From db14b748c7e9208adf420170d94f8005f2153d63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Sun, 20 Jun 2004 22:25:14 +0000
Subject: [PATCH 001/356] Don't activate invisible windows

svn path=/trunk/; revision=9774
---
 reactos/subsys/win32k/ntuser/focus.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/reactos/subsys/win32k/ntuser/focus.c b/reactos/subsys/win32k/ntuser/focus.c
index 7e561a6b038..e833cc1040f 100644
--- a/reactos/subsys/win32k/ntuser/focus.c
+++ b/reactos/subsys/win32k/ntuser/focus.c
@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: focus.c,v 1.22 2004/05/10 17:07:18 weiden Exp $
+ * $Id: focus.c,v 1.23 2004/06/20 22:25:14 gvg Exp $
  */
 
 #include <w32k.h>
@@ -151,6 +151,12 @@ IntSetForegroundAndFocusWindow(PWINDOW_OBJECT Window, PWINDOW_OBJECT FocusWindow
       return FALSE;
    }
 
+   if (0 == (Window->Style & WS_VISIBLE))
+   {
+      DPRINT("Failed - Invisible\n");
+      return FALSE;
+   }
+
    PrevForegroundQueue = IntGetFocusMessageQueue();
    if (PrevForegroundQueue != 0)
    {

From b24bc6c8def2a3032dc7306d3e19b09d36a9e61c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Sun, 20 Jun 2004 22:27:19 +0000
Subject: [PATCH 002/356] Prefer non-topmost windows when activating another
 window

svn path=/trunk/; revision=9776
---
 reactos/subsys/win32k/ntuser/winpos.c | 36 ++++++++++++++++-----------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/reactos/subsys/win32k/ntuser/winpos.c b/reactos/subsys/win32k/ntuser/winpos.c
index b43e935c680..f9f7bd91631 100644
--- a/reactos/subsys/win32k/ntuser/winpos.c
+++ b/reactos/subsys/win32k/ntuser/winpos.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: winpos.c,v 1.117 2004/06/20 00:45:37 navaraf Exp $
+/* $Id: winpos.c,v 1.118 2004/06/20 22:27:19 gvg Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -107,6 +107,7 @@ VOID FASTCALL
 WinPosActivateOtherWindow(PWINDOW_OBJECT Window)
 {
   PWINDOW_OBJECT Wnd, Old;
+  int TryTopmost;
   
   if (!Window || IntIsDesktopWindow(Window))
   {
@@ -132,25 +133,30 @@ WinPosActivateOtherWindow(PWINDOW_OBJECT Window)
     
     if((List = IntWinListChildren(Wnd)))
     {
-      for(phWnd = List; *phWnd; phWnd++)
+      for(TryTopmost = 0; TryTopmost <= 1; TryTopmost++)
       {
-        PWINDOW_OBJECT Child;
-        
-        if((*phWnd) == Window->Self)
+        for(phWnd = List; *phWnd; phWnd++)
         {
-          continue;
-        }
+          PWINDOW_OBJECT Child;
         
-        if((Child = IntGetWindowObject(*phWnd)))
-        {
-          if(IntSetForegroundWindow(Child))
+          if((*phWnd) == Window->Self)
           {
-            ExFreePool(List);
-            IntReleaseWindowObject(Wnd);
-            IntReleaseWindowObject(Child);
-            return;
+            continue;
+          }
+        
+          if((Child = IntGetWindowObject(*phWnd)))
+          {
+            if(((! TryTopmost && (0 == (Child->ExStyle & WS_EX_TOPMOST)))
+                || (TryTopmost && (0 != (Child->ExStyle & WS_EX_TOPMOST))))
+               && IntSetForegroundWindow(Child))
+            {
+              ExFreePool(List);
+              IntReleaseWindowObject(Wnd);
+              IntReleaseWindowObject(Child);
+              return;
+            }
+            IntReleaseWindowObject(Child);
           }
-          IntReleaseWindowObject(Child);
         }
       }
       ExFreePool(List);

From 77ea00dd5067c4d368481b21896779a7635d8a29 Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Sun, 20 Jun 2004 22:52:39 +0000
Subject: [PATCH 003/356] some little fixes

svn path=/trunk/; revision=9778
---
 reactos/subsys/system/regedit/hexedit.c | 271 ++++++++++++++++++++++--
 1 file changed, 256 insertions(+), 15 deletions(-)

diff --git a/reactos/subsys/system/regedit/hexedit.c b/reactos/subsys/system/regedit/hexedit.c
index 1f079c99413..7138a704c03 100644
--- a/reactos/subsys/system/regedit/hexedit.c
+++ b/reactos/subsys/system/regedit/hexedit.c
@@ -35,16 +35,29 @@ typedef struct
   DWORD ColumnsPerLine;
   DWORD nLines;
   DWORD nVisibleLines;
+  INT Position;
   INT LineHeight;
   INT CharWidth;
   HFONT hFont;
   
   INT LeftMargin;
-  INT TopMargin;
   INT AddressSpacing;
   INT SplitSpacing;
+  
+  BOOL EditingField;
+  INT CaretCol;
+  INT CaretLine;
 } HEXEDIT_DATA, *PHEXEDIT_DATA;
 
+/* hit test codes */
+#define HEHT_LEFTMARGIN	(0x1)
+#define HEHT_ADDRESS	(0x2)
+#define HEHT_ADDRESSSPACING	(0x3)
+#define HEHT_HEXDUMP	(0x4)
+#define HEHT_HEXDUMPSPACING	(0x5)
+#define HEHT_ASCIIDUMP	(0x6)
+#define HEHT_RIGHTMARGIN	(0x7)
+
 LRESULT WINAPI HexEditWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 ATOM
@@ -55,7 +68,7 @@ RegisterHexEditorClass(HINSTANCE hInstance)
   
   ZeroMemory(&WndClass, sizeof(WNDCLASSEX));
   WndClass.cbSize = sizeof(WNDCLASSEX);
-  WndClass.style = CS_DBLCLKS;// | CS_PARENTDC;
+  WndClass.style = CS_DBLCLKS;
   WndClass.lpfnWndProc = (WNDPROC)HexEditWndProc;
   WndClass.cbWndExtra = sizeof(PHEXEDIT_DATA);
   WndClass.hInstance = hInstance;
@@ -76,10 +89,33 @@ UnregisterHexEditorClass(HINSTANCE hInstance)
 /*** Helper functions *********************************************************/
 
 static VOID
-HEXEDIT_MoveCaret(PHEXEDIT_DATA hed, INT Col, INT Line)
+HEXEDIT_MoveCaret(PHEXEDIT_DATA hed, INT Line, INT Column, BOOL HexDump)
 {
-  /* FIXME - include the scroll position */
-  SetCaretPos(hed->LeftMargin + (Col * hed->CharWidth), hed->TopMargin + (Line * hed->LineHeight));
+  SCROLLINFO si;
+  
+  si.cbSize = sizeof(SCROLLINFO);
+  si.fMask = SIF_POS;
+  GetScrollInfo(hed->hWndSelf, SB_VERT, &si);
+  
+  if(si.nPos > Line)
+  {
+    si.nPos = Line;
+    SetScrollInfo(hed->hWndSelf, SB_VERT, &si, TRUE);
+    GetScrollInfo(hed->hWndSelf, SB_VERT, &si);
+    InvalidateRect(hed->hWndSelf, NULL, TRUE);
+  }
+  else if((Line - si.nPos) > hed->nVisibleLines)
+  {
+    si.nPos += (Line - si.nPos);
+    SetScrollInfo(hed->hWndSelf, SB_VERT, &si, TRUE);
+    GetScrollInfo(hed->hWndSelf, SB_VERT, &si);
+    InvalidateRect(hed->hWndSelf, NULL, TRUE);
+  }
+  
+  if(HexDump)
+    SetCaretPos(hed->LeftMargin + ((4 + hed->AddressSpacing) * hed->CharWidth) - 2, (Line - si.nPos) * hed->LineHeight);
+  else
+    SetCaretPos(hed->LeftMargin + ((4 + hed->AddressSpacing + hed->SplitSpacing + (3 * hed->ColumnsPerLine)) * hed->CharWidth) - 2, (Line - si.nPos) * hed->LineHeight);
 }
 
 static VOID
@@ -136,6 +172,7 @@ HEXEDIT_PaintLines(PHEXEDIT_DATA hed, HDC hDC, DWORD ScrollPos, DWORD First, DWO
   PBYTE buf, current, end, line;
   UINT bufsize;
   TCHAR hex[3], addr[17];
+  RECT rct;
   
   if(hed->hBuffer)
   {
@@ -157,24 +194,35 @@ HEXEDIT_PaintLines(PHEXEDIT_DATA hed, HDC hDC, DWORD ScrollPos, DWORD First, DWO
     current = buf + linestart;
     Last = min(hed->nLines - ScrollPos, Last);
     
-    for(; First <= Last && current < end; First++)
+    while(First <= Last && current < end)
     {
-      int slen;
+      DWORD dh;
       
       dx = hed->LeftMargin;
       
       /* draw address */
       _stprintf(addr, _T("%04X"), linestart);
       TextOut(hDC, dx, dy, addr, 4);
-      dx += (4 + hed->AddressSpacing) * hed->CharWidth;
+      
+      dx += ((4 + hed->AddressSpacing) * hed->CharWidth);
+      dh = (3 * hed->CharWidth);
+      
+      rct.left = dx;
+      rct.top = dy;
+      rct.right = rct.left + dh;
+      rct.bottom = dy + hed->LineHeight;
       
       /* draw hex map */
+      dx += (hed->CharWidth / 2);
       line = current;
       for(x = 0; x < hed->ColumnsPerLine && current < end; x++)
       {
+        rct.left += dh;
+        rct.right += dh;
+        
 	_stprintf(hex, _T("%02X"), *(current++));
-	TextOut(hDC, dx, dy, hex, 2);
-	dx += (3 * hed->CharWidth);
+	ExtTextOut(hDC, dx, dy, ETO_OPAQUE, &rct, hex, 2, NULL);
+	dx += dh;
       }
       
       /* draw ascii map */
@@ -183,19 +231,117 @@ HEXEDIT_PaintLines(PHEXEDIT_DATA hed, HDC hDC, DWORD ScrollPos, DWORD First, DWO
       for(x = 0; x < hed->ColumnsPerLine && current < end; x++)
       {
 	_stprintf(hex, _T("%C"), *(current++));
-	hex[0] = ((hex[0] & _T('\x007f')) > _T(' ') ? hex[0] : _T('.'));
+	hex[0] = ((hex[0] & _T('\x007f')) >= _T(' ') ? hex[0] : _T('.'));
 	TextOut(hDC, dx, dy, hex, 1);
 	dx += hed->CharWidth;
       }
       
       dy += hed->LineHeight;
       linestart += hed->ColumnsPerLine;
+      First++;
     }
   }
   
   LocalUnlock(hed->hBuffer);
 }
 
+static DWORD
+HEXEDIT_HitRegionTest(PHEXEDIT_DATA hed, POINTS pt, POINTS *ptClient)
+{
+  WINDOWINFO wi;
+  int d, x;
+  
+  wi.cbSize = sizeof(WINDOWINFO);
+  GetWindowInfo(hed->hWndSelf, &wi);
+  
+  x = pt.x - wi.rcClient.left;
+  if(ptClient)
+  {
+    ptClient->x = x;
+    ptClient->y = pt.y - wi.rcClient.top;
+  }
+  
+  if(x <= hed->LeftMargin)
+  {
+    return HEHT_LEFTMARGIN;
+  }
+  
+  x -= hed->LeftMargin;
+  d = (4 * hed->CharWidth);
+  if(x <= d)
+  {
+    return HEHT_ADDRESS;
+  }
+  
+  x -= d;
+  d = (hed->AddressSpacing * hed->CharWidth);
+  if(x <= d)
+  {
+    return HEHT_ADDRESSSPACING;
+  }
+  
+  x -= d;
+  d = (3 * hed->ColumnsPerLine * hed->CharWidth);
+  if(x <= d)
+  {
+    return HEHT_HEXDUMP;
+  }
+  
+  x -= d;
+  d = (hed->SplitSpacing * hed->CharWidth);
+  if(x <= d)
+  {
+    return HEHT_HEXDUMPSPACING;
+  }
+  
+  x -= d;
+  d = (hed->ColumnsPerLine * hed->CharWidth);
+  if(x <= d)
+  {
+    return HEHT_ASCIIDUMP;
+  }
+  
+  return HEHT_RIGHTMARGIN;
+}
+
+static DWORD
+HEXEDIT_PositionFromPoint(PHEXEDIT_DATA hed, POINTS pt, DWORD *Hit)
+{
+  SCROLLINFO si;
+  POINTS ptClient;
+  DWORD Line;
+  
+  *Hit = HEXEDIT_HitRegionTest(hed, pt, &ptClient);
+  
+  si.cbSize = sizeof(SCROLLINFO);
+  si.fMask = SIF_POS;
+  GetScrollInfo(hed->hWndSelf, SB_VERT, &si);
+  
+  if(hed->LineHeight > 0)
+  {
+    Line = min(si.nPos + (ptClient.y / hed->LineHeight), hed->nLines);
+  }
+  else
+    return 0;
+  
+  switch(*Hit)
+  {
+    case HEHT_LEFTMARGIN:
+    case HEHT_ADDRESS:
+    case HEHT_ADDRESSSPACING:
+      return Line * hed->ColumnsPerLine;
+    
+    case HEHT_HEXDUMP:
+      return 0;
+    
+    case HEHT_ASCIIDUMP:
+      return 0;
+    
+    case HEHT_RIGHTMARGIN:
+      return (Line + 1) * hed->ColumnsPerLine;
+  }
+}
+
 /*** Control specific messages ************************************************/
 
 static LRESULT
@@ -222,6 +368,7 @@ HEXEDIT_HEM_LOADBUFFER(PHEXEDIT_DATA hed, PVOID Buffer, DWORD Size)
       else
       {
         hed->hBuffer = LocalFree(hed->hBuffer);
+        hed->Position = 0;
         HEXEDIT_Update(hed);
         
         return 0;
@@ -244,11 +391,13 @@ HEXEDIT_HEM_LOADBUFFER(PHEXEDIT_DATA hed, PVOID Buffer, DWORD Size)
       LocalUnlock(hed->hBuffer);
     }
     
+    hed->Position = 0;
     HEXEDIT_Update(hed);
     return Size;
   }
   else if(hed->hBuffer)
   {
+    hed->Position = 0;
     hed->hBuffer = LocalFree(hed->hBuffer);
     HEXEDIT_Update(hed);
   }
@@ -318,9 +467,9 @@ HEXEDIT_WM_NCCREATE(HWND hWnd, CREATESTRUCT *cs)
   
   hed->ColumnsPerLine = 8;
   hed->LeftMargin = 2;
-  hed->TopMargin = 2;
   hed->AddressSpacing = 2;
   hed->SplitSpacing = 2;
+  hed->EditingField = TRUE; /* in hexdump field */
   
   SetWindowLong(hWnd, 0, (LONG)hed);
   
@@ -351,8 +500,8 @@ HEXEDIT_WM_CREATE(PHEXEDIT_DATA hed)
 static LRESULT
 HEXEDIT_WM_SETFOCUS(PHEXEDIT_DATA hed)
 {
-  CreateCaret(hed->hWndSelf, 0, 2, hed->LineHeight);
-  HEXEDIT_MoveCaret(hed, 0, 0);
+  CreateCaret(hed->hWndSelf, 0, 1, hed->LineHeight);
+  HEXEDIT_MoveCaret(hed, hed->CaretLine, hed->CaretCol, hed->EditingField);
   ShowCaret(hed->hWndSelf);
   return 0;
 }
@@ -471,6 +620,7 @@ HEXEDIT_WM_PAINT(PHEXEDIT_DATA hed)
   DWORD nLines, nFirst;
   HFONT hOldFont;
   HDC hTempDC;
+  DWORD height;
   
   if(GetUpdateRect(hed->hWndSelf, &rc, FALSE) && (hed->LineHeight > 0))
   {
@@ -479,7 +629,12 @@ HEXEDIT_WM_PAINT(PHEXEDIT_DATA hed)
     si.fMask = SIF_POS;
     GetScrollInfo(hed->hWndSelf, SB_VERT, &si);
     
-    nLines = (rc.bottom - rc.top) / hed->LineHeight;
+    height = (rc.bottom - rc.top);
+    nLines = height / hed->LineHeight;
+    if((height % hed->LineHeight) > 0)
+    {
+      nLines++;
+    }
     if(nLines > hed->nLines - si.nPos)
     {
       nLines = hed->nLines - si.nPos;
@@ -543,6 +698,86 @@ HEXEDIT_WM_MOUSEWHEEL(PHEXEDIT_DATA hed, int cyMoveLines, WORD ButtonsDown, LPPO
   return 0;
 }
 
+static LRESULT
+HEXEDIT_WM_SETCURSOR(PHEXEDIT_DATA hed)
+{
+  POINTS pt;
+  DWORD Hit, Pos;
+  
+  Pos = GetMessagePos();
+  pt = MAKEPOINTS(Pos);
+  Hit = HEXEDIT_HitRegionTest(hed, pt, NULL);
+  
+  switch(Hit)
+  {
+    case HEHT_HEXDUMP:
+    case HEHT_HEXDUMPSPACING:
+    case HEHT_ASCIIDUMP:
+      SetCursor(LoadCursor(0, MAKEINTRESOURCE(IDC_IBEAM)));
+      break;
+    
+    default:
+      SetCursor(LoadCursor(0, MAKEINTRESOURCE(IDC_ARROW)));
+      break;
+  }
+  return TRUE;
+}
+
+static BOOL
+HEXEDIT_WM_KEYDOWN(PHEXEDIT_DATA hed, INT VkCode)
+{
+  DWORD bufsize;
+  BOOL shift, control, handled;
+  
+  if(GetKeyState(VK_MENU) & 0x8000)
+  {
+    return FALSE;
+  }
+  
+  shift = GetKeyState(VK_SHIFT) & 0x8000;
+  control = GetKeyState(VK_CONTROL) & 0x8000;
+  
+  bufsize = (hed->hBuffer ? LocalSize(hed->hBuffer) : 0);
+  handled = FALSE;
+  
+  switch(VkCode)
+  {
+    case VK_LEFT:MessageBox(0, L"", L"", 0);
+      if(hed->Position > 0)
+      {
+        if(--hed->CaretCol < 0)
+	{
+	  hed->CaretLine--;
+	  hed->CaretCol = hed->ColumnsPerLine;
+	}
+	else
+	  hed->Position--;
+	
+	HEXEDIT_MoveCaret(hed, hed->CaretLine, hed->CaretCol, hed->EditingField);
+      }
+      handled = TRUE;
+      break;
+    
+    case VK_RIGHT:
+      if(hed->Position < bufsize)
+      {
+        if(++hed->CaretCol > hed->ColumnsPerLine)
+	{
+	  hed->CaretLine = 0;
+	  hed->CaretLine++;
+	}
+	else
+	  hed->Position++;
+	
+	HEXEDIT_MoveCaret(hed, hed->CaretLine, hed->CaretCol, hed->EditingField);
+      }
+      handled = TRUE;
+      break;
+  }
+  
+  return FALSE;
+}
+
 LRESULT
 WINAPI
 HexEditWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
@@ -558,6 +793,12 @@ HexEditWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
     case WM_PAINT:
       return HEXEDIT_WM_PAINT(hed);
     
+    case WM_SETCURSOR:
+      return HEXEDIT_WM_SETCURSOR(hed);
+    
+    case WM_KEYDOWN:
+      return HEXEDIT_WM_KEYDOWN(hed, (INT)wParam);
+    
     case WM_VSCROLL:
       return HEXEDIT_WM_VSCROLL(hed, HIWORD(wParam), LOWORD(wParam));
     

From 13e51e12a90ebbf34042d983d0e1cb34a39f4f43 Mon Sep 17 00:00:00 2001
From: Gunnar Dalsnes <hardon@online.no>
Date: Sun, 20 Jun 2004 23:22:06 +0000
Subject: [PATCH 004/356] move rtl/version|image|encode into rtl

svn path=/trunk/; revision=9779
---
 reactos/lib/ntdll/makefile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/reactos/lib/ntdll/makefile b/reactos/lib/ntdll/makefile
index bd5ce87d413..99fb8212ff6 100644
--- a/reactos/lib/ntdll/makefile
+++ b/reactos/lib/ntdll/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.102 2004/05/31 19:33:12 gdalsnes Exp $
+# $Id: makefile,v 1.103 2004/06/20 23:22:06 gdalsnes Exp $
 
 PATH_TO_TOP = ../..
 
@@ -70,10 +70,8 @@ RTL_OBJECTS = \
 	rtl/callback.o \
 	rtl/crc32.o \
 	rtl/critical.o \
-	rtl/encode.o \
 	rtl/exception.o \
 	rtl/handle.o \
-	rtl/image.o \
 	rtl/intrlck.o \
 	rtl/math.o \
 	rtl/message.o \
@@ -85,7 +83,6 @@ RTL_OBJECTS = \
 	rtl/rangelist.o \
 	rtl/registry.o \
 	rtl/resource.o \
-	rtl/splaytree.o \
 	rtl/teb.o \
 	rtl/thread.o \
 	rtl/libsupp.o

From d26418fb30d8b82174101905733654b2b4167dfc Mon Sep 17 00:00:00 2001
From: Gunnar Dalsnes <hardon@online.no>
Date: Sun, 20 Jun 2004 23:25:34 +0000
Subject: [PATCH 005/356] moved into rtl

svn path=/trunk/; revision=9780
---
 reactos/lib/ntdll/rtl/encode.c    |  80 ----------------
 reactos/lib/ntdll/rtl/image.c     | 148 ------------------------------
 reactos/lib/ntdll/rtl/splaytree.c |  70 --------------
 3 files changed, 298 deletions(-)
 delete mode 100644 reactos/lib/ntdll/rtl/encode.c
 delete mode 100644 reactos/lib/ntdll/rtl/image.c
 delete mode 100644 reactos/lib/ntdll/rtl/splaytree.c

diff --git a/reactos/lib/ntdll/rtl/encode.c b/reactos/lib/ntdll/rtl/encode.c
deleted file mode 100644
index cc28a2e2b01..00000000000
--- a/reactos/lib/ntdll/rtl/encode.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* $Id: encode.c,v 1.3 2004/02/01 20:48:06 ekohl Exp $
- *
- * COPYRIGHT:         See COPYING in the top level directory
- * PROJECT:           ReactOS kernel
- * PURPOSE:           Security descriptor functions
- * FILE:              lib/ntdll/rtl/encode.c
- * PROGRAMMER:        KJK::Hyperion <noog@libero.it>
- * REVISION HISTORY:
- *                 02/04/2003: created (code contributed by crazylord
- *                             <crazyl0rd@minithins.net>)
- */
-
-/* INCLUDES *****************************************************************/
-
-#include <ddk/ntddk.h>
-
-#include <ntdll/ntdll.h>
-
-/* FUNCTIONS ***************************************************************/
-
-VOID STDCALL
-RtlRunDecodeUnicodeString (IN UCHAR Hash,
-			   IN OUT PUNICODE_STRING String)
-{
-  PUCHAR ptr;
-  USHORT i;
-
-  ptr = (PUCHAR)String->Buffer;
-  if (String->Length > 1)
-    {
-      for (i = String->Length; i > 1; i--)
-        {
-          ptr[i - 1] ^= ptr[i - 2] ^ Hash;
-        }
-    }
-
-  if (String->Length >= 1)
-    {
-      ptr[0] ^= Hash | (UCHAR)0x43;
-    }
-}
-
-
-VOID STDCALL
-RtlRunEncodeUnicodeString (IN OUT PUCHAR Hash,
-			   IN OUT PUNICODE_STRING String)
-{
-  LARGE_INTEGER CurrentTime;
-  PUCHAR ptr;
-  USHORT i;
-  NTSTATUS Status;
-
-  ptr = (PUCHAR) String->Buffer;
-  if (*Hash == 0)
-    {
-      Status = NtQuerySystemTime (&CurrentTime);
-      if (NT_SUCCESS(Status))
-	{
-	  for (i = 1; i < sizeof(LARGE_INTEGER) && (*Hash == 0); i++)
-	    *Hash |= *(PUCHAR)(((PUCHAR)&CurrentTime) + i);
-	}
-
-      if (*Hash == 0)
-	*Hash = 1;
-    }
-
-  if (String->Length >= 1)
-    {
-      ptr[0] ^= (*Hash) | (UCHAR)0x43;
-      if (String->Length > 1)
-	{
-	  for (i = 1; i < String->Length; i++)
-	    {
-	      ptr[i] ^= ptr[i - 1] ^ (*Hash);
-	    }
-	}
-    }
-}
-
-/* EOF */
diff --git a/reactos/lib/ntdll/rtl/image.c b/reactos/lib/ntdll/rtl/image.c
deleted file mode 100644
index 2fd86411c48..00000000000
--- a/reactos/lib/ntdll/rtl/image.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/* $Id: image.c,v 1.7 2004/01/17 10:30:53 hbirr Exp $
- *
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS kernel
- * FILE:            lib/ntdll/rtl/image.c
- * PURPOSE:         Image handling functions
- * PROGRAMMER:      Eric Kohl
- * UPDATE HISTORY:
- *                  17/03/2000 Created
- */
-
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
-
-#define NDEBUG
-#include <ntdll/ntdll.h>
-
-/* FUNCTIONS ****************************************************************/
-
-/*
- * @implemented
- */
-PIMAGE_NT_HEADERS STDCALL
-RtlImageNtHeader (IN PVOID BaseAddress)
-{
-  PIMAGE_NT_HEADERS NtHeader;
-  PIMAGE_DOS_HEADER DosHeader = (PIMAGE_DOS_HEADER)BaseAddress;
-
-  if (DosHeader && DosHeader->e_magic != IMAGE_DOS_SIGNATURE)
-    {
-      DPRINT1("DosHeader->e_magic %x\n", DosHeader->e_magic);
-      DPRINT1("NtHeader %x\n", (BaseAddress + DosHeader->e_lfanew));
-    }
-
-  if (DosHeader && DosHeader->e_magic == IMAGE_DOS_SIGNATURE)
-    {
-      NtHeader = (PIMAGE_NT_HEADERS)(BaseAddress + DosHeader->e_lfanew);
-      if (NtHeader->Signature == IMAGE_NT_SIGNATURE)
-	return NtHeader;
-    }
-
-  return NULL;
-}
-
-
-/*
- * @implemented
- */
-PVOID
-STDCALL
-RtlImageDirectoryEntryToData (
-	PVOID	BaseAddress,
-	BOOLEAN	bFlag,
-	ULONG	Directory,
-	PULONG	Size
-	)
-{
-	PIMAGE_NT_HEADERS NtHeader;
-	ULONG Va;
-
-	NtHeader = RtlImageNtHeader (BaseAddress);
-	if (NtHeader == NULL)
-		return NULL;
-
-	if (Directory >= NtHeader->OptionalHeader.NumberOfRvaAndSizes)
-		return NULL;
-
-	Va = NtHeader->OptionalHeader.DataDirectory[Directory].VirtualAddress;
-	if (Va == 0)
-		return NULL;
-
-	if (Size)
-		*Size = NtHeader->OptionalHeader.DataDirectory[Directory].Size;
-
-	if (bFlag)
-		return (PVOID)(BaseAddress + Va);
-
-	/* image mapped as ordinary file, we must find raw pointer */
-	return (PVOID)RtlImageRvaToVa (NtHeader, BaseAddress, Va, NULL);
-}
-
-
-/*
- * @implemented
- */
-PIMAGE_SECTION_HEADER
-STDCALL
-RtlImageRvaToSection (
-	PIMAGE_NT_HEADERS	NtHeader,
-	PVOID			BaseAddress,
-	ULONG			Rva
-	)
-{
-	PIMAGE_SECTION_HEADER Section;
-	ULONG Va;
-	ULONG Count;
-
-	Count = NtHeader->FileHeader.NumberOfSections;
-	Section = (PIMAGE_SECTION_HEADER)((ULONG)&NtHeader->OptionalHeader +
-	                                  NtHeader->FileHeader.SizeOfOptionalHeader);
-	while (Count)
-	{
-		Va = Section->VirtualAddress;
-		if ((Va <= Rva) &&
-		    (Rva < Va + Section->SizeOfRawData))
-			return Section;
-		Section++;
-	}
-	return NULL;
-}
-
-
-/*
- * @implemented
- */
-ULONG
-STDCALL
-RtlImageRvaToVa (
-	PIMAGE_NT_HEADERS	NtHeader,
-	PVOID			BaseAddress,
-	ULONG			Rva,
-	PIMAGE_SECTION_HEADER	*SectionHeader
-	)
-{
-	PIMAGE_SECTION_HEADER Section = NULL;
-
-	if (SectionHeader)
-		Section = *SectionHeader;
-
-	if (Section == NULL ||
-	    Rva < Section->VirtualAddress ||
-	    Rva >= Section->VirtualAddress + Section->SizeOfRawData)
-	{
-		Section = RtlImageRvaToSection (NtHeader, BaseAddress, Rva);
-		if (Section == NULL)
-			return 0;
-
-		if (SectionHeader)
-			*SectionHeader = Section;
-	}
-
-	return (ULONG)(BaseAddress +
-	               Rva +
-	               Section->PointerToRawData -
-	               Section->VirtualAddress);
-}
-
-/* EOF */
diff --git a/reactos/lib/ntdll/rtl/splaytree.c b/reactos/lib/ntdll/rtl/splaytree.c
deleted file mode 100644
index 22896bf6778..00000000000
--- a/reactos/lib/ntdll/rtl/splaytree.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- *  ReactOS kernel
- *  Copyright (C) 2003 ReactOS Team
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-/* $Id: splaytree.c,v 1.1 2003/09/02 11:19:29 ekohl Exp $
- *
- * COPYRIGHT:         See COPYING in the top level directory
- * PROJECT:           ReactOS system libraries
- * PURPOSE:           Splay-Tree implementation
- * FILE:              lib/ntdll/rtl/splaytree.c
- */
-
-#include <ddk/ntddk.h>
-
-/* FUNCTIONS *****************************************************************/
-
-PRTL_SPLAY_LINKS STDCALL
-RtlSubtreePredecessor (IN PRTL_SPLAY_LINKS Links)
-{
-  PRTL_SPLAY_LINKS Child;
-
-  Child = Links->RightChild;
-  if (Child == NULL)
-    return NULL;
-
-  if (Child->LeftChild == NULL)
-    return Child;
-
-  /* Get left-most child */
-  while (Child->LeftChild != NULL)
-    Child = Child->LeftChild;
-
-  return Child;
-}
-
-
-PRTL_SPLAY_LINKS STDCALL
-RtlSubtreeSuccessor (IN PRTL_SPLAY_LINKS Links)
-{
-  PRTL_SPLAY_LINKS Child;
-
-  Child = Links->LeftChild;
-  if (Child == NULL)
-    return NULL;
-
-  if (Child->RightChild == NULL)
-    return Child;
-
-  /* Get right-most child */
-  while (Child->RightChild != NULL)
-    Child = Child->RightChild;
-
-  return Child;
-}
-
-/* EOF */

From 75a50813aaee3676d240cd4247d0517cec6a4be6 Mon Sep 17 00:00:00 2001
From: Gunnar Dalsnes <hardon@online.no>
Date: Sun, 20 Jun 2004 23:27:21 +0000
Subject: [PATCH 006/356] moved encode|image|splaytee into rtl

svn path=/trunk/; revision=9781
---
 reactos/lib/rtl/encode.c    |  80 +++++++++++++++++++
 reactos/lib/rtl/image.c     | 148 ++++++++++++++++++++++++++++++++++++
 reactos/lib/rtl/makefile    |   5 +-
 reactos/lib/rtl/splaytree.c |  70 +++++++++++++++++
 4 files changed, 302 insertions(+), 1 deletion(-)
 create mode 100644 reactos/lib/rtl/encode.c
 create mode 100644 reactos/lib/rtl/image.c
 create mode 100644 reactos/lib/rtl/splaytree.c

diff --git a/reactos/lib/rtl/encode.c b/reactos/lib/rtl/encode.c
new file mode 100644
index 00000000000..82b82a30283
--- /dev/null
+++ b/reactos/lib/rtl/encode.c
@@ -0,0 +1,80 @@
+/* $Id: encode.c,v 1.1 2004/06/20 23:27:21 gdalsnes Exp $
+ *
+ * COPYRIGHT:         See COPYING in the top level directory
+ * PROJECT:           ReactOS kernel
+ * PURPOSE:           Security descriptor functions
+ * FILE:              lib/rtl/encode.c
+ * PROGRAMMER:        KJK::Hyperion <noog@libero.it>
+ * REVISION HISTORY:
+ *                 02/04/2003: created (code contributed by crazylord
+ *                             <crazyl0rd@minithins.net>)
+ */
+
+/* INCLUDES *****************************************************************/
+
+#include <ddk/ntddk.h>
+
+#include <ntdll/ntdll.h>
+
+/* FUNCTIONS ***************************************************************/
+
+VOID STDCALL
+RtlRunDecodeUnicodeString (IN UCHAR Hash,
+                           IN OUT PUNICODE_STRING String)
+{
+   PUCHAR ptr;
+   USHORT i;
+
+   ptr = (PUCHAR)String->Buffer;
+   if (String->Length > 1)
+   {
+      for (i = String->Length; i > 1; i--)
+      {
+         ptr[i - 1] ^= ptr[i - 2] ^ Hash;
+      }
+   }
+
+   if (String->Length >= 1)
+   {
+      ptr[0] ^= Hash | (UCHAR)0x43;
+   }
+}
+
+
+VOID STDCALL
+RtlRunEncodeUnicodeString (IN OUT PUCHAR Hash,
+                           IN OUT PUNICODE_STRING String)
+{
+   LARGE_INTEGER CurrentTime;
+   PUCHAR ptr;
+   USHORT i;
+   NTSTATUS Status;
+
+   ptr = (PUCHAR) String->Buffer;
+   if (*Hash == 0)
+   {
+      Status = NtQuerySystemTime (&CurrentTime);
+      if (NT_SUCCESS(Status))
+      {
+         for (i = 1; i < sizeof(LARGE_INTEGER) && (*Hash == 0); i++)
+            *Hash |= *(PUCHAR)(((PUCHAR)&CurrentTime) + i);
+      }
+
+      if (*Hash == 0)
+         *Hash = 1;
+   }
+
+   if (String->Length >= 1)
+   {
+      ptr[0] ^= (*Hash) | (UCHAR)0x43;
+      if (String->Length > 1)
+      {
+         for (i = 1; i < String->Length; i++)
+         {
+            ptr[i] ^= ptr[i - 1] ^ (*Hash);
+         }
+      }
+   }
+}
+
+/* EOF */
diff --git a/reactos/lib/rtl/image.c b/reactos/lib/rtl/image.c
new file mode 100644
index 00000000000..0b261f3599d
--- /dev/null
+++ b/reactos/lib/rtl/image.c
@@ -0,0 +1,148 @@
+/* $Id: image.c,v 1.1 2004/06/20 23:27:21 gdalsnes Exp $
+ *
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS kernel
+ * FILE:            lib/ntdll/rtl/image.c
+ * PURPOSE:         Image handling functions
+ * PROGRAMMER:      Eric Kohl
+ * UPDATE HISTORY:
+ *                  17/03/2000 Created
+ */
+
+#include <ddk/ntddk.h>
+#include <ntdll/rtl.h>
+
+#define NDEBUG
+#include <ntdll/ntdll.h>
+
+/* FUNCTIONS ****************************************************************/
+
+/*
+ * @implemented
+ */
+PIMAGE_NT_HEADERS STDCALL
+RtlImageNtHeader (IN PVOID BaseAddress)
+{
+  PIMAGE_NT_HEADERS NtHeader;
+  PIMAGE_DOS_HEADER DosHeader = (PIMAGE_DOS_HEADER)BaseAddress;
+
+  if (DosHeader && DosHeader->e_magic != IMAGE_DOS_SIGNATURE)
+    {
+      DPRINT1("DosHeader->e_magic %x\n", DosHeader->e_magic);
+      DPRINT1("NtHeader %x\n", (BaseAddress + DosHeader->e_lfanew));
+    }
+
+  if (DosHeader && DosHeader->e_magic == IMAGE_DOS_SIGNATURE)
+    {
+      NtHeader = (PIMAGE_NT_HEADERS)(BaseAddress + DosHeader->e_lfanew);
+      if (NtHeader->Signature == IMAGE_NT_SIGNATURE)
+	return NtHeader;
+    }
+
+  return NULL;
+}
+
+
+/*
+ * @implemented
+ */
+PVOID
+STDCALL
+RtlImageDirectoryEntryToData (
+	PVOID	BaseAddress,
+	BOOLEAN	bFlag,
+	ULONG	Directory,
+	PULONG	Size
+	)
+{
+	PIMAGE_NT_HEADERS NtHeader;
+	ULONG Va;
+
+	NtHeader = RtlImageNtHeader (BaseAddress);
+	if (NtHeader == NULL)
+		return NULL;
+
+	if (Directory >= NtHeader->OptionalHeader.NumberOfRvaAndSizes)
+		return NULL;
+
+	Va = NtHeader->OptionalHeader.DataDirectory[Directory].VirtualAddress;
+	if (Va == 0)
+		return NULL;
+
+	if (Size)
+		*Size = NtHeader->OptionalHeader.DataDirectory[Directory].Size;
+
+	if (bFlag)
+		return (PVOID)(BaseAddress + Va);
+
+	/* image mapped as ordinary file, we must find raw pointer */
+	return (PVOID)RtlImageRvaToVa (NtHeader, BaseAddress, Va, NULL);
+}
+
+
+/*
+ * @implemented
+ */
+PIMAGE_SECTION_HEADER
+STDCALL
+RtlImageRvaToSection (
+	PIMAGE_NT_HEADERS	NtHeader,
+	PVOID			BaseAddress,
+	ULONG			Rva
+	)
+{
+	PIMAGE_SECTION_HEADER Section;
+	ULONG Va;
+	ULONG Count;
+
+	Count = NtHeader->FileHeader.NumberOfSections;
+	Section = (PIMAGE_SECTION_HEADER)((ULONG)&NtHeader->OptionalHeader +
+	                                  NtHeader->FileHeader.SizeOfOptionalHeader);
+	while (Count)
+	{
+		Va = Section->VirtualAddress;
+		if ((Va <= Rva) &&
+		    (Rva < Va + Section->SizeOfRawData))
+			return Section;
+		Section++;
+	}
+	return NULL;
+}
+
+
+/*
+ * @implemented
+ */
+ULONG
+STDCALL
+RtlImageRvaToVa (
+	PIMAGE_NT_HEADERS	NtHeader,
+	PVOID			BaseAddress,
+	ULONG			Rva,
+	PIMAGE_SECTION_HEADER	*SectionHeader
+	)
+{
+	PIMAGE_SECTION_HEADER Section = NULL;
+
+	if (SectionHeader)
+		Section = *SectionHeader;
+
+	if (Section == NULL ||
+	    Rva < Section->VirtualAddress ||
+	    Rva >= Section->VirtualAddress + Section->SizeOfRawData)
+	{
+		Section = RtlImageRvaToSection (NtHeader, BaseAddress, Rva);
+		if (Section == NULL)
+			return 0;
+
+		if (SectionHeader)
+			*SectionHeader = Section;
+	}
+
+	return (ULONG)(BaseAddress +
+	               Rva +
+	               Section->PointerToRawData -
+	               Section->VirtualAddress);
+}
+
+/* EOF */
diff --git a/reactos/lib/rtl/makefile b/reactos/lib/rtl/makefile
index dc94c041136..e11603524f2 100644
--- a/reactos/lib/rtl/makefile
+++ b/reactos/lib/rtl/makefile
@@ -30,7 +30,10 @@ TARGET_OBJECTS = \
 	time.o \
 	timezone.o \
 	unicode.o \
-	version.o
+	version.o \
+	encode.o \
+	image.o \
+	splaytree.o
 
 #	atom
 #	registry
diff --git a/reactos/lib/rtl/splaytree.c b/reactos/lib/rtl/splaytree.c
new file mode 100644
index 00000000000..49d738b3af3
--- /dev/null
+++ b/reactos/lib/rtl/splaytree.c
@@ -0,0 +1,70 @@
+/*
+ *  ReactOS kernel
+ *  Copyright (C) 2003 ReactOS Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+/* $Id: splaytree.c,v 1.1 2004/06/20 23:27:21 gdalsnes Exp $
+ *
+ * COPYRIGHT:         See COPYING in the top level directory
+ * PROJECT:           ReactOS system libraries
+ * PURPOSE:           Splay-Tree implementation
+ * FILE:              lib/rtl/splaytree.c
+ */
+
+#include <ddk/ntddk.h>
+
+/* FUNCTIONS *****************************************************************/
+
+PRTL_SPLAY_LINKS STDCALL
+RtlSubtreePredecessor (IN PRTL_SPLAY_LINKS Links)
+{
+   PRTL_SPLAY_LINKS Child;
+
+   Child = Links->RightChild;
+   if (Child == NULL)
+      return NULL;
+
+   if (Child->LeftChild == NULL)
+      return Child;
+
+   /* Get left-most child */
+   while (Child->LeftChild != NULL)
+      Child = Child->LeftChild;
+
+   return Child;
+}
+
+
+PRTL_SPLAY_LINKS STDCALL
+RtlSubtreeSuccessor (IN PRTL_SPLAY_LINKS Links)
+{
+   PRTL_SPLAY_LINKS Child;
+
+   Child = Links->LeftChild;
+   if (Child == NULL)
+      return NULL;
+
+   if (Child->RightChild == NULL)
+      return Child;
+
+   /* Get right-most child */
+   while (Child->RightChild != NULL)
+      Child = Child->RightChild;
+
+   return Child;
+}
+
+/* EOF */

From da670920b91e74cc8865b2efba1ca8fa1edbeeee Mon Sep 17 00:00:00 2001
From: Gunnar Dalsnes <hardon@online.no>
Date: Sun, 20 Jun 2004 23:30:47 +0000
Subject: [PATCH 007/356] forgot to change some memory allocators calls added
 comment to RtlFreeSid and changed its retval

svn path=/trunk/; revision=9782
---
 reactos/lib/rtl/sid.c | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/reactos/lib/rtl/sid.c b/reactos/lib/rtl/sid.c
index 10427eb302d..a7a7cee3a34 100644
--- a/reactos/lib/rtl/sid.c
+++ b/reactos/lib/rtl/sid.c
@@ -1,4 +1,4 @@
-/* $Id: sid.c,v 1.1 2004/05/31 19:29:02 gdalsnes Exp $
+/* $Id: sid.c,v 1.2 2004/06/20 23:30:47 gdalsnes Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -212,9 +212,7 @@ RtlAllocateAndInitializeSid (
    if (Sid == NULL)
       return STATUS_INVALID_PARAMETER;
 
-   pSid = (PSID)RtlAllocateHeap (RtlGetProcessHeap (),
-                                 0,
-                                 SubAuthorityCount * sizeof(DWORD) + 8);
+   pSid = (PSID)ExAllocatePool(PagedPool, SubAuthorityCount * sizeof(DWORD) + 8);
    if (pSid == NULL)
       return STATUS_NO_MEMORY;
 
@@ -253,14 +251,16 @@ RtlAllocateAndInitializeSid (
 
 /*
  * @implemented
+ *
+ * RETURNS
+ *  Docs says FreeSid does NOT return a value
+ *  even thou it's defined to return a PVOID...
  */
-PSID STDCALL
+PVOID STDCALL
 RtlFreeSid(IN PSID Sid)
 {
-   RtlFreeHeap(RtlGetProcessHeap(),
-               0,
-               Sid);
-   return(Sid);
+   ExFreePool(Sid);
+   return NULL;
 }
 
 
@@ -327,9 +327,7 @@ RtlConvertSidToUnicodeString(PUNICODE_STRING String,
    Length = (wcs - Buffer) * sizeof(WCHAR);
    if (AllocateBuffer)
    {
-      String->Buffer = RtlAllocateHeap (RtlGetProcessHeap (),
-                                        0,
-                                        Length + sizeof(WCHAR));
+      String->Buffer = ExAllocatePool(PagedPool,Length + sizeof(WCHAR));
       if (String->Buffer == NULL)
          return STATUS_NO_MEMORY;
       String->MaximumLength = Length + sizeof(WCHAR);

From 3b854207b75a316d7f5491dff31a365403978272 Mon Sep 17 00:00:00 2001
From: Gunnar Dalsnes <hardon@online.no>
Date: Sun, 20 Jun 2004 23:35:14 +0000
Subject: [PATCH 008/356] forgot to change some memory allocator calls added
 RtlpDuplicateUnicodeString

svn path=/trunk/; revision=9783
---
 reactos/lib/rtl/unicode.c | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/reactos/lib/rtl/unicode.c b/reactos/lib/rtl/unicode.c
index be4fe577d53..fe2f21db287 100644
--- a/reactos/lib/rtl/unicode.c
+++ b/reactos/lib/rtl/unicode.c
@@ -1136,7 +1136,6 @@ RtlOemStringToCountedUnicodeString(
 /*
  * private
  *
- 
  * NOTES
  *  Same as RtlOemStringToUnicodeString but doesn't write terminating null
  *  A partial copy is NOT performed if the dest buffer is too small!
@@ -1191,12 +1190,11 @@ RtlpOemStringToCountedUnicodeString(
 }
 
 
-//FIXME: sjekk returnverdi og returtype. Wine koflikter mht. returtype for EqualString og EqualComputer---
 /*
  * @implemented
  *
  * RETURNS
- *  0 if the names are equal, non-zero otherwise.
+ *  TRUE if the names are equal, FALSE if not
  *
  * NOTES
  *  The comparison is case insensitive.
@@ -1215,7 +1213,7 @@ RtlEqualComputerName(
    {
       if (NT_SUCCESS(RtlUpcaseUnicodeStringToOemString( &OemString2, ComputerName2, TRUE )))
       {
-         Result = RtlEqualString( &OemString1, &OemString2, FALSE );
+         Result = RtlEqualString( &OemString1, &OemString2, TRUE );
          RtlFreeOemString( &OemString2 );
       }
       RtlFreeOemString( &OemString1 );
@@ -1224,12 +1222,11 @@ RtlEqualComputerName(
    return Result;
 }
 
-//FIXME: sjekk returnverdi og returtype. Wine koflikter mht. returtype for EqualString og EqualComputer---
 /*
  * @implemented
  *
  * RETURNS
- *  0 if the names are equal, non-zero otherwise.
+ *  TRUE if the names are equal, FALSE if not
  *
  * NOTES
  *  The comparison is case insensitive.
@@ -2469,12 +2466,33 @@ RtlxUnicodeStringToOemSize(IN PUNICODE_STRING UnicodeString)
 
 /*
  * @implemented
+ *
+ * NOTES
+ *  See RtlpDuplicateUnicodeString
  */
 NTSTATUS STDCALL
 RtlDuplicateUnicodeString(
    INT AddNull,
    IN PUNICODE_STRING SourceString,
    PUNICODE_STRING DestinationString)
+{
+   return RtlpDuplicateUnicodeString(
+            AddNull,
+            SourceString,
+            DestinationString,
+            NonPagedPool);
+}
+   
+   
+/*
+ * @implemented
+ */
+NTSTATUS STDCALL
+RtlpDuplicateUnicodeString(
+   INT AddNull,
+   IN PUNICODE_STRING SourceString,
+   PUNICODE_STRING DestinationString,
+   POOL_TYPE PoolType)
 {
    if (SourceString == NULL || DestinationString == NULL)
       return STATUS_INVALID_PARAMETER;
@@ -2493,7 +2511,7 @@ RtlDuplicateUnicodeString(
       if (AddNull)
          DestMaxLength += sizeof(UNICODE_NULL);
 
-      DestinationString->Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, DestMaxLength);
+      DestinationString->Buffer = ExAllocatePool(PoolType, DestMaxLength);
       if (DestinationString->Buffer == NULL)
          return STATUS_NO_MEMORY;
 

From 2a54e31ff6d620151da5079316d3a40768a98368 Mon Sep 17 00:00:00 2001
From: Gunnar Dalsnes <hardon@online.no>
Date: Sun, 20 Jun 2004 23:37:52 +0000
Subject: [PATCH 009/356] added RtlpDuplicateUnicodeString fixed RtlFreeSid
 return type

svn path=/trunk/; revision=9784
---
 reactos/include/ntos/rtl.h | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/reactos/include/ntos/rtl.h b/reactos/include/ntos/rtl.h
index 7fb853ee770..f2ef70d74eb 100755
--- a/reactos/include/ntos/rtl.h
+++ b/reactos/include/ntos/rtl.h
@@ -1,4 +1,4 @@
-/* $Id: rtl.h,v 1.29 2004/05/31 19:51:47 gdalsnes Exp $
+/* $Id: rtl.h,v 1.30 2004/06/20 23:37:52 gdalsnes Exp $
  * 
  */
 #ifndef __DDK_RTL_H
@@ -1180,7 +1180,7 @@ RtlFreeOemString (IN POEM_STRING OemString);
 VOID STDCALL
 RtlFreeRangeList (IN PRTL_RANGE_LIST RangeList);
 
-PSID STDCALL
+PVOID STDCALL
 RtlFreeSid (PSID Sid);
 
 VOID STDCALL
@@ -2291,6 +2291,13 @@ RtlpUnicodeStringToCountedOemString(
    IN BOOLEAN AllocateDestinationString,
    IN POOL_TYPE PoolType);
 
+NTSTATUS STDCALL
+RtlpDuplicateUnicodeString(
+   INT AddNull,
+   IN PUNICODE_STRING SourceString,
+   PUNICODE_STRING DestinationString,
+   POOL_TYPE PoolType);
+   
 /* Register io functions */
 
 UCHAR

From 00eec04d6ef98c41a6e93d228bb696138251d887 Mon Sep 17 00:00:00 2001
From: Gunnar Dalsnes <hardon@online.no>
Date: Sun, 20 Jun 2004 23:39:07 +0000
Subject: [PATCH 010/356] added comment to FreeSid

svn path=/trunk/; revision=9785
---
 reactos/lib/advapi32/sec/sid.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/reactos/lib/advapi32/sec/sid.c b/reactos/lib/advapi32/sec/sid.c
index 5ddeb7ecb79..b93033464a0 100644
--- a/reactos/lib/advapi32/sec/sid.c
+++ b/reactos/lib/advapi32/sec/sid.c
@@ -1,4 +1,4 @@
-/* $Id: sid.c,v 1.12 2004/03/25 11:30:07 ekohl Exp $
+/* $Id: sid.c,v 1.13 2004/06/20 23:39:07 gdalsnes Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -117,11 +117,15 @@ EqualSid (PSID pSid1,
 
 /*
  * @implemented
+ *
+ * RETURNS
+ *  Docs says this function does NOT return a value
+ *  even thou it's defined to return a PVOID...
  */
 PVOID STDCALL
 FreeSid (PSID pSid)
 {
-  return RtlFreeSid (pSid);
+   return RtlFreeSid (pSid);
 }
 
 

From bb746199063b2efe679f8d02a92e7de42ebeb745 Mon Sep 17 00:00:00 2001
From: Gunnar Dalsnes <hardon@online.no>
Date: Sun, 20 Jun 2004 23:42:07 +0000
Subject: [PATCH 011/356] remove unused stub SetCriticalSectionSpinCount (it's
 forwarded to ntdll)

svn path=/trunk/; revision=9786
---
 reactos/lib/kernel32/misc/stubs.c | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/reactos/lib/kernel32/misc/stubs.c b/reactos/lib/kernel32/misc/stubs.c
index ffb5e290bab..f31bd6ee07e 100644
--- a/reactos/lib/kernel32/misc/stubs.c
+++ b/reactos/lib/kernel32/misc/stubs.c
@@ -1,4 +1,4 @@
-/* $Id: stubs.c,v 1.77 2004/06/13 20:04:56 navaraf Exp $
+/* $Id: stubs.c,v 1.78 2004/06/20 23:42:07 gdalsnes Exp $
  *
  * KERNEL32.DLL stubs (unimplemented functions)
  * Remove from this file, if you implement them.
@@ -1364,19 +1364,6 @@ RestoreLastError(
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 }
 
-/*
- * @unimplemented
- */
-DWORD
-STDCALL
-SetCriticalSectionSpinCount(
-    LPCRITICAL_SECTION lpCriticalSection,
-    DWORD dwSpinCount
-    )
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return 0;
-}
 
 /*
  * @unimplemented

From 16ea2c47a7e95d53ba21a3b3e2a9bab8802bf3d3 Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Mon, 21 Jun 2004 01:30:34 +0000
Subject: [PATCH 012/356] fixed scrollbar issues

svn path=/trunk/; revision=9787
---
 reactos/subsys/system/regedit/hexedit.c | 51 ++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 10 deletions(-)

diff --git a/reactos/subsys/system/regedit/hexedit.c b/reactos/subsys/system/regedit/hexedit.c
index 7138a704c03..c58cf1e5c52 100644
--- a/reactos/subsys/system/regedit/hexedit.c
+++ b/reactos/subsys/system/regedit/hexedit.c
@@ -39,6 +39,7 @@ typedef struct
   INT LineHeight;
   INT CharWidth;
   HFONT hFont;
+  BOOL SbVisible;
   
   INT LeftMargin;
   INT AddressSpacing;
@@ -123,38 +124,49 @@ HEXEDIT_Update(PHEXEDIT_DATA hed)
 {
   SCROLLINFO si;
   RECT rcClient;
+  BOOL SbVisible;
+  DWORD bufsize, cvislines;
   
   GetClientRect(hed->hWndSelf, &rcClient);
   hed->style = GetWindowLong(hed->hWndSelf, GWL_STYLE);
   
-  hed->nLines = max((hed->hBuffer ? LocalSize(hed->hBuffer) / hed->ColumnsPerLine : 1), 1);
+  bufsize = (hed->hBuffer ? LocalSize(hed->hBuffer) : 0);
+  hed->nLines = max(bufsize / hed->ColumnsPerLine, 1);
+  if(bufsize > hed->ColumnsPerLine && (bufsize % hed->ColumnsPerLine) > 0)
+  {
+    hed->nLines++;
+  }
   
   if(hed->LineHeight > 0)
   {
-    hed->nVisibleLines = rcClient.bottom / hed->LineHeight;
+    hed->nVisibleLines = cvislines = rcClient.bottom / hed->LineHeight;
     if(rcClient.bottom % hed->LineHeight)
     {
       hed->nVisibleLines++;
     }
   }
   else
-    hed->nVisibleLines = 0;
+  {
+    hed->nVisibleLines = cvislines = 0;
+  }
+  
+  SbVisible = bufsize > 0 && cvislines < hed->nLines;
+  ShowScrollBar(hed->hWndSelf, SB_VERT, SbVisible);
   
   /* update scrollbar */
   si.cbSize = sizeof(SCROLLINFO);
   si.fMask = SIF_RANGE | SIF_PAGE;
   si.nMin = 0;
-  si.nMax = hed->nLines;
-  if(hed->LineHeight > 0)
-    si.nPage = rcClient.bottom / hed->LineHeight;
-  else
-    si.nPage = 0;
+  si.nMax = ((bufsize > 0) ? hed->nLines - 1 : 0);
+  si.nPage = ((hed->LineHeight > 0) ? rcClient.bottom / hed->LineHeight : 0);
   SetScrollInfo(hed->hWndSelf, SB_VERT, &si, TRUE);
   
-  if(hed->style & WS_VISIBLE)
+  if(IsWindowVisible(hed->hWndSelf) && SbVisible != hed->SbVisible)
   {
     InvalidateRect(hed->hWndSelf, NULL, TRUE);
   }
+  
+  hed->SbVisible = SbVisible;
 }
 
 static HFONT
@@ -174,6 +186,8 @@ HEXEDIT_PaintLines(PHEXEDIT_DATA hed, HDC hDC, DWORD ScrollPos, DWORD First, DWO
   TCHAR hex[3], addr[17];
   RECT rct;
   
+  FillRect(hDC, rc, (HBRUSH)(COLOR_WINDOW + 1));
+  
   if(hed->hBuffer)
   {
     bufsize = LocalSize(hed->hBuffer);
@@ -183,9 +197,15 @@ HEXEDIT_PaintLines(PHEXEDIT_DATA hed, HDC hDC, DWORD ScrollPos, DWORD First, DWO
   {
     buf = NULL;
     bufsize = 0;
+    
+    if(ScrollPos + First == 0)
+    {
+      /* draw address */
+      _stprintf(addr, _T("%04X"), 0);
+      TextOut(hDC, hed->LeftMargin, First * hed->LineHeight, addr, 4);
+    }
   }
   
-  FillRect(hDC, rc, (HBRUSH)(COLOR_WINDOW + 1));
   if(buf)
   {
     end = buf + bufsize;
@@ -472,6 +492,7 @@ HEXEDIT_WM_NCCREATE(HWND hWnd, CREATESTRUCT *cs)
   hed->EditingField = TRUE; /* in hexdump field */
   
   SetWindowLong(hWnd, 0, (LONG)hed);
+  HEXEDIT_Update(hed);
   
   return TRUE;
 }
@@ -778,6 +799,13 @@ HEXEDIT_WM_KEYDOWN(PHEXEDIT_DATA hed, INT VkCode)
   return FALSE;
 }
 
+static LRESULT
+HEXEDIT_WM_SIZE(PHEXEDIT_DATA hed, DWORD sType, WORD NewWidth, WORD NewHeight)
+{
+  HEXEDIT_Update(hed);
+  return 0;
+}
+
 LRESULT
 WINAPI
 HexEditWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
@@ -802,6 +830,9 @@ HexEditWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
     case WM_VSCROLL:
       return HEXEDIT_WM_VSCROLL(hed, HIWORD(wParam), LOWORD(wParam));
     
+    case WM_SIZE:
+      return HEXEDIT_WM_SIZE(hed, (DWORD)wParam, LOWORD(lParam), HIWORD(lParam));
+    
     case WM_MOUSEWHEEL:
       return HEXEDIT_WM_MOUSEWHEEL(hed, ((SHORT)(wParam >> 16) < 0 ? 3 : -3), LOWORD(wParam), &MAKEPOINTS(lParam));
     

From 1fe3a2d6c307a1ec11d7728a9493360a5808e1ac Mon Sep 17 00:00:00 2001
From: Art Yerkes <art.yerkes@gmail.com>
Date: Mon, 21 Jun 2004 02:21:16 +0000
Subject: [PATCH 013/356] Switched the sense of the onlyLoopback flag in
 getNumNonLoopbackAdapters and kin.  I had the sense of needing only loopback
 adapters or all adapters inverted.

Our info ioctl still misidentifies the adapters with respect to loopback
and not.

svn path=/trunk/; revision=9788
---
 reactos/lib/iphlpapi/ifenum_reactos.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/reactos/lib/iphlpapi/ifenum_reactos.c b/reactos/lib/iphlpapi/ifenum_reactos.c
index ed5286d911d..2f3e5975d2d 100644
--- a/reactos/lib/iphlpapi/ifenum_reactos.c
+++ b/reactos/lib/iphlpapi/ifenum_reactos.c
@@ -393,7 +393,7 @@ static NTSTATUS getInterfaceInfoSet( HANDLE tcpFile,
     return STATUS_SUCCESS;
 }
 
-static DWORD getNumInterfacesInt(BOOL onlyLoopback)
+static DWORD getNumInterfacesInt(BOOL onlyNonLoopback)
 {
     DWORD numEntities, numInterfaces = 0;
     TDIEntityID *entitySet;
@@ -419,7 +419,8 @@ static DWORD getNumInterfacesInt(BOOL onlyLoopback)
 
     for( i = 0; i < numEntities; i++ ) {
         if( isInterface( &entitySet[i] ) &&
-            (!onlyLoopback || isLoopback( tcpFile, &entitySet[i] )) )
+            (!onlyNonLoopback || 
+	     (onlyNonLoopback && !isLoopback( tcpFile, &entitySet[i] ))) )
             numInterfaces++;
     }
 

From 821f740fc7ee658bf1a964d2ad192b6f98ad5bda Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Mon, 21 Jun 2004 04:11:44 +0000
Subject: [PATCH 014/356] Added Stubs for Cache Manager functions in their
 appropriate file.

svn path=/trunk/; revision=9789
---
 reactos/ntoskrnl/cc/cacheman.c | 122 ++++++++
 reactos/ntoskrnl/cc/copy.c     | 503 +++++----------------------------
 reactos/ntoskrnl/cc/fs.c       | 238 ++++++++++++++++
 reactos/ntoskrnl/cc/mdl.c      | 135 +++++++++
 reactos/ntoskrnl/cc/misc.c     | 144 ----------
 reactos/ntoskrnl/cc/pin.c      |  83 +++++-
 6 files changed, 634 insertions(+), 591 deletions(-)
 create mode 100644 reactos/ntoskrnl/cc/fs.c
 create mode 100644 reactos/ntoskrnl/cc/mdl.c

diff --git a/reactos/ntoskrnl/cc/cacheman.c b/reactos/ntoskrnl/cc/cacheman.c
index 5592f1c0409..4be4fa68e79 100644
--- a/reactos/ntoskrnl/cc/cacheman.c
+++ b/reactos/ntoskrnl/cc/cacheman.c
@@ -40,3 +40,125 @@ CcInit(VOID)
 {
   CcInitView();
 }
+
+/*
+ * @unimplemented
+ */
+LARGE_INTEGER
+STDCALL
+CcGetFlushedValidData (
+    IN PSECTION_OBJECT_POINTERS SectionObjectPointer,
+    IN BOOLEAN BcbListHeld
+    )
+{
+	UNIMPLEMENTED;
+
+	LARGE_INTEGER i; 
+	i.QuadPart = 0;
+	return i;
+}
+
+/*
+ * @unimplemented
+ */
+VOID
+STDCALL
+CcRepinBcb (
+	IN	PVOID	Bcb
+	)
+{
+	UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+VOID
+STDCALL
+CcRemapBcb (
+    IN PVOID Bcb
+    )
+{
+	UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+VOID
+STDCALL
+CcScheduleReadAhead (
+	IN	PFILE_OBJECT		FileObject,
+	IN	PLARGE_INTEGER		FileOffset,
+	IN	ULONG			Length
+	)
+{
+	UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+VOID
+STDCALL
+CcSetAdditionalCacheAttributes (
+	IN	PFILE_OBJECT	FileObject,
+	IN	BOOLEAN		DisableReadAhead,
+	IN	BOOLEAN		DisableWriteBehind
+	)
+{
+	UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+VOID
+STDCALL
+CcSetBcbOwnerPointer (
+	IN	PVOID	Bcb,
+	IN	PVOID	Owner
+	)
+{
+	UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+VOID
+STDCALL
+CcSetDirtyPageThreshold (
+	IN	PFILE_OBJECT	FileObject,
+	IN	ULONG		DirtyPageThreshold
+	)
+{
+	UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+VOID
+STDCALL
+CcSetReadAheadGranularity (
+	IN	PFILE_OBJECT	FileObject,
+	IN	ULONG		Granularity
+	)
+{
+	UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+VOID
+STDCALL
+CcUnpinRepinnedBcb (
+	IN	PVOID			Bcb,
+	IN	BOOLEAN			WriteThrough,
+	IN	PIO_STATUS_BLOCK	IoStatus
+	)
+{
+	UNIMPLEMENTED;
+}
diff --git a/reactos/ntoskrnl/cc/copy.c b/reactos/ntoskrnl/cc/copy.c
index e8d7e581993..2c53f493746 100644
--- a/reactos/ntoskrnl/cc/copy.c
+++ b/reactos/ntoskrnl/cc/copy.c
@@ -1,4 +1,4 @@
-/* $Id: copy.c,v 1.26 2004/06/20 02:10:07 vizzini Exp $
+/* $Id: copy.c,v 1.27 2004/06/21 04:11:44 ion Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -284,7 +284,6 @@ WriteCacheSegment(PCACHE_SEGMENT CacheSeg)
   return(STATUS_SUCCESS);
 }
 
-/* STUBS */
 
 /*
  * @unimplemented
@@ -300,442 +299,6 @@ CcCanIWrite (
 	return FALSE;
 }
 
-/*
- * @unimplemented
- */
-VOID
-STDCALL
-CcDeferWrite (
-	IN	PFILE_OBJECT		FileObject,
-	IN	PCC_POST_DEFERRED_WRITE	PostRoutine,
-	IN	PVOID			Context1,
-	IN	PVOID			Context2,
-	IN	ULONG			BytesToWrite,
-	IN	BOOLEAN			Retrying
-	)
-{
-	UNIMPLEMENTED;
-}
-
-/*
- * @unimplemented
- */
-BOOLEAN
-STDCALL
-CcFastCopyRead (
-	IN	PFILE_OBJECT		FileObject,
-	IN	ULONG			FileOffset,
-	IN	ULONG			Length,
-	IN	ULONG			PageCount,
-	OUT	PVOID			Buffer,
-	OUT	PIO_STATUS_BLOCK	IoStatus
-	)
-{
-	UNIMPLEMENTED;
-	return FALSE;
-}
-/*
- * @unimplemented
- */
-BOOLEAN
-STDCALL
-CcFastCopyWrite (
-	IN	PFILE_OBJECT		FileObject,
-	IN	PLARGE_INTEGER		FileOffset,
-	IN	ULONG			Length,
-	IN	PVOID			Buffer
-	)
-{
-	UNIMPLEMENTED;
-	return FALSE;
-}
-/*
- * @unimplemented
- */
-LARGE_INTEGER
-STDCALL
-CcGetDirtyPages (
-	IN	PVOID			LogHandle,
-	IN	PDIRTY_PAGE_ROUTINE	DirtyPageRoutine,
-	IN	PVOID			Context1,
-	IN	PVOID			Context2
-	)
-{
-	UNIMPLEMENTED;
-
-	LARGE_INTEGER i; 
-	i.QuadPart = 0;
-	return i;
-}
-/*
- * @unimplemented
- */
-PFILE_OBJECT
-STDCALL
-CcGetFileObjectFromBcb (
-	IN	PVOID	Bcb
-	)
-{
-	UNIMPLEMENTED;
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-VOID
-STDCALL
-CcInitializeCacheMap (
-	IN	PFILE_OBJECT			FileObject,
-	IN	PCC_FILE_SIZES			FileSizes,
-	IN	BOOLEAN				PinAccess,
-	IN	PCACHE_MANAGER_CALLBACKS	CallBacks,
-	IN	PVOID				LazyWriterContext
-	)
-{
-	UNIMPLEMENTED;
-}
-
-/*
- * @unimplemented
- */
-BOOLEAN
-STDCALL
-CcIsThereDirtyData (
-	IN	PVPB	Vpb
-	)
-{
-	UNIMPLEMENTED;
-	return FALSE;
-}
-
-
-/*
- * @unimplemented
- */
-LARGE_INTEGER
-STDCALL
-CcGetLsnForFileObject (
-	IN	PFILE_OBJECT	FileObject,
-	OUT	PLARGE_INTEGER	OldestLsn OPTIONAL
-	)
-{
-	UNIMPLEMENTED;
-
-	LARGE_INTEGER i; 
-	i.QuadPart = 0;
-	return i;
-}
-
-/*
- * @unimplemented
- */
-LARGE_INTEGER
-STDCALL
-CcGetFlushedValidData (
-    IN PSECTION_OBJECT_POINTERS SectionObjectPointer,
-    IN BOOLEAN BcbListHeld
-    )
-{
-	UNIMPLEMENTED;
-
-	LARGE_INTEGER i; 
-	i.QuadPart = 0;
-	return i;
-}
-
-
-/*
- * @unimplemented
- */
-VOID
-STDCALL
-CcMdlRead (
-	IN	PFILE_OBJECT		FileObject,
-	IN	PLARGE_INTEGER		FileOffset,
-	IN	ULONG			Length,
-	OUT	PMDL			* MdlChain,
-	OUT	PIO_STATUS_BLOCK	IoStatus
-	)
-{
-	UNIMPLEMENTED;
-}
-
-/*
- * @unimplemented
- */
-VOID
-STDCALL
-CcMdlWriteComplete (
-	IN	PFILE_OBJECT		FileObject,
-	IN	PLARGE_INTEGER		FileOffset,
-	IN	PMDL			MdlChain
-	)
-{
-	UNIMPLEMENTED;
-}
-
-/*
- * @unimplemented
- */
-VOID
-STDCALL
-CcMdlWriteAbort (
-    IN PFILE_OBJECT FileObject,
-    IN PMDL MdlChain
-    )
-{
-	UNIMPLEMENTED;
-}
-
-
-/*
- * @unimplemented
- */
-BOOLEAN
-STDCALL
-CcPinMappedData (
-	IN	PFILE_OBJECT		FileObject,
-	IN	PLARGE_INTEGER		FileOffset,
-	IN	ULONG			Length,
-	IN	BOOLEAN			Wait,
-	OUT	PVOID			* Bcb
-	)
-{
-	UNIMPLEMENTED;
-	return FALSE;
-}
-
-/*
- * @unimplemented
- */
-BOOLEAN
-STDCALL
-CcPinRead (
-	IN	PFILE_OBJECT		FileObject,
-	IN	PLARGE_INTEGER		FileOffset,
-	IN	ULONG			Length,
-	IN	BOOLEAN			Wait,
-	OUT	PVOID			* Bcb,
-	OUT	PVOID			* Buffer
-	)
-{
-	UNIMPLEMENTED;
-	return FALSE;
-}
-
-/*
- * @unimplemented
- */
-VOID
-STDCALL
-CcPrepareMdlWrite (
-	IN	PFILE_OBJECT		FileObject,
-	IN	PLARGE_INTEGER		FileOffset,
-	IN	ULONG			Length,
-	OUT	PMDL			* MdlChain,
-	OUT	PIO_STATUS_BLOCK	IoStatus
-	)
-{
-	UNIMPLEMENTED;
-}
-
-/*
- * @unimplemented
- */
-BOOLEAN
-STDCALL
-CcPreparePinWrite (
-	IN	PFILE_OBJECT		FileObject,
-	IN	PLARGE_INTEGER		FileOffset,
-	IN	ULONG			Length,
-	IN	BOOLEAN			Zero,
-	IN	BOOLEAN			Wait,
-	OUT	PVOID			* Bcb,
-	OUT	PVOID			* Buffer
-	)
-{
-	UNIMPLEMENTED;
-	return FALSE;
-}
-
-/*
- * @unimplemented
- */
-BOOLEAN
-STDCALL
-CcPurgeCacheSection (
-	IN	PSECTION_OBJECT_POINTERS	SectionObjectPointer,
-	IN	PLARGE_INTEGER			FileOffset OPTIONAL,
-	IN	ULONG				Length,
-	IN	BOOLEAN				UninitializeCacheMaps
-	)
-{
-	UNIMPLEMENTED;
-	return FALSE;
-}
-
-/*
- * @unimplemented
- */
-VOID
-STDCALL
-CcRepinBcb (
-	IN	PVOID	Bcb
-	)
-{
-	UNIMPLEMENTED;
-}
-
-/*
- * @unimplemented
- */
-VOID
-STDCALL
-CcRemapBcb (
-    IN PVOID Bcb
-    )
-{
-	UNIMPLEMENTED;
-}
-
-/*
- * @unimplemented
- */
-VOID
-STDCALL
-CcScheduleReadAhead (
-	IN	PFILE_OBJECT		FileObject,
-	IN	PLARGE_INTEGER		FileOffset,
-	IN	ULONG			Length
-	)
-{
-	UNIMPLEMENTED;
-}
-
-/*
- * @unimplemented
- */
-VOID
-STDCALL
-CcSetAdditionalCacheAttributes (
-	IN	PFILE_OBJECT	FileObject,
-	IN	BOOLEAN		DisableReadAhead,
-	IN	BOOLEAN		DisableWriteBehind
-	)
-{
-	UNIMPLEMENTED;
-}
-
-/*
- * @unimplemented
- */
-VOID
-STDCALL
-CcSetBcbOwnerPointer (
-	IN	PVOID	Bcb,
-	IN	PVOID	Owner
-	)
-{
-	UNIMPLEMENTED;
-}
-
-/*
- * @unimplemented
- */
-VOID
-STDCALL
-CcSetDirtyPageThreshold (
-	IN	PFILE_OBJECT	FileObject,
-	IN	ULONG		DirtyPageThreshold
-	)
-{
-	UNIMPLEMENTED;
-}
-
-/*
- * @unimplemented
- */
-VOID
-STDCALL
-CcSetLogHandleForFile (
-	IN	PFILE_OBJECT	FileObject,
-	IN	PVOID		LogHandle,
-	IN	PFLUSH_TO_LSN	FlushToLsnRoutine
-	)
-{
-	UNIMPLEMENTED;
-}
-
-/*
- * @unimplemented
- */
-VOID
-STDCALL
-CcSetReadAheadGranularity (
-	IN	PFILE_OBJECT	FileObject,
-	IN	ULONG		Granularity
-	)
-{
-	UNIMPLEMENTED;
-}
-
-/*
- * @unimplemented
- */
-BOOLEAN
-STDCALL
-CcUninitializeCacheMap (
-	IN	PFILE_OBJECT			FileObject,
-	IN	PLARGE_INTEGER			TruncateSize OPTIONAL,
-	IN	PCACHE_UNINITIALIZE_EVENT	UninitializeCompleteEvent OPTIONAL
-	)
-{
-	UNIMPLEMENTED;
-	return FALSE;
-}
-
-/*
- * @unimplemented
- */
-VOID
-STDCALL
-CcUnpinDataForThread (
-	IN	PVOID			Bcb,
-	IN	ERESOURCE_THREAD	ResourceThreadId
-	)
-{
-	UNIMPLEMENTED;
-}
-
-/*
- * @unimplemented
- */
-VOID
-STDCALL
-CcUnpinRepinnedBcb (
-	IN	PVOID			Bcb,
-	IN	BOOLEAN			WriteThrough,
-	IN	PIO_STATUS_BLOCK	IoStatus
-	)
-{
-	UNIMPLEMENTED;
-}
-
-/*
- * @unimplemented
- */
-NTSTATUS
-STDCALL
-CcWaitForCurrentLazyWriterActivity (
-    VOID
-    )
-{
-	UNIMPLEMENTED;
-	return STATUS_NOT_IMPLEMENTED;
-}
-
-/* STUBS END!!! */
 
 /*
  * @implemented
@@ -978,6 +541,69 @@ CcCopyWrite (IN PFILE_OBJECT FileObject,
    return(TRUE);
 }
 
+/*
+ * @unimplemented
+ */
+VOID
+STDCALL
+CcDeferWrite (
+	IN	PFILE_OBJECT		FileObject,
+	IN	PCC_POST_DEFERRED_WRITE	PostRoutine,
+	IN	PVOID			Context1,
+	IN	PVOID			Context2,
+	IN	ULONG			BytesToWrite,
+	IN	BOOLEAN			Retrying
+	)
+{
+	UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+BOOLEAN
+STDCALL
+CcFastCopyRead (
+	IN	PFILE_OBJECT		FileObject,
+	IN	ULONG			FileOffset,
+	IN	ULONG			Length,
+	IN	ULONG			PageCount,
+	OUT	PVOID			Buffer,
+	OUT	PIO_STATUS_BLOCK	IoStatus
+	)
+{
+	UNIMPLEMENTED;
+	return FALSE;
+}
+/*
+ * @unimplemented
+ */
+BOOLEAN
+STDCALL
+CcFastCopyWrite (
+	IN	PFILE_OBJECT		FileObject,
+	IN	PLARGE_INTEGER		FileOffset,
+	IN	ULONG			Length,
+	IN	PVOID			Buffer
+	)
+{
+	UNIMPLEMENTED;
+	return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+CcWaitForCurrentLazyWriterActivity (
+    VOID
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
 /*
  * @implemented
  */
@@ -1139,4 +765,3 @@ CcZeroData (IN PFILE_OBJECT     FileObject,
     }
   return(TRUE);
 }
-
diff --git a/reactos/ntoskrnl/cc/fs.c b/reactos/ntoskrnl/cc/fs.c
new file mode 100644
index 00000000000..8e8b3d5a46c
--- /dev/null
+++ b/reactos/ntoskrnl/cc/fs.c
@@ -0,0 +1,238 @@
+/* COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS kernel
+ * FILE:            ntoskrnl/cc/fs.c
+ * PURPOSE:         Implements cache managers functions useful for File Systems
+ * PROGRAMMER:      Alex Ionescu
+ * UPDATE HISTORY:
+ *                  Created 20/06/04
+ */
+
+/* INCLUDES ******************************************************************/
+
+#include <ddk/ntddk.h>
+#include <ddk/ntifs.h>
+#include <internal/mm.h>
+#include <internal/cc.h>
+#include <internal/pool.h>
+#include <internal/io.h>
+#include <ntos/minmax.h>
+
+#define NDEBUG
+#include <internal/debug.h>
+
+/* GLOBALS   *****************************************************************/
+
+extern FAST_MUTEX ViewLock;
+extern ULONG DirtyPageCount;
+
+NTSTATUS CcRosInternalFreeCacheSegment(PCACHE_SEGMENT CacheSeg);
+
+/* FUNCTIONS *****************************************************************/
+
+/*
+ * @unimplemented
+ */
+LARGE_INTEGER
+STDCALL
+CcGetDirtyPages (
+	IN	PVOID			LogHandle,
+	IN	PDIRTY_PAGE_ROUTINE	DirtyPageRoutine,
+	IN	PVOID			Context1,
+	IN	PVOID			Context2
+	)
+{
+	UNIMPLEMENTED;
+
+	LARGE_INTEGER i; 
+	i.QuadPart = 0;
+	return i;
+}
+
+/*
+ * @unimplemented
+ */
+PFILE_OBJECT
+STDCALL
+CcGetFileObjectFromBcb (
+	IN	PVOID	Bcb
+	)
+{
+	UNIMPLEMENTED;
+	return 0;
+}
+
+/*
+ * @unimplemented
+ */
+LARGE_INTEGER
+STDCALL
+CcGetLsnForFileObject (
+	IN	PFILE_OBJECT	FileObject,
+	OUT	PLARGE_INTEGER	OldestLsn OPTIONAL
+	)
+{
+	UNIMPLEMENTED;
+
+	LARGE_INTEGER i; 
+	i.QuadPart = 0;
+	return i;
+}
+
+/*
+ * @unimplemented
+ */
+VOID
+STDCALL
+CcInitializeCacheMap (
+	IN	PFILE_OBJECT			FileObject,
+	IN	PCC_FILE_SIZES			FileSizes,
+	IN	BOOLEAN				PinAccess,
+	IN	PCACHE_MANAGER_CALLBACKS	CallBacks,
+	IN	PVOID				LazyWriterContext
+	)
+{
+	UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+BOOLEAN
+STDCALL
+CcIsThereDirtyData (
+	IN	PVPB	Vpb
+	)
+{
+	UNIMPLEMENTED;
+	return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+BOOLEAN
+STDCALL
+CcPurgeCacheSection (
+	IN	PSECTION_OBJECT_POINTERS	SectionObjectPointer,
+	IN	PLARGE_INTEGER			FileOffset OPTIONAL,
+	IN	ULONG				Length,
+	IN	BOOLEAN				UninitializeCacheMaps
+	)
+{
+	UNIMPLEMENTED;
+	return FALSE;
+}
+
+
+/*
+ * @implemented
+ */
+VOID STDCALL
+CcSetFileSizes (IN PFILE_OBJECT FileObject,
+		IN PCC_FILE_SIZES FileSizes)
+{
+  KIRQL oldirql;
+  PBCB Bcb;
+  PLIST_ENTRY current_entry;
+  PCACHE_SEGMENT current;
+  LIST_ENTRY FreeListHead;
+  NTSTATUS Status;
+
+  DPRINT("CcSetFileSizes(FileObject %x, FileSizes %x)\n", 
+	 FileObject, FileSizes);
+  DPRINT("AllocationSize %d, FileSize %d, ValidDataLength %d\n",
+         (ULONG)FileSizes->AllocationSize.QuadPart,
+         (ULONG)FileSizes->FileSize.QuadPart,
+         (ULONG)FileSizes->ValidDataLength.QuadPart);
+
+  Bcb = FileObject->SectionObjectPointer->SharedCacheMap;
+  assert(Bcb);
+ 
+  if (FileSizes->AllocationSize.QuadPart < Bcb->AllocationSize.QuadPart)
+  {
+     InitializeListHead(&FreeListHead);
+     ExAcquireFastMutex(&ViewLock);
+     KeAcquireSpinLock(&Bcb->BcbLock, &oldirql);
+
+     current_entry = Bcb->BcbSegmentListHead.Flink;
+     while (current_entry != &Bcb->BcbSegmentListHead)
+     {
+	current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry);
+	current_entry = current_entry->Flink;
+	if (current->FileOffset > FileSizes->AllocationSize.QuadPart)
+	{
+           if (current->ReferenceCount == 0 || (current->ReferenceCount == 1 && current->Dirty))
+	   {
+              RemoveEntryList(&current->BcbSegmentListEntry);
+              RemoveEntryList(&current->CacheSegmentListEntry);
+              RemoveEntryList(&current->CacheSegmentLRUListEntry);
+              if (current->Dirty)
+              {
+                 RemoveEntryList(&current->DirtySegmentListEntry);
+                 DirtyPageCount -= Bcb->CacheSegmentSize / PAGE_SIZE;
+              }
+	      InsertHeadList(&FreeListHead, &current->BcbSegmentListEntry);
+	   }
+	   else
+	   {
+	      DPRINT1("Anyone has referenced a cache segment behind the new size.\n");
+	      KEBUGCHECK(0);
+	   }
+	}
+     }
+     
+     Bcb->AllocationSize = FileSizes->AllocationSize;
+     Bcb->FileSize = FileSizes->FileSize;
+     KeReleaseSpinLock(&Bcb->BcbLock, oldirql);
+     ExReleaseFastMutex(&ViewLock);
+
+     current_entry = FreeListHead.Flink;
+     while(current_entry != &FreeListHead)
+     {
+        current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry);
+        current_entry = current_entry->Flink;
+        Status = CcRosInternalFreeCacheSegment(current);
+        if (!NT_SUCCESS(Status))
+        {
+           DPRINT1("CcRosInternalFreeCacheSegment failed, status = %x\n");
+	   KEBUGCHECK(0);
+        }
+     }
+  }
+  else
+  {
+     KeAcquireSpinLock(&Bcb->BcbLock, &oldirql);
+     Bcb->AllocationSize = FileSizes->AllocationSize;
+     Bcb->FileSize = FileSizes->FileSize;
+     KeReleaseSpinLock(&Bcb->BcbLock, oldirql);
+  }
+}
+
+/*
+ * @unimplemented
+ */
+VOID
+STDCALL
+CcSetLogHandleForFile (
+	IN	PFILE_OBJECT	FileObject,
+	IN	PVOID		LogHandle,
+	IN	PFLUSH_TO_LSN	FlushToLsnRoutine
+	)
+{
+	UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+BOOLEAN
+STDCALL
+CcUninitializeCacheMap (
+	IN	PFILE_OBJECT			FileObject,
+	IN	PLARGE_INTEGER			TruncateSize OPTIONAL,
+	IN	PCACHE_UNINITIALIZE_EVENT	UninitializeCompleteEvent OPTIONAL
+	)
+{
+	UNIMPLEMENTED;
+	return FALSE;
+}
diff --git a/reactos/ntoskrnl/cc/mdl.c b/reactos/ntoskrnl/cc/mdl.c
new file mode 100644
index 00000000000..80d9550abc1
--- /dev/null
+++ b/reactos/ntoskrnl/cc/mdl.c
@@ -0,0 +1,135 @@
+/* COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS kernel
+ * FILE:            ntoskrnl/cc/fs.c
+ * PURPOSE:         Implements MDL Cache Manager Functions
+ * PROGRAMMER:      Alex Ionescu
+ * UPDATE HISTORY:
+ *                  Created 20/06/04
+ */
+
+/* INCLUDES ******************************************************************/
+
+#include <ddk/ntddk.h>
+#include <ddk/ntifs.h>
+#include <internal/mm.h>
+#include <internal/cc.h>
+#include <internal/pool.h>
+#include <internal/io.h>
+#include <ntos/minmax.h>
+
+#define NDEBUG
+#include <internal/debug.h>
+
+/* FUNCTIONS *****************************************************************/
+
+/*
+ * @unimplemented
+ */
+VOID
+STDCALL
+CcMdlRead (
+	IN	PFILE_OBJECT		FileObject,
+	IN	PLARGE_INTEGER		FileOffset,
+	IN	ULONG			Length,
+	OUT	PMDL			* MdlChain,
+	OUT	PIO_STATUS_BLOCK	IoStatus
+	)
+{
+	UNIMPLEMENTED;
+}
+
+/**********************************************************************
+ * NAME							INTERNAL
+ * 	CcMdlReadCompleteDev@8
+ *
+ * DESCRIPTION
+ *
+ * ARGUMENTS
+ *	MdlChain
+ *	DeviceObject
+ *	
+ * RETURN VALUE
+ * 	None.
+ *
+ * NOTE
+ * 	Used by CcMdlReadComplete@8 and FsRtl
+ *
+ */
+VOID STDCALL
+CcMdlReadCompleteDev (IN	PMDL		MdlChain,
+		      IN	PDEVICE_OBJECT	DeviceObject)
+{
+  UNIMPLEMENTED;
+}
+
+
+/**********************************************************************
+ * NAME							EXPORTED
+ * 	CcMdlReadComplete@8
+ *
+ * DESCRIPTION
+ *
+ * ARGUMENTS
+ *
+ * RETURN VALUE
+ * 	None.
+ *
+ * NOTE
+ * 	From Bo Branten's ntifs.h v13.
+ *
+ * @unimplemented
+ */
+VOID STDCALL
+CcMdlReadComplete (IN	PFILE_OBJECT	FileObject,
+		   IN	PMDL		MdlChain)
+{
+   PDEVICE_OBJECT	DeviceObject = NULL;
+   
+   DeviceObject = IoGetRelatedDeviceObject (FileObject);
+   /* FIXME: try fast I/O first */
+   CcMdlReadCompleteDev (MdlChain,
+			 DeviceObject);
+}
+
+/*
+ * @unimplemented
+ */
+VOID
+STDCALL
+CcMdlWriteComplete (
+	IN	PFILE_OBJECT		FileObject,
+	IN	PLARGE_INTEGER		FileOffset,
+	IN	PMDL			MdlChain
+	)
+{
+	UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+VOID
+STDCALL
+CcMdlWriteAbort (
+    IN PFILE_OBJECT FileObject,
+    IN PMDL MdlChain
+    )
+{
+	UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+VOID
+STDCALL
+CcPrepareMdlWrite (
+	IN	PFILE_OBJECT		FileObject,
+	IN	PLARGE_INTEGER		FileOffset,
+	IN	ULONG			Length,
+	OUT	PMDL			* MdlChain,
+	OUT	PIO_STATUS_BLOCK	IoStatus
+	)
+{
+	UNIMPLEMENTED;
+}
diff --git a/reactos/ntoskrnl/cc/misc.c b/reactos/ntoskrnl/cc/misc.c
index 53e3e68ac40..44af3c98930 100644
--- a/reactos/ntoskrnl/cc/misc.c
+++ b/reactos/ntoskrnl/cc/misc.c
@@ -16,147 +16,3 @@
 #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S))
 #define ROUND_DOWN(N, S) (((N) % (S)) ? ROUND_UP(N, S) - S : N)
 
-extern FAST_MUTEX ViewLock;
-extern ULONG DirtyPageCount;
-
-NTSTATUS CcRosInternalFreeCacheSegment(PCACHE_SEGMENT CacheSeg);
-
-/* FUNCTIONS *****************************************************************/
-
-/**********************************************************************
- * NAME							INTERNAL
- * 	CcMdlReadCompleteDev@8
- *
- * DESCRIPTION
- *
- * ARGUMENTS
- *	MdlChain
- *	DeviceObject
- *	
- * RETURN VALUE
- * 	None.
- *
- * NOTE
- * 	Used by CcMdlReadComplete@8 and FsRtl
- *
- */
-VOID STDCALL
-CcMdlReadCompleteDev (IN	PMDL		MdlChain,
-		      IN	PDEVICE_OBJECT	DeviceObject)
-{
-  UNIMPLEMENTED;
-}
-
-
-/**********************************************************************
- * NAME							EXPORTED
- * 	CcMdlReadComplete@8
- *
- * DESCRIPTION
- *
- * ARGUMENTS
- *
- * RETURN VALUE
- * 	None.
- *
- * NOTE
- * 	From Bo Branten's ntifs.h v13.
- *
- * @unimplemented
- */
-VOID STDCALL
-CcMdlReadComplete (IN	PFILE_OBJECT	FileObject,
-		   IN	PMDL		MdlChain)
-{
-   PDEVICE_OBJECT	DeviceObject = NULL;
-   
-   DeviceObject = IoGetRelatedDeviceObject (FileObject);
-   /* FIXME: try fast I/O first */
-   CcMdlReadCompleteDev (MdlChain,
-			 DeviceObject);
-}
-
-/*
- * @implemented
- */
-VOID STDCALL
-CcSetFileSizes (IN PFILE_OBJECT FileObject,
-		IN PCC_FILE_SIZES FileSizes)
-{
-  KIRQL oldirql;
-  PBCB Bcb;
-  PLIST_ENTRY current_entry;
-  PCACHE_SEGMENT current;
-  LIST_ENTRY FreeListHead;
-  NTSTATUS Status;
-
-  DPRINT("CcSetFileSizes(FileObject %x, FileSizes %x)\n", 
-	 FileObject, FileSizes);
-  DPRINT("AllocationSize %d, FileSize %d, ValidDataLength %d\n",
-         (ULONG)FileSizes->AllocationSize.QuadPart,
-         (ULONG)FileSizes->FileSize.QuadPart,
-         (ULONG)FileSizes->ValidDataLength.QuadPart);
-
-  Bcb = FileObject->SectionObjectPointer->SharedCacheMap;
-  assert(Bcb);
- 
-  if (FileSizes->AllocationSize.QuadPart < Bcb->AllocationSize.QuadPart)
-  {
-     InitializeListHead(&FreeListHead);
-     ExAcquireFastMutex(&ViewLock);
-     KeAcquireSpinLock(&Bcb->BcbLock, &oldirql);
-
-     current_entry = Bcb->BcbSegmentListHead.Flink;
-     while (current_entry != &Bcb->BcbSegmentListHead)
-     {
-	current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry);
-	current_entry = current_entry->Flink;
-	if (current->FileOffset > FileSizes->AllocationSize.QuadPart)
-	{
-           if (current->ReferenceCount == 0 || (current->ReferenceCount == 1 && current->Dirty))
-	   {
-              RemoveEntryList(&current->BcbSegmentListEntry);
-              RemoveEntryList(&current->CacheSegmentListEntry);
-              RemoveEntryList(&current->CacheSegmentLRUListEntry);
-              if (current->Dirty)
-              {
-                 RemoveEntryList(&current->DirtySegmentListEntry);
-                 DirtyPageCount -= Bcb->CacheSegmentSize / PAGE_SIZE;
-              }
-	      InsertHeadList(&FreeListHead, &current->BcbSegmentListEntry);
-	   }
-	   else
-	   {
-	      DPRINT1("Anyone has referenced a cache segment behind the new size.\n");
-	      KEBUGCHECK(0);
-	   }
-	}
-     }
-     
-     Bcb->AllocationSize = FileSizes->AllocationSize;
-     Bcb->FileSize = FileSizes->FileSize;
-     KeReleaseSpinLock(&Bcb->BcbLock, oldirql);
-     ExReleaseFastMutex(&ViewLock);
-
-     current_entry = FreeListHead.Flink;
-     while(current_entry != &FreeListHead)
-     {
-        current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry);
-        current_entry = current_entry->Flink;
-        Status = CcRosInternalFreeCacheSegment(current);
-        if (!NT_SUCCESS(Status))
-        {
-           DPRINT1("CcRosInternalFreeCacheSegment failed, status = %x\n");
-	   KEBUGCHECK(0);
-        }
-     }
-  }
-  else
-  {
-     KeAcquireSpinLock(&Bcb->BcbLock, &oldirql);
-     Bcb->AllocationSize = FileSizes->AllocationSize;
-     Bcb->FileSize = FileSizes->FileSize;
-     KeReleaseSpinLock(&Bcb->BcbLock, oldirql);
-  }
-}
-
diff --git a/reactos/ntoskrnl/cc/pin.c b/reactos/ntoskrnl/cc/pin.c
index 7fc04460ba7..6f33c8ae63f 100644
--- a/reactos/ntoskrnl/cc/pin.c
+++ b/reactos/ntoskrnl/cc/pin.c
@@ -1,4 +1,4 @@
-/* $Id: pin.c,v 1.14 2003/12/30 18:52:03 fireball Exp $
+/* $Id: pin.c,v 1.15 2004/06/21 04:11:44 ion Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -113,15 +113,57 @@ CcMapData (IN PFILE_OBJECT FileObject,
 }
 
 /*
- * @implemented
+ * @unimplemented
  */
-VOID STDCALL
-CcUnpinData (IN PVOID Bcb)
+BOOLEAN
+STDCALL
+CcPinMappedData (
+	IN	PFILE_OBJECT		FileObject,
+	IN	PLARGE_INTEGER		FileOffset,
+	IN	ULONG			Length,
+	IN	BOOLEAN			Wait,
+	OUT	PVOID			* Bcb
+	)
 {
-  PINTERNAL_BCB iBcb = Bcb;
-  CcRosReleaseCacheSegment(iBcb->CacheSegment->Bcb, iBcb->CacheSegment, TRUE, 
-			   iBcb->Dirty, FALSE);
-  ExFreeToNPagedLookasideList(&iBcbLookasideList, iBcb);
+	UNIMPLEMENTED;
+	return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+BOOLEAN
+STDCALL
+CcPinRead (
+	IN	PFILE_OBJECT		FileObject,
+	IN	PLARGE_INTEGER		FileOffset,
+	IN	ULONG			Length,
+	IN	BOOLEAN			Wait,
+	OUT	PVOID			* Bcb,
+	OUT	PVOID			* Buffer
+	)
+{
+	UNIMPLEMENTED;
+	return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+BOOLEAN
+STDCALL
+CcPreparePinWrite (
+	IN	PFILE_OBJECT		FileObject,
+	IN	PLARGE_INTEGER		FileOffset,
+	IN	ULONG			Length,
+	IN	BOOLEAN			Zero,
+	IN	BOOLEAN			Wait,
+	OUT	PVOID			* Bcb,
+	OUT	PVOID			* Buffer
+	)
+{
+	UNIMPLEMENTED;
+	return FALSE;
 }
 
 /*
@@ -135,3 +177,28 @@ CcSetDirtyPinnedData (IN PVOID Bcb,
    iBcb->Dirty = TRUE;
 }
 
+
+/*
+ * @implemented
+ */
+VOID STDCALL
+CcUnpinData (IN PVOID Bcb)
+{
+  PINTERNAL_BCB iBcb = Bcb;
+  CcRosReleaseCacheSegment(iBcb->CacheSegment->Bcb, iBcb->CacheSegment, TRUE, 
+			   iBcb->Dirty, FALSE);
+  ExFreeToNPagedLookasideList(&iBcbLookasideList, iBcb);
+}
+
+/*
+ * @unimplemented
+ */
+VOID
+STDCALL
+CcUnpinDataForThread (
+	IN	PVOID			Bcb,
+	IN	ERESOURCE_THREAD	ResourceThreadId
+	)
+{
+	UNIMPLEMENTED;
+}

From c8fb75517f3cd127c29ba69f5c950fc081cb69a1 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Mon, 21 Jun 2004 04:12:59 +0000
Subject: [PATCH 015/356] Added two new Cache Manager files added for the
 stubs.

svn path=/trunk/; revision=9790
---
 reactos/ntoskrnl/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/reactos/ntoskrnl/Makefile b/reactos/ntoskrnl/Makefile
index 5223a7c1dc5..0af7d653557 100644
--- a/reactos/ntoskrnl/Makefile
+++ b/reactos/ntoskrnl/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.123 2004/06/05 12:06:41 hbirr Exp $
+# $Id: Makefile,v 1.124 2004/06/21 04:12:59 ion Exp $
 #
 # ReactOS Operating System
 #
@@ -341,7 +341,9 @@ OBJECTS_PO = \
 OBJECTS_CC = \
 	cc/cacheman.o \
 	cc/copy.o \
+	cc/fs.o \
 	cc/pin.o \
+	cc/mdl.o \
 	cc/misc.o \
 	cc/view.o
 

From 1f85769d05228fbbd434be896b79bb774517bae1 Mon Sep 17 00:00:00 2001
From: Martin Fuchs <fuchs.martin@gmail.com>
Date: Mon, 21 Jun 2004 06:46:44 +0000
Subject: [PATCH 016/356] capture mode while scrolling start menus

svn path=/trunk/; revision=9791
---
 .../subsys/system/explorer/taskbar/startmenu.cpp    | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/reactos/subsys/system/explorer/taskbar/startmenu.cpp b/reactos/subsys/system/explorer/taskbar/startmenu.cpp
index a96e0c33626..f4a9da2de3a 100644
--- a/reactos/subsys/system/explorer/taskbar/startmenu.cpp
+++ b/reactos/subsys/system/explorer/taskbar/startmenu.cpp
@@ -321,6 +321,13 @@ LRESULT StartMenu::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam)
 
 	  case WM_CANCELMODE:
 		CloseStartMenu();
+
+#ifdef _LIGHT_STARTMENU
+		if (_scroll_mode != SCROLL_NOT) {
+			ReleaseCapture();
+			KillTimer(_hwnd, 0);
+		}
+#endif
 		break;
 
 #ifdef _LIGHT_STARTMENU
@@ -342,11 +349,13 @@ LRESULT StartMenu::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam)
 					scroll_mode = SCROLL_DOWN;
 
 				if (scroll_mode != _scroll_mode) {
-					if (scroll_mode == SCROLL_NOT)
+					if (scroll_mode == SCROLL_NOT) {
+						ReleaseCapture();
 						KillTimer(_hwnd, 0);
-					else {
+					} else {
 						CloseSubmenus();
 						SetTimer(_hwnd, 0, 150, NULL);	// 150 ms scroll interval
+						SetCapture(_hwnd);
 					}
 
 					_scroll_mode = scroll_mode;

From aed08f7da36d647981a4ade1e861c38081d12b79 Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Mon, 21 Jun 2004 07:48:11 +0000
Subject: [PATCH 017/356] moved several strings to the application resources

svn path=/trunk/; revision=9792
---
 reactos/subsys/system/regedit/En.rc      | 21 +++++++++++
 reactos/subsys/system/regedit/about.c    |  4 +-
 reactos/subsys/system/regedit/childwnd.c | 10 ++++-
 reactos/subsys/system/regedit/edit.c     | 16 ++++++--
 reactos/subsys/system/regedit/framewnd.c | 48 +++++++++++++++++++++---
 reactos/subsys/system/regedit/listview.c | 44 ++++++++++++++--------
 reactos/subsys/system/regedit/resource.h | 14 +++++++
 reactos/subsys/system/regedit/treeview.c |  2 +-
 8 files changed, 131 insertions(+), 28 deletions(-)

diff --git a/reactos/subsys/system/regedit/En.rc b/reactos/subsys/system/regedit/En.rc
index 4d697ea7c55..4ec1d5ae346 100644
--- a/reactos/subsys/system/regedit/En.rc
+++ b/reactos/subsys/system/regedit/En.rc
@@ -260,6 +260,27 @@ BEGIN
     IDS_MULTI_SZ_EMPTY_STRING "Data of type REG_MULTI_SZ cannot contain empty strings.\nThe empty strings have been removed from the list."
 END
 
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_BINARY_EMPTY	    "(zero-length binary value)"
+    IDS_DEFAULT_VALUE_NAME  "(Default)"
+    IDS_VALUE_NOT_SET       "(value not set)"
+    IDS_UNKNOWN_TYPE        "Unknown type: (0x%lx)"
+    IDS_MY_COMPUTER         "My Computer"
+    IDS_IMPORT_REG_FILE     "Import Registry File"
+    IDS_EXPORT_REG_FILE     "Export Registry File"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_FLT_REGFILES        "Registration Files"
+    IDS_FLT_REGFILES_FLT    "*.reg"
+    IDS_FLT_REGEDIT4        "Win9x/NT4 Registration Files (REGEDIT4)"
+    IDS_FLT_REGEDIT4_FLT    "*.reg"
+    IDS_FLT_ALLFILES        "All Files (*.*)"
+    IDS_FLT_ALLFILES_FLT    "*.*"
+END
+
 /*****************************************************************/
 
 
diff --git a/reactos/subsys/system/regedit/about.c b/reactos/subsys/system/regedit/about.c
index 67a8d1995a1..6261e6f8272 100644
--- a/reactos/subsys/system/regedit/about.c
+++ b/reactos/subsys/system/regedit/about.c
@@ -31,5 +31,7 @@
 
 void ShowAboutBox(HWND hWnd)
 {
-    ShellAbout(hWnd, _T("Registry Explorer"), _T(""), LoadIcon(hInst, MAKEINTRESOURCE(IDI_REGEDIT)));
+    TCHAR AppStr[255];
+    LoadString(hInst, IDS_APP_TITLE, AppStr, sizeof(AppStr)/sizeof(TCHAR));
+    ShellAbout(hWnd, AppStr, _T(""), LoadIcon(hInst, MAKEINTRESOURCE(IDI_REGEDIT)));
 }
diff --git a/reactos/subsys/system/regedit/childwnd.c b/reactos/subsys/system/regedit/childwnd.c
index 96619396658..1306c0b9dc6 100644
--- a/reactos/subsys/system/regedit/childwnd.c
+++ b/reactos/subsys/system/regedit/childwnd.c
@@ -134,15 +134,21 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
 
     switch (message) {
     case WM_CREATE:
-        g_pChildWnd = pChildWnd = HeapAlloc(GetProcessHeap(), 0, sizeof(ChildWnd));
+    {
+        TCHAR buffer[MAX_PATH];
+        /* load "My Computer" string */
+        LoadString(hInst, IDS_MY_COMPUTER, buffer, sizeof(buffer)/sizeof(TCHAR));
+        
+	g_pChildWnd = pChildWnd = HeapAlloc(GetProcessHeap(), 0, sizeof(ChildWnd));
         if (!pChildWnd) return 0;
-        _tcsncpy(pChildWnd->szPath, _T("My Computer"), MAX_PATH);
+        _tcsncpy(pChildWnd->szPath, buffer, MAX_PATH);
         pChildWnd->nSplitPos = 250;
         pChildWnd->hWnd = hWnd;
         pChildWnd->hTreeWnd = CreateTreeView(hWnd, pChildWnd->szPath, TREE_WINDOW);
         pChildWnd->hListWnd = CreateListView(hWnd, LIST_WINDOW/*, pChildWnd->szPath*/);
         SetFocus(pChildWnd->hTreeWnd);
         break;
+    }
     case WM_COMMAND:
         if (!_CmdWndProc(hWnd, message, wParam, lParam)) {
             goto def;
diff --git a/reactos/subsys/system/regedit/edit.c b/reactos/subsys/system/regedit/edit.c
index eb8c6544966..0be559ef4c0 100644
--- a/reactos/subsys/system/regedit/edit.c
+++ b/reactos/subsys/system/regedit/edit.c
@@ -111,7 +111,9 @@ INT_PTR CALLBACK modify_string_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L
         }
         else
         {
-          SetDlgItemText(hwndDlg, IDC_VALUE_NAME, _T("(Default)"));
+          TCHAR buffer[255];
+	  LoadString(hInst, IDS_DEFAULT_VALUE_NAME, buffer, sizeof(buffer)/sizeof(TCHAR));
+	  SetDlgItemText(hwndDlg, IDC_VALUE_NAME, buffer);
         }
         SetDlgItemText(hwndDlg, IDC_VALUE_DATA, stringValueData);
         SetFocus(GetDlgItem(hwndDlg, IDC_VALUE_DATA));
@@ -174,7 +176,9 @@ INT_PTR CALLBACK modify_multi_string_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wPa
         }
         else
         {
-          SetDlgItemText(hwndDlg, IDC_VALUE_NAME, _T("(Default)"));
+          TCHAR buffer[255];
+	  LoadString(hInst, IDS_DEFAULT_VALUE_NAME, buffer, sizeof(buffer)/sizeof(TCHAR));
+	  SetDlgItemText(hwndDlg, IDC_VALUE_NAME, buffer);
         }
         SetDlgItemText(hwndDlg, IDC_VALUE_DATA, stringValueData);
         SetFocus(GetDlgItem(hwndDlg, IDC_VALUE_DATA));
@@ -291,7 +295,9 @@ INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP
         }
         else
         {
-            SetDlgItemText(hwndDlg, IDC_VALUE_NAME, _T("(Default)"));
+	    TCHAR buffer[255];
+	    LoadString(hInst, IDS_DEFAULT_VALUE_NAME, buffer, sizeof(buffer)/sizeof(TCHAR));
+	    SetDlgItemText(hwndDlg, IDC_VALUE_NAME, buffer);
         }
         CheckRadioButton (hwndDlg, IDC_FORMAT_HEX, IDC_FORMAT_DEC, IDC_FORMAT_HEX);
         _stprintf (ValueString, _T("%lx"), dwordValueData);
@@ -404,7 +410,9 @@ INT_PTR CALLBACK modify_binary_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L
         }
         else
         {
-          SetDlgItemText(hwndDlg, IDC_VALUE_NAME, _T("(Default)"));
+          TCHAR buffer[255];
+	  LoadString(hInst, IDS_DEFAULT_VALUE_NAME, buffer, sizeof(buffer)/sizeof(TCHAR));
+	  SetDlgItemText(hwndDlg, IDC_VALUE_NAME, buffer);
         }
         hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA);
         HexEdit_LoadBuffer(hwndValue, binValueData, valueDataLen);
diff --git a/reactos/subsys/system/regedit/framewnd.c b/reactos/subsys/system/regedit/framewnd.c
index 7947a525a31..d8ecce3eacb 100644
--- a/reactos/subsys/system/regedit/framewnd.c
+++ b/reactos/subsys/system/regedit/framewnd.c
@@ -207,14 +207,48 @@ TCHAR CustomFilterBuffer[MAX_CUSTOM_FILTER_SIZE];
 TCHAR FileNameBuffer[_MAX_PATH];
 TCHAR FileTitleBuffer[_MAX_PATH];
 
+typedef struct
+{
+  UINT DisplayID;
+  UINT FilterID;
+} FILTERPAIR, *PFILTERPAIR;
+
+void
+BuildFilterStrings(TCHAR *Filter, PFILTERPAIR Pairs, int PairCount)
+{
+  int i, c;
+  
+  c = 0;
+  for(i = 0; i < PairCount; i++)
+  {
+    c += LoadString(hInst, Pairs[i].DisplayID, &Filter[c], 255 * sizeof(TCHAR));
+    Filter[++c] = '\0';
+    c += LoadString(hInst, Pairs[i].FilterID, &Filter[c], 255 * sizeof(TCHAR));
+    Filter[++c] = '\0';
+  }
+  Filter[++c] = '\0';
+}
+
 static BOOL InitOpenFileName(HWND hWnd, OPENFILENAME* pofn)
 {
+    FILTERPAIR FilterPairs[3];
+    static TCHAR Filter[1024];
+    
     memset(pofn, 0, sizeof(OPENFILENAME));
     pofn->lStructSize = sizeof(OPENFILENAME);
     pofn->hwndOwner = hWnd;
     pofn->hInstance = hInst;
-
-    pofn->lpstrFilter = _T("Registration Files\0*.reg\0Win9x/NT4 Registration Files (REGEDIT4)\0*.reg\0All Files (*.*)\0*.*\0\0");
+    
+    /* create filter string */
+    FilterPairs[0].DisplayID = IDS_FLT_REGFILES;
+    FilterPairs[0].FilterID = IDS_FLT_REGFILES_FLT;
+    FilterPairs[1].DisplayID = IDS_FLT_REGEDIT4;
+    FilterPairs[1].FilterID = IDS_FLT_REGEDIT4_FLT;
+    FilterPairs[2].DisplayID = IDS_FLT_ALLFILES;
+    FilterPairs[2].FilterID = IDS_FLT_ALLFILES_FLT;
+    BuildFilterStrings(Filter, FilterPairs, sizeof(FilterPairs) / sizeof(FILTERPAIR));
+    
+    pofn->lpstrFilter = Filter;
     pofn->lpstrCustomFilter = CustomFilterBuffer;
     pofn->nMaxCustFilter = MAX_CUSTOM_FILTER_SIZE;
     pofn->nFilterIndex = 0;
@@ -240,9 +274,11 @@ static BOOL InitOpenFileName(HWND hWnd, OPENFILENAME* pofn)
 static BOOL ImportRegistryFile(HWND hWnd)
 {
     OPENFILENAME ofn;
+    TCHAR Caption[128];
 
     InitOpenFileName(hWnd, &ofn);
-    ofn.lpstrTitle = _T("Import Registry File");
+    LoadString(hInst, IDS_IMPORT_REG_FILE, Caption, sizeof(Caption)/sizeof(TCHAR));
+    ofn.lpstrTitle = Caption;
     /*    ofn.lCustData = ;*/
     if (GetOpenFileName(&ofn)) {
         /* FIXME - convert to ascii */
@@ -279,10 +315,12 @@ static BOOL ExportRegistryFile(HWND hWnd)
 {
     OPENFILENAME ofn;
     TCHAR ExportKeyPath[_MAX_PATH];
+    TCHAR Caption[128];
 
     ExportKeyPath[0] = _T('\0');
     InitOpenFileName(hWnd, &ofn);
-    ofn.lpstrTitle = _T("Export Registry File");
+    LoadString(hInst, IDS_EXPORT_REG_FILE, Caption, sizeof(Caption)/sizeof(TCHAR));
+    ofn.lpstrTitle = Caption;
     /*    ofn.lCustData = ;*/
     ofn.Flags = OFN_ENABLETEMPLATE + OFN_EXPLORER;
     ofn.lpfnHook = ImportRegistryFile_OFNHookProc;
@@ -557,7 +595,7 @@ LRESULT CALLBACK FrameWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
 {
     switch (message) {
     case WM_CREATE:
-        CreateWindowEx(0, szChildClass, _T("regedit child window"), WS_CHILD | WS_VISIBLE,
+        CreateWindowEx(0, szChildClass, NULL, WS_CHILD | WS_VISIBLE,
                        CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
                        hWnd, (HMENU)0, hInst, 0);
         break;
diff --git a/reactos/subsys/system/regedit/listview.c b/reactos/subsys/system/regedit/listview.c
index ea637799225..106930fb589 100644
--- a/reactos/subsys/system/regedit/listview.c
+++ b/reactos/subsys/system/regedit/listview.c
@@ -201,21 +201,30 @@ static void AddEntryToList(HWND hwndLV, LPTSTR Name, DWORD dwValType, void* ValB
             }
             /*            lpsRes = convertHexToDWORDStr(lpbData, dwLen); */
             break;
-        case REG_NONE:
-        case REG_BINARY: {
+        default:
+	    {
                 unsigned int i;
                 LPBYTE pData = (LPBYTE)ValBuf;
-                LPTSTR strBinary = HeapAlloc(GetProcessHeap(), 0, dwCount * sizeof(TCHAR) * 3 + 1);
-                for (i = 0; i < dwCount; i++)
-                    wsprintf( strBinary + i*3, _T("%02X "), pData[i] );
-                strBinary[dwCount * 3] = 0;
-                ListView_SetItemText(hwndLV, index, 2, strBinary);
-                HeapFree(GetProcessHeap(), 0, strBinary);
+                LPTSTR strBinary;
+                if(dwCount > 0)
+                {
+		    strBinary = HeapAlloc(GetProcessHeap(), 0, (dwCount * sizeof(TCHAR) * 3) + 1);
+                    for (i = 0; i < dwCount; i++)
+                    {
+                        wsprintf( strBinary + i*3, _T("%02X "), pData[i] );
+                    }
+                    strBinary[dwCount * 3] = 0;
+                    ListView_SetItemText(hwndLV, index, 2, strBinary);
+                    HeapFree(GetProcessHeap(), 0, strBinary);
+                }
+                else
+                {
+                    TCHAR szText[128];
+		    LoadString(hInst, IDS_BINARY_EMPTY, szText, sizeof(szText)/sizeof(TCHAR));
+		    ListView_SetItemText(hwndLV, index, 2, szText);
+                }
             }
             break;
-        default:
-            ListView_SetItemText(hwndLV, index, 2, _T("(value)"));
-            break;
         }
     }
 }
@@ -281,7 +290,8 @@ static void OnGetDispInfo(NMLVDISPINFO* plvdi)
 
     switch (plvdi->item.iSubItem) {
     case 0:
-        plvdi->item.pszText = _T("(Default)");
+        LoadString(hInst, IDS_DEFAULT_VALUE_NAME, buffer, sizeof(buffer)/sizeof(TCHAR));
+	plvdi->item.pszText = buffer;
         break;
     case 1:
         switch (((LINE_INFO*)plvdi->item.lParam)->dwValType) {
@@ -318,14 +328,18 @@ static void OnGetDispInfo(NMLVDISPINFO* plvdi)
         case REG_NONE:
             plvdi->item.pszText = _T("REG_NONE");
             break;
-        default:
-            wsprintf(buffer, _T("unknown(0x%lx)"), ((LINE_INFO*)plvdi->item.lParam)->dwValType);
+        default: {
+            TCHAR buf2[200];
+	    LoadString(hInst, IDS_UNKNOWN_TYPE, buf2, sizeof(buf2)/sizeof(TCHAR));
+	    wsprintf(buffer, buf2, ((LINE_INFO*)plvdi->item.lParam)->dwValType);
             plvdi->item.pszText = buffer;
             break;
+          }
         }
         break;
     case 2:
-        plvdi->item.pszText = _T("(value not set)");
+        LoadString(hInst, IDS_VALUE_NOT_SET, buffer, sizeof(buffer)/sizeof(TCHAR));
+	plvdi->item.pszText = buffer;
         break;
     case 3:
         plvdi->item.pszText = _T("");
diff --git a/reactos/subsys/system/regedit/resource.h b/reactos/subsys/system/regedit/resource.h
index 6cabef02b58..3fe89997b5f 100644
--- a/reactos/subsys/system/regedit/resource.h
+++ b/reactos/subsys/system/regedit/resource.h
@@ -111,6 +111,20 @@
 #define ID_EDIT_MODIFY_BIN		32840
 #define IDS_WARNING			32841
 #define IDS_MULTI_SZ_EMPTY_STRING	32842
+#define IDS_BINARY_EMPTY		32843
+#define IDS_DEFAULT_VALUE_NAME		32844
+#define IDS_VALUE_NOT_SET		32845
+#define IDS_UNKNOWN_TYPE		32846
+#define IDS_MY_COMPUTER			32847
+#define IDS_IMPORT_REG_FILE		32848
+#define IDS_EXPORT_REG_FILE		32849
+
+#define IDS_FLT_REGFILES		31001
+#define IDS_FLT_REGFILES_FLT		31002
+#define IDS_FLT_REGEDIT4		31003
+#define IDS_FLT_REGEDIT4_FLT		31004
+#define IDS_FLT_ALLFILES		31005
+#define IDS_FLT_ALLFILES_FLT		31006
 
 #define IDD_EDIT_STRING			2000
 #define IDC_VALUE_NAME			2001
diff --git a/reactos/subsys/system/regedit/treeview.c b/reactos/subsys/system/regedit/treeview.c
index ba4927015b8..7131adb610e 100644
--- a/reactos/subsys/system/regedit/treeview.c
+++ b/reactos/subsys/system/regedit/treeview.c
@@ -267,7 +267,7 @@ HWND CreateTreeView(HWND hwndParent, LPTSTR pHostName, int id)
 
     /* Get the dimensions of the parent window's client area, and create the tree view control.  */
     GetClientRect(hwndParent, &rcClient);
-    hwndTV = CreateWindowEx(WS_EX_CLIENTEDGE, WC_TREEVIEW, _T("Tree View"),
+    hwndTV = CreateWindowEx(WS_EX_CLIENTEDGE, WC_TREEVIEW, NULL,
                             WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT,
                             0, 0, rcClient.right, rcClient.bottom,
                             hwndParent, (HMENU)id, hInst, NULL);

From 208898d3cdc31e431811785fe53d5d6e6df111f9 Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Mon, 21 Jun 2004 08:47:38 +0000
Subject: [PATCH 018/356] added support for deleting values

svn path=/trunk/; revision=9793
---
 reactos/subsys/system/regedit/En.rc      |  6 +++
 reactos/subsys/system/regedit/edit.c     | 35 +++++++++++-------
 reactos/subsys/system/regedit/framewnd.c | 47 ++++++++++++++++++++++--
 reactos/subsys/system/regedit/listview.c | 34 +++++++++++------
 reactos/subsys/system/regedit/main.h     |  4 +-
 reactos/subsys/system/regedit/resource.h |  6 +++
 6 files changed, 101 insertions(+), 31 deletions(-)

diff --git a/reactos/subsys/system/regedit/En.rc b/reactos/subsys/system/regedit/En.rc
index 4ec1d5ae346..c505ccdf1e5 100644
--- a/reactos/subsys/system/regedit/En.rc
+++ b/reactos/subsys/system/regedit/En.rc
@@ -258,6 +258,11 @@ BEGIN
     IDS_UNSUPPORTED_TYPE    "Can't edit keys of this type (%ld)"
     IDS_TOO_BIG_VALUE       "Value is too big (%ld)"
     IDS_MULTI_SZ_EMPTY_STRING "Data of type REG_MULTI_SZ cannot contain empty strings.\nThe empty strings have been removed from the list."
+    IDS_QUERY_DELETE_ONE    "Are you sure you want to delete this value?"
+    IDS_QUERY_DELETE_MORE   "Are you sure you want to delete these values?"
+    IDS_QUERY_DELETE_CONFIRM "Confirm Value Delete"
+    IDS_ERR_DELVAL_CAPTION  "Error Deleting Values"
+    IDS_ERR_DELETEVALUE     "Unable to delete all specified values!"
 END
 
 STRINGTABLE DISCARDABLE
@@ -269,6 +274,7 @@ BEGIN
     IDS_MY_COMPUTER         "My Computer"
     IDS_IMPORT_REG_FILE     "Import Registry File"
     IDS_EXPORT_REG_FILE     "Export Registry File"
+    IDS_INVALID_DWORD       "(invalid DWORD value)"
 END
 
 STRINGTABLE DISCARDABLE
diff --git a/reactos/subsys/system/regedit/edit.c b/reactos/subsys/system/regedit/edit.c
index 0be559ef4c0..18a389b9240 100644
--- a/reactos/subsys/system/regedit/edit.c
+++ b/reactos/subsys/system/regedit/edit.c
@@ -448,7 +448,7 @@ INT_PTR CALLBACK modify_binary_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L
 }
 
 
-BOOL ModifyValue(HWND hwnd, HKEY hKey, LPCTSTR valueName)
+BOOL ModifyValue(HWND hwnd, HKEY hKey, LPCTSTR valueName, BOOL EditBin)
 {
     DWORD type;
     LONG lRet;
@@ -475,7 +475,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKey, LPCTSTR valueName)
         goto done;
     }
 
-    if ((type == REG_SZ) || (type == REG_EXPAND_SZ))
+    if (EditBin == FALSE && ((type == REG_SZ) || (type == REG_EXPAND_SZ)))
     {
         if (valueDataLen > 0)
         {
@@ -510,7 +510,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKey, LPCTSTR valueName)
                 result = TRUE;
         }
     }
-    else if (type == REG_MULTI_SZ)
+    else if (EditBin == FALSE && type == REG_MULTI_SZ)
     {
         if (valueDataLen > 0)
         {
@@ -615,7 +615,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKey, LPCTSTR valueName)
                 result = TRUE;
         }
     }
-    else if (type == REG_DWORD)
+    else if (EditBin == FALSE && type == REG_DWORD)
     {
         lRet = RegQueryValueEx(hKey, valueName, 0, 0, (LPBYTE)&dwordValueData, &valueDataLen);
         if (lRet != ERROR_SUCCESS)
@@ -631,20 +631,27 @@ BOOL ModifyValue(HWND hwnd, HKEY hKey, LPCTSTR valueName)
                 result = TRUE;
         }
     }
-    else if (type == REG_NONE || type == REG_BINARY)
+    else if (EditBin == TRUE || type == REG_NONE || type == REG_BINARY)
     {
-        if(!(binValueData = HeapAlloc(GetProcessHeap(), 0, valueDataLen)))
+        if(valueDataLen > 0)
         {
-          error(hwnd, IDS_TOO_BIG_VALUE, valueDataLen);
-          goto done;
+	    if(!(binValueData = HeapAlloc(GetProcessHeap(), 0, valueDataLen)))
+            {
+              error(hwnd, IDS_TOO_BIG_VALUE, valueDataLen);
+              goto done;
+            }
+	    
+	    lRet = RegQueryValueEx(hKey, valueName, 0, 0, (LPBYTE)binValueData, &valueDataLen);
+            if (lRet != ERROR_SUCCESS)
+            {
+                HeapFree(GetProcessHeap(), 0, binValueData);
+	        error(hwnd, IDS_BAD_VALUE, valueName);
+                goto done;
+            }
         }
-	
-	lRet = RegQueryValueEx(hKey, valueName, 0, 0, (LPBYTE)binValueData, &valueDataLen);
-        if (lRet != ERROR_SUCCESS)
+        else
         {
-            HeapFree(GetProcessHeap(), 0, binValueData);
-	    error(hwnd, IDS_BAD_VALUE, valueName);
-            goto done;
+            binValueData = NULL;
         }
 
         if (DialogBox(0, MAKEINTRESOURCE(IDD_EDIT_BIN_DATA), hwnd, modify_binary_dlgproc) == IDOK)
diff --git a/reactos/subsys/system/regedit/framewnd.c b/reactos/subsys/system/regedit/framewnd.c
index d8ecce3eacb..b2c90e61cde 100644
--- a/reactos/subsys/system/regedit/framewnd.c
+++ b/reactos/subsys/system/regedit/framewnd.c
@@ -527,12 +527,14 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
     }
     case ID_EDIT_RENAME:
     case ID_EDIT_MODIFY:
+    case ID_EDIT_MODIFY_BIN:
+    case ID_EDIT_DELETE:
         regsam |= KEY_WRITE; 
         break;
     }
 
     keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot);
-    valueName = GetValueName(g_pChildWnd->hListWnd);
+    valueName = GetValueName(g_pChildWnd->hListWnd, -1);
     if (keyPath) {
         lRet = RegOpenKeyEx(hKeyRoot, keyPath, 0, regsam, &hKey);
         if (lRet != ERROR_SUCCESS) hKey = 0;
@@ -540,19 +542,58 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 
      switch (LOWORD(wParam)) {
     case ID_EDIT_MODIFY:
-        if (valueName && ModifyValue(hWnd, hKey, valueName))
+        if (valueName && ModifyValue(hWnd, hKey, valueName, FALSE))
+            RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath);
+        break;
+    case ID_EDIT_MODIFY_BIN:
+        if (valueName && ModifyValue(hWnd, hKey, valueName, TRUE))
             RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath);
         break;
     case ID_EDIT_RENAME:
         if(ListView_GetSelectedCount(g_pChildWnd->hListWnd) == 1)
         {
-          item = ListView_GetNextItem(g_pChildWnd->hListWnd, -1, LVNI_FOCUSED | LVNI_SELECTED);
+          item = ListView_GetNextItem(g_pChildWnd->hListWnd, -1, LVNI_SELECTED);
           if(item > -1)
           {
             ListView_EditLabel(g_pChildWnd->hListWnd, item);
           }
         }
         break;
+    case ID_EDIT_DELETE:
+    {
+        UINT nSelected = ListView_GetSelectedCount(g_pChildWnd->hListWnd);
+        if(nSelected >= 1)
+        {
+          TCHAR msg[128], caption[128];
+          LoadString(hInst, IDS_QUERY_DELETE_CONFIRM, caption, sizeof(caption)/sizeof(TCHAR));
+          LoadString(hInst, (nSelected == 1 ? IDS_QUERY_DELETE_ONE : IDS_QUERY_DELETE_MORE), msg, sizeof(msg)/sizeof(TCHAR));
+          if(MessageBox(g_pChildWnd->hWnd, msg, caption, MB_ICONQUESTION | MB_YESNO) == IDYES)
+          {
+            int ni, errs;
+            
+	    item = -1;
+	    errs = 0;
+            while((ni = ListView_GetNextItem(g_pChildWnd->hListWnd, item, LVNI_SELECTED)) > -1)
+            {
+              valueName = GetValueName(g_pChildWnd->hListWnd, item);
+              if(RegDeleteValue(hKey, valueName) != ERROR_SUCCESS)
+              {
+                errs++;
+              }
+	      item = ni;
+            }
+            
+            RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath);
+            if(errs > 0)
+            {
+              LoadString(hInst, IDS_ERR_DELVAL_CAPTION, caption, sizeof(caption)/sizeof(TCHAR));
+              LoadString(hInst, IDS_ERR_DELETEVALUE, msg, sizeof(msg)/sizeof(TCHAR));
+              MessageBox(g_pChildWnd->hWnd, msg, caption, MB_ICONSTOP);
+            }
+          }
+        }
+	break;
+    }
     case ID_EDIT_COPYKEYNAME:
         CopyKeyName(hWnd, _T(""));
         break;
diff --git a/reactos/subsys/system/regedit/listview.c b/reactos/subsys/system/regedit/listview.c
index 106930fb589..20c249ea08d 100644
--- a/reactos/subsys/system/regedit/listview.c
+++ b/reactos/subsys/system/regedit/listview.c
@@ -55,7 +55,7 @@ static LPTSTR g_valueName;
 static int default_column_widths[MAX_LIST_COLUMNS] = { 200, 175, 400 };
 static int column_alignment[MAX_LIST_COLUMNS] = { LVCFMT_LEFT, LVCFMT_LEFT, LVCFMT_LEFT };
 
-LPCTSTR GetValueName(HWND hwndLV)
+LPCTSTR GetValueName(HWND hwndLV, int iStartAt)
 {
     int item, len, maxLen;
     LPTSTR newStr;
@@ -68,7 +68,7 @@ LPCTSTR GetValueName(HWND hwndLV)
     maxLen = HeapSize(GetProcessHeap(), 0, g_valueName);
     if (maxLen == (SIZE_T) - 1) return NULL;
 
-    item = ListView_GetNextItem(hwndLV, -1, LVNI_FOCUSED | LVNI_SELECTED);
+    item = ListView_GetNextItem(hwndLV, iStartAt, LVNI_SELECTED);
     if (item == -1) return NULL;
     LVItem.mask = LVIF_PARAM;
     LVItem.iItem = item;
@@ -114,7 +114,7 @@ BOOL IsDefaultValue(HWND hwndLV, int i)
 /*******************************************************************************
  * Local module support methods
  */
-static void AddEntryToList(HWND hwndLV, LPTSTR Name, DWORD dwValType, void* ValBuf, DWORD dwCount, int Position)
+static void AddEntryToList(HWND hwndLV, LPTSTR Name, DWORD dwValType, void* ValBuf, DWORD dwCount, int Position, BOOL ValExists)
 {
     LINE_INFO* linfo;
     LVITEM item;
@@ -162,10 +162,17 @@ static void AddEntryToList(HWND hwndLV, LPTSTR Name, DWORD dwValType, void* ValB
         switch (dwValType) {
         case REG_SZ:
         case REG_EXPAND_SZ:
-            if(dwCount)
+            if(dwCount > 0)
             {
               ListView_SetItemText(hwndLV, index, 2, ValBuf);
             }
+            else if(!ValExists)
+            {
+              TCHAR buffer[255];
+              /* load (value not set) string */
+              LoadString(hInst, IDS_VALUE_NOT_SET, buffer, sizeof(buffer)/sizeof(TCHAR));
+              ListView_SetItemText(hwndLV, index, 2, buffer);
+            }
             break;
         case REG_MULTI_SZ:
             {
@@ -195,8 +202,15 @@ static void AddEntryToList(HWND hwndLV, LPTSTR Name, DWORD dwValType, void* ValB
             }
             break;
         case REG_DWORD: {
-                TCHAR buf[64];
-                wsprintf(buf, _T("0x%08X (%d)"), *(DWORD*)ValBuf, *(DWORD*)ValBuf);
+                TCHAR buf[200];
+                if(dwCount == sizeof(DWORD))
+                {
+                  wsprintf(buf, _T("0x%08X (%d)"), *(DWORD*)ValBuf, *(DWORD*)ValBuf);
+                }
+                else
+                {
+                  LoadString(hInst, IDS_INVALID_DWORD, buf, sizeof(buf)/sizeof(TCHAR));
+                }
                 ListView_SetItemText(hwndLV, index, 2, buf);
             }
             /*            lpsRes = convertHexToDWORDStr(lpbData, dwLen); */
@@ -337,10 +351,6 @@ static void OnGetDispInfo(NMLVDISPINFO* plvdi)
           }
         }
         break;
-    case 2:
-        LoadString(hInst, IDS_VALUE_NOT_SET, buffer, sizeof(buffer)/sizeof(TCHAR));
-	plvdi->item.pszText = buffer;
-        break;
     case 3:
         plvdi->item.pszText = _T("");
         break;
@@ -499,7 +509,7 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKey, LPCTSTR keyPath)
         /*                dwValSize = max_val_size; */
         while (RegEnumValue(hNewKey, dwIndex, ValName, &dwValNameLen, NULL, &dwValType, ValBuf, &dwValSize) == ERROR_SUCCESS) {
             ValBuf[dwValSize] = 0;
-            AddEntryToList(hwndLV, ValName, dwValType, ValBuf, dwValSize, -1);
+            AddEntryToList(hwndLV, ValName, dwValType, ValBuf, dwValSize, -1, TRUE);
             dwValNameLen = max_val_name_len;
             dwValSize = max_val_size;
             dwValType = 0L;
@@ -514,7 +524,7 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKey, LPCTSTR keyPath)
     }
     if(!AddedDefault)
     {
-      AddEntryToList(hwndLV, _T(""), REG_SZ, NULL, 0, 0);
+      AddEntryToList(hwndLV, _T(""), REG_SZ, NULL, 0, 0, FALSE);
     }
     ListView_SortItems(hwndLV, CompareFunc, (WPARAM)hwndLV);
     RegCloseKey(hNewKey);
diff --git a/reactos/subsys/system/regedit/main.h b/reactos/subsys/system/regedit/main.h
index bbffc12d636..96c6d424686 100644
--- a/reactos/subsys/system/regedit/main.h
+++ b/reactos/subsys/system/regedit/main.h
@@ -90,7 +90,7 @@ extern void UpdateStatusBar(void);
 /* listview.c */
 extern HWND CreateListView(HWND hwndParent, int id);
 extern BOOL RefreshListView(HWND hwndLV, HKEY hKey, LPCTSTR keyPath);
-extern LPCTSTR GetValueName(HWND hwndLV);
+extern LPCTSTR GetValueName(HWND hwndLV, int iStartAt);
 extern BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result);
 extern BOOL IsDefaultValue(HWND hwndLV, int i);
 
@@ -100,6 +100,6 @@ extern BOOL OnTreeExpanding(HWND hWnd, NMTREEVIEW* pnmtv);
 extern LPCTSTR GetItemPath(HWND hwndTV, HTREEITEM hItem, HKEY* phRootKey);
 
 /* edit.c */
-extern BOOL ModifyValue(HWND hwnd, HKEY hKey, LPCTSTR valueName);
+extern BOOL ModifyValue(HWND hwnd, HKEY hKey, LPCTSTR valueName, BOOL EditBin);
 
 #endif /* __MAIN_H__ */
diff --git a/reactos/subsys/system/regedit/resource.h b/reactos/subsys/system/regedit/resource.h
index 3fe89997b5f..cc201340810 100644
--- a/reactos/subsys/system/regedit/resource.h
+++ b/reactos/subsys/system/regedit/resource.h
@@ -118,6 +118,12 @@
 #define IDS_MY_COMPUTER			32847
 #define IDS_IMPORT_REG_FILE		32848
 #define IDS_EXPORT_REG_FILE		32849
+#define IDS_INVALID_DWORD		32850
+#define IDS_QUERY_DELETE_ONE		32851
+#define IDS_QUERY_DELETE_MORE		32852
+#define IDS_QUERY_DELETE_CONFIRM	32853
+#define IDS_ERR_DELVAL_CAPTION		32854
+#define IDS_ERR_DELETEVALUE		32855
 
 #define IDS_FLT_REGFILES		31001
 #define IDS_FLT_REGFILES_FLT		31002

From a10440fe8a31c4cb16d56842aaff183e5f35cfe6 Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Mon, 21 Jun 2004 10:24:52 +0000
Subject: [PATCH 019/356] merged focus handling code from wine

svn path=/trunk/; revision=9794
---
 reactos/subsys/system/regedit/En.rc      |  2 ++
 reactos/subsys/system/regedit/childwnd.c | 19 ++++++------
 reactos/subsys/system/regedit/framewnd.c |  4 +++
 reactos/subsys/system/regedit/listview.c | 38 +++++++++++++++++++++++-
 reactos/subsys/system/regedit/main.c     | 13 ++++++--
 reactos/subsys/system/regedit/resource.h |  3 ++
 6 files changed, 67 insertions(+), 12 deletions(-)

diff --git a/reactos/subsys/system/regedit/En.rc b/reactos/subsys/system/regedit/En.rc
index c505ccdf1e5..b3680cf3a2d 100644
--- a/reactos/subsys/system/regedit/En.rc
+++ b/reactos/subsys/system/regedit/En.rc
@@ -263,6 +263,8 @@ BEGIN
     IDS_QUERY_DELETE_CONFIRM "Confirm Value Delete"
     IDS_ERR_DELVAL_CAPTION  "Error Deleting Values"
     IDS_ERR_DELETEVALUE     "Unable to delete all specified values!"
+    IDS_ERR_RENVAL_CAPTION  "Error Renaming Value"
+    IDS_ERR_RENVAL_TOEMPTY  "Cannot rename %s. The specified value name is empty. Try another name and try again."
 END
 
 STRINGTABLE DISCARDABLE
diff --git a/reactos/subsys/system/regedit/childwnd.c b/reactos/subsys/system/regedit/childwnd.c
index 1306c0b9dc6..2a71a889988 100644
--- a/reactos/subsys/system/regedit/childwnd.c
+++ b/reactos/subsys/system/regedit/childwnd.c
@@ -101,6 +101,7 @@ static void OnPaint(HWND hWnd)
 
 static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
+    ChildWnd* pChildWnd = g_pChildWnd;
     switch (LOWORD(wParam)) {
         /* Parse the menu selections: */
     case ID_REGISTRY_EXIT:
@@ -109,6 +110,10 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
     case ID_VIEW_REFRESH:
         /* TODO */
         break;
+    case ID_SWITCH_PANELS:
+        pChildWnd->nFocusPanel = !pChildWnd->nFocusPanel;
+        SetFocus(pChildWnd->nFocusPanel? pChildWnd->hListWnd: pChildWnd->hTreeWnd);
+        break;
     default:
         return FALSE;
     }
@@ -275,10 +280,6 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
                     HKEY hRootKey;
 
 		    keyPath = GetItemPath(pChildWnd->hTreeWnd, ((NMTREEVIEW*)lParam)->itemNew.hItem, &hRootKey);
-		    if(!hRootKey)
-		    {
-		      RefreshListView(pChildWnd->hListWnd, 0, NULL);
-		    }
 		    if (keyPath) {
 		        RefreshListView(pChildWnd->hListWnd, hRootKey, keyPath);
 			rootName = get_root_key_name(hRootKey);
@@ -292,10 +293,10 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
                 }
                 break;
 	    case NM_SETFOCUS:
-		pChildWnd->nFocusPanel = 1;
+		pChildWnd->nFocusPanel = 0;
 		break;
             default:
-                goto def;
+                return 0;
             }
         } else
         {
@@ -303,12 +304,12 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
             {
 		switch (((LPNMHDR)lParam)->code) {
 		  case NM_SETFOCUS:
-		  	pChildWnd->nFocusPanel = 0;
+		  	pChildWnd->nFocusPanel = 1;
 		  	break;
 		  default:
-                	if(ListWndNotifyProc(pChildWnd->hListWnd, wParam, lParam, &Result))
+                	if(!ListWndNotifyProc(pChildWnd->hListWnd, wParam, lParam, &Result))
                 	{
-                  		return Result;
+                  		goto def;
                 	}
                 	break;
         	}
diff --git a/reactos/subsys/system/regedit/framewnd.c b/reactos/subsys/system/regedit/framewnd.c
index b2c90e61cde..c29c8a107aa 100644
--- a/reactos/subsys/system/regedit/framewnd.c
+++ b/reactos/subsys/system/regedit/framewnd.c
@@ -658,6 +658,10 @@ LRESULT CALLBACK FrameWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
     case WM_MENUSELECT:
         OnMenuSelect(hWnd, LOWORD(wParam), HIWORD(wParam), (HMENU)lParam);
         break;
+    case WM_ACTIVATE:
+        if (LOWORD(hWnd))
+          SetFocus(g_pChildWnd->hWnd);
+        break;
     case WM_DESTROY:
         WinHelp(hWnd, _T("regedit"), HELP_QUIT, 0);
         PostQuitMessage(0);
diff --git a/reactos/subsys/system/regedit/listview.c b/reactos/subsys/system/regedit/listview.c
index 20c249ea08d..edeb07e0f34 100644
--- a/reactos/subsys/system/regedit/listview.c
+++ b/reactos/subsys/system/regedit/listview.c
@@ -408,7 +408,9 @@ BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result)
                 SendMessage(hFrameWnd, WM_COMMAND, MAKEWPARAM(ID_EDIT_MODIFY, 0), 0);
             }
             return TRUE;
-
+	case NM_SETFOCUS:
+	    g_pChildWnd->nFocusPanel = 0;
+	    break;
         case LVN_BEGINLABELEDIT:
             {
               PLINE_INFO lineinfo;
@@ -429,6 +431,40 @@ BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result)
                 *Result = TRUE;
               return TRUE;
             }
+        case LVN_ENDLABELEDIT:
+            {
+              PLINE_INFO lineinfo;
+              Info = (NMLVDISPINFO*)lParam;
+              if(Info && Info->item.pszText)
+              {
+                lineinfo = (PLINE_INFO)Info->item.lParam;
+                if(!lineinfo->name || !_tcscmp(lineinfo->name, _T("")))
+                {
+                  *Result = FALSE;
+                }
+                else
+                {
+                  LONG ret;
+		  //if((ret = RenameValue(lineinfo->name, Info->item.pszText)) != ERROR_SUCCESS)
+                  {
+		    TCHAR msg[128], caption[128];
+		    
+		    LoadString(hInst, IDS_ERR_RENVAL_CAPTION, caption, sizeof(caption)/sizeof(TCHAR));
+		    if(_tcslen(Info->item.pszText) == 0)
+		    {
+		      LoadString(hInst, IDS_ERR_RENVAL_TOEMPTY, msg, sizeof(msg)/sizeof(TCHAR));
+		    }
+		    else
+                    _stprintf(msg, _T("rename from %s to %s"), lineinfo->name, Info->item.pszText);
+                    MessageBox(0, msg, NULL, 0);
+		    *Result = TRUE;
+		  }
+                }
+              }
+              else
+                *Result = TRUE;
+              return TRUE;
+            }
     }
     return FALSE;
 }
diff --git a/reactos/subsys/system/regedit/main.c b/reactos/subsys/system/regedit/main.c
index 57018d3eacf..520dd787060 100644
--- a/reactos/subsys/system/regedit/main.c
+++ b/reactos/subsys/system/regedit/main.c
@@ -147,6 +147,15 @@ void ExitInstance(HINSTANCE hInstance)
     DestroyMenu(hMenuFrame);
 }
 
+BOOL TranslateChildTabMessage(MSG *msg)
+{
+  if (msg->message != WM_KEYDOWN) return FALSE;
+  if (msg->wParam != VK_TAB) return FALSE;
+  if (GetParent(msg->hwnd) != g_pChildWnd->hWnd) return FALSE;
+  PostMessage(g_pChildWnd->hWnd, WM_COMMAND, ID_SWITCH_PANELS, 0);
+  return TRUE;
+}
+
 int APIENTRY WinMain(HINSTANCE hInstance,
                      HINSTANCE hPrevInstance,
                      LPSTR     lpCmdLine,
@@ -189,8 +198,8 @@ int APIENTRY WinMain(HINSTANCE hInstance,
 
     /* Main message loop */
     while (GetMessage(&msg, (HWND)NULL, 0, 0)) {
-        if (!TranslateAccelerator(msg.hwnd, hAccel, &msg) && 
-            !IsDialogMessage(hFrameWnd, &msg)) {
+        if (!TranslateAccelerator(msg.hwnd, hAccel, &msg) 
+            && !TranslateChildTabMessage(&msg)) {
             TranslateMessage(&msg);
             DispatchMessage(&msg);
         }
diff --git a/reactos/subsys/system/regedit/resource.h b/reactos/subsys/system/regedit/resource.h
index cc201340810..f3f45b677ee 100644
--- a/reactos/subsys/system/regedit/resource.h
+++ b/reactos/subsys/system/regedit/resource.h
@@ -124,6 +124,9 @@
 #define IDS_QUERY_DELETE_CONFIRM	32853
 #define IDS_ERR_DELVAL_CAPTION		32854
 #define IDS_ERR_DELETEVALUE		32855
+#define IDS_ERR_RENVAL_CAPTION		32856
+#define IDS_ERR_RENVAL_TOEMPTY		32857
+#define ID_SWITCH_PANELS                32871
 
 #define IDS_FLT_REGFILES		31001
 #define IDS_FLT_REGFILES_FLT		31002

From 62e0fe6b5e73d49063117193aff720749d80548d Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Mon, 21 Jun 2004 12:12:01 +0000
Subject: [PATCH 020/356] Stop dumping PnP nodes at an empty node.

svn path=/trunk/; revision=9795
---
 reactos/apps/utils/pnpdump/pnpdump.c | 59 ++++++++++++++++------------
 1 file changed, 33 insertions(+), 26 deletions(-)

diff --git a/reactos/apps/utils/pnpdump/pnpdump.c b/reactos/apps/utils/pnpdump/pnpdump.c
index ade651a0a23..00a25ad5789 100644
--- a/reactos/apps/utils/pnpdump/pnpdump.c
+++ b/reactos/apps/utils/pnpdump/pnpdump.c
@@ -671,29 +671,28 @@ int main (int argc, char *argv[])
   HKEY hPnpKey;
   DWORD dwType;
   DWORD dwSize;
-  BOOL Ask = TRUE;
+  BOOL Ask;
   PCM_FULL_RESOURCE_DESCRIPTOR lpBuffer;
   PCM_PNP_BIOS_INSTALLATION_CHECK lpPnpInst;
   PCM_PNP_BIOS_DEVICE_NODE lpDevNode;
-
-  DWORD dwDataSize, dwResourceSize;
+  DWORD dwDataSize;
+  DWORD dwResourceSize;
 
   hPnpKey = 0;
-  
 
-  if (argc >1 && (!strcmp (argv[1],"/S") || !strcmp (argv[1],"/s")))
+  Ask = TRUE;
+  if (argc >1 && (!strcmp(argv[1],"/S") || !strcmp(argv[1],"/s")))
     {
       Ask = FALSE;
     }
-  
-  if (argc >1 && !strcmp (argv[1],"/?"))
+
+  if (argc >1 && !strcmp(argv[1],"/?"))
     {
-      printf ("This utility prints the PnP-nodes from the registry\n");
-      printf ("\"/s\" prevents the \"Press any key\"\n\n");
+      printf("This utility prints the PnP-nodes from the registry\n");
+      printf("\"/s\" prevents the \"Press any key\"\n\n");
       return 0;
     }
-    
-    
+
   lError = GetPnpKey(&hPnpKey);
   if (lError != ERROR_SUCCESS)
     {
@@ -709,6 +708,12 @@ int main (int argc, char *argv[])
   /* Allocate buffer */
   dwSize = 1024;
   lpBuffer = malloc(dwSize);
+  if (lpBuffer == NULL)
+    {
+      printf("Error: malloc() failed\n");
+      RegCloseKey(hPnpKey);
+      return 0;
+    }
 
   lError = RegQueryValueEx(hPnpKey,
 			   "Configuration Data",
@@ -721,11 +726,10 @@ int main (int argc, char *argv[])
       if (lError == ERROR_MORE_DATA)
 	{
 	  printf("Need to resize buffer to %lu\n", dwSize);
-
 	}
 
       printf("Failed to read 'Configuration Data' value\n");
-      free (lpBuffer);
+      free(lpBuffer);
       RegCloseKey(hPnpKey);
       return 0;
     }
@@ -739,7 +743,7 @@ int main (int argc, char *argv[])
   if (lpBuffer->PartialResourceList.Count == 0)
     {
       printf("Invalid resource count!\n");
-      free (lpBuffer);
+      free(lpBuffer);
       return 0;
     }
 
@@ -774,7 +778,7 @@ int main (int argc, char *argv[])
     }
 
 #if 0
-      printf ("Node: %x  Size %hu (0x%hx)\n",
+      printf("Node: %x  Size %hu (0x%hx)\n",
 	      lpDevNode->Node,
 	      lpDevNode->Size,
 	      lpDevNode->Size);
@@ -789,10 +793,10 @@ return 0;
       if (lpDevNode->Size == 0)
 	break;
 
-      printf ("Node: %x  Size %hu (0x%hx)\n",
-	      lpDevNode->Node,
-	      lpDevNode->Size,
-	      lpDevNode->Size);
+      printf("Node: %x  Size %hu (0x%hx)\n",
+	     lpDevNode->Node,
+	     lpDevNode->Size,
+	     lpDevNode->Size);
 
       dwDataSize += lpDevNode->Size;
       lpDevNode = (PCM_PNP_BIOS_DEVICE_NODE)((DWORD)lpDevNode + lpDevNode->Size);
@@ -800,12 +804,12 @@ return 0;
 
   if (Ask)
     {
-      printf ("\n Press any key...\n");
+      printf("\n Press any key...\n");
       getch();
     }
   else
     {
-      printf ("\n");
+      printf("\n");
     }
 
   dwDataSize = sizeof(CM_PNP_BIOS_INSTALLATION_CHECK);
@@ -813,23 +817,26 @@ return 0;
 
   while (dwDataSize < dwResourceSize)
     {
-      PrintDeviceData (lpDevNode);
+      if (lpDevNode->Size == 0)
+	break;
+
+      PrintDeviceData(lpDevNode);
 
       if (Ask)
         {
-          printf ("\n Press any key...\n");
+          printf("\n Press any key...\n");
           getch();
         }
       else
         {
-          printf ("\n");
+          printf("\n");
         }
-      
+
       dwDataSize += lpDevNode->Size;
       lpDevNode = (PCM_PNP_BIOS_DEVICE_NODE)((DWORD)lpDevNode + lpDevNode->Size);
     }
 
-  free (lpBuffer);
+  free(lpBuffer);
 
   return 0;
 }

From 6d403cae78802e8292caa749b95aec8fe8bfa4b7 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Mon, 21 Jun 2004 12:23:01 +0000
Subject: [PATCH 021/356] Detect parallel ports.

svn path=/trunk/; revision=9796
---
 freeldr/freeldr/arch/i386/hardware.c | 139 +++++++++++++++++++++++++--
 1 file changed, 131 insertions(+), 8 deletions(-)

diff --git a/freeldr/freeldr/arch/i386/hardware.c b/freeldr/freeldr/arch/i386/hardware.c
index 7b375519cdf..46da8564b40 100644
--- a/freeldr/freeldr/arch/i386/hardware.c
+++ b/freeldr/freeldr/arch/i386/hardware.c
@@ -192,6 +192,7 @@ __KeStallExecutionProcessor(U32 Loops)
   for (i = 0; i < Loops; i++);
 }
 
+
 VOID KeStallExecutionProcessor(U32 Microseconds)
 {
   U64 LoopCount = ((U64)delay_count * (U64)Microseconds) / 1000ULL;
@@ -404,7 +405,6 @@ DetectPnpBios(HKEY SystemKey, U32 *BusNumber)
     CmResourceTypeDeviceSpecific;
   FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].ShareDisposition =
     CmResourceShareUndetermined;
-//  FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].Flags =
 
   Ptr = (char *)(((PVOID)&FullResourceDescriptor->PartialResourceList.PartialDescriptors[0]) +
 		 sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR));
@@ -430,10 +430,6 @@ DetectPnpBios(HKEY SystemKey, U32 *BusNumber)
 		    DeviceNode->Node,
 		    DeviceNode->Size,
 		    DeviceNode->Size));
-//	  printf("Node: %u  Size %u (0x%x)\n",
-//		 DeviceNode->Node,
-//		 DeviceNode->Size,
-//		 DeviceNode->Size);
 
 	  memcpy (Ptr,
 		  DeviceNode,
@@ -1448,7 +1444,7 @@ DetectSerialPorts(HKEY BusKey)
 			      "Identifier",
 			      REG_SZ,
 			      (PU8)Buffer,
-			      5);
+			      strlen(Buffer) + 1);
 	  if (Error != ERROR_SUCCESS)
 	    {
 	      DbgPrint((DPRINT_HWDETECT,
@@ -1469,6 +1465,135 @@ DetectSerialPorts(HKEY BusKey)
 }
 
 
+static VOID
+DetectParallelPorts(HKEY BusKey)
+{
+  PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor;
+  PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor;
+  U32 Irq[3] = {7, 5, (U32)-1};
+  char Buffer[80];
+  HKEY ControllerKey;
+  PU16 BasePtr;
+  U32 ControllerNumber;
+  U32 i;
+  S32 Error;
+  U32 Size;
+
+  DbgPrint((DPRINT_HWDETECT, "DetectParallelPorts() called\n"));
+
+  ControllerNumber = 0;
+  BasePtr = (PU16)0x408;
+  for (i = 0; i < 3; i++, BasePtr++)
+    {
+      if (*BasePtr == 0)
+        continue;
+
+      DbgPrint((DPRINT_HWDETECT,
+		"Parallel port %u: %x\n",
+		ControllerNumber,
+		*BasePtr));
+
+      /* Create controller key */
+      sprintf(Buffer,
+	      "ParallelController\\%u",
+	      ControllerNumber);
+
+      Error = RegCreateKey(BusKey,
+			   Buffer,
+			   &ControllerKey);
+      if (Error != ERROR_SUCCESS)
+	{
+	  DbgPrint((DPRINT_HWDETECT, "Failed to create controller key\n"));
+	  continue;
+	}
+      DbgPrint((DPRINT_HWDETECT, "Created key: %s\n", Buffer));
+
+      /* Set 'ComponentInformation' value */
+      SetComponentInformation(ControllerKey,
+			      0x78, /* FIXME */
+			      ControllerNumber,
+			      0xFFFFFFFF);
+
+      /* Build full device descriptor */
+      Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR);
+      if (Irq[i] != (U32)-1)
+	Size += sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR);
+
+      FullResourceDescriptor = MmAllocateMemory(Size);
+      if (FullResourceDescriptor == NULL)
+	{
+	  DbgPrint((DPRINT_HWDETECT,
+		    "Failed to allocate resource descriptor\n"));
+	  continue;
+	}
+      memset(FullResourceDescriptor, 0, Size);
+
+      /* Initialize resource descriptor */
+      FullResourceDescriptor->InterfaceType = Isa;
+      FullResourceDescriptor->BusNumber = 0;
+      FullResourceDescriptor->PartialResourceList.Count = (Irq[i] != (U32)-1) ? 2 : 1;
+
+      /* Set IO Port */
+      PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[0];
+      PartialDescriptor->Type = CmResourceTypePort;
+      PartialDescriptor->ShareDisposition = CmResourceShareDeviceExclusive;
+      PartialDescriptor->Flags = CM_RESOURCE_PORT_IO;
+      PartialDescriptor->u.Port.Start = (U64)*BasePtr;
+      PartialDescriptor->u.Port.Length = 3;
+
+      /* Set Interrupt */
+      if (Irq[i] != (U32)-1)
+	{
+	  PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[1];
+	  PartialDescriptor->Type = CmResourceTypeInterrupt;
+	  PartialDescriptor->ShareDisposition = CmResourceShareUndetermined;
+	  PartialDescriptor->Flags = CM_RESOURCE_INTERRUPT_LATCHED;
+	  PartialDescriptor->u.Interrupt.Level = Irq[i];
+	  PartialDescriptor->u.Interrupt.Vector = Irq[i];
+	  PartialDescriptor->u.Interrupt.Affinity = 0xFFFFFFFF;
+	}
+
+      /* Set 'Configuration Data' value */
+      Error = RegSetValue(ControllerKey,
+			  "Configuration Data",
+			  REG_FULL_RESOURCE_DESCRIPTOR,
+			  (PU8) FullResourceDescriptor,
+			  Size);
+      MmFreeMemory(FullResourceDescriptor);
+      if (Error != ERROR_SUCCESS)
+	{
+	  DbgPrint((DPRINT_HWDETECT,
+		    "RegSetValue(Configuration Data) failed (Error %u)\n",
+		    (int)Error));
+	}
+
+      /* Set 'Identifier' value */
+      sprintf(Buffer,
+	      "PARALLEL%u",
+	      i + 1);
+      Error = RegSetValue(ControllerKey,
+			  "Identifier",
+			  REG_SZ,
+			  (PU8)Buffer,
+			  strlen(Buffer) + 1);
+      if (Error != ERROR_SUCCESS)
+	{
+	  DbgPrint((DPRINT_HWDETECT,
+		    "RegSetValue() failed (Error %u)\n",
+		    (int)Error));
+	  continue;
+	}
+      DbgPrint((DPRINT_HWDETECT,
+		"Created value: Identifier %s\n",
+		Buffer));
+
+      ControllerNumber++;
+    }
+
+  DbgPrint((DPRINT_HWDETECT, "DetectParallelPorts() done\n"));
+}
+
+
 static BOOLEAN
 DetectKeyboardDevice(VOID)
 {
@@ -2081,9 +2206,7 @@ DetectIsaBios(HKEY SystemKey, U32 *BusNumber)
 
   DetectSerialPorts(BusKey);
 
-#if 0
   DetectParallelPorts(BusKey);
-#endif
 
   DetectKeyboardController(BusKey);
 

From 84fff6f7f22516ac070ea8b32db63fba1ecd1b55 Mon Sep 17 00:00:00 2001
From: Royce Mitchell III <royce3@ev1.net>
Date: Mon, 21 Jun 2004 16:58:28 +0000
Subject: [PATCH 022/356] cvsignore maintainance

svn path=/trunk/; revision=9797
---
 reactos/drivers/dd/floppy/.cvsignore | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 reactos/drivers/dd/floppy/.cvsignore

diff --git a/reactos/drivers/dd/floppy/.cvsignore b/reactos/drivers/dd/floppy/.cvsignore
new file mode 100644
index 00000000000..fbfbcf8c4b6
--- /dev/null
+++ b/reactos/drivers/dd/floppy/.cvsignore
@@ -0,0 +1,2 @@
+*.coff
+*.map
\ No newline at end of file

From edd6cd019054e5661803c880d0449b0fd606120b Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Mon, 21 Jun 2004 17:11:00 +0000
Subject: [PATCH 023/356] Fixed icon masks.

svn path=/trunk/; revision=9798
---
 reactos/subsys/system/regedit/res/regedit.ico | Bin 22534 -> 22534 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/reactos/subsys/system/regedit/res/regedit.ico b/reactos/subsys/system/regedit/res/regedit.ico
index b7481b412cf6f25e447fbf80fda2d91fc143fab8..d9811b9b6ac04d02a99545236266e4e3f4e6cfb3 100644
GIT binary patch
delta 94
zcmZqMz}U8dal&jyrpX_fBqq;cwwnBjNntY|;{isXfC9^ZAOJE-Cd&nLOnxTK$Iik4
j0u4YhNs#J^|HLQ1WlrP*ivkI-YAdGy|2I!zDGCMvq2wbM

delta 129
zcmZqMz}U8dal-7$?97sr=P+9dtU?1D|6O2IKoi5@PCm%qz^}o;z#ss`3P8-rz%rSU
ZSsr8}2Tb+kd&~t04kNR}=4mVi!2mJNJTL$N


From d82a66b2064c1c3fb9357c7061323e724936078e Mon Sep 17 00:00:00 2001
From: Royce Mitchell III <royce3@ev1.net>
Date: Mon, 21 Jun 2004 18:22:59 +0000
Subject: [PATCH 024/356] gone with the wind - sorry for that, I guess CVS
 isn't feeling well today

svn path=/trunk/; revision=9799
---
 reactos/drivers/dd/floppy/.cvsignore | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 reactos/drivers/dd/floppy/.cvsignore

diff --git a/reactos/drivers/dd/floppy/.cvsignore b/reactos/drivers/dd/floppy/.cvsignore
deleted file mode 100644
index fbfbcf8c4b6..00000000000
--- a/reactos/drivers/dd/floppy/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.coff
-*.map
\ No newline at end of file

From ae0bc4e93976516c5a885a96bded044b17940c5d Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Mon, 21 Jun 2004 18:32:36 +0000
Subject: [PATCH 025/356] 1. fixed compiler warning 2. German resource update
 by Michael Fritscher

svn path=/trunk/; revision=9800
---
 reactos/subsys/system/regedit/De.rc     | 339 ++++++++++++++++++++++++
 reactos/subsys/system/regedit/hexedit.c |   2 +-
 reactos/subsys/system/regedit/rsrc.rc   |   1 +
 3 files changed, 341 insertions(+), 1 deletion(-)
 create mode 100644 reactos/subsys/system/regedit/De.rc

diff --git a/reactos/subsys/system/regedit/De.rc b/reactos/subsys/system/regedit/De.rc
new file mode 100644
index 00000000000..f05fc7efb45
--- /dev/null
+++ b/reactos/subsys/system/regedit/De.rc
@@ -0,0 +1,339 @@
+/*
+ * Regedit resources
+ *
+ * Copyright 2002 Robert Dickenson
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
+
+/*
+ * Menu
+ */
+
+IDC_REGEDIT MENU DISCARDABLE
+BEGIN
+    POPUP "&Datei"
+    BEGIN
+        MENUITEM "&Beenden",                       ID_REGISTRY_EXIT
+    END
+    POPUP "&Help"
+    BEGIN
+        MENUITEM "&Über ...",                  ID_HELP_ABOUT
+    END
+END
+
+IDR_REGEDIT_MENU MENU DISCARDABLE
+BEGIN
+    POPUP "&Registry"
+    BEGIN
+        MENUITEM "Registry &importieren...",    ID_REGISTRY_IMPORTREGISTRYFILE
+
+        MENUITEM "Registry &exportieren...",    ID_REGISTRY_EXPORTREGISTRYFILE
+
+        MENUITEM SEPARATOR
+        MENUITEM "&Mit Neztwerkregistry verbinden...",
+                                                ID_REGISTRY_CONNECTNETWORKREGISTRY
+        , GRAYED
+        MENUITEM "&Von Netzwerkregistry trennen...",
+                                                ID_REGISTRY_DISCONNECTNETWORKREGISTRY
+        , GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Drucken\tStrg+P",              ID_REGISTRY_PRINT, GRAYED
+        MENUITEM SEPARATOR
+        MENUITEM "&Beenden",                       ID_REGISTRY_EXIT
+    END
+    POPUP "&Bearbeiten"
+    BEGIN
+        MENUITEM "&Ändern",                     ID_EDIT_MODIFY
+        MENUITEM SEPARATOR
+        POPUP "&Neu"
+        BEGIN
+            MENUITEM "&Schlüssel",                        ID_EDIT_NEW_KEY
+            MENUITEM SEPARATOR
+            MENUITEM "&Zeichenkette",               ID_EDIT_NEW_STRINGVALUE
+            MENUITEM "&Binärwert",               ID_EDIT_NEW_BINARYVALUE
+            MENUITEM "&DWORD Wert",                ID_EDIT_NEW_DWORDVALUE
+        END
+        MENUITEM SEPARATOR
+        MENUITEM "&Löschen\tEntf",                ID_EDIT_DELETE
+        MENUITEM "&Unbenennen",                     ID_EDIT_RENAME
+        MENUITEM SEPARATOR
+        MENUITEM "Schlüsselname &kopieren",              ID_EDIT_COPYKEYNAME
+        MENUITEM SEPARATOR
+        MENUITEM "&Suchen\tStrg+F",               ID_EDIT_FIND, GRAYED
+        MENUITEM "&Nächstes finden\tF3",              ID_EDIT_FINDNEXT, GRAYED
+    END
+    POPUP "&Ansicht"
+    BEGIN
+        MENUITEM "Status&leiste",                 ID_VIEW_STATUSBAR
+        MENUITEM SEPARATOR
+        MENUITEM "&Trennen",                      ID_VIEW_SPLIT
+        MENUITEM SEPARATOR
+        MENUITEM "&Aktualisieren\tF5",                ID_VIEW_REFRESH
+    END
+    POPUP "&Favoriten"
+    BEGIN
+        MENUITEM "Zu den Favoriten &hinzugügen",          ID_FAVOURITES_ADDTOFAVOURITES
+        , GRAYED
+        MENUITEM "Von den Favoriten &löschen",           ID_FAVOURITES_REMOVEFAVOURITE
+        , GRAYED
+    END
+    POPUP "&Hilfe"
+    BEGIN
+        MENUITEM "&Hilfethemen\tF1",            ID_HELP_HELPTOPICS
+        MENUITEM SEPARATOR
+        MENUITEM "&Über Registry Editor",      ID_HELP_ABOUT
+    END
+END
+
+IDR_POPUP_MENUS MENU DISCARDABLE
+BEGIN
+  POPUP ""
+  BEGIN
+	MENUITEM "&Ändern",                     ID_EDIT_MODIFY
+	MENUITEM "Binäre Daten ändern",          ID_EDIT_MODIFY_BIN
+	MENUITEM SEPARATOR
+	MENUITEM "&Löschen\tEntf",                ID_EDIT_DELETE
+	MENUITEM "&Umbennenen",                     ID_EDIT_RENAME
+  END
+  POPUP ""
+  BEGIN
+        POPUP "&Neu"
+        BEGIN
+            MENUITEM "&Schlüssel",                  ID_EDIT_NEW_KEY
+            MENUITEM SEPARATOR
+            MENUITEM "&Zeichenkette",               ID_EDIT_NEW_STRINGVALUE
+            MENUITEM "&Binärwert",                  ID_EDIT_NEW_BINARYVALUE
+            MENUITEM "&DWORD Wert",                 ID_EDIT_NEW_DWORDVALUE
+        END
+  END
+END
+
+
+/*
+ * Dialog
+ */
+
+IDD_EDIT_STRING DIALOG  32, 24, 252, 84
+STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | 
+    WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Zeichenkette ändern"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT           "&Name:",IDC_STATIC,6,6,134,8
+    EDITTEXT        IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY
+    LTEXT           "&Daten:",IDC_STATIC,6,35,161,8
+    EDITTEXT        IDC_VALUE_DATA,6,46,240,12,ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "OK",IDOK,142,64,50,14
+    PUSHBUTTON      "Abbrechen",IDCANCEL,196,64,50,14
+END
+
+IDD_EDIT_MULTI_STRING DIALOG  32, 24, 252, 174
+STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | 
+    WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Multi-Stringwert editieren"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT           "&Name:",IDC_STATIC,6,6,134,8
+    EDITTEXT        IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY
+    LTEXT           "&Daten:",IDC_STATIC,6,35,161,8
+    EDITTEXT        IDC_VALUE_DATA,6,46,240,102,ES_AUTOHSCROLL | ES_MULTILINE | ES_WANTRETURN | ES_AUTOVSCROLL | WS_VSCROLL
+    DEFPUSHBUTTON   "OK",IDOK,142,154,50,14
+    PUSHBUTTON      "Abbrechen",IDCANCEL,196,154,50,14
+END
+
+IDD_EDIT_BIN_DATA DIALOG  32, 24, 252, 174
+STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | 
+    WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Binärwert editieren"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT           "&Name:",IDC_STATIC,6,6,134,8
+    EDITTEXT        IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY
+    LTEXT           "&Daten:",IDC_STATIC,6,35,161,8
+    CONTROL         "",IDC_VALUE_DATA,"HexEdit32",WS_VSCROLL | WS_BORDER | WS_TABSTOP,6,46,240,102
+    DEFPUSHBUTTON   "OK",IDOK,142,154,50,14
+    PUSHBUTTON      "Abbrechen",IDCANCEL,196,154,50,14
+END
+
+
+IDD_EDIT_DWORD DIALOG  32, 24, 252, 104
+STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | 
+    WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "DWORD Wert editieren"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT           "&Name:",IDC_STATIC,6,6,134,8
+    EDITTEXT        IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY
+    LTEXT           "&Daten:",IDC_STATIC,6,35,161,8
+    EDITTEXT        IDC_VALUE_DATA,6,46,116,12,ES_AUTOHSCROLL
+    GROUPBOX        "Basis",IDC_STATIC,130,35,116,39
+    AUTORADIOBUTTON "&Hexadezimal",IDC_FORMAT_HEX,141,46,60,10,WS_GROUP
+    AUTORADIOBUTTON "&Dezimal",IDC_FORMAT_DEC,141,59,60,10
+    DEFPUSHBUTTON   "OK",IDOK,142,82,50,14
+    PUSHBUTTON      "Abbrechen",IDCANCEL,196,82,50,14
+END
+
+/*
+ * String Table
+ */
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_LIST_COLUMN_NAME    "Name"
+    IDS_LIST_COLUMN_TYPE    "Typ"
+    IDS_LIST_COLUMN_DATA    "Daten"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_APP_TITLE           "Registry Editor"
+    IDC_REGEDIT             "REGEDIT"
+    IDC_REGEDIT_FRAME       "REGEDIT_FRAME"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    ID_REGISTRY_MENU        "Befehle für für das Bearbeiten der ganzen Registry"
+    ID_EDIT_MENU            "Befehle für um Schlüssel oder Werte zu ändern"
+    ID_VIEW_MENU            "Befehle um das Fenster anzupassen"
+    ID_FAVOURITES_MENU      "Befehle für die Favoriten"
+    ID_HELP_MENU            "Befehle um die Hilfe oder Informationen über das Programm anzuzeigen"
+    ID_EDIT_NEW_MENU        "Befehle für das Erstellen von neuen Schlüsseln oder Daten"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    ID_EDIT_MODIFY          "Ändert die Daten eines Wertes"
+    ID_EDIT_NEW_KEY   "Fügt einen neuen Schlüssel hinzu"
+    ID_EDIT_NEW_STRINGVALUE "Fügt einen neuen Zeichenkette hinzu "
+    ID_EDIT_NEW_BINARYVALUE "Fügt einen neuen Binärwärt hinzu"
+    ID_EDIT_NEW_DWORDVALUE  "Fügt einen neuen DWORT Wert hinzu"
+    ID_REGISTRY_IMPORTREGISTRYFILE "Importiert eine Textddatei in die Registry"
+    ID_REGISTRY_EXPORTREGISTRYFILE
+                            "Exportiert Teile oder die ganze Registry in eine Textdatei"
+    ID_REGISTRY_CONNECTNETWORKREGISTRY
+                            "Verbindet zu einer Registry eines Fremdcomputers"
+    ID_REGISTRY_DISCONNECTNETWORKREGISTRY
+                            "Trennt die Verbindung zu der Registry eines Fremdcomputers"
+    ID_REGISTRY_PRINT       "Druckt Teile oder die gesamte Registry aus"
+/*    ID_HELP_HELPTOPICS      "Öffnet die Hilfe" */
+    ID_HELP_ABOUT           "Zeigt Programmname, Version und Copyright an"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    ID_REGISTRY_EXIT        "Beendet den Registry Editor"
+    ID_FAVOURITES_ADDTOFAVOURITES "Fügt Schlüssel to den Favoriten hinzu"
+    ID_FAVOURITES_REMOVEFAVOURITE "Löscht Schlüssel von den Favoriten"
+    ID_VIEW_STATUSBAR       "Zeigt oder versteckt die Statusleiste"
+    ID_VIEW_SPLIT           "Ändert die Position das Fensterteilers"
+    ID_VIEW_REFRESH         "Aktualisiert das Fenster"
+    ID_EDIT_DELETE          "Löscht die Auswahl"
+    ID_EDIT_RENAME          "Bennent die Auswahl um"
+    ID_EDIT_COPYKEYNAME     "Kopiert den Schlüsselnamen in die Zwischenablage"
+    ID_EDIT_FIND            "Findet eine Zeichenkette in einem Schlüssel, einem Namen oder in Daten"
+    ID_EDIT_FINDNEXT        "Findet nächste Zeichenkette"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_ERROR		    "Fehler"
+    IDS_BAD_VALUE           "Kann den Wert '%s' nicht lesen"
+    IDS_UNSUPPORTED_TYPE    "Kann Schlüssel von diesem Typ (%ld) nicht ändern"
+    IDS_TOO_BIG_VALUE       "Der Wert ist zu groß (%ld)"
+    IDS_MULTI_SZ_EMPTY_STRING "Daten vom Typ REG_MULTI_SZ können keine leere Zeichenketten enthalten.\nDie leeren Zeichenkette wurden von der Liste gelöscht."
+    IDS_QUERY_DELETE_ONE    "Diesen Wert wirklich löschen?"
+    IDS_QUERY_DELETE_MORE   "Diese Werte wirklich löschen?"
+    IDS_QUERY_DELETE_CONFIRM "Löschen bestätigen"
+    IDS_ERR_DELVAL_CAPTION  "Fehler beim Löschen von Werten"
+    IDS_ERR_DELETEVALUE     "Es konnten nicht alle Werte gelöscht werden!"
+    IDS_ERR_RENVAL_CAPTION  "Fehler beim Umbennnen des Wertes"
+    IDS_ERR_RENVAL_TOEMPTY  "Kann %s nicht umbennenen. Der angebene Name ist leer."
+
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_BINARY_EMPTY	    "(lerrer Binärwert)"
+    IDS_DEFAULT_VALUE_NAME  "(Standard)"
+    IDS_VALUE_NOT_SET       "(Wert nicht gesetzt)"
+    IDS_UNKNOWN_TYPE        "Unbekannter Typ: (0x%lx)"
+    IDS_MY_COMPUTER         "Arbeitsplatz"
+    IDS_IMPORT_REG_FILE     "Registry importieren"
+    IDS_EXPORT_REG_FILE     "Registry exportieren"
+    IDS_INVALID_DWORD       "(ungültiger DWORD Wert)"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_FLT_REGFILES        "Registrierungsdateien"
+    IDS_FLT_REGFILES_FLT    "*.reg"
+    IDS_FLT_REGEDIT4        "Win9x/NT4 Registrierungsdateien (REGEDIT4)"
+    IDS_FLT_REGEDIT4_FLT    "*.reg"
+    IDS_FLT_ALLFILES        "Alle Dateien (*.*)"
+    IDS_FLT_ALLFILES_FLT    "*.*"
+END
+
+/*****************************************************************/
+
+
+/*
+ * Dialog
+ */
+
+IDD_DIALOG1 DIALOG DISCARDABLE  50, 50, 268, 98
+STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS |
+    WS_BORDER
+FONT 8, "MS Sans Serif"
+BEGIN
+END
+
+IDD_DIALOG2 DIALOG DISCARDABLE  0, 0, 187, 95
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Dialog"
+FONT 8, "MS Sans Serif"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,130,7,50,14
+    PUSHBUTTON      "Abbrechen",IDCANCEL,130,24,50,14
+END
+
+
+/*
+ * TEXTINCLUDE
+ */
+
+1 TEXTINCLUDE DISCARDABLE
+BEGIN
+    "resource.h\0"
+END
+
+
+
+/*
+ * String Table
+ */
+
+/*
+ *STRINGTABLE DISCARDABLE
+ *BEGIN
+ *    ID_HELP_HELPTOPICS      "Öffnet die Hilfe."
+ *    ID_HELP_ABOUT           "Zeigt Programmname, Version und Copyright an"
+ *END
+ */
+
+/*****************************************************************/
diff --git a/reactos/subsys/system/regedit/hexedit.c b/reactos/subsys/system/regedit/hexedit.c
index c58cf1e5c52..b52907017a8 100644
--- a/reactos/subsys/system/regedit/hexedit.c
+++ b/reactos/subsys/system/regedit/hexedit.c
@@ -763,7 +763,7 @@ HEXEDIT_WM_KEYDOWN(PHEXEDIT_DATA hed, INT VkCode)
   
   switch(VkCode)
   {
-    case VK_LEFT:MessageBox(0, L"", L"", 0);
+    case VK_LEFT:
       if(hed->Position > 0)
       {
         if(--hed->CaretCol < 0)
diff --git a/reactos/subsys/system/regedit/rsrc.rc b/reactos/subsys/system/regedit/rsrc.rc
index fc5f795a49f..f9ed3b88ee1 100644
--- a/reactos/subsys/system/regedit/rsrc.rc
+++ b/reactos/subsys/system/regedit/rsrc.rc
@@ -27,6 +27,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 /* include localised resources */
 
+#include "De.rc"
 #include "En.rc"
 #include "Fr.rc"
 #include "It.rc"

From 8d5c0638409d1224589092576905b22707c09cbf Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Mon, 21 Jun 2004 18:57:22 +0000
Subject: [PATCH 026/356] use FormatMessage() to print some error messages.
 Patch by Michael Fritscher.

svn path=/trunk/; revision=9801
---
 reactos/subsys/system/cmd/cmd.c      |  4 ++--
 reactos/subsys/system/cmd/cmd.h      |  3 ++-
 reactos/subsys/system/cmd/console.c  | 16 +++++++++++++++-
 reactos/subsys/system/cmd/internal.c |  4 ++--
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/reactos/subsys/system/cmd/cmd.c b/reactos/subsys/system/cmd/cmd.c
index 9a13b1b5324..7fc6c6692b8 100644
--- a/reactos/subsys/system/cmd/cmd.c
+++ b/reactos/subsys/system/cmd/cmd.c
@@ -1,4 +1,4 @@
-/* $Id: cmd.c,v 1.15 2004/06/06 17:33:13 hbirr Exp $
+/* $Id: cmd.c,v 1.16 2004/06/21 18:57:22 weiden Exp $
  *
  *  CMD.C - command-line interface.
  *
@@ -1334,7 +1334,7 @@ int main (int argc, char *argv[])
 			OPEN_EXISTING, 0, NULL);
   if (GetConsoleScreenBufferInfo(hConsole, &Info) == FALSE)
     {
-      ConErrPrintf (_T("GetConsoleScreenBufferInfo: Error: %ld\n"), GetLastError());
+      ConOutFormatMessage(GetLastError());
       return(1);
     }
   wColor = Info.wAttributes;
diff --git a/reactos/subsys/system/cmd/cmd.h b/reactos/subsys/system/cmd/cmd.h
index d9a48e43308..cd6534d44a2 100644
--- a/reactos/subsys/system/cmd/cmd.h
+++ b/reactos/subsys/system/cmd/cmd.h
@@ -1,4 +1,4 @@
-/* $Id: cmd.h,v 1.4 2003/12/26 09:52:37 navaraf Exp $
+/* $Id: cmd.h,v 1.5 2004/06/21 18:57:22 weiden Exp $
  *
  *  CMD.H - header file for the modules in CMD.EXE
  *
@@ -170,6 +170,7 @@ VOID ConOutPrintf (LPTSTR, ...);
 VOID ConErrChar (TCHAR);
 VOID ConErrPuts (LPTSTR);
 VOID ConErrPrintf (LPTSTR, ...);
+VOID ConOutFormatMessage (DWORD MessageId, ...);	
 
 SHORT GetCursorX  (VOID);
 SHORT GetCursorY  (VOID);
diff --git a/reactos/subsys/system/cmd/console.c b/reactos/subsys/system/cmd/console.c
index 35a16c3a453..33e925092da 100644
--- a/reactos/subsys/system/cmd/console.c
+++ b/reactos/subsys/system/cmd/console.c
@@ -1,4 +1,4 @@
-/* $Id: console.c,v 1.5 2004/04/30 16:52:41 navaraf Exp $
+/* $Id: console.c,v 1.6 2004/06/21 18:57:22 weiden Exp $
  *
  *  CONSOLE.C - console input/output functions.
  *
@@ -223,6 +223,20 @@ VOID ConPrintf(LPTSTR szFormat, va_list arg_ptr, DWORD nStdHandle)
 #endif
 }
 
+VOID ConOutFormatMessage (DWORD MessageId, ...)
+{
+	DWORD temp;
+	LPTSTR text;
+	va_list arg_ptr;
+	temp = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+	       NULL,
+	       MessageId,
+	       MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+	       (LPTSTR) &text,
+	       0,
+	       &arg_ptr);
+	ConErrPrintf (text);	
+}
 
 VOID ConOutPrintf (LPTSTR szFormat, ...)
 {
diff --git a/reactos/subsys/system/cmd/internal.c b/reactos/subsys/system/cmd/internal.c
index c8a6f9feea0..0d03cf8322b 100644
--- a/reactos/subsys/system/cmd/internal.c
+++ b/reactos/subsys/system/cmd/internal.c
@@ -247,8 +247,8 @@ INT cmd_chdir (LPTSTR cmd, LPTSTR param)
 	if (!SetCurrentDirectory (dir))
 	{
 		//ErrorMessage (GetLastError(), _T("CD"));
-		ConErrPrintf (_T("Dir \"%s\" doesn't seem to exist!"),dir);
-
+		ConOutFormatMessage(GetLastError());
+		
 		/* throw away current directory */
 		free (lpOldPath);
 		lpOldPath = NULL;

From d9954bc076142502d28d2c32bae2a99baf97f000 Mon Sep 17 00:00:00 2001
From: Martin Fuchs <fuchs.martin@gmail.com>
Date: Mon, 21 Jun 2004 19:32:49 +0000
Subject: [PATCH 027/356] disable explorer sidebar in SDI mode

svn path=/trunk/; revision=9803
---
 reactos/subsys/system/explorer/explorer_intres.rc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/reactos/subsys/system/explorer/explorer_intres.rc b/reactos/subsys/system/explorer/explorer_intres.rc
index 5a6241bb229..319d9b75cca 100644
--- a/reactos/subsys/system/explorer/explorer_intres.rc
+++ b/reactos/subsys/system/explorer/explorer_intres.rc
@@ -81,7 +81,7 @@ BEGIN
     POPUP "²é¿´(&V)"
     BEGIN
         MENUITEM "¹¤¾ßÀ¸(&T)",                  ID_VIEW_TOOL_BAR
-        MENUITEM "²à±ßÀ¸(&S)",                  ID_VIEW_SIDE_BAR
+        MENUITEM "²à±ßÀ¸(&S)",                  ID_VIEW_SIDE_BAR, GRAYED
         MENUITEM "״̬À¸(&S)",                  ID_VIEW_STATUSBAR
         MENUITEM SEPARATOR
         MENUITEM "Ë¢ÐÂ(&R)\tF5",                ID_REFRESH
@@ -486,8 +486,8 @@ BEGIN
     POPUP "&Prezentare"
     BEGIN
         MENUITEM "&Bara cu instrumente",        ID_VIEW_TOOL_BAR
+        MENUITEM "&Side Bar",                   ID_VIEW_SIDE_BAR, GRAYED
         MENUITEM "&Bara de stare",              ID_VIEW_STATUSBAR
-        MENUITEM "&Side Bar",                   ID_VIEW_SIDE_BAR
         MENUITEM SEPARATOR
         MENUITEM "&Resetare\tF5",               ID_REFRESH
         MENUITEM "F&ull Screen\tCtrl+Shift+S",  ID_VIEW_FULLSCREEN
@@ -802,7 +802,7 @@ BEGIN
     POPUP "&Ansicht"
     BEGIN
         MENUITEM "&Toolbar",                    ID_VIEW_TOOL_BAR
-        MENUITEM "S&ide Bar",                   ID_VIEW_SIDE_BAR
+        MENUITEM "S&ide Bar",                   ID_VIEW_SIDE_BAR, GRAYED
         MENUITEM "&Status Bar",                 ID_VIEW_STATUSBAR
         MENUITEM SEPARATOR
         MENUITEM "&Aktualisieren\tF5",          ID_REFRESH
@@ -1072,7 +1072,7 @@ BEGIN
     POPUP "&View"
     BEGIN
         MENUITEM "&Toolbar",                    ID_VIEW_TOOL_BAR
-        MENUITEM "&Side Bar",                   ID_VIEW_SIDE_BAR
+        MENUITEM "&Side Bar",                   ID_VIEW_SIDE_BAR, GRAYED
         MENUITEM "&Status Bar",                 ID_VIEW_STATUSBAR
         MENUITEM SEPARATOR
         MENUITEM "&Refresh\tF5",                ID_REFRESH
@@ -1524,7 +1524,7 @@ BEGIN
     POPUP "&Affichage"
     BEGIN
         MENUITEM "Barre d'&outils",             ID_VIEW_TOOL_BAR
-        MENUITEM "&Side Bar",                   ID_VIEW_SIDE_BAR
+        MENUITEM "&Side Bar",                   ID_VIEW_SIDE_BAR, GRAYED
         MENUITEM "Barre d'&état",               ID_VIEW_STATUSBAR
         MENUITEM SEPARATOR
         MENUITEM "&Refresh\tF5",                ID_REFRESH

From bfce2bcf202ccf8b2552dbf1b4c95e206949ea1d Mon Sep 17 00:00:00 2001
From: "KJK::Hyperion" <hackbunny@reactos.org>
Date: Mon, 21 Jun 2004 20:55:16 +0000
Subject: [PATCH 028/356] Another PSEH fix

svn path=/trunk/; revision=9804
---
 reactos/include/pseh/excpt.h      | 32 +++++++++++++++++++++++++++++++
 reactos/include/pseh/framebased.h | 10 +++-------
 reactos/lib/pseh/framebased.c     | 13 +++++++------
 reactos/tools/helper.mk           |  6 +++---
 4 files changed, 45 insertions(+), 16 deletions(-)
 create mode 100644 reactos/include/pseh/excpt.h

diff --git a/reactos/include/pseh/excpt.h b/reactos/include/pseh/excpt.h
new file mode 100644
index 00000000000..3dcbb36afb4
--- /dev/null
+++ b/reactos/include/pseh/excpt.h
@@ -0,0 +1,32 @@
+/*
+ Copyright (c) 2004 KJK::Hyperion
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a copy of
+ this software and associated documentation files (the "Software"), to deal in
+ the Software without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ of the Software, and to permit persons to whom the Software is furnished to do
+ so, subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+*/
+
+#ifndef KJK_PSEH_EXCPT_H_
+#define KJK_PSEH_EXCPT_H_
+
+#define _SEH_CONTINUE_EXECUTION (-1)
+#define _SEH_CONTINUE_SEARCH (0)
+#define _SEH_EXECUTE_HANDLER (1)
+
+#endif
+
+/* EOF */
diff --git a/reactos/include/pseh/framebased.h b/reactos/include/pseh/framebased.h
index a203a045f27..94e348c18e3 100644
--- a/reactos/include/pseh/framebased.h
+++ b/reactos/include/pseh/framebased.h
@@ -24,11 +24,7 @@
 #define KJK_PSEH_FRAMEBASED_H_
 
 #include <pseh/framebased/internal.h>
-
-/* Safeguards against broken SDK/CRT headers */
-#ifndef _SEH_NO_SYSTEM_HEADERS
-# include <excpt.h>
-#endif
+#include <pseh/excpt.h>
 
 #ifndef offsetof
 # include <stddef.h>
@@ -81,7 +77,7 @@ static __declspec(noreturn) void __stdcall _SEHCompilerSpecificHandler
 #define _SEH_TRY_FINALLY(FINALLY_) \
  _SEH_TRY_FILTER_FINALLY \
  ( \
-  (_SEHFilter_t)(EXCEPTION_CONTINUE_SEARCH + 1), \
+  (_SEHFilter_t)(_SEH_CONTINUE_SEARCH + 1), \
   (FINALLY_) \
  )
 
@@ -93,7 +89,7 @@ static __declspec(noreturn) void __stdcall _SEHCompilerSpecificHandler
 #define _SEH_TRY_HANDLE_FINALLY(FINALLY_) \
  _SEH_TRY_FILTER_FINALLY \
  ( \
-  (_SEHFilter_t)(EXCEPTION_EXECUTE_HANDLER + 1), \
+  (_SEHFilter_t)(_SEH_EXECUTE_HANDLER + 1), \
   (FINALLY_) \
  )
 
diff --git a/reactos/lib/pseh/framebased.c b/reactos/lib/pseh/framebased.c
index 6393bba5f28..e858b21680a 100644
--- a/reactos/lib/pseh/framebased.c
+++ b/reactos/lib/pseh/framebased.c
@@ -25,6 +25,7 @@
 #include <windows.h>
 
 #include <pseh/framebased/internal.h>
+#include <pseh/excpt.h>
 #include <excpt.h>
 
 /* Assembly helpers, see i386/framebased.asm */
@@ -78,9 +79,9 @@ int __cdecl _SEHFrameHandler
 
    switch((UINT_PTR)frame->SPF_Handlers->SH_Filter)
    {
-    case EXCEPTION_EXECUTE_HANDLER + 1:
-    case EXCEPTION_CONTINUE_SEARCH + 1:
-    case EXCEPTION_CONTINUE_EXECUTION + 1:
+    case _SEH_EXECUTE_HANDLER + 1:
+    case _SEH_CONTINUE_SEARCH + 1:
+    case _SEH_CONTINUE_EXECUTION + 1:
     {
      ret = (int)((UINT_PTR)frame->SPF_Handlers->SH_Filter) - 1;
      break;
@@ -98,13 +99,13 @@ int __cdecl _SEHFrameHandler
     }
    }
 
-   /* EXCEPTION_CONTINUE_EXECUTION */
+   /* _SEH_CONTINUE_EXECUTION */
    if(ret < 0)
     return ExceptionContinueExecution;
-   /* EXCEPTION_EXECUTE_HANDLER */
+   /* _SEH_EXECUTE_HANDLER */
    else if(ret > 0)
     _SEHCallHandler(frame);
-   /* EXCEPTION_CONTINUE_SEARCH */
+   /* _SEH_CONTINUE_SEARCH */
    else
     /* fall through */;
   }
diff --git a/reactos/tools/helper.mk b/reactos/tools/helper.mk
index 71875be6d72..54aac3b16c1 100644
--- a/reactos/tools/helper.mk
+++ b/reactos/tools/helper.mk
@@ -1,4 +1,4 @@
-# $Id: helper.mk,v 1.68 2004/06/18 22:33:06 hyperion Exp $
+# $Id: helper.mk,v 1.69 2004/06/21 20:55:16 hyperion Exp $
 #
 # Helper makefile for ReactOS modules
 # Variables this makefile accepts:
@@ -583,8 +583,8 @@ endif
 ifeq ($(MK_MODE),kernel)
   MK_DEFBASE := 0x10000
   MK_LIBS := $(addprefix $(DDK_PATH_LIB)/, $(TARGET_DDKLIBS) $(MK_DDKLIBS))
-  MK_CFLAGS += -D_SEH_NO_NATIVE_NLG -D_SEH_NO_SYSTEM_HEADERS
-  MK_CPPFLAGS += -D_SEH_NO_NATIVE_NLG -D_SEH_NO_SYSTEM_HEADERS
+  MK_CFLAGS += -D_SEH_NO_NATIVE_NLG
+  MK_CPPFLAGS += -D_SEH_NO_NATIVE_NLG
 endif
 
 

From 924522f57cd02b46a11f4c11a1d9cebf196d8547 Mon Sep 17 00:00:00 2001
From: Hartmut Birr <osexpert@googlemail.com>
Date: Mon, 21 Jun 2004 20:56:53 +0000
Subject: [PATCH 029/356] - Fixed the access to an uninitialized variable in
 IntCreateClass.

svn path=/trunk/; revision=9805
---
 reactos/subsys/win32k/ntuser/class.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reactos/subsys/win32k/ntuser/class.c b/reactos/subsys/win32k/ntuser/class.c
index 6683da65076..6de093a39b7 100644
--- a/reactos/subsys/win32k/ntuser/class.c
+++ b/reactos/subsys/win32k/ntuser/class.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: class.c,v 1.58 2004/06/20 00:45:36 navaraf Exp $
+/* $Id: class.c,v 1.59 2004/06/21 20:56:53 hbirr Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -278,7 +278,7 @@ IntCreateClass(
 	ULONG  objectSize;
 	BOOL Global;
 
-	Global = !(Flags & REGISTERCLASS_SYSTEM) ? ClassObject->style & CS_GLOBALCLASS : TRUE;
+	Global = (Flags & REGISTERCLASS_SYSTEM) || (lpwcx->style & CS_GLOBALCLASS) ? TRUE : FALSE;
 
 	/* Check for double registration of the class. */
 	if (PsGetWin32Process() != NULL)

From 7d5a8e2e07c1f39306bb0256dbc20e13546f056e Mon Sep 17 00:00:00 2001
From: Hartmut Birr <osexpert@googlemail.com>
Date: Mon, 21 Jun 2004 21:00:37 +0000
Subject: [PATCH 030/356] - Reduced the necessary size of inquiry data to 4
 byte. - Incremented the active irp counters in SpiAddActiveIrp,   because the
 valid value is necessary in this function while starting new irp's. - Do not
 set the command queueing enable flag in SpiAddActiveIrp,   because this is
 the job of a driver above scsiport.

svn path=/trunk/; revision=9806
---
 reactos/drivers/storage/scsiport/scsiport.c | 34 ++++++++++++---------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/reactos/drivers/storage/scsiport/scsiport.c b/reactos/drivers/storage/scsiport/scsiport.c
index 996b2988256..2caa7671ba7 100644
--- a/reactos/drivers/storage/scsiport/scsiport.c
+++ b/reactos/drivers/storage/scsiport/scsiport.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: scsiport.c,v 1.61 2004/06/15 09:29:41 hbirr Exp $
+/* $Id: scsiport.c,v 1.62 2004/06/21 21:00:37 hbirr Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -48,6 +48,8 @@
 
 /* GLOBALS *******************************************************************/
 
+static ULONG InternalDebugLevel = 0;
+
 static VOID
 SpiProcessRequests(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, 
 	           PIRP NextIrp);
@@ -202,10 +204,8 @@ ScsiDebugPrint(IN ULONG DebugPrintLevel,
   char Buffer[256];
   va_list ap;
 
-#if 0
-  if (DebugPrintLevel > InternalDebugLevel)
+  if (DebugPrintLevel >= InternalDebugLevel)
     return;
-#endif
 
   va_start(ap, DebugMessage);
   vsprintf(Buffer, DebugMessage, ap);
@@ -1787,8 +1787,6 @@ SpiAllocateSrbExtension(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
         {
 	  DeviceExtension->CurrentSrbExtensions++;  
           Srb->SrbExtension = DeviceExtension->VirtualAddress + index * DeviceExtension->SrbExtensionSize;
-//	  Srb->QueueTag = i;
-//	  Srb->QueueAction = SRB_SIMPLE_TAG_REQUEST;
 	}
     }
   DPRINT("%x\n", Srb->SrbExtension);
@@ -2042,7 +2040,14 @@ SpiScanAdapter (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension)
 	      if (NT_SUCCESS(ScanData->Status) &&
 		  (Srb->SrbStatus == SRB_STATUS_SUCCESS || 
 		   (Srb->SrbStatus == SRB_STATUS_DATA_OVERRUN && 
-		    Srb->DataTransferLength >= INQUIRYDATABUFFERSIZE)) &&
+		   /*
+		    * FIXME: 
+		    *   The NT 4.0 driver from an inic950 based scsi controller 
+		    *   returns only 4 byte of inquiry data, but the device name 
+		    *   is visible on NT 4.0. We must implement an other way 
+		    *   to get the complete inquiry data. 
+		    */
+		    Srb->DataTransferLength >= /*INQUIRYDATABUFFERSIZE*/4)) &&
 		  ((PINQUIRYDATA)Srb->DataBuffer)->DeviceTypeQualifier == 0)
 		{
 		  /* Copy inquiry data */
@@ -2777,13 +2782,10 @@ SpiAddActiveIrp(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
   PSCSI_REQUEST_BLOCK Srb;
   LunExtension = Irp->Tail.Overlay.DriverContext[2];
   Srb = Irp->Tail.Overlay.DriverContext[3];
-  Srb->SrbFlags |= SRB_FLAGS_IS_ACTIVE;
   Irp->Tail.Overlay.DriverContext[0] = (PVOID)DeviceExtension->NextIrp;
   InterlockedExchangePointer(&DeviceExtension->NextIrp, Irp);
   Irp->Tail.Overlay.DriverContext[1] = (PVOID)LunExtension->NextIrp;
   InterlockedExchangePointer(&LunExtension->NextIrp, Irp);
-  InterlockedIncrement((PLONG)&LunExtension->ActiveIrpCount);
-  InterlockedIncrement((PLONG)&DeviceExtension->ActiveIrpCount);
 }
 
 static VOID
@@ -2838,10 +2840,6 @@ SpiProcessRequests(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
        * FIXME:
        *   Is this the right place to set this flag ?
        */
-      if (DeviceExtension->PortConfig->MultipleRequestPerLu)
-        {
-	  Srb->SrbFlags |= SRB_FLAGS_QUEUE_ACTION_ENABLE;
-	}
       NextIrp->Tail.Overlay.DriverContext[2] = (PVOID)Srb->QueueSortKey;
       LunExtension = Srb->OriginalRequest;
 
@@ -3021,6 +3019,10 @@ SpiProcessRequests(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
 	        {
 		  LunExtension->PendingIrpCount--;
 		  DeviceExtension->PendingIrpCount--;
+		  Srb->SrbFlags |= SRB_FLAGS_IS_ACTIVE;
+                  LunExtension->ActiveIrpCount++;
+                  DeviceExtension->ActiveIrpCount++;
+
                   RemoveEntryList((PLIST_ENTRY)&Irp->Tail.Overlay.DriverContext[0]);
 		  Irp->Tail.Overlay.DriverContext[2] = LunExtension;
 		  Srb->OriginalRequest = Irp;
@@ -3058,6 +3060,10 @@ SpiProcessRequests(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
 
 	  LunExtension->PendingIrpCount--;
 	  DeviceExtension->PendingIrpCount--;
+          Srb->SrbFlags |= SRB_FLAGS_IS_ACTIVE;
+	  LunExtension->ActiveIrpCount++;
+          DeviceExtension->ActiveIrpCount++;
+
 	  SpiAllocateSrbExtension(DeviceExtension, Srb);
           KeReleaseSpinLockFromDpcLevel(&DeviceExtension->Lock);
 

From 7b96a26e57d05185760764b1d02f8a1d4fb7ba72 Mon Sep 17 00:00:00 2001
From: Hartmut Birr <osexpert@googlemail.com>
Date: Mon, 21 Jun 2004 21:03:12 +0000
Subject: [PATCH 031/356] - Enabled the command queueing (in
 DiskClassCreateDeviceObject). - Do always reread the partition table in
 DiskBuildPartitionTable,   because DiskBuildPartitionTable is only called for
 removable media's. - If there is no partition table available, set the disk
 data entries   for this volume to the super floppy format (in
 DiskBuildPartitionTable).

svn path=/trunk/; revision=9807
---
 reactos/drivers/storage/disk/disk.c | 80 +++++++++++++++++++----------
 1 file changed, 53 insertions(+), 27 deletions(-)

diff --git a/reactos/drivers/storage/disk/disk.c b/reactos/drivers/storage/disk/disk.c
index 23de91ef1af..993f4c39e80 100644
--- a/reactos/drivers/storage/disk/disk.c
+++ b/reactos/drivers/storage/disk/disk.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: disk.c,v 1.41 2004/05/10 18:02:20 gvg Exp $
+/* $Id: disk.c,v 1.42 2004/06/21 21:03:12 hbirr Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -548,6 +548,14 @@ DiskClassCreateDeviceObject(IN PDRIVER_OBJECT DriverObject,
   DiskDeviceExtension->PathId = InquiryData->PathId;
   DiskDeviceExtension->TargetId = InquiryData->TargetId;
   DiskDeviceExtension->Lun = InquiryData->Lun;
+  DiskDeviceExtension->SrbFlags = 0;
+
+  /* Enable the command queueing, if it possible */
+  if (Capabilities->TaggedQueuing &&
+      ((PINQUIRYDATA)InquiryData->InquiryData)->CommandQueue)
+    {
+      DiskDeviceExtension->SrbFlags |= SRB_FLAGS_QUEUE_ACTION_ENABLE;
+    }
 
   /* Get timeout value */
   DiskDeviceExtension->TimeOutValue =
@@ -589,7 +597,7 @@ DiskClassCreateDeviceObject(IN PDRIVER_OBJECT DriverObject,
     }
 
   /* Allocate sense data buffer */
-  DiskDeviceExtension->SenseData = ExAllocatePool(NonPagedPool,
+  DiskDeviceExtension->SenseData = ExAllocatePool(NonPagedPoolCacheAligned,
 						  SENSE_BUFFER_SIZE);
   if (DiskDeviceExtension->SenseData == NULL)
     {
@@ -853,14 +861,17 @@ DiskBuildPartitionTable(IN PDEVICE_OBJECT DiskDeviceObject,
   DiskDeviceExtension = (PDEVICE_EXTENSION)DiskDeviceObject->DeviceExtension;
   DiskData = (PDISK_DATA)(DiskDeviceExtension + 1);
 
-  if (DiskDeviceExtension->StartingOffset.QuadPart)
+  Status = ScsiClassReadDriveCapacity(DiskDeviceObject);
+  if (!NT_SUCCESS(Status))
     {
-      DPRINT("Partition already installed\n");
-      return(STATUS_SUCCESS);
+      /* Drive is not ready. */
+      DPRINT("Drive not ready\n");
+      DiskData->DriveNotReady = TRUE;
+      return Status;
     }
 
-      /* Read partition table */
-  Status = IoReadPartitionTable(DiskDeviceObject,
+  /* Read partition table */
+  Status = IoReadPartitionTable(DiskDeviceExtension->PhysicalDevice,
 				DiskDeviceExtension->DiskGeometry->BytesPerSector,
 				TRUE,
 				&PartitionList);
@@ -886,27 +897,42 @@ DiskBuildPartitionTable(IN PDEVICE_OBJECT DiskDeviceObject,
       /* Set disk signature */
       DiskData->Signature = PartitionList->Signature;
 
-      for (PartitionNumber = 0; PartitionNumber < PartitionList->PartitionCount; PartitionNumber++)
-	{
-	  PartitionEntry = &PartitionList->PartitionEntry[PartitionNumber];
+      DiskData->NextPartition = NULL;
 
-      	DiskData->NextPartition = NULL;
-      	DiskData->PartitionType = PartitionEntry->PartitionType;
-      	DiskData->PartitionNumber = PartitionNumber + 1;
-      	DiskData->PartitionOrdinal = PartitionNumber + 1;
-      	DiskData->HiddenSectors = PartitionEntry->HiddenSectors;
-      	DiskData->BootIndicator = PartitionEntry->BootIndicator;
-      	DiskData->DriveNotReady = FALSE;
-      	DiskDeviceExtension->StartingOffset = PartitionEntry->StartingOffset;
-      	DiskDeviceExtension->PartitionLength = PartitionEntry->PartitionLength;
+      if (PartitionList->PartitionCount)
+        {
+          for (PartitionNumber = 0; PartitionNumber < PartitionList->PartitionCount; PartitionNumber++)
+	    {
+	      PartitionEntry = &PartitionList->PartitionEntry[PartitionNumber];
+
+      	      DiskData->PartitionType = PartitionEntry->PartitionType;
+      	      DiskData->PartitionNumber = PartitionNumber + 1;
+      	      DiskData->PartitionOrdinal = PartitionNumber + 1;
+      	      DiskData->HiddenSectors = PartitionEntry->HiddenSectors;
+      	      DiskData->BootIndicator = PartitionEntry->BootIndicator;
+      	      DiskData->DriveNotReady = FALSE;
+      	      DiskDeviceExtension->StartingOffset = PartitionEntry->StartingOffset;
+      	      DiskDeviceExtension->PartitionLength = PartitionEntry->PartitionLength;
 		
-	  DPRINT("Partition %02ld: nr: %d boot: %1x type: %x offset: %I64d size: %I64d\n",
-		 PartitionNumber,
-		 DiskData->PartitionNumber,
-		 DiskData->BootIndicator,
-		 DiskData->PartitionType,
-		 DiskDeviceExtension->StartingOffset.QuadPart / 512 /*DrvParms.BytesPerSector*/,
-		 DiskDeviceExtension->PartitionLength.QuadPart / 512 /* DrvParms.BytesPerSector*/);
+	      DPRINT1("Partition %02ld: nr: %d boot: %1x type: %x offset: %I64d size: %I64d\n",
+		      PartitionNumber,
+		      DiskData->PartitionNumber,
+		      DiskData->BootIndicator,
+		      DiskData->PartitionType,
+		      DiskDeviceExtension->StartingOffset.QuadPart / 512 /*DrvParms.BytesPerSector*/,
+		      DiskDeviceExtension->PartitionLength.QuadPart / 512 /* DrvParms.BytesPerSector*/);
+	    }
+	}
+      else
+        {
+      	  DiskData->PartitionType = 0;
+      	  DiskData->PartitionNumber = 1;
+      	  DiskData->PartitionOrdinal = 0;
+          DiskData->HiddenSectors = 0;
+ 	  DiskData->BootIndicator = 0;
+  	  DiskData->DriveNotReady = FALSE;
+          DiskDeviceExtension->PartitionLength.QuadPart += DiskDeviceExtension->StartingOffset.QuadPart;
+	  DiskDeviceExtension->StartingOffset.QuadPart = 0;
 	}    
     }
 
@@ -980,7 +1006,7 @@ DiskClassDeviceControl(IN PDEVICE_OBJECT DeviceObject,
 	    if (!NT_SUCCESS(Status))
 	      {
 		/* Drive is not ready */
-		DiskData->DriveNotReady = FALSE;
+		DiskData->DriveNotReady = TRUE;
 		break;
 	      }
 

From 362995c318bef6ac2ed44a6db7c8f901b121fd83 Mon Sep 17 00:00:00 2001
From: "KJK::Hyperion" <hackbunny@reactos.org>
Date: Mon, 21 Jun 2004 21:07:29 +0000
Subject: [PATCH 032/356] Does ntoskrnl really need its own makefile?

svn path=/trunk/; revision=9808
---
 reactos/ntoskrnl/Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/reactos/ntoskrnl/Makefile b/reactos/ntoskrnl/Makefile
index 0af7d653557..f502b63657f 100644
--- a/reactos/ntoskrnl/Makefile
+++ b/reactos/ntoskrnl/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.124 2004/06/21 04:12:59 ion Exp $
+# $Id: Makefile,v 1.125 2004/06/21 21:07:29 hyperion Exp $
 #
 # ReactOS Operating System
 #
@@ -52,6 +52,9 @@ endif
 # require os code to explicitly request A/W version of structs/functions
 CFLAGS += -D_DISABLE_TIDENTS
 
+# no native setjmp/longjmp in the kernel
+CFLAGS += -D_SEH_NO_NATIVE_NLG
+
 CFLAGS += $(STD_CFLAGS)
 ASFLAGS += $(STD_ASFLAGS)
 RCFLAGS += $(STD_RCFLAGS)

From c7ce024b3a3688a77a380aa8f1527db23b88eb92 Mon Sep 17 00:00:00 2001
From: Vizzini <vizzini@plasmic.com>
Date: Tue, 22 Jun 2004 03:02:33 +0000
Subject: [PATCH 033/356] minor debug message fix

svn path=/trunk/; revision=9809
---
 reactos/drivers/storage/floppy/hardware.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reactos/drivers/storage/floppy/hardware.c b/reactos/drivers/storage/floppy/hardware.c
index e881d83f1eb..ec340e99b83 100644
--- a/reactos/drivers/storage/floppy/hardware.c
+++ b/reactos/drivers/storage/floppy/hardware.c
@@ -288,7 +288,7 @@ NTSTATUS NTAPI HwTurnOffMotor(PCONTROLLER_INFO ControllerInfo)
  *     - Called at DISPATCH_LEVEL
  */
 {
-  KdPrint(("floppy: HwTurnOffMotor: writing byte 0x%x to offset 0x%x\n", DOR_FDC_ENABLE|DOR_DMA_IO_INTERFACE_ENABLE));
+  KdPrint(("floppy: HwTurnOffMotor: writing byte 0x%x to offset 0x%x\n", DOR_FDC_ENABLE|DOR_DMA_IO_INTERFACE_ENABLE, DIGITAL_OUTPUT_REGISTER));
 
   WRITE_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_OUTPUT_REGISTER, DOR_FDC_ENABLE|DOR_DMA_IO_INTERFACE_ENABLE);
 

From 55dc4a9268a95fca3c907cad1dda8ac86839119a Mon Sep 17 00:00:00 2001
From: Richard Campbell <betam4x@gmail.com>
Date: Tue, 22 Jun 2004 10:46:09 +0000
Subject: [PATCH 034/356] very basic makefile for vs2003 (and the free tools). 
 Please note that some programs don't compile properly, will take a look at
 this later.

svn path=/trunk/; revision=9810
---
 reactos/tools/makefile.vs2003 | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 reactos/tools/makefile.vs2003

diff --git a/reactos/tools/makefile.vs2003 b/reactos/tools/makefile.vs2003
deleted file mode 100644
index def91aa5543..00000000000
--- a/reactos/tools/makefile.vs2003
+++ /dev/null
@@ -1,13 +0,0 @@
-tools : buildno.c depends.c mkconfig.c mkflpimg.c rcopy.c rdel.c regtests.c rline.c rmkdir.c rrmdir.c rsym.c rtouch.c
-	cl buildno.c
-	cl depends.c
-	cl mkconfig.c
-	cl mkflpimg.c
-	cl rcopy.c
-	cl rdel.c
-	cl regtests.c
-	cl rline.c
-	cl rmkdir.c
-	cl rrmdir.c
-	cl rsym.c
-	cl rtouch.c
\ No newline at end of file

From 2e89468648315cfc9e6101b8b377eb2a96e1c452 Mon Sep 17 00:00:00 2001
From: Royce Mitchell III <royce3@ev1.net>
Date: Tue, 22 Jun 2004 12:43:49 +0000
Subject: [PATCH 035/356] small bugfix - debug/release inconsistency - found by
 Thomas Weidenmueller

svn path=/trunk/; revision=9811
---
 reactos/subsys/win32k/ntuser/window.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/reactos/subsys/win32k/ntuser/window.c b/reactos/subsys/win32k/ntuser/window.c
index 73857010f62..dd68202915c 100644
--- a/reactos/subsys/win32k/ntuser/window.c
+++ b/reactos/subsys/win32k/ntuser/window.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: window.c,v 1.240 2004/06/20 16:06:05 navaraf Exp $
+/* $Id: window.c,v 1.241 2004/06/22 12:43:49 royce Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -1934,7 +1934,9 @@ IntCreateWindowEx(DWORD dwExStyle,
 
       if ((WindowObject->ClientRect.right - WindowObject->ClientRect.left) < 0 ||
           (WindowObject->ClientRect.bottom - WindowObject->ClientRect.top) < 0)
+      {
          DPRINT("Sending bogus WM_SIZE\n");
+      }
       
       lParam = MAKE_LONG(WindowObject->ClientRect.right - 
 		  WindowObject->ClientRect.left,

From a8b5ba5a727297947449d6f51de632cd3fe0686a Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Tue, 22 Jun 2004 14:00:36 +0000
Subject: [PATCH 036/356] Add missing IOCTL codes.

svn path=/trunk/; revision=9812
---
 reactos/include/ntos/cdrom.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/reactos/include/ntos/cdrom.h b/reactos/include/ntos/cdrom.h
index 92e74835cf1..95e13249475 100644
--- a/reactos/include/ntos/cdrom.h
+++ b/reactos/include/ntos/cdrom.h
@@ -1,10 +1,10 @@
-/* $Id: cdrom.h,v 1.6 2003/06/26 20:02:03 ekohl Exp $
+/* $Id: cdrom.h,v 1.7 2004/06/22 14:00:36 ekohl Exp $
  *
  * COPYRIGHT:    See COPYING in the top level directory
  * PROJECT:      ReactOS kernel
  * FILE:         include/ntos/cdrom.h
  * PURPOSE:      CD-ROM related definitions used by all the parts of the system
- * PROGRAMMER:   Eric Kohl <ekohl@rz-online.de>
+ * PROGRAMMER:   Eric Kohl
  * UPDATE HISTORY:
  *               10/04/2002: Created
  */
@@ -20,6 +20,12 @@
 #define IOCTL_CDROM_GET_DRIVE_GEOMETRY  CTL_CODE(IOCTL_CDROM_BASE, 0x0013, METHOD_BUFFERED, FILE_READ_ACCESS)
 
 #define IOCTL_CDROM_CHECK_VERIFY        CTL_CODE(IOCTL_CDROM_BASE, 0x0200, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_CDROM_MEDIA_REMOVAL       CTL_CODE(IOCTL_CDROM_BASE, 0x0201, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_CDROM_EJECT_MEDIA         CTL_CODE(IOCTL_CDROM_BASE, 0x0202, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_CDROM_LOAD_MEDIA          CTL_CODE(IOCTL_CDROM_BASE, 0x0203, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_CDROM_RESERVE             CTL_CODE(IOCTL_CDROM_BASE, 0x0204, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_CDROM_RELEASE             CTL_CODE(IOCTL_CDROM_BASE, 0x0205, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_CDROM_FIND_NEW_DEVICES    CTL_CODE(IOCTL_CDROM_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS)
 
 
 #define MAXIMUM_NUMBER_TRACKS		100

From 47e5aeceab8ad92c3865f0daee1490bc30a4df01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Tue, 22 Jun 2004 20:08:17 +0000
Subject: [PATCH 037/356] Convert between RGBQUAD and PALETTEENTRY

svn path=/trunk/; revision=9814
---
 reactos/subsys/win32k/include/palette.h |  2 ++
 reactos/subsys/win32k/objects/dib.c     |  7 ++--
 reactos/subsys/win32k/objects/palette.c | 44 ++++++++++++++++++++++++-
 3 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/reactos/subsys/win32k/include/palette.h b/reactos/subsys/win32k/include/palette.h
index 5368f746429..073022a7920 100644
--- a/reactos/subsys/win32k/include/palette.h
+++ b/reactos/subsys/win32k/include/palette.h
@@ -33,6 +33,8 @@ HPALETTE FASTCALL PALETTE_AllocPalette(ULONG Mode,
                                        ULONG Red,
                                        ULONG Green,
                                        ULONG Blue);
+HPALETTE FASTCALL PALETTE_AllocPaletteIndexedRGB(ULONG NumColors,
+                                                 CONST RGBQUAD *Colors);
 #define  PALETTE_FreePalette(hPalette)  GDIOBJ_FreeObj((HGDIOBJ)hPalette, GDI_OBJECT_TYPE_PALETTE, GDIOBJFLAG_DEFAULT)
 #define  PALETTE_LockPalette(hPalette) ((PPALGDI)GDIOBJ_LockObj((HGDIOBJ)hPalette, GDI_OBJECT_TYPE_PALETTE))
 #define  PALETTE_UnlockPalette(hPalette) GDIOBJ_UnlockObj((HGDIOBJ)hPalette, GDI_OBJECT_TYPE_PALETTE)
diff --git a/reactos/subsys/win32k/objects/dib.c b/reactos/subsys/win32k/objects/dib.c
index b535517406f..2a0cea6435b 100644
--- a/reactos/subsys/win32k/objects/dib.c
+++ b/reactos/subsys/win32k/objects/dib.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dib.c,v 1.51 2004/06/20 00:45:37 navaraf Exp $
+ * $Id: dib.c,v 1.52 2004/06/22 20:08:17 gvg Exp $
  *
  * ReactOS W32 Subsystem
  * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team
@@ -54,9 +54,8 @@ NtGdiSetDIBColorTable(HDC hDC, UINT StartIndex, UINT Entries, CONST RGBQUAD *Col
 
       /* Rebuild the palette. */
       NtGdiDeleteObject(dc->w.hPalette);
-      dc->w.hPalette = PALETTE_AllocPalette(PAL_INDEXED,
-         1 << BitmapObj->dib->dsBmih.biBitCount,
-         (PULONG)BitmapObj->ColorMap, 0, 0, 0);
+      dc->w.hPalette = PALETTE_AllocPaletteIndexedRGB(1 << BitmapObj->dib->dsBmih.biBitCount,
+                                                      BitmapObj->ColorMap);
    }
    else
       Entries = 0;
diff --git a/reactos/subsys/win32k/objects/palette.c b/reactos/subsys/win32k/objects/palette.c
index c03b66a4a3f..617eac8a57a 100644
--- a/reactos/subsys/win32k/objects/palette.c
+++ b/reactos/subsys/win32k/objects/palette.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: palette.c,v 1.19 2004/06/20 00:45:37 navaraf Exp $ */
+/* $Id: palette.c,v 1.20 2004/06/22 20:08:17 gvg Exp $ */
 #include <w32k.h>
 
 #ifndef NO_MAPPING
@@ -98,6 +98,48 @@ PALETTE_AllocPalette(ULONG Mode,
   return NewPalette;
 }
 
+HPALETTE FASTCALL
+PALETTE_AllocPaletteIndexedRGB(ULONG NumColors,
+                               CONST RGBQUAD *Colors)
+{
+  HPALETTE NewPalette;
+  PPALGDI PalGDI;
+  unsigned i;
+
+  NewPalette = (HPALETTE) GDIOBJ_AllocObj(sizeof(PALGDI), GDI_OBJECT_TYPE_PALETTE, (GDICLEANUPPROC) PALETTE_InternalDelete);
+  if (NULL == NewPalette)
+    {
+      return NULL;
+    }
+
+  PalGDI = PALETTE_LockPalette(NewPalette);
+  ASSERT( PalGDI );
+
+  PalGDI->Self = NewPalette;
+  PalGDI->Mode = PAL_INDEXED;
+
+  PalGDI->IndexedColors = ExAllocatePoolWithTag(PagedPool, sizeof(PALETTEENTRY) * NumColors, TAG_PALETTE);
+  if (NULL == PalGDI->IndexedColors)
+    {
+      PALETTE_UnlockPalette(NewPalette);
+      PALETTE_FreePalette(NewPalette);
+      return NULL;
+    }
+  for (i = 0; i < NumColors; i++)
+    {
+      PalGDI->IndexedColors[i].peRed = Colors[i].rgbRed;
+      PalGDI->IndexedColors[i].peGreen = Colors[i].rgbGreen;
+      PalGDI->IndexedColors[i].peBlue = Colors[i].rgbBlue;
+      PalGDI->IndexedColors[i].peFlags = 0;
+    }
+
+  PalGDI->NumColors = NumColors;
+
+  PALETTE_UnlockPalette(NewPalette);
+
+  return NewPalette;
+}
+
 // Create the system palette
 HPALETTE FASTCALL PALETTE_Init(VOID)
 {

From 9130d5d683a5e8af08bc95ffdee9caf1833eb1df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Tue, 22 Jun 2004 23:27:48 +0000
Subject: [PATCH 038/356] Update version number to 0.2.x

svn path=/trunk/; revision=9817
---
 reactos/README | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reactos/README b/reactos/README
index ac71c277bcf..2a4e7f8da66 100644
--- a/reactos/README
+++ b/reactos/README
@@ -1,6 +1,6 @@
 ========================
-ReactOS Version 0.1.x
-Updated March 19th, 2003
+ReactOS Version 0.2.x
+Updated June 23rd, 2004
 ========================
 
 1. What is ReactOS?

From ba71f3769043dc8315dbdfd7dcc874a3f2103e9c Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Wed, 23 Jun 2004 00:12:41 +0000
Subject: [PATCH 039/356] CM (Registry Manager) Stubs added (Registry
 Callbacks)

svn path=/trunk/; revision=9818
---
 reactos/ntoskrnl/cm/cm.h     | 15 +++++++++++++++
 reactos/ntoskrnl/cm/ntfunc.c | 25 +++++++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/reactos/ntoskrnl/cm/cm.h b/reactos/ntoskrnl/cm/cm.h
index 2b9ef9c63d3..8e9f4719d5b 100644
--- a/reactos/ntoskrnl/cm/cm.h
+++ b/reactos/ntoskrnl/cm/cm.h
@@ -356,6 +356,12 @@ extern KSPIN_LOCK CmiKeyListLock;
 extern LIST_ENTRY CmiHiveListHead;
 extern ERESOURCE CmiHiveListLock;
 
+/* Registry Callback Function */
+typedef NTSTATUS (*PEX_CALLBACK_FUNCTION ) (
+    IN PVOID CallbackContext,
+    IN PVOID Argument1,
+    IN PVOID Argument2
+    );
 
 VOID
 CmiVerifyBinHeader(PHBIN BinHeader);
@@ -386,6 +392,15 @@ CmiVerifyRegistryHive(PREGISTRY_HIVE RegistryHive);
 #define VERIFY_REGISTRY_HIVE(x)
 #endif
 
+NTSTATUS STDCALL
+CmRegisterCallback(IN PEX_CALLBACK_FUNCTION Function,
+                   IN PVOID                 Context,
+                   IN OUT PLARGE_INTEGER    Cookie
+                    );
+
+NTSTATUS STDCALL
+CmUnRegisterCallback(IN LARGE_INTEGER    Cookie);
+
 NTSTATUS STDCALL
 CmiObjectParse(IN PVOID ParsedObject,
 	       OUT PVOID *NextObject,
diff --git a/reactos/ntoskrnl/cm/ntfunc.c b/reactos/ntoskrnl/cm/ntfunc.c
index fe26fcc2c73..327fb8e74d9 100644
--- a/reactos/ntoskrnl/cm/ntfunc.c
+++ b/reactos/ntoskrnl/cm/ntfunc.c
@@ -31,6 +31,31 @@ static BOOLEAN CmiRegistryInitialized = FALSE;
 
 /* FUNCTIONS ****************************************************************/
 
+/*
+ * @unimplemented
+ */
+NTSTATUS STDCALL
+CmRegisterCallback(IN PEX_CALLBACK_FUNCTION Function,
+                   IN PVOID                 Context,
+                   IN OUT PLARGE_INTEGER    Cookie
+                    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+
+NTSTATUS STDCALL
+CmUnRegisterCallback(IN LARGE_INTEGER    Cookie)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+
 NTSTATUS STDCALL
 NtCreateKey(OUT PHANDLE KeyHandle,
 	    IN ACCESS_MASK DesiredAccess,

From f737c1e98a5be37d11a335c4f76ebf964d18c98c Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Wed, 23 Jun 2004 00:15:59 +0000
Subject: [PATCH 040/356] DBG Stubs Added.

svn path=/trunk/; revision=9819
---
 reactos/ntoskrnl/dbg/dbgctrl.c | 43 ++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/reactos/ntoskrnl/dbg/dbgctrl.c b/reactos/ntoskrnl/dbg/dbgctrl.c
index 33df5344fc9..a1206a39a0b 100644
--- a/reactos/ntoskrnl/dbg/dbgctrl.c
+++ b/reactos/ntoskrnl/dbg/dbgctrl.c
@@ -35,6 +35,49 @@
 
 /* FUNCTIONS *****************************************************************/
 
+/*
+ * @unimplemented
+ */
+ULONG
+__cdecl
+DbgPrintReturnControlC(
+    PCH Format,
+    ...
+    )
+{
+	UNIMPLEMENTED;
+	return 0;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+DbgQueryDebugFilterState(
+    IN ULONG ComponentId,
+    IN ULONG Level
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+DbgSetDebugFilterState(
+    IN ULONG ComponentId,
+    IN ULONG Level,
+    IN BOOLEAN State
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
 NTSTATUS STDCALL 
 NtSystemDebugControl(DEBUG_CONTROL_CODE ControlCode,
 		     PVOID InputBuffer,

From 9467b632c17824119f6308e837a46192b6bab4ae Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Wed, 23 Jun 2004 00:41:55 +0000
Subject: [PATCH 041/356] FSRTL Types and Prototypes Added.

svn path=/trunk/; revision=9820
---
 reactos/include/ddk/fsfuncs.h | 137 +++++++++++++++++++++++++++++++++-
 reactos/include/ddk/fstypes.h | 101 ++++++++++++++++++++++++-
 2 files changed, 236 insertions(+), 2 deletions(-)

diff --git a/reactos/include/ddk/fsfuncs.h b/reactos/include/ddk/fsfuncs.h
index 98c725eac8c..4907134f372 100644
--- a/reactos/include/ddk/fsfuncs.h
+++ b/reactos/include/ddk/fsfuncs.h
@@ -1,6 +1,6 @@
 #ifndef __INCLUDE_DDK_FSFUNCS_H
 #define __INCLUDE_DDK_FSFUNCS_H
-/* $Id: fsfuncs.h,v 1.22 2003/12/17 20:27:06 ekohl Exp $ */
+/* $Id: fsfuncs.h,v 1.23 2004/06/23 00:41:55 ion Exp $ */
 #define FlagOn(x,f) ((x) & (f))
 
 #include <ntos/fstypes.h>
@@ -12,6 +12,12 @@ FsRtlFreeFileLock(
 	IN PFILE_LOCK FileLock
 	);
 
+STDCALL
+VOID
+FsRtlAcquireFileExclusive (
+    IN PFILE_OBJECT FileObject
+    );
+
 PFILE_LOCK
 STDCALL
 FsRtlAllocateFileLock (
@@ -257,6 +263,19 @@ FsRtlGetNextMcbEntry (IN PMCB     Mcb,
 		      OUT PULONG  SectorCount);
 #define FsRtlEnterFileSystem    KeEnterCriticalRegion
 #define FsRtlExitFileSystem     KeLeaveCriticalRegion
+
+VOID
+FsRtlIncrementCcFastReadNotPossible( VOID );
+
+VOID
+FsRtlIncrementCcFastReadWait( VOID );
+
+VOID
+FsRtlIncrementCcFastReadNoWait( VOID );
+
+VOID
+FsRtlIncrementCcFastReadResourceMiss( VOID );
+
 VOID
 STDCALL
 FsRtlInitializeFileLock (
@@ -276,11 +295,27 @@ FsRtlInitializeMcb (IN PMCB         Mcb,
 VOID STDCALL
 FsRtlInitializeOplock(IN OUT POPLOCK Oplock);
 
+
 VOID
 STDCALL
 FsRtlInitializeTunnelCache (
     IN PTUNNEL Cache
     );
+
+STDCALL
+NTSTATUS
+FsRtlInsertPerFileObjectContext (
+    IN PFSRTL_ADVANCED_FCB_HEADER PerFileObjectContext,
+    IN PVOID /* PFSRTL_PER_FILE_OBJECT_CONTEXT*/ Ptr
+    );
+
+STDCALL
+NTSTATUS
+FsRtlInsertPerStreamContext (
+    IN PFSRTL_ADVANCED_FCB_HEADER PerStreamContext,
+    IN PFSRTL_PER_STREAM_CONTEXT Ptr
+    );
+
 BOOLEAN
 STDCALL
 FsRtlIsDbcsInExpression (
@@ -317,6 +352,11 @@ FsRtlIsNameInExpression (
 BOOLEAN STDCALL
 FsRtlIsNtstatusExpected(IN NTSTATUS NtStatus);
 
+ULONG
+FsRtlIsPagingFile (
+    IN PFILE_OBJECT FileObject
+    );
+
 BOOLEAN STDCALL
 FsRtlIsTotalDeviceFailure(IN NTSTATUS NtStatus);
 
@@ -339,6 +379,14 @@ BOOLEAN STDCALL
 FsRtlLookupLastLargeMcbEntry(IN PLARGE_MCB Mcb,
 			     OUT PLONGLONG Vbn,
 			     OUT PLONGLONG Lbn);
+STDCALL
+BOOLEAN
+FsRtlLookupLastLargeMcbEntryAndIndex (
+    IN PLARGE_MCB OpaqueMcb,
+    OUT PLONGLONG LargeVbn,
+    OUT PLONGLONG LargeLbn,
+    OUT PULONG Index
+    );
 
 BOOLEAN STDCALL
 FsRtlLookupLastMcbEntry (IN PMCB     Mcb,
@@ -350,6 +398,21 @@ FsRtlLookupMcbEntry (IN PMCB     Mcb,
 		     OUT PLBN    Lbn,
 		     OUT PULONG  SectorCount OPTIONAL,
 		     OUT PULONG  Index);
+STDCALL
+PFSRTL_PER_STREAM_CONTEXT
+FsRtlLookupPerStreamContextInternal (
+    IN PFSRTL_ADVANCED_FCB_HEADER StreamContext,
+    IN PVOID OwnerId OPTIONAL,
+    IN PVOID InstanceId OPTIONAL
+    );
+
+STDCALL
+PVOID /* PFSRTL_PER_FILE_OBJECT_CONTEXT*/
+FsRtlLookupPerFileObjectContext (
+    IN PFSRTL_ADVANCED_FCB_HEADER StreamContext,
+    IN PVOID OwnerId OPTIONAL,
+    IN PVOID InstanceId OPTIONAL
+    );
 
 BOOLEAN
 STDCALL
@@ -424,6 +487,36 @@ BOOLEAN (*PCHECK_FOR_TRAVERSE_ACCESS) (
 	IN	PVOID				TargetContext,
 	IN	PSECURITY_SUBJECT_CONTEXT	SubjectContext
 	);
+STDCALL
+VOID
+FsRtlNotifyFilterChangeDirectory (
+    IN PNOTIFY_SYNC NotifySync,
+    IN PLIST_ENTRY NotifyList,
+    IN PVOID FsContext,
+    IN PSTRING FullDirectoryName,
+    IN BOOLEAN WatchTree,
+    IN BOOLEAN IgnoreBuffer,
+    IN ULONG CompletionFilter,
+    IN PIRP NotifyIrp,
+    IN PCHECK_FOR_TRAVERSE_ACCESS TraverseCallback OPTIONAL,
+    IN PSECURITY_SUBJECT_CONTEXT SubjectContext OPTIONAL,
+    IN PFILTER_REPORT_CHANGE FilterCallback OPTIONAL
+    );
+
+STDCALL
+VOID
+FsRtlNotifyFilterReportChange (
+    IN PNOTIFY_SYNC NotifySync,
+    IN PLIST_ENTRY NotifyList,
+    IN PSTRING FullTargetName,
+    IN USHORT TargetNameOffset,
+    IN PSTRING StreamName OPTIONAL,
+    IN PSTRING NormalizedParentName OPTIONAL,
+    IN ULONG FilterMatch,
+    IN ULONG Action,
+    IN PVOID TargetContext,
+    IN PVOID FilterContext
+    );
 VOID
 STDCALL
 FsRtlNotifyFullChangeDirectory (
@@ -551,11 +644,24 @@ FsRtlProcessFileLock (
     IN PVOID        Context OPTIONAL
     );
 
+STDCALL
+NTSTATUS
+FsRtlRegisterFileSystemFilterCallbacks (
+    IN struct _DRIVER_OBJECT *FilterDriverObject,
+    IN PFS_FILTER_CALLBACKS Callbacks
+    );
+
 NTSTATUS STDCALL
 FsRtlRegisterUncProvider(IN OUT PHANDLE Handle,
 			 IN PUNICODE_STRING RedirectorDeviceName,
 			 IN BOOLEAN MailslotsSupported);
 
+STDCALL
+VOID
+FsRtlReleaseFile (
+    IN PFILE_OBJECT FileObject
+    );
+
 VOID STDCALL
 FsRtlRemoveLargeMcbEntry(IN PLARGE_MCB Mcb,
 			 IN LONGLONG Vbn,
@@ -566,6 +672,29 @@ FsRtlRemoveMcbEntry (IN PMCB     Mcb,
 		     IN VBN      Vbn,
 		     IN ULONG    SectorCount);
 
+STDCALL
+PFSRTL_PER_STREAM_CONTEXT
+FsRtlRemovePerStreamContext (
+    IN PFSRTL_ADVANCED_FCB_HEADER StreamContext,
+    IN PVOID OwnerId OPTIONAL,
+    IN PVOID InstanceId OPTIONAL
+    );
+
+STDCALL
+PVOID /* PFSRTL_PER_FILE_OBJECT_CONTEXT*/
+FsRtlRemovePerFileObjectContext (
+   IN PFSRTL_ADVANCED_FCB_HEADER PerFileObjectContext,
+    IN PVOID OwnerId OPTIONAL,
+    IN PVOID InstanceId OPTIONAL
+    );
+
+STDCALL
+VOID
+FsRtlResetLargeMcb (
+    IN PLARGE_MCB Mcb,
+    IN BOOLEAN SelfSynchronized
+    );
+
 BOOLEAN STDCALL
 FsRtlSplitLargeMcb(IN PLARGE_MCB Mcb,
 		   IN LONGLONG Vbn,
@@ -579,6 +708,12 @@ FsRtlSyncVolumes (
 	DWORD	Unknown2
 	);
 
+STDCALL
+VOID
+FsRtlTeardownPerStreamContexts (
+  IN PFSRTL_ADVANCED_FCB_HEADER AdvancedHeader
+  );
+
 VOID STDCALL
 FsRtlTruncateLargeMcb(IN PLARGE_MCB Mcb,
 		      IN LONGLONG Vbn);
diff --git a/reactos/include/ddk/fstypes.h b/reactos/include/ddk/fstypes.h
index ba198a1c0fb..366c83b897b 100644
--- a/reactos/include/ddk/fstypes.h
+++ b/reactos/include/ddk/fstypes.h
@@ -1,6 +1,6 @@
 #ifndef __INCLUDE_DDK_FSTYPES_H
 #define __INCLUDE_DDK_FSTYPES_H
-/* $Id: fstypes.h,v 1.15 2004/03/18 16:19:25 weiden Exp $ */
+/* $Id: fstypes.h,v 1.16 2004/06/23 00:41:55 ion Exp $ */
 
 #ifndef __USE_W32API
 
@@ -35,6 +35,90 @@ typedef VOID (*PUNLOCK_ROUTINE) (
     IN PFILE_LOCK_INFO  FileLockInfo
 );
 
+typedef
+BOOLEAN (*PFILTER_REPORT_CHANGE) (
+            IN PVOID NotifyContext,
+            IN PVOID FilterContext
+            );
+
+typedef enum _FS_FILTER_SECTION_SYNC_TYPE {
+    SyncTypeOther = 0,
+    SyncTypeCreateSection
+} FS_FILTER_SECTION_SYNC_TYPE, *PFS_FILTER_SECTION_SYNC_TYPE;
+
+typedef union _FS_FILTER_PARAMETERS {
+
+    /*  AcquireForModifiedPageWriter */
+    struct {
+        PLARGE_INTEGER EndingOffset;
+    } AcquireForModifiedPageWriter;
+
+    /*  ReleaseForModifiedPageWriter */
+    struct {
+        PERESOURCE ResourceToRelease;
+    } ReleaseForModifiedPageWriter;
+
+    /*  AcquireForSectionSynchronization */
+    struct {
+        FS_FILTER_SECTION_SYNC_TYPE SyncType;
+        ULONG PageProtection;
+    } AcquireForSectionSynchronization;
+
+    /*  Other */
+    struct {
+        PVOID Argument1;
+        PVOID Argument2;
+        PVOID Argument3;
+        PVOID Argument4;
+        PVOID Argument5;
+    } Others;
+
+} FS_FILTER_PARAMETERS, *PFS_FILTER_PARAMETERS;
+
+typedef struct _FS_FILTER_CALLBACK_DATA {
+
+    ULONG SizeOfFsFilterCallbackData;
+    UCHAR Operation;
+    UCHAR Reserved;
+    struct _DEVICE_OBJECT *DeviceObject;
+    struct _FILE_OBJECT *FileObject;
+    FS_FILTER_PARAMETERS Parameters;
+
+} FS_FILTER_CALLBACK_DATA, *PFS_FILTER_CALLBACK_DATA;
+
+typedef
+NTSTATUS
+(*PFS_FILTER_CALLBACK) (
+    IN PFS_FILTER_CALLBACK_DATA Data,
+    OUT PVOID *CompletionContext
+    );
+
+typedef
+VOID
+(*PFS_FILTER_COMPLETION_CALLBACK) (
+    IN PFS_FILTER_CALLBACK_DATA Data,
+    IN NTSTATUS OperationStatus,
+    IN PVOID CompletionContext
+    );
+
+typedef struct _FS_FILTER_CALLBACKS {
+
+    ULONG SizeOfFsFilterCallbacks;
+    ULONG Reserved;
+    PFS_FILTER_CALLBACK PreAcquireForSectionSynchronization;
+    PFS_FILTER_COMPLETION_CALLBACK PostAcquireForSectionSynchronization;
+    PFS_FILTER_CALLBACK PreReleaseForSectionSynchronization;
+    PFS_FILTER_COMPLETION_CALLBACK PostReleaseForSectionSynchronization;
+    PFS_FILTER_CALLBACK PreAcquireForCcFlush;
+    PFS_FILTER_COMPLETION_CALLBACK PostAcquireForCcFlush;
+    PFS_FILTER_CALLBACK PreReleaseForCcFlush;
+    PFS_FILTER_COMPLETION_CALLBACK PostReleaseForCcFlush;
+    PFS_FILTER_CALLBACK PreAcquireForModifiedPageWriter;
+    PFS_FILTER_COMPLETION_CALLBACK PostAcquireForModifiedPageWriter;
+    PFS_FILTER_CALLBACK PreReleaseForModifiedPageWriter;
+    PFS_FILTER_COMPLETION_CALLBACK PostReleaseForModifiedPageWriter;
+
+} FS_FILTER_CALLBACKS, *PFS_FILTER_CALLBACKS;
 
 typedef struct _FILE_LOCK {
     PCOMPLETE_LOCK_IRP_ROUTINE  CompleteLockIrpRoutine;
@@ -71,6 +155,21 @@ typedef struct _NOTIFY_SYNC
 } NOTIFY_SYNC, * PNOTIFY_SYNC;
 
 
+typedef struct _FSRTL_ADVANCED_FCB_HEADER {
+    FSRTL_COMMON_FCB_HEADER Header;
+    PFAST_MUTEX FastMutex;
+    LIST_ENTRY FilterContexts;
+} FSRTL_ADVANCED_FCB_HEADER;
+
+typedef FSRTL_ADVANCED_FCB_HEADER *PFSRTL_ADVANCED_FCB_HEADER;
+
+typedef struct _FSRTL_PER_STREAM_CONTEXT {
+    LIST_ENTRY Links;
+    PVOID OwnerId;
+    PVOID InstanceId;
+    PFREE_FUNCTION FreeCallback;
+} FSRTL_PER_STREAM_CONTEXT, *PFSRTL_PER_STREAM_CONTEXT;
+
 typedef VOID
 (*POPLOCK_WAIT_COMPLETE_ROUTINE)(PVOID Context,
 				 PIRP Irp);

From 76321fa02553b938596e8f5c2f76d871f5142f0c Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Wed, 23 Jun 2004 00:42:21 +0000
Subject: [PATCH 042/356] FSRTL Stubs Added.

svn path=/trunk/; revision=9821
---
 reactos/ntoskrnl/fs/mcb.c    | 60 ++++++++++++++++++++++++-
 reactos/ntoskrnl/fs/mdl.c    | 41 ++++++++++++++++-
 reactos/ntoskrnl/fs/notify.c | 63 +++++++++++++++++++++++++-
 reactos/ntoskrnl/fs/util.c   | 86 +++++++++++++++++++++++++++++++++++-
 4 files changed, 245 insertions(+), 5 deletions(-)

diff --git a/reactos/ntoskrnl/fs/mcb.c b/reactos/ntoskrnl/fs/mcb.c
index 9eba3576d86..6afde133188 100644
--- a/reactos/ntoskrnl/fs/mcb.c
+++ b/reactos/ntoskrnl/fs/mcb.c
@@ -1,4 +1,4 @@
-/* $Id: mcb.c,v 1.11 2003/12/30 18:52:03 fireball Exp $
+/* $Id: mcb.c,v 1.12 2004/06/23 00:42:21 ion Exp $
  *
  * reactos/ntoskrnl/fs/mcb.c
  *
@@ -128,6 +128,51 @@ FsRtlLookupLargeMcbEntry(IN PLARGE_MCB Mcb,
   return(FALSE);
 }
 
+/*
+ * @unimplemented
+ */
+STDCALL
+BOOLEAN
+FsRtlLookupLastLargeMcbEntryAndIndex (
+    IN PLARGE_MCB OpaqueMcb,
+    OUT PLONGLONG LargeVbn,
+    OUT PLONGLONG LargeLbn,
+    OUT PULONG Index
+    )
+{
+  UNIMPLEMENTED;
+  return(FALSE);
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+PFSRTL_PER_STREAM_CONTEXT
+FsRtlLookupPerStreamContextInternal (
+    IN PFSRTL_ADVANCED_FCB_HEADER StreamContext,
+    IN PVOID OwnerId OPTIONAL,
+    IN PVOID InstanceId OPTIONAL
+    )
+{
+  UNIMPLEMENTED;
+  return(FALSE);
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+PVOID /* PFSRTL_PER_FILE_OBJECT_CONTEXT*/
+FsRtlLookupPerFileObjectContext (
+    IN PFSRTL_ADVANCED_FCB_HEADER StreamContext,
+    IN PVOID OwnerId OPTIONAL,
+    IN PVOID InstanceId OPTIONAL
+    )
+{
+  UNIMPLEMENTED;
+  return(FALSE);
+}
 
 /*
  * @unimplemented
@@ -220,6 +265,19 @@ FsRtlRemoveMcbEntry (IN PMCB     Mcb,
 }
 
 
+/*
+ * @unimplemented
+ */
+STDCALL
+VOID
+FsRtlResetLargeMcb (
+    IN PLARGE_MCB Mcb,
+    IN BOOLEAN SelfSynchronized
+    )
+{
+  UNIMPLEMENTED;
+}
+
 /*
  * @unimplemented
  */
diff --git a/reactos/ntoskrnl/fs/mdl.c b/reactos/ntoskrnl/fs/mdl.c
index 7de60fc6db5..0855039fede 100644
--- a/reactos/ntoskrnl/fs/mdl.c
+++ b/reactos/ntoskrnl/fs/mdl.c
@@ -1,4 +1,4 @@
-/* $Id: mdl.c,v 1.5 2003/07/10 06:27:13 royce Exp $
+/* $Id: mdl.c,v 1.6 2004/06/23 00:42:21 ion Exp $
  *
  * reactos/ntoskrnl/fs/mdl.c
  *
@@ -7,6 +7,45 @@
 #include <internal/cc.h>
 #include <ddk/ntifs.h>
 
+#include <internal/debug.h>
+
+/*
+ * @unimplemented
+ */
+VOID
+FsRtlIncrementCcFastReadResourceMiss( VOID )
+{
+  UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+VOID
+FsRtlIncrementCcFastReadNotPossible( VOID )
+{
+  UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+VOID
+FsRtlIncrementCcFastReadWait( VOID )
+{
+  UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+VOID
+FsRtlIncrementCcFastReadNoWait( VOID )
+{
+  UNIMPLEMENTED;
+}
+
+
 /**********************************************************************
  * NAME							EXPORTED
  *	FsRtlMdlRead@24
diff --git a/reactos/ntoskrnl/fs/notify.c b/reactos/ntoskrnl/fs/notify.c
index 8188961044f..8f8f10e25a7 100644
--- a/reactos/ntoskrnl/fs/notify.c
+++ b/reactos/ntoskrnl/fs/notify.c
@@ -1,4 +1,4 @@
-/* $Id: notify.c,v 1.9 2003/12/30 18:52:03 fireball Exp $
+/* $Id: notify.c,v 1.10 2004/06/23 00:42:21 ion Exp $
  *
  * reactos/ntoskrnl/fs/notify.c
  *
@@ -6,6 +6,8 @@
 #include <ntos.h>
 #include <ddk/ntifs.h>
 
+#define NDEBUG
+#include <internal/debug.h>
 
 /**********************************************************************
  * NAME							EXPORTED
@@ -46,6 +48,7 @@ FsRtlNotifyChangeDirectory (
 }
 
 
+
 /**********************************************************************
  * NAME							EXPORTED
  *	FsRtlNotifyCleanup@12
@@ -69,6 +72,50 @@ FsRtlNotifyCleanup (
 }
 
 
+/*
+ * @unimplemented
+ */
+STDCALL
+VOID
+FsRtlNotifyFilterChangeDirectory (
+    IN PNOTIFY_SYNC NotifySync,
+    IN PLIST_ENTRY NotifyList,
+    IN PVOID FsContext,
+    IN PSTRING FullDirectoryName,
+    IN BOOLEAN WatchTree,
+    IN BOOLEAN IgnoreBuffer,
+    IN ULONG CompletionFilter,
+    IN PIRP NotifyIrp,
+    IN PCHECK_FOR_TRAVERSE_ACCESS TraverseCallback OPTIONAL,
+    IN PSECURITY_SUBJECT_CONTEXT SubjectContext OPTIONAL,
+    IN PFILTER_REPORT_CHANGE FilterCallback OPTIONAL
+    )
+{
+	UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+VOID
+FsRtlNotifyFilterReportChange (
+    IN PNOTIFY_SYNC NotifySync,
+    IN PLIST_ENTRY NotifyList,
+    IN PSTRING FullTargetName,
+    IN USHORT TargetNameOffset,
+    IN PSTRING StreamName OPTIONAL,
+    IN PSTRING NormalizedParentName OPTIONAL,
+    IN ULONG FilterMatch,
+    IN ULONG Action,
+    IN PVOID TargetContext,
+    IN PVOID FilterContext
+    )
+{
+	UNIMPLEMENTED;
+}
+
+
 /**********************************************************************
  * NAME							EXPORTED
  *	FsRtlNotifyFullChangeDirectory@40
@@ -261,4 +308,18 @@ FsRtlNotifyVolumeEvent (
 	return STATUS_NOT_IMPLEMENTED;
 }
 
+/*
+ *
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+FsRtlRegisterFileSystemFilterCallbacks (
+    IN struct _DRIVER_OBJECT *FilterDriverObject,
+    IN PFS_FILTER_CALLBACKS Callbacks
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
 /* EOF */
diff --git a/reactos/ntoskrnl/fs/util.c b/reactos/ntoskrnl/fs/util.c
index f542730acfc..c5cdd1c2df1 100644
--- a/reactos/ntoskrnl/fs/util.c
+++ b/reactos/ntoskrnl/fs/util.c
@@ -1,4 +1,4 @@
-/* $Id: util.c,v 1.15 2003/08/03 15:53:45 ea Exp $
+/* $Id: util.c,v 1.16 2004/06/23 00:42:21 ion Exp $
  *
  * reactos/ntoskrnl/fs/util.c
  *
@@ -6,6 +6,8 @@
 #include <ddk/ntddk.h>
 #include <ddk/ntifs.h>
 
+#define NDEBUG
+#include <internal/debug.h>
 
 /**********************************************************************
  * NAME							EXPORTED
@@ -87,6 +89,18 @@ FsRtlIsNtstatusExpected (
 		: TRUE;
 }
 	
+/*
+ * @unimplemented
+ */
+ULONG
+FsRtlIsPagingFile (
+    IN PFILE_OBJECT FileObject
+    )
+{
+	UNIMPLEMENTED;
+	return 0;
+}
+
 
 /**********************************************************************
  * NAME							EXPORTED
@@ -271,6 +285,48 @@ FsRtlGetFileSize (
 	return Status;
 }
 
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+FsRtlInsertPerStreamContext (
+    IN PFSRTL_ADVANCED_FCB_HEADER PerStreamContext,
+    IN PFSRTL_PER_STREAM_CONTEXT Ptr
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+PFSRTL_PER_STREAM_CONTEXT
+FsRtlRemovePerStreamContext (
+    IN PFSRTL_ADVANCED_FCB_HEADER StreamContext,
+    IN PVOID OwnerId OPTIONAL,
+    IN PVOID InstanceId OPTIONAL
+    )
+{
+	UNIMPLEMENTED;
+	return NULL;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+FsRtlInsertPerFileObjectContext (
+    IN PFSRTL_ADVANCED_FCB_HEADER PerFileObjectContext,
+    IN PVOID /* PFSRTL_PER_FILE_OBJECT_CONTEXT*/ Ptr
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
 
 /**********************************************************************
  * NAME							EXPORTED
@@ -318,6 +374,21 @@ FsRtlPostStackOverflow (
 }
 
 
+/*
+ * @unimplemented
+ */
+STDCALL
+PVOID /* PFSRTL_PER_FILE_OBJECT_CONTEXT*/
+FsRtlRemovePerFileObjectContext (
+   IN PFSRTL_ADVANCED_FCB_HEADER PerFileObjectContext,
+    IN PVOID OwnerId OPTIONAL,
+    IN PVOID InstanceId OPTIONAL
+    )
+{
+	UNIMPLEMENTED;
+	return NULL;
+}
+
 /**********************************************************************
  * NAME							EXPORTED
  *	FsRtlSyncVolumes@12
@@ -344,5 +415,16 @@ FsRtlSyncVolumes (
 }
 
 
-/* EOF */
+/*
+ * @unimplemented
+ */
+STDCALL
+VOID
+FsRtlTeardownPerStreamContexts (
+  IN PFSRTL_ADVANCED_FCB_HEADER AdvancedHeader
+  )
+{
+	UNIMPLEMENTED;
+}
 
+/* EOF */

From be03c322b3be171128e6ece936f83fb98f804a5f Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Wed, 23 Jun 2004 00:49:22 +0000
Subject: [PATCH 043/356] DBG/KD Types and Prototypes Added.

svn path=/trunk/; revision=9822
---
 reactos/ntoskrnl/include/internal/dbg.h | 24 +++++++++++++++++++++++
 reactos/ntoskrnl/include/internal/kd.h  | 26 ++++++++++++++++++++++++-
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/reactos/ntoskrnl/include/internal/dbg.h b/reactos/ntoskrnl/include/internal/dbg.h
index 824d33688ff..bebb68081c7 100644
--- a/reactos/ntoskrnl/include/internal/dbg.h
+++ b/reactos/ntoskrnl/include/internal/dbg.h
@@ -4,6 +4,8 @@
 #include <napi/dbg.h>
 #include <internal/port.h>
 
+#define KdPrintEx(_x_) DbgPrintEx _x_
+
 NTSTATUS STDCALL 
 LpcSendDebugMessagePort(PEPORT Port,
 			PLPC_DBG_MESSAGE Message,
@@ -15,4 +17,26 @@ DbgkForwardException(EXCEPTION_RECORD Er, ULONG FirstChance);
 BOOLEAN
 DbgShouldPrint(PCH Filename);
 
+ULONG
+__cdecl
+DbgPrintReturnControlC(
+    PCH Format,
+    ...
+    );
+
+STDCALL
+NTSTATUS
+DbgQueryDebugFilterState(
+    IN ULONG ComponentId,
+    IN ULONG Level
+    );
+
+STDCALL
+NTSTATUS
+DbgSetDebugFilterState(
+    IN ULONG ComponentId,
+    IN ULONG Level,
+    IN BOOLEAN State
+    );
+
 #endif /* __INCLUDE_INTERNAL_DBG_H */
diff --git a/reactos/ntoskrnl/include/internal/kd.h b/reactos/ntoskrnl/include/internal/kd.h
index f523d07504a..6eee2e87b5d 100644
--- a/reactos/ntoskrnl/include/internal/kd.h
+++ b/reactos/ntoskrnl/include/internal/kd.h
@@ -1,4 +1,4 @@
-/* $Id: kd.h,v 1.24 2004/03/11 21:50:23 dwelch Exp $
+/* $Id: kd.h,v 1.25 2004/06/23 00:49:22 ion Exp $
  *
  * kernel debugger prototypes
  */
@@ -49,6 +49,30 @@ DebugLogInit(VOID);
 VOID
 DebugLogInit2(VOID);
 
+VOID
+STDCALL
+KdDisableDebugger(
+    VOID
+    );
+
+VOID
+STDCALL
+KdEnableDebugger(
+    VOID
+    );
+
+NTSTATUS
+STDCALL
+KdPowerTransition(
+	ULONG PowerState
+	);
+
+BOOLEAN
+STDCALL
+KeIsAttachedProcess(
+	VOID
+	);
+
 VOID
 KdInit1(VOID);
 

From 657b2275c714891df7c3d97ef47cee050fff95e3 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Wed, 23 Jun 2004 00:49:43 +0000
Subject: [PATCH 044/356] KD Stubs Added.

svn path=/trunk/; revision=9823
---
 reactos/ntoskrnl/kd/kdebug.c | 66 ++++++++++++++++++++++++++++++++++--
 1 file changed, 64 insertions(+), 2 deletions(-)

diff --git a/reactos/ntoskrnl/kd/kdebug.c b/reactos/ntoskrnl/kd/kdebug.c
index 67cd35774ef..14affa237e8 100644
--- a/reactos/ntoskrnl/kd/kdebug.c
+++ b/reactos/ntoskrnl/kd/kdebug.c
@@ -1,4 +1,4 @@
-/* $Id: kdebug.c,v 1.51 2004/02/24 21:25:41 weiden Exp $
+/* $Id: kdebug.c,v 1.52 2004/06/23 00:49:43 ion Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -15,6 +15,7 @@
 #include <internal/mm.h>
 #include <roscfg.h>
 #include "../dbg/kdb.h"
+#include <internal/debug.h>
 
 /* serial debug connection */
 #define DEFAULT_DEBUG_PORT      2	/* COM2 */
@@ -31,11 +32,23 @@ BOOLEAN
 __declspec(dllexport)
 KdDebuggerEnabled = FALSE;		/* EXPORTED */
 
+BOOLEAN
+__declspec(dllexport)
+KdEnteredDebugger = FALSE;		/* EXPORTED */
+
 BOOLEAN
 __declspec(dllexport)
 KdDebuggerNotPresent = TRUE;		/* EXPORTED */
 
+ULONG
+__declspec(dllexport)
+KiBugCheckData;		/* EXPORTED */
 
+BOOLEAN
+__declspec(dllexport)
+KiEnableTimerWatchdog = FALSE;		/* EXPORTED */
+
+ 
 static BOOLEAN KdpBreakPending = FALSE;
 ULONG KdDebugState = KD_DEBUG_DISABLED;
 ULONG KdpPortIrq = 0;
@@ -372,6 +385,43 @@ KdpPrintString(PANSI_STRING String)
 
 /* NTOSKRNL.KdPollBreakIn */
 
+/*
+ * @unimplemented
+ */
+VOID
+STDCALL
+KdDisableDebugger(
+	VOID
+	)
+{
+	UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+VOID
+STDCALL
+KdEnableDebugger (
+	VOID
+	)
+{
+	UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+BOOLEAN
+STDCALL
+KeIsAttachedProcess(
+	VOID
+	)
+{
+	UNIMPLEMENTED;
+	return FALSE;
+}
+
 /*
  * @implemented
  */
@@ -472,6 +522,18 @@ KdSystemDebugControl(ULONG Code)
     }
 }
 
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+KdPowerTransition(
+	ULONG PowerState
+	)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
 
 /* Support routines for the GDB stubs */
 
@@ -492,4 +554,4 @@ KdGetChar(VOID)
   return Value;
 }
 
-/* EOF */
+ /* EOF */

From 61d1eb4f34839e8a92dfa39f4416bd2bcaebe71b Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Wed, 23 Jun 2004 05:04:30 +0000
Subject: [PATCH 045/356] Added reason for copyimage fixme, declared as
 unimplemented, and added variable to only display dbgprint once.

svn path=/trunk/; revision=9824
---
 reactos/lib/user32/windows/bitmap.c | 77 +++++++++++++++++------------
 1 file changed, 45 insertions(+), 32 deletions(-)

diff --git a/reactos/lib/user32/windows/bitmap.c b/reactos/lib/user32/windows/bitmap.c
index 4e6338a1cd0..a75e2a66b33 100644
--- a/reactos/lib/user32/windows/bitmap.c
+++ b/reactos/lib/user32/windows/bitmap.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: bitmap.c,v 1.29 2004/04/13 00:06:50 weiden Exp $
+/* $Id: bitmap.c,v 1.30 2004/06/23 05:04:30 ion Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/input.c
@@ -42,7 +42,6 @@ HICON ICON_CreateIconFromData(HDC hDC, PVOID ImageData, ICONIMAGE* IconImage, in
 CURSORICONDIRENTRY *CURSORICON_FindBestIcon( CURSORICONDIR *dir, int width, int height, int colors);
 CURSORICONDIRENTRY *CURSORICON_FindBestCursor( CURSORICONDIR *dir, int width, int height, int colors);
 
-
 /* FUNCTIONS *****************************************************************/
 
 /*
@@ -661,39 +660,53 @@ LoadBitmapW(HINSTANCE hInstance, LPCWSTR lpBitmapName)
 
 
 /*
- * @implemented
+ * @unimplemented
  */
 HANDLE WINAPI
 CopyImage(HANDLE hnd, UINT type, INT desiredx, INT desiredy, UINT flags)
 {
-   switch (type)
-   {
-      case IMAGE_BITMAP:
-         {
-         	DbgPrint("WARNING:  Incomplete implementation of CopyImage!\n");
-         	/* FIXME:  support flags LR_COPYDELETEORG, LR_COPYFROMRESOURCE,
-         	   						 LR_COPYRETURNORG, LR_CREATEDIBSECTION,
-         	   						 and LR_MONOCHROME; */
-            HBITMAP res;
-            BITMAP bm;
+	switch (type)
+	{
+        case IMAGE_BITMAP:
+			{
+				DbgPrint("WARNING:  Incomplete implementation of CopyImage!\n");
+        		/* FIXME:  support flags LR_COPYDELETEORG, LR_COPYFROMRESOURCE,
+     	   							 LR_COPYRETURNORG, LR_CREATEDIBSECTION,
+     	   							 and LR_MONOCHROME; */
+				HBITMAP res;
+				BITMAP bm;
 
-            if (!GetObjectW(hnd, sizeof(bm), &bm)) return 0;
-            bm.bmBits = NULL;
-            if ((res = CreateBitmapIndirect(&bm)))
-            {
-               char *buf = HeapAlloc(GetProcessHeap(), 0, bm.bmWidthBytes * bm.bmHeight);
-               GetBitmapBits(hnd, bm.bmWidthBytes * bm.bmHeight, buf);
-               SetBitmapBits(res, bm.bmWidthBytes * bm.bmHeight, buf);
-               HeapFree(GetProcessHeap(), 0, buf);
-            }
-            return res;
-        }
-     case IMAGE_ICON:
-        DbgPrint("FIXME: CopyImage doesn't support IMAGE_ICON correctly!\n");
-        return CopyIcon(hnd);
-     case IMAGE_CURSOR:
-        DbgPrint("FIXME: CopyImage doesn't support IMAGE_CURSOR correctly!\n");
-        return CopyCursor(hnd);
-    }
-    return 0;
+				if (!GetObjectW(hnd, sizeof(bm), &bm)) return 0;
+				bm.bmBits = NULL;
+				if ((res = CreateBitmapIndirect(&bm)))
+				{
+                    char *buf = HeapAlloc(GetProcessHeap(), 0, bm.bmWidthBytes * bm.bmHeight);
+					GetBitmapBits(hnd, bm.bmWidthBytes * bm.bmHeight, buf);
+					SetBitmapBits(res, bm.bmWidthBytes * bm.bmHeight, buf);
+					HeapFree(GetProcessHeap(), 0, buf);
+				}
+                return res;
+			}
+		case IMAGE_ICON: 
+			{
+				static BOOL IconMsgDisplayed = FALSE;
+				/* FIXME: support loading the image as shared from an instance */
+				if (!IconMsgDisplayed) {
+					DbgPrint("FIXME: CopyImage doesn't support IMAGE_ICON correctly!\n");
+					IconMsgDisplayed = TRUE;
+				}
+		        return CopyIcon(hnd);
+			}
+		case IMAGE_CURSOR: 
+			{
+				static BOOL IconMsgDisplayed = FALSE;
+				/* FIXME: support loading the image as shared from an instance */
+				if (!IconMsgDisplayed) {
+					DbgPrint("FIXME: CopyImage doesn't support IMAGE_CURSOR correctly!\n");
+					IconMsgDisplayed = TRUE;
+				}
+				return CopyCursor(hnd);
+			}
+	}
+	return 0;
 }

From 4d08b708f414916fe3e5e977f37f444f15223e07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Wed, 23 Jun 2004 07:31:22 +0000
Subject: [PATCH 046/356] Handle RLE bottom-up dibs

svn path=/trunk/; revision=9825
---
 reactos/subsys/win32k/eng/surface.c     | 101 +++++++++++++-----------
 reactos/subsys/win32k/objects/dib.c     |  18 ++---
 reactos/subsys/win32k/objects/objconv.c |   6 +-
 reactos/subsys/win32k/objects/text.c    |   4 +-
 4 files changed, 66 insertions(+), 63 deletions(-)

diff --git a/reactos/subsys/win32k/eng/surface.c b/reactos/subsys/win32k/eng/surface.c
index e95dc5de38a..db655e99051 100644
--- a/reactos/subsys/win32k/eng/surface.c
+++ b/reactos/subsys/win32k/eng/surface.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: surface.c,v 1.40 2004/05/30 14:01:12 weiden Exp $
+/* $Id: surface.c,v 1.41 2004/06/23 07:31:22 gvg Exp $
  * 
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -317,57 +317,68 @@ EngCreateBitmap(IN SIZEL Size,
   PVOID UncompressedBits;
   ULONG UncompressedFormat;
 
-  NewBitmap = (PVOID)CreateGDIHandle(sizeof(SURFGDI), sizeof(SURFOBJ), (PVOID*)&SurfGDI, (PVOID*)&SurfObj);
-  if( !ValidEngHandle( NewBitmap ) )
+if (Width < 0) __asm__("int $3\n");
+  NewBitmap = (HBITMAP) CreateGDIHandle(sizeof(SURFGDI), sizeof(SURFOBJ), (PVOID*)&SurfGDI, (PVOID*)&SurfObj);
+  if (! ValidEngHandle(NewBitmap))
 	return 0;
 
   SurfGDI->BitsPerPixel = BitsPerFormat(Format);
-  if (Format == BMF_4RLE) {
-	  SurfObj->lDelta = DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(BMF_4BPP));
-	  SurfObj->cjBits = SurfObj->lDelta * Size.cy;
-	  UncompressedFormat = BMF_4BPP;
+  if (Format == BMF_4RLE)
+    {
+      SurfObj->lDelta = DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(BMF_4BPP));
+      SurfObj->cjBits = SurfObj->lDelta * Size.cy;
+      UncompressedFormat = BMF_4BPP;
       UncompressedBits = EngAllocMem(FL_ZERO_MEMORY, SurfObj->cjBits, 0);
-	  Decompress4bpp(Size, (BYTE *)Bits, (BYTE *)UncompressedBits, SurfObj->lDelta);
-  } else {
-	  if (Format == BMF_8RLE) {
-		  SurfObj->lDelta = DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(BMF_8BPP));
-		  SurfObj->cjBits = SurfObj->lDelta * Size.cy;
-	      UncompressedFormat = BMF_8BPP;
-	      UncompressedBits = EngAllocMem(FL_ZERO_MEMORY, SurfObj->cjBits, 0);
-		  Decompress8bpp(Size, (BYTE *)Bits, (BYTE *)UncompressedBits, SurfObj->lDelta);
-	  } else {
-  SurfObj->lDelta = Width;
-  SurfObj->cjBits = SurfObj->lDelta * Size.cy;
-		  UncompressedBits = Bits;
-		  UncompressedFormat = Format;
-	  }
-  }
-  if(UncompressedBits!=NULL)
-  {
-    SurfObj->pvBits = UncompressedBits;
-  } else
-  {
-    if (SurfObj->cjBits == 0)
-    {
-      SurfObj->pvBits = NULL;
+      Decompress4bpp(Size, (BYTE *)Bits, (BYTE *)UncompressedBits, SurfObj->lDelta);
     }
-    else
+  else if (Format == BMF_8RLE)
     {
-      if(Flags & BMF_USERMEM)
-      {
-        SurfObj->pvBits = EngAllocUserMem(SurfObj->cjBits, 0);
-      } else {
-        if(Flags & BMF_NOZEROINIT)
-        {
-          SurfObj->pvBits = EngAllocMem(0, SurfObj->cjBits, 0);
-        } else {
-          SurfObj->pvBits = EngAllocMem(FL_ZERO_MEMORY, SurfObj->cjBits, 0);
-        }
-      }
+      SurfObj->lDelta = DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(BMF_8BPP));
+      SurfObj->cjBits = SurfObj->lDelta * Size.cy;
+      UncompressedFormat = BMF_8BPP;
+      UncompressedBits = EngAllocMem(FL_ZERO_MEMORY, SurfObj->cjBits, 0);
+      Decompress8bpp(Size, (BYTE *)Bits, (BYTE *)UncompressedBits, SurfObj->lDelta);
+    }
+  else
+    {
+      SurfObj->lDelta = Width;
+      SurfObj->cjBits = Width * Size.cy;
+      UncompressedBits = Bits;
+      UncompressedFormat = Format;
     }
-  }
 
-  SurfObj->dhsurf = 0; // device managed surface
+  if (UncompressedBits != NULL)
+    {
+      SurfObj->pvBits = UncompressedBits;
+    }
+  else
+    {
+      if (SurfObj->cjBits == 0)
+        {
+          SurfObj->pvBits = NULL;
+        }
+      else
+        {
+          if (0 != (Flags & BMF_USERMEM))
+            {
+              SurfObj->pvBits = EngAllocUserMem(SurfObj->cjBits, 0);
+            }
+          else
+            {
+              SurfObj->pvBits = EngAllocMem(0 != (Flags & BMF_NOZEROINIT) ? 0 : FL_ZERO_MEMORY,
+                                            SurfObj->cjBits, 0);
+             }
+         }
+     }
+
+
+  if (0 == (Flags & BMF_TOPDOWN))
+    {
+      SurfObj->pvBits = (PVOID) ((PCHAR) UncompressedBits + SurfObj->cjBits - SurfObj->lDelta);
+      SurfObj->lDelta = - SurfObj->lDelta;
+    }
+
+  SurfObj->dhsurf = 0; /* device managed surface */
   SurfObj->hsurf  = 0;
   SurfObj->dhpdev = NULL;
   SurfObj->hdev = NULL;
@@ -380,7 +391,7 @@ EngCreateBitmap(IN SIZEL Size,
 
   InitializeFuncs(SurfGDI, UncompressedFormat);
 
-  // Use flags to determine bitmap type -- TOP_DOWN or whatever
+  /* Use flags to determine bitmap type -- TOP_DOWN or whatever */
 
   return NewBitmap;
 }
diff --git a/reactos/subsys/win32k/objects/dib.c b/reactos/subsys/win32k/objects/dib.c
index 2a0cea6435b..d966f1c31be 100644
--- a/reactos/subsys/win32k/objects/dib.c
+++ b/reactos/subsys/win32k/objects/dib.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dib.c,v 1.52 2004/06/22 20:08:17 gvg Exp $
+ * $Id: dib.c,v 1.53 2004/06/23 07:31:22 gvg Exp $
  *
  * ReactOS W32 Subsystem
  * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team
@@ -132,8 +132,7 @@ IntSetDIBits(
   //RGBQUAD  *lpRGB;
   HPALETTE    DDB_Palette, DIB_Palette;
   ULONG       DDB_Palette_Type, DIB_Palette_Type;
-  const BYTE *vBits = (const BYTE*)Bits;
-  INT         scanDirection = 1, DIBWidth;
+  INT         DIBWidth;
 
   // Check parameters
   if (!(bitmap = BITMAPOBJ_LockBitmap(hBitmap)))
@@ -160,18 +159,11 @@ IntSetDIBits(
   // Determine width of DIB
   DIBWidth = DIB_GetDIBWidthBytes(SourceSize.cx, bmi->bmiHeader.biBitCount);
 
-  // Determine DIB Vertical Orientation
-  if(bmi->bmiHeader.biHeight > 0)
-  {
-    scanDirection = -1;
-    vBits += DIBWidth * bmi->bmiHeader.biHeight - DIBWidth;
-  }
-
   SourceBitmap = EngCreateBitmap(SourceSize,
-                                 DIBWidth * scanDirection,
+                                 DIBWidth,
                                  BitmapFormat(bmi->bmiHeader.biBitCount, bmi->bmiHeader.biCompression),
-                                 0,
-                                 (PVOID)vBits );
+                                 0 < bmi->bmiHeader.biHeight ? 0 : BMF_TOPDOWN,
+                                 (PVOID) Bits);
   SourceSurf = (SURFOBJ*)AccessUserObject((ULONG)SourceBitmap);
 
   // Destination palette obtained from the hDC
diff --git a/reactos/subsys/win32k/objects/objconv.c b/reactos/subsys/win32k/objects/objconv.c
index e9f74bde459..0ffea950ff9 100644
--- a/reactos/subsys/win32k/objects/objconv.c
+++ b/reactos/subsys/win32k/objects/objconv.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: objconv.c,v 1.18 2004/05/10 17:07:20 weiden Exp $ */
+/* $Id: objconv.c,v 1.19 2004/06/23 07:31:22 gvg Exp $ */
 #include <w32k.h>
 
 HBITMAP FASTCALL BitmapToSurf(PBITMAPOBJ BitmapObj, HDEV GDIDevice)
@@ -31,13 +31,13 @@ HBITMAP FASTCALL BitmapToSurf(PBITMAPOBJ BitmapObj, HDEV GDIDevice)
     {
     BitmapHandle = EngCreateBitmap(Size, BitmapObj->dib->dsBm.bmWidthBytes,
                                    BitmapFormat(BitmapObj->dib->dsBm.bmBitsPixel, BI_RGB),
-                                   0, BitmapObj->dib->dsBm.bmBits);
+                                   BMF_TOPDOWN, BitmapObj->dib->dsBm.bmBits);
     }
   else
     {
     BitmapHandle = EngCreateBitmap(Size, BitmapObj->bitmap.bmWidthBytes,
                                    BitmapFormat(BitmapObj->bitmap.bmBitsPixel, BI_RGB),
-                                   0, BitmapObj->bitmap.bmBits);
+                                   BMF_TOPDOWN, BitmapObj->bitmap.bmBits);
     }
   if (NULL != BitmapHandle && NULL != GDIDevice)
     {
diff --git a/reactos/subsys/win32k/objects/text.c b/reactos/subsys/win32k/objects/text.c
index bd5731dd01f..90a50f4f0cb 100644
--- a/reactos/subsys/win32k/objects/text.c
+++ b/reactos/subsys/win32k/objects/text.c
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: text.c,v 1.97 2004/06/20 00:45:37 navaraf Exp $ */
+/* $Id: text.c,v 1.98 2004/06/23 07:31:22 gvg Exp $ */
 #include <w32k.h>
 
 #include <ft2build.h>
@@ -1865,7 +1865,7 @@ NtGdiExtTextOut(
        * limit the work of the transbitblt.
        */
 
-      HSourceGlyph = EngCreateBitmap(bitSize, pitch, (glyph->bitmap.pixel_mode == ft_pixel_mode_grays) ? BMF_8BPP : BMF_1BPP, 0, glyph->bitmap.buffer);
+      HSourceGlyph = EngCreateBitmap(bitSize, pitch, (glyph->bitmap.pixel_mode == ft_pixel_mode_grays) ? BMF_8BPP : BMF_1BPP, BMF_TOPDOWN, glyph->bitmap.buffer);
       SourceGlyphSurf = (SURFOBJ*)AccessUserObject((ULONG) HSourceGlyph);
     
       /*

From 80dcdcc7f613f7655258996ddd150a86d508fbb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Wed, 23 Jun 2004 07:40:45 +0000
Subject: [PATCH 047/356] Remove debugging statement

svn path=/trunk/; revision=9826
---
 reactos/subsys/win32k/eng/surface.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/reactos/subsys/win32k/eng/surface.c b/reactos/subsys/win32k/eng/surface.c
index db655e99051..658fcc0869d 100644
--- a/reactos/subsys/win32k/eng/surface.c
+++ b/reactos/subsys/win32k/eng/surface.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: surface.c,v 1.41 2004/06/23 07:31:22 gvg Exp $
+/* $Id: surface.c,v 1.42 2004/06/23 07:40:45 gvg Exp $
  * 
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -317,7 +317,6 @@ EngCreateBitmap(IN SIZEL Size,
   PVOID UncompressedBits;
   ULONG UncompressedFormat;
 
-if (Width < 0) __asm__("int $3\n");
   NewBitmap = (HBITMAP) CreateGDIHandle(sizeof(SURFGDI), sizeof(SURFOBJ), (PVOID*)&SurfGDI, (PVOID*)&SurfObj);
   if (! ValidEngHandle(NewBitmap))
 	return 0;

From 411068e4cc2dfd960d04242cd3234f1e8bec3d7b Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Wed, 23 Jun 2004 14:09:55 +0000
Subject: [PATCH 048/356] Implement the ability to write the bootcode to a
 floppy disk.

svn path=/trunk/; revision=9829
---
 reactos/subsys/system/usetup/bootsup.c | 386 ++++++++++++
 reactos/subsys/system/usetup/bootsup.h |  16 +-
 reactos/subsys/system/usetup/usetup.c  | 834 ++++++++-----------------
 3 files changed, 658 insertions(+), 578 deletions(-)

diff --git a/reactos/subsys/system/usetup/bootsup.c b/reactos/subsys/system/usetup/bootsup.c
index 68fa979277e..6182e541500 100644
--- a/reactos/subsys/system/usetup/bootsup.c
+++ b/reactos/subsys/system/usetup/bootsup.c
@@ -29,6 +29,7 @@
 
 #include "usetup.h"
 #include "inicache.h"
+#include "filesup.h"
 #include "bootsup.h"
 
 #define NDEBUG
@@ -1727,4 +1728,389 @@ UpdateBootIni(PWSTR BootIniPath,
   return(Status);
 }
 
+
+BOOLEAN
+CheckInstallFatBootcodeToPartition(PUNICODE_STRING SystemRootPath)
+{
+  if (DoesFileExist(SystemRootPath->Buffer, L"ntldr") ||
+      DoesFileExist(SystemRootPath->Buffer, L"boot.ini"))
+    {
+      return TRUE;
+    }
+  else if (DoesFileExist(SystemRootPath->Buffer, L"io.sys") ||
+	   DoesFileExist(SystemRootPath->Buffer, L"msdos.sys"))
+    {
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+
+NTSTATUS
+InstallFatBootcodeToPartition(PUNICODE_STRING SystemRootPath,
+			      PUNICODE_STRING SourceRootPath,
+			      PUNICODE_STRING DestinationArcPath,
+			      UCHAR PartitionType)
+{
+  WCHAR SrcPath[MAX_PATH];
+  WCHAR DstPath[MAX_PATH];
+  NTSTATUS Status;
+
+  /* FAT or FAT32 partition */
+  DPRINT1("System path: '%wZ'\n", SystemRootPath);
+
+  if (DoesFileExist(SystemRootPath->Buffer, L"ntldr") == TRUE ||
+      DoesFileExist(SystemRootPath->Buffer, L"boot.ini") == TRUE)
+    {
+      /* Search root directory for 'ntldr' and 'boot.ini'. */
+      DPRINT("Found Microsoft Windows NT/2000/XP boot loader\n");
+
+      /* Copy FreeLoader to the boot partition */
+      wcscpy(SrcPath, SourceRootPath->Buffer);
+      wcscat(SrcPath, L"\\loader\\freeldr.sys");
+      wcscpy(DstPath, SystemRootPath->Buffer);
+      wcscat(DstPath, L"\\freeldr.sys");
+
+      DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath);
+      Status = SetupCopyFile(SrcPath, DstPath);
+      if (!NT_SUCCESS(Status))
+      {
+	DPRINT1("SetupCopyFile() failed (Status %lx)\n", Status);
+	return Status;
+      }
+
+      /* Create or update freeldr.ini */
+      if (DoesFileExist(SystemRootPath->Buffer, L"freeldr.ini") == FALSE)
+      {
+	/* Create new 'freeldr.ini' */
+	DPRINT1("Create new 'freeldr.ini'\n");
+	wcscpy(DstPath, SystemRootPath->Buffer);
+	wcscat(DstPath, L"\\freeldr.ini");
+
+	Status = CreateFreeLoaderIniForReactos(DstPath,
+					       DestinationArcPath->Buffer);
+	if (!NT_SUCCESS(Status))
+	{
+	  DPRINT1("CreateFreeLoaderIniForReactos() failed (Status %lx)\n", Status);
+	  return Status;
+	}
+
+	/* Install new bootcode */
+	if (PartitionType == PARTITION_FAT32 ||
+	    PartitionType == PARTITION_FAT32_XINT13)
+	{
+	  /* Install FAT32 bootcode */
+	  wcscpy(SrcPath, SourceRootPath->Buffer);
+	  wcscat(SrcPath, L"\\loader\\fat32.bin");
+	  wcscpy(DstPath, SystemRootPath->Buffer);
+	  wcscat(DstPath, L"\\bootsect.ros");
+
+	  DPRINT1("Install FAT32 bootcode: %S ==> %S\n", SrcPath, DstPath);
+	  Status = InstallFat32BootCodeToFile(SrcPath,
+					      DstPath,
+					      SystemRootPath->Buffer);
+	  if (!NT_SUCCESS(Status))
+	  {
+	    DPRINT1("InstallFat32BootCodeToFile() failed (Status %lx)\n", Status);
+	    return Status;
+	  }
+	}
+	else
+	{
+	  /* Install FAT16 bootcode */
+	  wcscpy(SrcPath, SourceRootPath->Buffer);
+	  wcscat(SrcPath, L"\\loader\\fat.bin");
+	  wcscpy(DstPath, SystemRootPath->Buffer);
+	  wcscat(DstPath, L"\\bootsect.ros");
+
+	  DPRINT1("Install FAT bootcode: %S ==> %S\n", SrcPath, DstPath);
+	  Status = InstallFat16BootCodeToFile(SrcPath,
+					      DstPath,
+					      SystemRootPath->Buffer);
+	  if (!NT_SUCCESS(Status))
+	  {
+	    DPRINT1("InstallFat16BootCodeToFile() failed (Status %lx)\n", Status);
+	    return Status;
+	  }
+	}
+
+	/* Update 'boot.ini' */
+	wcscpy(DstPath, SystemRootPath->Buffer);
+	wcscat(DstPath, L"\\boot.ini");
+
+	DPRINT1("Update 'boot.ini': %S\n", DstPath);
+	Status = UpdateBootIni(DstPath,
+			       L"C:\\bootsect.ros",
+			       L"\"ReactOS\"");
+	if (!NT_SUCCESS(Status))
+	{
+	  DPRINT1("UpdateBootIni() failed (Status %lx)\n", Status);
+	  return Status;
+	}
+      }
+      else
+      {
+	/* Update existing 'freeldr.ini' */
+	DPRINT1("Update existing 'freeldr.ini'\n");
+	wcscpy(DstPath, SystemRootPath->Buffer);
+	wcscat(DstPath, L"\\freeldr.ini");
+
+	Status = UpdateFreeLoaderIni(DstPath,
+				     DestinationArcPath->Buffer);
+	if (!NT_SUCCESS(Status))
+	{
+	  DPRINT1("UpdateFreeLoaderIni() failed (Status %lx)\n", Status);
+	  return Status;
+	}
+      }
+    }
+    else if (DoesFileExist(SystemRootPath->Buffer, L"io.sys") == TRUE ||
+	     DoesFileExist(SystemRootPath->Buffer, L"msdos.sys") == TRUE)
+    {
+      /* Search for root directory for 'io.sys' and 'msdos.sys'. */
+      DPRINT1("Found Microsoft DOS or Windows 9x boot loader\n");
+
+      /* Copy FreeLoader to the boot partition */
+      wcscpy(SrcPath, SourceRootPath->Buffer);
+      wcscat(SrcPath, L"\\loader\\freeldr.sys");
+      wcscpy(DstPath, SystemRootPath->Buffer);
+      wcscat(DstPath, L"\\freeldr.sys");
+
+      DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath);
+      Status = SetupCopyFile(SrcPath, DstPath);
+      if (!NT_SUCCESS(Status))
+      {
+	DPRINT1("SetupCopyFile() failed (Status %lx)\n", Status);
+	return Status;
+      }
+
+      /* Create or update 'freeldr.ini' */
+      if (DoesFileExist(SystemRootPath->Buffer, L"freeldr.ini") == FALSE)
+      {
+	/* Create new 'freeldr.ini' */
+	DPRINT1("Create new 'freeldr.ini'\n");
+	wcscpy(DstPath, SystemRootPath->Buffer);
+	wcscat(DstPath, L"\\freeldr.ini");
+
+	Status = CreateFreeLoaderIniForDos(DstPath,
+					   DestinationArcPath->Buffer);
+	if (!NT_SUCCESS(Status))
+	{
+	  DPRINT1("CreateFreeLoaderIniForDos() failed (Status %lx)\n", Status);
+	  return Status;
+	}
+
+	/* Save current bootsector as 'BOOTSECT.DOS' */
+	wcscpy(SrcPath, SystemRootPath->Buffer);
+	wcscpy(DstPath, SystemRootPath->Buffer);
+	wcscat(DstPath, L"\\bootsect.dos");
+
+	DPRINT1("Save bootsector: %S ==> %S\n", SrcPath, DstPath);
+	Status = SaveCurrentBootSector(SrcPath,
+				       DstPath);
+	if (!NT_SUCCESS(Status))
+	{
+	  DPRINT1("SaveCurrentBootSector() failed (Status %lx)\n", Status);
+	  return Status;
+	}
+
+	/* Install new bootsector */
+	if (PartitionType == PARTITION_FAT32 ||
+	    PartitionType == PARTITION_FAT32_XINT13)
+	{
+	  wcscpy(SrcPath, SourceRootPath->Buffer);
+	  wcscat(SrcPath, L"\\loader\\fat32.bin");
+
+	  DPRINT1("Install FAT32 bootcode: %S ==> %S\n", SrcPath, SystemRootPath->Buffer);
+	  Status = InstallFat32BootCodeToDisk(SrcPath,
+					      SystemRootPath->Buffer);
+	  if (!NT_SUCCESS(Status))
+	  {
+	    DPRINT1("InstallFat32BootCodeToDisk() failed (Status %lx)\n", Status);
+	    return Status;
+	  }
+	}
+	else
+	{
+	  wcscpy(SrcPath, SourceRootPath->Buffer);
+	  wcscat(SrcPath, L"\\loader\\fat.bin");
+
+	  DPRINT1("Install FAT bootcode: %S ==> %S\n", SrcPath, SystemRootPath->Buffer);
+	  Status = InstallFat16BootCodeToDisk(SrcPath,
+					      SystemRootPath->Buffer);
+	  if (!NT_SUCCESS(Status))
+	  {
+	    DPRINT1("InstallFat16BootCodeToDisk() failed (Status %lx)\n", Status);
+	    return Status;
+	  }
+	}
+      }
+      else
+      {
+	/* Update existing 'freeldr.ini' */
+	wcscpy(DstPath, SystemRootPath->Buffer);
+	wcscat(DstPath, L"\\freeldr.ini");
+
+	Status = UpdateFreeLoaderIni(DstPath,
+				     DestinationArcPath->Buffer);
+	if (!NT_SUCCESS(Status))
+	{
+	  DPRINT1("UpdateFreeLoaderIni() failed (Status %lx)\n", Status);
+	  return Status;
+	}
+      }
+    }
+    else
+    {
+      /* No or unknown boot loader */
+      DPRINT1("No or unknown boot loader found\n");
+
+      /* Copy FreeLoader to the boot partition */
+      wcscpy(SrcPath, SourceRootPath->Buffer);
+      wcscat(SrcPath, L"\\loader\\freeldr.sys");
+      wcscpy(DstPath, SystemRootPath->Buffer);
+      wcscat(DstPath, L"\\freeldr.sys");
+
+      DPRINT1("Copy: %S ==> %S\n", SrcPath, DstPath);
+      Status = SetupCopyFile(SrcPath, DstPath);
+      if (!NT_SUCCESS(Status))
+      {
+	DPRINT1("SetupCopyFile() failed (Status %lx)\n", Status);
+	return Status;
+      }
+
+      /* Create or update 'freeldr.ini' */
+      if (DoesFileExist(SystemRootPath->Buffer, L"freeldr.ini") == FALSE)
+      {
+	/* Create new freeldr.ini */
+	wcscpy(DstPath, SystemRootPath->Buffer);
+	wcscat(DstPath, L"\\freeldr.ini");
+
+	DPRINT1("Copy: %S ==> %S\n", SrcPath, DstPath);
+	Status = CreateFreeLoaderIniForReactos(DstPath,
+					       DestinationArcPath->Buffer);
+	if (!NT_SUCCESS(Status))
+	{
+	  DPRINT1("CreateFreeLoaderIniForReactos() failed (Status %lx)\n", Status);
+	  return Status;
+	}
+
+	/* Save current bootsector as 'BOOTSECT.OLD' */
+	wcscpy(SrcPath, SystemRootPath->Buffer);
+	wcscpy(DstPath, SystemRootPath->Buffer);
+	wcscat(DstPath, L"\\bootsect.old");
+
+	DPRINT1("Save bootsector: %S ==> %S\n", SrcPath, DstPath);
+	Status = SaveCurrentBootSector(SrcPath,
+				       DstPath);
+	if (!NT_SUCCESS(Status))
+	{
+	  DPRINT1("SaveCurrentBootSector() failed (Status %lx)\n", Status);
+	  return Status;
+	}
+
+	/* Install new bootsector */
+	if (PartitionType == PARTITION_FAT32 ||
+	    PartitionType == PARTITION_FAT32_XINT13)
+	{
+	  wcscpy(SrcPath, SourceRootPath->Buffer);
+	  wcscat(SrcPath, L"\\loader\\fat32.bin");
+
+	  DPRINT("Install FAT32 bootcode: %S ==> %S\n", SrcPath, SystemRootPath->Buffer);
+	  Status = InstallFat32BootCodeToDisk(SrcPath,
+					      SystemRootPath->Buffer);
+	  if (!NT_SUCCESS(Status))
+	  {
+	    DPRINT1("InstallFat32BootCodeToDisk() failed (Status %lx)\n", Status);
+	    return Status;
+	  }
+	}
+	else
+	{
+	  wcscpy(SrcPath, SourceRootPath->Buffer);
+	  wcscat(SrcPath, L"\\loader\\fat.bin");
+
+	  DPRINT("Install FAT bootcode: %S ==> %S\n", SrcPath, SystemRootPath->Buffer);
+	  Status = InstallFat16BootCodeToDisk(SrcPath,
+					      SystemRootPath->Buffer);
+	  if (!NT_SUCCESS(Status))
+	  {
+	    DPRINT1("InstallFat16BootCodeToDisk() failed (Status %lx)\n", Status);
+	    return Status;
+	  }
+	}
+      }
+      else
+      {
+	/* Update existing 'freeldr.ini' */
+	wcscpy(DstPath, SystemRootPath->Buffer);
+	wcscat(DstPath, L"\\freeldr.ini");
+
+	Status = UpdateFreeLoaderIni(DstPath,
+				     DestinationArcPath->Buffer);
+	if (!NT_SUCCESS(Status))
+	{
+	  DPRINT1("UpdateFreeLoaderIni() failed (Status %lx)\n", Status);
+	  return Status;
+	}
+      }
+    }
+
+  return STATUS_SUCCESS;
+}
+
+
+NTSTATUS
+InstallFatBootcodeToFloppy(PUNICODE_STRING SourceRootPath,
+			   PUNICODE_STRING DestinationArcPath)
+{
+  WCHAR SrcPath[MAX_PATH];
+  WCHAR DstPath[MAX_PATH];
+  NTSTATUS Status;
+
+  /* Copy FreeLoader to the boot partition */
+  wcscpy(SrcPath, SourceRootPath->Buffer);
+  wcscat(SrcPath, L"\\loader\\freeldr.sys");
+
+  wcscat(DstPath, L"\\Device\\Floppy0\\freeldr.sys");
+
+  DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath);
+  Status = SetupCopyFile(SrcPath, DstPath);
+  if (!NT_SUCCESS(Status))
+    {
+      DPRINT1("SetupCopyFile() failed (Status %lx)\n", Status);
+      return Status;
+    }
+
+  /* Create new 'freeldr.ini' */
+  wcscat(DstPath, L"\\Device\\Floppy0\\freeldr.ini");
+
+  DPRINT("Create new 'freeldr.ini'\n");
+  Status = CreateFreeLoaderIniForReactos(DstPath,
+					 DestinationArcPath->Buffer);
+  if (!NT_SUCCESS(Status))
+    {
+      DPRINT1("CreateFreeLoaderIniForReactos() failed (Status %lx)\n", Status);
+      return Status;
+    }
+
+  /* Install FAT12/16 boosector */
+  wcscpy(SrcPath, SourceRootPath->Buffer);
+  wcscat(SrcPath, L"\\loader\\fat.bin");
+
+  wcscat(DstPath, L"\\Device\\Floppy0");
+
+  DPRINT("Install FAT bootcode: %S ==> %S\n", SrcPath, DstPath);
+  Status = InstallFat16BootCodeToDisk(SrcPath,
+				      DstPath);
+  if (!NT_SUCCESS(Status))
+    {
+      DPRINT1("InstallFat16BootCodeToDisk() failed (Status %lx)\n", Status);
+      return Status;
+    }
+
+  return STATUS_SUCCESS;
+}
+
 /* EOF */
diff --git a/reactos/subsys/system/usetup/bootsup.h b/reactos/subsys/system/usetup/bootsup.h
index ad2993d5e89..f80bdc01908 100644
--- a/reactos/subsys/system/usetup/bootsup.h
+++ b/reactos/subsys/system/usetup/bootsup.h
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: bootsup.h,v 1.6 2003/08/19 15:54:47 ekohl Exp $
+/* $Id: bootsup.h,v 1.7 2004/06/23 14:09:55 ekohl Exp $
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
  * FILE:            subsys/system/usetup/bootsup.h
@@ -65,12 +65,24 @@ NTSTATUS
 InstallFat32BootCodeToDisk(PWSTR SrcPath,
 			   PWSTR RootPath);
 
-
 NTSTATUS
 UpdateBootIni(PWSTR BootIniPath,
 	      PWSTR EntryName,
 	      PWSTR EntryValue);
 
+BOOLEAN
+CheckInstallFatBootcodeToPartition(PUNICODE_STRING SystemRootPath);
+
+NTSTATUS
+InstallFatBootcodeToPartition(PUNICODE_STRING SystemRootPath,
+			      PUNICODE_STRING SourceRootPath,
+			      PUNICODE_STRING DestinationArcPath,
+			      UCHAR PartitionType);
+
+NTSTATUS
+InstallFatBootcodeToFloppy(PUNICODE_STRING SourceRootPath,
+			   PUNICODE_STRING DestinationArcPath);
+
 #endif /* __BOOTSUP_H__ */
 
 /* EOF */
diff --git a/reactos/subsys/system/usetup/usetup.c b/reactos/subsys/system/usetup/usetup.c
index 1e432d41504..b52cc8308a2 100644
--- a/reactos/subsys/system/usetup/usetup.c
+++ b/reactos/subsys/system/usetup/usetup.c
@@ -58,6 +58,8 @@ typedef enum _PAGE_NUMBER
   INTRO_PAGE,
   INSTALL_INTRO_PAGE,
 
+//  SCSI_CONTROLLER_PAGE,
+
   DEVICE_SETTINGS_PAGE,
   COMPUTER_SETTINGS_PAGE,
   DISPLAY_SETTINGS_PAGE,
@@ -78,6 +80,8 @@ typedef enum _PAGE_NUMBER
   FILE_COPY_PAGE,
   REGISTRY_PAGE,
   BOOT_LOADER_PAGE,
+  BOOT_LOADER_FLOPPY_PAGE,
+  BOOT_LOADER_HARDDISK_PAGE,
 
   REPAIR_INTRO_PAGE,
 
@@ -435,8 +439,7 @@ CheckUnattendedSetup(VOID)
   RtlInitUnicodeString(&FileName,
 		       UnattendInfPath);
 
-  /* Load txtsetup.sif from install media. */
-
+  /* Load 'unattend.inf' from install media. */
   Status = InfOpenFile(&UnattendInf,
 		       &FileName,
 		       &ErrorLine);
@@ -835,9 +838,45 @@ InstallIntroPage(PINPUT_RECORD Ir)
 
   if (IsUnattendedSetup)
     {
-      return(SELECT_PARTITION_PAGE);
+      return SELECT_PARTITION_PAGE;
     }
 
+  while(TRUE)
+    {
+      ConInKey(Ir);
+
+      if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
+	  (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */
+	{
+	  if (ConfirmQuit(Ir) == TRUE)
+	    return QUIT_PAGE;
+	  break;
+	}
+      else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */
+	{
+	  return DEVICE_SETTINGS_PAGE;
+//	  return SCSI_CONTROLLER_PAGE;
+	}
+    }
+
+  return INSTALL_INTRO_PAGE;
+}
+
+
+#if 0
+static PAGE_NUMBER
+ScsiControllerPage(PINPUT_RECORD Ir)
+{
+  SetTextXY(6, 8, "Setup detected the following mass storage devices:");
+
+  /* FIXME: print loaded mass storage driver descriptions */
+#if 0
+  SetTextXY(8, 10, "TEST device");
+#endif
+
+
+  SetStatusText("   ENTER = Continue   F3 = Quit");
+
   while(TRUE)
     {
       ConInKey(Ir);
@@ -855,8 +894,9 @@ InstallIntroPage(PINPUT_RECORD Ir)
 	}
     }
 
-  return INSTALL_INTRO_PAGE;
+  return SCSI_CONTROLLER_PAGE;
 }
+#endif
 
 
 static PAGE_NUMBER
@@ -3245,596 +3285,224 @@ RegistryPage(PINPUT_RECORD Ir)
 static PAGE_NUMBER
 BootLoaderPage(PINPUT_RECORD Ir)
 {
-  WCHAR SrcPath[MAX_PATH];
-  WCHAR DstPath[MAX_PATH];
-  NTSTATUS Status;
-
-  SetTextXY(6, 8, "Installing the boot loader");
+  UCHAR PartitionType;
+  BOOLEAN InstallOnFloppy;
+  USHORT Line = 12;
 
   SetStatusText("   Please wait...");
 
-  if (PartitionList->ActiveBootPartition->PartInfo[0].PartitionType == PARTITION_ENTRY_UNUSED)
+  PartitionType = PartitionList->ActiveBootPartition->PartInfo[0].PartitionType;
+
+  if (PartitionType == PARTITION_ENTRY_UNUSED)
     {
-      DPRINT1("Error: active partition invalid (unused)\n");
-      PopupError("The active partition is unused (invalid).\n",
-		 "ENTER = Reboot computer");
-
-      while(TRUE)
-	{
-	  ConInKey(Ir);
-
-	  if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D)	/* ENTER */
-	    {
-	      return QUIT_PAGE;
-	    }
-	}
+      DPRINT("Error: active partition invalid (unused)\n");
+      InstallOnFloppy = TRUE;
     }
-
-  if (PartitionList->ActiveBootPartition->PartInfo[0].PartitionType == 0x0A)
+  else if (PartitionType == 0x0A)
     {
       /* OS/2 boot manager partition */
-      DPRINT1("Found OS/2 boot manager partition\n");
-      PopupError("Setup found an OS/2 boot manager partiton.\n"
-		 "The OS/2 boot manager is not supported yet!",
-		 "ENTER = Reboot computer");
-
-      while(TRUE)
-	{
-	  ConInKey(Ir);
-
-	  if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D)	/* ENTER */
-	    {
-	      return QUIT_PAGE;
-	    }
-	}
+      DPRINT("Found OS/2 boot manager partition\n");
+      InstallOnFloppy = TRUE;
     }
-  else if (PartitionList->ActiveBootPartition->PartInfo[0].PartitionType == 0x83)
+  else if (PartitionType == 0x83)
     {
       /* Linux ext2 partition */
-      DPRINT1("Found Linux ext2 partition\n");
-      PopupError("Setup found a Linux ext2 partiton.\n"
-		 "Linux ext2 partitions are not supported yet!",
-		 "ENTER = Reboot computer");
-
-      while(TRUE)
-	{
-	  ConInKey(Ir);
-
-	  if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D)	/* ENTER */
-	    {
-	      return QUIT_PAGE;
-	    }
-	}
+      DPRINT("Found Linux ext2 partition\n");
+      InstallOnFloppy = TRUE;
     }
-  else if (PartitionList->ActiveBootPartition->PartInfo[0].PartitionType == PARTITION_IFS)
+  else if (PartitionType == PARTITION_IFS)
     {
       /* NTFS partition */
-      DPRINT1("Found NTFS partition\n");
-      PopupError("Setup found an NTFS partiton.\n"
-		 "NTFS partitions are not supported yet!",
-		 "ENTER = Reboot computer");
-
-      while(TRUE)
-	{
-	  ConInKey(Ir);
-
-	  if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D)	/* ENTER */
-	    {
-	      return QUIT_PAGE;
-	    }
-	}
+      DPRINT("Found NTFS partition\n");
+      InstallOnFloppy = TRUE;
     }
-  else if ((PartitionList->ActiveBootPartition->PartInfo[0].PartitionType == PARTITION_FAT_12) ||
-	   (PartitionList->ActiveBootPartition->PartInfo[0].PartitionType == PARTITION_FAT_16) ||
-	   (PartitionList->ActiveBootPartition->PartInfo[0].PartitionType == PARTITION_HUGE) ||
-	   (PartitionList->ActiveBootPartition->PartInfo[0].PartitionType == PARTITION_XINT13) ||
-	   (PartitionList->ActiveBootPartition->PartInfo[0].PartitionType == PARTITION_FAT32) ||
-	   (PartitionList->ActiveBootPartition->PartInfo[0].PartitionType == PARTITION_FAT32_XINT13))
-  {
-    /* FAT or FAT32 partition */
-    DPRINT1("System path: '%wZ'\n", &SystemRootPath);
-
-    if (DoesFileExist(SystemRootPath.Buffer, L"ntldr") == TRUE ||
-	DoesFileExist(SystemRootPath.Buffer, L"boot.ini") == TRUE)
+  else if ((PartitionType == PARTITION_FAT_12) ||
+	   (PartitionType == PARTITION_FAT_16) ||
+	   (PartitionType == PARTITION_HUGE) ||
+	   (PartitionType == PARTITION_XINT13) ||
+	   (PartitionType == PARTITION_FAT32) ||
+	   (PartitionType == PARTITION_FAT32_XINT13))
     {
-      /* Search root directory for 'ntldr' and 'boot.ini'. */
-      DPRINT1("Found Microsoft Windows NT/2000/XP boot loader\n");
-
-      /* Copy FreeLoader to the boot partition */
-      wcscpy(SrcPath, SourceRootPath.Buffer);
-      wcscat(SrcPath, L"\\loader\\freeldr.sys");
-      wcscpy(DstPath, SystemRootPath.Buffer);
-      wcscat(DstPath, L"\\freeldr.sys");
-
-      DPRINT1("Copy: %S ==> %S\n", SrcPath, DstPath);
-      Status = SetupCopyFile(SrcPath, DstPath);
-      if (!NT_SUCCESS(Status))
-      {
-	DPRINT1("SetupCopyFile() failed (Status %lx)\n", Status);
-	PopupError("Setup failed to copy 'freeldr.sys'.",
-		   "ENTER = Reboot computer");
-
-	while(TRUE)
-	{
-	  ConInKey(Ir);
-
-	  if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D)	/* ENTER */
-	  {
-	    return QUIT_PAGE;
-	  }
-	}
-      }
-
-      /* Create or update freeldr.ini */
-      if (DoesFileExist(SystemRootPath.Buffer, L"freeldr.ini") == FALSE)
-      {
-	/* Create new 'freeldr.ini' */
-	DPRINT1("Create new 'freeldr.ini'\n");
-	wcscpy(DstPath, SystemRootPath.Buffer);
-	wcscat(DstPath, L"\\freeldr.ini");
-
-	Status = CreateFreeLoaderIniForReactos(DstPath,
-					       DestinationArcPath.Buffer);
-	if (!NT_SUCCESS(Status))
-	{
-	  DPRINT1("CreateFreeLoaderIniForReactos() failed (Status %lx)\n", Status);
-	  PopupError("Setup failed to create 'freeldr.ini'.",
-		     "ENTER = Reboot computer");
-
-	  while(TRUE)
-	  {
-	    ConInKey(Ir);
-
-	    if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D)	/* ENTER */
-	    {
-	      return QUIT_PAGE;
-	    }
-	  }
-	}
-
-	/* Install new bootcode */
-	if ((PartitionList->ActiveBootPartition->PartInfo[0].PartitionType == PARTITION_FAT32) ||
-	    (PartitionList->ActiveBootPartition->PartInfo[0].PartitionType == PARTITION_FAT32_XINT13))
-	{
-	  /* Install FAT32 bootcode */
-	  wcscpy(SrcPath, SourceRootPath.Buffer);
-	  wcscat(SrcPath, L"\\loader\\fat32.bin");
-	  wcscpy(DstPath, SystemRootPath.Buffer);
-	  wcscat(DstPath, L"\\bootsect.ros");
-
-	  DPRINT1("Install FAT32 bootcode: %S ==> %S\n", SrcPath, DstPath);
-	  Status = InstallFat32BootCodeToFile(SrcPath,
-					      DstPath,
-					      SystemRootPath.Buffer);
-	  if (!NT_SUCCESS(Status))
-	  {
-	    DPRINT1("InstallFat32BootCodeToFile() failed (Status %lx)\n", Status);
-	    PopupError("Setup failed to install the FAT32 bootcode.",
-		       "ENTER = Reboot computer");
-
-	    while(TRUE)
-	    {
-	      ConInKey(Ir);
-
-	      if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D)	/* ENTER */
-	      {
-		return QUIT_PAGE;
-	      }
-	    }
-	  }
-	}
-	else
-	{
-	  /* Install FAT16 bootcode */
-	  wcscpy(SrcPath, SourceRootPath.Buffer);
-	  wcscat(SrcPath, L"\\loader\\fat.bin");
-	  wcscpy(DstPath, SystemRootPath.Buffer);
-	  wcscat(DstPath, L"\\bootsect.ros");
-
-	  DPRINT1("Install FAT bootcode: %S ==> %S\n", SrcPath, DstPath);
-	  Status = InstallFat16BootCodeToFile(SrcPath,
-					      DstPath,
-					      SystemRootPath.Buffer);
-	  if (!NT_SUCCESS(Status))
-	  {
-	    DPRINT1("InstallFat16BootCodeToFile() failed (Status %lx)\n", Status);
-	    PopupError("Setup failed to install the FAT bootcode.",
-		       "ENTER = Reboot computer");
-
-	    while(TRUE)
-	    {
-	      ConInKey(Ir);
-
-	      if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D)	/* ENTER */
-	      {
-		return QUIT_PAGE;
-	      }
-	    }
-	  }
-	}
-
-	/* Update 'boot.ini' */
-	wcscpy(DstPath, SystemRootPath.Buffer);
-	wcscat(DstPath, L"\\boot.ini");
-
-	DPRINT1("Update 'boot.ini': %S\n", DstPath);
-	Status = UpdateBootIni(DstPath,
-			       L"C:\\bootsect.ros",
-			       L"\"ReactOS\"");
-	if (!NT_SUCCESS(Status))
-	{
-	  DPRINT1("UpdateBootIni() failed (Status %lx)\n", Status);
-	  PopupError("Setup failed to update \'boot.ini\'.",
-		     "ENTER = Reboot computer");
-
-	  while(TRUE)
-	  {
-	    ConInKey(Ir);
-
-	    if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D)	/* ENTER */
-	    {
-	      return QUIT_PAGE;
-	    }
-	  }
-	}
-      }
-      else
-      {
-	/* Update existing 'freeldr.ini' */
-	DPRINT1("Update existing 'freeldr.ini'\n");
-	wcscpy(DstPath, SystemRootPath.Buffer);
-	wcscat(DstPath, L"\\freeldr.ini");
-
-	Status = UpdateFreeLoaderIni(DstPath,
-				     DestinationArcPath.Buffer);
-	if (!NT_SUCCESS(Status))
-	{
-	  DPRINT1("UpdateFreeLoaderIni() failed (Status %lx)\n", Status);
-	  PopupError("Setup failed to update 'freeldr.ini'.",
-		     "ENTER = Reboot computer");
-
-	  while(TRUE)
-	  {
-	    ConInKey(Ir);
-
-	    if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D)	/* ENTER */
-	    {
-	      return QUIT_PAGE;
-	    }
-	  }
-	}
-      }
+      DPRINT("Found FAT partition\n");
+      InstallOnFloppy = FALSE;
     }
-    else if (DoesFileExist(SystemRootPath.Buffer, L"io.sys") == TRUE ||
-	     DoesFileExist(SystemRootPath.Buffer, L"msdos.sys") == TRUE)
-    {
-      /* Search for root directory for 'io.sys' and 'msdos.sys'. */
-      DPRINT1("Found Microsoft DOS or Windows 9x boot loader\n");
-
-      /* Copy FreeLoader to the boot partition */
-      wcscpy(SrcPath, SourceRootPath.Buffer);
-      wcscat(SrcPath, L"\\loader\\freeldr.sys");
-      wcscpy(DstPath, SystemRootPath.Buffer);
-      wcscat(DstPath, L"\\freeldr.sys");
-
-      DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath);
-      Status = SetupCopyFile(SrcPath, DstPath);
-      if (!NT_SUCCESS(Status))
-      {
-	DPRINT1("SetupCopyFile() failed (Status %lx)\n", Status);
-	PopupError("Setup failed to copy 'freeldr.sys'.",
-		   "ENTER = Reboot computer");
-
-	while(TRUE)
-	{
-	  ConInKey(Ir);
-
-	  if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D)	/* ENTER */
-	  {
-	    return QUIT_PAGE;
-	  }
-	}
-      }
-
-      /* Create or update 'freeldr.ini' */
-      if (DoesFileExist(SystemRootPath.Buffer, L"freeldr.ini") == FALSE)
-      {
-	/* Create new 'freeldr.ini' */
-	DPRINT1("Create new 'freeldr.ini'\n");
-	wcscpy(DstPath, SystemRootPath.Buffer);
-	wcscat(DstPath, L"\\freeldr.ini");
-
-	Status = CreateFreeLoaderIniForDos(DstPath,
-					   DestinationArcPath.Buffer);
-	if (!NT_SUCCESS(Status))
-	{
-	  DPRINT1("CreateFreeLoaderIniForDos() failed (Status %lx)\n", Status);
-	  PopupError("Setup failed to create 'freeldr.ini'.",
-		     "ENTER = Reboot computer");
-
-	  while(TRUE)
-	  {
-	    ConInKey(Ir);
-
-	    if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D)	/* ENTER */
-	    {
-	      return QUIT_PAGE;
-	    }
-	  }
-	}
-
-	/* Save current bootsector as 'BOOTSECT.DOS' */
-	wcscpy(SrcPath, SystemRootPath.Buffer);
-	wcscpy(DstPath, SystemRootPath.Buffer);
-	wcscat(DstPath, L"\\bootsect.dos");
-
-	DPRINT1("Save bootsector: %S ==> %S\n", SrcPath, DstPath);
-	Status = SaveCurrentBootSector(SrcPath,
-				       DstPath);
-	if (!NT_SUCCESS(Status))
-	{
-	  DPRINT1("SaveCurrentBootSector() failed (Status %lx)\n", Status);
-	  PopupError("Setup failed to save the current bootsector.",
-		     "ENTER = Reboot computer");
-
-	  while(TRUE)
-	  {
-	    ConInKey(Ir);
-
-	    if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D)	/* ENTER */
-	    {
-	      return QUIT_PAGE;
-	    }
-	  }
-	}
-
-	/* Install new bootsector */
-	if ((PartitionList->ActiveBootPartition->PartInfo[0].PartitionType == PARTITION_FAT32) ||
-	    (PartitionList->ActiveBootPartition->PartInfo[0].PartitionType == PARTITION_FAT32_XINT13))
-	{
-	  wcscpy(SrcPath, SourceRootPath.Buffer);
-	  wcscat(SrcPath, L"\\loader\\fat32.bin");
-
-	  DPRINT1("Install FAT32 bootcode: %S ==> %S\n", SrcPath, SystemRootPath.Buffer);
-	  Status = InstallFat32BootCodeToDisk(SrcPath,
-					      SystemRootPath.Buffer);
-	  if (!NT_SUCCESS(Status))
-	  {
-	    DPRINT1("InstallFat32BootCodeToDisk() failed (Status %lx)\n", Status);
-	    PopupError("Setup failed to install the FAT32 bootcode.",
-		       "ENTER = Reboot computer");
-
-	    while(TRUE)
-	    {
-	      ConInKey(Ir);
-
-	      if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D)	/* ENTER */
-	      {
-		return QUIT_PAGE;
-	      }
-	    }
-	  }
-	}
-	else
-	{
-	  wcscpy(SrcPath, SourceRootPath.Buffer);
-	  wcscat(SrcPath, L"\\loader\\fat.bin");
-
-	  DPRINT1("Install FAT bootcode: %S ==> %S\n", SrcPath, SystemRootPath.Buffer);
-	  Status = InstallFat16BootCodeToDisk(SrcPath,
-					      SystemRootPath.Buffer);
-	  if (!NT_SUCCESS(Status))
-	  {
-	    DPRINT1("InstallFat16BootCodeToDisk() failed (Status %lx)\n", Status);
-	    PopupError("Setup failed to install the FAT bootcode.",
-		       "ENTER = Reboot computer");
-
-	    while(TRUE)
-	    {
-	      ConInKey(Ir);
-
-	      if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D)	/* ENTER */
-	      {
-		return QUIT_PAGE;
-	      }
-	    }
-	  }
-	}
-      }
-      else
-      {
-	/* Update existing 'freeldr.ini' */
-	wcscpy(DstPath, SystemRootPath.Buffer);
-	wcscat(DstPath, L"\\freeldr.ini");
-
-	Status = UpdateFreeLoaderIni(DstPath,
-				     DestinationArcPath.Buffer);
-	if (!NT_SUCCESS(Status))
-	{
-	  DPRINT1("UpdateFreeLoaderIni() failed (Status %lx)\n", Status);
-	  PopupError("Setup failed to update 'freeldr.ini'.",
-		     "ENTER = Reboot computer");
-
-	  while(TRUE)
-	  {
-	    ConInKey(Ir);
-
-	    if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D)	/* ENTER */
-	    {
-	      return QUIT_PAGE;
-	    }
-	  }
-	}
-      }
-    }
-    else
-    {
-      /* No or unknown boot loader */
-      DPRINT1("No or unknown boot loader found\n");
-
-      /* Copy FreeLoader to the boot partition */
-      wcscpy(SrcPath, SourceRootPath.Buffer);
-      wcscat(SrcPath, L"\\loader\\freeldr.sys");
-      wcscpy(DstPath, SystemRootPath.Buffer);
-      wcscat(DstPath, L"\\freeldr.sys");
-
-      DPRINT1("Copy: %S ==> %S\n", SrcPath, DstPath);
-      Status = SetupCopyFile(SrcPath, DstPath);
-      if (!NT_SUCCESS(Status))
-      {
-	DPRINT1("SetupCopyFile() failed (Status %lx)\n", Status);
-	PopupError("Setup failed to copy 'freeldr.sys'.",
-		   "ENTER = Reboot computer");
-
-	while(TRUE)
-	{
-	  ConInKey(Ir);
-
-	  if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D)	/* ENTER */
-	  {
-	    return QUIT_PAGE;
-	  }
-	}
-      }
-
-      /* Create or update 'freeldr.ini' */
-      if (DoesFileExist(SystemRootPath.Buffer, L"freeldr.ini") == FALSE)
-      {
-	/* Create new freeldr.ini */
-	wcscpy(DstPath, SystemRootPath.Buffer);
-	wcscat(DstPath, L"\\freeldr.ini");
-
-	DPRINT1("Copy: %S ==> %S\n", SrcPath, DstPath);
-	Status = CreateFreeLoaderIniForReactos(DstPath,
-					       DestinationArcPath.Buffer);
-	if (!NT_SUCCESS(Status))
-	{
-	  DPRINT1("CreateFreeLoaderIniForReactos() failed (Status %lx)\n", Status);
-	  PopupError("Setup failed to create \'freeldr.ini\'.",
-		     "ENTER = Reboot computer");
-
-	  while(TRUE)
-	  {
-	    ConInKey(Ir);
-
-	    if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D)	/* ENTER */
-	    {
-	      return QUIT_PAGE;
-	    }
-	  }
-	}
-
-	/* Save current bootsector as 'BOOTSECT.OLD' */
-	wcscpy(SrcPath, SystemRootPath.Buffer);
-	wcscpy(DstPath, SystemRootPath.Buffer);
-	wcscat(DstPath, L"\\bootsect.old");
-
-	DPRINT1("Save bootsector: %S ==> %S\n", SrcPath, DstPath);
-	Status = SaveCurrentBootSector(SrcPath,
-				       DstPath);
-	if (!NT_SUCCESS(Status))
-	{
-	  DPRINT1("SaveCurrentBootSector() failed (Status %lx)\n", Status);
-	  PopupError("Setup failed save the current bootsector.",
-		     "ENTER = Reboot computer");
-
-	  while(TRUE)
-	  {
-	    ConInKey(Ir);
-
-	    if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D)	/* ENTER */
-	    {
-	      return QUIT_PAGE;
-	    }
-	  }
-	}
-
-	/* Install new bootsector */
-	if ((PartitionList->ActiveBootPartition->PartInfo[0].PartitionType == PARTITION_FAT32) ||
-	    (PartitionList->ActiveBootPartition->PartInfo[0].PartitionType == PARTITION_FAT32_XINT13))
-	{
-	  wcscpy(SrcPath, SourceRootPath.Buffer);
-	  wcscat(SrcPath, L"\\loader\\fat32.bin");
-
-	  DPRINT1("Install FAT32 bootcode: %S ==> %S\n", SrcPath, SystemRootPath.Buffer);
-	  Status = InstallFat32BootCodeToDisk(SrcPath,
-					      SystemRootPath.Buffer);
-	  if (!NT_SUCCESS(Status))
-	  {
-	    DPRINT1("InstallFat32BootCodeToDisk() failed (Status %lx)\n", Status);
-	    PopupError("Setup failed to install the FAT32 bootcode.",
-		       "ENTER = Reboot computer");
-
-	    while(TRUE)
-	    {
-	      ConInKey(Ir);
-
-	      if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D)	/* ENTER */
-	      {
-		return QUIT_PAGE;
-	      }
-	    }
-	  }
-	}
-	else
-	{
-	  wcscpy(SrcPath, SourceRootPath.Buffer);
-	  wcscat(SrcPath, L"\\loader\\fat.bin");
-
-	  DPRINT1("Install FAT bootcode: %S ==> %S\n", SrcPath, SystemRootPath.Buffer);
-	  Status = InstallFat16BootCodeToDisk(SrcPath,
-					      SystemRootPath.Buffer);
-	  if (!NT_SUCCESS(Status))
-	  {
-	    DPRINT1("InstallFat16BootCodeToDisk() failed (Status %lx)\n", Status);
-	    PopupError("Setup failed to install the FAT bootcode.",
-		       "ENTER = Reboot computer");
-
-	    while(TRUE)
-	    {
-	      ConInKey(Ir);
-
-	      if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D)	/* ENTER */
-	      {
-		return QUIT_PAGE;
-	      }
-	    }
-	  }
-	}
-      }
-      else
-      {
-	/* Update existing 'freeldr.ini' */
-	wcscpy(DstPath, SystemRootPath.Buffer);
-	wcscat(DstPath, L"\\freeldr.ini");
-
-	Status = UpdateFreeLoaderIni(DstPath,
-				     DestinationArcPath.Buffer);
-	if (!NT_SUCCESS(Status))
-	{
-	  DPRINT1("UpdateFreeLoaderIni() failed (Status %lx)\n", Status);
-	  PopupError("Setup failed to update 'freeldr.ini'.",
-		     "ENTER = Reboot computer");
-
-	  while(TRUE)
-	  {
-	    ConInKey(Ir);
-
-	    if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D)	/* ENTER */
-	    {
-	      return QUIT_PAGE;
-	    }
-	  }
-	}
-      }
-    }
-  }
   else
     {
       /* Unknown partition */
-      DPRINT1("Unknown partition found\n");
-      PopupError("Setup found an unknown partiton type.\n"
-		 "This partition type is not supported!",
+      DPRINT("Unknown partition found\n");
+      InstallOnFloppy = TRUE;
+    }
+
+  if (InstallOnFloppy == TRUE)
+    {
+      return BOOT_LOADER_FLOPPY_PAGE;
+    }
+
+  SetTextXY(6, 8, "Setup is installing the boot loader");
+
+  SetTextXY(8, 12, "Install bootloader on the harddisk (MBR).");
+  SetTextXY(8, 13, "Install bootloader on a floppy disk.");
+  InvertTextXY (8, Line, 48, 1);
+
+  SetStatusText("   ENTER = Continue   F3 = Quit");
+
+  while(TRUE)
+    {
+      ConInKey(Ir);
+
+      if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
+	  (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DOWN)) /* DOWN */
+	{
+	  NormalTextXY (8, Line, 48, 1);
+	  if (Line == 12)
+	    Line = 13;
+	  else if (Line == 13)
+	    Line = 12;
+#if 0
+	  else
+	    Line++;
+#endif
+	  InvertTextXY (8, Line, 48, 1);
+	}
+      else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
+	       (Ir->Event.KeyEvent.wVirtualKeyCode == VK_UP)) /* UP */
+	{
+	  NormalTextXY (8, Line, 48, 1);
+	  if (Line == 12)
+	    Line = 13;
+	  else if (Line == 13)
+	    Line = 12;
+#if 0
+	  else
+	    Line--;
+#endif
+	  InvertTextXY (8, Line, 48, 1);
+	}
+      else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
+	       (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */
+	{
+	  if (ConfirmQuit(Ir) == TRUE)
+	    return QUIT_PAGE;
+	  break;
+	}
+      else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D)	/* ENTER */
+	{
+	  if (Line == 12)
+	    {
+	      return BOOT_LOADER_HARDDISK_PAGE;
+	    }
+	  else if (Line == 13)
+	    {
+	      return BOOT_LOADER_FLOPPY_PAGE;
+	    }
+
+	  return BOOT_LOADER_PAGE;
+	}
+
+    }
+
+  return BOOT_LOADER_PAGE;
+}
+
+
+static PAGE_NUMBER
+BootLoaderFloppyPage(PINPUT_RECORD Ir)
+{
+  NTSTATUS Status;
+
+  SetTextXY(6, 8, "Setup cannot install the bootloader on your computers");
+  SetTextXY(6, 9, "harddisk");
+
+  SetTextXY(6, 13, "Please insert a formatted floppy disk in drive A: and");
+  SetTextXY(6, 14, "press ENTER.");
+
+
+  SetStatusText("   ENTER = Continue   F3 = Quit");
+//  SetStatusText("   Please wait...");
+
+  while(TRUE)
+    {
+      ConInKey(Ir);
+
+      if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
+	  (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */
+	{
+	  if (ConfirmQuit(Ir) == TRUE)
+	    return QUIT_PAGE;
+	  break;
+	}
+      else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D)	/* ENTER */
+	{
+	  if (DoesFileExist(L"\\Device\\Floppy0", L"\\") == FALSE)
+	    {
+	      PopupError("No disk in drive A:.",
+			 "ENTER = Continue");
+	      while(TRUE)
+		{
+		  ConInKey(Ir);
+
+		  if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D)	/* ENTER */
+		    break;
+		}
+
+	      return BOOT_LOADER_FLOPPY_PAGE;
+	    }
+
+	  Status = InstallFatBootcodeToFloppy(&SourceRootPath,
+					      &DestinationArcPath);
+	  if (!NT_SUCCESS(Status))
+	    {
+	      /* Print error message */
+	      return BOOT_LOADER_FLOPPY_PAGE;
+	    }
+
+	  return SUCCESS_PAGE;
+	}
+    }
+
+  return BOOT_LOADER_FLOPPY_PAGE;
+}
+
+
+static PAGE_NUMBER
+BootLoaderHarddiskPage(PINPUT_RECORD Ir)
+{
+  UCHAR PartitionType;
+  NTSTATUS Status;
+
+  PartitionType = PartitionList->ActiveBootPartition->PartInfo[0].PartitionType;
+  if ((PartitionType == PARTITION_FAT_12) ||
+      (PartitionType == PARTITION_FAT_16) ||
+      (PartitionType == PARTITION_HUGE) ||
+      (PartitionType == PARTITION_XINT13) ||
+      (PartitionType == PARTITION_FAT32) ||
+      (PartitionType == PARTITION_FAT32_XINT13))
+    {
+      Status = InstallFatBootcodeToPartition(&SystemRootPath,
+					     &SourceRootPath,
+					     &DestinationArcPath,
+					     PartitionType);
+      if (!NT_SUCCESS(Status))
+	{
+	  PopupError("Setup failed to install the FAT bootcode on the system partition.",
+		     "ENTER = Reboot computer");
+
+	  while(TRUE)
+	    {
+	      ConInKey(Ir);
+
+	      if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D)	/* ENTER */
+		{
+		  return QUIT_PAGE;
+		}
+	    }
+	}
+
+      return SUCCESS_PAGE;
+    }
+  else
+    {
+      PopupError("failed to install FAT bootcode on the system partition.",
 		 "ENTER = Reboot computer");
 
       while(TRUE)
@@ -3848,7 +3516,7 @@ BootLoaderPage(PINPUT_RECORD Ir)
 	}
     }
 
-  return SUCCESS_PAGE;
+  return BOOT_LOADER_HARDDISK_PAGE;
 }
 
 
@@ -4028,6 +3696,12 @@ NtProcessStartup(PPEB Peb)
 	    Page = InstallIntroPage(&Ir);
 	    break;
 
+#if 0
+	  case SCSI_CONTROLLER_PAGE:
+	    Page = ScsiControllerPage(&Ir);
+	    break;
+#endif
+
 #if 0
 	  case OEM_DRIVER_PAGE:
 	    Page = OemDriverPage(&Ir);
@@ -4102,6 +3776,14 @@ NtProcessStartup(PPEB Peb)
 	    Page = BootLoaderPage(&Ir);
 	    break;
 
+	  case BOOT_LOADER_FLOPPY_PAGE:
+	    Page = BootLoaderFloppyPage(&Ir);
+	    break;
+
+	  case BOOT_LOADER_HARDDISK_PAGE:
+	    Page = BootLoaderHarddiskPage(&Ir);
+	    break;
+
 
 	  /* Repair pages */
 	  case REPAIR_INTRO_PAGE:

From 94c3ee3a6a901e1b24171226b89b4db79e2d4553 Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Wed, 23 Jun 2004 15:30:21 +0000
Subject: [PATCH 049/356] little fixes

svn path=/trunk/; revision=9830
---
 reactos/subsys/win32k/objects/color.c | 4 ++--
 reactos/subsys/win32k/objects/text.c  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/reactos/subsys/win32k/objects/color.c b/reactos/subsys/win32k/objects/color.c
index 9bf96aa14a4..0e53f752d98 100644
--- a/reactos/subsys/win32k/objects/color.c
+++ b/reactos/subsys/win32k/objects/color.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: color.c,v 1.42 2004/05/22 22:07:42 navaraf Exp $ */
+/* $Id: color.c,v 1.43 2004/06/23 15:30:20 weiden Exp $ */
 #include <w32k.h>
 
 // FIXME: Use PXLATEOBJ logicalToSystem instead of int *mapping
@@ -519,7 +519,7 @@ NtGdiUpdateColors(HDC hDC)
 {
    HWND hWnd;
 
-   hWnd = IntWindowFromDC(hDC);
+   hWnd = (HWND)NtUserCallOneParam((DWORD)hDC, ONEPARAM_ROUTINE_WINDOWFROMDC);
    if (hWnd == NULL)
    {
       SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE);
diff --git a/reactos/subsys/win32k/objects/text.c b/reactos/subsys/win32k/objects/text.c
index 90a50f4f0cb..d9fe42fa4b4 100644
--- a/reactos/subsys/win32k/objects/text.c
+++ b/reactos/subsys/win32k/objects/text.c
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: text.c,v 1.98 2004/06/23 07:31:22 gvg Exp $ */
+/* $Id: text.c,v 1.99 2004/06/23 15:30:21 weiden Exp $ */
 #include <w32k.h>
 
 #include <ft2build.h>
@@ -284,7 +284,7 @@ IntGdiAddFontResource(PUNICODE_STRING FileName, DWORD Characteristics)
 
    if (!NT_SUCCESS(Status))
    {
-      DPRINT("Could not font file: %wZ\n", Filename);
+      DPRINT("Could not font file: %wZ\n", FileName);
       NtGdiDeleteObject(NewFont);
       return 0;
    }

From a1c2b75227862665a327bedd9b35789386e7d77f Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Wed, 23 Jun 2004 15:38:07 +0000
Subject: [PATCH 050/356] don't use the pointer if it's NULL...

svn path=/trunk/; revision=9831
---
 reactos/subsys/win32k/ntuser/focus.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reactos/subsys/win32k/ntuser/focus.c b/reactos/subsys/win32k/ntuser/focus.c
index e833cc1040f..806dd7df226 100644
--- a/reactos/subsys/win32k/ntuser/focus.c
+++ b/reactos/subsys/win32k/ntuser/focus.c
@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: focus.c,v 1.23 2004/06/20 22:25:14 gvg Exp $
+ * $Id: focus.c,v 1.24 2004/06/23 15:38:07 weiden Exp $
  */
 
 #include <w32k.h>
@@ -452,7 +452,7 @@ NtUserSetFocus(HWND hWnd)
       if (Window->Style & (WS_MINIMIZE | WS_DISABLED))
       {
          IntReleaseWindowObject(Window);
-         return ThreadQueue ? 0 : ThreadQueue->FocusWindow;
+         return (ThreadQueue ? ThreadQueue->FocusWindow : 0);
       }
 
       if (Window->MessageQueue != ThreadQueue)

From 7ebb752f567c776f2c59b6c32c05ccceee2fc5d7 Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Wed, 23 Jun 2004 19:32:17 +0000
Subject: [PATCH 051/356] fixed handling of variable arguments and free memory
 allocated by FormatMessage(). Thanks to Michael Fritscher for spotting this
 bug.

svn path=/trunk/; revision=9833
---
 reactos/subsys/system/cmd/console.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/reactos/subsys/system/cmd/console.c b/reactos/subsys/system/cmd/console.c
index 33e925092da..e5e22648284 100644
--- a/reactos/subsys/system/cmd/console.c
+++ b/reactos/subsys/system/cmd/console.c
@@ -1,4 +1,4 @@
-/* $Id: console.c,v 1.6 2004/06/21 18:57:22 weiden Exp $
+/* $Id: console.c,v 1.7 2004/06/23 19:32:17 weiden Exp $
  *
  *  CONSOLE.C - console input/output functions.
  *
@@ -225,17 +225,29 @@ VOID ConPrintf(LPTSTR szFormat, va_list arg_ptr, DWORD nStdHandle)
 
 VOID ConOutFormatMessage (DWORD MessageId, ...)
 {
-	DWORD temp;
+	DWORD ret;
 	LPTSTR text;
 	va_list arg_ptr;
-	temp = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+	
+	va_start (arg_ptr, MessageId);
+	ret = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
 	       NULL,
 	       MessageId,
 	       MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
 	       (LPTSTR) &text,
 	       0,
 	       &arg_ptr);
-	ConErrPrintf (text);	
+	
+	va_end (arg_ptr);
+	if(ret > 0)
+	{
+		ConErrPuts (text);
+		LocalFree(text);
+	}
+	else
+	{
+		ConErrPrintf (_T("Unknown error: %d\n"), MessageId);
+	}
 }
 
 VOID ConOutPrintf (LPTSTR szFormat, ...)

From 814c815bc1d3214406f37b2672529c4230d4c918 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Wed, 23 Jun 2004 19:42:14 +0000
Subject: [PATCH 052/356] Fixed KeRaiseUserException to return old EIP.

svn path=/trunk/; revision=9834
---
 reactos/ntoskrnl/include/internal/ke.h |  2 +-
 reactos/ntoskrnl/ke/i386/exp.c         | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/reactos/ntoskrnl/include/internal/ke.h b/reactos/ntoskrnl/include/internal/ke.h
index 0069df63d02..67a8cd61faf 100644
--- a/reactos/ntoskrnl/include/internal/ke.h
+++ b/reactos/ntoskrnl/include/internal/ke.h
@@ -79,7 +79,7 @@ KiDeliverNormalApc(VOID);
 BOOLEAN STDCALL KeRemoveQueueApc (PKAPC Apc);
 PLIST_ENTRY STDCALL KeRundownQueue(IN PKQUEUE Queue);
 
-VOID STDCALL
+NTSTATUS STDCALL
 KeRaiseUserException(NTSTATUS ExceptionCode);
 
 
diff --git a/reactos/ntoskrnl/ke/i386/exp.c b/reactos/ntoskrnl/ke/i386/exp.c
index f034a19a918..58e237b20e7 100644
--- a/reactos/ntoskrnl/ke/i386/exp.c
+++ b/reactos/ntoskrnl/ke/i386/exp.c
@@ -746,14 +746,16 @@ KeInitExceptions(VOID)
  * @implemented
  */
 
-VOID STDCALL
+NTSTATUS STDCALL
 KeRaiseUserException(IN NTSTATUS ExceptionCode)
 {
    /* FIXME: This needs SEH */
+	ULONG OldEip;
+	PKTHREAD Thread = KeGetCurrentThread();
 
-   PKTHREAD Thread = KeGetCurrentThread();
-
-   ProbeForWrite(&Thread->Teb->ExceptionCode, sizeof(NTSTATUS), sizeof(NTSTATUS)); /* NT doesn't check this -- bad? */
-   Thread->TrapFrame->Eip = (ULONG_PTR)LdrpGetSystemDllRaiseExceptionDispatcher();
-   Thread->Teb->ExceptionCode = ExceptionCode;
+	ProbeForWrite(&Thread->Teb->ExceptionCode, sizeof(NTSTATUS), sizeof(NTSTATUS)); /* NT doesn't check this -- bad? */
+	OldEip = Thread->TrapFrame->Eip;
+	Thread->TrapFrame->Eip = (ULONG_PTR)LdrpGetSystemDllRaiseExceptionDispatcher();
+	Thread->Teb->ExceptionCode = ExceptionCode;
+	return((NTSTATUS)OldEip);
 }

From 96523ea31421031e0ce64ba45692c37d648f9c50 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Wed, 23 Jun 2004 19:48:39 +0000
Subject: [PATCH 053/356] Fixed KeRaiseUserException to return old EIP.

svn path=/trunk/; revision=9835
---
 reactos/include/ddk/kefuncs.h          | 2 +-
 reactos/ntoskrnl/include/internal/ke.h | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/reactos/include/ddk/kefuncs.h b/reactos/include/ddk/kefuncs.h
index f6f7014cb03..a7aa8ca40bc 100644
--- a/reactos/include/ddk/kefuncs.h
+++ b/reactos/include/ddk/kefuncs.h
@@ -262,7 +262,7 @@ KeRaiseIrqlToDpcLevel (
  * ARGUMENTS:
  *	ExceptionCode = Status code of the exception
  */
-VOID
+NTSTATUS
 STDCALL
 KeRaiseUserException (
 	IN	NTSTATUS	ExceptionCode
diff --git a/reactos/ntoskrnl/include/internal/ke.h b/reactos/ntoskrnl/include/internal/ke.h
index 67a8cd61faf..c474b9f1f42 100644
--- a/reactos/ntoskrnl/include/internal/ke.h
+++ b/reactos/ntoskrnl/include/internal/ke.h
@@ -80,8 +80,7 @@ BOOLEAN STDCALL KeRemoveQueueApc (PKAPC Apc);
 PLIST_ENTRY STDCALL KeRundownQueue(IN PKQUEUE Queue);
 
 NTSTATUS STDCALL
-KeRaiseUserException(NTSTATUS ExceptionCode);
-
+KeRaiseUserException(IN NTSTATUS ExceptionCode);
 
 /* INITIALIZATION FUNCTIONS *************************************************/
 

From cd97bd13dae6306f3d2c03920a46fedd2d1bc367 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Wed, 23 Jun 2004 19:48:53 +0000
Subject: [PATCH 054/356] Added Ldr Stub Prototypes

svn path=/trunk/; revision=9836
---
 reactos/include/ddk/ldrfuncs.h | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/reactos/include/ddk/ldrfuncs.h b/reactos/include/ddk/ldrfuncs.h
index 229d36e8c9c..f1988e2d234 100644
--- a/reactos/include/ddk/ldrfuncs.h
+++ b/reactos/include/ddk/ldrfuncs.h
@@ -1,6 +1,6 @@
 #ifndef __INCLUDE_DDK_LDRFUNCS_H
 #define __INCLUDE_DDK_LDRFUNCS_H
-/* $Id: ldrfuncs.h,v 1.5 2002/09/08 10:47:44 chorns Exp $ */
+/* $Id: ldrfuncs.h,v 1.6 2004/06/23 19:48:53 ion Exp $ */
 
 NTSTATUS STDCALL
 LdrAccessResource(IN  PVOID BaseAddress,
@@ -14,4 +14,17 @@ LdrFindResource_U(IN  PVOID BaseAddress,
                   IN  ULONG Level,
                   OUT PIMAGE_RESOURCE_DATA_ENTRY *ResourceDataEntry);
 
+NTSTATUS STDCALL 
+LdrFindResourceDirectory_U(	IN PVOID   						BaseAddress,
+							IN PLDR_RESOURCE_INFO			ResourceInfo,
+							IN  ULONG						Level,
+							OUT PIMAGE_RESOURCE_DIRECTORY	*ResourceDirectory);
+
+NTSTATUS STDCALL
+LdrEnumResources(IN PVOID						BaseAddress,
+				 IN PLDR_RESOURCE_INFO			ResourceInfo,
+				 IN  ULONG						Level,
+				 IN OUT PULONG					ResourceCount,
+				 OUT PVOID						Resources  OPTIONAL);
+
 #endif /* __INCLUDE_DDK_LDRFUNCS_H */

From 517e96313d8fdcf787207f81b6582650fef3b124 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Wed, 23 Jun 2004 19:49:11 +0000
Subject: [PATCH 055/356] Added Ldr Stubs

svn path=/trunk/; revision=9837
---
 reactos/ntoskrnl/ldr/resource.c | 37 ++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/reactos/ntoskrnl/ldr/resource.c b/reactos/ntoskrnl/ldr/resource.c
index b2fe198bcc5..f67e5e3828c 100644
--- a/reactos/ntoskrnl/ldr/resource.c
+++ b/reactos/ntoskrnl/ldr/resource.c
@@ -1,4 +1,4 @@
-/* $Id: resource.c,v 1.6 2003/08/22 20:00:39 weiden Exp $
+/* $Id: resource.c,v 1.7 2004/06/23 19:49:11 ion Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -190,4 +190,39 @@ found:;
   return Status;
 }
 
+/* STUBS */
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+LdrFindResourceDirectory_U(
+	IN PVOID   	BaseAddress,
+	IN PLDR_RESOURCE_INFO			ResourceInfo,
+	IN  ULONG						Level,
+	OUT PIMAGE_RESOURCE_DIRECTORY	*ResourceDirectory
+)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+LdrEnumResources(
+	IN PVOID   	BaseAddress,
+	IN PLDR_RESOURCE_INFO			ResourceInfo,
+	IN  ULONG						Level,
+	IN OUT PULONG					ResourceCount,
+	OUT PVOID						Resources  OPTIONAL
+)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
 /* EOF */

From 83f7c0f1265d72c0d2e4c530478364c8548f0fd9 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Wed, 23 Jun 2004 19:49:21 +0000
Subject: [PATCH 056/356] Added Lpc Stubs

svn path=/trunk/; revision=9838
---
 reactos/ntoskrnl/lpc/reply.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/reactos/ntoskrnl/lpc/reply.c b/reactos/ntoskrnl/lpc/reply.c
index 4db58f2785d..0de25529c3c 100644
--- a/reactos/ntoskrnl/lpc/reply.c
+++ b/reactos/ntoskrnl/lpc/reply.c
@@ -1,4 +1,4 @@
-/* $Id: reply.c,v 1.19 2003/08/07 11:47:33 silverblade Exp $
+/* $Id: reply.c,v 1.20 2004/06/23 19:49:21 ion Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -335,5 +335,19 @@ NtReplyWaitReplyPort (HANDLE		PortHandle,
    return(STATUS_NOT_IMPLEMENTED);
 }
 
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+LpcRequestWaitReplyPort (
+	IN PEPORT		Port,
+	IN PLPC_MESSAGE	LpcMessageRequest,
+	OUT PLPC_MESSAGE	LpcMessageReply
+	)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
 
 /* EOF */

From b8b9f846b6820130701fef77a70bbf8c22c7af36 Mon Sep 17 00:00:00 2001
From: Hartmut Birr <osexpert@googlemail.com>
Date: Wed, 23 Jun 2004 20:23:59 +0000
Subject: [PATCH 057/356] - Improved removable media support.

svn path=/trunk/; revision=9839
---
 reactos/drivers/fs/vfat/create.c | 81 ++++++++++++++------------------
 reactos/drivers/fs/vfat/fsctl.c  | 63 ++++++++++++++++++++-----
 reactos/drivers/fs/vfat/vfat.h   |  6 ++-
 3 files changed, 92 insertions(+), 58 deletions(-)

diff --git a/reactos/drivers/fs/vfat/create.c b/reactos/drivers/fs/vfat/create.c
index 2204b4b9273..1f95922f578 100644
--- a/reactos/drivers/fs/vfat/create.c
+++ b/reactos/drivers/fs/vfat/create.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: create.c,v 1.67 2004/03/31 03:30:36 jimtabor Exp $
+/* $Id: create.c,v 1.68 2004/06/23 20:23:59 hbirr Exp $
  *
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/fs/vfat/create.c
@@ -338,11 +338,11 @@ VfatOpenFile (PDEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject,
 {
   PVFATFCB ParentFcb;
   PVFATFCB Fcb;
-  DISK_GEOMETRY DiskGeometry;
   NTSTATUS Status;
   UNICODE_STRING NameU;
   WCHAR Name[MAX_PATH];
   ULONG Size;
+  ULONG MediaChangeCount;
 
 //  PDEVICE_OBJECT DeviceObject = DeviceExt->StorageDevice->Vpb->DeviceObject;
   
@@ -370,50 +370,41 @@ VfatOpenFile (PDEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject,
 
   DPRINT ("PathName to open: '%wZ'\n", FileNameU);
 
-   Size = sizeof(DISK_GEOMETRY);
-   Status = VfatBlockDeviceIoControl(DeviceExt->StorageDevice,
-				     IOCTL_DISK_GET_DRIVE_GEOMETRY,
-				     NULL,
-				     0,
-				     &DiskGeometry,
-				     &Size,
-				     FALSE);
-
-  if (DiskGeometry.MediaType != FixedMedia )
-     {
-
-  	Status = VfatBlockDeviceIoControl (DeviceExt->StorageDevice,
-					IOCTL_DISK_CHECK_VERIFY,
-					NULL,
-					0,
-					NULL,
-					0,
-					TRUE);
-
-      if (Status == STATUS_VERIFY_REQUIRED)
-    	    {
-      PDEVICE_OBJECT DeviceToVerify;
-
-      DPRINT ("Media change detected!\n");
-      DPRINT ("Device %p\n", DeviceObject);
-
-      DeviceToVerify = IoGetDeviceToVerify (PsGetCurrentThread ());
-      IoSetDeviceToVerify (PsGetCurrentThread (),
-			   NULL);
-
-      Status = IoVerifyVolume (DeviceToVerify,
-			       FALSE);
-      if (!NT_SUCCESS(Status))
-	{
-	  DPRINT ("Status %lx\n", Status);
-	  return Status;
-	}
-    }
-  else if (!NT_SUCCESS(Status))
+  if (!DeviceExt->FatInfo.FixedMedia)
     {
-      DPRINT ("Status %lx\n", Status);
-      return Status;
-    }
+      Size = sizeof(ULONG);
+      Status = VfatBlockDeviceIoControl (DeviceExt->StorageDevice,
+					 IOCTL_DISK_CHECK_VERIFY,
+					 NULL,
+					 0,
+					 &MediaChangeCount,
+					 &Size,
+					 FALSE);
+
+      if (Status == STATUS_VERIFY_REQUIRED || MediaChangeCount != DeviceExt->MediaChangeCount)
+        {
+          PDEVICE_OBJECT DeviceToVerify;
+
+          DPRINT ("Media change detected!\n");
+          DPRINT ("Device %p\n", DeviceExt->StorageDevice);
+
+          DeviceToVerify = IoGetDeviceToVerify (PsGetCurrentThread ());
+          IoSetDeviceToVerify (PsGetCurrentThread (),
+			       NULL);
+
+          Status = IoVerifyVolume (DeviceToVerify,
+			          FALSE);
+          if (!NT_SUCCESS(Status))
+	    {
+	      DPRINT ("Status %lx\n", Status);
+	      return Status;
+	    }
+        }
+      else if (!NT_SUCCESS(Status))
+        {
+          DPRINT ("Status %lx\n", Status);
+          return Status;
+        }
     }
 
 
diff --git a/reactos/drivers/fs/vfat/fsctl.c b/reactos/drivers/fs/vfat/fsctl.c
index 5bd8bc9dcda..890595b35f9 100644
--- a/reactos/drivers/fs/vfat/fsctl.c
+++ b/reactos/drivers/fs/vfat/fsctl.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: fsctl.c,v 1.31 2004/06/20 09:52:58 navaraf Exp $
+/* $Id: fsctl.c,v 1.32 2004/06/23 20:23:59 hbirr Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -31,7 +31,7 @@
 #include <rosrtl/string.h>
 #include <wchar.h>
 
-//#define NDEBUG
+#define NDEBUG
 #include <debug.h>
 
 #include "vfat.h"
@@ -74,6 +74,7 @@ VfatHasFileSystem(PDEVICE_OBJECT DeviceToMount,
       DPRINT("VfatBlockDeviceIoControl faild (%x)\n", Status);
       return Status;
    }
+   FatInfo.FixedMedia = DiskGeometry.MediaType == FixedMedia ? TRUE : FALSE;
    if (DiskGeometry.MediaType == FixedMedia || DiskGeometry.MediaType == RemovableMedia)
    {
       // We have found a hard disk
@@ -274,6 +275,7 @@ VfatMountDevice(PDEVICE_EXTENSION DeviceExt,
 {
    NTSTATUS Status;
    BOOLEAN RecognizedFS;
+   ULONG Size;
 
    DPRINT("Mounting VFAT device...\n");
 
@@ -284,6 +286,22 @@ VfatMountDevice(PDEVICE_EXTENSION DeviceExt,
    }
    DPRINT("MountVfatdev %d, PAGE_SIZE = %d\n", DeviceExt->FatInfo.BytesPerCluster, PAGE_SIZE);
 
+   if (!DeviceExt->FatInfo.FixedMedia)
+     {
+       Size = sizeof(ULONG);
+       Status = VfatBlockDeviceIoControl (DeviceToMount,
+					  IOCTL_DISK_CHECK_VERIFY,
+					  NULL,
+					  0,
+					  &DeviceExt->MediaChangeCount,
+					  &Size,
+					  FALSE);
+       if (!NT_SUCCESS(Status))
+         {
+	   return Status;
+	 }
+     }
+
    return(STATUS_SUCCESS);
 }
 
@@ -478,29 +496,50 @@ VfatVerify (PVFAT_IRP_CONTEXT IrpContext)
 {
   PDEVICE_OBJECT DeviceToVerify;
   NTSTATUS Status = STATUS_SUCCESS;
-
+  FATINFO FatInfo;
+  BOOLEAN RecognizedFS;
+  ULONG Size;
+  PDEVICE_EXTENSION DeviceExt = IrpContext->DeviceExt;
 
   DPRINT("VfatVerify(IrpContext %x)\n", IrpContext);
 
   DeviceToVerify = IrpContext->Stack->Parameters.VerifyVolume.DeviceObject;
+  Size = sizeof(ULONG);
   Status = VfatBlockDeviceIoControl(DeviceToVerify,
 				    IOCTL_DISK_CHECK_VERIFY,
 				    NULL,
 				    0,
-				    NULL,
-				    NULL,
+				    &DeviceExt->MediaChangeCount,
+				    &Size,
 				    FALSE);
-  if (!NT_SUCCESS(Status))
+  if (!NT_SUCCESS(Status) && Status != STATUS_VERIFY_REQUIRED)
     {
       DPRINT("VfatBlockDeviceIoControl() failed (Status %lx)\n", Status);
-
-      /* FIXME: Compare volume label */
-
-      DPRINT("  returning STATUS_WRONG_VOLUME\n");
-
       Status = STATUS_WRONG_VOLUME;
     }
-  DeviceToVerify->Flags &= ~DO_VERIFY_VOLUME;
+  else
+    {
+      Status = VfatHasFileSystem(DeviceToVerify, &RecognizedFS, &FatInfo);
+      if (!NT_SUCCESS(Status) || RecognizedFS == FALSE)
+        {
+          Status = STATUS_WRONG_VOLUME;
+        }
+      else if (sizeof(FATINFO) == RtlCompareMemory(&FatInfo, &DeviceExt->FatInfo, sizeof(FATINFO)))
+        {
+          /*
+           * FIXME:
+           *   Preformated floppy disks have very often a serial number of 0000:0000. 
+           *   We should calculate a crc sum over the sectors from the root directory as secondary volume number. 
+	   *   Each write to the root directory must update this crc sum.
+           */
+  
+          DeviceToVerify->Flags &= ~DO_VERIFY_VOLUME;
+        }
+      else
+      	{
+      	  Status = STATUS_WRONG_VOLUME;
+        }
+     }
     
   return Status;
 }
diff --git a/reactos/drivers/fs/vfat/vfat.h b/reactos/drivers/fs/vfat/vfat.h
index 63a19ef5365..0eb9b0d53a4 100644
--- a/reactos/drivers/fs/vfat/vfat.h
+++ b/reactos/drivers/fs/vfat/vfat.h
@@ -1,4 +1,4 @@
-/* $Id: vfat.h,v 1.63 2004/05/15 23:00:02 hbirr Exp $ */
+/* $Id: vfat.h,v 1.64 2004/06/23 20:23:59 hbirr Exp $ */
 
 #include <ddk/ntifs.h>
 
@@ -129,6 +129,7 @@ typedef struct
   ULONG NumberOfClusters;
   ULONG FatType;
   ULONG Sectors;
+  BOOL FixedMedia;
 } FATINFO, *PFATINFO;
 
 struct _VFATFCB;
@@ -162,6 +163,9 @@ typedef struct
   struct _VFATFCB * VolumeFcb;
 
   LIST_ENTRY VolumeListEntry;
+
+  ULONG MediaChangeCount;
+
 } DEVICE_EXTENSION, *PDEVICE_EXTENSION, VCB, *PVCB;
 
 typedef struct

From 62a4509b5fba9c40eff678838d2021622f3085b5 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Wed, 23 Jun 2004 21:01:28 +0000
Subject: [PATCH 058/356] Added Ex Stubs

svn path=/trunk/; revision=9840
---
 reactos/ntoskrnl/ex/interlck.c |  19 ++++-
 reactos/ntoskrnl/ex/list.c     |  17 +++-
 reactos/ntoskrnl/ex/rundown.c  | 142 +++++++++++++++++++++++++++++++++
 reactos/ntoskrnl/ex/synch.c    |  76 ++++++++++++++++++
 reactos/ntoskrnl/ex/sysinfo.c  |  42 +++++++++-
 reactos/ntoskrnl/ex/time.c     |  14 +++-
 reactos/ntoskrnl/ex/util.c     |  63 +++++++++++++++
 7 files changed, 369 insertions(+), 4 deletions(-)
 create mode 100644 reactos/ntoskrnl/ex/rundown.c
 create mode 100644 reactos/ntoskrnl/ex/synch.c
 create mode 100644 reactos/ntoskrnl/ex/util.c

diff --git a/reactos/ntoskrnl/ex/interlck.c b/reactos/ntoskrnl/ex/interlck.c
index ef627177fcd..5d5ea238424 100644
--- a/reactos/ntoskrnl/ex/interlck.c
+++ b/reactos/ntoskrnl/ex/interlck.c
@@ -1,4 +1,4 @@
-/* $Id: interlck.c,v 1.12 2004/06/01 01:00:25 sedwards Exp $
+/* $Id: interlck.c,v 1.13 2004/06/23 21:01:27 ion Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -217,6 +217,23 @@ ExInterlockedCompareExchange64 (IN OUT	PLONGLONG	Destination,
 	return oldval;
 }
 
+/*
+ * @unimplemented
+ */
+LONGLONG
+FASTCALL
+ExfInterlockedCompareExchange64(
+    IN OUT LONGLONG volatile *Destination,
+    IN PLONGLONG ExChange,
+    IN PLONGLONG Comperand
+    )
+{
+	LONGLONG oldval;
+
+	UNIMPLEMENTED;
+	return oldval;
+}
+
 /*
  * @implemented
  */
diff --git a/reactos/ntoskrnl/ex/list.c b/reactos/ntoskrnl/ex/list.c
index 2088ef93683..f74ef818070 100644
--- a/reactos/ntoskrnl/ex/list.c
+++ b/reactos/ntoskrnl/ex/list.c
@@ -1,4 +1,4 @@
-/* $Id: list.c,v 1.11 2003/08/14 18:30:28 silverblade Exp $
+/* $Id: list.c,v 1.12 2004/06/23 21:01:27 ion Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -25,6 +25,21 @@ static KSPIN_LOCK ExpGlobalListLock = { 0, };
 
 /* FUNCTIONS *************************************************************/
 
+/*
+ * @unimplemented
+ */
+PSLIST_ENTRY
+FASTCALL
+ExInterlockedFlushSList (
+    IN PSLIST_HEADER ListHead
+    )
+{
+	PSLIST_ENTRY Old = NULL;
+
+	UNIMPLEMENTED;
+	return Old;
+}
+
 /*
  * @implemented
  */
diff --git a/reactos/ntoskrnl/ex/rundown.c b/reactos/ntoskrnl/ex/rundown.c
new file mode 100644
index 00000000000..3cf95f96cc9
--- /dev/null
+++ b/reactos/ntoskrnl/ex/rundown.c
@@ -0,0 +1,142 @@
+/*
+ *  ReactOS kernel
+ *  Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+/*
+ * PROJECT:         ReactOS kernel
+ * FILE:            ntoskrnl/ex/rundown.c
+ * PURPOSE:         Rundown Functions
+ * PORTABILITY:     Checked
+ */
+
+/* INCLUDES *****************************************************************/
+
+#include <ddk/ntddk.h>
+#include <roscfg.h>
+#include <internal/ldr.h>
+#include <internal/kd.h>
+
+#define NDEBUG
+#include <internal/debug.h>
+
+/* FUNCTIONS *****************************************************************/
+
+/*
+ * @unimplemented
+ */
+BOOLEAN
+FASTCALL
+ExAcquireRundownProtection (
+	PVOID		ProcessRundownProtect
+	)
+{
+	UNIMPLEMENTED;
+	return FALSE;
+}
+/*
+ * @unimplemented
+ */
+BOOLEAN
+FASTCALL
+ExAcquireRundownProtectionEx (
+	IN PVOID	ProcessRundownProtect,
+	IN PVOID	Unknown
+	)
+{
+	UNIMPLEMENTED;
+	return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+VOID
+FASTCALL
+ExInitializeRundownProtection (
+	IN PVOID	ProcessRundownProtect
+	)
+{
+	UNIMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+VOID
+FASTCALL
+ExReInitializeRundownProtection (
+	IN PVOID	ProcessRundownProtect
+	)
+{
+	UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+BOOLEAN
+FASTCALL
+ExReleaseRundownProtection (
+	IN PVOID	ProcessRundownProtect
+	)
+{
+	UNIMPLEMENTED;
+	return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+BOOLEAN
+FASTCALL
+ExReleaseRundownProtectionEx (
+	IN PVOID	ProcessRundownProtect,
+	IN PVOID	Unknown
+	)
+{
+	UNIMPLEMENTED;
+	return FALSE;
+}
+
+
+/*
+ * @unimplemented
+ */
+VOID
+FASTCALL
+ExRundownCompleted (
+	IN PVOID	ProcessRundownProtect
+	)
+{
+	UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+PVOID
+FASTCALL
+ExWaitForRundownProtectionRelease (
+	PVOID		ProcessRundownProtect
+	)
+{
+	UNIMPLEMENTED;
+	return FALSE;
+}
+
+/* EOF */
diff --git a/reactos/ntoskrnl/ex/synch.c b/reactos/ntoskrnl/ex/synch.c
new file mode 100644
index 00000000000..caaf8333569
--- /dev/null
+++ b/reactos/ntoskrnl/ex/synch.c
@@ -0,0 +1,76 @@
+/*
+ *  ReactOS kernel
+ *  Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+/*
+ * PROJECT:         ReactOS kernel
+ * FILE:            ntoskrnl/ex/synch.c
+ * PURPOSE:         Synchronization Functions (Pushlocks)
+ * PORTABILITY:     Checked
+ */
+
+/* INCLUDES *****************************************************************/
+
+#include <ddk/ntddk.h>
+#include <roscfg.h>
+#include <internal/ldr.h>
+#include <internal/kd.h>
+
+#define NDEBUG
+#include <internal/debug.h>
+
+/* FUNCTIONS *****************************************************************/
+
+/*
+ * @unimplemented
+ */
+PVOID
+FASTCALL
+ExfAcquirePushLockExclusive (
+	PVOID		Lock
+	)
+{
+	UNIMPLEMENTED;
+	return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+PVOID
+FASTCALL
+ExfAcquirePushLockShared (
+	PVOID		Lock
+	)
+{
+	UNIMPLEMENTED;
+	return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+PVOID
+FASTCALL
+ExfReleasePushLock (
+	PVOID		Lock
+	)
+{
+	UNIMPLEMENTED;
+}
+
+/* EOF */
diff --git a/reactos/ntoskrnl/ex/sysinfo.c b/reactos/ntoskrnl/ex/sysinfo.c
index 8bd9bbbc29f..9c238b8802d 100644
--- a/reactos/ntoskrnl/ex/sysinfo.c
+++ b/reactos/ntoskrnl/ex/sysinfo.c
@@ -1,4 +1,4 @@
-/* $Id: sysinfo.c,v 1.36 2004/06/13 10:35:52 navaraf Exp $
+/* $Id: sysinfo.c,v 1.37 2004/06/23 21:01:27 ion Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -37,6 +37,46 @@ extern ULONG Ke386Cpuid;
 
 /* FUNCTIONS *****************************************************************/
 
+/*
+ * @unimplemented
+ */
+VOID
+STDCALL
+ExEnumHandleTable (
+	PULONG	HandleTable,
+	PVOID	Callback,
+	PVOID	Param,
+	PHANDLE	Handle OPTIONAL
+	)
+{
+	UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+VOID
+STDCALL
+ExGetCurrentProcessorCounts (
+	PVOID	IdleThreadTime,
+	PVOID	SystemTime,
+	PVOID	Number
+	)
+{
+	UNIMPLEMENTED;
+}
+/*
+ * @unimplemented
+ */
+VOID
+STDCALL
+ExGetCurrentProcessorCpuUsage (
+	PVOID	RetVal
+	)
+{
+	UNIMPLEMENTED;
+}
+
 NTSTATUS STDCALL
 NtQuerySystemEnvironmentValue (IN	PUNICODE_STRING	UnsafeName,
 			       OUT	PVOID		UnsafeValue,
diff --git a/reactos/ntoskrnl/ex/time.c b/reactos/ntoskrnl/ex/time.c
index e706c72d479..6553c55e398 100644
--- a/reactos/ntoskrnl/ex/time.c
+++ b/reactos/ntoskrnl/ex/time.c
@@ -1,4 +1,4 @@
-/* $Id: time.c,v 1.19 2003/10/12 17:05:44 hbirr Exp $
+/* $Id: time.c,v 1.20 2004/06/23 21:01:27 ion Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -125,6 +125,18 @@ ExLocalTimeToSystemTime (
                           _SystemTimeZoneInfo.Bias * TICKSPERMINUTE;
 }
 
+/*
+ * @unimplemented
+ */
+VOID
+STDCALL
+ExSetTimerResolution (
+    IN ULONG DesiredTime,
+    IN BOOLEAN SetResolution
+    )
+{
+	UNIMPLEMENTED;
+}
 
 /*
  * @implemented
diff --git a/reactos/ntoskrnl/ex/util.c b/reactos/ntoskrnl/ex/util.c
new file mode 100644
index 00000000000..24661d3646c
--- /dev/null
+++ b/reactos/ntoskrnl/ex/util.c
@@ -0,0 +1,63 @@
+/*
+ *  ReactOS kernel
+ *  Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+/*
+ * PROJECT:         ReactOS kernel
+ * FILE:            ntoskrnl/ex/misc.c
+ * PURPOSE:         Executive Utility Functions
+ * PORTABILITY:     Checked
+ */
+
+/* INCLUDES *****************************************************************/
+
+#include <ddk/ntddk.h>
+#include <roscfg.h>
+#include <internal/ldr.h>
+#include <internal/kd.h>
+
+#define NDEBUG
+#include <internal/debug.h>
+
+/* FUNCTIONS *****************************************************************/
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+ExUuidCreate(
+    OUT UUID *Uuid
+    )
+{
+	UNIMPLEMENTED;
+	return FALSE;
+}
+/*
+ * @unimplemented
+ */
+STDCALL
+BOOLEAN
+ExVerifySuite(
+    SUITE_TYPE SuiteType
+    )
+{
+	UNIMPLEMENTED;
+	return FALSE;
+}
+
+/* EOF */

From 68f96d4b10d18ab536e03222e1da7d20c60bf690 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Wed, 23 Jun 2004 21:02:35 +0000
Subject: [PATCH 059/356] Added Ex Prototypes

svn path=/trunk/; revision=9841
---
 reactos/include/ddk/exfuncs.h          | 157 ++++++++++++++++++++++++-
 reactos/include/ddk/extypes.h          |  51 +++++++-
 reactos/ntoskrnl/include/internal/ke.h |  40 ++++++-
 reactos/ntoskrnl/include/internal/ps.h |  18 ++-
 4 files changed, 257 insertions(+), 9 deletions(-)

diff --git a/reactos/include/ddk/exfuncs.h b/reactos/include/ddk/exfuncs.h
index 3dda28ba517..fd126c305df 100644
--- a/reactos/include/ddk/exfuncs.h
+++ b/reactos/include/ddk/exfuncs.h
@@ -46,6 +46,32 @@ ExAcquireResourceSharedLite (
 	BOOLEAN		Wait
 	);
 BOOLEAN
+FASTCALL
+ExAcquireRundownProtection (
+	PVOID		ProcessRundownProtect
+	);
+BOOLEAN
+FASTCALL
+ExAcquireRundownProtectionEx (
+	IN PVOID	ProcessRundownProtect,
+	IN PVOID	Unknown
+	);
+PVOID
+FASTCALL
+ExfAcquirePushLockExclusive (
+	PVOID		Lock
+	);
+PVOID
+FASTCALL
+ExfAcquirePushLockShared (
+	PVOID		Lock
+	);
+PVOID
+FASTCALL
+ExfReleasePushLock (
+	PVOID		Lock
+	);
+BOOLEAN
 STDCALL
 ExAcquireSharedStarveExclusive (
 	PERESOURCE	Resource,
@@ -120,6 +146,15 @@ ExAllocatePoolWithTag (
 	IN	ULONG		Tag
 	);
 
+PVOID
+NTAPI
+ExAllocatePoolWithTagPriority(
+    IN POOL_TYPE PoolType,
+    IN SIZE_T NumberOfBytes,
+    IN ULONG Tag,
+    IN EX_POOL_PRIORITY Priority
+    );
+
 VOID
 STDCALL
 ExConvertExclusiveToSharedLite (
@@ -152,6 +187,15 @@ ExDisableResourceBoostLite (
 	PERESOURCE	Resource
 	);
 
+VOID
+STDCALL
+ExEnumHandleTable (
+	PULONG	HandleTable,
+	PVOID	Callback,
+	PVOID	Param,
+	PHANDLE	Handle OPTIONAL
+	);
+
 NTSTATUS
 STDCALL
 ExExtendZone (
@@ -199,6 +243,28 @@ ExFreePool (
 #define ExGetCurrentResourceThread() \
 	((ERESOURCE_THREAD)KeGetCurrentThread())
 
+LONGLONG
+FASTCALL
+ExfInterlockedCompareExchange64(
+    IN OUT LONGLONG volatile *Destination,
+    IN PLONGLONG ExChange,
+    IN PLONGLONG Comperand
+    );
+
+VOID
+STDCALL
+ExGetCurrentProcessorCounts (
+	PVOID	IdleThreadTime,
+	PVOID	SystemTime,
+	PVOID	Number
+	);
+
+VOID
+STDCALL
+ExGetCurrentProcessorCpuUsage (
+	PVOID	RetVal
+	);
+
 ULONG
 STDCALL
 ExGetExclusiveWaiterCount (
@@ -242,6 +308,12 @@ ExInitializeResourceLite (
 	PERESOURCE	Resource
 	);
 
+VOID
+FASTCALL
+ExInitializeRundownProtection (
+	PVOID	ProcessRundown
+	);
+
 /*
  * VOID
  * ExInitializeSListHead (
@@ -333,6 +405,7 @@ ExInterlockedDecrementLong (
 	PLONG		Addend,
 	PKSPIN_LOCK	Lock
 	);
+
 ULONG
 STDCALL
 ExInterlockedExchangeUlong (
@@ -340,6 +413,7 @@ ExInterlockedExchangeUlong (
 	ULONG		Value,
 	PKSPIN_LOCK	Lock
 	);
+
 NTSTATUS
 STDCALL
 ExInterlockedExtendZone (
@@ -349,6 +423,12 @@ ExInterlockedExtendZone (
 	PKSPIN_LOCK	Lock
 	);
 
+PSLIST_ENTRY
+FASTCALL
+ExInterlockedFlushSList (
+    IN PSLIST_HEADER ListHead
+    );
+
 /*
  * PVOID
  * ExInterlockedFreeToZone (
@@ -498,6 +578,14 @@ ExQueueWorkItem (
 	PWORK_QUEUE_ITEM	WorkItem,
 	WORK_QUEUE_TYPE		QueueType
 	);
+
+SIZE_T
+STDCALL
+ExQueryPoolBlockSize (                          
+    IN PVOID PoolBlock,                         
+    OUT PBOOLEAN QuotaCharged                   
+    );  
+
 VOID
 STDCALL
 ExRaiseAccessViolation (
@@ -513,6 +601,21 @@ STDCALL
 ExRaiseStatus (
 	NTSTATUS	Status
 	);
+VOID
+STDCALL
+ExRaiseException (
+	PEXCEPTION_RECORD pExcptRec
+	);
+VOID
+STDCALL
+ExRaiseHardError (
+	IN NTSTATUS ErrorStatus,
+	IN ULONG NumberOfParameters, 
+	IN PUNICODE_STRING UnicodeStringParameterMask OPTIONAL,
+	IN PVOID *Parameters, 
+	IN HARDERROR_RESPONSE_OPTION ResponseOption, 
+	OUT PHARDERROR_RESPONSE Response 
+	);
 
 PVOID
 STDCALL
@@ -527,6 +630,12 @@ STDCALL
 ExReinitializeResourceLite (
 	PERESOURCE	Resource
 	);
+VOID
+FASTCALL
+ExReInitializeRundownProtection (
+	PVOID	ProcessRundown
+	);
+
 /* ReactOS Specific: begin */
 VOID
 FASTCALL
@@ -566,7 +675,22 @@ ExReleaseResourceForThreadLite (
 	PERESOURCE		Resource,
 	ERESOURCE_THREAD	ResourceThreadId
 	);
-
+BOOLEAN
+FASTCALL
+ExReleaseRundownProtection (
+	IN PVOID	ProcessRundownProtect
+	);
+BOOLEAN
+FASTCALL
+ExReleaseRundownProtectionEx (
+	IN PVOID	ProcessRundownProtect,
+	IN PVOID	Unknown
+	);
+VOID
+FASTCALL
+ExRundownCompleted (
+	PVOID	ProcessRundown
+	);
 VOID
 STDCALL
 ExSetResourceOwnerPointer (
@@ -574,6 +698,23 @@ ExSetResourceOwnerPointer (
 	IN	PVOID		OwnerPointer
 	);
 
+VOID
+STDCALL
+ExSetTimerResolution (
+    IN ULONG DesiredTime,
+    IN BOOLEAN SetResolution
+    );
+
+STDCALL
+BOOLEAN
+ExVerifySuite(
+    SUITE_TYPE SuiteType
+    );
+
+BOOLEAN
+STDCALL
+ExSystemExceptionFilter();
+
 VOID
 STDCALL
 ExSystemTimeToLocalTime (
@@ -599,6 +740,20 @@ ExUnregisterCallback (
 	IN	PVOID	CallbackRegistration
 	);
 
+typedef GUID UUID;
+
+STDCALL
+NTSTATUS
+ExUuidCreate(
+    OUT UUID *Uuid
+    );
+
+PVOID
+FASTCALL
+ExWaitForRundownProtectionRelease (
+	PVOID		ProcessRundownProtect
+	);
+
 PSLIST_ENTRY
 FASTCALL
 InterlockedPopEntrySList (
diff --git a/reactos/include/ddk/extypes.h b/reactos/include/ddk/extypes.h
index 9d9f82468a7..f335dc8bf96 100644
--- a/reactos/include/ddk/extypes.h
+++ b/reactos/include/ddk/extypes.h
@@ -1,4 +1,4 @@
-/* $Id: extypes.h,v 1.21 2003/11/14 15:19:35 ekohl Exp $ */
+/* $Id: extypes.h,v 1.22 2004/06/23 21:02:35 ion Exp $ */
 
 #ifndef __INCLUDE_DDK_EXTYPES_H
 #define __INCLUDE_DDK_EXTYPES_H
@@ -137,6 +137,55 @@ typedef struct _PAGED_LOOKASIDE_LIST
    FAST_MUTEX Obsoleted;
 } PAGED_LOOKASIDE_LIST, *PPAGED_LOOKASIDE_LIST;
 
+typedef enum _EX_POOL_PRIORITY {
+    LowPoolPriority,
+    LowPoolPrioritySpecialPoolOverrun = 8,
+    LowPoolPrioritySpecialPoolUnderrun = 9,
+    NormalPoolPriority = 16,
+    NormalPoolPrioritySpecialPoolOverrun = 24,
+    NormalPoolPrioritySpecialPoolUnderrun = 25,
+    HighPoolPriority = 32,
+    HighPoolPrioritySpecialPoolOverrun = 40,
+    HighPoolPrioritySpecialPoolUnderrun = 41
+
+    } EX_POOL_PRIORITY;
+
+typedef enum _SUITE_TYPE {
+    SmallBusiness,
+    Enterprise,
+    BackOffice,
+    CommunicationServer,
+    TerminalServer,
+    SmallBusinessRestricted,
+    EmbeddedNT,
+    DataCenter,
+    SingleUserTS,
+    Personal,
+    Blade,
+    MaxSuiteType
+} SUITE_TYPE;
+
+typedef enum _HARDERROR_RESPONSE_OPTION {
+	OptionAbortRetryIgnore,
+	OptionOk,
+	OptionOkCancel,
+	OptionRetryCancel,
+	OptionYesNo,
+	OptionYesNoCancel,
+	OptionShutdownSystem
+} HARDERROR_RESPONSE_OPTION, *PHARDERROR_RESPONSE_OPTION;
+
+typedef enum _HARDERROR_RESPONSE {
+	ResponseReturnToCaller,
+	ResponseNotHandled,
+	ResponseAbort,
+	ResponseCancel,
+	ResponseIgnore,
+	ResponseNo,
+	ResponseOk,
+	ResponseRetry,
+	ResponseYes
+} HARDERROR_RESPONSE, *PHARDERROR_RESPONSE;
 
 /* callback object (not functional in NT4)*/
 
diff --git a/reactos/ntoskrnl/include/internal/ke.h b/reactos/ntoskrnl/include/internal/ke.h
index c474b9f1f42..49d122d2ae1 100644
--- a/reactos/ntoskrnl/include/internal/ke.h
+++ b/reactos/ntoskrnl/include/internal/ke.h
@@ -53,6 +53,34 @@ DbgBreakPointNoBugCheck(VOID);
 
 VOID STDCALL KeRescheduleThread();
 
+
+STDCALL
+VOID
+KeProfileInterrupt(
+    PKTRAP_FRAME TrapFrame
+);
+
+STDCALL
+VOID
+KeProfileInterruptWithSource(
+	IN PKTRAP_FRAME   		TrapFrame,
+	IN KPROFILE_SOURCE		Source
+);
+
+/*STDCALL
+BOOLEAN
+KiIpiServiceRoutine(
+	IN PKTRAP_FRAME   		TrapFrame,
+	IN PKEXCEPTION_FRAME  	ExceptionFrame
+);*/
+
+STDCALL
+VOID 
+KeUpdateSystemTime(
+	IN PKTRAP_FRAME   	TrapFrame,
+	IN ULONG  			Increment
+);
+
 VOID KiUpdateSystemTime (KIRQL oldIrql, ULONG Eip);
 
 KIRQL KeAcquireDispatcherDatabaseLock(VOID);
@@ -71,17 +99,13 @@ VOID KeDumpStackFrames(PULONG Frame);
 BOOLEAN KiTestAlert(VOID);
 VOID KeRemoveAllWaitsThread(struct _ETHREAD* Thread, NTSTATUS WaitStatus, BOOL Unblock);
 PULONG KeGetStackTopThread(struct _ETHREAD* Thread);
-VOID KeContextToTrapFrame(PCONTEXT Context,
-			  PKTRAP_FRAME TrapFrame);
+VOID KeContextToTrapFrame(PCONTEXT Context, PKTRAP_FRAME TrapFrame);
 VOID
 KiDeliverNormalApc(VOID);
 
 BOOLEAN STDCALL KeRemoveQueueApc (PKAPC Apc);
 PLIST_ENTRY STDCALL KeRundownQueue(IN PKQUEUE Queue);
 
-NTSTATUS STDCALL
-KeRaiseUserException(IN NTSTATUS ExceptionCode);
-
 /* INITIALIZATION FUNCTIONS *************************************************/
 
 VOID KeInitExceptions(VOID);
@@ -138,6 +162,12 @@ KiDumpTrapFrame(PKTRAP_FRAME Tf, ULONG ExceptionNr, ULONG cr2);
 VOID
 KiUpdateProcessThreadTime(VOID);
 
+STDCALL
+VOID
+KeUpdateRunTime(
+	IN PKTRAP_FRAME	TrapFrame
+);
+
 #endif /* not __ASM__ */
 
 #define MAXIMUM_PROCESSORS      32
diff --git a/reactos/ntoskrnl/include/internal/ps.h b/reactos/ntoskrnl/include/internal/ps.h
index ad4d3799c80..78247d95e6a 100644
--- a/reactos/ntoskrnl/include/internal/ps.h
+++ b/reactos/ntoskrnl/include/internal/ps.h
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: ps.h,v 1.58 2004/03/14 18:11:25 ekohl Exp $
+/* $Id: ps.h,v 1.59 2004/06/23 21:02:16 ion Exp $
  *
  * FILE:            ntoskrnl/ke/kthread.c
  * PURPOSE:         Process manager definitions
@@ -63,7 +63,7 @@ typedef struct _KAPC_STATE
    UCHAR KernelApcInProgress;
    UCHAR KernelApcPending;
    USHORT UserApcPending;
-} KAPC_STATE, *PKAPC_STATE;
+} KAPC_STATE, *PKAPC_STATE, *__restrict PRKAPC_STATE;
 
 #include <poppack.h>
 
@@ -505,6 +505,20 @@ NTSTATUS PsResumeThread(PETHREAD Thread, PULONG PreviousCount);
 VOID 
 KeInitializeThread(PKPROCESS Process, PKTHREAD Thread, BOOLEAN First);
 NTSTATUS KeReleaseThread(PETHREAD Thread);
+
+STDCALL
+VOID
+KeStackAttachProcess (
+    IN PKPROCESS Process,
+    OUT PRKAPC_STATE ApcState
+    );
+
+STDCALL
+VOID
+KeUnstackDetachProcess (
+    IN PRKAPC_STATE ApcState
+    );
+
 VOID STDCALL PiDeleteProcess(PVOID ObjectBody);
 VOID PsReapThreads(VOID);
 VOID PsUnfreezeOtherThread(PETHREAD Thread);

From d039c1362d7bf62f890c6a5276a93b1eef61b35b Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Wed, 23 Jun 2004 21:03:43 +0000
Subject: [PATCH 060/356] Added new files for Ex Stubs

svn path=/trunk/; revision=9842
---
 reactos/ntoskrnl/Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/reactos/ntoskrnl/Makefile b/reactos/ntoskrnl/Makefile
index f502b63657f..0ba13084ebc 100644
--- a/reactos/ntoskrnl/Makefile
+++ b/reactos/ntoskrnl/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.125 2004/06/21 21:07:29 hyperion Exp $
+# $Id: Makefile,v 1.126 2004/06/23 21:03:43 ion Exp $
 #
 # ReactOS Operating System
 #
@@ -262,9 +262,12 @@ OBJECTS_EX = \
 	ex/napi.o \
 	ex/power.o \
 	ex/resource.o \
-	ex/time.o \
+        ex/rundown.o \
 	ex/stree.o \
+        ex/synch.o \
 	ex/sysinfo.o \
+        ex/time.o \
+        ex/util.o \
 	ex/win32k.o \
 	ex/work.o \
 	ex/zone.o

From 2b0f40b581d77ff0d851d3f00da7452c52453d69 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Wed, 23 Jun 2004 21:37:06 +0000
Subject: [PATCH 061/356] Added Ex Stubs

svn path=/trunk/; revision=9843
---
 reactos/ntoskrnl/ex/interlck.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/reactos/ntoskrnl/ex/interlck.c b/reactos/ntoskrnl/ex/interlck.c
index 5d5ea238424..b174fe66280 100644
--- a/reactos/ntoskrnl/ex/interlck.c
+++ b/reactos/ntoskrnl/ex/interlck.c
@@ -1,4 +1,4 @@
-/* $Id: interlck.c,v 1.13 2004/06/23 21:01:27 ion Exp $
+/* $Id: interlck.c,v 1.14 2004/06/23 21:37:06 ion Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -13,7 +13,8 @@
 
 #include <ddk/ntddk.h>
 
-
+#define NDEBUG
+#include <internal/debug.h>
 /* FUNCTIONS *****************************************************************/
 
 #ifdef ExInterlockedDecrementLong

From f66364821ff312db53c420f76baff84d41494fb9 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Wed, 23 Jun 2004 21:42:50 +0000
Subject: [PATCH 062/356] Added Io Stubs

svn path=/trunk/; revision=9844
---
 reactos/ntoskrnl/io/device.c    | 145 +++++++++++++++++-
 reactos/ntoskrnl/io/driver.c    |  30 +++-
 reactos/ntoskrnl/io/errlog.c    |  13 +-
 reactos/ntoskrnl/io/file.c      | 143 +++++++++++++++++-
 reactos/ntoskrnl/io/fs.c        |  16 +-
 reactos/ntoskrnl/io/iocomp.c    |  37 +++++
 reactos/ntoskrnl/io/irp.c       |  56 ++++++-
 reactos/ntoskrnl/io/pnpmgr.c    |   9 +-
 reactos/ntoskrnl/io/pnpnotify.c |  16 ++
 reactos/ntoskrnl/io/process.c   |  14 +-
 reactos/ntoskrnl/io/share.c     |   6 +-
 reactos/ntoskrnl/io/wmi.c       | 257 ++++++++++++++++++++++++++++++++
 reactos/ntoskrnl/io/xhaldisp.c  | 149 +++++++++++++++++-
 13 files changed, 876 insertions(+), 15 deletions(-)
 create mode 100644 reactos/ntoskrnl/io/wmi.c

diff --git a/reactos/ntoskrnl/io/device.c b/reactos/ntoskrnl/io/device.c
index d461ae0f444..158f938425e 100644
--- a/reactos/ntoskrnl/io/device.c
+++ b/reactos/ntoskrnl/io/device.c
@@ -1,4 +1,4 @@
-/* $Id: device.c,v 1.70 2004/04/08 16:01:47 navaraf Exp $
+/* $Id: device.c,v 1.71 2004/06/23 21:42:49 ion Exp $
  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
@@ -164,6 +164,21 @@ IoAttachDeviceByPointer(
    return STATUS_SUCCESS;
 }
 
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoAttachDeviceToDeviceStackSafe(
+    IN PDEVICE_OBJECT SourceDevice,
+    IN PDEVICE_OBJECT TargetDevice,
+    OUT PDEVICE_OBJECT *AttachedToDeviceObject
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
 /*
  * IoDeleteDevice
  *
@@ -206,6 +221,64 @@ IoDeleteDevice(PDEVICE_OBJECT DeviceObject)
    ObDereferenceObject(DeviceObject);
 }
 
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoEnumerateDeviceObjectList(
+    IN  PDRIVER_OBJECT  DriverObject,
+    IN  PDEVICE_OBJECT  *DeviceObjectList,
+    IN  ULONG           DeviceObjectListSize,
+    OUT PULONG          ActualNumberDeviceObjects
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+STDCALL
+PDEVICE_OBJECT
+IoGetDeviceAttachmentBaseRef(
+    IN PDEVICE_OBJECT DeviceObject
+    )
+{
+	UNIMPLEMENTED;
+	return 0;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoGetDiskDeviceObject(
+    IN  PDEVICE_OBJECT  FileSystemDeviceObject,
+    OUT PDEVICE_OBJECT  *DiskDeviceObject
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+PDEVICE_OBJECT
+IoGetLowerDeviceObject(
+    IN  PDEVICE_OBJECT  DeviceObject
+    )
+{
+	UNIMPLEMENTED;
+	return 0;
+}
+
 /*
  * IoGetRelatedDeviceObject
  *
@@ -614,6 +687,34 @@ IoOpenDeviceInstanceKey(
    return STATUS_NOT_IMPLEMENTED;
 }
 
+/*
+ * @unimplemented
+ */
+STDCALL
+VOID
+IoRegisterBootDriverReinitialization(
+    IN PDRIVER_OBJECT DriverObject,
+    IN PDRIVER_REINITIALIZE DriverReinitializationRoutine,
+    IN PVOID Context
+    )
+{
+	UNIMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoRegisterLastChanceShutdownNotification(
+    IN PDEVICE_OBJECT DeviceObject
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
 /*
  * IoQueryDeviceEnumInfo
  *
@@ -630,4 +731,46 @@ IoQueryDeviceEnumInfo(
    return 0;
 }
 
+/*
+ * @unimplemented
+ */
+STDCALL
+VOID
+IoSetStartIoAttributes(
+    IN PDEVICE_OBJECT DeviceObject,
+    IN BOOLEAN DeferredStartIo,
+    IN BOOLEAN NonCancelable
+    )
+{
+	UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+VOID
+IoSynchronousInvalidateDeviceRelations(
+    IN PDEVICE_OBJECT DeviceObject,
+    IN DEVICE_RELATION_TYPE Type
+    )
+{
+	UNIMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoValidateDeviceIoControlAccess(
+    IN  PIRP    Irp,
+    IN  ULONG   RequiredAccess
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
 /* EOF */
diff --git a/reactos/ntoskrnl/io/driver.c b/reactos/ntoskrnl/io/driver.c
index 3968fea861d..ca646cc74b1 100644
--- a/reactos/ntoskrnl/io/driver.c
+++ b/reactos/ntoskrnl/io/driver.c
@@ -1,4 +1,4 @@
-/* $Id: driver.c,v 1.47 2004/06/20 00:44:55 navaraf Exp $
+/* $Id: driver.c,v 1.48 2004/06/23 21:42:50 ion Exp $
  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
@@ -1478,6 +1478,34 @@ IopReinitializeDrivers(VOID)
 
 /* PUBLIC FUNCTIONS ***********************************************************/
 
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoCreateDriver (
+	IN PUNICODE_STRING DriverName,   OPTIONAL
+	IN PDRIVER_INITIALIZE InitializationFunction
+	)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+VOID
+IoDeleteDriver (
+	IN PDRIVER_OBJECT DriverObject
+	)
+{
+	UNIMPLEMENTED;
+}
+
+
 /*
  * NtLoadDriver
  *
diff --git a/reactos/ntoskrnl/io/errlog.c b/reactos/ntoskrnl/io/errlog.c
index 09c424b52bb..49c9452cbce 100644
--- a/reactos/ntoskrnl/io/errlog.c
+++ b/reactos/ntoskrnl/io/errlog.c
@@ -1,4 +1,4 @@
-/* $Id: errlog.c,v 1.16 2003/12/30 18:52:04 fireball Exp $
+/* $Id: errlog.c,v 1.17 2004/06/23 21:42:50 ion Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -382,6 +382,17 @@ IoAllocateErrorLogEntry (IN PVOID IoObject,
   return (PVOID)((ULONG_PTR)LogEntry + sizeof(ERROR_LOG_ENTRY));
 }
 
+/*
+ * @unimplemented
+ */
+STDCALL
+VOID
+IoFreeErrorLogEntry(
+    PVOID ElEntry
+    )
+{
+	UNIMPLEMENTED;
+}
 
 /*
  * @implemented
diff --git a/reactos/ntoskrnl/io/file.c b/reactos/ntoskrnl/io/file.c
index c664058ebb0..378bffea75f 100644
--- a/reactos/ntoskrnl/io/file.c
+++ b/reactos/ntoskrnl/io/file.c
@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.28 2003/12/13 14:36:42 ekohl Exp $
+/* $Id: file.c,v 1.29 2004/06/23 21:42:50 ion Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -131,6 +131,133 @@ NtQueryInformationFile(HANDLE FileHandle,
 }
 
 
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoCheckQuerySetFileInformation(
+    IN FILE_INFORMATION_CLASS FileInformationClass,
+    IN ULONG Length,
+    IN BOOLEAN SetOperation
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoCheckQuerySetVolumeInformation(
+    IN FS_INFORMATION_CLASS FsInformationClass,
+    IN ULONG Length,
+    IN BOOLEAN SetOperation
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoCheckQuotaBufferValidity(
+    IN PFILE_QUOTA_INFORMATION QuotaBuffer,
+    IN ULONG QuotaLength,
+    OUT PULONG ErrorOffset
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoCreateFileSpecifyDeviceObjectHint(
+    OUT PHANDLE FileHandle,
+    IN ACCESS_MASK DesiredAccess,
+    IN POBJECT_ATTRIBUTES ObjectAttributes,
+    OUT PIO_STATUS_BLOCK IoStatusBlock,
+    IN PLARGE_INTEGER AllocationSize OPTIONAL,
+    IN ULONG FileAttributes,
+    IN ULONG ShareAccess,
+    IN ULONG Disposition,
+    IN ULONG CreateOptions,
+    IN PVOID EaBuffer OPTIONAL,
+    IN ULONG EaLength,
+    IN CREATE_FILE_TYPE CreateFileType,
+    IN PVOID ExtraCreateParameters OPTIONAL,
+    IN ULONG Options,
+    IN PVOID DeviceObject
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+PFILE_OBJECT
+IoCreateStreamFileObjectEx(
+    IN PFILE_OBJECT FileObject OPTIONAL,
+    IN PDEVICE_OBJECT DeviceObject OPTIONAL,
+    OUT PHANDLE FileObjectHandle OPTIONAL
+    )
+{
+	UNIMPLEMENTED;
+	return 0;
+}
+/*
+ * @unimplemented
+ */
+STDCALL
+PFILE_OBJECT
+IoCreateStreamFileObjectLite(
+    IN PFILE_OBJECT FileObject OPTIONAL,
+    IN PDEVICE_OBJECT DeviceObject OPTIONAL
+    )
+{
+	UNIMPLEMENTED;
+	return 0;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+BOOLEAN
+IoIsFileOriginRemote(
+    IN PFILE_OBJECT FileObject
+    )
+{
+	UNIMPLEMENTED;
+	return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoQueryFileDosDeviceName(
+    IN PFILE_OBJECT FileObject,
+    OUT POBJECT_NAME_INFORMATION *ObjectNameInformation
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
 /*
  * @implemented
  */
@@ -352,6 +479,20 @@ NtSetInformationFile(HANDLE FileHandle,
 }
 
 
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoSetFileOrigin(
+    IN PFILE_OBJECT FileObject,
+    IN BOOLEAN Remote
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
 NTSTATUS STDCALL
 NtQueryAttributesFile(IN POBJECT_ATTRIBUTES ObjectAttributes,
 		      OUT PFILE_BASIC_INFORMATION FileInformation)
diff --git a/reactos/ntoskrnl/io/fs.c b/reactos/ntoskrnl/io/fs.c
index a928c510a9c..6a37dfbd6a8 100644
--- a/reactos/ntoskrnl/io/fs.c
+++ b/reactos/ntoskrnl/io/fs.c
@@ -1,5 +1,4 @@
-/* $Id: fs.c,v 1.40 2003/12/13 14:36:42 ekohl Exp $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/io/fs.c
@@ -54,6 +53,19 @@ IopNotifyFileSystemChange(PDEVICE_OBJECT DeviceObject,
 
 /* FUNCTIONS *****************************************************************/
 
+/*
+ * @unimplemented
+ */
+STDCALL
+VOID
+IoCancelFileOpen(
+    IN PDEVICE_OBJECT  DeviceObject,
+    IN PFILE_OBJECT    FileObject
+    )
+{
+	UNIMPLEMENTED;
+}
+
 /*
  * @implemented
  */
diff --git a/reactos/ntoskrnl/io/iocomp.c b/reactos/ntoskrnl/io/iocomp.c
index 635fabadf73..c26eb2cd1bf 100644
--- a/reactos/ntoskrnl/io/iocomp.c
+++ b/reactos/ntoskrnl/io/iocomp.c
@@ -67,6 +67,43 @@ NtpDeleteIoCompletion(PVOID ObjectBody)
 }
 
 
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoSetCompletionRoutineEx(
+    IN PDEVICE_OBJECT DeviceObject,
+    IN PIRP Irp,
+    IN PIO_COMPLETION_ROUTINE CompletionRoutine,
+    IN PVOID Context,
+    IN BOOLEAN InvokeOnSuccess,
+    IN BOOLEAN InvokeOnError,
+    IN BOOLEAN InvokeOnCancel
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoSetIoCompletion (
+	IN PVOID IoCompletion,
+	IN PVOID KeyContext,
+	IN PVOID ApcContext,
+	IN NTSTATUS IoStatus,
+	IN ULONG_PTR IoStatusInformation,
+	IN BOOLEAN Quota
+	)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
 VOID 
 NtInitializeIoCompletionImplementation(VOID)
 {
diff --git a/reactos/ntoskrnl/io/irp.c b/reactos/ntoskrnl/io/irp.c
index ec80cff8de2..b3aa19da446 100644
--- a/reactos/ntoskrnl/io/irp.c
+++ b/reactos/ntoskrnl/io/irp.c
@@ -1,4 +1,4 @@
-/* $Id: irp.c,v 1.61 2004/06/06 08:36:31 hbirr Exp $
+/* $Id: irp.c,v 1.62 2004/06/23 21:42:50 ion Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -45,6 +45,19 @@
 
 /* FUNCTIONS ****************************************************************/
 
+/*
+ * @unimplemented
+ */
+STDCALL
+BOOLEAN
+IoForwardIrpSynchronously(
+    IN PDEVICE_OBJECT DeviceObject,
+    IN PIRP Irp
+    )
+{
+	UNIMPLEMENTED;
+	return FALSE;
+}
 
 /*
  * @implemented
@@ -60,6 +73,47 @@ IoFreeIrp(PIRP Irp)
   ExFreePool(Irp);
 }
 
+/*
+ * @unimplemented
+ */
+STDCALL
+ULONG
+IoGetRequestorProcessId(
+    IN PIRP Irp
+    )
+{
+	UNIMPLEMENTED;
+	return 0;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoGetRequestorSessionId(
+	IN PIRP Irp,
+	OUT PULONG pSessionId
+	)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+STDCALL
+BOOLEAN
+IoIsValidNameGraftingBuffer(
+    IN PIRP Irp,
+    IN PREPARSE_DATA_BUFFER ReparseBuffer
+    )
+{
+	UNIMPLEMENTED;
+	return FALSE;
+}
 
 /*
  * @unimplemented
diff --git a/reactos/ntoskrnl/io/pnpmgr.c b/reactos/ntoskrnl/io/pnpmgr.c
index 392c100887b..5acc109f6af 100644
--- a/reactos/ntoskrnl/io/pnpmgr.c
+++ b/reactos/ntoskrnl/io/pnpmgr.c
@@ -1,4 +1,4 @@
-/* $Id: pnpmgr.c,v 1.29 2004/06/10 11:00:28 ekohl Exp $
+/* $Id: pnpmgr.c,v 1.30 2004/06/23 21:42:50 ion Exp $
  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
@@ -195,11 +195,13 @@ IoOpenDeviceRegistryKey(
 /*
  * @unimplemented
  */
-VOID
 STDCALL
+VOID
 IoRequestDeviceEject(
-  IN PDEVICE_OBJECT PhysicalDeviceObject)
+    IN PDEVICE_OBJECT PhysicalDeviceObject
+    )
 {
+	UNIMPLEMENTED;
 }
 
 
@@ -1411,6 +1413,7 @@ IopInvalidateDeviceRelations(
    return STATUS_SUCCESS;
 }
 
+
 VOID INIT_FUNCTION
 PnpInit(VOID)
 {
diff --git a/reactos/ntoskrnl/io/pnpnotify.c b/reactos/ntoskrnl/io/pnpnotify.c
index 144610da1c9..bed60325639 100644
--- a/reactos/ntoskrnl/io/pnpnotify.c
+++ b/reactos/ntoskrnl/io/pnpnotify.c
@@ -22,6 +22,22 @@
 
 /* FUNCTIONS *****************************************************************/
 
+/*
+ * @unimplemented
+ */
+STDCALL
+ULONG
+IoPnPDeliverServicePowerNotification(
+	ULONG		VetoedPowerOperation OPTIONAL,
+	ULONG		PowerNotification,
+	ULONG		Unknown OPTIONAL,
+	BOOLEAN  	Synchronous
+	)
+{
+	UNIMPLEMENTED;
+	return 0;
+}
+
 /*
  * @unimplemented
  */
diff --git a/reactos/ntoskrnl/io/process.c b/reactos/ntoskrnl/io/process.c
index 2c783fa7d6b..b6f6c440927 100644
--- a/reactos/ntoskrnl/io/process.c
+++ b/reactos/ntoskrnl/io/process.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: process.c,v 1.16 2003/12/30 18:52:04 fireball Exp $
+/* $Id: process.c,v 1.17 2004/06/23 21:42:50 ion Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -57,6 +57,18 @@ IoGetStackLimits(OUT PULONG LowLimit,
   *HighLimit = (ULONG)NtCurrentTeb()->Tib.StackBase;
 }
 
+/*
+ * @unimplemented
+ */
+STDCALL
+BOOLEAN
+IoIsSystemThread(
+    IN PETHREAD Thread
+    )
+{
+	UNIMPLEMENTED;
+	return FALSE;
+}
 
 /*
  * @implemented
diff --git a/reactos/ntoskrnl/io/share.c b/reactos/ntoskrnl/io/share.c
index 09aeb05c4e3..13150c12d77 100644
--- a/reactos/ntoskrnl/io/share.c
+++ b/reactos/ntoskrnl/io/share.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: share.c,v 1.9 2003/07/10 15:47:00 royce Exp $
+/* $Id: share.c,v 1.10 2004/06/23 21:42:50 ion Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -330,8 +330,8 @@ IoCheckFunctionAccess(IN ACCESS_MASK GrantedAccess,
 		      IN UCHAR MajorFunction,
 		      IN UCHAR MinorFunction,
 		      IN ULONG IoControlCode,
-		      IN PFILE_INFORMATION_CLASS FileInformationClass OPTIONAL,
-		      IN PFS_INFORMATION_CLASS FsInformationClass OPTIONAL)
+		      IN PVOID ExtraData OPTIONAL,
+		      IN PVOID ExtraData2 OPTIONAL)
 {
   UNIMPLEMENTED;
   return(STATUS_NOT_IMPLEMENTED);
diff --git a/reactos/ntoskrnl/io/wmi.c b/reactos/ntoskrnl/io/wmi.c
new file mode 100644
index 00000000000..314950c4b10
--- /dev/null
+++ b/reactos/ntoskrnl/io/wmi.c
@@ -0,0 +1,257 @@
+/* $Id: wmi.c,v 1.1 2004/06/23 21:42:50 ion Exp $
+ *
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS kernel
+ * FILE:            ntoskrnl/io/wmi.c
+ * PURPOSE:         Windows Management Instrumentation
+ * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
+ * UPDATE HISTORY:
+ *                  Created 23/06/04
+ */
+
+/* INCLUDES *****************************************************************/
+
+#include <ddk/ntddk.h>
+#include <internal/io.h>
+#include <internal/ps.h>
+#include <internal/pool.h>
+
+#define NDEBUG
+#include <internal/debug.h>
+
+/* FUNCTIONS *****************************************************************/
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoWMIRegistrationControl(
+    IN PDEVICE_OBJECT DeviceObject,
+    IN ULONG Action
+	)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoWMIAllocateInstanceIds(
+    IN GUID *Guid,
+    IN ULONG InstanceCount,
+    OUT ULONG *FirstInstanceId
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoWMISuggestInstanceName(
+    IN PDEVICE_OBJECT PhysicalDeviceObject OPTIONAL,
+    IN PUNICODE_STRING SymbolicLinkName OPTIONAL,
+    IN BOOLEAN CombineNames,
+    OUT PUNICODE_STRING SuggestedInstanceName
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoWMIWriteEvent(
+    IN PVOID WnodeEventItem
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS IoWMIOpenBlock(
+    IN GUID *DataBlockGuid,
+    IN ULONG DesiredAccess,
+    OUT PVOID *DataBlockObject
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS IoWMIQueryAllData(
+    IN PVOID DataBlockObject,
+    IN OUT ULONG *InOutBufferSize,
+    OUT PVOID OutBuffer
+)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoWMIQueryAllDataMultiple(
+    IN PVOID *DataBlockObjectList,
+    IN ULONG ObjectCount,
+    IN OUT ULONG *InOutBufferSize,
+    OUT PVOID OutBuffer
+)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoWMIQuerySingleInstance(
+    IN PVOID DataBlockObject,
+    IN PUNICODE_STRING InstanceName,
+    IN OUT ULONG *InOutBufferSize,
+    OUT PVOID OutBuffer
+)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoWMIQuerySingleInstanceMultiple(
+    IN PVOID *DataBlockObjectList,
+    IN PUNICODE_STRING InstanceNames,
+    IN ULONG ObjectCount,
+    IN OUT ULONG *InOutBufferSize,
+    OUT PVOID OutBuffer
+)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoWMISetSingleInstance(
+    IN PVOID DataBlockObject,
+    IN PUNICODE_STRING InstanceName,
+    IN ULONG Version,
+    IN ULONG ValueBufferSize,
+    IN PVOID ValueBuffer
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoWMISetSingleItem(
+    IN PVOID DataBlockObject,
+    IN PUNICODE_STRING InstanceName,
+    IN ULONG DataItemId,
+    IN ULONG Version,
+    IN ULONG ValueBufferSize,
+    IN PVOID ValueBuffer
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoWMIExecuteMethod(
+    IN PVOID DataBlockObject,
+    IN PUNICODE_STRING InstanceName,
+    IN ULONG MethodId,
+    IN ULONG InBufferSize,
+    IN OUT PULONG OutBufferSize,
+    IN OUT PUCHAR InOutBuffer
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoWMISetNotificationCallback(
+    IN PVOID Object,
+    IN WMI_NOTIFICATION_CALLBACK Callback,
+    IN PVOID Context
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoWMIHandleToInstanceName(
+    IN PVOID DataBlockObject,
+    IN HANDLE FileHandle,
+    OUT PUNICODE_STRING InstanceName
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoWMIDeviceObjectToInstanceName(
+    IN PVOID DataBlockObject,
+    IN PDEVICE_OBJECT DeviceObject,
+    OUT PUNICODE_STRING InstanceName
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*Eof*/
diff --git a/reactos/ntoskrnl/io/xhaldisp.c b/reactos/ntoskrnl/io/xhaldisp.c
index 3f0afdeb5f3..0589c3997c7 100644
--- a/reactos/ntoskrnl/io/xhaldisp.c
+++ b/reactos/ntoskrnl/io/xhaldisp.c
@@ -1,4 +1,4 @@
-/* $Id: xhaldisp.c,v 1.8 2003/02/26 14:12:43 ekohl Exp $
+/* $Id: xhaldisp.c,v 1.9 2004/06/23 21:42:50 ion Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -14,6 +14,10 @@
 #include <ddk/ntddk.h>
 #include <internal/xhal.h>
 
+#define NDEBUG
+#include <internal/debug.h>
+
+
 /* DATA **********************************************************************/
 
 
@@ -49,4 +53,147 @@ HAL_PRIVATE_DISPATCH EXPORTED HalPrivateDispatchTable =
 				// ??
 };
 
+/*
+ * @unimplemented
+ *
+STDCALL
+VOID
+IoAssignDriveLetters(
+   		IN PLOADER_PARAMETER_BLOCK   	 LoaderBlock,
+		IN PSTRING  	NtDeviceName,
+		OUT PUCHAR  	NtSystemPath,
+		OUT PSTRING  	NtSystemPathString
+    )
+{
+	UNIMPLEMENTED;
+*/
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoCreateDisk(
+    IN PDEVICE_OBJECT DeviceObject,
+    IN struct _CREATE_DISK* Disk
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoGetBootDiskInformation(
+    IN OUT PBOOTDISK_INFORMATION BootDiskInformation,
+    IN ULONG Size
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoReadDiskSignature(
+    IN PDEVICE_OBJECT DeviceObject,
+    IN ULONG BytesPerSector,
+    OUT PDISK_SIGNATURE Signature
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoReadPartitionTableEx(
+    IN PDEVICE_OBJECT DeviceObject,
+    IN struct _DRIVE_LAYOUT_INFORMATION_EX** DriveLayout
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoSetPartitionInformationEx(
+    IN PDEVICE_OBJECT DeviceObject,
+    IN ULONG PartitionNumber,
+    IN struct _SET_PARTITION_INFORMATION_EX* PartitionInfo
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoSetSystemPartition(
+    PUNICODE_STRING VolumeNameString
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoVerifyPartitionTable(
+    IN PDEVICE_OBJECT DeviceObject,
+    IN BOOLEAN FixErrors
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoVolumeDeviceToDosName(
+    IN  PVOID           VolumeDeviceObject,
+    OUT PUNICODE_STRING DosName
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+IoWritePartitionTableEx(
+    IN PDEVICE_OBJECT DeviceObject,
+    IN struct _DRIVE_LAYOUT_INFORMATION_EX* DriveLayfout
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
 /* EOF */

From 3074af46ff9ddb126e88cd313f1de259e8203b6c Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Wed, 23 Jun 2004 21:43:19 +0000
Subject: [PATCH 063/356] Added Io Stub Prototypes

svn path=/trunk/; revision=9845
---
 reactos/include/ddk/iodef.h   |  11 +
 reactos/include/ddk/iofuncs.h | 555 +++++++++++++++++++++++++++++++++-
 reactos/include/ddk/iotypes.h | 132 +++++++-
 3 files changed, 689 insertions(+), 9 deletions(-)

diff --git a/reactos/include/ddk/iodef.h b/reactos/include/ddk/iodef.h
index 263841df188..2ba09992c09 100644
--- a/reactos/include/ddk/iodef.h
+++ b/reactos/include/ddk/iodef.h
@@ -454,6 +454,17 @@ typedef ULONG FS_INFORMATION_CLASS, *PFS_INFORMATION_CLASS;
 #define IRP_MN_QUERY_DIRECTORY          0x01
 #define IRP_MN_NOTIFY_CHANGE_DIRECTORY  0x02
 
+
+typedef struct _FILE_QUOTA_INFORMATION {
+    ULONG NextEntryOffset;
+    ULONG SidLength;
+    LARGE_INTEGER ChangeTime;
+    LARGE_INTEGER QuotaUsed;
+    LARGE_INTEGER QuotaThreshold;
+    LARGE_INTEGER QuotaLimit;
+    LARGE_INTEGER Sid;
+} FILE_QUOTA_INFORMATION, *PFILE_QUOTA_INFORMATION;
+
 /*
  * Floppy device data type
  */
diff --git a/reactos/include/ddk/iofuncs.h b/reactos/include/ddk/iofuncs.h
index a2138deabdb..ff937ce58e1 100644
--- a/reactos/include/ddk/iofuncs.h
+++ b/reactos/include/ddk/iofuncs.h
@@ -1,6 +1,6 @@
 #ifndef _INCLUDE_DDK_IOFUNCS_H
 #define _INCLUDE_DDK_IOFUNCS_H
-/* $Id: iofuncs.h,v 1.41 2003/11/19 20:57:22 gdalsnes Exp $ */
+/* $Id: iofuncs.h,v 1.42 2004/06/23 21:43:19 ion Exp $ */
 
 #ifdef __NTOSKRNL__
 extern POBJECT_TYPE EXPORTED IoAdapterObjectType;
@@ -415,8 +415,8 @@ IoCheckFunctionAccess(IN ACCESS_MASK GrantedAccess,
 		      IN UCHAR MajorFunction,
 		      IN UCHAR MinorFunction,
 		      IN ULONG IoControlCode,
-		      IN PFILE_INFORMATION_CLASS FileInformationClass OPTIONAL,
-		      IN PFS_INFORMATION_CLASS FsInformationClass OPTIONAL);
+		      IN PVOID ExtraData OPTIONAL,
+		      IN PVOID ExtraData2 OPTIONAL);
 
 NTSTATUS
 STDCALL
@@ -788,11 +788,11 @@ STDCALL
 IoIsOperationSynchronous (
 	IN	PIRP	Irp
 	);
-BOOLEAN
 STDCALL
-IoIsSystemThread (
-	PVOID	Unknown0
-	);
+BOOLEAN
+IoIsSystemThread(
+    IN struct _ETHREAD* Thread
+    );
 PIRP
 STDCALL
 IoMakeAssociatedIrp (
@@ -1238,6 +1238,547 @@ IoWritePartitionTable (
 	PDRIVE_LAYOUT_INFORMATION	PartitionBuffer
 	);
 
+/* STUBS*/
+
+STDCALL
+NTSTATUS
+IoAttachDeviceToDeviceStackSafe(
+    IN PDEVICE_OBJECT SourceDevice,
+    IN PDEVICE_OBJECT TargetDevice,
+    OUT PDEVICE_OBJECT *AttachedToDeviceObject
+    );
+
+STDCALL
+VOID
+IoCancelFileOpen(
+    IN PDEVICE_OBJECT  DeviceObject,
+    IN PFILE_OBJECT    FileObject
+    );
+
+STDCALL
+NTSTATUS
+IoCheckQuerySetFileInformation(
+    IN FILE_INFORMATION_CLASS FileInformationClass,
+    IN ULONG Length,
+    IN BOOLEAN SetOperation
+    );
+
+STDCALL
+NTSTATUS
+IoCheckQuerySetVolumeInformation(
+    IN FS_INFORMATION_CLASS FsInformationClass,
+    IN ULONG Length,
+    IN BOOLEAN SetOperation
+    );
+
+
+STDCALL
+NTSTATUS
+IoCheckQuotaBufferValidity(
+    IN PFILE_QUOTA_INFORMATION QuotaBuffer,
+    IN ULONG QuotaLength,
+    OUT PULONG ErrorOffset
+    );
+
+STDCALL
+NTSTATUS
+IoCreateFileSpecifyDeviceObjectHint(
+    OUT PHANDLE FileHandle,
+    IN ACCESS_MASK DesiredAccess,
+    IN POBJECT_ATTRIBUTES ObjectAttributes,
+    OUT PIO_STATUS_BLOCK IoStatusBlock,
+    IN PLARGE_INTEGER AllocationSize OPTIONAL,
+    IN ULONG FileAttributes,
+    IN ULONG ShareAccess,
+    IN ULONG Disposition,
+    IN ULONG CreateOptions,
+    IN PVOID EaBuffer OPTIONAL,
+    IN ULONG EaLength,
+    IN CREATE_FILE_TYPE CreateFileType,
+    IN PVOID ExtraCreateParameters OPTIONAL,
+    IN ULONG Options,
+    IN PVOID DeviceObject
+    );
+
+STDCALL
+PFILE_OBJECT
+IoCreateStreamFileObjectEx(
+    IN PFILE_OBJECT FileObject OPTIONAL,
+    IN PDEVICE_OBJECT DeviceObject OPTIONAL,
+    OUT PHANDLE FileObjectHandle OPTIONAL
+    );
+
+STDCALL
+PFILE_OBJECT
+IoCreateStreamFileObjectLite(
+    IN PFILE_OBJECT FileObject OPTIONAL,
+    IN PDEVICE_OBJECT DeviceObject OPTIONAL
+    );
+
+STDCALL
+NTSTATUS
+IoEnumerateDeviceObjectList(
+    IN  PDRIVER_OBJECT  DriverObject,
+    IN  PDEVICE_OBJECT  *DeviceObjectList,
+    IN  ULONG           DeviceObjectListSize,
+    OUT PULONG          ActualNumberDeviceObjects
+    );
+
+STDCALL
+BOOLEAN
+IoForwardIrpSynchronously(
+    IN PDEVICE_OBJECT DeviceObject,
+    IN PIRP Irp
+    );
+
+#define IoForwardAndCatchIrp IoForwardIrpSynchronously
+
+STDCALL
+VOID
+IoFreeErrorLogEntry(
+    PVOID ElEntry
+    );
+
+STDCALL
+ULONG
+IoPnPDeliverServicePowerNotification(
+	ULONG		VetoedPowerOperation OPTIONAL,
+	ULONG		PowerNotification,
+	ULONG		Unknown OPTIONAL,
+	BOOLEAN  	Synchronous
+	);
+
+STDCALL
+NTSTATUS
+IoGetBootDiskInformation(
+    IN OUT PBOOTDISK_INFORMATION BootDiskInformation,
+    IN ULONG Size
+    );
+
+STDCALL
+PDEVICE_OBJECT
+IoGetDeviceAttachmentBaseRef(
+    IN PDEVICE_OBJECT DeviceObject
+    );
+
+STDCALL
+NTSTATUS
+IoGetDiskDeviceObject(
+    IN  PDEVICE_OBJECT  FileSystemDeviceObject,
+    OUT PDEVICE_OBJECT  *DiskDeviceObject
+    );
+
+STDCALL
+PDEVICE_OBJECT
+IoGetLowerDeviceObject(
+    IN  PDEVICE_OBJECT  DeviceObject
+    );
+
+STDCALL
+ULONG
+IoGetRequestorProcessId(
+    IN PIRP Irp
+    );
+
+STDCALL
+BOOLEAN
+IoIsFileOriginRemote(
+    IN PFILE_OBJECT FileObject
+    );
+
+STDCALL
+BOOLEAN
+IoIsValidNameGraftingBuffer(
+    IN PIRP Irp,
+    IN PREPARSE_DATA_BUFFER ReparseBuffer
+    );
+
+STDCALL
+NTSTATUS
+IoQueryFileDosDeviceName(
+    IN PFILE_OBJECT FileObject,
+    OUT POBJECT_NAME_INFORMATION *ObjectNameInformation
+    );
+
+STDCALL
+VOID
+IoRegisterBootDriverReinitialization(
+    IN PDRIVER_OBJECT DriverObject,
+    IN PDRIVER_REINITIALIZE DriverReinitializationRoutine,
+    IN PVOID Context
+    );
+
+STDCALL
+NTSTATUS
+IoRegisterLastChanceShutdownNotification(
+    IN PDEVICE_OBJECT DeviceObject
+    );
+
+STDCALL
+VOID
+IoReuseIrp(
+    IN OUT PIRP Irp,
+    IN NTSTATUS Iostatus
+    );
+
+STDCALL
+NTSTATUS
+IoSetCompletionRoutineEx(
+    IN PDEVICE_OBJECT DeviceObject,
+    IN PIRP Irp,
+    IN PIO_COMPLETION_ROUTINE CompletionRoutine,
+    IN PVOID Context,
+    IN BOOLEAN InvokeOnSuccess,
+    IN BOOLEAN InvokeOnError,
+    IN BOOLEAN InvokeOnCancel
+    );
+
+STDCALL
+NTSTATUS
+IoSetFileOrigin(
+    IN PFILE_OBJECT FileObject,
+    IN BOOLEAN Remote
+    );
+
+STDCALL
+NTSTATUS
+IoSetSystemPartition(
+    PUNICODE_STRING VolumeNameString
+    );
+
+STDCALL
+NTSTATUS
+IoVolumeDeviceToDosName(
+    IN  PVOID           VolumeDeviceObject,
+    OUT PUNICODE_STRING DosName
+    );
+
+
+STDCALL
+NTSTATUS
+IoSetPartitionInformationEx(
+    IN PDEVICE_OBJECT DeviceObject,
+    IN ULONG PartitionNumber,
+    IN struct _SET_PARTITION_INFORMATION_EX* PartitionInfo
+    );
+
+STDCALL
+NTSTATUS
+IoWritePartitionTableEx(
+    IN PDEVICE_OBJECT DeviceObject,
+    IN struct _DRIVE_LAYOUT_INFORMATION_EX* DriveLayfout
+    );
+
+STDCALL
+NTSTATUS
+IoReadPartitionTableEx(
+    IN PDEVICE_OBJECT DeviceObject,
+    IN struct _DRIVE_LAYOUT_INFORMATION_EX** DriveLayout
+    );
+
+STDCALL
+NTSTATUS
+IoCreateDisk(
+    IN PDEVICE_OBJECT DeviceObject,
+    IN struct _CREATE_DISK* Disk
+    );
+
+STDCALL
+NTSTATUS
+NTAPI
+IoGetDeviceInterfaces(
+    IN CONST GUID *InterfaceClassGuid,
+    IN PDEVICE_OBJECT PhysicalDeviceObject OPTIONAL,
+    IN ULONG Flags,
+    OUT PWSTR *SymbolicLinkList
+    );
+
+STDCALL
+NTSTATUS
+NTAPI
+IoGetDeviceInterfaceAlias(
+    IN PUNICODE_STRING SymbolicLinkName,
+    IN CONST GUID *AliasInterfaceClassGuid,
+    OUT PUNICODE_STRING AliasSymbolicLinkName
+    );
+
+STDCALL
+NTSTATUS
+IoOpenDeviceInterfaceRegistryKey(
+    IN PUNICODE_STRING SymbolicLinkName,
+    IN ACCESS_MASK DesiredAccess,
+    OUT PHANDLE DeviceInterfaceKey
+    );
+
+STDCALL
+NTSTATUS
+IoReadDiskSignature(
+    IN PDEVICE_OBJECT DeviceObject,
+    IN ULONG BytesPerSector,
+    OUT PDISK_SIGNATURE Signature
+    );
+
+STDCALL
+NTSTATUS
+IoRegisterPlugPlayNotification(
+    IN IO_NOTIFICATION_EVENT_CATEGORY EventCategory,
+    IN ULONG EventCategoryFlags,
+    IN PVOID EventCategoryData OPTIONAL,
+    IN PDRIVER_OBJECT DriverObject,
+    IN PDRIVER_NOTIFICATION_CALLBACK_ROUTINE CallbackRoutine,
+    IN PVOID Context,
+    OUT PVOID *NotificationEntry
+    );
+
+STDCALL
+NTSTATUS
+IoUnregisterPlugPlayNotification(
+    IN PVOID NotificationEntry
+    );
+
+STDCALL
+NTSTATUS
+IoReportDetectedDevice(
+    IN PDRIVER_OBJECT DriverObject,
+    IN INTERFACE_TYPE LegacyBusType,
+    IN ULONG BusNumber,
+    IN ULONG SlotNumber,
+    IN PCM_RESOURCE_LIST ResourceList,
+    IN PIO_RESOURCE_REQUIREMENTS_LIST ResourceRequirements OPTIONAL,
+    IN BOOLEAN ResourceAssigned,
+    IN OUT PDEVICE_OBJECT *DeviceObject
+    );
+
+STDCALL
+NTSTATUS
+IoReportResourceForDetection(
+    IN PDRIVER_OBJECT DriverObject,
+    IN PCM_RESOURCE_LIST DriverList OPTIONAL,
+    IN ULONG DriverListSize OPTIONAL,
+    IN PDEVICE_OBJECT DeviceObject OPTIONAL,
+    IN PCM_RESOURCE_LIST DeviceList OPTIONAL,
+    IN ULONG DeviceListSize OPTIONAL,
+    OUT PBOOLEAN ConflictDetected
+    );
+
+STDCALL
+NTSTATUS
+IoReportTargetDeviceChange(
+    IN PDEVICE_OBJECT PhysicalDeviceObject,
+    IN PVOID NotificationStructure
+    );
+
+STDCALL
+NTSTATUS
+IoReportTargetDeviceChangeAsynchronous(
+    IN PDEVICE_OBJECT PhysicalDeviceObject,
+    IN PVOID NotificationStructure,
+    IN PDEVICE_CHANGE_COMPLETE_CALLBACK Callback,       OPTIONAL
+    IN PVOID Context    OPTIONAL
+    );
+
+STDCALL
+VOID
+IoRequestDeviceEject(
+    IN PDEVICE_OBJECT PhysicalDeviceObject
+    );
+
+STDCALL
+NTSTATUS
+IoVerifyPartitionTable(
+    IN PDEVICE_OBJECT DeviceObject,
+    IN BOOLEAN FixErrors
+    );
+
+STDCALL
+VOID
+IoSetStartIoAttributes(
+    IN PDEVICE_OBJECT DeviceObject,
+    IN BOOLEAN DeferredStartIo,
+    IN BOOLEAN NonCancelable
+    );
+
+STDCALL
+VOID
+IoSynchronousInvalidateDeviceRelations(
+    IN PDEVICE_OBJECT DeviceObject,
+    IN DEVICE_RELATION_TYPE Type
+    );
+
+STDCALL
+NTSTATUS
+IoCreateDriver (
+	IN PUNICODE_STRING DriverName,   OPTIONAL
+	IN PDRIVER_INITIALIZE InitializationFunction
+	);
+
+STDCALL
+NTSTATUS
+IoValidateDeviceIoControlAccess(
+    IN  PIRP    Irp,
+    IN  ULONG   RequiredAccess
+    );
+
+STDCALL
+VOID
+IoDeleteDriver (
+	IN PDRIVER_OBJECT DriverObject
+	);
+
+STDCALL
+NTSTATUS
+IoGetRequestorSessionId(
+	IN PIRP Irp,
+	OUT PULONG pSessionId
+	);
+
+STDCALL
+NTSTATUS
+IoSetIoCompletion (
+	IN PVOID IoCompletion,
+	IN PVOID KeyContext,
+	IN PVOID ApcContext,
+	IN NTSTATUS IoStatus,
+	IN ULONG_PTR IoStatusInformation,
+	IN BOOLEAN Quota
+	);
+
+STDCALL
+NTSTATUS
+IoWMIRegistrationControl(
+    IN PDEVICE_OBJECT DeviceObject,
+    IN ULONG Action
+	);
+
+STDCALL
+NTSTATUS
+IoWMIAllocateInstanceIds(
+    IN GUID *Guid,
+    IN ULONG InstanceCount,
+    OUT ULONG *FirstInstanceId
+    );
+
+STDCALL
+NTSTATUS
+IoWMISuggestInstanceName(
+    IN PDEVICE_OBJECT PhysicalDeviceObject OPTIONAL,
+    IN PUNICODE_STRING SymbolicLinkName OPTIONAL,
+    IN BOOLEAN CombineNames,
+    OUT PUNICODE_STRING SuggestedInstanceName
+    );
+
+STDCALL
+NTSTATUS
+IoWMIWriteEvent(
+    IN PVOID WnodeEventItem
+    );
+
+STDCALL
+NTSTATUS IoWMIOpenBlock(
+    IN GUID *DataBlockGuid,
+    IN ULONG DesiredAccess,
+    OUT PVOID *DataBlockObject
+    );
+
+
+STDCALL
+NTSTATUS IoWMIQueryAllData(
+    IN PVOID DataBlockObject,
+    IN OUT ULONG *InOutBufferSize,
+    OUT PVOID OutBuffer
+);
+
+
+STDCALL
+NTSTATUS
+IoWMIQueryAllDataMultiple(
+    IN PVOID *DataBlockObjectList,
+    IN ULONG ObjectCount,
+    IN OUT ULONG *InOutBufferSize,
+    OUT PVOID OutBuffer
+);
+
+
+STDCALL
+NTSTATUS
+IoWMIQuerySingleInstance(
+    IN PVOID DataBlockObject,
+    IN PUNICODE_STRING InstanceName,
+    IN OUT ULONG *InOutBufferSize,
+    OUT PVOID OutBuffer
+);
+
+STDCALL
+NTSTATUS
+IoWMIQuerySingleInstanceMultiple(
+    IN PVOID *DataBlockObjectList,
+    IN PUNICODE_STRING InstanceNames,
+    IN ULONG ObjectCount,
+    IN OUT ULONG *InOutBufferSize,
+    OUT PVOID OutBuffer
+);
+
+STDCALL
+NTSTATUS
+IoWMISetSingleInstance(
+    IN PVOID DataBlockObject,
+    IN PUNICODE_STRING InstanceName,
+    IN ULONG Version,
+    IN ULONG ValueBufferSize,
+    IN PVOID ValueBuffer
+    );
+
+STDCALL
+NTSTATUS
+IoWMISetSingleItem(
+    IN PVOID DataBlockObject,
+    IN PUNICODE_STRING InstanceName,
+    IN ULONG DataItemId,
+    IN ULONG Version,
+    IN ULONG ValueBufferSize,
+    IN PVOID ValueBuffer
+    );
+
+STDCALL
+NTSTATUS
+IoWMIExecuteMethod(
+    IN PVOID DataBlockObject,
+    IN PUNICODE_STRING InstanceName,
+    IN ULONG MethodId,
+    IN ULONG InBufferSize,
+    IN OUT PULONG OutBufferSize,
+    IN OUT PUCHAR InOutBuffer
+    );
+
+typedef VOID (*WMI_NOTIFICATION_CALLBACK)(
+    PVOID Wnode,
+    PVOID Context
+    );
+
+STDCALL
+NTSTATUS
+IoWMISetNotificationCallback(
+    IN PVOID Object,
+    IN WMI_NOTIFICATION_CALLBACK Callback,
+    IN PVOID Context
+    );
+
+STDCALL
+NTSTATUS
+IoWMIHandleToInstanceName(
+    IN PVOID DataBlockObject,
+    IN HANDLE FileHandle,
+    OUT PUNICODE_STRING InstanceName
+    );
+
+STDCALL
+NTSTATUS
+IoWMIDeviceObjectToInstanceName(
+    IN PVOID DataBlockObject,
+    IN PDEVICE_OBJECT DeviceObject,
+    OUT PUNICODE_STRING InstanceName
+    );
+
 
 /* --- --- --- INTERNAL or REACTOS ONLY --- --- --- */
 
diff --git a/reactos/include/ddk/iotypes.h b/reactos/include/ddk/iotypes.h
index 59062c83d79..f72280db401 100644
--- a/reactos/include/ddk/iotypes.h
+++ b/reactos/include/ddk/iotypes.h
@@ -1,4 +1,4 @@
-/* $Id: iotypes.h,v 1.62 2004/01/05 14:28:19 weiden Exp $
+/* $Id: iotypes.h,v 1.63 2004/06/23 21:43:19 ion Exp $
  *
  */
 
@@ -1089,6 +1089,135 @@ typedef struct _PARTITION_INFORMATION
 } PARTITION_INFORMATION, *PPARTITION_INFORMATION;
 #endif
 
+typedef enum _PARTITION_STYLE {
+    PARTITION_STYLE_MBR,
+    PARTITION_STYLE_GPT,
+    PARTITION_STYLE_RAW
+} PARTITION_STYLE;
+
+typedef struct _PARTITION_INFORMATION_GPT {
+    GUID PartitionType;             
+    GUID PartitionId;                 
+    ULONG64 Attributes;                
+    WCHAR Name [36];                 
+} PARTITION_INFORMATION_GPT, *PPARTITION_INFORMATION_GPT;
+
+typedef struct _PARTITION_INFORMATION_MBR {
+    UCHAR PartitionType;
+    BOOLEAN BootIndicator;
+    BOOLEAN RecognizedPartition;
+    ULONG HiddenSectors;
+} PARTITION_INFORMATION_MBR, *PPARTITION_INFORMATION_MBR;
+
+typedef SET_PARTITION_INFORMATION SET_PARTITION_INFORMATION_MBR;
+typedef PARTITION_INFORMATION_GPT SET_PARTITION_INFORMATION_GPT;
+
+typedef struct _SET_PARTITION_INFORMATION_EX {
+    PARTITION_STYLE PartitionStyle;
+    union {
+        SET_PARTITION_INFORMATION_MBR Mbr;
+        SET_PARTITION_INFORMATION_GPT Gpt;
+    };
+} SET_PARTITION_INFORMATION_EX, *PSET_PARTITION_INFORMATION_EX;
+
+typedef struct _CREATE_DISK_GPT {
+    GUID DiskId;                    
+    ULONG MaxPartitionCount;       
+} CREATE_DISK_GPT, *PCREATE_DISK_GPT;
+
+typedef struct _CREATE_DISK_MBR {
+    ULONG Signature;
+} CREATE_DISK_MBR, *PCREATE_DISK_MBR;
+
+
+typedef struct _CREATE_DISK {
+    PARTITION_STYLE PartitionStyle;
+    union {
+        CREATE_DISK_MBR Mbr;
+        CREATE_DISK_GPT Gpt;
+    };
+} CREATE_DISK, *PCREATE_DISK;
+
+typedef struct _DRIVE_LAYOUT_INFORMATION_GPT {
+    GUID DiskId;
+    LARGE_INTEGER StartingUsableOffset;
+    LARGE_INTEGER UsableLength;
+    ULONG MaxPartitionCount;
+} DRIVE_LAYOUT_INFORMATION_GPT, *PDRIVE_LAYOUT_INFORMATION_GPT;
+
+typedef struct _DRIVE_LAYOUT_INFORMATION_MBR {
+    ULONG Signature;
+} DRIVE_LAYOUT_INFORMATION_MBR, *PDRIVE_LAYOUT_INFORMATION_MBR;
+
+typedef struct _PARTITION_INFORMATION_EX {
+    PARTITION_STYLE PartitionStyle;
+    LARGE_INTEGER StartingOffset;
+    LARGE_INTEGER PartitionLength;
+    ULONG PartitionNumber;
+    BOOLEAN RewritePartition;
+    union {
+        PARTITION_INFORMATION_MBR Mbr;
+        PARTITION_INFORMATION_GPT Gpt;
+    };
+} PARTITION_INFORMATION_EX, *PPARTITION_INFORMATION_EX;
+
+typedef struct _DRIVE_LAYOUT_INFORMATION_EX {
+    ULONG PartitionStyle;
+    ULONG PartitionCount;
+    union {
+        DRIVE_LAYOUT_INFORMATION_MBR Mbr;
+        DRIVE_LAYOUT_INFORMATION_GPT Gpt;
+    };
+    PARTITION_INFORMATION_EX PartitionEntry[1];
+} DRIVE_LAYOUT_INFORMATION_EX, *PDRIVE_LAYOUT_INFORMATION_EX;
+
+typedef struct _BOOTDISK_INFORMATION {
+    LONGLONG BootPartitionOffset;
+    LONGLONG SystemPartitionOffset;
+    ULONG BootDeviceSignature;
+    ULONG SystemDeviceSignature;
+} BOOTDISK_INFORMATION, *PBOOTDISK_INFORMATION;
+
+
+typedef struct _DISK_SIGNATURE {
+    ULONG PartitionStyle;
+    union {
+        struct {
+            ULONG Signature;
+            ULONG CheckSum;
+        } Mbr;
+
+        struct {
+            GUID DiskId;
+        } Gpt;
+    };
+} DISK_SIGNATURE, *PDISK_SIGNATURE;
+
+typedef struct _REPARSE_DATA_BUFFER {
+    ULONG  ReparseTag;
+    USHORT ReparseDataLength;
+    USHORT Reserved;
+    union {
+        struct {
+            USHORT SubstituteNameOffset;
+            USHORT SubstituteNameLength;
+            USHORT PrintNameOffset;
+            USHORT PrintNameLength;
+            WCHAR PathBuffer[1];
+        } SymbolicLinkReparseBuffer;
+        struct {
+            USHORT SubstituteNameOffset;
+            USHORT SubstituteNameLength;
+            USHORT PrintNameOffset;
+            USHORT PrintNameLength;
+            WCHAR PathBuffer[1];
+        } MountPointReparseBuffer;
+        struct {
+            UCHAR  DataBuffer[1];
+        } GenericReparseBuffer;
+    };
+} REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER;
+
 typedef struct _DRIVER_LAYOUT_INFORMATION
 {
    ULONG PartitionCount;
@@ -1127,7 +1256,6 @@ typedef struct _IO_MAILSLOT_CREATE_BUFFER
    LARGE_INTEGER TimeOut;
 } IO_MAILSLOT_CREATE_BUFFER, *PIO_MAILSLOT_CREATE_BUFFER;
 
-
 /* error logging */
 
 typedef struct _IO_ERROR_LOG_PACKET

From 7f48bb36d77710af98da0d96c93dffaf08d3c198 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Wed, 23 Jun 2004 21:43:45 +0000
Subject: [PATCH 064/356] Added New Io File for stubs

svn path=/trunk/; revision=9846
---
 reactos/ntoskrnl/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/reactos/ntoskrnl/Makefile b/reactos/ntoskrnl/Makefile
index 0ba13084ebc..1d2fc1e5be1 100644
--- a/reactos/ntoskrnl/Makefile
+++ b/reactos/ntoskrnl/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.126 2004/06/23 21:03:43 ion Exp $
+# $Id: Makefile,v 1.127 2004/06/23 21:43:45 ion Exp $
 #
 # ReactOS Operating System
 #
@@ -222,7 +222,8 @@ OBJECTS_IO = \
 	io/vpb.o \
 	io/wdm.o \
 	io/xhaldisp.o \
-	io/xhaldrv.o
+        io/xhaldrv.o \
+        io/wmi.o
 
 # Object Manager (Ob)
 OBJECTS_OB = \

From 5dc4ab6ba966df4e49c8f217ba2870f513617d79 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Wed, 23 Jun 2004 21:50:59 +0000
Subject: [PATCH 065/356] Added Ex Stub

svn path=/trunk/; revision=9848
---
 reactos/ntoskrnl/mm/pool.c | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/reactos/ntoskrnl/mm/pool.c b/reactos/ntoskrnl/mm/pool.c
index c1c682baea1..e26bcde483d 100644
--- a/reactos/ntoskrnl/mm/pool.c
+++ b/reactos/ntoskrnl/mm/pool.c
@@ -1,4 +1,4 @@
-/* $Id: pool.c,v 1.28 2004/04/10 22:35:25 gdalsnes Exp $
+/* $Id: pool.c,v 1.29 2004/06/23 21:50:59 ion Exp $
  * 
  * COPYRIGHT:    See COPYING in the top level directory
  * PROJECT:      ReactOS kernel
@@ -146,7 +146,20 @@ ExAllocatePoolWithQuota (POOL_TYPE PoolType, ULONG NumberOfBytes)
    return(ExAllocatePoolWithQuotaTag(PoolType, NumberOfBytes, TAG_NONE));
 }
 
-
+/*
+ * @unimplemented
+ */
+PVOID
+STDCALL
+ExAllocatePoolWithTagPriority(
+    IN POOL_TYPE PoolType,
+    IN SIZE_T NumberOfBytes,
+    IN ULONG Tag,
+    IN EX_POOL_PRIORITY Priority
+    )
+{
+	UNIMPLEMENTED;
+}
 /*
  * @unimplemented
  */
@@ -195,6 +208,20 @@ ExFreePoolWithTag(IN PVOID Block, IN ULONG Tag)
    ExFreePool(Block);
 }
 
+/*
+ * @unimplemented
+ */
+SIZE_T
+STDCALL
+ExQueryPoolBlockSize (                          
+    IN PVOID PoolBlock,                         
+    OUT PBOOLEAN QuotaCharged                   
+    )
+{
+	UNIMPLEMENTED;
+	return FALSE;
+}
+
 /* EOF */
 
 

From 3d29c6de301716d0d6bc96df84efa2a67d334061 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Wed, 23 Jun 2004 22:21:03 +0000
Subject: [PATCH 066/356] Added Ldr Stub Prototypes

svn path=/trunk/; revision=9849
---
 reactos/include/ddk/ldrfuncs.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/reactos/include/ddk/ldrfuncs.h b/reactos/include/ddk/ldrfuncs.h
index f1988e2d234..e9dafa6a1b0 100644
--- a/reactos/include/ddk/ldrfuncs.h
+++ b/reactos/include/ddk/ldrfuncs.h
@@ -1,6 +1,6 @@
 #ifndef __INCLUDE_DDK_LDRFUNCS_H
 #define __INCLUDE_DDK_LDRFUNCS_H
-/* $Id: ldrfuncs.h,v 1.6 2004/06/23 19:48:53 ion Exp $ */
+/* $Id: ldrfuncs.h,v 1.7 2004/06/23 22:21:03 ion Exp $ */
 
 NTSTATUS STDCALL
 LdrAccessResource(IN  PVOID BaseAddress,
@@ -14,12 +14,12 @@ LdrFindResource_U(IN  PVOID BaseAddress,
                   IN  ULONG Level,
                   OUT PIMAGE_RESOURCE_DATA_ENTRY *ResourceDataEntry);
 
-NTSTATUS STDCALL 
+/*NTSTATUS STDCALL 
 LdrFindResourceDirectory_U(	IN PVOID   						BaseAddress,
 							IN PLDR_RESOURCE_INFO			ResourceInfo,
 							IN  ULONG						Level,
 							OUT PIMAGE_RESOURCE_DIRECTORY	*ResourceDirectory);
-
+*/
 NTSTATUS STDCALL
 LdrEnumResources(IN PVOID						BaseAddress,
 				 IN PLDR_RESOURCE_INFO			ResourceInfo,

From c800cdda6e05a389ce829ea345e834a8629510fa Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Wed, 23 Jun 2004 22:21:26 +0000
Subject: [PATCH 067/356] Added Ke Stub Prototypes

svn path=/trunk/; revision=9850
---
 reactos/include/ddk/kefuncs.h | 279 ++++++++++++++++++++++++++++++++--
 reactos/include/ddk/ketypes.h | 100 ++++++++++--
 2 files changed, 351 insertions(+), 28 deletions(-)

diff --git a/reactos/include/ddk/kefuncs.h b/reactos/include/ddk/kefuncs.h
index a7aa8ca40bc..bf7ac42dc29 100644
--- a/reactos/include/ddk/kefuncs.h
+++ b/reactos/include/ddk/kefuncs.h
@@ -1,3 +1,4 @@
+
 #ifndef __INCLUDE_DDK_KEFUNCS_H
 #define __INCLUDE_DDK_KEFUNCS_H
 
@@ -257,17 +258,6 @@ KeRaiseIrqlToDpcLevel (
 	VOID
 	);
 
-/*
- * FUNCTION: Raises a user mode exception
- * ARGUMENTS:
- *	ExceptionCode = Status code of the exception
- */
-NTSTATUS
-STDCALL
-KeRaiseUserException (
-	IN	NTSTATUS	ExceptionCode
-	);
-
 LONG
 STDCALL
 KeReadStateEvent (
@@ -482,7 +472,11 @@ Ke386IoSetAccessProcess(struct _EPROCESS* Eprocess, BOOL EnableIo);
  *     Value2 = The value of the high dword of the descriptor.
  */
 VOID
-KeSetGdtSelector(ULONG Entry, ULONG Value1, ULONG Value2);
+KeSetGdtSelector(
+	ULONG Entry,
+	ULONG Value1,
+	ULONG Value2
+);
 
 /*
  * FUNCTION: Releases a set of Global Descriptor Table Selectors
@@ -490,8 +484,11 @@ KeSetGdtSelector(ULONG Entry, ULONG Value1, ULONG Value2);
  *	SelArray = 
  *	NumOfSelectors = 
  */
-NTSTATUS KeI386ReleaseGdtSelectors(OUT PULONG SelArray,
-				   IN ULONG NumOfSelectors);
+NTSTATUS 
+KeI386ReleaseGdtSelectors(
+	OUT PULONG SelArray,
+	IN ULONG NumOfSelectors
+);
 
 /*
  * FUNCTION: Allocates a set of Global Descriptor Table Selectors
@@ -499,8 +496,11 @@ NTSTATUS KeI386ReleaseGdtSelectors(OUT PULONG SelArray,
  *	SelArray = 
  *	NumOfSelectors = 
  */
-NTSTATUS KeI386AllocateGdtSelectors(OUT PULONG SelArray,
-				    IN ULONG NumOfSelectors);
+NTSTATUS
+KeI386AllocateGdtSelectors(
+	OUT PULONG SelArray,
+    IN ULONG NumOfSelectors
+);
 
 
 KIRQL
@@ -536,4 +536,251 @@ VOID STDCALL KiDeliverApc(ULONG Unknown1,
 
 VOID STDCALL KiDispatchInterrupt(VOID);
 
+/* Stubs Start here */
+
+STDCALL
+VOID
+KeReleaseInterruptSpinLock(
+	IN PKINTERRUPT Interrupt,
+	IN KIRQL OldIrql
+	);
+
+STDCALL
+BOOLEAN
+KeAreApcsDisabled(
+	VOID
+	);
+
+STDCALL
+VOID
+KeFlushQueuedDpcs(
+	VOID
+	);
+
+STDCALL
+ULONG
+KeGetRecommendedSharedDataAlignment(
+	VOID
+	);
+
+STDCALL
+ULONG
+KeQueryRuntimeThread(
+	IN PKTHREAD Thread,
+	OUT PULONG UserTime
+	);    
+
+STDCALL
+BOOLEAN
+KeSetKernelStackSwapEnable(
+	IN BOOLEAN Enable
+	);
+
+STDCALL
+BOOLEAN
+KeDeregisterBugCheckReasonCallback(
+    IN PKBUGCHECK_REASON_CALLBACK_RECORD CallbackRecord
+    );
+
+STDCALL
+BOOLEAN
+KeRegisterBugCheckReasonCallback(
+    IN PKBUGCHECK_REASON_CALLBACK_RECORD CallbackRecord,
+    IN PKBUGCHECK_REASON_CALLBACK_ROUTINE CallbackRoutine,
+    IN KBUGCHECK_CALLBACK_REASON Reason,
+    IN PUCHAR Component
+    );
+
+STDCALL
+VOID 
+KeTerminateThread(
+	IN KPRIORITY   	 Increment  	 
+);
+
+STDCALL
+VOID 
+KeIsExecutingDpc(
+	VOID
+);
+
+STDCALL
+VOID
+KeSetEventBoostPriority(
+	IN PKEVENT Event,
+	IN PKTHREAD *Thread OPTIONAL
+);
+
+STDCALL
+PVOID
+KeFindConfigurationEntry(
+    IN PVOID Unknown,
+    IN ULONG Class,
+    IN CONFIGURATION_TYPE Type,
+    IN PULONG RegKey
+);
+
+STDCALL
+PVOID
+KeFindConfigurationNextEntry(
+    IN PVOID Unknown,
+    IN ULONG Class,
+    IN CONFIGURATION_TYPE Type,
+    IN PULONG RegKey,
+    IN PVOID *NextLink
+);
+
+STDCALL
+VOID
+KeFlushEntireTb(
+    IN ULONGLONG Flag
+);
+
+STDCALL
+VOID
+KeRevertToUserAffinityThread(
+    VOID
+);
+
+STDCALL
+VOID
+KiCoprocessorError(
+    VOID
+);
+
+STDCALL
+VOID
+KiUnexpectedInterrupt(
+    VOID
+);
+
+STDCALL
+VOID
+KeSetDmaIoCoherency(
+    IN ULONG Coherency
+);
+
+STDCALL
+VOID
+KeSetProfileIrql(
+    IN KIRQL ProfileIrql
+);
+
+STDCALL
+VOID
+KeSetSystemAffinityThread(
+    IN KAFFINITY Affinity
+);
+
+STDCALL
+NTSTATUS
+KeUserModeCallback(
+    IN ULONG	FunctionID,
+    IN PVOID	InputBuffer,
+    IN ULONG	InputLength,
+    OUT PVOID	*OutputBuffer,
+    OUT PULONG	OutputLength
+);
+
+STDCALL
+VOID
+KeSetTimeIncrement(
+    IN ULONG MaxIncrement,
+    IN ULONG MinIncrement
+);
+
+STDCALL
+VOID
+KeCapturePersistentThreadState(
+	IN PVOID	CurrentThread,
+	IN ULONG	Setting1,
+	IN ULONG	Setting2,
+	IN ULONG	Setting3,
+	IN ULONG	Setting4,
+	IN ULONG	Setting5,
+	IN PVOID	ThreadState
+);
+
+STDCALL
+BOOLEAN
+KeRemoveSystemServiceTable(
+    IN PUCHAR Number
+);
+
+NTSTATUS
+KeI386FlatToGdtSelector(
+	IN ULONG	Base,
+	IN USHORT	Length,
+	IN USHORT	Selector
+);
+
+STDCALL
+CCHAR
+KeSetIdealProcessorThread (
+	IN PKTHREAD Thread,
+	IN CCHAR Processor
+	);
+
+typedef
+VOID
+(FASTCALL *PTIME_UPDATE_NOTIFY_ROUTINE)(
+    IN HANDLE ThreadId,
+    IN KPROCESSOR_MODE Mode
+    );
+
+VOID
+FASTCALL
+KeSetTimeUpdateNotifyRoutine(
+    IN PTIME_UPDATE_NOTIFY_ROUTINE NotifyRoutine
+    );
+
+STDCALL
+PKDEVICE_QUEUE_ENTRY
+KeRemoveByKeyDeviceQueueIfBusy (
+    IN PKDEVICE_QUEUE DeviceQueue,
+    IN ULONG SortKey
+    );
+
+STDCALL
+KAFFINITY
+KeQueryActiveProcessors (
+    VOID
+    );
+
+VOID
+FASTCALL
+KeAcquireInStackQueuedSpinLockAtDpcLevel(
+    IN PKSPIN_LOCK SpinLock,
+    IN PKLOCK_QUEUE_HANDLE LockHandle
+    );
+
+VOID
+FASTCALL
+KeReleaseInStackQueuedSpinLockFromDpcLevel(
+    IN PKLOCK_QUEUE_HANDLE LockHandle
+    );
+
+STDCALL
+KPRIORITY
+KeQueryPriorityThread (
+    IN PKTHREAD Thread
+    );  
+
+STDCALL
+KIRQL
+KeAcquireInterruptSpinLock(
+    IN PKINTERRUPT Interrupt
+    );
+
+VOID
+__cdecl
+KeSaveStateForHibernate(
+    IN PVOID State
+);
+
+STDCALL
+NTSTATUS
+KeRaiseUserException(
+	IN NTSTATUS	ExceptionCode
+);
+
 #endif /* __INCLUDE_DDK_KEFUNCS_H */
diff --git a/reactos/include/ddk/ketypes.h b/reactos/include/ddk/ketypes.h
index aab46e16f5e..3d584aa5167 100644
--- a/reactos/include/ddk/ketypes.h
+++ b/reactos/include/ddk/ketypes.h
@@ -36,18 +36,7 @@ typedef VOID STDCALL_FUNC
 
 struct _DISPATCHER_HEADER;
 
-typedef struct _KWAIT_BLOCK
-/*
- * PURPOSE: Object describing the wait a thread is currently performing
- */
-{
-   LIST_ENTRY WaitListEntry;
-   struct _KTHREAD* Thread;
-   struct _DISPATCHER_HEADER *Object;
-   struct _KWAIT_BLOCK* NextWaitBlock;
-   USHORT WaitKey;
-   USHORT WaitType;
-} KWAIT_BLOCK, *PKWAIT_BLOCK;
+
 
 #include <pshpack1.h>
 
@@ -163,6 +152,29 @@ typedef struct _KEVENT_PAIR
 
 struct _KDPC;
 
+typedef struct _KSPIN_LOCK_QUEUE {
+    struct _KSPIN_LOCK_QUEUE * volatile Next;
+    PKSPIN_LOCK volatile Lock;
+} KSPIN_LOCK_QUEUE, *PKSPIN_LOCK_QUEUE;
+
+typedef struct _KLOCK_QUEUE_HANDLE {
+    KSPIN_LOCK_QUEUE LockQueue;
+    KIRQL OldIrql;
+} KLOCK_QUEUE_HANDLE, *PKLOCK_QUEUE_HANDLE;
+
+typedef struct _KWAIT_BLOCK
+/*
+ * PURPOSE: Object describing the wait a thread is currently performing
+ */
+{
+   LIST_ENTRY WaitListEntry;
+   struct _KTHREAD* Thread;
+   struct _DISPATCHER_HEADER *Object;
+   struct _KWAIT_BLOCK* NextWaitBlock;
+   USHORT WaitKey;
+   USHORT WaitType;
+} KWAIT_BLOCK, *PKWAIT_BLOCK;
+
 /*
  * PURPOSE: Defines a delayed procedure call routine
  * NOTE:
@@ -229,6 +241,31 @@ typedef struct _WAIT_CONTEXT_BLOCK
   PKDPC BufferChainingDpc;
 } WAIT_CONTEXT_BLOCK, *PWAIT_CONTEXT_BLOCK;
 
+typedef enum _KBUGCHECK_CALLBACK_REASON {
+    KbCallbackInvalid,
+    KbCallbackReserved1,
+    KbCallbackSecondaryDumpData,
+    KbCallbackDumpIo,
+} KBUGCHECK_CALLBACK_REASON;
+
+typedef
+VOID
+(*PKBUGCHECK_REASON_CALLBACK_ROUTINE) (
+    IN KBUGCHECK_CALLBACK_REASON Reason,
+    IN PVOID Record, // This should be struct _KBUGCHECK_REASON_CALLBACK_RECORD* but minggw doesn't want to allow that...
+    IN OUT PVOID ReasonSpecificData,
+    IN ULONG ReasonSpecificDataLength
+    );
+
+typedef struct _KBUGCHECK_REASON_CALLBACK_RECORD {
+    LIST_ENTRY Entry;
+    PKBUGCHECK_REASON_CALLBACK_ROUTINE CallbackRoutine;
+    PUCHAR Component;
+    ULONG_PTR Checksum;
+    KBUGCHECK_CALLBACK_REASON Reason;
+    UCHAR State;
+} KBUGCHECK_REASON_CALLBACK_RECORD, *PKBUGCHECK_REASON_CALLBACK_RECORD;
+
 struct _KINTERRUPT;
 
 typedef BOOLEAN STDCALL_FUNC
@@ -246,6 +283,45 @@ typedef LONG FLOATL;
 
 typedef LONG FIX; /* fixed-point number */
 
+typedef struct _M128 {
+    ULONGLONG Low;
+    LONGLONG High;
+} M128, *PM128;
+
+typedef struct _KEXCEPTION_FRAME {
+    ULONG64 P1Home;
+    ULONG64 P2Home;
+    ULONG64 P3Home;
+    ULONG64 P4Home;
+    ULONG64 P5;
+    ULONG64 InitialStack;
+    M128 Xmm6;
+    M128 Xmm7;
+    M128 Xmm8;
+    M128 Xmm9;
+    M128 Xmm10;
+    M128 Xmm11;
+    M128 Xmm12;
+    M128 Xmm13;
+    M128 Xmm14;
+    M128 Xmm15;
+    ULONG64 TrapFrame;
+    ULONG64 CallbackStack;
+    ULONG64 OutputBuffer;
+    ULONG64 OutputLength;
+    UCHAR ExceptionRecord[64];
+    ULONG64 Fill1;
+    ULONG64 Rbp;
+    ULONG64 Rbx;
+    ULONG64 Rdi;
+    ULONG64 Rsi;
+    ULONG64 R12;
+    ULONG64 R13;
+    ULONG64 R14;
+    ULONG64 R15;
+    ULONG64 Return;
+} KEXCEPTION_FRAME, *PKEXCEPTION_FRAME;
+
 /* copied from W32API */
 typedef struct _KFLOATING_SAVE
 {

From 0f47167023286dd5122de00cfec8ecce7f6a9a1c Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Wed, 23 Jun 2004 22:32:24 +0000
Subject: [PATCH 068/356] Added Ke Stubs

svn path=/trunk/; revision=9851
---
 reactos/ntoskrnl/ke/apc.c           |  12 +++
 reactos/ntoskrnl/ke/catch.c         |  83 +++++++++++++++++++-
 reactos/ntoskrnl/ke/device.c        | 114 ++++++++++++++++++++++++++++
 reactos/ntoskrnl/ke/dpc.c           |  40 +++++++++-
 reactos/ntoskrnl/ke/error.c         |  24 ++++++
 reactos/ntoskrnl/ke/event.c         |  13 ++++
 reactos/ntoskrnl/ke/i386/gdt.c      |  41 ++++++++++
 reactos/ntoskrnl/ke/i386/thread.c   |   3 +
 reactos/ntoskrnl/ke/i386/usercall.c |  32 +++++++-
 reactos/ntoskrnl/ke/kthread.c       |  96 ++++++++++++++++++++++-
 reactos/ntoskrnl/ke/process.c       |  27 ++++++-
 reactos/ntoskrnl/ke/profile.c       |  53 +++++++++++++
 reactos/ntoskrnl/ke/spinlock.c      |  53 ++++++++++++-
 reactos/ntoskrnl/ke/timer.c         |  70 ++++++++++++++++-
 14 files changed, 654 insertions(+), 7 deletions(-)
 create mode 100644 reactos/ntoskrnl/ke/device.c
 create mode 100644 reactos/ntoskrnl/ke/profile.c

diff --git a/reactos/ntoskrnl/ke/apc.c b/reactos/ntoskrnl/ke/apc.c
index e8baa4e9bba..bb798bf1c87 100644
--- a/reactos/ntoskrnl/ke/apc.c
+++ b/reactos/ntoskrnl/ke/apc.c
@@ -50,6 +50,18 @@ VOID PsTerminateCurrentThread(NTSTATUS ExitStatus);
 
 /* FUNCTIONS *****************************************************************/
 
+/*
+ * @unimplemented
+ */
+STDCALL
+BOOLEAN
+KeAreApcsDisabled(
+	VOID
+	)
+{
+	UNIMPLEMENTED;
+}
+
 VOID KiRundownThread(VOID)
 /*
  * FUNCTION: 
diff --git a/reactos/ntoskrnl/ke/catch.c b/reactos/ntoskrnl/ke/catch.c
index f0c274790f7..d526002d5ee 100644
--- a/reactos/ntoskrnl/ke/catch.c
+++ b/reactos/ntoskrnl/ke/catch.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: catch.c,v 1.42 2004/05/07 05:12:10 royce Exp $
+/* $Id: catch.c,v 1.43 2004/06/23 22:31:51 ion Exp $
  *
  * PROJECT:              ReactOS kernel
  * FILE:                 ntoskrnl/ke/catch.c
@@ -216,6 +216,46 @@ ExRaiseStatus (IN NTSTATUS Status)
 }
 
 
+/*
+ * @unimplemented
+ */
+VOID
+STDCALL
+ExRaiseException (
+	PEXCEPTION_RECORD pExcptRec
+	)
+{
+	UNIMPLEMENTED;
+}
+/*
+ * @unimplemented
+ */
+VOID
+STDCALL
+ExRaiseHardError (
+	IN NTSTATUS ErrorStatus,
+	IN ULONG NumberOfParameters, 
+	IN PUNICODE_STRING UnicodeStringParameterMask OPTIONAL,
+	IN PVOID *Parameters, 
+	IN HARDERROR_RESPONSE_OPTION ResponseOption, 
+	OUT PHARDERROR_RESPONSE Response 
+	)
+{
+	UNIMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+BOOLEAN
+STDCALL
+ExSystemExceptionFilter()
+{
+	UNIMPLEMENTED;
+	return FALSE;
+}
+
 NTSTATUS STDCALL
 NtRaiseException (IN PEXCEPTION_RECORD ExceptionRecord,
 		  IN PCONTEXT Context,
@@ -229,6 +269,47 @@ NtRaiseException (IN PEXCEPTION_RECORD ExceptionRecord,
   return(STATUS_SUCCESS);
 }
 
+/*
+ * @unimplemented
+ */
+STDCALL
+BOOLEAN
+KeDeregisterBugCheckReasonCallback(
+    IN PKBUGCHECK_REASON_CALLBACK_RECORD CallbackRecord
+    )
+{
+	UNIMPLEMENTED;
+	return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+ULONG
+KeGetRecommendedSharedDataAlignment(
+	VOID
+	)
+{
+	UNIMPLEMENTED;
+	return 0;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+BOOLEAN
+KeRegisterBugCheckReasonCallback(
+    IN PKBUGCHECK_REASON_CALLBACK_RECORD CallbackRecord,
+    IN PKBUGCHECK_REASON_CALLBACK_ROUTINE CallbackRoutine,
+    IN KBUGCHECK_CALLBACK_REASON Reason,
+    IN PUCHAR Component
+    )
+{
+	UNIMPLEMENTED;
+	return FALSE;
+}
 
 /*
  * @implemented
diff --git a/reactos/ntoskrnl/ke/device.c b/reactos/ntoskrnl/ke/device.c
new file mode 100644
index 00000000000..0241046dfe2
--- /dev/null
+++ b/reactos/ntoskrnl/ke/device.c
@@ -0,0 +1,114 @@
+/* $Id: device.c,v 1.1 2004/06/23 22:31:51 ion Exp $
+ *
+ * FILE:            ntoskrnl/ke/profile.c
+ * PURPOSE:         Kernel Device/Settings Functions
+ * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
+ * UPDATE HISTORY:
+ *                  Created 23/06/04
+ */
+
+#include <ddk/ntddk.h>
+#include <internal/io.h>
+#include <internal/ps.h>
+#include <internal/pool.h>
+
+#define NDEBUG
+#include <internal/debug.h>
+
+/*
+ * @unimplemented
+ */
+STDCALL
+PVOID
+KeFindConfigurationEntry(
+    IN PVOID Unknown,
+    IN ULONG Class,
+    IN CONFIGURATION_TYPE Type,
+    IN PULONG RegKey
+)
+{
+	UNIMPLEMENTED;
+	return 0;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+PVOID
+KeFindConfigurationNextEntry(
+    IN PVOID Unknown,
+    IN ULONG Class,
+    IN CONFIGURATION_TYPE Type,
+    IN PULONG RegKey,
+    IN PVOID *NextLink
+)
+{
+	UNIMPLEMENTED;
+	return 0;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+VOID
+KeFlushEntireTb(
+    IN ULONGLONG Flag
+)
+{
+	UNIMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+STDCALL
+VOID
+KeSetDmaIoCoherency(
+    IN ULONG Coherency
+)
+{
+	UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+PKDEVICE_QUEUE_ENTRY
+KeRemoveByKeyDeviceQueueIfBusy (
+    IN PKDEVICE_QUEUE DeviceQueue,
+    IN ULONG SortKey
+    )
+{
+	UNIMPLEMENTED;
+	return 0;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+KAFFINITY
+KeQueryActiveProcessors (
+    VOID
+    )
+{
+	UNIMPLEMENTED;
+	return 0;
+}
+
+
+/*
+ * @unimplemented
+ */
+VOID
+__cdecl
+KeSaveStateForHibernate(
+    IN PVOID State
+)
+{
+	UNIMPLEMENTED;
+}
diff --git a/reactos/ntoskrnl/ke/dpc.c b/reactos/ntoskrnl/ke/dpc.c
index bdcbadbf177..df8388d5a63 100644
--- a/reactos/ntoskrnl/ke/dpc.c
+++ b/reactos/ntoskrnl/ke/dpc.c
@@ -18,7 +18,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dpc.c,v 1.30 2004/01/18 22:42:50 gdalsnes Exp $
+/* $Id: dpc.c,v 1.31 2004/06/23 22:31:51 ion Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -124,6 +124,30 @@ KiDispatchInterrupt(VOID)
    KeLowerIrql(oldlvl);
 }
 
+/*
+ * @unimplemented
+ */
+STDCALL
+VOID
+KeFlushQueuedDpcs(
+	VOID
+	)
+{
+	UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+VOID 
+KeIsExecutingDpc(
+	VOID
+)
+{
+	UNIMPLEMENTED;
+}
+
 /*
  * @implemented
  */
@@ -245,4 +269,18 @@ KeInitDpc(VOID)
    KeInitializeSpinLock(&DpcQueueLock);
 }
 
+/*
+ * @unimplemented
+ *
+STDCALL
+BOOLEAN
+KiIpiServiceRoutine(
+	IN PKTRAP_FRAME   		TrapFrame,
+	IN PKEXCEPTION_FRAME  	ExceptionFrame
+)
+{
+	UNIMPLEMENTED;
+	return FALSE;
+}*/
+
 /* EOF */
diff --git a/reactos/ntoskrnl/ke/error.c b/reactos/ntoskrnl/ke/error.c
index 8be023b7b4d..d5f473d8ac7 100644
--- a/reactos/ntoskrnl/ke/error.c
+++ b/reactos/ntoskrnl/ke/error.c
@@ -17,6 +17,30 @@
 
 /* FUNCTIONS ***************************************************************/
 
+/*
+ * @unimplemented
+ */
+STDCALL
+VOID
+KiCoprocessorError(
+    VOID
+)
+{
+	UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+VOID
+KiUnexpectedInterrupt(
+    VOID
+)
+{
+	UNIMPLEMENTED;
+}
+
 NTSTATUS STDCALL 
 NtRaiseHardError(IN NTSTATUS Status,
 		 ULONG Unknown2,
diff --git a/reactos/ntoskrnl/ke/event.c b/reactos/ntoskrnl/ke/event.c
index c71303f47b2..52546c6f66c 100644
--- a/reactos/ntoskrnl/ke/event.c
+++ b/reactos/ntoskrnl/ke/event.c
@@ -136,4 +136,17 @@ NTSTATUS STDCALL KePulseEvent (PKEVENT		Event,
    return ((NTSTATUS)ret);
 }
 
+/*
+ * @unimplemented
+ */
+STDCALL
+VOID
+KeSetEventBoostPriority(
+	IN PKEVENT Event,
+	IN PKTHREAD *Thread OPTIONAL
+)
+{
+	UNIMPLEMENTED;
+}
+
 /* EOF */
diff --git a/reactos/ntoskrnl/ke/i386/gdt.c b/reactos/ntoskrnl/ke/i386/gdt.c
index 413e9134fba..83d3e3d2374 100644
--- a/reactos/ntoskrnl/ke/i386/gdt.c
+++ b/reactos/ntoskrnl/ke/i386/gdt.c
@@ -165,6 +165,47 @@ l4:
 #endif
 }
 
+
+/*
+ * @unimplemented
+ */
+NTSTATUS
+KeI386FlatToGdtSelector(
+	IN ULONG	Base,
+	IN USHORT	Length,
+	IN USHORT	Selector
+)
+{
+	UNIMPLEMENTED;
+	return 0;
+}
+
+/*
+ * @unimplemented
+ */
+NTSTATUS 
+KeI386ReleaseGdtSelectors(
+	OUT PULONG SelArray,
+	IN ULONG NumOfSelectors
+)
+{
+	UNIMPLEMENTED;
+	return 0;
+}
+
+/*
+ * @unimplemented
+ */
+NTSTATUS
+KeI386AllocateGdtSelectors(
+	OUT PULONG SelArray,
+    IN ULONG NumOfSelectors
+)
+{
+	UNIMPLEMENTED;
+	return 0;
+}
+
 VOID 
 KeSetBaseGdtSelector(ULONG Entry,
 		     PVOID Base)
diff --git a/reactos/ntoskrnl/ke/i386/thread.c b/reactos/ntoskrnl/ke/i386/thread.c
index 03f0d2c774e..edf1b6b0838 100644
--- a/reactos/ntoskrnl/ke/i386/thread.c
+++ b/reactos/ntoskrnl/ke/i386/thread.c
@@ -195,4 +195,7 @@ Ke386InitThread(PKTHREAD Thread,
   return(STATUS_SUCCESS);
 }
 
+
+
+
 /* EOF */
diff --git a/reactos/ntoskrnl/ke/i386/usercall.c b/reactos/ntoskrnl/ke/i386/usercall.c
index 0d628760200..63bc42bd47a 100644
--- a/reactos/ntoskrnl/ke/i386/usercall.c
+++ b/reactos/ntoskrnl/ke/i386/usercall.c
@@ -1,4 +1,4 @@
-/* $Id: usercall.c,v 1.25 2003/07/11 01:23:15 royce Exp $
+/* $Id: usercall.c,v 1.26 2004/06/23 22:32:24 ion Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -124,4 +124,34 @@ KeAddSystemServiceTable (
     return TRUE;
 }
 
+/*
+ * @unimplemented
+ */
+STDCALL
+BOOLEAN
+KeRemoveSystemServiceTable(
+    IN PUCHAR Number
+)
+{
+	UNIMPLEMENTED;
+	return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+NTSTATUS
+KeUserModeCallback(
+    IN ULONG	FunctionID,
+    IN PVOID	InputBuffer,
+    IN ULONG	InputLength,
+    OUT PVOID	*OutputBuffer,
+    OUT PULONG	OutputLength
+)
+{
+	UNIMPLEMENTED;
+	return 0;
+}
+
 /* EOF */
diff --git a/reactos/ntoskrnl/ke/kthread.c b/reactos/ntoskrnl/ke/kthread.c
index f28a4dd76cc..01c13e9ffbd 100644
--- a/reactos/ntoskrnl/ke/kthread.c
+++ b/reactos/ntoskrnl/ke/kthread.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: kthread.c,v 1.46 2003/12/31 05:33:03 jfilby Exp $
+/* $Id: kthread.c,v 1.47 2004/06/23 22:31:51 ion Exp $
  *
  * FILE:            ntoskrnl/ke/kthread.c
  * PURPOSE:         Microkernel thread support
@@ -38,6 +38,24 @@
 
 /* FUNCTIONS *****************************************************************/
 
+/*
+ * @unimplemented
+ */
+STDCALL
+VOID
+KeCapturePersistentThreadState(
+	IN PVOID	CurrentThread,
+	IN ULONG	Setting1,
+	IN ULONG	Setting2,
+	IN ULONG	Setting3,
+	IN ULONG	Setting4,
+	IN ULONG	Setting5,
+	IN PVOID	ThreadState
+)
+{
+	UNIMPLEMENTED;
+}
+
 VOID
 KeFreeStackPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, 
 		PHYSICAL_ADDRESS PhysAddr, SWAPENTRY SwapEntry, BOOLEAN Dirty)
@@ -49,6 +67,19 @@ KeFreeStackPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address,
     }
 }
 
+/*
+ * @unimplemented
+ */
+STDCALL
+KPRIORITY
+KeQueryPriorityThread (
+    IN PKTHREAD Thread
+    )
+{
+	UNIMPLEMENTED;
+	return 0;
+}
+
 NTSTATUS 
 KeReleaseThread(PETHREAD Thread)
 /*
@@ -76,6 +107,19 @@ KeReleaseThread(PETHREAD Thread)
   return(STATUS_SUCCESS);
 }
 
+/*
+ * @unimplemented
+ */
+STDCALL
+BOOLEAN
+KeSetKernelStackSwapEnable(
+	IN BOOLEAN Enable
+	)
+{
+	UNIMPLEMENTED;
+	return FALSE;
+}
+
 VOID
 KeInitializeThread(PKPROCESS Process, PKTHREAD Thread, BOOLEAN First)
 /*
@@ -272,3 +316,53 @@ KeRescheduleThread()
 {
   PsDispatchThread(THREAD_STATE_READY);
 }
+
+/*
+ * @unimplemented
+ */
+STDCALL
+VOID
+KeRevertToUserAffinityThread(
+    VOID
+)
+{
+	UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+CCHAR
+KeSetIdealProcessorThread (
+	IN PKTHREAD Thread,
+	IN CCHAR Processor
+	)
+{
+	UNIMPLEMENTED;
+	return 0;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+VOID
+KeSetSystemAffinityThread(
+    IN KAFFINITY Affinity
+)
+{
+	UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+VOID 
+KeTerminateThread(
+	IN KPRIORITY   	 Increment  	 
+)
+{
+	UNIMPLEMENTED;
+}
diff --git a/reactos/ntoskrnl/ke/process.c b/reactos/ntoskrnl/ke/process.c
index eaa110ee5b0..2c73b114f9a 100644
--- a/reactos/ntoskrnl/ke/process.c
+++ b/reactos/ntoskrnl/ke/process.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: process.c,v 1.19 2004/03/09 21:49:53 dwelch Exp $
+/* $Id: process.c,v 1.20 2004/06/23 22:31:51 ion Exp $
  *
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/ke/process.c
@@ -117,4 +117,29 @@ KeDetachProcess (VOID)
    KeLowerIrql(oldlvl);
 }
 
+/*
+ * @unimplemented
+ */
+STDCALL
+VOID
+KeStackAttachProcess (
+    IN PKPROCESS Process,
+    OUT PRKAPC_STATE ApcState
+    )
+{
+	UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+VOID
+KeUnstackDetachProcess (
+    IN PRKAPC_STATE ApcState
+    )
+{
+	UNIMPLEMENTED;
+}
+
 /* EOF */
diff --git a/reactos/ntoskrnl/ke/profile.c b/reactos/ntoskrnl/ke/profile.c
new file mode 100644
index 00000000000..15b72ffb0a0
--- /dev/null
+++ b/reactos/ntoskrnl/ke/profile.c
@@ -0,0 +1,53 @@
+/* $Id: profile.c,v 1.1 2004/06/23 22:31:51 ion Exp $
+ *
+ * FILE:            ntoskrnl/ke/profile.c
+ * PURPOSE:         Kernel Profiling
+ * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
+ * UPDATE HISTORY:
+ *                  Created 23/06/04
+ */
+
+#include <ddk/ntddk.h>
+#include <internal/io.h>
+#include <internal/ps.h>
+#include <internal/pool.h>
+
+#define NDEBUG
+#include <internal/debug.h>
+
+/*
+ * @unimplemented
+ */
+STDCALL
+VOID
+KeProfileInterrupt(
+    PKTRAP_FRAME TrapFrame
+)
+{
+	UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+VOID
+KeProfileInterruptWithSource(
+	IN PKTRAP_FRAME   		TrapFrame,
+	IN KPROFILE_SOURCE		Source
+)
+{
+	UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+VOID
+KeSetProfileIrql(
+    IN KIRQL ProfileIrql
+)
+{
+	UNIMPLEMENTED;
+}
diff --git a/reactos/ntoskrnl/ke/spinlock.c b/reactos/ntoskrnl/ke/spinlock.c
index 3fef79b096c..b954fbbd750 100644
--- a/reactos/ntoskrnl/ke/spinlock.c
+++ b/reactos/ntoskrnl/ke/spinlock.c
@@ -1,4 +1,4 @@
-/* $Id: spinlock.c,v 1.20 2004/01/18 22:41:53 gdalsnes Exp $
+/* $Id: spinlock.c,v 1.21 2004/06/23 22:31:51 ion Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -55,6 +55,19 @@ KeSynchronizeExecution (PKINTERRUPT		Interrupt,
    return(ret);
 }
 
+/*
+ * @unimplemented
+ */
+STDCALL
+KIRQL
+KeAcquireInterruptSpinLock(
+    IN PKINTERRUPT Interrupt
+    )
+{
+	UNIMPLEMENTED;
+	return 0;
+}
+
 /*
  * @implemented
  */
@@ -98,6 +111,21 @@ KeAcquireSpinLockAtDpcLevel (PKSPIN_LOCK	SpinLock)
   KefAcquireSpinLockAtDpcLevel(SpinLock);
 }
 
+
+/*
+ * @unimplemented
+ */
+VOID
+FASTCALL
+KeAcquireInStackQueuedSpinLockAtDpcLevel(
+    IN PKSPIN_LOCK SpinLock,
+    IN PKLOCK_QUEUE_HANDLE LockHandle
+    )
+{
+	UNIMPLEMENTED;
+}
+
+
 #undef KefReleaseSpinLockFromDpcLevel
 
 /*
@@ -127,6 +155,17 @@ KeReleaseSpinLockFromDpcLevel (PKSPIN_LOCK	SpinLock)
   KefReleaseSpinLockFromDpcLevel(SpinLock);
 }
 
+/*
+ * @unimplemented
+ */
+VOID
+FASTCALL
+KeReleaseInStackQueuedSpinLockFromDpcLevel(
+    IN PKLOCK_QUEUE_HANDLE LockHandle
+    )
+{
+	UNIMPLEMENTED;
+}
 
 /*
  * @implemented
@@ -157,6 +196,18 @@ KiAcquireSpinLock(PKSPIN_LOCK SpinLock)
   }
 }
 
+/*
+ * @unimplemented
+ */
+STDCALL
+VOID
+KeReleaseInterruptSpinLock(
+	IN PKINTERRUPT Interrupt,
+	IN KIRQL OldIrql
+	)
+{
+	UNIMPLEMENTED;
+}
 
 /*
  * @implemented
diff --git a/reactos/ntoskrnl/ke/timer.c b/reactos/ntoskrnl/ke/timer.c
index a2a0947a441..bfb7ad2334a 100644
--- a/reactos/ntoskrnl/ke/timer.c
+++ b/reactos/ntoskrnl/ke/timer.c
@@ -1,4 +1,4 @@
-/* $Id: timer.c,v 1.73 2004/06/13 10:35:52 navaraf Exp $
+/* $Id: timer.c,v 1.74 2004/06/23 22:31:51 ion Exp $
  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
@@ -475,6 +475,33 @@ KeQueryTickCount(PLARGE_INTEGER TickCount)
   TickCount->QuadPart = KeTickCount;
 }
 
+/*
+ * @unimplemented
+ */
+STDCALL
+ULONG
+KeQueryRuntimeThread(
+	IN PKTHREAD Thread,
+	OUT PULONG UserTime
+	)
+{
+	UNIMPLEMENTED;
+	return 0;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+VOID
+KeSetTimeIncrement(
+    IN ULONG MaxIncrement,
+    IN ULONG MinIncrement
+)
+{
+	UNIMPLEMENTED;
+}
+
 /*
  * We enter this function at IRQL DISPATCH_LEVEL, and with the
  * TimerListLock held.
@@ -718,3 +745,44 @@ KiUpdateProcessThreadTime(VOID)
 
     KiReleaseSpinLock(&TimeLock);       
 } 
+
+/*
+ * @unimplemented
+ */
+VOID
+FASTCALL
+KeSetTimeUpdateNotifyRoutine(
+    IN PTIME_UPDATE_NOTIFY_ROUTINE NotifyRoutine
+    )
+{
+	UNIMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+STDCALL
+VOID
+KeUpdateRunTime(
+	IN PKTRAP_FRAME	TrapFrame
+)
+{
+	UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+STDCALL
+VOID 
+KeUpdateSystemTime(
+	IN PKTRAP_FRAME   	TrapFrame,
+	IN ULONG  			Increment
+)
+{
+	UNIMPLEMENTED;
+}
+
+/*EOF*/
+

From 5bcda093f3e76431a1b687d72f72945bd01092e9 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Wed, 23 Jun 2004 22:32:45 +0000
Subject: [PATCH 069/356] Added new files for Ke Stubs

svn path=/trunk/; revision=9852
---
 reactos/ntoskrnl/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/reactos/ntoskrnl/Makefile b/reactos/ntoskrnl/Makefile
index 1d2fc1e5be1..1e89359f57f 100644
--- a/reactos/ntoskrnl/Makefile
+++ b/reactos/ntoskrnl/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.127 2004/06/23 21:43:45 ion Exp $
+# $Id: Makefile,v 1.128 2004/06/23 22:32:45 ion Exp $
 #
 # ReactOS Operating System
 #
@@ -130,6 +130,7 @@ OBJECTS_KE = \
 	ke/catch.o \
 	ke/critical.o \
 	ke/dpc.o \
+        ke/device.o \
 	ke/error.o \
 	ke/event.o \
 	ke/kqueue.o \
@@ -137,6 +138,7 @@ OBJECTS_KE = \
 	ke/main.o \
 	ke/mutex.o \
 	ke/process.o \
+        ke/profile.o \
 	ke/queue.o \
 	ke/sem.o \
 	ke/spinlock.o \

From a3e366fdf99237d4b6829440231d07b5ad7e860f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Thu, 24 Jun 2004 07:19:57 +0000
Subject: [PATCH 070/356] Mirror PRKAPC_STATE found in
 ntoskrnl/include/internal/ps.h

svn path=/trunk/; revision=9853
---
 reactos/w32api/include/ddk/ntifs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reactos/w32api/include/ddk/ntifs.h b/reactos/w32api/include/ddk/ntifs.h
index 0621d83c693..a7697095f09 100644
--- a/reactos/w32api/include/ddk/ntifs.h
+++ b/reactos/w32api/include/ddk/ntifs.h
@@ -550,7 +550,7 @@ typedef struct _KAPC_STATE {
     BOOLEAN     KernelApcInProgress;
     BOOLEAN     KernelApcPending;
     BOOLEAN     UserApcPending;
-} KAPC_STATE, *PKAPC_STATE;
+} KAPC_STATE, *PKAPC_STATE, *__restrict PRKAPC_STATE;
 
 typedef struct _KGDTENTRY {
     USHORT LimitLow;

From 3a3a3cc0aa6de0b63e56f048fa3c4825f5d31771 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Thu, 24 Jun 2004 08:54:03 +0000
Subject: [PATCH 071/356] Fix line breaks.

svn path=/trunk/; revision=9854
---
 reactos/include/ntos/bootvid.h | 151 ++++++++++++++++-----------------
 1 file changed, 75 insertions(+), 76 deletions(-)

diff --git a/reactos/include/ntos/bootvid.h b/reactos/include/ntos/bootvid.h
index 7a5a1ec0af4..b7c7b729744 100755
--- a/reactos/include/ntos/bootvid.h
+++ b/reactos/include/ntos/bootvid.h
@@ -1,76 +1,75 @@
-#ifndef __INCLUDE_NTOS_BOOTVID_H
-#define __INCLUDE_NTOS_BOOTVID_H
-
-VOID
-STDCALL
-InbvAcquireDisplayOwnership(VOID);
-
-BOOLEAN
-STDCALL
-InbvCheckDisplayOwnership(VOID);
-
-BOOLEAN
-STDCALL
-InbvDisplayString(IN PCHAR String);
-
-VOID
-STDCALL
-InbvEnableBootDriver(IN BOOLEAN Enable);
-
-BOOLEAN
-STDCALL
-InbvEnableDisplayString(IN BOOLEAN Enable);
-
-VOID
-STDCALL
-InbvInstallDisplayStringFilter(IN PVOID Unknown);
-
-BOOLEAN
-STDCALL
-InbvIsBootDriverInstalled(VOID);
-
-VOID
-STDCALL
-InbvNotifyDisplayOwnershipLost(IN PVOID Callback);
-
-BOOLEAN
-STDCALL
-InbvResetDisplay(VOID);
-
-VOID
-STDCALL
-InbvSetScrollRegion(IN ULONG Left,
-  IN ULONG Top,
-  IN ULONG Width,
-  IN ULONG Height);
-
-VOID
-STDCALL
-InbvSetTextColor(IN ULONG Color);
-
-VOID
-STDCALL
-InbvSolidColorFill(IN ULONG Left,
-  IN ULONG Top,
-  IN ULONG Width,
-  IN ULONG Height,
-  IN ULONG Color);
-
-
-VOID
-STDCALL
-VidCleanUp(VOID);
-
-BOOLEAN
-STDCALL
-VidInitialize(VOID);
-
-BOOLEAN
-STDCALL
-VidResetDisplay(VOID);
-
-BOOLEAN
-STDCALL
-VidIsBootDriverInstalled(VOID);
-
-#endif /* __INCLUDE_NTOS_BOOTVID_H */
+#ifndef __INCLUDE_NTOS_BOOTVID_H
+#define __INCLUDE_NTOS_BOOTVID_H
+
+VOID
+STDCALL
+InbvAcquireDisplayOwnership(VOID);
+
+BOOLEAN
+STDCALL
+InbvCheckDisplayOwnership(VOID);
+
+BOOLEAN
+STDCALL
+InbvDisplayString(IN PCHAR String);
+
+VOID
+STDCALL
+InbvEnableBootDriver(IN BOOLEAN Enable);
+
+BOOLEAN
+STDCALL
+InbvEnableDisplayString(IN BOOLEAN Enable);
+
+VOID
+STDCALL
+InbvInstallDisplayStringFilter(IN PVOID Unknown);
+
+BOOLEAN
+STDCALL
+InbvIsBootDriverInstalled(VOID);
+
+VOID
+STDCALL
+InbvNotifyDisplayOwnershipLost(IN PVOID Callback);
+
+BOOLEAN
+STDCALL
+InbvResetDisplay(VOID);
+
+VOID
+STDCALL
+InbvSetScrollRegion(IN ULONG Left,
+  IN ULONG Top,
+  IN ULONG Width,
+  IN ULONG Height);
+
+VOID
+STDCALL
+InbvSetTextColor(IN ULONG Color);
+
+VOID
+STDCALL
+InbvSolidColorFill(IN ULONG Left,
+  IN ULONG Top,
+  IN ULONG Width,
+  IN ULONG Height,
+  IN ULONG Color);
+
+VOID
+STDCALL
+VidCleanUp(VOID);
+
+BOOLEAN
+STDCALL
+VidInitialize(VOID);
+
+BOOLEAN
+STDCALL
+VidResetDisplay(VOID);
+
+BOOLEAN
+STDCALL
+VidIsBootDriverInstalled(VOID);
+
+#endif /* __INCLUDE_NTOS_BOOTVID_H */

From a36e6dca3b76bb7352b62b01dd05a9d5c43f9bee Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Thu, 24 Jun 2004 08:54:41 +0000
Subject: [PATCH 072/356] Cosmetic fixes.

svn path=/trunk/; revision=9855
---
 reactos/w32api/include/ddk/ntddscsi.h | 86 +++++++++++++--------------
 reactos/w32api/include/ddk/ntddtape.h | 14 ++---
 2 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/reactos/w32api/include/ddk/ntddscsi.h b/reactos/w32api/include/ddk/ntddscsi.h
index 11629cbaa59..ec1a582bfbc 100644
--- a/reactos/w32api/include/ddk/ntddscsi.h
+++ b/reactos/w32api/include/ddk/ntddscsi.h
@@ -98,53 +98,53 @@ typedef struct _SCSI_PASS_THROUGH_DIRECT {
   UCHAR  Cdb[16];
 } SCSI_PASS_THROUGH_DIRECT, *PSCSI_PASS_THROUGH_DIRECT;
 
-typedef struct _SRB_IO_CONTROL { 
-  ULONG  HeaderLength; 
-  UCHAR  Signature[8]; 
-  ULONG  Timeout; 
-  ULONG  ControlCode; 
-  ULONG  ReturnCode; 
-  ULONG  Length; 
-} SRB_IO_CONTROL, *PSRB_IO_CONTROL; 
+typedef struct _SRB_IO_CONTROL {
+  ULONG  HeaderLength;
+  UCHAR  Signature[8];
+  ULONG  Timeout;
+  ULONG  ControlCode;
+  ULONG  ReturnCode;
+  ULONG  Length;
+} SRB_IO_CONTROL, *PSRB_IO_CONTROL;
 
 typedef struct _SCSI_ADDRESS {
-	ULONG  Length;
-	UCHAR  PortNumber;
-	UCHAR  PathId;
-	UCHAR  TargetId;
-	UCHAR  Lun;
+  ULONG  Length;
+  UCHAR  PortNumber;
+  UCHAR  PathId;
+  UCHAR  TargetId;
+  UCHAR  Lun;
 } SCSI_ADDRESS, *PSCSI_ADDRESS;
 
 typedef struct _SCSI_BUS_DATA {
-	UCHAR  NumberOfLogicalUnits;
-	UCHAR  InitiatorBusId;
-	ULONG  InquiryDataOffset;
+  UCHAR  NumberOfLogicalUnits;
+  UCHAR  InitiatorBusId;
+  ULONG  InquiryDataOffset;
 }SCSI_BUS_DATA, *PSCSI_BUS_DATA;
 
 typedef struct _SCSI_ADAPTER_BUS_INFO {
-	UCHAR  NumberOfBuses;
-	SCSI_BUS_DATA  BusData[1];
+  UCHAR  NumberOfBuses;
+  SCSI_BUS_DATA  BusData[1];
 } SCSI_ADAPTER_BUS_INFO, *PSCSI_ADAPTER_BUS_INFO;
 
 typedef struct _IO_SCSI_CAPABILITIES {
-	ULONG  Length;
-	ULONG  MaximumTransferLength;
-	ULONG  MaximumPhysicalPages;
-	ULONG  SupportedAsynchronousEvents;
-	ULONG  AlignmentMask;
-	BOOLEAN  TaggedQueuing;
-	BOOLEAN  AdapterScansDown;
-	BOOLEAN  AdapterUsesPio;
+  ULONG  Length;
+  ULONG  MaximumTransferLength;
+  ULONG  MaximumPhysicalPages;
+  ULONG  SupportedAsynchronousEvents;
+  ULONG  AlignmentMask;
+  BOOLEAN  TaggedQueuing;
+  BOOLEAN  AdapterScansDown;
+  BOOLEAN  AdapterUsesPio;
 } IO_SCSI_CAPABILITIES, *PIO_SCSI_CAPABILITIES;
 
 typedef struct _SCSI_INQUIRY_DATA {
-	UCHAR  PathId;
-	UCHAR  TargetId;
-	UCHAR  Lun;
-	BOOLEAN  DeviceClaimed;
-	ULONG  InquiryDataLength;
-	ULONG  NextInquiryDataOffset;
-	UCHAR  InquiryData[1];
+  UCHAR  PathId;
+  UCHAR  TargetId;
+  UCHAR  Lun;
+  BOOLEAN  DeviceClaimed;
+  ULONG  InquiryDataLength;
+  ULONG  NextInquiryDataOffset;
+  UCHAR  InquiryData[1];
 } SCSI_INQUIRY_DATA, *PSCSI_INQUIRY_DATA;
 
 #define SCSI_IOCTL_DATA_OUT               0
@@ -152,16 +152,16 @@ typedef struct _SCSI_INQUIRY_DATA {
 #define SCSI_IOCTL_DATA_UNSPECIFIED       2
 
 typedef struct _DUMP_POINTERS {
-	PADAPTER_OBJECT  AdapterObject;
-	PVOID  MappedRegisterBase;
-	PVOID  DumpData;
-	PVOID  CommonBufferVa;
-	LARGE_INTEGER  CommonBufferPa;
-	ULONG  CommonBufferSize;
-	BOOLEAN  AllocateCommonBuffers;
-	BOOLEAN  UseDiskDump;
-	UCHAR  Spare1[2];
-	PVOID  DeviceObject;
+  PADAPTER_OBJECT  AdapterObject;
+  PVOID  MappedRegisterBase;
+  PVOID  DumpData;
+  PVOID  CommonBufferVa;
+  LARGE_INTEGER  CommonBufferPa;
+  ULONG  CommonBufferSize;
+  BOOLEAN  AllocateCommonBuffers;
+  BOOLEAN  UseDiskDump;
+  UCHAR  Spare1[2];
+  PVOID  DeviceObject;
 } DUMP_POINTERS, *PDUMP_POINTERS;
 
 #ifdef __cplusplus
diff --git a/reactos/w32api/include/ddk/ntddtape.h b/reactos/w32api/include/ddk/ntddtape.h
index 1b3b0499098..61a50df2607 100644
--- a/reactos/w32api/include/ddk/ntddtape.h
+++ b/reactos/w32api/include/ddk/ntddtape.h
@@ -46,7 +46,7 @@ extern "C" {
 #define IOCTL_TAPE_GET_DRIVE_PARAMS     CTL_CODE(IOCTL_TAPE_BASE, 0x0005, METHOD_BUFFERED, FILE_READ_ACCESS)
 #define IOCTL_TAPE_GET_MEDIA_PARAMS     CTL_CODE(IOCTL_TAPE_BASE, 0x0007, METHOD_BUFFERED, FILE_READ_ACCESS)
 #define IOCTL_TAPE_GET_POSITION         CTL_CODE(IOCTL_TAPE_BASE, 0x0003, METHOD_BUFFERED, FILE_READ_ACCESS)
-#define IOCTL_TAPE_GET_STATUS           CTL_CODE(IOCTL_TAPE_BASE, 0x0009, METHOD_BUFFERED, FILE_READ_ACCESS )
+#define IOCTL_TAPE_GET_STATUS           CTL_CODE(IOCTL_TAPE_BASE, 0x0009, METHOD_BUFFERED, FILE_READ_ACCESS)
 
 #define IOCTL_TAPE_PREPARE              CTL_CODE(IOCTL_TAPE_BASE, 0x0001, METHOD_BUFFERED, FILE_READ_ACCESS)
 #define IOCTL_TAPE_SET_DRIVE_PARAMS     CTL_CODE(IOCTL_TAPE_BASE, 0x0006, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
@@ -56,19 +56,19 @@ extern "C" {
 
 
 typedef enum _TAPE_DRIVE_PROBLEM_TYPE {
-  TapeDriveProblemNone, 
+  TapeDriveProblemNone,
   TapeDriveReadWriteWarning,
-  TapeDriveReadWriteError, 
+  TapeDriveReadWriteError,
   TapeDriveReadWarning,
   TapeDriveWriteWarning,
   TapeDriveReadError,
-  TapeDriveWriteError, 
+  TapeDriveWriteError,
   TapeDriveHardwareError,
-  TapeDriveUnsupportedMedia, 
+  TapeDriveUnsupportedMedia,
   TapeDriveScsiConnectionError,
-  TapeDriveTimetoClean, 
+  TapeDriveTimetoClean,
   TapeDriveCleanDriveNow,
-  TapeDriveMediaLifeExpired, 
+  TapeDriveMediaLifeExpired,
   TapeDriveSnappedTape
 } TAPE_DRIVE_PROBLEM_TYPE;
 

From 87cc4ce95f662d3ed873fcae21518876014ede8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Thu, 24 Jun 2004 09:17:33 +0000
Subject: [PATCH 073/356] Create temp directory

svn path=/trunk/; revision=9856
---
 reactos/lib/syssetup/install.c | 61 +++++++++++++++++++++++++++++++++-
 1 file changed, 60 insertions(+), 1 deletion(-)

diff --git a/reactos/lib/syssetup/install.c b/reactos/lib/syssetup/install.c
index fd382d30ef1..048373e2e4f 100644
--- a/reactos/lib/syssetup/install.c
+++ b/reactos/lib/syssetup/install.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: install.c,v 1.12 2004/04/19 10:54:23 ekohl Exp $
+/* $Id: install.c,v 1.13 2004/06/24 09:17:33 gvg Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS system libraries
@@ -192,6 +192,62 @@ RestartDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
    return FALSE;
 }
 
+static VOID
+CreateTempDir(LPCWSTR VarName)
+{
+  WCHAR szTempDir[MAX_PATH];
+  WCHAR szBuffer[MAX_PATH];
+  DWORD dwLength;
+  HKEY hKey;
+
+  if (RegOpenKeyExW (HKEY_LOCAL_MACHINE,
+		     L"SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment",
+		     0,
+		     KEY_ALL_ACCESS,
+		     &hKey))
+    {
+      DebugPrint("Error: %lu\n", GetLastError());
+      return;
+    }
+
+  /* Get temp dir */
+  dwLength = MAX_PATH * sizeof(WCHAR);
+  if (RegQueryValueExW (hKey,
+			VarName,
+			NULL,
+			NULL,
+			(LPBYTE)szBuffer,
+			&dwLength))
+    {
+      DebugPrint("Error: %lu\n", GetLastError());
+      RegCloseKey (hKey);
+      return;
+    }
+
+  /* Expand it */
+  if (!ExpandEnvironmentStringsW (szBuffer,
+				  szTempDir,
+				  MAX_PATH))
+    {
+      DebugPrint("Error: %lu\n", GetLastError());
+      RegCloseKey (hKey);
+      return;
+    }
+
+  /* Create profiles directory */
+  if (!CreateDirectoryW (szTempDir, NULL))
+    {
+      if (GetLastError () != ERROR_ALREADY_EXISTS)
+	{
+	  DebugPrint("Error: %lu\n", GetLastError());
+	  RegCloseKey (hKey);
+	  return;
+	}
+    }
+
+  RegCloseKey (hKey);
+}
+
 DWORD STDCALL
 InstallReactOS (HINSTANCE hInstance)
 {
@@ -284,6 +340,9 @@ InstallReactOS (HINSTANCE hInstance)
   RtlFreeSid (AdminSid);
   RtlFreeSid (DomainSid);
 
+  CreateTempDir(L"TEMP");
+  CreateTempDir(L"TMP");
+
 #if 1
   InstallWizard ();
 #endif

From 008c89dfcef7a032f9dc5a955f752f817452575c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Thu, 24 Jun 2004 09:19:52 +0000
Subject: [PATCH 074/356] Remove duplicate "All Users" path component

svn path=/trunk/; revision=9857
---
 reactos/bootdata/hivesft.inf | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/reactos/bootdata/hivesft.inf b/reactos/bootdata/hivesft.inf
index d186b82b6cc..45877bbccb1 100644
--- a/reactos/bootdata/hivesft.inf
+++ b/reactos/bootdata/hivesft.inf
@@ -12,12 +12,12 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CurrentBuildNumber",0x00020
 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders","Desktop",0x00020000,"%ALLUSERSPROFILE%\Desktop"
 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders","Common AppData",0x00020000,"%ALLUSERSPROFILE%\Application Data"
 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders","Common Programs",0x00020000,"%ALLUSERSPROFILE%\Start Menu\Programs"
-HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders","Common Documents",0x00020000,"%ALLUSERSPROFILE%\All Users\Documents"
-HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders","Common Desktop",0x00020000,"%ALLUSERSPROFILE%\All Users\Desktop"
-HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders","Common Start Menu",0x00020000,"%ALLUSERSPROFILE%\All Users\Start Menu"
-HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders","CommonPictures",0x00020000,"%ALLUSERSPROFILE%\All Users\Documents\My Pictures"
-HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders","CommonMusic",0x00020000,"%ALLUSERSPROFILE%\All Users\Documents\My Music"
-HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders","CommonVideo",0x00020000,"%ALLUSERSPROFILE%\All Users\Documents\My Videos"
+HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders","Common Documents",0x00020000,"%ALLUSERSPROFILE%\Documents"
+HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders","Common Desktop",0x00020000,"%ALLUSERSPROFILE%\Desktop"
+HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders","Common Start Menu",0x00020000,"%ALLUSERSPROFILE%\Start Menu"
+HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders","CommonPictures",0x00020000,"%ALLUSERSPROFILE%\Documents\My Pictures"
+HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders","CommonMusic",0x00020000,"%ALLUSERSPROFILE%\Documents\My Music"
+HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders","CommonVideo",0x00020000,"%ALLUSERSPROFILE%\Documents\My Videos"
 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders","Common Favorites",0x00020000,"%ALLUSERSPROFILE%\Favorites"
 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders","Common Startup",0x00020000,"%ALLUSERSPROFILE%\Start Menu\Programs\Startup"
 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders","Common Administrative Tools",0x00020000,"%ALLUSERSPROFILE%\Start Menu\Programs\Administrative Tools"

From 3977da5dc6c154521575e33eda65a8c4a8345fdb Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Thu, 24 Jun 2004 09:44:06 +0000
Subject: [PATCH 075/356] 1.fixed return type for NtSystemParametersInfo() 2.
 added missing definitions (NT5.1+) for SystemParametersInfo() to w32api

svn path=/trunk/; revision=9858
---
 reactos/include/win32k/ntuser.h     |  2 +-
 reactos/subsys/win32k/ntuser/misc.c | 10 ++--------
 reactos/w32api/include/winuser.h    | 19 +++++++++++++++++++
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/reactos/include/win32k/ntuser.h b/reactos/include/win32k/ntuser.h
index 7b81cad034c..dff98382f37 100644
--- a/reactos/include/win32k/ntuser.h
+++ b/reactos/include/win32k/ntuser.h
@@ -1538,7 +1538,7 @@ STDCALL
 NtUserSwitchDesktop(
   HDESK hDesktop);
 
-DWORD
+BOOL
 STDCALL
 NtUserSystemParametersInfo(
   UINT uiAction,
diff --git a/reactos/subsys/win32k/ntuser/misc.c b/reactos/subsys/win32k/ntuser/misc.c
index 7bf91eb4b1d..a0b1f75dea9 100644
--- a/reactos/subsys/win32k/ntuser/misc.c
+++ b/reactos/subsys/win32k/ntuser/misc.c
@@ -1,4 +1,4 @@
-/* $Id: misc.c,v 1.79 2004/06/20 00:45:36 navaraf Exp $
+/* $Id: misc.c,v 1.80 2004/06/24 09:44:06 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -17,12 +17,6 @@
 /* registered Logon process */
 PW32PROCESS LogonProcess = NULL;
 
-/* FIXME - not yet defined in w32api :( */
-#define SPI_GETFOCUSBORDERWIDTH	(8206)
-#define SPI_SETFOCUSBORDERWIDTH	(8207)
-#define SPI_GETFOCUSBORDERHEIGHT	(8208)
-#define SPI_SETFOCUSBORDERHEIGHT	(8209)
-
 void W32kRegisterPrimitiveMessageQueue() {
   extern PUSER_MESSAGE_QUEUE pmPrimitiveMessageQueue;
   if( !pmPrimitiveMessageQueue ) {
@@ -819,7 +813,7 @@ IntSystemParametersInfo(
 /*
  * @implemented
  */
-DWORD
+BOOL
 STDCALL
 NtUserSystemParametersInfo(
   UINT uiAction,
diff --git a/reactos/w32api/include/winuser.h b/reactos/w32api/include/winuser.h
index 51ef91b698a..bb7c528ad53 100644
--- a/reactos/w32api/include/winuser.h
+++ b/reactos/w32api/include/winuser.h
@@ -1249,6 +1249,25 @@ extern "C" {
 #define SPI_SETSELECTIONFADE 0x1015
 #define SPI_SETTOOLTIPANIMATION 0x1017
 #define SPI_SETTOOLTIPFADE 0x1019
+#if (WINVER >= 0x0501)
+#define FE_FONTSMOOTHINGORIENTATIONBGR 0
+#define FE_FONTSMOOTHINGORIENTATIONRGB 1
+#define FE_FONTSMOOTHINGSTANDARD 1
+#define FE_FONTSMOOTHINGCLEARTYPE 2
+#define FE_FONTSMOOTHINGDOCKING 32768
+#define SPI_GETMOUSECLICKLOCKTIME 8200
+#define SPI_SETMOUSECLICKLOCKTIME 8201
+#define SPI_GETFONTSMOOTHINGTYPE 8202
+#define SPI_SETFONTSMOOTHINGTYPE 8203
+#define SPI_GETFONTSMOOTHINGCONTRAST 8204
+#define SPI_SETFONTSMOOTHINGCONTRAST 8205
+#define SPI_GETFOCUSBORDERWIDTH 8206
+#define SPI_SETFOCUSBORDERWIDTH 8207
+#define SPI_GETFOCUSBORDERHEIGHT 8208
+#define SPI_SETFOCUSBORDERHEIGHT 8209
+#define SPI_GETFONTSMOOTHINGORIENTATION 8210
+#define SPI_SETFONTSMOOTHINGORIENTATION 8211
+#endif
 #endif
 
 #define SPIF_UPDATEINIFILE 1

From 9f03850ba77c77457613e257dbd8488756b26caf Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Thu, 24 Jun 2004 11:02:56 +0000
Subject: [PATCH 076/356] fixed redefinition of some constants for
 SystemParametersInfo()

svn path=/trunk/; revision=9859
---
 reactos/lib/user32/windows/draw.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/reactos/lib/user32/windows/draw.c b/reactos/lib/user32/windows/draw.c
index bfd06096ead..1981bc1a5c6 100644
--- a/reactos/lib/user32/windows/draw.c
+++ b/reactos/lib/user32/windows/draw.c
@@ -40,11 +40,6 @@
 #include <user32.h>
 #include <debug.h>
 
-/* FIXME - not yet defined in w32api :( */
-#define SPI_GETFOCUSBORDERWIDTH	(8206)
-#define SPI_SETFOCUSBORDERWIDTH	(8207)
-#define SPI_GETFOCUSBORDERHEIGHT	(8208)
-#define SPI_SETFOCUSBORDERHEIGHT	(8209)
 #define COLOR_MENUHILIGHT	(29)
 #define COLOR_MENUBAR	(30)
 

From 41871db16ccbba03ec84c9ecdf79f867592f766f Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Thu, 24 Jun 2004 14:48:33 +0000
Subject: [PATCH 077/356] Create user specific temp directory.

svn path=/trunk/; revision=9860
---
 reactos/lib/userenv/setup.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/reactos/lib/userenv/setup.c b/reactos/lib/userenv/setup.c
index 835a8945124..753afd1c02f 100644
--- a/reactos/lib/userenv/setup.c
+++ b/reactos/lib/userenv/setup.c
@@ -1,4 +1,4 @@
-/* $Id: setup.c,v 1.4 2004/03/13 20:49:07 ekohl Exp $ 
+/* $Id: setup.c,v 1.5 2004/06/24 14:48:33 ekohl Exp $ 
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -36,7 +36,9 @@ DefaultUserDirectories[] =
   {FALSE, L"Start Menu"},
   {FALSE, L"Start Menu\\Programs"},
   {FALSE, L"Start Menu\\Programs\\Startup"},
-
+  {TRUE,  L"Local Settings"},
+  {TRUE,  L"Local Settings\\Application Data"},
+  {FALSE, L"Local Settings\\Temp"},
   {FALSE, NULL}
 };
 

From 4e65adddb3b3ea7909c0a0f51080cf88e2c62142 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Thu, 24 Jun 2004 14:49:26 +0000
Subject: [PATCH 078/356] Set user specific TEMP and TMP environment variables.

svn path=/trunk/; revision=9861
---
 reactos/bootdata/hivedef.inf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/reactos/bootdata/hivedef.inf b/reactos/bootdata/hivedef.inf
index 15fcec6375b..e75c736219b 100644
--- a/reactos/bootdata/hivedef.inf
+++ b/reactos/bootdata/hivedef.inf
@@ -11,6 +11,8 @@ HKCU,"Control Panel\International",,0x00000012
 HKCU,"Control Panel\International","Locale",0x00000000,"0409"
 
 HKCU,"Environment",,0x00000012
+HKCU,"Environment","TEMP",0x00020000,"%USERPROFILE%\Local Settings\Temp"
+HKCU,"Environment","TMP",0x00020000,"%USERPROFILE%\Local Settings\Temp"
 
 HKCU,"SOFTWARE",,0x00000012
 HKCU,"SOFTWARE\Microsoft",,0x00000012

From 730275c8004825c922883eb16556f8ad3d690605 Mon Sep 17 00:00:00 2001
From: "KJK::Hyperion" <hackbunny@reactos.org>
Date: Thu, 24 Jun 2004 19:30:21 +0000
Subject: [PATCH 079/356] Moved common SEH code to Rtl

svn path=/trunk/; revision=9862
---
 reactos/lib/rtl/exception.c | 68 +++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 reactos/lib/rtl/exception.c

diff --git a/reactos/lib/rtl/exception.c b/reactos/lib/rtl/exception.c
new file mode 100644
index 00000000000..cffc56a92e7
--- /dev/null
+++ b/reactos/lib/rtl/exception.c
@@ -0,0 +1,68 @@
+/* $Id: exception.c,v 1.1 2004/06/24 19:30:21 hyperion Exp $
+ *
+ * COPYRIGHT:         See COPYING in the top level directory
+ * PROJECT:           ReactOS kernel
+ * PURPOSE:           User-mode exception support
+ * FILE:              lib/ntdll/rtl/exception.c
+ * PROGRAMERS:        David Welch <welch@cwcom.net>
+ *                    Skywing <skywing@valhallalegends.com>
+ *                    KJK::Hyperion <noog@libero.it>
+ * UPDATES:           Skywing, 09/11/2003: Implemented RtlRaiseException and
+ *                    KiUserRaiseExceptionDispatcher.
+ *                    KJK::Hyperion, 22/06/2004: Moved the common parts here,
+ *                    left the user-mode code in ntdll
+ */
+
+/* INCLUDES *****************************************************************/
+
+#include <ddk/ntddk.h>
+#include <windows.h>
+#include <string.h>
+#include <napi/teb.h>
+
+#define NDEBUG
+#include <debug.h>
+
+/* FUNCTIONS ***************************************************************/
+
+/* implemented in except.s */
+VOID
+RtlpCaptureContext(PCONTEXT Context);
+
+/*
+ * @implemented
+ */
+VOID STDCALL
+RtlRaiseException(PEXCEPTION_RECORD ExceptionRecord)
+{
+  CONTEXT Context;
+  NTSTATUS Status;
+
+  RtlpCaptureContext(&Context);
+
+  ExceptionRecord->ExceptionAddress = (PVOID)(*(((PULONG)Context.Ebp)+1));
+  Context.ContextFlags = CONTEXT_FULL;
+
+  Status = ZwRaiseException(ExceptionRecord, &Context, TRUE);
+  RtlRaiseException(ExceptionRecord);
+  RtlRaiseStatus(Status); /* If we get to this point, something is seriously wrong... */
+}
+
+/*
+ * @implemented
+ */
+VOID STDCALL
+RtlRaiseStatus(NTSTATUS Status)
+{
+  EXCEPTION_RECORD ExceptionRecord;
+
+  DPRINT("RtlRaiseStatus(Status 0x%.08x)\n", Status);
+
+  ExceptionRecord.ExceptionCode    = Status;
+  ExceptionRecord.ExceptionRecord  = NULL;
+  ExceptionRecord.NumberParameters = 0;
+  ExceptionRecord.ExceptionFlags   = EXCEPTION_NONCONTINUABLE;
+  RtlRaiseException (& ExceptionRecord);
+}
+
+/* EOF */

From f477796b79e6fdd3b399b806310752e45dffcdcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Thu, 24 Jun 2004 19:43:49 +0000
Subject: [PATCH 080/356] Fix some forgotten EngCreateBitmap() calls

svn path=/trunk/; revision=9863
---
 reactos/subsys/win32k/eng/misc.c        | 4 ++--
 reactos/subsys/win32k/eng/mouse.c       | 8 ++++----
 reactos/subsys/win32k/objects/objconv.c | 5 +++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/reactos/subsys/win32k/eng/misc.c b/reactos/subsys/win32k/eng/misc.c
index 497dad6e487..624d2a3ee69 100644
--- a/reactos/subsys/win32k/eng/misc.c
+++ b/reactos/subsys/win32k/eng/misc.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: misc.c,v 1.6 2004/05/10 17:07:17 weiden Exp $ */
+/* $Id: misc.c,v 1.7 2004/06/24 19:43:48 gvg Exp $ */
 #include <w32k.h>
 
 BOOL STDCALL
@@ -63,7 +63,7 @@ IntEngEnter(PINTENG_ENTER_LEAVE EnterLeave,
     Width = DIB_GetDIBWidthBytes(BitmapSize.cx, BitsPerFormat(DestObj->iBitmapFormat));
     EnterLeave->OutputBitmap = EngCreateBitmap(BitmapSize, Width,
                                                DestObj->iBitmapFormat,
-                                               BMF_NOZEROINIT, NULL);
+                                               BMF_TOPDOWN | BMF_NOZEROINIT, NULL);
     *OutputObj = (SURFOBJ *) AccessUserObject((ULONG) EnterLeave->OutputBitmap);
 
     EnterLeave->DestRect.left = 0;
diff --git a/reactos/subsys/win32k/eng/mouse.c b/reactos/subsys/win32k/eng/mouse.c
index 070329475ba..f4cb162aa09 100644
--- a/reactos/subsys/win32k/eng/mouse.c
+++ b/reactos/subsys/win32k/eng/mouse.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: mouse.c,v 1.72 2004/06/20 12:34:17 navaraf Exp $
+/* $Id: mouse.c,v 1.73 2004/06/24 19:43:48 gvg Exp $
  *
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Mouse
@@ -554,7 +554,7 @@ EngSetPointerShape(
       memcpy(Bits, psoColor->pvBits, psoColor->cjBits);
 
       ppdev->PointerColorSurface = (HSURF)EngCreateBitmap(Size,
-         psoColor->lDelta, psoColor->iBitmapFormat, 0, Bits);
+         psoColor->lDelta, psoColor->iBitmapFormat, BMF_TOPDOWN, Bits);
    }
    else
    {
@@ -571,7 +571,7 @@ EngSetPointerShape(
       memcpy(Bits, psoMask->pvBits, psoMask->cjBits);
 
       ppdev->PointerMaskSurface = (HSURF)EngCreateBitmap(Size,
-         psoMask->lDelta, psoMask->iBitmapFormat, 0, Bits);
+         psoMask->lDelta, psoMask->iBitmapFormat, BMF_TOPDOWN, Bits);
    }
 
    /*
@@ -626,7 +626,7 @@ EngSetPointerShape(
       }
 
       ppdev->PointerSaveSurface = (HSURF)EngCreateBitmap(
-         Size, lDelta, pso->iBitmapFormat, BMF_NOZEROINIT, NULL);
+         Size, lDelta, pso->iBitmapFormat, BMF_TOPDOWN | BMF_NOZEROINIT, NULL);
    }
 
    IntShowMousePointer(ppdev, pso);
diff --git a/reactos/subsys/win32k/objects/objconv.c b/reactos/subsys/win32k/objects/objconv.c
index 0ffea950ff9..442d7bfc1ca 100644
--- a/reactos/subsys/win32k/objects/objconv.c
+++ b/reactos/subsys/win32k/objects/objconv.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: objconv.c,v 1.19 2004/06/23 07:31:22 gvg Exp $ */
+/* $Id: objconv.c,v 1.20 2004/06/24 19:43:49 gvg Exp $ */
 #include <w32k.h>
 
 HBITMAP FASTCALL BitmapToSurf(PBITMAPOBJ BitmapObj, HDEV GDIDevice)
@@ -31,7 +31,8 @@ HBITMAP FASTCALL BitmapToSurf(PBITMAPOBJ BitmapObj, HDEV GDIDevice)
     {
     BitmapHandle = EngCreateBitmap(Size, BitmapObj->dib->dsBm.bmWidthBytes,
                                    BitmapFormat(BitmapObj->dib->dsBm.bmBitsPixel, BI_RGB),
-                                   BMF_TOPDOWN, BitmapObj->dib->dsBm.bmBits);
+                                   BitmapObj->dib->dsBmih.biHeight < 0 ? BMF_TOPDOWN : 0,
+                                   BitmapObj->dib->dsBm.bmBits);
     }
   else
     {

From 27080109867cd4a51b0c9af4218aaf970b489d4d Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Thu, 24 Jun 2004 21:03:56 +0000
Subject: [PATCH 081/356] Added Ke Stub Prototypes

svn path=/trunk/; revision=9864
---
 reactos/ntoskrnl/include/internal/ps.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/reactos/ntoskrnl/include/internal/ps.h b/reactos/ntoskrnl/include/internal/ps.h
index 78247d95e6a..97b93dc8f5d 100644
--- a/reactos/ntoskrnl/include/internal/ps.h
+++ b/reactos/ntoskrnl/include/internal/ps.h
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: ps.h,v 1.59 2004/06/23 21:02:16 ion Exp $
+/* $Id: ps.h,v 1.60 2004/06/24 21:03:56 ion Exp $
  *
  * FILE:            ntoskrnl/ke/kthread.c
  * PURPOSE:         Process manager definitions
@@ -510,13 +510,13 @@ STDCALL
 VOID
 KeStackAttachProcess (
     IN PKPROCESS Process,
-    OUT PRKAPC_STATE ApcState
+    OUT PKAPC_STATE ApcState
     );
 
 STDCALL
 VOID
 KeUnstackDetachProcess (
-    IN PRKAPC_STATE ApcState
+    IN PKAPC_STATE ApcState
     );
 
 VOID STDCALL PiDeleteProcess(PVOID ObjectBody);

From 7fa558788216d79fd9f5148f1f7af5fd0f47e7b2 Mon Sep 17 00:00:00 2001
From: "KJK::Hyperion" <hackbunny@reactos.org>
Date: Fri, 25 Jun 2004 01:41:20 +0000
Subject: [PATCH 082/356] Committed in the hope CVS will shut the hell up and
 let me branch. Still part of the SEH work

svn path=/trunk/; revision=9865
---
 reactos/lib/rtl/i386/except.s    | 291 +++++++++++++++++++++
 reactos/lib/rtl/i386/exception.c | 417 +++++++++++++++++++++++++++++++
 2 files changed, 708 insertions(+)
 create mode 100644 reactos/lib/rtl/i386/except.s
 create mode 100644 reactos/lib/rtl/i386/exception.c

diff --git a/reactos/lib/rtl/i386/except.s b/reactos/lib/rtl/i386/except.s
new file mode 100644
index 00000000000..bd0a78f235a
--- /dev/null
+++ b/reactos/lib/rtl/i386/except.s
@@ -0,0 +1,291 @@
+/* $Id: except.s,v 1.1 2004/06/25 01:41:19 hyperion Exp $
+ *
+ * COPYRIGHT:         See COPYING in the top level directory
+ * PROJECT:           ReactOS kernel
+ * PURPOSE:           User-mode exception support for IA-32
+ * FILE:              lib/ntdll/rtl/i386/except.s
+ * PROGRAMER:         Casper S. Hornstrup (chorns@users.sourceforge.net)
+ * NOTES:             This file is shared with ntoskrnl/rtl/i386/except.s.
+ *                    Please keep them in sync.
+ */
+
+#define EXCEPTION_UNWINDING		0x02
+
+#define EREC_FLAGS				0x04
+
+#define ExceptionContinueExecution 0
+#define ExceptionContinueSearch    1
+#define ExceptionNestedException   2
+#define ExceptionCollidedUnwind    3
+
+.globl _RtlpExecuteHandlerForException
+.globl _RtlpExecuteHandlerForUnwind
+
+#define CONTEXT_FLAGS	0x00
+#define CONTEXT_SEGGS	0x8C
+#define CONTEXT_SEGFS	0x90
+#define CONTEXT_SEGES	0x94
+#define CONTEXT_SEGDS	0x98
+#define CONTEXT_EDI		0x9C
+#define CONTEXT_ESI		0xA0
+#define CONTEXT_EBX		0xA4
+#define CONTEXT_EDX		0xA8
+#define CONTEXT_ECX		0xAC
+#define CONTEXT_EAX		0xB0
+#define CONTEXT_EBP		0xB4
+#define CONTEXT_EIP		0xB8
+#define CONTEXT_SEGCS	0xBC
+#define CONTEXT_EFLAGS	0xC0
+#define CONTEXT_ESP		0xC4
+#define CONTEXT_SEGSS	0xC8
+
+
+#define RCC_CONTEXT		0x08
+
+// EAX = value to print
+_do_debug:
+	pushal
+	pushl	%eax
+	call	_AsmDebug@4
+	popal
+	ret
+
+#ifndef __NTOSKRNL__
+
+//
+// VOID
+// RtlpCaptureContext(PCONTEXT pContext);
+//
+// Parameters:
+//   [ESP+08h] - PCONTEXT_X86 pContext
+// Registers:
+//   None
+// Returns:
+//   Nothing
+// Notes:
+//   Grabs the current CPU context.
+.globl _RtlpCaptureContext
+_RtlpCaptureContext:
+	pushl   %ebp
+    movl	%esp, %ebp
+	movl	RCC_CONTEXT(%ebp), %edx		// EDX = Address of context structure
+
+	cld
+	pushf
+	pop		%eax
+	movl	%eax, CONTEXT_EFLAGS(%edx)
+	xorl	%eax, %eax
+	movl	%eax, CONTEXT_EAX(%edx)
+	movl	%eax, CONTEXT_EBX(%edx)
+	movl	%eax, CONTEXT_ECX(%edx)
+	movl	%eax, CONTEXT_EDX(%edx)
+	movl	%eax, CONTEXT_ESI(%edx)
+	movl	%eax, CONTEXT_EDI(%edx)
+	movl	%cs, %eax
+	movl	%eax, CONTEXT_SEGCS(%edx)
+	movl	%ds, %eax
+	movl	%eax, CONTEXT_SEGDS(%edx)
+	movl	%es, %eax
+	movl	%eax, CONTEXT_SEGES(%edx)
+	movl	%fs, %eax
+	movl	%eax, CONTEXT_SEGFS(%edx)
+	movl	%gs, %eax
+	movl	%eax, CONTEXT_SEGGS(%edx)
+	movl	%ss, %eax
+	movl	%eax, CONTEXT_SEGSS(%edx)
+
+	//
+	// STACK LAYOUT: - (ESP to put in context structure)
+	//               - RETURN ADDRESS OF CALLER OF CALLER
+	//               - EBP OF CALLER OF CALLER
+	//                 ...
+	//               - RETURN ADDRESS OF CALLER
+	//               - EBP OF CALLER
+	//                 ...
+	//
+
+	// Get return address of the caller of the caller of this function
+	movl	%ebp, %ebx
+	//movl	4(%ebx), %eax			// EAX = return address of caller
+	movl	(%ebx), %ebx			// EBX = EBP of caller
+
+	movl	4(%ebx), %eax			// EAX = return address of caller of caller
+	movl	(%ebx), %ebx			// EBX = EBP of caller of caller
+
+	movl	%eax, CONTEXT_EIP(%edx)	// EIP = return address of caller of caller
+	movl	%ebx, CONTEXT_EBP(%edx)	// EBP = EBP of caller of caller
+	addl	$8, %ebx
+	movl	%ebx, CONTEXT_ESP(%edx)	// ESP = EBP of caller of caller + 8
+
+    movl	%ebp, %esp
+    popl	%ebp
+    ret
+
+#endif /* !__NTOSKRNL__ */
+
+#define REH_ERECORD		0x08
+#define REH_RFRAME		0x0C
+#define REH_CONTEXT		0x10
+#define REH_DCONTEXT	0x14
+#define REH_EROUTINE	0x18
+
+// Parameters:
+//   None
+// Registers:
+//   [EBP+08h] - PEXCEPTION_RECORD ExceptionRecord
+//   [EBP+0Ch] - PEXCEPTION_REGISTRATION RegistrationFrame
+//   [EBP+10h] - PVOID Context
+//   [EBP+14h] - PVOID DispatcherContext
+//   [EBP+18h] - PEXCEPTION_HANDLER ExceptionRoutine
+//   EDX       - Address of protecting exception handler
+// Returns:
+//   EXCEPTION_DISPOSITION
+// Notes:
+//   Setup the protecting exception handler and call the exception
+//   handler in the right context.
+_RtlpExecuteHandler:
+	pushl    %ebp
+    movl     %esp, %ebp
+    pushl    REH_RFRAME(%ebp)
+
+    pushl    %edx
+    pushl    %fs:0x0
+    movl     %esp, %fs:0x0
+
+    // Prepare to call the exception handler
+    pushl    REH_DCONTEXT(%ebp)
+    pushl    REH_CONTEXT(%ebp)
+    pushl    REH_RFRAME(%ebp)
+    pushl    REH_ERECORD(%ebp)
+
+    // Now call the exception handler
+    movl     REH_EROUTINE(%ebp), %eax
+    call    *%eax
+
+	cmpl	$-1, %fs:0x0
+	jne		.reh_stack_looks_ok
+
+	// This should not happen
+	pushl	0
+	pushl	0
+	pushl	0
+	pushl	0
+	call	_RtlAssert@16
+
+.reh_loop:
+	jmp	.reh_loop
+
+.reh_stack_looks_ok:
+    movl     %fs:0x0, %esp
+
+    // Return to the 'front-end' for this function
+    popl     %fs:0x0
+    movl     %ebp, %esp
+    popl     %ebp
+    ret
+
+
+#define REP_ERECORD     0x04
+#define REP_RFRAME      0x08
+#define REP_CONTEXT     0x0C
+#define REP_DCONTEXT    0x10
+
+// Parameters:
+//   [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord
+//   [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame
+//   [ESP+0Ch] - PCONTEXT Context
+//   [ESP+10h] - PVOID DispatcherContext
+// Registers:
+//   None
+// Returns:
+//   EXCEPTION_DISPOSITION
+// Notes:
+//    This exception handler protects the exception handling
+//    mechanism by detecting nested exceptions.
+_RtlpExceptionProtector:
+    movl     $ExceptionContinueSearch, %eax
+    movl     REP_ERECORD(%esp), %ecx
+    testl    $EXCEPTION_UNWINDING, EREC_FLAGS(%ecx)
+    jnz      .rep_end
+
+    // Unwinding is not taking place, so return ExceptionNestedException
+
+    // Set DispatcherContext field to the exception registration for the
+    // exception handler that executed when a nested exception occurred
+    movl     REP_DCONTEXT(%esp), %ecx
+    movl     REP_RFRAME(%esp), %eax
+    movl     %eax, (%ecx)
+    movl     $ExceptionNestedException, %eax
+
+.rep_end:
+    ret
+
+
+// Parameters:
+//   [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord
+//   [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame
+//   [ESP+0Ch] - PCONTEXT Context
+//   [ESP+10h] - PVOID DispatcherContext
+//   [ESP+14h] - PEXCEPTION_HANDLER ExceptionHandler
+// Registers:
+//   None
+// Returns:
+//   EXCEPTION_DISPOSITION
+// Notes:
+//   Front-end
+_RtlpExecuteHandlerForException:
+    movl     $_RtlpExceptionProtector, %edx
+    jmp      _RtlpExecuteHandler
+
+
+#define RUP_ERECORD     0x04
+#define RUP_RFRAME      0x08
+#define RUP_CONTEXT     0x0C
+#define RUP_DCONTEXT    0x10
+
+// Parameters:
+//   [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord
+//   [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame
+//   [ESP+0Ch] - PCONTEXT Context
+//   [ESP+10h] - PVOID DispatcherContext
+// Registers:
+//   None
+// Returns:
+//   EXCEPTION_DISPOSITION
+// Notes:
+//    This exception handler protects the exception handling
+//    mechanism by detecting collided unwinds.
+_RtlpUnwindProtector:
+    movl     $ExceptionContinueSearch, %eax
+    movl     %ecx, RUP_ERECORD(%esp)
+    testl    $EXCEPTION_UNWINDING, EREC_FLAGS(%ecx)
+    jz       .rup_end
+
+    // Unwinding is taking place, so return ExceptionCollidedUnwind
+
+    movl     RUP_RFRAME(%esp), %ecx
+    movl     RUP_DCONTEXT(%esp), %edx
+
+    // Set DispatcherContext field to the exception registration for the
+    // exception handler that executed when a collision occurred
+    movl     RUP_RFRAME(%ecx), %eax
+    movl     %eax, (%edx)
+    movl     $ExceptionCollidedUnwind, %eax
+
+.rup_end:
+    ret
+
+
+// Parameters:
+//   [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord
+//   [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame
+//   [ESP+0Ch] - PCONTEXT Context
+//   [ESP+10h] - PVOID DispatcherContext
+//   [ESP+14h] - PEXCEPTION_HANDLER ExceptionHandler
+// Registers:
+//   None
+// Returns:
+//   EXCEPTION_DISPOSITION
+_RtlpExecuteHandlerForUnwind:
+    movl     $_RtlpUnwindProtector, %edx
+    jmp      _RtlpExecuteHandler
diff --git a/reactos/lib/rtl/i386/exception.c b/reactos/lib/rtl/i386/exception.c
new file mode 100644
index 00000000000..ea80bc90a4a
--- /dev/null
+++ b/reactos/lib/rtl/i386/exception.c
@@ -0,0 +1,417 @@
+/* $Id: exception.c,v 1.1 2004/06/25 01:41:20 hyperion Exp $
+ *
+ * COPYRIGHT:         See COPYING in the top level directory
+ * PROJECT:           ReactOS kernel
+ * PURPOSE:           User-mode exception support for IA-32
+ * FILE:              lib/ntdll/rtl/i386/exception.c
+ * PROGRAMER:         Casper S. Hornstrup (chorns@users.sourceforge.net)
+ */
+
+/* INCLUDES *****************************************************************/
+
+#include <ddk/ntddk.h>
+#include <windows.h>
+#include <string.h>
+
+//#define NDEBUG
+#include <debug.h>
+
+/* FUNCTIONS ***************************************************************/
+
+/* Implemented in except.s */
+
+VOID
+RtlpCaptureContext(PCONTEXT pContext);
+
+#define SehpGetStackLimits(StackBase, StackLimit) \
+{ \
+	(*(StackBase)) = NtCurrentTeb()->Tib->StackBase; \
+	(*(StackLimit)) = NtCurrentTeb()->Tib->StackLimit; \
+}
+
+#define SehpGetExceptionList() \
+	(PEXCEPTION_REGISTRATION)(NtCurrentTeb()->Tib.ExceptionList)
+
+#define SehpSetExceptionList(NewExceptionList) \
+	NtCurrentTeb()->Tib.ExceptionList = (PVOID)(NewExceptionList)
+
+VOID STDCALL
+AsmDebug(ULONG Value)
+{
+  DbgPrint("Value 0x%.08x\n", Value);
+}
+
+
+/* Declare a few prototypes for the functions in except.s */
+
+EXCEPTION_DISPOSITION
+RtlpExecuteHandlerForException(
+  PEXCEPTION_RECORD ExceptionRecord,
+  PEXCEPTION_REGISTRATION RegistrationFrame,
+  PCONTEXT Context,
+  PVOID DispatcherContext,
+  PEXCEPTION_HANDLER ExceptionHandler);
+
+EXCEPTION_DISPOSITION
+RtlpExecuteHandlerForUnwind(
+  PEXCEPTION_RECORD ExceptionRecord,
+  PEXCEPTION_REGISTRATION RegistrationFrame,
+  PCONTEXT Context,
+  PVOID DispatcherContext,
+  PEXCEPTION_HANDLER ExceptionHandler);
+
+
+#ifndef NDEBUG
+
+VOID RtlpDumpExceptionRegistrations(VOID)
+{
+  PEXCEPTION_REGISTRATION Current;
+
+  DbgPrint("Dumping exception registrations:\n");
+
+  Current = SehpGetExceptionList();
+
+  if ((ULONG_PTR)Current != -1)
+  {
+    while ((ULONG_PTR)Current != -1)
+    {
+      DbgPrint("   (0x%08X)   HANDLER (0x%08X)\n", Current, Current->handler);
+      Current = Current->prev;
+    }
+    DbgPrint("   End-Of-List\n");
+  } else {
+    DbgPrint("   No exception registrations exists.\n");
+  }
+}
+
+#endif /* NDEBUG */
+
+ULONG
+RtlpDispatchException(IN PEXCEPTION_RECORD  ExceptionRecord,
+	IN PCONTEXT  Context)
+{
+  PEXCEPTION_REGISTRATION RegistrationFrame;
+  DWORD DispatcherContext;
+  DWORD ReturnValue;
+
+  DPRINT("RtlpDispatchException()\n");
+
+#ifndef NDEBUG
+  RtlpDumpExceptionRegistrations();
+#endif /* NDEBUG */
+
+  RegistrationFrame = SehpGetExceptionList();
+ 
+  DPRINT("RegistrationFrame is 0x%X\n", RegistrationFrame);
+
+  while ((ULONG_PTR)RegistrationFrame != -1)
+  {
+    EXCEPTION_RECORD ExceptionRecord2;
+    DWORD Temp = 0;
+    //PVOID RegistrationFrameEnd = (PVOID)RegistrationFrame + 8;
+
+    // Make sure the registration frame is located within the stack
+
+    DPRINT("Error checking\n");
+#if 0
+    if (Teb->Tib.StackBase > RegistrationFrameEnd)
+    {
+      DPRINT("Teb->Tib.StackBase (0x%.08x) > RegistrationFrameEnd (0x%.08x)\n",
+        Teb->Tib.StackBase, RegistrationFrameEnd);
+      ExceptionRecord->ExceptionFlags |= EXCEPTION_STACK_INVALID;
+      return ExceptionContinueExecution;
+    }
+    // FIXME: Stack top, correct?
+    if (Teb->Tib.StackLimit < RegistrationFrameEnd)
+    {
+      DPRINT("Teb->Tib.StackLimit (0x%.08x) > RegistrationFrameEnd (0x%.08x)\n",
+        Teb->Tib.StackLimit, RegistrationFrameEnd);
+      ExceptionRecord->ExceptionFlags |= EXCEPTION_STACK_INVALID;
+      return ExceptionContinueExecution;
+    }
+ 
+    // Make sure stack is DWORD aligned
+    if ((ULONG_PTR)RegistrationFrame & 3)
+    {
+      DPRINT("RegistrationFrameEnd (0x%.08x) is not DWORD aligned.\n",
+        RegistrationFrameEnd);
+      ExceptionRecord->ExceptionFlags |= EXCEPTION_STACK_INVALID;
+      return ExceptionContinueExecution;
+    }
+#endif
+
+#if 0
+    /* FIXME: */
+    if (someFlag)
+      RtlpLogLastExceptionDisposition( hLog, retValue );
+#endif
+
+    DPRINT("Calling handler at 0x%X\n", RegistrationFrame->handler);
+    DPRINT("ExceptionRecord 0x%X\n", ExceptionRecord);
+    DPRINT("RegistrationFrame 0x%X\n", RegistrationFrame);
+    DPRINT("Context 0x%X\n", Context);
+    DPRINT("&DispatcherContext 0x%X\n", &DispatcherContext);
+
+    ReturnValue = RtlpExecuteHandlerForException(
+      ExceptionRecord,
+      RegistrationFrame,
+      Context,
+      &DispatcherContext,
+      RegistrationFrame->handler);
+#ifdef DEBUG
+    DPRINT("Exception handler said 0x%X\n", ReturnValue);
+	DPRINT("RegistrationFrame == 0x%.08x\n", RegistrationFrame);
+	{
+		PULONG sp = (PULONG)((PVOID)RegistrationFrame - 0x08);
+		DPRINT("StandardESP == 0x%.08x\n", sp[0]);
+		DPRINT("Exception Pointers == 0x%.08x\n", sp[1]);
+		DPRINT("PrevFrame == 0x%.08x\n", sp[2]);
+		DPRINT("Handler == 0x%.08x\n", sp[3]);
+		DPRINT("ScopeTable == 0x%.08x\n", sp[4]);
+		DPRINT("TryLevel == 0x%.08x\n", sp[5]);
+		DPRINT("EBP == 0x%.08x\n", sp[6]);
+	}
+#endif
+    if (RegistrationFrame == NULL)
+    {
+      ExceptionRecord->ExceptionFlags &= ~EXCEPTION_NESTED_CALL;  // Turn off flag
+    }
+
+    if (ReturnValue == ExceptionContinueExecution)
+    {
+      DPRINT("ReturnValue == ExceptionContinueExecution\n");
+      if (ExceptionRecord->ExceptionFlags & EXCEPTION_NONCONTINUABLE)
+      {
+        DPRINT("(ExceptionRecord->ExceptionFlags & EXCEPTION_NONCONTINUABLE) == TRUE\n");
+
+        ExceptionRecord2.ExceptionRecord = ExceptionRecord;
+        ExceptionRecord2.ExceptionCode = STATUS_NONCONTINUABLE_EXCEPTION;
+        ExceptionRecord2.ExceptionFlags = EXCEPTION_NONCONTINUABLE;
+        ExceptionRecord2.NumberParameters = 0;
+        RtlRaiseException(&ExceptionRecord2);
+      }
+      else
+      {
+        /* Copy the (possibly changed) context back to the trap frame and return */
+        ZwContinue(Context, FALSE);
+        return ExceptionContinueExecution;
+      }
+    }
+    else if (ReturnValue == ExceptionContinueSearch)
+    {
+      DPRINT("ReturnValue == ExceptionContinueSearch\n");
+
+      /* Nothing to do here */
+    }
+    else if (ReturnValue == ExceptionNestedException)
+    {
+      DPRINT("ReturnValue == ExceptionNestedException\n");
+
+      ExceptionRecord->ExceptionFlags |= EXCEPTION_EXIT_UNWIND;
+      if (DispatcherContext > Temp)
+	  {
+          Temp = DispatcherContext;
+	  }
+    }
+    else /* if (ReturnValue == ExceptionCollidedUnwind) */
+    {
+      DPRINT("ReturnValue == ExceptionCollidedUnwind or unknown\n");
+
+      ExceptionRecord2.ExceptionRecord = ExceptionRecord;
+      ExceptionRecord2.ExceptionCode = STATUS_INVALID_DISPOSITION;
+      ExceptionRecord2.ExceptionFlags = EXCEPTION_NONCONTINUABLE;
+      ExceptionRecord2.NumberParameters = 0;
+      RtlRaiseException(&ExceptionRecord2);
+    }
+
+    RegistrationFrame = RegistrationFrame->prev;  // Go to previous frame
+  }
+ 
+  /* No exception handler will handle this exception */
+
+  DPRINT("RtlpDispatchException(): Return ExceptionContinueExecution\n");
+
+  return ExceptionContinueExecution;  
+}
+
+
+/*
+ * @implemented
+ */
+VOID STDCALL
+RtlUnwind(PEXCEPTION_REGISTRATION RegistrationFrame,
+  PVOID ReturnAddress,
+  PEXCEPTION_RECORD ExceptionRecord,
+  DWORD EaxValue)
+{
+  PEXCEPTION_REGISTRATION ERHead;
+  PEXCEPTION_RECORD pExceptRec;
+  EXCEPTION_RECORD TempER;    
+  CONTEXT Context;
+
+  DPRINT("RtlUnwind(). RegistrationFrame 0x%X\n", RegistrationFrame);
+
+#ifndef NDEBUG
+  RtlpDumpExceptionRegistrations();
+#endif /* NDEBUG */
+
+  ERHead = SehpGetExceptionList();
+ 
+  DPRINT("ERHead is 0x%X\n", ERHead);
+
+  if (ExceptionRecord == NULL) // The normal case
+  {
+	DPRINT("ExceptionRecord == NULL (normal)\n");
+
+    pExceptRec = &TempER;
+    pExceptRec->ExceptionFlags = 0;
+    pExceptRec->ExceptionCode = STATUS_UNWIND;
+    pExceptRec->ExceptionRecord = NULL;
+    pExceptRec->ExceptionAddress = ReturnAddress;
+    pExceptRec->ExceptionInformation[0] = 0;
+  }
+  else
+  {
+    pExceptRec = ExceptionRecord;
+  }
+
+  if (RegistrationFrame)
+    pExceptRec->ExceptionFlags |= EXCEPTION_UNWINDING;
+  else
+    pExceptRec->ExceptionFlags |= (EXCEPTION_UNWINDING|EXCEPTION_EXIT_UNWIND);
+
+#ifndef NDEBUG
+  DPRINT("ExceptionFlags == 0x%x:\n", pExceptRec->ExceptionFlags);
+  if (pExceptRec->ExceptionFlags & EXCEPTION_UNWINDING)
+  {
+	  DPRINT("  * EXCEPTION_UNWINDING (0x%x)\n", EXCEPTION_UNWINDING);
+  }
+  if (pExceptRec->ExceptionFlags & EXCEPTION_EXIT_UNWIND)
+  {
+	  DPRINT("  * EXCEPTION_EXIT_UNWIND (0x%x)\n", EXCEPTION_EXIT_UNWIND);
+  }
+#endif /* NDEBUG */
+
+  Context.ContextFlags =
+    (CONTEXT_i386 | CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS);
+
+  RtlpCaptureContext(&Context);
+
+  DPRINT("Context.Eip = 0x%.08x\n", Context.Eip);
+  DPRINT("Context.Ebp = 0x%.08x\n", Context.Ebp);
+  DPRINT("Context.Esp = 0x%.08x\n", Context.Esp);
+
+  Context.Esp += 0x10;
+  Context.Eax = EaxValue;
+ 
+  // Begin traversing the list of EXCEPTION_REGISTRATION
+  while ((ULONG_PTR)ERHead != -1)
+  {
+    EXCEPTION_RECORD er2;
+ 
+    DPRINT("ERHead 0x%X\n", ERHead);
+
+    if (ERHead == RegistrationFrame)
+    {
+      DPRINT("Continueing execution\n");
+      ZwContinue(&Context, FALSE);
+      return;
+    }
+    else
+    {
+      // If there's an exception frame, but it's lower on the stack
+      // than the head of the exception list, something's wrong!
+      if (RegistrationFrame && (RegistrationFrame <= ERHead))
+      {
+        DPRINT("The exception frame is bad\n");
+
+        // Generate an exception to bail out
+        er2.ExceptionRecord = pExceptRec;
+        er2.NumberParameters = 0;
+        er2.ExceptionCode = STATUS_INVALID_UNWIND_TARGET;
+        er2.ExceptionFlags = EXCEPTION_NONCONTINUABLE;    
+ 
+        RtlRaiseException(&er2);
+      }
+    }
+ 
+#if 0
+    Stack = ERHead + sizeof(EXCEPTION_REGISTRATION);
+    if ( (Teb->Tib.StackBase <= (PVOID)ERHead )      // Make sure that ERHead
+      && (Teb->Tib.->StackLimit >= (PVOID)Stack )      // is in range, and a multiple
+      && (0 == ((ULONG_PTR)ERHead & 3)) )         // of 4 (i.e., sane)
+#else
+    if (1)
+#endif
+    {
+      PEXCEPTION_REGISTRATION NewERHead;
+      PEXCEPTION_REGISTRATION pCurrExceptReg;
+      EXCEPTION_DISPOSITION ReturnValue;
+  
+      DPRINT("Executing handler at 0x%X for unwind\n", ERHead->handler);
+
+      ReturnValue = RtlpExecuteHandlerForUnwind(
+        pExceptRec,
+        ERHead,
+        &Context,
+        &NewERHead,
+        ERHead->handler);
+ 
+      DPRINT("Handler at 0x%X returned 0x%X\n", ERHead->handler, ReturnValue);
+
+      if (ReturnValue != ExceptionContinueSearch)
+      {
+        if (ReturnValue != ExceptionCollidedUnwind)
+        {
+          DPRINT("Bad return value\n");
+
+          er2.ExceptionRecord = pExceptRec;
+          er2.NumberParameters = 0;
+          er2.ExceptionCode = STATUS_INVALID_DISPOSITION;
+          er2.ExceptionFlags = EXCEPTION_NONCONTINUABLE;    
+ 
+          RtlRaiseException(&er2);
+        }
+        else
+        {
+          ERHead = NewERHead;
+        }
+      }
+ 
+      pCurrExceptReg = ERHead;
+      ERHead = ERHead->prev;
+
+      DPRINT("New ERHead is 0x%X\n", ERHead);
+
+      DPRINT("Setting exception registration at 0x%X as current\n",
+        RegistrationFrame->prev);
+
+      // Unlink the exception handler
+      SehpSetExceptionList(RegistrationFrame->prev);
+    }
+    else // The stack looks goofy! Raise an exception to bail out
+    {
+      DPRINT("Bad stack\n");
+
+      er2.ExceptionRecord = pExceptRec;
+      er2.NumberParameters = 0;
+      er2.ExceptionCode = STATUS_BAD_STACK;
+      er2.ExceptionFlags = EXCEPTION_NONCONTINUABLE;    
+ 
+      RtlRaiseException(&er2);
+    }
+  }
+ 
+  // If we get here, we reached the end of the EXCEPTION_REGISTRATION list.
+  // This shouldn't happen normally.
+
+  DPRINT("Ran out of exception registrations. RegistrationFrame is (0x%X)\n",
+    RegistrationFrame);
+
+  if ((ULONG_PTR)RegistrationFrame == -1)
+    ZwContinue(&Context, FALSE);
+  else
+    NtRaiseException(pExceptRec, &Context, 0);
+}
+
+/* EOF */

From 07420e3dd3eb4905f3faef49b262fe21f24c08a2 Mon Sep 17 00:00:00 2001
From: "KJK::Hyperion" <hackbunny@reactos.org>
Date: Fri, 25 Jun 2004 03:38:51 +0000
Subject: [PATCH 083/356] Moved common SEH routines to Rtl, removed very wrong
 RtlUnwind implementation from ntoskrnl

svn path=/trunk/; revision=9868
---
 reactos/lib/ntdll/rtl/i386/except.s    | 291 ----------------
 reactos/lib/ntdll/rtl/i386/exception.c | 446 -------------------------
 reactos/ntoskrnl/rtl/i386/except.s     | 291 ----------------
 3 files changed, 1028 deletions(-)
 delete mode 100755 reactos/lib/ntdll/rtl/i386/except.s
 delete mode 100755 reactos/lib/ntdll/rtl/i386/exception.c
 delete mode 100755 reactos/ntoskrnl/rtl/i386/except.s

diff --git a/reactos/lib/ntdll/rtl/i386/except.s b/reactos/lib/ntdll/rtl/i386/except.s
deleted file mode 100755
index c37bf5ffd30..00000000000
--- a/reactos/lib/ntdll/rtl/i386/except.s
+++ /dev/null
@@ -1,291 +0,0 @@
-/* $Id: except.s,v 1.3 2003/05/07 18:45:56 ekohl Exp $
- *
- * COPYRIGHT:         See COPYING in the top level directory
- * PROJECT:           ReactOS kernel
- * PURPOSE:           User-mode exception support for IA-32
- * FILE:              lib/ntdll/rtl/i386/except.s
- * PROGRAMER:         Casper S. Hornstrup (chorns@users.sourceforge.net)
- * NOTES:             This file is shared with ntoskrnl/rtl/i386/except.s.
- *                    Please keep them in sync.
- */
-
-#define EXCEPTION_UNWINDING		0x02
-
-#define EREC_FLAGS				0x04
-
-#define ExceptionContinueExecution 0
-#define ExceptionContinueSearch    1
-#define ExceptionNestedException   2
-#define ExceptionCollidedUnwind    3
-
-.globl _RtlpExecuteHandlerForException
-.globl _RtlpExecuteHandlerForUnwind
-
-#define CONTEXT_FLAGS	0x00
-#define CONTEXT_SEGGS	0x8C
-#define CONTEXT_SEGFS	0x90
-#define CONTEXT_SEGES	0x94
-#define CONTEXT_SEGDS	0x98
-#define CONTEXT_EDI		0x9C
-#define CONTEXT_ESI		0xA0
-#define CONTEXT_EBX		0xA4
-#define CONTEXT_EDX		0xA8
-#define CONTEXT_ECX		0xAC
-#define CONTEXT_EAX		0xB0
-#define CONTEXT_EBP		0xB4
-#define CONTEXT_EIP		0xB8
-#define CONTEXT_SEGCS	0xBC
-#define CONTEXT_EFLAGS	0xC0
-#define CONTEXT_ESP		0xC4
-#define CONTEXT_SEGSS	0xC8
-
-
-#define RCC_CONTEXT		0x08
-
-// EAX = value to print
-_do_debug:
-	pushal
-	pushl	%eax
-	call	_AsmDebug@4
-	popal
-	ret
-
-#ifndef __NTOSKRNL__
-
-//
-// VOID
-// RtlpCaptureContext(PCONTEXT pContext);
-//
-// Parameters:
-//   [ESP+08h] - PCONTEXT_X86 pContext
-// Registers:
-//   None
-// Returns:
-//   Nothing
-// Notes:
-//   Grabs the current CPU context.
-.globl _RtlpCaptureContext
-_RtlpCaptureContext:
-	pushl   %ebp
-    movl	%esp, %ebp
-	movl	RCC_CONTEXT(%ebp), %edx		// EDX = Address of context structure
-
-	cld
-	pushf
-	pop		%eax
-	movl	%eax, CONTEXT_EFLAGS(%edx)
-	xorl	%eax, %eax
-	movl	%eax, CONTEXT_EAX(%edx)
-	movl	%eax, CONTEXT_EBX(%edx)
-	movl	%eax, CONTEXT_ECX(%edx)
-	movl	%eax, CONTEXT_EDX(%edx)
-	movl	%eax, CONTEXT_ESI(%edx)
-	movl	%eax, CONTEXT_EDI(%edx)
-	movl	%cs, %eax
-	movl	%eax, CONTEXT_SEGCS(%edx)
-	movl	%ds, %eax
-	movl	%eax, CONTEXT_SEGDS(%edx)
-	movl	%es, %eax
-	movl	%eax, CONTEXT_SEGES(%edx)
-	movl	%fs, %eax
-	movl	%eax, CONTEXT_SEGFS(%edx)
-	movl	%gs, %eax
-	movl	%eax, CONTEXT_SEGGS(%edx)
-	movl	%ss, %eax
-	movl	%eax, CONTEXT_SEGSS(%edx)
-
-	//
-	// STACK LAYOUT: - (ESP to put in context structure)
-	//               - RETURN ADDRESS OF CALLER OF CALLER
-	//               - EBP OF CALLER OF CALLER
-	//                 ...
-	//               - RETURN ADDRESS OF CALLER
-	//               - EBP OF CALLER
-	//                 ...
-	//
-
-	// Get return address of the caller of the caller of this function
-	movl	%ebp, %ebx
-	//movl	4(%ebx), %eax			// EAX = return address of caller
-	movl	(%ebx), %ebx			// EBX = EBP of caller
-
-	movl	4(%ebx), %eax			// EAX = return address of caller of caller
-	movl	(%ebx), %ebx			// EBX = EBP of caller of caller
-
-	movl	%eax, CONTEXT_EIP(%edx)	// EIP = return address of caller of caller
-	movl	%ebx, CONTEXT_EBP(%edx)	// EBP = EBP of caller of caller
-	addl	$8, %ebx
-	movl	%ebx, CONTEXT_ESP(%edx)	// ESP = EBP of caller of caller + 8
-
-    movl	%ebp, %esp
-    popl	%ebp
-    ret
-
-#endif /* !__NTOSKRNL__ */
-
-#define REH_ERECORD		0x08
-#define REH_RFRAME		0x0C
-#define REH_CONTEXT		0x10
-#define REH_DCONTEXT	0x14
-#define REH_EROUTINE	0x18
-
-// Parameters:
-//   None
-// Registers:
-//   [EBP+08h] - PEXCEPTION_RECORD ExceptionRecord
-//   [EBP+0Ch] - PEXCEPTION_REGISTRATION RegistrationFrame
-//   [EBP+10h] - PVOID Context
-//   [EBP+14h] - PVOID DispatcherContext
-//   [EBP+18h] - PEXCEPTION_HANDLER ExceptionRoutine
-//   EDX       - Address of protecting exception handler
-// Returns:
-//   EXCEPTION_DISPOSITION
-// Notes:
-//   Setup the protecting exception handler and call the exception
-//   handler in the right context.
-_RtlpExecuteHandler:
-	pushl    %ebp
-    movl     %esp, %ebp
-    pushl    REH_RFRAME(%ebp)
-
-    pushl    %edx
-    pushl    %fs:0x0
-    movl     %esp, %fs:0x0
-
-    // Prepare to call the exception handler
-    pushl    REH_DCONTEXT(%ebp)
-    pushl    REH_CONTEXT(%ebp)
-    pushl    REH_RFRAME(%ebp)
-    pushl    REH_ERECORD(%ebp)
-
-    // Now call the exception handler
-    movl     REH_EROUTINE(%ebp), %eax
-    call    *%eax
-
-	cmpl	$-1, %fs:0x0
-	jne		.reh_stack_looks_ok
-
-	// This should not happen
-	pushl	0
-	pushl	0
-	pushl	0
-	pushl	0
-	call	_RtlAssert@16
-
-.reh_loop:
-	jmp	.reh_loop
-
-.reh_stack_looks_ok:
-    movl     %fs:0x0, %esp
-
-    // Return to the 'front-end' for this function
-    popl     %fs:0x0
-    movl     %ebp, %esp
-    popl     %ebp
-    ret
-
-
-#define REP_ERECORD     0x04
-#define REP_RFRAME      0x08
-#define REP_CONTEXT     0x0C
-#define REP_DCONTEXT    0x10
-
-// Parameters:
-//   [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord
-//   [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame
-//   [ESP+0Ch] - PCONTEXT Context
-//   [ESP+10h] - PVOID DispatcherContext
-// Registers:
-//   None
-// Returns:
-//   EXCEPTION_DISPOSITION
-// Notes:
-//    This exception handler protects the exception handling
-//    mechanism by detecting nested exceptions.
-_RtlpExceptionProtector:
-    movl     $ExceptionContinueSearch, %eax
-    movl     REP_ERECORD(%esp), %ecx
-    testl    $EXCEPTION_UNWINDING, EREC_FLAGS(%ecx)
-    jnz      .rep_end
-
-    // Unwinding is not taking place, so return ExceptionNestedException
-
-    // Set DispatcherContext field to the exception registration for the
-    // exception handler that executed when a nested exception occurred
-    movl     REP_DCONTEXT(%esp), %ecx
-    movl     REP_RFRAME(%esp), %eax
-    movl     %eax, (%ecx)
-    movl     $ExceptionNestedException, %eax
-
-.rep_end:
-    ret
-
-
-// Parameters:
-//   [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord
-//   [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame
-//   [ESP+0Ch] - PCONTEXT Context
-//   [ESP+10h] - PVOID DispatcherContext
-//   [ESP+14h] - PEXCEPTION_HANDLER ExceptionHandler
-// Registers:
-//   None
-// Returns:
-//   EXCEPTION_DISPOSITION
-// Notes:
-//   Front-end
-_RtlpExecuteHandlerForException:
-    movl     $_RtlpExceptionProtector, %edx
-    jmp      _RtlpExecuteHandler
-
-
-#define RUP_ERECORD     0x04
-#define RUP_RFRAME      0x08
-#define RUP_CONTEXT     0x0C
-#define RUP_DCONTEXT    0x10
-
-// Parameters:
-//   [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord
-//   [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame
-//   [ESP+0Ch] - PCONTEXT Context
-//   [ESP+10h] - PVOID DispatcherContext
-// Registers:
-//   None
-// Returns:
-//   EXCEPTION_DISPOSITION
-// Notes:
-//    This exception handler protects the exception handling
-//    mechanism by detecting collided unwinds.
-_RtlpUnwindProtector:
-    movl     $ExceptionContinueSearch, %eax
-    movl     %ecx, RUP_ERECORD(%esp)
-    testl    $EXCEPTION_UNWINDING, EREC_FLAGS(%ecx)
-    jz       .rup_end
-
-    // Unwinding is taking place, so return ExceptionCollidedUnwind
-
-    movl     RUP_RFRAME(%esp), %ecx
-    movl     RUP_DCONTEXT(%esp), %edx
-
-    // Set DispatcherContext field to the exception registration for the
-    // exception handler that executed when a collision occurred
-    movl     RUP_RFRAME(%ecx), %eax
-    movl     %eax, (%edx)
-    movl     $ExceptionCollidedUnwind, %eax
-
-.rup_end:
-    ret
-
-
-// Parameters:
-//   [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord
-//   [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame
-//   [ESP+0Ch] - PCONTEXT Context
-//   [ESP+10h] - PVOID DispatcherContext
-//   [ESP+14h] - PEXCEPTION_HANDLER ExceptionHandler
-// Registers:
-//   None
-// Returns:
-//   EXCEPTION_DISPOSITION
-_RtlpExecuteHandlerForUnwind:
-    movl     $_RtlpUnwindProtector, %edx
-    jmp      _RtlpExecuteHandler
diff --git a/reactos/lib/ntdll/rtl/i386/exception.c b/reactos/lib/ntdll/rtl/i386/exception.c
deleted file mode 100755
index f929f849b4e..00000000000
--- a/reactos/lib/ntdll/rtl/i386/exception.c
+++ /dev/null
@@ -1,446 +0,0 @@
-/* $Id: exception.c,v 1.7 2004/04/09 20:03:13 navaraf Exp $
- *
- * COPYRIGHT:         See COPYING in the top level directory
- * PROJECT:           ReactOS kernel
- * PURPOSE:           User-mode exception support for IA-32
- * FILE:              lib/ntdll/rtl/i386/exception.c
- * PROGRAMER:         Casper S. Hornstrup (chorns@users.sourceforge.net)
- */
-
-/* INCLUDES *****************************************************************/
-
-#include <ddk/ntddk.h>
-#include <windows.h>
-#include <string.h>
-
-#define NDEBUG
-#include <debug.h>
-
-/* FUNCTIONS ***************************************************************/
-
-/* Implemented in except.s */
-
-VOID
-RtlpCaptureContext(PCONTEXT pContext);
-
-/* Macros that will help streamline the SEH implementations for
-   kernel mode and user mode */
-
-#define SehpGetStackLimits(StackBase, StackLimit) \
-{ \
-	(*(StackBase)) = NtCurrentTeb()->Tib->StackBase; \
-	(*(StackLimit)) = NtCurrentTeb()->Tib->StackLimit; \
-}
-
-#define SehpGetExceptionList() \
-	(PEXCEPTION_REGISTRATION)(NtCurrentTeb()->Tib.ExceptionList)
-
-#define SehpSetExceptionList(NewExceptionList) \
-	NtCurrentTeb()->Tib.ExceptionList = (PVOID)(NewExceptionList)
-
-#define SehpCaptureContext(Context) \
-{ \
-	RtlpCaptureContext(Context); \
-}
-
-#define SehpContinue(Context, TestAlert) \
-	NtContinue(Context, TestAlert)
-
-/*** Code below this line is shared with ntoskrnl/rtl/i386/exception.c - please keep in sync ***/
-
-VOID STDCALL
-AsmDebug(ULONG Value)
-{
-  DbgPrint("Value 0x%.08x\n", Value);
-}
-
-
-/* Declare a few prototypes for the functions in except.s */
-
-EXCEPTION_DISPOSITION
-RtlpExecuteHandlerForException(
-  PEXCEPTION_RECORD ExceptionRecord,
-  PEXCEPTION_REGISTRATION RegistrationFrame,
-  PCONTEXT Context,
-  PVOID DispatcherContext,
-  PEXCEPTION_HANDLER ExceptionHandler);
-
-EXCEPTION_DISPOSITION
-RtlpExecuteHandlerForUnwind(
-  PEXCEPTION_RECORD ExceptionRecord,
-  PEXCEPTION_REGISTRATION RegistrationFrame,
-  PCONTEXT Context,
-  PVOID DispatcherContext,
-  PEXCEPTION_HANDLER ExceptionHandler);
-
-
-#ifndef NDEBUG
-
-VOID RtlpDumpExceptionRegistrations(VOID)
-{
-  PEXCEPTION_REGISTRATION Current;
-
-  DbgPrint("Dumping exception registrations:\n");
-
-  Current = SehpGetExceptionList();
-
-  if ((ULONG_PTR)Current != -1)
-  {
-    while ((ULONG_PTR)Current != -1)
-    {
-      DbgPrint("   (0x%08X)   HANDLER (0x%08X)\n", Current, Current->handler);
-      Current = Current->prev;
-    }
-    DbgPrint("   End-Of-List\n");
-  } else {
-    DbgPrint("   No exception registrations exists.\n");
-  }
-}
-
-#endif /* NDEBUG */
-
-ULONG
-RtlpDispatchException(IN PEXCEPTION_RECORD  ExceptionRecord,
-	IN PCONTEXT  Context)
-{
-  PEXCEPTION_REGISTRATION RegistrationFrame;
-  DWORD DispatcherContext;
-  DWORD ReturnValue;
-
-  DPRINT("RtlpDispatchException()\n");
-
-#ifndef NDEBUG
-  RtlpDumpExceptionRegistrations();
-#endif /* NDEBUG */
-
-  RegistrationFrame = SehpGetExceptionList();
- 
-  DPRINT("RegistrationFrame is 0x%X\n", RegistrationFrame);
-
-  while ((ULONG_PTR)RegistrationFrame != -1)
-  {
-    EXCEPTION_RECORD ExceptionRecord2;
-    DWORD Temp = 0;
-    //PVOID RegistrationFrameEnd = (PVOID)RegistrationFrame + 8;
-
-    // Make sure the registration frame is located within the stack
-
-    DPRINT("Error checking\n");
-#if 0
-    if (Teb->Tib.StackBase > RegistrationFrameEnd)
-    {
-      DPRINT("Teb->Tib.StackBase (0x%.08x) > RegistrationFrameEnd (0x%.08x)\n",
-        Teb->Tib.StackBase, RegistrationFrameEnd);
-      ExceptionRecord->ExceptionFlags |= EXCEPTION_STACK_INVALID;
-      return ExceptionContinueExecution;
-    }
-    // FIXME: Stack top, correct?
-    if (Teb->Tib.StackLimit < RegistrationFrameEnd)
-    {
-      DPRINT("Teb->Tib.StackLimit (0x%.08x) > RegistrationFrameEnd (0x%.08x)\n",
-        Teb->Tib.StackLimit, RegistrationFrameEnd);
-      ExceptionRecord->ExceptionFlags |= EXCEPTION_STACK_INVALID;
-      return ExceptionContinueExecution;
-    }
- 
-    // Make sure stack is DWORD aligned
-    if ((ULONG_PTR)RegistrationFrame & 3)
-    {
-      DPRINT("RegistrationFrameEnd (0x%.08x) is not DWORD aligned.\n",
-        RegistrationFrameEnd);
-      ExceptionRecord->ExceptionFlags |= EXCEPTION_STACK_INVALID;
-      return ExceptionContinueExecution;
-    }
-#endif
-
-#if 0
-    /* FIXME: */
-    if (someFlag)
-      RtlpLogLastExceptionDisposition( hLog, retValue );
-#endif
-
-    DPRINT("Calling handler at 0x%X\n", RegistrationFrame->handler);
-    DPRINT("ExceptionRecord 0x%X\n", ExceptionRecord);
-    DPRINT("RegistrationFrame 0x%X\n", RegistrationFrame);
-    DPRINT("Context 0x%X\n", Context);
-    DPRINT("&DispatcherContext 0x%X\n", &DispatcherContext);
-
-    ReturnValue = RtlpExecuteHandlerForException(
-      ExceptionRecord,
-      RegistrationFrame,
-      Context,
-      &DispatcherContext,
-      RegistrationFrame->handler);
-#ifdef DEBUG
-    DPRINT("Exception handler said 0x%X\n", ReturnValue);
-	DPRINT("RegistrationFrame == 0x%.08x\n", RegistrationFrame);
-	{
-		PULONG sp = (PULONG)((PVOID)RegistrationFrame - 0x08);
-		DPRINT("StandardESP == 0x%.08x\n", sp[0]);
-		DPRINT("Exception Pointers == 0x%.08x\n", sp[1]);
-		DPRINT("PrevFrame == 0x%.08x\n", sp[2]);
-		DPRINT("Handler == 0x%.08x\n", sp[3]);
-		DPRINT("ScopeTable == 0x%.08x\n", sp[4]);
-		DPRINT("TryLevel == 0x%.08x\n", sp[5]);
-		DPRINT("EBP == 0x%.08x\n", sp[6]);
-	}
-#endif
-    if (RegistrationFrame == NULL)
-    {
-      ExceptionRecord->ExceptionFlags &= ~EXCEPTION_NESTED_CALL;  // Turn off flag
-    }
-
-    if (ReturnValue == ExceptionContinueExecution)
-    {
-      DPRINT("ReturnValue == ExceptionContinueExecution\n");
-      if (ExceptionRecord->ExceptionFlags & EXCEPTION_NONCONTINUABLE)
-      {
-        DPRINT("(ExceptionRecord->ExceptionFlags & EXCEPTION_NONCONTINUABLE) == TRUE\n");
-
-        ExceptionRecord2.ExceptionRecord = ExceptionRecord;
-        ExceptionRecord2.ExceptionCode = STATUS_NONCONTINUABLE_EXCEPTION;
-        ExceptionRecord2.ExceptionFlags = EXCEPTION_NONCONTINUABLE;
-        ExceptionRecord2.NumberParameters = 0;
-        RtlRaiseException(&ExceptionRecord2);
-      }
-      else
-      {
-        /* Copy the (possibly changed) context back to the trap frame and return */
-        SehpContinue(Context, FALSE);
-        return ExceptionContinueExecution;
-      }
-    }
-    else if (ReturnValue == ExceptionContinueSearch)
-    {
-      DPRINT("ReturnValue == ExceptionContinueSearch\n");
-
-      /* Nothing to do here */
-    }
-    else if (ReturnValue == ExceptionNestedException)
-    {
-      DPRINT("ReturnValue == ExceptionNestedException\n");
-
-      ExceptionRecord->ExceptionFlags |= EXCEPTION_EXIT_UNWIND;
-      if (DispatcherContext > Temp)
-	  {
-          Temp = DispatcherContext;
-	  }
-    }
-    else /* if (ReturnValue == ExceptionCollidedUnwind) */
-    {
-      DPRINT("ReturnValue == ExceptionCollidedUnwind or unknown\n");
-
-      ExceptionRecord2.ExceptionRecord = ExceptionRecord;
-      ExceptionRecord2.ExceptionCode = STATUS_INVALID_DISPOSITION;
-      ExceptionRecord2.ExceptionFlags = EXCEPTION_NONCONTINUABLE;
-      ExceptionRecord2.NumberParameters = 0;
-      RtlRaiseException(&ExceptionRecord2);
-    }
-
-    RegistrationFrame = RegistrationFrame->prev;  // Go to previous frame
-  }
- 
-  /* No exception handler will handle this exception */
-
-  DPRINT("RtlpDispatchException(): Return ExceptionContinueExecution\n");
-
-  return ExceptionContinueExecution;  
-}
-
-/*
- * @implemented
- */
-VOID STDCALL
-RtlRaiseStatus(NTSTATUS Status)
-{
-  EXCEPTION_RECORD ExceptionRecord;
-
-  DPRINT("RtlRaiseStatus(Status 0x%.08x)\n", Status);
-
-  ExceptionRecord.ExceptionCode    = Status;
-  ExceptionRecord.ExceptionRecord  = NULL;
-  ExceptionRecord.NumberParameters = 0;
-  ExceptionRecord.ExceptionFlags   = EXCEPTION_NONCONTINUABLE;
-  RtlRaiseException (& ExceptionRecord);
-}
-
-/*
- * @implemented
- */
-VOID STDCALL
-RtlUnwind(PEXCEPTION_REGISTRATION RegistrationFrame,
-  PVOID ReturnAddress,
-  PEXCEPTION_RECORD ExceptionRecord,
-  DWORD EaxValue)
-{
-  PEXCEPTION_REGISTRATION ERHead;
-  PEXCEPTION_RECORD pExceptRec;
-  EXCEPTION_RECORD TempER;    
-  CONTEXT Context;
-
-  DPRINT("RtlUnwind(). RegistrationFrame 0x%X\n", RegistrationFrame);
-
-#ifndef NDEBUG
-  RtlpDumpExceptionRegistrations();
-#endif /* NDEBUG */
-
-  ERHead = SehpGetExceptionList();
- 
-  DPRINT("ERHead is 0x%X\n", ERHead);
-
-  if (ExceptionRecord == NULL) // The normal case
-  {
-	DPRINT("ExceptionRecord == NULL (normal)\n");
-
-    pExceptRec = &TempER;
-    pExceptRec->ExceptionFlags = 0;
-    pExceptRec->ExceptionCode = STATUS_UNWIND;
-    pExceptRec->ExceptionRecord = NULL;
-    pExceptRec->ExceptionAddress = ReturnAddress;
-    pExceptRec->ExceptionInformation[0] = 0;
-  }
-  else
-  {
-    pExceptRec = ExceptionRecord;
-  }
-
-  if (RegistrationFrame)
-    pExceptRec->ExceptionFlags |= EXCEPTION_UNWINDING;
-  else
-    pExceptRec->ExceptionFlags |= (EXCEPTION_UNWINDING|EXCEPTION_EXIT_UNWIND);
-
-#ifndef NDEBUG
-  DPRINT("ExceptionFlags == 0x%x:\n", pExceptRec->ExceptionFlags);
-  if (pExceptRec->ExceptionFlags & EXCEPTION_UNWINDING)
-  {
-	  DPRINT("  * EXCEPTION_UNWINDING (0x%x)\n", EXCEPTION_UNWINDING);
-  }
-  if (pExceptRec->ExceptionFlags & EXCEPTION_EXIT_UNWIND)
-  {
-	  DPRINT("  * EXCEPTION_EXIT_UNWIND (0x%x)\n", EXCEPTION_EXIT_UNWIND);
-  }
-#endif /* NDEBUG */
-
-  Context.ContextFlags =
-    (CONTEXT_i386 | CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS);
-
-  SehpCaptureContext(&Context);
-
-  DPRINT("Context.Eip = 0x%.08x\n", Context.Eip);
-  DPRINT("Context.Ebp = 0x%.08x\n", Context.Ebp);
-  DPRINT("Context.Esp = 0x%.08x\n", Context.Esp);
-
-  Context.Esp += 0x10;
-  Context.Eax = EaxValue;
- 
-  // Begin traversing the list of EXCEPTION_REGISTRATION
-  while ((ULONG_PTR)ERHead != -1)
-  {
-    EXCEPTION_RECORD er2;
- 
-    DPRINT("ERHead 0x%X\n", ERHead);
-
-    if (ERHead == RegistrationFrame)
-    {
-      DPRINT("Continueing execution\n");
-      SehpContinue(&Context, FALSE);
-      return;
-    }
-    else
-    {
-      // If there's an exception frame, but it's lower on the stack
-      // than the head of the exception list, something's wrong!
-      if (RegistrationFrame && (RegistrationFrame <= ERHead))
-      {
-        DPRINT("The exception frame is bad\n");
-
-        // Generate an exception to bail out
-        er2.ExceptionRecord = pExceptRec;
-        er2.NumberParameters = 0;
-        er2.ExceptionCode = STATUS_INVALID_UNWIND_TARGET;
-        er2.ExceptionFlags = EXCEPTION_NONCONTINUABLE;    
- 
-        RtlRaiseException(&er2);
-      }
-    }
- 
-#if 0
-    Stack = ERHead + sizeof(EXCEPTION_REGISTRATION);
-    if ( (Teb->Tib.StackBase <= (PVOID)ERHead )      // Make sure that ERHead
-      && (Teb->Tib.->StackLimit >= (PVOID)Stack )      // is in range, and a multiple
-      && (0 == ((ULONG_PTR)ERHead & 3)) )         // of 4 (i.e., sane)
-    {
-#else
-    if (1) {
-#endif
-      PEXCEPTION_REGISTRATION NewERHead;
-      PEXCEPTION_REGISTRATION pCurrExceptReg;
-      EXCEPTION_DISPOSITION ReturnValue;
-  
-      DPRINT("Executing handler at 0x%X for unwind\n", ERHead->handler);
-
-      ReturnValue = RtlpExecuteHandlerForUnwind(
-        pExceptRec,
-        ERHead,
-        &Context,
-        &NewERHead,
-        ERHead->handler);
- 
-      DPRINT("Handler at 0x%X returned 0x%X\n", ERHead->handler, ReturnValue);
-
-      if (ReturnValue != ExceptionContinueSearch)
-      {
-        if (ReturnValue != ExceptionCollidedUnwind)
-        {
-          DPRINT("Bad return value\n");
-
-          er2.ExceptionRecord = pExceptRec;
-          er2.NumberParameters = 0;
-          er2.ExceptionCode = STATUS_INVALID_DISPOSITION;
-          er2.ExceptionFlags = EXCEPTION_NONCONTINUABLE;    
- 
-          RtlRaiseException(&er2);
-        }
-        else
-        {
-          ERHead = NewERHead;
-        }
-      }
- 
-      pCurrExceptReg = ERHead;
-      ERHead = ERHead->prev;
-
-      DPRINT("New ERHead is 0x%X\n", ERHead);
-
-      DPRINT("Setting exception registration at 0x%X as current\n",
-        RegistrationFrame->prev);
-
-      // Unlink the exception handler
-      SehpSetExceptionList(RegistrationFrame->prev);
-    }
-    else // The stack looks goofy! Raise an exception to bail out
-    {
-      DPRINT("Bad stack\n");
-
-      er2.ExceptionRecord = pExceptRec;
-      er2.NumberParameters = 0;
-      er2.ExceptionCode = STATUS_BAD_STACK;
-      er2.ExceptionFlags = EXCEPTION_NONCONTINUABLE;    
- 
-      RtlRaiseException(&er2);
-    }
-  }
- 
-  // If we get here, we reached the end of the EXCEPTION_REGISTRATION list.
-  // This shouldn't happen normally.
-
-  DPRINT("Ran out of exception registrations. RegistrationFrame is (0x%X)\n",
-    RegistrationFrame);
-
-  if ((ULONG_PTR)RegistrationFrame == -1)
-    SehpContinue(&Context, FALSE);
-  else
-    NtRaiseException(pExceptRec, &Context, 0);
-}
-
-/* EOF */
diff --git a/reactos/ntoskrnl/rtl/i386/except.s b/reactos/ntoskrnl/rtl/i386/except.s
deleted file mode 100755
index e5532888420..00000000000
--- a/reactos/ntoskrnl/rtl/i386/except.s
+++ /dev/null
@@ -1,291 +0,0 @@
-/* $Id: except.s,v 1.2 2002/10/26 07:32:08 chorns Exp $
- *
- * COPYRIGHT:         See COPYING in the top level directory
- * PROJECT:           ReactOS kernel
- * PURPOSE:           Kernel-mode exception support for IA-32
- * FILE:              ntoskrnl/rtl/i386/except.s
- * PROGRAMER:         Casper S. Hornstrup (chorns@users.sourceforge.net)
- * NOTES:             This file is shared with lib/ntdll/rtl/i386/except.s.
- *                    Please keep them in sync.
- */
-
-#define EXCEPTION_UNWINDING		0x02
-
-#define EREC_FLAGS				0x04
-
-#define ExceptionContinueExecution 0
-#define ExceptionContinueSearch    1
-#define ExceptionNestedException   2
-#define ExceptionCollidedUnwind    3
-
-.globl _RtlpExecuteHandlerForException
-.globl _RtlpExecuteHandlerForUnwind
-
-#define CONTEXT_FLAGS	0x00
-#define CONTEXT_SEGGS	0x8C
-#define CONTEXT_SEGFS	0x90
-#define CONTEXT_SEGES	0x94
-#define CONTEXT_SEGDS	0x98
-#define CONTEXT_EDI		0x9C
-#define CONTEXT_ESI		0xA0
-#define CONTEXT_EBX		0xA4
-#define CONTEXT_EDX		0xA8
-#define CONTEXT_ECX		0xAC
-#define CONTEXT_EAX		0xB0
-#define CONTEXT_EBP		0xB4
-#define CONTEXT_EIP		0xB8
-#define CONTEXT_SEGCS	0xBC
-#define CONTEXT_EFLAGS	0xC0
-#define CONTEXT_ESP		0xC4
-#define CONTEXT_SEGSS	0xC8
-
-
-#define RCC_CONTEXT		0x08
-
-// EAX = value to print
-_do_debug:
-	pushal
-	pushl	%eax
-	call	_AsmDebug@4
-	popal
-	ret
-
-#ifndef __NTOSKRNL__
-
-//
-// VOID
-// RtlpCaptureContext(PCONTEXT pContext);
-//
-// Parameters:
-//   [ESP+08h] - PCONTEXT_X86 pContext
-// Registers:
-//   None
-// Returns:
-//   Nothing
-// Notes:
-//   Grabs the current CPU context.
-.globl _RtlpCaptureContext
-_RtlpCaptureContext:
-	pushl   %ebp
-    movl	%esp, %ebp
-	movl	RCC_CONTEXT(%ebp), %edx		// EDX = Address of context structure
-
-	cld
-	pushf
-	pop		%eax
-	movl	%eax, CONTEXT_EFLAGS(%edx)
-	xorl	%eax, %eax
-	movl	%eax, CONTEXT_EAX(%edx)
-	movl	%eax, CONTEXT_EBX(%edx)
-	movl	%eax, CONTEXT_ECX(%edx)
-	movl	%eax, CONTEXT_EDX(%edx)
-	movl	%eax, CONTEXT_ESI(%edx)
-	movl	%eax, CONTEXT_EDI(%edx)
-	movl	%cs, %eax
-	movl	%eax, CONTEXT_SEGCS(%edx)
-	movl	%ds, %eax
-	movl	%eax, CONTEXT_SEGDS(%edx)
-	movl	%es, %eax
-	movl	%eax, CONTEXT_SEGES(%edx)
-	movl	%fs, %eax
-	movl	%eax, CONTEXT_SEGFS(%edx)
-	movl	%gs, %eax
-	movl	%eax, CONTEXT_SEGGS(%edx)
-	movl	%ss, %eax
-	movl	%eax, CONTEXT_SEGSS(%edx)
-
-	//
-	// STACK LAYOUT: - (ESP to put in context structure)
-	//               - RETURN ADDRESS OF CALLER OF CALLER
-	//               - EBP OF CALLER OF CALLER
-	//                 ...
-	//               - RETURN ADDRESS OF CALLER
-	//               - EBP OF CALLER
-	//                 ...
-	//
-
-	// Get return address of the caller of the caller of this function
-	movl	%ebp, %ebx
-	//movl	4(%ebx), %eax			// EAX = return address of caller
-	movl	(%ebx), %ebx			// EBX = EBP of caller
-
-	movl	4(%ebx), %eax			// EAX = return address of caller of caller
-	movl	(%ebx), %ebx			// EBX = EBP of caller of caller
-
-	movl	%eax, CONTEXT_EIP(%edx)	// EIP = return address of caller of caller
-	movl	%ebx, CONTEXT_EBP(%edx)	// EBP = EBP of caller of caller
-	addl	$8, %ebx
-	movl	%ebx, CONTEXT_ESP(%edx)	// ESP = EBP of caller of caller + 8
-
-    movl	%ebp, %esp
-    popl	%ebp
-    ret
-
-#endif /* !__NTOSKRNL__ */
-
-#define REH_ERECORD		0x08
-#define REH_RFRAME		0x0C
-#define REH_CONTEXT		0x10
-#define REH_DCONTEXT	0x14
-#define REH_EROUTINE	0x18
-
-// Parameters:
-//   None
-// Registers:
-//   [EBP+08h] - PEXCEPTION_RECORD ExceptionRecord
-//   [EBP+0Ch] - PEXCEPTION_REGISTRATION RegistrationFrame
-//   [EBP+10h] - PVOID Context
-//   [EBP+14h] - PVOID DispatcherContext
-//   [EBP+18h] - PEXCEPTION_HANDLER ExceptionRoutine
-//   EDX       - Address of protecting exception handler
-// Returns:
-//   EXCEPTION_DISPOSITION
-// Notes:
-//   Setup the protecting exception handler and call the exception
-//   handler in the right context.
-_RtlpExecuteHandler:
-	pushl    %ebp
-    movl     %esp, %ebp
-    pushl    REH_RFRAME(%ebp)
-
-    pushl    %edx
-    pushl    %fs:0x0
-    movl     %esp, %fs:0x0
-
-    // Prepare to call the exception handler
-    pushl    REH_DCONTEXT(%ebp)
-    pushl    REH_CONTEXT(%ebp)
-    pushl    REH_RFRAME(%ebp)
-    pushl    REH_ERECORD(%ebp)
-
-    // Now call the exception handler
-    movl     REH_EROUTINE(%ebp), %eax
-    call    *%eax
-
-	cmpl	$-1, %fs:0x0
-	jne		.reh_stack_looks_ok
-
-	// This should not happen
-	pushl	0
-	pushl	0
-	pushl	0
-	pushl	0
-	call	_RtlAssert@16
-
-.reh_loop:
-	jmp	.reh_loop
-	
-.reh_stack_looks_ok:
-    movl     %fs:0x0, %esp
-
-    // Return to the 'front-end' for this function
-    popl     %fs:0x0
-    movl     %ebp, %esp
-    popl     %ebp
-    ret
-
-
-#define REP_ERECORD     0x04
-#define REP_RFRAME      0x08
-#define REP_CONTEXT     0x0C
-#define REP_DCONTEXT    0x10
-
-// Parameters:
-//   [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord
-//   [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame
-//   [ESP+0Ch] - PCONTEXT Context
-//   [ESP+10h] - PVOID DispatcherContext
-// Registers:
-//   None
-// Returns:
-//   EXCEPTION_DISPOSITION
-// Notes:
-//    This exception handler protects the exception handling
-//    mechanism by detecting nested exceptions.
-_RtlpExceptionProtector:
-    movl     $ExceptionContinueSearch, %eax
-    movl     REP_ERECORD(%esp), %ecx
-    testl    $EXCEPTION_UNWINDING, EREC_FLAGS(%ecx)
-    jnz      .rep_end
-
-    // Unwinding is not taking place, so return ExceptionNestedException
-
-    // Set DispatcherContext field to the exception registration for the
-    // exception handler that executed when a nested exception occurred
-    movl     REP_DCONTEXT(%esp), %ecx
-    movl     REP_RFRAME(%esp), %eax
-    movl     %eax, (%ecx)
-    movl     $ExceptionNestedException, %eax
-
-.rep_end:
-    ret
-
-
-// Parameters:
-//   [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord
-//   [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame
-//   [ESP+0Ch] - PCONTEXT Context
-//   [ESP+10h] - PVOID DispatcherContext
-//   [ESP+14h] - PEXCEPTION_HANDLER ExceptionHandler
-// Registers:
-//   None
-// Returns:
-//   EXCEPTION_DISPOSITION
-// Notes:
-//   Front-end
-_RtlpExecuteHandlerForException:
-    movl     $_RtlpExceptionProtector, %edx
-    jmp      _RtlpExecuteHandler
-
-
-#define RUP_ERECORD     0x04
-#define RUP_RFRAME      0x08
-#define RUP_CONTEXT     0x0C
-#define RUP_DCONTEXT    0x10
-
-// Parameters:
-//   [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord
-//   [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame
-//   [ESP+0Ch] - PCONTEXT Context
-//   [ESP+10h] - PVOID DispatcherContext
-// Registers:
-//   None
-// Returns:
-//   EXCEPTION_DISPOSITION
-// Notes:
-//    This exception handler protects the exception handling
-//    mechanism by detecting collided unwinds.
-_RtlpUnwindProtector:
-    movl     $ExceptionContinueSearch, %eax
-    movl     %ecx, RUP_ERECORD(%esp)
-    testl    $EXCEPTION_UNWINDING, EREC_FLAGS(%ecx)
-    jz       .rup_end
-
-    // Unwinding is taking place, so return ExceptionCollidedUnwind
-
-    movl     RUP_RFRAME(%esp), %ecx
-    movl     RUP_DCONTEXT(%esp), %edx
-
-    // Set DispatcherContext field to the exception registration for the
-    // exception handler that executed when a collision occurred
-    movl     RUP_RFRAME(%ecx), %eax
-    movl     %eax, (%edx)
-    movl     $ExceptionCollidedUnwind, %eax
-
-.rup_end:
-    ret
-
-
-// Parameters:
-//   [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord
-//   [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame
-//   [ESP+0Ch] - PCONTEXT Context
-//   [ESP+10h] - PVOID DispatcherContext
-//   [ESP+14h] - PEXCEPTION_HANDLER ExceptionHandler
-// Registers:
-//   None
-// Returns:
-//   EXCEPTION_DISPOSITION
-_RtlpExecuteHandlerForUnwind:
-    movl     $_RtlpUnwindProtector, %edx
-    jmp      _RtlpExecuteHandler

From 4531d961414d87b306650b5419cd90f0ee660b08 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Fri, 25 Jun 2004 11:42:00 +0000
Subject: [PATCH 084/356] Expand user-specific environment variables.

svn path=/trunk/; revision=9870
---
 reactos/lib/userenv/environment.c | 79 ++++++++++++++++++++++++-------
 1 file changed, 63 insertions(+), 16 deletions(-)

diff --git a/reactos/lib/userenv/environment.c b/reactos/lib/userenv/environment.c
index c65962b6e71..08c369552d6 100644
--- a/reactos/lib/userenv/environment.c
+++ b/reactos/lib/userenv/environment.c
@@ -1,4 +1,4 @@
-/* $Id: environment.c,v 1.3 2004/05/01 11:55:01 ekohl Exp $
+/* $Id: environment.c,v 1.4 2004/06/25 11:42:00 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -18,20 +18,63 @@
 static BOOL
 SetUserEnvironmentVariable (LPVOID *Environment,
 			    LPWSTR lpName,
-			    LPWSTR lpValue)
+			    LPWSTR lpValue,
+			    BOOL bExpand)
 {
   UNICODE_STRING Name;
-  UNICODE_STRING Value;
+  UNICODE_STRING SrcValue;
+  UNICODE_STRING DstValue;
+  ULONG Length;
   NTSTATUS Status;
 
+  if (bExpand)
+    {
+      RtlInitUnicodeString(&SrcValue,
+			   lpValue);
+
+      Length = 2 * MAX_PATH * sizeof(WCHAR);
+
+      DstValue.Length = 0;
+      DstValue.MaximumLength = Length;
+      DstValue.Buffer = LocalAlloc (LPTR,
+				    Length);
+      if (DstValue.Buffer == NULL)
+	{
+	  DPRINT1("LocalAlloc() failed\n");
+	  return FALSE;
+	}
+
+      Status = RtlExpandEnvironmentStrings_U((PWSTR)*Environment,
+					     &SrcValue,
+					     &DstValue,
+					     &Length);
+      if (!NT_SUCCESS(Status))
+	{
+	  DPRINT1 ("RtlExpandEnvironmentStrings_U() failed (Status %lx)\n", Status);
+	  DPRINT1 ("Length %lu\n", Length);
+	  return FALSE;
+	}
+    }
+  else
+    {
+      RtlInitUnicodeString(&DstValue,
+			   lpValue);
+    }
+
   RtlInitUnicodeString (&Name,
 			lpName);
-  RtlInitUnicodeString (&Value,
-			lpValue);
+
+  DPRINT("Value: %wZ\n", &DstValue);
 
   Status = RtlSetEnvironmentVariable ((PWSTR*)Environment,
 				      &Name,
-				      &Value);
+				      &DstValue);
+
+  if (bExpand)
+    {
+      LocalFree(DstValue.Buffer);
+    }
+
   if (!NT_SUCCESS(Status))
     {
       DPRINT1 ("RtlSetEnvironmentVariable() failed (Status %lx)\n", Status);
@@ -214,7 +257,8 @@ SetUserEnvironment (LPVOID *lpEnvironment,
 	  /* Set environment variable */
 	  SetUserEnvironmentVariable (lpEnvironment,
 				      lpValueName,
-				      lpValueData);
+				      lpValueData,
+				      (dwType == REG_EXPAND_SZ));
 	}
     }
 
@@ -254,9 +298,10 @@ CreateEnvironmentBlock (LPVOID *lpEnvironment,
   if (GetComputerNameW (Buffer,
 			&Length))
     {
-      SetUserEnvironmentVariable (lpEnvironment,
-				  L"COMPUTERNAME",
-				  Buffer);
+      SetUserEnvironmentVariable(lpEnvironment,
+				 L"COMPUTERNAME",
+				 Buffer,
+				 FALSE);
     }
 
   if (hToken == NULL)
@@ -275,9 +320,10 @@ CreateEnvironmentBlock (LPVOID *lpEnvironment,
   if (GetAllUsersProfileDirectoryW (Buffer,
 				    &Length))
     {
-      SetUserEnvironmentVariable (lpEnvironment,
-				  L"ALLUSERSPROFILE",
-				  Buffer);
+      SetUserEnvironmentVariable(lpEnvironment,
+				 L"ALLUSERSPROFILE",
+				 Buffer,
+				 FALSE);
     }
 
   /* Set 'USERPROFILE' variable */
@@ -286,9 +332,10 @@ CreateEnvironmentBlock (LPVOID *lpEnvironment,
 				Buffer,
 				&Length))
     {
-      SetUserEnvironmentVariable (lpEnvironment,
-				  L"USERPROFILE",
-				  Buffer);
+      SetUserEnvironmentVariable(lpEnvironment,
+				 L"USERPROFILE",
+				 Buffer,
+				 FALSE);
     }
 
   /* FIXME: Set 'USERDOMAIN' variable */

From 2dea23413207738884070b23a5c9419ed8025316 Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Fri, 25 Jun 2004 16:39:41 +0000
Subject: [PATCH 085/356] re-added files that hyperion accidently deleted from
 HEAD

svn path=/trunk/; revision=9871
---
 reactos/lib/ntdll/rtl/i386/except.s    | 291 ++++++++++++++++
 reactos/lib/ntdll/rtl/i386/exception.c | 446 +++++++++++++++++++++++++
 reactos/ntoskrnl/rtl/i386/except.s     | 291 ++++++++++++++++
 3 files changed, 1028 insertions(+)
 create mode 100755 reactos/lib/ntdll/rtl/i386/except.s
 create mode 100755 reactos/lib/ntdll/rtl/i386/exception.c
 create mode 100755 reactos/ntoskrnl/rtl/i386/except.s

diff --git a/reactos/lib/ntdll/rtl/i386/except.s b/reactos/lib/ntdll/rtl/i386/except.s
new file mode 100755
index 00000000000..15fdeddd982
--- /dev/null
+++ b/reactos/lib/ntdll/rtl/i386/except.s
@@ -0,0 +1,291 @@
+/* $Id: except.s,v 1.5 2004/06/25 16:39:41 weiden Exp $
+ *
+ * COPYRIGHT:         See COPYING in the top level directory
+ * PROJECT:           ReactOS kernel
+ * PURPOSE:           User-mode exception support for IA-32
+ * FILE:              lib/ntdll/rtl/i386/except.s
+ * PROGRAMER:         Casper S. Hornstrup (chorns@users.sourceforge.net)
+ * NOTES:             This file is shared with ntoskrnl/rtl/i386/except.s.
+ *                    Please keep them in sync.
+ */
+
+#define EXCEPTION_UNWINDING		0x02
+
+#define EREC_FLAGS				0x04
+
+#define ExceptionContinueExecution 0
+#define ExceptionContinueSearch    1
+#define ExceptionNestedException   2
+#define ExceptionCollidedUnwind    3
+
+.globl _RtlpExecuteHandlerForException
+.globl _RtlpExecuteHandlerForUnwind
+
+#define CONTEXT_FLAGS	0x00
+#define CONTEXT_SEGGS	0x8C
+#define CONTEXT_SEGFS	0x90
+#define CONTEXT_SEGES	0x94
+#define CONTEXT_SEGDS	0x98
+#define CONTEXT_EDI		0x9C
+#define CONTEXT_ESI		0xA0
+#define CONTEXT_EBX		0xA4
+#define CONTEXT_EDX		0xA8
+#define CONTEXT_ECX		0xAC
+#define CONTEXT_EAX		0xB0
+#define CONTEXT_EBP		0xB4
+#define CONTEXT_EIP		0xB8
+#define CONTEXT_SEGCS	0xBC
+#define CONTEXT_EFLAGS	0xC0
+#define CONTEXT_ESP		0xC4
+#define CONTEXT_SEGSS	0xC8
+
+
+#define RCC_CONTEXT		0x08
+
+// EAX = value to print
+_do_debug:
+	pushal
+	pushl	%eax
+	call	_AsmDebug@4
+	popal
+	ret
+
+#ifndef __NTOSKRNL__
+
+//
+// VOID
+// RtlpCaptureContext(PCONTEXT pContext);
+//
+// Parameters:
+//   [ESP+08h] - PCONTEXT_X86 pContext
+// Registers:
+//   None
+// Returns:
+//   Nothing
+// Notes:
+//   Grabs the current CPU context.
+.globl _RtlpCaptureContext
+_RtlpCaptureContext:
+	pushl   %ebp
+    movl	%esp, %ebp
+	movl	RCC_CONTEXT(%ebp), %edx		// EDX = Address of context structure
+
+	cld
+	pushf
+	pop		%eax
+	movl	%eax, CONTEXT_EFLAGS(%edx)
+	xorl	%eax, %eax
+	movl	%eax, CONTEXT_EAX(%edx)
+	movl	%eax, CONTEXT_EBX(%edx)
+	movl	%eax, CONTEXT_ECX(%edx)
+	movl	%eax, CONTEXT_EDX(%edx)
+	movl	%eax, CONTEXT_ESI(%edx)
+	movl	%eax, CONTEXT_EDI(%edx)
+	movl	%cs, %eax
+	movl	%eax, CONTEXT_SEGCS(%edx)
+	movl	%ds, %eax
+	movl	%eax, CONTEXT_SEGDS(%edx)
+	movl	%es, %eax
+	movl	%eax, CONTEXT_SEGES(%edx)
+	movl	%fs, %eax
+	movl	%eax, CONTEXT_SEGFS(%edx)
+	movl	%gs, %eax
+	movl	%eax, CONTEXT_SEGGS(%edx)
+	movl	%ss, %eax
+	movl	%eax, CONTEXT_SEGSS(%edx)
+
+	//
+	// STACK LAYOUT: - (ESP to put in context structure)
+	//               - RETURN ADDRESS OF CALLER OF CALLER
+	//               - EBP OF CALLER OF CALLER
+	//                 ...
+	//               - RETURN ADDRESS OF CALLER
+	//               - EBP OF CALLER
+	//                 ...
+	//
+
+	// Get return address of the caller of the caller of this function
+	movl	%ebp, %ebx
+	//movl	4(%ebx), %eax			// EAX = return address of caller
+	movl	(%ebx), %ebx			// EBX = EBP of caller
+
+	movl	4(%ebx), %eax			// EAX = return address of caller of caller
+	movl	(%ebx), %ebx			// EBX = EBP of caller of caller
+
+	movl	%eax, CONTEXT_EIP(%edx)	// EIP = return address of caller of caller
+	movl	%ebx, CONTEXT_EBP(%edx)	// EBP = EBP of caller of caller
+	addl	$8, %ebx
+	movl	%ebx, CONTEXT_ESP(%edx)	// ESP = EBP of caller of caller + 8
+
+    movl	%ebp, %esp
+    popl	%ebp
+    ret
+
+#endif /* !__NTOSKRNL__ */
+
+#define REH_ERECORD		0x08
+#define REH_RFRAME		0x0C
+#define REH_CONTEXT		0x10
+#define REH_DCONTEXT	0x14
+#define REH_EROUTINE	0x18
+
+// Parameters:
+//   None
+// Registers:
+//   [EBP+08h] - PEXCEPTION_RECORD ExceptionRecord
+//   [EBP+0Ch] - PEXCEPTION_REGISTRATION RegistrationFrame
+//   [EBP+10h] - PVOID Context
+//   [EBP+14h] - PVOID DispatcherContext
+//   [EBP+18h] - PEXCEPTION_HANDLER ExceptionRoutine
+//   EDX       - Address of protecting exception handler
+// Returns:
+//   EXCEPTION_DISPOSITION
+// Notes:
+//   Setup the protecting exception handler and call the exception
+//   handler in the right context.
+_RtlpExecuteHandler:
+	pushl    %ebp
+    movl     %esp, %ebp
+    pushl    REH_RFRAME(%ebp)
+
+    pushl    %edx
+    pushl    %fs:0x0
+    movl     %esp, %fs:0x0
+
+    // Prepare to call the exception handler
+    pushl    REH_DCONTEXT(%ebp)
+    pushl    REH_CONTEXT(%ebp)
+    pushl    REH_RFRAME(%ebp)
+    pushl    REH_ERECORD(%ebp)
+
+    // Now call the exception handler
+    movl     REH_EROUTINE(%ebp), %eax
+    call    *%eax
+
+	cmpl	$-1, %fs:0x0
+	jne		.reh_stack_looks_ok
+
+	// This should not happen
+	pushl	0
+	pushl	0
+	pushl	0
+	pushl	0
+	call	_RtlAssert@16
+
+.reh_loop:
+	jmp	.reh_loop
+
+.reh_stack_looks_ok:
+    movl     %fs:0x0, %esp
+
+    // Return to the 'front-end' for this function
+    popl     %fs:0x0
+    movl     %ebp, %esp
+    popl     %ebp
+    ret
+
+
+#define REP_ERECORD     0x04
+#define REP_RFRAME      0x08
+#define REP_CONTEXT     0x0C
+#define REP_DCONTEXT    0x10
+
+// Parameters:
+//   [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord
+//   [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame
+//   [ESP+0Ch] - PCONTEXT Context
+//   [ESP+10h] - PVOID DispatcherContext
+// Registers:
+//   None
+// Returns:
+//   EXCEPTION_DISPOSITION
+// Notes:
+//    This exception handler protects the exception handling
+//    mechanism by detecting nested exceptions.
+_RtlpExceptionProtector:
+    movl     $ExceptionContinueSearch, %eax
+    movl     REP_ERECORD(%esp), %ecx
+    testl    $EXCEPTION_UNWINDING, EREC_FLAGS(%ecx)
+    jnz      .rep_end
+
+    // Unwinding is not taking place, so return ExceptionNestedException
+
+    // Set DispatcherContext field to the exception registration for the
+    // exception handler that executed when a nested exception occurred
+    movl     REP_DCONTEXT(%esp), %ecx
+    movl     REP_RFRAME(%esp), %eax
+    movl     %eax, (%ecx)
+    movl     $ExceptionNestedException, %eax
+
+.rep_end:
+    ret
+
+
+// Parameters:
+//   [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord
+//   [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame
+//   [ESP+0Ch] - PCONTEXT Context
+//   [ESP+10h] - PVOID DispatcherContext
+//   [ESP+14h] - PEXCEPTION_HANDLER ExceptionHandler
+// Registers:
+//   None
+// Returns:
+//   EXCEPTION_DISPOSITION
+// Notes:
+//   Front-end
+_RtlpExecuteHandlerForException:
+    movl     $_RtlpExceptionProtector, %edx
+    jmp      _RtlpExecuteHandler
+
+
+#define RUP_ERECORD     0x04
+#define RUP_RFRAME      0x08
+#define RUP_CONTEXT     0x0C
+#define RUP_DCONTEXT    0x10
+
+// Parameters:
+//   [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord
+//   [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame
+//   [ESP+0Ch] - PCONTEXT Context
+//   [ESP+10h] - PVOID DispatcherContext
+// Registers:
+//   None
+// Returns:
+//   EXCEPTION_DISPOSITION
+// Notes:
+//    This exception handler protects the exception handling
+//    mechanism by detecting collided unwinds.
+_RtlpUnwindProtector:
+    movl     $ExceptionContinueSearch, %eax
+    movl     %ecx, RUP_ERECORD(%esp)
+    testl    $EXCEPTION_UNWINDING, EREC_FLAGS(%ecx)
+    jz       .rup_end
+
+    // Unwinding is taking place, so return ExceptionCollidedUnwind
+
+    movl     RUP_RFRAME(%esp), %ecx
+    movl     RUP_DCONTEXT(%esp), %edx
+
+    // Set DispatcherContext field to the exception registration for the
+    // exception handler that executed when a collision occurred
+    movl     RUP_RFRAME(%ecx), %eax
+    movl     %eax, (%edx)
+    movl     $ExceptionCollidedUnwind, %eax
+
+.rup_end:
+    ret
+
+
+// Parameters:
+//   [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord
+//   [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame
+//   [ESP+0Ch] - PCONTEXT Context
+//   [ESP+10h] - PVOID DispatcherContext
+//   [ESP+14h] - PEXCEPTION_HANDLER ExceptionHandler
+// Registers:
+//   None
+// Returns:
+//   EXCEPTION_DISPOSITION
+_RtlpExecuteHandlerForUnwind:
+    movl     $_RtlpUnwindProtector, %edx
+    jmp      _RtlpExecuteHandler
diff --git a/reactos/lib/ntdll/rtl/i386/exception.c b/reactos/lib/ntdll/rtl/i386/exception.c
new file mode 100755
index 00000000000..2623dabf7ff
--- /dev/null
+++ b/reactos/lib/ntdll/rtl/i386/exception.c
@@ -0,0 +1,446 @@
+/* $Id: exception.c,v 1.9 2004/06/25 16:39:41 weiden Exp $
+ *
+ * COPYRIGHT:         See COPYING in the top level directory
+ * PROJECT:           ReactOS kernel
+ * PURPOSE:           User-mode exception support for IA-32
+ * FILE:              lib/ntdll/rtl/i386/exception.c
+ * PROGRAMER:         Casper S. Hornstrup (chorns@users.sourceforge.net)
+ */
+
+/* INCLUDES *****************************************************************/
+
+#include <ddk/ntddk.h>
+#include <windows.h>
+#include <string.h>
+
+#define NDEBUG
+#include <debug.h>
+
+/* FUNCTIONS ***************************************************************/
+
+/* Implemented in except.s */
+
+VOID
+RtlpCaptureContext(PCONTEXT pContext);
+
+/* Macros that will help streamline the SEH implementations for
+   kernel mode and user mode */
+
+#define SehpGetStackLimits(StackBase, StackLimit) \
+{ \
+	(*(StackBase)) = NtCurrentTeb()->Tib->StackBase; \
+	(*(StackLimit)) = NtCurrentTeb()->Tib->StackLimit; \
+}
+
+#define SehpGetExceptionList() \
+	(PEXCEPTION_REGISTRATION)(NtCurrentTeb()->Tib.ExceptionList)
+
+#define SehpSetExceptionList(NewExceptionList) \
+	NtCurrentTeb()->Tib.ExceptionList = (PVOID)(NewExceptionList)
+
+#define SehpCaptureContext(Context) \
+{ \
+	RtlpCaptureContext(Context); \
+}
+
+#define SehpContinue(Context, TestAlert) \
+	NtContinue(Context, TestAlert)
+
+/*** Code below this line is shared with ntoskrnl/rtl/i386/exception.c - please keep in sync ***/
+
+VOID STDCALL
+AsmDebug(ULONG Value)
+{
+  DbgPrint("Value 0x%.08x\n", Value);
+}
+
+
+/* Declare a few prototypes for the functions in except.s */
+
+EXCEPTION_DISPOSITION
+RtlpExecuteHandlerForException(
+  PEXCEPTION_RECORD ExceptionRecord,
+  PEXCEPTION_REGISTRATION RegistrationFrame,
+  PCONTEXT Context,
+  PVOID DispatcherContext,
+  PEXCEPTION_HANDLER ExceptionHandler);
+
+EXCEPTION_DISPOSITION
+RtlpExecuteHandlerForUnwind(
+  PEXCEPTION_RECORD ExceptionRecord,
+  PEXCEPTION_REGISTRATION RegistrationFrame,
+  PCONTEXT Context,
+  PVOID DispatcherContext,
+  PEXCEPTION_HANDLER ExceptionHandler);
+
+
+#ifndef NDEBUG
+
+VOID RtlpDumpExceptionRegistrations(VOID)
+{
+  PEXCEPTION_REGISTRATION Current;
+
+  DbgPrint("Dumping exception registrations:\n");
+
+  Current = SehpGetExceptionList();
+
+  if ((ULONG_PTR)Current != -1)
+  {
+    while ((ULONG_PTR)Current != -1)
+    {
+      DbgPrint("   (0x%08X)   HANDLER (0x%08X)\n", Current, Current->handler);
+      Current = Current->prev;
+    }
+    DbgPrint("   End-Of-List\n");
+  } else {
+    DbgPrint("   No exception registrations exists.\n");
+  }
+}
+
+#endif /* NDEBUG */
+
+ULONG
+RtlpDispatchException(IN PEXCEPTION_RECORD  ExceptionRecord,
+	IN PCONTEXT  Context)
+{
+  PEXCEPTION_REGISTRATION RegistrationFrame;
+  DWORD DispatcherContext;
+  DWORD ReturnValue;
+
+  DPRINT("RtlpDispatchException()\n");
+
+#ifndef NDEBUG
+  RtlpDumpExceptionRegistrations();
+#endif /* NDEBUG */
+
+  RegistrationFrame = SehpGetExceptionList();
+ 
+  DPRINT("RegistrationFrame is 0x%X\n", RegistrationFrame);
+
+  while ((ULONG_PTR)RegistrationFrame != -1)
+  {
+    EXCEPTION_RECORD ExceptionRecord2;
+    DWORD Temp = 0;
+    //PVOID RegistrationFrameEnd = (PVOID)RegistrationFrame + 8;
+
+    // Make sure the registration frame is located within the stack
+
+    DPRINT("Error checking\n");
+#if 0
+    if (Teb->Tib.StackBase > RegistrationFrameEnd)
+    {
+      DPRINT("Teb->Tib.StackBase (0x%.08x) > RegistrationFrameEnd (0x%.08x)\n",
+        Teb->Tib.StackBase, RegistrationFrameEnd);
+      ExceptionRecord->ExceptionFlags |= EXCEPTION_STACK_INVALID;
+      return ExceptionContinueExecution;
+    }
+    // FIXME: Stack top, correct?
+    if (Teb->Tib.StackLimit < RegistrationFrameEnd)
+    {
+      DPRINT("Teb->Tib.StackLimit (0x%.08x) > RegistrationFrameEnd (0x%.08x)\n",
+        Teb->Tib.StackLimit, RegistrationFrameEnd);
+      ExceptionRecord->ExceptionFlags |= EXCEPTION_STACK_INVALID;
+      return ExceptionContinueExecution;
+    }
+ 
+    // Make sure stack is DWORD aligned
+    if ((ULONG_PTR)RegistrationFrame & 3)
+    {
+      DPRINT("RegistrationFrameEnd (0x%.08x) is not DWORD aligned.\n",
+        RegistrationFrameEnd);
+      ExceptionRecord->ExceptionFlags |= EXCEPTION_STACK_INVALID;
+      return ExceptionContinueExecution;
+    }
+#endif
+
+#if 0
+    /* FIXME: */
+    if (someFlag)
+      RtlpLogLastExceptionDisposition( hLog, retValue );
+#endif
+
+    DPRINT("Calling handler at 0x%X\n", RegistrationFrame->handler);
+    DPRINT("ExceptionRecord 0x%X\n", ExceptionRecord);
+    DPRINT("RegistrationFrame 0x%X\n", RegistrationFrame);
+    DPRINT("Context 0x%X\n", Context);
+    DPRINT("&DispatcherContext 0x%X\n", &DispatcherContext);
+
+    ReturnValue = RtlpExecuteHandlerForException(
+      ExceptionRecord,
+      RegistrationFrame,
+      Context,
+      &DispatcherContext,
+      RegistrationFrame->handler);
+#ifdef DEBUG
+    DPRINT("Exception handler said 0x%X\n", ReturnValue);
+	DPRINT("RegistrationFrame == 0x%.08x\n", RegistrationFrame);
+	{
+		PULONG sp = (PULONG)((PVOID)RegistrationFrame - 0x08);
+		DPRINT("StandardESP == 0x%.08x\n", sp[0]);
+		DPRINT("Exception Pointers == 0x%.08x\n", sp[1]);
+		DPRINT("PrevFrame == 0x%.08x\n", sp[2]);
+		DPRINT("Handler == 0x%.08x\n", sp[3]);
+		DPRINT("ScopeTable == 0x%.08x\n", sp[4]);
+		DPRINT("TryLevel == 0x%.08x\n", sp[5]);
+		DPRINT("EBP == 0x%.08x\n", sp[6]);
+	}
+#endif
+    if (RegistrationFrame == NULL)
+    {
+      ExceptionRecord->ExceptionFlags &= ~EXCEPTION_NESTED_CALL;  // Turn off flag
+    }
+
+    if (ReturnValue == ExceptionContinueExecution)
+    {
+      DPRINT("ReturnValue == ExceptionContinueExecution\n");
+      if (ExceptionRecord->ExceptionFlags & EXCEPTION_NONCONTINUABLE)
+      {
+        DPRINT("(ExceptionRecord->ExceptionFlags & EXCEPTION_NONCONTINUABLE) == TRUE\n");
+
+        ExceptionRecord2.ExceptionRecord = ExceptionRecord;
+        ExceptionRecord2.ExceptionCode = STATUS_NONCONTINUABLE_EXCEPTION;
+        ExceptionRecord2.ExceptionFlags = EXCEPTION_NONCONTINUABLE;
+        ExceptionRecord2.NumberParameters = 0;
+        RtlRaiseException(&ExceptionRecord2);
+      }
+      else
+      {
+        /* Copy the (possibly changed) context back to the trap frame and return */
+        SehpContinue(Context, FALSE);
+        return ExceptionContinueExecution;
+      }
+    }
+    else if (ReturnValue == ExceptionContinueSearch)
+    {
+      DPRINT("ReturnValue == ExceptionContinueSearch\n");
+
+      /* Nothing to do here */
+    }
+    else if (ReturnValue == ExceptionNestedException)
+    {
+      DPRINT("ReturnValue == ExceptionNestedException\n");
+
+      ExceptionRecord->ExceptionFlags |= EXCEPTION_EXIT_UNWIND;
+      if (DispatcherContext > Temp)
+	  {
+          Temp = DispatcherContext;
+	  }
+    }
+    else /* if (ReturnValue == ExceptionCollidedUnwind) */
+    {
+      DPRINT("ReturnValue == ExceptionCollidedUnwind or unknown\n");
+
+      ExceptionRecord2.ExceptionRecord = ExceptionRecord;
+      ExceptionRecord2.ExceptionCode = STATUS_INVALID_DISPOSITION;
+      ExceptionRecord2.ExceptionFlags = EXCEPTION_NONCONTINUABLE;
+      ExceptionRecord2.NumberParameters = 0;
+      RtlRaiseException(&ExceptionRecord2);
+    }
+
+    RegistrationFrame = RegistrationFrame->prev;  // Go to previous frame
+  }
+ 
+  /* No exception handler will handle this exception */
+
+  DPRINT("RtlpDispatchException(): Return ExceptionContinueExecution\n");
+
+  return ExceptionContinueExecution;  
+}
+
+/*
+ * @implemented
+ */
+VOID STDCALL
+RtlRaiseStatus(NTSTATUS Status)
+{
+  EXCEPTION_RECORD ExceptionRecord;
+
+  DPRINT("RtlRaiseStatus(Status 0x%.08x)\n", Status);
+
+  ExceptionRecord.ExceptionCode    = Status;
+  ExceptionRecord.ExceptionRecord  = NULL;
+  ExceptionRecord.NumberParameters = 0;
+  ExceptionRecord.ExceptionFlags   = EXCEPTION_NONCONTINUABLE;
+  RtlRaiseException (& ExceptionRecord);
+}
+
+/*
+ * @implemented
+ */
+VOID STDCALL
+RtlUnwind(PEXCEPTION_REGISTRATION RegistrationFrame,
+  PVOID ReturnAddress,
+  PEXCEPTION_RECORD ExceptionRecord,
+  DWORD EaxValue)
+{
+  PEXCEPTION_REGISTRATION ERHead;
+  PEXCEPTION_RECORD pExceptRec;
+  EXCEPTION_RECORD TempER;    
+  CONTEXT Context;
+
+  DPRINT("RtlUnwind(). RegistrationFrame 0x%X\n", RegistrationFrame);
+
+#ifndef NDEBUG
+  RtlpDumpExceptionRegistrations();
+#endif /* NDEBUG */
+
+  ERHead = SehpGetExceptionList();
+ 
+  DPRINT("ERHead is 0x%X\n", ERHead);
+
+  if (ExceptionRecord == NULL) // The normal case
+  {
+	DPRINT("ExceptionRecord == NULL (normal)\n");
+
+    pExceptRec = &TempER;
+    pExceptRec->ExceptionFlags = 0;
+    pExceptRec->ExceptionCode = STATUS_UNWIND;
+    pExceptRec->ExceptionRecord = NULL;
+    pExceptRec->ExceptionAddress = ReturnAddress;
+    pExceptRec->ExceptionInformation[0] = 0;
+  }
+  else
+  {
+    pExceptRec = ExceptionRecord;
+  }
+
+  if (RegistrationFrame)
+    pExceptRec->ExceptionFlags |= EXCEPTION_UNWINDING;
+  else
+    pExceptRec->ExceptionFlags |= (EXCEPTION_UNWINDING|EXCEPTION_EXIT_UNWIND);
+
+#ifndef NDEBUG
+  DPRINT("ExceptionFlags == 0x%x:\n", pExceptRec->ExceptionFlags);
+  if (pExceptRec->ExceptionFlags & EXCEPTION_UNWINDING)
+  {
+	  DPRINT("  * EXCEPTION_UNWINDING (0x%x)\n", EXCEPTION_UNWINDING);
+  }
+  if (pExceptRec->ExceptionFlags & EXCEPTION_EXIT_UNWIND)
+  {
+	  DPRINT("  * EXCEPTION_EXIT_UNWIND (0x%x)\n", EXCEPTION_EXIT_UNWIND);
+  }
+#endif /* NDEBUG */
+
+  Context.ContextFlags =
+    (CONTEXT_i386 | CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS);
+
+  SehpCaptureContext(&Context);
+
+  DPRINT("Context.Eip = 0x%.08x\n", Context.Eip);
+  DPRINT("Context.Ebp = 0x%.08x\n", Context.Ebp);
+  DPRINT("Context.Esp = 0x%.08x\n", Context.Esp);
+
+  Context.Esp += 0x10;
+  Context.Eax = EaxValue;
+ 
+  // Begin traversing the list of EXCEPTION_REGISTRATION
+  while ((ULONG_PTR)ERHead != -1)
+  {
+    EXCEPTION_RECORD er2;
+ 
+    DPRINT("ERHead 0x%X\n", ERHead);
+
+    if (ERHead == RegistrationFrame)
+    {
+      DPRINT("Continueing execution\n");
+      SehpContinue(&Context, FALSE);
+      return;
+    }
+    else
+    {
+      // If there's an exception frame, but it's lower on the stack
+      // than the head of the exception list, something's wrong!
+      if (RegistrationFrame && (RegistrationFrame <= ERHead))
+      {
+        DPRINT("The exception frame is bad\n");
+
+        // Generate an exception to bail out
+        er2.ExceptionRecord = pExceptRec;
+        er2.NumberParameters = 0;
+        er2.ExceptionCode = STATUS_INVALID_UNWIND_TARGET;
+        er2.ExceptionFlags = EXCEPTION_NONCONTINUABLE;    
+ 
+        RtlRaiseException(&er2);
+      }
+    }
+ 
+#if 0
+    Stack = ERHead + sizeof(EXCEPTION_REGISTRATION);
+    if ( (Teb->Tib.StackBase <= (PVOID)ERHead )      // Make sure that ERHead
+      && (Teb->Tib.->StackLimit >= (PVOID)Stack )      // is in range, and a multiple
+      && (0 == ((ULONG_PTR)ERHead & 3)) )         // of 4 (i.e., sane)
+    {
+#else
+    if (1) {
+#endif
+      PEXCEPTION_REGISTRATION NewERHead;
+      PEXCEPTION_REGISTRATION pCurrExceptReg;
+      EXCEPTION_DISPOSITION ReturnValue;
+  
+      DPRINT("Executing handler at 0x%X for unwind\n", ERHead->handler);
+
+      ReturnValue = RtlpExecuteHandlerForUnwind(
+        pExceptRec,
+        ERHead,
+        &Context,
+        &NewERHead,
+        ERHead->handler);
+ 
+      DPRINT("Handler at 0x%X returned 0x%X\n", ERHead->handler, ReturnValue);
+
+      if (ReturnValue != ExceptionContinueSearch)
+      {
+        if (ReturnValue != ExceptionCollidedUnwind)
+        {
+          DPRINT("Bad return value\n");
+
+          er2.ExceptionRecord = pExceptRec;
+          er2.NumberParameters = 0;
+          er2.ExceptionCode = STATUS_INVALID_DISPOSITION;
+          er2.ExceptionFlags = EXCEPTION_NONCONTINUABLE;    
+ 
+          RtlRaiseException(&er2);
+        }
+        else
+        {
+          ERHead = NewERHead;
+        }
+      }
+ 
+      pCurrExceptReg = ERHead;
+      ERHead = ERHead->prev;
+
+      DPRINT("New ERHead is 0x%X\n", ERHead);
+
+      DPRINT("Setting exception registration at 0x%X as current\n",
+        RegistrationFrame->prev);
+
+      // Unlink the exception handler
+      SehpSetExceptionList(RegistrationFrame->prev);
+    }
+    else // The stack looks goofy! Raise an exception to bail out
+    {
+      DPRINT("Bad stack\n");
+
+      er2.ExceptionRecord = pExceptRec;
+      er2.NumberParameters = 0;
+      er2.ExceptionCode = STATUS_BAD_STACK;
+      er2.ExceptionFlags = EXCEPTION_NONCONTINUABLE;    
+ 
+      RtlRaiseException(&er2);
+    }
+  }
+ 
+  // If we get here, we reached the end of the EXCEPTION_REGISTRATION list.
+  // This shouldn't happen normally.
+
+  DPRINT("Ran out of exception registrations. RegistrationFrame is (0x%X)\n",
+    RegistrationFrame);
+
+  if ((ULONG_PTR)RegistrationFrame == -1)
+    SehpContinue(&Context, FALSE);
+  else
+    NtRaiseException(pExceptRec, &Context, 0);
+}
+
+/* EOF */
diff --git a/reactos/ntoskrnl/rtl/i386/except.s b/reactos/ntoskrnl/rtl/i386/except.s
new file mode 100755
index 00000000000..156da64b626
--- /dev/null
+++ b/reactos/ntoskrnl/rtl/i386/except.s
@@ -0,0 +1,291 @@
+/* $Id: except.s,v 1.4 2004/06/25 16:39:41 weiden Exp $
+ *
+ * COPYRIGHT:         See COPYING in the top level directory
+ * PROJECT:           ReactOS kernel
+ * PURPOSE:           Kernel-mode exception support for IA-32
+ * FILE:              ntoskrnl/rtl/i386/except.s
+ * PROGRAMER:         Casper S. Hornstrup (chorns@users.sourceforge.net)
+ * NOTES:             This file is shared with lib/ntdll/rtl/i386/except.s.
+ *                    Please keep them in sync.
+ */
+
+#define EXCEPTION_UNWINDING		0x02
+
+#define EREC_FLAGS				0x04
+
+#define ExceptionContinueExecution 0
+#define ExceptionContinueSearch    1
+#define ExceptionNestedException   2
+#define ExceptionCollidedUnwind    3
+
+.globl _RtlpExecuteHandlerForException
+.globl _RtlpExecuteHandlerForUnwind
+
+#define CONTEXT_FLAGS	0x00
+#define CONTEXT_SEGGS	0x8C
+#define CONTEXT_SEGFS	0x90
+#define CONTEXT_SEGES	0x94
+#define CONTEXT_SEGDS	0x98
+#define CONTEXT_EDI		0x9C
+#define CONTEXT_ESI		0xA0
+#define CONTEXT_EBX		0xA4
+#define CONTEXT_EDX		0xA8
+#define CONTEXT_ECX		0xAC
+#define CONTEXT_EAX		0xB0
+#define CONTEXT_EBP		0xB4
+#define CONTEXT_EIP		0xB8
+#define CONTEXT_SEGCS	0xBC
+#define CONTEXT_EFLAGS	0xC0
+#define CONTEXT_ESP		0xC4
+#define CONTEXT_SEGSS	0xC8
+
+
+#define RCC_CONTEXT		0x08
+
+// EAX = value to print
+_do_debug:
+	pushal
+	pushl	%eax
+	call	_AsmDebug@4
+	popal
+	ret
+
+#ifndef __NTOSKRNL__
+
+//
+// VOID
+// RtlpCaptureContext(PCONTEXT pContext);
+//
+// Parameters:
+//   [ESP+08h] - PCONTEXT_X86 pContext
+// Registers:
+//   None
+// Returns:
+//   Nothing
+// Notes:
+//   Grabs the current CPU context.
+.globl _RtlpCaptureContext
+_RtlpCaptureContext:
+	pushl   %ebp
+    movl	%esp, %ebp
+	movl	RCC_CONTEXT(%ebp), %edx		// EDX = Address of context structure
+
+	cld
+	pushf
+	pop		%eax
+	movl	%eax, CONTEXT_EFLAGS(%edx)
+	xorl	%eax, %eax
+	movl	%eax, CONTEXT_EAX(%edx)
+	movl	%eax, CONTEXT_EBX(%edx)
+	movl	%eax, CONTEXT_ECX(%edx)
+	movl	%eax, CONTEXT_EDX(%edx)
+	movl	%eax, CONTEXT_ESI(%edx)
+	movl	%eax, CONTEXT_EDI(%edx)
+	movl	%cs, %eax
+	movl	%eax, CONTEXT_SEGCS(%edx)
+	movl	%ds, %eax
+	movl	%eax, CONTEXT_SEGDS(%edx)
+	movl	%es, %eax
+	movl	%eax, CONTEXT_SEGES(%edx)
+	movl	%fs, %eax
+	movl	%eax, CONTEXT_SEGFS(%edx)
+	movl	%gs, %eax
+	movl	%eax, CONTEXT_SEGGS(%edx)
+	movl	%ss, %eax
+	movl	%eax, CONTEXT_SEGSS(%edx)
+
+	//
+	// STACK LAYOUT: - (ESP to put in context structure)
+	//               - RETURN ADDRESS OF CALLER OF CALLER
+	//               - EBP OF CALLER OF CALLER
+	//                 ...
+	//               - RETURN ADDRESS OF CALLER
+	//               - EBP OF CALLER
+	//                 ...
+	//
+
+	// Get return address of the caller of the caller of this function
+	movl	%ebp, %ebx
+	//movl	4(%ebx), %eax			// EAX = return address of caller
+	movl	(%ebx), %ebx			// EBX = EBP of caller
+
+	movl	4(%ebx), %eax			// EAX = return address of caller of caller
+	movl	(%ebx), %ebx			// EBX = EBP of caller of caller
+
+	movl	%eax, CONTEXT_EIP(%edx)	// EIP = return address of caller of caller
+	movl	%ebx, CONTEXT_EBP(%edx)	// EBP = EBP of caller of caller
+	addl	$8, %ebx
+	movl	%ebx, CONTEXT_ESP(%edx)	// ESP = EBP of caller of caller + 8
+
+    movl	%ebp, %esp
+    popl	%ebp
+    ret
+
+#endif /* !__NTOSKRNL__ */
+
+#define REH_ERECORD		0x08
+#define REH_RFRAME		0x0C
+#define REH_CONTEXT		0x10
+#define REH_DCONTEXT	0x14
+#define REH_EROUTINE	0x18
+
+// Parameters:
+//   None
+// Registers:
+//   [EBP+08h] - PEXCEPTION_RECORD ExceptionRecord
+//   [EBP+0Ch] - PEXCEPTION_REGISTRATION RegistrationFrame
+//   [EBP+10h] - PVOID Context
+//   [EBP+14h] - PVOID DispatcherContext
+//   [EBP+18h] - PEXCEPTION_HANDLER ExceptionRoutine
+//   EDX       - Address of protecting exception handler
+// Returns:
+//   EXCEPTION_DISPOSITION
+// Notes:
+//   Setup the protecting exception handler and call the exception
+//   handler in the right context.
+_RtlpExecuteHandler:
+	pushl    %ebp
+    movl     %esp, %ebp
+    pushl    REH_RFRAME(%ebp)
+
+    pushl    %edx
+    pushl    %fs:0x0
+    movl     %esp, %fs:0x0
+
+    // Prepare to call the exception handler
+    pushl    REH_DCONTEXT(%ebp)
+    pushl    REH_CONTEXT(%ebp)
+    pushl    REH_RFRAME(%ebp)
+    pushl    REH_ERECORD(%ebp)
+
+    // Now call the exception handler
+    movl     REH_EROUTINE(%ebp), %eax
+    call    *%eax
+
+	cmpl	$-1, %fs:0x0
+	jne		.reh_stack_looks_ok
+
+	// This should not happen
+	pushl	0
+	pushl	0
+	pushl	0
+	pushl	0
+	call	_RtlAssert@16
+
+.reh_loop:
+	jmp	.reh_loop
+	
+.reh_stack_looks_ok:
+    movl     %fs:0x0, %esp
+
+    // Return to the 'front-end' for this function
+    popl     %fs:0x0
+    movl     %ebp, %esp
+    popl     %ebp
+    ret
+
+
+#define REP_ERECORD     0x04
+#define REP_RFRAME      0x08
+#define REP_CONTEXT     0x0C
+#define REP_DCONTEXT    0x10
+
+// Parameters:
+//   [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord
+//   [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame
+//   [ESP+0Ch] - PCONTEXT Context
+//   [ESP+10h] - PVOID DispatcherContext
+// Registers:
+//   None
+// Returns:
+//   EXCEPTION_DISPOSITION
+// Notes:
+//    This exception handler protects the exception handling
+//    mechanism by detecting nested exceptions.
+_RtlpExceptionProtector:
+    movl     $ExceptionContinueSearch, %eax
+    movl     REP_ERECORD(%esp), %ecx
+    testl    $EXCEPTION_UNWINDING, EREC_FLAGS(%ecx)
+    jnz      .rep_end
+
+    // Unwinding is not taking place, so return ExceptionNestedException
+
+    // Set DispatcherContext field to the exception registration for the
+    // exception handler that executed when a nested exception occurred
+    movl     REP_DCONTEXT(%esp), %ecx
+    movl     REP_RFRAME(%esp), %eax
+    movl     %eax, (%ecx)
+    movl     $ExceptionNestedException, %eax
+
+.rep_end:
+    ret
+
+
+// Parameters:
+//   [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord
+//   [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame
+//   [ESP+0Ch] - PCONTEXT Context
+//   [ESP+10h] - PVOID DispatcherContext
+//   [ESP+14h] - PEXCEPTION_HANDLER ExceptionHandler
+// Registers:
+//   None
+// Returns:
+//   EXCEPTION_DISPOSITION
+// Notes:
+//   Front-end
+_RtlpExecuteHandlerForException:
+    movl     $_RtlpExceptionProtector, %edx
+    jmp      _RtlpExecuteHandler
+
+
+#define RUP_ERECORD     0x04
+#define RUP_RFRAME      0x08
+#define RUP_CONTEXT     0x0C
+#define RUP_DCONTEXT    0x10
+
+// Parameters:
+//   [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord
+//   [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame
+//   [ESP+0Ch] - PCONTEXT Context
+//   [ESP+10h] - PVOID DispatcherContext
+// Registers:
+//   None
+// Returns:
+//   EXCEPTION_DISPOSITION
+// Notes:
+//    This exception handler protects the exception handling
+//    mechanism by detecting collided unwinds.
+_RtlpUnwindProtector:
+    movl     $ExceptionContinueSearch, %eax
+    movl     %ecx, RUP_ERECORD(%esp)
+    testl    $EXCEPTION_UNWINDING, EREC_FLAGS(%ecx)
+    jz       .rup_end
+
+    // Unwinding is taking place, so return ExceptionCollidedUnwind
+
+    movl     RUP_RFRAME(%esp), %ecx
+    movl     RUP_DCONTEXT(%esp), %edx
+
+    // Set DispatcherContext field to the exception registration for the
+    // exception handler that executed when a collision occurred
+    movl     RUP_RFRAME(%ecx), %eax
+    movl     %eax, (%edx)
+    movl     $ExceptionCollidedUnwind, %eax
+
+.rup_end:
+    ret
+
+
+// Parameters:
+//   [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord
+//   [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame
+//   [ESP+0Ch] - PCONTEXT Context
+//   [ESP+10h] - PVOID DispatcherContext
+//   [ESP+14h] - PEXCEPTION_HANDLER ExceptionHandler
+// Registers:
+//   None
+// Returns:
+//   EXCEPTION_DISPOSITION
+_RtlpExecuteHandlerForUnwind:
+    movl     $_RtlpUnwindProtector, %edx
+    jmp      _RtlpExecuteHandler

From acf32a29887a1c1655ab079be86878157698166e Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Fri, 25 Jun 2004 18:50:48 +0000
Subject: [PATCH 086/356] Fix crash in loader relocation code.

svn path=/trunk/; revision=9872
---
 reactos/lib/ntdll/ldr/utils.c | 121 +++++++++++++++++++---------------
 1 file changed, 67 insertions(+), 54 deletions(-)

diff --git a/reactos/lib/ntdll/ldr/utils.c b/reactos/lib/ntdll/ldr/utils.c
index 88ec8c81f89..2ad6c65bc61 100644
--- a/reactos/lib/ntdll/ldr/utils.c
+++ b/reactos/lib/ntdll/ldr/utils.c
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.90 2004/06/20 10:36:17 gvg Exp $
+/* $Id: utils.c,v 1.91 2004/06/25 18:50:48 ekohl Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -717,7 +717,10 @@ LdrLoadDll (IN PWSTR SearchPath OPTIONAL,
   NTSTATUS              Status;
   PLDR_MODULE           Module;
 
-  TRACE_LDR("LdrLoadDll, loading %wZ%s%S\n", Name, SearchPath ? " from " : "", SearchPath ? SearchPath : L"");
+  TRACE_LDR("LdrLoadDll, loading %wZ%s%S\n",
+            Name,
+            SearchPath ? " from " : "",
+            SearchPath ? SearchPath : L"");
 
   if (Name == NULL)
     {
@@ -1217,18 +1220,19 @@ LdrGetExportByName(PVOID BaseAddress,
  * NOTE
  *
  */
-static NTSTATUS LdrPerformRelocations (PIMAGE_NT_HEADERS        NTHeaders,
-                                       PVOID                    ImageBase)
+static NTSTATUS
+LdrPerformRelocations(PIMAGE_NT_HEADERS NTHeaders,
+                      PVOID ImageBase)
 {
-  USHORT                        NumberOfEntries;
-  PUSHORT                       pValue16;
-  ULONG                 RelocationRVA;
-  ULONG                 Delta32;
-  ULONG                 Offset;
-  PULONG                        pValue32;
+  USHORT NumberOfEntries;
+  PUSHORT pValue16;
+  ULONG RelocationRVA;
+  LONG Delta32;
+  ULONG Offset;
+  PULONG pValue32;
   PRELOCATION_DIRECTORY RelocationDir;
-  PRELOCATION_ENTRY     RelocationBlock;
-  int                   i;
+  PRELOCATION_ENTRY RelocationBlock;
+  int i;
   PIMAGE_DATA_DIRECTORY RelocationDDir;
   ULONG OldProtect;
   PVOID ProtectBase;
@@ -1239,6 +1243,8 @@ static NTSTATUS LdrPerformRelocations (PIMAGE_NT_HEADERS        NTHeaders,
   NTSTATUS Status;
   PIMAGE_SECTION_HEADER Sections;
   ULONG MaxExtend;
+  ULONG RelocationBlockOffset;
+  ULONG RelocationSectionSize;
 
   if (NTHeaders->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED)
     {
@@ -1248,6 +1254,7 @@ static NTSTATUS LdrPerformRelocations (PIMAGE_NT_HEADERS        NTHeaders,
   Sections =
     (PIMAGE_SECTION_HEADER)((PVOID)NTHeaders + sizeof(IMAGE_NT_HEADERS));
   MaxExtend = 0;
+  RelocationSectionSize = 0;
   for (i = 0; i < NTHeaders->FileHeader.NumberOfSections; i++)
     {
       if (!(Sections[i].Characteristics & IMAGE_SECTION_NOLOAD))
@@ -1257,6 +1264,12 @@ static NTSTATUS LdrPerformRelocations (PIMAGE_NT_HEADERS        NTHeaders,
             (ULONG)(Sections[i].VirtualAddress + Sections[i].Misc.VirtualSize);
           MaxExtend = max(MaxExtend, Extend);
         }
+
+      if (!memcmp(Sections[i].Name,".reloc", 6))
+	{
+	  RelocationSectionSize = Sections[i].Misc.VirtualSize;
+	  DPRINT("Relocation section size: %lx\n", RelocationSectionSize);
+	}
     }
 
   RelocationDDir =
@@ -1268,7 +1281,8 @@ static NTSTATUS LdrPerformRelocations (PIMAGE_NT_HEADERS        NTHeaders,
       RelocationDir =
         (PRELOCATION_DIRECTORY)((PCHAR)ImageBase + RelocationRVA);
 
-      while (RelocationDir->SizeOfBlock)
+      RelocationBlockOffset = 0;
+      while (RelocationBlockOffset < RelocationSectionSize)
         {
           if (RelocationDir->VirtualAddress > MaxExtend)
             {
@@ -1319,7 +1333,6 @@ static NTSTATUS LdrPerformRelocations (PIMAGE_NT_HEADERS        NTHeaders,
                       return(Status);
                     }
               }
-
           for (i = 0; i < NumberOfEntries; i++)
             {
               Offset = (RelocationBlock[i].TypeOffset & 0xfff);
@@ -1352,7 +1365,7 @@ static NTSTATUS LdrPerformRelocations (PIMAGE_NT_HEADERS        NTHeaders,
                 case TYPE_RELOC_HIGHADJ:
                   /* FIXME: do the highadjust fixup  */
                   DPRINT("TYPE_RELOC_HIGHADJ fixup not implemented, sorry\n");
-                  return(STATUS_UNSUCCESSFUL);
+                  return STATUS_UNSUCCESSFUL;
 
                 default:
                   DPRINT("unexpected fixup type\n");
@@ -1388,8 +1401,10 @@ static NTSTATUS LdrPerformRelocations (PIMAGE_NT_HEADERS        NTHeaders,
           RelocationRVA += RelocationDir->SizeOfBlock;
           RelocationDir =
             (PRELOCATION_DIRECTORY) (ImageBase + RelocationRVA);
+          RelocationBlockOffset += RelocationDir->SizeOfBlock;
         }
     }
+
   return STATUS_SUCCESS;
 }
 
@@ -1427,10 +1442,9 @@ LdrpGetOrLoadModule(PWCHAR SerachPath,
 }
 
 static NTSTATUS
-LdrpProcessImportDirectoryEntry(
-   PLDR_MODULE Module,
-   PLDR_MODULE ImportedModule,
-   PIMAGE_IMPORT_MODULE_DIRECTORY ImportModuleDirectory)
+LdrpProcessImportDirectoryEntry(PLDR_MODULE Module,
+                                PLDR_MODULE ImportedModule,
+                                PIMAGE_IMPORT_MODULE_DIRECTORY ImportModuleDirectory)
 {
    NTSTATUS Status;
    PVOID* ImportAddressList;
@@ -2571,8 +2585,8 @@ LdrpAttachProcess(VOID)
 NTSTATUS STDCALL
 LdrShutdownProcess (VOID)
 {
-   LdrpDetachProcess(TRUE);
-   return STATUS_SUCCESS;
+  LdrpDetachProcess(TRUE);
+  return STATUS_SUCCESS;
 }
 
 /*
@@ -2582,48 +2596,47 @@ LdrShutdownProcess (VOID)
 NTSTATUS
 LdrpAttachThread (VOID)
 {
-   PLIST_ENTRY ModuleListHead;
-   PLIST_ENTRY Entry;
-   PLDR_MODULE Module;
-   NTSTATUS Status;
+  PLIST_ENTRY ModuleListHead;
+  PLIST_ENTRY Entry;
+  PLDR_MODULE Module;
+  NTSTATUS Status;
 
-   DPRINT("LdrpAttachThread() called for %wZ\n",
-          &ExeModule->BaseDllName);
+  DPRINT("LdrpAttachThread() called for %wZ\n",
+         &ExeModule->BaseDllName);
 
-   RtlEnterCriticalSection (NtCurrentPeb()->LoaderLock);
+  RtlEnterCriticalSection (NtCurrentPeb()->LoaderLock);
 
-   Status = LdrpInitializeTlsForThread();
+  Status = LdrpInitializeTlsForThread();
 
-   if (NT_SUCCESS(Status))
-     {
+  if (NT_SUCCESS(Status))
+    {
+      ModuleListHead = &NtCurrentPeb()->Ldr->InInitializationOrderModuleList;
+      Entry = ModuleListHead->Flink;
 
-       ModuleListHead = &NtCurrentPeb()->Ldr->InInitializationOrderModuleList;
-       Entry = ModuleListHead->Flink;
+      while (Entry != ModuleListHead)
+        {
+          Module = CONTAINING_RECORD(Entry, LDR_MODULE, InInitializationOrderModuleList);
+          if (Module->Flags & PROCESS_ATTACH_CALLED &&
+              !(Module->Flags & DONT_CALL_FOR_THREAD) &&
+              !(Module->Flags & UNLOAD_IN_PROGRESS))
+            {
+              TRACE_LDR("%wZ - Calling entry point at %x for thread attaching\n",
+                        &Module->BaseDllName, Module->EntryPoint);
+              LdrpCallDllEntry(Module, DLL_THREAD_ATTACH, NULL);
+            }
+          Entry = Entry->Flink;
+        }
 
-       while (Entry != ModuleListHead)
-         {
-           Module = CONTAINING_RECORD(Entry, LDR_MODULE, InInitializationOrderModuleList);
-           if (Module->Flags & PROCESS_ATTACH_CALLED &&
-               !(Module->Flags & DONT_CALL_FOR_THREAD) &&
-               !(Module->Flags & UNLOAD_IN_PROGRESS))
-             {
-               TRACE_LDR("%wZ - Calling entry point at %x for thread attaching\n",
-                         &Module->BaseDllName, Module->EntryPoint);
-               LdrpCallDllEntry(Module, DLL_THREAD_ATTACH, NULL);
-             }
-           Entry = Entry->Flink;
-         }
+      Entry = NtCurrentPeb()->Ldr->InLoadOrderModuleList.Flink;
+      Module = CONTAINING_RECORD(Entry, LDR_MODULE, InLoadOrderModuleList);
+      LdrpTlsCallback(Module, DLL_THREAD_ATTACH);
+    }
 
-       Entry = NtCurrentPeb()->Ldr->InLoadOrderModuleList.Flink;
-       Module = CONTAINING_RECORD(Entry, LDR_MODULE, InLoadOrderModuleList);
-       LdrpTlsCallback(Module, DLL_THREAD_ATTACH);
-     }
+  RtlLeaveCriticalSection (NtCurrentPeb()->LoaderLock);
 
-   RtlLeaveCriticalSection (NtCurrentPeb()->LoaderLock);
+  DPRINT("LdrpAttachThread() done\n");
 
-   DPRINT("LdrpAttachThread() done\n");
-
-   return Status;
+  return Status;
 }
 
 

From d5255272ce9df007e16361a686a836be0bd70f1a Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Fri, 25 Jun 2004 19:05:20 +0000
Subject: [PATCH 087/356] Fix a typo.

svn path=/trunk/; revision=9874
---
 reactos/lib/ntdll/ldr/utils.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reactos/lib/ntdll/ldr/utils.c b/reactos/lib/ntdll/ldr/utils.c
index 2ad6c65bc61..1200f1cc98f 100644
--- a/reactos/lib/ntdll/ldr/utils.c
+++ b/reactos/lib/ntdll/ldr/utils.c
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.91 2004/06/25 18:50:48 ekohl Exp $
+/* $Id: utils.c,v 1.92 2004/06/25 19:05:20 ekohl Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -1227,7 +1227,7 @@ LdrPerformRelocations(PIMAGE_NT_HEADERS NTHeaders,
   USHORT NumberOfEntries;
   PUSHORT pValue16;
   ULONG RelocationRVA;
-  LONG Delta32;
+  ULONG Delta32;
   ULONG Offset;
   PULONG pValue32;
   PRELOCATION_DIRECTORY RelocationDir;

From 75fa578ba601b2300f288d9139ba1085b53acbd6 Mon Sep 17 00:00:00 2001
From: Steven Edwards <winehacker@gmail.com>
Date: Fri, 25 Jun 2004 23:30:22 +0000
Subject: [PATCH 088/356] sndblst fixes based on patch by Sylvain Petreolle.

svn path=/trunk/; revision=9875
---
 reactos/drivers/dd/sndblst/dma.c     | 15 +++++++++++----
 reactos/drivers/dd/sndblst/makefile  |  2 ++
 reactos/drivers/dd/sndblst/portio.c  |  5 +++++
 reactos/drivers/dd/sndblst/sbdebug.h |  2 +-
 reactos/drivers/dd/sndblst/sndblst.c |  6 ++++--
 reactos/drivers/dd/sndblst/sndblst.h |  6 +++---
 6 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/reactos/drivers/dd/sndblst/dma.c b/reactos/drivers/dd/sndblst/dma.c
index cf72c558917..bbeddbbce19 100644
--- a/reactos/drivers/dd/sndblst/dma.c
+++ b/reactos/drivers/dd/sndblst/dma.c
@@ -73,6 +73,7 @@ BOOLEAN CreateDMA(PDEVICE_OBJECT DeviceObject)
     NTSTATUS Status;
     PDEVICE_EXTENSION Device = DeviceObject->DeviceExtension;
     KEVENT DMAEvent;
+    KIRQL OldIrql;
 
     // Buffersize should already be set but it isn't yet !
     Device->BufferSize = SB_BUFSIZE;
@@ -138,7 +139,9 @@ BOOLEAN CreateDMA(PDEVICE_OBJECT DeviceObject)
                                                 &Device->Buffer, FALSE);
 
     // For some reason BufferSize == 0 here?!
-    DPRINT("Buffer == 0x%x Bufsize == %u\n", Device->Buffer, Device->BufferSize);
+//    DPRINT("Buffer == 0x%x Bufsize == %u\n", Device->Buffer, Device->BufferSize);
+    DPRINT("Bufsize == %u,", Device->BufferSize);
+    DPRINT("Buffer == 0x%x\n", Device->Buffer);
 
     if (! Device->VirtualBuffer)
     {
@@ -147,14 +150,16 @@ BOOLEAN CreateDMA(PDEVICE_OBJECT DeviceObject)
         return FALSE;
     }
 
-    DPRINT("Buffer == 0x%x Bufsize == %u\n", Device->Buffer, Device->BufferSize);
+//    DPRINT("Buffer == 0x%x Bufsize == %u\n", Device->Buffer, Device->BufferSize);
+    DPRINT("Bufsize == %u,", Device->BufferSize);
+    DPRINT("Buffer == 0x%x\n", Device->Buffer);
 
     DPRINT("Calling IoAllocateMdl()\n");
     Device->Mdl = IoAllocateMdl(Device->VirtualBuffer, Device->BufferSize, FALSE, FALSE, NULL);
     DPRINT("Bufsize == %u\n", Device->BufferSize);
 
     // IS THIS RIGHT:
-    if (! Device->VirtualBuffer)
+    if (! Device->Mdl)
     {
         DPRINT("IoAllocateMdl() FAILED\n");
         // Free the HAL buffer
@@ -171,11 +176,13 @@ BOOLEAN CreateDMA(PDEVICE_OBJECT DeviceObject)
     // part II:
     KeInitializeEvent(&DMAEvent, SynchronizationEvent, FALSE);
     // Raise IRQL
+    KeRaiseIrql(DISPATCH_LEVEL,&OldIrql);
     IoAllocateAdapterChannel(Device->Adapter, DeviceObject,
                             BYTES_TO_PAGES(Device->BufferSize),
                             SoundProgramDMA, &DMAEvent);
-    DPRINT("VBuffer == 0x%x Bufsize == %u\n", Device->VirtualBuffer, Device->BufferSize);
     // Lower IRQL
+    KeLowerIrql(OldIrql);
+    DPRINT("VBuffer == 0x%x Bufsize == %u\n", Device->VirtualBuffer, Device->BufferSize);
     KeWaitForSingleObject(&DMAEvent, Executive, KernelMode, FALSE, NULL);
 
 
diff --git a/reactos/drivers/dd/sndblst/makefile b/reactos/drivers/dd/sndblst/makefile
index 8435e542515..048b520f1b8 100644
--- a/reactos/drivers/dd/sndblst/makefile
+++ b/reactos/drivers/dd/sndblst/makefile
@@ -2,6 +2,8 @@ PATH_TO_TOP = ../../..
 
 TARGET_BOOTSTRAP = yes
 
+TARGET_CFLAGS = -Wall #-Werror
+
 TARGET_TYPE = driver
 
 TARGET_NAME = sndblst
diff --git a/reactos/drivers/dd/sndblst/portio.c b/reactos/drivers/dd/sndblst/portio.c
index 7e12e414e89..6c918084fcd 100644
--- a/reactos/drivers/dd/sndblst/portio.c
+++ b/reactos/drivers/dd/sndblst/portio.c
@@ -101,6 +101,11 @@ WORD InitSoundCard(UINT BasePort)
 
     DPRINT("DSP v%d.%d\n", DSP_Major, DSP_Minor);
 
+    // if audio is disabled,
+    // version tests return 0xFF everywhere
+    if (DSP_Major == 0xFF && DSP_Minor == 0xFF)
+        return FALSE;
+
     DPRINT("Sound card initialized!\n");
     
     return (DSP_Major * 256) + DSP_Minor;
diff --git a/reactos/drivers/dd/sndblst/sbdebug.h b/reactos/drivers/dd/sndblst/sbdebug.h
index 30e7feec961..3623ae370b6 100644
--- a/reactos/drivers/dd/sndblst/sbdebug.h
+++ b/reactos/drivers/dd/sndblst/sbdebug.h
@@ -17,7 +17,7 @@
             else if (s == STATUS_ACCESS_DENIED) \
                 DPRINT("NTSTATUS == ACCESS_DENIED\n") \
             else \
-                DPRINT("NTSTATUS == FAILURE (???)\n"); \
+                DPRINT("NTSTATUS == FAILURE (Unknown)\n"); \
         }
 #else
 #define TEST_STATUS(s)
diff --git a/reactos/drivers/dd/sndblst/sndblst.c b/reactos/drivers/dd/sndblst/sndblst.c
index 85f043a564c..7cb3990155a 100644
--- a/reactos/drivers/dd/sndblst/sndblst.c
+++ b/reactos/drivers/dd/sndblst/sndblst.c
@@ -107,10 +107,10 @@ NTSTATUS InitDevice(
     
     s = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, RegistryPath, Table,
                                 &Parameters, NULL);
-*/
 
     if (! NT_SUCCESS(s))
         return s;
+*/
 
     DPRINT("Port 0x%x  IRQ %d  DMA %d\n", Parameters->Port, Parameters->IRQ, Parameters->DMA);
 
@@ -124,6 +124,7 @@ NTSTATUS InitDevice(
         // Set state indication somehow
         // Failure - what error code do we give?!
         // return STATUS_????
+        return STATUS_UNSUCCESSFUL;
     }
 
     DSP_Major = DSP_Version / 256;
@@ -453,7 +454,8 @@ DriverEntry(PDRIVER_OBJECT DriverObject,
 //  DeviceExtension = DeviceObject->DeviceExtension;
 //  DeviceExtension->BeepOn = FALSE;
 
-  return(STATUS_SUCCESS);
+//  return(STATUS_SUCCESS);
+    return(Status);
 }
 
 /* EOF */
diff --git a/reactos/drivers/dd/sndblst/sndblst.h b/reactos/drivers/dd/sndblst/sndblst.h
index 39f26614f77..deee5340abe 100644
--- a/reactos/drivers/dd/sndblst/sndblst.h
+++ b/reactos/drivers/dd/sndblst/sndblst.h
@@ -46,9 +46,9 @@
 #define IOCTL_SOUND_BASE FILE_DEVICE_SOUND
 #define IOCTL_WAVE_BASE  0x0000 // CORRECT?
 
-//#define IOCTL_MIDI_PLAY CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0006, \
-//                                METHOD_BUFFERED, FILE_WRITE_ACCESS)
-
+/* #define IOCTL_MIDI_PLAY CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0006, \
+ *                                METHOD_BUFFERED, FILE_WRITE_ACCESS)
+ */
 
 // Some constants
 

From 97a29e0c78f290be00a4723d8e96fb9c43f8311e Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Fri, 25 Jun 2004 23:47:04 +0000
Subject: [PATCH 089/356] fixed binary editing of strings in the ansi version,
 query and set the value using the unicode version in this case.

svn path=/trunk/; revision=9876
---
 reactos/subsys/system/regedit/edit.c | 46 ++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/reactos/subsys/system/regedit/edit.c b/reactos/subsys/system/regedit/edit.c
index 18a389b9240..ae38df61031 100644
--- a/reactos/subsys/system/regedit/edit.c
+++ b/reactos/subsys/system/regedit/edit.c
@@ -633,7 +633,25 @@ BOOL ModifyValue(HWND hwnd, HKEY hKey, LPCTSTR valueName, BOOL EditBin)
     }
     else if (EditBin == TRUE || type == REG_NONE || type == REG_BINARY)
     {
-        if(valueDataLen > 0)
+        #ifndef UNICODE
+        LPWSTR u_valuename;
+        int len_vname = lstrlen(valueName);
+        
+	if(len_vname > 0)
+        {
+          if(!(u_valuename = HeapAlloc(GetProcessHeap(), 0, (len_vname + 1) * sizeof(WCHAR))))
+          {
+            error(hwnd, IDS_TOO_BIG_VALUE, len_vname);
+            goto done;
+          }
+	  /* convert the ansi value name to an unicode string */
+          MultiByteToWideChar(CP_ACP, 0, valueName, -1, u_valuename, len_vname + 1);
+          valueDataLen *= sizeof(WCHAR);
+        }
+        else
+          u_valuename = L"";
+        #endif
+	if(valueDataLen > 0)
         {
 	    if(!(binValueData = HeapAlloc(GetProcessHeap(), 0, valueDataLen)))
             {
@@ -641,10 +659,21 @@ BOOL ModifyValue(HWND hwnd, HKEY hKey, LPCTSTR valueName, BOOL EditBin)
               goto done;
             }
 	    
-	    lRet = RegQueryValueEx(hKey, valueName, 0, 0, (LPBYTE)binValueData, &valueDataLen);
+	    /* force to use the unicode version, so editing strings in binary mode is correct */
+	    lRet = RegQueryValueExW(hKey,
+	                            #ifndef UNICODE
+	                            u_valuename,
+	                            #else
+	                            valueName,
+	                            #endif
+				    0, 0, (LPBYTE)binValueData, &valueDataLen);
             if (lRet != ERROR_SUCCESS)
             {
                 HeapFree(GetProcessHeap(), 0, binValueData);
+                #ifndef UNICODE
+                if(len_vname > 0)
+                  HeapFree(GetProcessHeap(), 0, u_valuename);
+                #endif
 	        error(hwnd, IDS_BAD_VALUE, valueName);
                 goto done;
             }
@@ -656,12 +685,23 @@ BOOL ModifyValue(HWND hwnd, HKEY hKey, LPCTSTR valueName, BOOL EditBin)
 
         if (DialogBox(0, MAKEINTRESOURCE(IDD_EDIT_BIN_DATA), hwnd, modify_binary_dlgproc) == IDOK)
         {
-	    lRet = RegSetValueEx(hKey, valueName, 0, type, (LPBYTE)binValueData, valueDataLen);
+	    /* force to use the unicode version, so editing strings in binary mode is correct */
+	    lRet = RegSetValueExW(hKey,
+	                          #ifndef UNICODE
+	                          u_valuename,
+	                          #else
+	                          valueName,
+	                          #endif
+				  0, type, (LPBYTE)binValueData, valueDataLen);
             if (lRet == ERROR_SUCCESS)
                 result = TRUE;
         }
         if(binValueData != NULL)
 	  HeapFree(GetProcessHeap(), 0, binValueData);
+        #ifndef UNICODE
+        if(len_vname > 0)
+          HeapFree(GetProcessHeap(), 0, u_valuename);
+        #endif
     }
     else
     {

From 2678ec03871234549f27bcd462dca5485eb91f1e Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Sat, 26 Jun 2004 08:09:55 +0000
Subject: [PATCH 090/356] fixed little gdi handle leak

svn path=/trunk/; revision=9879
---
 reactos/subsys/system/regedit/hexedit.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/reactos/subsys/system/regedit/hexedit.c b/reactos/subsys/system/regedit/hexedit.c
index b52907017a8..718faaa233c 100644
--- a/reactos/subsys/system/regedit/hexedit.c
+++ b/reactos/subsys/system/regedit/hexedit.c
@@ -506,6 +506,11 @@ HEXEDIT_WM_NCDESTROY(PHEXEDIT_DATA hed)
     LocalFree(hed->hBuffer);
   }
   
+  if(hed->hFont)
+  {
+    DeleteObject(hed->hFont);
+  }
+  
   SetWindowLong(hed->hWndSelf, 0, 0);
   HeapFree(GetProcessHeap(), 0, hed);
   

From 1336676b5ebb18074267a80fa085206671b7667e Mon Sep 17 00:00:00 2001
From: Martin Fuchs <fuchs.martin@gmail.com>
Date: Sat, 26 Jun 2004 10:43:18 +0000
Subject: [PATCH 091/356] simplified chinese explorer resources by Larry Li
 <larry@mimios.com> (not for windres)

svn path=/trunk/; revision=9880
---
 reactos/subsys/system/explorer/explorer-cn.rc | Bin 0 -> 32924 bytes
 .../subsys/system/explorer/explorer_intres.rc | 456 +-----------------
 2 files changed, 23 insertions(+), 433 deletions(-)
 create mode 100644 reactos/subsys/system/explorer/explorer-cn.rc

diff --git a/reactos/subsys/system/explorer/explorer-cn.rc b/reactos/subsys/system/explorer/explorer-cn.rc
new file mode 100644
index 0000000000000000000000000000000000000000..8a0495b15c7c912f4651de47b26b3103929f2a30
GIT binary patch
literal 32924
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
WlCP96`o7f#S^Mxitl#=xTmC<B&XSh^

literal 0
HcmV?d00001

diff --git a/reactos/subsys/system/explorer/explorer_intres.rc b/reactos/subsys/system/explorer/explorer_intres.rc
index 319d9b75cca..488e700781c 100644
--- a/reactos/subsys/system/explorer/explorer_intres.rc
+++ b/reactos/subsys/system/explorer/explorer_intres.rc
@@ -12,422 +12,6 @@
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
 
-/////////////////////////////////////////////////////////////////////////////
-// Chinese (P.R.C.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)
-#ifdef _WIN32
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
-#pragma code_page(936)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDM_DESKTOPBAR MENU DISCARDABLE 
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "ÉèÖÃ(&S)...",                 ID_DESKTOPBAR_SETTINGS
-        MENUITEM "ÈÎÎñ¹ÜÀíÆ÷(&T)...",           ID_TASKMGR
-        MENUITEM SEPARATOR
-        MENUITEM "¹ØÓÚä¯ÀÀÆ÷(&A)...",           ID_ABOUT_EXPLORER
-    END
-END
-
-IDM_MDIFRAME MENU PRELOAD DISCARDABLE 
-BEGIN
-    POPUP "Îļþ(&F)"
-    BEGIN
-        MENUITEM "Í˳ö(&X)",                    ID_FILE_EXIT
-    END
-    POPUP "²é¿´(&V)"
-    BEGIN
-        MENUITEM "¹¤¾ßÀ¸(&T)",                  ID_VIEW_TOOL_BAR
-        MENUITEM "¸½¼ÓÀ¸(&E)",                  ID_VIEW_EXTRA_BAR
-        MENUITEM "Çý¶¯Æ÷À¸(&D)",                ID_VIEW_DRIVE_BAR, CHECKED
-        MENUITEM "²à±ßÀ¸(&S)",                  ID_VIEW_SIDE_BAR
-        MENUITEM "״̬À¸(&S)",                  ID_VIEW_STATUSBAR
-        MENUITEM SEPARATOR
-        MENUITEM "Ë¢ÐÂ(&R)\tF5",                ID_REFRESH
-        MENUITEM "È«ÆÁ(&U)\tCtrl+Shift+S",      ID_VIEW_FULLSCREEN
-        MENUITEM "&SDI",                        ID_VIEW_SDI
-    END
-    POPUP "´°¿Ú(&W)"
-    BEGIN
-        MENUITEM "д°¿Ú(&W)",                  ID_WINDOW_NEW
-        MENUITEM "²ãµþÅÅÁÐ(&C)\tShift+F5",      ID_WINDOW_CASCADE
-        MENUITEM "ºáÏòƽÆÌ(&H)",                ID_WINDOW_TILE_HORZ
-        MENUITEM "×ÝÏòƽÆÌ(&V)\tShift+F4",      ID_WINDOW_TILE_VERT
-        MENUITEM "×Ô¶¯ÅÅÁÐ(&A)",                ID_WINDOW_AUTOSORT
-        MENUITEM "È«²¿×îС»¯(&S)",              ID_WINDOW_ARRANGE
-    END
-    POPUP "°ïÖú(&H)"
-    BEGIN
-        MENUITEM "ä¯ÀÀÆ÷°ïÖúÎĵµ(&F)...",       ID_EXPLORER_FAQ
-        MENUITEM "¹ØÓÚä¯ÀÀÆ÷(&A)...",           ID_ABOUT_EXPLORER
-        MENUITEM "¹ØÓÚ²Ù×÷ϵͳ(&O)...",         ID_ABOUT_WINDOWS
-    END
-END
-
-IDM_SDIFRAME MENU PRELOAD DISCARDABLE 
-BEGIN
-    POPUP "Îļþ(&F)"
-    BEGIN
-        MENUITEM "Í˳ö(&X)",                    ID_FILE_EXIT
-    END
-    POPUP "²é¿´(&V)"
-    BEGIN
-        MENUITEM "¹¤¾ßÀ¸(&T)",                  ID_VIEW_TOOL_BAR
-        MENUITEM "²à±ßÀ¸(&S)",                  ID_VIEW_SIDE_BAR, GRAYED
-        MENUITEM "״̬À¸(&S)",                  ID_VIEW_STATUSBAR
-        MENUITEM SEPARATOR
-        MENUITEM "Ë¢ÐÂ(&R)\tF5",                ID_REFRESH
-        MENUITEM "È«ÆÁ(&U)\tCtrl+Shift+S",      ID_VIEW_FULLSCREEN
-        MENUITEM "&MDI",                        ID_VIEW_MDI
-    END
-    POPUP "°ïÖú(&H)"
-    BEGIN
-        MENUITEM "ä¯ÀÀÆ÷°ïÖúÎĵµ(&F)...",       ID_EXPLORER_FAQ
-        MENUITEM "¹ØÓÚä¯ÀÀÆ÷(&A)...",           ID_ABOUT_EXPLORER
-        MENUITEM "¹ØÓÚ²Ù×÷ϵͳ(&O)...",         ID_ABOUT_WINDOWS
-    END
-END
-
-IDM_NOTIFYAREA MENU DISCARDABLE 
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "ÏÔʾÒþ²Øͼ±ê(&S)",            ID_SHOW_HIDDEN_ICONS
-        MENUITEM "ÅäÖÃÈÎÎñÀ¸Í¨ÖªÇø(&C)...",     ID_CONFIG_NOTIFYAREA
-        MENUITEM "ÉèÖÃÈÕÆÚ/ʱ¼ä(&T)...",        ID_CONFIG_TIME
-        MENUITEM SEPARATOR
-        MENUITEM "¹ØÓÚä¯ÀÀÆ÷(&A)...",           ID_ABOUT_EXPLORER
-    END
-END
-
-IDM_VOLUME MENU DISCARDABLE 
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "´ò¿ªÒôÁ¿¿ØÖÆ",                ID_TRAY_VOLUME
-        MENUITEM "µ÷ÕûÒôƵÊôÐÔ",                ID_VOLUME_PROPERTIES
-    END
-END
-
-IDM_WINEFILE MENU FIXED IMPURE 
-BEGIN
-    POPUP "Îļþ(&F)"
-    BEGIN
-        MENUITEM "´ò¿ª(&O)\tEnter",             101
-        MENUITEM "Òƶ¯(&M)...\tF7",             106
-        MENUITEM "¸´ÖÆ(&C)...\tF8",             107
-        MENUITEM "´Ó¼ôÌù°å(&I)...\tF9",         118
-        MENUITEM "ɾ³ý(&D)\tDel",               108
-        MENUITEM "ÖØÃüÃû(&N)...",               109
-        MENUITEM "ÊôÐÔ(&I)...\tAlt+Enter",      ID_EDIT_PROPERTIES
-        MENUITEM SEPARATOR
-        MENUITEM "ѹËõ(&O)...",                 119
-        MENUITEM "½âѹ(&O)...",                 120
-        MENUITEM SEPARATOR
-        MENUITEM "ÔËÐÐ(&R)...",                 ID_EXECUTE
-        MENUITEM "´òÓ¡(&P)...",                 102
-        MENUITEM "¹ØÁª(GA)...",                 103
-        MENUITEM SEPARATOR
-        MENUITEM "´´½¨Ä¿Â¼(&E)...",             ID_EXECUTE
-        MENUITEM "ËÑË÷(&H)...",                 104
-        MENUITEM "Ñ¡¶¨Îļþ(&S)...",             116
-        MENUITEM SEPARATOR
-        MENUITEM "Í˳ö(&X)\tAlt+X",             ID_FILE_EXIT
-    END
-    POPUP "´ÅÅÌ(&D)"
-    BEGIN
-        MENUITEM "¸´ÖÆ´ÅÅÌ(&C)...",             201
-        MENUITEM "±ê×¢´ÅÅÌ(&L)...",             202
-        MENUITEM SEPARATOR
-        MENUITEM "¸ñʽ»¯´ÅÅÌ(&F)...",           203
-        MENUITEM SEPARATOR
-        MENUITEM "Ó³ÉäÍøÂçÇý¶¯Æ÷(&N)",          252
-        MENUITEM "¶Ï¿ªÍøÂçÇý¶¯Æ÷(&D)",          253
-        MENUITEM SEPARATOR
-        MENUITEM "¹²ÏíΪ...",                   254
-        MENUITEM "ÒƳý¹²Ïí(&R)...",             255
-        MENUITEM SEPARATOR
-        MENUITEM "Ñ¡ÔñÇý¶¯Æ÷(&S)...",           251
-    END
-    POPUP "Ŀ¼Ê÷(&T)"
-    BEGIN
-        MENUITEM "Õ¹¿ªÒ»²ã(&X)\t+",             301
-        MENUITEM "Õ¹¿ª·ÖÖ§(&B)\t*",             302
-        MENUITEM "Õ¹¿ªÈ«²¿(&A)\tStrg+*",        303
-        MENUITEM "ÕÛµþ·ÖÖ§(&C)\t-",             304
-        MENUITEM SEPARATOR
-        MENUITEM "±íÃ÷¿ÉÕ¹¿ªµÄ·ÖÖ§(&I)",        505
-    END
-    POPUP "²é¿´(&V)"
-    BEGIN
-        MENUITEM "Ŀ¼Ê÷ÓëĿ¼(&R)",            413
-        MENUITEM "Ŀ¼Ê÷(&E)",                  411
-        MENUITEM "Ŀ¼(&O)",                    412
-        MENUITEM SEPARATOR
-        MENUITEM "²ð·Ö(&L)",                    414
-        MENUITEM SEPARATOR
-        MENUITEM "Ãû³Æ(&N)",                    ID_VIEW_NAME
-        MENUITEM "ÎļþµÄÈ«²¿Ïêϸ×ÊÁÏ(&A)",      ID_VIEW_ALL_ATTRIBUTES
-        , CHECKED
-        MENUITEM "²¿·ÖÏêϸ×ÊÁÏ(&P)...",         ID_VIEW_SELECTED_ATTRIBUTES
-        MENUITEM SEPARATOR
-        MENUITEM "°´Ãû³ÆÅÅÐò(&S)",              404
-        MENUITEM "°´ÀàÐÍÅÅÐò(&B)",              405
-        MENUITEM "°´´óСÅÅÐò(&Z)",              406
-        MENUITEM "°´ÈÕÆÚÅÅÐò(&D)",              407
-        MENUITEM SEPARATOR
-        MENUITEM "°´ÎļþÀàÐÍ(&T)...",           409
-    END
-    POPUP "Ñ¡Ïî(&O)"
-    BEGIN
-        MENUITEM "È·ÈÏ(&C)...",                 65535
-        MENUITEM "×ÖÌå(&F)...",                 65535
-        MENUITEM "×Ô¶¨Ò幤¾ßÀ¸(&B)...",         65535
-        MENUITEM SEPARATOR
-        MENUITEM "¹¤¾ßÀ¸(&T)",                  ID_VIEW_TOOL_BAR, CHECKED
-        MENUITEM "Çý¶¯Æ÷À¸(&D)",                ID_VIEW_DRIVE_BAR, CHECKED
-        MENUITEM "״̬À¸(&S)",                  ID_VIEW_STATUSBAR, CHECKED
-        MENUITEM "È«ÆÁÄ»(&U)\tCtrl+Shift+S",    ID_VIEW_FULLSCREEN
-        MENUITEM SEPARATOR
-        MENUITEM "×Ô¶¯Ëõ³Éͼ±ê(&M)",            65535
-        MENUITEM "Í˳öʱ±£´æÉ趨ֵ(&E)",        511
-    END
-    POPUP "&Security"
-    BEGIN
-        MENUITEM "&Access...",                  605
-        MENUITEM "&Logging...",                 606
-        MENUITEM "&Owner...",                   607
-    END
-    POPUP "´°¿Ú(&W)"
-    BEGIN
-        MENUITEM "д°¿Ú(&N)",                  ID_WINDOW_NEW
-        MENUITEM "²ãµþ(&C)\tCtrl+F5",           ID_WINDOW_CASCADE
-        MENUITEM "ˮƽƽÆÌ(&H)",                ID_WINDOW_TILE_HORZ
-        MENUITEM "´¹Ö±Æ½ÆÌ(&T)\tCtrl+F4",       ID_WINDOW_TILE_VERT
-        MENUITEM "×Ô¶¯ÅÅÁÐ",                    ID_WINDOW_AUTOSORT
-        MENUITEM "ÖØÅÅͼ±ê(&A)",                ID_WINDOW_ARRANGE
-        MENUITEM "Ë¢ÐÂ(&R)\tF5",                ID_REFRESH
-    END
-    POPUP "&?"
-    BEGIN
-        MENUITEM "°ïÖúÖ÷Ìâ(&H)\tF1",            ID_HELP
-        MENUITEM "°ïÖúËÑË÷(&S)...\tF1",         ID_HELP
-        MENUITEM "ʹÓðïÖú(&U)\tF1",            ID_HELP_USING
-        MENUITEM SEPARATOR
-        MENUITEM "¹ØÓÚÎļþ¹ÜÀíÆ÷(&A)...",       ID_ABOUT_WINEFILE
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE  0, 0, 212, 172
-STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "×ÀÃæÊôÐÔ"
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "Please select your prefered icon alignment algorithm:",
-                    IDC_STATIC,7,7,166,8
-    CONTROL         "left/top dwn",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | 
-                    BS_BOTTOM | WS_TABSTOP,7,25,46,44
-    CONTROL         "left/top right",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | 
-                    BS_BOTTOM | WS_TABSTOP,57,25,46,44
-    CONTROL         "right/top left",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | 
-                    BS_BOTTOM | WS_TABSTOP,110,25,46,44
-    CONTROL         "rig./top dwn",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | 
-                    BS_BOTTOM | WS_TABSTOP,159,25,46,44
-    CONTROL         "left/bot. up",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | 
-                    BS_BOTTOM | WS_TABSTOP,7,73,46,44
-    CONTROL         "left/bot. right",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | 
-                    BS_BOTTOM | WS_TABSTOP,57,73,46,44
-    CONTROL         "right/bot. left",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | 
-                    BS_BOTTOM | WS_TABSTOP,110,73,46,44
-    CONTROL         "rig./bot. dwn",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | 
-                    BS_BOTTOM | WS_TABSTOP,159,73,46,44
-    CONTROL         "border down",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | 
-                    BS_BOTTOM | WS_TABSTOP,7,121,46,44
-    CONTROL         "border H/V",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | 
-                    BS_BOTTOM | WS_TABSTOP,57,121,46,44
-    CONTROL         "round about",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | 
-                    BS_BOTTOM | WS_TABSTOP,110,121,46,44
-    CONTROL         "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | 
-                    WS_TABSTOP,159,121,46,44
-    CONTROL         "Display &Version Number",ID_DESKTOP_VERSION,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10
-END
-
-IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE  0, 0, 210, 194
-STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "¿ªÊ¼²Ëµ¥ÊôÐÔ"
-FONT 8, "MS Sans Serif"
-BEGIN
-END
-
-IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE  0, 0, 210, 194
-STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "ÈÎÎñÀ¸ÊôÐÔ"
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "ÏÔʾʱÖÓ(&C)",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,7,152,52,10
-    CONTROL         "Òþ²Ø²»»î¶¯µÄ֪ͨÇøͼ±ê(&H)",ID_HIDE_INACTIVE_ICONS,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,174,111,10
-    PUSHBUTTON      "ÈÎÎñÀ¸Í¨ÖªÇø(&N)...",ID_CONFIG_NOTIFYAREA,153,173,50,14
-END
-
-IDD_EXECUTE DIALOG FIXED IMPURE  15, 13, 210, 63
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "ÔËÐÐ"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL         "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,162,10
-    CONTROL         "ÃüÁî(&C):",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3,
-                    18,60,10
-    EDITTEXT        201,3,29,134,12,ES_AUTOHSCROLL
-    CONTROL         "As &Symbol",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,
-                    45,71,12
-    DEFPUSHBUTTON   "È·¶¨(&O)",1,158,6,47,14
-    PUSHBUTTON      "È¡Ïû(&C)",2,158,23,47,14
-    PUSHBUTTON      "°ïÖú(&H)",254,158,43,47,14
-END
-
-IDD_NOTIFYAREA DIALOGEX 0, 0, 207, 150
-STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU | WS_THICKFRAME
-EXSTYLE WS_EX_APPWINDOW
-CAPTION "ÅäÖÃ֪ͨÇøͼ±ê"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    CONTROL         "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | 
-                    TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,193,31
-    LTEXT           "ÌáʾÎÄ×Ö(&T):",IDC_LABEL1,7,44,40,8
-    EDITTEXT        IDC_NOTIFY_TOOLTIP,55,42,145,14,ES_AUTOHSCROLL
-    LTEXT           "´°¿Ú±êÌâ(&I):",IDC_LABEL2,7,63,44,8
-    EDITTEXT        IDC_NOTIFY_TITLE,55,60,145,14,ES_AUTOHSCROLL
-    LTEXT           "Ä£¿é·¾¶(&M):",IDC_LABEL3,7,81,43,8
-    EDITTEXT        IDC_NOTIFY_MODULE,55,78,145,14,ES_AUTOHSCROLL
-    GROUPBOX        "ÏÔʾģʽ(&D)",IDC_LABEL4,7,95,157,28
-    CONTROL         "ÏÔʾ(&S)",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | 
-                    WS_TABSTOP,15,107,33,10
-    CONTROL         "Òþ²Ø(&H)",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON,
-                    66,107,29,10
-    CONTROL         "×Ô¶¯Òþ²Ø(&U)",IDC_NOTIFY_AUTOHIDE,"Button",
-                    BS_AUTORADIOBUTTON,112,107,43,10
-    ICON            "",IDC_PICTURE,173,100,20,20
-    CONTROL         "ÏÔʾ±»Òþ²ØµÄ(&W)",ID_SHOW_HIDDEN_ICONS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,131,56,10
-    DEFPUSHBUTTON   "È·¶¨(&O)",IDOK,91,129,50,14,WS_GROUP
-    PUSHBUTTON      "È¡Ïû(&C)",IDCANCEL,150,129,50,14
-END
-
-IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65
-STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU | WS_THICKFRAME
-EXSTYLE WS_EX_APPWINDOW
-CAPTION "ÔÚ¿ªÊ¼²Ëµ¥ËÑË÷³ÌÐò"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    LTEXT           "&Filter:",IDC_STATIC,7,9,18,8
-    EDITTEXT        IDC_FILTER,34,7,100,14,ES_AUTOHSCROLL
-    CONTROL         "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | 
-                    LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | 
-                    WS_TABSTOP,7,25,185,33
-    PUSHBUTTON      "&Check Entries",IDC_CHECK_ENTRIES,143,7,50,14
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    IDD_SEARCH_PROGRAM, DIALOG
-    BEGIN
-        RIGHTMARGIN, 193
-        BOTTOMMARGIN, 58
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_TITLE               "Reactos ä¯ÀÀÆ÷"
-    IDS_START               "¿ªÊ¼"
-    IDS_LOGOFF              "×¢Ïú..."
-    IDS_SHUTDOWN            "¹Ø±Õ..."
-    IDS_LAUNCH              "ÔËÐÐ..."
-    IDS_START_HELP          "°ïÖú"
-    IDS_SEARCH_FILES        "ËÑË÷..."
-    IDS_DOCUMENTS           "ÎÒµÄÎĵµ"
-    IDS_FAVORITES           "ÊղؼÐ"
-    IDS_PROGRAMS            "³ÌÐò"
-    IDS_SETTINGS            "ÉèÖÃ"
-    IDS_EXPLORE             "ä¯ÀÀÆ÷"
-    IDS_EMPTY               "(¿Õ)"
-    IDS_RECENT              "×î½üµÄÎĵµ"
-    IDS_ADMIN               "¹ÜÀí¹¤¾ß"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_NETWORK             "ÍøÂç"
-    IDS_CONNECTIONS         "ÍøÂçÁ¬½Ó"
-    IDS_DRIVES              "Çý¶¯Æ÷"
-    IDS_SEARCH_COMPUTER     "ËÑË÷¼ÆËã»ú..."
-    IDS_SETTINGS_MENU       "ÉèÖò˵¥"
-    IDS_CONTROL_PANEL       "¿ØÖÆÃæ°å"
-    IDS_PRINTERS            "´òÓ¡»ú"
-    IDS_BROWSE              "ä¯ÀÀÎļþ"
-    IDS_SEARCH_PRG          "ËÑË÷³ÌÐò..."
-    IDS_ALL_USERS           "All Users\\"
-    IDS_SEARCH              "ËÑË÷"
-    IDS_ABOUT_EXPLORER      "¹ØÓÚä¯ÀÀÆ÷(&A)..."
-    IDS_LAUNCH_MANY_PROGRAMS 
-                            "ÇëÑ¡ÔñÒ»¸öÒÔÉϵÄÓ¦ÓóÌÐò¡£\nÈ·¶¨ÒªÔËÐÐÕâЩ³ÌÐòô£¿"
-    IDS_DESKTOPBAR_SETTINGS "×ÀÃæÉèÖÃ"
-    IDS_DESKTOP             "×ÀÃæ"
-    IDS_TASKBAR             "ÈÎÎñÀ¸"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_STARTMENU           "¿ªÊ¼²Ëµ¥"
-    IDS_MINIMIZE_ALL        "×îС»¯ËùÓд°¿Ú"
-    IDS_DESKTOP_NUM         "×ÀÃæ %d"
-    IDS_VOLUME              "ÒôÁ¿"
-    IDS_ITEMS_CUR           "µ±Ç°ÏîÄ¿"
-    IDS_ITEMS_CONFIGURED    "ÅäÖÃ"
-    IDS_ITEMS_VISIBLE       "¿É¼û"
-    IDS_ITEMS_HIDDEN        "Òþ²Ø"
-    IDS_NOTIFY_SHOW         "ÏÔʾ"
-    IDS_NOTIFY_HIDE         "Òþ²Ø"
-    IDS_NOTIFY_AUTOHIDE     "×Ô¶¯Òþ²Ø"
-END
-
-#endif    // Chinese (P.R.C.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
 /////////////////////////////////////////////////////////////////////////////
 // Romanian resources
 
@@ -853,6 +437,23 @@ BEGIN
 END
 
 
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+IDB_ICON_ALIGN_0        BITMAP  DISCARDABLE     "res/icoalig0.bmp"
+IDB_ICON_ALIGN_1        BITMAP  DISCARDABLE     "res/icoalig1.bmp"
+IDB_ICON_ALIGN_2        BITMAP  DISCARDABLE     "res/icoalig2.bmp"
+IDB_ICON_ALIGN_3        BITMAP  DISCARDABLE     "res/icoalig3.bmp"
+IDB_ICON_ALIGN_4        BITMAP  DISCARDABLE     "res/icoalig4.bmp"
+IDB_ICON_ALIGN_5        BITMAP  DISCARDABLE     "res/icoalig5.bmp"
+IDB_ICON_ALIGN_6        BITMAP  DISCARDABLE     "res/icoalig6.bmp"
+IDB_ICON_ALIGN_7        BITMAP  DISCARDABLE     "res/icoalig7.bmp"
+IDB_ICON_ALIGN_8        BITMAP  DISCARDABLE     "res/icoalig8.bmp"
+IDB_ICON_ALIGN_9        BITMAP  DISCARDABLE     "res/icoalig9.bmp"
+IDB_ICON_ALIGN_10       BITMAP  DISCARDABLE     "res/icoali10.bmp"
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // DESIGNINFO
@@ -872,23 +473,6 @@ END
 #endif    // APSTUDIO_INVOKED
 
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDB_ICON_ALIGN_0        BITMAP  DISCARDABLE     "res/icoalig0.bmp"
-IDB_ICON_ALIGN_1        BITMAP  DISCARDABLE     "res/icoalig1.bmp"
-IDB_ICON_ALIGN_2        BITMAP  DISCARDABLE     "res/icoalig2.bmp"
-IDB_ICON_ALIGN_3        BITMAP  DISCARDABLE     "res/icoalig3.bmp"
-IDB_ICON_ALIGN_4        BITMAP  DISCARDABLE     "res/icoalig4.bmp"
-IDB_ICON_ALIGN_5        BITMAP  DISCARDABLE     "res/icoalig5.bmp"
-IDB_ICON_ALIGN_6        BITMAP  DISCARDABLE     "res/icoalig6.bmp"
-IDB_ICON_ALIGN_7        BITMAP  DISCARDABLE     "res/icoalig7.bmp"
-IDB_ICON_ALIGN_8        BITMAP  DISCARDABLE     "res/icoalig8.bmp"
-IDB_ICON_ALIGN_9        BITMAP  DISCARDABLE     "res/icoalig9.bmp"
-IDB_ICON_ALIGN_10       BITMAP  DISCARDABLE     "res/icoali10.bmp"
-
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -909,6 +493,9 @@ END
 3 TEXTINCLUDE DISCARDABLE 
 BEGIN
     "#include ""explorer-jp.rc""\r\n"
+    "#ifndef __WINDRES__\r\n"
+    "#include ""explorer-cn.rc""\r\n"
+    "#endif\r\n"
     "\0"
 END
 
@@ -1844,6 +1431,9 @@ END
 // Generated from the TEXTINCLUDE 3 resource.
 //
 #include "explorer-jp.rc"
+#ifndef __WINDRES__
+#include "explorer-cn.rc"
+#endif
 
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED

From 9a0d240ea43b799144ba14fdf8428cd96bdbe727 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Sat, 26 Jun 2004 11:23:32 +0000
Subject: [PATCH 092/356] Stop at the real end of the relocation table.

svn path=/trunk/; revision=9881
---
 reactos/lib/ntdll/ldr/utils.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/reactos/lib/ntdll/ldr/utils.c b/reactos/lib/ntdll/ldr/utils.c
index 1200f1cc98f..e5c86e75217 100644
--- a/reactos/lib/ntdll/ldr/utils.c
+++ b/reactos/lib/ntdll/ldr/utils.c
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.92 2004/06/25 19:05:20 ekohl Exp $
+/* $Id: utils.c,v 1.93 2004/06/26 11:23:32 ekohl Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -1289,6 +1289,7 @@ LdrPerformRelocations(PIMAGE_NT_HEADERS NTHeaders,
               RelocationRVA += RelocationDir->SizeOfBlock;
               RelocationDir =
                 (PRELOCATION_DIRECTORY) (ImageBase + RelocationRVA);
+              RelocationBlockOffset += RelocationDir->SizeOfBlock;
               continue;
             }
 
@@ -1333,6 +1334,7 @@ LdrPerformRelocations(PIMAGE_NT_HEADERS NTHeaders,
                       return(Status);
                     }
               }
+
           for (i = 0; i < NumberOfEntries; i++)
             {
               Offset = (RelocationBlock[i].TypeOffset & 0xfff);

From e4c1673f8066a7a84294ea6f03c318e096fcd17b Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sat, 26 Jun 2004 12:56:11 +0000
Subject: [PATCH 093/356] - Partial implementation of CompareStringW. Fixes bug
 #378.

svn path=/trunk/; revision=9883
---
 reactos/lib/kernel32/misc/stubs.c | 42 ++++++++++++++++++++++++++++---
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/reactos/lib/kernel32/misc/stubs.c b/reactos/lib/kernel32/misc/stubs.c
index f31bd6ee07e..0c5056691c7 100644
--- a/reactos/lib/kernel32/misc/stubs.c
+++ b/reactos/lib/kernel32/misc/stubs.c
@@ -1,4 +1,4 @@
-/* $Id: stubs.c,v 1.78 2004/06/20 23:42:07 gdalsnes Exp $
+/* $Id: stubs.c,v 1.79 2004/06/26 12:56:11 navaraf Exp $
  *
  * KERNEL32.DLL stubs (unimplemented functions)
  * Remove from this file, if you implement them.
@@ -106,8 +106,44 @@ CompareStringW (
     int cchCount2
     )
 {
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return 0;
+    INT Result;
+    UNICODE_STRING String1, String2;
+
+    if (!lpString1 || !lpString2)
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return 0;
+    }
+
+    if (dwCmpFlags & ~(NORM_IGNORECASE | NORM_IGNORENONSPACE |
+        NORM_IGNORESYMBOLS | SORT_STRINGSORT | NORM_IGNOREKANATYPE |
+        NORM_IGNOREWIDTH | 0x10000000))
+    {
+        SetLastError(ERROR_INVALID_FLAGS);
+        return 0;
+    }
+
+    if (dwCmpFlags & ~NORM_IGNORECASE)
+    {
+        DPRINT1("CompareString: Unimplemented flags - 0x%x\n", 
+           dwCmpFlags & ~NORM_IGNORECASE);
+    }
+
+    if (cchCount1 < 0) cchCount1 = lstrlenW(lpString1);
+    if (cchCount2 < 0) cchCount2 = lstrlenW(lpString2);
+
+    String1.Length = String1.MaximumLength = cchCount1 * sizeof(WCHAR);
+    String1.Buffer = (LPWSTR)lpString1;
+    String2.Length = String2.MaximumLength = cchCount2 * sizeof(WCHAR);
+    String2.Buffer = (LPWSTR)lpString2;
+
+    Result = RtlCompareUnicodeString(
+       &String1, &String2, dwCmpFlags & NORM_IGNORECASE);
+
+    if (Result) /* need to translate result */
+        return (Result < 0) ? CSTR_LESS_THAN : CSTR_GREATER_THAN;
+
+    return CSTR_EQUAL;
 }
 
 

From 399da202962e9864d833495ad22cb7058cb00609 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sat, 26 Jun 2004 14:37:05 +0000
Subject: [PATCH 094/356] - Rewritten relocation code to not make invalid
 assumptions (".reloc" section name) and to not unprotect second page (not
 needed really).

svn path=/trunk/; revision=9884
---
 reactos/lib/ntdll/ldr/utils.c | 235 ++++++++++------------------------
 1 file changed, 68 insertions(+), 167 deletions(-)

diff --git a/reactos/lib/ntdll/ldr/utils.c b/reactos/lib/ntdll/ldr/utils.c
index e5c86e75217..c152a119888 100644
--- a/reactos/lib/ntdll/ldr/utils.c
+++ b/reactos/lib/ntdll/ldr/utils.c
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.93 2004/06/26 11:23:32 ekohl Exp $
+/* $Id: utils.c,v 1.94 2004/06/26 14:37:05 navaraf Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -1224,187 +1224,88 @@ static NTSTATUS
 LdrPerformRelocations(PIMAGE_NT_HEADERS NTHeaders,
                       PVOID ImageBase)
 {
-  USHORT NumberOfEntries;
-  PUSHORT pValue16;
-  ULONG RelocationRVA;
-  ULONG Delta32;
-  ULONG Offset;
-  PULONG pValue32;
-  PRELOCATION_DIRECTORY RelocationDir;
-  PRELOCATION_ENTRY RelocationBlock;
-  int i;
   PIMAGE_DATA_DIRECTORY RelocationDDir;
-  ULONG OldProtect;
-  PVOID ProtectBase;
-  ULONG ProtectSize;
-  ULONG OldProtect2;
-  PVOID ProtectBase2;
-  ULONG ProtectSize2;
+  PIMAGE_BASE_RELOCATION RelocationDir, RelocationEnd;
+  ULONG Count, ProtectSize, OldProtect, i;
+  PVOID Page, ProtectPage;
+  PWORD TypeOffset;
+  ULONG Delta = (ULONG_PTR)ImageBase - NTHeaders->OptionalHeader.ImageBase;
   NTSTATUS Status;
-  PIMAGE_SECTION_HEADER Sections;
-  ULONG MaxExtend;
-  ULONG RelocationBlockOffset;
-  ULONG RelocationSectionSize;
 
   if (NTHeaders->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED)
     {
       return STATUS_UNSUCCESSFUL;
     }
 
-  Sections =
-    (PIMAGE_SECTION_HEADER)((PVOID)NTHeaders + sizeof(IMAGE_NT_HEADERS));
-  MaxExtend = 0;
-  RelocationSectionSize = 0;
-  for (i = 0; i < NTHeaders->FileHeader.NumberOfSections; i++)
-    {
-      if (!(Sections[i].Characteristics & IMAGE_SECTION_NOLOAD))
-        {
-          ULONG Extend;
-          Extend =
-            (ULONG)(Sections[i].VirtualAddress + Sections[i].Misc.VirtualSize);
-          MaxExtend = max(MaxExtend, Extend);
-        }
-
-      if (!memcmp(Sections[i].Name,".reloc", 6))
-	{
-	  RelocationSectionSize = Sections[i].Misc.VirtualSize;
-	  DPRINT("Relocation section size: %lx\n", RelocationSectionSize);
-	}
-    }
-
   RelocationDDir =
     &NTHeaders->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC];
-  RelocationRVA = RelocationDDir->VirtualAddress;
 
-  if (RelocationRVA)
+  if (RelocationDDir->VirtualAddress == 0 || RelocationDDir->Size == 0)
     {
-      RelocationDir =
-        (PRELOCATION_DIRECTORY)((PCHAR)ImageBase + RelocationRVA);
+      return STATUS_SUCCESS;
+    }
+   
+  ProtectSize = PAGE_SIZE;
+  RelocationDir = (IMAGE_BASE_RELOCATION*)((ULONG_PTR)ImageBase + 
+                  RelocationDDir->VirtualAddress);
+  RelocationEnd = (IMAGE_BASE_RELOCATION*)((ULONG_PTR)ImageBase +
+                  RelocationDDir->VirtualAddress + RelocationDDir->Size);
+  while (RelocationDir < RelocationEnd &&
+         RelocationDir->SizeOfBlock > 0)
+    {
+      Count = (RelocationDir->SizeOfBlock - sizeof(IMAGE_BASE_RELOCATION)) /
+              sizeof(WORD);
+      Page = ImageBase + RelocationDir->VirtualAddress;
+      TypeOffset = (PWORD)(RelocationDir + 1);
 
-      RelocationBlockOffset = 0;
-      while (RelocationBlockOffset < RelocationSectionSize)
+      /* Unprotect the page we're about to relocate. */
+      ProtectPage = Page;
+      Status = NtProtectVirtualMemory(NtCurrentProcess(),
+                                      &ProtectPage,
+                                      &ProtectSize,
+                                      PAGE_READWRITE,
+                                      &OldProtect);
+      if (!NT_SUCCESS(Status))
         {
-          if (RelocationDir->VirtualAddress > MaxExtend)
-            {
-              RelocationRVA += RelocationDir->SizeOfBlock;
-              RelocationDir =
-                (PRELOCATION_DIRECTORY) (ImageBase + RelocationRVA);
-              RelocationBlockOffset += RelocationDir->SizeOfBlock;
-              continue;
-            }
-
-          Delta32 = (ULONG)(ImageBase - NTHeaders->OptionalHeader.ImageBase);
-          RelocationBlock =
-            (PRELOCATION_ENTRY) (RelocationRVA + ImageBase +
-                                 sizeof (RELOCATION_DIRECTORY));
-          NumberOfEntries =
-            RelocationDir->SizeOfBlock - sizeof (RELOCATION_DIRECTORY);
-          NumberOfEntries = NumberOfEntries / sizeof (RELOCATION_ENTRY);
-
-          ProtectBase = ImageBase + RelocationDir->VirtualAddress;
-          ProtectSize = PAGE_SIZE;
-          Status = NtProtectVirtualMemory(NtCurrentProcess(),
-                                          &ProtectBase,
-                                          &ProtectSize,
-                                          PAGE_READWRITE,
-                                          &OldProtect);
-          if (!NT_SUCCESS(Status))
-            {
-              DPRINT1("Failed to unprotect relocation target.\n");
-              return(Status);
-            }
-
-          if (RelocationDir->VirtualAddress + PAGE_SIZE < MaxExtend)
-            {
-                  ProtectBase2 = ImageBase + RelocationDir->VirtualAddress + PAGE_SIZE;
-                  ProtectSize2 = PAGE_SIZE;
-                  Status = NtProtectVirtualMemory(NtCurrentProcess(),
-                                                  &ProtectBase2,
-                                                  &ProtectSize2,
-                                                  PAGE_READWRITE,
-                                                  &OldProtect2);
-                  if (!NT_SUCCESS(Status))
-                    {
-                      DPRINT1("Failed to unprotect relocation target (2).\n");
-                      NtProtectVirtualMemory(NtCurrentProcess(),
-                                             &ProtectBase,
-                                             &ProtectSize,
-                                             OldProtect,
-                                             &OldProtect);
-                      return(Status);
-                    }
-              }
-
-          for (i = 0; i < NumberOfEntries; i++)
-            {
-              Offset = (RelocationBlock[i].TypeOffset & 0xfff);
-              Offset += (ULONG)(RelocationDir->VirtualAddress + ImageBase);
-
-              /*
-               * What kind of relocations should we perform
-               * for the current entry?
-               */
-              switch (RelocationBlock[i].TypeOffset >> 12)
-                {
-                case TYPE_RELOC_ABSOLUTE:
-                  break;
-
-                case TYPE_RELOC_HIGH:
-                  pValue16 = (PUSHORT)Offset;
-                  *pValue16 += Delta32 >> 16;
-                  break;
-
-                case TYPE_RELOC_LOW:
-                  pValue16 = (PUSHORT)Offset;
-                  *pValue16 += Delta32 & 0xffff;
-                  break;
-
-                case TYPE_RELOC_HIGHLOW:
-                  pValue32 = (PULONG)Offset;
-                  *pValue32 += Delta32;
-                  break;
-
-                case TYPE_RELOC_HIGHADJ:
-                  /* FIXME: do the highadjust fixup  */
-                  DPRINT("TYPE_RELOC_HIGHADJ fixup not implemented, sorry\n");
-                  return STATUS_UNSUCCESSFUL;
-
-                default:
-                  DPRINT("unexpected fixup type\n");
-                  return STATUS_UNSUCCESSFUL;
-                }
-            }
-
-          Status = NtProtectVirtualMemory(NtCurrentProcess(),
-                                          &ProtectBase,
-                                          &ProtectSize,
-                                          OldProtect,
-                                          &OldProtect);
-          if (!NT_SUCCESS(Status))
-            {
-              DPRINT1("Failed to protect relocation target.\n");
-              return(Status);
-            }
-
-          if (RelocationDir->VirtualAddress + PAGE_SIZE < MaxExtend)
-            {
-                  Status = NtProtectVirtualMemory(NtCurrentProcess(),
-                                                  &ProtectBase2,
-                                                  &ProtectSize2,
-                                                  OldProtect2,
-                                                  &OldProtect2);
-                  if (!NT_SUCCESS(Status))
-                    {
-                      DPRINT1("Failed to protect relocation target2.\n");
-                      return(Status);
-                    }
-            }
-
-          RelocationRVA += RelocationDir->SizeOfBlock;
-          RelocationDir =
-            (PRELOCATION_DIRECTORY) (ImageBase + RelocationRVA);
-          RelocationBlockOffset += RelocationDir->SizeOfBlock;
+          DPRINT1("Failed to unprotect relocation target.\n");
+          return(Status);
         }
+
+      /* Patch the page. */
+      for (i = 0; i < Count; i++)
+        {
+          SHORT Offset = TypeOffset[i] & 0xFFF;
+          USHORT Type = TypeOffset[i] >> 12;
+
+          switch (Type)
+            {
+              case IMAGE_REL_BASED_ABSOLUTE:
+                break;
+              case IMAGE_REL_BASED_HIGH:
+                *(PUSHORT)(Page + Offset) += HIWORD(Delta);
+                break;
+              case IMAGE_REL_BASED_LOW:
+                *(PUSHORT)(Page + Offset) += LOWORD(Delta);
+                break;
+              case IMAGE_REL_BASED_HIGHLOW:
+                *(PULONG)(Page + Offset) += Delta;
+                break;
+              case IMAGE_REL_BASED_HIGHADJ:
+              default:
+                DPRINT("Unknown/unsupported fixup type %d.\n", type);
+                return STATUS_UNSUCCESSFUL;
+            }
+        }
+
+      /* Restore old page protection. */
+      NtProtectVirtualMemory(NtCurrentProcess(),
+                             &ProtectPage,
+                             &ProtectSize,
+                             OldProtect,
+                             &OldProtect);
+
+      RelocationDir = (IMAGE_BASE_RELOCATION*)((ULONG_PTR)RelocationDir +
+                      RelocationDir->SizeOfBlock);
     }
 
   return STATUS_SUCCESS;

From 9cea7cc06ce4344a3d0389945e14eb0868ee3577 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sat, 26 Jun 2004 15:11:14 +0000
Subject: [PATCH 095/356] - Readded the code for unportecting second page while
 relocating. Some applications like OpenOffice actually depend on it.

svn path=/trunk/; revision=9885
---
 reactos/lib/ntdll/ldr/utils.c | 39 +++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/reactos/lib/ntdll/ldr/utils.c b/reactos/lib/ntdll/ldr/utils.c
index c152a119888..e68ef93bcaa 100644
--- a/reactos/lib/ntdll/ldr/utils.c
+++ b/reactos/lib/ntdll/ldr/utils.c
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.94 2004/06/26 14:37:05 navaraf Exp $
+/* $Id: utils.c,v 1.95 2004/06/26 15:11:14 navaraf Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -1226,8 +1226,8 @@ LdrPerformRelocations(PIMAGE_NT_HEADERS NTHeaders,
 {
   PIMAGE_DATA_DIRECTORY RelocationDDir;
   PIMAGE_BASE_RELOCATION RelocationDir, RelocationEnd;
-  ULONG Count, ProtectSize, OldProtect, i;
-  PVOID Page, ProtectPage;
+  ULONG Count, ProtectSize, OldProtect, OldProtect2, i;
+  PVOID Page, ProtectPage, ProtectPage2;
   PWORD TypeOffset;
   ULONG Delta = (ULONG_PTR)ImageBase - NTHeaders->OptionalHeader.ImageBase;
   NTSTATUS Status;
@@ -1258,7 +1258,7 @@ LdrPerformRelocations(PIMAGE_NT_HEADERS NTHeaders,
       Page = ImageBase + RelocationDir->VirtualAddress;
       TypeOffset = (PWORD)(RelocationDir + 1);
 
-      /* Unprotect the page we're about to relocate. */
+      /* Unprotect the page(s) we're about to relocate. */
       ProtectPage = Page;
       Status = NtProtectVirtualMemory(NtCurrentProcess(),
                                       &ProtectPage,
@@ -1271,6 +1271,27 @@ LdrPerformRelocations(PIMAGE_NT_HEADERS NTHeaders,
           return(Status);
         }
 
+      if (RelocationDir->VirtualAddress + PAGE_SIZE <
+          NTHeaders->OptionalHeader.SizeOfImage)
+        {
+          ProtectPage2 = ProtectPage + PAGE_SIZE;
+          Status = NtProtectVirtualMemory(NtCurrentProcess(),
+                                          &ProtectPage2,
+                                          &ProtectSize,
+                                          PAGE_READWRITE,
+                                          &OldProtect2);
+          if (!NT_SUCCESS(Status))
+            {
+              DPRINT1("Failed to unprotect relocation target (2).\n");
+              NtProtectVirtualMemory(NtCurrentProcess(),
+                                     &ProtectPage,
+                                     &ProtectSize,
+                                     OldProtect,
+                                     &OldProtect);
+              return(Status);
+            }
+        }
+
       /* Patch the page. */
       for (i = 0; i < Count; i++)
         {
@@ -1304,6 +1325,16 @@ LdrPerformRelocations(PIMAGE_NT_HEADERS NTHeaders,
                              OldProtect,
                              &OldProtect);
 
+      if (RelocationDir->VirtualAddress + PAGE_SIZE <
+          NTHeaders->OptionalHeader.SizeOfImage)
+        {
+          NtProtectVirtualMemory(NtCurrentProcess(),
+                                 &ProtectPage2,
+                                 &ProtectSize,
+                                 OldProtect2,
+                                 &OldProtect2);
+        }
+
       RelocationDir = (IMAGE_BASE_RELOCATION*)((ULONG_PTR)RelocationDir +
                       RelocationDir->SizeOfBlock);
     }

From 4ba7ff413b263a3718643ec0e4e139753f7b4751 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sat, 26 Jun 2004 18:22:14 +0000
Subject: [PATCH 096/356] - Set the palette for image list DIBs that has 8 or
 less bits per pixel.

svn path=/trunk/; revision=9888
---
 reactos/lib/comctl32/imagelist.c | 57 ++++++++++++++++++++++++--------
 1 file changed, 43 insertions(+), 14 deletions(-)

diff --git a/reactos/lib/comctl32/imagelist.c b/reactos/lib/comctl32/imagelist.c
index 77c795b66fa..8ed4b6d0260 100644
--- a/reactos/lib/comctl32/imagelist.c
+++ b/reactos/lib/comctl32/imagelist.c
@@ -1112,7 +1112,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp)
     /*
      * Draw the initial image
      */
-    if(fStyle & ILD_MASK) {
+    if (fStyle & ILD_MASK) {
 	if (himl->hbmMask) {
             BitBlt(hImageDC, 0, 0, cx, cy, hMaskListDC, lx, ly, SRCCOPY);
 	} else {
@@ -2824,23 +2824,52 @@ static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT width, UINT
     if ((ilc >= ILC_COLOR4 && ilc <= ILC_COLOR32) || ilc == ILC_COLOR)
     {
         VOID* bits;
-        BITMAPINFO bmi;
+        BITMAPINFO *bmi;
 
         TRACE("Creating DIBSection: %d Bits per Pixel\n", himl->uBitsPixel);
 
-	bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
-	bmi.bmiHeader.biWidth = width;
-	bmi.bmiHeader.biHeight = height;
-	bmi.bmiHeader.biPlanes = 1;
-	bmi.bmiHeader.biBitCount = himl->uBitsPixel;
-	bmi.bmiHeader.biCompression = BI_RGB;
-	bmi.bmiHeader.biSizeImage = 0;
-	bmi.bmiHeader.biXPelsPerMeter = 0;
-	bmi.bmiHeader.biYPelsPerMeter = 0;
-	bmi.bmiHeader.biClrUsed = 0;
-	bmi.bmiHeader.biClrImportant = 0;
+	if (himl->uBitsPixel <= ILC_COLOR8)
+	{
+	    LPPALETTEENTRY pal;
+	    ULONG i, colors;
+	    BYTE temp;
 
-	hbmNewBitmap = CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, &bits, 0, 0);
+	    colors = 1 << himl->uBitsPixel;
+	    bmi = HeapAlloc(GetProcessHeap(), 0, sizeof(BITMAPINFOHEADER) +
+	                    sizeof(PALETTEENTRY) * colors);
+
+	    pal = (LPPALETTEENTRY)bmi->bmiColors;
+	    GetPaletteEntries(GetStockObject(DEFAULT_PALETTE), 0, colors, pal);
+
+	    /* Swap colors returned by GetPaletteEntries so we can use them for
+	     * CreateDIBSection call. */
+	    for (i = 0; i < colors; i++)
+	    {
+	        temp = pal[i].peBlue;
+	        bmi->bmiColors[i].rgbRed = pal[i].peRed;
+	        bmi->bmiColors[i].rgbBlue = temp;
+	    }
+	}
+	else
+	{
+	    bmi = HeapAlloc(GetProcessHeap(), 0, sizeof(BITMAPINFOHEADER));
+	}
+
+	bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
+	bmi->bmiHeader.biWidth = width;
+	bmi->bmiHeader.biHeight = height;
+	bmi->bmiHeader.biPlanes = 1;
+	bmi->bmiHeader.biBitCount = himl->uBitsPixel;
+	bmi->bmiHeader.biCompression = BI_RGB;
+	bmi->bmiHeader.biSizeImage = 0;
+	bmi->bmiHeader.biXPelsPerMeter = 0;
+	bmi->bmiHeader.biYPelsPerMeter = 0;
+	bmi->bmiHeader.biClrUsed = 0;
+	bmi->bmiHeader.biClrImportant = 0;
+
+	hbmNewBitmap = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, &bits, 0, 0);
+
+	HeapFree(GetProcessHeap(), 0, bmi);
     }
     else /*if (ilc == ILC_COLORDDB)*/
     {

From 2859278f6eb0a8c7dd5df2745af8f5f3ca986caa Mon Sep 17 00:00:00 2001
From: Gunnar Dalsnes <hardon@online.no>
Date: Sat, 26 Jun 2004 20:02:31 +0000
Subject: [PATCH 097/356] Whole file ripped from Wine's
 dlls\\kernel\\lcformat.c, rev 1.7 and is unchanged except that includes are
 different. I thought about adding @implemented to each exported function, but
 this might make merging harder

svn path=/trunk/; revision=9889
---
 reactos/lib/kernel32/misc/lcformat.c | 1947 ++++++++++++++++++++++++++
 1 file changed, 1947 insertions(+)
 create mode 100644 reactos/lib/kernel32/misc/lcformat.c

diff --git a/reactos/lib/kernel32/misc/lcformat.c b/reactos/lib/kernel32/misc/lcformat.c
new file mode 100644
index 00000000000..03cad7eb433
--- /dev/null
+++ b/reactos/lib/kernel32/misc/lcformat.c
@@ -0,0 +1,1947 @@
+/*
+ * Locale-dependent format handling
+ *
+ * Copyright 1995 Martin von Loewis
+ * Copyright 1998 David Lee Lambert
+ * Copyright 2000 Julio César Gázquez
+ * Copyright 2003 Jon Griffiths
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/*
+ * Whole file ripped from Wine's dlls\kernel\lcformat.c, rev 1.7 and is 
+ * unchanged except that includes are different. I thought about adding
+ * @implemeted to each exported function, but this might make merging harder?
+ * -Gunnar
+ */
+ 
+#define WINVER 0x0500
+
+#include <k32.h>
+
+#include "wine/config.h"
+#include "wine/port.h"
+#include "wine/debug.h"
+#include "wine/unicode.h"
+
+
+WINE_DEFAULT_DEBUG_CHANNEL(nls);
+
+#define DATE_DATEVARSONLY 0x0100  /* only date stuff: yMdg */
+#define TIME_TIMEVARSONLY 0x0200  /* only time stuff: hHmst */
+
+/* Since calculating the formatting data for each locale is time-consuming,
+ * we get the format data for each locale only once and cache it in memory.
+ * We cache both the system default and user overridden data, after converting
+ * them into the formats that the functions here expect. Since these functions
+ * will typically be called with only a small number of the total locales
+ * installed, the memory overhead is minimal while the speedup is significant.
+ *
+ * Our cache takes the form of a singly linked list, whose node is below:
+ */
+#define NLS_NUM_CACHED_STRINGS 45
+
+typedef struct _NLS_FORMAT_NODE
+{
+  LCID  lcid;         /* Locale Id */
+  DWORD dwFlags;      /* 0 or LOCALE_NOUSEROVERRIDE */
+  DWORD dwCodePage;   /* Default code page (if LOCALE_USE_ANSI_CP not given) */
+  NUMBERFMTW   fmt;   /* Default format for numbers */
+  CURRENCYFMTW cyfmt; /* Default format for currencies */
+  LPWSTR lppszStrings[NLS_NUM_CACHED_STRINGS]; /* Default formats,day/month names */
+  WCHAR szShortAM[2]; /* Short 'AM' marker */
+  WCHAR szShortPM[2]; /* Short 'PM' marker */
+  struct _NLS_FORMAT_NODE *next;
+} NLS_FORMAT_NODE;
+
+/* Macros to get particular data strings from a format node */
+#define GetNegative(fmt)  fmt->lppszStrings[0]
+#define GetLongDate(fmt)  fmt->lppszStrings[1]
+#define GetShortDate(fmt) fmt->lppszStrings[2]
+#define GetTime(fmt)      fmt->lppszStrings[3]
+#define GetAM(fmt)        fmt->lppszStrings[42]
+#define GetPM(fmt)        fmt->lppszStrings[43]
+#define GetYearMonth(fmt) fmt->lppszStrings[44]
+
+#define GetLongDay(fmt,day)    fmt->lppszStrings[4 + day]
+#define GetShortDay(fmt,day)   fmt->lppszStrings[11 + day]
+#define GetLongMonth(fmt,mth)  fmt->lppszStrings[18 + mth]
+#define GetShortMonth(fmt,mth) fmt->lppszStrings[30 + mth]
+
+/* Write access to the cache is protected by this critical section */
+static CRITICAL_SECTION NLS_FormatsCS;
+static CRITICAL_SECTION_DEBUG NLS_FormatsCS_debug =
+{
+    0, 0, &NLS_FormatsCS,
+    { &NLS_FormatsCS_debug.ProcessLocksList,
+      &NLS_FormatsCS_debug.ProcessLocksList },
+      0, 0, { 0, (DWORD)(__FILE__ ": NLS_Formats") }
+};
+static CRITICAL_SECTION NLS_FormatsCS = { &NLS_FormatsCS_debug, -1, 0, 0, 0, 0 };
+
+/**************************************************************************
+ * NLS_GetLocaleNumber <internal>
+ *
+ * Get a numeric locale format value.
+ */
+static DWORD NLS_GetLocaleNumber(LCID lcid, DWORD dwFlags)
+{
+  WCHAR szBuff[80];
+  DWORD dwVal = 0;
+
+  szBuff[0] = '\0';
+  GetLocaleInfoW(lcid, dwFlags, szBuff, sizeof(szBuff) / sizeof(WCHAR));
+
+  if (szBuff[0] && szBuff[1] == ';' && szBuff[2] != '0')
+    dwVal = (szBuff[0] - '0') * 10 + (szBuff[2] - '0');
+  else
+  {
+    const WCHAR* iter = szBuff;
+    dwVal = 0;
+    while(*iter >= '0' && *iter <= '9')
+      dwVal = dwVal * 10 + (*iter++ - '0');
+  }
+  return dwVal;
+}
+
+/**************************************************************************
+ * NLS_GetLocaleString <internal>
+ *
+ * Get a string locale format value.
+ */
+static WCHAR* NLS_GetLocaleString(LCID lcid, DWORD dwFlags)
+{
+  WCHAR szBuff[80], *str;
+  DWORD dwLen;
+
+  szBuff[0] = '\0';
+  GetLocaleInfoW(lcid, dwFlags, szBuff, sizeof(szBuff) / sizeof(WCHAR));
+  dwLen = strlenW(szBuff) + 1;
+  str = HeapAlloc(GetProcessHeap(), 0, dwLen * sizeof(WCHAR));
+  if (str)
+    memcpy(str, szBuff, dwLen * sizeof(WCHAR));
+  return str;
+}
+
+#define GET_LOCALE_NUMBER(num, type) num = NLS_GetLocaleNumber(lcid, type|dwFlags); \
+  TRACE( #type ": %ld (%08lx)\n", (DWORD)num, (DWORD)num)
+
+#define GET_LOCALE_STRING(str, type) str = NLS_GetLocaleString(lcid, type|dwFlags); \
+  TRACE( #type ": '%s'\n", debugstr_w(str))
+
+/**************************************************************************
+ * NLS_GetFormats <internal>
+ *
+ * Calculate (and cache) the number formats for a locale.
+ */
+static const NLS_FORMAT_NODE *NLS_GetFormats(LCID lcid, DWORD dwFlags)
+{
+  /* GetLocaleInfo() identifiers for cached formatting strings */
+  static const USHORT NLS_LocaleIndices[] = {
+    LOCALE_SNEGATIVESIGN,
+    LOCALE_SLONGDATE,   LOCALE_SSHORTDATE,
+    LOCALE_STIMEFORMAT,
+    LOCALE_SDAYNAME1, LOCALE_SDAYNAME2, LOCALE_SDAYNAME3,
+    LOCALE_SDAYNAME4, LOCALE_SDAYNAME5, LOCALE_SDAYNAME6, LOCALE_SDAYNAME7,
+    LOCALE_SABBREVDAYNAME1, LOCALE_SABBREVDAYNAME2, LOCALE_SABBREVDAYNAME3,
+    LOCALE_SABBREVDAYNAME4, LOCALE_SABBREVDAYNAME5, LOCALE_SABBREVDAYNAME6,
+    LOCALE_SABBREVDAYNAME7,
+    LOCALE_SMONTHNAME1, LOCALE_SMONTHNAME2, LOCALE_SMONTHNAME3,
+    LOCALE_SMONTHNAME4, LOCALE_SMONTHNAME5, LOCALE_SMONTHNAME6,
+    LOCALE_SMONTHNAME7, LOCALE_SMONTHNAME8, LOCALE_SMONTHNAME9,
+    LOCALE_SMONTHNAME10, LOCALE_SMONTHNAME11, LOCALE_SMONTHNAME12,
+    LOCALE_SABBREVMONTHNAME1, LOCALE_SABBREVMONTHNAME2, LOCALE_SABBREVMONTHNAME3,
+    LOCALE_SABBREVMONTHNAME4, LOCALE_SABBREVMONTHNAME5, LOCALE_SABBREVMONTHNAME6,
+    LOCALE_SABBREVMONTHNAME7, LOCALE_SABBREVMONTHNAME8, LOCALE_SABBREVMONTHNAME9,
+    LOCALE_SABBREVMONTHNAME10, LOCALE_SABBREVMONTHNAME11, LOCALE_SABBREVMONTHNAME12,
+    LOCALE_S1159, LOCALE_S2359,
+    LOCALE_SYEARMONTH
+  };
+  static NLS_FORMAT_NODE *NLS_CachedFormats = NULL;
+  NLS_FORMAT_NODE *node = NLS_CachedFormats;
+
+  dwFlags &= LOCALE_NOUSEROVERRIDE;
+
+  TRACE("(0x%04lx,0x%08lx)\n", lcid, dwFlags);
+
+  /* See if we have already cached the locales number format */
+  while (node && (node->lcid != lcid || node->dwFlags != dwFlags) && node->next)
+    node = node->next;
+
+  if (!node || node->lcid != lcid || node->dwFlags != dwFlags)
+  {
+    NLS_FORMAT_NODE *new_node;
+    DWORD i;
+
+    TRACE("Creating new cache entry\n");
+
+    if (!(new_node = HeapAlloc(GetProcessHeap(), 0, sizeof(NLS_FORMAT_NODE))))
+      return NULL;
+
+    GET_LOCALE_NUMBER(new_node->dwCodePage, LOCALE_IDEFAULTANSICODEPAGE);
+
+    /* Number Format */
+    new_node->lcid = lcid;
+    new_node->dwFlags = dwFlags;
+    new_node->next = NULL;
+
+    GET_LOCALE_NUMBER(new_node->fmt.NumDigits, LOCALE_IDIGITS);
+    GET_LOCALE_NUMBER(new_node->fmt.LeadingZero, LOCALE_ILZERO);
+    GET_LOCALE_NUMBER(new_node->fmt.NegativeOrder, LOCALE_INEGNUMBER);
+
+    GET_LOCALE_NUMBER(new_node->fmt.Grouping, LOCALE_SGROUPING);
+    if (new_node->fmt.Grouping > 9 && new_node->fmt.Grouping != 32)
+    {
+      WARN("LOCALE_SGROUPING (%d) unhandled, please report!\n",
+           new_node->fmt.Grouping);
+      new_node->fmt.Grouping = 0;
+    }
+
+    GET_LOCALE_STRING(new_node->fmt.lpDecimalSep, LOCALE_SDECIMAL);
+    GET_LOCALE_STRING(new_node->fmt.lpThousandSep, LOCALE_STHOUSAND);
+
+    /* Currency Format */
+    new_node->cyfmt.NumDigits = new_node->fmt.NumDigits;
+    new_node->cyfmt.LeadingZero = new_node->fmt.LeadingZero;
+
+    GET_LOCALE_NUMBER(new_node->cyfmt.Grouping, LOCALE_SGROUPING);
+
+    if (new_node->cyfmt.Grouping > 9)
+    {
+      WARN("LOCALE_SMONGROUPING (%d) unhandled, please report!\n",
+           new_node->cyfmt.Grouping);
+      new_node->cyfmt.Grouping = 0;
+    }
+
+    GET_LOCALE_NUMBER(new_node->cyfmt.NegativeOrder, LOCALE_INEGCURR);
+    if (new_node->cyfmt.NegativeOrder > 15)
+    {
+      WARN("LOCALE_INEGCURR (%d) unhandled, please report!\n",
+           new_node->cyfmt.NegativeOrder);
+      new_node->cyfmt.NegativeOrder = 0;
+    }
+    GET_LOCALE_NUMBER(new_node->cyfmt.PositiveOrder, LOCALE_ICURRENCY);
+    if (new_node->cyfmt.PositiveOrder > 3)
+    {
+      WARN("LOCALE_IPOSCURR (%d) unhandled,please report!\n",
+           new_node->cyfmt.PositiveOrder);
+      new_node->cyfmt.PositiveOrder = 0;
+    }
+    GET_LOCALE_STRING(new_node->cyfmt.lpDecimalSep, LOCALE_SMONDECIMALSEP);
+    GET_LOCALE_STRING(new_node->cyfmt.lpThousandSep, LOCALE_SMONTHOUSANDSEP);
+    GET_LOCALE_STRING(new_node->cyfmt.lpCurrencySymbol, LOCALE_SCURRENCY);
+
+    /* Date/Time Format info, negative character, etc */
+    for (i = 0; i < sizeof(NLS_LocaleIndices)/sizeof(NLS_LocaleIndices[0]); i++)
+    {
+      GET_LOCALE_STRING(new_node->lppszStrings[i], NLS_LocaleIndices[i]);
+    }
+    new_node->szShortAM[0] = GetAM(new_node)[0]; new_node->szShortAM[1] = '\0';
+    new_node->szShortPM[0] = GetPM(new_node)[0]; new_node->szShortPM[1] = '\0';
+
+    /* Now add the computed format to the cache */
+    RtlEnterCriticalSection(&NLS_FormatsCS);
+
+    /* Search again: We may have raced to add the node */
+    node = NLS_CachedFormats;
+    while (node && (node->lcid != lcid || node->dwFlags != dwFlags) && node->next)
+      node = node->next;
+
+    if (!node)
+    {
+      node = NLS_CachedFormats = new_node; /* Empty list */
+      new_node = NULL;
+    }
+    else if (node->lcid != lcid || node->dwFlags != dwFlags)
+    {
+      node->next = new_node; /* Not in the list, add to end */
+      node = new_node;
+      new_node = NULL;
+    }
+
+    RtlLeaveCriticalSection(&NLS_FormatsCS);
+
+    if (new_node)
+    {
+      /* We raced and lost: The node was already added by another thread.
+       * node points to the currently cached node, so free new_node.
+       */
+      for (i = 0; i < sizeof(NLS_LocaleIndices)/sizeof(NLS_LocaleIndices[0]); i++)
+        HeapFree(GetProcessHeap(), 0, new_node->lppszStrings[i]);
+      HeapFree(GetProcessHeap(), 0, new_node->fmt.lpDecimalSep);
+      HeapFree(GetProcessHeap(), 0, new_node->fmt.lpThousandSep);
+      HeapFree(GetProcessHeap(), 0, new_node->cyfmt.lpDecimalSep);
+      HeapFree(GetProcessHeap(), 0, new_node->cyfmt.lpThousandSep);
+      HeapFree(GetProcessHeap(), 0, new_node->cyfmt.lpCurrencySymbol);
+      HeapFree(GetProcessHeap(), 0, new_node);
+    }
+  }
+  return node;
+}
+
+/**************************************************************************
+ * NLS_IsUnicodeOnlyLcid <internal>
+ *
+ * Determine if a locale is Unicode only, and thus invalid in ASCII calls.
+ */
+BOOL NLS_IsUnicodeOnlyLcid(LCID lcid)
+{
+  switch (PRIMARYLANGID(lcid))
+  {
+  case LANG_ARMENIAN:
+  case LANG_DIVEHI:
+  case LANG_GEORGIAN:
+  case LANG_GUJARATI:
+  case LANG_HINDI:
+  case LANG_KANNADA:
+  case LANG_KONKANI:
+  case LANG_MARATHI:
+  case LANG_PUNJABI:
+  case LANG_SANSKRIT:
+    TRACE("lcid 0x%08lx: langid 0x%4x is Unicode Only\n", lcid, PRIMARYLANGID(lcid));
+    return TRUE;
+  default:
+    return FALSE;
+  }
+}
+
+/*
+ * Formatting of dates, times, numbers and currencies.
+ */
+
+#define IsLiteralMarker(p) (p == '\'')
+#define IsDateFmtChar(p)   (p == 'd'||p == 'M'||p == 'y'||p == 'g')
+#define IsTimeFmtChar(p)   (p == 'H'||p == 'h'||p == 'm'||p == 's'||p == 't')
+
+/* Only the following flags can be given if a date/time format is specified */
+#define DATE_FORMAT_FLAGS (DATE_DATEVARSONLY|LOCALE_NOUSEROVERRIDE)
+#define TIME_FORMAT_FLAGS (TIME_TIMEVARSONLY|TIME_FORCE24HOURFORMAT| \
+                           TIME_NOMINUTESORSECONDS|TIME_NOSECONDS| \
+                           TIME_NOTIMEMARKER|LOCALE_NOUSEROVERRIDE)
+
+/******************************************************************************
+ * NLS_GetDateTimeFormatW <internal>
+ *
+ * Performs the formatting for GetDateFormatW/GetTimeFormatW.
+ *
+ * FIXME
+ * DATE_USE_ALT_CALENDAR           - Requires GetCalendarInfo to work first.
+ * DATE_LTRREADING/DATE_RTLREADING - Not yet implemented.
+ */
+static INT NLS_GetDateTimeFormatW(LCID lcid, DWORD dwFlags,
+                                  const SYSTEMTIME* lpTime, LPCWSTR lpFormat,
+                                  LPWSTR lpStr, INT cchOut)
+{
+  const NLS_FORMAT_NODE *node;
+  SYSTEMTIME st;
+  INT cchWritten = 0;
+  INT lastFormatPos = 0;
+  BOOL bSkipping = FALSE; /* Skipping text around marker? */
+
+  /* Verify our arguments */
+  if ((cchOut && !lpStr) || !(node = NLS_GetFormats(lcid, dwFlags)))
+  {
+NLS_GetDateTimeFormatW_InvalidParameter:
+    SetLastError(ERROR_INVALID_PARAMETER);
+    return 0;
+  }
+
+  if (dwFlags & ~(DATE_DATEVARSONLY|TIME_TIMEVARSONLY))
+  {
+    if (lpFormat &&
+        ((dwFlags & DATE_DATEVARSONLY && dwFlags & ~DATE_FORMAT_FLAGS) ||
+         (dwFlags & TIME_TIMEVARSONLY && dwFlags & ~TIME_FORMAT_FLAGS)))
+    {
+NLS_GetDateTimeFormatW_InvalidFlags:
+      SetLastError(ERROR_INVALID_FLAGS);
+      return 0;
+    }
+
+    if (dwFlags & DATE_DATEVARSONLY)
+    {
+      if ((dwFlags & (DATE_LTRREADING|DATE_RTLREADING)) == (DATE_LTRREADING|DATE_RTLREADING))
+        goto NLS_GetDateTimeFormatW_InvalidFlags;
+      else if (dwFlags & (DATE_LTRREADING|DATE_RTLREADING))
+        FIXME("Unsupported flags: DATE_LTRREADING/DATE_RTLREADING\n");
+
+      switch (dwFlags & (DATE_SHORTDATE|DATE_LONGDATE|DATE_YEARMONTH))
+      {
+      case 0:
+        break;
+      case DATE_SHORTDATE:
+      case DATE_LONGDATE:
+      case DATE_YEARMONTH:
+        if (lpFormat)
+          goto NLS_GetDateTimeFormatW_InvalidFlags;
+        break;
+      default:
+        goto NLS_GetDateTimeFormatW_InvalidFlags;
+      }
+    }
+  }
+
+  if (!lpFormat)
+  {
+    /* Use the appropriate default format */
+    if (dwFlags & DATE_DATEVARSONLY)
+    {
+      if (dwFlags & DATE_YEARMONTH)
+        lpFormat = GetYearMonth(node);
+      else if (dwFlags & DATE_LONGDATE)
+        lpFormat = GetLongDate(node);
+      else
+        lpFormat = GetShortDate(node);
+    }
+    else
+      lpFormat = GetTime(node);
+  }
+
+  if (!lpTime)
+  {
+    GetSystemTime(&st); /* Default to current time */
+    lpTime = &st;
+  }
+  else
+  {
+    if (dwFlags & DATE_DATEVARSONLY)
+    {
+      FILETIME ftTmp;
+
+      /* Verify the date and correct the D.O.W. if needed */
+      memset(&st, 0, sizeof(st));
+      st.wYear = lpTime->wYear;
+      st.wMonth = lpTime->wMonth;
+      st.wDay = lpTime->wDay;
+
+      if (st.wDay > 31 || st.wMonth > 12 || !SystemTimeToFileTime(&st, &ftTmp))
+        goto NLS_GetDateTimeFormatW_InvalidParameter;
+
+      FileTimeToSystemTime(&ftTmp, &st);
+      lpTime = &st;
+    }
+
+    if (dwFlags & TIME_TIMEVARSONLY)
+    {
+      /* Verify the time */
+      if (lpTime->wHour > 24 || lpTime->wMinute > 59 || lpTime->wSecond > 59)
+        goto NLS_GetDateTimeFormatW_InvalidParameter;
+    }
+  }
+
+  /* Format the output */
+  while (*lpFormat)
+  {
+    if (IsLiteralMarker(*lpFormat))
+    {
+      /* Start of a literal string */
+      lpFormat++;
+
+      /* Loop until the end of the literal marker or end of the string */
+      while (*lpFormat)
+      {
+        if (IsLiteralMarker(*lpFormat))
+        {
+          lpFormat++;
+          if (!IsLiteralMarker(*lpFormat))
+            break; /* Terminating literal marker */
+        }
+
+        if (!cchOut)
+          cchWritten++;   /* Count size only */
+        else if (cchWritten >= cchOut)
+          goto NLS_GetDateTimeFormatW_Overrun;
+        else if (!bSkipping)
+        {
+          lpStr[cchWritten] = *lpFormat;
+          cchWritten++;
+        }
+        lpFormat++;
+      }
+    }
+    else if ((dwFlags & DATE_DATEVARSONLY && IsDateFmtChar(*lpFormat)) ||
+             (dwFlags & TIME_TIMEVARSONLY && IsTimeFmtChar(*lpFormat)))
+    {
+      char  buffA[32];
+      WCHAR buff[32], fmtChar;
+      LPCWSTR szAdd = NULL;
+      DWORD dwVal = 0;
+      int   count = 0, dwLen;
+
+      bSkipping = FALSE;
+
+      fmtChar = *lpFormat;
+      while (*lpFormat == fmtChar)
+      {
+        count++;
+        lpFormat++;
+      }
+      buff[0] = '\0';
+
+      switch(fmtChar)
+      {
+      case 'd':
+        if (count >= 4)
+          szAdd = GetLongDay(node, (lpTime->wDayOfWeek + 6) % 7);
+        else if (count == 3)
+          szAdd = GetShortDay(node, (lpTime->wDayOfWeek + 6) % 7);
+        else
+        {
+          dwVal = lpTime->wDay;
+          szAdd = buff;
+        }
+        break;
+
+      case 'M':
+        if (count >= 4)
+          szAdd = GetLongMonth(node, lpTime->wMonth - 1);
+        else if (count == 3)
+          szAdd = GetShortMonth(node, lpTime->wMonth - 1);
+        else
+        {
+          dwVal = lpTime->wMonth;
+          szAdd = buff;
+        }
+        break;
+
+      case 'y':
+        if (count >= 4)
+        {
+          count = 4;
+          dwVal = lpTime->wYear;
+        }
+        else
+        {
+          count = count > 2 ? 2 : count;
+          dwVal = lpTime->wYear % 100;
+        }
+        szAdd = buff;
+        break;
+
+      case 'g':
+        if (count == 2)
+        {
+          /* FIXME: Our GetCalendarInfo() does not yet support CAL_SERASTRING.
+           *        When it is fixed, this string should be cached in 'node'.
+           */
+          FIXME("Should be using GetCalendarInfo(CAL_SERASTRING), defaulting to 'AD'\n");
+          buff[0] = 'A'; buff[1] = 'D'; buff[2] = '\0';
+        }
+        else
+        {
+          buff[0] = 'g'; buff[1] = '\0'; /* Add a literal 'g' */
+        }
+        szAdd = buff;
+        break;
+
+      case 'h':
+        if (!(dwFlags & TIME_FORCE24HOURFORMAT))
+        {
+          count = count > 2 ? 2 : count;
+          dwVal = lpTime->wHour == 0 ? 12 : (lpTime->wHour - 1) % 12 + 1;
+          szAdd = buff;
+          break;
+        }
+        /* .. fall through if we are forced to output in 24 hour format */
+
+      case 'H':
+        count = count > 2 ? 2 : count;
+        dwVal = lpTime->wHour;
+        szAdd = buff;
+        break;
+
+      case 'm':
+        if (dwFlags & TIME_NOMINUTESORSECONDS)
+        {
+          cchWritten = lastFormatPos; /* Skip */
+          bSkipping = TRUE;
+        }
+        else
+        {
+          count = count > 2 ? 2 : count;
+          dwVal = lpTime->wMinute;
+          szAdd = buff;
+        }
+        break;
+
+      case 's':
+        if (dwFlags & (TIME_NOSECONDS|TIME_NOMINUTESORSECONDS))
+        {
+          cchWritten = lastFormatPos; /* Skip */
+          bSkipping = TRUE;
+        }
+        else
+        {
+          count = count > 2 ? 2 : count;
+          dwVal = lpTime->wSecond;
+          szAdd = buff;
+        }
+        break;
+
+      case 't':
+        if (dwFlags & TIME_NOTIMEMARKER)
+        {
+          cchWritten = lastFormatPos; /* Skip */
+          bSkipping = TRUE;
+        }
+        else
+        {
+          if (count == 1)
+            szAdd = lpTime->wHour < 12 ? node->szShortAM : node->szShortPM;
+          else
+            szAdd = lpTime->wHour < 12 ? GetAM(node) : GetPM(node);
+        }
+        break;
+      }
+
+      if (szAdd == buff && buff[0] == '\0')
+      {
+        /* We have a numeric value to add */
+        sprintf(buffA, "%.*ld", count, dwVal);
+        MultiByteToWideChar(CP_ACP, 0, buffA, -1, buff, sizeof(buff)/sizeof(WCHAR));
+      }
+
+      dwLen = szAdd ? strlenW(szAdd) : 0;
+
+      if (cchOut && dwLen)
+      {
+        if (cchWritten + dwLen < cchOut)
+          memcpy(lpStr + cchWritten, szAdd, dwLen * sizeof(WCHAR));
+        else
+        {
+          memcpy(lpStr + cchWritten, szAdd, (cchOut - cchWritten) * sizeof(WCHAR));
+          goto NLS_GetDateTimeFormatW_Overrun;
+        }
+      }
+      cchWritten += dwLen;
+      lastFormatPos = cchWritten; /* Save position of last output format text */
+    }
+    else
+    {
+      /* Literal character */
+      if (!cchOut)
+        cchWritten++;   /* Count size only */
+      else if (cchWritten >= cchOut)
+        goto NLS_GetDateTimeFormatW_Overrun;
+      else if (!bSkipping || *lpFormat == ' ')
+      {
+        lpStr[cchWritten] = *lpFormat;
+        cchWritten++;
+      }
+      lpFormat++;
+    }
+  }
+
+  /* Final string terminator and sanity check */
+  if (cchOut)
+  {
+   if (cchWritten >= cchOut)
+     goto NLS_GetDateTimeFormatW_Overrun;
+   else
+     lpStr[cchWritten] = '\0';
+  }
+  cchWritten++; /* Include terminating NUL */
+
+  TRACE("returning length=%d, ouput='%s'\n", cchWritten, debugstr_w(lpStr));
+  return cchWritten;
+
+NLS_GetDateTimeFormatW_Overrun:
+  TRACE("returning 0, (ERROR_INSUFFICIENT_BUFFER)\n");
+  SetLastError(ERROR_INSUFFICIENT_BUFFER);
+  return 0;
+}
+
+/******************************************************************************
+ * NLS_GetDateTimeFormatA <internal>
+ *
+ * ASCII wrapper for GetDateFormatA/GetTimeFormatA.
+ */
+static INT NLS_GetDateTimeFormatA(LCID lcid, DWORD dwFlags,
+                                  const SYSTEMTIME* lpTime,
+                                  LPCSTR lpFormat, LPSTR lpStr, INT cchOut)
+{
+  DWORD cp = CP_ACP;
+  WCHAR szFormat[128], szOut[128];
+  INT iRet;
+
+  TRACE("(0x%04lx,0x%08lx,%p,%s,%p,%d)\n", lcid, dwFlags, lpTime,
+        debugstr_a(lpFormat), lpStr, cchOut);
+
+  if (NLS_IsUnicodeOnlyLcid(lcid))
+  {
+GetDateTimeFormatA_InvalidParameter:
+    SetLastError(ERROR_INVALID_PARAMETER);
+    return 0;
+  }
+
+  if (!(dwFlags & LOCALE_USE_CP_ACP))
+  {
+    const NLS_FORMAT_NODE *node = NLS_GetFormats(lcid, dwFlags);
+    if (!node)
+      goto GetDateTimeFormatA_InvalidParameter;
+    cp = node->dwCodePage;
+  }
+
+  if (lpFormat)
+    MultiByteToWideChar(cp, 0, lpFormat, -1, szFormat, sizeof(szFormat)/sizeof(WCHAR));
+
+  if (cchOut > (int)(sizeof(szOut)/sizeof(WCHAR)))
+    cchOut = sizeof(szOut)/sizeof(WCHAR);
+
+  szOut[0] = '\0';
+
+  iRet = NLS_GetDateTimeFormatW(lcid, dwFlags, lpTime, lpFormat ? szFormat : NULL,
+                                lpStr ? szOut : NULL, cchOut);
+
+  if (lpStr)
+  {
+    if (szOut[0])
+      WideCharToMultiByte(cp, 0, szOut, -1, lpStr, cchOut, 0, 0);
+    else if (cchOut && iRet)
+      *lpStr = '\0';
+  }
+  return iRet;
+}
+
+/******************************************************************************
+ * GetDateFormatA [KERNEL32.@]
+ *
+ * Format a date for a given locale.
+ *
+ * PARAMS
+ *  lcid      [I] Locale to format for
+ *  dwFlags   [I] LOCALE_ and DATE_ flags from "winnls.h"
+ *  lpTime    [I] Date to format
+ *  lpFormat  [I] Format string, or NULL to use the system defaults
+ *  lpDateStr [O] Destination for formatted string
+ *  cchOut    [I] Size of lpDateStr, or 0 to calculate the resulting size
+ *
+ * NOTES
+ *  - If lpFormat is NULL, lpDateStr will be formatted according to the format
+ *    details returned by GetLocaleInfoA() and modified by dwFlags.
+ *  - lpFormat is a string of characters and formatting tokens. Any characters
+ *    in the string are copied verbatim to lpDateStr, with tokens being replaced
+ *    by the date values they represent.
+ *  - The following tokens have special meanings in a date format string:
+ *|  Token  Meaning
+ *|  -----  -------
+ *|  d      Single digit day of the month (no leading 0)
+ *|  dd     Double digit day of the month
+ *|  ddd    Short name for the day of the week
+ *|  dddd   Long name for the day of the week
+ *|  M      Single digit month of the year (no leading 0)
+ *|  MM     Double digit month of the year
+ *|  MMM    Short name for the month of the year
+ *|  MMMM   Long name for the month of the year
+ *|  y      Double digit year number (no leading 0)
+ *|  yy     Double digit year number
+ *|  yyyy   Four digit year number
+ *|  gg     Era string, for example 'AD'.
+ *  - To output any literal character that could be misidentified as a token,
+ *    enclose it in single quotes.
+ *  - The Ascii version of this function fails if lcid is Unicode only.
+ *
+ * RETURNS
+ *  Success: The number of character written to lpDateStr, or that would
+ *           have been written, if cchOut is 0.
+ *  Failure: 0. Use GetLastError() to determine the cause.
+ */
+INT WINAPI GetDateFormatA( LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime,
+                           LPCSTR lpFormat, LPSTR lpDateStr, INT cchOut)
+{
+  TRACE("(0x%04lx,0x%08lx,%p,%s,%p,%d)\n",lcid, dwFlags, lpTime,
+        debugstr_a(lpFormat), lpDateStr, cchOut);
+
+  return NLS_GetDateTimeFormatA(lcid, dwFlags | DATE_DATEVARSONLY, lpTime,
+                                lpFormat, lpDateStr, cchOut);
+}
+
+
+/******************************************************************************
+ * GetDateFormatW	[KERNEL32.@]
+ *
+ * See GetDateFormatA.
+ */
+INT WINAPI GetDateFormatW(LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime,
+                          LPCWSTR lpFormat, LPWSTR lpDateStr, INT cchOut)
+{
+  TRACE("(0x%04lx,0x%08lx,%p,%s,%p,%d)\n", lcid, dwFlags, lpTime,
+        debugstr_w(lpFormat), lpDateStr, cchOut);
+
+  return NLS_GetDateTimeFormatW(lcid, dwFlags|DATE_DATEVARSONLY, lpTime,
+                                lpFormat, lpDateStr, cchOut);
+}
+
+/******************************************************************************
+ *		GetTimeFormatA	[KERNEL32.@]
+ *
+ * Format a time for a given locale.
+ *
+ * PARAMS
+ *  lcid      [I] Locale to format for
+ *  dwFlags   [I] LOCALE_ and TIME_ flags from "winnls.h"
+ *  lpTime    [I] Time to format
+ *  lpFormat  [I] Formatting overrides
+ *  lpTimeStr [O] Destination for formatted string
+ *  cchOut    [I] Size of lpTimeStr, or 0 to calculate the resulting size
+ *
+ * NOTES
+ *  - If lpFormat is NULL, lpszValue will be formatted according to the format
+ *    details returned by GetLocaleInfoA() and modified by dwFlags.
+ *  - lpFormat is a string of characters and formatting tokens. Any characters
+ *    in the string are copied verbatim to lpTimeStr, with tokens being replaced
+ *    by the time values they represent.
+ *  - The following tokens have special meanings in a time format string:
+ *|  Token  Meaning
+ *|  -----  -------
+ *|  h      Hours with no leading zero (12-hour clock)
+ *|  hh     Hours with full two digits (12-hour clock)
+ *|  H      Hours with no leading zero (24-hour clock)
+ *|  HH     Hours with full two digits (24-hour clock)
+ *|  m      Minutes with no leading zero
+ *|  mm     Minutes with full two digits
+ *|  s      Seconds with no leading zero
+ *|  ss     Seconds with full two digits
+ *|  t      Short time marker (e.g. "A" or "P")
+ *|  tt     Long time marker (e.g. "AM", "PM")
+ *  - To output any literal character that could be misidentified as a token,
+ *    enclose it in single quotes.
+ *  - The Ascii version of this function fails if lcid is Unicode only.
+ *
+ * RETURNS
+ *  Success: The number of character written to lpTimeStr, or that would
+ *           have been written, if cchOut is 0.
+ *  Failure: 0. Use GetLastError() to determine the cause.
+ */
+INT WINAPI GetTimeFormatA(LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime,
+                          LPCSTR lpFormat, LPSTR lpTimeStr, INT cchOut)
+{
+  TRACE("(0x%04lx,0x%08lx,%p,%s,%p,%d)\n",lcid, dwFlags, lpTime,
+        debugstr_a(lpFormat), lpTimeStr, cchOut);
+
+  return NLS_GetDateTimeFormatA(lcid, dwFlags|TIME_TIMEVARSONLY, lpTime,
+                                lpFormat, lpTimeStr, cchOut);
+}
+
+/******************************************************************************
+ *		GetTimeFormatW	[KERNEL32.@]
+ *
+ * See GetTimeFormatA.
+ */
+INT WINAPI GetTimeFormatW(LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime,
+                          LPCWSTR lpFormat, LPWSTR lpTimeStr, INT cchOut)
+{
+  TRACE("(0x%04lx,0x%08lx,%p,%s,%p,%d)\n",lcid, dwFlags, lpTime,
+        debugstr_w(lpFormat), lpTimeStr, cchOut);
+
+  return NLS_GetDateTimeFormatW(lcid, dwFlags|TIME_TIMEVARSONLY, lpTime,
+                                lpFormat, lpTimeStr, cchOut);
+}
+
+/**************************************************************************
+ *              GetNumberFormatA	(KERNEL32.@)
+ *
+ * Format a number string for a given locale.
+ *
+ * PARAMS
+ *  lcid        [I] Locale to format for
+ *  dwFlags     [I] LOCALE_ flags from "winnls.h"
+ *  lpszValue   [I] String to format
+ *  lpFormat    [I] Formatting overrides
+ *  lpNumberStr [O] Destination for formatted string
+ *  cchOut      [I] Size of lpNumberStr, or 0 to calculate the resulting size
+ *
+ * NOTES
+ *  - lpszValue can contain only '0' - '9', '-' and '.'.
+ *  - If lpFormat is non-NULL, dwFlags must be 0. In this case lpszValue will
+ *    be formatted according to the format details returned by GetLocaleInfoA().
+ *  - This function rounds the number string if the number of decimals exceeds the
+ *    locales normal number of decimal places.
+ *  - If cchOut is 0, this function does not write to lpNumberStr.
+ *  - The Ascii version of this function fails if lcid is Unicode only.
+ *
+ * RETURNS
+ *  Success: The number of character written to lpNumberStr, or that would
+ *           have been written, if cchOut is 0.
+ *  Failure: 0. Use GetLastError() to determine the cause.
+ */
+INT WINAPI GetNumberFormatA(LCID lcid, DWORD dwFlags,
+                            LPCSTR lpszValue,  const NUMBERFMTA *lpFormat,
+                            LPSTR lpNumberStr, int cchOut)
+{
+  DWORD cp = CP_ACP;
+  WCHAR szDec[8], szGrp[8], szIn[128], szOut[128];
+  NUMBERFMTW fmt;
+  const NUMBERFMTW *pfmt = NULL;
+  INT iRet;
+
+  TRACE("(0x%04lx,0x%08lx,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_a(lpszValue),
+        lpFormat, lpNumberStr, cchOut);
+
+  if (NLS_IsUnicodeOnlyLcid(lcid))
+  {
+GetNumberFormatA_InvalidParameter:
+    SetLastError(ERROR_INVALID_PARAMETER);
+    return 0;
+  }
+
+  if (!(dwFlags & LOCALE_USE_CP_ACP))
+  {
+    const NLS_FORMAT_NODE *node = NLS_GetFormats(lcid, dwFlags);
+    if (!node)
+      goto GetNumberFormatA_InvalidParameter;
+    cp = node->dwCodePage;
+  }
+
+  if (lpFormat)
+  {
+    memcpy(&fmt, lpFormat, sizeof(fmt));
+    pfmt = &fmt;
+    if (lpFormat->lpDecimalSep)
+    {
+      MultiByteToWideChar(cp, 0, lpFormat->lpDecimalSep, -1, szDec, sizeof(szDec)/sizeof(WCHAR));
+      fmt.lpDecimalSep = szDec;
+    }
+    if (lpFormat->lpThousandSep)
+    {
+      MultiByteToWideChar(cp, 0, lpFormat->lpThousandSep, -1, szGrp, sizeof(szGrp)/sizeof(WCHAR));
+      fmt.lpThousandSep = szGrp;
+    }
+  }
+
+  if (lpszValue)
+    MultiByteToWideChar(cp, 0, lpszValue, -1, szIn, sizeof(szIn)/sizeof(WCHAR));
+
+  if (cchOut > (int)(sizeof(szOut)/sizeof(WCHAR)))
+    cchOut = sizeof(szOut)/sizeof(WCHAR);
+
+  szOut[0] = '\0';
+
+  iRet = GetNumberFormatW(lcid, dwFlags, lpszValue ? szIn : NULL, pfmt,
+                          lpNumberStr ? szOut : NULL, cchOut);
+
+  if (szOut[0] && lpNumberStr)
+    WideCharToMultiByte(cp, 0, szOut, -1, lpNumberStr, cchOut, 0, 0);
+  return iRet;
+}
+
+/* Number parsing state flags */
+#define NF_ISNEGATIVE 0x1  /* '-' found */
+#define NF_ISREAL     0x2  /* '.' found */
+#define NF_DIGITS     0x4  /* '0'-'9' found */
+#define NF_DIGITS_OUT 0x8  /* Digits before the '.' found */
+#define NF_ROUND      0x10 /* Number needs to be rounded */
+
+/* Formatting options for Numbers */
+#define NLS_NEG_PARENS      0 /* "(1.1)" */
+#define NLS_NEG_LEFT        1 /* "-1.1"  */
+#define NLS_NEG_LEFT_SPACE  2 /* "- 1.1" */
+#define NLS_NEG_RIGHT       3 /* "1.1-"  */
+#define NLS_NEG_RIGHT_SPACE 4 /* "1.1 -" */
+
+/**************************************************************************
+ *              GetNumberFormatW	(KERNEL32.@)
+ *
+ * See GetNumberFormatA.
+ */
+INT WINAPI GetNumberFormatW(LCID lcid, DWORD dwFlags,
+                            LPCWSTR lpszValue,  const NUMBERFMTW *lpFormat,
+                            LPWSTR lpNumberStr, int cchOut)
+{
+  WCHAR szBuff[128], *szOut = szBuff + sizeof(szBuff) / sizeof(WCHAR) - 1;
+  WCHAR szNegBuff[8];
+  const WCHAR *lpszNeg = NULL, *lpszNegStart, *szSrc;
+  DWORD dwState = 0, dwDecimals = 0, dwGroupCount = 0, dwCurrentGroupCount = 0;
+  INT iRet;
+
+  TRACE("(0x%04lx,0x%08lx,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_w(lpszValue),
+        lpFormat, lpNumberStr, cchOut);
+
+  if (!lpszValue || cchOut < 0 || (cchOut > 0 && !lpNumberStr) ||
+      !IsValidLocale(lcid, 0) ||
+      (lpFormat && (dwFlags || !lpFormat->lpDecimalSep || !lpFormat->lpThousandSep)))
+  {
+GetNumberFormatW_Error:
+    SetLastError(lpFormat && dwFlags ? ERROR_INVALID_FLAGS : ERROR_INVALID_PARAMETER);
+    return 0;
+  }
+
+  if (!lpFormat)
+  {
+    const NLS_FORMAT_NODE *node = NLS_GetFormats(lcid, dwFlags);
+
+    if (!node)
+      goto GetNumberFormatW_Error;
+    lpFormat = &node->fmt;
+    lpszNegStart = lpszNeg = GetNegative(node);
+  }
+  else
+  {
+    GetLocaleInfoW(lcid, LOCALE_SNEGATIVESIGN|(dwFlags & LOCALE_NOUSEROVERRIDE),
+                   szNegBuff, sizeof(szNegBuff)/sizeof(WCHAR));
+    lpszNegStart = lpszNeg = szNegBuff;
+  }
+  lpszNeg = lpszNeg + strlenW(lpszNeg) - 1;
+
+  dwFlags &= (LOCALE_NOUSEROVERRIDE|LOCALE_USE_CP_ACP);
+
+  /* Format the number backwards into a temporary buffer */
+
+  szSrc = lpszValue;
+  *szOut-- = '\0';
+
+  /* Check the number for validity */
+  while (*szSrc)
+  {
+    if (*szSrc >= '0' && *szSrc <= '9')
+    {
+      dwState |= NF_DIGITS;
+      if (dwState & NF_ISREAL)
+        dwDecimals++;
+    }
+    else if (*szSrc == '-')
+    {
+      if (dwState)
+        goto GetNumberFormatW_Error; /* '-' not first character */
+      dwState |= NF_ISNEGATIVE;
+    }
+    else if (*szSrc == '.')
+    {
+      if (dwState & NF_ISREAL)
+        goto GetNumberFormatW_Error; /* More than one '.' */
+      dwState |= NF_ISREAL;
+    }
+    else
+      goto GetNumberFormatW_Error; /* Invalid char */
+    szSrc++;
+  }
+  szSrc--; /* Point to last character */
+
+  if (!(dwState & NF_DIGITS))
+    goto GetNumberFormatW_Error; /* No digits */
+
+  /* Add any trailing negative sign */
+  if (dwState & NF_ISNEGATIVE)
+  {
+    switch (lpFormat->NegativeOrder)
+    {
+    case NLS_NEG_PARENS:
+      *szOut-- = ')';
+      break;
+    case NLS_NEG_RIGHT:
+    case NLS_NEG_RIGHT_SPACE:
+      while (lpszNeg >= lpszNegStart)
+        *szOut-- = *lpszNeg--;
+     if (lpFormat->NegativeOrder == NLS_NEG_RIGHT_SPACE)
+       *szOut-- = ' ';
+      break;
+    }
+  }
+
+  /* Copy all digits up to the decimal point */
+  if (!lpFormat->NumDigits)
+  {
+    if (dwState & NF_ISREAL)
+    {
+      while (*szSrc != '.') /* Don't write any decimals or a separator */
+      {
+        if (*szSrc >= '5' || (*szSrc == '4' && (dwState & NF_ROUND)))
+          dwState |= NF_ROUND;
+        else
+          dwState &= ~NF_ROUND;
+        szSrc--;
+      }
+      szSrc--;
+    }
+  }
+  else
+  {
+    LPWSTR lpszDec = lpFormat->lpDecimalSep + strlenW(lpFormat->lpDecimalSep) - 1;
+
+    if (dwDecimals <= lpFormat->NumDigits)
+    {
+      dwDecimals = lpFormat->NumDigits - dwDecimals;
+      while (dwDecimals--)
+        *szOut-- = '0'; /* Pad to correct number of dp */
+    }
+    else
+    {
+      dwDecimals -= lpFormat->NumDigits;
+      /* Skip excess decimals, and determine if we have to round the number */
+      while (dwDecimals--)
+      {
+        if (*szSrc >= '5' || (*szSrc == '4' && (dwState & NF_ROUND)))
+          dwState |= NF_ROUND;
+        else
+          dwState &= ~NF_ROUND;
+        szSrc--;
+      }
+    }
+
+    if (dwState & NF_ISREAL)
+    {
+      while (*szSrc != '.')
+      {
+        if (dwState & NF_ROUND)
+        {
+          if (*szSrc == '9')
+            *szOut-- = '0'; /* continue rounding */
+          else
+          {
+            dwState &= ~NF_ROUND;
+            *szOut-- = (*szSrc)+1;
+          }
+          szSrc--;
+        }
+        else
+          *szOut-- = *szSrc--; /* Write existing decimals */
+      }
+      szSrc--; /* Skip '.' */
+    }
+
+    while (lpszDec >= lpFormat->lpDecimalSep)
+      *szOut-- = *lpszDec--; /* Write decimal separator */
+  }
+
+  dwGroupCount = lpFormat->Grouping == 32 ? 3 : lpFormat->Grouping;
+
+  /* Write the remaining whole number digits, including grouping chars */
+  while (szSrc >= lpszValue && *szSrc >= '0' && *szSrc <= '9')
+  {
+    if (dwState & NF_ROUND)
+    {
+      if (*szSrc == '9')
+        *szOut-- = '0'; /* continue rounding */
+      else
+      {
+        dwState &= ~NF_ROUND;
+        *szOut-- = (*szSrc)+1;
+      }
+      szSrc--;
+    }
+    else
+      *szOut-- = *szSrc--;
+
+    dwState |= NF_DIGITS_OUT;
+    dwCurrentGroupCount++;
+    if (szSrc >= lpszValue && dwCurrentGroupCount == dwGroupCount && *szSrc != '-')
+    {
+      LPWSTR lpszGrp = lpFormat->lpThousandSep + strlenW(lpFormat->lpThousandSep) - 1;
+
+      while (lpszGrp >= lpFormat->lpThousandSep)
+        *szOut-- = *lpszGrp--; /* Write grouping char */
+
+      dwCurrentGroupCount = 0;
+      if (lpFormat->Grouping == 32)
+        dwGroupCount = 2; /* Indic grouping: 3 then 2 */
+    }
+  }
+  if (dwState & NF_ROUND)
+  {
+    *szOut-- = '1'; /* e.g. .6 > 1.0 */
+  }
+  else if (!(dwState & NF_DIGITS_OUT) && lpFormat->LeadingZero)
+    *szOut-- = '0'; /* Add leading 0 if we have no digits before the decimal point */
+
+  /* Add any leading negative sign */
+  if (dwState & NF_ISNEGATIVE)
+  {
+    switch (lpFormat->NegativeOrder)
+    {
+    case NLS_NEG_PARENS:
+      *szOut-- = '(';
+      break;
+    case NLS_NEG_LEFT_SPACE:
+      *szOut-- = ' ';
+      /* Fall through */
+    case NLS_NEG_LEFT:
+      while (lpszNeg >= lpszNegStart)
+        *szOut-- = *lpszNeg--;
+      break;
+    }
+  }
+  szOut++;
+
+  iRet = strlenW(szOut) + 1;
+  if (cchOut)
+  {
+    if (iRet <= cchOut)
+      memcpy(lpNumberStr, szOut, iRet * sizeof(WCHAR));
+    else
+    {
+      memcpy(lpNumberStr, szOut, cchOut * sizeof(WCHAR));
+      lpNumberStr[cchOut - 1] = '\0';
+      SetLastError(ERROR_INSUFFICIENT_BUFFER);
+      iRet = 0;
+    }
+  }
+  return iRet;
+}
+
+/**************************************************************************
+ *              GetCurrencyFormatA	(KERNEL32.@)
+ *
+ * Format a currency string for a given locale.
+ *
+ * PARAMS
+ *  lcid          [I] Locale to format for
+ *  dwFlags       [I] LOCALE_ flags from "winnls.h"
+ *  lpszValue     [I] String to format
+ *  lpFormat      [I] Formatting overrides
+ *  lpCurrencyStr [O] Destination for formatted string
+ *  cchOut        [I] Size of lpCurrencyStr, or 0 to calculate the resulting size
+ *
+ * NOTES
+ *  - lpszValue can contain only '0' - '9', '-' and '.'.
+ *  - If lpFormat is non-NULL, dwFlags must be 0. In this case lpszValue will
+ *    be formatted according to the format details returned by GetLocaleInfoA().
+ *  - This function rounds the currency if the number of decimals exceeds the
+ *    locales number of currency decimal places.
+ *  - If cchOut is 0, this function does not write to lpCurrencyStr.
+ *  - The Ascii version of this function fails if lcid is Unicode only.
+ *
+ * RETURNS
+ *  Success: The number of character written to lpNumberStr, or that would
+ *           have been written, if cchOut is 0.
+ *  Failure: 0. Use GetLastError() to determine the cause.
+ */
+INT WINAPI GetCurrencyFormatA(LCID lcid, DWORD dwFlags,
+                              LPCSTR lpszValue,  const CURRENCYFMTA *lpFormat,
+                              LPSTR lpCurrencyStr, int cchOut)
+{
+  DWORD cp = CP_ACP;
+  WCHAR szDec[8], szGrp[8], szCy[8], szIn[128], szOut[128];
+  CURRENCYFMTW fmt;
+  const CURRENCYFMTW *pfmt = NULL;
+  INT iRet;
+
+  TRACE("(0x%04lx,0x%08lx,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_a(lpszValue),
+        lpFormat, lpCurrencyStr, cchOut);
+
+  if (NLS_IsUnicodeOnlyLcid(lcid))
+  {
+GetCurrencyFormatA_InvalidParameter:
+    SetLastError(ERROR_INVALID_PARAMETER);
+    return 0;
+  }
+
+  if (!(dwFlags & LOCALE_USE_CP_ACP))
+  {
+    const NLS_FORMAT_NODE *node = NLS_GetFormats(lcid, dwFlags);
+    if (!node)
+      goto GetCurrencyFormatA_InvalidParameter;
+    cp = node->dwCodePage;
+  }
+
+  if (lpFormat)
+  {
+    memcpy(&fmt, lpFormat, sizeof(fmt));
+    pfmt = &fmt;
+    if (lpFormat->lpDecimalSep)
+    {
+      MultiByteToWideChar(cp, 0, lpFormat->lpDecimalSep, -1, szDec, sizeof(szDec)/sizeof(WCHAR));
+      fmt.lpDecimalSep = szDec;
+    }
+    if (lpFormat->lpThousandSep)
+    {
+      MultiByteToWideChar(cp, 0, lpFormat->lpThousandSep, -1, szGrp, sizeof(szGrp)/sizeof(WCHAR));
+      fmt.lpThousandSep = szGrp;
+    }
+    if (lpFormat->lpCurrencySymbol)
+    {
+      MultiByteToWideChar(cp, 0, lpFormat->lpCurrencySymbol, -1, szCy, sizeof(szCy)/sizeof(WCHAR));
+      fmt.lpCurrencySymbol = szCy;
+    }
+  }
+
+  if (lpszValue)
+    MultiByteToWideChar(cp, 0, lpszValue, -1, szIn, sizeof(szIn)/sizeof(WCHAR));
+
+  if (cchOut > (int)(sizeof(szOut)/sizeof(WCHAR)))
+    cchOut = sizeof(szOut)/sizeof(WCHAR);
+
+  szOut[0] = '\0';
+
+  iRet = GetCurrencyFormatW(lcid, dwFlags, lpszValue ? szIn : NULL, pfmt,
+                            lpCurrencyStr ? szOut : NULL, cchOut);
+
+  if (szOut[0] && lpCurrencyStr)
+    WideCharToMultiByte(cp, 0, szOut, -1, lpCurrencyStr, cchOut, 0, 0);
+  return iRet;
+}
+
+/* Formatting states for Currencies. We use flags to avoid code duplication. */
+#define CF_PARENS       0x1  /* Parentheses      */
+#define CF_MINUS_LEFT   0x2  /* '-' to the left  */
+#define CF_MINUS_RIGHT  0x4  /* '-' to the right */
+#define CF_MINUS_BEFORE 0x8  /* '-' before '$'   */
+#define CF_CY_LEFT      0x10 /* '$' to the left  */
+#define CF_CY_RIGHT     0x20 /* '$' to the right */
+#define CF_CY_SPACE     0x40 /* ' ' by '$'       */
+
+/**************************************************************************
+ *              GetCurrencyFormatW	(KERNEL32.@)
+ *
+ * See GetCurrencyFormatA.
+ */
+INT WINAPI GetCurrencyFormatW(LCID lcid, DWORD dwFlags,
+                              LPCWSTR lpszValue,  const CURRENCYFMTW *lpFormat,
+                              LPWSTR lpCurrencyStr, int cchOut)
+{
+  static const BYTE NLS_NegCyFormats[16] =
+  {
+    CF_PARENS|CF_CY_LEFT,                       /* ($1.1) */
+    CF_MINUS_LEFT|CF_MINUS_BEFORE|CF_CY_LEFT,   /* -$1.1  */
+    CF_MINUS_LEFT|CF_CY_LEFT,                   /* $-1.1  */
+    CF_MINUS_RIGHT|CF_CY_LEFT,                  /* $1.1-  */
+    CF_PARENS|CF_CY_RIGHT,                      /* (1.1$) */
+    CF_MINUS_LEFT|CF_CY_RIGHT,                  /* -1.1$  */
+    CF_MINUS_RIGHT|CF_MINUS_BEFORE|CF_CY_RIGHT, /* 1.1-$  */
+    CF_MINUS_RIGHT|CF_CY_RIGHT,                 /* 1.1$-  */
+    CF_MINUS_LEFT|CF_CY_RIGHT|CF_CY_SPACE,      /* -1.1 $ */
+    CF_MINUS_LEFT|CF_MINUS_BEFORE|CF_CY_LEFT|CF_CY_SPACE,   /* -$ 1.1 */
+    CF_MINUS_RIGHT|CF_CY_RIGHT|CF_CY_SPACE,     /* 1.1 $-  */
+    CF_MINUS_RIGHT|CF_CY_LEFT|CF_CY_SPACE,      /* $ 1.1-  */
+    CF_MINUS_LEFT|CF_CY_LEFT|CF_CY_SPACE,       /* $ -1.1  */
+    CF_MINUS_RIGHT|CF_MINUS_BEFORE|CF_CY_RIGHT|CF_CY_SPACE, /* 1.1- $ */
+    CF_PARENS|CF_CY_LEFT|CF_CY_SPACE,           /* ($ 1.1) */
+    CF_PARENS|CF_CY_RIGHT|CF_CY_SPACE,          /* (1.1 $) */
+  };
+  static const BYTE NLS_PosCyFormats[4] =
+  {
+    CF_CY_LEFT,              /* $1.1  */
+    CF_CY_RIGHT,             /* 1.1$  */
+    CF_CY_LEFT|CF_CY_SPACE,  /* $ 1.1 */
+    CF_CY_RIGHT|CF_CY_SPACE, /* 1.1 $ */
+  };
+  WCHAR szBuff[128], *szOut = szBuff + sizeof(szBuff) / sizeof(WCHAR) - 1;
+  WCHAR szNegBuff[8];
+  const WCHAR *lpszNeg = NULL, *lpszNegStart, *szSrc, *lpszCy, *lpszCyStart;
+  DWORD dwState = 0, dwDecimals = 0, dwGroupCount = 0, dwCurrentGroupCount = 0, dwFmt;
+  INT iRet;
+
+  TRACE("(0x%04lx,0x%08lx,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_w(lpszValue),
+        lpFormat, lpCurrencyStr, cchOut);
+
+  if (!lpszValue || cchOut < 0 || (cchOut > 0 && !lpCurrencyStr) ||
+      !IsValidLocale(lcid, 0) ||
+      (lpFormat && (dwFlags || !lpFormat->lpDecimalSep || !lpFormat->lpThousandSep ||
+      !lpFormat->lpCurrencySymbol || lpFormat->NegativeOrder > 15 ||
+      lpFormat->PositiveOrder > 3)))
+  {
+GetCurrencyFormatW_Error:
+    SetLastError(lpFormat && dwFlags ? ERROR_INVALID_FLAGS : ERROR_INVALID_PARAMETER);
+    return 0;
+  }
+
+  if (!lpFormat)
+  {
+    const NLS_FORMAT_NODE *node = NLS_GetFormats(lcid, dwFlags);
+
+    if (!node)
+      goto GetCurrencyFormatW_Error;
+    lpFormat = &node->cyfmt;
+    lpszNegStart = lpszNeg = GetNegative(node);
+  }
+  else
+  {
+    GetLocaleInfoW(lcid, LOCALE_SNEGATIVESIGN|(dwFlags & LOCALE_NOUSEROVERRIDE),
+                   szNegBuff, sizeof(szNegBuff)/sizeof(WCHAR));
+    lpszNegStart = lpszNeg = szNegBuff;
+  }
+  dwFlags &= (LOCALE_NOUSEROVERRIDE|LOCALE_USE_CP_ACP);
+
+  lpszNeg = lpszNeg + strlenW(lpszNeg) - 1;
+  lpszCyStart = lpFormat->lpCurrencySymbol;
+  lpszCy = lpszCyStart + strlenW(lpszCyStart) - 1;
+
+  /* Format the currency backwards into a temporary buffer */
+
+  szSrc = lpszValue;
+  *szOut-- = '\0';
+
+  /* Check the number for validity */
+  while (*szSrc)
+  {
+    if (*szSrc >= '0' && *szSrc <= '9')
+    {
+      dwState |= NF_DIGITS;
+      if (dwState & NF_ISREAL)
+        dwDecimals++;
+    }
+    else if (*szSrc == '-')
+    {
+      if (dwState)
+        goto GetCurrencyFormatW_Error; /* '-' not first character */
+      dwState |= NF_ISNEGATIVE;
+    }
+    else if (*szSrc == '.')
+    {
+      if (dwState & NF_ISREAL)
+        goto GetCurrencyFormatW_Error; /* More than one '.' */
+      dwState |= NF_ISREAL;
+    }
+    else
+      goto GetCurrencyFormatW_Error; /* Invalid char */
+    szSrc++;
+  }
+  szSrc--; /* Point to last character */
+
+  if (!(dwState & NF_DIGITS))
+    goto GetCurrencyFormatW_Error; /* No digits */
+
+  if (dwState & NF_ISNEGATIVE)
+    dwFmt = NLS_NegCyFormats[lpFormat->NegativeOrder];
+  else
+    dwFmt = NLS_PosCyFormats[lpFormat->PositiveOrder];
+
+  /* Add any trailing negative or currency signs */
+  if (dwFmt & CF_PARENS)
+    *szOut-- = ')';
+
+  while (dwFmt & (CF_MINUS_RIGHT|CF_CY_RIGHT))
+  {
+    switch (dwFmt & (CF_MINUS_RIGHT|CF_MINUS_BEFORE|CF_CY_RIGHT))
+    {
+    case CF_MINUS_RIGHT:
+    case CF_MINUS_RIGHT|CF_CY_RIGHT:
+      while (lpszNeg >= lpszNegStart)
+        *szOut-- = *lpszNeg--;
+      dwFmt &= ~CF_MINUS_RIGHT;
+      break;
+
+    case CF_CY_RIGHT:
+    case CF_MINUS_BEFORE|CF_CY_RIGHT:
+    case CF_MINUS_RIGHT|CF_MINUS_BEFORE|CF_CY_RIGHT:
+      while (lpszCy >= lpszCyStart)
+        *szOut-- = *lpszCy--;
+      if (dwFmt & CF_CY_SPACE)
+        *szOut-- = ' ';
+      dwFmt &= ~(CF_CY_RIGHT|CF_MINUS_BEFORE);
+      break;
+    }
+  }
+
+  /* Copy all digits up to the decimal point */
+  if (!lpFormat->NumDigits)
+  {
+    if (dwState & NF_ISREAL)
+    {
+      while (*szSrc != '.') /* Don't write any decimals or a separator */
+      {
+        if (*szSrc >= '5' || (*szSrc == '4' && (dwState & NF_ROUND)))
+          dwState |= NF_ROUND;
+        else
+          dwState &= ~NF_ROUND;
+        szSrc--;
+      }
+      szSrc--;
+    }
+  }
+  else
+  {
+    LPWSTR lpszDec = lpFormat->lpDecimalSep + strlenW(lpFormat->lpDecimalSep) - 1;
+
+    if (dwDecimals <= lpFormat->NumDigits)
+    {
+      dwDecimals = lpFormat->NumDigits - dwDecimals;
+      while (dwDecimals--)
+        *szOut-- = '0'; /* Pad to correct number of dp */
+    }
+    else
+    {
+      dwDecimals -= lpFormat->NumDigits;
+      /* Skip excess decimals, and determine if we have to round the number */
+      while (dwDecimals--)
+      {
+        if (*szSrc >= '5' || (*szSrc == '4' && (dwState & NF_ROUND)))
+          dwState |= NF_ROUND;
+        else
+          dwState &= ~NF_ROUND;
+        szSrc--;
+      }
+    }
+
+    if (dwState & NF_ISREAL)
+    {
+      while (*szSrc != '.')
+      {
+        if (dwState & NF_ROUND)
+        {
+          if (*szSrc == '9')
+            *szOut-- = '0'; /* continue rounding */
+          else
+          {
+            dwState &= ~NF_ROUND;
+            *szOut-- = (*szSrc)+1;
+          }
+          szSrc--;
+        }
+        else
+          *szOut-- = *szSrc--; /* Write existing decimals */
+      }
+      szSrc--; /* Skip '.' */
+    }
+    while (lpszDec >= lpFormat->lpDecimalSep)
+      *szOut-- = *lpszDec--; /* Write decimal separator */
+  }
+
+  dwGroupCount = lpFormat->Grouping;
+
+  /* Write the remaining whole number digits, including grouping chars */
+  while (szSrc >= lpszValue && *szSrc >= '0' && *szSrc <= '9')
+  {
+    if (dwState & NF_ROUND)
+    {
+      if (*szSrc == '9')
+        *szOut-- = '0'; /* continue rounding */
+      else
+      {
+        dwState &= ~NF_ROUND;
+        *szOut-- = (*szSrc)+1;
+      }
+      szSrc--;
+    }
+    else
+      *szOut-- = *szSrc--;
+
+    dwState |= NF_DIGITS_OUT;
+    dwCurrentGroupCount++;
+    if (szSrc >= lpszValue && dwCurrentGroupCount == dwGroupCount)
+    {
+      LPWSTR lpszGrp = lpFormat->lpThousandSep + strlenW(lpFormat->lpThousandSep) - 1;
+
+      while (lpszGrp >= lpFormat->lpThousandSep)
+        *szOut-- = *lpszGrp--; /* Write grouping char */
+
+      dwCurrentGroupCount = 0;
+    }
+  }
+  if (dwState & NF_ROUND)
+    *szOut-- = '1'; /* e.g. .6 > 1.0 */
+  else if (!(dwState & NF_DIGITS_OUT) && lpFormat->LeadingZero)
+    *szOut-- = '0'; /* Add leading 0 if we have no digits before the decimal point */
+
+  /* Add any leading negative or currency sign */
+  while (dwFmt & (CF_MINUS_LEFT|CF_CY_LEFT))
+  {
+    switch (dwFmt & (CF_MINUS_LEFT|CF_MINUS_BEFORE|CF_CY_LEFT))
+    {
+    case CF_MINUS_LEFT:
+    case CF_MINUS_LEFT|CF_CY_LEFT:
+      while (lpszNeg >= lpszNegStart)
+        *szOut-- = *lpszNeg--;
+      dwFmt &= ~CF_MINUS_LEFT;
+      break;
+
+    case CF_CY_LEFT:
+    case CF_CY_LEFT|CF_MINUS_BEFORE:
+    case CF_MINUS_LEFT|CF_MINUS_BEFORE|CF_CY_LEFT:
+      if (dwFmt & CF_CY_SPACE)
+        *szOut-- = ' ';
+      while (lpszCy >= lpszCyStart)
+        *szOut-- = *lpszCy--;
+      dwFmt &= ~(CF_CY_LEFT|CF_MINUS_BEFORE);
+      break;
+    }
+  }
+  if (dwFmt & CF_PARENS)
+    *szOut-- = '(';
+  szOut++;
+
+  iRet = strlenW(szOut) + 1;
+  if (cchOut)
+  {
+    if (iRet <= cchOut)
+      memcpy(lpCurrencyStr, szOut, iRet * sizeof(WCHAR));
+    else
+    {
+      memcpy(lpCurrencyStr, szOut, cchOut * sizeof(WCHAR));
+      lpCurrencyStr[cchOut - 1] = '\0';
+      SetLastError(ERROR_INSUFFICIENT_BUFFER);
+      iRet = 0;
+    }
+  }
+  return iRet;
+}
+
+/* FIXME: Everything below here needs to move somewhere else along with the
+ *        other EnumXXX functions, when a method for storing resources for
+ *        alternate calendars is determined.
+ */
+
+/**************************************************************************
+ *              EnumDateFormatsA	(KERNEL32.@)
+ */
+BOOL WINAPI EnumDateFormatsA( DATEFMT_ENUMPROCA lpDateFmtEnumProc, LCID Locale,  DWORD dwFlags)
+{
+  LCID Loc = GetUserDefaultLCID();
+  if(!lpDateFmtEnumProc)
+    {
+      SetLastError(ERROR_INVALID_PARAMETER);
+      return FALSE;
+    }
+
+  switch( Loc )
+ {
+
+   case 0x00000407:  /* (Loc,"de_DE") */
+   {
+    switch(dwFlags)
+    {
+      case DATE_SHORTDATE:
+	if(!(*lpDateFmtEnumProc)("dd.MM.yy")) return TRUE;
+	if(!(*lpDateFmtEnumProc)("d.M.yyyy")) return TRUE;
+	if(!(*lpDateFmtEnumProc)("d.MM.yy")) return TRUE;
+	if(!(*lpDateFmtEnumProc)("d.M.yy")) return TRUE;
+	return TRUE;
+      case DATE_LONGDATE:
+        if(!(*lpDateFmtEnumProc)("dddd,d. MMMM yyyy")) return TRUE;
+        if(!(*lpDateFmtEnumProc)("d. MMMM yyyy")) return TRUE;
+        if(!(*lpDateFmtEnumProc)("d. MMM yyyy")) return TRUE;
+	return TRUE;
+      default:
+	FIXME("Unknown date format (%ld)\n", dwFlags);
+	SetLastError(ERROR_INVALID_PARAMETER);
+	return FALSE;
+     }
+   }
+
+   case 0x0000040c:  /* (Loc,"fr_FR") */
+   {
+    switch(dwFlags)
+    {
+      case DATE_SHORTDATE:
+	if(!(*lpDateFmtEnumProc)("dd/MM/yy")) return TRUE;
+	if(!(*lpDateFmtEnumProc)("dd.MM.yy")) return TRUE;
+	if(!(*lpDateFmtEnumProc)("dd-MM-yy")) return TRUE;
+	if(!(*lpDateFmtEnumProc)("dd/MM/yyyy")) return TRUE;
+	return TRUE;
+      case DATE_LONGDATE:
+        if(!(*lpDateFmtEnumProc)("dddd d MMMM yyyy")) return TRUE;
+        if(!(*lpDateFmtEnumProc)("d MMM yy")) return TRUE;
+        if(!(*lpDateFmtEnumProc)("d MMMM yyyy")) return TRUE;
+	return TRUE;
+      default:
+	FIXME("Unknown date format (%ld)\n", dwFlags);
+	SetLastError(ERROR_INVALID_PARAMETER);
+	return FALSE;
+     }
+   }
+
+   case 0x00000c0c:  /* (Loc,"fr_CA") */
+   {
+    switch(dwFlags)
+    {
+      case DATE_SHORTDATE:
+	if(!(*lpDateFmtEnumProc)("yy-MM-dd")) return TRUE;
+	if(!(*lpDateFmtEnumProc)("dd-MM-yy")) return TRUE;
+	if(!(*lpDateFmtEnumProc)("yy MM dd")) return TRUE;
+	if(!(*lpDateFmtEnumProc)("dd/MM/yy")) return TRUE;
+	return TRUE;
+      case DATE_LONGDATE:
+        if(!(*lpDateFmtEnumProc)("d MMMM, yyyy")) return TRUE;
+        if(!(*lpDateFmtEnumProc)("d MMM yyyy")) return TRUE;
+	return TRUE;
+      default:
+	FIXME("Unknown date format (%ld)\n", dwFlags);
+	SetLastError(ERROR_INVALID_PARAMETER);
+	return FALSE;
+     }
+   }
+
+   case 0x00000809:  /* (Loc,"en_UK") */
+  {
+   switch(dwFlags)
+    {
+      case DATE_SHORTDATE:
+	if(!(*lpDateFmtEnumProc)("dd/MM/yy")) return TRUE;
+	if(!(*lpDateFmtEnumProc)("dd/MM/yyyy")) return TRUE;
+	if(!(*lpDateFmtEnumProc)("d/M/yy")) return TRUE;
+	if(!(*lpDateFmtEnumProc)("d.M.yy")) return TRUE;
+	return TRUE;
+      case DATE_LONGDATE:
+        if(!(*lpDateFmtEnumProc)("dd MMMM yyyy")) return TRUE;
+        if(!(*lpDateFmtEnumProc)("d MMMM yyyy")) return TRUE;
+	return TRUE;
+      default:
+	FIXME("Unknown date format (%ld)\n", dwFlags);
+	SetLastError(ERROR_INVALID_PARAMETER);
+	return FALSE;
+    }
+  }
+
+   case 0x00000c09:  /* (Loc,"en_AU") */
+  {
+   switch(dwFlags)
+    {
+      case DATE_SHORTDATE:
+	if(!(*lpDateFmtEnumProc)("d/MM/yy")) return TRUE;
+	if(!(*lpDateFmtEnumProc)("d/M/yy")) return TRUE;
+	if(!(*lpDateFmtEnumProc)("dd/MM/yy")) return TRUE;
+	return TRUE;
+      case DATE_LONGDATE:
+        if(!(*lpDateFmtEnumProc)("dddd,d MMMM yyyy")) return TRUE;
+        if(!(*lpDateFmtEnumProc)("d MMMM yyyy")) return TRUE;
+	return TRUE;
+      default:
+	FIXME("Unknown date format (%ld)\n", dwFlags);
+	SetLastError(ERROR_INVALID_PARAMETER);
+	return FALSE;
+    }
+  }
+
+   case 0x00001009:  /* (Loc,"en_CA") */
+  {
+   switch(dwFlags)
+    {
+      case DATE_SHORTDATE:
+	if(!(*lpDateFmtEnumProc)("dd/MM/yy")) return TRUE;
+	if(!(*lpDateFmtEnumProc)("d/M/yy")) return TRUE;
+	if(!(*lpDateFmtEnumProc)("yy-MM-dd")) return TRUE;
+	if(!(*lpDateFmtEnumProc)("M/dd/yy")) return TRUE;
+	return TRUE;
+      case DATE_LONGDATE:
+        if(!(*lpDateFmtEnumProc)("d-MMM-yy")) return TRUE;
+        if(!(*lpDateFmtEnumProc)("MMMM d, yyyy")) return TRUE;
+	return TRUE;
+      default:
+	FIXME("Unknown date format (%ld)\n", dwFlags);
+	SetLastError(ERROR_INVALID_PARAMETER);
+	return FALSE;
+    }
+  }
+
+   case 0x00001409:  /* (Loc,"en_NZ") */
+  {
+   switch(dwFlags)
+    {
+      case DATE_SHORTDATE:
+	if(!(*lpDateFmtEnumProc)("d/MM/yy")) return TRUE;
+	if(!(*lpDateFmtEnumProc)("dd/MM/yy")) return TRUE;
+	if(!(*lpDateFmtEnumProc)("d.MM.yy")) return TRUE;
+	return TRUE;
+      case DATE_LONGDATE:
+        if(!(*lpDateFmtEnumProc)("d MMMM yyyy")) return TRUE;
+        if(!(*lpDateFmtEnumProc)("dddd, d MMMM yyyy")) return TRUE;
+	return TRUE;
+      default:
+	FIXME("Unknown date format (%ld)\n", dwFlags);
+	SetLastError(ERROR_INVALID_PARAMETER);
+	return FALSE;
+    }
+  }
+
+   case 0x00001809:  /* (Loc,"en_IE") */
+  {
+   switch(dwFlags)
+    {
+      case DATE_SHORTDATE:
+	if(!(*lpDateFmtEnumProc)("dd/MM/yy")) return TRUE;
+	if(!(*lpDateFmtEnumProc)("d/M/yy")) return TRUE;
+	if(!(*lpDateFmtEnumProc)("d.M.yy")) return TRUE;
+	return TRUE;
+      case DATE_LONGDATE:
+        if(!(*lpDateFmtEnumProc)("dd MMMM yyyy")) return TRUE;
+        if(!(*lpDateFmtEnumProc)("d MMMM yyyy")) return TRUE;
+	return TRUE;
+      default:
+	FIXME("Unknown date format (%ld)\n", dwFlags);
+	SetLastError(ERROR_INVALID_PARAMETER);
+	return FALSE;
+    }
+  }
+
+   case 0x00001c09:  /* (Loc,"en_ZA") */
+  {
+   switch(dwFlags)
+    {
+      case DATE_SHORTDATE:
+	if(!(*lpDateFmtEnumProc)("yy/MM/dd")) return TRUE;
+	return TRUE;
+      case DATE_LONGDATE:
+        if(!(*lpDateFmtEnumProc)("dd MMMM yyyy")) return TRUE;
+	return TRUE;
+      default:
+	FIXME("Unknown date format (%ld)\n", dwFlags);
+	SetLastError(ERROR_INVALID_PARAMETER);
+	return FALSE;
+    }
+  }
+
+   case 0x00002009:  /* (Loc,"en_JM") */
+  {
+   switch(dwFlags)
+    {
+      case DATE_SHORTDATE:
+	if(!(*lpDateFmtEnumProc)("dd/MM/yyyy")) return TRUE;
+	return TRUE;
+      case DATE_LONGDATE:
+        if(!(*lpDateFmtEnumProc)("dddd,MMMM dd,yyyy")) return TRUE;
+        if(!(*lpDateFmtEnumProc)("MMMM dd,yyyy")) return TRUE;
+        if(!(*lpDateFmtEnumProc)("dddd,dd MMMM,yyyy")) return TRUE;
+        if(!(*lpDateFmtEnumProc)("dd MMMM,yyyy")) return TRUE;
+	return TRUE;
+      default:
+	FIXME("Unknown date format (%ld)\n", dwFlags);
+	SetLastError(ERROR_INVALID_PARAMETER);
+	return FALSE;
+    }
+  }
+
+   case 0x00002809:  /* (Loc,"en_BZ") */
+   case 0x00002c09:  /* (Loc,"en_TT") */
+  {
+   switch(dwFlags)
+    {
+      case DATE_SHORTDATE:
+	if(!(*lpDateFmtEnumProc)("dd/MM/yyyy")) return TRUE;
+	return TRUE;
+      case DATE_LONGDATE:
+        if(!(*lpDateFmtEnumProc)("dddd,dd MMMM yyyy")) return TRUE;
+	return TRUE;
+      default:
+	FIXME("Unknown date format (%ld)\n", dwFlags);
+	SetLastError(ERROR_INVALID_PARAMETER);
+	return FALSE;
+    }
+  }
+
+   default:  /* default to US English "en_US" */
+  {
+   switch(dwFlags)
+    {
+      case DATE_SHORTDATE:
+	if(!(*lpDateFmtEnumProc)("M/d/yy")) return TRUE;
+	if(!(*lpDateFmtEnumProc)("M/d/yyyy")) return TRUE;
+	if(!(*lpDateFmtEnumProc)("MM/dd/yy")) return TRUE;
+	if(!(*lpDateFmtEnumProc)("MM/dd/yyyy")) return TRUE;
+	if(!(*lpDateFmtEnumProc)("yy/MM/dd")) return TRUE;
+	if(!(*lpDateFmtEnumProc)("dd-MMM-yy")) return TRUE;
+	return TRUE;
+      case DATE_LONGDATE:
+        if(!(*lpDateFmtEnumProc)("dddd, MMMM dd, yyyy")) return TRUE;
+        if(!(*lpDateFmtEnumProc)("MMMM dd, yyyy")) return TRUE;
+        if(!(*lpDateFmtEnumProc)("dddd, dd MMMM, yyyy")) return TRUE;
+        if(!(*lpDateFmtEnumProc)("dd MMMM, yyyy")) return TRUE;
+	return TRUE;
+      default:
+	FIXME("Unknown date format (%ld)\n", dwFlags);
+	SetLastError(ERROR_INVALID_PARAMETER);
+	return FALSE;
+    }
+  }
+ }
+}
+
+/**************************************************************************
+ *              EnumDateFormatsW	(KERNEL32.@)
+ */
+BOOL WINAPI EnumDateFormatsW( DATEFMT_ENUMPROCW lpDateFmtEnumProc, LCID Locale, DWORD dwFlags )
+{
+  FIXME("(%p, %ld, %ld): stub\n", lpDateFmtEnumProc, Locale, dwFlags);
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+/**************************************************************************
+ *              EnumTimeFormatsA	(KERNEL32.@)
+ */
+BOOL WINAPI EnumTimeFormatsA( TIMEFMT_ENUMPROCA lpTimeFmtEnumProc, LCID Locale, DWORD dwFlags )
+{
+  LCID Loc = GetUserDefaultLCID();
+  if(!lpTimeFmtEnumProc)
+    {
+      SetLastError(ERROR_INVALID_PARAMETER);
+      return FALSE;
+    }
+  if(dwFlags)
+    {
+      FIXME("Unknown time format (%ld)\n", dwFlags);
+    }
+
+  switch( Loc )
+ {
+   case 0x00000407:  /* (Loc,"de_DE") */
+   {
+    if(!(*lpTimeFmtEnumProc)("HH.mm")) return TRUE;
+    if(!(*lpTimeFmtEnumProc)("HH:mm:ss")) return TRUE;
+    if(!(*lpTimeFmtEnumProc)("H:mm:ss")) return TRUE;
+    if(!(*lpTimeFmtEnumProc)("H.mm")) return TRUE;
+    if(!(*lpTimeFmtEnumProc)("H.mm'Uhr'")) return TRUE;
+    return TRUE;
+   }
+
+   case 0x0000040c:  /* (Loc,"fr_FR") */
+   case 0x00000c0c:  /* (Loc,"fr_CA") */
+   {
+    if(!(*lpTimeFmtEnumProc)("H:mm")) return TRUE;
+    if(!(*lpTimeFmtEnumProc)("HH:mm:ss")) return TRUE;
+    if(!(*lpTimeFmtEnumProc)("H:mm:ss")) return TRUE;
+    if(!(*lpTimeFmtEnumProc)("HH.mm")) return TRUE;
+    if(!(*lpTimeFmtEnumProc)("HH'h'mm")) return TRUE;
+    return TRUE;
+   }
+
+   case 0x00000809:  /* (Loc,"en_UK") */
+   case 0x00000c09:  /* (Loc,"en_AU") */
+   case 0x00001409:  /* (Loc,"en_NZ") */
+   case 0x00001809:  /* (Loc,"en_IE") */
+   {
+    if(!(*lpTimeFmtEnumProc)("h:mm:ss tt")) return TRUE;
+    if(!(*lpTimeFmtEnumProc)("HH:mm:ss")) return TRUE;
+    if(!(*lpTimeFmtEnumProc)("H:mm:ss")) return TRUE;
+    return TRUE;
+   }
+
+   case 0x00001c09:  /* (Loc,"en_ZA") */
+   case 0x00002809:  /* (Loc,"en_BZ") */
+   case 0x00002c09:  /* (Loc,"en_TT") */
+   {
+    if(!(*lpTimeFmtEnumProc)("h:mm:ss tt")) return TRUE;
+    if(!(*lpTimeFmtEnumProc)("hh:mm:ss tt")) return TRUE;
+    return TRUE;
+   }
+
+   default:  /* default to US style "en_US" */
+   {
+    if(!(*lpTimeFmtEnumProc)("h:mm:ss tt")) return TRUE;
+    if(!(*lpTimeFmtEnumProc)("hh:mm:ss tt")) return TRUE;
+    if(!(*lpTimeFmtEnumProc)("H:mm:ss")) return TRUE;
+    if(!(*lpTimeFmtEnumProc)("HH:mm:ss")) return TRUE;
+    return TRUE;
+   }
+ }
+}
+
+/**************************************************************************
+ *              EnumTimeFormatsW	(KERNEL32.@)
+ */
+BOOL WINAPI EnumTimeFormatsW( TIMEFMT_ENUMPROCW lpTimeFmtEnumProc, LCID Locale, DWORD dwFlags )
+{
+  FIXME("(%p,%ld,%ld): stub\n", lpTimeFmtEnumProc, Locale, dwFlags);
+  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+  return FALSE;
+}
+
+/******************************************************************************
+ *		EnumCalendarInfoA	[KERNEL32.@]
+ */
+BOOL WINAPI EnumCalendarInfoA( CALINFO_ENUMPROCA calinfoproc,LCID locale,
+                               CALID calendar,CALTYPE caltype )
+{
+    FIXME("(%p,0x%04lx,0x%08lx,0x%08lx),stub!\n",calinfoproc,locale,calendar,caltype);
+    return FALSE;
+}

From def9bd78171205b99d56a09764eee4bce14999cf Mon Sep 17 00:00:00 2001
From: Gunnar Dalsnes <hardon@online.no>
Date: Sat, 26 Jun 2004 20:07:40 +0000
Subject: [PATCH 098/356] save modlue handle

svn path=/trunk/; revision=9890
---
 reactos/lib/kernel32/include/kernel32.h | 1 +
 reactos/lib/kernel32/misc/dllmain.c     | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/reactos/lib/kernel32/include/kernel32.h b/reactos/lib/kernel32/include/kernel32.h
index b3815f221e6..d87ba4a88bd 100755
--- a/reactos/lib/kernel32/include/kernel32.h
+++ b/reactos/lib/kernel32/include/kernel32.h
@@ -37,6 +37,7 @@ DWORD
 extern BOOL bIsFileApiAnsi;
 extern HANDLE hProcessHeap;
 extern HANDLE hBaseDir;
+extern HMODULE hCurrentModule;
 
 extern CRITICAL_SECTION DllLock;
 
diff --git a/reactos/lib/kernel32/misc/dllmain.c b/reactos/lib/kernel32/misc/dllmain.c
index 0a9e5a0159d..afc8aff6fa6 100644
--- a/reactos/lib/kernel32/misc/dllmain.c
+++ b/reactos/lib/kernel32/misc/dllmain.c
@@ -1,4 +1,4 @@
-/* $Id: dllmain.c,v 1.34 2004/02/22 17:30:32 chorns Exp $
+/* $Id: dllmain.c,v 1.35 2004/06/26 20:07:40 gdalsnes Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -23,6 +23,7 @@ extern UNICODE_STRING SystemDirectory;
 extern UNICODE_STRING WindowsDirectory;
 
 HANDLE hProcessHeap = NULL;
+HMODULE hCurrentModule = NULL;
 HANDLE hBaseDir = NULL;
 
 static BOOL DllInitialized = FALSE;
@@ -117,6 +118,7 @@ DllMain(HANDLE hDll,
 	  }
 
 	hProcessHeap = RtlGetProcessHeap();
+   hCurrentModule = hDll;
 
 	/*
 	 * Initialize WindowsDirectory and SystemDirectory

From add8be67c259a16ecfcb968075b8dd63af0a8803 Mon Sep 17 00:00:00 2001
From: Gunnar Dalsnes <hardon@online.no>
Date: Sat, 26 Jun 2004 20:10:50 +0000
Subject: [PATCH 099/356] remove duplicate stuff due to adding lcformat from
 wine impl. misc stuff from wine

svn path=/trunk/; revision=9891
---
 reactos/lib/kernel32/misc/lang.c | 630 ++++++-------------------------
 1 file changed, 114 insertions(+), 516 deletions(-)

diff --git a/reactos/lib/kernel32/misc/lang.c b/reactos/lib/kernel32/misc/lang.c
index a72031093db..edd70e49f87 100644
--- a/reactos/lib/kernel32/misc/lang.c
+++ b/reactos/lib/kernel32/misc/lang.c
@@ -1,4 +1,4 @@
-/* $Id: lang.c,v 1.19 2004/06/13 20:04:56 navaraf Exp $
+/* $Id: lang.c,v 1.20 2004/06/26 20:10:50 gdalsnes Exp $
  *
  * COPYRIGHT: See COPYING in the top level directory
  * PROJECT  : ReactOS user mode libraries
@@ -21,69 +21,57 @@
 #define LOCALE_USE_CP_ACP 0x40000000
 #define LOCALE_LOCALEINFOFLAGSMASK (LOCALE_NOUSEROVERRIDE|LOCALE_USE_CP_ACP|LOCALE_RETURN_NUMBER)
 
-static LCID SystemLocale = MAKELCID(LANG_ENGLISH, SORT_DEFAULT);
+//static LCID SystemLocale = MAKELCID(LANG_ENGLISH, SORT_DEFAULT);
 
 //#define _OLE2NLS_IN_BUILD_
 
-/*
+
+/******************************************************************************
  * @implemented
+ * RIPPED FROM WINE's dlls\kernel\locale.c rev 1.42
+ *
+ *    ConvertDefaultLocale (KERNEL32.@)
+ *
+ * Convert a default locale identifier into a real identifier.
+ *
+ * PARAMS
+ *  lcid [I] LCID identifier of the locale to convert
+ *
+ * RETURNS
+ *  lcid unchanged, if not a default locale or its sublanguage is
+ *   not SUBLANG_NEUTRAL.
+ *  GetSystemDefaultLCID(), if lcid == LOCALE_SYSTEM_DEFAULT.
+ *  GetUserDefaultLCID(), if lcid == LOCALE_USER_DEFAULT or LOCALE_NEUTRAL.
+ *  Otherwise, lcid with sublanguage changed to SUBLANG_DEFAULT.
  */
-LCID
-STDCALL
-ConvertDefaultLocale (
-    LCID    Locale
-    )
+LCID WINAPI ConvertDefaultLocale( LCID lcid )
 {
-  switch(Locale)
-  {
+    LANGID langid;
+
+    switch (lcid)
+    {
     case LOCALE_SYSTEM_DEFAULT:
-      return GetSystemDefaultLCID();
-    
+        lcid = GetSystemDefaultLCID();
+        break;
     case LOCALE_USER_DEFAULT:
-      return GetUserDefaultLCID();
-    
-    /*case LOCALE_NEUTRAL:
-      return MAKELCID(LANG_NEUTRAL, SUBLANG_NEUTRAL);*/
-  }
-  
-  /* ported from wine, is that right? */
-  return MAKELANGID(PRIMARYLANGID(Locale), SUBLANG_NEUTRAL);
+    case LOCALE_NEUTRAL:
+        lcid = GetUserDefaultLCID();
+        break;
+    default:
+        /* Replace SUBLANG_NEUTRAL with SUBLANG_DEFAULT */
+        langid = LANGIDFROMLCID(lcid);
+        if (SUBLANGID(langid) == SUBLANG_NEUTRAL)
+        {
+          langid = MAKELANGID(PRIMARYLANGID(langid), SUBLANG_DEFAULT);
+          lcid = MAKELCID(langid, SORTIDFROMLCID(lcid));
+        }
+    }
+    return lcid;
 }
 
 
-/*
- * @unimplemented
- */
-BOOL
-STDCALL
-EnumCalendarInfoW (
-    CALINFO_ENUMPROCW lpCalInfoEnumProc,
-    LCID              Locale,
-    CALID             Calendar,
-    CALTYPE           CalType
-    )
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
 
 
-/*
- * @unimplemented
- */
-BOOL
-STDCALL
-EnumCalendarInfoA (
-    CALINFO_ENUMPROCA lpCalInfoEnumProc,
-    LCID              Locale,
-    CALID             Calendar,
-    CALTYPE           CalType
-    )
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
-
 
 /*
  * @unimplemented
@@ -117,36 +105,6 @@ EnumCalendarInfoExW(
 }
 
 
-/*
- * @unimplemented
- */
-BOOL
-STDCALL
-EnumDateFormatsW (
-    DATEFMT_ENUMPROCW  lpDateFmtEnumProc,
-    LCID               Locale,
-    DWORD              dwFlags
-    )
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
-
-
-/*
- * @unimplemented
- */
-BOOL
-STDCALL
-EnumDateFormatsA (
-    DATEFMT_ENUMPROCA  lpDateFmtEnumProc,
-    LCID               Locale,
-    DWORD              dwFlags
-    )
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
 
 
 /*
@@ -327,36 +285,6 @@ EnumSystemLocalesA (
 #endif
 
 
-/*
- * @unimplemented
- */
-BOOL
-STDCALL
-EnumTimeFormatsW (
-    TIMEFMT_ENUMPROCW    lpTimeFmtEnumProc,
-    LCID            Locale,
-    DWORD           dwFlags
-    )
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
-
-
-/*
- * @unimplemented
- */
-BOOL
-STDCALL
-EnumTimeFormatsA (
-    TIMEFMT_ENUMPROCA  lpTimeFmtEnumProc,
-    LCID               Locale,
-    DWORD              dwFlags
-    )
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
 
 
 /*
@@ -504,86 +432,6 @@ GetCPInfoExA(
 }
 
 
-/*
- * @unimplemented
- */
-int
-STDCALL
-GetCurrencyFormatW (
-    LCID            Locale,
-    DWORD           dwFlags,
-    LPCWSTR         lpValue,
-    CONST CURRENCYFMTW   * lpFormat,
-    LPWSTR          lpCurrencyStr,
-    int         cchCurrency
-    )
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return 0;
-}
-
-
-/*
- * @unimplemented
- */
-int
-STDCALL
-GetCurrencyFormatA (
-    LCID            Locale,
-    DWORD           dwFlags,
-    LPCSTR          lpValue,
-    CONST CURRENCYFMTA   * lpFormat,
-    LPSTR           lpCurrencyStr,
-    int         cchCurrency
-    )
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return 0;
-}
-
-
-#ifndef _OLE2NLS_IN_BUILD_
-
-/*
- * @unimplemented
- */
-int
-STDCALL
-GetDateFormatW (
-    LCID            Locale,
-    DWORD           dwFlags,
-    CONST SYSTEMTIME    * lpDate,
-    LPCWSTR         lpFormat,
-    LPWSTR          lpDateStr,
-    int         cchDate
-    )
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return 0;
-}
-
-
-/*
- * @unimplemented
- */
-int
-STDCALL
-GetDateFormatA (
-    LCID            Locale,
-    DWORD           dwFlags,
-    CONST SYSTEMTIME    * lpDate,
-    LPCSTR          lpFormat,
-    LPSTR           lpDateStr,
-    int         cchDate
-    )
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return 0;
-}
-
-#endif
-
-
 /*
  * @unimplemented
  */
@@ -931,43 +779,8 @@ INT STDCALL GetLocaleInfoA( LCID lcid, LCTYPE lctype, LPSTR buffer, INT len )
 }
 
 
-/*
- * @unimplemented
- */
-int
-STDCALL
-GetNumberFormatW (
-    LCID        Locale,
-    DWORD       dwFlags,
-    LPCWSTR     lpValue,
-    CONST NUMBERFMTW * lpFormat,
-    LPWSTR      lpNumberStr,
-    int     cchNumber
-    )
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return 0;
-}
 
 
-/*
- * @unimplemented
- */
-int
-STDCALL
-GetNumberFormatA (
-    LCID        Locale,
-    DWORD       dwFlags,
-    LPCSTR      lpValue,
-    CONST NUMBERFMTA * lpFormat,
-    LPSTR       lpNumberStr,
-    int     cchNumber
-    )
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return 0;
-}
-
 
 /*
  * @unimplemented
@@ -984,18 +797,13 @@ GetOEMCP (VOID)
 #ifndef _OLE2NLS_IN_BUILD_
 
 /*
- * @unimplemented
+ * @implemented
  */
 LANGID
 STDCALL
 GetSystemDefaultLangID (VOID)
 {
-     /* FIXME: ??? */
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return MAKELANGID(
-        LANG_ENGLISH,
-        SUBLANG_ENGLISH_US
-        );
+   return LANGIDFROMLCID(GetSystemDefaultLCID());
 }
 
 
@@ -1006,7 +814,11 @@ LCID
 STDCALL
 GetSystemDefaultLCID (VOID)
 {
-  return SystemLocale;
+   LCID lcid;
+   NtQueryDefaultLocale( FALSE, &lcid );
+   return lcid;
+
+//  return SystemLocale;
 }
 
 #endif
@@ -1038,269 +850,7 @@ GetThreadLocale (VOID)
 
 #endif
 
-INT RosGetTimeFormat(LCID Locale, DWORD dwFlags, CONST SYSTEMTIME *lpTime, LPCWSTR lpFormat, LPWSTR lpTimeStr, int cchTime)
-{
-	INT nPos = 0, nLastFormatPos = 0;
-	BOOL bDrop = FALSE;
 
-	while( *lpFormat )
-	{
-		if (*lpFormat == L'\'')
-		{
-			lpFormat++;
-
-			while(*lpFormat)
-			{
-				if (*lpFormat == L'\'')
-				{
-					lpFormat++;
-					if(*lpFormat != L'\'')
-						break;
-				}
-				if (!cchTime)
-					nPos++;
-				else if(nPos > cchTime)
-				{
-					SetLastError(ERROR_INSUFFICIENT_BUFFER);
-					return 0;
-				}
-				else
-				{
-					if(!bDrop)
-					{
-						lpTimeStr[nPos] = *lpFormat;
-						nPos++;
-					}
-				}
-				*lpFormat++;
-			}
-		}
-		else if(*lpFormat==L'H' || *lpFormat==L'h' || *lpFormat==L'm' || *lpFormat==L's' || *lpFormat==L't' )
-		{
-			int nCount, nBufLen;
-			WCHAR nType = *lpFormat;
-			WCHAR Buffer[40];
-
-			bDrop = FALSE;
-
-			Buffer[0] = 0;
-
-			for(nCount = 1; *lpFormat == nType; lpFormat++)
-				nCount++;
-
-			switch(nType)
-			{
-			case L'h':
-				{
-					if(!(dwFlags & TIME_FORCE24HOURFORMAT))
-					{
-						swprintf( Buffer, L"%.*d", nCount > 2 ? 2 : nCount,
-							lpTime->wHour == 0 ? 12 : (lpTime->wHour - 1) % 12 + 1);
-						break;
-					}
-				}
-			case L'H':
-				{
-					swprintf( Buffer, L"%.*d", nCount > 2 ? 2 : nCount, lpTime->wHour );
-					break;
-				}
-			case L'm':
-				{
-					if(!(dwFlags & TIME_NOMINUTESORSECONDS))
-					{
-						swprintf( Buffer, L"%.*d", nCount > 2 ? 2 : nCount, lpTime->wMinute );
-					}
-					else
-						nPos = nLastFormatPos;
-
-					break;
-				}
-			case L's':
-				{
-					if(!(dwFlags & (TIME_NOSECONDS|TIME_NOMINUTESORSECONDS)))
-					{
-					    swprintf( Buffer, L"%.*d", nCount > 2 ? 2 : nCount, lpTime->wSecond );				
-					}
-					else
-						nPos = nLastFormatPos;
-
-					break;
-				}
-			case L't':
-				{
-					if(!(dwFlags & TIME_NOTIMEMARKER))
-					{
-						GetLocaleInfoW(Locale, (lpTime->wHour < 12) ? LOCALE_S1159 : LOCALE_S2359, Buffer, sizeof(Buffer) );
-						if(nCount == 1)
-							Buffer[1] = 0;
-					}
-					else
-					{
-						nPos = nLastFormatPos;
-						bDrop = TRUE;
-					}
-					break;
-				}
-			}
-			nBufLen = wcslen(Buffer);
-
-			if(!cchTime)
-			{
-				/* wine does nothing here?!? */
-			}
-			else if(nPos + nBufLen < cchTime)
-				wcscpy( lpTimeStr + nPos, Buffer );
-			else
-			{
-				lstrcpynW( lpTimeStr + nPos, Buffer, cchTime - nPos );
-				
-				SetLastError(ERROR_INSUFFICIENT_BUFFER);
-				return 0;
-			}
-			nPos += nBufLen;
-			nLastFormatPos = nPos;
-		}
-		else
-		{
-			if(!cchTime)
-				nPos++;
-			else if(nPos > cchTime)
-			{
-				SetLastError(ERROR_INSUFFICIENT_BUFFER);
-				return 0;
-			}
-			else
-			{
-				if(!bDrop)
-				{
-					lpTimeStr[nPos] = *lpFormat;
-					nPos++;
-				}
-			}
-		lpFormat++;
-		}
-	}
-
-	/* Are we not only counting? */
-	if (cchTime)
-	{
-		if (nPos >= cchTime)
-		{
-			SetLastError(ERROR_INSUFFICIENT_BUFFER);
-			return 0;
-		}
-		else
-			lpTimeStr[nPos] = L'\0';
-	}
-
-	nPos++;
-	return nPos;
-}
-
-/*
- * @implemented
- */
-INT
-STDCALL
-GetTimeFormatW (
-    LCID            Locale,
-    DWORD           dwFlags,
-    CONST SYSTEMTIME* lpTime,
-    LPCWSTR         lpFormat,
-    LPWSTR          lpTimeStr,
-    int             cchTime
-    )
-{
-	WCHAR Buffer[40];
-	SYSTEMTIME t;
-
-    if (!Locale)
-		Locale = LOCALE_SYSTEM_DEFAULT;
-        
-	Locale = ConvertDefaultLocale( Locale );
-
-	if (lpFormat == NULL)
-	{
-	  if (dwFlags & LOCALE_NOUSEROVERRIDE)
-		  Locale = GetSystemDefaultLCID();
-
-	  if (!GetLocaleInfoW(Locale, LOCALE_STIMEFORMAT, Buffer, 40))
-		return 0;
-
-	  lpFormat = Buffer;
-	}
-	if (dwFlags & LOCALE_NOUSEROVERRIDE)
-    {
-		SetLastError(ERROR_INVALID_FLAGS);
-	    return 0;
-    }
-	if (lpTime == NULL)
-	{
-		GetLocalTime(&t);
-		lpTime = &t;
-	}
-	if((lpTime->wHour > 24) || (lpTime->wMinute >= 60) || (lpTime->wSecond >= 60))
-    {
-		SetLastError(ERROR_INVALID_PARAMETER);
-        return 0;
-    }
-	return RosGetTimeFormat(Locale, dwFlags, lpTime, lpFormat, lpTimeStr, cchTime);
-}
-
-
-/*
- * @implemented
- */
-int
-STDCALL
-GetTimeFormatA (
-    LCID            Locale,
-    DWORD           dwFlags,
-    CONST SYSTEMTIME* lpTime,
-    LPCSTR          lpFormat,
-    LPSTR           lpTimeStr,
-    int             cchTime
-    )
-{
-	LPWSTR lpFormatU = NULL;
-	LPWSTR lpTimeStrU;
-	int numCharsU;
-	int retVal = 0;
-
-	if (lpFormat != NULL) {
-		/* First just determine the number of necessary bytes 
-		for the unicode string */
-		int numBytes = MultiByteToWideChar(CP_ACP, 0, lpFormat, -1, NULL, 0);
-
-		if (numBytes > 0) {
-			lpFormatU = HeapAlloc(GetProcessHeap(), 0, numBytes);
-
-			if (lpFormatU != NULL) 
-				MultiByteToWideChar(CP_ACP, 0, lpFormat, -1, lpFormatU, numBytes);
-		}
-	}
-
-	/* Just get the number of characters needed to store the 
-	   Unicode output */
-	numCharsU = GetTimeFormatW(Locale, dwFlags, lpTime, lpFormatU, NULL, 0);
-
-	if (numCharsU != 0) {
-		lpTimeStrU = HeapAlloc(GetProcessHeap(), 0, numCharsU*sizeof(WCHAR));
-
-		if (lpTimeStrU != NULL) {
-			if (GetTimeFormatW(Locale, dwFlags, lpTime, lpFormatU, lpTimeStrU, numCharsU))
-				/* Convert the output string to ANSI */
-				retVal = WideCharToMultiByte(CP_ACP, 0, lpTimeStrU, numCharsU, lpTimeStr, cchTime, NULL, NULL);
-
-			HeapFree(GetProcessHeap(), 0, lpTimeStrU);
-		}
-	}
-
-	if (lpFormatU != NULL)
-		HeapFree(GetProcessHeap(), 0, lpFormatU);
-
-	return retVal;
-}
 
 
 
@@ -1385,21 +935,40 @@ IsValidLanguageGroup(
 }
 
 
-/*
- * @unimplemented
+
+/******************************************************************************
+ * @implemented
+ * RIPPED FROM WINE's dlls\kernel\locale.c rev 1.44
+ *
+ *           IsValidLocale   (KERNEL32.@)
+ *
+ * Determine if a locale is valid.
+ *
+ * PARAMS
+ *  lcid  [I] LCID of the locale to check
+ *  flags [I] LCID_SUPPORTED = Valid, LCID_INSTALLED = Valid and installed on the system
+ *
+ * RETURN
+ *  TRUE,  if lcid is valid,
+ *  FALSE, otherwise.
+ *
+ * NOTES
+ *  Wine does not currently make the distinction between supported and installed. All
+ *  languages supported are installed by default.
  */
-BOOL
-STDCALL
-IsValidLocale (
-    LCID    Locale,
-    DWORD   dwFlags
-    )
+BOOL STDCALL 
+IsValidLocale( 
+   LCID lcid, 
+   DWORD flags 
+   )
 {
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
+    /* check if language is registered in the kernel32 resources */
+    return FindResourceExW( hCurrentModule, (LPWSTR)RT_STRING,
+                            (LPCWSTR)LOCALE_ILANGUAGE, LANGIDFROMLCID(lcid)) != 0;
 }
 
 
+
 #ifndef _OLE2NLS_IN_BUILD_
 
 /*
@@ -1507,19 +1076,48 @@ SetLocaleInfoW (
 }
 
 
-/*
+/**********************************************************************
  * @implemented
+ * RIPPED FROM WINE's dlls\kernel\locale.c rev 1.42
+ *
+ *           SetThreadLocale    (KERNEL32.@)
+ *  
+ * Set the current threads locale.
+ *
+ * PARAMS
+ *  lcid [I] LCID of the locale to set
+ *
+ * RETURNS
+ *  Success: TRUE. The threads locale is set to lcid.
+ *  Failure: FALSE. Use GetLastError() to determine the cause.
+ *
  */
-BOOL
-STDCALL
-SetThreadLocale (
-    LCID    Locale
-    )
+BOOL WINAPI SetThreadLocale( LCID lcid )
 {
-  /* FIXME - Check if locale is valid */
-  
-  NtCurrentTeb()->CurrentLocale = Locale;
-  return TRUE;
+    DPRINT("SetThreadLocale(0x%04lX)\n", lcid);
+
+    lcid = ConvertDefaultLocale(lcid);
+
+    if (lcid != GetThreadLocale())
+    {
+        if (!IsValidLocale(lcid, LCID_SUPPORTED))
+        {
+            SetLastError(ERROR_INVALID_PARAMETER);
+            return FALSE;
+        }
+
+        NtCurrentTeb()->CurrentLocale = lcid;
+        /* FIXME: NtCurrentTeb()->code_page = get_lcid_codepage( lcid );
+         * Wine save the acp for easy/fast access, but ROS has no such Teb member.
+         * Maybe add this member to ros as well?
+         */
+         
+        /*
+        Lag test app for å se om locale etc, endres i en app. etter at prosessen er
+        startet, eller om bare nye prosesser blir berørt.
+        */
+    }
+    return TRUE;
 }
 
 #endif

From c12eca029d0ce98d2f3e971c0deda387c596f2b8 Mon Sep 17 00:00:00 2001
From: Gunnar Dalsnes <hardon@online.no>
Date: Sat, 26 Jun 2004 20:11:18 +0000
Subject: [PATCH 100/356] make misc/lcformat

svn path=/trunk/; revision=9892
---
 reactos/lib/kernel32/makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reactos/lib/kernel32/makefile b/reactos/lib/kernel32/makefile
index 3ac8a5e71c7..eff36290df5 100644
--- a/reactos/lib/kernel32/makefile
+++ b/reactos/lib/kernel32/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.80 2004/05/29 21:24:44 hbirr Exp $
+# $Id: makefile,v 1.81 2004/06/26 20:11:18 gdalsnes Exp $
 
 PATH_TO_TOP = ../..
 
@@ -34,7 +34,7 @@ MISC_OBJECTS = misc/error.o misc/atom.o misc/handle.o misc/env.o \
                misc/stubs.o misc/lang.o misc/ldr.o misc/res.o \
                misc/sysinfo.o misc/profile.o \
                misc/mbchars.o misc/muldiv.o misc/computername.o \
-               misc/perfcnt.o misc/lzexpand_main.o
+               misc/perfcnt.o misc/lzexpand_main.o misc/lcformat.o
 
 FILE_OBJECTS = file/file.o file/curdir.o file/lfile.o file/dir.o \
                file/iocompl.o file/volume.o file/deviceio.o file/dosdev.o \

From 20ac14caf593fc3cd35ad04801954e1b78e91fa0 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sat, 26 Jun 2004 22:30:34 +0000
Subject: [PATCH 101/356] - Added VideoPortQueryPerformanceCounter and
 VideoPortQueryServices to the import library definition file. - Fixed minor
 memory overrun in VideoPortInitialize for older video drivers (< Win NT 5.1).

svn path=/trunk/; revision=9893
---
 reactos/drivers/video/videoprt/videoprt.c   | 5 +++--
 reactos/drivers/video/videoprt/videoprt.def | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/reactos/drivers/video/videoprt/videoprt.c b/reactos/drivers/video/videoprt/videoprt.c
index 3fc4bb3e2e2..ff7b14565fb 100644
--- a/reactos/drivers/video/videoprt/videoprt.c
+++ b/reactos/drivers/video/videoprt/videoprt.c
@@ -18,7 +18,7 @@
  * If not, write to the Free Software Foundation,
  * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Id: videoprt.c,v 1.24 2004/03/19 20:58:32 navaraf Exp $
+ * $Id: videoprt.c,v 1.25 2004/06/26 22:30:34 navaraf Exp $
  */
 
 #include "videoprt.h"
@@ -534,7 +534,8 @@ VideoPortInitialize(
    RtlCopyMemory(
       &DriverExtension->InitializationData,
       HwInitializationData,
-      sizeof(VIDEO_HW_INITIALIZATION_DATA));
+      min(sizeof(VIDEO_HW_INITIALIZATION_DATA),
+          HwInitializationData->HwInitDataSize));
    DriverExtension->HwContext = HwContext;
 
    RtlCopyMemory(&DriverExtension->RegistryPath, RegistryPath, sizeof(UNICODE_STRING));
diff --git a/reactos/drivers/video/videoprt/videoprt.def b/reactos/drivers/video/videoprt/videoprt.def
index e0bd5ee958d..a5caae0c563 100644
--- a/reactos/drivers/video/videoprt/videoprt.def
+++ b/reactos/drivers/video/videoprt/videoprt.def
@@ -1,4 +1,4 @@
-; $Id: videoprt.def,v 1.7 2004/03/08 20:27:33 dwelch Exp $
+; $Id: videoprt.def,v 1.8 2004/06/26 22:30:34 navaraf Exp $
 ;
 ; vidport.def - export definition file for ReactOS
 ;
@@ -39,6 +39,8 @@ VideoPortMapMemory@24
 VideoPortMoveMemory@12
 VideoPortPutDmaAdapter@8
 VideoPortQueueDpc@12
+VideoPortQueryPerformanceCounter@8
+VideoPortQueryServices@12
 VideoPortReadPortUchar@4
 VideoPortReadPortUshort@4
 VideoPortReadPortUlong@4

From 0ce9ce5756b11e06f188c3e3b368c30c955d20c7 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sat, 26 Jun 2004 22:30:34 +0000
Subject: [PATCH 102/356] - Use the Video Port driver Int 10 services instead
 of using undocumented Ke386CallBios function. - Power management functions
 implementation. Based on patch by Magnus Olsen <magnus@itkonsult-olsen.com>.
 - First steps towards VBE 1.2 support. Based on patch by Magnus Olsen
 <magnus@itkonsult-olsen.com>.

svn path=/trunk/; revision=9894
---
 reactos/drivers/video/miniport/vbe/vbemp.c | 637 ++++++++++++---------
 reactos/drivers/video/miniport/vbe/vbemp.h |  86 ++-
 2 files changed, 418 insertions(+), 305 deletions(-)

diff --git a/reactos/drivers/video/miniport/vbe/vbemp.c b/reactos/drivers/video/miniport/vbe/vbemp.c
index 960efcfd16f..07f881f5e11 100644
--- a/reactos/drivers/video/miniport/vbe/vbemp.c
+++ b/reactos/drivers/video/miniport/vbe/vbemp.c
@@ -1,8 +1,10 @@
 /*
  * ReactOS VBE miniport video driver
- *
  * Copyright (C) 2004 Filip Navara
  *
+ * Power Management and VBE 1.2 support
+ * Copyright (C) 2004 Magnus Olsen
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
@@ -19,7 +21,8 @@
  *
  * TODO:
  * - Check input parameters everywhere.
- * - Implement power management support.
+ * - Call VideoPortVerifyAccessRanges to reserve the memory we're about
+ *   to map.
  */
 
 /* INCLUDES *******************************************************************/
@@ -47,125 +50,13 @@ DriverEntry(IN PVOID Context1, IN PVOID Context2)
 }
 
 /*
- * InitializeVideoAddressSpace
+ * VBEFindAdapter
  *
- * This function maps the BIOS memory into out virtual address space and
- * setups real-mode interrupt table.
+ * Should detect a VBE compatible display adapter, but it's not possible
+ * to use video port Int 10 services at this time during initialization,
+ * so we always return NO_ERROR and do the real work in VBEInitialize.
  */
 
-BOOL FASTCALL
-InitializeVideoAddressSpace(VOID)
-{
-   NTSTATUS Status;
-   PVOID BaseAddress;
-   PVOID NullAddress;
-   ULONG ViewSize;
-   CHAR IVT[1024];
-   CHAR BDA[256];
-   LARGE_INTEGER Offset;
-   OBJECT_ATTRIBUTES ObjectAttributes;
-   UNICODE_STRING PhysMemName;
-   HANDLE PhysMemHandle;
-
-   /*
-    * Open the physical memory section
-    */
-
-   RtlInitUnicodeString(&PhysMemName, L"\\Device\\PhysicalMemory");
-   InitializeObjectAttributes(&ObjectAttributes, &PhysMemName, 0, NULL, NULL);
-   Status = ZwOpenSection(&PhysMemHandle, SECTION_ALL_ACCESS, &ObjectAttributes);
-   if (!NT_SUCCESS(Status))
-   {
-      DPRINT(("VBEMP: Couldn't open \\Device\\PhysicalMemory\n"));
-      return FALSE;
-   }
-
-   /*
-    * Map the BIOS and device registers into the address space
-    */
-
-   Offset.QuadPart = 0xa0000;
-   ViewSize = 0x30000;
-   BaseAddress = (PVOID)0xa0000;
-   Status = NtMapViewOfSection(PhysMemHandle, NtCurrentProcess(), &BaseAddress,
-      0, 8192, &Offset, &ViewSize, ViewUnmap, 0, PAGE_EXECUTE_READWRITE);
-   if (!NT_SUCCESS(Status))
-   {
-      DPRINT(("VBEMP: Couldn't map physical memory (%x)\n", Status));
-      NtClose(PhysMemHandle);
-      return FALSE;
-   }
-   NtClose(PhysMemHandle);
-   if (BaseAddress != (PVOID)0xa0000)
-   {
-      DPRINT(("VBEMP: Couldn't map physical memory at the right address "
-              "(was %x)\n", BaseAddress));
-      return FALSE;
-   }
-
-   /*
-    * Map some memory to use for the non-BIOS parts of the v86 mode address
-    * space
-    */
-
-   BaseAddress = (PVOID)0x1;
-   ViewSize = 0x20000;
-   Status = ZwAllocateVirtualMemory(NtCurrentProcess(),
-				    &BaseAddress,
-				    0,
-				    &ViewSize,
-				    MEM_COMMIT,
-				    PAGE_EXECUTE_READWRITE);
-   if (!NT_SUCCESS(Status))
-   {
-      DPRINT(("VBEMP: Failed to allocate virtual memory (Status %x)\n", Status));
-      return FALSE;
-   }
-   if (BaseAddress != (PVOID)0x0)
-   {
-      DPRINT(("VBEMP: Failed to allocate virtual memory at right address "
-               "(was %x)\n", BaseAddress));
-      return FALSE;
-   }
-
-   /*
-    * Get the real mode IVT from the kernel
-    */
-
-   Status = NtVdmControl(0, IVT);
-   if (!NT_SUCCESS(Status))
-   {
-      DPRINT(("VBEMP: NtVdmControl failed (status %x)\n", Status));
-      return 0;
-   }
-   
-   /*
-    * Copy the real mode IVT into the right place
-    */
-
-   NullAddress = (PVOID)0x0; /* Workaround for GCC 3.4 */
-   VideoPortMoveMemory(NullAddress, IVT, 1024);
-   
-   /*
-    * Get the BDA from the kernel
-    */
-
-   Status = NtVdmControl(1, BDA);
-   if (!NT_SUCCESS(Status))
-   {
-      DPRINT(("VBEMP: NtVdmControl failed (status %x)\n", Status));
-      return FALSE;
-   }
-   
-   /*
-    * Copy the BDA into the right place
-    */
-
-   VideoPortMoveMemory((PVOID)0x400, BDA, 256);
-
-   return TRUE;
-}
-
 VP_STATUS STDCALL
 VBEFindAdapter(
    IN PVOID HwDeviceExtension,
@@ -174,79 +65,7 @@ VBEFindAdapter(
    IN OUT PVIDEO_PORT_CONFIG_INFO ConfigInfo,
    OUT PUCHAR Again)
 {
-   KV86M_REGISTERS BiosRegisters;
-   DWORD ViewSize;
-   NTSTATUS Status;
-   PVBE_INFO VbeInfo;
-   PVBE_DEVICE_EXTENSION VBEDeviceExtension = 
-     (PVBE_DEVICE_EXTENSION)HwDeviceExtension;
-
-   /*
-    * Map the BIOS parts of memory into our memory space and intitalize
-    * the real mode interrupt table.
-    */
-
-   InitializeVideoAddressSpace();
-
-   /*
-    * Allocate a bit of memory that will be later used for VBE transport
-    * buffer. This memory must be accessible from V86 mode so it must fit
-    * in the first megabyte of physical memory.
-    */
-
-   VBEDeviceExtension->TrampolineMemory = (PVOID)0x20000;
-   ViewSize = 0x400;
-   Status = ZwAllocateVirtualMemory(NtCurrentProcess(),
-      (PVOID*)&VBEDeviceExtension->TrampolineMemory, 0, &ViewSize, MEM_COMMIT,
-      PAGE_EXECUTE_READWRITE);
-   if (!NT_SUCCESS(Status))
-   {
-      DPRINT(("Failed to allocate virtual memory (Status %x)\n", Status));
-      return 0;
-   }
-   if (VBEDeviceExtension->TrampolineMemory > (PVOID)(0x100000 - 0x400))
-   {
-      DPRINT(("Failed to allocate virtual memory at right address "
-              "(was %x)\n", VBEDeviceExtension->TrampolineMemory));
-      return 0;
-   }
-   VBEDeviceExtension->PhysicalAddress.QuadPart = 
-      (UINT_PTR)VBEDeviceExtension->TrampolineMemory;
-
-   /*
-    * Get the VBE general information.
-    */
-   
-   VbeInfo = (PVBE_INFO)VBEDeviceExtension->TrampolineMemory;
-   VideoPortMoveMemory(VbeInfo->Signature, "VBE2", 4);
-   VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters));
-   BiosRegisters.Eax = 0x4F00;
-   BiosRegisters.Edi = VBEDeviceExtension->PhysicalAddress.QuadPart & 0xFF;
-   BiosRegisters.Es = VBEDeviceExtension->PhysicalAddress.QuadPart >> 4;
-   Ke386CallBios(0x10, &BiosRegisters);
-   if (BiosRegisters.Eax == 0x4F)
-   {
-      if (VbeInfo->Version >= 0x200)
-      {
-         DPRINT(("VBE BIOS Present (%d.%d, %8ld Kb)\n",
-            VbeInfo->Version / 0x100, VbeInfo->Version & 0xFF,
-            VbeInfo->TotalMemory * 16));
-
-         return NO_ERROR;
-      }
-      else
-      {
-         DPRINT(("VBE BIOS present, but incompatible version.\n"));
-
-         return ERROR_DEV_NOT_EXIST;
-      }
-   }
-   else
-   {
-      DPRINT(("No VBE BIOS found.\n"));
-
-      return ERROR_DEV_NOT_EXIST;
-   }
+   return NO_ERROR;
 }
 
 /*
@@ -254,60 +73,154 @@ VBEFindAdapter(
  *
  * Performs the first initialization of the adapter, after the HAL has given
  * up control of the video hardware to the video port driver.
+ *
+ * This function performs these steps:
+ * - Gets global VBE information and finds if VBE BIOS is present.
+ * - Builds the internal mode list using the list of modes provided by
+ *   the VBE.
  */
 
 BOOLEAN STDCALL
 VBEInitialize(PVOID HwDeviceExtension)
 {
+   INT10_BIOS_ARGUMENTS BiosRegisters;
+   VP_STATUS Status;
+   PVBE_DEVICE_EXTENSION VBEDeviceExtension = 
+     (PVBE_DEVICE_EXTENSION)HwDeviceExtension;
+   ULONG Length;
+   ULONG ModeCount;
+   ULONG SuitableModeCount;
+   USHORT ModeTemp;
+   ULONG CurrentMode;
+   PVBE_MODEINFO VbeModeInfo;
+   VBE_MODEINFO TempVbeModeInfo;
+   WORD TempVbeModeNumber;
+   WORD DefaultMode;
+
+   /*
+    * Get the Int 10 interface that we will use for allocating real
+    * mode memory and calling the video BIOS.
+    */
+
+   VBEDeviceExtension->Int10Interface.Version = VIDEO_PORT_INT10_INTERFACE_VERSION_1;
+   VBEDeviceExtension->Int10Interface.Size = sizeof(VIDEO_PORT_INT10_INTERFACE);
+   Status = VideoPortQueryServices(
+      HwDeviceExtension,
+      VideoPortServicesInt10,
+      (PINTERFACE)&VBEDeviceExtension->Int10Interface);
+
+   if (Status != NO_ERROR)
+   {
+      DPRINT(("Failed to get Int 10 service functions (Status %x)\n", Status));
+      return 0;
+   }
+   
+   /*
+    * Allocate a bit of memory that will be later used for VBE transport
+    * buffer. This memory must be accessible from V86 mode so it must fit
+    * in the first megabyte of physical memory.
+    */
+
+   Length = 0x400;
+   Status = VBEDeviceExtension->Int10Interface.Int10AllocateBuffer(
+      VBEDeviceExtension->Int10Interface.Context,
+      &VBEDeviceExtension->TrampolineMemorySegment,
+      &VBEDeviceExtension->TrampolineMemoryOffset,
+      &Length);
+
+   if (Status != NO_ERROR)
+   {
+      DPRINT(("Failed to allocate virtual memory (Status %x)\n", Status));
+      return 0;
+   }
+
+   /*
+    * Get the VBE general information.
+    */
+   
+   VBEDeviceExtension->Int10Interface.Int10WriteMemory(
+      VBEDeviceExtension->Int10Interface.Context,
+      VBEDeviceExtension->TrampolineMemorySegment,
+      VBEDeviceExtension->TrampolineMemoryOffset,
+      "VBE2",
+      4);
+
+   VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters));
+   BiosRegisters.Eax = VBE_GET_CONTROLLER_INFORMATION;
+   BiosRegisters.Edi = VBEDeviceExtension->TrampolineMemoryOffset;
+   BiosRegisters.SegEs = VBEDeviceExtension->TrampolineMemorySegment;
+   VBEDeviceExtension->Int10Interface.Int10CallBios(
+      VBEDeviceExtension->Int10Interface.Context,
+      &BiosRegisters);
+   
+   if (BiosRegisters.Eax == VBE_SUCCESS)
+   {
+      VBEDeviceExtension->Int10Interface.Int10ReadMemory(
+         VBEDeviceExtension->Int10Interface.Context,
+         VBEDeviceExtension->TrampolineMemorySegment,
+         VBEDeviceExtension->TrampolineMemoryOffset,
+         &VBEDeviceExtension->VbeInfo,
+         sizeof(VBEDeviceExtension->VbeInfo));
+
+      DPRINT(("VBE BIOS Present (%d.%d, %8ld Kb)\n",
+         VBEDeviceExtension->VbeInfo.Version / 0x100,
+         VBEDeviceExtension->VbeInfo.Version & 0xFF,
+         VBEDeviceExtension->VbeInfo.TotalMemory * 16));
+
+#ifdef VBE12_SUPPORT
+      if (VBEDeviceExtension->VbeInfo.Version < 0x102)
+#else
+      if (VBEDeviceExtension->VbeInfo.Version < 0x200)
+#endif
+      {
+         DPRINT(("VBE BIOS present, but incompatible version.\n"));
+         return ERROR_DEV_NOT_EXIST;
+      }
+   }
+   else
+   {
+      DPRINT(("No VBE BIOS found.\n"));
+      return ERROR_DEV_NOT_EXIST;
+   }
+
+#ifdef VBE12_SUPPORT
+   if (VBEDeviceExtension->VbeInfo.Version < 0x200)
+   {
+      /*
+       * FIXME: Build a mode list here based on the total memory
+       * available on the video card and the video mode tables
+       * from the VBE specification.
+       */
+      return ERROR_NOT_SUPPORTED;
+   }
+#endif
+
    /*
     * Build a mode list here that can be later used by
     * IOCTL_VIDEO_QUERY_NUM_AVAIL_MODES and IOCTL_VIDEO_QUERY_AVAIL_MODES
     * calls.
     */
 
-   ULONG ModeCount;
-   ULONG CurrentMode;
-   KV86M_REGISTERS BiosRegisters;
-   PVBE_DEVICE_EXTENSION VBEDeviceExtension = 
-     (PVBE_DEVICE_EXTENSION)HwDeviceExtension;
-   PVBE_INFO VbeInfo;
-   PVBE_MODEINFO VbeModeInfo;
-   VBE_MODEINFO TempVbeModeInfo;
-   WORD TempVbeModeNumber;
-   WORD *ModeList;
-   WORD DefaultMode;
-
-   InitializeVideoAddressSpace();
-
-   /*
-    * Get the VBE general information.
-    */
-   
-   VbeInfo = (PVBE_INFO)VBEDeviceExtension->TrampolineMemory;
-   VideoPortMoveMemory(VbeInfo->Signature, "VBE2", 4);
-   VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters));
-   BiosRegisters.Eax = 0x4F00;
-   BiosRegisters.Edi = VBEDeviceExtension->PhysicalAddress.QuadPart & 0xFF;
-   BiosRegisters.Es = VBEDeviceExtension->PhysicalAddress.QuadPart >> 4;
-   Ke386CallBios(0x10, &BiosRegisters);
-
-   VBEDeviceExtension->VBEVersion = VbeInfo->Version;
-   VBEDeviceExtension->VGACompatible = !(VbeInfo->Capabilities & 2);
-
    /*
     * Get the number of supported video modes.
+    *
+    * No need to be map the memory. It's either in the video BIOS memory or
+    * in our trampoline memory. In either case the memory is already mapped.
     */
 
-   /*
-    * No need to be mapped, it's either in BIOS memory or in our trampoline
-    * memory. Both of them are already mapped.
-    */
-   ModeList = (WORD *)((HIWORD(VbeInfo->VideoModePtr) << 4) + LOWORD(VbeInfo->VideoModePtr));
-   for (CurrentMode = 0, ModeCount = 0;
-        ModeList[CurrentMode] != 0xFFFF && ModeList[CurrentMode] != 0;
-        CurrentMode++)
+   for (ModeCount = 0; ; ModeCount++)
    {
-      ModeCount++;
+      /* Read the VBE mode number. */
+      VBEDeviceExtension->Int10Interface.Int10ReadMemory(
+         VBEDeviceExtension->Int10Interface.Context,
+         HIWORD(VBEDeviceExtension->VbeInfo.VideoModePtr),
+         LOWORD(VBEDeviceExtension->VbeInfo.VideoModePtr) + (ModeCount << 1),
+         &ModeTemp,
+         sizeof(ModeTemp));
+
+      /* End of list? */
+      if (ModeTemp == 0xFFFF || ModeTemp == 0)
+         break;
    }
 
    /*
@@ -323,35 +236,61 @@ VBEInitialize(PVOID HwDeviceExtension)
     * Get the actual mode infos.
     */
    
-   for (CurrentMode = 0, ModeCount = 0, DefaultMode = 0;
-        ModeList[CurrentMode] != 0xFFFF && ModeList[CurrentMode] != 0;
+   for (CurrentMode = 0, SuitableModeCount = 0, DefaultMode = 0;
+        CurrentMode < ModeCount;
         CurrentMode++)
    {
-      BiosRegisters.Eax = 0x4F01;
-      BiosRegisters.Ecx = ModeList[CurrentMode];
-      BiosRegisters.Edi = (VBEDeviceExtension->PhysicalAddress.QuadPart + 0x200) & 0xF;
-      BiosRegisters.Es = (VBEDeviceExtension->PhysicalAddress.QuadPart + 0x200) >> 4;
-      Ke386CallBios(0x10, &BiosRegisters);
-      VbeModeInfo = (PVBE_MODEINFO)(VBEDeviceExtension->TrampolineMemory + 0x200);
-      if (BiosRegisters.Eax == 0x4F &&
+      /* Read the VBE mode number. */
+      VBEDeviceExtension->Int10Interface.Int10ReadMemory(
+         VBEDeviceExtension->Int10Interface.Context,
+         HIWORD(VBEDeviceExtension->VbeInfo.VideoModePtr),
+         LOWORD(VBEDeviceExtension->VbeInfo.VideoModePtr) + (CurrentMode << 1),
+         &ModeTemp,
+         sizeof(ModeTemp));
+
+      /* Call VBE BIOS to read the mode info. */
+      VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters));
+      BiosRegisters.Eax = VBE_GET_MODE_INFORMATION;
+      BiosRegisters.Ecx = ModeTemp;
+      BiosRegisters.Edi = VBEDeviceExtension->TrampolineMemoryOffset + 0x200;
+      BiosRegisters.SegEs = VBEDeviceExtension->TrampolineMemorySegment;
+      VBEDeviceExtension->Int10Interface.Int10CallBios(
+         VBEDeviceExtension->Int10Interface.Context,
+         &BiosRegisters);
+
+      /* Read the VBE mode info. */
+      VBEDeviceExtension->Int10Interface.Int10ReadMemory(
+         VBEDeviceExtension->Int10Interface.Context,
+         VBEDeviceExtension->TrampolineMemorySegment,
+         VBEDeviceExtension->TrampolineMemoryOffset + 0x200,
+         VBEDeviceExtension->ModeInfo + SuitableModeCount,
+         sizeof(VBE_MODEINFO));
+
+      VbeModeInfo = VBEDeviceExtension->ModeInfo + SuitableModeCount;
+
+      /* Is this mode acceptable? */
+      if (BiosRegisters.Eax == VBE_SUCCESS &&
           VbeModeInfo->XResolution >= 640 &&
           VbeModeInfo->YResolution >= 480 &&
           (VbeModeInfo->ModeAttributes & VBE_MODEATTR_LINEAR))
       {
-         VideoPortMoveMemory(VBEDeviceExtension->ModeInfo + ModeCount, 
-                             VBEDeviceExtension->TrampolineMemory + 0x200,
-                             sizeof(VBE_MODEINFO));
-         VBEDeviceExtension->ModeNumbers[ModeCount] = ModeList[CurrentMode] | 0x4000;
+         VBEDeviceExtension->ModeNumbers[SuitableModeCount] = ModeTemp | 0x4000;
          if (VbeModeInfo->XResolution == 640 &&
              VbeModeInfo->YResolution == 480 &&
              VbeModeInfo->BitsPerPixel == 32)
          {
-            DefaultMode = ModeCount;
+            DefaultMode = SuitableModeCount;
          }
-         ModeCount++;
+         SuitableModeCount++;
       }
    }
 
+   if (SuitableModeCount == 0)
+   {
+      DPRINT(("VBEMP: No video modes supported\n"));
+      return FALSE;
+   }
+   
    /*
     * Exchange the default mode so it's at the first place in list.
     */
@@ -366,13 +305,7 @@ VBEInitialize(PVOID HwDeviceExtension)
    VBEDeviceExtension->ModeNumbers[0] = VBEDeviceExtension->ModeNumbers[DefaultMode];
    VBEDeviceExtension->ModeNumbers[DefaultMode] = TempVbeModeNumber;
 
-   if (ModeCount == 0)
-   {
-      DPRINT(("VBEMP: No video modes supported\n"));
-      return FALSE;
-   }
-   
-   VBEDeviceExtension->ModeCount = ModeCount;
+   VBEDeviceExtension->ModeCount = SuitableModeCount;
 
    /*
     * Print the supported video modes when DBG is set.
@@ -380,7 +313,7 @@ VBEInitialize(PVOID HwDeviceExtension)
 
 #ifdef DBG
    for (CurrentMode = 0;
-        CurrentMode < ModeCount;
+        CurrentMode < SuitableModeCount;
         CurrentMode++)
    {
       DPRINT(("%dx%dx%d\n",
@@ -443,8 +376,14 @@ VBEStartIO(
          break;
 
       case IOCTL_VIDEO_UNMAP_VIDEO_MEMORY:
+         if (RequestPacket->InputBufferLength < sizeof(VIDEO_MEMORY)) 
+         {
+            RequestPacket->StatusBlock->Status = ERROR_INSUFFICIENT_BUFFER;
+            return TRUE;
+         }
          Result = VBEUnmapVideoMemory(
             (PVBE_DEVICE_EXTENSION)HwDeviceExtension,
+            (PVIDEO_MEMORY)RequestPacket->InputBuffer,
             RequestPacket->StatusBlock);
          break;
 
@@ -538,7 +477,62 @@ VBEGetPowerState(
    ULONG HwId,
    PVIDEO_POWER_MANAGEMENT VideoPowerControl)
 {
-   return ERROR_INVALID_FUNCTION;
+   INT10_BIOS_ARGUMENTS BiosRegisters;
+   PVBE_DEVICE_EXTENSION VBEDeviceExtension = 
+     (PVBE_DEVICE_EXTENSION)HwDeviceExtension;
+
+   if (HwId != DISPLAY_ADAPTER_HW_ID ||
+       VideoPowerControl->Length < sizeof(VIDEO_POWER_MANAGEMENT))
+      return ERROR_INVALID_FUNCTION;
+
+   /*
+    * Get general power support information.
+    */
+
+   VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters));
+   BiosRegisters.Eax = VBE_POWER_MANAGEMENT_EXTENSIONS;
+   BiosRegisters.Ebx = 0;  
+   BiosRegisters.Edi = 0;
+   BiosRegisters.SegEs = 0;
+   VBEDeviceExtension->Int10Interface.Int10CallBios(
+      VBEDeviceExtension->Int10Interface.Context,
+      &BiosRegisters);
+
+   if (BiosRegisters.Eax == VBE_NOT_SUPPORTED)
+      return ERROR_NOT_SUPPORTED;   
+   if (BiosRegisters.Eax != VBE_SUCCESS)
+      return ERROR_INVALID_FUNCTION;   
+   
+   /*
+    * Get current power state.
+    */
+
+   VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters));
+   BiosRegisters.Eax = VBE_POWER_MANAGEMENT_EXTENSIONS;
+   BiosRegisters.Ebx = 0x2;
+   BiosRegisters.Edi = 0;
+   BiosRegisters.SegEs = 0;
+   VBEDeviceExtension->Int10Interface.Int10CallBios(
+      VBEDeviceExtension->Int10Interface.Context,
+      &BiosRegisters);
+
+   if (BiosRegisters.Eax == VBE_SUCCESS)
+   {
+      VideoPowerControl->DPMSVersion = BiosRegisters.Ebx & 0xFF;
+      switch (BiosRegisters.Ebx >> 8)
+      {
+         case 0: VideoPowerControl->PowerState = VideoPowerOn; break;
+         case 1: VideoPowerControl->PowerState = VideoPowerStandBy; break;
+         case 2: VideoPowerControl->PowerState = VideoPowerSuspend; break;
+         case 4: VideoPowerControl->PowerState = VideoPowerOff; break;
+         case 5: VideoPowerControl->PowerState = VideoPowerOn; break;
+         default: VideoPowerControl->PowerState = VideoPowerUnspecified;
+      }
+
+      return NO_ERROR;
+   }
+
+   return ERROR_NOT_SUPPORTED;
 }
 
 /*
@@ -553,7 +547,45 @@ VBESetPowerState(
    ULONG HwId,
    PVIDEO_POWER_MANAGEMENT VideoPowerControl)
 {
-   return ERROR_INVALID_FUNCTION;
+   INT10_BIOS_ARGUMENTS BiosRegisters;
+   PVBE_DEVICE_EXTENSION VBEDeviceExtension = 
+     (PVBE_DEVICE_EXTENSION)HwDeviceExtension;
+
+   if (HwId != DISPLAY_ADAPTER_HW_ID ||
+       VideoPowerControl->Length < sizeof(VIDEO_POWER_MANAGEMENT) ||
+       VideoPowerControl->PowerState < VideoPowerOn ||
+       VideoPowerControl->PowerState > VideoPowerHibernate)
+      return ERROR_INVALID_FUNCTION;
+
+   if (VideoPowerControl->PowerState == VideoPowerHibernate)
+      return NO_ERROR;
+
+   /*
+    * Set current power state.
+    */
+
+   VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters));
+   BiosRegisters.Eax = VBE_POWER_MANAGEMENT_EXTENSIONS;
+   BiosRegisters.Ebx = 1;
+   BiosRegisters.Edi = 0;
+   BiosRegisters.SegEs = 0;
+   switch (VideoPowerControl->PowerState)
+   {
+      case VideoPowerStandBy: BiosRegisters.Ebx |= 0x100; break;
+      case VideoPowerSuspend: BiosRegisters.Ebx |= 0x200; break;
+      case VideoPowerOff: BiosRegisters.Ebx |= 0x400; break;
+   }
+
+   VBEDeviceExtension->Int10Interface.Int10CallBios(
+      VBEDeviceExtension->Int10Interface.Context,
+      &BiosRegisters);
+
+   if (BiosRegisters.Eax == VBE_NOT_SUPPORTED)
+      return ERROR_NOT_SUPPORTED;   
+   if (BiosRegisters.Eax != VBE_SUCCESS)
+      return ERROR_INVALID_FUNCTION;   
+
+   return VBE_SUCCESS;
 }
 
 /*
@@ -568,13 +600,21 @@ VBESetCurrentMode(
    PVIDEO_MODE RequestedMode,
    PSTATUS_BLOCK StatusBlock)
 {
-   KV86M_REGISTERS BiosRegisters;
+   INT10_BIOS_ARGUMENTS BiosRegisters;
+
+   if (RequestedMode->RequestedMode >= DeviceExtension->ModeCount)
+   {
+      return ERROR_INVALID_PARAMETER;
+   }
 
    VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters));
-   BiosRegisters.Eax = 0x4F02;
+   BiosRegisters.Eax = VBE_SET_VBE_MODE;
    BiosRegisters.Ebx = DeviceExtension->ModeNumbers[RequestedMode->RequestedMode];
-   Ke386CallBios(0x10, &BiosRegisters);
-   if (BiosRegisters.Eax == 0x4F)
+   DeviceExtension->Int10Interface.Int10CallBios(
+      DeviceExtension->Int10Interface.Context,
+      &BiosRegisters);
+
+   if (BiosRegisters.Eax == VBE_SUCCESS)
    {
       DeviceExtension->CurrentMode = RequestedMode->RequestedMode;
    }
@@ -583,7 +623,8 @@ VBESetCurrentMode(
       DPRINT(("VBEMP: VBESetCurrentMode failed (%x)\n", BiosRegisters.Eax));
       DeviceExtension->CurrentMode = -1;
    }
-   return (BiosRegisters.Eax == 0x4F);
+
+   return BiosRegisters.Eax == VBE_SUCCESS;
 }
 
 /*
@@ -598,14 +639,16 @@ VBEResetDevice(
    PVBE_DEVICE_EXTENSION DeviceExtension,
    PSTATUS_BLOCK StatusBlock)
 {
-   KV86M_REGISTERS BiosRegisters;
+   INT10_BIOS_ARGUMENTS BiosRegisters;
 
-   InitializeVideoAddressSpace();
    VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters));
-   BiosRegisters.Eax = 0x4F02;
+   BiosRegisters.Eax = VBE_SET_VBE_MODE;
    BiosRegisters.Ebx = 0x3;
-   Ke386CallBios(0x10, &BiosRegisters);
-   return TRUE;
+   DeviceExtension->Int10Interface.Int10CallBios(
+      DeviceExtension->Int10Interface.Context,
+      &BiosRegisters);
+
+   return BiosRegisters.Eax == VBE_SUCCESS;
 }
 
 /*
@@ -623,16 +666,28 @@ VBEMapVideoMemory(
    PSTATUS_BLOCK StatusBlock)
 {
    PHYSICAL_ADDRESS FrameBuffer;
-   ULONG inIoSpace = 0;
+   ULONG inIoSpace = VIDEO_MEMORY_SPACE_MEMORY;
 
    StatusBlock->Information = sizeof(VIDEO_MEMORY_INFORMATION);
 
-   FrameBuffer.QuadPart =
-      DeviceExtension->ModeInfo[DeviceExtension->CurrentMode].PhysBasePtr;
-   MapInformation->VideoRamBase = RequestedAddress->RequestedVirtualAddress;
-   MapInformation->VideoRamLength = 
-      DeviceExtension->ModeInfo[DeviceExtension->CurrentMode].BytesPerScanLine *
-      DeviceExtension->ModeInfo[DeviceExtension->CurrentMode].YResolution;
+   if (DeviceExtension->ModeInfo[DeviceExtension->CurrentMode].ModeAttributes &
+       VBE_MODEATTR_LINEAR)
+   {    
+      FrameBuffer.QuadPart =
+         DeviceExtension->ModeInfo[DeviceExtension->CurrentMode].PhysBasePtr;
+      MapInformation->VideoRamBase = RequestedAddress->RequestedVirtualAddress;
+      MapInformation->VideoRamLength = 
+         DeviceExtension->ModeInfo[DeviceExtension->CurrentMode].BytesPerScanLine *
+         DeviceExtension->ModeInfo[DeviceExtension->CurrentMode].YResolution;
+   }
+#ifdef VBE12_SUPPORT
+   else
+   {
+      FrameBuffer.QuadPart = 0xA0000;    
+      MapInformation->VideoRamBase = RequestedAddress->RequestedVirtualAddress;
+      MapInformation->VideoRamLength = 0x10000;
+   }
+#endif
 
    VideoPortMapMemory(DeviceExtension, FrameBuffer,
       &MapInformation->VideoRamLength, &inIoSpace,
@@ -641,8 +696,6 @@ VBEMapVideoMemory(
    MapInformation->FrameBufferBase = MapInformation->VideoRamBase;
    MapInformation->FrameBufferLength = MapInformation->VideoRamLength;
 
-   DeviceExtension->FrameBufferMemory = MapInformation->VideoRamBase;
-
    return TRUE;
 }
 
@@ -656,9 +709,10 @@ VBEMapVideoMemory(
 BOOL FASTCALL
 VBEUnmapVideoMemory(
    PVBE_DEVICE_EXTENSION DeviceExtension,
+   PVIDEO_MEMORY VideoMemory,
    PSTATUS_BLOCK StatusBlock)
 {
-   VideoPortUnmapMemory(DeviceExtension, DeviceExtension->FrameBufferMemory,
+   VideoPortUnmapMemory(DeviceExtension, VideoMemory->RequestedVirtualAddress,
       NULL);
    return TRUE;
 }   
@@ -709,7 +763,7 @@ VBEQueryMode(
    VideoMode->YMillimeter = 0; /* FIXME */
    if (VBEMode->BitsPerPixel > 8)
    {
-      if (DeviceExtension->VBEVersion < 0x300)
+      if (DeviceExtension->VbeInfo.Version < 0x300)
       {
          VideoMode->NumberRedBits = VBEMode->RedMaskSize;
          VideoMode->NumberGreenBits = VBEMode->GreenMaskSize;
@@ -813,14 +867,19 @@ VBESetColorRegisters(
    PVIDEO_CLUT ColorLookUpTable,
    PSTATUS_BLOCK StatusBlock)
 {
-   KV86M_REGISTERS BiosRegisters;
+   INT10_BIOS_ARGUMENTS BiosRegisters;
    ULONG Entry;
    PULONG OutputEntry;
+   ULONG OutputBuffer[256];
 
    if (ColorLookUpTable->NumEntries + ColorLookUpTable->FirstEntry > 256)
       return FALSE;
 
-   if (DeviceExtension->VGACompatible)
+   /*
+    * For VGA compatible adapters program the color registers directly.
+    */
+
+   if (!(DeviceExtension->VbeInfo.Capabilities & 2))
    {
       for (Entry = ColorLookUpTable->FirstEntry;
            Entry < ColorLookUpTable->NumEntries + ColorLookUpTable->FirstEntry;
@@ -831,6 +890,7 @@ VBESetColorRegisters(
          VideoPortWritePortUchar((PUCHAR)0x03c9, ColorLookUpTable->LookupTable[Entry].RgbArray.Green);
          VideoPortWritePortUchar((PUCHAR)0x03c9, ColorLookUpTable->LookupTable[Entry].RgbArray.Blue);
       }
+
       return TRUE;
    }
    else
@@ -841,7 +901,7 @@ VBESetColorRegisters(
        */
 
       for (Entry = ColorLookUpTable->FirstEntry,
-           OutputEntry = DeviceExtension->TrampolineMemory;
+           OutputEntry = OutputBuffer;
            Entry < ColorLookUpTable->NumEntries + ColorLookUpTable->FirstEntry;
            Entry++, OutputEntry++)
       {
@@ -851,13 +911,24 @@ VBESetColorRegisters(
             (ColorLookUpTable->LookupTable[Entry].RgbArray.Blue);
       }
 
-      BiosRegisters.Eax = 0x4F09;
+      DeviceExtension->Int10Interface.Int10WriteMemory(
+         DeviceExtension->Int10Interface.Context,
+         DeviceExtension->TrampolineMemorySegment,
+         DeviceExtension->TrampolineMemoryOffset,
+         OutputBuffer,
+         (OutputEntry - OutputBuffer) * sizeof(ULONG));
+
+      VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters));
+      BiosRegisters.Eax = VBE_SET_GET_PALETTE_DATA;
       BiosRegisters.Ebx = 0;
       BiosRegisters.Ecx = ColorLookUpTable->NumEntries;
       BiosRegisters.Edx = ColorLookUpTable->FirstEntry;
-      BiosRegisters.Edi = DeviceExtension->PhysicalAddress.QuadPart & 0xF;
-      BiosRegisters.Es = DeviceExtension->PhysicalAddress.QuadPart >> 4;
-      Ke386CallBios(0x10, &BiosRegisters);
-      return (BiosRegisters.Eax == 0x4F);
+      BiosRegisters.Edi = DeviceExtension->TrampolineMemoryOffset;
+      BiosRegisters.SegEs = DeviceExtension->TrampolineMemorySegment;
+      DeviceExtension->Int10Interface.Int10CallBios(
+         DeviceExtension->Int10Interface.Context,
+         &BiosRegisters);
+
+      return BiosRegisters.Eax == VBE_SUCCESS;
    }
 }
diff --git a/reactos/drivers/video/miniport/vbe/vbemp.h b/reactos/drivers/video/miniport/vbe/vbemp.h
index 58ceed90aa4..cae4716e10f 100644
--- a/reactos/drivers/video/miniport/vbe/vbemp.h
+++ b/reactos/drivers/video/miniport/vbe/vbemp.h
@@ -31,26 +31,67 @@
 #include <ddk/ntddvdeo.h>
 #include <ddk/ntapi.h>
 
-/* For Ke386CallBios */
-#include "internal/v86m.h"
-
-/* FIXME: Missing define in w32api! */
-#ifndef NtCurrentProcess
-#define NtCurrentProcess() ((HANDLE)(LONG_PTR)-1)
-#endif
-
 #ifdef DBG
 #define DPRINT(arg) DbgPrint arg;
 #else
 #define DPRINT(arg)
 #endif
 
+/*
+ * Compile-time define to get VBE 1.2 support. The implementation
+ * is far from complete now and so it's left undefined.
+ */
+
+/* #define VBE12_SUPPORT */
+
 #include <pshpack1.h>
 
 /*
- * VBE specification defined structure for general adapter info
- * returned by function 0x4F00.
+ * VBE Command Definitions
  */
+
+#define VBE_GET_CONTROLLER_INFORMATION       0x4F00
+#define VBE_GET_MODE_INFORMATION             0x4F01
+#define VBE_SET_VBE_MODE                     0x4F02
+#define VBE_GET_CURRENT_VBE_MODE             0x4F03
+#define VBE_SAVE_RESTORE_STATE               0x4F04
+#define VBE_DISPLAY_WINDOW_CONTROL           0x4F05
+#define VBE_SET_GET_LOGICAL_SCAN_LINE_LENGTH 0x4F06
+#define VBE_SET_GET_DISPLAY_START            0x4F07 
+#define VBE_SET_GET_DAC_PALETTE_FORMAT       0x4F08
+#define VBE_SET_GET_PALETTE_DATA             0x4F09
+
+/* VBE 2.0+ */
+#define VBE_RETURN_PROTECTED_MODE_INTERFACE  0x4F0A 
+#define VBE_GET_SET_PIXEL_CLOCK              0x4F0B
+
+/* Extensions */
+#define VBE_POWER_MANAGEMENT_EXTENSIONS      0x4F10
+#define VBE_FLAT_PANEL_INTERFACE_EXTENSIONS  0x4F11
+#define VBE_AUDIO_INTERFACE_EXTENSIONS       0x4F12 
+#define VBE_OEM_EXTENSIONS                   0x4F13
+#define VBE_DISPLAY_DATA_CHANNEL             0x4F14
+
+/*
+ * VBE Video Mode Information Attributes
+ */
+
+#define VBE_MODEATTR_LINEAR                    0x80
+
+/*
+ * VBE Return Codes
+ */
+
+#define VBE_SUCCESS                            0x4F 
+#define VBE_UNSUCCESSFUL                      0x14F
+#define VBE_NOT_SUPPORTED                     0x24F
+#define VBE_FUNCTION_INVALID                  0x34F
+
+/*
+ * VBE specification defined structure for general adapter info
+ * returned by function VBE_GET_CONTROLLER_INFORMATION command.
+ */
+
 typedef struct
 {
    CHAR Signature[4];
@@ -69,9 +110,11 @@ typedef struct
 
 /*
  * VBE specification defined structure for specific video mode
- * info returned by function 0x4F01.
+ * info returned by function VBE_GET_MODE_INFORMATION command.
  */
-typedef struct {
+
+typedef struct
+{
    /* Mandatory information for all VBE revisions */
    WORD ModeAttributes;
    BYTE WinAAttributes;
@@ -129,21 +172,19 @@ typedef struct {
    CHAR Reserved4[189];
 } VBE_MODEINFO, *PVBE_MODEINFO;
 
-#define VBE_MODEATTR_LINEAR 0x80
-
 #include <poppack.h>
 
-typedef struct {
-   /* Trampoline memory for communication with VBE real-mode interface. */
-   PHYSICAL_ADDRESS PhysicalAddress;
-   PVOID TrampolineMemory;
+typedef struct
+{
+   /* Interface to Int10 calls */
+   VIDEO_PORT_INT10_INTERFACE Int10Interface;
 
-   /* Pointer to mapped frame buffer memory */
-   PVOID FrameBufferMemory;
+   /* Trampoline memory for communication with VBE real-mode interface */
+   USHORT TrampolineMemorySegment;
+   USHORT TrampolineMemoryOffset;
 
    /* General controller/BIOS information */
-   BOOL VGACompatible;
-   WORD VBEVersion;
+   VBE_INFO VbeInfo;
 
    /* Saved information about video modes */
    ULONG ModeCount;
@@ -207,6 +248,7 @@ VBEMapVideoMemory(
 BOOL FASTCALL
 VBEUnmapVideoMemory(
    PVBE_DEVICE_EXTENSION DeviceExtension,
+   PVIDEO_MEMORY VideoMemory,
    PSTATUS_BLOCK StatusBlock);
 
 BOOL FASTCALL

From 8d2f5591896075efb6694906dd6de554b1dd6d86 Mon Sep 17 00:00:00 2001
From: Royce Mitchell III <royce3@ev1.net>
Date: Sun, 27 Jun 2004 04:08:57 +0000
Subject: [PATCH 103/356] fix end-of-lines

svn path=/trunk/; revision=9897
---
 reactos/ntoskrnl/rtl/i386/except.s | 582 ++++++++++++++---------------
 1 file changed, 291 insertions(+), 291 deletions(-)

diff --git a/reactos/ntoskrnl/rtl/i386/except.s b/reactos/ntoskrnl/rtl/i386/except.s
index 156da64b626..1b613708cbf 100755
--- a/reactos/ntoskrnl/rtl/i386/except.s
+++ b/reactos/ntoskrnl/rtl/i386/except.s
@@ -1,291 +1,291 @@
-/* $Id: except.s,v 1.4 2004/06/25 16:39:41 weiden Exp $
- *
- * COPYRIGHT:         See COPYING in the top level directory
- * PROJECT:           ReactOS kernel
- * PURPOSE:           Kernel-mode exception support for IA-32
- * FILE:              ntoskrnl/rtl/i386/except.s
- * PROGRAMER:         Casper S. Hornstrup (chorns@users.sourceforge.net)
- * NOTES:             This file is shared with lib/ntdll/rtl/i386/except.s.
- *                    Please keep them in sync.
- */
-
-#define EXCEPTION_UNWINDING		0x02
-
-#define EREC_FLAGS				0x04
-
-#define ExceptionContinueExecution 0
-#define ExceptionContinueSearch    1
-#define ExceptionNestedException   2
-#define ExceptionCollidedUnwind    3
-
-.globl _RtlpExecuteHandlerForException
-.globl _RtlpExecuteHandlerForUnwind
-
-#define CONTEXT_FLAGS	0x00
-#define CONTEXT_SEGGS	0x8C
-#define CONTEXT_SEGFS	0x90
-#define CONTEXT_SEGES	0x94
-#define CONTEXT_SEGDS	0x98
-#define CONTEXT_EDI		0x9C
-#define CONTEXT_ESI		0xA0
-#define CONTEXT_EBX		0xA4
-#define CONTEXT_EDX		0xA8
-#define CONTEXT_ECX		0xAC
-#define CONTEXT_EAX		0xB0
-#define CONTEXT_EBP		0xB4
-#define CONTEXT_EIP		0xB8
-#define CONTEXT_SEGCS	0xBC
-#define CONTEXT_EFLAGS	0xC0
-#define CONTEXT_ESP		0xC4
-#define CONTEXT_SEGSS	0xC8
-
-
-#define RCC_CONTEXT		0x08
-
-// EAX = value to print
-_do_debug:
-	pushal
-	pushl	%eax
-	call	_AsmDebug@4
-	popal
-	ret
-
-#ifndef __NTOSKRNL__
-
-//
-// VOID
-// RtlpCaptureContext(PCONTEXT pContext);
-//
-// Parameters:
-//   [ESP+08h] - PCONTEXT_X86 pContext
-// Registers:
-//   None
-// Returns:
-//   Nothing
-// Notes:
-//   Grabs the current CPU context.
-.globl _RtlpCaptureContext
-_RtlpCaptureContext:
-	pushl   %ebp
-    movl	%esp, %ebp
-	movl	RCC_CONTEXT(%ebp), %edx		// EDX = Address of context structure
-
-	cld
-	pushf
-	pop		%eax
-	movl	%eax, CONTEXT_EFLAGS(%edx)
-	xorl	%eax, %eax
-	movl	%eax, CONTEXT_EAX(%edx)
-	movl	%eax, CONTEXT_EBX(%edx)
-	movl	%eax, CONTEXT_ECX(%edx)
-	movl	%eax, CONTEXT_EDX(%edx)
-	movl	%eax, CONTEXT_ESI(%edx)
-	movl	%eax, CONTEXT_EDI(%edx)
-	movl	%cs, %eax
-	movl	%eax, CONTEXT_SEGCS(%edx)
-	movl	%ds, %eax
-	movl	%eax, CONTEXT_SEGDS(%edx)
-	movl	%es, %eax
-	movl	%eax, CONTEXT_SEGES(%edx)
-	movl	%fs, %eax
-	movl	%eax, CONTEXT_SEGFS(%edx)
-	movl	%gs, %eax
-	movl	%eax, CONTEXT_SEGGS(%edx)
-	movl	%ss, %eax
-	movl	%eax, CONTEXT_SEGSS(%edx)
-
-	//
-	// STACK LAYOUT: - (ESP to put in context structure)
-	//               - RETURN ADDRESS OF CALLER OF CALLER
-	//               - EBP OF CALLER OF CALLER
-	//                 ...
-	//               - RETURN ADDRESS OF CALLER
-	//               - EBP OF CALLER
-	//                 ...
-	//
-
-	// Get return address of the caller of the caller of this function
-	movl	%ebp, %ebx
-	//movl	4(%ebx), %eax			// EAX = return address of caller
-	movl	(%ebx), %ebx			// EBX = EBP of caller
-
-	movl	4(%ebx), %eax			// EAX = return address of caller of caller
-	movl	(%ebx), %ebx			// EBX = EBP of caller of caller
-
-	movl	%eax, CONTEXT_EIP(%edx)	// EIP = return address of caller of caller
-	movl	%ebx, CONTEXT_EBP(%edx)	// EBP = EBP of caller of caller
-	addl	$8, %ebx
-	movl	%ebx, CONTEXT_ESP(%edx)	// ESP = EBP of caller of caller + 8
-
-    movl	%ebp, %esp
-    popl	%ebp
-    ret
-
-#endif /* !__NTOSKRNL__ */
-
-#define REH_ERECORD		0x08
-#define REH_RFRAME		0x0C
-#define REH_CONTEXT		0x10
-#define REH_DCONTEXT	0x14
-#define REH_EROUTINE	0x18
-
-// Parameters:
-//   None
-// Registers:
-//   [EBP+08h] - PEXCEPTION_RECORD ExceptionRecord
-//   [EBP+0Ch] - PEXCEPTION_REGISTRATION RegistrationFrame
-//   [EBP+10h] - PVOID Context
-//   [EBP+14h] - PVOID DispatcherContext
-//   [EBP+18h] - PEXCEPTION_HANDLER ExceptionRoutine
-//   EDX       - Address of protecting exception handler
-// Returns:
-//   EXCEPTION_DISPOSITION
-// Notes:
-//   Setup the protecting exception handler and call the exception
-//   handler in the right context.
-_RtlpExecuteHandler:
-	pushl    %ebp
-    movl     %esp, %ebp
-    pushl    REH_RFRAME(%ebp)
-
-    pushl    %edx
-    pushl    %fs:0x0
-    movl     %esp, %fs:0x0
-
-    // Prepare to call the exception handler
-    pushl    REH_DCONTEXT(%ebp)
-    pushl    REH_CONTEXT(%ebp)
-    pushl    REH_RFRAME(%ebp)
-    pushl    REH_ERECORD(%ebp)
-
-    // Now call the exception handler
-    movl     REH_EROUTINE(%ebp), %eax
-    call    *%eax
-
-	cmpl	$-1, %fs:0x0
-	jne		.reh_stack_looks_ok
-
-	// This should not happen
-	pushl	0
-	pushl	0
-	pushl	0
-	pushl	0
-	call	_RtlAssert@16
-
-.reh_loop:
-	jmp	.reh_loop
-	
-.reh_stack_looks_ok:
-    movl     %fs:0x0, %esp
-
-    // Return to the 'front-end' for this function
-    popl     %fs:0x0
-    movl     %ebp, %esp
-    popl     %ebp
-    ret
-
-
-#define REP_ERECORD     0x04
-#define REP_RFRAME      0x08
-#define REP_CONTEXT     0x0C
-#define REP_DCONTEXT    0x10
-
-// Parameters:
-//   [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord
-//   [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame
-//   [ESP+0Ch] - PCONTEXT Context
-//   [ESP+10h] - PVOID DispatcherContext
-// Registers:
-//   None
-// Returns:
-//   EXCEPTION_DISPOSITION
-// Notes:
-//    This exception handler protects the exception handling
-//    mechanism by detecting nested exceptions.
-_RtlpExceptionProtector:
-    movl     $ExceptionContinueSearch, %eax
-    movl     REP_ERECORD(%esp), %ecx
-    testl    $EXCEPTION_UNWINDING, EREC_FLAGS(%ecx)
-    jnz      .rep_end
-
-    // Unwinding is not taking place, so return ExceptionNestedException
-
-    // Set DispatcherContext field to the exception registration for the
-    // exception handler that executed when a nested exception occurred
-    movl     REP_DCONTEXT(%esp), %ecx
-    movl     REP_RFRAME(%esp), %eax
-    movl     %eax, (%ecx)
-    movl     $ExceptionNestedException, %eax
-
-.rep_end:
-    ret
-
-
-// Parameters:
-//   [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord
-//   [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame
-//   [ESP+0Ch] - PCONTEXT Context
-//   [ESP+10h] - PVOID DispatcherContext
-//   [ESP+14h] - PEXCEPTION_HANDLER ExceptionHandler
-// Registers:
-//   None
-// Returns:
-//   EXCEPTION_DISPOSITION
-// Notes:
-//   Front-end
-_RtlpExecuteHandlerForException:
-    movl     $_RtlpExceptionProtector, %edx
-    jmp      _RtlpExecuteHandler
-
-
-#define RUP_ERECORD     0x04
-#define RUP_RFRAME      0x08
-#define RUP_CONTEXT     0x0C
-#define RUP_DCONTEXT    0x10
-
-// Parameters:
-//   [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord
-//   [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame
-//   [ESP+0Ch] - PCONTEXT Context
-//   [ESP+10h] - PVOID DispatcherContext
-// Registers:
-//   None
-// Returns:
-//   EXCEPTION_DISPOSITION
-// Notes:
-//    This exception handler protects the exception handling
-//    mechanism by detecting collided unwinds.
-_RtlpUnwindProtector:
-    movl     $ExceptionContinueSearch, %eax
-    movl     %ecx, RUP_ERECORD(%esp)
-    testl    $EXCEPTION_UNWINDING, EREC_FLAGS(%ecx)
-    jz       .rup_end
-
-    // Unwinding is taking place, so return ExceptionCollidedUnwind
-
-    movl     RUP_RFRAME(%esp), %ecx
-    movl     RUP_DCONTEXT(%esp), %edx
-
-    // Set DispatcherContext field to the exception registration for the
-    // exception handler that executed when a collision occurred
-    movl     RUP_RFRAME(%ecx), %eax
-    movl     %eax, (%edx)
-    movl     $ExceptionCollidedUnwind, %eax
-
-.rup_end:
-    ret
-
-
-// Parameters:
-//   [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord
-//   [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame
-//   [ESP+0Ch] - PCONTEXT Context
-//   [ESP+10h] - PVOID DispatcherContext
-//   [ESP+14h] - PEXCEPTION_HANDLER ExceptionHandler
-// Registers:
-//   None
-// Returns:
-//   EXCEPTION_DISPOSITION
-_RtlpExecuteHandlerForUnwind:
-    movl     $_RtlpUnwindProtector, %edx
-    jmp      _RtlpExecuteHandler
+/* $Id: except.s,v 1.5 2004/06/27 04:08:57 royce Exp $
+ *
+ * COPYRIGHT:         See COPYING in the top level directory
+ * PROJECT:           ReactOS kernel
+ * PURPOSE:           Kernel-mode exception support for IA-32
+ * FILE:              ntoskrnl/rtl/i386/except.s
+ * PROGRAMER:         Casper S. Hornstrup (chorns@users.sourceforge.net)
+ * NOTES:             This file is shared with lib/ntdll/rtl/i386/except.s.
+ *                    Please keep them in sync.
+ */
+
+#define EXCEPTION_UNWINDING		0x02
+
+#define EREC_FLAGS				0x04
+
+#define ExceptionContinueExecution 0
+#define ExceptionContinueSearch    1
+#define ExceptionNestedException   2
+#define ExceptionCollidedUnwind    3
+
+.globl _RtlpExecuteHandlerForException
+.globl _RtlpExecuteHandlerForUnwind
+
+#define CONTEXT_FLAGS	0x00
+#define CONTEXT_SEGGS	0x8C
+#define CONTEXT_SEGFS	0x90
+#define CONTEXT_SEGES	0x94
+#define CONTEXT_SEGDS	0x98
+#define CONTEXT_EDI		0x9C
+#define CONTEXT_ESI		0xA0
+#define CONTEXT_EBX		0xA4
+#define CONTEXT_EDX		0xA8
+#define CONTEXT_ECX		0xAC
+#define CONTEXT_EAX		0xB0
+#define CONTEXT_EBP		0xB4
+#define CONTEXT_EIP		0xB8
+#define CONTEXT_SEGCS	0xBC
+#define CONTEXT_EFLAGS	0xC0
+#define CONTEXT_ESP		0xC4
+#define CONTEXT_SEGSS	0xC8
+
+
+#define RCC_CONTEXT		0x08
+
+// EAX = value to print
+_do_debug:
+	pushal
+	pushl	%eax
+	call	_AsmDebug@4
+	popal
+	ret
+
+#ifndef __NTOSKRNL__
+
+//
+// VOID
+// RtlpCaptureContext(PCONTEXT pContext);
+//
+// Parameters:
+//   [ESP+08h] - PCONTEXT_X86 pContext
+// Registers:
+//   None
+// Returns:
+//   Nothing
+// Notes:
+//   Grabs the current CPU context.
+.globl _RtlpCaptureContext
+_RtlpCaptureContext:
+	pushl   %ebp
+    movl	%esp, %ebp
+	movl	RCC_CONTEXT(%ebp), %edx		// EDX = Address of context structure
+
+	cld
+	pushf
+	pop		%eax
+	movl	%eax, CONTEXT_EFLAGS(%edx)
+	xorl	%eax, %eax
+	movl	%eax, CONTEXT_EAX(%edx)
+	movl	%eax, CONTEXT_EBX(%edx)
+	movl	%eax, CONTEXT_ECX(%edx)
+	movl	%eax, CONTEXT_EDX(%edx)
+	movl	%eax, CONTEXT_ESI(%edx)
+	movl	%eax, CONTEXT_EDI(%edx)
+	movl	%cs, %eax
+	movl	%eax, CONTEXT_SEGCS(%edx)
+	movl	%ds, %eax
+	movl	%eax, CONTEXT_SEGDS(%edx)
+	movl	%es, %eax
+	movl	%eax, CONTEXT_SEGES(%edx)
+	movl	%fs, %eax
+	movl	%eax, CONTEXT_SEGFS(%edx)
+	movl	%gs, %eax
+	movl	%eax, CONTEXT_SEGGS(%edx)
+	movl	%ss, %eax
+	movl	%eax, CONTEXT_SEGSS(%edx)
+
+	//
+	// STACK LAYOUT: - (ESP to put in context structure)
+	//               - RETURN ADDRESS OF CALLER OF CALLER
+	//               - EBP OF CALLER OF CALLER
+	//                 ...
+	//               - RETURN ADDRESS OF CALLER
+	//               - EBP OF CALLER
+	//                 ...
+	//
+
+	// Get return address of the caller of the caller of this function
+	movl	%ebp, %ebx
+	//movl	4(%ebx), %eax			// EAX = return address of caller
+	movl	(%ebx), %ebx			// EBX = EBP of caller
+
+	movl	4(%ebx), %eax			// EAX = return address of caller of caller
+	movl	(%ebx), %ebx			// EBX = EBP of caller of caller
+
+	movl	%eax, CONTEXT_EIP(%edx)	// EIP = return address of caller of caller
+	movl	%ebx, CONTEXT_EBP(%edx)	// EBP = EBP of caller of caller
+	addl	$8, %ebx
+	movl	%ebx, CONTEXT_ESP(%edx)	// ESP = EBP of caller of caller + 8
+
+    movl	%ebp, %esp
+    popl	%ebp
+    ret
+
+#endif /* !__NTOSKRNL__ */
+
+#define REH_ERECORD		0x08
+#define REH_RFRAME		0x0C
+#define REH_CONTEXT		0x10
+#define REH_DCONTEXT	0x14
+#define REH_EROUTINE	0x18
+
+// Parameters:
+//   None
+// Registers:
+//   [EBP+08h] - PEXCEPTION_RECORD ExceptionRecord
+//   [EBP+0Ch] - PEXCEPTION_REGISTRATION RegistrationFrame
+//   [EBP+10h] - PVOID Context
+//   [EBP+14h] - PVOID DispatcherContext
+//   [EBP+18h] - PEXCEPTION_HANDLER ExceptionRoutine
+//   EDX       - Address of protecting exception handler
+// Returns:
+//   EXCEPTION_DISPOSITION
+// Notes:
+//   Setup the protecting exception handler and call the exception
+//   handler in the right context.
+_RtlpExecuteHandler:
+	pushl    %ebp
+    movl     %esp, %ebp
+    pushl    REH_RFRAME(%ebp)
+
+    pushl    %edx
+    pushl    %fs:0x0
+    movl     %esp, %fs:0x0
+
+    // Prepare to call the exception handler
+    pushl    REH_DCONTEXT(%ebp)
+    pushl    REH_CONTEXT(%ebp)
+    pushl    REH_RFRAME(%ebp)
+    pushl    REH_ERECORD(%ebp)
+
+    // Now call the exception handler
+    movl     REH_EROUTINE(%ebp), %eax
+    call    *%eax
+
+	cmpl	$-1, %fs:0x0
+	jne		.reh_stack_looks_ok
+
+	// This should not happen
+	pushl	0
+	pushl	0
+	pushl	0
+	pushl	0
+	call	_RtlAssert@16
+
+.reh_loop:
+	jmp	.reh_loop
+	
+.reh_stack_looks_ok:
+    movl     %fs:0x0, %esp
+
+    // Return to the 'front-end' for this function
+    popl     %fs:0x0
+    movl     %ebp, %esp
+    popl     %ebp
+    ret
+
+
+#define REP_ERECORD     0x04
+#define REP_RFRAME      0x08
+#define REP_CONTEXT     0x0C
+#define REP_DCONTEXT    0x10
+
+// Parameters:
+//   [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord
+//   [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame
+//   [ESP+0Ch] - PCONTEXT Context
+//   [ESP+10h] - PVOID DispatcherContext
+// Registers:
+//   None
+// Returns:
+//   EXCEPTION_DISPOSITION
+// Notes:
+//    This exception handler protects the exception handling
+//    mechanism by detecting nested exceptions.
+_RtlpExceptionProtector:
+    movl     $ExceptionContinueSearch, %eax
+    movl     REP_ERECORD(%esp), %ecx
+    testl    $EXCEPTION_UNWINDING, EREC_FLAGS(%ecx)
+    jnz      .rep_end
+
+    // Unwinding is not taking place, so return ExceptionNestedException
+
+    // Set DispatcherContext field to the exception registration for the
+    // exception handler that executed when a nested exception occurred
+    movl     REP_DCONTEXT(%esp), %ecx
+    movl     REP_RFRAME(%esp), %eax
+    movl     %eax, (%ecx)
+    movl     $ExceptionNestedException, %eax
+
+.rep_end:
+    ret
+
+
+// Parameters:
+//   [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord
+//   [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame
+//   [ESP+0Ch] - PCONTEXT Context
+//   [ESP+10h] - PVOID DispatcherContext
+//   [ESP+14h] - PEXCEPTION_HANDLER ExceptionHandler
+// Registers:
+//   None
+// Returns:
+//   EXCEPTION_DISPOSITION
+// Notes:
+//   Front-end
+_RtlpExecuteHandlerForException:
+    movl     $_RtlpExceptionProtector, %edx
+    jmp      _RtlpExecuteHandler
+
+
+#define RUP_ERECORD     0x04
+#define RUP_RFRAME      0x08
+#define RUP_CONTEXT     0x0C
+#define RUP_DCONTEXT    0x10
+
+// Parameters:
+//   [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord
+//   [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame
+//   [ESP+0Ch] - PCONTEXT Context
+//   [ESP+10h] - PVOID DispatcherContext
+// Registers:
+//   None
+// Returns:
+//   EXCEPTION_DISPOSITION
+// Notes:
+//    This exception handler protects the exception handling
+//    mechanism by detecting collided unwinds.
+_RtlpUnwindProtector:
+    movl     $ExceptionContinueSearch, %eax
+    movl     %ecx, RUP_ERECORD(%esp)
+    testl    $EXCEPTION_UNWINDING, EREC_FLAGS(%ecx)
+    jz       .rup_end
+
+    // Unwinding is taking place, so return ExceptionCollidedUnwind
+
+    movl     RUP_RFRAME(%esp), %ecx
+    movl     RUP_DCONTEXT(%esp), %edx
+
+    // Set DispatcherContext field to the exception registration for the
+    // exception handler that executed when a collision occurred
+    movl     RUP_RFRAME(%ecx), %eax
+    movl     %eax, (%edx)
+    movl     $ExceptionCollidedUnwind, %eax
+
+.rup_end:
+    ret
+
+
+// Parameters:
+//   [ESP+04h] - PEXCEPTION_RECORD ExceptionRecord
+//   [ESP+08h] - PEXCEPTION_REGISTRATION RegistrationFrame
+//   [ESP+0Ch] - PCONTEXT Context
+//   [ESP+10h] - PVOID DispatcherContext
+//   [ESP+14h] - PEXCEPTION_HANDLER ExceptionHandler
+// Registers:
+//   None
+// Returns:
+//   EXCEPTION_DISPOSITION
+_RtlpExecuteHandlerForUnwind:
+    movl     $_RtlpUnwindProtector, %edx
+    jmp      _RtlpExecuteHandler

From 629da60934d53545007a83988799935f5008315c Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Sun, 27 Jun 2004 05:38:54 +0000
Subject: [PATCH 104/356] Removed Named Arguments for non-public APIs and added
 explanations/sources for non-GNU IFS APIs.

svn path=/trunk/; revision=9898
---
 reactos/include/ddk/fsfuncs.h | 61 ++++++++++++++++++++++++++++++++---
 1 file changed, 56 insertions(+), 5 deletions(-)

diff --git a/reactos/include/ddk/fsfuncs.h b/reactos/include/ddk/fsfuncs.h
index 4907134f372..251ee7c92a2 100644
--- a/reactos/include/ddk/fsfuncs.h
+++ b/reactos/include/ddk/fsfuncs.h
@@ -1,10 +1,56 @@
 #ifndef __INCLUDE_DDK_FSFUNCS_H
 #define __INCLUDE_DDK_FSFUNCS_H
-/* $Id: fsfuncs.h,v 1.23 2004/06/23 00:41:55 ion Exp $ */
+/* $Id: fsfuncs.h,v 1.24 2004/06/27 05:38:54 ion Exp $ */
 #define FlagOn(x,f) ((x) & (f))
 
 #include <ntos/fstypes.h>
 
+/* Some comments on the Prototypes that aren't in the GNU IFS:
+
+The following come from alternate sources, or guessed from documentation:
+FsRtlNotifyFullChangeDirectory GOOGLE GROUPS
+FsRtlIsPagingFile OSR DOCUMENTATION
+FsRtlAcquireFileExclusive (GUESS: The function takes a single parameter. The function name is "AcquireFile". Logical assumption says this is a File Object. NTFSD ML Post confirms.)
+FsRtlReleaseFile (GUESS: The function takes a single parameter. The function name is "AcquireFile". Logical assumption says this is a File Object. NTFSD ML Post confirms.)
+FsRtlMdlReadCompleteDev (FsRtlMdlReadComplete is on GNU IFS. The Dev Suffix simply means an extra PDEVICE_OBJECT param)
+FsRtlMdlReadDev (FsRtlMdlReadDev is on GNU IFS. The Dev Suffix simply means an extra PDEVICE_OBJECT param)
+FsRtlMdlWriteCompleteDev FsRtlMdlWriteCompleteDev is on GNU IFS. The Dev Suffix simply means an extra PDEVICE_OBJECT param)
+FsRtlPrepareMdlWrite (Compared with CcMdlWrite, which is already documented)
+FsRtlPrepareMdlWriteDev (Same as above, and add a pointer to device object (Dev suffix)
+FsRtlGetNextMcbEntry(FsRtlGetNextLargeMcbEntry is documented and uses LONGLONGs. Logical assumption that this one only uses LONGS and non-large MCB (Documented))
+
+Stream Context. Going along with public OSR documenttion:
+
+FsRtlInsertPerStreamContext:
+"This call is used by the file system filter driver to associate a given context block 
+(allocated by the filter and initialized using FsRtlInitPerStreamContext) with the stream associated with the given file object."
+Notice we are told "given context block...initialized using FsRtlInitPerStreamContext". This function description tells us:
+" provide space for the FSRTL_PER_STREAM_CONTEXT block in the filter driver’s context structure"
+Therefore, one of the parameters is PFSRTL_PER_STREAM_CONTEXT.
+"with the stream associated with the given file object." The OSR Documentations then mentions:
+"Tracking per-file (or “per stream”) context information in FSRTL_ADVANCED_FCB_HEADER"
+So we are associating a FSRTL_PER_STREAM_CONTEXT block with the FSRTL_ADVANCED_FCB_HEADER associated with the file object.
+FSRTL_ADVANCED_FCB_HEADER is documented by a search through Google.
+FSRTL_PER_STREAM_CONTEXT is *NOT* documented anywhere else then in the IFS, so it has been removed.
+
+FsRtlLookupPerStreamContextInternal
+"FsRtlLookupPerStreamContext – this call is used by the file system filter driver to locate a given context
+block that is associated with the file object.  Typically, a file system filter driver will identify its 
+own context block using unique OwnerId and InstanceId parameters when creating the context block and subsequently
+when locating the associated information."
+OSR tells us here that the last two parameters are OwnerId and InstanceId. It also says it will find a given context block,
+so there's our Return Value. (Although, not being documented, we must put PVOID). It looks into a file object's stream, so we
+probably need that FCB header again.
+
+FsRtlRemovePerStreamContext
+OSR is vague, so all we know for sure is that we are sending an FCB Header. The return value isn't NTSTATUS, but seems to be a
+pointer. We don't know what the two other parameters are, so they have been marked as unknown.
+
+FsRtlTeardownPerStreamContexts
+OSR doens't tell a lot, but we only have one parameter. It must be the FCB Header. Furthermore, the CVS of Captive implements
+this function as a stub, and confirms the theory.
+
+*/
 
 VOID
 STDCALL
@@ -424,6 +470,7 @@ FsRtlMdlRead (
 	OUT	PMDL			*MdlChain,
 	OUT	PIO_STATUS_BLOCK	IoStatus
 	);
+
 BOOLEAN
 STDCALL
 FsRtlMdlReadComplete (
@@ -584,6 +631,7 @@ FsRtlPrepareMdlWrite (
 	OUT	PMDL			*MdlChain,
 	OUT	PIO_STATUS_BLOCK	IoStatus
 	);
+
 BOOLEAN
 STDCALL
 FsRtlPrepareMdlWriteDev (
@@ -613,6 +661,7 @@ FsRtlPostPagingFileStackOverflow (
 	DWORD	Unknown1,
 	DWORD	Unknown2
 	);
+
 VOID
 STDCALL
 FsRtlPostStackOverflow (
@@ -620,6 +669,7 @@ FsRtlPostStackOverflow (
 	DWORD	Unknown1,
 	DWORD	Unknown2
 	);
+
 BOOLEAN
 STDCALL
 FsRtlPrivateLock (
@@ -636,6 +686,7 @@ FsRtlPrivateLock (
     IN PVOID                Context,
     IN BOOLEAN              AlreadySynchronized
     );
+
 NTSTATUS
 STDCALL
 FsRtlProcessFileLock (
@@ -647,8 +698,8 @@ FsRtlProcessFileLock (
 STDCALL
 NTSTATUS
 FsRtlRegisterFileSystemFilterCallbacks (
-    IN struct _DRIVER_OBJECT *FilterDriverObject,
-    IN PFS_FILTER_CALLBACKS Callbacks
+    IN PVOID		Unknown,
+    IN PVOID		Unknown
     );
 
 NTSTATUS STDCALL
@@ -676,8 +727,8 @@ STDCALL
 PFSRTL_PER_STREAM_CONTEXT
 FsRtlRemovePerStreamContext (
     IN PFSRTL_ADVANCED_FCB_HEADER StreamContext,
-    IN PVOID OwnerId OPTIONAL,
-    IN PVOID InstanceId OPTIONAL
+    IN PVOID Unknown1 OPTIONAL,
+    IN PVOID Unknown2 OPTIONAL
     );
 
 STDCALL

From 2bb2c4aae8c736f7eadebac12f636cece61141e8 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sun, 27 Jun 2004 07:56:44 +0000
Subject: [PATCH 105/356] - Replaced the old default mode algortihm with video
 mode list sorting. - Added check for video mode memory model since we don't
 support anything but Direct Color and Packed Pixel modes. - More work in
 order to support VBE 1.2. - Fixed retun values in VBEInitialize.

svn path=/trunk/; revision=9899
---
 reactos/drivers/video/miniport/vbe/vbemp.c | 139 +++++++++++++++------
 reactos/drivers/video/miniport/vbe/vbemp.h |   5 +-
 2 files changed, 104 insertions(+), 40 deletions(-)

diff --git a/reactos/drivers/video/miniport/vbe/vbemp.c b/reactos/drivers/video/miniport/vbe/vbemp.c
index 07f881f5e11..6992ce6df96 100644
--- a/reactos/drivers/video/miniport/vbe/vbemp.c
+++ b/reactos/drivers/video/miniport/vbe/vbemp.c
@@ -68,6 +68,85 @@ VBEFindAdapter(
    return NO_ERROR;
 }
 
+/*
+ * VBESortModesCallback
+ *
+ * Helper function for sorting video mode list.
+ */
+
+static int
+VBESortModesCallback(PVBE_MODEINFO VbeModeInfoA, PVBE_MODEINFO VbeModeInfoB)
+{
+   DPRINT(("VBESortModesCallback: %dx%dx%d / %dx%dx%d\n",
+      VbeModeInfoA->XResolution, VbeModeInfoA->YResolution,
+      VbeModeInfoA->BitsPerPixel,
+      VbeModeInfoB->XResolution, VbeModeInfoB->YResolution,
+      VbeModeInfoB->BitsPerPixel));
+   
+   /*
+    * FIXME: Until some reasonable method for changing video modes will
+    * be available we favor more bits per pixel. It should be changed
+    * later.
+    */
+   if (VbeModeInfoA->BitsPerPixel < VbeModeInfoB->BitsPerPixel) return 1;
+   if (VbeModeInfoA->BitsPerPixel > VbeModeInfoB->BitsPerPixel) return -1;
+   if (VbeModeInfoA->XResolution < VbeModeInfoB->XResolution) return -1;
+   if (VbeModeInfoA->XResolution > VbeModeInfoB->XResolution) return 1;
+   if (VbeModeInfoA->YResolution < VbeModeInfoB->YResolution) return -1;
+   if (VbeModeInfoA->YResolution > VbeModeInfoB->YResolution) return 1;
+   return 0;
+}
+
+/*
+ * VBESortModes
+ *
+ * Simple function for sorting the video mode list. Uses bubble sort.
+ */
+
+VOID FASTCALL
+VBESortModes(PVBE_DEVICE_EXTENSION DeviceExtension)
+{
+   BOOLEAN Finished = FALSE;
+   ULONG Pos;
+   int Result;
+   VBE_MODEINFO TempModeInfo;
+   WORD TempModeNumber;
+
+   while (!Finished)
+   {
+      Finished = TRUE;
+      for (Pos = 0; Pos < DeviceExtension->ModeCount - 1; Pos++)
+      {
+         Result = VBESortModesCallback(
+            DeviceExtension->ModeInfo + Pos,
+            DeviceExtension->ModeInfo + Pos + 1);
+         if (Result > 0)
+         {
+            Finished = FALSE;
+
+            VideoPortMoveMemory(
+               &TempModeInfo,
+               DeviceExtension->ModeInfo + Pos,
+               sizeof(VBE_MODEINFO));
+            TempModeNumber = DeviceExtension->ModeNumbers[Pos];
+
+            VideoPortMoveMemory(
+               DeviceExtension->ModeInfo + Pos,
+               DeviceExtension->ModeInfo + Pos + 1,
+               sizeof(VBE_MODEINFO));
+            DeviceExtension->ModeNumbers[Pos] =
+               DeviceExtension->ModeNumbers[Pos + 1];
+
+            VideoPortMoveMemory(
+               DeviceExtension->ModeInfo + Pos + 1,
+               &TempModeInfo,
+               sizeof(VBE_MODEINFO));
+            DeviceExtension->ModeNumbers[Pos + 1] = TempModeNumber;
+         }
+      }
+   }
+}
+
 /*
  * VBEInitialize
  *
@@ -93,9 +172,6 @@ VBEInitialize(PVOID HwDeviceExtension)
    USHORT ModeTemp;
    ULONG CurrentMode;
    PVBE_MODEINFO VbeModeInfo;
-   VBE_MODEINFO TempVbeModeInfo;
-   WORD TempVbeModeNumber;
-   WORD DefaultMode;
 
    /*
     * Get the Int 10 interface that we will use for allocating real
@@ -112,7 +188,7 @@ VBEInitialize(PVOID HwDeviceExtension)
    if (Status != NO_ERROR)
    {
       DPRINT(("Failed to get Int 10 service functions (Status %x)\n", Status));
-      return 0;
+      return FALSE;
    }
    
    /*
@@ -131,7 +207,7 @@ VBEInitialize(PVOID HwDeviceExtension)
    if (Status != NO_ERROR)
    {
       DPRINT(("Failed to allocate virtual memory (Status %x)\n", Status));
-      return 0;
+      return FALSE;
    }
 
    /*
@@ -174,27 +250,15 @@ VBEInitialize(PVOID HwDeviceExtension)
 #endif
       {
          DPRINT(("VBE BIOS present, but incompatible version.\n"));
-         return ERROR_DEV_NOT_EXIST;
+         return FALSE;
       }
    }
    else
    {
       DPRINT(("No VBE BIOS found.\n"));
-      return ERROR_DEV_NOT_EXIST;
+      return FALSE;
    }
 
-#ifdef VBE12_SUPPORT
-   if (VBEDeviceExtension->VbeInfo.Version < 0x200)
-   {
-      /*
-       * FIXME: Build a mode list here based on the total memory
-       * available on the video card and the video mode tables
-       * from the VBE specification.
-       */
-      return ERROR_NOT_SUPPORTED;
-   }
-#endif
-
    /*
     * Build a mode list here that can be later used by
     * IOCTL_VIDEO_QUERY_NUM_AVAIL_MODES and IOCTL_VIDEO_QUERY_AVAIL_MODES
@@ -236,7 +300,7 @@ VBEInitialize(PVOID HwDeviceExtension)
     * Get the actual mode infos.
     */
    
-   for (CurrentMode = 0, SuitableModeCount = 0, DefaultMode = 0;
+   for (CurrentMode = 0, SuitableModeCount = 0;
         CurrentMode < ModeCount;
         CurrentMode++)
    {
@@ -272,16 +336,21 @@ VBEInitialize(PVOID HwDeviceExtension)
       if (BiosRegisters.Eax == VBE_SUCCESS &&
           VbeModeInfo->XResolution >= 640 &&
           VbeModeInfo->YResolution >= 480 &&
-          (VbeModeInfo->ModeAttributes & VBE_MODEATTR_LINEAR))
+          (VbeModeInfo->MemoryModel == VBE_MEMORYMODEL_PACKEDPIXEL ||
+           VbeModeInfo->MemoryModel == VBE_MEMORYMODEL_DIRECTCOLOR))
       {
-         VBEDeviceExtension->ModeNumbers[SuitableModeCount] = ModeTemp | 0x4000;
-         if (VbeModeInfo->XResolution == 640 &&
-             VbeModeInfo->YResolution == 480 &&
-             VbeModeInfo->BitsPerPixel == 32)
+         if (VbeModeInfo->ModeAttributes & VBE_MODEATTR_LINEAR)
          {
-            DefaultMode = SuitableModeCount;
+            VBEDeviceExtension->ModeNumbers[SuitableModeCount] = ModeTemp | 0x4000;
+            SuitableModeCount++;
          }
-         SuitableModeCount++;
+#ifdef VBE12_SUPPORT
+         else
+         {
+            VBEDeviceExtension->ModeNumbers[SuitableModeCount] = ModeTemp;
+            SuitableModeCount++;
+         }
+#endif
       }
    }
 
@@ -291,21 +360,13 @@ VBEInitialize(PVOID HwDeviceExtension)
       return FALSE;
    }
    
+   VBEDeviceExtension->ModeCount = SuitableModeCount;
+
    /*
-    * Exchange the default mode so it's at the first place in list.
+    * Sort the video mode list according to resolution and bits per pixel.
     */
 
-   VideoPortMoveMemory(&TempVbeModeInfo, VBEDeviceExtension->ModeInfo,
-      sizeof(VBE_MODEINFO));
-   VideoPortMoveMemory(VBEDeviceExtension->ModeInfo, VBEDeviceExtension->ModeInfo + DefaultMode,
-      sizeof(VBE_MODEINFO));
-   VideoPortMoveMemory(VBEDeviceExtension->ModeInfo + DefaultMode, &TempVbeModeInfo,
-      sizeof(VBE_MODEINFO));
-   TempVbeModeNumber = VBEDeviceExtension->ModeNumbers[0];
-   VBEDeviceExtension->ModeNumbers[0] = VBEDeviceExtension->ModeNumbers[DefaultMode];
-   VBEDeviceExtension->ModeNumbers[DefaultMode] = TempVbeModeNumber;
-
-   VBEDeviceExtension->ModeCount = SuitableModeCount;
+   VBESortModes(VBEDeviceExtension);
 
    /*
     * Print the supported video modes when DBG is set.
diff --git a/reactos/drivers/video/miniport/vbe/vbemp.h b/reactos/drivers/video/miniport/vbe/vbemp.h
index cae4716e10f..b3ce9373458 100644
--- a/reactos/drivers/video/miniport/vbe/vbemp.h
+++ b/reactos/drivers/video/miniport/vbe/vbemp.h
@@ -73,11 +73,14 @@
 #define VBE_DISPLAY_DATA_CHANNEL             0x4F14
 
 /*
- * VBE Video Mode Information Attributes
+ * VBE Video Mode Information Definitions
  */
 
 #define VBE_MODEATTR_LINEAR                    0x80
 
+#define VBE_MEMORYMODEL_PACKEDPIXEL            0x04
+#define VBE_MEMORYMODEL_DIRECTCOLOR            0x06
+
 /*
  * VBE Return Codes
  */

From 308a04ade4883c72eeb43127a081c1d33e67c0b5 Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Sun, 27 Jun 2004 10:16:59 +0000
Subject: [PATCH 106/356] don't crash if requested process couldn't be found

svn path=/trunk/; revision=9900
---
 reactos/subsys/csrss/api/process.c |  7 ++++++-
 reactos/subsys/csrss/api/wapi.c    | 15 +++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/reactos/subsys/csrss/api/process.c b/reactos/subsys/csrss/api/process.c
index 75c5596cde1..48fd6c3c995 100644
--- a/reactos/subsys/csrss/api/process.c
+++ b/reactos/subsys/csrss/api/process.c
@@ -1,4 +1,4 @@
-/* $Id: process.c,v 1.33 2004/04/09 20:03:15 navaraf Exp $
+/* $Id: process.c,v 1.34 2004/06/27 10:16:59 weiden Exp $
  *
  * reactos/subsys/csrss/api/process.c
  *
@@ -411,6 +411,11 @@ CSR_API(CsrDuplicateHandle)
   Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - LPC_MESSAGE_BASE_SIZE;
 
   ProcessData = CsrGetProcessData(Request->Data.DuplicateHandleRequest.ProcessId);
+  if (ProcessData == NULL)
+    {
+      DPRINT1("CsrGetProcessData() failed for process 0x%x, unable to dublicate handle\n", Request->Data.DuplicateHandleRequest.ProcessId);
+      return STATUS_INVALID_HANDLE;
+    }
   Reply->Status = CsrGetObject(ProcessData, Request->Data.DuplicateHandleRequest.Handle, &Object);
   if (! NT_SUCCESS(Reply->Status))
     {
diff --git a/reactos/subsys/csrss/api/wapi.c b/reactos/subsys/csrss/api/wapi.c
index 00a2a76514f..15d7ba00eae 100644
--- a/reactos/subsys/csrss/api/wapi.c
+++ b/reactos/subsys/csrss/api/wapi.c
@@ -1,4 +1,4 @@
-/* $Id: wapi.c,v 1.34 2004/04/09 20:03:15 navaraf Exp $
+/* $Id: wapi.c,v 1.35 2004/06/27 10:16:59 weiden Exp $
  * 
  * reactos/subsys/csrss/api/wapi.c
  *
@@ -135,7 +135,12 @@ Thread_Api2(HANDLE ServerPort)
       Reply = (PCSRSS_API_REPLY)&LpcReply;
 	
       ProcessData = CsrGetProcessData((ULONG)LpcRequest.Header.ClientId.UniqueProcess);
-
+      if (ProcessData == NULL)
+	{
+          DPRINT1("CSR: Unable to find process data for process 0x%x\n", (ULONG)LpcRequest.Header.ClientId.UniqueProcess);
+          NtClose(ServerPort);
+          continue;
+        }
       CsrApiCallHandler(ProcessData, Request, Reply);
     }
 }
@@ -182,6 +187,12 @@ void Thread_Api(PVOID PortHandle)
 	  }
 
 	ProcessData = CsrGetProcessData((ULONG)Request.Header.ClientId.UniqueProcess);
+	if (ProcessData == NULL)
+	  {
+	    DPRINT1("CSR: Unable to find process data for process 0x%x\n", (ULONG)Request.Header.ClientId.UniqueProcess);
+	    NtClose(ServerPort);
+	    continue;
+	  }
 	ProcessData->CsrSectionViewBase = LpcRead.ViewBase;
 	ProcessData->CsrSectionViewSize = LpcRead.ViewSize;
 	

From 6f6c0f76ef41a1be46cce7cb5ad831b68c169f67 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sun, 27 Jun 2004 11:23:57 +0000
Subject: [PATCH 107/356] - Fixed compilation.

svn path=/trunk/; revision=9901
---
 reactos/include/ddk/fsfuncs.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/reactos/include/ddk/fsfuncs.h b/reactos/include/ddk/fsfuncs.h
index 251ee7c92a2..9a3fd3fbcfe 100644
--- a/reactos/include/ddk/fsfuncs.h
+++ b/reactos/include/ddk/fsfuncs.h
@@ -1,6 +1,6 @@
 #ifndef __INCLUDE_DDK_FSFUNCS_H
 #define __INCLUDE_DDK_FSFUNCS_H
-/* $Id: fsfuncs.h,v 1.24 2004/06/27 05:38:54 ion Exp $ */
+/* $Id: fsfuncs.h,v 1.25 2004/06/27 11:23:57 navaraf Exp $ */
 #define FlagOn(x,f) ((x) & (f))
 
 #include <ntos/fstypes.h>
@@ -698,8 +698,8 @@ FsRtlProcessFileLock (
 STDCALL
 NTSTATUS
 FsRtlRegisterFileSystemFilterCallbacks (
-    IN PVOID		Unknown,
-    IN PVOID		Unknown
+    IN PVOID		Unknown1,
+    IN PVOID		Unknown2
     );
 
 NTSTATUS STDCALL

From 625c7953e54f02432b883e5aa5884434031d7169 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sun, 27 Jun 2004 11:23:57 +0000
Subject: [PATCH 108/356] - Better handling of error cases in font handling.

svn path=/trunk/; revision=9902
---
 reactos/subsys/win32k/objects/text.c | 128 +++++++++++++++------------
 1 file changed, 70 insertions(+), 58 deletions(-)

diff --git a/reactos/subsys/win32k/objects/text.c b/reactos/subsys/win32k/objects/text.c
index d9fe42fa4b4..c0515c2637c 100644
--- a/reactos/subsys/win32k/objects/text.c
+++ b/reactos/subsys/win32k/objects/text.c
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: text.c,v 1.99 2004/06/23 15:30:21 weiden Exp $ */
+/* $Id: text.c,v 1.100 2004/06/27 11:23:57 navaraf Exp $ */
 #include <w32k.h>
 
 #include <ft2build.h>
@@ -1579,59 +1579,6 @@ NtGdiExtTextOut(
    XStart = Start.x + dc->w.DCOrgX;
    YStart = Start.y + dc->w.DCOrgY;
 
-   TextObj = TEXTOBJ_LockText(dc->w.hFont);
-
-   if (!NT_SUCCESS(GetFontObjectsFromTextObj(TextObj, NULL, &FontObj, &FontGDI)))
-   {
-      goto fail;
-   }
-
-   face = FontGDI->face;
-   if (face->charmap == NULL)
-   {
-      DPRINT("WARNING: No charmap selected!\n");
-      DPRINT("This font face has %d charmaps\n", face->num_charmaps);
-
-      for (n = 0; n < face->num_charmaps; n++)
-      {
-         charmap = face->charmaps[n];
-         DPRINT("found charmap encoding: %u\n", charmap->encoding);
-         if (charmap->encoding != 0)
-         {
-            found = charmap;
-            break;
-         }
-      }
-      if (!found)
-         DPRINT1("WARNING: Could not find desired charmap!\n");
-      IntLockFreeType;
-      error = FT_Set_Charmap(face, found);
-      IntUnLockFreeType;
-      if (error)
-         DPRINT1("WARNING: Could not set the charmap!\n");
-   }
-
-   Render = IntIsFontRenderingEnabled();
-   if (Render)
-      RenderMode = IntGetFontRenderMode(&TextObj->logfont);
-   else
-      RenderMode = FT_RENDER_MODE_MONO;
-  
-   IntLockFreeType;
-   error = FT_Set_Pixel_Sizes(
-      face,
-      /* FIXME should set character height if neg */
-      (TextObj->logfont.lfHeight < 0 ?
-      - TextObj->logfont.lfHeight :
-      TextObj->logfont.lfHeight),
-      TextObj->logfont.lfWidth);
-   IntUnLockFreeType;
-   if (error)
-   {
-      DPRINT1("Error in setting pixel sizes: %u\n", error);
-      goto fail;
-   }
-
    /* Create the brushes */
    PalDestGDI = PALETTE_LockPalette(dc->w.hPalette);
    if ( !PalDestGDI )
@@ -1695,6 +1642,59 @@ NtGdiExtTextOut(
       }
    }
 
+   TextObj = TEXTOBJ_LockText(dc->w.hFont);
+
+   if (!NT_SUCCESS(GetFontObjectsFromTextObj(TextObj, NULL, &FontObj, &FontGDI)))
+   {
+      goto fail;
+   }
+
+   face = FontGDI->face;
+   if (face->charmap == NULL)
+   {
+      DPRINT("WARNING: No charmap selected!\n");
+      DPRINT("This font face has %d charmaps\n", face->num_charmaps);
+
+      for (n = 0; n < face->num_charmaps; n++)
+      {
+         charmap = face->charmaps[n];
+         DPRINT("found charmap encoding: %u\n", charmap->encoding);
+         if (charmap->encoding != 0)
+         {
+            found = charmap;
+            break;
+         }
+      }
+      if (!found)
+         DPRINT1("WARNING: Could not find desired charmap!\n");
+      IntLockFreeType;
+      error = FT_Set_Charmap(face, found);
+      IntUnLockFreeType;
+      if (error)
+         DPRINT1("WARNING: Could not set the charmap!\n");
+   }
+
+   Render = IntIsFontRenderingEnabled();
+   if (Render)
+      RenderMode = IntGetFontRenderMode(&TextObj->logfont);
+   else
+      RenderMode = FT_RENDER_MODE_MONO;
+  
+   IntLockFreeType;
+   error = FT_Set_Pixel_Sizes(
+      face,
+      /* FIXME should set character height if neg */
+      (TextObj->logfont.lfHeight < 0 ?
+      - TextObj->logfont.lfHeight :
+      TextObj->logfont.lfHeight),
+      TextObj->logfont.lfWidth);
+   IntUnLockFreeType;
+   if (error)
+   {
+      DPRINT1("Error in setting pixel sizes: %u\n", error);
+      goto fail;
+   }
+
    /*
     * Process the vertical alignment and determine the yoff.
     */
@@ -1994,6 +1994,7 @@ NtGdiGetCharWidth32(HDC  hDC,
    FT_Face face;
    FT_CharMap charmap, found = NULL;
    UINT i, glyph_index, BufferSize;
+   HFONT hFont;
 
    if (LastChar < FirstChar)
    {
@@ -2016,10 +2017,17 @@ NtGdiGetCharWidth32(HDC  hDC,
       SetLastWin32Error(ERROR_INVALID_HANDLE);
       return FALSE;
    }
-   TextObj = TEXTOBJ_LockText(dc->w.hFont);
+   TextObj = TEXTOBJ_LockText(hFont);
+   hFont = dc->w.hFont;
    DC_UnlockDc(hDC);
 
-   GetFontObjectsFromTextObj(TextObj, NULL, NULL, &FontGDI);
+   if (!NT_SUCCESS(GetFontObjectsFromTextObj(TextObj, NULL, NULL, &FontGDI)))
+   {
+      ExFreePool(SafeBuffer);
+      SetLastWin32Error(ERROR_INVALID_HANDLE);
+      TEXTOBJ_UnlockText(hFont);
+      return FALSE;
+   }
    
    face = FontGDI->face;
    if (face->charmap == NULL)
@@ -2062,7 +2070,7 @@ NtGdiGetCharWidth32(HDC  hDC,
       SafeBuffer[i - FirstChar] = face->glyph->advance.x >> 6;
    }
    IntUnLockFreeType;
-   TEXTOBJ_UnlockText(dc->w.hFont);
+   TEXTOBJ_UnlockText(hFont);
    MmCopyToCaller(Buffer, SafeBuffer, BufferSize);
    ExFreePool(SafeBuffer);
    return TRUE;
@@ -2161,7 +2169,11 @@ TextIntGetTextExtentPoint(HDC hDC,
   FT_CharMap charmap, found = NULL;
   BOOL use_kerning;
 
-  GetFontObjectsFromTextObj(TextObj, NULL, NULL, &FontGDI);
+  if (!NT_SUCCESS(GetFontObjectsFromTextObj(TextObj, NULL, NULL, &FontGDI)))
+    {
+      return FALSE;
+    }
+
   face = FontGDI->face;
   if (NULL != Fit)
     {

From 13d400fbd2c147fff8995b50425d03bd2d70e468 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sun, 27 Jun 2004 11:24:06 +0000
Subject: [PATCH 109/356] - Better handling of error cases in DrawTextW.

svn path=/trunk/; revision=9903
---
 reactos/lib/user32/windows/font.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/reactos/lib/user32/windows/font.c b/reactos/lib/user32/windows/font.c
index 544f9802014..a18f3091b1b 100644
--- a/reactos/lib/user32/windows/font.c
+++ b/reactos/lib/user32/windows/font.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: font.c,v 1.9 2003/12/21 16:49:41 navaraf Exp $
+/* $Id: font.c,v 1.10 2004/06/27 11:24:06 navaraf Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/input.c
@@ -97,8 +97,10 @@ static LONG TEXT_TabbedTextOut( HDC hdc, INT x, INT y, LPCWSTR lpstr,
     else
     {
         TEXTMETRICA tm;
-        GetTextMetricsA( hdc, &tm );
-        defWidth = 8 * tm.tmAveCharWidth;
+        if (GetTextMetricsA( hdc, &tm ))
+            defWidth = 8 * tm.tmAveCharWidth;
+        else
+            defWidth = 0;
         if (cTabStops == 1)
             cTabStops = 0; /* on negative *lpTabPos */
     }
@@ -742,7 +744,7 @@ static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count,
 {
     int i = 0, j = 0;
     int plen = 0;
-    SIZE size;
+    SIZE size = {0, 0};
     int maxl = *len;
     int seg_i, seg_count, seg_j;
     int max_seg_width;
@@ -950,7 +952,7 @@ static void TEXT_DrawUnderscore (HDC hdc, int x, int y, const WCHAR *str, int of
 {
     int prefix_x;
     int prefix_end;
-    SIZE size;
+    SIZE size = {0, 0};
     HPEN hpen;
     HPEN oldPen;
 

From 3bd4ef3363f38e05514cd23cda575699db908601 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sun, 27 Jun 2004 11:24:43 +0000
Subject: [PATCH 110/356] - Better handling of error cases when no fonts are
 present in the system.

svn path=/trunk/; revision=9904
---
 reactos/lib/comctl32/listview.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/reactos/lib/comctl32/listview.c b/reactos/lib/comctl32/listview.c
index 8914a44abd2..6799434d182 100644
--- a/reactos/lib/comctl32/listview.c
+++ b/reactos/lib/comctl32/listview.c
@@ -2024,7 +2024,8 @@ calc_label:
 		         infoPtr->iconSize.cy + ICON_BOTTOM_PADDING;
 	    Label.right = Label.left + labelSize.cx;
 	    Label.bottom = Label.top + infoPtr->nItemHeight;
-	    if (!oversizedBox && labelSize.cy > infoPtr->ntmHeight)
+	    if (!oversizedBox && labelSize.cy > infoPtr->ntmHeight &&
+	        infoPtr->ntmHeight)
 	    {
 		labelSize.cy = min(Box.bottom - Label.top, labelSize.cy);
 		labelSize.cy /= infoPtr->ntmHeight;
@@ -9516,7 +9517,8 @@ static HWND CreateEditLabelT(LISTVIEW_INFO *infoPtr, LPCWSTR text, DWORD style,
         hOldFont = SelectObject(hdc, infoPtr->hFont);
 
     /*Get String Length in pixels */
-    GetTextExtentPoint32W(hdc, text, lstrlenW(text), &sz);
+    if(!GetTextExtentPoint32W(hdc, text, lstrlenW(text), &sz))
+        sz.cx = 0;
 
     /*Add Extra spacing for the next character */
     GetTextMetricsW(hdc, &textMetric);

From fbe9f7f64f32fb2735db9019ae3e58081d21b1ac Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Sun, 27 Jun 2004 12:21:14 +0000
Subject: [PATCH 111/356] Implement and use LdrProcessRelocationBlock().

svn path=/trunk/; revision=9905
---
 reactos/include/ntdll/ldr.h     |   6 ++
 reactos/lib/ntdll/def/ntdll.def |   4 +-
 reactos/lib/ntdll/def/ntdll.edf |   4 +-
 reactos/lib/ntdll/ldr/utils.c   | 114 +++++++++++++++++++++-----------
 4 files changed, 84 insertions(+), 44 deletions(-)

diff --git a/reactos/include/ntdll/ldr.h b/reactos/include/ntdll/ldr.h
index 8075d53b200..e4a05e109f7 100644
--- a/reactos/include/ntdll/ldr.h
+++ b/reactos/include/ntdll/ldr.h
@@ -126,6 +126,12 @@ LdrLoadDll(IN PWSTR SearchPath OPTIONAL,
 	   IN PUNICODE_STRING Name,
 	   OUT PVOID *BaseAddress OPTIONAL);
 
+PIMAGE_BASE_RELOCATION STDCALL
+LdrProcessRelocationBlock(IN PVOID Address,
+			  IN USHORT Count,
+			  IN PUSHORT TypeOffset,
+			  IN ULONG_PTR Delta);
+
 NTSTATUS STDCALL
 LdrQueryImageFileExecutionOptions (IN PUNICODE_STRING SubKey,
 				   IN PCWSTR ValueName,
diff --git a/reactos/lib/ntdll/def/ntdll.def b/reactos/lib/ntdll/def/ntdll.def
index 7f6b2e06a7c..376a3486cdc 100644
--- a/reactos/lib/ntdll/def/ntdll.def
+++ b/reactos/lib/ntdll/def/ntdll.def
@@ -1,4 +1,4 @@
-; $Id: ntdll.def,v 1.121 2004/06/13 10:35:52 navaraf Exp $
+; $Id: ntdll.def,v 1.122 2004/06/27 12:21:14 ekohl Exp $
 ;
 ; ReactOS Operating System
 ;
@@ -51,7 +51,7 @@ LdrGetDllHandle@16
 LdrGetProcedureAddress@16
 LdrInitializeThunk@16
 LdrLoadDll@16
-;LdrProcessRelocationBlock@16
+LdrProcessRelocationBlock@16
 LdrQueryImageFileExecutionOptions@24
 LdrQueryProcessModuleInformation@12
 LdrShutdownProcess@0
diff --git a/reactos/lib/ntdll/def/ntdll.edf b/reactos/lib/ntdll/def/ntdll.edf
index d7c771d57b1..c21b6a89cf4 100644
--- a/reactos/lib/ntdll/def/ntdll.edf
+++ b/reactos/lib/ntdll/def/ntdll.edf
@@ -1,4 +1,4 @@
-; $Id: ntdll.edf,v 1.111 2004/06/13 10:35:52 navaraf Exp $
+; $Id: ntdll.edf,v 1.112 2004/06/27 12:21:14 ekohl Exp $
 ;
 ; ReactOS Operating System
 ;
@@ -51,7 +51,7 @@ LdrGetDllHandle=LdrGetDllHandle@16
 LdrGetProcedureAddress=LdrGetProcedureAddress@16
 LdrInitializeThunk=LdrInitializeThunk@16
 LdrLoadDll=LdrLoadDll@16
-;LdrProcessRelocationBlock
+LdrProcessRelocationBlock=LdrProcessRelocationBlock@16
 LdrQueryImageFileExecutionOptions=LdrQueryImageFileExecutionOptions@24
 LdrQueryProcessModuleInformation=LdrQueryProcessModuleInformation@12
 LdrShutdownProcess=LdrShutdownProcess@0
diff --git a/reactos/lib/ntdll/ldr/utils.c b/reactos/lib/ntdll/ldr/utils.c
index e68ef93bcaa..54fe950a1df 100644
--- a/reactos/lib/ntdll/ldr/utils.c
+++ b/reactos/lib/ntdll/ldr/utils.c
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.95 2004/06/26 15:11:14 navaraf Exp $
+/* $Id: utils.c,v 1.96 2004/06/27 12:20:33 ekohl Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -1226,10 +1226,10 @@ LdrPerformRelocations(PIMAGE_NT_HEADERS NTHeaders,
 {
   PIMAGE_DATA_DIRECTORY RelocationDDir;
   PIMAGE_BASE_RELOCATION RelocationDir, RelocationEnd;
-  ULONG Count, ProtectSize, OldProtect, OldProtect2, i;
+  ULONG Count, ProtectSize, OldProtect, OldProtect2;
   PVOID Page, ProtectPage, ProtectPage2;
-  PWORD TypeOffset;
-  ULONG Delta = (ULONG_PTR)ImageBase - NTHeaders->OptionalHeader.ImageBase;
+  PUSHORT TypeOffset;
+  ULONG_PTR Delta;
   NTSTATUS Status;
 
   if (NTHeaders->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED)
@@ -1244,19 +1244,21 @@ LdrPerformRelocations(PIMAGE_NT_HEADERS NTHeaders,
     {
       return STATUS_SUCCESS;
     }
-   
+
   ProtectSize = PAGE_SIZE;
-  RelocationDir = (IMAGE_BASE_RELOCATION*)((ULONG_PTR)ImageBase + 
+  Delta = (ULONG_PTR)ImageBase - NTHeaders->OptionalHeader.ImageBase;
+  RelocationDir = (PIMAGE_BASE_RELOCATION)((ULONG_PTR)ImageBase +
                   RelocationDDir->VirtualAddress);
-  RelocationEnd = (IMAGE_BASE_RELOCATION*)((ULONG_PTR)ImageBase +
+  RelocationEnd = (PIMAGE_BASE_RELOCATION)((ULONG_PTR)ImageBase +
                   RelocationDDir->VirtualAddress + RelocationDDir->Size);
+
   while (RelocationDir < RelocationEnd &&
          RelocationDir->SizeOfBlock > 0)
     {
       Count = (RelocationDir->SizeOfBlock - sizeof(IMAGE_BASE_RELOCATION)) /
-              sizeof(WORD);
+              sizeof(USHORT);
       Page = ImageBase + RelocationDir->VirtualAddress;
-      TypeOffset = (PWORD)(RelocationDir + 1);
+      TypeOffset = (PUSHORT)(RelocationDir + 1);
 
       /* Unprotect the page(s) we're about to relocate. */
       ProtectPage = Page;
@@ -1268,7 +1270,7 @@ LdrPerformRelocations(PIMAGE_NT_HEADERS NTHeaders,
       if (!NT_SUCCESS(Status))
         {
           DPRINT1("Failed to unprotect relocation target.\n");
-          return(Status);
+          return Status;
         }
 
       if (RelocationDir->VirtualAddress + PAGE_SIZE <
@@ -1288,36 +1290,21 @@ LdrPerformRelocations(PIMAGE_NT_HEADERS NTHeaders,
                                      &ProtectSize,
                                      OldProtect,
                                      &OldProtect);
-              return(Status);
+              return Status;
             }
         }
-
-      /* Patch the page. */
-      for (i = 0; i < Count; i++)
+      else
         {
-          SHORT Offset = TypeOffset[i] & 0xFFF;
-          USHORT Type = TypeOffset[i] >> 12;
-
-          switch (Type)
-            {
-              case IMAGE_REL_BASED_ABSOLUTE:
-                break;
-              case IMAGE_REL_BASED_HIGH:
-                *(PUSHORT)(Page + Offset) += HIWORD(Delta);
-                break;
-              case IMAGE_REL_BASED_LOW:
-                *(PUSHORT)(Page + Offset) += LOWORD(Delta);
-                break;
-              case IMAGE_REL_BASED_HIGHLOW:
-                *(PULONG)(Page + Offset) += Delta;
-                break;
-              case IMAGE_REL_BASED_HIGHADJ:
-              default:
-                DPRINT("Unknown/unsupported fixup type %d.\n", type);
-                return STATUS_UNSUCCESSFUL;
-            }
+          ProtectPage2 = NULL;
         }
 
+      RelocationDir = LdrProcessRelocationBlock(Page,
+                                                Count,
+                                                TypeOffset,
+                                                Delta);
+      if (RelocationDir == NULL)
+        return STATUS_UNSUCCESSFUL;
+
       /* Restore old page protection. */
       NtProtectVirtualMemory(NtCurrentProcess(),
                              &ProtectPage,
@@ -1325,8 +1312,7 @@ LdrPerformRelocations(PIMAGE_NT_HEADERS NTHeaders,
                              OldProtect,
                              &OldProtect);
 
-      if (RelocationDir->VirtualAddress + PAGE_SIZE <
-          NTHeaders->OptionalHeader.SizeOfImage)
+      if (ProtectPage2 != NULL)
         {
           NtProtectVirtualMemory(NtCurrentProcess(),
                                  &ProtectPage2,
@@ -1334,9 +1320,6 @@ LdrPerformRelocations(PIMAGE_NT_HEADERS NTHeaders,
                                  OldProtect2,
                                  &OldProtect2);
         }
-
-      RelocationDir = (IMAGE_BASE_RELOCATION*)((ULONG_PTR)RelocationDir +
-                      RelocationDir->SizeOfBlock);
     }
 
   return STATUS_SUCCESS;
@@ -3030,4 +3013,55 @@ LdrQueryImageFileExecutionOptions (IN PUNICODE_STRING SubKey,
   return Status;
 }
 
+
+PIMAGE_BASE_RELOCATION STDCALL
+LdrProcessRelocationBlock(IN PVOID Address,
+			  IN USHORT Count,
+			  IN PUSHORT TypeOffset,
+			  IN ULONG_PTR Delta)
+{
+  SHORT Offset;
+  USHORT Type;
+  USHORT i;
+  PUSHORT ShortPtr;
+  PULONG LongPtr;
+
+  for (i = 0; i < Count; i++)
+    {
+      Offset = *TypeOffset & 0xFFF;
+      Type = *TypeOffset >> 12;
+
+      switch (Type)
+        {
+          case IMAGE_REL_BASED_ABSOLUTE:
+            break;
+
+          case IMAGE_REL_BASED_HIGH:
+            ShortPtr = (PUSHORT)(Address + Offset);
+            *ShortPtr += HIWORD(Delta);
+            break;
+
+          case IMAGE_REL_BASED_LOW:
+            ShortPtr = (PUSHORT)(Address + Offset);
+            *ShortPtr += LOWORD(Delta);
+            break;
+
+          case IMAGE_REL_BASED_HIGHLOW:
+            LongPtr = (PULONG)(Address + Offset);
+            *LongPtr += Delta;
+            break;
+
+          case IMAGE_REL_BASED_HIGHADJ:
+          case IMAGE_REL_BASED_MIPS_JMPADDR:
+          default:
+            DPRINT1("Unknown/unsupported fixup type %hu.\n", Type);
+            return NULL;
+        }
+
+      TypeOffset++;
+    }
+
+  return (PIMAGE_BASE_RELOCATION)TypeOffset;
+}
+
 /* EOF */

From 988f8a5efc8eed9bb41ebab57a8087964470d807 Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Sun, 27 Jun 2004 12:21:32 +0000
Subject: [PATCH 112/356] revert my previous patch

svn path=/trunk/; revision=9906
---
 reactos/subsys/csrss/api/process.c |  7 +------
 reactos/subsys/csrss/api/wapi.c    | 15 ++-------------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/reactos/subsys/csrss/api/process.c b/reactos/subsys/csrss/api/process.c
index 48fd6c3c995..fef95841023 100644
--- a/reactos/subsys/csrss/api/process.c
+++ b/reactos/subsys/csrss/api/process.c
@@ -1,4 +1,4 @@
-/* $Id: process.c,v 1.34 2004/06/27 10:16:59 weiden Exp $
+/* $Id: process.c,v 1.35 2004/06/27 12:21:31 weiden Exp $
  *
  * reactos/subsys/csrss/api/process.c
  *
@@ -411,11 +411,6 @@ CSR_API(CsrDuplicateHandle)
   Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - LPC_MESSAGE_BASE_SIZE;
 
   ProcessData = CsrGetProcessData(Request->Data.DuplicateHandleRequest.ProcessId);
-  if (ProcessData == NULL)
-    {
-      DPRINT1("CsrGetProcessData() failed for process 0x%x, unable to dublicate handle\n", Request->Data.DuplicateHandleRequest.ProcessId);
-      return STATUS_INVALID_HANDLE;
-    }
   Reply->Status = CsrGetObject(ProcessData, Request->Data.DuplicateHandleRequest.Handle, &Object);
   if (! NT_SUCCESS(Reply->Status))
     {
diff --git a/reactos/subsys/csrss/api/wapi.c b/reactos/subsys/csrss/api/wapi.c
index 15d7ba00eae..f4ec9c88333 100644
--- a/reactos/subsys/csrss/api/wapi.c
+++ b/reactos/subsys/csrss/api/wapi.c
@@ -1,4 +1,4 @@
-/* $Id: wapi.c,v 1.35 2004/06/27 10:16:59 weiden Exp $
+/* $Id: wapi.c,v 1.36 2004/06/27 12:21:32 weiden Exp $
  * 
  * reactos/subsys/csrss/api/wapi.c
  *
@@ -135,12 +135,7 @@ Thread_Api2(HANDLE ServerPort)
       Reply = (PCSRSS_API_REPLY)&LpcReply;
 	
       ProcessData = CsrGetProcessData((ULONG)LpcRequest.Header.ClientId.UniqueProcess);
-      if (ProcessData == NULL)
-	{
-          DPRINT1("CSR: Unable to find process data for process 0x%x\n", (ULONG)LpcRequest.Header.ClientId.UniqueProcess);
-          NtClose(ServerPort);
-          continue;
-        }
+
       CsrApiCallHandler(ProcessData, Request, Reply);
     }
 }
@@ -187,12 +182,6 @@ void Thread_Api(PVOID PortHandle)
 	  }
 
 	ProcessData = CsrGetProcessData((ULONG)Request.Header.ClientId.UniqueProcess);
-	if (ProcessData == NULL)
-	  {
-	    DPRINT1("CSR: Unable to find process data for process 0x%x\n", (ULONG)Request.Header.ClientId.UniqueProcess);
-	    NtClose(ServerPort);
-	    continue;
-	  }
 	ProcessData->CsrSectionViewBase = LpcRead.ViewBase;
 	ProcessData->CsrSectionViewSize = LpcRead.ViewSize;
 	

From f764d79dbb9d25ad37cfc8c37b4f6869587c59d0 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sun, 27 Jun 2004 13:58:05 +0000
Subject: [PATCH 113/356] - Fixed compilation.

svn path=/trunk/; revision=9908
---
 reactos/ntoskrnl/fs/notify.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/reactos/ntoskrnl/fs/notify.c b/reactos/ntoskrnl/fs/notify.c
index 8f8f10e25a7..30ef07cbf04 100644
--- a/reactos/ntoskrnl/fs/notify.c
+++ b/reactos/ntoskrnl/fs/notify.c
@@ -1,4 +1,4 @@
-/* $Id: notify.c,v 1.10 2004/06/23 00:42:21 ion Exp $
+/* $Id: notify.c,v 1.11 2004/06/27 13:58:05 navaraf Exp $
  *
  * reactos/ntoskrnl/fs/notify.c
  *
@@ -315,8 +315,8 @@ FsRtlNotifyVolumeEvent (
 STDCALL
 NTSTATUS
 FsRtlRegisterFileSystemFilterCallbacks (
-    IN struct _DRIVER_OBJECT *FilterDriverObject,
-    IN PFS_FILTER_CALLBACKS Callbacks
+    IN PVOID		Unknown1,
+    IN PVOID		Unknown2
     )
 {
 	UNIMPLEMENTED;

From 870260bec78049793fdeb2f9a55a4baf38f4dea5 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sun, 27 Jun 2004 14:15:33 +0000
Subject: [PATCH 114/356] - Fixed bug in binary search algorithm.

svn path=/trunk/; revision=9909
---
 reactos/ntoskrnl/ldr/rtl.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/reactos/ntoskrnl/ldr/rtl.c b/reactos/ntoskrnl/ldr/rtl.c
index 0a165ea095e..19346b2e65f 100644
--- a/reactos/ntoskrnl/ldr/rtl.c
+++ b/reactos/ntoskrnl/ldr/rtl.c
@@ -1,4 +1,4 @@
-/* $Id: rtl.c,v 1.18 2003/12/30 18:52:05 fireball Exp $
+/* $Id: rtl.c,v 1.19 2004/06/27 14:15:33 navaraf Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -175,7 +175,7 @@ LdrGetProcedureAddress (IN PVOID BaseAddress,
    AddressPtr = (PULONG)RVA((char*)BaseAddress, ExportDir->AddressOfFunctions);
    if (Name && Name->Length)
      {
-       ULONG minn, maxn;
+       LONG minn, maxn;
 
 	/* by name */
        OrdinalPtr = 
@@ -185,7 +185,7 @@ LdrGetProcedureAddress (IN PVOID BaseAddress,
 	minn = 0; maxn = ExportDir->NumberOfNames;
 	while (minn <= maxn)
 	  {
-	    ULONG mid;
+	    LONG mid;
 	    LONG res;
 
 	    mid = (minn + maxn) / 2;

From 3424e4ee4a604297ea78e3fa9210aa068008bda2 Mon Sep 17 00:00:00 2001
From: Martin Fuchs <fuchs.martin@gmail.com>
Date: Mon, 28 Jun 2004 06:52:41 +0000
Subject: [PATCH 115/356] add explorer-cfg-template.xml for explorer default
 configuration

svn path=/trunk/; revision=9912
---
 reactos/bootdata/packages/reactos.dff | 1 +
 1 file changed, 1 insertion(+)

diff --git a/reactos/bootdata/packages/reactos.dff b/reactos/bootdata/packages/reactos.dff
index f8741b6408b..6f33636d262 100755
--- a/reactos/bootdata/packages/reactos.dff
+++ b/reactos/bootdata/packages/reactos.dff
@@ -106,6 +106,7 @@ subsys\win32k\win32k.sys                1
 subsys\system\autochk\autochk.exe       1
 subsys\system\cmd\cmd.exe               1
 subsys\system\explorer\explorer.exe     4
+subsys\system\explorer\explorer-cfg-template.xml 4
 subsys\system\explorer\notifyhook.dll   1
 subsys\system\format\format.exe         1
 subsys\system\regedit\regedit.exe       4

From 6c9226bcbff7bd148d4ce80594c4740cc639d8f3 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Mon, 28 Jun 2004 12:05:16 +0000
Subject: [PATCH 116/356] Don't use fixed size main window. GetProcAddress()
 does not accept Unicode procedure names. Visual improvements.

svn path=/trunk/; revision=9913
---
 reactos/lib/cpl/control/control.c | 56 ++++++++++++++++---------------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/reactos/lib/cpl/control/control.c b/reactos/lib/cpl/control/control.c
index 26689e015f1..a12395454d3 100644
--- a/reactos/lib/cpl/control/control.c
+++ b/reactos/lib/cpl/control/control.c
@@ -17,10 +17,10 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: control.c,v 1.1 2004/06/19 00:11:44 kuehng Exp $
+/* $Id: control.c,v 1.2 2004/06/28 12:05:16 ekohl Exp $
  *
  * PROJECT:         ReactOS System Control Panel
- * FILE:            lib/cpl/system/control.cpp
+ * FILE:            lib/cpl/system/control.c
  * PURPOSE:         ReactOS System Control Panel
  * PROGRAMMER:      Gero Kuehn (reactos.filter@gkware.com)
  * UPDATE HISTORY:
@@ -47,6 +47,22 @@
 #define CTL_DEBUG(x)
 #endif
 
+
+#define MYWNDCLASS _T("CTLPANELCLASS")
+
+typedef LONG (CALLBACK *CPLAPPLETFUNC)(HWND hwndCPL, UINT uMsg, LPARAM lParam1, LPARAM lParam2);
+
+typedef struct CPLLISTENTRY
+{
+	TCHAR pszPath[MAX_PATH];
+	HMODULE hDLL;
+	CPLAPPLETFUNC pFunc;
+	CPLINFO CPLInfo;
+	int nIndex;
+} CPLLISTENTRY;
+
+
+HWND hListView;
 HINSTANCE hInst;
 HWND hMainWnd;
 
@@ -60,19 +76,6 @@ void dbgprint(TCHAR *format,...)
 	va_end(va);
 }
 
-#define MYWNDCLASS _T("CTLPANELCLASS")
-HWND hListView;
-
-typedef LONG  (CALLBACK *CPLAPPLETFUNC)(HWND hwndCPL, UINT uMsg, LPARAM lParam1, LPARAM lParam2);
-
-typedef struct CPLLISTENTRY{
-	TCHAR pszPath[MAX_PATH];
-	HMODULE hDLL;
-	CPLAPPLETFUNC pFunc;
-	CPLINFO CPLInfo;
-	int nIndex;
-} CPLLISTENTRY;
-
 void PopulateCPLList(HWND hLisCtrl)
 {
 	WIN32_FIND_DATA fd;
@@ -99,7 +102,7 @@ void PopulateCPLList(HWND hLisCtrl)
 
 		pEntry->hDLL = LoadLibrary(pEntry->pszPath);
 		CTL_DEBUG((_T("Handle %08X\r\n"),pEntry->hDLL));
-		pEntry->pFunc = (CPLAPPLETFUNC)GetProcAddress(pEntry->hDLL,_T("CPlApplet"));
+		pEntry->pFunc = (CPLAPPLETFUNC)GetProcAddress(pEntry->hDLL,"CPlApplet");
 		CTL_DEBUG((_T("CPLFunc %08X\r\n"),pEntry->pFunc));
 		if(pEntry->pFunc && pEntry->pFunc(hLisCtrl,CPL_INIT,0,0))
 		{
@@ -119,7 +122,6 @@ void PopulateCPLList(HWND hLisCtrl)
 				LoadString(pEntry->hDLL,pEntry->CPLInfo.idName,Name,MAX_PATH);
 				if(_tcslen(Name))
 				{
-				
 				LV_ITEM lvi;
 
 				memset(&lvi,0x00,sizeof(lvi));
@@ -149,41 +151,41 @@ LRESULT CALLBACK MyWindowProc(HWND hWnd,UINT uMsg,WPARAM wParam,LPARAM lParam)
 	switch(uMsg)
 	{
 	case WM_CREATE:
-		{		
+		{
 		RECT rect;
 		LV_COLUMN column;
 		GetClientRect(hWnd,&rect);
-		hListView = CreateWindow(WC_LISTVIEW,_T(""),LVS_REPORT | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL   | WS_VISIBLE | WS_CHILD|WS_BORDER|WS_TABSTOP,0,0,rect.right ,rect.bottom,hWnd,NULL,hInst,0);
+		hListView = CreateWindow(WC_LISTVIEW,_T(""),LVS_REPORT | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_VISIBLE | WS_CHILD | WS_TABSTOP,0,0,rect.right ,rect.bottom,hWnd,NULL,hInst,0);
 		CTL_DEBUG((_T("Listview Window %08X\r\n"),hListView));
 
 		memset(&column,0x00,sizeof(column));
 		column.mask=LVCF_FMT | LVCF_WIDTH | LVCF_SUBITEM|LVCF_TEXT;
 		column.fmt=LVCFMT_LEFT;
-		column.cx = 200;
+		column.cx = (rect.right - rect.left) / 3;
 		column.iSubItem = 0;
 		column.pszText = _T("Name");
 		ListView_InsertColumn(hListView,0,&column);
-		column.cx = 200;
+		column.cx = (rect.right - rect.left) - ((rect.right - rect.left) / 3) - 1;
 		column.iSubItem = 1;
 		column.pszText = _T("Comment");
 		ListView_InsertColumn(hListView,1,&column);
 		PopulateCPLList(hListView);
 		ListView_SetColumnWidth(hListView,2,LVSCW_AUTOSIZE_USEHEADER);
-	    ListView_Update(hListView,0);
+		ListView_Update(hListView,0);
 		}
 		break;
 	case WM_DESTROY:
-		PostQuitMessage(0);	
+		PostQuitMessage(0);
 		break;
 	case WM_SIZE:
-		{		
+		{
 		RECT rect;
 		GetClientRect(hWnd,&rect);
 		MoveWindow(hListView,0,0,rect.right,rect.bottom,TRUE);
 		}
 		break;
 	case WM_NOTIFY:
-		{		
+		{
 		NMHDR *phdr;
 		phdr = (NMHDR*)lParam;
 		switch(phdr->code)
@@ -193,7 +195,7 @@ LRESULT CALLBACK MyWindowProc(HWND hWnd,UINT uMsg,WPARAM wParam,LPARAM lParam)
 			int nSelect;
 			LV_ITEM lvi;
 			CPLLISTENTRY *pEntry;
-			nSelect=SendMessage(hListView,LVM_GETNEXTITEM,(WPARAM)-1,LVNI_FOCUSED); 
+			nSelect=SendMessage(hListView,LVM_GETNEXTITEM,(WPARAM)-1,LVNI_FOCUSED);
 			
 			if(nSelect==-1) // no items
 			{
@@ -262,7 +264,7 @@ int WINAPI WinMain(HINSTANCE hInstance,HINSTANCE hPrevInstance,char *lpCmdLine,i
 	wc.lpfnWndProc = MyWindowProc;
 	RegisterClass(&wc);
 	InitCommonControls();
-	hMainWnd = CreateWindow(MYWNDCLASS,_T("Control Panel"),WS_OVERLAPPEDWINDOW,300,300,500,300,NULL,LoadMenu(hInst,MAKEINTRESOURCE(IDM_MAINMENU)),hInst,0);
+	hMainWnd = CreateWindowEx(WS_EX_CLIENTEDGE,MYWNDCLASS,_T("Control Panel"),WS_OVERLAPPEDWINDOW,CW_USEDEFAULT,CW_USEDEFAULT,CW_USEDEFAULT,CW_USEDEFAULT,NULL,LoadMenu(hInst,MAKEINTRESOURCE(IDM_MAINMENU)),hInst,0);
 	if(!hMainWnd) {
 		CTL_DEBUG((_T("Unable to create window\r\n")));
 		return -1;

From a630cd560f96fe4bf6c0d5230651fa96b75e7498 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Mon, 28 Jun 2004 15:53:17 +0000
Subject: [PATCH 117/356] - Fixed implementation of PALOBJ_cGetColors. -
 Cleaned up IntEngCreateXlate and XLATEOBJ_iXlate a bit and fixed some cases
 (Indexed -> Bitfields/BGR, Bitfields/BGR -> Indexed). - Removed simple color
 cache from ClosestColorMatch, because it wasn't thread safe and would return
 bogus values when more XLATEOBJs are used at once.

svn path=/trunk/; revision=9914
---
 reactos/subsys/win32k/eng/palette.c |  55 ++---
 reactos/subsys/win32k/eng/xlate.c   | 342 +++++++++++-----------------
 2 files changed, 160 insertions(+), 237 deletions(-)

diff --git a/reactos/subsys/win32k/eng/palette.c b/reactos/subsys/win32k/eng/palette.c
index e3330a4f486..f60ac6f72d1 100644
--- a/reactos/subsys/win32k/eng/palette.c
+++ b/reactos/subsys/win32k/eng/palette.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: palette.c,v 1.21 2004/05/10 17:07:17 weiden Exp $
+/* $Id: palette.c,v 1.22 2004/06/28 15:53:17 navaraf Exp $
  * 
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -32,22 +32,18 @@
  * @implemented
  */
 HPALETTE STDCALL
-EngCreatePalette(ULONG Mode,
-		 ULONG NumColors,
-		 ULONG *Colors,
-		 ULONG Red,
-		 ULONG Green,
-		 ULONG Blue)
+EngCreatePalette(ULONG Mode, ULONG NumColors, ULONG *Colors,
+                 ULONG Red, ULONG Green, ULONG Blue)
 {
-  HPALETTE Palette;
+   HPALETTE Palette;
 
-  Palette = PALETTE_AllocPalette(Mode, NumColors, Colors, Red, Green, Blue);
-  if (NULL != Palette)
-    {
+   Palette = PALETTE_AllocPalette(Mode, NumColors, Colors, Red, Green, Blue);
+   if (Palette != NULL)
+   {
       GDIOBJ_SetOwnership(Palette, NULL);
-    }
+   }
 
-  return Palette;
+   return Palette;
 }
 
 /*
@@ -56,34 +52,31 @@ EngCreatePalette(ULONG Mode,
 BOOL STDCALL
 EngDeletePalette(IN HPALETTE Palette)
 {
-  GDIOBJ_SetOwnership(Palette, PsGetCurrentProcess());
+   GDIOBJ_SetOwnership(Palette, PsGetCurrentProcess());
 
-  return PALETTE_FreePalette(Palette);
+   return PALETTE_FreePalette(Palette);
 }
 
 /*
  * @implemented
  */
 ULONG STDCALL
-PALOBJ_cGetColors(PALOBJ *PalObj,
-		  ULONG Start,
-		  ULONG Colors,
-		  ULONG *PaletteEntry)
+PALOBJ_cGetColors(PALOBJ *PalObj, ULONG Start, ULONG Colors, ULONG *PaletteEntry)
 {
-  ULONG i;
-  PALGDI *PalGDI;
+   PALGDI *PalGDI;
 
-  PalGDI = (PALGDI*)PalObj;
-  //PalGDI = (PALGDI*)AccessInternalObjectFromUserObject(PalObj);
+   PalGDI = (PALGDI*)PalObj;
+   /* PalGDI = (PALGDI*)AccessInternalObjectFromUserObject(PalObj); */
 
-  for(i=Start; i<Colors; i++)
-  {
-    PaletteEntry[i] = RGB(
-      PalGDI->IndexedColors[i].peRed,
-      PalGDI->IndexedColors[i].peGreen,
-      PalGDI->IndexedColors[i].peBlue);
-  }
+   if (Start >= PalGDI->NumColors)
+      return 0;
 
-  return Colors;
+   Colors = min(Colors, PalGDI->NumColors - Start);
+
+   /* NOTE: PaletteEntry ULONGs are in the same order as PALETTEENTRY. */
+   RtlCopyMemory(PaletteEntry, PalGDI->IndexedColors + Start, sizeof(ULONG) * Colors);
+
+   return Colors;
 }
+
 /* EOF */
diff --git a/reactos/subsys/win32k/eng/xlate.c b/reactos/subsys/win32k/eng/xlate.c
index 1c9b951e40e..fe860f22fea 100644
--- a/reactos/subsys/win32k/eng/xlate.c
+++ b/reactos/subsys/win32k/eng/xlate.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: xlate.c,v 1.35 2004/05/30 14:01:12 weiden Exp $
+/* $Id: xlate.c,v 1.36 2004/06/28 15:53:17 navaraf Exp $
  * 
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -30,8 +30,6 @@
 
 // TODO: Cache XLATEOBJs that are created by EngCreateXlate by checking if the given palettes match a cached list
 
-ULONG CCMLastSourceColor = 0, CCMLastColorMatch = 0;
-
 static ULONG FASTCALL ShiftAndMask(XLATEGDI *XlateGDI, ULONG Color)
 {
   ULONG TranslatedColor;
@@ -72,14 +70,6 @@ ClosestColorMatch(XLATEGDI *XlateGDI, ULONG SourceColor,
   ULONG SourceRed, SourceGreen, SourceBlue;
   ULONG cxRed, cxGreen, cxBlue, rt, BestMatch = 16777215;
 
-  // Simple cache -- only one value because we don't want to waste time
-  // if the colors aren't very sequential
-
-  if(SourceColor == CCMLastSourceColor)
-  {
-    return CCMLastColorMatch;
-  }
-
   if (PAL_BITFIELDS == XlateGDI->XlateObj.iSrcType || PAL_BGR == XlateGDI->XlateObj.iSrcType)
     {
       /* FIXME: must use bitfields */
@@ -112,9 +102,6 @@ ClosestColorMatch(XLATEGDI *XlateGDI, ULONG SourceColor,
     }
   }
 
-  CCMLastSourceColor = SourceColor;
-  CCMLastColorMatch  = idx;
-
   return idx;
 }
 
@@ -141,6 +128,10 @@ static VOID STDCALL
 BitMasksFromPal(USHORT PalType, PPALGDI Palette,
                             PULONG RedMask, PULONG BlueMask, PULONG GreenMask)
 {
+  static const union { PALETTEENTRY Color; ULONG Mask; } Red = {{255, 0, 0}};
+  static const union { PALETTEENTRY Color; ULONG Mask; } Green = {{0, 255, 0}};
+  static const union { PALETTEENTRY Color; ULONG Mask; } Blue = {{0, 0, 255}};
+
   switch(PalType)
   {
     case PAL_RGB:
@@ -155,8 +146,13 @@ BitMasksFromPal(USHORT PalType, PPALGDI Palette,
       break;
     case PAL_BITFIELDS:
       *RedMask = Palette->RedMask;
-      *BlueMask = Palette->BlueMask;
       *GreenMask = Palette->GreenMask;
+      *BlueMask = Palette->BlueMask;
+      break;
+    case PAL_INDEXED:
+      *RedMask = Red.Mask;
+      *GreenMask = Green.Mask;
+      *BlueMask = Blue.Mask;
       break;
   }
 }
@@ -201,185 +197,121 @@ VOID FASTCALL EngDeleteXlate(XLATEOBJ *XlateObj)
   FreeGDIHandle((ULONG)HXlate);
 }
 
-XLATEOBJ * STDCALL IntEngCreateXlate(USHORT DestPalType, USHORT SourcePalType,
-                            HPALETTE PaletteDest, HPALETTE PaletteSource)
+XLATEOBJ* STDCALL
+IntEngCreateXlate(USHORT DestPalType, USHORT SourcePalType,
+                  HPALETTE PaletteDest, HPALETTE PaletteSource)
 {
-  // FIXME: Add support for BGR conversions
+   ULONG NewXlate;
+   XLATEOBJ *XlateObj;
+   XLATEGDI *XlateGDI;
+   PALGDI *SourcePalGDI = 0;
+   PALGDI *DestPalGDI = 0;
+   ULONG SourceRedMask, SourceGreenMask, SourceBlueMask;
+   ULONG DestRedMask, DestGreenMask, DestBlueMask;
+   ULONG i;
 
-  HPALETTE NewXlate;
-  XLATEOBJ *XlateObj;
-  XLATEGDI *XlateGDI;
-  PALGDI   *SourcePalGDI, *DestPalGDI;
-  ULONG    IndexedColors;
-  ULONG    SourceRedMask, SourceGreenMask, SourceBlueMask;
-  ULONG    DestRedMask, DestGreenMask, DestBlueMask;
-  UINT     i;
+   NewXlate = CreateGDIHandle(sizeof(XLATEGDI), sizeof(XLATEOBJ), (PVOID*)&XlateGDI, (PVOID*)&XlateObj);
+   if (!ValidEngHandle(NewXlate))
+      return NULL;
 
-  NewXlate = (HPALETTE)CreateGDIHandle(sizeof( XLATEGDI ), sizeof( XLATEOBJ ), (PVOID*)&XlateGDI, (PVOID*)&XlateObj);
-  if ( !ValidEngHandle ( NewXlate ) )
-    return NULL;
+   if (PaletteSource != NULL)
+      SourcePalGDI = PALETTE_LockPalette(PaletteSource);
+   if (PaletteDest == PaletteSource)
+      DestPalGDI = SourcePalGDI;
+   else if (PaletteDest != NULL)
+      DestPalGDI = PALETTE_LockPalette(PaletteDest);
 
-  if (NULL != PaletteSource)
-  {
-    SourcePalGDI = PALETTE_LockPalette(PaletteSource);
-  }
-  if (PaletteDest == PaletteSource)
-  {
-    DestPalGDI = SourcePalGDI;
-  }
-  else if (NULL != PaletteDest)
-  {
-    DestPalGDI = PALETTE_LockPalette(PaletteDest);
-  }
+   XlateObj->iSrcType = SourcePalType;
+   XlateObj->iDstType = DestPalType;
+   XlateObj->flXlate = 0;
 
-  XlateObj->iSrcType = SourcePalType;
-  XlateObj->iDstType = DestPalType;
+   /* Store handles of palettes in internal Xlate GDI object (or NULLs) */
+   XlateGDI->SourcePal = PaletteSource;
+   XlateGDI->DestPal = PaletteDest;
 
-  // Store handles of palettes in internal Xlate GDI object (or NULLs)
-  XlateGDI->DestPal   = PaletteDest;
-  XlateGDI->SourcePal = PaletteSource;
+   XlateGDI->UseShiftAndMask = FALSE;
 
-  XlateObj->flXlate = 0;
+   /*
+    * Compute bit fiddeling constants unless both palettes are indexed, then
+    * we don't need them.
+    */
+   if (SourcePalType != PAL_INDEXED || DestPalType != PAL_INDEXED)
+   {
+      BitMasksFromPal(SourcePalType, SourcePalGDI, &SourceRedMask,
+                      &SourceBlueMask, &SourceGreenMask);
+      BitMasksFromPal(DestPalType, DestPalGDI, &DestRedMask,
+                      &DestBlueMask, &DestGreenMask);
+      XlateGDI->RedShift = CalculateShift(SourceRedMask) - CalculateShift(DestRedMask);
+      XlateGDI->RedMask = DestRedMask;
+      XlateGDI->GreenShift = CalculateShift(SourceGreenMask) - CalculateShift(DestGreenMask);
+      XlateGDI->GreenMask = DestGreenMask;
+      XlateGDI->BlueShift = CalculateShift(SourceBlueMask) - CalculateShift(DestBlueMask);
+      XlateGDI->BlueMask = DestBlueMask;
+   }
 
-  XlateGDI->UseShiftAndMask = FALSE;
-
-  /* Compute bit fiddeling constants unless both palettes are indexed, then we don't need them */
-  if (PAL_INDEXED != SourcePalType || PAL_INDEXED != DestPalType)
-  {
-    BitMasksFromPal(PAL_INDEXED == SourcePalType ? PAL_RGB : SourcePalType,
-                    SourcePalGDI, &SourceRedMask, &SourceBlueMask, &SourceGreenMask);
-    BitMasksFromPal(PAL_INDEXED == DestPalType ? PAL_RGB : DestPalType,
-                    DestPalGDI, &DestRedMask, &DestBlueMask, &DestGreenMask);
-    XlateGDI->RedShift = CalculateShift(SourceRedMask) - CalculateShift(DestRedMask);
-    XlateGDI->RedMask = DestRedMask;
-    XlateGDI->GreenShift = CalculateShift(SourceGreenMask) - CalculateShift(DestGreenMask);
-    XlateGDI->GreenMask = DestGreenMask;
-    XlateGDI->BlueShift = CalculateShift(SourceBlueMask) - CalculateShift(DestBlueMask);
-    XlateGDI->BlueMask = DestBlueMask;
-  }
-
-  // If source and destination palettes are the same or if they're RGB/BGR
-  if( (PaletteDest == PaletteSource) ||
-      ((DestPalType == PAL_RGB) && (SourcePalType == PAL_RGB)) ||
-      ((DestPalType == PAL_BGR) && (SourcePalType == PAL_BGR)) )
-  {
-    XlateObj->flXlate |= XO_TRIVIAL;
-    if (NULL != PaletteSource)
-    {
-      PALETTE_UnlockPalette(PaletteSource);
-    }
-    if (NULL != PaletteDest && PaletteDest != PaletteSource)
-    {
-      PALETTE_UnlockPalette(PaletteDest);
-    }
-    return XlateObj;
-  }
-
-  /* If source and destination are bitfield based (RGB and BGR are just special bitfields) */
-  if ((PAL_RGB == DestPalType || PAL_BGR == DestPalType || PAL_BITFIELDS == DestPalType) &&
-      (PAL_RGB == SourcePalType || PAL_BGR == SourcePalType || PAL_BITFIELDS == SourcePalType))
-  {
-    if (SourceRedMask == DestRedMask &&
-        SourceBlueMask == DestBlueMask &&
-        SourceGreenMask == DestGreenMask)
-      {
+   /* If source and destination palettes are the same or if they're RGB/BGR */
+   if (PaletteDest == PaletteSource ||
+       (DestPalType == PAL_RGB && SourcePalType == PAL_RGB) ||
+       (DestPalType == PAL_BGR && SourcePalType == PAL_BGR))
+   {
       XlateObj->flXlate |= XO_TRIVIAL;
-      }
-    XlateGDI->UseShiftAndMask = TRUE;
-    if (NULL != PaletteSource)
-    {
-      PALETTE_UnlockPalette(PaletteSource);
-    }
-    if (NULL != PaletteDest && PaletteDest != PaletteSource)
-    {
-      PALETTE_UnlockPalette(PaletteDest);
-    }
-    return XlateObj;
-  }
+      goto end;
+   }
 
-  // Prepare the translation table
-  if (PAL_INDEXED == SourcePalType || PAL_RGB == SourcePalType || PAL_BGR == SourcePalType)
-  {
-    XlateObj->flXlate |= XO_TABLE;
-    if ((SourcePalType == PAL_INDEXED) && (DestPalType == PAL_INDEXED))
-    {
-      if(SourcePalGDI->NumColors > DestPalGDI->NumColors)
+   /*
+    * If source and destination are bitfield based (RGB and BGR are just
+    * special bitfields) we can use simple shifting.
+    */
+   if ((DestPalType == PAL_RGB || DestPalType == PAL_BGR ||
+        DestPalType == PAL_BITFIELDS) &&
+       (SourcePalType == PAL_RGB || SourcePalType == PAL_BGR ||
+        SourcePalType == PAL_BITFIELDS))
+   {
+      if (SourceRedMask == DestRedMask &&
+          SourceBlueMask == DestBlueMask &&
+          SourceGreenMask == DestGreenMask)
       {
-        IndexedColors = SourcePalGDI->NumColors;
-      } else
-        IndexedColors = DestPalGDI->NumColors;
-    }
-    else if (SourcePalType == PAL_INDEXED) { IndexedColors = SourcePalGDI->NumColors; }
-    else if (DestPalType   == PAL_INDEXED) { IndexedColors = DestPalGDI->NumColors; }
-
-    XlateGDI->translationTable = EngAllocMem(FL_ZERO_MEMORY, sizeof(ULONG)*IndexedColors, 0);
-    if (NULL == XlateGDI->translationTable)
-      {
-	if (NULL != PaletteSource)
-	  {
-	    PALETTE_UnlockPalette(PaletteSource);
-	  }
-	if (NULL != PaletteDest && PaletteDest != PaletteSource)
-	  {
-	    PALETTE_UnlockPalette(PaletteDest);
-	  }
-	EngDeleteXlate(XlateObj);
-	return NULL;
+         XlateObj->flXlate |= XO_TRIVIAL;
       }
-  }
+      XlateGDI->UseShiftAndMask = TRUE;
+      goto end;
+   }
 
-  // Source palette is indexed
-  if(XlateObj->iSrcType == PAL_INDEXED)
-  {
-    if(XlateObj->iDstType == PAL_INDEXED)
-    {
-      // Converting from indexed to indexed
+   /* Indexed -> Indexed */
+   if (SourcePalType == PAL_INDEXED && DestPalType == PAL_INDEXED)
+   {
+      XlateGDI->translationTable = 
+         EngAllocMem(0, sizeof(ULONG) * SourcePalGDI->NumColors, 0);
       IndexedToIndexedTranslationTable(XlateGDI, XlateGDI->translationTable, DestPalGDI, SourcePalGDI);
-    } else
-      if (PAL_RGB == XlateObj->iDstType || PAL_BITFIELDS == XlateObj->iDstType )
-      {
-        // FIXME: Is this necessary? I think the driver has to call this
-        // function anyways if pulXlate is NULL and Source is PAL_INDEXED
+      XlateObj->flXlate |= XO_TABLE;
+      XlateObj->pulXlate = XlateGDI->translationTable;
+      goto end;
+   }
 
-        // Converting from indexed to RGB
+   /* Indexed -> Bitfields/RGB/BGR */
+   if (SourcePalType == PAL_INDEXED)
+   {
+      XlateGDI->translationTable = 
+         EngAllocMem(0, sizeof(ULONG) * SourcePalGDI->NumColors, 0);
+      for (i = 0; i < SourcePalGDI->NumColors; i++)
+         XlateGDI->translationTable[i] =
+            ShiftAndMask(XlateGDI, *((ULONG *)&SourcePalGDI->IndexedColors[i]));
+      XlateObj->flXlate |= XO_TABLE;
+      XlateObj->pulXlate = XlateGDI->translationTable;
+      goto end;
+   }
 
-	RtlCopyMemory(XlateGDI->translationTable, SourcePalGDI->IndexedColors, sizeof(ULONG) * SourcePalGDI->NumColors);
-	if (PAL_BITFIELDS == XlateObj->iDstType)
-	{
-	  for (i = 0; i < SourcePalGDI->NumColors; i++)
-	  {
-	  XlateGDI->translationTable[i] = ShiftAndMask(XlateGDI, XlateGDI->translationTable[i]);
-	  }
-	}
-      }
+   /*
+    * Last case: Bitfields/RGB/BGR -> Indexed
+    * isn't handled here yet and all the logic is in XLATEOBJ_iXlate now.
+    */
 
-    XlateObj->pulXlate = XlateGDI->translationTable;
-  }
-
-  // Source palette is RGB
-  if (PAL_RGB == XlateObj->iSrcType || PAL_BGR == XlateObj->iSrcType)
-  {
-    if(PAL_INDEXED == XlateObj->iDstType)
-    {
-      // FIXME: Is this necessary? I think the driver has to call this
-      // function anyways if pulXlate is NULL and Dest is PAL_INDEXED
-
-      // Converting from RGB to indexed
-      RtlCopyMemory(XlateGDI->translationTable, DestPalGDI->IndexedColors, sizeof(ULONG) * DestPalGDI->NumColors);
-    }
-  }
-
-  // FIXME: Add support for XO_TO_MONO
-  if (NULL != PaletteSource)
-  {
-    PALETTE_UnlockPalette(PaletteSource);
-  }
-  if (NULL != PaletteDest && PaletteDest != PaletteSource)
-  {
-    PALETTE_UnlockPalette(PaletteDest);
-  }
-
-  return XlateObj;
+end:
+   if (PaletteSource != NULL)
+      PALETTE_UnlockPalette(PaletteSource);
+   if (PaletteDest != NULL && PaletteDest != PaletteSource)
+      PALETTE_UnlockPalette(PaletteDest);
+   return XlateObj;
 }
 
 XLATEOBJ * STDCALL IntEngCreateMonoXlate(
@@ -458,6 +390,7 @@ XLATEOBJ_piVector(XLATEOBJ *XlateObj)
 ULONG STDCALL
 XLATEOBJ_iXlate(XLATEOBJ *XlateObj, ULONG Color)
 {
+   XLATEGDI *XlateGDI;
    PALGDI *PalGDI;
    ULONG Closest;
 
@@ -466,41 +399,38 @@ XLATEOBJ_iXlate(XLATEOBJ *XlateObj, ULONG Color)
       return Color;
 
    if (XlateObj->flXlate & XO_TRIVIAL)
-   {
       return Color;
-   } else
+
+   if (XlateObj->flXlate & XO_TABLE)
+      return XlateObj->pulXlate[Color];         
+
+   XlateGDI = (XLATEGDI *)AccessInternalObjectFromUserObject(XlateObj);
+
+   if (XlateObj->flXlate & XO_TO_MONO)
+      return Color == XlateGDI->BackgroundColor;
+
+   if (XlateGDI->UseShiftAndMask)
+      return ShiftAndMask(XlateGDI, Color);
+
+   if (XlateObj->iSrcType == PAL_RGB || XlateObj->iSrcType == PAL_BGR ||
+       XlateObj->iSrcType == PAL_BITFIELDS)
    {
-      XLATEGDI *XlateGDI = (XLATEGDI *)AccessInternalObjectFromUserObject(XlateObj);
+      /* FIXME: should we cache colors used often? */
+      /* FIXME: won't work if destination isn't indexed */
 
-      if (XlateObj->flXlate & XO_TO_MONO)
-      {
-         return Color == XlateGDI->BackgroundColor;
-      } else
-      if (XlateGDI->UseShiftAndMask)
-      {
-         return ShiftAndMask(XlateGDI, Color);
-      } else
-      if (XlateObj->iSrcType == PAL_RGB || XlateObj->iSrcType == PAL_BGR ||
-          XlateObj->iSrcType == PAL_BITFIELDS)
-      {
-         /* FIXME: should we cache colors used often? */
-         /* FIXME: won't work if destination isn't indexed */
+      /* Extract the destination palette. */
+      PalGDI = PALETTE_LockPalette(XlateGDI->DestPal);
 
-         /* Extract the destination palette. */
-         PalGDI = PALETTE_LockPalette(XlateGDI->DestPal);
+      /* Convert the source color to the palette RGB format. */
+      Color = ShiftAndMask(XlateGDI, Color);
 
-         /* Return closest match for the given color. */
-         Closest = ClosestColorMatch(XlateGDI, Color, PalGDI->IndexedColors, PalGDI->NumColors);
-         PALETTE_UnlockPalette(XlateGDI->DestPal);
-         return Closest;
-      } else
-      if (XlateObj->iSrcType == PAL_INDEXED)
-      {
-         return XlateGDI->translationTable[Color];
-      }
-  }
+      /* Return closest match for the given color. */
+      Closest = ClosestColorMatch(XlateGDI, Color, PalGDI->IndexedColors, PalGDI->NumColors);
+      PALETTE_UnlockPalette(XlateGDI->DestPal);
+      return Closest;
+   }
 
-  return 0;
+   return 0;
 }
 
 /*

From f2e5d4cd25fdc9ce58d517461cdb29e6cea4a844 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Mon, 28 Jun 2004 17:03:35 +0000
Subject: [PATCH 118/356] - Fixed more color handling issues (mostly incorrect
 RGB <-> BGR swapping).

svn path=/trunk/; revision=9915
---
 reactos/subsys/win32k/eng/xlate.c       |  6 ++---
 reactos/subsys/win32k/objects/bitmaps.c |  5 ++--
 reactos/subsys/win32k/objects/color.c   | 34 +++++--------------------
 reactos/subsys/win32k/objects/dc.c      | 19 +++-----------
 reactos/subsys/win32k/objects/dib.c     | 31 +++-------------------
 5 files changed, 20 insertions(+), 75 deletions(-)

diff --git a/reactos/subsys/win32k/eng/xlate.c b/reactos/subsys/win32k/eng/xlate.c
index fe860f22fea..9b60b2abaed 100644
--- a/reactos/subsys/win32k/eng/xlate.c
+++ b/reactos/subsys/win32k/eng/xlate.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: xlate.c,v 1.36 2004/06/28 15:53:17 navaraf Exp $
+/* $Id: xlate.c,v 1.37 2004/06/28 17:03:35 navaraf Exp $
  * 
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -342,10 +342,10 @@ XLATEOBJ * STDCALL IntEngCreateMonoXlate(
          XlateGDI->BackgroundColor = NtGdiGetNearestPaletteIndex(
             PaletteSource, BackgroundColor);
          break;
-      case PAL_RGB:
+      case PAL_BGR:
          XlateGDI->BackgroundColor = BackgroundColor;
          break;
-      case PAL_BGR:
+      case PAL_RGB:
          XlateGDI->BackgroundColor =
             ((BackgroundColor & 0xFF) << 16) |
             ((BackgroundColor & 0xFF0000) >> 16) |
diff --git a/reactos/subsys/win32k/objects/bitmaps.c b/reactos/subsys/win32k/objects/bitmaps.c
index b897f7dfd25..003815b6471 100644
--- a/reactos/subsys/win32k/objects/bitmaps.c
+++ b/reactos/subsys/win32k/objects/bitmaps.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: bitmaps.c,v 1.74 2004/06/20 00:45:37 navaraf Exp $ */
+/* $Id: bitmaps.c,v 1.75 2004/06/28 17:03:35 navaraf Exp $ */
 #include <w32k.h>
 
 #define IN_RECT(r,x,y) \
@@ -193,7 +193,7 @@ NtGdiBitBlt(
 
 		Colors[0] = DCSrc->w.textColor;
 		Colors[1] = DCSrc->w.backgroundColor;
-		Mono = EngCreatePalette(PAL_INDEXED, 2, Colors, 0, 0, 0);
+		Mono = PALETTE_AllocPaletteIndexedRGB(2, (RGBQUAD*)Colors);
 		if (NULL != Mono)
 		{
 			XlateObj = (XLATEOBJ*)IntEngCreateXlate(DestMode, PAL_INDEXED, DestPalette, Mono);
@@ -630,6 +630,7 @@ NtGdiGetPixel(HDC hDC, INT XPos, INT YPos)
 				PalMode = PalGDI->Mode;
 				PALETTE_UnlockPalette(Pal);
 
+				/* FIXME: Verify if it shouldn't be PAL_BGR! */
 				XlateObj = (XLATEOBJ*)IntEngCreateXlate ( PAL_RGB, PalMode, NULL, Pal );
 				if ( XlateObj )
 				{
diff --git a/reactos/subsys/win32k/objects/color.c b/reactos/subsys/win32k/objects/color.c
index 0e53f752d98..2fbbfcbe751 100644
--- a/reactos/subsys/win32k/objects/color.c
+++ b/reactos/subsys/win32k/objects/color.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: color.c,v 1.43 2004/06/23 15:30:20 weiden Exp $ */
+/* $Id: color.c,v 1.44 2004/06/28 17:03:35 navaraf Exp $ */
 #include <w32k.h>
 
 // FIXME: Use PXLATEOBJ logicalToSystem instead of int *mapping
@@ -200,7 +200,7 @@ UINT STDCALL NtGdiGetNearestPaletteIndex(HPALETTE  hpal,
   if (NULL != palGDI)
     {
       /* Return closest match for the given RGB color */
-      index = COLOR_PaletteLookupPixel((LPPALETTEENTRY)palGDI->IndexedColors, palGDI->NumColors, NULL, Color, FALSE);
+      index = COLOR_PaletteLookupPixel(palGDI->IndexedColors, palGDI->NumColors, NULL, Color, FALSE);
       PALETTE_UnlockPalette(hpal);
     }
 
@@ -233,7 +233,7 @@ UINT STDCALL NtGdiGetPaletteEntries(HPALETTE  hpal,
 	  PALETTE_UnlockPalette(hpal);
 	  return 0;
 	}
-      memcpy(pe, &palGDI->IndexedColors[StartIndex], Entries * sizeof(PALETTEENTRY));
+      memcpy(pe, palGDI->IndexedColors + StartIndex, Entries * sizeof(PALETTEENTRY));
       for (numEntries = 0; numEntries < Entries; numEntries++)
 	{
 	  if (pe[numEntries].peFlags & 0xF0)
@@ -493,7 +493,7 @@ UINT STDCALL NtGdiSetPaletteEntries(HPALETTE  hpal,
     {
       Entries = numEntries - Start;
     }
-  memcpy(&palGDI->IndexedColors[Start], pe, Entries * sizeof(PALETTEENTRY));
+  memcpy(palGDI->IndexedColors + Start, pe, Entries * sizeof(PALETTEENTRY));
   PALETTE_ValidateFlags(palGDI->IndexedColors, palGDI->NumColors);
   ExFreePool(palGDI->logicalToSystem);
   palGDI->logicalToSystem = NULL;
@@ -536,8 +536,10 @@ INT STDCALL COLOR_PaletteLookupPixel(PALETTEENTRY *palPalEntry, INT size,
 
   for( i = 0; i < size && diff ; i++ )
   {
+#if 0
     if(!(palPalEntry[i].peFlags & PC_SYS_USED) || (skipReserved && palPalEntry[i].peFlags  & PC_SYS_RESERVED))
       continue;
+#endif
 
     r = palPalEntry[i].peRed - GetRValue(col);
     g = palPalEntry[i].peGreen - GetGValue(col);
@@ -556,7 +558,6 @@ INT STDCALL COLOR_PaletteLookupPixel(PALETTEENTRY *palPalEntry, INT size,
 
 COLORREF STDCALL COLOR_LookupNearestColor( PALETTEENTRY* palPalEntry, int size, COLORREF color )
 {
-#if 1
    INT index;
 
    index = COLOR_PaletteLookupPixel(palPalEntry, size, NULL, color, FALSE);
@@ -564,29 +565,6 @@ COLORREF STDCALL COLOR_LookupNearestColor( PALETTEENTRY* palPalEntry, int size,
       palPalEntry[index].peRed,
       palPalEntry[index].peGreen,
       palPalEntry[index].peBlue);
-#else
-  unsigned char spec_type = color >> 24;
-  int i;
-  PALETTEENTRY *COLOR_sysPal = (PALETTEENTRY*)ReturnSystemPalette();
-
-  // we need logical palette for PALETTERGB and PALETTEINDEX colorrefs
-
-  if( spec_type == 2 ) /* PALETTERGB */
-    color = *(COLORREF*)(palPalEntry + COLOR_PaletteLookupPixel(palPalEntry,size,NULL,color,FALSE));
-
-  else if( spec_type == 1 ) /* PALETTEINDEX */
-  {
-    if( (i = color & 0x0000ffff) >= size )
-    {
-      DbgPrint("RGB(%lx) : idx %d is out of bounds, assuming NULL\n", color, i);
-      color = *(COLORREF*)palPalEntry;
-    }
-    else color = *(COLORREF*)(palPalEntry + i);
-  }
-
-  color &= 0x00ffffff;
-  return (0x00ffffff & *(COLORREF*)(COLOR_sysPal + COLOR_PaletteLookupPixel(COLOR_sysPal, 256, NULL, color, FALSE)));
-#endif
 }
 
 int STDCALL COLOR_PaletteLookupExactIndex( PALETTEENTRY* palPalEntry, int size,
diff --git a/reactos/subsys/win32k/objects/dc.c b/reactos/subsys/win32k/objects/dc.c
index 74dfc9ca076..b2d994e29f7 100644
--- a/reactos/subsys/win32k/objects/dc.c
+++ b/reactos/subsys/win32k/objects/dc.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dc.c,v 1.139 2004/06/20 00:45:37 navaraf Exp $
+/* $Id: dc.c,v 1.140 2004/06/28 17:03:35 navaraf Exp $
  *
  * DC.C - Device context functions
  *
@@ -1749,9 +1749,8 @@ NtGdiSelectObject(HDC  hDC, HGDIOBJ  hGDIObj)
   XLATEOBJ *XlateObj;
   PPALGDI PalGDI;
   DWORD objectType;
-  COLORREF *ColorMap;
   COLORREF MonoColorMap[2];
-  ULONG NumColors, Index;
+  ULONG NumColors;
   HRGN hVisRgn;
   USHORT Mode;
 
@@ -1903,17 +1902,7 @@ NtGdiSelectObject(HDC  hDC, HGDIOBJ  hGDIObj)
           if(pb->dib->dsBmih.biBitCount == 1) { NumColors = 2; } else
           if(pb->dib->dsBmih.biBitCount == 4) { NumColors = 16; } else
           if(pb->dib->dsBmih.biBitCount == 8) { NumColors = 256; }
-
-          ColorMap = ExAllocatePoolWithTag(PagedPool, sizeof(COLORREF) * NumColors, TAG_DC);
-          ASSERT(ColorMap);
-          for (Index = 0; Index < NumColors; Index++)
-          {
-            ColorMap[Index] = RGB(pb->ColorMap[Index].rgbRed,
-                                  pb->ColorMap[Index].rgbGreen,
-                                  pb->ColorMap[Index].rgbBlue);
-          }
-          dc->w.hPalette = PALETTE_AllocPalette(PAL_INDEXED, NumColors, (ULONG *) ColorMap, 0, 0, 0);
-          ExFreePool(ColorMap);
+          dc->w.hPalette = PALETTE_AllocPaletteIndexedRGB(NumColors, pb->ColorMap);
         }
         else if ( 16 == pb->dib->dsBmih.biBitCount )
         {
@@ -1931,7 +1920,7 @@ NtGdiSelectObject(HDC  hDC, HGDIOBJ  hGDIObj)
           {
             MonoColorMap[0] = RGB(0, 0, 0);
             MonoColorMap[1] = RGB(255, 255, 255);
-            dc->w.hPalette = PALETTE_AllocPalette(PAL_INDEXED, 2, MonoColorMap, 0, 0, 0);
+            dc->w.hPalette = PALETTE_AllocPaletteIndexedRGB(2, (RGBQUAD*)MonoColorMap);
           }
         else
           {
diff --git a/reactos/subsys/win32k/objects/dib.c b/reactos/subsys/win32k/objects/dib.c
index d966f1c31be..1be558bf67e 100644
--- a/reactos/subsys/win32k/objects/dib.c
+++ b/reactos/subsys/win32k/objects/dib.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dib.c,v 1.53 2004/06/23 07:31:22 gvg Exp $
+ * $Id: dib.c,v 1.54 2004/06/28 17:03:35 navaraf Exp $
  *
  * ReactOS W32 Subsystem
  * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team
@@ -1350,27 +1350,6 @@ DIB_MapPaletteColors(PDC dc, CONST BITMAPINFO* lpbmi)
   return lpRGB;
 }
 
-PPALETTEENTRY STDCALL
-DIBColorTableToPaletteEntries (
-	PPALETTEENTRY palEntries,
-	const RGBQUAD *DIBColorTable,
-	ULONG ColorCount
-	)
-{
-  ULONG i;
-
-  for (i = 0; i < ColorCount; i++)
-    {
-      palEntries->peRed   = DIBColorTable->rgbRed;
-      palEntries->peGreen = DIBColorTable->rgbGreen;
-      palEntries->peBlue  = DIBColorTable->rgbBlue;
-      palEntries++;
-      DIBColorTable++;
-    }
-
-  return palEntries;
-}
-
 HPALETTE FASTCALL
 BuildDIBPalette (PBITMAPINFO bmi, PINT paletteType)
 {
@@ -1407,13 +1386,11 @@ BuildDIBPalette (PBITMAPINFO bmi, PINT paletteType)
 
   if (PAL_INDEXED == *paletteType)
     {
-      palEntries = ExAllocatePoolWithTag(PagedPool, sizeof(PALETTEENTRY)*ColorCount, TAG_COLORMAP);
-      DIBColorTableToPaletteEntries(palEntries, bmi->bmiColors, ColorCount);
+      hPal = PALETTE_AllocPaletteIndexedRGB(ColorCount, (RGBQUAD*)bmi->bmiColors);
     }
-  hPal = PALETTE_AllocPalette( *paletteType, ColorCount, (ULONG*)palEntries, 0, 0, 0 );
-  if (NULL != palEntries)
+  else
     {
-      ExFreePool(palEntries);
+      hPal = PALETTE_AllocPalette( *paletteType, ColorCount, (ULONG*)palEntries, 0, 0, 0 );
     }
 
   return hPal;

From d9f6abff670b701cee5193d07c4024c6beb61d77 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Mon, 28 Jun 2004 17:03:46 +0000
Subject: [PATCH 119/356] - Removed ReactOS specific hack in
 ImageList_DrawIndirect since the color conversions in Win32K are fixed now.

svn path=/trunk/; revision=9916
---
 reactos/lib/comctl32/imagelist.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/reactos/lib/comctl32/imagelist.c b/reactos/lib/comctl32/imagelist.c
index 8ed4b6d0260..d0fff569d6f 100644
--- a/reactos/lib/comctl32/imagelist.c
+++ b/reactos/lib/comctl32/imagelist.c
@@ -1146,13 +1146,11 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp)
     	PatBlt(hBlendMaskDC, 0, 0, cx, cy, PATCOPY);
     	SelectObject(hBlendMaskDC, hOldBrush);
 
-#if 0
     	/* Modify the blend mask if an Image Mask exist */
     	if(himl->hbmMask) {
 	    BitBlt(hBlendMaskDC, 0, 0, cx, cy, hMaskListDC, lx, ly, 0x220326); /* NOTSRCAND */
 	    BitBlt(hBlendMaskDC, 0, 0, cx, cy, hBlendMaskDC, 0, 0, NOTSRCCOPY);
 	}
-#endif
 	
 	/* now apply blend to the current image given the BlendMask */
         if (clrBlend == CLR_DEFAULT) clrBlend = GetSysColor (COLOR_HIGHLIGHT);

From 06b882daa5e57efbad744fa9ac68da2957161e32 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Mon, 28 Jun 2004 19:46:17 +0000
Subject: [PATCH 120/356] - Copied implementation of GetShortPathName[AW] from
 Wine.

svn path=/trunk/; revision=9918
---
 reactos/lib/kernel32/file/dir.c | 152 ++++++++++++++++++++++++++++----
 1 file changed, 133 insertions(+), 19 deletions(-)

diff --git a/reactos/lib/kernel32/file/dir.c b/reactos/lib/kernel32/file/dir.c
index 36b63751ad4..fe69e74ce61 100644
--- a/reactos/lib/kernel32/file/dir.c
+++ b/reactos/lib/kernel32/file/dir.c
@@ -1,4 +1,4 @@
-/* $Id: dir.c,v 1.45 2004/06/02 18:26:57 gvg Exp $
+/* $Id: dir.c,v 1.46 2004/06/28 19:46:17 navaraf Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -433,43 +433,157 @@ GetFullPathNameW (
 
 
 /*
- * @unimplemented
+ * NOTE: Copied from Wine.
+ * @implemented
  */
 DWORD
 STDCALL
 GetShortPathNameA (
-        LPCSTR  lpszLongPath,
-        LPSTR   lpszShortPath,
-        DWORD   cchBuffer
+        LPCSTR  longpath,
+        LPSTR   shortpath,
+        DWORD   shortlen
         )
 {
-        //1 remove unicode chars and spaces
-        //2 remove preceding and trailing periods.
-        //3 remove embedded periods except the last one
-
-        //4 Split the string in two parts before and after the period
-        //      truncate the part before the period to 6 chars and add ~1
-        //      truncate the part after the period to 3 chars
-        //3 Put the new name in uppercase
-
-        //4 Increment the ~1 string if the resulting name allready exists
+    UNICODE_STRING longpathW;
+    WCHAR shortpathW[MAX_PATH];
+    DWORD ret, retW;
 
+    if (!longpath)
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
         return 0;
+    }
+
+    if (!RtlCreateUnicodeStringFromAsciiz(&longpathW, longpath))
+    {
+        SetLastError(ERROR_NOT_ENOUGH_MEMORY);
+        return 0;
+    }
+
+    retW = GetShortPathNameW(longpathW.Buffer, shortpathW, MAX_PATH);
+
+    if (!retW)
+        ret = 0;
+    else if (retW > PATH_MAX)
+    {
+        SetLastError(ERROR_FILENAME_EXCED_RANGE);
+        ret = 0;
+    }
+    else
+    {
+        ret = WideCharToMultiByte(CP_ACP, 0, shortpathW, -1, NULL, 0, NULL, NULL);
+        if (ret <= shortlen)
+        {
+            WideCharToMultiByte(CP_ACP, 0, shortpathW, -1, shortpath, shortlen, NULL, NULL);
+            ret--; /* length without 0 */
+        }
+    }
+
+    RtlFreeUnicodeString(&longpathW);
+    return ret;
 }
 
 
 /*
- * @unimplemented
+ * NOTE: Copied from Wine.
+ * @implemented
  */
 DWORD
 STDCALL
 GetShortPathNameW (
-        LPCWSTR lpszLongPath,
-        LPWSTR  lpszShortPath,
-        DWORD   cchBuffer
+        LPCWSTR longpath,
+        LPWSTR  shortpath,
+        DWORD   shortlen
         )
 {
+    WCHAR               tmpshortpath[PATH_MAX];
+    LPCWSTR             p;
+    DWORD               sp = 0, lp = 0;
+    DWORD               tmplen;
+    WIN32_FIND_DATAW    wfd;
+    HANDLE              goit;
+    UNICODE_STRING      ustr;
+    WCHAR               ustr_buf[8+1+3+1];
+
+    if (!longpath)
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
         return 0;
+    }
+    if (!longpath[0])
+    {
+        SetLastError(ERROR_BAD_PATHNAME);
+        return 0;
+    }
+
+    /* check for drive letter */
+    if (longpath[1] == ':' )
+    {
+        tmpshortpath[0] = longpath[0];
+        tmpshortpath[1] = ':';
+        sp = lp = 2;
+    }
+
+    ustr.Buffer = ustr_buf;
+    ustr.Length = 0;
+    ustr.MaximumLength = sizeof(ustr_buf);
+
+    while (longpath[lp])
+    {
+        /* check for path delimiters and reproduce them */
+        if (longpath[lp] == '\\' || longpath[lp] == '/')
+        {
+            if (!sp || tmpshortpath[sp-1] != '\\')
+            {
+                /* strip double "\\" */
+                tmpshortpath[sp] = '\\';
+                sp++;
+            }
+            tmpshortpath[sp] = 0; /* terminate string */
+            lp++;
+            continue;
+        }
+
+        for (p = longpath + lp; *p && *p != '/' && *p != '\\'; p++);
+        tmplen = p - (longpath + lp);
+        lstrcpynW(tmpshortpath + sp, longpath + lp, tmplen + 1);
+        /* Check, if the current element is a valid dos name */
+        if (tmplen <= 8+1+3+1)
+        {
+            BOOLEAN spaces;
+            memcpy(ustr_buf, longpath + lp, tmplen * sizeof(WCHAR));
+            ustr_buf[tmplen] = '\0';
+            ustr.Length = tmplen * sizeof(WCHAR);
+            if (RtlIsNameLegalDOS8Dot3(&ustr, NULL, &spaces) && !spaces)
+            {
+                sp += tmplen;
+                lp += tmplen;
+                continue;
+            }
+        }
+
+        /* Check if the file exists and use the existing short file name */
+        goit = FindFirstFileW(tmpshortpath, &wfd);
+        if (goit == INVALID_HANDLE_VALUE) goto notfound;
+        FindClose(goit);
+        lstrcpyW(tmpshortpath + sp, wfd.cAlternateFileName);
+        sp += lstrlenW(tmpshortpath + sp);
+        lp += tmplen;
+    }
+    tmpshortpath[sp] = 0;
+
+    tmplen = lstrlenW(tmpshortpath) + 1;
+    if (tmplen <= shortlen)
+    {
+        lstrcpyW(shortpath, tmpshortpath);
+        tmplen--; /* length without 0 */
+    }
+
+    return tmplen;
+
+ notfound:
+    SetLastError ( ERROR_FILE_NOT_FOUND );
+    return 0;
 }
 
 

From d5f50bdad51b945116f2216cafb0a35c0d94e193 Mon Sep 17 00:00:00 2001
From: Martin Fuchs <fuchs.martin@gmail.com>
Date: Mon, 28 Jun 2004 20:38:42 +0000
Subject: [PATCH 121/356] - compatibility to expat version < 1.95.7 - handle
 missing XML encoding parameter

svn path=/trunk/; revision=9919
---
 .../system/explorer/utility/xmlstorage.cpp    |  8 +-
 .../system/explorer/utility/xmlstorage.h      | 80 ++++++++++++++++++-
 2 files changed, 85 insertions(+), 3 deletions(-)

diff --git a/reactos/subsys/system/explorer/utility/xmlstorage.cpp b/reactos/subsys/system/explorer/utility/xmlstorage.cpp
index 28f41780997..da863514833 100644
--- a/reactos/subsys/system/explorer/utility/xmlstorage.cpp
+++ b/reactos/subsys/system/explorer/utility/xmlstorage.cpp
@@ -87,10 +87,11 @@ void XMLCALL XMLReaderBase::XML_XmlDeclHandler(void* userData, const XML_Char* v
 {
 	XMLReaderBase* pReader = (XMLReaderBase*) userData;
 
-	if (version) {
+	if (version)
 		pReader->_xml_version = version;
+
+	if (encoding)
 		pReader->_encoding = encoding;
-	}
 }
 
  /// notifications about XML start tag
@@ -217,11 +218,14 @@ std::string XMLReaderBase::get_error_string() const
 	  case XML_ERROR_FEATURE_REQUIRES_XML_DTD:			return "XML_ERROR_FEATURE_REQUIRES_XML_DTD";
 	  case XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING:	return "XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING";
 	  case XML_ERROR_UNBOUND_PREFIX:					return "XML_ERROR_UNBOUND_PREFIX";
+ // EXPAT version >= 1.95.8
+#if XML_MAJOR_VERSION>1 || (XML_MAJOR_VERSION==1 && XML_MINOR_VERSION>95) || (XML_MAJOR_VERSION==1 && XML_MINOR_VERSION==95 && XML_MICRO_VERSION>7)
 	  case XML_ERROR_SUSPENDED:							return "XML_ERROR_SUSPENDED";
 	  case XML_ERROR_NOT_SUSPENDED:						return "XML_ERROR_NOT_SUSPENDED";
 	  case XML_ERROR_ABORTED:							return "XML_ERROR_ABORTED";
 	  case XML_ERROR_FINISHED:							return "XML_ERROR_FINISHED";
 	  case XML_ERROR_SUSPEND_PE:						return "XML_ERROR_SUSPEND_PE";
+#endif
 	}
 
 	std::ostringstream out;
diff --git a/reactos/subsys/system/explorer/utility/xmlstorage.h b/reactos/subsys/system/explorer/utility/xmlstorage.h
index 1ec305c2ef3..686e6b30515 100644
--- a/reactos/subsys/system/explorer/utility/xmlstorage.h
+++ b/reactos/subsys/system/explorer/utility/xmlstorage.h
@@ -1205,7 +1205,7 @@ protected:
 	int _value;
 
 private:
-	void operator=(const XMLBool&); // disallow assignment operations
+	void operator=(const XMLInt&); // disallow assignment operations
 };
 
 struct XMLIntRef
@@ -1242,6 +1242,84 @@ protected:
 };
 
 
+struct XMLString
+{
+	XMLString(const String& value)
+	 :	_value(value)
+	{
+	}
+
+	XMLString(LPCTSTR value, LPCTSTR def=TEXT(""))
+	{
+		if (value && *value)
+			_value = value;
+		else
+			_value = def;
+	}
+
+	XMLString(const XMLNode* node, const String& attr_name, LPCTSTR def=TEXT(""))
+	{
+		const String& value = node->get(attr_name);
+
+		if (!value.empty())
+			_value = value;
+		else
+			_value = def;
+	}
+
+	XMLString(const XMLNode* node, const String& name, const String& attr_name, LPCTSTR def=TEXT(""))
+	{
+		const String& value = node->value(name, attr_name);
+
+		if (!value.empty())
+			_value = value;
+		else
+			_value = def;
+	}
+
+	operator const String&() const
+	{
+		return _value;
+	}
+
+protected:
+	String	_value;
+
+private:
+	void operator=(const XMLString&); // disallow assignment operations
+};
+
+struct XMStringRef
+{
+	XMStringRef(XMLNode* node, const String& name, const String& attr_name, LPCTSTR def=TEXT(""))
+	 :	_ref(node->value(name, attr_name))
+	{
+		if (_ref.empty())
+			assign(def);
+	}
+
+	XMStringRef& operator=(const String& value)
+	{
+		assign(value);
+
+		return *this;
+	}
+
+	operator const String&() const
+	{
+		return _ref;
+	}
+
+	void assign(const String& value)
+	{
+		_ref.assign(value);
+	}
+
+protected:
+	String& _ref;
+};
+
+
 #ifdef _MSC_VER
 #pragma warning(disable: 4355)
 #endif

From cffc8dfe096e5b75436ae2faacac6a8068af4b34 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Mon, 28 Jun 2004 21:02:49 +0000
Subject: [PATCH 122/356] - Import RtlImageDirectoryEntryToData from ntoskrnl
 and don't duplicate it.

svn path=/trunk/; revision=9920
---
 reactos/subsys/win32k/ldr/loader.c | 54 +++---------------------------
 1 file changed, 4 insertions(+), 50 deletions(-)

diff --git a/reactos/subsys/win32k/ldr/loader.c b/reactos/subsys/win32k/ldr/loader.c
index 42522861329..fb34704143a 100644
--- a/reactos/subsys/win32k/ldr/loader.c
+++ b/reactos/subsys/win32k/ldr/loader.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: loader.c,v 1.16 2004/04/11 09:09:38 gvg Exp $
+/* $Id: loader.c,v 1.17 2004/06/28 21:02:49 navaraf Exp $
  *
  */
 
@@ -29,57 +29,11 @@
 
 #ifdef __USE_W32API
 PIMAGE_NT_HEADERS STDCALL
-RtlImageNtHeader(IN PVOID BaseAddress);
+RtlImageNtHeader(PVOID);
+PVOID STDCALL
+RtlImageDirectoryEntryToData(PVOID,BOOLEAN,ULONG,PULONG);
 #endif
 
-/*
- * This is copied from ntdll...  It's needed for loading keyboard dlls.
- */
-
-PVOID
-STDCALL
-RtlImageDirectoryEntryToData (
-	PVOID	BaseAddress,
-	BOOLEAN	bFlag,
-	ULONG	Directory,
-	PULONG	Size
-	)
-{
-	PIMAGE_NT_HEADERS NtHeader;
-	PIMAGE_SECTION_HEADER SectionHeader;
-	ULONG Va;
-	ULONG Count;
-
-	NtHeader = RtlImageNtHeader (BaseAddress);
-	if (NtHeader == NULL)
-		return NULL;
-
-	if (Directory >= NtHeader->OptionalHeader.NumberOfRvaAndSizes)
-		return NULL;
-
-	Va = NtHeader->OptionalHeader.DataDirectory[Directory].VirtualAddress;
-	if (Va == 0)
-		return NULL;
-
-	if (Size)
-		*Size = NtHeader->OptionalHeader.DataDirectory[Directory].Size;
-
-	if (bFlag)
-		return (PVOID)(BaseAddress + Va);
-
-	/* image mapped as ordinary file, we must find raw pointer */
-	SectionHeader = (PIMAGE_SECTION_HEADER)(NtHeader + 1);
-	Count = NtHeader->FileHeader.NumberOfSections;
-	while (Count--)
-	{
-		if (SectionHeader->VirtualAddress == Va)
-			return (PVOID)(BaseAddress + SectionHeader->PointerToRawData);
-		SectionHeader++;
-	}
-
-	return NULL;
-}
-
 /*
  * Blatantly stolen from ldr/utils.c in ntdll.  I can't link ntdll from
  * here, though.

From e834678a62ed97d4a488d645846ca4b893f5a160 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Mon, 28 Jun 2004 21:03:08 +0000
Subject: [PATCH 123/356] - We don't need to have BuiltInRect member in the
 ROSRGNDATA structure. Since regions with only one rectangle have this
 rectange identical to the bounding one, we can use rdh.rcBounds instead and
 save 16 bytes.

svn path=/trunk/; revision=9921
---
 reactos/include/win32k/region.h        |  3 ---
 reactos/subsys/win32k/objects/region.c | 36 +++++++++++++++-----------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/reactos/include/win32k/region.h b/reactos/include/win32k/region.h
index 0b3acd22d0b..1a96f5b0a71 100644
--- a/reactos/include/win32k/region.h
+++ b/reactos/include/win32k/region.h
@@ -8,9 +8,6 @@
 typedef struct _ROSRGNDATA {
   RGNDATAHEADER rdh;
   PRECT         Buffer;
-  RECT          BuiltInRect;   /* Testing shows that > 95% of all regions have only 1 rect.
-                                  Including that here saves us from having to do another
-                                  allocation */
 } ROSRGNDATA, *PROSRGNDATA, *LPROSRGNDATA;
 
 
diff --git a/reactos/subsys/win32k/objects/region.c b/reactos/subsys/win32k/objects/region.c
index add1ce02ed0..397de6c10ec 100644
--- a/reactos/subsys/win32k/objects/region.c
+++ b/reactos/subsys/win32k/objects/region.c
@@ -113,7 +113,7 @@ SOFTWARE.
  * the y-x-banding that's so nice to have...
  */
 
-/* $Id: region.c,v 1.57 2004/05/18 22:32:48 weiden Exp $ */
+/* $Id: region.c,v 1.58 2004/06/28 21:03:08 navaraf Exp $ */
 #include <w32k.h>
 #include <win32k/float.h>
 
@@ -400,7 +400,7 @@ static inline int xmemcheck(ROSRGNDATA *reg, PRECT *rect, PRECT *firstrect ) {
 		    return 0;
 		RtlCopyMemory( temp, *firstrect, reg->rdh.nRgnSize );
 		reg->rdh.nRgnSize *= 2;
-		if (*firstrect != &reg->BuiltInRect)
+		if (*firstrect != &reg->rdh.rcBound)
 		    ExFreePool( *firstrect );
 		*firstrect = temp;
 		*rect = (*firstrect)+reg->rdh.nCount;
@@ -466,7 +466,7 @@ static BOOL FASTCALL REGION_CopyRegion(PROSRGNDATA dst, PROSRGNDATA src)
 	  if( !temp )
 		return FALSE;
 
-	  if( dst->Buffer && dst->Buffer != &dst->BuiltInRect )
+	  if( dst->Buffer && dst->Buffer != &dst->rdh.rcBound )
 	  	ExFreePool( dst->Buffer );	//free the old buffer
 	  dst->Buffer = temp;
       dst->rdh.nRgnSize = src->rdh.nCount * sizeof(RECT);  //size of region buffer
@@ -541,7 +541,7 @@ static BOOL FASTCALL REGION_CropAndOffsetRegion(const PPOINT off, const PRECT re
     }
     else{
       xrect = ExAllocatePoolWithTag(PagedPool, rgnSrc->rdh.nCount * sizeof(RECT), TAG_REGION);
-	  if( rgnDst->Buffer && rgnDst->Buffer != &rgnDst->BuiltInRect )
+	  if( rgnDst->Buffer && rgnDst->Buffer != &rgnDst->rdh.rcBound )
 	  	ExFreePool( rgnDst->Buffer ); //free the old buffer. will be assigned to xrect below.
 	}
 
@@ -604,7 +604,7 @@ static BOOL FASTCALL REGION_CropAndOffsetRegion(const PPOINT off, const PRECT re
       if(!temp)
 	      return FALSE;
 
-	  if( rgnDst->Buffer && rgnDst->Buffer != &rgnDst->BuiltInRect )
+	  if( rgnDst->Buffer && rgnDst->Buffer != &rgnDst->rdh.rcBound )
 	  	ExFreePool( rgnDst->Buffer ); //free the old buffer
       rgnDst->Buffer = temp;
       rgnDst->rdh.nCount = i;
@@ -1142,7 +1142,7 @@ REGION_RegionOp(
 			else{
 				newReg->rdh.nRgnSize = newReg->rdh.nCount*sizeof(RECT);
 				RtlCopyMemory( newReg->Buffer, prev_rects, newReg->rdh.nRgnSize );
-				if (prev_rects != &newReg->BuiltInRect)
+				if (prev_rects != &newReg->rdh.rcBound)
 					ExFreePool( prev_rects );
 			}
 		}
@@ -1153,7 +1153,7 @@ REGION_RegionOp(
 		     * the region is empty
 		     */
 		    newReg->rdh.nRgnSize = sizeof(RECT);
-		    if (newReg->Buffer != &newReg->BuiltInRect)
+		    if (newReg->Buffer != &newReg->rdh.rcBound)
 			ExFreePool( newReg->Buffer );
 		    newReg->Buffer = ExAllocatePoolWithTag( PagedPool, sizeof(RECT), TAG_REGION );
 			ASSERT( newReg->Buffer );
@@ -1165,7 +1165,7 @@ REGION_RegionOp(
 	else
 		newReg->rdh.iType = (newReg->rdh.nCount > 1)? COMPLEXREGION : SIMPLEREGION;
 
-	if (oldRects != &newReg->BuiltInRect)
+	if (oldRects != &newReg->rdh.rcBound)
 		ExFreePool( oldRects );
     return;
 }
@@ -1900,7 +1900,10 @@ HRGN FASTCALL RGNDATA_AllocRgn(INT n)
         {
           if (1 == n)
             {
-              pReg->Buffer = &pReg->BuiltInRect;
+              /* Testing shows that > 95% of all regions have only 1 rect.
+                 Including that here saves us from having to do another
+                 allocation */
+              pReg->Buffer = &pReg->rdh.rcBound;
             }
           else
             {
@@ -1931,7 +1934,7 @@ HRGN FASTCALL RGNDATA_AllocRgn(INT n)
 BOOL FASTCALL RGNDATA_InternalDelete( PROSRGNDATA pRgn )
 {
   ASSERT(pRgn);
-  if(pRgn->Buffer && pRgn->Buffer != &pRgn->BuiltInRect)
+  if(pRgn->Buffer && pRgn->Buffer != &pRgn->rdh.rcBound)
     ExFreePool(pRgn->Buffer);
   return TRUE;
 }
@@ -2383,10 +2386,13 @@ NtGdiOffsetRgn(HRGN  hRgn,
         pbox->bottom += YOffset;
         pbox++;
       }
-      rgn->rdh.rcBound.left += XOffset;
-      rgn->rdh.rcBound.right += XOffset;
-      rgn->rdh.rcBound.top += YOffset;
-      rgn->rdh.rcBound.bottom += YOffset;
+      if (rgn->Buffer != &rgn->rdh.rcBound)
+      {
+        rgn->rdh.rcBound.left += XOffset;
+        rgn->rdh.rcBound.right += XOffset;
+        rgn->rdh.rcBound.top += YOffset;
+        rgn->rdh.rcBound.bottom += YOffset;
+      }
     }
   }
   ret = rgn->rdh.iType;
@@ -2877,7 +2883,7 @@ static int FASTCALL REGION_PtsToRegion(int numFullPtBlocks, int iCurPtBlock,
     if(reg->Buffer != NULL)
     {
       RtlCopyMemory(temp, reg->Buffer, reg->rdh.nCount * sizeof(RECT));
-      if(reg->Buffer != &reg->BuiltInRect)
+      if(reg->Buffer != &reg->rdh.rcBound)
         ExFreePool(reg->Buffer);
     }
     reg->Buffer = temp;

From c2f6de9e7bf30264f03f095fd66c762096c19a8e Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Tue, 29 Jun 2004 06:08:54 +0000
Subject: [PATCH 124/356] - Improved implementation of REGION_CreateFrameRgn
 that gives more correct results.

svn path=/trunk/; revision=9923
---
 reactos/subsys/win32k/objects/region.c | 156 ++++++++++++-------------
 1 file changed, 75 insertions(+), 81 deletions(-)

diff --git a/reactos/subsys/win32k/objects/region.c b/reactos/subsys/win32k/objects/region.c
index 397de6c10ec..6dd6ec4baeb 100644
--- a/reactos/subsys/win32k/objects/region.c
+++ b/reactos/subsys/win32k/objects/region.c
@@ -113,7 +113,7 @@ SOFTWARE.
  * the y-x-banding that's so nice to have...
  */
 
-/* $Id: region.c,v 1.58 2004/06/28 21:03:08 navaraf Exp $ */
+/* $Id: region.c,v 1.59 2004/06/29 06:08:54 navaraf Exp $ */
 #include <w32k.h>
 #include <win32k/float.h>
 
@@ -1736,96 +1736,90 @@ void FASTCALL REGION_UnionRectWithRegion(const RECT *rect, ROSRGNDATA *rgn)
     REGION_UnionRegion(rgn, rgn, &region);
 }
 
-
 BOOL FASTCALL REGION_CreateFrameRgn(HRGN hDest, HRGN hSrc, INT x, INT y)
 {
-  PROSRGNDATA srcObj, destObj;
-  PRECT rc;
-  INT dx, dy;
-  ULONG i;
+   PROSRGNDATA srcObj, destObj;
+   PRECT rc;
+   ULONG i;
   
-  if(!(srcObj = (PROSRGNDATA)RGNDATA_LockRgn(hSrc)))
-  {
-    return FALSE;
-  }
-  if(!REGION_NOT_EMPTY(srcObj))
-  {
-    RGNDATA_UnlockRgn(hSrc);
-    return FALSE;
-  }
-  if(!(destObj = (PROSRGNDATA)RGNDATA_LockRgn(hDest)))
-  {
-    RGNDATA_UnlockRgn(hSrc);
-    return FALSE;
-  }
+   if (!(srcObj = (PROSRGNDATA)RGNDATA_LockRgn(hSrc)))
+   {
+      return FALSE;
+   }
+   if (!REGION_NOT_EMPTY(srcObj))
+   {
+      RGNDATA_UnlockRgn(hSrc);
+      return FALSE;
+   }
+   if (!(destObj = (PROSRGNDATA)RGNDATA_LockRgn(hDest)))
+   {
+      RGNDATA_UnlockRgn(hSrc);
+      return FALSE;
+   }
   
-  EMPTY_REGION(destObj);
-  if(!REGION_CopyRegion(destObj, srcObj))
-  {
-    RGNDATA_UnlockRgn(hDest);
-    RGNDATA_UnlockRgn(hSrc);
-    return FALSE;
-  }
+   EMPTY_REGION(destObj);
+   if (!REGION_CopyRegion(destObj, srcObj))
+   {
+      RGNDATA_UnlockRgn(hDest);
+      RGNDATA_UnlockRgn(hSrc);
+      return FALSE;
+   }
   
-  /* left-top */
-  dx = x * 2;
-  dy = y * 2;
-  rc = (PRECT)srcObj->Buffer;
-  for(i = 0; i < srcObj->rdh.nCount; i++)
-  {
-    rc->left += x;
-    rc->top += y;
-    rc->right += x;
-    rc->bottom += y;
-    rc++;
-  }
-  REGION_IntersectRegion(destObj, destObj, srcObj);
+   /* Original region moved to right */
+   rc = (PRECT)srcObj->Buffer;
+   for (i = 0; i < srcObj->rdh.nCount; i++)
+   {
+      rc->left += x;
+      rc->right += x;
+      rc++;
+   }
+   REGION_IntersectRegion(destObj, destObj, srcObj);
   
-  /* right-top */
-  rc = (PRECT)srcObj->Buffer;
-  for(i = 0; i < srcObj->rdh.nCount; i++)
-  {
-    rc->left -= dx;
-    rc->right -= dx;
-    rc++;
-  }
-  REGION_IntersectRegion(destObj, destObj, srcObj);
+   /* Original region moved to left */
+   rc = (PRECT)srcObj->Buffer;
+   for (i = 0; i < srcObj->rdh.nCount; i++)
+   {
+      rc->left -= 2 * x;
+      rc->right -= 2 * x;
+      rc++;
+   }
+   REGION_IntersectRegion(destObj, destObj, srcObj);
   
-  /* right-bottom */
-  rc = (PRECT)srcObj->Buffer;
-  for(i = 0; i < srcObj->rdh.nCount; i++)
-  {
-    rc->top -= dy;
-    rc->bottom -= dy;
-    rc++;
-  }
-  REGION_IntersectRegion(destObj, destObj, srcObj);
+   /* Original region moved down */
+   rc = (PRECT)srcObj->Buffer;
+   for (i = 0; i < srcObj->rdh.nCount; i++)
+   {
+      rc->left += x;
+      rc->right += x;
+      rc->top += y;
+      rc->bottom += y;
+      rc++;
+   }
+   REGION_IntersectRegion(destObj, destObj, srcObj);
   
-  /* left-bottom */
-  rc = (PRECT)srcObj->Buffer;
-  for(i = 0; i < srcObj->rdh.nCount; i++)
-  {
-    rc->left += dx;
-    rc->right += dx;
-    rc++;
-  }
-  REGION_IntersectRegion(destObj, destObj, srcObj);
+   /* Original region moved up */
+   rc = (PRECT)srcObj->Buffer;
+   for (i = 0; i < srcObj->rdh.nCount; i++)
+   {
+      rc->top -= 2 * y;
+      rc->bottom -= 2 * y;
+      rc++;
+   }
+   REGION_IntersectRegion(destObj, destObj, srcObj);
   
+   /* Restore the original region */
+   rc = (PRECT)srcObj->Buffer;
+   for (i = 0; i < srcObj->rdh.nCount; i++)
+   {
+      rc->top += y;
+      rc->bottom += y;
+      rc++;
+   }
+   REGION_SubtractRegion(destObj, srcObj, destObj);
   
-  rc = (PRECT)srcObj->Buffer;
-  for(i = 0; i < srcObj->rdh.nCount; i++)
-  {
-    rc->left -= x;
-    rc->top += y;
-    rc->right -= x;
-    rc->bottom += y;
-    rc++;
-  }
-  REGION_SubtractRegion(destObj, srcObj, destObj);
-  
-  RGNDATA_UnlockRgn(hDest);
-  RGNDATA_UnlockRgn(hSrc);
-  return TRUE;
+   RGNDATA_UnlockRgn(hDest);
+   RGNDATA_UnlockRgn(hSrc);
+   return TRUE;
 }
 
 

From 56df203d1b8183396d14cea33669ba831fa7a3d6 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Tue, 29 Jun 2004 12:03:56 +0000
Subject: [PATCH 125/356] - Load 16x16 and 32x32 icons. - Use masked image
 lists. - Clean-up menu IDs.

svn path=/trunk/; revision=9924
---
 reactos/lib/cpl/control/Makefile   |  6 ++----
 reactos/lib/cpl/control/control.c  | 24 +++++++++++++-----------
 reactos/lib/cpl/control/control.rc | 12 ++++++------
 reactos/lib/cpl/control/resource.h | 22 +++++++++-------------
 4 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/reactos/lib/cpl/control/Makefile b/reactos/lib/cpl/control/Makefile
index e804c38e468..7a70cb49e6e 100644
--- a/reactos/lib/cpl/control/Makefile
+++ b/reactos/lib/cpl/control/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 2004/06/18 20:43:44 kuehng Exp $
+# $Id: Makefile,v 1.2 2004/06/29 12:03:56 ekohl Exp $
 
 PATH_TO_TOP = ../../..
 
@@ -10,9 +10,7 @@ TARGET_INSTALLDIR = system32
 
 TARGET_APPTYPE = windows
 
-MK_CFLAGS = -D_UNICODE -DUNICODE
-MK_CPPFLAGS = -D_UNICODE -DUNICODE
-MK_RCFLAGS = -D_UNICODE -DUNICODE
+TARGET_CFLAGS = -D_UNICODE -DUNICODE
 
 TARGET_SDKLIBS = kernel32.a user32.a comctl32.a
 
diff --git a/reactos/lib/cpl/control/control.c b/reactos/lib/cpl/control/control.c
index a12395454d3..3b35fd6abc6 100644
--- a/reactos/lib/cpl/control/control.c
+++ b/reactos/lib/cpl/control/control.c
@@ -17,7 +17,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: control.c,v 1.2 2004/06/28 12:05:16 ekohl Exp $
+/* $Id: control.c,v 1.3 2004/06/29 12:03:56 ekohl Exp $
  *
  * PROJECT:         ReactOS System Control Panel
  * FILE:            lib/cpl/system/control.c
@@ -86,8 +86,8 @@ void PopulateCPLList(HWND hLisCtrl)
 	GetSystemDirectory(pszSearchPath,MAX_PATH);
 	_tcscat(pszSearchPath,_T("\\*.cpl"));
 	hFind = FindFirstFile(pszSearchPath,&fd);
-	hImgListSmall = ImageList_Create(16,16,ILC_COLOR,256,1000);
-	hImgListLarge = ImageList_Create(32,32,ILC_COLOR,256,1000);
+	hImgListSmall = ImageList_Create(16,16,ILC_COLOR | ILC_MASK,256,1000);
+	hImgListLarge = ImageList_Create(32,32,ILC_COLOR | ILC_MASK,256,1000);
 	while(hFind != INVALID_HANDLE_VALUE)
 	{
 		CPLLISTENTRY *pEntry;
@@ -114,11 +114,13 @@ void PopulateCPLList(HWND hLisCtrl)
 				int index;
 				pEntry->pFunc(hLisCtrl,CPL_INQUIRE,0,(LPARAM)&pEntry->CPLInfo);
 
-				hIcon = LoadIcon(pEntry->hDLL,MAKEINTRESOURCE(pEntry->CPLInfo.idIcon));
+				hIcon = LoadImage(pEntry->hDLL,MAKEINTRESOURCE(pEntry->CPLInfo.idIcon),IMAGE_ICON,16,16,LR_DEFAULTCOLOR);
 				index = ImageList_AddIcon(hImgListSmall,hIcon);
+				DestroyIcon(hIcon);
+				hIcon = LoadImage(pEntry->hDLL,MAKEINTRESOURCE(pEntry->CPLInfo.idIcon),IMAGE_ICON,32,32,LR_DEFAULTCOLOR);
 				ImageList_AddIcon(hImgListLarge,hIcon);
+				DestroyIcon(hIcon);
 
-				
 				LoadString(pEntry->hDLL,pEntry->CPLInfo.idName,Name,MAX_PATH);
 				if(_tcslen(Name))
 				{
@@ -221,22 +223,22 @@ LRESULT CALLBACK MyWindowProc(HWND hWnd,UINT uMsg,WPARAM wParam,LPARAM lParam)
 	case WM_COMMAND:
 		switch(LOWORD(wParam))
 		{
-		case CM_LARGEICONS:
+		case IDM_LARGEICONS:
 			SetWindowLong(hListView,GWL_STYLE,LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL   | WS_VISIBLE | WS_CHILD|WS_BORDER|WS_TABSTOP);
 			break;
-		case CM_SMALLICONS:
+		case IDM_SMALLICONS:
 			SetWindowLong(hListView,GWL_STYLE,LVS_SMALLICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL   | WS_VISIBLE | WS_CHILD|WS_BORDER|WS_TABSTOP);
 			break;
-		case CM_LIST:
+		case IDM_LIST:
 			SetWindowLong(hListView,GWL_STYLE,LVS_LIST | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL   | WS_VISIBLE | WS_CHILD|WS_BORDER|WS_TABSTOP);
 			break;
-		case CM_DETAILS:
+		case IDM_DETAILS:
 			SetWindowLong(hListView,GWL_STYLE,LVS_REPORT | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL   | WS_VISIBLE | WS_CHILD|WS_BORDER|WS_TABSTOP);
 			break;
-		case CM_CLOSE:
+		case IDM_CLOSE:
 			DestroyWindow(hWnd);
 			break;
-		case CM_ABOUT:
+		case IDM_ABOUT:
 			MessageBox(hWnd,_T("Simple Control Panel (not Shell-namespace based)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rReleased under the GPL"),_T("About the Control Panel"),MB_OK | MB_ICONINFORMATION);
 			break;
 		}
diff --git a/reactos/lib/cpl/control/control.rc b/reactos/lib/cpl/control/control.rc
index 292af968d2d..bc7d94eda54 100644
--- a/reactos/lib/cpl/control/control.rc
+++ b/reactos/lib/cpl/control/control.rc
@@ -21,18 +21,18 @@ IDM_MAINMENU MENU DISCARDABLE
 BEGIN
     POPUP "&File"
     BEGIN
-        MENUITEM "&Close",                      CM_CLOSE
+        MENUITEM "&Close",                      IDM_CLOSE
     END
     POPUP "&View"
     BEGIN
-        MENUITEM "Large Icons",                 CM_LARGEICONS
-        MENUITEM "Small Icons",                 CM_SMALLICONS
-        MENUITEM "List",                        CM_LIST
-        MENUITEM "Details",                     CM_DETAILS
+        MENUITEM "Large Icons",                 IDM_LARGEICONS
+        MENUITEM "Small Icons",                 IDM_SMALLICONS
+        MENUITEM "List",                        IDM_LIST
+        MENUITEM "Details",                     IDM_DETAILS
     END
     POPUP "Help"
     BEGIN
-        MENUITEM "About",                       CM_ABOUT
+        MENUITEM "About",                       IDM_ABOUT
     END
 END
 
diff --git a/reactos/lib/cpl/control/resource.h b/reactos/lib/cpl/control/resource.h
index 053c1da5f2c..8cce795056c 100644
--- a/reactos/lib/cpl/control/resource.h
+++ b/reactos/lib/cpl/control/resource.h
@@ -2,25 +2,21 @@
 // Microsoft Developer Studio generated include file.
 // Used by control.rc
 //
-#define IDR_MENU1                       101
+#define IDI_MAINICON                    100
 #define IDM_MAINMENU                    101
-#define IDI_MAINICON                    104
-#define ID_VIEW_LARGEICONS              40002
-#define CM_LARGEICONS                   40002
-#define ID_VIEW_SMALLICONS              40003
-#define CM_SMALLICONS                   40003
-#define ID_HELP_ABOUT                   40007
-#define CM_ABOUT                        40007
-#define CM_CLOSE                        40008
-#define CM_LIST                         40009
-#define CM_DETAILS                      40010
+#define IDM_LARGEICONS                  40000
+#define IDM_SMALLICONS                  40001
+#define IDM_LIST                        40002
+#define IDM_DETAILS                     40003
+#define IDM_ABOUT                       40004
+#define IDM_CLOSE                       40005
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        105
-#define _APS_NEXT_COMMAND_VALUE         40011
+#define _APS_NEXT_RESOURCE_VALUE        102
+#define _APS_NEXT_COMMAND_VALUE         40006
 #define _APS_NEXT_CONTROL_VALUE         1000
 #define _APS_NEXT_SYMED_VALUE           101
 #endif

From 2a6745d9d4fa42e08d8d0106ff195f56f1d9a5b6 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Tue, 29 Jun 2004 12:04:42 +0000
Subject: [PATCH 126/356] Install control panel app and control panels.

svn path=/trunk/; revision=9925
---
 reactos/bootdata/packages/reactos.dff | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/reactos/bootdata/packages/reactos.dff b/reactos/bootdata/packages/reactos.dff
index 6f33636d262..6efcbfde4ba 100755
--- a/reactos/bootdata/packages/reactos.dff
+++ b/reactos/bootdata/packages/reactos.dff
@@ -51,6 +51,9 @@ drivers\net\wshtcpip\wshtcpip.dll       1
 drivers\net\dd\ne2000\ne2000.sys        2
 lib\advapi32\advapi32.dll               1
 lib\cards\cards.dll                     1
+lib\cpl\appwiz\appwiz.cpl               1
+lib\cpl\control\control.exe             1
+lib\cpl\sysdm\sysdm.cpl                 1
 lib\comctl32\comctl32.dll               1
 lib\comdlg32\comdlg32.dll               1
 lib\crtdll\crtdll.dll                   1

From b031cfa71751a1e415bf9a55c60fa03180f4ea6a Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Tue, 29 Jun 2004 12:06:01 +0000
Subject: [PATCH 127/356] Set short path names for 'temp' and 'tmp' environment
 variables.

svn path=/trunk/; revision=9926
---
 reactos/lib/userenv/environment.c | 36 +++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/reactos/lib/userenv/environment.c b/reactos/lib/userenv/environment.c
index 08c369552d6..7a44fa5d4f7 100644
--- a/reactos/lib/userenv/environment.c
+++ b/reactos/lib/userenv/environment.c
@@ -1,4 +1,4 @@
-/* $Id: environment.c,v 1.4 2004/06/25 11:42:00 ekohl Exp $
+/* $Id: environment.c,v 1.5 2004/06/29 12:06:01 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -21,6 +21,7 @@ SetUserEnvironmentVariable (LPVOID *Environment,
 			    LPWSTR lpValue,
 			    BOOL bExpand)
 {
+  WCHAR ShortName[MAX_PATH];
   UNICODE_STRING Name;
   UNICODE_STRING SrcValue;
   UNICODE_STRING DstValue;
@@ -36,8 +37,8 @@ SetUserEnvironmentVariable (LPVOID *Environment,
 
       DstValue.Length = 0;
       DstValue.MaximumLength = Length;
-      DstValue.Buffer = LocalAlloc (LPTR,
-				    Length);
+      DstValue.Buffer = LocalAlloc(LPTR,
+				   Length);
       if (DstValue.Buffer == NULL)
 	{
 	  DPRINT1("LocalAlloc() failed\n");
@@ -50,8 +51,8 @@ SetUserEnvironmentVariable (LPVOID *Environment,
 					     &Length);
       if (!NT_SUCCESS(Status))
 	{
-	  DPRINT1 ("RtlExpandEnvironmentStrings_U() failed (Status %lx)\n", Status);
-	  DPRINT1 ("Length %lu\n", Length);
+	  DPRINT1("RtlExpandEnvironmentStrings_U() failed (Status %lx)\n", Status);
+	  DPRINT1("Length %lu\n", Length);
 	  return FALSE;
 	}
     }
@@ -61,14 +62,27 @@ SetUserEnvironmentVariable (LPVOID *Environment,
 			   lpValue);
     }
 
-  RtlInitUnicodeString (&Name,
-			lpName);
+  if (!_wcsicmp (lpName, L"temp") || !_wcsicmp (lpName, L"tmp"))
+    {
+      if (!GetShortPathNameW(DstValue.Buffer, ShortName, MAX_PATH))
+	{
+	  DPRINT1("GetShortPathNameW() failed (Error %lu)\n", GetLastError());
+	  return FALSE;
+	}
+
+      DPRINT("Buffer: %S\n", ShortName);
+      RtlInitUnicodeString(&DstValue,
+			   ShortName);
+    }
+
+  RtlInitUnicodeString(&Name,
+		       lpName);
 
   DPRINT("Value: %wZ\n", &DstValue);
 
-  Status = RtlSetEnvironmentVariable ((PWSTR*)Environment,
-				      &Name,
-				      &DstValue);
+  Status = RtlSetEnvironmentVariable((PWSTR*)Environment,
+				     &Name,
+				     &DstValue);
 
   if (bExpand)
     {
@@ -77,7 +91,7 @@ SetUserEnvironmentVariable (LPVOID *Environment,
 
   if (!NT_SUCCESS(Status))
     {
-      DPRINT1 ("RtlSetEnvironmentVariable() failed (Status %lx)\n", Status);
+      DPRINT1("RtlSetEnvironmentVariable() failed (Status %lx)\n", Status);
       return FALSE;
     }
 

From f1a2c7a2d58081abc47a1e7536d92d925679f0bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Tue, 29 Jun 2004 13:40:40 +0000
Subject: [PATCH 128/356] Minimize Wine porting headers

svn path=/trunk/; revision=9927
---
 reactos/include/wine/shlguid.h     |   86 +-
 reactos/include/wine/shlobj.h      |  909 +-----
 reactos/include/wine/shobjidl.h    | 4258 +---------------------------
 reactos/include/wine/winnetwk.h    |  388 +--
 reactos/lib/shell32/pidl.c         |    2 +-
 reactos/lib/shell32/shell32_main.c |    2 +-
 reactos/lib/shell32/shellole.c     |    2 +-
 reactos/lib/shell32/shellord.c     |   17 +-
 reactos/lib/shell32/shlfileop.c    |    6 +-
 reactos/w32api/include/shlguid.h   |    6 +
 reactos/w32api/include/shlobj.h    |  251 +-
 reactos/w32api/include/winnetwk.h  |    2 +-
 12 files changed, 322 insertions(+), 5607 deletions(-)

diff --git a/reactos/include/wine/shlguid.h b/reactos/include/wine/shlguid.h
index 59cab255527..2d3efc7f330 100644
--- a/reactos/include/wine/shlguid.h
+++ b/reactos/include/wine/shlguid.h
@@ -1,62 +1,24 @@
-/*
- * Copyright (C) 1999 Juergen Schmied
+/* $Id: shlguid.h,v 1.4 2004/06/29 13:40:40 gvg Exp $
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * Compatibility header
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This header is wrapper to allow compilation of Wine DLLs under ReactOS
+ * build system. It contains definitions commonly refered to as Wineisms
+ * and definitions that are missing in w32api.
  */
 
+#include_next <shlguid.h>
+
 #ifndef __WINE_SHLGUID_H
 #define __WINE_SHLGUID_H
 
-#define DEFINE_SHLGUID(name, l, w1, w2) DEFINE_OLEGUID(name,l,w1,w2)
-
 DEFINE_SHLGUID(CLSID_ShellDesktop,      0x00021400L, 0, 0);
 DEFINE_SHLGUID(CLSID_ShellLink,         0x00021401L, 0, 0);
 
-DEFINE_SHLGUID(CATID_BrowsableShellExt, 0x00021490L, 0, 0);
-DEFINE_SHLGUID(CATID_BrowseInPlace,     0x00021491L, 0, 0);
-DEFINE_SHLGUID(CATID_DeskBand,          0x00021492L, 0, 0);
-DEFINE_SHLGUID(CATID_InfoBand,          0x00021493L, 0, 0);
-DEFINE_SHLGUID(CATID_CommBand,          0x00021494L, 0, 0);
-
-/* shell32 formatids */
-DEFINE_SHLGUID(FMTID_Intshcut,          0x000214A0L, 0, 0);
-DEFINE_SHLGUID(FMTID_InternetSite,      0x000214A1L, 0, 0);
-
 /* command group ids */
 DEFINE_SHLGUID(CGID_Explorer,           0x000214D0L, 0, 0);
 DEFINE_SHLGUID(CGID_ShellDocView,       0x000214D1L, 0, 0);
-DEFINE_SHLGUID(CGID_ShellServiceObject, 0x000214D2L, 0, 0);
-DEFINE_SHLGUID(CGID_ExplorerBarDoc,     0x000214D3L, 0, 0);
 
-DEFINE_SHLGUID(IID_INewShortcutHookA,   0x000214E1L, 0, 0);
-DEFINE_SHLGUID(IID_IShellIcon,          0x000214E5L, 0, 0);
-DEFINE_SHLGUID(IID_IShellPropSheetExt,  0x000214E9L, 0, 0);
-DEFINE_SHLGUID(IID_IShellDetails,       0x000214ECL, 0, 0);
-DEFINE_SHLGUID(IID_IDelayedRelease,     0x000214EDL, 0, 0);
-DEFINE_SHLGUID(IID_IShellCopyHookA,     0x000214EFL, 0, 0);
-DEFINE_SHLGUID(IID_IFileViewerA,        0x000214F0L, 0, 0);
-DEFINE_SHLGUID(IID_IFileViewerSite,     0x000214F3L, 0, 0);
-DEFINE_SHLGUID(IID_IPropSheetPage,      0x000214F6L, 0, 0);
-DEFINE_SHLGUID(IID_INewShortcutHookW,   0x000214F7L, 0, 0);
-DEFINE_SHLGUID(IID_IFileViewerW,        0x000214F8L, 0, 0);
-DEFINE_SHLGUID(IID_IShellCopyHookW,     0x000214FCL, 0, 0);
-DEFINE_SHLGUID(IID_IRemoteComputer,     0x000214FEL, 0, 0);
-DEFINE_SHLGUID(IID_IQueryInfo,          0x00021500L, 0, 0);
-
-/* avoid duplicate definitions with shobjidl.h (FIXME) */
-#ifdef __REACTOS__
 DEFINE_SHLGUID(IID_IExtractIconA,       0x000214EBL, 0, 0);
 DEFINE_SHLGUID(IID_IExtractIconW,       0x000214FAL, 0, 0);
 DEFINE_SHLGUID(IID_IContextMenu,        0x000214E4L, 0, 0);
@@ -70,48 +32,20 @@ DEFINE_SHLGUID(IID_IPersistFolder,      0x000214EAL, 0, 0);
 DEFINE_SHLGUID(IID_IShellLinkA,         0x000214EEL, 0, 0);
 DEFINE_SHLGUID(IID_IEnumIDList,         0x000214F2L, 0, 0);
 DEFINE_SHLGUID(IID_IShellLinkW,         0x000214F9L, 0, 0);
-#endif
-/* DEFINE_SHLGUID(IID_IShellExecuteHookA,  0x000214F5L, 0, 0); */
-/* DEFINE_SHLGUID(IID_IShellExecuteHookW,  0x000214FBL, 0, 0); */
+DEFINE_SHLGUID(IID_IShellExecuteHookA,  0x000214F5L, 0, 0);
+DEFINE_SHLGUID(IID_IShellExecuteHookW,  0x000214FBL, 0, 0);
 
 DEFINE_GUID(SID_STopLevelBrowser, 0x4C96BE40L, 0x915C, 0x11CF, 0x99, 0xD3, 0x00, 0xAA, 0x00, 0x4A, 0xE8, 0x37);
 
-#define SID_SShellBrowser     IID_IShellBrowser
-
-#define IID_IFileViewer       WINELIB_NAME_AW(IID_IFileViewer)
-#define IID_IShellLink        WINELIB_NAME_AW(IID_IShellLink)
-#define IID_IExtractIcon      WINELIB_NAME_AW(IID_IExtractIcon)
-#define IID_IShellCopyHook    WINELIB_NAME_AW(IID_IShellCopyHook)
-#define IID_IShellExecuteHook WINELIB_NAME_AW(IID_IShellExecuteHook)
-#define IID_INewShortcutHook  WINELIB_NAME_AW(IID_INewShortcutHook)
-
-DEFINE_GUID (IID_IDockingWindow,	0x012dd920L, 0x7B26, 0x11D0, 0x8C, 0xA9, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8);
-DEFINE_GUID (IID_IDockingWindowSite,	0x2A342FC2L, 0x7B26, 0x11D0, 0x8C, 0xA9, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8);
-
-/****************************************************************************
- * the next IID's are the namespace elements of the pidls
- */
 DEFINE_GUID(CLSID_NetworkPlaces, 0x208D2C60, 0x3AEA, 0x1069, 0xA2, 0xD7, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D);
-DEFINE_GUID(CLSID_NetworkDomain, 0x46e06680, 0x4bf0, 0x11d1, 0x83, 0xee, 0x00, 0xa0, 0xc9, 0x0d, 0xc8, 0x49);
-DEFINE_GUID(CLSID_NetworkServer, 0xc0542a90, 0x4bf0, 0x11d1, 0x83, 0xee, 0x00, 0xa0, 0xc9, 0x0d, 0xc8, 0x49);
-DEFINE_GUID(CLSID_NetworkShare, 0x54a754c0, 0x4bf0, 0x11d1, 0x83, 0xee, 0x00, 0xa0, 0xc9, 0x0d, 0xc8, 0x49);
 DEFINE_GUID(CLSID_MyComputer, 0x20D04FE0, 0x3AEA, 0x1069, 0xA2, 0xD8, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D);
 DEFINE_GUID(CLSID_Internet, 0x871C5380, 0x42A0, 0x1069, 0xA2, 0xEA, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D);
 DEFINE_GUID(CLSID_ShellFSFolder, 0xF3364BA0, 0x65B9, 0x11CE, 0xA9, 0xBA, 0x00, 0xAA, 0x00, 0x4A, 0xE8, 0x37);
 DEFINE_GUID(CLSID_RecycleBin, 0x645FF040, 0x5081, 0x101B, 0x9F, 0x08, 0x00, 0xAA, 0x00, 0x2F, 0x95, 0x4E);
 DEFINE_GUID(CLSID_ControlPanel, 0x21EC2020, 0x3AEA, 0x1069, 0xA2, 0xDD, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D);
-DEFINE_GUID(CLSID_Printers, 0x2227A280, 0x3AEA, 0x1069, 0xA2, 0xDE, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D);
-DEFINE_GUID(CLSID_MyDocuments, 0x450d8fba, 0xad25, 0x11d0, 0x98, 0xa8, 0x08, 0x00, 0x36, 0x1b, 0x11, 0x03);
 
 DEFINE_GUID(IID_IQueryAssociations, 0xc46ca590, 0x3c3f, 0x11d2, 0xbe, 0xe6, 0x00, 0x00, 0xf8, 0x05, 0xca, 0x57);
 
 DEFINE_GUID(CLSID_DragDropHelper, 0x4657278a, 0x411b, 0x11d2, 0x83, 0x9a, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0);
 
-#define PID_FINDDATA        0
-#define PID_NETRESOURCE     1
-#define PID_DESCRIPTIONID   2
-#define PID_WHICHFOLDER     3
-#define PID_NETWORKLOCATION 4
-#define PID_COMPUTERNAME    5
-
-#endif /* __WINE_SHLGUID_H */
+#endif /* __WINE_SHLOBJ_H */
diff --git a/reactos/include/wine/shlobj.h b/reactos/include/wine/shlobj.h
index 5a3714800a8..21670e32857 100644
--- a/reactos/include/wine/shlobj.h
+++ b/reactos/include/wine/shlobj.h
@@ -1,129 +1,24 @@
-/*
- * Copyright (C) the Wine project
+/* $Id: shlobj.h,v 1.4 2004/06/29 13:40:40 gvg Exp $
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * Compatibility header
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This header is wrapper to allow compilation of Wine DLLs under ReactOS
+ * build system. It contains definitions commonly refered to as Wineisms
+ * and definitions that are missing in w32api.
  */
 
+#include <winnetwk.h>
+
+#include_next <shlobj.h>
+
+#include <shlguid.h>
+#include <shobjidl.h>
+
 #ifndef __WINE_SHLOBJ_H
 #define __WINE_SHLOBJ_H
 
-#include <ole2.h>
-#include <commctrl.h>
-#include <prsht.h>
-#include <shlguid.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* defined(__cplusplus) */
-
-#include <pshpack1.h>
-
-#include <shtypes.h>
-#include <shobjidl.h>
-
-
-LPVOID       WINAPI SHAlloc(ULONG);
-HRESULT      WINAPI SHCoCreateInstance(LPCWSTR,const CLSID*,IUnknown*,REFIID,LPVOID*);
-HRESULT      WINAPI SHCreateStdEnumFmtEtc(DWORD,const FORMATETC *,IEnumFORMATETC**);
-BOOL         WINAPI SHFindFiles(LPCITEMIDLIST,LPCITEMIDLIST);
-void         WINAPI SHFree(LPVOID);
-BOOL         WINAPI SHGetPathFromIDListA(LPCITEMIDLIST pidl,LPSTR pszPath);
-BOOL         WINAPI SHGetPathFromIDListW(LPCITEMIDLIST pidl,LPWSTR pszPath);
-#define             SHGetPathFromIDList WINELIB_NAME_AW(SHGetPathFromIDList)
-HRESULT      WINAPI SHILCreateFromPath(LPCWSTR,LPITEMIDLIST*,DWORD*);
-LPITEMIDLIST WINAPI SHSimpleIDListFromPath(LPCWSTR);
-int          WINAPI SHMapPIDLToSystemImageListIndex(IShellFolder*,LPCITEMIDLIST,int*);
-
-LPITEMIDLIST WINAPI ILAppendID(LPITEMIDLIST,LPCSHITEMID,BOOL);
-LPITEMIDLIST WINAPI ILClone(LPCITEMIDLIST);
-LPITEMIDLIST WINAPI ILCloneFirst(LPCITEMIDLIST);
-LPITEMIDLIST WINAPI ILCreateFromPathA(LPCSTR);
-LPITEMIDLIST WINAPI ILCreateFromPathW(LPCWSTR);
-#define             ILCreateFromPath WINELIB_NAME_AW(ILCreateFromPath)
-LPITEMIDLIST WINAPI ILCombine(LPCITEMIDLIST,LPCITEMIDLIST);
-LPITEMIDLIST WINAPI ILFindChild(LPCITEMIDLIST,LPCITEMIDLIST);
-LPITEMIDLIST WINAPI ILFindLastID(LPCITEMIDLIST);
-void         WINAPI ILFree(LPITEMIDLIST);
-LPITEMIDLIST WINAPI ILGetNext(LPCITEMIDLIST);
-UINT         WINAPI ILGetSize(LPCITEMIDLIST);
-BOOL         WINAPI ILIsEqual(LPCITEMIDLIST,LPCITEMIDLIST);
-BOOL         WINAPI ILIsParent(LPCITEMIDLIST,LPCITEMIDLIST,BOOL);
-BOOL         WINAPI ILRemoveLastID(LPCITEMIDLIST);
-
-HRESULT WINAPI SHCoCreateInstance(LPCWSTR, const CLSID*, LPUNKNOWN, REFIID, LPVOID*);
-
-BOOL WINAPI SHGetPathFromIDListA (LPCITEMIDLIST pidl,LPSTR pszPath);
-BOOL WINAPI SHGetPathFromIDListW (LPCITEMIDLIST pidl,LPWSTR pszPath);
-#define     SHGetPathFromIDList WINELIB_NAME_AW(SHGetPathFromIDList)
-
-/*****************************************************************************
- * Predeclare interfaces
- */
-typedef struct IShellIcon IShellIcon, *LPSHELLICON;
-
-
-/*****************************************************************************
- * IContextMenu interface
- */
-
-
-/* DATAOBJECT_InitShellIDList*/
-#define CFSTR_SHELLIDLIST       "Shell IDList Array"      /* CF_IDLIST */
-
-extern UINT cfShellIDList;
-
-typedef struct
-{	UINT cidl;
-	UINT aoffset[1];
-} CIDA, *LPIDA;
-
-#define CFSTR_SHELLIDLISTOFFSET "Shell Object Offsets"    /* CF_OBJECTPOSITIONS */
-#define CFSTR_NETRESOURCES      "Net Resource"            /* CF_NETRESOURCE */
-
-/* DATAOBJECT_InitFileGroupDesc */
-#define CFSTR_FILEDESCRIPTORA   "FileGroupDescriptor"     /* CF_FILEGROUPDESCRIPTORA */
-extern UINT cfFileGroupDesc;
-
-#define CFSTR_FILEDESCRIPTORW   "FileGroupDescriptorW"    /* CF_FILEGROUPDESCRIPTORW */
-
-/* DATAOBJECT_InitFileContents*/
-#define CFSTR_FILECONTENTS      "FileContents"            /* CF_FILECONTENTS */
-extern UINT cfFileContents;
-
-#define CFSTR_FILENAMEA         "FileName"                /* CF_FILENAMEA */
-#define CFSTR_FILENAMEW         "FileNameW"               /* CF_FILENAMEW */
-#define CFSTR_PRINTERGROUP      "PrinterFriendlyName"     /* CF_PRINTERS */
-#define CFSTR_FILENAMEMAPA      "FileNameMap"             /* CF_FILENAMEMAPA */
-#define CFSTR_FILENAMEMAPW      "FileNameMapW"            /* CF_FILENAMEMAPW */
-#define CFSTR_SHELLURL          "UniformResourceLocator"
-#define CFSTR_PREFERREDDROPEFFECT "Preferred DropEffect"
-#define CFSTR_PERFORMEDDROPEFFECT "Performed DropEffect"
-#define CFSTR_PASTESUCCEEDED    "Paste Succeeded"
-#define CFSTR_INDRAGLOOP        "InShellDragLoop"
-
-#define CFSTR_FILENAME WINELIB_NAME_AW(CFSTR_FILENAME)
-
-
-/************************************************************************
-* IShellView interface
-*/
-
-typedef GUID SHELLVIEWID;
 #define SV_CLASS_NAME   ("SHELLDLL_DefView")
 
-#define FCIDM_SHVIEWFIRST       0x0000
 /* undocumented */
 #define FCIDM_SHVIEW_ARRANGE    0x7001
 #define FCIDM_SHVIEW_DELETE     0x7011
@@ -154,8 +49,6 @@ typedef GUID SHELLVIEWID;
 #define FCIDM_SHVIEW_EXPLORE    0x7101 /* FIXME */
 #define FCIDM_SHVIEW_OPEN       0x7102 /* FIXME */
 
-#define FCIDM_SHVIEWLAST        0x7fff
-#define FCIDM_BROWSERFIRST      0xA000
 /* undocumented toolbar items from stddlg's*/
 #define FCIDM_TB_UPFOLDER       0xA001
 #define FCIDM_TB_NEWFOLDER      0xA002
@@ -163,719 +56,16 @@ typedef GUID SHELLVIEWID;
 #define FCIDM_TB_REPORTVIEW     0xA004
 #define FCIDM_TB_DESKTOP        0xA005  /* FIXME */
 
-#define FCIDM_BROWSERLAST       0xbf00
-#define FCIDM_GLOBALFIRST       0x8000
-#define FCIDM_GLOBALLAST        0x9fff
-
-/*
-* Global submenu IDs and separator IDs
-*/
-#define FCIDM_MENU_FILE             (FCIDM_GLOBALFIRST+0x0000)
-#define FCIDM_MENU_EDIT             (FCIDM_GLOBALFIRST+0x0040)
-#define FCIDM_MENU_VIEW             (FCIDM_GLOBALFIRST+0x0080)
-#define FCIDM_MENU_VIEW_SEP_OPTIONS (FCIDM_GLOBALFIRST+0x0081)
-#define FCIDM_MENU_TOOLS            (FCIDM_GLOBALFIRST+0x00c0)
-#define FCIDM_MENU_TOOLS_SEP_GOTO   (FCIDM_GLOBALFIRST+0x00c1)
-#define FCIDM_MENU_HELP             (FCIDM_GLOBALFIRST+0x0100)
-#define FCIDM_MENU_FIND             (FCIDM_GLOBALFIRST+0x0140)
-#define FCIDM_MENU_EXPLORE          (FCIDM_GLOBALFIRST+0x0150)
-#define FCIDM_MENU_FAVORITES        (FCIDM_GLOBALFIRST+0x0170)
-
-/* control IDs known to the view */
-#define FCIDM_TOOLBAR      (FCIDM_BROWSERFIRST + 0)
-#define FCIDM_STATUS       (FCIDM_BROWSERFIRST + 1)
-
-
-/****************************************************************************
- * IShellIcon interface
- */
-
-#define INTERFACE IShellIcon
-#define IShellIcon_METHODS \
-    IUnknown_METHODS \
-    STDMETHOD(GetIconOf)(THIS_ LPCITEMIDLIST pidl, UINT flags, LPINT lpIconIndex) PURE;
-ICOM_DEFINE(IShellIcon, IUnknown)
-#undef INTERFACE
-
-#ifdef COBJMACROS
-/*** IUnknown methods ***/
-#define IShellIcon_QueryInterface(p,a,b)      (p)->lpVtbl->QueryInterface(p,a,b)
-#define IShellIcon_AddRef(p)                  (p)->lpVtbl->AddRef(p)
-#define IShellIcon_Release(p)                 (p)->lpVtbl->Release(p)
-/*** IShellIcon methods ***/
-#define IShellIcon_GetIconOf(p,a,b,c)         (p)->lpVtbl->GetIconOf(p,a,b,c)
-#endif
-
-/****************************************************************************
-* SHAddToRecentDocs API
-*/
-#define SHARD_PIDL      0x00000001L
-#define SHARD_PATHA     0x00000002L
-#define SHARD_PATHW     0x00000003L
-#define SHARD_PATH WINELIB_NAME_AW(SHARD_PATH)
-
-DWORD WINAPI SHAddToRecentDocs(UINT uFlags, LPCVOID pv);
-
-/****************************************************************************
- * SHBrowseForFolder API
- */
-typedef INT (CALLBACK *BFFCALLBACK)(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData);
-
-typedef struct tagBROWSEINFOA {
-    HWND        hwndOwner;
-    LPCITEMIDLIST pidlRoot;
-    LPSTR         pszDisplayName;
-    LPCSTR        lpszTitle;
-    UINT        ulFlags;
-    BFFCALLBACK   lpfn;
-    LPARAM        lParam;
-    INT         iImage;
-} BROWSEINFOA, *PBROWSEINFOA, *LPBROWSEINFOA;
-
-typedef struct tagBROWSEINFOW {
-    HWND        hwndOwner;
-    LPCITEMIDLIST pidlRoot;
-    LPWSTR        pszDisplayName;
-    LPCWSTR       lpszTitle;
-    UINT        ulFlags;
-    BFFCALLBACK   lpfn;
-    LPARAM        lParam;
-    INT         iImage;
-} BROWSEINFOW, *PBROWSEINFOW, *LPBROWSEINFOW;
-
-#define BROWSEINFO   WINELIB_NAME_AW(BROWSEINFO)
-#define PBROWSEINFO  WINELIB_NAME_AW(PBROWSEINFO)
-#define LPBROWSEINFO WINELIB_NAME_AW(LPBROWSEINFO)
-
-/* Browsing for directory. */
-#define BIF_RETURNONLYFSDIRS   0x0001
-#define BIF_DONTGOBELOWDOMAIN  0x0002
-#define BIF_STATUSTEXT         0x0004
-#define BIF_RETURNFSANCESTORS  0x0008
-#define BIF_EDITBOX            0x0010
-#define BIF_VALIDATE           0x0020
-#define BIF_NEWDIALOGSTYLE     0x0040   
-
-#define BIF_BROWSEFORCOMPUTER  0x1000
-#define BIF_BROWSEFORPRINTER   0x2000
-#define BIF_BROWSEINCLUDEFILES 0x4000
-
-/* message from browser */
-#define BFFM_INITIALIZED        1
-#define BFFM_SELCHANGED         2
-#define BFFM_VALIDATEFAILEDA    3   /* lParam:szPath ret:1(cont),0(EndDialog) */
-#define BFFM_VALIDATEFAILEDW    4   /* lParam:wzPath ret:1(cont),0(EndDialog) */
-
-/* messages to browser */
-#define BFFM_SETSTATUSTEXTA     (WM_USER+100)
-#define BFFM_ENABLEOK           (WM_USER+101)
-#define BFFM_SETSELECTIONA      (WM_USER+102)
-#define BFFM_SETSELECTIONW      (WM_USER+103)
-#define BFFM_SETSTATUSTEXTW     (WM_USER+104)
-#define BFFM_SETOKTEXT          (WM_USER+105)
-#define BFFM_SETEXPANDED        (WM_USER+106)
-
-LPITEMIDLIST WINAPI SHBrowseForFolderA(LPBROWSEINFOA lpbi);
-LPITEMIDLIST WINAPI SHBrowseForFolderW(LPBROWSEINFOW lpbi);
-#define SHBrowseForFolder	 WINELIB_NAME_AW(SHBrowseForFolder)
-#define BFFM_SETSTATUSTEXT  WINELIB_NAME_AW(BFFM_SETSTATUSTEXT)
-#define BFFM_SETSELECTION   WINELIB_NAME_AW(BFFM_SETSELECTION)
-#define BFFM_VALIDATEFAILED WINELIB_NAME_AW(BFFM_VALIDATEFAILED)
-
-/****************************************************************************
-*	SHGetDataFromIDList API
-*/
-#define SHGDFIL_FINDDATA        1
-#define SHGDFIL_NETRESOURCE     2
-#define SHGDFIL_DESCRIPTIONID   3
-
-#define SHDID_ROOT_REGITEM          1
-#define SHDID_FS_FILE               2
-#define SHDID_FS_DIRECTORY          3
-#define SHDID_FS_OTHER              4
-#define SHDID_COMPUTER_DRIVE35      5
-#define SHDID_COMPUTER_DRIVE525     6
-#define SHDID_COMPUTER_REMOVABLE    7
-#define SHDID_COMPUTER_FIXED        8
-#define SHDID_COMPUTER_NETDRIVE     9
-#define SHDID_COMPUTER_CDROM        10
-#define SHDID_COMPUTER_RAMDISK      11
-#define SHDID_COMPUTER_OTHER        12
-#define SHDID_NET_DOMAIN            13
-#define SHDID_NET_SERVER            14
-#define SHDID_NET_SHARE             15
-#define SHDID_NET_RESTOFNET         16
-#define SHDID_NET_OTHER             17
-#define SHDID_COMPUTER_IMAGING      18
-#define SHDID_COMPUTER_AUDIO        19
-#define SHDID_COMPUTER_SHAREDDOCS   20
-
-typedef struct _SHDESCRIPTIONID
-{   DWORD   dwDescriptionId;
-    CLSID   clsid;
-} SHDESCRIPTIONID, *LPSHDESCRIPTIONID;
-
-HRESULT WINAPI SHGetDataFromIDListA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, int nFormat, LPVOID pv, int cb);
-HRESULT WINAPI SHGetDataFromIDListW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, int nFormat, LPVOID pv, int cb);
-#define  SHGetDataFromIDList WINELIB_NAME_AW(SHGetDataFromIDList)
-
-BOOL WINAPI SHGetSpecialFolderPathA (HWND hwndOwner, LPSTR szPath, int nFolder, BOOL bCreate);
-BOOL WINAPI SHGetSpecialFolderPathW (HWND hwndOwner, LPWSTR szPath, int nFolder, BOOL bCreate);
-#define  SHGetSpecialFolderPath WINELIB_NAME_AW(SHGetSpecialFolderPath)
-
-/****************************************************************************
-* shlview structures
-*/
-
-/*
-* IShellFolderViewCallback Callback
-*  This "callback" is called by the shells default IShellView implementation (that
-*  we got using SHCreateShellViewEx()), to notify us of the various things that
-*  are happening to the shellview (and ask for things too).
-*
-*  You don't have to support anything here - anything you don't want to
-*  handle, the shell will do itself if you just return E_NOTIMPL. This parameters
-*  that the shell passes to this function are entirely undocumented.
-*
-*  HOWEVER, as the cabview sample as originally written used this callback, the
-*  writers implemented the callback mechanism on top of their own IShellView.
-*  Look there for some clues on what to do here.
-*/
-
-typedef HRESULT (CALLBACK *SHELLVIEWPROC)(DWORD dwUserParam,LPSHELLFOLDER psf,
-                         HWND hwnd,UINT uMsg,UINT wParam,LPARAM lParam);
-
-/* NF valid values for the "viewmode" item of the SHELLTEMPLATE*/
-#define NF_INHERITVIEW    0x0000
-#define NF_LOCALVIEW        0x0001
-
-typedef struct _SHELLVIEWDATA   /* idl */
-{ DWORD           dwSize;
-  LPSHELLFOLDER   pShellFolder;
-  DWORD           dwUserParam;
-  LPCITEMIDLIST   pidl;
-  DWORD           v3;        /* always 0 */
-  SHELLVIEWPROC   pCallBack;
-  DWORD           viewmode;  /* NF_* enum */
-} SHELLVIEWDATA, * LPSHELLVIEWDATA;
-
-HRESULT WINAPI SHGetMalloc(LPMALLOC *lpmal) ;
-
-/**********************************************************************
- * SHGetSetSettings ()
- */
-
-typedef struct
-{
-    BOOL fShowAllObjects : 1;
-    BOOL fShowExtensions : 1;
-    BOOL fNoConfirmRecycle : 1;
-
-    BOOL fShowSysFiles : 1;
-    BOOL fShowCompColor : 1;
-    BOOL fDoubleClickInWebView : 1;
-    BOOL fDesktopHTML : 1;
-    BOOL fWin95Classic : 1;
-    BOOL fDontPrettyPath : 1;
-    BOOL fShowAttribCol : 1;
-    BOOL fMapNetDrvBtn : 1;
-    BOOL fShowInfoTip : 1;
-    BOOL fHideIcons : 1;
-    BOOL fWebView : 1;
-    BOOL fFilter : 1;
-    BOOL fShowSuperHidden : 1;
-    BOOL fNoNetCrawling : 1;
-
-    DWORD dwWin95Unused;
-    UINT  uWin95Unused;
-    LONG   lParamSort;
-    int    iSortDirection;
-    UINT   version;
-    UINT uNotUsed;
-    BOOL fSepProcess: 1;
-    BOOL fStartPanelOn: 1;
-    BOOL fShowStartPage: 1;
-    UINT fSpareFlags : 13;
-} SHELLSTATE, *LPSHELLSTATE;
-
-/**********************************************************************
- * SHGetSettings ()
- */
-typedef struct
-{	BOOL fShowAllObjects : 1;
-	BOOL fShowExtensions : 1;
-	BOOL fNoConfirmRecycle : 1;
-	BOOL fShowSysFiles : 1;
-
-	BOOL fShowCompColor : 1;
-	BOOL fDoubleClickInWebView : 1;
-	BOOL fDesktopHTML : 1;
-	BOOL fWin95Classic : 1;
-
-	BOOL fDontPrettyPath : 1;
-	BOOL fShowAttribCol : 1;
-	BOOL fMapNetDrvBtn : 1;
-	BOOL fShowInfoTip : 1;
-
-	BOOL fHideIcons : 1;
-	UINT fRestFlags : 3;
-} SHELLFLAGSTATE, * LPSHELLFLAGSTATE;
-
-VOID WINAPI SHGetSettings(LPSHELLFLAGSTATE lpsfs, DWORD dwMask);
-
-#define SSF_SHOWALLOBJECTS		0x0001
-#define SSF_SHOWEXTENSIONS		0x0002
-#define SSF_SHOWCOMPCOLOR		0x0008
-#define SSF_SHOWSYSFILES		0x0020
-#define SSF_DOUBLECLICKINWEBVIEW	0x0080
-#define SSF_SHOWATTRIBCOL		0x0100
-#define SSF_DESKTOPHTML			0x0200
-#define SSF_WIN95CLASSIC		0x0400
-#define SSF_DONTPRETTYPATH		0x0800
-#define SSF_SHOWINFOTIP			0x2000
-#define SSF_MAPNETDRVBUTTON		0x1000
-#define SSF_NOCONFIRMRECYCLE		0x8000
-#define SSF_HIDEICONS			0x4000
-
-/****************************************************************************
-* SHRestricted API
-*/
-typedef enum RESTRICTIONS
-{
-	REST_NONE			= 0x00000000,
-	REST_NORUN			= 0x00000001,
-	REST_NOCLOSE			= 0x00000002,
-	REST_NOSAVESET			= 0x00000004,
-	REST_NOFILEMENU			= 0x00000008,
-	REST_NOSETFOLDERS		= 0x00000010,
-	REST_NOSETTASKBAR		= 0x00000020,
-	REST_NODESKTOP			= 0x00000040,
-	REST_NOFIND			= 0x00000080,
-	REST_NODRIVES			= 0x00000100,
-	REST_NODRIVEAUTORUN		= 0x00000200,
-	REST_NODRIVETYPEAUTORUN		= 0x00000400,
-	REST_NONETHOOD			= 0x00000800,
-	REST_STARTBANNER		= 0x00001000,
-	REST_RESTRICTRUN		= 0x00002000,
-	REST_NOPRINTERTABS		= 0x00004000,
-	REST_NOPRINTERDELETE		= 0x00008000,
-	REST_NOPRINTERADD		= 0x00010000,
-	REST_NOSTARTMENUSUBFOLDERS	= 0x00020000,
-	REST_MYDOCSONNET		= 0x00040000,
-	REST_NOEXITTODOS		= 0x00080000,
-	REST_ENFORCESHELLEXTSECURITY	= 0x00100000,
-	REST_LINKRESOLVEIGNORELINKINFO	= 0x00200000,
-	REST_NOCOMMONGROUPS		= 0x00400000,
-	REST_SEPARATEDESKTOPPROCESS	= 0x00800000,
-	REST_NOWEB			= 0x01000000,
-	REST_NOTRAYCONTEXTMENU		= 0x02000000,
-	REST_NOVIEWCONTEXTMENU		= 0x04000000,
-	REST_NONETCONNECTDISCONNECT	= 0x08000000,
-	REST_STARTMENULOGOFF		= 0x10000000,
-	REST_NOSETTINGSASSIST		= 0x20000000,
-	REST_NOINTERNETICON		= 0x40000001,
-	REST_NORECENTDOCSHISTORY,
-	REST_NORECENTDOCSMENU,
-	REST_NOACTIVEDESKTOP,
-	REST_NOACTIVEDESKTOPCHANGES,
-	REST_NOFAVORITESMENU,
-	REST_CLEARRECENTDOCSONEXIT,
-	REST_CLASSICSHELL,
-	REST_NOCUSTOMIZEWEBVIEW,
-
-	REST_NOHTMLWALLPAPER		= 0x40000010,
-	REST_NOCHANGINGWALLPAPER,
-	REST_NODESKCOMP,
-	REST_NOADDDESKCOMP,
-	REST_NODELDESKCOMP,
-	REST_NOCLOSEDESKCOMP,
-	REST_NOCLOSE_DRAGDROPBAND,
-	REST_NOMOVINGBAND,
-	REST_NOEDITDESKCOMP,
-	REST_NORESOLVESEARCH,
-	REST_NORESOLVETRACK,
-	REST_FORCECOPYACLWITHFILE,
-	REST_NOLOGO3CHANNELNOTIFY,
-	REST_NOFORGETSOFTWAREUPDATE,
-	REST_NOSETACTIVEDESKTOP,
-	REST_NOUPDATEWINDOWS,
-	REST_NOCHANGESTARMENU,		/* 0x40000020 */
-	REST_NOFOLDEROPTIONS,
-	REST_HASFINDCOMPUTERS,
-	REST_INTELLIMENUS,
-	REST_RUNDLGMEMCHECKBOX,
-	REST_ARP_ShowPostSetup,
-	REST_NOCSC,
-	REST_NOCONTROLPANEL,
-	REST_ENUMWORKGROUP,
-	REST_ARP_NOARP,
-	REST_ARP_NOREMOVEPAGE,
-	REST_ARP_NOADDPAGE,
-	REST_ARP_NOWINSETUPPAGE,
-	REST_GREYMSIADS,
-	REST_NOCHANGEMAPPEDDRIVELABEL,
-	REST_NOCHANGEMAPPEDDRIVECOMMENT,
-	REST_MaxRecentDocs,		/* 0x40000030 */
-	REST_NONETWORKCONNECTIONS,
-	REST_FORCESTARTMENULOGOFF,
-	REST_NOWEBVIEW,
-	REST_NOCUSTOMIZETHISFOLDER,
-	REST_NOENCRYPTION,
-
-	REST_ALLOWFRENCHENCRYPTION,	/* not documented */
-
-	REST_DONTSHOWSUPERHIDDEN,
-	REST_NOSHELLSEARCHBUTTON,
-	REST_NOHARDWARETAB,
-	REST_NORUNASINSTALLPROMPT,
-	REST_PROMPTRUNASINSTALLNETPATH,
-	REST_NOMANAGEMYCOMPUTERVERB,
-	REST_NORECENTDOCSNETHOOD,
-	REST_DISALLOWRUN,
-	REST_NOWELCOMESCREEN,
-	REST_RESTRICTCPL,		/* 0x40000040 */
-	REST_DISALLOWCPL,
-	REST_NOSMBALLOONTIP,
-	REST_NOSMHELP,
-	REST_NOWINKEYS,
-	REST_NOENCRYPTONMOVE,
-	REST_NOLOCALMACHINERUN,
-	REST_NOCURRENTUSERRUN,
-	REST_NOLOCALMACHINERUNONCE,
-	REST_NOCURRENTUSERRUNONCE,
-	REST_FORCEACTIVEDESKTOPON,
-	REST_NOCOMPUTERSNEARME,
-	REST_NOVIEWONDRIVE,
-	REST_NONETCRAWL,
-	REST_NOSHAREDDOCUMENTS,
-	REST_NOSMMYDOCS,
-	REST_NOSMMYPICS,		/* 0x40000050 */
-	REST_ALLOWBITBUCKDRIVES,
-	REST_NONLEGACYSHELLMODE,
-	REST_NOCONTROLPANELBARRICADE,
-	REST_NOSTARTPAGE,
-	REST_NOAUTOTRAYNOTIFY,
-	REST_NOTASKGROUPING,
-	REST_NOCDBURNING,
-	REST_MYCOMPNOPROP,
-	REST_MYDOCSNOPROP,
-	REST_NOSTARTPANEL,
-	REST_NODISPLAYAPPEARANCEPAGE,
-	REST_NOTHEMESTAB,
-	REST_NOVISUALSTYLECHOICE,
-	REST_NOSIZECHOICE,
-	REST_NOCOLORCHOICE,
-	REST_SETVISUALSTYLE,		/* 0x40000060 */
-	REST_STARTRUNNOHOMEPATH,
-	REST_NOUSERNAMEINSTARTPANEL,
-	REST_NOMYCOMPUTERICON,
-	REST_NOSMNETWORKPLACES,
-	REST_NOSMPINNEDLIST,
-	REST_NOSMMYMUSIC,
-	REST_NOSMEJECTPC,
-	REST_NOSMMOREPROGRAMS,
-	REST_NOSMMFUPROGRAMS,
-	REST_NOTRAYITEMSDISPLAY,
-	REST_NOTOOLBARSONTASKBAR,
-	/* 0x4000006C
-	   0x4000006D
-	   0x4000006E */
-	REST_NOSMCONFIGUREPROGRAMS	= 0x4000006F,
-	REST_HIDECLOCK,			/* 0x40000070 */
-	REST_NOLOWDISKSPACECHECKS,
-	REST_NOENTIRENETWORK,
-	REST_NODESKTOPCLEANUP,
-	REST_BITBUCKNUKEONDELETE,
-	REST_BITBUCKCONFIRMDELETE,
-	REST_BITBUCKNOPROP,
-	REST_NODISPBACKGROUND,
-	REST_NODISPSCREENSAVEPG,
-	REST_NODISPSETTINGSPG,
-	REST_NODISPSCREENSAVEPREVIEW,
-	REST_NODISPLAYCPL,
-	REST_HIDERUNASVERB,
-	REST_NOTHUMBNAILCACHE,
-	REST_NOSTRCMPLOGICAL,
-	REST_NOPUBLISHWIZARD,
-	REST_NOONLINEPRINTSWIZARD,	/* 0x40000080 */
-	REST_NOWEBSERVICES,
-	REST_ALLOWUNHASHEDWEBVIEW,
-	REST_ALLOWLEGACYWEBVIEW,
-	REST_REVERTWEBVIEWSECURITY,
-	
-	REST_INHERITCONSOLEHANDLES	= 0x40000086,
-
-	REST_NODISCONNECT		= 0x41000001,
-	REST_NOSECURITY,
-	REST_NOFILEASSOCIATE,		/* 0x41000003 */
-} RESTRICTIONS;
-
-DWORD WINAPI SHRestricted(RESTRICTIONS rest);
-
-/****************************************************************************
-* SHChangeNotify API
-*/
-typedef struct _SHChangeNotifyEntry
-{
-    LPCITEMIDLIST pidl;
-    BOOL   fRecursive;
-} SHChangeNotifyEntry;
-
-#define SHCNE_RENAMEITEM	0x00000001
-#define SHCNE_CREATE		0x00000002
-#define SHCNE_DELETE		0x00000004
-#define SHCNE_MKDIR		0x00000008
-#define SHCNE_RMDIR		0x00000010
-#define SHCNE_MEDIAINSERTED	0x00000020
-#define SHCNE_MEDIAREMOVED	0x00000040
-#define SHCNE_DRIVEREMOVED	0x00000080
-#define SHCNE_DRIVEADD		0x00000100
-#define SHCNE_NETSHARE		0x00000200
-#define SHCNE_NETUNSHARE	0x00000400
-#define SHCNE_ATTRIBUTES	0x00000800
-#define SHCNE_UPDATEDIR		0x00001000
-#define SHCNE_UPDATEITEM	0x00002000
-#define SHCNE_SERVERDISCONNECT	0x00004000
-#define SHCNE_UPDATEIMAGE	0x00008000
-#define SHCNE_DRIVEADDGUI	0x00010000
-#define SHCNE_RENAMEFOLDER	0x00020000
-#define SHCNE_FREESPACE		0x00040000
-
-#define SHCNE_EXTENDED_EVENT	0x04000000
-#define SHCNE_ASSOCCHANGED	0x08000000
-#define SHCNE_DISKEVENTS	0x0002381F
-#define SHCNE_GLOBALEVENTS	0x0C0581E0
-#define SHCNE_ALLEVENTS		0x7FFFFFFF
-#define SHCNE_INTERRUPT		0x80000000
-
-#define SHCNEE_ORDERCHANGED	0x0002L
-#define SHCNEE_MSI_CHANGE	0x0004L
-#define SHCNEE_MSI_UNINSTALL	0x0005L
-
-#define SHCNF_IDLIST		0x0000
-#define SHCNF_PATHA		0x0001
-#define SHCNF_PRINTERA		0x0002
-#define SHCNF_DWORD		0x0003
-#define SHCNF_PATHW		0x0005
-#define SHCNF_PRINTERW		0x0006
-#define SHCNF_TYPE		0x00FF
-#define SHCNF_FLUSH		0x1000
-#define SHCNF_FLUSHNOWAIT	0x2000
-
-#define SHCNF_PATH              WINELIB_NAME_AW(SHCNF_PATH)
-#define SHCNF_PRINTER           WINELIB_NAME_AW(SHCNF_PRINTER)
-
-void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID dwItem2);
-
-/*
- * IShellChangeNotify
- */
-typedef struct IShellChangeNotify IShellChangeNotify, *LPSHELLCHANGENOTIFY;
-
-#define INTERFACE IShellChangeNotify
-#define IShellChangeNotify_METHODS \
-    IUnknown_METHODS \
-    STDMETHOD(OnChange)(THIS_ LONG lEvent, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) PURE;
-
-ICOM_DEFINE(IShellChangeNotify, IUnknown)
-#undef INTERFACE
-
-#ifdef COBJMACROS
-/*** IUnknown methods ***/
-#define IShellChangeNotify_QueryInterface(p,a,b)      (p)->lpVtbl->QueryInterface(p,a,b)
-#define IShellChangeNotify_AddRef(p)                  (p)->lpVtbl->AddRef(p)
-#define IShellChangeNotify_Release(p)                 (p)->lpVtbl->Release(p)
-/*** IShellChangeNotify methods ***/
-#define IShellChangeNotify_OnChange(p,a,b,c)         (p)->lpVtbl->OnChange(p,a,b,c)
-#endif
-
-typedef struct _SHChangeDWORDAsIDList {
-    USHORT   cb;
-    DWORD    dwItem1;
-    DWORD    dwItem2;
-    USHORT   cbZero;
-} SHChangeDWORDAsIDList, *LPSHChangeDWORDAsIDList;
-
-typedef struct _SHChangeProductKeyAsIDList {
-    USHORT cb;
-    WCHAR wszProductKey[39];
-    USHORT cbZero;
-} SHChangeProductKeyAsIDList, *LPSHChangeProductKeyAsIDList;
-
-ULONG WINAPI SHChangeNotifyRegister(HWND hwnd, int fSources, LONG fEvents, UINT wMsg,
-                                    int cEntries, SHChangeNotifyEntry *pshcne);
-BOOL WINAPI SHChangeNotifyDeregister(ULONG ulID);
-HANDLE WINAPI SHChangeNotification_Lock(HANDLE hChangeNotification, DWORD dwProcessId,
-                                        LPITEMIDLIST **pppidl, LONG *plEvent);
-BOOL WINAPI SHChangeNotification_Unlock(HANDLE hLock);
-
-HRESULT WINAPI SHGetRealIDL(IShellFolder *psf, LPCITEMIDLIST pidlSimple, LPITEMIDLIST * ppidlReal);
-
-/****************************************************************************
-* SHCreateDirectory API
-*/
-DWORD WINAPI SHCreateDirectory(HWND, LPCVOID);
-DWORD WINAPI SHCreateDirectoryExA(HWND, LPCSTR, LPSECURITY_ATTRIBUTES);
-DWORD WINAPI SHCreateDirectoryExW(HWND, LPCWSTR, LPSECURITY_ATTRIBUTES);
-
-/****************************************************************************
-* SHGetSpecialFolderLocation API
-*/
-HRESULT WINAPI SHGetSpecialFolderLocation(HWND hwndOwner, int nFolder, LPITEMIDLIST * ppidl);
-HRESULT WINAPI SHGetFolderLocation(HWND hwndOwner, int nFolder, HANDLE hToken, DWORD dwReserved, LPITEMIDLIST *ppidl);
-
-#define CSIDL_DESKTOP		0x0000
-#define CSIDL_INTERNET		0x0001
-#define CSIDL_PROGRAMS		0x0002
-#define CSIDL_CONTROLS		0x0003
-#define CSIDL_PRINTERS		0x0004
-#define CSIDL_PERSONAL		0x0005
-#define CSIDL_FAVORITES		0x0006
-#define CSIDL_STARTUP		0x0007
-#define CSIDL_RECENT		0x0008
-#define CSIDL_SENDTO		0x0009
-#define CSIDL_BITBUCKET		0x000a
-#define CSIDL_STARTMENU		0x000b
-#define CSIDL_MYDOCUMENTS	0x000c
-#define CSIDL_MYMUSIC		0x000d
-#define CSIDL_MYVIDEO		0x000e
-#define CSIDL_DESKTOPDIRECTORY	0x0010
-#define CSIDL_DRIVES		0x0011
-#define CSIDL_NETWORK		0x0012
-#define CSIDL_NETHOOD		0x0013
-#define CSIDL_FONTS		0x0014
-#define CSIDL_TEMPLATES		0x0015
-#define CSIDL_COMMON_STARTMENU	0x0016
-#define CSIDL_COMMON_PROGRAMS	0X0017
-#define CSIDL_COMMON_STARTUP	0x0018
-#define CSIDL_COMMON_DESKTOPDIRECTORY	0x0019
-#define CSIDL_APPDATA		0x001a
-#define CSIDL_PRINTHOOD		0x001b
-#define CSIDL_LOCAL_APPDATA	0x001c
-#define CSIDL_ALTSTARTUP	0x001d
-#define CSIDL_COMMON_ALTSTARTUP	0x001e
-#define CSIDL_COMMON_FAVORITES  0x001f
-#define CSIDL_INTERNET_CACHE	0x0020
-#define CSIDL_COOKIES		0x0021
-#define CSIDL_HISTORY		0x0022
-#define CSIDL_COMMON_APPDATA	0x0023
-#define CSIDL_WINDOWS		0x0024
-#define CSIDL_SYSTEM		0x0025
-#define CSIDL_PROGRAM_FILES	0x0026
-#define CSIDL_MYPICTURES	0x0027
-#define CSIDL_PROFILE		0x0028
-#define CSIDL_SYSTEMX86		0x0029
-#define CSIDL_PROGRAM_FILESX86	0x002a
-#define CSIDL_PROGRAM_FILES_COMMON	0x002b
-#define CSIDL_PROGRAM_FILES_COMMONX86	0x002c
-#define CSIDL_COMMON_TEMPLATES	0x002d
-#define CSIDL_COMMON_DOCUMENTS	0x002e
-#define CSIDL_COMMON_ADMINTOOLS	0x002f
-#define CSIDL_ADMINTOOLS	0x0030
-#define CSIDL_CONNECTIONS	0x0031
-#define CSIDL_COMMON_MUSIC	0x0035
-#define CSIDL_COMMON_PICTURES	0x0036
-#define CSIDL_COMMON_VIDEO	0x0037
-#define CSIDL_RESOURCES		0x0038
-#define CSIDL_RESOURCES_LOCALIZED 0x0039
-#define CSIDL_COMMON_OEM_LINKS	0x003a
-#define CSIDL_CDBURN_AREA	0x003b
-#define CSIDL_COMPUTERSNEARME	0x003d
-#define CSIDL_PROFILES		0x003e
 #define CSIDL_FOLDER_MASK	0x00ff
-#define CSIDL_FLAG_PER_USER_INIT 0x0800
-#define CSIDL_FLAG_NO_ALIAS	0x1000
-#define CSIDL_FLAG_DONT_VERIFY	0x4000
-#define CSIDL_FLAG_CREATE	0x8000
 
-#define CSIDL_FLAG_MASK		0xff00
-
-/****************************************************************************
- * SHGetDesktopFolder API
- */
-DWORD WINAPI SHGetDesktopFolder(IShellFolder * *);
-
-/****************************************************************************
- * SHBindToParent API
- */
-HRESULT WINAPI SHBindToParent(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCITEMIDLIST *ppidlLast);
-
-/****************************************************************************
-* SHDefExtractIcon API
-*/
-HRESULT WINAPI SHDefExtractIconA(LPCSTR pszIconFile, int iIndex, UINT uFlags,
-                                 HICON* phiconLarge, HICON* phiconSmall, UINT nIconSize);
-HRESULT WINAPI SHDefExtractIconW(LPCWSTR pszIconFile, int iIndex, UINT uFlags,
-                                 HICON* phiconLarge, HICON* phiconSmall, UINT nIconSize);
-#define        SHDefExtractIcon WINELIB_NAME_AW(SHDefExtractIcon)
-
-/*
- * DROPFILES for CF_HDROP and CF_PRINTERS
- */
-typedef struct _DROPFILES
-{
-  DWORD pFiles;
-  POINT pt;
-  BOOL  fNC;
-  BOOL  fWide;
-} DROPFILES, *LPDROPFILES;
-
-#include <poppack.h> 
+LPVOID WINAPI SHAlloc(ULONG);
+void WINAPI SHFree(LPVOID);
+int WINAPI SHMapPIDLToSystemImageListIndex(IShellFolder*,LPCITEMIDLIST,int*);
 
 /*****************************************************************************
  * IFileSystemBindData interface
  */
-#ifndef __IFileSystemBindData_FWD_DEFINED__
-#define __IFileSystemBindData_FWD_DEFINED__
-typedef struct IFileSystemBindData IFileSystemBindData;
-#endif
-
-typedef IFileSystemBindData *LPFILESYSTEMBINDDATA;
-
-#ifndef __IFileSystemBindData_INTERFACE_DEFINED__
-#define __IFileSystemBindData_INTERFACE_DEFINED__
-
 DEFINE_GUID(IID_IFileSystemBindData, 0x01e18d10, 0x4d8b, 0x11d2, 0x85,0x5d, 0x00,0x60,0x08,0x05,0x93,0x67);
-#if defined(__cplusplus) && !defined(CINTERFACE)
-struct IFileSystemBindData : public IUnknown
-{
-    virtual HRESULT STDMETHODCALLTYPE GetFindData(
-        WIN32_FIND_DATAW* pfd) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SetFindData(
-        const WIN32_FIND_DATAW* pfd) = 0;
-
-};
-#else
-typedef struct IFileSystemBindDataVtbl IFileSystemBindDataVtbl;
-struct IFileSystemBindData {
-    const IFileSystemBindDataVtbl* lpVtbl;
-};
-struct IFileSystemBindDataVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
-    /*** IUnknown methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFileSystemBindData* This,
-        REFIID riid,
-        void** ppvObject);
-
-    ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFileSystemBindData* This);
-
-    ULONG (STDMETHODCALLTYPE *Release)(
-        IFileSystemBindData* This);
-
-    /*** IFileSystemBindData methods ***/
-    HRESULT (STDMETHODCALLTYPE *GetFindData)(
-        IFileSystemBindData* This,
-        WIN32_FIND_DATAW* pfd);
-
-    HRESULT (STDMETHODCALLTYPE *SetFindData)(
-        IFileSystemBindData* This,
-        const WIN32_FIND_DATAW* pfd);
-
-};
 
 /*** IUnknown methods ***/
 #define IFileSystemBindData_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
@@ -885,73 +75,4 @@ struct IFileSystemBindDataVtbl {
 #define IFileSystemBindData_GetFindData(p,a) (p)->lpVtbl->GetFindData(p,a)
 #define IFileSystemBindData_SetFindData(p,a) (p)->lpVtbl->SetFindData(p,a)
 
-#endif
-
-#define IFileSystemBindData_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
-    /*** IUnknown methods ***/ \
-    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
-    STDMETHOD_(ULONG,Release)(THIS) PURE; \
-    /*** IFileSystemBindData methods ***/ \
-    STDMETHOD_(HRESULT,GetFindData)(THIS_ WIN32_FIND_DATAW* pfd) PURE; \
-    STDMETHOD_(HRESULT,SetFindData)(THIS_ const WIN32_FIND_DATAW* pfd) PURE;
-
-#endif  /* __IFileSystemBindData_INTERFACE_DEFINED__ */
-
-
-/****************************************************************************
- * Drag And Drop Routines
- */
-
-/* DAD_AutoScroll sample structure */
-#define NUM_POINTS 3
-typedef struct
-{
-    int   iNextSample;
-    DWORD dwLastScroll;
-    BOOL  bFull;
-    POINT pts[NUM_POINTS];
-    DWORD dwTimes[NUM_POINTS];
-} AUTO_SCROLL_DATA;
-
-BOOL         WINAPI DAD_SetDragImage(HIMAGELIST,LPPOINT);
-BOOL         WINAPI DAD_DragEnterEx(HWND,POINT);
-BOOL         WINAPI DAD_DragEnterEx2(HWND,POINT,IDataObject*);
-BOOL         WINAPI DAD_DragMove(POINT);
-BOOL         WINAPI DAD_DragLeave(void);
-BOOL         WINAPI DAD_AutoScroll(HWND,AUTO_SCROLL_DATA*,LPPOINT);
-HRESULT      WINAPI SHDoDragDrop(HWND,IDataObject*,IDropSource*,DWORD,LPDWORD);
-
-
-/****************************************************************************
- * Cabinet functions
- */
-
-typedef struct {
-    WORD cLength;
-    WORD nVersion;
-    BOOL fFullPathTitle:1;
-    BOOL fSaveLocalView:1;
-    BOOL fNotShell:1;
-    BOOL fSimpleDefault:1;
-    BOOL fDontShowDescBar:1;
-    BOOL fNewWindowMode:1;
-    BOOL fShowCompColor:1;
-    BOOL fDontPrettyNames:1;
-    BOOL fAdminsCreateCommonGroups:1;
-    UINT fUnusedFlags:7;
-    UINT fMenuEnumFilter;
-} CABINETSTATE, *LPCABINETSTATE;
-
-#define CABINETSTATE_VERSION 2
-
-BOOL WINAPI ReadCabinetState(CABINETSTATE *, int);
-BOOL WINAPI WriteCabinetState(CABINETSTATE *);
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif /* defined(__cplusplus) */
-
 #endif /* __WINE_SHLOBJ_H */
diff --git a/reactos/include/wine/shobjidl.h b/reactos/include/wine/shobjidl.h
index 77a741bbcd0..874711f7457 100644
--- a/reactos/include/wine/shobjidl.h
+++ b/reactos/include/wine/shobjidl.h
@@ -1,4240 +1,41 @@
-/*** Autogenerated by WIDL 0.1 from shobjidl.idl - Do not edit ***/
-#include <rpc.h>
-#include <rpcndr.h>
-
-#ifndef __WIDL_SHOBJIDL_H
-#define __WIDL_SHOBJIDL_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <objidl.h>
-#include <oleidl.h>
-#include <oaidl.h>
-#include <shtypes.h>
-#include <servprov.h>
-#include <comcat.h>
-#ifndef __IPersistFolder_FWD_DEFINED__
-#define __IPersistFolder_FWD_DEFINED__
-typedef struct IPersistFolder IPersistFolder;
-#endif
-
-typedef IPersistFolder *LPPERSISTFOLDER;
-
-/*****************************************************************************
- * IPersistFolder interface
+/* $Id: shobjidl.h,v 1.4 2004/06/29 13:40:40 gvg Exp $
+ *
+ * Compatibility header
+ *
+ * This header is wrapper to allow compilation of Wine DLLs under ReactOS
+ * build system. It contains definitions commonly refered to as Wineisms
+ * and definitions that are missing in w32api.
  */
-#ifndef __IPersistFolder_INTERFACE_DEFINED__
-#define __IPersistFolder_INTERFACE_DEFINED__
 
-DEFINE_GUID(IID_IPersistFolder, 0x000214ea, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46);
-#if defined(__cplusplus) && !defined(CINTERFACE)
-struct IPersistFolder : public IPersist
-{
-    virtual HRESULT STDMETHODCALLTYPE Initialize(
-        LPCITEMIDLIST pidl) = 0;
 
-};
-#else
-typedef struct IPersistFolderVtbl IPersistFolderVtbl;
-struct IPersistFolder {
-    const IPersistFolderVtbl* lpVtbl;
-};
-struct IPersistFolderVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
+#ifndef __WINE_SHOBJIDL_H
+#define __WINE_SHOBJIDL_H
 
-    /*** IUnknown methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPersistFolder* This,
-        REFIID riid,
-        void** ppvObject);
-
-    ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPersistFolder* This);
-
-    ULONG (STDMETHODCALLTYPE *Release)(
-        IPersistFolder* This);
-
-    /*** IPersist methods ***/
-    HRESULT (STDMETHODCALLTYPE *GetClassID)(
-        IPersistFolder* This,
-        CLSID* pClassID);
-
-    /*** IPersistFolder methods ***/
-    HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IPersistFolder* This,
-        LPCITEMIDLIST pidl);
-
-};
-
-/*** IUnknown methods ***/
-#define IPersistFolder_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IPersistFolder_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IPersistFolder_Release(p) (p)->lpVtbl->Release(p)
-/*** IPersist methods ***/
-#define IPersistFolder_GetClassID(p,a) (p)->lpVtbl->GetClassID(p,a)
-/*** IPersistFolder methods ***/
-#define IPersistFolder_Initialize(p,a) (p)->lpVtbl->Initialize(p,a)
-
-#endif
-
-#define IPersistFolder_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
-    /*** IUnknown methods ***/ \
-    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
-    STDMETHOD_(ULONG,Release)(THIS) PURE; \
-    /*** IPersist methods ***/ \
-    STDMETHOD_(HRESULT,GetClassID)(THIS_ CLSID* pClassID) PURE; \
-    /*** IPersistFolder methods ***/ \
-    STDMETHOD_(HRESULT,Initialize)(THIS_ LPCITEMIDLIST pidl) PURE;
-
-HRESULT CALLBACK IPersistFolder_Initialize_Proxy(
-    IPersistFolder* This,
-    LPCITEMIDLIST pidl);
-void __RPC_STUB IPersistFolder_Initialize_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-
-#endif  /* __IPersistFolder_INTERFACE_DEFINED__ */
-
-#ifndef __IPersistFolder2_FWD_DEFINED__
-#define __IPersistFolder2_FWD_DEFINED__
-typedef struct IPersistFolder2 IPersistFolder2;
-#endif
-
-typedef IPersistFolder2 *LPPERSISTFOLDER2;
-
-/*****************************************************************************
- * IPersistFolder2 interface
- */
-#ifndef __IPersistFolder2_INTERFACE_DEFINED__
-#define __IPersistFolder2_INTERFACE_DEFINED__
-
-DEFINE_GUID(IID_IPersistFolder2, 0x1ac3d9f0, 0x175c, 0x11d1, 0x95,0xbe, 0x00,0x60,0x97,0x97,0xea,0x4f);
-#if defined(__cplusplus) && !defined(CINTERFACE)
-struct IPersistFolder2 : public IPersistFolder
-{
-    virtual HRESULT STDMETHODCALLTYPE GetCurFolder(
-        LPITEMIDLIST* ppidl) = 0;
-
-};
-#else
-typedef struct IPersistFolder2Vtbl IPersistFolder2Vtbl;
-struct IPersistFolder2 {
-    const IPersistFolder2Vtbl* lpVtbl;
-};
-struct IPersistFolder2Vtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
-    /*** IUnknown methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPersistFolder2* This,
-        REFIID riid,
-        void** ppvObject);
-
-    ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPersistFolder2* This);
-
-    ULONG (STDMETHODCALLTYPE *Release)(
-        IPersistFolder2* This);
-
-    /*** IPersist methods ***/
-    HRESULT (STDMETHODCALLTYPE *GetClassID)(
-        IPersistFolder2* This,
-        CLSID* pClassID);
-
-    /*** IPersistFolder methods ***/
-    HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IPersistFolder2* This,
-        LPCITEMIDLIST pidl);
-
-    /*** IPersistFolder2 methods ***/
-    HRESULT (STDMETHODCALLTYPE *GetCurFolder)(
-        IPersistFolder2* This,
-        LPITEMIDLIST* ppidl);
-
-};
-
-/*** IUnknown methods ***/
-#define IPersistFolder2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IPersistFolder2_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IPersistFolder2_Release(p) (p)->lpVtbl->Release(p)
-/*** IPersist methods ***/
-#define IPersistFolder2_GetClassID(p,a) (p)->lpVtbl->GetClassID(p,a)
-/*** IPersistFolder methods ***/
-#define IPersistFolder2_Initialize(p,a) (p)->lpVtbl->Initialize(p,a)
-/*** IPersistFolder2 methods ***/
-#define IPersistFolder2_GetCurFolder(p,a) (p)->lpVtbl->GetCurFolder(p,a)
-
-#endif
-
-#define IPersistFolder2_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
-    /*** IUnknown methods ***/ \
-    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
-    STDMETHOD_(ULONG,Release)(THIS) PURE; \
-    /*** IPersist methods ***/ \
-    STDMETHOD_(HRESULT,GetClassID)(THIS_ CLSID* pClassID) PURE; \
-    /*** IPersistFolder methods ***/ \
-    STDMETHOD_(HRESULT,Initialize)(THIS_ LPCITEMIDLIST pidl) PURE; \
-    /*** IPersistFolder2 methods ***/ \
-    STDMETHOD_(HRESULT,GetCurFolder)(THIS_ LPITEMIDLIST* ppidl) PURE;
-
-HRESULT CALLBACK IPersistFolder2_GetCurFolder_Proxy(
-    IPersistFolder2* This,
-    LPITEMIDLIST* ppidl);
-void __RPC_STUB IPersistFolder2_GetCurFolder_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-
-#endif  /* __IPersistFolder2_INTERFACE_DEFINED__ */
-
-#ifndef __IEnumIDList_FWD_DEFINED__
-#define __IEnumIDList_FWD_DEFINED__
-typedef struct IEnumIDList IEnumIDList;
-#endif
-
-typedef IEnumIDList *LPENUMIDLIST;
-
-/*****************************************************************************
- * IEnumIDList interface
- */
-#ifndef __IEnumIDList_INTERFACE_DEFINED__
-#define __IEnumIDList_INTERFACE_DEFINED__
-
-DEFINE_GUID(IID_IEnumIDList, 0x000214f2, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46);
-#if defined(__cplusplus) && !defined(CINTERFACE)
-struct IEnumIDList : public IUnknown
-{
-    virtual HRESULT STDMETHODCALLTYPE Next(
-        ULONG celt,
-        LPITEMIDLIST* rgelt,
-        ULONG* pceltFetched) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE Skip(
-        ULONG celt) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE Reset(
-        ) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE Clone(
-        IEnumIDList** ppenum) = 0;
-
-};
-#else
-typedef struct IEnumIDListVtbl IEnumIDListVtbl;
-struct IEnumIDList {
-    const IEnumIDListVtbl* lpVtbl;
-};
-struct IEnumIDListVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
-    /*** IUnknown methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumIDList* This,
-        REFIID riid,
-        void** ppvObject);
-
-    ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumIDList* This);
-
-    ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumIDList* This);
-
-    /*** IEnumIDList methods ***/
-    HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumIDList* This,
-        ULONG celt,
-        LPITEMIDLIST* rgelt,
-        ULONG* pceltFetched);
-
-    HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumIDList* This,
-        ULONG celt);
-
-    HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumIDList* This);
-
-    HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumIDList* This,
-        IEnumIDList** ppenum);
-
-};
-
-/*** IUnknown methods ***/
-#define IEnumIDList_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IEnumIDList_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IEnumIDList_Release(p) (p)->lpVtbl->Release(p)
-/*** IEnumIDList methods ***/
-#define IEnumIDList_Next(p,a,b,c) (p)->lpVtbl->Next(p,a,b,c)
-#define IEnumIDList_Skip(p,a) (p)->lpVtbl->Skip(p,a)
-#define IEnumIDList_Reset(p) (p)->lpVtbl->Reset(p)
-#define IEnumIDList_Clone(p,a) (p)->lpVtbl->Clone(p,a)
-
-#endif
-
-#define IEnumIDList_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
-    /*** IUnknown methods ***/ \
-    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
-    STDMETHOD_(ULONG,Release)(THIS) PURE; \
-    /*** IEnumIDList methods ***/ \
-    STDMETHOD_(HRESULT,Next)(THIS_ ULONG celt, LPITEMIDLIST* rgelt, ULONG* pceltFetched) PURE; \
-    STDMETHOD_(HRESULT,Skip)(THIS_ ULONG celt) PURE; \
-    STDMETHOD_(HRESULT,Reset)(THIS) PURE; \
-    STDMETHOD_(HRESULT,Clone)(THIS_ IEnumIDList** ppenum) PURE;
-
-HRESULT CALLBACK IEnumIDList_Next_Proxy(
-    IEnumIDList* This,
-    ULONG celt,
-    LPITEMIDLIST* rgelt,
-    ULONG* pceltFetched);
-void __RPC_STUB IEnumIDList_Next_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IEnumIDList_Skip_Proxy(
-    IEnumIDList* This,
-    ULONG celt);
-void __RPC_STUB IEnumIDList_Skip_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IEnumIDList_Reset_Proxy(
-    IEnumIDList* This);
-void __RPC_STUB IEnumIDList_Reset_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IEnumIDList_Clone_Proxy(
-    IEnumIDList* This,
-    IEnumIDList** ppenum);
-void __RPC_STUB IEnumIDList_Clone_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-
-#endif  /* __IEnumIDList_INTERFACE_DEFINED__ */
-
-#ifndef __IShellFolder_FWD_DEFINED__
-#define __IShellFolder_FWD_DEFINED__
-typedef struct IShellFolder IShellFolder;
-#endif
-
-typedef IShellFolder *LPSHELLFOLDER;
-
-typedef enum tagSHGDN {
-    SHGDN_NORMAL = 0,
-    SHGDN_INFOLDER = 1,
-    SHGDN_FOREDITING = 0x1000,
-    SHGDN_INCLUDE_NONFILESYS = 0x2000,
-    SHGDN_FORADDRESSBAR = 0x4000,
-    SHGDN_FORPARSING = 0x8000
-} SHGNO;
-
-typedef DWORD SHGDNF;
-
-enum tagSHCONTF {
-    SHCONTF_FOLDERS = 32,
-    SHCONTF_NONFOLDERS = 64,
-    SHCONTF_INCLUDEHIDDEN = 128,
-    SHCONTF_INIT_ON_FIRST_NEXT = 256,
-    SHCONTF_NETPRINTERSRCH = 512,
-    SHCONTF_SHAREABLE = 1024,
-    SHCONTF_STORAGE = 2048
-};
-
-typedef DWORD SHCONTF;
-
-#define SFGAO_CANCOPY           DROPEFFECT_COPY
-#define SFGAO_CANMOVE           DROPEFFECT_MOVE
-#define SFGAO_CANLINK           DROPEFFECT_LINK
-#define SFGAO_CANRENAME         0x00000010L
-#define SFGAO_CANDELETE         0x00000020L
-#define SFGAO_HASPROPSHEET      0x00000040L
-#define SFGAO_DROPTARGET        0x00000100L
-#define SFGAO_CAPABILITYMASK    0x00000177L
-#define SFGAO_LINK              0x00010000L
-#define SFGAO_SHARE             0x00020000L
-#define SFGAO_READONLY          0x00040000L
-#define SFGAO_GHOSTED           0x00080000L
-#define SFGAO_HIDDEN            0x00080000L
-#define SFGAO_DISPLAYATTRMASK   0x000F0000L
-#define SFGAO_FILESYSANCESTOR   0x10000000L
-#define SFGAO_FOLDER            0x20000000L
-#define SFGAO_FILESYSTEM        0x40000000L
-#define SFGAO_HASSUBFOLDER      0x80000000L
-#define SFGAO_CONTENTSMASK      0x80000000L
-#define SFGAO_VALIDATE          0x01000000L
-#define SFGAO_REMOVABLE         0x02000000L
-#define SFGAO_COMPRESSED        0x04000000L
-#define SFGAO_BROWSABLE         0x08000000L
-#define SFGAO_NONENUMERATED     0x00100000L
-#define SFGAO_NEWCONTENT        0x00200000L
-typedef ULONG SFGAOF;
-
-/*****************************************************************************
- * IShellFolder interface
- */
-#ifndef __IShellFolder_INTERFACE_DEFINED__
-#define __IShellFolder_INTERFACE_DEFINED__
-
-DEFINE_GUID(IID_IShellFolder, 0x000214e6, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46);
-#if defined(__cplusplus) && !defined(CINTERFACE)
-struct IShellFolder : public IUnknown
-{
-    virtual HRESULT STDMETHODCALLTYPE ParseDisplayName(
-        HWND hwndOwner,
-        LPBC pbcReserved,
-        LPOLESTR lpszDisplayName,
-        ULONG* pchEaten,
-        LPITEMIDLIST* ppidl,
-        ULONG* pdwAttributes) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE EnumObjects(
-        HWND hwndOwner,
-        SHCONTF grfFlags,
-        IEnumIDList** ppenumIDList) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE BindToObject(
-        LPCITEMIDLIST pidl,
-        LPBC pbcReserved,
-        REFIID riid,
-        void** ppvOut) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE BindToStorage(
-        LPCITEMIDLIST pidl,
-        LPBC pbcReserved,
-        REFIID riid,
-        void** ppvObj) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE CompareIDs(
-        LPARAM lParam,
-        LPCITEMIDLIST pidl1,
-        LPCITEMIDLIST pidl2) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE CreateViewObject(
-        HWND hwndOwner,
-        REFIID riid,
-        void** ppvOut) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE GetAttributesOf(
-        UINT cidl,
-        LPCITEMIDLIST* apidl,
-        SFGAOF* rgfInOut) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE GetUIObjectOf(
-        HWND hwndOwner,
-        UINT cidl,
-        LPCITEMIDLIST* apidl,
-        REFIID riid,
-        UINT* prgfInOut,
-        void** ppvOut) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE GetDisplayNameOf(
-        LPCITEMIDLIST pidl,
-        SHGDNF uFlags,
-        STRRET* lpName) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SetNameOf(
-        HWND hwnd,
-        LPCITEMIDLIST pidl,
-        LPCOLESTR lpszName,
-        SHGDNF uFlags,
-        LPITEMIDLIST* ppidlOut) = 0;
-
-};
-#else
-typedef struct IShellFolderVtbl IShellFolderVtbl;
-struct IShellFolder {
-    const IShellFolderVtbl* lpVtbl;
-};
-struct IShellFolderVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
-    /*** IUnknown methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellFolder* This,
-        REFIID riid,
-        void** ppvObject);
-
-    ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellFolder* This);
-
-    ULONG (STDMETHODCALLTYPE *Release)(
-        IShellFolder* This);
-
-    /*** IShellFolder methods ***/
-    HRESULT (STDMETHODCALLTYPE *ParseDisplayName)(
-        IShellFolder* This,
-        HWND hwndOwner,
-        LPBC pbcReserved,
-        LPOLESTR lpszDisplayName,
-        ULONG* pchEaten,
-        LPITEMIDLIST* ppidl,
-        ULONG* pdwAttributes);
-
-    HRESULT (STDMETHODCALLTYPE *EnumObjects)(
-        IShellFolder* This,
-        HWND hwndOwner,
-        SHCONTF grfFlags,
-        IEnumIDList** ppenumIDList);
-
-    HRESULT (STDMETHODCALLTYPE *BindToObject)(
-        IShellFolder* This,
-        LPCITEMIDLIST pidl,
-        LPBC pbcReserved,
-        REFIID riid,
-        void** ppvOut);
-
-    HRESULT (STDMETHODCALLTYPE *BindToStorage)(
-        IShellFolder* This,
-        LPCITEMIDLIST pidl,
-        LPBC pbcReserved,
-        REFIID riid,
-        void** ppvObj);
-
-    HRESULT (STDMETHODCALLTYPE *CompareIDs)(
-        IShellFolder* This,
-        LPARAM lParam,
-        LPCITEMIDLIST pidl1,
-        LPCITEMIDLIST pidl2);
-
-    HRESULT (STDMETHODCALLTYPE *CreateViewObject)(
-        IShellFolder* This,
-        HWND hwndOwner,
-        REFIID riid,
-        void** ppvOut);
-
-    HRESULT (STDMETHODCALLTYPE *GetAttributesOf)(
-        IShellFolder* This,
-        UINT cidl,
-        LPCITEMIDLIST* apidl,
-        SFGAOF* rgfInOut);
-
-    HRESULT (STDMETHODCALLTYPE *GetUIObjectOf)(
-        IShellFolder* This,
-        HWND hwndOwner,
-        UINT cidl,
-        LPCITEMIDLIST* apidl,
-        REFIID riid,
-        UINT* prgfInOut,
-        void** ppvOut);
-
-    HRESULT (STDMETHODCALLTYPE *GetDisplayNameOf)(
-        IShellFolder* This,
-        LPCITEMIDLIST pidl,
-        SHGDNF uFlags,
-        STRRET* lpName);
-
-    HRESULT (STDMETHODCALLTYPE *SetNameOf)(
-        IShellFolder* This,
-        HWND hwnd,
-        LPCITEMIDLIST pidl,
-        LPCOLESTR lpszName,
-        SHGDNF uFlags,
-        LPITEMIDLIST* ppidlOut);
-
-};
-
-/*** IUnknown methods ***/
-#define IShellFolder_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IShellFolder_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IShellFolder_Release(p) (p)->lpVtbl->Release(p)
-/*** IShellFolder methods ***/
-#define IShellFolder_ParseDisplayName(p,a,b,c,d,e,f) (p)->lpVtbl->ParseDisplayName(p,a,b,c,d,e,f)
-#define IShellFolder_EnumObjects(p,a,b,c) (p)->lpVtbl->EnumObjects(p,a,b,c)
-#define IShellFolder_BindToObject(p,a,b,c,d) (p)->lpVtbl->BindToObject(p,a,b,c,d)
-#define IShellFolder_BindToStorage(p,a,b,c,d) (p)->lpVtbl->BindToStorage(p,a,b,c,d)
-#define IShellFolder_CompareIDs(p,a,b,c) (p)->lpVtbl->CompareIDs(p,a,b,c)
-#define IShellFolder_CreateViewObject(p,a,b,c) (p)->lpVtbl->CreateViewObject(p,a,b,c)
-#define IShellFolder_GetAttributesOf(p,a,b,c) (p)->lpVtbl->GetAttributesOf(p,a,b,c)
-#define IShellFolder_GetUIObjectOf(p,a,b,c,d,e,f) (p)->lpVtbl->GetUIObjectOf(p,a,b,c,d,e,f)
-#define IShellFolder_GetDisplayNameOf(p,a,b,c) (p)->lpVtbl->GetDisplayNameOf(p,a,b,c)
-#define IShellFolder_SetNameOf(p,a,b,c,d,e) (p)->lpVtbl->SetNameOf(p,a,b,c,d,e)
-
-#endif
-
-#define IShellFolder_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
-    /*** IUnknown methods ***/ \
-    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
-    STDMETHOD_(ULONG,Release)(THIS) PURE; \
-    /*** IShellFolder methods ***/ \
-    STDMETHOD_(HRESULT,ParseDisplayName)(THIS_ HWND hwndOwner, LPBC pbcReserved, LPOLESTR lpszDisplayName, ULONG* pchEaten, LPITEMIDLIST* ppidl, ULONG* pdwAttributes) PURE; \
-    STDMETHOD_(HRESULT,EnumObjects)(THIS_ HWND hwndOwner, SHCONTF grfFlags, IEnumIDList** ppenumIDList) PURE; \
-    STDMETHOD_(HRESULT,BindToObject)(THIS_ LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, void** ppvOut) PURE; \
-    STDMETHOD_(HRESULT,BindToStorage)(THIS_ LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, void** ppvObj) PURE; \
-    STDMETHOD_(HRESULT,CompareIDs)(THIS_ LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) PURE; \
-    STDMETHOD_(HRESULT,CreateViewObject)(THIS_ HWND hwndOwner, REFIID riid, void** ppvOut) PURE; \
-    STDMETHOD_(HRESULT,GetAttributesOf)(THIS_ UINT cidl, LPCITEMIDLIST* apidl, SFGAOF* rgfInOut) PURE; \
-    STDMETHOD_(HRESULT,GetUIObjectOf)(THIS_ HWND hwndOwner, UINT cidl, LPCITEMIDLIST* apidl, REFIID riid, UINT* prgfInOut, void** ppvOut) PURE; \
-    STDMETHOD_(HRESULT,GetDisplayNameOf)(THIS_ LPCITEMIDLIST pidl, SHGDNF uFlags, STRRET* lpName) PURE; \
-    STDMETHOD_(HRESULT,SetNameOf)(THIS_ HWND hwnd, LPCITEMIDLIST pidl, LPCOLESTR lpszName, SHGDNF uFlags, LPITEMIDLIST* ppidlOut) PURE;
-
-HRESULT CALLBACK IShellFolder_ParseDisplayName_Proxy(
-    IShellFolder* This,
-    HWND hwndOwner,
-    LPBC pbcReserved,
-    LPOLESTR lpszDisplayName,
-    ULONG* pchEaten,
-    LPITEMIDLIST* ppidl,
-    ULONG* pdwAttributes);
-void __RPC_STUB IShellFolder_ParseDisplayName_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellFolder_EnumObjects_Proxy(
-    IShellFolder* This,
-    HWND hwndOwner,
-    SHCONTF grfFlags,
-    IEnumIDList** ppenumIDList);
-void __RPC_STUB IShellFolder_EnumObjects_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellFolder_BindToObject_Proxy(
-    IShellFolder* This,
-    LPCITEMIDLIST pidl,
-    LPBC pbcReserved,
-    REFIID riid,
-    void** ppvOut);
-void __RPC_STUB IShellFolder_BindToObject_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellFolder_BindToStorage_Proxy(
-    IShellFolder* This,
-    LPCITEMIDLIST pidl,
-    LPBC pbcReserved,
-    REFIID riid,
-    void** ppvObj);
-void __RPC_STUB IShellFolder_BindToStorage_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellFolder_CompareIDs_Proxy(
-    IShellFolder* This,
-    LPARAM lParam,
-    LPCITEMIDLIST pidl1,
-    LPCITEMIDLIST pidl2);
-void __RPC_STUB IShellFolder_CompareIDs_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellFolder_CreateViewObject_Proxy(
-    IShellFolder* This,
-    HWND hwndOwner,
-    REFIID riid,
-    void** ppvOut);
-void __RPC_STUB IShellFolder_CreateViewObject_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellFolder_GetAttributesOf_Proxy(
-    IShellFolder* This,
-    UINT cidl,
-    LPCITEMIDLIST* apidl,
-    SFGAOF* rgfInOut);
-void __RPC_STUB IShellFolder_GetAttributesOf_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellFolder_GetUIObjectOf_Proxy(
-    IShellFolder* This,
-    HWND hwndOwner,
-    UINT cidl,
-    LPCITEMIDLIST* apidl,
-    REFIID riid,
-    UINT* prgfInOut,
-    void** ppvOut);
-void __RPC_STUB IShellFolder_GetUIObjectOf_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellFolder_GetDisplayNameOf_Proxy(
-    IShellFolder* This,
-    LPCITEMIDLIST pidl,
-    SHGDNF uFlags,
-    STRRET* lpName);
-void __RPC_STUB IShellFolder_GetDisplayNameOf_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellFolder_SetNameOf_Proxy(
-    IShellFolder* This,
-    HWND hwnd,
-    LPCITEMIDLIST pidl,
-    LPCOLESTR lpszName,
-    SHGDNF uFlags,
-    LPITEMIDLIST* ppidlOut);
-void __RPC_STUB IShellFolder_SetNameOf_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-
-#endif  /* __IShellFolder_INTERFACE_DEFINED__ */
-
-#ifndef __IEnumExtraSearch_FWD_DEFINED__
-#define __IEnumExtraSearch_FWD_DEFINED__
-typedef struct IEnumExtraSearch IEnumExtraSearch;
-#endif
-
-typedef IEnumExtraSearch *LPENUMEXTRASEARCH;
-
-typedef struct {
-    GUID guidSearch;
-    WCHAR wszFriendlyName[80];
-    WCHAR wszUrl[2084];
-} EXTRASEARCH, *LPEXTRASEARCH;
-
-/*****************************************************************************
- * IEnumExtraSearch interface
- */
-#ifndef __IEnumExtraSearch_INTERFACE_DEFINED__
-#define __IEnumExtraSearch_INTERFACE_DEFINED__
-
-DEFINE_GUID(IID_IEnumExtraSearch, 0x0e700be1, 0x9db6, 0x11d1, 0xa1,0xce, 0x00,0xc0,0x4f,0xd7,0x5d,0x13);
-#if defined(__cplusplus) && !defined(CINTERFACE)
-struct IEnumExtraSearch : public IUnknown
-{
-    virtual HRESULT STDMETHODCALLTYPE Next(
-        ULONG celt,
-        EXTRASEARCH* rgelt,
-        ULONG* pceltFetched) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE Skip(
-        ULONG celt) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE Reset(
-        ) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE Clone(
-        IEnumExtraSearch** ppenum) = 0;
-
-};
-#else
-typedef struct IEnumExtraSearchVtbl IEnumExtraSearchVtbl;
-struct IEnumExtraSearch {
-    const IEnumExtraSearchVtbl* lpVtbl;
-};
-struct IEnumExtraSearchVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
-    /*** IUnknown methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumExtraSearch* This,
-        REFIID riid,
-        void** ppvObject);
-
-    ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumExtraSearch* This);
-
-    ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumExtraSearch* This);
-
-    /*** IEnumExtraSearch methods ***/
-    HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumExtraSearch* This,
-        ULONG celt,
-        EXTRASEARCH* rgelt,
-        ULONG* pceltFetched);
-
-    HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumExtraSearch* This,
-        ULONG celt);
-
-    HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumExtraSearch* This);
-
-    HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumExtraSearch* This,
-        IEnumExtraSearch** ppenum);
-
-};
-
-/*** IUnknown methods ***/
-#define IEnumExtraSearch_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IEnumExtraSearch_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IEnumExtraSearch_Release(p) (p)->lpVtbl->Release(p)
-/*** IEnumExtraSearch methods ***/
-#define IEnumExtraSearch_Next(p,a,b,c) (p)->lpVtbl->Next(p,a,b,c)
-#define IEnumExtraSearch_Skip(p,a) (p)->lpVtbl->Skip(p,a)
-#define IEnumExtraSearch_Reset(p) (p)->lpVtbl->Reset(p)
-#define IEnumExtraSearch_Clone(p,a) (p)->lpVtbl->Clone(p,a)
-
-#endif
-
-#define IEnumExtraSearch_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
-    /*** IUnknown methods ***/ \
-    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
-    STDMETHOD_(ULONG,Release)(THIS) PURE; \
-    /*** IEnumExtraSearch methods ***/ \
-    STDMETHOD_(HRESULT,Next)(THIS_ ULONG celt, EXTRASEARCH* rgelt, ULONG* pceltFetched) PURE; \
-    STDMETHOD_(HRESULT,Skip)(THIS_ ULONG celt) PURE; \
-    STDMETHOD_(HRESULT,Reset)(THIS) PURE; \
-    STDMETHOD_(HRESULT,Clone)(THIS_ IEnumExtraSearch** ppenum) PURE;
-
-HRESULT CALLBACK IEnumExtraSearch_Next_Proxy(
-    IEnumExtraSearch* This,
-    ULONG celt,
-    EXTRASEARCH* rgelt,
-    ULONG* pceltFetched);
-void __RPC_STUB IEnumExtraSearch_Next_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IEnumExtraSearch_Skip_Proxy(
-    IEnumExtraSearch* This,
-    ULONG celt);
-void __RPC_STUB IEnumExtraSearch_Skip_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IEnumExtraSearch_Reset_Proxy(
-    IEnumExtraSearch* This);
-void __RPC_STUB IEnumExtraSearch_Reset_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IEnumExtraSearch_Clone_Proxy(
-    IEnumExtraSearch* This,
-    IEnumExtraSearch** ppenum);
-void __RPC_STUB IEnumExtraSearch_Clone_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-
-#endif  /* __IEnumExtraSearch_INTERFACE_DEFINED__ */
-
-#ifndef __IShellFolder2_FWD_DEFINED__
-#define __IShellFolder2_FWD_DEFINED__
-typedef struct IShellFolder2 IShellFolder2;
-#endif
-
-typedef enum {
-    SHCOLSTATE_TYPE_STR = 0x1,
-    SHCOLSTATE_TYPE_INT = 0x2,
-    SHCOLSTATE_TYPE_DATE = 0x3,
-    SHCOLSTATE_TYPEMASK = 0xf,
-    SHCOLSTATE_ONBYDEFAULT = 0x10,
-    SHCOLSTATE_SLOW = 0x20,
-    SHCOLSTATE_EXTENDED = 0x40,
-    SHCOLSTATE_SECONDARYUI = 0x80,
-    SHCOLSTATE_HIDDEN = 0x100,
-    SHCOLSTATE_PREFER_VARCMP = 0x200
-} SHCOLSTATE;
-
-typedef DWORD SHCOLSTATEF;
-
-typedef struct {
-    GUID fmtid;
-    DWORD pid;
-} SHCOLUMNID, *LPSHCOLUMNID;
-
-typedef const SHCOLUMNID *LPCSHCOLUMNID;
-
-/*****************************************************************************
- * IShellFolder2 interface
- */
-#ifndef __IShellFolder2_INTERFACE_DEFINED__
-#define __IShellFolder2_INTERFACE_DEFINED__
-
-DEFINE_GUID(IID_IShellFolder2, 0x93f2f68c, 0x1d1b, 0x11d3, 0xa3,0x0e, 0x00,0xc0,0x4f,0x79,0xab,0xd1);
-#if defined(__cplusplus) && !defined(CINTERFACE)
-struct IShellFolder2 : public IShellFolder
-{
-    virtual HRESULT STDMETHODCALLTYPE GetDefaultSearchGUID(
-        GUID* lpguid) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE EnumSearches(
-        IEnumExtraSearch** ppenum) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE GetDefaultColumn(
-        DWORD dwReserved,
-        ULONG* pSort,
-        ULONG* pDisplay) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE GetDefaultColumnState(
-        UINT iColumn,
-        SHCOLSTATEF* pcsFlags) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE GetDetailsEx(
-        LPCITEMIDLIST pidl,
-        const SHCOLUMNID* pscid,
-        VARIANT* pv) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE GetDetailsOf(
-        LPCITEMIDLIST pidl,
-        UINT iColumn,
-        SHELLDETAILS* psd) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE MapColumnToSCID(
-        UINT iColumn,
-        SHCOLUMNID* pscid) = 0;
-
-};
-#else
-typedef struct IShellFolder2Vtbl IShellFolder2Vtbl;
-struct IShellFolder2 {
-    const IShellFolder2Vtbl* lpVtbl;
-};
-struct IShellFolder2Vtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
-    /*** IUnknown methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellFolder2* This,
-        REFIID riid,
-        void** ppvObject);
-
-    ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellFolder2* This);
-
-    ULONG (STDMETHODCALLTYPE *Release)(
-        IShellFolder2* This);
-
-    /*** IShellFolder methods ***/
-    HRESULT (STDMETHODCALLTYPE *ParseDisplayName)(
-        IShellFolder2* This,
-        HWND hwndOwner,
-        LPBC pbcReserved,
-        LPOLESTR lpszDisplayName,
-        ULONG* pchEaten,
-        LPITEMIDLIST* ppidl,
-        ULONG* pdwAttributes);
-
-    HRESULT (STDMETHODCALLTYPE *EnumObjects)(
-        IShellFolder2* This,
-        HWND hwndOwner,
-        SHCONTF grfFlags,
-        IEnumIDList** ppenumIDList);
-
-    HRESULT (STDMETHODCALLTYPE *BindToObject)(
-        IShellFolder2* This,
-        LPCITEMIDLIST pidl,
-        LPBC pbcReserved,
-        REFIID riid,
-        void** ppvOut);
-
-    HRESULT (STDMETHODCALLTYPE *BindToStorage)(
-        IShellFolder2* This,
-        LPCITEMIDLIST pidl,
-        LPBC pbcReserved,
-        REFIID riid,
-        void** ppvObj);
-
-    HRESULT (STDMETHODCALLTYPE *CompareIDs)(
-        IShellFolder2* This,
-        LPARAM lParam,
-        LPCITEMIDLIST pidl1,
-        LPCITEMIDLIST pidl2);
-
-    HRESULT (STDMETHODCALLTYPE *CreateViewObject)(
-        IShellFolder2* This,
-        HWND hwndOwner,
-        REFIID riid,
-        void** ppvOut);
-
-    HRESULT (STDMETHODCALLTYPE *GetAttributesOf)(
-        IShellFolder2* This,
-        UINT cidl,
-        LPCITEMIDLIST* apidl,
-        SFGAOF* rgfInOut);
-
-    HRESULT (STDMETHODCALLTYPE *GetUIObjectOf)(
-        IShellFolder2* This,
-        HWND hwndOwner,
-        UINT cidl,
-        LPCITEMIDLIST* apidl,
-        REFIID riid,
-        UINT* prgfInOut,
-        void** ppvOut);
-
-    HRESULT (STDMETHODCALLTYPE *GetDisplayNameOf)(
-        IShellFolder2* This,
-        LPCITEMIDLIST pidl,
-        SHGDNF uFlags,
-        STRRET* lpName);
-
-    HRESULT (STDMETHODCALLTYPE *SetNameOf)(
-        IShellFolder2* This,
-        HWND hwnd,
-        LPCITEMIDLIST pidl,
-        LPCOLESTR lpszName,
-        SHGDNF uFlags,
-        LPITEMIDLIST* ppidlOut);
-
-    /*** IShellFolder2 methods ***/
-    HRESULT (STDMETHODCALLTYPE *GetDefaultSearchGUID)(
-        IShellFolder2* This,
-        GUID* lpguid);
-
-    HRESULT (STDMETHODCALLTYPE *EnumSearches)(
-        IShellFolder2* This,
-        IEnumExtraSearch** ppenum);
-
-    HRESULT (STDMETHODCALLTYPE *GetDefaultColumn)(
-        IShellFolder2* This,
-        DWORD dwReserved,
-        ULONG* pSort,
-        ULONG* pDisplay);
-
-    HRESULT (STDMETHODCALLTYPE *GetDefaultColumnState)(
-        IShellFolder2* This,
-        UINT iColumn,
-        SHCOLSTATEF* pcsFlags);
-
-    HRESULT (STDMETHODCALLTYPE *GetDetailsEx)(
-        IShellFolder2* This,
-        LPCITEMIDLIST pidl,
-        const SHCOLUMNID* pscid,
-        VARIANT* pv);
-
-    HRESULT (STDMETHODCALLTYPE *GetDetailsOf)(
-        IShellFolder2* This,
-        LPCITEMIDLIST pidl,
-        UINT iColumn,
-        SHELLDETAILS* psd);
-
-    HRESULT (STDMETHODCALLTYPE *MapColumnToSCID)(
-        IShellFolder2* This,
-        UINT iColumn,
-        SHCOLUMNID* pscid);
-
-};
-
-/*** IUnknown methods ***/
-#define IShellFolder2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IShellFolder2_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IShellFolder2_Release(p) (p)->lpVtbl->Release(p)
-/*** IShellFolder methods ***/
-#define IShellFolder2_ParseDisplayName(p,a,b,c,d,e,f) (p)->lpVtbl->ParseDisplayName(p,a,b,c,d,e,f)
-#define IShellFolder2_EnumObjects(p,a,b,c) (p)->lpVtbl->EnumObjects(p,a,b,c)
-#define IShellFolder2_BindToObject(p,a,b,c,d) (p)->lpVtbl->BindToObject(p,a,b,c,d)
-#define IShellFolder2_BindToStorage(p,a,b,c,d) (p)->lpVtbl->BindToStorage(p,a,b,c,d)
-#define IShellFolder2_CompareIDs(p,a,b,c) (p)->lpVtbl->CompareIDs(p,a,b,c)
-#define IShellFolder2_CreateViewObject(p,a,b,c) (p)->lpVtbl->CreateViewObject(p,a,b,c)
-#define IShellFolder2_GetAttributesOf(p,a,b,c) (p)->lpVtbl->GetAttributesOf(p,a,b,c)
-#define IShellFolder2_GetUIObjectOf(p,a,b,c,d,e,f) (p)->lpVtbl->GetUIObjectOf(p,a,b,c,d,e,f)
-#define IShellFolder2_GetDisplayNameOf(p,a,b,c) (p)->lpVtbl->GetDisplayNameOf(p,a,b,c)
-#define IShellFolder2_SetNameOf(p,a,b,c,d,e) (p)->lpVtbl->SetNameOf(p,a,b,c,d,e)
-/*** IShellFolder2 methods ***/
-#define IShellFolder2_GetDefaultSearchGUID(p,a) (p)->lpVtbl->GetDefaultSearchGUID(p,a)
-#define IShellFolder2_EnumSearches(p,a) (p)->lpVtbl->EnumSearches(p,a)
-#define IShellFolder2_GetDefaultColumn(p,a,b,c) (p)->lpVtbl->GetDefaultColumn(p,a,b,c)
-#define IShellFolder2_GetDefaultColumnState(p,a,b) (p)->lpVtbl->GetDefaultColumnState(p,a,b)
-#define IShellFolder2_GetDetailsEx(p,a,b,c) (p)->lpVtbl->GetDetailsEx(p,a,b,c)
-#define IShellFolder2_GetDetailsOf(p,a,b,c) (p)->lpVtbl->GetDetailsOf(p,a,b,c)
-#define IShellFolder2_MapColumnToSCID(p,a,b) (p)->lpVtbl->MapColumnToSCID(p,a,b)
-
-#endif
-
-#define IShellFolder2_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
-    /*** IUnknown methods ***/ \
-    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
-    STDMETHOD_(ULONG,Release)(THIS) PURE; \
-    /*** IShellFolder methods ***/ \
-    STDMETHOD_(HRESULT,ParseDisplayName)(THIS_ HWND hwndOwner, LPBC pbcReserved, LPOLESTR lpszDisplayName, ULONG* pchEaten, LPITEMIDLIST* ppidl, ULONG* pdwAttributes) PURE; \
-    STDMETHOD_(HRESULT,EnumObjects)(THIS_ HWND hwndOwner, SHCONTF grfFlags, IEnumIDList** ppenumIDList) PURE; \
-    STDMETHOD_(HRESULT,BindToObject)(THIS_ LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, void** ppvOut) PURE; \
-    STDMETHOD_(HRESULT,BindToStorage)(THIS_ LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, void** ppvObj) PURE; \
-    STDMETHOD_(HRESULT,CompareIDs)(THIS_ LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) PURE; \
-    STDMETHOD_(HRESULT,CreateViewObject)(THIS_ HWND hwndOwner, REFIID riid, void** ppvOut) PURE; \
-    STDMETHOD_(HRESULT,GetAttributesOf)(THIS_ UINT cidl, LPCITEMIDLIST* apidl, SFGAOF* rgfInOut) PURE; \
-    STDMETHOD_(HRESULT,GetUIObjectOf)(THIS_ HWND hwndOwner, UINT cidl, LPCITEMIDLIST* apidl, REFIID riid, UINT* prgfInOut, void** ppvOut) PURE; \
-    STDMETHOD_(HRESULT,GetDisplayNameOf)(THIS_ LPCITEMIDLIST pidl, SHGDNF uFlags, STRRET* lpName) PURE; \
-    STDMETHOD_(HRESULT,SetNameOf)(THIS_ HWND hwnd, LPCITEMIDLIST pidl, LPCOLESTR lpszName, SHGDNF uFlags, LPITEMIDLIST* ppidlOut) PURE; \
-    /*** IShellFolder2 methods ***/ \
-    STDMETHOD_(HRESULT,GetDefaultSearchGUID)(THIS_ GUID* lpguid) PURE; \
-    STDMETHOD_(HRESULT,EnumSearches)(THIS_ IEnumExtraSearch** ppenum) PURE; \
-    STDMETHOD_(HRESULT,GetDefaultColumn)(THIS_ DWORD dwReserved, ULONG* pSort, ULONG* pDisplay) PURE; \
-    STDMETHOD_(HRESULT,GetDefaultColumnState)(THIS_ UINT iColumn, SHCOLSTATEF* pcsFlags) PURE; \
-    STDMETHOD_(HRESULT,GetDetailsEx)(THIS_ LPCITEMIDLIST pidl, const SHCOLUMNID* pscid, VARIANT* pv) PURE; \
-    STDMETHOD_(HRESULT,GetDetailsOf)(THIS_ LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS* psd) PURE; \
-    STDMETHOD_(HRESULT,MapColumnToSCID)(THIS_ UINT iColumn, SHCOLUMNID* pscid) PURE;
-
-HRESULT CALLBACK IShellFolder2_GetDefaultSearchGUID_Proxy(
-    IShellFolder2* This,
-    GUID* lpguid);
-void __RPC_STUB IShellFolder2_GetDefaultSearchGUID_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellFolder2_EnumSearches_Proxy(
-    IShellFolder2* This,
-    IEnumExtraSearch** ppenum);
-void __RPC_STUB IShellFolder2_EnumSearches_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellFolder2_GetDefaultColumn_Proxy(
-    IShellFolder2* This,
-    DWORD dwReserved,
-    ULONG* pSort,
-    ULONG* pDisplay);
-void __RPC_STUB IShellFolder2_GetDefaultColumn_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellFolder2_GetDefaultColumnState_Proxy(
-    IShellFolder2* This,
-    UINT iColumn,
-    SHCOLSTATEF* pcsFlags);
-void __RPC_STUB IShellFolder2_GetDefaultColumnState_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellFolder2_GetDetailsEx_Proxy(
-    IShellFolder2* This,
-    LPCITEMIDLIST pidl,
-    const SHCOLUMNID* pscid,
-    VARIANT* pv);
-void __RPC_STUB IShellFolder2_GetDetailsEx_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellFolder2_GetDetailsOf_Proxy(
-    IShellFolder2* This,
-    LPCITEMIDLIST pidl,
-    UINT iColumn,
-    SHELLDETAILS* psd);
-void __RPC_STUB IShellFolder2_GetDetailsOf_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellFolder2_MapColumnToSCID_Proxy(
-    IShellFolder2* This,
-    UINT iColumn,
-    SHCOLUMNID* pscid);
-void __RPC_STUB IShellFolder2_MapColumnToSCID_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-
-#endif  /* __IShellFolder2_INTERFACE_DEFINED__ */
-
-typedef char *LPVIEWSETTINGS;
-
-typedef enum {
-    FWF_AUTOARRANGE = 0x1,
-    FWF_ABBREVIATEDNAMES = 0x2,
-    FWF_SNAPTOGRID = 0x4,
-    FWF_OWNERDATA = 0x8,
-    FWF_BESTFITWINDOW = 0x10,
-    FWF_DESKTOP = 0x20,
-    FWF_SINGLESEL = 0x40,
-    FWF_NOSUBFOLDERS = 0x80,
-    FWF_TRANSPARENT = 0x100,
-    FWF_NOCLIENTEDGE = 0x200,
-    FWF_NOSCROLL = 0x400,
-    FWF_ALIGNLEFT = 0x800,
-    FWF_NOICONS = 0x1000,
-    FWF_SHOWSELALWAYS = 0x2000,
-    FWF_NOVISIBLE = 0x4000,
-    FWF_SINGLECLICKACTIVATE = 0x8000,
-    FWF_NOWEBVIEW = 0x10000,
-    FWF_HIDEFILENAMES = 0x20000,
-    FWF_CHECKSELECT = 0x40000
-} FOLDERFLAGS;
-
-typedef enum {
-    FVM_ICON = 1,
-    FVM_FIRST = FVM_ICON,
-    FVM_SMALLICON = 2,
-    FVM_LIST = 3,
-    FVM_DETAILS = 4,
-    FVM_THUMBNAIL = 5,
-    FVM_TILE = 6,
-    FVM_THUMBSTRIP = 7,
-    FVM_LAST = FVM_THUMBSTRIP
-} FOLDERVIEWMODE;
-
-typedef struct {
-    UINT ViewMode;
-    UINT fFlags;
-} FOLDERSETTINGS, *PFOLDERSETTINGS, *LPFOLDERSETTINGS;
-
-typedef const FOLDERSETTINGS *LPCFOLDERSETTINGS;
-
-#ifndef __IShellBrowser_FWD_DEFINED__
-#define __IShellBrowser_FWD_DEFINED__
-typedef struct IShellBrowser IShellBrowser;
-#endif
-
-#ifndef __IShellView_FWD_DEFINED__
-#define __IShellView_FWD_DEFINED__
-typedef struct IShellView IShellView;
-#endif
-
-typedef IShellView *LPSHELLVIEW;
-
-#define SVSI_DESELECT       0x00000000
-#define SVSI_SELECT         0x00000001
-#define SVSI_EDIT           0x00000003
-#define SVSI_DESELECTOTHERS 0x00000004
-#define SVSI_ENSUREVISIBLE  0x00000008
-#define SVSI_FOCUSED        0x00000010
-#define SVSI_TRANSLATEPT    0x00000020
-#define SVSI_SELECTIONMARK  0x00000040
-#define SVSI_POSITIONITEM   0x00000080
-#define SVSI_CHECK          0x00000100
-#define SVSI_NOSTATECHANGE  0x80000000
-typedef UINT SVSIF;
-
-typedef enum {
-    SVGIO_BACKGROUND = 0x0,
-    SVGIO_SELECTION = 0x1,
-    SVGIO_ALLVIEW = 0x2,
-    SVGIO_CHECKED = 0x3,
-    SVGIO_TYPE_MASK = 0xf,
-    SVGIO_FLAG_VIEWORDER = 0x80000000
-} SVGIO;
-
-typedef enum {
-    SVUIA_DEACTIVATE = 0,
-    SVUIA_ACTIVATE_NOFOCUS = 1,
-    SVUIA_ACTIVATE_FOCUS = 2,
-    SVUIA_INPLACEACTIVATE = 3
-} SVUIA_STATUS;
-
-#if 0
-typedef LPARAM LPFNSVADDPROPSHEETPAGE;
-
-#else
-#include <prsht.h>
-typedef LPFNADDPROPSHEETPAGE LPFNSVADDPROPSHEETPAGE;
-#endif
-/*****************************************************************************
- * IShellView interface
- */
-#ifndef __IShellView_INTERFACE_DEFINED__
-#define __IShellView_INTERFACE_DEFINED__
-
-DEFINE_GUID(IID_IShellView, 0x000214e3, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46);
-#if defined(__cplusplus) && !defined(CINTERFACE)
-struct IShellView : public IOleWindow
-{
-    virtual HRESULT STDMETHODCALLTYPE TranslateAccelerator(
-        MSG* pmsg) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE EnableModeless(
-        BOOL fEnable) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE UIActivate(
-        UINT uState) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE Refresh(
-        ) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE CreateViewWindow(
-        IShellView* psvPrevious,
-        LPCFOLDERSETTINGS lpfs,
-        IShellBrowser* psb,
-        RECT* prcView,
-        HWND* phWnd) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE DestroyViewWindow(
-        ) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE GetCurrentInfo(
-        LPFOLDERSETTINGS lpfs) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE AddPropertySheetPages(
-        DWORD dwReserved,
-        LPFNSVADDPROPSHEETPAGE pfn,
-        LPARAM lparam) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SaveViewState(
-        ) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SelectItem(
-        LPCITEMIDLIST pidlItem,
-        SVSIF uFlags) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE GetItemObject(
-        UINT uItem,
-        REFIID riid,
-        void** ppv) = 0;
-
-};
-#else
-typedef struct IShellViewVtbl IShellViewVtbl;
-struct IShellView {
-    const IShellViewVtbl* lpVtbl;
-};
-struct IShellViewVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
-    /*** IUnknown methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellView* This,
-        REFIID riid,
-        void** ppvObject);
-
-    ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellView* This);
-
-    ULONG (STDMETHODCALLTYPE *Release)(
-        IShellView* This);
-
-    /*** IOleWindow methods ***/
-    HRESULT (STDMETHODCALLTYPE *GetWindow)(
-        IShellView* This,
-        HWND* phwnd);
-
-    HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)(
-        IShellView* This,
-        BOOL fEnterMode);
-
-    /*** IShellView methods ***/
-    HRESULT (STDMETHODCALLTYPE *TranslateAccelerator)(
-        IShellView* This,
-        MSG* pmsg);
-
-    HRESULT (STDMETHODCALLTYPE *EnableModeless)(
-        IShellView* This,
-        BOOL fEnable);
-
-    HRESULT (STDMETHODCALLTYPE *UIActivate)(
-        IShellView* This,
-        UINT uState);
-
-    HRESULT (STDMETHODCALLTYPE *Refresh)(
-        IShellView* This);
-
-    HRESULT (STDMETHODCALLTYPE *CreateViewWindow)(
-        IShellView* This,
-        IShellView* psvPrevious,
-        LPCFOLDERSETTINGS lpfs,
-        IShellBrowser* psb,
-        RECT* prcView,
-        HWND* phWnd);
-
-    HRESULT (STDMETHODCALLTYPE *DestroyViewWindow)(
-        IShellView* This);
-
-    HRESULT (STDMETHODCALLTYPE *GetCurrentInfo)(
-        IShellView* This,
-        LPFOLDERSETTINGS lpfs);
-
-    HRESULT (STDMETHODCALLTYPE *AddPropertySheetPages)(
-        IShellView* This,
-        DWORD dwReserved,
-        LPFNSVADDPROPSHEETPAGE pfn,
-        LPARAM lparam);
-
-    HRESULT (STDMETHODCALLTYPE *SaveViewState)(
-        IShellView* This);
-
-    HRESULT (STDMETHODCALLTYPE *SelectItem)(
-        IShellView* This,
-        LPCITEMIDLIST pidlItem,
-        SVSIF uFlags);
-
-    HRESULT (STDMETHODCALLTYPE *GetItemObject)(
-        IShellView* This,
-        UINT uItem,
-        REFIID riid,
-        void** ppv);
-
-};
-
-/*** IUnknown methods ***/
-#define IShellView_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IShellView_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IShellView_Release(p) (p)->lpVtbl->Release(p)
-/*** IOleWindow methods ***/
-#define IShellView_GetWindow(p,a) (p)->lpVtbl->GetWindow(p,a)
-#define IShellView_ContextSensitiveHelp(p,a) (p)->lpVtbl->ContextSensitiveHelp(p,a)
-/*** IShellView methods ***/
-#define IShellView_TranslateAccelerator(p,a) (p)->lpVtbl->TranslateAccelerator(p,a)
-#define IShellView_EnableModeless(p,a) (p)->lpVtbl->EnableModeless(p,a)
-#define IShellView_UIActivate(p,a) (p)->lpVtbl->UIActivate(p,a)
-#define IShellView_Refresh(p) (p)->lpVtbl->Refresh(p)
-#define IShellView_CreateViewWindow(p,a,b,c,d,e) (p)->lpVtbl->CreateViewWindow(p,a,b,c,d,e)
-#define IShellView_DestroyViewWindow(p) (p)->lpVtbl->DestroyViewWindow(p)
-#define IShellView_GetCurrentInfo(p,a) (p)->lpVtbl->GetCurrentInfo(p,a)
-#define IShellView_AddPropertySheetPages(p,a,b,c) (p)->lpVtbl->AddPropertySheetPages(p,a,b,c)
-#define IShellView_SaveViewState(p) (p)->lpVtbl->SaveViewState(p)
-#define IShellView_SelectItem(p,a,b) (p)->lpVtbl->SelectItem(p,a,b)
-#define IShellView_GetItemObject(p,a,b,c) (p)->lpVtbl->GetItemObject(p,a,b,c)
-
-#endif
-
-#define IShellView_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
-    /*** IUnknown methods ***/ \
-    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
-    STDMETHOD_(ULONG,Release)(THIS) PURE; \
-    /*** IOleWindow methods ***/ \
-    STDMETHOD_(HRESULT,GetWindow)(THIS_ HWND* phwnd) PURE; \
-    STDMETHOD_(HRESULT,ContextSensitiveHelp)(THIS_ BOOL fEnterMode) PURE; \
-    /*** IShellView methods ***/ \
-    STDMETHOD_(HRESULT,TranslateAccelerator)(THIS_ MSG* pmsg) PURE; \
-    STDMETHOD_(HRESULT,EnableModeless)(THIS_ BOOL fEnable) PURE; \
-    STDMETHOD_(HRESULT,UIActivate)(THIS_ UINT uState) PURE; \
-    STDMETHOD_(HRESULT,Refresh)(THIS) PURE; \
-    STDMETHOD_(HRESULT,CreateViewWindow)(THIS_ IShellView* psvPrevious, LPCFOLDERSETTINGS lpfs, IShellBrowser* psb, RECT* prcView, HWND* phWnd) PURE; \
-    STDMETHOD_(HRESULT,DestroyViewWindow)(THIS) PURE; \
-    STDMETHOD_(HRESULT,GetCurrentInfo)(THIS_ LPFOLDERSETTINGS lpfs) PURE; \
-    STDMETHOD_(HRESULT,AddPropertySheetPages)(THIS_ DWORD dwReserved, LPFNSVADDPROPSHEETPAGE pfn, LPARAM lparam) PURE; \
-    STDMETHOD_(HRESULT,SaveViewState)(THIS) PURE; \
-    STDMETHOD_(HRESULT,SelectItem)(THIS_ LPCITEMIDLIST pidlItem, SVSIF uFlags) PURE; \
-    STDMETHOD_(HRESULT,GetItemObject)(THIS_ UINT uItem, REFIID riid, void** ppv) PURE;
-
-HRESULT CALLBACK IShellView_TranslateAccelerator_Proxy(
-    IShellView* This,
-    MSG* pmsg);
-void __RPC_STUB IShellView_TranslateAccelerator_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellView_EnableModeless_Proxy(
-    IShellView* This,
-    BOOL fEnable);
-void __RPC_STUB IShellView_EnableModeless_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellView_UIActivate_Proxy(
-    IShellView* This,
-    UINT uState);
-void __RPC_STUB IShellView_UIActivate_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellView_Refresh_Proxy(
-    IShellView* This);
-void __RPC_STUB IShellView_Refresh_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellView_CreateViewWindow_Proxy(
-    IShellView* This,
-    IShellView* psvPrevious,
-    LPCFOLDERSETTINGS lpfs,
-    IShellBrowser* psb,
-    RECT* prcView,
-    HWND* phWnd);
-void __RPC_STUB IShellView_CreateViewWindow_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellView_DestroyViewWindow_Proxy(
-    IShellView* This);
-void __RPC_STUB IShellView_DestroyViewWindow_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellView_GetCurrentInfo_Proxy(
-    IShellView* This,
-    LPFOLDERSETTINGS lpfs);
-void __RPC_STUB IShellView_GetCurrentInfo_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellView_SaveViewState_Proxy(
-    IShellView* This);
-void __RPC_STUB IShellView_SaveViewState_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellView_SelectItem_Proxy(
-    IShellView* This,
-    LPCITEMIDLIST pidlItem,
-    SVSIF uFlags);
-void __RPC_STUB IShellView_SelectItem_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellView_GetItemObject_Proxy(
-    IShellView* This,
-    UINT uItem,
-    REFIID riid,
-    void** ppv);
-void __RPC_STUB IShellView_GetItemObject_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-
-#endif  /* __IShellView_INTERFACE_DEFINED__ */
-
-typedef IShellBrowser *LPSHELLBROWSER;
-
-#define SBSP_DEFBROWSER            0x00000000
-#define SBSP_SAMEBROWSER           0x00000001
-#define SBSP_NEWBROWSER            0x00000002
-#define SBSP_DEFMODE               0x00000000
-#define SBSP_OPENMODE              0x00000010
-#define SBSP_EXPLOREMODE           0x00000020
-#define SBSP_HELPMODE              0x00000040
-#define SBSP_NOTRANSFERHIST        0x00000080
-#define SBSP_ABSOLUTE              0x00000000
-#define SBSP_RELATIVE              0x00001000
-#define SBSP_PARENT                0x00002000
-#define SBSP_NAVIGATEBACK          0x00004000
-#define SBSP_NAVIGATEFORWARD       0x00008000
-#define SBSP_ALLOW_AUTONAVIGATE    0x00010000
-#define SBSP_NOAUTOSELECT          0x04000000
-#define SBSP_WRITENOHISTORY        0x08000000
-#define SBSP_REDIRECT              0x40000000
-#define SBSP_INITIATEDBYHLINKFRAME 0x80000000
-#define FCW_STATUS      0x0001
-#define FCW_TOOLBAR     0x0002
-#define FCW_TREE        0x0003
-#define FCW_INTERNETBAR 0x0006
-#define FCW_PROGRESS    0x0008
-#define FCT_MERGE       0x0001
-#define FCT_CONFIGABLE  0x0002
-#define FCT_ADDTOEND    0x0004
-#if 0
-typedef LPARAM LPTBBUTTONSB;
-
-#else
-#include <commctrl.h>
-typedef LPTBBUTTON LPTBBUTTONSB;
-#endif
-/*****************************************************************************
- * IShellBrowser interface
- */
-#ifndef __IShellBrowser_INTERFACE_DEFINED__
-#define __IShellBrowser_INTERFACE_DEFINED__
-
-DEFINE_GUID(IID_IShellBrowser, 0x000214e2, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46);
-#if defined(__cplusplus) && !defined(CINTERFACE)
-struct IShellBrowser : public IOleWindow
-{
-    virtual HRESULT STDMETHODCALLTYPE InsertMenusSB(
-        HMENU hmenuShared,
-        LPOLEMENUGROUPWIDTHS lpMenuWidths) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SetMenuSB(
-        HMENU hmenuShared,
-        HOLEMENU holemenuReserved,
-        HWND hwndActiveObject) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE RemoveMenusSB(
-        HMENU hmenuShared) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SetStatusTextSB(
-        LPCOLESTR pszStatusText) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE EnableModelessSB(
-        BOOL fEnable) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE TranslateAcceleratorSB(
-        MSG* pmsg,
-        WORD wID) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE BrowseObject(
-        LPCITEMIDLIST pidl,
-        UINT wFlags) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE GetViewStateStream(
-        DWORD grfMode,
-        IStream** ppStrm) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE GetControlWindow(
-        UINT id,
-        HWND* phwnd) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SendControlMsg(
-        UINT id,
-        UINT uMsg,
-        WPARAM wParam,
-        LPARAM lParam,
-        LRESULT* pret) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE QueryActiveShellView(
-        IShellView** ppshv) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE OnViewWindowActive(
-        IShellView* pshv) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SetToolbarItems(
-        LPTBBUTTONSB lpButtons,
-        UINT nButtons,
-        UINT uFlags) = 0;
-
-};
-#else
-typedef struct IShellBrowserVtbl IShellBrowserVtbl;
-struct IShellBrowser {
-    const IShellBrowserVtbl* lpVtbl;
-};
-struct IShellBrowserVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
-    /*** IUnknown methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellBrowser* This,
-        REFIID riid,
-        void** ppvObject);
-
-    ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellBrowser* This);
-
-    ULONG (STDMETHODCALLTYPE *Release)(
-        IShellBrowser* This);
-
-    /*** IOleWindow methods ***/
-    HRESULT (STDMETHODCALLTYPE *GetWindow)(
-        IShellBrowser* This,
-        HWND* phwnd);
-
-    HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)(
-        IShellBrowser* This,
-        BOOL fEnterMode);
-
-    /*** IShellBrowser methods ***/
-    HRESULT (STDMETHODCALLTYPE *InsertMenusSB)(
-        IShellBrowser* This,
-        HMENU hmenuShared,
-        LPOLEMENUGROUPWIDTHS lpMenuWidths);
-
-    HRESULT (STDMETHODCALLTYPE *SetMenuSB)(
-        IShellBrowser* This,
-        HMENU hmenuShared,
-        HOLEMENU holemenuReserved,
-        HWND hwndActiveObject);
-
-    HRESULT (STDMETHODCALLTYPE *RemoveMenusSB)(
-        IShellBrowser* This,
-        HMENU hmenuShared);
-
-    HRESULT (STDMETHODCALLTYPE *SetStatusTextSB)(
-        IShellBrowser* This,
-        LPCOLESTR pszStatusText);
-
-    HRESULT (STDMETHODCALLTYPE *EnableModelessSB)(
-        IShellBrowser* This,
-        BOOL fEnable);
-
-    HRESULT (STDMETHODCALLTYPE *TranslateAcceleratorSB)(
-        IShellBrowser* This,
-        MSG* pmsg,
-        WORD wID);
-
-    HRESULT (STDMETHODCALLTYPE *BrowseObject)(
-        IShellBrowser* This,
-        LPCITEMIDLIST pidl,
-        UINT wFlags);
-
-    HRESULT (STDMETHODCALLTYPE *GetViewStateStream)(
-        IShellBrowser* This,
-        DWORD grfMode,
-        IStream** ppStrm);
-
-    HRESULT (STDMETHODCALLTYPE *GetControlWindow)(
-        IShellBrowser* This,
-        UINT id,
-        HWND* phwnd);
-
-    HRESULT (STDMETHODCALLTYPE *SendControlMsg)(
-        IShellBrowser* This,
-        UINT id,
-        UINT uMsg,
-        WPARAM wParam,
-        LPARAM lParam,
-        LRESULT* pret);
-
-    HRESULT (STDMETHODCALLTYPE *QueryActiveShellView)(
-        IShellBrowser* This,
-        IShellView** ppshv);
-
-    HRESULT (STDMETHODCALLTYPE *OnViewWindowActive)(
-        IShellBrowser* This,
-        IShellView* pshv);
-
-    HRESULT (STDMETHODCALLTYPE *SetToolbarItems)(
-        IShellBrowser* This,
-        LPTBBUTTONSB lpButtons,
-        UINT nButtons,
-        UINT uFlags);
-
-};
-
-/*** IUnknown methods ***/
-#define IShellBrowser_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IShellBrowser_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IShellBrowser_Release(p) (p)->lpVtbl->Release(p)
-/*** IOleWindow methods ***/
-#define IShellBrowser_GetWindow(p,a) (p)->lpVtbl->GetWindow(p,a)
-#define IShellBrowser_ContextSensitiveHelp(p,a) (p)->lpVtbl->ContextSensitiveHelp(p,a)
-/*** IShellBrowser methods ***/
-#define IShellBrowser_InsertMenusSB(p,a,b) (p)->lpVtbl->InsertMenusSB(p,a,b)
-#define IShellBrowser_SetMenuSB(p,a,b,c) (p)->lpVtbl->SetMenuSB(p,a,b,c)
-#define IShellBrowser_RemoveMenusSB(p,a) (p)->lpVtbl->RemoveMenusSB(p,a)
-#define IShellBrowser_SetStatusTextSB(p,a) (p)->lpVtbl->SetStatusTextSB(p,a)
-#define IShellBrowser_EnableModelessSB(p,a) (p)->lpVtbl->EnableModelessSB(p,a)
-#define IShellBrowser_TranslateAcceleratorSB(p,a,b) (p)->lpVtbl->TranslateAcceleratorSB(p,a,b)
-#define IShellBrowser_BrowseObject(p,a,b) (p)->lpVtbl->BrowseObject(p,a,b)
-#define IShellBrowser_GetViewStateStream(p,a,b) (p)->lpVtbl->GetViewStateStream(p,a,b)
-#define IShellBrowser_GetControlWindow(p,a,b) (p)->lpVtbl->GetControlWindow(p,a,b)
-#define IShellBrowser_SendControlMsg(p,a,b,c,d,e) (p)->lpVtbl->SendControlMsg(p,a,b,c,d,e)
-#define IShellBrowser_QueryActiveShellView(p,a) (p)->lpVtbl->QueryActiveShellView(p,a)
-#define IShellBrowser_OnViewWindowActive(p,a) (p)->lpVtbl->OnViewWindowActive(p,a)
-#define IShellBrowser_SetToolbarItems(p,a,b,c) (p)->lpVtbl->SetToolbarItems(p,a,b,c)
-
-#endif
-
-#define IShellBrowser_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
-    /*** IUnknown methods ***/ \
-    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
-    STDMETHOD_(ULONG,Release)(THIS) PURE; \
-    /*** IOleWindow methods ***/ \
-    STDMETHOD_(HRESULT,GetWindow)(THIS_ HWND* phwnd) PURE; \
-    STDMETHOD_(HRESULT,ContextSensitiveHelp)(THIS_ BOOL fEnterMode) PURE; \
-    /*** IShellBrowser methods ***/ \
-    STDMETHOD_(HRESULT,InsertMenusSB)(THIS_ HMENU hmenuShared, LPOLEMENUGROUPWIDTHS lpMenuWidths) PURE; \
-    STDMETHOD_(HRESULT,SetMenuSB)(THIS_ HMENU hmenuShared, HOLEMENU holemenuReserved, HWND hwndActiveObject) PURE; \
-    STDMETHOD_(HRESULT,RemoveMenusSB)(THIS_ HMENU hmenuShared) PURE; \
-    STDMETHOD_(HRESULT,SetStatusTextSB)(THIS_ LPCOLESTR pszStatusText) PURE; \
-    STDMETHOD_(HRESULT,EnableModelessSB)(THIS_ BOOL fEnable) PURE; \
-    STDMETHOD_(HRESULT,TranslateAcceleratorSB)(THIS_ MSG* pmsg, WORD wID) PURE; \
-    STDMETHOD_(HRESULT,BrowseObject)(THIS_ LPCITEMIDLIST pidl, UINT wFlags) PURE; \
-    STDMETHOD_(HRESULT,GetViewStateStream)(THIS_ DWORD grfMode, IStream** ppStrm) PURE; \
-    STDMETHOD_(HRESULT,GetControlWindow)(THIS_ UINT id, HWND* phwnd) PURE; \
-    STDMETHOD_(HRESULT,SendControlMsg)(THIS_ UINT id, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT* pret) PURE; \
-    STDMETHOD_(HRESULT,QueryActiveShellView)(THIS_ IShellView** ppshv) PURE; \
-    STDMETHOD_(HRESULT,OnViewWindowActive)(THIS_ IShellView* pshv) PURE; \
-    STDMETHOD_(HRESULT,SetToolbarItems)(THIS_ LPTBBUTTONSB lpButtons, UINT nButtons, UINT uFlags) PURE;
-
-HRESULT CALLBACK IShellBrowser_InsertMenusSB_Proxy(
-    IShellBrowser* This,
-    HMENU hmenuShared,
-    LPOLEMENUGROUPWIDTHS lpMenuWidths);
-void __RPC_STUB IShellBrowser_InsertMenusSB_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellBrowser_SetMenuSB_Proxy(
-    IShellBrowser* This,
-    HMENU hmenuShared,
-    HOLEMENU holemenuReserved,
-    HWND hwndActiveObject);
-void __RPC_STUB IShellBrowser_SetMenuSB_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellBrowser_RemoveMenusSB_Proxy(
-    IShellBrowser* This,
-    HMENU hmenuShared);
-void __RPC_STUB IShellBrowser_RemoveMenusSB_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellBrowser_SetStatusTextSB_Proxy(
-    IShellBrowser* This,
-    LPCOLESTR pszStatusText);
-void __RPC_STUB IShellBrowser_SetStatusTextSB_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellBrowser_EnableModelessSB_Proxy(
-    IShellBrowser* This,
-    BOOL fEnable);
-void __RPC_STUB IShellBrowser_EnableModelessSB_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellBrowser_TranslateAcceleratorSB_Proxy(
-    IShellBrowser* This,
-    MSG* pmsg,
-    WORD wID);
-void __RPC_STUB IShellBrowser_TranslateAcceleratorSB_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellBrowser_BrowseObject_Proxy(
-    IShellBrowser* This,
-    LPCITEMIDLIST pidl,
-    UINT wFlags);
-void __RPC_STUB IShellBrowser_BrowseObject_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellBrowser_GetViewStateStream_Proxy(
-    IShellBrowser* This,
-    DWORD grfMode,
-    IStream** ppStrm);
-void __RPC_STUB IShellBrowser_GetViewStateStream_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellBrowser_GetControlWindow_Proxy(
-    IShellBrowser* This,
-    UINT id,
-    HWND* phwnd);
-void __RPC_STUB IShellBrowser_GetControlWindow_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellBrowser_QueryActiveShellView_Proxy(
-    IShellBrowser* This,
-    IShellView** ppshv);
-void __RPC_STUB IShellBrowser_QueryActiveShellView_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellBrowser_OnViewWindowActive_Proxy(
-    IShellBrowser* This,
-    IShellView* pshv);
-void __RPC_STUB IShellBrowser_OnViewWindowActive_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-
-#endif  /* __IShellBrowser_INTERFACE_DEFINED__ */
-
-#ifndef __IShellLinkA_FWD_DEFINED__
-#define __IShellLinkA_FWD_DEFINED__
-typedef struct IShellLinkA IShellLinkA;
-#endif
-
-typedef enum {
-    SLR_NO_UI = 0x1,
-    SLR_ANY_MATCH = 0x2,
-    SLR_UPDATE = 0x4,
-    SLR_NOUPDATE = 0x8,
-    SLR_NOSEARCH = 0x10,
-    SLR_NOTRACK = 0x20,
-    SLR_NOLINKINFO = 0x40,
-    SLR_INVOKE_MSI = 0x80,
-    SLR_NO_UI_WITH_MSG_PUMP = 0x101
-} SLR_FLAGS;
-
-typedef enum {
-    SLGP_SHORTPATH = 0x1,
-    SLGP_UNCPRIORITY = 0x2,
-    SLGP_RAWPATH = 0x4
-} SLGP_FLAGS;
-
-/*****************************************************************************
- * IShellLinkA interface
- */
-#ifndef __IShellLinkA_INTERFACE_DEFINED__
-#define __IShellLinkA_INTERFACE_DEFINED__
-
-DEFINE_GUID(IID_IShellLinkA, 0x000214ee, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46);
-#if defined(__cplusplus) && !defined(CINTERFACE)
-struct IShellLinkA : public IUnknown
-{
-    virtual HRESULT STDMETHODCALLTYPE GetPath(
-        LPSTR pszFile,
-        int cch,
-        WIN32_FIND_DATAA* pfd,
-        DWORD fFlags) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE GetIDList(
-        LPITEMIDLIST* ppidl) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SetIDList(
-        LPCITEMIDLIST pidl) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE GetDescription(
-        LPSTR pszName,
-        int cch) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SetDescription(
-        LPCSTR pszName) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE GetWorkingDirectory(
-        LPSTR pszDir,
-        int cch) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SetWorkingDirectory(
-        LPCSTR pszDir) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE GetArguments(
-        LPSTR pszArgs,
-        int cch) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SetArguments(
-        LPCSTR pszArgs) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE GetHotkey(
-        WORD* pwHotkey) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SetHotkey(
-        WORD wHotkey) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE GetShowCmd(
-        int* piShowCmd) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SetShowCmd(
-        int iShowCmd) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE GetIconLocation(
-        LPSTR pszIconPath,
-        int cch,
-        int* piIcon) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SetIconLocation(
-        LPCSTR pszIconPath,
-        int iIcon) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SetRelativePath(
-        LPCSTR pszPathRel,
-        DWORD dwReserved) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE Resolve(
-        HWND hwnd,
-        DWORD fFlags) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SetPath(
-        LPCSTR pszFile) = 0;
-
-};
-#else
-typedef struct IShellLinkAVtbl IShellLinkAVtbl;
-struct IShellLinkA {
-    const IShellLinkAVtbl* lpVtbl;
-};
-struct IShellLinkAVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
-    /*** IUnknown methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellLinkA* This,
-        REFIID riid,
-        void** ppvObject);
-
-    ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellLinkA* This);
-
-    ULONG (STDMETHODCALLTYPE *Release)(
-        IShellLinkA* This);
-
-    /*** IShellLinkA methods ***/
-    HRESULT (STDMETHODCALLTYPE *GetPath)(
-        IShellLinkA* This,
-        LPSTR pszFile,
-        int cch,
-        WIN32_FIND_DATAA* pfd,
-        DWORD fFlags);
-
-    HRESULT (STDMETHODCALLTYPE *GetIDList)(
-        IShellLinkA* This,
-        LPITEMIDLIST* ppidl);
-
-    HRESULT (STDMETHODCALLTYPE *SetIDList)(
-        IShellLinkA* This,
-        LPCITEMIDLIST pidl);
-
-    HRESULT (STDMETHODCALLTYPE *GetDescription)(
-        IShellLinkA* This,
-        LPSTR pszName,
-        int cch);
-
-    HRESULT (STDMETHODCALLTYPE *SetDescription)(
-        IShellLinkA* This,
-        LPCSTR pszName);
-
-    HRESULT (STDMETHODCALLTYPE *GetWorkingDirectory)(
-        IShellLinkA* This,
-        LPSTR pszDir,
-        int cch);
-
-    HRESULT (STDMETHODCALLTYPE *SetWorkingDirectory)(
-        IShellLinkA* This,
-        LPCSTR pszDir);
-
-    HRESULT (STDMETHODCALLTYPE *GetArguments)(
-        IShellLinkA* This,
-        LPSTR pszArgs,
-        int cch);
-
-    HRESULT (STDMETHODCALLTYPE *SetArguments)(
-        IShellLinkA* This,
-        LPCSTR pszArgs);
-
-    HRESULT (STDMETHODCALLTYPE *GetHotkey)(
-        IShellLinkA* This,
-        WORD* pwHotkey);
-
-    HRESULT (STDMETHODCALLTYPE *SetHotkey)(
-        IShellLinkA* This,
-        WORD wHotkey);
-
-    HRESULT (STDMETHODCALLTYPE *GetShowCmd)(
-        IShellLinkA* This,
-        int* piShowCmd);
-
-    HRESULT (STDMETHODCALLTYPE *SetShowCmd)(
-        IShellLinkA* This,
-        int iShowCmd);
-
-    HRESULT (STDMETHODCALLTYPE *GetIconLocation)(
-        IShellLinkA* This,
-        LPSTR pszIconPath,
-        int cch,
-        int* piIcon);
-
-    HRESULT (STDMETHODCALLTYPE *SetIconLocation)(
-        IShellLinkA* This,
-        LPCSTR pszIconPath,
-        int iIcon);
-
-    HRESULT (STDMETHODCALLTYPE *SetRelativePath)(
-        IShellLinkA* This,
-        LPCSTR pszPathRel,
-        DWORD dwReserved);
-
-    HRESULT (STDMETHODCALLTYPE *Resolve)(
-        IShellLinkA* This,
-        HWND hwnd,
-        DWORD fFlags);
-
-    HRESULT (STDMETHODCALLTYPE *SetPath)(
-        IShellLinkA* This,
-        LPCSTR pszFile);
-
-};
-
-/*** IUnknown methods ***/
-#define IShellLinkA_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IShellLinkA_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IShellLinkA_Release(p) (p)->lpVtbl->Release(p)
-/*** IShellLinkA methods ***/
-#define IShellLinkA_GetPath(p,a,b,c,d) (p)->lpVtbl->GetPath(p,a,b,c,d)
-#define IShellLinkA_GetIDList(p,a) (p)->lpVtbl->GetIDList(p,a)
-#define IShellLinkA_SetIDList(p,a) (p)->lpVtbl->SetIDList(p,a)
-#define IShellLinkA_GetDescription(p,a,b) (p)->lpVtbl->GetDescription(p,a,b)
-#define IShellLinkA_SetDescription(p,a) (p)->lpVtbl->SetDescription(p,a)
-#define IShellLinkA_GetWorkingDirectory(p,a,b) (p)->lpVtbl->GetWorkingDirectory(p,a,b)
-#define IShellLinkA_SetWorkingDirectory(p,a) (p)->lpVtbl->SetWorkingDirectory(p,a)
-#define IShellLinkA_GetArguments(p,a,b) (p)->lpVtbl->GetArguments(p,a,b)
-#define IShellLinkA_SetArguments(p,a) (p)->lpVtbl->SetArguments(p,a)
-#define IShellLinkA_GetHotkey(p,a) (p)->lpVtbl->GetHotkey(p,a)
-#define IShellLinkA_SetHotkey(p,a) (p)->lpVtbl->SetHotkey(p,a)
-#define IShellLinkA_GetShowCmd(p,a) (p)->lpVtbl->GetShowCmd(p,a)
-#define IShellLinkA_SetShowCmd(p,a) (p)->lpVtbl->SetShowCmd(p,a)
-#define IShellLinkA_GetIconLocation(p,a,b,c) (p)->lpVtbl->GetIconLocation(p,a,b,c)
-#define IShellLinkA_SetIconLocation(p,a,b) (p)->lpVtbl->SetIconLocation(p,a,b)
-#define IShellLinkA_SetRelativePath(p,a,b) (p)->lpVtbl->SetRelativePath(p,a,b)
-#define IShellLinkA_Resolve(p,a,b) (p)->lpVtbl->Resolve(p,a,b)
-#define IShellLinkA_SetPath(p,a) (p)->lpVtbl->SetPath(p,a)
-
-#endif
-
-#define IShellLinkA_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
-    /*** IUnknown methods ***/ \
-    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
-    STDMETHOD_(ULONG,Release)(THIS) PURE; \
-    /*** IShellLinkA methods ***/ \
-    STDMETHOD_(HRESULT,GetPath)(THIS_ LPSTR pszFile, int cch, WIN32_FIND_DATAA* pfd, DWORD fFlags) PURE; \
-    STDMETHOD_(HRESULT,GetIDList)(THIS_ LPITEMIDLIST* ppidl) PURE; \
-    STDMETHOD_(HRESULT,SetIDList)(THIS_ LPCITEMIDLIST pidl) PURE; \
-    STDMETHOD_(HRESULT,GetDescription)(THIS_ LPSTR pszName, int cch) PURE; \
-    STDMETHOD_(HRESULT,SetDescription)(THIS_ LPCSTR pszName) PURE; \
-    STDMETHOD_(HRESULT,GetWorkingDirectory)(THIS_ LPSTR pszDir, int cch) PURE; \
-    STDMETHOD_(HRESULT,SetWorkingDirectory)(THIS_ LPCSTR pszDir) PURE; \
-    STDMETHOD_(HRESULT,GetArguments)(THIS_ LPSTR pszArgs, int cch) PURE; \
-    STDMETHOD_(HRESULT,SetArguments)(THIS_ LPCSTR pszArgs) PURE; \
-    STDMETHOD_(HRESULT,GetHotkey)(THIS_ WORD* pwHotkey) PURE; \
-    STDMETHOD_(HRESULT,SetHotkey)(THIS_ WORD wHotkey) PURE; \
-    STDMETHOD_(HRESULT,GetShowCmd)(THIS_ int* piShowCmd) PURE; \
-    STDMETHOD_(HRESULT,SetShowCmd)(THIS_ int iShowCmd) PURE; \
-    STDMETHOD_(HRESULT,GetIconLocation)(THIS_ LPSTR pszIconPath, int cch, int* piIcon) PURE; \
-    STDMETHOD_(HRESULT,SetIconLocation)(THIS_ LPCSTR pszIconPath, int iIcon) PURE; \
-    STDMETHOD_(HRESULT,SetRelativePath)(THIS_ LPCSTR pszPathRel, DWORD dwReserved) PURE; \
-    STDMETHOD_(HRESULT,Resolve)(THIS_ HWND hwnd, DWORD fFlags) PURE; \
-    STDMETHOD_(HRESULT,SetPath)(THIS_ LPCSTR pszFile) PURE;
-
-HRESULT CALLBACK IShellLinkA_GetPath_Proxy(
-    IShellLinkA* This,
-    LPSTR pszFile,
-    int cch,
-    WIN32_FIND_DATAA* pfd,
-    DWORD fFlags);
-void __RPC_STUB IShellLinkA_GetPath_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkA_GetIDList_Proxy(
-    IShellLinkA* This,
-    LPITEMIDLIST* ppidl);
-void __RPC_STUB IShellLinkA_GetIDList_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkA_SetIDList_Proxy(
-    IShellLinkA* This,
-    LPCITEMIDLIST pidl);
-void __RPC_STUB IShellLinkA_SetIDList_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkA_GetDescription_Proxy(
-    IShellLinkA* This,
-    LPSTR pszName,
-    int cch);
-void __RPC_STUB IShellLinkA_GetDescription_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkA_SetDescription_Proxy(
-    IShellLinkA* This,
-    LPCSTR pszName);
-void __RPC_STUB IShellLinkA_SetDescription_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkA_GetWorkingDirectory_Proxy(
-    IShellLinkA* This,
-    LPSTR pszDir,
-    int cch);
-void __RPC_STUB IShellLinkA_GetWorkingDirectory_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkA_SetWorkingDirectory_Proxy(
-    IShellLinkA* This,
-    LPCSTR pszDir);
-void __RPC_STUB IShellLinkA_SetWorkingDirectory_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkA_GetArguments_Proxy(
-    IShellLinkA* This,
-    LPSTR pszArgs,
-    int cch);
-void __RPC_STUB IShellLinkA_GetArguments_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkA_SetArguments_Proxy(
-    IShellLinkA* This,
-    LPCSTR pszArgs);
-void __RPC_STUB IShellLinkA_SetArguments_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkA_GetHotkey_Proxy(
-    IShellLinkA* This,
-    WORD* pwHotkey);
-void __RPC_STUB IShellLinkA_GetHotkey_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkA_SetHotkey_Proxy(
-    IShellLinkA* This,
-    WORD wHotkey);
-void __RPC_STUB IShellLinkA_SetHotkey_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkA_GetShowCmd_Proxy(
-    IShellLinkA* This,
-    int* piShowCmd);
-void __RPC_STUB IShellLinkA_GetShowCmd_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkA_SetShowCmd_Proxy(
-    IShellLinkA* This,
-    int iShowCmd);
-void __RPC_STUB IShellLinkA_SetShowCmd_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkA_GetIconLocation_Proxy(
-    IShellLinkA* This,
-    LPSTR pszIconPath,
-    int cch,
-    int* piIcon);
-void __RPC_STUB IShellLinkA_GetIconLocation_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkA_SetIconLocation_Proxy(
-    IShellLinkA* This,
-    LPCSTR pszIconPath,
-    int iIcon);
-void __RPC_STUB IShellLinkA_SetIconLocation_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkA_SetRelativePath_Proxy(
-    IShellLinkA* This,
-    LPCSTR pszPathRel,
-    DWORD dwReserved);
-void __RPC_STUB IShellLinkA_SetRelativePath_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkA_Resolve_Proxy(
-    IShellLinkA* This,
-    HWND hwnd,
-    DWORD fFlags);
-void __RPC_STUB IShellLinkA_Resolve_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkA_SetPath_Proxy(
-    IShellLinkA* This,
-    LPCSTR pszFile);
-void __RPC_STUB IShellLinkA_SetPath_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-
-#endif  /* __IShellLinkA_INTERFACE_DEFINED__ */
-
-#ifndef __IShellLinkW_FWD_DEFINED__
-#define __IShellLinkW_FWD_DEFINED__
-typedef struct IShellLinkW IShellLinkW;
-#endif
-
-/*****************************************************************************
- * IShellLinkW interface
- */
-#ifndef __IShellLinkW_INTERFACE_DEFINED__
-#define __IShellLinkW_INTERFACE_DEFINED__
-
-DEFINE_GUID(IID_IShellLinkW, 0x000214f9, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46);
-#if defined(__cplusplus) && !defined(CINTERFACE)
-struct IShellLinkW : public IUnknown
-{
-    virtual HRESULT STDMETHODCALLTYPE GetPath(
-        LPWSTR pszFile,
-        int cch,
-        WIN32_FIND_DATAW* pfd,
-        DWORD fFlags) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE GetIDList(
-        LPITEMIDLIST* ppidl) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SetIDList(
-        LPCITEMIDLIST pidl) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE GetDescription(
-        LPWSTR pszName,
-        int cch) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SetDescription(
-        LPCWSTR pszName) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE GetWorkingDirectory(
-        LPWSTR pszDir,
-        int cch) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SetWorkingDirectory(
-        LPCWSTR pszDir) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE GetArguments(
-        LPWSTR pszArgs,
-        int cch) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SetArguments(
-        LPCWSTR pszArgs) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE GetHotkey(
-        WORD* pwHotkey) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SetHotkey(
-        WORD wHotkey) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE GetShowCmd(
-        int* piShowCmd) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SetShowCmd(
-        int iShowCmd) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE GetIconLocation(
-        LPWSTR pszIconPath,
-        int cch,
-        int* piIcon) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SetIconLocation(
-        LPCWSTR pszIconPath,
-        int iIcon) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SetRelativePath(
-        LPCWSTR pszPathRel,
-        DWORD dwReserved) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE Resolve(
-        HWND hwnd,
-        DWORD fFlags) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SetPath(
-        LPCWSTR pszFile) = 0;
-
-};
-#else
-typedef struct IShellLinkWVtbl IShellLinkWVtbl;
-struct IShellLinkW {
-    const IShellLinkWVtbl* lpVtbl;
-};
-struct IShellLinkWVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
-    /*** IUnknown methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellLinkW* This,
-        REFIID riid,
-        void** ppvObject);
-
-    ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellLinkW* This);
-
-    ULONG (STDMETHODCALLTYPE *Release)(
-        IShellLinkW* This);
-
-    /*** IShellLinkW methods ***/
-    HRESULT (STDMETHODCALLTYPE *GetPath)(
-        IShellLinkW* This,
-        LPWSTR pszFile,
-        int cch,
-        WIN32_FIND_DATAW* pfd,
-        DWORD fFlags);
-
-    HRESULT (STDMETHODCALLTYPE *GetIDList)(
-        IShellLinkW* This,
-        LPITEMIDLIST* ppidl);
-
-    HRESULT (STDMETHODCALLTYPE *SetIDList)(
-        IShellLinkW* This,
-        LPCITEMIDLIST pidl);
-
-    HRESULT (STDMETHODCALLTYPE *GetDescription)(
-        IShellLinkW* This,
-        LPWSTR pszName,
-        int cch);
-
-    HRESULT (STDMETHODCALLTYPE *SetDescription)(
-        IShellLinkW* This,
-        LPCWSTR pszName);
-
-    HRESULT (STDMETHODCALLTYPE *GetWorkingDirectory)(
-        IShellLinkW* This,
-        LPWSTR pszDir,
-        int cch);
-
-    HRESULT (STDMETHODCALLTYPE *SetWorkingDirectory)(
-        IShellLinkW* This,
-        LPCWSTR pszDir);
-
-    HRESULT (STDMETHODCALLTYPE *GetArguments)(
-        IShellLinkW* This,
-        LPWSTR pszArgs,
-        int cch);
-
-    HRESULT (STDMETHODCALLTYPE *SetArguments)(
-        IShellLinkW* This,
-        LPCWSTR pszArgs);
-
-    HRESULT (STDMETHODCALLTYPE *GetHotkey)(
-        IShellLinkW* This,
-        WORD* pwHotkey);
-
-    HRESULT (STDMETHODCALLTYPE *SetHotkey)(
-        IShellLinkW* This,
-        WORD wHotkey);
-
-    HRESULT (STDMETHODCALLTYPE *GetShowCmd)(
-        IShellLinkW* This,
-        int* piShowCmd);
-
-    HRESULT (STDMETHODCALLTYPE *SetShowCmd)(
-        IShellLinkW* This,
-        int iShowCmd);
-
-    HRESULT (STDMETHODCALLTYPE *GetIconLocation)(
-        IShellLinkW* This,
-        LPWSTR pszIconPath,
-        int cch,
-        int* piIcon);
-
-    HRESULT (STDMETHODCALLTYPE *SetIconLocation)(
-        IShellLinkW* This,
-        LPCWSTR pszIconPath,
-        int iIcon);
-
-    HRESULT (STDMETHODCALLTYPE *SetRelativePath)(
-        IShellLinkW* This,
-        LPCWSTR pszPathRel,
-        DWORD dwReserved);
-
-    HRESULT (STDMETHODCALLTYPE *Resolve)(
-        IShellLinkW* This,
-        HWND hwnd,
-        DWORD fFlags);
-
-    HRESULT (STDMETHODCALLTYPE *SetPath)(
-        IShellLinkW* This,
-        LPCWSTR pszFile);
-
-};
-
-/*** IUnknown methods ***/
-#define IShellLinkW_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IShellLinkW_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IShellLinkW_Release(p) (p)->lpVtbl->Release(p)
-/*** IShellLinkW methods ***/
-#define IShellLinkW_GetPath(p,a,b,c,d) (p)->lpVtbl->GetPath(p,a,b,c,d)
-#define IShellLinkW_GetIDList(p,a) (p)->lpVtbl->GetIDList(p,a)
-#define IShellLinkW_SetIDList(p,a) (p)->lpVtbl->SetIDList(p,a)
-#define IShellLinkW_GetDescription(p,a,b) (p)->lpVtbl->GetDescription(p,a,b)
-#define IShellLinkW_SetDescription(p,a) (p)->lpVtbl->SetDescription(p,a)
-#define IShellLinkW_GetWorkingDirectory(p,a,b) (p)->lpVtbl->GetWorkingDirectory(p,a,b)
-#define IShellLinkW_SetWorkingDirectory(p,a) (p)->lpVtbl->SetWorkingDirectory(p,a)
-#define IShellLinkW_GetArguments(p,a,b) (p)->lpVtbl->GetArguments(p,a,b)
-#define IShellLinkW_SetArguments(p,a) (p)->lpVtbl->SetArguments(p,a)
-#define IShellLinkW_GetHotkey(p,a) (p)->lpVtbl->GetHotkey(p,a)
-#define IShellLinkW_SetHotkey(p,a) (p)->lpVtbl->SetHotkey(p,a)
-#define IShellLinkW_GetShowCmd(p,a) (p)->lpVtbl->GetShowCmd(p,a)
-#define IShellLinkW_SetShowCmd(p,a) (p)->lpVtbl->SetShowCmd(p,a)
-#define IShellLinkW_GetIconLocation(p,a,b,c) (p)->lpVtbl->GetIconLocation(p,a,b,c)
-#define IShellLinkW_SetIconLocation(p,a,b) (p)->lpVtbl->SetIconLocation(p,a,b)
-#define IShellLinkW_SetRelativePath(p,a,b) (p)->lpVtbl->SetRelativePath(p,a,b)
-#define IShellLinkW_Resolve(p,a,b) (p)->lpVtbl->Resolve(p,a,b)
-#define IShellLinkW_SetPath(p,a) (p)->lpVtbl->SetPath(p,a)
-
-#endif
-
-#define IShellLinkW_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
-    /*** IUnknown methods ***/ \
-    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
-    STDMETHOD_(ULONG,Release)(THIS) PURE; \
-    /*** IShellLinkW methods ***/ \
-    STDMETHOD_(HRESULT,GetPath)(THIS_ LPWSTR pszFile, int cch, WIN32_FIND_DATAW* pfd, DWORD fFlags) PURE; \
-    STDMETHOD_(HRESULT,GetIDList)(THIS_ LPITEMIDLIST* ppidl) PURE; \
-    STDMETHOD_(HRESULT,SetIDList)(THIS_ LPCITEMIDLIST pidl) PURE; \
-    STDMETHOD_(HRESULT,GetDescription)(THIS_ LPWSTR pszName, int cch) PURE; \
-    STDMETHOD_(HRESULT,SetDescription)(THIS_ LPCWSTR pszName) PURE; \
-    STDMETHOD_(HRESULT,GetWorkingDirectory)(THIS_ LPWSTR pszDir, int cch) PURE; \
-    STDMETHOD_(HRESULT,SetWorkingDirectory)(THIS_ LPCWSTR pszDir) PURE; \
-    STDMETHOD_(HRESULT,GetArguments)(THIS_ LPWSTR pszArgs, int cch) PURE; \
-    STDMETHOD_(HRESULT,SetArguments)(THIS_ LPCWSTR pszArgs) PURE; \
-    STDMETHOD_(HRESULT,GetHotkey)(THIS_ WORD* pwHotkey) PURE; \
-    STDMETHOD_(HRESULT,SetHotkey)(THIS_ WORD wHotkey) PURE; \
-    STDMETHOD_(HRESULT,GetShowCmd)(THIS_ int* piShowCmd) PURE; \
-    STDMETHOD_(HRESULT,SetShowCmd)(THIS_ int iShowCmd) PURE; \
-    STDMETHOD_(HRESULT,GetIconLocation)(THIS_ LPWSTR pszIconPath, int cch, int* piIcon) PURE; \
-    STDMETHOD_(HRESULT,SetIconLocation)(THIS_ LPCWSTR pszIconPath, int iIcon) PURE; \
-    STDMETHOD_(HRESULT,SetRelativePath)(THIS_ LPCWSTR pszPathRel, DWORD dwReserved) PURE; \
-    STDMETHOD_(HRESULT,Resolve)(THIS_ HWND hwnd, DWORD fFlags) PURE; \
-    STDMETHOD_(HRESULT,SetPath)(THIS_ LPCWSTR pszFile) PURE;
-
-HRESULT CALLBACK IShellLinkW_GetPath_Proxy(
-    IShellLinkW* This,
-    LPWSTR pszFile,
-    int cch,
-    WIN32_FIND_DATAW* pfd,
-    DWORD fFlags);
-void __RPC_STUB IShellLinkW_GetPath_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkW_GetIDList_Proxy(
-    IShellLinkW* This,
-    LPITEMIDLIST* ppidl);
-void __RPC_STUB IShellLinkW_GetIDList_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkW_SetIDList_Proxy(
-    IShellLinkW* This,
-    LPCITEMIDLIST pidl);
-void __RPC_STUB IShellLinkW_SetIDList_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkW_GetDescription_Proxy(
-    IShellLinkW* This,
-    LPWSTR pszName,
-    int cch);
-void __RPC_STUB IShellLinkW_GetDescription_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkW_SetDescription_Proxy(
-    IShellLinkW* This,
-    LPCWSTR pszName);
-void __RPC_STUB IShellLinkW_SetDescription_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkW_GetWorkingDirectory_Proxy(
-    IShellLinkW* This,
-    LPWSTR pszDir,
-    int cch);
-void __RPC_STUB IShellLinkW_GetWorkingDirectory_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkW_SetWorkingDirectory_Proxy(
-    IShellLinkW* This,
-    LPCWSTR pszDir);
-void __RPC_STUB IShellLinkW_SetWorkingDirectory_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkW_GetArguments_Proxy(
-    IShellLinkW* This,
-    LPWSTR pszArgs,
-    int cch);
-void __RPC_STUB IShellLinkW_GetArguments_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkW_SetArguments_Proxy(
-    IShellLinkW* This,
-    LPCWSTR pszArgs);
-void __RPC_STUB IShellLinkW_SetArguments_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkW_GetHotkey_Proxy(
-    IShellLinkW* This,
-    WORD* pwHotkey);
-void __RPC_STUB IShellLinkW_GetHotkey_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkW_SetHotkey_Proxy(
-    IShellLinkW* This,
-    WORD wHotkey);
-void __RPC_STUB IShellLinkW_SetHotkey_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkW_GetShowCmd_Proxy(
-    IShellLinkW* This,
-    int* piShowCmd);
-void __RPC_STUB IShellLinkW_GetShowCmd_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkW_SetShowCmd_Proxy(
-    IShellLinkW* This,
-    int iShowCmd);
-void __RPC_STUB IShellLinkW_SetShowCmd_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkW_GetIconLocation_Proxy(
-    IShellLinkW* This,
-    LPWSTR pszIconPath,
-    int cch,
-    int* piIcon);
-void __RPC_STUB IShellLinkW_GetIconLocation_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkW_SetIconLocation_Proxy(
-    IShellLinkW* This,
-    LPCWSTR pszIconPath,
-    int iIcon);
-void __RPC_STUB IShellLinkW_SetIconLocation_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkW_SetRelativePath_Proxy(
-    IShellLinkW* This,
-    LPCWSTR pszPathRel,
-    DWORD dwReserved);
-void __RPC_STUB IShellLinkW_SetRelativePath_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkW_Resolve_Proxy(
-    IShellLinkW* This,
-    HWND hwnd,
-    DWORD fFlags);
-void __RPC_STUB IShellLinkW_Resolve_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IShellLinkW_SetPath_Proxy(
-    IShellLinkW* This,
-    LPCWSTR pszFile);
-void __RPC_STUB IShellLinkW_SetPath_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-
-#endif  /* __IShellLinkW_INTERFACE_DEFINED__ */
-
-#define IShellLink WINELIB_NAME_AW(IShellLink)
-#ifndef __IShellExtInit_FWD_DEFINED__
-#define __IShellExtInit_FWD_DEFINED__
-typedef struct IShellExtInit IShellExtInit;
-#endif
-
-typedef IShellExtInit *LPSHELLEXTINIT;
-
-/*****************************************************************************
- * IShellExtInit interface
- */
-#ifndef __IShellExtInit_INTERFACE_DEFINED__
-#define __IShellExtInit_INTERFACE_DEFINED__
-
-DEFINE_GUID(IID_IShellExtInit, 0x000214e8, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46);
-#if defined(__cplusplus) && !defined(CINTERFACE)
-struct IShellExtInit : public IUnknown
-{
-    virtual HRESULT STDMETHODCALLTYPE Initialize(
-        LPCITEMIDLIST pidlFolder,
-        IDataObject* pdtobj,
-        HKEY hkeyProgID) = 0;
-
-};
-#else
-typedef struct IShellExtInitVtbl IShellExtInitVtbl;
-struct IShellExtInit {
-    const IShellExtInitVtbl* lpVtbl;
-};
-struct IShellExtInitVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
-    /*** IUnknown methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellExtInit* This,
-        REFIID riid,
-        void** ppvObject);
-
-    ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellExtInit* This);
-
-    ULONG (STDMETHODCALLTYPE *Release)(
-        IShellExtInit* This);
-
-    /*** IShellExtInit methods ***/
-    HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IShellExtInit* This,
-        LPCITEMIDLIST pidlFolder,
-        IDataObject* pdtobj,
-        HKEY hkeyProgID);
-
-};
-
-/*** IUnknown methods ***/
-#define IShellExtInit_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IShellExtInit_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IShellExtInit_Release(p) (p)->lpVtbl->Release(p)
-/*** IShellExtInit methods ***/
-#define IShellExtInit_Initialize(p,a,b,c) (p)->lpVtbl->Initialize(p,a,b,c)
-
-#endif
-
-#define IShellExtInit_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
-    /*** IUnknown methods ***/ \
-    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
-    STDMETHOD_(ULONG,Release)(THIS) PURE; \
-    /*** IShellExtInit methods ***/ \
-    STDMETHOD_(HRESULT,Initialize)(THIS_ LPCITEMIDLIST pidlFolder, IDataObject* pdtobj, HKEY hkeyProgID) PURE;
-
-HRESULT CALLBACK IShellExtInit_Initialize_Proxy(
-    IShellExtInit* This,
-    LPCITEMIDLIST pidlFolder,
-    IDataObject* pdtobj,
-    HKEY hkeyProgID);
-void __RPC_STUB IShellExtInit_Initialize_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-
-#endif  /* __IShellExtInit_INTERFACE_DEFINED__ */
-
-#ifndef __IPersistFolder3_FWD_DEFINED__
-#define __IPersistFolder3_FWD_DEFINED__
-typedef struct IPersistFolder3 IPersistFolder3;
-#endif
-
-typedef struct {
-    LPITEMIDLIST pidlTargetFolder;
-    WCHAR szTargetParsingName[260];
-    WCHAR szNetworkProvider[260];
-    DWORD dwAttributes;
-    int csidl;
-} PERSIST_FOLDER_TARGET_INFO;
-
-/*****************************************************************************
- * IPersistFolder3 interface
- */
-#ifndef __IPersistFolder3_INTERFACE_DEFINED__
-#define __IPersistFolder3_INTERFACE_DEFINED__
-
-DEFINE_GUID(IID_IPersistFolder3, 0xcef04fdf, 0xfe72, 0x11d2, 0x87,0xa5, 0x00,0xc0,0x4f,0x68,0x37,0xcf);
-#if defined(__cplusplus) && !defined(CINTERFACE)
-struct IPersistFolder3 : public IPersistFolder2
-{
-    virtual HRESULT STDMETHODCALLTYPE InitializeEx(
-        IBindCtx* pbc,
-        LPCITEMIDLIST pidlRoot,
-        const PERSIST_FOLDER_TARGET_INFO* ppfti) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE GetFolderTargetInfo(
-        PERSIST_FOLDER_TARGET_INFO* ppfti) = 0;
-
-};
-#else
-typedef struct IPersistFolder3Vtbl IPersistFolder3Vtbl;
-struct IPersistFolder3 {
-    const IPersistFolder3Vtbl* lpVtbl;
-};
-struct IPersistFolder3Vtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
-    /*** IUnknown methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPersistFolder3* This,
-        REFIID riid,
-        void** ppvObject);
-
-    ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPersistFolder3* This);
-
-    ULONG (STDMETHODCALLTYPE *Release)(
-        IPersistFolder3* This);
-
-    /*** IPersist methods ***/
-    HRESULT (STDMETHODCALLTYPE *GetClassID)(
-        IPersistFolder3* This,
-        CLSID* pClassID);
-
-    /*** IPersistFolder methods ***/
-    HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IPersistFolder3* This,
-        LPCITEMIDLIST pidl);
-
-    /*** IPersistFolder2 methods ***/
-    HRESULT (STDMETHODCALLTYPE *GetCurFolder)(
-        IPersistFolder3* This,
-        LPITEMIDLIST* ppidl);
-
-    /*** IPersistFolder3 methods ***/
-    HRESULT (STDMETHODCALLTYPE *InitializeEx)(
-        IPersistFolder3* This,
-        IBindCtx* pbc,
-        LPCITEMIDLIST pidlRoot,
-        const PERSIST_FOLDER_TARGET_INFO* ppfti);
-
-    HRESULT (STDMETHODCALLTYPE *GetFolderTargetInfo)(
-        IPersistFolder3* This,
-        PERSIST_FOLDER_TARGET_INFO* ppfti);
-
-};
-
-/*** IUnknown methods ***/
-#define IPersistFolder3_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IPersistFolder3_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IPersistFolder3_Release(p) (p)->lpVtbl->Release(p)
-/*** IPersist methods ***/
-#define IPersistFolder3_GetClassID(p,a) (p)->lpVtbl->GetClassID(p,a)
-/*** IPersistFolder methods ***/
-#define IPersistFolder3_Initialize(p,a) (p)->lpVtbl->Initialize(p,a)
-/*** IPersistFolder2 methods ***/
-#define IPersistFolder3_GetCurFolder(p,a) (p)->lpVtbl->GetCurFolder(p,a)
-/*** IPersistFolder3 methods ***/
-#define IPersistFolder3_InitializeEx(p,a,b,c) (p)->lpVtbl->InitializeEx(p,a,b,c)
-#define IPersistFolder3_GetFolderTargetInfo(p,a) (p)->lpVtbl->GetFolderTargetInfo(p,a)
-
-#endif
-
-#define IPersistFolder3_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
-    /*** IUnknown methods ***/ \
-    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
-    STDMETHOD_(ULONG,Release)(THIS) PURE; \
-    /*** IPersist methods ***/ \
-    STDMETHOD_(HRESULT,GetClassID)(THIS_ CLSID* pClassID) PURE; \
-    /*** IPersistFolder methods ***/ \
-    STDMETHOD_(HRESULT,Initialize)(THIS_ LPCITEMIDLIST pidl) PURE; \
-    /*** IPersistFolder2 methods ***/ \
-    STDMETHOD_(HRESULT,GetCurFolder)(THIS_ LPITEMIDLIST* ppidl) PURE; \
-    /*** IPersistFolder3 methods ***/ \
-    STDMETHOD_(HRESULT,InitializeEx)(THIS_ IBindCtx* pbc, LPCITEMIDLIST pidlRoot, const PERSIST_FOLDER_TARGET_INFO* ppfti) PURE; \
-    STDMETHOD_(HRESULT,GetFolderTargetInfo)(THIS_ PERSIST_FOLDER_TARGET_INFO* ppfti) PURE;
-
-HRESULT CALLBACK IPersistFolder3_InitializeEx_Proxy(
-    IPersistFolder3* This,
-    IBindCtx* pbc,
-    LPCITEMIDLIST pidlRoot,
-    const PERSIST_FOLDER_TARGET_INFO* ppfti);
-void __RPC_STUB IPersistFolder3_InitializeEx_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IPersistFolder3_GetFolderTargetInfo_Proxy(
-    IPersistFolder3* This,
-    PERSIST_FOLDER_TARGET_INFO* ppfti);
-void __RPC_STUB IPersistFolder3_GetFolderTargetInfo_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-
-#endif  /* __IPersistFolder3_INTERFACE_DEFINED__ */
-
-#ifndef __IExtractIconA_FWD_DEFINED__
-#define __IExtractIconA_FWD_DEFINED__
-typedef struct IExtractIconA IExtractIconA;
-#endif
-
-#define GIL_OPENICON     0x0001
-#define GIL_FORSHELL     0x0002
-#define GIL_ASYNC        0x0020
-#define GIL_DEFAULTICON  0x0040
-#define GIL_FORSHORTCUT  0x0080
-#define GIL_SIMULATEDOC  0x0001
-#define GIL_PERINSTANCE  0x0002
-#define GIL_PERCLASS     0x0004
-#define GIL_NOTFILENAME  0x0008
-#define GIL_DONTCACHE    0x0010
-typedef IExtractIconA *LPEXTRACTICONA;
-
-/*****************************************************************************
- * IExtractIconA interface
- */
-#ifndef __IExtractIconA_INTERFACE_DEFINED__
-#define __IExtractIconA_INTERFACE_DEFINED__
-
-DEFINE_GUID(IID_IExtractIconA, 0x000214eb, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46);
-#if defined(__cplusplus) && !defined(CINTERFACE)
-struct IExtractIconA : public IUnknown
-{
-    virtual HRESULT STDMETHODCALLTYPE GetIconLocation(
-        UINT uFlags,
-        LPSTR szIconFile,
-        UINT cchMax,
-        INT* piIndex,
-        UINT* pwFlags) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE Extract(
-        LPCSTR pszFile,
-        UINT nIconIndex,
-        HICON* phiconLarge,
-        HICON* phiconSmall,
-        UINT nIconSize) = 0;
-
-};
-#else
-typedef struct IExtractIconAVtbl IExtractIconAVtbl;
-struct IExtractIconA {
-    const IExtractIconAVtbl* lpVtbl;
-};
-struct IExtractIconAVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
-    /*** IUnknown methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IExtractIconA* This,
-        REFIID riid,
-        void** ppvObject);
-
-    ULONG (STDMETHODCALLTYPE *AddRef)(
-        IExtractIconA* This);
-
-    ULONG (STDMETHODCALLTYPE *Release)(
-        IExtractIconA* This);
-
-    /*** IExtractIconA methods ***/
-    HRESULT (STDMETHODCALLTYPE *GetIconLocation)(
-        IExtractIconA* This,
-        UINT uFlags,
-        LPSTR szIconFile,
-        UINT cchMax,
-        INT* piIndex,
-        UINT* pwFlags);
-
-    HRESULT (STDMETHODCALLTYPE *Extract)(
-        IExtractIconA* This,
-        LPCSTR pszFile,
-        UINT nIconIndex,
-        HICON* phiconLarge,
-        HICON* phiconSmall,
-        UINT nIconSize);
-
-};
-
-/*** IUnknown methods ***/
-#define IExtractIconA_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IExtractIconA_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IExtractIconA_Release(p) (p)->lpVtbl->Release(p)
-/*** IExtractIconA methods ***/
-#define IExtractIconA_GetIconLocation(p,a,b,c,d,e) (p)->lpVtbl->GetIconLocation(p,a,b,c,d,e)
-#define IExtractIconA_Extract(p,a,b,c,d,e) (p)->lpVtbl->Extract(p,a,b,c,d,e)
-
-#endif
-
-#define IExtractIconA_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
-    /*** IUnknown methods ***/ \
-    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
-    STDMETHOD_(ULONG,Release)(THIS) PURE; \
-    /*** IExtractIconA methods ***/ \
-    STDMETHOD_(HRESULT,GetIconLocation)(THIS_ UINT uFlags, LPSTR szIconFile, UINT cchMax, INT* piIndex, UINT* pwFlags) PURE; \
-    STDMETHOD_(HRESULT,Extract)(THIS_ LPCSTR pszFile, UINT nIconIndex, HICON* phiconLarge, HICON* phiconSmall, UINT nIconSize) PURE;
-
-HRESULT CALLBACK IExtractIconA_GetIconLocation_Proxy(
-    IExtractIconA* This,
-    UINT uFlags,
-    LPSTR szIconFile,
-    UINT cchMax,
-    INT* piIndex,
-    UINT* pwFlags);
-void __RPC_STUB IExtractIconA_GetIconLocation_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IExtractIconA_Extract_Proxy(
-    IExtractIconA* This,
-    LPCSTR pszFile,
-    UINT nIconIndex,
-    HICON* phiconLarge,
-    HICON* phiconSmall,
-    UINT nIconSize);
-void __RPC_STUB IExtractIconA_Extract_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-
-#endif  /* __IExtractIconA_INTERFACE_DEFINED__ */
-
-#ifndef __IExtractIconW_FWD_DEFINED__
-#define __IExtractIconW_FWD_DEFINED__
-typedef struct IExtractIconW IExtractIconW;
-#endif
-
-typedef IExtractIconW *LPEXTRACTICONW;
-
-/*****************************************************************************
- * IExtractIconW interface
- */
-#ifndef __IExtractIconW_INTERFACE_DEFINED__
-#define __IExtractIconW_INTERFACE_DEFINED__
-
-DEFINE_GUID(IID_IExtractIconW, 0x000214fa, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46);
-#if defined(__cplusplus) && !defined(CINTERFACE)
-struct IExtractIconW : public IUnknown
-{
-    virtual HRESULT STDMETHODCALLTYPE GetIconLocation(
-        UINT uFlags,
-        LPWSTR szIconFile,
-        UINT cchMax,
-        INT* piIndex,
-        UINT* pwFlags) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE Extract(
-        LPCWSTR pszFile,
-        UINT nIconIndex,
-        HICON* phiconLarge,
-        HICON* phiconSmall,
-        UINT nIconSize) = 0;
-
-};
-#else
-typedef struct IExtractIconWVtbl IExtractIconWVtbl;
-struct IExtractIconW {
-    const IExtractIconWVtbl* lpVtbl;
-};
-struct IExtractIconWVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
-    /*** IUnknown methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IExtractIconW* This,
-        REFIID riid,
-        void** ppvObject);
-
-    ULONG (STDMETHODCALLTYPE *AddRef)(
-        IExtractIconW* This);
-
-    ULONG (STDMETHODCALLTYPE *Release)(
-        IExtractIconW* This);
-
-    /*** IExtractIconW methods ***/
-    HRESULT (STDMETHODCALLTYPE *GetIconLocation)(
-        IExtractIconW* This,
-        UINT uFlags,
-        LPWSTR szIconFile,
-        UINT cchMax,
-        INT* piIndex,
-        UINT* pwFlags);
-
-    HRESULT (STDMETHODCALLTYPE *Extract)(
-        IExtractIconW* This,
-        LPCWSTR pszFile,
-        UINT nIconIndex,
-        HICON* phiconLarge,
-        HICON* phiconSmall,
-        UINT nIconSize);
-
-};
-
-/*** IUnknown methods ***/
-#define IExtractIconW_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IExtractIconW_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IExtractIconW_Release(p) (p)->lpVtbl->Release(p)
-/*** IExtractIconW methods ***/
-#define IExtractIconW_GetIconLocation(p,a,b,c,d,e) (p)->lpVtbl->GetIconLocation(p,a,b,c,d,e)
-#define IExtractIconW_Extract(p,a,b,c,d,e) (p)->lpVtbl->Extract(p,a,b,c,d,e)
-
-#endif
-
-#define IExtractIconW_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
-    /*** IUnknown methods ***/ \
-    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
-    STDMETHOD_(ULONG,Release)(THIS) PURE; \
-    /*** IExtractIconW methods ***/ \
-    STDMETHOD_(HRESULT,GetIconLocation)(THIS_ UINT uFlags, LPWSTR szIconFile, UINT cchMax, INT* piIndex, UINT* pwFlags) PURE; \
-    STDMETHOD_(HRESULT,Extract)(THIS_ LPCWSTR pszFile, UINT nIconIndex, HICON* phiconLarge, HICON* phiconSmall, UINT nIconSize) PURE;
-
-HRESULT CALLBACK IExtractIconW_GetIconLocation_Proxy(
-    IExtractIconW* This,
-    UINT uFlags,
-    LPWSTR szIconFile,
-    UINT cchMax,
-    INT* piIndex,
-    UINT* pwFlags);
-void __RPC_STUB IExtractIconW_GetIconLocation_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IExtractIconW_Extract_Proxy(
-    IExtractIconW* This,
-    LPCWSTR pszFile,
-    UINT nIconIndex,
-    HICON* phiconLarge,
-    HICON* phiconSmall,
-    UINT nIconSize);
-void __RPC_STUB IExtractIconW_Extract_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-
-#endif  /* __IExtractIconW_INTERFACE_DEFINED__ */
-
-#define LPEXTRACTICON WINELIB_NAME_AW(LPEXTRACTICON)
-#define IExtractIcon WINELIB_NAME_AW(IExtractIcon)
-#ifndef __ICommDlgBrowser_FWD_DEFINED__
-#define __ICommDlgBrowser_FWD_DEFINED__
-typedef struct ICommDlgBrowser ICommDlgBrowser;
-#endif
-
-#define CDBOSC_SETFOCUS     0x00000000
-#define CDBOSC_KILLFOCUS    0x00000001
-#define CDBOSC_SELCHANGE    0x00000002
-#define CDBOSC_RENAME       0x00000003
-#define CDBOSC_STATECHANGE  0x00000004
-typedef ICommDlgBrowser *LPCOMMDLGBROWSER;
-
-/*****************************************************************************
- * ICommDlgBrowser interface
- */
-#ifndef __ICommDlgBrowser_INTERFACE_DEFINED__
-#define __ICommDlgBrowser_INTERFACE_DEFINED__
-
-DEFINE_GUID(IID_ICommDlgBrowser, 0x000214f1, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46);
-#if defined(__cplusplus) && !defined(CINTERFACE)
-struct ICommDlgBrowser : public IUnknown
-{
-    virtual HRESULT STDMETHODCALLTYPE OnDefaultCommand(
-        IShellView* shv) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE OnStateChange(
-        IShellView* shv,
-        ULONG uChange) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE IncludeObject(
-        IShellView* shv,
-        LPCITEMIDLIST pidl) = 0;
-
-};
-#else
-typedef struct ICommDlgBrowserVtbl ICommDlgBrowserVtbl;
-struct ICommDlgBrowser {
-    const ICommDlgBrowserVtbl* lpVtbl;
-};
-struct ICommDlgBrowserVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
-    /*** IUnknown methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICommDlgBrowser* This,
-        REFIID riid,
-        void** ppvObject);
-
-    ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICommDlgBrowser* This);
-
-    ULONG (STDMETHODCALLTYPE *Release)(
-        ICommDlgBrowser* This);
-
-    /*** ICommDlgBrowser methods ***/
-    HRESULT (STDMETHODCALLTYPE *OnDefaultCommand)(
-        ICommDlgBrowser* This,
-        IShellView* shv);
-
-    HRESULT (STDMETHODCALLTYPE *OnStateChange)(
-        ICommDlgBrowser* This,
-        IShellView* shv,
-        ULONG uChange);
-
-    HRESULT (STDMETHODCALLTYPE *IncludeObject)(
-        ICommDlgBrowser* This,
-        IShellView* shv,
-        LPCITEMIDLIST pidl);
-
-};
-
-/*** IUnknown methods ***/
-#define ICommDlgBrowser_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define ICommDlgBrowser_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define ICommDlgBrowser_Release(p) (p)->lpVtbl->Release(p)
-/*** ICommDlgBrowser methods ***/
-#define ICommDlgBrowser_OnDefaultCommand(p,a) (p)->lpVtbl->OnDefaultCommand(p,a)
-#define ICommDlgBrowser_OnStateChange(p,a,b) (p)->lpVtbl->OnStateChange(p,a,b)
-#define ICommDlgBrowser_IncludeObject(p,a,b) (p)->lpVtbl->IncludeObject(p,a,b)
-
-#endif
-
-#define ICommDlgBrowser_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
-    /*** IUnknown methods ***/ \
-    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
-    STDMETHOD_(ULONG,Release)(THIS) PURE; \
-    /*** ICommDlgBrowser methods ***/ \
-    STDMETHOD_(HRESULT,OnDefaultCommand)(THIS_ IShellView* shv) PURE; \
-    STDMETHOD_(HRESULT,OnStateChange)(THIS_ IShellView* shv, ULONG uChange) PURE; \
-    STDMETHOD_(HRESULT,IncludeObject)(THIS_ IShellView* shv, LPCITEMIDLIST pidl) PURE;
-
-HRESULT CALLBACK ICommDlgBrowser_OnDefaultCommand_Proxy(
-    ICommDlgBrowser* This,
-    IShellView* shv);
-void __RPC_STUB ICommDlgBrowser_OnDefaultCommand_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK ICommDlgBrowser_OnStateChange_Proxy(
-    ICommDlgBrowser* This,
-    IShellView* shv,
-    ULONG uChange);
-void __RPC_STUB ICommDlgBrowser_OnStateChange_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK ICommDlgBrowser_IncludeObject_Proxy(
-    ICommDlgBrowser* This,
-    IShellView* shv,
-    LPCITEMIDLIST pidl);
-void __RPC_STUB ICommDlgBrowser_IncludeObject_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-
-#endif  /* __ICommDlgBrowser_INTERFACE_DEFINED__ */
-
-#ifndef __IDockingWindowFrame_FWD_DEFINED__
-#define __IDockingWindowFrame_FWD_DEFINED__
-typedef struct IDockingWindowFrame IDockingWindowFrame;
-#endif
-
-#define DWFRF_NORMAL           0x0000
-#define DWFRF_DELETECONFIGDATA 0x0001
-#define DWFAF_HIDDEN           0x0001
-/*****************************************************************************
- * IDockingWindowFrame interface
- */
-#ifndef __IDockingWindowFrame_INTERFACE_DEFINED__
-#define __IDockingWindowFrame_INTERFACE_DEFINED__
-
-DEFINE_GUID(IID_IDockingWindowFrame, 0x47d2657a, 0x7b27, 0x11d0, 0x8c,0xa9, 0x00,0xa0,0xc9,0x2d,0xbf,0xe8);
-#if defined(__cplusplus) && !defined(CINTERFACE)
-struct IDockingWindowFrame : public IOleWindow
-{
-    virtual HRESULT STDMETHODCALLTYPE AddToolbar(
-        IUnknown* punkSrc,
-        LPCWSTR pwszItem,
-        DWORD dwAddFlags) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE RemoveToolbar(
-        IUnknown* punkSrc,
-        DWORD dwRemoveFlags) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE FindToolbar(
-        LPCWSTR pwszItem,
-        REFIID riid,
-        LPVOID* ppvObj) = 0;
-
-};
-#else
-typedef struct IDockingWindowFrameVtbl IDockingWindowFrameVtbl;
-struct IDockingWindowFrame {
-    const IDockingWindowFrameVtbl* lpVtbl;
-};
-struct IDockingWindowFrameVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
-    /*** IUnknown methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDockingWindowFrame* This,
-        REFIID riid,
-        void** ppvObject);
-
-    ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDockingWindowFrame* This);
-
-    ULONG (STDMETHODCALLTYPE *Release)(
-        IDockingWindowFrame* This);
-
-    /*** IOleWindow methods ***/
-    HRESULT (STDMETHODCALLTYPE *GetWindow)(
-        IDockingWindowFrame* This,
-        HWND* phwnd);
-
-    HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)(
-        IDockingWindowFrame* This,
-        BOOL fEnterMode);
-
-    /*** IDockingWindowFrame methods ***/
-    HRESULT (STDMETHODCALLTYPE *AddToolbar)(
-        IDockingWindowFrame* This,
-        IUnknown* punkSrc,
-        LPCWSTR pwszItem,
-        DWORD dwAddFlags);
-
-    HRESULT (STDMETHODCALLTYPE *RemoveToolbar)(
-        IDockingWindowFrame* This,
-        IUnknown* punkSrc,
-        DWORD dwRemoveFlags);
-
-    HRESULT (STDMETHODCALLTYPE *FindToolbar)(
-        IDockingWindowFrame* This,
-        LPCWSTR pwszItem,
-        REFIID riid,
-        LPVOID* ppvObj);
-
-};
-
-/*** IUnknown methods ***/
-#define IDockingWindowFrame_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IDockingWindowFrame_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IDockingWindowFrame_Release(p) (p)->lpVtbl->Release(p)
-/*** IOleWindow methods ***/
-#define IDockingWindowFrame_GetWindow(p,a) (p)->lpVtbl->GetWindow(p,a)
-#define IDockingWindowFrame_ContextSensitiveHelp(p,a) (p)->lpVtbl->ContextSensitiveHelp(p,a)
-/*** IDockingWindowFrame methods ***/
-#define IDockingWindowFrame_AddToolbar(p,a,b,c) (p)->lpVtbl->AddToolbar(p,a,b,c)
-#define IDockingWindowFrame_RemoveToolbar(p,a,b) (p)->lpVtbl->RemoveToolbar(p,a,b)
-#define IDockingWindowFrame_FindToolbar(p,a,b,c) (p)->lpVtbl->FindToolbar(p,a,b,c)
-
-#endif
-
-#define IDockingWindowFrame_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
-    /*** IUnknown methods ***/ \
-    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
-    STDMETHOD_(ULONG,Release)(THIS) PURE; \
-    /*** IOleWindow methods ***/ \
-    STDMETHOD_(HRESULT,GetWindow)(THIS_ HWND* phwnd) PURE; \
-    STDMETHOD_(HRESULT,ContextSensitiveHelp)(THIS_ BOOL fEnterMode) PURE; \
-    /*** IDockingWindowFrame methods ***/ \
-    STDMETHOD_(HRESULT,AddToolbar)(THIS_ IUnknown* punkSrc, LPCWSTR pwszItem, DWORD dwAddFlags) PURE; \
-    STDMETHOD_(HRESULT,RemoveToolbar)(THIS_ IUnknown* punkSrc, DWORD dwRemoveFlags) PURE; \
-    STDMETHOD_(HRESULT,FindToolbar)(THIS_ LPCWSTR pwszItem, REFIID riid, LPVOID* ppvObj) PURE;
-
-HRESULT CALLBACK IDockingWindowFrame_AddToolbar_Proxy(
-    IDockingWindowFrame* This,
-    IUnknown* punkSrc,
-    LPCWSTR pwszItem,
-    DWORD dwAddFlags);
-void __RPC_STUB IDockingWindowFrame_AddToolbar_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IDockingWindowFrame_RemoveToolbar_Proxy(
-    IDockingWindowFrame* This,
-    IUnknown* punkSrc,
-    DWORD dwRemoveFlags);
-void __RPC_STUB IDockingWindowFrame_RemoveToolbar_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IDockingWindowFrame_FindToolbar_Proxy(
-    IDockingWindowFrame* This,
-    LPCWSTR pwszItem,
-    REFIID riid,
-    LPVOID* ppvObj);
-void __RPC_STUB IDockingWindowFrame_FindToolbar_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-
-#endif  /* __IDockingWindowFrame_INTERFACE_DEFINED__ */
-
-#ifndef __IDragSourceHelper_FWD_DEFINED__
-#define __IDragSourceHelper_FWD_DEFINED__
-typedef struct IDragSourceHelper IDragSourceHelper;
-#endif
-
-typedef struct {
-    SIZE sizeDragImage;
-    POINT ptOffset;
-    HBITMAP hbmpDragImage;
-    COLORREF crColorKey;
-} SHDRAGIMAGE, *LPSHDRAGIMAGE;
-
-/*****************************************************************************
- * IDragSourceHelper interface
- */
-#ifndef __IDragSourceHelper_INTERFACE_DEFINED__
-#define __IDragSourceHelper_INTERFACE_DEFINED__
-
-DEFINE_GUID(IID_IDragSourceHelper, 0xde5bf786, 0x477a, 0x11d2, 0x83,0x9d, 0x00,0xc0,0x4f,0xd9,0x18,0xd0);
-#if defined(__cplusplus) && !defined(CINTERFACE)
-struct IDragSourceHelper : public IUnknown
-{
-    virtual HRESULT STDMETHODCALLTYPE InitializeFromBitmap(
-        LPSHDRAGIMAGE pshdi,
-        IDataObject* pDataObject) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE InitializeFromWindow(
-        HWND hwnd,
-        POINT* ppt,
-        IDataObject* pDataObject) = 0;
-
-};
-#else
-typedef struct IDragSourceHelperVtbl IDragSourceHelperVtbl;
-struct IDragSourceHelper {
-    const IDragSourceHelperVtbl* lpVtbl;
-};
-struct IDragSourceHelperVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
-    /*** IUnknown methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDragSourceHelper* This,
-        REFIID riid,
-        void** ppvObject);
-
-    ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDragSourceHelper* This);
-
-    ULONG (STDMETHODCALLTYPE *Release)(
-        IDragSourceHelper* This);
-
-    /*** IDragSourceHelper methods ***/
-    HRESULT (STDMETHODCALLTYPE *InitializeFromBitmap)(
-        IDragSourceHelper* This,
-        LPSHDRAGIMAGE pshdi,
-        IDataObject* pDataObject);
-
-    HRESULT (STDMETHODCALLTYPE *InitializeFromWindow)(
-        IDragSourceHelper* This,
-        HWND hwnd,
-        POINT* ppt,
-        IDataObject* pDataObject);
-
-};
-
-/*** IUnknown methods ***/
-#define IDragSourceHelper_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IDragSourceHelper_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IDragSourceHelper_Release(p) (p)->lpVtbl->Release(p)
-/*** IDragSourceHelper methods ***/
-#define IDragSourceHelper_InitializeFromBitmap(p,a,b) (p)->lpVtbl->InitializeFromBitmap(p,a,b)
-#define IDragSourceHelper_InitializeFromWindow(p,a,b,c) (p)->lpVtbl->InitializeFromWindow(p,a,b,c)
-
-#endif
-
-#define IDragSourceHelper_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
-    /*** IUnknown methods ***/ \
-    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
-    STDMETHOD_(ULONG,Release)(THIS) PURE; \
-    /*** IDragSourceHelper methods ***/ \
-    STDMETHOD_(HRESULT,InitializeFromBitmap)(THIS_ LPSHDRAGIMAGE pshdi, IDataObject* pDataObject) PURE; \
-    STDMETHOD_(HRESULT,InitializeFromWindow)(THIS_ HWND hwnd, POINT* ppt, IDataObject* pDataObject) PURE;
-
-HRESULT CALLBACK IDragSourceHelper_InitializeFromBitmap_Proxy(
-    IDragSourceHelper* This,
-    LPSHDRAGIMAGE pshdi,
-    IDataObject* pDataObject);
-void __RPC_STUB IDragSourceHelper_InitializeFromBitmap_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IDragSourceHelper_InitializeFromWindow_Proxy(
-    IDragSourceHelper* This,
-    HWND hwnd,
-    POINT* ppt,
-    IDataObject* pDataObject);
-void __RPC_STUB IDragSourceHelper_InitializeFromWindow_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-
-#endif  /* __IDragSourceHelper_INTERFACE_DEFINED__ */
-
-#ifndef __IDropTargetHelper_FWD_DEFINED__
-#define __IDropTargetHelper_FWD_DEFINED__
-typedef struct IDropTargetHelper IDropTargetHelper;
-#endif
+#define CMIC_MASK_ASYNCOK        SEE_MASK_ASYNCOK
 
 /*****************************************************************************
  * IDropTargetHelper interface
  */
-#ifndef __IDropTargetHelper_INTERFACE_DEFINED__
-#define __IDropTargetHelper_INTERFACE_DEFINED__
-
 DEFINE_GUID(IID_IDropTargetHelper, 0x4657278b, 0x411b, 0x11d2, 0x83,0x9a, 0x00,0xc0,0x4f,0xd9,0x18,0xd0);
-#if defined(__cplusplus) && !defined(CINTERFACE)
-struct IDropTargetHelper : public IUnknown
-{
-    virtual HRESULT STDMETHODCALLTYPE DragEnter(
-        HWND hwndTarget,
-        IDataObject* pDataObject,
-        POINT* ppt,
-        DWORD dwEffect) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE DragLeave(
-        ) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE DragOver(
-        POINT* ppt,
-        DWORD dwEffect) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE Drop(
-        IDataObject* pDataObject,
-        POINT* ppt,
-        DWORD dwEffect) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE Show(
-        BOOL fShow) = 0;
-
-};
-#else
-typedef struct IDropTargetHelperVtbl IDropTargetHelperVtbl;
-struct IDropTargetHelper {
-    const IDropTargetHelperVtbl* lpVtbl;
-};
-struct IDropTargetHelperVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
-    /*** IUnknown methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDropTargetHelper* This,
-        REFIID riid,
-        void** ppvObject);
-
-    ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDropTargetHelper* This);
-
-    ULONG (STDMETHODCALLTYPE *Release)(
-        IDropTargetHelper* This);
-
-    /*** IDropTargetHelper methods ***/
-    HRESULT (STDMETHODCALLTYPE *DragEnter)(
-        IDropTargetHelper* This,
-        HWND hwndTarget,
-        IDataObject* pDataObject,
-        POINT* ppt,
-        DWORD dwEffect);
-
-    HRESULT (STDMETHODCALLTYPE *DragLeave)(
-        IDropTargetHelper* This);
-
-    HRESULT (STDMETHODCALLTYPE *DragOver)(
-        IDropTargetHelper* This,
-        POINT* ppt,
-        DWORD dwEffect);
-
-    HRESULT (STDMETHODCALLTYPE *Drop)(
-        IDropTargetHelper* This,
-        IDataObject* pDataObject,
-        POINT* ppt,
-        DWORD dwEffect);
-
-    HRESULT (STDMETHODCALLTYPE *Show)(
-        IDropTargetHelper* This,
-        BOOL fShow);
-
-};
-
-/*** IUnknown methods ***/
-#define IDropTargetHelper_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IDropTargetHelper_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IDropTargetHelper_Release(p) (p)->lpVtbl->Release(p)
-/*** IDropTargetHelper methods ***/
-#define IDropTargetHelper_DragEnter(p,a,b,c,d) (p)->lpVtbl->DragEnter(p,a,b,c,d)
-#define IDropTargetHelper_DragLeave(p) (p)->lpVtbl->DragLeave(p)
-#define IDropTargetHelper_DragOver(p,a,b) (p)->lpVtbl->DragOver(p,a,b)
-#define IDropTargetHelper_Drop(p,a,b,c) (p)->lpVtbl->Drop(p,a,b,c)
-#define IDropTargetHelper_Show(p,a) (p)->lpVtbl->Show(p,a)
-
-#endif
-
-#define IDropTargetHelper_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
-    /*** IUnknown methods ***/ \
-    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
-    STDMETHOD_(ULONG,Release)(THIS) PURE; \
-    /*** IDropTargetHelper methods ***/ \
-    STDMETHOD_(HRESULT,DragEnter)(THIS_ HWND hwndTarget, IDataObject* pDataObject, POINT* ppt, DWORD dwEffect) PURE; \
-    STDMETHOD_(HRESULT,DragLeave)(THIS) PURE; \
-    STDMETHOD_(HRESULT,DragOver)(THIS_ POINT* ppt, DWORD dwEffect) PURE; \
-    STDMETHOD_(HRESULT,Drop)(THIS_ IDataObject* pDataObject, POINT* ppt, DWORD dwEffect) PURE; \
-    STDMETHOD_(HRESULT,Show)(THIS_ BOOL fShow) PURE;
-
-HRESULT CALLBACK IDropTargetHelper_DragEnter_Proxy(
-    IDropTargetHelper* This,
-    HWND hwndTarget,
-    IDataObject* pDataObject,
-    POINT* ppt,
-    DWORD dwEffect);
-void __RPC_STUB IDropTargetHelper_DragEnter_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IDropTargetHelper_DragLeave_Proxy(
-    IDropTargetHelper* This);
-void __RPC_STUB IDropTargetHelper_DragLeave_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IDropTargetHelper_DragOver_Proxy(
-    IDropTargetHelper* This,
-    POINT* ppt,
-    DWORD dwEffect);
-void __RPC_STUB IDropTargetHelper_DragOver_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IDropTargetHelper_Drop_Proxy(
-    IDropTargetHelper* This,
-    IDataObject* pDataObject,
-    POINT* ppt,
-    DWORD dwEffect);
-void __RPC_STUB IDropTargetHelper_Drop_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IDropTargetHelper_Show_Proxy(
-    IDropTargetHelper* This,
-    BOOL fShow);
-void __RPC_STUB IDropTargetHelper_Show_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-
-#endif  /* __IDropTargetHelper_INTERFACE_DEFINED__ */
-
-#ifndef __IContextMenu_FWD_DEFINED__
-#define __IContextMenu_FWD_DEFINED__
-typedef struct IContextMenu IContextMenu;
-#endif
-
-#define CMF_NORMAL        0x00000000
-#define CMF_DEFAULTONLY   0x00000001
-#define CMF_VERBSONLY     0x00000002
-#define CMF_EXPLORE       0x00000004
-#define CMF_NOVERBS       0x00000008
-#define CMF_CANRENAME     0x00000010
-#define CMF_NODEFAULT     0x00000020
-#define CMF_INCLUDESTATIC 0x00000040
-#define CMF_EXTENDEDVERBS 0x00000100
-#define CMF_RESERVED      0xffff0000
-#define GCS_VERBA         0x00000000
-#define GCS_HELPTEXTA     0x00000001
-#define GCS_VALIDATEA     0x00000002
-#define GCS_VERBW         0x00000004
-#define GCS_HELPTEXTW     0x00000005
-#define GCS_VALIDATEW     0x00000006
-#define GCS_UNICODE       0x00000004
-#define GCS_VERB          WINELIB_NAME_AW(GCS_VERB)
-#define GCS_HELPTEXT      WINELIB_NAME_AW(GCS_HELPTEXT)
-#define GCS_VALIDATE      WINELIB_NAME_AW(GCS_VALIDATE)
-#define CMDSTR_NEWFOLDERA   "NewFolder"
-#define CMDSTR_VIEWLISTA    "ViewList"
-#define CMDSTR_VIEWDETAILSA "ViewDetails"
-#if defined(__GNUC__)
-# define CMDSTR_NEWFOLDERW (const WCHAR []){ 'N','e','w','F','o','l','d','e','r',0 }
-# define CMDSTR_VIEWLISTW (const WCHAR []){ 'V','i','e','w','L','i','s','t',0 }
-# define CMDSTR_VIEWDETAILSW (const WCHAR []){ 'V','i','e','w','D','e','t','a','i','l','s',0 }
-#elif defined(_MSC_VER)
-# define CMDSTR_NEWFOLDERW   L"NewFolder"
-# define CMDSTR_VIEWLISTW    L"ViewList"
-# define CMDSTR_VIEWDETAILSW L"ViewDetails"
-#else
-static const WCHAR CMDSTR_NEWFOLDERW[] = {'N','e','w','F','o','l','d','e','r',0};
-static const WCHAR CMDSTR_VIEWLISTW [] = {'V','i','e','w','L','i','s','t',0};
-static const WCHAR CMDSTR_VIEWDETAILSW[] = {'V','i','e','w','D','e','t','a','i','l','s',0};
-#endif
-#define CMDSTR_NEWFOLDER    WINELIB_NAME_AW(CMDSTR_NEWFOLDER)
-#define CMDSTR_VIEWLIST     WINELIB_NAME_AW(CMDSTR_VIEWLIST)
-#define CMDSTR_VIEWDETAILS  WINELIB_NAME_AW(CMDSTR_VIEWDETAILS)
-#define CMIC_MASK_HOTKEY         SEE_MASK_HOTKEY
-#define CMIC_MASK_ICON           SEE_MASK_ICON
-#define CMIC_MASK_FLAG_NO_UI     SEE_MASK_FLAG_NO_UI
-#define CMIC_MASK_UNICODE        SEE_MASK_UNICODE
-#define CMIC_MASK_NO_CONSOLE     SEE_MASK_NO_CONSOLE
-#define CMIC_MASK_HASLINKNAME    SEE_MASK_HASLINKNAME
-#define CMIC_MASK_FLAG_SEP_VDM   SEE_MASK_FLAG_SEPVDM
-#define CMIC_MASK_HASTITLE       SEE_MASK_HASTITLE
-#define CMIC_MASK_ASYNCOK        SEE_MASK_ASYNCOK
-#define CMIC_MASK_SHIFT_DOWN     0x10000000
-#define CMIC_MASK_PTINVOKE       0x20000000
-#define CMIC_MASK_CONTROL_DOWN   0x40000000
-#define CMIC_MASK_FLAG_LOG_USAGE SEE_MASK_FLAG_LOG_USAGE
-#define CMIC_MASK_NOZONECHECKS   SEE_MASK_NOZONECHECKS
-typedef IContextMenu *LPCONTEXTMENU;
-
-typedef struct tagCMINVOKECOMMANDINFO {
-    DWORD cbSize;
-    DWORD fMask;
-    HWND hwnd;
-    LPCSTR lpVerb;
-    LPCSTR lpParameters;
-    LPCSTR lpDirectory;
-    INT nShow;
-    DWORD dwHotKey;
-    HANDLE hIcon;
-} CMINVOKECOMMANDINFO, *LPCMINVOKECOMMANDINFO;
-
-typedef struct tagCMInvokeCommandInfoEx {
-    DWORD cbSize;
-    DWORD fMask;
-    HWND hwnd;
-    LPCSTR lpVerb;
-    LPCSTR lpParameters;
-    LPCSTR lpDirectory;
-    INT nShow;
-    DWORD dwHotKey;
-    HANDLE hIcon;
-    LPCSTR lpTitle;
-    LPCWSTR lpVerbW;
-    LPCWSTR lpParametersW;
-    LPCWSTR lpDirectoryW;
-    LPCWSTR lpTitleW;
-    POINT ptInvoke;
-} CMINVOKECOMMANDINFOEX, *LPCMINVOKECOMMANDINFOEX;
 
 /*****************************************************************************
- * IContextMenu interface
+ * IPersistFolder2 interface
  */
-#ifndef __IContextMenu_INTERFACE_DEFINED__
-#define __IContextMenu_INTERFACE_DEFINED__
-
-DEFINE_GUID(IID_IContextMenu, 0x000214e4, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46);
-#if defined(__cplusplus) && !defined(CINTERFACE)
-struct IContextMenu : public IUnknown
-{
-    virtual HRESULT STDMETHODCALLTYPE QueryContextMenu(
-        HMENU hmenu,
-        UINT indexMenu,
-        UINT idCmdFirst,
-        UINT idCmdLast,
-        UINT uFlags) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE InvokeCommand(
-        LPCMINVOKECOMMANDINFO lpici) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE GetCommandString(
-        UINT idCmd,
-        UINT uType,
-        UINT* pwReserved,
-        LPSTR pszName,
-        UINT cchMax) = 0;
-
-};
-#else
-typedef struct IContextMenuVtbl IContextMenuVtbl;
-struct IContextMenu {
-    const IContextMenuVtbl* lpVtbl;
-};
-struct IContextMenuVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
-    /*** IUnknown methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IContextMenu* This,
-        REFIID riid,
-        void** ppvObject);
-
-    ULONG (STDMETHODCALLTYPE *AddRef)(
-        IContextMenu* This);
-
-    ULONG (STDMETHODCALLTYPE *Release)(
-        IContextMenu* This);
-
-    /*** IContextMenu methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryContextMenu)(
-        IContextMenu* This,
-        HMENU hmenu,
-        UINT indexMenu,
-        UINT idCmdFirst,
-        UINT idCmdLast,
-        UINT uFlags);
-
-    HRESULT (STDMETHODCALLTYPE *InvokeCommand)(
-        IContextMenu* This,
-        LPCMINVOKECOMMANDINFO lpici);
-
-    HRESULT (STDMETHODCALLTYPE *GetCommandString)(
-        IContextMenu* This,
-        UINT idCmd,
-        UINT uType,
-        UINT* pwReserved,
-        LPSTR pszName,
-        UINT cchMax);
-
-};
-
-/*** IUnknown methods ***/
-#define IContextMenu_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IContextMenu_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IContextMenu_Release(p) (p)->lpVtbl->Release(p)
-/*** IContextMenu methods ***/
-#define IContextMenu_QueryContextMenu(p,a,b,c,d,e) (p)->lpVtbl->QueryContextMenu(p,a,b,c,d,e)
-#define IContextMenu_InvokeCommand(p,a) (p)->lpVtbl->InvokeCommand(p,a)
-#define IContextMenu_GetCommandString(p,a,b,c,d,e) (p)->lpVtbl->GetCommandString(p,a,b,c,d,e)
-
-#endif
-
-#define IContextMenu_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
-    /*** IUnknown methods ***/ \
-    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
-    STDMETHOD_(ULONG,Release)(THIS) PURE; \
-    /*** IContextMenu methods ***/ \
-    STDMETHOD_(HRESULT,QueryContextMenu)(THIS_ HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) PURE; \
-    STDMETHOD_(HRESULT,InvokeCommand)(THIS_ LPCMINVOKECOMMANDINFO lpici) PURE; \
-    STDMETHOD_(HRESULT,GetCommandString)(THIS_ UINT idCmd, UINT uType, UINT* pwReserved, LPSTR pszName, UINT cchMax) PURE;
-
-HRESULT CALLBACK IContextMenu_QueryContextMenu_Proxy(
-    IContextMenu* This,
-    HMENU hmenu,
-    UINT indexMenu,
-    UINT idCmdFirst,
-    UINT idCmdLast,
-    UINT uFlags);
-void __RPC_STUB IContextMenu_QueryContextMenu_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IContextMenu_InvokeCommand_Proxy(
-    IContextMenu* This,
-    LPCMINVOKECOMMANDINFO lpici);
-void __RPC_STUB IContextMenu_InvokeCommand_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IContextMenu_GetCommandString_Proxy(
-    IContextMenu* This,
-    UINT idCmd,
-    UINT uType,
-    UINT* pwReserved,
-    LPSTR pszName,
-    UINT cchMax);
-void __RPC_STUB IContextMenu_GetCommandString_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-
-#endif  /* __IContextMenu_INTERFACE_DEFINED__ */
-
-#ifndef __IContextMenu2_FWD_DEFINED__
-#define __IContextMenu2_FWD_DEFINED__
-typedef struct IContextMenu2 IContextMenu2;
-#endif
-
-typedef IContextMenu2 *LPCONTEXTMENU2;
+DEFINE_GUID(IID_IPersistFolder2, 0x1ac3d9f0, 0x175c, 0x11d1, 0x95,0xbe, 0x00,0x60,0x97,0x97,0xea,0x4f);
 
 /*****************************************************************************
- * IContextMenu2 interface
+ * IShellFolder2 interface
  */
-#ifndef __IContextMenu2_INTERFACE_DEFINED__
-#define __IContextMenu2_INTERFACE_DEFINED__
-
-DEFINE_GUID(IID_IContextMenu2, 0x000214f4, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46);
-#if defined(__cplusplus) && !defined(CINTERFACE)
-struct IContextMenu2 : public IContextMenu
-{
-    virtual HRESULT STDMETHODCALLTYPE HandleMenuMsg(
-        UINT uMsg,
-        WPARAM wParam,
-        LPARAM lParam) = 0;
-
-};
-#else
-typedef struct IContextMenu2Vtbl IContextMenu2Vtbl;
-struct IContextMenu2 {
-    const IContextMenu2Vtbl* lpVtbl;
-};
-struct IContextMenu2Vtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
-    /*** IUnknown methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IContextMenu2* This,
-        REFIID riid,
-        void** ppvObject);
-
-    ULONG (STDMETHODCALLTYPE *AddRef)(
-        IContextMenu2* This);
-
-    ULONG (STDMETHODCALLTYPE *Release)(
-        IContextMenu2* This);
-
-    /*** IContextMenu methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryContextMenu)(
-        IContextMenu2* This,
-        HMENU hmenu,
-        UINT indexMenu,
-        UINT idCmdFirst,
-        UINT idCmdLast,
-        UINT uFlags);
-
-    HRESULT (STDMETHODCALLTYPE *InvokeCommand)(
-        IContextMenu2* This,
-        LPCMINVOKECOMMANDINFO lpici);
-
-    HRESULT (STDMETHODCALLTYPE *GetCommandString)(
-        IContextMenu2* This,
-        UINT idCmd,
-        UINT uType,
-        UINT* pwReserved,
-        LPSTR pszName,
-        UINT cchMax);
-
-    /*** IContextMenu2 methods ***/
-    HRESULT (STDMETHODCALLTYPE *HandleMenuMsg)(
-        IContextMenu2* This,
-        UINT uMsg,
-        WPARAM wParam,
-        LPARAM lParam);
-
-};
-
-/*** IUnknown methods ***/
-#define IContextMenu2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IContextMenu2_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IContextMenu2_Release(p) (p)->lpVtbl->Release(p)
-/*** IContextMenu methods ***/
-#define IContextMenu2_QueryContextMenu(p,a,b,c,d,e) (p)->lpVtbl->QueryContextMenu(p,a,b,c,d,e)
-#define IContextMenu2_InvokeCommand(p,a) (p)->lpVtbl->InvokeCommand(p,a)
-#define IContextMenu2_GetCommandString(p,a,b,c,d,e) (p)->lpVtbl->GetCommandString(p,a,b,c,d,e)
-/*** IContextMenu2 methods ***/
-#define IContextMenu2_HandleMenuMsg(p,a,b,c) (p)->lpVtbl->HandleMenuMsg(p,a,b,c)
-
-#endif
-
-#define IContextMenu2_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
-    /*** IUnknown methods ***/ \
-    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
-    STDMETHOD_(ULONG,Release)(THIS) PURE; \
-    /*** IContextMenu methods ***/ \
-    STDMETHOD_(HRESULT,QueryContextMenu)(THIS_ HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) PURE; \
-    STDMETHOD_(HRESULT,InvokeCommand)(THIS_ LPCMINVOKECOMMANDINFO lpici) PURE; \
-    STDMETHOD_(HRESULT,GetCommandString)(THIS_ UINT idCmd, UINT uType, UINT* pwReserved, LPSTR pszName, UINT cchMax) PURE; \
-    /*** IContextMenu2 methods ***/ \
-    STDMETHOD_(HRESULT,HandleMenuMsg)(THIS_ UINT uMsg, WPARAM wParam, LPARAM lParam) PURE;
-
-HRESULT CALLBACK IContextMenu2_HandleMenuMsg_Proxy(
-    IContextMenu2* This,
-    UINT uMsg,
-    WPARAM wParam,
-    LPARAM lParam);
-void __RPC_STUB IContextMenu2_HandleMenuMsg_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-
-#endif  /* __IContextMenu2_INTERFACE_DEFINED__ */
-
-#ifndef __IContextMenu3_FWD_DEFINED__
-#define __IContextMenu3_FWD_DEFINED__
-typedef struct IContextMenu3 IContextMenu3;
-#endif
-
-typedef IContextMenu3 *LPCONTEXTMENU3;
+DEFINE_GUID(IID_IShellFolder2, 0x93f2f68c, 0x1d1b, 0x11d3, 0xa3,0x0e, 0x00,0xc0,0x4f,0x79,0xab,0xd1);
 
 /*****************************************************************************
- * IContextMenu3 interface
+ * IPersistFolder3 interface
  */
-#ifndef __IContextMenu3_INTERFACE_DEFINED__
-#define __IContextMenu3_INTERFACE_DEFINED__
 
-DEFINE_GUID(IID_IContextMenu3, 0xbcfce0a0, 0xec17, 0x11d0, 0x8d,0x10, 0x00,0xa0,0xc9,0x0f,0x27,0x19);
-#if defined(__cplusplus) && !defined(CINTERFACE)
-struct IContextMenu3 : public IContextMenu2
-{
-    virtual HRESULT STDMETHODCALLTYPE HandleMenuMsg2(
-        UINT uMsg,
-        WPARAM wParam,
-        LPARAM lParam,
-        LRESULT* plResult) = 0;
-
-};
-#else
-typedef struct IContextMenu3Vtbl IContextMenu3Vtbl;
-struct IContextMenu3 {
-    const IContextMenu3Vtbl* lpVtbl;
-};
-struct IContextMenu3Vtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
-    /*** IUnknown methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IContextMenu3* This,
-        REFIID riid,
-        void** ppvObject);
-
-    ULONG (STDMETHODCALLTYPE *AddRef)(
-        IContextMenu3* This);
-
-    ULONG (STDMETHODCALLTYPE *Release)(
-        IContextMenu3* This);
-
-    /*** IContextMenu methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryContextMenu)(
-        IContextMenu3* This,
-        HMENU hmenu,
-        UINT indexMenu,
-        UINT idCmdFirst,
-        UINT idCmdLast,
-        UINT uFlags);
-
-    HRESULT (STDMETHODCALLTYPE *InvokeCommand)(
-        IContextMenu3* This,
-        LPCMINVOKECOMMANDINFO lpici);
-
-    HRESULT (STDMETHODCALLTYPE *GetCommandString)(
-        IContextMenu3* This,
-        UINT idCmd,
-        UINT uType,
-        UINT* pwReserved,
-        LPSTR pszName,
-        UINT cchMax);
-
-    /*** IContextMenu2 methods ***/
-    HRESULT (STDMETHODCALLTYPE *HandleMenuMsg)(
-        IContextMenu3* This,
-        UINT uMsg,
-        WPARAM wParam,
-        LPARAM lParam);
-
-    /*** IContextMenu3 methods ***/
-    HRESULT (STDMETHODCALLTYPE *HandleMenuMsg2)(
-        IContextMenu3* This,
-        UINT uMsg,
-        WPARAM wParam,
-        LPARAM lParam,
-        LRESULT* plResult);
-
-};
-
-/*** IUnknown methods ***/
-#define IContextMenu3_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IContextMenu3_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IContextMenu3_Release(p) (p)->lpVtbl->Release(p)
-/*** IContextMenu methods ***/
-#define IContextMenu3_QueryContextMenu(p,a,b,c,d,e) (p)->lpVtbl->QueryContextMenu(p,a,b,c,d,e)
-#define IContextMenu3_InvokeCommand(p,a) (p)->lpVtbl->InvokeCommand(p,a)
-#define IContextMenu3_GetCommandString(p,a,b,c,d,e) (p)->lpVtbl->GetCommandString(p,a,b,c,d,e)
-/*** IContextMenu2 methods ***/
-#define IContextMenu3_HandleMenuMsg(p,a,b,c) (p)->lpVtbl->HandleMenuMsg(p,a,b,c)
-/*** IContextMenu3 methods ***/
-#define IContextMenu3_HandleMenuMsg2(p,a,b,c,d) (p)->lpVtbl->HandleMenuMsg2(p,a,b,c,d)
-
-#endif
-
-#define IContextMenu3_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
-    /*** IUnknown methods ***/ \
-    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
-    STDMETHOD_(ULONG,Release)(THIS) PURE; \
-    /*** IContextMenu methods ***/ \
-    STDMETHOD_(HRESULT,QueryContextMenu)(THIS_ HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) PURE; \
-    STDMETHOD_(HRESULT,InvokeCommand)(THIS_ LPCMINVOKECOMMANDINFO lpici) PURE; \
-    STDMETHOD_(HRESULT,GetCommandString)(THIS_ UINT idCmd, UINT uType, UINT* pwReserved, LPSTR pszName, UINT cchMax) PURE; \
-    /*** IContextMenu2 methods ***/ \
-    STDMETHOD_(HRESULT,HandleMenuMsg)(THIS_ UINT uMsg, WPARAM wParam, LPARAM lParam) PURE; \
-    /*** IContextMenu3 methods ***/ \
-    STDMETHOD_(HRESULT,HandleMenuMsg2)(THIS_ UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT* plResult) PURE;
-
-HRESULT CALLBACK IContextMenu3_HandleMenuMsg2_Proxy(
-    IContextMenu3* This,
-    UINT uMsg,
-    WPARAM wParam,
-    LPARAM lParam,
-    LRESULT* plResult);
-void __RPC_STUB IContextMenu3_HandleMenuMsg2_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-
-#endif  /* __IContextMenu3_INTERFACE_DEFINED__ */
-
-#ifndef __IShellExecuteHookA_FWD_DEFINED__
-#define __IShellExecuteHookA_FWD_DEFINED__
-typedef struct IShellExecuteHookA IShellExecuteHookA;
-#endif
-
-struct _SHELLEXECUTEINFOA;
-/*****************************************************************************
- * IShellExecuteHookA interface
- */
-#ifndef __IShellExecuteHookA_INTERFACE_DEFINED__
-#define __IShellExecuteHookA_INTERFACE_DEFINED__
-
-DEFINE_GUID(IID_IShellExecuteHookA, 0x000214f5, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46);
-#if defined(__cplusplus) && !defined(CINTERFACE)
-struct IShellExecuteHookA : public IUnknown
-{
-    virtual HRESULT STDMETHODCALLTYPE Execute(
-        struct _SHELLEXECUTEINFOA* pei) = 0;
-
-};
-#else
-typedef struct IShellExecuteHookAVtbl IShellExecuteHookAVtbl;
-struct IShellExecuteHookA {
-    const IShellExecuteHookAVtbl* lpVtbl;
-};
-struct IShellExecuteHookAVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
-    /*** IUnknown methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellExecuteHookA* This,
-        REFIID riid,
-        void** ppvObject);
-
-    ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellExecuteHookA* This);
-
-    ULONG (STDMETHODCALLTYPE *Release)(
-        IShellExecuteHookA* This);
-
-    /*** IShellExecuteHookA methods ***/
-    HRESULT (STDMETHODCALLTYPE *Execute)(
-        IShellExecuteHookA* This,
-        struct _SHELLEXECUTEINFOA* pei);
-
-};
-
-/*** IUnknown methods ***/
-#define IShellExecuteHookA_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IShellExecuteHookA_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IShellExecuteHookA_Release(p) (p)->lpVtbl->Release(p)
-/*** IShellExecuteHookA methods ***/
-#define IShellExecuteHookA_Execute(p,a) (p)->lpVtbl->Execute(p,a)
-
-#endif
-
-#define IShellExecuteHookA_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
-    /*** IUnknown methods ***/ \
-    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
-    STDMETHOD_(ULONG,Release)(THIS) PURE; \
-    /*** IShellExecuteHookA methods ***/ \
-    STDMETHOD_(HRESULT,Execute)(THIS_ struct _SHELLEXECUTEINFOA* pei) PURE;
-
-HRESULT CALLBACK IShellExecuteHookA_Execute_Proxy(
-    IShellExecuteHookA* This,
-    struct _SHELLEXECUTEINFOA* pei);
-void __RPC_STUB IShellExecuteHookA_Execute_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-
-#endif  /* __IShellExecuteHookA_INTERFACE_DEFINED__ */
-
-#ifndef __IShellExecuteHookW_FWD_DEFINED__
-#define __IShellExecuteHookW_FWD_DEFINED__
-typedef struct IShellExecuteHookW IShellExecuteHookW;
-#endif
-
-struct _SHELLEXECUTEINFOW;
 /*****************************************************************************
  * IShellExecuteHookW interface
  */
-#ifndef __IShellExecuteHookW_INTERFACE_DEFINED__
-#define __IShellExecuteHookW_INTERFACE_DEFINED__
-
-DEFINE_GUID(IID_IShellExecuteHookW, 0x000214fb, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46);
-#if defined(__cplusplus) && !defined(CINTERFACE)
-struct IShellExecuteHookW : public IUnknown
-{
-    virtual HRESULT STDMETHODCALLTYPE Execute(
-        struct _SHELLEXECUTEINFOW* pei) = 0;
-
-};
-#else
-typedef struct IShellExecuteHookWVtbl IShellExecuteHookWVtbl;
-struct IShellExecuteHookW {
-    const IShellExecuteHookWVtbl* lpVtbl;
-};
-struct IShellExecuteHookWVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
-    /*** IUnknown methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellExecuteHookW* This,
-        REFIID riid,
-        void** ppvObject);
-
-    ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellExecuteHookW* This);
-
-    ULONG (STDMETHODCALLTYPE *Release)(
-        IShellExecuteHookW* This);
-
-    /*** IShellExecuteHookW methods ***/
-    HRESULT (STDMETHODCALLTYPE *Execute)(
-        IShellExecuteHookW* This,
-        struct _SHELLEXECUTEINFOW* pei);
-
-};
-
+DEFINE_GUID(IID_IPersistFolder3, 0xcef04fdf, 0xfe72, 0x11d2, 0x87,0xa5, 0x00,0xc0,0x4f,0x68,0x37,0xcf);
 /*** IUnknown methods ***/
 #define IShellExecuteHookW_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
 #define IShellExecuteHookW_AddRef(p) (p)->lpVtbl->AddRef(p)
@@ -4242,29 +43,4 @@ struct IShellExecuteHookWVtbl {
 /*** IShellExecuteHookW methods ***/
 #define IShellExecuteHookW_Execute(p,a) (p)->lpVtbl->Execute(p,a)
 
-#endif
-
-#define IShellExecuteHookW_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
-    /*** IUnknown methods ***/ \
-    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
-    STDMETHOD_(ULONG,Release)(THIS) PURE; \
-    /*** IShellExecuteHookW methods ***/ \
-    STDMETHOD_(HRESULT,Execute)(THIS_ struct _SHELLEXECUTEINFOW* pei) PURE;
-
-HRESULT CALLBACK IShellExecuteHookW_Execute_Proxy(
-    IShellExecuteHookW* This,
-    struct _SHELLEXECUTEINFOW* pei);
-void __RPC_STUB IShellExecuteHookW_Execute_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-
-#endif  /* __IShellExecuteHookW_INTERFACE_DEFINED__ */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* __WIDL_SHOBJIDL_H */
+#endif /* __WINE_SHOBJIDL_H */
diff --git a/reactos/include/wine/winnetwk.h b/reactos/include/wine/winnetwk.h
index f5149bdb9e6..d84bc41ab8b 100644
--- a/reactos/include/wine/winnetwk.h
+++ b/reactos/include/wine/winnetwk.h
@@ -1,383 +1,16 @@
-/*
- * Copyright (C) the Wine project
+/* $Id: winnetwk.h,v 1.2 2004/06/29 13:40:40 gvg Exp $
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * Compatibility header
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This header is wrapper to allow compilation of Wine DLLs under ReactOS
+ * build system. It contains definitions commonly refered to as Wineisms
+ * and definitions that are missing in w32api.
  */
 
+#include_next <winnetwk.h>
 
-#ifndef _WINNETWK_H_
-#define _WINNETWK_H_
-
-/*
- * Network types
- */
-
-#define WNNC_NET_MSNET      0x00010000
-#define WNNC_NET_LANMAN     0x00020000
-#define WNNC_NET_NETWARE    0x00030000
-#define WNNC_NET_VINES      0x00040000
-#define WNNC_NET_10NET      0x00050000
-#define WNNC_NET_LOCUS      0x00060000
-#define WNNC_NET_SUN_PC_NFS 0x00070000
-#define WNNC_NET_LANSTEP    0x00080000
-#define WNNC_NET_9TILES     0x00090000
-#define WNNC_NET_LANTASTIC  0x000A0000
-#define WNNC_NET_AS400      0x000B0000
-#define WNNC_NET_FTP_NFS    0x000C0000
-#define WNNC_NET_PATHWORKS  0x000D0000
-#define WNNC_NET_LIFENET    0x000E0000
-#define WNNC_NET_POWERLAN   0x000F0000
-#define WNNC_NET_BWNFS      0x00100000
-#define WNNC_NET_COGENT     0x00110000
-#define WNNC_NET_FARALLON   0x00120000
-#define WNNC_NET_APPLETALK  0x00130000
-#define WNNC_NET_INTERGRAPH 0x00140000
-
-/*
- *  Network resources
- */
-
-#define RESOURCE_CONNECTED      0x00000001
-#define RESOURCE_GLOBALNET      0x00000002
-#define RESOURCE_REMEMBERED     0x00000003
-#define RESOURCE_RECENT         0x00000004
-#define RESOURCE_CONTEXT        0x00000005
-
-#define RESOURCETYPE_ANY        0x00000000
-#define RESOURCETYPE_DISK       0x00000001
-#define RESOURCETYPE_PRINT      0x00000002
-#define RESOURCETYPE_RESERVED   0x00000008
-#define RESOURCETYPE_UNKNOWN    0xFFFFFFFF
-
-#define RESOURCEUSAGE_CONNECTABLE   0x00000001
-#define RESOURCEUSAGE_CONTAINER     0x00000002
-#define RESOURCEUSAGE_NOLOCALDEVICE 0x00000004
-#define RESOURCEUSAGE_SIBLING       0x00000008
-#define RESOURCEUSAGE_ATTACHED      0x00000010
-#define RESOURCEUSAGE_ALL           (RESOURCEUSAGE_CONNECTABLE | RESOURCEUSAGE_CONTAINER | RESOURCEUSAGE_ATTACHED)
-#define RESOURCEUSAGE_RESERVED      0x80000000
-
-#define RESOURCEDISPLAYTYPE_GENERIC        0x00000000
-#define RESOURCEDISPLAYTYPE_DOMAIN         0x00000001
-#define RESOURCEDISPLAYTYPE_SERVER         0x00000002
-#define RESOURCEDISPLAYTYPE_SHARE          0x00000003
-#define RESOURCEDISPLAYTYPE_FILE           0x00000004
-#define RESOURCEDISPLAYTYPE_GROUP          0x00000005
-#define RESOURCEDISPLAYTYPE_NETWORK        0x00000006
-#define RESOURCEDISPLAYTYPE_ROOT           0x00000007
-#define RESOURCEDISPLAYTYPE_SHAREADMIN     0x00000008
-#define RESOURCEDISPLAYTYPE_DIRECTORY      0x00000009
-#define RESOURCEDISPLAYTYPE_TREE           0x0000000A
-
-typedef struct {
-	DWORD	dwScope;
-	DWORD	dwType;
-	DWORD	dwDisplayType;
-	DWORD	dwUsage;
-	LPSTR	lpLocalName;
-	LPSTR	lpRemoteName;
-	LPSTR	lpComment ;
-	LPSTR	lpProvider;
-} NETRESOURCEA,*LPNETRESOURCEA;
-
-typedef struct {
-	DWORD	dwScope;
-	DWORD	dwType;
-	DWORD	dwDisplayType;
-	DWORD	dwUsage;
-	LPWSTR	lpLocalName;
-	LPWSTR	lpRemoteName;
-	LPWSTR	lpComment ;
-	LPWSTR	lpProvider;
-} NETRESOURCEW,*LPNETRESOURCEW;
-
-DECL_WINELIB_TYPE_AW(NETRESOURCE)
-DECL_WINELIB_TYPE_AW(LPNETRESOURCE)
-
-
-/*
- *  Network connections
- */
-
-#define NETPROPERTY_PERSISTENT       1
-
-#define CONNECT_UPDATE_PROFILE      0x00000001
-#define CONNECT_UPDATE_RECENT       0x00000002
-#define CONNECT_TEMPORARY           0x00000004
-#define CONNECT_INTERACTIVE         0x00000008
-#define CONNECT_PROMPT              0x00000010
-#define CONNECT_NEED_DRIVE          0x00000020
-#define CONNECT_REFCOUNT            0x00000040
-#define CONNECT_REDIRECT            0x00000080
-#define CONNECT_LOCALDRIVE          0x00000100
-#define CONNECT_CURRENT_MEDIA       0x00000200
-
-DWORD WINAPI WNetAddConnectionA(LPCSTR,LPCSTR,LPCSTR);
-DWORD WINAPI WNetAddConnectionW(LPCWSTR,LPCWSTR,LPCWSTR);
-#define      WNetAddConnection WINELIB_NAME_AW(WNetAddConnection)
-DWORD WINAPI WNetAddConnection2A(LPNETRESOURCEA,LPCSTR,LPCSTR,DWORD);
-DWORD WINAPI WNetAddConnection2W(LPNETRESOURCEW,LPCWSTR,LPCWSTR,DWORD);
-#define      WNetAddConnection2 WINELIB_NAME_AW(WNetAddConnection2)
-DWORD WINAPI WNetAddConnection3A(HWND,LPNETRESOURCEA,LPCSTR,LPCSTR,DWORD);
-DWORD WINAPI WNetAddConnection3W(HWND,LPNETRESOURCEW,LPCWSTR,LPCWSTR,DWORD);
-#define      WNetAddConnection3 WINELIB_NAME_AW(WNetAddConnection3)
-DWORD WINAPI WNetCancelConnectionA(LPCSTR,BOOL);
-DWORD WINAPI WNetCancelConnectionW(LPCWSTR,BOOL);
-#define      WNetCancelConnection WINELIB_NAME_AW(WNetCancelConnection)
-DWORD WINAPI WNetCancelConnection2A(LPCSTR,DWORD,BOOL);
-DWORD WINAPI WNetCancelConnection2W(LPCWSTR,DWORD,BOOL);
-#define      WNetCancelConnection2 WINELIB_NAME_AW(WNetCancelConnection2)
-DWORD WINAPI WNetGetConnectionA(LPCSTR,LPSTR,LPDWORD);
-DWORD WINAPI WNetGetConnectionW(LPCWSTR,LPWSTR,LPDWORD);
-#define      WNetGetConnection WINELIB_NAME_AW(WNetGetConnection)
-DWORD WINAPI WNetUseConnectionA(HWND,LPNETRESOURCEA,LPCSTR,LPCSTR,DWORD,LPSTR,LPDWORD,LPDWORD);
-DWORD WINAPI WNetUseConnectionW(HWND,LPNETRESOURCEW,LPCWSTR,LPCWSTR,DWORD,LPWSTR,LPDWORD,LPDWORD);
-#define      WNetUseConnection WINELIB_NAME_AW(WNetUseConnection)
-DWORD WINAPI WNetSetConnectionA(LPCSTR,DWORD,LPVOID);
-DWORD WINAPI WNetSetConnectionW(LPCWSTR,DWORD,LPVOID);
-#define      WNetSetConnection WINELIB_NAME_AW(WNetSetConnection)
-
-/*
- *  Network connection dialogs
- */
-
-typedef struct {
-    DWORD cbStructure;       /* size of this structure in bytes */
-    HWND hwndOwner;          /* owner window for the dialog */
-    LPNETRESOURCEA lpConnRes;/* Requested Resource info    */
-    DWORD dwFlags;           /* flags (see below) */
-    DWORD dwDevNum;          /* number of devices connected to */
-} CONNECTDLGSTRUCTA, *LPCONNECTDLGSTRUCTA;
-typedef struct {
-    DWORD cbStructure;       /* size of this structure in bytes */
-    HWND hwndOwner;          /* owner window for the dialog */
-    LPNETRESOURCEW lpConnRes;/* Requested Resource info    */
-    DWORD dwFlags;           /* flags (see below) */
-    DWORD dwDevNum;          /* number of devices connected to */
-} CONNECTDLGSTRUCTW, *LPCONNECTDLGSTRUCTW;
-
-DECL_WINELIB_TYPE_AW(CONNECTDLGSTRUCT)
-DECL_WINELIB_TYPE_AW(LPCONNECTDLGSTRUCT)
-
-#define CONNDLG_RO_PATH     0x00000001 /* Resource path should be read-only    */
-#define CONNDLG_CONN_POINT  0x00000002 /* Netware -style movable connection point enabled */
-#define CONNDLG_USE_MRU     0x00000004 /* Use MRU combobox  */
-#define CONNDLG_HIDE_BOX    0x00000008 /* Hide persistent connect checkbox  */
-#define CONNDLG_PERSIST     0x00000010 /* Force persistent connection */
-#define CONNDLG_NOT_PERSIST 0x00000020 /* Force connection NOT persistent */
-
-typedef struct {
-    DWORD           cbStructure;      /* size of this structure in bytes */
-    HWND            hwndOwner;        /* owner window for the dialog */
-    LPSTR           lpLocalName;      /* local device name */
-    LPSTR           lpRemoteName;     /* network resource name */
-    DWORD           dwFlags;          /* flags */
-} DISCDLGSTRUCTA, *LPDISCDLGSTRUCTA;
-typedef struct {
-    DWORD           cbStructure;      /* size of this structure in bytes */
-    HWND            hwndOwner;        /* owner window for the dialog */
-    LPWSTR          lpLocalName;      /* local device name */
-    LPWSTR          lpRemoteName;     /* network resource name */
-    DWORD           dwFlags;          /* flags */
-} DISCDLGSTRUCTW, *LPDISCDLGSTRUCTW;
-
-DECL_WINELIB_TYPE_AW(DISCDLGSTRUCT)
-DECL_WINELIB_TYPE_AW(LPDISCDLGSTRUCT)
-
-#define DISC_UPDATE_PROFILE         0x00000001
-#define DISC_NO_FORCE               0x00000040
-
-DWORD WINAPI WNetConnectionDialog(HWND,DWORD);
-DWORD WINAPI WNetDisconnectDialog(HWND,DWORD);
-DWORD WINAPI WNetConnectionDialog1A(LPCONNECTDLGSTRUCTA);
-DWORD WINAPI WNetConnectionDialog1W(LPCONNECTDLGSTRUCTW);
-#define      WNetConnectionDialog1 WINELIB_NAME_AW(WNetConnectionDialog1)
-DWORD WINAPI WNetDisconnectDialog1A(LPDISCDLGSTRUCTA);
-DWORD WINAPI WNetDisconnectDialog1W(LPDISCDLGSTRUCTW);
-#define      WNetDisconnectDialog1 WINELIB_NAME_AW(WNetDisconnectDialog1)
-
-/*
- *  Network browsing
- */
-
-DWORD WINAPI WNetOpenEnumA(DWORD,DWORD,DWORD,LPNETRESOURCEA,LPHANDLE);
-DWORD WINAPI WNetOpenEnumW(DWORD,DWORD,DWORD,LPNETRESOURCEW,LPHANDLE);
-#define      WNetOpenEnum WINELIB_NAME_AW(WNetOpenEnum)
-DWORD WINAPI WNetEnumResourceA(HANDLE,LPDWORD,LPVOID,LPDWORD);
-DWORD WINAPI WNetEnumResourceW(HANDLE,LPDWORD,LPVOID,LPDWORD);
-#define      WNetEnumResource WINELIB_NAME_AW(WNetEnumResource)
-DWORD WINAPI WNetGetResourceInformationA(LPNETRESOURCEA,LPVOID,LPDWORD,LPSTR*);
-DWORD WINAPI WNetGetResourceInformationW(LPNETRESOURCEW,LPVOID,LPDWORD,LPWSTR*);
-#define      WNetGetResourceInformation WINELIB_NAME_AW(WNetGetResourceInformation)
-DWORD WINAPI WNetGetResourceParentA(LPNETRESOURCEA,LPVOID,LPDWORD);
-DWORD WINAPI WNetGetResourceParentW(LPNETRESOURCEW,LPVOID,LPDWORD);
-#define      WNetGetResourceParent WINELIB_NAME_AW(WNetGetResourceParent)
-DWORD WINAPI WNetCloseEnum(HANDLE);
-
-/*
- *  Universal naming
- */
-
-#define UNIVERSAL_NAME_INFO_LEVEL   0x00000001
-#define REMOTE_NAME_INFO_LEVEL      0x00000002
-
-typedef struct {
-    LPSTR    lpUniversalName;
-} UNIVERSAL_NAME_INFOA, *LPUNIVERSAL_NAME_INFOA;
-typedef struct {
-    LPWSTR   lpUniversalName;
-} UNIVERSAL_NAME_INFOW, *LPUNIVERSAL_NAME_INFOW;
-
-DECL_WINELIB_TYPE_AW(UNIVERSAL_NAME_INFO)
-DECL_WINELIB_TYPE_AW(LPUNIVERSAL_NAME_INFO)
-
-typedef struct {
-    LPSTR    lpUniversalName;
-    LPSTR    lpConnectionName;
-    LPSTR    lpRemainingPath;
-}REMOTE_NAME_INFOA, *LPREMOTE_NAME_INFOA;
-typedef struct {
-    LPWSTR   lpUniversalName;
-    LPWSTR   lpConnectionName;
-    LPWSTR   lpRemainingPath;
-}REMOTE_NAME_INFOW, *LPREMOTE_NAME_INFOW;
-
-DECL_WINELIB_TYPE_AW(REMOTE_NAME_INFO)
-DECL_WINELIB_TYPE_AW(LPREMOTE_NAME_INFO)
-
-DWORD WINAPI WNetGetUniversalNameA(LPCSTR,DWORD,LPVOID,LPDWORD);
-DWORD WINAPI WNetGetUniversalNameW(LPCWSTR,DWORD,LPVOID,LPDWORD);
-#define      WNetGetUniversalName WINELIB_NAME_AW(WNetGetUniversalName)
-
-/*
- *  Other
- */
-
-DWORD WINAPI WNetGetUserA(LPCSTR,LPSTR,LPDWORD);
-DWORD WINAPI WNetGetUserW(LPCWSTR,LPWSTR,LPDWORD);
-#define      WNetGetUser WINELIB_NAME_AW(WNetGetUser)
-
-#define WNFMT_MULTILINE         0x01
-#define WNFMT_ABBREVIATED       0x02
-#define WNFMT_INENUM            0x10
-#define WNFMT_CONNECTION        0x20
-
-DWORD WINAPI WNetGetProviderNameA(DWORD,LPSTR,LPDWORD);
-DWORD WINAPI WNetGetProviderNameW(DWORD,LPWSTR,LPDWORD);
-#define      WNetGetProviderName WINELIB_NAME_AW(WNetGetProviderName)
-
-typedef struct {
-    DWORD cbStructure;
-    DWORD dwProviderVersion;
-    DWORD dwStatus;
-    DWORD dwCharacteristics;
-    DWORD dwHandle;
-    WORD  wNetType;
-    DWORD dwPrinters;
-    DWORD dwDrives;
-} NETINFOSTRUCT, *LPNETINFOSTRUCT;
-
-#define NETINFO_DLL16       0x00000001
-#define NETINFO_DISKRED     0x00000004
-#define NETINFO_PRINTERRED  0x00000008
-
-DWORD WINAPI WNetGetNetworkInformationA(LPCSTR,LPNETINFOSTRUCT);
-DWORD WINAPI WNetGetNetworkInformationW(LPCWSTR,LPNETINFOSTRUCT);
-#define      WNetGetNetworkInformation WINELIB_NAME_AW(WNetGetNetworkInformation)
-
-
-/*
- *  Status codes
- */
-
-DWORD WINAPI WNetGetLastErrorA(LPDWORD,LPSTR,DWORD,LPSTR,DWORD);
-DWORD WINAPI WNetGetLastErrorW(LPDWORD,LPWSTR,DWORD,LPWSTR,DWORD);
-#define      WNetGetLastError WINELIB_NAME_AW(WNetGetLastError)
-
-#define WN_SUCCESS                      NO_ERROR
-#define WN_NO_ERROR                     NO_ERROR
-#define WN_NOT_SUPPORTED                ERROR_NOT_SUPPORTED
-#define WN_CANCEL                       ERROR_CANCELLED
-#define WN_RETRY                        ERROR_RETRY
-#define WN_NET_ERROR                    ERROR_UNEXP_NET_ERR
-#define WN_MORE_DATA                    ERROR_MORE_DATA
-#define WN_BAD_POINTER                  ERROR_INVALID_ADDRESS
-#define WN_BAD_VALUE                    ERROR_INVALID_PARAMETER
-#define WN_BAD_USER                     ERROR_BAD_USERNAME
-#define WN_BAD_PASSWORD                 ERROR_INVALID_PASSWORD
-#define WN_ACCESS_DENIED                ERROR_ACCESS_DENIED
-#define WN_FUNCTION_BUSY                ERROR_BUSY
-#define WN_WINDOWS_ERROR                ERROR_UNEXP_NET_ERR
-#define WN_OUT_OF_MEMORY                ERROR_NOT_ENOUGH_MEMORY
-#define WN_NO_NETWORK                   ERROR_NO_NETWORK
-#define WN_EXTENDED_ERROR               ERROR_EXTENDED_ERROR
-#define WN_BAD_LEVEL                    ERROR_INVALID_LEVEL
-#define WN_BAD_HANDLE                   ERROR_INVALID_HANDLE
-#define WN_NOT_INITIALIZING             ERROR_ALREADY_INITIALIZED
-#define WN_NO_MORE_DEVICES              ERROR_NO_MORE_DEVICES
-
-#define WN_NOT_CONNECTED                ERROR_NOT_CONNECTED
-#define WN_OPEN_FILES                   ERROR_OPEN_FILES
-#define WN_DEVICE_IN_USE                ERROR_DEVICE_IN_USE
-#define WN_BAD_NETNAME                  ERROR_BAD_NET_NAME
-#define WN_BAD_LOCALNAME                ERROR_BAD_DEVICE
-#define WN_ALREADY_CONNECTED            ERROR_ALREADY_ASSIGNED
-#define WN_DEVICE_ERROR                 ERROR_GEN_FAILURE
-#define WN_CONNECTION_CLOSED            ERROR_CONNECTION_UNAVAIL
-#define WN_NO_NET_OR_BAD_PATH           ERROR_NO_NET_OR_BAD_PATH
-#define WN_BAD_PROVIDER                 ERROR_BAD_PROVIDER
-#define WN_CANNOT_OPEN_PROFILE          ERROR_CANNOT_OPEN_PROFILE
-#define WN_BAD_PROFILE                  ERROR_BAD_PROFILE
-#define WN_BAD_DEV_TYPE                 ERROR_BAD_DEV_TYPE
-#define WN_DEVICE_ALREADY_REMEMBERED    ERROR_DEVICE_ALREADY_REMEMBERED
-
-#define WN_NO_MORE_ENTRIES              ERROR_NO_MORE_ITEMS
-#define WN_NOT_CONTAINER                ERROR_NOT_CONTAINER
-
-#define WN_NOT_AUTHENTICATED            ERROR_NOT_AUTHENTICATED
-#define WN_NOT_LOGGED_ON                ERROR_NOT_LOGGED_ON
-#define WN_NOT_VALIDATED                ERROR_NO_LOGON_SERVERS
-
-
-/*
- *  Multinet (for Shell)
- */
-
-typedef struct {
-	DWORD	cbStructure;
-	DWORD	dwFlags;
-	DWORD	dwSpeed;
-	DWORD	dwDelay;
-	DWORD	dwOptDataSize;
-} NETCONNECTINFOSTRUCT,*LPNETCONNECTINFOSTRUCT;
-
-#define WNCON_FORNETCARD        0x00000001
-#define WNCON_NOTROUTED         0x00000002
-#define WNCON_SLOWLINK          0x00000004
-#define WNCON_DYNAMIC           0x00000008
-
-DWORD WINAPI MultinetGetConnectionPerformanceA(LPNETRESOURCEA,LPNETCONNECTINFOSTRUCT);
-DWORD WINAPI MultinetGetConnectionPerformanceW(LPNETRESOURCEW,LPNETCONNECTINFOSTRUCT);
-#define      MultinetGetConnectionPerformance WINELIB_NAME_AW(MultinetGetConnectionPerformance)
-DWORD WINAPI MultinetGetErrorTextA(DWORD,DWORD,DWORD);
-DWORD WINAPI MultinetGetErrorTextW(DWORD,DWORD,DWORD);
-#define      MultinetGetErrorText WINELIB_NAME_AW(MultinetGetErrorText)
-
-/*
- * Password cache
- */
+#ifndef __WINE_WINNETWK_H
+#define __WINE_WINNETWK_H
 
 /* WNetEnumCachedPasswords */
 typedef struct tagPASSWORD_CACHE_ENTRY
@@ -392,8 +25,5 @@ typedef struct tagPASSWORD_CACHE_ENTRY
 
 typedef BOOL (CALLBACK *ENUMPASSWORDPROC)(PASSWORD_CACHE_ENTRY *, DWORD);
 UINT WINAPI WNetEnumCachedPasswords( LPSTR, WORD, BYTE, ENUMPASSWORDPROC, DWORD);
-DWORD WINAPI WNetGetCachedPassword( LPSTR, WORD, LPSTR, LPWORD, BYTE );
-DWORD WINAPI WNetCachePassword( LPSTR, WORD, LPSTR, WORD, BYTE, WORD );
 
-
-#endif /* _WINNETWK_H_ */
+#endif /* __WINE_WINNETWK_H */
diff --git a/reactos/lib/shell32/pidl.c b/reactos/lib/shell32/pidl.c
index 1ebdd76330f..3fd02d9a5b7 100644
--- a/reactos/lib/shell32/pidl.c
+++ b/reactos/lib/shell32/pidl.c
@@ -204,7 +204,7 @@ LPITEMIDLIST WINAPI ILFindLastID(LPCITEMIDLIST pidl)
  * NOTES
  *   when pidl=Desktop return=FALSE
  */
-BOOL WINAPI ILRemoveLastID(LPCITEMIDLIST pidl)
+BOOL WINAPI ILRemoveLastID(LPITEMIDLIST pidl)
 {
 	TRACE_(shell)("pidl=%p\n",pidl);
 
diff --git a/reactos/lib/shell32/shell32_main.c b/reactos/lib/shell32/shell32_main.c
index fa79faf559b..5de39d65eb2 100644
--- a/reactos/lib/shell32/shell32_main.c
+++ b/reactos/lib/shell32/shell32_main.c
@@ -706,7 +706,7 @@ DWORD WINAPI SHHelpShortcuts_RunDLL (DWORD dwArg1, DWORD dwArg2, DWORD dwArg3, D
  * the shell process and release it immediately
  */
 
-DWORD WINAPI SHLoadInProc (REFCLSID rclsid)
+HRESULT WINAPI SHLoadInProc (REFCLSID rclsid)
 {
     void *ptr = NULL;
 
diff --git a/reactos/lib/shell32/shellole.c b/reactos/lib/shell32/shellole.c
index cc4f7067cfc..e53f21f21b2 100644
--- a/reactos/lib/shell32/shellole.c
+++ b/reactos/lib/shell32/shellole.c
@@ -495,7 +495,7 @@ void WINAPI SHFree(LPVOID pv)
 /*************************************************************************
  * SHGetDesktopFolder			[SHELL32.@]
  */
-DWORD WINAPI SHGetDesktopFolder(IShellFolder **psf)
+HRESULT WINAPI SHGetDesktopFolder(IShellFolder **psf)
 {
 	HRESULT	hres = S_OK;
 	TRACE("\n");
diff --git a/reactos/lib/shell32/shellord.c b/reactos/lib/shell32/shellord.c
index 894de4dcf01..d6521fa4b75 100644
--- a/reactos/lib/shell32/shellord.c
+++ b/reactos/lib/shell32/shellord.c
@@ -612,9 +612,8 @@ static INT SHADD_create_add_mru_data(HANDLE mruhandle, LPSTR doc_name, LPSTR new
  * NOTES
  *     exported by name
  *
- * FIXME: ?? MSDN shows this as a VOID
  */
-DWORD WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv)
+void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv)
 {
 /* If list is a string list lpfnCompare has the following prototype
  * int CALLBACK MRUCompareString(LPCSTR s1, LPCSTR s2)
@@ -653,20 +652,20 @@ DWORD WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv)
     ret=SHADD_get_policy( "NoRecentDocsHistory", &type, &data, &datalen);
     if ((ret > 0) && (ret != ERROR_FILE_NOT_FOUND)) {
 	ERR("Error %d getting policy \"NoRecentDocsHistory\"\n", ret);
-	return 0;
+	return;
     }
     if (ret == ERROR_SUCCESS) {
 	if (!( (type == REG_DWORD) ||
 	       ((type == REG_BINARY) && (datalen == 4)) )) {
 	    ERR("Error policy data for \"NoRecentDocsHistory\" not formated correctly, type=%ld, len=%ld\n",
 		type, datalen);
-	    return 0;
+	    return;
 	}
 
 	TRACE("policy value for NoRecentDocsHistory = %08lx\n", data[0]);
 	/* now test the actual policy value */
 	if ( data[0] != 0)
-	    return 0;
+	    return;
     }
 
     /* Open key to where the necessary info is
@@ -679,7 +678,7 @@ DWORD WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv)
 			"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer",
 			0, 0, 0, KEY_READ, 0, &HCUbasekey, 0)) {
 	ERR("Failed to create 'Software\\Microsoft\\Windows\\CurrentVersion\\Explorer'\n");
-	return 0;
+	return;
     }
 
     /* Get path to user's "Recent" directory
@@ -729,7 +728,7 @@ DWORD WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv)
 	 */
 	RegDeleteKeyA(HCUbasekey, "RecentDocs");
 	RegCloseKey(HCUbasekey);
-	return 0;
+	return;
     }
 
     /* Have data to add, the jobs to be done:
@@ -785,7 +784,7 @@ DWORD WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv)
 	    /* MRU failed */
 	    ERR("MRU processing failed, handle zero\n");
 	    RegCloseKey(HCUbasekey);
-	    return 0;
+	    return;
 	}
 	len = lstrlenA(doc_name);
 	pos = FindMRUData(mruhandle, doc_name, len, 0);
@@ -934,7 +933,7 @@ DWORD WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv)
 
     /* all done */
     RegCloseKey(HCUbasekey);
-    return 0;
+    return;
 }
 
 /*************************************************************************
diff --git a/reactos/lib/shell32/shlfileop.c b/reactos/lib/shell32/shlfileop.c
index 21956669373..bae85725e06 100644
--- a/reactos/lib/shell32/shlfileop.c
+++ b/reactos/lib/shell32/shlfileop.c
@@ -545,7 +545,7 @@ DWORD WINAPI SHCreateDirectory(HWND hWnd, LPCVOID path)
  *  ERROR_ALREADY_EXISTS when the directory already exists
  *  ERROR_FILENAME_EXCED_RANGE if the filename was to long to process
  */
-DWORD WINAPI SHCreateDirectoryExA(HWND hWnd, LPCSTR path, LPSECURITY_ATTRIBUTES sec)
+int WINAPI SHCreateDirectoryExA(HWND hWnd, LPCSTR path, LPSECURITY_ATTRIBUTES sec)
 {
 	WCHAR wPath[MAX_PATH];
 	TRACE("(%p, %s, %p)\n",hWnd, debugstr_a(path), sec);
@@ -557,9 +557,9 @@ DWORD WINAPI SHCreateDirectoryExA(HWND hWnd, LPCSTR path, LPSECURITY_ATTRIBUTES
 /*************************************************************************
  * SHCreateDirectoryExW      [SHELL32.@]
  */
-DWORD WINAPI SHCreateDirectoryExW(HWND hWnd, LPCWSTR path, LPSECURITY_ATTRIBUTES sec)
+int WINAPI SHCreateDirectoryExW(HWND hWnd, LPCWSTR path, LPSECURITY_ATTRIBUTES sec)
 {
-	DWORD ret = ERROR_BAD_PATHNAME;
+	int ret = ERROR_BAD_PATHNAME;
 	TRACE("(%p, %s, %p)\n",hWnd, debugstr_w(path), sec);
 
 	if (PathIsRelativeW(path))
diff --git a/reactos/w32api/include/shlguid.h b/reactos/w32api/include/shlguid.h
index 5bbc7af414e..ff1dfa01551 100644
--- a/reactos/w32api/include/shlguid.h
+++ b/reactos/w32api/include/shlguid.h
@@ -9,8 +9,14 @@ extern "C" {
 #endif
 #define DEFINE_SHLGUID(n,l,w1,w2) DEFINE_GUID(n,l,w1,w2,0xC0,0,0,0,0,0,0,0x46)
 #define SID_SShellBrowser IID_IShellBrowser
+extern const GUID CLSID_MyComputer;
 extern const GUID CLSID_ShellDesktop;
 extern const GUID CLSID_ShellLink;
+extern const GUID CLSID_ControlPanel;
+extern const GUID CLSID_Internet;
+extern const GUID CLSID_NetworkPlaces;
+extern const GUID CLSID_RecycleBin;
+extern const GUID CLSID_ShellFSFolder;
 extern const GUID FMTID_Intshcut;
 extern const GUID FMTID_InternetSite;
 extern const GUID CGID_Explorer;
diff --git a/reactos/w32api/include/shlobj.h b/reactos/w32api/include/shlobj.h
index 52a1e4fcf4c..761d35286dd 100644
--- a/reactos/w32api/include/shlobj.h
+++ b/reactos/w32api/include/shlobj.h
@@ -332,6 +332,50 @@ extern "C" {
 #define SVGIO_ALLVIEW	2
 #define SV2GV_CURRENTVIEW ((UINT)-1)
 #define SV2GV_DEFAULTVIEW ((UINT)-2)
+#define SHCNE_RENAMEITEM	0x00000001
+#define SHCNE_CREATE		0x00000002
+#define SHCNE_DELETE		0x00000004
+#define SHCNE_MKDIR		0x00000008
+#define SHCNE_RMDIR		0x00000010
+#define SHCNE_MEDIAINSERTED	0x00000020
+#define SHCNE_MEDIAREMOVED	0x00000040
+#define SHCNE_DRIVEREMOVED	0x00000080
+#define SHCNE_DRIVEADD		0x00000100
+#define SHCNE_NETSHARE		0x00000200
+#define SHCNE_NETUNSHARE	0x00000400
+#define SHCNE_ATTRIBUTES	0x00000800
+#define SHCNE_UPDATEDIR		0x00001000
+#define SHCNE_UPDATEITEM	0x00002000
+#define SHCNE_SERVERDISCONNECT	0x00004000
+#define SHCNE_UPDATEIMAGE	0x00008000
+#define SHCNE_DRIVEADDGUI	0x00010000
+#define SHCNE_RENAMEFOLDER	0x00020000
+#define SHCNE_FREESPACE		0x00040000
+#define SHCNE_EXTENDED_EVENT	0x04000000
+#define SHCNE_ASSOCCHANGED	0x08000000
+#define SHCNE_DISKEVENTS	0x0002381F
+#define SHCNE_GLOBALEVENTS	0x0C0581E0
+#define SHCNE_ALLEVENTS		0x7FFFFFFF
+#define SHCNE_INTERRUPT		0x80000000
+#define SHCNEE_ORDERCHANGED	0x0002L
+#define SHCNEE_MSI_CHANGE	0x0004L
+#define SHCNEE_MSI_UNINSTALL	0x0005L
+#define SHCNF_IDLIST		0x0000
+#define SHCNF_PATHA		0x0001
+#define SHCNF_PRINTERA		0x0002
+#define SHCNF_DWORD		0x0003
+#define SHCNF_PATHW		0x0005
+#define SHCNF_PRINTERW		0x0006
+#define SHCNF_TYPE		0x00FF
+#define SHCNF_FLUSH		0x1000
+#define SHCNF_FLUSHNOWAIT	0x2000
+#ifdef UNICODE
+#define SHCNF_PATH              SHCNF_PATHW
+#define SHCNF_PRINTER           SHCNF_PRINTERW
+#else
+#define SHCNF_PATH              SHCNF_PATHA
+#define SHCNF_PRINTER           SHCNF_PRINTERA
+#endif
 
 typedef ULONG SFGAOF;
 typedef DWORD SHGDNF;
@@ -516,6 +560,205 @@ typedef struct
 	int csidl;
 } PERSIST_FOLDER_TARGET_INFO;
 #endif
+typedef struct _SHChangeNotifyEntry
+{
+    LPCITEMIDLIST pidl;
+    BOOL   fRecursive;
+} SHChangeNotifyEntry;
+#define NUM_POINTS 3
+typedef struct
+{
+    int   iNextSample;
+    DWORD dwLastScroll;
+    BOOL  bFull;
+    POINT pts[NUM_POINTS];
+    DWORD dwTimes[NUM_POINTS];
+} AUTO_SCROLL_DATA;
+typedef struct
+{
+    WORD cLength;
+    WORD nVersion;
+    BOOL fFullPathTitle:1;
+    BOOL fSaveLocalView:1;
+    BOOL fNotShell:1;
+    BOOL fSimpleDefault:1;
+    BOOL fDontShowDescBar:1;
+    BOOL fNewWindowMode:1;
+    BOOL fShowCompColor:1;
+    BOOL fDontPrettyNames:1;
+    BOOL fAdminsCreateCommonGroups:1;
+    UINT fUnusedFlags:7;
+    UINT fMenuEnumFilter;
+} CABINETSTATE, *LPCABINETSTATE;
+typedef enum RESTRICTIONS
+{
+	REST_NONE			= 0x00000000,
+	REST_NORUN			= 0x00000001,
+	REST_NOCLOSE			= 0x00000002,
+	REST_NOSAVESET			= 0x00000004,
+	REST_NOFILEMENU			= 0x00000008,
+	REST_NOSETFOLDERS		= 0x00000010,
+	REST_NOSETTASKBAR		= 0x00000020,
+	REST_NODESKTOP			= 0x00000040,
+	REST_NOFIND			= 0x00000080,
+	REST_NODRIVES			= 0x00000100,
+	REST_NODRIVEAUTORUN		= 0x00000200,
+	REST_NODRIVETYPEAUTORUN		= 0x00000400,
+	REST_NONETHOOD			= 0x00000800,
+	REST_STARTBANNER		= 0x00001000,
+	REST_RESTRICTRUN		= 0x00002000,
+	REST_NOPRINTERTABS		= 0x00004000,
+	REST_NOPRINTERDELETE		= 0x00008000,
+	REST_NOPRINTERADD		= 0x00010000,
+	REST_NOSTARTMENUSUBFOLDERS	= 0x00020000,
+	REST_MYDOCSONNET		= 0x00040000,
+	REST_NOEXITTODOS		= 0x00080000,
+	REST_ENFORCESHELLEXTSECURITY	= 0x00100000,
+	REST_LINKRESOLVEIGNORELINKINFO	= 0x00200000,
+	REST_NOCOMMONGROUPS		= 0x00400000,
+	REST_SEPARATEDESKTOPPROCESS	= 0x00800000,
+	REST_NOWEB			= 0x01000000,
+	REST_NOTRAYCONTEXTMENU		= 0x02000000,
+	REST_NOVIEWCONTEXTMENU		= 0x04000000,
+	REST_NONETCONNECTDISCONNECT	= 0x08000000,
+	REST_STARTMENULOGOFF		= 0x10000000,
+	REST_NOSETTINGSASSIST		= 0x20000000,
+	REST_NOINTERNETICON		= 0x40000001,
+	REST_NORECENTDOCSHISTORY,
+	REST_NORECENTDOCSMENU,
+	REST_NOACTIVEDESKTOP,
+	REST_NOACTIVEDESKTOPCHANGES,
+	REST_NOFAVORITESMENU,
+	REST_CLEARRECENTDOCSONEXIT,
+	REST_CLASSICSHELL,
+	REST_NOCUSTOMIZEWEBVIEW,
+
+	REST_NOHTMLWALLPAPER		= 0x40000010,
+	REST_NOCHANGINGWALLPAPER,
+	REST_NODESKCOMP,
+	REST_NOADDDESKCOMP,
+	REST_NODELDESKCOMP,
+	REST_NOCLOSEDESKCOMP,
+	REST_NOCLOSE_DRAGDROPBAND,
+	REST_NOMOVINGBAND,
+	REST_NOEDITDESKCOMP,
+	REST_NORESOLVESEARCH,
+	REST_NORESOLVETRACK,
+	REST_FORCECOPYACLWITHFILE,
+	REST_NOLOGO3CHANNELNOTIFY,
+	REST_NOFORGETSOFTWAREUPDATE,
+	REST_NOSETACTIVEDESKTOP,
+	REST_NOUPDATEWINDOWS,
+	REST_NOCHANGESTARMENU,		/* 0x40000020 */
+	REST_NOFOLDEROPTIONS,
+	REST_HASFINDCOMPUTERS,
+	REST_INTELLIMENUS,
+	REST_RUNDLGMEMCHECKBOX,
+	REST_ARP_ShowPostSetup,
+	REST_NOCSC,
+	REST_NOCONTROLPANEL,
+	REST_ENUMWORKGROUP,
+	REST_ARP_NOARP,
+	REST_ARP_NOREMOVEPAGE,
+	REST_ARP_NOADDPAGE,
+	REST_ARP_NOWINSETUPPAGE,
+	REST_GREYMSIADS,
+	REST_NOCHANGEMAPPEDDRIVELABEL,
+	REST_NOCHANGEMAPPEDDRIVECOMMENT,
+	REST_MaxRecentDocs,		/* 0x40000030 */
+	REST_NONETWORKCONNECTIONS,
+	REST_FORCESTARTMENULOGOFF,
+	REST_NOWEBVIEW,
+	REST_NOCUSTOMIZETHISFOLDER,
+	REST_NOENCRYPTION,
+
+	REST_ALLOWFRENCHENCRYPTION,	/* not documented */
+
+	REST_DONTSHOWSUPERHIDDEN,
+	REST_NOSHELLSEARCHBUTTON,
+	REST_NOHARDWARETAB,
+	REST_NORUNASINSTALLPROMPT,
+	REST_PROMPTRUNASINSTALLNETPATH,
+	REST_NOMANAGEMYCOMPUTERVERB,
+	REST_NORECENTDOCSNETHOOD,
+	REST_DISALLOWRUN,
+	REST_NOWELCOMESCREEN,
+	REST_RESTRICTCPL,		/* 0x40000040 */
+	REST_DISALLOWCPL,
+	REST_NOSMBALLOONTIP,
+	REST_NOSMHELP,
+	REST_NOWINKEYS,
+	REST_NOENCRYPTONMOVE,
+	REST_NOLOCALMACHINERUN,
+	REST_NOCURRENTUSERRUN,
+	REST_NOLOCALMACHINERUNONCE,
+	REST_NOCURRENTUSERRUNONCE,
+	REST_FORCEACTIVEDESKTOPON,
+	REST_NOCOMPUTERSNEARME,
+	REST_NOVIEWONDRIVE,
+	REST_NONETCRAWL,
+	REST_NOSHAREDDOCUMENTS,
+	REST_NOSMMYDOCS,
+	REST_NOSMMYPICS,		/* 0x40000050 */
+	REST_ALLOWBITBUCKDRIVES,
+	REST_NONLEGACYSHELLMODE,
+	REST_NOCONTROLPANELBARRICADE,
+	REST_NOSTARTPAGE,
+	REST_NOAUTOTRAYNOTIFY,
+	REST_NOTASKGROUPING,
+	REST_NOCDBURNING,
+	REST_MYCOMPNOPROP,
+	REST_MYDOCSNOPROP,
+	REST_NOSTARTPANEL,
+	REST_NODISPLAYAPPEARANCEPAGE,
+	REST_NOTHEMESTAB,
+	REST_NOVISUALSTYLECHOICE,
+	REST_NOSIZECHOICE,
+	REST_NOCOLORCHOICE,
+	REST_SETVISUALSTYLE,		/* 0x40000060 */
+	REST_STARTRUNNOHOMEPATH,
+	REST_NOUSERNAMEINSTARTPANEL,
+	REST_NOMYCOMPUTERICON,
+	REST_NOSMNETWORKPLACES,
+	REST_NOSMPINNEDLIST,
+	REST_NOSMMYMUSIC,
+	REST_NOSMEJECTPC,
+	REST_NOSMMOREPROGRAMS,
+	REST_NOSMMFUPROGRAMS,
+	REST_NOTRAYITEMSDISPLAY,
+	REST_NOTOOLBARSONTASKBAR,
+	/* 0x4000006C
+	   0x4000006D
+	   0x4000006E */
+	REST_NOSMCONFIGUREPROGRAMS	= 0x4000006F,
+	REST_HIDECLOCK,			/* 0x40000070 */
+	REST_NOLOWDISKSPACECHECKS,
+	REST_NOENTIRENETWORK,
+	REST_NODESKTOPCLEANUP,
+	REST_BITBUCKNUKEONDELETE,
+	REST_BITBUCKCONFIRMDELETE,
+	REST_BITBUCKNOPROP,
+	REST_NODISPBACKGROUND,
+	REST_NODISPSCREENSAVEPG,
+	REST_NODISPSETTINGSPG,
+	REST_NODISPSCREENSAVEPREVIEW,
+	REST_NODISPLAYCPL,
+	REST_HIDERUNASVERB,
+	REST_NOTHUMBNAILCACHE,
+	REST_NOSTRCMPLOGICAL,
+	REST_NOPUBLISHWIZARD,
+	REST_NOONLINEPRINTSWIZARD,	/* 0x40000080 */
+	REST_NOWEBSERVICES,
+	REST_ALLOWUNHASHEDWEBVIEW,
+	REST_ALLOWLEGACYWEBVIEW,
+	REST_REVERTWEBVIEWSECURITY,
+	
+	REST_INHERITCONSOLEHANDLES	= 0x40000086,
+
+	REST_NODISCONNECT		= 0x41000001,
+	REST_NOSECURITY,
+	REST_NOFILEASSOCIATE,		/* 0x41000003 */
+} RESTRICTIONS;
 
 DECLARE_ENUMERATOR_(IEnumIDList,LPITEMIDLIST);
 typedef IEnumIDList *LPENUMIDLIST;
@@ -848,7 +1091,7 @@ typedef IShellFolder *LPSHELLFOLDER;
 #define IShellFolder_BindToObject(T,a,b,c,d) (T)->lpVtbl->BindToObject(T,a,b,c,d)
 #define IShellFolder_BindToStorage(T,a,b,c,d) (T)->lpVtbl->BindToStorage(T,a,b,c,d)
 #define IShellFolder_CompareIDs(T,a,b,c) (T)->lpVtbl->CompareIDs(T,a,b,c)
-#define IShellFolder_CreateViewObject(T,a,b) (T)->lpVtbl->CreateViewObject(T,a,b)
+#define IShellFolder_CreateViewObject(T,a,b,c) (T)->lpVtbl->CreateViewObject(T,a,b,c)
 #define IShellFolder_GetAttributesOf(T,a,b,c) (T)->lpVtbl->GetAttributesOf(T,a,b,c)
 #define IShellFolder_GetUIObjectOf(T,a,b,c,d,e,f) (T)->lpVtbl->GetUIObjectOf(T,a,b,c,d,e,f)
 #define IShellFolder_GetDisplayNameOf(T,a,b,c) (T)->lpVtbl->GetDisplayNameOf(T,a,b,c)
@@ -1394,6 +1637,12 @@ void WINAPI ILFree(LPITEMIDLIST);
 HRESULT WINAPI SHCoCreateInstance(LPCWSTR,REFCLSID,IUnknown*,REFIID,void**);
 #endif
 
+int WINAPI RestartDialog(HWND,LPCWSTR,UINT);
+int WINAPI RestartDialogEx(HWND,LPCWSTR,UINT,UINT);
+
+ULONG WINAPI SHChangeNotifyRegister(HWND,int,LONG,UINT,int,SHChangeNotifyEntry *);
+BOOL WINAPI SHChangeNotifyDeregister(ULONG);
+
 #ifdef UNICODE
 typedef IShellExecuteHookW IShellExecuteHook;
 typedef IShellLinkW IShellLink;
diff --git a/reactos/w32api/include/winnetwk.h b/reactos/w32api/include/winnetwk.h
index 0e734462587..44ca5c1823c 100644
--- a/reactos/w32api/include/winnetwk.h
+++ b/reactos/w32api/include/winnetwk.h
@@ -277,7 +277,7 @@ DWORD APIENTRY WNetGetProviderNameW(DWORD,LPWSTR,PDWORD);
 DWORD APIENTRY WNetGetNetworkInformationA(LPCSTR,LPNETINFOSTRUCT);
 DWORD APIENTRY WNetGetNetworkInformationW(LPCWSTR,LPNETINFOSTRUCT);
 DWORD APIENTRY WNetGetResourceInformationA(LPNETRESOURCEA,LPVOID,LPDWORD,LPSTR*);
-DWORD APIENTRY WNetGetResourceInformationW(LPNETRESOURCEA,LPVOID,LPDWORD,LPWSTR*);
+DWORD APIENTRY WNetGetResourceInformationW(LPNETRESOURCEW,LPVOID,LPDWORD,LPWSTR*);
 DWORD APIENTRY WNetGetLastErrorA(PDWORD,LPSTR,DWORD,LPSTR,DWORD);
 DWORD APIENTRY WNetGetLastErrorW(PDWORD,LPWSTR,DWORD,LPWSTR,DWORD);
 DWORD APIENTRY MultinetGetConnectionPerformanceA(LPNETRESOURCEA,LPNETCONNECTINFOSTRUCT);

From 80df3c01b832dd7d8b1ccbfad31694b8f09ad876 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Tue, 29 Jun 2004 13:47:27 +0000
Subject: [PATCH 129/356] Minimize Wine porting headers

svn path=/trunk/; revision=9928
---
 reactos/lib/shell32/shell32_main.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/reactos/lib/shell32/shell32_main.h b/reactos/lib/shell32/shell32_main.h
index eb399e45628..934af5855d3 100644
--- a/reactos/lib/shell32/shell32_main.h
+++ b/reactos/lib/shell32/shell32_main.h
@@ -236,9 +236,6 @@ BOOL WINAPI ShellExecuteExW32(LPSHELLEXECUTEINFOW psei, SHELL_ExecuteW32 execfun
 UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOperation,
                           LPWSTR lpResult, int resultLen, LPWSTR key, void **env, LPITEMIDLIST pidl, LPCWSTR args);
 
-int WINAPI RestartDialog(HWND hwndOwner, LPCSTR lpstrReason, UINT uFlags);
-int WINAPI RestartDialogEx(HWND hwndOwner, LPCWSTR lpwstrReason, UINT uFlags, UINT uReason);
-
 extern WCHAR swShell32Name[MAX_PATH];
 
 #endif

From 4e347550d48d94f14fe7550f2bdb93c24004005c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Tue, 29 Jun 2004 13:51:59 +0000
Subject: [PATCH 130/356] Fix RestartDialog() prototype

svn path=/trunk/; revision=9929
---
 reactos/lib/shell32/dialogs.c | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/reactos/lib/shell32/dialogs.c b/reactos/lib/shell32/dialogs.c
index 11a70f9b9f3..bd19cd458d5 100644
--- a/reactos/lib/shell32/dialogs.c
+++ b/reactos/lib/shell32/dialogs.c
@@ -379,7 +379,7 @@ void FillList (HWND hCb, char *pszLatest)
 
 
 /*************************************************************************
- * RestartWindowsDialog				[SHELL32.730]
+ * RestartDialogEx				[SHELL32.730]
  */
 
 int WINAPI RestartDialogEx(HWND hwndOwner, LPCWSTR lpwstrReason, UINT uFlags, UINT uReason)
@@ -410,27 +410,12 @@ int WINAPI RestartDialogEx(HWND hwndOwner, LPCWSTR lpwstrReason, UINT uFlags, UI
 
 
 /*************************************************************************
- * RestartWindowsDialog				[SHELL32.59]
+ * RestartDialog				[SHELL32.59]
  */
 
-int WINAPI RestartDialog(HWND hwndOwner, LPCSTR lpstrReason, UINT uFlags)
+int WINAPI RestartDialog(HWND hwndOwner, LPCWSTR lpstrReason, UINT uFlags)
 {
-    LPWSTR lpwcsReason;
-    int len, ret;
-
-    if (lpstrReason) {
-	len = MultiByteToWideChar(CP_ACP, 0, lpstrReason, -1, NULL, 0);
-	lpwcsReason = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
-	MultiByteToWideChar(CP_ACP, 0, lpstrReason, -1, lpwcsReason, len);
-    } else
-	lpwcsReason = NULL;
-
-    ret = RestartDialogEx(hwndOwner, lpwcsReason, uFlags, 0);
-
-    if (lpwcsReason)
-	HeapFree(GetProcessHeap(), 0, lpwcsReason);
-
-    return ret;
+    return RestartDialogEx(hwndOwner, lpstrReason, uFlags, 0);
 }
 
 

From 653e60385efb73e4b3f8d498885b655ae435173e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Tue, 29 Jun 2004 14:08:58 +0000
Subject: [PATCH 131/356] Fix IFileSystemBindData method order

svn path=/trunk/; revision=9930
---
 reactos/lib/shell32/shlfsbind.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reactos/lib/shell32/shlfsbind.c b/reactos/lib/shell32/shlfsbind.c
index 73344ae1ebf..75ea638f5d5 100644
--- a/reactos/lib/shell32/shlfsbind.c
+++ b/reactos/lib/shell32/shlfsbind.c
@@ -58,8 +58,8 @@ static struct ICOM_VTABLE(IFileSystemBindData) sbvt =
     IFileSystemBindData_fnQueryInterface,
     IFileSystemBindData_fnAddRef,
     IFileSystemBindData_fnRelease,
-    IFileSystemBindData_fnGetFindData,
     IFileSystemBindData_fnSetFindData,
+    IFileSystemBindData_fnGetFindData,
 };
 
 static WCHAR wFileSystemBindData[] = {'F','i','l','e',' ','S','y','s','t','e','m',' ','B','i','n','d','D','a','t','a',0};

From 91da5e1abe9808ac067863fc134963a1ba402277 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Tue, 29 Jun 2004 17:40:01 +0000
Subject: [PATCH 132/356] Add substitutions for 'MS Shell Dlg' and 'MS Shell
 Dlg 2' fonts.

svn path=/trunk/; revision=9931
---
 reactos/bootdata/hivesft.inf | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/reactos/bootdata/hivesft.inf b/reactos/bootdata/hivesft.inf
index 45877bbccb1..3814479b776 100644
--- a/reactos/bootdata/hivesft.inf
+++ b/reactos/bootdata/hivesft.inf
@@ -3,11 +3,6 @@ Signature="$ReactOS$
 
 [AddReg]
 
-; Version Information
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CurrentVersion",0x00020000,"4.0"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CSDVersion",0x00020000,"Service Pack 6"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CurrentBuildNumber",0x00020000,"1381"
-
 ; Common shell folder settings
 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders","Desktop",0x00020000,"%ALLUSERSPROFILE%\Desktop"
 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders","Common AppData",0x00020000,"%ALLUSERSPROFILE%\Application Data"
@@ -24,6 +19,11 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders","Common
 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders","Common Templates",0x00020000,"%ALLUSERSPROFILE%\Templates"
 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders","Personal",0x00020000,"%ALLUSERSPROFILE%\My Documents"
 
+; Version Information
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CurrentVersion",0x00020000,"4.0"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CSDVersion",0x00020000,"Service Pack 6"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CurrentBuildNumber",0x00020000,"1381"
+
 ; Image File Execution Options (NtGlobalFlag with FLG_SHOW_LDR_SNAPS set for loadlib.exe) 
 HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\loadlib.exe","GlobalFlag",0x00000000,"0x00000002"
 ;HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\loaddll.exe","GlobalFlag",0x00000000,"0x00000002"
@@ -49,5 +49,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Courier
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Marlett",0x00000000,"TGMarlett"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Times New Roman",0x00000000,"Bitstream Vera Serif"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Sans Serif",0x00000000,"Bitstream Vera Sans"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg",0x00000000,"Bitstream Vera Sans"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg 2",0x00000000,"Bitstream Vera Sans"
 
 ; EOF

From ecd1ebfec82a194465ab506b4e9d21e3fac6074d Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Tue, 29 Jun 2004 18:12:27 +0000
Subject: [PATCH 133/356] - Match the first 16 colors of the Windows (R) XP
 default palette.

svn path=/trunk/; revision=9932
---
 reactos/drivers/video/displays/framebuf/palette.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reactos/drivers/video/displays/framebuf/palette.c b/reactos/drivers/video/displays/framebuf/palette.c
index 7e6272e92ba..87ab37285ae 100644
--- a/reactos/drivers/video/displays/framebuf/palette.c
+++ b/reactos/drivers/video/displays/framebuf/palette.c
@@ -36,9 +36,9 @@ const PALETTEENTRY BASEPALETTE[20] =
    { 0x00, 0x80, 0x80, 0x00 },
    { 0xC0, 0xC0, 0xC0, 0x00 },
    { 0xC0, 0xDC, 0xC0, 0x00 },
-   { 0xA6, 0xCA, 0xF0, 0x00 },
+   { 0xD4, 0xD0, 0xC8, 0x00 },
    { 0xFF, 0xFB, 0xF0, 0x00 },
-   { 0xA0, 0xA0, 0xA4, 0x00 },
+   { 0x3A, 0x6E, 0xA5, 0x00 },
    { 0x80, 0x80, 0x80, 0x00 },
    { 0xFF, 0x00, 0x00, 0x00 },
    { 0x00, 0xFF, 0x00, 0x00 },

From b43bcf2cc14309660ecbb517693a47164ed11868 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Tue, 29 Jun 2004 18:12:28 +0000
Subject: [PATCH 134/356] - Report 1 (Default) instead of 0 (Invalid) as the
 refresh frequency value.

svn path=/trunk/; revision=9933
---
 reactos/drivers/video/miniport/vbe/vbemp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reactos/drivers/video/miniport/vbe/vbemp.c b/reactos/drivers/video/miniport/vbe/vbemp.c
index 6992ce6df96..cd2a21917ac 100644
--- a/reactos/drivers/video/miniport/vbe/vbemp.c
+++ b/reactos/drivers/video/miniport/vbe/vbemp.c
@@ -819,7 +819,7 @@ VBEQueryMode(
    VideoMode->ScreenStride = VBEMode->BytesPerScanLine;
    VideoMode->NumberOfPlanes = VBEMode->NumberOfPlanes;
    VideoMode->BitsPerPlane = VBEMode->BitsPerPixel / VBEMode->NumberOfPlanes;
-   VideoMode->Frequency = 0; /* FIXME */
+   VideoMode->Frequency = 1;
    VideoMode->XMillimeter = 0; /* FIXME */
    VideoMode->YMillimeter = 0; /* FIXME */
    if (VBEMode->BitsPerPixel > 8)

From 0ad9fa72f8ba66437b9e556477484d71ef0e6c66 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Tue, 29 Jun 2004 18:12:30 +0000
Subject: [PATCH 135/356] - Fixed list mode traversing.

svn path=/trunk/; revision=9934
---
 reactos/drivers/video/displays/framebuf/screen.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/reactos/drivers/video/displays/framebuf/screen.c b/reactos/drivers/video/displays/framebuf/screen.c
index 95abedddda3..b760cafac23 100644
--- a/reactos/drivers/video/displays/framebuf/screen.c
+++ b/reactos/drivers/video/displays/framebuf/screen.c
@@ -162,6 +162,7 @@ IntInitScreenInfo(
          {
             continue;
          }
+
          if (pDevMode->dmPelsWidth == ModeInfoPtr->VisScreenWidth &&
              pDevMode->dmPelsHeight == ModeInfoPtr->VisScreenHeight &&
              pDevMode->dmBitsPerPel == (ModeInfoPtr->BitsPerPlane *
@@ -171,6 +172,8 @@ IntInitScreenInfo(
             SelectedMode = ModeInfoPtr;
             break;
          }
+
+         ModeInfoPtr++;
       }
    }
 

From 70e1b16c270a590d8f4cfd0197ac7e89d62cfc81 Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Tue, 29 Jun 2004 19:20:16 +0000
Subject: [PATCH 136/356] fixed makefiles

svn path=/trunk/; revision=9935
---
 reactos/drivers/dd/Makefile      | 2 +-
 reactos/drivers/storage/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/reactos/drivers/dd/Makefile b/reactos/drivers/dd/Makefile
index 3c842adfa26..9859d89a6d9 100644
--- a/reactos/drivers/dd/Makefile
+++ b/reactos/drivers/dd/Makefile
@@ -6,7 +6,7 @@ PATH_TO_TOP = ../..
 
 include $(PATH_TO_TOP)/rules.mak
 
-DRIVERS = beep blue bootvid debugout floppy ide null serial 
+DRIVERS = beep blue bootvid debugout null serial 
 
 all: $(DRIVERS)
 
diff --git a/reactos/drivers/storage/Makefile b/reactos/drivers/storage/Makefile
index 11018f5ed4d..c7bb0fde85c 100644
--- a/reactos/drivers/storage/Makefile
+++ b/reactos/drivers/storage/Makefile
@@ -6,7 +6,7 @@ PATH_TO_TOP = ../..
 
 include $(PATH_TO_TOP)/rules.mak
 
-DRIVERS = atapi cdrom class2 disk diskdump scsiport
+DRIVERS = atapi cdrom class2 disk diskdump floppy scsiport
 
 all: $(DRIVERS)
 

From c891ec007e73ad12ef85aa61e72ddb98505f269e Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Tue, 29 Jun 2004 20:08:05 +0000
Subject: [PATCH 137/356] - Match the first 16 colors of the Windows (R) XP
 default palette.

svn path=/trunk/; revision=9936
---
 reactos/subsys/win32k/objects/color.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/reactos/subsys/win32k/objects/color.c b/reactos/subsys/win32k/objects/color.c
index 2fbbfcbe751..c28fd426ae1 100644
--- a/reactos/subsys/win32k/objects/color.c
+++ b/reactos/subsys/win32k/objects/color.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: color.c,v 1.44 2004/06/28 17:03:35 navaraf Exp $ */
+/* $Id: color.c,v 1.45 2004/06/29 20:08:05 navaraf Exp $ */
 #include <w32k.h>
 
 // FIXME: Use PXLATEOBJ logicalToSystem instead of int *mapping
@@ -44,14 +44,14 @@ const PALETTEENTRY COLOR_sysPalTemplate[NB_RESERVED_COLORS] =
   { 0x00, 0x80, 0x80, PC_SYS_USED },
   { 0xc0, 0xc0, 0xc0, PC_SYS_USED },
   { 0xc0, 0xdc, 0xc0, PC_SYS_USED },
-  { 0xa6, 0xca, 0xf0, PC_SYS_USED },
+  { 0xd4, 0xd0, 0xc7, PC_SYS_USED },
 
   // ... c_min/2 dynamic colorcells
   // ... gap (for sparse palettes)
   // ... c_min/2 dynamic colorcells
 
   { 0xff, 0xfb, 0xf0, PC_SYS_USED },
-  { 0xa0, 0xa0, 0xa4, PC_SYS_USED },
+  { 0x3a, 0x6e, 0xa5, PC_SYS_USED },
   { 0x80, 0x80, 0x80, PC_SYS_USED },
   { 0xff, 0x00, 0x00, PC_SYS_USED },
   { 0x00, 0xff, 0x00, PC_SYS_USED },

From e83551ae34f83225e142f4fa2a27983edfaee998 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Tue, 29 Jun 2004 20:08:07 +0000
Subject: [PATCH 138/356] - Fixed duplicate color conversion in Bitfields/RGB
 -> Indexed case.

svn path=/trunk/; revision=9937
---
 reactos/subsys/win32k/eng/xlate.c | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/reactos/subsys/win32k/eng/xlate.c b/reactos/subsys/win32k/eng/xlate.c
index 9b60b2abaed..bcb8d019572 100644
--- a/reactos/subsys/win32k/eng/xlate.c
+++ b/reactos/subsys/win32k/eng/xlate.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: xlate.c,v 1.37 2004/06/28 17:03:35 navaraf Exp $
+/* $Id: xlate.c,v 1.38 2004/06/29 20:08:07 navaraf Exp $
  * 
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -60,29 +60,17 @@ static ULONG FASTCALL ShiftAndMask(XLATEGDI *XlateGDI, ULONG Color)
 
 // Takes indexed palette and a
 ULONG STDCALL 
-ClosestColorMatch(XLATEGDI *XlateGDI, ULONG SourceColor,
+ClosestColorMatch(XLATEGDI *XlateGDI, LPPALETTEENTRY SourceColor,
    PALETTEENTRY *DestColors, ULONG NumColors)
 {
-  LPPALETTEENTRY cSourceColor;
   LONG idx = 0;
   ULONG i;
-  ULONG SourceRGB;
   ULONG SourceRed, SourceGreen, SourceBlue;
   ULONG cxRed, cxGreen, cxBlue, rt, BestMatch = 16777215;
 
-  if (PAL_BITFIELDS == XlateGDI->XlateObj.iSrcType || PAL_BGR == XlateGDI->XlateObj.iSrcType)
-    {
-      /* FIXME: must use bitfields */
-      SourceRGB = ShiftAndMask(XlateGDI, SourceColor);
-      cSourceColor = (LPPALETTEENTRY) &SourceRGB;
-    }
-  else
-    {
-      cSourceColor = (LPPALETTEENTRY)&SourceColor;
-    } 
-  SourceRed = cSourceColor->peRed;
-  SourceGreen = cSourceColor->peGreen;
-  SourceBlue = cSourceColor->peBlue;
+  SourceRed = SourceColor->peRed;
+  SourceGreen = SourceColor->peGreen;
+  SourceBlue = SourceColor->peBlue;
 
   for (i=0; i<NumColors; i++)
   {
@@ -115,7 +103,7 @@ IndexedToIndexedTranslationTable(XLATEGDI *XlateGDI, ULONG *TranslationTable,
   Trivial = TRUE;
   for(i=0; i<PalSource->NumColors; i++)
     {
-      TranslationTable[i] = ClosestColorMatch(XlateGDI, *((ULONG*)&PalSource->IndexedColors[i]), PalDest->IndexedColors, PalDest->NumColors);
+      TranslationTable[i] = ClosestColorMatch(XlateGDI, PalSource->IndexedColors + i, PalDest->IndexedColors, PalDest->NumColors);
       Trivial = Trivial && (TranslationTable[i] == i);
     }
   if (Trivial)
@@ -425,7 +413,7 @@ XLATEOBJ_iXlate(XLATEOBJ *XlateObj, ULONG Color)
       Color = ShiftAndMask(XlateGDI, Color);
 
       /* Return closest match for the given color. */
-      Closest = ClosestColorMatch(XlateGDI, Color, PalGDI->IndexedColors, PalGDI->NumColors);
+      Closest = ClosestColorMatch(XlateGDI, (LPPALETTEENTRY)&Color, PalGDI->IndexedColors, PalGDI->NumColors);
       PALETTE_UnlockPalette(XlateGDI->DestPal);
       return Closest;
    }

From a4a1cb1b98f10a82def526567ce9859fcc709749 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Tue, 29 Jun 2004 21:09:16 +0000
Subject: [PATCH 139/356] Use DIB bitfields to create palette at > 8 bpp

svn path=/trunk/; revision=9939
---
 reactos/subsys/win32k/objects/dc.c  | 13 ++++++-------
 reactos/subsys/win32k/objects/dib.c | 14 +++++++-------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/reactos/subsys/win32k/objects/dc.c b/reactos/subsys/win32k/objects/dc.c
index b2d994e29f7..23f235984df 100644
--- a/reactos/subsys/win32k/objects/dc.c
+++ b/reactos/subsys/win32k/objects/dc.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dc.c,v 1.140 2004/06/28 17:03:35 navaraf Exp $
+/* $Id: dc.c,v 1.141 2004/06/29 21:09:16 gvg Exp $
  *
  * DC.C - Device context functions
  *
@@ -1904,13 +1904,12 @@ NtGdiSelectObject(HDC  hDC, HGDIOBJ  hGDIObj)
           if(pb->dib->dsBmih.biBitCount == 8) { NumColors = 256; }
           dc->w.hPalette = PALETTE_AllocPaletteIndexedRGB(NumColors, pb->ColorMap);
         }
-        else if ( 16 == pb->dib->dsBmih.biBitCount )
+        else
         {
-          dc->w.hPalette = PALETTE_AllocPalette(PAL_BITFIELDS, pb->dib->dsBmih.biClrUsed, NULL, 0x7c00, 0x03e0, 0x001f);
-        }
-        else if(pb->dib->dsBmih.biBitCount >= 24)
-        {
-          dc->w.hPalette = PALETTE_AllocPalette(PAL_RGB, pb->dib->dsBmih.biClrUsed, NULL, 0, 0, 0);
+          dc->w.hPalette = PALETTE_AllocPalette(PAL_BITFIELDS, 0, NULL,
+                                                pb->dib->dsBitfields[0],
+                                                pb->dib->dsBitfields[1],
+                                                pb->dib->dsBitfields[2]);
         }
       }
       else
diff --git a/reactos/subsys/win32k/objects/dib.c b/reactos/subsys/win32k/objects/dib.c
index 1be558bf67e..1abf6123dbf 100644
--- a/reactos/subsys/win32k/objects/dib.c
+++ b/reactos/subsys/win32k/objects/dib.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dib.c,v 1.54 2004/06/28 17:03:35 navaraf Exp $
+ * $Id: dib.c,v 1.55 2004/06/29 21:09:16 gvg Exp $
  *
  * ReactOS W32 Subsystem
  * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team
@@ -1115,15 +1115,15 @@ DIB_CreateDIBSection(
         dib->dsBitfields[2] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)bmi->bmiColors + 2) : 0x001f;        break;
 
       case 24:
-        dib->dsBitfields[0] = 0xff;
-        dib->dsBitfields[1] = 0xff00;
-        dib->dsBitfields[2] = 0xff0000;
+        dib->dsBitfields[0] = 0xff0000;
+        dib->dsBitfields[1] = 0x00ff00;
+        dib->dsBitfields[2] = 0x0000ff;
         break;
 
       case 32:
-        dib->dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)bmi->bmiColors : 0xff;
-        dib->dsBitfields[1] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)bmi->bmiColors + 1) : 0xff00;
-        dib->dsBitfields[2] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)bmi->bmiColors + 2) : 0xff0000;
+        dib->dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)bmi->bmiColors : 0xff0000;
+        dib->dsBitfields[1] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)bmi->bmiColors + 1) : 0x00ff00;
+        dib->dsBitfields[2] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)bmi->bmiColors + 2) : 0x0000ff;
         break;
     }
     dib->dshSection = section;

From 52b944e9fba28fd1bd63d9d526eb90263e9eea2f Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Tue, 29 Jun 2004 23:45:31 +0000
Subject: [PATCH 140/356] - Return correct ID for windowless timers in
 IntSetTimer.

svn path=/trunk/; revision=9940
---
 reactos/subsys/win32k/ntuser/timer.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/reactos/subsys/win32k/ntuser/timer.c b/reactos/subsys/win32k/ntuser/timer.c
index 26c783427d9..d15dd11a978 100644
--- a/reactos/subsys/win32k/ntuser/timer.c
+++ b/reactos/subsys/win32k/ntuser/timer.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: timer.c,v 1.32 2004/05/10 17:07:18 weiden Exp $
+/* $Id: timer.c,v 1.33 2004/06/29 23:45:31 navaraf Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -175,7 +175,6 @@ RemoveTimersWindow(HWND Wnd)
 UINT_PTR FASTCALL
 IntSetTimer(HWND hWnd, UINT_PTR nIDEvent, UINT uElapse, TIMERPROC lpTimerFunc, BOOL SystemTimer)
 {
-  ULONG Index;
   PMSG_TIMER_ENTRY MsgTimer = NULL;
   PMSG_TIMER_ENTRY NewTimer;
   LARGE_INTEGER CurrentTime;
@@ -190,15 +189,15 @@ IntSetTimer(HWND hWnd, UINT_PTR nIDEvent, UINT uElapse, TIMERPROC lpTimerFunc, B
   if((hWnd == NULL) && !SystemTimer)
   {
     /* find a free, window-less timer id */
-    Index = RtlFindClearBitsAndSet(&WindowLessTimersBitMap, 1, HintIndex);
+    nIDEvent = RtlFindClearBitsAndSet(&WindowLessTimersBitMap, 1, HintIndex);
     
-    if(Index == (ULONG) -1)
+    if(nIDEvent == (UINT_PTR) -1)
     {
       IntUnLockTimerList();
       return 0;
     }
     
-    HintIndex = ++Index;
+    HintIndex = ++nIDEvent;
   }
   else
   {
@@ -302,7 +301,6 @@ IntKillTimer(HWND hWnd, UINT_PTR uIDEvent, BOOL SystemTimer)
       /* FIXME: set the last error */
       return FALSE;
     }
-    
     RtlClearBits(&WindowLessTimersBitMap, uIDEvent - 1, 1);
   }
   else

From 885e4ae102f1c1dcab7c27c836863111a9246218 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Wed, 30 Jun 2004 10:49:18 +0000
Subject: [PATCH 141/356] Define PSCB_BUTTONPRESSED.

svn path=/trunk/; revision=9941
---
 reactos/w32api/include/prsht.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/reactos/w32api/include/prsht.h b/reactos/w32api/include/prsht.h
index 299834b68e0..004558980eb 100644
--- a/reactos/w32api/include/prsht.h
+++ b/reactos/w32api/include/prsht.h
@@ -60,6 +60,9 @@ extern "C" {
 #endif
 #define PSCB_INITIALIZED	1
 #define PSCB_PRECREATE	2
+#if (_WIN32_IE >= 0x560)
+#define PSCB_BUTTONPRESSED	3
+#endif /* _WIN32_IE >= 0x560 */
 #define PSM_GETTABCONTROL	1140
 #define PSM_GETCURRENTPAGEHWND	1142
 #define PSM_ISDIALOGMESSAGE	1141
@@ -82,7 +85,7 @@ extern "C" {
 #define PSNRET_INVALID	1
 #define PSNRET_INVALID_NOCHANGEPAGE	2
 #define ID_PSRESTARTWINDOWS	2
-#define ID_PSREBOOTSYSTEM 	3
+#define ID_PSREBOOTSYSTEM	3
 #define WIZ_CXDLG	276
 #define WIZ_CYDLG	140
 #define WIZ_CXBMP	80

From 3845c9019c2ae69e306e45da994cc1f550ebd6b8 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Wed, 30 Jun 2004 10:53:05 +0000
Subject: [PATCH 142/356] - Apply patch by <j_anderw@sbox.tugraz.at>. - User
 w32api. - Fix some tchar issues.

svn path=/trunk/; revision=9942
---
 reactos/lib/cpl/sysdm/Makefile      |  7 +++-
 reactos/lib/cpl/sysdm/advanced.c    | 10 ++++-
 reactos/lib/cpl/sysdm/general.c     |  8 ++--
 reactos/lib/cpl/sysdm/hardware.c    | 12 +++---
 reactos/lib/cpl/sysdm/resource.h    | 18 ++++++++-
 reactos/lib/cpl/sysdm/sysdm.c       | 27 ++++++-------
 reactos/lib/cpl/sysdm/sysdm.h       | 14 ++++++-
 reactos/lib/cpl/sysdm/sysdm.rc      | 59 +++++++++++++++++++++++++----
 reactos/lib/cpl/sysdm/userprofile.c | 48 +++++++++++++++++++++++
 9 files changed, 168 insertions(+), 35 deletions(-)
 create mode 100644 reactos/lib/cpl/sysdm/userprofile.c

diff --git a/reactos/lib/cpl/sysdm/Makefile b/reactos/lib/cpl/sysdm/Makefile
index 20f88d4b9b8..6a480a0811f 100644
--- a/reactos/lib/cpl/sysdm/Makefile
+++ b/reactos/lib/cpl/sysdm/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 2004/05/29 21:24:43 hbirr Exp $
+# $Id: Makefile,v 1.3 2004/06/30 10:53:05 ekohl Exp $
 
 PATH_TO_TOP = ../../..
 
@@ -13,10 +13,13 @@ TARGET_INSTALLDIR = system32
 TARGET_BASE = $(TARGET_BASE_LIB_CPL_SYSDM)
 
 TARGET_CFLAGS = \
+ -D_WIN32_IE=0x0600 \
+ -D_WIN32_WINNT=0x0501 \
  -I./include \
  -DUNICODE \
  -D_UNICODE \
  -D__REACTOS__ \
+ -D__USE_W32API \
  -Wall \
  -Werror \
  -fno-builtin
@@ -31,7 +34,7 @@ TARGET_PCH =
 
 TARGET_CLEAN = 
 
-TARGET_OBJECTS = sysdm.o general.o computer.o hardware.o advanced.o
+TARGET_OBJECTS = sysdm.o general.o computer.o hardware.o advanced.o userprofile.o
 
 DEP_OBJECTS = $(TARGET_OBJECTS)
 
diff --git a/reactos/lib/cpl/sysdm/advanced.c b/reactos/lib/cpl/sysdm/advanced.c
index 8cd77a88735..c21c1b34c35 100644
--- a/reactos/lib/cpl/sysdm/advanced.c
+++ b/reactos/lib/cpl/sysdm/advanced.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: advanced.c,v 1.1 2004/03/08 14:24:47 weiden Exp $
+/* $Id: advanced.c,v 1.2 2004/06/30 10:53:05 ekohl Exp $
  *
  * PROJECT:         ReactOS System Control Panel
  * FILE:            lib/cpl/system/advanced.c
@@ -27,6 +27,8 @@
  */
 #include <windows.h>
 #include <stdlib.h>
+#include <tchar.h>
+
 #include "resource.h"
 #include "sysdm.h"
 
@@ -39,10 +41,14 @@ AdvancedPageProc(
   LPARAM lParam
 )
 {
-  switch(uMsg)
+  switch (uMsg)
   {
     case WM_INITDIALOG:
       break;
+
+    case WM_COMMAND:
+      break;
+
   }
   return FALSE;
 }
diff --git a/reactos/lib/cpl/sysdm/general.c b/reactos/lib/cpl/sysdm/general.c
index 50889de8b41..9d8b1375730 100644
--- a/reactos/lib/cpl/sysdm/general.c
+++ b/reactos/lib/cpl/sysdm/general.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: general.c,v 1.1 2004/03/08 14:24:47 weiden Exp $
+/* $Id: general.c,v 1.2 2004/06/30 10:53:05 ekohl Exp $
  *
  * PROJECT:         ReactOS System Control Panel
  * FILE:            lib/cpl/system/general.c
@@ -26,21 +26,23 @@
  *      03-04-2004  Created
  */
 #include <windows.h>
+#include <tchar.h>
 #include <stdlib.h>
+
 #include "resource.h"
 #include "sysdm.h"
 
 void
 ShowLastWin32Error(HWND hWndOwner)
 {
-  LPWSTR lpMsg;
+  LPTSTR lpMsg;
   DWORD LastError;
   
   LastError = GetLastError();
   
   if((LastError == 0) || !FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | 
                     FORMAT_MESSAGE_FROM_SYSTEM, NULL, LastError, 
-                    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),(LPWSTR)&lpMsg, 0, 
+                    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),(LPTSTR)&lpMsg, 0, 
                     NULL))
   {
     return;
diff --git a/reactos/lib/cpl/sysdm/hardware.c b/reactos/lib/cpl/sysdm/hardware.c
index ef329b3b299..eb56423357e 100644
--- a/reactos/lib/cpl/sysdm/hardware.c
+++ b/reactos/lib/cpl/sysdm/hardware.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: hardware.c,v 1.1 2004/03/08 14:24:47 weiden Exp $
+/* $Id: hardware.c,v 1.2 2004/06/30 10:53:05 ekohl Exp $
  *
  * PROJECT:         ReactOS System Control Panel
  * FILE:            lib/cpl/system/hardware.c
@@ -27,17 +27,19 @@
  */
 #include <windows.h>
 #include <stdlib.h>
+#include <tchar.h>
+
 #include "resource.h"
 #include "sysdm.h"
 
-typedef WINBOOL (STDCALL *PDEVMGREXEC)(HWND hWndParent, HINSTANCE hInst, PVOID Unknown, int nCmdShow);
+typedef BOOL (STDCALL *PDEVMGREXEC)(HWND hWndParent, HINSTANCE hInst, PVOID Unknown, int nCmdShow);
 BOOL LaunchDeviceManager(HWND hWndParent)
 {
   HMODULE hDll;
   PDEVMGREXEC DevMgrExec;
   BOOL Ret;
-  
-  if(!(hDll = LoadLibrary(L"devmgr.dll")))
+
+  if(!(hDll = LoadLibrary(_TEXT("devmgr.dll"))))
   {
     return FALSE;
   }
@@ -68,7 +70,7 @@ HardwarePageProc(
     case WM_COMMAND:
       switch(LOWORD(wParam))
       {
-        case IDC_DEVMGR:
+        case IDC_HARDWARE_DEVICE_MANAGER:
           if(!LaunchDeviceManager(hwndDlg))
           {
             /* FIXME */
diff --git a/reactos/lib/cpl/sysdm/resource.h b/reactos/lib/cpl/sysdm/resource.h
index c6650a917d9..a6f4ff1bc87 100644
--- a/reactos/lib/cpl/sysdm/resource.h
+++ b/reactos/lib/cpl/sysdm/resource.h
@@ -19,7 +19,8 @@
 #define IDD_PROPPAGEGENERAL	100
 #define IDD_PROPPAGECOMPUTER	101
 #define IDD_PROPPAGEHARDWARE	102
-#define IDD_PROPPAGEADVANCED	103
+#define IDD_PROPPAGEUSERPROFILE	103
+#define IDD_PROPPAGEADVANCED	104
 
 #define IDS_CPLSYSTEMNAME	1001
 #define IDS_CPLSYSTEMDESCRIPTION	2001
@@ -31,8 +32,23 @@
 #define IDC_PROCESSORSPEED      104
 #define IDC_SYSTEMMEMORY        105
 #define IDC_DEVMGR      106
+#define IDC_ENVVAR	107
+#define IDC_STAREC	108
 #define IDC_ICON1       201
 
+#define IDC_COMPUTERNAME	202
+#define IDC_WORKGROUPDOMAIN_NAME	203
+#define IDC_WORKGROUPDOMAIN	204
+#define IDC_NETWORK_ID	205
+#define IDC_NETWORK_PROPERTY	206
+#define IDC_HARDWARE_WIZARD	207
+#define IDC_HARDWARE_PROFILE	210
+#define IDC_HARDWARE_DRIVER_SIGN	211
+#define IDC_HARDWARE_DEVICE_MANAGER	212
+#define IDC_USERPROFILE_DELETE	213
+#define IDC_USERPROFILE_CHANGE	214
+#define IDC_USERPROFILE_COPY		215
+
 #endif /* __CPL_RESOURCE_H */
 
 /* EOF */
diff --git a/reactos/lib/cpl/sysdm/sysdm.c b/reactos/lib/cpl/sysdm/sysdm.c
index 08ab7509ff8..a786ae656b9 100644
--- a/reactos/lib/cpl/sysdm/sysdm.c
+++ b/reactos/lib/cpl/sysdm/sysdm.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: sysdm.c,v 1.1 2004/03/08 14:24:47 weiden Exp $
+/* $Id: sysdm.c,v 1.2 2004/06/30 10:53:05 ekohl Exp $
  *
  * PROJECT:         ReactOS System Control Panel
  * FILE:            lib/cpl/system/sysdm.c
@@ -26,17 +26,17 @@
  *      03-04-2004  Created
  */
 #include <windows.h>
+#include <commctrl.h>
+#include <prsht.h>
+#include <cpl.h>
 #include <stdlib.h>
+
 #include "resource.h"
 #include "sysdm.h"
 
 #define NUM_APPLETS	(1)
 
 LONG CALLBACK SystemApplet(VOID);
-BOOL CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-BOOL CALLBACK ComputerPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-BOOL CALLBACK HardwarePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-BOOL CALLBACK AdvancedPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 HINSTANCE hApplet = 0;
 
 /* Applets */
@@ -52,7 +52,7 @@ InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc)
   psp->dwSize = sizeof(PROPSHEETPAGE);
   psp->dwFlags = PSP_DEFAULT;
   psp->hInstance = hApplet;
-  psp->u1.pszTemplate = MAKEINTRESOURCE(idDlg);
+  psp->pszTemplate = MAKEINTRESOURCE(idDlg);
   psp->pfnDlgProc = DlgProc;
 }
 
@@ -93,7 +93,7 @@ PropSheetProc(
 LONG CALLBACK
 SystemApplet(VOID)
 {
-  PROPSHEETPAGE psp[4];
+  PROPSHEETPAGE psp[5];
   PROPSHEETHEADER psh;
   TCHAR Caption[1024];
   
@@ -101,20 +101,21 @@ SystemApplet(VOID)
   
   ZeroMemory(&psh, sizeof(PROPSHEETHEADER));
   psh.dwSize = sizeof(PROPSHEETHEADER);
-  psh.dwFlags =  PSH_PROPSHEETPAGE | PSH_USECALLBACK | PSH_PROPTITLE;
+  psh.dwFlags =  PSH_PROPSHEETPAGE | PSH_PROPTITLE; /* | PSH_USECALLBACK */
   psh.hwndParent = NULL;
   psh.hInstance = hApplet;
-  psh.u1.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM));
+  psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM));
   psh.pszCaption = Caption;
   psh.nPages = sizeof(psp) / sizeof(PROPSHEETHEADER);
-  psh.u2.nStartPage = 0;
-  psh.u3.ppsp = psp;
-  psh.pfnCallback = PropSheetProc;
+  psh.nStartPage = 0;
+  psh.ppsp = psp;
+  psh.pfnCallback = NULL; /* PropSheetProc; */
   
   InitPropSheetPage(&psp[0], IDD_PROPPAGEGENERAL, GeneralPageProc);
   InitPropSheetPage(&psp[1], IDD_PROPPAGECOMPUTER, ComputerPageProc);
   InitPropSheetPage(&psp[2], IDD_PROPPAGEHARDWARE, HardwarePageProc);
-  InitPropSheetPage(&psp[3], IDD_PROPPAGEADVANCED, AdvancedPageProc);
+  InitPropSheetPage(&psp[3], IDD_PROPPAGEUSERPROFILE, UserProfilePageProc);
+  InitPropSheetPage(&psp[4], IDD_PROPPAGEADVANCED, AdvancedPageProc);
   
   return (LONG)(PropertySheet(&psh) != -1);
 }
diff --git a/reactos/lib/cpl/sysdm/sysdm.h b/reactos/lib/cpl/sysdm/sysdm.h
index 0640f5fd283..0fc26155f9d 100644
--- a/reactos/lib/cpl/sysdm/sysdm.h
+++ b/reactos/lib/cpl/sysdm/sysdm.h
@@ -1,20 +1,30 @@
 #ifndef __CPL_SYSDM_H
 #define __CPL_SYSDM_H
 
-typedef LONG (CALLBACK *APPLET_PROC)(VOID);
+typedef LONG (CALLBACK *APPLET_INITPROC)(VOID);
 
 typedef struct
 {
   int idIcon;
   int idName;
   int idDescription;
-  APPLET_PROC AppletProc;
+  APPLET_INITPROC AppletProc;
 } APPLET, *PAPPLET;
 
 extern HINSTANCE hApplet;
 
 void ShowLastWin32Error(HWND hWndOwner);
 
+BOOL CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+BOOL CALLBACK ComputerPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+BOOL CALLBACK HardwarePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+BOOL CALLBACK AdvancedPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+BOOL CALLBACK UserProfilePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+
+
+//BOOL CALLBACK EnvironmentDlgProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+
+
 #endif /* __CPL_SYSDM_H */
 
 /* EOF */
diff --git a/reactos/lib/cpl/sysdm/sysdm.rc b/reactos/lib/cpl/sysdm/sysdm.rc
index 64a2fba81c6..a47bcd20ba3 100644
--- a/reactos/lib/cpl/sysdm/sysdm.rc
+++ b/reactos/lib/cpl/sysdm/sysdm.rc
@@ -1,5 +1,6 @@
 #include <reactos/resource.h>
 #include <defines.h>
+#include <commctrl.h>
 #include "resource.h"
 
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
@@ -61,21 +62,54 @@ END
 
 IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Computer Name"
+CAPTION "Network Identification"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  /* LTEXT "Property Page 2",-1,73,74,90,8 */
+  ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING,LABELLINE(1)-5, ICONSIZE, ICONSIZE, SS_ICON
+  LTEXT "Windows uses the following information to identify your computer on the network.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  LTEXT "Full computer name:",-1,PROPSHEETPADDING,LABELLINE(4)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(4)-4
+  LTEXT "",IDC_COMPUTERNAME,90,LABELLINE(4)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(4)-5
+  LTEXT "Workgroup:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING,LABELLINE(6)-6,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(6)-6
+  LTEXT "",IDC_WORKGROUPDOMAIN_NAME,90,LABELLINE(6)-6,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(6)-6
+  LTEXT "To use the Network Identfication Wizard to join a domain and create a local user, click Network ID.",-1,PROPSHEETPADDING,LABELLINE(7)+5,PROPSHEETWIDTH-(12*PROPSHEETPADDING)-ICONSIZE,LABELLINE(8)+5
+  PUSHBUTTON "&Network ID",IDC_NETWORK_ID,185,LABELLINE(7)+5,54,LABELLINE(1)+4
+  LTEXT "To rename this computer or join a domain, click Properties.",-1,PROPSHEETPADDING,LABELLINE(11)+2,PROPSHEETWIDTH-(12*PROPSHEETPADDING)-ICONSIZE,LABELLINE(12)+2
+  PUSHBUTTON "&Properties",IDC_NETWORK_PROPERTY,185,LABELLINE(11)+2,54,LABELLINE(1)+4
 END
 
 IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Hardware"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-  GROUPBOX "Hardware Devices",-1,PROPSHEETPADDING,PROPSHEETPADDING,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+BEGIN  
+  GROUPBOX "Hardware Wizard",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "The Hardware wizard helps you install, uninstall, repair, unplug, eject, and configure your hardware.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
   ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON
-  LTEXT "The Device Manager lists all the hardware devices that are installed on your computer. Use the Device Manger to change their settings.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
-  PUSHBUTTON "&Device Manager",IDC_DEVMGR,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&Hardware Wizard",IDC_HARDWARE_WIZARD,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+
+  GROUPBOX "Device Manager",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(7)+2
+  ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-3,ICONSIZE, ICONSIZE, SS_ICON
+  LTEXT "The Device Manager lists all the hardware devices installed on your computer. Use the Device Manager to change the properties of any device.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  
+  PUSHBUTTON "&Device Manager",IDC_HARDWARE_DEVICE_MANAGER,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14
+
+  GROUPBOX "Hardware Profiles",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(18)-5, ICONSIZE, ICONSIZE, SS_ICON
+  LTEXT "Hardware profiles provide a way for you to set up and store different hardware configurations.",0,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  PUSHBUTTON "&Hardware Profiles",IDC_HARDWARE_PROFILE,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(20)+2,(15*PROPSHEETPADDING),14
+END
+
+IDD_PROPPAGEUSERPROFILE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "User Profiles"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+  ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING,LABELLINE(1), ICONSIZE, ICONSIZE, SS_ICON
+  LTEXT "User profiles contain desktop settings and other information related to your login. A different profile can be created on each computer you use, or you can select a roaming profile that is the same on every computer you use.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(4)
+  LTEXT "Profiles stored on this computer:",-1,PROPSHEETPADDING,LABELLINE(6),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(6)
+  PUSHBUTTON "Delete",IDC_USERPROFILE_DELETE,PROPSHEETPADDING,LABELLINE(23),60,LABELLINE(1)+2
+  PUSHBUTTON "Change Type",IDC_USERPROFILE_CHANGE,95,LABELLINE(23),60,LABELLINE(1)+2
+  PUSHBUTTON "Copy To",IDC_USERPROFILE_COPY,180,LABELLINE(23),60,LABELLINE(1)+2
 END
 
 IDD_PROPPAGEADVANCED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
@@ -83,7 +117,18 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Advanced"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  /* LTEXT "Property Page 4",-1,73,74,90,8 */
+  GROUPBOX "Performance",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON
+  LTEXT "Performance options control how applications use memory, which affects the speed of your computer.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  PUSHBUTTON "&Performance Options",IDC_ENVVAR,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  GROUPBOX "Environment Variables",-1,PROPSHEETPADDING,LABELLINE(8)+2,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-5, ICONSIZE, ICONSIZE, SS_ICON
+  LTEXT "Environment variables tell your computer where to find certain types of information.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(11)
+  PUSHBUTTON "&Environment Variables",IDC_ENVVAR,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(12)+2,(15*PROPSHEETPADDING),14
+  GROUPBOX "Startup and Recovery",-1,PROPSHEETPADDING,LABELLINE(15)+3,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(17)-5, ICONSIZE, ICONSIZE, SS_ICON
+  LTEXT "Startup and recovery options tell your computer how to start and what to do if an error causes your computer to stop.",0,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(17)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  PUSHBUTTON "&Startup and Recovery",IDC_STAREC,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(19)+2,(15*PROPSHEETPADDING),14
 END
 
 STRINGTABLE 
diff --git a/reactos/lib/cpl/sysdm/userprofile.c b/reactos/lib/cpl/sysdm/userprofile.c
new file mode 100644
index 00000000000..fd2425f7702
--- /dev/null
+++ b/reactos/lib/cpl/sysdm/userprofile.c
@@ -0,0 +1,48 @@
+/*
+ *  ReactOS
+ *  Copyright (C) 2004 ReactOS Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+/* $Id: userprofile.c,v 1.1 2004/06/30 10:53:05 ekohl Exp $
+ *
+ * PROJECT:         ReactOS System Control Panel
+ * FILE:            lib/cpl/system/computer.c
+ * PURPOSE:         Computer settings for networking
+ * PROGRAMMER:      Thomas Weidenmueller (w3seek@users.sourceforge.net)
+ * UPDATE HISTORY:
+ *      03-04-2004  Created
+ */
+#include <windows.h>
+#include <stdlib.h>
+#include "resource.h"
+#include "sysdm.h"
+
+/* Property page dialog callback */
+BOOL CALLBACK
+UserProfilePageProc(
+  HWND hwndDlg,
+  UINT uMsg,
+  WPARAM wParam,
+  LPARAM lParam
+)
+{
+  switch(uMsg)
+  {
+    case WM_INITDIALOG:
+      break; //GetUserName
+  }
+  return FALSE;
+}

From e4d51272bee82a9cd84754187c691ab67d224e1f Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Wed, 30 Jun 2004 12:11:11 +0000
Subject: [PATCH 143/356] Use w32api.

svn path=/trunk/; revision=9944
---
 reactos/lib/cpl/appwiz/Makefile   |   8 +-
 reactos/lib/cpl/appwiz/appwiz.c   | 376 ++++++++++++++++--------------
 reactos/lib/cpl/appwiz/appwiz.rc  |   1 -
 reactos/lib/cpl/control/Makefile  |  13 +-
 reactos/lib/cpl/control/control.c |  12 +-
 5 files changed, 222 insertions(+), 188 deletions(-)

diff --git a/reactos/lib/cpl/appwiz/Makefile b/reactos/lib/cpl/appwiz/Makefile
index dead14f0e90..28d6a098113 100644
--- a/reactos/lib/cpl/appwiz/Makefile
+++ b/reactos/lib/cpl/appwiz/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 2004/06/18 20:43:44 kuehng Exp $
+# $Id: Makefile,v 1.2 2004/06/30 12:11:11 ekohl Exp $
 
 PATH_TO_TOP = ../../..
 
@@ -13,16 +13,22 @@ TARGET_INSTALLDIR = system32
 TARGET_BASE = $(TARGET_BASE_LIB_CPL_SYSDM)
 
 TARGET_CFLAGS = \
+ -D_WIN32_IE=0x0600 \
+ -D_WIN32_WINNT=0x0501 \
  -I./include \
  -DUNICODE \
  -D_UNICODE \
  -D__REACTOS__ \
+ -D__USE_W32API \
  -Wall \
  -Werror \
  -fno-builtin
 
 TARGET_LFLAGS = -nostartfiles
 
+
+TARGET_LFLAGS = -nostartfiles
+
 TARGET_SDKLIBS = kernel32.a user32.a comctl32.a
 
 TARGET_GCCLIBS = gcc
diff --git a/reactos/lib/cpl/appwiz/appwiz.c b/reactos/lib/cpl/appwiz/appwiz.c
index 72ccb8315f8..c33f6c35a3b 100644
--- a/reactos/lib/cpl/appwiz/appwiz.c
+++ b/reactos/lib/cpl/appwiz/appwiz.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: appwiz.c,v 1.1 2004/06/18 20:43:44 kuehng Exp $
+/* $Id: appwiz.c,v 1.2 2004/06/30 12:11:11 ekohl Exp $
  *
  * PROJECT:         ReactOS Software Control Panel
  * FILE:            lib/cpl/system/appwiz.c
@@ -26,21 +26,15 @@
  *      06-17-2004  Created
  */
 
+#include <windows.h>
+#include <commctrl.h>
+#include <cpl.h>
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <tchar.h>
-#include <windows.h>
-
-#ifdef _MSC_VER
-#include <commctrl.h>
-#include <cpl.h>
-#endif
-
-#include <stdlib.h>
-#include <tchar.h>
 #include <process.h>
-#include <stdio.h>
 
 #include "resource.h"
 #include "appwiz.h"
@@ -55,124 +49,162 @@ HINSTANCE hApplet = 0;
 /* Applets */
 APPLET Applets[NUM_APPLETS] = 
 {
-	{IDI_CPLSYSTEM, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, SystemApplet}
+  {IDI_CPLSYSTEM, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, SystemApplet}
 };
 
-void CallUninstall(HWND hwndDlg)
+
+static VOID
+CallUninstall(HWND hwndDlg)
 {
-	int nIndex;
-	nIndex = SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_GETCURSEL,0,0);
-	if(nIndex == -1)
-		MessageBox(hwndDlg,L"No item selected",L"Error",MB_ICONSTOP);
-	else {
-		HKEY hKey;
-		DWORD dwType = REG_SZ;
-		TCHAR pszUninstallString[MAX_PATH];
-		DWORD dwSize = MAX_PATH;
-		hKey = (HKEY)SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_GETITEMDATA,(WPARAM)nIndex,0);
-		if(RegQueryValueEx(hKey,L"UninstallString",NULL,&dwType,(BYTE*)pszUninstallString,&dwSize)==ERROR_SUCCESS)
-		{
-			STARTUPINFO si;
-			PROCESS_INFORMATION pi;
-			memset(&si,0x00,sizeof(si));
-			si.cb = sizeof(si);
-			si.wShowWindow = SW_SHOW;
-			if(CreateProcess(NULL,pszUninstallString,NULL,NULL,FALSE,0,NULL,NULL,&si,&pi))
-			{
-				CloseHandle(pi.hProcess);
-				CloseHandle(pi.hThread);
-			}
-		} else {
-			MessageBox(hwndDlg,L"Unable to read UninstallString. This entry is invalid or has been created by an MSI installer.",L"Error",MB_ICONSTOP);
-		}
-	}
+  STARTUPINFO si;
+  PROCESS_INFORMATION pi;
+  int nIndex;
+  HKEY hKey;
+  DWORD dwType;
+  TCHAR pszUninstallString[MAX_PATH];
+  DWORD dwSize;
+
+  nIndex = SendDlgItemMessage(hwndDlg, IDC_SOFTWARELIST, LB_GETCURSEL, 0, 0);
+  if (nIndex == -1)
+  {
+    MessageBox(hwndDlg,
+               _TEXT("No item selected"),
+               _TEXT("Error"),
+               MB_ICONSTOP);
+  }
+  else
+  {
+    hKey = (HKEY)SendDlgItemMessage(hwndDlg, IDC_SOFTWARELIST, LB_GETITEMDATA, (WPARAM)nIndex, 0);
+
+    dwType = REG_SZ;
+    dwSize = MAX_PATH;
+    if (RegQueryValueEx(hKey,
+                        _TEXT("UninstallString"),
+                        NULL,
+                        &dwType,
+                        (LPBYTE)pszUninstallString,
+                        &dwSize) == ERROR_SUCCESS)
+    {
+      ZeroMemory(&si, sizeof(si));
+      si.cb = sizeof(si);
+      si.wShowWindow = SW_SHOW;
+      if (CreateProcess(NULL,pszUninstallString,NULL,NULL,FALSE,0,NULL,NULL,&si,&pi))
+      {
+        CloseHandle(pi.hProcess);
+        CloseHandle(pi.hThread);
+      }
+    }
+    else
+    {
+      MessageBox(hwndDlg,
+                 _TEXT("Unable to read UninstallString. This entry is invalid or has been created by an MSI installer."),
+                 _TEXT("Error"),
+                 MB_ICONSTOP);
+    }
+  }
 }
 
+
 /* Property page dialog callback */
-BOOL CALLBACK InstallPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)
+static BOOL CALLBACK
+InstallPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)
 {
-	switch(uMsg)
-	{
+  TCHAR pszName[MAX_PATH];
+  TCHAR pszDisplayName[MAX_PATH];
+  FILETIME FileTime;
+  HKEY hKey;
+  HKEY hSubKey;
+  DWORD dwType;
+  DWORD dwSize;
+  int i;
+  ULONG index;
+
+  switch (uMsg)
+  {
     case WM_INITDIALOG:
-		{
-			HKEY hKey;
-			int i=0;
-			TCHAR pszName[MAX_PATH];
-			FILETIME FileTime;
-			DWORD dwSize = MAX_PATH;
-			EnableWindow(GetDlgItem(hwndDlg,IDC_INSTALL),FALSE);			
-			if(RegOpenKey(HKEY_LOCAL_MACHINE,L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall",&hKey)!=ERROR_SUCCESS) {
-				MessageBox(hwndDlg,L"Unable to open Uninstall Key",L"Error",MB_ICONSTOP);
-				return FALSE;
-			}
-			while(RegEnumKeyEx(hKey,i,pszName,&dwSize,NULL,NULL,NULL,&FileTime)==ERROR_SUCCESS)
-			{
-				HKEY hSubKey;
-				if(RegOpenKey(hKey,pszName,&hSubKey)==ERROR_SUCCESS)
-				{
-					DWORD dwType = REG_SZ;
-					TCHAR pszDisplayName[MAX_PATH];
-					DWORD dwSize = MAX_PATH;
-					ULONG index;
-					if(RegQueryValueEx(hSubKey,L"DisplayName",NULL,&dwType,(BYTE*)pszDisplayName,&dwSize)==ERROR_SUCCESS)
-					{
-						index = SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_ADDSTRING,0,(LPARAM)pszDisplayName);
-						SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_SETITEMDATA,index,(LPARAM)hSubKey);
-					} 
-				}
-				
-				dwSize = MAX_PATH;
-				i++;
-			}
-			RegCloseKey(hKey);
-			break;
-		}
-		break;
-	case WM_COMMAND:
-		switch(LOWORD(wParam))
-		{
-		case IDC_SOFTWARELIST:
-			if(HIWORD(wParam)==LBN_DBLCLK)
-			{
-				CallUninstall(hwndDlg);
-			}
-			break;
-		
-		case IDC_ADDREMOVE:
-			CallUninstall(hwndDlg);
-			break;
-		}
-		break;
-	}
-	return FALSE;
+      EnableWindow(GetDlgItem(hwndDlg,IDC_INSTALL), FALSE);
+      if (RegOpenKey(HKEY_LOCAL_MACHINE,
+                     _TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall"),
+                     &hKey) != ERROR_SUCCESS)
+      {
+        MessageBox(hwndDlg,
+                   _TEXT("Unable to open Uninstall Key"),
+                   _TEXT("Error"),
+                   MB_ICONSTOP);
+        return FALSE;
+      }
+
+      i = 0;
+      dwSize = MAX_PATH;
+      while (RegEnumKeyEx (hKey, i, pszName, &dwSize, NULL, NULL, NULL, &FileTime) == ERROR_SUCCESS)
+      {
+        if (RegOpenKey(hKey,pszName,&hSubKey)==ERROR_SUCCESS)
+        {
+          dwType = REG_SZ;
+          dwSize = MAX_PATH;
+          if (RegQueryValueEx(hSubKey,
+                              _TEXT("DisplayName"),
+                              NULL,
+                              &dwType,
+                              (LPBYTE)pszDisplayName,
+                              &dwSize) == ERROR_SUCCESS)
+          {
+            index = SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_ADDSTRING,0,(LPARAM)pszDisplayName);
+            SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_SETITEMDATA,index,(LPARAM)hSubKey);
+          }
+        }
+
+        dwSize = MAX_PATH;
+        i++;
+      }
+
+      RegCloseKey(hKey);
+      break;
+
+    case WM_COMMAND:
+      switch (LOWORD(wParam))
+      {
+        case IDC_SOFTWARELIST:
+          if (HIWORD(wParam) == LBN_DBLCLK)
+          {
+            CallUninstall(hwndDlg);
+          }
+          break;
+
+        case IDC_ADDREMOVE:
+          CallUninstall(hwndDlg);
+          break;
+      }
+      break;
+  }
+
+  return FALSE;
 }
 
+
 /* Property page dialog callback */
-BOOL CALLBACK RosPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)
+static BOOL CALLBACK
+RosPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)
 {
-	switch(uMsg)
-	{
+  switch(uMsg)
+  {
     case WM_INITDIALOG:
-		{
-			
-			break;
-		}
-	}
-	return FALSE;
+      break;
+  }
+
+  return FALSE;
 }
 
-static void InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc)
+
+static VOID
+InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc)
 {
-	ZeroMemory(psp, sizeof(PROPSHEETPAGE));
-	psp->dwSize = sizeof(PROPSHEETPAGE);
-	psp->dwFlags = PSP_DEFAULT;
-	psp->hInstance = hApplet;
-#ifdef _MSC_VER
-	psp->pszTemplate = MAKEINTRESOURCE(idDlg);
-#else
-	psp->u1.pszTemplate = MAKEINTRESOURCE(idDlg);
-#endif
-	psp->pfnDlgProc = DlgProc;
+  ZeroMemory(psp, sizeof(PROPSHEETPAGE));
+  psp->dwSize = sizeof(PROPSHEETPAGE);
+  psp->dwFlags = PSP_DEFAULT;
+  psp->hInstance = hApplet;
+  psp->pszTemplate = MAKEINTRESOURCE(idDlg);
+  psp->pfnDlgProc = DlgProc;
 }
 
 
@@ -181,83 +213,73 @@ static void InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc)
 LONG CALLBACK
 SystemApplet(VOID)
 {
-	PROPSHEETPAGE psp[2];
-	PROPSHEETHEADER psh;
-	TCHAR Caption[1024];
-	
-	LoadString(hApplet, IDS_CPLSYSTEMNAME, Caption, sizeof(Caption) / sizeof(TCHAR));
-	
-	ZeroMemory(&psh, sizeof(PROPSHEETHEADER));
-	psh.dwSize = sizeof(PROPSHEETHEADER);
-	psh.dwFlags =  PSH_PROPSHEETPAGE | PSH_PROPTITLE;
-	psh.hwndParent = NULL;
-	psh.hInstance = hApplet;
-#ifdef _MSC_VER
-	psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM));
-#else
-	psh.u1.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM));
-#endif
-	psh.pszCaption = Caption;
-	psh.nPages = sizeof(psp) / sizeof(PROPSHEETHEADER);
-#ifdef _MSC_VER
-	psh.nStartPage = 0;
-	psh.ppsp = psp;
-#else
-	psh.u2.nStartPage = 0;
-	psh.u3.ppsp = psp;
-#endif
-	psh.pfnCallback = NULL;
-	
+  PROPSHEETPAGE psp[2];
+  PROPSHEETHEADER psh;
+  TCHAR Caption[1024];
 
-	InitPropSheetPage(&psp[0], IDD_PROPPAGEINSTALL, InstallPageProc);
-	InitPropSheetPage(&psp[1], IDD_PROPPAGEROSSETUP, RosPageProc);
-	
-	return (LONG)(PropertySheet(&psh) != -1);
+  LoadString(hApplet, IDS_CPLSYSTEMNAME, Caption, sizeof(Caption) / sizeof(TCHAR));
+
+  ZeroMemory(&psh, sizeof(PROPSHEETHEADER));
+  psh.dwSize = sizeof(PROPSHEETHEADER);
+  psh.dwFlags =  PSH_PROPSHEETPAGE | PSH_PROPTITLE;
+  psh.hwndParent = NULL;
+  psh.hInstance = hApplet;
+  psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM));
+  psh.pszCaption = Caption;
+  psh.nPages = sizeof(psp) / sizeof(PROPSHEETHEADER);
+  psh.nStartPage = 0;
+  psh.ppsp = psp;
+  psh.pfnCallback = NULL;
+
+  InitPropSheetPage(&psp[0], IDD_PROPPAGEINSTALL, InstallPageProc);
+  InitPropSheetPage(&psp[1], IDD_PROPPAGEROSSETUP, RosPageProc);
+
+  return (LONG)(PropertySheet(&psh) != -1);
 }
 
+
 /* Control Panel Callback */
-LONG CALLBACK CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
+LONG CALLBACK
+CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
 {
-	int i = (int)lParam1;
-	
-	switch(uMsg)
-	{
+  CPLINFO *CPlInfo;
+  DWORD i;
+
+  i = (DWORD)lParam1;
+  switch(uMsg)
+  {
     case CPL_INIT:
-		{
-			return TRUE;
-		}
+      return TRUE;
+
     case CPL_GETCOUNT:
-		{
-			return NUM_APPLETS;
-		}
+      return NUM_APPLETS;
+
     case CPL_INQUIRE:
-		{
-			CPLINFO *CPlInfo = (CPLINFO*)lParam2;
-			CPlInfo->lData = 0;
-			CPlInfo->idIcon = Applets[i].idIcon;
-			CPlInfo->idName = Applets[i].idName;
-			CPlInfo->idInfo = Applets[i].idDescription;
-			break;
-		}
+      CPlInfo = (CPLINFO*)lParam2;
+      CPlInfo->lData = 0;
+      CPlInfo->idIcon = Applets[i].idIcon;
+      CPlInfo->idName = Applets[i].idName;
+      CPlInfo->idInfo = Applets[i].idDescription;
+      break;
+
     case CPL_DBLCLK:
-		{
-			Applets[i].AppletProc();
-			break;
-		}
-	}
-	return FALSE;
+      Applets[i].AppletProc();
+      break;
+  }
+
+  return FALSE;
 }
 
 
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved)
+BOOL WINAPI
+DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved)
 {
-	switch(dwReason)
-	{
+  switch(dwReason)
+  {
     case DLL_PROCESS_ATTACH:
     case DLL_THREAD_ATTACH:
-		hApplet = hinstDLL;
-		break;
-	}
-	return TRUE;
+      hApplet = hinstDLL;
+      break;
+  }
+  return TRUE;
 }
-
diff --git a/reactos/lib/cpl/appwiz/appwiz.rc b/reactos/lib/cpl/appwiz/appwiz.rc
index 4eec9a01551..485a020b9b5 100644
--- a/reactos/lib/cpl/appwiz/appwiz.rc
+++ b/reactos/lib/cpl/appwiz/appwiz.rc
@@ -49,7 +49,6 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Install/Uninstall"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-
   ICON            IDI_CPLSYSTEM,-1,PROPSHEETPADDING,18,16,16
   LTEXT "To install a new program, click Install",-1,36,18,PROPSHEETWIDTH-48,8
   PUSHBUTTON "&Install...", IDC_INSTALL, PROPSHEETWIDTH-(72), 36, 60, 14
diff --git a/reactos/lib/cpl/control/Makefile b/reactos/lib/cpl/control/Makefile
index 7a70cb49e6e..1ad6360f659 100644
--- a/reactos/lib/cpl/control/Makefile
+++ b/reactos/lib/cpl/control/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 2004/06/29 12:03:56 ekohl Exp $
+# $Id: Makefile,v 1.3 2004/06/30 12:10:12 ekohl Exp $
 
 PATH_TO_TOP = ../../..
 
@@ -10,7 +10,16 @@ TARGET_INSTALLDIR = system32
 
 TARGET_APPTYPE = windows
 
-TARGET_CFLAGS = -D_UNICODE -DUNICODE
+TARGET_CFLAGS = \
+ -D_WIN32_IE=0x0600 \
+ -D_WIN32_WINNT=0x0501 \
+ -DUNICODE \
+ -D_UNICODE \
+ -D__REACTOS__ \
+ -D__USE_W32API \
+ -Wall \
+ -Werror \
+ -fno-builtin
 
 TARGET_SDKLIBS = kernel32.a user32.a comctl32.a
 
diff --git a/reactos/lib/cpl/control/control.c b/reactos/lib/cpl/control/control.c
index 3b35fd6abc6..d10ad031ec4 100644
--- a/reactos/lib/cpl/control/control.c
+++ b/reactos/lib/cpl/control/control.c
@@ -17,7 +17,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: control.c,v 1.3 2004/06/29 12:03:56 ekohl Exp $
+/* $Id: control.c,v 1.4 2004/06/30 12:10:12 ekohl Exp $
  *
  * PROJECT:         ReactOS System Control Panel
  * FILE:            lib/cpl/system/control.c
@@ -26,16 +26,14 @@
  * UPDATE HISTORY:
  *      06-13-2004  Created
  */
+#include <windows.h>
+#include <commctrl.h>
+#include <cpl.h>
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <tchar.h>
-#include <windows.h>
-
-#ifdef _MSC_VER
-#include <commctrl.h>
-#include <cpl.h>
-#endif
 
 #include "resource.h"
 

From c9ad0dddb4d50ebde891ac8570bdb004b032293e Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Wed, 30 Jun 2004 12:16:27 +0000
Subject: [PATCH 144/356] - Add accessibility control panel. Patch by
 <j_anderw@sbox.tugraz.at> - Use w32api. - Add control panel icon.

svn path=/trunk/; revision=9945
---
 reactos/lib/cpl/access/Makefile   |  49 ++++++++
 reactos/lib/cpl/access/access.c   | 182 ++++++++++++++++++++++++++++++
 reactos/lib/cpl/access/access.def |   6 +
 reactos/lib/cpl/access/access.edf |   6 +
 reactos/lib/cpl/access/access.h   |  20 ++++
 reactos/lib/cpl/access/access.rc  | 144 +++++++++++++++++++++++
 reactos/lib/cpl/access/display.c  |  64 +++++++++++
 reactos/lib/cpl/access/general.c  |  84 ++++++++++++++
 reactos/lib/cpl/access/keyboard.c |  85 ++++++++++++++
 reactos/lib/cpl/access/mouse.c    |  64 +++++++++++
 reactos/lib/cpl/access/resource.h |  51 +++++++++
 reactos/lib/cpl/access/sound.c    |  68 +++++++++++
 12 files changed, 823 insertions(+)
 create mode 100644 reactos/lib/cpl/access/Makefile
 create mode 100644 reactos/lib/cpl/access/access.c
 create mode 100644 reactos/lib/cpl/access/access.def
 create mode 100644 reactos/lib/cpl/access/access.edf
 create mode 100644 reactos/lib/cpl/access/access.h
 create mode 100644 reactos/lib/cpl/access/access.rc
 create mode 100644 reactos/lib/cpl/access/display.c
 create mode 100644 reactos/lib/cpl/access/general.c
 create mode 100644 reactos/lib/cpl/access/keyboard.c
 create mode 100644 reactos/lib/cpl/access/mouse.c
 create mode 100644 reactos/lib/cpl/access/resource.h
 create mode 100644 reactos/lib/cpl/access/sound.c

diff --git a/reactos/lib/cpl/access/Makefile b/reactos/lib/cpl/access/Makefile
new file mode 100644
index 00000000000..a85b852b5d4
--- /dev/null
+++ b/reactos/lib/cpl/access/Makefile
@@ -0,0 +1,49 @@
+# $Id: Makefile,v 1.1 2004/06/30 12:16:27 ekohl Exp $
+
+PATH_TO_TOP = ../../..
+
+TARGET_TYPE = dynlink
+
+TARGET_EXTENSION = .cpl
+
+TARGET_NAME = access
+
+TARGET_INSTALLDIR = system32
+
+TARGET_BASE = 0x58760000
+
+TARGET_CFLAGS = \
+ -D_WIN32_IE=0x0600 \
+ -D_WIN32_WINNT=0x0501 \
+ -DUNICODE \
+ -D_UNICODE \
+ -D__REACTOS__ \
+ -D__USE_W32API \
+ -Wall \
+ -Werror \
+ -fno-builtin
+
+TARGET_LFLAGS = -nostartfiles
+
+TARGET_SDKLIBS = kernel32.a user32.a comctl32.a
+
+TARGET_GCCLIBS = gcc
+
+TARGET_PCH = 
+
+TARGET_CLEAN = 
+
+TARGET_OBJECTS = keyboard.o sound.o display.o mouse.o general.o access.o
+
+DEP_OBJECTS = $(TARGET_OBJECTS)
+
+include $(PATH_TO_TOP)/rules.mak
+
+include $(TOOLS_PATH)/helper.mk
+
+include $(TOOLS_PATH)/depend.mk
+
+%/TAGS:
+	etags -o $(@D)/TAGS $(@D)/\*.c
+
+etags: ./TAGS
diff --git a/reactos/lib/cpl/access/access.c b/reactos/lib/cpl/access/access.c
new file mode 100644
index 00000000000..69de779a790
--- /dev/null
+++ b/reactos/lib/cpl/access/access.c
@@ -0,0 +1,182 @@
+/*
+ *  ReactOS
+ *  Copyright (C) 2004 ReactOS Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+/* $Id: access.c,v 1.1 2004/06/30 12:16:27 ekohl Exp $
+ *
+ * PROJECT:         ReactOS System Control Panel
+ * FILE:            lib/cpl/system/sysdm.c
+ * PURPOSE:         ReactOS System Control Panel
+ * PROGRAMMER:      Thomas Weidenmueller (w3seek@users.sourceforge.net)
+ * UPDATE HISTORY:
+ *      03-04-2004  Created
+ */
+#include <windows.h>
+#include <commctrl.h>
+#include <cpl.h>
+
+#include <stdlib.h>
+
+#include "resource.h"
+#include "access.h"
+
+#define NUM_APPLETS	(1)
+
+LONG CALLBACK SystemApplet(VOID);
+BOOL CALLBACK DisplayPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+BOOL CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+BOOL CALLBACK KeyboardPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+BOOL CALLBACK MousePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+BOOL CALLBACK SoundPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+HINSTANCE hApplet = 0;
+
+/* Applets */
+APPLET Applets[NUM_APPLETS] = 
+{
+  {IDI_CPLACCESS, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, SystemApplet}
+};
+
+static void
+InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc)
+{
+  ZeroMemory(psp, sizeof(PROPSHEETPAGE));
+  psp->dwSize = sizeof(PROPSHEETPAGE);
+  psp->dwFlags = PSP_DEFAULT;
+  psp->hInstance = hApplet;
+  psp->pszTemplate = MAKEINTRESOURCE(idDlg);
+  psp->pfnDlgProc = DlgProc;
+}
+
+/* Property Sheet Callback */
+int CALLBACK
+PropSheetProc(
+	HWND hwndDlg,
+	UINT uMsg,
+	LPARAM lParam
+)
+{
+  switch(uMsg)
+  {
+    case PSCB_BUTTONPRESSED:
+      switch(lParam)
+      {
+        case PSBTN_OK: /* OK */
+          break;
+        case PSBTN_CANCEL: /* Cancel */
+          break;
+        case PSBTN_APPLYNOW: /* Apply now */
+          break;
+        case PSBTN_FINISH: /* Close */
+          break;
+        default:
+          return FALSE;
+      }
+      break;
+      
+    case PSCB_INITIALIZED:
+      break;
+  }
+  return TRUE;
+}
+
+/* First Applet */
+
+LONG CALLBACK
+SystemApplet(VOID)
+{
+  PROPSHEETPAGE psp[5];
+  PROPSHEETHEADER psh;
+  TCHAR Caption[1024];
+  
+  LoadString(hApplet, IDS_CPLSYSTEMNAME, Caption, sizeof(Caption) / sizeof(TCHAR));
+  
+  ZeroMemory(&psh, sizeof(PROPSHEETHEADER));
+  psh.dwSize = sizeof(PROPSHEETHEADER);
+  psh.dwFlags =  PSH_PROPSHEETPAGE | PSH_USECALLBACK | PSH_PROPTITLE;
+  psh.hwndParent = NULL;
+  psh.hInstance = hApplet;
+  psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLACCESS));
+  psh.pszCaption = Caption;
+  psh.nPages = sizeof(psp) / sizeof(PROPSHEETHEADER);
+  psh.nStartPage = 0;
+  psh.ppsp = psp;
+  psh.pfnCallback = PropSheetProc;
+  
+  InitPropSheetPage(&psp[0], IDD_PROPPAGEKEYBOARD, KeyboardPageProc);
+  InitPropSheetPage(&psp[1], IDD_PROPPAGESOUND, SoundPageProc);
+  InitPropSheetPage(&psp[2], IDD_PROPPAGEDISPLAY, DisplayPageProc);
+  InitPropSheetPage(&psp[3], IDD_PROPPAGEMOUSE, MousePageProc);
+  InitPropSheetPage(&psp[4], IDD_PROPPAGEGENERAL, GeneralPageProc);
+  
+  return (LONG)(PropertySheet(&psh) != -1);
+}
+
+/* Control Panel Callback */
+LONG CALLBACK
+CPlApplet(
+	HWND hwndCPl,
+	UINT uMsg,
+	LPARAM lParam1,
+	LPARAM lParam2)
+{
+  int i = (int)lParam1;
+  
+  switch(uMsg)
+  {
+    case CPL_INIT:
+    {
+      return TRUE;
+    }
+    case CPL_GETCOUNT:
+    {
+      return NUM_APPLETS;
+    }
+    case CPL_INQUIRE:
+    {
+      CPLINFO *CPlInfo = (CPLINFO*)lParam2;
+      CPlInfo->lData = 0;
+      CPlInfo->idIcon = Applets[i].idIcon;
+      CPlInfo->idName = Applets[i].idName;
+      CPlInfo->idInfo = Applets[i].idDescription;
+      break;
+    }
+    case CPL_DBLCLK:
+    {
+      Applets[i].AppletProc();
+      break;
+    }
+  }
+  return FALSE;
+}
+
+
+BOOL STDCALL
+DllMain(
+	HINSTANCE hinstDLL,
+	DWORD     dwReason,
+	LPVOID    lpvReserved)
+{
+  switch(dwReason)
+  {
+    case DLL_PROCESS_ATTACH:
+    case DLL_THREAD_ATTACH:
+      hApplet = hinstDLL;
+      break;
+  }
+  return TRUE;
+}
+
diff --git a/reactos/lib/cpl/access/access.def b/reactos/lib/cpl/access/access.def
new file mode 100644
index 00000000000..1ed84314984
--- /dev/null
+++ b/reactos/lib/cpl/access/access.def
@@ -0,0 +1,6 @@
+LIBRARY cplsample.cpl
+
+EXPORTS
+CPlApplet@16
+
+; EOF
diff --git a/reactos/lib/cpl/access/access.edf b/reactos/lib/cpl/access/access.edf
new file mode 100644
index 00000000000..47e146aa470
--- /dev/null
+++ b/reactos/lib/cpl/access/access.edf
@@ -0,0 +1,6 @@
+LIBRARY cplsample.cpl
+
+EXPORTS
+CPlApplet=CPlApplet@16
+
+; EOF
diff --git a/reactos/lib/cpl/access/access.h b/reactos/lib/cpl/access/access.h
new file mode 100644
index 00000000000..337bc5b692c
--- /dev/null
+++ b/reactos/lib/cpl/access/access.h
@@ -0,0 +1,20 @@
+#ifndef __CPL_SYSDM_H
+#define __CPL_SYSDM_H
+
+typedef LONG (CALLBACK *APPLET_INITPROC)(VOID);
+
+typedef struct
+{
+  int idIcon;
+  int idName;
+  int idDescription;
+  APPLET_INITPROC AppletProc;
+} APPLET, *PAPPLET;
+
+extern HINSTANCE hApplet;
+
+void ShowLastWin32Error(HWND hWndOwner);
+
+#endif /* __CPL_SYSDM_H */
+
+/* EOF */
diff --git a/reactos/lib/cpl/access/access.rc b/reactos/lib/cpl/access/access.rc
new file mode 100644
index 00000000000..f055a576865
--- /dev/null
+++ b/reactos/lib/cpl/access/access.rc
@@ -0,0 +1,144 @@
+#include <reactos/resource.h>
+#include <defines.h>
+#include "resource.h"
+
+LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+
+VS_VERSION_INFO VERSIONINFO
+	FILEVERSION	RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD
+	PRODUCTVERSION	RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD	
+	FILEFLAGSMASK	0x3fL
+#ifdef _DEBUG
+	FILEFLAGS	0x1L
+#else
+	FILEFLAGS	0x0L
+#endif
+	FILEOS		0x40004L
+	FILETYPE	0x2L
+	FILESUBTYPE	0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName",	RES_STR_COMPANY_NAME
+            VALUE "FileDescription",	"ReactOS Accessibility Control Panel\0"
+            VALUE "FileVersion",	RES_STR_FILE_VERSION
+            VALUE "InternalName",	"access\0"
+            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
+            VALUE "OriginalFilename",	"access.cpl\0"
+            VALUE "ProductName",	RES_STR_PRODUCT_NAME
+            VALUE "ProductVersion",	RES_STR_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+IDI_CPLACCESS ICON "resources/applet.ico"
+
+
+IDD_PROPPAGEKEYBOARD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Keyboard"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+  GROUPBOX "StickyKeys",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "Use StickyKeys if you want to use Shift, Ctrl, or Alt key by pressing one key at at time.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "Use StickyKeys",IDC_STICKY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&Settings",IDC_STICKY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  GROUPBOX "FilterKeys",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(7)+2
+  LTEXT "Use FilterKeys if you want Reactos to ignore brief or repeated keystrokes, or slow the repeat rate.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "Use FilterKeys",IDC_FILTER_BOX,(4*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&Settings",IDC_FILTER_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14
+  GROUPBOX "ToggleKeys",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "Use ToggleKeys if you want to hear tones when pressing Caps Lock, Num Lock, and Scroll Lock.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "Use ToggleKeys",IDC_TOGGLE_BOX,(4*PROPSHEETPADDING),LABELLINE(20)+2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  PUSHBUTTON "&Settings",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(20)+2,(15*PROPSHEETPADDING),14
+//  CHECKBOX "Show extra keyboard help in programs",IDC_KEYBOARD_EXTRA
+END
+
+
+IDD_PROPPAGESOUND DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Sound"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+  GROUPBOX "SoundSentry",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "Use SoundSentry if you want Reactos to generate visual warnings when your system makes a sound.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "Use &SoundSentry",IDC_SENTRY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&Settings",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+
+  GROUPBOX "ShowSounds",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(7)+2
+  LTEXT "Use ShowSounds to tell your programs to display captions for the speech and sounds they make.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "Use S&howSounds",IDC_SSHOW_BOX,(4*PROPSHEETPADDING),LABELLINE(12)+2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+END
+
+
+IDD_PROPPAGEDISPLAY DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Display"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN  
+  GROUPBOX "High Contrast",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "Use this option if you want Reactos to use colors and fonts designed for easy reading.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "&Use High Contrast",IDC_CONTRAST_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&Settings",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+END
+
+
+IDD_PROPPAGEMOUSE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Mouse"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+  GROUPBOX "MouseKeys",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "Use this option if you want to control the pointer with the numeric keypad on your keyboard.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "Use &MouseKeys",IDC_MOUSE_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&Settings",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+END
+
+
+IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "General"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+  GROUPBOX "Automatic Reset",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
+  CHECKBOX "&Turn off accessbility features after idle for:",IDC_RESET_BOX,(2*PROPSHEETPADDING),LABELLINE(2)-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+
+  //POPUP IDC_RESET_POPUP, GRAYED
+  //{
+  //  MENUITEM "5 Minutes", IDC_RESET_5
+  //  MENUITEM "10 Minutes", IDC_RESET_10
+  //  MENUITEM "15 Minutes", IDC_RESET_15
+  //  MENUITEM "20 Minutes", IDC_RESET_20
+  //  MENUITEM "25 Minutes", IDC_RESET_25
+  //  MENUITEM "30 Minutes", IDC_RESET_30
+  //}
+
+  GROUPBOX "Notification",-1,PROPSHEETPADDING,LABELLINE(7)-2,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
+  CHECKBOX "Give warning message when turning a feature on",IDC_NOTIFICATION_MESSAGE,(2*PROPSHEETPADDING),LABELLINE(8)-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "Make a sound when turning a feature on or off",IDC_NOTIFICATION_SOUND,(2*PROPSHEETPADDING),LABELLINE(10)-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1)
+
+ 
+  GROUPBOX "SerialKey Devices",-1,PROPSHEETPADDING,LABELLINE(13)-4,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
+  LTEXT "SerialKey devices allow alternative access to keyboard and mouse features.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "Support &SerialKey devices",IDC_SERIAL_BOX,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1)
+
+  PUSHBUTTON "S&ettings",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1)  
+
+  GROUPBOX "Administrative options",-1,PROPSHEETPADDING,LABELLINE(19)-4,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
+
+  CHECKBOX "Apply all settings to l&ogon desktop",IDC_ADMIN_LOGON_BOX,(PROPSHEETPADDING*2),LABELLINE(20)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "Apply all settings to &defaults for new users",IDC_ADMIN_USERS_BOX,(2*PROPSHEETPADDING),LABELLINE(22)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1)
+END
+
+
+STRINGTABLE 
+BEGIN
+  IDS_CPLSYSTEMNAME "Accessibility"
+  IDS_CPLSYSTEMDESCRIPTION "Customizes accessbility features for your computer."
+END
diff --git a/reactos/lib/cpl/access/display.c b/reactos/lib/cpl/access/display.c
new file mode 100644
index 00000000000..12178ab3fb2
--- /dev/null
+++ b/reactos/lib/cpl/access/display.c
@@ -0,0 +1,64 @@
+/*
+ *  ReactOS
+ *  Copyright (C) 2004 ReactOS Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+/* $Id: display.c,v 1.1 2004/06/30 12:16:27 ekohl Exp $
+ *
+ * PROJECT:         ReactOS System Control Panel
+ * FILE:            lib/cpl/system/advanced.c
+ * PURPOSE:         Memory, start-up and profiles settings
+ * PROGRAMMER:      Thomas Weidenmueller (w3seek@users.sourceforge.net)
+ * UPDATE HISTORY:
+ *      03-04-2004  Created
+ */
+#include <windows.h>
+#include <stdlib.h>
+#include "resource.h"
+#include "access.h"
+
+/* Property page dialog callback */
+BOOL CALLBACK
+DisplayPageProc(
+  HWND hwndDlg,
+  UINT uMsg,
+  WPARAM wParam,
+  LPARAM lParam
+)
+{
+  switch(uMsg)
+  {
+    case WM_INITDIALOG:
+      break;
+    case WM_COMMAND:
+    {
+      switch(LOWORD(wParam))
+      {
+        case IDC_CONTRAST_BOX:
+        {
+          break;
+        }
+        case IDC_CONTRAST_BUTTON:
+        {
+          break;
+        }
+        default:
+          break;
+      }
+    }
+  }
+  return FALSE;
+}
diff --git a/reactos/lib/cpl/access/general.c b/reactos/lib/cpl/access/general.c
new file mode 100644
index 00000000000..03f032cac43
--- /dev/null
+++ b/reactos/lib/cpl/access/general.c
@@ -0,0 +1,84 @@
+/*
+ *  ReactOS
+ *  Copyright (C) 2004 ReactOS Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+/* $Id: general.c,v 1.1 2004/06/30 12:16:27 ekohl Exp $
+ *
+ * PROJECT:         ReactOS System Control Panel
+ * FILE:            lib/cpl/system/advanced.c
+ * PURPOSE:         Memory, start-up and profiles settings
+ * PROGRAMMER:      Thomas Weidenmueller (w3seek@users.sourceforge.net)
+ * UPDATE HISTORY:
+ *      03-04-2004  Created
+ */
+#include <windows.h>
+#include <stdlib.h>
+#include "resource.h"
+#include "access.h"
+
+/* Property page dialog callback */
+BOOL CALLBACK
+GeneralPageProc(
+  HWND hwndDlg,
+  UINT uMsg,
+  WPARAM wParam,
+  LPARAM lParam
+)
+{
+  switch(uMsg)
+  {
+    case WM_INITDIALOG:
+      break;
+    case WM_COMMAND:
+    {
+      switch(LOWORD(wParam))
+      {      
+        case IDC_RESET_BOX:
+        {
+          break;
+        }
+        case IDC_NOTIFICATION_MESSAGE:
+        {
+          break;
+        }
+        case IDC_NOTIFICATION_SOUND:
+        {
+          break;
+        }
+        case IDC_SERIAL_BOX:
+        {
+          break;
+        }
+        case IDC_SERIAL_BUTTON:
+        {
+          break;
+        }
+        case IDC_ADMIN_LOGON_BOX:
+        {
+          break;
+        }
+        case IDC_ADMIN_USERS_BOX:
+        {
+          break;
+        }
+        default:
+         break;
+      }
+    }
+  }
+  return FALSE;
+}
diff --git a/reactos/lib/cpl/access/keyboard.c b/reactos/lib/cpl/access/keyboard.c
new file mode 100644
index 00000000000..aeb64bfbdd2
--- /dev/null
+++ b/reactos/lib/cpl/access/keyboard.c
@@ -0,0 +1,85 @@
+/*
+ *  ReactOS
+ *  Copyright (C) 2004 ReactOS Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+/* $Id: keyboard.c,v 1.1 2004/06/30 12:16:27 ekohl Exp $
+ *
+ * PROJECT:         ReactOS System Control Panel
+ * FILE:            lib/cpl/system/advanced.c
+ * PURPOSE:         Memory, start-up and profiles settings
+ * PROGRAMMER:      Thomas Weidenmueller (w3seek@users.sourceforge.net)
+ * UPDATE HISTORY:
+ *      03-04-2004  Created
+ */
+#include <windows.h>
+#include <stdlib.h>
+#include "resource.h"
+#include "access.h"
+
+/* Property page dialog callback */
+BOOL CALLBACK
+KeyboardPageProc(
+  HWND hwndDlg,
+  UINT uMsg,
+  WPARAM wParam,
+  LPARAM lParam
+)
+{
+  switch(uMsg)
+  {
+    case WM_INITDIALOG:
+      break;
+    case WM_COMMAND:
+    {
+      switch(LOWORD(wParam))
+      {
+        case IDC_STICKY_BOX:
+        {
+          break;
+        }
+
+        case IDC_STICKY_BUTTON:
+        {
+          break;
+        }
+
+        case IDC_FILTER_BOX:
+        {
+          break;
+        }
+
+        case IDC_FILTER_BUTTON:
+        {
+          break;
+        }
+
+        case IDC_TOGGLE_BOX:
+        {
+          break;
+        }
+
+        case IDC_TOGGLE_BUTTON:
+        {
+          break;
+        }
+        default:
+           break;
+      }
+    }
+  }
+  return FALSE;
+}
diff --git a/reactos/lib/cpl/access/mouse.c b/reactos/lib/cpl/access/mouse.c
new file mode 100644
index 00000000000..ec8ce4a5d2f
--- /dev/null
+++ b/reactos/lib/cpl/access/mouse.c
@@ -0,0 +1,64 @@
+/*
+ *  ReactOS
+ *  Copyright (C) 2004 ReactOS Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+/* $Id: mouse.c,v 1.1 2004/06/30 12:16:27 ekohl Exp $
+ *
+ * PROJECT:         ReactOS System Control Panel
+ * FILE:            lib/cpl/system/advanced.c
+ * PURPOSE:         Memory, start-up and profiles settings
+ * PROGRAMMER:      Thomas Weidenmueller (w3seek@users.sourceforge.net)
+ * UPDATE HISTORY:
+ *      03-04-2004  Created
+ */
+#include <windows.h>
+#include <stdlib.h>
+#include "resource.h"
+#include "access.h"
+
+/* Property page dialog callback */
+BOOL CALLBACK
+MousePageProc(
+  HWND hwndDlg,
+  UINT uMsg,
+  WPARAM wParam,
+  LPARAM lParam
+)
+{
+  switch(uMsg)
+  {
+    case WM_INITDIALOG:
+      break;
+    case WM_COMMAND:
+    {
+      switch(LOWORD(wParam))
+      {      
+        case IDC_MOUSE_BOX:
+        {
+          break;
+        }
+        case IDC_MOUSE_BUTTON:
+        {
+          break;
+        }
+        default:
+          break;
+      }
+    }
+  }
+  return FALSE;
+}
diff --git a/reactos/lib/cpl/access/resource.h b/reactos/lib/cpl/access/resource.h
new file mode 100644
index 00000000000..d2cb74fee6e
--- /dev/null
+++ b/reactos/lib/cpl/access/resource.h
@@ -0,0 +1,51 @@
+#ifndef __CPL_RESOURCE_H
+#define __CPL_RESOURCE_H
+
+/* metrics */
+#define PROPSHEETWIDTH  246
+#define PROPSHEETHEIGHT 228
+#define PROPSHEETPADDING        6
+#define SYSTEM_COLUMN   (18 * PROPSHEETPADDING)
+#define LABELLINE(x)    (((PROPSHEETPADDING + 2) * x) + (x + 2))
+#define ICONSIZE        16
+
+/* ids */
+#define IDI_CPLACCESS		100
+
+#define IDD_PROPPAGEKEYBOARD	100
+#define IDD_PROPPAGESOUND	101
+#define IDD_PROPPAGEDISPLAY	102
+#define IDD_PROPPAGEMOUSE	103
+#define IDD_PROPPAGEGENERAL	104
+
+#define IDS_CPLSYSTEMNAME	1001
+#define IDS_CPLSYSTEMDESCRIPTION	2001
+
+/* controls */
+#define IDC_STICKY_BOX		200
+#define IDC_STICKY_BUTTON	201
+#define IDC_FILTER_BOX		202
+#define IDC_FILTER_BUTTON	203
+#define IDC_TOGGLE_BOX		204
+#define IDC_TOGGLE_BUTTON	205
+#define IDC_SENTRY_BOX		206
+#define IDC_SENTRY_BUTTON	207
+#define IDC_SSHOW_BOX		208
+#define IDC_CONTRAST_BOX	209
+#define IDC_CONTRAST_BUTTON	210
+#define IDC_MOUSE_BOX		211
+#define IDC_MOUSE_BUTTON	212
+#define IDC_RESET_BOX		213
+#define IDC_RESET_POPUP		214
+#define IDC_NOTIFICATION_MESSAGE	215
+#define IDC_NOTIFICATION_SOUND	216
+#define IDC_SERIAL_BOX		217
+#define IDC_SERIAL_BUTTON	218
+#define IDC_ADMIN_LOGON_BOX	219
+#define IDC_ADMIN_USERS_BOX	220
+
+
+
+#endif /* __CPL_RESOURCE_H */
+
+/* EOF */
diff --git a/reactos/lib/cpl/access/sound.c b/reactos/lib/cpl/access/sound.c
new file mode 100644
index 00000000000..c1780b41059
--- /dev/null
+++ b/reactos/lib/cpl/access/sound.c
@@ -0,0 +1,68 @@
+/*
+ *  ReactOS
+ *  Copyright (C) 2004 ReactOS Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+/* $Id: sound.c,v 1.1 2004/06/30 12:16:27 ekohl Exp $
+ *
+ * PROJECT:         ReactOS System Control Panel
+ * FILE:            lib/cpl/system/advanced.c
+ * PURPOSE:         Memory, start-up and profiles settings
+ * PROGRAMMER:      Thomas Weidenmueller (w3seek@users.sourceforge.net)
+ * UPDATE HISTORY:
+ *      03-04-2004  Created
+ */
+#include <windows.h>
+#include <stdlib.h>
+#include "resource.h"
+#include "access.h"
+
+/* Property page dialog callback */
+BOOL CALLBACK
+SoundPageProc(
+  HWND hwndDlg,
+  UINT uMsg,
+  WPARAM wParam,
+  LPARAM lParam
+)
+{
+  switch(uMsg)
+  {
+    case WM_INITDIALOG:
+      break;
+    case WM_COMMAND:
+    {
+      switch(LOWORD(wParam))
+      {
+        case IDC_SENTRY_BOX:
+        {
+          break;
+        }
+        case IDC_SENTRY_BUTTON:
+        {
+          break;
+        }
+        case IDC_SSHOW_BOX:
+        {
+          break;
+        }
+        default:  
+          break;
+      }
+    }
+  }
+  return FALSE;
+}

From 9eefe9985c592c92efcc504ad6034d2d6923b5c5 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Wed, 30 Jun 2004 12:20:35 +0000
Subject: [PATCH 145/356] Add control panel icon.

svn path=/trunk/; revision=9946
---
 reactos/lib/cpl/access/resources/applet.ico | Bin 0 -> 1398 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 reactos/lib/cpl/access/resources/applet.ico

diff --git a/reactos/lib/cpl/access/resources/applet.ico b/reactos/lib/cpl/access/resources/applet.ico
new file mode 100644
index 0000000000000000000000000000000000000000..3eae16df58c7f5b9a6b80827d788f7416afccbda
GIT binary patch
literal 1398
zcmds1v2MaJ5Pcy?>6oosVPx#onJ?g5x|yL8-r%#mb?JxX50cHi7sup4K?u<bsV_O-
zJ)bW=TbBb0lvpln>N%Pj@Bxs|$P2s|z*`B_b@H#sH*;X6HIy|)ae`;;G(4U3c%KwU
zng}6K%Mtq*G0LLw(UgYY#`a*~ft@q>4}8aK8_?=J=D_=@^L_oC@Gbu>Zm!E|ecnu(
z+`8Q-9)<n7>;RO1DVO`5*Ex${7*rzT$k>q>YY}5t123;JHup-7leVI7nk`P|W&Ys_
z_r*N>-jMqObGQP}o<J9SK(9E`e5fx}>F-9>st~smS_|yFs$V?oA+Ep34wa~LO!6G5
MKQVRI!ab7Xj@&-27XSbN

literal 0
HcmV?d00001


From 3ec9c96584b6a3b2285089c2c47e69c49ef55f98 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Wed, 30 Jun 2004 12:21:20 +0000
Subject: [PATCH 146/356] Add accessibility control panel.

svn path=/trunk/; revision=9947
---
 reactos/lib/cpl/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reactos/lib/cpl/Makefile b/reactos/lib/cpl/Makefile
index 21e4b0b27f9..cfe388ce48b 100644
--- a/reactos/lib/cpl/Makefile
+++ b/reactos/lib/cpl/Makefile
@@ -6,7 +6,7 @@ PATH_TO_TOP = ../..
 
 include $(PATH_TO_TOP)/rules.mak
 
-CONTROL_PANELS = sysdm appwiz control
+CONTROL_PANELS = access appwiz control sysdm
 
 all: $(CONTROL_PANELS)
 

From 3af5a16e60a76bc547c9c78c713d77d7579d6346 Mon Sep 17 00:00:00 2001
From: Steven Edwards <winehacker@gmail.com>
Date: Wed, 30 Jun 2004 19:07:22 +0000
Subject: [PATCH 147/356] Merge in Winehq commits.

svn path=/trunk/; revision=9948
---
 reactos/lib/shell32/classes.c      |  2 +-
 reactos/lib/shell32/shlfsbind.c    | 10 +++++-----
 reactos/lib/shell32/shv_bg_cmenu.c |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/reactos/lib/shell32/classes.c b/reactos/lib/shell32/classes.c
index 21f75721238..5c00c8b4399 100644
--- a/reactos/lib/shell32/classes.c
+++ b/reactos/lib/shell32/classes.c
@@ -265,7 +265,7 @@ BOOL HCR_GetDefaultIconFromGUIDW(REFIID riid, LPWSTR szDest, DWORD len, LPDWORD
 *
 * Gets the name of a registred class
 */
-static WCHAR swEmpty[] = {0};
+static const WCHAR swEmpty[] = {0};
 
 BOOL HCR_GetClassNameW(REFIID riid, LPWSTR szDest, DWORD len)
 {	
diff --git a/reactos/lib/shell32/shlfsbind.c b/reactos/lib/shell32/shlfsbind.c
index 75ea638f5d5..a5a0dc52a8b 100644
--- a/reactos/lib/shell32/shlfsbind.c
+++ b/reactos/lib/shell32/shlfsbind.c
@@ -58,11 +58,11 @@ static struct ICOM_VTABLE(IFileSystemBindData) sbvt =
     IFileSystemBindData_fnQueryInterface,
     IFileSystemBindData_fnAddRef,
     IFileSystemBindData_fnRelease,
-    IFileSystemBindData_fnSetFindData,
     IFileSystemBindData_fnGetFindData,
+    IFileSystemBindData_fnSetFindData,
 };
 
-static WCHAR wFileSystemBindData[] = {'F','i','l','e',' ','S','y','s','t','e','m',' ','B','i','n','d','D','a','t','a',0};
+static const WCHAR wFileSystemBindData[] = {'F','i','l','e',' ','S','y','s','t','e','m',' ','B','i','n','d','D','a','t','a',0};
 
 HRESULT WINAPI IFileSystemBindData_Constructor(const WIN32_FIND_DATAW *pfd, LPBC *ppV)
 {
@@ -93,7 +93,7 @@ HRESULT WINAPI IFileSystemBindData_Constructor(const WIN32_FIND_DATAW *pfd, LPBC
 	  bindOpts.grfMode = STGM_CREATE;
 	  bindOpts.dwTickCountDeadline = 0;
 	  IBindCtx_SetBindOptions(*ppV, &bindOpts);
-	  IBindCtx_RegisterObjectParam(*ppV, wFileSystemBindData, (LPUNKNOWN)sb);
+	  IBindCtx_RegisterObjectParam(*ppV, (LPOLESTR)wFileSystemBindData, (LPUNKNOWN)sb);
 
 	  IFileSystemBindData_Release((IFileSystemBindData*)sb);
 	}
@@ -113,7 +113,7 @@ HRESULT WINAPI FileSystemBindData_GetFindData(LPBC pbc, WIN32_FIND_DATAW *pfd)
 	if (!pfd)
 	  return E_INVALIDARG;
 
-	ret = IBindCtx_GetObjectParam(pbc, wFileSystemBindData, &pUnk);
+	ret = IBindCtx_GetObjectParam(pbc, (LPOLESTR)wFileSystemBindData, &pUnk);
 	if (SUCCEEDED(ret))
 	{
 	  ret = IUnknown_QueryInterface(pUnk, &IID_IFileSystemBindData, (LPVOID *)&pfsbd);
@@ -135,7 +135,7 @@ HRESULT WINAPI FileSystemBindData_SetFindData(LPBC pbc, const WIN32_FIND_DATAW *
 	
 	TRACE("%p, %p\n", pbc, pfd);
 
-	ret = IBindCtx_GetObjectParam(pbc, wFileSystemBindData, &pUnk);
+	ret = IBindCtx_GetObjectParam(pbc, (LPOLESTR)wFileSystemBindData, &pUnk);
 	if (SUCCEEDED(ret))
 	{
 	  ret = IUnknown_QueryInterface(pUnk, &IID_IFileSystemBindData, (LPVOID *)&pfsbd);
diff --git a/reactos/lib/shell32/shv_bg_cmenu.c b/reactos/lib/shell32/shv_bg_cmenu.c
index cfc1fc136be..c4174fab11f 100644
--- a/reactos/lib/shell32/shv_bg_cmenu.c
+++ b/reactos/lib/shell32/shv_bg_cmenu.c
@@ -223,7 +223,7 @@ static BOOL DoPaste(
 
 	TRACE("\n");
 
-	if(SUCCEEDED(pOleGetClipboard(&pda)))
+	if(SUCCEEDED(OleGetClipboard(&pda)))
 	{
 	  STGMEDIUM medium;
 	  FORMATETC formatetc;
@@ -277,7 +277,7 @@ static BOOL DoPaste(
 	    SHFree(pidl);
 
 	    /* release the medium*/
-	    pReleaseStgMedium(&medium);
+	    ReleaseStgMedium(&medium);
 	  }
 	  IDataObject_Release(pda);
 	}

From 458aec49c1d3dbbb2be31dd1feaf4223ed6da361 Mon Sep 17 00:00:00 2001
From: Steven Edwards <winehacker@gmail.com>
Date: Wed, 30 Jun 2004 19:14:24 +0000
Subject: [PATCH 148/356] Merge in Winehq commits.

svn path=/trunk/; revision=9949
---
 reactos/lib/shell32/shell.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reactos/lib/shell32/shell.c b/reactos/lib/shell32/shell.c
index 419e2fd0ab2..b6307a7beea 100644
--- a/reactos/lib/shell32/shell.c
+++ b/reactos/lib/shell32/shell.c
@@ -611,7 +611,7 @@ DWORD WINAPI RegEnumKey16( HKEY hkey, DWORD index, LPSTR name, DWORD name_len )
 /*************************************************************************
  *           SHELL_Execute16 [Internal]
  */
-static UINT SHELL_Execute16(const WCHAR *lpCmd, void *env, BOOL shWait,
+static UINT SHELL_Execute16(const WCHAR *lpCmd, WCHAR *env, BOOL shWait,
 			    LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out)
 {
     UINT ret;

From e050a4dd0303a89514833619ac7140d3d023e211 Mon Sep 17 00:00:00 2001
From: Steven Edwards <winehacker@gmail.com>
Date: Wed, 30 Jun 2004 20:19:25 +0000
Subject: [PATCH 149/356] Merge in Winehq commits.

svn path=/trunk/; revision=9950
---
 reactos/lib/shell32/enumidlist.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/reactos/lib/shell32/enumidlist.c b/reactos/lib/shell32/enumidlist.c
index 4ce2e7257c2..07122012bb9 100644
--- a/reactos/lib/shell32/enumidlist.c
+++ b/reactos/lib/shell32/enumidlist.c
@@ -21,7 +21,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
-
 #include "wine/debug.h"
 #include "windef.h"
 #include "winbase.h"

From 8eb23c9e6c2b190dc0152a341b8c99b346511e87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Wed, 30 Jun 2004 20:40:02 +0000
Subject: [PATCH 150/356] Fix IFileSystemBindData method order again.

svn path=/trunk/; revision=9951
---
 reactos/lib/shell32/shlfsbind.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reactos/lib/shell32/shlfsbind.c b/reactos/lib/shell32/shlfsbind.c
index a5a0dc52a8b..0804b1bb6db 100644
--- a/reactos/lib/shell32/shlfsbind.c
+++ b/reactos/lib/shell32/shlfsbind.c
@@ -58,8 +58,8 @@ static struct ICOM_VTABLE(IFileSystemBindData) sbvt =
     IFileSystemBindData_fnQueryInterface,
     IFileSystemBindData_fnAddRef,
     IFileSystemBindData_fnRelease,
-    IFileSystemBindData_fnGetFindData,
     IFileSystemBindData_fnSetFindData,
+    IFileSystemBindData_fnGetFindData,
 };
 
 static const WCHAR wFileSystemBindData[] = {'F','i','l','e',' ','S','y','s','t','e','m',' ','B','i','n','d','D','a','t','a',0};

From 6cfb2b5848861648701aa03ae8da2733b2b13bba Mon Sep 17 00:00:00 2001
From: Steven Edwards <winehacker@gmail.com>
Date: Wed, 30 Jun 2004 20:42:18 +0000
Subject: [PATCH 151/356] Merge in Winehq commits.

svn path=/trunk/; revision=9952
---
 reactos/lib/shell32/brsfolder.c | 11 ++++++-----
 reactos/lib/shell32/shlfileop.c | 17 ++++++++++++++---
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/reactos/lib/shell32/brsfolder.c b/reactos/lib/shell32/brsfolder.c
index 9110ed2515e..944117fdd05 100644
--- a/reactos/lib/shell32/brsfolder.c
+++ b/reactos/lib/shell32/brsfolder.c
@@ -391,7 +391,8 @@ static INT_PTR CALLBACK BrsFolderDlgProc(HWND hWnd, UINT msg, WPARAM wParam,
 	    switch (wParam)
 	    { case IDOK:
 	        pdump ( pidlRet );
-	        SHGetPathFromIDListW(pidlRet, lpBrowseInfo->pszDisplayName);
+		if (lpBrowseInfo->pszDisplayName)
+	            SHGetPathFromIDListW(pidlRet, lpBrowseInfo->pszDisplayName);
 	        EndDialog(hWnd, (DWORD) ILClone(pidlRet));
 	        return TRUE;
 
@@ -438,7 +439,7 @@ static INT_PTR CALLBACK BrsFolderDlgProc(HWND hWnd, UINT msg, WPARAM wParam,
 	return FALSE;
 }
 
-static WCHAR swBrowseTempName[] = {'S','H','B','R','S','F','O','R','F','O','L','D','E','R','_','M','S','G','B','O','X',0};
+static const WCHAR swBrowseTempName[] = {'S','H','B','R','S','F','O','R','F','O','L','D','E','R','_','M','S','G','B','O','X',0};
 
 /*************************************************************************
  * SHBrowseForFolderA [SHELL32.@]
@@ -460,9 +461,9 @@ LPITEMIDLIST WINAPI SHBrowseForFolderA (LPBROWSEINFOA lpbi)
 	bi.pidlRoot = lpbi->pidlRoot;
 	if (lpbi->pszDisplayName)
 	{
-	  len = MultiByteToWideChar(CP_ACP, 0, lpbi->pszDisplayName, -1, NULL, 0);
-	  bi.pszDisplayName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
-	  MultiByteToWideChar(CP_ACP, 0, lpbi->pszDisplayName, -1, bi.pszDisplayName, len);
+	  /*lpbi->pszDisplayName is assumed to be MAX_PATH (MSDN) */
+	  bi.pszDisplayName = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR));
+	  MultiByteToWideChar(CP_ACP, 0, lpbi->pszDisplayName, -1, bi.pszDisplayName, MAX_PATH);
 	}
 	else
 	  bi.pszDisplayName = NULL;
diff --git a/reactos/lib/shell32/shlfileop.c b/reactos/lib/shell32/shlfileop.c
index bae85725e06..2acb2ed6004 100644
--- a/reactos/lib/shell32/shlfileop.c
+++ b/reactos/lib/shell32/shlfileop.c
@@ -53,9 +53,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
 #define FO_MASK         0xF
 
 CHAR aWildcardFile[] = {'*','.','*',0};
-WCHAR wWildcardFile[] = {'*','.','*',0};
-WCHAR wWildcardChars[] = {'*','?',0};
-WCHAR wBackslash[] = {'\\',0};
+static const WCHAR wWildcardFile[] = {'*','.','*',0};
+static const WCHAR wWildcardChars[] = {'*','?',0};
+static const WCHAR wBackslash[] = {'\\',0};
 
 static DWORD SHNotifyCreateDirectoryA(LPCSTR path, LPSECURITY_ATTRIBUTES sec);
 static DWORD SHNotifyCreateDirectoryW(LPCWSTR path, LPSECURITY_ATTRIBUTES sec);
@@ -1310,3 +1310,14 @@ BOOL WINAPI IsNetDrive(DWORD drive)
 	root[0] += (char)drive;
 	return (GetDriveTypeA(root) == DRIVE_REMOTE);
 }
+
+
+/*************************************************************************
+ * RealDriveType                [SHELL32.524]
+ */
+INT WINAPI RealDriveType(INT drive, BOOL bQueryNet)
+{
+    char root[] = "A:\\";
+    root[0] += (char)drive;
+    return GetDriveTypeA(root);
+}

From aa33e159659e5635c351e92d9f2fc35305d76774 Mon Sep 17 00:00:00 2001
From: Steven Edwards <winehacker@gmail.com>
Date: Wed, 30 Jun 2004 20:51:45 +0000
Subject: [PATCH 152/356] Merge in Winehq commits. - not enabled yet

svn path=/trunk/; revision=9953
---
 reactos/lib/shell32/autocomplete.c | 645 +++++++++++++++++++++++++++++
 1 file changed, 645 insertions(+)
 create mode 100644 reactos/lib/shell32/autocomplete.c

diff --git a/reactos/lib/shell32/autocomplete.c b/reactos/lib/shell32/autocomplete.c
new file mode 100644
index 00000000000..50460c4bec9
--- /dev/null
+++ b/reactos/lib/shell32/autocomplete.c
@@ -0,0 +1,645 @@
+/*
+ *	AutoComplete interfaces implementation.
+ *
+ *	Copyright 2004	Maxime Bellengé <maxime.bellenge@laposte.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/*
+  Implemented:
+  - ACO_AUTOAPPEND style
+  - ACO_AUTOSUGGEST style
+  - ACO_UPDOWNKEYDROPSLIST style
+
+  - Handle pwzsRegKeyPath and pwszQuickComplete in Init
+
+  TODO:
+  - implement ACO_SEARCH style
+  - implement ACO_FILTERPREFIXES style
+  - implement ACO_USETAB style
+  - implement ACO_RTLREADING style
+  
+ */
+#include "config.h"
+
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include "wine/debug.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
+#include "undocshell.h"
+#include "shlwapi.h"
+#include "winerror.h"
+#include "objbase.h"
+
+#include "pidl.h"
+#include "shlguid.h"
+#include "shlobj.h"
+#include "shldisp.h"
+#include "debughlp.h"
+
+#include "wine/unicode.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
+
+typedef struct
+{
+    ICOM_VFIELD(IAutoComplete);
+    ICOM_VTABLE (IAutoComplete2) * lpvtblAutoComplete2;
+    DWORD ref;
+    BOOL  enabled;
+    HWND hwndEdit;
+    HWND hwndListBox;
+    WNDPROC wpOrigEditProc;
+    WNDPROC wpOrigLBoxProc;
+    WCHAR *txtbackup;
+    WCHAR *quickComplete;
+    IEnumString *enumstr;
+    AUTOCOMPLETEOPTIONS options;
+} IAutoCompleteImpl;
+
+static struct ICOM_VTABLE(IAutoComplete) acvt;
+static struct ICOM_VTABLE(IAutoComplete2) ac2vt;
+
+#define _IAutoComplete2_Offset ((int)(&(((IAutoCompleteImpl*)0)->lpvtblAutoComplete2)))
+#define _ICOM_THIS_From_IAutoComplete2(class, name) class* This = (class*)(((char*)name)-_IAutoComplete2_Offset);
+
+/*
+  converts This to a interface pointer
+*/
+#define _IUnknown_(This) (IUnknown*)&(This->lpVtbl)
+#define _IAutoComplete2_(This)  (IAutoComplete2*)&(This->lpvtblAutoComplete2) 
+
+static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+
+/**************************************************************************
+ *  IAutoComplete_Constructor
+ */
+HRESULT WINAPI IAutoComplete_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv)
+{
+    IAutoCompleteImpl *lpac;
+
+    if (pUnkOuter && !IsEqualIID (riid, &IID_IUnknown))
+	return CLASS_E_NOAGGREGATION;
+
+    lpac = (IAutoCompleteImpl*)HeapAlloc(GetProcessHeap(),
+      HEAP_ZERO_MEMORY, sizeof(IAutoCompleteImpl));
+    if (!lpac) 
+	return E_OUTOFMEMORY;
+
+    lpac->ref = 1;
+    lpac->lpVtbl = &acvt;
+    lpac->lpvtblAutoComplete2 = &ac2vt;
+    lpac->enabled = TRUE;
+    lpac->enumstr = NULL;
+    lpac->options = ACO_AUTOAPPEND;
+    lpac->wpOrigEditProc = NULL;
+    lpac->hwndListBox = NULL;
+    lpac->txtbackup = NULL;
+    lpac->quickComplete = NULL;
+    
+    if (!SUCCEEDED (IUnknown_QueryInterface (_IUnknown_ (lpac), riid, ppv))) {
+	IUnknown_Release (_IUnknown_ (lpac));
+	return E_NOINTERFACE;
+    }
+    
+    TRACE("-- (%p)->\n",lpac);
+
+    return S_OK;
+}
+
+/**************************************************************************
+ *  AutoComplete_QueryInterface
+ */
+static HRESULT WINAPI IAutoComplete_fnQueryInterface(
+    IAutoComplete * iface,
+    REFIID riid,
+    LPVOID *ppvObj)
+{
+    ICOM_THIS(IAutoCompleteImpl, iface);
+    
+    TRACE("(%p)->(\n\tIID:\t%s,%p)\n", This, shdebugstr_guid(riid), ppvObj);
+    *ppvObj = NULL;
+
+    if(IsEqualIID(riid, &IID_IUnknown)) 
+    {
+	*ppvObj = This;
+    } 
+    else if(IsEqualIID(riid, &IID_IAutoComplete))
+    {
+	*ppvObj = (IAutoComplete*)This;
+    }
+    else if(IsEqualIID(riid, &IID_IAutoComplete2))
+    {
+	*ppvObj = _IAutoComplete2_ (This);
+    }
+
+    if (*ppvObj)
+    {
+	IAutoComplete_AddRef((IAutoComplete*)*ppvObj);
+	TRACE("-- Interface: (%p)->(%p)\n", ppvObj, *ppvObj);
+	return S_OK;
+    }
+    TRACE("-- Interface: E_NOINTERFACE\n");
+    return E_NOINTERFACE;	
+}
+
+/******************************************************************************
+ * IAutoComplete_fnAddRef
+ */
+static ULONG WINAPI IAutoComplete_fnAddRef(
+	IAutoComplete * iface)
+{
+    ICOM_THIS(IAutoCompleteImpl,iface);
+    
+    TRACE("(%p)->(%lu)\n",This,This->ref);
+    return ++(This->ref);
+}
+
+/******************************************************************************
+ * IAutoComplete_fnRelease
+ */
+static ULONG WINAPI IAutoComplete_fnRelease(
+	IAutoComplete * iface)
+{
+    ICOM_THIS(IAutoCompleteImpl,iface);
+    
+    TRACE("(%p)->(%lu)\n",This,This->ref);
+
+    if (!--(This->ref)) {
+	TRACE(" destroying IAutoComplete(%p)\n",This);
+	if (This->quickComplete)
+	    HeapFree(GetProcessHeap(), 0, This->quickComplete);
+	if (This->txtbackup)
+	    HeapFree(GetProcessHeap(), 0, This->txtbackup);
+	if (This->hwndListBox)
+	    DestroyWindow(This->hwndListBox);
+	if (This->enumstr)
+	    IEnumString_Release(This->enumstr);
+	HeapFree(GetProcessHeap(), 0, This);
+	return 0;
+    }
+    return This->ref;
+}
+
+/******************************************************************************
+ * IAutoComplete_fnEnable
+ */
+static HRESULT WINAPI IAutoComplete_fnEnable(
+    IAutoComplete * iface,
+    BOOL fEnable)
+{
+    ICOM_THIS(IAutoCompleteImpl, iface);
+
+    HRESULT hr = S_OK;
+
+    TRACE("(%p)->(%s)\n", This, (fEnable)?"true":"false");
+
+    This->enabled = fEnable;
+
+    return hr;
+}
+
+/******************************************************************************
+ * IAutoComplete_fnInit
+ */
+static HRESULT WINAPI IAutoComplete_fnInit(
+    IAutoComplete * iface,
+    HWND hwndEdit,
+    IUnknown *punkACL,
+    LPCOLESTR pwzsRegKeyPath,
+    LPCOLESTR pwszQuickComplete)
+{
+    ICOM_THIS(IAutoCompleteImpl, iface);
+    static const WCHAR lbName[] = {'L','i','s','t','B','o','x',0};
+
+    TRACE("(%p)->(0x%08lx, %p, %s, %s)\n", 
+	  This, (long)hwndEdit, punkACL, debugstr_w(pwzsRegKeyPath), debugstr_w(pwszQuickComplete));
+
+    if (This->options & ACO_AUTOSUGGEST) TRACE(" ACO_AUTOSUGGEST\n");
+    if (This->options & ACO_AUTOAPPEND) TRACE(" ACO_AUTOAPPEND\n");
+    if (This->options & ACO_SEARCH) FIXME(" ACO_SEARCH not supported\n");
+    if (This->options & ACO_FILTERPREFIXES) FIXME(" ACO_FILTERPREFIXES not supported\n");
+    if (This->options & ACO_USETAB) FIXME(" ACO_USETAB not supported\n");
+    if (This->options & ACO_UPDOWNKEYDROPSLIST) TRACE(" ACO_UPDOWNKEYDROPSLIST\n");
+    if (This->options & ACO_RTLREADING) FIXME(" ACO_RTLREADING not supported\n");
+
+    This->hwndEdit = hwndEdit;
+
+    if (!SUCCEEDED (IUnknown_QueryInterface (punkACL, &IID_IEnumString, (LPVOID*)&This->enumstr))) {
+	TRACE("No IEnumString interface\n");
+	return  E_NOINTERFACE;
+    }
+
+    This->wpOrigEditProc = (WNDPROC) SetWindowLongPtrW( hwndEdit, GWLP_WNDPROC, (LONG_PTR) ACEditSubclassProc);
+    SetWindowLongPtrW( hwndEdit, GWLP_USERDATA, (LONG_PTR)This);
+
+    if (This->options & ACO_AUTOSUGGEST) {
+	HWND hwndParent;
+
+	hwndParent = GetParent(This->hwndEdit);
+	
+	/* FIXME : The listbox should be resizable with the mouse. WS_THICKFRAME looks ugly */
+	This->hwndListBox = CreateWindowExW(0, lbName, NULL, 
+					    WS_BORDER | WS_CHILD | WS_VSCROLL | LBS_HASSTRINGS | LBS_NOTIFY | LBS_NOINTEGRALHEIGHT, 
+					    CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
+					    hwndParent, NULL, 
+					    (HINSTANCE)GetWindowLongA( hwndParent, GWL_HINSTANCE ), NULL);
+					    
+	if (This->hwndListBox) {
+	    This->wpOrigLBoxProc = (WNDPROC) SetWindowLongPtrW( This->hwndListBox, GWLP_WNDPROC, (LONG_PTR) ACLBoxSubclassProc);
+	    SetWindowLongPtrW( This->hwndListBox, GWLP_USERDATA, (LONG_PTR)This);
+	}
+    }
+
+    if (pwzsRegKeyPath) {
+	WCHAR *key;
+	WCHAR result[MAX_PATH];
+	WCHAR *value;
+	HKEY hKey = 0;
+	LONG res;
+	LONG len;
+
+	/* pwszRegKeyPath contains the key as well as the value, so we split */
+	key = (WCHAR*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (lstrlenW(pwzsRegKeyPath)+1)*sizeof(WCHAR));
+	strcpyW(key, pwzsRegKeyPath);
+	value = strrchrW(key, '\\');
+	*value = 0;
+	value++;
+	/* Now value contains the value and buffer the key */
+	res = RegOpenKeyExW(HKEY_CURRENT_USER, key, 0, KEY_READ, &hKey);
+	if (res != ERROR_SUCCESS) {
+	    /* if the key is not found, MSDN states we must seek in HKEY_LOCAL_MACHINE */
+	    res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, key, 0, KEY_READ, &hKey);  
+	}
+	if (res == ERROR_SUCCESS) {
+	    res = RegQueryValueW(hKey, value, result, &len);
+	    if (res == ERROR_SUCCESS) {
+		This->quickComplete = (WCHAR*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len*sizeof(WCHAR));
+		strcpyW(This->quickComplete, result);
+	    }
+	    RegCloseKey(hKey);
+	}
+	HeapFree(GetProcessHeap(), 0, key);
+    }
+
+    if ((pwszQuickComplete) && (!This->quickComplete)) {
+	This->quickComplete = (WCHAR*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (lstrlenW(pwszQuickComplete)+1)*sizeof(WCHAR));
+	lstrcpyW(This->quickComplete, pwszQuickComplete);
+    }
+
+    return S_OK;
+}
+
+/**************************************************************************
+ *  IAutoComplete_fnVTable
+ */
+static ICOM_VTABLE (IAutoComplete) acvt =
+{
+    ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+    IAutoComplete_fnQueryInterface,
+    IAutoComplete_fnAddRef,
+    IAutoComplete_fnRelease,
+    IAutoComplete_fnInit,
+    IAutoComplete_fnEnable,
+};
+
+/**************************************************************************
+ *  AutoComplete2_QueryInterface
+ */
+static HRESULT WINAPI IAutoComplete2_fnQueryInterface(
+    IAutoComplete2 * iface,
+    REFIID riid,
+    LPVOID *ppvObj)
+{
+    _ICOM_THIS_From_IAutoComplete2(IAutoCompleteImpl, iface);
+
+    TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj);
+
+    return IAutoComplete_QueryInterface((IAutoComplete*)This, riid, ppvObj);
+}
+
+/******************************************************************************
+ * IAutoComplete2_fnAddRef
+ */
+static ULONG WINAPI IAutoComplete2_fnAddRef(
+	IAutoComplete2 * iface)
+{
+    _ICOM_THIS_From_IAutoComplete2(IAutoCompleteImpl,iface);
+
+    TRACE ("(%p)->(count=%lu)\n", This, This->ref);
+
+    return IAutoComplete2_AddRef((IAutoComplete*)This);
+}
+
+/******************************************************************************
+ * IAutoComplete2_fnRelease
+ */
+static ULONG WINAPI IAutoComplete2_fnRelease(
+	IAutoComplete2 * iface)
+{
+    _ICOM_THIS_From_IAutoComplete2(IAutoCompleteImpl,iface);
+
+    TRACE ("(%p)->(count=%lu)\n", This, This->ref);
+
+    return IAutoComplete_Release((IAutoComplete*)This);
+}
+
+/******************************************************************************
+ * IAutoComplete2_fnEnable
+ */
+static HRESULT WINAPI IAutoComplete2_fnEnable(
+    IAutoComplete2 * iface,
+    BOOL fEnable)
+{
+    _ICOM_THIS_From_IAutoComplete2(IAutoCompleteImpl, iface);
+
+    TRACE ("(%p)->(%s)\n", This, (fEnable)?"true":"false");
+
+    return IAutoComplete_Enable((IAutoComplete*)This, fEnable);
+}
+
+/******************************************************************************
+ * IAutoComplete2_fnInit
+ */
+static HRESULT WINAPI IAutoComplete2_fnInit(
+    IAutoComplete2 * iface,
+    HWND hwndEdit,
+    IUnknown *punkACL,
+    LPCOLESTR pwzsRegKeyPath,
+    LPCOLESTR pwszQuickComplete)
+{
+    _ICOM_THIS_From_IAutoComplete2(IAutoCompleteImpl, iface);
+
+    TRACE("(%p)\n", This);
+
+    return IAutoComplete_Init((IAutoComplete*)This, hwndEdit, punkACL, pwzsRegKeyPath, pwszQuickComplete);
+}
+
+/**************************************************************************
+ *  IAutoComplete_fnGetOptions
+ */
+static HRESULT WINAPI IAutoComplete2_fnGetOptions(
+    IAutoComplete2 * iface,
+    DWORD *pdwFlag)
+{
+    HRESULT hr = S_OK;
+
+    _ICOM_THIS_From_IAutoComplete2(IAutoCompleteImpl, iface);
+
+    TRACE("(%p) -> (%p)\n", This, pdwFlag);
+
+    *pdwFlag = This->options;
+
+    return hr;
+}
+
+/**************************************************************************
+ *  IAutoComplete_fnSetOptions
+ */
+static HRESULT WINAPI IAutoComplete2_fnSetOptions(
+    IAutoComplete2 * iface,
+    DWORD dwFlag)
+{
+    HRESULT hr = S_OK;
+
+    _ICOM_THIS_From_IAutoComplete2(IAutoCompleteImpl, iface);
+
+    TRACE("(%p) -> (0x%lx)\n", This, dwFlag);
+
+    This->options = dwFlag;
+
+    return hr;
+}
+
+/**************************************************************************
+ *  IAutoComplete2_fnVTable
+ */
+static ICOM_VTABLE (IAutoComplete2) ac2vt =
+{
+    ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+    IAutoComplete2_fnQueryInterface,
+    IAutoComplete2_fnAddRef,
+    IAutoComplete2_fnRelease,
+    IAutoComplete2_fnInit,
+    IAutoComplete2_fnEnable,
+    /* IAutoComplete2 */
+    IAutoComplete2_fnSetOptions,
+    IAutoComplete2_fnGetOptions,
+};
+
+/*
+  Window procedure for autocompletion
+ */
+static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+    ICOM_THIS(IAutoCompleteImpl, GetWindowLongPtrW(hwnd, GWLP_USERDATA));
+    LPOLESTR strs;
+    HRESULT hr;
+    WCHAR hwndText[255];
+    WCHAR *hwndQCText;
+    RECT r;
+    BOOL control, filled, displayall = FALSE;
+    int cpt, height, sel;
+
+    if (!This->enabled) return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam);
+
+    switch (uMsg)
+    {
+	case CB_SHOWDROPDOWN:
+	    ShowWindow(This->hwndListBox, SW_HIDE);
+	    break;
+	case WM_KILLFOCUS:
+	    if ((This->options && ACO_AUTOSUGGEST) && 
+		((HWND)wParam != This->hwndListBox))
+	    {
+		ShowWindow(This->hwndListBox, SW_HIDE);
+	    }
+	    break;
+	case WM_KEYUP:
+	    
+	    GetWindowTextW( hwnd, (LPWSTR)hwndText, 255);
+      
+	    switch(wParam) {
+		case VK_RETURN:
+		    /* If quickComplete is set and control is pressed, replace the string */
+		    control = GetKeyState(VK_CONTROL) & 0x8000;		    
+		    if (control && This->quickComplete) {
+			hwndQCText = (WCHAR*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 
+						       (lstrlenW(This->quickComplete)+lstrlenW(hwndText))*sizeof(WCHAR));
+			sel = sprintfW(hwndQCText, This->quickComplete, hwndText);
+			SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)hwndQCText);
+			SendMessageW(hwnd, EM_SETSEL, 0, sel);
+			HeapFree(GetProcessHeap(), 0, hwndQCText);
+		    }
+
+		    ShowWindow(This->hwndListBox, SW_HIDE);
+		    return 0;
+		case VK_LEFT:
+		case VK_RIGHT:
+		    return 0;
+		case VK_UP:	      
+		case VK_DOWN:
+		    /* Two cases here : 
+		       - if the listbox is not visible, displays it 
+		       with all the entries if the style ACO_UPDOWNKEYDROPSLIST
+		       is present but does not select anything.
+		       - if the listbox is visible, change the selection
+		    */
+		    if ( (This->options & (ACO_AUTOSUGGEST | ACO_UPDOWNKEYDROPSLIST)) 
+			 && (!IsWindowVisible(This->hwndListBox) && (! *hwndText)) )
+		    {
+			 /* We must dispays all the entries */
+			 displayall = TRUE;
+		    } else {
+			if (IsWindowVisible(This->hwndListBox)) {
+			    int count;
+
+			    count = SendMessageW(This->hwndListBox, LB_GETCOUNT, 0, 0);
+			    /* Change the selection */
+			    sel = SendMessageW(This->hwndListBox, LB_GETCURSEL, 0, 0);
+			    if (wParam == VK_UP)
+				sel = ((sel-1)<0)?count-1:sel-1;
+			    else
+				sel = ((sel+1)>= count)?-1:sel+1;
+			    SendMessageW(This->hwndListBox, LB_SETCURSEL, sel, 0);
+			    if (sel != -1) {
+				WCHAR *msg;
+				int len;
+				
+				len = SendMessageW(This->hwndListBox, LB_GETTEXTLEN, sel, (LPARAM)NULL);
+				msg = (WCHAR*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (len+1)*sizeof(WCHAR));
+				SendMessageW(This->hwndListBox, LB_GETTEXT, sel, (LPARAM)msg);
+				SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)msg);
+				SendMessageW(hwnd, EM_SETSEL, lstrlenW(msg), lstrlenW(msg));
+				HeapFree(GetProcessHeap(), 0, msg);
+			    } else {
+				SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)This->txtbackup);
+				SendMessageW(hwnd, EM_SETSEL, lstrlenW(This->txtbackup), lstrlenW(This->txtbackup));
+			    }			
+			} 		
+			return 0;
+		    }
+		    break;
+		case VK_BACK:
+		case VK_DELETE:
+		    if ((! *hwndText) && (This->options & ACO_AUTOSUGGEST)) {
+			ShowWindow(This->hwndListBox, SW_HIDE);
+			return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam);
+		    }
+		    if (This->options & ACO_AUTOAPPEND) {
+			DWORD b;
+			SendMessageW(hwnd, EM_GETSEL, (WPARAM)&b, (LPARAM)NULL);
+			if (b>1) {
+			    hwndText[b-1] = '\0';
+			} else {
+			    hwndText[0] = '\0';
+			    SetWindowTextW(hwnd, hwndText); 
+			}			
+		    }
+		    break;
+		default:		    
+		    ;
+	    }
+      
+	    SendMessageW(This->hwndListBox, LB_RESETCONTENT, 0, 0);
+
+	    HeapFree(GetProcessHeap(), 0, This->txtbackup);
+	    This->txtbackup = (WCHAR*) HeapAlloc(GetProcessHeap(),
+						 HEAP_ZERO_MEMORY, lstrlenW(hwndText)*sizeof(WCHAR));							      
+	    lstrcpyW(This->txtbackup, hwndText);
+
+	    /* Returns if there is no text to search and we doesn't want to display all the entries */
+	    if ((!displayall) && (! *hwndText) )
+		break;
+	    
+	    IEnumString_Reset(This->enumstr);
+	    filled = FALSE;
+	    for(cpt = 0;;) {
+		hr = IEnumString_Next(This->enumstr, 1, &strs, NULL);
+		if (hr != S_OK)
+		    break;
+
+		if ((LPWSTR)strstrW(strs, hwndText) == strs) {
+		    
+		    if (This->options & ACO_AUTOAPPEND) {
+			SetWindowTextW(hwnd, strs);
+			SendMessageW(hwnd, EM_SETSEL, lstrlenW(hwndText), lstrlenW(strs));
+			break;
+		    }		
+
+		    if (This->options & ACO_AUTOSUGGEST) {
+			SendMessageW(This->hwndListBox, LB_ADDSTRING, 0, (LPARAM)strs);
+			filled = TRUE;
+			cpt++;
+		    }
+		}		
+	    }
+	    
+	    if (This->options & ACO_AUTOSUGGEST) {
+		if (filled) {
+		    height = SendMessageW(This->hwndListBox, LB_GETITEMHEIGHT, 0, 0);
+		    SendMessageW(This->hwndListBox, LB_CARETOFF, 0, 0);
+		    GetWindowRect(hwnd, &r);
+		    SetParent(This->hwndListBox, HWND_DESKTOP);
+		    /* It seems that Windows XP displays 7 lines at most 
+		       and otherwise displays a vertical scroll bar */
+		    SetWindowPos(This->hwndListBox, HWND_TOP, 
+				 r.left, r.bottom + 1, r.right - r.left, min(height * 7, height*(cpt+1)), 
+				 SWP_SHOWWINDOW );
+		} else {
+		    ShowWindow(This->hwndListBox, SW_HIDE);
+		}
+	    }
+	    
+	    break; 
+	default:
+	    return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam);
+	    
+    }
+
+    return 0;
+}
+
+static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+    ICOM_THIS(IAutoCompleteImpl, GetWindowLongPtrW(hwnd, GWLP_USERDATA));
+    WCHAR *msg;
+    int sel = -1, len;
+
+    switch (uMsg) {
+	case WM_MOUSEMOVE:
+	    sel = SendMessageW(hwnd, LB_ITEMFROMPOINT, 0, lParam);
+	    SendMessageW(hwnd, LB_SETCURSEL, (WPARAM)sel, (LPARAM)0);
+	    break;
+	case WM_LBUTTONDOWN:
+	    len = SendMessageW(This->hwndListBox, LB_GETTEXTLEN, sel, (LPARAM)NULL);
+	    msg = (WCHAR*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (len+1)*sizeof(WCHAR));
+	    sel = (INT)SendMessageW(hwnd, LB_GETCURSEL, 0, 0);
+	    SendMessageW(hwnd, LB_GETTEXT, sel, (LPARAM)msg);
+	    SendMessageW(This->hwndEdit, WM_SETTEXT, 0, (LPARAM)msg);
+	    SendMessageW(This->hwndEdit, EM_SETSEL, 0, lstrlenW(msg));
+	    ShowWindow(hwnd, SW_HIDE);
+	    HeapFree(GetProcessHeap(), 0, msg);
+	    break;
+	default:
+	    return CallWindowProcW(This->wpOrigLBoxProc, hwnd, uMsg, wParam, lParam);
+    }
+    return 0;
+}

From 209e1d76923dd8a61ec6612353fb35d52acd9ab2 Mon Sep 17 00:00:00 2001
From: Royce Mitchell III <royce3@ev1.net>
Date: Thu, 1 Jul 2004 01:52:37 +0000
Subject: [PATCH 153/356] cleanup/reformat syscall code, save return value as
 soon as possible so that eax is freed up, which also simplifies the
 implementation of KiAfterSystemCallHook(), also removes a couple redundant
 instructions.

svn path=/trunk/; revision=9955
---
 reactos/ntoskrnl/ke/i386/syscall.S  | 413 +++++++++++++++-------------
 reactos/ntoskrnl/ke/i386/usercall.c |  12 +-
 2 files changed, 222 insertions(+), 203 deletions(-)

diff --git a/reactos/ntoskrnl/ke/i386/syscall.S b/reactos/ntoskrnl/ke/i386/syscall.S
index f843f97599c..db7a885abe7 100644
--- a/reactos/ntoskrnl/ke/i386/syscall.S
+++ b/reactos/ntoskrnl/ke/i386/syscall.S
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: syscall.S,v 1.14 2004/04/07 15:35:14 ekohl Exp $
+/* $Id: syscall.S,v 1.15 2004/07/01 01:52:37 royce Exp $
  *
  * FILE:            ntoskrnl/hal/x86/syscall.s
  * PURPOSE:         2E trap handler
@@ -28,6 +28,7 @@
 #include <ddk/status.h>
 #include <internal/i386/segment.h>
 #include <internal/ps.h>
+#include <internal/i386/ke.h>
 #include <roscfg.h>
 
 #define KernelMode  (0)
@@ -41,250 +42,266 @@
 .globl _interrupt_handler2e
 _interrupt_handler2e:
 
-           /* Construct a trap frame on the stack */
+	/* Construct a trap frame on the stack */
 
-	   /* Error code */
-	   pushl	$0     
-	   pushl	%ebp
-	   pushl	%ebx
-	   pushl	%esi
-	   pushl	%edi
-	   pushl	%fs
-	   /* Load PCR selector into fs */
-	   movl		$PCR_SELECTOR, %ebx 
-	   movl		%ebx, %fs
+	/* Error code */
+	pushl $0
+	pushl %ebp
+	pushl %ebx
+	pushl %esi
+	pushl %edi
+	pushl %fs
+	/* Load PCR selector into fs */
+	movl  $PCR_SELECTOR, %ebx
+	movl  %ebx, %fs
 
-	   /* Save the old exception list */
-	   movl         %fs:KPCR_EXCEPTION_LIST, %ebx
-	   pushl	%ebx
-	   /* Set the exception handler chain terminator */
-	   movl         $0xffffffff, %fs:KPCR_EXCEPTION_LIST
-	   /* Get a pointer to the current thread */
-	   movl         %fs:KPCR_CURRENT_THREAD, %esi
-	   /* Save the old previous mode */
-	   movl         $0, %ebx
-	   movb         %ss:KTHREAD_PREVIOUS_MODE(%esi), %bl
-	   pushl        %ebx
-           /* Set the new previous mode based on the saved CS selector */
-	   movl	        0x24(%esp), %ebx
-	   andl         $0x0000FFFF, %ebx
-	   cmpl         $KERNEL_CS, %ebx
-	   jne          L1
-	   movb         $KernelMode, %ss:KTHREAD_PREVIOUS_MODE(%esi)
-	   jmp          L3
+	/* Save the old exception list */
+	movl  %fs:KPCR_EXCEPTION_LIST, %ebx
+	pushl %ebx
+	/* Set the exception handler chain terminator */
+	movl  $0xffffffff, %fs:KPCR_EXCEPTION_LIST
+	/* Get a pointer to the current thread */
+	movl  %fs:KPCR_CURRENT_THREAD, %esi
+	/* Save the old previous mode */
+	movl  $0, %ebx
+	movb  %ss:KTHREAD_PREVIOUS_MODE(%esi), %bl
+	pushl %ebx
+	/* Set the new previous mode based on the saved CS selector */
+	movl  0x24(%esp), %ebx
+	andl  $0x0000FFFF, %ebx
+	cmpl  $KERNEL_CS, %ebx
+	jne   L1
+	movb  $KernelMode, %ss:KTHREAD_PREVIOUS_MODE(%esi)
+	jmp   L3
 L1:
-	   movb         $UserMode, %ss:KTHREAD_PREVIOUS_MODE(%esi)
+	movb  $UserMode, %ss:KTHREAD_PREVIOUS_MODE(%esi)
 L3:
 
-	   /* Save other registers */	   
-	   pushl %eax
-	   pushl %ecx
-	   pushl %edx
-	   pushl %ds
-	   pushl %es
-	   pushl %gs
-	   pushl $0     /* DR7 */
-	   pushl $0     /* DR6 */
-	   pushl $0     /* DR3 */
-	   pushl $0     /* DR2 */
-	   pushl $0     /* DR1 */
-	   pushl $0     /* DR0 */
-	   pushl $0     /* XXX: TempESP */
-	   pushl $0     /* XXX: TempCS */
-	   pushl $0     /* XXX: DebugPointer */
-	   pushl $0     /* XXX: DebugArgMark */
+	/* Save other registers */
+	pushl %eax
+	pushl %ecx
+	pushl %edx
+	pushl %ds
+	pushl %es
+	pushl %gs
+	pushl $0     /* DR7 */
+	pushl $0     /* DR6 */
+	pushl $0     /* DR3 */
+	pushl $0     /* DR2 */
+	pushl $0     /* DR1 */
+	pushl $0     /* DR0 */
+	pushl $0     /* XXX: TempESP */
+	pushl $0     /* XXX: TempCS */
+	pushl $0     /* XXX: DebugPointer */
+	pushl $0     /* XXX: DebugArgMark */
 #ifdef DBG
-           /* Trick gdb 6 into backtracing over the system call */
-           movl  4(%ebp), %ebx
-	   pushl %ebx   /* DebugEIP */
-           movl  (%ebp), %ebx
-           pushl %ebx   /* DebugEBP */
+	/* Trick gdb 6 into backtracing over the system call */
+	movl  4(%ebp), %ebx
+	pushl %ebx   /* DebugEIP */
+	movl  (%ebp), %ebx
+	pushl %ebx   /* DebugEBP */
 #else
-	   movl	 0x60(%esp), %ebx
-	   pushl %ebx   /* DebugEIP */
-	   pushl %ebp   /* DebugEBP */
+	movl  0x60(%esp), %ebx
+	pushl %ebx   /* DebugEIP */
+	pushl %ebp   /* DebugEBP */
 #endif
 
-           /* Load the segment registers */
-	   movl  $KERNEL_DS, %ebx
-	   movl  %ebx, %ds
-	   movl  %ebx, %es
-	   movl  %ebx, %gs
+	/* Load the segment registers */
+	movl  $KERNEL_DS, %ebx
+	movl  %ebx, %ds
+	movl  %ebx, %es
+	movl  %ebx, %gs
 
-           /* 
-	    * Save the old trap frame pointer over where we would save the EDX
-	    * register.
-	    */
-           movl KTHREAD_TRAP_FRAME(%esi), %ebx
-	   movl %ebx, 0x3C(%esp)
-	
-	   /* Save a pointer to the trap frame in the TCB */
-	   movl	%esp, KTHREAD_TRAP_FRAME(%esi)
-	 
-           /*  Set ES to kernel segment  */
-           movw $KERNEL_DS,%bx
-           movw %bx,%es
+	/*
+	 * Save the old trap frame pointer over where we would save the EDX
+	 * register.
+	 */
+	movl  KTHREAD_TRAP_FRAME(%esi), %ebx
+	movl  %ebx, KTRAP_FRAME_EDX(%esp)
 
-           /*  Allocate new Kernel stack frame  */
-           movl %esp,%ebp
+	/*  Allocate new Kernel stack frame  */
+	movl  %esp,%ebp
 
-           /*  Users's current stack frame pointer is source  */
-           movl %edx,%esi
+	/* Save a pointer to the trap frame in the TCB */
+	movl  %ebp, KTHREAD_TRAP_FRAME(%esi)
 
-           /*  Determine system service table to use  */
-           cmpl  $0x0fff, %eax
-           ja    new_useShadowTable
+	/*  Set ES to kernel segment  */
+	movw  $KERNEL_DS,%bx
+	movw  %bx,%es
 
-           /*  Check to see if EAX is valid/inrange  */
-           cmpl  %es:_KeServiceDescriptorTable + 8, %eax
-           jbe   new_serviceInRange
-           movl  $STATUS_INVALID_SYSTEM_SERVICE, %eax
-           jmp   KeReturnFromSystemCall
+	/*  Users's current stack frame pointer is source  */
+	movl  %edx,%esi
+
+	/*  Determine system service table to use  */
+	cmpl  $0x0fff, %eax
+	ja    new_useShadowTable
+
+	/*  Check to see if EAX is valid/inrange  */
+	cmpl  %es:_KeServiceDescriptorTable + 8, %eax
+	jbe   new_serviceInRange
+	movl  $STATUS_INVALID_SYSTEM_SERVICE, %eax
+	movl  %eax, KTRAP_FRAME_EAX(%ebp) /* save our return value in PKTRAP_FRAME->Eax */
+	jmp   KeReturnFromSystemCall
 
 new_serviceInRange:
 
 #ifdef DBG
-           /* GDB thinks the function starts here and
-              wants a standard prolog, so let's give it */
-           pushl %ebp
-           movl  %esp,%ebp
-           popl  %ebp
+	/* GDB thinks the function starts here and
+	   wants a standard prolog, so let's give it */
+	pushl %ebp
+	movl  %esp,%ebp
+	popl  %ebp
 #endif
 
-           /*  Allocate room for argument list from kernel stack  */
-           movl  %es:_KeServiceDescriptorTable + 12, %ecx
-           movb  %es:(%ecx, %eax), %cl
-           movzx %cl, %ecx
-           subl  %ecx, %esp
+	/*  Allocate room for argument list from kernel stack  */
+	movl  %es:_KeServiceDescriptorTable + 12, %ecx
+	movb  %es:(%ecx, %eax), %cl
+	movzx %cl, %ecx
+	subl  %ecx, %esp
 
-           /*  Copy the arguments from the user stack to the kernel stack  */
-           movl %esp,%edi
-           cld
-           rep  movsb
+	/*  Copy the arguments from the user stack to the kernel stack  */
+	movl  %esp,%edi
+	cld
+	rep   movsb
 
-           /*  DS is now also kernel segment  */
-           movw %bx, %ds
-	   
-	   /* Call system call hook */
-	   pushl %eax
-	   call _KiSystemCallHook
-	   popl %eax
+	/*  DS is now also kernel segment  */
+	movw  %bx, %ds
 
-           /*  Make the system service call  */
-           movl  %es:_KeServiceDescriptorTable, %ecx
-           movl  %es:(%ecx, %eax, 4), %eax
-           call  *%eax
+	/* Call system call hook */
+	pushl %eax
+	call  _KiSystemCallHook
+	popl  %eax
+
+	/*  Make the system service call  */
+	movl  %es:_KeServiceDescriptorTable, %ecx
+	movl  %es:(%ecx, %eax, 4), %eax
+	call  *%eax
+	movl  %eax, KTRAP_FRAME_EAX(%ebp) /* save our return value in PKTRAP_FRAME->Eax */
 
 #if CHECKED
-           /*  Bump Service Counter  */
+	/*  Bump Service Counter  */
 #endif
 
-           /*  Deallocate the kernel stack frame  */
-           movl %ebp,%esp
-
-	   /* Call the post system call hook and deliver any pending APCs */
-	   pushl %ebp
-	   pushl %eax
-	   call _KiAfterSystemCallHook
-	   addl $8,%esp
-
-           jmp  KeReturnFromSystemCall
+	jmp   KeDeallocateStackAndReturnFromSystemCallWithHook
 
 new_useShadowTable:
 
-           subl  $0x1000, %eax
+	subl  $0x1000, %eax
 
-           /*  Check to see if EAX is valid/inrange  */
-           cmpl  %es:_KeServiceDescriptorTableShadow + 24, %eax
-           jbe   new_shadowServiceInRange
-           movl  $STATUS_INVALID_SYSTEM_SERVICE, %eax
-           jmp   KeReturnFromSystemCall
+	/*  Check to see if EAX is valid/inrange  */
+	cmpl  %es:_KeServiceDescriptorTableShadow + 24, %eax
+	jbe   new_shadowServiceInRange
+	movl  $STATUS_INVALID_SYSTEM_SERVICE, %eax
+	movl  %eax, KTRAP_FRAME_EAX(%ebp) /* save our return value in PKTRAP_FRAME->Eax */
+	jmp   KeReturnFromSystemCall
 
 new_shadowServiceInRange:
 
 #ifdef DBG
-           /* GDB thinks the function starts here and
-              wants a standard prolog, so let's give it */
-           pushl %ebp
-           movl  %esp,%ebp
-           popl  %ebp
+	/* GDB thinks the function starts here and
+	   wants a standard prolog, so let's give it */
+	pushl %ebp
+	movl  %esp,%ebp
+	popl  %ebp
 #endif
 
-           /*  Allocate room for argument list from kernel stack  */
-           movl  %es:_KeServiceDescriptorTableShadow + 28, %ecx
-           movb  %es:(%ecx, %eax), %cl
-           movzx %cl, %ecx
-           subl  %ecx, %esp
+	/*  Allocate room for argument list from kernel stack  */
+	movl  %es:_KeServiceDescriptorTableShadow + 28, %ecx
+	movb  %es:(%ecx, %eax), %cl
+	movzx %cl, %ecx
+	subl  %ecx, %esp
 
-           /*  Copy the arguments from the user stack to the kernel stack  */
-           movl %esp,%edi
-           cld
-           rep movsb
+	/*  Copy the arguments from the user stack to the kernel stack  */
+	movl  %esp,%edi
+	cld
+	rep   movsb
 
-           /*  DS is now also kernel segment  */
-           movw %bx,%ds
+	/*  DS is now also kernel segment  */
+	movw  %bx,%ds
 
-	   /* Call system call hook */
-//	   pushl %eax
-//	   call _KiSystemCallHook
-//	   popl %eax
+	/* Call system call hook */
+//	pushl %eax
+//	call  _KiSystemCallHook
+//	popl  %eax
 
-	   /* Call service check routine */
-	   pushl %eax
-	   call _KiServiceCheck
-	   popl %eax
- 
-           /*  Make the system service call  */
-           movl  %es:_KeServiceDescriptorTableShadow + 16, %ecx
-           movl  %es:(%ecx, %eax, 4), %eax
-           call  *%eax
+	/* Call service check routine */
+	pushl %eax
+	call  _KiServiceCheck
+	popl  %eax
+
+	/*  Make the system service call  */
+	movl  %es:_KeServiceDescriptorTableShadow + 16, %ecx
+	movl  %es:(%ecx, %eax, 4), %eax
+	call  *%eax
+	movl  %eax, KTRAP_FRAME_EAX(%ebp) /* save our return value in PKTRAP_FRAME->Eax */
 
 #if CHECKED
-           /*  Bump Service Counter  */
+	/* Bump Service Counter  */
 #endif
 
-           /*  Deallocate the kernel stack frame  */
-           movl %ebp,%esp
+KeDeallocateStackAndReturnFromSystemCallWithHook:
+	/* Deallocate the kernel stack frame  */
+	movl %ebp,%esp
 
-KeReturnFromSystemCallWithHook:	
-	   /* Call the post system call hook and deliver any pending APCs */
-	   pushl %esp
-	   pushl %eax
-	   call _KiAfterSystemCallHook
-	   addl $8,%esp
+KeReturnFromSystemCallWithHook:
+	/* Call the post system call hook and deliver any pending APCs */
+	pushl %esp
+	call  _KiAfterSystemCallHook
+	addl  $4,%esp
 
 KeReturnFromSystemCall:
-	
-           /* Restore the user context */
-	   /* Get a pointer to the current thread */
-           movl %fs:0x124, %esi
-	
-           /* Restore the old trap frame pointer */
-           movl 0x3c(%esp), %ebx
-	   movl %ebx, KTHREAD_TRAP_FRAME(%esi)
-	
-	   /* Skip debug information and unsaved registers */
-	   addl	$0x30, %esp
-	   popl %gs
-	   popl %es
-	   popl %ds
-	   popl %edx
-	   popl %ecx
-	   addl $0x4, %esp   /* Don't restore eax */
 
-	   /* Restore the old previous mode */
-	   popl %ebx
-	   movb %bl, %ss:KTHREAD_PREVIOUS_MODE(%esi)
+	/* Restore the user context */
+	/* Get a pointer to the current thread */
+	movl  %fs:0x124, %esi
 
-	   /* Restore the old exception handler list */
-	   popl %ebx
-	   movl %ebx, %fs:KPCR_EXCEPTION_LIST
-	
-	   popl %fs 
-	   popl %edi
-	   popl %esi
-	   popl %ebx
-	   popl %ebp
-	   addl $0x4, %esp  /* Ignore error code */
-		
-           iret
+	/* Restore the old trap frame pointer */
+	movl  KTRAP_FRAME_EDX(%esp), %ebx
+	movl  %ebx, KTHREAD_TRAP_FRAME(%esi)
+
+KiRosTrapReturn:
+	/* Skip debug information and unsaved registers */
+	addl  $0x30, %esp
+	popl  %gs
+	popl  %es
+	popl  %ds
+	popl  %edx
+	popl  %ecx
+	popl  %eax
+
+	/* Restore the old previous mode */
+	popl  %ebx
+	movb  %bl, %ss:KTHREAD_PREVIOUS_MODE(%esi)
+
+	/* Restore the old exception handler list */
+	popl  %ebx
+	movl  %ebx, %fs:KPCR_EXCEPTION_LIST
+
+	popl  %fs
+	popl  %edi
+	popl  %esi
+	popl  %ebx
+	popl  %ebp
+	addl  $0x4, %esp  /* Ignore error code */
+
+	iret
+
+/* R3: NOTE: This is part of my in-progress attempt at correcting NtContinue
+ *           It is not being called, yet...
+ */
+.globl @KeRosTrapReturn@8
+@KeRosTrapReturn@8:
+	/* Call the post system call hook and deliver any pending APCs */
+	pushl %esp
+	call  _KiAfterSystemCallHook
+	addl  $4,%esp
+
+	/* Restore the user context */
+	/* Get a pointer to the current thread */
+	movl  %fs:0x124, %esi
+	/* Restore the old trap frame pointer */
+	movl  %edx, KTHREAD_TRAP_FRAME(%esi)
+
+	/* point %esp to the trap frame to restore */
+	movl  %ecx, %esp
+	jmp   KiRosTrapReturn;
diff --git a/reactos/ntoskrnl/ke/i386/usercall.c b/reactos/ntoskrnl/ke/i386/usercall.c
index 63bc42bd47a..09d79710db9 100644
--- a/reactos/ntoskrnl/ke/i386/usercall.c
+++ b/reactos/ntoskrnl/ke/i386/usercall.c
@@ -1,4 +1,4 @@
-/* $Id: usercall.c,v 1.26 2004/06/23 22:32:24 ion Exp $
+/* $Id: usercall.c,v 1.27 2004/07/01 01:52:37 royce Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -26,7 +26,8 @@
 
 /* FUNCTIONS *****************************************************************/
 
-VOID KiSystemCallHook(ULONG Nr, ...)
+VOID
+KiSystemCallHook(ULONG Nr, ...)
 {
 #if 0
    va_list ap;
@@ -46,7 +47,8 @@ VOID KiSystemCallHook(ULONG Nr, ...)
 #endif
 }
 
-ULONG KiAfterSystemCallHook(ULONG NtStatus, PKTRAP_FRAME TrapFrame)
+VOID
+KiAfterSystemCallHook(PKTRAP_FRAME TrapFrame)
 {
   if (KeGetCurrentThread()->Alerted[1] != 0 && TrapFrame->Cs != KERNEL_CS)
     {
@@ -56,11 +58,11 @@ ULONG KiAfterSystemCallHook(ULONG NtStatus, PKTRAP_FRAME TrapFrame)
     {
       KiDeliverUserApc(TrapFrame);
     }
-  return(NtStatus);
 }
 
 
-VOID KiServiceCheck (ULONG Nr)
+VOID
+KiServiceCheck (ULONG Nr)
 {
   PETHREAD Thread;
 

From fdd518ddace3af1c9879b977bba9017e048754d1 Mon Sep 17 00:00:00 2001
From: "KJK::Hyperion" <hackbunny@reactos.org>
Date: Thu, 1 Jul 2004 02:40:23 +0000
Subject: [PATCH 154/356] Merging the KJKHyperion-RtlUnwind branch back into
 HEAD

svn path=/trunk/; revision=9956
---
 reactos/Makefile                      |   4 +-
 reactos/drivers/dd/null/makefile      |  10 +-
 reactos/drivers/dd/null/null.c        |  48 ++-
 reactos/lib/ntdll/makefile            |   4 +-
 reactos/lib/ntdll/rtl/exception.c     |  26 +-
 reactos/lib/pseh/framebased.c         |  65 ++--
 reactos/lib/pseh/i386/framebased.asm  |   8 +-
 reactos/lib/rtl/i386/.cvsignore       |   2 +
 reactos/lib/rtl/makefile              |   5 +-
 reactos/ntoskrnl/Makefile.i386        |   1 -
 reactos/ntoskrnl/ke/i386/trap.s       |   5 +-
 reactos/ntoskrnl/ps/thread.c          |   6 +-
 reactos/ntoskrnl/rtl/i386/exception.c | 442 +-------------------------
 13 files changed, 96 insertions(+), 530 deletions(-)
 create mode 100644 reactos/lib/rtl/i386/.cvsignore

diff --git a/reactos/Makefile b/reactos/Makefile
index 547e13a4db3..da718be5d00 100644
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.231 2004/06/15 22:33:45 gvg Exp $
+# $Id: Makefile,v 1.232 2004/07/01 02:40:21 hyperion Exp $
 #
 # Global makefile
 #
@@ -32,7 +32,7 @@ BUS = acpi isapnp pci
 LIB_FSLIB = vfatlib
 
 # Static libraries
-LIB_STATIC = string rosrtl epsapi uuid libwine zlib rtl tgetopt
+LIB_STATIC = string rosrtl epsapi uuid libwine zlib rtl tgetopt pseh
 
 # Keyboard layout libraries
 DLLS_KBD = kbddv kbdfr kbdgr kbdse kbduk kbdus
diff --git a/reactos/drivers/dd/null/makefile b/reactos/drivers/dd/null/makefile
index 7adb9916919..ea0518641d8 100644
--- a/reactos/drivers/dd/null/makefile
+++ b/reactos/drivers/dd/null/makefile
@@ -1,17 +1,17 @@
-# $Id: makefile,v 1.18 2003/11/17 20:48:22 sedwards Exp $
+# $Id: makefile,v 1.19 2004/07/01 02:40:22 hyperion Exp $
 
 PATH_TO_TOP = ../../..
 
+include $(PATH_TO_TOP)/rules.mak
+
 TARGET_TYPE = driver
 
 TARGET_NAME = null
 
 TARGET_OBJECTS = null.o
 
-TARGET_CFLAGS = -Wall -Werror
+TARGET_CFLAGS = -Wall -Werror -D__USE_W32API
 
-#TARGET_LFLAGS = -Wl,--file-alignment,0x20 -Wl,--section-alignment,0x20
-
-include $(PATH_TO_TOP)/rules.mak
+TARGET_LIBS = $(SDK_PATH_LIB)/pseh.a
 
 include $(TOOLS_PATH)/helper.mk
diff --git a/reactos/drivers/dd/null/null.c b/reactos/drivers/dd/null/null.c
index d5575508882..b7030a8cf49 100644
--- a/reactos/drivers/dd/null/null.c
+++ b/reactos/drivers/dd/null/null.c
@@ -1,4 +1,4 @@
-/* $Id: null.c,v 1.13 2004/02/10 16:22:55 navaraf Exp $
+/* $Id: null.c,v 1.14 2004/07/01 02:40:22 hyperion Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -8,11 +8,15 @@
  * UPDATE HISTORY:
  *              13/08/1998: Created
  *              29/04/2002: Fixed bugs, added zero-stream device
+ *              28/06/2004: Compile against the DDK, use PSEH where necessary
  */
 
 /* INCLUDES */
-#include <ddk/ntddk.h>
+#include <ntddk.h>
+
 #include <rosrtl/string.h>
+#include <pseh.h>
+
 #include "null.h"
 
 /* OBJECTS */
@@ -27,15 +31,24 @@ NullDispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp)
  NTSTATUS nErrCode;
  
  nErrCode = STATUS_SUCCESS;
+ Irp->IoStatus.Information = 0;
 
  switch(piosStack->MajorFunction)
  {
   /* opening and closing handles to the device */
   case IRP_MJ_CREATE:
   case IRP_MJ_CLOSE:
-  {
+   switch(NULL_DEVICE_TYPE(DeviceObject))
+   {
+    case NullBitBucket:
+    case NullZeroStream:
+     break;
+
+    default:
+     ASSERT(FALSE);
+   }
+
    break;
-  }
 
   /* write data */
   case IRP_MJ_WRITE:
@@ -47,9 +60,11 @@ NullDispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp)
      break;
 
     case NullZeroStream:
+     nErrCode = STATUS_INVALID_DEVICE_REQUEST;
+     break;
+
     default:
-     Irp->IoStatus.Information = 0;
-     nErrCode = STATUS_NOT_IMPLEMENTED;
+     ASSERT(FALSE);
    }
 
    break;
@@ -61,13 +76,21 @@ NullDispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp)
    switch(NULL_DEVICE_TYPE(DeviceObject))
    {
     case NullBitBucket:
-     Irp->IoStatus.Information = 0;
      nErrCode = STATUS_END_OF_FILE;
      break;
 
     case NullZeroStream:
-     RtlZeroMemory(Irp->AssociatedIrp.SystemBuffer, piosStack->Parameters.Read.Length);
-     Irp->IoStatus.Information = piosStack->Parameters.Read.Length;
+     _SEH_TRY
+     {
+      RtlZeroMemory(Irp->AssociatedIrp.SystemBuffer, piosStack->Parameters.Read.Length);
+      Irp->IoStatus.Information = piosStack->Parameters.Read.Length;
+     }
+     _SEH_HANDLE
+     {
+      nErrCode = _SEH_GetExceptionCode();
+     }
+     _SEH_END;
+
      break;
 
     default:
@@ -78,11 +101,8 @@ NullDispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp)
    break;
   }
 
-  /* unsupported operations */
   default:
-  {
-   nErrCode = STATUS_NOT_IMPLEMENTED;
-  }
+   ASSERT(FALSE);
  }
 
  Irp->IoStatus.Status = nErrCode;
@@ -96,6 +116,7 @@ NullUnload(PDRIVER_OBJECT DriverObject)
 {
 }
 
+/* TODO: \Device\Zero should be memory-mappable */
 NTSTATUS STDCALL 
 DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath)
 {
@@ -109,7 +130,6 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath)
  DriverObject->MajorFunction[IRP_MJ_CREATE] = NullDispatch;
  DriverObject->MajorFunction[IRP_MJ_WRITE] = NullDispatch;
  DriverObject->MajorFunction[IRP_MJ_READ] = NullDispatch;
- /* DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = NullDispatch; */
  DriverObject->DriverUnload = NullUnload;
 
  /* create null device */
diff --git a/reactos/lib/ntdll/makefile b/reactos/lib/ntdll/makefile
index 99fb8212ff6..15fe23320bb 100644
--- a/reactos/lib/ntdll/makefile
+++ b/reactos/lib/ntdll/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.103 2004/06/20 23:22:06 gdalsnes Exp $
+# $Id: makefile,v 1.104 2004/07/01 02:40:22 hyperion Exp $
 
 PATH_TO_TOP = ../..
 
@@ -57,8 +57,6 @@ RTL_I386_OBJECTS = \
 	rtl/i386/aullrem.o \
 	rtl/i386/aullshr.o \
 	rtl/i386/chkstk.o \
-	rtl/i386/exception.o \
-	rtl/i386/except.o \
 	rtl/i386/float.o \
 	rtl/i386/ftol.o
 
diff --git a/reactos/lib/ntdll/rtl/exception.c b/reactos/lib/ntdll/rtl/exception.c
index 43285853751..79e5a9c610b 100644
--- a/reactos/lib/ntdll/rtl/exception.c
+++ b/reactos/lib/ntdll/rtl/exception.c
@@ -1,4 +1,4 @@
-/* $Id: exception.c,v 1.17 2004/04/08 21:14:18 navaraf Exp $
+/* $Id: exception.c,v 1.18 2004/07/01 02:40:22 hyperion Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -6,8 +6,10 @@
  * FILE:              lib/ntdll/rtl/exception.c
  * PROGRAMERS:        David Welch <welch@cwcom.net>
  *                    Skywing <skywing@valhallalegends.com>
+ *                    KJK::Hyperion <noog@libero.it>
  * UPDATES:           Skywing, 09/11/2003: Implemented RtlRaiseException and
  *                    KiUserRaiseExceptionDispatcher.
+ *                    KJK::Hyperion, 22/06/2003: Moved common parts to rtl
  */
 
 /* INCLUDES *****************************************************************/
@@ -57,28 +59,6 @@ KiUserExceptionDispatcher(PEXCEPTION_RECORD ExceptionRecord,
   RtlRaiseException(&NestedExceptionRecord);
 }
 
-/* implemented in except.s */
-VOID
-RtlpCaptureContext(PCONTEXT Context);
-
-/*
- * @implemented
- */
-VOID STDCALL
-RtlRaiseException(PEXCEPTION_RECORD ExceptionRecord)
-{
-  CONTEXT Context;
-  NTSTATUS Status;
-
-  RtlpCaptureContext(&Context);
-
-  ExceptionRecord->ExceptionAddress = (PVOID)(*(((PULONG)Context.Ebp)+1));
-  Context.ContextFlags = CONTEXT_FULL;
-
-  Status = ZwRaiseException(ExceptionRecord, &Context, TRUE);
-  RtlRaiseException(ExceptionRecord);
-  RtlRaiseStatus(Status); /* If we get to this point, something is seriously wrong... */
-}
 
 /*
  * @implemented
diff --git a/reactos/lib/pseh/framebased.c b/reactos/lib/pseh/framebased.c
index e858b21680a..8bcbbfd4e50 100644
--- a/reactos/lib/pseh/framebased.c
+++ b/reactos/lib/pseh/framebased.c
@@ -68,47 +68,50 @@ int __cdecl _SEHFrameHandler
  /* Handling */
  else
  {
+  int ret;
+
   if(ExceptionRecord->ExceptionCode)
    frame->SPF_Code = ExceptionRecord->ExceptionCode;
   else
    frame->SPF_Code = 0xC0000001; 
 
-  if(frame->SPF_Handlers->SH_Filter)
+  switch((UINT_PTR)frame->SPF_Handlers->SH_Filter)
   {
-   int ret;
-
-   switch((UINT_PTR)frame->SPF_Handlers->SH_Filter)
+   case _SEH_EXECUTE_HANDLER + 1:
+   case _SEH_CONTINUE_SEARCH + 1:
+   case _SEH_CONTINUE_EXECUTION + 1:
    {
-    case _SEH_EXECUTE_HANDLER + 1:
-    case _SEH_CONTINUE_SEARCH + 1:
-    case _SEH_CONTINUE_EXECUTION + 1:
-    {
-     ret = (int)((UINT_PTR)frame->SPF_Handlers->SH_Filter) - 1;
-     break;
-    }
-
-    default:
-    {
-     EXCEPTION_POINTERS ep;
-
-     ep.ExceptionRecord = ExceptionRecord;
-     ep.ContextRecord = ContextRecord;
-
-     ret = frame->SPF_Handlers->SH_Filter(&ep, frame);
-     break;
-    }
+    ret = (int)((UINT_PTR)frame->SPF_Handlers->SH_Filter) - 1;
+    break;
    }
 
-   /* _SEH_CONTINUE_EXECUTION */
-   if(ret < 0)
-    return ExceptionContinueExecution;
-   /* _SEH_EXECUTE_HANDLER */
-   else if(ret > 0)
-    _SEHCallHandler(frame);
-   /* _SEH_CONTINUE_SEARCH */
-   else
-    /* fall through */;
+   default:
+   {
+    if(frame->SPF_Handlers->SH_Filter)
+    {
+     EXCEPTION_POINTERS ep;
+ 
+     ep.ExceptionRecord = ExceptionRecord;
+     ep.ContextRecord = ContextRecord;
+ 
+     ret = frame->SPF_Handlers->SH_Filter(&ep, frame);
+    }
+    else
+     ret = _SEH_CONTINUE_SEARCH;
+
+    break;
+   }
   }
+
+  /* _SEH_CONTINUE_EXECUTION */
+  if(ret < 0)
+   return ExceptionContinueExecution;
+  /* _SEH_EXECUTE_HANDLER */
+  else if(ret > 0)
+   _SEHCallHandler(frame);
+  /* _SEH_CONTINUE_SEARCH */
+  else
+   /* fall through */;
  }
 
  return ExceptionContinueSearch;
diff --git a/reactos/lib/pseh/i386/framebased.asm b/reactos/lib/pseh/i386/framebased.asm
index d4d56b20fa9..50adede06e3 100644
--- a/reactos/lib/pseh/i386/framebased.asm
+++ b/reactos/lib/pseh/i386/framebased.asm
@@ -54,10 +54,10 @@ __SEHUnwind:
  push ebx
 
  xor eax, eax
- push eax
- push eax
- push eax
- push ecx
+ push eax ; ReturnValue
+ push eax ; ExceptionRecord
+ push eax ; TargetIp
+ push ecx ; TargetFrame
  call [__SEHRtlUnwind]
 
  pop ebx
diff --git a/reactos/lib/rtl/i386/.cvsignore b/reactos/lib/rtl/i386/.cvsignore
new file mode 100644
index 00000000000..31dc3078b3a
--- /dev/null
+++ b/reactos/lib/rtl/i386/.cvsignore
@@ -0,0 +1,2 @@
+*.d
+*.o
diff --git a/reactos/lib/rtl/makefile b/reactos/lib/rtl/makefile
index e11603524f2..195bf17702c 100644
--- a/reactos/lib/rtl/makefile
+++ b/reactos/lib/rtl/makefile
@@ -33,7 +33,10 @@ TARGET_OBJECTS = \
 	version.o \
 	encode.o \
 	image.o \
-	splaytree.o
+	splaytree.o \
+        exception.o \
+        i386/exception.o \
+        i386/except.o
 
 #	atom
 #	registry
diff --git a/reactos/ntoskrnl/Makefile.i386 b/reactos/ntoskrnl/Makefile.i386
index 3f86fc56066..0d8870edf2f 100644
--- a/reactos/ntoskrnl/Makefile.i386
+++ b/reactos/ntoskrnl/Makefile.i386
@@ -48,7 +48,6 @@ OBJECTS_RTL_I386 := \
 	rtl/i386/aulldiv.o \
 	rtl/i386/aullrem.o \
 	rtl/i386/aullshr.o \
-	rtl/i386/except.o \
 	rtl/i386/exception.o \
 	rtl/i386/seh.o
 
diff --git a/reactos/ntoskrnl/ke/i386/trap.s b/reactos/ntoskrnl/ke/i386/trap.s
index c465bdad5c4..6a0e2bf6d34 100644
--- a/reactos/ntoskrnl/ke/i386/trap.s
+++ b/reactos/ntoskrnl/ke/i386/trap.s
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: trap.s,v 1.19 2004/03/13 18:21:57 dwelch Exp $
+/* $Id: trap.s,v 1.20 2004/07/01 02:40:23 hyperion Exp $
  *
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/ke/i386/trap.s
@@ -99,9 +99,6 @@ _KiTrapProlog:
 	movl    %fs:KPCR_EXCEPTION_LIST, %ebx
 	pushl	%ebx
 	
-	/* Put the exception handler chain terminator */
-	movl    $0xffffffff, %fs:KPCR_EXCEPTION_LIST
-	
 	/* Get a pointer to the current thread */
 	movl    %fs:KPCR_CURRENT_THREAD, %edi
 
diff --git a/reactos/ntoskrnl/ps/thread.c b/reactos/ntoskrnl/ps/thread.c
index 8ed65131e83..a8e33d9b6e8 100644
--- a/reactos/ntoskrnl/ps/thread.c
+++ b/reactos/ntoskrnl/ps/thread.c
@@ -1,4 +1,4 @@
-/* $Id: thread.c,v 1.124 2004/01/05 14:28:21 weiden Exp $
+/* $Id: thread.c,v 1.125 2004/07/01 02:40:23 hyperion Exp $
  *
  * COPYRIGHT:              See COPYING in the top level directory
  * PROJECT:                ReactOS kernel
@@ -739,6 +739,10 @@ NtContinue(IN PCONTEXT	Context,
 	KEBUGCHECK(0);
      }
    KeContextToTrapFrame(Context, TrapFrame);
+
+   if(TestAlert)
+    KiTestAlert();
+
    return(STATUS_SUCCESS);
 }
 
diff --git a/reactos/ntoskrnl/rtl/i386/exception.c b/reactos/ntoskrnl/rtl/i386/exception.c
index 7e2306aed32..fc3b2bb4c25 100755
--- a/reactos/ntoskrnl/rtl/i386/exception.c
+++ b/reactos/ntoskrnl/rtl/i386/exception.c
@@ -1,4 +1,4 @@
-/* $Id: exception.c,v 1.10 2004/02/24 23:51:04 dwelch Exp $
+/* $Id: exception.c,v 1.11 2004/07/01 02:40:23 hyperion Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -73,444 +73,4 @@ __ret_label:
 
 #endif	/* _MSC_VER */
 
-
-/* Implemented in except.s */
-
-VOID
-RtlpCaptureContext(PCONTEXT pContext);
-
-/* Macros that will help streamline the SEH implementations for
-   kernel mode and user mode */
-
-#define SehpGetStackLimits(StackBase, StackLimit) \
-{ \
-	(*(StackBase)) = KeGetCurrentKPCR()->StackBase; \
-	(*(StackLimit)) = KeGetCurrentKPCR()->StackLimit; \
-}
-
-#define SehpGetExceptionList() \
-	(PEXCEPTION_REGISTRATION)(KeGetCurrentThread()->TrapFrame ->ExceptionList)
-
-#define SehpSetExceptionList(NewExceptionList) \
-	KeGetCurrentThread()->TrapFrame->ExceptionList = (PVOID)(NewExceptionList)
-
-#define SehpCaptureContext(Context) \
-{ \
-	KeTrapFrameToContext(KeGetCurrentThread()->TrapFrame, (Context)); \
-}
-
-#define SehpContinue(Context, TestAlert) \
-	ZwContinue(Context, TestAlert)
-
-/*** Code below this line is shared with lib/ntdll/rtl/i386/exception.c - please keep in sync ***/
-
-VOID STDCALL
-AsmDebug(ULONG Value)
-{
-  DbgPrint("Value 0x%.08x\n", Value);
-}
-
-
-/* Declare a few prototypes for the functions in except.s */
-
-EXCEPTION_DISPOSITION
-RtlpExecuteHandlerForException(
-  PEXCEPTION_RECORD ExceptionRecord,
-  PEXCEPTION_REGISTRATION RegistrationFrame,
-  PCONTEXT Context,
-  PVOID DispatcherContext,
-  PEXCEPTION_HANDLER ExceptionHandler);
-
-EXCEPTION_DISPOSITION
-RtlpExecuteHandlerForUnwind(
-  PEXCEPTION_RECORD ExceptionRecord,
-  PEXCEPTION_REGISTRATION RegistrationFrame,
-  PCONTEXT Context,
-  PVOID DispatcherContext,
-  PEXCEPTION_HANDLER ExceptionHandler);
-
-
-#ifndef NDEBUG
-
-VOID RtlpDumpExceptionRegistrations(VOID)
-{
-  PEXCEPTION_REGISTRATION Current;
-
-  DbgPrint("Dumping exception registrations:\n");
-
-  Current = SehpGetExceptionList();
-
-  if ((ULONG_PTR)Current != -1)
-  {
-    while ((ULONG_PTR)Current != -1)
-    {
-      DbgPrint("   (0x%08X)   HANDLER (0x%08X)\n", Current, Current->handler);
-      Current = Current->prev;
-    }
-    DbgPrint("   End-Of-List\n");
-  } else {
-    DbgPrint("   No exception registrations exists.\n");
-  }
-}
-
-#endif /* NDEBUG */
-
-ULONG
-RtlpDispatchException(IN PEXCEPTION_RECORD  ExceptionRecord,
-	IN PCONTEXT  Context)
-{
-  PEXCEPTION_REGISTRATION RegistrationFrame;
-  DWORD DispatcherContext;
-  DWORD ReturnValue;
-
-  DPRINT("RtlpDispatchException()\n");
-
-  /*
-    This could be true very early in the boot process 
-    in which case there is no point in continuing. 
-  */
-  if (KeGetCurrentThread() == NULL)
-    {
-      return ExceptionContinueExecution;
-    }
-
-#ifndef NDEBUG
-  RtlpDumpExceptionRegistrations();
-#endif /* NDEBUG */
-
-  RegistrationFrame = SehpGetExceptionList();
- 
-  DPRINT("RegistrationFrame is 0x%X\n", RegistrationFrame);
-
-  /* Check if there are any exception handlers at all. */
-  if ((ULONG_PTR)RegistrationFrame == (ULONG_PTR)-1)
-    {
-      ExceptionRecord->ExceptionFlags |= EXCEPTION_NONCONTINUABLE;
-      return ExceptionContinueExecution;
-    }
-
-  while ((ULONG_PTR)RegistrationFrame != (ULONG_PTR)-1)
-  {
-    EXCEPTION_RECORD ExceptionRecord2;
-    DWORD Temp = 0;
-    //PVOID RegistrationFrameEnd = (PVOID)RegistrationFrame + 8;
-
-    // Make sure the registration frame is located within the stack
-
-    DPRINT("Error checking\n");
-#if 0
-    if (Teb->Tib.StackBase > RegistrationFrameEnd)
-    {
-      DPRINT("Teb->Tib.StackBase (0x%.08x) > RegistrationFrameEnd (0x%.08x)\n",
-        Teb->Tib.StackBase, RegistrationFrameEnd);
-      ExceptionRecord->ExceptionFlags |= EXCEPTION_STACK_INVALID;
-      return ExceptionContinueExecution;
-    }
-    // FIXME: Stack top, correct?
-    if (Teb->Tib.StackLimit < RegistrationFrameEnd)
-    {
-      DPRINT("Teb->Tib.StackLimit (0x%.08x) > RegistrationFrameEnd (0x%.08x)\n",
-        Teb->Tib.StackLimit, RegistrationFrameEnd);
-      ExceptionRecord->ExceptionFlags |= EXCEPTION_STACK_INVALID;
-      return ExceptionContinueExecution;
-    }
- 
-    // Make sure stack is DWORD aligned
-    if ((ULONG_PTR)RegistrationFrame & 3)
-    {
-      DPRINT("RegistrationFrameEnd (0x%.08x) is not DWORD aligned.\n",
-        RegistrationFrameEnd);
-      ExceptionRecord->ExceptionFlags |= EXCEPTION_STACK_INVALID;
-      return ExceptionContinueExecution;
-    }
-#endif
-
-#if 0
-    /* FIXME: */
-    if (someFlag)
-      RtlpLogLastExceptionDisposition( hLog, retValue );
-#endif
-
-    DPRINT("Calling handler at 0x%X\n", RegistrationFrame->handler);
-    DPRINT("ExceptionRecord 0x%X\n", ExceptionRecord);
-    DPRINT("RegistrationFrame 0x%X\n", RegistrationFrame);
-    DPRINT("Context 0x%X\n", Context);
-    DPRINT("&DispatcherContext 0x%X\n", &DispatcherContext);
-
-    ReturnValue = RtlpExecuteHandlerForException(
-      ExceptionRecord,
-      RegistrationFrame,
-      Context,
-      &DispatcherContext,
-      RegistrationFrame->handler);
-
-#ifndef NDEBUG
-
-    DPRINT("Exception handler said 0x%X\n", ReturnValue);
-	DPRINT("RegistrationFrame == 0x%.08x\n", RegistrationFrame);
-	{
-		PULONG sp = (PULONG)((PVOID)RegistrationFrame - 0x08);
-		DPRINT("StandardESP == 0x%.08x\n", sp[0]);
-		DPRINT("Exception Pointers == 0x%.08x\n", sp[1]);
-		DPRINT("PrevFrame == 0x%.08x\n", sp[2]);
-		DPRINT("Handler == 0x%.08x\n", sp[3]);
-		DPRINT("ScopeTable == 0x%.08x\n", sp[4]);
-		DPRINT("TryLevel == 0x%.08x\n", sp[5]);
-		DPRINT("EBP == 0x%.08x\n", sp[6]);
-	}
-
-#endif
-
-    if (RegistrationFrame == NULL)
-    {
-      ExceptionRecord->ExceptionFlags &= ~EXCEPTION_NESTED_CALL;  // Turn off flag
-    }
-
-    if (ReturnValue == ExceptionContinueExecution)
-    {
-      DPRINT("ReturnValue == ExceptionContinueExecution\n");
-      if (ExceptionRecord->ExceptionFlags & EXCEPTION_NONCONTINUABLE)
-      {
-        DPRINT("(ExceptionRecord->ExceptionFlags & EXCEPTION_NONCONTINUABLE) == TRUE\n");
-
-        ExceptionRecord2.ExceptionRecord = ExceptionRecord;
-        ExceptionRecord2.ExceptionCode = STATUS_NONCONTINUABLE_EXCEPTION;
-        ExceptionRecord2.ExceptionFlags = EXCEPTION_NONCONTINUABLE;
-        ExceptionRecord2.NumberParameters = 0;
-        RtlRaiseException(&ExceptionRecord2);
-      }
-      else
-      {
-        /* Copy the (possibly changed) context back to the trap frame and return */
-        SehpContinue(Context, FALSE);
-        return ExceptionContinueExecution;
-      }
-    }
-    else if (ReturnValue == ExceptionContinueSearch)
-    {
-      DPRINT("ReturnValue == ExceptionContinueSearch\n");
-
-      /* Nothing to do here */
-    }
-    else if (ReturnValue == ExceptionNestedException)
-    {
-      DPRINT("ReturnValue == ExceptionNestedException\n");
-
-      ExceptionRecord->ExceptionFlags |= EXCEPTION_EXIT_UNWIND;
-      if (DispatcherContext > Temp)
-	{	  
-          Temp = DispatcherContext;
-	}
-    }
-    else /* if (ReturnValue == ExceptionCollidedUnwind) */
-    {
-      DPRINT("ReturnValue == ExceptionCollidedUnwind or unknown\n");
-
-      ExceptionRecord2.ExceptionRecord = ExceptionRecord;
-      ExceptionRecord2.ExceptionCode = STATUS_INVALID_DISPOSITION;
-      ExceptionRecord2.ExceptionFlags = EXCEPTION_NONCONTINUABLE;
-      ExceptionRecord2.NumberParameters = 0;
-      RtlRaiseException(&ExceptionRecord2);
-    }
-
-    RegistrationFrame = RegistrationFrame->prev;  // Go to previous frame
-  }
- 
-  /* No exception handler will handle this exception */
-
-  DPRINT("RtlpDispatchException(): Return ExceptionContinueExecution\n");
-
-  return ExceptionContinueExecution;  
-}
-
-VOID STDCALL
-RtlRaiseStatus(NTSTATUS Status)
-{
-  EXCEPTION_RECORD ExceptionRecord;
-
-  DPRINT("RtlRaiseStatus(Status 0x%.08x)\n", Status);
-
-  ExceptionRecord.ExceptionCode    = Status;
-  ExceptionRecord.ExceptionRecord  = NULL;
-  ExceptionRecord.NumberParameters = 0;
-  ExceptionRecord.ExceptionFlags   = EXCEPTION_NONCONTINUABLE;
-  RtlRaiseException (& ExceptionRecord);
-}
-
-/*
- * @implemented
- */
-VOID STDCALL
-RtlUnwind(PEXCEPTION_REGISTRATION RegistrationFrame,
-  PVOID ReturnAddress,
-  PEXCEPTION_RECORD ExceptionRecord,
-  DWORD EaxValue)
-{
-  PEXCEPTION_REGISTRATION ERHead;
-  PEXCEPTION_RECORD pExceptRec;
-  EXCEPTION_RECORD TempER;    
-  CONTEXT Context;
-
-  DPRINT("RtlUnwind(). RegistrationFrame 0x%X\n", RegistrationFrame);
-
-#ifndef NDEBUG
-  RtlpDumpExceptionRegistrations();
-#endif /* NDEBUG */
-
-  ERHead = SehpGetExceptionList();
- 
-  DPRINT("ERHead is 0x%X\n", ERHead);
-
-  pExceptRec = &TempER;
-
-  if (ExceptionRecord == NULL) // The normal case
-  {
-    DPRINT("ExceptionRecord == NULL (normal)\n");
-
-    pExceptRec->ExceptionFlags = 0;
-    pExceptRec->ExceptionCode = STATUS_UNWIND;
-    pExceptRec->ExceptionRecord = NULL;
-    pExceptRec->ExceptionAddress = ReturnAddress;
-    pExceptRec->ExceptionInformation[0] = 0;
-  }
-
-  if (RegistrationFrame)
-    pExceptRec->ExceptionFlags |= EXCEPTION_UNWINDING;
-  else
-    pExceptRec->ExceptionFlags |= (EXCEPTION_UNWINDING|EXCEPTION_EXIT_UNWIND);
-
-#ifndef NDEBUG
-  DPRINT("ExceptionFlags == 0x%x:\n", pExceptRec->ExceptionFlags);
-  if (pExceptRec->ExceptionFlags & EXCEPTION_UNWINDING)
-  {
-    DPRINT("  * EXCEPTION_UNWINDING (0x%x)\n", EXCEPTION_UNWINDING);
-  }
-  if (pExceptRec->ExceptionFlags & EXCEPTION_EXIT_UNWIND)
-  {
-    DPRINT("  * EXCEPTION_EXIT_UNWIND (0x%x)\n", EXCEPTION_EXIT_UNWIND);
-  }
-#endif /* NDEBUG */
-
-  Context.ContextFlags =
-    (CONTEXT_i386 | CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS);
-
-  SehpCaptureContext(&Context);
-
-  DPRINT("Context.Eip = 0x%.08x\n", Context.Eip);
-  DPRINT("Context.Ebp = 0x%.08x\n", Context.Ebp);
-  DPRINT("Context.Esp = 0x%.08x\n", Context.Esp);
-
-  Context.Esp += 0x10;
-  Context.Eax = EaxValue;
- 
-  // Begin traversing the list of EXCEPTION_REGISTRATION
-  while ((ULONG_PTR)ERHead != (ULONG_PTR)-1)
-  {
-    EXCEPTION_RECORD er2;
- 
-    DPRINT("ERHead 0x%X\n", ERHead);
-
-    if (ERHead == RegistrationFrame)
-    {
-      DPRINT("Continueing execution\n");
-      SehpContinue(&Context, FALSE);
-      return;
-    }
-    else
-    {
-      // If there's an exception frame, but it's lower on the stack
-      // than the head of the exception list, something's wrong!
-      if (RegistrationFrame && (RegistrationFrame <= ERHead))
-      {
-        DPRINT("The exception frame is bad\n");
-
-        // Generate an exception to bail out
-        er2.ExceptionRecord = pExceptRec;
-        er2.NumberParameters = 0;
-        er2.ExceptionCode = STATUS_INVALID_UNWIND_TARGET;
-        er2.ExceptionFlags = EXCEPTION_NONCONTINUABLE;    
- 
-        RtlRaiseException(&er2);
-      }
-    }
- 
-#if 0
-    Stack = ERHead + sizeof(EXCEPTION_REGISTRATION);
-    if ( (Teb->Tib.StackBase <= (PVOID)ERHead )      // Make sure that ERHead
-      && (Teb->Tib.->StackLimit >= (PVOID)Stack )      // is in range, and a multiple
-      && (0 == ((ULONG_PTR)ERHead & 3)) )         // of 4 (i.e., sane)
-    {
-#else
-    if (1) {
-#endif
-      PEXCEPTION_REGISTRATION NewERHead;
-      PEXCEPTION_REGISTRATION pCurrExceptReg;
-      EXCEPTION_DISPOSITION ReturnValue;
-  
-      DPRINT("Executing handler at 0x%X for unwind\n", ERHead->handler);
-
-      ReturnValue = RtlpExecuteHandlerForUnwind(
-        pExceptRec,
-        ERHead,
-        &Context,
-        &NewERHead,
-        ERHead->handler);
- 
-      DPRINT("Handler at 0x%X returned 0x%X\n", ERHead->handler, ReturnValue);
-
-      if (ReturnValue != ExceptionContinueSearch)
-      {
-        if (ReturnValue != ExceptionCollidedUnwind)
-        {
-          DPRINT("Bad return value\n");
-
-          er2.ExceptionRecord = pExceptRec;
-          er2.NumberParameters = 0;
-          er2.ExceptionCode = STATUS_INVALID_DISPOSITION;
-          er2.ExceptionFlags = EXCEPTION_NONCONTINUABLE;    
- 
-          RtlRaiseException(&er2);
-        }
-        else
-        {
-          ERHead = NewERHead;
-        }
-      }
- 
-      pCurrExceptReg = ERHead;
-      ERHead = ERHead->prev;
-
-      DPRINT("New ERHead is 0x%X\n", ERHead);
-
-      DPRINT("Setting exception registration at 0x%X as current\n",
-        RegistrationFrame->prev);
-
-      // Unlink the exception handler
-      SehpSetExceptionList(RegistrationFrame->prev);
-    }
-    else // The stack looks goofy! Raise an exception to bail out
-    {
-      DPRINT("Bad stack\n");
-
-      er2.ExceptionRecord = pExceptRec;
-      er2.NumberParameters = 0;
-      er2.ExceptionCode = STATUS_BAD_STACK;
-      er2.ExceptionFlags = EXCEPTION_NONCONTINUABLE;    
- 
-      RtlRaiseException(&er2);
-    }
-  }
- 
-  // If we get here, we reached the end of the EXCEPTION_REGISTRATION list.
-  // This shouldn't happen normally.
-
-  DPRINT("Ran out of exception registrations. RegistrationFrame is (0x%X)\n",
-    RegistrationFrame);
-
-  if ((ULONG_PTR)RegistrationFrame == (ULONG_PTR)-1)
-    SehpContinue(&Context, FALSE);
-  else
-    NtRaiseException(pExceptRec, &Context, 0);
-}
-
 /* EOF */

From b4dc709c434695d4577a95c2f8c503d8c0ce2817 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Thu, 1 Jul 2004 18:12:47 +0000
Subject: [PATCH 155/356] CVS maintaince

svn path=/trunk/; revision=9957
---
 reactos/lib/olepro32/.cvsignore | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/reactos/lib/olepro32/.cvsignore b/reactos/lib/olepro32/.cvsignore
index 9edd5cbe53b..60c1df8b097 100644
--- a/reactos/lib/olepro32/.cvsignore
+++ b/reactos/lib/olepro32/.cvsignore
@@ -7,14 +7,4 @@
 *.map
 *.tmp
 Makefile.ros
-idb_hist_large.bmp
-idb_hist_small.bmp
-idb_std_small.bmp
-idb_std_large.bmp
-idb_view_large.bmp
-idb_view_small.bmp
-idc_divider.cur
-idc_divideropen.cur
-idi_dragarrow.ico
-idt_check.bmp
-comctl32.spec.def
+olepro32.spec.def

From 820eaf8fce9ce28977952584d6f99203e299865e Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Thu, 1 Jul 2004 20:27:50 +0000
Subject: [PATCH 156/356] Fix a typo. Now the 'Advanced' page shows again.

svn path=/trunk/; revision=9958
---
 reactos/lib/cpl/sysdm/sysdm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reactos/lib/cpl/sysdm/sysdm.c b/reactos/lib/cpl/sysdm/sysdm.c
index a786ae656b9..c7c96da23cd 100644
--- a/reactos/lib/cpl/sysdm/sysdm.c
+++ b/reactos/lib/cpl/sysdm/sysdm.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: sysdm.c,v 1.2 2004/06/30 10:53:05 ekohl Exp $
+/* $Id: sysdm.c,v 1.3 2004/07/01 20:27:50 ekohl Exp $
  *
  * PROJECT:         ReactOS System Control Panel
  * FILE:            lib/cpl/system/sysdm.c
@@ -106,7 +106,7 @@ SystemApplet(VOID)
   psh.hInstance = hApplet;
   psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM));
   psh.pszCaption = Caption;
-  psh.nPages = sizeof(psp) / sizeof(PROPSHEETHEADER);
+  psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE);
   psh.nStartPage = 0;
   psh.ppsp = psp;
   psh.pfnCallback = NULL; /* PropSheetProc; */

From 1c2af8076a413b5fcdef3a3fa5f9ede2942e2e40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Thu, 1 Jul 2004 22:35:35 +0000
Subject: [PATCH 157/356] Handle file names like ./somename in SearchPath()

svn path=/trunk/; revision=9959
---
 reactos/lib/kernel32/file/dir.c | 169 ++++++++++++++++++++------------
 1 file changed, 107 insertions(+), 62 deletions(-)

diff --git a/reactos/lib/kernel32/file/dir.c b/reactos/lib/kernel32/file/dir.c
index fe69e74ce61..9f18ffbf979 100644
--- a/reactos/lib/kernel32/file/dir.c
+++ b/reactos/lib/kernel32/file/dir.c
@@ -1,4 +1,4 @@
-/* $Id: dir.c,v 1.46 2004/06/28 19:46:17 navaraf Exp $
+/* $Id: dir.c,v 1.47 2004/07/01 22:35:35 gvg Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -753,75 +753,120 @@ SearchPathW (
         PWCHAR EnvironmentBufferW = NULL;
         PWCHAR AppPathW = NULL;
         WCHAR Buffer;
-        //WCHAR drv[3];
-
+        BOOL HasExtension;
+        LPCWSTR p;
+        PWCHAR Name;
 
         DPRINT("SearchPath\n");
 
-        if (lpPath == NULL)
+        HasExtension = FALSE;
+        p = lpFileName + wcslen(lpFileName);
+        while (lpFileName < p &&
+               L'\\' != *(p - 1) &&
+               L'/' != *(p - 1) &&
+               L':' != *(p - 1))
         {
-
-                AppPathW = (PWCHAR) RtlAllocateHeap(GetProcessHeap(),
-                                                HEAP_GENERATE_EXCEPTIONS|HEAP_ZERO_MEMORY,
-                                                MAX_PATH * sizeof(WCHAR));
-
-
-                wcscat (AppPathW, NtCurrentPeb()->ProcessParameters->ImagePathName.Buffer);
-
-                len = wcslen (AppPathW);
-
-                while (len && AppPathW[len - 1] != L'\\')
-                        len--;
-
-                if (len) AppPathW[len-1] = L'\0';
-
-                len = GetEnvironmentVariableW(L"PATH", &Buffer, 0);
-                len += 1 + GetCurrentDirectoryW(0, &Buffer);
-                len += 1 + GetSystemDirectoryW(&Buffer, 0);
-                len += 1 + GetWindowsDirectoryW(&Buffer, 0);
-                len += 1 + wcslen(AppPathW) * sizeof(WCHAR);
-
-                EnvironmentBufferW = (PWCHAR) RtlAllocateHeap(GetProcessHeap(),
-                                                HEAP_GENERATE_EXCEPTIONS|HEAP_ZERO_MEMORY,
-                                                len * sizeof(WCHAR));
-                if (EnvironmentBufferW == NULL)
+                HasExtension = HasExtension || L'.' == *(p - 1);
+                p--;
+        }
+        if (lpFileName < p)
+        {
+                if (HasExtension || NULL == lpExtension)
                 {
-                        SetLastError(ERROR_OUTOFMEMORY);
-                        return 0;
+                        Name = (PWCHAR) lpFileName;
+                }
+                else
+                {
+                        Name = RtlAllocateHeap(GetProcessHeap(), 
+                                               HEAP_GENERATE_EXCEPTIONS,
+                                               (wcslen(lpFileName) + wcslen(lpExtension) + 1)
+                                               * sizeof(WCHAR));
+                        if (NULL == Name)
+                        {
+                                SetLastError(ERROR_OUTOFMEMORY);
+                                return 0;
+                        }
+                        wcscat(wcscpy(Name, lpFileName), lpExtension);
+                }
+	        if (RtlDoesFileExists_U(Name))
+                {
+                        retCode = RtlGetFullPathName_U (Name,
+                                                        nBufferLength * sizeof(WCHAR),
+                                                        lpBuffer,
+                                                        lpFilePart);
+                }
+                if (Name != lpFileName)
+                {
+                        RtlFreeHeap(GetProcessHeap(), 0, Name);
+                }
+        }
+        else
+        {
+                if (lpPath == NULL)
+                {
+
+                        AppPathW = (PWCHAR) RtlAllocateHeap(GetProcessHeap(),
+                                                        HEAP_GENERATE_EXCEPTIONS|HEAP_ZERO_MEMORY,
+                                                        MAX_PATH * sizeof(WCHAR));
+
+
+                        wcscat (AppPathW, NtCurrentPeb()->ProcessParameters->ImagePathName.Buffer);
+
+                        len = wcslen (AppPathW);
+
+                        while (len && AppPathW[len - 1] != L'\\')
+                                len--;
+
+                        if (len) AppPathW[len-1] = L'\0';
+
+                        len = GetEnvironmentVariableW(L"PATH", &Buffer, 0);
+                        len += 1 + GetCurrentDirectoryW(0, &Buffer);
+                        len += 1 + GetSystemDirectoryW(&Buffer, 0);
+                        len += 1 + GetWindowsDirectoryW(&Buffer, 0);
+                        len += 1 + wcslen(AppPathW) * sizeof(WCHAR);
+
+                        EnvironmentBufferW = (PWCHAR) RtlAllocateHeap(GetProcessHeap(),
+                                                        HEAP_GENERATE_EXCEPTIONS|HEAP_ZERO_MEMORY,
+                                                        len * sizeof(WCHAR));
+                        if (EnvironmentBufferW == NULL)
+                        {
+                                SetLastError(ERROR_OUTOFMEMORY);
+                                return 0;
+                        }
+
+                        pos = GetCurrentDirectoryW(len, EnvironmentBufferW);
+                        EnvironmentBufferW[pos++] = L';';
+                        EnvironmentBufferW[pos] = 0;
+                        pos += GetSystemDirectoryW(&EnvironmentBufferW[pos], len - pos);
+                        EnvironmentBufferW[pos++] = L';';
+                        EnvironmentBufferW[pos] = 0;
+                        pos += GetWindowsDirectoryW(&EnvironmentBufferW[pos], len - pos);
+                        EnvironmentBufferW[pos++] = L';';
+                        EnvironmentBufferW[pos] = 0;
+                        pos += GetEnvironmentVariableW(L"PATH", &EnvironmentBufferW[pos], len - pos);
+                        EnvironmentBufferW[pos++] = L';';
+                        EnvironmentBufferW[pos] = 0;
+                        wcscat (EnvironmentBufferW, AppPathW);
+
+                        RtlFreeHeap (RtlGetProcessHeap (),
+                             0,
+                             AppPathW);
+
+                        lpPath = EnvironmentBufferW;
+
                 }
 
-                pos = GetCurrentDirectoryW(len, EnvironmentBufferW);
-                EnvironmentBufferW[pos++] = L';';
-                EnvironmentBufferW[pos] = 0;
-                pos += GetSystemDirectoryW(&EnvironmentBufferW[pos], len - pos);
-                EnvironmentBufferW[pos++] = L';';
-                EnvironmentBufferW[pos] = 0;
-                pos += GetWindowsDirectoryW(&EnvironmentBufferW[pos], len - pos);
-                EnvironmentBufferW[pos++] = L';';
-                EnvironmentBufferW[pos] = 0;
-                pos += GetEnvironmentVariableW(L"PATH", &EnvironmentBufferW[pos], len - pos);
-                EnvironmentBufferW[pos++] = L';';
-                EnvironmentBufferW[pos] = 0;
-                wcscat (EnvironmentBufferW, AppPathW);
+                retCode = RtlDosSearchPath_U ((PWCHAR)lpPath, (PWCHAR)lpFileName, (PWCHAR)lpExtension,
+                                              nBufferLength * sizeof(WCHAR), lpBuffer, lpFilePart);
 
-                RtlFreeHeap (RtlGetProcessHeap (),
-                     0,
-                     AppPathW);
-
-                lpPath = EnvironmentBufferW;
-
-        }
-
-        retCode = RtlDosSearchPath_U ((PWCHAR)lpPath, (PWCHAR)lpFileName, (PWCHAR)lpExtension,
-                                      nBufferLength * sizeof(WCHAR), lpBuffer, lpFilePart);
-
-        if (EnvironmentBufferW != NULL)
-        {
-                RtlFreeHeap(GetProcessHeap(), 0, EnvironmentBufferW);
-        }
-        if (retCode == 0)
-        {
-                SetLastError(ERROR_FILE_NOT_FOUND);
+                if (EnvironmentBufferW != NULL)
+                {
+                        RtlFreeHeap(GetProcessHeap(), 0, EnvironmentBufferW);
+                }
+                if (retCode == 0)
+                {
+                        SetLastError(ERROR_FILE_NOT_FOUND);
+                }
         }
         return retCode / sizeof(WCHAR);
 }

From db3e54f680b8259fd35c33e66c9349aed3a916da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Thu, 1 Jul 2004 22:36:16 +0000
Subject: [PATCH 158/356] Don't reset LastError on success

svn path=/trunk/; revision=9960
---
 reactos/lib/kernel32/file/create.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/reactos/lib/kernel32/file/create.c b/reactos/lib/kernel32/file/create.c
index c6c90d4ebc2..3d71034ec8b 100644
--- a/reactos/lib/kernel32/file/create.c
+++ b/reactos/lib/kernel32/file/create.c
@@ -1,4 +1,4 @@
-/* $Id: create.c,v 1.35 2004/01/23 21:16:03 ekohl Exp $
+/* $Id: create.c,v 1.36 2004/07/01 22:36:16 gvg Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -286,10 +286,6 @@ HANDLE STDCALL CreateFileW (LPCWSTR			lpFileName,
   {
     SetLastError(ERROR_ALREADY_EXISTS);
   }
-  else
-  {
-    SetLastError(0);
-  }
 
   return FileHandle;
 }

From ecae0d0647d7b6dc70c1e3ede561b2f82baae6cd Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Thu, 1 Jul 2004 23:36:57 +0000
Subject: [PATCH 159/356] some little fixes

svn path=/trunk/; revision=9961
---
 reactos/subsys/system/regedit/hexedit.c | 137 +++++++++++++++---------
 1 file changed, 85 insertions(+), 52 deletions(-)

diff --git a/reactos/subsys/system/regedit/hexedit.c b/reactos/subsys/system/regedit/hexedit.c
index 718faaa233c..6333c131438 100644
--- a/reactos/subsys/system/regedit/hexedit.c
+++ b/reactos/subsys/system/regedit/hexedit.c
@@ -34,6 +34,7 @@ typedef struct
   DWORD MaxBuffer;
   DWORD ColumnsPerLine;
   DWORD nLines;
+  DWORD nVisibleLinesComplete;
   DWORD nVisibleLines;
   INT Position;
   INT LineHeight;
@@ -90,7 +91,7 @@ UnregisterHexEditorClass(HINSTANCE hInstance)
 /*** Helper functions *********************************************************/
 
 static VOID
-HEXEDIT_MoveCaret(PHEXEDIT_DATA hed, INT Line, INT Column, BOOL HexDump)
+HEXEDIT_MoveCaret(PHEXEDIT_DATA hed, BOOL Scroll)
 {
   SCROLLINFO si;
   
@@ -98,25 +99,28 @@ HEXEDIT_MoveCaret(PHEXEDIT_DATA hed, INT Line, INT Column, BOOL HexDump)
   si.fMask = SIF_POS;
   GetScrollInfo(hed->hWndSelf, SB_VERT, &si);
   
-  if(si.nPos > Line)
+  if(Scroll)
   {
-    si.nPos = Line;
-    SetScrollInfo(hed->hWndSelf, SB_VERT, &si, TRUE);
-    GetScrollInfo(hed->hWndSelf, SB_VERT, &si);
-    InvalidateRect(hed->hWndSelf, NULL, TRUE);
-  }
-  else if((Line - si.nPos) > hed->nVisibleLines)
-  {
-    si.nPos += (Line - si.nPos);
-    SetScrollInfo(hed->hWndSelf, SB_VERT, &si, TRUE);
-    GetScrollInfo(hed->hWndSelf, SB_VERT, &si);
-    InvalidateRect(hed->hWndSelf, NULL, TRUE);
+    if(si.nPos > hed->CaretLine)
+    {
+      si.nPos = hed->CaretLine;
+      SetScrollInfo(hed->hWndSelf, SB_VERT, &si, TRUE);
+      GetScrollInfo(hed->hWndSelf, SB_VERT, &si);
+      InvalidateRect(hed->hWndSelf, NULL, TRUE);
+    }
+    else if(hed->CaretLine >= (hed->nVisibleLinesComplete + si.nPos))
+    {
+      si.nPos = hed->CaretLine - hed->nVisibleLinesComplete + 1; 
+      SetScrollInfo(hed->hWndSelf, SB_VERT, &si, TRUE);
+      GetScrollInfo(hed->hWndSelf, SB_VERT, &si);
+      InvalidateRect(hed->hWndSelf, NULL, TRUE);
+    }
   }
   
-  if(HexDump)
-    SetCaretPos(hed->LeftMargin + ((4 + hed->AddressSpacing) * hed->CharWidth) - 2, (Line - si.nPos) * hed->LineHeight);
+  if(hed->EditingField)
+    SetCaretPos(hed->LeftMargin + ((4 + hed->AddressSpacing + (3 * hed->CaretCol)) * hed->CharWidth) - 1, (hed->CaretLine - si.nPos) * hed->LineHeight);
   else
-    SetCaretPos(hed->LeftMargin + ((4 + hed->AddressSpacing + hed->SplitSpacing + (3 * hed->ColumnsPerLine)) * hed->CharWidth) - 2, (Line - si.nPos) * hed->LineHeight);
+    SetCaretPos(hed->LeftMargin + ((4 + hed->AddressSpacing + hed->SplitSpacing + (3 * hed->ColumnsPerLine) + hed->CaretCol) * hed->CharWidth) - 2, (hed->CaretLine - si.nPos) * hed->LineHeight);
 }
 
 static VOID
@@ -139,7 +143,8 @@ HEXEDIT_Update(PHEXEDIT_DATA hed)
   
   if(hed->LineHeight > 0)
   {
-    hed->nVisibleLines = cvislines = rcClient.bottom / hed->LineHeight;
+    hed->nVisibleLinesComplete = cvislines = rcClient.bottom / hed->LineHeight;
+    hed->nVisibleLines = hed->nVisibleLinesComplete;
     if(rcClient.bottom % hed->LineHeight)
     {
       hed->nVisibleLines++;
@@ -527,7 +532,7 @@ static LRESULT
 HEXEDIT_WM_SETFOCUS(PHEXEDIT_DATA hed)
 {
   CreateCaret(hed->hWndSelf, 0, 1, hed->LineHeight);
-  HEXEDIT_MoveCaret(hed, hed->CaretLine, hed->CaretCol, hed->EditingField);
+  HEXEDIT_MoveCaret(hed, FALSE);
   ShowCaret(hed->hWndSelf);
   return 0;
 }
@@ -725,35 +730,16 @@ HEXEDIT_WM_MOUSEWHEEL(PHEXEDIT_DATA hed, int cyMoveLines, WORD ButtonsDown, LPPO
 }
 
 static LRESULT
-HEXEDIT_WM_SETCURSOR(PHEXEDIT_DATA hed)
+HEXEDIT_WM_GETDLGCODE(LPMSG Msg)
 {
-  POINTS pt;
-  DWORD Hit, Pos;
-  
-  Pos = GetMessagePos();
-  pt = MAKEPOINTS(Pos);
-  Hit = HEXEDIT_HitRegionTest(hed, pt, NULL);
-  
-  switch(Hit)
-  {
-    case HEHT_HEXDUMP:
-    case HEHT_HEXDUMPSPACING:
-    case HEHT_ASCIIDUMP:
-      SetCursor(LoadCursor(0, MAKEINTRESOURCE(IDC_IBEAM)));
-      break;
-    
-    default:
-      SetCursor(LoadCursor(0, MAKEINTRESOURCE(IDC_ARROW)));
-      break;
-  }
-  return TRUE;
+  return DLGC_WANTARROWS | DLGC_WANTCHARS;
 }
 
 static BOOL
 HEXEDIT_WM_KEYDOWN(PHEXEDIT_DATA hed, INT VkCode)
 {
   DWORD bufsize;
-  BOOL shift, control, handled;
+  BOOL shift, control;
   
   if(GetKeyState(VK_MENU) & 0x8000)
   {
@@ -764,7 +750,6 @@ HEXEDIT_WM_KEYDOWN(PHEXEDIT_DATA hed, INT VkCode)
   control = GetKeyState(VK_CONTROL) & 0x8000;
   
   bufsize = (hed->hBuffer ? LocalSize(hed->hBuffer) : 0);
-  handled = FALSE;
   
   switch(VkCode)
   {
@@ -778,10 +763,8 @@ HEXEDIT_WM_KEYDOWN(PHEXEDIT_DATA hed, INT VkCode)
 	}
 	else
 	  hed->Position--;
-	
-	HEXEDIT_MoveCaret(hed, hed->CaretLine, hed->CaretCol, hed->EditingField);
       }
-      handled = TRUE;
+      HEXEDIT_MoveCaret(hed, TRUE);
       break;
     
     case VK_RIGHT:
@@ -789,15 +772,54 @@ HEXEDIT_WM_KEYDOWN(PHEXEDIT_DATA hed, INT VkCode)
       {
         if(++hed->CaretCol > hed->ColumnsPerLine)
 	{
-	  hed->CaretLine = 0;
+	  hed->CaretCol = 0;
 	  hed->CaretLine++;
 	}
 	else
 	  hed->Position++;
-	
-	HEXEDIT_MoveCaret(hed, hed->CaretLine, hed->CaretCol, hed->EditingField);
       }
-      handled = TRUE;
+      HEXEDIT_MoveCaret(hed, TRUE);
+      break;
+    
+    case VK_UP:
+      if(hed->Position > 0)
+      {
+        if(hed->CaretLine <= 0)
+	{
+	  hed->CaretCol = 0;
+	  hed->Position = 0;
+	}
+	else
+	{
+	  hed->CaretLine--;
+	  hed->Position -= hed->ColumnsPerLine;
+	}
+      }
+      HEXEDIT_MoveCaret(hed, TRUE);
+      break;
+    
+    case VK_DOWN:
+      if(hed->Position <= bufsize)
+      {
+        if(hed->CaretLine < hed->nLines - 1)
+	{
+	  hed->Position += hed->ColumnsPerLine;
+	  hed->CaretLine++;
+	  if(hed->Position > bufsize)
+	  {
+	    hed->Position = bufsize;
+	    hed->CaretLine = (hed->nLines > 0 ? hed->nLines - 1 : 0);
+	    hed->CaretCol = bufsize % hed->ColumnsPerLine;
+	  }
+	}
+	else
+	{
+	  INT tmp = bufsize % hed->ColumnsPerLine;
+	  hed->Position = bufsize;
+	  hed->CaretCol = (tmp == 0 ? hed->ColumnsPerLine : tmp);
+	}
+      }
+      HEXEDIT_MoveCaret(hed, TRUE);
       break;
   }
   
@@ -826,9 +848,6 @@ HexEditWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
     case WM_PAINT:
       return HEXEDIT_WM_PAINT(hed);
     
-    case WM_SETCURSOR:
-      return HEXEDIT_WM_SETCURSOR(hed);
-    
     case WM_KEYDOWN:
       return HEXEDIT_WM_KEYDOWN(hed, (INT)wParam);
     
@@ -839,7 +858,18 @@ HexEditWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
       return HEXEDIT_WM_SIZE(hed, (DWORD)wParam, LOWORD(lParam), HIWORD(lParam));
     
     case WM_MOUSEWHEEL:
-      return HEXEDIT_WM_MOUSEWHEEL(hed, ((SHORT)(wParam >> 16) < 0 ? 3 : -3), LOWORD(wParam), &MAKEPOINTS(lParam));
+    {
+      UINT nScrollLines = 3;
+      int delta = 0;
+      
+      SystemParametersInfoW(SPI_GETWHEELSCROLLLINES, 0, &nScrollLines, 0);
+      delta -= (SHORT)HIWORD(wParam);
+      if(abs(delta) >= WHEEL_DELTA && nScrollLines != 0)
+      {
+        return HEXEDIT_WM_MOUSEWHEEL(hed, nScrollLines * (delta / WHEEL_DELTA), LOWORD(wParam), &MAKEPOINTS(lParam));
+      }
+      break;
+    }
     
     case HEM_LOADBUFFER:
       return HEXEDIT_HEM_LOADBUFFER(hed, (PVOID)wParam, (DWORD)lParam);
@@ -856,6 +886,9 @@ HexEditWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
     case WM_KILLFOCUS:
       return HEXEDIT_WM_KILLFOCUS(hed);
     
+    case WM_GETDLGCODE:
+      return HEXEDIT_WM_GETDLGCODE((LPMSG)lParam);
+    
     case WM_SETFONT:
       return HEXEDIT_WM_SETFONT(hed, (HFONT)wParam, (BOOL)LOWORD(lParam));
     

From d0ea8e8ce1fc42e9c430af51472a9acf993dd2d6 Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Thu, 1 Jul 2004 23:56:04 +0000
Subject: [PATCH 160/356] merge patch from wine by Robert Shearman
 (http://www.winehq.org/hypermail/wine-patches/2004/06/0108.html)

svn path=/trunk/; revision=9962
---
 reactos/subsys/system/regedit/treeview.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/reactos/subsys/system/regedit/treeview.c b/reactos/subsys/system/regedit/treeview.c
index 7131adb610e..c7cf2e8dcf6 100644
--- a/reactos/subsys/system/regedit/treeview.c
+++ b/reactos/subsys/system/regedit/treeview.c
@@ -203,6 +203,7 @@ BOOL OnTreeExpanding(HWND hwndTV, NMTREEVIEW* pnmtv)
     LPCTSTR keyPath;
     LPTSTR Name;
     LONG errCode;
+    HCURSOR hcursorOld;
 
     static int expanding;
     if (expanding) return FALSE;
@@ -210,6 +211,8 @@ BOOL OnTreeExpanding(HWND hwndTV, NMTREEVIEW* pnmtv)
         return TRUE;
     }
     expanding = TRUE;
+    hcursorOld = SetCursor(LoadCursor(NULL, IDC_WAIT));
+    SendMessage(hwndTV, WM_SETREDRAW, FALSE, 0);
 
     keyPath = GetItemPath(hwndTV, pnmtv->itemNew.hItem, &hRoot);
     if (!keyPath) goto done;
@@ -249,6 +252,8 @@ BOOL OnTreeExpanding(HWND hwndTV, NMTREEVIEW* pnmtv)
     HeapFree(GetProcessHeap(), 0, Name);
 
 done:
+    SendMessage(hwndTV, WM_SETREDRAW, TRUE, 0);
+    SetCursor(hcursorOld);
     expanding = FALSE;
 
     return TRUE;

From 8467d37d7d6d2bdc437a1a8c59a5b6c3f2666b95 Mon Sep 17 00:00:00 2001
From: Royce Mitchell III <royce3@ev1.net>
Date: Thu, 1 Jul 2004 23:58:44 +0000
Subject: [PATCH 161/356] merge in kjk_hyperion's ZwContinue test

svn path=/trunk/; revision=9963
---
 reactos/apps/tests/zwcontinue/.cvsignore      |   6 +
 reactos/apps/tests/zwcontinue/Makefile        |  23 +++
 reactos/apps/tests/zwcontinue/i386/.cvsignore |   2 +
 .../apps/tests/zwcontinue/i386/zwcontinue.asm |  48 +++++
 reactos/apps/tests/zwcontinue/zwcontinue.c    | 185 ++++++++++++++++++
 5 files changed, 264 insertions(+)
 create mode 100644 reactos/apps/tests/zwcontinue/.cvsignore
 create mode 100644 reactos/apps/tests/zwcontinue/Makefile
 create mode 100644 reactos/apps/tests/zwcontinue/i386/.cvsignore
 create mode 100644 reactos/apps/tests/zwcontinue/i386/zwcontinue.asm
 create mode 100644 reactos/apps/tests/zwcontinue/zwcontinue.c

diff --git a/reactos/apps/tests/zwcontinue/.cvsignore b/reactos/apps/tests/zwcontinue/.cvsignore
new file mode 100644
index 00000000000..d63774a7353
--- /dev/null
+++ b/reactos/apps/tests/zwcontinue/.cvsignore
@@ -0,0 +1,6 @@
+*.o
+*.d
+*.exe
+*.coff
+*.sym
+*.map
diff --git a/reactos/apps/tests/zwcontinue/Makefile b/reactos/apps/tests/zwcontinue/Makefile
new file mode 100644
index 00000000000..a99bb3da2dc
--- /dev/null
+++ b/reactos/apps/tests/zwcontinue/Makefile
@@ -0,0 +1,23 @@
+# $Id: Makefile,v 1.2 2004/07/01 23:58:44 royce Exp $
+
+PATH_TO_TOP = ../../..
+
+TARGET_NORC = yes
+
+TARGET_TYPE = program
+
+TARGET_APPTYPE = console
+
+TARGET_NAME = zwcontinue
+
+TARGET_OBJECTS = $(TARGET_NAME).o i386/$(TARGET_NAME).o
+
+TARGET_CFLAGS = -Wall -Werror -D__USE_W32API
+
+TARGET_SDKLIBS = ntdll.a
+
+include $(PATH_TO_TOP)/rules.mak
+
+include $(TOOLS_PATH)/helper.mk
+
+# EOF
diff --git a/reactos/apps/tests/zwcontinue/i386/.cvsignore b/reactos/apps/tests/zwcontinue/i386/.cvsignore
new file mode 100644
index 00000000000..6142305dc12
--- /dev/null
+++ b/reactos/apps/tests/zwcontinue/i386/.cvsignore
@@ -0,0 +1,2 @@
+*.o
+*.d
diff --git a/reactos/apps/tests/zwcontinue/i386/zwcontinue.asm b/reactos/apps/tests/zwcontinue/i386/zwcontinue.asm
new file mode 100644
index 00000000000..c8116412389
--- /dev/null
+++ b/reactos/apps/tests/zwcontinue/i386/zwcontinue.asm
@@ -0,0 +1,48 @@
+cpu 486
+segment .text use32
+
+extern _check
+
+global _continuePoint
+_continuePoint:
+ push ss
+ push dword 0
+ pushfd
+ push cs
+ push _continuePoint
+ push ebp
+
+ push eax
+ push ecx
+ push edx
+ push ebx
+ push esi
+ push edi
+
+ push ds
+ push es
+ push fs
+ push gs
+
+ ; TODO: floating point state
+ sub esp, 70h
+
+ ; Debug registers
+ sub esp, 18h
+
+ push dword 00010007h
+
+ ; Fill the Esp field
+ lea eax, [esp+0CCh]
+ lea ecx, [esp+0C4h]
+ mov [ecx], eax
+
+ ; Call the function that will compare the current context with the expected one
+ cld
+ push esp
+ call _check
+
+ ; check() must not return
+ int 3
+
+; EOF
diff --git a/reactos/apps/tests/zwcontinue/zwcontinue.c b/reactos/apps/tests/zwcontinue/zwcontinue.c
new file mode 100644
index 00000000000..637f0221c51
--- /dev/null
+++ b/reactos/apps/tests/zwcontinue/zwcontinue.c
@@ -0,0 +1,185 @@
+#define WIN32_LEAN_AND_MEAN
+#define STRICT
+#include <windows.h>
+
+#include <assert.h>
+#include <setjmp.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <limits.h>
+#include <time.h>
+
+static unsigned int nRandBytes;
+
+static int initrand(void)
+{
+ unsigned int nRandMax;
+ unsigned int nRandMaxBits;
+ time_t tLoc;
+
+ nRandMax = RAND_MAX;
+
+ for(nRandMaxBits = 0; nRandMax != 0; nRandMax >>= 1, ++ nRandMaxBits);
+
+ nRandBytes = nRandMaxBits / CHAR_BIT;
+
+ assert(nRandBytes != 0);
+
+ srand((unsigned)(time(&tLoc) & UINT_MAX));
+
+ return 1;
+}
+
+static void randbytes(void * p, size_t n)
+{
+ unsigned char * b;
+ size_t i;
+ int r;
+
+ b = (unsigned char *)p;
+
+ for(i = 0; i < n; ++ i)
+ {
+  if(i % nRandBytes == 0)
+   r = rand();
+
+  b[i] = (unsigned char)(r & UCHAR_MAX);
+  r >>= CHAR_BIT;
+ }
+}
+
+static ULONG randULONG(void)
+{
+ ULONG n;
+ randbytes(&n, sizeof(n));
+ return n;
+}
+
+#ifdef _M_IX86
+#define ZWC_SEGMENT_BITS (0xFFFF)
+#define ZWC_EFLAGS_BITS  (0x3C0CD5)
+#endif
+
+static jmp_buf jmpbuf;
+static CONTEXT continueContext;
+
+extern void continuePoint(void);
+extern void check(CONTEXT *);
+extern LONG NTAPI ZwContinue(IN CONTEXT *, IN BOOLEAN);
+
+void check(CONTEXT * actualContext)
+{
+#ifdef _M_IX86
+ assert(actualContext->ContextFlags == CONTEXT_FULL);
+
+ /* Random data segments */
+ assert
+ (
+  (actualContext->SegGs & ZWC_SEGMENT_BITS) ==
+  (continueContext.SegGs & ZWC_SEGMENT_BITS)
+ );
+
+ assert
+ (
+  (actualContext->SegFs & ZWC_SEGMENT_BITS) ==
+  (continueContext.SegFs & ZWC_SEGMENT_BITS)
+ );
+
+ assert
+ (
+  (actualContext->SegEs & ZWC_SEGMENT_BITS) ==
+  (continueContext.SegEs & ZWC_SEGMENT_BITS)
+ );
+
+ assert
+ (
+  (actualContext->SegDs & ZWC_SEGMENT_BITS) ==
+  (continueContext.SegDs & ZWC_SEGMENT_BITS)
+ );
+
+ /* Integer registers */
+ assert(actualContext->Edi == continueContext.Edi);
+ assert(actualContext->Esi == continueContext.Esi);
+ assert(actualContext->Ebx == continueContext.Ebx);
+ printf("%s %lX : %lX\n", "Edx", actualContext->Edx, continueContext.Edx);
+ //assert(actualContext->Edx == continueContext.Edx);
+ assert(actualContext->Ecx == continueContext.Ecx);
+ assert(actualContext->Eax == continueContext.Eax);
+
+ /* Control registers and segments */
+ assert(actualContext->Ebp == continueContext.Ebp);
+ assert(actualContext->Eip == continueContext.Eip);
+
+ assert
+ (
+  (actualContext->SegCs & ZWC_SEGMENT_BITS) ==
+  (continueContext.SegCs & ZWC_SEGMENT_BITS)
+ );
+
+ assert
+ (
+  (actualContext->EFlags & ZWC_EFLAGS_BITS) ==
+  (continueContext.EFlags & ZWC_EFLAGS_BITS)
+ );
+ 
+ assert(actualContext->Esp == continueContext.Esp);
+ 
+ assert
+ (
+  (actualContext->SegSs & ZWC_SEGMENT_BITS) ==
+  (continueContext.SegSs & ZWC_SEGMENT_BITS)
+ );
+#endif
+
+ longjmp(jmpbuf, 1);
+}
+
+int main(void)
+{
+ initrand();
+
+ /* First time */
+ if(setjmp(jmpbuf) == 0)
+ {
+  CONTEXT bogus;
+
+  continueContext.ContextFlags = CONTEXT_FULL;
+  GetThreadContext(GetCurrentThread(), &continueContext);
+
+#ifdef _M_IX86
+  continueContext.ContextFlags = CONTEXT_FULL;
+
+  /* Fill the integer registers with random values */
+  continueContext.Edi = randULONG();
+  continueContext.Esi = randULONG();
+  continueContext.Ebx = randULONG();
+  continueContext.Edx = randULONG();
+  continueContext.Ecx = randULONG();
+  continueContext.Eax = randULONG();
+  continueContext.Ebp = randULONG();
+
+  /* Randomize all the allowed flags (determined experimentally with WinDbg) */
+  continueContext.EFlags = randULONG() & 0x3C0CD5;
+
+  /* Randomize the stack pointer as much as possible */
+  continueContext.Esp =
+   (ULONG)(((ULONG_PTR)&bogus) & 0xFFFFFFFF) +
+   sizeof(bogus) -
+   (randULONG() & 0xF) * 4;
+
+  /* continuePoint() is implemented in assembler */
+  continueContext.Eip = (ULONG)((ULONG_PTR)continuePoint & 0xFFFFFFF);
+
+  /* Can't do a lot about segments */
+#endif
+
+  ZwContinue(&continueContext, FALSE);
+ }
+ /* Second time */
+ else
+  return 0;
+
+ assert(0);
+ return 1;
+}

From 837baf14b463d5ed67ae0c125b28649e6f8a5b40 Mon Sep 17 00:00:00 2001
From: Royce Mitchell III <royce3@ev1.net>
Date: Fri, 2 Jul 2004 00:47:57 +0000
Subject: [PATCH 162/356] NtContinue fixed to return failure on invalid params
 ( not checking for access violations yet ), but not clobber EAX on success.
 This patch was made possiblel by the collaborative efforts of myself,
 kjk_hyperion, Art Yerkes, and Skywing.

svn path=/trunk/; revision=9964
---
 reactos/ntoskrnl/Makefile.i386      |  5 +-
 reactos/ntoskrnl/ke/i386/syscall.S  | 21 +++++-
 reactos/ntoskrnl/ps/i386/continue.c | 99 +++++++++++++++++++++++++++++
 reactos/ntoskrnl/ps/thread.c        | 98 +++++++++++-----------------
 4 files changed, 157 insertions(+), 66 deletions(-)
 create mode 100644 reactos/ntoskrnl/ps/i386/continue.c

diff --git a/reactos/ntoskrnl/Makefile.i386 b/reactos/ntoskrnl/Makefile.i386
index 0d8870edf2f..76c401c421d 100644
--- a/reactos/ntoskrnl/Makefile.i386
+++ b/reactos/ntoskrnl/Makefile.i386
@@ -51,7 +51,10 @@ OBJECTS_RTL_I386 := \
 	rtl/i386/exception.o \
 	rtl/i386/seh.o
 
+OBJECTS_PS_I386 := \
+	ps/i386/continue.o
+
 RTL_EXCLUDE_FILTER := 
 
 OBJECTS_ARCH = $(OBJECTS_BOOT) $(OBJECTS_EX_I386) $(OBJECTS_KE_I386) $(OBJECTS_MM_I386) \
-  $(OBJECTS_RTL_I386)
+  $(OBJECTS_RTL_I386) $(OBJECTS_PS_I386)
diff --git a/reactos/ntoskrnl/ke/i386/syscall.S b/reactos/ntoskrnl/ke/i386/syscall.S
index db7a885abe7..78de008b62b 100644
--- a/reactos/ntoskrnl/ke/i386/syscall.S
+++ b/reactos/ntoskrnl/ke/i386/syscall.S
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: syscall.S,v 1.15 2004/07/01 01:52:37 royce Exp $
+/* $Id: syscall.S,v 1.16 2004/07/02 00:47:57 royce Exp $
  *
  * FILE:            ntoskrnl/hal/x86/syscall.s
  * PURPOSE:         2E trap handler
@@ -94,6 +94,7 @@ L3:
 	pushl $0     /* XXX: TempCS */
 	pushl $0     /* XXX: DebugPointer */
 	pushl $0     /* XXX: DebugArgMark */
+
 #ifdef DBG
 	/* Trick gdb 6 into backtracing over the system call */
 	movl  4(%ebp), %ebx
@@ -260,6 +261,17 @@ KeReturnFromSystemCall:
 	movl  %ebx, KTHREAD_TRAP_FRAME(%esi)
 
 KiRosTrapReturn:
+
+#if 0
+	mov   KTRAP_FRAME_RESERVED1(%ebp), %ax
+	cmp   %ax, SSIDX_NTCONTINUE
+	jnz   KeNoEpilogPrint
+	movl  KTRAP_FRAME_ESP(%ebp), %ecx
+	movl  KTRAP_FRAME_EBP(%ebp), %edx
+	call  @KeRosPrintEspEbp@8
+KeNoEpilogPrint:
+#endif
+
 	/* Skip debug information and unsaved registers */
 	addl  $0x30, %esp
 	popl  %gs
@@ -291,6 +303,11 @@ KiRosTrapReturn:
  */
 .globl @KeRosTrapReturn@8
 @KeRosTrapReturn@8:
+
+	/* point %esp to the trap frame to restore */
+	movl  %ecx, %esp
+	movl  %esp, %ebp
+
 	/* Call the post system call hook and deliver any pending APCs */
 	pushl %esp
 	call  _KiAfterSystemCallHook
@@ -302,6 +319,4 @@ KiRosTrapReturn:
 	/* Restore the old trap frame pointer */
 	movl  %edx, KTHREAD_TRAP_FRAME(%esi)
 
-	/* point %esp to the trap frame to restore */
-	movl  %ecx, %esp
 	jmp   KiRosTrapReturn;
diff --git a/reactos/ntoskrnl/ps/i386/continue.c b/reactos/ntoskrnl/ps/i386/continue.c
new file mode 100644
index 00000000000..00fdd8c5e14
--- /dev/null
+++ b/reactos/ntoskrnl/ps/i386/continue.c
@@ -0,0 +1,99 @@
+/* $Id: continue.c,v 1.1 2004/07/02 00:47:57 royce Exp $
+ *
+ * COPYRIGHT:              See COPYING in the top level directory
+ * PROJECT:                ReactOS kernel
+ * FILE:                   ntoskrnl/ps/i386/continue.c
+ * PURPOSE:                i386 implementation of NtContinue()
+ * PROGRAMMER:             Royce Mitchell III, kjk_hyperion
+ * REVISION HISTORY:
+ *               29/06/04: Created
+ */
+
+/* INCLUDES ****************************************************************/
+
+#include <ddk/ntddk.h>
+#include <internal/ke.h>
+#include <internal/ob.h>
+#include <internal/ps.h>
+#include <internal/ob.h>
+#include <internal/pool.h>
+#include <ntos/minmax.h>
+#include <internal/ldr.h>
+#include <rosrtl/string.h>
+
+#define NDEBUG
+#include <internal/debug.h>
+
+#if 1
+VOID
+FASTCALL
+KeRosTrapReturn ( PKTRAP_FRAME TrapFrame, PKTRAP_FRAME PrevTrapFrame );
+
+VOID STDCALL
+KeRosDumpStackFrames ( PULONG Frame, ULONG FrameCount );
+
+/*
+ * @implemented
+ */
+NTSTATUS STDCALL
+NtContinue (
+	IN PCONTEXT Context,
+	IN BOOLEAN TestAlert)
+{
+	PKTRAP_FRAME TrapFrame = KeGetCurrentThread()->TrapFrame;
+	PKTRAP_FRAME PrevTrapFrame = (PKTRAP_FRAME)TrapFrame->Edx;
+
+	DPRINT1("NtContinue: Context: Eip=0x%x, Esp=0x%x\n", Context->Eip, Context->Esp );
+	PULONG Frame = 0;
+	__asm__("mov %%ebp, %%ebx" : "=b" (Frame) : );
+	DbgPrint ( "NtContinue(): Ebp=%x, prev/TF=%x/%x\n", Frame, Frame[0], TrapFrame );
+	KeRosDumpStackFrames(NULL,5);
+
+	if ( Context == NULL )
+	{
+		DPRINT1("NtContinue called with NULL Context\n");
+		return STATUS_INVALID_PARAMETER;
+	}
+
+	if ( TrapFrame == NULL )
+	{
+		CPRINT("NtContinue called but TrapFrame was NULL\n");
+		KEBUGCHECK(0);
+	}
+
+	/*
+	* Copy the supplied context over the register information that was saved
+	* on entry to kernel mode, it will then be restored on exit
+	* FIXME: Validate the context
+	*/
+	KeContextToTrapFrame ( Context, TrapFrame );
+
+	KeRosTrapReturn ( TrapFrame, PrevTrapFrame );
+
+	return STATUS_SUCCESS; /* this doesn't actually happen b/c KeRosTrapReturn() won't return */
+}
+#else
+NTSTATUS STDCALL
+NtContinue (
+	IN PCONTEXT Context,
+	IN BOOLEAN TestAlert)
+{
+	PKTRAP_FRAME TrapFrame = KeGetCurrentThread()->TrapFrame;
+	PULONG Frame = 0;
+	__asm__("mov %%ebp, %%ebx" : "=b" (Frame) : );
+	DbgPrint ( "NtContinue(): Ebp=%x, prev/TF=%x/%x\n", Frame, Frame[0], TrapFrame );
+
+	/*
+	 * Copy the supplied context over the register information that was saved
+	 * on entry to kernel mode, it will then be restored on exit
+	 * FIXME: Validate the context
+	 */
+	if ( TrapFrame == NULL )
+	{
+		CPRINT("NtContinue called but TrapFrame was NULL\n");
+		KEBUGCHECK(0);
+	}
+	KeContextToTrapFrame ( Context, TrapFrame );
+	return(STATUS_SUCCESS);
+}
+#endif
diff --git a/reactos/ntoskrnl/ps/thread.c b/reactos/ntoskrnl/ps/thread.c
index a8e33d9b6e8..e04ff087bd6 100644
--- a/reactos/ntoskrnl/ps/thread.c
+++ b/reactos/ntoskrnl/ps/thread.c
@@ -1,21 +1,21 @@
-/* $Id: thread.c,v 1.125 2004/07/01 02:40:23 hyperion Exp $
+/* $Id: thread.c,v 1.126 2004/07/02 00:47:57 royce Exp $
  *
  * COPYRIGHT:              See COPYING in the top level directory
  * PROJECT:                ReactOS kernel
  * FILE:                   ntoskrnl/ps/thread.c
  * PURPOSE:                Thread managment
  * PROGRAMMER:             David Welch (welch@mcmail.com)
- * REVISION HISTORY: 
+ * REVISION HISTORY:
  *               23/06/98: Created
  *               12/10/99: Phillip Susi:  Thread priorities, and APC work
  */
 
 /*
  * NOTE:
- * 
+ *
  * All of the routines that manipulate the thread queue synchronize on
  * a single spinlock
- * 
+ *
  */
 
 /* INCLUDES ****************************************************************/
@@ -79,7 +79,7 @@ HANDLE STDCALL PsGetCurrentThreadId(VOID)
    return(PsGetCurrentThread()->Cid.UniqueThread);
 }
 
-static VOID 
+static VOID
 PsInsertIntoThreadList(KPRIORITY Priority, PETHREAD Thread)
 {
    assert(THREAD_STATE_READY == Thread->Tcb.State);
@@ -111,16 +111,16 @@ VOID PsDumpThreads(BOOLEAN IncludeSystem)
    PETHREAD current;
    ULONG t;
    ULONG i;
-   
+
    current_entry = PiThreadListHead.Flink;
    t = 0;
-   
+
    while (current_entry != &PiThreadListHead)
      {
        PULONG Ebp;
        PULONG Esp;
 
-       current = CONTAINING_RECORD(current_entry, ETHREAD, 
+       current = CONTAINING_RECORD(current_entry, ETHREAD,
 				   Tcb.ThreadListEntry);
        t++;
        if (t > PiNrThreads)
@@ -131,9 +131,9 @@ VOID PsDumpThreads(BOOLEAN IncludeSystem)
        if (IncludeSystem || current->ThreadsProcess->UniqueProcessId >= 6)
 	 {
 	   DbgPrint("current->Tcb.State %d PID.TID %d.%d Name %.8s Stack: \n",
-		    current->Tcb.State, 
+		    current->Tcb.State,
 		    current->ThreadsProcess->UniqueProcessId,
-		    current->Cid.UniqueThread, 
+		    current->Cid.UniqueThread,
 		    current->ThreadsProcess->ImageFileName);
 	   if (current->Tcb.State == THREAD_STATE_READY ||
 	       current->Tcb.State == THREAD_STATE_SUSPENDED ||
@@ -227,7 +227,7 @@ VOID PsDispatchThreadNoLock (ULONG NewThreadStatus)
 
    DPRINT("PsDispatchThread() %d/%d/%d/%d\n", KeGetCurrentProcessorNumber(),
 	   CurrentThread->Cid.UniqueThread, NewThreadStatus, CurrentThread->Tcb.State);
-   
+
    CurrentThread->Tcb.State = (UCHAR)NewThreadStatus;
    if (CurrentThread->Tcb.State == THREAD_STATE_READY)
      {
@@ -238,7 +238,7 @@ VOID PsDispatchThreadNoLock (ULONG NewThreadStatus)
      {
        PiNrThreadsAwaitingReaping++;
      }
-   
+
    Affinity = 1 << KeGetCurrentProcessorNumber();
    for (CurrentPriority = HIGH_PRIORITY;
 	CurrentPriority >= LOW_PRIORITY;
@@ -256,12 +256,12 @@ VOID PsDispatchThreadNoLock (ULONG NewThreadStatus)
 	    PETHREAD OldThread;
 
 	    DPRINT("Scheduling %x(%d)\n",Candidate, CurrentPriority);
-	    
+
 	    Candidate->Tcb.State = THREAD_STATE_RUNNING;
-	    
+
 	    OldThread = CurrentThread;
 	    CurrentThread = Candidate;
-#if 0	    
+#if 0
             /*
 	     * This code is moved to the end of KiArchContextSwitch.
 	     * It should be execute after the context switch.
@@ -271,7 +271,7 @@ VOID PsDispatchThreadNoLock (ULONG NewThreadStatus)
 	      {
 		PiWakeupReaperThread();
 	      }
-#endif 
+#endif
 	    KiArchContextSwitch(&CurrentThread->Tcb, &OldThread->Tcb);
 	    return;
 	  }
@@ -284,12 +284,12 @@ VOID STDCALL
 PsDispatchThread(ULONG NewThreadStatus)
 {
    KIRQL oldIrql;
-   
+
    if (!DoneInitYet)
      {
 	return;
      }
-   
+
    KeAcquireSpinLock(&PiThreadListLock, &oldIrql);
    /*
     * Save wait IRQL
@@ -385,8 +385,8 @@ PsBlockThread(PNTSTATUS Status, UCHAR Alertable, ULONG WaitMode,
 VOID
 PsFreezeAllThreads(PEPROCESS Process)
      /*
-      * Used by the debugging code to freeze all the process's threads 
-      * while the debugger is examining their state. 
+      * Used by the debugging code to freeze all the process's threads
+      * while the debugger is examining their state.
       */
 {
   KIRQL oldIrql;
@@ -398,7 +398,7 @@ PsFreezeAllThreads(PEPROCESS Process)
   current_entry = Process->ThreadListHead.Flink;
   while (current_entry != &Process->ThreadListHead)
     {
-      current = CONTAINING_RECORD(current_entry, ETHREAD, 
+      current = CONTAINING_RECORD(current_entry, ETHREAD,
 				  Tcb.ProcessThreadListEntry);
 
       /*
@@ -408,14 +408,14 @@ PsFreezeAllThreads(PEPROCESS Process)
 
       current_entry = current_entry->Flink;
     }
-  
+
   KeReleaseSpinLock(&PiThreadListLock, oldIrql);
 }
 
 VOID
 PsApplicationProcessorInit(VOID)
 {
-  ((PIKPCR) KeGetCurrentKPCR())->CurrentThread = 
+  ((PIKPCR) KeGetCurrentKPCR())->CurrentThread =
     (PVOID)IdleThreads[KeGetCurrentProcessorNumber()];
 }
 
@@ -429,7 +429,7 @@ PsPrepareForApplicationProcessorInit(ULONG Id)
 		     &IdleThread,
 		     &IdleThreadHandle,
 		     THREAD_ALL_ACCESS,
-		     NULL, 
+		     NULL,
 		     TRUE);
   IdleThread->Tcb.State = THREAD_STATE_RUNNING;
   IdleThread->Tcb.FreezeCount = 0;
@@ -452,7 +452,7 @@ PsInitThreadManagment(VOID)
    ULONG i;
    HANDLE FirstThreadHandle;
    NTSTATUS Status;
-   
+
    KeInitializeSpinLock(&PiThreadListLock);
    for (i=0; i < MAXIMUM_PRIORITY; i++)
      {
@@ -460,9 +460,9 @@ PsInitThreadManagment(VOID)
      }
 
    InitializeListHead(&PiThreadListHead);
-   
+
    PsThreadType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE));
-   
+
    PsThreadType->Tag = TAG('T', 'H', 'R', 'T');
    PsThreadType->TotalObjects = 0;
    PsThreadType->TotalHandles = 0;
@@ -481,9 +481,9 @@ PsInitThreadManagment(VOID)
    PsThreadType->OkayToClose = NULL;
    PsThreadType->Create = NULL;
    PsThreadType->DuplicationNotify = NULL;
-   
+
    RtlRosInitUnicodeStringFromLiteral(&PsThreadType->TypeName, L"Thread");
-   
+
    ObpCreateTypeObject(PsThreadType);
 
    PsInitializeThread(NULL,&FirstThread,&FirstThreadHandle,
@@ -492,9 +492,9 @@ PsInitThreadManagment(VOID)
    FirstThread->Tcb.FreezeCount = 0;
    ((PIKPCR) KeGetCurrentKPCR())->CurrentThread = (PVOID)FirstThread;
    NtClose(FirstThreadHandle);
-   
+
    DPRINT("FirstThread %x\n",FirstThread);
-      
+
    DoneInitYet = TRUE;
 
    /*
@@ -559,12 +559,12 @@ KeSetPriorityThread (PKTHREAD Thread, KPRIORITY Priority)
    KIRQL oldIrql;
    PKTHREAD CurrentThread;
    ULONG Mask;
-   
+
    if (Priority < LOW_PRIORITY || Priority >= MAXIMUM_PRIORITY)
      {
 	KEBUGCHECK(0);
      }
-   
+
    KeAcquireSpinLock(&PiThreadListLock, &oldIrql);
 
    OldPriority = Thread->Priority;
@@ -635,7 +635,7 @@ NtAlertThread (IN HANDLE ThreadHandle)
    PETHREAD Thread;
    NTSTATUS Status;
    NTSTATUS ThreadStatus;
-   
+
    Status = ObReferenceObjectByHandle(ThreadHandle,
 				      THREAD_SUSPEND_RESUME,
 				      PsThreadType,
@@ -646,10 +646,10 @@ NtAlertThread (IN HANDLE ThreadHandle)
      {
 	return(Status);
      }
-   
+
    ThreadStatus = STATUS_ALERTED;
    (VOID)PsUnblockThread(Thread, &ThreadStatus);
-   
+
    ObDereferenceObject(Thread);
    return(STATUS_SUCCESS);
 }
@@ -721,32 +721,6 @@ NtOpenThread(OUT PHANDLE ThreadHandle,
    return(Status);
 }
 
-NTSTATUS STDCALL
-NtContinue(IN PCONTEXT	Context,
-	   IN BOOLEAN TestAlert)
-{
-   PKTRAP_FRAME TrapFrame;
-   
-   /*
-    * Copy the supplied context over the register information that was saved
-    * on entry to kernel mode, it will then be restored on exit
-    * FIXME: Validate the context
-    */
-   TrapFrame = KeGetCurrentThread()->TrapFrame;
-   if (TrapFrame == NULL)
-     {
-	CPRINT("NtContinue called but TrapFrame was NULL\n");
-	KEBUGCHECK(0);
-     }
-   KeContextToTrapFrame(Context, TrapFrame);
-
-   if(TestAlert)
-    KiTestAlert();
-
-   return(STATUS_SUCCESS);
-}
-
-
 NTSTATUS STDCALL
 NtYieldExecution(VOID)
 {

From 22755559276b140324414713c0d9df02c6e82752 Mon Sep 17 00:00:00 2001
From: Royce Mitchell III <royce3@ev1.net>
Date: Fri, 2 Jul 2004 01:23:26 +0000
Subject: [PATCH 163/356] (remove old disabled code)

svn path=/trunk/; revision=9965
---
 reactos/ntoskrnl/ps/i386/continue.c | 28 +---------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/reactos/ntoskrnl/ps/i386/continue.c b/reactos/ntoskrnl/ps/i386/continue.c
index 00fdd8c5e14..8e32a7c9b13 100644
--- a/reactos/ntoskrnl/ps/i386/continue.c
+++ b/reactos/ntoskrnl/ps/i386/continue.c
@@ -1,4 +1,4 @@
-/* $Id: continue.c,v 1.1 2004/07/02 00:47:57 royce Exp $
+/* $Id: continue.c,v 1.2 2004/07/02 01:23:26 royce Exp $
  *
  * COPYRIGHT:              See COPYING in the top level directory
  * PROJECT:                ReactOS kernel
@@ -24,7 +24,6 @@
 #define NDEBUG
 #include <internal/debug.h>
 
-#if 1
 VOID
 FASTCALL
 KeRosTrapReturn ( PKTRAP_FRAME TrapFrame, PKTRAP_FRAME PrevTrapFrame );
@@ -72,28 +71,3 @@ NtContinue (
 
 	return STATUS_SUCCESS; /* this doesn't actually happen b/c KeRosTrapReturn() won't return */
 }
-#else
-NTSTATUS STDCALL
-NtContinue (
-	IN PCONTEXT Context,
-	IN BOOLEAN TestAlert)
-{
-	PKTRAP_FRAME TrapFrame = KeGetCurrentThread()->TrapFrame;
-	PULONG Frame = 0;
-	__asm__("mov %%ebp, %%ebx" : "=b" (Frame) : );
-	DbgPrint ( "NtContinue(): Ebp=%x, prev/TF=%x/%x\n", Frame, Frame[0], TrapFrame );
-
-	/*
-	 * Copy the supplied context over the register information that was saved
-	 * on entry to kernel mode, it will then be restored on exit
-	 * FIXME: Validate the context
-	 */
-	if ( TrapFrame == NULL )
-	{
-		CPRINT("NtContinue called but TrapFrame was NULL\n");
-		KEBUGCHECK(0);
-	}
-	KeContextToTrapFrame ( Context, TrapFrame );
-	return(STATUS_SUCCESS);
-}
-#endif

From 6a225669b558a974dacf5d0833e0dd80ec6873a7 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Fri, 2 Jul 2004 01:26:29 +0000
Subject: [PATCH 164/356] Services file for WS2_32.dll, created by Cameron
 Palmer.

svn path=/trunk/; revision=9966
---
 reactos/media/drivers/etc/services | 8234 ++++++++++++++++++++++++++++
 1 file changed, 8234 insertions(+)
 create mode 100644 reactos/media/drivers/etc/services

diff --git a/reactos/media/drivers/etc/services b/reactos/media/drivers/etc/services
new file mode 100644
index 00000000000..3fc6e36df6f
--- /dev/null
+++ b/reactos/media/drivers/etc/services
@@ -0,0 +1,8234 @@
+# The ReactOS services file
+#
+# This file contains port numbers for well-known services defined by IANA
+#
+# The Well Known Ports are thuse from 0 through 1023
+# The Registered Ports are those from 1024 through 49151
+# The Dynamic and/or Private Ports are those from 49152 through 65535
+#
+# Format:
+# <service name>  <port number>/<protocol>  [aliases...]   [#<comment>]
+#
+
+tcpmux              1/tcp  #TCP Port Service Multiplexer
+tcpmux              1/udp  #TCP Port Service Multiplexer
+compressnet         2/tcp  #Management Utility
+compressnet         2/udp  #Management Utility
+compressnet         3/tcp  #Compression Process
+compressnet         3/udp  #Compression Process
+rje                 5/tcp  #Remote Job Entry
+rje                 5/udp  #Remote Job Entry
+echo                7/tcp  #Echo
+echo                7/udp  #Echo
+discard             9/tcp  #Discard
+discard             9/udp  #Discard
+systat              11/tcp  #Active Users
+systat              11/udp  #Active Users
+daytime             13/tcp  #Daytime (RFC 867)
+daytime             13/udp  #Daytime (RFC 867)
+qotd                17/tcp  #Quote of the Day
+qotd                17/udp  #Quote of the Day
+msp                 18/tcp  #Message Send Protocol
+msp                 18/udp  #Message Send Protocol
+chargen             19/tcp  #Character Generator
+chargen             19/udp  #Character Generator
+ftp-data            20/tcp  #File Transfer [Default Data]
+ftp-data            20/udp  #File Transfer [Default Data]
+ftp                 21/tcp  #File Transfer [Control]
+ftp                 21/udp  #File Transfer [Control]
+ssh                 22/tcp  #SSH Remote Login Protocol
+ssh                 22/udp  #SSH Remote Login Protocol
+telnet              23/tcp  #Telnet
+telnet              23/udp  #Telnet
+smtp                25/tcp  #Simple Mail Transfer
+smtp                25/udp  #Simple Mail Transfer
+nsw-fe              27/tcp  #NSW User System FE
+nsw-fe              27/udp  #NSW User System FE
+msg-icp             29/tcp  #MSG ICP
+msg-icp             29/udp  #MSG ICP
+msg-auth            31/tcp  #MSG Authentication
+msg-auth            31/udp  #MSG Authentication
+dsp                 33/tcp  #Display Support Protocol
+dsp                 33/udp  #Display Support Protocol
+time                37/tcp  #Time
+time                37/udp  #Time
+rap                 38/tcp  #Route Access Protocol
+rap                 38/udp  #Route Access Protocol
+rlp                 39/tcp  #Resource Location Protocol
+rlp                 39/udp  #Resource Location Protocol
+graphics            41/tcp  #Graphics
+graphics            41/udp  #Graphics
+name                42/tcp  #Host Name Server
+name                42/udp  #Host Name Server
+nameserver          42/tcp  #Host Name Server
+nameserver          42/udp  #Host Name Server
+nicname             43/tcp  #Who Is
+nicname             43/udp  #Who Is
+mpm-flags           44/tcp  #MPM FLAGS Protocol
+mpm-flags           44/udp  #MPM FLAGS Protocol
+mpm                 45/tcp  #Message Processing Module [recv]
+mpm                 45/udp  #Message Processing Module [recv]
+mpm-snd             46/tcp  #MPM [default send]
+mpm-snd             46/udp  #MPM [default send]
+ni-ftp              47/tcp  #NI FTP
+ni-ftp              47/udp  #NI FTP
+auditd              48/tcp  #Digital Audit Daemon
+auditd              48/udp  #Digital Audit Daemon
+tacacs              49/tcp  #Login Host Protocol (TACACS)
+tacacs              49/udp  #Login Host Protocol (TACACS)
+re-mail-ck          50/tcp  #Remote Mail Checking Protocol
+re-mail-ck          50/udp  #Remote Mail Checking Protocol
+la-maint            51/tcp  #IMP Logical Address Maintenance
+la-maint            51/udp  #IMP Logical Address Maintenance
+xns-time            52/tcp  #XNS Time Protocol
+xns-time            52/udp  #XNS Time Protocol
+domain              53/tcp  #Domain Name Server
+domain              53/udp  #Domain Name Server
+xns-ch              54/tcp  #XNS Clearinghouse
+xns-ch              54/udp  #XNS Clearinghouse
+isi-gl              55/tcp  #ISI Graphics Language
+isi-gl              55/udp  #ISI Graphics Language
+xns-auth            56/tcp  #XNS Authentication
+xns-auth            56/udp  #XNS Authentication
+xns-mail            58/tcp  #XNS Mail
+xns-mail            58/udp  #XNS Mail
+ni-mail             61/tcp  #NI MAIL
+ni-mail             61/udp  #NI MAIL
+acas                62/tcp  #ACA Services
+acas                62/udp  #ACA Services
+whois++             63/tcp  #whois++
+whois++             63/udp  #whois++
+covia               64/tcp  #Communications Integrator (CI)
+covia               64/udp  #Communications Integrator (CI)
+tacacs-ds           65/tcp  #TACACS-Database Service
+tacacs-ds           65/udp  #TACACS-Database Service
+sql*net             66/tcp  #Oracle SQL*NET
+sql*net             66/udp  #Oracle SQL*NET
+bootps              67/tcp  #Bootstrap Protocol Server
+bootps              67/udp  #Bootstrap Protocol Server
+bootpc              68/tcp  #Bootstrap Protocol Client
+bootpc              68/udp  #Bootstrap Protocol Client
+tftp                69/tcp  #Trivial File Transfer
+tftp                69/udp  #Trivial File Transfer
+gopher              70/tcp  #Gopher
+gopher              70/udp  #Gopher
+netrjs-1            71/tcp  #Remote Job Service
+netrjs-1            71/udp  #Remote Job Service
+netrjs-2            72/tcp  #Remote Job Service
+netrjs-2            72/udp  #Remote Job Service
+netrjs-3            73/tcp  #Remote Job Service
+netrjs-3            73/udp  #Remote Job Service
+netrjs-4            74/tcp  #Remote Job Service
+netrjs-4            74/udp  #Remote Job Service
+deos                76/tcp  #Distributed External Object Store
+deos                76/udp  #Distributed External Object Store
+vettcp              78/tcp  #vettcp
+vettcp              78/udp  #vettcp
+finger              79/tcp  #Finger
+finger              79/udp  #Finger
+http                80/tcp  #World Wide Web HTTP
+http                80/udp  #World Wide Web HTTP
+www                 80/tcp  #World Wide Web HTTP
+www                 80/udp  #World Wide Web HTTP
+www-http            80/tcp  #World Wide Web HTTP
+www-http            80/udp  #World Wide Web HTTP
+hosts2-ns           81/tcp  #HOSTS2 Name Server
+hosts2-ns           81/udp  #HOSTS2 Name Server
+xfer                82/tcp  #XFER Utility
+xfer                82/udp  #XFER Utility
+mit-ml-dev          83/tcp  #MIT ML Device
+mit-ml-dev          83/udp  #MIT ML Device
+ctf                 84/tcp  #Common Trace Facility
+ctf                 84/udp  #Common Trace Facility
+mit-ml-dev          85/tcp  #MIT ML Device
+mit-ml-dev          85/udp  #MIT ML Device
+mfcobol             86/tcp  #Micro Focus Cobol
+mfcobol             86/udp  #Micro Focus Cobol
+kerberos            88/tcp  #Kerberos
+kerberos            88/udp  #Kerberos
+su-mit-tg           89/tcp  #SU/MIT Telnet Gateway
+su-mit-tg           89/udp  #SU/MIT Telnet Gateway
+dnsix               90/tcp  #DNSIX Securit Attribute Token Map
+dnsix               90/udp  #DNSIX Securit Attribute Token Map
+mit-dov             91/tcp  #MIT Dover Spooler
+mit-dov             91/udp  #MIT Dover Spooler
+npp                 92/tcp  #Network Printing Protocol
+npp                 92/udp  #Network Printing Protocol
+dcp                 93/tcp  #Device Control Protocol
+dcp                 93/udp  #Device Control Protocol
+objcall             94/tcp  #Tivoli Object Dispatcher
+objcall             94/udp  #Tivoli Object Dispatcher
+supdup              95/tcp  #SUPDUP
+supdup              95/udp  #SUPDUP
+dixie               96/tcp  #DIXIE Protocol Specification
+dixie               96/udp  #DIXIE Protocol Specification
+swift-rvf           97/tcp  #Swift Remote Virtural File Protocol
+swift-rvf           97/udp  #Swift Remote Virtural File Protocol
+tacnews             98/tcp  #TAC News
+tacnews             98/udp  #TAC News
+metagram            99/tcp  #Metagram Relay
+metagram            99/udp  #Metagram Relay
+newacct             100/tcp  #[unauthorized use]
+hostname            101/tcp  #NIC Host Name Server
+hostname            101/udp  #NIC Host Name Server
+iso-tsap            102/tcp  #ISO-TSAP Class 0
+iso-tsap            102/udp  #ISO-TSAP Class 0
+gppitnp             103/tcp  #Genesis Point-to-Point Trans Net
+gppitnp             103/udp  #Genesis Point-to-Point Trans Net
+acr-nema            104/tcp  #ACR-NEMA Digital Imag. & Comm. 300
+acr-nema            104/udp  #ACR-NEMA Digital Imag. & Comm. 300
+cso                 105/tcp  #CCSO name server protocol
+cso                 105/udp  #CCSO name server protocol
+csnet-ns            105/tcp  #Mailbox Name Nameserver
+csnet-ns            105/udp  #Mailbox Name Nameserver
+3com-tsmux          106/tcp  #3COM-TSMUX
+3com-tsmux          106/udp  #3COM-TSMUX
+rtelnet             107/tcp  #Remote Telnet Service
+rtelnet             107/udp  #Remote Telnet Service
+snagas              108/tcp  #SNA Gateway Access Server
+snagas              108/udp  #SNA Gateway Access Server
+pop2                109/tcp  #Post Office Protocol - Version 2
+pop2                109/udp  #Post Office Protocol - Version 2
+pop3                110/tcp  #Post Office Protocol - Version 3
+pop3                110/udp  #Post Office Protocol - Version 3
+sunrpc              111/tcp  #SUN Remote Procedure Call
+sunrpc              111/udp  #SUN Remote Procedure Call
+mcidas              112/tcp  #McIDAS Data Transmission Protocol
+mcidas              112/udp  #McIDAS Data Transmission Protocol
+ident               113/tcp
+auth                113/tcp  #Authentication Service
+auth                113/udp  #Authentication Service
+sftp                115/tcp  #Simple File Transfer Protocol
+sftp                115/udp  #Simple File Transfer Protocol
+ansanotify          116/tcp  #ANSA REX Notify
+ansanotify          116/udp  #ANSA REX Notify
+uucp-path           117/tcp  #UUCP Path Service
+uucp-path           117/udp  #UUCP Path Service
+sqlserv             118/tcp  #SQL Services
+sqlserv             118/udp  #SQL Services
+nntp                119/tcp  #Network News Transfer Protocol
+nntp                119/udp  #Network News Transfer Protocol
+cfdptkt             120/tcp  #CFDPTKT
+cfdptkt             120/udp  #CFDPTKT
+erpc                121/tcp  #Encore Expedited Remote Pro.Call
+erpc                121/udp  #Encore Expedited Remote Pro.Call
+smakynet            122/tcp  #SMAKYNET
+smakynet            122/udp  #SMAKYNET
+ntp                 123/tcp  #Network Time Protocol
+ntp                 123/udp  #Network Time Protocol
+ansatrader          124/tcp  #ANSA REX Trader
+ansatrader          124/udp  #ANSA REX Trader
+locus-map           125/tcp  #Locus PC-Interface Net Map Ser
+locus-map           125/udp  #Locus PC-Interface Net Map Ser
+nxedit              126/tcp  #NXEdit
+nxedit              126/udp  #NXEdit
+locus-con           127/tcp  #Locus PC-Interface Conn Server
+locus-con           127/udp  #Locus PC-Interface Conn Server
+gss-xlicen          128/tcp  #GSS X License Verification
+gss-xlicen          128/udp  #GSS X License Verification
+pwdgen              129/tcp  #Password Generator Protocol
+pwdgen              129/udp  #Password Generator Protocol
+cisco-fna           130/tcp  #cisco FNATIVE
+cisco-fna           130/udp  #cisco FNATIVE
+cisco-tna           131/tcp  #cisco TNATIVE
+cisco-tna           131/udp  #cisco TNATIVE
+cisco-sys           132/tcp  #cisco SYSMAINT
+cisco-sys           132/udp  #cisco SYSMAINT
+statsrv             133/tcp  #Statistics Service
+statsrv             133/udp  #Statistics Service
+ingres-net          134/tcp  #INGRES-NET Service
+ingres-net          134/udp  #INGRES-NET Service
+epmap               135/tcp  #DCE endpoint resolution
+epmap               135/udp  #DCE endpoint resolution
+profile             136/tcp  #PROFILE Naming System           
+profile             136/udp  #PROFILE Naming System           
+netbios-ns          137/tcp  #NETBIOS Name Service    
+netbios-ns          137/udp  #NETBIOS Name Service    
+netbios-dgm         138/tcp  #NETBIOS Datagram Service
+netbios-dgm         138/udp  #NETBIOS Datagram Service
+netbios-ssn         139/tcp  #NETBIOS Session Service
+netbios-ssn         139/udp  #NETBIOS Session Service
+emfis-data          140/tcp  #EMFIS Data Service
+emfis-data          140/udp  #EMFIS Data Service
+emfis-cntl          141/tcp  #EMFIS Control Service
+emfis-cntl          141/udp  #EMFIS Control Service
+bl-idm              142/tcp  #Britton-Lee IDM           
+bl-idm              142/udp  #Britton-Lee IDM           
+imap                143/tcp  #Internet Message Access Protocol
+imap                143/udp  #Internet Message Access Protocol
+uma                 144/tcp  #Universal Management Architecture
+uma                 144/udp  #Universal Management Architecture
+uaac                145/tcp  #UAAC Protocol             
+uaac                145/udp  #UAAC Protocol             
+iso-tp0             146/tcp  #ISO-IP0
+iso-tp0             146/udp  #ISO-IP0
+iso-ip              147/tcp  #ISO-IP
+iso-ip              147/udp  #ISO-IP
+jargon              148/tcp  #Jargon
+jargon              148/udp  #Jargon
+aed-512             149/tcp  #AED 512 Emulation Service           
+aed-512             149/udp  #AED 512 Emulation Service           
+sql-net             150/tcp  #SQL-NET                    
+sql-net             150/udp  #SQL-NET                    
+hems                151/tcp  #HEMS                              
+hems                151/udp  #HEMS                              
+bftp                152/tcp  #Background File Transfer Program 
+bftp                152/udp  #Background File Transfer Program 
+sgmp                153/tcp  #SGMP                    
+sgmp                153/udp  #SGMP                    
+netsc-prod          154/tcp  #NETSC                             
+netsc-prod          154/udp  #NETSC                             
+netsc-dev           155/tcp  #NETSC                             
+netsc-dev           155/udp  #NETSC                             
+sqlsrv              156/tcp  #SQL Service                  
+sqlsrv              156/udp  #SQL Service                  
+knet-cmp            157/tcp  #KNET/VM Command/Message Protocol
+knet-cmp            157/udp  #KNET/VM Command/Message Protocol
+pcmail-srv          158/tcp  #PCMail Server                 
+pcmail-srv          158/udp  #PCMail Server                 
+nss-routing         159/tcp  #NSS-Routing                  
+nss-routing         159/udp  #NSS-Routing                  
+sgmp-traps          160/tcp  #SGMP-TRAPS                
+sgmp-traps          160/udp  #SGMP-TRAPS                
+snmp                161/tcp  #SNMP
+snmp                161/udp  #SNMP
+snmptrap            162/tcp  #SNMPTRAP
+snmptrap            162/udp  #SNMPTRAP
+cmip-man            163/tcp  #CMIP/TCP Manager   
+cmip-man            163/udp  #CMIP/TCP Manager   
+cmip-agent          164/tcp  #CMIP/TCP Agent     
+cmip-agent          164/udp  #CMIP/TCP Agent     
+xns-courier         165/tcp  #Xerox                          
+xns-courier         165/udp  #Xerox                          
+s-net               166/tcp  #Sirius Systems          
+s-net               166/udp  #Sirius Systems          
+namp                167/tcp  #NAMP                    
+namp                167/udp  #NAMP                    
+rsvd                168/tcp  #RSVD                              
+rsvd                168/udp  #RSVD                              
+send                169/tcp  #SEND                              
+send                169/udp  #SEND                              
+print-srv           170/tcp  #Network PostScript              
+print-srv           170/udp  #Network PostScript              
+multiplex           171/tcp  #Network Innovations Multiplex
+multiplex           171/udp  #Network Innovations Multiplex
+xyplex-mux          173/tcp  #Xyplex                          
+xyplex-mux          173/udp  #Xyplex                          
+mailq               174/tcp  #MAILQ                               
+mailq               174/udp  #MAILQ                               
+vmnet               175/tcp  #VMNET                                
+vmnet               175/udp  #VMNET  
+genrad-mux          176/tcp  #GENRAD-MUX                      
+genrad-mux          176/udp  #GENRAD-MUX                      
+xdmcp               177/tcp  #X Display Manager Control Protocol  
+xdmcp               177/udp  #X Display Manager Control Protocol  
+nextstep            178/tcp  #NextStep Window Server     
+nextstep            178/udp  #NextStep Window Server     
+bgp                 179/tcp  #Border Gateway Protocol             
+bgp                 179/udp  #Border Gateway Protocol             
+ris                 180/tcp  #Intergraph                         
+ris                 180/udp  #Intergraph                         
+unify               181/tcp  #Unify                  
+unify               181/udp  #Unify                  
+audit               182/tcp  #Unisys Audit SITP                  
+audit               182/udp  #Unisys Audit SITP                  
+ocbinder            183/tcp  #OCBinder                     
+ocbinder            183/udp  #OCBinder                     
+ocserver            184/tcp  #OCServer                     
+ocserver            184/udp  #OCServer                     
+remote-kis          185/tcp  #Remote-KIS                        
+remote-kis          185/udp  #Remote-KIS                        
+kis                 186/tcp  #KIS Protocol                      
+kis                 186/udp  #KIS Protocol                      
+aci                 187/tcp  #Application Communication Interface
+aci                 187/udp  #Application Communication Interface
+mumps               188/tcp  #Plus Five's MUMPS            
+mumps               188/udp  #Plus Five's MUMPS            
+qft                 189/tcp  #Queued File Transport        
+qft                 189/udp  #Queued File Transport        
+gacp                190/tcp  #Gateway Access Control Protocol
+gacp                190/udp  #Gateway Access Control Protocol
+prospero            191/tcp  #Prospero Directory Service      
+prospero            191/udp  #Prospero Directory Service      
+osu-nms             192/tcp  #OSU Network Monitoring System       
+osu-nms             192/udp  #OSU Network Monitoring System       
+srmp                193/tcp  #Spider Remote Monitoring Protocol 
+srmp                193/udp  #Spider Remote Monitoring Protocol 
+irc                 194/tcp  #Internet Relay Chat Protocol        
+irc                 194/udp  #Internet Relay Chat Protocol        
+dn6-nlm-aud         195/tcp  #DNSIX Network Level Module Audit    
+dn6-nlm-aud         195/udp  #DNSIX Network Level Module Audit    
+dn6-smm-red         196/tcp  #DNSIX Session Mgt Module Audit Redir
+dn6-smm-red         196/udp  #DNSIX Session Mgt Module Audit Redir
+dls                 197/tcp  #Directory Location Service        
+dls                 197/udp  #Directory Location Service        
+dls-mon             198/tcp  #Directory Location Service Monitor
+dls-mon             198/udp  #Directory Location Service Monitor
+smux                199/tcp  #SMUX
+smux                199/udp  #SMUX
+src                 200/tcp  #IBM System Resource Controller
+src                 200/udp  #IBM System Resource Controller
+at-rtmp             201/tcp  #AppleTalk Routing Maintenance       
+at-rtmp             201/udp  #AppleTalk Routing Maintenance       
+at-nbp              202/tcp  #AppleTalk Name Binding              
+at-nbp              202/udp  #AppleTalk Name Binding              
+at-3                203/tcp  #AppleTalk Unused                    
+at-3                203/udp  #AppleTalk Unused                    
+at-echo             204/tcp  #AppleTalk Echo                      
+at-echo             204/udp  #AppleTalk Echo                      
+at-5                205/tcp  #AppleTalk Unused                    
+at-5                205/udp  #AppleTalk Unused                    
+at-zis              206/tcp  #AppleTalk Zone Information          
+at-zis              206/udp  #AppleTalk Zone Information          
+at-7                207/tcp  #AppleTalk Unused                    
+at-7                207/udp  #AppleTalk Unused                    
+at-8                208/tcp  #AppleTalk Unused                    
+at-8                208/udp  #AppleTalk Unused                    
+qmtp                209/tcp  #The Quick Mail Transfer Protocol
+qmtp                209/udp  #The Quick Mail Transfer Protocol
+z39.50              210/tcp  #ANSI Z39.50
+z39.50              210/udp  #ANSI Z39.50
+anet                212/tcp  #ATEXSSTR   
+anet                212/udp  #ATEXSSTR   
+ipx                 213/tcp  #IPX         	                      
+ipx                 213/udp  #IPX                                
+vmpwscs             214/tcp  #VM PWSCS                         
+vmpwscs             214/udp  #VM PWSCS                         
+softpc              215/tcp  #Insignia Solutions
+softpc              215/udp  #Insignia Solutions
+dbase               217/tcp  #dBASE Unix
+dbase               217/udp  #dBASE Unix
+mpp                 218/tcp  #Netix Message Posting Protocol
+mpp                 218/udp  #Netix Message Posting Protocol
+uarps               219/tcp  #Unisys ARPs               
+uarps               219/udp  #Unisys ARPs               
+imap3               220/tcp  #Interactive Mail Access Protocol v3
+imap3               220/udp  #Interactive Mail Access Protocol v3
+fln-spx             221/tcp  #Berkeley rlogind with SPX auth   
+fln-spx             221/udp  #Berkeley rlogind with SPX auth   
+rsh-spx             222/tcp  #Berkeley rshd with SPX auth      
+rsh-spx             222/udp  #Berkeley rshd with SPX auth      
+cdc                 223/tcp  #Certificate Distribution Center  
+cdc                 223/udp  #Certificate Distribution Center  
+masqdialer          224/tcp  #masqdialer
+masqdialer          224/udp  #masqdialer
+direct              242/tcp  #Direct
+direct              242/udp  #Direct
+sur-meas            243/tcp  #Survey Measurement          
+sur-meas            243/udp  #Survey Measurement          
+inbusiness          244/tcp  #inbusiness
+inbusiness          244/udp  #inbusiness
+link                245/tcp  #LINK
+link                245/udp  #LINK
+dsp3270             246/tcp  #Display Systems Protocol        
+dsp3270             246/udp  #Display Systems Protocol        
+subntbcst_tftp      247/tcp  #SUBNTBCST_TFTP
+subntbcst_tftp      247/udp  #SUBNTBCST_TFTP
+bhfhs               248/tcp  #bhfhs
+bhfhs               248/udp  #bhfhs
+rap                 256/tcp  #RAP
+rap                 256/udp  #RAP
+set                 257/tcp  #Secure Electronic Transaction
+set                 257/udp  #Secure Electronic Transaction
+yak-chat            258/tcp  #Yak Winsock Personal Chat
+yak-chat            258/udp  #Yak Winsock Personal Chat
+esro-gen            259/tcp  #Efficient Short Remote Operations
+esro-gen            259/udp  #Efficient Short Remote Operations
+openport            260/tcp  #Openport
+openport            260/udp  #Openport
+nsiiops             261/tcp  #IIOP Name Service over TLS/SSL
+nsiiops             261/udp  #IIOP Name Service over TLS/SSL
+arcisdms            262/tcp  #Arcisdms
+arcisdms            262/udp  #Arcisdms
+hdap                263/tcp  #HDAP
+hdap                263/udp  #HDAP
+bgmp                264/tcp  #BGMP
+bgmp                264/udp  #BGMP
+x-bone-ctl          265/tcp  #X-Bone CTL
+x-bone-ctl          265/udp  #X-Bone CTL
+sst                 266/tcp  #SCSI on ST
+sst                 266/udp  #SCSI on ST
+td-service          267/tcp  #Tobit David Service Layer
+td-service          267/udp  #Tobit David Service Layer
+td-replica          268/tcp  #Tobit David Replica
+td-replica          268/udp  #Tobit David Replica
+http-mgmt           280/tcp  #http-mgmt
+http-mgmt           280/udp  #http-mgmt
+personal-link       281/tcp  #Personal Link
+personal-link       281/udp  #Personal Link
+cableport-ax        282/tcp  #Cable Port A/X
+cableport-ax        282/udp  #Cable Port A/X
+rescap              283/tcp  #rescap
+rescap              283/udp  #rescap
+corerjd             284/tcp  #corerjd
+corerjd             284/udp  #corerjd
+fxp                 286/tcp  #FXP Communication
+fxp                 286/udp  #FXP Communication
+k-block             287/tcp  #K-BLOCK
+k-block             287/udp  #K-BLOCK
+novastorbakcup      308/tcp  #Novastor Backup
+novastorbakcup      308/udp  #Novastor Backup
+entrusttime         309/tcp  #EntrustTime    
+entrusttime         309/udp  #EntrustTime    
+bhmds               310/tcp  #bhmds
+bhmds               310/udp  #bhmds
+asip-webadmin       311/tcp  #AppleShare IP WebAdmin
+asip-webadmin       311/udp  #AppleShare IP WebAdmin
+vslmp               312/tcp  #VSLMP
+vslmp               312/udp  #VSLMP
+magenta-logic       313/tcp  #Magenta Logic
+magenta-logic       313/udp  #Magenta Logic
+opalis-robot        314/tcp  #Opalis Robot
+opalis-robot        314/udp  #Opalis Robot
+dpsi                315/tcp  #DPSI
+dpsi                315/udp  #DPSI
+decauth             316/tcp  #decAuth
+decauth             316/udp  #decAuth
+zannet              317/tcp  #Zannet
+zannet              317/udp  #Zannet
+pkix-timestamp      318/tcp  #PKIX TimeStamp
+pkix-timestamp      318/udp  #PKIX TimeStamp
+ptp-event           319/tcp  #PTP Event
+ptp-event           319/udp  #PTP Event
+ptp-general         320/tcp  #PTP General
+ptp-general         320/udp  #PTP General
+pip                 321/tcp  #PIP
+pip                 321/udp  #PIP
+rtsps               322/tcp  #RTSPS
+rtsps               322/udp  #RTSPS
+texar               333/tcp  #Texar Security Port
+texar               333/udp  #Texar Security Port
+pdap                344/tcp  #Prospero Data Access Protocol
+pdap                344/udp  #Prospero Data Access Protocol
+pawserv             345/tcp  #Perf Analysis Workbench
+pawserv             345/udp  #Perf Analysis Workbench
+zserv               346/tcp  #Zebra server
+zserv               346/udp  #Zebra server
+fatserv             347/tcp  #Fatmen Server
+fatserv             347/udp  #Fatmen Server
+csi-sgwp            348/tcp  #Cabletron Management Protocol
+csi-sgwp            348/udp  #Cabletron Management Protocol
+mftp                349/tcp  #mftp
+mftp                349/udp  #mftp
+matip-type-a        350/tcp  #MATIP Type A
+matip-type-a        350/udp  #MATIP Type A
+matip-type-b        351/tcp  #MATIP Type B
+matip-type-b        351/udp  #MATIP Type B
+bhoetty             351/tcp  #bhoetty (added 5/21/97)
+bhoetty             351/udp  #bhoetty
+dtag-ste-sb         352/tcp  #DTAG (assigned long ago)
+dtag-ste-sb         352/udp  #DTAG
+bhoedap4            352/tcp  #bhoedap4 (added 5/21/97)
+bhoedap4            352/udp  #bhoedap4
+ndsauth             353/tcp  #NDSAUTH
+ndsauth             353/udp  #NDSAUTH
+bh611               354/tcp  #bh611
+bh611               354/udp  #bh611
+datex-asn           355/tcp  #DATEX-ASN
+datex-asn           355/udp  #DATEX-ASN
+cloanto-net-1       356/tcp  #Cloanto Net 1
+cloanto-net-1       356/udp  #Cloanto Net 1
+bhevent             357/tcp  #bhevent
+bhevent             357/udp  #bhevent
+shrinkwrap          358/tcp  #Shrinkwrap
+shrinkwrap          358/udp  #Shrinkwrap
+nsrmp               359/tcp  #Network Security Risk Management Protocol
+nsrmp               359/udp  #Network Security Risk Management Protocol
+scoi2odialog        360/tcp  #scoi2odialog
+scoi2odialog        360/udp  #scoi2odialog
+semantix            361/tcp  #Semantix
+semantix            361/udp  #Semantix
+srssend             362/tcp  #SRS Send
+srssend             362/udp  #SRS Send
+rsvp_tunnel         363/tcp  #RSVP Tunnel
+rsvp_tunnel         363/udp  #RSVP Tunnel
+aurora-cmgr         364/tcp  #Aurora CMGR
+aurora-cmgr         364/udp  #Aurora CMGR
+dtk                 365/tcp  #DTK
+dtk                 365/udp  #DTK
+odmr                366/tcp  #ODMR
+odmr                366/udp  #ODMR
+mortgageware        367/tcp  #MortgageWare
+mortgageware        367/udp  #MortgageWare
+qbikgdp             368/tcp  #QbikGDP
+qbikgdp             368/udp  #QbikGDP
+rpc2portmap         369/tcp  #rpc2portmap 
+rpc2portmap         369/udp  #rpc2portmap
+codaauth2           370/tcp  #codaauth2
+codaauth2           370/udp  #codaauth2
+clearcase           371/tcp  #Clearcase
+clearcase           371/udp  #Clearcase
+ulistproc           372/tcp  #ListProcessor
+ulistproc           372/udp  #ListProcessor
+legent-1            373/tcp  #Legent Corporation
+legent-1            373/udp  #Legent Corporation
+legent-2            374/tcp  #Legent Corporation
+legent-2            374/udp  #Legent Corporation
+hassle              375/tcp  #Hassle
+hassle              375/udp  #Hassle
+nip                 376/tcp  #Amiga Envoy Network Inquiry Proto   
+nip                 376/udp  #Amiga Envoy Network Inquiry Proto
+tnETOS              377/tcp  #NEC Corporation
+tnETOS              377/udp  #NEC Corporation
+dsETOS              378/tcp  #NEC Corporation
+dsETOS              378/udp  #NEC Corporation
+is99c               379/tcp  #TIA/EIA/IS-99 modem client
+is99c               379/udp  #TIA/EIA/IS-99 modem client
+is99s               380/tcp  #TIA/EIA/IS-99 modem server
+is99s               380/udp  #TIA/EIA/IS-99 modem server
+hp-collector        381/tcp  #hp performance data collector
+hp-collector        381/udp  #hp performance data collector
+hp-managed-node     382/tcp  #hp performance data managed node
+hp-managed-node     382/udp  #hp performance data managed node
+hp-alarm-mgr        383/tcp  #hp performance data alarm manager
+hp-alarm-mgr        383/udp  #hp performance data alarm manager
+arns                384/tcp  #A Remote Network Server System
+arns                384/udp  #A Remote Network Server System
+ibm-app             385/tcp  #IBM Application
+ibm-app             385/udp  #IBM Application
+asa                 386/tcp  #ASA Message Router Object Def.
+asa                 386/udp  #ASA Message Router Object Def.
+aurp                387/tcp  #Appletalk Update-Based Routing Pro.
+aurp                387/udp  #Appletalk Update-Based Routing Pro.
+unidata-ldm         388/tcp  #Unidata LDM  
+unidata-ldm         388/udp  #Unidata LDM 
+ldap                389/tcp  #Lightweight Directory Access Protocol
+ldap                389/udp  #Lightweight Directory Access Protocol
+uis                 390/tcp  #UIS
+uis                 390/udp  #UIS
+synotics-relay      391/tcp  #SynOptics SNMP Relay Port
+synotics-relay      391/udp  #SynOptics SNMP Relay Port
+synotics-broker     392/tcp  #SynOptics Port Broker Port
+synotics-broker     392/udp  #SynOptics Port Broker Port
+meta5               393/tcp  #Meta5
+meta5               393/udp  #Meta5
+embl-ndt            394/tcp  #EMBL Nucleic Data Transfer
+embl-ndt            394/udp  #EMBL Nucleic Data Transfer
+netcp               395/tcp  #NETscout Control Protocol
+netcp               395/udp  #NETscout Control Protocol
+netware-ip          396/tcp  #Novell Netware over IP
+netware-ip          396/udp  #Novell Netware over IP
+mptn                397/tcp  #Multi Protocol Trans. Net.
+mptn                397/udp  #Multi Protocol Trans. Net.
+kryptolan           398/tcp  #Kryptolan
+kryptolan           398/udp  #Kryptolan
+iso-tsap-c2         399/tcp  #ISO Transport Class 2 Non-Control over TCP
+iso-tsap-c2         399/udp  #ISO Transport Class 2 Non-Control over UDP
+work-sol            400/tcp  #Workstation Solutions
+work-sol            400/udp  #Workstation Solutions
+ups                 401/tcp  #Uninterruptible Power Supply
+ups                 401/udp  #Uninterruptible Power Supply
+genie               402/tcp  #Genie Protocol
+genie               402/udp  #Genie Protocol
+decap               403/tcp  #decap
+decap               403/udp  #decap
+nced                404/tcp  #nced
+nced                404/udp  #nced
+ncld                405/tcp  #ncld
+ncld                405/udp  #ncld
+imsp                406/tcp  #Interactive Mail Support Protocol
+imsp                406/udp  #Interactive Mail Support Protocol
+timbuktu            407/tcp  #Timbuktu
+timbuktu            407/udp  #Timbuktu
+prm-sm              408/tcp  #Prospero Resource Manager Sys. Man.
+prm-sm              408/udp  #Prospero Resource Manager Sys. Man.
+prm-nm              409/tcp  #Prospero Resource Manager Node Man.
+prm-nm              409/udp  #Prospero Resource Manager Node Man.
+decladebug          410/tcp  #DECLadebug Remote Debug Protocol
+decladebug          410/udp  #DECLadebug Remote Debug Protocol
+rmt                 411/tcp  #Remote MT Protocol
+rmt                 411/udp  #Remote MT Protocol
+synoptics-trap      412/tcp  #Trap Convention Port
+synoptics-trap      412/udp  #Trap Convention Port
+smsp                413/tcp  #Storage Management Services Protocol
+smsp                413/udp  #Storage Management Services Protocol
+infoseek            414/tcp  #InfoSeek
+infoseek            414/udp  #InfoSeek
+bnet                415/tcp  #BNet
+bnet                415/udp  #BNet
+silverplatter       416/tcp  #Silverplatter
+silverplatter       416/udp  #Silverplatter
+onmux               417/tcp  #Onmux
+onmux               417/udp  #Onmux
+hyper-g             418/tcp  #Hyper-G
+hyper-g             418/udp  #Hyper-G
+ariel1              419/tcp  #Ariel 1
+ariel1              419/udp  #Ariel 1
+smpte               420/tcp  #SMPTE
+smpte               420/udp  #SMPTE
+ariel2              421/tcp  #Ariel 2
+ariel2              421/udp  #Ariel 2
+ariel3              422/tcp  #Ariel 3
+ariel3              422/udp  #Ariel 3 
+opc-job-start       423/tcp  #IBM Operations Planning and Control Start
+opc-job-start       423/udp  #IBM Operations Planning and Control Start
+opc-job-track       424/tcp  #IBM Operations Planning and Control Track
+opc-job-track       424/udp  #IBM Operations Planning and Control Track
+icad-el             425/tcp  #ICAD
+icad-el             425/udp  #ICAD
+smartsdp            426/tcp  #smartsdp
+smartsdp            426/udp  #smartsdp
+svrloc              427/tcp  #Server Location
+svrloc              427/udp  #Server Location
+ocs_cmu             428/tcp  #OCS_CMU
+ocs_cmu             428/udp  #OCS_CMU
+ocs_amu             429/tcp  #OCS_AMU
+ocs_amu             429/udp  #OCS_AMU
+utmpsd              430/tcp  #UTMPSD
+utmpsd              430/udp  #UTMPSD
+utmpcd              431/tcp  #UTMPCD
+utmpcd              431/udp  #UTMPCD
+iasd                432/tcp  #IASD  
+iasd                432/udp  #IASD  
+nnsp                433/tcp  #NNSP
+nnsp                433/udp  #NNSP
+mobileip-agent      434/tcp  #MobileIP-Agent
+mobileip-agent      434/udp  #MobileIP-Agent
+mobilip-mn          435/tcp  #MobilIP-MN
+mobilip-mn          435/udp  #MobilIP-MN
+dna-cml             436/tcp  #DNA-CML   
+dna-cml             436/udp  #DNA-CML   
+comscm              437/tcp  #comscm
+comscm              437/udp  #comscm
+dsfgw               438/tcp  #dsfgw
+dsfgw               438/udp  #dsfgw
+dasp                439/tcp  #dasp      Thomas Obermair
+dasp                439/udp  #dasp      tommy@inlab.m.eunet.de
+sgcp                440/tcp  #sgcp      
+sgcp                440/udp  #sgcp      
+decvms-sysmgt       441/tcp  #decvms-sysmgt
+decvms-sysmgt       441/udp  #decvms-sysmgt
+cvc_hostd           442/tcp  #cvc_hostd
+cvc_hostd           442/udp  #cvc_hostd
+https               443/tcp  #http protocol over TLS/SSL
+https               443/udp  #http protocol over TLS/SSL
+snpp                444/tcp  #Simple Network Paging Protocol
+snpp                444/udp  #Simple Network Paging Protocol
+microsoft-ds        445/tcp  #Microsoft-DS
+microsoft-ds        445/udp  #Microsoft-DS
+ddm-rdb             446/tcp  #DDM-Remote Relational Database Access
+ddm-rdb             446/udp  #DDM-Remote Relational Database Access
+ddm-dfm             447/tcp  #DDM-Distributed File Management
+ddm-dfm             447/udp  #DDM-Distributed File Management
+ddm-ssl             448/tcp  #DDM-Remote DB Access Using Secure Sockets
+ddm-ssl             448/udp  #DDM-Remote DB Access Using Secure Sockets
+as-servermap        449/tcp  #AS Server Mapper
+as-servermap        449/udp  #AS Server Mapper
+tserver             450/tcp  #Computer Supported Telecomunication Applications
+tserver             450/udp  #Computer Supported Telecomunication Applications
+sfs-smp-net         451/tcp  #Cray Network Semaphore server
+sfs-smp-net         451/udp  #Cray Network Semaphore server
+sfs-config          452/tcp  #Cray SFS config server
+sfs-config          452/udp  #Cray SFS config server
+creativeserver      453/tcp  #CreativeServer
+creativeserver      453/udp  #CreativeServer
+contentserver       454/tcp  #ContentServer
+contentserver       454/udp  #ContentServer
+creativepartnr      455/tcp  #CreativePartnr
+creativepartnr      455/udp  #CreativePartnr
+macon-tcp           456/tcp  #macon-tcp
+macon-udp           456/udp  #macon-udp
+scohelp             457/tcp  #scohelp
+scohelp             457/udp  #scohelp
+appleqtc            458/tcp  #apple quick time
+appleqtc            458/udp  #apple quick time
+ampr-rcmd           459/tcp  #ampr-rcmd              
+ampr-rcmd           459/udp  #ampr-rcmd              
+skronk              460/tcp  #skronk
+skronk              460/udp  #skronk
+datasurfsrv         461/tcp  #DataRampSrv
+datasurfsrv         461/udp  #DataRampSrv
+datasurfsrvsec      462/tcp  #DataRampSrvSec
+datasurfsrvsec      462/udp  #DataRampSrvSec
+alpes               463/tcp  #alpes
+alpes               463/udp  #alpes
+kpasswd             464/tcp  #kpasswd
+kpasswd             464/udp  #kpasswd
+urd                 465/tcp  #URL Rendesvous Directory for SSM
+igmpv3lite          465/udp  #IGMP over UDP for SSM 
+digital-vrc         466/tcp  #digital-vrc
+digital-vrc         466/udp  #digital-vrc
+mylex-mapd          467/tcp  #mylex-mapd
+mylex-mapd          467/udp  #mylex-mapd
+photuris            468/tcp  #proturis
+photuris            468/udp  #proturis
+rcp                 469/tcp  #Radio Control Protocol
+rcp                 469/udp  #Radio Control Protocol
+scx-proxy           470/tcp  #scx-proxy
+scx-proxy           470/udp  #scx-proxy
+mondex              471/tcp  #Mondex
+mondex              471/udp  #Mondex
+ljk-login           472/tcp  #ljk-login
+ljk-login           472/udp  #ljk-login
+hybrid-pop          473/tcp  #hybrid-pop
+hybrid-pop          473/udp  #hybrid-pop
+tn-tl-w1            474/tcp  #tn-tl-w1
+tn-tl-w2            474/udp  #tn-tl-w2
+tcpnethaspsrv       475/tcp  #tcpnethaspsrv
+tcpnethaspsrv       475/udp  #tcpnethaspsrv
+tn-tl-fd1           476/tcp  #tn-tl-fd1
+tn-tl-fd1           476/udp  #tn-tl-fd1
+ss7ns               477/tcp  #ss7ns
+ss7ns               477/udp  #ss7ns
+spsc                478/tcp  #spsc
+spsc                478/udp  #spsc
+iafserver           479/tcp  #iafserver
+iafserver           479/udp  #iafserver
+iafdbase            480/tcp  #iafdbase
+iafdbase            480/udp  #iafdbase
+ph                  481/tcp  #Ph service
+ph                  481/udp  #Ph service
+bgs-nsi             482/tcp  #bgs-nsi
+bgs-nsi             482/udp  #bgs-nsi
+ulpnet              483/tcp  #ulpnet
+ulpnet              483/udp  #ulpnet
+integra-sme         484/tcp  #Integra Software Management Environment
+integra-sme         484/udp  #Integra Software Management Environment
+powerburst          485/tcp  #Air Soft Power Burst
+powerburst          485/udp  #Air Soft Power Burst
+avian               486/tcp  #avian
+avian               486/udp  #avian
+saft                487/tcp  #saft Simple Asynchronous File Transfer
+saft                487/udp  #saft Simple Asynchronous File Transfer
+gss-http            488/tcp  #gss-http
+gss-http            488/udp  #gss-http
+nest-protocol       489/tcp  #nest-protocol
+nest-protocol       489/udp  #nest-protocol
+micom-pfs           490/tcp  #micom-pfs
+micom-pfs           490/udp  #micom-pfs
+go-login            491/tcp  #go-login
+go-login            491/udp  #go-login
+ticf-1              492/tcp  #Transport Independent Convergence for FNA
+ticf-1              492/udp  #Transport Independent Convergence for FNA
+ticf-2              493/tcp  #Transport Independent Convergence for FNA
+ticf-2              493/udp  #Transport Independent Convergence for FNA
+pov-ray             494/tcp  #POV-Ray
+pov-ray             494/udp  #POV-Ray
+intecourier         495/tcp  #intecourier
+intecourier         495/udp  #intecourier
+pim-rp-disc         496/tcp  #PIM-RP-DISC
+pim-rp-disc         496/udp  #PIM-RP-DISC
+dantz               497/tcp  #dantz
+dantz               497/udp  #dantz
+siam                498/tcp  #siam
+siam                498/udp  #siam
+iso-ill             499/tcp  #ISO ILL Protocol
+iso-ill             499/udp  #ISO ILL Protocol
+isakmp              500/tcp  #isakmp
+isakmp              500/udp  #isakmp
+stmf                501/tcp  #STMF
+stmf                501/udp  #STMF
+asa-appl-proto      502/tcp  #asa-appl-proto
+asa-appl-proto      502/udp  #asa-appl-proto
+intrinsa            503/tcp  #Intrinsa
+intrinsa            503/udp  #Intrinsa
+citadel             504/tcp  #citadel
+citadel             504/udp  #citadel
+mailbox-lm          505/tcp  #mailbox-lm
+mailbox-lm          505/udp  #mailbox-lm
+ohimsrv             506/tcp  #ohimsrv
+ohimsrv             506/udp  #ohimsrv
+crs                 507/tcp  #crs
+crs                 507/udp  #crs
+xvttp               508/tcp  #xvttp
+xvttp               508/udp  #xvttp
+snare               509/tcp  #snare
+snare               509/udp  #snare
+fcp                 510/tcp  #FirstClass Protocol
+fcp                 510/udp  #FirstClass Protocol
+passgo              511/tcp  #PassGo
+passgo              511/udp  #PassGo
+exec                512/tcp  #remote process execution;
+biff                512/udp  #used by mail system to notify users
+login               513/tcp  #remote login a la telnet;
+who                 513/udp  #maintains data bases showing who's
+shell               514/tcp  #cmd
+printer             515/tcp  #spooler
+printer             515/udp  #spooler
+videotex            516/tcp  #videotex
+videotex            516/udp  #videotex
+talk                517/tcp  #like tenex link, but across
+talk                517/udp  #like tenex link, but across
+utime               519/tcp  #unixtime
+utime               519/udp  #unixtime
+efs                 520/tcp  #extended file name server
+router              520/udp  #local routing process (on site);
+ripng               521/tcp  #ripng
+ripng               521/udp  #ripng
+ulp                 522/tcp  #ULP    
+ulp                 522/udp  #ULP    
+ibm-db2             523/tcp  #IBM-DB2
+ibm-db2             523/udp  #IBM-DB2
+ncp                 524/tcp  #NCP
+ncp                 524/udp  #NCP    
+timed               525/tcp  #timeserver
+timed               525/udp  #timeserver
+tempo               526/tcp  #newdate
+tempo               526/udp  #newdate
+stx                 527/tcp  #Stock IXChange
+stx                 527/udp  #Stock IXChange
+custix              528/tcp  #Customer IXChange
+custix              528/udp  #Customer IXChange
+irc-serv            529/tcp  #IRC-SERV
+irc-serv            529/udp  #IRC-SERV
+courier             530/tcp  #rpc
+courier             530/udp  #rpc
+conference          531/tcp  #chat
+conference          531/udp  #chat
+netnews             532/tcp  #readnews
+netnews             532/udp  #readnews
+netwall             533/tcp  #for emergency broadcasts
+netwall             533/udp  #for emergency broadcasts
+mm-admin            534/tcp  #MegaMedia Admin
+mm-admin            534/udp  #MegaMedia Admin
+iiop                535/tcp  #iiop
+iiop                535/udp  #iiop
+opalis-rdv          536/tcp  #opalis-rdv
+opalis-rdv          536/udp  #opalis-rdv
+nmsp                537/tcp  #Networked Media Streaming Protocol
+nmsp                537/udp  #Networked Media Streaming Protocol
+gdomap              538/tcp  #gdomap
+gdomap              538/udp  #gdomap
+apertus-ldp         539/tcp  #Apertus Technologies Load Determination
+apertus-ldp         539/udp  #Apertus Technologies Load Determination
+uucp                540/tcp  #uucpd		
+uucp                540/udp  #uucpd		
+uucp-rlogin         541/tcp  #uucp-rlogin  
+uucp-rlogin         541/udp  #uucp-rlogin
+commerce            542/tcp  #commerce
+commerce            542/udp  #commerce
+kshell              544/tcp  #krcmd
+kshell              544/udp  #krcmd
+appleqtcsrvr        545/tcp  #appleqtcsrvr
+appleqtcsrvr        545/udp  #appleqtcsrvr
+dhcpv6-client       546/tcp  #DHCPv6 Client
+dhcpv6-client       546/udp  #DHCPv6 Client
+dhcpv6-server       547/tcp  #DHCPv6 Server
+dhcpv6-server       547/udp  #DHCPv6 Server
+afpovertcp          548/tcp  #AFP over TCP
+afpovertcp          548/udp  #AFP over TCP
+idfp                549/tcp  #IDFP
+idfp                549/udp  #IDFP
+new-rwho            550/tcp  #new-who
+new-rwho            550/udp  #new-who
+cybercash           551/tcp  #cybercash
+cybercash           551/udp  #cybercash
+devshr-nts          552/tcp  #DeviceShare
+devshr-nts          552/udp  #DeviceShare
+pirp                553/tcp  #pirp
+pirp                553/udp  #pirp
+rtsp                554/tcp  #Real Time Stream Control Protocol
+rtsp                554/udp  #Real Time Stream Control Protocol
+remotefs            556/tcp  #rfs server
+remotefs            556/udp  #rfs server
+openvms-sysipc      557/tcp  #openvms-sysipc
+openvms-sysipc      557/udp  #openvms-sysipc
+sdnskmp             558/tcp  #SDNSKMP
+sdnskmp             558/udp  #SDNSKMP
+teedtap             559/tcp  #TEEDTAP
+teedtap             559/udp  #TEEDTAP
+rmonitor            560/tcp  #rmonitord
+rmonitor            560/udp  #rmonitord
+chshell             562/tcp  #chcmd
+chshell             562/udp  #chcmd
+nntps               563/tcp  #nntp protocol over TLS/SSL (was snntp)
+nntps               563/udp  #nntp protocol over TLS/SSL (was snntp)
+9pfs                564/tcp  #plan 9 file service
+9pfs                564/udp  #plan 9 file service
+whoami              565/tcp  #whoami
+whoami              565/udp  #whoami
+streettalk          566/tcp  #streettalk
+streettalk          566/udp  #streettalk
+banyan-rpc          567/tcp  #banyan-rpc
+banyan-rpc          567/udp  #banyan-rpc
+ms-shuttle          568/tcp  #microsoft shuttle
+ms-shuttle          568/udp  #microsoft shuttle
+ms-rome             569/tcp  #microsoft rome
+ms-rome             569/udp  #microsoft rome
+meter               570/tcp  #demon
+meter               570/udp  #demon
+meter               571/tcp  #udemon
+meter               571/udp  #udemon
+sonar               572/tcp  #sonar
+sonar               572/udp  #sonar
+banyan-vip          573/tcp  #banyan-vip
+banyan-vip          573/udp  #banyan-vip
+ftp-agent           574/tcp  #FTP Software Agent System
+ftp-agent           574/udp  #FTP Software Agent System
+vemmi               575/tcp  #VEMMI
+vemmi               575/udp  #VEMMI
+ipcd                576/tcp  #ipcd
+ipcd                576/udp  #ipcd
+vnas                577/tcp  #vnas
+vnas                577/udp  #vnas
+ipdd                578/tcp  #ipdd
+ipdd                578/udp  #ipdd
+decbsrv             579/tcp  #decbsrv
+decbsrv             579/udp  #decbsrv
+sntp-heartbeat      580/tcp  #SNTP HEARTBEAT
+sntp-heartbeat      580/udp  #SNTP HEARTBEAT
+bdp                 581/tcp  #Bundle Discovery Protocol
+bdp                 581/udp  #Bundle Discovery Protocol
+scc-security        582/tcp  #SCC Security
+scc-security        582/udp  #SCC Security
+philips-vc          583/tcp  #Philips Video-Conferencing
+philips-vc          583/udp  #Philips Video-Conferencing
+keyserver           584/tcp  #Key Server
+keyserver           584/udp  #Key Server
+imap4-ssl           585/tcp  #IMAP4+SSL (use 993 instead)
+imap4-ssl           585/udp  #IMAP4+SSL (use 993 instead)
+password-chg        586/tcp  #Password Change
+password-chg        586/udp  #Password Change
+submission          587/tcp  #Submission
+submission          587/udp  #Submission
+cal                 588/tcp  #CAL
+cal                 588/udp  #CAL
+eyelink             589/tcp  #EyeLink
+eyelink             589/udp  #EyeLink
+tns-cml             590/tcp  #TNS CML
+tns-cml             590/udp  #TNS CML
+http-alt            591/tcp  #FileMaker, Inc. - HTTP Alternate (see Port 80)
+http-alt            591/udp  #FileMaker, Inc. - HTTP Alternate (see Port 80)
+eudora-set          592/tcp  #Eudora Set
+eudora-set          592/udp  #Eudora Set
+http-rpc-epmap      593/tcp  #HTTP RPC Ep Map
+http-rpc-epmap      593/udp  #HTTP RPC Ep Map
+tpip                594/tcp  #TPIP
+tpip                594/udp  #TPIP
+cab-protocol        595/tcp  #CAB Protocol
+cab-protocol        595/udp  #CAB Protocol
+smsd                596/tcp  #SMSD
+smsd                596/udp  #SMSD
+ptcnameservice      597/tcp  #PTC Name Service
+ptcnameservice      597/udp  #PTC Name Service
+sco-websrvrmg3      598/tcp  #SCO Web Server Manager 3
+sco-websrvrmg3      598/udp  #SCO Web Server Manager 3
+acp                 599/tcp  #Aeolon Core Protocol
+acp                 599/udp  #Aeolon Core Protocol
+ipcserver           600/tcp  #Sun IPC server
+ipcserver           600/udp  #Sun IPC server
+syslog-conn         601/tcp  #Reliable Syslog Service
+syslog-conn         601/udp  #Reliable Syslog Service
+xmlrpc-beep         602/tcp  #XML-RPC over BEEP
+xmlrpc-beep         602/udp  #XML-RPC over BEEP
+idxp                603/tcp  #IDXP
+idxp                603/udp  #IDXP
+tunnel              604/tcp  #TUNNEL
+tunnel              604/udp  #TUNNEL
+soap-beep           605/tcp  #SOAP over BEEP
+soap-beep           605/udp  #SOAP over BEEP
+urm                 606/tcp  #Cray Unified Resource Manager
+urm                 606/udp  #Cray Unified Resource Manager
+nqs                 607/tcp  #nqs
+nqs                 607/udp  #nqs
+sift-uft            608/tcp  #Sender-Initiated/Unsolicited File Transfer 
+sift-uft            608/udp  #Sender-Initiated/Unsolicited File Transfer
+npmp-trap           609/tcp  #npmp-trap
+npmp-trap           609/udp  #npmp-trap
+npmp-local          610/tcp  #npmp-local
+npmp-local          610/udp  #npmp-local
+npmp-gui            611/tcp  #npmp-gui  
+npmp-gui            611/udp  #npmp-gui  
+hmmp-ind            612/tcp  #HMMP Indication
+hmmp-ind            612/udp  #HMMP Indication
+hmmp-op             613/tcp  #HMMP Operation
+hmmp-op             613/udp  #HMMP Operation
+sshell              614/tcp  #SSLshell
+sshell              614/udp  #SSLshell
+sco-inetmgr         615/tcp  #Internet Configuration Manager
+sco-inetmgr         615/udp  #Internet Configuration Manager
+sco-sysmgr          616/tcp  #SCO System Administration Server
+sco-sysmgr          616/udp  #SCO System Administration Server
+sco-dtmgr           617/tcp  #SCO Desktop Administration Server
+sco-dtmgr           617/udp  #SCO Desktop Administration Server
+dei-icda            618/tcp  #DEI-ICDA
+dei-icda            618/udp  #DEI-ICDA
+compaq-evm          619/tcp  #Compaq EVM
+compaq-evm          619/udp  #Compaq EVM
+sco-websrvrmgr      620/tcp  #SCO WebServer Manager
+sco-websrvrmgr      620/udp  #SCO WebServer Manager
+escp-ip             621/tcp  #ESCP
+escp-ip             621/udp  #ESCP
+collaborator        622/tcp  #Collaborator
+collaborator        622/udp  #Collaborator
+asf-rmcp            623/tcp  #ASF Remote Management and Control Protocol
+asf-rmcp            623/udp  #ASF Remote Management and Control Protocol
+cryptoadmin         624/tcp  #Crypto Admin
+cryptoadmin         624/udp  #Crypto Admin
+dec_dlm             625/tcp  #DEC DLM
+dec_dlm             625/udp  #DEC DLM
+asia                626/tcp  #ASIA
+asia                626/udp  #ASIA
+passgo-tivoli       627/tcp  #PassGo Tivoli
+passgo-tivoli       627/udp  #PassGo Tivoli
+qmqp                628/tcp  #QMQP
+qmqp                628/udp  #QMQP
+3com-amp3           629/tcp  #3Com AMP3
+3com-amp3           629/udp  #3Com AMP3
+rda                 630/tcp  #RDA
+rda                 630/udp  #RDA
+ipp                 631/tcp  #IPP (Internet Printing Protocol)
+ipp                 631/udp  #IPP (Internet Printing Protocol)
+bmpp                632/tcp  #bmpp
+bmpp                632/udp  #bmpp
+servstat            633/tcp  #Service Status update (Sterling Software)
+servstat            633/udp  #Service Status update (Sterling Software)
+ginad               634/tcp  #ginad
+ginad               634/udp  #ginad
+rlzdbase            635/tcp  #RLZ DBase
+rlzdbase            635/udp  #RLZ DBase
+ldaps               636/tcp  #ldap protocol over TLS/SSL (was sldap)
+ldaps               636/udp  #ldap protocol over TLS/SSL (was sldap)
+lanserver           637/tcp  #lanserver
+lanserver           637/udp  #lanserver
+mcns-sec            638/tcp  #mcns-sec
+mcns-sec            638/udp  #mcns-sec
+msdp                639/tcp  #MSDP
+msdp                639/udp  #MSDP
+entrust-sps         640/tcp  #entrust-sps
+entrust-sps         640/udp  #entrust-sps
+repcmd              641/tcp  #repcmd
+repcmd              641/udp  #repcmd
+esro-emsdp          642/tcp  #ESRO-EMSDP V1.3
+esro-emsdp          642/udp  #ESRO-EMSDP V1.3
+sanity              643/tcp  #SANity
+sanity              643/udp  #SANity
+dwr                 644/tcp  #dwr
+dwr                 644/udp  #dwr
+pssc                645/tcp  #PSSC
+pssc                645/udp  #PSSC
+ldp                 646/tcp  #LDP
+ldp                 646/udp  #LDP
+dhcp-failover       647/tcp  #DHCP Failover
+dhcp-failover       647/udp  #DHCP Failover
+rrp                 648/tcp  #Registry Registrar Protocol (RRP)
+rrp                 648/udp  #Registry Registrar Protocol (RRP)
+cadview-3d          649/tcp  #Cadview-3d - streaming 3d models over the internet
+cadview-3d          649/udp  #Cadview-3d - streaming 3d models over the internet
+obex                650/tcp  #OBEX
+obex                650/udp  #OBEX
+ieee-mms            651/tcp  #IEEE MMS
+ieee-mms            651/udp  #IEEE MMS
+hello-port          652/tcp  #HELLO_PORT
+hello-port          652/udp  #HELLO_PORT	
+repscmd             653/tcp  #RepCmd
+repscmd             653/udp  #RepCmd
+aodv                654/tcp  #AODV
+aodv                654/udp  #AODV
+tinc                655/tcp  #TINC
+tinc                655/udp  #TINC
+spmp                656/tcp  #SPMP
+spmp                656/udp  #SPMP
+rmc                 657/tcp  #RMC
+rmc                 657/udp  #RMC
+tenfold             658/tcp  #TenFold
+tenfold             658/udp  #TenFold
+mac-srvr-admin      660/tcp  #MacOS Server Admin
+mac-srvr-admin      660/udp  #MacOS Server Admin
+hap                 661/tcp  #HAP
+hap                 661/udp  #HAP
+pftp                662/tcp  #PFTP
+pftp                662/udp  #PFTP
+purenoise           663/tcp  #PureNoise
+purenoise           663/udp  #PureNoise
+asf-secure-rmcp     664/tcp  #ASF Secure Remote Management and Control Protocol
+asf-secure-rmcp     664/udp  #ASF Secure Remote Management and Control Protocol
+sun-dr              665/tcp  #Sun DR
+sun-dr              665/udp  #Sun DR
+mdqs                666/tcp
+mdqs                666/udp
+doom                666/tcp  #doom Id Software
+doom                666/udp  #doom Id Software
+disclose            667/tcp  #campaign contribution disclosures - SDR Technologies
+disclose            667/udp  #campaign contribution disclosures - SDR Technologies
+mecomm              668/tcp  #MeComm
+mecomm              668/udp  #MeComm
+meregister          669/tcp  #MeRegister
+meregister          669/udp  #MeRegister
+vacdsm-sws          670/tcp  #VACDSM-SWS
+vacdsm-sws          670/udp  #VACDSM-SWS
+vacdsm-app          671/tcp  #VACDSM-APP
+vacdsm-app          671/udp  #VACDSM-APP
+vpps-qua            672/tcp  #VPPS-QUA
+vpps-qua            672/udp  #VPPS-QUA
+cimplex             673/tcp  #CIMPLEX
+cimplex             673/udp  #CIMPLEX
+acap                674/tcp  #ACAP
+acap                674/udp  #ACAP
+dctp                675/tcp  #DCTP
+dctp                675/udp  #DCTP
+vpps-via            676/tcp  #VPPS Via
+vpps-via            676/udp  #VPPS Via
+vpp                 677/tcp  #Virtual Presence Protocol 
+vpp                 677/udp  #Virtual Presence Protocol 
+ggf-ncp             678/tcp  #GNU Generation Foundation NCP
+ggf-ncp             678/udp  #GNU Generation Foundation NCP
+mrm                 679/tcp  #MRM
+mrm                 679/udp  #MRM
+entrust-aaas        680/tcp  #entrust-aaas 
+entrust-aaas        680/udp  #entrust-aaas 
+entrust-aams        681/tcp  #entrust-aams
+entrust-aams        681/udp  #entrust-aams
+xfr                 682/tcp  #XFR
+xfr                 682/udp  #XFR
+corba-iiop          683/tcp  #CORBA IIOP 
+corba-iiop          683/udp  #CORBA IIOP 
+corba-iiop-ssl      684/tcp  #CORBA IIOP SSL
+corba-iiop-ssl      684/udp  #CORBA IIOP SSL
+mdc-portmapper      685/tcp  #MDC Port Mapper
+mdc-portmapper      685/udp  #MDC Port Mapper
+hcp-wismar          686/tcp  #Hardware Control Protocol Wismar
+hcp-wismar          686/udp  #Hardware Control Protocol Wismar
+asipregistry        687/tcp  #asipregistry
+asipregistry        687/udp  #asipregistry
+realm-rusd          688/tcp  #REALM-RUSD
+realm-rusd          688/udp  #REALM-RUSD
+nmap                689/tcp  #NMAP
+nmap                689/udp  #NMAP
+vatp                690/tcp  #VATP
+vatp                690/udp  #VATP
+msexch-routing      691/tcp  #MS Exchange Routing
+msexch-routing      691/udp  #MS Exchange Routing
+hyperwave-isp       692/tcp  #Hyperwave-ISP
+hyperwave-isp       692/udp  #Hyperwave-ISP
+connendp            693/tcp  #connendp
+connendp            693/udp  #connendp
+ha-cluster          694/tcp  #ha-cluster
+ha-cluster          694/udp  #ha-cluster
+ieee-mms-ssl        695/tcp  #IEEE-MMS-SSL
+ieee-mms-ssl        695/udp  #IEEE-MMS-SSL
+rushd               696/tcp  #RUSHD
+rushd               696/udp  #RUSHD
+uuidgen             697/tcp  #UUIDGEN
+uuidgen             697/udp  #UUIDGEN
+olsr                698/tcp  #OLSR
+olsr                698/udp  #OLSR
+accessnetwork       699/tcp  #Access Network
+accessnetwork       699/udp  #Access Network
+epp                 700/tcp  #Extensible Provisioning Protocol
+epp                 700/udp  #Extensible Provisioning Protocol
+lmp                 701/tcp  #Link Management Protocol (LMP)
+lmp                 701/udp  #Link Management Protocol (LMP)
+elcsd               704/tcp  #errlog copy/server daemon
+elcsd               704/udp  #errlog copy/server daemon
+agentx              705/tcp  #AgentX
+agentx              705/udp  #AgentX
+silc                706/tcp  #SILC
+silc                706/udp  #SILC
+borland-dsj         707/tcp  #Borland DSJ
+borland-dsj         707/udp  #Borland DSJ
+entrust-kmsh        709/tcp  #Entrust Key Management Service Handler
+entrust-kmsh        709/udp  #Entrust Key Management Service Handler
+entrust-ash         710/tcp  #Entrust Administration Service Handler
+entrust-ash         710/udp  #Entrust Administration Service Handler
+cisco-tdp           711/tcp  #Cisco TDP
+cisco-tdp           711/udp  #Cisco TDP
+tbrpf               712/tcp  #TBRPF
+tbrpf               712/udp  #TBRPF
+netviewdm1          729/tcp  #IBM NetView DM/6000 Server/Client
+netviewdm1          729/udp  #IBM NetView DM/6000 Server/Client
+netviewdm2          730/tcp  #IBM NetView DM/6000 send/tcp
+netviewdm2          730/udp  #IBM NetView DM/6000 send/tcp
+netviewdm3          731/tcp  #IBM NetView DM/6000 receive/tcp
+netviewdm3          731/udp  #IBM NetView DM/6000 receive/tcp
+netgw               741/tcp  #netGW
+netgw               741/udp  #netGW
+netrcs              742/tcp  #Network based Rev. Cont. Sys.
+netrcs              742/udp  #Network based Rev. Cont. Sys.
+flexlm              744/tcp  #Flexible License Manager
+flexlm              744/udp  #Flexible License Manager
+fujitsu-dev         747/tcp  #Fujitsu Device Control
+fujitsu-dev         747/udp  #Fujitsu Device Control
+ris-cm              748/tcp  #Russell Info Sci Calendar Manager
+ris-cm              748/udp  #Russell Info Sci Calendar Manager
+kerberos-adm        749/tcp  #kerberos administration
+kerberos-adm        749/udp  #kerberos administration
+kerberos-iv         750/udp  #kerberos version iv
+tell                754/tcp  #send
+tell                754/udp  #send
+phonebook           767/tcp  #phone
+phonebook           767/udp  #phone
+multiling-http      777/tcp  #Multiling HTTP
+multiling-http      777/udp  #Multiling HTTP
+mdbs_daemon         800/tcp
+mdbs_daemon         800/udp
+fcp-udp             810/tcp  #FCP
+fcp-udp             810/udp  #FCP Datagram
+itm-mcell-s         828/tcp  #itm-mcell-s
+itm-mcell-s         828/udp  #itm-mcell-s
+pkix-3-ca-ra        829/tcp  #PKIX-3 CA/RA
+pkix-3-ca-ra        829/udp  #PKIX-3 CA/RA
+dhcp-failover2      847/tcp  #dhcp-failover 2
+dhcp-failover2      847/udp  #dhcp-failover 2
+gdoi                848/tcp  #GDOI
+gdoi                848/udp  #GDOI
+iscsi               860/tcp  #iSCSI
+iscsi               860/udp  #iSCSI
+rsync               873/tcp  #rsync
+rsync               873/udp  #rsync
+iclcnet-locate      886/tcp  #ICL coNETion locate server
+iclcnet-locate      886/udp  #ICL coNETion locate server
+iclcnet_svinfo      887/tcp  #ICL coNETion server info
+iclcnet_svinfo      887/udp  #ICL coNETion server info
+accessbuilder       888/tcp  #AccessBuilder
+accessbuilder       888/udp  #AccessBuilder
+cddbp               888/tcp  #CD Database Protocol
+omginitialrefs      900/tcp  #OMG Initial Refs
+omginitialrefs      900/udp  #OMG Initial Refs
+smpnameres          901/tcp  #SMPNAMERES
+smpnameres          901/udp  #SMPNAMERES
+ideafarm-chat       902/tcp  #IDEAFARM-CHAT
+ideafarm-chat       902/udp  #IDEAFARM-CHAT
+ideafarm-catch      903/tcp  #IDEAFARM-CATCH
+ideafarm-catch      903/udp  #IDEAFARM-CATCH
+xact-backup         911/tcp  #xact-backup
+xact-backup         911/udp  #xact-backup
+apex-mesh           912/tcp  #APEX relay-relay service
+apex-mesh           912/udp  #APEX relay-relay service
+apex-edge           913/tcp  #APEX endpoint-relay service
+apex-edge           913/udp  #APEX endpoint-relay service    
+ftps-data           989/tcp  #ftp protocol, data, over TLS/SSL
+ftps-data           989/udp  #ftp protocol, data, over TLS/SSL
+ftps                990/tcp  #ftp protocol, control, over TLS/SSL
+ftps                990/udp  #ftp protocol, control, over TLS/SSL
+nas                 991/tcp  #Netnews Administration System
+nas                 991/udp  #Netnews Administration System
+telnets             992/tcp  #telnet protocol over TLS/SSL
+telnets             992/udp  #telnet protocol over TLS/SSL
+imaps               993/tcp  #imap4 protocol over TLS/SSL
+imaps               993/udp  #imap4 protocol over TLS/SSL
+ircs                994/tcp  #irc protocol over TLS/SSL
+ircs                994/udp  #irc protocol over TLS/SSL
+pop3s               995/tcp  #pop3 protocol over TLS/SSL (was spop3)
+pop3s               995/udp  #pop3 protocol over TLS/SSL (was spop3)
+vsinet              996/tcp  #vsinet
+vsinet              996/udp  #vsinet
+applix              999/udp  #Applix ac
+surf                1010/tcp  #surf
+surf                1010/udp  #surf
+blackjack           1025/tcp  #network blackjack
+blackjack           1025/udp  #network blackjack
+cap                 1026/tcp  #Calender Access Protocol
+cap                 1026/udp  #Calender Access Protocol
+exosee              1027/tcp  #ExoSee
+exosee              1027/udp  #ExoSee
+iad1                1030/tcp  #BBN IAD
+iad1                1030/udp  #BBN IAD
+iad2                1031/tcp  #BBN IAD
+iad2                1031/udp  #BBN IAD
+iad3                1032/tcp  #BBN IAD
+iad3                1032/udp  #BBN IAD
+netinfo-local       1033/tcp  #local netinfo port
+netinfo-local       1033/udp  #local netinfo port
+activesync          1034/tcp  #ActiveSync Notifications
+activesync          1034/udp  #ActiveSync Notifications
+mxxrlogin           1035/tcp  #MX-XR RPC
+mxxrlogin           1035/udp  #MX-XR RPC
+nsstp               1036/tcp  #Nebula Secure Segment Transfer Protocol
+nsstp               1036/udp  #Nebula Secure Segment Transfer Protocol
+ams                 1037/tcp  #AMS
+ams                 1037/udp  #AMS
+netarx              1040/tcp  #Netarx
+netarx              1040/udp  #Netarx
+fpitp               1045/tcp  #Fingerprint Image Transfer Protocol
+fpitp               1045/udp  #Fingerprint Image Transfer Protocol
+neod1               1047/tcp  #Sun's NEO Object Request Broker
+neod1               1047/udp  #Sun's NEO Object Request Broker
+neod2               1048/tcp  #Sun's NEO Object Request Broker
+neod2               1048/udp  #Sun's NEO Object Request Broker
+td-postman          1049/tcp  #Tobit David Postman VPMN
+td-postman          1049/udp  #Tobit David Postman VPMN
+cma                 1050/tcp  #CORBA Management Agent
+cma                 1050/udp  #CORBA Management Agent
+optima-vnet         1051/tcp  #Optima VNET
+optima-vnet         1051/udp  #Optima VNET
+ddt                 1052/tcp  #Dynamic DNS Tools
+ddt                 1052/udp  #Dynamic DNS Tools
+remote-as           1053/tcp  #Remote Assistant (RA)
+remote-as           1053/udp  #Remote Assistant (RA)
+brvread             1054/tcp  #BRVREAD
+brvread             1054/udp  #BRVREAD
+ansyslmd            1055/tcp  #ANSYS - License Manager 
+ansyslmd            1055/udp  #ANSYS - License Manager
+vfo                 1056/tcp  #VFO
+vfo                 1056/udp  #VFO 
+startron            1057/tcp  #STARTRON
+startron            1057/udp  #STARTRON
+nim                 1058/tcp  #nim
+nim                 1058/udp  #nim
+nimreg              1059/tcp  #nimreg
+nimreg              1059/udp  #nimreg
+polestar            1060/tcp  #POLESTAR
+polestar            1060/udp  #POLESTAR
+kiosk               1061/tcp  #KIOSK
+kiosk               1061/udp  #KIOSK
+veracity            1062/tcp  #Veracity
+veracity            1062/udp  #Veracity
+kyoceranetdev       1063/tcp  #KyoceraNetDev
+kyoceranetdev       1063/udp  #KyoceraNetDev
+jstel               1064/tcp  #JSTEL
+jstel               1064/udp  #JSTEL
+syscomlan           1065/tcp  #SYSCOMLAN
+syscomlan           1065/udp  #SYSCOMLAN
+fpo-fns             1066/tcp  #FPO-FNS
+fpo-fns             1066/udp  #FPO-FNS
+instl_boots         1067/tcp  #Installation Bootstrap Proto. Serv. 
+instl_boots         1067/udp  #Installation Bootstrap Proto. Serv. 
+instl_bootc         1068/tcp  #Installation Bootstrap Proto. Cli.  
+instl_bootc         1068/udp  #Installation Bootstrap Proto. Cli.  
+cognex-insight      1069/tcp  #COGNEX-INSIGHT
+cognex-insight      1069/udp  #COGNEX-INSIGHT
+gmrupdateserv       1070/tcp  #GMRUpdateSERV
+gmrupdateserv       1070/udp  #GMRUpdateSERV
+bsquare-voip        1071/tcp  #BSQUARE-VOIP
+bsquare-voip        1071/udp  #BSQUARE-VOIP
+cardax              1072/tcp  #CARDAX
+cardax              1072/udp  #CARDAX
+bridgecontrol       1073/tcp  #Bridge Control
+bridgecontrol       1073/udp  #Bridge Control
+fastechnologlm      1074/tcp  #FASTechnologies License Manager
+fastechnologlm      1074/udp  #FASTechnologies License Manager
+rdrmshc             1075/tcp  #RDRMSHC
+rdrmshc             1075/udp  #RDRMSHC
+dab-sti-c           1076/tcp  #DAB STI-C
+dab-sti-c           1076/udp  #DAB STI-C
+imgames             1077/tcp  #IMGames
+imgames             1077/udp  #IMGames
+avocent-proxy       1078/tcp  #Avocent Proxy Protocol
+avocent-proxy       1078/udp  #Avocent Proxy Protocol
+asprovatalk         1079/tcp  #ASPROVATalk
+asprovatalk         1079/udp  #ASPROVATalk
+socks               1080/tcp  #Socks    
+socks               1080/udp  #Socks    
+pvuniwien           1081/tcp  #PVUNIWIEN
+pvuniwien           1081/udp  #PVUNIWIEN
+amt-esd-prot        1082/tcp  #AMT-ESD-PROT
+amt-esd-prot        1082/udp  #AMT-ESD-PROT 
+ansoft-lm-1         1083/tcp  #Anasoft License Manager
+ansoft-lm-1         1083/udp  #Anasoft License Manager
+ansoft-lm-2         1084/tcp  #Anasoft License Manager
+ansoft-lm-2         1084/udp  #Anasoft License Manager
+webobjects          1085/tcp  #Web Objects
+webobjects          1085/udp  #Web Objects
+cplscrambler-lg     1086/tcp  #CPL Scrambler Logging
+cplscrambler-lg     1086/udp  #CPL Scrambler Logging
+cplscrambler-in     1087/tcp  #CPL Scrambler Internal
+cplscrambler-in     1087/udp  #CPL Scrambler Internal 
+cplscrambler-al     1088/tcp  #CPL Scrambler Alarm Log
+cplscrambler-al     1088/udp  #CPL Scrambler Alarm Log
+ff-annunc           1089/tcp  #FF Annunciation 
+ff-annunc           1089/udp  #FF Annunciation 
+ff-fms              1090/tcp  #FF Fieldbus Message Specification 
+ff-fms              1090/udp  #FF Fieldbus Message Specification
+ff-sm               1091/tcp  #FF System Management
+ff-sm               1091/udp  #FF System Management
+obrpd               1092/tcp  #Open Business Reporting Protocol
+obrpd               1092/udp  #Open Business Reporting Protocol
+proofd              1093/tcp  #PROOFD
+proofd              1093/udp  #PROOFD
+rootd               1094/tcp  #ROOTD
+rootd               1094/udp  #ROOTD
+nicelink            1095/tcp  #NICELink
+nicelink            1095/udp  #NICELink
+cnrprotocol         1096/tcp  #Common Name Resolution Protocol
+cnrprotocol         1096/udp  #Common Name Resolution Protocol
+sunclustermgr       1097/tcp  #Sun Cluster Manager
+sunclustermgr       1097/udp  #Sun Cluster Manager
+rmiactivation       1098/tcp  #RMI Activation
+rmiactivation       1098/udp  #RMI Activation
+rmiregistry         1099/tcp  #RMI Registry
+rmiregistry         1099/udp  #RMI Registry
+mctp                1100/tcp  #MCTP 
+mctp                1100/udp  #MCTP
+pt2-discover        1101/tcp  #PT2-DISCOVER
+pt2-discover        1101/udp  #PT2-DISCOVER
+adobeserver-1       1102/tcp  #ADOBE SERVER 1
+adobeserver-1       1102/udp  #ADOBE SERVER 1
+adobeserver-2       1103/tcp  #ADOBE SERVER 2
+adobeserver-2       1103/udp  #ADOBE SERVER 2
+xrl                 1104/tcp  #XRL
+xrl                 1104/udp  #XRL
+ftranhc             1105/tcp  #FTRANHC
+ftranhc             1105/udp  #FTRANHC
+isoipsigport-1      1106/tcp  #ISOIPSIGPORT-1
+isoipsigport-1      1106/udp  #ISOIPSIGPORT-1 
+isoipsigport-2      1107/tcp  #ISOIPSIGPORT-2 
+isoipsigport-2      1107/udp  #ISOIPSIGPORT-2 
+ratio-adp           1108/tcp  #ratio-adp
+ratio-adp           1108/udp  #ratio-adp
+nfsd-status         1110/tcp  #Cluster status info
+nfsd-keepalive      1110/udp  #Client status info
+lmsocialserver      1111/tcp  #LM Social Server
+lmsocialserver      1111/udp  #LM Social Server
+icp                 1112/tcp  #Intelligent Communication Protocol
+icp                 1112/udp  #Intelligent Communication Protocol
+mini-sql            1114/tcp  #Mini SQL
+mini-sql            1114/udp  #Mini SQL
+ardus-trns          1115/tcp  #ARDUS Transfer
+ardus-trns          1115/udp  #ARDUS Transfer
+ardus-cntl          1116/tcp  #ARDUS Control
+ardus-cntl          1116/udp  #ARDUS Control
+ardus-mtrns         1117/tcp  #ARDUS Multicast Transfer
+ardus-mtrns         1117/udp  #ARDUS Multicast Transfer
+sacred              1118/tcp  #SACRED
+sacred              1118/udp  #SACRED
+rmpp                1121/tcp  #Datalode RMPP
+rmpp                1121/udp  #Datalode RMPP
+availant-mgr        1122/tcp  #availant-mgr
+availant-mgr        1122/udp  #availant-mgr
+murray              1123/tcp  #Murray
+murray              1123/udp  #Murray
+nfa                 1155/tcp  #Network File Access                
+nfa                 1155/udp  #Network File Access                
+health-polling      1161/tcp  #Health Polling
+health-polling      1161/udp  #Health Polling
+health-trap         1162/tcp  #Health Trap
+health-trap         1162/udp  #Health Trap
+vchat               1168/tcp  #VChat Conference Service
+vchat               1168/udp  #VChat Conference Service
+tripwire            1169/tcp  #TRIPWIRE
+tripwire            1169/udp  #TRIPWIRE
+atc-lm              1170/tcp  #AT+C License Manager
+atc-lm              1170/udp  #AT+C License Manager
+atc-appserver       1171/tcp  #AT+C FmiApplicationServer
+atc-appserver       1171/udp  #AT+C FmiApplicationServer
+mc-client           1180/tcp  #Millicent Client Proxy
+mc-client           1180/udp  #Millicent Client Proxy
+llsurfup-http       1183/tcp  #LL Surfup HTTP
+llsurfup-http       1183/udp  #LL Surfup HTTP
+llsurfup-https      1184/tcp  #LL Surfup HTTPS
+llsurfup-https      1184/udp  #LL Surfup HTTPS
+catchpole           1185/tcp  #Catchpole port
+catchpole           1185/udp  #Catchpole port
+hp-webadmin         1188/tcp  #HP Web Admin
+hp-webadmin         1188/udp  #HP Web Admin
+dmidi               1199/tcp  #DMIDI
+dmidi               1199/udp  #DMIDI
+scol                1200/tcp  #SCOL
+scol                1200/udp  #SCOL
+nucleus-sand        1201/tcp  #Nucleus Sand
+nucleus-sand        1201/udp  #Nucleus Sand
+caiccipc            1202/tcp  #caiccipc
+caiccipc            1202/udp  #caiccipc
+ssslic-mgr          1203/tcp  #License Validation
+ssslic-mgr          1203/udp  #License Validation
+ssslog-mgr          1204/tcp  #Log Request Listener
+ssslog-mgr          1204/udp  #Log Request Listener
+accord-mgc          1205/tcp  #Accord-MGC
+accord-mgc          1205/udp  #Accord-MGC
+anthony-data        1206/tcp  #Anthony Data
+anthony-data        1206/udp  #Anthony Data
+metasage            1207/tcp  #MetaSage
+metasage            1207/udp  #MetaSage
+seagull-ais         1208/tcp  #SEAGULL AIS
+seagull-ais         1208/udp  #SEAGULL AIS
+ipcd3               1209/tcp  #IPCD3
+ipcd3               1209/udp  #IPCD3
+eoss                1210/tcp  #EOSS
+eoss                1210/udp  #EOSS
+groove-dpp          1211/tcp  #Groove DPP
+groove-dpp          1211/udp  #Groove DPP
+lupa                1212/tcp  #lupa
+lupa                1212/udp  #lupa
+mpc-lifenet         1213/tcp  #MPC LIFENET
+mpc-lifenet         1213/udp  #MPC LIFENET
+kazaa               1214/tcp  #KAZAA
+kazaa               1214/udp  #KAZAA
+scanstat-1          1215/tcp  #scanSTAT 1.0
+scanstat-1          1215/udp  #scanSTAT 1.0
+etebac5             1216/tcp  #ETEBAC 5
+etebac5             1216/udp  #ETEBAC 5
+hpss-ndapi          1217/tcp  #HPSS-NDAPI
+hpss-ndapi          1217/udp  #HPSS-NDAPI
+aeroflight-ads      1218/tcp  #AeroFlight-ADs
+aeroflight-ads      1218/udp  #AeroFlight-ADs
+aeroflight-ret      1219/tcp  #AeroFlight-Ret
+aeroflight-ret      1219/udp  #AeroFlight-Ret
+qt-serveradmin      1220/tcp  #QT SERVER ADMIN
+qt-serveradmin      1220/udp  #QT SERVER ADMIN
+sweetware-apps      1221/tcp  #SweetWARE Apps
+sweetware-apps      1221/udp  #SweetWARE Apps
+nerv                1222/tcp  #SNI R&D network                  
+nerv                1222/udp  #SNI R&D network                  
+tgp                 1223/tcp  #TGP
+tgp                 1223/udp  #TGP
+vpnz                1224/tcp  #VPNz
+vpnz                1224/udp  #VPNz
+slinkysearch        1225/tcp  #SLINKYSEARCH
+slinkysearch        1225/udp  #SLINKYSEARCH
+stgxfws             1226/tcp  #STGXFWS
+stgxfws             1226/udp  #STGXFWS
+dns2go              1227/tcp  #DNS2Go
+dns2go              1227/udp  #DNS2Go
+florence            1228/tcp  #FLORENCE
+florence            1228/udp  #FLORENCE
+novell-zfs          1229/tcp  #Novell ZFS
+novell-zfs          1229/udp  #Novell ZFS
+periscope           1230/tcp  #Periscope
+periscope           1230/udp  #Periscope
+menandmice-lpm      1231/tcp  #menandmice-lpm
+menandmice-lpm      1231/udp  #menandmice-lpm
+univ-appserver      1233/tcp  #Universal App Server
+univ-appserver      1233/udp  #Universal App Server
+search-agent        1234/tcp  #Infoseek Search Agent
+search-agent        1234/udp  #Infoseek Search Agent
+mosaicsyssvc1       1235/tcp  #mosaicsyssvc1
+mosaicsyssvc1       1235/udp  #mosaicsyssvc1
+bvcontrol           1236/tcp  #bvcontrol
+bvcontrol           1236/udp  #bvcontrol
+tsdos390            1237/tcp  #tsdos390
+tsdos390            1237/udp  #tsdos390
+hacl-qs             1238/tcp  #hacl-qs
+hacl-qs             1238/udp  #hacl-qs
+nmsd                1239/tcp  #NMSD
+nmsd                1239/udp  #NMSD
+instantia           1240/tcp  #Instantia
+instantia           1240/udp  #Instantia
+nessus              1241/tcp  #nessus
+nessus              1241/udp  #nessus
+nmasoverip          1242/tcp  #NMAS over IP
+nmasoverip          1242/udp  #NMAS over IP
+serialgateway       1243/tcp  #SerialGateway
+serialgateway       1243/udp  #SerialGateway
+isbconference1      1244/tcp  #isbconference1
+isbconference1      1244/udp  #isbconference1
+isbconference2      1245/tcp  #isbconference2
+isbconference2      1245/udp  #isbconference2
+payrouter           1246/tcp  #payrouter
+payrouter           1246/udp  #payrouter
+visionpyramid       1247/tcp  #VisionPyramid
+visionpyramid       1247/udp  #VisionPyramid
+hermes              1248/tcp  #hermes
+hermes              1248/udp  #hermes
+mesavistaco         1249/tcp  #Mesa Vista Co
+mesavistaco         1249/udp  #Mesa Vista Co
+swldy-sias          1250/tcp  #swldy-sias
+swldy-sias          1250/udp  #swldy-sias
+servergraph         1251/tcp  #servergraph
+servergraph         1251/udp  #servergraph
+bspne-pcc           1252/tcp  #bspne-pcc
+bspne-pcc           1252/udp  #bspne-pcc
+q55-pcc             1253/tcp  #q55-pcc
+q55-pcc             1253/udp  #q55-pcc
+de-noc              1254/tcp  #de-noc
+de-noc              1254/udp  #de-noc
+de-cache-query      1255/tcp  #de-cache-query
+de-cache-query      1255/udp  #de-cache-query
+de-server           1256/tcp  #de-server
+de-server           1256/udp  #de-server
+shockwave2          1257/tcp  #Shockwave 2
+shockwave2          1257/udp  #Shockwave 2
+opennl              1258/tcp  #Open Network Library
+opennl              1258/udp  #Open Network Library
+opennl-voice        1259/tcp  #Open Network Library Voice
+opennl-voice        1259/udp  #Open Network Library Voice
+ibm-ssd             1260/tcp  #ibm-ssd
+ibm-ssd             1260/udp  #ibm-ssd
+mpshrsv             1261/tcp  #mpshrsv
+mpshrsv             1261/udp  #mpshrsv
+qnts-orb            1262/tcp  #QNTS-ORB
+qnts-orb            1262/udp  #QNTS-ORB
+dka                 1263/tcp  #dka
+dka                 1263/udp  #dka
+prat                1264/tcp  #PRAT
+prat                1264/udp  #PRAT
+dssiapi             1265/tcp  #DSSIAPI
+dssiapi             1265/udp  #DSSIAPI
+dellpwrappks        1266/tcp  #DELLPWRAPPKS
+dellpwrappks        1266/udp  #DELLPWRAPPKS
+epc                 1267/tcp  #eTrust Policy Compliance
+epc                 1267/udp  #eTrust Policy Compliance
+propel-msgsys       1268/tcp  #PROPEL-MSGSYS
+propel-msgsys       1268/udp  #PROPEL-MSGSYS
+watilapp            1269/tcp  #WATiLaPP
+watilapp            1269/udp  #WATiLaPP
+opsmgr              1270/tcp  #Microsoft Operations Manager
+opsmgr              1270/udp  #Microsoft Operations Manager
+excw                1271/tcp  #eXcW
+excw                1271/udp  #eXcW
+cspmlockmgr         1272/tcp  #CSPMLockMgr
+cspmlockmgr         1272/udp  #CSPMLockMgr
+emc-gateway         1273/tcp  #EMC-Gateway
+emc-gateway         1273/udp  #EMC-Gateway
+t1distproc          1274/tcp  #t1distproc
+t1distproc          1274/udp  #t1distproc
+ivcollector         1275/tcp  #ivcollector
+ivcollector         1275/udp  #ivcollector
+ivmanager           1276/tcp  #ivmanager
+ivmanager           1276/udp  #ivmanager
+miva-mqs            1277/tcp  #mqs
+miva-mqs            1277/udp  #mqs
+dellwebadmin-1      1278/tcp  #Dell Web Admin 1
+dellwebadmin-1      1278/udp  #Dell Web Admin 1
+dellwebadmin-2      1279/tcp  #Dell Web Admin 2
+dellwebadmin-2      1279/udp  #Dell Web Admin 2   
+pictrography        1280/tcp  #Pictrography
+pictrography        1280/udp  #Pictrography
+healthd             1281/tcp  #healthd
+healthd             1281/udp  #healthd
+emperion            1282/tcp  #Emperion
+emperion            1282/udp  #Emperion
+productinfo         1283/tcp  #ProductInfo
+productinfo         1283/udp  #ProductInfo
+iee-qfx             1284/tcp  #IEE-QFX
+iee-qfx             1284/udp  #IEE-QFX
+neoiface            1285/tcp  #neoiface
+neoiface            1285/udp  #neoiface
+netuitive           1286/tcp  #netuitive
+netuitive           1286/udp  #netuitive 
+navbuddy            1288/tcp  #NavBuddy
+navbuddy            1288/udp  #NavBuddy
+jwalkserver         1289/tcp  #JWalkServer
+jwalkserver         1289/udp  #JWalkServer
+winjaserver         1290/tcp  #WinJaServer 
+winjaserver         1290/udp  #WinJaServer  
+seagulllms          1291/tcp  #SEAGULLLMS
+seagulllms          1291/udp  #SEAGULLLMS
+dsdn                1292/tcp  #dsdn
+dsdn                1292/udp  #dsdn
+pkt-krb-ipsec       1293/tcp  #PKT-KRB-IPSec
+pkt-krb-ipsec       1293/udp  #PKT-KRB-IPSec
+cmmdriver           1294/tcp  #CMMdriver
+cmmdriver           1294/udp  #CMMdriver
+ehtp                1295/tcp  #End-by-Hop Transmission Protocol
+ehtp                1295/udp  #End-by-Hop Transmission Protocol
+dproxy              1296/tcp  #dproxy
+dproxy              1296/udp  #dproxy
+sdproxy             1297/tcp  #sdproxy
+sdproxy             1297/udp  #sdproxy
+lpcp                1298/tcp  #lpcp
+lpcp                1298/udp  #lpcp
+hp-sci              1299/tcp  #hp-sci
+hp-sci              1299/udp  #hp-sci
+h323hostcallsc      1300/tcp  #H323 Host Call Secure
+h323hostcallsc      1300/udp  #H323 Host Call Secure
+ci3-software-1      1301/tcp  #CI3-Software-1
+ci3-software-1      1301/udp  #CI3-Software-1
+ci3-software-2      1302/tcp  #CI3-Software-2
+ci3-software-2      1302/udp  #CI3-Software-2
+sftsrv              1303/tcp  #sftsrv
+sftsrv              1303/udp  #sftsrv
+boomerang           1304/tcp  #Boomerang
+boomerang           1304/udp  #Boomerang
+pe-mike             1305/tcp  #pe-mike
+pe-mike             1305/udp  #pe-mike
+re-conn-proto       1306/tcp  #RE-Conn-Proto
+re-conn-proto       1306/udp  #RE-Conn-Proto
+pacmand             1307/tcp  #Pacmand
+pacmand             1307/udp  #Pacmand
+odsi                1308/tcp  #Optical Domain Service Interconnect (ODSI)
+odsi                1308/udp  #Optical Domain Service Interconnect (ODSI)
+jtag-server         1309/tcp  #JTAG server
+jtag-server         1309/udp  #JTAG server
+husky               1310/tcp  #Husky
+husky               1310/udp  #Husky
+rxmon               1311/tcp  #RxMon
+rxmon               1311/udp  #RxMon
+sti-envision        1312/tcp  #STI Envision
+sti-envision        1312/udp  #STI Envision
+bmc_patroldb        1313/tcp  #BMC_PATROLDB
+bmc_patroldb        1313/udp  #BMC_PATROLDB
+pdps                1314/tcp  #Photoscript Distributed Printing System
+pdps                1314/udp  #Photoscript Distributed Printing System
+els                 1315/tcp  #E.L.S., Event Listener Service
+els                 1315/udp  #E.L.S., Event Listener Service
+exbit-escp          1316/tcp  #Exbit-ESCP
+exbit-escp          1316/udp  #Exbit-ESCP
+vrts-ipcserver      1317/tcp  #vrts-ipcserver
+vrts-ipcserver      1317/udp  #vrts-ipcserver
+krb5gatekeeper      1318/tcp  #krb5gatekeeper
+krb5gatekeeper      1318/udp  #krb5gatekeeper
+panja-icsp          1319/tcp  #Panja-ICSP
+panja-icsp          1319/udp  #Panja-ICSP
+panja-axbnet        1320/tcp  #Panja-AXBNET
+panja-axbnet        1320/udp  #Panja-AXBNET
+pip                 1321/tcp  #PIP
+pip                 1321/udp  #PIP
+novation            1322/tcp  #Novation
+novation            1322/udp  #Novation
+brcd                1323/tcp  #brcd
+brcd                1323/udp  #brcd
+delta-mcp           1324/tcp  #delta-mcp
+delta-mcp           1324/udp  #delta-mcp
+dx-instrument       1325/tcp  #DX-Instrument
+dx-instrument       1325/udp  #DX-Instrument
+wimsic              1326/tcp  #WIMSIC
+wimsic              1326/udp  #WIMSIC
+ultrex              1327/tcp  #Ultrex
+ultrex              1327/udp  #Ultrex
+ewall               1328/tcp  #EWALL
+ewall               1328/udp  #EWALL
+netdb-export        1329/tcp  #netdb-export
+netdb-export        1329/udp  #netdb-export
+streetperfect       1330/tcp  #StreetPerfect
+streetperfect       1330/udp  #StreetPerfect
+intersan            1331/tcp  #intersan
+intersan            1331/udp  #intersan
+pcia-rxp-b          1332/tcp  #PCIA RXP-B
+pcia-rxp-b          1332/udp  #PCIA RXP-B
+passwrd-policy      1333/tcp  #Password Policy
+passwrd-policy      1333/udp  #Password Policy
+writesrv            1334/tcp  #writesrv
+writesrv            1334/udp  #writesrv
+digital-notary      1335/tcp  #Digital Notary Protocol
+digital-notary      1335/udp  #Digital Notary Protocol
+ischat              1336/tcp  #Instant Service Chat
+ischat              1336/udp  #Instant Service Chat
+menandmice-dns      1337/tcp  #menandmice DNS
+menandmice-dns      1337/udp  #menandmice DNS
+wmc-log-svc         1338/tcp  #WMC-log-svr
+wmc-log-svc         1338/udp  #WMC-log-svr
+kjtsiteserver       1339/tcp  #kjtsiteserver
+kjtsiteserver       1339/udp  #kjtsiteserver
+naap                1340/tcp  #NAAP
+naap                1340/udp  #NAAP
+qubes               1341/tcp  #QuBES
+qubes               1341/udp  #QuBES
+esbroker            1342/tcp  #ESBroker
+esbroker            1342/udp  #ESBroker
+re101               1343/tcp  #re101
+re101               1343/udp  #re101
+icap                1344/tcp  #ICAP
+icap                1344/udp  #ICAP
+vpjp                1345/tcp  #VPJP
+vpjp                1345/udp  #VPJP
+alta-ana-lm         1346/tcp  #Alta Analytics License Manager 
+alta-ana-lm         1346/udp  #Alta Analytics License Manager 
+bbn-mmc             1347/tcp  #multi media conferencing
+bbn-mmc             1347/udp  #multi media conferencing
+bbn-mmx             1348/tcp  #multi media conferencing
+bbn-mmx             1348/udp  #multi media conferencing
+sbook               1349/tcp  #Registration Network Protocol       
+sbook               1349/udp  #Registration Network Protocol       
+editbench           1350/tcp  #Registration Network Protocol       
+editbench           1350/udp  #Registration Network Protocol       
+equationbuilder     1351/tcp  #Digital Tool Works (MIT)            
+equationbuilder     1351/udp  #Digital Tool Works (MIT)            
+lotusnote           1352/tcp  #Lotus Note                          
+lotusnote           1352/udp  #Lotus Note                          
+relief              1353/tcp  #Relief Consulting                   
+relief              1353/udp  #Relief Consulting                   
+intuitive-edge      1355/tcp  #Intuitive Edge 
+intuitive-edge      1355/udp  #Intuitive Edge 
+cuillamartin        1356/tcp  #CuillaMartin Company 
+cuillamartin        1356/udp  #CuillaMartin Company 
+pegboard            1357/tcp  #Electronic PegBoard  
+pegboard            1357/udp  #Electronic PegBoard  
+connlcli            1358/tcp  #CONNLCLI                             
+connlcli            1358/udp  #CONNLCLI                             
+ftsrv               1359/tcp  #FTSRV                                
+ftsrv               1359/udp  #FTSRV                                
+mimer               1360/tcp  #MIMER                               
+mimer               1360/udp  #MIMER                               
+linx                1361/tcp  #LinX                        
+linx                1361/udp  #LinX                        
+timeflies           1362/tcp  #TimeFlies                           
+timeflies           1362/udp  #TimeFlies                           
+ndm-requester       1363/tcp  #Network DataMover Requester
+ndm-requester       1363/udp  #Network DataMover Requester
+ndm-server          1364/tcp  #Network DataMover Server   
+ndm-server          1364/udp  #Network DataMover Server   
+adapt-sna           1365/tcp  #Network Software Associates
+adapt-sna           1365/udp  #Network Software Associates
+netware-csp         1366/tcp  #Novell NetWare Comm Service Platform
+netware-csp         1366/udp  #Novell NetWare Comm Service Platform
+dcs                 1367/tcp  #DCS                             
+dcs                 1367/udp  #DCS                             
+screencast          1368/tcp  #ScreenCast                          
+screencast          1368/udp  #ScreenCast                          
+gv-us               1369/tcp  #GlobalView to Unix Shell             
+gv-us               1369/udp  #GlobalView to Unix Shell             
+us-gv               1370/tcp  #Unix Shell to GlobalView             
+us-gv               1370/udp  #Unix Shell to GlobalView             
+fc-cli              1371/tcp  #Fujitsu Config Protocol             
+fc-cli              1371/udp  #Fujitsu Config Protocol             
+fc-ser              1372/tcp  #Fujitsu Config Protocol             
+fc-ser              1372/udp  #Fujitsu Config Protocol             
+chromagrafx         1373/tcp  #Chromagrafx                         
+chromagrafx         1373/udp  #Chromagrafx                         
+molly               1374/tcp  #EPI Software Systems        
+molly               1374/udp  #EPI Software Systems        
+bytex               1375/tcp  #Bytex                             
+bytex               1375/udp  #Bytex                             
+ibm-pps             1376/tcp  #IBM Person to Person Software     
+ibm-pps             1376/udp  #IBM Person to Person Software     
+cichlid             1377/tcp  #Cichlid License Manager       
+cichlid             1377/udp  #Cichlid License Manager       
+elan                1378/tcp  #Elan License Manager   
+elan                1378/udp  #Elan License Manager   
+dbreporter          1379/tcp  #Integrity Solutions                 
+dbreporter          1379/udp  #Integrity Solutions                 
+telesis-licman      1380/tcp  #Telesis Network License Manager     
+telesis-licman      1380/udp  #Telesis Network License Manager     
+apple-licman        1381/tcp  #Apple Network License Manager 
+apple-licman        1381/udp  #Apple Network License Manager 
+udt_os              1382/tcp  #udt_os
+udt_os              1382/udp  #udt_os
+gwha                1383/tcp  #GW Hannaway Network License Manager
+gwha                1383/udp  #GW Hannaway Network License Manager
+os-licman           1384/tcp  #Objective Solutions License Manager 
+os-licman           1384/udp  #Objective Solutions License Manager 
+atex_elmd           1385/tcp  #Atex Publishing License Manager
+atex_elmd           1385/udp  #Atex Publishing License Manager
+checksum            1386/tcp  #CheckSum License Manager            
+checksum            1386/udp  #CheckSum License Manager            
+cadsi-lm            1387/tcp  #Computer Aided Design Software Inc LM 
+cadsi-lm            1387/udp  #Computer Aided Design Software Inc LM 
+objective-dbc       1388/tcp  #Objective Solutions DataBase Cache
+objective-dbc       1388/udp  #Objective Solutions DataBase Cache
+iclpv-dm            1389/tcp  #Document Manager                    
+iclpv-dm            1389/udp  #Document Manager                    
+iclpv-sc            1390/tcp  #Storage Controller                  
+iclpv-sc            1390/udp  #Storage Controller                  
+iclpv-sas           1391/tcp  #Storage Access Server               
+iclpv-sas           1391/udp  #Storage Access Server               
+iclpv-pm            1392/tcp  #Print Manager                       
+iclpv-pm            1392/udp  #Print Manager                       
+iclpv-nls           1393/tcp  #Network Log Server                  
+iclpv-nls           1393/udp  #Network Log Server                  
+iclpv-nlc           1394/tcp  #Network Log Client                  
+iclpv-nlc           1394/udp  #Network Log Client                  
+iclpv-wsm           1395/tcp  #PC Workstation Manager software     
+iclpv-wsm           1395/udp  #PC Workstation Manager software     
+dvl-activemail      1396/tcp  #DVL Active Mail                     
+dvl-activemail      1396/udp  #DVL Active Mail                     
+audio-activmail     1397/tcp  #Audio Active Mail                   
+audio-activmail     1397/udp  #Audio Active Mail                   
+video-activmail     1398/tcp  #Video Active Mail                   
+video-activmail     1398/udp  #Video Active Mail                   
+cadkey-licman       1399/tcp  #Cadkey License Manager         
+cadkey-licman       1399/udp  #Cadkey License Manager         
+cadkey-tablet       1400/tcp  #Cadkey Tablet Daemon           
+cadkey-tablet       1400/udp  #Cadkey Tablet Daemon           
+goldleaf-licman     1401/tcp  #Goldleaf License Manager
+goldleaf-licman     1401/udp  #Goldleaf License Manager
+prm-sm-np           1402/tcp  #Prospero Resource Manager
+prm-sm-np           1402/udp  #Prospero Resource Manager
+prm-nm-np           1403/tcp  #Prospero Resource Manager
+prm-nm-np           1403/udp  #Prospero Resource Manager
+igi-lm              1404/tcp  #Infinite Graphics License Manager
+igi-lm              1404/udp  #Infinite Graphics License Manager
+ibm-res             1405/tcp  #IBM Remote Execution Starter
+ibm-res             1405/udp  #IBM Remote Execution Starter
+netlabs-lm          1406/tcp  #NetLabs License Manager
+netlabs-lm          1406/udp  #NetLabs License Manager
+dbsa-lm             1407/tcp  #DBSA License Manager        
+dbsa-lm             1407/udp  #DBSA License Manager        
+sophia-lm           1408/tcp  #Sophia License Manager              
+sophia-lm           1408/udp  #Sophia License Manager              
+here-lm             1409/tcp  #Here License Manager             
+here-lm             1409/udp  #Here License Manager             
+hiq                 1410/tcp  #HiQ License Manager               
+hiq                 1410/udp  #HiQ License Manager               
+af                  1411/tcp  #AudioFile                  
+af                  1411/udp  #AudioFile                  
+innosys             1412/tcp  #InnoSys               
+innosys             1412/udp  #InnoSys               
+innosys-acl         1413/tcp  #Innosys-ACL           
+innosys-acl         1413/udp  #Innosys-ACL           
+ibm-mqseries        1414/tcp  #IBM MQSeries                        
+ibm-mqseries        1414/udp  #IBM MQSeries                        
+dbstar              1415/tcp  #DBStar                          
+dbstar              1415/udp  #DBStar                          
+novell-lu6.2        1416/tcp  #Novell LU6.2         
+novell-lu6.2        1416/udp  #Novell LU6.2         
+timbuktu-srv1       1417/tcp  #Timbuktu Service 1 Port            
+timbuktu-srv1       1417/udp  #Timbuktu Service 1 Port            
+timbuktu-srv2       1418/tcp  #Timbuktu Service 2 Port            
+timbuktu-srv2       1418/udp  #Timbuktu Service 2 Port            
+timbuktu-srv3       1419/tcp  #Timbuktu Service 3 Port            
+timbuktu-srv3       1419/udp  #Timbuktu Service 3 Port            
+timbuktu-srv4       1420/tcp  #Timbuktu Service 4 Port            
+timbuktu-srv4       1420/udp  #Timbuktu Service 4 Port            
+gandalf-lm          1421/tcp  #Gandalf License Manager
+gandalf-lm          1421/udp  #Gandalf License Manager
+autodesk-lm         1422/tcp  #Autodesk License Manager   
+autodesk-lm         1422/udp  #Autodesk License Manager   
+essbase             1423/tcp  #Essbase Arbor Software     
+essbase             1423/udp  #Essbase Arbor Software     
+hybrid              1424/tcp  #Hybrid Encryption Protocol  
+hybrid              1424/udp  #Hybrid Encryption Protocol  
+zion-lm             1425/tcp  #Zion Software License Manager 
+zion-lm             1425/udp  #Zion Software License Manager 
+sais                1426/tcp  #Satellite-data Acquisition System 1
+sais                1426/udp  #Satellite-data Acquisition System 1
+mloadd              1427/tcp  #mloadd monitoring tool     
+mloadd              1427/udp  #mloadd monitoring tool     
+informatik-lm       1428/tcp  #Informatik License Manager
+informatik-lm       1428/udp  #Informatik License Manager
+nms                 1429/tcp  #Hypercom NMS                      
+nms                 1429/udp  #Hypercom NMS                      
+tpdu                1430/tcp  #Hypercom TPDU                     
+tpdu                1430/udp  #Hypercom TPDU                     
+rgtp                1431/tcp  #Reverse Gossip Transport
+rgtp                1431/udp  #Reverse Gossip Transport
+blueberry-lm        1432/tcp  #Blueberry Software License Manager  
+blueberry-lm        1432/udp  #Blueberry Software License Manager  
+ms-sql-s            1433/tcp  #Microsoft-SQL-Server 
+ms-sql-s            1433/udp  #Microsoft-SQL-Server 
+ms-sql-m            1434/tcp  #Microsoft-SQL-Monitor
+ms-sql-m            1434/udp  #Microsoft-SQL-Monitor                
+ibm-cics            1435/tcp  #IBM CICS
+ibm-cics            1435/udp  #IBM CICS
+saism               1436/tcp  #Satellite-data Acquisition System 2
+saism               1436/udp  #Satellite-data Acquisition System 2
+tabula              1437/tcp  #Tabula
+tabula              1437/udp  #Tabula
+eicon-server        1438/tcp  #Eicon Security Agent/Server         
+eicon-server        1438/udp  #Eicon Security Agent/Server         
+eicon-x25           1439/tcp  #Eicon X25/SNA Gateway               
+eicon-x25           1439/udp  #Eicon X25/SNA Gateway               
+eicon-slp           1440/tcp  #Eicon Service Location Protocol     
+eicon-slp           1440/udp  #Eicon Service Location Protocol     
+cadis-1             1441/tcp  #Cadis License Management       
+cadis-1             1441/udp  #Cadis License Management       
+cadis-2             1442/tcp  #Cadis License Management       
+cadis-2             1442/udp  #Cadis License Management       
+ies-lm              1443/tcp  #Integrated Engineering Software     
+ies-lm              1443/udp  #Integrated Engineering Software     
+marcam-lm           1444/tcp  #Marcam  License Management    
+marcam-lm           1444/udp  #Marcam  License Management    
+proxima-lm          1445/tcp  #Proxima License Manager       
+proxima-lm          1445/udp  #Proxima License Manager       
+ora-lm              1446/tcp  #Optical Research Associates License Manager
+ora-lm              1446/udp  #Optical Research Associates License Manager
+apri-lm             1447/tcp  #Applied Parallel Research LM
+apri-lm             1447/udp  #Applied Parallel Research LM
+oc-lm               1448/tcp  #OpenConnect License Manager
+oc-lm               1448/udp  #OpenConnect License Manager
+peport              1449/tcp  #PEport                               
+peport              1449/udp  #PEport                               
+dwf                 1450/tcp  #Tandem Distributed Workbench Facility 
+dwf                 1450/udp  #Tandem Distributed Workbench Facility 
+infoman             1451/tcp  #IBM Information Management
+infoman             1451/udp  #IBM Information Management
+gtegsc-lm           1452/tcp  #GTE Government Systems License Man   
+gtegsc-lm           1452/udp  #GTE Government Systems License Man   
+genie-lm            1453/tcp  #Genie License Manager                
+genie-lm            1453/udp  #Genie License Manager                
+interhdl_elmd       1454/tcp  #interHDL License Manager      
+interhdl_elmd       1454/udp  #interHDL License Manager      
+esl-lm              1455/tcp  #ESL License Manager           
+esl-lm              1455/udp  #ESL License Manager           
+dca                 1456/tcp  #DCA           
+dca                 1456/udp  #DCA           
+valisys-lm          1457/tcp  #Valisys License Manager
+valisys-lm          1457/udp  #Valisys License Manager
+nrcabq-lm           1458/tcp  #Nichols Research Corp.
+nrcabq-lm           1458/udp  #Nichols Research Corp.
+proshare1           1459/tcp  #Proshare Notebook Application
+proshare1           1459/udp  #Proshare Notebook Application
+proshare2           1460/tcp  #Proshare Notebook Application
+proshare2           1460/udp  #Proshare Notebook Application
+ibm_wrless_lan      1461/tcp  #IBM Wireless LAN 
+ibm_wrless_lan      1461/udp  #IBM Wireless LAN 
+world-lm            1462/tcp  #World License Manager
+world-lm            1462/udp  #World License Manager
+nucleus             1463/tcp  #Nucleus
+nucleus             1463/udp  #Nucleus
+msl_lmd             1464/tcp  #MSL License Manager
+msl_lmd             1464/udp  #MSL License Manager
+pipes               1465/tcp  #Pipes Platform 
+pipes               1465/udp  #Pipes Platform  mfarlin@peerlogic.com
+oceansoft-lm        1466/tcp  #Ocean Software License Manager
+oceansoft-lm        1466/udp  #Ocean Software License Manager
+csdmbase            1467/tcp  #CSDMBASE  
+csdmbase            1467/udp  #CSDMBASE  
+csdm                1468/tcp  #CSDM      
+csdm                1468/udp  #CSDM      
+aal-lm              1469/tcp  #Active Analysis Limited License Manager
+aal-lm              1469/udp  #Active Analysis Limited License Manager
+uaiact              1470/tcp  #Universal Analytics  
+uaiact              1470/udp  #Universal Analytics  
+csdmbase            1471/tcp  #csdmbase   
+csdmbase            1471/udp  #csdmbase   
+csdm                1472/tcp  #csdm       
+csdm                1472/udp  #csdm       
+openmath            1473/tcp  #OpenMath   
+openmath            1473/udp  #OpenMath   
+telefinder          1474/tcp  #Telefinder 
+telefinder          1474/udp  #Telefinder 
+taligent-lm         1475/tcp  #Taligent License Manager  
+taligent-lm         1475/udp  #Taligent License Manager  
+clvm-cfg            1476/tcp  #clvm-cfg  
+clvm-cfg            1476/udp  #clvm-cfg  
+ms-sna-server       1477/tcp  #ms-sna-server  
+ms-sna-server       1477/udp  #ms-sna-server  
+ms-sna-base         1478/tcp  #ms-sna-base    
+ms-sna-base         1478/udp  #ms-sna-base    
+dberegister         1479/tcp  #dberegister  
+dberegister         1479/udp  #dberegister  
+pacerforum          1480/tcp  #PacerForum  
+pacerforum          1480/udp  #PacerForum  
+airs                1481/tcp  #AIRS        
+airs                1481/udp  #AIRS        
+miteksys-lm         1482/tcp  #Miteksys License Manager
+miteksys-lm         1482/udp  #Miteksys License Manager
+afs                 1483/tcp  #AFS License Manager   
+afs                 1483/udp  #AFS License Manager   
+confluent           1484/tcp  #Confluent License Manager 
+confluent           1484/udp  #Confluent License Manager 
+lansource           1485/tcp  #LANSource 
+lansource           1485/udp  #LANSource 
+nms_topo_serv       1486/tcp  #nms_topo_serv  
+nms_topo_serv       1486/udp  #nms_topo_serv  
+localinfosrvr       1487/tcp  #LocalInfoSrvr  
+localinfosrvr       1487/udp  #LocalInfoSrvr  
+docstor             1488/tcp  #DocStor  
+docstor             1488/udp  #DocStor  
+dmdocbroker         1489/tcp  #dmdocbroker  
+dmdocbroker         1489/udp  #dmdocbroker  
+insitu-conf         1490/tcp  #insitu-conf  
+insitu-conf         1490/udp  #insitu-conf  
+anynetgateway       1491/tcp  #anynetgateway  
+anynetgateway       1491/udp  #anynetgateway  
+stone-design-1      1492/tcp  #stone-design-1  
+stone-design-1      1492/udp  #stone-design-1  
+netmap_lm           1493/tcp  #netmap_lm  
+netmap_lm           1493/udp  #netmap_lm  
+ica                 1494/tcp  #ica   
+ica                 1494/udp  #ica   
+cvc                 1495/tcp  #cvc  
+cvc                 1495/udp  #cvc  
+liberty-lm          1496/tcp  #liberty-lm
+liberty-lm          1496/udp  #liberty-lm
+rfx-lm              1497/tcp  #rfx-lm
+rfx-lm              1497/udp  #rfx-lm
+sybase-sqlany       1498/tcp  #Sybase SQL Any
+sybase-sqlany       1498/udp  #Sybase SQL Any
+fhc                 1499/tcp  #Federico Heinz Consultora
+fhc                 1499/udp  #Federico Heinz Consultora
+vlsi-lm             1500/tcp  #VLSI License Manager
+vlsi-lm             1500/udp  #VLSI License Manager
+saiscm              1501/tcp  #Satellite-data Acquisition System 3 
+saiscm              1501/udp  #Satellite-data Acquisition System 3 
+shivadiscovery      1502/tcp  #Shiva
+shivadiscovery      1502/udp  #Shiva
+imtc-mcs            1503/tcp  #Databeam
+imtc-mcs            1503/udp  #Databeam
+evb-elm             1504/tcp  #EVB Software Engineering License Manager
+evb-elm             1504/udp  #EVB Software Engineering License Manager
+funkproxy           1505/tcp  #Funk Software, Inc.
+funkproxy           1505/udp  #Funk Software, Inc.
+utcd                1506/tcp  #Universal Time daemon (utcd)
+utcd                1506/udp  #Universal Time daemon (utcd)
+symplex             1507/tcp  #symplex
+symplex             1507/udp  #symplex
+diagmond            1508/tcp  #diagmond
+diagmond            1508/udp  #diagmond
+robcad-lm           1509/tcp  #Robcad, Ltd. License Manager
+robcad-lm           1509/udp  #Robcad, Ltd. License Manager
+mvx-lm              1510/tcp  #Midland Valley Exploration Ltd. Lic. Man.
+mvx-lm              1510/udp  #Midland Valley Exploration Ltd. Lic. Man.
+3l-l1               1511/tcp  #3l-l1
+3l-l1               1511/udp  #3l-l1
+wins                1512/tcp  #Microsoft's Windows Internet Name Service
+wins                1512/udp  #Microsoft's Windows Internet Name Service
+fujitsu-dtc         1513/tcp  #Fujitsu Systems Business of America, Inc
+fujitsu-dtc         1513/udp  #Fujitsu Systems Business of America, Inc
+fujitsu-dtcns       1514/tcp  #Fujitsu Systems Business of America, Inc
+fujitsu-dtcns       1514/udp  #Fujitsu Systems Business of America, Inc
+ifor-protocol       1515/tcp  #ifor-protocol
+ifor-protocol       1515/udp  #ifor-protocol
+vpad                1516/tcp  #Virtual Places Audio data
+vpad                1516/udp  #Virtual Places Audio data
+vpac                1517/tcp  #Virtual Places Audio control
+vpac                1517/udp  #Virtual Places Audio control
+vpvd                1518/tcp  #Virtual Places Video data
+vpvd                1518/udp  #Virtual Places Video data
+vpvc                1519/tcp  #Virtual Places Video control
+vpvc                1519/udp  #Virtual Places Video control
+atm-zip-office      1520/tcp  #atm zip office
+atm-zip-office      1520/udp  #atm zip office
+ncube-lm            1521/tcp  #nCube License Manager
+ncube-lm            1521/udp  #nCube License Manager
+ricardo-lm          1522/tcp  #Ricardo North America License Manager
+ricardo-lm          1522/udp  #Ricardo North America License Manager
+cichild-lm          1523/tcp  #cichild
+cichild-lm          1523/udp  #cichild
+ingreslock          1524/tcp  #ingres
+ingreslock          1524/udp  #ingres
+orasrv              1525/tcp  #oracle
+orasrv              1525/udp  #oracle
+prospero-np         1525/tcp  #Prospero Directory Service non-priv
+prospero-np         1525/udp  #Prospero Directory Service non-priv
+pdap-np             1526/tcp  #Prospero Data Access Prot non-priv 
+pdap-np             1526/udp  #Prospero Data Access Prot non-priv 
+tlisrv              1527/tcp  #oracle
+tlisrv              1527/udp  #oracle
+mciautoreg          1528/tcp  #micautoreg
+mciautoreg          1528/udp  #micautoreg
+coauthor            1529/tcp  #oracle
+coauthor            1529/udp  #oracle
+rap-service         1530/tcp  #rap-service
+rap-service         1530/udp  #rap-service
+rap-listen          1531/tcp  #rap-listen
+rap-listen          1531/udp  #rap-listen
+miroconnect         1532/tcp  #miroconnect
+miroconnect         1532/udp  #miroconnect
+virtual-places      1533/tcp  #Virtual Places Software
+virtual-places      1533/udp  #Virtual Places Software
+micromuse-lm        1534/tcp  #micromuse-lm    
+micromuse-lm        1534/udp  #micromuse-lm    
+ampr-info           1535/tcp  #ampr-info    
+ampr-info           1535/udp  #ampr-info    
+ampr-inter          1536/tcp  #ampr-inter
+ampr-inter          1536/udp  #ampr-inter
+sdsc-lm             1537/tcp  #isi-lm
+sdsc-lm             1537/udp  #isi-lm
+3ds-lm              1538/tcp  #3ds-lm
+3ds-lm              1538/udp  #3ds-lm
+intellistor-lm      1539/tcp  #Intellistor License Manager
+intellistor-lm      1539/udp  #Intellistor License Manager
+rds                 1540/tcp  #rds
+rds                 1540/udp  #rds
+rds2                1541/tcp  #rds2
+rds2                1541/udp  #rds2
+gridgen-elmd        1542/tcp  #gridgen-elmd
+gridgen-elmd        1542/udp  #gridgen-elmd
+simba-cs            1543/tcp  #simba-cs
+simba-cs            1543/udp  #simba-cs
+aspeclmd            1544/tcp  #aspeclmd
+aspeclmd            1544/udp  #aspeclmd
+vistium-share       1545/tcp  #vistium-share
+vistium-share       1545/udp  #vistium-share
+abbaccuray          1546/tcp  #abbaccuray
+abbaccuray          1546/udp  #abbaccuray
+laplink             1547/tcp  #laplink
+laplink             1547/udp  #laplink
+axon-lm             1548/tcp  #Axon License Manager
+axon-lm             1548/udp  #Axon License Manager
+shivahose           1549/tcp  #Shiva Hose
+shivasound          1549/udp  #Shiva Sound
+3m-image-lm         1550/tcp  #Image Storage license manager 3M Company
+3m-image-lm         1550/udp  #Image Storage license manager 3M Company
+hecmtl-db           1551/tcp  #HECMTL-DB
+hecmtl-db           1551/udp  #HECMTL-DB
+pciarray            1552/tcp  #pciarray
+pciarray            1552/udp  #pciarray
+sna-cs              1553/tcp  #sna-cs
+sna-cs              1553/udp  #sna-cs
+caci-lm             1554/tcp  #CACI Products Company License Manager
+caci-lm             1554/udp  #CACI Products Company License Manager
+livelan             1555/tcp  #livelan
+livelan             1555/udp  #livelan
+veritas_pbx         1556/tcp  #VERITAS Private Branch Exchange
+veritas_pbx         1556/udp  #VERITAS Private Branch Exchange                        
+arbortext-lm        1557/tcp  #ArborText License Manager
+arbortext-lm        1557/udp  #ArborText License Manager
+xingmpeg            1558/tcp  #xingmpeg
+xingmpeg            1558/udp  #xingmpeg
+web2host            1559/tcp  #web2host
+web2host            1559/udp  #web2host
+asci-val            1560/tcp  #ASCI-RemoteSHADOW
+asci-val            1560/udp  #ASCI-RemoteSHADOW
+facilityview        1561/tcp  #facilityview
+facilityview        1561/udp  #facilityview
+pconnectmgr         1562/tcp  #pconnectmgr
+pconnectmgr         1562/udp  #pconnectmgr
+cadabra-lm          1563/tcp  #Cadabra License Manager
+cadabra-lm          1563/udp  #Cadabra License Manager
+pay-per-view        1564/tcp  #Pay-Per-View
+pay-per-view        1564/udp  #Pay-Per-View
+winddlb             1565/tcp  #WinDD
+winddlb             1565/udp  #WinDD
+corelvideo          1566/tcp  #CORELVIDEO
+corelvideo          1566/udp  #CORELVIDEO
+jlicelmd            1567/tcp  #jlicelmd
+jlicelmd            1567/udp  #jlicelmd
+tsspmap             1568/tcp  #tsspmap
+tsspmap             1568/udp  #tsspmap
+ets                 1569/tcp  #ets
+ets                 1569/udp  #ets
+orbixd              1570/tcp  #orbixd
+orbixd              1570/udp  #orbixd
+rdb-dbs-disp        1571/tcp  #Oracle Remote Data Base
+rdb-dbs-disp        1571/udp  #Oracle Remote Data Base
+chip-lm             1572/tcp  #Chipcom License Manager
+chip-lm             1572/udp  #Chipcom License Manager
+itscomm-ns          1573/tcp  #itscomm-ns
+itscomm-ns          1573/udp  #itscomm-ns
+mvel-lm             1574/tcp  #mvel-lm
+mvel-lm             1574/udp  #mvel-lm
+oraclenames         1575/tcp  #oraclenames
+oraclenames         1575/udp  #oraclenames
+moldflow-lm         1576/tcp  #moldflow-lm
+moldflow-lm         1576/udp  #moldflow-lm
+hypercube-lm        1577/tcp  #hypercube-lm
+hypercube-lm        1577/udp  #hypercube-lm
+jacobus-lm          1578/tcp  #Jacobus License Manager
+jacobus-lm          1578/udp  #Jacobus License Manager
+ioc-sea-lm          1579/tcp  #ioc-sea-lm
+ioc-sea-lm          1579/udp  #ioc-sea-lm
+tn-tl-r1            1580/tcp  #tn-tl-r1
+tn-tl-r2            1580/udp  #tn-tl-r2
+mil-2045-47001      1581/tcp  #MIL-2045-47001
+mil-2045-47001      1581/udp  #MIL-2045-47001
+msims               1582/tcp  #MSIMS
+msims               1582/udp  #MSIMS
+simbaexpress        1583/tcp  #simbaexpress
+simbaexpress        1583/udp  #simbaexpress
+tn-tl-fd2           1584/tcp  #tn-tl-fd2
+tn-tl-fd2           1584/udp  #tn-tl-fd2
+intv                1585/tcp  #intv
+intv                1585/udp  #intv
+ibm-abtact          1586/tcp  #ibm-abtact
+ibm-abtact          1586/udp  #ibm-abtact
+pra_elmd            1587/tcp  #pra_elmd
+pra_elmd            1587/udp  #pra_elmd
+triquest-lm         1588/tcp  #triquest-lm 
+triquest-lm         1588/udp  #triquest-lm 
+vqp                 1589/tcp  #VQP
+vqp                 1589/udp  #VQP
+gemini-lm           1590/tcp  #gemini-lm
+gemini-lm           1590/udp  #gemini-lm
+ncpm-pm             1591/tcp  #ncpm-pm
+ncpm-pm             1591/udp  #ncpm-pm
+commonspace         1592/tcp  #commonspace
+commonspace         1592/udp  #commonspace
+mainsoft-lm         1593/tcp  #mainsoft-lm
+mainsoft-lm         1593/udp  #mainsoft-lm
+sixtrak             1594/tcp  #sixtrak
+sixtrak             1594/udp  #sixtrak
+radio               1595/tcp  #radio
+radio               1595/udp  #radio
+radio-sm            1596/tcp  #radio-sm
+radio-bc            1596/udp  #radio-bc
+orbplus-iiop        1597/tcp  #orbplus-iiop
+orbplus-iiop        1597/udp  #orbplus-iiop
+picknfs             1598/tcp  #picknfs
+picknfs             1598/udp  #picknfs
+simbaservices       1599/tcp  #simbaservices
+simbaservices       1599/udp  #simbaservices
+aas                 1601/tcp  #aas
+aas                 1601/udp  #aas
+inspect             1602/tcp  #inspect
+inspect             1602/udp  #inspect
+picodbc             1603/tcp  #pickodbc
+picodbc             1603/udp  #pickodbc
+icabrowser          1604/tcp  #icabrowser
+icabrowser          1604/udp  #icabrowser
+slp                 1605/tcp  #Salutation Manager (Salutation Protocol)
+slp                 1605/udp  #Salutation Manager (Salutation Protocol)
+slm-api             1606/tcp  #Salutation Manager (SLM-API)
+slm-api             1606/udp  #Salutation Manager (SLM-API)
+stt                 1607/tcp  #stt
+stt                 1607/udp  #stt
+smart-lm            1608/tcp  #Smart Corp. License Manager
+smart-lm            1608/udp  #Smart Corp. License Manager
+isysg-lm            1609/tcp  #isysg-lm
+isysg-lm            1609/udp  #isysg-lm
+taurus-wh           1610/tcp  #taurus-wh
+taurus-wh           1610/udp  #taurus-wh
+ill                 1611/tcp  #Inter Library Loan
+ill                 1611/udp  #Inter Library Loan
+netbill-trans       1612/tcp  #NetBill Transaction Server
+netbill-trans       1612/udp  #NetBill Transaction Server
+netbill-keyrep      1613/tcp  #NetBill Key Repository
+netbill-keyrep      1613/udp  #NetBill Key Repository
+netbill-cred        1614/tcp  #NetBill Credential Server
+netbill-cred        1614/udp  #NetBill Credential Server
+netbill-auth        1615/tcp  #NetBill Authorization Server
+netbill-auth        1615/udp  #NetBill Authorization Server
+netbill-prod        1616/tcp  #NetBill Product Server
+netbill-prod        1616/udp  #NetBill Product Server
+nimrod-agent        1617/tcp  #Nimrod Inter-Agent Communication
+nimrod-agent        1617/udp  #Nimrod Inter-Agent Communication
+skytelnet           1618/tcp  #skytelnet
+skytelnet           1618/udp  #skytelnet
+xs-openstorage      1619/tcp  #xs-openstorage
+xs-openstorage      1619/udp  #xs-openstorage
+faxportwinport      1620/tcp  #faxportwinport
+faxportwinport      1620/udp  #faxportwinport
+softdataphone       1621/tcp  #softdataphone
+softdataphone       1621/udp  #softdataphone
+ontime              1622/tcp  #ontime
+ontime              1622/udp  #ontime
+jaleosnd            1623/tcp  #jaleosnd
+jaleosnd            1623/udp  #jaleosnd
+udp-sr-port         1624/tcp  #udp-sr-port
+udp-sr-port         1624/udp  #udp-sr-port
+svs-omagent         1625/tcp  #svs-omagent
+svs-omagent         1625/udp  #svs-omagent
+shockwave           1626/tcp  #Shockwave
+shockwave           1626/udp  #Shockwave
+t128-gateway        1627/tcp  #T.128 Gateway
+t128-gateway        1627/udp  #T.128 Gateway
+lontalk-norm        1628/tcp  #LonTalk normal
+lontalk-norm        1628/udp  #LonTalk normal
+lontalk-urgnt       1629/tcp  #LonTalk urgent
+lontalk-urgnt       1629/udp  #LonTalk urgent
+oraclenet8cman      1630/tcp  #Oracle Net8 Cman
+oraclenet8cman      1630/udp  #Oracle Net8 Cman
+visitview           1631/tcp  #Visit view 	
+visitview           1631/udp  #Visit view 	
+pammratc            1632/tcp  #PAMMRATC
+pammratc            1632/udp  #PAMMRATC
+pammrpc             1633/tcp  #PAMMRPC
+pammrpc             1633/udp  #PAMMRPC
+loaprobe            1634/tcp  #Log On America Probe
+loaprobe            1634/udp  #Log On America Probe
+edb-server1         1635/tcp  #EDB Server 1
+edb-server1         1635/udp  #EDB Server 1
+cncp                1636/tcp  #CableNet Control Protocol
+cncp                1636/udp  #CableNet Control Protocol
+cnap                1637/tcp  #CableNet Admin Protocol
+cnap                1637/udp  #CableNet Admin Protocol
+cnip                1638/tcp  #CableNet Info Protocol
+cnip                1638/udp  #CableNet Info Protocol
+cert-initiator      1639/tcp  #cert-initiator
+cert-initiator      1639/udp  #cert-initiator
+cert-responder      1640/tcp  #cert-responder
+cert-responder      1640/udp  #cert-responder
+invision            1641/tcp  #InVision
+invision            1641/udp  #InVision
+isis-am             1642/tcp  #isis-am
+isis-am             1642/udp  #isis-am
+isis-ambc           1643/tcp  #isis-ambc
+isis-ambc           1643/udp  #isis-ambc
+saiseh              1644/tcp  #Satellite-data Acquisition System 4
+sightline           1645/tcp  #SightLine   
+sightline           1645/udp  #SightLine  
+sa-msg-port         1646/tcp  #sa-msg-port
+sa-msg-port         1646/udp  #sa-msg-port
+rsap                1647/tcp  #rsap
+rsap                1647/udp  #rsap
+concurrent-lm       1648/tcp  #concurrent-lm
+concurrent-lm       1648/udp  #concurrent-lm
+kermit              1649/tcp  #kermit
+kermit              1649/udp  #kermit 
+nkd                 1650/tcp  #nkdn
+nkd                 1650/udp  #nkd
+shiva_confsrvr      1651/tcp  #shiva_confsrvr
+shiva_confsrvr      1651/udp  #shiva_confsrvr
+xnmp                1652/tcp  #xnmp
+xnmp                1652/udp  #xnmp
+alphatech-lm        1653/tcp  #alphatech-lm
+alphatech-lm        1653/udp  #alphatech-lm
+stargatealerts      1654/tcp  #stargatealerts
+stargatealerts      1654/udp  #stargatealerts
+dec-mbadmin         1655/tcp  #dec-mbadmin
+dec-mbadmin         1655/udp  #dec-mbadmin
+dec-mbadmin-h       1656/tcp  #dec-mbadmin-h
+dec-mbadmin-h       1656/udp  #dec-mbadmin-h
+fujitsu-mmpdc       1657/tcp  #fujitsu-mmpdc
+fujitsu-mmpdc       1657/udp  #fujitsu-mmpdc
+sixnetudr           1658/tcp  #sixnetudr
+sixnetudr           1658/udp  #sixnetudr
+sg-lm               1659/tcp  #Silicon Grail License Manager
+sg-lm               1659/udp  #Silicon Grail License Manager
+skip-mc-gikreq      1660/tcp  #skip-mc-gikreq
+skip-mc-gikreq      1660/udp  #skip-mc-gikreq
+netview-aix-1       1661/tcp  #netview-aix-1
+netview-aix-1       1661/udp  #netview-aix-1
+netview-aix-2       1662/tcp  #netview-aix-2
+netview-aix-2       1662/udp  #netview-aix-2
+netview-aix-3       1663/tcp  #netview-aix-3
+netview-aix-3       1663/udp  #netview-aix-3
+netview-aix-4       1664/tcp  #netview-aix-4
+netview-aix-4       1664/udp  #netview-aix-4
+netview-aix-5       1665/tcp  #netview-aix-5
+netview-aix-5       1665/udp  #netview-aix-5
+netview-aix-6       1666/tcp  #netview-aix-6
+netview-aix-6       1666/udp  #netview-aix-6
+netview-aix-7       1667/tcp  #netview-aix-7
+netview-aix-7       1667/udp  #netview-aix-7
+netview-aix-8       1668/tcp  #netview-aix-8
+netview-aix-8       1668/udp  #netview-aix-8
+netview-aix-9       1669/tcp  #netview-aix-9
+netview-aix-9       1669/udp  #netview-aix-9
+netview-aix-10      1670/tcp  #netview-aix-10
+netview-aix-10      1670/udp  #netview-aix-10
+netview-aix-11      1671/tcp  #netview-aix-11
+netview-aix-11      1671/udp  #netview-aix-11
+netview-aix-12      1672/tcp  #netview-aix-12
+netview-aix-12      1672/udp  #netview-aix-12
+proshare-mc-1       1673/tcp  #Intel Proshare Multicast
+proshare-mc-1       1673/udp  #Intel Proshare Multicast
+proshare-mc-2       1674/tcp  #Intel Proshare Multicast
+proshare-mc-2       1674/udp  #Intel Proshare Multicast
+pdp                 1675/tcp  #Pacific Data Products
+pdp                 1675/udp  #Pacific Data Products
+netcomm1            1676/tcp  #netcomm1
+netcomm2            1676/udp  #netcomm2
+groupwise           1677/tcp  #groupwise
+groupwise           1677/udp  #groupwise
+prolink             1678/tcp  #prolink
+prolink             1678/udp  #prolink
+darcorp-lm          1679/tcp  #darcorp-lm
+darcorp-lm          1679/udp  #darcorp-lm
+microcom-sbp        1680/tcp  #microcom-sbp	
+microcom-sbp        1680/udp  #microcom-sbp	
+sd-elmd             1681/tcp  #sd-elmd
+sd-elmd             1681/udp  #sd-elmd
+lanyon-lantern      1682/tcp  #lanyon-lantern
+lanyon-lantern      1682/udp  #lanyon-lantern
+ncpm-hip            1683/tcp  #ncpm-hip
+ncpm-hip            1683/udp  #ncpm-hip
+snaresecure         1684/tcp  #SnareSecure
+snaresecure         1684/udp  #SnareSecure
+n2nremote           1685/tcp  #n2nremote
+n2nremote           1685/udp  #n2nremote
+cvmon               1686/tcp  #cvmon
+cvmon               1686/udp  #cvmon
+nsjtp-ctrl          1687/tcp  #nsjtp-ctrl
+nsjtp-ctrl          1687/udp  #nsjtp-ctrl
+nsjtp-data          1688/tcp  #nsjtp-data
+nsjtp-data          1688/udp  #nsjtp-data
+firefox             1689/tcp  #firefox
+firefox             1689/udp  #firefox
+ng-umds             1690/tcp  #ng-umds
+ng-umds             1690/udp  #ng-umds
+empire-empuma       1691/tcp  #empire-empuma
+empire-empuma       1691/udp  #empire-empuma
+sstsys-lm           1692/tcp  #sstsys-lm
+sstsys-lm           1692/udp  #sstsys-lm
+rrirtr              1693/tcp  #rrirtr
+rrirtr              1693/udp  #rrirtr
+rrimwm              1694/tcp  #rrimwm
+rrimwm              1694/udp  #rrimwm
+rrilwm              1695/tcp  #rrilwm
+rrilwm              1695/udp  #rrilwm
+rrifmm              1696/tcp  #rrifmm
+rrifmm              1696/udp  #rrifmm
+rrisat              1697/tcp  #rrisat
+rrisat              1697/udp  #rrisat
+rsvp-encap-1        1698/tcp  #RSVP-ENCAPSULATION-1
+rsvp-encap-1        1698/udp  #RSVP-ENCAPSULATION-1
+rsvp-encap-2        1699/tcp  #RSVP-ENCAPSULATION-2
+rsvp-encap-2        1699/udp  #RSVP-ENCAPSULATION-2
+mps-raft            1700/tcp  #mps-raft
+mps-raft            1700/udp  #mps-raft
+l2f                 1701/tcp  #l2f
+l2f                 1701/udp  #l2f
+l2tp                1701/tcp  #l2tp
+l2tp                1701/udp  #l2tp
+deskshare           1702/tcp  #deskshare
+deskshare           1702/udp  #deskshare
+hb-engine           1703/tcp  #hb-engine
+hb-engine           1703/udp  #hb-engine
+bcs-broker          1704/tcp  #bcs-broker
+bcs-broker          1704/udp  #bcs-broker
+slingshot           1705/tcp  #slingshot
+slingshot           1705/udp  #slingshot
+jetform             1706/tcp  #jetform
+jetform             1706/udp  #jetform
+vdmplay             1707/tcp  #vdmplay
+vdmplay             1707/udp  #vdmplay
+gat-lmd             1708/tcp  #gat-lmd
+gat-lmd             1708/udp  #gat-lmd
+centra              1709/tcp  #centra
+centra              1709/udp  #centra
+impera              1710/tcp  #impera
+impera              1710/udp  #impera
+pptconference       1711/tcp  #pptconference
+pptconference       1711/udp  #pptconference
+registrar           1712/tcp  #resource monitoring service
+registrar           1712/udp  #resource monitoring service
+conferencetalk      1713/tcp  #ConferenceTalk
+conferencetalk      1713/udp  #ConferenceTalk
+sesi-lm             1714/tcp  #sesi-lm
+sesi-lm             1714/udp  #sesi-lm
+houdini-lm          1715/tcp  #houdini-lm
+houdini-lm          1715/udp  #houdini-lm
+xmsg                1716/tcp  #xmsg
+xmsg                1716/udp  #xmsg
+fj-hdnet            1717/tcp  #fj-hdnet
+fj-hdnet            1717/udp  #fj-hdnet
+h323gatedisc        1718/tcp  #h323gatedisc
+h323gatedisc        1718/udp  #h323gatedisc
+h323gatestat        1719/tcp  #h323gatestat 
+h323gatestat        1719/udp  #h323gatestat 
+h323hostcall        1720/tcp  #h323hostcall
+h323hostcall        1720/udp  #h323hostcall
+caicci              1721/tcp  #caicci
+caicci              1721/udp  #caicci
+hks-lm              1722/tcp  #HKS License Manager
+hks-lm              1722/udp  #HKS License Manager
+pptp                1723/tcp  #pptp
+pptp                1723/udp  #pptp
+csbphonemaster      1724/tcp  #csbphonemaster
+csbphonemaster      1724/udp  #csbphonemaster
+iden-ralp           1725/tcp  #iden-ralp
+iden-ralp           1725/udp  #iden-ralp
+iberiagames         1726/tcp  #IBERIAGAMES
+iberiagames         1726/udp  #IBERIAGAMES
+winddx              1727/tcp  #winddx
+winddx              1727/udp  #winddx
+telindus            1728/tcp  #TELINDUS
+telindus            1728/udp  #TELINDUS
+citynl              1729/tcp  #CityNL License Management
+citynl              1729/udp  #CityNL License Management
+roketz              1730/tcp  #roketz
+roketz              1730/udp  #roketz
+msiccp              1731/tcp  #MSICCP
+msiccp              1731/udp  #MSICCP
+proxim              1732/tcp  #proxim
+proxim              1732/udp  #proxim
+siipat              1733/tcp  #SIMS - SIIPAT Protocol for Alarm Transmission
+siipat              1733/udp  #SIMS - SIIPAT Protocol for Alarm Transmission
+cambertx-lm         1734/tcp  #Camber Corporation License Management
+cambertx-lm         1734/udp  #Camber Corporation License Management
+privatechat         1735/tcp  #PrivateChat
+privatechat         1735/udp  #PrivateChat
+street-stream       1736/tcp  #street-stream
+street-stream       1736/udp  #street-stream
+ultimad             1737/tcp  #ultimad
+ultimad             1737/udp  #ultimad
+gamegen1            1738/tcp  #GameGen1
+gamegen1            1738/udp  #GameGen1
+webaccess           1739/tcp  #webaccess
+webaccess           1739/udp  #webaccess
+encore              1740/tcp  #encore
+encore              1740/udp  #encore
+cisco-net-mgmt      1741/tcp  #cisco-net-mgmt
+cisco-net-mgmt      1741/udp  #cisco-net-mgmt
+3Com-nsd            1742/tcp  #3Com-nsd
+3Com-nsd            1742/udp  #3Com-nsd
+cinegrfx-lm         1743/tcp  #Cinema Graphics License Manager
+cinegrfx-lm         1743/udp  #Cinema Graphics License Manager
+ncpm-ft             1744/tcp  #ncpm-ft
+ncpm-ft             1744/udp  #ncpm-ft
+remote-winsock      1745/tcp  #remote-winsock
+remote-winsock      1745/udp  #remote-winsock
+ftrapid-1           1746/tcp  #ftrapid-1
+ftrapid-1           1746/udp  #ftrapid-1
+ftrapid-2           1747/tcp  #ftrapid-2
+ftrapid-2           1747/udp  #ftrapid-2
+oracle-em1          1748/tcp  #oracle-em1
+oracle-em1          1748/udp  #oracle-em1
+aspen-services      1749/tcp  #aspen-services
+aspen-services      1749/udp  #aspen-services
+sslp                1750/tcp  #Simple Socket Library's PortMaster
+sslp                1750/udp  #Simple Socket Library's PortMaster
+swiftnet            1751/tcp  #SwiftNet
+swiftnet            1751/udp  #SwiftNet
+lofr-lm             1752/tcp  #Leap of Faith Research License Manager 
+lofr-lm             1752/udp  #Leap of Faith Research License Manager 
+oracle-em2          1754/tcp  #oracle-em2
+oracle-em2          1754/udp  #oracle-em2
+ms-streaming        1755/tcp  #ms-streaming
+ms-streaming        1755/udp  #ms-streaming
+capfast-lmd         1756/tcp  #capfast-lmd
+capfast-lmd         1756/udp  #capfast-lmd
+cnhrp               1757/tcp  #cnhrp
+cnhrp               1757/udp  #cnhrp
+tftp-mcast          1758/tcp  #tftp-mcast
+tftp-mcast          1758/udp  #tftp-mcast
+spss-lm             1759/tcp  #SPSS License Manager
+spss-lm             1759/udp  #SPSS License Manager
+www-ldap-gw         1760/tcp  #www-ldap-gw
+www-ldap-gw         1760/udp  #www-ldap-gw
+cft-0               1761/tcp  #cft-0
+cft-0               1761/udp  #cft-0
+cft-1               1762/tcp  #cft-1
+cft-1               1762/udp  #cft-1
+cft-2               1763/tcp  #cft-2
+cft-2               1763/udp  #cft-2
+cft-3               1764/tcp  #cft-3
+cft-3               1764/udp  #cft-3
+cft-4               1765/tcp  #cft-4
+cft-4               1765/udp  #cft-4
+cft-5               1766/tcp  #cft-5
+cft-5               1766/udp  #cft-5
+cft-6               1767/tcp  #cft-6
+cft-6               1767/udp  #cft-6
+cft-7               1768/tcp  #cft-7
+cft-7               1768/udp  #cft-7
+bmc-net-adm         1769/tcp  #bmc-net-adm
+bmc-net-adm         1769/udp  #bmc-net-adm
+bmc-net-svc         1770/tcp  #bmc-net-svc
+bmc-net-svc         1770/udp  #bmc-net-svc
+vaultbase           1771/tcp  #vaultbase
+vaultbase           1771/udp  #vaultbase
+essweb-gw           1772/tcp  #EssWeb Gateway
+essweb-gw           1772/udp  #EssWeb Gateway
+kmscontrol          1773/tcp  #KMSControl
+kmscontrol          1773/udp  #KMSControl
+global-dtserv       1774/tcp  #global-dtserv
+global-dtserv       1774/udp  #global-dtserv
+femis               1776/tcp  #Federal Emergency Management Information System
+femis               1776/udp  #Federal Emergency Management Information System
+powerguardian       1777/tcp  #powerguardian
+powerguardian       1777/udp  #powerguardian
+prodigy-intrnet     1778/tcp  #prodigy-internet
+prodigy-intrnet     1778/udp  #prodigy-internet
+pharmasoft          1779/tcp  #pharmasoft
+pharmasoft          1779/udp  #pharmasoft
+dpkeyserv           1780/tcp  #dpkeyserv
+dpkeyserv           1780/udp  #dpkeyserv
+answersoft-lm       1781/tcp  #answersoft-lm
+answersoft-lm       1781/udp  #answersoft-lm 
+hp-hcip             1782/tcp  #hp-hcip
+hp-hcip             1782/udp  #hp-hcip
+finle-lm            1784/tcp  #Finle License Manager
+finle-lm            1784/udp  #Finle License Manager
+windlm              1785/tcp  #Wind River Systems License Manager
+windlm              1785/udp  #Wind River Systems License Manager
+funk-logger         1786/tcp  #funk-logger
+funk-logger         1786/udp  #funk-logger
+funk-license        1787/tcp  #funk-license
+funk-license        1787/udp  #funk-license
+psmond              1788/tcp  #psmond
+psmond              1788/udp  #psmond
+hello               1789/tcp  #hello
+hello               1789/udp  #hello
+nmsp                1790/tcp  #Narrative Media Streaming Protocol
+nmsp                1790/udp  #Narrative Media Streaming Protocol
+ea1                 1791/tcp  #EA1
+ea1                 1791/udp  #EA1
+ibm-dt-2            1792/tcp  #ibm-dt-2
+ibm-dt-2            1792/udp  #ibm-dt-2
+rsc-robot           1793/tcp  #rsc-robot
+rsc-robot           1793/udp  #rsc-robot
+cera-bcm            1794/tcp  #cera-bcm
+cera-bcm            1794/udp  #cera-bcm
+dpi-proxy           1795/tcp  #dpi-proxy
+dpi-proxy           1795/udp  #dpi-proxy
+vocaltec-admin      1796/tcp  #Vocaltec Server Administration
+vocaltec-admin      1796/udp  #Vocaltec Server Administration
+uma                 1797/tcp  #UMA 
+uma                 1797/udp  #UMA
+etp                 1798/tcp  #Event Transfer Protocol
+etp                 1798/udp  #Event Transfer Protocol
+netrisk             1799/tcp  #NETRISK
+netrisk             1799/udp  #NETRISK
+ansys-lm            1800/tcp  #ANSYS-License manager
+ansys-lm            1800/udp  #ANSYS-License manager
+msmq                1801/tcp  #Microsoft Message Que
+msmq                1801/udp  #Microsoft Message Que
+concomp1            1802/tcp  #ConComp1
+concomp1            1802/udp  #ConComp1
+hp-hcip-gwy         1803/tcp  #HP-HCIP-GWY
+hp-hcip-gwy         1803/udp  #HP-HCIP-GWY
+enl                 1804/tcp  #ENL
+enl                 1804/udp  #ENL
+enl-name            1805/tcp  #ENL-Name
+enl-name            1805/udp  #ENL-Name
+musiconline         1806/tcp  #Musiconline
+musiconline         1806/udp  #Musiconline
+fhsp                1807/tcp  #Fujitsu Hot Standby Protocol
+fhsp                1807/udp  #Fujitsu Hot Standby Protocol
+oracle-vp2          1808/tcp  #Oracle-VP2
+oracle-vp2          1808/udp  #Oracle-VP2
+oracle-vp1          1809/tcp  #Oracle-VP1
+oracle-vp1          1809/udp  #Oracle-VP1
+jerand-lm           1810/tcp  #Jerand License Manager
+jerand-lm           1810/udp  #Jerand License Manager
+scientia-sdb        1811/tcp  #Scientia-SDB
+scientia-sdb        1811/udp  #Scientia-SDB
+radius              1812/tcp  #RADIUS
+radius              1812/udp  #RADIUS
+radius-acct         1813/tcp  #RADIUS Accounting
+radius-acct         1813/udp  #RADIUS Accounting
+tdp-suite           1814/tcp  #TDP Suite
+tdp-suite           1814/udp  #TDP Suite
+mmpft               1815/tcp  #MMPFT
+mmpft               1815/udp  #MMPFT
+harp                1816/tcp  #HARP
+harp                1816/udp  #HARP
+rkb-oscs            1817/tcp  #RKB-OSCS
+rkb-oscs            1817/udp  #RKB-OSCS
+etftp               1818/tcp  #Enhanced Trivial File Transfer Protocol
+etftp               1818/udp  #Enhanced Trivial File Transfer Protocol
+plato-lm            1819/tcp  #Plato License Manager
+plato-lm            1819/udp  #Plato License Manager
+mcagent             1820/tcp  #mcagent
+mcagent             1820/udp  #mcagent
+donnyworld          1821/tcp  #donnyworld
+donnyworld          1821/udp  #donnyworld
+es-elmd             1822/tcp  #es-elmd
+es-elmd             1822/udp  #es-elmd
+unisys-lm           1823/tcp  #Unisys Natural Language License Manager
+unisys-lm           1823/udp  #Unisys Natural Language License Manager
+metrics-pas         1824/tcp  #metrics-pas
+metrics-pas         1824/udp  #metrics-pas
+direcpc-video       1825/tcp  #DirecPC Video
+direcpc-video       1825/udp  #DirecPC Video
+ardt                1826/tcp  #ARDT
+ardt                1826/udp  #ARDT
+asi                 1827/tcp  #ASI 
+asi                 1827/udp  #ASI 
+itm-mcell-u         1828/tcp  #itm-mcell-u
+itm-mcell-u         1828/udp  #itm-mcell-u
+optika-emedia       1829/tcp  #Optika eMedia 
+optika-emedia       1829/udp  #Optika eMedia 
+net8-cman           1830/tcp  #Oracle Net8 CMan Admin
+net8-cman           1830/udp  #Oracle Net8 CMan Admin
+myrtle              1831/tcp  #Myrtle
+myrtle              1831/udp  #Myrtle
+tht-treasure        1832/tcp  #ThoughtTreasure
+tht-treasure        1832/udp  #ThoughtTreasure
+udpradio            1833/tcp  #udpradio
+udpradio            1833/udp  #udpradio
+ardusuni            1834/tcp  #ARDUS Unicast
+ardusuni            1834/udp  #ARDUS Unicast
+ardusmul            1835/tcp  #ARDUS Multicast
+ardusmul            1835/udp  #ARDUS Multicast
+ste-smsc            1836/tcp  #ste-smsc
+ste-smsc            1836/udp  #ste-smsc
+csoft1              1837/tcp  #csoft1
+csoft1              1837/udp  #csoft1
+talnet              1838/tcp  #TALNET
+talnet              1838/udp  #TALNET
+netopia-vo1         1839/tcp  #netopia-vo1
+netopia-vo1         1839/udp  #netopia-vo1
+netopia-vo2         1840/tcp  #netopia-vo2
+netopia-vo2         1840/udp  #netopia-vo2
+netopia-vo3         1841/tcp  #netopia-vo3
+netopia-vo3         1841/udp  #netopia-vo3
+netopia-vo4         1842/tcp  #netopia-vo4
+netopia-vo4         1842/udp  #netopia-vo4
+netopia-vo5         1843/tcp  #netopia-vo5
+netopia-vo5         1843/udp  #netopia-vo5
+direcpc-dll         1844/tcp  #DirecPC-DLL
+direcpc-dll         1844/udp  #DirecPC-DLL
+altalink            1845/tcp  #altalink
+altalink            1845/udp  #altalink
+tunstall-pnc        1846/tcp  #Tunstall PNC
+tunstall-pnc        1846/udp  #Tunstall PNC
+slp-notify          1847/tcp  #SLP Notification
+slp-notify          1847/udp  #SLP Notification
+fjdocdist           1848/tcp  #fjdocdist
+fjdocdist           1848/udp  #fjdocdist
+alpha-sms           1849/tcp  #ALPHA-SMS
+alpha-sms           1849/udp  #ALPHA-SMS
+gsi                 1850/tcp  #GSI
+gsi                 1850/udp  #GSI
+ctcd                1851/tcp  #ctcd
+ctcd                1851/udp  #ctcd
+virtual-time        1852/tcp  #Virtual Time
+virtual-time        1852/udp  #Virtual Time
+vids-avtp           1853/tcp  #VIDS-AVTP
+vids-avtp           1853/udp  #VIDS-AVTP
+buddy-draw          1854/tcp  #Buddy Draw
+buddy-draw          1854/udp  #Buddy Draw
+fiorano-rtrsvc      1855/tcp  #Fiorano RtrSvc
+fiorano-rtrsvc      1855/udp  #Fiorano RtrSvc
+fiorano-msgsvc      1856/tcp  #Fiorano MsgSvc
+fiorano-msgsvc      1856/udp  #Fiorano MsgSvc
+datacaptor          1857/tcp  #DataCaptor
+datacaptor          1857/udp  #DataCaptor
+privateark          1858/tcp  #PrivateArk
+privateark          1858/udp  #PrivateArk
+gammafetchsvr       1859/tcp  #Gamma Fetcher Server
+gammafetchsvr       1859/udp  #Gamma Fetcher Server
+sunscalar-svc       1860/tcp  #SunSCALAR Services
+sunscalar-svc       1860/udp  #SunSCALAR Services
+lecroy-vicp         1861/tcp  #LeCroy VICP
+lecroy-vicp         1861/udp  #LeCroy VICP
+techra-server       1862/tcp  #techra-server
+techra-server       1862/udp  #techra-server
+msnp                1863/tcp  #MSNP
+msnp                1863/udp  #MSNP
+paradym-31port      1864/tcp  #Paradym 31 Port
+paradym-31port      1864/udp  #Paradym 31 Port
+entp                1865/tcp  #ENTP
+entp                1865/udp  #ENTP
+swrmi               1866/tcp  #swrmi
+swrmi               1866/udp  #swrmi
+udrive              1867/tcp  #UDRIVE
+udrive              1867/udp  #UDRIVE
+viziblebrowser      1868/tcp  #VizibleBrowser
+viziblebrowser      1868/udp  #VizibleBrowser
+yestrader           1869/tcp  #YesTrader
+yestrader           1869/udp  #YesTrader
+sunscalar-dns       1870/tcp  #SunSCALAR DNS Service
+sunscalar-dns       1870/udp  #SunSCALAR DNS Service
+canocentral0        1871/tcp  #Cano Central 0
+canocentral0        1871/udp  #Cano Central 0
+canocentral1        1872/tcp  #Cano Central 1
+canocentral1        1872/udp  #Cano Central 1
+fjmpjps             1873/tcp  #Fjmpjps
+fjmpjps             1873/udp  #Fjmpjps
+fjswapsnp           1874/tcp  #Fjswapsnp
+fjswapsnp           1874/udp  #Fjswapsnp
+westell-stats       1875/tcp  #westell stats
+westell-stats       1875/udp  #westell stats
+ewcappsrv           1876/tcp  #ewcappsrv
+ewcappsrv           1876/udp  #ewcappsrv
+hp-webqosdb         1877/tcp  #hp-webqosdb
+hp-webqosdb         1877/udp  #hp-webqosdb
+drmsmc              1878/tcp  #drmsmc
+drmsmc              1878/udp  #drmsmc
+nettgain-nms        1879/tcp  #NettGain NMS
+nettgain-nms        1879/udp  #NettGain NMS
+vsat-control        1880/tcp  #Gilat VSAT Control
+vsat-control        1880/udp  #Gilat VSAT Control
+ibm-mqseries2       1881/tcp  #IBM WebSphere MQ Everyplace
+ibm-mqseries2       1881/udp  #IBM WebSphere MQ Everyplace
+ecsqdmn             1882/tcp  #ecsqdmn
+ecsqdmn             1882/udp  #ecsqdmn
+ibm-mqisdp          1883/tcp  #IBM MQSeries SCADA
+ibm-mqisdp          1883/udp  #IBM MQSeries SCADA
+idmaps              1884/tcp  #Internet Distance Map Svc
+idmaps              1884/udp  #Internet Distance Map Svc
+vrtstrapserver      1885/tcp  #Veritas Trap Server
+vrtstrapserver      1885/udp  #Veritas Trap Server
+leoip               1886/tcp  #Leonardo over IP
+leoip               1886/udp  #Leonardo over IP
+filex-lport         1887/tcp  #FileX Listening Port
+filex-lport         1887/udp  #FileX Listening Port
+ncconfig            1888/tcp  #NC Config Port
+ncconfig            1888/udp  #NC Config Port
+unify-adapter       1889/tcp  #Unify Web Adapter Service
+unify-adapter       1889/udp  #Unify Web Adapter Service
+wilkenlistener      1890/tcp  #wilkenListener
+wilkenlistener      1890/udp  #wilkenListener
+childkey-notif      1891/tcp  #ChildKey Notification
+childkey-notif      1891/udp  #ChildKey Notification
+childkey-ctrl       1892/tcp  #ChildKey Control
+childkey-ctrl       1892/udp  #ChildKey Control 	
+elad                1893/tcp  #ELAD Protocol
+elad                1893/udp  #ELAD Protocol
+o2server-port       1894/tcp  #O2Server Port
+o2server-port       1894/udp  #O2Server Port
+b-novative-ls       1896/tcp  #b-novative license server
+b-novative-ls       1896/udp  #b-novative license server
+metaagent           1897/tcp  #MetaAgent
+metaagent           1897/udp  #MetaAgent
+cymtec-port         1898/tcp  #Cymtec secure management
+cymtec-port         1898/udp  #Cymtec secure management
+mc2studios          1899/tcp  #MC2Studios
+mc2studios          1899/udp  #MC2Studios
+ssdp                1900/tcp  #SSDP
+ssdp                1900/udp  #SSDP
+fjicl-tep-a         1901/tcp  #Fujitsu ICL Terminal Emulator Program A
+fjicl-tep-a         1901/udp  #Fujitsu ICL Terminal Emulator Program A
+fjicl-tep-b         1902/tcp  #Fujitsu ICL Terminal Emulator Program B
+fjicl-tep-b         1902/udp  #Fujitsu ICL Terminal Emulator Program B
+linkname            1903/tcp  #Local Link Name Resolution
+linkname            1903/udp  #Local Link Name Resolution
+fjicl-tep-c         1904/tcp  #Fujitsu ICL Terminal Emulator Program C
+fjicl-tep-c         1904/udp  #Fujitsu ICL Terminal Emulator Program C
+sugp                1905/tcp  #Secure UP.Link Gateway Protocol
+sugp                1905/udp  #Secure UP.Link Gateway Protocol
+tpmd                1906/tcp  #TPortMapperReq
+tpmd                1906/udp  #TPortMapperReq
+intrastar           1907/tcp  #IntraSTAR
+intrastar           1907/udp  #IntraSTAR
+dawn                1908/tcp  #Dawn
+dawn                1908/udp  #Dawn
+global-wlink        1909/tcp  #Global World Link
+global-wlink        1909/udp  #Global World Link
+ultrabac            1910/tcp  #UltraBac Software communications port
+ultrabac            1910/udp  #UltraBac Software communications port
+mtp                 1911/tcp  #Starlight Networks Multimedia Transport Protocol
+mtp                 1911/udp  #Starlight Networks Multimedia Transport Protocol
+rhp-iibp            1912/tcp  #rhp-iibp	
+rhp-iibp            1912/udp  #rhp-iibp	
+armadp              1913/tcp  #armadp
+armadp              1913/udp  #armadp
+elm-momentum        1914/tcp  #Elm-Momentum
+elm-momentum        1914/udp  #Elm-Momentum
+facelink            1915/tcp  #FACELINK
+facelink            1915/udp  #FACELINK
+persona             1916/tcp  #Persoft Persona
+persona             1916/udp  #Persoft Persona
+noagent             1917/tcp  #nOAgent
+noagent             1917/udp  #nOAgent
+can-nds             1918/tcp  #Candle Directory Service - NDS    
+can-nds             1918/udp  #Candle Directory Service - NDS
+can-dch             1919/tcp  #Candle Directory Service - DCH
+can-dch             1919/udp  #Candle Directory Service - DCH
+can-ferret          1920/tcp  #Candle Directory Service - FERRET
+can-ferret          1920/udp  #Candle Directory Service - FERRET
+noadmin             1921/tcp  #NoAdmin
+noadmin             1921/udp  #NoAdmin
+tapestry            1922/tcp  #Tapestry	
+tapestry            1922/udp  #Tapestry	
+spice               1923/tcp  #SPICE
+spice               1923/udp  #SPICE
+xiip                1924/tcp  #XIIP
+xiip                1924/udp  #XIIP
+discovery-port      1925/tcp  #Surrogate Discovery Port
+discovery-port      1925/udp  #Surrogate Discovery Port
+egs                 1926/tcp  #Evolution Game Server
+egs                 1926/udp  #Evolution Game Server
+videte-cipc         1927/tcp  #Videte CIPC Port
+videte-cipc         1927/udp  #Videte CIPC Port
+emsd-port           1928/tcp  #Expnd Maui Srvr Dscovr
+emsd-port           1928/udp  #Expnd Maui Srvr Dscovr
+bandwiz-system      1929/tcp  #Bandwiz System - Server
+bandwiz-system      1929/udp  #Bandwiz System - Server
+driveappserver      1930/tcp  #Drive AppServer
+driveappserver      1930/udp  #Drive AppServer
+amdsched            1931/tcp  #AMD SCHED
+amdsched            1931/udp  #AMD SCHED
+ctt-broker          1932/tcp  #CTT Broker
+ctt-broker          1932/udp  #CTT Broker
+xmapi               1933/tcp  #IBM LM MT Agent
+xmapi               1933/udp  #IBM LM MT Agent
+xaapi               1934/tcp  #IBM LM Appl Agent
+xaapi               1934/udp  #IBM LM Appl Agent
+macromedia-fcs      1935/tcp  #Macromedia Flash Communications Server MX
+macromedia-fcs      1935/udp  #Macromedia Flash Communications server MX
+jetcmeserver        1936/tcp  #JetCmeServer Server Port
+jetcmeserver        1936/udp  #JetCmeServer Server Port
+jwserver            1937/tcp  #JetVWay Server Port
+jwserver            1937/udp  #JetVWay Server Port
+jwclient            1938/tcp  #JetVWay Client Port
+jwclient            1938/udp  #JetVWay Client Port
+jvserver            1939/tcp  #JetVision Server Port
+jvserver            1939/udp  #JetVision Server Port
+jvclient            1940/tcp  #JetVision Client Port
+jvclient            1940/udp  #JetVision Client Port
+dic-aida            1941/tcp  #DIC-Aida
+dic-aida            1941/udp  #DIC-Aida
+res                 1942/tcp  #Real Enterprise Service
+res                 1942/udp  #Real Enterprise Service
+beeyond-media       1943/tcp  #Beeyond Media
+beeyond-media       1943/udp  #Beeyond Media
+close-combat        1944/tcp  #close-combat
+close-combat        1944/udp  #close-combat
+dialogic-elmd       1945/tcp  #dialogic-elmd
+dialogic-elmd       1945/udp  #dialogic-elmd
+tekpls              1946/tcp  #tekpls
+tekpls              1946/udp  #tekpls
+hlserver            1947/tcp  #hlserver
+hlserver            1947/udp  #hlserver
+eye2eye             1948/tcp  #eye2eye
+eye2eye             1948/udp  #eye2eye
+ismaeasdaqlive      1949/tcp  #ISMA Easdaq Live
+ismaeasdaqlive      1949/udp  #ISMA Easdaq Live
+ismaeasdaqtest      1950/tcp  #ISMA Easdaq Test
+ismaeasdaqtest      1950/udp  #ISMA Easdaq Test
+bcs-lmserver        1951/tcp  #bcs-lmserver
+bcs-lmserver        1951/udp  #bcs-lmserver
+mpnjsc              1952/tcp  #mpnjsc
+mpnjsc              1952/udp  #mpnjsc
+rapidbase           1953/tcp  #Rapid Base
+rapidbase           1953/udp  #Rapid Base
+abr-basic           1954/tcp  #ABR-Basic Data
+abr-basic           1954/udp  #ABR-Basic Data
+abr-secure          1955/tcp  #ABR-Secure Data
+abr-secure          1955/udp  #ABR-Secure Data
+vrtl-vmf-ds         1956/tcp  #Vertel VMF DS
+vrtl-vmf-ds         1956/udp  #Vertel VMF DS
+unix-status         1957/tcp  #unix-status
+unix-status         1957/udp  #unix-status
+dxadmind            1958/tcp  #CA Administration Daemon
+dxadmind            1958/udp  #CA Administration Daemon
+simp-all            1959/tcp  #SIMP Channel
+simp-all            1959/udp  #SIMP Channel
+nasmanager          1960/tcp  #Merit DAC NASmanager
+nasmanager          1960/udp  #Merit DAC NASmanager
+bts-appserver       1961/tcp  #BTS APPSERVER
+bts-appserver       1961/udp  #BTS APPSERVER
+biap-mp             1962/tcp  #BIAP-MP
+biap-mp             1962/udp  #BIAP-MP
+webmachine          1963/tcp  #WebMachine
+webmachine          1963/udp  #WebMachine
+solid-e-engine      1964/tcp  #SOLID E ENGINE
+solid-e-engine      1964/udp  #SOLID E ENGINE
+tivoli-npm          1965/tcp  #Tivoli NPM
+tivoli-npm          1965/udp  #Tivoli NPM
+slush               1966/tcp  #Slush
+slush               1966/udp  #Slush
+sns-quote           1967/tcp  #SNS Quote
+sns-quote           1967/udp  #SNS Quote
+lipsinc             1968/tcp  #LIPSinc
+lipsinc             1968/udp  #LIPSinc
+lipsinc1            1969/tcp  #LIPSinc 1
+lipsinc1            1969/udp  #LIPSinc 1
+netop-rc            1970/tcp  #NetOp Remote Control
+netop-rc            1970/udp  #NetOp Remote Control
+netop-school        1971/tcp  #NetOp School
+netop-school        1971/udp  #NetOp School
+intersys-cache      1972/tcp  #Cache
+intersys-cache      1972/udp  #Cache
+dlsrap              1973/tcp  #Data Link Switching Remote Access Protocol
+dlsrap              1973/udp  #Data Link Switching Remote Access Protocol
+drp                 1974/tcp  #DRP
+drp                 1974/udp  #DRP
+tcoflashagent       1975/tcp  #TCO Flash Agent
+tcoflashagent       1975/udp  #TCO Flash Agent
+tcoregagent         1976/tcp  #TCO Reg Agent 
+tcoregagent         1976/udp  #TCO Reg Agent 
+tcoaddressbook      1977/tcp  #TCO Address Book
+tcoaddressbook      1977/udp  #TCO Address Book
+unisql              1978/tcp  #UniSQL
+unisql              1978/udp  #UniSQL
+unisql-java         1979/tcp  #UniSQL Java
+unisql-java         1979/udp  #UniSQL Java
+pearldoc-xact       1980/tcp  #PearlDoc XACT
+pearldoc-xact       1980/udp  #PearlDoc XACT
+p2pq                1981/tcp  #p2pQ
+p2pq                1981/udp  #p2pQ
+estamp              1982/tcp  #Evidentiary Timestamp
+estamp              1982/udp  #Evidentiary Timestamp
+lhtp                1983/tcp  #Loophole Test Protocol
+lhtp                1983/udp  #Loophole Test Protocol
+bb                  1984/tcp  #BB
+bb                  1984/udp  #BB
+hsrp                1985/tcp  #Hot Standby Router Protocol
+hsrp                1985/udp  #Hot Standby Router Protocol
+licensedaemon       1986/tcp  #cisco license management
+licensedaemon       1986/udp  #cisco license management
+tr-rsrb-p1          1987/tcp  #cisco RSRB Priority 1 port
+tr-rsrb-p1          1987/udp  #cisco RSRB Priority 1 port
+tr-rsrb-p2          1988/tcp  #cisco RSRB Priority 2 port
+tr-rsrb-p2          1988/udp  #cisco RSRB Priority 2 port
+tr-rsrb-p3          1989/tcp  #cisco RSRB Priority 3 port
+tr-rsrb-p3          1989/udp  #cisco RSRB Priority 3 port
+mshnet              1989/tcp  #MHSnet system
+mshnet              1989/udp  #MHSnet system
+stun-p1             1990/tcp  #cisco STUN Priority 1 port
+stun-p1             1990/udp  #cisco STUN Priority 1 port
+stun-p2             1991/tcp  #cisco STUN Priority 2 port
+stun-p2             1991/udp  #cisco STUN Priority 2 port
+stun-p3             1992/tcp  #cisco STUN Priority 3 port
+stun-p3             1992/udp  #cisco STUN Priority 3 port
+ipsendmsg           1992/tcp  #IPsendmsg
+ipsendmsg           1992/udp  #IPsendmsg
+snmp-tcp-port       1993/tcp  #cisco SNMP TCP port
+snmp-tcp-port       1993/udp  #cisco SNMP TCP port
+stun-port           1994/tcp  #cisco serial tunnel port
+stun-port           1994/udp  #cisco serial tunnel port
+perf-port           1995/tcp  #cisco perf port
+perf-port           1995/udp  #cisco perf port
+tr-rsrb-port        1996/tcp  #cisco Remote SRB port
+tr-rsrb-port        1996/udp  #cisco Remote SRB port
+gdp-port            1997/tcp  #cisco Gateway Discovery Protocol
+gdp-port            1997/udp  #cisco Gateway Discovery Protocol
+x25-svc-port        1998/tcp  #cisco X.25 service (XOT)
+x25-svc-port        1998/udp  #cisco X.25 service (XOT)
+tcp-id-port         1999/tcp  #cisco identification port
+tcp-id-port         1999/udp  #cisco identification port
+cisco-sccp          2000/tcp  #Cisco SCCP
+cisco-sccp          2000/udp  #Cisco SCCp
+wizard              2001/udp  #curry
+emce                2004/udp  #CCWS mm conf
+raid-cd             2006/udp  #raid
+raid-cc             2011/tcp  #raid
+p2plus              2037/tcp  #P2plus Application Server
+p2plus              2037/udp  #P2plus Application Server
+isis                2042/tcp  #isis
+isis                2042/udp  #isis
+isis-bcast          2043/tcp  #isis-bcast
+isis-bcast          2043/udp  #isis-bcast
+nfs                 2049/tcp  #Network File System - Sun Microsystems
+nfs                 2049/udp  #Network File System - Sun Microsystems
+av-emb-config       2050/tcp  #Avaya EMB Config Port
+av-emb-config       2050/udp  #Avaya EMB Config Port
+epnsdp              2051/tcp  #EPNSDP
+epnsdp              2051/udp  #EPNSDP
+clearvisn           2052/tcp  #clearVisn Services Port
+clearvisn           2052/udp  #clearVisn Services Port
+lot105-ds-upd       2053/tcp  #Lot105 DSuper Updates
+lot105-ds-upd       2053/udp  #Lot105 DSuper Updates
+weblogin            2054/tcp  #Weblogin Port
+weblogin            2054/udp  #Weblogin Port
+iop                 2055/tcp  #Iliad-Odyssey Protocol
+iop                 2055/udp  #Iliad-Odyssey Protocol
+omnisky             2056/tcp  #OmniSky Port
+omnisky             2056/udp  #OmniSky Port
+rich-cp             2057/tcp  #Rich Content Protocol
+rich-cp             2057/udp  #Rich Content Protocol
+newwavesearch       2058/tcp  #NewWaveSearchables RMI
+newwavesearch       2058/udp  #NewWaveSearchables RMI
+bmc-messaging       2059/tcp  #BMC Messaging Service
+bmc-messaging       2059/udp  #BMC Messaging Service
+teleniumdaemon      2060/tcp  #Telenium Daemon IF
+teleniumdaemon      2060/udp  #Telenium Daemon IF
+netmount            2061/tcp  #NetMount
+netmount            2061/udp  #NetMount
+icg-swp             2062/tcp  #ICG SWP Port
+icg-swp             2062/udp  #ICG SWP Port
+icg-bridge          2063/tcp  #ICG Bridge Port
+icg-bridge          2063/udp  #ICG Bridge Port
+icg-iprelay         2064/tcp  #ICG IP Relay Port
+icg-iprelay         2064/udp  #ICG IP Relay Port
+dlsrpn              2065/tcp  #Data Link Switch Read Port Number
+dlsrpn              2065/udp  #Data Link Switch Read Port Number
+dlswpn              2067/tcp  #Data Link Switch Write Port Number
+dlswpn              2067/udp  #Data Link Switch Write Port Number
+avauthsrvprtcl      2068/tcp  #Avocent AuthSrv Protocol
+avauthsrvprtcl      2068/udp  #Avocent AuthSrv Protocol
+event-port          2069/tcp  #HTTP Event Port
+event-port          2069/udp  #HTTP Event Port
+ah-esp-encap        2070/tcp  #AH and ESP Encapsulated in UDP packet
+ah-esp-encap        2070/udp  #AH and ESP Encapsulated in UDP packet
+acp-port            2071/tcp  #Axon Control Protocol
+acp-port            2071/udp  #Axon Control Protocol
+msync               2072/tcp  #GlobeCast mSync
+msync               2072/udp  #GlobeCast mSync
+gxs-data-port       2073/tcp  #DataReel Database Socket
+gxs-data-port       2073/udp  #DataReel Database Socket
+vrtl-vmf-sa         2074/tcp  #Vertel VMF SA
+vrtl-vmf-sa         2074/udp  #Vertel VMF SA
+newlixengine        2075/tcp  #Newlix ServerWare Engine
+newlixengine        2075/udp  #Newlix ServerWare Engine
+newlixconfig        2076/tcp  #Newlix JSPConfig
+newlixconfig        2076/udp  #Newlix JSPConfig
+trellisagt          2077/tcp  #TrelliSoft Agent
+trellisagt          2077/udp  #TrelliSoft Agent
+trellissvr          2078/tcp  #TrelliSoft Server
+trellissvr          2078/udp  #TrelliSoft Server
+idware-router       2079/tcp  #IDWARE Router Port
+idware-router       2079/udp  #IDWARE Router Port
+autodesk-nlm        2080/tcp  #Autodesk NLM (FLEXlm)
+autodesk-nlm        2080/udp  #Autodesk NLM (FLEXlm)
+kme-trap-port       2081/tcp  #KME PRINTER TRAP PORT
+kme-trap-port       2081/udp  #KME PRINTER TRAP PORT
+infowave            2082/tcp  #Infowave Mobility Server
+infowave            2082/udp  #Infowave Mobiltiy Server
+gnunet              2086/tcp  #GNUnet
+gnunet              2086/udp  #GNUnet
+eli                 2087/tcp  #ELI - Event Logging Integration
+eli                 2087/udp  #ELI - Event Logging Integration
+sep                 2089/tcp  #Security Encapsulation Protocol - SEP 
+sep                 2089/udp  #Security Encapsulation Protocol - SEP 
+lrp                 2090/tcp  #Load Report Protocol
+lrp                 2090/udp  #Load Report Protocol
+prp                 2091/tcp  #PRP
+prp                 2091/udp  #PRP
+descent3            2092/tcp  #Descent 3
+descent3            2092/udp  #Descent 3
+nbx-cc              2093/tcp  #NBX CC
+nbx-cc              2093/udp  #NBX CC
+nbx-au              2094/tcp  #NBX AU
+nbx-au              2094/udp  #NBX AU
+nbx-ser             2095/tcp  #NBX SER
+nbx-ser             2095/udp  #NBX SER
+nbx-dir             2096/tcp  #NBX DIR
+nbx-dir             2096/udp  #NBX DIR
+jetformpreview      2097/tcp  #Jet Form Preview
+jetformpreview      2097/udp  #Jet Form Preview
+dialog-port         2098/tcp  #Dialog Port
+dialog-port         2098/udp  #Dialog Port
+h2250-annex-g       2099/tcp  #H.225.0 Annex G
+h2250-annex-g       2099/udp  #H.225.0 Annex G
+amiganetfs          2100/tcp  #Amiga Network Filesystem
+amiganetfs          2100/udp  #Amiga Network Filesystem
+rtcm-sc104          2101/tcp  #rtcm-sc104
+rtcm-sc104          2101/udp  #rtcm-sc104
+zephyr-srv          2102/tcp  #Zephyr server
+zephyr-srv          2102/udp  #Zephyr server
+zephyr-clt          2103/tcp  #Zephyr serv-hm connection
+zephyr-clt          2103/udp  #Zephyr serv-hm connection
+zephyr-hm           2104/tcp  #Zephyr hostmanager
+zephyr-hm           2104/udp  #Zephyr hostmanager
+minipay             2105/tcp  #MiniPay
+minipay             2105/udp  #MiniPay
+mzap                2106/tcp  #MZAP
+mzap                2106/udp  #MZAP
+bintec-admin        2107/tcp  #BinTec Admin 
+bintec-admin        2107/udp  #BinTec Admin 
+comcam              2108/tcp  #Comcam
+comcam              2108/udp  #Comcam
+ergolight           2109/tcp  #Ergolight
+ergolight           2109/udp  #Ergolight
+umsp                2110/tcp  #UMSP
+umsp                2110/udp  #UMSP
+dsatp               2111/tcp  #DSATP
+dsatp               2111/udp  #DSATP
+idonix-metanet      2112/tcp  #Idonix MetaNet
+idonix-metanet      2112/udp  #Idonix MetaNet
+hsl-storm           2113/tcp  #HSL StoRM
+hsl-storm           2113/udp  #HSL StoRM
+newheights          2114/tcp  #NEWHEIGHTS
+newheights          2114/udp  #NEWHEIGHTS
+kdm                 2115/tcp  #Key Distribution Manager
+kdm                 2115/udp  #Key Distribution Manager
+ccowcmr             2116/tcp  #CCOWCMR
+ccowcmr             2116/udp  #CCOWCMR
+mentaclient         2117/tcp  #MENTACLIENT
+mentaclient         2117/udp  #MENTACLIENT
+mentaserver         2118/tcp  #MENTASERVER
+mentaserver         2118/udp  #MENTASERVER
+gsigatekeeper       2119/tcp  #GSIGATEKEEPER
+gsigatekeeper       2119/udp  #GSIGATEKEEPER
+qencp               2120/tcp  #Quick Eagle Networks CP
+qencp               2120/udp  #Quick Eagle Networks CP
+scientia-ssdb       2121/tcp  #SCIENTIA-SSDB
+scientia-ssdb       2121/udp  #SCIENTIA-SSDB
+caupc-remote        2122/tcp  #CauPC Remote Control
+caupc-remote        2122/udp  #CauPC Remote Control
+gtp-control         2123/tcp  #GTP-Control Plane (3GPP)
+gtp-control         2123/udp  #GTP-Control Plane (3GPP)
+elatelink           2124/tcp  #ELATELINK
+elatelink           2124/udp  #ELATELINK
+lockstep            2125/tcp  #LOCKSTEP
+lockstep            2125/udp  #LOCKSTEP
+pktcable-cops       2126/tcp  #PktCable-COPS
+pktcable-cops       2126/udp  #PktCable-COPS
+index-pc-wb         2127/tcp  #INDEX-PC-WB
+index-pc-wb         2127/udp  #INDEX-PC-WB
+net-steward         2128/tcp  #Net Steward Control
+net-steward         2128/udp  #Net Steward Control
+cs-live             2129/tcp  #cs-live.com
+cs-live             2129/udp  #cs-live.com
+swc-xds             2130/tcp  #SWC-XDS
+swc-xds             2130/udp  #SWC-XDS
+avantageb2b         2131/tcp  #Avantageb2b
+avantageb2b         2131/udp  #Avantageb2b
+avail-epmap         2132/tcp  #AVAIL-EPMAP
+avail-epmap         2132/udp  #AVAIL-EPMAP
+zymed-zpp           2133/tcp  #ZYMED-ZPP
+zymed-zpp           2133/udp  #ZYMED-ZPP
+avenue              2134/tcp  #AVENUE
+avenue              2134/udp  #AVENUE
+gris                2135/tcp  #Grid Resource Information Server
+gris                2135/udp  #Grid Resource Information Server
+appworxsrv          2136/tcp  #APPWORXSRV
+appworxsrv          2136/udp  #APPWORXSRV
+connect             2137/tcp  #CONNECT
+connect             2137/udp  #CONNECT
+unbind-cluster      2138/tcp  #UNBIND-CLUSTER
+unbind-cluster      2138/udp  #UNBIND-CLUSTER
+ias-auth            2139/tcp  #IAS-AUTH	     
+ias-auth            2139/udp  #IAS-AUTH
+ias-reg             2140/tcp  #IAS-REG
+ias-reg             2140/udp  #IAS-REG
+ias-admind          2141/tcp  #IAS-ADMIND
+ias-admind          2141/udp  #IAS-ADMIND
+tdm-over-ip         2142/tcp  #TDM-OVER-IP
+tdm-over-ip         2142/udp  #TDM-OVER-IP
+lv-jc               2143/tcp  #Live Vault Job Control
+lv-jc               2143/udp  #Live Vault Job Control
+lv-ffx              2144/tcp  #Live Vault Fast Object Transfer
+lv-ffx              2144/udp  #Live Vault Fast Object Transfer
+lv-pici             2145/tcp  #Live Vault Remote Diagnostic Console Support
+lv-pici             2145/udp  #Live Vault Remote Diagnostic Console Support
+lv-not              2146/tcp  #Live Vault Admin Event Notification
+lv-not              2146/udp  #Live Vault Admin Event Notification
+lv-auth             2147/tcp  #Live Vault Authentication
+lv-auth             2147/udp  #Live Vault Authentication
+veritas-ucl         2148/tcp  #VERITAS UNIVERSAL COMMUNICATION LAYER
+veritas-ucl         2148/udp  #VERITAS UNIVERSAL COMMUNICATION LAYER
+acptsys             2149/tcp  #ACPTSYS
+acptsys             2149/udp  #ACPTSYS
+dynamic3d           2150/tcp  #DYNAMIC3D
+dynamic3d           2150/udp  #DYNAMIC3D
+docent              2151/tcp  #DOCENT
+docent              2151/udp  #DOCENT
+gtp-user            2152/tcp  #GTP-User Plane (3GPP)
+gtp-user            2152/udp  #GTP-User Plane (3GPP)
+gdbremote           2159/tcp  #GDB Remote Debug Port
+gdbremote           2159/udp  #GDB Remote Debug Port
+apc-2160            2160/tcp  #APC 2160
+apc-2160            2160/udp  #APC 2160
+apc-2161            2161/tcp  #APC 2161
+apc-2161            2161/udp  #APC 2161
+navisphere          2162/tcp  #Navisphere
+navisphere          2162/udp  #Navisphere
+navisphere-sec      2163/tcp  #Navisphere Secure
+navisphere-sec      2163/udp  #Navisphere Secure
+ddns-v3             2164/tcp  #Dynamic DNS Version 3
+ddns-v3             2164/udp  #Dynamic DNS Version 3
+x-bone-api          2165/tcp  #X-Bone API
+x-bone-api          2165/udp  #X-Bone API
+iwserver            2166/tcp  #iwserver
+iwserver            2166/udp  #iwserver
+raw-serial          2167/tcp  #Raw Async Serial Link
+raw-serial          2167/udp  #Raw Async Serial Link
+mc-gt-srv           2180/tcp  #Millicent Vendor Gateway Server
+mc-gt-srv           2180/udp  #Millicent Vendor Gateway Server
+eforward            2181/tcp  #eforward
+eforward            2181/udp  #eforward
+tivoconnect         2190/tcp  #TiVoConnect Beacon
+tivoconnect         2190/udp  #TiVoConnect Beacon
+tvbus               2191/tcp  #TvBus Messaging
+tvbus               2191/udp  #TvBus Messaging
+ici                 2200/tcp  #ICI
+ici                 2200/udp  #ICI
+ats                 2201/tcp  #Advanced Training System Program
+ats                 2201/udp  #Advanced Training System Program
+imtc-map            2202/tcp  #Int. Multimedia Teleconferencing Cosortium
+imtc-map            2202/udp  #Int. Multimedia Teleconferencing Cosortium
+kali                2213/tcp  #Kali
+kali                2213/udp  #Kali
+netiq               2220/tcp  #NetIQ End2End
+netiq               2220/udp  #NetIQ End2End
+rockwell-csp1       2221/tcp  #Rockwell CSP1
+rockwell-csp1       2221/udp  #Rockwell CSP1
+rockwell-csp2       2222/tcp  #Rockwell CSP2
+rockwell-csp2       2222/udp  #Rockwell CSP2
+rockwell-csp3       2223/tcp  #Rockwell CSP3
+rockwell-csp3       2223/udp  #Rockwell CSP3
+ivs-video           2232/tcp  #IVS Video default
+ivs-video           2232/udp  #IVS Video default
+infocrypt           2233/tcp  #INFOCRYPT
+infocrypt           2233/udp  #INFOCRYPT
+directplay          2234/tcp  #DirectPlay
+directplay          2234/udp  #DirectPlay
+sercomm-wlink       2235/tcp  #Sercomm-WLink
+sercomm-wlink       2235/udp  #Sercomm-WLink
+nani                2236/tcp  #Nani
+nani                2236/udp  #Nani
+optech-port1-lm     2237/tcp  #Optech Port1 License Manager
+optech-port1-lm     2237/udp  #Optech Port1 License Manager
+aviva-sna           2238/tcp  #AVIVA SNA SERVER
+aviva-sna           2238/udp  #AVIVA SNA SERVER
+imagequery          2239/tcp  #Image Query	
+imagequery          2239/udp  #Image Query
+recipe              2240/tcp  #RECIPe
+recipe              2240/udp  #RECIPe
+ivsd                2241/tcp  #IVS Daemon
+ivsd                2241/udp  #IVS Daemon
+foliocorp           2242/tcp  #Folio Remote Server
+foliocorp           2242/udp  #Folio Remote Server
+magicom             2243/tcp  #Magicom Protocol
+magicom             2243/udp  #Magicom Protocol
+nmsserver           2244/tcp  #NMS Server
+nmsserver           2244/udp  #NMS Server
+hao                 2245/tcp  #HaO
+hao                 2245/udp  #HaO
+pc-mta-addrmap      2246/tcp  #PacketCable MTA Addr Map
+pc-mta-addrmap      2246/udp  #PacketCable MTA Addr Map
+ums                 2248/tcp  #User Management Service
+ums                 2248/udp  #User Management Service
+rfmp                2249/tcp  #RISO File Manager Protocol
+rfmp                2249/udp  #RISO File Manager Protocol
+remote-collab       2250/tcp  #remote-collab
+remote-collab       2250/udp  #remote-collab
+dif-port            2251/tcp  #Distributed Framework Port
+dif-port            2251/udp  #Distributed Framework Port
+njenet-ssl          2252/tcp  #NJENET using SSL
+njenet-ssl          2252/udp  #NJENET using SSL
+dtv-chan-req        2253/tcp  #DTV Channel Request
+dtv-chan-req        2253/udp  #DTV Channel Request
+seispoc             2254/tcp  #Seismic P.O.C. Port
+seispoc             2254/udp  #Seismic P.O.C. Port
+vrtp                2255/tcp  #VRTP - ViRtue Transfer Protocol
+vrtp                2255/udp  #VRTP - ViRtue Transfer Protocol
+apc-2260            2260/tcp  #APC 2260
+apc-2260            2260/udp  #APC 2260
+mfserver            2266/tcp  #M-Files Server
+mfserver            2266/udp  #M-files Server
+xmquery             2279/tcp  #xmquery
+xmquery             2279/udp  #xmquery
+lnvpoller           2280/tcp  #LNVPOLLER
+lnvpoller           2280/udp  #LNVPOLLER
+lnvconsole          2281/tcp  #LNVCONSOLE
+lnvconsole          2281/udp  #LNVCONSOLE
+lnvalarm            2282/tcp  #LNVALARM
+lnvalarm            2282/udp  #LNVALARM
+lnvstatus           2283/tcp  #LNVSTATUS
+lnvstatus           2283/udp  #LNVSTATUS
+lnvmaps             2284/tcp  #LNVMAPS
+lnvmaps             2284/udp  #LNVMAPS
+lnvmailmon          2285/tcp  #LNVMAILMON
+lnvmailmon          2285/udp  #LNVMAILMON
+nas-metering        2286/tcp  #NAS-Metering
+nas-metering        2286/udp  #NAS-Metering
+dna                 2287/tcp  #DNA
+dna                 2287/udp  #DNA
+netml               2288/tcp  #NETML
+netml               2288/udp  #NETML
+konshus-lm          2294/tcp  #Konshus License Manager (FLEX)
+konshus-lm          2294/udp  #Konshus License Manager (FLEX)
+advant-lm           2295/tcp  #Advant License Manager
+advant-lm           2295/udp  #Advant License Manager
+theta-lm            2296/tcp  #Theta License Manager (Rainbow)
+theta-lm            2296/udp  #Theta License Manager (Rainbow)
+d2k-datamover1      2297/tcp  #D2K DataMover 1
+d2k-datamover1      2297/udp  #D2K DataMover 1
+d2k-datamover2      2298/tcp  #D2K DataMover 2
+d2k-datamover2      2298/udp  #D2K DataMover 2
+pc-telecommute      2299/tcp  #PC Telecommute
+pc-telecommute      2299/udp  #PC Telecommute
+cvmmon              2300/tcp  #CVMMON
+cvmmon              2300/udp  #CVMMON
+cpq-wbem            2301/tcp  #Compaq HTTP
+cpq-wbem            2301/udp  #Compaq HTTP
+binderysupport      2302/tcp  #Bindery Support
+binderysupport      2302/udp  #Bindery Support
+proxy-gateway       2303/tcp  #Proxy Gateway
+proxy-gateway       2303/udp  #Proxy Gateway
+attachmate-uts      2304/tcp  #Attachmate UTS
+attachmate-uts      2304/udp  #Attachmate UTS
+mt-scaleserver      2305/tcp  #MT ScaleServer
+mt-scaleserver      2305/udp  #MT ScaleServer
+tappi-boxnet        2306/tcp  #TAPPI BoxNet
+tappi-boxnet        2306/udp  #TAPPI BoxNet
+pehelp              2307/tcp  #pehelp
+pehelp              2307/udp  #pehelp
+sdhelp              2308/tcp  #sdhelp
+sdhelp              2308/udp  #sdhelp
+sdserver            2309/tcp  #SD Server
+sdserver            2309/udp  #SD Server
+sdclient            2310/tcp  #SD Client
+sdclient            2310/udp  #SD Client
+messageservice      2311/tcp  #Message Service
+messageservice      2311/udp  #Message Service
+iapp                2313/tcp  #IAPP (Inter Access Point Protocol)
+iapp                2313/udp  #IAPP (Inter Access Point Protocol)
+cr-websystems       2314/tcp  #CR WebSystems
+cr-websystems       2314/udp  #CR WebSystems
+precise-sft         2315/tcp  #Precise Sft.
+precise-sft         2315/udp  #Precise Sft.
+sent-lm             2316/tcp  #SENT License Manager
+sent-lm             2316/udp  #SENT License Manager
+attachmate-g32      2317/tcp  #Attachmate G32
+attachmate-g32      2317/udp  #Attachmate G32
+cadencecontrol      2318/tcp  #Cadence Control
+cadencecontrol      2318/udp  #Cadence Control
+infolibria          2319/tcp  #InfoLibria
+infolibria          2319/udp  #InfoLibria
+siebel-ns           2320/tcp  #Siebel NS
+siebel-ns           2320/udp  #Siebel NS
+rdlap               2321/tcp  #RDLAP
+rdlap               2321/udp  #RDLAP
+ofsd                2322/tcp  #ofsd
+ofsd                2322/udp  #ofsd
+3d-nfsd             2323/tcp  #3d-nfsd
+3d-nfsd             2323/udp  #3d-nfsd
+cosmocall           2324/tcp  #Cosmocall
+cosmocall           2324/udp  #Cosmocall
+designspace-lm      2325/tcp  #Design Space License Management
+designspace-lm      2325/udp  #Design Space License Management
+idcp                2326/tcp  #IDCP
+idcp                2326/udp  #IDCP
+xingcsm             2327/tcp  #xingcsm
+xingcsm             2327/udp  #xingcsm
+netrix-sftm         2328/tcp  #Netrix SFTM
+netrix-sftm         2328/udp  #Netrix SFTM
+nvd                 2329/tcp  #NVD
+nvd                 2329/udp  #NVD
+tscchat             2330/tcp  #TSCCHAT
+tscchat             2330/udp  #TSCCHAT
+agentview           2331/tcp  #AGENTVIEW
+agentview           2331/udp  #AGENTVIEW
+rcc-host            2332/tcp  #RCC Host 
+rcc-host            2332/udp  #RCC Host
+snapp               2333/tcp  #SNAPP
+snapp               2333/udp  #SNAPP
+ace-client          2334/tcp  #ACE Client Auth
+ace-client          2334/udp  #ACE Client Auth
+ace-proxy           2335/tcp  #ACE Proxy
+ace-proxy           2335/udp  #ACE Proxy
+appleugcontrol      2336/tcp  #Apple UG Control
+appleugcontrol      2336/udp  #Apple UG Control
+ideesrv             2337/tcp  #ideesrv
+ideesrv             2337/udp  #ideesrv
+norton-lambert      2338/tcp  #Norton Lambert
+norton-lambert      2338/udp  #Norton Lambert
+3com-webview        2339/tcp  #3Com WebView
+3com-webview        2339/udp  #3Com WebView
+wrs_registry        2340/tcp  #WRS Registry
+wrs_registry        2340/udp  #WRS Registry
+xiostatus           2341/tcp  #XIO Status
+xiostatus           2341/udp  #XIO Status
+manage-exec         2342/tcp  #Seagate Manage Exec
+manage-exec         2342/udp  #Seagate Manage Exec
+nati-logos          2343/tcp  #nati logos
+nati-logos          2343/udp  #nati logos
+fcmsys              2344/tcp  #fcmsys
+fcmsys              2344/udp  #fcmsys
+dbm                 2345/tcp  #dbm
+dbm                 2345/udp  #dbm
+redstorm_join       2346/tcp  #Game Connection Port
+redstorm_join       2346/udp  #Game Connection Port
+redstorm_find       2347/tcp  #Game Announcement and Location
+redstorm_find       2347/udp  #Game Announcement and Location
+redstorm_info       2348/tcp  #Information to query for game status
+redstorm_info       2348/udp  #Information to query for game status
+redstorm_diag       2349/tcp  #Diagnostics Port
+redstorm_diag       2349/udp  #Diagnostics Port
+psbserver           2350/tcp  #psbserver
+psbserver           2350/udp  #psbserver
+psrserver           2351/tcp  #psrserver
+psrserver           2351/udp  #psrserver
+pslserver           2352/tcp  #pslserver
+pslserver           2352/udp  #pslserver
+pspserver           2353/tcp  #pspserver
+pspserver           2353/udp  #pspserver
+psprserver          2354/tcp  #psprserver
+psprserver          2354/udp  #psprserver
+psdbserver          2355/tcp  #psdbserver
+psdbserver          2355/udp  #psdbserver
+gxtelmd             2356/tcp  #GXT License Managemant
+gxtelmd             2356/udp  #GXT License Managemant
+unihub-server       2357/tcp  #UniHub Server
+unihub-server       2357/udp  #UniHub Server
+futrix              2358/tcp  #Futrix
+futrix              2358/udp  #Futrix
+flukeserver         2359/tcp  #FlukeServer
+flukeserver         2359/udp  #FlukeServer
+nexstorindltd       2360/tcp  #NexstorIndLtd
+nexstorindltd       2360/udp  #NexstorIndLtd
+tl1                 2361/tcp  #TL1
+tl1                 2361/udp  #TL1
+digiman             2362/tcp  #digiman
+digiman             2362/udp  #digiman
+mediacntrlnfsd      2363/tcp  #Media Central NFSD 
+mediacntrlnfsd      2363/udp  #Media Central NFSD 
+oi-2000             2364/tcp  #OI-2000
+oi-2000             2364/udp  #OI-2000
+dbref               2365/tcp  #dbref
+dbref               2365/udp  #dbref
+qip-login           2366/tcp  #qip-login
+qip-login           2366/udp  #qip-login
+service-ctrl        2367/tcp  #Service Control
+service-ctrl        2367/udp  #Service Control
+opentable           2368/tcp  #OpenTable
+opentable           2368/udp  #OpenTable
+acs2000-dsp         2369/tcp  #ACS2000 DSP
+acs2000-dsp         2369/udp  #ACS2000 DSP
+l3-hbmon            2370/tcp  #L3-HBMon
+l3-hbmon            2370/udp  #L3-HBMon
+worldwire           2371/tcp  #Compaq WorldWire Port
+worldwire           2371/udp  #Compaq WorldWire Port
+compaq-https        2381/tcp  #Compaq HTTPS
+compaq-https        2381/udp  #Compaq HTTPS
+ms-olap3            2382/tcp  #Microsoft OLAP
+ms-olap3            2382/udp  #Microsoft OLAP
+ms-olap4            2383/tcp  #Microsoft OLAP
+ms-olap4            2383/udp  #Microsoft OLAP
+sd-request          2384/tcp  #SD-REQUEST
+sd-capacity         2384/udp  #SD-CAPACITY
+sd-data             2385/tcp  #SD-DATA
+sd-data             2385/udp  #SD-DATA
+virtualtape         2386/tcp  #Virtual Tape
+virtualtape         2386/udp  #Virtual Tape
+vsamredirector      2387/tcp  #VSAM Redirector
+vsamredirector      2387/udp  #VSAM Redirector
+mynahautostart      2388/tcp  #MYNAH AutoStart
+mynahautostart      2388/udp  #MYNAH AutoStart
+ovsessionmgr        2389/tcp  #OpenView Session Mgr
+ovsessionmgr        2389/udp  #OpenView Session Mgr
+rsmtp               2390/tcp  #RSMTP
+rsmtp               2390/udp  #RSMTP
+3com-net-mgmt       2391/tcp  #3COM Net Management
+3com-net-mgmt       2391/udp  #3COM Net Management
+tacticalauth        2392/tcp  #Tactical Auth
+tacticalauth        2392/udp  #Tactical Auth
+ms-olap1            2393/tcp  #MS OLAP 1
+ms-olap1            2393/udp  #MS OLAP 1
+ms-olap2            2394/tcp  #MS OLAP 2
+ms-olap2            2394/udp  #MS OLAP 2
+lan900_remote       2395/tcp  #LAN900 Remote
+lan900_remote       2395/udp  #LAN900 Remote
+wusage              2396/tcp  #Wusage
+wusage              2396/udp  #Wusage
+ncl                 2397/tcp  #NCL
+ncl                 2397/udp  #NCL
+orbiter             2398/tcp  #Orbiter
+orbiter             2398/udp  #Orbiter
+fmpro-fdal          2399/tcp  #FileMaker, Inc. - Data Access Layer
+fmpro-fdal          2399/udp  #FileMaker, Inc. - Data Access Layer
+opequus-server      2400/tcp  #OpEquus Server
+opequus-server      2400/udp  #OpEquus Server
+cvspserver          2401/tcp  #cvspserver
+cvspserver          2401/udp  #cvspserver
+taskmaster2000      2402/tcp  #TaskMaster 2000 Server
+taskmaster2000      2402/udp  #TaskMaster 2000 Server
+taskmaster2000      2403/tcp  #TaskMaster 2000 Web
+taskmaster2000      2403/udp  #TaskMaster 2000 Web
+iec-104             2404/tcp  #IEC 60870-5-104 process control over IP
+iec-104             2404/udp  #IEC 60870-5-104 process control over IP
+trc-netpoll         2405/tcp  #TRC Netpoll
+trc-netpoll         2405/udp  #TRC Netpoll
+jediserver          2406/tcp  #JediServer
+jediserver          2406/udp  #JediServer
+orion               2407/tcp  #Orion
+orion               2407/udp  #Orion
+optimanet           2408/tcp  #OptimaNet
+optimanet           2408/udp  #OptimaNet
+sns-protocol        2409/tcp  #SNS Protocol
+sns-protocol        2409/udp  #SNS Protocol
+vrts-registry       2410/tcp  #VRTS Registry
+vrts-registry       2410/udp  #VRTS Registry
+netwave-ap-mgmt     2411/tcp  #Netwave AP Management
+netwave-ap-mgmt     2411/udp  #Netwave AP Management
+cdn                 2412/tcp  #CDN
+cdn                 2412/udp  #CDN
+orion-rmi-reg       2413/tcp  #orion-rmi-reg 
+orion-rmi-reg       2413/udp  #orion-rmi-reg
+beeyond             2414/tcp  #Beeyond
+beeyond             2414/udp  #Beeyond
+codima-rtp          2415/tcp  #Codima Remote Transaction Protocol
+codima-rtp          2415/udp  #Codima Remote Transaction Protocol
+rmtserver           2416/tcp  #RMT Server	
+rmtserver           2416/udp  #RMT Server
+composit-server     2417/tcp  #Composit Server
+composit-server     2417/udp  #Composit Server
+cas                 2418/tcp  #cas
+cas                 2418/udp  #cas
+attachmate-s2s      2419/tcp  #Attachmate S2S
+attachmate-s2s      2419/udp  #Attachmate S2S
+dslremote-mgmt      2420/tcp  #DSL Remote Management
+dslremote-mgmt      2420/udp  #DSL Remote Management
+g-talk              2421/tcp  #G-Talk
+g-talk              2421/udp  #G-Talk
+crmsbits            2422/tcp  #CRMSBITS
+crmsbits            2422/udp  #CRMSBITS
+rnrp                2423/tcp  #RNRP
+rnrp                2423/udp  #RNRP
+kofax-svr           2424/tcp  #KOFAX-SVR
+kofax-svr           2424/udp  #KOFAX-SVR
+fjitsuappmgr        2425/tcp  #Fujitsu App Manager
+fjitsuappmgr        2425/udp  #Fujitsu App Manager
+mgcp-gateway        2427/tcp  #Media Gateway Control Protocol Gateway
+mgcp-gateway        2427/udp  #Media Gateway Control Protocol Gateway
+ott                 2428/tcp  #One Way Trip Time
+ott                 2428/udp  #One Way Trip Time
+ft-role             2429/tcp  #FT-ROLE
+ft-role             2429/udp  #FT-ROLE
+venus               2430/tcp  #venus
+venus               2430/udp  #venus
+venus-se            2431/tcp  #venus-se
+venus-se            2431/udp  #venus-se
+codasrv             2432/tcp  #codasrv
+codasrv             2432/udp  #codasrv
+codasrv-se          2433/tcp  #codasrv-se
+codasrv-se          2433/udp  #codasrv-se
+pxc-epmap           2434/tcp  #pxc-epmap
+pxc-epmap           2434/udp  #pxc-epmap
+optilogic           2435/tcp  #OptiLogic
+optilogic           2435/udp  #OptiLogic
+topx                2436/tcp  #TOP/X
+topx                2436/udp  #TOP/X
+unicontrol          2437/tcp  #UniControl
+unicontrol          2437/udp  #UniControl
+msp                 2438/tcp  #MSP
+msp                 2438/udp  #MSP
+sybasedbsynch       2439/tcp  #SybaseDBSynch
+sybasedbsynch       2439/udp  #SybaseDBSynch
+spearway            2440/tcp  #Spearway Lockers
+spearway            2440/udp  #Spearway Lockers
+pvsw-inet           2441/tcp  #Pervasive I*net Data Server
+pvsw-inet           2441/udp  #Pervasive I*net Data Server
+netangel            2442/tcp  #Netangel
+netangel            2442/udp  #Netangel
+powerclientcsf      2443/tcp  #PowerClient Central Storage Facility
+powerclientcsf      2443/udp  #PowerClient Central Storage Facility
+btpp2sectrans       2444/tcp  #BT PP2 Sectrans
+btpp2sectrans       2444/udp  #BT PP2 Sectrans
+dtn1                2445/tcp  #DTN1
+dtn1                2445/udp  #DTN1
+bues_service        2446/tcp  #bues_service
+bues_service        2446/udp  #bues_service
+ovwdb               2447/tcp  #OpenView NNM daemon
+ovwdb               2447/udp  #OpenView NNM daemon
+hpppssvr            2448/tcp  #hpppsvr
+hpppssvr            2448/udp  #hpppsvr
+ratl                2449/tcp  #RATL
+ratl                2449/udp  #RATL
+netadmin            2450/tcp  #netadmin
+netadmin            2450/udp  #netadmin
+netchat             2451/tcp  #netchat
+netchat             2451/udp  #netchat
+snifferclient       2452/tcp  #SnifferClient
+snifferclient       2452/udp  #SnifferClient
+madge-ltd           2453/tcp  #madge ltd
+madge-ltd           2453/udp  #madge ltd
+indx-dds            2454/tcp  #IndX-DDS
+indx-dds            2454/udp  #IndX-DDS
+wago-io-system      2455/tcp  #WAGO-IO-SYSTEM
+wago-io-system      2455/udp  #WAGO-IO-SYSTEM
+altav-remmgt        2456/tcp  #altav-remmgt
+altav-remmgt        2456/udp  #altav-remmgt
+rapido-ip           2457/tcp  #Rapido_IP
+rapido-ip           2457/udp  #Rapido_IP
+griffin             2458/tcp  #griffin
+griffin             2458/udp  #griffin
+community           2459/tcp  #Community
+community           2459/udp  #Community
+ms-theater          2460/tcp  #ms-theater
+ms-theater          2460/udp  #ms-theater
+qadmifoper          2461/tcp  #qadmifoper
+qadmifoper          2461/udp  #qadmifoper
+qadmifevent         2462/tcp  #qadmifevent
+qadmifevent         2462/udp  #qadmifevent	
+symbios-raid        2463/tcp  #Symbios Raid
+symbios-raid        2463/udp  #Symbios Raid
+direcpc-si          2464/tcp  #DirecPC SI
+direcpc-si          2464/udp  #DirecPC SI
+lbm                 2465/tcp  #Load Balance Management
+lbm                 2465/udp  #Load Balance Management
+lbf                 2466/tcp  #Load Balance Forwarding
+lbf                 2466/udp  #Load Balance Forwarding
+high-criteria       2467/tcp  #High Criteria
+high-criteria       2467/udp  #High Criteria
+qip-msgd            2468/tcp  #qip_msgd
+qip-msgd            2468/udp  #qip_msgd
+mti-tcs-comm        2469/tcp  #MTI-TCS-COMM
+mti-tcs-comm        2469/udp  #MTI-TCS-COMM
+taskman-port        2470/tcp  #taskman port
+taskman-port        2470/udp  #taskman port
+seaodbc             2471/tcp  #SeaODBC
+seaodbc             2471/udp  #SeaODBC
+c3                  2472/tcp  #C3
+c3                  2472/udp  #C3
+aker-cdp            2473/tcp  #Aker-cdp
+aker-cdp            2473/udp  #Aker-cdp
+vitalanalysis       2474/tcp  #Vital Analysis
+vitalanalysis       2474/udp  #Vital Analysis
+ace-server          2475/tcp  #ACE Server
+ace-server          2475/udp  #ACE Server
+ace-svr-prop        2476/tcp  #ACE Server Propagation
+ace-svr-prop        2476/udp  #ACE Server Propagation
+ssm-cvs             2477/tcp  #SecurSight Certificate Valifation Service
+ssm-cvs             2477/udp  #SecurSight Certificate Valifation Service
+ssm-cssps           2478/tcp  #SecurSight Authentication Server (SSL)
+ssm-cssps           2478/udp  #SecurSight Authentication Server (SSL)
+ssm-els             2479/tcp  #SecurSight Event Logging Server (SSL)
+ssm-els             2479/udp  #SecurSight Event Logging Server (SSL)
+lingwood            2480/tcp  #Lingwood's Detail
+lingwood            2480/udp  #Lingwood's Detail
+giop                2481/tcp  #Oracle GIOP
+giop                2481/udp  #Oracle GIOP
+giop-ssl            2482/tcp  #Oracle GIOP SSL
+giop-ssl            2482/udp  #Oracle GIOP SSL
+ttc                 2483/tcp  #Oracle TTC
+ttc                 2483/udp  #Oracle TTC
+ttc-ssl             2484/tcp  #Oracle TTC SSL
+ttc-ssl             2484/udp  #Oracle TTC SSL
+netobjects1         2485/tcp  #Net Objects1
+netobjects1         2485/udp  #Net Objects1
+netobjects2         2486/tcp  #Net Objects2
+netobjects2         2486/udp  #Net Objects2
+pns                 2487/tcp  #Policy Notice Service
+pns                 2487/udp  #Policy Notice Service
+moy-corp            2488/tcp  #Moy Corporation
+moy-corp            2488/udp  #Moy Corporation
+tsilb               2489/tcp  #TSILB
+tsilb               2489/udp  #TSILB
+qip-qdhcp           2490/tcp  #qip_qdhcp
+qip-qdhcp           2490/udp  #qip_qdhcp
+conclave-cpp        2491/tcp  #Conclave CPP
+conclave-cpp        2491/udp  #Conclave CPP
+groove              2492/tcp  #GROOVE
+groove              2492/udp  #GROOVE
+talarian-mqs        2493/tcp  #Talarian MQS
+talarian-mqs        2493/udp  #Talarian MQS
+bmc-ar              2494/tcp  #BMC AR
+bmc-ar              2494/udp  #BMC AR
+fast-rem-serv       2495/tcp  #Fast Remote Services
+fast-rem-serv       2495/udp  #Fast Remote Services
+dirgis              2496/tcp  #DIRGIS
+dirgis              2496/udp  #DIRGIS
+quaddb              2497/tcp  #Quad DB
+quaddb              2497/udp  #Quad DB
+odn-castraq         2498/tcp  #ODN-CasTraq
+odn-castraq         2498/udp  #ODN-CasTraq
+unicontrol          2499/tcp  #UniControl
+unicontrol          2499/udp  #UniControl
+rtsserv             2500/tcp  #Resource Tracking system server
+rtsserv             2500/udp  #Resource Tracking system server
+rtsclient           2501/tcp  #Resource Tracking system client
+rtsclient           2501/udp  #Resource Tracking system client
+kentrox-prot        2502/tcp  #Kentrox Protocol
+kentrox-prot        2502/udp  #Kentrox Protocol
+nms-dpnss           2503/tcp  #NMS-DPNSS
+nms-dpnss           2503/udp  #NMS-DPNSS
+wlbs                2504/tcp  #WLBS 
+wlbs                2504/udp  #WLBS 
+jbroker             2506/tcp  #jbroker
+jbroker             2506/udp  #jbroker
+spock               2507/tcp  #spock
+spock               2507/udp  #spock
+jdatastore          2508/tcp  #JDataStore
+jdatastore          2508/udp  #JDataStore
+fjmpss              2509/tcp  #fjmpss
+fjmpss              2509/udp  #fjmpss
+fjappmgrbulk        2510/tcp  #fjappmgrbulk
+fjappmgrbulk        2510/udp  #fjappmgrbulk
+metastorm           2511/tcp  #Metastorm
+metastorm           2511/udp  #Metastorm
+citrixima           2512/tcp  #Citrix IMA
+citrixima           2512/udp  #Citrix IMA
+citrixadmin         2513/tcp  #Citrix ADMIN
+citrixadmin         2513/udp  #Citrix ADMIN
+facsys-ntp          2514/tcp  #Facsys NTP
+facsys-ntp          2514/udp  #Facsys NTP
+facsys-router       2515/tcp  #Facsys Router
+facsys-router       2515/udp  #Facsys Router
+maincontrol         2516/tcp  #Main Control   
+maincontrol         2516/udp  #Main Control   
+call-sig-trans      2517/tcp  #H.323 Annex E call signaling transport
+call-sig-trans      2517/udp  #H.323 Annex E call signaling transport
+willy               2518/tcp  #Willy
+willy               2518/udp  #Willy
+globmsgsvc          2519/tcp  #globmsgsvc
+globmsgsvc          2519/udp  #globmsgsvc
+pvsw                2520/tcp  #Pervasive Listener
+pvsw                2520/udp  #Pervasive Listener
+adaptecmgr          2521/tcp  #Adaptec Manager
+adaptecmgr          2521/udp  #Adaptec Manager
+windb               2522/tcp  #WinDb
+windb               2522/udp  #WinDb
+qke-llc-v3          2523/tcp  #Qke LLC V.3
+qke-llc-v3          2523/udp  #Qke LLC V.3
+optiwave-lm         2524/tcp  #Optiwave License Management
+optiwave-lm         2524/udp  #Optiwave License Management
+ms-v-worlds         2525/tcp  #MS V-Worlds 
+ms-v-worlds         2525/udp  #MS V-Worlds 
+ema-sent-lm         2526/tcp  #EMA License Manager
+ema-sent-lm         2526/udp  #EMA License Manager
+iqserver            2527/tcp  #IQ Server
+iqserver            2527/udp  #IQ Server
+ncr_ccl             2528/tcp  #NCR CCL
+ncr_ccl             2528/udp  #NCR CCL
+utsftp              2529/tcp  #UTS FTP
+utsftp              2529/udp  #UTS FTP
+vrcommerce          2530/tcp  #VR Commerce
+vrcommerce          2530/udp  #VR Commerce
+ito-e-gui           2531/tcp  #ITO-E GUI
+ito-e-gui           2531/udp  #ITO-E GUI
+ovtopmd             2532/tcp  #OVTOPMD
+ovtopmd             2532/udp  #OVTOPMD
+snifferserver       2533/tcp  #SnifferServer
+snifferserver       2533/udp  #SnifferServer
+combox-web-acc      2534/tcp  #Combox Web Access
+combox-web-acc      2534/udp  #Combox Web Access
+madcap              2535/tcp  #MADCAP
+madcap              2535/udp  #MADCAP
+btpp2audctr1        2536/tcp  #btpp2audctr1
+btpp2audctr1        2536/udp  #btpp2audctr1
+upgrade             2537/tcp  #Upgrade Protocol
+upgrade             2537/udp  #Upgrade Protocol
+vnwk-prapi          2538/tcp  #vnwk-prapi
+vnwk-prapi          2538/udp  #vnwk-prapi
+vsiadmin            2539/tcp  #VSI Admin
+vsiadmin            2539/udp  #VSI Admin
+lonworks            2540/tcp  #LonWorks
+lonworks            2540/udp  #LonWorks
+lonworks2           2541/tcp  #LonWorks2
+lonworks2           2541/udp  #LonWorks2 
+davinci             2542/tcp  #daVinci Presenter
+davinci             2542/udp  #daVinci Presenter
+reftek              2543/tcp  #REFTEK
+reftek              2543/udp  #REFTEK
+novell-zen          2544/tcp  #Novell ZEN
+novell-zen          2544/udp  #Novell ZEN
+sis-emt             2545/tcp  #sis-emt
+sis-emt             2545/udp  #sis-emt
+vytalvaultbrtp      2546/tcp  #vytalvaultbrtp
+vytalvaultbrtp      2546/udp  #vytalvaultbrtp
+vytalvaultvsmp      2547/tcp  #vytalvaultvsmp
+vytalvaultvsmp      2547/udp  #vytalvaultvsmp
+vytalvaultpipe      2548/tcp  #vytalvaultpipe
+vytalvaultpipe      2548/udp  #vytalvaultpipe
+ipass               2549/tcp  #IPASS
+ipass               2549/udp  #IPASS
+ads                 2550/tcp  #ADS
+ads                 2550/udp  #ADS
+isg-uda-server      2551/tcp  #ISG UDA Server
+isg-uda-server      2551/udp  #ISG UDA Server
+call-logging        2552/tcp  #Call Logging
+call-logging        2552/udp  #Call Logging
+efidiningport       2553/tcp  #efidiningport
+efidiningport       2553/udp  #efidiningport
+vcnet-link-v10      2554/tcp  #VCnet-Link v10
+vcnet-link-v10      2554/udp  #VCnet-Link v10
+compaq-wcp          2555/tcp  #Compaq WCP
+compaq-wcp          2555/udp  #Compaq WCP
+nicetec-nmsvc       2556/tcp  #nicetec-nmsvc
+nicetec-nmsvc       2556/udp  #nicetec-nmsvc
+nicetec-mgmt        2557/tcp  #nicetec-mgmt
+nicetec-mgmt        2557/udp  #nicetec-mgmt
+pclemultimedia      2558/tcp  #PCLE Multi Media
+pclemultimedia      2558/udp  #PCLE Multi Media
+lstp                2559/tcp  #LSTP
+lstp                2559/udp  #LSTP
+labrat              2560/tcp  #labrat
+labrat              2560/udp  #labrat
+mosaixcc            2561/tcp  #MosaixCC
+mosaixcc            2561/udp  #MosaixCC
+delibo              2562/tcp  #Delibo
+delibo              2562/udp  #Delibo
+cti-redwood         2563/tcp  #CTI Redwood
+cti-redwood         2563/udp  #CTI Redwood
+hp-3000-telnet      2564/tcp  #HP 3000 NS/VT block mode telnet
+coord-svr           2565/tcp  #Coordinator Server
+coord-svr           2565/udp  #Coordinator Server
+pcs-pcw             2566/tcp  #pcs-pcw
+pcs-pcw             2566/udp  #pcs-pcw
+clp                 2567/tcp  #Cisco Line Protocol
+clp                 2567/udp  #Cisco Line Protocol
+spamtrap            2568/tcp  #SPAM TRAP
+spamtrap            2568/udp  #SPAM TRAP
+sonuscallsig        2569/tcp  #Sonus Call Signal
+sonuscallsig        2569/udp  #Sonus Call Signal
+hs-port             2570/tcp  #HS Port
+hs-port             2570/udp  #HS Port
+cecsvc              2571/tcp  #CECSVC
+cecsvc              2571/udp  #CECSVC
+ibp                 2572/tcp  #IBP
+ibp                 2572/udp  #IBP
+trustestablish      2573/tcp  #Trust Establish
+trustestablish      2573/udp  #Trust Establish
+blockade-bpsp       2574/tcp  #Blockade BPSP
+blockade-bpsp       2574/udp  #Blockade BPSP
+hl7                 2575/tcp  #HL7
+hl7                 2575/udp  #HL7
+tclprodebugger      2576/tcp  #TCL Pro Debugger
+tclprodebugger      2576/udp  #TCL Pro Debugger
+scipticslsrvr       2577/tcp  #Scriptics Lsrvr
+scipticslsrvr       2577/udp  #Scriptics Lsrvr
+rvs-isdn-dcp        2578/tcp  #RVS ISDN DCP
+rvs-isdn-dcp        2578/udp  #RVS ISDN DCP
+mpfoncl             2579/tcp  #mpfoncl
+mpfoncl             2579/udp  #mpfoncl
+tributary           2580/tcp  #Tributary
+tributary           2580/udp  #Tributary
+argis-te            2581/tcp  #ARGIS TE
+argis-te            2581/udp  #ARGIS TE
+argis-ds            2582/tcp  #ARGIS DS
+argis-ds            2582/udp  #ARGIS DS
+mon                 2583/tcp  #MON
+mon                 2583/udp  #MON
+cyaserv             2584/tcp  #cyaserv
+cyaserv             2584/udp  #cyaserv
+netx-server         2585/tcp  #NETX Server
+netx-server         2585/udp  #NETX Server
+netx-agent          2586/tcp  #NETX Agent
+netx-agent          2586/udp  #NETX Agent
+masc                2587/tcp  #MASC
+masc                2587/udp  #MASC
+privilege           2588/tcp  #Privilege
+privilege           2588/udp  #Privilege
+quartus-tcl         2589/tcp  #quartus tcl
+quartus-tcl         2589/udp  #quartus tcl
+idotdist            2590/tcp  #idotdist
+idotdist            2590/udp  #idotdist
+maytagshuffle       2591/tcp  #Maytag Shuffle
+maytagshuffle       2591/udp  #Maytag Shuffle
+netrek              2592/tcp  #netrek
+netrek              2592/udp  #netrek
+mns-mail            2593/tcp  #MNS Mail Notice Service
+mns-mail            2593/udp  #MNS Mail Notice Service
+dts                 2594/tcp  #Data Base Server
+dts                 2594/udp  #Data Base Server
+worldfusion1        2595/tcp  #World Fusion 1
+worldfusion1        2595/udp  #World Fusion 1
+worldfusion2        2596/tcp  #World Fusion 2
+worldfusion2        2596/udp  #World Fusion 2
+homesteadglory      2597/tcp  #Homestead Glory
+homesteadglory      2597/udp  #Homestead Glory
+citriximaclient     2598/tcp  #Citrix MA Client
+citriximaclient     2598/udp  #Citrix MA Client
+snapd               2599/tcp  #Snap Discovery
+snapd               2599/udp  #Snap Discovery
+hpstgmgr            2600/tcp  #HPSTGMGR
+hpstgmgr            2600/udp  #HPSTGMGR
+discp-client        2601/tcp  #discp client
+discp-client        2601/udp  #discp client
+discp-server        2602/tcp  #discp server
+discp-server        2602/udp  #discp server
+servicemeter        2603/tcp  #Service Meter
+servicemeter        2603/udp  #Service Meter
+nsc-ccs             2604/tcp  #NSC CCS	
+nsc-ccs             2604/udp  #NSC CCS	
+nsc-posa            2605/tcp  #NSC POSA
+nsc-posa            2605/udp  #NSC POSA
+netmon              2606/tcp  #Dell Netmon
+netmon              2606/udp  #Dell Netmon
+connection          2607/tcp  #Dell Connection
+connection          2607/udp  #Dell Connection
+wag-service         2608/tcp  #Wag Service
+wag-service         2608/udp  #Wag Service
+system-monitor      2609/tcp  #System Monitor 
+system-monitor      2609/udp  #System Monitor 
+versa-tek           2610/tcp  #VersaTek
+versa-tek           2610/udp  #VersaTek
+lionhead            2611/tcp  #LIONHEAD
+lionhead            2611/udp  #LIONHEAD
+qpasa-agent         2612/tcp  #Qpasa Agent
+qpasa-agent         2612/udp  #Qpasa Agent
+smntubootstrap      2613/tcp  #SMNTUBootstrap
+smntubootstrap      2613/udp  #SMNTUBootstrap
+neveroffline        2614/tcp  #Never Offline
+neveroffline        2614/udp  #Never Offline
+firepower           2615/tcp  #firepower
+firepower           2615/udp  #firepower
+appswitch-emp       2616/tcp  #appswitch-emp
+appswitch-emp       2616/udp  #appswitch-emp
+cmadmin             2617/tcp  #Clinical Context Managers
+cmadmin             2617/udp  #Clinical Context Managers
+priority-e-com      2618/tcp  #Priority E-Com
+priority-e-com      2618/udp  #Priority E-Com
+bruce               2619/tcp  #bruce
+bruce               2619/udp  #bruce
+lpsrecommender      2620/tcp  #LPSRecommender
+lpsrecommender      2620/udp  #LPSRecommender
+miles-apart         2621/tcp  #Miles Apart Jukebox Server
+miles-apart         2621/udp  #Miles Apart Jukebox Server
+metricadbc          2622/tcp  #MetricaDBC
+metricadbc          2622/udp  #MetricaDBC
+lmdp                2623/tcp  #LMDP
+lmdp                2623/udp  #LMDP
+aria                2624/tcp  #Aria
+aria                2624/udp  #Aria
+blwnkl-port         2625/tcp  #Blwnkl Port
+blwnkl-port         2625/udp  #Blwnkl Port
+gbjd816             2626/tcp  #gbjd816
+gbjd816             2626/udp  #gbjd816
+moshebeeri          2627/tcp  #Moshe Beeri
+moshebeeri          2627/udp  #Moshe Beeri
+dict                2628/tcp  #DICT
+dict                2628/udp  #DICT
+sitaraserver        2629/tcp  #Sitara Server
+sitaraserver        2629/udp  #Sitara Server
+sitaramgmt          2630/tcp  #Sitara Management
+sitaramgmt          2630/udp  #Sitara Management
+sitaradir           2631/tcp  #Sitara Dir
+sitaradir           2631/udp  #Sitara Dir
+irdg-post           2632/tcp  #IRdg Post
+irdg-post           2632/udp  #IRdg Post
+interintelli        2633/tcp  #InterIntelli
+interintelli        2633/udp  #InterIntelli
+pk-electronics      2634/tcp  #PK Electronics
+pk-electronics      2634/udp  #PK Electronics
+backburner          2635/tcp  #Back Burner
+backburner          2635/udp  #Back Burner
+solve               2636/tcp  #Solve
+solve               2636/udp  #Solve
+imdocsvc            2637/tcp  #Import Document Service
+imdocsvc            2637/udp  #Import Document Service
+sybaseanywhere      2638/tcp  #Sybase Anywhere
+sybaseanywhere      2638/udp  #Sybase Anywhere
+aminet              2639/tcp  #AMInet
+aminet              2639/udp  #AMInet
+sai_sentlm          2640/tcp  #Sabbagh Associates Licence Manager
+sai_sentlm          2640/udp  #Sabbagh Associates Licence Manager
+hdl-srv             2641/tcp  #HDL Server
+hdl-srv             2641/udp  #HDL Server
+tragic              2642/tcp  #Tragic
+tragic              2642/udp  #Tragic
+gte-samp            2643/tcp  #GTE-SAMP
+gte-samp            2643/udp  #GTE-SAMP
+travsoft-ipx-t      2644/tcp  #Travsoft IPX Tunnel
+travsoft-ipx-t      2644/udp  #Travsoft IPX Tunnel
+novell-ipx-cmd      2645/tcp  #Novell IPX CMD
+novell-ipx-cmd      2645/udp  #Novell IPX CMD
+and-lm              2646/tcp  #AND License Manager
+and-lm              2646/udp  #AND License Manager
+syncserver          2647/tcp  #SyncServer
+syncserver          2647/udp  #SyncServer
+upsnotifyprot       2648/tcp  #Upsnotifyprot
+upsnotifyprot       2648/udp  #Upsnotifyprot
+vpsipport           2649/tcp  #VPSIPPORT
+vpsipport           2649/udp  #VPSIPPORT
+eristwoguns         2650/tcp  #eristwoguns
+eristwoguns         2650/udp  #eristwoguns
+ebinsite            2651/tcp  #EBInSite
+ebinsite            2651/udp  #EBInSite
+interpathpanel      2652/tcp  #InterPathPanel
+interpathpanel      2652/udp  #InterPathPanel
+sonus               2653/tcp  #Sonus
+sonus               2653/udp  #Sonus
+corel_vncadmin      2654/tcp  #Corel VNC Admin
+corel_vncadmin      2654/udp  #Corel VNC Admin
+unglue              2655/tcp  #UNIX Nt Glue
+unglue              2655/udp  #UNIX Nt Glue
+kana                2656/tcp  #Kana
+kana                2656/udp  #Kana
+sns-dispatcher      2657/tcp  #SNS Dispatcher
+sns-dispatcher      2657/udp  #SNS Dispatcher
+sns-admin           2658/tcp  #SNS Admin
+sns-admin           2658/udp  #SNS Admin
+sns-query           2659/tcp  #SNS Query
+sns-query           2659/udp  #SNS Query
+gcmonitor           2660/tcp  #GC Monitor
+gcmonitor           2660/udp  #GC Monitor
+olhost              2661/tcp  #OLHOST
+olhost              2661/udp  #OLHOST
+bintec-capi         2662/tcp  #BinTec-CAPI
+bintec-capi         2662/udp  #BinTec-CAPI
+bintec-tapi         2663/tcp  #BinTec-TAPI
+bintec-tapi         2663/udp  #BinTec-TAPI
+patrol-mq-gm        2664/tcp  #Patrol for MQ GM
+patrol-mq-gm        2664/udp  #Patrol for MQ GM
+patrol-mq-nm        2665/tcp  #Patrol for MQ NM
+patrol-mq-nm        2665/udp  #Patrol for MQ NM
+extensis            2666/tcp  #extensis
+extensis            2666/udp  #extensis
+alarm-clock-s       2667/tcp  #Alarm Clock Server
+alarm-clock-s       2667/udp  #Alarm Clock Server
+alarm-clock-c       2668/tcp  #Alarm Clock Client
+alarm-clock-c       2668/udp  #Alarm Clock Client
+toad                2669/tcp  #TOAD
+toad                2669/udp  #TOAD
+tve-announce        2670/tcp  #TVE Announce
+tve-announce        2670/udp  #TVE Announce
+newlixreg           2671/tcp  #newlixreg
+newlixreg           2671/udp  #newlixreg
+nhserver            2672/tcp  #nhserver
+nhserver            2672/udp  #nhserver
+firstcall42         2673/tcp  #First Call 42 
+firstcall42         2673/udp  #First Call 42 
+ewnn                2674/tcp  #ewnn
+ewnn                2674/udp  #ewnn
+ttc-etap            2675/tcp  #TTC ETAP
+ttc-etap            2675/udp  #TTC ETAP
+simslink            2676/tcp  #SIMSLink
+simslink            2676/udp  #SIMSLink
+gadgetgate1way      2677/tcp  #Gadget Gate 1 Way
+gadgetgate1way      2677/udp  #Gadget Gate 1 Way
+gadgetgate2way      2678/tcp  #Gadget Gate 2 Way
+gadgetgate2way      2678/udp  #Gadget Gate 2 Way
+syncserverssl       2679/tcp  #Sync Server SSL
+syncserverssl       2679/udp  #Sync Server SSL
+pxc-sapxom          2680/tcp  #pxc-sapxom
+pxc-sapxom          2680/udp  #pxc-sapxom
+mpnjsomb            2681/tcp  #mpnjsomb
+mpnjsomb            2681/udp  #mpnjsomb
+ncdloadbalance      2683/tcp  #NCDLoadBalance 
+ncdloadbalance      2683/udp  #NCDLoadBalance 
+mpnjsosv            2684/tcp  #mpnjsosv
+mpnjsosv            2684/udp  #mpnjsosv
+mpnjsocl            2685/tcp  #mpnjsocl
+mpnjsocl            2685/udp  #mpnjsocl
+mpnjsomg            2686/tcp  #mpnjsomg
+mpnjsomg            2686/udp  #mpnjsomg
+pq-lic-mgmt         2687/tcp  #pq-lic-mgmt
+pq-lic-mgmt         2687/udp  #pq-lic-mgmt
+md-cg-http          2688/tcp  #md-cf-http
+md-cg-http          2688/udp  #md-cf-http
+fastlynx            2689/tcp  #FastLynx
+fastlynx            2689/udp  #FastLynx
+hp-nnm-data         2690/tcp  #HP NNM Embedded Database
+hp-nnm-data         2690/udp  #HP NNM Embedded Database
+itinternet          2691/tcp  #ITInternet ISM Server
+itinternet          2691/udp  #ITInternet ISM Server
+admins-lms          2692/tcp  #Admins LMS
+admins-lms          2692/udp  #Admins LMS
+pwrsevent           2694/tcp  #pwrsevent	
+pwrsevent           2694/udp  #pwrsevent	
+vspread             2695/tcp  #VSPREAD
+vspread             2695/udp  #VSPREAD
+unifyadmin          2696/tcp  #Unify Admin
+unifyadmin          2696/udp  #Unify Admin
+oce-snmp-trap       2697/tcp  #Oce SNMP Trap Port 
+oce-snmp-trap       2697/udp  #Oce SNMP Trap Port 
+mck-ivpip           2698/tcp  #MCK-IVPIP
+mck-ivpip           2698/udp  #MCK-IVPIP
+csoft-plusclnt      2699/tcp  #Csoft Plus Client
+csoft-plusclnt      2699/udp  #Csoft Plus Client
+tqdata              2700/tcp  #tqdata
+tqdata              2700/udp  #tqdata
+sms-rcinfo          2701/tcp  #SMS RCINFO
+sms-rcinfo          2701/udp  #SMS RCINFO
+sms-xfer            2702/tcp  #SMS XFER
+sms-xfer            2702/udp  #SMS XFER
+sms-chat            2703/tcp  #SMS CHAT
+sms-chat            2703/udp  #SMS CHAT
+sms-remctrl         2704/tcp  #SMS REMCTRL
+sms-remctrl         2704/udp  #SMS REMCTRL
+sds-admin           2705/tcp  #SDS Admin
+sds-admin           2705/udp  #SDS Admin
+ncdmirroring        2706/tcp  #NCD Mirroring
+ncdmirroring        2706/udp  #NCD Mirroring
+emcsymapiport       2707/tcp  #EMCSYMAPIPORT
+emcsymapiport       2707/udp  #EMCSYMAPIPORT
+banyan-net          2708/tcp  #Banyan-Net
+banyan-net          2708/udp  #Banyan-Net
+supermon            2709/tcp  #Supermon
+supermon            2709/udp  #Supermon
+sso-service         2710/tcp  #SSO Service
+sso-service         2710/udp  #SSO Service
+sso-control         2711/tcp  #SSO Control
+sso-control         2711/udp  #SSO Control
+aocp                2712/tcp  #Axapta Object Communication Protocol
+aocp                2712/udp  #Axapta Object Communication Protocol
+raven1              2713/tcp  #Raven1
+raven1              2713/udp  #Raven1
+raven2              2714/tcp  #Raven2
+raven2              2714/udp  #Raven2
+hpstgmgr2           2715/tcp  #HPSTGMGR2
+hpstgmgr2           2715/udp  #HPSTGMGR2
+inova-ip-disco      2716/tcp  #Inova IP Disco
+inova-ip-disco      2716/udp  #Inova IP Disco
+pn-requester        2717/tcp  #PN REQUESTER
+pn-requester        2717/udp  #PN REQUESTER
+pn-requester2       2718/tcp  #PN REQUESTER 2
+pn-requester2       2718/udp  #PN REQUESTER 2
+scan-change         2719/tcp  #Scan & Change
+scan-change         2719/udp  #Scan & Change
+wkars               2720/tcp  #wkars
+wkars               2720/udp  #wkars
+smart-diagnose      2721/tcp  #Smart Diagnose
+smart-diagnose      2721/udp  #Smart Diagnose
+proactivesrvr       2722/tcp  #Proactive Server
+proactivesrvr       2722/udp  #Proactive Server
+watchdognt          2723/tcp  #WatchDog NT
+watchdognt          2723/udp  #WatchDog NT
+qotps               2724/tcp  #qotps
+qotps               2724/udp  #qotps
+msolap-ptp2         2725/tcp  #MSOLAP PTP2
+msolap-ptp2         2725/udp  #MSOLAP PTP2
+tams                2726/tcp  #TAMS
+tams                2726/udp  #TAMS
+mgcp-callagent      2727/tcp  #Media Gateway Control Protocol Call Agent
+mgcp-callagent      2727/udp  #Media Gateway Control Protocol Call Agent
+sqdr                2728/tcp  #SQDR
+sqdr                2728/udp  #SQDR
+tcim-control        2729/tcp  #TCIM Control
+tcim-control        2729/udp  #TCIM Control
+nec-raidplus        2730/tcp  #NEC RaidPlus
+nec-raidplus        2730/udp  #NEC RaidPlus
+fyre-messanger      2731/tcp  #Fyre Messanger
+fyre-messanger      2731/udp  #Fyre Messagner
+g5m                 2732/tcp  #G5M
+g5m                 2732/udp  #G5M
+signet-ctf          2733/tcp  #Signet CTF
+signet-ctf          2733/udp  #Signet CTF
+ccs-software        2734/tcp  #CCS Software 
+ccs-software        2734/udp  #CCS Software 
+netiq-mc            2735/tcp  #NetIQ Monitor Console
+netiq-mc            2735/udp  #NetIQ Monitor Console
+radwiz-nms-srv      2736/tcp  #RADWIZ NMS SRV
+radwiz-nms-srv      2736/udp  #RADWIZ NMS SRV
+srp-feedback        2737/tcp  #SRP Feedback
+srp-feedback        2737/udp  #SRP Feedback
+ndl-tcp-ois-gw      2738/tcp  #NDL TCP-OSI Gateway
+ndl-tcp-ois-gw      2738/udp  #NDL TCP-OSI Gateway
+tn-timing           2739/tcp  #TN Timing
+tn-timing           2739/udp  #TN Timing
+alarm               2740/tcp  #Alarm
+alarm               2740/udp  #Alarm
+tsb                 2741/tcp  #TSB
+tsb                 2741/udp  #TSB
+tsb2                2742/tcp  #TSB2
+tsb2                2742/udp  #TSB2
+murx                2743/tcp  #murx
+murx                2743/udp  #murx
+honyaku             2744/tcp  #honyaku
+honyaku             2744/udp  #honyaku
+urbisnet            2745/tcp  #URBISNET
+urbisnet            2745/udp  #URBISNET
+cpudpencap          2746/tcp  #CPUDPENCAP
+cpudpencap          2746/udp  #CPUDPENCAP
+rsisysaccess        2752/tcp  #RSISYS ACCESS
+rsisysaccess        2752/udp  #RSISYS ACCESS
+de-spot             2753/tcp  #de-spot
+de-spot             2753/udp  #de-spot
+apollo-cc           2754/tcp  #APOLLO CC
+apollo-cc           2754/udp  #APOLLO CC
+expresspay          2755/tcp  #Express Pay
+expresspay          2755/udp  #Express Pay
+simplement-tie      2756/tcp  #simplement-tie
+simplement-tie      2756/udp  #simplement-tie
+cnrp                2757/tcp  #CNRP
+cnrp                2757/udp  #CNRP
+apollo-status       2758/tcp  #APOLLO Status
+apollo-status       2758/udp  #APOLLO Status
+apollo-gms          2759/tcp  #APOLLO GMS
+apollo-gms          2759/udp  #APOLLO GMS
+sabams              2760/tcp  #Saba MS
+sabams              2760/udp  #Saba MS
+dicom-iscl          2761/tcp  #DICOM ISCL
+dicom-iscl          2761/udp  #DICOM ISCL
+dicom-tls           2762/tcp  #DICOM TLS
+dicom-tls           2762/udp  #DICOM TLS
+desktop-dna         2763/tcp  #Desktop DNA
+desktop-dna         2763/udp  #Desktop DNA
+data-insurance      2764/tcp  #Data Insurance
+data-insurance      2764/udp  #Data Insurance
+qip-audup           2765/tcp  #qip-audup
+qip-audup           2765/udp  #qip-audup
+compaq-scp          2766/tcp  #Compaq SCP
+compaq-scp          2766/udp  #Compaq SCP
+uadtc               2767/tcp  #UADTC
+uadtc               2767/udp  #UADTC
+uacs                2768/tcp  #UACS
+uacs                2768/udp  #UACS
+exce                2769/tcp  #eXcE
+exce                2769/udp  #eXcE
+veronica            2770/tcp  #Veronica
+veronica            2770/udp  #Veronica
+vergencecm          2771/tcp  #Vergence CM
+vergencecm          2771/udp  #Vergence CM
+auris               2772/tcp  #auris
+auris               2772/udp  #auris
+rbakcup1            2773/tcp  #RBackup Remote Backup
+rbakcup1            2773/udp  #RBackup Remote Backup
+rbakcup2            2774/tcp  #RBackup Remote Backup
+rbakcup2            2774/udp  #RBackup Remote Backup
+smpp                2775/tcp  #SMPP
+smpp                2775/udp  #SMPP
+ridgeway1           2776/tcp  #Ridgeway Systems & Software
+ridgeway1           2776/udp  #Ridgeway Systems & Software
+ridgeway2           2777/tcp  #Ridgeway Systems & Software
+ridgeway2           2777/udp  #Ridgeway Systems & Software
+gwen-sonya          2778/tcp  #Gwen-Sonya 
+gwen-sonya          2778/udp  #Gwen-Sonya 
+lbc-sync            2779/tcp  #LBC Sync
+lbc-sync            2779/udp  #LBC Sync
+lbc-control         2780/tcp  #LBC Control
+lbc-control         2780/udp  #LBC Control
+whosells            2781/tcp  #whosells
+whosells            2781/udp  #whosells
+everydayrc          2782/tcp  #everydayrc
+everydayrc          2782/udp  #everydayrc
+aises               2783/tcp  #AISES
+aises               2783/udp  #AISES
+www-dev             2784/tcp  #world wide web - development
+www-dev             2784/udp  #world wide web - development
+aic-np              2785/tcp  #aic-np
+aic-np              2785/udp  #aic-np
+aic-oncrpc          2786/tcp  #aic-oncrpc - Destiny MCD database
+aic-oncrpc          2786/udp  #aic-oncrpc - Destiny MCD database
+piccolo             2787/tcp  #piccolo - Cornerstone Software
+piccolo             2787/udp  #piccolo - Cornerstone Software
+fryeserv            2788/tcp  #NetWare Loadable Module - Seagate Software
+fryeserv            2788/udp  #NetWare Loadable Module - Seagate Software
+media-agent         2789/tcp  #Media Agent
+media-agent         2789/udp  #Media Agent
+plgproxy            2790/tcp  #PLG Proxy
+plgproxy            2790/udp  #PLG Proxy
+mtport-regist       2791/tcp  #MT Port Registrator
+mtport-regist       2791/udp  #MT Port Registrator
+f5-globalsite       2792/tcp  #f5-globalsite
+f5-globalsite       2792/udp  #f5-globalsite
+initlsmsad          2793/tcp  #initlsmsad
+initlsmsad          2793/udp  #initlsmsad
+aaftp               2794/tcp  #aaftp
+aaftp               2794/udp  #aaftp
+livestats           2795/tcp  #LiveStats
+livestats           2795/udp  #LiveStats
+ac-tech             2796/tcp  #ac-tech
+ac-tech             2796/udp  #ac-tech
+esp-encap           2797/tcp  #esp-encap
+esp-encap           2797/udp  #esp-encap
+tmesis-upshot       2798/tcp  #TMESIS-UPShot
+tmesis-upshot       2798/udp  #TMESIS-UPShot
+icon-discover       2799/tcp  #ICON Discover
+icon-discover       2799/udp  #ICON Discover
+acc-raid            2800/tcp  #ACC RAID
+acc-raid            2800/udp  #ACC RAID
+igcp                2801/tcp  #IGCP
+igcp                2801/udp  #IGCP
+veritas-tcp1        2802/tcp  #Veritas TCP1
+veritas-udp1        2802/udp  #Veritas UDP1
+btprjctrl           2803/tcp  #btprjctrl
+btprjctrl           2803/udp  #btprjctrl
+dvr-esm             2804/tcp  #March Networks Digital Video Recorders and Enterprise Service Manager products
+dvr-esm             2804/udp  #March Networks Digital Video Recorders and Enterprise Service Manager products
+wta-wsp-s           2805/tcp  #WTA WSP-S
+wta-wsp-s           2805/udp  #WTA WSP-S
+cspuni              2806/tcp  #cspuni
+cspuni              2806/udp  #cspuni
+cspmulti            2807/tcp  #cspmulti
+cspmulti            2807/udp  #cspmulti
+j-lan-p             2808/tcp  #J-LAN-P
+j-lan-p             2808/udp  #J-LAN-P
+corbaloc            2809/tcp  #CORBA LOC
+corbaloc            2809/udp  #CORBA LOC
+netsteward          2810/tcp  #Active Net Steward
+netsteward          2810/udp  #Active Net Steward
+gsiftp              2811/tcp  #GSI FTP
+gsiftp              2811/udp  #GSI FTP
+atmtcp              2812/tcp  #atmtcp
+atmtcp              2812/udp  #atmtcp
+llm-pass            2813/tcp  #llm-pass
+llm-pass            2813/udp  #llm-pass
+llm-csv             2814/tcp  #llm-csv
+llm-csv             2814/udp  #llm-csv
+lbc-measure         2815/tcp  #LBC Measurement
+lbc-measure         2815/udp  #LBC Measurement
+lbc-watchdog        2816/tcp  #LBC Watchdog
+lbc-watchdog        2816/udp  #LBC Watchdog
+nmsigport           2817/tcp  #NMSig Port
+nmsigport           2817/udp  #NMSig Port
+rmlnk               2818/tcp  #rmlnk
+rmlnk               2818/udp  #rmlnk
+fc-faultnotify      2819/tcp  #FC Fault Notification
+fc-faultnotify      2819/udp  #FC Fault Notification
+univision           2820/tcp  #UniVision
+univision           2820/udp  #UniVision
+vrts-at-port        2821/tcp  #VERITAS Authentication Service
+vrts-at-port        2821/udp  #VERITAS Authentication Service
+ka0wuc              2822/tcp  #ka0wuc
+ka0wuc              2822/udp  #ka0wuc
+cqg-netlan          2823/tcp  #CQG Net/LAN
+cqg-netlan          2823/udp  #CQG Net/LAN
+cqg-netlan-1        2824/tcp  #CQG Net/LAN 1
+cqg-netlan-1        2824/udp  #CQG Net/Lan 1 
+slc-systemlog       2826/tcp  #slc systemlog
+slc-systemlog       2826/udp  #slc systemlog
+slc-ctrlrloops      2827/tcp  #slc ctrlrloops
+slc-ctrlrloops      2827/udp  #slc ctrlrloops
+itm-lm              2828/tcp  #ITM License Manager 
+itm-lm              2828/udp  #ITM License Manager 
+silkp1              2829/tcp  #silkp1
+silkp1              2829/udp  #silkp1
+silkp2              2830/tcp  #silkp2
+silkp2              2830/udp  #silkp2
+silkp3              2831/tcp  #silkp3
+silkp3              2831/udp  #silkp3
+silkp4              2832/tcp  #silkp4
+silkp4              2832/udp  #silkp4
+glishd              2833/tcp  #glishd
+glishd              2833/udp  #glishd
+evtp                2834/tcp  #EVTP
+evtp                2834/udp  #EVTP
+evtp-data           2835/tcp  #EVTP-DATA
+evtp-data           2835/udp  #EVTP-DATA
+catalyst            2836/tcp  #catalyst
+catalyst            2836/udp  #catalyst
+repliweb            2837/tcp  #Repliweb
+repliweb            2837/udp  #Repliweb
+starbot             2838/tcp  #Starbot
+starbot             2838/udp  #Starbot
+nmsigport           2839/tcp  #NMSigPort
+nmsigport           2839/udp  #NMSigPort
+l3-exprt            2840/tcp  #l3-exprt
+l3-exprt            2840/udp  #l3-exprt
+l3-ranger           2841/tcp  #l3-ranger
+l3-ranger           2841/udp  #l3-ranger
+l3-hawk             2842/tcp  #l3-hawk
+l3-hawk             2842/udp  #l3-hawk
+pdnet               2843/tcp  #PDnet
+pdnet               2843/udp  #PDnet
+bpcp-poll           2844/tcp  #BPCP POLL
+bpcp-poll           2844/udp  #BPCP POLL
+bpcp-trap           2845/tcp  #BPCP TRAP
+bpcp-trap           2845/udp  #BPCP TRAP
+aimpp-hello         2846/tcp  #AIMPP Hello
+aimpp-hello         2846/udp  #AIMPP Hello
+aimpp-port-req      2847/tcp  #AIMPP Port Req
+aimpp-port-req      2847/udp  #AIMPP Port Req
+amt-blc-port        2848/tcp  #AMT-BLC-PORT
+amt-blc-port        2848/udp  #AMT-BLC-PORT
+fxp                 2849/tcp  #FXP
+fxp                 2849/udp  #FXP
+metaconsole         2850/tcp  #MetaConsole
+metaconsole         2850/udp  #MetaConsole
+webemshttp          2851/tcp  #webemshttp
+webemshttp          2851/udp  #webemshttp
+bears-01            2852/tcp  #bears-01
+bears-01            2852/udp  #bears-01
+ispipes             2853/tcp  #ISPipes
+ispipes             2853/udp  #ISPipes
+infomover           2854/tcp  #InfoMover
+infomover           2854/udp  #InfoMover
+cesdinv             2856/tcp  #cesdinv
+cesdinv             2856/udp  #cesdinv
+simctlp             2857/tcp  #SimCtIP
+simctlp             2857/udp  #SimCtIP
+ecnp                2858/tcp  #ECNP
+ecnp                2858/udp  #ECNP
+activememory        2859/tcp  #Active Memory
+activememory        2859/udp  #Active Memory
+dialpad-voice1      2860/tcp  #Dialpad Voice 1
+dialpad-voice1      2860/udp  #Dialpad Voice 1
+dialpad-voice2      2861/tcp  #Dialpad Voice 2
+dialpad-voice2      2861/udp  #Dialpad Voice 2
+ttg-protocol        2862/tcp  #TTG Protocol
+ttg-protocol        2862/udp  #TTG Protocol
+sonardata           2863/tcp  #Sonar Data
+sonardata           2863/udp  #Sonar Data
+astromed-main       2864/tcp  #main 5001 cmd
+astromed-main       2864/udp  #main 5001 cmd
+pit-vpn             2865/tcp  #pit-vpn
+pit-vpn             2865/udp  #pit-vpn
+iwlistener          2866/tcp  #iwlistener
+iwlistener          2866/udp  #iwlistener
+esps-portal         2867/tcp  #esps-portal
+esps-portal         2867/udp  #esps-portal
+npep-messaging      2868/tcp  #NPEP Messaging
+npep-messaging      2868/udp  #NPEP Messaging
+icslap              2869/tcp  #ICSLAP
+icslap              2869/udp  #ICSLAP
+daishi              2870/tcp  #daishi
+daishi              2870/udp  #daishi
+msi-selectplay      2871/tcp  #MSI Select Play
+msi-selectplay      2871/udp  #MSI Select Play
+radix               2872/tcp  #RADIX
+radix               2872/udp  #RADIX
+dxmessagebase1      2874/tcp  #dxmessagebase1
+dxmessagebase1      2874/udp  #dxmessagebase1
+dxmessagebase2      2875/tcp  #dxmessagebase2
+dxmessagebase2      2875/udp  #dxmessagebase2
+sps-tunnel          2876/tcp  #SPS Tunnel
+sps-tunnel          2876/udp  #SPS Tunnel
+bluelance           2877/tcp  #BLUELANCE
+bluelance           2877/udp  #BLUELANCE
+aap                 2878/tcp  #AAP
+aap                 2878/udp  #AAP
+ucentric-ds         2879/tcp  #ucentric-ds
+ucentric-ds         2879/udp  #ucentric-ds
+synapse             2880/tcp  #Synapse Transport
+synapse             2880/udp  #Synapse Transport
+ndsp                2881/tcp  #NDSP
+ndsp                2881/udp  #NDSP
+ndtp                2882/tcp  #NDTP
+ndtp                2882/udp  #NDTP
+ndnp                2883/tcp  #NDNP
+ndnp                2883/udp  #NDNP
+flashmsg            2884/tcp  #Flash Msg
+flashmsg            2884/udp  #Flash Msg
+topflow             2885/tcp  #TopFlow
+topflow             2885/udp  #TopFlow
+responselogic       2886/tcp  #RESPONSELOGIC
+responselogic       2886/udp  #RESPONSELOGIC
+aironetddp          2887/tcp  #aironet
+aironetddp          2887/udp  #aironet
+spcsdlobby          2888/tcp  #SPCSDLOBBY
+spcsdlobby          2888/udp  #SPCSDLOBBY
+rsom                2889/tcp  #RSOM
+rsom                2889/udp  #RSOM
+cspclmulti          2890/tcp  #CSPCLMULTI
+cspclmulti          2890/udp  #CSPCLMULTI
+cinegrfx-elmd       2891/tcp  #CINEGRFX-ELMD License Manager
+cinegrfx-elmd       2891/udp  #CINEGRFX-ELMD License Manager
+snifferdata         2892/tcp  #SNIFFERDATA
+snifferdata         2892/udp  #SNIFFERDATA
+vseconnector        2893/tcp  #VSECONNECTOR
+vseconnector        2893/udp  #VSECONNECTOR
+abacus-remote       2894/tcp  #ABACUS-REMOTE
+abacus-remote       2894/udp  #ABACUS-REMOTE
+natuslink           2895/tcp  #NATUS LINK
+natuslink           2895/udp  #NATUS LINK
+ecovisiong6-1       2896/tcp  #ECOVISIONG6-1
+ecovisiong6-1       2896/udp  #ECOVISIONG6-1
+citrix-rtmp         2897/tcp  #Citrix RTMP
+citrix-rtmp         2897/udp  #Citrix RTMP
+appliance-cfg       2898/tcp  #APPLIANCE-CFG
+appliance-cfg       2898/udp  #APPLIANCE-CFG
+powergemplus        2899/tcp  #POWERGEMPLUS
+powergemplus        2899/udp  #POWERGEMPLUS
+quicksuite          2900/tcp  #QUICKSUITE
+quicksuite          2900/udp  #QUICKSUITE
+allstorcns          2901/tcp  #ALLSTORCNS
+allstorcns          2901/udp  #ALLSTORCNS
+netaspi             2902/tcp  #NET ASPI
+netaspi             2902/udp  #NET ASPI
+suitcase            2903/tcp  #SUITCASE
+suitcase            2903/udp  #SUITCASE
+m2ua                2904/tcp  #M2UA
+m2ua                2904/udp  #M2UA
+m3ua                2905/tcp  #M3UA
+m3ua                2905/udp  #De-registered (2001 June 07)
+caller9             2906/tcp  #CALLER9
+caller9             2906/udp  #CALLER9
+webmethods-b2b      2907/tcp  #WEBMETHODS B2B
+webmethods-b2b      2907/udp  #WEBMETHODS B2B
+mao                 2908/tcp  #mao
+mao                 2908/udp  #mao
+funk-dialout        2909/tcp  #Funk Dialout
+funk-dialout        2909/udp  #Funk Dialout
+tdaccess            2910/tcp  #TDAccess
+tdaccess            2910/udp  #TDAccess
+blockade            2911/tcp  #Blockade
+blockade            2911/udp  #Blockade
+epicon              2912/tcp  #Epicon
+epicon              2912/udp  #Epicon
+boosterware         2913/tcp  #Booster Ware
+boosterware         2913/udp  #Booster Ware
+gamelobby           2914/tcp  #Game Lobby
+gamelobby           2914/udp  #Game Lobby
+tksocket            2915/tcp  #TK Socket
+tksocket            2915/udp  #TK Socket
+elvin_server        2916/tcp  #Elvin Server
+elvin_server        2916/udp  #Elvin Server
+elvin_client        2917/tcp  #Elvin Client
+elvin_client        2917/udp  #Elvin Client
+kastenchasepad      2918/tcp  #Kasten Chase Pad
+kastenchasepad      2918/udp  #Kasten Chase Pad
+roboer              2919/tcp  #roboER
+roboer              2919/udp  #roboER
+roboeda             2920/tcp  #roboEDA
+roboeda             2920/udp  #roboEDA
+cesdcdman           2921/tcp  #CESD Contents Delivery Management
+cesdcdman           2921/udp  #CESD Contents Delivery Management
+cesdcdtrn           2922/tcp  #CESD Contents Delivery Data Transfer
+cesdcdtrn           2922/udp  #CESD Contents Delivery Data Transfer
+wta-wsp-wtp-s       2923/tcp  #WTA-WSP-WTP-S
+wta-wsp-wtp-s       2923/udp  #WTA-WSP-WTP-S
+precise-vip         2924/tcp  #PRECISE-VIP
+precise-vip         2924/udp  #PRECISE-VIP
+mobile-file-dl      2926/tcp  #MOBILE-FILE-DL
+mobile-file-dl      2926/udp  #MOBILE-FILE-DL
+unimobilectrl       2927/tcp  #UNIMOBILECTRL
+unimobilectrl       2927/udp  #UNIMOBILECTRL
+redstone-cpss       2928/tcp  #REDSTONE-CPSS
+redstone-cpss       2928/udp  #REDSTONE-CPSS
+amx-webadmin        2929/tcp  #AMX-WEBADMIN
+amx-webadmin        2929/udp  #AMX-WEBADMIN
+amx-weblinx         2930/tcp  #AMX-WEBLINX
+amx-weblinx         2930/udp  #AMX-WEBLINX
+circle-x            2931/tcp  #Circle-X
+circle-x            2931/udp  #Circle-X
+incp                2932/tcp  #INCP
+incp                2932/udp  #INCP
+4-tieropmgw         2933/tcp  #4-TIER OPM GW 
+4-tieropmgw         2933/udp  #4-TIER OPM GW
+4-tieropmcli        2934/tcp  #4-TIER OPM CLI
+4-tieropmcli        2934/udp  #4-TIER OPM CLI
+qtp                 2935/tcp  #QTP
+qtp                 2935/udp  #QTP
+otpatch             2936/tcp  #OTPatch
+otpatch             2936/udp  #OTPatch
+pnaconsult-lm       2937/tcp  #PNACONSULT-LM
+pnaconsult-lm       2937/udp  #PNACONSULT-LM
+sm-pas-1            2938/tcp  #SM-PAS-1
+sm-pas-1            2938/udp  #SM-PAS-1
+sm-pas-2            2939/tcp  #SM-PAS-2
+sm-pas-2            2939/udp  #SM-PAS-2
+sm-pas-3            2940/tcp  #SM-PAS-3
+sm-pas-3            2940/udp  #SM-PAS-3
+sm-pas-4            2941/tcp  #SM-PAS-4
+sm-pas-4            2941/udp  #SM-PAS-4
+sm-pas-5            2942/tcp  #SM-PAS-5
+sm-pas-5            2942/udp  #SM-PAS-5
+ttnrepository       2943/tcp  #TTNRepository
+ttnrepository       2943/udp  #TTNRepository
+megaco-h248         2944/tcp  #Megaco H-248
+megaco-h248         2944/udp  #Megaco H-248
+h248-binary         2945/tcp  #H248 Binary
+h248-binary         2945/udp  #H248 Binary
+fjsvmpor            2946/tcp  #FJSVmpor
+fjsvmpor            2946/udp  #FJSVmpor
+gpsd                2947/tcp  #GPSD
+gpsd                2947/udp  #GPSD
+wap-push            2948/tcp  #WAP PUSH
+wap-push            2948/udp  #WAP PUSH
+wap-pushsecure      2949/tcp  #WAP PUSH SECURE
+wap-pushsecure      2949/udp  #WAP PUSH SECURE
+esip                2950/tcp  #ESIP
+esip                2950/udp  #ESIP
+ottp                2951/tcp  #OTTP
+ottp                2951/udp  #OTTP
+mpfwsas             2952/tcp  #MPFWSAS
+mpfwsas             2952/udp  #MPFWSAS
+ovalarmsrv          2953/tcp  #OVALARMSRV
+ovalarmsrv          2953/udp  #OVALARMSRV
+ovalarmsrv-cmd      2954/tcp  #OVALARMSRV-CMD
+ovalarmsrv-cmd      2954/udp  #OVALARMSRV-CMD
+csnotify            2955/tcp  #CSNOTIFY
+csnotify            2955/udp  #CSNOTIFY
+ovrimosdbman        2956/tcp  #OVRIMOSDBMAN
+ovrimosdbman        2956/udp  #OVRIMOSDBMAN
+jmact5              2957/tcp  #JAMCT5
+jmact5              2957/udp  #JAMCT5
+jmact6              2958/tcp  #JAMCT6
+jmact6              2958/udp  #JAMCT6
+rmopagt             2959/tcp  #RMOPAGT
+rmopagt             2959/udp  #RMOPAGT
+dfoxserver          2960/tcp  #DFOXSERVER
+dfoxserver          2960/udp  #DFOXSERVER
+boldsoft-lm         2961/tcp  #BOLDSOFT-LM
+boldsoft-lm         2961/udp  #BOLDSOFT-LM
+iph-policy-cli      2962/tcp  #IPH-POLICY-CLI
+iph-policy-cli      2962/udp  #IPH-POLICY-CLI
+iph-policy-adm      2963/tcp  #IPH-POLICY-ADM
+iph-policy-adm      2963/udp  #IPH-POLICY-ADM
+bullant-srap        2964/tcp  #BULLANT SRAP
+bullant-srap        2964/udp  #BULLANT SRAP
+bullant-rap         2965/tcp  #BULLANT RAP
+bullant-rap         2965/udp  #BULLANT RAP
+idp-infotrieve      2966/tcp  #IDP-INFOTRIEVE
+idp-infotrieve      2966/udp  #IDP-INFOTRIEVE
+ssc-agent           2967/tcp  #SSC-AGENT
+ssc-agent           2967/udp  #SSC-AGENT
+enpp                2968/tcp  #ENPP
+enpp                2968/udp  #ENPP
+essp                2969/tcp  #ESSP
+essp                2969/udp  #ESSP
+index-net           2970/tcp  #INDEX-NET
+index-net           2970/udp  #INDEX-NET
+netclip             2971/tcp  #NetClip clipboard daemon
+netclip             2971/udp  #NetClip clipboard daemon
+pmsm-webrctl        2972/tcp  #PMSM Webrctl
+pmsm-webrctl        2972/udp  #PMSM Webrctl
+svnetworks          2973/tcp  #SV Networks
+svnetworks          2973/udp  #SV Networks
+signal              2974/tcp  #Signal
+signal              2974/udp  #Signal
+fjmpcm              2975/tcp  #Fujitsu Configuration Management Service
+fjmpcm              2975/udp  #Fujitsu Configuration Management Service
+cns-srv-port        2976/tcp  #CNS Server Port
+cns-srv-port        2976/udp  #CNS Server Port
+ttc-etap-ns         2977/tcp  #TTCs Enterprise Test Access Protocol - NS
+ttc-etap-ns         2977/udp  #TTCs Enterprise Test Access Protocol - NS
+ttc-etap-ds         2978/tcp  #TTCs Enterprise Test Access Protocol - DS
+ttc-etap-ds         2978/udp  #TTCs Enterprise Test Access Protocol - DS
+h263-video          2979/tcp  #H.263 Video Streaming 
+h263-video          2979/udp  #H.263 Video Streaming 
+wimd                2980/tcp  #Instant Messaging Service
+wimd                2980/udp  #Instant Messaging Service
+mylxamport          2981/tcp  #MYLXAMPORT
+mylxamport          2981/udp  #MYLXAMPORT
+iwb-whiteboard      2982/tcp  #IWB-WHITEBOARD
+iwb-whiteboard      2982/udp  #IWB-WHITEBOARD
+netplan             2983/tcp  #NETPLAN
+netplan             2983/udp  #NETPLAN
+hpidsadmin          2984/tcp  #HPIDSADMIN
+hpidsadmin          2984/udp  #HPIDSADMIN
+hpidsagent          2985/tcp  #HPIDSAGENT
+hpidsagent          2985/udp  #HPIDSAGENT
+stonefalls          2986/tcp  #STONEFALLS
+stonefalls          2986/udp  #STONEFALLS
+identify            2987/tcp  #identify
+identify            2987/udp  #identify
+hippad              2988/tcp  #HIPPA Reporting Protocol
+hippad              2988/udp  #HIPPA Reporting Protocol
+zarkov              2989/tcp  #ZARKOV Intelligent Agent Communication
+zarkov              2989/udp  #ZARKOV Intelligent Agent Communication
+boscap              2990/tcp  #BOSCAP
+boscap              2990/udp  #BOSCAP
+wkstn-mon           2991/tcp  #WKSTN-MON
+wkstn-mon           2991/udp  #WKSTN-MON
+itb301              2992/tcp  #ITB301
+itb301              2992/udp  #ITB301
+veritas-vis1        2993/tcp  #VERITAS VIS1
+veritas-vis1        2993/udp  #VERITAS VIS1
+veritas-vis2        2994/tcp  #VERITAS VIS2
+veritas-vis2        2994/udp  #VERITAS VIS2
+idrs                2995/tcp  #IDRS
+idrs                2995/udp  #IDRS
+vsixml              2996/tcp  #vsixml
+vsixml              2996/udp  #vsixml
+rebol               2997/tcp  #REBOL
+rebol               2997/udp  #REBOL
+realsecure          2998/tcp  #Real Secure
+realsecure          2998/udp  #Real Secure
+remoteware-un       2999/tcp  #RemoteWare Unassigned
+remoteware-un       2999/udp  #RemoteWare Unassigned
+hbci                3000/tcp  #HBCI
+hbci                3000/udp  #HBCI
+remoteware-cl       3000/tcp  #RemoteWare Client
+remoteware-cl       3000/udp  #RemoteWare Client
+redwood-broker      3001/tcp  #Redwood Broker
+redwood-broker      3001/udp  #Redwood Broker
+exlm-agent          3002/tcp  #EXLM Agent
+exlm-agent          3002/udp  #EXLM Agent
+remoteware-srv      3002/tcp  #RemoteWare Server
+remoteware-srv      3002/udp  #RemoteWare Server
+cgms                3003/tcp  #CGMS
+cgms                3003/udp  #CGMS
+csoftragent         3004/tcp  #Csoft Agent
+csoftragent         3004/udp  #Csoft Agent
+geniuslm            3005/tcp  #Genius License Manager
+geniuslm            3005/udp  #Genius License Manager
+ii-admin            3006/tcp  #Instant Internet Admin
+ii-admin            3006/udp  #Instant Internet Admin
+lotusmtap           3007/tcp  #Lotus Mail Tracking Agent Protocol
+lotusmtap           3007/udp  #Lotus Mail Tracking Agent Protocol
+midnight-tech       3008/tcp  #Midnight Technologies
+midnight-tech       3008/udp  #Midnight Technologies
+pxc-ntfy            3009/tcp  #PXC-NTFY
+pxc-ntfy            3009/udp  #PXC-NTFY
+gw                  3010/tcp  #Telerate Workstation
+ping-pong           3010/udp  #Telerate Workstation
+trusted-web         3011/tcp  #Trusted Web
+trusted-web         3011/udp  #Trusted Web
+twsdss              3012/tcp  #Trusted Web Client
+twsdss              3012/udp  #Trusted Web Client
+gilatskysurfer      3013/tcp  #Gilat Sky Surfer
+gilatskysurfer      3013/udp  #Gilat Sky Surfer
+broker_service      3014/tcp  #Broker Service
+broker_service      3014/udp  #Broker Service
+nati-dstp           3015/tcp  #NATI DSTP
+nati-dstp           3015/udp  #NATI DSTP
+notify_srvr         3016/tcp  #Notify Server
+notify_srvr         3016/udp  #Notify Server
+event_listener      3017/tcp  #Event Listener
+event_listener      3017/udp  #Event Listener
+srvc_registry       3018/tcp  #Service Registry
+srvc_registry       3018/udp  #Service Registry
+resource_mgr        3019/tcp  #Resource Manager
+resource_mgr        3019/udp  #Resource Manager
+cifs                3020/tcp  #CIFS
+cifs                3020/udp  #CIFS
+agriserver          3021/tcp  #AGRI Server
+agriserver          3021/udp  #AGRI Server
+csregagent          3022/tcp  #CSREGAGENT
+csregagent          3022/udp  #CSREGAGENT
+magicnotes          3023/tcp  #magicnotes
+magicnotes          3023/udp  #magicnotes
+nds_sso             3024/tcp  #NDS_SSO
+nds_sso             3024/udp  #NDS_SSO
+arepa-raft          3025/tcp  #Arepa Raft 
+arepa-raft          3025/udp  #Arepa Raft 
+agri-gateway        3026/tcp  #AGRI Gateway
+agri-gateway        3026/udp  #AGRI Gateway
+arepa-cas           3030/tcp  #Arepa Cas
+arepa-cas           3030/udp  #Arepa Cas
+eppc                3031/tcp  #Remote AppleEvents/PPC Toolbox
+eppc                3031/udp  #Remote AppleEvents/PPC Toolbox
+redwood-chat        3032/tcp  #Redwood Chat
+redwood-chat        3032/udp  #Redwood Chat
+pdb                 3033/tcp  #PDB
+pdb                 3033/udp  #PDB
+osmosis-aeea        3034/tcp  #Osmosis / Helix (R) AEEA Port
+osmosis-aeea        3034/udp  #Osmosis / Helix (R) AEEA Port
+fjsv-gssagt         3035/tcp  #FJSV gssagt
+fjsv-gssagt         3035/udp  #FJSV gssagt
+hagel-dump          3036/tcp  #Hagel DUMP
+hagel-dump          3036/udp  #Hagel DUMP
+hp-san-mgmt         3037/tcp  #HP SAN Mgmt
+hp-san-mgmt         3037/udp  #HP SAN Mgmt
+santak-ups          3038/tcp  #Santak UPS
+santak-ups          3038/udp  #Santak UPS
+cogitate            3039/tcp  #Cogitate, Inc.
+cogitate            3039/udp  #Cogitate, Inc.
+tomato-springs      3040/tcp  #Tomato Springs
+tomato-springs      3040/udp  #Tomato Springs
+di-traceware        3041/tcp  #di-traceware
+di-traceware        3041/udp  #di-traceware
+journee             3042/tcp  #journee
+journee             3042/udp  #journee
+brp                 3043/tcp  #BRP
+brp                 3043/udp  #BRP
+epp                 3044/tcp  #EndPoint Protocol
+epp                 3044/udp  #EndPoint Protocol
+responsenet         3045/tcp  #ResponseNet
+responsenet         3045/udp  #ResponseNet
+di-ase              3046/tcp  #di-ase
+di-ase              3046/udp  #di-ase
+hlserver            3047/tcp  #Fast Security HL Server
+hlserver            3047/udp  #Fast Security HL Server
+pctrader            3048/tcp  #Sierra Net PC Trader
+pctrader            3048/udp  #Sierra Net PC Trader
+nsws                3049/tcp  #NSWS
+nsws                3049/udp  #NSWS
+gds_db              3050/tcp  #gds_db
+gds_db              3050/udp  #gds_db
+galaxy-server       3051/tcp  #Galaxy Server
+galaxy-server       3051/udp  #Galaxy Server
+apc-3052            3052/tcp  #APC 3052
+apc-3052            3052/udp  #APC 3052
+dsom-server         3053/tcp  #dsom-server
+dsom-server         3053/udp  #dsom-server
+amt-cnf-prot        3054/tcp  #AMT CNF PROT
+amt-cnf-prot        3054/udp  #AMT CNF PROT
+policyserver        3055/tcp  #Policy Server
+policyserver        3055/udp  #Policy Server
+cdl-server          3056/tcp  #CDL Server
+cdl-server          3056/udp  #CDL Server
+goahead-fldup       3057/tcp  #GoAhead FldUp
+goahead-fldup       3057/udp  #GoAhead FldUp
+videobeans          3058/tcp  #videobeans
+videobeans          3058/udp  #videobeans
+qsoft               3059/tcp  #qsoft
+qsoft               3059/udp  #qsoft
+interserver         3060/tcp  #interserver
+interserver         3060/udp  #interserver
+cautcpd             3061/tcp  #cautcpd
+cautcpd             3061/udp  #cautcpd
+ncacn-ip-tcp        3062/tcp  #ncacn-ip-tcp
+ncacn-ip-tcp        3062/udp  #ncacn-ip-tcp
+ncadg-ip-udp        3063/tcp  #ncadg-ip-udp
+ncadg-ip-udp        3063/udp  #ncadg-ip-udp
+rprt                3064/tcp  #Remote Port Redirector
+rprt                3064/udp  #Remote Port Redirector
+slinterbase         3065/tcp  #slinterbase
+slinterbase         3065/udp  #slinterbase
+netattachsdmp       3066/tcp  #NETATTACHSDMP
+netattachsdmp       3066/udp  #NETATTACHSDMP
+fjhpjp              3067/tcp  #FJHPJP
+fjhpjp              3067/udp  #FJHPJP
+ls3bcast            3068/tcp  #ls3 Broadcast
+ls3bcast            3068/udp  #ls3 Broadcast
+ls3                 3069/tcp  #ls3
+ls3                 3069/udp  #ls3
+mgxswitch           3070/tcp  #MGXSWITCH
+mgxswitch           3070/udp  #MGXSWITCH
+csd-mgmt-port       3071/tcp  #ContinuStor Manager Port
+csd-mgmt-port       3071/udp  #ContinuStor Manager Port
+csd-monitor         3072/tcp  #ContinuStor Monitor Port
+csd-monitor         3072/udp  #ContinuStor Monitor Port
+vcrp                3073/tcp  #Very simple chatroom prot
+vcrp                3073/udp  #Very simple chatroom prot
+xbox                3074/tcp  #Xbox game port
+xbox                3074/udp  #Xbox game port
+orbix-locator       3075/tcp  #Orbix 2000 Locator
+orbix-locator       3075/udp  #Orbix 2000 Locator
+orbix-config        3076/tcp  #Orbix 2000 Config
+orbix-config        3076/udp  #Orbix 2000 Config
+orbix-loc-ssl       3077/tcp  #Orbix 2000 Locator SSL
+orbix-loc-ssl       3077/udp  #Orbix 2000 Locator SSL
+orbix-cfg-ssl       3078/tcp  #Orbix 2000 Locator SSL
+orbix-cfg-ssl       3078/udp  #Orbix 2000 Locator SSL
+lv-frontpanel       3079/tcp  #LV Front Panel
+lv-frontpanel       3079/udp  #LV Front Panel
+stm_pproc           3080/tcp  #stm_pproc
+stm_pproc           3080/udp  #stm_pproc
+tl1-lv              3081/tcp  #TL1-LV
+tl1-lv              3081/udp  #TL1-LV
+tl1-raw             3082/tcp  #TL1-RAW
+tl1-raw             3082/udp  #TL1-RAW
+tl1-telnet          3083/tcp  #TL1-TELNET
+tl1-telnet          3083/udp  #TL1-TELNET
+itm-mccs            3084/tcp  #ITM-MCCS
+itm-mccs            3084/udp  #ITM-MCCS
+pcihreq             3085/tcp  #PCIHReq
+pcihreq             3085/udp  #PCIHReq
+jdl-dbkitchen       3086/tcp  #JDL-DBKitchen
+jdl-dbkitchen       3086/udp  #JDL-DBKitchen
+asoki-sma           3087/tcp  #Asoki SMA
+asoki-sma           3087/udp  #Asoki SMA
+xdtp                3088/tcp  #eXtensible Data Transfer Protocol
+xdtp                3088/udp  #eXtensible Data Transfer Protocol
+ptk-alink           3089/tcp  #ParaTek Agent Linking
+ptk-alink           3089/udp  #ParaTek Agent Linking
+rtss                3090/tcp  #Rappore Session Services
+rtss                3090/udp  #Rappore Session Services
+1ci-smcs            3091/tcp  #1Ci Server Management
+1ci-smcs            3091/udp  #1Ci Server Management
+njfss               3092/tcp  #Netware sync services
+njfss               3092/udp  #Netware sync services
+rapidmq-center      3093/tcp  #Jiiva RapidMQ Center
+rapidmq-center      3093/udp  #Jiiva RapidMQ Center
+rapidmq-reg         3094/tcp  #Jiiva RapidMQ Registry
+rapidmq-reg         3094/udp  #Jiiva RapidMQ Registry
+panasas             3095/tcp  #Panasas rendevous port
+panasas             3095/udp  #Panasas rendevous port
+ndl-aps             3096/tcp  #Active Print Server Port
+ndl-aps             3096/udp  #Active Print Server Port
+umm-port            3098/tcp  #Universal Message Manager
+umm-port            3098/udp  #Universal Message Manager
+chmd                3099/tcp  #CHIPSY Machine Daemon
+chmd                3099/udp  #CHIPSY Machine Daemon
+opcon-xps           3100/tcp  #OpCon/xps
+opcon-xps           3100/udp  #OpCon/xps
+hp-pxpib            3101/tcp  #HP PolicyXpert PIB Server
+hp-pxpib            3101/udp  #HP PolicyXpert PIB Server
+slslavemon          3102/tcp  #SoftlinK Slave Mon Port
+slslavemon          3102/udp  #SoftlinK Slave Mon Port
+autocuesmi          3103/tcp  #Autocue SMI Protocol
+autocuesmi          3103/udp  #Autocue SMI Protocol
+autocuelog          3104/tcp  #Autocue Logger Protocol
+autocuetime         3104/udp  #Autocue Time Service
+cardbox             3105/tcp  #Cardbox
+cardbox             3105/udp  #Cardbox
+cardbox-http        3106/tcp  #Cardbox HTTP
+cardbox-http        3106/udp  #Cardbox HTTP
+business            3107/tcp  #Business protocol
+business            3107/udp  #Business protocol
+geolocate           3108/tcp  #Geolocate protocol
+geolocate           3108/udp  #Geolocate protocol
+personnel           3109/tcp  #Personnel protocol
+personnel           3109/udp  #Personnel protocol
+sim-control         3110/tcp  #simulator control port
+sim-control         3110/udp  #simulator control port
+wsynch              3111/tcp  #Web Synchronous Services
+wsynch              3111/udp  #Web Synchronous Services
+ksysguard           3112/tcp  #KDE System Guard
+ksysguard           3112/udp  #KDE System Guard
+cs-auth-svr         3113/tcp  #CS-Authenticate Svr Port
+cs-auth-svr         3113/udp  #CS-Authenticate Svr Port
+ccmad               3114/tcp  #CCM AutoDiscover
+ccmad               3114/udp  #CCM AutoDiscover
+mctet-master        3115/tcp  #MCTET Master
+mctet-master        3115/udp  #MCTET Master
+mctet-gateway       3116/tcp  #MCTET Gateway
+mctet-gateway       3116/udp  #MCTET Gateway
+mctet-jserv         3117/tcp  #MCTET Jserv
+mctet-jserv         3117/udp  #MCTET Jserv
+pkagent             3118/tcp  #PKAgent
+pkagent             3118/udp  #PKAgent
+d2000kernel         3119/tcp  #D2000 Kernel Port
+d2000kernel         3119/udp  #D2000 Kernel Port
+d2000webserver      3120/tcp  #D2000 Webserver Port 
+d2000webserver      3120/udp  #D2000 Webserver Port
+vtr-emulator        3122/tcp  #MTI VTR Emulator port
+vtr-emulator        3122/udp  #MTI VTR Emulator port
+edix                3123/tcp  #EDI Translation Protocol
+edix                3123/udp  #EDI Translation Protocol
+beacon-port         3124/tcp  #Beacon Port
+beacon-port         3124/udp  #Beacon Port
+a13-an              3125/tcp  #A13-AN Interface
+a13-an              3125/udp  #A13-AN Interface
+ms-dotnetster       3126/tcp  #Microsoft .NETster Port
+ms-dotnetster       3126/udp  #Microsoft .NETster Port
+ctx-bridge          3127/tcp  #CTX Bridge Port
+ctx-bridge          3127/udp  #CTX Bridge Port
+ndl-aas             3128/tcp  #Active API Server Port
+ndl-aas             3128/udp  #Active API Server Port
+netport-id          3129/tcp  #NetPort Discovery Port
+netport-id          3129/udp  #NetPort Discovery Port
+icpv2               3130/tcp  #ICPv2
+icpv2               3130/udp  #ICPv2
+netbookmark         3131/tcp  #Net Book Mark
+netbookmark         3131/udp  #Net Book Mark
+ms-rule-engine      3132/tcp  #Microsoft Business Rule Engine Update Service
+ms-rule-engine      3132/udp  #Microsoft Business Rule Engine Update Service
+prism-deploy        3133/tcp  #Prism Deploy User Port
+prism-deploy        3133/udp  #Prism Deploy User Port
+ecp                 3134/tcp  #Extensible Code Protocol
+ecp                 3134/udp  #Extensible Code Protocol
+peerbook-port       3135/tcp  #PeerBook Port
+peerbook-port       3135/udp  #PeerBook Port
+grubd               3136/tcp  #Grub Server Port
+grubd               3136/udp  #Grub Server Port
+rtnt-1              3137/tcp  #rtnt-1 data packets
+rtnt-1              3137/udp  #rtnt-1 data packets
+rtnt-2              3138/tcp  #rtnt-2 data packets
+rtnt-2              3138/udp  #rtnt-2 data packets
+incognitorv         3139/tcp  #Incognito Rendez-Vous
+incognitorv         3139/udp  #Incognito Rendez-Vous
+ariliamulti         3140/tcp  #Arilia Multiplexor
+ariliamulti         3140/udp  #Arilia Multiplexor
+vmodem              3141/tcp  #VMODEM
+vmodem              3141/udp  #VMODEM
+rdc-wh-eos          3142/tcp  #RDC WH EOS
+rdc-wh-eos          3142/udp  #RDC WH EOS
+seaview             3143/tcp  #Sea View
+seaview             3143/udp  #Sea View
+tarantella          3144/tcp  #Tarantella
+tarantella          3144/udp  #Tarantella
+csi-lfap            3145/tcp  #CSI-LFAP
+csi-lfap            3145/udp  #CSI-LFAP
+bears-02            3146/tcp  #bears-02
+bears-02            3146/udp  #bears-02
+rfio                3147/tcp  #RFIO
+rfio                3147/udp  #RFIO
+nm-game-admin       3148/tcp  #NetMike Game Administrator
+nm-game-admin       3148/udp  #NetMike Game Administrator
+nm-game-server      3149/tcp  #NetMike Game Server
+nm-game-server      3149/udp  #NetMike Game Server
+nm-asses-admin      3150/tcp  #NetMike Assessor Administrator
+nm-asses-admin      3150/udp  #NetMike Assessor Administrator
+nm-assessor         3151/tcp  #NetMike Assessor
+nm-assessor         3151/udp  #NetMike Assessor
+feitianrockey       3152/tcp  #FeiTian Port
+feitianrockey       3152/udp  #FeiTian Port
+s8-client-port      3153/tcp  #S8Cargo Client Port
+s8-client-port      3153/udp  #S8Cargo Client Port
+ccmrmi              3154/tcp  #ON RMI Registry
+ccmrmi              3154/udp  #ON RMI Registry
+jpegmpeg            3155/tcp  #JpegMpeg Port
+jpegmpeg            3155/udp  #JpegMpeg Port
+indura              3156/tcp  #Indura Collector
+indura              3156/udp  #Indura Collector
+e3consultants       3157/tcp  #CCC Listener Port
+e3consultants       3157/udp  #CCC Listener Port
+stvp                3158/tcp  #SmashTV Protocol
+stvp                3158/udp  #SmashTV Protocol
+navegaweb-port      3159/tcp  #NavegaWeb Tarification
+navegaweb-port      3159/udp  #NavegaWeb Tarification
+tip-app-server      3160/tcp  #TIP Application Server
+tip-app-server      3160/udp  #TIP Application Server
+doc1lm              3161/tcp  #DOC1 License Manager
+doc1lm              3161/udp  #DOC1 License Manager
+sflm                3162/tcp  #SFLM
+sflm                3162/udp  #SFLM
+res-sap             3163/tcp  #RES-SAP
+res-sap             3163/udp  #RES-SAP
+imprs               3164/tcp  #IMPRS
+imprs               3164/udp  #IMPRS
+newgenpay           3165/tcp  #Newgenpay Engine Service
+newgenpay           3165/udp  #Newgenpay Engine Service
+qrepos              3166/tcp  #Quest Repository
+qrepos              3166/udp  #Quest Repository
+poweroncontact      3167/tcp  #poweroncontact
+poweroncontact      3167/udp  #poweroncontact
+poweronnud          3168/tcp  #poweronnud
+poweronnud          3168/udp  #poweronnud
+serverview-as       3169/tcp  #SERVERVIEW-AS
+serverview-as       3169/udp  #SERVERVIEW-AS
+serverview-asn      3170/tcp  #SERVERVIEW-ASN
+serverview-asn      3170/udp  #SERVERVIEW-ASN
+serverview-gf       3171/tcp  #SERVERVIEW-GF
+serverview-gf       3171/udp  #SERVERVIEW-GF
+serverview-rm       3172/tcp  #SERVERVIEW-RM
+serverview-rm       3172/udp  #SERVERVIEW-RM
+serverview-icc      3173/tcp  #SERVERVIEW-ICC
+serverview-icc      3173/udp  #SERVERVIEW-ICC
+armi-server         3174/tcp  #ARMI Server
+armi-server         3174/udp  #ARMI Server
+t1-e1-over-ip       3175/tcp  #T1_E1_Over_IP
+t1-e1-over-ip       3175/udp  #T1_E1_Over_IP
+ars-master          3176/tcp  #ARS Master
+ars-master          3176/udp  #ARS Master
+phonex-port         3177/tcp  #Phonex Protocol
+phonex-port         3177/udp  #Phonex Protocol
+radclientport       3178/tcp  #Radiance UltraEdge Port
+radclientport       3178/udp  #Radiance UltraEdge Port
+h2gf-w-2m           3179/tcp  #H2GF W.2m Handover prot.
+h2gf-w-2m           3179/udp  #H2GF W.2m Handover prot.
+mc-brk-srv          3180/tcp  #Millicent Broker Server
+mc-brk-srv          3180/udp  #Millicent Broker Server
+bmcpatrolagent      3181/tcp  #BMC Patrol Agent
+bmcpatrolagent      3181/udp  #BMC Patrol Agent
+bmcpatrolrnvu       3182/tcp  #BMC Patrol Rendezvous
+bmcpatrolrnvu       3182/udp  #BMC Patrol Rendezvous
+cops-tls            3183/tcp  #COPS/TLS
+cops-tls            3183/udp  #COPS/TLS
+apogeex-port        3184/tcp  #ApogeeX Port
+apogeex-port        3184/udp  #ApogeeX Port
+smpppd              3185/tcp  #SuSE Meta PPPD
+smpppd              3185/udp  #SuSE Meta PPPD
+iiw-port            3186/tcp  #IIW Monitor User Port
+iiw-port            3186/udp  #IIW Monitor User Port
+odi-port            3187/tcp  #Open Design Listen Port
+odi-port            3187/udp  #Open Design Listen Port
+brcm-comm-port      3188/tcp  #Broadcom Port
+brcm-comm-port      3188/udp  #Broadcom Port
+pcle-infex          3189/tcp  #Pinnacle Sys InfEx Port
+pcle-infex          3189/udp  #Pinnacle Sys InfEx Port
+csvr-proxy          3190/tcp  #ConServR Proxy
+csvr-proxy          3190/udp  #ConServR Proxy
+csvr-sslproxy       3191/tcp  #ConServR SSL Proxy
+csvr-sslproxy       3191/udp  #ConServR SSL Proxy
+firemonrcc          3192/tcp  #FireMon Revision Control
+firemonrcc          3192/udp  #FireMon Revision Control
+spandataport        3193/tcp  #SpanDataPort
+spandataport        3193/udp  #SpanDataPort
+magbind             3194/tcp  #Rockstorm MAG protocol
+magbind             3194/udp  #Rockstorm MAG protocol
+ncu-1               3195/tcp  #Network Control Unit
+ncu-1               3195/udp  #Network Control Unit
+ncu-2               3196/tcp  #Network Control Unit
+ncu-2               3196/udp  #Network Control Unit
+embrace-dp-s        3197/tcp  #Embrace Device Protocol Server
+embrace-dp-s        3197/udp  #Embrace Device Protocol Server
+embrace-dp-c        3198/tcp  #Embrace Device Protocol Client
+embrace-dp-c        3198/udp  #Embrace Device Protocol Client
+dmod-workspace      3199/tcp  #DMOD WorkSpace
+dmod-workspace      3199/udp  #DMOD WorkSpace
+tick-port           3200/tcp  #Press-sense Tick Port
+tick-port           3200/udp  #Press-sense Tick Port
+cpq-tasksmart       3201/tcp  #CPQ-TaskSmart
+cpq-tasksmart       3201/udp  #CPQ-TaskSmart
+intraintra          3202/tcp  #IntraIntra
+intraintra          3202/udp  #IntraIntra
+netwatcher-mon      3203/tcp  #Network Watcher Monitor
+netwatcher-mon      3203/udp  #Network Watcher Monitor
+netwatcher-db       3204/tcp  #Network Watcher DB Access
+netwatcher-db       3204/udp  #Network Watcher DB Access
+isns                3205/tcp  #iSNS Server Port
+isns                3205/udp  #iSNS Server Port
+ironmail            3206/tcp  #IronMail POP Proxy
+ironmail            3206/udp  #IronMail POP Proxy
+vx-auth-port        3207/tcp  #Veritas Authentication Port
+vx-auth-port        3207/udp  #Veritas Authentication Port
+pfu-prcallback      3208/tcp  #PFU PR Callback
+pfu-prcallback      3208/udp  #PFU PR Callback
+netwkpathengine     3209/tcp  #HP OpenView Network Path Engine Server
+netwkpathengine     3209/udp  #HP OpenView Network Path Engine Server
+flamenco-proxy      3210/tcp  #Flamenco Networks Proxy
+flamenco-proxy      3210/udp  #Flamenco Networks Proxy
+avsecuremgmt        3211/tcp  #Avocent Secure Management
+avsecuremgmt        3211/udp  #Avocent Secure Management
+surveyinst          3212/tcp  #Survey Instrument
+surveyinst          3212/udp  #Survey Instrument
+neon24x7            3213/tcp  #NEON 24X7 Mission Control
+neon24x7            3213/udp  #NEON 24X7 Mission Control
+jmq-daemon-1        3214/tcp  #JMQ Daemon Port 1
+jmq-daemon-1        3214/udp  #JMQ Daemon Port 1
+jmq-daemon-2        3215/tcp  #JMQ Daemon Port 2
+jmq-daemon-2        3215/udp  #JMQ Daemon Port 2
+ferrari-foam        3216/tcp  #Ferrari electronic FOAM
+ferrari-foam        3216/udp  #Ferrari electronic FOAM
+unite               3217/tcp  #Unified IP & Telecomm Env
+unite               3217/udp  #Unified IP & Telecomm Env
+smartpackets        3218/tcp  #EMC SmartPackets
+smartpackets        3218/udp  #EMC SmartPackets
+wms-messenger       3219/tcp  #WMS Messenger
+wms-messenger       3219/udp  #WMS Messenger
+xnm-ssl             3220/tcp  #XML NM over SSL
+xnm-ssl             3220/udp  #XML NM over SSL
+xnm-clear-text      3221/tcp  #XML NM over TCP
+xnm-clear-text      3221/udp  #XML NM over TCP
+glbp                3222/tcp  #Gateway Load Balancing Pr
+glbp                3222/udp  #Gateway Load Balancing Pr
+digivote            3223/tcp  #DIGIVOTE (R) Vote-Server
+digivote            3223/udp  #DIGIVOTE (R) Vote-Server
+aes-discovery       3224/tcp  #AES Discovery Port
+aes-discovery       3224/udp  #AES Discovery Port
+fcip-port           3225/tcp  #FCIP
+fcip-port           3225/udp  #FCIP
+isi-irp             3226/tcp  #ISI Industry Software IRP
+isi-irp             3226/udp  #ISI Industry Software IRP
+dwnmshttp           3227/tcp  #DiamondWave NMS Server
+dwnmshttp           3227/udp  #DiamondWave NMS Server
+dwmsgserver         3228/tcp  #DiamondWave MSG Server
+dwmsgserver         3228/udp  #DiamondWave MSG Server
+global-cd-port      3229/tcp  #Global CD Port
+global-cd-port      3229/udp  #Global CD Port
+sftdst-port         3230/tcp  #Software Distributor Port
+sftdst-port         3230/udp  #Software Distributor Port
+dsnl                3231/tcp  #Delta Solutions Direct
+dsnl                3231/udp  #Delta Solutions Direct
+mdtp                3232/tcp  #MDT port
+mdtp                3232/udp  #MDT port
+whisker             3233/tcp  #WhiskerControl main port
+whisker             3233/udp  #WhiskerControl main port
+alchemy             3234/tcp  #Alchemy Server 
+alchemy             3234/udp  #Alchemy Server
+mdap-port           3235/tcp  #MDAP port
+mdap-port           3235/udp  #MDAP Port
+apparenet-ts        3236/tcp  #appareNet Test Server
+apparenet-ts        3236/udp  #appareNet Test Server
+apparenet-tps       3237/tcp  #appareNet Test Packet Sequencer
+apparenet-tps       3237/udp  #appareNet Test Packet Sequencer
+apparenet-as        3238/tcp  #appareNet Analysis Server
+apparenet-as        3238/udp  #appareNet Analysis Server
+apparenet-ui        3239/tcp  #appareNet User Interface
+apparenet-ui        3239/udp  #appareNet User Interface
+triomotion          3240/tcp  #Trio Motion Control Port
+triomotion          3240/udp  #Trio Motion Control Port
+sysorb              3241/tcp  #SysOrb Monitoring Server
+sysorb              3241/udp  #SysOrb Monitoring Server
+sdp-id-port         3242/tcp  #Session Description ID
+sdp-id-port         3242/udp  #Session Description ID
+timelot             3243/tcp  #Timelot Port
+timelot             3243/udp  #Timelot Port
+onesaf              3244/tcp  #OneSAF
+onesaf              3244/udp  #OneSAF
+vieo-fe             3245/tcp  #VIEO Fabric Executive
+vieo-fe             3245/udp  #VIEO Fabric Executive
+dvt-system          3246/tcp  #DVT SYSTEM PORT
+dvt-system          3246/udp  #DVT SYSTEM PORT
+dvt-data            3247/tcp  #DVT DATA LINK
+dvt-data            3247/udp  #DVT DATA LINK
+procos-lm           3248/tcp  #PROCOS LM
+procos-lm           3248/udp  #PROCOS LM
+ssp                 3249/tcp  #State Sync Protocol
+ssp                 3249/udp  #State Sync Protocol
+hicp                3250/tcp  #HMS hicp port
+hicp                3250/udp  #HMS hicp port
+sysscanner          3251/tcp  #Sys Scanner
+sysscanner          3251/udp  #Sys Scanner
+dhe                 3252/tcp  #DHE port
+dhe                 3252/udp  #DHE port
+pda-data            3253/tcp  #PDA Data
+pda-data            3253/udp  #PDA Data
+pda-sys             3254/tcp  #PDA System
+pda-sys             3254/udp  #PDA System
+semaphore           3255/tcp  #Semaphore Connection Port
+semaphore           3255/udp  #Semaphore Connection Port
+cpqrpm-agent        3256/tcp  #Compaq RPM Agent Port
+cpqrpm-agent        3256/udp  #Compaq RPM Agent Port
+cpqrpm-server       3257/tcp  #Compaq RPM Server Port
+cpqrpm-server       3257/udp  #Compaq RPM Server Port
+ivecon-port         3258/tcp  #Ivecon Server Port
+ivecon-port         3258/udp  #Ivecon Server Port
+epncdp2             3259/tcp  #Epson Network Common Devi
+epncdp2             3259/udp  #Epson Network Common Devi
+iscsi-target        3260/tcp  #iSCSI port
+iscsi-target        3260/udp  #iSCSI port
+winshadow           3261/tcp  #winShadow
+winshadow           3261/udp  #winShadow
+necp                3262/tcp  #NECP
+necp                3262/udp  #NECP
+ecolor-imager       3263/tcp  #E-Color Enterprise Imager
+ecolor-imager       3263/udp  #E-Color Enterprise Imager
+ccmail              3264/tcp  #cc:mail/lotus
+ccmail              3264/udp  #cc:mail/lotus
+altav-tunnel        3265/tcp  #Altav Tunnel
+altav-tunnel        3265/udp  #Altav Tunnel
+ns-cfg-server       3266/tcp  #NS CFG Server
+ns-cfg-server       3266/udp  #NS CFG Server
+ibm-dial-out        3267/tcp  #IBM Dial Out
+ibm-dial-out        3267/udp  #IBM Dial Out
+msft-gc             3268/tcp  #Microsoft Global Catalog
+msft-gc             3268/udp  #Microsoft Global Catalog
+msft-gc-ssl         3269/tcp  #Microsoft Global Catalog with LDAP/SSL
+msft-gc-ssl         3269/udp  #Microsoft Global Catalog with LDAP/SSL
+verismart           3270/tcp  #Verismart
+verismart           3270/udp  #Verismart
+csoft-prev          3271/tcp  #CSoft Prev Port
+csoft-prev          3271/udp  #CSoft Prev Port
+user-manager        3272/tcp  #Fujitsu User Manager
+user-manager        3272/udp  #Fujitsu User Manager
+sxmp                3273/tcp  #Simple Extensible Multiplexed Protocol
+sxmp                3273/udp  #Simple Extensible Multiplexed Protocol
+ordinox-server      3274/tcp  #Ordinox Server
+ordinox-server      3274/udp  #Ordinox Server
+samd                3275/tcp  #SAMD
+samd                3275/udp  #SAMD
+maxim-asics         3276/tcp  #Maxim ASICs
+maxim-asics         3276/udp  #Maxim ASICs
+awg-proxy           3277/tcp  #AWG Proxy
+awg-proxy           3277/udp  #AWG Proxy
+lkcmserver          3278/tcp  #LKCM Server
+lkcmserver          3278/udp  #LKCM Server
+admind              3279/tcp  #admind
+admind              3279/udp  #admind
+vs-server           3280/tcp  #VS Server
+vs-server           3280/udp  #VS Server
+sysopt              3281/tcp  #SYSOPT
+sysopt              3281/udp  #SYSOPT
+datusorb            3282/tcp  #Datusorb
+datusorb            3282/udp  #Datusorb
+net-assistant       3283/tcp  #Net Assistant
+net-assistant       3283/udp  #Net Assistant
+4talk               3284/tcp  #4Talk
+4talk               3284/udp  #4Talk
+plato               3285/tcp  #Plato
+plato               3285/udp  #Plato
+e-net               3286/tcp  #E-Net
+e-net               3286/udp  #E-Net
+directvdata         3287/tcp  #DIRECTVDATA
+directvdata         3287/udp  #DIRECTVDATA
+cops                3288/tcp  #COPS
+cops                3288/udp  #COPS
+enpc                3289/tcp  #ENPC
+enpc                3289/udp  #ENPC
+caps-lm             3290/tcp  #CAPS LOGISTICS TOOLKIT - LM
+caps-lm             3290/udp  #CAPS LOGISTICS TOOLKIT - LM
+sah-lm              3291/tcp  #S A Holditch & Associates - LM
+sah-lm              3291/udp  #S A Holditch & Associates - LM
+cart-o-rama         3292/tcp  #Cart O Rama
+cart-o-rama         3292/udp  #Cart O Rama
+fg-fps              3293/tcp  #fg-fps
+fg-fps              3293/udp  #fg-fps
+fg-gip              3294/tcp  #fg-gip
+fg-gip              3294/udp  #fg-gip
+dyniplookup         3295/tcp  #Dynamic IP Lookup
+dyniplookup         3295/udp  #Dynamic IP Lookup
+rib-slm             3296/tcp  #Rib License Manager
+rib-slm             3296/udp  #Rib License Manager
+cytel-lm            3297/tcp  #Cytel License Manager
+cytel-lm            3297/udp  #Cytel License Manager
+deskview            3298/tcp  #DeskView
+deskview            3298/udp  #DeskView
+pdrncs              3299/tcp  #pdrncs
+pdrncs              3299/udp  #pdrncs
+mcs-fastmail        3302/tcp  #MCS Fastmail
+mcs-fastmail        3302/udp  #MCS Fastmail
+opsession-clnt      3303/tcp  #OP Session Client
+opsession-clnt      3303/udp  #OP Session Client
+opsession-srvr      3304/tcp  #OP Session Server
+opsession-srvr      3304/udp  #OP Session Server
+odette-ftp          3305/tcp  #ODETTE-FTP
+odette-ftp          3305/udp  #ODETTE-FTP
+mysql               3306/tcp  #MySQL
+mysql               3306/udp  #MySQL
+opsession-prxy      3307/tcp  #OP Session Proxy
+opsession-prxy      3307/udp  #OP Session Proxy
+tns-server          3308/tcp  #TNS Server
+tns-server          3308/udp  #TNS Server
+tns-adv             3309/tcp  #TNS ADV
+tns-adv             3309/udp  #TNS ADV
+dyna-access         3310/tcp  #Dyna Access
+dyna-access         3310/udp  #Dyna Access
+mcns-tel-ret        3311/tcp  #MCNS Tel Ret
+mcns-tel-ret        3311/udp  #MCNS Tel Ret
+appman-server       3312/tcp  #Application Management Server
+appman-server       3312/udp  #Application Management Server
+uorb                3313/tcp  #Unify Object Broker
+uorb                3313/udp  #Unify Object Broker
+uohost              3314/tcp  #Unify Object Host
+uohost              3314/udp  #Unify Object Host
+cdid                3315/tcp  #CDID
+cdid                3315/udp  #CDID
+aicc-cmi            3316/tcp  #AICC/CMI
+aicc-cmi            3316/udp  #AICC/CMI
+vsaiport            3317/tcp  #VSAI PORT
+vsaiport            3317/udp  #VSAI PORT
+ssrip               3318/tcp  #Swith to Swith Routing Information Protocol
+ssrip               3318/udp  #Swith to Swith Routing Information Protocol
+sdt-lmd             3319/tcp  #SDT License Manager
+sdt-lmd             3319/udp  #SDT License Manager
+officelink2000      3320/tcp  #Office Link 2000
+officelink2000      3320/udp  #Office Link 2000
+vnsstr              3321/tcp  #VNSSTR
+vnsstr              3321/udp  #VNSSTR
+sftu                3326/tcp  #SFTU
+sftu                3326/udp  #SFTU
+bbars               3327/tcp  #BBARS
+bbars               3327/udp  #BBARS
+egptlm              3328/tcp  #Eaglepoint License Manager
+egptlm              3328/udp  #Eaglepoint License Manager
+hp-device-disc      3329/tcp  #HP Device Disc
+hp-device-disc      3329/udp  #HP Device Disc
+mcs-calypsoicf      3330/tcp  #MCS Calypso ICF
+mcs-calypsoicf      3330/udp  #MCS Calypso ICF
+mcs-messaging       3331/tcp  #MCS Messaging
+mcs-messaging       3331/udp  #MCS Messaging
+mcs-mailsvr         3332/tcp  #MCS Mail Server
+mcs-mailsvr         3332/udp  #MCS Mail Server
+dec-notes           3333/tcp  #DEC Notes
+dec-notes           3333/udp  #DEC Notes
+directv-web         3334/tcp  #Direct TV Webcasting
+directv-web         3334/udp  #Direct TV Webcasting
+directv-soft        3335/tcp  #Direct TV Software Updates
+directv-soft        3335/udp  #Direct TV Software Updates
+directv-tick        3336/tcp  #Direct TV Tickers
+directv-tick        3336/udp  #Direct TV Tickers
+directv-catlg       3337/tcp  #Direct TV Data Catalog
+directv-catlg       3337/udp  #Direct TV Data Catalog
+anet-b              3338/tcp  #OMF data b
+anet-b              3338/udp  #OMF data b
+anet-l              3339/tcp  #OMF data l
+anet-l              3339/udp  #OMF data l
+anet-m              3340/tcp  #OMF data m
+anet-m              3340/udp  #OMF data m
+anet-h              3341/tcp  #OMF data h
+anet-h              3341/udp  #OMF data h
+webtie              3342/tcp  #WebTIE
+webtie              3342/udp  #WebTIE
+ms-cluster-net      3343/tcp  #MS Cluster Net
+ms-cluster-net      3343/udp  #MS Cluster Net
+bnt-manager         3344/tcp  #BNT Manager
+bnt-manager         3344/udp  #BNT Manager
+influence           3345/tcp  #Influence
+influence           3345/udp  #Influence
+trnsprntproxy       3346/tcp  #Trnsprnt Proxy
+trnsprntproxy       3346/udp  #Trnsprnt Proxy
+phoenix-rpc         3347/tcp  #Phoenix RPC
+phoenix-rpc         3347/udp  #Phoenix RPC
+pangolin-laser      3348/tcp  #Pangolin Laser
+pangolin-laser      3348/udp  #Pangolin Laser
+chevinservices      3349/tcp  #Chevin Services
+chevinservices      3349/udp  #Chevin Services
+findviatv           3350/tcp  #FINDVIATV
+findviatv           3350/udp  #FINDVIATV
+btrieve             3351/tcp  #Btrieve port
+btrieve             3351/udp  #Btrieve port
+ssql                3352/tcp  #Scalable SQL
+ssql                3352/udp  #Scalable SQL
+fatpipe             3353/tcp  #FATPIPE
+fatpipe             3353/udp  #FATPIPE
+suitjd              3354/tcp  #SUITJD
+suitjd              3354/udp  #SUITJD
+ordinox-dbase       3355/tcp  #Ordinox Dbase
+ordinox-dbase       3355/udp  #Ordinox Dbase
+upnotifyps          3356/tcp  #UPNOTIFYPS
+upnotifyps          3356/udp  #UPNOTIFYPS
+adtech-test         3357/tcp  #Adtech Test IP
+adtech-test         3357/udp  #Adtech Test IP
+mpsysrmsvr          3358/tcp  #Mp Sys Rmsvr
+mpsysrmsvr          3358/udp  #Mp Sys Rmsvr
+wg-netforce         3359/tcp  #WG NetForce
+wg-netforce         3359/udp  #WG NetForce
+kv-server           3360/tcp  #KV Server
+kv-server           3360/udp  #KV Server
+kv-agent            3361/tcp  #KV Agent 
+kv-agent            3361/udp  #KV Agent
+dj-ilm              3362/tcp  #DJ ILM
+dj-ilm              3362/udp  #DJ ILM
+nati-vi-server      3363/tcp  #NATI Vi Server
+nati-vi-server      3363/udp  #NATI Vi Server
+creativeserver      3364/tcp  #Creative Server
+creativeserver      3364/udp  #Creative Server
+contentserver       3365/tcp  #Content Server
+contentserver       3365/udp  #Content Server
+creativepartnr      3366/tcp  #Creative Partner
+creativepartnr      3366/udp  #Creative Partner
+tip2                3372/tcp  #TIP 2
+tip2                3372/udp  #TIP 2
+lavenir-lm          3373/tcp  #Lavenir License Manager
+lavenir-lm          3373/udp  #Lavenir License Manager
+cluster-disc        3374/tcp  #Cluster Disc
+cluster-disc        3374/udp  #Cluster Disc
+vsnm-agent          3375/tcp  #VSNM Agent
+vsnm-agent          3375/udp  #VSNM Agent
+cdbroker            3376/tcp  #CD Broker
+cdbroker            3376/udp  #CD Broker
+cogsys-lm           3377/tcp  #Cogsys Network License Manager
+cogsys-lm           3377/udp  #Cogsys Network License Manager
+wsicopy             3378/tcp  #WSICOPY
+wsicopy             3378/udp  #WSICOPY
+socorfs             3379/tcp  #SOCORFS
+socorfs             3379/udp  #SOCORFS
+sns-channels        3380/tcp  #SNS Channels
+sns-channels        3380/udp  #SNS Channels
+geneous             3381/tcp  #Geneous
+geneous             3381/udp  #Geneous
+fujitsu-neat        3382/tcp  #Fujitsu Network Enhanced Antitheft function
+fujitsu-neat        3382/udp  #Fujitsu Network Enhanced Antitheft function
+esp-lm              3383/tcp  #Enterprise Software Products License Manager
+esp-lm              3383/udp  #Enterprise Software Products License Manager
+hp-clic             3384/tcp  #Cluster Management Services
+hp-clic             3384/udp  #Hardware Management
+qnxnetman           3385/tcp  #qnxnetman
+qnxnetman           3385/udp  #qnxnetman
+gprs-data           3386/tcp  #GPRS Data
+gprs-sig            3386/udp  #GPRS SIG
+backroomnet         3387/tcp  #Back Room Net
+backroomnet         3387/udp  #Back Room Net
+cbserver            3388/tcp  #CB Server
+cbserver            3388/udp  #CB Server
+ms-wbt-server       3389/tcp  #MS WBT Server
+ms-wbt-server       3389/udp  #MS WBT Server
+dsc                 3390/tcp  #Distributed Service Coordinator
+dsc                 3390/udp  #Distributed Service Coordinator
+savant              3391/tcp  #SAVANT
+savant              3391/udp  #SAVANT
+efi-lm              3392/tcp  #EFI License Management
+efi-lm              3392/udp  #EFI License Management
+d2k-tapestry1       3393/tcp  #D2K Tapestry Client to Server
+d2k-tapestry1       3393/udp  #D2K Tapestry Client to Server
+d2k-tapestry2       3394/tcp  #D2K Tapestry Server to Server
+d2k-tapestry2       3394/udp  #D2K Tapestry Server to Server
+dyna-lm             3395/tcp  #Dyna License Manager (Elam)
+dyna-lm             3395/udp  #Dyna License Manager (Elam)
+printer_agent       3396/tcp  #Printer Agent
+printer_agent       3396/udp  #Printer Agent
+cloanto-lm          3397/tcp  #Cloanto License Manager
+cloanto-lm          3397/udp  #Cloanto License Manager 
+mercantile          3398/tcp  #Mercantile
+mercantile          3398/udp  #Mercantile
+csms                3399/tcp  #CSMS
+csms                3399/udp  #CSMS
+csms2               3400/tcp  #CSMS2
+csms2               3400/udp  #CSMS2
+filecast            3401/tcp  #filecast
+filecast            3401/udp  #filecast
+fxaengine-net       3402/tcp  #FXa Engine Network Port
+fxaengine-net       3402/udp  #FXa Engine Network Port
+copysnap            3403/tcp  #CopySnap Server Port
+copysnap            3403/udp  #CopySnap Server Port
+nokia-ann-ch1       3405/tcp  #Nokia Announcement ch 1
+nokia-ann-ch1       3405/udp  #Nokia Announcement ch 1
+nokia-ann-ch2       3406/tcp  #Nokia Announcement ch 2
+nokia-ann-ch2       3406/udp  #Nokia Announcement ch 2
+ldap-admin          3407/tcp  #LDAP admin server port
+ldap-admin          3407/udp  #LDAP admin server port
+issapi              3408/tcp  #POWERpack API Port
+issapi              3408/udp  #POWERpack API Port
+networklens         3409/tcp  #NetworkLens Event Port
+networklens         3409/udp  #NetworkLens Event Port
+networklenss        3410/tcp  #NetworkLens SSL Event
+networklenss        3410/udp  #NetworkLens SSL Event
+biolink-auth        3411/tcp  #BioLink Authenteon server
+biolink-auth        3411/udp  #BioLink Authenteon server
+xmlblaster          3412/tcp  #xmlBlaster
+xmlblaster          3412/udp  #xmlBlaster
+svnet               3413/tcp  #SpecView Networking
+svnet               3413/udp  #SpecView Networking
+wip-port            3414/tcp  #BroadCloud WIP Port
+wip-port            3414/udp  #BroadCloud WIP Port
+bcinameservice      3415/tcp  #BCI Name Service
+bcinameservice      3415/udp  #BCI Name Service
+commandport         3416/tcp  #AirMobile IS Command Port
+commandport         3416/udp  #AirMobile IS Command Port
+csvr                3417/tcp  #ConServR file translation
+csvr                3417/udp  #ConServR file translation
+rnmap               3418/tcp  #Remote nmap
+rnmap               3418/udp  #Remote nmap
+softaudit           3419/tcp  #Isogon SoftAudit
+softaudit           3419/udp  #ISogon SoftAudit
+ifcp-port           3420/tcp  #iFCP User Port
+ifcp-port           3420/udp  #iFCP User Port
+bmap                3421/tcp  #Bull Apprise portmapper
+bmap                3421/udp  #Bull Apprise portmapper
+rusb-sys-port       3422/tcp  #Remote USB System Port
+rusb-sys-port       3422/udp  #Remote USB System Port
+xtrm                3423/tcp  #xTrade Reliable Messaging
+xtrm                3423/udp  #xTrade Reliable Messaging
+xtrms               3424/tcp  #xTrade over TLS/SSL
+xtrms               3424/udp  #xTrade over TLS/SSL
+agps-port           3425/tcp  #AGPS Access Port
+agps-port           3425/udp  #AGPS Access Port
+arkivio             3426/tcp  #Arkivio Storage Protocol
+arkivio             3426/udp  #Arkivio Storage Protocol
+websphere-snmp      3427/tcp  #WebSphere SNMP
+websphere-snmp      3427/udp  #WebSphere SNMP
+twcss               3428/tcp  #2Wire CSS
+twcss               3428/udp  #2Wire CSS
+gcsp                3429/tcp  #GCSP user port
+gcsp                3429/udp  #GCSP user port
+ssdispatch          3430/tcp  #Scott Studios Dispatch
+ssdispatch          3430/udp  #Scott Studios Dispatch
+ndl-als             3431/tcp  #Active License Server Port
+ndl-als             3431/udp  #Active License Server Port
+osdcp               3432/tcp  #Secure Device Protocol
+osdcp               3432/udp  #Secure Device Protocol
+alta-smp            3433/tcp  #Altaworks Service Management Platform
+alta-smp            3433/udp  #Altaworks Service Management Platform
+opencm              3434/tcp  #OpenCM Server
+opencm              3434/udp  #OpenCM Server
+pacom               3435/tcp  #Pacom Security User Port
+pacom               3435/udp  #Pacom Security User Port
+gc-config           3436/tcp  #GuardControl Exchange Protocol
+gc-config           3436/udp  #GuardControl Exchange Protocol
+autocueds           3437/tcp  #Autocue Directory Service
+autocueds           3437/udp  #Autocue Directory Service
+spiral-admin        3438/tcp  #Spiralcraft Admin
+spiral-admin        3438/udp  #Spiralcraft Admin
+hri-port            3439/tcp  #HRI Interface Port
+hri-port            3439/udp  #HRI Interface Port
+ans-console         3440/tcp  #Net Steward Mgmt Console
+ans-console         3440/udp  #Net Steward Mgmt Console
+connect-client      3441/tcp  #OC Connect Client
+connect-client      3441/udp  #OC Connect Client
+connect-server      3442/tcp  #OC Connect Server
+connect-server      3442/udp  #OC Connect Server
+ov-nnm-websrv       3443/tcp  #OpenView Network Node Manager WEB Server
+ov-nnm-websrv       3443/udp  #OpenView Network Node Manager WEB Server
+denali-server       3444/tcp  #Denali Server
+denali-server       3444/udp  #Denali Server
+monp                3445/tcp  #Media Object Network
+monp                3445/udp  #Media Object Network
+3comfaxrpc          3446/tcp  #3Com FAX RPC port
+3comfaxrpc          3446/udp  #3Com FAX RPC port
+cddn                3447/tcp  #CompuDuo DirectNet
+cddn                3447/udp  #CompuDuo DirectNet
+dnc-port            3448/tcp  #Discovery and Net Config
+dnc-port            3448/udp  #Discovery and Net Config
+hotu-chat           3449/tcp  #HotU Chat
+hotu-chat           3449/udp  #HotU Chat
+castorproxy         3450/tcp  #CAStorProxy
+castorproxy         3450/udp  #CAStorProxy
+asam                3451/tcp  #ASAM Services
+asam                3451/udp  #ASAM Services
+sabp-signal         3452/tcp  #SABP-Signalling Protocol
+sabp-signal         3452/udp  #SABP-Signalling Protocol
+pscupd              3453/tcp  #PSC Update Port
+pscupd              3453/udp  #PSC Update Port
+mira                3454/tcp  #Apple Remote Access Protocol
+prsvp               3455/tcp  #RSVP Port
+prsvp               3455/udp  #RSVP Port
+vat                 3456/tcp  #VAT default data
+vat                 3456/udp  #VAT default data
+vat-control         3457/tcp  #VAT default control
+vat-control         3457/udp  #VAT default control
+d3winosfi           3458/tcp  #D3WinOSFI
+d3winosfi           3458/udp  #D3WinOSFI
+integral            3459/tcp  #TIP Integral
+integral            3459/udp  #TIP Integral
+edm-manager         3460/tcp  #EDM Manger
+edm-manager         3460/udp  #EDM Manger
+edm-stager          3461/tcp  #EDM Stager
+edm-stager          3461/udp  #EDM Stager
+edm-std-notify      3462/tcp  #EDM STD Notify
+edm-std-notify      3462/udp  #EDM STD Notify
+edm-adm-notify      3463/tcp  #EDM ADM Notify
+edm-adm-notify      3463/udp  #EDM ADM Notify
+edm-mgr-sync        3464/tcp  #EDM MGR Sync
+edm-mgr-sync        3464/udp  #EDM MGR Sync
+edm-mgr-cntrl       3465/tcp  #EDM MGR Cntrl
+edm-mgr-cntrl       3465/udp  #EDM MGR Cntrl
+workflow            3466/tcp  #WORKFLOW
+workflow            3466/udp  #WORKFLOW
+rcst                3467/tcp  #RCST
+rcst                3467/udp  #RCST
+ttcmremotectrl      3468/tcp  #TTCM Remote Controll
+ttcmremotectrl      3468/udp  #TTCM Remote Controll
+pluribus            3469/tcp  #Pluribus
+pluribus            3469/udp  #Pluribus
+jt400               3470/tcp  #jt400
+jt400               3470/udp  #jt400
+jt400-ssl           3471/tcp  #jt400-ssl
+jt400-ssl           3471/udp  #jt400-ssl
+jaugsremotec-1      3472/tcp  #JAUGS N-G Remotec 1
+jaugsremotec-1      3472/udp  #JAUGS N-G Remotec 1
+jaugsremotec-2      3473/tcp  #JAUGS N-G Remotec 2
+jaugsremotec-2      3473/udp  #JAUGS N-G Remotec 2
+ttntspauto          3474/tcp  #TSP Automation
+ttntspauto          3474/udp  #TSP Automation
+genisar-port        3475/tcp  #Genisar Comm Port
+genisar-port        3475/udp  #Genisar Comm Port
+nppmp               3476/tcp  #NVIDIA Mgmt Protocol
+nppmp               3476/udp  #NVIDIA Mgmt Protocol
+ecomm               3477/tcp  #eComm link port
+ecomm               3477/udp  #eComm link port
+nat-stun-port       3478/tcp  #Simple Traversal of UDP Through NAT (STUN) port
+nat-stun-port       3478/udp  #Simple Traversal of UDP Through NAT (STUN) port
+twrpc               3479/tcp  #2Wire RPC
+twrpc               3479/udp  #2Wire RPC
+plethora            3480/tcp  #Secure Virtual Workspace
+plethora            3480/udp  #Secure Virtual Workspace
+cleanerliverc       3481/tcp  #CleanerLive remote ctrl
+cleanerliverc       3481/udp  #CleanerLive remote ctrl
+vulture             3482/tcp  #Vulture Monitoring System
+vulture             3482/udp  #Vulture Monitoring System
+slim-devices        3483/tcp  #Slim Devices Protocol
+slim-devices        3483/udp  #Slim Devices Protocol
+gbs-stp             3484/tcp  #GBS SnapTalk Protocol
+gbs-stp             3484/udp  #GBS SnapTalk Protocol
+celatalk            3485/tcp  #CelaTalk
+celatalk            3485/udp  #CelaTalk
+ifsf-hb-port        3486/tcp  #IFSF Heartbeat Port
+ifsf-hb-port        3486/udp  #IFSF Heartbeat Port
+ltctcp              3487/tcp  #LISA TCP Transfer Channel
+ltcudp              3487/udp  #LISA UDP Transfer Channel
+fs-rh-srv           3488/tcp  #FS Remote Host Server
+fs-rh-srv           3488/udp  #FS Remote Host Server
+dtp-dia             3489/tcp  #DTP/DIA
+dtp-dia             3489/udp  #DTP/DIA
+colubris            3490/tcp  #Colubris Management Port
+colubris            3490/udp  #Colubris Management Port
+swr-port            3491/tcp  #SWR Port
+swr-port            3491/udp  #SWR Port 
+tvdumtray-port      3492/tcp  #TVDUM Tray Port
+tvdumtray-port      3492/udp  #TVDUM Tray Port
+nut                 3493/tcp  #Network UPS Tools
+nut                 3493/udp  #Network UPS Tools
+ibm3494             3494/tcp  #IBM 3494
+ibm3494             3494/udp  #IBM 3494
+seclayer-tcp        3495/tcp  #securitylayer over tcp
+seclayer-tcp        3495/udp  #securitylayer over tcp
+seclayer-tls        3496/tcp  #securitylayer over tls
+seclayer-tls        3496/udp  #securitylayer over tls
+ipether232port      3497/tcp  #ipEther232Port
+ipether232port      3497/udp  #ipEther232Port
+dashpas-port        3498/tcp  #DASHPAS user port
+dashpas-port        3498/udp  #DASHPAS user port
+sccip-media         3499/tcp  #SccIP Media
+sccip-media         3499/udp  #SccIP Media
+rtmp-port           3500/tcp  #RTMP Port
+rtmp-port           3500/udp  #RTMP Port
+isoft-p2p           3501/tcp  #iSoft-P2P
+isoft-p2p           3501/udp  #iSoft-P2P
+avinstalldisc       3502/tcp  #Avocent Install Discovery
+avinstalldisc       3502/udp  #Avocent Install Discovery
+lsp-ping            3503/tcp  #MPLS LSP-echo Port
+lsp-ping            3503/udp  #MPLS LSP-echo Port
+ironstorm           3504/tcp  #IronStorm game server
+ironstorm           3504/udp  #IronStorm game server
+ccmcomm             3505/tcp  #CCM communications port
+ccmcomm             3505/udp  #CCM communications port
+apc-3506            3506/tcp  #APC 3506
+apc-3506            3506/udp  #APC 3506
+nesh-broker         3507/tcp  #Nesh Broker Port
+nesh-broker         3507/udp  #Nesh Broker Port
+interactionweb      3508/tcp  #Interaction Web
+interactionweb      3508/udp  #Interaction Web
+vt-ssl              3509/tcp  #Virtual Token SSL Port
+vt-ssl              3509/udp  #Virtual Token SSL Port
+xss-port            3510/tcp  #XSS Port
+xss-port            3510/udp  #XSS Port
+webmail-2           3511/tcp  #WebMail/2
+webmail-2           3511/udp  #WebMail/2
+aztec               3512/tcp  #Aztec Distribution Port
+aztec               3512/udp  #Aztec Distribution Port
+arcpd               3513/tcp  #Adaptec Remote Protocol
+arcpd               3513/udp  #Adaptec Remote Protocol
+must-p2p            3514/tcp  #MUST Peer to Peer
+must-p2p            3514/udp  #MUST Peer to Peer
+must-backplane      3515/tcp  #MUST Backplane
+must-backplane      3515/udp  #MUST Backplane
+smartcard-port      3516/tcp  #Smartcard Port
+smartcard-port      3516/udp  #Smartcard Port 
+802-11-iapp         3517/tcp  #IEEE 802.11 WLANs WG IAPP
+802-11-iapp         3517/udp  #IEEE 802.11 WLANs WG IAPP
+artifact-msg        3518/tcp  #Artifact Message Server
+artifact-msg        3518/udp  #Artifact Message Server
+nvmsgd              3519/tcp  #Netvion Messenger Port
+galileo             3519/udp  #Netvion Galileo Port
+galileolog          3520/tcp  #Netvion Galileo Log Port
+galileolog          3520/udp  #Netvion Galileo Log Port
+mc3ss               3521/tcp  #Telequip Labs MC3SS
+mc3ss               3521/udp  #Telequip Labs MC3SS
+nssocketport        3522/tcp  #DO over NSSocketPort
+nssocketport        3522/udp  #DO over NSSocketPort
+odeumservlink       3523/tcp  #Odeum Serverlink 
+odeumservlink       3523/udp  #Odeum Serverlink
+ecmport             3524/tcp  #ECM Server port
+ecmport             3524/udp  #ECM Server port
+eisport             3525/tcp  #EIS Server port
+eisport             3525/udp  #EIS Server port
+starquiz-port       3526/tcp  #starQuiz Port
+starquiz-port       3526/udp  #starQuiz Port
+beserver-msg-q      3527/tcp  #VERITAS Backup Exec Server
+beserver-msg-q      3527/udp  #VERITAS Backup Exec Server
+jboss-iiop          3528/tcp  #JBoss IIOP
+jboss-iiop          3528/udp  #JBoss IIOP
+jboss-iiop-ssl      3529/tcp  #JBoss IIOP/SSL
+jboss-iiop-ssl      3529/udp  #JBoss IIOP/SSL
+gf                  3530/tcp  #Grid Friendly
+gf                  3530/udp  #Grid Friendly
+joltid              3531/tcp  #Joltid
+joltid              3531/udp  #Joltid
+raven-rmp           3532/tcp  #Raven Remote Management Control
+raven-rmp           3532/udp  #Raven Remote Management Control
+raven-rdp           3533/tcp  #Raven Remote Management Data
+raven-rdp           3533/udp  #Raven Remote Management Data
+urld-port           3534/tcp  #URL Daemon Port
+urld-port           3534/udp  #URL Daemon Port
+ms-la               3535/tcp  #MS-LA
+ms-la               3535/udp  #MS-LA
+snac                3536/tcp  #SNAC
+snac                3536/udp  #SNAC
+ni-visa-remote      3537/tcp  #Remote NI-VISA port
+ni-visa-remote      3537/udp  #Remote NI-VISA port
+ibm-diradm          3538/tcp  #IBM Directory Server
+ibm-diradm          3538/udp  #IBM Directory Server
+ibm-diradm-ssl      3539/tcp  #IBM Directory Server SSL
+ibm-diradm-ssl      3539/udp  #IBM Directory Server SSL
+pnrp-port           3540/tcp  #PNRP User Port
+pnrp-port           3540/udp  #PNRP User Port
+voispeed-port       3541/tcp  #VoiSpeed Port
+voispeed-port       3541/udp  #VoiSpeed Port
+hacl-monitor        3542/tcp  #HA cluster monitor
+hacl-monitor        3542/udp  #HA cluster monitor
+qftest-lookup       3543/tcp  #qftest Lookup Port
+qftest-lookup       3543/udp  #qftest Lookup Port
+teredo              3544/tcp  #Teredo Port
+teredo              3544/udp  #Teredo Port
+camac               3545/tcp  #CAMAC equipment
+camac               3545/udp  #CAMAC equipment
+symantec-sim        3547/tcp  #Symantec SIM
+symantec-sim        3547/udp  #Symantec SIM
+interworld          3548/tcp  #Interworld
+interworld          3548/udp  #Interworld
+tellumat-nms        3549/tcp  #Tellumat MDR NMS 
+tellumat-nms        3549/udp  #Tellumat MDR NMS
+ssmpp               3550/tcp  #Secure SMPP
+ssmpp               3550/udp  #Secure SMPP
+apcupsd             3551/tcp  #Apcupsd Information Port
+apcupsd             3551/udp  #Apcupsd Information Port
+taserver            3552/tcp  #TeamAgenda Server Port
+taserver            3552/udp  #TeamAgenda Server Port
+rbr-discovery       3553/tcp  #Red Box Recorder ADP
+rbr-discovery       3553/udp  #Red Box Recorder ADP
+questnotify         3554/tcp  #Quest Notification Server
+questnotify         3554/udp  #Quest Notification Server
+razor               3555/tcp  #Vipul's Razor
+razor               3555/udp  #Vipul's Razor
+sky-transport       3556/tcp  #Sky Transport Protocol
+sky-transport       3556/udp  #Sky Transport Protocol
+personalos-001      3557/tcp  #PersonalOS Comm Port
+personalos-001      3557/udp  #PersonalOS Comm Port
+mcp-port            3558/tcp  #MCP user port
+mcp-port            3558/udp  #MCP user port
+cctv-port           3559/tcp  #CCTV control port
+cctv-port           3559/udp  #CCTV control port
+iniserve-port       3560/tcp  #INIServe port
+iniserve-port       3560/udp  #INIServe port
+bmc-onekey          3561/tcp  #BMC-OneKey
+bmc-onekey          3561/udp  #BMC-OneKey
+sdbproxy            3562/tcp  #SDBProxy
+sdbproxy            3562/udp  #SDBProxy
+watcomdebug         3563/tcp  #Watcom Debug
+watcomdebug         3563/udp  #Watcom Debug
+esimport            3564/tcp  #Electromed SIM port
+esimport            3564/udp  #Electromed SIM port
+m2pa                3565/tcp  #M2PA
+quest-launcher      3566/tcp  #Quest Agent Manager
+quest-launcher      3566/udp  #Quest Agent Manager
+emware-oft          3567/tcp  #emWare OFT Services
+emware-oft          3567/udp  #emWare OFT Services
+emware-epss         3568/tcp  #emWare EMIT/Secure
+emware-epss         3568/udp  #emWare EMIT/Secure
+mbg-ctrl            3569/tcp  #Meinberg Control Service
+mbg-ctrl            3569/udp  #Meinberg Control Service
+mccwebsvr-port      3570/tcp  #MCC Web Server Port
+mccwebsvr-port      3570/udp  #MCC Web Server Port
+megardsvr-port      3571/tcp  #MegaRAID Server Port
+megardsvr-port      3571/udp  #MegaRAID Server Port
+megaregsvrport      3572/tcp  #Registration Server Port
+megaregsvrport      3572/udp  #Registration Server Port
+tag-ups-1           3573/tcp  #Advantage Group UPS Suite
+tag-ups-1           3573/udp  #Advantage Group UPS Suite
+dmaf-server         3574/tcp  #DMAF Server
+dmaf-caster         3574/udp  #DMAF Caster
+ccm-port            3575/tcp  #Coalsere CCM Port
+ccm-port            3575/udp  #Coalsere CCM Port
+cmc-port            3576/tcp  #Coalsere CMC Port
+cmc-port            3576/udp  #Coalsere CMC Port
+config-port         3577/tcp  #Configuration Port
+config-port         3577/udp  #Configuration Port
+data-port           3578/tcp  #Data Port
+data-port           3578/udp  #Data Port
+ttat3lb             3579/tcp  #Tarantella Load Balancing
+ttat3lb             3579/udp  #Tarantella Load Balancing
+nati-svrloc         3580/tcp  #NATI-ServiceLocator
+nati-svrloc         3580/udp  #NATI-ServiceLocator
+kfxaclicensing      3581/tcp  #Ascent Capture Licensing
+kfxaclicensing      3581/udp  #Ascent Capture Licensing
+press               3582/tcp  #PEG PRESS Server
+press               3582/udp  #PEG PRESS Server
+canex-watch         3583/tcp  #CANEX Watch System
+canex-watch         3583/udp  #CANEX Watch System
+u-dbap              3584/tcp  #U-DBase Access Protocol
+u-dbap              3584/udp  #U-DBase Access Protocol
+emprise-lls         3585/tcp  #Emprise License Server
+emprise-lls         3585/udp  #Emprise License Server
+emprise-lsc         3586/tcp  #License Server Console
+emprise-lsc         3586/udp  #License Server Console
+p2pgroup            3587/tcp  #Peer to Peer Grouping
+p2pgroup            3587/udp  #Peer to Peer Grouping
+sentinel            3588/tcp  #Sentinel Server
+sentinel            3588/udp  #Sentinel Server
+isomair             3589/tcp  #isomair
+isomair             3589/udp  #isomair
+wv-csp-sms          3590/tcp  #WV CSP SMS Binding
+wv-csp-sms          3590/udp  #WV CSP SMS Binding
+gtrack-server       3591/tcp  #LOCANIS G-TRACK Server
+gtrack-server       3591/udp  #LOCANIS G-TRACK Server
+gtrack-ne           3592/tcp  #LOCANIS G-TRACK NE Port
+gtrack-ne           3592/udp  #LOCANIS G-TRACK NE Port
+bpmd                3593/tcp  #BP Model Debugger
+bpmd                3593/udp  #BP Model Debugger
+mediaspace          3594/tcp  #MediaSpace
+mediaspace          3594/udp  #MediaSpace
+shareapp            3595/tcp  #ShareApp
+shareapp            3595/udp  #ShareApp
+iw-mmogame          3596/tcp  #Illusion Wireless MMOG
+iw-mmogame          3596/udp  #Illusion Wireless MMOG
+a14                 3597/tcp  #A14 (AN-to-SC/MM)
+a14                 3597/udp  #A14 (AN-to-SC/MM)
+a15                 3598/tcp  #A15 (AN-to-AN)
+a15                 3598/udp  #A15 (AN-to-AN)
+quasar-server       3599/tcp  #Quasar Accounting Server
+quasar-server       3599/udp  #Quasar Accounting Server
+trap-daemon         3600/tcp  #text relay-answer
+trap-daemon         3600/udp  #text relay-answer
+visinet-gui         3601/tcp  #Visinet Gui
+visinet-gui         3601/udp  #Visinet Gui
+infiniswitchcl      3602/tcp  #InfiniSwitch Mgr Client
+infiniswitchcl      3602/udp  #InfiniSwitch Mgr Client
+int-rcv-cntrl       3603/tcp  #Integrated Rcvr Control
+int-rcv-cntrl       3603/udp  #Integrated Rcvr Control
+bmc-jmx-port        3604/tcp  #BMC JMX Port
+bmc-jmx-port        3604/udp  #BMC JMX Port
+comcam-io           3605/tcp  #ComCam IO Port
+comcam-io           3605/udp  #ComCam IO Port
+splitlock           3606/tcp  #Splitlock Server
+splitlock           3606/udp  #Splitlock Server
+precise-i3          3607/tcp  #Precise I3
+precise-i3          3607/udp  #Precise I3
+trendchip-dcp       3608/tcp  #Trendchip control protocol
+trendchip-dcp       3608/udp  #Trendchip control protocol
+cpdi-pidas-cm       3609/tcp  #CPDI PIDAS Connection Mon
+cpdi-pidas-cm       3609/udp  #CPDI PIDAS Connection Mon
+echonet             3610/tcp  #ECHONET
+echonet             3610/udp  #ECHONET
+six-degrees         3611/tcp  #Six Degrees Port
+six-degrees         3611/udp  #Six Degrees Port
+hp-dataprotect      3612/tcp  #HP Data Protector
+hp-dataprotect      3612/udp  #HP Data Protector
+alaris-disc         3613/tcp  #Alaris Device Discovery
+alaris-disc         3613/udp  #Alaris Device Discovery
+sigma-port          3614/tcp  #Invensys Sigma Port
+sigma-port          3614/udp  #Invensys Sigma Port
+start-network       3615/tcp  #Start Messaging Network
+start-network       3615/udp  #Start Messaging Network
+cd3o-protocol       3616/tcp  #cd3o Control Protocol
+cd3o-protocol       3616/udp  #cd3o Control Protocol
+sharp-server        3617/tcp  #ATI SHARP Logic Engine
+sharp-server        3617/udp  #ATI SHARP Logic Engine  
+aairnet-1           3618/tcp  #AAIR-Network 1
+aairnet-1           3618/udp  #AAIR-Network 1
+aairnet-2           3619/tcp  #AAIR-Network 2 
+aairnet-2           3619/udp  #AAIR-Network 2
+ep-pcp              3620/tcp  #EPSON Projector Control Port
+ep-pcp              3620/udp  #EPSON Projector Control Port
+ep-nsp              3621/tcp  #EPSON Network Screen Port
+ep-nsp              3621/udp  #EPSON Network Screen Port
+ff-lr-port          3622/tcp  #FF LAN Redundancy Port
+ff-lr-port          3622/udp  #FF LAN Redundancy Port
+haipe-discover      3623/tcp  #HAIPIS Dynamic Discovery
+haipe-discover      3623/udp  #HAIPIS Dynamic Discovery
+dist-upgrade        3624/tcp  #Distributed Upgrade Port
+dist-upgrade        3624/udp  #Distributed Upgrade Port
+volley              3625/tcp  #Volley
+volley              3625/udp  #Volley
+bvcdaemon-port      3626/tcp  #bvControl Daemon
+bvcdaemon-port      3626/udp  #bvControl Daemon
+jamserverport       3627/tcp  #Jam Server Port
+jamserverport       3627/udp  #Jam Server Port
+ept-machine         3628/tcp  #EPT Machine Interface
+ept-machine         3628/udp  #EPT Machine Interface
+escvpnet            3629/tcp  #ESC/VP.net
+escvpnet            3629/udp  #ESC/VP.net
+cs-remote-db        3630/tcp  #C&S Remote Database Port
+cs-remote-db        3630/udp  #C&S Remote Database Port
+cs-services         3631/tcp  #C&S Web Services Port
+cs-services         3631/udp  #C&S Web Services Port
+distcc              3632/tcp  #distributed compiler
+distcc              3632/udp  #distributed compiler
+wacp                3633/tcp  #Wyrnix AIS port
+wacp                3633/udp  #Wyrnix AIS port
+hlibmgr             3634/tcp  #hNTSP Library Manager
+hlibmgr             3634/udp  #hNTSP Library Manager 
+sdo                 3635/tcp  #Simple Distributed Objects
+sdo                 3635/udp  #Simple Distributed Objects
+opscenter           3636/tcp  #OpsCenter
+opscenter           3636/udp  #OpsCenter
+scservp             3637/tcp  #Customer Service Port
+scservp             3637/udp  #Customer Service Port
+ehp-backup          3638/tcp  #EHP Backup Protocol
+ehp-backup          3638/udp  #EHP Backup Protocol
+xap-ha              3639/tcp  #Extensible Automation 
+xap-ha              3639/udp  #Extensible Automation 
+netplay-port1       3640/tcp  #Netplay Port 1
+netplay-port1       3640/udp  #Netplay Port 1
+netplay-port2       3641/tcp  #Netplay Port 2
+netplay-port2       3641/udp  #Netplay Port 2
+juxml-port          3642/tcp  #Juxml Replication port
+juxml-port          3642/udp  #Juxml Replication port
+audiojuggler        3643/tcp  #AudioJuggler
+audiojuggler        3643/udp  #AudioJuggler
+ssowatch            3644/tcp  #ssowatch
+ssowatch            3644/udp  #ssowatch
+cyc                 3645/tcp  #Cyc
+cyc                 3645/udp  #Cyc 
+xss-srv-port        3646/tcp  #XSS Server Port
+xss-srv-port        3646/udp  #XSS Server Port
+splitlock-gw        3647/tcp  #Splitlock Gateway
+splitlock-gw        3647/udp  #Splitlock Gateway
+fjcp                3648/tcp  #Fujitsu Cooperation Port
+fjcp                3648/udp  #Fujitsu Cooperation Port
+nmmp                3649/tcp  #Nishioka Miyuki Msg Protocol
+nmmp                3649/udp  #Nishioka Miyuki Msg Protocol
+prismiq-plugin      3650/tcp  #PRISMIQ VOD plug-in
+prismiq-plugin      3650/udp  #PRISMIQ VOD plug-in
+xrpc-registry       3651/tcp  #XRPC Registry
+xrpc-registry       3651/udp  #XRPC Registry
+vxcrnbuport         3652/tcp  #VxCR NBU Default Port
+vxcrnbuport         3652/udp  #VxCR NBU Default Port
+tsp                 3653/tcp  #Tunnel Setup Protocol
+tsp                 3653/udp  #Tunnel Setup Protocol
+vaprtm              3654/tcp  #VAP RealTime Messenger
+vaprtm              3654/udp  #VAP RealTime Messenger
+abatemgr            3655/tcp  #ActiveBatch Exec Agent
+abatemgr            3655/udp  #ActiveBatch Exec Agent 
+abatjss             3656/tcp  #ActiveBatch Job Scheduler
+abatjss             3656/udp  #ActiveBatch Job Scheduler
+immedianet-bcn      3657/tcp  #ImmediaNet Beacon
+immedianet-bcn      3657/udp  #ImmediaNet Beacon
+ps-ams              3658/tcp  #PlayStation AMS (Secure)
+ps-ams              3658/udp  #PlayStation AMS (Secure)
+apple-sasl          3659/tcp  #Apple SASL
+apple-sasl          3659/udp  #Apple SASL
+can-nds-ssl         3660/tcp  #Candle Directory Services using SSL
+can-nds-ssl         3660/udp  #Candle Directory Services using SSL
+can-ferret-ssl      3661/tcp  #Candle Directory Services using SSL
+can-ferret-ssl      3661/udp  #Candle Directory Services using SSL
+pserver             3662/tcp  #pserver
+pserver             3662/udp  #pserver
+dtp                 3663/tcp  #DIRECWAY Tunnel Protocol
+dtp                 3663/udp  #DIRECWAY Tunnel Protocol
+ups-engine          3664/tcp  #UPS Engine Port
+ups-engine          3664/udp  #UPS Engine Port
+ent-engine          3665/tcp  #Enterprise Engine Port
+ent-engine          3665/udp  #Enterprise Engine Port
+eserver-pap         3666/tcp  #IBM eServer PAP
+eserver-pap         3666/udp  #IBM EServer PAP
+infoexch            3667/tcp  #IBM Information Exchange
+infoexch            3667/udp  #IBM Information Exchange
+dell-rm-port        3668/tcp  #Dell Remote Management
+dell-rm-port        3668/udp  #Dell Remote Management
+casanswmgmt         3669/tcp  #CA SAN Switch Management
+casanswmgmt         3669/udp  #CA SAN Switch Management
+smile               3670/tcp  #SMILE TCP/UDP Interface
+smile               3670/udp  #SMILE TCP/UDP Interface
+efcp                3671/tcp  #e Field Control (EIBnet)
+efcp                3671/udp  #e Field Control (EIBnet)
+lispworks-orb       3672/tcp  #LispWorks ORB
+lispworks-orb       3672/udp  #LispWorks ORB
+mediavault-gui      3673/tcp  #Openview Media Vault GUI
+mediavault-gui      3673/udp  #Openview Media Vault GUI
+wininstall-ipc      3674/tcp  #WinINSTALL IPC Port
+wininstall-ipc      3674/udp  #WinINSTALL IPC Port
+calltrax            3675/tcp  #CallTrax Data Port
+calltrax            3675/udp  #CallTrax Data Port
+va-pacbase          3676/tcp  #VisualAge Pacbase server
+va-pacbase          3676/udp  #VisualAge Pacbase server
+roverlog            3677/tcp  #RoverLog IPC
+roverlog            3677/udp  #RoverLog IPC
+ipr-dglt            3678/tcp  #DataGuardianLT
+ipr-dglt            3678/udp  #DataGuardianLT
+newton-dock         3679/tcp  #Newton Dock
+newton-dock         3679/udp  #Newton Dock
+npds-tracker        3680/tcp  #NPDS Tracker
+npds-tracker        3680/udp  #NPDS Tracker
+bts-x73             3681/tcp  #BTS X73 Port
+bts-x73             3681/udp  #BTS X73 Port
+cas-mapi            3682/tcp  #EMC SmartPackets-MAPI
+cas-mapi            3682/udp  #EMC SmartPackets-MAPI
+bmc-ea              3683/tcp  #BMC EDV/EA
+bmc-ea              3683/udp  #BMC EDV/EA
+faxstfx-port        3684/tcp  #FAXstfX
+faxstfx-port        3684/udp  #FAXstfX
+dsx-agent           3685/tcp  #DS Expert Agent
+dsx-agent           3685/udp  #DS Expert Agent
+tnmpv2              3686/tcp  #Trivial Network Management
+tnmpv2              3686/udp  #Trivial Network Management
+simple-push         3687/tcp  #simple-push
+simple-push         3687/udp  #simple-push
+simple-push-s       3688/tcp  #simple-push Secure
+simple-push-s       3688/udp  #simple-push Secure
+daap                3689/tcp  #Digital Audio Access Protocol
+daap                3689/udp  #Digital Audio Access Protocol
+svn                 3690/tcp  #Subversion
+svn                 3690/udp  #Subversion
+magaya-network      3691/tcp  #Magaya Network Port
+magaya-network      3691/udp  #Magaya Network Port
+intelsync           3692/tcp  #Brimstone IntelSync
+intelsync           3692/udp  #Brimstone IntelSync
+gttp                3693/tcp  #GTTP
+gttp                3693/udp  #GTTP
+vpntpp              3694/tcp  #VPN Token Propagation Protocol
+vpntpp              3694/udp  #VPN Token Propagation Protocol
+bmc-data-coll       3695/tcp  #BMC Data Collection
+bmc-data-coll       3695/udp  #BMC Data Collection
+telnetcpcd          3696/tcp  #Telnet Com Port Control
+telnetcpcd          3696/udp  #Telnet Com Port Control
+nw-license          3697/tcp  #NavisWorks License System
+nw-license          3697/udp  #NavisWorks Licnese System
+sagectlpanel        3698/tcp  #SAGECTLPANEL
+sagectlpanel        3698/udp  #SAGECTLPANEL
+kpn-icw             3699/tcp  #Internet Call Waiting
+kpn-icw             3699/udp  #Internet Call Waiting
+lrs-paging          3700/tcp  #LRS NetPage
+lrs-paging          3700/udp  #LRS NetPage
+netcelera           3701/tcp  #NetCelera
+netcelera           3701/udp  #NetCelera 
+ws-discovery        3702/tcp  #Web Service Discovery
+ws-discovery        3702/udp  #Web Service Discovery
+adobeserver-3       3703/tcp  #Adobe Server 3
+adobeserver-3       3703/udp  #Adobe Server 3
+adobeserver-4       3704/tcp  #Adobe Server 4
+adobeserver-4       3704/udp  #Adobe Server 4
+adobeserver-5       3705/tcp  #Adobe Server 5
+adobeserver-5       3705/udp  #Adobe Server 5
+rt-event            3706/tcp  #Real-Time Event Port
+rt-event            3706/udp  #Real-Time Event Port
+rt-event-s          3707/tcp  #Real-Time Event Secure Port
+rt-event-s          3707/udp  #Real-Time Event Secure Port
+ca-idms             3709/tcp  #CA-IDMS Server
+ca-idms             3709/udp  #CA-IDMS Server
+portgate-auth       3710/tcp  #PortGate Authentication
+portgate-auth       3710/udp  #PortGate Authentication
+edb-server2         3711/tcp  #EBD Server 2
+edb-server2         3711/udp  #EBD Server 2
+sentinel-ent        3712/tcp  #Sentinel Enterprise
+sentinel-ent        3712/udp  #Sentinel Enterprise
+tftps               3713/tcp  #TFTP over TLS
+tftps               3713/udp  #TFTP over TLS
+delos-dms           3714/tcp  #DELOS Direct Messaging
+delos-dms           3714/udp  #DELOS Direct Messaging
+anoto-rendezv       3715/tcp  #Anoto Rendezvous Port
+anoto-rendezv       3715/udp  #Anoto Rendezvous Port
+wv-csp-sms-cir      3716/tcp  #WV CSP SMS CIR Channel
+wv-csp-sms-cir      3716/udp  #WV CSP SMS CIR Channel
+wv-csp-udp-cir      3717/tcp  #WV CSP UDP/IP CIR Channel
+wv-csp-udp-cir      3717/udp  #WV CSP UDP/IP CIR Channel
+opus-services       3718/tcp  #OPUS Server Port
+opus-services       3718/udp  #OPUS Server Port
+itelserverport      3719/tcp  #iTel Server Port
+itelserverport      3719/udp  #iTel Server Port
+ufastro-instr       3720/tcp  #UF Astro. Instr. Services
+ufastro-instr       3720/udp  #UF Astro. Instr. Services
+xsync               3721/tcp  #Xsync
+xsync               3721/udp  #Xsync
+xserveraid          3722/tcp  #Xserve RAID
+xserveraid          3722/udp  #Xserve RAID
+sychrond            3723/tcp  #Sychron Service Daemon
+sychrond            3723/udp  #Sychron Service Daemon
+battlenet           3724/tcp  #Blizzard Battlenet
+battlenet           3724/udp  #Blizzard Battlenet
+na-er-tip           3725/tcp  #Netia NA-ER Port
+na-er-tip           3725/udp  #Netia NA-ER Port
+array-manager       3726/tcp  #Xyratex Array Manager
+array-manager       3726/udp  #Xyartex Array Manager
+e-mdu               3727/tcp  #Ericsson Mobile Data Unit
+e-mdu               3727/udp  #Ericsson Mobile Data Unit
+e-woa               3728/tcp  #Ericsson Web on Air
+e-woa               3728/udp  #Ericsson Web on Air
+fksp-audit          3729/tcp  #Fireking Audit Port
+fksp-audit          3729/udp  #Fireking Audit Port
+client-ctrl         3730/tcp  #Client Control
+client-ctrl         3730/udp  #Client Control
+smap                3731/tcp  #Service Manager
+smap                3731/udp  #Service Manager
+m-wnn               3732/tcp  #Mobile Wnn
+m-wnn               3732/udp  #Mobile Wnn
+multip-msg          3733/tcp  #Multipuesto Msg Port
+multip-msg          3733/udp  #Multipuesto Msg Port
+synel-data          3734/tcp  #Synel Data Collection Port
+synel-data          3734/udp  #Synel Data Collection Port
+pwdis               3735/tcp  #Password Distribution
+pwdis               3735/udp  #Password Distribution
+rs-rmi              3736/tcp  #RealSpace RMI
+rs-rmi              3736/udp  #RealSpace RMI
+versatalk           3738/tcp  #versaTalk Server Port
+versatalk           3738/udp  #versaTalk Server Port
+launchbird-lm       3739/tcp  #Launchbird LicenseManager
+launchbird-lm       3739/udp  #Launchbird LicenseManager
+heartbeat           3740/tcp  #Heartbeat Protocol
+heartbeat           3740/udp  #Heartbeat Protocol
+wysdma              3741/tcp  #WysDM Agent
+wysdma              3741/udp  #WysDM Agent
+cst-port            3742/tcp  #CST - Configuration & Service Tracker
+cst-port            3742/udp  #CST - Configuration & Service Tracker
+ipcs-command        3743/tcp  #IP Control Systems Ltd.
+ipcs-command        3743/udp  #IP Control Systems Ltd.
+sasg                3744/tcp  #SASG
+sasg                3744/udp  #SASG
+gw-call-port        3745/tcp  #GWRTC Call Port
+gw-call-port        3745/udp  #GWRTC Call Port
+linktest            3746/tcp  #LXPRO.COM LinkTest
+linktest            3746/udp  #LXPRO.COM LinkTest
+linktest-s          3747/tcp  #LXPRO.COM LinkTest SSL
+linktest-s          3747/udp  #LXPRO.COM LinkTest SSL
+webdata             3748/tcp  #webData
+webdata             3748/udp  #webData
+cimtrak             3749/tcp  #CimTrak
+cimtrak             3749/udp  #CimTrak
+cbos-ip-port        3750/tcp  #CBOS/IP ncapsalation port
+cbos-ip-port        3750/udp  #CBOS/IP ncapsalatoin port
+gprs-cube           3751/tcp  #CommLinx GPRS Cube
+gprs-cube           3751/udp  #CommLinx GPRS Cube
+vipremoteagent      3752/tcp  #Vigil-IP RemoteAgent
+vipremoteagent      3752/udp  #Vigil-IP RemoteAgent
+nattyserver         3753/tcp  #NattyServer Port
+nattyserver         3753/udp  #NattyServer Port
+timestenbroker      3754/tcp  #TimesTen Broker Port 
+timestenbroker      3754/udp  #TimesTen Broker Port
+sas-remote-hlp      3755/tcp  #SAS Remote Help Server
+sas-remote-hlp      3755/udp  #SAS Remote Help Server
+canon-capt          3756/tcp  #Canon CAPT Port
+canon-capt          3756/udp  #Canon CAPT Port
+grf-port            3757/tcp  #GRF Server Port
+grf-port            3757/udp  #GRF Server Port
+apw-registry        3758/tcp  #apw RMI registry
+apw-registry        3758/udp  #apw RMI registry
+exapt-lmgr          3759/tcp  #Exapt License Manager
+exapt-lmgr          3759/udp  #Exapt License Manager
+adtempusclient      3760/tcp  #adTempus Client
+adtempusclient      3760/udp  #adTEmpus Client
+gsakmp              3761/tcp  #gsakmp port
+gsakmp              3761/udp  #gsakmp port
+gbs-smp             3762/tcp  #GBS SnapMail Protocol
+gbs-smp             3762/udp  #GBS SnapMail Protocol
+xo-wave             3763/tcp  #XO Wave Control Port
+xo-wave             3763/udp  #XO Wave Control Port
+mni-prot-rout       3764/tcp  #MNI Protected Routing
+mni-prot-rout       3764/udp  #MNI Protected Routing
+rtraceroute         3765/tcp  #Remote Traceroute
+rtraceroute         3765/udp  #Remote Traceroute
+listmgr-port        3767/tcp  #ListMGR Port
+listmgr-port        3767/udp  #ListMGR Port
+rblcheckd           3768/tcp  #rblcheckd server daemon
+rblcheckd           3768/udp  #rblcheckd server daemon
+haipe-otnk          3769/tcp  #HAIPE Network Keying
+haipe-otnk          3769/udp  #HAIPE Network Keying
+cindycollab         3770/tcp  #Cinderella Collaboration
+cindycollab         3770/udp  #Cinderella Collaboration
+paging-port         3771/tcp  #RTP Paging Port
+paging-port         3771/udp  #RTP Paging Port
+ctp                 3772/tcp  #Chantry Tunnel Protocol
+ctp                 3772/udp  #Chantry Tunnel Protocol
+ctdhercules         3773/tcp  #ctdhercules
+ctdhercules         3773/udp  #ctdhercules
+zicom               3774/tcp  #ZICOM
+zicom               3774/udp  #ZICOM
+ispmmgr             3775/tcp  #ISPM Manager Port
+ispmmgr             3775/udp  #ISPM Manager Port
+dvcprov-port        3776/tcp  #Device Provisioning Port
+dvcprov-port        3776/udp  #Device Provisioning Port
+jibe-eb             3777/tcp  #Jibe EdgeBurst
+jibe-eb             3777/udp  #Jibe EdgeBurst
+c-h-it-port         3778/tcp  #Cutler-Hammer IT Port
+c-h-it-port         3778/udp  #Cutler-Hammer IT Port
+cognima             3779/tcp  #Cognima Replication
+cognima             3779/udp  #Cognima Replication
+nnp                 3780/tcp  #Nuzzler Network Protocol
+nnp                 3780/udp  #Nuzzler Network Protocol
+abcvoice-port       3781/tcp  #ABCvoice server port
+abcvoice-port       3781/udp  #ABCvoice server port
+iso-tp0s            3782/tcp  #Secure ISO TP0 port
+iso-tp0s            3782/udp  #Secure ISO TP0 port
+bim-pem             3783/tcp  #Impact Mgr./PEM Gateway
+bim-pem             3783/udp  #Impact Mgr./PEM Gateway
+bfd                 3784/tcp  #BFD
+bfd                 3784/udp  #BFD
+bfd-control         3785/tcp  #BFD-Control
+bfd-control         3785/udp  #BFD-Control 
+upstriggervsw       3786/tcp  #VSW Upstrigger port
+upstriggervsw       3786/udp  #VSW Upstrigger port
+fintrx              3787/tcp  #Fintrx
+fintrx              3787/udp  #Fintrx
+isrp-port           3788/tcp  #SPACEWAY Routing port
+isrp-port           3788/udp  #SPACEWAY Routing port
+remotedeploy        3789/tcp  #RemoteDeploy Administrati
+remotedeploy        3789/udp  #RemoteDeploy Administrati
+quickbooksrds       3790/tcp  #QuickBooks RDS
+quickbooksrds       3790/udp  #QuickBooks RDS
+tvnetworkvideo      3791/tcp  #TV NetworkVideo Data port
+tvnetworkvideo      3791/udp  #TV NetworkVideo Data port
+sitewatch           3792/tcp  #e-watch, Inc. SiteWatch
+sitewatch           3792/udp  #e-watch, Inc. Sitewatch
+dcsoftware          3793/tcp  #DataCore Software
+dcsoftware          3793/udp  #DataCore Software
+jaus                3794/tcp  #JAUS Robots
+jaus                3794/udp  #JAUS Robots
+myblast             3795/tcp  #myBLAST Mekentosj port
+myblast             3795/udp  #myBLAST Mekentosj port
+spw-dialer          3796/tcp  #Spaceway Dialer
+spw-dialer          3796/udp  #Spaceway Dialer
+idps                3797/tcp  #idps
+idps                3797/udp  #idps
+minilock            3798/tcp  #Minilock
+minilock            3798/udp  #Minilock
+radius-dynauth      3799/tcp  #RADIUS Dynamic Authorization
+radius-dynauth      3799/udp  #RADIUS Dynamic Authorization
+pwgpsi              3800/tcp  #Print Services Interface
+pwgpsi              3800/udp  #Print Services Interface
+vhd                 3802/tcp  #VHD
+vhd                 3802/udp  #VHD
+soniqsync           3803/tcp  #SoniqSync
+soniqsync           3803/udp  #SoniqSync
+iqnet-port          3804/tcp  #Harman IQNet Port
+iqnet-port          3804/udp  #Harman IQNet Port
+tcpdataserver       3805/tcp  #ThorGuard Server Port
+tcpdataserver       3805/udp  #ThorGuard Server Port
+wsmlb               3806/tcp  #Remote System Manager
+wsmlb               3806/udp  #Remote System Manager
+spugna              3807/tcp  #SpuGNA Communication Port
+spugna              3807/udp  #SpuGNA Communication Port
+wlanauth            3810/tcp  #WLAN AS server
+wlanauth            3810/udp  #WLAN AS server
+amp                 3811/tcp  #AMP
+amp                 3811/udp  #AMP
+neto-wol-server     3812/tcp  #netO WOL Server
+neto-wol-server     3812/udp  #netO WOL Server
+rap-ip              3813/tcp  #Rhapsody Interface Protocol
+rap-ip              3813/udp  #Rhapsody Interface Protocol
+neto-dcs            3814/tcp  #netO DCS
+neto-dcs            3814/udp  #netO DCS
+lansurveyorxml      3815/tcp  #LANsurveyor XML
+lansurveyorxml      3815/udp  #LANsurveyor XML
+sunlps-http         3816/tcp  #Sun Local Patch Server
+sunlps-http         3816/udp  #Sun Local Patch Server
+tapeware            3817/tcp  #Yosemite Tech Tapeware
+tapeware            3817/udp  #Yosemite Tech Tapeware
+crinis-hb           3818/tcp  #Crinis Heartbeat
+crinis-hb           3818/udp  #Crinis Heartbeat
+sos                 3838/tcp  #Scito Object Server
+sos                 3838/udp  #Scito Object Server
+amx-mtgman          3839/tcp  #AMX MeetingManager
+amx-mtgman          3839/udp  #AMX MeetingManager
+flirtmitmir         3840/tcp  #www.FlirtMitMir.de
+flirtmitmir         3840/udp  #www.FlirtMitMir.de
+zfirm-shiprush3     3841/tcp  #Z-Firm ShipRush v3
+zfirm-shiprush3     3841/udp  #Z-Firm ShipRush v3
+nhci                3842/tcp  #NHCI status port
+nhci                3842/udp  #NHCI status port
+quest-agent         3843/tcp  #Quest Common Agent
+quest-agent         3843/udp  #Quest Common Agent
+rnm                 3844/tcp  #RNM
+rnm                 3844/udp  #RNM
+v-one-spp           3845/tcp  #V-ONE Single Port Proxy
+v-one-spp           3845/udp  #V-ONE Single Port Proxy
+an-pcp              3846/tcp  #Astare Network PCP
+an-pcp              3846/udp  #Astare Network PCP
+msfw-control        3847/tcp  #MS Firewall Control
+msfw-control        3847/udp  #MS Firewall Control
+item                3848/tcp  #IT Environmental Monitor
+item                3848/udp  #IT Environmental Monitor
+spw-dnspreload      3849/tcp  #SPACEWAY DNS Preload
+spw-dnspreload      3849/udp  #SPACEWAY DNS Prelaod
+qtms-bootstrap      3850/tcp  #QTMS Bootstrap Protocol
+qtms-bootstrap      3850/udp  #QTMS Bootstrap Protocol
+spectraport         3851/tcp  #SpectraTalk Port
+spectraport         3851/udp  #SpectraTalk Port
+sse-app-config      3852/tcp  #SSE App Configuration
+sse-app-config      3852/udp  #SSE App Configuration
+sscan               3853/tcp  #SONY scanning protocol
+sscan               3853/udp  #SONY scanning protocol
+stryker-com         3854/tcp  #Stryker Comm Port
+stryker-com         3854/udp  #Stryker Comm Port
+opentrac            3855/tcp  #OpenTRAC
+opentrac            3855/udp  #OpenTRAC
+informer            3856/tcp  #INFORMER
+informer            3856/udp  #INFORMER
+trap-port           3857/tcp  #Trap Port
+trap-port           3857/udp  #Trap Port
+trap-port-mom       3858/tcp  #Trap Port MOM
+trap-port-mom       3858/udp  #Trap Port MOM
+nav-port            3859/tcp  #Navini Port
+nav-port            3859/udp  #Navini Port
+ewlm                3860/tcp  #eWLM 
+ewlm                3860/udp  #eWLM 
+winshadow-hd        3861/tcp  #winShadow Host Discovery
+winshadow-hd        3861/udp  #winShadow Host Discovery
+giga-pocket         3862/tcp  #GIGA-POCKET
+giga-pocket         3862/udp  #GIGA-POCKET
+asap-tcp            3863/tcp  #asap tcp port
+asap-tcp            3863/udp  #asap tcp port
+asap-tcp-tls        3864/tcp  #asap/tls tcp port
+asap-tcp-tls        3864/udp  #asap/tls tcp port
+xpl                 3865/tcp  #xpl automation protocol
+xpl                 3865/udp  #xpl automation protocol
+dzdaemon            3866/tcp  #Sun SDViz DZDAEMON Port
+dzdaemon            3866/udp  #Sun SDViz DZDAEMON Port
+dzoglserver         3867/tcp  #Sun SDViz DZOGLSERVER Port
+dzoglserver         3867/udp  #Sun SDViz DZOGLSERVER Port
+diameter            3868/tcp  #DIAMETER
+ovsam-mgmt          3869/tcp  #hp OVSAM MgmtServer Disco
+ovsam-mgmt          3869/udp  #hp OVSAM MgmtServer Disco
+ovsam-d-agent       3870/tcp  #hp OVSAM HostAgent Disco
+ovsam-d-agent       3870/udp  #hp OVSAM HostAgent Disco
+avocent-adsap       3871/tcp  #Avocent DS Authorization
+avocent-adsap       3871/udp  #Avocent DS Authorization
+oem-agent           3872/tcp  #OEM Agent
+oem-agent           3872/udp  #OEM Agent
+fagordnc            3873/tcp  #fagordnc
+fagordnc            3873/udp  #fagordnc
+sixxsconfig         3874/tcp  #SixXS Configuration
+sixxsconfig         3874/udp  #SixXS Configuration
+pnbscada            3875/tcp  #PNBSCADA
+pnbscada            3875/udp  #PNBSCADA
+dl_agent            3876/tcp  #DirectoryLockdown Agent
+dl_agent            3876/udp  #DirectoryLockdown Agent
+xmpcr-interface     3877/tcp  #XMPCR Interface Port
+xmpcr-interface     3877/udp  #XMPCR Interface Port
+fotogcad            3878/tcp  #FotoG CAD interface
+fotogcad            3878/udp  #FotoG CAD interface
+appss-lm            3879/tcp  #appss license manager
+appss-lm            3879/udp  #appss license manager
+microgrid           3880/tcp  #microgrid
+microgrid           3880/udp  #microgrid
+idac                3881/tcp  #Data Acquisition and Control
+idac                3881/udp  #Data Acquisition and Control
+msdts1              3882/tcp  #DTS Service Port
+msdts1              3882/udp  #DTS Service Port
+vrpn                3883/tcp  #VR Peripheral Network
+vrpn                3883/udp  #VR Peripheral Network
+softrack-meter      3884/tcp  #SofTrack Metering
+softrack-meter      3884/udp  #SofTrack Metering
+topflow-ssl         3885/tcp  #TopFlow SSL
+topflow-ssl         3885/udp  #TopFlow SSL
+nei-management      3886/tcp  #NEI management port
+nei-management      3886/udp  #NEI management port
+leogic-data         3887/tcp  #Leogic Data Transport
+leogic-data         3887/udp  #Leogic Data Transport
+leogic-services     3888/tcp  #Leogic Services
+leogic-services     3888/udp  #Leogic Services
+dandv-tester        3889/tcp  #D and V Tester Control Port
+dandv-tester        3889/udp  #D and V Tester Control Port
+ndsconnect          3890/tcp  #Niche Data Server Connect
+ndsconnect          3890/udp  #Niche Data Server Connect
+rtc-pm-port         3891/tcp  #Oracle RTC-PM port
+rtc-pm-port         3891/udp  #Oracle RTC-PM port
+pcc-image-port      3892/tcp  #PCC-image-port
+pcc-image-port      3892/udp  #PCC-image-port
+cgi-starapi         3893/tcp  #CGI StarAPI Server
+cgi-starapi         3893/udp  #CGI StarAPI Server
+syam-agent          3894/tcp  #SyAM Agent Port
+syam-agent          3894/udp  #SyAM Agent Port
+syam-smc            3895/tcp  #SyAm SMC Service Port
+syam-smc            3895/udp  #SyAm SMC Service Port
+sdo-tls             3896/tcp  #Simple Distributed Objects over TLS
+sdo-tls             3896/udp  #Simple Distributed Objects over TLS
+sdo-ssh             3897/tcp  #Simple Distributed Objects over SSH
+sdo-ssh             3897/udp  #Simple Distributed Objects over SSH
+senip               3898/tcp  #IAS, Inc. SmartEye NET Internet Protocol
+senip               3898/udp  #IAS, Inc. SmartEye NET Internet Protocol
+itv-control         3899/tcp  #ITV Port
+itv-control         3899/udp  #ITV Port
+udt_os              3900/tcp  #Unidata UDT OS
+udt_os              3900/udp  #Unidata UDT OS
+nimsh               3901/tcp  #NIM Service Handler
+nimsh               3901/udp  #NIM Service Handler
+nimaux              3902/tcp  #NIMsh Auxiliary Port
+nimaux              3902/udp  #NIMsh Auxiliary Port
+charsetmgr          3903/tcp  #CharsetMGR
+charsetmgr          3903/udp  #CharsetMGR
+omnilink-port       3904/tcp  #Arnet Omnilink Port
+omnilink-port       3904/udp  #Arnet Omnilink Port
+mupdate             3905/tcp  #Mailbox Update (MUPDATE) protocol    
+mupdate             3905/udp  #Mailbox Update (MUPDATE) protocol
+topovista-data      3906/tcp  #TopoVista elevation data
+topovista-data      3906/udp  #TopoVista elevation data
+imoguia-port        3907/tcp  #Imoguia Port
+imoguia-port        3907/udp  #Imoguia Port
+hppronetman         3908/tcp  #HP Procurve NetManagement
+hppronetman         3908/udp  #HP Procurve NetManagement
+surfcontrolcpa      3909/tcp  #SurfControl CPA
+surfcontrolcpa      3909/udp  #SurfControl CPA
+prnrequest          3910/tcp  #Printer Request Port
+prnrequest          3910/udp  #Printer Request Port
+prnstatus           3911/tcp  #Printer Status Port
+prnstatus           3911/udp  #Printer Status Port
+gbmt-stars          3912/tcp  #Global Maintech Stars
+gbmt-stars          3912/udp  #Global Maintech Stars
+listcrt-port        3913/tcp  #ListCREATOR Port
+listcrt-port        3913/udp  #ListCREATOR Port
+listcrt-port-2      3914/tcp  #ListCREATOR Port 2
+listcrt-port-2      3914/udp  #ListCREATOR Port 2
+agcat               3915/tcp  #Auto-Graphics Cataloging
+agcat               3915/udp  #Auto-Graphics Cataloging
+wysdmc              3916/tcp  #WysDM Controller
+wysdmc              3916/udp  #WysDM Controller
+aftmux              3917/tcp  #AFT multiplex port
+aftmux              3917/udp  #AFT multiples port
+pktcablemmcops      3918/tcp  #PacketCableMultimediaCOPS
+pktcablemmcops      3918/udp  #PacketCableMultimediaCOPS
+hyperip             3919/tcp  #HyperIP
+hyperip             3919/udp  #HyperIP
+exasoftport1        3920/tcp  #Exasoft IP Port
+exasoftport1        3920/udp  #Exasoft IP Port
+herodotus-net       3921/tcp  #Herodotus Net
+herodotus-net       3921/udp  #Herodotus Net
+sor-update          3922/tcp  #Soronti Update Port
+sor-update          3922/udp  #Soronti Update Port
+symb-sb-port        3923/tcp  #Symbian Service Broker
+symb-sb-port        3923/udp  #Symbian Service Broker
+mpl-gprs-port       3924/tcp  #MPL_GPRS_PORT
+mpl-gprs-port       3924/udp  #MPL_GPRS_Port
+zmp                 3925/tcp  #Zoran Media Port
+zmp                 3925/udp  #Zoran Media Port
+winport             3926/tcp  #WINPort
+winport             3926/udp  #WINPort
+natdataservice      3927/tcp  #ScsTsr
+natdataservice      3927/udp  #ScsTsr
+netboot-pxe         3928/tcp  #PXE NetBoot Manager
+netboot-pxe         3928/udp  #PXE NetBoot Manager
+smauth-port         3929/tcp  #AMS Port
+smauth-port         3929/udp  #AMS Port
+syam-webserver      3930/tcp  #Syam Web Server Port
+syam-webserver      3930/udp  #Syam Web Server Port
+msr-plugin-port     3931/tcp  #MSR Plugin Port
+msr-plugin-port     3931/udp  #MSR Plugin Port
+dyn-site            3932/tcp  #Dynamic Site System
+dyn-site            3932/udp  #Dynamic Site System
+plbserve-port       3933/tcp  #PL/B App Server User Port
+plbserve-port       3933/udp  #PL/B App Server User Port
+sunfm-port          3934/tcp  #PL/B File Manager Port
+sunfm-port          3934/udp  #PL/B File Manager Port
+sdp-portmapper      3935/tcp  #SDP Port Mapper Protocol
+sdp-portmapper      3935/udp  #SDP Port Mapper Protocol
+mailprox            3936/tcp  #Mailprox
+mailprox            3936/udp  #Mailprox
+dvbservdscport      3937/tcp  #DVB Service Disc Port
+dvbservdscport      3937/udp  #DVB Service Disc Port
+dbcontrol_agent     3938/tcp  #Oracle dbControl Agent po
+dbcontrol_agent     3938/udp  #Oracel dbControl Agent po
+aamp                3939/tcp  #Anti-virus Application Management Port
+aamp                3939/udp  #Anti-virus Application Management Port
+xecp-node           3940/tcp  #XeCP Node Service 
+xecp-node           3940/udp  #XeCP Node Service
+homeportal-web      3941/tcp  #Home Portal Web Server
+homeportal-web      3941/udp  #Home Portal Web Server
+srdp                3942/tcp  #satellite distribution
+srdp                3942/udp  #satellite distribution
+tig                 3943/tcp  #TetraNode Ip Gateway
+tig                 3943/udp  #TetraNode Ip Gateway
+sops                3944/tcp  #S-Ops Management
+sops                3944/udp  #S-Ops Management
+emcads              3945/tcp  #EMCADS Server Port
+emcads              3945/udp  #EMCADS Server Port
+backupedge          3946/tcp  #BackupEDGE Server
+backupedge          3946/udp  #BackupEDGE Server
+ccp                 3947/tcp  #Connect and Control Protocol for Consumer, Commercial, and Industrial Electronic Devices
+ccp                 3947/udp  #Connect and Control Protocol for Consumer, Commercial, and Industrial Electronic Devices
+apdap               3948/tcp  #Anton Paar Device Administration Protocol
+apdap               3948/udp  #Anton Paar Device Administration Protocol
+drip                3949/tcp  #Dynamic Routing Information Protocol
+drip                3949/udp  #Dynamic Routing Information Protocol
+mapper-nodemgr      3984/tcp  #MAPPER network node manager
+mapper-nodemgr      3984/udp  #MAPPER network node manager
+mapper-mapethd      3985/tcp  #MAPPER TCP/IP server
+mapper-mapethd      3985/udp  #MAPPER TCP/IP server
+mapper-ws_ethd      3986/tcp  #MAPPER workstation server
+mapper-ws_ethd      3986/udp  #MAPPER workstation server
+centerline          3987/tcp  #Centerline
+centerline          3987/udp  #Centerline
+iss-mgmt-ssl        3995/tcp  #ISS Management Svcs SSL
+iss-mgmt-ssl        3995/udp  #ISS Management Svcs SSL
+abcsoftware         3996/tcp  #abcsoftware-01
+abscoftware         3996/udp  #abcsoftware-01
+terabase            4000/tcp  #Terabase
+terabase            4000/udp  #Terabase
+newoak              4001/tcp  #NewOak
+newoak              4001/udp  #NewOak
+pxc-spvr-ft         4002/tcp  #pxc-spvr-ft
+pxc-spvr-ft         4002/udp  #pxc-spvr-ft
+pxc-splr-ft         4003/tcp  #pxc-splr-ft
+pxc-splr-ft         4003/udp  #pxc-splr-ft
+pxc-roid            4004/tcp  #pxc-roid
+pxc-roid            4004/udp  #pxc-roid
+pxc-pin             4005/tcp  #pxc-pin
+pxc-pin             4005/udp  #pxc-pin
+pxc-spvr            4006/tcp  #pxc-spvr
+pxc-spvr            4006/udp  #pxc-spvr
+pxc-splr            4007/tcp  #pxc-splr
+pxc-splr            4007/udp  #pxc-splr
+netcheque           4008/tcp  #NetCheque accounting 
+netcheque           4008/udp  #NetCheque accounting 
+chimera-hwm         4009/tcp  #Chimera HWM
+chimera-hwm         4009/udp  #Chimera HWM
+samsung-unidex      4010/tcp  #Samsung Unidex
+samsung-unidex      4010/udp  #Samsung Unidex
+altserviceboot      4011/tcp  #Alternate Service Boot
+altserviceboot      4011/udp  #Alternate Service Boot
+pda-gate            4012/tcp  #PDA Gate
+pda-gate            4012/udp  #PDA Gate
+acl-manager         4013/tcp  #ACL Manager
+acl-manager         4013/udp  #ACL Manager
+taiclock            4014/tcp  #TAICLOCK
+taiclock            4014/udp  #TAICLOCK
+talarian-mcast1     4015/tcp  #Talarian Mcast
+talarian-mcast1     4015/udp  #Talarian Mcast
+talarian-mcast2     4016/tcp  #Talarian Mcast
+talarian-mcast2     4016/udp  #Talarian Mcast
+talarian-mcast3     4017/tcp  #Talarian Mcast
+talarian-mcast3     4017/udp  #Talarian Mcast
+talarian-mcast4     4018/tcp  #Talarian Mcast
+talarian-mcast4     4018/udp  #Talarian Mcast
+talarian-mcast5     4019/tcp  #Talarian Mcast
+talarian-mcast5     4019/udp  #Talarian Mcast
+trap                4020/tcp  #TRAP Port
+trap                4020/udp  #TRAP Port
+nexus-portal        4021/tcp  #Nexus Portal
+nexus-portal        4021/udp  #Nexus Portal
+dnox                4022/tcp  #DNOX
+dnox                4022/udp  #DNOX
+esnm-zoning         4023/tcp  #ESNM Zoning Port
+esnm-zoning         4023/udp  #ESNM Zoning Port
+tnp1-port           4024/tcp  #TNP1 User Port
+tnp1-port           4024/udp  #TNP1 User Port
+partimage           4025/tcp  #Partition Image Port
+partimage           4025/udp  #Partition Image Port
+as-debug            4026/tcp  #Graphical Debug Server
+as-debug            4026/udp  #Graphical Debug Server
+bxp                 4027/tcp  #bitxpress
+bxp                 4027/udp  #bitxpress
+dtserver-port       4028/tcp  #DTServer Port
+dtserver-port       4028/udp  #DTServer Port
+ip-qsig             4029/tcp  #IP Q signaling protocol
+ip-qsig             4029/udp  #IP Q signaling protocol
+jdmn-port           4030/tcp  #Accell/JSP Daemon Port
+jdmn-port           4030/udp  #Accell/JSP Daemon Port
+suucp               4031/tcp  #UUCP over SSL
+suucp               4031/udp  #UUCP over SSL
+vrts-auth-port      4032/tcp  #VERITAS Authorization Service
+vrts-auth-port      4032/udp  #VERITAS Authorization Service
+sanavigator         4033/tcp  #SANavigator Peer Port
+sanavigator         4033/udp  #SANavigator Peer Port
+ubxd                4034/tcp  #Ubiquinox Daemon 
+ubxd                4034/udp  #Ubiquinox Daemon
+wap-push-http       4035/tcp  #WAP Push OTA-HTTP port
+wap-push-http       4035/udp  #WAP Push OTA-HTTP port
+wap-push-https      4036/tcp  #WAP Push OTA-HTTP secure
+wap-push-https      4036/udp  #WAP Push OTA-HTTP secure
+yo-main             4040/tcp  #Yo.net main service
+yo-main             4040/udp  #Yo.net main service
+houston             4041/tcp  #Rocketeer-Houston
+houston             4041/udp  #Rocketeer-Houston
+ldxp                4042/tcp  #LDXP
+ldxp                4042/udp  #LDXP
+bre                 4096/tcp  #BRE (Bridge Relay Element)
+bre                 4096/udp  #BRE (Bridge Relay Element)
+patrolview          4097/tcp  #Patrol View
+patrolview          4097/udp  #Patrol View
+drmsfsd             4098/tcp  #drmsfsd
+drmsfsd             4098/udp  #drmsfsd
+dpcp                4099/tcp  #DPCP
+dpcp                4099/udp  #DPCP
+igo-incognito       4100/tcp  #IGo Incognito Data Port
+igo-incognito       4100/udp  #IGo Incognito Data Port
+jomamqmonitor       4114/tcp  #JomaMQMonitor
+jomamqmonitor       4114/udp  #JomaMQMonitor
+nuts_dem            4132/tcp  #NUTS Daemon
+nuts_dem            4132/udp  #NUTS Daemon
+nuts_bootp          4133/tcp  #NUTS Bootp Server
+nuts_bootp          4133/udp  #NUTS Bootp Server
+nifty-hmi           4134/tcp  #NIFTY-Serve HMI protocol
+nifty-hmi           4134/udp  #NIFTY-Serve HMI protocol
+nettest             4138/tcp  #nettest
+nettest             4138/udp  #nettest
+oirtgsvc            4141/tcp  #Workflow Server
+oirtgsvc            4141/udp  #Workflow Server
+oidocsvc            4142/tcp  #Document Server
+oidocsvc            4142/udp  #Document Server
+oidsr               4143/tcp  #Document Replication
+oidsr               4143/udp  #Document Replication
+vvr-control         4145/tcp  #VVR Control
+vvr-control         4145/udp  #VVR Control
+atlinks             4154/tcp  #atlinks device discovery
+atlinks             4154/udp  #atlinks device discovery
+jini-discovery      4160/tcp  #Jini Discovery
+jini-discovery      4160/udp  #Jini Discovery
+eims-admin          4199/tcp  #EIMS ADMIN
+eims-admin          4199/udp  #EIMS ADMIN
+corelccam           4300/tcp  #Corel CCam
+corelccam           4300/udp  #Corel CCam
+rwhois              4321/tcp  #Remote Who Is
+rwhois              4321/udp  #Remote Who Is
+unicall             4343/tcp  #UNICALL
+unicall             4343/udp  #UNICALL
+vinainstall         4344/tcp  #VinaInstall
+vinainstall         4344/udp  #VinaInstall
+m4-network-as       4345/tcp  #Macro 4 Network AS
+m4-network-as       4345/udp  #Macro 4 Network AS
+elanlm              4346/tcp  #ELAN LM
+elanlm              4346/udp  #ELAN LM
+lansurveyor         4347/tcp  #LAN Surveyor
+lansurveyor         4347/udp  #LAN Surveyor
+itose               4348/tcp  #ITOSE
+itose               4348/udp  #ITOSE
+fsportmap           4349/tcp  #File System Port Map
+fsportmap           4349/udp  #File System Port Map
+net-device          4350/tcp  #Net Device
+net-device          4350/udp  #Net Device
+plcy-net-svcs       4351/tcp  #PLCY Net Services
+plcy-net-svcs       4351/udp  #PLCY Net Services
+f5-iquery           4353/tcp  #F5 iQuery 
+f5-iquery           4353/udp  #F5 iQuery 
+qsnet-trans         4354/tcp  #QSNet Transmitter
+qsnet-trans         4354/udp  #QSNet Transmitter
+qsnet-workst        4355/tcp  #QSNet Workstation
+qsnet-workst        4355/udp  #QSNet Workstation
+qsnet-assist        4356/tcp  #QSNet Assistant
+qsnet-assist        4356/udp  #QSNet Assistant
+qsnet-cond          4357/tcp  #QSNet Conductor
+qsnet-cond          4357/udp  #QSNet Conductor
+qsnet-nucl          4358/tcp  #QSNet Nucleus
+qsnet-nucl          4358/udp  #QSNet Nucleus
+beacon-port-2       4426/tcp  #SMARTS Beacon Port
+saris               4442/tcp  #Saris
+saris               4442/udp  #Saris
+pharos              4443/tcp  #Pharos
+pharos              4443/udp  #Pharos
+krb524              4444/tcp  #KRB524
+krb524              4444/udp  #KRB524
+nv-video            4444/tcp  #NV Video default
+nv-video            4444/udp  #NV Video default
+upnotifyp           4445/tcp  #UPNOTIFYP
+upnotifyp           4445/udp  #UPNOTIFYP
+n1-fwp              4446/tcp  #N1-FWP
+n1-fwp              4446/udp  #N1-FWP
+n1-rmgmt            4447/tcp  #N1-RMGMT
+n1-rmgmt            4447/udp  #N1-RMGMT
+asc-slmd            4448/tcp  #ASC Licence Manager
+asc-slmd            4448/udp  #ASC Licence Manager
+privatewire         4449/tcp  #PrivateWire
+privatewire         4449/udp  #PrivateWire
+camp                4450/tcp  #Camp
+camp                4450/udp  #Camp
+ctisystemmsg        4451/tcp  #CTI System Msg
+ctisystemmsg        4451/udp  #CTI System Msg
+ctiprogramload      4452/tcp  #CTI Program Load
+ctiprogramload      4452/udp  #CTI Program Load
+nssalertmgr         4453/tcp  #NSS Alert Manager
+nssalertmgr         4453/udp  #NSS Alert Manager
+nssagentmgr         4454/tcp  #NSS Agent Manager
+nssagentmgr         4454/udp  #NSS Agent Manager
+prchat-user         4455/tcp  #PR Chat User
+prchat-user         4455/udp  #PR Chat User
+prchat-server       4456/tcp  #PR Chat Server
+prchat-server       4456/udp  #PR Chat Server
+prRegister          4457/tcp  #PR Register
+prRegister          4457/udp  #PR Register
+ipsec-msft          4500/tcp  #Microsoft IPsec NAT-T
+ipsec-msft          4500/udp  #Microsoft IPsec NAT-T
+worldscores         4545/tcp  #WorldScores
+worldscores         4545/udp  #WorldScores
+sf-lm               4546/tcp  #SF License Manager (Sentinel)
+sf-lm               4546/udp  #SF License Manager (Sentinel)
+lanner-lm           4547/tcp  #Lanner License Manager
+lanner-lm           4547/udp  #Lanner License Manager
+rsip                4555/tcp  #RSIP Port
+rsip                4555/udp  #RSIP Port
+hylafax             4559/tcp  #HylaFAX
+hylafax             4559/udp  #HylaFAX
+tram                4567/tcp  #TRAM
+tram                4567/udp  #TRAM
+bmc-reporting       4568/tcp  #BMC Reporting 
+bmc-reporting       4568/udp  #BMC Reporting 
+piranha1            4600/tcp  #Piranha1
+piranha1            4600/udp  #Piranha1
+piranha2            4601/tcp  #Piranha2
+piranha2            4601/udp  #Piranha2
+smaclmgr            4660/tcp  #smaclmgr
+smaclmgr            4660/udp  #smaclmgr
+kar2ouche           4661/tcp  #Kar2ouche Peer location service
+kar2ouche           4661/udp  #Kar2ouche Peer location service
+rfa                 4672/tcp  #remote file access server
+rfa                 4672/udp  #remote file access server
+snap                4752/tcp  #Simple Network Audio Protocol
+snap                4752/udp  #Simple Network Audio Protocol
+iims                4800/tcp  #Icona Instant Messenging System
+iims                4800/udp  #Icona Instant Messenging System
+iwec                4801/tcp  #Icona Web Embedded Chat
+iwec                4801/udp  #Icona Web Embedded Chat
+ilss                4802/tcp  #Icona License System Server
+ilss                4802/udp  #Icona License System Server
+htcp                4827/tcp  #HTCP
+htcp                4827/udp  #HTCP
+varadero-0          4837/tcp  #Varadero-0
+varadero-0          4837/udp  #Varadero-0 
+varadero-1          4838/tcp  #Varadero-1
+varadero-1          4838/udp  #Varadero-1
+varadero-2          4839/tcp  #Varadero-2
+varadero-2          4839/udp  #Varadero-2
+appserv-http        4848/tcp  #App Server - Admin HTTP
+appserv-http        4848/udp  #App Server - Admin HTTP
+appserv-https       4849/tcp  #App Server - Admin HTTPS
+appserv-https       4849/udp  #App Server - Admin HTTPS
+phrelay             4868/tcp  #Photon Relay
+phrelay             4868/udp  #Photon Relay
+phrelaydbg          4869/tcp  #Photon Relay Debug
+phrelaydbg          4869/udp  #Photon Relay Debug
+abbs                4885/tcp  #ABBS
+abbs                4885/udp  #ABBS
+lyskom              4894/tcp  #LysKOM Protocol A
+lyskom              4894/udp  #LysKOM Protocol A
+radmin-port         4899/tcp  #RAdmin Port
+radmin-port         4899/udp  #RAdmin Port
+att-intercom        4983/tcp  #AT&T Intercom
+att-intercom        4983/udp  #AT&T Intercom
+smar-se-port1       4987/tcp  #SMAR Ethernet Port 1
+smar-se-port1       4987/udp  #SMAR Ethernet Port 1
+smar-se-port2       4988/tcp  #SMAR Ethernet Port 2
+smar-se-port2       4988/udp  #SMAR Ethernet Port 2
+parallel            4989/tcp  #Parallel for GAUSS (tm)
+parallel            4989/udp  #Parallel for GAUSS (tm)
+rfe                 5002/tcp  #radio free ethernet
+rfe                 5002/udp  #radio free ethernet
+fmpro-internal      5003/tcp  #FileMaker, Inc. - Proprietary transport
+fmpro-internal      5003/udp  #FileMaker, Inc. - Proprietary name binding
+avt-profile-1       5004/tcp  #avt-profile-1
+avt-profile-1       5004/udp  #avt-profile-1
+avt-profile-2       5005/tcp  #avt-profile-2
+avt-profile-2       5005/udp  #avt-profile-2
+wsm-server          5006/tcp  #wsm server
+wsm-server          5006/udp  #wsm server
+wsm-server-ssl      5007/tcp  #wsm server ssl
+wsm-server-ssl      5007/udp  #wsm server ssl
+synapsis-edge       5008/tcp  #Synapsis EDGE
+synapsis-edge       5008/udp  #Synapsis EDGE
+telelpathstart      5010/tcp  #TelepathStart
+telelpathstart      5010/udp  #TelepathStart
+telelpathattack     5011/tcp  #TelepathAttack
+telelpathattack     5011/udp  #TelepathAttack
+zenginkyo-1         5020/tcp  #zenginkyo-1
+zenginkyo-1         5020/udp  #zenginkyo-1
+zenginkyo-2         5021/tcp  #zenginkyo-2
+zenginkyo-2         5021/udp  #zenginkyo-2
+mice                5022/tcp  #mice server
+mice                5022/udp  #mice server
+htuilsrv            5023/tcp  #Htuil Server for PLD2
+htuilsrv            5023/udp  #Htuil Server for PLD2
+scpi-telnet         5024/tcp  #SCPI-TELNET
+scpi-telnet         5024/udp  #SCPI-TELNET
+scpi-raw            5025/tcp  #SCPI-RAW
+scpi-raw            5025/udp  #SCPI-RAW
+asnaacceler8db      5042/tcp  #asnaacceler8db
+asnaacceler8db      5042/udp  #asnaacceler8db
+mmcc                5050/tcp  #multimedia conference control tool
+mmcc                5050/udp  #multimedia conference control tool
+ita-agent           5051/tcp  #ITA Agent
+ita-agent           5051/udp  #ITA Agent
+ita-manager         5052/tcp  #ITA Manager
+ita-manager         5052/udp  #ITA Manager
+unot                5055/tcp  #UNOT
+unot                5055/udp  #UNOT
+intecom-ps1         5056/tcp  #Intecom PS 1
+intecom-ps1         5056/udp  #Intecom PS 1
+intecom-ps2         5057/tcp  #Intecom PS 2
+intecom-ps2         5057/udp  #Intecom PS 2
+sip                 5060/tcp  #SIP
+sip                 5060/udp  #SIP
+sip-tls             5061/tcp  #SIP-TLS
+sip-tls             5061/udp  #SIP-TLS
+ca-1                5064/tcp  #Channel Access 1
+ca-1                5064/udp  #Channel Access 1
+ca-2                5065/tcp  #Channel Access 2
+ca-2                5065/udp  #Channel Access 2
+stanag-5066         5066/tcp  #STANAG-5066-SUBNET-INTF
+stanag-5066         5066/udp  #STANAG-5066-SUBNET-INTF
+i-net-2000-npr      5069/tcp  #I/Net 2000-NPR
+i-net-2000-npr      5069/udp  #I/Net 2000-NPR
+powerschool         5071/tcp  #PowerSchool
+powerschool         5071/udp  #PowerSchool
+sdl-ets             5081/tcp  #SDL - Ent Trans Server
+sdl-ets             5081/udp  #SDL - Ent Trans Server
+sentinel-lm         5093/tcp  #Sentinel LM
+sentinel-lm         5093/udp  #Sentinel LM
+sentlm-srv2srv      5099/tcp  #SentLM Srv2Srv
+sentlm-srv2srv      5099/udp  #SentLM Srv2Srv
+talarian-tcp        5101/tcp  #Talarian_TCP
+talarian-udp        5101/udp  #Talarian_UDP
+ctsd                5137/tcp  #MyCTS server port
+ctsd                5137/udp  #MyCTS server port
+rmonitor_secure     5145/tcp  #RMONITOR SECURE
+rmonitor_secure     5145/udp  #RMONITOR SECURE
+atmp                5150/tcp  #Ascend Tunnel Management Protocol
+atmp                5150/udp  #Ascend Tunnel Management Protocol
+esri_sde            5151/tcp  #ESRI SDE Instance
+esri_sde            5151/udp  #ESRI SDE Remote Start
+sde-discovery       5152/tcp  #ESRI SDE Instance Discovery
+sde-discovery       5152/udp  #ESRI SDE Instance Discovery
+bzflag              5154/tcp  #BZFlag game server
+bzflag              5154/udp  #BZFlag game server
+ife_icorp           5165/tcp  #ife_1corp
+ife_icorp           5165/udp  #ife_1corp
+aol                 5190/tcp  #America-Online
+aol                 5190/udp  #America-Online
+aol-1               5191/tcp  #AmericaOnline1
+aol-1               5191/udp  #AmericaOnline1
+aol-2               5192/tcp  #AmericaOnline2
+aol-2               5192/udp  #AmericaOnline2
+aol-3               5193/tcp  #AmericaOnline3
+aol-3               5193/udp  #AmericaOnline3
+targus-getdata      5200/tcp  #TARGUS GetData 
+targus-getdata      5200/udp  #TARGUS GetData  
+targus-getdata1     5201/tcp  #TARGUS GetData 1
+targus-getdata1     5201/udp  #TARGUS GetData 1
+targus-getdata2     5202/tcp  #TARGUS GetData 2
+targus-getdata2     5202/udp  #TARGUS GetData 2
+targus-getdata3     5203/tcp  #TARGUS GetData 3 
+targus-getdata3     5203/udp  #TARGUS GetData 3
+xmpp-client         5222/tcp  #XMPP Client Connection
+xmpp-client         5222/udp  #XMPP Client Connection
+hp-server           5225/tcp  #HP Server
+hp-server           5225/udp  #HP Server
+hp-status           5226/tcp  #HP Status
+hp-status           5226/udp  #HP Status
+igateway            5250/tcp  #iGateway
+igateway            5250/udp  #iGateway
+3com-njack-1        5264/tcp  #3Com Network Jack Port 1 
+3com-njack-1        5264/udp  #3Com Network Jack Port 1
+3com-njack-2        5265/tcp  #3Com Network Jack Port 2
+3com-njack-2        5265/udp  #3Com Network Jack Port 2
+xmpp-server         5269/tcp  #XMPP Server Connection
+xmpp-server         5269/udp  #XMPP Server Connection
+pk                  5272/tcp  #PK
+pk                  5272/udp  #PK
+transmit-port       5282/tcp  #Marimba Transmitter Port
+transmit-port       5282/udp  #Marimba Transmitter Port
+hacl-hb             5300/tcp  ## HA cluster heartbeat
+hacl-hb             5300/udp  ## HA cluster heartbeat
+hacl-gs             5301/tcp  ## HA cluster general services
+hacl-gs             5301/udp  ## HA cluster general services
+hacl-cfg            5302/tcp  ## HA cluster configuration
+hacl-cfg            5302/udp  ## HA cluster configuration
+hacl-probe          5303/tcp  ## HA cluster probing
+hacl-probe          5303/udp  ## HA cluster probing
+hacl-local          5304/tcp  ## HA Cluster Commands
+hacl-local          5304/udp
+hacl-test           5305/tcp  ## HA Cluster Test                    
+hacl-test           5305/udp
+sun-mc-grp          5306/tcp  #Sun MC Group
+sun-mc-grp          5306/udp  #Sun MC Group
+sco-aip             5307/tcp  #SCO AIP
+sco-aip             5307/udp  #SCO AIP
+cfengine            5308/tcp  #CFengine
+cfengine            5308/udp  #CFengine
+jprinter            5309/tcp  #J Printer
+jprinter            5309/udp  #J Printer
+outlaws             5310/tcp  #Outlaws
+outlaws             5310/udp  #Outlaws
+permabit-cs         5312/tcp  #Permabit Client-Server
+permabit-cs         5312/udp  #Permabit Client-Server
+rrdp                5313/tcp  #Real-time & Reliable Data
+rrdp                5313/udp  #Real-time & Reliable Data
+opalis-rbt-ipc      5314/tcp  #opalis-rbt-ipc
+opalis-rbt-ipc      5314/udp  #opalis-rbt-ipc
+hacl-poll           5315/tcp  #HA Cluster UDP Polling
+hacl-poll           5315/udp  #HA Cluster UDP Polling
+mdns                5353/tcp  #Multicast DNS
+mdns                5353/udp  #Multicast DNS
+mdnsresponder       5354/tcp  #Multicast DNS Responder IPC 
+mdnsresponder       5354/udp  #Multicast DNS Responder IPC
+excerpt             5400/tcp  #Excerpt Search
+excerpt             5400/udp  #Excerpt Search
+excerpts            5401/tcp  #Excerpt Search Secure
+excerpts            5401/udp  #Excerpt Search Secure
+mftp                5402/tcp  #MFTP
+mftp                5402/udp  #MFTP
+hpoms-ci-lstn       5403/tcp  #HPOMS-CI-LSTN
+hpoms-ci-lstn       5403/udp  #HPOMS-CI-LSTN
+hpoms-dps-lstn      5404/tcp  #HPOMS-DPS-LSTN
+hpoms-dps-lstn      5404/udp  #HPOMS-DPS-LSTN
+netsupport          5405/tcp  #NetSupport
+netsupport          5405/udp  #NetSupport
+systemics-sox       5406/tcp  #Systemics Sox
+systemics-sox       5406/udp  #Systemics Sox
+foresyte-clear      5407/tcp  #Foresyte-Clear
+foresyte-clear      5407/udp  #Foresyte-Clear
+foresyte-sec        5408/tcp  #Foresyte-Sec
+foresyte-sec        5408/udp  #Foresyte-Sec
+salient-dtasrv      5409/tcp  #Salient Data Server
+salient-dtasrv      5409/udp  #Salient Data Server
+salient-usrmgr      5410/tcp  #Salient User Manager
+salient-usrmgr      5410/udp  #Salient User Manager
+actnet              5411/tcp  #ActNet
+actnet              5411/udp  #ActNet
+continuus           5412/tcp  #Continuus
+continuus           5412/udp  #Continuus
+wwiotalk            5413/tcp  #WWIOTALK
+wwiotalk            5413/udp  #WWIOTALK
+statusd             5414/tcp  #StatusD
+statusd             5414/udp  #StatusD
+ns-server           5415/tcp  #NS Server
+ns-server           5415/udp  #NS Server
+sns-gateway         5416/tcp  #SNS Gateway
+sns-gateway         5416/udp  #SNS Gateway
+sns-agent           5417/tcp  #SNS Agent
+sns-agent           5417/udp  #SNS Agent
+mcntp               5418/tcp  #MCNTP
+mcntp               5418/udp  #MCNTP
+dj-ice              5419/tcp  #DJ-ICE
+dj-ice              5419/udp  #DJ-ICE
+cylink-c            5420/tcp  #Cylink-C
+cylink-c            5420/udp  #Cylink-C
+netsupport2         5421/tcp  #Net Support 2
+netsupport2         5421/udp  #Net Support 2
+salient-mux         5422/tcp  #Salient MUX
+salient-mux         5422/udp  #Salient MUX
+virtualuser         5423/tcp  #VIRTUALUSER
+virtualuser         5423/udp  #VIRTUALUSER
+devbasic            5426/tcp  #DEVBASIC
+devbasic            5426/udp  #DEVBASIC
+sco-peer-tta        5427/tcp  #SCO-PEER-TTA
+sco-peer-tta        5427/udp  #SCO-PEER-TTA
+telaconsole         5428/tcp  #TELACONSOLE
+telaconsole         5428/udp  #TELACONSOLE
+base                5429/tcp  #Billing and Accounting System Exchange
+base                5429/udp  #Billing and Accounting System Exchange
+radec-corp          5430/tcp  #RADEC CORP
+radec-corp          5430/udp  #RADEC CORP
+park-agent          5431/tcp  #PARK AGENT
+park-agent          5431/udp  #PARK AGENT
+postgresql          5432/tcp  #PostgreSQL Database
+postgresql          5432/udp  #PostgreSQL Database
+dttl                5435/tcp  #Data Tunneling Transceiver Linking (DTTL)
+dttl                5435/udp  #Data Tunneling Transceiver Linking (DTTL)
+apc-5454            5454/tcp  #APC 5454
+apc-5454            5454/udp  #APC 5454
+apc-5455            5455/tcp  #APC 5455
+apc-5455            5455/udp  #APC 5455
+apc-5456            5456/tcp  #APC 5456
+apc-5456            5456/udp  #APC 5456
+silkmeter           5461/tcp  #SILKMETER
+silkmeter           5461/udp  #SILKMETER
+ttl-publisher       5462/tcp  #TTL Publisher
+ttl-publisher       5462/udp  #TTL Publisher
+ttlpriceproxy       5463/tcp  #TTL Price Proxy
+ttlpriceproxy       5463/udp  #TTL Price Proxy
+netops-broker       5465/tcp  #NETOPS-BROKER
+netops-broker       5465/udp  #NETOPS-BROKER
+fcp-addr-srvr1      5500/tcp  #fcp-addr-srvr1
+fcp-addr-srvr1      5500/udp  #fcp-addr-srvr1
+fcp-addr-srvr2      5501/tcp  #fcp-addr-srvr2
+fcp-addr-srvr2      5501/udp  #fcp-addr-srvr2
+fcp-srvr-inst1      5502/tcp  #fcp-srvr-inst1
+fcp-srvr-inst1      5502/udp  #fcp-srvr-inst1
+fcp-srvr-inst2      5503/tcp  #fcp-srvr-inst2
+fcp-srvr-inst2      5503/udp  #fcp-srvr-inst2
+fcp-cics-gw1        5504/tcp  #fcp-cics-gw1
+fcp-cics-gw1        5504/udp  #fcp-cics-gw1
+sgi-eventmond       5553/tcp  #SGI Eventmond Port
+sgi-eventmond       5553/udp  #SGI Eventmond Port
+sgi-esphttp         5554/tcp  #SGI ESP HTTP
+sgi-esphttp         5554/udp  #SGI ESP HTTP
+personal-agent      5555/tcp  #Personal Agent
+personal-agent      5555/udp  #Personal Agent
+udpplus             5566/tcp  #UDPPlus
+udpplus             5566/udp  #UDPPlus
+esinstall           5599/tcp  #Enterprise Security Remote Install
+esinstall           5599/udp  #Enterprise Security Remote Install
+esmmanager          5600/tcp  #Enterprise Security Manager
+esmmanager          5600/udp  #Enterprise Security Manager
+esmagent            5601/tcp  #Enterprise Security Agent
+esmagent            5601/udp  #Enterprise Security Agent
+a1-msc              5602/tcp  #A1-MSC
+a1-msc              5602/udp  #A1-MSC
+a1-bs               5603/tcp  #A1-BS
+a1-bs               5603/udp  #A1-BS
+a3-sdunode          5604/tcp  #A3-SDUNode
+a3-sdunode          5604/udp  #A3-SDUNode
+a4-sdunode          5605/tcp  #A4-SDUNode
+a4-sdunode          5605/udp  #A4-SDUNode
+pcanywheredata      5631/tcp  #pcANYWHEREdata
+pcanywheredata      5631/udp  #pcANYWHEREdata
+pcanywherestat      5632/tcp  #pcANYWHEREstat
+pcanywherestat      5632/udp  #pcANYWHEREstat
+jms                 5673/tcp  #JACL Message Server
+jms                 5673/udp  #JACL Message Server
+hyperscsi-port      5674/tcp  #HyperSCSI Port
+hyperscsi-port      5674/udp  #HyperSCSI Port
+v5ua                5675/tcp  #V5UA application port
+v5ua                5675/udp  #V5UA application port
+raadmin             5676/tcp  #RA Administration
+raadmin             5676/udp  #RA Administration
+questdb2-lnchr      5677/tcp  #Quest Central DB2 Launchr
+questdb2-lnchr      5677/udp  #Quest Central DB2 Launchr
+rrac                5678/tcp  #Remote Replication Agent Connection  
+rrac                5678/udp  #Remote Replication Agent Connection  
+dccm                5679/tcp  #Direct Cable Connect Manager
+dccm                5679/udp  #Direct Cable Connect Manager
+ggz                 5688/tcp  #GGZ Gaming Zone
+ggz                 5688/udp  #GGZ Gaming Zone
+proshareaudio       5713/tcp  #proshare conf audio
+proshareaudio       5713/udp  #proshare conf audio
+prosharevideo       5714/tcp  #proshare conf video
+prosharevideo       5714/udp  #proshare conf video
+prosharedata        5715/tcp  #proshare conf data 
+prosharedata        5715/udp  #proshare conf data 
+prosharerequest     5716/tcp  #proshare conf request
+prosharerequest     5716/udp  #proshare conf request
+prosharenotify      5717/tcp  #proshare conf notify 
+prosharenotify      5717/udp  #proshare conf notify 
+ms-licensing        5720/tcp  #MS-Licensing
+ms-licensing        5720/udp  #MS-Licensing 
+openmail            5729/tcp  #Openmail User Agent Layer
+openmail            5729/udp  #Openmail User Agent Layer
+unieng              5730/tcp  #Steltor's calendar access
+unieng              5730/udp  #Steltor's calendar access
+ida-discover1       5741/tcp  #IDA Discover Port 1
+ida-discover1       5741/udp  #IDA Discover Port 1
+ida-discover2       5742/tcp  #IDA Discover Port 2
+ida-discover2       5742/udp  #IDA Discover Port 2
+fcopy-server        5745/tcp  #fcopy-server
+fcopy-server        5745/udp  #fcopy-server
+fcopys-server       5746/tcp  #fcopys-server
+fcopys-server       5746/udp  #fcopys-server
+openmailg           5755/tcp  #OpenMail Desk Gateway server
+openmailg           5755/udp  #OpenMail Desk Gateway server
+x500ms              5757/tcp  #OpenMail X.500 Directory Server
+x500ms              5757/udp  #OpenMail X.500 Directory Server
+openmailns          5766/tcp  #OpenMail NewMail Server
+openmailns          5766/udp  #OpenMail NewMail Server
+s-openmail          5767/tcp  #OpenMail Suer Agent Layer (Secure)
+s-openmail          5767/udp  #OpenMail Suer Agent Layer (Secure)
+openmailpxy         5768/tcp  #OpenMail CMTS Server
+openmailpxy         5768/udp  #OpenMail CMTS Server
+netagent            5771/tcp  #NetAgent
+netagent            5771/udp  #NetAgent
+dali-port           5777/tcp  #DALI Port
+dali-port           5777/udp  #DALI Port
+icmpd               5813/tcp  #ICMPD
+icmpd               5813/udp  #ICMPD
+spt-automation      5814/tcp  #Support Automation
+spt-automation      5814/udp  #Support Automation
+wherehoo            5859/tcp  #WHEREHOO
+wherehoo            5859/udp  #WHEREHOO
+mppolicy-v5         5968/tcp  #mppolicy-v5
+mppolicy-v5         5968/udp  #mppolicy-v5
+mppolicy-mgr        5969/tcp  #mppolicy-mgr
+mppolicy-mgr        5969/udp  #mppolicy-mgr
+wbem-rmi            5987/tcp  #WBEM RMI
+wbem-rmi            5987/udp  #WBEM RMI
+wbem-http           5988/tcp  #WBEM HTTP
+wbem-http           5988/udp  #WBEM HTTP
+wbem-https          5989/tcp  #WBEM HTTPS
+wbem-https          5989/udp  #WBEM HTTPS
+nuxsl               5991/tcp  #NUXSL
+nuxsl               5991/udp  #NUXSL
+cvsup               5999/tcp  #CVSup
+cvsup               5999/udp  #CVSup
+ndl-ahp-svc         6064/tcp  #NDL-AHP-SVC
+ndl-ahp-svc         6064/udp  #NDL-AHP-SVC
+winpharaoh          6065/tcp  #WinPharaoh
+winpharaoh          6065/udp  #WinPharaoh
+ewctsp              6066/tcp  #EWCTSP
+ewctsp              6066/udp  #EWCTSP
+srb                 6067/tcp  #SRB
+srb                 6067/udp  #SRB
+gsmp                6068/tcp  #GSMP
+gsmp                6068/udp  #GSMP
+trip                6069/tcp  #TRIP
+trip                6069/udp  #TRIP
+messageasap         6070/tcp  #Messageasap
+messageasap         6070/udp  #Messageasap
+ssdtp               6071/tcp  #SSDTP
+ssdtp               6071/udp  #SSDTP
+diagnose-proc       6072/tcp  #DIAGNOSE-PROC
+diagnose-proc       6072/udp  #DIAGNOSE-PROC
+directplay8         6073/tcp  #DirectPlay8
+directplay8         6073/udp  #DirectPlay8
+konspire2b          6085/tcp  #konspire2b p2p network
+konspire2b          6085/udp  #konspire2b p2p network
+synchronet-db       6100/tcp  #SynchroNet-db
+synchronet-db       6100/udp  #SynchroNet-db
+synchronet-rtc      6101/tcp  #SynchroNet-rtc
+synchronet-rtc      6101/udp  #SynchroNet-rtc
+synchronet-upd      6102/tcp  #SynchroNet-upd
+synchronet-upd      6102/udp  #SynchroNet-upd
+rets                6103/tcp  #RETS
+rets                6103/udp  #RETS
+dbdb                6104/tcp  #DBDB
+dbdb                6104/udp  #DBDB
+primaserver         6105/tcp  #Prima Server
+primaserver         6105/udp  #Prima Server
+mpsserver           6106/tcp  #MPS Server
+mpsserver           6106/udp  #MPS Server
+etc-control         6107/tcp  #ETC Control
+etc-control         6107/udp  #ETC Control
+sercomm-scadmin     6108/tcp  #Sercomm-SCAdmin
+sercomm-scadmin     6108/udp  #Sercomm-SCAdmin
+globecast-id        6109/tcp  #GLOBECAST-ID
+globecast-id        6109/udp  #GLOBECAST-ID
+softcm              6110/tcp  #HP SoftBench CM
+softcm              6110/udp  #HP SoftBench CM
+spc                 6111/tcp  #HP SoftBench Sub-Process Control
+spc                 6111/udp  #HP SoftBench Sub-Process Control
+dtspcd              6112/tcp  #dtspcd
+dtspcd              6112/udp  #dtspcd   
+backup-express      6123/tcp  #Backup Express
+backup-express      6123/udp  #Backup Express
+meta-corp           6141/tcp  #Meta Corporation License Manager
+meta-corp           6141/udp  #Meta Corporation License Manager
+aspentec-lm         6142/tcp  #Aspen Technology License Manager
+aspentec-lm         6142/udp  #Aspen Technology License Manager
+watershed-lm        6143/tcp  #Watershed License Manager
+watershed-lm        6143/udp  #Watershed License Manager
+statsci1-lm         6144/tcp  #StatSci License Manager - 1
+statsci1-lm         6144/udp  #StatSci License Manager - 1
+statsci2-lm         6145/tcp  #StatSci License Manager - 2
+statsci2-lm         6145/udp  #StatSci License Manager - 2
+lonewolf-lm         6146/tcp  #Lone Wolf Systems License Manager
+lonewolf-lm         6146/udp  #Lone Wolf Systems License Manager
+montage-lm          6147/tcp  #Montage License Manager
+montage-lm          6147/udp  #Montage License Manager
+ricardo-lm          6148/tcp  #Ricardo North America License Manager
+ricardo-lm          6148/udp  #Ricardo North America License Manager
+tal-pod             6149/tcp  #tal-pod 
+tal-pod             6149/udp  #tal-pod 
+crip                6253/tcp  #CRIP
+crip                6253/udp  #CRIP
+bmc-grx             6300/tcp  #BMC GRX
+bmc-grx             6300/udp  #BMC GRX
+emp-server1         6321/tcp  #Empress Software Connectivity Server 1
+emp-server1         6321/udp  #Empress Software Connectivity Server 1   
+emp-server2         6322/tcp  #Empress Software Connectivity Server 2  
+emp-server2         6322/udp  #Empress Software Connectivity Server 2  
+sflow               6343/tcp  #sFlow traffic monitoring
+sflow               6343/udp  #sFlow traffic monitoring
+gnutella-svc        6346/tcp  #gnutella-svc
+gnutella-svc        6346/udp  #gnutella-svc
+gnutella-rtr        6347/tcp  #gnutella-rtr
+gnutella-rtr        6347/udp  #gnutella-rtr
+metatude-mds        6382/tcp  #Metatude Dialogue Server
+metatude-mds        6382/udp  #Metatude Dialogue Server
+clariion-evr01      6389/tcp  #clariion-evr01
+clariion-evr01      6389/udp  #clariion-evr01
+skip-cert-recv      6455/tcp  #SKIP Certificate Receive
+skip-cert-send      6456/tcp  #SKIP Certificate Send
+lvision-lm          6471/tcp  #LVision License Manager
+lvision-lm          6471/udp  #LVision License Manager
+boks                6500/tcp  #BoKS Master
+boks                6500/udp  #BoKS Master
+boks_servc          6501/tcp  #BoKS Servc
+boks_servc          6501/udp  #BoKS Servc
+boks_servm          6502/tcp  #BoKS Servm
+boks_servm          6502/udp  #BoKS Servm
+boks_clntd          6503/tcp  #BoKS Clntd
+boks_clntd          6503/udp  #BoKS Clntd
+badm_priv           6505/tcp  #BoKS Admin Private Port
+badm_priv           6505/udp  #BoKS Admin Private Port
+badm_pub            6506/tcp  #BoKS Admin Public Port
+badm_pub            6506/udp  #BoKS Admin Public Port
+bdir_priv           6507/tcp  #BoKS Dir Server, Private Port
+bdir_priv           6507/udp  #BoKS Dir Server, Private Port
+bdir_pub            6508/tcp  #BoKS Dir Server, Public Port
+bdir_pub            6508/udp  #BoKS Dir Server, Public Port
+mgcs-mfp-port       6509/tcp  #MGCS-MFP Port
+mgcs-mfp-port       6509/udp  #MGCS-MFP Port
+mcer-port           6510/tcp  #MCER Port
+mcer-port           6510/udp  #MCER Port
+lds-distrib         6543/tcp  #lds_distrib
+lds-distrib         6543/udp  #lds_distrib
+apc-6547            6547/tcp  #APC 6547
+apc-6547            6547/udp  #APC 6547
+apc-6548            6548/tcp  #APC 6548
+apc-6548            6548/udp  #APC 6548
+apc-6549            6549/tcp  #APC 6549
+apc-6549            6549/udp  #APC 6549
+fg-sysupdate        6550/tcp  #fg-sysupdate
+fg-sysupdate        6550/udp  #fg-sysupdate
+xdsxdm              6558/tcp
+xdsxdm              6558/udp
+sane-port           6566/tcp  #SANE Control Port
+sane-port           6566/udp  #SANE Control Port
+parsec-master       6580/tcp  #Parsec Masterserver
+parsec-master       6580/udp  #Parsec Masterserver
+parsec-peer         6581/tcp  #Parsec Peer-to-Peer
+parsec-peer         6581/udp  #Parsec Peer-to-Peer
+parsec-game         6582/tcp  #Parsec Gameserver
+parsec-game         6582/udp  #Parsec Gameserver
+afesc-mc            6628/tcp  #AFE Stock Channel M/C
+afesc-mc            6628/udp  #AFE Stock Channel M/C
+vocaltec-gold       6670/tcp  #Vocaltec Global Online Directory
+vocaltec-gold       6670/udp  #Vocaltec Global Online Directory
+vision_server       6672/tcp  #vision_server
+vision_server       6672/udp  #vision_server
+vision_elmd         6673/tcp  #vision_elmd
+vision_elmd         6673/udp  #vision_elmd
+kti-icad-srvr       6701/tcp  #KTI/ICAD Nameserver
+kti-icad-srvr       6701/udp  #KTI/ICAD Nameserver
+ibprotocol          6714/tcp  #Internet Backplane Protocol
+ibprotocol          6714/udp  #Internet Backplane Protocol
+bmc-perf-agent      6767/tcp  #BMC PERFORM AGENT
+bmc-perf-agent      6767/udp  #BMC PERFORM AGENT
+bmc-perf-mgrd       6768/tcp  #BMC PERFORM MGRD   
+bmc-perf-mgrd       6768/udp  #BMC PERFORM MGRD
+smc-http            6788/tcp  #SMC-HTTP
+smc-http            6788/udp  #SMC-HTTP
+smc-https           6789/tcp  #SMC-HTTPS
+smc-https           6789/udp  #SMC-HTTPS
+hnmp                6790/tcp  #HNMP
+hnmp                6790/udp  #HNMP
+ambit-lm            6831/tcp  #ambit-lm
+ambit-lm            6831/udp  #ambit-lm
+netmo-default       6841/tcp  #Netmo Default
+netmo-default       6841/udp  #Netmo Default
+netmo-http          6842/tcp  #Netmo HTTP
+netmo-http          6842/udp  #Netmo HTTP
+iccrushmore         6850/tcp  #ICCRUSHMORE
+iccrushmore         6850/udp  #ICCRUSHMORE
+muse                6888/tcp  #MUSE
+muse                6888/udp  #MUSE
+jmact3              6961/tcp  #JMACT3
+jmact3              6961/udp  #JMACT3
+jmevt2              6962/tcp  #jmevt2
+jmevt2              6962/udp  #jmevt2
+swismgr1            6963/tcp  #swismgr1
+swismgr1            6963/udp  #swismgr1
+swismgr2            6964/tcp  #swismgr2
+swismgr2            6964/udp  #swismgr2
+swistrap            6965/tcp  #swistrap
+swistrap            6965/udp  #swistrap
+swispol             6966/tcp  #swispol
+swispol             6966/udp  #swispol
+acmsoda             6969/tcp  #acmsoda
+acmsoda             6969/udp  #acmsoda
+iatp-highpri        6998/tcp  #IATP-highPri
+iatp-highpri        6998/udp  #IATP-highPri
+iatp-normalpri      6999/tcp  #IATP-normalPri
+iatp-normalpri      6999/udp  #IATP-normalPri
+afs3-fileserver     7000/tcp  #file server itself
+afs3-fileserver     7000/udp  #file server itself
+afs3-callback       7001/tcp  #callbacks to cache managers
+afs3-callback       7001/udp  #callbacks to cache managers
+afs3-prserver       7002/tcp  #users & groups database
+afs3-prserver       7002/udp  #users & groups database
+afs3-vlserver       7003/tcp  #volume location database
+afs3-vlserver       7003/udp  #volume location database
+afs3-kaserver       7004/tcp  #AFS/Kerberos authentication service
+afs3-kaserver       7004/udp  #AFS/Kerberos authentication service
+afs3-volser         7005/tcp  #volume managment server
+afs3-volser         7005/udp  #volume managment server
+afs3-errors         7006/tcp  #error interpretation service
+afs3-errors         7006/udp  #error interpretation service
+afs3-bos            7007/tcp  #basic overseer process
+afs3-bos            7007/udp  #basic overseer process
+afs3-update         7008/tcp  #server-to-server updater
+afs3-update         7008/udp  #server-to-server updater
+afs3-rmtsys         7009/tcp  #remote cache manager service
+afs3-rmtsys         7009/udp  #remote cache manager service
+ups-onlinet         7010/tcp  #onlinet uninterruptable power supplies
+ups-onlinet         7010/udp  #onlinet uninterruptable power supplies
+talon-disc          7011/tcp  #Talon Discovery Port
+talon-disc          7011/udp  #Talon Discovery Port
+talon-engine        7012/tcp  #Talon Engine
+talon-engine        7012/udp  #Talon Engine
+microtalon-dis      7013/tcp  #Microtalon Discovery
+microtalon-dis      7013/udp  #Microtalon Discovery
+microtalon-com      7014/tcp  #Microtalon Communications
+microtalon-com      7014/udp  #Microtalon Communications
+talon-webserver     7015/tcp  #Talon Webserver
+talon-webserver     7015/udp  #Talon Webserver
+dpserve             7020/tcp  #DP Serve
+dpserve             7020/udp  #DP Serve
+dpserveadmin        7021/tcp  #DP Serve Admin
+dpserveadmin        7021/udp  #DP Serve Admin
+op-probe            7030/tcp  #ObjectPlanet probe
+op-probe            7030/udp  #ObjectPlanet probe
+arcp                7070/tcp  #ARCP
+arcp                7070/udp  #ARCP
+lazy-ptop           7099/tcp  #lazy-ptop
+lazy-ptop           7099/udp  #lazy-ptop
+font-service        7100/tcp  #X Font Service
+font-service        7100/udp  #X Font Service
+virprot-lm          7121/tcp  #Virtual Prototypes License Manager
+virprot-lm          7121/udp  #Virtual Prototypes License Manager
+clutild             7174/tcp  #Clutild
+clutild             7174/udp  #Clutild
+fodms               7200/tcp  #FODMS FLIP  
+fodms               7200/udp  #FODMS FLIP  
+dlip                7201/tcp  #DLIP
+dlip                7201/udp  #DLIP
+ramp                7227/tcp  #Registry A & M Protocol
+ramp                7227/udp  #Registry A $ M Protocol 
+itactionserver1     7280/tcp  #ITACTIONSERVER 1
+itactionserver1     7280/udp  #ITACTIONSERVER 1
+itactionserver2     7281/tcp  #ITACTIONSERVER 2
+itactionserver2     7281/udp  #ITACTIONSERVER 2
+mindfilesys         7391/tcp  #mind-file system server
+mindfilesys         7391/udp  #mind-file system server
+mrssrendezvous      7392/tcp  #mrss-rendezvous server
+mrssrendezvous      7392/udp  #mrss-rendezvous server
+winqedit            7395/tcp  #winqedit
+winqedit            7395/udp  #winqedit
+pmdmgr              7426/tcp  #OpenView DM Postmaster Manager
+pmdmgr              7426/udp  #OpenView DM Postmaster Manager
+oveadmgr            7427/tcp  #OpenView DM Event Agent Manager
+oveadmgr            7427/udp  #OpenView DM Event Agent Manager
+ovladmgr            7428/tcp  #OpenView DM Log Agent Manager
+ovladmgr            7428/udp  #OpenView DM Log Agent Manager
+opi-sock            7429/tcp  #OpenView DM rqt communication
+opi-sock            7429/udp  #OpenView DM rqt communication
+xmpv7               7430/tcp  #OpenView DM xmpv7 api pipe
+xmpv7               7430/udp  #OpenView DM xmpv7 api pipe
+pmd                 7431/tcp  #OpenView DM ovc/xmpv3 api pipe
+pmd                 7431/udp  #OpenView DM ovc/xmpv3 api pipe
+faximum             7437/tcp  #Faximum
+faximum             7437/udp  #Faximum
+telops-lmd          7491/tcp  #telops-lmd
+telops-lmd          7491/udp  #telops-lmd
+silhouette          7500/tcp  #Silhouette User
+silhouette          7500/udp  #Silhouette User
+ovbus               7501/tcp  #HP OpenView Bus Daemon
+ovbus               7501/udp  #HP OpenView Bus Daemon
+ovhpas              7510/tcp  #HP OpenView Application Server
+ovhpas              7510/udp  #HP OpenView Application Server
+pafec-lm            7511/tcp  #pafec-lm
+pafec-lm            7511/udp  #pafec-lm
+nta-ds              7544/tcp  #FlowAnalyzer DisplayServer
+nta-ds              7544/udp  #FlowAnalyzer DisplayServer
+nta-us              7545/tcp  #FlowAnalyzer UtilityServer
+nta-us              7545/udp  #FlowAnalyzer UtilityServer
+vsi-omega           7566/tcp  #VSI Omega	
+vsi-omega           7566/udp  #VSI Omega
+aries-kfinder       7570/tcp  #Aries Kfinder
+aries-kfinder       7570/udp  #Aries Kfinder
+sun-lm              7588/tcp  #Sun License Manager
+sun-lm              7588/udp  #Sun License Manager
+indi                7624/tcp  #Instrument Neutral Distributed Interface
+indi                7624/udp  #Instrument Neutral Distributed Interface
+pmdfmgt             7633/tcp  #PMDF Management
+pmdfmgt             7633/udp  #PMDF Management
+imqtunnels          7674/tcp  #iMQ SSL tunnel
+imqtunnels          7674/udp  #iMQ SSL tunnel
+imqtunnel           7675/tcp  #iMQ Tunnel
+imqtunnel           7675/udp  #iMQ Tunnel
+imqbrokerd          7676/tcp  #iMQ Broker Rendezvous
+imqbrokerd          7676/udp  #iMQ Broker Rendezvous
+medimageportal      7720/tcp  #MedImage Portal
+medimageportal      7720/udp  #MedImage Portal
+sstp-1              7743/tcp  #Sakura Script Transfer Protocol
+sstp-1              7743/udp  #Sakura Script Transfer Protocol
+cbt                 7777/tcp  #cbt
+cbt                 7777/udp  #cbt
+interwise           7778/tcp  #Interwise
+interwise           7778/udp  #Interwise
+vstat               7779/tcp  #VSTAT
+vstat               7779/udp  #VSTAT
+accu-lmgr           7781/tcp  #accu-lmgr
+accu-lmgr           7781/udp  #accu-lmgr
+minivend            7786/tcp  #MINIVEND
+minivend            7786/udp  #MINIVEND
+pnet-conn           7797/tcp  #Propel Connector port
+pnet-conn           7797/udp  #Propel Connector port
+pnet-enc            7798/tcp  #Propel Encoder port
+pnet-enc            7798/udp  #Propel Encoder port
+apc-7845            7845/tcp  #APC 7845
+apc-7845            7845/udp  #APC 7845
+apc-7846            7846/tcp  #APC 7846
+apc-7846            7846/udp  #APC 7846
+qo-secure           7913/tcp  #QuickObjects secure port
+qo-secure           7913/udp  #QuickObjects secure port
+t2-drm              7932/tcp  #Tier 2 Data Resource Manager
+t2-drm              7932/udp  #Tier 2 Data Resource Manager
+t2-brm              7933/tcp  #Tier 2 Business Rules Manager
+t2-brm              7933/udp  #Tier 2 Business Rules Manager
+supercell           7967/tcp  #Supercell
+supercell           7967/udp  #Supercell
+micromuse-ncps      7979/tcp  #Micromuse-ncps
+micromuse-ncps      7979/udp  #Micromuse-ncps
+quest-vista         7980/tcp  #Quest Vista
+quest-vista         7980/udp  #Quest Vista
+irdmi2              7999/tcp  #iRDMI2
+irdmi2              7999/udp  #iRDMI2
+irdmi               8000/tcp  #iRDMI
+irdmi               8000/udp  #iRDMI
+vcom-tunnel         8001/tcp  #VCOM Tunnel
+vcom-tunnel         8001/udp  #VCOM Tunnel
+teradataordbms      8002/tcp  #Teradata ORDBMS
+teradataordbms      8002/udp  #Teradata ORDBMS
+http-alt            8008/tcp  #HTTP Alternate
+http-alt            8008/udp  #HTTP Alternate
+oa-system           8022/tcp  #oa-system
+oa-system           8022/udp  #oa-system 
+pro-ed              8032/tcp  #ProEd
+pro-ed              8032/udp  #ProEd
+mindprint           8033/tcp  #MindPrint
+mindprint           8033/udp  #MindPrint
+http-alt            8080/tcp  #HTTP Alternate (see port 80)
+http-alt            8080/udp  #HTTP Alternate (see port 80)
+radan-http          8088/tcp  #Radan HTTP
+radan-http          8088/udp  #Radan HTTP
+xprint-server       8100/tcp  #Xprint Server
+xprint-server       8100/udp  #Xprint Server
+mtl8000-matrix      8115/tcp  #MTL8000 Matrix
+mtl8000-matrix      8115/udp  #MTL8000 Matrix
+cp-cluster          8116/tcp  #Check Point Clustering
+cp-cluster          8116/udp  #Check Point Clustering
+privoxy             8118/tcp  #Privoxy HTTP proxy
+privoxy             8118/udp  #Privoxy HTTP proxy
+apollo-data         8121/tcp  #Apollo Data Port
+apollo-data         8121/udp  #Apollo Data Port
+apollo-admin        8122/tcp  #Apollo Admin Port
+apollo-admin        8122/udp  #Apollo Admin Port
+indigo-vrmi         8130/tcp  #INDIGO-VRMI
+indigo-vrmi         8130/udp  #INDIGO-VRMI
+indigo-vbcp         8131/tcp  #INDIGO-VBCP
+indigo-vbcp         8131/udp  #INDIGO-VBCP
+dbabble             8132/tcp  #dbabble
+dbabble             8132/udp  #dbabble
+patrol              8160/tcp  #Patrol
+patrol              8160/udp  #Patrol
+patrol-snmp         8161/tcp  #Patrol SNMP
+patrol-snmp         8161/udp  #Patrol SNMP
+vvr-data            8199/tcp  #VVR DATA
+vvr-data            8199/udp  #VVR DATA
+trivnet1            8200/tcp  #TRIVNET
+trivnet1            8200/udp  #TRIVNET
+trivnet2            8201/tcp  #TRIVNET
+trivnet2            8201/udp  #TRIVNET
+lm-perfworks        8204/tcp  #LM Perfworks
+lm-perfworks        8204/udp  #LM Perfworks
+lm-instmgr          8205/tcp  #LM Instmgr
+lm-instmgr          8205/udp  #LM Instmgr
+lm-dta              8206/tcp  #LM Dta
+lm-dta              8206/udp  #LM Dta
+lm-sserver          8207/tcp  #LM SServer
+lm-sserver          8207/udp  #LM SServer
+lm-webwatcher       8208/tcp  #LM Webwatcher
+lm-webwatcher       8208/udp  #LM Webwatcher
+server-find         8351/tcp  #Server Find
+server-find         8351/udp  #Server Find
+cruise-enum         8376/tcp  #Cruise ENUM
+cruise-enum         8376/udp  #Cruise ENUM
+cruise-swroute      8377/tcp  #Cruise SWROUTE
+cruise-swroute      8377/udp  #Cruise SWROUTE
+cruise-config       8378/tcp  #Cruise CONFIG
+cruise-config       8378/udp  #Cruise CONFIG
+cruise-diags        8379/tcp  #Cruise DIAGS
+cruise-diags        8379/udp  #Cruise DIAGS
+cruise-update       8380/tcp  #Cruise UPDATE
+cruise-update       8380/udp  #Cruise UPDATE
+cvd                 8400/tcp  #cvd
+cvd                 8400/udp  #cvd
+sabarsd             8401/tcp  #sabarsd
+sabarsd             8401/udp  #sabarsd
+abarsd              8402/tcp  #abarsd
+abarsd              8402/udp  #abarsd
+admind              8403/tcp  #admind
+admind              8403/udp  #admind
+espeech             8416/tcp  #eSpeech Session Protocol
+espeech             8416/udp  #eSpeech Session Protocol
+espeech-rtp         8417/tcp  #eSpeech RTP Protocol
+espeech-rtp         8417/udp  #eSpeech RTP Protocol
+pcsync-https        8443/tcp  #PCsync HTTPS
+pcsync-https        8443/udp  #PCsync HTTPS
+pcsync-http         8444/tcp  #PCsync HTTP
+pcsync-http         8444/udp  #PCsync HTTP
+npmp                8450/tcp  #npmp
+npmp                8450/udp  #npmp
+vp2p                8473/tcp  #Virtual Point to Point
+vp2p                8473/udp  #Virtual Point to Point
+fde                 8500/tcp  #Flight Data Exchange
+fde                 8500/udp  #Flight Data Exchange
+rtsp-alt            8554/tcp  #RTSP Alternate (see port 554)
+rtsp-alt            8554/udp  #RTSP Alternate (see port 554)
+d-fence             8555/tcp  #SYMAX D-FENCE
+d-fence             8555/udp  #SYMAX D-FENCE
+canon-bjnp1         8611/tcp  #Canon BJNP Port 1
+canon-bjnp1         8611/udp  #Canon BJNP Port 1
+canon-bjnp2         8612/tcp  #Canon BJNP Port 2
+canon-bjnp2         8612/udp  #Canon BJNP Port 2
+canon-bjnp3         8613/tcp  #Canon BJNP Port 3
+canon-bjnp3         8613/udp  #Canon BJNP Port 3
+canon-bjnp4         8614/tcp  #Canon BJNP Port 4
+canon-bjnp4         8614/udp  #Canon BJNP Port 4
+ibus                8733/tcp  #iBus
+ibus                8733/udp  #iBus
+mc-appserver        8763/tcp  #MC-APPSERVER
+mc-appserver        8763/udp  #MC-APPSERVER
+openqueue           8764/tcp  #OPENQUEUE
+openqueue           8764/udp  #OPENQUEUE
+ultraseek-http      8765/tcp  #Ultraseek HTTP
+ultraseek-http      8765/udp  #Ultraseek HTTP
+msgclnt             8786/tcp  #Message Client
+msgclnt             8786/udp  #Message Client
+msgsrvr             8787/tcp  #Message Server
+msgsrvr             8787/udp  #Message Server
+truecm              8804/tcp  #truecm
+truecm              8804/udp  #truecm
+cddbp-alt           8880/tcp  #CDDBP
+cddbp-alt           8880/udp  #CDDBP
+ddi-tcp-1           8888/tcp  #NewsEDGE server TCP (TCP 1)
+ddi-udp-1           8888/udp  #NewsEDGE server UDP (UDP 1)
+ddi-tcp-2           8889/tcp  #Desktop Data TCP 1
+ddi-udp-2           8889/udp  #NewsEDGE server broadcast
+ddi-tcp-3           8890/tcp  #Desktop Data TCP 2
+ddi-udp-3           8890/udp  #NewsEDGE client broadcast
+ddi-tcp-4           8891/tcp  #Desktop Data TCP 3: NESS application
+ddi-udp-4           8891/udp  #Desktop Data UDP 3: NESS application
+ddi-tcp-5           8892/tcp  #Desktop Data TCP 4: FARM product
+ddi-udp-5           8892/udp  #Desktop Data UDP 4: FARM product
+ddi-tcp-6           8893/tcp  #Desktop Data TCP 5: NewsEDGE/Web application
+ddi-udp-6           8893/udp  #Desktop Data UDP 5: NewsEDGE/Web application
+ddi-tcp-7           8894/tcp  #Desktop Data TCP 6: COAL application
+ddi-udp-7           8894/udp  #Desktop Data UDP 6: COAL application
+jmb-cds1            8900/tcp  #JMB-CDS 1
+jmb-cds1            8900/udp  #JMB-CDS 1
+jmb-cds2            8901/tcp  #JMB-CDS 2
+jmb-cds2            8901/udp  #JMB-CDS 2
+manyone-http        8910/tcp  #manyone-http
+manyone-http        8910/udp  #manyone-http
+manyone-xml         8911/tcp  #manyone-xml
+manyone-xml         8911/udp  #manyone-xml
+cumulus-admin       8954/tcp  #Cumulus Admin Port
+cumulus-admin       8954/udp  #Cumulus Admin Port
+bctp                8999/tcp  #Brodos Crypto Trade Protocol
+bctp                8999/udp  #Brodos Crypto Trade Protocol
+cslistener          9000/tcp  #CSlistener
+cslistener          9000/udp  #CSlistener
+etlservicemgr       9001/tcp  #ETL Service Manager
+etlservicemgr       9001/udp  #ETL Service Manager
+dynamid             9002/tcp  #DynamID authentication
+dynamid             9002/udp  #DynamID authentication
+tambora             9020/tcp  #TAMBORA
+tambora             9020/udp  #TAMBORA
+panagolin-ident     9021/tcp  #Pangolin Identification
+panagolin-ident     9021/udp  #Pangolin Identification
+paragent            9022/tcp  #PrivateArk Remote Agent
+paragent            9022/udp  #PrivateArk Remote Agent
+swa-1               9023/tcp  #Secure Web Access - 1
+swa-1               9023/udp  #Secure Web Access - 1
+swa-2               9024/tcp  #Secure Web Access - 2
+swa-2               9024/udp  #Secure Web Access - 2
+swa-3               9025/tcp  #Secure Web Access - 3
+swa-3               9025/udp  #Secure Web Access - 3
+swa-4               9026/tcp  #Secure Web Access - 4
+swa-4               9026/udp  #Secure Web Access - 4
+glrpc               9080/tcp  #Groove GLRPC
+glrpc               9080/udp  #Groove GLRPC
+websm               9090/tcp  #WebSM
+websm               9090/udp  #WebSM
+xmltec-xmlmail      9091/tcp  #xmltec-xmlmail
+xmltec-xmlmail      9091/udp  #xmltec-xmlmail
+hp-pdl-datastr      9100/tcp  #PDL Data Streaming Port
+hp-pdl-datastr      9100/udp  #PDL Data Streaming Port
+pdl-datastream      9100/tcp  #Printer PDL Data Stream 
+pdl-datastream      9100/udp  #Printer PDL Data Stream 
+bacula-dir          9101/tcp  #Bacula Director
+bacula-dir          9101/udp  #Bacula Director
+bacula-fd           9102/tcp  #Bacula File Daemon  
+bacula-fd           9102/udp  #Bacula File Daemon
+bacula-sd           9103/tcp  #Bacula Storage Daemon
+bacula-sd           9103/udp  #Bacula Storage Daemon
+peerwire            9104/tcp  #PeerWire
+peerwire            9104/udp  #PeerWire
+netlock1            9160/tcp  #NetLOCK1
+netlock1            9160/udp  #NetLOCK1
+netlock2            9161/tcp  #NetLOCK2
+netlock2            9161/udp  #NetLOCK2
+netlock3            9162/tcp  #NetLOCK3
+netlock3            9162/udp  #NetLOCK3
+netlock4            9163/tcp  #NetLOCK4
+netlock4            9163/udp  #NetLOCK4
+netlock5            9164/tcp  #NetLOCK5
+netlock5            9164/udp  #NetLOCK5
+wap-wsp             9200/tcp  #WAP connectionless session service
+wap-wsp             9200/udp  #WAP connectionless session service
+wap-wsp-wtp         9201/tcp  #WAP session service
+wap-wsp-wtp         9201/udp  #WAP session service
+wap-wsp-s           9202/tcp  #WAP secure connectionless session service
+wap-wsp-s           9202/udp  #WAP secure connectionless session service
+wap-wsp-wtp-s       9203/tcp  #WAP secure session service
+wap-wsp-wtp-s       9203/udp  #WAP secure session service
+wap-vcard           9204/tcp  #WAP vCard
+wap-vcard           9204/udp  #WAP vCard
+wap-vcal            9205/tcp  #WAP vCal
+wap-vcal            9205/udp  #WAP vCal
+wap-vcard-s         9206/tcp  #WAP vCard Secure
+wap-vcard-s         9206/udp  #WAP vCard Secure
+wap-vcal-s          9207/tcp  #WAP vCal Secure
+wap-vcal-s          9207/udp  #WAP vCal Secure
+oma-mlp             9210/tcp  #OMA Mobile Location Protocol
+oma-mlp             9210/udp  #OMA Mobile Location Protocol
+oma-mlp-s           9211/tcp  #OMA Mobile Location Protocol Secure
+oma-mlp-s           9211/udp  #OMA Mobile Location Protocol Secure
+fsc-port            9217/tcp  #FSC Communication Port
+fsc-port            9217/udp  #FSC Communication Port
+swtp-port1          9281/tcp  #SofaWare transport port 1
+swtp-port1          9281/udp  #SofaWare transport port 1
+swtp-port2          9282/tcp  #SofaWare transport port 2
+swtp-port2          9282/udp  #SofaWare transport port 2
+callwaveiam         9283/tcp  #CallWaveIAM
+callwaveiam         9283/udp  #CallWaveIAM
+visd                9284/tcp  #VERITAS Information Serve
+visd                9284/udp  #VERITAS Information Serve
+n2h2server          9285/tcp  #N2H2 Filter Service Port
+n2h2server          9285/udp  #N2H2 Filter Service Port
+cumulus             9287/tcp  #Cumulus
+cumulus             9287/udp  #Cumulus
+armtechdaemon       9292/tcp  #ArmTech Daemon
+armtechdaemon       9292/udp  #ArmTech Daemon
+guibase             9321/tcp  #guibase
+guibase             9321/udp  #guibase
+mpidcmgr            9343/tcp  #MpIdcMgr
+mpidcmgr            9343/udp  #MpIdcMgr
+mphlpdmc            9344/tcp  #Mphlpdmc
+mphlpdmc            9344/udp  #Mphlpdmc
+ctechlicensing      9346/tcp  #C Tech Licensing
+ctechlicensing      9346/udp  #C Tech Licensing
+fjdmimgr            9374/tcp  #fjdmimgr
+fjdmimgr            9374/udp  #fjdmimgr
+fjinvmgr            9396/tcp  #fjinvmgr
+fjinvmgr            9396/udp  #fjinvmgr
+mpidcagt            9397/tcp  #MpIdcAgt
+mpidcagt            9397/udp  #MpIdcAgt
+ismserver           9500/tcp  #ismserver
+ismserver           9500/udp  #ismserver
+mngsuite            9535/tcp  #Management Suite Remote Control
+mngsuite            9535/udp  #Management Suite Remote Control
+msgsys              9594/tcp  #Message System
+msgsys              9594/udp  #Message System
+pds                 9595/tcp  #Ping Discovery Service
+pds                 9595/udp  #Ping Discovery Service
+micromuse-ncpw      9600/tcp  #MICROMUSE-NCPW
+micromuse-ncpw      9600/udp  #MICROMUSE-NCPW
+streamcomm-ds       9612/tcp  #StreamComm User Directory
+streamcomm-ds       9612/udp  #StreamComm User Directory
+l5nas-parchan       9747/tcp  #L5NAS Parallel Channel
+l5nas-parchan       9747/udp  #L5NAS Parallel Channel
+rasadv              9753/tcp  #rasadv
+rasadv              9753/udp  #rasadv
+davsrc              9800/tcp  #WebDav Source Port
+davsrc              9800/udp  #WebDav Source Port
+sstp-2              9801/tcp  #Sakura Script Transfer Protocol-2
+sstp-2              9801/udp  #Sakura Script Transfer Protocol-2
+davsrcs             9802/tcp  #WebDAV Source TLS/SSL
+davsrcs             9802/udp  #WebDAV Source TLS/SSL
+sapv1               9875/tcp  #Session Announcement v1
+sapv1               9875/udp  #Session Announcement v1
+sd                  9876/tcp  #Session Director
+sd                  9876/udp  #Session Director
+cyborg-systems      9888/tcp  #CYBORG Systems
+cyborg-systems      9888/udp  #CYBORG Systems
+monkeycom           9898/tcp  #MonkeyCom
+monkeycom           9898/udp  #MonkeyCom
+sctp-tunneling      9899/tcp  #SCTP TUNNELING
+sctp-tunneling      9899/udp  #SCTP TUNNELING
+iua                 9900/tcp  #IUA
+iua                 9900/udp  #IUA
+domaintime          9909/tcp  #domaintime
+domaintime          9909/udp  #domaintime
+sype-transport      9911/tcp  #SYPECom Transport Protocol
+sype-transport      9911/udp  #SYPECom Transport Protocol
+apc-9950            9950/tcp  #APC 9950
+apc-9950            9950/udp  #APC 9950
+apc-9951            9951/tcp  #APC 9951 
+apc-9951            9951/udp  #APC 9951
+apc-9952            9952/tcp  #APC 9952
+apc-9952            9952/udp  #APC 9952
+osm-appsrvr         9990/tcp  #OSM Applet Server
+osm-appsrvr         9990/udp  #OSM Applet Server
+osm-oev             9991/tcp  #OSM Event Server
+osm-oev             9991/udp  #OSM Event Server
+palace-1            9992/tcp  #OnLive-1
+palace-1            9992/udp  #OnLive-1
+palace-2            9993/tcp  #OnLive-2
+palace-2            9993/udp  #OnLive-2
+palace-3            9994/tcp  #OnLive-3
+palace-3            9994/udp  #OnLive-3
+palace-4            9995/tcp  #Palace-4
+palace-4            9995/udp  #Palace-4
+palace-5            9996/tcp  #Palace-5
+palace-5            9996/udp  #Palace-5
+palace-6            9997/tcp  #Palace-6
+palace-6            9997/udp  #Palace-6
+distinct32          9998/tcp  #Distinct32
+distinct32          9998/udp  #Distinct32
+distinct            9999/tcp  #distinct
+distinct            9999/udp  #distinct
+ndmp                10000/tcp  #Network Data Management Protocol
+ndmp                10000/udp  #Network Data Management Protocol
+scp-config          10001/tcp  #SCP Configuration Port
+scp-config          10001/udp  #SCP Configuration Port
+mvs-capacity        10007/tcp  #MVS Capacity
+mvs-capacity        10007/udp  #MVS Capacity
+octopus             10008/tcp  #Octopus Multiplexer
+octopus             10008/udp  #Octopus Multiplexer
+amanda              10080/tcp  #Amanda 
+amanda              10080/udp  #Amanda 
+itap-ddtp           10100/tcp  #VERITAS ITAP DDTP
+itap-ddtp           10100/udp  #VERITAS ITAP DDTP
+ezmeeting-2         10101/tcp  #eZmeeting
+ezmeeting-2         10101/udp  #eZmeeting
+ezproxy-2           10102/tcp  #eZproxy
+ezproxy-2           10102/udp  #eZproxy
+ezrelay             10103/tcp  #eZrelay
+ezrelay             10103/udp  #eZrelay
+bctp-server         10107/tcp  #VERITAS BCTP, server
+bctp-server         10107/udp  #VERITAS BCTP, server
+netiq-endpoint      10113/tcp  #NetIQ Endpoint
+netiq-endpoint      10113/udp  #NetIQ Endpoint
+netiq-qcheck        10114/tcp  #NetIQ Qcheck
+netiq-qcheck        10114/udp  #NetIQ Qcheck
+netiq-endpt         10115/tcp  #NetIQ Endpoint
+netiq-endpt         10115/udp  #NetIQ Endpoint
+netiq-voipa         10116/tcp  #NetIQ VoIP Assessor
+netiq-voipa         10116/udp  #NetIQ VoIP Assessor
+bmc-perf-sd         10128/tcp  #BMC-PERFORM-SERVICE DAEMON
+bmc-perf-sd         10128/udp  #BMC-PERFORM-SERVICE DAEMON
+apollo-relay        10252/tcp  #Apollo Relay Port
+apollo-relay        10252/udp  #Apollo Relay Port
+axis-wimp-port      10260/tcp  #Axis WIMP Port
+axis-wimp-port      10260/udp  #Axis WIMP Port
+blocks              10288/tcp  #Blocks 
+blocks              10288/udp  #Blocks 
+rmiaux              10990/tcp  #Auxiliary RMI Port
+rmiaux              10990/udp  #Auxiliary RMI Port
+irisa               11000/tcp  #IRISA
+irisa               11000/udp  #IRISA
+metasys             11001/tcp  #Metasys
+metasys             11001/udp  #Metasys
+vce                 11111/tcp  #Viral Computing Environment (VCE)
+vce                 11111/udp  #Viral Computing Environment (VCE)
+smsqp               11201/tcp  #smsqp
+smsqp               11201/udp  #smsqp
+imip                11319/tcp  #IMIP
+imip                11319/udp  #IMIP
+imip-channels       11320/tcp  #IMIP Channels Port
+imip-channels       11320/udp  #IMIP Channels Port
+arena-server        11321/tcp  #Arena Server Listen
+arena-server        11321/udp  #Arena Server Listen
+atm-uhas            11367/tcp  #ATM UHAS
+atm-uhas            11367/udp  #ATM UHAS
+hkp                 11371/tcp  #OpenPGP HTTP Keyserver
+hkp                 11371/udp  #OpenPGP HTTP Keyserver
+tempest-port        11600/tcp  #Tempest Protocol Port
+tempest-port        11600/udp  #Tempest Protocol Port
+h323callsigalt      11720/tcp  #h323 Call Signal Alternate
+h323callsigalt      11720/udp  #h323 Call Signal Alternate
+intrepid-ssl        11751/tcp  #Intrepid SSL
+intrepid-ssl        11751/udp  #Intrepid SSL
+sysinfo-sp          11967/tcp  #SysInfo Service Protocol
+sysinfo-sp          11967/udp  #SysInfo Sercice Protocol
+entextxid           12000/tcp  #IBM Enterprise Extender SNA XID Exchange
+entextxid           12000/udp  #IBM Enterprise Extender SNA XID Exchange
+entextnetwk         12001/tcp  #IBM Enterprise Extender SNA COS Network Priority
+entextnetwk         12001/udp  #IBM Enterprise Extender SNA COS Network Priority
+entexthigh          12002/tcp  #IBM Enterprise Extender SNA COS High Priority
+entexthigh          12002/udp  #IBM Enterprise Extender SNA COS High Priority
+entextmed           12003/tcp  #IBM Enterprise Extender SNA COS Medium Priority
+entextmed           12003/udp  #IBM Enterprise Extender SNA COS Medium Priority
+entextlow           12004/tcp  #IBM Enterprise Extender SNA COS Low Priority
+entextlow           12004/udp  #IBM Enterprise Extender SNA COS Low Priority
+dbisamserver1       12005/tcp  #DBISAM Database Server - Regular
+dbisamserver1       12005/udp  #DBISAM Database Server - Regular
+dbisamserver2       12006/tcp  #DBISAM Database Server - Admin
+dbisamserver2       12006/udp  #DBISAM Database Server - Admin
+rets-ssl            12109/tcp  #RETS over SSL
+rets-ssl            12109/udp  #RETS over SSL
+hivep               12172/tcp  #HiveP
+hivep               12172/udp  #HiveP
+italk               12345/tcp  #Italk Chat System
+italk               12345/udp  #Italk Chat System
+tsaf                12753/tcp  #tsaf port   
+tsaf                12753/udp  #tsaf port   
+i-zipqd             13160/tcp  #I-ZIPQD
+i-zipqd             13160/udp  #I-ZIPQD
+powwow-client       13223/tcp  #PowWow Client
+powwow-client       13223/udp  #PowWow Client
+powwow-server       13224/tcp  #PowWow Server
+powwow-server       13224/udp  #PowWow Server
+bprd                13720/tcp  #BPRD Protocol (VERITAS NetBackup)
+bprd                13720/udp  #BPRD Protocol (VERITAS NetBackup)
+bpdbm               13721/tcp  #BPDBM Protocol (VERITAS NetBackup)
+bpdbm               13721/udp  #BPDBM Protocol (VERITAS NetBackup)
+bpjava-msvc         13722/tcp  #BP Java MSVC Protocol
+bpjava-msvc         13722/udp  #BP Java MSVC Protocol
+vnetd               13724/tcp  #Veritas Network Utility
+vnetd               13724/udp  #Veritas Network Utility
+bpcd                13782/tcp  #VERITAS NetBackup
+bpcd                13782/udp  #VERITAS NetBackup
+vopied              13783/tcp  #VOPIED Protocol
+vopied              13783/udp  #VOPIED Protocol
+dsmcc-config        13818/tcp  #DSMCC Config
+dsmcc-config        13818/udp  #DSMCC Config
+dsmcc-session       13819/tcp  #DSMCC Session Messages
+dsmcc-session       13819/udp  #DSMCC Session Messages
+dsmcc-passthru      13820/tcp  #DSMCC Pass-Thru Messages
+dsmcc-passthru      13820/udp  #DSMCC Pass-Thru Messages
+dsmcc-download      13821/tcp  #DSMCC Download Protocol
+dsmcc-download      13821/udp  #DSMCC Download Protocol
+dsmcc-ccp           13822/tcp  #DSMCC Channel Change Protocol
+dsmcc-ccp           13822/udp  #DSMCC Channel Change Protocol
+sua                 14001/tcp  #SUA
+sua                 14001/udp  #De-Registered (2001 June 06)
+sage-best-com1      14033/tcp  #sage Best! Config Server 1
+sage-best-com1      14033/udp  #sage Best! Config Server 1
+sage-best-com2      14034/tcp  #sage Best! Config Server 2
+sage-best-com2      14034/udp  #sage Best! Config Server 2
+vcs-app             14141/tcp  #VCS Application
+vcs-app             14141/udp  #VCS Application
+gcm-app             14145/tcp  #GCM Application
+gcm-app             14145/udp  #GCM Application
+vrts-tdd            14149/tcp  #Veritas Traffic Director
+vrts-tdd            14149/udp  #Veritas Traffic Director
+hde-lcesrvr-1       14936/tcp  #hde-lcesrvr-1
+hde-lcesrvr-1       14936/udp  #hde-lcesrvr-1
+hde-lcesrvr-2       14937/tcp  #hde-lcesrvr-2
+hde-lcesrvr-2       14937/udp  #hde-lcesrvr-2
+hydap               15000/tcp  #Hypack Data Aquisition
+hydap               15000/udp  #Hypack Data Aquisition
+xpilot              15345/tcp  #XPilot Contact Port
+xpilot              15345/udp  #XPilot Contact Port
+3link               15363/tcp  #3Link Negotiation
+3link               15363/udp  #3Link Negotiation
+sun-sea-port        16161/tcp  #Solaris SEA Port
+sun-sea-port        16161/udp  #Solaris SEA Port
+netserialext1       16360/tcp  #netserialext1
+netserialext1       16360/udp  #netserialext1
+netserialext2       16361/tcp  #netserialext2
+netserialext2       16361/udp  #netserialext2
+netserialext3       16367/tcp  #netserialext3
+netserialext3       16367/udp  #netserialext3
+netserialext4       16368/tcp  #netserialext4
+netserialext4       16368/udp  #netserialext4
+connected           16384/tcp  #Connected Corp
+connected           16384/udp  #Connected Corp
+intel-rci-mp        16991/tcp  #INTEL-RCI-MP
+intel-rci-mp        16991/udp  #INTEL-RCI-MP
+soundsvirtual       17185/tcp  #Sounds Virtual
+soundsvirtual       17185/udp  #Sounds Virtual
+chipper             17219/tcp  #Chipper
+chipper             17219/udp  #Chipper
+biimenu             18000/tcp  #Beckman Instruments, Inc.
+biimenu             18000/udp  #Beckman Instruments, Inc.
+opsec-cvp           18181/tcp  #OPSEC CVP 
+opsec-cvp           18181/udp  #OPSEC CVP 
+opsec-ufp           18182/tcp  #OPSEC UFP
+opsec-ufp           18182/udp  #OPSEC UFP
+opsec-sam           18183/tcp  #OPSEC SAM
+opsec-sam           18183/udp  #OPSEC SAM
+opsec-lea           18184/tcp  #OPSEC LEA
+opsec-lea           18184/udp  #OPSEC LEA
+opsec-omi           18185/tcp  #OPSEC OMI
+opsec-omi           18185/udp  #OPSEC OMI
+ohsc                18186/tcp  #Occupational Health SC
+ohsc                18186/udp  #Occupational Health Sc
+opsec-ela           18187/tcp  #OPSEC ELA
+opsec-ela           18187/udp  #OPSEC ELA
+checkpoint-rtm      18241/tcp  #Check Point RTM
+checkpoint-rtm      18241/udp  #Check Point RTM
+ac-cluster          18463/tcp  #AC Cluster
+ac-cluster          18463/udp  #AC Cluster
+ique                18769/tcp  #IQue Protocol
+ique                18769/udp  #IQue Protocol
+apc-necmp           18888/tcp  #APCNECMP 
+apc-necmp           18888/udp  #APCNECMP 
+opsec-uaa           19191/tcp  #OPSEC UAA
+opsec-uaa           19191/udp  #OPSEC UAA
+ua-secureagent      19194/tcp  #UserAuthority SecureAgent
+ua-secureagent      19194/udp  #UserAuthority SecureAgent
+keysrvr             19283/tcp  #Key Server for SASSAFRAS
+keysrvr             19283/udp  #Key Server for SASSAFRAS
+keyshadow           19315/tcp  #Key Shadow for SASSAFRAS
+keyshadow           19315/udp  #Key Shadow for SASSAFRAS
+mtrgtrans           19398/tcp  #mtrgtrans
+mtrgtrans           19398/udp  #mtrgtrans
+hp-sco              19410/tcp  #hp-sco 
+hp-sco              19410/udp  #hp-sco
+hp-sca              19411/tcp  #hp-sca
+hp-sca              19411/udp  #hp-sca
+hp-sessmon          19412/tcp  #HP-SESSMON
+hp-sessmon          19412/udp  #HP-SESSMON
+sxuptp              19540/tcp  #SXUPTP
+sxuptp              19540/udp  #SXUPTP
+jcp                 19541/tcp  #JCP Client
+jcp                 19541/udp  #JCP Client
+dnp                 20000/tcp  #DNP
+dnp                 20000/udp  #DNP
+microsan            20001/tcp  #MicroSAN
+microsan            20001/udp  #MicroSAN
+nburn_id            20034/tcp  #NetBurner ID Port
+nburn_id            20034/udp  #NetBurner ID Port
+ipdtp-port          20202/tcp  #IPD Tunneling Port
+ipdtp-port          20202/udp  #IPD Tunneling Port
+ipulse-ics          20222/tcp  #iPulse-ICS
+ipulse-ics          20222/udp  #iPulse-ICS
+track               20670/tcp  #Track
+track               20670/udp  #Track
+athand-mmp          20999/tcp  #At Hand MMP
+athand-mmp          20999/udp  #AT Hand MMP
+vofr-gateway        21590/tcp  #VoFR Gateway
+vofr-gateway        21590/udp  #VoFR Gateway
+tvpm                21800/tcp  #TVNC Pro Multiplexing
+tvpm                21800/udp  #TVNC Pro Multiplexing
+webphone            21845/tcp  #webphone
+webphone            21845/udp  #webphone
+netspeak-is         21846/tcp  #NetSpeak Corp. Directory Services
+netspeak-is         21846/udp  #NetSpeak Corp. Directory Services
+netspeak-cs         21847/tcp  #NetSpeak Corp. Connection Services
+netspeak-cs         21847/udp  #NetSpeak Corp. Connection Services
+netspeak-acd        21848/tcp  #NetSpeak Corp. Automatic Call Distribution
+netspeak-acd        21848/udp  #NetSpeak Corp. Automatic Call Distribution
+netspeak-cps        21849/tcp  #NetSpeak Corp. Credit Processing System
+netspeak-cps        21849/udp  #NetSpeak Corp. Credit Processing System
+snapenetio          22000/tcp  #SNAPenetIO
+snapenetio          22000/udp  #SNAPenetIO
+optocontrol         22001/tcp  #OptoControl
+optocontrol         22001/udp  #OptoControl
+wnn6                22273/tcp  #wnn6
+wnn6                22273/udp  #wnn6
+vocaltec-wconf      22555/tcp  #Vocaltec Web Conference
+vocaltec-phone      22555/udp  #Vocaltec Internet Phone
+aws-brf             22800/tcp  #Telerate Information Platform LAN
+aws-brf             22800/udp  #Telerate Information Platform LAN
+brf-gw              22951/tcp  #Telerate Information Platform WAN
+brf-gw              22951/udp  #Telerate Information Platform WAN
+med-ltp             24000/tcp  #med-ltp
+med-ltp             24000/udp  #med-ltp
+med-fsp-rx          24001/tcp  #med-fsp-rx
+med-fsp-rx          24001/udp  #med-fsp-rx
+med-fsp-tx          24002/tcp  #med-fsp-tx
+med-fsp-tx          24002/udp  #med-fsp-tx
+med-supp            24003/tcp  #med-supp
+med-supp            24003/udp  #med-supp
+med-ovw             24004/tcp  #med-ovw
+med-ovw             24004/udp  #med-ovw
+med-ci              24005/tcp  #med-ci
+med-ci              24005/udp  #med-ci
+med-net-svc         24006/tcp  #med-net-svc
+med-net-svc         24006/udp  #med-net-svc
+filesphere          24242/tcp  #fileSphere
+filesphere          24242/udp  #fileSphere
+vista-4gl           24249/tcp  #Vista 4GL
+vista-4gl           24249/udp  #Vista 4GL
+intel_rci           24386/tcp  #Intel RCI 
+intel_rci           24386/udp  #Intel RCI
+binkp               24554/tcp  #BINKP
+binkp               24554/udp  #BINKP
+flashfiler          24677/tcp  #FlashFiler
+flashfiler          24677/udp  #FlashFiler
+proactivate         24678/tcp  #Turbopower Proactivate
+proactivate         24678/udp  #Turbopower Proactivate
+snip                24922/tcp  #Simple Net Ident Protocol
+snip                24922/udp  #Simple Net Ident Protocol
+icl-twobase1        25000/tcp  #icl-twobase1
+icl-twobase1        25000/udp  #icl-twobase1
+icl-twobase2        25001/tcp  #icl-twobase2
+icl-twobase2        25001/udp  #icl-twobase2
+icl-twobase3        25002/tcp  #icl-twobase3
+icl-twobase3        25002/udp  #icl-twobase3
+icl-twobase4        25003/tcp  #icl-twobase4
+icl-twobase4        25003/udp  #icl-twobase4
+icl-twobase5        25004/tcp  #icl-twobase5
+icl-twobase5        25004/udp  #icl-twobase5
+icl-twobase6        25005/tcp  #icl-twobase6
+icl-twobase6        25005/udp  #icl-twobase6
+icl-twobase7        25006/tcp  #icl-twobase7
+icl-twobase7        25006/udp  #icl-twobase7
+icl-twobase8        25007/tcp  #icl-twobase8
+icl-twobase8        25007/udp  #icl-twobase8
+icl-twobase9        25008/tcp  #icl-twobase9
+icl-twobase9        25008/udp  #icl-twobase9
+icl-twobase10       25009/tcp  #icl-twobase10
+icl-twobase10       25009/udp  #icl-twobase10
+vocaltec-hos        25793/tcp  #Vocaltec Address Server      
+vocaltec-hos        25793/udp  #Vocaltec Address Server
+niobserver          25901/tcp  #NIObserver
+niobserver          25901/udp  #NIObserver
+niprobe             25903/tcp  #NIProbe
+niprobe             25903/udp  #NIProbe
+quake               26000/tcp  #quake
+quake               26000/udp  #quake
+wnn6-ds             26208/tcp  #wnn6-ds
+wnn6-ds             26208/udp  #wnn6-ds
+ezproxy             26260/tcp  #eZproxy
+ezproxy             26260/udp  #eZproxy
+ezmeeting           26261/tcp  #eZmeeting
+ezmeeting           26261/udp  #eZmeeting
+k3software-svr      26262/tcp  #K3 Software-Server
+k3software-svr      26262/udp  #K3 Software-Server
+k3software-cli      26263/tcp  #K3 Software-Client
+k3software-cli      26263/udp  #K3 Software-Client
+gserver             26264/tcp  #Gserver 
+gserver             26264/udp  #Gserver
+imagepump           27345/tcp  #ImagePump
+imagepump           27345/udp  #ImagePump
+kopek-httphead      27504/tcp  #Kopek HTTP Head Port
+kopek-httphead      27504/udp  #Kopek HTTP Head Port
+tw-auth-key         27999/tcp  #TW Authentication/Key Distribution and 
+tw-auth-key         27999/udp  #Attribute Certificate Services
+pago-services1      30001/tcp  #Pago Services 1
+pago-services1      30001/udp  #Pago Services 1
+pago-services2      30002/tcp  #Pago Services 2
+pago-services2      30002/udp  #Pago Services 2
+xqosd               31416/tcp  #XQoS network monitor
+xqosd               31416/udp  #XQoS network monitor
+lm-mon              31620/tcp  #lm mon
+lm-mon              31620/udp  #lm mon
+gamesmith-port      31765/tcp  #GameSmith Port
+gamesmith-port      31765/udp  #GameSmith Port
+filenet-tms         32768/tcp  #Filenet TMS
+filenet-tms         32768/udp  #Filenet TMS
+filenet-rpc         32769/tcp  #Filenet RPC
+filenet-rpc         32769/udp  #Filenet RPC
+filenet-nch         32770/tcp  #Filenet NCH
+filenet-nch         32770/udp  #Filenet NCH
+filenet-rmi         32771/tcp  #FileNET RMI
+filenet-rmi         32771/udp  #FileNet RMI
+filenet-pa          32772/tcp  #FileNET Process Analyzer 
+filenet-pa          32772/udp  #FileNET Process Analyzer
+filenet-cm          32773/tcp  #FileNET Component Manager
+filenet-cm          32773/udp  #FileNET Component Manager
+filenet-re          32774/tcp  #FileNET Rules Engine
+filenet-re          32774/udp  #FileNET Rules Engine
+idmgratm            32896/tcp  #Attachmate ID Manager
+idmgratm            32896/udp  #Attachmate ID Manager
+diamondport         33331/tcp  #DiamondCentral Interface
+diamondport         33331/udp  #DiamondCentral Interface
+traceroute          33434/tcp  #traceroute use
+traceroute          33434/udp  #traceroute use
+turbonote-2         34249/tcp  #TurboNote Relay Server Default Port
+turbonote-2         34249/udp  #TurboNote Relay Server Default Port
+p-net-local         34378/tcp  #P-Net on IP local 
+p-net-local         34378/udp  #P-Net on IP local
+p-net-remote        34379/tcp  #P-Net on IP remote
+p-net-remote        34379/udp  #P-Net on IP remote
+ethercat            34980/tcp  #EtherCAT Port
+ethercat            34980/udp  #EhterCAT Port
+kastenxpipe         36865/tcp  #KastenX Pipe
+kastenxpipe         36865/udp  #KastenX Pipe
+neckar              37475/tcp  #science + computing's Venus Administration Port
+neckar              37475/udp  #science + computing's Venus Administration Port
+galaxy7-data        38201/tcp  #Galaxy7 Data Tunnel
+galaxy7-data        38201/udp  #Galaxy7 Data Tunnel
+turbonote-1         39681/tcp  #TurboNote Default Port
+turbonote-1         39681/udp  #TurboNote Default Port
+cscp                40841/tcp  #CSCP
+cscp                40841/udp  #CSCP
+csccredir           40842/tcp  #CSCCREDIR
+csccredir           40842/udp  #CSCCREDIR
+csccfirewall        40843/tcp  #CSCCFIREWALL
+csccfirewall        40843/udp  #CSCCFIREWALL
+fs-qos              41111/tcp  #Foursticks QoS Protocol
+fs-qos              41111/udp  #Foursticks QoS Protocol
+crestron-cip        41794/tcp  #Crestron Control Port
+crestron-cip        41794/udp  #Crestron Control Port
+crestron-ctp        41795/tcp  #Crestron Terminal Port
+crestron-ctp        41795/udp  #Crestron Terminal Port
+reachout            43188/tcp  #REACHOUT
+reachout            43188/udp  #REACHOUT
+ndm-agent-port      43189/tcp  #NDM-AGENT-PORT
+ndm-agent-port      43189/udp  #NDM-AGENT-PORT
+ip-provision        43190/tcp  #IP-PROVISION
+ip-provision        43190/udp  #IP-PROVISION
+pmcd                44321/tcp  #PCP server (pmcd)
+pmcd                44321/udp  #PCP server (pmcd)
+pmcdproxy           44322/tcp  #PCP server (pmcd) proxy
+pmcdproxy           44322/udp  #PCP server (pmcd) proxy
+rockwell-encap      44818/tcp  #Rockwell Encapsulation
+rockwell-encap      44818/udp  #Rockwell Encapsulation
+invision-ag         45054/tcp  #InVision AG 
+invision-ag         45054/udp  #InVision AG
+eba                 45678/tcp  #EBA PRISE
+eba                 45678/udp  #EBA PRISE
+ssr-servermgr       45966/tcp  #SSRServerMgr
+ssr-servermgr       45966/udp  #SSRServerMgr
+mbus                47000/tcp  #Message Bus
+mbus                47000/udp  #Message Bus
+dbbrowse            47557/tcp  #Databeam Corporation
+dbbrowse            47557/udp  #Databeam Corporation
+directplaysrvr      47624/tcp  #Direct Play Server
+directplaysrvr      47624/udp  #Direct Play Server
+ap                  47806/tcp  #ALC Protocol
+ap                  47806/udp  #ALC Protocol
+bacnet              47808/tcp  #Building Automation and Control Networks
+bacnet              47808/udp  #Building Automation and Control Networks
+nimcontroller       48000/tcp  #Nimbus Controller
+nimcontroller       48000/udp  #Nimbus Controller
+nimspooler          48001/tcp  #Nimbus Spooler
+nimspooler          48001/udp  #Nimbus Spooler
+nimhub              48002/tcp  #Nimbus Hub
+nimhub              48002/udp  #Nimbus Hub
+nimgtw              48003/tcp  #Nimbus Gateway
+nimgtw              48003/udp  #Nimbus Gateway
+com-bardac-dw       48556/tcp  #com-bardac-dw
+com-bardac-dw       48556/udp  #com-bardac-dw
+iqobject            48619/tcp  #iqobject
+iqobject            48619/udp  #iqobject

From c76e4992960cbff08a4613d9647288d6185d814b Mon Sep 17 00:00:00 2001
From: Royce Mitchell III <royce3@ev1.net>
Date: Fri, 2 Jul 2004 01:36:25 +0000
Subject: [PATCH 165/356] NtRaiseException fixed to not clobber EAX any more,
 and both NtContinue and NtRaiseException no longer clobber EDX. kmode SEH
 works now, but there are likely some lingering bugs. This patch was made
 possible by the collaborative efforts of myself, kjk_hyperion, Art Yerkes,
 and Skywing.

svn path=/trunk/; revision=9967
---
 reactos/ntoskrnl/ke/catch.c    | 25 ++++++---
 reactos/ntoskrnl/ke/i386/exp.c | 97 +++++++++++++++++++++-------------
 reactos/ntoskrnl/ps/debug.c    |  8 +--
 3 files changed, 81 insertions(+), 49 deletions(-)

diff --git a/reactos/ntoskrnl/ke/catch.c b/reactos/ntoskrnl/ke/catch.c
index d526002d5ee..73e0e5c2102 100644
--- a/reactos/ntoskrnl/ke/catch.c
+++ b/reactos/ntoskrnl/ke/catch.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: catch.c,v 1.43 2004/06/23 22:31:51 ion Exp $
+/* $Id: catch.c,v 1.44 2004/07/02 01:36:25 royce Exp $
  *
  * PROJECT:              ReactOS kernel
  * FILE:                 ntoskrnl/ke/catch.c
@@ -256,17 +256,28 @@ ExSystemExceptionFilter()
 	return FALSE;
 }
 
+VOID
+FASTCALL
+KeRosTrapReturn ( PKTRAP_FRAME TrapFrame, PKTRAP_FRAME PrevTrapFrame );
+
 NTSTATUS STDCALL
 NtRaiseException (IN PEXCEPTION_RECORD ExceptionRecord,
 		  IN PCONTEXT Context,
 		  IN BOOLEAN SearchFrames)
 {
-  KiDispatchException(ExceptionRecord,
-		      Context,
-		      PsGetCurrentThread()->Tcb.TrapFrame,
-		      (KPROCESSOR_MODE)ExGetPreviousMode(),
-		      SearchFrames);
-  return(STATUS_SUCCESS);
+	PKTRAP_FRAME TrapFrame = KeGetCurrentThread()->TrapFrame;
+	PKTRAP_FRAME PrevTrapFrame = (PKTRAP_FRAME)TrapFrame->Edx;
+
+	KeGetCurrentKPCR()->Tib.ExceptionList = TrapFrame->ExceptionList;
+
+	KiDispatchException(ExceptionRecord,
+		Context,
+		PsGetCurrentThread()->Tcb.TrapFrame,
+		(KPROCESSOR_MODE)ExGetPreviousMode(),
+		SearchFrames);
+
+	KeRosTrapReturn ( TrapFrame, PrevTrapFrame );
+	return(STATUS_SUCCESS);
 }
 
 /*
diff --git a/reactos/ntoskrnl/ke/i386/exp.c b/reactos/ntoskrnl/ke/i386/exp.c
index 58e237b20e7..1778b9a6d26 100644
--- a/reactos/ntoskrnl/ke/i386/exp.c
+++ b/reactos/ntoskrnl/ke/i386/exp.c
@@ -79,7 +79,7 @@ extern VOID KiTrapUnknown(VOID);
 extern ULONG init_stack;
 extern ULONG init_stack_top;
 
-static char *ExceptionTypeStrings[] = 
+static char *ExceptionTypeStrings[] =
   {
     "Divide Error",
     "Debug Trap",
@@ -101,7 +101,7 @@ static char *ExceptionTypeStrings[] =
     "Machine Check"
   };
 
-static NTSTATUS ExceptionToNtStatus[] = 
+static NTSTATUS ExceptionToNtStatus[] =
   {
     STATUS_INTEGER_DIVIDE_BY_ZERO,
     STATUS_SINGLE_STEP,
@@ -142,11 +142,11 @@ KeRosPrintAddress(PVOID address)
    ULONG_PTR RelativeAddress;
 
    current_entry = ModuleTextListHead.Flink;
-   
+
    while (current_entry != &ModuleTextListHead &&
 	  current_entry != NULL)
      {
-	current = 
+	current =
 	  CONTAINING_RECORD(current_entry, MODULE_TEXT_SECTION, ListEntry);
 
 	if (address >= (PVOID)current->Base &&
@@ -219,7 +219,7 @@ KiDoubleFaultHandler(VOID)
   ULONG TraceLength;
   BOOLEAN FoundRepeat;
 #endif
-  
+
   OldTss = KeGetCurrentKPCR()->TSS;
   Esp0 = OldTss->Esp;
 
@@ -243,7 +243,7 @@ KiDoubleFaultHandler(VOID)
     {
       OldCr3 = 0xBEADF0AL;
     }
-   
+
    /*
     * Check for stack underflow
     */
@@ -254,7 +254,7 @@ KiDoubleFaultHandler(VOID)
 		 Esp0, (ULONG)PsGetCurrentThread()->Tcb.StackLimit);
 	ExceptionNr = 12;
      }
-   
+
    /*
     * Print out the CPU registers
     */
@@ -286,9 +286,9 @@ KiDoubleFaultHandler(VOID)
    DbgPrint("\n");
    DbgPrint("DS %x ES %x FS %x GS %x\n", OldTss->Ds, OldTss->Es,
 	    OldTss->Fs, OldTss->Gs);
-   DbgPrint("EAX: %.8x   EBX: %.8x   ECX: %.8x\n", OldTss->Eax, OldTss->Ebx, 
+   DbgPrint("EAX: %.8x   EBX: %.8x   ECX: %.8x\n", OldTss->Eax, OldTss->Ebx,
 	    OldTss->Ecx);
-   DbgPrint("EDX: %.8x   EBP: %.8x   ESI: %.8x\n   ESP: %.8x", OldTss->Edx, 
+   DbgPrint("EDX: %.8x   EBP: %.8x   ESI: %.8x\n   ESP: %.8x", OldTss->Edx,
 	    OldTss->Ebp, OldTss->Esi, Esp0);
    DbgPrint("EDI: %.8x   EFLAGS: %.8x ", OldTss->Edi, OldTss->Eflags);
    if (OldTss->Cs == KERNEL_CS)
@@ -298,7 +298,7 @@ KiDoubleFaultHandler(VOID)
 	  {
 	     DbgPrint("kernel stack base %x\n",
 		      PsGetCurrentThread()->Tcb.StackLimit);
-		      	     
+
 	  }
      }
    else
@@ -318,10 +318,10 @@ KiDoubleFaultHandler(VOID)
 	  StackBase = (ULONG)&init_stack;
 	}
 
-      /* 
+      /*
 	 Change to an #if 0 to reduce the amount of information printed on
-	 a recursive stack trace. 
-      */      
+	 a recursive stack trace.
+      */
 #if 1
       DbgPrint("Frames: ");
       Frame = (PULONG)OldTss->Ebp;
@@ -351,7 +351,7 @@ KiDoubleFaultHandler(VOID)
 	  FoundRepeat = FALSE;
 	  while ((j - i) <= (TraceLength - j) && FoundRepeat == FALSE)
 	    {
-	      if (memcmp(&StackTrace[i], &StackTrace[j], 
+	      if (memcmp(&StackTrace[i], &StackTrace[j],
 			 (j - i) * sizeof(PVOID)) == 0)
 		{
 		  StackRepeatCount[i] = 2;
@@ -369,10 +369,10 @@ KiDoubleFaultHandler(VOID)
 	      continue;
 	    }
 	  j = j + StackRepeatLength[i];
-	  while ((TraceLength - j) >= StackRepeatLength[i] && 
+	  while ((TraceLength - j) >= StackRepeatLength[i] &&
 		 FoundRepeat == TRUE)
 	    {
-	      if (memcmp(&StackTrace[i], &StackTrace[j], 
+	      if (memcmp(&StackTrace[i], &StackTrace[j],
 			 StackRepeatLength[i] * sizeof(PVOID)) == 0)
 		{
 		  StackRepeatCount[i]++;
@@ -411,7 +411,7 @@ KiDoubleFaultHandler(VOID)
 	}
 #endif
     }
-   
+
    DbgPrint("\n");
    for(;;);
    return 0;
@@ -429,7 +429,7 @@ KiDumpTrapFrame(PKTRAP_FRAME Tf, ULONG Parameter1, ULONG Parameter2)
   ULONG cr2 = (ULONG)Tf->DebugPointer;
 
   Esp0 = (ULONG)Tf;
-  
+
    /*
     * Print out the CPU registers
     */
@@ -464,7 +464,7 @@ KiDumpTrapFrame(PKTRAP_FRAME Tf, ULONG Parameter1, ULONG Parameter2)
    DbgPrint("DS %x ES %x FS %x GS %x\n", Tf->Ds&0xffff, Tf->Es&0xffff,
 	    Tf->Fs&0xffff, Tf->Gs&0xfff);
    DbgPrint("EAX: %.8x   EBX: %.8x   ECX: %.8x\n", Tf->Eax, Tf->Ebx, Tf->Ecx);
-   DbgPrint("EDX: %.8x   EBP: %.8x   ESI: %.8x   ESP: %.8x\n", Tf->Edx, 
+   DbgPrint("EDX: %.8x   EBP: %.8x   ESI: %.8x   ESP: %.8x\n", Tf->Edx,
 	    Tf->Ebp, Tf->Esi, Esp0);
    DbgPrint("EDI: %.8x   EFLAGS: %.8x ", Tf->Edi, Tf->Eflags);
    if ((Tf->Cs&0xffff) == KERNEL_CS)
@@ -474,7 +474,7 @@ KiDumpTrapFrame(PKTRAP_FRAME Tf, ULONG Parameter1, ULONG Parameter2)
 	  {
 	     DbgPrint("kernel stack base %x\n",
 		      PsGetCurrentThread()->Tcb.StackLimit);
-		      	     
+
 	  }
      }
 
@@ -486,7 +486,7 @@ KiDumpTrapFrame(PKTRAP_FRAME Tf, ULONG Parameter1, ULONG Parameter2)
      {
        StackLimit = (ULONG)&init_stack_top;
      }
-   
+
    /*
     * Dump the stack frames
     */
@@ -536,7 +536,7 @@ KiDumpTrapFrame(PKTRAP_FRAME Tf, ULONG Parameter1, ULONG Parameter2)
 ULONG
 KiTrapHandler(PKTRAP_FRAME Tf, ULONG ExceptionNr)
 /*
- * FUNCTION: Called by the lowlevel execption handlers to print an amusing 
+ * FUNCTION: Called by the lowlevel execption handlers to print an amusing
  * message and halt the computer
  * ARGUMENTS:
  *        Complete CPU context
@@ -551,7 +551,7 @@ KiTrapHandler(PKTRAP_FRAME Tf, ULONG ExceptionNr)
 
    /* Use the address of the trap frame as approximation to the ring0 esp */
    Esp0 = (ULONG)&Tf->Eip;
-  
+
    /* Get CR2 */
 #if defined(__GNUC__)
    __asm__("movl %%cr2,%0\n\t" : "=d" (cr2_));
@@ -562,7 +562,7 @@ KiTrapHandler(PKTRAP_FRAME Tf, ULONG ExceptionNr)
 #error Unknown compiler for inline assembler
 #endif
    Tf->DebugPointer = (PVOID)cr2_;
-   
+
    /*
     * If this was a V86 mode exception then handle it specially
     */
@@ -607,7 +607,7 @@ KiTrapHandler(PKTRAP_FRAME Tf, ULONG ExceptionNr)
     */
    if (ExceptionNr == 3 && Tf->Eip == ((ULONG)DbgBreakPointNoBugCheck) + 1)
      {
-       /* 
+       /*
 	  EIP is already adjusted by the processor to point to the instruction
 	  after the breakpoint.
        */
@@ -627,13 +627,10 @@ KiTrapHandler(PKTRAP_FRAME Tf, ULONG ExceptionNr)
     }
 }
 
-VOID 
+VOID
 KeDumpStackFrames(PULONG Frame)
 {
-	ULONG i;
-
 	DbgPrint("Frames: ");
-	i = 1;
 	while ( MmIsAddressValid(Frame) )
 	{
 		if (!KeRosPrintAddress((PVOID)Frame[1]))
@@ -641,15 +638,15 @@ KeDumpStackFrames(PULONG Frame)
 			DbgPrint("<%X>", (PVOID)Frame[1]);
 		}
 		Frame = (PULONG)Frame[0];
-		i++;
 		DbgPrint(" ");
 	}
+	DbgPrint("\n");
 }
 
 VOID STDCALL
 KeRosDumpStackFrames ( PULONG Frame, ULONG FrameCount )
 {
-	ULONG i;
+	ULONG i=0;
 
 	DbgPrint("Frames: ");
 	if ( !Frame )
@@ -657,7 +654,6 @@ KeRosDumpStackFrames ( PULONG Frame, ULONG FrameCount )
 		__asm__("mov %%ebp, %%ebx" : "=b" (Frame) : );
 		Frame = (PULONG)Frame[0]; // step out of KeRosDumpStackFrames
 	}
-	i = 1;
 	while ( MmIsAddressValid(Frame) && i++ < FrameCount )
 	{
 		if (!KeRosPrintAddress((PVOID)Frame[1]))
@@ -667,6 +663,7 @@ KeRosDumpStackFrames ( PULONG Frame, ULONG FrameCount )
 		Frame = (PULONG)Frame[0];
 		DbgPrint(" ");
 	}
+	DbgPrint("\n");
 }
 
 static void set_system_call_gate(unsigned int sel, unsigned int func)
@@ -683,7 +680,7 @@ static void set_interrupt_gate(unsigned int sel, unsigned int func)
    DPRINT("set_interrupt_gate(sel %d, func %x)\n",sel,func);
    KiIdt[sel].a = (((int)func)&0xffff) +
      (KERNEL_CS << 16);
-   KiIdt[sel].b = 0x8e00 + (((int)func)&0xffff0000);         
+   KiIdt[sel].b = 0x8e00 + (((int)func)&0xffff0000);
 }
 
 static void set_trap_gate(unsigned int sel, unsigned int func, unsigned int dpl)
@@ -692,7 +689,7 @@ static void set_trap_gate(unsigned int sel, unsigned int func, unsigned int dpl)
    assert(dpl <= 3);
    KiIdt[sel].a = (((int)func)&0xffff) +
      (KERNEL_CS << 16);
-   KiIdt[sel].b = 0x8f00 + (dpl << 13) + (((int)func)&0xffff0000);         
+   KiIdt[sel].b = 0x8f00 + (dpl << 13) + (((int)func)&0xffff0000);
 }
 
 static void
@@ -732,12 +729,12 @@ KeInitExceptions(VOID)
    set_interrupt_gate(14, (ULONG)KiTrap14);
    set_trap_gate(15, (ULONG)KiTrap15, 0);
    set_trap_gate(16, (ULONG)KiTrap16, 0);
-   
+
    for (i=17;i<256;i++)
         {
 	   set_trap_gate(i,(int)KiTrapUnknown, 0);
         }
-   
+
    set_system_call_gate(0x2d,(int)interrupt_handler2d);
    set_system_call_gate(0x2e,(int)interrupt_handler2e);
 }
@@ -759,3 +756,31 @@ KeRaiseUserException(IN NTSTATUS ExceptionCode)
 	Thread->Teb->ExceptionCode = ExceptionCode;
 	return((NTSTATUS)OldEip);
 }
+
+VOID
+FASTCALL
+KeRosTrapReturn ( PKTRAP_FRAME TrapFrame, PKTRAP_FRAME PrevTrapFrame );
+
+/*
+ * @implemented
+ */
+NTSTATUS STDCALL
+NtRaiseException (
+	IN PEXCEPTION_RECORD ExceptionRecord,
+	IN PCONTEXT Context,
+	IN BOOLEAN SearchFrames)
+{
+	PKTRAP_FRAME TrapFrame = KeGetCurrentThread()->TrapFrame;
+	PKTRAP_FRAME PrevTrapFrame = (PKTRAP_FRAME)TrapFrame->Edx;
+
+	KeGetCurrentKPCR()->Tib.ExceptionList = TrapFrame->ExceptionList;
+
+	KiDispatchException(ExceptionRecord,
+		Context,
+		PsGetCurrentThread()->Tcb.TrapFrame,
+		(KPROCESSOR_MODE)ExGetPreviousMode(),
+		SearchFrames);
+
+	KeRosTrapReturn ( TrapFrame, PrevTrapFrame );
+	return(STATUS_SUCCESS);
+}
diff --git a/reactos/ntoskrnl/ps/debug.c b/reactos/ntoskrnl/ps/debug.c
index 29b09071511..146209c3e65 100644
--- a/reactos/ntoskrnl/ps/debug.c
+++ b/reactos/ntoskrnl/ps/debug.c
@@ -17,7 +17,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: debug.c,v 1.11 2003/07/21 21:36:01 dwelch Exp $
+/* $Id: debug.c,v 1.12 2004/07/02 01:36:25 royce Exp $
  *
  * PROJECT:                ReactOS kernel
  * FILE:                   ntoskrnl/ps/debug.c
@@ -69,11 +69,7 @@ KeContextToTrapFrame(PCONTEXT Context,
 	TrapFrame->Eax = Context->Eax;
 	TrapFrame->Ebx = Context->Ebx;
 	TrapFrame->Ecx = Context->Ecx;
-	/*
-	 * Edx is used in the TrapFrame to hold the old trap frame pointer
-	 * so we don't want to overwrite it here
-	 */
-/*	TrapFrame->Edx = Context->Edx; */
+	TrapFrame->Edx = Context->Edx;
 	TrapFrame->Esi = Context->Esi;
 	TrapFrame->Edi = Context->Edi;
      }

From 9860c72592f45688ceb4926557d1d185917b2a88 Mon Sep 17 00:00:00 2001
From: Art Yerkes <art.yerkes@gmail.com>
Date: Fri, 2 Jul 2004 08:06:47 +0000
Subject: [PATCH 166/356] Added installation of services file needed for
 getservbyname and kin. The services file was created by Cameron Palmer from
 the official IANA list.

svn path=/trunk/; revision=9968
---
 reactos/Makefile                      | 6 +++++-
 reactos/bootdata/packages/reactos.dff | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/reactos/Makefile b/reactos/Makefile
index da718be5d00..a196acc3be6 100644
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.232 2004/07/01 02:40:21 hyperion Exp $
+# $Id: Makefile,v 1.233 2004/07/02 08:06:46 arty Exp $
 #
 # Global makefile
 #
@@ -187,6 +187,7 @@ bootcd_install_before:
 	$(CP) media/nls/c_1252.nls $(BOOTCD_DIR)/reactos/c_1252.nls
 	$(CP) media/nls/c_437.nls $(BOOTCD_DIR)/reactos/c_437.nls
 	$(CP) media/nls/l_intl.nls $(BOOTCD_DIR)/reactos/l_intl.nls
+	$(CP) media/drivers/etc/services $(BOOTCD_DIR)/reactos/services
 
 bootcd_basic: bootcd_directory_layout bootcd_bootstrap_files bootcd_install_before
 
@@ -829,6 +830,7 @@ install_dirs:
 	$(RMKDIR) $(INSTALL_DIR)/system32
 	$(RMKDIR) $(INSTALL_DIR)/system32/config
 	$(RMKDIR) $(INSTALL_DIR)/system32/drivers
+	$(RMKDIR) $(INSTALL_DIR)/system32/drivers/etc
 
 install_before:
 	$(CP) bootc.lst $(INSTALL_DIR)/bootc.lst
@@ -839,6 +841,8 @@ install_before:
 	$(CP) media/nls/c_1252.nls $(INSTALL_DIR)/system32/ansi.nls
 	$(CP) media/nls/c_437.nls $(INSTALL_DIR)/system32/oem.nls
 	$(CP) media/nls/l_intl.nls $(INSTALL_DIR)/system32/casemap.nls
+	$(CP) media/drivers/etc/services \
+		$(INSTALL_DIR)/system32/drivers/etc/services
 
 .PHONY: install_clean install_dirs install_before
 
diff --git a/reactos/bootdata/packages/reactos.dff b/reactos/bootdata/packages/reactos.dff
index 6efcbfde4ba..8ed34fae39f 100755
--- a/reactos/bootdata/packages/reactos.dff
+++ b/reactos/bootdata/packages/reactos.dff
@@ -17,6 +17,7 @@ Signature = "$ReactOS$"
 2 = system32\drivers
 3 = media\fonts
 4 = .
+5 = system32\drivers\etc
 
 .InfEnd
 
@@ -182,3 +183,4 @@ media\nls\c_28596.nls                   1
 media\nls\c_28597.nls                   1
 media\nls\c_28598.nls                   1
 media\nls\c_28599.nls                   1
+media\drivers\etc\services		5
\ No newline at end of file

From 7bca32fad2cb51dd5c3c69f5e6396558deb6edfd Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Fri, 2 Jul 2004 08:46:50 +0000
Subject: [PATCH 167/356] allow changing the cursor position with the mouse

svn path=/trunk/; revision=9969
---
 reactos/subsys/system/regedit/hexedit.c | 104 +++++++++++++++---------
 1 file changed, 65 insertions(+), 39 deletions(-)

diff --git a/reactos/subsys/system/regedit/hexedit.c b/reactos/subsys/system/regedit/hexedit.c
index 6333c131438..332a937e372 100644
--- a/reactos/subsys/system/regedit/hexedit.c
+++ b/reactos/subsys/system/regedit/hexedit.c
@@ -271,57 +271,47 @@ HEXEDIT_PaintLines(PHEXEDIT_DATA hed, HDC hDC, DWORD ScrollPos, DWORD First, DWO
 }
 
 static DWORD
-HEXEDIT_HitRegionTest(PHEXEDIT_DATA hed, POINTS pt, POINTS *ptClient)
+HEXEDIT_HitRegionTest(PHEXEDIT_DATA hed, POINTS pt)
 {
   WINDOWINFO wi;
-  int d, x;
+  int d;
   
-  wi.cbSize = sizeof(WINDOWINFO);
-  GetWindowInfo(hed->hWndSelf, &wi);
-  
-  x = pt.x - wi.rcClient.left;
-  if(ptClient)
-  {
-    ptClient->x = x;
-    ptClient->y = pt.y - wi.rcClient.top;
-  }
-  
-  if(x <= hed->LeftMargin)
+  if(pt.x <= hed->LeftMargin)
   {
     return HEHT_LEFTMARGIN;
   }
   
-  x -= hed->LeftMargin;
+  pt.x -= hed->LeftMargin;
   d = (4 * hed->CharWidth);
-  if(x <= d)
+  if(pt.x <= d)
   {
     return HEHT_ADDRESS;
   }
   
-  x -= d;
+  pt.x -= d;
   d = (hed->AddressSpacing * hed->CharWidth);
-  if(x <= d)
+  if(pt.x <= d)
   {
     return HEHT_ADDRESSSPACING;
   }
   
-  x -= d;
+  pt.x -= d;
   d = (3 * hed->ColumnsPerLine * hed->CharWidth);
-  if(x <= d)
+  if(pt.x <= d)
   {
     return HEHT_HEXDUMP;
   }
   
-  x -= d;
+  pt.x -= d;
   d = (hed->SplitSpacing * hed->CharWidth);
-  if(x <= d)
+  if(pt.x <= d)
   {
     return HEHT_HEXDUMPSPACING;
   }
   
-  x -= d;
+  pt.x -= d;
   d = (hed->ColumnsPerLine * hed->CharWidth);
-  if(x <= d)
+  if(pt.x <= d)
   {
     return HEHT_ASCIIDUMP;
   }
@@ -330,41 +320,57 @@ HEXEDIT_HitRegionTest(PHEXEDIT_DATA hed, POINTS pt, POINTS *ptClient)
 }
 
 static DWORD
-HEXEDIT_PositionFromPoint(PHEXEDIT_DATA hed, POINTS pt, DWORD *Hit)
+HEXEDIT_PositionFromPoint(PHEXEDIT_DATA hed, POINTS pt, DWORD Hit, POINT *EditPos, BOOL *EditField)
 {
   SCROLLINFO si;
-  POINTS ptClient;
-  DWORD Line;
-  
-  *Hit = HEXEDIT_HitRegionTest(hed, pt, &ptClient);
+  DWORD Pos, bufsize;
   
   si.cbSize = sizeof(SCROLLINFO);
   si.fMask = SIF_POS;
   GetScrollInfo(hed->hWndSelf, SB_VERT, &si);
   
+  EditPos->x = 0;
+  
   if(hed->LineHeight > 0)
   {
-    Line = min(si.nPos + (ptClient.y / hed->LineHeight), hed->nLines);
+    EditPos->y = min(si.nPos + (pt.y / hed->LineHeight), hed->nLines - 1);
   }
   else
-    return 0;
+  {
+    EditPos->y = si.nPos;
+  }
   
-  switch(*Hit)
+  switch(Hit)
   {
     case HEHT_LEFTMARGIN:
     case HEHT_ADDRESS:
     case HEHT_ADDRESSSPACING:
-      return Line * hed->ColumnsPerLine;
-    
     case HEHT_HEXDUMP:
-      return 0;
+      pt.x -= hed->LeftMargin + ((4 + hed->AddressSpacing) * hed->CharWidth);
+      *EditField = TRUE;
+      break;
     
-    case HEHT_ASCIIDUMP:
-      return 0;
-    
-    case HEHT_RIGHTMARGIN:
-      return (Line + 1) * hed->ColumnsPerLine;
+    default:
+      pt.x -= hed->LeftMargin + ((4 + hed->AddressSpacing + hed->SplitSpacing + (3 * hed->ColumnsPerLine)) * hed->CharWidth);
+      *EditField = FALSE;
+      break;
   }
+  
+  if(pt.x > 0)
+  {
+    INT BlockWidth = (*EditField ? hed->CharWidth * 3 : hed->CharWidth);
+    EditPos->x = min(hed->ColumnsPerLine, pt.x / BlockWidth);
+  }
+  
+  bufsize = (hed->hBuffer ? LocalSize(hed->hBuffer) : 0);
+  Pos = (EditPos->y * hed->ColumnsPerLine) + EditPos->x;
+  if(Pos > bufsize)
+  {
+    INT tmp = bufsize % hed->ColumnsPerLine;
+    Pos = bufsize;
+    EditPos->x = (tmp == 0 ? hed->ColumnsPerLine : tmp);
+  }
+  return Pos;
 }
 
 /*** Control specific messages ************************************************/
@@ -735,6 +741,23 @@ HEXEDIT_WM_GETDLGCODE(LPMSG Msg)
   return DLGC_WANTARROWS | DLGC_WANTCHARS;
 }
 
+static LRESULT
+HEXEDIT_WM_LBUTTONDOWN(PHEXEDIT_DATA hed, INT Buttons, POINTS Pt)
+{
+  BOOL NewField;
+  POINT EditPos;
+  DWORD Hit = HEXEDIT_HitRegionTest(hed, Pt);
+  
+  hed->Position = HEXEDIT_PositionFromPoint(hed, Pt, Hit, &EditPos, &NewField); 
+  hed->EditingField = NewField;
+  hed->CaretCol = EditPos.x;
+  hed->CaretLine = EditPos.y;
+  
+  HEXEDIT_MoveCaret(hed, TRUE);
+  
+  return 0;
+}
+
 static BOOL
 HEXEDIT_WM_KEYDOWN(PHEXEDIT_DATA hed, INT VkCode)
 {
@@ -857,6 +880,9 @@ HexEditWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
     case WM_SIZE:
       return HEXEDIT_WM_SIZE(hed, (DWORD)wParam, LOWORD(lParam), HIWORD(lParam));
     
+    case WM_LBUTTONDOWN:
+      return HEXEDIT_WM_LBUTTONDOWN(hed, (INT)wParam, MAKEPOINTS(lParam));
+    
     case WM_MOUSEWHEEL:
     {
       UINT nScrollLines = 3;

From 386450b0181e8d0505947ea52a182fb0f143e3c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Fri, 2 Jul 2004 12:18:04 +0000
Subject: [PATCH 168/356] Fix WinExec return value

svn path=/trunk/; revision=9970
---
 reactos/lib/kernel32/process/proc.c | 43 ++++++++++++++---------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/reactos/lib/kernel32/process/proc.c b/reactos/lib/kernel32/process/proc.c
index 1bf9048a184..a0fc16931f1 100644
--- a/reactos/lib/kernel32/process/proc.c
+++ b/reactos/lib/kernel32/process/proc.c
@@ -1,4 +1,4 @@
-/* $Id: proc.c,v 1.62 2004/05/29 15:10:28 navaraf Exp $
+/* $Id: proc.c,v 1.63 2004/07/02 12:18:04 gvg Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -380,7 +380,6 @@ WinExec(LPCSTR lpCmdLine,
 {
    STARTUPINFOA StartupInfo;
    PROCESS_INFORMATION  ProcessInformation;
-   HINSTANCE hInst;
    DWORD dosErr;
 
    RtlZeroMemory(&StartupInfo, sizeof(StartupInfo));
@@ -388,31 +387,31 @@ WinExec(LPCSTR lpCmdLine,
    StartupInfo.wShowWindow = uCmdShow;
    StartupInfo.dwFlags = 0;
 
-   hInst = (HINSTANCE)CreateProcessA(NULL,
-				     (PVOID)lpCmdLine,
-				     NULL,
-				     NULL,
-				     FALSE,
-				     0,
-				     NULL,
-				     NULL,
-				     &StartupInfo,
-				     &ProcessInformation);
-   if ( hInst == NULL )
+   if (! CreateProcessA(NULL,
+			(PVOID)lpCmdLine,
+			NULL,
+			NULL,
+			FALSE,
+			0,
+			NULL,
+			NULL,
+			&StartupInfo,
+			&ProcessInformation))
      {
 	dosErr = GetLastError();
-	return dosErr;
+	return dosErr < 32 ? dosErr : ERROR_BAD_FORMAT;
      }
    if (NULL != lpfnGlobalRegisterWaitForInputIdle)
-   {
-     lpfnGlobalRegisterWaitForInputIdle (
-	ProcessInformation.hProcess,
-	10000
+     {
+       lpfnGlobalRegisterWaitForInputIdle (
+	  ProcessInformation.hProcess,
+          10000
 	);
-   }
-   NtClose (ProcessInformation.hProcess);
-   NtClose (ProcessInformation.hThread);
-   return 0;	
+     }
+   NtClose(ProcessInformation.hProcess);
+   NtClose(ProcessInformation.hThread);
+
+   return 33; /* Something bigger than 31 means success. */
 }
 
 

From b04f8c0e2234a1310c55e7a10b7c424e3fb1ec04 Mon Sep 17 00:00:00 2001
From: Royce Mitchell III <royce3@ev1.net>
Date: Fri, 2 Jul 2004 12:43:38 +0000
Subject: [PATCH 169/356] oops, if you're going to move a function, get rid of
 the old one... sorry...

svn path=/trunk/; revision=9971
---
 reactos/ntoskrnl/ke/catch.c | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/reactos/ntoskrnl/ke/catch.c b/reactos/ntoskrnl/ke/catch.c
index 73e0e5c2102..8702c0a4c1d 100644
--- a/reactos/ntoskrnl/ke/catch.c
+++ b/reactos/ntoskrnl/ke/catch.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: catch.c,v 1.44 2004/07/02 01:36:25 royce Exp $
+/* $Id: catch.c,v 1.45 2004/07/02 12:43:38 royce Exp $
  *
  * PROJECT:              ReactOS kernel
  * FILE:                 ntoskrnl/ke/catch.c
@@ -256,30 +256,6 @@ ExSystemExceptionFilter()
 	return FALSE;
 }
 
-VOID
-FASTCALL
-KeRosTrapReturn ( PKTRAP_FRAME TrapFrame, PKTRAP_FRAME PrevTrapFrame );
-
-NTSTATUS STDCALL
-NtRaiseException (IN PEXCEPTION_RECORD ExceptionRecord,
-		  IN PCONTEXT Context,
-		  IN BOOLEAN SearchFrames)
-{
-	PKTRAP_FRAME TrapFrame = KeGetCurrentThread()->TrapFrame;
-	PKTRAP_FRAME PrevTrapFrame = (PKTRAP_FRAME)TrapFrame->Edx;
-
-	KeGetCurrentKPCR()->Tib.ExceptionList = TrapFrame->ExceptionList;
-
-	KiDispatchException(ExceptionRecord,
-		Context,
-		PsGetCurrentThread()->Tcb.TrapFrame,
-		(KPROCESSOR_MODE)ExGetPreviousMode(),
-		SearchFrames);
-
-	KeRosTrapReturn ( TrapFrame, PrevTrapFrame );
-	return(STATUS_SUCCESS);
-}
-
 /*
  * @unimplemented
  */

From 0155d5acde6293cf0b507b95414f3affd1fa8e4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Fri, 2 Jul 2004 20:04:48 +0000
Subject: [PATCH 170/356] Only accept matching palette

svn path=/trunk/; revision=9972
---
 reactos/subsys/win32k/objects/color.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/reactos/subsys/win32k/objects/color.c b/reactos/subsys/win32k/objects/color.c
index c28fd426ae1..a86dbdfd55b 100644
--- a/reactos/subsys/win32k/objects/color.c
+++ b/reactos/subsys/win32k/objects/color.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: color.c,v 1.45 2004/06/29 20:08:05 navaraf Exp $ */
+/* $Id: color.c,v 1.46 2004/07/02 20:04:48 gvg Exp $ */
 #include <w32k.h>
 
 // FIXME: Use PXLATEOBJ logicalToSystem instead of int *mapping
@@ -452,9 +452,19 @@ HPALETTE STDCALL NtGdiSelectPalette(HDC  hDC,
       PalGDI = PALETTE_LockPalette(hpal);
       if (NULL != PalGDI)
 	{
-	  PALETTE_UnlockPalette(hpal);
-	  oldPal = dc->w.hPalette;
-	  dc->w.hPalette = hpal;
+          /* Is this a valid palette for this depth? */
+          if ((dc->w.bitsPerPixel <= 8 && PAL_INDEXED == PalGDI->Mode)
+              || (8 < dc->w.bitsPerPixel && PAL_INDEXED != PalGDI->Mode))
+            {
+              PALETTE_UnlockPalette(hpal);
+              oldPal = dc->w.hPalette;
+              dc->w.hPalette = hpal;
+            }
+          else
+            {
+              PALETTE_UnlockPalette(hpal);
+              oldPal = NULL;
+            }
 	}
       else
 	{

From 8af3ba8548bc6448c64f2daccbe7844982dbb2b5 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Fri, 2 Jul 2004 20:28:00 +0000
Subject: [PATCH 171/356] Add partial implementation of the environment
 variables dialog.

svn path=/trunk/; revision=9973
---
 reactos/lib/cpl/sysdm/Makefile      |   5 +-
 reactos/lib/cpl/sysdm/advanced.c    |  14 +-
 reactos/lib/cpl/sysdm/environment.c | 248 ++++++++++++++++++++++++++++
 reactos/lib/cpl/sysdm/resource.h    |  30 +++-
 reactos/lib/cpl/sysdm/sysdm.h       |   4 +-
 reactos/lib/cpl/sysdm/sysdm.rc      |  49 ++++--
 6 files changed, 322 insertions(+), 28 deletions(-)
 create mode 100644 reactos/lib/cpl/sysdm/environment.c

diff --git a/reactos/lib/cpl/sysdm/Makefile b/reactos/lib/cpl/sysdm/Makefile
index 6a480a0811f..9a6b0770913 100644
--- a/reactos/lib/cpl/sysdm/Makefile
+++ b/reactos/lib/cpl/sysdm/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 2004/06/30 10:53:05 ekohl Exp $
+# $Id: Makefile,v 1.4 2004/07/02 20:28:00 ekohl Exp $
 
 PATH_TO_TOP = ../../..
 
@@ -34,7 +34,8 @@ TARGET_PCH =
 
 TARGET_CLEAN = 
 
-TARGET_OBJECTS = sysdm.o general.o computer.o hardware.o advanced.o userprofile.o
+TARGET_OBJECTS = sysdm.o general.o computer.o hardware.o advanced.o userprofile.o\
+                 environment.o
 
 DEP_OBJECTS = $(TARGET_OBJECTS)
 
diff --git a/reactos/lib/cpl/sysdm/advanced.c b/reactos/lib/cpl/sysdm/advanced.c
index c21c1b34c35..d61039ad8d6 100644
--- a/reactos/lib/cpl/sysdm/advanced.c
+++ b/reactos/lib/cpl/sysdm/advanced.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: advanced.c,v 1.2 2004/06/30 10:53:05 ekohl Exp $
+/* $Id: advanced.c,v 1.3 2004/07/02 20:28:00 ekohl Exp $
  *
  * PROJECT:         ReactOS System Control Panel
  * FILE:            lib/cpl/system/advanced.c
@@ -38,8 +38,7 @@ AdvancedPageProc(
   HWND hwndDlg,
   UINT uMsg,
   WPARAM wParam,
-  LPARAM lParam
-)
+  LPARAM lParam)
 {
   switch (uMsg)
   {
@@ -47,6 +46,15 @@ AdvancedPageProc(
       break;
 
     case WM_COMMAND:
+      switch(LOWORD(wParam))
+      {
+        case IDC_ENVVAR:
+          DialogBox(hApplet,
+                    MAKEINTRESOURCE(IDD_ENVIRONMENT_VARIABLES),
+                    hwndDlg,
+                    EnvironmentDlgProc);
+          break;
+      }
       break;
 
   }
diff --git a/reactos/lib/cpl/sysdm/environment.c b/reactos/lib/cpl/sysdm/environment.c
new file mode 100644
index 00000000000..ad3f3577f8a
--- /dev/null
+++ b/reactos/lib/cpl/sysdm/environment.c
@@ -0,0 +1,248 @@
+/*
+ *  ReactOS
+ *  Copyright (C) 2004 ReactOS Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+/* $Id: environment.c,v 1.1 2004/07/02 20:28:00 ekohl Exp $
+ *
+ * PROJECT:         ReactOS System Control Panel
+ * FILE:            lib/cpl/sysdm/environment.c
+ * PURPOSE:         Environment variable settings
+ * PROGRAMMER:      Eric Kohl
+ */
+
+#include <windows.h>
+#include <commctrl.h>
+#include <stdlib.h>
+#include <tchar.h>
+
+#include "resource.h"
+#include "sysdm.h"
+
+
+static VOID
+SetEnvironmentVariables(HWND hwndListView,
+			HKEY hRootKey,
+			LPTSTR lpSubKeyName)
+{
+  HKEY hKey;
+  DWORD dwValues;
+  DWORD dwMaxValueNameLength;
+  DWORD dwMaxValueDataLength;
+  DWORD i;
+  LPTSTR lpName;
+  LPTSTR lpData;
+  LPTSTR lpExpandData;
+  DWORD dwNameLength;
+  DWORD dwDataLength;
+  DWORD dwType;
+
+  LV_ITEM lvi;
+  int nIndex;
+
+  if (RegOpenKeyEx(hRootKey,
+		   lpSubKeyName,
+		   0,
+		   KEY_READ,
+		   &hKey))
+    return;
+
+  if (RegQueryInfoKey(hKey,
+		      NULL,
+		      NULL,
+		      NULL,
+		      NULL,
+		      NULL,
+		      NULL,
+		      &dwValues,
+		      &dwMaxValueNameLength,
+		      &dwMaxValueDataLength,
+		      NULL,
+		      NULL))
+  {
+    RegCloseKey(hKey);
+    return;
+  }
+
+  lpName = GlobalAlloc(GPTR, (dwMaxValueNameLength + 1) * sizeof(TCHAR));
+  if (lpName == NULL)
+  {
+    RegCloseKey(hKey);
+    return;
+  }
+
+  lpData = GlobalAlloc(GPTR, (dwMaxValueDataLength + 1) * sizeof(TCHAR));
+  if (lpData == NULL)
+  {
+    GlobalFree(lpData);
+    RegCloseKey(hKey);
+    return;
+  }
+
+  for (i = 0; i < dwValues; i++)
+  {
+    dwNameLength = dwMaxValueNameLength + 1;
+    dwDataLength = dwMaxValueDataLength + 1;
+    if (RegEnumValue(hKey,
+		     i,
+		     lpName,
+		     &dwNameLength,
+		     NULL,
+		     &dwType,
+		     (LPBYTE)lpData,
+		     &dwDataLength))
+    {
+      GlobalFree(lpName);
+      GlobalFree(lpData);
+      RegCloseKey(hKey);
+      return;
+    }
+
+    if (dwType == REG_EXPAND_SZ)
+    {
+      lpExpandData = GlobalAlloc(GPTR, MAX_PATH * sizeof(TCHAR));
+      if (lpExpandData == NULL)
+      {
+        GlobalFree(lpName);
+        GlobalFree(lpData);
+        RegCloseKey(hKey);
+        return;
+      }
+
+      ExpandEnvironmentStrings(lpData,
+			       lpExpandData,
+			       MAX_PATH);
+    }
+
+    memset(&lvi, 0x00, sizeof(lvi));
+    lvi.mask = LVIF_TEXT | LVIF_STATE;
+    lvi.pszText = lpName;
+    lvi.state=0;
+    nIndex = ListView_InsertItem(hwndListView, &lvi);
+
+    if (dwType == REG_EXPAND_SZ)
+    {
+      ListView_SetItemText(hwndListView, nIndex, 1, lpExpandData);
+      GlobalFree(lpExpandData);
+    }
+    else
+    {
+      ListView_SetItemText(hwndListView, nIndex, 1, lpData);
+    }
+  }
+
+  GlobalFree(lpName);
+  GlobalFree(lpData);
+  RegCloseKey(hKey);
+}
+
+
+static VOID
+SetListViewColumns(HWND hwndListView)
+{
+  RECT rect;
+  LV_COLUMN column;
+
+  GetClientRect(hwndListView, &rect);
+
+  memset(&column, 0x00, sizeof(column));
+  column.mask=LVCF_FMT | LVCF_WIDTH | LVCF_SUBITEM|LVCF_TEXT;
+  column.fmt=LVCFMT_LEFT;
+  column.cx = (rect.right - rect.left) / 3;
+  column.iSubItem = 0;
+  column.pszText = _T("Variable");
+  ListView_InsertColumn(hwndListView, 0, &column);
+
+  column.cx = (rect.right - rect.left) - ((rect.right - rect.left) / 3) - 1;
+  column.iSubItem = 1;
+  column.pszText = _T("Value");
+  ListView_InsertColumn(hwndListView, 1, &column);
+}
+
+
+static VOID
+OnInitDialog(HWND hwndDlg)
+{
+  HWND hwndListView;
+
+  /* Set user environment variables */
+  hwndListView = GetDlgItem(hwndDlg, IDC_USER_VARIABLE_LIST);
+
+  SetListViewColumns(hwndListView);
+
+  SetEnvironmentVariables(hwndListView,
+			  HKEY_CURRENT_USER,
+			  _T("Environment"));
+
+  ListView_SetColumnWidth(hwndListView,2,LVSCW_AUTOSIZE_USEHEADER);
+  ListView_Update(hwndListView,0);
+
+
+  /* Set system environment variables */
+  hwndListView = GetDlgItem(hwndDlg, IDC_SYSTEM_VARIABLE_LIST);
+
+  SetListViewColumns(hwndListView);
+
+  SetEnvironmentVariables(hwndListView,
+			  HKEY_LOCAL_MACHINE,
+			  _T("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment"));
+
+  ListView_SetColumnWidth(hwndListView,2,LVSCW_AUTOSIZE_USEHEADER);
+  ListView_Update(hwndListView,0);
+}
+
+
+/* Environment dialog procedure */
+BOOL CALLBACK
+EnvironmentDlgProc(HWND hwndDlg,
+		   UINT uMsg,
+		   WPARAM wParam,
+		   LPARAM lParam)
+{
+  switch (uMsg)
+  {
+    case WM_INITDIALOG:
+      OnInitDialog(hwndDlg);
+      break;
+
+    case WM_COMMAND:
+      switch (LOWORD(wParam))
+      {
+        case IDC_USER_VARIABLE_NEW:
+        case IDC_USER_VARIABLE_EDIT:
+        case IDC_USER_VARIABLE_DELETE:
+          break;
+
+        case IDC_SYSTEM_VARIABLE_NEW:
+        case IDC_SYSTEM_VARIABLE_EDIT:
+        case IDC_SYSTEM_VARIABLE_DELETE:
+          break;
+
+        case IDOK:
+          EndDialog(hwndDlg, 0);
+          return TRUE;
+
+        case IDCANCEL:
+          EndDialog(hwndDlg, 0);
+          return TRUE;
+      }
+      break;
+  }
+
+  return FALSE;
+}
+
+/* EOF */
diff --git a/reactos/lib/cpl/sysdm/resource.h b/reactos/lib/cpl/sysdm/resource.h
index a6f4ff1bc87..e4d56fb1615 100644
--- a/reactos/lib/cpl/sysdm/resource.h
+++ b/reactos/lib/cpl/sysdm/resource.h
@@ -2,12 +2,12 @@
 #define __CPL_RESOURCE_H
 
 /* metrics */
-#define PROPSHEETWIDTH  246
-#define PROPSHEETHEIGHT 228
-#define PROPSHEETPADDING        6
-#define SYSTEM_COLUMN   (18 * PROPSHEETPADDING)
-#define LABELLINE(x)    (((PROPSHEETPADDING + 2) * x) + (x + 2))
-#define ICONSIZE        16
+#define PROPSHEETWIDTH   256
+#define PROPSHEETHEIGHT  218
+#define PROPSHEETPADDING 6
+#define SYSTEM_COLUMN    (18 * PROPSHEETPADDING)
+#define LABELLINE(x)     (((PROPSHEETPADDING + 2) * x) + (x + 2))
+#define ICONSIZE         16
 
 /* ids */
 #define RC_LICENSE      101
@@ -45,9 +45,21 @@
 #define IDC_HARDWARE_PROFILE	210
 #define IDC_HARDWARE_DRIVER_SIGN	211
 #define IDC_HARDWARE_DEVICE_MANAGER	212
-#define IDC_USERPROFILE_DELETE	213
-#define IDC_USERPROFILE_CHANGE	214
-#define IDC_USERPROFILE_COPY		215
+
+#define IDC_USERPROFILE_LIST            213
+#define IDC_USERPROFILE_DELETE          214
+#define IDC_USERPROFILE_CHANGE          215
+#define IDC_USERPROFILE_COPY            216
+
+#define IDD_ENVIRONMENT_VARIABLES       105
+#define IDC_USER_VARIABLE_LIST          220
+#define IDC_USER_VARIABLE_NEW           221
+#define IDC_USER_VARIABLE_EDIT          222
+#define IDC_USER_VARIABLE_DELETE        223
+#define IDC_SYSTEM_VARIABLE_LIST        224
+#define IDC_SYSTEM_VARIABLE_NEW         225
+#define IDC_SYSTEM_VARIABLE_EDIT        226
+#define IDC_SYSTEM_VARIABLE_DELETE      227
 
 #endif /* __CPL_RESOURCE_H */
 
diff --git a/reactos/lib/cpl/sysdm/sysdm.h b/reactos/lib/cpl/sysdm/sysdm.h
index 0fc26155f9d..915203dfed8 100644
--- a/reactos/lib/cpl/sysdm/sysdm.h
+++ b/reactos/lib/cpl/sysdm/sysdm.h
@@ -21,8 +21,8 @@ BOOL CALLBACK HardwarePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lP
 BOOL CALLBACK AdvancedPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 BOOL CALLBACK UserProfilePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
-
-//BOOL CALLBACK EnvironmentDlgProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+/* environment.c */
+BOOL CALLBACK EnvironmentDlgProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 
 #endif /* __CPL_SYSDM_H */
diff --git a/reactos/lib/cpl/sysdm/sysdm.rc b/reactos/lib/cpl/sysdm/sysdm.rc
index a47bcd20ba3..d9344bd6d27 100644
--- a/reactos/lib/cpl/sysdm/sysdm.rc
+++ b/reactos/lib/cpl/sysdm/sysdm.rc
@@ -72,9 +72,9 @@ BEGIN
   LTEXT "Workgroup:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING,LABELLINE(6)-6,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(6)-6
   LTEXT "",IDC_WORKGROUPDOMAIN_NAME,90,LABELLINE(6)-6,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(6)-6
   LTEXT "To use the Network Identfication Wizard to join a domain and create a local user, click Network ID.",-1,PROPSHEETPADDING,LABELLINE(7)+5,PROPSHEETWIDTH-(12*PROPSHEETPADDING)-ICONSIZE,LABELLINE(8)+5
-  PUSHBUTTON "&Network ID",IDC_NETWORK_ID,185,LABELLINE(7)+5,54,LABELLINE(1)+4
+  PUSHBUTTON "&Network ID...",IDC_NETWORK_ID,185,LABELLINE(7)+5,54,LABELLINE(1)+4
   LTEXT "To rename this computer or join a domain, click Properties.",-1,PROPSHEETPADDING,LABELLINE(11)+2,PROPSHEETWIDTH-(12*PROPSHEETPADDING)-ICONSIZE,LABELLINE(12)+2
-  PUSHBUTTON "&Properties",IDC_NETWORK_PROPERTY,185,LABELLINE(11)+2,54,LABELLINE(1)+4
+  PUSHBUTTON "&Properties...",IDC_NETWORK_PROPERTY,185,LABELLINE(11)+2,54,LABELLINE(1)+4
 END
 
 IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
@@ -85,18 +85,18 @@ BEGIN
   GROUPBOX "Hardware Wizard",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
   LTEXT "The Hardware wizard helps you install, uninstall, repair, unplug, eject, and configure your hardware.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
   ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON
-  PUSHBUTTON "&Hardware Wizard",IDC_HARDWARE_WIZARD,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&Hardware Wizard...",IDC_HARDWARE_WIZARD,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
 
   GROUPBOX "Device Manager",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(7)+2
   ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-3,ICONSIZE, ICONSIZE, SS_ICON
   LTEXT "The Device Manager lists all the hardware devices installed on your computer. Use the Device Manager to change the properties of any device.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
   
-  PUSHBUTTON "&Device Manager",IDC_HARDWARE_DEVICE_MANAGER,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&Device Manager...",IDC_HARDWARE_DEVICE_MANAGER,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14
 
   GROUPBOX "Hardware Profiles",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
   ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(18)-5, ICONSIZE, ICONSIZE, SS_ICON
   LTEXT "Hardware profiles provide a way for you to set up and store different hardware configurations.",0,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
-  PUSHBUTTON "&Hardware Profiles",IDC_HARDWARE_PROFILE,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(20)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&Hardware Profiles...",IDC_HARDWARE_PROFILE,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(20)+2,(15*PROPSHEETPADDING),14
 END
 
 IDD_PROPPAGEUSERPROFILE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
@@ -106,10 +106,12 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
   ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING,LABELLINE(1), ICONSIZE, ICONSIZE, SS_ICON
   LTEXT "User profiles contain desktop settings and other information related to your login. A different profile can be created on each computer you use, or you can select a roaming profile that is the same on every computer you use.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(4)
-  LTEXT "Profiles stored on this computer:",-1,PROPSHEETPADDING,LABELLINE(6),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(6)
-  PUSHBUTTON "Delete",IDC_USERPROFILE_DELETE,PROPSHEETPADDING,LABELLINE(23),60,LABELLINE(1)+2
-  PUSHBUTTON "Change Type",IDC_USERPROFILE_CHANGE,95,LABELLINE(23),60,LABELLINE(1)+2
-  PUSHBUTTON "Copy To",IDC_USERPROFILE_COPY,180,LABELLINE(23),60,LABELLINE(1)+2
+  LTEXT "Profiles stored on this computer:",-1,PROPSHEETPADDING,LABELLINE(6),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1)
+  CONTROL "",IDC_USERPROFILE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_SHOWSELALWAYS|LVS_SORTASCENDING|WS_BORDER|WS_TABSTOP,PROPSHEETPADDING,LABELLINE(8),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(11),WS_EX_CLIENTEDGE
+  
+  PUSHBUTTON "Delete",IDC_USERPROFILE_DELETE,PROPSHEETPADDING,LABELLINE(20),60,LABELLINE(1)+2
+  PUSHBUTTON "Change Type...",IDC_USERPROFILE_CHANGE,95,LABELLINE(20),60,LABELLINE(1)+2
+  PUSHBUTTON "Copy To...",IDC_USERPROFILE_COPY,180,LABELLINE(20),60,LABELLINE(1)+2
 END
 
 IDD_PROPPAGEADVANCED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
@@ -120,15 +122,38 @@ BEGIN
   GROUPBOX "Performance",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
   ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON
   LTEXT "Performance options control how applications use memory, which affects the speed of your computer.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
-  PUSHBUTTON "&Performance Options",IDC_ENVVAR,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&Performance Options...",IDC_ENVVAR,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
   GROUPBOX "Environment Variables",-1,PROPSHEETPADDING,LABELLINE(8)+2,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
   ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-5, ICONSIZE, ICONSIZE, SS_ICON
   LTEXT "Environment variables tell your computer where to find certain types of information.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(11)
-  PUSHBUTTON "&Environment Variables",IDC_ENVVAR,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(12)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&Environment Variables...",IDC_ENVVAR,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(12)+2,(15*PROPSHEETPADDING),14
   GROUPBOX "Startup and Recovery",-1,PROPSHEETPADDING,LABELLINE(15)+3,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
   ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(17)-5, ICONSIZE, ICONSIZE, SS_ICON
   LTEXT "Startup and recovery options tell your computer how to start and what to do if an error causes your computer to stop.",0,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(17)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
-  PUSHBUTTON "&Startup and Recovery",IDC_STAREC,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(19)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&Startup and Recovery...",IDC_STAREC,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(19)+2,(15*PROPSHEETPADDING),14
+END
+
+IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245
+STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Environment Variables"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+  GROUPBOX "User variables",-1,7,12,238,100
+  LTEXT "&Variables:",-1,14,24,224,8
+  CONTROL "",IDC_USER_VARIABLE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_SHOWSELALWAYS|LVS_SORTASCENDING|LVS_NOSORTHEADER|WS_VSCROLL|WS_HSCROLL|WS_TABSTOP,14,35,224,48,WS_EX_CLIENTEDGE
+  PUSHBUTTON "&New...",IDC_USER_VARIABLE_NEW,80,90,50,14
+  PUSHBUTTON "&Edit...",IDC_USER_VARIABLE_EDIT,134,90,50,14
+  PUSHBUTTON "&Delete",IDC_USER_VARIABLE_DELETE,188,90,50,14
+
+  GROUPBOX "System variables",-1,7,116,238,100
+  LTEXT "V&ariables:",410,14,128,224,8
+  CONTROL "",IDC_SYSTEM_VARIABLE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_SHOWSELALWAYS|LVS_SORTASCENDING|LVS_NOSORTHEADER|WS_VSCROLL|WS_HSCROLL|WS_TABSTOP,14,139,224,48,WS_EX_CLIENTEDGE
+  PUSHBUTTON "Ne&w...",IDC_SYSTEM_VARIABLE_NEW,80,194,50,14
+  PUSHBUTTON "Ed&it...",IDC_SYSTEM_VARIABLE_EDIT,134,194,50,14
+  PUSHBUTTON "De&lete",IDC_SYSTEM_VARIABLE_DELETE,188,194,50,14
+
+  DEFPUSHBUTTON "OK",IDOK,141,224,50,14,WS_GROUP
+  PUSHBUTTON "Cancel",IDCANCEL,195,224,50,14
 END
 
 STRINGTABLE 

From 14377c13f53e98126a70421a615e428c164a49bd Mon Sep 17 00:00:00 2001
From: Royce Mitchell III <royce3@ev1.net>
Date: Fri, 2 Jul 2004 21:02:54 +0000
Subject: [PATCH 172/356] small cleanup

svn path=/trunk/; revision=9974
---
 reactos/ntoskrnl/Makefile | 87 +++++++++++++--------------------------
 1 file changed, 29 insertions(+), 58 deletions(-)

diff --git a/reactos/ntoskrnl/Makefile b/reactos/ntoskrnl/Makefile
index 1e89359f57f..ddfb1eddd28 100644
--- a/reactos/ntoskrnl/Makefile
+++ b/reactos/ntoskrnl/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.128 2004/06/23 22:32:45 ion Exp $
+# $Id: Makefile,v 1.129 2004/07/02 21:02:54 royce Exp $
 #
 # ReactOS Operating System
 #
@@ -535,25 +535,31 @@ OBJECTS := \
 	$(OBJECTS_PATH)/inbv.o \
 	$(OBJECTS_RESOURCE)
 
+NTOSKRNL_LIBS := \
+	$(DDK_PATH_LIB)/hal.a \
+	$(SDK_PATH_LIB)/rtl.a \
+	$(SDK_PATH_LIB)/string.a \
+	$(SDK_PATH_LIB)/rosrtl.a \
+	$(SDK_PATH_LIB)/pseh.a
 
-$(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA) $(SDK_PATH_LIB)/rtl.a $(SDK_PATH_LIB)/string.a $(SDK_PATH_LIB)/rosrtl.a
+NTOSKRNL_LD_FLAGS := \
+	-Wl,--subsystem,native \
+	-Wl,--image-base,0xc0000000 \
+	-Wl,--file-alignment,0x1000 \
+	-Wl,--section-alignment,0x1000 \
+	-Wl,--entry,_NtProcessStartup
+
+$(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA) $(NTOSKRNL_LIBS)
 	$(CC) \
 		-Wl,-T,ntoskrnl.lnk \
 		-nostartfiles \
 		-nostdlib \
 		-mdll \
 		-o junk.tmp \
-		-Wl,--subsystem,native \
-		-Wl,--image-base,0xc0000000 \
-		-Wl,--file-alignment,0x1000 \
-		-Wl,--section-alignment,0x1000 \
-		-Wl,--entry,_NtProcessStartup \
+		$(NTOSKRNL_LD_FLAGS) \
 		-Wl,--base-file,base.tmp \
 		$(TARGETNAME).o -lgcc \
-		$(SDK_PATH_LIB)/rtl.a \
-		$(SDK_PATH_LIB)/string.a \
-		$(SDK_PATH_LIB)/rosrtl.a \
-		$(DDK_PATH_LIB)/hal.a
+		$(NTOSKRNL_LIBS)
 	- $(RM) junk.tmp
 	$(DLLTOOL) \
 		--dllname $(TARGETNAME).exe \
@@ -568,37 +574,23 @@ $(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA) $(SDK_PATH_LIB)/rtl.a $(SD
 		-Wl,-T,ntoskrnl.lnk \
 		-mdll \
 		-o $(TARGETNAME).nostrip.exe \
-		-Wl,--subsystem,native \
-		-Wl,--image-base,0xc0000000 \
-		-Wl,--file-alignment,0x1000 \
-		-Wl,--section-alignment,0x1000 \
-		-Wl,--entry,_NtProcessStartup \
+		$(NTOSKRNL_LD_FLAGS) \
 		-Wl,temp.exp \
 		$(TARGETNAME).o -lgcc \
-		$(SDK_PATH_LIB)/rtl.a \
-		$(SDK_PATH_LIB)/string.a \
-		$(SDK_PATH_LIB)/rosrtl.a \
-		$(DDK_PATH_LIB)/hal.a
+		$(NTOSKRNL_LIBS)
 	- $(RM) temp.exp
 
-$(TARGETNAME).exe: $(TARGETNAME).o $(LINKER_SCRIPT) $(DDK_PATH_LIB)/hal.a $(SDK_PATH_LIB)/rtl.a $(SDK_PATH_LIB)/string.a $(SDK_PATH_LIB)/rosrtl.a
+$(TARGETNAME).exe: $(TARGETNAME).o $(LINKER_SCRIPT) $(NTOSKRNL_LIBS)
 	- $(CC) \
 		-Wl,-T,$(LINKER_SCRIPT) \
 		-nostartfiles \
 		-nostdlib \
 		-mdll \
 		-o junk.tmp \
-		-Wl,--subsystem,native \
-		-Wl,--image-base,0xc0000000 \
-		-Wl,--file-alignment,0x1000 \
-		-Wl,--section-alignment,0x1000 \
-		-Wl,--entry,_NtProcessStartup \
+		$(NTOSKRNL_LD_FLAGS) \
 		-Wl,--base-file,base.tmp \
 		$(TARGETNAME).o -lgcc \
-		$(SDK_PATH_LIB)/rtl.a \
-		$(SDK_PATH_LIB)/string.a \
-		$(SDK_PATH_LIB)/rosrtl.a \
-		$(DDK_PATH_LIB)/hal.a
+		$(NTOSKRNL_LIBS)
 	- $(RM) junk.tmp
 	$(DLLTOOL) \
 		--dllname $(TARGETNAME).exe \
@@ -613,40 +605,26 @@ $(TARGETNAME).exe: $(TARGETNAME).o $(LINKER_SCRIPT) $(DDK_PATH_LIB)/hal.a $(SDK_
 		-nostdlib \
 		-mdll \
 		-o $(TARGETNAME).exe \
-		-Wl,--subsystem,native \
-		-Wl,--image-base,0xc0000000 \
-		-Wl,--file-alignment,0x1000 \
-		-Wl,--section-alignment,0x1000 \
-		-Wl,--entry,_NtProcessStartup \
+		$(NTOSKRNL_LD_FLAGS) \
 		-Wl,temp.exp \
 		$(TARGETNAME).o -lgcc \
-		$(SDK_PATH_LIB)/rtl.a \
-		$(SDK_PATH_LIB)/string.a \
-		$(SDK_PATH_LIB)/rosrtl.a \
-		$(DDK_PATH_LIB)/hal.a
+		$(NTOSKRNL_LIBS)
 	- $(RM) temp.exp
 
 $(TARGETNAME).dbg.o: $(TARGETNAME).o
 	$(STRIP) --strip-debug -o $(TARGETNAME).dbg.o $(TARGETNAME).o
 
-$(TARGETNAME).dbg: $(TARGETNAME).dbg.o $(TARGETNAME).a $(TARGETNAME).dbg.lnk $(DDK_PATH_LIB)/hal.a $(SDK_PATH_LIB)/rtl.a $(SDK_PATH_LIB)/string.a $(SDK_PATH_LIB)/rosrtl.a
+$(TARGETNAME).dbg: $(TARGETNAME).dbg.o $(TARGETNAME).a $(TARGETNAME).dbg.lnk $(NTOSKRNL_LIBS)
 	$(CC) \
 		-Wl,-T,$(TARGETNAME).dbg.lnk \
 		-nostartfiles \
 		-nostdlib \
 		-mdll \
 		-o junk.tmp \
-		-Wl,--subsystem,native \
-		-Wl,--image-base,0xc0000000 \
-		-Wl,--file-alignment,0x1000 \
-		-Wl,--section-alignment,0x1000 \
-		-Wl,--entry,_NtProcessStartup \
+		$(NTOSKRNL_LD_FLAGS) \
 		-Wl,--base-file,base.tmp \
 		$(TARGETNAME).dbg.o -lgcc \
-		$(SDK_PATH_LIB)/rtl.a \
-		$(SDK_PATH_LIB)/string.a \
-		$(SDK_PATH_LIB)/rosrtl.a \
-		$(DDK_PATH_LIB)/hal.a
+		$(NTOSKRNL_LIBS)
 	- $(RM) junk.tmp
 	$(DLLTOOL) \
 		--dllname $(TARGETNAME).dbg \
@@ -661,17 +639,10 @@ $(TARGETNAME).dbg: $(TARGETNAME).dbg.o $(TARGETNAME).a $(TARGETNAME).dbg.lnk $(D
 		-nostdlib \
 		-mdll \
 		-o $(TARGETNAME).dbg \
-		-Wl,--subsystem,native \
-		-Wl,--image-base,0xc0000000 \
-		-Wl,--file-alignment,0x1000 \
-		-Wl,--section-alignment,0x1000 \
-		-Wl,--entry,_NtProcessStartup \
+		$(NTOSKRNL_LD_FLAGS) \
 		-Wl,temp.exp \
 		$(TARGETNAME).dbg.o -lgcc \
-		$(SDK_PATH_LIB)/rtl.a \
-		$(SDK_PATH_LIB)/string.a \
-		$(SDK_PATH_LIB)/rosrtl.a \
-		$(DDK_PATH_LIB)/hal.a
+		$(NTOSKRNL_LIBS)
 	- $(RM) temp.exp
 
 $(TARGETNAME).sym: $(TARGETNAME).nostrip.exe

From 40afa3d500206509aedfe00999d6086a92ad3d46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Fri, 2 Jul 2004 21:20:51 +0000
Subject: [PATCH 173/356] NtCreateKey doesn't create nested keys, but
 RegCreateKey should. Fixes issues 2) and 3) of bug #331

svn path=/trunk/; revision=9975
---
 reactos/lib/advapi32/reg/reg.c | 138 +++++++++++++++++++++++++++++----
 1 file changed, 123 insertions(+), 15 deletions(-)

diff --git a/reactos/lib/advapi32/reg/reg.c b/reactos/lib/advapi32/reg/reg.c
index 1f720b98c34..fcd890716f4 100644
--- a/reactos/lib/advapi32/reg/reg.c
+++ b/reactos/lib/advapi32/reg/reg.c
@@ -1,4 +1,4 @@
-/* $Id: reg.c,v 1.47 2004/06/17 09:07:12 ekohl Exp $
+/* $Id: reg.c,v 1.48 2004/07/02 21:20:51 gvg Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -313,6 +313,115 @@ RegConnectRegistryW (LPCWSTR lpMachineName,
 }
 
 
+/************************************************************************
+ *  CreateNestedKey
+ *
+ *  Create key and all necessary intermediate keys
+ */
+static NTSTATUS
+CreateNestedKey(PHKEY KeyHandle,
+		POBJECT_ATTRIBUTES ObjectAttributes,
+                PUNICODE_STRING ClassString,
+                DWORD dwOptions,
+                REGSAM samDesired,
+                DWORD *lpdwDisposition)
+{
+  OBJECT_ATTRIBUTES LocalObjectAttributes;
+  UNICODE_STRING LocalKeyName;
+  ULONG Disposition;
+  NTSTATUS Status;
+  ULONG FullNameLength;
+  ULONG Length;
+  PWCHAR Ptr;
+  HANDLE LocalKeyHandle;
+
+  Status = NtCreateKey((PHANDLE) KeyHandle,
+                       samDesired,
+                       ObjectAttributes,
+                       0,
+                       ClassString,
+                       dwOptions,
+                       (PULONG)lpdwDisposition);
+  DPRINT("NtCreateKey(%wZ) called (Status %lx)\n", ObjectAttributes->ObjectName, Status);
+  if (Status != STATUS_OBJECT_NAME_NOT_FOUND)
+    return Status;
+
+  /* Copy object attributes */
+  RtlCopyMemory (&LocalObjectAttributes,
+		 ObjectAttributes,
+		 sizeof(OBJECT_ATTRIBUTES));
+  RtlCreateUnicodeString (&LocalKeyName,
+			  ObjectAttributes->ObjectName->Buffer);
+  LocalObjectAttributes.ObjectName = &LocalKeyName;
+  FullNameLength = LocalKeyName.Length / sizeof(WCHAR);
+
+  /* Remove the last part of the key name and try to create the key again. */
+  while (Status == STATUS_OBJECT_NAME_NOT_FOUND)
+    {
+      Ptr = wcsrchr (LocalKeyName.Buffer, '\\');
+      if (Ptr == NULL || Ptr == LocalKeyName.Buffer)
+	{
+	  Status = STATUS_UNSUCCESSFUL;
+	  break;
+	}
+      *Ptr = (WCHAR)0;
+      LocalKeyName.Length = wcslen (LocalKeyName.Buffer) * sizeof(WCHAR);
+
+      Status = NtCreateKey (&LocalKeyHandle,
+			    KEY_ALL_ACCESS,
+			    &LocalObjectAttributes,
+			    0,
+			    NULL,
+			    0,
+			    &Disposition);
+      DPRINT("NtCreateKey(%wZ) called (Status %lx)\n", &LocalKeyName, Status);
+    }
+
+  if (!NT_SUCCESS(Status))
+    {
+      RtlFreeUnicodeString (&LocalKeyName);
+      return Status;
+    }
+
+  /* Add removed parts of the key name and create them too. */
+  Length = wcslen (LocalKeyName.Buffer);
+  while (TRUE)
+    {
+      NtClose (LocalKeyHandle);
+
+      LocalKeyName.Buffer[Length] = L'\\';
+      Length = wcslen (LocalKeyName.Buffer);
+      LocalKeyName.Length = Length * sizeof(WCHAR);
+
+      if (Length == FullNameLength)
+        {
+          Status = NtCreateKey((PHANDLE) KeyHandle,
+                               samDesired,
+                               ObjectAttributes,
+                               0,
+                               ClassString,
+                               dwOptions,
+                               (PULONG)lpdwDisposition);
+          break;
+        }
+      Status = NtCreateKey (&LocalKeyHandle,
+			    KEY_ALL_ACCESS,
+			    &LocalObjectAttributes,
+			    0,
+			    NULL,
+			    0,
+			    &Disposition);
+      DPRINT("NtCreateKey(%wZ) called (Status %lx)\n", &LocalKeyName, Status);
+      if (!NT_SUCCESS(Status))
+	break;
+    }
+
+  RtlFreeUnicodeString (&LocalKeyName);
+
+  return Status;
+}
+
+
 /************************************************************************
  *  RegCreateKeyExA
  *
@@ -361,13 +470,12 @@ RegCreateKeyExA (HKEY hKey,
 			      OBJ_CASE_INSENSITIVE,
 			      (HANDLE)ParentKey,
 			      (PSECURITY_DESCRIPTOR)lpSecurityAttributes);
-  Status = NtCreateKey ((PHANDLE)phkResult,
-			samDesired,
-			&Attributes,
-			0,
-			(lpClass == NULL)? NULL : &ClassString,
-			dwOptions,
-			(PULONG)lpdwDisposition);
+  Status = CreateNestedKey(phkResult,
+		           &Attributes,
+                           (lpClass == NULL)? NULL : &ClassString,
+                           dwOptions,
+                           samDesired,
+                           lpdwDisposition);
   RtlFreeUnicodeString (&SubKeyString);
   if (lpClass != NULL)
     {
@@ -430,13 +538,12 @@ RegCreateKeyExW (HKEY hKey,
 			      OBJ_CASE_INSENSITIVE,
 			      (HANDLE)ParentKey,
 			      (PSECURITY_DESCRIPTOR)lpSecurityAttributes);
-  Status = NtCreateKey ((PHANDLE)phkResult,
-			samDesired,
-			&Attributes,
-			0,
-			(lpClass == NULL)? NULL : &ClassString,
-			dwOptions,
-			(PULONG)lpdwDisposition);
+  Status = CreateNestedKey(phkResult,
+		           &Attributes,
+                           (lpClass == NULL)? NULL : &ClassString,
+                           dwOptions,
+                           samDesired,
+                           lpdwDisposition);
   DPRINT("Status %x\n", Status);
   if (!NT_SUCCESS(Status))
     {
@@ -1622,6 +1729,7 @@ RegOpenKeyA (HKEY hKey,
   LONG ErrorCode;
   NTSTATUS Status;
 
+DPRINT1("RegOpenKeyA hKey 0x%x subkey %s\n", hKey, lpSubKey);
   Status = MapDefaultKey (&KeyHandle,
 			  hKey);
   if (!NT_SUCCESS(Status))

From ac183abd237145228390ec2606b743b77b98f10e Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sat, 3 Jul 2004 13:45:42 +0000
Subject: [PATCH 174/356] - Handle correctly bottom-up surfaces in the VGA
 driver.

svn path=/trunk/; revision=9976
---
 reactos/drivers/video/displays/vga/objects/bitblt.c    |  6 +++---
 reactos/drivers/video/displays/vga/objects/pointer.c   | 10 +++++-----
 reactos/drivers/video/displays/vga/objects/transblt.c  |  2 +-
 reactos/drivers/video/displays/vga/vgavideo/vgavideo.c |  5 ++++-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/reactos/drivers/video/displays/vga/objects/bitblt.c b/reactos/drivers/video/displays/vga/objects/bitblt.c
index 2f8b8e30cfa..b80fc8ff520 100644
--- a/reactos/drivers/video/displays/vga/objects/bitblt.c
+++ b/reactos/drivers/video/displays/vga/objects/bitblt.c
@@ -77,7 +77,7 @@ VGAtoDIB(SURFOBJ *Dest, SURFOBJ *Source, XLATEOBJ *ColorTranslation,
 
   // FIXME: Optimize to retrieve entire bytes at a time (see /display/vgavideo/vgavideo.c:vgaGetByte)
 
-  GDIpos = Dest->pvBits /* + (DestRect->top * Dest->lDelta) + (DestRect->left >> 1) */ ;
+  GDIpos = Dest->pvScan0 /* + (DestRect->top * Dest->lDelta) + (DestRect->left >> 1) */ ;
   dx = DestRect->right  - DestRect->left;
   dy = DestRect->bottom - DestRect->top;
 
@@ -87,7 +87,7 @@ VGAtoDIB(SURFOBJ *Dest, SURFOBJ *Source, XLATEOBJ *ColorTranslation,
     DestDevSurf.NextScan = Dest->lDelta;
     DestDevSurf.StartBmp = Dest->pvScan0;
 
-    DIB_BltFromVGA(SourcePoint->x, SourcePoint->y, dx, dy, Dest->pvBits, Dest->lDelta);
+    DIB_BltFromVGA(SourcePoint->x, SourcePoint->y, dx, dy, Dest->pvScan0, Dest->lDelta);
 
   } else {
     // Color translation
@@ -353,7 +353,7 @@ VGADDI_BltMask(SURFOBJ* Dest, SURFOBJ* Source, SURFOBJ* Mask,
     {
       if (Mask != NULL)
 	{
-	  tMask = Mask->pvBits;
+	  tMask = Mask->pvScan0;
 	  for (j=0; j<dy; j++)
 	    {
 	      lMask = tMask;
diff --git a/reactos/drivers/video/displays/vga/objects/pointer.c b/reactos/drivers/video/displays/vga/objects/pointer.c
index 2b5d5fe6e3c..53ea3acacfa 100644
--- a/reactos/drivers/video/displays/vga/objects/pointer.c
+++ b/reactos/drivers/video/displays/vga/objects/pointer.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: pointer.c,v 1.2 2004/01/16 13:18:23 gvg Exp $
+/* $Id: pointer.c,v 1.3 2004/07/03 13:45:42 navaraf Exp $
  *
  * PROJECT:         ReactOS VGA16 display driver
  * FILE:            drivers/dd/vga/display/objects/pointer.c
@@ -245,8 +245,8 @@ DrvSetPointerShape(SURFOBJ* pso,
     }
   ppdev->flCursor = ppdev->flCursor & (~ CURSOR_DOWN);
 
-  NewWidth = psoMask->lDelta << 3;
-  NewHeight = (psoMask->cjBits / psoMask->lDelta) / 2;
+  NewWidth = abs(psoMask->lDelta) << 3;
+  NewHeight = (psoMask->cjBits / abs(psoMask->lDelta)) / 2;
 
   /* Reallocate the space for the cursor if necessary. */
   if (ppdev->pPointerAttributes->Width != NewWidth ||
@@ -275,11 +275,10 @@ DrvSetPointerShape(SURFOBJ* pso,
       ImageBehindCursor = VGADDI_AllocSavedScreenBits(SavedMemSize);
     }
 
+  Src = (PUCHAR)psoMask->pvScan0;
   /* Copy the new cursor in. */
   for (i = 0; i < (NewHeight * 2); i++)
     {
-      Src = (PUCHAR)psoMask->pvBits;
-      Src += (i * (NewWidth >> 3));
       Dest = (PUCHAR)ppdev->pPointerAttributes->Pixels;
       if (i >= NewHeight)
 	{
@@ -290,6 +289,7 @@ DrvSetPointerShape(SURFOBJ* pso,
 	  Dest += ((NewHeight - i - 1) * (NewWidth >> 3));
 	}
       memcpy(Dest, Src, NewWidth >> 3);
+      Src += psoMask->lDelta;
     }
 
   /* Set the new cursor position */
diff --git a/reactos/drivers/video/displays/vga/objects/transblt.c b/reactos/drivers/video/displays/vga/objects/transblt.c
index 25eb5fc0c2b..eabb2347337 100644
--- a/reactos/drivers/video/displays/vga/objects/transblt.c
+++ b/reactos/drivers/video/displays/vga/objects/transblt.c
@@ -28,7 +28,7 @@ DrvTransparentBlt(SURFOBJ* Dest,
   if(sy<dy) dy = sy;
 
   // FIXME: adjust using SourceRect
-  DIB_TransparentBltToVGA(DestRect->left, DestRect->top, dx, dy, Source->pvBits, Source->lDelta, TransparentColor);
+  DIB_TransparentBltToVGA(DestRect->left, DestRect->top, dx, dy, Source->pvScan0, Source->lDelta, TransparentColor);
 
   return TRUE;
 }
diff --git a/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c b/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c
index f740b797d39..aadc24aac04 100644
--- a/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c
+++ b/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c
@@ -407,7 +407,10 @@ void DIB_BltFromVGA(int x, int y, int w, int h, void *b, int Dest_lDelta)
     }
 
   /* Reset the destination. */
-  memset(b, 0, h * Dest_lDelta);
+  for (j = 0; j < h; j++)
+    {
+      memset(b + (j * Dest_lDelta), 0, abs(Dest_lDelta));
+    }
 
   for (plane = 0; plane < 4; plane++)
     {

From 0a89ed6e1ce4e0a11740d26d0906c5629791d3ff Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sat, 3 Jul 2004 13:55:37 +0000
Subject: [PATCH 175/356] [Sorry for too many changes in one patch, but it's
 nearly impossible to separate it without breaking the functionality] - Remove
 the eng/brush.h header and all occurrences of BRUSHINST. - Remove eng/nls.c
 and make the NLS functions forward exports to ntoskrnl. - Remove DDBITMAP
 definition. - Overall cleanup of eng/xlate.c. - Stop processing if exact
 match is found in ClosestColorMatch. - Move SURFGDI->PointerStatus to
 GDIDEVICE structure. - Remove the GDIDEVICE->DriverLock. - Replace BITMAP by
 SURFOBJ in BITMAPOBJ structure and added two new members (Flags and Hooks). -
 Replace function pointers to driver functions in SURFGDI with flHooks
 variable specifying the bitmask of hooked functions. - Added two new macros:
 GDIDEV and GDIDEVFUNCS. - Fixed locking in NtGdiGetBitmapBits. - Removed
 IntCopyBitmap and replaced it's usage by BITMAPOBJ_CopyBitmap. - Fixed
 setting of SURFOBJ->pvBits and SURFOBJ->pvScan0 in EngCreateBitmap for
 bottom-up surfaces. - Fix DPRINTs. - Remove unused definitions from
 eng/objects.h. - Call IntEngBitBlt instead of EngBitBlt from EngCopyBits. -
 Correctly set the SURFOBJ->hsurf field. - Merge Engine surface handling with
 the GDI one and remove DC->Surface, SURFGDI, BitmapToSurf. - Support for
 bottom-up mouse cursors in the Eng* cursor emulation routines. - Fix locking
 in error cases of NtGdiRestoreDC (get Primitives demo to start). - Fix
 BitmapFormat to return 0 for unknown bit depth. - Move code from
 EngCreateBitmap to IntCreateBitmap and use this function in EngCreateBitmap,
 NtGdiCreateBitmap and DIB_CreateDIBSection. - New implementation of
 NtGdiGetDIBits.

svn path=/trunk/; revision=9977
---
 reactos/include/win32k/bitmaps.h           |  15 +-
 reactos/include/win32k/dc.h                |   3 +-
 reactos/subsys/win32k/dib/dib.c            | 161 +++--
 reactos/subsys/win32k/dib/dib.h            |  60 +-
 reactos/subsys/win32k/dib/dib16bpp.c       |  98 ++-
 reactos/subsys/win32k/dib/dib1bpp.c        |  45 +-
 reactos/subsys/win32k/dib/dib24bpp.c       |  37 +-
 reactos/subsys/win32k/dib/dib32bpp.c       |  88 ++-
 reactos/subsys/win32k/dib/dib4bpp.c        |  53 +-
 reactos/subsys/win32k/dib/dib8bpp.c        |  98 ++-
 reactos/subsys/win32k/eng/bitblt.c         | 220 +++----
 reactos/subsys/win32k/eng/brush.h          |  77 ---
 reactos/subsys/win32k/eng/copybits.c       |  78 ++-
 reactos/subsys/win32k/eng/gradient.c       |  52 +-
 reactos/subsys/win32k/eng/lineto.c         |  61 +-
 reactos/subsys/win32k/eng/misc.c           |  15 +-
 reactos/subsys/win32k/eng/misc.h           |   3 +-
 reactos/subsys/win32k/eng/mouse.c          |  67 +-
 reactos/subsys/win32k/eng/nls.c            |  80 ---
 reactos/subsys/win32k/eng/objects.h        |  87 +--
 reactos/subsys/win32k/eng/paint.c          |  44 +-
 reactos/subsys/win32k/eng/surface.c        | 233 +++----
 reactos/subsys/win32k/eng/transblt.c       |  69 +-
 reactos/subsys/win32k/eng/xlate.c          | 239 ++++---
 reactos/subsys/win32k/include/copybits.h   |   9 -
 reactos/subsys/win32k/include/dib.h        |   2 -
 reactos/subsys/win32k/include/eng.h        |   6 -
 reactos/subsys/win32k/include/inteng.h     | 121 ++--
 reactos/subsys/win32k/include/mouse.h      |   4 +-
 reactos/subsys/win32k/include/object.h     |   6 -
 reactos/subsys/win32k/include/paint.h      |   2 +-
 reactos/subsys/win32k/include/surface.h    |   4 +
 reactos/subsys/win32k/makefile             |   9 +-
 reactos/subsys/win32k/ntuser/desktop.c     |  13 +-
 reactos/subsys/win32k/ntuser/input.c       |  78 ++-
 reactos/subsys/win32k/ntuser/misc.c        |  10 +-
 reactos/subsys/win32k/objects/bitmaps.c    | 242 ++++---
 reactos/subsys/win32k/objects/brush.c      |  12 +-
 reactos/subsys/win32k/objects/color.c      |  13 +-
 reactos/subsys/win32k/objects/cursoricon.c | 110 ++--
 reactos/subsys/win32k/objects/dc.c         |  70 +--
 reactos/subsys/win32k/objects/dib.c        | 698 ++++++---------------
 reactos/subsys/win32k/objects/fillshap.c   |  82 +--
 reactos/subsys/win32k/objects/gdiobj.c     |   6 +-
 reactos/subsys/win32k/objects/line.c       |  39 +-
 reactos/subsys/win32k/objects/objconv.c    |  51 --
 reactos/subsys/win32k/objects/polyfill.c   |  18 +-
 reactos/subsys/win32k/objects/print.c      |  16 +-
 reactos/subsys/win32k/objects/region.c     |  13 +-
 reactos/subsys/win32k/objects/text.c       |  43 +-
 reactos/subsys/win32k/w32k.h               |   1 -
 reactos/subsys/win32k/win32k.edf           |   8 +-
 52 files changed, 1431 insertions(+), 2238 deletions(-)
 delete mode 100644 reactos/subsys/win32k/eng/brush.h
 delete mode 100644 reactos/subsys/win32k/eng/nls.c
 delete mode 100644 reactos/subsys/win32k/include/copybits.h
 delete mode 100644 reactos/subsys/win32k/objects/objconv.c

diff --git a/reactos/include/win32k/bitmaps.h b/reactos/include/win32k/bitmaps.h
index 3e2282fb6bb..084519ed94c 100644
--- a/reactos/include/win32k/bitmaps.h
+++ b/reactos/include/win32k/bitmaps.h
@@ -5,29 +5,24 @@
 #include <win32k/dc.h>
 #include <win32k/gdiobj.h>
 
-typedef struct _DDBITMAP
-{
-  const PDRIVER_FUNCTIONS  pDriverFunctions;
-/*  DHPDEV  PDev; */
-/*  HSURF  Surface; */
-} DDBITMAP;
-
 /* GDI logical bitmap object */
 typedef struct _BITMAPOBJ
 {
-  BITMAP      bitmap;
+  SURFOBJ     SurfObj;
+  FLONG	      flHooks;
+  FLONG       flFlags;
   SIZE        dimension;   /* For SetBitmapDimension(), do NOT use
                               to get width/height of bitmap, use
                               bitmap.bmWidth/bitmap.bmHeight for
                               that */
 
-  DDBITMAP   *DDBitmap;
-
   /* For device-independent bitmaps: */
   DIBSECTION *dib;
   RGBQUAD *ColorMap;
 } BITMAPOBJ, *PBITMAPOBJ;
 
+#define BITMAPOBJ_IS_APIBITMAP		0x1
+
 /*  Internal interface  */
 
 #define  BITMAPOBJ_AllocBitmap()  \
diff --git a/reactos/include/win32k/dc.h b/reactos/include/win32k/dc.h
index cc1c1289335..4f877f0bfd9 100644
--- a/reactos/include/win32k/dc.h
+++ b/reactos/include/win32k/dc.h
@@ -83,7 +83,6 @@ typedef struct _DC
   HSURF  FillPatternSurfaces[HS_DDI_MAX];
   PGDIINFO  GDIInfo;
   PDEVINFO  DevInfo;
-  HSURF  Surface;
   HDEV   GDIDevice;
 
   DRIVER_FUNCTIONS  DriverFunctions;
@@ -116,7 +115,6 @@ typedef struct
   DEVINFO DevInfo;
   DRIVER_FUNCTIONS DriverFunctions;
   PFILE_OBJECT VideoFileObject;
-  FAST_MUTEX DriverLock;
 
   struct {
      BOOL Enable;
@@ -130,6 +128,7 @@ typedef struct
   HSURF PointerMaskSurface;
   HSURF PointerSaveSurface;
   POINTL PointerHotSpot;
+  ULONG PointerStatus;
 } GDIDEVICE;
 
 /*  Internal functions  */
diff --git a/reactos/subsys/win32k/dib/dib.c b/reactos/subsys/win32k/dib/dib.c
index e7a62938f18..2ed9d8a906a 100644
--- a/reactos/subsys/win32k/dib/dib.c
+++ b/reactos/subsys/win32k/dib/dib.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dib.c,v 1.10 2004/05/10 17:07:16 weiden Exp $ */
+/* $Id: dib.c,v 1.11 2004/07/03 13:55:35 navaraf Exp $ */
 #include <w32k.h>
 
 /* Static data */
@@ -24,62 +24,107 @@
 unsigned char notmask[2] = { 0x0f, 0xf0 };
 unsigned char altnotmask[2] = { 0xf0, 0x0f };
 
-ULONG
-DIB_GetSource(SURFOBJ* SourceSurf, SURFGDI* SourceGDI, ULONG sx, ULONG sy, XLATEOBJ* ColorTranslation)
+DIB_FUNCTIONS DibFunctionsForBitmapFormat[] =
 {
-  switch (SourceGDI->BitsPerPixel)
+   /* 0 */
+   {
+      Dummy_PutPixel, Dummy_GetPixel, Dummy_HLine, Dummy_VLine,
+      Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt
+   },
+   /* BMF_1BPP */
+   {
+      DIB_1BPP_PutPixel, DIB_1BPP_GetPixel, DIB_1BPP_HLine, DIB_1BPP_VLine,
+      DIB_1BPP_BitBlt, DIB_1BPP_StretchBlt, DIB_1BPP_TransparentBlt
+   },
+   /* BMF_4BPP */
+   {
+      DIB_4BPP_PutPixel, DIB_4BPP_GetPixel, DIB_4BPP_HLine, DIB_4BPP_VLine,
+      DIB_4BPP_BitBlt, DIB_4BPP_StretchBlt, DIB_4BPP_TransparentBlt
+   },
+   /* BMF_8BPP */
+   {
+      DIB_8BPP_PutPixel, DIB_8BPP_GetPixel, DIB_8BPP_HLine, DIB_8BPP_VLine,
+      DIB_8BPP_BitBlt, DIB_8BPP_StretchBlt, DIB_8BPP_TransparentBlt
+   },
+   /* BMF_16BPP */
+   {
+      DIB_16BPP_PutPixel, DIB_16BPP_GetPixel, DIB_16BPP_HLine, DIB_16BPP_VLine,
+      DIB_16BPP_BitBlt, DIB_16BPP_StretchBlt, DIB_16BPP_TransparentBlt
+   },
+   /* BMF_24BPP */
+   {
+      DIB_24BPP_PutPixel, DIB_24BPP_GetPixel, DIB_24BPP_HLine, DIB_24BPP_VLine,
+      DIB_24BPP_BitBlt, DIB_24BPP_StretchBlt, DIB_24BPP_TransparentBlt
+   },
+   /* BMF_32BPP */
+   {
+      DIB_32BPP_PutPixel, DIB_32BPP_GetPixel, DIB_32BPP_HLine, DIB_32BPP_VLine,
+      DIB_32BPP_BitBlt, DIB_32BPP_StretchBlt, DIB_32BPP_TransparentBlt
+   },
+   /* BMF_4RLE */
+   {
+      Dummy_PutPixel, Dummy_GetPixel, Dummy_HLine, Dummy_VLine,
+      Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt
+   },
+   /* BMF_8RLE */
+   {
+      Dummy_PutPixel, Dummy_GetPixel, Dummy_HLine, Dummy_VLine,
+      Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt
+   },
+   /* BMF_JPEG */
+   {
+      Dummy_PutPixel, Dummy_GetPixel, Dummy_HLine, Dummy_VLine,
+      Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt
+   },
+   /* BMF_PNG */
+   {
+      Dummy_PutPixel, Dummy_GetPixel, Dummy_HLine, Dummy_VLine,
+      Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt
+   }
+};
+
+ULONG
+DIB_GetSource(SURFOBJ* SourceSurf, ULONG sx, ULONG sy, XLATEOBJ* ColorTranslation)
+{
+  switch (SourceSurf->iBitmapFormat)
     {
-    case 1:
-      if (DIB_1BPP_GetPixel(SourceSurf, sx, sy))
-	{
-	  return(XLATEOBJ_iXlate(ColorTranslation, 1));
-	}
-      else
-	{
-	  return(XLATEOBJ_iXlate(ColorTranslation, 0));
-	}
-    case 4:
-      if (ColorTranslation != NULL)
-	{
-	  return(XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)));
-	}
-      else
-	{
-	  return(DIB_4BPP_GetPixel(SourceSurf, sx, sy));
-	}
-    case 8:
+    case BMF_1BPP:
+      return(XLATEOBJ_iXlate(ColorTranslation, DIB_1BPP_GetPixel(SourceSurf, sx, sy)));
+    case BMF_4BPP:
+      return(XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)));
+    case BMF_8BPP:
       return(XLATEOBJ_iXlate(ColorTranslation, DIB_8BPP_GetPixel(SourceSurf, sx, sy)));
-    case 16:
+    case BMF_16BPP:
       return(XLATEOBJ_iXlate(ColorTranslation, DIB_16BPP_GetPixel(SourceSurf, sx, sy)));
-    case 24:
+    case BMF_24BPP:
       return(XLATEOBJ_iXlate(ColorTranslation, DIB_24BPP_GetPixel(SourceSurf, sx, sy)));
-    case 32:
+    case BMF_32BPP:
       return(XLATEOBJ_iXlate(ColorTranslation, DIB_32BPP_GetPixel(SourceSurf, sx, sy)));
     default:
-      DPRINT1("DIB_GetSource: Unhandled number of bits per pixel in source (%d).\n", SourceGDI->BitsPerPixel);
+      DPRINT1("DIB_GetSource: Unhandled number of bits per pixel in source (%d).\n", BitsPerFormat(SourceSurf->iBitmapFormat));
       return(0);
     }
 }
 
 ULONG
-DIB_GetSourceIndex(SURFOBJ* SourceSurf, SURFGDI* SourceGDI, ULONG sx, ULONG sy)
+DIB_GetSourceIndex(SURFOBJ* SourceSurf, ULONG sx, ULONG sy)
 {
-  switch (SourceGDI->BitsPerPixel)
+  switch (SourceSurf->iBitmapFormat)
     {
-    case 1:
+    case BMF_1BPP:
       return DIB_1BPP_GetPixel(SourceSurf, sx, sy);
-    case 4:
+    case BMF_4BPP:
       return DIB_4BPP_GetPixel(SourceSurf, sx, sy);
-    case 8:
+    case BMF_8BPP:
       return DIB_8BPP_GetPixel(SourceSurf, sx, sy);
-    case 16:
+    case BMF_16BPP:
       return DIB_16BPP_GetPixel(SourceSurf, sx, sy);
-    case 24:
+    case BMF_24BPP:
       return DIB_24BPP_GetPixel(SourceSurf, sx, sy);
-    case 32:
+    case BMF_32BPP:
       return DIB_32BPP_GetPixel(SourceSurf, sx, sy);
     default:
-      DPRINT1("DIB_GetOriginalSource: Unhandled number of bits per pixel in source (%d).\n", SourceGDI->BitsPerPixel);
+      DPRINT1("DIB_GetOriginalSource: Unhandled number of bits per pixel in source (%d).\n", BitsPerFormat(SourceSurf->iBitmapFormat));
       return(0);
     }
 }
@@ -184,4 +229,48 @@ DIB_DoRop(ULONG Rop, ULONG Dest, ULONG Source, ULONG Pattern)
   return(Result);
 }
 
+VOID Dummy_PutPixel(SURFOBJ* SurfObj, LONG x, LONG y, ULONG c)
+{
+  return;
+}
+
+ULONG Dummy_GetPixel(SURFOBJ* SurfObj, LONG x, LONG y)
+{
+  return 0;
+}
+
+VOID Dummy_HLine(SURFOBJ* SurfObj, LONG x1, LONG x2, LONG y, ULONG c)
+{
+  return;
+}
+
+VOID Dummy_VLine(SURFOBJ* SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
+{
+  return;
+}
+
+BOOLEAN Dummy_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
+                     RECTL*  DestRect,  POINTL  *SourcePoint,
+                     BRUSHOBJ* BrushObj, POINTL BrushOrign,
+                     XLATEOBJ *ColorTranslation, ULONG Rop4)
+{
+  return FALSE;
+}
+
+BOOLEAN Dummy_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
+                         RECTL*  DestRect,  RECTL  *SourceRect,
+                         POINTL* MaskOrigin, POINTL BrushOrign,
+                         CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
+                         ULONG Mode)
+{
+  return FALSE;
+}
+
+BOOLEAN Dummy_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
+                             RECTL*  DestRect,  POINTL  *SourcePoint,
+                             XLATEOBJ *ColorTranslation, ULONG iTransColor)
+{
+  return FALSE;
+}
+
 /* EOF */
diff --git a/reactos/subsys/win32k/dib/dib.h b/reactos/subsys/win32k/dib/dib.h
index 24a07cdb767..b6ca70fa58c 100644
--- a/reactos/subsys/win32k/dib/dib.h
+++ b/reactos/subsys/win32k/dib/dib.h
@@ -1,30 +1,65 @@
 #ifndef _W32K_DIB_DIB_H
 #define _W32K_DIB_DIB_H
 
+typedef VOID (*PFN_DIB_PutPixel)(SURFOBJ*,LONG,LONG,ULONG);
+typedef ULONG (*PFN_DIB_GetPixel)(SURFOBJ*,LONG,LONG);
+typedef VOID (*PFN_DIB_HLine)(SURFOBJ*,LONG,LONG,LONG,ULONG);
+typedef VOID (*PFN_DIB_VLine)(SURFOBJ*,LONG,LONG,LONG,ULONG);
+typedef BOOLEAN (*PFN_DIB_BitBlt)(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,BRUSHOBJ*,POINTL,XLATEOBJ*,ULONG);
+typedef BOOLEAN (*PFN_DIB_StretchBlt)(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG);
+typedef BOOLEAN (*PFN_DIB_TransparentBlt)(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG);
+
+typedef struct
+{
+  PFN_DIB_PutPixel       DIB_PutPixel;
+  PFN_DIB_GetPixel       DIB_GetPixel;
+  PFN_DIB_HLine          DIB_HLine;
+  PFN_DIB_VLine          DIB_VLine;
+  PFN_DIB_BitBlt         DIB_BitBlt;
+  PFN_DIB_StretchBlt     DIB_StretchBlt;
+  PFN_DIB_TransparentBlt DIB_TransparentBlt;
+} DIB_FUNCTIONS;
+
+extern DIB_FUNCTIONS DibFunctionsForBitmapFormat[];
+
 extern unsigned char notmask[2];
 extern unsigned char altnotmask[2];
 #define MASK1BPP(x) (1<<(7-((x)&7)))
 ULONG   DIB_DoRop(ULONG Rop, ULONG Dest, ULONG Source, ULONG Pattern);
-ULONG   DIB_GetSource(SURFOBJ* SourceSurf, SURFGDI* SourceGDI, ULONG sx, ULONG sy, XLATEOBJ* ColorTranslation);
-ULONG   DIB_GetSourceIndex(SURFOBJ* SourceSurf, SURFGDI* SourceGDI, ULONG sx, ULONG sy);
+ULONG   DIB_GetSource(SURFOBJ* SourceSurf, ULONG sx, ULONG sy, XLATEOBJ* ColorTranslation);
+ULONG   DIB_GetSourceIndex(SURFOBJ* SourceSurf, ULONG sx, ULONG sy);
+
+VOID Dummy_PutPixel(SURFOBJ* SurfObj, LONG x, LONG y, ULONG c);
+ULONG Dummy_GetPixel(SURFOBJ* SurfObj, LONG x, LONG y);
+VOID Dummy_HLine(SURFOBJ* SurfObj, LONG x1, LONG x2, LONG y, ULONG c);
+VOID Dummy_VLine(SURFOBJ* SurfObj, LONG x, LONG y1, LONG y2, ULONG c);
+BOOLEAN Dummy_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
+                     RECTL*  DestRect,  POINTL  *SourcePoint,
+                     BRUSHOBJ* BrushObj, POINTL BrushOrign,
+                     XLATEOBJ *ColorTranslation, ULONG Rop4);
+BOOLEAN Dummy_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
+                         RECTL*  DestRect,  RECTL  *SourceRect,
+                         POINTL* MaskOrigin, POINTL BrushOrign,
+                         CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
+                         ULONG Mode);
+BOOLEAN Dummy_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
+                             RECTL*  DestRect,  POINTL  *SourcePoint,
+                             XLATEOBJ *ColorTranslation, ULONG iTransColor);
 
 VOID    DIB_1BPP_PutPixel(SURFOBJ* SurfObj, LONG x, LONG y, ULONG c);
 ULONG   DIB_1BPP_GetPixel(SURFOBJ* SurfObj, LONG x, LONG y);
 VOID    DIB_1BPP_HLine(SURFOBJ* SurfObj, LONG x1, LONG x2, LONG y, ULONG c);
 VOID    DIB_1BPP_VLine(SURFOBJ* SurfObj, LONG x, LONG y1, LONG y2, ULONG c);
 BOOLEAN DIB_1BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                        SURFGDI *DestGDI, SURFGDI *SourceGDI,
                         RECTL* DestRect, POINTL *SourcePoint,
                         BRUSHOBJ* Brush, POINTL BrushOrigin,
                         XLATEOBJ *ColorTranslation, ULONG Rop4);
 BOOLEAN DIB_1BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                            SURFGDI *DestGDI, SURFGDI *SourceGDI,
                             RECTL* DestRect, RECTL *SourceRect,
                             POINTL* MaskOrigin, POINTL BrushOrigin,
                             CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
                             ULONG Mode);
 BOOLEAN DIB_1BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                                PSURFGDI DestGDI,  PSURFGDI SourceGDI,
                                 RECTL*  DestRect,  POINTL  *SourcePoint,
                                 XLATEOBJ *ColorTranslation, ULONG iTransColor);
 
@@ -33,18 +68,15 @@ ULONG   DIB_4BPP_GetPixel(SURFOBJ* SurfObj, LONG x, LONG y);
 VOID    DIB_4BPP_HLine(SURFOBJ* SurfObj, LONG x1, LONG x2, LONG y, ULONG c);
 VOID    DIB_4BPP_VLine(SURFOBJ* SurfObj, LONG x, LONG y1, LONG y2, ULONG c);
 BOOLEAN DIB_4BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                        SURFGDI *DestGDI, SURFGDI *SourceGDI,
                         RECTL* DestRect, POINTL *SourcePoint,
                         BRUSHOBJ* Brush, POINTL BrushOrigin,
                         XLATEOBJ *ColorTranslation, ULONG Rop4);
 BOOLEAN DIB_4BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                            SURFGDI *DestGDI, SURFGDI *SourceGDI,
                             RECTL* DestRect, RECTL *SourceRect,
                             POINTL* MaskOrigin, POINTL BrushOrigin,
                             CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
                             ULONG Mode);
 BOOLEAN DIB_4BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                                PSURFGDI DestGDI,  PSURFGDI SourceGDI,
                                 RECTL*  DestRect,  POINTL  *SourcePoint,
                                 XLATEOBJ *ColorTranslation, ULONG iTransColor);
 
@@ -53,18 +85,15 @@ ULONG   DIB_8BPP_GetPixel(SURFOBJ* SurfObj, LONG x, LONG y);
 VOID    DIB_8BPP_HLine(SURFOBJ* SurfObj, LONG x1, LONG x2, LONG y, ULONG c);
 VOID    DIB_8BPP_VLine(SURFOBJ* SurfObj, LONG x, LONG y1, LONG y2, ULONG c);
 BOOLEAN DIB_8BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                        SURFGDI *DestGDI, SURFGDI *SourceGDI,
                         RECTL* DestRect, POINTL *SourcePoint,
                         BRUSHOBJ* Brush, POINTL BrushOrigin,
                         XLATEOBJ *ColorTranslation, ULONG Rop4);
 BOOLEAN DIB_8BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                            SURFGDI *DestGDI, SURFGDI *SourceGDI,
                             RECTL* DestRect, RECTL *SourceRect,
                             POINTL* MaskOrigin, POINTL BrushOrigin,
                             CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
                             ULONG Mode);
 BOOLEAN DIB_8BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                                PSURFGDI DestGDI,  PSURFGDI SourceGDI,
                                 RECTL*  DestRect,  POINTL  *SourcePoint,
                                 XLATEOBJ *ColorTranslation, ULONG iTransColor);
 
@@ -73,18 +102,15 @@ ULONG   DIB_16BPP_GetPixel(SURFOBJ* SurfObj, LONG x, LONG y);
 VOID    DIB_16BPP_HLine(SURFOBJ* SurfObj, LONG x1, LONG x2, LONG y, ULONG c);
 VOID    DIB_16BPP_VLine(SURFOBJ* SurfObj, LONG x, LONG y1, LONG y2, ULONG c);
 BOOLEAN DIB_16BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                         SURFGDI *DestGDI, SURFGDI *SourceGDI,
                          RECTL* DestRect, POINTL *SourcePoint,
                          BRUSHOBJ* Brush, POINTL BrushOrigin,
                          XLATEOBJ *ColorTranslation, ULONG Rop4);
 BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                             SURFGDI *DestGDI, SURFGDI *SourceGDI,
                              RECTL* DestRect, RECTL *SourceRect,
                              POINTL* MaskOrigin, POINTL BrushOrigin,
                              CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
                              ULONG Mode);
 BOOLEAN DIB_16BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                                 PSURFGDI DestGDI,  PSURFGDI SourceGDI,
                                  RECTL*  DestRect,  POINTL  *SourcePoint,
                                  XLATEOBJ *ColorTranslation, ULONG iTransColor);
 
@@ -93,18 +119,15 @@ ULONG   DIB_24BPP_GetPixel(SURFOBJ* SurfObj, LONG x, LONG y);
 VOID    DIB_24BPP_HLine(SURFOBJ* SurfObj, LONG x1, LONG x2, LONG y, ULONG c);
 VOID    DIB_24BPP_VLine(SURFOBJ* SurfObj, LONG x, LONG y1, LONG y2, ULONG c);
 BOOLEAN DIB_24BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                         SURFGDI *DestGDI, SURFGDI *SourceGDI,
                          RECTL* DestRect, POINTL *SourcePoint,
                          BRUSHOBJ* Brush, POINTL BrushOrigin,
                          XLATEOBJ *ColorTranslation, ULONG Rop4);
 BOOLEAN DIB_24BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                             SURFGDI *DestGDI, SURFGDI *SourceGDI,
                              RECTL* DestRect, RECTL *SourceRect,
                              POINTL* MaskOrigin, POINTL BrushOrigin,
                              CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
                              ULONG Mode);
 BOOLEAN DIB_24BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                                 PSURFGDI DestGDI,  PSURFGDI SourceGDI,
                                  RECTL*  DestRect,  POINTL  *SourcePoint,
                                  XLATEOBJ *ColorTranslation, ULONG iTransColor);
 
@@ -113,18 +136,15 @@ ULONG   DIB_32BPP_GetPixel(SURFOBJ* SurfObj, LONG x, LONG y);
 VOID    DIB_32BPP_HLine(SURFOBJ* SurfObj, LONG x1, LONG x2, LONG y, ULONG c);
 VOID    DIB_32BPP_VLine(SURFOBJ* SurfObj, LONG x, LONG y1, LONG y2, ULONG c);
 BOOLEAN DIB_32BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                         SURFGDI *DestGDI, SURFGDI *SourceGDI,
                          RECTL* DestRect, POINTL *SourcePoint,
                          BRUSHOBJ* Brush, POINTL BrushOrigin,
                          XLATEOBJ *ColorTranslation, ULONG Rop4);
 BOOLEAN DIB_32BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                             SURFGDI *DestGDI, SURFGDI *SourceGDI,
                              RECTL* DestRect, RECTL *SourceRect,
                              POINTL* MaskOrigin, POINTL BrushOrigin,
                              CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
                              ULONG Mode);
 BOOLEAN DIB_32BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                                 PSURFGDI DestGDI,  PSURFGDI SourceGDI,
                                  RECTL*  DestRect,  POINTL  *SourcePoint,
                                  XLATEOBJ *ColorTranslation, ULONG iTransColor);
 
diff --git a/reactos/subsys/win32k/dib/dib16bpp.c b/reactos/subsys/win32k/dib/dib16bpp.c
index 21ff5cd0b42..e85958231ab 100644
--- a/reactos/subsys/win32k/dib/dib16bpp.c
+++ b/reactos/subsys/win32k/dib/dib16bpp.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dib16bpp.c,v 1.32 2004/05/14 22:56:17 gvg Exp $ */
+/* $Id: dib16bpp.c,v 1.33 2004/07/03 13:55:35 navaraf Exp $ */
 #include <w32k.h>
 
 VOID
@@ -69,7 +69,6 @@ DIB_16BPP_VLine(SURFOBJ *SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
 
 BOOLEAN STATIC
 DIB_16BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-		        SURFGDI *DestGDI,  SURFGDI *SourceGDI,
 		        PRECTL  DestRect,  POINTL  *SourcePoint,
 		        XLATEOBJ *ColorTranslation)
 {
@@ -78,9 +77,9 @@ DIB_16BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
   PBYTE    SourceBits_4BPP, SourceLine_4BPP;
   DestBits = DestSurf->pvScan0 + (DestRect->top * DestSurf->lDelta) + 2 * DestRect->left;
 
-  switch(SourceGDI->BitsPerPixel)
+  switch(SourceSurf->iBitmapFormat)
   {
-    case 1:
+    case BMF_1BPP:
       sx = SourcePoint->x;
       sy = SourcePoint->y;
 
@@ -101,7 +100,7 @@ DIB_16BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       }
       break;
 
-    case 4:
+    case BMF_4BPP:
       SourceBits_4BPP = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + (SourcePoint->x >> 1);
 
       for (j=DestRect->top; j<DestRect->bottom; j++)
@@ -123,7 +122,7 @@ DIB_16BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       }
       break;
 
-    case 8:
+    case BMF_8BPP:
       SourceLine = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + SourcePoint->x;
       DestLine = DestBits;
 
@@ -144,7 +143,7 @@ DIB_16BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       }
       break;
 
-    case 16:
+    case BMF_16BPP:
       if (NULL == ColorTranslation || 0 != (ColorTranslation->flXlate & XO_TRIVIAL))
       {
 	if (DestRect->top < SourcePoint->y)
@@ -210,7 +209,7 @@ DIB_16BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       }
       break;
 
-    case 24:
+    case BMF_24BPP:
       SourceLine = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + 3 * SourcePoint->x;
       DestLine = DestBits;
 
@@ -234,7 +233,7 @@ DIB_16BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       }
       break;
 
-    case 32:
+    case BMF_32BPP:
       SourceLine = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + 4 * SourcePoint->x;
       DestLine = DestBits;
 
@@ -256,7 +255,7 @@ DIB_16BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       break;
 
     default:
-      DPRINT1("DIB_16BPP_Bitblt: Unhandled Source BPP: %u\n", SourceGDI->BitsPerPixel);
+      DPRINT1("DIB_16BPP_Bitblt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat));
       return FALSE;
   }
 
@@ -265,7 +264,6 @@ DIB_16BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
 
 BOOLEAN
 DIB_16BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-		 SURFGDI *DestGDI,  SURFGDI *SourceGDI,
 		 PRECTL  DestRect,  POINTL  *SourcePoint,
 		 BRUSHOBJ *Brush,   POINTL BrushOrigin,
 		 XLATEOBJ *ColorTranslation, ULONG Rop4)
@@ -288,8 +286,6 @@ DIB_16BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       return DIB_16BPP_BitBltSrcCopy(
          DestSurf,
          SourceSurf,
-         DestGDI,
-         SourceGDI,
          DestRect,
          SourcePoint,
          ColorTranslation);
@@ -309,11 +305,10 @@ DIB_16BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
             GDIBRUSHOBJ,
             BrushObject);
 
+         PatternSurface = GdiBrush->hbmPattern;
          PatternBitmap = BITMAPOBJ_LockBitmap(GdiBrush->hbmPattern);
-         PatternSurface = BitmapToSurf(PatternBitmap, NULL);
-         BITMAPOBJ_UnlockBitmap(GdiBrush->hbmPattern);
 
-         PatternObj = (SURFOBJ*)AccessUserObject((ULONG)PatternSurface);
+         PatternObj = &PatternBitmap->SurfObj;
          PatternWidth = PatternObj->sizlBitmap.cx;
          PatternHeight = PatternObj->sizlBitmap.cy;
          
@@ -348,8 +343,8 @@ DIB_16BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
  
          if (UsesSource)
          {
-            Source = DIB_GetSource(SourceSurf, SourceGDI, SourceX, SourceY, ColorTranslation);
-            Source |= DIB_GetSource(SourceSurf, SourceGDI, SourceX + 1, SourceY, ColorTranslation) << 16;
+            Source = DIB_GetSource(SourceSurf, SourceX, SourceY, ColorTranslation);
+            Source |= DIB_GetSource(SourceSurf, SourceX + 1, SourceY, ColorTranslation) << 16;
          }
 
          if (UsesPattern)
@@ -367,7 +362,7 @@ DIB_16BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
 
          if (UsesSource)
          {
-            Source = DIB_GetSource(SourceSurf, SourceGDI, SourceX, SourceY, ColorTranslation);
+            Source = DIB_GetSource(SourceSurf, SourceX, SourceY, ColorTranslation);
          }
 
          if (UsesPattern)
@@ -385,7 +380,7 @@ DIB_16BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
    }
 
    if (PatternSurface != NULL)
-      EngDeleteSurface((HSURF)PatternSurface);
+      BITMAPOBJ_UnlockBitmap(PatternSurface);
   
    return TRUE;
 }
@@ -506,14 +501,14 @@ FinalCopy16(PIXEL *Target, PIXEL *Source, PSPAN ClipSpans, UINT ClipSpansCount,
 }
 
 //NOTE: If you change something here, please do the same in other dibXXbpp.c files!
-BOOLEAN ScaleRectAvg16(SURFGDI *DestGDI, SURFGDI *SourceGDI,
+BOOLEAN ScaleRectAvg16(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
                        RECTL* DestRect, RECTL *SourceRect,
                        POINTL* MaskOrigin, POINTL BrushOrigin,
                        CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
                        ULONG Mode)
 {
   int NumPixels = DestRect->bottom - DestRect->top;
-  int IntPart = (((SourceRect->bottom - SourceRect->top) / (DestRect->bottom - DestRect->top)) * SourceGDI->SurfObj.lDelta) >> 1; /* ((SourceRect->bottom - SourceRect->top) / (DestRect->bottom - DestRect->top)) * (SourceRect->right - SourceRect->left); */
+  int IntPart = (((SourceRect->bottom - SourceRect->top) / (DestRect->bottom - DestRect->top)) * SourceSurf->lDelta) >> 1;
   int FractPart = (SourceRect->bottom - SourceRect->top) % (DestRect->bottom - DestRect->top);
   int Mid = (DestRect->bottom - DestRect->top) >> 1;
   int E = 0;
@@ -521,8 +516,8 @@ BOOLEAN ScaleRectAvg16(SURFGDI *DestGDI, SURFGDI *SourceGDI,
   PIXEL *ScanLine, *ScanLineAhead;
   PIXEL *PrevSource = NULL;
   PIXEL *PrevSourceAhead = NULL;
-  PIXEL *Target = (PIXEL *) (DestGDI->SurfObj.pvScan0 + (DestRect->top * DestGDI->SurfObj.lDelta) + 2 * DestRect->left);
-  PIXEL *Source = (PIXEL *) (SourceGDI->SurfObj.pvScan0 + (SourceRect->top * SourceGDI->SurfObj.lDelta) + 2 * SourceRect->left);
+  PIXEL *Target = (PIXEL *) (DestSurf->pvScan0 + (DestRect->top * DestSurf->lDelta) + 2 * DestRect->left);
+  PIXEL *Source = (PIXEL *) (SourceSurf->pvScan0 + (SourceRect->top * SourceSurf->lDelta) + 2 * SourceRect->left);
   PSPAN ClipSpans;
   UINT ClipSpansCount;
   UINT SpanIndex;
@@ -562,12 +557,12 @@ BOOLEAN ScaleRectAvg16(SURFGDI *DestGDI, SURFGDI *SourceGDI,
       PrevSource = Source;
     } /* if */
     
-    if (E >= Mid && PrevSourceAhead != (PIXEL *)((BYTE *)Source + SourceGDI->SurfObj.lDelta)) {
+    if (E >= Mid && PrevSourceAhead != (PIXEL *)((BYTE *)Source + SourceSurf->lDelta)) {
       int x;
-      ScaleLineAvg16(ScanLineAhead, (PIXEL *)((BYTE *)Source + SourceGDI->SurfObj.lDelta), SourceRect->right - SourceRect->left, DestRect->right - DestRect->left);
+      ScaleLineAvg16(ScanLineAhead, (PIXEL *)((BYTE *)Source + SourceSurf->lDelta), SourceRect->right - SourceRect->left, DestRect->right - DestRect->left);
       for (x = 0; x < DestRect->right - DestRect->left; x++)
         ScanLine[x] = average16(ScanLine[x], ScanLineAhead[x]);
-      PrevSourceAhead = (PIXEL *)((BYTE *)Source + SourceGDI->SurfObj.lDelta);
+      PrevSourceAhead = (PIXEL *)((BYTE *)Source + SourceSurf->lDelta);
     } /* if */
 
     if (! FinalCopy16(Target, ScanLine, ClipSpans, ClipSpansCount, &SpanIndex, DestY, DestRect))
@@ -579,12 +574,12 @@ BOOLEAN ScaleRectAvg16(SURFGDI *DestGDI, SURFGDI *SourceGDI,
         return TRUE;
       }
     DestY++;
-    Target = (PIXEL *)((BYTE *)Target + DestGDI->SurfObj.lDelta);
+    Target = (PIXEL *)((BYTE *)Target + DestSurf->lDelta);
     Source += IntPart;
     E += FractPart;
     if (E >= DestRect->bottom - DestRect->top) {
       E -= DestRect->bottom - DestRect->top;
-      Source = (PIXEL *)((BYTE *)Source + SourceGDI->SurfObj.lDelta);
+      Source = (PIXEL *)((BYTE *)Source + SourceSurf->lDelta);
     } /* if */
   } /* while */
 
@@ -600,7 +595,7 @@ BOOLEAN ScaleRectAvg16(SURFGDI *DestGDI, SURFGDI *SourceGDI,
         return TRUE;
       }
     DestY++;
-    Target = (PIXEL *)((BYTE *)Target + DestGDI->SurfObj.lDelta);
+    Target = (PIXEL *)((BYTE *)Target + DestSurf->lDelta);
   } /* while */
 
   ExFreePool(ClipSpans);
@@ -612,45 +607,33 @@ BOOLEAN ScaleRectAvg16(SURFGDI *DestGDI, SURFGDI *SourceGDI,
 
 //NOTE: If you change something here, please do the same in other dibXXbpp.c files!
 BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                             SURFGDI *DestGDI, SURFGDI *SourceGDI,
                              RECTL* DestRect, RECTL *SourceRect,
                              POINTL* MaskOrigin, POINTL BrushOrigin,
                              CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
                              ULONG Mode)
 {
   DPRINT("DIB_16BPP_StretchBlt: Source BPP: %u, srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n",
-     SourceGDI->BitsPerPixel, SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom,
+     BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom,
      DestRect->left, DestRect->top, DestRect->right, DestRect->bottom);
 
-    switch(SourceGDI->BitsPerPixel)
+    switch(SourceSurf->iBitmapFormat)
     {
-      case 1:
-         return FALSE;      
-      break;
-  
-      case 4:
-         return FALSE;
-      break;
-  
-      case 8:
-         return FALSE;
+      case BMF_1BPP:
+      case BMF_4BPP:
+      case BMF_8BPP:
+      case BMF_24BPP:
+      case BMF_32BPP:
+        /* Not implemented yet. */
+        return FALSE;      
       break;
 
-      case 16:
-        return ScaleRectAvg16(DestGDI, SourceGDI, DestRect, SourceRect, MaskOrigin, BrushOrigin,
+      case BMF_16BPP:
+        return ScaleRectAvg16(DestSurf, SourceSurf, DestRect, SourceRect, MaskOrigin, BrushOrigin,
                               ClipRegion, ColorTranslation, Mode);
       break;
-    
-      case 24:
-         return FALSE;
-      break;
-      
-      case 32:
-         return FALSE;
-      break;
       
       default:
-         DPRINT1("DIB_16BPP_StretchBlt: Unhandled Source BPP: %u\n", SourceGDI->BitsPerPixel);
+         DPRINT1("DIB_16BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat));
       return FALSE;
     }
 
@@ -661,7 +644,6 @@ BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
 
 BOOLEAN 
 DIB_16BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                         PSURFGDI DestGDI,  PSURFGDI SourceGDI,
                          RECTL*  DestRect,  POINTL  *SourcePoint,
                          XLATEOBJ *ColorTranslation, ULONG iTransColor)
 {
@@ -682,14 +664,14 @@ DIB_16BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
     {
       Dest = *DestBits;
       
-      Source = DIB_GetSourceIndex(SourceSurf, SourceGDI, SourceX, SourceY);
+      Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY);
       if(Source != iTransColor)
       {
         Dest &= 0xFFFF0000;
         Dest |= (XLATEOBJ_iXlate(ColorTranslation, Source) & 0xFFFF);
       }
 
-      Source = DIB_GetSourceIndex(SourceSurf, SourceGDI, SourceX + 1, SourceY);
+      Source = DIB_GetSourceIndex(SourceSurf, SourceX + 1, SourceY);
       if(Source != iTransColor)
       {
         Dest &= 0xFFFF;
@@ -701,7 +683,7 @@ DIB_16BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
     
     if(X < DestRect->right)
     {
-      Source = DIB_GetSourceIndex(SourceSurf, SourceGDI, SourceX, SourceY);
+      Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY);
       if(Source != iTransColor)
       {
         *((USHORT*)DestBits) = (USHORT)XLATEOBJ_iXlate(ColorTranslation, Source);
diff --git a/reactos/subsys/win32k/dib/dib1bpp.c b/reactos/subsys/win32k/dib/dib1bpp.c
index 57c7e6daf34..00e1f8cd820 100644
--- a/reactos/subsys/win32k/dib/dib1bpp.c
+++ b/reactos/subsys/win32k/dib/dib1bpp.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dib1bpp.c,v 1.29 2004/05/27 12:35:23 royce Exp $ */
+/* $Id: dib1bpp.c,v 1.30 2004/07/03 13:55:35 navaraf Exp $ */
 #include <w32k.h>
 
 VOID
@@ -229,19 +229,18 @@ DIB_1BPP_BitBltSrcCopy_From1BPP (
 BOOLEAN
 DIB_1BPP_BitBltSrcCopy(
 	SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-	SURFGDI *DestGDI,  SURFGDI *SourceGDI,
 	PRECTL  DestRect,  POINTL  *SourcePoint,
 	XLATEOBJ *ColorTranslation)
 {
 	LONG i, j, sx, sy = SourcePoint->y;
 
-	switch ( SourceGDI->BitsPerPixel )
+	switch ( SourceSurf->iBitmapFormat )
 	{
-	case 1:
+	case BMF_1BPP:
 		DIB_1BPP_BitBltSrcCopy_From1BPP ( DestSurf, SourceSurf, DestRect, SourcePoint );
 		break;
 
-	case 4:
+	case BMF_4BPP:
 		for (j=DestRect->top; j<DestRect->bottom; j++)
 		{
 			sx = SourcePoint->x;
@@ -259,7 +258,7 @@ DIB_1BPP_BitBltSrcCopy(
 		}
 		break;
 
-	case 8:
+	case BMF_8BPP:
 		for (j=DestRect->top; j<DestRect->bottom; j++)
 		{
 			sx = SourcePoint->x;
@@ -277,7 +276,7 @@ DIB_1BPP_BitBltSrcCopy(
 		}
 		break;
 
-	case 16:
+	case BMF_16BPP:
 		for (j=DestRect->top; j<DestRect->bottom; j++)
 		{
 			sx = SourcePoint->x;
@@ -295,7 +294,7 @@ DIB_1BPP_BitBltSrcCopy(
 		}
 		break;
 
-	case 24:
+	case BMF_24BPP:
 		for (j=DestRect->top; j<DestRect->bottom; j++)
 		{
 			sx = SourcePoint->x;
@@ -313,7 +312,7 @@ DIB_1BPP_BitBltSrcCopy(
 		}
 		break;
 
-	case 32:
+	case BMF_32BPP:
 		for (j=DestRect->top; j<DestRect->bottom; j++)
 		{
 			sx = SourcePoint->x;
@@ -332,7 +331,7 @@ DIB_1BPP_BitBltSrcCopy(
 		break;
 
 	default:
-		DbgPrint("DIB_1BPP_BitBlt: Unhandled Source BPP: %u\n", SourceGDI->BitsPerPixel);
+		DbgPrint("DIB_1BPP_BitBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat));
 		return FALSE;
 	}
 
@@ -342,7 +341,6 @@ DIB_1BPP_BitBltSrcCopy(
 BOOLEAN
 DIB_1BPP_BitBlt(
 	SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-	SURFGDI *DestGDI,  SURFGDI *SourceGDI,
 	PRECTL  DestRect,  POINTL  *SourcePoint,
 	BRUSHOBJ *Brush,   POINTL BrushOrigin,
 	XLATEOBJ *ColorTranslation, ULONG Rop4)
@@ -365,8 +363,6 @@ DIB_1BPP_BitBlt(
       return DIB_1BPP_BitBltSrcCopy(
          DestSurf,
          SourceSurf,
-         DestGDI,
-         SourceGDI,
          DestRect,
          SourcePoint,
          ColorTranslation);
@@ -386,11 +382,10 @@ DIB_1BPP_BitBlt(
             GDIBRUSHOBJ,
             BrushObject);
 
+         PatternSurface = GdiBrush->hbmPattern;
          PatternBitmap = BITMAPOBJ_LockBitmap(GdiBrush->hbmPattern);
-         PatternSurface = BitmapToSurf(PatternBitmap, NULL);
-         BITMAPOBJ_UnlockBitmap(GdiBrush->hbmPattern);
 
-         PatternObj = (SURFOBJ*)AccessUserObject((ULONG)PatternSurface);
+         PatternObj = &PatternBitmap->SurfObj;
          PatternWidth = PatternObj->sizlBitmap.cx;
          PatternHeight = PatternObj->sizlBitmap.cy;
          
@@ -431,7 +426,7 @@ DIB_1BPP_BitBlt(
          {
             Source = 0;
             for (k = 31 - NoBits; k < NoBits; k++)
-               Source |= (DIB_GetSource(SourceSurf, SourceGDI, SourceX + k, SourceY, ColorTranslation) << (31 - k));
+               Source |= (DIB_GetSource(SourceSurf, SourceX + k, SourceY, ColorTranslation) << (31 - k));
          }
 
          if (UsesPattern)
@@ -460,10 +455,10 @@ DIB_1BPP_BitBlt(
             Source = 0;
             for (k = 0; k < 8; k++)
             {
-               Source |= (DIB_GetSource(SourceSurf, SourceGDI, SourceX + k, SourceY, ColorTranslation) << (7 - k));
-               Source |= (DIB_GetSource(SourceSurf, SourceGDI, SourceX + k + 8, SourceY, ColorTranslation) << (8 + (7 - k)));
-               Source |= (DIB_GetSource(SourceSurf, SourceGDI, SourceX + k + 16, SourceY, ColorTranslation) << (16 + (7 - k)));
-               Source |= (DIB_GetSource(SourceSurf, SourceGDI, SourceX + k + 24, SourceY, ColorTranslation) << (24 + (7 - k)));
+               Source |= (DIB_GetSource(SourceSurf, SourceX + k, SourceY, ColorTranslation) << (7 - k));
+               Source |= (DIB_GetSource(SourceSurf, SourceX + k + 8, SourceY, ColorTranslation) << (8 + (7 - k)));
+               Source |= (DIB_GetSource(SourceSurf, SourceX + k + 16, SourceY, ColorTranslation) << (16 + (7 - k)));
+               Source |= (DIB_GetSource(SourceSurf, SourceX + k + 24, SourceY, ColorTranslation) << (24 + (7 - k)));
             }
          }
 
@@ -492,7 +487,7 @@ DIB_1BPP_BitBlt(
 
             if (UsesSource)
             {
-               Source = DIB_GetSource(SourceSurf, SourceGDI, SourceX, SourceY, ColorTranslation);
+               Source = DIB_GetSource(SourceSurf, SourceX, SourceY, ColorTranslation);
             }
 
             if (UsesPattern)
@@ -509,7 +504,7 @@ DIB_1BPP_BitBlt(
    }
 
    if (PatternSurface != NULL)
-      EngDeleteSurface((HSURF)PatternSurface);
+      BITMAPOBJ_UnlockBitmap(PatternSurface);
   
    return TRUE;
 }
@@ -517,19 +512,17 @@ DIB_1BPP_BitBlt(
 BOOLEAN
 DIB_1BPP_StretchBlt (
 	SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-	SURFGDI *DestGDI, SURFGDI *SourceGDI,
 	RECTL* DestRect, RECTL *SourceRect,
 	POINTL* MaskOrigin, POINTL BrushOrigin,
 	CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
         ULONG Mode)
 {
-	DbgPrint("DIB_1BPP_StretchBlt: Source BPP: %u\n", SourceGDI->BitsPerPixel);
+	DbgPrint("DIB_1BPP_StretchBlt: Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat));
 	return FALSE;
 }
 
 BOOLEAN 
 DIB_1BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                        PSURFGDI DestGDI,  PSURFGDI SourceGDI,
                         RECTL*  DestRect,  POINTL  *SourcePoint,
                         XLATEOBJ *ColorTranslation, ULONG iTransColor)
 {
diff --git a/reactos/subsys/win32k/dib/dib24bpp.c b/reactos/subsys/win32k/dib/dib24bpp.c
index 709c67a36ac..56e35822bce 100644
--- a/reactos/subsys/win32k/dib/dib24bpp.c
+++ b/reactos/subsys/win32k/dib/dib24bpp.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dib24bpp.c,v 1.28 2004/06/09 20:39:41 sedwards Exp $ */
+/* $Id: dib24bpp.c,v 1.29 2004/07/03 13:55:35 navaraf Exp $ */
 #include <w32k.h>
 
 VOID
@@ -67,7 +67,6 @@ DIB_24BPP_VLine(SURFOBJ *SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
 
 BOOLEAN
 DIB_24BPP_BitBltSrcCopy(  SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-		          SURFGDI *DestGDI,  SURFGDI *SourceGDI,
 		          PRECTL  DestRect,  POINTL  *SourcePoint,
 		          XLATEOBJ *ColorTranslation)
 {
@@ -78,9 +77,9 @@ DIB_24BPP_BitBltSrcCopy(  SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
 
   DestBits = DestSurf->pvScan0 + (DestRect->top * DestSurf->lDelta) + DestRect->left * 3;
 
-  switch(SourceGDI->BitsPerPixel)
+  switch(SourceSurf->iBitmapFormat)
   {
-    case 1:
+    case BMF_1BPP:
       sx = SourcePoint->x;
       sy = SourcePoint->y;
 
@@ -101,7 +100,7 @@ DIB_24BPP_BitBltSrcCopy(  SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       }
       break;
 
-    case 4:
+    case BMF_4BPP:
       SourceBits_4BPP = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + (SourcePoint->x >> 1);
 
       for (j=DestRect->top; j<DestRect->bottom; j++)
@@ -127,7 +126,7 @@ DIB_24BPP_BitBltSrcCopy(  SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       }
       break;
 
-    case 8:
+    case BMF_8BPP:
       SourceLine = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + SourcePoint->x;
       DestLine = DestBits;
 
@@ -150,7 +149,7 @@ DIB_24BPP_BitBltSrcCopy(  SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       }
       break;
 
-    case 16:
+    case BMF_16BPP:
       SourceBits_16BPP = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + 2 * SourcePoint->x;
 
       for (j=DestRect->top; j<DestRect->bottom; j++)
@@ -172,7 +171,7 @@ DIB_24BPP_BitBltSrcCopy(  SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       }
       break;
 
-    case 24:
+    case BMF_24BPP:
       if (NULL == ColorTranslation || 0 != (ColorTranslation->flXlate & XO_TRIVIAL))
       {
 	if (DestRect->top < SourcePoint->y)
@@ -205,7 +204,7 @@ DIB_24BPP_BitBltSrcCopy(  SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       }
       break;
 
-    case 32:
+    case BMF_32BPP:
       SourceLine = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + 4 * SourcePoint->x;
       DestLine = DestBits;
 
@@ -229,7 +228,7 @@ DIB_24BPP_BitBltSrcCopy(  SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       break;
 
     default:
-      DbgPrint("DIB_24BPP_Bitblt: Unhandled Source BPP: %u\n", SourceGDI->BitsPerPixel);
+      DbgPrint("DIB_24BPP_Bitblt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat));
       return FALSE;
   }
 
@@ -238,7 +237,6 @@ DIB_24BPP_BitBltSrcCopy(  SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
 
 BOOLEAN
 DIB_24BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-		 SURFGDI *DestGDI,  SURFGDI *SourceGDI,
 		 PRECTL  DestRect,  POINTL  *SourcePoint,
 		 BRUSHOBJ *Brush,   POINTL BrushOrigin,
 		 XLATEOBJ *ColorTranslation, ULONG Rop4)
@@ -260,8 +258,6 @@ DIB_24BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       return DIB_24BPP_BitBltSrcCopy(
          DestSurf,
          SourceSurf,
-         DestGDI,
-         SourceGDI,
          DestRect,
          SourcePoint,
          ColorTranslation);
@@ -281,11 +277,10 @@ DIB_24BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
             GDIBRUSHOBJ,
             BrushObject);
 
+         PatternSurface = GdiBrush->hbmPattern;
          PatternBitmap = BITMAPOBJ_LockBitmap(GdiBrush->hbmPattern);
-         PatternSurface = BitmapToSurf(PatternBitmap, NULL);
-         BITMAPOBJ_UnlockBitmap(GdiBrush->hbmPattern);
 
-         PatternObj = (SURFOBJ*)AccessUserObject((ULONG)PatternSurface);
+         PatternObj = &PatternBitmap->SurfObj;
          PatternWidth = PatternObj->sizlBitmap.cx;
          PatternHeight = PatternObj->sizlBitmap.cy;
          
@@ -317,7 +312,7 @@ DIB_24BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
  
          if (UsesSource)
          {
-            Source = DIB_GetSource(SourceSurf, SourceGDI, SourceX, SourceY, ColorTranslation);
+            Source = DIB_GetSource(SourceSurf, SourceX, SourceY, ColorTranslation);
          }
 
          if (UsesPattern)
@@ -336,25 +331,23 @@ DIB_24BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
    }
 
    if (PatternSurface != NULL)
-      EngDeleteSurface((HSURF)PatternSurface);
+      BITMAPOBJ_UnlockBitmap(PatternSurface);
   
    return TRUE;
 }
 
 BOOLEAN DIB_24BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                            SURFGDI *DestGDI, SURFGDI *SourceGDI,
                             RECTL* DestRect, RECTL *SourceRect,
                             POINTL* MaskOrigin, POINTL BrushOrigin,
                             CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
                             ULONG Mode)
 {
-  DbgPrint("DIB_24BPP_StretchBlt: Source BPP: %u\n", SourceGDI->BitsPerPixel);
+  DbgPrint("DIB_24BPP_StretchBlt: Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat));
   return FALSE;
 }
 
 BOOLEAN 
 DIB_24BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                         PSURFGDI DestGDI,  PSURFGDI SourceGDI,
                          RECTL*  DestRect,  POINTL  *SourcePoint,
                          XLATEOBJ *ColorTranslation, ULONG iTransColor)
 {
@@ -372,7 +365,7 @@ DIB_24BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
     SourceX = SourcePoint->x;
     for(X = DestRect->left; X < DestRect->right; X++, DestBits += 3, SourceX++)
     {
-      Source = DIB_GetSourceIndex(SourceSurf, SourceGDI, SourceX, SourceY);
+      Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY);
       if(Source != iTransColor)
       {
         Dest = XLATEOBJ_iXlate(ColorTranslation, Source) & 0xFFFFFF;
diff --git a/reactos/subsys/win32k/dib/dib32bpp.c b/reactos/subsys/win32k/dib/dib32bpp.c
index f33c9d5cead..fe378627eda 100644
--- a/reactos/subsys/win32k/dib/dib32bpp.c
+++ b/reactos/subsys/win32k/dib/dib32bpp.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dib32bpp.c,v 1.27 2004/05/14 22:56:17 gvg Exp $ */
+/* $Id: dib32bpp.c,v 1.28 2004/07/03 13:55:35 navaraf Exp $ */
 #include <w32k.h>
 
 VOID
@@ -68,7 +68,6 @@ DIB_32BPP_VLine(SURFOBJ *SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
 
 BOOLEAN
 DIB_32BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-		        SURFGDI *DestGDI,  SURFGDI *SourceGDI,
 		        PRECTL  DestRect,  POINTL  *SourcePoint,
 		        XLATEOBJ *ColorTranslation)
 {
@@ -79,9 +78,9 @@ DIB_32BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
 
   DestBits = DestSurf->pvScan0 + (DestRect->top * DestSurf->lDelta) + 4 * DestRect->left;
 
-  switch(SourceGDI->BitsPerPixel)
+  switch(SourceSurf->iBitmapFormat)
   {
-    case 1:
+    case BMF_1BPP:
       sx = SourcePoint->x;
       sy = SourcePoint->y;
 
@@ -102,7 +101,7 @@ DIB_32BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       }
       break;
 
-    case 4:
+    case BMF_4BPP:
       SourceBits_4BPP = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + (SourcePoint->x >> 1);
 
       for (j=DestRect->top; j<DestRect->bottom; j++)
@@ -124,7 +123,7 @@ DIB_32BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       }
       break;
 
-    case 8:
+    case BMF_8BPP:
       SourceLine = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + SourcePoint->x;
       DestLine = DestBits;
 
@@ -146,7 +145,7 @@ DIB_32BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       }
       break;
 
-    case 16:
+    case BMF_16BPP:
       SourceLine = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + 2 * SourcePoint->x;
       DestLine = DestBits;
 
@@ -168,7 +167,7 @@ DIB_32BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       }
       break;
 
-    case 24:
+    case BMF_24BPP:
       SourceLine = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + 3 * SourcePoint->x;
       DestLine = DestBits;
 
@@ -192,7 +191,7 @@ DIB_32BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       }
       break;
 
-    case 32:
+    case BMF_32BPP:
       if (NULL == ColorTranslation || 0 != (ColorTranslation->flXlate & XO_TRIVIAL))
       {
 	if (DestRect->top < SourcePoint->y)
@@ -278,7 +277,7 @@ DIB_32BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       break;
 
     default:
-      DPRINT1("DIB_32BPP_Bitblt: Unhandled Source BPP: %u\n", SourceGDI->BitsPerPixel);
+      DPRINT1("DIB_32BPP_Bitblt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat));
       return FALSE;
   }
 
@@ -287,7 +286,6 @@ DIB_32BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
 
 BOOLEAN
 DIB_32BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-		 SURFGDI *DestGDI,  SURFGDI *SourceGDI,
 		 PRECTL  DestRect,  POINTL  *SourcePoint,
 		 BRUSHOBJ *Brush,   POINTL BrushOrigin,
 		 XLATEOBJ *ColorTranslation, ULONG Rop4)
@@ -309,8 +307,6 @@ DIB_32BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       return DIB_32BPP_BitBltSrcCopy(
          DestSurf,
          SourceSurf,
-         DestGDI,
-         SourceGDI,
          DestRect,
          SourcePoint,
          ColorTranslation);
@@ -330,11 +326,10 @@ DIB_32BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
             GDIBRUSHOBJ,
             BrushObject);
 
+         PatternSurface = GdiBrush->hbmPattern;
          PatternBitmap = BITMAPOBJ_LockBitmap(GdiBrush->hbmPattern);
-         PatternSurface = BitmapToSurf(PatternBitmap, NULL);
-         BITMAPOBJ_UnlockBitmap(GdiBrush->hbmPattern);
 
-         PatternObj = (SURFOBJ*)AccessUserObject((ULONG)PatternSurface);
+         PatternObj = &PatternBitmap->SurfObj;
          PatternWidth = PatternObj->sizlBitmap.cx;
          PatternHeight = PatternObj->sizlBitmap.cy;
          
@@ -368,7 +363,7 @@ DIB_32BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
  
          if (UsesSource)
          {
-            Source = DIB_GetSource(SourceSurf, SourceGDI, SourceX, SourceY, ColorTranslation);
+            Source = DIB_GetSource(SourceSurf, SourceX, SourceY, ColorTranslation);
          }
 
          if (UsesPattern)
@@ -385,7 +380,7 @@ DIB_32BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
    }
 
    if (PatternSurface != NULL)
-      EngDeleteSurface((HSURF)PatternSurface);
+      BITMAPOBJ_UnlockBitmap(PatternSurface);
   
    return TRUE;
 }
@@ -476,14 +471,14 @@ FinalCopy32(PIXEL *Target, PIXEL *Source, PSPAN ClipSpans, UINT ClipSpansCount,
 }
 
 //NOTE: If you change something here, please do the same in other dibXXbpp.c files!
-BOOLEAN ScaleRectAvg32(SURFGDI *DestGDI, SURFGDI *SourceGDI,
+BOOLEAN ScaleRectAvg32(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
                        RECTL* DestRect, RECTL *SourceRect,
                        POINTL* MaskOrigin, POINTL BrushOrigin,
                        CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
                        ULONG Mode)
 {
   int NumPixels = DestRect->bottom - DestRect->top;
-  int IntPart = (((SourceRect->bottom - SourceRect->top) / (DestRect->bottom - DestRect->top)) * SourceGDI->SurfObj.lDelta) / 4; //((SourceRect->bottom - SourceRect->top) / (DestRect->bottom - DestRect->top)) * (SourceRect->right - SourceRect->left);
+  int IntPart = (((SourceRect->bottom - SourceRect->top) / (DestRect->bottom - DestRect->top)) * SourceSurf->lDelta) / 4;
   int FractPart = (SourceRect->bottom - SourceRect->top) % (DestRect->bottom - DestRect->top);
   int Mid = (DestRect->bottom - DestRect->top) >> 1;
   int E = 0;
@@ -491,8 +486,8 @@ BOOLEAN ScaleRectAvg32(SURFGDI *DestGDI, SURFGDI *SourceGDI,
   PIXEL *ScanLine, *ScanLineAhead;
   PIXEL *PrevSource = NULL;
   PIXEL *PrevSourceAhead = NULL;
-  PIXEL *Target = (PIXEL *) (DestGDI->SurfObj.pvScan0 + (DestRect->top * DestGDI->SurfObj.lDelta) + 4 * DestRect->left);
-  PIXEL *Source = (PIXEL *) (SourceGDI->SurfObj.pvScan0 + (SourceRect->top * SourceGDI->SurfObj.lDelta) + 4 * SourceRect->left);
+  PIXEL *Target = (PIXEL *) (DestSurf->pvScan0 + (DestRect->top * DestSurf->lDelta) + 4 * DestRect->left);
+  PIXEL *Source = (PIXEL *) (SourceSurf->pvScan0 + (SourceRect->top * SourceSurf->lDelta) + 4 * SourceRect->left);
   PSPAN ClipSpans;
   UINT ClipSpansCount;
   UINT SpanIndex;
@@ -532,12 +527,12 @@ BOOLEAN ScaleRectAvg32(SURFGDI *DestGDI, SURFGDI *SourceGDI,
       PrevSource = Source;
     } /* if */
     
-    if (E >= Mid && PrevSourceAhead != (PIXEL *)((BYTE *)Source + SourceGDI->SurfObj.lDelta)) {
+    if (E >= Mid && PrevSourceAhead != (PIXEL *)((BYTE *)Source + SourceSurf->lDelta)) {
       int x;
-      ScaleLineAvg32(ScanLineAhead, (PIXEL *)((BYTE *)Source + SourceGDI->SurfObj.lDelta), SourceRect->right - SourceRect->left, DestRect->right - DestRect->left);
+      ScaleLineAvg32(ScanLineAhead, (PIXEL *)((BYTE *)Source + SourceSurf->lDelta), SourceRect->right - SourceRect->left, DestRect->right - DestRect->left);
       for (x = 0; x < DestRect->right - DestRect->left; x++)
         ScanLine[x] = average32(ScanLine[x], ScanLineAhead[x]);
-      PrevSourceAhead = (PIXEL *)((BYTE *)Source + SourceGDI->SurfObj.lDelta);
+      PrevSourceAhead = (PIXEL *)((BYTE *)Source + SourceSurf->lDelta);
     } /* if */
     
     if (! FinalCopy32(Target, ScanLine, ClipSpans, ClipSpansCount, &SpanIndex, DestY, DestRect))
@@ -549,12 +544,12 @@ BOOLEAN ScaleRectAvg32(SURFGDI *DestGDI, SURFGDI *SourceGDI,
         return TRUE;
       }
     DestY++;
-    Target = (PIXEL *)((BYTE *)Target + DestGDI->SurfObj.lDelta);
+    Target = (PIXEL *)((BYTE *)Target + DestSurf->lDelta);
     Source += IntPart;
     E += FractPart;
     if (E >= DestRect->bottom - DestRect->top) {
       E -= DestRect->bottom - DestRect->top;
-      Source = (PIXEL *)((BYTE *)Source + SourceGDI->SurfObj.lDelta);
+      Source = (PIXEL *)((BYTE *)Source + SourceSurf->lDelta);
     } /* if */
   } /* while */
 
@@ -570,7 +565,7 @@ BOOLEAN ScaleRectAvg32(SURFGDI *DestGDI, SURFGDI *SourceGDI,
         return TRUE;
       }
     DestY++;
-    Target = (PIXEL *)((BYTE *)Target + DestGDI->SurfObj.lDelta);
+    Target = (PIXEL *)((BYTE *)Target + DestSurf->lDelta);
   } /* while */
 
   ExFreePool(ClipSpans);
@@ -582,45 +577,33 @@ BOOLEAN ScaleRectAvg32(SURFGDI *DestGDI, SURFGDI *SourceGDI,
 
 //NOTE: If you change something here, please do the same in other dibXXbpp.c files!
 BOOLEAN DIB_32BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                            SURFGDI *DestGDI, SURFGDI *SourceGDI,
                             RECTL* DestRect, RECTL *SourceRect,
                             POINTL* MaskOrigin, POINTL BrushOrigin,
                             CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
                             ULONG Mode)
 {
   DPRINT("DIB_32BPP_StretchBlt: Source BPP: %u, srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n",
-     SourceGDI->BitsPerPixel, SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom,
+     BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom,
      DestRect->left, DestRect->top, DestRect->right, DestRect->bottom);
 
-    switch(SourceGDI->BitsPerPixel)
+    switch(SourceSurf->iBitmapFormat)
     {
-      case 1:
+      case BMF_1BPP:
+      case BMF_4BPP:
+      case BMF_8BPP:
+      case BMF_16BPP:
+      case BMF_24BPP:
+         /* Not implemented yet. */
          return FALSE;      
       break;
   
-      case 4:
-         return FALSE;
-      break;
-  
-      case 8:
-         return FALSE;
-      break;
-
-      case 16:
-         return FALSE;
-      break;
-    
-      case 24:
-         return FALSE;
-      break;
-      
-      case 32:
-        return ScaleRectAvg32(DestGDI, SourceGDI, DestRect, SourceRect, MaskOrigin, BrushOrigin,
+      case BMF_32BPP:
+        return ScaleRectAvg32(DestSurf, SourceSurf, DestRect, SourceRect, MaskOrigin, BrushOrigin,
                               ClipRegion, ColorTranslation, Mode);
       break;
       
       default:
-      //DPRINT1("DIB_32BPP_StretchBlt: Unhandled Source BPP: %u\n", SourceGDI->BitsPerPixel);
+      //DPRINT1("DIB_32BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat));
       return FALSE;
     }
 
@@ -631,7 +614,6 @@ BOOLEAN DIB_32BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
 
 BOOLEAN 
 DIB_32BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                         PSURFGDI DestGDI,  PSURFGDI SourceGDI,
                          RECTL*  DestRect,  POINTL  *SourcePoint,
                          XLATEOBJ *ColorTranslation, ULONG iTransColor)
 {
@@ -649,7 +631,7 @@ DIB_32BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
     SourceX = SourcePoint->x;
     for(X = DestRect->left; X < DestRect->right; X++, DestBits++, SourceX++)
     {
-      Source = DIB_GetSourceIndex(SourceSurf, SourceGDI, SourceX, SourceY);
+      Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY);
       if(Source != iTransColor)
       {
         *DestBits = XLATEOBJ_iXlate(ColorTranslation, Source);
diff --git a/reactos/subsys/win32k/dib/dib4bpp.c b/reactos/subsys/win32k/dib/dib4bpp.c
index 37730023f61..a1cb1e208e8 100644
--- a/reactos/subsys/win32k/dib/dib4bpp.c
+++ b/reactos/subsys/win32k/dib/dib4bpp.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dib4bpp.c,v 1.35 2004/05/14 22:56:17 gvg Exp $ */
+/* $Id: dib4bpp.c,v 1.36 2004/07/03 13:55:35 navaraf Exp $ */
 #include <w32k.h>
 
 VOID
@@ -62,7 +62,6 @@ DIB_4BPP_VLine(SURFOBJ *SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
 
 BOOLEAN STATIC
 DIB_4BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-		       SURFGDI *DestGDI,  SURFGDI *SourceGDI,
 		       PRECTL  DestRect,  POINTL  *SourcePoint,
 		       XLATEOBJ* ColorTranslation)
 {
@@ -73,9 +72,9 @@ DIB_4BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
 
   DestBits = DestSurf->pvScan0 + (DestRect->left>>1) + DestRect->top * DestSurf->lDelta;
 
-  switch(SourceGDI->BitsPerPixel)
+  switch(SourceSurf->iBitmapFormat)
   {
-    case 1:
+    case BMF_1BPP:
       sx = SourcePoint->x;
       sy = SourcePoint->y;
 
@@ -96,7 +95,7 @@ DIB_4BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       }
       break;
 
-    case 4:
+    case BMF_4BPP:
       sy = SourcePoint->y;
 
       for (j=DestRect->top; j<DestRect->bottom; j++)
@@ -119,7 +118,7 @@ DIB_4BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       }
       break;
 
-    case 8:
+    case BMF_8BPP:
       SourceBits_8BPP = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + SourcePoint->x;
 
       for (j=DestRect->top; j<DestRect->bottom; j++)
@@ -141,7 +140,7 @@ DIB_4BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       }
       break;
 
-    case 16:
+    case BMF_16BPP:
       SourceLine = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + 2 * SourcePoint->x;
       DestLine = DestBits;
 
@@ -165,7 +164,7 @@ DIB_4BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       }
       break;
 
-    case 24:
+    case BMF_24BPP:
       SourceBits_24BPP = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + SourcePoint->x * 3;
 
       for (j=DestRect->top; j<DestRect->bottom; j++)
@@ -190,7 +189,7 @@ DIB_4BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       }
       break;
 
-    case 32:
+    case BMF_32BPP:
       SourceLine = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + 4 * SourcePoint->x;
       DestLine = DestBits;
 
@@ -215,7 +214,7 @@ DIB_4BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       break;
 
     default:
-      DbgPrint("DIB_4BPP_Bitblt: Unhandled Source BPP: %u\n", SourceGDI->BitsPerPixel);
+      DbgPrint("DIB_4BPP_Bitblt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat));
       return FALSE;
   }
   return(TRUE);
@@ -223,7 +222,6 @@ DIB_4BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
 
 BOOLEAN
 DIB_4BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-		SURFGDI *DestGDI,  SURFGDI *SourceGDI,
 		PRECTL  DestRect,  POINTL  *SourcePoint,
 		BRUSHOBJ *Brush,   POINTL BrushOrigin,
 		XLATEOBJ *ColorTranslation, ULONG Rop4)
@@ -264,8 +262,6 @@ DIB_4BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       return DIB_4BPP_BitBltSrcCopy(
          DestSurf,
          SourceSurf,
-         DestGDI,
-         SourceGDI,
          DestRect,
          SourcePoint,
          ColorTranslation);
@@ -285,11 +281,10 @@ DIB_4BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
             GDIBRUSHOBJ,
             BrushObject);
 
+         PatternSurface = GdiBrush->hbmPattern;
          PatternBitmap = BITMAPOBJ_LockBitmap(GdiBrush->hbmPattern);
-         PatternSurface = BitmapToSurf(PatternBitmap, NULL);
-         BITMAPOBJ_UnlockBitmap(GdiBrush->hbmPattern);
 
-         PatternObj = (SURFOBJ*)AccessUserObject((ULONG)PatternSurface);
+         PatternObj = &PatternBitmap->SurfObj;
          PatternWidth = PatternObj->sizlBitmap.cx;
          PatternHeight = PatternObj->sizlBitmap.cy;
 
@@ -320,7 +315,7 @@ DIB_4BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
 
          if (UsesSource)
          {
-            Source = DIB_GetSource(SourceSurf, SourceGDI, sx, sy, ColorTranslation);
+            Source = DIB_GetSource(SourceSurf, sx, sy, ColorTranslation);
          }
 
          if (UsesPattern)
@@ -341,14 +336,14 @@ DIB_4BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
          if (UsesSource)
          {
             Source =
-               (DIB_GetSource(SourceSurf, SourceGDI, sx + 1, sy, ColorTranslation)) | 
-               (DIB_GetSource(SourceSurf, SourceGDI, sx + 0, sy, ColorTranslation) << 4) |
-               (DIB_GetSource(SourceSurf, SourceGDI, sx + 3, sy, ColorTranslation) << 8) | 
-               (DIB_GetSource(SourceSurf, SourceGDI, sx + 2, sy, ColorTranslation) << 12) |
-               (DIB_GetSource(SourceSurf, SourceGDI, sx + 5, sy, ColorTranslation) << 16) | 
-               (DIB_GetSource(SourceSurf, SourceGDI, sx + 4, sy, ColorTranslation) << 20) |
-               (DIB_GetSource(SourceSurf, SourceGDI, sx + 7, sy, ColorTranslation) << 24) | 
-               (DIB_GetSource(SourceSurf, SourceGDI, sx + 6, sy, ColorTranslation) << 28);
+               (DIB_GetSource(SourceSurf, sx + 1, sy, ColorTranslation)) | 
+               (DIB_GetSource(SourceSurf, sx + 0, sy, ColorTranslation) << 4) |
+               (DIB_GetSource(SourceSurf, sx + 3, sy, ColorTranslation) << 8) | 
+               (DIB_GetSource(SourceSurf, sx + 2, sy, ColorTranslation) << 12) |
+               (DIB_GetSource(SourceSurf, sx + 5, sy, ColorTranslation) << 16) | 
+               (DIB_GetSource(SourceSurf, sx + 4, sy, ColorTranslation) << 20) |
+               (DIB_GetSource(SourceSurf, sx + 7, sy, ColorTranslation) << 24) | 
+               (DIB_GetSource(SourceSurf, sx + 6, sy, ColorTranslation) << 28);
          }
          if (UsesPattern)
          {
@@ -370,7 +365,7 @@ DIB_4BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
          Dest = DIB_4BPP_GetPixel(DestSurf, i, j);
          if (UsesSource)
          {
-            Source = DIB_GetSource(SourceSurf, SourceGDI, sx, sy, ColorTranslation);
+            Source = DIB_GetSource(SourceSurf, sx, sy, ColorTranslation);
          }
          if (UsesPattern)
          {
@@ -381,25 +376,23 @@ DIB_4BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
    }
 
    if (PatternSurface != NULL)
-      EngDeleteSurface((HSURF)PatternSurface);
+      BITMAPOBJ_UnlockBitmap(PatternSurface);
 
    return TRUE;
 }
 
 BOOLEAN DIB_4BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                            SURFGDI *DestGDI, SURFGDI *SourceGDI,
                             RECTL* DestRect, RECTL *SourceRect,
                             POINTL* MaskOrigin, POINTL BrushOrigin,
                             CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
                             ULONG Mode)
 {
-  DbgPrint("DIB_4BPP_StretchBlt: Source BPP: %u\n", SourceGDI->BitsPerPixel);
+  DbgPrint("DIB_4BPP_StretchBlt: Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat));
   return FALSE;
 }
 
 BOOLEAN 
 DIB_4BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                        PSURFGDI DestGDI,  PSURFGDI SourceGDI,
                         RECTL*  DestRect,  POINTL  *SourcePoint,
                         XLATEOBJ *ColorTranslation, ULONG iTransColor)
 {
diff --git a/reactos/subsys/win32k/dib/dib8bpp.c b/reactos/subsys/win32k/dib/dib8bpp.c
index 6b7a6e5e76b..f565135c168 100644
--- a/reactos/subsys/win32k/dib/dib8bpp.c
+++ b/reactos/subsys/win32k/dib/dib8bpp.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dib8bpp.c,v 1.26 2004/05/14 22:56:17 gvg Exp $ */
+/* $Id: dib8bpp.c,v 1.27 2004/07/03 13:55:35 navaraf Exp $ */
 #include <w32k.h>
 
 VOID
@@ -66,7 +66,6 @@ DIB_8BPP_VLine(SURFOBJ *SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
 
 BOOLEAN
 DIB_8BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-		       SURFGDI *DestGDI,  SURFGDI *SourceGDI,
 		       PRECTL  DestRect,  POINTL  *SourcePoint,
 		       XLATEOBJ *ColorTranslation)
 {
@@ -76,9 +75,9 @@ DIB_8BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
 
   DestBits = DestSurf->pvScan0 + (DestRect->top * DestSurf->lDelta) + DestRect->left;
 
-  switch(SourceGDI->BitsPerPixel)
+  switch(SourceSurf->iBitmapFormat)
   {
-    case 1:
+    case BMF_1BPP:
       sx = SourcePoint->x;
       sy = SourcePoint->y;
 
@@ -99,7 +98,7 @@ DIB_8BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       }
       break;
 
-    case 4:
+    case BMF_4BPP:
       SourceBits_4BPP = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + (SourcePoint->x >> 1);
 
       for (j=DestRect->top; j<DestRect->bottom; j++)
@@ -121,7 +120,7 @@ DIB_8BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       }
       break;
 
-    case 8:
+    case BMF_8BPP:
       if (NULL == ColorTranslation || 0 != (ColorTranslation->flXlate & XO_TRIVIAL))
       {
 	if (DestRect->top < SourcePoint->y)
@@ -183,7 +182,7 @@ DIB_8BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       }
       break;
 
-    case 16:
+    case BMF_16BPP:
       SourceLine = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + 2 * SourcePoint->x;
       DestLine = DestBits;
 
@@ -205,7 +204,7 @@ DIB_8BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       }
       break;
 
-    case 24:
+    case BMF_24BPP:
       SourceLine = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + 3 * SourcePoint->x;
       DestLine = DestBits;
 
@@ -229,7 +228,7 @@ DIB_8BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       }
       break;
 
-    case 32:
+    case BMF_32BPP:
       SourceLine = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + 4 * SourcePoint->x;
       DestLine = DestBits;
 
@@ -252,7 +251,7 @@ DIB_8BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       break;
 
     default:
-      DPRINT1("DIB_8BPP_Bitblt: Unhandled Source BPP: %u\n", SourceGDI->BitsPerPixel);
+      DPRINT1("DIB_8BPP_Bitblt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat));
       return FALSE;
   }
 
@@ -261,7 +260,6 @@ DIB_8BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
 
 BOOLEAN
 DIB_8BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-		 SURFGDI *DestGDI,  SURFGDI *SourceGDI,
 		 PRECTL  DestRect,  POINTL  *SourcePoint,
 		 BRUSHOBJ *Brush,   POINTL BrushOrigin,
 		 XLATEOBJ *ColorTranslation, ULONG Rop4)
@@ -283,8 +281,6 @@ DIB_8BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       return DIB_8BPP_BitBltSrcCopy(
          DestSurf,
          SourceSurf,
-         DestGDI,
-         SourceGDI,
          DestRect,
          SourcePoint,
          ColorTranslation);
@@ -304,11 +300,10 @@ DIB_8BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
             GDIBRUSHOBJ,
             BrushObject);
 
+         PatternSurface = GdiBrush->hbmPattern;
          PatternBitmap = BITMAPOBJ_LockBitmap(GdiBrush->hbmPattern);
-         PatternSurface = BitmapToSurf(PatternBitmap, NULL);
-         BITMAPOBJ_UnlockBitmap(GdiBrush->hbmPattern);
 
-         PatternObj = (SURFOBJ*)AccessUserObject((ULONG)PatternSurface);
+         PatternObj = &PatternBitmap->SurfObj;
          PatternWidth = PatternObj->sizlBitmap.cx;
          PatternHeight = PatternObj->sizlBitmap.cy;
          
@@ -343,7 +338,7 @@ DIB_8BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
          {
             Source = 0;
             for (k = 0; k < 4; k++)
-               Source |= (DIB_GetSource(SourceSurf, SourceGDI, sx + (i - DestRect->left) + k, sy, ColorTranslation) << (k * 8));
+               Source |= (DIB_GetSource(SourceSurf, sx + (i - DestRect->left) + k, sy, ColorTranslation) << (k * 8));
          }
 
          if (UsesPattern)
@@ -364,7 +359,7 @@ DIB_8BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
             
             if (UsesSource)
 	    {
-               Source = DIB_GetSource(SourceSurf, SourceGDI, sx + (i - DestRect->left), sy, ColorTranslation);
+               Source = DIB_GetSource(SourceSurf, sx + (i - DestRect->left), sy, ColorTranslation);
             }
 
             if (UsesPattern)
@@ -380,7 +375,7 @@ DIB_8BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
    }
 
    if (PatternSurface != NULL)
-      EngDeleteSurface((HSURF)PatternSurface);
+      BITMAPOBJ_UnlockBitmap(PatternSurface);
 
    return TRUE;
 }
@@ -470,14 +465,14 @@ FinalCopy8(PIXEL *Target, PIXEL *Source, PSPAN ClipSpans, UINT ClipSpansCount, U
 }
 
 //NOTE: If you change something here, please do the same in other dibXXbpp.c files!
-BOOLEAN ScaleRectAvg8(SURFGDI *DestGDI, SURFGDI *SourceGDI,
+BOOLEAN ScaleRectAvg8(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
                       RECTL* DestRect, RECTL *SourceRect,
                       POINTL* MaskOrigin, POINTL BrushOrigin,
                       CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
                       ULONG Mode)
 {
   int NumPixels = DestRect->bottom - DestRect->top;
-  int IntPart = (((SourceRect->bottom - SourceRect->top) / (DestRect->bottom - DestRect->top)) * SourceGDI->SurfObj.lDelta); //((SourceRect->bottom - SourceRect->top) / (DestRect->bottom - DestRect->top)) * (SourceRect->right - SourceRect->left);
+  int IntPart = (((SourceRect->bottom - SourceRect->top) / (DestRect->bottom - DestRect->top)) * SourceSurf->lDelta); //((SourceRect->bottom - SourceRect->top) / (DestRect->bottom - DestRect->top)) * (SourceRect->right - SourceRect->left);
   int FractPart = (SourceRect->bottom - SourceRect->top) % (DestRect->bottom - DestRect->top);
   int Mid = (DestRect->bottom - DestRect->top) >> 1;
   int E = 0;
@@ -485,8 +480,8 @@ BOOLEAN ScaleRectAvg8(SURFGDI *DestGDI, SURFGDI *SourceGDI,
   PIXEL *ScanLine, *ScanLineAhead;
   PIXEL *PrevSource = NULL;
   PIXEL *PrevSourceAhead = NULL;
-  PIXEL *Target = (PIXEL *) (DestGDI->SurfObj.pvScan0 + (DestRect->top * DestGDI->SurfObj.lDelta) + DestRect->left);
-  PIXEL *Source = (PIXEL *) (SourceGDI->SurfObj.pvScan0 + (SourceRect->top * SourceGDI->SurfObj.lDelta) + SourceRect->left);
+  PIXEL *Target = (PIXEL *) (DestSurf->pvScan0 + (DestRect->top * DestSurf->lDelta) + DestRect->left);
+  PIXEL *Source = (PIXEL *) (SourceSurf->pvScan0 + (SourceRect->top * SourceSurf->lDelta) + SourceRect->left);
   PSPAN ClipSpans;
   UINT ClipSpansCount;
   UINT SpanIndex;
@@ -526,12 +521,12 @@ BOOLEAN ScaleRectAvg8(SURFGDI *DestGDI, SURFGDI *SourceGDI,
       PrevSource = Source;
     } /* if */
     
-    if (E >= Mid && PrevSourceAhead != (PIXEL *)((BYTE *)Source + SourceGDI->SurfObj.lDelta)) {
+    if (E >= Mid && PrevSourceAhead != (PIXEL *)((BYTE *)Source + SourceSurf->lDelta)) {
       int x;
-      ScaleLineAvg8(ScanLineAhead, (PIXEL *)((BYTE *)Source + SourceGDI->SurfObj.lDelta), SourceRect->right - SourceRect->left, DestRect->right - DestRect->left);
+      ScaleLineAvg8(ScanLineAhead, (PIXEL *)((BYTE *)Source + SourceSurf->lDelta), SourceRect->right - SourceRect->left, DestRect->right - DestRect->left);
       for (x = 0; x < DestRect->right - DestRect->left; x++)
         ScanLine[x] = average8(ScanLine[x], ScanLineAhead[x]);
-      PrevSourceAhead = (PIXEL *)((BYTE *)Source + SourceGDI->SurfObj.lDelta);
+      PrevSourceAhead = (PIXEL *)((BYTE *)Source + SourceSurf->lDelta);
     } /* if */
     
     if (! FinalCopy8(Target, ScanLine, ClipSpans, ClipSpansCount, &SpanIndex, DestY, DestRect))
@@ -543,12 +538,12 @@ BOOLEAN ScaleRectAvg8(SURFGDI *DestGDI, SURFGDI *SourceGDI,
         return TRUE;
       }
     DestY++;
-    Target = (PIXEL *)((BYTE *)Target + DestGDI->SurfObj.lDelta);
+    Target = (PIXEL *)((BYTE *)Target + DestSurf->lDelta);
     Source += IntPart;
     E += FractPart;
     if (E >= DestRect->bottom - DestRect->top) {
       E -= DestRect->bottom - DestRect->top;
-      Source = (PIXEL *)((BYTE *)Source + SourceGDI->SurfObj.lDelta);
+      Source = (PIXEL *)((BYTE *)Source + SourceSurf->lDelta);
     } /* if */
   } /* while */
 
@@ -564,7 +559,7 @@ BOOLEAN ScaleRectAvg8(SURFGDI *DestGDI, SURFGDI *SourceGDI,
         return TRUE;
       }
     DestY++;
-    Target = (PIXEL *)((BYTE *)Target + DestGDI->SurfObj.lDelta);
+    Target = (PIXEL *)((BYTE *)Target + DestSurf->lDelta);
   } /* while */
 
   ExFreePool(ClipSpans);
@@ -575,45 +570,33 @@ BOOLEAN ScaleRectAvg8(SURFGDI *DestGDI, SURFGDI *SourceGDI,
 }
 
 BOOLEAN DIB_8BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                            SURFGDI *DestGDI, SURFGDI *SourceGDI,
                             RECTL* DestRect, RECTL *SourceRect,
                             POINTL* MaskOrigin, POINTL BrushOrigin,
                             CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
                             ULONG Mode)
 {
   DPRINT("DIB_8BPP_StretchBlt: Source BPP: %u, srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n",
-     SourceGDI->BitsPerPixel, SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom,
+     BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom,
      DestRect->left, DestRect->top, DestRect->right, DestRect->bottom);
 
-    switch(SourceGDI->BitsPerPixel)
+    switch(SourceSurf->iBitmapFormat)
     {
-      case 1:
+      case BMF_1BPP:
+      case BMF_4BPP:
+      case BMF_16BPP:
+      case BMF_24BPP:
+      case BMF_32BPP:
+         /* Not implemented yet. */
          return FALSE;      
       break;
   
-      case 4:
-         return FALSE;
-      break;
-  
-      case 8:
-        return ScaleRectAvg8(DestGDI, SourceGDI, DestRect, SourceRect, MaskOrigin, BrushOrigin,
+      case BMF_8BPP:
+        return ScaleRectAvg8(DestSurf, SourceSurf, DestRect, SourceRect, MaskOrigin, BrushOrigin,
                              ClipRegion, ColorTranslation, Mode);
       break;
-
-      case 16:
-         return FALSE;
-      break;
-    
-      case 24:
-         return FALSE;
-      break;
-      
-      case 32:
-         return FALSE;
-      break;
       
       default:
-         DPRINT1("DIB_8BPP_StretchBlt: Unhandled Source BPP: %u\n", SourceGDI->BitsPerPixel);
+         DPRINT1("DIB_8BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat));
       return FALSE;
     }
     
@@ -622,7 +605,6 @@ BOOLEAN DIB_8BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
 
 BOOLEAN 
 DIB_8BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                        PSURFGDI DestGDI,  PSURFGDI SourceGDI,
                         RECTL*  DestRect,  POINTL  *SourcePoint,
                         XLATEOBJ *ColorTranslation, ULONG iTransColor)
 {
@@ -644,28 +626,28 @@ DIB_8BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
     {
       Dest = *DestBits;
       
-      Source = DIB_GetSourceIndex(SourceSurf, SourceGDI, SourceX++, SourceY);
+      Source = DIB_GetSourceIndex(SourceSurf, SourceX++, SourceY);
       if(Source != iTransColor)
       {
         Dest &= 0xFFFFFF00;
         Dest |= (XLATEOBJ_iXlate(ColorTranslation, Source) & 0xFF);
       }
 
-      Source = DIB_GetSourceIndex(SourceSurf, SourceGDI, SourceX++, SourceY);
+      Source = DIB_GetSourceIndex(SourceSurf, SourceX++, SourceY);
       if(Source != iTransColor)
       {
         Dest &= 0xFFFF00FF;
         Dest |= ((XLATEOBJ_iXlate(ColorTranslation, Source) << 8) & 0xFF00);
       }
       
-      Source = DIB_GetSourceIndex(SourceSurf, SourceGDI, SourceX++, SourceY);
+      Source = DIB_GetSourceIndex(SourceSurf, SourceX++, SourceY);
       if(Source != iTransColor)
       {
         Dest &= 0xFF00FFFF;
         Dest |= ((XLATEOBJ_iXlate(ColorTranslation, Source) << 16) & 0xFF0000);
       }
       
-      Source = DIB_GetSourceIndex(SourceSurf, SourceGDI, SourceX++, SourceY);
+      Source = DIB_GetSourceIndex(SourceSurf, SourceX++, SourceY);
       if(Source != iTransColor)
       {
         Dest &= 0x00FFFFFF;
@@ -679,7 +661,7 @@ DIB_8BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
     {
       for (; X < DestRect->right; X++)
       {
-        Source = DIB_GetSourceIndex(SourceSurf, SourceGDI, SourceX++, SourceY);
+        Source = DIB_GetSourceIndex(SourceSurf, SourceX++, SourceY);
         if(Source != iTransColor)
         {
           *((BYTE*)DestBits) = (BYTE)(XLATEOBJ_iXlate(ColorTranslation, Source) & 0xFF);
diff --git a/reactos/subsys/win32k/eng/bitblt.c b/reactos/subsys/win32k/eng/bitblt.c
index 9bd1592cfb5..64f769cc76a 100644
--- a/reactos/subsys/win32k/eng/bitblt.c
+++ b/reactos/subsys/win32k/eng/bitblt.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: bitblt.c,v 1.55 2004/05/14 22:56:18 gvg Exp $
+/* $Id: bitblt.c,v 1.56 2004/07/03 13:55:35 navaraf Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -29,9 +29,7 @@
 #include <w32k.h>
 
 typedef BOOLEAN STDCALL (*PBLTRECTFUNC)(SURFOBJ* OutputObj,
-                                        SURFGDI* OutputGDI,
                                         SURFOBJ* InputObj,
-                                        SURFGDI* InputGDI,
                                         SURFOBJ* Mask,
                                         XLATEOBJ* ColorTranslation,
                                         RECTL* OutputRect,
@@ -41,9 +39,7 @@ typedef BOOLEAN STDCALL (*PBLTRECTFUNC)(SURFOBJ* OutputObj,
                                         POINTL* BrushOrigin,
                                         ROP4 Rop4);
 typedef BOOLEAN STDCALL (*PSTRETCHRECTFUNC)(SURFOBJ* OutputObj,
-                                            SURFGDI* OutputGDI,
                                             SURFOBJ* InputObj,
-                                            SURFGDI* InputGDI,
                                             SURFOBJ* Mask,
                                             CLIPOBJ* ClipRegion,
                                             XLATEOBJ* ColorTranslation,
@@ -78,9 +74,7 @@ BOOL STDCALL EngIntersectRect(RECTL* prcDst, RECTL* prcSrc1, RECTL* prcSrc2)
 
 static BOOLEAN STDCALL
 BltMask(SURFOBJ* Dest,
-	SURFGDI* DestGDI,
 	SURFOBJ* Source,
-	SURFGDI* SourceGDI,
 	SURFOBJ* Mask, 
 	XLATEOBJ* ColorTranslation,
 	RECTL* DestRect,
@@ -116,11 +110,10 @@ BltMask(SURFOBJ* Dest,
          GDIBRUSHOBJ,
          BrushObject);
 
+      PatternSurface = GdiBrush->hbmPattern;
       PatternBitmap = BITMAPOBJ_LockBitmap(GdiBrush->hbmPattern);
-      PatternSurface = BitmapToSurf(PatternBitmap, Dest->hdev);
-      BITMAPOBJ_UnlockBitmap(GdiBrush->hbmPattern);
 
-      PatternObj = (SURFOBJ*)AccessUserObject((ULONG)PatternSurface);
+      PatternObj = &PatternBitmap->SurfObj;
       PatternWidth = PatternObj->sizlBitmap.cx;
       PatternHeight = PatternObj->sizlBitmap.cy;
    }
@@ -140,11 +133,13 @@ BltMask(SURFOBJ* Dest,
          {
             if (PatternSurface == NULL)
             {
-               DestGDI->DIB_PutPixel(Dest, DestRect->left + i, DestRect->top + j, Brush->iSolidColor);
+               DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_PutPixel(
+                  Dest, DestRect->left + i, DestRect->top + j, Brush->iSolidColor);
             }
             else
             {
-               DestGDI->DIB_PutPixel(Dest, DestRect->left + i, DestRect->top + j,
+               DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_PutPixel(
+                  Dest, DestRect->left + i, DestRect->top + j,
                   DIB_1BPP_GetPixel(PatternObj, (DestRect->left + i) % PatternWidth, PatternY) ? GdiBrush->crFore : GdiBrush->crBack);
             }
          }
@@ -159,16 +154,14 @@ BltMask(SURFOBJ* Dest,
    }
 
    if (PatternSurface != NULL)
-      EngDeleteSurface((HSURF)PatternSurface);
+      BITMAPOBJ_UnlockBitmap(PatternSurface);
 
    return TRUE;
 }
 
 static BOOLEAN STDCALL
 BltPatCopy(SURFOBJ* Dest,
-	   SURFGDI* DestGDI,
 	   SURFOBJ* Source,
-	   SURFGDI* SourceGDI,
 	   SURFOBJ* Mask, 
 	   XLATEOBJ* ColorTranslation,
 	   RECTL* DestRect,
@@ -186,7 +179,8 @@ BltPatCopy(SURFOBJ* Dest,
   LineWidth  = DestRect->right - DestRect->left;
   for (y = DestRect->top; y < DestRect->bottom; y++)
   {
-    DestGDI->DIB_HLine(Dest, DestRect->left, DestRect->right, y,  Brush->iSolidColor);
+    DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_HLine(
+      Dest, DestRect->left, DestRect->right, y,  Brush->iSolidColor);
   }
 
   return TRUE;
@@ -194,9 +188,7 @@ BltPatCopy(SURFOBJ* Dest,
 
 static BOOLEAN STDCALL
 CallDibBitBlt(SURFOBJ* OutputObj,
-              SURFGDI* OutputGDI,
               SURFOBJ* InputObj,
-              SURFGDI* InputGDI,
               SURFOBJ* Mask,
               XLATEOBJ* ColorTranslation,
               RECTL* OutputRect,
@@ -215,7 +207,9 @@ CallDibBitBlt(SURFOBJ* OutputObj,
     {
       RealBrushOrigin = *BrushOrigin;
     }
-  return OutputGDI->DIB_BitBlt(OutputObj, InputObj, OutputGDI, InputGDI, OutputRect, InputPoint, Brush, RealBrushOrigin, ColorTranslation, Rop4);
+
+  return DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_BitBlt(
+    OutputObj, InputObj, OutputRect, InputPoint, Brush, RealBrushOrigin, ColorTranslation, Rop4);
 }
 
 INT abs(INT nm);
@@ -240,8 +234,6 @@ EngBitBlt(SURFOBJ *DestObj,
   RECTL              CombinedRect;
   RECT_ENUM          RectEnum;
   BOOL               EnumMore;
-  SURFGDI*           OutputGDI;
-  SURFGDI*           InputGDI;
   POINTL             InputPoint;
   RECTL              InputRect;
   RECTL              OutputRect;
@@ -299,15 +291,6 @@ EngBitBlt(SURFOBJ *DestObj,
     InputPoint.y = 0;
     }
 
-  if (NULL != InputObj)
-    {
-    InputGDI = (SURFGDI*) AccessInternalObjectFromUserObject(InputObj);
-    }
-  else
-    {
-      InputGDI = NULL;
-    }
-
   OutputRect = *DestRect;
   if (NULL != ClipRegion)
     {
@@ -362,11 +345,6 @@ EngBitBlt(SURFOBJ *DestObj,
   else
     AdjustedBrushOrigin = Translate;
 
-  if (NULL != OutputObj)
-    {
-    OutputGDI = (SURFGDI*)AccessInternalObjectFromUserObject(OutputObj);
-    }
-
   // Determine clipping type
   if (ClipRegion == (CLIPOBJ *) NULL)
   {
@@ -399,7 +377,7 @@ EngBitBlt(SURFOBJ *DestObj,
   switch(clippingType)
   {
     case DC_TRIVIAL:
-      Ret = (*BltRectFunc)(OutputObj, OutputGDI, InputObj, InputGDI, Mask, ColorTranslation,
+      Ret = (*BltRectFunc)(OutputObj, InputObj, Mask, ColorTranslation,
                            &OutputRect, &InputPoint, MaskOrigin, Brush, &AdjustedBrushOrigin, Rop4);
       break;
     case DC_RECT:
@@ -411,7 +389,7 @@ EngBitBlt(SURFOBJ *DestObj,
       EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect);
       Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left;
       Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top;
-      Ret = (*BltRectFunc)(OutputObj, OutputGDI, InputObj, InputGDI, Mask, ColorTranslation,
+      Ret = (*BltRectFunc)(OutputObj, InputObj, Mask, ColorTranslation,
                            &CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin, Rop4);
       break;
     case DC_COMPLEX:
@@ -445,7 +423,7 @@ EngBitBlt(SURFOBJ *DestObj,
 	      EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect);
 	      Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left;
 	      Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top;
-	      Ret = (*BltRectFunc)(OutputObj, OutputGDI, InputObj, InputGDI, Mask, ColorTranslation,
+	      Ret = (*BltRectFunc)(OutputObj, InputObj, Mask, ColorTranslation,
 	                           &CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin, Rop4) &&
 	            Ret;
 	    }
@@ -462,9 +440,9 @@ EngBitBlt(SURFOBJ *DestObj,
 }
 
 BOOL STDCALL
-IntEngBitBlt(SURFOBJ *DestObj,
-             SURFOBJ *SourceObj,
-             SURFOBJ *Mask,
+IntEngBitBlt(BITMAPOBJ *DestObj,
+             BITMAPOBJ *SourceObj,
+             BITMAPOBJ *MaskObj,
              CLIPOBJ *ClipRegion,
              XLATEOBJ *ColorTranslation,
              RECTL *DestRect,
@@ -475,12 +453,13 @@ IntEngBitBlt(SURFOBJ *DestObj,
              ROP4 Rop4)
 {
   BOOLEAN ret;
-  SURFGDI *DestGDI;
-  SURFGDI *SourceGDI;
   RECTL InputClippedRect;
   RECTL OutputRect;
   POINTL InputPoint;
   BOOLEAN UsesSource;
+  SURFOBJ *DestSurf = &DestObj->SurfObj;
+  SURFOBJ *SourceSurf = SourceObj ? &SourceObj->SurfObj : NULL;
+  SURFOBJ *MaskSurf = MaskObj ? &MaskObj->SurfObj : NULL;
 
   InputClippedRect = *DestRect;
   if (InputClippedRect.right < InputClippedRect.left)
@@ -501,7 +480,6 @@ IntEngBitBlt(SURFOBJ *DestObj,
           return FALSE;
         }
       InputPoint = *SourcePoint;
-      SourceGDI = (SURFGDI*) AccessInternalObjectFromUserObject(SourceObj);
 
       /* Make sure we don't try to copy anything outside the valid source region */
       if (InputPoint.x < 0)
@@ -514,13 +492,13 @@ IntEngBitBlt(SURFOBJ *DestObj,
           InputClippedRect.top -= InputPoint.y;
           InputPoint.y = 0;
         }
-      if (SourceObj->sizlBitmap.cx < InputPoint.x + InputClippedRect.right - InputClippedRect.left)
+      if (SourceSurf->sizlBitmap.cx < InputPoint.x + InputClippedRect.right - InputClippedRect.left)
         {
-          InputClippedRect.right = InputClippedRect.left + SourceObj->sizlBitmap.cx - InputPoint.x;
+          InputClippedRect.right = InputClippedRect.left + SourceSurf->sizlBitmap.cx - InputPoint.x;
         }
-      if (SourceObj->sizlBitmap.cy < InputPoint.y + InputClippedRect.bottom - InputClippedRect.top)
+      if (SourceSurf->sizlBitmap.cy < InputPoint.y + InputClippedRect.bottom - InputClippedRect.top)
         {
-          InputClippedRect.bottom = InputClippedRect.top + SourceObj->sizlBitmap.cy - InputPoint.y;
+          InputClippedRect.bottom = InputClippedRect.top + SourceSurf->sizlBitmap.cy - InputPoint.y;
         }
 
       if (InputClippedRect.right < InputClippedRect.left ||
@@ -549,40 +527,36 @@ IntEngBitBlt(SURFOBJ *DestObj,
 
   if (UsesSource)
     {
-    MouseSafetyOnDrawStart(SourceObj, SourceGDI, InputPoint.x, InputPoint.y,
+    MouseSafetyOnDrawStart(SourceSurf, InputPoint.x, InputPoint.y,
                            (InputPoint.x + abs(DestRect->right - DestRect->left)),
 			   (InputPoint.y + abs(DestRect->bottom - DestRect->top)));
     }
 
   /* No success yet */
   ret = FALSE;
-  DestGDI = (SURFGDI*)AccessInternalObjectFromUserObject(DestObj);
-  MouseSafetyOnDrawStart(DestObj, DestGDI, OutputRect.left, OutputRect.top,
+  MouseSafetyOnDrawStart(DestSurf, OutputRect.left, OutputRect.top,
                          OutputRect.right, OutputRect.bottom);
 
   /* Call the driver's DrvBitBlt if available */
-  if (NULL != DestGDI->BitBlt)
+  if (DestObj->flHooks & HOOK_BITBLT)
     {
-      IntLockGDIDriver(DestGDI);
-      ret = DestGDI->BitBlt(DestObj, SourceObj, Mask, ClipRegion, ColorTranslation,
+      ret = GDIDEVFUNCS(DestSurf).BitBlt(
+                            DestSurf, SourceSurf, MaskSurf, ClipRegion, ColorTranslation,
                             &OutputRect, &InputPoint, MaskOrigin, Brush, BrushOrigin,
                             Rop4);
-      IntUnLockGDIDriver(DestGDI);
     }
 
   if (! ret)
     {
-      IntLockGDIDriver(DestGDI);
-      ret = EngBitBlt(DestObj, SourceObj, Mask, ClipRegion, ColorTranslation,
+      ret = EngBitBlt(DestSurf, SourceSurf, MaskSurf, ClipRegion, ColorTranslation,
                       &OutputRect, &InputPoint, MaskOrigin, Brush, BrushOrigin,
                       Rop4);
-      IntUnLockGDIDriver(DestGDI);
     }
 
-  MouseSafetyOnDrawEnd(DestObj, DestGDI);
+  MouseSafetyOnDrawEnd(DestSurf);
   if (UsesSource)
     {
-    MouseSafetyOnDrawEnd(SourceObj, SourceGDI);
+    MouseSafetyOnDrawEnd(SourceSurf);
     }
 
   return ret;
@@ -590,9 +564,7 @@ IntEngBitBlt(SURFOBJ *DestObj,
 
 static BOOLEAN STDCALL
 CallDibStretchBlt(SURFOBJ* OutputObj,
-                  SURFGDI* OutputGDI,
                   SURFOBJ* InputObj,
-                  SURFGDI* InputGDI,
                   SURFOBJ* Mask,
 	          CLIPOBJ* ClipRegion,
                   XLATEOBJ* ColorTranslation,
@@ -611,7 +583,8 @@ CallDibStretchBlt(SURFOBJ* OutputObj,
     {
       RealBrushOrigin = *BrushOrigin;
     }
-  return OutputGDI->DIB_StretchBlt(OutputObj, InputObj, OutputGDI, InputGDI, OutputRect, InputRect, MaskOrigin, RealBrushOrigin, ClipRegion, ColorTranslation, Mode);
+  return DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_StretchBlt(
+    OutputObj, InputObj, OutputRect, InputRect, MaskOrigin, RealBrushOrigin, ClipRegion, ColorTranslation, Mode);
 }
 
 
@@ -633,8 +606,6 @@ EngStretchBlt(
 {
   // www.osr.com/ddk/graphics/gdifncs_0bs7.htm
   
-  SURFGDI*           OutputGDI;
-  SURFGDI*           InputGDI;
   POINTL             InputPoint;
   RECTL              InputRect;
   RECTL              OutputRect;
@@ -660,15 +631,6 @@ EngStretchBlt(
   InputPoint.x = InputRect.left + Translate.x;
   InputPoint.y = InputRect.top + Translate.y;
  
-  if (NULL != InputObj)
-    {
-      InputGDI = (SURFGDI*) AccessInternalObjectFromUserObject(InputObj);
-    }
-  else
-    {
-      InputGDI = NULL;
-    }
-
   OutputRect = *prclDest;
 
   /* Check for degenerate case: if height or width of OutputRect is 0 pixels there's
@@ -700,11 +662,6 @@ EngStretchBlt(
       AdjustedBrushOrigin = Translate;
     }
 
-  if (NULL != OutputObj)
-    {
-      OutputGDI = (SURFGDI*)AccessInternalObjectFromUserObject(OutputObj);
-    }
-
   if (Mask != NULL)
     {
       //BltRectFunc = BltMask;
@@ -720,7 +677,7 @@ EngStretchBlt(
     }
 
 
-  Ret = (*BltRectFunc)(OutputObj, OutputGDI, InputObj, InputGDI, Mask, ClipRegion,
+  Ret = (*BltRectFunc)(OutputObj, InputObj, Mask, ClipRegion,
                        ColorTranslation, &OutputRect, &InputRect, MaskOrigin,
                        &AdjustedBrushOrigin, Mode);
 
@@ -731,23 +688,24 @@ EngStretchBlt(
 }
 
 BOOL STDCALL
-IntEngStretchBlt(SURFOBJ *DestObj,
-             SURFOBJ *SourceObj,
-             SURFOBJ *Mask,
-             CLIPOBJ *ClipRegion,
-             XLATEOBJ *ColorTranslation,
-             RECTL *DestRect,
-             RECTL *SourceRect,
-             POINTL *pMaskOrigin,
-             BRUSHOBJ *Brush,
-             POINTL *BrushOrigin,
-             ULONG Mode)
+IntEngStretchBlt(BITMAPOBJ *DestObj,
+                 BITMAPOBJ *SourceObj,
+                 BITMAPOBJ *MaskObj,
+                 CLIPOBJ *ClipRegion,
+                 XLATEOBJ *ColorTranslation,
+                 RECTL *DestRect,
+                 RECTL *SourceRect,
+                 POINTL *pMaskOrigin,
+                 BRUSHOBJ *Brush,
+                 POINTL *BrushOrigin,
+                 ULONG Mode)
 {
   BOOLEAN ret;
-  SURFGDI *DestGDI;
-  SURFGDI *SourceGDI;
   COLORADJUSTMENT ca;
   POINT MaskOrigin;
+  SURFOBJ *DestSurf = &DestObj->SurfObj;
+  SURFOBJ *SourceSurf = SourceObj ? &SourceObj->SurfObj : NULL;
+  SURFOBJ *MaskSurf = MaskObj ? &MaskObj->SurfObj : NULL;
 
   if (pMaskOrigin != NULL)
     {
@@ -756,43 +714,40 @@ IntEngStretchBlt(SURFOBJ *DestObj,
 
   if (NULL != SourceObj)
     {
-    SourceGDI = (SURFGDI*) AccessInternalObjectFromUserObject(SourceObj);
-    MouseSafetyOnDrawStart(SourceObj, SourceGDI, SourceRect->left, SourceRect->top,
+    MouseSafetyOnDrawStart(SourceSurf, SourceRect->left, SourceRect->top,
                            (SourceRect->left + abs(SourceRect->right - SourceRect->left)),
 			   (SourceRect->top + abs(SourceRect->bottom - SourceRect->top)));
     }
 
   /* No success yet */
   ret = FALSE;
-  DestGDI = (SURFGDI*)AccessInternalObjectFromUserObject(DestObj);
-  MouseSafetyOnDrawStart(DestObj, DestGDI, DestRect->left, DestRect->top,
+  MouseSafetyOnDrawStart(DestSurf, DestRect->left, DestRect->top,
                          DestRect->right, DestRect->bottom);
 
   /* Prepare color adjustment */
 
   /* Call the driver's DrvStretchBlt if available */
-  if (NULL != DestGDI->StretchBlt)
+  if (DestObj->flHooks & HOOK_STRETCHBLT)
     {
       /* Drv->StretchBlt (look at http://www.osr.com/ddk/graphics/ddifncs_3ew7.htm )
       SURFOBJ *psoMask // optional, if it exists, then rop4=0xCCAA, otherwise rop4=0xCCCC */
       // FIXME: MaskOrigin is always NULL !
-      IntLockGDIDriver(DestGDI);
-      ret = DestGDI->StretchBlt(DestObj, SourceObj, Mask, ClipRegion, ColorTranslation,
+      ret = GDIDEVFUNCS(DestSurf).StretchBlt(
+                            DestSurf, SourceSurf, MaskSurf, ClipRegion, ColorTranslation,
                             &ca, BrushOrigin, DestRect, SourceRect, NULL, Mode);
-      IntUnLockGDIDriver(DestGDI);
     }
 
   if (! ret)
     {
       // FIXME: see previous fixme
-      ret = EngStretchBlt(DestObj, SourceObj, Mask, ClipRegion, ColorTranslation,
+      ret = EngStretchBlt(DestSurf, SourceSurf, MaskSurf, ClipRegion, ColorTranslation,
                           &ca, BrushOrigin, DestRect, SourceRect, NULL, Mode);
     }
 
-  MouseSafetyOnDrawEnd(DestObj, DestGDI);
-  if (NULL != SourceObj)
+  MouseSafetyOnDrawEnd(DestSurf);
+  if (NULL != SourceSurf)
     {
-    MouseSafetyOnDrawEnd(SourceObj, SourceGDI);
+    MouseSafetyOnDrawEnd(SourceSurf);
     }
 
   return ret;
@@ -803,9 +758,7 @@ IntEngStretchBlt(SURFOBJ *DestObj,
 /* renders the alpha mask bitmap */
 static BOOLEAN STDCALL
 AlphaBltMask(SURFOBJ* Dest,
-	SURFGDI* DestGDI,
 	SURFOBJ* Source,
-	SURFGDI* SourceGDI,
 	SURFOBJ* Mask, 
 	XLATEOBJ* ColorTranslation,
 	XLATEOBJ* SrcColorTranslation,
@@ -840,11 +793,12 @@ AlphaBltMask(SURFOBJ* Dest,
 		{
 			if(*lMask == 0xff)
 			{
-				DestGDI->DIB_PutPixel(Dest, DestRect->left + i, DestRect->top + j, Brush->iSolidColor);
+				DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_PutPixel(
+					Dest, DestRect->left + i, DestRect->top + j, Brush->iSolidColor);
 			}
 			else
 			{
-				Background = DIB_GetSource(Dest, DestGDI, DestRect->left + i, DestRect->top + j, SrcColorTranslation);
+				Background = DIB_GetSource(Dest, DestRect->left + i, DestRect->top + j, SrcColorTranslation);
 
 				NewColor = 
 				     RGB((*lMask * (r - GetRValue(Background)) >> 8) + GetRValue(Background),
@@ -852,7 +806,8 @@ AlphaBltMask(SURFOBJ* Dest,
 				         (*lMask * (b - GetBValue(Background)) >> 8) + GetBValue(Background));
 				
 				Background = XLATEOBJ_iXlate(ColorTranslation, NewColor);
-				DestGDI->DIB_PutPixel(Dest, DestRect->left + i, DestRect->top + j, Background);
+				DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_PutPixel(
+					Dest, DestRect->left + i, DestRect->top + j, Background);
 			}
 		}
 		  lMask++;
@@ -883,8 +838,6 @@ EngMaskBitBlt(SURFOBJ *DestObj,
   RECTL              CombinedRect;
   RECT_ENUM          RectEnum;
   BOOL               EnumMore;
-  SURFGDI*           OutputGDI;
-  SURFGDI*           InputGDI;
   POINTL             InputPoint;
   RECTL              InputRect;
   RECTL              OutputRect;
@@ -898,7 +851,6 @@ EngMaskBitBlt(SURFOBJ *DestObj,
   unsigned           i;
   POINTL             Pt;
   ULONG              Direction;
-  SURFGDI*           DestGDI;
   POINTL             AdjustedBrushOrigin;
 
   if (NULL != SourcePoint)
@@ -916,11 +868,8 @@ EngMaskBitBlt(SURFOBJ *DestObj,
     InputRect.bottom = DestRect->bottom - DestRect->top;
     }
 
-  DestGDI = (SURFGDI*)AccessInternalObjectFromUserObject(DestObj);
-  IntLockGDIDriver(DestGDI);
   if (! IntEngEnter(&EnterLeaveSource, NULL, &InputRect, TRUE, &Translate, &InputObj))
     {
-    IntUnLockGDIDriver(DestGDI);
     return FALSE;
     }
 
@@ -935,15 +884,6 @@ EngMaskBitBlt(SURFOBJ *DestObj,
     InputPoint.y = 0;
     }
 
-  if (NULL != InputObj)
-    {
-    InputGDI = (SURFGDI*) AccessInternalObjectFromUserObject(InputObj);
-    }
-  else
-    {
-      InputGDI = NULL;
-    }
-
   OutputRect = *DestRect;
   if (NULL != ClipRegion)
     {
@@ -976,14 +916,12 @@ EngMaskBitBlt(SURFOBJ *DestObj,
   if (OutputRect.right <= OutputRect.left || OutputRect.bottom <= OutputRect.top)
     {
     IntEngLeave(&EnterLeaveSource);
-    IntUnLockGDIDriver(DestGDI);
     return TRUE;
     }
 
   if (! IntEngEnter(&EnterLeaveDest, DestObj, &OutputRect, FALSE, &Translate, &OutputObj))
     {
     IntEngLeave(&EnterLeaveSource);
-    IntUnLockGDIDriver(DestGDI);
     return FALSE;
     }
 
@@ -1000,11 +938,6 @@ EngMaskBitBlt(SURFOBJ *DestObj,
   else
     AdjustedBrushOrigin = Translate;
 
-  if (NULL != OutputObj)
-    {
-    OutputGDI = (SURFGDI*)AccessInternalObjectFromUserObject(OutputObj);
-    }
-
   // Determine clipping type
   if (ClipRegion == (CLIPOBJ *) NULL)
   {
@@ -1017,10 +950,10 @@ EngMaskBitBlt(SURFOBJ *DestObj,
   {
     case DC_TRIVIAL:
       if(Mask->iBitmapFormat == BMF_8BPP)
-        Ret = AlphaBltMask(OutputObj, OutputGDI, InputObj, InputGDI, Mask, DestColorTranslation, SourceColorTranslation,
+        Ret = AlphaBltMask(OutputObj, InputObj, Mask, DestColorTranslation, SourceColorTranslation,
                            &OutputRect, &InputPoint, MaskOrigin, Brush, &AdjustedBrushOrigin);
       else
-        Ret = BltMask(OutputObj, OutputGDI, InputObj, InputGDI, Mask, DestColorTranslation,
+        Ret = BltMask(OutputObj, InputObj, Mask, DestColorTranslation,
                            &OutputRect, &InputPoint, MaskOrigin, Brush, &AdjustedBrushOrigin, 0xAACC);
       break;
     case DC_RECT:
@@ -1033,10 +966,10 @@ EngMaskBitBlt(SURFOBJ *DestObj,
       Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left;
       Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top;
       if(Mask->iBitmapFormat == BMF_8BPP)
-        Ret = AlphaBltMask(OutputObj, OutputGDI, InputObj, InputGDI, Mask, DestColorTranslation, SourceColorTranslation,
+        Ret = AlphaBltMask(OutputObj, InputObj, Mask, DestColorTranslation, SourceColorTranslation,
                            &CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin);
       else
-        Ret = BltMask(OutputObj, OutputGDI, InputObj, InputGDI, Mask, DestColorTranslation,
+        Ret = BltMask(OutputObj, InputObj, Mask, DestColorTranslation,
                            &CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin, 0xAACC);
       break;
     case DC_COMPLEX:
@@ -1071,10 +1004,10 @@ EngMaskBitBlt(SURFOBJ *DestObj,
 	      Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left;
 	      Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top;
 	      if(Mask->iBitmapFormat == BMF_8BPP)
-	        Ret = AlphaBltMask(OutputObj, OutputGDI, InputObj, InputGDI, Mask, DestColorTranslation, SourceColorTranslation,
+	        Ret = AlphaBltMask(OutputObj, InputObj, Mask, DestColorTranslation, SourceColorTranslation,
 	                           &CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin) && Ret;
               else
-                Ret = BltMask(OutputObj, OutputGDI, InputObj, InputGDI, Mask, DestColorTranslation,
+                Ret = BltMask(OutputObj, InputObj, Mask, DestColorTranslation,
                                    &CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin, 0xAACC) && Ret;
 	    }
 	}
@@ -1086,11 +1019,10 @@ EngMaskBitBlt(SURFOBJ *DestObj,
   IntEngLeave(&EnterLeaveDest);
   IntEngLeave(&EnterLeaveSource);
 
-  IntUnLockGDIDriver(DestGDI);
-
   /* Dummy BitBlt to let driver know that something has changed.
      0x00AA0029 is the Rop for D (no-op) */
-  IntEngBitBlt(DestObj, NULL, Mask, ClipRegion, DestColorTranslation,
+  /* FIXME: Remove the typecast! */
+  IntEngBitBlt((BITMAPOBJ*)DestObj, NULL, (BITMAPOBJ*)Mask, ClipRegion, DestColorTranslation,
                DestRect, SourcePoint, MaskOrigin, Brush, BrushOrigin, ROP_NOOP);
 
   return Ret;
@@ -1109,7 +1041,6 @@ IntEngMaskBlt(SURFOBJ *DestObj,
              POINTL *BrushOrigin)
 {
   BOOLEAN ret;
-  SURFGDI *DestGDI;
   RECTL OutputRect;
   POINTL InputPoint;
 
@@ -1136,14 +1067,13 @@ IntEngMaskBlt(SURFOBJ *DestObj,
 
   /* No success yet */
   ret = FALSE;
-  DestGDI = (SURFGDI*)AccessInternalObjectFromUserObject(DestObj);
-  MouseSafetyOnDrawStart(DestObj, DestGDI, OutputRect.left, OutputRect.top,
+  MouseSafetyOnDrawStart(DestObj, OutputRect.left, OutputRect.top,
                          OutputRect.right, OutputRect.bottom);
 
   ret = EngMaskBitBlt(DestObj, Mask, ClipRegion, DestColorTranslation, SourceColorTranslation,
                       &OutputRect, &InputPoint, MaskOrigin, Brush, BrushOrigin);
 
-  MouseSafetyOnDrawEnd(DestObj, DestGDI);
+  MouseSafetyOnDrawEnd(DestObj);
 
   return ret;
 }
diff --git a/reactos/subsys/win32k/eng/brush.h b/reactos/subsys/win32k/eng/brush.h
deleted file mode 100644
index a919275db17..00000000000
--- a/reactos/subsys/win32k/eng/brush.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- *  ReactOS kernel
- *  Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-/* $Id: brush.h,v 1.3 2003/05/18 17:16:17 ea Exp $ */
-typedef struct  _BRUSHINST
-{
-  // We need to removed ajC0-3 when color pattern code is complete!!!
-  //
-  BYTE    ajC0[8];  // Color bits for plane 0
-  BYTE    ajC1[8];  // Color bits for plane 1
-  BYTE    ajC2[8];  // Color bits for plane 2
-  BYTE    ajC3[8];  // Color bits for plane 3
-
-  BYTE    ajPattern[32];       // Color bits for the mask
-  USHORT  usStyle;  // Brush style
-  BYTE    fjAccel;  // Accelerator flags
-  BYTE    jFgColor; // Current foreground color
-  BYTE    jBkColor; // Current background color
-  BYTE    RealWidth;//
-  BYTE    YShiftValue;       //
-  BYTE    jOldBrushRealized; //
-  DWORD   Width;    // Width of brush
-  DWORD   Height;
-  BYTE    *pPattern;     //Pointer to realized mono pattern
-} BRUSHINST;
-
-#define BRI_SOLID           0
-#define BRI_HOLLOW          1
-#define BRI_HATCHED         2
-#define BRI_PATTERN         3
-#define BRI_MONO_PATTERN    4
-#define BRI_COLOR_PATTERN   5
-
-//      Definitions for the pcol_C3 byte of the physical color
-//
-//      Some of these definitions have limitations as to when they
-//      are valid.  They are as follows:
-//
-//      C0_BIT          color device, phys color, solid brushes if SOLID_COLOR
-//      C1_BIT          color device, phys color, solid brushes if SOLID_COLOR
-//      C2_BIT          color device, phys color, solid brushes if SOLID_COLOR
-//      C3_BIT          color device, phys color, solid brushes if SOLID_COLOR
-//      MONO_BIT        mono  device, phys color
-//      ONES_OR_ZEROS   color device, phys color, solid brushes if SOLID_COLOR
-//      GREY_SCALE      color device, dithered solid and hatched brushes
-//      SOLID_BRUSH     color device, solid brush qualifier
-//
-//      There may be brushes where the accelerators could have been set,
-//      but wasn't.  That's life.
-
-#define C0_BIT          0x01            // C0 color
-#define C1_BIT          0x02            // C1 color
-#define C2_BIT          0x04            // C2 color
-#define C3_BIT          0x08            // C3 color
-#define COLOR_BITS      0x0f            // All the color bits
-#define MONO_BIT        0x10            // Monochrome bit
-#define ONES_OR_ZEROS   0x20            // Color is really all 1's or all 0's
-#define GREY_SCALE      0x40            // Indicates a real grey scale brush
-#define SOLID_BRUSH     0x80            // Indicates a solid color brush
-
-#define PTRI_INVERT     0x0001
-#define PTRI_ANIMATE    0x0002
diff --git a/reactos/subsys/win32k/eng/copybits.c b/reactos/subsys/win32k/eng/copybits.c
index 445ce052dc1..94b45914de0 100644
--- a/reactos/subsys/win32k/eng/copybits.c
+++ b/reactos/subsys/win32k/eng/copybits.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: copybits.c,v 1.24 2004/05/10 17:07:17 weiden Exp $
+/* $Id: copybits.c,v 1.25 2004/07/03 13:55:35 navaraf Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -40,8 +40,6 @@ EngCopyBits(SURFOBJ *Dest,
 	    POINTL *SourcePoint)
 {
   BOOLEAN   ret;
-  PSURFGDI DestGDI  = (PSURFGDI)AccessInternalObjectFromUserObject(Dest),
-           SourceGDI = (PSURFGDI)AccessInternalObjectFromUserObject(Source);
   BYTE      clippingType;
   RECTL     rclTmp;
   POINTL    ptlTmp;
@@ -49,10 +47,10 @@ EngCopyBits(SURFOBJ *Dest,
   BOOL      EnumMore;
   POINTL BrushOrigin;
 
-  MouseSafetyOnDrawStart(Source, SourceGDI, SourcePoint->x, SourcePoint->y,
+  MouseSafetyOnDrawStart(Source, SourcePoint->x, SourcePoint->y,
                          (SourcePoint->x + abs(DestRect->right - DestRect->left)),
                          (SourcePoint->y + abs(DestRect->bottom - DestRect->top)));
-  MouseSafetyOnDrawStart(Dest, DestGDI, DestRect->left, DestRect->top, DestRect->right, DestRect->bottom);
+  MouseSafetyOnDrawStart(Dest, DestRect->left, DestRect->top, DestRect->right, DestRect->bottom);
 
   // FIXME: Don't punt to the driver's DrvCopyBits immediately. Instead,
   //        mark the copy block function to be DrvCopyBits instead of the
@@ -65,16 +63,15 @@ EngCopyBits(SURFOBJ *Dest,
     // Destination surface is device managed
     if(Dest->iType!=STYPE_BITMAP)
     {
-      DestGDI = (PSURFGDI)AccessInternalObjectFromUserObject(Dest);
-
-      if (DestGDI->CopyBits!=NULL)
+      /* FIXME: Eng* functions shouldn't call Drv* functions. ? */
+      /* FIXME: Remove typecast. */
+      if (((BITMAPOBJ*)Dest)->flHooks & HOOK_COPYBITS)
       {
-        IntLockGDIDriver(DestGDI);
-        ret = DestGDI->CopyBits(Dest, Source, Clip, ColorTranslation, DestRect, SourcePoint);
-        IntUnLockGDIDriver(DestGDI);
+        ret = GDIDEVFUNCS(Dest).CopyBits(
+          Dest, Source, Clip, ColorTranslation, DestRect, SourcePoint);
 
-        MouseSafetyOnDrawEnd(Dest, DestGDI);
-        MouseSafetyOnDrawEnd(Source, SourceGDI);
+        MouseSafetyOnDrawEnd(Dest);
+        MouseSafetyOnDrawEnd(Source);
 
         return ret;
       }
@@ -83,28 +80,28 @@ EngCopyBits(SURFOBJ *Dest,
     // Source surface is device managed
     if(Source->iType!=STYPE_BITMAP)
     {
-      SourceGDI = (PSURFGDI)AccessInternalObjectFromUserObject(Source);
-
-      if (SourceGDI->CopyBits!=NULL)
+      /* FIXME: Eng* functions shouldn't call Drv* functions. ? */
+      /* FIXME: Remove typecast. */
+      if (((BITMAPOBJ*)Source)->flHooks & HOOK_COPYBITS)
       {
-        IntLockGDIDriver(DestGDI);
-        ret = SourceGDI->CopyBits(Dest, Source, Clip, ColorTranslation, DestRect, SourcePoint);
-        IntUnLockGDIDriver(DestGDI);
+        ret = GDIDEVFUNCS(Source).CopyBits(
+          Dest, Source, Clip, ColorTranslation, DestRect, SourcePoint);
 
-        MouseSafetyOnDrawEnd(Dest, DestGDI);
-        MouseSafetyOnDrawEnd(Source, SourceGDI);
+        MouseSafetyOnDrawEnd(Dest);
+        MouseSafetyOnDrawEnd(Source);
 
         return ret;
       }
     }
 
     // If CopyBits wasn't hooked, BitBlt must be
-    ret = EngBitBlt(Dest, Source,
-                    NULL, Clip, ColorTranslation, DestRect, SourcePoint,
-                    NULL, NULL, NULL, 0);
+    /* FIXME: Remove the typecast! */
+    ret = IntEngBitBlt((BITMAPOBJ*)Dest, (BITMAPOBJ*)Source,
+                       NULL, Clip, ColorTranslation, DestRect, SourcePoint,
+                       NULL, NULL, NULL, 0);
 
-    MouseSafetyOnDrawEnd(Dest, DestGDI);
-    MouseSafetyOnDrawEnd(Source, SourceGDI);
+    MouseSafetyOnDrawEnd(Dest);
+    MouseSafetyOnDrawEnd(Source);
 
     return ret;
   }
@@ -117,18 +114,16 @@ EngCopyBits(SURFOBJ *Dest,
     clippingType = Clip->iDComplexity;
   }
 
-  SourceGDI = (PSURFGDI)AccessInternalObjectFromUserObject(Source);
-  DestGDI   = (PSURFGDI)AccessInternalObjectFromUserObject(Dest);
-
   BrushOrigin.x = BrushOrigin.y = 0;
 
   switch(clippingType)
     {
       case DC_TRIVIAL:
-        DestGDI->DIB_BitBlt(Dest, Source, DestGDI, SourceGDI, DestRect, SourcePoint, NULL, BrushOrigin, ColorTranslation, SRCCOPY);
+        DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_BitBlt(
+          Dest, Source, DestRect, SourcePoint, NULL, BrushOrigin, ColorTranslation, SRCCOPY);
 
-        MouseSafetyOnDrawEnd(Dest, DestGDI);
-        MouseSafetyOnDrawEnd(Source, SourceGDI);
+        MouseSafetyOnDrawEnd(Dest);
+        MouseSafetyOnDrawEnd(Source);
 
         return(TRUE);
 
@@ -139,10 +134,11 @@ EngCopyBits(SURFOBJ *Dest,
         ptlTmp.x = SourcePoint->x + rclTmp.left - DestRect->left;
         ptlTmp.y = SourcePoint->y + rclTmp.top  - DestRect->top;
 
-        DestGDI->DIB_BitBlt(Dest, Source, DestGDI, SourceGDI, &rclTmp, &ptlTmp, NULL, BrushOrigin, ColorTranslation, SRCCOPY);
+        DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_BitBlt(
+          Dest, Source, &rclTmp, &ptlTmp, NULL, BrushOrigin, ColorTranslation, SRCCOPY);
 
-        MouseSafetyOnDrawEnd(Dest, DestGDI);
-        MouseSafetyOnDrawEnd(Source, SourceGDI);
+        MouseSafetyOnDrawEnd(Dest);
+        MouseSafetyOnDrawEnd(Source);
 
         return(TRUE);
 
@@ -164,8 +160,8 @@ EngCopyBits(SURFOBJ *Dest,
               ptlTmp.x = SourcePoint->x + prcl->left - DestRect->left;
               ptlTmp.y = SourcePoint->y + prcl->top - DestRect->top;
 
-              if(!DestGDI->DIB_BitBlt(Dest, Source, DestGDI, SourceGDI,
-                                      prcl, &ptlTmp, NULL, BrushOrigin, ColorTranslation, SRCCOPY)) return FALSE;
+              if(!DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_BitBlt(
+                    Dest, Source, prcl, &ptlTmp, NULL, BrushOrigin, ColorTranslation, SRCCOPY)) return FALSE;
 
               prcl++;
 
@@ -174,14 +170,14 @@ EngCopyBits(SURFOBJ *Dest,
 
           } while(EnumMore);
 
-          MouseSafetyOnDrawEnd(Dest, DestGDI);
-          MouseSafetyOnDrawEnd(Source, SourceGDI);
+          MouseSafetyOnDrawEnd(Dest);
+          MouseSafetyOnDrawEnd(Source);
 
           return(TRUE);
     }
 
-  MouseSafetyOnDrawEnd(Dest, DestGDI);
-  MouseSafetyOnDrawEnd(Source, SourceGDI);
+  MouseSafetyOnDrawEnd(Dest);
+  MouseSafetyOnDrawEnd(Source);
 
   return FALSE;
 }
diff --git a/reactos/subsys/win32k/eng/gradient.c b/reactos/subsys/win32k/eng/gradient.c
index 99f9c150d0f..8a5ab8de25a 100644
--- a/reactos/subsys/win32k/eng/gradient.c
+++ b/reactos/subsys/win32k/eng/gradient.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: gradient.c,v 1.9 2004/05/10 17:07:17 weiden Exp $
+/* $Id: gradient.c,v 1.10 2004/07/03 13:55:35 navaraf Exp $
  * 
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -73,7 +73,6 @@ IntEngGradientFillRect(
     IN BOOL Horizontal)
 {
   SURFOBJ *OutputObj;
-  SURFGDI *OutputGDI;
   TRIVERTEX *v1, *v2;
   RECTL rcGradient, rcSG;
   RECT_ENUM RectEnum;
@@ -106,7 +105,6 @@ IntEngGradientFillRect(
   {
     return FALSE;
   }
-  OutputGDI = AccessInternalObjectFromUserObject(OutputObj);
   
   if((v1->Red != v2->Red || v1->Green != v2->Green || v1->Blue != v2->Blue) && dy > 1)
   {
@@ -132,7 +130,8 @@ IntEngGradientFillRect(
               if(y >= FillRect.left)
               {
                 Color = XLATEOBJ_iXlate(pxlo, RGB(c[0], c[1], c[2]));
-                OutputGDI->DIB_VLine(OutputObj, y, FillRect.top, FillRect.bottom, Color);
+                DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_VLine(
+                  OutputObj, y, FillRect.top, FillRect.bottom, Color);
               }
               HVSTEPCOL(0);
               HVSTEPCOL(1);
@@ -159,7 +158,8 @@ IntEngGradientFillRect(
             if(y >= FillRect.top)
             {
               Color = XLATEOBJ_iXlate(pxlo, RGB(c[0], c[1], c[2]));
-              OutputGDI->DIB_HLine(OutputObj, FillRect.left, FillRect.right, y, Color);
+              DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_HLine(
+                OutputObj, FillRect.left, FillRect.right, y, Color);
             }
             HVSTEPCOL(0);
             HVSTEPCOL(1);
@@ -187,7 +187,8 @@ IntEngGradientFillRect(
       {
         for(; FillRect.top < FillRect.bottom; FillRect.top++)
         {
-          OutputGDI->DIB_HLine(OutputObj, FillRect.left, FillRect.right, FillRect.top, Color);
+          DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_HLine(
+            OutputObj, FillRect.left, FillRect.right, FillRect.top, Color);
         }
       }
     }
@@ -199,9 +200,9 @@ IntEngGradientFillRect(
 /* Fill triangle with solid color */
 #define S_FILLLINE(linefrom,lineto) \
   if(sx[lineto] < sx[linefrom]) \
-    OutputGDI->DIB_HLine(OutputObj, max(sx[lineto], FillRect.left), min(sx[linefrom], FillRect.right), sy, Color); \
+    DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_HLine(OutputObj, max(sx[lineto], FillRect.left), min(sx[linefrom], FillRect.right), sy, Color); \
   else \
-    OutputGDI->DIB_HLine(OutputObj, max(sx[linefrom], FillRect.left), min(sx[lineto], FillRect.right), sy, Color);
+    DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_HLine(OutputObj, max(sx[linefrom], FillRect.left), min(sx[lineto], FillRect.right), sy, Color);
 #define S_DOLINE(a,b,line) \
   ex[line] += dx[line]; \
   while(ex[line] > 0 && x[line] != destx[line]) \
@@ -260,7 +261,7 @@ IntEngGradientFillRect(
     if(InY && g >= FillRect.left && g < FillRect.right) \
     { \
       Color = XLATEOBJ_iXlate(pxlo, RGB(gc[0], gc[1], gc[2])); \
-      OutputGDI->DIB_PutPixel(OutputObj, g, sy, Color); \
+      DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_PutPixel(OutputObj, g, sy, Color); \
     } \
     FDOCOL(linefrom, lineto, 0); \
     FDOCOL(linefrom, lineto, 1); \
@@ -312,7 +313,6 @@ IntEngGradientFillTriangle(
     IN POINTL  *pptlDitherOrg)
 {
   SURFOBJ *OutputObj;
-  SURFGDI *OutputGDI;
   PTRIVERTEX v1, v2, v3;
   RECT_ENUM RectEnum;
   BOOL EnumMore;
@@ -354,7 +354,6 @@ IntEngGradientFillTriangle(
   {
     return FALSE;
   }
-  OutputGDI = AccessInternalObjectFromUserObject(OutputObj);
   
   if(VCMPCLRS(v1, v2, v3))
   {
@@ -517,7 +516,7 @@ EngGradientFill(
 
 BOOL STDCALL
 IntEngGradientFill(
-    IN SURFOBJ  *psoDest,
+    IN BITMAPOBJ  *pboDest,
     IN CLIPOBJ  *pco,
     IN XLATEOBJ  *pxlo,
     IN TRIVERTEX  *pVertex,
@@ -529,18 +528,16 @@ IntEngGradientFill(
     IN ULONG  ulMode)
 {
   BOOL Ret;
-  SURFGDI *SurfGDI;
+  SURFOBJ *psoDest = &pboDest->SurfObj;
   
-  SurfGDI = (SURFGDI*)AccessInternalObjectFromUserObject(psoDest);
-  MouseSafetyOnDrawStart(psoDest, SurfGDI, pco->rclBounds.left, pco->rclBounds.top, 
+  MouseSafetyOnDrawStart(psoDest, pco->rclBounds.left, pco->rclBounds.top, 
                          pco->rclBounds.right, pco->rclBounds.bottom);
-  if((psoDest->iType != STYPE_BITMAP) && SurfGDI->GradientFill)
+  if((psoDest->iType != STYPE_BITMAP) && (pboDest->flHooks & HOOK_GRADIENTFILL))
   {
-    IntLockGDIDriver(SurfGDI);
-    Ret = SurfGDI->GradientFill(psoDest, pco, pxlo, pVertex, nVertex, pMesh, nMesh, 
-                                prclExtents, pptlDitherOrg, ulMode);
-    IntUnLockGDIDriver(SurfGDI);
-    MouseSafetyOnDrawEnd(psoDest, SurfGDI);
+    Ret = GDIDEVFUNCS(psoDest).GradientFill(
+      psoDest, pco, pxlo, pVertex, nVertex, pMesh, nMesh, 
+      prclExtents, pptlDitherOrg, ulMode);
+    MouseSafetyOnDrawEnd(psoDest);
     return Ret;
   }
   Ret = EngGradientFill(psoDest, pco, pxlo, pVertex, nVertex, pMesh, nMesh, prclExtents, 
@@ -549,18 +546,15 @@ IntEngGradientFill(
   {
     /* Dummy BitBlt to let driver know that something has changed.
        0x00AA0029 is the Rop for D (no-op) */
-    if(SurfGDI->BitBlt)
+    if(pboDest->flHooks & HOOK_BITBLT)
     {
-      IntLockGDIDriver(SurfGDI);
-      SurfGDI->BitBlt(psoDest, NULL, NULL, pco, pxlo,
+      GDIDEVFUNCS(psoDest).BitBlt(
+                      psoDest, NULL, NULL, pco, pxlo,
                       prclExtents, pptlDitherOrg, NULL, NULL, NULL, ROP_NOOP);
-      IntUnLockGDIDriver(SurfGDI);
-      MouseSafetyOnDrawEnd(psoDest, SurfGDI);
+      MouseSafetyOnDrawEnd(psoDest);
       return TRUE;
     }
-    EngBitBlt(psoDest, NULL, NULL, pco, pxlo,
-              prclExtents, pptlDitherOrg, NULL, NULL, NULL, ROP_NOOP);
   }
-  MouseSafetyOnDrawEnd(psoDest, SurfGDI);
+  MouseSafetyOnDrawEnd(psoDest);
   return Ret;
 }
diff --git a/reactos/subsys/win32k/eng/lineto.c b/reactos/subsys/win32k/eng/lineto.c
index 20752865cc1..94bd8fee0dd 100644
--- a/reactos/subsys/win32k/eng/lineto.c
+++ b/reactos/subsys/win32k/eng/lineto.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: lineto.c,v 1.33 2004/05/10 17:07:17 weiden Exp $
+ * $Id: lineto.c,v 1.34 2004/07/03 13:55:35 navaraf Exp $
  */
 #include <w32k.h>
 
@@ -41,7 +41,7 @@ TranslateRects(RECT_ENUM *RectEnum, POINTL* Translate)
  * Draw a line from top-left to bottom-right
  */
 static void FASTCALL
-NWtoSE(SURFOBJ* OutputObj, SURFGDI* OutputGDI, CLIPOBJ* Clip,
+NWtoSE(SURFOBJ* OutputObj, CLIPOBJ* Clip,
        BRUSHOBJ* Brush, LONG x, LONG y, LONG deltax, LONG deltay,
        POINTL* Translate)
 {
@@ -83,7 +83,8 @@ NWtoSE(SURFOBJ* OutputObj, SURFGDI* OutputGDI, CLIPOBJ* Clip,
 	{
 	  if (ClipRect->left <= x && ClipRect->top <= y)
 	    {
-	      OutputGDI->DIB_PutPixel(OutputObj, x, y, Pixel);
+              DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_PutPixel(
+                OutputObj, x, y, Pixel);
 	    }
 	  if (deltax < deltay)
 	    {
@@ -111,7 +112,7 @@ NWtoSE(SURFOBJ* OutputObj, SURFGDI* OutputGDI, CLIPOBJ* Clip,
 }
 
 static void FASTCALL
-SWtoNE(SURFOBJ* OutputObj, SURFGDI* OutputGDI, CLIPOBJ* Clip,
+SWtoNE(SURFOBJ* OutputObj, CLIPOBJ* Clip,
        BRUSHOBJ* Brush, LONG x, LONG y, LONG deltax, LONG deltay,
        POINTL* Translate)
 {
@@ -152,7 +153,8 @@ SWtoNE(SURFOBJ* OutputObj, SURFGDI* OutputGDI, CLIPOBJ* Clip,
 	{
 	  if (ClipRect->left <= x && y < ClipRect->bottom)
 	    {
-	      OutputGDI->DIB_PutPixel(OutputObj, x, y, Pixel);
+              DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_PutPixel(
+	        OutputObj, x, y, Pixel);
 	    }
 	  if (deltax < deltay)
 	    {
@@ -180,7 +182,7 @@ SWtoNE(SURFOBJ* OutputObj, SURFGDI* OutputGDI, CLIPOBJ* Clip,
 }
 
 static void FASTCALL
-NEtoSW(SURFOBJ* OutputObj, SURFGDI* OutputGDI, CLIPOBJ* Clip,
+NEtoSW(SURFOBJ* OutputObj, CLIPOBJ* Clip,
        BRUSHOBJ* Brush, LONG x, LONG y, LONG deltax, LONG deltay,
        POINTL* Translate)
 {
@@ -221,7 +223,8 @@ NEtoSW(SURFOBJ* OutputObj, SURFGDI* OutputGDI, CLIPOBJ* Clip,
 	{
 	  if (x < ClipRect->right && ClipRect->top <= y)
 	    {
-	      OutputGDI->DIB_PutPixel(OutputObj, x, y, Pixel);
+              DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_PutPixel(
+	        OutputObj, x, y, Pixel);
 	    }
 	  if (deltax < deltay)
 	    {
@@ -249,7 +252,7 @@ NEtoSW(SURFOBJ* OutputObj, SURFGDI* OutputGDI, CLIPOBJ* Clip,
 }
 
 static void FASTCALL
-SEtoNW(SURFOBJ* OutputObj, SURFGDI* OutputGDI, CLIPOBJ* Clip,
+SEtoNW(SURFOBJ* OutputObj, CLIPOBJ* Clip,
        BRUSHOBJ* Brush, LONG x, LONG y, LONG deltax, LONG deltay,
        POINTL* Translate)
 {
@@ -290,7 +293,8 @@ SEtoNW(SURFOBJ* OutputObj, SURFGDI* OutputGDI, CLIPOBJ* Clip,
 	{
 	  if (x < ClipRect->right && y < ClipRect->bottom)
 	    {
-	      OutputGDI->DIB_PutPixel(OutputObj, x, y, Pixel);
+              DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_PutPixel(
+	        OutputObj, x, y, Pixel);
 	    }
 	  if (deltax < deltay)
 	    {
@@ -335,7 +339,6 @@ EngLineTo(SURFOBJ *DestObj,
   ULONG i;
   ULONG Pixel = Brush->iSolidColor;
   SURFOBJ *OutputObj;
-  SURFGDI *OutputGDI;
   RECTL DestRect;
   POINTL Translate;
   INTENG_ENTER_LEAVE EnterLeave;
@@ -373,8 +376,6 @@ EngLineTo(SURFOBJ *DestObj,
   y1 += Translate.y;
   y2 += Translate.y;
 
-  OutputGDI = AccessInternalObjectFromUserObject(OutputObj);
-
   x = x1;
   y = y1;
   deltax = x2 - x1;
@@ -416,7 +417,8 @@ EngLineTo(SURFOBJ *DestObj,
 	          RectEnum.arcl[i].left + Translate.x <= hx + deltax &&
 	          hx < RectEnum.arcl[i].right + Translate.x)
 		{
-		  OutputGDI->DIB_HLine(OutputObj,
+		  DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_HLine(
+                                       OutputObj,
 		                       max(hx, RectEnum.arcl[i].left + Translate.x),
 		                       min(hx + deltax, RectEnum.arcl[i].right + Translate.x),
 		                       y1, Pixel);
@@ -438,7 +440,8 @@ EngLineTo(SURFOBJ *DestObj,
 	          RectEnum.arcl[i].top + Translate.y <= vy + deltay &&
 	          vy < RectEnum.arcl[i].bottom + Translate.y)
 		{
-		  OutputGDI->DIB_VLine(OutputObj, x1,
+		  DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_VLine(
+		                       OutputObj, x1,
 		                       max(vy, RectEnum.arcl[i].top + Translate.y),
 		                       min(vy + deltay, RectEnum.arcl[i].bottom + Translate.y),
 		                       Pixel);
@@ -453,22 +456,22 @@ EngLineTo(SURFOBJ *DestObj,
 	{
 	  if (0 < ychange)
 	    {
-	      NWtoSE(OutputObj, OutputGDI, Clip, Brush, x, y, deltax, deltay, &Translate);
+	      NWtoSE(OutputObj, Clip, Brush, x, y, deltax, deltay, &Translate);
 	    }
 	  else
 	    {
-	      SWtoNE(OutputObj, OutputGDI, Clip, Brush, x, y, deltax, deltay, &Translate);
+	      SWtoNE(OutputObj, Clip, Brush, x, y, deltax, deltay, &Translate);
 	    }
 	}
       else
 	{
 	  if (0 < ychange)
 	    {
-	      NEtoSW(OutputObj, OutputGDI, Clip, Brush, x, y, deltax, deltay, &Translate);
+	      NEtoSW(OutputObj, Clip, Brush, x, y, deltax, deltay, &Translate);
 	    }
 	  else
 	    {
-	      SEtoNW(OutputObj, OutputGDI, Clip, Brush, x, y, deltax, deltay, &Translate);
+	      SEtoNW(OutputObj, Clip, Brush, x, y, deltax, deltay, &Translate);
 	    }
 	}
     }
@@ -477,7 +480,7 @@ EngLineTo(SURFOBJ *DestObj,
 }
 
 BOOL STDCALL
-IntEngLineTo(SURFOBJ *DestSurf,
+IntEngLineTo(BITMAPOBJ *DestObj,
 	     CLIPOBJ *Clip,
 	     BRUSHOBJ *Brush,
 	     LONG x1,
@@ -488,7 +491,7 @@ IntEngLineTo(SURFOBJ *DestSurf,
 	     MIX mix)
 {
   BOOLEAN ret;
-  SURFGDI *SurfGDI;
+  SURFOBJ *DestSurf = &DestObj->SurfObj;
   PGDIBRUSHOBJ GdiBrush;
   RECTL b;
 
@@ -502,7 +505,6 @@ IntEngLineTo(SURFOBJ *DestSurf,
 
   /* No success yet */
   ret = FALSE;
-  SurfGDI = (SURFGDI*)AccessInternalObjectFromUserObject(DestSurf);
 
   b.left = min(x1, x2);
   b.right = max(x1, x2);
@@ -510,18 +512,17 @@ IntEngLineTo(SURFOBJ *DestSurf,
   b.bottom = max(y1, y2);
   if (b.left == b.right) b.right++;
   if (b.top == b.bottom) b.bottom++;
-  MouseSafetyOnDrawStart(DestSurf, SurfGDI, x1, y1, x2, y2);
+  MouseSafetyOnDrawStart(DestSurf, x1, y1, x2, y2);
 
-  if (NULL != SurfGDI->LineTo)
+  if (DestObj->flHooks & HOOK_LINETO)
     {
     /* Call the driver's DrvLineTo */
-    IntLockGDIDriver(SurfGDI);
-    ret = SurfGDI->LineTo(DestSurf, Clip, Brush, x1, y1, x2, y2, /*RectBounds*/&b, mix);
-    IntUnLockGDIDriver(SurfGDI);
+    ret = GDIDEVFUNCS(DestSurf).LineTo(
+      DestSurf, Clip, Brush, x1, y1, x2, y2, /*RectBounds*/&b, mix);
     }
 
 #if 0
-  if (! ret && NULL != SurfGDI->StrokePath)
+  if (! ret && (DestObj->flHooks & HOOK_STROKEPATH))
     {
       /* FIXME: Emulate LineTo using drivers DrvStrokePath and set ret on success */
     }
@@ -532,13 +533,13 @@ IntEngLineTo(SURFOBJ *DestSurf,
       ret = EngLineTo(DestSurf, Clip, Brush, x1, y1, x2, y2, RectBounds, mix);
     }
 
-  MouseSafetyOnDrawEnd(DestSurf, SurfGDI);
+  MouseSafetyOnDrawEnd(DestSurf);
 
   return ret;
 }
 
 BOOL STDCALL
-IntEngPolyline(SURFOBJ *DestSurf,
+IntEngPolyline(BITMAPOBJ *DestObj,
 	       CLIPOBJ *Clip,
 	       BRUSHOBJ *Brush,
 	       CONST LPPOINT  pt,
@@ -556,7 +557,7 @@ IntEngPolyline(SURFOBJ *DestSurf,
       rect.top = min(pt[i-1].y, pt[i].y);
       rect.right = max(pt[i-1].x, pt[i].x);
       rect.bottom = max(pt[i-1].y, pt[i].y);
-      ret = IntEngLineTo(DestSurf,
+      ret = IntEngLineTo(DestObj,
 	                 Clip,
 	                 Brush,
                          pt[i-1].x,
diff --git a/reactos/subsys/win32k/eng/misc.c b/reactos/subsys/win32k/eng/misc.c
index 624d2a3ee69..3288c27bed2 100644
--- a/reactos/subsys/win32k/eng/misc.c
+++ b/reactos/subsys/win32k/eng/misc.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: misc.c,v 1.7 2004/06/24 19:43:48 gvg Exp $ */
+/* $Id: misc.c,v 1.8 2004/07/03 13:55:35 navaraf Exp $ */
 #include <w32k.h>
 
 BOOL STDCALL
@@ -50,9 +50,9 @@ IntEngEnter(PINTENG_ENTER_LEAVE EnterLeave,
   if (NULL != DestObj && STYPE_BITMAP != DestObj->iType &&
       (NULL == DestObj->pvScan0 || 0 == DestObj->lDelta))
     {
-    EnterLeave->DestGDI = (SURFGDI*)AccessInternalObjectFromUserObject(DestObj);
     /* Driver needs to support DrvCopyBits, else we can't do anything */
-    if (NULL == EnterLeave->DestGDI->CopyBits)
+    /* FIXME: Remove typecast! */
+    if (!(((BITMAPOBJ*)DestObj)->flHooks & HOOK_COPYBITS))
       {
       return FALSE;
       }
@@ -64,7 +64,7 @@ IntEngEnter(PINTENG_ENTER_LEAVE EnterLeave,
     EnterLeave->OutputBitmap = EngCreateBitmap(BitmapSize, Width,
                                                DestObj->iBitmapFormat,
                                                BMF_TOPDOWN | BMF_NOZEROINIT, NULL);
-    *OutputObj = (SURFOBJ *) AccessUserObject((ULONG) EnterLeave->OutputBitmap);
+    *OutputObj = EngLockSurface((HSURF)EnterLeave->OutputBitmap);
 
     EnterLeave->DestRect.left = 0;
     EnterLeave->DestRect.top = 0;
@@ -99,7 +99,8 @@ IntEngEnter(PINTENG_ENTER_LEAVE EnterLeave,
         ClippedDestRect.top <= (*OutputObj)->sizlBitmap.cy &&
         0 <= ClippedDestRect.bottom &&
         SrcPoint.y < DestObj->sizlBitmap.cy &&
-        ! EnterLeave->DestGDI->CopyBits(*OutputObj, DestObj,
+        ! GDIDEVFUNCS(DestObj).CopyBits(
+                                        *OutputObj, DestObj,
                                         EnterLeave->TrivialClipObj, NULL,
                                         &ClippedDestRect, &SrcPoint))
       {
@@ -166,7 +167,8 @@ IntEngLeave(PINTENG_ENTER_LEAVE EnterLeave)
           EnterLeave->DestRect.top <= EnterLeave->DestRect.bottom &&
           EnterLeave->DestRect.top < EnterLeave->DestObj->sizlBitmap.cy)
         {
-          Result = EnterLeave->DestGDI->CopyBits(EnterLeave->DestObj,
+          Result = GDIDEVFUNCS(EnterLeave->DestObj).CopyBits(
+                                                 EnterLeave->DestObj,
                                                  EnterLeave->OutputObj,
                                                  EnterLeave->TrivialClipObj, NULL,
                                                  &EnterLeave->DestRect, &SrcPoint);
@@ -177,6 +179,7 @@ IntEngLeave(PINTENG_ENTER_LEAVE EnterLeave)
         }
       }
     EngFreeMem(EnterLeave->OutputObj->pvBits);
+    EngUnlockSurface(EnterLeave->OutputObj);
     EngDeleteSurface((HSURF)EnterLeave->OutputBitmap);
     EngDeleteClip(EnterLeave->TrivialClipObj);
     }
diff --git a/reactos/subsys/win32k/eng/misc.h b/reactos/subsys/win32k/eng/misc.h
index 87230a73edb..6b0aff25aad 100644
--- a/reactos/subsys/win32k/eng/misc.h
+++ b/reactos/subsys/win32k/eng/misc.h
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: misc.h,v 1.2 2003/05/18 17:16:17 ea Exp $ */
+/* $Id: misc.h,v 1.3 2004/07/03 13:55:35 navaraf Exp $ */
 #ifndef __ENG_MISC_H
 #define __ENG_MISC_H
 
@@ -28,7 +28,6 @@ typedef struct INTENG_ENTER_LEAVE_TAG
   {
   /* Contents is private to EngEnter/EngLeave */
   SURFOBJ *DestObj;
-  SURFGDI *DestGDI;
   SURFOBJ *OutputObj;
   HBITMAP OutputBitmap;
   CLIPOBJ *TrivialClipObj;
diff --git a/reactos/subsys/win32k/eng/mouse.c b/reactos/subsys/win32k/eng/mouse.c
index f4cb162aa09..3dc43862994 100644
--- a/reactos/subsys/win32k/eng/mouse.c
+++ b/reactos/subsys/win32k/eng/mouse.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: mouse.c,v 1.73 2004/06/24 19:43:48 gvg Exp $
+/* $Id: mouse.c,v 1.74 2004/07/03 13:55:35 navaraf Exp $
  *
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Mouse
@@ -31,14 +31,14 @@
 /* FUNCTIONS *****************************************************************/
 
 BOOL FASTCALL
-IntIsPrimarySurface(PSURFGDI SurfGDI);
+IntIsPrimarySurface(SURFOBJ *SurfObj);
 
 VOID FASTCALL
 EnableMouse(HDC hDisplayDC)
 {
   PDC dc;
-  SURFOBJ *SurfObj;
-  PSURFGDI SurfGDI;
+  BITMAPOBJ *BitmapObj;
+  GDIDEVICE *GdiDev;
   PSYSTEM_CURSORINFO CurInfo = IntGetSysCursorInfo(InputWindowStation);
 
   if( hDisplayDC && InputWindowStation)
@@ -50,22 +50,25 @@ EnableMouse(HDC hDisplayDC)
     }
     
     dc = DC_LockDc(hDisplayDC);
-    SurfObj = (SURFOBJ*)AccessUserObject((ULONG) dc->Surface);
-    DC_UnlockDc( hDisplayDC );
-    
-    ASSERT(SurfObj);
-    SurfGDI = (PSURFGDI)AccessInternalObjectFromUserObject(SurfObj);
+    ASSERT(dc);
+    BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap);
+    ASSERT(BitmapObj);
     
     /* Move the cursor to the screen center */
     DPRINT("Setting Cursor up at 0x%x, 0x%x\n", SurfObj->sizlBitmap.cx / 2, SurfObj->sizlBitmap.cy / 2);
     ExAcquireFastMutex(&CurInfo->CursorMutex);
-    CurInfo->x = SurfObj->sizlBitmap.cx / 2;
-    CurInfo->y = SurfObj->sizlBitmap.cy / 2;
+    CurInfo->x = BitmapObj->SurfObj.sizlBitmap.cx / 2;
+    CurInfo->y = BitmapObj->SurfObj.sizlBitmap.cy / 2;
     ExReleaseFastMutex(&CurInfo->CursorMutex);
+
+    GdiDev = GDIDEV(&BitmapObj->SurfObj);
+    BITMAPOBJ_UnlockBitmap(dc->w.hBitmap);
+    DC_UnlockDc( hDisplayDC );
+
     IntSetCursor(InputWindowStation, NULL, TRUE);
     
-    CurInfo->Enabled = (SPS_ACCEPT_EXCLUDE == SurfGDI->PointerStatus ||
-                        SPS_ACCEPT_NOEXCLUDE == SurfGDI->PointerStatus);
+    CurInfo->Enabled = (SPS_ACCEPT_EXCLUDE == GdiDev->PointerStatus ||
+                        SPS_ACCEPT_NOEXCLUDE == GdiDev->PointerStatus);
 
     IntLoadDefaultCursors();
     
@@ -85,7 +88,7 @@ EnableMouse(HDC hDisplayDC)
 }
 
 INT FASTCALL
-MouseSafetyOnDrawStart(SURFOBJ *SurfObj, PSURFGDI SurfGDI, LONG HazardX1,
+MouseSafetyOnDrawStart(SURFOBJ *SurfObj, LONG HazardX1,
 		       LONG HazardY1, LONG HazardX2, LONG HazardY2)
 /*
  * FUNCTION: Notify the mouse driver that drawing is about to begin in
@@ -114,13 +117,13 @@ MouseSafetyOnDrawStart(SURFOBJ *SurfObj, PSURFGDI SurfGDI, LONG HazardX1,
       ObDereferenceObject(InputWindowStation);
       return(FALSE);
     }
-  if (!IntIsPrimarySurface(SurfGDI) || MouseEnabled == FALSE)
+  if (!IntIsPrimarySurface(SurfObj) || MouseEnabled == FALSE)
     {
       ObDereferenceObject(InputWindowStation);
       return(FALSE);
     }
 
-  if (SPS_ACCEPT_NOEXCLUDE == SurfGDI->PointerStatus)
+  if (SPS_ACCEPT_NOEXCLUDE == GDIDEV(SurfObj)->PointerStatus)
     {
       /* Hardware cursor, no need to remove it */
       ObDereferenceObject(InputWindowStation);
@@ -157,9 +160,10 @@ MouseSafetyOnDrawStart(SURFOBJ *SurfObj, PSURFGDI SurfGDI, LONG HazardX1,
           return FALSE;
         }
       CurInfo->SafetySwitch = TRUE;
-      IntLockGDIDriver(SurfGDI);
-      SurfGDI->MovePointer(SurfObj, -1, -1, NULL);
-      IntUnLockGDIDriver(SurfGDI);
+      if (GDIDEVFUNCS(SurfObj).MovePointer)
+         GDIDEVFUNCS(SurfObj).MovePointer(SurfObj, -1, -1, NULL);
+      else
+         EngMovePointer(SurfObj, -1, -1, NULL);
       ExReleaseFastMutex(&CurInfo->CursorMutex);
     }
     
@@ -177,7 +181,7 @@ SetPointerRect(PSYSTEM_CURSORINFO CurInfo, PRECTL PointerRect)
 }
 
 INT FASTCALL
-MouseSafetyOnDrawEnd(SURFOBJ *SurfObj, SURFGDI *SurfGDI)
+MouseSafetyOnDrawEnd(SURFOBJ *SurfObj)
 /*
  * FUNCTION: Notify the mouse driver that drawing has finished on a surface.
  */
@@ -202,14 +206,14 @@ MouseSafetyOnDrawEnd(SURFOBJ *SurfObj, SURFGDI *SurfGDI)
   }
   
   MouseEnabled = CurInfo->Enabled && CurInfo->ShowingCursor;
-  if (!IntIsPrimarySurface(SurfGDI) || MouseEnabled == FALSE)
+  if (!IntIsPrimarySurface(SurfObj) || MouseEnabled == FALSE)
     {
       ExReleaseFastMutex(&CurInfo->CursorMutex);
       ObDereferenceObject(InputWindowStation);
       return(FALSE);
     }
 
-  if (SPS_ACCEPT_NOEXCLUDE == SurfGDI->PointerStatus)
+  if (SPS_ACCEPT_NOEXCLUDE == GDIDEV(SurfObj)->PointerStatus)
     {
       /* Hardware cursor, it wasn't removed so need to restore it */
       ExReleaseFastMutex(&CurInfo->CursorMutex);
@@ -226,9 +230,10 @@ MouseSafetyOnDrawEnd(SURFOBJ *SurfObj, SURFGDI *SurfGDI)
           ObDereferenceObject(InputWindowStation);
           return FALSE;
         }
-      IntLockGDIDriver(SurfGDI);
-      SurfGDI->MovePointer(SurfObj, CurInfo->x, CurInfo->y, &PointerRect);
-      IntUnLockGDIDriver(SurfGDI);
+      if (GDIDEVFUNCS(SurfObj).MovePointer)
+         GDIDEVFUNCS(SurfObj).MovePointer(SurfObj, CurInfo->x, CurInfo->y, &PointerRect);
+      else
+         EngMovePointer(SurfObj, CurInfo->x, CurInfo->y, &PointerRect);
       SetPointerRect(CurInfo, &PointerRect);
       CurInfo->SafetySwitch = FALSE;
     }
@@ -532,8 +537,8 @@ EngSetPointerShape(
 
    ppdev->PointerAttributes.Column = x - xHot;
    ppdev->PointerAttributes.Row = y - yHot;
-   ppdev->PointerAttributes.Width = psoMask->lDelta << 3;
-   ppdev->PointerAttributes.Height = (psoMask->cjBits / psoMask->lDelta) >> 1;
+   ppdev->PointerAttributes.Width = abs(psoMask->lDelta) << 3;
+   ppdev->PointerAttributes.Height = (psoMask->cjBits / abs(psoMask->lDelta)) >> 1;
 
    if (prcl != NULL)
    {
@@ -554,7 +559,8 @@ EngSetPointerShape(
       memcpy(Bits, psoColor->pvBits, psoColor->cjBits);
 
       ppdev->PointerColorSurface = (HSURF)EngCreateBitmap(Size,
-         psoColor->lDelta, psoColor->iBitmapFormat, BMF_TOPDOWN, Bits);
+         psoColor->lDelta, psoColor->iBitmapFormat,
+         psoColor->lDelta < 0 ? 0 : BMF_TOPDOWN, Bits);
    }
    else
    {
@@ -571,11 +577,12 @@ EngSetPointerShape(
       memcpy(Bits, psoMask->pvBits, psoMask->cjBits);
 
       ppdev->PointerMaskSurface = (HSURF)EngCreateBitmap(Size,
-         psoMask->lDelta, psoMask->iBitmapFormat, BMF_TOPDOWN, Bits);
+         psoMask->lDelta, psoMask->iBitmapFormat,
+         psoMask->lDelta < 0 ? 0 : BMF_TOPDOWN, Bits);
    }
 
    /*
-    * Create and XLATEOBJ that will be used for drawing masks.
+    * Create an XLATEOBJ that will be used for drawing masks.
     * FIXME: We should get this in pxlo parameter!
     */
 
diff --git a/reactos/subsys/win32k/eng/nls.c b/reactos/subsys/win32k/eng/nls.c
deleted file mode 100644
index 59b195dce1a..00000000000
--- a/reactos/subsys/win32k/eng/nls.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *  ReactOS W32 Subsystem
- *  Copyright (C) 2003 ReactOS Team
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-/* $Id: nls.c,v 1.4 2004/05/10 17:07:17 weiden Exp $
- *
- * COPYRIGHT:        See COPYING in the top level directory
- * PROJECT:          ReactOS kernel
- * PURPOSE:          NLS functions
- * FILE:             subsys/win32k/eng/nls.c
- * PROGRAMER:        Eric Kohl
- * REVISION HISTORY:
- *        6/21/2003: Created
- */
-
-/* INCLUDES *****************************************************************/
-#include <w32k.h>
-
-/* FUNCTIONS ****************************************************************/
-
-/*
- * @implemented
- */
-VOID STDCALL
-EngGetCurrentCodePage(OUT PUSHORT OemCodePage,
-		      OUT PUSHORT AnsiCodePage)
-{
-  RtlGetDefaultCodePage (OemCodePage,
-			 AnsiCodePage);
-}
-
-/*
- * @implemented
- */
-VOID STDCALL
-EngMultiByteToUnicodeN(OUT LPWSTR UnicodeString,
-		       IN ULONG MaxBytesInUnicodeString,
-		       OUT PULONG BytesInUnicodeString,
-		       IN PCHAR MultiByteString,
-		       IN ULONG BytesInMultiByteString)
-{
-  RtlMultiByteToUnicodeN(UnicodeString,
-			 MaxBytesInUnicodeString,
-			 BytesInUnicodeString,
-			 MultiByteString,
-			 BytesInMultiByteString);
-}
-
-/*
- * @implemented
- */
-VOID STDCALL
-EngUnicodeToMultiByteN(OUT PCHAR MultiByteString,
-		       IN ULONG MaxBytesInMultiByteString,
-		       OUT PULONG BytesInMultiByteString,
-		       IN PWSTR UnicodeString,
-		       IN ULONG BytesInUnicodeString)
-{
-  RtlUnicodeToMultiByteN(MultiByteString,
-			 MaxBytesInMultiByteString,
-			 BytesInMultiByteString,
-			 UnicodeString,
-			 BytesInUnicodeString);
-}
-
-/* EOF */
diff --git a/reactos/subsys/win32k/eng/objects.h b/reactos/subsys/win32k/eng/objects.h
index 175d8a4f025..a169f72f8d9 100644
--- a/reactos/subsys/win32k/eng/objects.h
+++ b/reactos/subsys/win32k/eng/objects.h
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: objects.h,v 1.31 2004/05/15 06:54:47 gvg Exp $
+/* $Id: objects.h,v 1.32 2004/07/03 13:55:35 navaraf Exp $
  * 
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -49,14 +49,7 @@ typedef struct _ENGOBJ {
 	ULONG  hObj;
 	ULONG  InternalSize;
 	ULONG  UserSize;
-}ENGOBJ, *PENGOBJ;
-
-
-
-typedef struct _BRUSHGDI {
-  ENGOBJ 		Header;
-  BRUSHOBJ	BrushObj;
-} BRUSHGDI;
+} ENGOBJ, *PENGOBJ;
 
 typedef struct _CLIPGDI {
   ENGOBJ 		Header;
@@ -147,67 +140,6 @@ typedef BOOL STDCALL (*PFN_SetPalette)(DHPDEV, PALOBJ*, ULONG, ULONG, ULONG);
 
 typedef BOOL STDCALL (*PFN_GradientFill)(SURFOBJ*, CLIPOBJ*, XLATEOBJ*, TRIVERTEX*, ULONG, PVOID, ULONG, RECTL*, POINTL*, ULONG);
 
-/* Forward declare (circular reference) */
-typedef struct _SURFGDI *PSURFGDI;
-
-typedef VOID    (*PFN_DIB_PutPixel)       (SURFOBJ *, LONG, LONG, ULONG);
-typedef ULONG   (*PFN_DIB_GetPixel)       (SURFOBJ *, LONG, LONG);
-typedef VOID    (*PFN_DIB_HLine)          (SURFOBJ *, LONG, LONG, LONG, ULONG);
-typedef VOID    (*PFN_DIB_VLine)          (SURFOBJ *, LONG, LONG, LONG, ULONG);
-typedef BOOLEAN (*PFN_DIB_BitBlt)         (SURFOBJ * DestSurf, SURFOBJ * SourceSurf,
-                                           PSURFGDI DestGDI,  PSURFGDI SourceGDI,
-                                           RECTL *  DestRect, POINTL *  SourcePoint,
-				           BRUSHOBJ *BrushObj, POINTL BrushOrigin,
-                                           XLATEOBJ *ColorTranslation, ULONG Rop4);
-typedef BOOLEAN (*PFN_DIB_StretchBlt)     (SURFOBJ * DestSurf, SURFOBJ * SourceSurf,
-                                           PSURFGDI DestGDI,  PSURFGDI SourceGDI,
-                                           RECTL *  DestRect, RECTL *  SourceRect,
-                                           POINTL *MaskOrigin, POINTL BrushOrigin,
-                                           CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
-                                           ULONG Mode);
-typedef BOOLEAN (*PFN_DIB_TransparentBlt) (SURFOBJ *, SURFOBJ *, PSURFGDI, PSURFGDI,
-                                           RECTL*  ,  POINTL  *, XLATEOBJ  *,ULONG);
-
-
-typedef struct _SURFGDI {
-  ENGOBJ 		Header;
-  SURFOBJ		SurfObj;
-
-  INT BitsPerPixel;
-
-  /* Driver functions */
-  PFN_BitBlt BitBlt;
-  PFN_TransparentBlt TransparentBlt;
-  PFN_StretchBlt StretchBlt;
-  PFN_TextOut TextOut;
-  PFN_Paint Paint;
-  PFN_StrokePath StrokePath;
-  PFN_FillPath FillPath;
-  PFN_StrokeAndFillPath StrokeAndFillPath;
-  PFN_LineTo LineTo;
-  PFN_CopyBits CopyBits;
-  PFN_Synchronize Synchronize;
-  BOOL SynchronizeAccess;
-  PFN_CreateDeviceBitmap CreateDeviceBitmap;
-  PFN_SetPalette SetPalette;
-  PFN_MovePointer MovePointer;
-  PFN_SetPointerShape SetPointerShape;
-  PFN_GradientFill GradientFill;
-
-  /* DIB functions */
-  PFN_DIB_PutPixel       DIB_PutPixel;
-  PFN_DIB_GetPixel       DIB_GetPixel;
-  PFN_DIB_HLine          DIB_HLine;
-  PFN_DIB_VLine          DIB_VLine;
-  PFN_DIB_BitBlt         DIB_BitBlt;
-  PFN_DIB_StretchBlt     DIB_StretchBlt;
-  PFN_DIB_TransparentBlt DIB_TransparentBlt;
-
-  /* misc */
-  ULONG       PointerStatus;
-  PFAST_MUTEX DriverLock;
-} SURFGDI;
-
 typedef struct _XFORMGDI {
   ENGOBJ 		Header;
   /* XFORMOBJ has no public members */
@@ -238,19 +170,4 @@ typedef struct _XLATEGDI {
 //  };
 } XLATEGDI;
 
-// List of GDI objects
-// FIXME: Make more dynamic
-
-#define MAX_GDI_BRUSHES      255
-#define MAX_GDI_CLIPS        255
-#define MAX_GDI_DRVFUNCTIONS  16
-#define MAX_GDI_FLOATS       255
-#define MAX_GDI_FONTS        255
-#define MAX_GDI_PALS         255
-#define MAX_GDI_PATHS        255
-#define MAX_GDI_STRS         255
-#define MAX_GDI_SURFS        255
-#define MAX_GDI_XFORMS       255
-#define MAX_GDI_XLATES       255
-
 #endif //__ENG_OBJECTS_H
diff --git a/reactos/subsys/win32k/eng/paint.c b/reactos/subsys/win32k/eng/paint.c
index 83bade0c08d..57ee7dd0652 100644
--- a/reactos/subsys/win32k/eng/paint.c
+++ b/reactos/subsys/win32k/eng/paint.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: paint.c,v 1.19 2004/05/10 17:07:17 weiden Exp $
+/* $Id: paint.c,v 1.20 2004/07/03 13:55:35 navaraf Exp $
  * 
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -33,24 +33,23 @@ BOOL STDCALL FillSolid(SURFOBJ *Surface, PRECTL pRect, ULONG iColor)
 {
   LONG y;
   ULONG LineWidth;
-  SURFGDI *SurfaceGDI;
 
-  SurfaceGDI = (SURFGDI*)AccessInternalObjectFromUserObject(Surface);
-  MouseSafetyOnDrawStart(Surface, SurfaceGDI, pRect->left, pRect->top, pRect->right, pRect->bottom);
+  MouseSafetyOnDrawStart(Surface, pRect->left, pRect->top, pRect->right, pRect->bottom);
   LineWidth  = pRect->right - pRect->left;
   DPRINT(" LineWidth: %d, top: %d, bottom: %d\n", LineWidth, pRect->top, pRect->bottom);
   for (y = pRect->top; y < pRect->bottom; y++)
   {
-    SurfaceGDI->DIB_HLine(Surface, pRect->left, pRect->right, y, iColor);
+    DibFunctionsForBitmapFormat[Surface->iBitmapFormat].DIB_HLine(
+      Surface, pRect->left, pRect->right, y, iColor);
   }
-  MouseSafetyOnDrawEnd(Surface, SurfaceGDI);
+  MouseSafetyOnDrawEnd(Surface);
 
   return TRUE;
 }
 
 BOOL STDCALL
 EngPaintRgn(SURFOBJ *Surface, CLIPOBJ *ClipRegion, ULONG iColor, MIX Mix,
-               BRUSHINST *BrushInst, POINTL *BrushPoint)
+            BRUSHOBJ *BrushObj, POINTL *BrushPoint)
 {
   RECT_ENUM RectEnum;
   BOOL EnumMore;
@@ -101,36 +100,33 @@ EngPaint(IN SURFOBJ *Surface,
   BOOLEAN ret;
 
   // FIXME: We only support a brush's solid color attribute
-  ret = EngPaintRgn(Surface, ClipRegion, Brush->iSolidColor, Mix, NULL, BrushOrigin);
+  ret = EngPaintRgn(Surface, ClipRegion, Brush->iSolidColor, Mix, Brush, BrushOrigin);
 
   return ret;
 }
 
 BOOL STDCALL
-IntEngPaint(IN SURFOBJ *Surface,
-	 IN CLIPOBJ *ClipRegion,
-	 IN BRUSHOBJ *Brush,
-	 IN POINTL *BrushOrigin,
-	 IN MIX  Mix)
+IntEngPaint(IN BITMAPOBJ *BitmapObj,
+            IN CLIPOBJ *ClipRegion,
+            IN BRUSHOBJ *Brush,
+            IN POINTL *BrushOrigin,
+            IN MIX  Mix)
 {
-  SURFGDI *SurfGDI;
+  SURFOBJ *Surface = &BitmapObj->SurfObj;
   BOOL ret;
 
-  // Is the surface's Paint function hooked?
-  SurfGDI = (SURFGDI*)AccessInternalObjectFromUserObject(Surface);
-
-  DPRINT("SurfGDI type: %d, sgdi paint: %x\n", Surface->iType, SurfGDI->Paint);
-  if((Surface->iType!=STYPE_BITMAP) && (SurfGDI->Paint!=NULL))
+  DPRINT("SurfGDI type: %d\n", Surface->iType);
+  /* Is the surface's Paint function hooked? */
+  if((Surface->iType!=STYPE_BITMAP) && (BitmapObj->flHooks & HOOK_PAINT))
   {
     // Call the driver's DrvPaint
-    MouseSafetyOnDrawStart(Surface, SurfGDI, ClipRegion->rclBounds.left,
+    MouseSafetyOnDrawStart(Surface, ClipRegion->rclBounds.left,
 	                         ClipRegion->rclBounds.top, ClipRegion->rclBounds.right,
 							 ClipRegion->rclBounds.bottom);
 
-    IntLockGDIDriver(SurfGDI);
-    ret = SurfGDI->Paint(Surface, ClipRegion, Brush, BrushOrigin, Mix);
-    IntUnLockGDIDriver(SurfGDI);
-    MouseSafetyOnDrawEnd(Surface, SurfGDI);
+    ret = GDIDEVFUNCS(Surface).Paint(
+      Surface, ClipRegion, Brush, BrushOrigin, Mix);
+    MouseSafetyOnDrawEnd(Surface);
     return ret;
   }
   return EngPaint( Surface, ClipRegion, Brush, BrushOrigin, Mix );
diff --git a/reactos/subsys/win32k/eng/surface.c b/reactos/subsys/win32k/eng/surface.c
index 658fcc0869d..1f5ce7b4045 100644
--- a/reactos/subsys/win32k/eng/surface.c
+++ b/reactos/subsys/win32k/eng/surface.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: surface.c,v 1.42 2004/06/23 07:40:45 gvg Exp $
+/* $Id: surface.c,v 1.43 2004/07/03 13:55:35 navaraf Exp $
  * 
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -69,6 +69,7 @@ ULONG FASTCALL BitmapFormat(WORD Bits, DWORD Compression)
         case 24: return BMF_24BPP;
         case 32: return BMF_32BPP;
       }
+      return 0;
 
     case BI_RLE4: return BMF_4RLE;
     case BI_RLE8: return BMF_8RLE;
@@ -77,99 +78,6 @@ ULONG FASTCALL BitmapFormat(WORD Bits, DWORD Compression)
   }
 }
 
-static VOID Dummy_PutPixel(SURFOBJ* SurfObj, LONG x, LONG y, ULONG c)
-{
-  return;
-}
-
-static ULONG Dummy_GetPixel(SURFOBJ* SurfObj, LONG x, LONG y)
-{
-  return 0;
-}
-
-static VOID Dummy_HLine(SURFOBJ* SurfObj, LONG x1, LONG x2, LONG y, ULONG c)
-{
-  return;
-}
-
-static VOID Dummy_VLine(SURFOBJ* SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
-{
-  return;
-}
-
-static BOOLEAN Dummy_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                            SURFGDI *DestGDI,  SURFGDI *SourceGDI,
-                            RECTL*  DestRect,  POINTL  *SourcePoint,
-                            BRUSHOBJ* BrushObj, POINTL BrushOrign,
-                            XLATEOBJ *ColorTranslation, ULONG Rop4)
-{
-  return FALSE;
-}
-
-static BOOLEAN Dummy_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                                SURFGDI *DestGDI,  SURFGDI *SourceGDI,
-                                RECTL*  DestRect,  RECTL  *SourceRect,
-                                POINTL* MaskOrigin, POINTL BrushOrign,
-                                CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
-                                ULONG Mode)
-{
-  return FALSE;
-}
-
-static BOOLEAN Dummy_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                                    PSURFGDI DestGDI,  PSURFGDI SourceGDI,
-                                    RECTL*  DestRect,  POINTL  *SourcePoint,
-                                    XLATEOBJ *ColorTranslation, ULONG iTransColor)
-{
-  return FALSE;
-}
-
-
-#define SURF_METHOD(c,n) DIB_##c##_##n
-#define SET_SURFGDI(c)\
- SurfGDI->DIB_PutPixel=SURF_METHOD(c,PutPixel);\
- SurfGDI->DIB_GetPixel=SURF_METHOD(c,GetPixel);\
- SurfGDI->DIB_HLine=SURF_METHOD(c,HLine);\
- SurfGDI->DIB_VLine=SURF_METHOD(c,VLine);\
- SurfGDI->DIB_BitBlt=SURF_METHOD(c,BitBlt);\
- SurfGDI->DIB_StretchBlt=SURF_METHOD(c,StretchBlt);\
- SurfGDI->DIB_TransparentBlt=SURF_METHOD(c,TransparentBlt);
-
-VOID FASTCALL InitializeFuncs(SURFGDI *SurfGDI, ULONG BitmapFormat)
-{
-  SurfGDI->BitBlt   = NULL;
-  SurfGDI->StretchBlt   = NULL;
-  SurfGDI->CopyBits = NULL;
-  SurfGDI->CreateDeviceBitmap = NULL;
-  SurfGDI->SetPalette = NULL;
-  SurfGDI->TransparentBlt = NULL;
-
-  switch(BitmapFormat)
-    {
-    case BMF_1BPP:  SET_SURFGDI(1BPP) break;
-    case BMF_4BPP:  SET_SURFGDI(4BPP) break;
-    case BMF_8BPP:  SET_SURFGDI(8BPP) break;
-    case BMF_16BPP: SET_SURFGDI(16BPP) break;
-    case BMF_24BPP: SET_SURFGDI(24BPP) break;
-    case BMF_32BPP: SET_SURFGDI(32BPP) break;
-    case BMF_4RLE:
-    case BMF_8RLE:
-      /* Not supported yet, fall through to unrecognized case */
-    default:
-      DPRINT1("InitializeFuncs: unsupported DIB format %d\n",
-               BitmapFormat);
-
-      SurfGDI->DIB_PutPixel       = Dummy_PutPixel;
-      SurfGDI->DIB_GetPixel       = Dummy_GetPixel;
-      SurfGDI->DIB_HLine          = Dummy_HLine;
-      SurfGDI->DIB_VLine          = Dummy_VLine;
-      SurfGDI->DIB_BitBlt         = Dummy_BitBlt;
-      SurfGDI->DIB_StretchBlt     = Dummy_StretchBlt;
-      SurfGDI->DIB_TransparentBlt = Dummy_TransparentBlt;
-      break;
-    }
-}
-
 /*
  * @implemented
  */
@@ -182,8 +90,9 @@ EngCreateDeviceBitmap(IN DHSURF dhsurf,
   SURFOBJ *SurfObj;
 
   NewBitmap = EngCreateBitmap(Size, DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(Format)), Format, 0, NULL);
-  SurfObj = (PVOID)AccessUserObject((ULONG)NewBitmap);
+  SurfObj = EngLockSurface((HSURF)NewBitmap);
   SurfObj->dhsurf = dhsurf;
+  EngUnlockSurface(SurfObj);
 
   return NewBitmap;
 }
@@ -301,11 +210,8 @@ VOID Decompress8bpp(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBits, LO
 	}
 }
 
-/*
- * @implemented
- */
-HBITMAP STDCALL
-EngCreateBitmap(IN SIZEL Size,
+HBITMAP FASTCALL
+IntCreateBitmap(IN SIZEL Size,
 		IN LONG Width,
 		IN ULONG Format,
 		IN ULONG Flags,
@@ -313,15 +219,17 @@ EngCreateBitmap(IN SIZEL Size,
 {
   HBITMAP NewBitmap;
   SURFOBJ *SurfObj;
-  SURFGDI *SurfGDI;
+  BITMAPOBJ *BitmapObj;
   PVOID UncompressedBits;
   ULONG UncompressedFormat;
 
-  NewBitmap = (HBITMAP) CreateGDIHandle(sizeof(SURFGDI), sizeof(SURFOBJ), (PVOID*)&SurfGDI, (PVOID*)&SurfObj);
-  if (! ValidEngHandle(NewBitmap))
+  NewBitmap = BITMAPOBJ_AllocBitmap();
+  if (NewBitmap == NULL)
 	return 0;
 
-  SurfGDI->BitsPerPixel = BitsPerFormat(Format);
+  BitmapObj = BITMAPOBJ_LockBitmap(NewBitmap);
+  SurfObj = &BitmapObj->SurfObj;
+
   if (Format == BMF_4RLE)
     {
       SurfObj->lDelta = DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(BMF_4BPP));
@@ -340,8 +248,8 @@ EngCreateBitmap(IN SIZEL Size,
     }
   else
     {
-      SurfObj->lDelta = Width;
-      SurfObj->cjBits = Width * Size.cy;
+      SurfObj->lDelta = abs(Width);
+      SurfObj->cjBits = SurfObj->lDelta * Size.cy;
       UncompressedBits = Bits;
       UncompressedFormat = Format;
     }
@@ -373,24 +281,49 @@ EngCreateBitmap(IN SIZEL Size,
 
   if (0 == (Flags & BMF_TOPDOWN))
     {
-      SurfObj->pvBits = (PVOID) ((PCHAR) UncompressedBits + SurfObj->cjBits - SurfObj->lDelta);
+      SurfObj->pvScan0 = (PVOID) ((ULONG_PTR) SurfObj->pvBits + SurfObj->cjBits - SurfObj->lDelta);
       SurfObj->lDelta = - SurfObj->lDelta;
     }
+  else
+    {
+      SurfObj->pvScan0 = SurfObj->pvBits;
+    }
 
   SurfObj->dhsurf = 0; /* device managed surface */
-  SurfObj->hsurf  = 0;
+  SurfObj->hsurf = (HSURF)NewBitmap;
   SurfObj->dhpdev = NULL;
   SurfObj->hdev = NULL;
   SurfObj->sizlBitmap = Size;
   SurfObj->iBitmapFormat = UncompressedFormat;
   SurfObj->iType = STYPE_BITMAP;
   SurfObj->fjBitmap = Flags & (BMF_TOPDOWN | BMF_NOZEROINIT);
-  SurfObj->pvScan0 = SurfObj->pvBits;
   SurfObj->iUniq = 0;
 
-  InitializeFuncs(SurfGDI, UncompressedFormat);
+  BitmapObj->flHooks = 0;
+  BitmapObj->flFlags = 0;
+  BitmapObj->dimension.cx = 0;
+  BitmapObj->dimension.cy = 0;
+  BitmapObj->dib = NULL;
 
-  /* Use flags to determine bitmap type -- TOP_DOWN or whatever */
+  BITMAPOBJ_UnlockBitmap(NewBitmap);
+
+  return NewBitmap;
+}
+
+/*
+ * @implemented
+ */
+HBITMAP STDCALL
+EngCreateBitmap(IN SIZEL Size,
+		IN LONG Width,
+		IN ULONG Format,
+		IN ULONG Flags,
+		IN PVOID Bits)
+{
+  HBITMAP NewBitmap;
+  
+  NewBitmap = IntCreateBitmap(Size, Width, Format, Flags, Bits);
+  GDIOBJ_SetOwnership(NewBitmap, NULL);
 
   return NewBitmap;
 }
@@ -403,24 +336,30 @@ EngCreateDeviceSurface(IN DHSURF dhsurf,
 		       IN SIZEL Size,
 		       IN ULONG Format)
 {
-  HSURF   NewSurface;
+  HSURF NewSurface;
   SURFOBJ *SurfObj;
-  SURFGDI *SurfGDI;
+  BITMAPOBJ *BitmapObj;
 
-  NewSurface = (HSURF)CreateGDIHandle(sizeof( SURFGDI ), sizeof( SURFOBJ ), (PVOID*)&SurfGDI, (PVOID*)&SurfObj);
-  if( !ValidEngHandle( NewSurface ) )
+  NewSurface = (HSURF)BITMAPOBJ_AllocBitmap();
+  if (NewSurface == NULL)
 	return 0;
 
-  SurfGDI->BitsPerPixel = BitsPerFormat(Format);
+  GDIOBJ_SetOwnership(NewSurface, NULL);
+
+  BitmapObj = BITMAPOBJ_LockBitmap(NewSurface);
+  SurfObj = &BitmapObj->SurfObj;
+
   SurfObj->dhsurf = dhsurf;
-  SurfObj->hsurf  = (HSURF) dhsurf; // FIXME: Is this correct??
+  SurfObj->hsurf = NewSurface;
   SurfObj->sizlBitmap = Size;
   SurfObj->iBitmapFormat = Format;
   SurfObj->lDelta = DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(Format));
   SurfObj->iType = STYPE_DEVICE;
   SurfObj->iUniq = 0;
 
-  InitializeFuncs(SurfGDI, Format);
+  BitmapObj->flHooks = 0;
+
+  BITMAPOBJ_UnlockBitmap(NewSurface);
 
   return NewSurface;
 }
@@ -446,40 +385,23 @@ EngAssociateSurface(IN HSURF Surface,
 		    IN ULONG Hooks)
 {
   SURFOBJ *SurfObj;
-  SURFGDI *SurfGDI;
+  BITMAPOBJ *BitmapObj;
   GDIDEVICE* Device;
 
   Device = (GDIDEVICE*)Dev;
 
-  SurfObj = (SURFOBJ*)AccessUserObject((ULONG)Surface);
-  ASSERT(SurfObj);
-  SurfGDI = (SURFGDI*)AccessInternalObjectFromUserObject(SurfObj);
+  BitmapObj = BITMAPOBJ_LockBitmap(Surface);
+  ASSERT(BitmapObj);
+  SurfObj = &BitmapObj->SurfObj;
 
-  // Associate the hdev
+  /* Associate the hdev */
   SurfObj->hdev = Dev;
   SurfObj->dhpdev = Device->PDev;
 
-  // Hook up specified functions
-  if(Hooks & HOOK_BITBLT)            SurfGDI->BitBlt            = Device->DriverFunctions.BitBlt;
-  if(Hooks & HOOK_TRANSPARENTBLT)    SurfGDI->TransparentBlt	= Device->DriverFunctions.TransparentBlt;
-  if(Hooks & HOOK_STRETCHBLT)        SurfGDI->StretchBlt        = (PFN_StretchBlt)Device->DriverFunctions.StretchBlt;
-  if(Hooks & HOOK_TEXTOUT)           SurfGDI->TextOut           = Device->DriverFunctions.TextOut;
-  if(Hooks & HOOK_PAINT)             SurfGDI->Paint             = Device->DriverFunctions.Paint;
-  if(Hooks & HOOK_STROKEPATH)        SurfGDI->StrokePath        = Device->DriverFunctions.StrokePath;
-  if(Hooks & HOOK_FILLPATH)          SurfGDI->FillPath          = Device->DriverFunctions.FillPath;
-  if(Hooks & HOOK_STROKEANDFILLPATH) SurfGDI->StrokeAndFillPath = Device->DriverFunctions.StrokeAndFillPath;
-  if(Hooks & HOOK_LINETO)            SurfGDI->LineTo            = Device->DriverFunctions.LineTo;
-  if(Hooks & HOOK_COPYBITS)          SurfGDI->CopyBits          = Device->DriverFunctions.CopyBits;
-  if(Hooks & HOOK_SYNCHRONIZE)       SurfGDI->Synchronize       = Device->DriverFunctions.Synchronize;
-  if(Hooks & HOOK_SYNCHRONIZEACCESS) SurfGDI->SynchronizeAccess = TRUE;
-  if(Hooks & HOOK_GRADIENTFILL)      SurfGDI->GradientFill      = Device->DriverFunctions.GradientFill;
+  /* Hook up specified functions */
+  BitmapObj->flHooks = Hooks;
 
-  SurfGDI->CreateDeviceBitmap = Device->DriverFunctions.CreateDeviceBitmap;
-  SurfGDI->SetPalette = Device->DriverFunctions.SetPalette;
-  SurfGDI->MovePointer = Device->DriverFunctions.MovePointer;
-  SurfGDI->SetPointerShape = (PFN_SetPointerShape)Device->DriverFunctions.SetPointerShape;
-
-  SurfGDI->DriverLock = &Device->DriverLock;
+  BITMAPOBJ_UnlockBitmap(Surface);
 
   return TRUE;
 }
@@ -528,8 +450,9 @@ EngModifySurface(
 BOOL STDCALL
 EngDeleteSurface(IN HSURF Surface)
 {
-  FreeGDIHandle((ULONG)Surface);
-  return TRUE;
+   GDIOBJ_SetOwnership(Surface, PsGetCurrentProcess());
+   BITMAPOBJ_FreeBitmap(Surface);
+   return TRUE;
 }
 
 /*
@@ -544,32 +467,20 @@ EngEraseSurface(SURFOBJ *Surface,
 }
 
 /*
- * @unimplemented
+ * @implemented
  */
 SURFOBJ * STDCALL
 EngLockSurface(IN HSURF Surface)
 {
-  /*
-   * FIXME - don't know if GDIOBJ_LockObj's return value is a SURFOBJ or not...
-   * also, what is HSURF's correct magic #?
-   */
-#ifdef TODO
-  GDIOBJ_LockObj ( Surface, GDI_OBJECT_TYPE_DONTCARE );
-#endif
-  return (SURFOBJ*)AccessUserObject((ULONG)Surface);
+  return &((BITMAPOBJ*)BITMAPOBJ_LockBitmap(Surface))->SurfObj;
 }
 
 /*
- * @unimplemented
+ * @implemented
  */
 VOID STDCALL
 EngUnlockSurface(IN SURFOBJ *Surface)
 {
-  /*
-   * FIXME what is HSURF's correct magic #?
-   */
-#ifdef TODO
-  GDIOBJ_UnlockObj ( Surface->hsurf, GDI_OBJECT_TYPE_DONTCARE );
-#endif
+  BITMAPOBJ_UnlockBitmap ( Surface->hsurf );
 }
 /* EOF */
diff --git a/reactos/subsys/win32k/eng/transblt.c b/reactos/subsys/win32k/eng/transblt.c
index 8135a0c5834..0fdb080359b 100644
--- a/reactos/subsys/win32k/eng/transblt.c
+++ b/reactos/subsys/win32k/eng/transblt.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: transblt.c,v 1.19 2004/05/16 09:51:26 weiden Exp $
+/* $Id: transblt.c,v 1.20 2004/07/03 13:55:35 navaraf Exp $
  * 
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -43,7 +43,6 @@ EngTransparentBlt(SURFOBJ *Dest,
   BYTE ClippingType;
   INTENG_ENTER_LEAVE EnterLeaveSource, EnterLeaveDest;
   SURFOBJ *InputObj, *OutputObj;
-  SURFGDI *InputGDI, *OutputGDI;
   RECTL OutputRect, InputRect;
   POINTL Translate, InputPoint;
   
@@ -60,9 +59,6 @@ EngTransparentBlt(SURFOBJ *Dest,
   InputPoint.x = SourceRect->left + Translate.x;
   InputPoint.y = SourceRect->top + Translate.y;
   
-  InputGDI = (InputObj ? (SURFGDI*)AccessInternalObjectFromUserObject(InputObj) : NULL);
-  ASSERT(InputGDI);
-  
   OutputRect = *DestRect;
   if(Clip)
   {
@@ -109,17 +105,14 @@ EngTransparentBlt(SURFOBJ *Dest,
   OutputRect.top = DestRect->top + Translate.y;
   OutputRect.bottom = DestRect->bottom + Translate.y;
   
-  OutputGDI = (OutputObj ? (SURFGDI*)AccessInternalObjectFromUserObject(OutputObj) : NULL);
-  ASSERT(OutputGDI);
-  
   ClippingType = (Clip ? Clip->iDComplexity : DC_TRIVIAL);
   
   switch(ClippingType)
   {
     case DC_TRIVIAL:
     {
-      Ret = OutputGDI->DIB_TransparentBlt(OutputObj, InputObj, OutputGDI, InputGDI, &OutputRect, 
-                                         &InputPoint, ColorTranslation, iTransColor);
+      Ret = DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_TransparentBlt(
+        OutputObj, InputObj, &OutputRect, &InputPoint, ColorTranslation, iTransColor);
       break;
     }
     case DC_RECT:
@@ -134,8 +127,8 @@ EngTransparentBlt(SURFOBJ *Dest,
       EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect);
       Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left;
       Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top;
-      Ret = OutputGDI->DIB_TransparentBlt(OutputObj, InputObj, OutputGDI, InputGDI, &CombinedRect, 
-                                          &Pt, ColorTranslation, iTransColor);
+      Ret = DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_TransparentBlt(
+        OutputObj, InputObj, &CombinedRect, &Pt, ColorTranslation, iTransColor);
       break;
     }
     case DC_COMPLEX:
@@ -176,8 +169,8 @@ EngTransparentBlt(SURFOBJ *Dest,
           EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect);
           Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left;
           Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top;
-          Ret = OutputGDI->DIB_TransparentBlt(OutputObj, InputObj, OutputGDI, InputGDI, &CombinedRect, 
-                                              &Pt, ColorTranslation, iTransColor);
+          Ret = DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_TransparentBlt(
+            OutputObj, InputObj, &CombinedRect, &Pt, ColorTranslation, iTransColor);
           if(!Ret)
           {
             break;
@@ -200,8 +193,8 @@ EngTransparentBlt(SURFOBJ *Dest,
 }
 
 BOOL FASTCALL
-IntEngTransparentBlt(SURFOBJ *Dest,
-                     SURFOBJ *Source,
+IntEngTransparentBlt(BITMAPOBJ *DestObj,
+                     BITMAPOBJ *SourceObj,
                      CLIPOBJ *Clip,
                      XLATEOBJ *ColorTranslation,
                      PRECTL DestRect,
@@ -211,7 +204,8 @@ IntEngTransparentBlt(SURFOBJ *Dest,
 {
   BOOL Ret;
   RECTL OutputRect, InputClippedRect;
-  PSURFGDI SurfGDIDest, SurfGDISrc;
+  SURFOBJ *DestSurf = &DestObj->SurfObj;
+  SURFOBJ *SourceSurf = &SourceObj->SurfObj;
   
   InputClippedRect = *DestRect;
   if(InputClippedRect.right < InputClippedRect.left)
@@ -243,57 +237,46 @@ IntEngTransparentBlt(SURFOBJ *Dest,
     OutputRect = *DestRect;
   }
   
-  if(Source != Dest)
+  if(SourceSurf != DestSurf)
   {
-    SurfGDISrc = (PSURFGDI)AccessInternalObjectFromUserObject(Source);
-    ASSERT(SurfGDISrc);
-    MouseSafetyOnDrawStart(Source, SurfGDISrc, SourceRect->left, SourceRect->top, 
+    MouseSafetyOnDrawStart(SourceSurf, SourceRect->left, SourceRect->top, 
                            (SourceRect->left + abs(SourceRect->right - SourceRect->left)),
                            (SourceRect->top + abs(SourceRect->bottom - SourceRect->top)));
   }
-  SurfGDIDest = (PSURFGDI)AccessInternalObjectFromUserObject(Dest);
-  ASSERT(SurfGDIDest);
-  MouseSafetyOnDrawStart(Dest, SurfGDIDest, OutputRect.left, OutputRect.top,
+  MouseSafetyOnDrawStart(DestSurf, OutputRect.left, OutputRect.top,
                          OutputRect.right, OutputRect.bottom);
   
-  if(SurfGDIDest->TransparentBlt)
+  if(DestObj->flHooks & HOOK_TRANSPARENTBLT)
   {
-    IntLockGDIDriver(SurfGDIDest);
-    Ret = SurfGDIDest->TransparentBlt(Dest, Source, Clip, ColorTranslation, &OutputRect, 
-                                      SourceRect, iTransColor, Reserved);
-    IntUnLockGDIDriver(SurfGDIDest);
+    Ret = GDIDEVFUNCS(DestSurf).TransparentBlt(
+      DestSurf, SourceSurf, Clip, ColorTranslation, &OutputRect, 
+      SourceRect, iTransColor, Reserved);
   }
   else
     Ret = FALSE;
   
   if(!Ret)
   {
-    IntLockGDIDriver(SurfGDIDest);
-    Ret = EngTransparentBlt(Dest, Source, Clip, ColorTranslation, &OutputRect, 
-                            SourceRect, iTransColor, Reserved);
-    IntUnLockGDIDriver(SurfGDIDest);
+    Ret = EngTransparentBlt(DestSurf, SourceSurf, Clip, ColorTranslation,
+                            &OutputRect, SourceRect, iTransColor, Reserved);
   }
   
   if(Ret)
   {
     /* Dummy BitBlt to let driver know that something has changed.
        0x00AA0029 is the Rop for D (no-op) */
-    if(SurfGDIDest->BitBlt)
+    if (DestObj->flHooks & HOOK_BITBLT)
     {
-      IntLockGDIDriver(SurfGDIDest);
-      SurfGDIDest->BitBlt(Dest, NULL, NULL, Clip, ColorTranslation,
+      GDIDEVFUNCS(DestSurf).BitBlt(
+                          DestSurf, NULL, NULL, Clip, ColorTranslation,
                           &OutputRect, NULL, NULL, NULL, NULL, ROP_NOOP);
-      IntUnLockGDIDriver(SurfGDIDest);
     }
-    else
-      EngBitBlt(Dest, NULL, NULL, Clip, ColorTranslation,
-                &OutputRect, NULL, NULL, NULL, NULL, ROP_NOOP);
   }
   
-  MouseSafetyOnDrawEnd(Dest, SurfGDIDest);
-  if(Source != Dest)
+  MouseSafetyOnDrawEnd(DestSurf);
+  if(SourceSurf != DestSurf)
   {
-    MouseSafetyOnDrawEnd(Source, SurfGDISrc);
+    MouseSafetyOnDrawEnd(SourceSurf);
   }
 
   return Ret;
diff --git a/reactos/subsys/win32k/eng/xlate.c b/reactos/subsys/win32k/eng/xlate.c
index bcb8d019572..43d4eff8408 100644
--- a/reactos/subsys/win32k/eng/xlate.c
+++ b/reactos/subsys/win32k/eng/xlate.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: xlate.c,v 1.38 2004/06/29 20:08:07 navaraf Exp $
+/* $Id: xlate.c,v 1.39 2004/07/03 13:55:35 navaraf Exp $
  * 
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -26,123 +26,98 @@
  * REVISION HISTORY:
  *        8/20/1999: Created
  */
-#include <w32k.h>
 
-// TODO: Cache XLATEOBJs that are created by EngCreateXlate by checking if the given palettes match a cached list
+#include <w32k.h>
 
 static ULONG FASTCALL ShiftAndMask(XLATEGDI *XlateGDI, ULONG Color)
 {
-  ULONG TranslatedColor;
+   ULONG TranslatedColor;
 
-  TranslatedColor = 0;
-  if (XlateGDI->RedShift < 0)
-  {
-    TranslatedColor = (Color >> -(XlateGDI->RedShift)) & XlateGDI->RedMask;
-  } else
-    TranslatedColor = (Color << XlateGDI->RedShift) & XlateGDI->RedMask;
-  if (XlateGDI->GreenShift < 0)
-  {
-    TranslatedColor |= (Color >> -(XlateGDI->GreenShift)) & XlateGDI->GreenMask;
-  } else
-    TranslatedColor |= (Color << XlateGDI->GreenShift) & XlateGDI->GreenMask;
-  if (XlateGDI->BlueShift < 0)
-  {
-    TranslatedColor |= (Color >> -(XlateGDI->BlueShift)) & XlateGDI->BlueMask;
-  } else
-    TranslatedColor |= (Color << XlateGDI->BlueShift) & XlateGDI->BlueMask;
+   if (XlateGDI->RedShift < 0)
+      TranslatedColor = (Color >> -(XlateGDI->RedShift)) & XlateGDI->RedMask;
+   else
+      TranslatedColor = (Color << XlateGDI->RedShift) & XlateGDI->RedMask;
+   if (XlateGDI->GreenShift < 0)
+      TranslatedColor |= (Color >> -(XlateGDI->GreenShift)) & XlateGDI->GreenMask;
+   else
+      TranslatedColor |= (Color << XlateGDI->GreenShift) & XlateGDI->GreenMask;
+   if (XlateGDI->BlueShift < 0)
+      TranslatedColor |= (Color >> -(XlateGDI->BlueShift)) & XlateGDI->BlueMask;
+   else
+      TranslatedColor |= (Color << XlateGDI->BlueShift) & XlateGDI->BlueMask;
 
-  return TranslatedColor;
+   return TranslatedColor;
 }
 
 
-// FIXME: If the caller knows that the destinations are indexed and not RGB
-// then we should cache more than one value. Same with the source.
-
-// Takes indexed palette and a
 ULONG STDCALL 
 ClosestColorMatch(XLATEGDI *XlateGDI, LPPALETTEENTRY SourceColor,
-   PALETTEENTRY *DestColors, ULONG NumColors)
+                  PALETTEENTRY *DestColors, ULONG NumColors)
 {
-  LONG idx = 0;
-  ULONG i;
-  ULONG SourceRed, SourceGreen, SourceBlue;
-  ULONG cxRed, cxGreen, cxBlue, rt, BestMatch = 16777215;
+   ULONG SourceRed, SourceGreen, SourceBlue;
+   ULONG cxRed, cxGreen, cxBlue, Rating, BestMatch = 16777215;
+   ULONG CurrentIndex, BestIndex = 0;
 
-  SourceRed = SourceColor->peRed;
-  SourceGreen = SourceColor->peGreen;
-  SourceBlue = SourceColor->peBlue;
+   SourceRed = SourceColor->peRed;
+   SourceGreen = SourceColor->peGreen;
+   SourceBlue = SourceColor->peBlue;
 
-  for (i=0; i<NumColors; i++)
-  {
-    cxRed = (SourceRed - DestColors[i].peRed);
-	cxRed *= cxRed;  //compute cxRed squared
-    cxGreen = (SourceGreen - DestColors[i].peGreen);
-	cxGreen *= cxGreen;
-    cxBlue = (SourceBlue - DestColors[i].peBlue);
-	cxBlue *= cxBlue;
+   for (CurrentIndex = 0; CurrentIndex < NumColors; CurrentIndex++)
+   {
+      cxRed = (SourceRed - DestColors[CurrentIndex].peRed);
+      cxRed *= cxRed;
+      cxGreen = (SourceGreen - DestColors[CurrentIndex].peGreen);
+      cxGreen *= cxGreen;
+      cxBlue = (SourceBlue - DestColors[CurrentIndex].peBlue);
+      cxBlue *= cxBlue;
 
-    rt = /* sqrt */ (cxRed + cxGreen + cxBlue);
+      Rating = cxRed + cxGreen + cxBlue;
 
-    if(rt<=BestMatch)
-    {
-      idx = i;
-      BestMatch = rt;
-    }
-  }
+      if (Rating < BestMatch)
+      {
+         BestIndex = CurrentIndex;
+         BestMatch = Rating;
+      }
 
-  return idx;
-}
+      /* Exact match */
+      if (Rating == 0)
+         break;
+   }
 
-VOID STDCALL 
-IndexedToIndexedTranslationTable(XLATEGDI *XlateGDI, ULONG *TranslationTable,
-                                      PALGDI *PalDest, PALGDI *PalSource)
-{
-  ULONG i;
-  BOOL Trivial;
-
-  Trivial = TRUE;
-  for(i=0; i<PalSource->NumColors; i++)
-    {
-      TranslationTable[i] = ClosestColorMatch(XlateGDI, PalSource->IndexedColors + i, PalDest->IndexedColors, PalDest->NumColors);
-      Trivial = Trivial && (TranslationTable[i] == i);
-    }
-  if (Trivial)
-    {
-      XlateGDI->XlateObj.flXlate |= XO_TRIVIAL;
-    }
+   return BestIndex;
 }
 
 static VOID STDCALL
 BitMasksFromPal(USHORT PalType, PPALGDI Palette,
-                            PULONG RedMask, PULONG BlueMask, PULONG GreenMask)
+                PULONG RedMask, PULONG BlueMask, PULONG GreenMask)
 {
-  static const union { PALETTEENTRY Color; ULONG Mask; } Red = {{255, 0, 0}};
-  static const union { PALETTEENTRY Color; ULONG Mask; } Green = {{0, 255, 0}};
-  static const union { PALETTEENTRY Color; ULONG Mask; } Blue = {{0, 0, 255}};
+   static const union { PALETTEENTRY Color; ULONG Mask; } Red = {{255, 0, 0}};
+   static const union { PALETTEENTRY Color; ULONG Mask; } Green = {{0, 255, 0}};
+   static const union { PALETTEENTRY Color; ULONG Mask; } Blue = {{0, 0, 255}};
 
-  switch(PalType)
-  {
-    case PAL_RGB:
-      *RedMask = RGB(255, 0, 0);
-      *GreenMask = RGB(0, 255, 0);
-      *BlueMask = RGB(0, 0, 255);
-      break;
-    case PAL_BGR:
-      *RedMask = RGB(0, 0, 255);
-      *GreenMask = RGB(0, 255, 0);
-      *BlueMask = RGB(255, 0, 0);
-      break;
-    case PAL_BITFIELDS:
-      *RedMask = Palette->RedMask;
-      *GreenMask = Palette->GreenMask;
-      *BlueMask = Palette->BlueMask;
-      break;
-    case PAL_INDEXED:
-      *RedMask = Red.Mask;
-      *GreenMask = Green.Mask;
-      *BlueMask = Blue.Mask;
-      break;
-  }
+   switch (PalType)
+   {
+      case PAL_RGB:
+         *RedMask = RGB(255, 0, 0);
+         *GreenMask = RGB(0, 255, 0);
+         *BlueMask = RGB(0, 0, 255);
+         break;
+      case PAL_BGR:
+         *RedMask = RGB(0, 0, 255);
+         *GreenMask = RGB(0, 255, 0);
+         *BlueMask = RGB(255, 0, 0);
+         break;
+      case PAL_BITFIELDS:
+         *RedMask = Palette->RedMask;
+         *GreenMask = Palette->GreenMask;
+         *BlueMask = Palette->BlueMask;
+         break;
+      case PAL_INDEXED:
+         *RedMask = Red.Mask;
+         *GreenMask = Green.Mask;
+         *BlueMask = Blue.Mask;
+         break;
+   }
 }
 
 /*
@@ -155,36 +130,14 @@ static INT FASTCALL CalculateShift(ULONG Mask)
    ULONG LeftmostBit = 1 << (8 * sizeof(ULONG) - 1);
 
    while (0 == (Mask & LeftmostBit) && Shift < 8 * sizeof(ULONG))
-     {
-     Mask = Mask << 1;
-     Shift++;
-     }
+   {
+      Mask = Mask << 1;
+      Shift++;
+   }
 
    return Shift;
 }
 
-VOID FASTCALL EngDeleteXlate(XLATEOBJ *XlateObj)
-{
-  XLATEGDI *XlateGDI;
-  HANDLE HXlate;
-
-  if (NULL == XlateObj)
-    {
-      DPRINT1("Trying to delete NULL XLATEOBJ\n");
-      return;
-    }
-
-  XlateGDI = (XLATEGDI *) AccessInternalObjectFromUserObject(XlateObj);
-  HXlate = (HANDLE) AccessHandleFromUserObject(XlateObj);
-
-  if((XlateObj->flXlate & XO_TABLE) && NULL != XlateGDI->translationTable)
-    {
-      EngFreeMem(XlateGDI->translationTable);
-    }
-
-  FreeGDIHandle((ULONG)HXlate);
-}
-
 XLATEOBJ* STDCALL
 IntEngCreateXlate(USHORT DestPalType, USHORT SourcePalType,
                   HPALETTE PaletteDest, HPALETTE PaletteSource)
@@ -270,7 +223,17 @@ IntEngCreateXlate(USHORT DestPalType, USHORT SourcePalType,
    {
       XlateGDI->translationTable = 
          EngAllocMem(0, sizeof(ULONG) * SourcePalGDI->NumColors, 0);
-      IndexedToIndexedTranslationTable(XlateGDI, XlateGDI->translationTable, DestPalGDI, SourcePalGDI);
+
+      XlateObj->flXlate |= XO_TRIVIAL;
+      for (i = 0; i < SourcePalGDI->NumColors; i++)
+      {
+         XlateGDI->translationTable[i] = ClosestColorMatch(
+            XlateGDI, SourcePalGDI->IndexedColors + i,
+            DestPalGDI->IndexedColors, DestPalGDI->NumColors);
+         if (XlateGDI->translationTable[i] != i)
+            XlateObj->flXlate &= ~XO_TRIVIAL;
+      }
+
       XlateObj->flXlate |= XO_TABLE;
       XlateObj->pulXlate = XlateGDI->translationTable;
       goto end;
@@ -318,12 +281,11 @@ XLATEOBJ * STDCALL IntEngCreateMonoXlate(
    XlateObj->iSrcType = SourcePalType;
    XlateObj->iDstType = PAL_INDEXED;
 
-   // Store handles of palettes in internal Xlate GDI object (or NULLs)
+   /* Store handles of palettes in internal Xlate GDI object (or NULLs) */
    XlateGDI->DestPal = PaletteDest;
    XlateGDI->SourcePal = PaletteSource;
 
    XlateObj->flXlate = XO_TO_MONO;
-   /* FIXME: Map into source palette type */
    switch (SourcePalType)
    {
       case PAL_INDEXED:
@@ -356,6 +318,35 @@ XLATEOBJ * STDCALL IntEngCreateMonoXlate(
    return XlateObj;
 }
 
+/* PUBLIC FUNCTIONS ***********************************************************/
+
+/*
+ * @implemented
+ */
+VOID FASTCALL
+EngDeleteXlate(XLATEOBJ *XlateObj)
+{
+   XLATEGDI *XlateGDI;
+   HANDLE HXlate;
+
+   if (XlateObj == NULL)
+   {
+      DPRINT1("Trying to delete NULL XLATEOBJ\n");
+      return;
+   }
+
+   XlateGDI = (XLATEGDI *)AccessInternalObjectFromUserObject(XlateObj);
+   HXlate = (HANDLE)AccessHandleFromUserObject(XlateObj);
+
+   if ((XlateObj->flXlate & XO_TABLE) &&
+       XlateGDI->translationTable != NULL)
+   {
+      EngFreeMem(XlateGDI->translationTable);
+   }
+
+   FreeGDIHandle((ULONG)HXlate);
+}
+
 /*
  * @implemented
  */
@@ -390,7 +381,7 @@ XLATEOBJ_iXlate(XLATEOBJ *XlateObj, ULONG Color)
       return Color;
 
    if (XlateObj->flXlate & XO_TABLE)
-      return XlateObj->pulXlate[Color];         
+      return XlateObj->pulXlate[Color];
 
    XlateGDI = (XLATEGDI *)AccessInternalObjectFromUserObject(XlateObj);
 
diff --git a/reactos/subsys/win32k/include/copybits.h b/reactos/subsys/win32k/include/copybits.h
deleted file mode 100644
index 75c986ab390..00000000000
--- a/reactos/subsys/win32k/include/copybits.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __WIN32K_COPYBITS_H
-#define __WIN32K_COPYBITS_H
-
-BOOLEAN STDCALL CopyBitsCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                     SURFGDI *DestGDI,  SURFGDI *SourceGDI,
-                     PRECTL  DestRect,  POINTL  *SourcePoint,
-                     ULONG   Delta,     XLATEOBJ *ColorTranslation);
-
-#endif /* __WIN32K_COPYBITS_H */
diff --git a/reactos/subsys/win32k/include/dib.h b/reactos/subsys/win32k/include/dib.h
index 403d1e1673b..80a2fc4d7a3 100644
--- a/reactos/subsys/win32k/include/dib.h
+++ b/reactos/subsys/win32k/include/dib.h
@@ -16,8 +16,6 @@ DIB_GetDIBWidthBytes (INT width, INT depth);
 RGBQUAD * FASTCALL
 DIB_MapPaletteColors(PDC dc, CONST BITMAPINFO* lpbmi);
 
-PPALETTEENTRY STDCALL
-DIBColorTableToPaletteEntries(PPALETTEENTRY palEntries, const RGBQUAD *DIBColorTable, ULONG ColorCount);
 HPALETTE FASTCALL
 BuildDIBPalette (PBITMAPINFO bmi, PINT paletteType);
 
diff --git a/reactos/subsys/win32k/include/eng.h b/reactos/subsys/win32k/include/eng.h
index 52d0d98039b..cafed3f9bff 100644
--- a/reactos/subsys/win32k/include/eng.h
+++ b/reactos/subsys/win32k/include/eng.h
@@ -1,12 +1,6 @@
 #ifndef _WIN32K_ENG_H
 #define _WIN32K_ENG_H
 
-#define IntLockGDIDriver(SurfGDI) \
-  ExAcquireFastMutex(SurfGDI->DriverLock)
-
-#define IntUnLockGDIDriver(SurfGDI) \
-  ExReleaseFastMutex(SurfGDI->DriverLock)
-
 BOOL STDCALL  EngIntersectRect (PRECTL prcDst, PRECTL prcSrc1, PRECTL prcSrc2);
 VOID FASTCALL EngDeleteXlate (XLATEOBJ *XlateObj);
 BOOL STDCALL
diff --git a/reactos/subsys/win32k/include/inteng.h b/reactos/subsys/win32k/include/inteng.h
index 2f90775eb3a..2f55e696e71 100644
--- a/reactos/subsys/win32k/include/inteng.h
+++ b/reactos/subsys/win32k/include/inteng.h
@@ -5,30 +5,34 @@
 
 /* Definitions of IntEngXxx functions */
 
-BOOL STDCALL IntEngLineTo(SURFOBJ *Surface,
-                                 CLIPOBJ *Clip,
-                                 BRUSHOBJ *Brush,
-                                 LONG x1,
-                                 LONG y1,
-                                 LONG x2,
-                                 LONG y2,
-                                 RECTL *RectBounds,
-                                 MIX mix);
-BOOL STDCALL IntEngBitBlt(SURFOBJ *DestObj,
-	                  SURFOBJ *SourceObj,
-	                  SURFOBJ *Mask,
-	                  CLIPOBJ *ClipRegion,
-	                  XLATEOBJ *ColorTranslation,
-	                  RECTL *DestRect,
-	                  POINTL *SourcePoint,
-	                  POINTL *MaskOrigin,
-	                  BRUSHOBJ *Brush,
-	                  POINTL *BrushOrigin,
-	                  ROP4 rop4);
 BOOL STDCALL
-IntEngStretchBlt(SURFOBJ *DestObj,
-                 SURFOBJ *SourceObj,
-                 SURFOBJ *Mask,
+IntEngLineTo(BITMAPOBJ *Surface,
+             CLIPOBJ *Clip,
+             BRUSHOBJ *Brush,
+             LONG x1,
+             LONG y1,
+             LONG x2,
+             LONG y2,
+             RECTL *RectBounds,
+             MIX mix);
+
+BOOL STDCALL
+IntEngBitBlt(BITMAPOBJ *DestObj,
+	     BITMAPOBJ *SourceObj,
+	     BITMAPOBJ *Mask,
+	     CLIPOBJ *ClipRegion,
+	     XLATEOBJ *ColorTranslation,
+	     RECTL *DestRect,
+	     POINTL *SourcePoint,
+	     POINTL *MaskOrigin,
+	     BRUSHOBJ *Brush,
+	     POINTL *BrushOrigin,
+	     ROP4 rop4);
+
+BOOL STDCALL
+IntEngStretchBlt(BITMAPOBJ *DestObj,
+                 BITMAPOBJ *SourceObj,
+                 BITMAPOBJ *Mask,
                  CLIPOBJ *ClipRegion,
                  XLATEOBJ *ColorTranslation,
                  RECTL *DestRect,
@@ -39,44 +43,57 @@ IntEngStretchBlt(SURFOBJ *DestObj,
                  ULONG Mode);
 
 BOOL STDCALL
-IntEngGradientFill(
-    SURFOBJ  *psoDest,
-    CLIPOBJ  *pco,
-    XLATEOBJ  *pxlo,
-    TRIVERTEX  *pVertex,
-    ULONG  nVertex,
-    PVOID  pMesh,
-    ULONG  nMesh,
-    RECTL  *prclExtents,
-    POINTL  *pptlDitherOrg,
-    ULONG  ulMode);
+IntEngGradientFill(BITMAPOBJ *psoDest,
+                   CLIPOBJ *pco,
+                   XLATEOBJ *pxlo,
+                   TRIVERTEX *pVertex,
+                   ULONG nVertex,
+                   PVOID pMesh,
+                   ULONG nMesh,
+                   RECTL *prclExtents,
+                   POINTL *pptlDitherOrg,
+                   ULONG ulMode);
 
-XLATEOBJ * STDCALL IntEngCreateXlate(USHORT DestPalType,
-                            USHORT SourcePalType,
-                            HPALETTE PaletteDest,
-                            HPALETTE PaletteSource);
+XLATEOBJ * STDCALL
+IntEngCreateXlate(USHORT DestPalType,
+                  USHORT SourcePalType,
+                  HPALETTE PaletteDest,
+                  HPALETTE PaletteSource);
 
-XLATEOBJ * STDCALL IntEngCreateMonoXlate(
-   USHORT SourcePalType, HPALETTE PaletteDest, HPALETTE PaletteSource,
-   ULONG BackgroundColor);
+XLATEOBJ * STDCALL
+IntEngCreateMonoXlate(USHORT SourcePalType,
+                      HPALETTE PaletteDest,
+                      HPALETTE PaletteSource,
+                      ULONG BackgroundColor);
 			
-BOOL STDCALL IntEngPolyline(SURFOBJ *DestSurf,
-	                           CLIPOBJ *Clip,
-	                           BRUSHOBJ *Brush,
-	                           CONST LPPOINT  pt,
-				   LONG dCount,
-	                           MIX mix);
-CLIPOBJ* STDCALL IntEngCreateClipRegion(ULONG count,
-					 PRECTL pRect,
-					 PRECTL rcBounds);
+BOOL STDCALL
+IntEngPolyline(BITMAPOBJ *DestSurf,
+               CLIPOBJ *Clip,
+               BRUSHOBJ *Brush,
+               CONST LPPOINT  pt,
+               LONG dCount,
+               MIX mix);
+
+CLIPOBJ* STDCALL
+IntEngCreateClipRegion(ULONG count,
+                       PRECTL pRect,
+                       PRECTL rcBounds);
 
 BOOL FASTCALL
-IntEngTransparentBlt(SURFOBJ *Dest,
-                     SURFOBJ *Source,
+IntEngTransparentBlt(BITMAPOBJ *Dest,
+                     BITMAPOBJ *Source,
                      CLIPOBJ *Clip,
                      XLATEOBJ *ColorTranslation,
                      PRECTL DestRect,
                      PRECTL SourceRect,
                      ULONG iTransColor,
                      ULONG Reserved);
+
+BOOL STDCALL
+IntEngPaint(IN BITMAPOBJ *Surface,
+            IN CLIPOBJ *ClipRegion,
+            IN BRUSHOBJ *Brush,
+            IN POINTL *BrushOrigin,
+            IN MIX Mix);
+
 #endif /* _WIN32K_INTENG_H */
diff --git a/reactos/subsys/win32k/include/mouse.h b/reactos/subsys/win32k/include/mouse.h
index cd8de7d3ed8..d114c682583 100644
--- a/reactos/subsys/win32k/include/mouse.h
+++ b/reactos/subsys/win32k/include/mouse.h
@@ -7,8 +7,8 @@
 
 BOOL FASTCALL IntCheckClipCursor(LONG *x, LONG *y, PSYSTEM_CURSORINFO CurInfo);
 BOOL FASTCALL IntSwapMouseButton(PWINSTATION_OBJECT WinStaObject, BOOL Swap);
-INT  FASTCALL MouseSafetyOnDrawStart(SURFOBJ *SurfObj, SURFGDI *SurfGDI, LONG HazardX1, LONG HazardY1, LONG HazardX2, LONG HazardY2);
-INT  FASTCALL MouseSafetyOnDrawEnd(SURFOBJ *SurfObj, SURFGDI *SurfGDI);
+INT  FASTCALL MouseSafetyOnDrawStart(SURFOBJ *SurfObj, LONG HazardX1, LONG HazardY1, LONG HazardX2, LONG HazardY2);
+INT  FASTCALL MouseSafetyOnDrawEnd(SURFOBJ *SurfObj);
 BOOL FASTCALL MouseMoveCursor(LONG X, LONG Y);
 VOID FASTCALL EnableMouse(HDC hDisplayDC);
 VOID          MouseGDICallBack(PMOUSE_INPUT_DATA Data, ULONG InputCount);
diff --git a/reactos/subsys/win32k/include/object.h b/reactos/subsys/win32k/include/object.h
index 5bfc3ea1e02..859b4f21ccb 100644
--- a/reactos/subsys/win32k/include/object.h
+++ b/reactos/subsys/win32k/include/object.h
@@ -132,12 +132,6 @@ BOOL  FASTCALL CleanupForProcess (struct _EPROCESS *Process, INT Pid);
 
 PPOINT FASTCALL GDI_Bezier (const POINT *Points, INT count, PINT nPtsOut);
 
-/* objects/objconv.c */
-
-HBITMAP
-FASTCALL
-BitmapToSurf ( PBITMAPOBJ BitmapObj, HDEV GDIDevice );
-
 #endif /* _WIN32K_OBJECT_H */
 
 /* EOF */
diff --git a/reactos/subsys/win32k/include/paint.h b/reactos/subsys/win32k/include/paint.h
index 4f10180407c..80c5ea801a0 100644
--- a/reactos/subsys/win32k/include/paint.h
+++ b/reactos/subsys/win32k/include/paint.h
@@ -2,6 +2,6 @@
 #define _WIN32K_PAINT_H
 
 BOOL STDCALL FillSolid (SURFOBJ* Surface, RECTL* Dimensions, ULONG iColor);
-BOOL STDCALL FillPolygon ( DC* dc, SURFOBJ* SurfObj, BRUSHOBJ* BrushObj, MIX RopMode, CONST PPOINT Points, INT Count, RECTL BoundRect );
+BOOL STDCALL FillPolygon ( DC* dc, BITMAPOBJ* SurfObj, BRUSHOBJ* BrushObj, MIX RopMode, CONST PPOINT Points, INT Count, RECTL BoundRect );
 
 #endif /* _WIN32K_PAINT_H */
diff --git a/reactos/subsys/win32k/include/surface.h b/reactos/subsys/win32k/include/surface.h
index ce8a6de27c6..4629f9a2b08 100644
--- a/reactos/subsys/win32k/include/surface.h
+++ b/reactos/subsys/win32k/include/surface.h
@@ -1,7 +1,11 @@
 #ifndef _WIN32K_SURFACE_H
 #define _WIN32K_SURFACE_H
 
+#define GDIDEV(SurfObj) ((GDIDEVICE *)((SurfObj)->hdev))
+#define GDIDEVFUNCS(SurfObj) ((GDIDEVICE *)((SurfObj)->hdev))->DriverFunctions
+
 INT   FASTCALL BitsPerFormat (ULONG Format);
 ULONG FASTCALL BitmapFormat (WORD Bits, DWORD Compression);
+HBITMAP FASTCALL IntCreateBitmap(IN SIZEL Size, IN LONG Width, IN ULONG Format, IN ULONG Flags, IN PVOID Bits);
 
 #endif /* _WIN32K_SURFACE_H */
diff --git a/reactos/subsys/win32k/makefile b/reactos/subsys/win32k/makefile
index 9a50688c475..e5843d6434c 100644
--- a/reactos/subsys/win32k/makefile
+++ b/reactos/subsys/win32k/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.100 2004/05/28 21:33:40 gvg Exp $
+# $Id: makefile,v 1.101 2004/07/03 13:55:36 navaraf Exp $
 
 PATH_TO_TOP = ../..
 
@@ -44,7 +44,7 @@ TARGET_LFLAGS =\
 ENG_OBJECTS= eng/debug.o eng/error.o eng/mem.o eng/brush.o eng/bitblt.o \
     eng/clip.o eng/copybits.o eng/device.o eng/handle.o eng/lineto.o \
     eng/paint.o eng/palette.o eng/perfcnt.o eng/semaphor.o eng/surface.o \
-    eng/xlate.o eng/transblt.o eng/mouse.o eng/misc.o eng/nls.o eng/sort.o \
+    eng/xlate.o eng/transblt.o eng/mouse.o eng/misc.o eng/sort.o \
     eng/gradient.o eng/event.o eng/float.o
 
 MAIN_OBJECTS = main/dllmain.o main/svctabm.o
@@ -67,9 +67,8 @@ OBJECTS_OBJECTS = objects/bitmaps.o objects/brush.o objects/cliprgn.o  \
                   objects/line.o objects/metafile.o objects/paint.o  \
                   objects/path.o objects/pen.o objects/print.o  \
                   objects/region.o objects/text.o objects/wingl.o \
-                  objects/bezier.o objects/objconv.o objects/dib.o \
-                  objects/palette.o objects/rect.o objects/polyfill.o \
-                  objects/cursoricon.o
+                  objects/bezier.o objects/dib.o objects/palette.o \
+                  objects/rect.o objects/polyfill.o objects/cursoricon.o
 
 DIB_OBJECTS = dib/dib.o dib/dib1bpp.o dib/dib4bpp.o dib/dib8bpp.o dib/dib16bpp.o \
               dib/dib24bpp.o dib/dib32bpp.o
diff --git a/reactos/subsys/win32k/ntuser/desktop.c b/reactos/subsys/win32k/ntuser/desktop.c
index c368b01ccd3..dcb00662e55 100644
--- a/reactos/subsys/win32k/ntuser/desktop.c
+++ b/reactos/subsys/win32k/ntuser/desktop.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *  $Id: desktop.c,v 1.15 2004/05/28 21:33:41 gvg Exp $
+ *  $Id: desktop.c,v 1.16 2004/07/03 13:55:36 navaraf Exp $
  *
  *  COPYRIGHT:        See COPYING in the top level directory
  *  PROJECT:          ReactOS kernel
@@ -110,13 +110,14 @@ IntGetDesktopWorkArea(PDESKTOP_OBJECT Desktop, PRECT Rect)
   if((Ret->right == -1) && ScreenDeviceContext)
   {
     PDC dc;
-    SURFOBJ *SurfObj;
+    BITMAPOBJ *BitmapObj;
     dc = DC_LockDc(ScreenDeviceContext);
-    SurfObj = (SURFOBJ*)AccessUserObject((ULONG) dc->Surface);
-    if(SurfObj)
+    BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap);
+    if(BitmapObj)
     {
-      Ret->right = SurfObj->sizlBitmap.cx;
-      Ret->bottom = SurfObj->sizlBitmap.cy;
+      Ret->right = BitmapObj->SurfObj.sizlBitmap.cx;
+      Ret->bottom = BitmapObj->SurfObj.sizlBitmap.cy;
+      BITMAPOBJ_UnlockBitmap(dc->w.hBitmap);
     }
     DC_UnlockDc(ScreenDeviceContext);
   }
diff --git a/reactos/subsys/win32k/ntuser/input.c b/reactos/subsys/win32k/ntuser/input.c
index 039b607879e..e86347993d6 100644
--- a/reactos/subsys/win32k/ntuser/input.c
+++ b/reactos/subsys/win32k/ntuser/input.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: input.c,v 1.34 2004/05/25 15:52:45 navaraf Exp $
+/* $Id: input.c,v 1.35 2004/07/03 13:55:36 navaraf Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -530,10 +530,13 @@ IntMouseInput(MOUSEINPUT *mi)
   PWINSTATION_OBJECT WinSta;
   BOOL DoMove, SwapButtons;
   MSG Msg;
+  HBITMAP hBitmap;
+  BITMAPOBJ *BitmapObj;
   SURFOBJ *SurfObj;
-  PSURFGDI SurfGDI;
   PDC dc;
   RECTL PointerRect;
+  PWINDOW_OBJECT DesktopWindow;
+  NTSTATUS Status;
   
 #if 1
   HDC hDC;
@@ -558,13 +561,6 @@ IntMouseInput(MOUSEINPUT *mi)
   
   CurInfo = IntGetSysCursorInfo(WinSta);
   
-  dc = DC_LockDc(hDC);
-  SurfObj = (SURFOBJ*)AccessUserObject((ULONG) dc->Surface);
-  SurfGDI = (PSURFGDI)AccessInternalObject((ULONG) dc->Surface);
-  DC_UnlockDc(hDC);
-  ASSERT(SurfObj);
-  ASSERT(SurfGDI);
-  
   if(!mi->time)
   {
     LARGE_INTEGER LargeTickCount;
@@ -574,6 +570,7 @@ IntMouseInput(MOUSEINPUT *mi)
   
   SwapButtons = CurInfo->SwapButtons;
   DoMove = FALSE;
+
   ExAcquireFastMutex(&CurInfo->CursorMutex);
   MousePos.x = CurInfo->x;
   MousePos.y = CurInfo->y;
@@ -590,14 +587,21 @@ IntMouseInput(MOUSEINPUT *mi)
       MousePos.y += mi->dy;
     }
     
+    Status = ObmReferenceObjectByHandle(WinSta->HandleTable,
+      WinSta->ActiveDesktop->DesktopWindow, otWindow, (PVOID*)&DesktopWindow);
+    if (NT_SUCCESS(Status))
+    {
+      if(MousePos.x >= DesktopWindow->ClientRect.right)
+        MousePos.x = DesktopWindow->ClientRect.right - 1;
+      if(MousePos.y >= DesktopWindow->ClientRect.bottom)
+        MousePos.y = DesktopWindow->ClientRect.bottom - 1;
+    }
+    ObmDereferenceObject(DesktopWindow);
+
     if(MousePos.x < 0)
       MousePos.x = 0;
     if(MousePos.y < 0)
       MousePos.y = 0;
-    if(MousePos.x >= SurfObj->sizlBitmap.cx)
-      MousePos.x = SurfObj->sizlBitmap.cx - 1;
-    if(MousePos.y >= SurfObj->sizlBitmap.cy)
-      MousePos.y = SurfObj->sizlBitmap.cy - 1;
     
     if(CurInfo->CursorClipInfo.IsClipped)
     {
@@ -613,28 +617,48 @@ IntMouseInput(MOUSEINPUT *mi)
         MousePos.y = (LONG)CurInfo->CursorClipInfo.Top;
     }
     
-    if((DoMove = (MousePos.x != CurInfo->x || MousePos.y != CurInfo->y)))
+    DoMove = (MousePos.x != CurInfo->x || MousePos.y != CurInfo->y);
+    if(DoMove)
     {
       CurInfo->x = MousePos.x;
       CurInfo->y = MousePos.y;
-      if(SurfGDI->MovePointer)
-      {
-        IntLockGDIDriver(SurfGDI);
-        SurfGDI->MovePointer(SurfObj, CurInfo->x, CurInfo->y, &PointerRect);
-        IntUnLockGDIDriver(SurfGDI);
-      }
-      else
-      {
-        IntLockGDIDriver(SurfGDI);
-        EngMovePointer(SurfObj, CurInfo->x, CurInfo->y, &PointerRect);
-        IntUnLockGDIDriver(SurfGDI);
-      }
-      SetPointerRect(CurInfo, &PointerRect);
     }
   }
 
   ExReleaseFastMutex(&CurInfo->CursorMutex);
   
+  if (DoMove)
+  {
+    dc = DC_LockDc(hDC);
+    if (dc)
+    {
+      hBitmap = dc->w.hBitmap;
+      DC_UnlockDc(hDC);
+
+      BitmapObj = BITMAPOBJ_LockBitmap(hBitmap);
+      if (BitmapObj)
+      {
+        SurfObj = &BitmapObj->SurfObj;
+
+        if(GDIDEVFUNCS(SurfObj).MovePointer)
+        {
+          GDIDEVFUNCS(SurfObj).MovePointer(
+             SurfObj, MousePos.x, MousePos.y, &PointerRect);
+        }
+        else
+        {
+          EngMovePointer(SurfObj, MousePos.x, MousePos.y, &PointerRect);
+        }
+
+        BITMAPOBJ_UnlockBitmap(hBitmap);
+
+        ExAcquireFastMutex(&CurInfo->CursorMutex);
+        SetPointerRect(CurInfo, &PointerRect);
+        ExReleaseFastMutex(&CurInfo->CursorMutex);
+      }
+    }
+  }
+
   /*
    * Insert the messages into the system queue
    */
diff --git a/reactos/subsys/win32k/ntuser/misc.c b/reactos/subsys/win32k/ntuser/misc.c
index a0b1f75dea9..edab9193f2c 100644
--- a/reactos/subsys/win32k/ntuser/misc.c
+++ b/reactos/subsys/win32k/ntuser/misc.c
@@ -1,4 +1,4 @@
-/* $Id: misc.c,v 1.80 2004/06/24 09:44:06 weiden Exp $
+/* $Id: misc.c,v 1.81 2004/07/03 13:55:36 navaraf Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -735,18 +735,12 @@ IntSystemParametersInfo(
     case SPI_GETGRADIENTCAPTIONS:
     {
       HDC hDC;
-      PDC dc;
-      SURFOBJ *SurfObj;
       BOOL Ret = GradientCaptions;
       
       hDC = IntGetScreenDC();
       if(hDC)
       {
-        dc = DC_LockDc(hDC);
-        SurfObj = (SURFOBJ*)AccessUserObject((ULONG) dc->Surface);
-        if(SurfObj)
-          Ret = (SurfObj->iBitmapFormat > BMF_8BPP) && Ret;
-        DC_UnlockDc(hDC);
+        Ret = (NtGdiGetDeviceCaps(hDC, BITSPIXEL) > 8) && Ret;
         
         ASSERT(pvParam);
         *((PBOOL)pvParam) = Ret;
diff --git a/reactos/subsys/win32k/objects/bitmaps.c b/reactos/subsys/win32k/objects/bitmaps.c
index 003815b6471..92aa42b2f36 100644
--- a/reactos/subsys/win32k/objects/bitmaps.c
+++ b/reactos/subsys/win32k/objects/bitmaps.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: bitmaps.c,v 1.75 2004/06/28 17:03:35 navaraf Exp $ */
+/* $Id: bitmaps.c,v 1.76 2004/07/03 13:55:36 navaraf Exp $ */
 #include <w32k.h>
 
 #define IN_RECT(r,x,y) \
@@ -41,8 +41,7 @@ NtGdiBitBlt(
 {
 	PDC DCDest = NULL;
 	PDC DCSrc  = NULL;
-	SURFOBJ *SurfDest, *SurfSrc;
-	PSURFGDI SurfGDIDest, SurfGDISrc;
+	BITMAPOBJ *BitmapDest, *BitmapSrc;
 	RECTL DestRect;
 	POINTL SourcePoint, BrushOrigin;
 	BOOL Status;
@@ -107,17 +106,17 @@ NtGdiBitBlt(
 	BrushOrigin.y = 0;
 
 	/* Determine surfaces to be used in the bitblt */
-	SurfDest = (SURFOBJ*)AccessUserObject((ULONG)DCDest->Surface);
-	SurfGDIDest = (PSURFGDI)AccessInternalObjectFromUserObject(SurfDest);
+	BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap);
 	if (UsesSource)
 	{
-		SurfSrc  = (SURFOBJ*)AccessUserObject((ULONG)DCSrc->Surface);
-		SurfGDISrc  = (PSURFGDI)AccessInternalObjectFromUserObject(SurfSrc);
+	        if (DCSrc->w.hBitmap == DCDest->w.hBitmap)
+			BitmapSrc = BitmapDest;
+		else
+			BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap);
 	}
 	else
 	{
-		SurfSrc  = NULL;
-		SurfGDISrc  = NULL;
+		BitmapSrc = NULL;
 	}
 
 	if (UsesPattern)
@@ -223,10 +222,15 @@ NtGdiBitBlt(
 	}
 
 	/* Perform the bitblt operation */
-	Status = IntEngBitBlt(SurfDest, SurfSrc, NULL, DCDest->CombinedClip, XlateObj,
+	Status = IntEngBitBlt(BitmapDest, BitmapSrc, NULL, DCDest->CombinedClip, XlateObj,
 		&DestRect, &SourcePoint, NULL, &BrushObj->BrushObject, &BrushOrigin, ROP);
 
 	EngDeleteXlate(XlateObj);
+	BITMAPOBJ_UnlockBitmap(DCDest->w.hBitmap);
+	if (UsesSource && DCSrc->w.hBitmap != DCDest->w.hBitmap)
+	{
+		BITMAPOBJ_UnlockBitmap(DCSrc->w.hBitmap);
+	}
 	if (NULL != Mono)
 	{
 		EngDeletePalette(Mono);
@@ -260,7 +264,7 @@ NtGdiTransparentBlt(
 {
   PDC DCDest, DCSrc;
   RECTL rcDest, rcSrc;
-  SURFOBJ *SurfDest, *SurfSrc;
+  BITMAPOBJ *BitmapDest, *BitmapSrc;
   XLATEOBJ *XlateObj;
   HPALETTE SourcePalette, DestPalette;
   PPALGDI PalDestGDI, PalSourceGDI;
@@ -336,10 +340,10 @@ NtGdiTransparentBlt(
   /* Create the XLATE object to convert colors between source and destination */
   XlateObj = (XLATEOBJ*)IntEngCreateXlate(PalDestMode, PalSrcMode, DestPalette, SourcePalette);
   
-  SurfDest = (SURFOBJ*)AccessUserObject((ULONG)DCDest->Surface);
-  ASSERT(SurfDest);
-  SurfSrc = (SURFOBJ*)AccessUserObject((ULONG)DCSrc->Surface);
-  ASSERT(SurfSrc);
+  BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap);
+  ASSERT(BitmapDest);
+  BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap);
+  ASSERT(BitmapSrc);
   
   rcDest.left = xDst;
   rcDest.top = yDst;
@@ -356,10 +360,12 @@ NtGdiTransparentBlt(
     goto done;
   }
   
-  Ret = IntEngTransparentBlt(SurfDest, SurfSrc, DCDest->CombinedClip, XlateObj, &rcDest, &rcSrc, 
+  Ret = IntEngTransparentBlt(BitmapDest, BitmapSrc, DCDest->CombinedClip, XlateObj, &rcDest, &rcSrc, 
                              TransparentColor, 0);
   
 done:
+  BITMAPOBJ_UnlockBitmap(DCDest->w.hBitmap);
+  BITMAPOBJ_UnlockBitmap(DCSrc->w.hBitmap);
   DC_UnlockDc(hdcSrc);
   if(hdcDst != hdcSrc)
   {
@@ -380,73 +386,54 @@ NtGdiCreateBitmap(
 	UINT  BitsPerPel,
 	CONST VOID *Bits)
 {
-	PBITMAPOBJ  bmp;
-	HBITMAP  hBitmap;
+   PBITMAPOBJ bmp;
+   HBITMAP hBitmap;
+   SIZEL Size;
 
-	Planes = (BYTE) Planes;
-	BitsPerPel = (BYTE) BitsPerPel;
+   /* NOTE: Windows also doesn't store nr. of planes separately! */
+   BitsPerPel = (BYTE)BitsPerPel * (BYTE)Planes;
 
-	/* Check parameters */
-	if (!Height || !Width)
-	{
-		Width = 1;
-		Height = 1;
-	}
-	if (Planes != 1)
-	{
-		DPRINT("NtGdiCreateBitmap - UNIMPLEMENTED\n");
-		return  0;
-	}
-	if (Height < 0)
-	{
-		Height = -Height;
-	}
-	if (Width < 0)
-	{
-		Width = -Width;
-	}
+   /* Check parameters */
+   if (!Height || !Width)
+   {
+      Size.cx = Size.cy = 1;
+   }
+   else
+   {
+      Size.cx = Width;
+      Size.cy = abs(Height);
+   }
 
-	/* Create the BITMAPOBJ */
-	hBitmap = BITMAPOBJ_AllocBitmap ();
-	if (!hBitmap)
-	{
-		DPRINT("NtGdiCreateBitmap: BITMAPOBJ_AllocBitmap returned 0\n");
-		return 0;
-	}
+   /* Create the bitmap object. */
+   hBitmap = IntCreateBitmap(Size, BITMAPOBJ_GetWidthBytes(Width, BitsPerPel),
+                             BitmapFormat(BitsPerPel, BI_RGB),
+                             (Height > 0 ? 0 : BMF_TOPDOWN) |
+                             (Bits == NULL ? 0 : BMF_NOZEROINIT), NULL);
+   if (!hBitmap)
+   {
+      DPRINT("NtGdiCreateBitmap: IntCreateBitmap returned 0\n");
+      return 0;
+   }
 
-	bmp = BITMAPOBJ_LockBitmap( hBitmap );
+   DPRINT("NtGdiCreateBitmap:%dx%d, %d BPP colors returning %08x\n",
+          Size.cx, Size.cy, BitsPerPel, hBitmap);
 
-	DPRINT("NtGdiCreateBitmap:%dx%d, %d (%d BPP) colors returning %08x\n", Width, Height,
-		1 << (Planes * BitsPerPel), BitsPerPel, bmp);
+   bmp = BITMAPOBJ_LockBitmap( hBitmap );
+   bmp->flFlags = BITMAPOBJ_IS_APIBITMAP;
+   BITMAPOBJ_UnlockBitmap( hBitmap );
 
-	bmp->dimension.cx = 0;
-	bmp->dimension.cy = 0;
-	bmp->bitmap.bmType = 0;
-	bmp->bitmap.bmWidth = Width;
-	bmp->bitmap.bmHeight = Height;
-	bmp->bitmap.bmPlanes = Planes;
-	bmp->bitmap.bmBitsPixel = BitsPerPel;
-	bmp->bitmap.bmWidthBytes = BITMAPOBJ_GetWidthBytes (Width, BitsPerPel);
-	bmp->bitmap.bmBits = NULL;
-	bmp->DDBitmap = NULL;
-	bmp->dib = NULL;
+   /*
+    * NOTE: It's ugly practice, but we are using the object even
+    * after unlocking. Since the handle is currently known only
+    * to us it should be safe.
+    */
 
-	// Allocate memory for bitmap bits
-	bmp->bitmap.bmBits = ExAllocatePoolWithTag(PagedPool, bmp->bitmap.bmWidthBytes * bmp->bitmap.bmHeight, TAG_BITMAP);
+   if (Bits != NULL)
+   {
+      NtGdiSetBitmapBits(hBitmap, bmp->SurfObj.cjBits, Bits);
+   }
 
-	BITMAPOBJ_UnlockBitmap( hBitmap );
-
-	if (Bits) /* Set bitmap bits */
-	{
-		NtGdiSetBitmapBits(hBitmap, Height * bmp->bitmap.bmWidthBytes, Bits);
-	}
-	else
-	{
-		// Initialize the bitmap (fixes bug 244?)
-		RtlZeroMemory(bmp->bitmap.bmBits, Height * bmp->bitmap.bmWidthBytes);
-	}
-
-	return  hBitmap;
+   return hBitmap;
 }
 
 BOOL FASTCALL
@@ -454,23 +441,16 @@ Bitmap_InternalDelete( PBITMAPOBJ pBmp )
 {
 	ASSERT( pBmp );
 
-	if (NULL != pBmp->bitmap.bmBits)
+	if (pBmp->SurfObj.pvBits != NULL &&
+	    (pBmp->flFlags & BITMAPOBJ_IS_APIBITMAP))
 	{
-		if (NULL != pBmp->dib)
+		if (pBmp->dib == NULL)
 		{
-			if (NULL == pBmp->dib->dshSection)
-			{
-				EngFreeUserMem(pBmp->bitmap.bmBits);
-			}
-			else
-			{
-				/* This is a file-mapped section */
-				UNIMPLEMENTED;
-			}
+			ExFreePool(pBmp->SurfObj.pvBits);
 		}
 		else
 		{
-			ExFreePool(pBmp->bitmap.bmBits);
+			EngFreeUserMem(pBmp->SurfObj.pvBits);
 		}
 	}
 
@@ -600,7 +580,7 @@ NtGdiGetPixel(HDC hDC, INT XPos, INT YPos)
 	PDC dc = NULL;
 	COLORREF Result = (COLORREF)CLR_INVALID; // default to failure
 	BOOL bInRect = FALSE;
-	PSURFGDI Surface;
+	BITMAPOBJ *BitmapObject;
 	SURFOBJ *SurfaceObject;
 	HPALETTE Pal;
 	PPALGDI PalGDI;
@@ -617,10 +597,9 @@ NtGdiGetPixel(HDC hDC, INT XPos, INT YPos)
 	if ( IN_RECT(dc->CombinedClip->rclBounds,XPos,YPos) )
 	{
 		bInRect = TRUE;
-		SurfaceObject = (SURFOBJ*)AccessUserObject((ULONG)dc->Surface);
-		ASSERT(SurfaceObject);
-		Surface = (PSURFGDI)AccessInternalObjectFromUserObject(SurfaceObject);
-		if ( Surface )
+		BitmapObject = BITMAPOBJ_LockBitmap(dc->w.hBitmap);
+		SurfaceObject = &BitmapObject->SurfObj;
+		if ( BitmapObject )
 		{
 			if ( dc->w.hPalette != 0 )
 				Pal = dc->w.hPalette;
@@ -637,13 +616,15 @@ NtGdiGetPixel(HDC hDC, INT XPos, INT YPos)
 					// check if this DC has a DIB behind it...
 					if ( SurfaceObject->pvScan0 ) // STYPE_BITMAP == SurfaceObject->iType
 					{
-						ASSERT ( SurfaceObject->lDelta && Surface->DIB_GetPixel );
-						Result = XLATEOBJ_iXlate(XlateObj, Surface->DIB_GetPixel ( SurfaceObject, XPos, YPos ) );
+						ASSERT ( SurfaceObject->lDelta );
+						Result = XLATEOBJ_iXlate(XlateObj,
+							DibFunctionsForBitmapFormat[SurfaceObject->iBitmapFormat].DIB_GetPixel ( SurfaceObject, XPos, YPos ) );
 					}
 					EngDeleteXlate(XlateObj);
 				}
 			}
 		}
+		BITMAPOBJ_UnlockBitmap(dc->w.hBitmap);
 	}
 	DC_UnlockDc(hDC);
 
@@ -673,7 +654,7 @@ NtGdiGetPixel(HDC hDC, INT XPos, INT YPos)
 					bmpobj = BITMAPOBJ_LockBitmap ( hBmpTmp );
 					if ( bmpobj )
 					{
-						Result = *(COLORREF*)bmpobj->bitmap.bmBits;
+						Result = *(COLORREF*)bmpobj->SurfObj.pvScan0;
 						BITMAPOBJ_UnlockBitmap ( hBmpTmp );
 					}
 				}
@@ -935,19 +916,19 @@ NtGdiSetBitmapBits(
 	}
 
 	/* Only get entire lines */
-	height = Bytes / bmp->bitmap.bmWidthBytes;
-	if (height > bmp->bitmap.bmHeight)
+	height = Bytes / abs(bmp->SurfObj.lDelta);
+	if (height > bmp->SurfObj.sizlBitmap.cx)
 	{
-		height = bmp->bitmap.bmHeight;
+		height = bmp->SurfObj.sizlBitmap.cx;
 	}
-	Bytes = height * bmp->bitmap.bmWidthBytes;
+	Bytes = height * abs(bmp->SurfObj.lDelta);
 	DPRINT ("(%08x, bytes:%ld, bits:%p) %dx%d %d colors fetched height: %ld\n",
 		hBitmap,
 		Bytes,
 		Bits,
-		bmp->bitmap.bmWidth,
-		bmp->bitmap.bmHeight,
-		1 << bmp->bitmap.bmBitsPixel,
+		bmp->SurfObj.sizlBitmap.cx,
+		bmp->SurfObj.sizlBitmap.cy,
+		1 << BitsPerFormat(bmp->SurfObj.iBitmapFormat),
 		height);
 
 #if 0
@@ -968,21 +949,8 @@ NtGdiSetBitmapBits(
 	else
 #endif
 	{
-		/* FIXME: Alloc enough for entire bitmap */
-		if (bmp->bitmap.bmBits == NULL)
-		{
-			bmp->bitmap.bmBits = ExAllocatePoolWithTag(PagedPool, Bytes, TAG_BITMAP);
-		}
-		if(!bmp->bitmap.bmBits)
-		{
-			DPRINT ("Unable to allocate bit buffer\n");
-			ret = 0;
-		}
-		else
-		{
-			memcpy(bmp->bitmap.bmBits, Bits, Bytes);
-			ret = Bytes;
-		}
+		memcpy(bmp->SurfObj.pvBits, Bits, Bytes);
+		ret = Bytes;
 	}
 
 	BITMAPOBJ_UnlockBitmap(hBitmap);
@@ -1072,8 +1040,7 @@ NtGdiStretchBlt(
 {
 	PDC DCDest = NULL;
 	PDC DCSrc  = NULL;
-	SURFOBJ *SurfDest, *SurfSrc;
-	PSURFGDI SurfGDIDest, SurfGDISrc;
+	BITMAPOBJ *BitmapDest, *BitmapSrc;
 	RECTL DestRect;
 	RECTL SourceRect;
 	BOOL Status;
@@ -1141,17 +1108,17 @@ NtGdiStretchBlt(
 	SourceRect.bottom = YOriginSrc+HeightSrc;
 
 	/* Determine surfaces to be used in the bitblt */
-	SurfDest = (SURFOBJ*)AccessUserObject((ULONG)DCDest->Surface);
-	SurfGDIDest = (PSURFGDI)AccessInternalObjectFromUserObject(SurfDest);
+	BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap);
 	if (UsesSource)
 	{
-		SurfSrc  = (SURFOBJ*)AccessUserObject((ULONG)DCSrc->Surface);
-		SurfGDISrc  = (PSURFGDI)AccessInternalObjectFromUserObject(SurfSrc);
+	        if (DCSrc->w.hBitmap == DCDest->w.hBitmap)
+			BitmapSrc = BitmapDest;
+		else
+			BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap);
 	}
 	else
 	{
-		SurfSrc  = NULL;
-		SurfGDISrc  = NULL;
+		BitmapSrc = NULL;
 	}
 
 	if (UsesPattern)
@@ -1227,10 +1194,15 @@ NtGdiStretchBlt(
 	}
 
 	/* Perform the bitblt operation */
-	Status = IntEngStretchBlt(SurfDest, SurfSrc, NULL, DCDest->CombinedClip,
+	Status = IntEngStretchBlt(BitmapDest, BitmapSrc, NULL, DCDest->CombinedClip,
 		XlateObj, &DestRect, &SourceRect, NULL, NULL, NULL, COLORONCOLOR);
 
 	EngDeleteXlate(XlateObj);
+	BITMAPOBJ_UnlockBitmap(DCDest->w.hBitmap);
+	if (UsesSource && DCSrc->w.hBitmap != DCDest->w.hBitmap)
+	{
+		BITMAPOBJ_UnlockBitmap(DCSrc->w.hBitmap);
+	}
 	if (UsesPattern)
 	{
 		BRUSHOBJ_UnlockBrush(DCDest->w.hBrush);
@@ -1283,20 +1255,14 @@ BITMAPOBJ_GetWidthBytes (INT bmWidth, INT bpp)
 HBITMAP FASTCALL
 BITMAPOBJ_CopyBitmap(HBITMAP  hBitmap)
 {
-	PBITMAPOBJ  bmp;
 	HBITMAP  res;
 	BITMAP  bm;
 
-	bmp = BITMAPOBJ_LockBitmap(hBitmap);
-	if (bmp == NULL)
+	if (IntGdiGetObject(hBitmap, sizeof(BITMAP), &bm) == 0)
 	{
 		return 0;
 	}
-	res = 0;
-
-	bm = bmp->bitmap;
 	bm.bmBits = NULL;
-	BITMAPOBJ_UnlockBitmap(hBitmap);
 	res = NtGdiCreateBitmapIndirect(&bm);
 	if(res)
 	{
@@ -1329,8 +1295,16 @@ BITMAP_GetObject(BITMAPOBJ * bmp, INT count, LPVOID buffer)
 	}
 	else
 	{
+		BITMAP Bitmap;
 		if (count > (INT) sizeof(BITMAP)) count = sizeof(BITMAP);
-		memcpy(buffer, &bmp->bitmap, count);
+		Bitmap.bmType = 0;
+		Bitmap.bmWidth = bmp->SurfObj.sizlBitmap.cx; 
+		Bitmap.bmHeight = bmp->SurfObj.sizlBitmap.cy; 
+		Bitmap.bmWidthBytes = abs(bmp->SurfObj.lDelta);
+		Bitmap.bmPlanes = 1; 
+		Bitmap.bmBitsPixel = BitsPerFormat(bmp->SurfObj.iBitmapFormat);
+		Bitmap.bmBits = bmp->SurfObj.pvBits; 
+		memcpy(buffer, &Bitmap, count);
 		return count;
 	}
 }
diff --git a/reactos/subsys/win32k/objects/brush.c b/reactos/subsys/win32k/objects/brush.c
index 4e0e911592b..ac0937ba0f1 100644
--- a/reactos/subsys/win32k/objects/brush.c
+++ b/reactos/subsys/win32k/objects/brush.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: brush.c,v 1.37 2004/05/10 17:07:20 weiden Exp $
+ * $Id: brush.c,v 1.38 2004/07/03 13:55:36 navaraf Exp $
  */
 #include <w32k.h>
 
@@ -127,12 +127,12 @@ IntPatBlt(
    PGDIBRUSHOBJ BrushObj)
 {
    RECTL DestRect;
-   SURFOBJ *SurfObj;
+   BITMAPOBJ *BitmapObj;
    POINTL BrushOrigin;
    BOOL ret;
 
-   SurfObj = (SURFOBJ *)AccessUserObject((ULONG)dc->Surface);
-   if (SurfObj == NULL)
+   BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap);
+   if (BitmapObj == NULL)
    {
       SetLastWin32Error(ERROR_INVALID_HANDLE);
       return FALSE;
@@ -167,7 +167,7 @@ IntPatBlt(
       BrushOrigin.y = BrushObj->ptOrigin.y + dc->w.DCOrgY;
 
       ret = IntEngBitBlt(
-         SurfObj,
+         BitmapObj,
          NULL,
          NULL,
          dc->CombinedClip,
@@ -180,6 +180,8 @@ IntPatBlt(
          ROP);
    }
 
+   BITMAPOBJ_UnlockBitmap(dc->w.hBitmap);
+
    return ret;
 }
 
diff --git a/reactos/subsys/win32k/objects/color.c b/reactos/subsys/win32k/objects/color.c
index a86dbdfd55b..709c11afc85 100644
--- a/reactos/subsys/win32k/objects/color.c
+++ b/reactos/subsys/win32k/objects/color.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: color.c,v 1.46 2004/07/02 20:04:48 gvg Exp $ */
+/* $Id: color.c,v 1.47 2004/07/03 13:55:36 navaraf Exp $ */
 #include <w32k.h>
 
 // FIXME: Use PXLATEOBJ logicalToSystem instead of int *mapping
@@ -320,7 +320,7 @@ UINT STDCALL NtGdiRealizePalette(HDC hDC)
   int realized = 0;
   PDC dc;
   HPALETTE systemPalette;
-  PSURFGDI SurfGDI;
+  SURFOBJ *SurfObj;
   BOOLEAN success;
   USHORT sysMode, palMode;
 
@@ -328,7 +328,7 @@ UINT STDCALL NtGdiRealizePalette(HDC hDC)
   if (!dc)
   	return 0;
 
-  SurfGDI = (PSURFGDI)AccessInternalObject((ULONG)dc->Surface);
+  SurfObj = (SURFOBJ*)AccessUserObject((ULONG)dc->Surface);
   systemPalette = NtGdiGetStockObject((INT)DEFAULT_PALETTE);
   palGDI = PALETTE_LockPalette(dc->w.hPalette);
   palPtr = (PALOBJ*) palGDI;
@@ -354,12 +354,11 @@ UINT STDCALL NtGdiRealizePalette(HDC hDC)
     // Memory managed DC
     DbgPrint("win32k: realizepalette unimplemented step 2 for DC_MEMORY");
   } else {
-    if(SurfGDI->SetPalette)
+    if(GDIDEVFUNCS(SurfObj).SetPalette)
     {
-      IntLockGDIDriver(SurfGDI);
       ASSERT(sysGDI->NumColors <= 256);
-      success = SurfGDI->SetPalette(dc->PDev, sysPtr, 0, 0, sysGDI->NumColors);
-      IntUnLockGDIDriver(SurfGDI);
+      success = GDIDEVFUNCS(SurfObj).SetPalette(
+        dc->PDev, sysPtr, 0, 0, sysGDI->NumColors);
     }
   }
 
diff --git a/reactos/subsys/win32k/objects/cursoricon.c b/reactos/subsys/win32k/objects/cursoricon.c
index 0c25fee46d6..995f10e0237 100644
--- a/reactos/subsys/win32k/objects/cursoricon.c
+++ b/reactos/subsys/win32k/objects/cursoricon.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: cursoricon.c,v 1.57 2004/05/30 14:01:13 weiden Exp $ */
+/* $Id: cursoricon.c,v 1.58 2004/07/03 13:55:36 navaraf Exp $ */
 #include <w32k.h>
 
 PCURICON_OBJECT FASTCALL
@@ -34,40 +34,19 @@ IntGetCurIconObject(PWINSTATION_OBJECT WinStaObject, HANDLE Handle)
    return Object;
 }
 
-HBITMAP FASTCALL
-IntCopyBitmap(HBITMAP bmp)
-{
-  PBITMAPOBJ src;
-  HBITMAP ret = (HBITMAP)0;
-  
-  if(!bmp)
-    return (HBITMAP)0;
-  
-  src = BITMAPOBJ_LockBitmap(bmp);
-  if(src)
-  {
-    ret = NtGdiCreateBitmap(src->bitmap.bmWidth, src->bitmap.bmHeight, src->bitmap.bmPlanes, 
-                            src->bitmap.bmBitsPixel, src->bitmap.bmBits);
-    BITMAPOBJ_UnlockBitmap(bmp);
-  }
-  
-  return ret;
-}
-
 #define COLORCURSORS_ALLOWED FALSE
 HCURSOR FASTCALL
 IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor,
    BOOL ForceChange)
 {
+   BITMAPOBJ *BitmapObj;
    SURFOBJ *SurfObj;
-   PSURFGDI SurfGDI;
-   SIZEL MouseSize;
    PDEVINFO DevInfo;
-   PBITMAPOBJ MaskBmpObj;
+   PBITMAPOBJ MaskBmpObj = NULL;
    PSYSTEM_CURSORINFO CurInfo;
    PCURICON_OBJECT OldCursor;
    HCURSOR Ret = (HCURSOR)0;
-   HBITMAP hMask = (HBITMAP)0, hColor = (HBITMAP)0;
+   HBITMAP hColor = (HBITMAP)0;
    SURFOBJ *soMask = NULL, *soColor = NULL;
    XLATEOBJ *XlateObj = NULL;
    RECTL PointerRect;
@@ -98,8 +77,8 @@ IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor,
          return Ret;
       }
   
-      SurfObj = (SURFOBJ*)AccessUserObject((ULONG) dc->Surface);
-      SurfGDI = (PSURFGDI)AccessInternalObjectFromUserObject(SurfObj);
+      BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap);
+      SurfObj = &BitmapObj->SurfObj;
       DevInfo = dc->DevInfo;
       DC_UnlockDc(Screen);
    }
@@ -109,22 +88,24 @@ IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor,
       if (NULL != CurInfo->CurrentCursorObject && CurInfo->ShowingCursor)
       {
          /* Remove the cursor if it was displayed */
-         IntLockGDIDriver(SurfGDI);
-         if (SurfGDI->MovePointer != NULL)
-           SurfGDI->MovePointer(SurfObj, -1, -1, &PointerRect);
-         IntUnLockGDIDriver(SurfGDI);
+         if (GDIDEVFUNCS(SurfObj).MovePointer)
+           GDIDEVFUNCS(SurfObj).MovePointer(SurfObj, -1, -1, &PointerRect);
+         else
+           EngMovePointer(SurfObj, -1, -1, &PointerRect);
          SetPointerRect(CurInfo, &PointerRect);
       }
 
-      SurfGDI->PointerStatus = SPS_ACCEPT_NOEXCLUDE;
+      GDIDEV(SurfObj)->PointerStatus = SPS_ACCEPT_NOEXCLUDE;
 
       CurInfo->CurrentCursorObject = NewCursor; /* i.e. CurrentCursorObject = NULL */
       CurInfo->ShowingCursor = 0;
+      BITMAPOBJ_UnlockBitmap(SurfObj->hsurf);
       return Ret;
    }
   
    if (!NewCursor)
    {
+      BITMAPOBJ_UnlockBitmap(SurfObj->hsurf);
       return Ret;
    }
 
@@ -134,17 +115,19 @@ IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor,
    MaskBmpObj = BITMAPOBJ_LockBitmap(NewCursor->IconInfo.hbmMask);
    if (MaskBmpObj)
    {
-      const int maskBpp = MaskBmpObj->bitmap.bmBitsPixel;
+      const int maskBpp = BitsPerFormat(MaskBmpObj->SurfObj.iBitmapFormat);
       BITMAPOBJ_UnlockBitmap(NewCursor->IconInfo.hbmMask);
       if (maskBpp != 1)
       {
          DbgPrint("SetCursor: The Mask bitmap must have 1BPP!\n");
+         BITMAPOBJ_UnlockBitmap(SurfObj->hsurf);
          return Ret;
       }
       
       if ((DevInfo->flGraphicsCaps2 & GCAPS2_ALPHACURSOR) && 
-          (SurfGDI->BitsPerPixel >= 16) && NewCursor->Shadow
-          && COLORCURSORS_ALLOWED)
+          SurfObj->iBitmapFormat >= BMF_16BPP &&
+          SurfObj->iBitmapFormat <= BMF_32BPP &&
+          NewCursor->Shadow && COLORCURSORS_ALLOWED)
       {
         /* FIXME - Create a color pointer, only 32bit bitmap, set alpha bits!
                    Do not pass a mask bitmap to DrvSetPointerShape()!
@@ -167,11 +150,7 @@ IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor,
           MaskBmpObj = BITMAPOBJ_LockBitmap(NewCursor->IconInfo.hbmMask);
           if(MaskBmpObj)
           {
-            MouseSize.cx = MaskBmpObj->bitmap.bmWidth;
-            MouseSize.cy = MaskBmpObj->bitmap.bmHeight;
-            hMask = EngCreateBitmap(MouseSize, 4, BMF_1BPP, BMF_TOPDOWN, MaskBmpObj->bitmap.bmBits);
-            soMask = (SURFOBJ*)AccessUserObject((ULONG)hMask);
-            BITMAPOBJ_UnlockBitmap(NewCursor->IconInfo.hbmMask);
+            soMask = &MaskBmpObj->SurfObj;
           }
         }
       }
@@ -184,28 +163,26 @@ IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor,
       CurInfo->CurrentCursorObject = NULL;
     }
     
-    if (SurfGDI->SetPointerShape != NULL)
+    if (GDIDEVFUNCS(SurfObj).SetPointerShape)
     {
-      IntLockGDIDriver(SurfGDI);
-      SurfGDI->PointerStatus = SurfGDI->SetPointerShape(SurfObj, soMask, soColor, XlateObj,
+      GDIDEV(SurfObj)->PointerStatus =
+         GDIDEVFUNCS(SurfObj).SetPointerShape(
+                                                        SurfObj, soMask, soColor, XlateObj,
                                                         NewCursor->IconInfo.xHotspot,
                                                         NewCursor->IconInfo.yHotspot,
                                                         CurInfo->x, 
                                                         CurInfo->y, 
                                                         &PointerRect,
                                                         SPS_CHANGE);
-      IntUnLockGDIDriver(SurfGDI);
     }
     else
     {
-      SurfGDI->PointerStatus = SPS_DECLINE;
+      GDIDEV(SurfObj)->PointerStatus = SPS_DECLINE;
     }
 
-    if(SurfGDI->PointerStatus == SPS_DECLINE)
+    if(((GDIDEVICE *)SurfObj->hdev)->PointerStatus == SPS_DECLINE)
     {
-      SurfGDI->SetPointerShape = EngSetPointerShape;
-      SurfGDI->MovePointer = EngMovePointer;
-      SurfGDI->PointerStatus = EngSetPointerShape(
+      GDIDEV(SurfObj)->PointerStatus = EngSetPointerShape(
                          SurfObj, soMask, soColor, XlateObj,
                          NewCursor->IconInfo.xHotspot,
                          NewCursor->IconInfo.yHotspot,
@@ -218,9 +195,10 @@ IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor,
     
     SetPointerRect(CurInfo, &PointerRect);
     
-    if(hMask)
+    BITMAPOBJ_UnlockBitmap(SurfObj->hsurf);
+    if(MaskBmpObj)
     {
-      EngDeleteSurface((HSURF)hMask);
+      BITMAPOBJ_UnlockBitmap(soMask->hsurf);
     }
     if(hColor)
     {
@@ -231,7 +209,7 @@ IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor,
       EngDeleteXlate(XlateObj);
     }
     
-    if(SurfGDI->PointerStatus == SPS_ERROR)
+    if(GDIDEV(SurfObj)->PointerStatus == SPS_ERROR)
       DbgPrint("SetCursor: DrvSetPointerShape() returned SPS_ERROR\n");
   
   return Ret;
@@ -423,14 +401,14 @@ NtUserCreateCursorIconHandle(PICONINFO IconInfo, BOOL Indirect)
       {
         if(Indirect)
         {
-          CurIconObject->IconInfo.hbmMask = IntCopyBitmap(CurIconObject->IconInfo.hbmMask);
-          CurIconObject->IconInfo.hbmColor = IntCopyBitmap(CurIconObject->IconInfo.hbmColor);
+          CurIconObject->IconInfo.hbmMask = BITMAPOBJ_CopyBitmap(CurIconObject->IconInfo.hbmMask);
+          CurIconObject->IconInfo.hbmColor = BITMAPOBJ_CopyBitmap(CurIconObject->IconInfo.hbmColor);
         }
         if(CurIconObject->IconInfo.hbmColor && 
           (bmp = BITMAPOBJ_LockBitmap(CurIconObject->IconInfo.hbmColor)))
         {
-          CurIconObject->Size.cx = bmp->bitmap.bmWidth;
-          CurIconObject->Size.cy = bmp->bitmap.bmHeight;
+          CurIconObject->Size.cx = bmp->SurfObj.sizlBitmap.cx;
+          CurIconObject->Size.cy = bmp->SurfObj.sizlBitmap.cy;
           BITMAPOBJ_UnlockBitmap(CurIconObject->IconInfo.hbmColor);
         }
         else
@@ -438,8 +416,8 @@ NtUserCreateCursorIconHandle(PICONINFO IconInfo, BOOL Indirect)
           if(CurIconObject->IconInfo.hbmMask && 
             (bmp = BITMAPOBJ_LockBitmap(CurIconObject->IconInfo.hbmMask)))
           {
-            CurIconObject->Size.cx = bmp->bitmap.bmWidth;
-            CurIconObject->Size.cy = bmp->bitmap.bmHeight / 2;
+            CurIconObject->Size.cx = bmp->SurfObj.sizlBitmap.cx;
+            CurIconObject->Size.cy = bmp->SurfObj.sizlBitmap.cy / 2;
             BITMAPOBJ_UnlockBitmap(CurIconObject->IconInfo.hbmMask);
           }
         }
@@ -494,8 +472,8 @@ NtUserGetCursorIconInfo(
       RtlCopyMemory(&ii, &CurIconObject->IconInfo, sizeof(ICONINFO));
       
       /* Copy bitmaps */
-      ii.hbmMask = IntCopyBitmap(ii.hbmMask);
-      ii.hbmColor = IntCopyBitmap(ii.hbmColor);      
+      ii.hbmMask = BITMAPOBJ_CopyBitmap(ii.hbmMask);
+      ii.hbmColor = BITMAPOBJ_CopyBitmap(ii.hbmColor);      
       
       /* Copy fields */
       Status = MmCopyToCaller(IconInfo, &ii, sizeof(ICONINFO));
@@ -563,8 +541,8 @@ NtUserGetCursorIconSize(
     if(!bmp)
       goto done;
 
-    SafeSize.cx = bmp->bitmap.bmWidth;
-    SafeSize.cy = bmp->bitmap.bmHeight;
+    SafeSize.cx = bmp->SurfObj.sizlBitmap.cx;
+    SafeSize.cy = bmp->SurfObj.sizlBitmap.cy;
     Status = MmCopyToCaller(Size, &SafeSize, sizeof(SIZE));
     if(NT_SUCCESS(Status))
       Ret = TRUE;
@@ -943,8 +921,8 @@ NtUserSetCursorIconContents(
     bmp = BITMAPOBJ_LockBitmap(CurIconObject->IconInfo.hbmColor);
     if(bmp)
     {
-      CurIconObject->Size.cx = bmp->bitmap.bmWidth;
-      CurIconObject->Size.cy = bmp->bitmap.bmHeight;
+      CurIconObject->Size.cx = bmp->SurfObj.sizlBitmap.cx;
+      CurIconObject->Size.cy = bmp->SurfObj.sizlBitmap.cy;
       BITMAPOBJ_UnlockBitmap(CurIconObject->IconInfo.hbmColor);
     }
     else
@@ -953,8 +931,8 @@ NtUserSetCursorIconContents(
       if(!bmp)
         goto done;
       
-      CurIconObject->Size.cx = bmp->bitmap.bmWidth;
-      CurIconObject->Size.cy = bmp->bitmap.bmHeight / 2;
+      CurIconObject->Size.cx = bmp->SurfObj.sizlBitmap.cx;
+      CurIconObject->Size.cy = bmp->SurfObj.sizlBitmap.cy / 2;
       
       BITMAPOBJ_UnlockBitmap(CurIconObject->IconInfo.hbmMask);
     }
diff --git a/reactos/subsys/win32k/objects/dc.c b/reactos/subsys/win32k/objects/dc.c
index 23f235984df..9b32c7ab2b5 100644
--- a/reactos/subsys/win32k/objects/dc.c
+++ b/reactos/subsys/win32k/objects/dc.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dc.c,v 1.141 2004/06/29 21:09:16 gvg Exp $
+/* $Id: dc.c,v 1.142 2004/07/03 13:55:36 navaraf Exp $
  *
  * DC.C - Device context functions
  *
@@ -129,7 +129,6 @@ NtGdiCreateCompatableDC(HDC hDC)
   HBITMAP  hBitmap;
   HDC hNewDC, DisplayDC;
   HRGN hVisRgn;
-  BITMAPOBJ *pb;
   UNICODE_STRING DriverName;
 
   DisplayDC = NULL;
@@ -206,9 +205,6 @@ NtGdiCreateCompatableDC(HDC hDC)
   NewDC->w.hBitmap      = hBitmap;
   NewDC->w.hFirstBitmap = hBitmap;
   NewDC->GDIDevice      = OrigDC->GDIDevice;
-  pb = BITMAPOBJ_LockBitmap(hBitmap);
-  NewDC->Surface = (HSURF)BitmapToSurf(pb, NewDC->GDIDevice);
-  BITMAPOBJ_UnlockBitmap(hBitmap);
 
   NewDC->w.hPalette = OrigDC->w.hPalette;
   NewDC->w.textColor = OrigDC->w.textColor;
@@ -462,7 +458,7 @@ IntCreatePrimarySurface()
    PGD_ENABLEDRIVER GDEnableDriver;
    DRVENABLEDATA DED;
    SURFOBJ *SurfObj;
-   PSURFGDI SurfGDI;
+   SIZEL SurfSize;
    UNICODE_STRING DriverFileNames;
    PWSTR CurrentName;
    BOOL GotDriver;
@@ -474,7 +470,6 @@ IntCreatePrimarySurface()
       DPRINT("Trying to load display driver no. %d\n", DisplayNumber);
 
       RtlZeroMemory(&PrimarySurface, sizeof(PrimarySurface));
-      ExInitializeFastMutex(&PrimarySurface.DriverLock);
 
       PrimarySurface.VideoFileObject = DRIVER_FindMPDriver(DisplayNumber);
 
@@ -650,13 +645,11 @@ IntCreatePrimarySurface()
          continue;
       }
 
-      SurfObj = (SURFOBJ*)AccessUserObject((ULONG) PrimarySurface.Handle);
+      SurfObj = EngLockSurface((HSURF)PrimarySurface.Handle);
       SurfObj->dhpdev = PrimarySurface.PDev;
-      SurfGDI = (PSURFGDI)AccessInternalObjectFromUserObject(SurfObj);
-      IntShowDesktop(
-         IntGetActiveDesktop(),
-         SurfGDI->SurfObj.sizlBitmap.cx,
-         SurfGDI->SurfObj.sizlBitmap.cy);
+      SurfSize = SurfObj->sizlBitmap;
+      EngUnlockSurface(SurfObj);
+      IntShowDesktop(IntGetActiveDesktop(), SurfSize.cx, SurfSize.cy);
       break;
    }
 
@@ -666,19 +659,13 @@ IntCreatePrimarySurface()
 VOID FASTCALL
 IntDestroyPrimarySurface()
   {
-#if 0
-    SURFOBJ *SurfObj;
-    PSURFGDI SurfGDI;
-#endif
-
     DRIVER_UnreferenceDriver(L"DISPLAY");
 
-#if 0
-    DPRINT("Hiding mouse pointer\n" );
-    SurfObj = (SURFOBJ*)AccessUserObject((ULONG) PrimarySurface.Handle);
-    SurfGDI = (PSURFGDI)AccessInternalObjectFromUserObject(SurfObj);
-    SurfGDI->SetPointerShape(SurfObj, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0);
-#endif
+    /*
+     * FIXME: Hide a mouse pointer there. Also because we have to prevent
+     * memory leaks with the Eng* mouse routines.
+     */
+
     DPRINT("Reseting display\n" );
     PrimarySurface.DriverFunctions.AssertMode(PrimarySurface.PDev, FALSE);
     PrimarySurface.DriverFunctions.DisableSurface(PrimarySurface.PDev);
@@ -698,7 +685,7 @@ IntGdiCreateDC(PUNICODE_STRING Driver,
   HDC      hNewDC;
   PDC      NewDC;
   HDC      hDC = NULL;
-  PSURFGDI SurfGDI;
+  SURFOBJ *SurfObj;
   HRGN     hVisRgn;
   UNICODE_STRING StdDriver;
   
@@ -740,9 +727,9 @@ IntGdiCreateDC(PUNICODE_STRING Driver,
   memcpy(NewDC->FillPatternSurfaces, PrimarySurface.FillPatterns,
 	 sizeof(NewDC->FillPatternSurfaces));
   NewDC->PDev = PrimarySurface.PDev;
-  NewDC->Surface = PrimarySurface.Handle;
   NewDC->GDIDevice = (HDEV)&PrimarySurface;
   NewDC->DriverFunctions = PrimarySurface.DriverFunctions;
+  NewDC->w.hBitmap = PrimarySurface.Handle;
 
   NewDC->DMW.dmSize = sizeof(NewDC->DMW);
   NewDC->DMW.dmFields = 0x000fc000;
@@ -750,14 +737,14 @@ IntGdiCreateDC(PUNICODE_STRING Driver,
   /* FIXME: get mode selection information from somewhere  */
 
   NewDC->DMW.dmLogPixels = 96;
-  SurfGDI = (PSURFGDI)AccessInternalObject((ULONG) PrimarySurface.Handle);
-  NewDC->DMW.dmBitsPerPel = SurfGDI->BitsPerPixel;
-  NewDC->DMW.dmPelsWidth = SurfGDI->SurfObj.sizlBitmap.cx;
-  NewDC->DMW.dmPelsHeight = SurfGDI->SurfObj.sizlBitmap.cy;
+  SurfObj = EngLockSurface((HSURF)PrimarySurface.Handle);
+  NewDC->DMW.dmBitsPerPel = BitsPerFormat(SurfObj->iBitmapFormat);
+  NewDC->DMW.dmPelsWidth = SurfObj->sizlBitmap.cx;
+  NewDC->DMW.dmPelsHeight = SurfObj->sizlBitmap.cy;
   NewDC->DMW.dmDisplayFlags = 0;
   NewDC->DMW.dmDisplayFrequency = 0;
 
-  NewDC->w.bitsPerPixel = SurfGDI->BitsPerPixel; // FIXME: set this here??
+  NewDC->w.bitsPerPixel = NewDC->DMW.dmBitsPerPel; // FIXME: set this here??
 
   NewDC->w.hPalette = NewDC->DevInfo->hpalDefault;
 
@@ -765,8 +752,8 @@ IntGdiCreateDC(PUNICODE_STRING Driver,
   
   DC_UnlockDc( hNewDC );
 
-  hVisRgn = NtGdiCreateRectRgn(0, 0, SurfGDI->SurfObj.sizlBitmap.cx,
-                              SurfGDI->SurfObj.sizlBitmap.cy);
+  hVisRgn = NtGdiCreateRectRgn(0, 0, SurfObj->sizlBitmap.cx,
+                              SurfObj->sizlBitmap.cy);
   NtGdiSelectVisRgn(hNewDC, hVisRgn);
   NtGdiDeleteObject(hVisRgn);
 
@@ -776,6 +763,8 @@ IntGdiCreateDC(PUNICODE_STRING Driver,
   NtGdiSetTextAlign(hNewDC, TA_TOP);
   NtGdiSetBkColor(hNewDC, RGB(255, 255, 255));
   NtGdiSetBkMode(hNewDC, OPAQUE);
+
+  EngUnlockSurface(SurfObj);
   
   return hNewDC;
 }
@@ -878,7 +867,6 @@ NtGdiDeleteDC(HDC  DCHandle)
     DC_LockDC (DCHandle); NtGdiSelectObject does not recognize stock objects yet  */
     if (DCToDelete->w.flags & DC_MEMORY)
     {
-      EngDeleteSurface (DCToDelete->Surface);
       NtGdiDeleteObject (DCToDelete->w.hFirstBitmap);
     }
   }
@@ -1644,7 +1632,10 @@ NtGdiRestoreDC(HDC  hDC, INT  SaveLevel)
     SaveLevel = dc->saveLevel;
 
   if ((SaveLevel < 1) || (SaveLevel > dc->saveLevel))
+  {
+    DC_UnlockDc(hDC);
     return FALSE;
+  }
 
   success = TRUE;
   while (dc->saveLevel >= SaveLevel)
@@ -1654,6 +1645,7 @@ NtGdiRestoreDC(HDC  hDC, INT  SaveLevel)
     dcs = DC_LockDc (hdcs);
     if (dcs == NULL)
     {
+      DC_UnlockDc(hDC);
       return FALSE;
     }
     DC_SetNextDC (dcs, DC_GetNextDC (dcs));
@@ -1888,9 +1880,7 @@ NtGdiSelectObject(HDC  hDC, HGDIOBJ  hGDIObj)
       objOrg = (HGDIOBJ)dc->w.hBitmap;
 
       /* Release the old bitmap, lock the new one and convert it to a SURF */
-      EngDeleteSurface(dc->Surface);
       dc->w.hBitmap = hGDIObj;
-      dc->Surface = (HSURF)BitmapToSurf(pb, dc->GDIDevice);
 
       // if we're working with a DIB, get the palette [fixme: only create if the selected palette is null]
       if(pb->dib)
@@ -1914,7 +1904,7 @@ NtGdiSelectObject(HDC  hDC, HGDIOBJ  hGDIObj)
       }
       else
       {
-        dc->w.bitsPerPixel = pb->bitmap.bmBitsPixel;
+        dc->w.bitsPerPixel = BitsPerFormat(pb->SurfObj.iBitmapFormat);
         if (1 == dc->w.bitsPerPixel)
           {
             MonoColorMap[0] = RGB(0, 0, 0);
@@ -1928,7 +1918,7 @@ NtGdiSelectObject(HDC  hDC, HGDIOBJ  hGDIObj)
       }
 
       DC_UnlockDc ( hDC );
-      hVisRgn = NtGdiCreateRectRgn ( 0, 0, pb->bitmap.bmWidth, pb->bitmap.bmHeight );
+      hVisRgn = NtGdiCreateRectRgn ( 0, 0, pb->SurfObj.sizlBitmap.cx, pb->SurfObj.sizlBitmap.cy );
       NtGdiSelectVisRgn ( hDC, hVisRgn );
       NtGdiDeleteObject ( hVisRgn );
       BITMAPOBJ_UnlockBitmap(hGDIObj);
@@ -2175,13 +2165,13 @@ DC_SetOwnership(HDC hDC, PEPROCESS Owner)
 }
 
 BOOL FASTCALL
-IntIsPrimarySurface(PSURFGDI SurfGDI)
+IntIsPrimarySurface(SURFOBJ *SurfObj)
 {
    if (PrimarySurface.Handle == NULL)
      {
        return FALSE;
      }
-   return SurfGDI == (PSURFGDI)AccessInternalObject((ULONG) PrimarySurface.Handle) ? TRUE : FALSE;
+   return SurfObj->hsurf == PrimarySurface.Handle;
 }
 
 /*
diff --git a/reactos/subsys/win32k/objects/dib.c b/reactos/subsys/win32k/objects/dib.c
index 1abf6123dbf..dc770e87006 100644
--- a/reactos/subsys/win32k/objects/dib.c
+++ b/reactos/subsys/win32k/objects/dib.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dib.c,v 1.55 2004/06/29 21:09:16 gvg Exp $
+ * $Id: dib.c,v 1.56 2004/07/03 13:55:36 navaraf Exp $
  *
  * ReactOS W32 Subsystem
  * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team
@@ -119,11 +119,10 @@ IntSetDIBits(
 	UINT  ColorUse)
 {
   BITMAPOBJ  *bitmap;
-  HBITMAP     SourceBitmap, DestBitmap;
+  HBITMAP     SourceBitmap;
   INT         result = 0;
   BOOL        copyBitsResult;
   SURFOBJ    *DestSurf, *SourceSurf;
-  PSURFGDI    DestGDI;
   SIZEL       SourceSize;
   POINTL      ZeroPoint;
   RECTL       DestRect;
@@ -146,11 +145,7 @@ IntSetDIBits(
   //else
   //  lpRGB = &bmi->bmiColors[0];
 
-  // Create a temporary surface for the destination bitmap
-  DestBitmap = BitmapToSurf(bitmap, DC->GDIDevice);
-
-  DestSurf   = (SURFOBJ*) AccessUserObject( (ULONG)DestBitmap );
-  DestGDI    = (PSURFGDI) AccessInternalObjectFromUserObject( DestSurf );
+  DestSurf = &bitmap->SurfObj;
 
   // Create source surface
   SourceSize.cx = bmi->bmiHeader.biWidth;
@@ -164,14 +159,14 @@ IntSetDIBits(
                                  BitmapFormat(bmi->bmiHeader.biBitCount, bmi->bmiHeader.biCompression),
                                  0 < bmi->bmiHeader.biHeight ? 0 : BMF_TOPDOWN,
                                  (PVOID) Bits);
-  SourceSurf = (SURFOBJ*)AccessUserObject((ULONG)SourceBitmap);
+  SourceSurf = EngLockSurface((HSURF)SourceBitmap);
 
   // Destination palette obtained from the hDC
   hDCPalette = PALETTE_LockPalette(DC->DevInfo->hpalDefault);
   if (NULL == hDCPalette)
     {
+      EngUnlockSurface(SourceSurf);
       EngDeleteSurface((HSURF)SourceBitmap);
-      EngDeleteSurface((HSURF)DestBitmap);
       BITMAPOBJ_UnlockBitmap(hBitmap);
       SetLastWin32Error(ERROR_INVALID_HANDLE);
       return 0;
@@ -184,8 +179,8 @@ IntSetDIBits(
   DIB_Palette = BuildDIBPalette ( (PBITMAPINFO)bmi, (PINT)&DIB_Palette_Type );
   if (NULL == DIB_Palette)
     {
+      EngUnlockSurface(SourceSurf);
       EngDeleteSurface((HSURF)SourceBitmap);
-      EngDeleteSurface((HSURF)DestBitmap);
       BITMAPOBJ_UnlockBitmap(hBitmap);
       SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES);
       return 0;
@@ -196,8 +191,8 @@ IntSetDIBits(
   if (NULL == XlateObj)
     {
       PALETTE_FreePalette(DIB_Palette);
+      EngUnlockSurface(SourceSurf);
       EngDeleteSurface((HSURF)SourceBitmap);
-      EngDeleteSurface((HSURF)DestBitmap);
       BITMAPOBJ_UnlockBitmap(hBitmap);
       SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES);
       return 0;
@@ -224,8 +219,8 @@ IntSetDIBits(
   // Clean up
   EngDeleteXlate(XlateObj);
   PALETTE_FreePalette(DIB_Palette);
+  EngUnlockSurface(SourceSurf);
   EngDeleteSurface((HSURF)SourceBitmap);
-  EngDeleteSurface((HSURF)DestBitmap);
 
 //  if (ColorUse == DIB_PAL_COLORS)
 //    WinFree((LPSTR)lpRGB);
@@ -282,491 +277,175 @@ NtGdiSetDIBitsToDevice(
   return 0;
 }
 
-// Converts a device-dependent bitmap to a DIB
-#if 0
-INT STDCALL NtGdiGetDIBits(HDC  hDC,
-                   HBITMAP hBitmap,
-                   UINT  StartScan,
-                   UINT  ScanLines,
-                   LPVOID  Bits,
-                   LPBITMAPINFO UnsafeInfo,
-                   UINT  Usage)
-#else
-INT STDCALL NtGdiGetDIBits(
-    HDC hdc,         /* [in]  Handle to device context */
-    HBITMAP hbitmap, /* [in]  Handle to bitmap */
-    UINT startscan,  /* [in]  First scan line to set in dest bitmap */
-    UINT lines,      /* [in]  Number of scan lines to copy */
-    LPVOID bits,       /* [out] Address of array for bitmap bits */
-    BITMAPINFO * info, /* [out] Address of structure with bitmap data */
-    UINT coloruse)   /* [in]  RGB or palette index */
-#endif
+/* Converts a device-dependent bitmap to a DIB */
+INT STDCALL
+NtGdiGetDIBits(HDC hDC,
+               HBITMAP hBitmap,
+               UINT StartScan,
+               UINT ScanLines,
+               LPVOID Bits,
+               LPBITMAPINFO Info,
+               UINT Usage)
 {
-#if 0
-  BITMAPINFO Info;
-  BITMAPCOREHEADER *Core;
-  PBITMAPOBJ BitmapObj;
-  INT Result;
-  NTSTATUS Status;
-  PDC DCObj;
-  PPALGDI PalGdi;
-  struct
-    {
-    BITMAPINFO Info;
-    DWORD BitFields[3];
-    } InfoWithBitFields;
-  DWORD *BitField;
-  DWORD InfoSize;
+   BITMAPOBJ *BitmapObj;
+   SURFOBJ *DestSurfObj;
+   XLATEOBJ *XlateObj;
+   HBITMAP DestBitmap;
+   SIZEL DestSize;
+   HPALETTE hSourcePalette;
+   HPALETTE hDestPalette;
+   PPALGDI SourcePalette;
+   PPALGDI DestPalette;
+   ULONG SourcePaletteType;
+   ULONG DestPaletteType;
+   PDC Dc;
+   POINTL SourcePoint;
+   RECTL DestRect;
+   ULONG Result = 0;
+   ULONG Index;
 
-  BitmapObj = BITMAPOBJ_LockBitmap(hBitmap);
-  if (NULL == BitmapObj)
-    {
+   /* Get handle for the palette in DC. */
+   Dc = DC_LockDc(hDC);
+   if (Dc == NULL)
+   {
       SetLastWin32Error(ERROR_INVALID_HANDLE);
       return 0;
-    }
+   }
+   hSourcePalette = Dc->w.hPalette;
+   /* FIXME: This is incorrect. hDestPalette should be something other. */
+   hDestPalette = Dc->DevInfo->hpalDefault;
+   DC_UnlockDc(hDC);
 
-  RtlZeroMemory(&Info, sizeof(BITMAPINFO));
-  Status = MmCopyFromCaller(&(Info.bmiHeader.biSize),
-                            &(UnsafeInfo->bmiHeader.biSize),
-                            sizeof(DWORD));
-  if (! NT_SUCCESS(Status))
-    {
-    SetLastNtError(Status);
-    BITMAPOBJ_UnlockBitmap(hBitmap);
-    return 0;
-    }
-
-  /* If the bits are not requested, UnsafeInfo can point to either a
-     BITMAPINFOHEADER or a BITMAPCOREHEADER */
-  if (sizeof(BITMAPINFOHEADER) != Info.bmiHeader.biSize &&
-      (sizeof(BITMAPCOREHEADER) != Info.bmiHeader.biSize ||
-       NULL != Bits))
-    {
-      SetLastWin32Error(ERROR_INVALID_PARAMETER);
-      BITMAPOBJ_UnlockBitmap(hBitmap);
+   /* Get pointer to the source bitmap object. */
+   BitmapObj = BITMAPOBJ_LockBitmap(hBitmap);
+   if (BitmapObj == NULL)
+   {
+      SetLastWin32Error(ERROR_INVALID_HANDLE);
       return 0;
-    }
+   }
 
-  Status = MmCopyFromCaller(&(Info.bmiHeader),
-                            &(UnsafeInfo->bmiHeader),
-                            Info.bmiHeader.biSize);
-  if (! NT_SUCCESS(Status))
-    {
-      SetLastNtError(Status);
-      BITMAPOBJ_UnlockBitmap(hBitmap);
-      return 0;
-    }
-
-  if (NULL == Bits)
-    {
-      if (sizeof(BITMAPINFOHEADER) == Info.bmiHeader.biSize)
-	{
-	  if (0 != Info.bmiHeader.biBitCount)
-	    {
-              DPRINT("NtGdiGetDIBits(): This operation isn't fully implemented yet.");
-	      /*UNIMPLEMENTED;*/
-	    }
-
-	  Info.bmiHeader.biWidth = BitmapObj->bitmap.bmWidth;
-	  Info.bmiHeader.biHeight = BitmapObj->bitmap.bmHeight;
-	  Info.bmiHeader.biPlanes = BitmapObj->bitmap.bmPlanes;
-	  Info.bmiHeader.biBitCount = BitmapObj->bitmap.bmBitsPixel;
-	  Info.bmiHeader.biCompression = BI_RGB;
-	  Info.bmiHeader.biSizeImage = BitmapObj->bitmap.bmHeight * BitmapObj->bitmap.bmWidthBytes;
-	}
-      else
-	{
-	  Core = (BITMAPCOREHEADER *)(&Info.bmiHeader);
-	  if (0 != Core->bcBitCount)
-	    {
-	      UNIMPLEMENTED;
-	    }
-
-	  Core->bcWidth = BitmapObj->bitmap.bmWidth;
-	  Core->bcHeight = BitmapObj->bitmap.bmHeight;
-	  Core->bcPlanes = BitmapObj->bitmap.bmPlanes;
-	  Core->bcBitCount = BitmapObj->bitmap.bmBitsPixel;
-	}
-
-      Status = MmCopyToCaller(UnsafeInfo, &Info, Info.bmiHeader.biSize);
-      if (! NT_SUCCESS(Status))
-	{
-	  SetLastNtError(Status);
-	  BITMAPOBJ_UnlockBitmap(hBitmap);
-	  return 0;
-	}
-      Result = 1;
-    }
-  else if (0 == StartScan && Info.bmiHeader.biHeight == (LONG) (StartScan + ScanLines) &&
-           Info.bmiHeader.biWidth == BitmapObj->bitmap.bmWidth &&
-           Info.bmiHeader.biHeight == BitmapObj->bitmap.bmHeight &&
-           Info.bmiHeader.biPlanes == BitmapObj->bitmap.bmPlanes &&
-           Info.bmiHeader.biBitCount == BitmapObj->bitmap.bmBitsPixel &&
-           8 < Info.bmiHeader.biBitCount)
-    {
-      Info.bmiHeader.biSizeImage = BitmapObj->bitmap.bmHeight * BitmapObj->bitmap.bmWidthBytes;
-      Status = MmCopyToCaller(Bits, BitmapObj->bitmap.bmBits, Info.bmiHeader.biSizeImage);
-      if (! NT_SUCCESS(Status))
-	{
-	  SetLastNtError(Status);
-	  BITMAPOBJ_UnlockBitmap(hBitmap);
-	  return 0;
-	}
-      RtlZeroMemory(&InfoWithBitFields, sizeof(InfoWithBitFields));
-      RtlCopyMemory(&(InfoWithBitFields.Info), &Info, sizeof(BITMAPINFO));
-      if (BI_BITFIELDS == Info.bmiHeader.biCompression)
-	{
-	  DCObj = DC_LockDc(hDC);
-	  if (NULL == DCObj)
-	    {
-	      SetLastWin32Error(ERROR_INVALID_HANDLE);
-	      BITMAPOBJ_UnlockBitmap(hBitmap);
-	      return 0;
-	    }
-	  PalGdi = PALETTE_LockPalette(DCObj->w.hPalette);
-	  BitField = (DWORD *) ((char *) &InfoWithBitFields + InfoWithBitFields.Info.bmiHeader.biSize);
-	  BitField[0] = PalGdi->RedMask;
-	  BitField[1] = PalGdi->GreenMask;
-	  BitField[2] = PalGdi->BlueMask;
-	  PALETTE_UnlockPalette(DCObj->w.hPalette);
-	  InfoSize = InfoWithBitFields.Info.bmiHeader.biSize + 3 * sizeof(DWORD);
-	  DC_UnlockDc(hDC);
-	}
-      else
-	{
-	  InfoSize = Info.bmiHeader.biSize;
-	}
-      Status = MmCopyToCaller(UnsafeInfo, &InfoWithBitFields, InfoSize);
-      if (! NT_SUCCESS(Status))
-	{
-	  SetLastNtError(Status);
-	  BITMAPOBJ_UnlockBitmap(hBitmap);
-	  return 0;
-	}
-    }
-  else
-    {
-    UNIMPLEMENTED;
-    }
-
-  BITMAPOBJ_UnlockBitmap(hBitmap);
-
-  return Result;
-#else
-    PDC dc;
-    PBITMAPOBJ bmp;
-    int i;
-
-    if (!info) return 0;
-    if (!(dc = DC_LockDc( hdc ))) return 0;
-    if (!(bmp = BITMAPOBJ_LockBitmap(hbitmap)))
-    {
-        DC_UnlockDc( hdc );
-	return 0;
-    }
-
-    /* Transfer color info */
-
-    if (info->bmiHeader.biBitCount <= 8 && info->bmiHeader.biBitCount > 0 ) {
-
-	info->bmiHeader.biClrUsed = 0;
-
-	/* If the bitmap object already has a dib section at the
-	   same color depth then get the color map from it */
-	if (bmp->dib && bmp->dib->dsBm.bmBitsPixel == info->bmiHeader.biBitCount) {
-	    NtGdiGetDIBColorTable(hdc, 0, 1 << info->bmiHeader.biBitCount, info->bmiColors);
-	}
-        else {
-            if(info->bmiHeader.biBitCount >= bmp->bitmap.bmBitsPixel) {
-                /* Generate the color map from the selected palette */
-                PALETTEENTRY * palEntry;
-                PPALGDI palette;
-                if (!(palette = PALETTE_LockPalette(dc->w.hPalette))) {
-                    DC_UnlockDc( hdc );
-                    BITMAPOBJ_UnlockBitmap( hbitmap );
-                    return 0;
-                }
-                palEntry = palette->IndexedColors;
-                for (i = 0; i < (1 << bmp->bitmap.bmBitsPixel); i++, palEntry++) {
-                    if (coloruse == DIB_RGB_COLORS) {
-                        info->bmiColors[i].rgbRed      = palEntry->peRed;
-                        info->bmiColors[i].rgbGreen    = palEntry->peGreen;
-                        info->bmiColors[i].rgbBlue     = palEntry->peBlue;
-                        info->bmiColors[i].rgbReserved = 0;
-                    }
-                    else ((WORD *)info->bmiColors)[i] = (WORD)i;
-                }
-                PALETTE_UnlockPalette( dc->w.hPalette );
-            } else {
-                switch (info->bmiHeader.biBitCount) {
-                case 1:
-                    info->bmiColors[0].rgbRed = info->bmiColors[0].rgbGreen =
-                        info->bmiColors[0].rgbBlue = 0;
-                    info->bmiColors[0].rgbReserved = 0;
-                    info->bmiColors[1].rgbRed = info->bmiColors[1].rgbGreen =
-                        info->bmiColors[1].rgbBlue = 0xff;
-                    info->bmiColors[1].rgbReserved = 0;
-                    break;
-
-                case 4:
-                    memcpy(info->bmiColors, COLOR_GetSystemPaletteTemplate(), NB_RESERVED_COLORS * sizeof(PALETTEENTRY));
-                    break;
-
-                case 8:
-                    {
-                        INT r, g, b;
-                        RGBQUAD *color;
-
-                        memcpy(info->bmiColors, COLOR_GetSystemPaletteTemplate(),
-                               10 * sizeof(RGBQUAD));
-                        memcpy(info->bmiColors + 246, COLOR_GetSystemPaletteTemplate() + 10,
-                               10 * sizeof(RGBQUAD));
-                        color = info->bmiColors + 10;
-                        for(r = 0; r <= 5; r++) /* FIXME */
-                            for(g = 0; g <= 5; g++)
-                                for(b = 0; b <= 5; b++) {
-                                    color->rgbRed =   (r * 0xff) / 5;
-                                    color->rgbGreen = (g * 0xff) / 5;
-                                    color->rgbBlue =  (b * 0xff) / 5;
-                                    color->rgbReserved = 0;
-                                    color++;
-                                }
-                    }
-                }
-            }
-        }
-    }
-
-    if (bits && lines)
-    {
-        /* If the bitmap object already have a dib section that contains image data, get the bits from it */
-        if(bmp->dib && bmp->dib->dsBm.bmBitsPixel >= 15 && info->bmiHeader.biBitCount >= 15)
-        {
-            /*FIXME: Only RGB dibs supported for now */
-            unsigned int srcwidth = bmp->dib->dsBm.bmWidth, srcwidthb = bmp->dib->dsBm.bmWidthBytes;
-            int dstwidthb = DIB_GetDIBWidthBytes( info->bmiHeader.biWidth, info->bmiHeader.biBitCount );
-            LPBYTE dbits = bits, sbits = (LPBYTE) bmp->dib->dsBm.bmBits + (startscan * srcwidthb);
-            unsigned int x, y;
-
-            if ((info->bmiHeader.biHeight < 0) ^ (bmp->dib->dsBmih.biHeight < 0))
+   if (Bits == NULL)
+   {
+      if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER) ||
+          Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER))
+      {
+         Info->bmiHeader.biWidth = BitmapObj->SurfObj.sizlBitmap.cx;
+         Info->bmiHeader.biHeight = BitmapObj->SurfObj.sizlBitmap.cy;
+         /* Report negtive height for top-down bitmaps. */
+         if (BitmapObj->SurfObj.lDelta > 0)
+            Info->bmiHeader.biHeight = -Info->bmiHeader.biHeight;
+         Info->bmiHeader.biPlanes = 1;
+         Info->bmiHeader.biBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat);
+         if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER))
+         {
+            switch (BitmapObj->SurfObj.iBitmapFormat)
             {
-                dbits = (LPBYTE)bits + (dstwidthb * (lines-1));
-                dstwidthb = -dstwidthb;
+               case BMF_1BPP: case BMF_4BPP: case BMF_8BPP:
+               case BMF_16BPP: case BMF_24BPP: case BMF_32BPP:
+                  Info->bmiHeader.biCompression = BI_RGB;
+                  break;
+               case BMF_4RLE:
+                  Info->bmiHeader.biCompression = BI_RLE4;
+                  break;
+               case BMF_8RLE:
+                  Info->bmiHeader.biCompression = BI_RLE8;
+                  break;
+               case BMF_JPEG: 
+                  Info->bmiHeader.biCompression = BI_JPEG;
+                  break;
+               case BMF_PNG:
+                  Info->bmiHeader.biCompression = BI_PNG;
+                  break;
             }
+            Info->bmiHeader.biSizeImage = BitmapObj->SurfObj.cjBits;
+            Info->bmiHeader.biXPelsPerMeter = 0; /* FIXME */
+            Info->bmiHeader.biYPelsPerMeter = 0; /* FIXME */ 
+            Info->bmiHeader.biClrUsed = 
+            Info->bmiHeader.biClrImportant = 1 << Info->bmiHeader.biBitCount; /* FIXME */
+            Result = BitmapObj->SurfObj.sizlBitmap.cy;
+         }
+      }
+   }
+   else
+   {
+      if (StartScan > BitmapObj->SurfObj.sizlBitmap.cy)
+      {
+         Result = 0;
+      }
+      else
+      {
+         ScanLines = min(ScanLines, BitmapObj->SurfObj.sizlBitmap.cy - StartScan);
+         DestSize.cx = BitmapObj->SurfObj.sizlBitmap.cx;
+         DestSize.cy = ScanLines;
+         DestBitmap = EngCreateBitmap(
+            DestSize, BitmapObj->SurfObj.lDelta,
+            BitmapFormat(Info->bmiHeader.biBitCount, Info->bmiHeader.biCompression),
+            0 < Info->bmiHeader.biHeight ? 0 : BMF_TOPDOWN,
+            Bits);
+         DestSurfObj = EngLockSurface((HSURF)DestBitmap);
 
-            switch( info->bmiHeader.biBitCount ) {
+         SourcePalette = PALETTE_LockPalette(hSourcePalette);
+         ASSERT(SourcePalette);
+         SourcePaletteType = SourcePalette->Mode;
+         PALETTE_UnlockPalette(hSourcePalette);
 
-	    case 15:
-            case 16: /* 16 bpp dstDIB */
-                {
-                    LPWORD dstbits = (LPWORD)dbits;
-                    WORD rmask = 0x7c00, gmask= 0x03e0, bmask = 0x001f;
-
-                    /* FIXME: BI_BITFIELDS not supported yet */
-
-                    switch(bmp->dib->dsBm.bmBitsPixel) {
-
-                    case 16: /* 16 bpp srcDIB -> 16 bpp dstDIB */
-                        {
-                            /* FIXME: BI_BITFIELDS not supported yet */
-                            for (y = 0; y < lines; y++, dbits+=dstwidthb, sbits+=srcwidthb)
-                                memcpy(dbits, sbits, srcwidthb);
-                        }
-                        break;
-
-                    case 24: /* 24 bpp srcDIB -> 16 bpp dstDIB */
-                        {
-                            LPBYTE srcbits = sbits;
-
-                            for( y = 0; y < lines; y++) {
-                                for( x = 0; x < srcwidth; x++, srcbits += 3)
-                                    *dstbits++ = ((srcbits[0] >> 3) & bmask) |
-                                                 (((WORD)srcbits[1] << 2) & gmask) |
-                                                 (((WORD)srcbits[2] << 7) & rmask);
-
-                                dstbits = (LPWORD)(dbits+=dstwidthb);
-                                srcbits = (sbits += srcwidthb);
-                            }
-                        }
-                        break;
-
-                    case 32: /* 32 bpp srcDIB -> 16 bpp dstDIB */
-                        {
-                            LPDWORD srcbits = (LPDWORD)sbits;
-                            DWORD val;
-
-                            for( y = 0; y < lines; y++) {
-                                for( x = 0; x < srcwidth; x++ ) {
-                                    val = *srcbits++;
-                                    *dstbits++ = (WORD)(((val >> 3) & bmask) | ((val >> 6) & gmask) |
-                                                       ((val >> 9) & rmask));
-                                }
-                                dstbits = (LPWORD)(dbits+=dstwidthb);
-                                srcbits = (LPDWORD)(sbits+=srcwidthb);
-                            }
-                        }
-                        break;
-
-                    default: /* ? bit bmp -> 16 bit DIB */
-                        DPRINT1("FIXME: 15/16 bit DIB %d bit bitmap\n",
-                        bmp->bitmap.bmBitsPixel);
-                        break;
-                    }
-                }
-                break;
-
-            case 24: /* 24 bpp dstDIB */
-                {
-                    LPBYTE dstbits = dbits;
-
-                    switch(bmp->dib->dsBm.bmBitsPixel) {
-
-                    case 16: /* 16 bpp srcDIB -> 24 bpp dstDIB */
-                        {
-                            LPWORD srcbits = (LPWORD)sbits;
-                            WORD val;
-
-                            /* FIXME: BI_BITFIELDS not supported yet */
-                            for( y = 0; y < lines; y++) {
-                                for( x = 0; x < srcwidth; x++ ) {
-                                    val = *srcbits++;
-                                    *dstbits++ = (BYTE)(((val << 3) & 0xf8) | ((val >> 2) & 0x07));
-                                    *dstbits++ = (BYTE)(((val >> 2) & 0xf8) | ((val >> 7) & 0x07));
-                                    *dstbits++ = (BYTE)(((val >> 7) & 0xf8) | ((val >> 12) & 0x07));
-                                }
-                                dstbits = (LPBYTE)(dbits+=dstwidthb);
-                                srcbits = (LPWORD)(sbits+=srcwidthb);
-                            }
-                        }
-                        break;
-
-                    case 24: /* 24 bpp srcDIB -> 24 bpp dstDIB */
-                        {
-                            for (y = 0; y < lines; y++, dbits+=dstwidthb, sbits+=srcwidthb)
-                                memcpy(dbits, sbits, srcwidthb);
-                        }
-                        break;
-
-                    case 32: /* 32 bpp srcDIB -> 24 bpp dstDIB */
-                        {
-                            LPBYTE srcbits = (LPBYTE)sbits;
-
-                            for( y = 0; y < lines; y++) {
-                                for( x = 0; x < srcwidth; x++, srcbits++ ) {
-                                    *dstbits++ = *srcbits++;
-                                    *dstbits++ = *srcbits++;
-                                    *dstbits++ = *srcbits++;
-                                }
-                                dstbits=(LPBYTE)(dbits+=dstwidthb);
-                                srcbits = (LPBYTE)(sbits+=srcwidthb);
-                            }
-                        }
-                        break;
-
-                    default: /* ? bit bmp -> 24 bit DIB */
-                        DPRINT1("FIXME: 24 bit DIB %d bit bitmap\n",
-                              bmp->bitmap.bmBitsPixel);
-                        break;
-                    }
-                }
-                break;
-
-            case 32: /* 32 bpp dstDIB */
-                {
-                    LPDWORD dstbits = (LPDWORD)dbits;
-
-                    /* FIXME: BI_BITFIELDS not supported yet */
-
-                    switch(bmp->dib->dsBm.bmBitsPixel) {
-                        case 16: /* 16 bpp srcDIB -> 32 bpp dstDIB */
-                        {
-                            LPWORD srcbits = (LPWORD)sbits;
-                            DWORD val;
-
-                            /* FIXME: BI_BITFIELDS not supported yet */
-                            for( y = 0; y < lines; y++) {
-                                for( x = 0; x < srcwidth; x++ ) {
-                                    val = (DWORD)*srcbits++;
-                                    *dstbits++ = ((val << 3) & 0xf8) | ((val >> 2) & 0x07) |
-                                                 ((val << 6) & 0xf800) | ((val << 1) & 0x0700) |
-                                                 ((val << 9) & 0xf80000) | ((val << 4) & 0x070000);
-                                }
-                                dstbits=(LPDWORD)(dbits+=dstwidthb);
-                                srcbits=(LPWORD)(sbits+=srcwidthb);
-                            }
-                        }
-                        break;
-
-                    case 24: /* 24 bpp srcDIB -> 32 bpp dstDIB */
-                        {
-                            LPBYTE srcbits = sbits;
-
-                            for( y = 0; y < lines; y++) {
-                                for( x = 0; x < srcwidth; x++, srcbits+=3 )
-                                    *dstbits++ = ((DWORD)*srcbits) & 0x00ffffff;
-                                dstbits=(LPDWORD)(dbits+=dstwidthb);
-                                srcbits=(sbits+=srcwidthb);
-                            }
-                        }
-                        break;
-
-                    case 32: /* 32 bpp srcDIB -> 16 bpp dstDIB */
-                        {
-                            /* FIXME: BI_BITFIELDS not supported yet */
-                            for (y = 0; y < lines; y++, dbits+=dstwidthb, sbits+=srcwidthb)
-                                memcpy(dbits, sbits, srcwidthb);
-                        }
-                        break;
-
-                    default: /* ? bit bmp -> 32 bit DIB */
-                        DPRINT1("FIXME: 32 bit DIB %d bit bitmap\n",
-                        bmp->bitmap.bmBitsPixel);
-                        break;
-                    }
-                }
-                break;
-
-            default: /* ? bit DIB */
-                DPRINT1("FIXME: Unsupported DIB depth %d\n", info->bmiHeader.biBitCount);
-                break;
+         DestPalette = PALETTE_LockPalette(hDestPalette);
+         ASSERT(DestPalette);
+         DestPaletteType = DestPalette->Mode;
+         
+         /* Copy palette. */
+         /* FIXME: This is largely incomplete. */
+         if (Info->bmiHeader.biBitCount <= 8)
+         {
+            if (Usage == DIB_RGB_COLORS)
+            {
+               for (Index = 0;
+                    Index < (1 << Info->bmiHeader.biBitCount) &&
+                    Index < DestPalette->NumColors;
+                    Index++)
+               {
+                  Info->bmiColors[Index].rgbRed =
+                     DestPalette->IndexedColors[Index].peRed;
+                  Info->bmiColors[Index].rgbGreen =
+                     DestPalette->IndexedColors[Index].peGreen;
+                  Info->bmiColors[Index].rgbBlue =
+                     DestPalette->IndexedColors[Index].peBlue;
+               }
             }
-        }
-        /* Otherwise, get bits from the XImage */
-        else
-        {
-            UNIMPLEMENTED;
-        }
-    }
-    else if( info->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER) )
-    {
-	/* fill in struct members */
+            if (Usage == DIB_PAL_COLORS)
+            {
+               DbgPrint("GetDIBits with DIB_PAL_COLORS isn't implemented yet.");
+            }
+         }
 
-        if( info->bmiHeader.biBitCount == 0)
-	{
-	    info->bmiHeader.biWidth = bmp->bitmap.bmWidth;
-	    info->bmiHeader.biHeight = bmp->bitmap.bmHeight;
-	    info->bmiHeader.biPlanes = 1;
-	    info->bmiHeader.biBitCount = bmp->bitmap.bmBitsPixel;
-	    info->bmiHeader.biSizeImage =
-                             DIB_GetDIBImageBytes( bmp->bitmap.bmWidth,
-						   bmp->bitmap.bmHeight,
-						   bmp->bitmap.bmBitsPixel );
-	    info->bmiHeader.biCompression = 0;
-	}
-	else
-	{
-	    info->bmiHeader.biSizeImage = DIB_GetDIBImageBytes(
-					       info->bmiHeader.biWidth,
-					       info->bmiHeader.biHeight,
-					       info->bmiHeader.biBitCount );
-	}
-    }
+         PALETTE_UnlockPalette(hDestPalette);
 
-    DC_UnlockDc( hdc );
-    BITMAPOBJ_UnlockBitmap( hbitmap );
+         XlateObj = IntEngCreateXlate(
+            DestPaletteType, SourcePaletteType, hDestPalette, hSourcePalette);
+         
+         SourcePoint.x = 0;
+         SourcePoint.y = StartScan;
 
-    return lines;
-#endif
+         /* Determine destination rectangle */
+         DestRect.top = 0;
+         DestRect.left = 0;
+         DestRect.right = DestSize.cx;
+         DestRect.bottom = DestSize.cy;
+
+         if (EngCopyBits(DestSurfObj, &BitmapObj->SurfObj,
+                         NULL, XlateObj, &DestRect, &SourcePoint))
+         {
+            Result = ScanLines;
+         }
+         
+         EngDeleteXlate(XlateObj);
+         EngUnlockSurface(DestSurfObj);
+      }
+   }
+
+   BITMAPOBJ_UnlockBitmap(hBitmap);
+
+   return Result;
 }
 
 INT STDCALL NtGdiStretchDIBits(HDC  hDC,
@@ -847,7 +526,9 @@ LONG STDCALL NtGdiGetBitmapBits(HBITMAP  hBitmap,
   /* If the bits vector is null, the function should return the read size */
   if (Bits == NULL)
   {
-    return bmp->bitmap.bmWidthBytes * bmp->bitmap.bmHeight;
+    ret = bmp->SurfObj.cjBits;
+    BITMAPOBJ_UnlockBitmap (hBitmap);
+    return ret;
   }
 
   if (Count < 0)
@@ -857,21 +538,23 @@ LONG STDCALL NtGdiGetBitmapBits(HBITMAP  hBitmap,
   }
 
   /* Only get entire lines */
-  height = Count / bmp->bitmap.bmWidthBytes;
-  if (height > bmp->bitmap.bmHeight)
+  height = Count / abs(bmp->SurfObj.lDelta);
+  if (height > bmp->SurfObj.sizlBitmap.cy)
   {
-    height = bmp->bitmap.bmHeight;
+    height = bmp->SurfObj.sizlBitmap.cy;
   }
-  Count = height * bmp->bitmap.bmWidthBytes;
+  Count = height * abs(bmp->SurfObj.lDelta);
   if (Count == 0)
   {
     DPRINT("Less then one entire line requested\n");
+    BITMAPOBJ_UnlockBitmap (hBitmap);
     return  0;
   }
 
   DPRINT("(%08x, %ld, %p) %dx%d %d colors fetched height: %ld\n",
-         hBitmap, Count, Bits, bmp->bitmap.bmWidth, bmp->bitmap.bmHeight,
-         1 << bmp->bitmap.bmBitsPixel, height );
+         hBitmap, Count, Bits, bmp->SurfObj.sizlBitmap.cx,
+         bmp->SurfObj.sizlBitmap.cy,
+         1 << BitsPerFormat(bmp->SurfObj.iBitmapFormat), height );
 #if 0
   /* FIXME: Call DDI CopyBits here if available  */
   if(bmp->DDBitmap)
@@ -891,18 +574,12 @@ LONG STDCALL NtGdiGetBitmapBits(HBITMAP  hBitmap,
   else
 #endif
   {
-    if(!bmp->bitmap.bmBits)
-    {
-      DPRINT ("Bitmap is empty\n");
-      ret = 0;
-    }
-    else
-    {
-      memcpy(Bits, bmp->bitmap.bmBits, Count);
-      ret = Count;
-    }
+    memcpy(Bits, bmp->SurfObj.pvBits, Count);
+    ret = Count;
   }
 
+  BITMAPOBJ_UnlockBitmap (hBitmap);
+
   return  ret;
 }
 
@@ -919,7 +596,6 @@ IntCreateDIBitmap(PDC Dc, const BITMAPINFOHEADER *header,
   WORD compr;
 
   if (DIB_GetBitmapInfo( header, &width, &height, &bpp, &compr ) == -1) return 0;
-  if (height < 0) height = -height;
 
   // Check if we should create a monochrome or color bitmap. We create a monochrome bitmap only if it has exactly 2
   // colors, which are black followed by white, nothing else. In all other cases, we create a color bitmap.
@@ -975,6 +651,9 @@ IntCreateDIBitmap(PDC Dc, const BITMAPINFOHEADER *header,
     handle = NtGdiCreateBitmap( width, height, 1, 1, NULL);
   }
 
+  if (height < 0)
+    height = -height;
+
   if (NULL != handle && CBM_INIT == init)
   {
     IntSetDIBits(Dc, handle, 0, height, bits, data, coloruse);
@@ -1053,6 +732,7 @@ DIB_CreateDIBSection(
   ULONG totalSize;
   UINT Entries = 0;
   BITMAP bm;
+  SIZEL Size;
 
   DPRINT("format (%ld,%ld), planes %d, bpp %d, size %ld, colors %ld (%s)\n",
 	bi->biWidth, bi->biHeight, bi->biPlanes, bi->biBitCount,
@@ -1074,9 +754,12 @@ DIB_CreateDIBSection(
     ? bi->biSizeImage : (ULONG) (bm.bmWidthBytes * effHeight);
 
   if (section)
+  {
 /*    bm.bmBits = MapViewOfFile(section, FILE_MAP_ALL_ACCESS,
 			      0L, offset, totalSize); */
     DbgPrint("DIB_CreateDIBSection: Cannot yet handle section DIBs\n");
+    return 0;
+  }
   else if (ovr_pitch && offset)
     bm.bmBits = (LPVOID) offset;
   else {
@@ -1084,8 +767,6 @@ DIB_CreateDIBSection(
     bm.bmBits = EngAllocUserMem(totalSize, 0);
   }
 
-/*  bm.bmBits = ExAllocatePool(PagedPool, totalSize); */
-
   if(usage == DIB_PAL_COLORS)
     memcpy(bmi->bmiColors, (UINT *)DIB_MapPaletteColors(dc, bmi), sizeof(UINT *));
 
@@ -1133,7 +814,13 @@ DIB_CreateDIBSection(
   // Create Device Dependent Bitmap and add DIB pointer
   if (dib)
   {
-    res = IntCreateDIBitmap(dc, bi, 0, NULL, bmi, usage);
+    Size.cx = bm.bmWidth;
+    Size.cy = bm.bmHeight;
+    res = IntCreateBitmap(Size, bm.bmWidthBytes,
+                          BitmapFormat(bi->biBitCount * bi->biPlanes, bi->biCompression),
+                          BMF_DONTCACHE | BMF_USERMEM | BMF_NOZEROINIT |
+                          (bi->biHeight > 0 ? 0 : BMF_TOPDOWN),
+                          bm.bmBits);
     if (! res)
       {
 	return NULL;
@@ -1145,9 +832,6 @@ DIB_CreateDIBSection(
 	return NULL;
       }
     bmp->dib = (DIBSECTION *) dib;
-    /* Install user-mode bits instead of kernel-mode bits */
-    ExFreePool(bmp->bitmap.bmBits);
-    bmp->bitmap.bmBits = bm.bmBits;
 
     /* WINE NOTE: WINE makes use of a colormap, which is a color translation table between the DIB and the X physical
                   device. Obviously, this is left out of the ReactOS implementation. Instead, we call
diff --git a/reactos/subsys/win32k/objects/fillshap.c b/reactos/subsys/win32k/objects/fillshap.c
index fc64b19f183..e5f530da0a5 100644
--- a/reactos/subsys/win32k/objects/fillshap.c
+++ b/reactos/subsys/win32k/objects/fillshap.c
@@ -16,26 +16,26 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: fillshap.c,v 1.50 2004/06/20 00:45:37 navaraf Exp $ */
+/* $Id: fillshap.c,v 1.51 2004/07/03 13:55:36 navaraf Exp $ */
 #include <w32k.h>
 
 /*
  * a couple macros to fill a single pixel or a line
  */
-#define PUTPIXEL(x,y,brushObj)      \
-  ret = ret && IntEngLineTo(SurfObj,  \
-       dc->CombinedClip,              \
-       &brushObj->BrushObject,        \
-       x, y, (x)+1, y,                \
-       &RectBounds,                   \
+#define PUTPIXEL(x,y,brushObj)         \
+  ret = ret && IntEngLineTo(BitmapObj, \
+       dc->CombinedClip,               \
+       &brushObj->BrushObject,         \
+       x, y, (x)+1, y,                 \
+       &RectBounds,                    \
        dc->w.ROPmode);
 
 #define PUTLINE(x1,y1,x2,y2,brushObj)  \
-  ret = ret && IntEngLineTo(SurfObj,  \
-       dc->CombinedClip,              \
-       &brushObj->BrushObject,        \
-       x1, y1, x2, y2,                \
-       &RectBounds,                   \
+  ret = ret && IntEngLineTo(BitmapObj, \
+       dc->CombinedClip,               \
+       &brushObj->BrushObject,         \
+       x1, y1, x2, y2,                 \
+       &RectBounds,                    \
        dc->w.ROPmode);
 
 BOOL FASTCALL
@@ -43,7 +43,7 @@ IntGdiPolygon(PDC    dc,
               PPOINT UnsafePoints,
               int    Count)
 {
-  SURFOBJ *SurfObj;
+  BITMAPOBJ *BitmapObj;
   PGDIBRUSHOBJ PenBrushObj, FillBrushObj;
   BOOL ret = FALSE; // default to failure
   RECTL DestRect;
@@ -57,8 +57,8 @@ IntGdiPolygon(PDC    dc,
       return FALSE;
     }
 
-  SurfObj = (SURFOBJ*)AccessUserObject((ULONG)dc->Surface);
-  ASSERT(SurfObj);
+  BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap);
+  ASSERT(BitmapObj);
 
       /* Convert to screen coordinates */
       for (CurrentPoint = 0; CurrentPoint < Count; CurrentPoint++)
@@ -84,14 +84,12 @@ IntGdiPolygon(PDC    dc,
 	  DestRect.bottom   = max(DestRect.bottom, UnsafePoints[CurrentPoint].y);
 	}
 
-#if 1
 	/* Now fill the polygon with the current brush. */
 	FillBrushObj = BRUSHOBJ_LockBrush(dc->w.hBrush);
 	ASSERT(FillBrushObj);
 	if (!(FillBrushObj->flAttrs & GDIBRUSH_IS_NULL))
-	  ret = FillPolygon ( dc, SurfObj, &FillBrushObj->BrushObject, dc->w.ROPmode, UnsafePoints, Count, DestRect );
+	  ret = FillPolygon ( dc, BitmapObj, &FillBrushObj->BrushObject, dc->w.ROPmode, UnsafePoints, Count, DestRect );
 	BRUSHOBJ_UnlockBrush(dc->w.hBrush);
-#endif
 
 	/* get BRUSHOBJ from current pen. */
 	PenBrushObj = PENOBJ_LockPen(dc->w.hPen);
@@ -114,7 +112,7 @@ IntGdiPolygon(PDC    dc,
 	      To = UnsafePoints[CurrentPoint + 1];
 
 	    //DPRINT("Polygon Making line from (%d,%d) to (%d,%d)\n", From.x, From.y, To.x, To.y );
-	    ret = IntEngLineTo(SurfObj,
+	    ret = IntEngLineTo(BitmapObj,
 			       dc->CombinedClip,
 			       &PenBrushObj->BrushObject,
 			       From.x,
@@ -125,16 +123,9 @@ IntGdiPolygon(PDC    dc,
 			       dc->w.ROPmode); /* MIX */
 	  }
 	}
-#if 0
-	/* Now fill the polygon with the current brush. */
-	FillBrushObj = BRUSHOBJ_LockBrush(dc->w.hBrush);
-	ASSERT(FillBrushObj);
-	if ( FillBrushObj->logbrush.lbStyle != BS_NULL )
-	  ret = FillPolygon ( dc, SurfObj, FillBrushObj, dc->w.ROPmode, UnsafePoints, Count, DestRect );
-	BRUSHOBJ_UnlockBrush(dc->w.hBrush);
-#endif
       }
 
+      BITMAPOBJ_UnlockBitmap(dc->w.hBitmap);
       PENOBJ_UnlockPen( dc->w.hPen );
   
   return ret;
@@ -215,7 +206,7 @@ NtGdiEllipse(
    int RadiusX, RadiusY;
    int Temp;
    PGDIBRUSHOBJ FillBrush, PenBrush;
-   SURFOBJ *SurfObj;
+   BITMAPOBJ *BitmapObj;
    RECTL RectBounds;
    PDC dc;
    BOOL ret = TRUE, Cond1, Cond2;
@@ -258,7 +249,8 @@ NtGdiEllipse(
       return FALSE;
    }
 
-   SurfObj = (SURFOBJ*)AccessUserObject((ULONG)dc->Surface);
+   BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap);
+   ASSERT(BitmapObj);
 
    nLeftRect += dc->w.DCOrgX;
    nRightRect += dc->w.DCOrgX - 1;
@@ -377,6 +369,7 @@ NtGdiEllipse(
       }
    } while (B > A);
 
+   BITMAPOBJ_UnlockBitmap(dc->w.hBitmap);
    BRUSHOBJ_UnlockBrush(dc->w.hBrush);
    PENOBJ_UnlockPen(dc->w.hPen);
    DC_UnlockDc(hDC);
@@ -927,12 +920,13 @@ IntRectangle(PDC dc,
 	     int RightRect,
 	     int BottomRect)
 {
-  SURFOBJ   *SurfObj = (SURFOBJ*)AccessUserObject((ULONG)dc->Surface);
+  BITMAPOBJ *BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap);
   PGDIBRUSHOBJ PenBrushObj, FillBrushObj;
   BOOL       ret = FALSE; // default to failure
   RECTL      DestRect;
 
   ASSERT ( dc ); // caller's responsibility to set this up
+  ASSERT ( BitmapObj );
 
   if ( PATH_IsPathOpen(dc->w.path) )
   {
@@ -956,7 +950,7 @@ IntRectangle(PDC dc,
     {
       if (!(FillBrushObj->flAttrs & GDIBRUSH_IS_NULL))
       {
-	ret = IntEngBitBlt(SurfObj,
+	ret = IntEngBitBlt(BitmapObj,
                            NULL,
                            NULL,
                            dc->CombinedClip,
@@ -977,6 +971,7 @@ IntRectangle(PDC dc,
     if (PenBrushObj == NULL)
     {
       SetLastWin32Error(ERROR_INVALID_HANDLE);
+      BITMAPOBJ_UnlockBitmap(dc->w.hBitmap);
       return FALSE;
     }
 
@@ -986,28 +981,28 @@ IntRectangle(PDC dc,
 
     if (!(PenBrushObj->flAttrs & GDIBRUSH_IS_NULL))
     {
-      ret = ret && IntEngLineTo(SurfObj,
+      ret = ret && IntEngLineTo(BitmapObj,
 			 dc->CombinedClip,
 			 &PenBrushObj->BrushObject,
 			 LeftRect, TopRect, RightRect, TopRect,
 			 &DestRect, // Bounding rectangle
 			 dc->w.ROPmode); // MIX
 
-      ret = ret && IntEngLineTo(SurfObj,
+      ret = ret && IntEngLineTo(BitmapObj,
 			 dc->CombinedClip,
 			 &PenBrushObj->BrushObject,
 			 RightRect, TopRect, RightRect, BottomRect,
 			 &DestRect, // Bounding rectangle
 			 dc->w.ROPmode); // MIX
 
-      ret = ret && IntEngLineTo(SurfObj,
+      ret = ret && IntEngLineTo(BitmapObj,
 			 dc->CombinedClip,
 			 &PenBrushObj->BrushObject,
 			 RightRect, BottomRect, LeftRect, BottomRect,
 			 &DestRect, // Bounding rectangle
 			 dc->w.ROPmode); // MIX
 
-      ret = ret && IntEngLineTo(SurfObj,
+      ret = ret && IntEngLineTo(BitmapObj,
 			 dc->CombinedClip,
 			 &PenBrushObj->BrushObject,
 			 LeftRect, BottomRect, LeftRect, TopRect,
@@ -1018,6 +1013,8 @@ IntRectangle(PDC dc,
     PENOBJ_UnlockPen(dc->w.hPen);
   }
 
+  BITMAPOBJ_UnlockBitmap(dc->w.hBitmap);
+
   /* Move current position in DC?
      MSDN: The current position is neither used nor updated by Rectangle. */
 
@@ -1060,7 +1057,7 @@ IntRoundRect(
 	int  xCurveDiameter,
 	int  yCurveDiameter)
 {
-  SURFOBJ   *SurfObj;
+  BITMAPOBJ   *BitmapObj;
   PGDIBRUSHOBJ   PenBrushObj, FillBrushObj;
   RECTL      RectBounds;
   int i, col, row, width, height, x1, x1start, x2, x2start, y1, y2;
@@ -1092,7 +1089,8 @@ IntRoundRect(
   RectBounds.top = top;
   RectBounds.bottom = bottom;
 
-  SurfObj = (SURFOBJ*)AccessUserObject((ULONG)dc->Surface);
+  BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap);
+  ASSERT(BitmapObj);
 
   FillBrushObj = BRUSHOBJ_LockBrush(dc->w.hBrush);
   ASSERT(FillBrushObj);
@@ -1287,6 +1285,7 @@ IntRoundRect(
     PUTLINE ( left,  y2,     left,  y1,     PenBrushObj );
   }
 
+  BITMAPOBJ_UnlockBitmap(dc->w.hBitmap);
   PENOBJ_UnlockPen(dc->w.hPen);
   BRUSHOBJ_UnlockBrush(dc->w.hBrush);
 
@@ -1331,7 +1330,7 @@ IntGdiGradientFill(
   ULONG uMesh,
   ULONG ulMode)
 {
-  SURFOBJ *SurfObj;
+  BITMAPOBJ *BitmapObj;
   PPALGDI PalDestGDI;
   XLATEOBJ *XlateObj;
   RECTL Extent;
@@ -1392,8 +1391,8 @@ IntGdiGradientFill(
   Extent.top += DitherOrg.y;
   Extent.bottom += DitherOrg.y;
   
-  SurfObj = (SURFOBJ*)AccessUserObject((ULONG)dc->Surface);
-  ASSERT(SurfObj);
+  BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap);
+  ASSERT(BitmapObj);
   
   PalDestGDI = PALETTE_LockPalette(dc->w.hPalette);
   ASSERT(PalDestGDI);
@@ -1403,7 +1402,7 @@ IntGdiGradientFill(
   XlateObj = (XLATEOBJ*)IntEngCreateXlate(Mode, PAL_RGB, dc->w.hPalette, NULL);
   ASSERT(XlateObj);
   
-  Ret = IntEngGradientFill(SurfObj,
+  Ret = IntEngGradientFill(BitmapObj,
                            dc->CombinedClip,
                            XlateObj,
                            pVertex,
@@ -1414,6 +1413,7 @@ IntGdiGradientFill(
                            &DitherOrg,
                            ulMode);
   
+  BITMAPOBJ_UnlockBitmap(dc->w.hBitmap);
   EngDeleteXlate(XlateObj);
   
   return Ret;
diff --git a/reactos/subsys/win32k/objects/gdiobj.c b/reactos/subsys/win32k/objects/gdiobj.c
index 3d1c2fcf06f..0627c3ecbbb 100644
--- a/reactos/subsys/win32k/objects/gdiobj.c
+++ b/reactos/subsys/win32k/objects/gdiobj.c
@@ -19,7 +19,7 @@
 /*
  * GDIOBJ.C - GDI object manipulation routines
  *
- * $Id: gdiobj.c,v 1.68 2004/06/20 00:45:37 navaraf Exp $
+ * $Id: gdiobj.c,v 1.69 2004/07/03 13:55:36 navaraf Exp $
  *
  */
 #include <w32k.h>
@@ -710,10 +710,10 @@ GDIOBJ_LockObjDbg (const char* file, int line, HGDIOBJ hObj, DWORD ObjectType)
   if (! ExTryToAcquireFastMutex(&ObjHdr->Lock))
     {
       DPRINT1("Caution! GDIOBJ_LockObj trying to lock object 0x%x second time\n", hObj);
-      DPRINT1("  called from: %s:%i\n", file, line);
+      DPRINT1("  called from: %s:%i (thread %x)\n", file, line, KeGetCurrentThread());
       if (NULL != ObjHdr->lockfile)
         {
-          DPRINT1("  previously locked from: %s:%i\n", ObjHdr->lockfile, ObjHdr->lockline);
+          DPRINT1("  previously locked from: %s:%i (thread %x)\n", ObjHdr->lockfile, ObjHdr->lockline, ObjHdr->Lock.Owner);
         }
       ExAcquireFastMutex(&ObjHdr->Lock);
       DPRINT1("  Disregard previous message about object 0x%x, it's ok\n", hObj);
diff --git a/reactos/subsys/win32k/objects/line.c b/reactos/subsys/win32k/objects/line.c
index 4f2f5bb9dcf..ca7bcc5be27 100644
--- a/reactos/subsys/win32k/objects/line.c
+++ b/reactos/subsys/win32k/objects/line.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: line.c,v 1.33 2004/06/20 00:45:37 navaraf Exp $ */
+/* $Id: line.c,v 1.34 2004/07/03 13:55:37 navaraf Exp $ */
 #include <w32k.h>
 
 // Some code from the WINE project source (www.winehq.com)
@@ -51,18 +51,11 @@ IntGdiLineTo(DC  *dc,
              int XEnd,
              int YEnd)
 {
-  SURFOBJ *SurfObj;
-  BOOL     Ret;
+  BITMAPOBJ *BitmapObj;
+  BOOL      Ret;
   PGDIBRUSHOBJ PenBrushObj;
-  RECTL    Bounds;
-  POINT    Points[2];
-
-  SurfObj = (SURFOBJ*)AccessUserObject ( (ULONG)dc->Surface );
-  if (NULL == SurfObj)
-    {
-      SetLastWin32Error(ERROR_INVALID_HANDLE);
-      return FALSE;
-    }
+  RECTL     Bounds;
+  POINT     Points[2];
 
   if (PATH_IsPathOpen(dc->w.path))
     {
@@ -77,6 +70,13 @@ IntGdiLineTo(DC  *dc,
     }
   else
     {
+      BitmapObj = BITMAPOBJ_LockBitmap ( dc->w.hBitmap );
+      if (NULL == BitmapObj)
+        {
+          SetLastWin32Error(ERROR_INVALID_HANDLE);
+          return FALSE;
+        }
+
       Points[0].x = dc->w.CursPosX;
       Points[0].y = dc->w.CursPosY;
       Points[1].x = XEnd;
@@ -101,7 +101,7 @@ IntGdiLineTo(DC  *dc,
 
       if (!(PenBrushObj->flAttrs & GDIBRUSH_IS_NULL))
       {
-        Ret = IntEngLineTo(SurfObj,
+        Ret = IntEngLineTo(BitmapObj,
                            dc->CombinedClip,
                            &PenBrushObj->BrushObject,
                            Points[0].x, Points[0].y,
@@ -110,6 +110,7 @@ IntGdiLineTo(DC  *dc,
                            dc->w.ROPmode);
       }
 
+      BITMAPOBJ_UnlockBitmap ( dc->w.hBitmap );
       PENOBJ_UnlockPen( dc->w.hPen );
     }
 
@@ -187,18 +188,18 @@ IntGdiPolyline(DC      *dc,
                LPPOINT pt,
                int     Count)
 {
-  SURFOBJ     *SurfObj = NULL;
+  BITMAPOBJ    *BitmapObj;
   BOOL         ret = FALSE; // default to failure
   LONG         i;
   PGDIBRUSHOBJ PenBrushObj;
   POINT       *pts;
 
-  SurfObj = (SURFOBJ*)AccessUserObject((ULONG)dc->Surface);
-  ASSERT(SurfObj);
-
   if ( PATH_IsPathOpen ( dc->w.path ) )
     return PATH_Polyline ( dc, pt, Count );
 
+  BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap);
+  ASSERT(BitmapObj);
+
   //Allocate "Count" bytes of memory to hold a safe copy of pt
   pts = (POINT*)ExAllocatePoolWithTag ( PagedPool, sizeof(POINT)*Count, TAG_SHAPE );
   if ( pts )
@@ -220,7 +221,7 @@ IntGdiPolyline(DC      *dc,
       if (!(PenBrushObj->flAttrs & GDIBRUSH_IS_NULL))
       {
         //get IntEngPolyline to do the drawing.
-        ret = IntEngPolyline(SurfObj,
+        ret = IntEngPolyline(BitmapObj,
   			   dc->CombinedClip,
   			   &PenBrushObj->BrushObject,
   			   pts,
@@ -234,6 +235,8 @@ IntGdiPolyline(DC      *dc,
     ExFreePool ( pts );
   }
 
+  BITMAPOBJ_UnlockBitmap(dc->w.hBitmap);
+
   return ret;
 }
 
diff --git a/reactos/subsys/win32k/objects/objconv.c b/reactos/subsys/win32k/objects/objconv.c
deleted file mode 100644
index 442d7bfc1ca..00000000000
--- a/reactos/subsys/win32k/objects/objconv.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  ReactOS W32 Subsystem
- *  Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-/* $Id: objconv.c,v 1.20 2004/06/24 19:43:49 gvg Exp $ */
-#include <w32k.h>
-
-HBITMAP FASTCALL BitmapToSurf(PBITMAPOBJ BitmapObj, HDEV GDIDevice)
-{
-  HBITMAP BitmapHandle;
-  SIZE Size;
-
-  ASSERT ( BitmapObj );
-  Size.cx = BitmapObj->bitmap.bmWidth;
-  Size.cy = BitmapObj->bitmap.bmHeight;
-  if (NULL != BitmapObj->dib)
-    {
-    BitmapHandle = EngCreateBitmap(Size, BitmapObj->dib->dsBm.bmWidthBytes,
-                                   BitmapFormat(BitmapObj->dib->dsBm.bmBitsPixel, BI_RGB),
-                                   BitmapObj->dib->dsBmih.biHeight < 0 ? BMF_TOPDOWN : 0,
-                                   BitmapObj->dib->dsBm.bmBits);
-    }
-  else
-    {
-    BitmapHandle = EngCreateBitmap(Size, BitmapObj->bitmap.bmWidthBytes,
-                                   BitmapFormat(BitmapObj->bitmap.bmBitsPixel, BI_RGB),
-                                   BMF_TOPDOWN, BitmapObj->bitmap.bmBits);
-    }
-  if (NULL != BitmapHandle && NULL != GDIDevice)
-    {
-      EngAssociateSurface((HSURF)BitmapHandle, GDIDevice, 0);
-    }
-
-  return BitmapHandle;
-}
-
-/* EOF */
diff --git a/reactos/subsys/win32k/objects/polyfill.c b/reactos/subsys/win32k/objects/polyfill.c
index dffd73f1c5e..d2ee59c5b42 100644
--- a/reactos/subsys/win32k/objects/polyfill.c
+++ b/reactos/subsys/win32k/objects/polyfill.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: polyfill.c,v 1.14 2004/05/10 17:07:20 weiden Exp $
+/* $Id: polyfill.c,v 1.15 2004/07/03 13:55:37 navaraf Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -396,7 +396,7 @@ POLYGONFILL_FillScanLineAlternate(
   PDC dc,
   int ScanLine,
   FILL_EDGE* ActiveHead,
-  SURFOBJ *SurfObj,
+  BITMAPOBJ *BitmapObj,
   BRUSHOBJ *BrushObj,
   MIX RopMode )
 {
@@ -422,7 +422,7 @@ POLYGONFILL_FillScanLineAlternate(
       BoundRect.right = x2;
 
       //DPRINT("Fill Line (%d, %d) to (%d, %d)\n",x1, ScanLine, x2, ScanLine);
-      IntEngLineTo( SurfObj,
+      IntEngLineTo( BitmapObj,
 			  dc->CombinedClip,
 			  BrushObj,
 			  x1,
@@ -444,7 +444,7 @@ POLYGONFILL_FillScanLineWinding(
   PDC dc,
   int ScanLine,
   FILL_EDGE* ActiveHead,
-  SURFOBJ *SurfObj,
+  BITMAPOBJ *BitmapObj,
   BRUSHOBJ *BrushObj,
   MIX RopMode )
 {
@@ -495,7 +495,7 @@ POLYGONFILL_FillScanLineWinding(
 	BoundRect.right = x2;
 
 	//DPRINT("Fill Line (%d, %d) to (%d, %d)\n",x1, ScanLine, x2, ScanLine);
-	IntEngLineTo( SurfObj,
+	IntEngLineTo( BitmapObj,
 		      dc->CombinedClip,
 		      BrushObj,
 		      x1,
@@ -518,7 +518,7 @@ POLYGONFILL_FillScanLineWinding(
   BoundRect.right = x2;
 
   //DPRINT("Fill Line (%d, %d) to (%d, %d)\n",x1, ScanLine, x2, ScanLine);
-  IntEngLineTo( SurfObj,
+  IntEngLineTo( BitmapObj,
 		dc->CombinedClip,
 		BrushObj,
 		x1,
@@ -542,7 +542,7 @@ BOOL
 STDCALL
 FillPolygon(
   PDC dc,
-  SURFOBJ *SurfObj,
+  BITMAPOBJ *BitmapObj,
   BRUSHOBJ *BrushObj,
   MIX RopMode,
   CONST PPOINT Points,
@@ -559,7 +559,7 @@ FillPolygon(
     PDC dc,
     int ScanLine,
     FILL_EDGE* ActiveHead,
-    SURFOBJ *SurfObj,
+    BITMAPOBJ *BitmapObj,
     BRUSHOBJ *BrushObj,
     MIX RopMode );
 
@@ -583,7 +583,7 @@ FillPolygon(
   {
     POLYGONFILL_BuildActiveList(ScanLine, list, &ActiveHead);
     //DEBUG_PRINT_ACTIVE_EDGELIST(ActiveHead);
-    FillScanLine ( dc, ScanLine, ActiveHead, SurfObj, BrushObj, RopMode );
+    FillScanLine ( dc, ScanLine, ActiveHead, BitmapObj, BrushObj, RopMode );
   }
 
   /* Free Edge List. If any are left. */
diff --git a/reactos/subsys/win32k/objects/print.c b/reactos/subsys/win32k/objects/print.c
index f5f9521360b..6f13519655a 100644
--- a/reactos/subsys/win32k/objects/print.c
+++ b/reactos/subsys/win32k/objects/print.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: print.c,v 1.18 2004/06/20 00:45:37 navaraf Exp $ */
+/* $Id: print.c,v 1.19 2004/07/03 13:55:37 navaraf Exp $ */
 #include <w32k.h>
 
 INT
@@ -75,12 +75,13 @@ IntGdiExtEscape(
    INT    OutSize,
    LPSTR  OutData)
 {
-   SURFOBJ *Surface = (SURFOBJ*)AccessUserObject((ULONG)dc->Surface);
+   BITMAPOBJ *BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap);
+   INT Result;
 
    if ( NULL == dc->DriverFunctions.Escape )
    {
-      return IntEngExtEscape(
-         Surface,
+      Result = IntEngExtEscape(
+         &BitmapObj->SurfObj,
          Escape,
          InSize,
          (PVOID)InData,
@@ -89,14 +90,17 @@ IntGdiExtEscape(
    }
    else
    {
-      return dc->DriverFunctions.Escape(
-         Surface,
+      Result = dc->DriverFunctions.Escape(
+         &BitmapObj->SurfObj,
          Escape,
          InSize,
          (PVOID)InData,
          OutSize,
          (PVOID)OutData );
    }
+   BITMAPOBJ_UnlockBitmap(dc->w.hBitmap);
+
+   return Result;
 }
 
 INT
diff --git a/reactos/subsys/win32k/objects/region.c b/reactos/subsys/win32k/objects/region.c
index 6dd6ec4baeb..d19dc086b93 100644
--- a/reactos/subsys/win32k/objects/region.c
+++ b/reactos/subsys/win32k/objects/region.c
@@ -113,14 +113,10 @@ SOFTWARE.
  * the y-x-banding that's so nice to have...
  */
 
-/* $Id: region.c,v 1.59 2004/06/29 06:08:54 navaraf Exp $ */
+/* $Id: region.c,v 1.60 2004/07/03 13:55:37 navaraf Exp $ */
 #include <w32k.h>
 #include <win32k/float.h>
 
-BOOL STDCALL
-IntEngPaint(IN SURFOBJ *Surface,IN CLIPOBJ *ClipRegion,IN BRUSHOBJ *Brush,IN POINTL *BrushOrigin,
-	 IN MIX  Mix);
-
 // Internal Functions
 
 #define EMPTY_REGION(pReg) { \
@@ -2407,7 +2403,7 @@ NtGdiPaintRgn(HDC  hDC,
   BOOL bRet = FALSE;
   PGDIBRUSHOBJ pBrush;
   POINTL BrushOrigin;
-  SURFOBJ	*SurfObj;
+  BITMAPOBJ *BitmapObj;
 
   if( !dc )
 	return FALSE;
@@ -2444,14 +2440,15 @@ NtGdiPaintRgn(HDC  hDC,
   ASSERT(pBrush);
   BrushOrigin.x = dc->w.brushOrgX;
   BrushOrigin.y = dc->w.brushOrgY;
-  SurfObj = (SURFOBJ*)AccessUserObject((ULONG)dc->Surface);
+  BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap);
 
-  bRet = IntEngPaint(SurfObj,
+  bRet = IntEngPaint(BitmapObj,
 	 ClipRegion,
 	 &pBrush->BrushObject,
 	 &BrushOrigin,
 	 0xFFFF);//FIXME:don't know what to put here
 
+  BITMAPOBJ_UnlockBitmap(dc->w.hBitmap);
   RGNDATA_UnlockRgn( tmpVisRgn );
 
   // Fill the region
diff --git a/reactos/subsys/win32k/objects/text.c b/reactos/subsys/win32k/objects/text.c
index c0515c2637c..29cd537776d 100644
--- a/reactos/subsys/win32k/objects/text.c
+++ b/reactos/subsys/win32k/objects/text.c
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: text.c,v 1.100 2004/06/27 11:23:57 navaraf Exp $ */
+/* $Id: text.c,v 1.101 2004/07/03 13:55:37 navaraf Exp $ */
 #include <w32k.h>
 
 #include <ft2build.h>
@@ -382,8 +382,8 @@ IntGdiAddFontResource(PUNICODE_STRING FileName, DWORD Characteristics)
    FontGDI->TextMetric.tmDescent = (32 - Face->size->metrics.descender) >> 6; /* units below baseline */
    FontGDI->TextMetric.tmHeight = FontGDI->TextMetric.tmAscent + FontGDI->TextMetric.tmDescent;
 
-   DPRINT("Font loaded: %s (%s)\n", face->family_name, face->style_name);
-   DPRINT("Num glyphs: %u\n", face->num_glyphs);
+   DPRINT("Font loaded: %s (%s)\n", Face->family_name, Face->style_name);
+   DPRINT("Num glyphs: %u\n", Face->num_glyphs);
 
    /* Add this font resource to the font table */
 
@@ -412,21 +412,14 @@ IntGdiAddFontResource(PUNICODE_STRING FileName, DWORD Characteristics)
 BOOL FASTCALL
 IntIsFontRenderingEnabled(VOID)
 {
-  BOOL Ret;
-  HDC hDC;
-  PDC dc;
-  SURFOBJ *SurfObj;
-  Ret = RenderingEnabled;
-  hDC = IntGetScreenDC();
-  if(hDC)
-  {
-    dc = DC_LockDc(hDC);
-    SurfObj = (SURFOBJ*)AccessUserObject((ULONG) dc->Surface);
-    if(SurfObj)
-      Ret = (SurfObj->iBitmapFormat >= BMF_8BPP);
-    DC_UnlockDc(hDC);
-  }
-  return Ret;
+   BOOL Ret = RenderingEnabled;
+   HDC hDC;
+
+   hDC = IntGetScreenDC();
+   if (hDC)
+      Ret = (NtGdiGetDeviceCaps(hDC, BITSPIXEL) > 8) && RenderingEnabled;
+
+   return Ret;
 }
 
 VOID FASTCALL
@@ -1522,6 +1515,7 @@ NtGdiExtTextOut(
 
    DC *dc;
    SURFOBJ *SurfObj;
+   BITMAPOBJ *BitmapObj;
    int error, glyph_index, n, i;
    FT_Face face;
    FT_GlyphSlot glyph;
@@ -1571,7 +1565,9 @@ NtGdiExtTextOut(
       }
    }
  
-   SurfObj = (SURFOBJ*)AccessUserObject((ULONG) dc->Surface);
+   BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap);
+   ASSERT(BitmapObj);
+   SurfObj = &BitmapObj->SurfObj;
 
    Start.x = XStart; Start.y = YStart;
    IntLPtoDP(dc, &Start, 1);
@@ -1621,7 +1617,7 @@ NtGdiExtTextOut(
       DestRect.right += dc->w.DCOrgX;
       DestRect.bottom += dc->w.DCOrgY;
       IntEngBitBlt(
-         SurfObj,
+         BitmapObj,
          NULL,
          NULL,
          dc->CombinedClip,
@@ -1835,7 +1831,7 @@ NtGdiExtTextOut(
          DestRect.top = TextTop + yoff - ((face->size->metrics.ascender + 32) >> 6);
          DestRect.bottom = TextTop + yoff + ((32 - face->size->metrics.descender) >> 6);
          IntEngBitBlt(
-            SurfObj,
+            BitmapObj,
             NULL,
             NULL,
             dc->CombinedClip,
@@ -1866,7 +1862,7 @@ NtGdiExtTextOut(
        */
 
       HSourceGlyph = EngCreateBitmap(bitSize, pitch, (glyph->bitmap.pixel_mode == ft_pixel_mode_grays) ? BMF_8BPP : BMF_1BPP, BMF_TOPDOWN, glyph->bitmap.buffer);
-      SourceGlyphSurf = (SURFOBJ*)AccessUserObject((ULONG) HSourceGlyph);
+      SourceGlyphSurf = EngLockSurface((HSURF)HSourceGlyph);
     
       /*
        * Use the font data as a mask to paint onto the DCs surface using a
@@ -1885,6 +1881,7 @@ NtGdiExtTextOut(
          &BrushFg->BrushObject,
          &BrushOrigin);
 
+      EngUnlockSurface(SourceGlyphSurf);
       EngDeleteSurface((HSURF)HSourceGlyph);
 
       if (NULL == Dx)
@@ -1902,6 +1899,7 @@ NtGdiExtTextOut(
 
    EngDeleteXlate(XlateObj);
    EngDeleteXlate(XlateObj2);
+   BITMAPOBJ_UnlockBitmap(dc->w.hBitmap);
    TEXTOBJ_UnlockText(dc->w.hFont);
    if (hBrushBg != NULL)
    {
@@ -1920,6 +1918,7 @@ NtGdiExtTextOut(
 
 fail:
    TEXTOBJ_UnlockText(dc->w.hFont);
+   BITMAPOBJ_UnlockBitmap(dc->w.hBitmap);
    if (hBrushBg != NULL)
    {
       BRUSHOBJ_UnlockBrush(hBrushBg);
diff --git a/reactos/subsys/win32k/w32k.h b/reactos/subsys/win32k/w32k.h
index 13630062753..3d4caad4497 100644
--- a/reactos/subsys/win32k/w32k.h
+++ b/reactos/subsys/win32k/w32k.h
@@ -74,7 +74,6 @@
 #include <eng/misc.h>
 #include <eng/handle.h>
 #include <eng/clip.h>
-#include <eng/brush.h>
 
 #include <dib/dib.h>
 
diff --git a/reactos/subsys/win32k/win32k.edf b/reactos/subsys/win32k/win32k.edf
index 489b4e3cb3c..09615817b47 100644
--- a/reactos/subsys/win32k/win32k.edf
+++ b/reactos/subsys/win32k/win32k.edf
@@ -1,4 +1,4 @@
-; $Id: win32k.edf,v 1.22 2004/03/07 12:49:27 dwelch Exp $
+; $Id: win32k.edf,v 1.23 2004/07/03 13:55:36 navaraf Exp $
 ;
 ; win32k.def
 ;
@@ -52,7 +52,7 @@ EngFindResource=EngFindResource@16
 EngFreeMem=EngFreeMem@4
 EngFreeModule=EngFreeModule@4
 EngFreeUserMem=EngFreeUserMem@4
-EngGetCurrentCodePage=EngGetCurrentCodePage@8
+EngGetCurrentCodePage=ntoskrnl.RtlGetCurrentCodePage
 EngGetCurrentProcessId=EngGetCurrentProcessId@0
 EngGetCurrentThreadId=EngGetCurrentThreadId@0
 EngGetDriverName=EngGetDriverName@4
@@ -79,7 +79,7 @@ EngMarkBandingSurface=EngMarkBandingSurface@4
 EngModifySurface=EngModifySurface@32
 EngMovePointer=EngMovePointer@16
 EngMulDiv=EngMulDiv@12
-EngMultiByteToUnicodeN=EngMultiByteToUnicodeN@20
+EngMultiByteToUnicodeN=ntoskrnl.RtlMultiByteToUnicodeN
 EngMultiByteToWideChar=EngMultiByteToWideChar@20
 EngPaint=EngPaint@20
 EngProbeForRead=NTOSKRNL.ProbeForRead
@@ -104,7 +104,7 @@ EngStrokeAndFillPath=EngStrokeAndFillPath@40
 EngStrokePath=EngStrokePath@32
 EngTextOut=EngTextOut@40
 EngTransparentBlt=EngTransparentBlt@32
-EngUnicodeToMultiByteN=EngUnicodeToMultiByteN@20
+EngUnicodeToMultiByteN=ntoskrnl.RtlUnicodeToMultiByteN
 EngUnloadImage=EngUnloadImage@4
 EngUnlockDriverObj=EngUnlockDriverObj@4
 EngUnlockSurface=EngUnlockSurface@4

From 60d9c7030d9df9cc25ef48a6f4c94fbd87eac7b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Sat, 3 Jul 2004 14:46:39 +0000
Subject: [PATCH 176/356] Remove debugging statement

svn path=/trunk/; revision=9978
---
 reactos/lib/advapi32/reg/reg.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/reactos/lib/advapi32/reg/reg.c b/reactos/lib/advapi32/reg/reg.c
index fcd890716f4..6599c2563d1 100644
--- a/reactos/lib/advapi32/reg/reg.c
+++ b/reactos/lib/advapi32/reg/reg.c
@@ -1,4 +1,4 @@
-/* $Id: reg.c,v 1.48 2004/07/02 21:20:51 gvg Exp $
+/* $Id: reg.c,v 1.49 2004/07/03 14:46:39 gvg Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -1729,7 +1729,6 @@ RegOpenKeyA (HKEY hKey,
   LONG ErrorCode;
   NTSTATUS Status;
 
-DPRINT1("RegOpenKeyA hKey 0x%x subkey %s\n", hKey, lpSubKey);
   Status = MapDefaultKey (&KeyHandle,
 			  hKey);
   if (!NT_SUCCESS(Status))

From 9a64b810797fa50a5c87ea922e982ea46915590b Mon Sep 17 00:00:00 2001
From: Hartmut Birr <osexpert@googlemail.com>
Date: Sat, 3 Jul 2004 17:13:09 +0000
Subject: [PATCH 177/356] - Allowed multiple calls to CsrClientConnectToServer.
 - Removed CsrIsCsrss.

svn path=/trunk/; revision=9979
---
 reactos/include/ntdll/csr.h     |  4 +---
 reactos/lib/ntdll/csr/lpc.c     | 13 +++----------
 reactos/lib/ntdll/def/ntdll.def |  3 +--
 reactos/lib/ntdll/def/ntdll.edf |  3 +--
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/reactos/include/ntdll/csr.h b/reactos/include/ntdll/csr.h
index 00603b6dfe0..57d05cebcbf 100644
--- a/reactos/include/ntdll/csr.h
+++ b/reactos/include/ntdll/csr.h
@@ -1,4 +1,4 @@
-/* $Id: csr.h,v 1.8 2003/12/02 11:38:46 gvg Exp $
+/* $Id: csr.h,v 1.9 2004/07/03 17:13:09 hbirr Exp $
  *
  */
 
@@ -33,8 +33,6 @@ CsrCaptureParameterBuffer(PVOID ParameterBuffer,
 NTSTATUS STDCALL
 CsrReleaseParameterBuffer(PVOID ClientAddress);
 
-VOID STDCALL CsrIsCsrss(VOID);
-
 #endif /* __INCLUDE_NTDLL_CSR_H */
 
 /* EOF */
diff --git a/reactos/lib/ntdll/csr/lpc.c b/reactos/lib/ntdll/csr/lpc.c
index 8894aa0774f..dfe442f88cc 100644
--- a/reactos/lib/ntdll/csr/lpc.c
+++ b/reactos/lib/ntdll/csr/lpc.c
@@ -1,4 +1,4 @@
-/* $Id: lpc.c,v 1.12 2003/12/02 11:38:46 gvg Exp $
+/* $Id: lpc.c,v 1.13 2004/07/03 17:13:09 hbirr Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -30,8 +30,6 @@ static PVOID CsrSectionMapBase = NULL;
 static PVOID CsrSectionMapServerBase = NULL;
 static HANDLE CsrCommHeap = NULL;
 
-static BOOL IsCsrss = FALSE;
-
 #define CSR_CONTROL_HEAP_SIZE (65536)
 
 /* FUNCTIONS *****************************************************************/
@@ -128,7 +126,7 @@ CsrClientConnectToServer(VOID)
    HANDLE CsrSectionHandle;
    LARGE_INTEGER CsrSectionViewSize;
 
-   if (IsCsrss)
+   if (WindowsApiPort != INVALID_HANDLE_VALUE)
      {
        return STATUS_SUCCESS;
      }
@@ -161,6 +159,7 @@ CsrClientConnectToServer(VOID)
 			  &ConnectInfoLength);
    if (!NT_SUCCESS(Status))
      {
+     	WindowsApiPort = INVALID_HANDLE_VALUE;
 	return(Status);
      }
 
@@ -196,10 +195,4 @@ CsrClientConnectToServer(VOID)
    return(STATUS_SUCCESS);
 }
 
-void STDCALL
-CsrIsCsrss()
-{
-   IsCsrss = TRUE;
-}
-
 /* EOF */
diff --git a/reactos/lib/ntdll/def/ntdll.def b/reactos/lib/ntdll/def/ntdll.def
index 376a3486cdc..ab3eb203f25 100644
--- a/reactos/lib/ntdll/def/ntdll.def
+++ b/reactos/lib/ntdll/def/ntdll.def
@@ -1,4 +1,4 @@
-; $Id: ntdll.def,v 1.122 2004/06/27 12:21:14 ekohl Exp $
+; $Id: ntdll.def,v 1.123 2004/07/03 17:13:09 hbirr Exp $
 ;
 ; ReactOS Operating System
 ;
@@ -17,7 +17,6 @@ CsrClientCallServer@16
 CsrClientConnectToServer@0
 CsrFreeCaptureBuffer@4
 CsrIdentifyAlertableThread@0
-CsrIsCsrss@0
 CsrNewThread@0
 CsrProbeForRead@12
 CsrProbeForWrite@12
diff --git a/reactos/lib/ntdll/def/ntdll.edf b/reactos/lib/ntdll/def/ntdll.edf
index c21b6a89cf4..a3cb299df88 100644
--- a/reactos/lib/ntdll/def/ntdll.edf
+++ b/reactos/lib/ntdll/def/ntdll.edf
@@ -1,4 +1,4 @@
-; $Id: ntdll.edf,v 1.112 2004/06/27 12:21:14 ekohl Exp $
+; $Id: ntdll.edf,v 1.113 2004/07/03 17:13:09 hbirr Exp $
 ;
 ; ReactOS Operating System
 ;
@@ -17,7 +17,6 @@ CsrClientCallServer=CsrClientCallServer@16
 CsrClientConnectToServer=CsrClientConnectToServer@0
 CsrFreeCaptureBuffer=CsrFreeCaptureBuffer@4
 CsrIdentifyAlertableThread=CsrIdentifyAlertableThread@0
-CsrIsCsrss=CsrIsCsrss@0
 CsrNewThread=CsrNewThread@0
 CsrProbeForRead=CsrProbeForRead@12
 CsrProbeForWrite=CsrProbeForWrite@12

From c973b907c8bf9dce1ddd97469f754284159a1ec2 Mon Sep 17 00:00:00 2001
From: Hartmut Birr <osexpert@googlemail.com>
Date: Sat, 3 Jul 2004 17:15:02 +0000
Subject: [PATCH 178/356] - Try to get or to allocate the process data
 structure in ServerApiPortThread. - Changed the initialization sequence in
 CsrServerInitialization.

svn path=/trunk/; revision=9980
---
 reactos/subsys/csrss/api/wapi.c    | 56 ++++++++++++++++++++----------
 reactos/subsys/csrss/include/api.h |  5 +--
 reactos/subsys/csrss/init.c        | 24 +++++++------
 3 files changed, 55 insertions(+), 30 deletions(-)

diff --git a/reactos/subsys/csrss/api/wapi.c b/reactos/subsys/csrss/api/wapi.c
index f4ec9c88333..68c65c28c14 100644
--- a/reactos/subsys/csrss/api/wapi.c
+++ b/reactos/subsys/csrss/api/wapi.c
@@ -1,4 +1,4 @@
-/* $Id: wapi.c,v 1.36 2004/06/27 12:21:32 weiden Exp $
+/* $Id: wapi.c,v 1.37 2004/07/03 17:15:02 hbirr Exp $
  * 
  * reactos/subsys/csrss/api/wapi.c
  *
@@ -97,8 +97,8 @@ CsrApiCallHandler(PCSRSS_PROCESS_DATA ProcessData,
     }
 }
 
-static void
-Thread_Api2(HANDLE ServerPort)
+static void STDCALL
+ClientConnectionThread(HANDLE ServerPort)
 {
   NTSTATUS Status;
   LPC_MAX_MESSAGE LpcReply;
@@ -118,26 +118,31 @@ Thread_Api2(HANDLE ServerPort)
       if (! NT_SUCCESS(Status))
         {
           DPRINT1("CSR: NtReplyWaitReceivePort failed\n");
-          NtClose(ServerPort);
-          RtlRosExitUserThread(Status);
-          continue;
+          break;
         }
 	
       if (LpcRequest.Header.MessageType == LPC_PORT_CLOSED)
         {
           CsrFreeProcessData( (ULONG)LpcRequest.Header.ClientId.UniqueProcess );
-          NtClose(ServerPort);
-          RtlRosExitUserThread(STATUS_SUCCESS);
-          continue;
+          break;
         }
 
       Request = (PCSRSS_API_REQUEST)&LpcRequest;
       Reply = (PCSRSS_API_REPLY)&LpcReply;
 	
       ProcessData = CsrGetProcessData((ULONG)LpcRequest.Header.ClientId.UniqueProcess);
+      if (ProcessData == NULL)
+        {
+          DPRINT1("CSR: Message %d: Unable to find data for process %d\n",
+	          LpcRequest.Header.MessageType, (ULONG)LpcRequest.Header.ClientId.UniqueProcess);
+	  break;
+        }	          
+
 
       CsrApiCallHandler(ProcessData, Request, Reply);
     }
+  NtClose(ServerPort);
+  RtlRosExitUserThread(STATUS_SUCCESS);
 }
 
 /**********************************************************************
@@ -148,7 +153,8 @@ Thread_Api2(HANDLE ServerPort)
  * 	Handle connection requests from clients to the port
  * 	"\Windows\ApiPort".
  */
-void Thread_Api(PVOID PortHandle)
+void STDCALL
+ServerApiPortThead(PVOID PortHandle)
 {
    NTSTATUS Status;
    LPC_MAX_MESSAGE Request;
@@ -161,14 +167,14 @@ void Thread_Api(PVOID PortHandle)
    for (;;)
      {
         LPC_SECTION_READ LpcRead;
+        ServerPort = NULL;
 
 	Status = NtListenPort(PortHandle, &Request.Header);
 	if (!NT_SUCCESS(Status))
 	  {
 	     DPRINT1("CSR: NtListenPort() failed\n");
-	     NtTerminateThread(NtCurrentThread(), Status);
+	     break;
 	  }
-	
 	Status = NtAcceptConnectPort(&ServerPort,
 				     PortHandle,
 				     NULL,
@@ -178,10 +184,19 @@ void Thread_Api(PVOID PortHandle)
 	if (!NT_SUCCESS(Status))
 	  {
 	     DPRINT1("CSR: NtAcceptConnectPort() failed\n");
-	     NtTerminateThread(NtCurrentThread(), Status);
+	     break;
 	  }
 
-	ProcessData = CsrGetProcessData((ULONG)Request.Header.ClientId.UniqueProcess);
+	ProcessData = CsrCreateProcessData((ULONG)Request.Header.ClientId.UniqueProcess);
+	if (ProcessData == NULL)
+	  {
+	     DPRINT1("Unable to allocate or find data for process %d\n",
+	             (ULONG)Request.Header.ClientId.UniqueProcess);
+	     Status = STATUS_UNSUCCESSFUL;
+	     break;
+	  }
+	    
+
 	ProcessData->CsrSectionViewBase = LpcRead.ViewBase;
 	ProcessData->CsrSectionViewSize = LpcRead.ViewSize;
 	
@@ -189,7 +204,7 @@ void Thread_Api(PVOID PortHandle)
 	if (!NT_SUCCESS(Status))
 	  {
 	     DPRINT1("CSR: NtCompleteConnectPort() failed\n");
-	     NtTerminateThread(NtCurrentThread(), Status);
+	     break;
 	  }
 	
 	Status = RtlCreateUserThread(NtCurrentProcess(),
@@ -198,18 +213,23 @@ void Thread_Api(PVOID PortHandle)
 				     0,
 				     NULL,
 				     NULL,
-				     (PTHREAD_START_ROUTINE)Thread_Api2,
+				     (PTHREAD_START_ROUTINE)ClientConnectionThread,
 				     ServerPort,
 				     &ServerThread,
 				     NULL);
 	if (!NT_SUCCESS(Status))
 	  {
 	     DPRINT1("CSR: Unable to create server thread\n");
-	     NtClose(ServerPort);
-	     NtTerminateThread(NtCurrentThread(), Status);
+	     break;
 	  }
 	NtClose(ServerThread);
      }
+   if (ServerPort)
+     {
+       NtClose(ServerPort);
+     }
+   NtClose(PortHandle);
+   NtTerminateThread(NtCurrentThread(), Status);
 }
 
 /* EOF */
diff --git a/reactos/subsys/csrss/include/api.h b/reactos/subsys/csrss/include/api.h
index 7358c39dd3b..5aa8f6f3090 100644
--- a/reactos/subsys/csrss/include/api.h
+++ b/reactos/subsys/csrss/include/api.h
@@ -1,4 +1,4 @@
-/* $Id: api.h,v 1.4 2004/01/11 17:31:15 gvg Exp $
+/* $Id: api.h,v 1.5 2004/07/03 17:15:02 hbirr Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -96,7 +96,7 @@ NTSTATUS FASTCALL CsrApiRegisterDefinitions(PCSRSS_API_DEFINITION NewDefinitions
 VOID FASTCALL CsrApiCallHandler(PCSRSS_PROCESS_DATA ProcessData,
                                 PCSRSS_API_REQUEST Request,
                                 PCSRSS_API_REPLY Reply);
-VOID Thread_Api(PVOID PortHandle);
+VOID STDCALL ServerApiPortThead(PVOID PortHandle);
 VOID Console_Api( DWORD Ignored );
 
 extern HANDLE CsrssApiHeap;
@@ -107,6 +107,7 @@ VOID STDCALL CsrInitConsoleSupport(VOID);
 /* api/process.c */
 VOID STDCALL CsrInitProcessData(VOID);
 PCSRSS_PROCESS_DATA STDCALL CsrGetProcessData(ULONG ProcessId);
+PCSRSS_PROCESS_DATA STDCALL CsrCreateProcessData(ULONG ProcessId);
 NTSTATUS STDCALL CsrFreeProcessData( ULONG Pid );
 
 /* api/handle.c */
diff --git a/reactos/subsys/csrss/init.c b/reactos/subsys/csrss/init.c
index c232a896f77..220e88383b0 100644
--- a/reactos/subsys/csrss/init.c
+++ b/reactos/subsys/csrss/init.c
@@ -1,4 +1,4 @@
-/* $Id: init.c,v 1.27 2004/05/28 21:33:41 gvg Exp $
+/* $Id: init.c,v 1.28 2004/07/03 17:15:02 hbirr Exp $
  * 
  * reactos/subsys/csrss/init.c
  *
@@ -249,7 +249,6 @@ CsrServerInitialization (
       return FALSE;
     }
 
-  CsrIsCsrss( );
   CsrInitVideo();
 
   CsrssApiHeap = RtlCreateHeap(HEAP_GROWABLE,
@@ -270,13 +269,6 @@ CsrServerInitialization (
       return Status;
     }
 
-  Status = InitWin32Csr();
-  if (! NT_SUCCESS(Status))
-    {
-      DPRINT1("CSR: Unable to load usermode dll (Status %x)\n", Status);
-      return FALSE;
-    }
-
   /* NEW NAMED PORT: \ApiPort */
   RtlRosInitUnicodeStringFromLiteral(&PortName, L"\\Windows\\ApiPort");
   InitializeObjectAttributes(&ObAttributes,
@@ -300,7 +292,7 @@ CsrServerInitialization (
                                0,
                                NULL,
                                NULL,
-                               (PTHREAD_START_ROUTINE)Thread_Api,
+                               (PTHREAD_START_ROUTINE)ServerApiPortThead,
                                ApiPortHandle,
                                NULL,
                                NULL);
@@ -310,6 +302,18 @@ CsrServerInitialization (
       NtClose(ApiPortHandle);
       return FALSE;
     }
+  Status = CsrClientConnectToServer();
+  if (!NT_SUCCESS(Status))
+    {
+      DPRINT1("CsrClientConnectToServer() failed (Status %x)\n", Status);
+      return FALSE;
+    }
+  Status = InitWin32Csr();
+  if (! NT_SUCCESS(Status))
+    {
+      DPRINT1("CSR: Unable to load usermode dll (Status %x)\n", Status);
+      return FALSE;
+    }
 
   return CallInitComplete();
 }

From ba93d9c7b08d6778611872c6eefb88a5496f3afb Mon Sep 17 00:00:00 2001
From: Hartmut Birr <osexpert@googlemail.com>
Date: Sat, 3 Jul 2004 17:17:05 +0000
Subject: [PATCH 179/356] - Implemented GuiConsoleHandleClose.

svn path=/trunk/; revision=9981
---
 reactos/subsys/csrss/win32csr/guiconsole.c | 35 ++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/reactos/subsys/csrss/win32csr/guiconsole.c b/reactos/subsys/csrss/win32csr/guiconsole.c
index 8b3af6eed8d..716881289aa 100644
--- a/reactos/subsys/csrss/win32csr/guiconsole.c
+++ b/reactos/subsys/csrss/win32csr/guiconsole.c
@@ -1,4 +1,4 @@
-/* $Id: guiconsole.c,v 1.14 2004/05/08 09:19:53 gvg Exp $
+/* $Id: guiconsole.c,v 1.15 2004/07/03 17:17:05 hbirr Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -477,7 +477,38 @@ GuiConsoleHandleTimer(HWND hWnd)
 static VOID FASTCALL
 GuiConsoleHandleClose(HWND hWnd)
 {
-  /* FIXME for now, just ignore close requests */
+  PCSRSS_CONSOLE Console;
+  PGUI_CONSOLE_DATA GuiData;
+  PLIST_ENTRY current_entry;
+  PCSRSS_PROCESS_DATA current;
+  HANDLE Process;
+  BOOL Result;
+
+  GuiConsoleGetDataPointers(hWnd, &Console, &GuiData);
+
+  EnterCriticalSection(&Console->Header.Lock);
+
+  current_entry = Console->ProcessList.Flink;
+  while (current_entry != &Console->ProcessList)
+    {
+      current = CONTAINING_RECORD(current_entry, CSRSS_PROCESS_DATA, ProcessEntry);
+      current_entry = current_entry->Flink;
+
+      Process = OpenProcess(PROCESS_DUP_HANDLE, FALSE, current->ProcessId);
+      if (NULL == Process)
+        {
+          DPRINT1("Failed for handle duplication\n");
+	  continue;
+        }
+      Result = TerminateProcess(Process, 0);
+      CloseHandle(Process);
+      if (!Result)
+        {
+	  DPRINT1("Failed to terminate process %d\n", current->ProcessId);
+	}
+    }
+
+  LeaveCriticalSection(&Console->Header.Lock);
 }
 
 static VOID FASTCALL

From e251c53983a5110de05ecf7e9910e79bb2d155e6 Mon Sep 17 00:00:00 2001
From: Hartmut Birr <osexpert@googlemail.com>
Date: Sat, 3 Jul 2004 17:31:30 +0000
Subject: [PATCH 180/356] - Fixed a bug, which prevents an opening of files, if
 the file name contains short path names.

svn path=/trunk/; revision=9982
---
 reactos/drivers/fs/vfat/create.c | 43 +++++++++++++++++----------
 reactos/drivers/fs/vfat/fcb.c    | 51 ++++++++++++++++++++++++++++----
 2 files changed, 73 insertions(+), 21 deletions(-)

diff --git a/reactos/drivers/fs/vfat/create.c b/reactos/drivers/fs/vfat/create.c
index 1f95922f578..00843c284da 100644
--- a/reactos/drivers/fs/vfat/create.c
+++ b/reactos/drivers/fs/vfat/create.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: create.c,v 1.68 2004/06/23 20:23:59 hbirr Exp $
+/* $Id: create.c,v 1.69 2004/07/03 17:31:30 hbirr Exp $
  *
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/fs/vfat/create.c
@@ -339,34 +339,35 @@ VfatOpenFile (PDEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject,
   PVFATFCB ParentFcb;
   PVFATFCB Fcb;
   NTSTATUS Status;
-  UNICODE_STRING NameU;
-  WCHAR Name[MAX_PATH];
   ULONG Size;
   ULONG MediaChangeCount;
 
 //  PDEVICE_OBJECT DeviceObject = DeviceExt->StorageDevice->Vpb->DeviceObject;
   
-  DPRINT ("VfatOpenFile(%08lx, %08lx, '%wZ')\n", DeviceExt, FileObject, FileNameU);
+  DPRINT ("VfatOpenFile(%08lx, %08lx, '%wZ')\n", DeviceExt, FileObject, &FileObject->FileName);
 
   if (FileObject->RelatedFileObject)
     {
       DPRINT ("Converting relative filename to absolute filename\n");
 
-      NameU.Buffer = Name;
-      NameU.Length = 0;
-      NameU.MaximumLength = sizeof(Name);
-
       Fcb = FileObject->RelatedFileObject->FsContext;
-      RtlCopyUnicodeString(&NameU, &Fcb->PathNameU);
+      RtlCopyUnicodeString(FileNameU, &Fcb->PathNameU);
       if (!vfatFCBIsRoot(Fcb))
         {
-	  NameU.Buffer[NameU.Length / sizeof(WCHAR)] = L'\\';
-	  NameU.Length += sizeof(WCHAR);
+	  RtlAppendUnicodeToString(FileNameU, L"\\");
 	}
-      RtlAppendUnicodeStringToString(&NameU, FileNameU);
-      NameU.Buffer[NameU.Length / sizeof(WCHAR)] = 0;
-      FileNameU = &NameU;
+      RtlAppendUnicodeStringToString(FileNameU, &FileObject->FileName);
     }
+  else
+    {
+      RtlCopyUnicodeString(FileNameU, &FileObject->FileName);
+    }
+  if (FileNameU->Length > sizeof(WCHAR) &&
+      FileNameU->Buffer[FileNameU->Length / sizeof(WCHAR) - 1] == L'\\')
+    {
+      FileNameU->Length -= sizeof(WCHAR);
+    }
+  FileNameU->Buffer[FileNameU->Length / sizeof(WCHAR)] = 0;
 
   DPRINT ("PathName to open: '%wZ'\n", FileNameU);
 
@@ -425,6 +426,10 @@ VfatOpenFile (PDEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject,
           return  Status;
 	}
     }
+  else
+    {
+      RtlCopyUnicodeString(FileNameU, &Fcb->PathNameU);
+    }
   if (Fcb->Flags & FCB_DELETE_PENDING)
     {
       vfatReleaseFCB (DeviceExt, Fcb);
@@ -492,6 +497,8 @@ VfatCreateFile (PDEVICE_OBJECT DeviceObject, PIRP Irp)
   BOOLEAN PagingFileCreate = FALSE;
   LARGE_INTEGER AllocationSize;
   BOOLEAN Dots;
+  UNICODE_STRING NameU;
+  WCHAR NameW[MAX_PATH];
   
   /* Unpack the various parameters. */
   Stack = IoGetCurrentIrpStackLocation (Irp);
@@ -568,8 +575,12 @@ VfatCreateFile (PDEVICE_OBJECT DeviceObject, PIRP Irp)
 	}
     }
 
+  NameU.Buffer = NameW;
+  NameU.Length = 0;
+  NameU.MaximumLength = sizeof(NameW);
+
   /* Try opening the file. */
-  Status = VfatOpenFile (DeviceExt, FileObject, &FileObject->FileName);
+  Status = VfatOpenFile (DeviceExt, FileObject, &NameU);
 
   /*
    * If the directory containing the file to open doesn't exist then
@@ -594,7 +605,7 @@ VfatCreateFile (PDEVICE_OBJECT DeviceObject, PIRP Irp)
 	{
 	  ULONG Attributes;
 	  Attributes = Stack->Parameters.Create.FileAttributes;
-	  Status = VfatAddEntry (DeviceExt, &FileObject->FileName, FileObject, RequestedOptions, 
+	  Status = VfatAddEntry (DeviceExt, &NameU, FileObject, RequestedOptions, 
 				 (UCHAR)(Attributes & FILE_ATTRIBUTE_VALID_FLAGS));
 	  if (NT_SUCCESS (Status))
 	    {
diff --git a/reactos/drivers/fs/vfat/fcb.c b/reactos/drivers/fs/vfat/fcb.c
index fd8b48dbda6..5bbe452de93 100644
--- a/reactos/drivers/fs/vfat/fcb.c
+++ b/reactos/drivers/fs/vfat/fcb.c
@@ -1,4 +1,4 @@
-/* $Id: fcb.c,v 1.37 2004/01/28 20:53:46 ekohl Exp $
+/* $Id: fcb.c,v 1.38 2004/07/03 17:31:30 hbirr Exp $
  *
  *
  * FILE:             drivers/fs/vfat/fcb.c
@@ -594,6 +594,7 @@ vfatGetFCBForFile (PDEVICE_EXTENSION  pVCB,
   UNICODE_STRING NameU;
   UNICODE_STRING RootNameU;
   PWCHAR curr, prev, last;
+  ULONG Length;
 
   DPRINT ("vfatGetFCBForFile (%x,%x,%x,%wZ)\n",
           pVCB,
@@ -626,6 +627,24 @@ vfatGetFCBForFile (PDEVICE_EXTENSION  pVCB,
       NameU.Buffer = pFileNameU->Buffer;
       NameU.MaximumLength = NameU.Length = (curr - pFileNameU->Buffer) * sizeof(WCHAR);
       FCB = vfatGrabFCBFromTable(pVCB, &NameU);
+      if (FCB)
+        {
+	  Length = (curr - pFileNameU->Buffer) * sizeof(WCHAR);
+          if (Length != FCB->PathNameU.Length)
+	    {
+	      if (pFileNameU->Length + FCB->PathNameU.Length - Length > pFileNameU->MaximumLength)
+	        {
+		  vfatReleaseFCB (pVCB, FCB);
+		  return STATUS_OBJECT_NAME_INVALID;
+		}
+	      memmove(pFileNameU->Buffer + FCB->PathNameU.Length / sizeof(WCHAR), 
+		      curr, pFileNameU->Length - Length);
+	      pFileNameU->Length += FCB->PathNameU.Length - Length;
+	      curr = pFileNameU->Buffer + FCB->PathNameU.Length / sizeof(WCHAR);
+              last = pFileNameU->Buffer + pFileNameU->Length / sizeof(WCHAR) - 1;
+	    }
+	  memcpy(pFileNameU->Buffer, FCB->PathNameU.Buffer, FCB->PathNameU.Length);
+	}
     }
   else
     {
@@ -637,8 +656,10 @@ vfatGetFCBForFile (PDEVICE_EXTENSION  pVCB,
       FCB = vfatOpenRootFCB(pVCB);
       curr = pFileNameU->Buffer;
     }
-  curr++;
+  
   parentFCB = NULL;
+  prev = curr;
+
   while (curr <= last)
     {
       if (parentFCB)
@@ -659,13 +680,34 @@ vfatGetFCBForFile (PDEVICE_EXTENSION  pVCB,
           return  STATUS_OBJECT_PATH_NOT_FOUND;
 	}
       parentFCB = FCB;
-      NameU.Buffer = pFileNameU->Buffer;
+      if (prev < curr)
+        {
+	  Length = (curr - prev) * sizeof(WCHAR);
+	  if (Length != parentFCB->LongNameU.Length)
+	    {
+	      if (pFileNameU->Length + parentFCB->LongNameU.Length - Length > pFileNameU->MaximumLength)
+	        {
+		  vfatReleaseFCB (pVCB, parentFCB);
+		  return STATUS_OBJECT_NAME_INVALID;
+		}
+	      memmove(prev + parentFCB->LongNameU.Length / sizeof(WCHAR), curr, 
+		      pFileNameU->Length - (curr - pFileNameU->Buffer) * sizeof(WCHAR));
+	      pFileNameU->Length += parentFCB->LongNameU.Length - Length;
+	      curr = prev + parentFCB->LongNameU.Length / sizeof(WCHAR);
+              last = pFileNameU->Buffer + pFileNameU->Length / sizeof(WCHAR) - 1;
+	    }
+	  memcpy(prev, parentFCB->LongNameU.Buffer, parentFCB->LongNameU.Length);
+	}
+      curr++;      
       prev = curr;
       while (*curr != L'\\' && curr <= last)
         {
 	  curr++;
 	}
-      NameU.MaximumLength = NameU.Length = (curr - NameU.Buffer) * sizeof(WCHAR);
+      NameU.Buffer = pFileNameU->Buffer;
+      NameU.Length = (curr - NameU.Buffer) * sizeof(WCHAR);
+      NameU.MaximumLength = pFileNameU->MaximumLength;
+      DPRINT("%wZ\n", &NameU);
       FCB = vfatGrabFCBFromTable(pVCB, &NameU);
       if (FCB == NULL)
         {
@@ -694,7 +736,6 @@ vfatGetFCBForFile (PDEVICE_EXTENSION  pVCB,
               return  status;
 	    }
 	}
-      curr++;
     }
 
   *pParentFCB = parentFCB;

From 8fab52126fa72169c738240b9627105231cb549a Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sat, 3 Jul 2004 17:40:27 +0000
Subject: [PATCH 181/356] - Fix errors during optimized build.

svn path=/trunk/; revision=9983
---
 reactos/apps/tests/fiber/fiber.c                   |  4 ++--
 reactos/apps/tests/terminate/terminate.c           |  2 +-
 reactos/apps/utils/partinfo/partinfo.c             |  1 -
 reactos/drivers/bus/isapnp/isapnp.c                |  8 ++++----
 reactos/drivers/fs/ms/create.c                     |  3 +--
 reactos/drivers/fs/np/create.c                     |  4 ++--
 reactos/drivers/net/afd/afd/dispatch.c             |  5 ++---
 reactos/drivers/net/afd/afd/rdwr.c                 |  2 +-
 reactos/drivers/net/afd/afd/tdi.c                  |  6 +++---
 reactos/drivers/net/ndis/ndis/config.c             |  2 +-
 reactos/drivers/net/npf/dump.c                     |  2 +-
 reactos/drivers/net/npf/packet.c                   |  2 +-
 reactos/drivers/storage/cdrom/cdrom.c              |  4 ++--
 reactos/drivers/storage/disk/disk.c                |  4 ++--
 reactos/drivers/video/displays/framebuf/surface.c  |  3 +++
 .../drivers/video/displays/vga/objects/bitblt.c    |  2 +-
 reactos/drivers/video/displays/vga/objects/paint.c | 14 +++++---------
 reactos/drivers/video/videoprt/videoprt.c          |  4 ++--
 reactos/lib/advapi32/reg/reg.c                     | 12 ++++++------
 reactos/lib/advapi32/service/scm.c                 |  6 ++----
 reactos/lib/cpl/sysdm/environment.c                |  4 ++--
 reactos/lib/crtdll/stdio/popen.c                   |  4 ++--
 reactos/lib/fslib/vfatlib/fat12.c                  |  2 +-
 reactos/lib/fslib/vfatlib/fat16.c                  |  2 +-
 reactos/lib/gdi32/objects/font.c                   |  4 ++--
 reactos/lib/kernel32/k32.h                         |  1 +
 reactos/lib/kernel32/mem/global.c                  |  4 ++--
 reactos/lib/kernel32/misc/lzexpand_main.c          |  3 ++-
 reactos/lib/kernel32/process/create.c              |  4 ++--
 reactos/lib/ntdll/ldr/utils.c                      |  4 ++--
 reactos/lib/ntdll/makefile                         |  4 ++--
 reactos/lib/ntdll/rtl/message.c                    |  4 ++--
 reactos/lib/ntdll/stdio/sprintf.c                  |  3 ++-
 reactos/lib/ntdll/stdlib/atoi64.c                  |  3 ++-
 reactos/lib/ntdll/stdlib/strtol.c                  |  1 +
 reactos/lib/ntdll/stdlib/strtoul.c                 |  1 +
 reactos/lib/packet/Packet32.c                      |  2 +-
 reactos/lib/rtl/env.c                              |  4 +---
 reactos/lib/rtl/makefile                           |  2 +-
 reactos/lib/rtl/unicode.c                          |  1 +
 reactos/lib/user32/controls/scrollbar.c            |  3 +++
 reactos/lib/user32/misc/dllmain.c                  | 12 ++----------
 reactos/lib/user32/windows/class.c                 | 12 +++++++-----
 reactos/lib/user32/windows/defwnd.c                |  4 ++--
 reactos/lib/user32/windows/mdi.c                   |  2 +-
 reactos/lib/user32/windows/nonclient.c             |  2 +-
 reactos/lib/ws2_32/misc/ns.c                       |  1 +
 reactos/lib/ws2_32/misc/stubs.c                    |  5 ++---
 reactos/ntoskrnl/io/deviface.c                     |  6 +++---
 reactos/ntoskrnl/io/resource.c                     |  8 ++++----
 reactos/subsys/system/cmd/dir.c                    |  4 ++--
 reactos/subsys/system/format/format.c              |  6 +-----
 reactos/subsys/system/services/database.c          |  6 +++---
 reactos/subsys/system/winlogon/winlogon.c          |  4 ++--
 reactos/subsys/win32k/dib/dib16bpp.c               | 10 +++++-----
 reactos/subsys/win32k/dib/dib1bpp.c                | 12 +++++-------
 reactos/subsys/win32k/dib/dib24bpp.c               | 10 +++++-----
 reactos/subsys/win32k/dib/dib32bpp.c               | 11 +++++------
 reactos/subsys/win32k/dib/dib4bpp.c                | 10 +++++-----
 reactos/subsys/win32k/dib/dib8bpp.c                | 10 +++++-----
 reactos/subsys/win32k/eng/bitblt.c                 | 12 ++++++------
 reactos/subsys/win32k/eng/misc.c                   |  4 ++--
 reactos/subsys/win32k/eng/mouse.c                  |  3 ++-
 reactos/subsys/win32k/eng/transblt.c               |  4 ++--
 reactos/subsys/win32k/ntuser/message.c             |  6 +++---
 reactos/subsys/win32k/ntuser/scrollbar.c           |  3 ++-
 reactos/subsys/win32k/ntuser/window.c              |  8 ++++----
 reactos/subsys/win32k/objects/bitmaps.c            | 14 +++++++-------
 reactos/subsys/win32k/objects/brush.c              |  8 ++++----
 reactos/subsys/win32k/objects/color.c              |  4 ++--
 reactos/subsys/win32k/objects/cursoricon.c         |  4 ++--
 reactos/subsys/win32k/objects/dc.c                 | 10 ++++++----
 reactos/subsys/win32k/objects/line.c               |  4 ++--
 reactos/subsys/win32k/objects/path.c               | 11 +++++------
 reactos/subsys/win32k/objects/region.c             | 12 +++---------
 reactos/subsys/win32k/objects/text.c               |  4 ++--
 76 files changed, 191 insertions(+), 205 deletions(-)

diff --git a/reactos/apps/tests/fiber/fiber.c b/reactos/apps/tests/fiber/fiber.c
index bc325400b90..3dfb2dc1be8 100644
--- a/reactos/apps/tests/fiber/fiber.c
+++ b/reactos/apps/tests/fiber/fiber.c
@@ -1,4 +1,4 @@
-/* $Id: fiber.c,v 1.2 2004/03/07 20:07:04 hyperion Exp $
+/* $Id: fiber.c,v 1.3 2004/07/03 17:40:19 navaraf Exp $
 */
 
 #include <assert.h>
@@ -180,7 +180,7 @@ void Fbt_Dispatch(struct FiberData * pfdCur, int bExit)
   int k;
   int b;
   int bResume;
-  PLIST_ENTRY ple;
+  PLIST_ENTRY ple = NULL;
 
   bResume = 0;
   i = 0;
diff --git a/reactos/apps/tests/terminate/terminate.c b/reactos/apps/tests/terminate/terminate.c
index b82ae6d2f5d..986de455800 100644
--- a/reactos/apps/tests/terminate/terminate.c
+++ b/reactos/apps/tests/terminate/terminate.c
@@ -41,7 +41,6 @@ main(int argc, char *argv[])
   
   while (z < 50)
     {
-      TerminateThread(thread, 0);
       z++;
       thread=CreateThread(NULL,
 			  0x1000,
@@ -69,6 +68,7 @@ main(int argc, char *argv[])
       SuspendThread(thread);
       printf("R");
       ResumeThread(thread);      
+      TerminateThread(thread, 0);
     }
 
   ExitProcess(0);
diff --git a/reactos/apps/utils/partinfo/partinfo.c b/reactos/apps/utils/partinfo/partinfo.c
index 9dc9a6880f5..844fe8f83d8 100644
--- a/reactos/apps/utils/partinfo/partinfo.c
+++ b/reactos/apps/utils/partinfo/partinfo.c
@@ -142,7 +142,6 @@ int main (int argc, char *argv[])
       CloseHandle(hDisk);
       printf("DeviceIoControl failed! Error: %lu\n",
 	     GetLastError());
-      free(Buffer);
       return 0;
     }
 
diff --git a/reactos/drivers/bus/isapnp/isapnp.c b/reactos/drivers/bus/isapnp/isapnp.c
index e6ba40a0418..e53187f2af0 100644
--- a/reactos/drivers/bus/isapnp/isapnp.c
+++ b/reactos/drivers/bus/isapnp/isapnp.c
@@ -1,4 +1,4 @@
-/* $Id: isapnp.c,v 1.9 2004/02/10 16:22:54 navaraf Exp $
+/* $Id: isapnp.c,v 1.10 2004/07/03 17:40:20 navaraf Exp $
  *
  * PROJECT:         ReactOS ISA PnP Bus driver
  * FILE:            isapnp.c
@@ -584,7 +584,7 @@ static NTSTATUS AddIrqResource(
 {
   PISAPNP_DESCRIPTOR Descriptor;
 	UCHAR tmp[3];
-  ULONG irq, i, last;
+  ULONG irq, i, last = 0;
   BOOLEAN found;
   NTSTATUS Status;
 
@@ -639,7 +639,7 @@ static NTSTATUS AddDmaResource(
 {
   PISAPNP_DESCRIPTOR Descriptor;
 	UCHAR tmp[2];
-  ULONG dma, flags, i, last;
+  ULONG dma, flags, i, last = 0;
   BOOLEAN found;
   NTSTATUS Status;
 
@@ -1424,7 +1424,7 @@ ISAPNPQueryBusRelations(
   PISAPNP_LOGICAL_DEVICE LogicalDevice;
   PDEVICE_RELATIONS Relations;
   PLIST_ENTRY CurrentEntry;
-  NTSTATUS Status;
+  NTSTATUS Status = STATUS_SUCCESS;
   ULONG Size;
   ULONG i;
 
diff --git a/reactos/drivers/fs/ms/create.c b/reactos/drivers/fs/ms/create.c
index 740eed7cc46..a7f6fcb6e04 100644
--- a/reactos/drivers/fs/ms/create.c
+++ b/reactos/drivers/fs/ms/create.c
@@ -1,4 +1,4 @@
-/* $Id: create.c,v 1.4 2002/09/08 10:22:10 chorns Exp $
+/* $Id: create.c,v 1.5 2004/07/03 17:40:20 navaraf Exp $
  *
  * COPYRIGHT:  See COPYING in the top level directory
  * PROJECT:    ReactOS kernel
@@ -139,7 +139,6 @@ MsfsCreateMailslot(PDEVICE_OBJECT DeviceObject,
    if (!RtlCreateUnicodeString(&Mailslot->Name, FileObject->FileName.Buffer))
      {
 	ExFreePool(Mailslot);
-	ExFreePool(Fcb);
 
 	Irp->IoStatus.Status = STATUS_NO_MEMORY;
 	Irp->IoStatus.Information = 0;
diff --git a/reactos/drivers/fs/np/create.c b/reactos/drivers/fs/np/create.c
index 79f8aad2ff1..75d70767c6c 100644
--- a/reactos/drivers/fs/np/create.c
+++ b/reactos/drivers/fs/np/create.c
@@ -1,4 +1,4 @@
-/* $Id: create.c,v 1.21 2004/05/10 19:58:10 navaraf Exp $
+/* $Id: create.c,v 1.22 2004/07/03 17:40:20 navaraf Exp $
  *
  * COPYRIGHT:  See COPYING in the top level directory
  * PROJECT:    ReactOS kernel
@@ -203,7 +203,7 @@ NpfsCreateNamedPipe(PDEVICE_OBJECT DeviceObject,
    PNPFS_PIPE Pipe;
    PNPFS_FCB Fcb;
    PLIST_ENTRY current_entry;
-   PNPFS_PIPE current;
+   PNPFS_PIPE current = NULL;
    PIO_PIPE_CREATE_BUFFER Buffer;
    
    DPRINT("NpfsCreateNamedPipe(DeviceObject %p Irp %p)\n", DeviceObject, Irp);
diff --git a/reactos/drivers/net/afd/afd/dispatch.c b/reactos/drivers/net/afd/afd/dispatch.c
index 5f01d97b66d..70bcc086339 100644
--- a/reactos/drivers/net/afd/afd/dispatch.c
+++ b/reactos/drivers/net/afd/afd/dispatch.c
@@ -772,7 +772,6 @@ NTSTATUS AfdDispRecv(
   UINT OutputBufferLength;
   PFILE_REQUEST_RECVFROM Request;
   PFILE_REPLY_RECVFROM Reply;
-  DWORD NumberOfBytesRecvd;
   PAFDFCB FCB;
 
   AFD_DbgPrint(MAX_TRACE, ("Called.\n"));
@@ -794,7 +793,7 @@ NTSTATUS AfdDispRecv(
       Request,
       Reply,
       TRUE);
-    Reply->NumberOfBytesRecvd = NumberOfBytesRecvd;
+    Reply->NumberOfBytesRecvd = 0; /* FIXME */
     Reply->Status = NO_ERROR;
   } else {
     Status = STATUS_INVALID_PARAMETER;
@@ -818,7 +817,7 @@ NTSTATUS AfdDispSend(
  *     Status of operation
  */
 {
-  NTSTATUS Status;
+  NTSTATUS Status = STATUS_SUCCESS;
   UINT InputBufferLength;
   UINT OutputBufferLength;
   PFILE_REQUEST_SEND Request;
diff --git a/reactos/drivers/net/afd/afd/rdwr.c b/reactos/drivers/net/afd/afd/rdwr.c
index 1cf2d7db113..9c2ccc999f9 100644
--- a/reactos/drivers/net/afd/afd/rdwr.c
+++ b/reactos/drivers/net/afd/afd/rdwr.c
@@ -68,7 +68,7 @@ AfdWrite(
 {
     PIO_STACK_LOCATION IoSp = IoGetCurrentIrpStackLocation(Irp);
     PFILE_OBJECT FileObject = IoSp->FileObject;
-    NTSTATUS Status;
+    NTSTATUS Status = STATUS_NOT_IMPLEMENTED;
     ULONG Length;
     PVOID Buffer;
     ULONG Offset;
diff --git a/reactos/drivers/net/afd/afd/tdi.c b/reactos/drivers/net/afd/afd/tdi.c
index a2c6d8258f2..067d1f46d63 100644
--- a/reactos/drivers/net/afd/afd/tdi.c
+++ b/reactos/drivers/net/afd/afd/tdi.c
@@ -1044,7 +1044,7 @@ NTSTATUS TdiReceiveDatagram(
  */
 {
     PTDI_CONNECTION_INFORMATION ReceiveInfo;
-    PTDI_CONNECTION_INFORMATION ReturnInfo;
+    TDI_CONNECTION_INFORMATION ReturnInfo;
     PDEVICE_OBJECT DeviceObject;
     IO_STATUS_BLOCK Iosb;
     NTSTATUS Status;
@@ -1111,12 +1111,12 @@ NTSTATUS TdiReceiveDatagram(
                             Mdl,                    /* Data buffer */
                             *BufferSize,            /* Size of data buffer */
                             ReceiveInfo,            /* Connection information */
-                            ReturnInfo,             /* Connection information */
+                            &ReturnInfo,            /* Connection information */
                             TDI_RECEIVE_NORMAL);    /* Flags */
     Status = TdiCall(Irp, DeviceObject, &Event, &Iosb);
     if (NT_SUCCESS(Status)) {
         *BufferSize = Iosb.Information;
-        TdiBuildName(Address, TdiGetRemoteAddress(ReturnInfo));
+        TdiBuildName(Address, TdiGetRemoteAddress(&ReturnInfo));
     }
 
     MmUnlockPages(Mdl);
diff --git a/reactos/drivers/net/ndis/ndis/config.c b/reactos/drivers/net/ndis/ndis/config.c
index a48c41f6ca7..bfafbe49e73 100644
--- a/reactos/drivers/net/ndis/ndis/config.c
+++ b/reactos/drivers/net/ndis/ndis/config.c
@@ -864,7 +864,7 @@ NdisOpenConfigurationKeyByName(
     NDIS_HANDLE RegKeyHandle;
 
     InitializeObjectAttributes(&KeyAttributes, KeyName, OBJ_CASE_INSENSITIVE, ConfigurationHandle, 0);
-    *Status = ZwOpenKey(RegKeyHandle, KEY_ALL_ACCESS, &KeyAttributes);
+    *Status = ZwOpenKey(&RegKeyHandle, KEY_ALL_ACCESS, &KeyAttributes);
 
     if(*Status != STATUS_SUCCESS)
     {
diff --git a/reactos/drivers/net/npf/dump.c b/reactos/drivers/net/npf/dump.c
index afef4f5da3e..a48e447d8d0 100644
--- a/reactos/drivers/net/npf/dump.c
+++ b/reactos/drivers/net/npf/dump.c
@@ -46,7 +46,7 @@ NPF_OpenDumpFile(POPEN_INSTANCE Open , PUNICODE_STRING fileName, BOOLEAN Append)
     NTSTATUS ntStatus;
     IO_STATUS_BLOCK IoStatus;
     OBJECT_ATTRIBUTES ObjectAttributes;
-    PWCHAR PathPrefix;
+    PWCHAR PathPrefix = NULL;
     USHORT PathLen;
     UNICODE_STRING FullFileName;
     ULONG FullFileNameLength;
diff --git a/reactos/drivers/net/npf/packet.c b/reactos/drivers/net/npf/packet.c
index 7e0882ca61b..fc6ed0ec73e 100644
--- a/reactos/drivers/net/npf/packet.c
+++ b/reactos/drivers/net/npf/packet.c
@@ -623,12 +623,12 @@ NPF_Unload(IN PDRIVER_OBJECT DriverObject)
 		}
 
         IoDeleteDevice(OldDeviceObject);
-    }
 
 	NdisDeregisterProtocol(
         &Status,
         NdisProtocolHandle
         );
+    }
 
 	// Free the adapters names
 	ExFreePool( bindP );
diff --git a/reactos/drivers/storage/cdrom/cdrom.c b/reactos/drivers/storage/cdrom/cdrom.c
index 2ff4c6a88c1..6d7ad693e16 100644
--- a/reactos/drivers/storage/cdrom/cdrom.c
+++ b/reactos/drivers/storage/cdrom/cdrom.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: cdrom.c,v 1.28 2004/05/09 14:50:50 hbirr Exp $
+/* $Id: cdrom.c,v 1.29 2004/07/03 17:40:21 navaraf Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -233,7 +233,7 @@ CdromClassFindDevices(IN PDRIVER_OBJECT DriverObject,
   PCHAR Buffer;
   ULONG Bus;
   ULONG DeviceCount;
-  BOOLEAN FoundDevice;
+  BOOLEAN FoundDevice = FALSE;
   NTSTATUS Status;
 
   DPRINT("CdromClassFindDevices() called.\n");
diff --git a/reactos/drivers/storage/disk/disk.c b/reactos/drivers/storage/disk/disk.c
index 993f4c39e80..93bfdd5e991 100644
--- a/reactos/drivers/storage/disk/disk.c
+++ b/reactos/drivers/storage/disk/disk.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: disk.c,v 1.42 2004/06/21 21:03:12 hbirr Exp $
+/* $Id: disk.c,v 1.43 2004/07/03 17:40:21 navaraf Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -218,7 +218,7 @@ DiskClassFindDevices(PDRIVER_OBJECT DriverObject,
   PCHAR Buffer;
   ULONG Bus;
   ULONG DeviceCount;
-  BOOLEAN FoundDevice;
+  BOOLEAN FoundDevice = FALSE;
   NTSTATUS Status;
 
   DPRINT("DiskClassFindDevices() called.\n");
diff --git a/reactos/drivers/video/displays/framebuf/surface.c b/reactos/drivers/video/displays/framebuf/surface.c
index 82a3f5fcc88..5067da0d895 100644
--- a/reactos/drivers/video/displays/framebuf/surface.c
+++ b/reactos/drivers/video/displays/framebuf/surface.c
@@ -86,6 +86,9 @@ DrvEnableSurface(
       case 32:
          BitmapType = BMF_32BPP;
          break;
+
+      default:
+         return FALSE;
    }
 
    ScreenSize.cx = ppdev->ScreenWidth;
diff --git a/reactos/drivers/video/displays/vga/objects/bitblt.c b/reactos/drivers/video/displays/vga/objects/bitblt.c
index b80fc8ff520..4726dffe890 100644
--- a/reactos/drivers/video/displays/vga/objects/bitblt.c
+++ b/reactos/drivers/video/displays/vga/objects/bitblt.c
@@ -389,7 +389,7 @@ DrvBitBlt(SURFOBJ *Dest,
 {
   PBLTRECTFUNC BltRectFunc;
   RECTL CombinedRect;
-  BOOL Ret;
+  BOOL Ret = FALSE;
   RECT_ENUM RectEnum;
   BOOL EnumMore;
   unsigned i;
diff --git a/reactos/drivers/video/displays/vga/objects/paint.c b/reactos/drivers/video/displays/vga/objects/paint.c
index af95f60c065..e3f06c22d48 100644
--- a/reactos/drivers/video/displays/vga/objects/paint.c
+++ b/reactos/drivers/video/displays/vga/objects/paint.c
@@ -11,11 +11,9 @@ BOOL VGADDIFillSolid(SURFOBJ *Surface, RECTL Dimensions, ULONG iColor)
   ULONG offset, j, pre1;
   ULONG orgpre1, orgx, midpre1, tmppre1;
   ULONG ileftpix, imidpix, irightpix;
-  double leftpix, midpix, rightpix;
+/*  double leftpix, midpix, rightpix;*/
   UCHAR a;
 
-  DPRINT("VGADDIFillSolid: x:%d, y:%d, w:%d, h:%d\n", x, y, w, h);
-
   // Swap dimensions so that x, y are at topmost left
   if ( Dimensions.right < Dimensions.left )
   {
@@ -42,6 +40,8 @@ BOOL VGADDIFillSolid(SURFOBJ *Surface, RECTL Dimensions, ULONG iColor)
   w = x2 - x;
   h = y2 - y;
 
+  DPRINT("VGADDIFillSolid: x:%d, y:%d, w:%d, h:%d\n", x, y, w, h);
+
   // Calculate the starting offset
   offset = xconv[x]+y80[y];
 
@@ -50,12 +50,8 @@ BOOL VGADDIFillSolid(SURFOBJ *Surface, RECTL Dimensions, ULONG iColor)
 
   // Calculate the left mask pixels, middle bytes and right mask pixel
   ileftpix = 7 - mod8(x-1);
-  rightpix = mod8(x+w);
-  midpix = (w-leftpix-rightpix) / 8;
-
-  ileftpix = leftpix;
-  irightpix = rightpix;
-  imidpix = midpix;
+  irightpix = mod8(x+w);
+  imidpix = (w-ileftpix-irightpix) / 8;
 
   pre1 = xconv[(x-1)&~7] + y80[y];
   orgpre1=pre1;
diff --git a/reactos/drivers/video/videoprt/videoprt.c b/reactos/drivers/video/videoprt/videoprt.c
index ff7b14565fb..32a0236a9b6 100644
--- a/reactos/drivers/video/videoprt/videoprt.c
+++ b/reactos/drivers/video/videoprt/videoprt.c
@@ -18,7 +18,7 @@
  * If not, write to the Free Software Foundation,
  * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Id: videoprt.c,v 1.25 2004/06/26 22:30:34 navaraf Exp $
+ * $Id: videoprt.c,v 1.26 2004/07/03 17:40:21 navaraf Exp $
  */
 
 #include "videoprt.h"
@@ -180,7 +180,7 @@ IntVideoPortFindAdapter(
    WCHAR SymlinkBuffer[20];
    UNICODE_STRING SymlinkName;
    PDEVICE_OBJECT DeviceObject;
-   BOOL LegacyDetection;
+   BOOL LegacyDetection = FALSE;
 
    /*
     * Find the first free device number that can be used for video device
diff --git a/reactos/lib/advapi32/reg/reg.c b/reactos/lib/advapi32/reg/reg.c
index 6599c2563d1..d747d7d7d95 100644
--- a/reactos/lib/advapi32/reg/reg.c
+++ b/reactos/lib/advapi32/reg/reg.c
@@ -1,4 +1,4 @@
-/* $Id: reg.c,v 1.49 2004/07/03 14:46:39 gvg Exp $
+/* $Id: reg.c,v 1.50 2004/07/03 17:40:21 navaraf Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -865,7 +865,7 @@ RegEnumKeyExA (HKEY hKey,
   ANSI_STRING StringA;
   LONG ErrorCode = ERROR_SUCCESS;
   DWORD NameLength;
-  DWORD ClassLength;
+  DWORD ClassLength = 0;
   DWORD BufferSize;
   DWORD ResultSize;
   HANDLE KeyHandle;
@@ -1042,7 +1042,7 @@ RegEnumKeyExW (HKEY hKey,
   ULONG BufferSize;
   ULONG ResultSize;
   ULONG NameLength;
-  ULONG ClassLength;
+  ULONG ClassLength = 0;
   HANDLE KeyHandle;
   LONG ErrorCode = ERROR_SUCCESS;
   NTSTATUS Status;
@@ -1193,7 +1193,7 @@ RegEnumValueA (HKEY hKey,
 
   ULONG NameLength;
   ULONG BufferSize;
-  ULONG DataLength;
+  ULONG DataLength = 0;
   ULONG ResultSize;
   HANDLE KeyHandle;
   LONG ErrorCode;
@@ -1360,7 +1360,7 @@ RegEnumValueW (HKEY hKey,
 
   ULONG NameLength;
   ULONG BufferSize;
-  ULONG DataLength;
+  ULONG DataLength = 0;
   ULONG ResultSize;
   HANDLE KeyHandle;
   LONG ErrorCode;
@@ -1997,7 +1997,7 @@ RegQueryInfoKeyW (HKEY hKey,
   KEY_FULL_INFORMATION FullInfoBuffer;
   PKEY_FULL_INFORMATION FullInfo;
   ULONG FullInfoSize;
-  ULONG ClassLength;
+  ULONG ClassLength = 0;
   HANDLE KeyHandle;
   NTSTATUS Status;
   LONG ErrorCode = ERROR_SUCCESS;
diff --git a/reactos/lib/advapi32/service/scm.c b/reactos/lib/advapi32/service/scm.c
index c64ae872d72..ba7cfb8325c 100644
--- a/reactos/lib/advapi32/service/scm.c
+++ b/reactos/lib/advapi32/service/scm.c
@@ -1,4 +1,4 @@
-/* $Id: scm.c,v 1.21 2004/04/12 17:20:47 navaraf Exp $
+/* $Id: scm.c,v 1.22 2004/07/03 17:40:21 navaraf Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -82,11 +82,9 @@ BOOL
 STDCALL
 CloseServiceHandle(SC_HANDLE hSCObject)
 {
-    HANDLE hPipe;
     DPRINT("CloseServiceHandle() - called.\n");
-//    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 
-    if (!CloseHandle(hPipe)) {
+    if (!CloseHandle(hSCObject)) {
         SetLastError(ERROR_INVALID_HANDLE);
         return FALSE;
     }
diff --git a/reactos/lib/cpl/sysdm/environment.c b/reactos/lib/cpl/sysdm/environment.c
index ad3f3577f8a..876330bd4dc 100644
--- a/reactos/lib/cpl/sysdm/environment.c
+++ b/reactos/lib/cpl/sysdm/environment.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: environment.c,v 1.1 2004/07/02 20:28:00 ekohl Exp $
+/* $Id: environment.c,v 1.2 2004/07/03 17:40:22 navaraf Exp $
  *
  * PROJECT:         ReactOS System Control Panel
  * FILE:            lib/cpl/sysdm/environment.c
@@ -45,7 +45,7 @@ SetEnvironmentVariables(HWND hwndListView,
   DWORD i;
   LPTSTR lpName;
   LPTSTR lpData;
-  LPTSTR lpExpandData;
+  LPTSTR lpExpandData = NULL;
   DWORD dwNameLength;
   DWORD dwDataLength;
   DWORD dwType;
diff --git a/reactos/lib/crtdll/stdio/popen.c b/reactos/lib/crtdll/stdio/popen.c
index 40cf63de87a..9b00409e1b6 100644
--- a/reactos/lib/crtdll/stdio/popen.c
+++ b/reactos/lib/crtdll/stdio/popen.c
@@ -20,8 +20,8 @@ FILE *_popen (const char *cm, const char *md) /* program name, pipe mode */
 
   // fixme CreatePipe
 
-//  if ( !CreatePipe(&hReadPipe,&hWritePipe,NULL,1024))
-//		return NULL;	
+  if ( !CreatePipe(&hReadPipe,&hWritePipe,NULL,1024))
+		return NULL;	
 
   StartupInfo.cb = sizeof(StartupInfo);
   if ( md == "r" ) {
diff --git a/reactos/lib/fslib/vfatlib/fat12.c b/reactos/lib/fslib/vfatlib/fat12.c
index 050aed8ccff..fb8cd7dd787 100644
--- a/reactos/lib/fslib/vfatlib/fat12.c
+++ b/reactos/lib/fslib/vfatlib/fat12.c
@@ -199,7 +199,7 @@ Fat12WriteRootDirectory (IN HANDLE FileHandle,
 			 IN OUT PFORMAT_CONTEXT Context)
 {
   IO_STATUS_BLOCK IoStatusBlock;
-  NTSTATUS Status;
+  NTSTATUS Status = STATUS_SUCCESS;
   PUCHAR Buffer;
   LARGE_INTEGER FileOffset;
   ULONG FirstRootDirSector;
diff --git a/reactos/lib/fslib/vfatlib/fat16.c b/reactos/lib/fslib/vfatlib/fat16.c
index 31b6c5cdd86..a3f093a6817 100644
--- a/reactos/lib/fslib/vfatlib/fat16.c
+++ b/reactos/lib/fslib/vfatlib/fat16.c
@@ -201,7 +201,7 @@ Fat16WriteRootDirectory (IN HANDLE FileHandle,
 			 IN OUT PFORMAT_CONTEXT Context)
 {
   IO_STATUS_BLOCK IoStatusBlock;
-  NTSTATUS Status;
+  NTSTATUS Status = STATUS_SUCCESS;
   PUCHAR Buffer;
   LARGE_INTEGER FileOffset;
   ULONG FirstRootDirSector;
diff --git a/reactos/lib/gdi32/objects/font.c b/reactos/lib/gdi32/objects/font.c
index 02bdaf615e6..244649af501 100644
--- a/reactos/lib/gdi32/objects/font.c
+++ b/reactos/lib/gdi32/objects/font.c
@@ -1,4 +1,4 @@
-/* $Id: font.c,v 1.4 2004/04/25 14:46:54 weiden Exp $
+/* $Id: font.c,v 1.5 2004/07/03 17:40:22 navaraf Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -206,7 +206,7 @@ IntEnumFontFamilies(HDC Dc, LPLOGFONTW LogFont, PVOID EnumProc, LPARAM lParam,
   int FontFamilyCount;
   unsigned FontFamilySize;
   PFONTFAMILYINFO Info;
-  int Ret;
+  int Ret = 0;
   unsigned i;
   ENUMLOGFONTEXA EnumLogFontExA;
   NEWTEXTMETRICEXA NewTextMetricExA;
diff --git a/reactos/lib/kernel32/k32.h b/reactos/lib/kernel32/k32.h
index 8f4b2d433cd..995b19bb5ad 100755
--- a/reactos/lib/kernel32/k32.h
+++ b/reactos/lib/kernel32/k32.h
@@ -1,6 +1,7 @@
 #define _WIN32_WINNT 0x0501
 #define __USE_W32API
 #define NTOS_MODE_USER
+#define __NO_CTYPE_INLINES
 #include <ntos.h>
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/reactos/lib/kernel32/mem/global.c b/reactos/lib/kernel32/mem/global.c
index 0cf2bc38d9f..32f61e415ab 100644
--- a/reactos/lib/kernel32/mem/global.c
+++ b/reactos/lib/kernel32/mem/global.c
@@ -1,4 +1,4 @@
-/* $Id: global.c,v 1.25 2004/06/13 20:04:55 navaraf Exp $
+/* $Id: global.c,v 1.26 2004/07/03 17:40:22 navaraf Exp $
  *
  * Win32 Global/Local heap functions (GlobalXXX, LocalXXX).
  * These functions included in Win32 for compatibility with 16 bit Windows
@@ -671,7 +671,7 @@ GlobalUnlock(HGLOBAL hMem)
 {
 
    PGLOBAL_HANDLE	phandle;
-   BOOL			    locked;
+   BOOL			    locked = FALSE;
 
    DPRINT("GlobalUnlock( 0x%lX )\n", (ULONG)hMem);
 
diff --git a/reactos/lib/kernel32/misc/lzexpand_main.c b/reactos/lib/kernel32/misc/lzexpand_main.c
index 0dcbb123b7d..e97b330c0fc 100644
--- a/reactos/lib/kernel32/misc/lzexpand_main.c
+++ b/reactos/lib/kernel32/misc/lzexpand_main.c
@@ -1,4 +1,4 @@
-/* $Id: lzexpand_main.c,v 1.2 2004/01/23 21:16:03 ekohl Exp $
+/* $Id: lzexpand_main.c,v 1.3 2004/07/03 17:40:22 navaraf Exp $
  *
  * LZ Decompression functions
  *
@@ -27,6 +27,7 @@
 #define NDEBUG
 #include "../include/debug.h"
 #include <string.h>
+#define __NO_CTYPE_INLINES
 #include <ctype.h>
 #include <sys/types.h>
 #include <stdio.h>
diff --git a/reactos/lib/kernel32/process/create.c b/reactos/lib/kernel32/process/create.c
index 2daf02012a9..a393ce28730 100644
--- a/reactos/lib/kernel32/process/create.c
+++ b/reactos/lib/kernel32/process/create.c
@@ -1,4 +1,4 @@
-/* $Id: create.c,v 1.85 2004/05/15 20:25:09 hbirr Exp $
+/* $Id: create.c,v 1.86 2004/07/03 17:40:22 navaraf Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -829,7 +829,7 @@ CreateProcessW
    UNICODE_STRING RuntimeInfo_U;
    PVOID ImageBaseAddress;
    BOOL InputSet, OutputSet, ErrorSet;
-   BOOL InputDup, OutputDup, ErrorDup;
+   BOOL InputDup = FALSE, OutputDup = FALSE, ErrorDup = FALSE;
    WCHAR Name[MAX_PATH];
    WCHAR *TidyCmdLine;
    BOOL IsBatchFile = FALSE;
diff --git a/reactos/lib/ntdll/ldr/utils.c b/reactos/lib/ntdll/ldr/utils.c
index 54fe950a1df..41abc521a40 100644
--- a/reactos/lib/ntdll/ldr/utils.c
+++ b/reactos/lib/ntdll/ldr/utils.c
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.96 2004/06/27 12:20:33 ekohl Exp $
+/* $Id: utils.c,v 1.97 2004/07/03 17:40:22 navaraf Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -1629,7 +1629,7 @@ LdrFixupImports(IN PWSTR SearchPath OPTIONAL,
    PIMAGE_BOUND_IMPORT_DESCRIPTOR BoundImportDescriptor;
    PIMAGE_BOUND_IMPORT_DESCRIPTOR BoundImportDescriptorCurrent;
    PIMAGE_TLS_DIRECTORY TlsDirectory;
-   ULONG TlsSize;
+   ULONG TlsSize = 0;
    NTSTATUS Status;
    PLDR_MODULE ImportedModule;
    PCHAR ImportedName;
diff --git a/reactos/lib/ntdll/makefile b/reactos/lib/ntdll/makefile
index 15fe23320bb..e8d80ccb614 100644
--- a/reactos/lib/ntdll/makefile
+++ b/reactos/lib/ntdll/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.104 2004/07/01 02:40:22 hyperion Exp $
+# $Id: makefile,v 1.105 2004/07/03 17:40:23 navaraf Exp $
 
 PATH_TO_TOP = ../..
 
@@ -19,7 +19,7 @@ TARGET_LFLAGS = -Wl,--file-alignment,0x1000 \
   -Wl,--section-alignment,0x1000 \
   -nostartfiles -nostdlib
 
-TARGET_SDKLIBS = string.a rosrtl.a rtl.a
+TARGET_SDKLIBS = rosrtl.a rtl.a string.a
 
 TARGET_GCCLIBS = gcc
 
diff --git a/reactos/lib/ntdll/rtl/message.c b/reactos/lib/ntdll/rtl/message.c
index d7c9facd3f9..1500a463fcd 100644
--- a/reactos/lib/ntdll/rtl/message.c
+++ b/reactos/lib/ntdll/rtl/message.c
@@ -1,4 +1,4 @@
-/* $Id: message.c,v 1.5 2002/09/08 10:23:06 chorns Exp $
+/* $Id: message.c,v 1.6 2004/07/03 17:40:23 navaraf Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -30,7 +30,7 @@ RtlFindMessage(PVOID BaseAddress,
    PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry;
    PRTL_MESSAGE_RESOURCE_DATA MessageTable;
    NTSTATUS Status;
-   ULONG EntryOffset, IdOffset;
+   ULONG EntryOffset, IdOffset = 0;
    PRTL_MESSAGE_RESOURCE_ENTRY MessageEntry;
    ULONG i;
 
diff --git a/reactos/lib/ntdll/stdio/sprintf.c b/reactos/lib/ntdll/stdio/sprintf.c
index d7dbf2181f1..e8cccf09961 100644
--- a/reactos/lib/ntdll/stdio/sprintf.c
+++ b/reactos/lib/ntdll/stdio/sprintf.c
@@ -1,4 +1,4 @@
-/* $Id: sprintf.c,v 1.15 2004/06/15 08:53:53 hbirr Exp $
+/* $Id: sprintf.c,v 1.16 2004/07/03 17:40:23 navaraf Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -23,6 +23,7 @@
 #include <ddk/ntddk.h>
 #include <stdarg.h>
 #include <stdlib.h>
+#define __NO_CTYPE_INLINES
 #include <ctype.h>
 #include <string.h>
 #include <limits.h>
diff --git a/reactos/lib/ntdll/stdlib/atoi64.c b/reactos/lib/ntdll/stdlib/atoi64.c
index 1b1856ce450..92e5d12f189 100644
--- a/reactos/lib/ntdll/stdlib/atoi64.c
+++ b/reactos/lib/ntdll/stdlib/atoi64.c
@@ -1,4 +1,4 @@
-/* $Id: atoi64.c,v 1.4 2003/07/11 13:50:23 royce Exp $
+/* $Id: atoi64.c,v 1.5 2004/07/03 17:40:23 navaraf Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -7,6 +7,7 @@
  */
 
 #include <stdlib.h>
+#define __NO_CTYPE_INLINES
 #include <ctype.h>
 
 /*
diff --git a/reactos/lib/ntdll/stdlib/strtol.c b/reactos/lib/ntdll/stdlib/strtol.c
index 5651f6a8c09..bf11453b7ae 100644
--- a/reactos/lib/ntdll/stdlib/strtol.c
+++ b/reactos/lib/ntdll/stdlib/strtol.c
@@ -1,5 +1,6 @@
 /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
 #include <limits.h>
+#define __NO_CTYPE_INLINES
 #include <ctype.h>
 #include <stdlib.h>
 
diff --git a/reactos/lib/ntdll/stdlib/strtoul.c b/reactos/lib/ntdll/stdlib/strtoul.c
index efb5a210dd4..ee283b6b44a 100644
--- a/reactos/lib/ntdll/stdlib/strtoul.c
+++ b/reactos/lib/ntdll/stdlib/strtoul.c
@@ -1,5 +1,6 @@
 /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
 #include <limits.h>
+#define __NO_CTYPE_INLINES
 #include <ctype.h>
 #include <stdlib.h>
 
diff --git a/reactos/lib/packet/Packet32.c b/reactos/lib/packet/Packet32.c
index 72292c839ad..187efc0c409 100644
--- a/reactos/lib/packet/Packet32.c
+++ b/reactos/lib/packet/Packet32.c
@@ -1289,7 +1289,7 @@ BOOLEAN PacketGetStatsEx(LPADAPTER AdapterObject,struct bpf_stat *s)
 BOOLEAN PacketRequest(LPADAPTER  AdapterObject,BOOLEAN Set,PPACKET_OID_DATA  OidData)
 {
 	//DWORD BytesReturned;
-    BOOLEAN Result;
+    BOOLEAN Result = 0;
 	/*commented out since its broken & needs fixing*/
     /*Result=DeviceIoControl(AdapterObject->hFile,(DWORD) Set ? pBIOCSETOID : pBIOCQUERYOID,
                            OidData,sizeof(PACKET_OID_DATA)-1+OidData->Length,OidData,
diff --git a/reactos/lib/rtl/env.c b/reactos/lib/rtl/env.c
index 257b0dc193b..69eb5caae62 100644
--- a/reactos/lib/rtl/env.c
+++ b/reactos/lib/rtl/env.c
@@ -1,4 +1,4 @@
-/* $Id: env.c,v 1.1 2004/05/31 19:29:02 gdalsnes Exp $
+/* $Id: env.c,v 1.2 2004/07/03 17:40:23 navaraf Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -19,8 +19,6 @@
 #define NDEBUG
 #include <ntdll/ntdll.h>
 
-
-
 /* FUNCTIONS *****************************************************************/
 
 /*
diff --git a/reactos/lib/rtl/makefile b/reactos/lib/rtl/makefile
index 195bf17702c..c2a5e6a41e2 100644
--- a/reactos/lib/rtl/makefile
+++ b/reactos/lib/rtl/makefile
@@ -7,7 +7,7 @@ TARGET_NAME = rtl
 
 include $(PATH_TO_TOP)/config
 
-TARGET_CFLAGS = -Wall -Werror
+TARGET_CFLAGS = -Wall -Werror -ffreestanding
 
 # require os code to explicitly request A/W version of structs/functions
 TARGET_CFLAGS += -D_DISABLE_TIDENTS
diff --git a/reactos/lib/rtl/unicode.c b/reactos/lib/rtl/unicode.c
index fe2f21db287..5f85743bbec 100644
--- a/reactos/lib/rtl/unicode.c
+++ b/reactos/lib/rtl/unicode.c
@@ -27,6 +27,7 @@
 #include <ntdll/rtl.h>
 
 #include <ntos/minmax.h>
+#define __NO_CTYPE_INLINES
 #include <ctype.h>
 
 #define NDEBUG
diff --git a/reactos/lib/user32/controls/scrollbar.c b/reactos/lib/user32/controls/scrollbar.c
index 8fa443ccf80..34f5bf3303a 100644
--- a/reactos/lib/user32/controls/scrollbar.c
+++ b/reactos/lib/user32/controls/scrollbar.c
@@ -342,6 +342,9 @@ IntDrawScrollBar(HWND Wnd, HDC DC, INT Bar)
       case SB_CTL:
         Vertical = (GetWindowLongW(Wnd, GWL_STYLE) & SBS_VERT) != 0;
         break;
+
+      default:
+        return;
     }
   if (! IntGetScrollBarInfo(Wnd, Bar, &Info))
     {
diff --git a/reactos/lib/user32/misc/dllmain.c b/reactos/lib/user32/misc/dllmain.c
index f6181e52521..a05b417c0e0 100644
--- a/reactos/lib/user32/misc/dllmain.c
+++ b/reactos/lib/user32/misc/dllmain.c
@@ -54,11 +54,9 @@ CleanupThread(VOID)
   TlsSetValue(User32TlsIndex, 0);
 }
 
-DWORD
+VOID
 Init(VOID)
 {
-  DWORD Status;
-
   /* Set up the kernel callbacks. */
   NtCurrentTeb()->Peb->KernelCallbackTable[USER32_CALLBACK_WINDOWPROC] =
     (PVOID)User32CallWindowProcFromKernel;
@@ -81,20 +79,14 @@ Init(VOID)
   InitializeCriticalSection(&gcsMPH);
 
   GdiDllInitialize(NULL, DLL_PROCESS_ATTACH, NULL);
-
-  return(Status);
 }
 
-DWORD
+VOID
 Cleanup(VOID)
 {
-  DWORD Status;
-
   GdiDllInitialize(NULL, DLL_PROCESS_DETACH, NULL);
 
   TlsFree(User32TlsIndex);
-
-  return(Status);
 }
 
 
diff --git a/reactos/lib/user32/windows/class.c b/reactos/lib/user32/windows/class.c
index 658906fd641..9730f0caf28 100644
--- a/reactos/lib/user32/windows/class.c
+++ b/reactos/lib/user32/windows/class.c
@@ -1,4 +1,4 @@
-/* $Id: class.c,v 1.49 2004/05/17 16:38:57 navaraf Exp $
+/* $Id: class.c,v 1.50 2004/07/03 17:40:23 navaraf Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
@@ -587,8 +587,9 @@ SetClassLongA (
   int nIndex,
   LONG dwNewLong)
 {
+  UNICODE_STRING str2buf;
   PUNICODE_STRING str;
-  PUNICODE_STRING str2;
+  PUNICODE_STRING str2 = &str2buf;
 
   if ( nIndex != GCL_MENUNAME )
   {
@@ -600,7 +601,7 @@ SetClassLongA (
   }
   else
   {
-    RtlCreateUnicodeString ( str2, (LPWSTR)dwNewLong );
+    RtlCreateUnicodeStringFromAsciiz ( &str2buf,(LPSTR)dwNewLong );
   }
 
   str = (PUNICODE_STRING)NtUserSetClassLong(hWnd, nIndex, (DWORD)str2, TRUE);
@@ -630,8 +631,9 @@ SetClassLongW(
   int nIndex,
   LONG dwNewLong)
 {
+  UNICODE_STRING str2buf;
   PUNICODE_STRING str;
-  PUNICODE_STRING str2;
+  PUNICODE_STRING str2 = &str2buf;
 
   if (nIndex != GCL_MENUNAME )
   {
@@ -643,7 +645,7 @@ SetClassLongW(
   }
   else
   {
-    RtlCreateUnicodeStringFromAsciiz ( str2,(LPSTR)dwNewLong );
+    RtlCreateUnicodeString ( &str2buf, (LPWSTR)dwNewLong );
   }
 
   str = (PUNICODE_STRING)NtUserSetClassLong(hWnd, nIndex, (DWORD)str2, TRUE);
diff --git a/reactos/lib/user32/windows/defwnd.c b/reactos/lib/user32/windows/defwnd.c
index a35bf7d1615..3e96bf1ad6a 100644
--- a/reactos/lib/user32/windows/defwnd.c
+++ b/reactos/lib/user32/windows/defwnd.c
@@ -1,4 +1,4 @@
-/* $Id: defwnd.c,v 1.140 2004/05/26 18:59:21 weiden Exp $
+/* $Id: defwnd.c,v 1.141 2004/07/03 17:40:23 navaraf Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
@@ -496,7 +496,7 @@ DefWndDoSizeMove(HWND hwnd, WORD wParam)
   BOOL moved = FALSE;
   DWORD dwPoint = GetMessagePos();
   BOOL DragFullWindows = FALSE;
-  HWND hWndParent;
+  HWND hWndParent = NULL;
 
   SystemParametersInfoA(SPI_GETDRAGFULLWINDOWS, 0, &DragFullWindows, 0);
   
diff --git a/reactos/lib/user32/windows/mdi.c b/reactos/lib/user32/windows/mdi.c
index baf4dbf369f..fb7db4890e1 100644
--- a/reactos/lib/user32/windows/mdi.c
+++ b/reactos/lib/user32/windows/mdi.c
@@ -1316,7 +1316,7 @@ static void MDI_UpdateFrameText( HWND frame, HWND hClient,
 static LRESULT MDIClientWndProc_common( HWND hwnd, UINT message,
                                         WPARAM wParam, LPARAM lParam, BOOL unicode )
 {
-    MDICLIENTINFO *ci;
+    MDICLIENTINFO *ci = NULL;
 
     if (WM_NCCREATE != message && WM_CREATE != message
         && NULL == (ci = get_client_info(hwnd)))
diff --git a/reactos/lib/user32/windows/nonclient.c b/reactos/lib/user32/windows/nonclient.c
index bdd841fdf16..75d94006c74 100644
--- a/reactos/lib/user32/windows/nonclient.c
+++ b/reactos/lib/user32/windows/nonclient.c
@@ -900,7 +900,7 @@ DefWndDoButton(HWND hWnd, WPARAM wParam)
   BOOL InBtn, HasBtn = FALSE;
   ULONG Btn, Style;
   WPARAM SCMsg, CurBtn = wParam, OrigBtn = wParam;
-  HDC WindowDC;
+  HDC WindowDC = NULL;
   
   Style = GetWindowLongW(hWnd, GWL_STYLE);
   switch(wParam)
diff --git a/reactos/lib/ws2_32/misc/ns.c b/reactos/lib/ws2_32/misc/ns.c
index eb6799e2559..3121a3cda20 100644
--- a/reactos/lib/ws2_32/misc/ns.c
+++ b/reactos/lib/ws2_32/misc/ns.c
@@ -7,6 +7,7 @@
  * REVISIONS:
  *   CSH 01/09-2000 Created
  */
+#define __NO_CTYPE_INLINES
 #include <ctype.h>
 #include <ws2_32.h>
 
diff --git a/reactos/lib/ws2_32/misc/stubs.c b/reactos/lib/ws2_32/misc/stubs.c
index f3b9d1be9e1..332ef500b8e 100644
--- a/reactos/lib/ws2_32/misc/stubs.c
+++ b/reactos/lib/ws2_32/misc/stubs.c
@@ -377,7 +377,7 @@ WSADuplicateSocketW(
   Error = Provider->ProcTable.lpWSPDuplicateSocket(s,
                                                    dwProcessId,
                                                    lpProtocolInfo,
-                                                   &Error);
+                                                   &Errno);
   DereferenceProviderByPointer(Provider);                                              
   
   if (Error == SOCKET_ERROR)
@@ -434,7 +434,6 @@ WSAGetOverlappedResult(
     OUT LPDWORD lpdwFlags)
 {
   INT Errno;
-  int Error;
   BOOL Success;
   PCATALOG_ENTRY Provider;
 
@@ -455,7 +454,7 @@ WSAGetOverlappedResult(
                                                         lpcbTransfer,
                                                         fWait,
                                                         lpdwFlags,
-                                                        &Error);
+                                                        &Errno);
   DereferenceProviderByPointer(Provider);                                              
   
   if (Success == FALSE)
diff --git a/reactos/ntoskrnl/io/deviface.c b/reactos/ntoskrnl/io/deviface.c
index 7cb0d5192b0..cf51fa6e28b 100644
--- a/reactos/ntoskrnl/io/deviface.c
+++ b/reactos/ntoskrnl/io/deviface.c
@@ -109,11 +109,11 @@ IoGetDeviceInterfaces(
    HANDLE SubKey;
    HANDLE SymbolicLinkKey;
    PKEY_FULL_INFORMATION fip;
-   PKEY_FULL_INFORMATION bfip;
+   PKEY_FULL_INFORMATION bfip = NULL;
    PKEY_BASIC_INFORMATION bip;
-   PKEY_VALUE_PARTIAL_INFORMATION vpip;
+   PKEY_VALUE_PARTIAL_INFORMATION vpip = NULL;
    PWCHAR SymLinkList = NULL;
-   ULONG SymLinkListSize;
+   ULONG SymLinkListSize = 0;
    NTSTATUS Status;
    ULONG Size = 0;
    ULONG i = 0;
diff --git a/reactos/ntoskrnl/io/resource.c b/reactos/ntoskrnl/io/resource.c
index d4fd336c260..4ba00fd14f6 100644
--- a/reactos/ntoskrnl/io/resource.c
+++ b/reactos/ntoskrnl/io/resource.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: resource.c,v 1.16 2004/06/20 04:50:02 vizzini Exp $
+/* $Id: resource.c,v 1.17 2004/07/03 17:40:24 navaraf Exp $
  *
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/io/resource.c
@@ -125,7 +125,7 @@ IopQueryDeviceDescription(
    ULONG Bus,
    PKEY_VALUE_FULL_INFORMATION *BusInformation) 
 {
-   NTSTATUS Status;
+   NTSTATUS Status = STATUS_SUCCESS;
 
    /* Controller Stuff */
    UNICODE_STRING ControllerString;
@@ -481,13 +481,13 @@ IopQueryBusDescription(
    UNICODE_STRING SubRootRegName;
    UNICODE_STRING BusString;
    UNICODE_STRING SubBusString;
-   ULONG LenBasicInformation;
+   ULONG LenBasicInformation = 0;
    ULONG LenFullInformation;
    ULONG LenKeyFullInformation;
    ULONG LenKey;
    HANDLE SubRootKeyHandle;
    PKEY_FULL_INFORMATION FullInformation;
-   PKEY_BASIC_INFORMATION BasicInformation;
+   PKEY_BASIC_INFORMATION BasicInformation = NULL;
    OBJECT_ATTRIBUTES ObjectAttributes;
    PKEY_VALUE_FULL_INFORMATION BusInformation[3] = {NULL, NULL, NULL};
 
diff --git a/reactos/subsys/system/cmd/dir.c b/reactos/subsys/system/cmd/dir.c
index 653f711e5c9..94b76df00bc 100644
--- a/reactos/subsys/system/cmd/dir.c
+++ b/reactos/subsys/system/cmd/dir.c
@@ -1,4 +1,4 @@
-/* $Id: dir.c,v 1.9 2004/04/30 16:52:41 navaraf Exp $
+/* $Id: dir.c,v 1.10 2004/07/03 17:40:24 navaraf Exp $
  *
  *  DIR.C - dir internal command.
  *
@@ -862,7 +862,7 @@ DirList (LPTSTR szPath, LPTSTR szFilespec, LPINT pLine, DWORD dwFlags)
 	TCHAR  buffer[32];
 	ULONG filecount = 0;
 	ULONG dircount = 0;
-	INT count;
+	INT count = 0;
 	USHORT screenwidth;
 	INT longestfname = 0;
 
diff --git a/reactos/subsys/system/format/format.c b/reactos/subsys/system/format/format.c
index d556f9ee112..c29512de76f 100755
--- a/reactos/subsys/system/format/format.c
+++ b/reactos/subsys/system/format/format.c
@@ -265,7 +265,7 @@ BOOLEAN LoadFMIFSEntryPoints()
 int wmain( int argc, WCHAR *argv[] )
 {
 	int badArg;
-	DWORD media;
+	DWORD media = FMIFS_HARDDISK;
 	DWORD driveType;
 	WCHAR fileSystem[1024];
 	WCHAR volumeName[1024];
@@ -326,10 +326,6 @@ int wmain( int argc, WCHAR *argv[] )
 		fgetws( input, sizeof(input)/2, stdin );
 
 		media = FMIFS_FLOPPY;
-
-
-		driveType = DRIVE_FIXED;
-		media = FMIFS_HARDDISK;
 	}
 
 	//
diff --git a/reactos/subsys/system/services/database.c b/reactos/subsys/system/services/database.c
index 83888bc17fe..31127b8b8be 100644
--- a/reactos/subsys/system/services/database.c
+++ b/reactos/subsys/system/services/database.c
@@ -1,4 +1,4 @@
-/* $Id: database.c,v 1.16 2004/04/12 17:20:47 navaraf Exp $
+/* $Id: database.c,v 1.17 2004/07/03 17:40:24 navaraf Exp $
  *
  * service control manager
  * 
@@ -680,7 +680,7 @@ ScmAutoStartServices(VOID)
     {
       CurrentService = CONTAINING_RECORD(ServiceEntry, SERVICE, ServiceListEntry);
 
-      if ((CurrentGroup->GroupName.Length > 0) &&
+      if ((CurrentService->ServiceGroup.Length == 0) &&
 	  (CurrentService->Start == SERVICE_AUTO_START) &&
 	  (CurrentService->ServiceVisited == FALSE))
 	{
@@ -698,7 +698,7 @@ ScmAutoStartServices(VOID)
     {
       CurrentService = CONTAINING_RECORD(ServiceEntry, SERVICE, ServiceListEntry);
 
-      if ((CurrentGroup->GroupName.Length == 0) &&
+      if ((CurrentService->ServiceGroup.Length == 0) &&
 	  (CurrentService->Start == SERVICE_AUTO_START) &&
 	  (CurrentService->ServiceVisited == FALSE))
 	{
diff --git a/reactos/subsys/system/winlogon/winlogon.c b/reactos/subsys/system/winlogon/winlogon.c
index 7dd5bd4ab1d..8b2cec9342b 100644
--- a/reactos/subsys/system/winlogon/winlogon.c
+++ b/reactos/subsys/system/winlogon/winlogon.c
@@ -1,4 +1,4 @@
-/* $Id: winlogon.c,v 1.30 2004/05/25 15:53:16 navaraf Exp $
+/* $Id: winlogon.c,v 1.31 2004/07/03 17:40:24 navaraf Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -805,7 +805,7 @@ DoLogin(PWLSESSION Session)
   DWORD WlxAction, Options;
   WLX_MPR_NOTIFY_INFO MprNotifyInfo;
   PWLX_PROFILE_V2_0 Profile;
-  PSID LogonSid;
+  PSID LogonSid = NULL;
   HANDLE Token;
   
   /* FIXME - Create a Logon Sid
diff --git a/reactos/subsys/win32k/dib/dib16bpp.c b/reactos/subsys/win32k/dib/dib16bpp.c
index e85958231ab..339bcb66c0d 100644
--- a/reactos/subsys/win32k/dib/dib16bpp.c
+++ b/reactos/subsys/win32k/dib/dib16bpp.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dib16bpp.c,v 1.33 2004/07/03 13:55:35 navaraf Exp $ */
+/* $Id: dib16bpp.c,v 1.34 2004/07/03 17:40:24 navaraf Exp $ */
 #include <w32k.h>
 
 VOID
@@ -270,16 +270,16 @@ DIB_16BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
 {
    ULONG X, Y;
    ULONG SourceX, SourceY;
-   ULONG wd, Dest, Source, Pattern = 0, PatternY;
+   ULONG wd, Dest, Source = 0, Pattern = 0;
    PULONG DestBits;
    BOOL UsesSource;
    BOOL UsesPattern;
    ULONG RoundedRight;
    /* Pattern brushes */
-   PGDIBRUSHOBJ GdiBrush;
+   PGDIBRUSHOBJ GdiBrush = NULL;
    HBITMAP PatternSurface = NULL;
-   SURFOBJ *PatternObj;
-   ULONG PatternWidth, PatternHeight;
+   SURFOBJ *PatternObj = NULL;
+   ULONG PatternWidth = 0, PatternHeight = 0, PatternY = 0;
 
    if (Rop4 == SRCCOPY)
    {
diff --git a/reactos/subsys/win32k/dib/dib1bpp.c b/reactos/subsys/win32k/dib/dib1bpp.c
index 00e1f8cd820..bace95e7501 100644
--- a/reactos/subsys/win32k/dib/dib1bpp.c
+++ b/reactos/subsys/win32k/dib/dib1bpp.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dib1bpp.c,v 1.30 2004/07/03 13:55:35 navaraf Exp $ */
+/* $Id: dib1bpp.c,v 1.31 2004/07/03 17:40:24 navaraf Exp $ */
 #include <w32k.h>
 
 VOID
@@ -346,17 +346,17 @@ DIB_1BPP_BitBlt(
 	XLATEOBJ *ColorTranslation, ULONG Rop4)
 {
    ULONG X, Y, SourceX, SourceY, k;
-   ULONG Dest, Source, Pattern = 0;
+   ULONG Dest, Source = 0, Pattern = 0;
    PULONG DestBits;
    BOOL UsesSource;
    BOOL UsesPattern;
    ULONG RoundedRight;
    BYTE NoBits;
    /* Pattern brushes */
-   PGDIBRUSHOBJ GdiBrush;
+   PGDIBRUSHOBJ GdiBrush = NULL;
    HBITMAP PatternSurface = NULL;
-   SURFOBJ *PatternObj;
-   ULONG PatternWidth, PatternHeight;
+   SURFOBJ *PatternObj = NULL;
+   ULONG PatternWidth = 0, PatternHeight = 0, PatternY = 0;
 
    if (Rop4 == SRCCOPY)
    {
@@ -403,8 +403,6 @@ DIB_1BPP_BitBlt(
    
    for (Y = DestRect->top; Y < DestRect->bottom; Y++)
    {
-      ULONG PatternY;
-      
       SourceX = SourcePoint->x;
       DestBits = (PULONG)(
          DestSurf->pvScan0 +
diff --git a/reactos/subsys/win32k/dib/dib24bpp.c b/reactos/subsys/win32k/dib/dib24bpp.c
index 56e35822bce..9d158967ab6 100644
--- a/reactos/subsys/win32k/dib/dib24bpp.c
+++ b/reactos/subsys/win32k/dib/dib24bpp.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dib24bpp.c,v 1.29 2004/07/03 13:55:35 navaraf Exp $ */
+/* $Id: dib24bpp.c,v 1.30 2004/07/03 17:40:24 navaraf Exp $ */
 #include <w32k.h>
 
 VOID
@@ -243,15 +243,15 @@ DIB_24BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
 {
    ULONG X, Y;
    ULONG SourceX, SourceY;
-   ULONG Dest, Source, Pattern = 0, PatternY;
+   ULONG Dest, Source = 0, Pattern = 0;
    PBYTE DestBits;
    BOOL UsesSource;
    BOOL UsesPattern;
    /* Pattern brushes */
-   PGDIBRUSHOBJ GdiBrush;
+   PGDIBRUSHOBJ GdiBrush = NULL;
    HBITMAP PatternSurface = NULL;
-   SURFOBJ *PatternObj;
-   ULONG PatternWidth, PatternHeight;
+   SURFOBJ *PatternObj = NULL;
+   ULONG PatternWidth = 0, PatternHeight = 0, PatternY = 0;
 
    if (Rop4 == SRCCOPY)
    {
diff --git a/reactos/subsys/win32k/dib/dib32bpp.c b/reactos/subsys/win32k/dib/dib32bpp.c
index fe378627eda..a9ffaaf613c 100644
--- a/reactos/subsys/win32k/dib/dib32bpp.c
+++ b/reactos/subsys/win32k/dib/dib32bpp.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dib32bpp.c,v 1.28 2004/07/03 13:55:35 navaraf Exp $ */
+/* $Id: dib32bpp.c,v 1.29 2004/07/03 17:40:24 navaraf Exp $ */
 #include <w32k.h>
 
 VOID
@@ -292,15 +292,15 @@ DIB_32BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
 {
    ULONG X, Y;
    ULONG SourceX, SourceY;
-   ULONG Dest, Source, Pattern = 0, wd;
+   ULONG Dest, Source = 0, Pattern = 0, wd;
    PULONG DestBits;
    BOOL UsesSource;
    BOOL UsesPattern;
    /* Pattern brushes */
-   PGDIBRUSHOBJ GdiBrush;
+   PGDIBRUSHOBJ GdiBrush = NULL;
    HBITMAP PatternSurface = NULL;
-   SURFOBJ *PatternObj;
-   ULONG PatternWidth, PatternHeight;
+   SURFOBJ *PatternObj = NULL;
+   ULONG PatternWidth = 0, PatternHeight = 0, PatternY = 0;
 
    if (Rop4 == SRCCOPY)
    {
@@ -351,7 +351,6 @@ DIB_32BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
    
    for (Y = DestRect->top; Y < DestRect->bottom; Y++)
    {
-      ULONG PatternY;
       SourceX = SourcePoint->x;
       
       if(UsesPattern)
diff --git a/reactos/subsys/win32k/dib/dib4bpp.c b/reactos/subsys/win32k/dib/dib4bpp.c
index a1cb1e208e8..6f25051fb5f 100644
--- a/reactos/subsys/win32k/dib/dib4bpp.c
+++ b/reactos/subsys/win32k/dib/dib4bpp.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dib4bpp.c,v 1.36 2004/07/03 13:55:35 navaraf Exp $ */
+/* $Id: dib4bpp.c,v 1.37 2004/07/03 17:40:24 navaraf Exp $ */
 #include <w32k.h>
 
 VOID
@@ -227,16 +227,16 @@ DIB_4BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
 		XLATEOBJ *ColorTranslation, ULONG Rop4)
 {
    LONG i, j, sx, sy;
-   ULONG Dest, Source, Pattern = 0, PatternY;
+   ULONG Dest, Source = 0, Pattern = 0;
    PULONG DestBits;
    BOOL UsesSource;
    BOOL UsesPattern;
    LONG RoundedRight;
    /* Pattern brushes */
-   PGDIBRUSHOBJ GdiBrush;
+   PGDIBRUSHOBJ GdiBrush = NULL;
    HBITMAP PatternSurface = NULL;
-   SURFOBJ *PatternObj;
-   ULONG PatternWidth, PatternHeight;
+   SURFOBJ *PatternObj = NULL;
+   ULONG PatternWidth = 0, PatternHeight = 0, PatternY = 0;
    static const ULONG ExpandSolidColor[16] = 
    {
       0x00000000 /* 0 */,
diff --git a/reactos/subsys/win32k/dib/dib8bpp.c b/reactos/subsys/win32k/dib/dib8bpp.c
index f565135c168..2c189913c33 100644
--- a/reactos/subsys/win32k/dib/dib8bpp.c
+++ b/reactos/subsys/win32k/dib/dib8bpp.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dib8bpp.c,v 1.27 2004/07/03 13:55:35 navaraf Exp $ */
+/* $Id: dib8bpp.c,v 1.28 2004/07/03 17:40:24 navaraf Exp $ */
 #include <w32k.h>
 
 VOID
@@ -265,16 +265,16 @@ DIB_8BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
 		 XLATEOBJ *ColorTranslation, ULONG Rop4)
 {
    LONG i, j, k, sx, sy;
-   ULONG Dest, Source, Pattern = 0, PatternY;
+   ULONG Dest, Source = 0, Pattern = 0;
    PULONG DestBits;
    BOOL UsesSource;
    BOOL UsesPattern;
    LONG RoundedRight;
    /* Pattern brushes */
-   PGDIBRUSHOBJ GdiBrush;
+   PGDIBRUSHOBJ GdiBrush = NULL;
    HBITMAP PatternSurface = NULL;
-   SURFOBJ *PatternObj;
-   ULONG PatternWidth, PatternHeight;
+   SURFOBJ *PatternObj = NULL;
+   ULONG PatternWidth = 0, PatternHeight = 0, PatternY = 0;
 
    if (Rop4 == SRCCOPY)
    {
diff --git a/reactos/subsys/win32k/eng/bitblt.c b/reactos/subsys/win32k/eng/bitblt.c
index 64f769cc76a..ae128872510 100644
--- a/reactos/subsys/win32k/eng/bitblt.c
+++ b/reactos/subsys/win32k/eng/bitblt.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: bitblt.c,v 1.56 2004/07/03 13:55:35 navaraf Exp $
+/* $Id: bitblt.c,v 1.57 2004/07/03 17:40:25 navaraf Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -88,10 +88,10 @@ BltMask(SURFOBJ* Dest,
    BYTE *tMask, *lMask;
    static BYTE maskbit[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 };
    /* Pattern brushes */
-   PGDIBRUSHOBJ GdiBrush;
+   PGDIBRUSHOBJ GdiBrush = NULL;
    HBITMAP PatternSurface = NULL;
-   SURFOBJ *PatternObj;
-   ULONG PatternWidth, PatternHeight, PatternY;
+   SURFOBJ *PatternObj = NULL;
+   ULONG PatternWidth = 0, PatternHeight = 0, PatternY = 0;
   
    if (Mask == NULL)
    {
@@ -243,7 +243,7 @@ EngBitBlt(SURFOBJ *DestObj,
   SURFOBJ*           InputObj;
   SURFOBJ*           OutputObj;
   PBLTRECTFUNC       BltRectFunc;
-  BOOLEAN            Ret;
+  BOOLEAN            Ret = TRUE;
   RECTL              ClipRect;
   unsigned           i;
   POINTL             Pt;
@@ -846,7 +846,7 @@ EngMaskBitBlt(SURFOBJ *DestObj,
   INTENG_ENTER_LEAVE EnterLeaveDest;
   SURFOBJ*           InputObj;
   SURFOBJ*           OutputObj;
-  BOOLEAN            Ret;
+  BOOLEAN            Ret = TRUE;
   RECTL              ClipRect;
   unsigned           i;
   POINTL             Pt;
diff --git a/reactos/subsys/win32k/eng/misc.c b/reactos/subsys/win32k/eng/misc.c
index 3288c27bed2..6fd3236d145 100644
--- a/reactos/subsys/win32k/eng/misc.c
+++ b/reactos/subsys/win32k/eng/misc.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: misc.c,v 1.8 2004/07/03 13:55:35 navaraf Exp $ */
+/* $Id: misc.c,v 1.9 2004/07/03 17:40:25 navaraf Exp $ */
 #include <w32k.h>
 
 BOOL STDCALL
@@ -134,7 +134,7 @@ BOOL STDCALL
 IntEngLeave(PINTENG_ENTER_LEAVE EnterLeave)
 {
   POINTL SrcPoint;
-  BOOL Result;
+  BOOL Result = TRUE;
 
   if (EnterLeave->OutputObj != EnterLeave->DestObj && NULL != EnterLeave->OutputObj)
     {
diff --git a/reactos/subsys/win32k/eng/mouse.c b/reactos/subsys/win32k/eng/mouse.c
index 3dc43862994..e580cd5c59d 100644
--- a/reactos/subsys/win32k/eng/mouse.c
+++ b/reactos/subsys/win32k/eng/mouse.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: mouse.c,v 1.74 2004/07/03 13:55:35 navaraf Exp $
+/* $Id: mouse.c,v 1.75 2004/07/03 17:40:25 navaraf Exp $
  *
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Mouse
@@ -630,6 +630,7 @@ EngSetPointerShape(
          case BMF_16BPP: lDelta = Size.cx << 1; break;
          case BMF_24BPP: lDelta = Size.cx * 3; break; 
          case BMF_32BPP: lDelta = Size.cx << 2; break;
+         default: lDelta = 0; break;
       }
 
       ppdev->PointerSaveSurface = (HSURF)EngCreateBitmap(
diff --git a/reactos/subsys/win32k/eng/transblt.c b/reactos/subsys/win32k/eng/transblt.c
index 0fdb080359b..cd934a1e2b7 100644
--- a/reactos/subsys/win32k/eng/transblt.c
+++ b/reactos/subsys/win32k/eng/transblt.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: transblt.c,v 1.20 2004/07/03 13:55:35 navaraf Exp $
+/* $Id: transblt.c,v 1.21 2004/07/03 17:40:25 navaraf Exp $
  * 
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -39,7 +39,7 @@ EngTransparentBlt(SURFOBJ *Dest,
 		  ULONG iTransColor,
 		  ULONG Reserved)
 {
-  BOOL Ret;
+  BOOL Ret = TRUE;
   BYTE ClippingType;
   INTENG_ENTER_LEAVE EnterLeaveSource, EnterLeaveDest;
   SURFOBJ *InputObj, *OutputObj;
diff --git a/reactos/subsys/win32k/ntuser/message.c b/reactos/subsys/win32k/ntuser/message.c
index 8d9ebf17a75..a55a258d286 100644
--- a/reactos/subsys/win32k/ntuser/message.c
+++ b/reactos/subsys/win32k/ntuser/message.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: message.c,v 1.70 2004/06/16 06:09:40 gvg Exp $
+/* $Id: message.c,v 1.71 2004/07/03 17:40:25 navaraf Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -287,7 +287,7 @@ NtUserDispatchMessage(PNTUSERDISPATCHMESSAGEINFO UnsafeMsgInfo)
   NTSTATUS Status;
   NTUSERDISPATCHMESSAGEINFO MsgInfo;
   PWINDOW_OBJECT WindowObject;
-  LRESULT Result;
+  LRESULT Result = TRUE;
 
   Status = MmCopyFromCaller(&MsgInfo, UnsafeMsgInfo, sizeof(NTUSERDISPATCHMESSAGEINFO));
   if (! NT_SUCCESS(Status))
@@ -1397,7 +1397,7 @@ IntDoSendMessage(HWND Wnd,
 		 PDOSENDMESSAGE dsm,
 	         PNTUSERSENDMESSAGEINFO UnsafeInfo)
 {
-  LRESULT Result;
+  LRESULT Result = TRUE;
   NTSTATUS Status;
   PWINDOW_OBJECT Window;
   NTUSERSENDMESSAGEINFO Info;
diff --git a/reactos/subsys/win32k/ntuser/scrollbar.c b/reactos/subsys/win32k/ntuser/scrollbar.c
index 8b803d6b962..741cd9dff84 100644
--- a/reactos/subsys/win32k/ntuser/scrollbar.c
+++ b/reactos/subsys/win32k/ntuser/scrollbar.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: scrollbar.c,v 1.33 2004/05/12 09:47:16 gvg Exp $
+/* $Id: scrollbar.c,v 1.34 2004/07/03 17:40:25 navaraf Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -805,6 +805,7 @@ NtUserShowScrollBar(HWND hWnd, int wBar, DWORD bShow)
        Style = WS_HSCROLL | WS_VSCROLL;
        break;
      case SB_CTL:
+       Style = 0;
        break;
      default:
        IntReleaseWindowObject(Window);
diff --git a/reactos/subsys/win32k/ntuser/window.c b/reactos/subsys/win32k/ntuser/window.c
index dd68202915c..570fc5fabbd 100644
--- a/reactos/subsys/win32k/ntuser/window.c
+++ b/reactos/subsys/win32k/ntuser/window.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: window.c,v 1.241 2004/06/22 12:43:49 royce Exp $
+/* $Id: window.c,v 1.242 2004/07/03 17:40:25 navaraf Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -456,7 +456,7 @@ IntSetMenu(
    HMENU Menu,
    BOOL *Changed)
 {
-  PMENU_OBJECT OldMenuObject, NewMenuObject;
+  PMENU_OBJECT OldMenuObject, NewMenuObject = NULL;
 
   *Changed = (WindowObject->IDMenu != (UINT) Menu);
   if (! *Changed)
@@ -3153,7 +3153,7 @@ LONG STDCALL
 NtUserGetWindowLong(HWND hWnd, DWORD Index, BOOL Ansi)
 {
    PWINDOW_OBJECT WindowObject, Parent;
-   LONG Result;
+   LONG Result = 0;
 
    DPRINT("NtUserGetWindowLong(%x,%d,%d)\n", hWnd, (INT)Index, Ansi);
 
@@ -4193,7 +4193,7 @@ DWORD
 IntAddWndProcHandle(WNDPROC WindowProc, BOOL IsUnicode)
 {
 	WORD i;
-	WORD FreeSpot;
+	WORD FreeSpot = 0;
 	BOOL found;
 	WndProcHandle *OldArray;
 	WORD OldArraySize;
diff --git a/reactos/subsys/win32k/objects/bitmaps.c b/reactos/subsys/win32k/objects/bitmaps.c
index 92aa42b2f36..8c1980c6f77 100644
--- a/reactos/subsys/win32k/objects/bitmaps.c
+++ b/reactos/subsys/win32k/objects/bitmaps.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: bitmaps.c,v 1.76 2004/07/03 13:55:36 navaraf Exp $ */
+/* $Id: bitmaps.c,v 1.77 2004/07/03 17:40:27 navaraf Exp $ */
 #include <w32k.h>
 
 #define IN_RECT(r,x,y) \
@@ -47,7 +47,7 @@ NtGdiBitBlt(
 	BOOL Status;
 	PPALGDI PalDestGDI, PalSourceGDI;
 	XLATEOBJ *XlateObj = NULL;
-	HPALETTE SourcePalette, DestPalette;
+	HPALETTE SourcePalette = 0, DestPalette = 0;
 	ULONG SourceMode, DestMode;
 	PGDIBRUSHOBJ BrushObj;
 	BOOL UsesSource = ((ROP & 0xCC0000) >> 2) != (ROP & 0x330000);
@@ -266,11 +266,11 @@ NtGdiTransparentBlt(
   RECTL rcDest, rcSrc;
   BITMAPOBJ *BitmapDest, *BitmapSrc;
   XLATEOBJ *XlateObj;
-  HPALETTE SourcePalette, DestPalette;
+  HPALETTE SourcePalette = 0, DestPalette = 0;
   PPALGDI PalDestGDI, PalSourceGDI;
   USHORT PalDestMode, PalSrcMode;
-  ULONG TransparentColor;
-  BOOL Ret;
+  ULONG TransparentColor = 0;
+  BOOL Ret = FALSE;
   
   if(!(DCDest = DC_LockDc(hdcDst)))
   {
@@ -582,7 +582,7 @@ NtGdiGetPixel(HDC hDC, INT XPos, INT YPos)
 	BOOL bInRect = FALSE;
 	BITMAPOBJ *BitmapObject;
 	SURFOBJ *SurfaceObject;
-	HPALETTE Pal;
+	HPALETTE Pal = 0;
 	PPALGDI PalGDI;
 	USHORT PalMode;
 	XLATEOBJ *XlateObj;
@@ -1046,7 +1046,7 @@ NtGdiStretchBlt(
 	BOOL Status;
 	PPALGDI PalDestGDI, PalSourceGDI;
 	XLATEOBJ *XlateObj = NULL;
-	HPALETTE SourcePalette, DestPalette;
+	HPALETTE SourcePalette = 0, DestPalette = 0;
 	ULONG SourceMode, DestMode;
 	PGDIBRUSHOBJ BrushObj;
 	BOOL UsesSource = ((ROP & 0xCC0000) >> 2) != (ROP & 0x330000);
diff --git a/reactos/subsys/win32k/objects/brush.c b/reactos/subsys/win32k/objects/brush.c
index ac0937ba0f1..4ab20927155 100644
--- a/reactos/subsys/win32k/objects/brush.c
+++ b/reactos/subsys/win32k/objects/brush.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: brush.c,v 1.38 2004/07/03 13:55:36 navaraf Exp $
+ * $Id: brush.c,v 1.39 2004/07/03 17:40:27 navaraf Exp $
  */
 #include <w32k.h>
 
@@ -50,7 +50,7 @@ IntGdiCreateBrushIndirect(PLOGBRUSH LogBrush)
 {
    PGDIBRUSHOBJ BrushObject;
    HBRUSH hBrush;
-   HBITMAP hPattern;
+   HBITMAP hPattern = 0;
    
    switch (LogBrush->lbStyle)
    {
@@ -129,7 +129,7 @@ IntPatBlt(
    RECTL DestRect;
    BITMAPOBJ *BitmapObj;
    POINTL BrushOrigin;
-   BOOL ret;
+   BOOL ret = TRUE;
 
    BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap);
    if (BitmapObj == NULL)
@@ -354,7 +354,7 @@ NtGdiPolyPatBlt(
    INT cRects,
    ULONG Reserved)
 {
-   PPATRECT rb;
+   PPATRECT rb = NULL;
    NTSTATUS Status;
    BOOL Ret;
     
diff --git a/reactos/subsys/win32k/objects/color.c b/reactos/subsys/win32k/objects/color.c
index 709c11afc85..0d55a75e9f8 100644
--- a/reactos/subsys/win32k/objects/color.c
+++ b/reactos/subsys/win32k/objects/color.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: color.c,v 1.47 2004/07/03 13:55:36 navaraf Exp $ */
+/* $Id: color.c,v 1.48 2004/07/03 17:40:27 navaraf Exp $ */
 #include <w32k.h>
 
 // FIXME: Use PXLATEOBJ logicalToSystem instead of int *mapping
@@ -440,7 +440,7 @@ HPALETTE STDCALL NtGdiSelectPalette(HDC  hDC,
                             BOOL  ForceBackground)
 {
   PDC dc;
-  HPALETTE oldPal;
+  HPALETTE oldPal = NULL;
   PPALGDI PalGDI;
 
   // FIXME: mark the palette as a [fore\back]ground pal
diff --git a/reactos/subsys/win32k/objects/cursoricon.c b/reactos/subsys/win32k/objects/cursoricon.c
index 995f10e0237..0e951e5f0e1 100644
--- a/reactos/subsys/win32k/objects/cursoricon.c
+++ b/reactos/subsys/win32k/objects/cursoricon.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: cursoricon.c,v 1.58 2004/07/03 13:55:36 navaraf Exp $ */
+/* $Id: cursoricon.c,v 1.59 2004/07/03 17:40:27 navaraf Exp $ */
 #include <w32k.h>
 
 PCURICON_OBJECT FASTCALL
@@ -1077,7 +1077,7 @@ NtUserDrawIconEx(
   COLORREF oldFg, oldBg;
   HDC hdcMem, hdcOff = (HDC)0;
   HBITMAP hbmOff = (HBITMAP)0;
-  HGDIOBJ hOldOffBrush, hOldOffBmp, hOldMem;
+  HGDIOBJ hOldOffBrush = 0, hOldOffBmp = 0, hOldMem;
   BOOL Ret = FALSE;
   #if CANSTRETCHBLT
   INT nStretchMode;
diff --git a/reactos/subsys/win32k/objects/dc.c b/reactos/subsys/win32k/objects/dc.c
index 9b32c7ab2b5..9667640e560 100644
--- a/reactos/subsys/win32k/objects/dc.c
+++ b/reactos/subsys/win32k/objects/dc.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dc.c,v 1.142 2004/07/03 13:55:36 navaraf Exp $
+/* $Id: dc.c,v 1.143 2004/07/03 17:40:27 navaraf Exp $
  *
  * DC.C - Device context functions
  *
@@ -940,6 +940,7 @@ NtGdiGetCurrentObject(HDC  hDC, UINT  ObjectType)
       break;
     case OBJ_PAL:
       DPRINT1("FIXME: NtGdiGetCurrentObject() ObjectType OBJ_PAL not supported yet!\n");
+      SelObject = NULL;
       break;
     case OBJ_FONT:
       SelObject = dc->w.hFont;
@@ -949,6 +950,7 @@ NtGdiGetCurrentObject(HDC  hDC, UINT  ObjectType)
       break;
     case OBJ_COLORSPACE:
       DPRINT1("FIXME: NtGdiGetCurrentObject() ObjectType OBJ_COLORSPACE not supported yet!\n");
+      SelObject = NULL;
       break;
     default:
       SelObject = NULL;
@@ -1742,7 +1744,7 @@ NtGdiSelectObject(HDC  hDC, HGDIOBJ  hGDIObj)
   PPALGDI PalGDI;
   DWORD objectType;
   COLORREF MonoColorMap[2];
-  ULONG NumColors;
+  ULONG NumColors = 0;
   HRGN hVisRgn;
   USHORT Mode;
 
@@ -2187,7 +2189,7 @@ IntGetDCColor(HDC hDC, ULONG Object)
   PGDIBRUSHOBJ pen;
   PGDIBRUSHOBJ brush;
   XLATEOBJ *XlateObj;
-  HPALETTE Pal;
+  HPALETTE Pal = 0;
   USHORT Mode;
   ULONG iColor;
   
@@ -2279,7 +2281,7 @@ IntSetDCColor(HDC hDC, ULONG Object, COLORREF Color)
   PGDIBRUSHOBJ pen;
   PGDIBRUSHOBJ brush;
   XLATEOBJ *XlateObj;
-  HPALETTE Pal;
+  HPALETTE Pal = 0;
   USHORT Mode;
   ULONG iColor;
   
diff --git a/reactos/subsys/win32k/objects/line.c b/reactos/subsys/win32k/objects/line.c
index ca7bcc5be27..86324311b3c 100644
--- a/reactos/subsys/win32k/objects/line.c
+++ b/reactos/subsys/win32k/objects/line.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: line.c,v 1.34 2004/07/03 13:55:37 navaraf Exp $ */
+/* $Id: line.c,v 1.35 2004/07/03 17:40:27 navaraf Exp $ */
 #include <w32k.h>
 
 // Some code from the WINE project source (www.winehq.com)
@@ -52,7 +52,7 @@ IntGdiLineTo(DC  *dc,
              int YEnd)
 {
   BITMAPOBJ *BitmapObj;
-  BOOL      Ret;
+  BOOL      Ret = TRUE;
   PGDIBRUSHOBJ PenBrushObj;
   RECTL     Bounds;
   POINT     Points[2];
diff --git a/reactos/subsys/win32k/objects/path.c b/reactos/subsys/win32k/objects/path.c
index 08390bf1041..005df53c83b 100644
--- a/reactos/subsys/win32k/objects/path.c
+++ b/reactos/subsys/win32k/objects/path.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: path.c,v 1.22 2004/06/20 00:45:37 navaraf Exp $ */
+/* $Id: path.c,v 1.23 2004/07/03 17:40:27 navaraf Exp $ */
 #include <w32k.h>
 #include <win32k/float.h>
 
@@ -403,7 +403,6 @@ PATH_Arc ( PDC dc, INT x1, INT y1, INT x2, INT y2,
    INT xStart, INT yStart, INT xEnd, INT yEnd)
 {
   GdiPath *pPath;
-  DC      *pDC;
   double  angleStart, angleEnd, angleStartQuadrant, angleEndQuadrant=0.0;
           /* Initialize angleEndQuadrant to silence gcc's warning */
   double  x, y;
@@ -442,10 +441,10 @@ PATH_Arc ( PDC dc, INT x1, INT y1, INT x2, INT y2,
   pointStart.y=(FLOAT)yStart;
   pointEnd.x=(FLOAT)xEnd;
   pointEnd.y=(FLOAT)yEnd;
-  INTERNAL_LPTODP_FLOAT(pDC, corners);
-  INTERNAL_LPTODP_FLOAT(pDC, corners+1);
-  INTERNAL_LPTODP_FLOAT(pDC, &pointStart);
-  INTERNAL_LPTODP_FLOAT(pDC, &pointEnd);
+  INTERNAL_LPTODP_FLOAT(dc, corners);
+  INTERNAL_LPTODP_FLOAT(dc, corners+1);
+  INTERNAL_LPTODP_FLOAT(dc, &pointStart);
+  INTERNAL_LPTODP_FLOAT(dc, &pointEnd);
 
   /* Make sure first corner is top left and second corner is bottom right */
   if ( corners[0].x > corners[1].x )
diff --git a/reactos/subsys/win32k/objects/region.c b/reactos/subsys/win32k/objects/region.c
index d19dc086b93..21658a98a9f 100644
--- a/reactos/subsys/win32k/objects/region.c
+++ b/reactos/subsys/win32k/objects/region.c
@@ -113,7 +113,7 @@ SOFTWARE.
  * the y-x-banding that's so nice to have...
  */
 
-/* $Id: region.c,v 1.60 2004/07/03 13:55:37 navaraf Exp $ */
+/* $Id: region.c,v 1.61 2004/07/03 17:40:27 navaraf Exp $ */
 #include <w32k.h>
 #include <win32k/float.h>
 
@@ -2209,14 +2209,8 @@ NtGdiExtCreateRegion(CONST PXFORM  Xform,
                           DWORD  Count,
                           CONST PROSRGNDATA  RgnData)
 {
-  HRGN hRgn;
-
-  // FIXME: Apply Xform transformation to the regional data
-  if(Xform != NULL) {
-
-  }
-
-  return hRgn;
+  UNIMPLEMENTED;
+  return 0;
 }
 
 BOOL
diff --git a/reactos/subsys/win32k/objects/text.c b/reactos/subsys/win32k/objects/text.c
index 29cd537776d..4b9856c8088 100644
--- a/reactos/subsys/win32k/objects/text.c
+++ b/reactos/subsys/win32k/objects/text.c
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: text.c,v 1.101 2004/07/03 13:55:37 navaraf Exp $ */
+/* $Id: text.c,v 1.102 2004/07/03 17:40:27 navaraf Exp $ */
 #include <w32k.h>
 
 #include <ft2build.h>
@@ -1993,7 +1993,7 @@ NtGdiGetCharWidth32(HDC  hDC,
    FT_Face face;
    FT_CharMap charmap, found = NULL;
    UINT i, glyph_index, BufferSize;
-   HFONT hFont;
+   HFONT hFont = 0;
 
    if (LastChar < FirstChar)
    {

From 4d9b237e6d38b09ca924677fac0310581fe56609 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sat, 3 Jul 2004 18:41:56 +0000
Subject: [PATCH 182/356] - Don't use the "cpu" directive because NASM 0.98
 doesn't support it.

svn path=/trunk/; revision=9985
---
 reactos/lib/pseh/i386/framebased.asm | 3 ++-
 reactos/lib/pseh/i386/setjmp.asm     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/reactos/lib/pseh/i386/framebased.asm b/reactos/lib/pseh/i386/framebased.asm
index 50adede06e3..0db8ad10d0d 100644
--- a/reactos/lib/pseh/i386/framebased.asm
+++ b/reactos/lib/pseh/i386/framebased.asm
@@ -18,7 +18,8 @@
 ; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 ; SOFTWARE.
 
-cpu 486
+; DON'T USE THE "cpu" DIRECTIVE BECAUSE NASM 0.98 DOESN'T SUPPORT IT
+; cpu 486
 segment .text use32
 
 global __SEHCleanHandlerEnvironment
diff --git a/reactos/lib/pseh/i386/setjmp.asm b/reactos/lib/pseh/i386/setjmp.asm
index abc81b10095..a46897071a7 100644
--- a/reactos/lib/pseh/i386/setjmp.asm
+++ b/reactos/lib/pseh/i386/setjmp.asm
@@ -18,7 +18,8 @@
 ; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 ; SOFTWARE.
 
-cpu 486
+; DON'T USE THE "cpu" DIRECTIVE BECAUSE NASM 0.98 DOESN'T SUPPORT IT
+; cpu 486
 segment .text use32
 
 ; Note: the undecorated names are for Borland C++ (and possibly other compilers

From 0c94f9e2c2483ece829666fa935b3b0682db9f91 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sat, 3 Jul 2004 22:36:01 +0000
Subject: [PATCH 183/356] - Fixed buffer handling and coordinate translation in
 IntGdiPolyline.

svn path=/trunk/; revision=9986
---
 reactos/subsys/win32k/objects/line.c | 81 ++++++++++++++--------------
 1 file changed, 39 insertions(+), 42 deletions(-)

diff --git a/reactos/subsys/win32k/objects/line.c b/reactos/subsys/win32k/objects/line.c
index 86324311b3c..ade99359842 100644
--- a/reactos/subsys/win32k/objects/line.c
+++ b/reactos/subsys/win32k/objects/line.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: line.c,v 1.35 2004/07/03 17:40:27 navaraf Exp $ */
+/* $Id: line.c,v 1.36 2004/07/03 22:36:01 navaraf Exp $ */
 #include <w32k.h>
 
 // Some code from the WINE project source (www.winehq.com)
@@ -188,56 +188,53 @@ IntGdiPolyline(DC      *dc,
                LPPOINT pt,
                int     Count)
 {
-  BITMAPOBJ    *BitmapObj;
-  BOOL         ret = FALSE; // default to failure
-  LONG         i;
-  PGDIBRUSHOBJ PenBrushObj;
-  POINT       *pts;
+   BITMAPOBJ *BitmapObj;
+   GDIBRUSHOBJ *PenBrushObj;
+   LPPOINT Points;
+   BOOL Ret = TRUE;
+   LONG i;
 
-  if ( PATH_IsPathOpen ( dc->w.path ) )
-    return PATH_Polyline ( dc, pt, Count );
+   if (PATH_IsPathOpen(dc->w.path))
+      return PATH_Polyline(dc, pt, Count);
 
-  BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap);
-  ASSERT(BitmapObj);
+   /* Get BRUSHOBJ from current pen. */
+   PenBrushObj = PENOBJ_LockPen(dc->w.hPen);
+   ASSERT(PenBrushObj);
 
-  //Allocate "Count" bytes of memory to hold a safe copy of pt
-  pts = (POINT*)ExAllocatePoolWithTag ( PagedPool, sizeof(POINT)*Count, TAG_SHAPE );
-  if ( pts )
-  {
-    // safely copy pt to local version
-    if ( STATUS_SUCCESS == MmCopyFromCaller(pts, pt, sizeof(POINT)*Count) )
-    {
-      //offset the array of point by the dc->w.DCOrg
-      for ( i = 0; i < Count; i++ )
+   if (!(PenBrushObj->flAttrs & GDIBRUSH_IS_NULL))
+   {
+      Points = EngAllocMem(0, Count * sizeof(POINT), TAG_COORD);
+      if (Points != NULL)
       {
-	pts[i].x += dc->w.DCOrgX;
-	pts[i].y += dc->w.DCOrgY;
+         BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap);
+         ASSERT(BitmapObj);
+
+         RtlCopyMemory(Points, pt, Count * sizeof(POINT));
+         IntLPtoDP(dc, Points, Count);
+
+         /* Offset the array of point by the dc->w.DCOrg */
+         for (i = 0; i < Count; i++)
+         {
+            Points[i].x += dc->w.DCOrgX;
+            Points[i].y += dc->w.DCOrgY;
+         }
+
+         Ret = IntEngPolyline(BitmapObj, dc->CombinedClip,
+     			   &PenBrushObj->BrushObject, Points, Count,
+     			   dc->w.ROPmode);
+
+         BITMAPOBJ_UnlockBitmap(dc->w.hBitmap);
+         EngFreeMem(Points);
       }
-
-      /* get BRUSHOBJ from current pen. */
-      PenBrushObj = PENOBJ_LockPen( dc->w.hPen );
-      ASSERT(PenBrushObj);
-
-      if (!(PenBrushObj->flAttrs & GDIBRUSH_IS_NULL))
+      else
       {
-        //get IntEngPolyline to do the drawing.
-        ret = IntEngPolyline(BitmapObj,
-  			   dc->CombinedClip,
-  			   &PenBrushObj->BrushObject,
-  			   pts,
-  			   Count,
-  			   dc->w.ROPmode);
+         Ret = FALSE;
       }
+   }
 
-      PENOBJ_UnlockPen( dc->w.hPen );
-    }
+   PENOBJ_UnlockPen(dc->w.hPen);
 
-    ExFreePool ( pts );
-  }
-
-  BITMAPOBJ_UnlockBitmap(dc->w.hBitmap);
-
-  return ret;
+   return Ret;
 }
 
 BOOL FASTCALL

From 05345c056a9f9c8de5da0b1a2cad5fa54f4b33bd Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sat, 3 Jul 2004 22:36:27 +0000
Subject: [PATCH 184/356] - Allocate memory from paged pool in EngAllocMem.

svn path=/trunk/; revision=9987
---
 reactos/subsys/win32k/eng/mem.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reactos/subsys/win32k/eng/mem.c b/reactos/subsys/win32k/eng/mem.c
index 61524e3a4ee..79ace46beca 100644
--- a/reactos/subsys/win32k/eng/mem.c
+++ b/reactos/subsys/win32k/eng/mem.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: mem.c,v 1.16 2004/05/10 17:07:17 weiden Exp $
+/* $Id: mem.c,v 1.17 2004/07/03 22:36:27 navaraf Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -46,7 +46,7 @@ EngAllocMem(ULONG Flags,
 {
   PVOID newMem;
 
-  newMem = ExAllocatePoolWithTag(NonPagedPool, MemSize, Tag); // FIXME: Use PagedPool when it is implemented
+  newMem = ExAllocatePoolWithTag(PagedPool, MemSize, Tag);
 
   if (Flags == FL_ZERO_MEMORY && NULL != newMem)
   {

From f5d1bff687168d51809902f2bdcf9c7b92ba98f2 Mon Sep 17 00:00:00 2001
From: Royce Mitchell III <royce3@ev1.net>
Date: Sun, 4 Jul 2004 00:33:26 +0000
Subject: [PATCH 185/356] small fix to constant we aren't even using, yet, but
 should

svn path=/trunk/; revision=9988
---
 reactos/include/ntos/except.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reactos/include/ntos/except.h b/reactos/include/ntos/except.h
index 753d50a4538..7034cb782e5 100644
--- a/reactos/include/ntos/except.h
+++ b/reactos/include/ntos/except.h
@@ -14,7 +14,7 @@ typedef enum {
 	ExceptionContinueSearch,
 	ExceptionNestedException,
 	ExceptionCollidedUnwind,
-  ExceptionDismiss  /* ??? */
+	ExceptionDismiss = 0 /* assuming this is the same thing as DISPOSITION_DISMISS */
 } EXCEPTION_DISPOSITION;
 
 

From 9ac102fb1720823051acf25c00592aabdb51e4cf Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sun, 4 Jul 2004 01:23:32 +0000
Subject: [PATCH 186/356] - Support resursive locking of the GDI objects. -
 Call EngMovePointer instead of DrvMovePointer if driver DrvSetPointerShape
 returned SPS_DECLINE.

svn path=/trunk/; revision=9989
---
 reactos/include/win32k/dc.h                |  2 +
 reactos/include/win32k/gdiobj.h            |  4 +-
 reactos/subsys/win32k/ntuser/input.c       | 11 ++---
 reactos/subsys/win32k/objects/cursoricon.c | 18 ++++---
 reactos/subsys/win32k/objects/gdiobj.c     | 55 +++++++++++++++++++++-
 5 files changed, 73 insertions(+), 17 deletions(-)

diff --git a/reactos/include/win32k/dc.h b/reactos/include/win32k/dc.h
index 4f877f0bfd9..dc7cf9e0cae 100644
--- a/reactos/include/win32k/dc.h
+++ b/reactos/include/win32k/dc.h
@@ -116,6 +116,8 @@ typedef struct
   DRIVER_FUNCTIONS DriverFunctions;
   PFILE_OBJECT VideoFileObject;
 
+  PGD_MOVEPOINTER MovePointer;
+
   struct {
      BOOL Enable;
      LONG Column;
diff --git a/reactos/include/win32k/gdiobj.h b/reactos/include/win32k/gdiobj.h
index fd2ac756d9a..801b50eb021 100644
--- a/reactos/include/win32k/gdiobj.h
+++ b/reactos/include/win32k/gdiobj.h
@@ -49,7 +49,9 @@ typedef struct _GDIOBJHDR
   WORD Magic;
   const char* lockfile;
   int lockline;
-  FAST_MUTEX Lock;
+/*  FAST_MUTEX Lock;*/
+  DWORD LockTid;
+  DWORD LockCount;
 } GDIOBJHDR, *PGDIOBJHDR;
 
 typedef struct _GDIMULTILOCK
diff --git a/reactos/subsys/win32k/ntuser/input.c b/reactos/subsys/win32k/ntuser/input.c
index e86347993d6..8d8506f2600 100644
--- a/reactos/subsys/win32k/ntuser/input.c
+++ b/reactos/subsys/win32k/ntuser/input.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: input.c,v 1.35 2004/07/03 13:55:36 navaraf Exp $
+/* $Id: input.c,v 1.36 2004/07/04 01:23:32 navaraf Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -640,14 +640,9 @@ IntMouseInput(MOUSEINPUT *mi)
       {
         SurfObj = &BitmapObj->SurfObj;
 
-        if(GDIDEVFUNCS(SurfObj).MovePointer)
+        if (GDIDEV(SurfObj)->MovePointer)
         {
-          GDIDEVFUNCS(SurfObj).MovePointer(
-             SurfObj, MousePos.x, MousePos.y, &PointerRect);
-        }
-        else
-        {
-          EngMovePointer(SurfObj, MousePos.x, MousePos.y, &PointerRect);
+          GDIDEV(SurfObj)->MovePointer(SurfObj, MousePos.x, MousePos.y, &PointerRect);
         }
 
         BITMAPOBJ_UnlockBitmap(hBitmap);
diff --git a/reactos/subsys/win32k/objects/cursoricon.c b/reactos/subsys/win32k/objects/cursoricon.c
index 0e951e5f0e1..3acd970ed80 100644
--- a/reactos/subsys/win32k/objects/cursoricon.c
+++ b/reactos/subsys/win32k/objects/cursoricon.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: cursoricon.c,v 1.59 2004/07/03 17:40:27 navaraf Exp $ */
+/* $Id: cursoricon.c,v 1.60 2004/07/04 01:23:32 navaraf Exp $ */
 #include <w32k.h>
 
 PCURICON_OBJECT FASTCALL
@@ -88,10 +88,8 @@ IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor,
       if (NULL != CurInfo->CurrentCursorObject && CurInfo->ShowingCursor)
       {
          /* Remove the cursor if it was displayed */
-         if (GDIDEVFUNCS(SurfObj).MovePointer)
-           GDIDEVFUNCS(SurfObj).MovePointer(SurfObj, -1, -1, &PointerRect);
-         else
-           EngMovePointer(SurfObj, -1, -1, &PointerRect);
+         if (GDIDEV(SurfObj)->MovePointer)
+           GDIDEV(SurfObj)->MovePointer(SurfObj, -1, -1, &PointerRect);
          SetPointerRect(CurInfo, &PointerRect);
       }
 
@@ -174,13 +172,15 @@ IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor,
                                                         CurInfo->y, 
                                                         &PointerRect,
                                                         SPS_CHANGE);
+      DbgPrint("SetCursor: DrvSetPointerShape() returned %x\n",
+         GDIDEV(SurfObj)->PointerStatus);
     }
     else
     {
       GDIDEV(SurfObj)->PointerStatus = SPS_DECLINE;
     }
 
-    if(((GDIDEVICE *)SurfObj->hdev)->PointerStatus == SPS_DECLINE)
+    if(GDIDEV(SurfObj)->PointerStatus == SPS_DECLINE)
     {
       GDIDEV(SurfObj)->PointerStatus = EngSetPointerShape(
                          SurfObj, soMask, soColor, XlateObj,
@@ -190,7 +190,11 @@ IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor,
                          CurInfo->y, 
                          &PointerRect,
                          SPS_CHANGE);
-      DbgPrint("SetCursor: DrvSetPointerShape() returned SPS_DECLINE\n");
+      GDIDEV(SurfObj)->MovePointer = EngMovePointer;
+    }
+    else
+    {
+      GDIDEV(SurfObj)->MovePointer = GDIDEVFUNCS(SurfObj).MovePointer;
     }
     
     SetPointerRect(CurInfo, &PointerRect);
diff --git a/reactos/subsys/win32k/objects/gdiobj.c b/reactos/subsys/win32k/objects/gdiobj.c
index 0627c3ecbbb..a26e967ddec 100644
--- a/reactos/subsys/win32k/objects/gdiobj.c
+++ b/reactos/subsys/win32k/objects/gdiobj.c
@@ -19,7 +19,7 @@
 /*
  * GDIOBJ.C - GDI object manipulation routines
  *
- * $Id: gdiobj.c,v 1.69 2004/07/03 13:55:36 navaraf Exp $
+ * $Id: gdiobj.c,v 1.70 2004/07/04 01:23:32 navaraf Exp $
  *
  */
 #include <w32k.h>
@@ -178,6 +178,7 @@ static HGDIOBJ StockObjects[NB_STOCK_OBJECTS];
 static PGDI_HANDLE_TABLE  HandleTable = 0;
 static FAST_MUTEX  HandleTableMutex;
 static FAST_MUTEX  RefCountHandling;
+static LARGE_INTEGER  ShortDelay;
 
 /*!
  * Allocate GDI object table.
@@ -344,7 +345,12 @@ GDIOBJ_AllocObj(WORD Size, DWORD ObjectType, GDICLEANUPPROC CleanupProc)
   newObject->Magic = GDI_TYPE_TO_MAGIC(ObjectType);
   newObject->lockfile = NULL;
   newObject->lockline = 0;
+#if 0
   ExInitializeFastMutex(&newObject->Lock);
+#else
+  newObject->LockTid = 0;
+  newObject->LockCount = 0;
+#endif
   HandleTable->Handles[Index] = newObject;
 #if GDI_COUNT_OBJECTS
   HandleTable->HandlesCount++;
@@ -550,6 +556,8 @@ InitGdiObjectHandleTable (VOID)
   ExInitializeFastMutex (&HandleTableMutex);
   ExInitializeFastMutex (&RefCountHandling);
 
+  ShortDelay.QuadPart = -100;
+
   HandleTable = GDIOBJ_iAllocHandleTable (GDI_HANDLE_COUNT);
   DPRINT("HandleTable: %x\n", HandleTable );
 
@@ -704,6 +712,7 @@ GDIOBJ_LockObjDbg (const char* file, int line, HGDIOBJ hObj, DWORD ObjectType)
       return NULL;
     }
 
+#if 0
 #ifdef NDEBUG
   ExAcquireFastMutex(&ObjHdr->Lock);
 #else /* NDEBUG */
@@ -719,6 +728,24 @@ GDIOBJ_LockObjDbg (const char* file, int line, HGDIOBJ hObj, DWORD ObjectType)
       DPRINT1("  Disregard previous message about object 0x%x, it's ok\n", hObj);
     }
 #endif /* NDEBUG */
+#else
+  if (ObjHdr->LockTid == (DWORD)PsGetCurrentThreadId())
+    {
+      InterlockedIncrement(&ObjHdr->LockCount);
+    }
+  else
+    {
+      for (;;)
+        {
+          if (InterlockedCompareExchange(&ObjHdr->LockTid, (DWORD)PsGetCurrentThreadId(), 0))
+            {
+              InterlockedIncrement(&ObjHdr->LockCount);
+              break;
+            }
+          /* FIXME: KeDelayExecutionThread(KernelMode, FALSE, &ShortDelay); */
+        }
+    }
+#endif
 
   ExAcquireFastMutex(&RefCountHandling);
   ObjHdr->dwCount++;
@@ -780,7 +807,26 @@ GDIOBJ_LockObj(HGDIOBJ hObj, DWORD ObjectType)
       return NULL;
     }
 
+#if 0
   ExAcquireFastMutex(&ObjHdr->Lock);
+#else
+  if (ObjHdr->LockTid == (DWORD)PsGetCurrentThreadId())
+    {
+      InterlockedIncrement(&ObjHdr->LockCount);
+    }
+  else
+    {
+      for (;;)
+        {
+          if (InterlockedCompareExchange(&ObjHdr->LockTid, (DWORD)PsGetCurrentThreadId(), 0))
+            {
+              InterlockedIncrement(&ObjHdr->LockCount);
+              break;
+            }
+          /* FIXME: KeDelayExecutionThread(KernelMode, FALSE, &ShortDelay); */
+        }
+    }
+#endif
 
   ExAcquireFastMutex(&RefCountHandling);
   ObjHdr->dwCount++;
@@ -813,7 +859,14 @@ GDIOBJ_UnlockObj(HGDIOBJ hObj, DWORD ObjectType)
     return FALSE;
   }
 
+#if 0
   ExReleaseFastMutex(&ObjHdr->Lock);
+#else
+  if (InterlockedDecrement(&ObjHdr->LockCount) == 0)
+    {
+      InterlockedExchange(&ObjHdr->LockTid, 0);
+    }
+#endif
 
   ExAcquireFastMutex(&RefCountHandling);
   if (0 == (ObjHdr->dwCount & ~0x80000000))

From 31456c578a2674189dfb26641721eddd5ef2c3c2 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sun, 4 Jul 2004 02:01:02 +0000
Subject: [PATCH 187/356] - Don't continue execution if there is no exception
 handler. It's common that continuing such execution would result in the same
 exception again and thus creating infinite loop.

svn path=/trunk/; revision=9990
---
 reactos/lib/rtl/i386/exception.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/reactos/lib/rtl/i386/exception.c b/reactos/lib/rtl/i386/exception.c
index ea80bc90a4a..961b1376c5d 100644
--- a/reactos/lib/rtl/i386/exception.c
+++ b/reactos/lib/rtl/i386/exception.c
@@ -1,4 +1,4 @@
-/* $Id: exception.c,v 1.1 2004/06/25 01:41:20 hyperion Exp $
+/* $Id: exception.c,v 1.2 2004/07/04 02:01:02 navaraf Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -231,6 +231,8 @@ RtlpDispatchException(IN PEXCEPTION_RECORD  ExceptionRecord,
 
   DPRINT("RtlpDispatchException(): Return ExceptionContinueExecution\n");
 
+  ExceptionRecord->ExceptionFlags = EXCEPTION_NONCONTINUABLE;
+
   return ExceptionContinueExecution;  
 }
 

From 62a8ad0e874643e8d11bc1f44e86945fd4049355 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Sun, 4 Jul 2004 06:56:41 +0000
Subject: [PATCH 188/356] Mike McCormack <mike@codeweavers.com> - Fix a buffer
 overrun in autocomplete.

svn path=/trunk/; revision=9991
---
 reactos/lib/shell32/autocomplete.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reactos/lib/shell32/autocomplete.c b/reactos/lib/shell32/autocomplete.c
index 50460c4bec9..ebc2bfcc304 100644
--- a/reactos/lib/shell32/autocomplete.c
+++ b/reactos/lib/shell32/autocomplete.c
@@ -562,7 +562,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam,
 
 	    HeapFree(GetProcessHeap(), 0, This->txtbackup);
 	    This->txtbackup = (WCHAR*) HeapAlloc(GetProcessHeap(),
-						 HEAP_ZERO_MEMORY, lstrlenW(hwndText)*sizeof(WCHAR));							      
+						 HEAP_ZERO_MEMORY, (lstrlenW(hwndText)+1)*sizeof(WCHAR));							      
 	    lstrcpyW(This->txtbackup, hwndText);
 
 	    /* Returns if there is no text to search and we doesn't want to display all the entries */

From 5c7b116b2889a13c60f4d3ff50f882df6bf48953 Mon Sep 17 00:00:00 2001
From: Hartmut Birr <osexpert@googlemail.com>
Date: Sun, 4 Jul 2004 08:30:28 +0000
Subject: [PATCH 189/356] - Fixed a bug in IoCsqRemoveIrp and
 IoCsqRemoveNextIrp.

svn path=/trunk/; revision=9992
---
 reactos/drivers/lib/csq/csq.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/reactos/drivers/lib/csq/csq.c b/reactos/drivers/lib/csq/csq.c
index 1b656724460..ebf66624ff4 100644
--- a/reactos/drivers/lib/csq/csq.c
+++ b/reactos/drivers/lib/csq/csq.c
@@ -23,6 +23,8 @@
  * all happen at DISPATCH_LEVEL all of the time, so thread switching on a single
  * processor can create races too.
  */
+/* $Id: csq.c,v 1.4 2004/07/04 08:30:28 hbirr Exp $ */
+
 #define __NTDRIVER__
 #include <ddk/ntddk.h>
 #include <ddk/csq.h>
@@ -321,7 +323,7 @@ PIRP NTAPI IoCsqRemoveIrp(PIO_CSQ Csq,
 			/* This IRP is valid and is ours.  Dequeue it, fix it up, and return */
 			Csq->CsqRemoveIrp(Csq, Irp);
 
-			Context = (PIO_CSQ_IRP_CONTEXT)InterlockedExchange(Irp->Tail.Overlay.DriverContext[3], 0);
+			Context = (PIO_CSQ_IRP_CONTEXT)InterlockedExchangePointer(&Irp->Tail.Overlay.DriverContext[3], NULL);
 
 			if(Context && Context->Type == IO_TYPE_CSQ_IRP_CONTEXT)
 				Context->Irp = NULL;
@@ -371,7 +373,7 @@ PIRP NTAPI IoCsqRemoveNextIrp(PIO_CSQ Csq,
 			Csq->CsqRemoveIrp(Csq, Irp);
 
 			/* Unset the context stuff and return */
-			Context = (PIO_CSQ_IRP_CONTEXT)InterlockedExchange(Irp->Tail.Overlay.DriverContext[3], 0);
+			Context = (PIO_CSQ_IRP_CONTEXT)InterlockedExchangePointer(&Irp->Tail.Overlay.DriverContext[3], NULL);
 
 			if(Context && Context->Type == IO_TYPE_CSQ_IRP_CONTEXT)
 				Context->Irp = NULL;

From 390647c9fb30bf834890a8e048bd434d882e5aaa Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sun, 4 Jul 2004 11:18:56 +0000
Subject: [PATCH 190/356] - Send the cursor to display driver in top-down
 format.

svn path=/trunk/; revision=9993
---
 reactos/subsys/win32k/objects/cursoricon.c | 28 ++++++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/reactos/subsys/win32k/objects/cursoricon.c b/reactos/subsys/win32k/objects/cursoricon.c
index 3acd970ed80..ddbc4f56631 100644
--- a/reactos/subsys/win32k/objects/cursoricon.c
+++ b/reactos/subsys/win32k/objects/cursoricon.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: cursoricon.c,v 1.60 2004/07/04 01:23:32 navaraf Exp $ */
+/* $Id: cursoricon.c,v 1.61 2004/07/04 11:18:56 navaraf Exp $ */
 #include <w32k.h>
 
 PCURICON_OBJECT FASTCALL
@@ -47,6 +47,7 @@ IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor,
    PCURICON_OBJECT OldCursor;
    HCURSOR Ret = (HCURSOR)0;
    HBITMAP hColor = (HBITMAP)0;
+   HBITMAP hMask = 0;
    SURFOBJ *soMask = NULL, *soColor = NULL;
    XLATEOBJ *XlateObj = NULL;
    RECTL PointerRect;
@@ -148,7 +149,23 @@ IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor,
           MaskBmpObj = BITMAPOBJ_LockBitmap(NewCursor->IconInfo.hbmMask);
           if(MaskBmpObj)
           {
-            soMask = &MaskBmpObj->SurfObj;
+            RECTL DestRect = {0, 0, MaskBmpObj->SurfObj.sizlBitmap.cx, MaskBmpObj->SurfObj.sizlBitmap.cy};
+            POINTL SourcePoint = {0, 0};
+
+            /*
+             * NOTE: For now we create the cursor in top-down bitmap,
+             * because VMware driver rejects it otherwise. This should
+             * be fixed later.
+             */
+            hMask = EngCreateBitmap(
+              MaskBmpObj->SurfObj.sizlBitmap, abs(MaskBmpObj->SurfObj.lDelta),
+              MaskBmpObj->SurfObj.iBitmapFormat, BMF_TOPDOWN,
+              NULL);
+            ASSERT(hMask);
+            soMask = EngLockSurface((HSURF)hMask);
+            EngCopyBits(soMask, &MaskBmpObj->SurfObj, NULL, NULL,
+              &DestRect, &SourcePoint);
+            BITMAPOBJ_UnlockBitmap(NewCursor->IconInfo.hbmMask);
           }
         }
       }
@@ -172,7 +189,7 @@ IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor,
                                                         CurInfo->y, 
                                                         &PointerRect,
                                                         SPS_CHANGE);
-      DbgPrint("SetCursor: DrvSetPointerShape() returned %x\n",
+      DPRINT("SetCursor: DrvSetPointerShape() returned %x\n",
          GDIDEV(SurfObj)->PointerStatus);
     }
     else
@@ -200,9 +217,10 @@ IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor,
     SetPointerRect(CurInfo, &PointerRect);
     
     BITMAPOBJ_UnlockBitmap(SurfObj->hsurf);
-    if(MaskBmpObj)
+    if(hMask)
     {
-      BITMAPOBJ_UnlockBitmap(soMask->hsurf);
+      EngUnlockSurface(soMask);
+      EngDeleteSurface((HSURF)hMask);
     }
     if(hColor)
     {

From 78ae71475473938da16e8bbfe9c858e48e858710 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sun, 4 Jul 2004 12:00:40 +0000
Subject: [PATCH 191/356] - Fix GDI object locking broken by this patch:
 http://reactos.com:8080/archives/public/ros-cvs/2004-July/004334.html

svn path=/trunk/; revision=9994
---
 reactos/include/win32k/gdiobj.h        |  8 ++-
 reactos/subsys/win32k/objects/gdiobj.c | 70 +++++++++++++++++---------
 2 files changed, 54 insertions(+), 24 deletions(-)

diff --git a/reactos/include/win32k/gdiobj.h b/reactos/include/win32k/gdiobj.h
index 801b50eb021..b29164e1ce9 100644
--- a/reactos/include/win32k/gdiobj.h
+++ b/reactos/include/win32k/gdiobj.h
@@ -37,6 +37,8 @@ typedef PVOID PGDIOBJ;
 
 typedef BOOL (FASTCALL *GDICLEANUPPROC)(PGDIOBJ Obj);
 
+#define GDIOBJ_USE_FASTMUTEX
+
 /*!
  * GDI object header. This is a part of any GDI object
 */
@@ -49,9 +51,13 @@ typedef struct _GDIOBJHDR
   WORD Magic;
   const char* lockfile;
   int lockline;
-/*  FAST_MUTEX Lock;*/
+#ifdef GDIOBJ_USE_FASTMUTEX
+  FAST_MUTEX Lock;
+  DWORD RecursiveLockCount;
+#else
   DWORD LockTid;
   DWORD LockCount;
+#endif
 } GDIOBJHDR, *PGDIOBJHDR;
 
 typedef struct _GDIMULTILOCK
diff --git a/reactos/subsys/win32k/objects/gdiobj.c b/reactos/subsys/win32k/objects/gdiobj.c
index a26e967ddec..58fc7fa6b2f 100644
--- a/reactos/subsys/win32k/objects/gdiobj.c
+++ b/reactos/subsys/win32k/objects/gdiobj.c
@@ -19,7 +19,7 @@
 /*
  * GDIOBJ.C - GDI object manipulation routines
  *
- * $Id: gdiobj.c,v 1.70 2004/07/04 01:23:32 navaraf Exp $
+ * $Id: gdiobj.c,v 1.71 2004/07/04 12:00:40 navaraf Exp $
  *
  */
 #include <w32k.h>
@@ -345,8 +345,9 @@ GDIOBJ_AllocObj(WORD Size, DWORD ObjectType, GDICLEANUPPROC CleanupProc)
   newObject->Magic = GDI_TYPE_TO_MAGIC(ObjectType);
   newObject->lockfile = NULL;
   newObject->lockline = 0;
-#if 0
+#ifdef GDIOBJ_USE_FASTMUTEX
   ExInitializeFastMutex(&newObject->Lock);
+  newObject->RecursiveLockCount = 0;
 #else
   newObject->LockTid = 0;
   newObject->LockCount = 0;
@@ -684,6 +685,9 @@ PGDIOBJ FASTCALL
 GDIOBJ_LockObjDbg (const char* file, int line, HGDIOBJ hObj, DWORD ObjectType)
 {
   PGDIOBJHDR ObjHdr = GDIOBJ_iGetObjectForIndex(GDI_HANDLE_GET_INDEX(hObj));
+#ifndef GDIOBJ_USE_FASTMUTEX
+  DWORD CurrentTid = (DWORD)PsGetCurrentThreadId();
+#endif
 
   DPRINT("(%s:%i) GDIOBJ_LockObjDbg(0x%08x,0x%08x)\n", file, line, hObj, ObjectType);
   if (! GDI_VALID_OBJECT(hObj, ObjHdr, ObjectType, GDIOBJFLAG_DEFAULT))
@@ -712,24 +716,32 @@ GDIOBJ_LockObjDbg (const char* file, int line, HGDIOBJ hObj, DWORD ObjectType)
       return NULL;
     }
 
-#if 0
-#ifdef NDEBUG
-  ExAcquireFastMutex(&ObjHdr->Lock);
-#else /* NDEBUG */
-  if (! ExTryToAcquireFastMutex(&ObjHdr->Lock))
+#ifdef GDIOBJ_USE_FASTMUTEX
+  if (ObjHdr->Lock.Owner == KeGetCurrentThread())
     {
-      DPRINT1("Caution! GDIOBJ_LockObj trying to lock object 0x%x second time\n", hObj);
-      DPRINT1("  called from: %s:%i (thread %x)\n", file, line, KeGetCurrentThread());
-      if (NULL != ObjHdr->lockfile)
-        {
-          DPRINT1("  previously locked from: %s:%i (thread %x)\n", ObjHdr->lockfile, ObjHdr->lockline, ObjHdr->Lock.Owner);
-        }
-      ExAcquireFastMutex(&ObjHdr->Lock);
-      DPRINT1("  Disregard previous message about object 0x%x, it's ok\n", hObj);
+      ObjHdr->RecursiveLockCount++;
     }
+  else
+    {
+#ifdef NDEBUG    
+      ExAcquireFastMutex(&ObjHdr->Lock);
+#else /* NDEBUG */
+      if (! ExTryToAcquireFastMutex(&ObjHdr->Lock))
+        {
+          DPRINT1("Caution! GDIOBJ_LockObj trying to lock object 0x%x second time\n", hObj);
+          DPRINT1("  called from: %s:%i (thread %x)\n", file, line, KeGetCurrentThread());
+          if (NULL != ObjHdr->lockfile)
+            {
+              DPRINT1("  previously locked from: %s:%i (thread %x)\n", ObjHdr->lockfile, ObjHdr->lockline, ObjHdr->Lock.Owner);
+            }
+          ExAcquireFastMutex(&ObjHdr->Lock);
+          DPRINT1("  Disregard previous message about object 0x%x, it's ok\n", hObj);
+        }
 #endif /* NDEBUG */
+      ObjHdr->RecursiveLockCount++;
+    }
 #else
-  if (ObjHdr->LockTid == (DWORD)PsGetCurrentThreadId())
+  if (ObjHdr->LockTid == CurrentTid)
     {
       InterlockedIncrement(&ObjHdr->LockCount);
     }
@@ -737,7 +749,7 @@ GDIOBJ_LockObjDbg (const char* file, int line, HGDIOBJ hObj, DWORD ObjectType)
     {
       for (;;)
         {
-          if (InterlockedCompareExchange(&ObjHdr->LockTid, (DWORD)PsGetCurrentThreadId(), 0))
+          if (InterlockedCompareExchange(&ObjHdr->LockTid, CurrentTid, 0) == CurrentTid)
             {
               InterlockedIncrement(&ObjHdr->LockCount);
               break;
@@ -798,6 +810,9 @@ PGDIOBJ FASTCALL
 GDIOBJ_LockObj(HGDIOBJ hObj, DWORD ObjectType)
 {
   PGDIOBJHDR ObjHdr = GDIOBJ_iGetObjectForIndex(GDI_HANDLE_GET_INDEX(hObj));
+#ifndef GDIOBJ_USE_FASTMUTEX
+  DWORD CurrentTid = (DWORD)PsGetCurrentThreadId();
+#endif
 
   DPRINT("GDIOBJ_LockObj: hObj: 0x%08x, type: 0x%08x, objhdr: %x\n", hObj, ObjectType, ObjHdr);
   if (! GDI_VALID_OBJECT(hObj, ObjHdr, ObjectType, GDIOBJFLAG_DEFAULT))
@@ -807,10 +822,18 @@ GDIOBJ_LockObj(HGDIOBJ hObj, DWORD ObjectType)
       return NULL;
     }
 
-#if 0
-  ExAcquireFastMutex(&ObjHdr->Lock);
+#ifdef GDIOBJ_USE_FASTMUTEX
+  if (ObjHdr->Lock.Owner == KeGetCurrentThread())
+    {
+      ObjHdr->RecursiveLockCount++;
+    }
+  else
+    {
+      ExAcquireFastMutex(&ObjHdr->Lock);
+      ObjHdr->RecursiveLockCount++;
+    }
 #else
-  if (ObjHdr->LockTid == (DWORD)PsGetCurrentThreadId())
+  if (ObjHdr->LockTid == CurrentTid)
     {
       InterlockedIncrement(&ObjHdr->LockCount);
     }
@@ -818,7 +841,7 @@ GDIOBJ_LockObj(HGDIOBJ hObj, DWORD ObjectType)
     {
       for (;;)
         {
-          if (InterlockedCompareExchange(&ObjHdr->LockTid, (DWORD)PsGetCurrentThreadId(), 0))
+          if (InterlockedCompareExchange(&ObjHdr->LockTid, CurrentTid, 0) == CurrentTid)
             {
               InterlockedIncrement(&ObjHdr->LockCount);
               break;
@@ -859,8 +882,9 @@ GDIOBJ_UnlockObj(HGDIOBJ hObj, DWORD ObjectType)
     return FALSE;
   }
 
-#if 0
-  ExReleaseFastMutex(&ObjHdr->Lock);
+#ifdef GDIOBJ_USE_FASTMUTEX
+  if (--ObjHdr->RecursiveLockCount == 0)
+    ExReleaseFastMutex(&ObjHdr->Lock);
 #else
   if (InterlockedDecrement(&ObjHdr->LockCount) == 0)
     {

From dd643751959760e1e46c5a78220b1cdb9ecb09a4 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sun, 4 Jul 2004 17:08:40 +0000
Subject: [PATCH 192/356] - Guard against out of bounds access to
 KeyboardLayout->pusVSCtoVK in W32kKeyProcessMessage. - Fixed SetKeyState to
 correctly index the keyboard state table.

svn path=/trunk/; revision=9995
---
 reactos/subsys/win32k/ntuser/keyboard.c | 66 +++++++++++++++----------
 1 file changed, 39 insertions(+), 27 deletions(-)

diff --git a/reactos/subsys/win32k/ntuser/keyboard.c b/reactos/subsys/win32k/ntuser/keyboard.c
index d94bdcb9428..02a633e32cd 100644
--- a/reactos/subsys/win32k/ntuser/keyboard.c
+++ b/reactos/subsys/win32k/ntuser/keyboard.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: keyboard.c,v 1.29 2004/05/10 17:07:18 weiden Exp $
+/* $Id: keyboard.c,v 1.30 2004/07/04 17:08:40 navaraf Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -82,35 +82,44 @@ static UINT DontDistinguishShifts( UINT ret ) {
 }
 
 static VOID STDCALL SetKeyState(DWORD key, DWORD vk, DWORD ext, BOOL down) {
+  ASSERT(vk <= 0xff);
+
   /* Special handling for toggles like numpad and caps lock */
-
-  if (vk == VK_CAPITAL || vk == VK_NUMLOCK) 
-    {
-      if (down) QueueKeyStateTable[key] ^= 1;
-    } 
-
-  if (vk == VK_LSHIFT && ext) {
-      SetKeyState(VK_RSHIFT, 0, 0, down);
-  } else if (vk == VK_LSHIFT || vk == VK_SHIFT) {
-      SetKeyState(VK_LSHIFT, 0, 0, down);
-  }
-
-  if (vk == VK_LCONTROL && ext) {
-      SetKeyState(VK_RCONTROL, 0, 0, down);
-  } else if (vk == VK_LCONTROL || vk == VK_CONTROL) {
-      SetKeyState(VK_LCONTROL, 0, 0, down);
-  }
-
-  if (vk == VK_LMENU && ext) {
-      SetKeyState(VK_RMENU, 0, 0, down);
-  } else if (vk == VK_LMENU || vk == VK_MENU) {
-      SetKeyState(VK_LMENU, 0, 0, down);
-  }
+  if (vk == VK_CAPITAL || vk == VK_NUMLOCK) {
+    if (down) QueueKeyStateTable[vk] ^= KS_LOCK_BIT;
+  } 
 
   if (down)
-    QueueKeyStateTable[key] |= KS_DOWN_BIT;
+    QueueKeyStateTable[vk] |= KS_DOWN_BIT;
   else
-    QueueKeyStateTable[key] &= ~KS_DOWN_MASK;
+    QueueKeyStateTable[vk] &= ~KS_DOWN_MASK;
+
+  if (vk == VK_LSHIFT || vk == VK_RSHIFT) {
+    if ((QueueKeyStateTable[VK_LSHIFT] & KS_DOWN_BIT) ||
+        (QueueKeyStateTable[VK_RSHIFT] & KS_DOWN_BIT)) {
+      QueueKeyStateTable[VK_SHIFT] |= KS_DOWN_BIT;
+    } else {
+      QueueKeyStateTable[VK_SHIFT] &= ~KS_DOWN_MASK;
+    }
+  }
+
+  if (vk == VK_LCONTROL || vk == VK_RCONTROL) {
+    if ((QueueKeyStateTable[VK_LCONTROL] & KS_DOWN_BIT) ||
+        (QueueKeyStateTable[VK_RCONTROL] & KS_DOWN_BIT)) {
+      QueueKeyStateTable[VK_CONTROL] |= KS_DOWN_BIT;
+    } else {
+      QueueKeyStateTable[VK_CONTROL] &= ~KS_DOWN_MASK;
+    }
+  }
+
+  if (vk == VK_LMENU || vk == VK_RMENU) {
+    if ((QueueKeyStateTable[VK_LMENU] & KS_DOWN_BIT) ||
+        (QueueKeyStateTable[VK_RMENU] & KS_DOWN_BIT)) {
+      QueueKeyStateTable[VK_MENU] |= KS_DOWN_BIT;
+    } else {
+      QueueKeyStateTable[VK_MENU] &= ~KS_DOWN_MASK;
+    }
+  }
 }
 
 VOID DumpKeyState( PBYTE KeyState ) {
@@ -965,7 +974,10 @@ VOID FASTCALL W32kKeyProcessMessage(LPMSG Msg, PKBDTABLES KeyboardLayout) {
   ScanCode = (Msg->lParam >> 16) & 0xff;
   BaseMapping = Msg->wParam = 
     IntMapVirtualKeyEx( ScanCode, 1, KeyboardLayout );
-  RawVk = KeyboardLayout->pusVSCtoVK[ScanCode];
+  if( ScanCode >= KeyboardLayout->bMaxVSCtoVK )
+    RawVk = 0;
+  else
+    RawVk = KeyboardLayout->pusVSCtoVK[ScanCode];
 
   if ((ModifierBits & NUMLOCK_BIT) && 
       !(ModifierBits & GetShiftBit(KeyboardLayout, VK_SHIFT)) && 

From 91008697a8339ac1f769401aa64a861293b26c1f Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sun, 4 Jul 2004 17:09:45 +0000
Subject: [PATCH 193/356] - Use absolute value of the color difference when
 calculating color match rating.

svn path=/trunk/; revision=9996
---
 reactos/subsys/win32k/eng/xlate.c     | 8 ++++----
 reactos/subsys/win32k/objects/color.c | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/reactos/subsys/win32k/eng/xlate.c b/reactos/subsys/win32k/eng/xlate.c
index 43d4eff8408..8ff75a93b31 100644
--- a/reactos/subsys/win32k/eng/xlate.c
+++ b/reactos/subsys/win32k/eng/xlate.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: xlate.c,v 1.39 2004/07/03 13:55:35 navaraf Exp $
+/* $Id: xlate.c,v 1.40 2004/07/04 17:09:45 navaraf Exp $
  * 
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -64,11 +64,11 @@ ClosestColorMatch(XLATEGDI *XlateGDI, LPPALETTEENTRY SourceColor,
 
    for (CurrentIndex = 0; CurrentIndex < NumColors; CurrentIndex++)
    {
-      cxRed = (SourceRed - DestColors[CurrentIndex].peRed);
+      cxRed = abs((SHORT)SourceRed - (SHORT)DestColors[CurrentIndex].peRed);
       cxRed *= cxRed;
-      cxGreen = (SourceGreen - DestColors[CurrentIndex].peGreen);
+      cxGreen = abs((SHORT)SourceGreen - (SHORT)DestColors[CurrentIndex].peGreen);
       cxGreen *= cxGreen;
-      cxBlue = (SourceBlue - DestColors[CurrentIndex].peBlue);
+      cxBlue = abs((SHORT)SourceBlue - (SHORT)DestColors[CurrentIndex].peBlue);
       cxBlue *= cxBlue;
 
       Rating = cxRed + cxGreen + cxBlue;
diff --git a/reactos/subsys/win32k/objects/color.c b/reactos/subsys/win32k/objects/color.c
index 0d55a75e9f8..bd4010937e1 100644
--- a/reactos/subsys/win32k/objects/color.c
+++ b/reactos/subsys/win32k/objects/color.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: color.c,v 1.48 2004/07/03 17:40:27 navaraf Exp $ */
+/* $Id: color.c,v 1.49 2004/07/04 17:09:45 navaraf Exp $ */
 #include <w32k.h>
 
 // FIXME: Use PXLATEOBJ logicalToSystem instead of int *mapping
@@ -550,9 +550,9 @@ INT STDCALL COLOR_PaletteLookupPixel(PALETTEENTRY *palPalEntry, INT size,
       continue;
 #endif
 
-    r = palPalEntry[i].peRed - GetRValue(col);
-    g = palPalEntry[i].peGreen - GetGValue(col);
-    b = palPalEntry[i].peBlue - GetBValue(col);
+    r = abs((SHORT)palPalEntry[i].peRed - GetRValue(col));
+    g = abs((SHORT)palPalEntry[i].peGreen - GetGValue(col));
+    b = abs((SHORT)palPalEntry[i].peBlue - GetBValue(col));
 
     r = r*r + g*g + b*b;
 

From 907bf3c0a8112164ea04a11f3c31d30f5fc9fb93 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sun, 4 Jul 2004 17:22:33 +0000
Subject: [PATCH 194/356] - Fixed NumLock, CapsLock and ScrollLock handling in
 ConioGetShiftState.

svn path=/trunk/; revision=9997
---
 reactos/subsys/csrss/win32csr/conio.c | 30 +++++++--------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/reactos/subsys/csrss/win32csr/conio.c b/reactos/subsys/csrss/win32csr/conio.c
index fe7c91b9fc1..70df7e10f9c 100644
--- a/reactos/subsys/csrss/win32csr/conio.c
+++ b/reactos/subsys/csrss/win32csr/conio.c
@@ -1,4 +1,4 @@
-/* $Id: conio.c,v 1.10 2004/04/09 20:03:16 navaraf Exp $
+/* $Id: conio.c,v 1.11 2004/07/04 17:22:33 navaraf Exp $
  *
  * reactos/subsys/csrss/win32csr/conio.c
  *
@@ -1125,32 +1125,18 @@ ConioProcessChar(PCSRSS_CONSOLE Console,
 STATIC DWORD FASTCALL
 ConioGetShiftState(PBYTE KeyState)
 {
-  int i;
   DWORD ssOut = 0;
 
-  for (i = 0; i < 0x100; i++)
-    {
-      if (0 != (KeyState[i] & 0x80))
-        {
-          UINT vk = MapVirtualKeyExW(i, 3, 0) & 0xff;
-          switch(vk)
-            {
-              case VK_CAPITAL:
-                ssOut |= CAPSLOCK_ON;
-                break;
+  if (KeyState[VK_CAPITAL] & 1)
+      ssOut |= CAPSLOCK_ON;
 
-              case VK_NUMLOCK:
-                ssOut |= NUMLOCK_ON;
-                break;
+  if (KeyState[VK_NUMLOCK] & 1)
+      ssOut |= NUMLOCK_ON;
 
-              case VK_SCROLL:
-                ssOut |= SCROLLLOCK_ON;
-                break;
-            }
-        }
-    }
+  if (KeyState[VK_SCROLL] & 1)
+      ssOut |= SCROLLLOCK_ON;
 
-  if (KeyState[VK_LSHIFT] & 0x80 || KeyState[VK_RSHIFT] & 0x80)
+  if (KeyState[VK_SHIFT] & 0x80)
       ssOut |= SHIFT_PRESSED;
 
   if (KeyState[VK_LCONTROL] & 0x80)

From 52f4f6acefd8d027447a9f489817472e2c3ace59 Mon Sep 17 00:00:00 2001
From: Jason Filby <jason.filby@gmail.com>
Date: Sun, 4 Jul 2004 18:11:49 +0000
Subject: [PATCH 195/356] lstrcpy and lstrcat should return NULL if the string
 to copy to is NULL instead of crashing; verified by a test app on Windows XP

svn path=/trunk/; revision=9998
---
 reactos/lib/kernel32/string/lstring.c | 50 +++++++++++++++++++++------
 1 file changed, 40 insertions(+), 10 deletions(-)

diff --git a/reactos/lib/kernel32/string/lstring.c b/reactos/lib/kernel32/string/lstring.c
index c72c1dc9298..67890fcd129 100644
--- a/reactos/lib/kernel32/string/lstring.c
+++ b/reactos/lib/kernel32/string/lstring.c
@@ -21,7 +21,7 @@ lstrcmpA(
 	 LPCSTR lpString2
 	 )
 {
-	return strcmp(lpString1,lpString2);
+  return strcmp(lpString1,lpString2);
 }
 
 
@@ -35,7 +35,7 @@ lstrcmpiA(
 	  LPCSTR lpString2
 	  )
 {
-        return _stricmp(lpString1,lpString2); 
+  return _stricmp(lpString1,lpString2); 
 }
 
 
@@ -54,6 +54,11 @@ lstrcpynA(
      lpString1 with NUL bytes while lstrcpynA doesn't. Also lstrcpynA
      guarantees NUL termination while strncpy doesn't */
 
+  if (lpString1 == NULL)
+  {
+    return NULL;
+  }
+
   if (1 < iMaxLength)
     {
       char *d = lpString1;
@@ -89,7 +94,12 @@ lstrcpyA(
 	 LPCSTR lpString2
 	 )
 {
-	return strcpy(lpString1,lpString2);
+  if (lpString1 == NULL)
+  {
+    return NULL;
+  }
+
+  return strcpy(lpString1,lpString2);
 }
 
 
@@ -103,7 +113,12 @@ lstrcatA(
 	 LPCSTR lpString2
 	 )
 {
-	return strcat(lpString1,lpString2);
+  if (lpString1 == NULL)
+  {
+    return NULL;
+  }
+
+  return strcat(lpString1,lpString2);
 }
 
 
@@ -116,7 +131,7 @@ lstrlenA(
 	 LPCSTR lpString
 	 )
 {
-	return strlen(lpString);
+  return strlen(lpString);
 }
 
 
@@ -130,7 +145,7 @@ lstrcmpW(
 	 LPCWSTR lpString2
 	 )
 {
-	return wcscmp(lpString1,lpString2);
+  return wcscmp(lpString1,lpString2);
 }
 
 
@@ -144,7 +159,7 @@ lstrcmpiW(
     LPCWSTR lpString2
     )
 {
-        return _wcsicmp(lpString1,lpString2);
+  return _wcsicmp(lpString1,lpString2);
 }
 
 
@@ -163,6 +178,11 @@ lstrcpynW(
      lpString1 with NUL bytes while lstrcpynW doesn't Also lstrcpynW
      guarantees NUL termination while wcsncpy doesn't */
 
+  if (lpString1 == NULL)
+  {
+    return NULL;
+  }
+
   if (1 < iMaxLength)
     {
       WCHAR *d = lpString1;
@@ -198,7 +218,12 @@ lstrcpyW(
     LPCWSTR lpString2
     )
 {
-	return wcscpy(lpString1,lpString2);	
+  if (lpString1 == NULL)
+  {
+    return NULL;
+  }
+
+  return wcscpy(lpString1,lpString2);	
 }
 
 
@@ -212,7 +237,12 @@ lstrcatW(
     LPCWSTR lpString2
     )
 {
-	return wcscat(lpString1,lpString2);
+  if (lpString1 == NULL)
+  {
+    return NULL;
+  }
+
+  return wcscat(lpString1,lpString2);
 }
 
 
@@ -225,5 +255,5 @@ lstrlenW(
     LPCWSTR lpString
     )
 {
-	return wcslen(lpString);
+  return wcslen(lpString);
 }

From fac1d981b14b93f474d1f2cead8799b31c91e8dd Mon Sep 17 00:00:00 2001
From: Hartmut Birr <osexpert@googlemail.com>
Date: Mon, 5 Jul 2004 21:39:02 +0000
Subject: [PATCH 196/356] - Removed the using of the media change count to
 recognize a median change.

svn path=/trunk/; revision=9999
---
 reactos/drivers/fs/vfat/create.c | 42 ++++++++++++++------------------
 reactos/drivers/fs/vfat/fsctl.c  | 28 ++++-----------------
 reactos/drivers/fs/vfat/vfat.h   |  5 +---
 3 files changed, 24 insertions(+), 51 deletions(-)

diff --git a/reactos/drivers/fs/vfat/create.c b/reactos/drivers/fs/vfat/create.c
index 00843c284da..433a516891c 100644
--- a/reactos/drivers/fs/vfat/create.c
+++ b/reactos/drivers/fs/vfat/create.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: create.c,v 1.69 2004/07/03 17:31:30 hbirr Exp $
+/* $Id: create.c,v 1.70 2004/07/05 21:39:02 hbirr Exp $
  *
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/fs/vfat/create.c
@@ -178,7 +178,7 @@ FindFile (PDEVICE_EXTENSION DeviceExt,
   PVOID Page;
   PVFATFCB rcFcb;
   BOOLEAN FoundLong;
-  BOOLEAN FoundShort;
+  BOOLEAN FoundShort = FALSE;
   UNICODE_STRING PathNameU;
   BOOLEAN WildCard;
   PWCHAR curr, last;
@@ -339,8 +339,7 @@ VfatOpenFile (PDEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject,
   PVFATFCB ParentFcb;
   PVFATFCB Fcb;
   NTSTATUS Status;
-  ULONG Size;
-  ULONG MediaChangeCount;
+
 
 //  PDEVICE_OBJECT DeviceObject = DeviceExt->StorageDevice->Vpb->DeviceObject;
   
@@ -373,39 +372,34 @@ VfatOpenFile (PDEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject,
 
   if (!DeviceExt->FatInfo.FixedMedia)
     {
-      Size = sizeof(ULONG);
       Status = VfatBlockDeviceIoControl (DeviceExt->StorageDevice,
 					 IOCTL_DISK_CHECK_VERIFY,
 					 NULL,
 					 0,
-					 &MediaChangeCount,
-					 &Size,
+					 NULL,
+					 0,
 					 FALSE);
 
-      if (Status == STATUS_VERIFY_REQUIRED || MediaChangeCount != DeviceExt->MediaChangeCount)
+      if (Status == STATUS_VERIFY_REQUIRED) 
+
         {
           PDEVICE_OBJECT DeviceToVerify;
 
           DPRINT ("Media change detected!\n");
           DPRINT ("Device %p\n", DeviceExt->StorageDevice);
 
-          DeviceToVerify = IoGetDeviceToVerify (PsGetCurrentThread ());
-          IoSetDeviceToVerify (PsGetCurrentThread (),
+	  DeviceToVerify = IoGetDeviceToVerify (PsGetCurrentThread ());
+	  
+	  IoSetDeviceToVerify (PsGetCurrentThread (),
 			       NULL);
-
-          Status = IoVerifyVolume (DeviceToVerify,
-			          FALSE);
-          if (!NT_SUCCESS(Status))
-	    {
-	      DPRINT ("Status %lx\n", Status);
-	      return Status;
-	    }
-        }
-      else if (!NT_SUCCESS(Status))
-        {
-          DPRINT ("Status %lx\n", Status);
-          return Status;
-        }
+          Status = IoVerifyVolume (DeviceExt->StorageDevice,
+			           FALSE);
+	}
+      if (!NT_SUCCESS(Status))
+	{
+	  DPRINT ("Status %lx\n", Status);
+	  return Status;
+	}
     }
 
 
diff --git a/reactos/drivers/fs/vfat/fsctl.c b/reactos/drivers/fs/vfat/fsctl.c
index 890595b35f9..f179d268afc 100644
--- a/reactos/drivers/fs/vfat/fsctl.c
+++ b/reactos/drivers/fs/vfat/fsctl.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: fsctl.c,v 1.32 2004/06/23 20:23:59 hbirr Exp $
+/* $Id: fsctl.c,v 1.33 2004/07/05 21:39:02 hbirr Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -275,7 +275,6 @@ VfatMountDevice(PDEVICE_EXTENSION DeviceExt,
 {
    NTSTATUS Status;
    BOOLEAN RecognizedFS;
-   ULONG Size;
 
    DPRINT("Mounting VFAT device...\n");
 
@@ -286,21 +285,6 @@ VfatMountDevice(PDEVICE_EXTENSION DeviceExt,
    }
    DPRINT("MountVfatdev %d, PAGE_SIZE = %d\n", DeviceExt->FatInfo.BytesPerCluster, PAGE_SIZE);
 
-   if (!DeviceExt->FatInfo.FixedMedia)
-     {
-       Size = sizeof(ULONG);
-       Status = VfatBlockDeviceIoControl (DeviceToMount,
-					  IOCTL_DISK_CHECK_VERIFY,
-					  NULL,
-					  0,
-					  &DeviceExt->MediaChangeCount,
-					  &Size,
-					  FALSE);
-       if (!NT_SUCCESS(Status))
-         {
-	   return Status;
-	 }
-     }
 
    return(STATUS_SUCCESS);
 }
@@ -498,20 +482,19 @@ VfatVerify (PVFAT_IRP_CONTEXT IrpContext)
   NTSTATUS Status = STATUS_SUCCESS;
   FATINFO FatInfo;
   BOOLEAN RecognizedFS;
-  ULONG Size;
   PDEVICE_EXTENSION DeviceExt = IrpContext->DeviceExt;
 
   DPRINT("VfatVerify(IrpContext %x)\n", IrpContext);
 
   DeviceToVerify = IrpContext->Stack->Parameters.VerifyVolume.DeviceObject;
-  Size = sizeof(ULONG);
   Status = VfatBlockDeviceIoControl(DeviceToVerify,
 				    IOCTL_DISK_CHECK_VERIFY,
 				    NULL,
 				    0,
-				    &DeviceExt->MediaChangeCount,
-				    &Size,
-				    FALSE);
+				    NULL,
+				    0,
+				    TRUE);
+  DeviceToVerify->Flags &= ~DO_VERIFY_VOLUME;
   if (!NT_SUCCESS(Status) && Status != STATUS_VERIFY_REQUIRED)
     {
       DPRINT("VfatBlockDeviceIoControl() failed (Status %lx)\n", Status);
@@ -533,7 +516,6 @@ VfatVerify (PVFAT_IRP_CONTEXT IrpContext)
 	   *   Each write to the root directory must update this crc sum.
            */
   
-          DeviceToVerify->Flags &= ~DO_VERIFY_VOLUME;
         }
       else
       	{
diff --git a/reactos/drivers/fs/vfat/vfat.h b/reactos/drivers/fs/vfat/vfat.h
index 0eb9b0d53a4..56c2f151104 100644
--- a/reactos/drivers/fs/vfat/vfat.h
+++ b/reactos/drivers/fs/vfat/vfat.h
@@ -1,4 +1,4 @@
-/* $Id: vfat.h,v 1.64 2004/06/23 20:23:59 hbirr Exp $ */
+/* $Id: vfat.h,v 1.65 2004/07/05 21:39:02 hbirr Exp $ */
 
 #include <ddk/ntifs.h>
 
@@ -163,9 +163,6 @@ typedef struct
   struct _VFATFCB * VolumeFcb;
 
   LIST_ENTRY VolumeListEntry;
-
-  ULONG MediaChangeCount;
-
 } DEVICE_EXTENSION, *PDEVICE_EXTENSION, VCB, *PVCB;
 
 typedef struct

From 405e3b3822e0978e012ef6403b982555e143ab36 Mon Sep 17 00:00:00 2001
From: Hartmut Birr <osexpert@googlemail.com>
Date: Mon, 5 Jul 2004 21:42:05 +0000
Subject: [PATCH 197/356] - Removed IOCTL_DISK_CHECK_VERIFY. We must use the
 port driver to detect the current state of the drive.

svn path=/trunk/; revision=10000
---
 reactos/drivers/storage/disk/disk.c | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/reactos/drivers/storage/disk/disk.c b/reactos/drivers/storage/disk/disk.c
index 93bfdd5e991..f457bc3bbc0 100644
--- a/reactos/drivers/storage/disk/disk.c
+++ b/reactos/drivers/storage/disk/disk.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: disk.c,v 1.43 2004/07/03 17:40:21 navaraf Exp $
+/* $Id: disk.c,v 1.44 2004/07/05 21:42:05 hbirr Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -1206,25 +1206,6 @@ DiskClassDeviceControl(IN PDEVICE_OBJECT DeviceObject,
 	}
 	break;
 
-
-      case IOCTL_DISK_CHECK_VERIFY:
-          DPRINT("IOCTL_DISK_CHECK_VERIFY\n");
-          Information = 0;
-	  if (OutputLength != 0)
-	    {
-	       Irp->AssociatedIrp.SystemBuffer = (PVOID) DeviceExtension->MediaChangeCount;
-	       Information = sizeof(ULONG);
-
-	    }
-          if (DeviceObject->Flags & DO_VERIFY_VOLUME)
-            {
-               DPRINT("Do Verify Set\n");
-               Status = STATUS_VERIFY_REQUIRED;
-            }
-            else
-	       Status = STATUS_SUCCESS;
-	break;
-
       case IOCTL_DISK_VERIFY:
       case IOCTL_DISK_FORMAT_TRACKS:
       case IOCTL_DISK_PERFORMANCE:

From 1b16d86ba8df5dc2fa7207e6455dfc06558aa058 Mon Sep 17 00:00:00 2001
From: Hartmut Birr <osexpert@googlemail.com>
Date: Mon, 5 Jul 2004 21:44:27 +0000
Subject: [PATCH 198/356] - Check for a valid buffer on a call to
 IOCTL_DISK_CHECK_VERIFY.

svn path=/trunk/; revision=10001
---
 reactos/drivers/storage/floppy/ioctl.c | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/reactos/drivers/storage/floppy/ioctl.c b/reactos/drivers/storage/floppy/ioctl.c
index 7242a3311d2..a50b7ba67f0 100644
--- a/reactos/drivers/storage/floppy/ioctl.c
+++ b/reactos/drivers/storage/floppy/ioctl.c
@@ -210,9 +210,25 @@ VOID NTAPI DeviceIoctlPassive(PDRIVE_INFO DriveInfo,
 
     case IOCTL_DISK_CHECK_VERIFY:
       KdPrint(("floppy: IOCTL_DISK_CHECK_VERIFY called\n"));
-      *((PULONG)OutputBuffer) = DriveInfo->DiskChangeCount;
-      Irp->IoStatus.Status = STATUS_SUCCESS;
-      Irp->IoStatus.Information = sizeof(ULONG);
+      if (OutputLength != 0)
+        {
+	  if (OutputLength < sizeof(ULONG))
+	    {
+	      Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL;
+              Irp->IoStatus.Information = 0;
+	    }
+	  else
+	    {
+	      *((PULONG)OutputBuffer) = DriveInfo->DiskChangeCount;
+              Irp->IoStatus.Status = STATUS_SUCCESS;
+              Irp->IoStatus.Information = sizeof(ULONG);
+	    }
+	}
+      else
+        {
+          Irp->IoStatus.Status = STATUS_SUCCESS;
+          Irp->IoStatus.Information = 0;
+	}
       break;
 
     case IOCTL_DISK_GET_DRIVE_GEOMETRY:

From ad8356897959aad8aa3467b17ed6021b00b65632 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Mon, 5 Jul 2004 22:12:45 +0000
Subject: [PATCH 199/356] Patch by Jens Collin <jens.collin@lakhei.com> Fixes
 autocompletion, see bug #177

svn path=/trunk/; revision=10002
---
 reactos/subsys/system/cmd/filecomp.c | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/reactos/subsys/system/cmd/filecomp.c b/reactos/subsys/system/cmd/filecomp.c
index b79ce848756..9ed63022ac8 100644
--- a/reactos/subsys/system/cmd/filecomp.c
+++ b/reactos/subsys/system/cmd/filecomp.c
@@ -14,6 +14,10 @@
  *
  *    30-Apr-2004 (Filip Navara <xnavara@volny.cz>)
  *       Make the file listing readable when there is a lot of long names.
+ *
+
+ *    05-Jul-2004 (Jens Collin <jens.collin@lakhei.com>)
+ *       Now expands lfn even when trailing " is omitted.
  */
 
 #include "config.h"
@@ -25,7 +29,7 @@
 #include <ctype.h>
 #include <stdio.h>
 
-#include "cmd.h" 
+#include "cmd.h"
 
 
 #ifdef FEATURE_UNIX_FILENAME_COMPLETION
@@ -37,6 +41,7 @@ VOID CompleteFilename (LPTSTR str, INT charcount)
 	INT   curplace = 0;
 	INT   start;
 	INT   count;
+	INT step, c;
 	BOOL  found_dot = FALSE;
 	BOOL  perfectmatch = TRUE;
 	TCHAR path[MAX_PATH];
@@ -50,8 +55,18 @@ VOID CompleteFilename (LPTSTR str, INT charcount)
 	if (count < 0)
 		count = 0;
 
+	/* find how many '"'s there is typed already.*/
+	step = count;
+	while (step > 0)
+	{
+		if (str[step] == _T('"'))
+			c++;
+		step--;
+	}
+	/* if c is odd, then user typed " before name, else not.*/
+
 	/* find front of word */
-	if (str[count] == _T('"'))
+	if (str[count] == _T('"') || (c % 2))
 	{
 		count--;
 		while (count > 0 && str[count] != _T('"'))
@@ -256,9 +271,9 @@ BOOL ShowCompletionMatches (LPTSTR str, INT charcount)
 
 	if (curplace >= 0 && directory[curplace] == _T('"'))
 		directory[curplace--] = _T('\0');
-	
+
 	_tcscpy (path, directory);
-	
+
 	while (curplace >= 0 &&
 		   directory[curplace] != _T('\\') &&
 		   directory[curplace] != _T(':'))
@@ -312,13 +327,13 @@ BOOL ShowCompletionMatches (LPTSTR str, INT charcount)
 
 		/* Increase by the number of spaces behind file name */
 		longestfname += 3;
-		
+
 		/* find anything */
 		ConOutChar (_T('\n'));
 		do
 		{
 			/* ignore . and .. */
-			if (!_tcscmp (file.cFileName, _T(".")) || 
+			if (!_tcscmp (file.cFileName, _T(".")) ||
 				!_tcscmp (file.cFileName, _T("..")))
 				continue;
 

From f54f6b901865ec4dcd049dddd99837ac3b0328eb Mon Sep 17 00:00:00 2001
From: Royce Mitchell III <royce3@ev1.net>
Date: Mon, 5 Jul 2004 22:33:14 +0000
Subject: [PATCH 200/356] fixed typo

svn path=/trunk/; revision=10003
---
 reactos/lib/samlib/samlib.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reactos/lib/samlib/samlib.c b/reactos/lib/samlib/samlib.c
index 9f7475aea1e..e163a0c33df 100644
--- a/reactos/lib/samlib/samlib.c
+++ b/reactos/lib/samlib/samlib.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: samlib.c,v 1.2 2004/02/04 17:57:56 ekohl Exp $
+/* $Id: samlib.c,v 1.3 2004/07/05 22:33:14 royce Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS system libraries
@@ -397,7 +397,7 @@ SamCreateUser (PWSTR UserName,
 
   if (dwDisposition == REG_OPENED_EXISTING_KEY)
     {
-      DPRINT1 ("User alredy exists!\n");
+      DPRINT1 ("User already exists!\n");
       RegCloseKey (hUserKey);
       SetLastError (ERROR_USER_EXISTS);
       return FALSE;

From 37635ba8535b7110f6e093db9ec66e1c9c6c2099 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Tue, 6 Jul 2004 22:07:26 +0000
Subject: [PATCH 201/356] Make AdjustTokenPrivileges confirm to MSDN-documented
 behaviour: - return FALSE on error with appropriate LastError - return TRUE
 with LastError == ERROR_NOT_ALL_ASSIGNED if not all   privileges could be
 adjusted - return TRUE with LastError == ERROR_SUCCESS if all privileges  
 were successfully adjusted

svn path=/trunk/; revision=10004
---
 reactos/lib/advapi32/token/token.c | 12 +++++++++---
 reactos/ntoskrnl/se/token.c        | 14 +++++++-------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/reactos/lib/advapi32/token/token.c b/reactos/lib/advapi32/token/token.c
index 2d48b6d853e..97a8e191d2c 100644
--- a/reactos/lib/advapi32/token/token.c
+++ b/reactos/lib/advapi32/token/token.c
@@ -1,4 +1,4 @@
-/* $Id: token.c,v 1.10 2004/03/25 11:30:07 ekohl Exp $
+/* $Id: token.c,v 1.11 2004/07/06 22:07:25 gvg Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -61,12 +61,18 @@ AdjustTokenPrivileges (HANDLE TokenHandle,
 				    BufferLength,
 				    PreviousState,
 				    (PULONG)ReturnLength);
-  if (!NT_SUCCESS (Status))
+  if (STATUS_NOT_ALL_ASSIGNED == Status)
     {
-      SetLastError (RtlNtStatusToDosError (Status));
+      SetLastError(ERROR_NOT_ALL_ASSIGNED);
+      return TRUE;
+    }
+  if (! NT_SUCCESS(Status))
+    {
+      SetLastError(RtlNtStatusToDosError(Status));
       return FALSE;
     }
 
+  SetLastError(ERROR_SUCCESS); /* AdjustTokenPrivileges is documented to do this */
   return TRUE;
 }
 
diff --git a/reactos/ntoskrnl/se/token.c b/reactos/ntoskrnl/se/token.c
index 84363af24d0..f929bdffd76 100644
--- a/reactos/ntoskrnl/se/token.c
+++ b/reactos/ntoskrnl/se/token.c
@@ -1,4 +1,4 @@
-/* $Id: token.c,v 1.35 2004/05/18 12:23:48 ekohl Exp $
+/* $Id: token.c,v 1.36 2004/07/06 22:07:26 gvg Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -989,6 +989,7 @@ NtAdjustPrivilegesToken (IN HANDLE TokenHandle,
   ULONG i;
   ULONG j;
   ULONG k;
+  ULONG Count;
 #if 0
    ULONG a;
    ULONG b;
@@ -1059,9 +1060,11 @@ NtAdjustPrivilegesToken (IN HANDLE TokenHandle,
 	      Token->Privileges[i].Attributes &= ~SE_PRIVILEGE_ENABLED;
 	    }
 	}
+      Status = STATUS_SUCCESS;
     }
   else
     {
+      Count = 0;
       for (i = 0; i < Token->PrivilegeCount; i++)
 	{
 	  for (j = 0; j < NewState->PrivilegeCount; j++)
@@ -1094,9 +1097,11 @@ NtAdjustPrivilegesToken (IN HANDLE TokenHandle,
 		      DPRINT ("New attributes %lx\n",
 			      Token->Privileges[i].Attributes);
 		    }
+                  Count++;
 		}
 	    }
 	}
+      Status = Count < NewState->PrivilegeCount ? STATUS_NOT_ALL_ASSIGNED : STATUS_SUCCESS;
     }
 
   if (ReturnLength != NULL)
@@ -1113,12 +1118,7 @@ NtAdjustPrivilegesToken (IN HANDLE TokenHandle,
 
   DPRINT ("NtAdjustPrivilegesToken() done\n");
 
-  if (k < NewState->PrivilegeCount)
-    {
-      return STATUS_NOT_ALL_ASSIGNED;
-    }
-
-  return STATUS_SUCCESS;
+  return Status;
 }
 
 

From f3903190861958bd8977be0928a67ea506d4c110 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Tue, 6 Jul 2004 22:08:48 +0000
Subject: [PATCH 202/356] Implement LookupPrivilegeValueW for local machine

svn path=/trunk/; revision=10005
---
 reactos/lib/advapi32/sec/misc.c | 63 ++++++++++++++++++++++++++++++---
 1 file changed, 58 insertions(+), 5 deletions(-)

diff --git a/reactos/lib/advapi32/sec/misc.c b/reactos/lib/advapi32/sec/misc.c
index 88d3c9c1983..be32d2b1508 100644
--- a/reactos/lib/advapi32/sec/misc.c
+++ b/reactos/lib/advapi32/sec/misc.c
@@ -1,4 +1,4 @@
-/* $Id: misc.c,v 1.18 2004/05/27 14:50:17 weiden Exp $
+/* $Id: misc.c,v 1.19 2004/07/06 22:08:48 gvg Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -455,11 +455,64 @@ LookupPrivilegeValueA (LPCSTR lpSystemName,
  * @unimplemented
  */
 BOOL STDCALL
-LookupPrivilegeValueW (LPCWSTR lpSystemName,
-		       LPCWSTR lpName,
-		       PLUID lpLuid)
+LookupPrivilegeValueW (LPCWSTR SystemName,
+		       LPCWSTR PrivName,
+		       PLUID Luid)
 {
-  DPRINT1("LookupPrivilegeValueW: stub\n");
+  static const WCHAR * const DefaultPrivNames[] =
+    {
+      L"SeCreateTokenPrivilege",
+      L"SeAssignPrimaryTokenPrivilege",
+      L"SeLockMemoryPrivilege",
+      L"SeIncreaseQuotaPrivilege",
+      L"SeUnsolicitedInputPrivilege",
+      L"SeMachineAccountPrivilege",
+      L"SeTcbPrivilege",
+      L"SeSecurityPrivilege",
+      L"SeTakeOwnershipPrivilege",
+      L"SeLoadDriverPrivilege",
+      L"SeSystemProfilePrivilege",
+      L"SeSystemtimePrivilege",
+      L"SeProfileSingleProcessPrivilege",
+      L"SeIncreaseBasePriorityPrivilege",
+      L"SeCreatePagefilePrivilege",
+      L"SeCreatePermanentPrivilege",
+      L"SeBackupPrivilege",
+      L"SeRestorePrivilege",
+      L"SeShutdownPrivilege",
+      L"SeDebugPrivilege",
+      L"SeAuditPrivilege",
+      L"SeSystemEnvironmentPrivilege",
+      L"SeChangeNotifyPrivilege",
+      L"SeRemoteShutdownPrivilege",
+      L"SeUndockPrivilege",
+      L"SeSyncAgentPrivilege",
+      L"SeEnableDelegationPrivilege",
+      L"SeManageVolumePrivilege",
+      L"SeImpersonatePrivilege",
+      L"SeCreateGlobalPrivilege"
+    };
+  unsigned Priv;
+
+  if (NULL != SystemName && L'\0' != *SystemName)
+    {
+      DPRINT1("LookupPrivilegeValueW: not implemented for remote system\n");
+      SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+      return FALSE;
+    }
+
+  for (Priv = 0; Priv < sizeof(DefaultPrivNames) / sizeof(DefaultPrivNames[0]); Priv++)
+    {
+      if (0 == wcscmp(PrivName, DefaultPrivNames[Priv]))
+        {
+          Luid->LowPart = Priv + 1;
+          Luid->HighPart = 0;
+          return TRUE;
+        }
+    }
+
+  DPRINT1("LookupPrivilegeValueW: no such privilege %S\n", PrivName);
+  SetLastError(ERROR_NO_SUCH_PRIVILEGE);
   return FALSE;
 }
 

From 20180bf59f028a3270499c7e43d85edfdc5dd61d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Wed, 7 Jul 2004 08:39:54 +0000
Subject: [PATCH 203/356] Silence debug messages

svn path=/trunk/; revision=10006
---
 reactos/drivers/net/ndis/ndis/main.c       |  2 +-
 reactos/drivers/net/tcpip/tcpip/main.c     |  2 +-
 reactos/ntoskrnl/ps/i386/continue.c        |  6 +++---
 reactos/subsys/win32k/objects/cursoricon.c | 12 ++++++------
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/reactos/drivers/net/ndis/ndis/main.c b/reactos/drivers/net/ndis/ndis/main.c
index 53d6ebf6a99..1d00be4374d 100644
--- a/reactos/drivers/net/ndis/ndis/main.c
+++ b/reactos/drivers/net/ndis/ndis/main.c
@@ -18,7 +18,7 @@
 #ifdef DBG
 
 /* See debug.h for debug/trace constants */
-DWORD DebugTraceLevel = MIN_TRACE;
+DWORD DebugTraceLevel = 0;
 
 #endif /* DBG */
 
diff --git a/reactos/drivers/net/tcpip/tcpip/main.c b/reactos/drivers/net/tcpip/tcpip/main.c
index 4fa181cfa1c..3e906921d45 100644
--- a/reactos/drivers/net/tcpip/tcpip/main.c
+++ b/reactos/drivers/net/tcpip/tcpip/main.c
@@ -25,7 +25,7 @@
 #ifndef NDEBUG
 DWORD DebugTraceLevel = 0x7fffffff;
 #else
-DWORD DebugTraceLevel = MIN_TRACE;
+DWORD DebugTraceLevel = 0;
 #endif /* NDEBUG */
 
 PDEVICE_OBJECT TCPDeviceObject   = NULL;
diff --git a/reactos/ntoskrnl/ps/i386/continue.c b/reactos/ntoskrnl/ps/i386/continue.c
index 8e32a7c9b13..5a3136d18ef 100644
--- a/reactos/ntoskrnl/ps/i386/continue.c
+++ b/reactos/ntoskrnl/ps/i386/continue.c
@@ -1,4 +1,4 @@
-/* $Id: continue.c,v 1.2 2004/07/02 01:23:26 royce Exp $
+/* $Id: continue.c,v 1.3 2004/07/07 08:39:53 gvg Exp $
  *
  * COPYRIGHT:              See COPYING in the top level directory
  * PROJECT:                ReactOS kernel
@@ -42,10 +42,10 @@ NtContinue (
 	PKTRAP_FRAME TrapFrame = KeGetCurrentThread()->TrapFrame;
 	PKTRAP_FRAME PrevTrapFrame = (PKTRAP_FRAME)TrapFrame->Edx;
 
-	DPRINT1("NtContinue: Context: Eip=0x%x, Esp=0x%x\n", Context->Eip, Context->Esp );
+	DPRINT("NtContinue: Context: Eip=0x%x, Esp=0x%x\n", Context->Eip, Context->Esp );
 	PULONG Frame = 0;
 	__asm__("mov %%ebp, %%ebx" : "=b" (Frame) : );
-	DbgPrint ( "NtContinue(): Ebp=%x, prev/TF=%x/%x\n", Frame, Frame[0], TrapFrame );
+	DPRINT( "NtContinue(): Ebp=%x, prev/TF=%x/%x\n", Frame, Frame[0], TrapFrame );
 	KeRosDumpStackFrames(NULL,5);
 
 	if ( Context == NULL )
diff --git a/reactos/subsys/win32k/objects/cursoricon.c b/reactos/subsys/win32k/objects/cursoricon.c
index ddbc4f56631..53f04c30fe9 100644
--- a/reactos/subsys/win32k/objects/cursoricon.c
+++ b/reactos/subsys/win32k/objects/cursoricon.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: cursoricon.c,v 1.61 2004/07/04 11:18:56 navaraf Exp $ */
+/* $Id: cursoricon.c,v 1.62 2004/07/07 08:39:54 gvg Exp $ */
 #include <w32k.h>
 
 PCURICON_OBJECT FASTCALL
@@ -118,7 +118,7 @@ IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor,
       BITMAPOBJ_UnlockBitmap(NewCursor->IconInfo.hbmMask);
       if (maskBpp != 1)
       {
-         DbgPrint("SetCursor: The Mask bitmap must have 1BPP!\n");
+         DPRINT1("SetCursor: The Mask bitmap must have 1BPP!\n");
          BITMAPOBJ_UnlockBitmap(SurfObj->hsurf);
          return Ret;
       }
@@ -131,7 +131,7 @@ IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor,
         /* FIXME - Create a color pointer, only 32bit bitmap, set alpha bits!
                    Do not pass a mask bitmap to DrvSetPointerShape()!
                    Create a XLATEOBJ that describes the colors of the bitmap. */
-        DbgPrint("SetCursor: (Colored) alpha cursors are not supported!\n");
+        DPRINT1("SetCursor: (Colored) alpha cursors are not supported!\n");
       }
       else
       {
@@ -142,7 +142,7 @@ IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor,
                      Do not pass a mask bitmap to DrvSetPointerShape()!
                      Create a XLATEOBJ that describes the colors of the bitmap.
                      (16bit bitmaps are propably allowed) */
-          DbgPrint("SetCursor: Cursors with colors are not supported!\n");
+          DPRINT1("SetCursor: Cursors with colors are not supported!\n");
         }
         else
         {
@@ -232,7 +232,7 @@ IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor,
     }
     
     if(GDIDEV(SurfObj)->PointerStatus == SPS_ERROR)
-      DbgPrint("SetCursor: DrvSetPointerShape() returned SPS_ERROR\n");
+      DPRINT1("SetCursor: DrvSetPointerShape() returned SPS_ERROR\n");
   
   return Ret;
 }
@@ -1124,7 +1124,7 @@ NtUserDrawIconEx(
     IntReleaseCurIconObject(CurIconObject);
     
     if(istepIfAniCur)
-      DbgPrint("NtUserDrawIconEx: istepIfAniCur is not supported!\n");
+      DPRINT1("NtUserDrawIconEx: istepIfAniCur is not supported!\n");
     
     if(!hbmMask || !IntGdiGetObject(hbmMask, sizeof(BITMAP), &bmpMask))
       goto done;

From f79ec69b9cbec8f0e6463732b3b73d3f22761ec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Wed, 7 Jul 2004 08:41:47 +0000
Subject: [PATCH 204/356] Set default (Administrator) privileges when logging
 on

svn path=/trunk/; revision=10007
---
 reactos/lib/advapi32/misc/logon.c | 75 +++++++++++++++++++++++++------
 1 file changed, 61 insertions(+), 14 deletions(-)

diff --git a/reactos/lib/advapi32/misc/logon.c b/reactos/lib/advapi32/misc/logon.c
index 73fc8f19ae3..cfc0f6f74fa 100644
--- a/reactos/lib/advapi32/misc/logon.c
+++ b/reactos/lib/advapi32/misc/logon.c
@@ -1,4 +1,4 @@
-/* $Id: logon.c,v 1.6 2004/06/17 09:07:12 ekohl Exp $
+/* $Id: logon.c,v 1.7 2004/07/07 08:41:47 gvg Exp $
  *
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS system libraries
@@ -248,6 +248,36 @@ LogonUserW (LPWSTR lpszUsername,
 	    DWORD dwLogonProvider,
 	    PHANDLE phToken)
 {
+  /* FIXME shouldn't use hard-coded list of privileges */
+  static struct
+    {
+      LPCWSTR PrivName;
+      DWORD Attributes;
+    }
+  DefaultPrivs[] =
+    {
+      { L"SeUnsolicitedInputPrivilege", 0 },
+      { L"SeMachineAccountPrivilege", 0 },
+      { L"SeSecurityPrivilege", 0 },
+      { L"SeTakeOwnershipPrivilege", 0 },
+      { L"SeLoadDriverPrivilege", 0 },
+      { L"SeSystemProfilePrivilege", 0 },
+      { L"SeSystemtimePrivilege", 0 },
+      { L"SeProfileSingleProcessPrivilege", 0 },
+      { L"SeIncreaseBasePriorityPrivilege", 0 },
+      { L"SeCreatePagefilePrivilege", 0 },
+      { L"SeBackupPrivilege", 0 },
+      { L"SeRestorePrivilege", 0 },
+      { L"SeShutdownPrivilege", 0 },
+      { L"SeDebugPrivilege", 0 },
+      { L"SeSystemEnvironmentPrivilege", 0 },
+      { L"SeChangeNotifyPrivilege", SE_PRIVILEGE_ENABLED | SE_PRIVILEGE_ENABLED_BY_DEFAULT },
+      { L"SeRemoteShutdownPrivilege", 0 },
+      { L"SeUndockPrivilege", 0 },
+      { L"SeEnableDelegationPrivilege", 0 },
+      { L"SeImpersonatePrivilege", SE_PRIVILEGE_ENABLED | SE_PRIVILEGE_ENABLED_BY_DEFAULT },
+      { L"SeCreateGlobalPrivilege", SE_PRIVILEGE_ENABLED | SE_PRIVILEGE_ENABLED_BY_DEFAULT }
+    };
   OBJECT_ATTRIBUTES ObjectAttributes;
   SECURITY_QUALITY_OF_SERVICE Qos;
   TOKEN_USER TokenUser;
@@ -255,8 +285,7 @@ LogonUserW (LPWSTR lpszUsername,
   TOKEN_PRIMARY_GROUP TokenPrimaryGroup;
   TOKEN_GROUPS TokenGroups;
 //  PTOKEN_GROUPS TokenGroups;
-  TOKEN_PRIVILEGES TokenPrivileges;
-//  PTOKEN_PRIVILEGES TokenPrivileges;
+  PTOKEN_PRIVILEGES TokenPrivileges;
   TOKEN_DEFAULT_DACL TokenDefaultDacl;
   LARGE_INTEGER ExpirationTime;
   LUID AuthenticationId;
@@ -264,8 +293,8 @@ LogonUserW (LPWSTR lpszUsername,
   PSID UserSid;
   ACL Dacl;
   NTSTATUS Status;
-
   SID_IDENTIFIER_AUTHORITY SystemAuthority = {SECURITY_NT_AUTHORITY};
+  unsigned i;
 
   Qos.Length = sizeof(SECURITY_QUALITY_OF_SERVICE);
   Qos.ImpersonationLevel = SecurityAnonymous;
@@ -309,8 +338,30 @@ LogonUserW (LPWSTR lpszUsername,
   TokenGroups.Groups[0].Sid = UserSid; /* FIXME */
   TokenGroups.Groups[0].Attributes = SE_GROUP_ENABLED;
 
-//  TokenPrivileges = NULL;
-  TokenPrivileges.PrivilegeCount = 0;
+  TokenPrivileges = RtlAllocateHeap(GetProcessHeap(), 0,
+                                    sizeof(TOKEN_PRIVILEGES)
+                                    + sizeof(DefaultPrivs) / sizeof(DefaultPrivs[0])
+                                      * sizeof(LUID_AND_ATTRIBUTES));
+  if (NULL == TokenPrivileges)
+    {
+      RtlFreeSid (UserSid);
+      SetLastError(ERROR_OUTOFMEMORY);
+      return FALSE;
+    }
+  TokenPrivileges->PrivilegeCount = 0;
+  for (i = 0; i < sizeof(DefaultPrivs) / sizeof(DefaultPrivs[0]); i++)
+    {
+      if (! LookupPrivilegeValueW(NULL, DefaultPrivs[i].PrivName,
+                                  &TokenPrivileges->Privileges[TokenPrivileges->PrivilegeCount].Luid))
+        {
+          DPRINT1("Can't set privilege %S\n", DefaultPrivs[i].PrivName);
+        }
+      else
+        {
+          TokenPrivileges->Privileges[TokenPrivileges->PrivilegeCount].Attributes = DefaultPrivs[i].Attributes;
+          TokenPrivileges->PrivilegeCount++;
+        }
+    }
 
   TokenOwner.Owner = UserSid;
 
@@ -319,6 +370,7 @@ LogonUserW (LPWSTR lpszUsername,
   Status = RtlCreateAcl (&Dacl, sizeof(ACL), ACL_REVISION);
   if (!NT_SUCCESS(Status))
     {
+      RtlFreeHeap(GetProcessHeap(), 0, TokenPrivileges);
       RtlFreeSid (UserSid);
       return FALSE;
     }
@@ -344,21 +396,16 @@ LogonUserW (LPWSTR lpszUsername,
 			  &TokenUser,
 //			  TokenGroups,
 			  &TokenGroups,
-//			  TokenPrivileges,
-			  &TokenPrivileges,
+			  TokenPrivileges,
 			  &TokenOwner,
 			  &TokenPrimaryGroup,
 			  &TokenDefaultDacl,
 			  &TokenSource);
-  if (!NT_SUCCESS(Status))
-    {
-      RtlFreeSid (UserSid);
-      return FALSE;
-    }
 
+  RtlFreeHeap(GetProcessHeap(), 0, TokenPrivileges);
   RtlFreeSid (UserSid);
 
-  return TRUE;
+  return NT_SUCCESS(Status);
 }
 
 /* EOF */

From 6a871dff662d34469c0dc134052abb8d896dc8d3 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Wed, 7 Jul 2004 09:42:58 +0000
Subject: [PATCH 205/356] Implement environment variable dialog.

svn path=/trunk/; revision=10008
---
 reactos/lib/cpl/sysdm/environment.c | 348 ++++++++++++++++++++++++++--
 reactos/lib/cpl/sysdm/resource.h    |   4 +
 reactos/lib/cpl/sysdm/sysdm.rc      |  18 +-
 3 files changed, 347 insertions(+), 23 deletions(-)

diff --git a/reactos/lib/cpl/sysdm/environment.c b/reactos/lib/cpl/sysdm/environment.c
index 876330bd4dc..fe0942b14eb 100644
--- a/reactos/lib/cpl/sysdm/environment.c
+++ b/reactos/lib/cpl/sysdm/environment.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: environment.c,v 1.2 2004/07/03 17:40:22 navaraf Exp $
+/* $Id: environment.c,v 1.3 2004/07/07 09:42:58 ekohl Exp $
  *
  * PROJECT:         ReactOS System Control Panel
  * FILE:            lib/cpl/sysdm/environment.c
@@ -33,6 +33,104 @@
 #include "sysdm.h"
 
 
+typedef struct _VARIABLE_DATA
+{
+  LPTSTR lpName;
+  LPTSTR lpRawValue;
+  LPTSTR lpCookedValue;
+} VARIABLE_DATA, *PVARIABLE_DATA;
+
+
+
+BOOL CALLBACK
+EditVariableDlgProc(HWND hwndDlg,
+		    UINT uMsg,
+		    WPARAM wParam,
+		    LPARAM lParam)
+{
+  PVARIABLE_DATA VarData;
+  DWORD dwNameLength;
+  DWORD dwValueLength;
+
+  VarData = (PVARIABLE_DATA)GetWindowLong(hwndDlg, GWL_USERDATA);
+
+  switch (uMsg)
+  {
+    case WM_INITDIALOG:
+      SetWindowLong(hwndDlg, GWL_USERDATA, (LONG)lParam);
+      VarData = (PVARIABLE_DATA)lParam;
+
+      if (VarData->lpName != NULL)
+      {
+        SendDlgItemMessage(hwndDlg, IDC_VARIABLE_NAME, WM_SETTEXT, 0, (LPARAM)VarData->lpName);
+      }
+
+      if (VarData->lpRawValue != NULL)
+      {
+        SendDlgItemMessage(hwndDlg, IDC_VARIABLE_VALUE, WM_SETTEXT, 0, (LPARAM)VarData->lpRawValue);
+      }
+      break;
+
+    case WM_COMMAND:
+      switch (LOWORD(wParam))
+      {
+        case IDOK:
+          dwNameLength = (DWORD)SendDlgItemMessage(hwndDlg, IDC_VARIABLE_NAME, WM_GETTEXTLENGTH, 0, 0);
+          dwValueLength = (DWORD)SendDlgItemMessage(hwndDlg, IDC_VARIABLE_VALUE, WM_GETTEXTLENGTH, 0, 0);
+          if (dwNameLength != 0 && dwValueLength != 0)
+          {
+            if (VarData->lpName == NULL)
+            {
+              VarData->lpName = GlobalAlloc(GPTR, (dwNameLength + 1) * sizeof(TCHAR));
+            }
+            else if (_tcslen(VarData->lpName) < dwNameLength)
+            {
+              GlobalFree(VarData->lpName);
+              VarData->lpName = GlobalAlloc(GPTR, (dwNameLength + 1) * sizeof(TCHAR));
+            }
+            SendDlgItemMessage(hwndDlg, IDC_VARIABLE_NAME, WM_GETTEXT, dwNameLength + 1, (LPARAM)VarData->lpName);
+
+            if (VarData->lpRawValue == NULL)
+            {
+              VarData->lpRawValue = GlobalAlloc(GPTR, (dwValueLength + 1) * sizeof(TCHAR));
+            }
+            else if (_tcslen(VarData->lpRawValue) < dwValueLength)
+            {
+              GlobalFree(VarData->lpRawValue);
+              VarData->lpRawValue = GlobalAlloc(GPTR, (dwValueLength + 1) * sizeof(TCHAR));
+            }
+            SendDlgItemMessage(hwndDlg, IDC_VARIABLE_VALUE, WM_GETTEXT, dwValueLength + 1, (LPARAM)VarData->lpRawValue);
+
+            if (_tcschr(VarData->lpRawValue, _T('%')))
+            {
+              if (VarData->lpCookedValue == NULL)
+              {
+                VarData->lpCookedValue = GlobalAlloc(GPTR, 2 * MAX_PATH * sizeof(TCHAR));
+              }
+
+              ExpandEnvironmentStrings(VarData->lpRawValue,
+                                       VarData->lpCookedValue,
+                                       2 * MAX_PATH);
+            }
+            else if (VarData->lpCookedValue)
+            {
+              GlobalFree(VarData->lpCookedValue);
+            }
+          }
+          EndDialog(hwndDlg, 1);
+          return TRUE;
+
+        case IDCANCEL:
+          EndDialog(hwndDlg, 0);
+          return TRUE;
+      }
+      break;
+  }
+
+  return FALSE;
+}
+
+
 static VOID
 SetEnvironmentVariables(HWND hwndListView,
 			HKEY hRootKey,
@@ -49,9 +147,10 @@ SetEnvironmentVariables(HWND hwndListView,
   DWORD dwNameLength;
   DWORD dwDataLength;
   DWORD dwType;
+  PVARIABLE_DATA VarData;
 
   LV_ITEM lvi;
-  int nIndex;
+  int iItem;
 
   if (RegOpenKeyEx(hRootKey,
 		   lpSubKeyName,
@@ -111,9 +210,17 @@ SetEnvironmentVariables(HWND hwndListView,
       return;
     }
 
+    VarData = GlobalAlloc(GPTR, sizeof(VARIABLE_DATA));
+
+    VarData->lpName = GlobalAlloc(GPTR, (dwNameLength + 1) * sizeof(TCHAR));
+    _tcscpy(VarData->lpName, lpName);
+
+    VarData->lpRawValue = GlobalAlloc(GPTR, (dwDataLength + 1) * sizeof(TCHAR));
+    _tcscpy(VarData->lpRawValue, lpData);
+
     if (dwType == REG_EXPAND_SZ)
     {
-      lpExpandData = GlobalAlloc(GPTR, MAX_PATH * sizeof(TCHAR));
+      lpExpandData = GlobalAlloc(GPTR, MAX_PATH * 2* sizeof(TCHAR));
       if (lpExpandData == NULL)
       {
         GlobalFree(lpName);
@@ -124,24 +231,22 @@ SetEnvironmentVariables(HWND hwndListView,
 
       ExpandEnvironmentStrings(lpData,
 			       lpExpandData,
-			       MAX_PATH);
+			       2 * MAX_PATH);
+
+      VarData->lpCookedValue = GlobalAlloc(GPTR, (_tcslen(lpExpandData) + 1) * sizeof(TCHAR));
+      _tcscpy(VarData->lpCookedValue, lpExpandData);
+      GlobalFree(lpExpandData);
     }
 
     memset(&lvi, 0x00, sizeof(lvi));
-    lvi.mask = LVIF_TEXT | LVIF_STATE;
-    lvi.pszText = lpName;
-    lvi.state=0;
-    nIndex = ListView_InsertItem(hwndListView, &lvi);
+    lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_PARAM;
+    lvi.lParam = (LPARAM)VarData;
+    lvi.pszText = VarData->lpName;
+    lvi.state = (i == 0) ? LVIS_SELECTED : 0;
+    iItem = ListView_InsertItem(hwndListView, &lvi);
 
-    if (dwType == REG_EXPAND_SZ)
-    {
-      ListView_SetItemText(hwndListView, nIndex, 1, lpExpandData);
-      GlobalFree(lpExpandData);
-    }
-    else
-    {
-      ListView_SetItemText(hwndListView, nIndex, 1, lpData);
-    }
+    ListView_SetItemText(hwndListView, iItem, 1,
+                         (VarData->lpCookedValue) ? VarData->lpCookedValue : VarData->lpRawValue);
   }
 
   GlobalFree(lpName);
@@ -159,7 +264,7 @@ SetListViewColumns(HWND hwndListView)
   GetClientRect(hwndListView, &rect);
 
   memset(&column, 0x00, sizeof(column));
-  column.mask=LVCF_FMT | LVCF_WIDTH | LVCF_SUBITEM|LVCF_TEXT;
+  column.mask=LVCF_FMT | LVCF_WIDTH | LVCF_SUBITEM | LVCF_TEXT;
   column.fmt=LVCFMT_LEFT;
   column.cx = (rect.right - rect.left) / 3;
   column.iSubItem = 0;
@@ -205,6 +310,170 @@ OnInitDialog(HWND hwndDlg)
 }
 
 
+VOID
+OnNewVariable(HWND hwndDlg,
+	      int iDlgItem)
+{
+  HWND hwndListView;
+  PVARIABLE_DATA VarData;
+  LV_ITEM lvi;
+  int iItem;
+
+  hwndListView = GetDlgItem(hwndDlg, iDlgItem);
+
+  VarData = GlobalAlloc(GPTR, sizeof(VARIABLE_DATA));
+
+  if (!DialogBoxParam(hApplet,
+                      MAKEINTRESOURCE(IDD_EDIT_VARIABLE),
+                      hwndDlg,
+                      EditVariableDlgProc,
+                     (LPARAM)VarData) > 0)
+  {
+    if (VarData->lpName != NULL)
+      GlobalFree(VarData->lpName);
+
+    if (VarData->lpRawValue != NULL)
+      GlobalFree(VarData->lpRawValue);
+
+    if (VarData->lpCookedValue != NULL)
+      GlobalFree(VarData->lpCookedValue);
+
+    GlobalFree(VarData);
+  }
+
+  memset(&lvi, 0x00, sizeof(lvi));
+  lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_PARAM;
+  lvi.lParam = (LPARAM)VarData;
+  lvi.pszText = VarData->lpName;
+  lvi.state = 0;
+  iItem = ListView_InsertItem(hwndListView, &lvi);
+
+  ListView_SetItemText(hwndListView, iItem, 1,
+                       (VarData->lpCookedValue) ? VarData->lpCookedValue : VarData->lpRawValue);
+}
+
+
+VOID
+OnEditVariable(HWND hwndDlg,
+	       int iDlgItem)
+{
+  HWND hwndListView;
+  PVARIABLE_DATA VarData;
+  LV_ITEM lvi;
+  int iItem;
+
+  hwndListView = GetDlgItem(hwndDlg, iDlgItem);
+
+  iItem = ListView_GetSelectionMark(hwndListView);
+  if (iItem != -1)
+  {
+    memset(&lvi, 0x00, sizeof(lvi));
+    lvi.mask = LVIF_PARAM;
+    lvi.iItem = iItem;
+
+    if (ListView_GetItem(hwndListView, &lvi))
+    {
+      VarData = (PVARIABLE_DATA)lvi.lParam;
+
+      if (DialogBoxParam(hApplet,
+                         MAKEINTRESOURCE(IDD_EDIT_VARIABLE),
+                         hwndDlg,
+                         EditVariableDlgProc,
+                        (LPARAM)VarData) > 0)
+      {
+        ListView_SetItemText(hwndListView, iItem, 0, VarData->lpName);
+        ListView_SetItemText(hwndListView, iItem, 1,
+                             (VarData->lpCookedValue) ? VarData->lpCookedValue : VarData->lpRawValue);
+      }
+    }
+  }
+}
+
+
+VOID
+OnDeleteVariable(HWND hwndDlg,
+		 int iDlgItem)
+{
+  HWND hwndListView;
+  PVARIABLE_DATA VarData;
+  LV_ITEM lvi;
+  int iItem;
+
+  hwndListView = GetDlgItem(hwndDlg, iDlgItem);
+
+  iItem = ListView_GetSelectionMark(hwndListView);
+  if (iItem != -1)
+  {
+    memset(&lvi, 0x00, sizeof(lvi));
+    lvi.mask = LVIF_PARAM;
+    lvi.iItem = iItem;
+
+    if (ListView_GetItem(hwndListView, &lvi))
+    {
+      VarData = (PVARIABLE_DATA)lvi.lParam;
+      if (VarData != NULL)
+      {
+        if (VarData->lpName != NULL)
+          GlobalFree(VarData->lpName);
+
+        if (VarData->lpRawValue != NULL)
+          GlobalFree(VarData->lpRawValue);
+
+        if (VarData->lpCookedValue != NULL)
+          GlobalFree(VarData->lpCookedValue);
+
+        GlobalFree(VarData);
+        lvi.lParam = 0;
+      }
+    }
+
+    ListView_DeleteItem(hwndListView, iItem);
+  }
+}
+
+
+VOID
+ReleaseListViewItems(HWND hwndDlg,
+		     int iDlgItem)
+{
+  HWND hwndListView;
+  PVARIABLE_DATA VarData;
+  int nItemCount;
+  LV_ITEM lvi;
+  int i;
+
+  hwndListView = GetDlgItem(hwndDlg, iDlgItem);
+
+  memset(&lvi, 0x00, sizeof(lvi));
+
+  nItemCount = ListView_GetItemCount(hwndListView);
+  for (i = 0; i < nItemCount; i++)
+  {
+    lvi.mask = LVIF_PARAM;
+    lvi.iItem = i;
+
+    if (ListView_GetItem(hwndListView, &lvi))
+    {
+      VarData = (PVARIABLE_DATA)lvi.lParam;
+      if (VarData != NULL)
+      {
+        if (VarData->lpName != NULL)
+          GlobalFree(VarData->lpName);
+
+        if (VarData->lpRawValue != NULL)
+          GlobalFree(VarData->lpRawValue);
+
+        if (VarData->lpCookedValue != NULL)
+          GlobalFree(VarData->lpCookedValue);
+
+        GlobalFree(VarData);
+        lvi.lParam = 0;
+      }
+    }
+  }
+}
+
+
 /* Environment dialog procedure */
 BOOL CALLBACK
 EnvironmentDlgProc(HWND hwndDlg,
@@ -222,24 +491,59 @@ EnvironmentDlgProc(HWND hwndDlg,
       switch (LOWORD(wParam))
       {
         case IDC_USER_VARIABLE_NEW:
+          OnNewVariable(hwndDlg, IDC_USER_VARIABLE_LIST);
+          return TRUE;
+
         case IDC_USER_VARIABLE_EDIT:
+          OnEditVariable(hwndDlg, IDC_USER_VARIABLE_LIST);
+          return TRUE;
+
         case IDC_USER_VARIABLE_DELETE:
-          break;
+          OnDeleteVariable(hwndDlg, IDC_USER_VARIABLE_LIST);
+          return TRUE;
 
         case IDC_SYSTEM_VARIABLE_NEW:
+          OnNewVariable(hwndDlg, IDC_SYSTEM_VARIABLE_LIST);
+          return TRUE;
+
         case IDC_SYSTEM_VARIABLE_EDIT:
+          OnEditVariable(hwndDlg, IDC_SYSTEM_VARIABLE_LIST);
+          return TRUE;
+
         case IDC_SYSTEM_VARIABLE_DELETE:
-          break;
+          OnDeleteVariable(hwndDlg, IDC_SYSTEM_VARIABLE_LIST);
+          return TRUE;
 
         case IDOK:
-          EndDialog(hwndDlg, 0);
-          return TRUE;
+          /* FIXME: Set environment variables in the registry */
 
         case IDCANCEL:
+          ReleaseListViewItems(hwndDlg, IDC_USER_VARIABLE_LIST);
+          ReleaseListViewItems(hwndDlg, IDC_SYSTEM_VARIABLE_LIST);
           EndDialog(hwndDlg, 0);
           return TRUE;
       }
       break;
+
+    case WM_NOTIFY:
+      {
+        NMHDR *phdr;
+
+        phdr = (NMHDR*)lParam;
+        switch(phdr->code)
+          {
+            case NM_DBLCLK:
+              {
+                if (phdr->idFrom == IDC_USER_VARIABLE_LIST ||
+                    phdr->idFrom == IDC_SYSTEM_VARIABLE_LIST)
+                {
+                  OnEditVariable(hwndDlg, phdr->idFrom);
+                  return TRUE;
+                }
+              }
+          }
+      }
+      break;
   }
 
   return FALSE;
diff --git a/reactos/lib/cpl/sysdm/resource.h b/reactos/lib/cpl/sysdm/resource.h
index e4d56fb1615..3fe4acc0974 100644
--- a/reactos/lib/cpl/sysdm/resource.h
+++ b/reactos/lib/cpl/sysdm/resource.h
@@ -61,6 +61,10 @@
 #define IDC_SYSTEM_VARIABLE_EDIT        226
 #define IDC_SYSTEM_VARIABLE_DELETE      227
 
+#define IDD_EDIT_VARIABLE               106
+#define IDC_VARIABLE_NAME               230
+#define IDC_VARIABLE_VALUE              231
+
 #endif /* __CPL_RESOURCE_H */
 
 /* EOF */
diff --git a/reactos/lib/cpl/sysdm/sysdm.rc b/reactos/lib/cpl/sysdm/sysdm.rc
index d9344bd6d27..dea372e7c57 100644
--- a/reactos/lib/cpl/sysdm/sysdm.rc
+++ b/reactos/lib/cpl/sysdm/sysdm.rc
@@ -146,7 +146,7 @@ BEGIN
   PUSHBUTTON "&Delete",IDC_USER_VARIABLE_DELETE,188,90,50,14
 
   GROUPBOX "System variables",-1,7,116,238,100
-  LTEXT "V&ariables:",410,14,128,224,8
+  LTEXT "V&ariables:",-1,14,128,224,8
   CONTROL "",IDC_SYSTEM_VARIABLE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_SHOWSELALWAYS|LVS_SORTASCENDING|LVS_NOSORTHEADER|WS_VSCROLL|WS_HSCROLL|WS_TABSTOP,14,139,224,48,WS_EX_CLIENTEDGE
   PUSHBUTTON "Ne&w...",IDC_SYSTEM_VARIABLE_NEW,80,194,50,14
   PUSHBUTTON "Ed&it...",IDC_SYSTEM_VARIABLE_EDIT,134,194,50,14
@@ -156,6 +156,22 @@ BEGIN
   PUSHBUTTON "Cancel",IDCANCEL,195,224,50,14
 END
 
+
+IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71
+STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Edit Variable"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+  LTEXT           "Variable &Name:",-1,7,14,50,8
+  EDITTEXT        IDC_VARIABLE_NAME,75,12,145,12,ES_AUTOHSCROLL
+  LTEXT           "Variable &Value:",-1,7,32,50,8
+  EDITTEXT        IDC_VARIABLE_VALUE,75,30,145,12,ES_AUTOHSCROLL
+  
+  DEFPUSHBUTTON "OK",IDOK,116,50,50,14,WS_GROUP
+  PUSHBUTTON "Cancel",IDCANCEL,170,50,50,14
+END
+
+
 STRINGTABLE 
 BEGIN
   IDS_CPLSYSTEMNAME "System"

From 7a25c2785c43289f06b3a1c577669cf42f33b739 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Wed, 7 Jul 2004 16:22:22 +0000
Subject: [PATCH 206/356] - Add VBE video mode registry. (Gerard Gatineau asked
 for it)

svn path=/trunk/; revision=10009
---
 reactos/bootdata/hiveinst.inf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/reactos/bootdata/hiveinst.inf b/reactos/bootdata/hiveinst.inf
index 551441aabfc..888b3c8c74a 100644
--- a/reactos/bootdata/hiveinst.inf
+++ b/reactos/bootdata/hiveinst.inf
@@ -10,6 +10,10 @@ Signature = "$ReactOS$"
 
 ; VBE SVGA driver
 HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Start",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.VRefresh",0x00010001,1
+HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.BitsPerPel",0x00010001,16
+HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.XResolution",0x00010001,800
+HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.YResolution",0x00010001,600
 
 ; VGA miniport driver
 HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Start",0x00010001,0x00000001

From bfb94c6d6f58f0dbe8d6473562e5360b7a60d62a Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Wed, 7 Jul 2004 16:25:00 +0000
Subject: [PATCH 207/356] - Fixed RtlUnwind to correctly remove SEH frames and
 not to call ZwContinue.

svn path=/trunk/; revision=10010
---
 reactos/lib/rtl/i386/exception.c | 50 ++++++++++----------------------
 1 file changed, 15 insertions(+), 35 deletions(-)

diff --git a/reactos/lib/rtl/i386/exception.c b/reactos/lib/rtl/i386/exception.c
index 961b1376c5d..bb091e72396 100644
--- a/reactos/lib/rtl/i386/exception.c
+++ b/reactos/lib/rtl/i386/exception.c
@@ -1,4 +1,4 @@
-/* $Id: exception.c,v 1.2 2004/07/04 02:01:02 navaraf Exp $
+/* $Id: exception.c,v 1.3 2004/07/07 16:25:00 navaraf Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -13,7 +13,7 @@
 #include <windows.h>
 #include <string.h>
 
-//#define NDEBUG
+#define NDEBUG
 #include <debug.h>
 
 /* FUNCTIONS ***************************************************************/
@@ -307,34 +307,25 @@ RtlUnwind(PEXCEPTION_REGISTRATION RegistrationFrame,
   Context.Eax = EaxValue;
  
   // Begin traversing the list of EXCEPTION_REGISTRATION
-  while ((ULONG_PTR)ERHead != -1)
+  while ((ULONG_PTR)ERHead != -1 && ERHead != RegistrationFrame)
   {
     EXCEPTION_RECORD er2;
  
     DPRINT("ERHead 0x%X\n", ERHead);
 
-    if (ERHead == RegistrationFrame)
+    // If there's an exception frame, but it's lower on the stack
+    // than the head of the exception list, something's wrong!
+    if (RegistrationFrame && (RegistrationFrame <= ERHead))
     {
-      DPRINT("Continueing execution\n");
-      ZwContinue(&Context, FALSE);
-      return;
-    }
-    else
-    {
-      // If there's an exception frame, but it's lower on the stack
-      // than the head of the exception list, something's wrong!
-      if (RegistrationFrame && (RegistrationFrame <= ERHead))
-      {
-        DPRINT("The exception frame is bad\n");
+      DPRINT("The exception frame is bad\n");
 
-        // Generate an exception to bail out
-        er2.ExceptionRecord = pExceptRec;
-        er2.NumberParameters = 0;
-        er2.ExceptionCode = STATUS_INVALID_UNWIND_TARGET;
-        er2.ExceptionFlags = EXCEPTION_NONCONTINUABLE;    
+      // Generate an exception to bail out
+      er2.ExceptionRecord = pExceptRec;
+      er2.NumberParameters = 0;
+      er2.ExceptionCode = STATUS_INVALID_UNWIND_TARGET;
+      er2.ExceptionFlags = EXCEPTION_NONCONTINUABLE;    
  
-        RtlRaiseException(&er2);
-      }
+      RtlRaiseException(&er2);
     }
  
 #if 0
@@ -386,10 +377,10 @@ RtlUnwind(PEXCEPTION_REGISTRATION RegistrationFrame,
       DPRINT("New ERHead is 0x%X\n", ERHead);
 
       DPRINT("Setting exception registration at 0x%X as current\n",
-        RegistrationFrame->prev);
+        /*RegistrationFrame->prev*/ pCurrExceptReg->prev);
 
       // Unlink the exception handler
-      SehpSetExceptionList(RegistrationFrame->prev);
+      SehpSetExceptionList(pCurrExceptReg->prev);
     }
     else // The stack looks goofy! Raise an exception to bail out
     {
@@ -403,17 +394,6 @@ RtlUnwind(PEXCEPTION_REGISTRATION RegistrationFrame,
       RtlRaiseException(&er2);
     }
   }
- 
-  // If we get here, we reached the end of the EXCEPTION_REGISTRATION list.
-  // This shouldn't happen normally.
-
-  DPRINT("Ran out of exception registrations. RegistrationFrame is (0x%X)\n",
-    RegistrationFrame);
-
-  if ((ULONG_PTR)RegistrationFrame == -1)
-    ZwContinue(&Context, FALSE);
-  else
-    NtRaiseException(pExceptRec, &Context, 0);
 }
 
 /* EOF */

From be3d5c04dac985b06033e4ea69e28e3a81a222a7 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Wed, 7 Jul 2004 16:28:35 +0000
Subject: [PATCH 208/356] - Fixed NtQueryInformationProcess to return
 STATUS_NOT_IMPLEMENTED for unimplemented cases.

svn path=/trunk/; revision=10011
---
 reactos/ntoskrnl/ps/process.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/reactos/ntoskrnl/ps/process.c b/reactos/ntoskrnl/ps/process.c
index 7cf0612b1c5..5c2580f7259 100644
--- a/reactos/ntoskrnl/ps/process.c
+++ b/reactos/ntoskrnl/ps/process.c
@@ -1,4 +1,4 @@
-/* $Id: process.c,v 1.131 2004/05/02 04:40:25 jimtabor Exp $
+/* $Id: process.c,v 1.132 2004/07/07 16:28:35 navaraf Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -1085,6 +1085,9 @@ NtQueryInformationProcess(IN  HANDLE ProcessHandle,
 
       case ProcessQuotaLimits:
       case ProcessIoCounters:
+	Status = STATUS_NOT_IMPLEMENTED;
+	break;
+
       case ProcessTimes:
 	if (ProcessInformationLength != sizeof(KERNEL_USER_TIMES))
 	{
@@ -1106,10 +1109,14 @@ NtQueryInformationProcess(IN  HANDLE ProcessHandle,
 	  }
 	}
 	break;
+
       case ProcessDebugPort:
       case ProcessLdtInformation:
       case ProcessWorkingSetWatch:
       case ProcessWx86Information:
+	Status = STATUS_NOT_IMPLEMENTED;
+	break;
+
       case ProcessHandleCount:
       	if (ProcessInformationLength != sizeof(ULONG))
 	{
@@ -1125,6 +1132,7 @@ NtQueryInformationProcess(IN  HANDLE ProcessHandle,
 	  }
 	}
 	break;
+
       case ProcessSessionInformation:
       case ProcessWow64Information:
 	Status = STATUS_NOT_IMPLEMENTED;

From eb298d6e0106eb1ae2a24b85fc8e33f864bf4c24 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Wed, 7 Jul 2004 16:32:02 +0000
Subject: [PATCH 209/356] - Imporved implementation of
 UnhandledExceptionFilter. - Moved most of code from _except_handler in
 process/create.c to UnhandledExceptionFilter and changed _except_handler to
 call it.

svn path=/trunk/; revision=10012
---
 reactos/lib/kernel32/except/except.c  | 138 ++++++++++++++++++--------
 reactos/lib/kernel32/process/create.c | 113 +++++----------------
 2 files changed, 125 insertions(+), 126 deletions(-)

diff --git a/reactos/lib/kernel32/except/except.c b/reactos/lib/kernel32/except/except.c
index 02e66b9c229..f2756e7dcf2 100644
--- a/reactos/lib/kernel32/except/except.c
+++ b/reactos/lib/kernel32/except/except.c
@@ -1,4 +1,4 @@
-/* $Id: except.c,v 1.14 2004/06/13 20:04:55 navaraf Exp $
+/* $Id: except.c,v 1.15 2004/07/07 16:32:01 navaraf Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -12,8 +12,11 @@
 
 #include <k32.h>
 
-UINT GlobalErrMode;
-LPTOP_LEVEL_EXCEPTION_FILTER GlobalTopLevelExceptionFilter;
+#define NDEBUG
+#include "../include/debug.h"
+
+UINT GlobalErrMode = 0;
+LPTOP_LEVEL_EXCEPTION_FILTER GlobalTopLevelExceptionFilter = NULL;
 
 UINT GetErrorMode(void)
 {
@@ -50,52 +53,107 @@ SetUnhandledExceptionFilter(
 }
 
 
+/*
+ * Private helper function to lookup the module name from a given address.
+ * The address can point to anywhere within the module.
+ */
+static const char*
+_module_name_from_addr(const void* addr, char* psz, size_t nChars)
+{
+   MEMORY_BASIC_INFORMATION mbi;
+   if (VirtualQuery(addr, &mbi, sizeof(mbi)) != sizeof(mbi) ||
+       !GetModuleFileNameA((HMODULE)mbi.AllocationBase, psz, nChars))
+   {
+      psz[0] = '\0';
+   }
+   return psz;
+}
+
+
 /*
  * @unimplemented
  */
-LONG
-STDCALL
+LONG STDCALL
 UnhandledExceptionFilter(struct _EXCEPTION_POINTERS *ExceptionInfo)
 {
-	DWORD	dbgRet;
-	HANDLE DebugPort;
-	NTSTATUS errCode;
+   DWORD RetValue;
+   HANDLE DebugPort = NULL;
+   NTSTATUS ErrCode;
+   static int RescursionTrap = 3;
 
-	if(ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION) {
-		// might check read only resource
-		// Is there a debugger running ?
-		errCode = NtQueryInformationProcess(NtCurrentProcess(),ProcessDebugPort,&DebugPort,sizeof(HANDLE),NULL);
-		if ( !NT_SUCCESS(errCode) ) {
-			SetLastErrorByStatus(errCode);
-			return EXCEPTION_EXECUTE_HANDLER;
-		}
-		if ( DebugPort ) {
-			//return EXCEPTION_CONTINUE_SEARCH;
-		}
-		if(GlobalTopLevelExceptionFilter != NULL) {
-		dbgRet = GlobalTopLevelExceptionFilter(ExceptionInfo);
-        	if(dbgRet == EXCEPTION_EXECUTE_HANDLER) 
-        		return EXCEPTION_EXECUTE_HANDLER;
-        	else if(dbgRet == EXCEPTION_CONTINUE_EXECUTION) 
-         		return EXCEPTION_CONTINUE_EXECUTION;
-		}
+#if 0
+   if (ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION &&
+       ExceptionInfo->ExceptionRecord->ExceptionInformation[0])
+   {
+      RetValue = _BasepCheckForReadOnlyResource(
+         ExceptionInfo->ExceptionRecord->ExceptionInformation[1]);
+      if (RetValue == EXCEPTION_CONTINUE_EXECUTION)
+         return EXCEPTION_CONTINUE_EXECUTION;
+   }
+#endif
 
-	}
+   if (--RescursionTrap > 0)
+   {
+      /* Is there a debugger running ? */
+      ErrCode = NtQueryInformationProcess(NtCurrentProcess(), ProcessDebugPort,
+                                          &DebugPort, sizeof(HANDLE), NULL);
+      if (!NT_SUCCESS(ErrCode) && ErrCode != STATUS_NOT_IMPLEMENTED)
+      {
+         SetLastErrorByStatus(ErrCode);
+         return EXCEPTION_EXECUTE_HANDLER;
+      }
 
-	//if ( GetErrorMode() & SEM_NOGPFAULTERRORBOX == SEM_NOGPFAULTERRORBOX ) {
-		// produce a stack trace or pop a message
-		//sprintf( message, "Unhandled exception 0x%08lx at address 0x%08lx.",
-             	//	ExceptionInfo->ExceptionRecord->ExceptionCode,
-             	//	(DWORD)ExceptionInfo->ExceptionRecord->ExceptionAddress );
-		//MessageBoxA( 0, message, "Error", MB_OK | MB_ICONHAND );
-	
-	//}
-	// Returning EXCEPTION_EXECUTE_HANDLER means that the code in 
-	// the __execept block will be executed. Normally this will end up in a
-	// Terminate process.
+      if (DebugPort)
+      {
+         /* Pass the exception to debugger. */
+         DPRINT("Passing exception to debugger\n");
+         return EXCEPTION_CONTINUE_SEARCH;
+      }
 
-	return EXCEPTION_EXECUTE_HANDLER;
-	
+      /* Run unhandled exception handler. */
+      if (GlobalTopLevelExceptionFilter != NULL)
+      {
+         RetValue = GlobalTopLevelExceptionFilter(ExceptionInfo);
+         if (RetValue == EXCEPTION_EXECUTE_HANDLER)
+            return EXCEPTION_EXECUTE_HANDLER;
+         if (RetValue == EXCEPTION_CONTINUE_EXECUTION) 
+            return EXCEPTION_CONTINUE_EXECUTION;
+      }
+   }
+
+   if (RescursionTrap >= 0 && (GetErrorMode() & SEM_NOGPFAULTERRORBOX) == 0)
+   {
+#ifdef _X86_
+      PULONG Frame;
+      CHAR szMod[128] = "";
+#endif
+
+      /* Print a stack trace. */
+      DPRINT1("Unhandled exception\n");
+      DPRINT1("Address:\n");
+      DPRINT1("   %8x   %s\n",
+         ExceptionInfo->ExceptionRecord->ExceptionAddress,
+         _module_name_from_addr(ExceptionInfo->ExceptionRecord->ExceptionAddress, szMod, sizeof(szMod)));
+
+#ifdef _X86_
+      DPRINT1("Frames:\n");
+      Frame = (PULONG)ExceptionInfo->ContextRecord->Ebp;
+      while (Frame[1] != 0 && Frame[1] != 0xdeadbeef)
+      {
+         _module_name_from_addr((const void*)Frame[1], szMod, sizeof(szMod));
+         DPRINT1("   %8x   %s\n", Frame[1], szMod);
+         Frame = (PULONG)Frame[0];
+      }
+#endif
+   }
+
+   /*
+    * Returning EXCEPTION_EXECUTE_HANDLER means that the code in 
+    * the __except block will be executed. Normally this will end up in a
+    * Terminate process.
+    */
+
+   return EXCEPTION_EXECUTE_HANDLER;	
 }
 
 
diff --git a/reactos/lib/kernel32/process/create.c b/reactos/lib/kernel32/process/create.c
index a393ce28730..14fc209dbe8 100644
--- a/reactos/lib/kernel32/process/create.c
+++ b/reactos/lib/kernel32/process/create.c
@@ -1,4 +1,4 @@
-/* $Id: create.c,v 1.86 2004/07/03 17:40:22 navaraf Exp $
+/* $Id: create.c,v 1.87 2004/07/07 16:32:02 navaraf Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -283,103 +283,44 @@ BOOL STDCALL CreateProcessA(LPCSTR lpApplicationName,
 }
 
 
-/*
- * Private helper function to lookup the module name from a given address.
- * The address can point to anywhere within the module.
- */
-static const char*
-_module_name_from_addr(const void* addr, char* psz, size_t nChars)
+static EXCEPTION_DISPOSITION __cdecl
+_except_handler(EXCEPTION_RECORD *ExceptionRecord,
+		void * EstablisherFrame,
+		CONTEXT *ContextRecord,
+		void * DispatcherContext)
 {
-   MEMORY_BASIC_INFORMATION mbi;
-   if (VirtualQuery(addr, &mbi, sizeof(mbi)) != sizeof(mbi) ||
-       !GetModuleFileNameA((HMODULE)mbi.AllocationBase, psz, nChars))
+   EXCEPTION_POINTERS ExceptionInfo;
+   EXCEPTION_DISPOSITION ExceptionDisposition;
+   ExceptionInfo.ExceptionRecord = ExceptionRecord;
+   ExceptionInfo.ContextRecord = ContextRecord;
+   ExceptionDisposition = UnhandledExceptionFilter(&ExceptionInfo);
+   if (ExceptionDisposition == EXCEPTION_EXECUTE_HANDLER)
    {
-      psz[0] = '\0';
+      /* FIXME */
+#if 0
+      if (_BaseRunningInServerProcess)
+         ExitThread(ExceptionRecord->ExceptionCode);
+      else
+#endif
+         ExitProcess(ExceptionRecord->ExceptionCode);
    }
-   return psz;
+
+   return ExceptionDisposition;
 }
 
-static int _except_recursion_trap = 0;
-
-struct _CONTEXT;
-struct __EXCEPTION_RECORD;
-
-static
-EXCEPTION_DISPOSITION
-__cdecl
-_except_handler(
-    struct _EXCEPTION_RECORD *ExceptionRecord,
-    void * EstablisherFrame,
-    struct _CONTEXT *ContextRecord,
-    void * DispatcherContext )
-{
-#ifdef _X86_
- char szMod[128] = "";
-#endif
- DPRINT1("Thread terminated abnormally due to unhandled exception\n");
- DPRINT1("Address:\n");
- DPRINT1("%8x    %s\n",
-         ExceptionRecord->ExceptionAddress,
-         _module_name_from_addr(ExceptionRecord->ExceptionAddress, szMod, sizeof(szMod)));
-
-#ifdef _X86_
-  {
-    PULONG Frame;
-    DPRINT1("Frames:\n");
-    Frame = (PULONG)((CONTEXT *)ContextRecord)->Ebp;
-    while ((PVOID)Frame[1] != NULL && (PULONG)Frame[1] != (PULONG)0xdeadbeef)
-       {
-         _module_name_from_addr((const void*)Frame[1], szMod, sizeof(szMod));
-         DPRINT1("%8x    %s\n", (PVOID)Frame[1], szMod);
-         Frame = (PULONG)Frame[0];
-       }
-  }
-#endif
-
- if (3 < ++_except_recursion_trap)
-    {
-      DPRINT1("_except_handler(...) appears to be recursing.\n");
-      DPRINT1("Process HALTED.\n");
-      for (;;)
-	{
-	}
-    }
-
-  if (/* FIXME: */ TRUE) /* Not a service */
-    {
-      DPRINT("  calling ExitProcess(0) no, lets try ExitThread . . .\n");
-      /* ExitProcess(0); */
-      ExitThread(0);
-    }
-  else
-    {
-    DPRINT("  calling ExitThread(0) . . .\n");
-    ExitThread(0);
-    }
-
-  DPRINT1("  We should not get to here !!!\n");
-  /* We should not get to here */
-  return ExceptionContinueSearch;
-}
 
 VOID STDCALL
 BaseProcessStart(LPTHREAD_START_ROUTINE lpStartAddress,
 		 DWORD lpParameter)
 {
-	UINT uExitCode = 0;
+   UINT uExitCode = 0;
 
-    DPRINT("BaseProcessStart(..) - setting up exception frame.\n");
+   DPRINT("BaseProcessStart(..) - setting up exception frame.\n");
 
-	__try1(_except_handler)
-	{
-		uExitCode = (lpStartAddress)((PVOID)lpParameter);
-	} __except1
-	{
-	}
-
-    DPRINT("BaseProcessStart(..) - cleaned up exception frame.\n");
-
-	ExitThread(uExitCode);
+   __try1(_except_handler)
+   {
+      uExitCode = (lpStartAddress)((PVOID)lpParameter);
+   } __except1
 }
 
 

From bf1db388a0a0b62f847906802406cfb3514fec58 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Wed, 7 Jul 2004 16:33:44 +0000
Subject: [PATCH 210/356] - Handle allocation failure in IntCreateBitmap. -
 Don't allow creating surface with BitmapFormat == 0 (Invalid) in
 IntCreateSurface.

svn path=/trunk/; revision=10013
---
 reactos/subsys/win32k/eng/surface.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/reactos/subsys/win32k/eng/surface.c b/reactos/subsys/win32k/eng/surface.c
index 1f5ce7b4045..40b4a82ace0 100644
--- a/reactos/subsys/win32k/eng/surface.c
+++ b/reactos/subsys/win32k/eng/surface.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: surface.c,v 1.43 2004/07/03 13:55:35 navaraf Exp $
+/* $Id: surface.c,v 1.44 2004/07/07 16:33:44 navaraf Exp $
  * 
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -223,6 +223,9 @@ IntCreateBitmap(IN SIZEL Size,
   PVOID UncompressedBits;
   ULONG UncompressedFormat;
 
+  if (Format == 0)
+	return 0;
+
   NewBitmap = BITMAPOBJ_AllocBitmap();
   if (NewBitmap == NULL)
 	return 0;
@@ -274,8 +277,14 @@ IntCreateBitmap(IN SIZEL Size,
             {
               SurfObj->pvBits = EngAllocMem(0 != (Flags & BMF_NOZEROINIT) ? 0 : FL_ZERO_MEMORY,
                                             SurfObj->cjBits, 0);
-             }
-         }
+            }
+          if (SurfObj->pvBits == NULL)
+            {
+              BITMAPOBJ_UnlockBitmap(NewBitmap);
+              BITMAPOBJ_FreeBitmap(NewBitmap);
+              return 0;
+            }
+        }
      }
 
 

From bce67c86c4caf1596d786b138031ecd33a25e19f Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Wed, 7 Jul 2004 16:34:33 +0000
Subject: [PATCH 211/356] - Fixed ExcludeClipRgn for case when DC contained no
 clipping region before the call to this function.

svn path=/trunk/; revision=10014
---
 reactos/subsys/win32k/objects/cliprgn.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/reactos/subsys/win32k/objects/cliprgn.c b/reactos/subsys/win32k/objects/cliprgn.c
index 71b819e50d6..c2b3bb6dcc8 100644
--- a/reactos/subsys/win32k/objects/cliprgn.c
+++ b/reactos/subsys/win32k/objects/cliprgn.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: cliprgn.c,v 1.40 2004/05/26 18:49:06 weiden Exp $ */
+/* $Id: cliprgn.c,v 1.41 2004/07/07 16:34:33 navaraf Exp $ */
 #include <w32k.h>
 
 int FASTCALL
@@ -251,14 +251,18 @@ int STDCALL NtGdiExcludeClipRect(HDC  hDC,
    {
       Result = ERROR;
    }
-   else if (!dc->w.hClipRgn)
-   {
-      dc->w.hClipRgn = NewRgn;
-      Result = SIMPLEREGION;
-   }
    else
    {
-      Result = NtGdiCombineRgn(dc->w.hClipRgn, dc->w.hClipRgn, NewRgn, RGN_DIFF);
+      if (!dc->w.hClipRgn)
+      {
+         dc->w.hClipRgn = NtGdiCreateRectRgn(0, 0, 0, 0);
+         NtGdiCombineRgn(dc->w.hClipRgn, dc->w.hVisRgn, NewRgn, RGN_DIFF);         
+         Result = SIMPLEREGION;
+      }
+      else
+      {
+         Result = NtGdiCombineRgn(dc->w.hClipRgn, dc->w.hClipRgn, NewRgn, RGN_DIFF);
+      }
       NtGdiDeleteObject(NewRgn);
    }
    if (Result != ERROR)

From 226251dab16fcf072b740c0b2af37f7d4414e6f6 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Wed, 7 Jul 2004 16:36:08 +0000
Subject: [PATCH 212/356] - Don't create XLATEOBJ for BitBlt and StretchBlt
 operations that don't use source DC.

svn path=/trunk/; revision=10015
---
 reactos/subsys/win32k/objects/bitmaps.c | 209 +++++++++++++-----------
 1 file changed, 110 insertions(+), 99 deletions(-)

diff --git a/reactos/subsys/win32k/objects/bitmaps.c b/reactos/subsys/win32k/objects/bitmaps.c
index 8c1980c6f77..12f7d091d28 100644
--- a/reactos/subsys/win32k/objects/bitmaps.c
+++ b/reactos/subsys/win32k/objects/bitmaps.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: bitmaps.c,v 1.77 2004/07/03 17:40:27 navaraf Exp $ */
+/* $Id: bitmaps.c,v 1.78 2004/07/07 16:36:08 navaraf Exp $ */
 #include <w32k.h>
 
 #define IN_RECT(r,x,y) \
@@ -139,34 +139,17 @@ NtGdiBitBlt(
 		BrushObj = NULL;
 	}
 
-	if (DCDest->w.hPalette != 0)
-		DestPalette = DCDest->w.hPalette;
-
-	if (UsesSource && DCSrc->w.hPalette != 0)
-		SourcePalette = DCSrc->w.hPalette;
-
-	PalSourceGDI = PALETTE_LockPalette(SourcePalette);
-	if (NULL == PalSourceGDI)
+	/* Create the XLATEOBJ. */
+	if (UsesSource)
 	{
-		if (UsesSource && hDCSrc != hDCDest)
-		{
-			DC_UnlockDc(hDCSrc);
-		}
-		DC_UnlockDc(hDCDest);
-		SetLastWin32Error(ERROR_INVALID_HANDLE);
-		return FALSE;
-	}
-	SourceMode = PalSourceGDI->Mode;
-	PALETTE_UnlockPalette(SourcePalette);
+		if (DCDest->w.hPalette != 0)
+			DestPalette = DCDest->w.hPalette;
 
-	if (DestPalette == SourcePalette)
-	{
-		DestMode = SourceMode;
-	}
-	else
-	{
-		PalDestGDI = PALETTE_LockPalette(DestPalette);
-		if (NULL == PalDestGDI)
+		if (DCSrc->w.hPalette != 0)
+			SourcePalette = DCSrc->w.hPalette;
+
+		PalSourceGDI = PALETTE_LockPalette(SourcePalette);
+		if (NULL == PalSourceGDI)
 		{
 			if (UsesSource && hDCSrc != hDCDest)
 			{
@@ -176,56 +159,78 @@ NtGdiBitBlt(
 			SetLastWin32Error(ERROR_INVALID_HANDLE);
 			return FALSE;
 		}
-		DestMode = PalDestGDI->Mode;
-		PALETTE_UnlockPalette(DestPalette);
-	}
+		SourceMode = PalSourceGDI->Mode;
+		PALETTE_UnlockPalette(SourcePalette);
 
-	/* KB41464 details how to convert between mono and color */
-	if (DCDest->w.bitsPerPixel == 1)
-	{
-		XlateObj = (XLATEOBJ*)IntEngCreateMonoXlate(SourceMode, DestPalette,
-			SourcePalette, DCSrc->w.backgroundColor);
-	}
-	else if (UsesSource && 1 == DCSrc->w.bitsPerPixel)
-	{
-		ULONG Colors[2];
-
-		Colors[0] = DCSrc->w.textColor;
-		Colors[1] = DCSrc->w.backgroundColor;
-		Mono = PALETTE_AllocPaletteIndexedRGB(2, (RGBQUAD*)Colors);
-		if (NULL != Mono)
+		if (DestPalette == SourcePalette)
 		{
-			XlateObj = (XLATEOBJ*)IntEngCreateXlate(DestMode, PAL_INDEXED, DestPalette, Mono);
+			DestMode = SourceMode;
 		}
 		else
 		{
-			XlateObj = NULL;
+			PalDestGDI = PALETTE_LockPalette(DestPalette);
+			if (NULL == PalDestGDI)
+			{
+				if (UsesSource && hDCSrc != hDCDest)
+				{
+					DC_UnlockDc(hDCSrc);
+				}
+				DC_UnlockDc(hDCDest);
+				SetLastWin32Error(ERROR_INVALID_HANDLE);
+				return FALSE;
+			}
+			DestMode = PalDestGDI->Mode;
+			PALETTE_UnlockPalette(DestPalette);
 		}
-	}
-	else
-	{
-		XlateObj = (XLATEOBJ*)IntEngCreateXlate(DestMode, SourceMode, DestPalette, SourcePalette);
-	}
-	if (NULL == XlateObj)
-	{
-		if (NULL != Mono)
+
+		/* KB41464 details how to convert between mono and color */
+		if (DCDest->w.bitsPerPixel == 1)
 		{
-			EngDeletePalette(Mono);
+			XlateObj = (XLATEOBJ*)IntEngCreateMonoXlate(SourceMode, DestPalette,
+				SourcePalette, DCSrc->w.backgroundColor);
 		}
-		if (UsesSource && hDCSrc != hDCDest)
+		else if (DCSrc->w.bitsPerPixel == 1)
 		{
-			DC_UnlockDc(hDCSrc);
+			ULONG Colors[2];
+
+			Colors[0] = DCSrc->w.textColor;
+			Colors[1] = DCSrc->w.backgroundColor;
+			Mono = PALETTE_AllocPaletteIndexedRGB(2, (RGBQUAD*)Colors);
+			if (NULL != Mono)
+			{
+				XlateObj = (XLATEOBJ*)IntEngCreateXlate(DestMode, PAL_INDEXED, DestPalette, Mono);
+			}
+			else
+			{
+				XlateObj = NULL;
+			}
+		}
+		else
+		{
+			XlateObj = (XLATEOBJ*)IntEngCreateXlate(DestMode, SourceMode, DestPalette, SourcePalette);
+		}
+		if (NULL == XlateObj)
+		{
+			if (NULL != Mono)
+			{
+				EngDeletePalette(Mono);
+			}
+			if (UsesSource && hDCSrc != hDCDest)
+			{
+				DC_UnlockDc(hDCSrc);
+			}
+			DC_UnlockDc(hDCDest);
+			SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES);
+			return FALSE;
 		}
-		DC_UnlockDc(hDCDest);
-		SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES);
-		return FALSE;
 	}
 
 	/* Perform the bitblt operation */
 	Status = IntEngBitBlt(BitmapDest, BitmapSrc, NULL, DCDest->CombinedClip, XlateObj,
 		&DestRect, &SourcePoint, NULL, &BrushObj->BrushObject, &BrushOrigin, ROP);
 
-	EngDeleteXlate(XlateObj);
+	if (UsesSource)
+		EngDeleteXlate(XlateObj);
 	BITMAPOBJ_UnlockBitmap(DCDest->w.hBitmap);
 	if (UsesSource && DCSrc->w.hBitmap != DCDest->w.hBitmap)
 	{
@@ -1140,34 +1145,17 @@ NtGdiStretchBlt(
 		BrushObj = NULL;
 	}
 
-	if (DCDest->w.hPalette != 0)
-		DestPalette = DCDest->w.hPalette;
-
-	if (UsesSource && DCSrc->w.hPalette != 0)
-		SourcePalette = DCSrc->w.hPalette;
-
-	PalSourceGDI = PALETTE_LockPalette(SourcePalette);
-	if (NULL == PalSourceGDI)
+	/* Create the XLATEOBJ. */
+	if (UsesSource)
 	{
-		if (UsesSource && hDCSrc != hDCDest)
-		{
-			DC_UnlockDc(hDCSrc);
-		}
-		DC_UnlockDc(hDCDest);
-		SetLastWin32Error(ERROR_INVALID_HANDLE);
-		return FALSE;
-	}
-	SourceMode = PalSourceGDI->Mode;
-	PALETTE_UnlockPalette(SourcePalette);
+		if (DCDest->w.hPalette != 0)
+			DestPalette = DCDest->w.hPalette;
 
-	if (DestPalette == SourcePalette)
-	{
-		DestMode = SourceMode;
-	}
-	else
-	{
-		PalDestGDI = PALETTE_LockPalette(DestPalette);
-		if (NULL == PalDestGDI)
+		if (DCSrc->w.hPalette != 0)
+			SourcePalette = DCSrc->w.hPalette;
+
+		PalSourceGDI = PALETTE_LockPalette(SourcePalette);
+		if (NULL == PalSourceGDI)
 		{
 			if (UsesSource && hDCSrc != hDCDest)
 			{
@@ -1177,27 +1165,50 @@ NtGdiStretchBlt(
 			SetLastWin32Error(ERROR_INVALID_HANDLE);
 			return FALSE;
 		}
-		DestMode = PalDestGDI->Mode;
-		PALETTE_UnlockPalette(DestPalette);
-	}
+		SourceMode = PalSourceGDI->Mode;
+		PALETTE_UnlockPalette(SourcePalette);
 
-	XlateObj = (XLATEOBJ*)IntEngCreateXlate(DestMode, SourceMode, DestPalette, SourcePalette);
-	if (NULL == XlateObj)
-	{
-		if (UsesSource && hDCSrc != hDCDest)
+		if (DestPalette == SourcePalette)
 		{
-			DC_UnlockDc(hDCSrc);
+			DestMode = SourceMode;
+		}
+		else
+		{
+			PalDestGDI = PALETTE_LockPalette(DestPalette);
+			if (NULL == PalDestGDI)
+			{
+				if (UsesSource && hDCSrc != hDCDest)
+				{
+					DC_UnlockDc(hDCSrc);
+				}
+				DC_UnlockDc(hDCDest);
+				SetLastWin32Error(ERROR_INVALID_HANDLE);
+				return FALSE;
+			}
+			DestMode = PalDestGDI->Mode;
+			PALETTE_UnlockPalette(DestPalette);
+		}
+
+		/* FIXME: Use the same logic for create XLATEOBJ as in NtGdiBitBlt. */
+		XlateObj = (XLATEOBJ*)IntEngCreateXlate(DestMode, SourceMode, DestPalette, SourcePalette);
+		if (NULL == XlateObj)
+		{
+			if (UsesSource && hDCSrc != hDCDest)
+			{
+				DC_UnlockDc(hDCSrc);
+			}
+			DC_UnlockDc(hDCDest);
+			SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES);
+			return FALSE;
 		}
-		DC_UnlockDc(hDCDest);
-		SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES);
-		return FALSE;
 	}
 
 	/* Perform the bitblt operation */
 	Status = IntEngStretchBlt(BitmapDest, BitmapSrc, NULL, DCDest->CombinedClip,
 		XlateObj, &DestRect, &SourceRect, NULL, NULL, NULL, COLORONCOLOR);
 
-	EngDeleteXlate(XlateObj);
+	if (UsesSource)
+		EngDeleteXlate(XlateObj);
 	BITMAPOBJ_UnlockBitmap(DCDest->w.hBitmap);
 	if (UsesSource && DCSrc->w.hBitmap != DCDest->w.hBitmap)
 	{

From 680d163578ab03057a617c4164eb3b7e051c6a6e Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Wed, 7 Jul 2004 16:47:43 +0000
Subject: [PATCH 213/356] added missing cvsignore file

svn path=/trunk/; revision=10016
---
 reactos/lib/cpl/access/.cvsignore | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 reactos/lib/cpl/access/.cvsignore

diff --git a/reactos/lib/cpl/access/.cvsignore b/reactos/lib/cpl/access/.cvsignore
new file mode 100644
index 00000000000..e569704df95
--- /dev/null
+++ b/reactos/lib/cpl/access/.cvsignore
@@ -0,0 +1,14 @@
+*.coff
+*.cpl
+*.d
+*.a
+*.o
+*.sym
+*.map
+*.tmp
+
+*.ncb
+*.opt
+*.plg
+Debug
+Release
\ No newline at end of file

From e4848fe10094613188aa3a566e2664ecad18ca71 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Wed, 7 Jul 2004 16:50:54 +0000
Subject: [PATCH 214/356] - Return image name in SymGetModuleInfo since some
 applications use it for determining path. It's still a stub though.

svn path=/trunk/; revision=10017
---
 reactos/lib/imagehlp/symbol.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/reactos/lib/imagehlp/symbol.c b/reactos/lib/imagehlp/symbol.c
index d71a843d5a1..6ab4428e5e6 100644
--- a/reactos/lib/imagehlp/symbol.c
+++ b/reactos/lib/imagehlp/symbol.c
@@ -94,11 +94,23 @@ BOOL WINAPI SymGetModuleInfo(
   HANDLE hProcess, DWORD dwAddr,
   PIMAGEHLP_MODULE ModuleInfo)
 {
-  FIXME("(%p, 0x%08lx, %p): stub\n",
+  MEMORY_BASIC_INFORMATION mbi;
+
+  FIXME("(%p, 0x%08lx, %p): hacked stub\n",
     hProcess, dwAddr, ModuleInfo
   );
-  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return FALSE;
+
+  /*
+   * OpenOffice uses this function to get paths of it's modules
+   * from address inside the module. So return at least that for
+   * now.
+   */
+  if (VirtualQuery((PVOID)dwAddr, &mbi, sizeof(mbi)) != sizeof(mbi) ||
+      !GetModuleFileNameA((HMODULE)mbi.AllocationBase, ModuleInfo->ImageName, sizeof(ModuleInfo->ImageName)))
+  {
+    return FALSE;
+  }
+  return TRUE;
 }
 
 /***********************************************************************

From 825a514a465b1a77a14637a840a243c45a4335a8 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Wed, 7 Jul 2004 16:54:43 +0000
Subject: [PATCH 215/356] - Use LinBytesPerScanLine (value for linar
 framebuffer modes) instead of BytesPerScanLine for VBE 3.0 controllers.

svn path=/trunk/; revision=10018
---
 reactos/drivers/video/miniport/vbe/vbemp.c | 24 ++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/reactos/drivers/video/miniport/vbe/vbemp.c b/reactos/drivers/video/miniport/vbe/vbemp.c
index cd2a21917ac..c16897b77d3 100644
--- a/reactos/drivers/video/miniport/vbe/vbemp.c
+++ b/reactos/drivers/video/miniport/vbe/vbemp.c
@@ -88,8 +88,8 @@ VBESortModesCallback(PVBE_MODEINFO VbeModeInfoA, PVBE_MODEINFO VbeModeInfoB)
     * be available we favor more bits per pixel. It should be changed
     * later.
     */
-   if (VbeModeInfoA->BitsPerPixel < VbeModeInfoB->BitsPerPixel) return 1;
-   if (VbeModeInfoA->BitsPerPixel > VbeModeInfoB->BitsPerPixel) return -1;
+   if (VbeModeInfoA->BitsPerPixel < VbeModeInfoB->BitsPerPixel) return -1;
+   if (VbeModeInfoA->BitsPerPixel > VbeModeInfoB->BitsPerPixel) return 1;
    if (VbeModeInfoA->XResolution < VbeModeInfoB->XResolution) return -1;
    if (VbeModeInfoA->XResolution > VbeModeInfoB->XResolution) return 1;
    if (VbeModeInfoA->YResolution < VbeModeInfoB->YResolution) return -1;
@@ -737,9 +737,18 @@ VBEMapVideoMemory(
       FrameBuffer.QuadPart =
          DeviceExtension->ModeInfo[DeviceExtension->CurrentMode].PhysBasePtr;
       MapInformation->VideoRamBase = RequestedAddress->RequestedVirtualAddress;
-      MapInformation->VideoRamLength = 
-         DeviceExtension->ModeInfo[DeviceExtension->CurrentMode].BytesPerScanLine *
-         DeviceExtension->ModeInfo[DeviceExtension->CurrentMode].YResolution;
+      if (DeviceExtension->VbeInfo.Version < 0x300)
+      {
+         MapInformation->VideoRamLength = 
+            DeviceExtension->ModeInfo[DeviceExtension->CurrentMode].BytesPerScanLine *
+            DeviceExtension->ModeInfo[DeviceExtension->CurrentMode].YResolution;
+      }
+      else
+      {
+         MapInformation->VideoRamLength = 
+            DeviceExtension->ModeInfo[DeviceExtension->CurrentMode].LinBytesPerScanLine *
+            DeviceExtension->ModeInfo[DeviceExtension->CurrentMode].YResolution;
+      }
    }
 #ifdef VBE12_SUPPORT
    else
@@ -816,7 +825,10 @@ VBEQueryMode(
    VideoMode->ModeIndex = VideoModeId;
    VideoMode->VisScreenWidth = VBEMode->XResolution;
    VideoMode->VisScreenHeight = VBEMode->YResolution;
-   VideoMode->ScreenStride = VBEMode->BytesPerScanLine;
+   if (DeviceExtension->VbeInfo.Version < 0x300)
+      VideoMode->ScreenStride = VBEMode->BytesPerScanLine;
+   else
+      VideoMode->ScreenStride = VBEMode->LinBytesPerScanLine;
    VideoMode->NumberOfPlanes = VBEMode->NumberOfPlanes;
    VideoMode->BitsPerPlane = VBEMode->BitsPerPixel / VBEMode->NumberOfPlanes;
    VideoMode->Frequency = 1;

From 596469a0b65405be80d053ca81171cae5e752360 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Wed, 7 Jul 2004 17:03:32 +0000
Subject: [PATCH 216/356] - Updated system colors.

svn path=/trunk/; revision=10019
---
 reactos/lib/user32/windows/defwnd.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/reactos/lib/user32/windows/defwnd.c b/reactos/lib/user32/windows/defwnd.c
index 3e96bf1ad6a..f791d0895b9 100644
--- a/reactos/lib/user32/windows/defwnd.c
+++ b/reactos/lib/user32/windows/defwnd.c
@@ -1,4 +1,4 @@
-/* $Id: defwnd.c,v 1.141 2004/07/03 17:40:23 navaraf Exp $
+/* $Id: defwnd.c,v 1.142 2004/07/07 17:03:32 navaraf Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
@@ -59,33 +59,33 @@ static HBITMAP hbScrRight;
 
 static COLORREF SysColors[] =
   {
-    RGB(192, 192, 192) /* COLOR_SCROLLBAR */,
+    RGB(212, 208, 200) /* COLOR_SCROLLBAR */,
     RGB(58, 110, 165) /* COLOR_BACKGROUND */,
     RGB(10, 36, 106) /* COLOR_ACTIVECAPTION */,
     RGB(128, 128, 128) /* COLOR_INACTIVECAPTION */,
-    RGB(192, 192, 192) /* COLOR_MENU */,
+    RGB(212, 208, 200) /* COLOR_MENU */,
     RGB(255, 255, 255) /* COLOR_WINDOW */,
     RGB(0, 0, 0) /* COLOR_WINDOWFRAME */,
     RGB(0, 0, 0) /* COLOR_MENUTEXT */,
     RGB(0, 0, 0) /* COLOR_WINDOWTEXT */,
     RGB(255, 255, 255) /* COLOR_CAPTIONTEXT */,
-    RGB(192, 192, 192) /* COLOR_ACTIVEBORDER */,
-    RGB(192, 192, 192) /* COLOR_INACTIVEBORDER */,
+    RGB(212, 208, 200) /* COLOR_ACTIVEBORDER */,
+    RGB(212, 208, 200) /* COLOR_INACTIVEBORDER */,
     RGB(128, 128, 128) /* COLOR_APPWORKSPACE */,
-    RGB(0, 0, 128) /* COLOR_HILIGHT */,
+    RGB(10, 36, 106) /* COLOR_HILIGHT */,
     RGB(255, 255, 255) /* COLOR_HILIGHTTEXT */,
-    RGB(192, 192, 192) /* COLOR_BTNFACE */,
+    RGB(212, 208, 200) /* COLOR_BTNFACE */,
     RGB(128, 128, 128) /* COLOR_BTNSHADOW */,
     RGB(128, 128, 128) /* COLOR_GRAYTEXT */,
     RGB(0, 0, 0) /* COLOR_BTNTEXT */,
-    RGB(192, 192, 192) /* COLOR_INACTIVECAPTIONTEXT */,
+    RGB(212, 208, 200) /* COLOR_INACTIVECAPTIONTEXT */,
     RGB(255, 255, 255) /* COLOR_BTNHILIGHT */,
-    RGB(32, 32, 32) /* COLOR_3DDKSHADOW */,
-    RGB(192, 192, 192) /* COLOR_3DLIGHT */,
+    RGB(64, 64, 64) /* COLOR_3DDKSHADOW */,
+    RGB(212, 208, 200) /* COLOR_3DLIGHT */,
     RGB(0, 0, 0) /* COLOR_INFOTEXT */,
-    RGB(255, 255, 192) /* COLOR_INFOBK */,
-    RGB(180, 180, 180) /* COLOR_ALTERNATEBTNFACE */,
-    RGB(0, 0, 255) /* COLOR_HOTLIGHT */,
+    RGB(255, 255, 225) /* COLOR_INFOBK */,
+    RGB(181, 181, 181) /* COLOR_ALTERNATEBTNFACE */,
+    RGB(0, 0, 128) /* COLOR_HOTLIGHT */,
     RGB(166, 202, 240) /* COLOR_GRADIENTACTIVECAPTION */,
     RGB(192, 192, 192) /* COLOR_GRADIENTINACTIVECAPTION */,
   };

From 6d616faf61b33508d6d639caf06c3b184048de6b Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Wed, 7 Jul 2004 17:20:35 +0000
Subject: [PATCH 217/356] Add ACCESS_STATE and INITIAL_PRIVILEGE_SET.

svn path=/trunk/; revision=10020
---
 reactos/include/ddk/setypes.h   | 26 +++++++++++++++++++++++++-
 reactos/include/ntos/obtypes.h  |  5 +----
 reactos/include/ntos/security.h |  9 +++++++++
 3 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/reactos/include/ddk/setypes.h b/reactos/include/ddk/setypes.h
index 78baff63748..087e110dbb6 100644
--- a/reactos/include/ddk/setypes.h
+++ b/reactos/include/ddk/setypes.h
@@ -1,4 +1,4 @@
-/* $Id: setypes.h,v 1.13 2004/02/02 12:03:43 ekohl Exp $
+/* $Id: setypes.h,v 1.14 2004/07/07 17:20:35 ekohl Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory for details
  * PROJECT:           ReactOS kernel
@@ -179,6 +179,30 @@ typedef enum _SECURITY_OPERATION_CODE
   AssignSecurityDescriptor
 } SECURITY_OPERATION_CODE, *PSECURITY_OPERATION_CODE;
 
+typedef struct _ACCESS_STATE
+{
+  LUID OperationID;
+  BOOLEAN SecurityEvaluated;
+  BOOLEAN GenerateAudit;
+  BOOLEAN GenerateClose;
+  BOOLEAN PrivilegesAllocated;
+  ULONG Flags;
+  ACCESS_MASK RemainingDesiredAccess;
+  ACCESS_MASK PreviouslyGrantedAccess;
+  ACCESS_MASK OriginallyDesiredAccess;
+  SECURITY_SUBJECT_CONTEXT SubjectSecurityContext; /* 0x1C */
+  PSECURITY_DESCRIPTOR SecurityDescriptor; /* 0x2C */
+  PVOID AuxData; /* 0x30 */
+  union
+  {
+    INITIAL_PRIVILEGE_SET InitialPrivilegeSet;
+    PRIVILEGE_SET PrivilegeSet;
+  } Privileges;
+  BOOLEAN AuditPrivileges;
+  UNICODE_STRING ObjectName;
+  UNICODE_STRING ObjectTypeName;
+} ACCESS_STATE, *PACCESS_STATE;
+
 #endif
 
 /* EOF */
diff --git a/reactos/include/ntos/obtypes.h b/reactos/include/ntos/obtypes.h
index 71a27325dde..958b61f31c3 100755
--- a/reactos/include/ntos/obtypes.h
+++ b/reactos/include/ntos/obtypes.h
@@ -1,14 +1,11 @@
 #ifndef _INCLUDE_DDK_OBTYPES_H
 #define _INCLUDE_DDK_OBTYPES_H
-/* $Id: obtypes.h,v 1.7 2003/10/21 15:49:19 ekohl Exp $ */
+/* $Id: obtypes.h,v 1.8 2004/07/07 17:20:16 ekohl Exp $ */
 struct _DIRECTORY_OBJECT;
 struct _OBJECT_ATTRIBUTES;
 
 #ifndef __USE_W32API
 
-typedef ULONG ACCESS_STATE, *PACCESS_STATE;
-
-
 typedef struct _OBJECT_HANDLE_INFORMATION
 {
   ULONG HandleAttributes;
diff --git a/reactos/include/ntos/security.h b/reactos/include/ntos/security.h
index 87804906b68..ea778000f66 100644
--- a/reactos/include/ntos/security.h
+++ b/reactos/include/ntos/security.h
@@ -349,6 +349,15 @@ typedef struct _PRIVILEGE_SET
   LUID_AND_ATTRIBUTES Privilege[ANYSIZE_ARRAY];
 } PRIVILEGE_SET, *PPRIVILEGE_SET, *LPPRIVILEGE_SET;
 
+#define INITIAL_PRIVILEGE_COUNT 3
+
+typedef struct _INITIAL_PRIVILEGE_SET
+{
+  ULONG PrivilegeCount;
+  ULONG Control;
+  LUID_AND_ATTRIBUTES Privilege[INITIAL_PRIVILEGE_COUNT];
+} INITIAL_PRIVILEGE_SET, *PINITIAL_PRIVILEGE_SET;
+
 typedef struct _SECURITY_ATTRIBUTES
 {
   DWORD  nLength;

From 8d126dbfc4a36f9901beeb8debf72be9e798c2c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Wed, 7 Jul 2004 22:29:37 +0000
Subject: [PATCH 218/356] Add command-line shutdown/logoff utility

svn path=/trunk/; revision=10028
---
 reactos/apps/tests/fiber/fiber.c       |   4 +-
 reactos/apps/utils/Makefile            |   2 +-
 reactos/apps/utils/shutdown/.cvsignore |   6 +
 reactos/apps/utils/shutdown/Makefile   |  23 ++++
 reactos/apps/utils/shutdown/shutdown.c | 168 +++++++++++++++++++++++++
 reactos/include/tchar.h                |  17 ++-
 6 files changed, 212 insertions(+), 8 deletions(-)
 create mode 100644 reactos/apps/utils/shutdown/.cvsignore
 create mode 100644 reactos/apps/utils/shutdown/Makefile
 create mode 100644 reactos/apps/utils/shutdown/shutdown.c

diff --git a/reactos/apps/tests/fiber/fiber.c b/reactos/apps/tests/fiber/fiber.c
index 3dfb2dc1be8..94318f56d13 100644
--- a/reactos/apps/tests/fiber/fiber.c
+++ b/reactos/apps/tests/fiber/fiber.c
@@ -1,4 +1,4 @@
-/* $Id: fiber.c,v 1.3 2004/07/03 17:40:19 navaraf Exp $
+/* $Id: fiber.c,v 1.4 2004/07/07 22:29:37 gvg Exp $
 */
 
 #include <assert.h>
@@ -426,7 +426,7 @@ int _tmain(int argc, _TCHAR const * const * argv)
  unsigned nFibers;
 
  if(argc > 1)
-  nFibers = _tcstoul(argv[1], 0, NULL);
+  nFibers = _tcstoul(argv[1], NULL, 0);
  else
   nFibers = FIBERTEST_COUNT;
 
diff --git a/reactos/apps/utils/Makefile b/reactos/apps/utils/Makefile
index ec127395847..2744bc70c11 100644
--- a/reactos/apps/utils/Makefile
+++ b/reactos/apps/utils/Makefile
@@ -9,7 +9,7 @@ include $(PATH_TO_TOP)/rules.mak
 
 # Console system utilities
 # cabman cat net objdir partinfo pice ps sc stats
-UTIL_APPS = cat objdir partinfo pnpdump sc stats tickcount consw rundll32 regsvr32
+UTIL_APPS = cat objdir partinfo pnpdump sc shutdown stats tickcount consw rundll32 regsvr32
 
 UTIL_NET_APPS = 
 
diff --git a/reactos/apps/utils/shutdown/.cvsignore b/reactos/apps/utils/shutdown/.cvsignore
new file mode 100644
index 00000000000..d63774a7353
--- /dev/null
+++ b/reactos/apps/utils/shutdown/.cvsignore
@@ -0,0 +1,6 @@
+*.o
+*.d
+*.exe
+*.coff
+*.sym
+*.map
diff --git a/reactos/apps/utils/shutdown/Makefile b/reactos/apps/utils/shutdown/Makefile
new file mode 100644
index 00000000000..d47429a5353
--- /dev/null
+++ b/reactos/apps/utils/shutdown/Makefile
@@ -0,0 +1,23 @@
+# $Id: Makefile,v 1.1 2004/07/07 22:29:37 gvg Exp $
+
+PATH_TO_TOP = ../../..
+
+TARGET_NORC = yes
+
+TARGET_TYPE = program
+
+TARGET_APPTYPE = console
+
+TARGET_NAME = shutdown
+
+TARGET_SDKLIBS = kernel32.a user32.a
+
+TARGET_OBJECTS = shutdown.o
+
+TARGET_CFLAGS = -Wall -Werror -D__USE_W32API
+
+include $(PATH_TO_TOP)/rules.mak
+
+include $(TOOLS_PATH)/helper.mk
+
+# EOF
diff --git a/reactos/apps/utils/shutdown/shutdown.c b/reactos/apps/utils/shutdown/shutdown.c
new file mode 100644
index 00000000000..b978a8043cd
--- /dev/null
+++ b/reactos/apps/utils/shutdown/shutdown.c
@@ -0,0 +1,168 @@
+/* $Id: shutdown.c,v 1.1 2004/07/07 22:29:37 gvg Exp $
+ *
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS shutdown/logoff utility
+ * FILE:            apps/utils/shutdown/shutdown.c
+ * PURPOSE:         Initiate logoff, shutdown or reboot of the system
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <windows.h>
+#include <tchar.h>
+
+static void
+PrintUsage(LPCTSTR Cmd)
+{
+  _ftprintf(stderr, _T("usage: %s [action] [flag]\n"), Cmd);
+  _ftprintf(stderr, _T(" action = \"logoff\", \"reboot\", \"shutdown\" or \"poweroff\"\n"));
+  _ftprintf(stderr, _T(" flag = \"force\"\n"));
+}
+
+int
+_tmain(int argc, TCHAR *argv[])
+{
+  static struct
+    {
+      TCHAR *Name;
+      UINT ExitType;
+      UINT ExitFlags;
+    }
+  Options[] =
+    {
+      { _T("logoff"), EWX_LOGOFF, 0 },
+      { _T("logout"), EWX_LOGOFF, 0 },
+      { _T("poweroff"), EWX_POWEROFF, 0 },
+      { _T("powerdown"), EWX_POWEROFF, 0 },
+      { _T("reboot"), EWX_REBOOT, 0 },
+      { _T("restart"), EWX_REBOOT, 0 },
+      { _T("shutdown"), EWX_SHUTDOWN, 0 },
+      { _T("force"), 0, EWX_FORCE }
+    };
+  UINT ExitType, ExitFlags;
+  HANDLE hToken;
+  TOKEN_PRIVILEGES npr;
+  TCHAR *Arg;
+  TCHAR BaseName[_MAX_FNAME];
+  unsigned i, j;
+  BOOL HaveType, Matched;
+
+  ExitType = 0;
+  ExitFlags = 0;
+  HaveType = FALSE;
+
+  _tsplitpath(argv[0], NULL, NULL, BaseName, NULL);
+
+  /* Process optional arguments */
+  for (i = 1; i < (unsigned) argc; i++)
+    {
+      /* Allow e.g. "/s" or "-l" for shutdown resp. logoff */
+      Arg = argv[i];
+      if (_T('/') == *Arg || _T('-') == *Arg)
+        {
+          Arg++;
+        }
+
+      /* Search known options */
+      Matched = FALSE;
+      for (j = 0; j < sizeof(Options) / sizeof(Options[0]) && ! Matched; j++)
+        {
+          /* Match if arg starts the same as the option name */
+          if (0 == _tcsnicmp(Options[j].Name, Arg, _tcslen(Arg)))
+            {
+              if (0 != Options[j].ExitType)
+                {
+                  /* Can have only 1 type */
+                  if (HaveType)
+                    {
+                      PrintUsage(BaseName);
+                      exit(1);
+                    }
+                  ExitType = Options[j].ExitType;
+                  HaveType = TRUE;
+                }
+              else
+                {
+                  /* Can have only 1 flag */
+                  if (0 != ExitFlags)
+                    {
+                      PrintUsage(BaseName);
+                      exit(1);
+                    }
+                  ExitFlags |= Options[j].ExitFlags;
+                }
+              Matched = TRUE;
+            }
+        }
+
+      /* Was the argument processed? */
+      if (! Matched)
+        {
+          PrintUsage(BaseName);
+          exit(1);
+        }
+    }
+
+  /* Check command name if user didn't explicitly specify action */
+  if (! HaveType)
+    {
+      for (j = 0; j < sizeof(Options) / sizeof(Options[0]); j++)
+        {
+          if (0 == _tcsicmp(Options[j].Name, BaseName) && 0 != Options[j].ExitType)
+            {
+              ExitType = Options[j].ExitType;
+              HaveType = TRUE;
+            }
+        }
+    }
+
+  /* Still not sure what to do? */
+  if (! HaveType)
+    {
+      PrintUsage(BaseName);
+      exit(1);
+    }
+
+  /* Everyone can logoff, for the other actions you need the appropriate privilege */
+  if (EWX_LOGOFF != ExitType)
+    {
+      /* enable shutdown privilege for current process */
+      if (! OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken))
+        {
+          _ftprintf(stderr, _T("OpenProcessToken failed with error %d\n"), (int) GetLastError());
+          exit(1);
+        }
+      npr.PrivilegeCount = 1;
+      npr.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
+      if (! LookupPrivilegeValue(NULL, SE_SHUTDOWN_NAME, &npr.Privileges[0].Luid))
+        {
+          CloseHandle(hToken);
+          _ftprintf(stderr, _T("LookupPrivilegeValue failed with error %d\n"), (int) GetLastError());
+          exit(1);
+        }
+      if (! AdjustTokenPrivileges(hToken, FALSE, &npr, 0, 0, 0)
+          || ERROR_SUCCESS != GetLastError())
+        {
+          CloseHandle(hToken);
+          if (ERROR_NOT_ALL_ASSIGNED == GetLastError())
+            {
+              _ftprintf(stderr, _T("You are not authorized to shutdown the system\n"));
+            }
+          else
+            {
+              _ftprintf(stderr, _T("AdjustTokenPrivileges failed with error %d\n"), (int) GetLastError());
+            }
+          exit(1);
+        }
+      CloseHandle(hToken);
+    }
+
+  /* Finally do it */
+  if (! ExitWindowsEx(ExitType | ExitFlags, 0))
+    {
+      _ftprintf(stderr, _T("ExitWindowsEx failed with error %d\n"), (int) GetLastError());
+      exit(1);
+    }
+
+  return 0;
+}
diff --git a/reactos/include/tchar.h b/reactos/include/tchar.h
index 95e6cdbeabd..0ac89e0cff1 100644
--- a/reactos/include/tchar.h
+++ b/reactos/include/tchar.h
@@ -29,14 +29,20 @@
  *  DISCLAIMED. This includes but is not limited to warranties of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Revision: 1.10 $
- * $Author: royce $
- * $Date: 2003/08/11 00:04:05 $
+ * $Revision: 1.11 $
+ * $Author: gvg $
+ * $Date: 2004/07/07 22:29:37 $
  *
  */
 
-#ifndef	_TCHAR_H_
-#define _TCHAR_H_
+#ifndef	_ROS_TCHAR_H_
+#define _ROS_TCHAR_H_
+
+#ifdef __USE_W32API
+
+#include_next <tchar.h>
+
+#else /* Not __USE_W32API */
 
 #include <msvcrt/string.h>
 
@@ -259,3 +265,4 @@ typedef char TCHAR;
 
 #endif	/* Not _TCHAR_H_ */
 
+#endif /* Not __USE_W32API */

From 580f2e7a686fb2a0da7ff3ca441232a867ff9778 Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Thu, 8 Jul 2004 00:40:31 +0000
Subject: [PATCH 219/356] 1. implemented the timer queue functions of kernel32
 (I tested the implementation of CreateTimerQueueTimer() and
 DeleteTimerQueueTimer() on windows) 2. export the timer queue Rtl* stubs of
 ntdll

svn path=/trunk/; revision=10029
---
 reactos/include/base.h                 |   4 +-
 reactos/include/funcs.h                |  23 --
 reactos/include/ntdll/rtl.h            |  31 +-
 reactos/lib/kernel32/makefile          |   4 +-
 reactos/lib/kernel32/misc/stubs.c      | 123 +-------
 reactos/lib/kernel32/misc/timerqueue.c | 377 +++++++++++++++++++++++++
 reactos/lib/ntdll/def/ntdll.def        |   8 +-
 reactos/lib/ntdll/def/ntdll.edf        |   8 +-
 reactos/lib/ntdll/makefile             |   3 +-
 reactos/lib/ntdll/rtl/timerqueue.c     | 119 ++++++++
 10 files changed, 547 insertions(+), 153 deletions(-)
 create mode 100644 reactos/lib/kernel32/misc/timerqueue.c
 create mode 100644 reactos/lib/ntdll/rtl/timerqueue.c

diff --git a/reactos/include/base.h b/reactos/include/base.h
index 282db9f5917..333a062fe56 100644
--- a/reactos/include/base.h
+++ b/reactos/include/base.h
@@ -733,8 +733,8 @@ typedef enum _MEMORY_RESOURCE_NOTIFICATION_TYPE {
     HighMemoryResourceNotification
 } MEMORY_RESOURCE_NOTIFICATION_TYPE;
 
-typedef VOID (CALLBACK *WAITORTIMERCALLBACKFUNC) (PVOID, BOOLEAN );
-typedef WAITORTIMERCALLBACKFUNC WAITORTIMERCALLBACK;
+typedef VOID (CALLBACK *WAITORTIMERCALLBACK) (PVOID, BOOLEAN );
+
 /* End of stuff from ddeml.h in old Cygnus headers */
 /* ----------------------------------------------- */
 
diff --git a/reactos/include/funcs.h b/reactos/include/funcs.h
index 7c8423d1c9a..763a63f156c 100644
--- a/reactos/include/funcs.h
+++ b/reactos/include/funcs.h
@@ -1073,29 +1073,6 @@ STDCALL
 RtlQueryDepthSList (
     PSLIST_HEADER ListHead
     );
-NTSTATUS
-STDCALL
-RtlCreateTimer(HANDLE TimerQueue,PHANDLE phNewTimer, WAITORTIMERCALLBACK Callback,PVOID Parameter,DWORD DueTime,DWORD Period,ULONG Flags);
-
-NTSTATUS
-STDCALL
-RtlCreateTimerQueue(PHANDLE TimerQueue);
-
-NTSTATUS
-STDCALL
-RtlDeleteTimer(HANDLE TimerQueue,HANDLE Timer,HANDLE CompletionEvent);
-
-NTSTATUS
-STDCALL
-RtlUpdateTimer(HANDLE TimerQueue,HANDLE Timer,ULONG DueTime,ULONG Period);
-
-NTSTATUS
-STDCALL
-RtlDeleteTimerQueueEx(HANDLE TimerQueue,HANDLE CompletionEvent);
-
-NTSTATUS
-STDCALL
-RtlDeleteTimerQueue(HANDLE TimerQueue);
 
 NTSTATUS
 STDCALL
diff --git a/reactos/include/ntdll/rtl.h b/reactos/include/ntdll/rtl.h
index 365a41386e3..e61f005d1cc 100644
--- a/reactos/include/ntdll/rtl.h
+++ b/reactos/include/ntdll/rtl.h
@@ -1,4 +1,4 @@
-/* $Id: rtl.h,v 1.43 2004/02/03 14:19:56 ekohl Exp $
+/* $Id: rtl.h,v 1.44 2004/07/08 00:40:30 weiden Exp $
  *
  */
 
@@ -616,6 +616,35 @@ VOID STDCALL
 RtlRunEncodeUnicodeString (IN OUT PUCHAR Hash,
 			   IN OUT PUNICODE_STRING String);
 
+/* Timer Queue functions */
+
+typedef VOID (CALLBACK *WAITORTIMERCALLBACKFUNC) (PVOID, BOOLEAN );
+
+NTSTATUS
+STDCALL
+RtlCreateTimer(HANDLE TimerQueue,PHANDLE phNewTimer, WAITORTIMERCALLBACKFUNC Callback,PVOID Parameter,DWORD DueTime,DWORD Period,ULONG Flags);
+
+NTSTATUS
+STDCALL
+RtlCreateTimerQueue(PHANDLE TimerQueue);
+
+NTSTATUS
+STDCALL
+RtlDeleteTimer(HANDLE TimerQueue,HANDLE Timer,HANDLE CompletionEvent);
+
+NTSTATUS
+STDCALL
+RtlUpdateTimer(HANDLE TimerQueue,HANDLE Timer,ULONG DueTime,ULONG Period);
+
+NTSTATUS
+STDCALL
+RtlDeleteTimerQueueEx(HANDLE TimerQueue,HANDLE CompletionEvent);
+
+NTSTATUS
+STDCALL
+RtlDeleteTimerQueue(HANDLE TimerQueue);
+
+
 #ifndef __NTDRIVER__
 
 #ifndef __INTERLOCKED_DECLARED
diff --git a/reactos/lib/kernel32/makefile b/reactos/lib/kernel32/makefile
index eff36290df5..9258dd80b04 100644
--- a/reactos/lib/kernel32/makefile
+++ b/reactos/lib/kernel32/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.81 2004/06/26 20:11:18 gdalsnes Exp $
+# $Id: makefile,v 1.82 2004/07/08 00:40:30 weiden Exp $
 
 PATH_TO_TOP = ../..
 
@@ -30,7 +30,7 @@ SYNCH_OBJECTS = synch/critical.o synch/event.o synch/intrlck.o synch/mutex.o \
 
 MISC_OBJECTS = misc/error.o misc/atom.o misc/handle.o misc/env.o \
                misc/dllmain.o misc/comm.o misc/errormsg.o \
-               misc/console.o misc/time.o misc/toolhelp.o \
+               misc/console.o misc/time.o misc/timerqueue.o misc/toolhelp.o \
                misc/stubs.o misc/lang.o misc/ldr.o misc/res.o \
                misc/sysinfo.o misc/profile.o \
                misc/mbchars.o misc/muldiv.o misc/computername.o \
diff --git a/reactos/lib/kernel32/misc/stubs.c b/reactos/lib/kernel32/misc/stubs.c
index 0c5056691c7..ca067da5f21 100644
--- a/reactos/lib/kernel32/misc/stubs.c
+++ b/reactos/lib/kernel32/misc/stubs.c
@@ -1,4 +1,4 @@
-/* $Id: stubs.c,v 1.79 2004/06/26 12:56:11 navaraf Exp $
+/* $Id: stubs.c,v 1.80 2004/07/08 00:40:30 weiden Exp $
  *
  * KERNEL32.DLL stubs (unimplemented functions)
  * Remove from this file, if you implement them.
@@ -653,35 +653,6 @@ CancelDeviceWakeupRequest(
     return 0;
 }
 
-/*
- * @unimplemented
- */
-BOOL
-STDCALL
-CancelTimerQueueTimer(
-    HANDLE TimerQueue,
-    HANDLE Timer
-    )
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return 0;
-}
-/*
- * @unimplemented
- */
-
-BOOL
-STDCALL
-ChangeTimerQueueTimer(
-    HANDLE TimerQueue,
-    HANDLE Timer,
-    ULONG DueTime,
-    ULONG Period
-    )
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return 0;
-}
 
 /*
  * @unimplemented
@@ -736,38 +707,6 @@ CreateMemoryResourceNotification(
     return 0;
 }
 
-/*
- * @unimplemented
- */
-HANDLE
-STDCALL
-CreateTimerQueue(
-    VOID
-    )
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return 0;
-}
-
-/*
- * @unimplemented
- */
-BOOL
-STDCALL
-CreateTimerQueueTimer(
-    PHANDLE phNewTimer,
-    HANDLE TimerQueue,
-    WAITORTIMERCALLBACK Callback,
-    PVOID Parameter,
-    DWORD DueTime,
-    DWORD Period,
-    ULONG Flags
-    )
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return 0;
-}
-
 /*
  * @unimplemented
  */
@@ -783,48 +722,6 @@ DeactivateActCtx(
     return 0;
 }
 
-/*
- * @unimplemented
- */
-BOOL
-STDCALL
-DeleteTimerQueue(
-    HANDLE TimerQueue
-    )
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return 0;
-}
-
-/*
- * @unimplemented
- */
-BOOL
-STDCALL
-DeleteTimerQueueEx(
-    HANDLE TimerQueue,
-    HANDLE CompletionEvent
-    )
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return 0;
-}
-
-/*
- * @unimplemented
- */
-BOOL
-STDCALL
-DeleteTimerQueueTimer(
-    HANDLE TimerQueue,
-    HANDLE Timer,
-    HANDLE CompletionEvent
-    )
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return 0;
-}
-
 /*
  * @unimplemented
  */
@@ -1458,24 +1355,6 @@ SetThreadExecutionState(
     return 0;
 }
 
-/*
- * @unimplemented
- */
-HANDLE
-STDCALL
-SetTimerQueueTimer(
-    HANDLE TimerQueue,
-    WAITORTIMERCALLBACK Callback,
-    PVOID Parameter,
-    DWORD DueTime,
-    DWORD Period,
-    BOOL PreferIo
-    )
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return 0;
-}
-
 /*
  * @unimplemented
  */
diff --git a/reactos/lib/kernel32/misc/timerqueue.c b/reactos/lib/kernel32/misc/timerqueue.c
new file mode 100644
index 00000000000..4bb0e1aeeb6
--- /dev/null
+++ b/reactos/lib/kernel32/misc/timerqueue.c
@@ -0,0 +1,377 @@
+/*
+ *  ReactOS kernel
+ *  Copyright (C) 2004 ReactOS Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+/* $Id: timerqueue.c,v 1.1 2004/07/08 00:40:30 weiden Exp $
+ *
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS system libraries
+ * PURPOSE:         Timer Queue functions
+ * FILE:            lib/kernel32/misc/timerqueue.c
+ * PROGRAMER:       Thomas Weidenmueller <w3seek@reactos.com>
+ */
+
+/* INCLUDES ******************************************************************/
+
+#include <k32.h>
+
+#define NDEBUG
+#include "../include/debug.h"
+
+
+/* FUNCTIONS *****************************************************************/
+
+HANDLE DefaultTimerQueue = NULL;
+
+/*
+ * Create the default timer queue for the current process. This function is only
+ * called if CreateTimerQueueTimer() or SetTimerQueueTimer() is called. 
+ * However, ChangeTimerQueueTimer() fails with ERROR_INVALID_PARAMETER if the 
+ * default timer queue has not been created, because it assumes there has to be
+ * a timer queue with a timer if it want's to be changed.
+ */
+static BOOL
+IntCreateDefaultTimerQueue(VOID)
+{
+  NTSTATUS Status;
+  
+  /* FIXME - make this thread safe */
+  
+  /* create the timer queue */
+  Status = RtlCreateTimerQueue(&DefaultTimerQueue);
+  if(!NT_SUCCESS(Status))
+  {
+    SetLastErrorByStatus(Status);
+    DPRINT1("Unable to create the default timer queue!\n");
+    return FALSE;
+  }
+  
+  return TRUE;
+}
+
+/*
+ * @implemented
+ */
+BOOL
+STDCALL
+CancelTimerQueueTimer(HANDLE TimerQueue,
+                      HANDLE Timer)
+{
+  /* Since this function is not documented in PSDK and apparently does nothing
+     but delete the timer, we just do the same as DeleteTimerQueueTimer(), without
+     passing a completion event. */
+  NTSTATUS Status;
+  
+  if(TimerQueue == NULL)
+  {
+    /* let's use the process' default timer queue. We assume the default timer
+       queue has been created with a previous call to CreateTimerQueueTimer() or
+       SetTimerQueueTimer(), otherwise this call wouldn't make much sense. */
+    if(!(TimerQueue = DefaultTimerQueue))
+    {
+      SetLastError(ERROR_INVALID_HANDLE);
+      return FALSE;
+    }
+  }
+  
+  if(Timer == NULL)
+  {
+    SetLastError(ERROR_INVALID_PARAMETER);
+    return FALSE;
+  }
+  
+  /* delete the timer */
+  Status = RtlDeleteTimer(TimerQueue, Timer, NULL);
+  
+  if(!NT_SUCCESS(Status))
+  {
+    SetLastErrorByStatus(Status);
+    return FALSE; 
+  }
+  
+  return TRUE;
+}
+
+/*
+ * @implemented
+ */
+BOOL
+STDCALL
+ChangeTimerQueueTimer(HANDLE TimerQueue,
+                      HANDLE Timer,
+                      ULONG DueTime,
+                      ULONG Period)
+{
+  NTSTATUS Status;
+  
+  if(TimerQueue == NULL)
+  {
+    /* let's use the process' default timer queue. We assume the default timer
+       queue has been created with a previous call to CreateTimerQueueTimer() or
+       SetTimerQueueTimer(), otherwise this call wouldn't make much sense. */
+    if(!(TimerQueue = DefaultTimerQueue))
+    {
+      SetLastError(ERROR_INVALID_HANDLE);
+      return FALSE;
+    }
+  }
+  
+  if(Timer == NULL)
+  {
+    SetLastError(ERROR_INVALID_PARAMETER);
+    return FALSE;
+  }
+  
+  /* update the timer */
+  Status = RtlUpdateTimer(TimerQueue, Timer, DueTime, Period);
+  if(!NT_SUCCESS(Status))
+  {
+    SetLastErrorByStatus(Status);
+    return FALSE;
+  }
+  
+  return TRUE;
+}
+
+/*
+ * @implemented
+ */
+HANDLE
+STDCALL
+CreateTimerQueue(VOID)
+{
+  HANDLE Handle;
+  NTSTATUS Status;
+  
+  /* create the timer queue */
+  Status = RtlCreateTimerQueue(&Handle);
+  if(!NT_SUCCESS(Status))
+  {
+    SetLastErrorByStatus(Status);
+    return NULL;
+  }
+  
+  return Handle;
+}
+
+/*
+ * @implemented
+ */
+BOOL
+STDCALL
+CreateTimerQueueTimer(PHANDLE phNewTimer,
+                      HANDLE TimerQueue,
+                      WAITORTIMERCALLBACK Callback,
+                      PVOID Parameter,
+                      DWORD DueTime,
+                      DWORD Period,
+                      ULONG Flags)
+{
+  NTSTATUS Status;
+  
+  /* windows seems not to test this parameter at all, so we'll try to clear it here
+     so we don't crash somewhere inside ntdll */
+  *phNewTimer = NULL;
+  
+  if(TimerQueue == NULL)
+  {
+    /* the default timer queue is requested, try to create it if it hasn't been already */
+    if(!(TimerQueue = DefaultTimerQueue))
+    {
+      if(!IntCreateDefaultTimerQueue())
+      {
+        /* IntCreateDefaultTimerQueue() set the last error code already, just fail */
+        return FALSE;
+      }
+      TimerQueue = DefaultTimerQueue;
+    }
+  }
+  
+  /* !!! Win doesn't even check if Callback == NULL, so we don't, too! That'll
+         raise a nice exception later... */
+  
+  /* create the timer */
+  Status = RtlCreateTimer(TimerQueue, phNewTimer, Callback, Parameter, DueTime,
+                          Period, Flags);
+  if(!NT_SUCCESS(Status))
+  {
+    SetLastErrorByStatus(Status);
+    return FALSE;
+  }
+  
+  return TRUE;
+}
+
+/*
+ * @implemented
+ */
+BOOL
+STDCALL
+DeleteTimerQueue(HANDLE TimerQueue)
+{
+  NTSTATUS Status;
+  
+  /* We don't allow the user to delete the default timer queue */
+  if(TimerQueue == NULL)
+  {
+    SetLastError(ERROR_INVALID_HANDLE);
+    return FALSE;
+  }
+  
+  /* delete the timer queue */
+  Status = RtlDeleteTimerQueue(TimerQueue);
+  return NT_SUCCESS(Status);
+}
+
+/*
+ * @implemented
+ */
+BOOL
+STDCALL
+DeleteTimerQueueEx(HANDLE TimerQueue,
+                   HANDLE CompletionEvent)
+{
+  NTSTATUS Status;
+  
+  /* We don't allow the user to delete the default timer queue */
+  if(TimerQueue == NULL)
+  {
+    SetLastError(ERROR_INVALID_HANDLE);
+    return FALSE;
+  }
+  
+  /* delete the queue */
+  Status = RtlDeleteTimerQueueEx(TimerQueue, CompletionEvent);
+  
+  if((CompletionEvent != INVALID_HANDLE_VALUE && Status == STATUS_PENDING) ||
+     !NT_SUCCESS(Status))
+  {
+    /* In case CompletionEvent == NULL, RtlDeleteTimerQueueEx() returns before
+       all callback routines returned. We set the last error code to STATUS_PENDING
+       and return FALSE. In case CompletionEvent == INVALID_HANDLE_VALUE we only 
+       can get here if another error occured. In case CompletionEvent is something
+       else, we get here and fail, even though it isn't really an error (if Status == STATUS_PENDING).
+       We also handle all other failures the same way. */
+    
+    SetLastErrorByStatus(Status);
+    return FALSE; 
+  }
+  
+  return TRUE;
+}
+
+/*
+ * @implemented
+ */
+BOOL
+STDCALL
+DeleteTimerQueueTimer(HANDLE TimerQueue,
+                      HANDLE Timer,
+                      HANDLE CompletionEvent)
+{
+  NTSTATUS Status;
+  
+  if(TimerQueue == NULL)
+  {
+    /* let's use the process' default timer queue. We assume the default timer
+       queue has been created with a previous call to CreateTimerQueueTimer() or
+       SetTimerQueueTimer(), otherwise this call wouldn't make much sense. */
+    if(!(TimerQueue = DefaultTimerQueue))
+    {
+      SetLastError(ERROR_INVALID_HANDLE);
+      return FALSE;
+    }
+  }
+  
+  if(Timer == NULL)
+  {
+    SetLastError(ERROR_INVALID_PARAMETER);
+    return FALSE;
+  }
+  
+  /* delete the timer */
+  Status = RtlDeleteTimer(TimerQueue, Timer, CompletionEvent);
+  
+  if((CompletionEvent != INVALID_HANDLE_VALUE && Status == STATUS_PENDING) ||
+     !NT_SUCCESS(Status))
+  {
+    /* In case CompletionEvent == NULL, RtlDeleteTimer() returns before
+       the callback routine returned. We set the last error code to STATUS_PENDING
+       and return FALSE. In case CompletionEvent == INVALID_HANDLE_VALUE we only 
+       can get here if another error occured. In case CompletionEvent is something
+       else, we get here and fail, even though it isn't really an error (if Status == STATUS_PENDING).
+       We also handle all other failures the same way. */
+    
+    SetLastErrorByStatus(Status);
+    return FALSE; 
+  }
+  
+  return TRUE;
+}
+
+/*
+ * @implemented
+ */
+HANDLE
+STDCALL
+SetTimerQueueTimer(HANDLE TimerQueue,
+                   WAITORTIMERCALLBACK Callback,
+                   PVOID Parameter,
+                   DWORD DueTime,
+                   DWORD Period,
+                   BOOL PreferIo)
+{
+  /* Since this function is not documented in PSDK and apparently does nothing
+     but create a timer, we just do the same as CreateTimerQueueTimer(). Unfortunately
+     I don't really know what PreferIo is supposed to be, it propably just affects the
+     Flags parameter of CreateTimerQueueTimer(). Looking at the PSDK documentation of
+     CreateTimerQueueTimer() there's only one flag (WT_EXECUTEINIOTHREAD) that causes
+     the callback function queued to an I/O worker thread. I guess it uses this flag
+     if PreferIo == TRUE, otherwise let's just use WT_EXECUTEDEFAULT. We should
+     test this though, this is only guess work and I'm too lazy to do further 
+     investigation. */
+  
+  HANDLE Timer;
+  NTSTATUS Status;
+  
+  if(TimerQueue == NULL)
+  {
+    /* the default timer queue is requested, try to create it if it hasn't been already */
+    if(!(TimerQueue = DefaultTimerQueue))
+    {
+      if(!IntCreateDefaultTimerQueue())
+      {
+        /* IntCreateDefaultTimerQueue() set the last error code already, just fail */
+        return FALSE;
+      }
+      TimerQueue = DefaultTimerQueue;
+    }
+  }
+  
+  /* create the timer */
+  Status = RtlCreateTimer(TimerQueue, &Timer, Callback, Parameter, DueTime,
+                          Period, (PreferIo ? WT_EXECUTEINIOTHREAD : WT_EXECUTEDEFAULT));
+  if(!NT_SUCCESS(Status))
+  {
+    SetLastErrorByStatus(Status);
+    return NULL;
+  }
+  
+  return Timer;
+}
+
+/* EOF */
diff --git a/reactos/lib/ntdll/def/ntdll.def b/reactos/lib/ntdll/def/ntdll.def
index ab3eb203f25..eabbc65de8a 100644
--- a/reactos/lib/ntdll/def/ntdll.def
+++ b/reactos/lib/ntdll/def/ntdll.def
@@ -1,4 +1,4 @@
-; $Id: ntdll.def,v 1.123 2004/07/03 17:13:09 hbirr Exp $
+; $Id: ntdll.def,v 1.124 2004/07/08 00:40:30 weiden Exp $
 ;
 ; ReactOS Operating System
 ;
@@ -354,6 +354,8 @@ RtlCreateProcessParameters@40
 RtlCreateRegistryKey@8
 RtlCreateSecurityDescriptor@8
 ;RtlCreateTagHeap
+RtlCreateTimer@28
+RtlCreateTimerQueue@4
 RtlCreateUnicodeString@8
 RtlCreateUnicodeStringFromAsciiz@8
 RtlCreateUserProcess@40
@@ -377,6 +379,9 @@ RtlDeleteRange@24
 RtlDeleteRegistryValue@12
 RtlDeleteResource@4
 ;RtlDeleteSecurityObject
+RtlDeleteTimer@12
+RtlDeleteTimerQueue@4
+RtlDeleteTimerQueueEx@8
 RtlDestroyAtomTable@4
 RtlDestroyEnvironment@4
 RtlDestroyHandleTable@4
@@ -623,6 +628,7 @@ RtlUpcaseUnicodeStringToOemString@12
 RtlUpcaseUnicodeToCustomCPN@24
 RtlUpcaseUnicodeToMultiByteN@20
 RtlUpcaseUnicodeToOemN@20
+RtlUpdateTimer@16
 RtlUpperChar@4
 RtlUpperString@8
 ;RtlUsageHeap
diff --git a/reactos/lib/ntdll/def/ntdll.edf b/reactos/lib/ntdll/def/ntdll.edf
index a3cb299df88..ebfbc5a1778 100644
--- a/reactos/lib/ntdll/def/ntdll.edf
+++ b/reactos/lib/ntdll/def/ntdll.edf
@@ -1,4 +1,4 @@
-; $Id: ntdll.edf,v 1.113 2004/07/03 17:13:09 hbirr Exp $
+; $Id: ntdll.edf,v 1.114 2004/07/08 00:40:30 weiden Exp $
 ;
 ; ReactOS Operating System
 ;
@@ -354,6 +354,8 @@ RtlCreateProcessParameters=RtlCreateProcessParameters@40
 RtlCreateRegistryKey=RtlCreateRegistryKey@8
 RtlCreateSecurityDescriptor=RtlCreateSecurityDescriptor@8
 ;RtlCreateTagHeap
+RtlCreateTimer=RtlCreateTimer@28
+RtlCreateTimerQueue=RtlCreateTimerQueue@4
 RtlCreateUnicodeString=RtlCreateUnicodeString@8
 RtlCreateUnicodeStringFromAsciiz=RtlCreateUnicodeStringFromAsciiz@8
 RtlCreateUserProcess=RtlCreateUserProcess@40
@@ -377,6 +379,9 @@ RtlDeleteRange=RtlDeleteRange@24
 RtlDeleteRegistryValue=RtlDeleteRegistryValue@12
 RtlDeleteResource=RtlDeleteResource@4
 ;RtlDeleteSecurityObject
+RtlDeleteTimer=RtlDeleteTimer@12
+RtlDeleteTimerQueue=RtlDeleteTimerQueue@4
+RtlDeleteTimerQueueEx=RtlDeleteTimerQueueEx@8
 RtlDestroyAtomTable=RtlDestroyAtomTable@4
 RtlDestroyEnvironment=RtlDestroyEnvironment@4
 RtlDestroyHandleTable=RtlDestroyHandleTable@4
@@ -625,6 +630,7 @@ RtlUpcaseUnicodeStringToOemString=RtlUpcaseUnicodeStringToOemString@12
 RtlUpcaseUnicodeToCustomCPN=RtlUpcaseUnicodeToCustomCPN@24
 RtlUpcaseUnicodeToMultiByteN=RtlUpcaseUnicodeToMultiByteN@20
 RtlUpcaseUnicodeToOemN=RtlUpcaseUnicodeToOemN@20
+RtlUpdateTimer=RtlUpdateTimer@16
 RtlUpperChar=RtlUpperChar@4
 RtlUpperString=RtlUpperString@8
 ;RtlUsageHeap
diff --git a/reactos/lib/ntdll/makefile b/reactos/lib/ntdll/makefile
index e8d80ccb614..58585e0afd4 100644
--- a/reactos/lib/ntdll/makefile
+++ b/reactos/lib/ntdll/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.105 2004/07/03 17:40:23 navaraf Exp $
+# $Id: makefile,v 1.106 2004/07/08 00:40:31 weiden Exp $
 
 PATH_TO_TOP = ../..
 
@@ -83,6 +83,7 @@ RTL_OBJECTS = \
 	rtl/resource.o \
 	rtl/teb.o \
 	rtl/thread.o \
+	rtl/timerqueue.o \
 	rtl/libsupp.o
 
 STDIO_OBJECTS = \
diff --git a/reactos/lib/ntdll/rtl/timerqueue.c b/reactos/lib/ntdll/rtl/timerqueue.c
new file mode 100644
index 00000000000..74875dc8c2b
--- /dev/null
+++ b/reactos/lib/ntdll/rtl/timerqueue.c
@@ -0,0 +1,119 @@
+/*
+ *  ReactOS kernel
+ *  Copyright (C) 2004 ReactOS Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+/* $Id: timerqueue.c,v 1.1 2004/07/08 00:40:31 weiden Exp $
+ *
+ * COPYRIGHT:         See COPYING in the top level directory
+ * PROJECT:           ReactOS system libraries
+ * PURPOSE:           Timer Queue implementation
+ * FILE:              lib/ntdll/rtl/timerqueue.c
+ */
+
+/* INCLUDES ****************************************************************/
+
+#include <ddk/ntddk.h>
+
+#define NDEBUG
+#include <ntdll/ntdll.h>
+
+typedef VOID (CALLBACK *WAITORTIMERCALLBACKFUNC) (PVOID, BOOLEAN );
+
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+RtlCreateTimer(HANDLE TimerQueue,
+               PHANDLE phNewTimer,
+	       WAITORTIMERCALLBACKFUNC Callback,
+	       PVOID Parameter,
+	       DWORD DueTime,
+	       DWORD Period,
+	       ULONG Flags)
+{
+  DPRINT1("RtlCreateTimer: stub\n");
+  return STATUS_NOT_IMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+RtlCreateTimerQueue(PHANDLE TimerQueue)
+{
+  DPRINT1("RtlCreateTimer: stub\n");
+  return STATUS_NOT_IMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+RtlDeleteTimer(HANDLE TimerQueue,
+               HANDLE Timer,
+	       HANDLE CompletionEvent)
+{
+  DPRINT1("RtlCreateTimer: stub\n");
+  return STATUS_NOT_IMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+RtlDeleteTimerQueue(HANDLE TimerQueue)
+{
+  DPRINT1("RtlCreateTimer: stub\n");
+  return STATUS_NOT_IMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+RtlDeleteTimerQueueEx(HANDLE TimerQueue,
+                      HANDLE CompletionEvent)
+{
+  DPRINT1("RtlCreateTimer: stub\n");
+  return STATUS_NOT_IMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+RtlUpdateTimer(HANDLE TimerQueue,
+               HANDLE Timer,
+	       ULONG DueTime,
+	       ULONG Period)
+{
+  DPRINT1("RtlCreateTimer: stub\n");
+  return STATUS_NOT_IMPLEMENTED;
+}
+
+/* EOF */

From 76cd746a0f914b5b179b74c5cfe7baeede75b91e Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Thu, 8 Jul 2004 00:46:22 +0000
Subject: [PATCH 220/356] Fixed handling of NULL arguments in
 ChangeDisplaySettings(Ex)(). Patch by blight.

svn path=/trunk/; revision=10030
---
 reactos/lib/user32/misc/display.c | 36 ++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/reactos/lib/user32/misc/display.c b/reactos/lib/user32/misc/display.c
index cbbe12e2b2e..3f40870a22f 100644
--- a/reactos/lib/user32/misc/display.c
+++ b/reactos/lib/user32/misc/display.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: display.c,v 1.9 2004/04/09 20:03:14 navaraf Exp $
+/* $Id: display.c,v 1.10 2004/07/08 00:46:22 weiden Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/misc/dde.c
@@ -241,19 +241,30 @@ ChangeDisplaySettingsExA(
 {
   LONG rc;
   UNICODE_STRING DeviceName;
+  PUNICODE_STRING pDeviceName = &DeviceName;
   DEVMODEW DevModeW;
+  LPDEVMODEW pDevModeW = &DevModeW;
 
-  if ( !RtlCreateUnicodeStringFromAsciiz ( &DeviceName, (PCSZ)lpszDeviceName ) )
+  if (lpszDeviceName != NULL)
     {
-      SetLastError ( ERROR_OUTOFMEMORY );
-      return DISP_CHANGE_BADPARAM; /* FIXME what to return? */
+      if ( !RtlCreateUnicodeStringFromAsciiz ( pDeviceName, (PCSZ)lpszDeviceName ) )
+        {
+          SetLastError ( ERROR_OUTOFMEMORY );
+          return DISP_CHANGE_BADPARAM; /* FIXME what to return? */
+        }
     }
+  else
+    pDeviceName = NULL;
 
-  RosRtlDevModeA2W ( &DevModeW, lpDevMode );
+  if (lpDevMode != NULL)
+    RosRtlDevModeA2W ( pDevModeW, lpDevMode );
+  else
+    pDevModeW = NULL;
 
-  rc = NtUserChangeDisplaySettings ( &DeviceName, &DevModeW, hwnd, dwflags, lParam );
+  rc = NtUserChangeDisplaySettings ( pDeviceName, pDevModeW, hwnd, dwflags, lParam );
 
-  RtlFreeUnicodeString ( &DeviceName );
+  if (lpszDeviceName != NULL)
+    RtlFreeUnicodeString ( &DeviceName );
 
   return rc;
 }
@@ -286,12 +297,17 @@ ChangeDisplaySettingsExW(
 {
   LONG rc;
   UNICODE_STRING DeviceName;
+  PUNICODE_STRING pDeviceName = &DeviceName;
 
-  RtlInitUnicodeString ( &DeviceName, lpszDeviceName );
+  if (lpszDeviceName != NULL)
+    RtlInitUnicodeString ( pDeviceName, lpszDeviceName );
+  else
+    pDeviceName = NULL;
 
-  rc = NtUserChangeDisplaySettings ( &DeviceName, lpDevMode, hwnd, dwflags, lParam );
+  rc = NtUserChangeDisplaySettings ( pDeviceName, lpDevMode, hwnd, dwflags, lParam );
 
-  RtlFreeUnicodeString ( &DeviceName );
+  if (lpszDeviceName != NULL)
+    RtlFreeUnicodeString ( pDeviceName );
 
   return rc;
 }

From aa11660dd0ac8675c24f61048401c9e4b0545c3a Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Thu, 8 Jul 2004 00:48:12 +0000
Subject: [PATCH 221/356] fixed debug output

svn path=/trunk/; revision=10031
---
 reactos/lib/ntdll/rtl/timerqueue.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/reactos/lib/ntdll/rtl/timerqueue.c b/reactos/lib/ntdll/rtl/timerqueue.c
index 74875dc8c2b..91ffc39bfbb 100644
--- a/reactos/lib/ntdll/rtl/timerqueue.c
+++ b/reactos/lib/ntdll/rtl/timerqueue.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: timerqueue.c,v 1.1 2004/07/08 00:40:31 weiden Exp $
+/* $Id: timerqueue.c,v 1.2 2004/07/08 00:48:12 weiden Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS system libraries
@@ -58,7 +58,7 @@ NTSTATUS
 STDCALL
 RtlCreateTimerQueue(PHANDLE TimerQueue)
 {
-  DPRINT1("RtlCreateTimer: stub\n");
+  DPRINT1("RtlCreateTimerQueue: stub\n");
   return STATUS_NOT_IMPLEMENTED;
 }
 
@@ -72,7 +72,7 @@ RtlDeleteTimer(HANDLE TimerQueue,
                HANDLE Timer,
 	       HANDLE CompletionEvent)
 {
-  DPRINT1("RtlCreateTimer: stub\n");
+  DPRINT1("RtlDeleteTimer: stub\n");
   return STATUS_NOT_IMPLEMENTED;
 }
 
@@ -84,7 +84,7 @@ NTSTATUS
 STDCALL
 RtlDeleteTimerQueue(HANDLE TimerQueue)
 {
-  DPRINT1("RtlCreateTimer: stub\n");
+  DPRINT1("RtlDeleteTimerQueue: stub\n");
   return STATUS_NOT_IMPLEMENTED;
 }
 
@@ -97,7 +97,7 @@ STDCALL
 RtlDeleteTimerQueueEx(HANDLE TimerQueue,
                       HANDLE CompletionEvent)
 {
-  DPRINT1("RtlCreateTimer: stub\n");
+  DPRINT1("RtlDeleteTimerQueueEx: stub\n");
   return STATUS_NOT_IMPLEMENTED;
 }
 
@@ -112,7 +112,7 @@ RtlUpdateTimer(HANDLE TimerQueue,
 	       ULONG DueTime,
 	       ULONG Period)
 {
-  DPRINT1("RtlCreateTimer: stub\n");
+  DPRINT1("RtlUpdateTimer: stub\n");
   return STATUS_NOT_IMPLEMENTED;
 }
 

From 494edc04e53ca256a7744db220ecaf1f5875ebc6 Mon Sep 17 00:00:00 2001
From: Art Yerkes <art.yerkes@gmail.com>
Date: Thu, 8 Jul 2004 06:36:04 +0000
Subject: [PATCH 222/356] Fixed for TCPIP

Regularized TCPSendData and TCPReceiveData parameters and calling.
Added number of bytes IoStatus for TDI_SEND_DATAGRAM and TDI_SEND as
specified in the OSR entry for TDI_SEND_DATAGRAM.
Fixed IRQL in packet send event.  We now use KeRaiseIrql to make sure we're
in DISPATCH_LEVEL.
Fixed socket state callback for new afd.  Now fully based on io completion.

svn path=/trunk/; revision=10032
---
 reactos/drivers/net/tcpip/include/rawip.h     |   3 +-
 reactos/drivers/net/tcpip/include/tcp.h       |   5 +-
 reactos/drivers/net/tcpip/include/titypes.h   |  66 ++---
 reactos/drivers/net/tcpip/include/udp.h       |   3 +-
 reactos/drivers/net/tcpip/tcpip/address.c     |  20 +-
 reactos/drivers/net/tcpip/tcpip/dispatch.c    | 100 +++++---
 reactos/drivers/net/tcpip/tcpip/fileobjs.c    |   6 +-
 reactos/drivers/net/tcpip/tcpip/main.c        |  12 +-
 .../drivers/net/tcpip/transport/rawip/rawip.c |   5 +-
 .../drivers/net/tcpip/transport/tcp/event.c   | 233 +++++++-----------
 reactos/drivers/net/tcpip/transport/tcp/tcp.c | 108 ++++++--
 reactos/drivers/net/tcpip/transport/udp/udp.c |   9 +-
 12 files changed, 304 insertions(+), 266 deletions(-)

diff --git a/reactos/drivers/net/tcpip/include/rawip.h b/reactos/drivers/net/tcpip/include/rawip.h
index fbd0961d9fa..c3599a5b7fd 100644
--- a/reactos/drivers/net/tcpip/include/rawip.h
+++ b/reactos/drivers/net/tcpip/include/rawip.h
@@ -11,7 +11,8 @@ NTSTATUS RawIPSendDatagram(
     PTDI_REQUEST Request,
     PTDI_CONNECTION_INFORMATION ConnInfo,
     PNDIS_BUFFER Buffer,
-    ULONG DataSize);
+    ULONG DataSize,
+    PULONG DataUsed);
 
 VOID RawIPReceive(
     PNET_TABLE_ENTRY NTE,
diff --git a/reactos/drivers/net/tcpip/include/tcp.h b/reactos/drivers/net/tcpip/include/tcp.h
index c71391ba8ae..d3f876926b8 100644
--- a/reactos/drivers/net/tcpip/include/tcp.h
+++ b/reactos/drivers/net/tcpip/include/tcp.h
@@ -104,9 +104,10 @@ NTSTATUS TCPReceiveData(
 
 NTSTATUS TCPSendData(
   PTDI_REQUEST Request,
-  PTDI_CONNECTION_INFORMATION ConnInfo,
   PNDIS_BUFFER Buffer,
-  ULONG DataSize);
+  ULONG DataSize,
+  ULONG Flags,
+  PULONG DataUsed);
 
 NTSTATUS TCPStartup(
   VOID);
diff --git a/reactos/drivers/net/tcpip/include/titypes.h b/reactos/drivers/net/tcpip/include/titypes.h
index 46955a231a9..ced8385c559 100644
--- a/reactos/drivers/net/tcpip/include/titypes.h
+++ b/reactos/drivers/net/tcpip/include/titypes.h
@@ -100,7 +100,8 @@ typedef NTSTATUS (*DATAGRAM_SEND_ROUTINE)(
     PTDI_REQUEST Request,
     PTDI_CONNECTION_INFORMATION ConnInfo,
     PNDIS_BUFFER Buffer,
-    ULONG DataSize);
+    ULONG DataSize,
+    PULONG DataUsed);
 
 /* Datagram completion handler prototype */
 typedef VOID (*DATAGRAM_COMPLETION_ROUTINE)(
@@ -295,54 +296,31 @@ typedef struct _TCP_SEGMENT {
   ULONG BytesDelivered;       /* Number of bytes already delivered to the client */
 } TCP_SEGMENT, *PTCP_SEGMENT;
 
+typedef struct _TDI_BUCKET {
+    LIST_ENTRY Entry;
+    TDI_REQUEST Request;
+} TDI_BUCKET, *PTDI_BUCKET;
 
 /* Transport connection context structure A.K.A. Transmission Control Block
    (TCB) in TCP terminology. The FileObject->FsContext2 field holds a pointer
    to this structure */
 typedef struct _CONNECTION_ENDPOINT {
-  LIST_ENTRY ListEntry;       /* Entry on list */
-  KSPIN_LOCK Lock;            /* Spin lock to protect this structure */
-  ULONG RefCount;             /* Number of references to this object */
-  PVOID ClientContext;        /* Pointer to client context information */
-  PADDRESS_FILE AddressFile;  /* Associated address file object (NULL if none) */
-  PVOID SocketContext;        /* Context for lower layer */
-
-#if 0
-  PIP_ADDRESS LocalAddress;   /* Pointer to local IP address */
-  USHORT LocalPort;           /* Local port number (network byte order) */
-
-  PIP_ADDRESS RemoteAddress;  /* Pointer to remote IP address */
-  USHORT RemotePort;          /* Remote port number (network byte order) */
-
-  CONNECTION_STATE State;     /* Connection state */
-  /* Send sequence variables */
-  ULONG SendUnacknowledged;   /* Highest sequence number that is acknowledged */
-  ULONG SendNext;             /* Sequence number of last data block sent */
-  ULONG SendWindow;           /* Maximum allowed number of octets in a segment */
-  ULONG SendUrgentPointer;    /* Sequence number of start of urgent data */
-  ULONG SendWL1;              /* Sequence number used for last window update */
-  ULONG SendWL2;              /* Acknowledgment number used for last window update */
-  ULONG SendISS;              /* Initial send sequence number */
-
-  /* Receive sequence variables */
-  ULONG ReceiveNext;          /* Next sequence number expected and start of receive window */
-  ULONG ReceiveWindow;        /* Maximum allowed number of octets in a segment */
-  ULONG ReceiveUrgentPointer; /* Sequence number of start of urgent data */
-  ULONG ReceiveIRS;           /* Initial receive sequence number */
-  ULONG ReceiveDelivered;     /* Next sequence number to be delivered to the client */
-
-  /* Statistics for computing the retransmission timeout */
-  ULONG TimestampSend;        /* Timestamp when sending a segment */
-  ULONG TimestampAck;         /* Timestamp when receiving acknowledgment */
-#endif
-
-  /* Requests */
-  PTDI_REQUEST ListenRequest; /* Queued listen request */
-  LIST_ENTRY ReceiveRequests; /* Queued receive requests */
-
-  /* Queues */
-  LIST_ENTRY ReceivedSegments;/* Segments that are received */
-
+    LIST_ENTRY ListEntry;       /* Entry on list */
+    KSPIN_LOCK Lock;            /* Spin lock to protect this structure */
+    ULONG RefCount;             /* Number of references to this object */
+    PVOID ClientContext;        /* Pointer to client context information */
+    PADDRESS_FILE AddressFile;  /* Associated address file object (NULL if none) */
+    PVOID SocketContext;        /* Context for lower layer */
+    
+    UINT State;                 /* Socket state W.R.T. oskit */
+    
+    /* Requests */
+    LIST_ENTRY ConnectRequest; /* Queued connect rqueusts */
+    LIST_ENTRY ListenRequest;  /* Queued listen requests */
+    LIST_ENTRY ReceiveRequest; /* Queued receive requests */
+    
+    /* Queues */
+    LIST_ENTRY ReceivedSegments;/* Segments that are received */
 } CONNECTION_ENDPOINT, *PCONNECTION_ENDPOINT;
 
 
diff --git a/reactos/drivers/net/tcpip/include/udp.h b/reactos/drivers/net/tcpip/include/udp.h
index 02464046c3a..532324f6013 100644
--- a/reactos/drivers/net/tcpip/include/udp.h
+++ b/reactos/drivers/net/tcpip/include/udp.h
@@ -42,7 +42,8 @@ NTSTATUS UDPSendDatagram(
   PTDI_REQUEST Request,
   PTDI_CONNECTION_INFORMATION ConnInfo,
   PNDIS_BUFFER Buffer,
-  ULONG DataSize);
+  ULONG DataSize,
+  PULONG DataUsed);
 
 NTSTATUS UDPReceiveDatagram(
   PTDI_REQUEST Request,
diff --git a/reactos/drivers/net/tcpip/tcpip/address.c b/reactos/drivers/net/tcpip/tcpip/address.c
index 3443675e974..cafb98f13e4 100644
--- a/reactos/drivers/net/tcpip/tcpip/address.c
+++ b/reactos/drivers/net/tcpip/tcpip/address.c
@@ -210,11 +210,22 @@ NTSTATUS AddrBuildAddress(
   PTDI_ADDRESS_IP ValidAddr;
   PIP_ADDRESS IPAddress;
 
-  if (TdiAddress->AddressType != TDI_ADDRESS_TYPE_IP)
-    return STATUS_INVALID_ADDRESS;
+  TI_DbgPrint(MID_TRACE,("Address in:\n"));
+  OskitDumpBuffer( TdiAddress, sizeof(*TdiAddress) );
 
-  if (TdiAddress->AddressLength != TDI_ADDRESS_LENGTH_IP)
+  if (TdiAddress->AddressType != TDI_ADDRESS_TYPE_IP) {
+      TI_DbgPrint
+	  (MID_TRACE,("AddressType %x, Not valid\n", 
+		      TdiAddress->AddressType));
     return STATUS_INVALID_ADDRESS;
+  }
+  if (TdiAddress->AddressLength < TDI_ADDRESS_LENGTH_IP) {
+      TI_DbgPrint
+	  (MID_TRACE,("AddressLength %x, Not valid (expected %x)\n", 
+		      TdiAddress->AddressLength, TDI_ADDRESS_LENGTH_IP));
+      return STATUS_INVALID_ADDRESS;
+  }
+
 
   ValidAddr = (PTDI_ADDRESS_IP)TdiAddress->Address;
 
@@ -226,6 +237,9 @@ NTSTATUS AddrBuildAddress(
   *Address = IPAddress;
   *Port = ValidAddr->sin_port;
 
+  TI_DbgPrint(MID_TRACE,("Address out:\n"));
+  OskitDumpBuffer( IPAddress, sizeof(*IPAddress) );
+
   return STATUS_SUCCESS;
 }
 
diff --git a/reactos/drivers/net/tcpip/tcpip/dispatch.c b/reactos/drivers/net/tcpip/tcpip/dispatch.c
index fe1ec1e7fa5..7473e0c01fa 100644
--- a/reactos/drivers/net/tcpip/tcpip/dispatch.c
+++ b/reactos/drivers/net/tcpip/tcpip/dispatch.c
@@ -187,9 +187,10 @@ VOID DispDataRequestComplete(
     PTRANSPORT_CONTEXT TranContext;
     KIRQL OldIrql;
 
-    TI_DbgPrint(DEBUG_IRP, ("Called.\n"));
+    TI_DbgPrint(DEBUG_IRP, ("Called for irp %x (%x, %d).\n", 
+			    Context, Status, Count));
 
-    Irp         = (PIRP)Context;
+    Irp         = Context;
     IrpSp       = IoGetCurrentIrpStackLocation(Irp);
     TranContext = (PTRANSPORT_CONTEXT)IrpSp->FileObject->FsContext;
 
@@ -218,6 +219,10 @@ VOID DispDataRequestComplete(
     Irp->IoStatus.Status      = Status;
     Irp->IoStatus.Information = Count;
 
+    TI_DbgPrint(MID_TRACE, ("Irp->IoStatus.Status = %x\n",
+			    Irp->IoStatus.Status));
+    TI_DbgPrint(MID_TRACE, ("Irp->IoStatus.Information = %d\n",
+			    Irp->IoStatus.Information));
     TI_DbgPrint(DEBUG_IRP, ("Completing IRP at (0x%X).\n", Irp));
 
     IRPFinish(Irp, STATUS_SUCCESS);
@@ -687,6 +692,7 @@ NTSTATUS DispTdiReceive(
     IrpSp->FileObject->FsContext,
     Irp,
     (PDRIVER_CANCEL)DispCancelRequest);
+  TI_DbgPrint(MID_TRACE,("TCPIP<<< Got an MDL: %x\n", Irp->MdlAddress));
   if (NT_SUCCESS(Status))
     {
       Status = TCPReceiveData(
@@ -786,46 +792,63 @@ NTSTATUS DispTdiSend(
  *     Status of operation
  */
 {
-    PIO_STACK_LOCATION IrpSp;
-    TDI_REQUEST Request;
-    PTDI_REQUEST_KERNEL_SEND SendInfo;
-    PTRANSPORT_CONTEXT TranContext;
-    NTSTATUS Status;
+  PIO_STACK_LOCATION IrpSp;
+  PTDI_REQUEST_KERNEL_RECEIVE ReceiveInfo;
+  PTRANSPORT_CONTEXT TranContext;
+  TDI_REQUEST Request;
+  NTSTATUS Status;
+  ULONG BytesReceived;
 
-    TI_DbgPrint(DEBUG_IRP, ("Called.\n"));
+  TI_DbgPrint(DEBUG_IRP, ("Called.\n"));
 
-    IrpSp       = IoGetCurrentIrpStackLocation(Irp);
-    SendInfo    = (PTDI_REQUEST_KERNEL_SEND)&(IrpSp->Parameters);
-    TranContext = IrpSp->FileObject->FsContext;
+  IrpSp = IoGetCurrentIrpStackLocation(Irp);
+  ReceiveInfo = (PTDI_REQUEST_KERNEL_RECEIVE)&(IrpSp->Parameters);
 
-    /* Initialize a send request */
-    Request.Handle.AddressHandle = TranContext->Handle.AddressHandle;
-    Request.RequestNotifyObject  = DispDataRequestComplete;
-    Request.RequestContext       = Irp;
-
-    Status = DispPrepareIrpForCancel(
-        IrpSp->FileObject->FsContext,
-        Irp,
-        (PDRIVER_CANCEL)DispCancelRequest);
-    if (NT_SUCCESS(Status)) {
-
-        /* FIXME: DgramInfo->SendDatagramInformation->RemoteAddress 
-           must be of type PTDI_ADDRESS_IP */
-
-        Status = (*((PADDRESS_FILE)Request.Handle.AddressHandle)->Send)(
-            &Request, NULL, 
-	    (PNDIS_BUFFER)Irp->MdlAddress, SendInfo->SendLength);
-        if (Status != STATUS_PENDING) {
-            DispDataRequestComplete(Irp, Status, 0);
-            /* Return STATUS_PENDING because DispPrepareIrpForCancel
-               marks Irp as pending */
-            Status = STATUS_PENDING;
-        }
+  TranContext = IrpSp->FileObject->FsContext;
+  if (TranContext == NULL)
+    {
+      TI_DbgPrint(MID_TRACE, ("Bad transport context.\n"));
+      return STATUS_INVALID_CONNECTION;
     }
 
-    TI_DbgPrint(DEBUG_IRP, ("Leaving.\n"));
+  if (TranContext->Handle.ConnectionContext == NULL)
+    {
+      TI_DbgPrint(MID_TRACE, ("No connection endpoint file object.\n"));
+      return STATUS_INVALID_CONNECTION;
+    }
 
-    return Status;
+  /* Initialize a receive request */
+  Request.Handle.ConnectionContext = TranContext->Handle.ConnectionContext;
+  Request.RequestNotifyObject = DispDataRequestComplete;
+  Request.RequestContext = Irp;
+  Status = DispPrepareIrpForCancel(
+    IrpSp->FileObject->FsContext,
+    Irp,
+    (PDRIVER_CANCEL)DispCancelRequest);
+  TI_DbgPrint(MID_TRACE,("TCPIP<<< Got an MDL: %x\n", Irp->MdlAddress));
+  if (NT_SUCCESS(Status))
+    {
+	TI_DbgPrint(MID_TRACE,("About to TCPSendData\n"));
+	Status = TCPSendData(
+	    &Request,
+	    (PNDIS_BUFFER)Irp->MdlAddress,
+	    ReceiveInfo->ReceiveLength,
+	    ReceiveInfo->ReceiveFlags,
+	    &BytesReceived);
+	if (Status != STATUS_PENDING)
+	{
+	    DispDataRequestComplete(Irp, Status, BytesReceived);
+	}
+    }
+
+  if (Status != STATUS_PENDING)
+    {
+      IrpSp->Control &= ~SL_PENDING_RETURNED;
+    }
+
+  TI_DbgPrint(DEBUG_IRP, ("Leaving. Status is (0x%X)\n", Status));
+
+  return Status;
 }
 
 
@@ -867,9 +890,10 @@ NTSTATUS DispTdiSendDatagram(
 
         Status = (*((PADDRESS_FILE)Request.Handle.AddressHandle)->Send)(
             &Request, DgramInfo->SendDatagramInformation,
-            (PNDIS_BUFFER)Irp->MdlAddress, DgramInfo->SendLength);
+            (PNDIS_BUFFER)Irp->MdlAddress, DgramInfo->SendLength, 
+	    &Irp->IoStatus.Information);
         if (Status != STATUS_PENDING) {
-            DispDataRequestComplete(Irp, Status, 0);
+            DispDataRequestComplete(Irp, Status, Irp->IoStatus.Information);
             /* Return STATUS_PENDING because DispPrepareIrpForCancel
                marks Irp as pending */
             Status = STATUS_PENDING;
diff --git a/reactos/drivers/net/tcpip/tcpip/fileobjs.c b/reactos/drivers/net/tcpip/tcpip/fileobjs.c
index a482a62152f..0386d5823ab 100644
--- a/reactos/drivers/net/tcpip/tcpip/fileobjs.c
+++ b/reactos/drivers/net/tcpip/tcpip/fileobjs.c
@@ -456,6 +456,9 @@ NTSTATUS FileOpenConnection(
 
   /* Initialize spin lock that protects the connection endpoint file object */
   KeInitializeSpinLock(&Connection->Lock);
+  InitializeListHead(&Connection->ConnectRequest);
+  InitializeListHead(&Connection->ListenRequest);
+  InitializeListHead(&Connection->ReceiveRequest);
 
   /* Reference the object */
   Connection->RefCount = 1;
@@ -469,9 +472,6 @@ NTSTATUS FileOpenConnection(
 			   IPPROTO_TCP );
   DbgPrint("STATUS from OSKITTCP was %08x\n", Status);
   
-  /* Initialize receive requests queue */
-  InitializeListHead(&Connection->ReceiveRequests);
-
   /* Initialize received segments queue */
   InitializeListHead(&Connection->ReceivedSegments);
 
diff --git a/reactos/drivers/net/tcpip/tcpip/main.c b/reactos/drivers/net/tcpip/tcpip/main.c
index 3e906921d45..e7d4ee3f5de 100644
--- a/reactos/drivers/net/tcpip/tcpip/main.c
+++ b/reactos/drivers/net/tcpip/tcpip/main.c
@@ -213,7 +213,14 @@ CP
       (Address->TAAddressCount != 1) ||
       (Address->Address[0].AddressLength < TDI_ADDRESS_LENGTH_IP) ||
       (Address->Address[0].AddressType != TDI_ADDRESS_TYPE_IP)) {
-      TI_DbgPrint(MIN_TRACE, ("Parameters are invalid.\n"));
+      TI_DbgPrint(MIN_TRACE, ("Parameters are invalid:\n"));
+      TI_DbgPrint(MIN_TRACE, ("AddressCount: %d\n", Address->TAAddressCount));
+      if( Address->TAAddressCount == 1 ) {
+	  TI_DbgPrint(MIN_TRACE, ("AddressLength: %\n", 
+				  Address->Address[0].AddressLength));
+	  TI_DbgPrint(MIN_TRACE, ("AddressType: %\n", 
+				  Address->Address[0].AddressType));
+      }
       ExFreePool(Context);
       return STATUS_INVALID_PARAMETER;
     }
@@ -578,11 +585,12 @@ TiDispatch(
   NTSTATUS Status;
   PIO_STACK_LOCATION IrpSp;
 
+  IrpSp  = IoGetCurrentIrpStackLocation(Irp);
+
   TI_DbgPrint(DEBUG_IRP, ("Called. IRP is at (0x%X).\n", Irp));
 
   Irp->IoStatus.Information = 0;
 
-  IrpSp  = IoGetCurrentIrpStackLocation(Irp);
 #ifdef _MSC_VER
   Status = TdiMapUserRequest(DeviceObject, Irp, IrpSp);
   if (NT_SUCCESS(Status)) {
diff --git a/reactos/drivers/net/tcpip/transport/rawip/rawip.c b/reactos/drivers/net/tcpip/transport/rawip/rawip.c
index cdb75f61f96..d3e23afabb5 100644
--- a/reactos/drivers/net/tcpip/transport/rawip/rawip.c
+++ b/reactos/drivers/net/tcpip/transport/rawip/rawip.c
@@ -84,7 +84,8 @@ NTSTATUS RawIPSendDatagram(
     PTDI_REQUEST Request,
     PTDI_CONNECTION_INFORMATION ConnInfo,
     PNDIS_BUFFER Buffer,
-    ULONG DataSize)
+    ULONG DataSize,
+    PULONG DataUsed )
 /*
  * FUNCTION: Sends a raw IP datagram to a remote address
  * ARGUMENTS:
@@ -110,6 +111,8 @@ NTSTATUS RawIPSendDatagram(
     
     TI_DbgPrint(MID_TRACE,("Packet.NdisPacket %x\n", Packet.NdisPacket));
 
+    *DataUsed = BufferLen;
+
     if( Status == NDIS_STATUS_SUCCESS )
 	Status = BuildRawIPPacket( &Packet,
 				   BufferLen,
diff --git a/reactos/drivers/net/tcpip/transport/tcp/event.c b/reactos/drivers/net/tcpip/transport/tcp/event.c
index 4f74debad59..a8ca6ff7c3f 100644
--- a/reactos/drivers/net/tcpip/transport/tcp/event.c
+++ b/reactos/drivers/net/tcpip/transport/tcp/event.c
@@ -23,150 +23,93 @@
 
 extern ULONG TCP_IPIdentification;
 
-void TCPRecvNotify( PCONNECTION_ENDPOINT Connection, UINT Flags ) {
-    int error = 0;
-    NTSTATUS Status = 0;
-    CHAR DataBuffer[1024];
-    UINT BytesRead = 0, BytesTaken = 0;
-    PTDI_IND_RECEIVE ReceiveHandler;
-    PTDI_IND_DISCONNECT DisconnectHandler;
-    PVOID HandlerContext;
-    SOCKADDR Addr;
+typedef VOID 
+(*PTCP_COMPLETION_ROUTINE)( PVOID Context, NTSTATUS Status, ULONG Count );
 
-    TI_DbgPrint(MID_TRACE,("XX> Called\n"));
-    
-    do { 
-	error = OskitTCPRecv( Connection->SocketContext,
-			      &Addr,
-			      DataBuffer,
-			      1024,
-			      &BytesRead,
-			      Flags | OSK_MSG_DONTWAIT | OSK_MSG_PEEK );
+int TCPSocketState(void *ClientData,
+		   void *WhichSocket, 
+		   void *WhichConnection,
+		   OSK_UINT NewState ) {
+    PCONNECTION_ENDPOINT Connection = WhichConnection;
+    PTCP_COMPLETION_ROUTINE Complete;
+    PTDI_BUCKET Bucket;
+    PLIST_ENTRY Entry;
 
-	switch( error ) {
-	case 0:
-	    ReceiveHandler = Connection->AddressFile->ReceiveHandler;
-	    HandlerContext = Connection->AddressFile->ReceiveHandlerContext;
-	    
-	    TI_DbgPrint(MID_TRACE,("Received %d bytes\n", BytesRead));
-	    
-	    if( Connection->AddressFile->RegisteredReceiveHandler ) 
-		Status = ReceiveHandler( HandlerContext,
-					 NULL,
-					 TDI_RECEIVE_NORMAL,
-					 BytesRead,
-					 BytesRead,
-					 &BytesTaken,
-					 DataBuffer,
-					 NULL );
-	    else
-		Status = STATUS_UNSUCCESSFUL;
-	    
-	    if( Status == STATUS_SUCCESS ) {
-		OskitTCPRecv( Connection->SocketContext,
-			      &Addr,
-			      DataBuffer,
-			      BytesTaken,
-			      &BytesRead,
-			      Flags | OSK_MSG_DONTWAIT );
-	    }
-	    break;
+    TI_DbgPrint(MID_TRACE,("Called: NewState %x\n", NewState));
 
-	case OSK_ESHUTDOWN:
-	case OSK_ECONNRESET:
-	    DisconnectHandler = Connection->AddressFile->DisconnectHandler;
-	    HandlerContext = Connection->AddressFile->DisconnectHandlerContext;
-	    
-	    if( Connection->AddressFile->RegisteredDisconnectHandler )
-		Status = DisconnectHandler( HandlerContext,
-					    NULL,
-					    0,
-					    NULL,
-					    0,
-					    NULL,
-					    (error == OSK_ESHUTDOWN) ? 
-					    TDI_DISCONNECT_RELEASE :
-					    TDI_DISCONNECT_ABORT );
-	    else
-		Status = STATUS_UNSUCCESSFUL;
-	    break;
-	    
-	default:
-	    assert( 0 );
-	    break;
-	}
-    } while( error == 0 && BytesRead > 0 && BytesTaken > 0 );
-
-    TI_DbgPrint(MID_TRACE,("XX> Leaving\n"));
-}
-
-void TCPCloseNotify( PCONNECTION_ENDPOINT Connection ) {
-    NTSTATUS Status;
-    PTDI_IND_DISCONNECT DisconnectHandler;
-    PVOID HandlerContext;
-
-    DisconnectHandler = Connection->AddressFile->DisconnectHandler;
-    HandlerContext = Connection->AddressFile->DisconnectHandlerContext;
-    
-    /* XXX Distinguish TDI_DISCONNECT_RELEASE from TDI_DISCONNECT_ABORT */
-    if( Connection->AddressFile->RegisteredDisconnectHandler )
-	Status = DisconnectHandler( HandlerContext,
-				    NULL,
-				    0,
-				    NULL,
-				    0,
-				    NULL,
-				    TDI_DISCONNECT_ABORT );
-    else
-	Status = STATUS_UNSUCCESSFUL;    
-
-    return Status;
-}
-
-char *FlagNames[] = { "SEL_CONNECT",
-		      "SEL_FIN",
-		      "SEL_ACCEPT",
-		      "SEL_OOB",
-		      "SEL_READ",
-		      "SEL_WRITE",
-		       0 };
-int FlagValues[]   = { SEL_CONNECT,
-		       SEL_FIN,
-		       SEL_ACCEPT,
-		       SEL_OOB,
-		       SEL_READ,
-		       SEL_WRITE,
-		       0 };
-
-void TCPSocketState( void *ClientData,
-		     void *WhichSocket,
-		     void *WhichConnection,
-		     OSK_UINT Flags,
-		     OSK_UINT SocketState ) {
-    int i;
-    PCONNECTION_ENDPOINT Connection = 
-	(PCONNECTION_ENDPOINT)WhichConnection;
-
-    TI_DbgPrint(MID_TRACE,("TCPSocketState: (socket %x) %x %x\n",
-			   WhichSocket, Flags, SocketState));
-
-    for( i = 0; FlagValues[i]; i++ ) {
-	if( Flags & FlagValues[i] ) 
-	    TI_DbgPrint(MID_TRACE,("Flag %s\n", FlagNames[i]));
+    if( !Connection ) {
+	TI_DbgPrint(MID_TRACE,("Socket closing.\n"));
+	return 0;
     }
 
-    if( Flags & SEL_CONNECT ) 
-	/* TCPConnectNotify( Connection ); */ ;
-    if( Flags & SEL_FIN )
-	TCPCloseNotify( Connection );
-    if( Flags & SEL_ACCEPT )
-	/* TCPAcceptNotify( Connection ); */ ;
-    if( Flags & SEL_OOB ) 
-	TCPRecvNotify( Connection, MSG_OOB );
-    if( Flags & SEL_WRITE )
-	/* TCPSendNotify( Connection ); */ ;
-    if( Flags & SEL_READ )
-	TCPRecvNotify( Connection, 0 );
+    if( (NewState & SEL_CONNECT) && 
+	!(Connection->State & SEL_CONNECT) ) {
+	while( !IsListEmpty( &Connection->ConnectRequest ) ) {
+	    Connection->State |= SEL_CONNECT;
+	    Entry = RemoveHeadList( &Connection->ConnectRequest );
+	    Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
+	    Complete = Bucket->Request.RequestNotifyObject;
+	    TI_DbgPrint(MID_TRACE,
+			("Completing Connect Request %x\n", Bucket->Request));
+	    Complete( Bucket->Request.RequestContext, STATUS_SUCCESS, 0 );
+	    /* Frees the bucket allocated in TCPConnect */
+	    ExFreePool( Bucket );
+	}
+    } else if( NewState & SEL_READ ) {
+	while( !IsListEmpty( &Connection->ReceiveRequest ) ) {
+	    PIRP Irp;
+	    OSK_UINT RecvLen = 0, Received = 0;
+	    OSK_PCHAR RecvBuffer = 0;
+	    PMDL Mdl;
+	    NTSTATUS Status;
+
+	    Entry = RemoveHeadList( &Connection->ReceiveRequest );
+	    Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
+	    Complete = Bucket->Request.RequestNotifyObject;
+
+	    TI_DbgPrint(MID_TRACE,
+			("Readable, Completing read request %x\n", 
+			 Bucket->Request));
+
+	    Irp = Bucket->Request.RequestContext;
+	    Mdl = Irp->MdlAddress;
+
+	    TI_DbgPrint(MID_TRACE,
+			("Getting the user buffer from %x\n", Mdl));
+
+	    NdisQueryBuffer( Mdl, &RecvBuffer, &RecvLen );
+
+	    TI_DbgPrint(MID_TRACE,
+			("Reading %d bytes to %x\n", RecvLen, RecvBuffer));
+
+	    Status = TCPTranslateError
+		( OskitTCPRecv( Connection->SocketContext,
+				RecvBuffer,
+				RecvLen,
+				&Received,
+				0 ) );
+
+	    TI_DbgPrint(MID_TRACE,("TCP Bytes: %d\n", Received));
+
+	    if( Status == STATUS_SUCCESS && Received != 0 ) {
+		TI_DbgPrint(MID_TRACE,("Received %d bytes with status %x\n",
+				       Received, Status));
+		
+		TI_DbgPrint(MID_TRACE,
+			    ("Completing Receive Request: %x\n", 
+			     Bucket->Request));
+		
+		Complete( Bucket->Request.RequestContext, 
+			  STATUS_SUCCESS, 
+			  Received );
+	    } else {
+		InsertHeadList( &Connection->ReceiveRequest,
+				&Bucket->Entry );
+	    }
+	}
+    }
+
+    return 0;
 }
 
 void TCPPacketSendComplete( PVOID Context,
@@ -294,6 +237,12 @@ int TCPPacketSend(void *ClientData,
 			&RemoteAddress.Address.IPv4Address,
 			&RemotePort );
 
+    DbgPrint("OSKIT SENDING PACKET *** %x:%d -> %x:%d\n",
+	     LocalAddress.Address.IPv4Address,
+	     LocalPort,
+	     RemoteAddress.Address.IPv4Address,
+	     RemotePort);
+
     NCE = RouterGetRoute( &RemoteAddress, NULL );
 
     if( !NCE ) return OSK_EADDRNOTAVAIL;
@@ -302,8 +251,7 @@ int TCPPacketSend(void *ClientData,
 			    ADE_UNICAST, 
 			    &LocalAddress.Address.IPv4Address );
 
-    if( Connection ) 
-	KeAcquireSpinLock( &Connection->Lock, &OldIrql );
+    KeRaiseIrql( DISPATCH_LEVEL, &OldIrql );
 
     NdisStatus = 
 	AllocatePacketWithBuffer( &SendRequest->PacketToSend, data, len );
@@ -333,8 +281,7 @@ int TCPPacketSend(void *ClientData,
 	DbgPrint("Transmit called without connection.\n");
 
 end:
-    if( Connection )
-	KeReleaseSpinLock( &Connection->Lock, OldIrql );
+    KeLowerIrql( OldIrql );
 
     if( !NT_SUCCESS(NdisStatus) ) return OSK_EINVAL;
     else return 0;
diff --git a/reactos/drivers/net/tcpip/transport/tcp/tcp.c b/reactos/drivers/net/tcpip/transport/tcp/tcp.c
index da778a0641a..71745bfef3e 100644
--- a/reactos/drivers/net/tcpip/transport/tcp/tcp.c
+++ b/reactos/drivers/net/tcpip/transport/tcp/tcp.c
@@ -52,11 +52,10 @@ VOID TCPReceive(PNET_TABLE_ENTRY NTE, PIP_PACKET IPPacket)
 }
 
 /* event.c */
-void TCPSocketState( void *ClientData,
-		     void *WhichSocket,
-		     void *WhichConnection,
-		     OSK_UINT SelFlags,
-		     OSK_UINT SocketState );
+int TCPSocketState( void *ClientData,
+		    void *WhichSocket,
+		    void *WhichConnection,
+		    OSK_UINT NewState );
 
 int TCPPacketSend( void *ClientData,
 		   void *WhichSocket,
@@ -67,7 +66,7 @@ int TCPPacketSend( void *ClientData,
 OSKITTCP_EVENT_HANDLERS EventHandlers = {
     NULL, /* Client Data */
     TCPSocketState, /* SocketState */
-    TCPPacketSend, /* PacketSend */
+    TCPPacketSend,  /* PacketSend */
 };
 
 NTSTATUS TCPStartup(VOID)
@@ -129,6 +128,8 @@ NTSTATUS TCPTranslateError( int OskitError ) {
     case OSK_EAFNOSUPPORT: Status = STATUS_INVALID_CONNECTION; break;
     case OSK_ECONNREFUSED:
     case OSK_ECONNRESET: Status = STATUS_REMOTE_NOT_LISTENING; break;
+    case OSK_EINPROGRESS:
+    case OSK_EAGAIN: Status = STATUS_PENDING; break;
     default: Status = STATUS_INVALID_CONNECTION; break;
     }
 
@@ -143,20 +144,30 @@ NTSTATUS TCPConnect
     KIRQL OldIrql;
     NTSTATUS Status;
     SOCKADDR_IN AddressToConnect;
-    PCONNECTION_ENDPOINT Connection;
-
-    Connection = Request->Handle.ConnectionContext;
-
-    KeAcquireSpinLock(&Connection->Lock, &OldIrql);
-    
+    PCONNECTION_ENDPOINT Connection = Request->Handle.ConnectionContext;
     PIP_ADDRESS RemoteAddress;
     USHORT RemotePort;
+    PTDI_BUCKET Bucket;
 
-    Status = AddrBuildAddress(
-	(PTA_ADDRESS)(&((PTRANSPORT_ADDRESS)ConnInfo->RemoteAddress)->
-		      Address[0]),
-	&RemoteAddress,
-	&RemotePort);
+    DbgPrint("TCPConnect: Called\n");
+
+    Bucket = ExAllocatePool( NonPagedPool, sizeof(*Bucket) );
+    if( !Bucket ) return STATUS_NO_MEMORY;
+
+    KeAcquireSpinLock(&Connection->Lock, &OldIrql);
+
+    /* Freed in TCPSocketState */
+    Bucket->Request = *Request;
+    InsertHeadList( &Connection->ConnectRequest, &Bucket->Entry );
+
+    Status = AddrBuildAddress
+	((PTA_ADDRESS)ConnInfo->RemoteAddress,
+	 &RemoteAddress,
+	 &RemotePort);
+
+    DbgPrint("Connecting to address %x:%x\n",
+	     RemoteAddress->Address.IPv4Address,
+	     RemotePort);
 
     if (!NT_SUCCESS(Status)) {
 	TI_DbgPrint(MID_TRACE, ("Could not AddrBuildAddress in TCPConnect\n"));
@@ -171,11 +182,16 @@ NTSTATUS TCPConnect
 	    sizeof(AddressToConnect.sin_addr) );
     AddressToConnect.sin_port = RemotePort;
     KeReleaseSpinLock(&Connection->Lock, OldIrql);
+    
+    Status = OskitTCPConnect(Connection->SocketContext,
+			     Connection,
+			     &AddressToConnect, 
+			     sizeof(AddressToConnect));
 
-    return TCPTranslateError( OskitTCPConnect(Connection->SocketContext,
-					      Connection,
-					      &AddressToConnect, 
-					      sizeof(AddressToConnect)) );
+    if( Status == OSK_EINPROGRESS || Status == STATUS_SUCCESS ) 
+	return STATUS_PENDING;
+    else
+	return Status;
 }
 
 NTSTATUS TCPClose
@@ -209,38 +225,76 @@ NTSTATUS TCPReceiveData
   ULONG ReceiveLength,
   ULONG ReceiveFlags,
   PULONG BytesReceived ) {
+    KIRQL OldIrql;
     PCONNECTION_ENDPOINT Connection;
     PCHAR DataBuffer;
     UINT DataLen, Received = 0;
+    NTSTATUS Status;
+    PTDI_BUCKET Bucket;
 
     Connection = Request->Handle.ConnectionContext;
 
+    KeAcquireSpinLock(&Connection->Lock, &OldIrql);
+
     NdisQueryBuffer( Buffer, &DataBuffer, &DataLen );
 
-    return TCPTranslateError
+    TI_DbgPrint(MID_TRACE,("TCP>|< Got an MDL %x (%x:%d)\n", Buffer, DataBuffer, DataLen));
+
+    Status = TCPTranslateError
 	( OskitTCPRecv
 	  ( Connection->SocketContext,
 	    DataBuffer,
 	    DataLen,
 	    &Received,
 	    ReceiveFlags ) );    
+
+    /* Keep this request around ... there was no data yet */
+    if( Status == STATUS_PENDING || Received == 0 ) {
+	/* Freed in TCPSocketState */
+	Bucket = ExAllocatePool( NonPagedPool, sizeof(*Bucket) );
+	if( !Bucket ) return STATUS_NO_MEMORY;
+	
+	Bucket->Request = *Request;
+	InsertHeadList( &Connection->ReceiveRequest, &Bucket->Entry );
+	Status = STATUS_PENDING;
+    }
+
+    KeReleaseSpinLock(&Connection->Lock, OldIrql);
+
+    TI_DbgPrint(MID_TRACE,("Status %x\n", Status));
+
+    return Status;
 }
 
 NTSTATUS TCPSendData
 ( PTDI_REQUEST Request,
-  PTDI_CONNECTION_INFORMATION ConnInfo,
   PNDIS_BUFFER Buffer,
-  ULONG DataSize ) {
+  ULONG DataSize,
+  ULONG Flags,
+  PULONG DataUsed ) {
+    KIRQL OldIrql;
+    NTSTATUS Status;
     PCONNECTION_ENDPOINT Connection;
     PCHAR BufferData;
     ULONG PacketSize;
     int error;
 
+    Connection = Request->Handle.ConnectionContext;
+
+    KeAcquireSpinLock(&Connection->Lock, &OldIrql);
+
     NdisQueryBuffer( Buffer, &BufferData, &PacketSize );
     
-    Connection = Request->Handle.ConnectionContext;
-    return  OskitTCPSend( Connection->SocketContext, 
-			  BufferData, PacketSize, 0 );
+    TI_DbgPrint(MID_TRACE,("Connection = %x\n", Connection));
+    TI_DbgPrint(MID_TRACE,("Connection->SocketContext = %x\n",
+			   Connection->SocketContext));
+
+    Status = OskitTCPSend( Connection->SocketContext, 
+			 BufferData, PacketSize, (OSK_UINT *)DataUsed, 0 );
+
+    KeReleaseSpinLock(&Connection->Lock, OldIrql);
+
+    return Status;
 }
 
 NTSTATUS TCPTimeout(VOID) { 
diff --git a/reactos/drivers/net/tcpip/transport/udp/udp.c b/reactos/drivers/net/tcpip/transport/udp/udp.c
index 768d02f0109..5415aa32f24 100644
--- a/reactos/drivers/net/tcpip/transport/udp/udp.c
+++ b/reactos/drivers/net/tcpip/transport/udp/udp.c
@@ -168,7 +168,8 @@ NTSTATUS UDPSendDatagram(
   PTDI_REQUEST Request,
   PTDI_CONNECTION_INFORMATION ConnInfo,
   PNDIS_BUFFER Buffer,
-  ULONG DataSize)
+  ULONG DataSize,
+  PULONG DataUsed ) 
 /*
  * FUNCTION: Sends an UDP datagram to a remote address
  * ARGUMENTS:
@@ -183,6 +184,12 @@ NTSTATUS UDPSendDatagram(
     PDATAGRAM_SEND_REQUEST SendRequest;
     PADDRESS_FILE AddrFile = 
 	(PADDRESS_FILE)Request->Handle.AddressHandle;
+    PCHAR BufferData;
+    UINT BufferLen;
+
+    NdisQueryBuffer( Buffer, &BufferData, &BufferLen );
+
+    *DataUsed = BufferLen;
     
     BuildUDPPacket( SendRequest,
 		    (PIP_ADDRESS)&AddrFile->ADE->Address->Address.

From aa565ab06283d6b3c5088383ea9e4ab0df9a6b97 Mon Sep 17 00:00:00 2001
From: Art Yerkes <art.yerkes@gmail.com>
Date: Thu, 8 Jul 2004 06:39:30 +0000
Subject: [PATCH 223/356] Fixed OskitTCPSend prototype. sleep: removed
 blocking.  not needed anymore. Made socket non-blocking with respect to
 oskit. removed unneeded panic in sbflush. removed unneeded stats keeping. 
 This info is better kept by tcpip.sys

svn path=/trunk/; revision=10033
---
 .../drivers/lib/oskittcp/include/oskittcp.h   | 11 +++++--
 .../drivers/lib/oskittcp/oskittcp/interface.c | 33 ++++++-------------
 reactos/drivers/lib/oskittcp/oskittcp/sleep.c | 20 ++++++-----
 .../drivers/lib/oskittcp/oskittcp/tcp_input.c | 16 +++++----
 .../lib/oskittcp/oskittcp/tcp_usrreq.c        |  2 --
 .../lib/oskittcp/oskittcp/uipc_socket.c       |  4 ++-
 .../lib/oskittcp/oskittcp/uipc_socket2.c      |  2 ++
 7 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/reactos/drivers/lib/oskittcp/include/oskittcp.h b/reactos/drivers/lib/oskittcp/include/oskittcp.h
index ee4f7ea151a..3d07a09cc23 100644
--- a/reactos/drivers/lib/oskittcp/include/oskittcp.h
+++ b/reactos/drivers/lib/oskittcp/include/oskittcp.h
@@ -50,12 +50,12 @@ struct connect_args {
 #define SEL_ERROR   256
 #define SEL_FINOUT  512
 
-typedef void (*OSKITTCP_SOCKET_STATE)
+typedef int (*OSKITTCP_SOCKET_STATE)
     ( void *ClientData,
       void *WhichSocket,
       void *WhichConnection,
-      OSK_UINT SelFlags,
-      OSK_UINT SocketState );
+      OSK_UINT NewState );
+
 typedef int (*OSKITTCP_SEND_PACKET)
     ( void *ClientData,
       void *WhichSocket,
@@ -86,6 +86,11 @@ extern int OskitTCPReceive( void *socket,
 			    OSK_UINT Len,
 			    OSK_UINT *OutLen,
 			    OSK_UINT Flags );
+extern int OskitTCPSend( void *socket, 
+			 OSK_PCHAR Data,
+			 OSK_UINT Len,
+			 OSK_UINT *OutLen,
+			 OSK_UINT Flags );
 #undef errno
 
 #define malloc(x,...) fbsd_malloc(x,__FILE__,__LINE__)
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/interface.c b/reactos/drivers/lib/oskittcp/oskittcp/interface.c
index 3d7ee049a45..b4fc0baea62 100644
--- a/reactos/drivers/lib/oskittcp/oskittcp/interface.c
+++ b/reactos/drivers/lib/oskittcp/oskittcp/interface.c
@@ -1,3 +1,4 @@
+
 #include <oskittcp.h>
 #include <oskitdebug.h>
 #include <ntddk.h>
@@ -79,13 +80,13 @@ int OskitTCPSocket( void *context,
     int error = socreate(domain, &so, type, proto);
     if( !error ) {
 	so->so_connection = context;
+	so->so_state = SS_NBIO;
 	*aso = so;
     }
     return error;
 }
 
 int OskitTCPRecv( void *connection,
-		  void *Addr,
 		  OSK_PCHAR Data,
 		  OSK_UINT Len,
 		  OSK_UINT *OutLen,
@@ -118,9 +119,6 @@ int OskitTCPRecv( void *connection,
 	OskitDumpBuffer( m.m_data, uio.uio_resid );
     }
 
-    if( paddr )
-	memcpy( Addr, paddr, min(sizeof(struct sockaddr),paddr->m_len) );
-
     *OutLen = uio.uio_resid;
     return error;
 }
@@ -186,22 +184,6 @@ NTSTATUS OskitTCPConnect( PVOID socket, PVOID connection,
 	goto done;
     }
 
-    s = splnet();
-
-    while ((so->so_state & SS_ISCONNECTING) && so->so_error == 0) {
-	error = tsleep((caddr_t)&so->so_timeo, PSOCK | PCATCH,
-		       "connect", 0);
-	if (error)
-	    break;
-    }
-
-    if (error == 0) {
-	error = so->so_error;
-	so->so_error = 0;
-    }
-
-    splx(s);
-
 bad:
     so->so_state &= ~SS_ISCONNECTING;
 
@@ -219,12 +201,17 @@ DWORD OskitTCPClose( void *socket ) {
     soclose( so );
 }
 
-DWORD OskitTCPSend( void *socket, OSK_PCHAR Data, OSK_UINT Len, int flags ) {
-    OskitDumpBuffer( Data, Len );
+int OskitTCPSend( void *socket, OSK_PCHAR Data, OSK_UINT Len, 
+		  OSK_UINT *OutLen, OSK_UINT flags ) {
     struct mbuf mb;
+    struct uio uio = { 0 };
+    int error = 0;
+    OskitDumpBuffer( Data, Len );
     mb.m_data = Data;
     mb.m_len  = Len;
-    return sosend( socket, NULL, NULL, (struct mbuf *)&mb, NULL, 0 );
+    error = sosend( socket, NULL, &uio, (struct mbuf *)&mb, NULL, 0 );
+    *OutLen = uio.uio_resid;
+    return error;
 }
 
 void *OskitTCPAccept( void *socket, 
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/sleep.c b/reactos/drivers/lib/oskittcp/oskittcp/sleep.c
index f56fa322af4..615b8e79bb3 100644
--- a/reactos/drivers/lib/oskittcp/oskittcp/sleep.c
+++ b/reactos/drivers/lib/oskittcp/oskittcp/sleep.c
@@ -64,25 +64,29 @@ void wakeup( struct socket *so, struct selinfo *si, void *token ) {
     KEVENT Event;
     PLIST_ENTRY Entry;
     PSLEEPING_THREAD SleepingThread;
+    UINT flags = 0;
 
     OS_DbgPrint
 	(OSK_MID_TRACE,("XXX Bytes to receive: %d\n", so->so_rcv.sb_cc));
 
-    if( so->so_rcv.sb_cc && si )
-	si->si_flags |= SEL_READ;
+    if( so->so_state & SS_ISCONNECTED ) {
+	OS_DbgPrint(OSK_MID_TRACE,("Socket connected!\n"));
+	flags |= SEL_CONNECT;
+    }
+    if( so->so_rcv.sb_cc && si ) {
+	OS_DbgPrint(OSK_MID_TRACE,("Socket readable\n"));
+	flags |= SEL_READ;
+    }
 
     OS_DbgPrint(OSK_MID_TRACE,("Wakeup %x (socket %x, si_flags %x, state %x)!\n",
 			       token, so, si ? si->si_flags : 0,
 			       so->so_state));
 
-    if( OtcpEvent.SocketState ) {
-	OS_DbgPrint(OSK_MID_TRACE,("Calling client's socket state fn\n"));
+    if( OtcpEvent.SocketState ) 
 	OtcpEvent.SocketState( OtcpEvent.ClientData,
 			       so,
-			       so->so_connection,
-			       si ? si->si_flags : 0,
-			       so->so_state );
-    }
+			       so ? so->so_connection : 0,
+			       flags );
 
     ExAcquireFastMutex( &SleepingThreadsLock );
     Entry = SleepingThreadsList.Flink;
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/tcp_input.c b/reactos/drivers/lib/oskittcp/oskittcp/tcp_input.c
index 0ab79a24d37..fbded676bb3 100644
--- a/reactos/drivers/lib/oskittcp/oskittcp/tcp_input.c
+++ b/reactos/drivers/lib/oskittcp/oskittcp/tcp_input.c
@@ -121,10 +121,11 @@ tcp_reass(tp, ti, m)
 	 * Find a segment which begins after this one does.
 	 */
 	for (q = tp->seg_next; q != (struct tcpiphdr *)tp;
-	    q = (struct tcpiphdr *)q->ti_next)
-		if (SEQ_GT(q->ti_seq, ti->ti_seq))
-			break;
-
+	     q = (struct tcpiphdr *)q->ti_next) { 
+	    printf("Finding segment: %x\n", q);
+	    if (SEQ_GT(q->ti_seq, ti->ti_seq))
+		break;
+	}
 	/*
 	 * If there is a preceding segment, it may provide some of
 	 * our data already.  If so, drop the data from the incoming
@@ -760,7 +761,7 @@ findpcb:
 			 */
 			tp->rcv_adv += min(tp->rcv_wnd, TCP_MAXWIN);
 			tcpstat.tcps_connects++;
-			soisconnected(so);
+			//soisconnected(so);
 			tp->t_timer[TCPT_KEEP] = tcp_keepinit;
 			dropsocket = 0;		/* committed to socket */
 			tcpstat.tcps_accepts++;
@@ -853,7 +854,7 @@ findpcb:
 					goto dropwithreset;
 			}
 			tcpstat.tcps_connects++;
-			soisconnected(so);
+			//soisconnected(so);
 			/* Do window scaling on this connection? */
 			if ((tp->t_flags & (TF_RCVD_SCALE|TF_REQ_SCALE)) ==
 				(TF_RCVD_SCALE|TF_REQ_SCALE)) {
@@ -890,6 +891,7 @@ findpcb:
 				 ("Socket %x entered ESTABLISHED state\n",
 				  so));
 			    tp->t_state = TCPS_ESTABLISHED;
+			    soisconnected(so);
 			    tp->t_timer[TCPT_KEEP] = tcp_keepidle;
 			    socwakeup(so);
 			}
@@ -1220,7 +1222,7 @@ trimthenstep6:
 			goto dropwithreset;
 
 		tcpstat.tcps_connects++;
-		soisconnected(so);
+		//soisconnected(so);
 		/* Do window scaling? */
 		if ((tp->t_flags & (TF_RCVD_SCALE|TF_REQ_SCALE)) ==
 			(TF_RCVD_SCALE|TF_REQ_SCALE)) {
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/tcp_usrreq.c b/reactos/drivers/lib/oskittcp/oskittcp/tcp_usrreq.c
index ac61c4eb609..c780f43452d 100644
--- a/reactos/drivers/lib/oskittcp/oskittcp/tcp_usrreq.c
+++ b/reactos/drivers/lib/oskittcp/oskittcp/tcp_usrreq.c
@@ -452,7 +452,6 @@ tcp_connect(tp, nam)
     
     in_pcbrehash(inp);
     
-    
     tp->t_template = tcp_template(tp);
     
     if (tp->t_template == 0) {
@@ -478,7 +477,6 @@ tcp_connect(tp, nam)
     
     tcp_sendseqinit(tp);
     
-    
     /*
      * Generate a CC value for this connection and
      * check whether CC or CCnew should be used.
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/uipc_socket.c b/reactos/drivers/lib/oskittcp/oskittcp/uipc_socket.c
index c7ae553c3c8..b90b95bdf5f 100644
--- a/reactos/drivers/lib/oskittcp/oskittcp/uipc_socket.c
+++ b/reactos/drivers/lib/oskittcp/oskittcp/uipc_socket.c
@@ -74,6 +74,8 @@ socreate(dom, aso, type, proto)
 	register struct socket *so;
 	register int error;
 
+	printf("socreate(%d,%x,%d,%d)\n", dom, aso, type, proto);
+
 	if (proto)
 		prp = pffindproto(dom, proto, type);
 	else
@@ -352,7 +354,7 @@ sosend(so, addr, uio, top, control, flags)
 	dontroute =
 	    (flags & MSG_DONTROUTE) && (so->so_options & SO_DONTROUTE) == 0 &&
 	    (so->so_proto->pr_flags & PR_ATOMIC);
-	p->p_stats->p_ru.ru_msgsnd++;
+	/* p->p_stats->p_ru.ru_msgsnd++; */
 	if (control)
 		clen = control->m_len;
 #define	snderr(errno)	{ error = errno; splx(s); goto release; }
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/uipc_socket2.c b/reactos/drivers/lib/oskittcp/oskittcp/uipc_socket2.c
index 6c0f86f8f60..ec24f57dfb1 100644
--- a/reactos/drivers/lib/oskittcp/oskittcp/uipc_socket2.c
+++ b/reactos/drivers/lib/oskittcp/oskittcp/uipc_socket2.c
@@ -742,8 +742,10 @@ sbflush(sb)
 		panic("sbflush");
 	while (sb->sb_mbcnt)
 		sbdrop(sb, (int)sb->sb_cc);
+#if 0
 	if (sb->sb_cc || sb->sb_mb)
 		panic("sbflush 2");
+#endif
 }
 
 /*

From cf7372bf5a4a13c1fdbfd39ae4e5484f53d7979e Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Thu, 8 Jul 2004 10:32:18 +0000
Subject: [PATCH 224/356] added a very basic timer queue test program

svn path=/trunk/; revision=10034
---
 reactos/apps/tests/tmrqueue/.cvsignore |   6 +
 reactos/apps/tests/tmrqueue/makefile   |  23 ++
 reactos/apps/tests/tmrqueue/tmrqueue.c | 365 +++++++++++++++++++++++++
 3 files changed, 394 insertions(+)
 create mode 100644 reactos/apps/tests/tmrqueue/.cvsignore
 create mode 100644 reactos/apps/tests/tmrqueue/makefile
 create mode 100644 reactos/apps/tests/tmrqueue/tmrqueue.c

diff --git a/reactos/apps/tests/tmrqueue/.cvsignore b/reactos/apps/tests/tmrqueue/.cvsignore
new file mode 100644
index 00000000000..d63774a7353
--- /dev/null
+++ b/reactos/apps/tests/tmrqueue/.cvsignore
@@ -0,0 +1,6 @@
+*.o
+*.d
+*.exe
+*.coff
+*.sym
+*.map
diff --git a/reactos/apps/tests/tmrqueue/makefile b/reactos/apps/tests/tmrqueue/makefile
new file mode 100644
index 00000000000..58a97d29b1a
--- /dev/null
+++ b/reactos/apps/tests/tmrqueue/makefile
@@ -0,0 +1,23 @@
+# $Id: makefile,v 1.1 2004/07/08 10:32:18 weiden Exp $
+
+PATH_TO_TOP = ../../..
+
+TARGET_NORC = yes
+
+TARGET_TYPE = program
+
+TARGET_APPTYPE = console
+
+TARGET_NAME = tmrqueue
+
+TARGET_SDKLIBS = kernel32.a
+
+TARGET_OBJECTS = $(TARGET_NAME).o
+
+TARGET_CFLAGS = -Wall -Werror
+
+include $(PATH_TO_TOP)/rules.mak
+
+include $(TOOLS_PATH)/helper.mk
+
+# EOF
diff --git a/reactos/apps/tests/tmrqueue/tmrqueue.c b/reactos/apps/tests/tmrqueue/tmrqueue.c
new file mode 100644
index 00000000000..5dd2df7f005
--- /dev/null
+++ b/reactos/apps/tests/tmrqueue/tmrqueue.c
@@ -0,0 +1,365 @@
+#include <windows.h>
+#include <stdio.h>
+#include <tchar.h>
+
+#define N_TIMEOUT	3
+
+/*******************************************************************************/
+
+typedef struct _TEST *PTEST;
+
+typedef VOID (*PFNTEST)(PTEST Test, HANDLE hEvent);
+
+typedef struct _TEST
+{
+  TCHAR *description;
+  BOOL Result;
+  PFNTEST Routine;
+  int id;
+} TEST;
+
+static TEST Tests[3];
+
+VOID RunTests(VOID)
+{
+  int i, nTests;
+  static HANDLE hEvent;
+  
+  hEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
+  if(hEvent == NULL)
+  {
+    _tprintf(_T("Unable to create event!"));
+    return;
+  }
+  
+  nTests = sizeof(Tests) / sizeof(TEST);
+  
+  for(i = 0; i < nTests; i++)
+  {
+    Tests[i].id = i + 1;
+    
+    if(Tests[i].Routine == NULL)
+    {
+      continue;
+    }
+    
+    _tprintf(_T("+++ TEST %d: %s\n"), Tests[i].id, Tests[i].description);
+    
+    Tests[i].Routine(&Tests[i], hEvent);
+    
+    WaitForSingleObject(hEvent, INFINITE);
+    
+    _tprintf(_T("\n\n"));
+  }
+  
+  CloseHandle(hEvent);
+}
+
+VOID PrintTestResults(VOID)
+{
+  int i, nTests, nsuccess = 0, nfailed = 0;
+  TCHAR *status;
+  
+  nTests = sizeof(Tests) / sizeof(TEST);
+  
+  for(i = 0; i < nTests; i++)
+  {
+    if(Tests[i].Routine == NULL)
+    {
+      status = _T("SKIPPED");
+    }
+    else if(Tests[i].Result == TRUE)
+    {
+      status = _T("SUCCESS");
+      nsuccess++;
+    }
+    else
+    {
+      status = _T("FAILED ");
+      nfailed++;
+    }
+    
+    _tprintf(_T("Test %d: %s %s\n"), i, status, Tests[i].description);
+  }
+  
+  _tprintf(_T("\nTests succeeded: %d, failed: %d\n"), nsuccess, nfailed);
+  if(nfailed == 0)
+  {
+    _tprintf(_T("  ALL TESTS SUCCESSFUL!\n"));
+  }
+}
+
+/*******************************************************************************/
+
+typedef struct _TESTINFO
+{
+  PTEST Test;
+  int secsleft;
+  HANDLE hTimer;
+  HANDLE hEvent;
+  /* additional stuff */
+  union
+  {
+    struct
+    {
+      /* nothing */
+    } Test1;
+    struct
+    {
+      HANDLE hWaitEvent; 
+    } Test2;
+    struct
+    {
+      HANDLE hWaitEvent;
+      HANDLE hNotification;
+    } Test3;
+  };
+} TESTINFO, *PTESTINFO;
+
+VOID CALLBACK TimerCallback1(PVOID Param, BOOLEAN Fired)
+{
+  PTESTINFO Info = (PTESTINFO)Param;
+  
+  _tprintf(_T("[%d]TimerCallback(0x%x, %d) called (%d)\n"), (int)Info->Test->id, (int)Info->hTimer, (int)Fired, --Info->secsleft);
+  
+  if(Info->secsleft == 0)
+  {
+    BOOL stat;
+    
+    _tprintf(_T("[%d]Timout finished, delete timer queue..."), (int)Info->Test->id);
+    stat = DeleteTimerQueueTimer(NULL, Info->hTimer, NULL);
+    if(stat)
+      _tprintf(_T("returned OK -> test FAILED!\n"));
+    else
+    {
+      int error = GetLastError();
+      
+      switch(error)
+      {
+        case ERROR_IO_PENDING:
+          _tprintf(_T("OK, Overlapped I/O operation in progress\n"));
+          /* this test is only successful in this case */
+          Info->Test->Result = TRUE;
+          break;
+        default:
+          _tprintf(_T("Failed, LastError: %d\n"), (int)GetLastError());
+          break;
+      }
+    }
+    
+    /* set the event to continue tests */
+    SetEvent(Info->hEvent);
+  }
+}
+
+VOID Test1(PTEST Test, HANDLE hEvent)
+{
+  static TESTINFO Info;
+  
+  Info.Test = Test;
+  Info.hEvent = hEvent;
+  Info.secsleft = N_TIMEOUT;
+  
+  if(!CreateTimerQueueTimer(&Info.hTimer, NULL, TimerCallback1, &Info, 1000, 1000, 0))
+  {
+    _tprintf(_T("[%d]CreateTimerQueueTimer() failed, LastError: %d!"), (int)Info.Test->id, (int)GetLastError());
+    /* we failed, set the event to continue tests */
+    SetEvent(hEvent);
+    return;
+  }
+  
+  _tprintf(_T("[%d]CreateTimerQueueTimer() created timer 0x%x, countdown (%d sec)...\n"), (int)Info.Test->id, (int)Info.hTimer, (int)Info.secsleft);
+}
+
+/*******************************************************************************/
+
+VOID CALLBACK TimerCallback2(PVOID Param, BOOLEAN Fired)
+{
+  PTESTINFO Info = (PTESTINFO)Param;
+  
+  _tprintf(_T("[%d]TimerCallback(0x%x, %d) called (%d)\n"), (int)Info->Test->id, (int)Info->hTimer, (int)Fired, --Info->secsleft);
+  
+  if(Info->secsleft == 0)
+  {
+    /* set the event to continue tests */
+    SetEvent(Info->Test2.hWaitEvent);
+    
+    /* sleep a bit */
+    Sleep(1500);	
+  }
+}
+
+VOID Test2(PTEST Test, HANDLE hEvent)
+{
+  static TESTINFO Info;
+  BOOL stat;
+  
+  Info.Test = Test;
+  Info.hEvent = hEvent;
+  Info.secsleft = N_TIMEOUT;
+  
+  Info.Test2.hWaitEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
+  if(Info.Test2.hWaitEvent == NULL)
+  {
+    _tprintf(_T("[%d]Unable to create event!\n"), (int)Info.Test->id);
+    return;
+  }
+  
+  if(!CreateTimerQueueTimer(&Info.hTimer, NULL, TimerCallback2, &Info, 1000, 1000, 0))
+  {
+    _tprintf(_T("[%d]CreateTimerQueueTimer() failed, LastError: %d!"), (int)Info.Test->id, (int)GetLastError());
+    
+    CloseHandle(Info.Test2.hWaitEvent);
+    /* we failed, set the event to continue tests */
+    SetEvent(hEvent);
+    return;
+  }
+  
+  _tprintf(_T("[%d]CreateTimerQueueTimer() created timer 0x%x, countdown (%d sec)...\n"), (int)Test->id, (int)Info.hTimer, (int)Info.secsleft);
+  
+  WaitForSingleObject(Info.Test2.hWaitEvent, INFINITE);
+  
+  _tprintf(_T("[%d]Timout finished, delete timer queue..."), (int)Test->id);
+  stat = DeleteTimerQueueTimer(NULL, Info.hTimer, INVALID_HANDLE_VALUE);
+  if(stat)
+  {
+    _tprintf(_T("OK\n"));
+    /* this test is only successful in this case */
+    Test->Result = TRUE;
+  }
+  else
+  {
+    int error = GetLastError();
+    
+    switch(error)
+    {
+      case ERROR_IO_PENDING:
+        _tprintf(_T("FAILED, Overlapped I/O operation in progress\n"));
+        break;
+      default:
+        _tprintf(_T("Failed, LastError: %d\n"), (int)GetLastError());
+        break;
+    }
+  }
+  
+  SetEvent(Info.hEvent);
+}
+
+/*******************************************************************************/
+
+VOID CALLBACK TimerCallback3(PVOID Param, BOOLEAN Fired)
+{
+  PTESTINFO Info = (PTESTINFO)Param;
+  
+  _tprintf(_T("[%d]TimerCallback(0x%x, %d) called (%d)\n"), (int)Info->Test->id, (int)Info->hTimer, (int)Fired, --Info->secsleft);
+  
+  if(Info->secsleft == 0)
+  {
+    /* set the event to continue tests */
+    SetEvent(Info->Test3.hWaitEvent);
+    
+    /* sleep a bit */
+    Sleep(1500);	
+  }
+}
+
+VOID Test3(PTEST Test, HANDLE hEvent)
+{
+  static TESTINFO Info;
+  BOOL stat;
+  
+  Info.Test = Test;
+  Info.hEvent = hEvent;
+  Info.secsleft = N_TIMEOUT;
+  
+  Info.Test3.hWaitEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
+  if(Info.Test3.hWaitEvent == NULL)
+  {
+    _tprintf(_T("[%d]Unable to create event!\n"), (int)Info.Test->id);
+    return;
+  }
+  
+  Info.Test3.hNotification = CreateEvent(NULL, FALSE, FALSE, NULL);
+  if(Info.Test3.hNotification == NULL)
+  {
+    _tprintf(_T("[%d]Unable to create notification event!\n"), (int)Info.Test->id);
+    return;
+  }
+  
+  if(!CreateTimerQueueTimer(&Info.hTimer, NULL, TimerCallback3, &Info, 1000, 1000, 0))
+  {
+    _tprintf(_T("[%d]CreateTimerQueueTimer() failed, LastError: %d!"), (int)Info.Test->id, (int)GetLastError());
+    
+    CloseHandle(Info.Test3.hWaitEvent);
+    CloseHandle(Info.Test3.hNotification);
+    /* we failed, set the event to continue tests */
+    SetEvent(hEvent);
+    return;
+  }
+  
+  _tprintf(_T("[%d]CreateTimerQueueTimer() created timer 0x%x, countdown (%d sec)...\n"), (int)Test->id, (int)Info.hTimer, (int)Info.secsleft);
+  
+  WaitForSingleObject(Info.Test3.hWaitEvent, INFINITE);
+  
+  _tprintf(_T("[%d]Timout finished, delete timer queue..."), (int)Test->id);
+  stat = DeleteTimerQueueTimer(NULL, Info.hTimer, Info.Test3.hNotification);
+  if(stat)
+  {
+    _tprintf(_T("returned OK -> test FAILED!\n"));
+  }
+  else
+  {
+    int error = GetLastError();
+    
+    switch(error)
+    {
+      case ERROR_IO_PENDING:
+        _tprintf(_T("OK, Overlapped I/O operation in progress\n"));
+        /* this test is only successful in this case */
+        Test->Result = TRUE;
+        break;
+      default:
+        _tprintf(_T("Failed, LastError: %d\n"), (int)GetLastError());
+        break;
+    }
+  }
+  
+  WaitForSingleObject(Info.Test3.hNotification, INFINITE);
+  
+  CloseHandle(Info.Test3.hWaitEvent);
+  CloseHandle(Info.Test3.hNotification);
+  
+  SetEvent(Info.hEvent);
+}
+
+/*******************************************************************************/
+
+VOID
+InitTests(VOID)
+{
+  ZeroMemory(Tests, sizeof(Tests));
+  
+  Tests[0].description = _T("non-blocking DeleteTimerQueueTimer() call from callback");
+  Tests[0].Routine = Test1;
+  
+  Tests[1].description = _T("blocking DeleteTimerQueueTimer() call");
+  Tests[1].Routine = Test2;
+  
+  Tests[2].description = _T("blocking DeleteTimerQueueTimer() call with specified event");
+  Tests[2].Routine = Test3;
+}
+
+int main(int argc, char* argv[])
+{
+  _tprintf(_T("+++ TimerQueue test running +++\n\n"));
+  
+  InitTests();
+  
+  RunTests(); 
+  
+  _tprintf(_T("\n+++ RESULTS +++\n"));
+  
+  PrintTestResults();
+  
+  return 0;
+}

From 3e78fd61283fbc17a5952b974be9b3c53b4c130e Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Thu, 8 Jul 2004 12:55:01 +0000
Subject: [PATCH 225/356] - Honor the "Extended" bit in SetKeyState.

svn path=/trunk/; revision=10035
---
 reactos/subsys/win32k/ntuser/keyboard.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/reactos/subsys/win32k/ntuser/keyboard.c b/reactos/subsys/win32k/ntuser/keyboard.c
index 02a633e32cd..6215ca72ec1 100644
--- a/reactos/subsys/win32k/ntuser/keyboard.c
+++ b/reactos/subsys/win32k/ntuser/keyboard.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: keyboard.c,v 1.30 2004/07/04 17:08:40 navaraf Exp $
+/* $Id: keyboard.c,v 1.31 2004/07/08 12:55:01 navaraf Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -89,6 +89,13 @@ static VOID STDCALL SetKeyState(DWORD key, DWORD vk, DWORD ext, BOOL down) {
     if (down) QueueKeyStateTable[vk] ^= KS_LOCK_BIT;
   } 
 
+  if (ext && vk == VK_LSHIFT)
+    vk = VK_RSHIFT;
+  if (ext && vk == VK_LCONTROL)
+    vk = VK_RCONTROL;
+  if (ext && vk == VK_LMENU)
+    vk = VK_RMENU;
+
   if (down)
     QueueKeyStateTable[vk] |= KS_DOWN_BIT;
   else

From 29ced92e4bd0cd6672b22495da01a3c9b6297661 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Thu, 8 Jul 2004 14:36:18 +0000
Subject: [PATCH 226/356] Fix RegisterLogonProcess().

svn path=/trunk/; revision=10036
---
 reactos/include/funcs.h             |  4 +--
 reactos/lib/user32/misc/misc.c      | 11 ++++---
 reactos/subsys/win32k/ntuser/misc.c | 47 ++++++++++++++++-------------
 reactos/w32api/include/winuser.h    |  1 +
 4 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/reactos/include/funcs.h b/reactos/include/funcs.h
index 763a63f156c..de16fc11001 100644
--- a/reactos/include/funcs.h
+++ b/reactos/include/funcs.h
@@ -4604,8 +4604,8 @@ RegisterSystemThread(
 BOOL
 STDCALL
 RegisterLogonProcess(
-		     HANDLE hprocess,
-		     BOOL x
+		     DWORD dwPprocessId,
+		     BOOL bRegister
 		     );
 
 WINBOOL
diff --git a/reactos/lib/user32/misc/misc.c b/reactos/lib/user32/misc/misc.c
index 9f3393287f6..1ad07afabed 100644
--- a/reactos/lib/user32/misc/misc.c
+++ b/reactos/lib/user32/misc/misc.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: misc.c,v 1.5 2004/05/28 21:33:41 gvg Exp $
+/* $Id: misc.c,v 1.6 2004/07/08 14:35:10 ekohl Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/misc/misc.c
@@ -59,17 +59,20 @@ PrivateCsrssManualGuiCheck(LONG Check)
 
 VOID
 STDCALL
-PrivateCsrssInitialized()
+PrivateCsrssInitialized(VOID)
 {
   NtUserCallNoParam(NOPARAM_ROUTINE_CSRSS_INITIALIZED);
 }
 
+
 /*
  * @implemented
  */
 BOOL
 STDCALL
-RegisterLogonProcess ( HANDLE hprocess, BOOL x )
+RegisterLogonProcess(DWORD dwProcessId, BOOL bRegister)
 {
-  return NtUserRegisterLogonProcess(hprocess, x);
+  return NtUserCallTwoParam(dwProcessId,
+			    (DWORD)bRegister,
+			    TWOPARAM_ROUTINE_REGISTERLOGONPROC);
 }
diff --git a/reactos/subsys/win32k/ntuser/misc.c b/reactos/subsys/win32k/ntuser/misc.c
index edab9193f2c..e786c0be3fa 100644
--- a/reactos/subsys/win32k/ntuser/misc.c
+++ b/reactos/subsys/win32k/ntuser/misc.c
@@ -1,4 +1,4 @@
-/* $Id: misc.c,v 1.81 2004/07/03 13:55:36 navaraf Exp $
+/* $Id: misc.c,v 1.82 2004/07/08 14:36:18 ekohl Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -37,39 +37,44 @@ PUSER_MESSAGE_QUEUE W32kGetPrimitiveMessageQueue() {
 }
 
 BOOL FASTCALL
-IntRegisterLogonProcess(HANDLE hProcess, BOOL x)
+IntRegisterLogonProcess(DWORD dwProcessId, BOOL bRegister)
 {
   PEPROCESS Process;
   NTSTATUS Status;
-  
-  if(LogonProcess != NULL && LogonProcess != PsGetWin32Process())
+
+  Status = PsLookupProcessByProcessId((PVOID)dwProcessId,
+				      &Process);
+  if (!NT_SUCCESS(Status))
   {
-    SetLastWin32Error(ERROR_ACCESS_DENIED);
+    SetLastWin32Error(RtlNtStatusToDosError(Status));
     return FALSE;
   }
-  
-  if(hProcess)
+
+  if (bRegister)
   {
-    Status = ObReferenceObjectByHandle(hProcess,
-                                       PROCESS_QUERY_INFORMATION,
-                                       PsProcessType,
-                                       ExGetPreviousMode(),
-                                       (PVOID*)&Process,
-                                       NULL);
-    if(!NT_SUCCESS(Status))
+    /* Register the logon process */
+    if (LogonProcess != NULL)
     {
-      SetLastNtError(Status);
-      return 0;
+      ObDereferenceObject(Process);
+      return FALSE;
     }
-  
+
     LogonProcess = Process->Win32Process;
-    ObDereferenceObject(Process);
   }
   else
   {
-    /* deregister the logon process */
+    /* Deregister the logon process */
+    if (LogonProcess != Process->Win32Process)
+    {
+      ObDereferenceObject(Process);
+      return FALSE;
+    }
+
     LogonProcess = NULL;
   }
+
+  ObDereferenceObject(Process);
+
   return TRUE;
 }
 
@@ -489,7 +494,7 @@ NtUserCallTwoParam(
     }
     
     case TWOPARAM_ROUTINE_REGISTERLOGONPROC:
-      return (DWORD)IntRegisterLogonProcess((HANDLE)Param1, (BOOL)Param2);
+      return (DWORD)IntRegisterLogonProcess(Param1, (BOOL)Param2);
     
   }
   DPRINT1("Calling invalid routine number 0x%x in NtUserCallTwoParam(), Param1=0x%x Parm2=0x%x\n",
@@ -532,7 +537,7 @@ NtUserCallHwndLock(
          /* FIXME */
          break;
 
-      case HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOW:         
+      case HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOW:
          Ret = IntSetForegroundWindow(Window);
          break;
 
diff --git a/reactos/w32api/include/winuser.h b/reactos/w32api/include/winuser.h
index bb7c528ad53..c8a02f99f1e 100644
--- a/reactos/w32api/include/winuser.h
+++ b/reactos/w32api/include/winuser.h
@@ -3704,6 +3704,7 @@ HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE,LPVOID,DWORD);
 HDEVNOTIFY WINAPI RegisterDeviceNotificationW(HANDLE,LPVOID,DWORD);
 #endif
 BOOL WINAPI RegisterHotKey(HWND,int,UINT,UINT);
+BOOL WINAPI RegisterLogonProcess(DWORD,BOOL);
 #if (_WIN32_WINNT >= 0x0501)
 BOOL WINAPI RegisterRawInputDevices(PCRAWINPUTDEVICE,UINT,UINT);
 #endif

From 5b95f50fd4b3f91bbca75f93fb80c23d3d81671f Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Thu, 8 Jul 2004 14:41:38 +0000
Subject: [PATCH 227/356] Register the logon process.

svn path=/trunk/; revision=10037
---
 reactos/subsys/system/winlogon/winlogon.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/reactos/subsys/system/winlogon/winlogon.c b/reactos/subsys/system/winlogon/winlogon.c
index 8b2cec9342b..9a3b4f4f891 100644
--- a/reactos/subsys/system/winlogon/winlogon.c
+++ b/reactos/subsys/system/winlogon/winlogon.c
@@ -1,4 +1,4 @@
-/* $Id: winlogon.c,v 1.31 2004/07/03 17:40:24 navaraf Exp $
+/* $Id: winlogon.c,v 1.32 2004/07/08 14:41:38 ekohl Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -565,7 +565,7 @@ WinMain(HINSTANCE hInstance,
   }
   
   WLSession->LogonStatus = LOGON_INITIALIZING;
-#if START_LSASS
+
   if(!RegisterLogonProcess(GetCurrentProcessId(), TRUE))
   {
     DbgPrint("WL: Could not register logon process\n");
@@ -573,7 +573,6 @@ WinMain(HINSTANCE hInstance,
     ExitProcess(0);
     return 0;
   }
-#endif
   
   if(!WlxCreateWindowStationAndDesktops(WLSession))
   {

From 4a76a3915bcbd479d8080d6c731db20e743f83e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Thu, 8 Jul 2004 22:05:48 +0000
Subject: [PATCH 228/356] Fix lib/rosrtl compilation

svn path=/trunk/; revision=10039
---
 reactos/include/ntdll/rtl.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/reactos/include/ntdll/rtl.h b/reactos/include/ntdll/rtl.h
index e61f005d1cc..7d9895e9a63 100644
--- a/reactos/include/ntdll/rtl.h
+++ b/reactos/include/ntdll/rtl.h
@@ -1,4 +1,4 @@
-/* $Id: rtl.h,v 1.44 2004/07/08 00:40:30 weiden Exp $
+/* $Id: rtl.h,v 1.45 2004/07/08 22:05:48 gvg Exp $
  *
  */
 
@@ -618,7 +618,11 @@ RtlRunEncodeUnicodeString (IN OUT PUCHAR Hash,
 
 /* Timer Queue functions */
 
+#ifdef __USE_W32API
+#include <winnt.h>
+#else /* __USE_W32API */
 typedef VOID (CALLBACK *WAITORTIMERCALLBACKFUNC) (PVOID, BOOLEAN );
+#endif /* __USE_W32API */
 
 NTSTATUS
 STDCALL

From 1ef595367943b98798d931d6649caec0583be925 Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Fri, 9 Jul 2004 15:53:34 +0000
Subject: [PATCH 229/356] set the control focus when clicking on it

svn path=/trunk/; revision=10047
---
 reactos/subsys/system/regedit/hexedit.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/reactos/subsys/system/regedit/hexedit.c b/reactos/subsys/system/regedit/hexedit.c
index 332a937e372..edec6af814f 100644
--- a/reactos/subsys/system/regedit/hexedit.c
+++ b/reactos/subsys/system/regedit/hexedit.c
@@ -748,10 +748,12 @@ HEXEDIT_WM_LBUTTONDOWN(PHEXEDIT_DATA hed, INT Buttons, POINTS Pt)
   POINT EditPos;
   DWORD Hit = HEXEDIT_HitRegionTest(hed, Pt);
   
+  SetFocus(hed->hWndSelf);
+  
   hed->Position = HEXEDIT_PositionFromPoint(hed, Pt, Hit, &EditPos, &NewField); 
   hed->EditingField = NewField;
   hed->CaretCol = EditPos.x;
-  hed->CaretLine = EditPos.y;
+  hed->CaretLine = EditPos.y;  
   
   HEXEDIT_MoveCaret(hed, TRUE);
   

From b00489100f3e5e45e3e911b9ae3128073227f2e0 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Fri, 9 Jul 2004 20:04:05 +0000
Subject: [PATCH 230/356] - Added ordinal numbers.

svn path=/trunk/; revision=10048
---
 reactos/lib/ws2_32/ws2_32.edf | 229 +++++++++++++++++-----------------
 1 file changed, 114 insertions(+), 115 deletions(-)

diff --git a/reactos/lib/ws2_32/ws2_32.edf b/reactos/lib/ws2_32/ws2_32.edf
index 5cfe339aeb0..b32f69db26c 100644
--- a/reactos/lib/ws2_32/ws2_32.edf
+++ b/reactos/lib/ws2_32/ws2_32.edf
@@ -3,120 +3,119 @@
 LIBRARY ws2_32.dll
 
 EXPORTS
-WEP=WEP@0
-WPUCompleteOverlappedRequest=WPUCompleteOverlappedRequest@20
-WSAAccept=WSAAccept@20
-WSAAddressToStringA=WSAAddressToStringA@20
-WSAAddressToStringW=WSAAddressToStringW@20
-WSAAsyncGetHostByAddr=WSAAsyncGetHostByAddr@28
-WSAAsyncGetHostByName=WSAAsyncGetHostByName@20
-WSAAsyncGetProtoByName=WSAAsyncGetProtoByName@20
-WSAAsyncGetProtoByNumber=WSAAsyncGetProtoByNumber@20
-WSAAsyncGetServByName=WSAAsyncGetServByName@24
-WSAAsyncGetServByPort=WSAAsyncGetServByPort@24
-WSAAsyncSelect=WSAAsyncSelect@16
-WSACancelAsyncRequest=WSACancelAsyncRequest@4
-WSACancelBlockingCall=WSACancelBlockingCall@0
-WSACleanup=WSACleanup@0
-WSACloseEvent=WSACloseEvent@4
-WSAConnect=WSAConnect@28
-WSACreateEvent=WSACreateEvent@0
-WSADuplicateSocketA=WSADuplicateSocketA@12
-WSADuplicateSocketW=WSADuplicateSocketW@12
-WSAEnumNameSpaceProvidersA=WSAEnumNameSpaceProvidersA@8
-WSAEnumNameSpaceProvidersW=WSAEnumNameSpaceProvidersW@8
-WSAEnumNetworkEvents=WSAEnumNetworkEvents@12
-WSAEnumProtocolsA=WSAEnumProtocolsA@12
-WSAEnumProtocolsW=WSAEnumProtocolsW@12
-WSAEventSelect=WSAEventSelect@12
-WSAGetLastError=WSAGetLastError@0
-WSAGetOverlappedResult=WSAGetOverlappedResult@20
-WSAGetQOSByName=WSAGetQOSByName@12
-WSAGetServiceClassInfoA=WSAGetServiceClassInfoA@16
-WSAGetServiceClassInfoW=WSAGetServiceClassInfoW@16
-WSAGetServiceClassNameByClassIdA=WSAGetServiceClassNameByClassIdA@12
-WSAGetServiceClassNameByClassIdW=WSAGetServiceClassNameByClassIdW@12
-WSAHtonl=WSAHtonl@12
-WSAHtons=WSAHtons@12
-WSAInstallServiceClassA=WSAInstallServiceClassA@4
-WSAInstallServiceClassW=WSAInstallServiceClassW@4
-WSAIoctl=WSAIoctl@36
-WSAIsBlocking=WSAIsBlocking@0
-WSAJoinLeaf=WSAJoinLeaf@32
-WSALookupServiceBeginA=WSALookupServiceBeginA@12
-WSALookupServiceBeginW=WSALookupServiceBeginW@12
-WSALookupServiceEnd=WSALookupServiceEnd@4
-WSALookupServiceNextA=WSALookupServiceNextA@16
-WSALookupServiceNextW=WSALookupServiceNextW@16
-WSANtohl=WSANtohl@12
-WSANtohs=WSANtohs@12
-WSAProviderConfigChange=WSAProviderConfigChange@12
-WSARecv=WSARecv@28
-WSARecvDisconnect=WSARecvDisconnect@8
-WSARecvFrom=WSARecvFrom@36
-WSARemoveServiceClass=WSARemoveServiceClass@4
-WSAResetEvent=WSAResetEvent@4
-WSASend=WSASend@28
-WSASendDisconnect=WSASendDisconnect@8
-WSASendTo=WSASendTo@36
-WSASetBlockingHook=WSASetBlockingHook@4
-WSASetEvent=WSASetEvent@4
-WSASetLastError=WSASetLastError@4
-WSASetServiceA=WSASetServiceA@12
-WSASetServiceW=WSASetServiceW@12
-WSASocketA=WSASocketA@24
-WSASocketW=WSASocketW@24
-WSAStartup=WSAStartup@8
-WSAStringToAddressA=WSAStringToAddressA@20
-WSAStringToAddressW=WSAStringToAddressW@20
-WSAUnhookBlockingHook=WSAUnhookBlockingHook@0
-WSAWaitForMultipleEvents=WSAWaitForMultipleEvents@20
-WSApSetPostRoutine=WSApSetPostRoutine@4
-WSCDeinstallProvider=WSCDeinstallProvider@8
-WSCEnableNSProvider=WSCEnableNSProvider@8
-WSCEnumProtocols=WSCEnumProtocols@16
-WSCGetProviderPath=WSCGetProviderPath@16
-WSCInstallNameSpace=WSCInstallNameSpace@20
-WSCInstallProvider=WSCInstallProvider@20
-WSCUnInstallNameSpace=WSCUnInstallNameSpace@4
-WSCWriteNameSpaceOrder=WSCWriteNameSpaceOrder@8
-WSCWriteProviderOrder=WSCWriteProviderOrder@8
-__WSAFDIsSet=__WSAFDIsSet@8
-accept=accept@12
-bind=bind@12
-closesocket=closesocket@4
-connect=connect@12
-gethostbyaddr=gethostbyaddr@12
-gethostbyname=gethostbyname@4
-gethostname=gethostname@8
-getpeername=getpeername@12
-getprotobyname=getprotobyname@4
-getprotobynumber=getprotobynumber@4
-getservbyname=getservbyname@8
-getservbyport=getservbyport@8
-getsockname=getsockname@12
-getsockopt=getsockopt@20
-htonl=htonl@4
-htons=htons@4
-inet_addr=inet_addr@4
-inet_ntoa=inet_ntoa@4
-ioctlsocket=ioctlsocket@12
-listen=listen@8
-ntohl=ntohl@4
-ntohs=ntohs@4
-recv=recv@16
-recvfrom=recvfrom@24
-select=select@20
-send=send@16
-sendto=sendto@24
-setsockopt=setsockopt@20
-shutdown=shutdown@8
-socket=socket@12
-WSANSPIoctl=WSANSPIoctl@32
-WSCUpdateProvider=WSCUpdateProvider@20
-WSCWriteNameSpaceOrder=WSCWriteNameSpaceOrder@8
-freeaddrinfo=freeaddrinfo@4
-getaddrinfo=getaddrinfo@16
-getnameinfo=getnameinfo@28
+WEP=WEP@0 @500
+WPUCompleteOverlappedRequest=WPUCompleteOverlappedRequest@20 @25
+WSAAccept=WSAAccept@20 @26
+WSAAddressToStringA=WSAAddressToStringA@20 @27
+WSAAddressToStringW=WSAAddressToStringW@20 @28
+WSAAsyncGetHostByAddr=WSAAsyncGetHostByAddr@28 @102
+WSAAsyncGetHostByName=WSAAsyncGetHostByName@20 @103
+WSAAsyncGetProtoByName=WSAAsyncGetProtoByName@20 @105
+WSAAsyncGetProtoByNumber=WSAAsyncGetProtoByNumber@20 @104
+WSAAsyncGetServByName=WSAAsyncGetServByName@24 @107
+WSAAsyncGetServByPort=WSAAsyncGetServByPort@24 @106
+WSAAsyncSelect=WSAAsyncSelect@16 @101
+WSACancelAsyncRequest=WSACancelAsyncRequest@4 @108
+WSACancelBlockingCall=WSACancelBlockingCall@0 @113
+WSACleanup=WSACleanup@0 @116
+WSACloseEvent=WSACloseEvent@4 @29
+WSAConnect=WSAConnect@28 @30
+WSACreateEvent=WSACreateEvent@0 @31
+WSADuplicateSocketA=WSADuplicateSocketA@12 @32
+WSADuplicateSocketW=WSADuplicateSocketW@12 @33
+WSAEnumNameSpaceProvidersA=WSAEnumNameSpaceProvidersA@8 @34
+WSAEnumNameSpaceProvidersW=WSAEnumNameSpaceProvidersW@8 @35
+WSAEnumNetworkEvents=WSAEnumNetworkEvents@12 @36
+WSAEnumProtocolsA=WSAEnumProtocolsA@12 @37
+WSAEnumProtocolsW=WSAEnumProtocolsW@12 @38
+WSAEventSelect=WSAEventSelect@12 @39
+WSAGetLastError=WSAGetLastError@0 @111
+WSAGetOverlappedResult=WSAGetOverlappedResult@20 @40
+WSAGetQOSByName=WSAGetQOSByName@12 @41
+WSAGetServiceClassInfoA=WSAGetServiceClassInfoA@16 @42
+WSAGetServiceClassInfoW=WSAGetServiceClassInfoW@16 @43
+WSAGetServiceClassNameByClassIdA=WSAGetServiceClassNameByClassIdA@12 @44
+WSAGetServiceClassNameByClassIdW=WSAGetServiceClassNameByClassIdW@12 @45
+WSAHtonl=WSAHtonl@12 @46
+WSAHtons=WSAHtons@12 @47
+WSAInstallServiceClassA=WSAInstallServiceClassA@4 @48
+WSAInstallServiceClassW=WSAInstallServiceClassW@4 @49
+WSAIoctl=WSAIoctl@36 @50
+WSAIsBlocking=WSAIsBlocking@0 @114
+WSAJoinLeaf=WSAJoinLeaf@32 @58
+WSALookupServiceBeginA=WSALookupServiceBeginA@12 @59
+WSALookupServiceBeginW=WSALookupServiceBeginW@12 @60
+WSALookupServiceEnd=WSALookupServiceEnd@4 @61
+WSALookupServiceNextA=WSALookupServiceNextA@16 @62
+WSALookupServiceNextW=WSALookupServiceNextW@16 @63
+WSANSPIoctl=WSANSPIoctl@32 @64
+WSANtohl=WSANtohl@12 @65
+WSANtohs=WSANtohs@12 @66
+WSAProviderConfigChange=WSAProviderConfigChange@12 @67
+WSARecv=WSARecv@28 @68
+WSARecvDisconnect=WSARecvDisconnect@8 @69
+WSARecvFrom=WSARecvFrom@36 @70
+WSARemoveServiceClass=WSARemoveServiceClass@4 @71
+WSAResetEvent=WSAResetEvent@4 @72
+WSASend=WSASend@28 @73
+WSASendDisconnect=WSASendDisconnect@8 @74
+WSASendTo=WSASendTo@36 @75
+WSASetBlockingHook=WSASetBlockingHook@4 @109
+WSASetEvent=WSASetEvent@4 @76
+WSASetLastError=WSASetLastError@4 @112
+WSASetServiceA=WSASetServiceA@12 @77
+WSASetServiceW=WSASetServiceW@12 @78
+WSASocketA=WSASocketA@24 @79
+WSASocketW=WSASocketW@24 @80
+WSAStartup=WSAStartup@8 @115
+WSAStringToAddressA=WSAStringToAddressA@20 @81
+WSAStringToAddressW=WSAStringToAddressW@20 @82
+WSAUnhookBlockingHook=WSAUnhookBlockingHook@0 @110
+WSAWaitForMultipleEvents=WSAWaitForMultipleEvents@20 @83
+WSApSetPostRoutine=WSApSetPostRoutine@4 @24
+WSCDeinstallProvider=WSCDeinstallProvider@8 @84
+WSCEnableNSProvider=WSCEnableNSProvider@8 @85
+WSCEnumProtocols=WSCEnumProtocols@16 @86
+WSCGetProviderPath=WSCGetProviderPath@16 @87
+WSCInstallNameSpace=WSCInstallNameSpace@20 @88
+WSCInstallProvider=WSCInstallProvider@20 @89
+WSCUnInstallNameSpace=WSCUnInstallNameSpace@4 @90
+WSCUpdateProvider=WSCUpdateProvider@20 @91
+WSCWriteNameSpaceOrder=WSCWriteNameSpaceOrder@8 @92
+WSCWriteProviderOrder=WSCWriteProviderOrder@8 @93
+__WSAFDIsSet=__WSAFDIsSet@8 @151
+accept=accept@12 @1
+bind=bind@12 @2
+closesocket=closesocket@4 @3
+connect=connect@12 @4
+freeaddrinfo=freeaddrinfo@4 @94
+getaddrinfo=getaddrinfo@16 @95
+gethostbyaddr=gethostbyaddr@12 @51
+gethostbyname=gethostbyname@4 @52
+gethostname=gethostname@8 @57
+getnameinfo=getnameinfo@28 @96
+getpeername=getpeername@12 @5
+getprotobyname=getprotobyname@4 @53
+getprotobynumber=getprotobynumber@4 @54
+getservbyname=getservbyname@8 @55
+getservbyport=getservbyport@8 @56
+getsockname=getsockname@12 @6
+getsockopt=getsockopt@20 @7
+htonl=htonl@4 @8
+htons=htons@4 @9
+inet_addr=inet_addr@4 @11
+inet_ntoa=inet_ntoa@4 @12
+ioctlsocket=ioctlsocket@12 @10
+listen=listen@8 @13
+ntohl=ntohl@4 @14
+ntohs=ntohs@4 @15
+recv=recv@16 @16
+recvfrom=recvfrom@24 @17
+select=select@20 @18
+send=send@16 @19
+sendto=sendto@24 @20
+setsockopt=setsockopt@20 @21
+shutdown=shutdown@8 @22
+socket=socket@12 @23
 
 ; EOF

From 18168b454a7526b1cb3c208e67162120f9593c21 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Fri, 9 Jul 2004 20:06:40 +0000
Subject: [PATCH 231/356] - Fixed dispatching of nested exceptions.

svn path=/trunk/; revision=10049
---
 reactos/lib/rtl/i386/exception.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/reactos/lib/rtl/i386/exception.c b/reactos/lib/rtl/i386/exception.c
index bb091e72396..e6abf5a5d68 100644
--- a/reactos/lib/rtl/i386/exception.c
+++ b/reactos/lib/rtl/i386/exception.c
@@ -1,4 +1,4 @@
-/* $Id: exception.c,v 1.3 2004/07/07 16:25:00 navaraf Exp $
+/* $Id: exception.c,v 1.4 2004/07/09 20:06:40 navaraf Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -90,8 +90,7 @@ ULONG
 RtlpDispatchException(IN PEXCEPTION_RECORD  ExceptionRecord,
 	IN PCONTEXT  Context)
 {
-  PEXCEPTION_REGISTRATION RegistrationFrame;
-  DWORD DispatcherContext;
+  PEXCEPTION_REGISTRATION RegistrationFrame, NestedFrame = NULL, DispatcherContext;
   DWORD ReturnValue;
 
   DPRINT("RtlpDispatchException()\n");
@@ -107,7 +106,6 @@ RtlpDispatchException(IN PEXCEPTION_RECORD  ExceptionRecord,
   while ((ULONG_PTR)RegistrationFrame != -1)
   {
     EXCEPTION_RECORD ExceptionRecord2;
-    DWORD Temp = 0;
     //PVOID RegistrationFrameEnd = (PVOID)RegistrationFrame + 8;
 
     // Make sure the registration frame is located within the stack
@@ -172,9 +170,10 @@ RtlpDispatchException(IN PEXCEPTION_RECORD  ExceptionRecord,
 		DPRINT("EBP == 0x%.08x\n", sp[6]);
 	}
 #endif
-    if (RegistrationFrame == NULL)
+    if (RegistrationFrame == NestedFrame)
     {
       ExceptionRecord->ExceptionFlags &= ~EXCEPTION_NESTED_CALL;  // Turn off flag
+      NestedFrame = NULL;
     }
 
     if (ReturnValue == ExceptionContinueExecution)
@@ -207,10 +206,10 @@ RtlpDispatchException(IN PEXCEPTION_RECORD  ExceptionRecord,
     {
       DPRINT("ReturnValue == ExceptionNestedException\n");
 
-      ExceptionRecord->ExceptionFlags |= EXCEPTION_EXIT_UNWIND;
-      if (DispatcherContext > Temp)
+      ExceptionRecord->ExceptionFlags |= EXCEPTION_NESTED_CALL;
+      if (NestedFrame < DispatcherContext)
 	  {
-          Temp = DispatcherContext;
+          NestedFrame = DispatcherContext;
 	  }
     }
     else /* if (ReturnValue == ExceptionCollidedUnwind) */

From 2915b7de9b1ffdf3fb608c7d5b5d2efefe342429 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Fri, 9 Jul 2004 20:08:05 +0000
Subject: [PATCH 232/356] - Corrected the obtaining of TLS callbacks address.

svn path=/trunk/; revision=10050
---
 reactos/lib/ntdll/ldr/utils.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/reactos/lib/ntdll/ldr/utils.c b/reactos/lib/ntdll/ldr/utils.c
index 41abc521a40..0ed85b43db0 100644
--- a/reactos/lib/ntdll/ldr/utils.c
+++ b/reactos/lib/ntdll/ldr/utils.c
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.97 2004/07/03 17:40:22 navaraf Exp $
+/* $Id: utils.c,v 1.98 2004/07/09 20:08:05 navaraf Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -252,7 +252,10 @@ LdrpInitializeTlsForProccess(VOID)
                TlsData->StartAddressOfRawData = (PVOID)TlsDirectory->StartAddressOfRawData;
                TlsData->TlsDataSize = TlsDirectory->EndAddressOfRawData - TlsDirectory->StartAddressOfRawData;
                TlsData->TlsZeroSize = TlsDirectory->SizeOfZeroFill;
-               TlsData->TlsAddressOfCallBacks = *TlsDirectory->AddressOfCallBacks;
+               if (TlsDirectory->AddressOfCallBacks)
+                 TlsData->TlsAddressOfCallBacks = *(PIMAGE_TLS_CALLBACK)RVA(Module->BaseAddress, TlsDirectory->AddressOfCallBacks);
+               else
+                 TlsData->TlsAddressOfCallBacks = NULL;
                TlsData->Module = Module;
 #if 0
                DbgPrint("TLS directory for %wZ\n", &Module->BaseDllName);

From a2f7e347924cfffd2bc0d71cd30b520d82a76b6a Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Fri, 9 Jul 2004 20:08:48 +0000
Subject: [PATCH 233/356] - Display window icon only if there is any.

svn path=/trunk/; revision=10051
---
 reactos/lib/user32/windows/nonclient.c | 80 +++++++++++---------------
 1 file changed, 32 insertions(+), 48 deletions(-)

diff --git a/reactos/lib/user32/windows/nonclient.c b/reactos/lib/user32/windows/nonclient.c
index 75d94006c74..13682738a6c 100644
--- a/reactos/lib/user32/windows/nonclient.c
+++ b/reactos/lib/user32/windows/nonclient.c
@@ -147,52 +147,38 @@ UserHasMenu(HWND hWnd, ULONG Style)
 HICON 
 UserGetWindowIcon(HWND hwnd)
 {
-  HICON Ret;
-  
-  if(SendMessageTimeoutW(hwnd, WM_GETICON, ICON_SMALL2, 0, SMTO_ABORTIFHUNG, 1000, (LPDWORD)&Ret) && Ret)
-  {
-    return Ret;
-  }
-  if(SendMessageTimeoutW(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, 1000, (LPDWORD)&Ret) && Ret)
-  {
-    return Ret;
-  }
-  if(SendMessageTimeoutW(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000, (LPDWORD)&Ret) && Ret)
-  {
-    return Ret;
-  }
-  if((Ret = (HICON)GetClassLongW(hwnd, GCL_HICONSM)))
-  {
-    return Ret;
-  }
-  if((Ret = (HICON)GetClassLongW(hwnd, GCL_HICON)))
-  {
-    return Ret;
-  }
-  if(SendMessageTimeoutW(hwnd, WM_QUERYDRAGICON, 0, 0, 0, 1000, (LPDWORD)&Ret) && Ret)
-  {
-    return Ret;
-  }
-  if((Ret = LoadIconW(0, IDI_APPLICATION)))
-  {
-    return Ret;
-  }
-  
-  return NULL;
+   HICON hIcon = 0;
+
+   SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL2, 0, SMTO_ABORTIFHUNG, 1000, (LPDWORD)&hIcon);
+
+   if (!hIcon)
+      SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, 1000, (LPDWORD)&hIcon);
+
+   if (!hIcon)
+      SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000, (LPDWORD)&hIcon);
+
+   if (!hIcon)
+      hIcon = (HICON)GetClassLong(hwnd, GCL_HICONSM);
+
+   if (!hIcon)
+      hIcon = (HICON)GetClassLong(hwnd, GCL_HICON);
+
+   return hIcon;
 }
 
 BOOL
 UserDrawSysMenuButton(HWND hWnd, HDC hDC, LPRECT Rect, BOOL Down)
 {
-  HICON WindowIcon;
+   HICON WindowIcon;
   
-  if((WindowIcon = UserGetWindowIcon(hWnd)))
-  {
-    return DrawIconEx(hDC, Rect->left + 2, Rect->top + 2, WindowIcon,
-                      GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON),
-                      0, NULL, DI_NORMAL);
-  }
-  return FALSE;
+   if ((WindowIcon = UserGetWindowIcon(hWnd)))
+   {
+      return DrawIconEx(hDC, Rect->left + 2, Rect->top + 2, WindowIcon,
+                        GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON),
+                        0, NULL, DI_NORMAL);
+   }
+
+   return FALSE;
 }
 
 /*
@@ -1223,11 +1209,11 @@ DrawCaption(HWND hWnd, HDC hDC, LPCRECT lprc, UINT uFlags)
             xx = GetSystemMetrics(SM_CXSIZE) + Padding;
             /* draw icon background */
             PatBlt(MemDC, 0, 0, xx, lprc->bottom - lprc->top, PATCOPY);
-            // For some reason the icon isn't centered correctly...
+            /* For some reason the icon isn't centered correctly... */
             r.top --;
-            UserDrawSysMenuButton(hWnd, MemDC, &r, FALSE);
+            if (UserDrawSysMenuButton(hWnd, MemDC, &r, FALSE))
+              r.left += xx;
             r.top ++;
-            r.left += xx;
           }
           
           vert[0].x = r.left;
@@ -1269,9 +1255,10 @@ DrawCaption(HWND hWnd, HDC hDC, LPCRECT lprc, UINT uFlags)
     
     if ((uFlags & DC_ICON) && !(uFlags & DC_GRADIENT) && (Style & WS_SYSMENU) && !(uFlags & DC_SMALLCAP))
     {
-        // For some reason the icon isn't centered correctly...
+        /* For some reason the icon isn't centered correctly... */
         r.top --;
-        UserDrawSysMenuButton(hWnd, MemDC, &r, FALSE);
+        if (UserDrawSysMenuButton(hWnd, MemDC, &r, FALSE))
+          r.left += GetSystemMetrics(SM_CXSIZE) + Padding;
         r.top ++;
     }
     r.top ++;
@@ -1283,9 +1270,6 @@ DrawCaption(HWND hWnd, HDC hDC, LPCRECT lprc, UINT uFlags)
   {
     if(!(uFlags & DC_GRADIENT))
     {
-    if (!(uFlags & DC_SMALLCAP) && ((uFlags & DC_ICON) || (uFlags & DC_INBUTTON)))
-        r.left += GetSystemMetrics(SM_CXSIZE) + Padding;
-
     r.right = (lprc->right - lprc->left);
     if (uFlags & DC_SMALLCAP)
       ButtonWidth = GetSystemMetrics(SM_CXSMSIZE) - 2;

From d45a8c1356cb0007e8fb8a2a648e83434a478175 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Fri, 9 Jul 2004 20:09:35 +0000
Subject: [PATCH 234/356] - DrawIcon should return TRUE if it succeeds.

svn path=/trunk/; revision=10052
---
 reactos/subsys/win32k/objects/cursoricon.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/reactos/subsys/win32k/objects/cursoricon.c b/reactos/subsys/win32k/objects/cursoricon.c
index 53f04c30fe9..5c743425eef 100644
--- a/reactos/subsys/win32k/objects/cursoricon.c
+++ b/reactos/subsys/win32k/objects/cursoricon.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: cursoricon.c,v 1.62 2004/07/07 08:39:54 gvg Exp $ */
+/* $Id: cursoricon.c,v 1.63 2004/07/09 20:09:35 navaraf Exp $ */
 #include <w32k.h>
 
 PCURICON_OBJECT FASTCALL
@@ -1236,6 +1236,8 @@ NtUserDrawIconEx(
     #if CANSTRETCHBLT
     SetStretchBltMode(hdcOff, nStretchMode);
     #endif
+
+    Ret = TRUE;
     
     cleanup:
     if(DoFlickerFree)

From 35a256ae2bdb353c04e5cc69bbc451bb2262b978 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Fri, 9 Jul 2004 20:10:45 +0000
Subject: [PATCH 235/356] - Since LookupAccountSidA is unimplemented, but
 returns success, we should at least fill the output parameters with some
 reasonable values.

svn path=/trunk/; revision=10053
---
 reactos/lib/advapi32/sec/misc.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/reactos/lib/advapi32/sec/misc.c b/reactos/lib/advapi32/sec/misc.c
index be32d2b1508..37c7668a196 100644
--- a/reactos/lib/advapi32/sec/misc.c
+++ b/reactos/lib/advapi32/sec/misc.c
@@ -1,4 +1,4 @@
-/* $Id: misc.c,v 1.19 2004/07/06 22:08:48 gvg Exp $
+/* $Id: misc.c,v 1.20 2004/07/09 20:10:45 navaraf Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -379,6 +379,8 @@ LookupAccountSidA (LPCSTR lpSystemName,
 		   PSID_NAME_USE peUse)
 {
   DPRINT1("LookupAccountSidA is unimplemented, but returns success\n");
+  lstrcpynA(lpName, "Administrator", *cchName);
+  lstrcpynA(lpReferencedDomainName, "ReactOS", *cchReferencedDomainName);
   return TRUE;
 }
 
@@ -398,6 +400,8 @@ LookupAccountSidW (LPCWSTR lpSystemName,
 		   PSID_NAME_USE peUse)
 {
   DPRINT1("LookupAccountSidW is unimplemented, but returns success\n");
+  lstrcpynW(lpName, L"Administrator", *cchName);
+  lstrcpynW(lpReferencedDomainName, L"ReactOS", *cchReferencedDomainName);
   return TRUE;
 }
 

From 79a4726093ee464dcdbe2df9732a6424b8947486 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Fri, 9 Jul 2004 20:13:00 +0000
Subject: [PATCH 236/356] - Handle UnsafeRect == NULL case in
 NtUserGetUpdateRect.

svn path=/trunk/; revision=10054
---
 reactos/subsys/win32k/ntuser/painting.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/reactos/subsys/win32k/ntuser/painting.c b/reactos/subsys/win32k/ntuser/painting.c
index b72f6a2cc74..419440e0295 100644
--- a/reactos/subsys/win32k/ntuser/painting.c
+++ b/reactos/subsys/win32k/ntuser/painting.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *  $Id: painting.c,v 1.83 2004/05/15 08:01:56 gvg Exp $
+ *  $Id: painting.c,v 1.84 2004/07/09 20:13:00 navaraf Exp $
  *
  *  COPYRIGHT:        See COPYING in the top level directory
  *  PROJECT:          ReactOS kernel
@@ -914,11 +914,14 @@ NtUserGetUpdateRect(HWND Wnd, LPRECT UnsafeRect, BOOL Erase)
   RGNDATA_UnlockRgn(Rgn);
   NtGdiDeleteObject(Rgn);
 
-  Status = MmCopyToCaller(UnsafeRect, &Rect, sizeof(RECT));
-  if (! NT_SUCCESS(Status))
+  if (UnsafeRect != NULL)
     {
-      SetLastWin32Error(ERROR_INVALID_PARAMETER);
-      return FALSE;
+      Status = MmCopyToCaller(UnsafeRect, &Rect, sizeof(RECT));
+      if (! NT_SUCCESS(Status))
+        {
+          SetLastWin32Error(ERROR_INVALID_PARAMETER);
+          return FALSE;
+        }
     }
 
   return Rect.left < Rect.right && Rect.top < Rect.bottom;

From 91995ef4ed9c605f93f489867fdcaa52567d5dc1 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Fri, 9 Jul 2004 20:14:49 +0000
Subject: [PATCH 237/356] - Some application depend on Info->RegionSize set by
 NtQueryVirtualMemory for iteration. We had a workaround here for this
 behaviour until a correct implementation is written, but it was limited for
 addresses lower than 0x70000000. Raise that limit to 0x80000000.

svn path=/trunk/; revision=10055
---
 reactos/ntoskrnl/mm/virtual.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reactos/ntoskrnl/mm/virtual.c b/reactos/ntoskrnl/mm/virtual.c
index abc85fcef5a..44c966ce914 100644
--- a/reactos/ntoskrnl/mm/virtual.c
+++ b/reactos/ntoskrnl/mm/virtual.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: virtual.c,v 1.76 2004/06/19 08:53:35 vizzini Exp $
+/* $Id: virtual.c,v 1.77 2004/07/09 20:14:49 navaraf Exp $
  *
  * PROJECT:     ReactOS kernel
  * FILE:        ntoskrnl/mm/virtual.c
@@ -180,7 +180,7 @@ NtQueryVirtualMemory (IN HANDLE ProcessHandle,
                /* Since programs might depend on RegionSize for
                 * iteration, we for now just make up a value.
                 */
-               Info->RegionSize = (Address > (PVOID)0x70000000) ? 0 : 0x10000;
+               Info->RegionSize = (Address > (PVOID)0x80000000) ? 0 : 0x10000;
                Info->Protect = PAGE_NOACCESS;
                Info->Type = 0;
                Status = STATUS_SUCCESS;

From 549b1545100f169a8ec9a4b6600ba7d2cb75b204 Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Fri, 9 Jul 2004 20:18:49 +0000
Subject: [PATCH 238/356] added skeleton for acledit.dll

svn path=/trunk/; revision=10056
---
 reactos/Makefile                 |   4 +-
 reactos/baseaddress.cfg          |   3 +-
 reactos/include/acledit.h        | 136 +++++++++++++++++++++++++++++++
 reactos/lib/acledit/.cvsignore   |   8 ++
 reactos/lib/acledit/Makefile     |  45 ++++++++++
 reactos/lib/acledit/acledit.c    |  60 ++++++++++++++
 reactos/lib/acledit/acledit.def  |  12 +++
 reactos/lib/acledit/acledit.edf  |  12 +++
 reactos/lib/acledit/acledit.rc   |  40 +++++++++
 reactos/lib/acledit/acleditint.h |   8 ++
 reactos/lib/acledit/resource.h   |   8 ++
 reactos/lib/acledit/stubs.c      | 118 +++++++++++++++++++++++++++
 12 files changed, 451 insertions(+), 3 deletions(-)
 create mode 100644 reactos/include/acledit.h
 create mode 100644 reactos/lib/acledit/.cvsignore
 create mode 100644 reactos/lib/acledit/Makefile
 create mode 100644 reactos/lib/acledit/acledit.c
 create mode 100644 reactos/lib/acledit/acledit.def
 create mode 100644 reactos/lib/acledit/acledit.edf
 create mode 100644 reactos/lib/acledit/acledit.rc
 create mode 100644 reactos/lib/acledit/acleditint.h
 create mode 100644 reactos/lib/acledit/resource.h
 create mode 100644 reactos/lib/acledit/stubs.c

diff --git a/reactos/Makefile b/reactos/Makefile
index a196acc3be6..74d806db17a 100644
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.233 2004/07/02 08:06:46 arty Exp $
+# $Id: Makefile,v 1.234 2004/07/09 20:18:48 weiden Exp $
 #
 # Global makefile
 #
@@ -44,7 +44,7 @@ DLLS_CPL = cpl
 # advapi32 cards crtdll comdlg32 fmifs gdi32 imagehlp kernel32 libpcap packet msafd msvcrt ntdll
 # epsapi psapi richedit rpcrt4 secur32 user32 version ws2help ws2_32 wsock32 wshirda mswsock
 # imagehlp imm32
-DLLS = advapi32 cabinet cards comctl32 crtdll comdlg32 d3d8thk expat fmifs freetype gdi32 \
+DLLS = acledit advapi32 cabinet cards comctl32 crtdll comdlg32 d3d8thk expat fmifs freetype gdi32 \
 	imm32 iphlpapi kernel32 lzexpand mpr msafd msgina msimg32 msvcrt msvcrt20 mswsock \
 	netapi32 ntdll ole32 oleaut32 oledlg packet psapi richedit rpcrt4 samlib secur32 \
 	setupapi shell32 shlwapi snmpapi syssetup twain unicode user32 userenv version wininet \
diff --git a/reactos/baseaddress.cfg b/reactos/baseaddress.cfg
index c149050787f..293f7bdffa1 100644
--- a/reactos/baseaddress.cfg
+++ b/reactos/baseaddress.cfg
@@ -1,10 +1,11 @@
-# $Id: baseaddress.cfg,v 1.16 2004/05/29 21:24:42 hbirr Exp $
+# $Id: baseaddress.cfg,v 1.17 2004/07/09 20:18:49 weiden Exp $
 #
 # Please try to keep this up2date. Please clean up 
 # after yourself.
 
 # REACTOS
 
+TARGET_BASE_LIB_ACLEDIT		=0x71b70000
 TARGET_BASE_LIB_ADVAPI32 	=0x77dc0000	
 TARGET_BASE_LIB_CABINET		=0x75120000
 TARGET_BASE_LIB_CARDS		=0x701a0000
diff --git a/reactos/include/acledit.h b/reactos/include/acledit.h
new file mode 100644
index 00000000000..c7269f42ecc
--- /dev/null
+++ b/reactos/include/acledit.h
@@ -0,0 +1,136 @@
+/*
+ * acledit.h
+ *
+ * Access Control List Editor definitions
+ *
+ * THIS SOFTWARE IS NOT COPYRIGHTED
+ *
+ * This source code is offered for use in the public domain. You may
+ * use, modify or distribute it freely.
+ *
+ * This code is distributed in the hope that it will be useful but
+ * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
+ * DISCLAIMED. This includes but is not limited to warranties of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ */
+
+#ifndef __ACLEDIT_H
+#define __ACLEDIT_H
+
+#include <windows.h>
+
+typedef struct _ACL_HELP_CONTROL
+{
+  LPWSTR lpHelpFile;
+  DWORD dwMainDialogTopic;
+  DWORD dwACLEditorDialogTopic;
+  DWORD Reserved1;
+  DWORD dwAddEntryDialogTopic;
+  DWORD Reserved2;
+  DWORD Reserved3;
+  DWORD dwAccountDialogTopic;
+} ACL_HELP_CONTROL, *PACL_HELP_CONTROL;
+
+typedef struct _ACL_DLG_CONTROL
+{
+  UCHAR ucVersion;
+  BOOL bIsContainer;
+  BOOL bAllowNewObject;
+  BOOL bMapSpecificToGeneric;
+  LPDWORD lpdwGenericAccessMap;
+  LPDWORD lpdwGenericMappingNewObjects;
+  LPWSTR lpDialogTitle;
+  PACL_HELP_CONTROL pHelpInfo;
+  LPWSTR lpSubReplaceTitle;
+  LPWSTR lpSubReplaceObjectsTitle;
+  LPWSTR lpSubReplaceConfirmation;
+  LPWSTR lpSpecialAccess;
+  LPWSTR lpSpecialNewAccess;
+} ACL_DLG_CONTROL, *PACL_DLG_CONTROL;
+
+typedef struct _ACL_EDIT_ENTRY{
+  DWORD dwType;
+  DWORD dwAccessMask;
+  DWORD dwAccessMask1;
+  LPWSTR lpName;
+} ACL_EDIT_ENTRY, *PACL_EDIT_ENTRY;
+
+typedef struct _ACL_EDIT_CONTROL
+{
+  DWORD dwNumberOfEntries;
+  PACL_EDIT_ENTRY pEntries;
+  LPWSTR lpDefaultPermissionName;
+} ACL_EDIT_CONTROL, *PACL_EDIT_CONTROL;
+
+typedef DWORD (CALLBACK *PACL_CHANGE)(HWND hWnd, 
+                                      HINSTANCE hInstance, 
+                                      PVOID pCallbackContext, 
+                                      PSECURITY_DESCRIPTOR pNewSD,
+                                      PSECURITY_DESCRIPTOR pNewObjectSD,
+                                      BOOL bApplyToSubContainers,
+                                      BOOL bApplyToSubObjects,
+                                      LPDWORD lpdwChangeContextStatus);
+
+DWORD WINAPI
+EditAuditInfo(DWORD Unknown);
+
+DWORD WINAPI
+EditOwnerInfo(DWORD Unknown);
+
+DWORD WINAPI
+EditPermissionInfo(DWORD Unknown);
+
+LONG WINAPI
+FMExtensionProcW(HWND hWnd,
+                 WORD wEvent,
+		 LONG lParam);
+
+DWORD WINAPI
+SedDiscretionaryAclEditor(HWND hWndOwner,
+                          HINSTANCE hInstance,
+                          LPCWSTR lpMachineName,
+                          PACL_DLG_CONTROL pAclDlgControl,
+                          PACL_EDIT_CONTROL pAclEditControl,
+                          LPCWSTR lpObjectName,
+                          PACL_CHANGE pChangeCallback,
+                          PVOID pChangeCallbackContext,
+                          PSECURITY_DESCRIPTOR pObjectSecurity,
+                          BOOL bNoReadPermission,
+                          BOOL bReadOnly,
+                          LPDWORD lpdwChangeContextStatus,
+                          DWORD Reserved);
+
+DWORD WINAPI
+SedTakeOwnership(HWND hWndOwner,
+                 HINSTANCE hInstance,
+                 LPCWSTR lpMachineName,
+                 LPCWSTR lpObjectType,
+                 LPCWSTR lpObjectName,
+                 DWORD dwObjectCount,
+                 PACL_CHANGE pChangeCallback,
+                 PVOID pChangeCallbackContext,
+                 PSECURITY_DESCRIPTOR pObjectSecurity,
+                 BOOL NoReadPermission,
+                 BOOL NoOwnerChange,
+                 LPDWORD lpdwChangeContextStatus,
+                 PACL_HELP_CONTROL pHelpInfo,
+                 DWORD Reserved);
+
+DWORD WINAPI
+SedSystemAclEditor(HWND hWndOwner,
+                   HINSTANCE hInstance,
+                   LPCWSTR lpMachineName,
+                   PACL_DLG_CONTROL pAclDlgControl,
+                   PACL_EDIT_CONTROL pAclEditControl,
+                   LPCWSTR lpObjectName,
+                   PACL_CHANGE pChangeCallback,
+                   PVOID pChangeCallbackContext,
+                   PSECURITY_DESCRIPTOR pObjectSecurity,
+                   BOOL bNoReadPermission,
+                   LPDWORD lpdwChangeContextStatus,
+                   DWORD Reserved);
+
+#endif /* __ACLEDIT_H */
+
+/* EOF */
diff --git a/reactos/lib/acledit/.cvsignore b/reactos/lib/acledit/.cvsignore
new file mode 100644
index 00000000000..9103a525d39
--- /dev/null
+++ b/reactos/lib/acledit/.cvsignore
@@ -0,0 +1,8 @@
+*.coff
+*.dll
+*.d
+*.a
+*.o
+*.sym
+*.map
+*.tmp
diff --git a/reactos/lib/acledit/Makefile b/reactos/lib/acledit/Makefile
new file mode 100644
index 00000000000..406425c47e1
--- /dev/null
+++ b/reactos/lib/acledit/Makefile
@@ -0,0 +1,45 @@
+# $Id: Makefile,v 1.1 2004/07/09 20:18:49 weiden Exp $
+
+PATH_TO_TOP = ../..
+
+TARGET_TYPE = dynlink
+
+TARGET_NAME = acledit
+
+TARGET_INSTALLDIR = system32
+
+TARGET_BASE = $(TARGET_BASE_LIB_ACLEDIT)
+
+TARGET_CFLAGS = \
+ -I./include \
+ -DUNICODE \
+ -D_UNICODE \
+ -D__REACTOS__ \
+ -Wall \
+ -Werror \
+ -fno-builtin
+
+TARGET_LFLAGS = -nostartfiles -nostdlib
+
+TARGET_SDKLIBS = ntdll.a kernel32.a advapi32.a user32.a
+
+TARGET_GCCLIBS = gcc
+
+TARGET_PCH = 
+
+TARGET_CLEAN = 
+
+TARGET_OBJECTS = acledit.o stubs.o
+
+DEP_OBJECTS = $(TARGET_OBJECTS)
+
+include $(PATH_TO_TOP)/rules.mak
+
+include $(TOOLS_PATH)/helper.mk
+
+include $(TOOLS_PATH)/depend.mk
+
+%/TAGS:
+	etags -o $(@D)/TAGS $(@D)/\*.c
+
+etags: ./TAGS
diff --git a/reactos/lib/acledit/acledit.c b/reactos/lib/acledit/acledit.c
new file mode 100644
index 00000000000..02234d5d8aa
--- /dev/null
+++ b/reactos/lib/acledit/acledit.c
@@ -0,0 +1,60 @@
+/*
+ *  ReactOS kernel
+ *  Copyright (C) 2004 ReactOS Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+/* $Id: acledit.c,v 1.1 2004/07/09 20:18:49 weiden Exp $
+ *
+ * PROJECT:         ReactOS Access Control List Editor
+ * FILE:            lib/acledit/acledit.c
+ * PURPOSE:         Access Control List Editor
+ * PROGRAMMER:      Thomas Weidenmueller (w3seek@users.sourceforge.net)
+ *
+ *                  Based on guess work and on this nice article:
+ *                    http://www.sysinternals.com/ntw2k/info/acledit.shtml
+ *
+ * UPDATE HISTORY:
+ *      07/09/2004  Created
+ */
+#include <windows.h>
+#include <acledit.h>
+#include "acleditint.h"
+#include "resource.h"
+
+extern HINSTANCE hDllInstance;
+
+
+BOOL STDCALL
+DllMain(
+	HINSTANCE hinstDLL,
+	DWORD     dwReason,
+	LPVOID    lpvReserved)
+{
+  switch (dwReason)
+  {
+    case DLL_PROCESS_ATTACH:
+      hDllInstance = hinstDLL;
+      break;
+    case DLL_THREAD_ATTACH:
+      break;
+    case DLL_THREAD_DETACH:
+      break;
+    case DLL_PROCESS_DETACH:
+      break;
+  }
+  return TRUE;
+}
+
diff --git a/reactos/lib/acledit/acledit.def b/reactos/lib/acledit/acledit.def
new file mode 100644
index 00000000000..7fc5e70c99a
--- /dev/null
+++ b/reactos/lib/acledit/acledit.def
@@ -0,0 +1,12 @@
+LIBRARY acledit.dll
+
+EXPORTS
+EditAuditInfo@4
+EditOwnerInfo@4
+EditPermissionInfo@4
+FMExtensionProcW@12
+SedDiscretionaryAclEditor@52
+SedSystemAclEditor@48
+SedTakeOwnership@56
+
+; EOF
diff --git a/reactos/lib/acledit/acledit.edf b/reactos/lib/acledit/acledit.edf
new file mode 100644
index 00000000000..63aa6816eaf
--- /dev/null
+++ b/reactos/lib/acledit/acledit.edf
@@ -0,0 +1,12 @@
+LIBRARY acledit.dll
+
+EXPORTS
+EditAuditInfo=EditAuditInfo@4
+EditOwnerInfo=EditOwnerInfo@4
+EditPermissionInfo=EditPermissionInfo@4
+FMExtensionProcW=FMExtensionProcW@12
+SedDiscretionaryAclEditor=SedDiscretionaryAclEditor@52
+SedSystemAclEditor=SedSystemAclEditor@48
+SedTakeOwnership=SedTakeOwnership@56
+
+; EOF
diff --git a/reactos/lib/acledit/acledit.rc b/reactos/lib/acledit/acledit.rc
new file mode 100644
index 00000000000..533618c97e5
--- /dev/null
+++ b/reactos/lib/acledit/acledit.rc
@@ -0,0 +1,40 @@
+#include <reactos/resource.h>
+#include <defines.h>
+#include "resource.h"
+
+LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+
+VS_VERSION_INFO VERSIONINFO
+	FILEVERSION	RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD
+	PRODUCTVERSION	RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD	
+	FILEFLAGSMASK	0x3fL
+#ifdef _DEBUG
+	FILEFLAGS	0x1L
+#else
+	FILEFLAGS	0x0L
+#endif
+	FILEOS		0x40004L
+	FILETYPE	0x2L
+	FILESUBTYPE	0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName",	RES_STR_COMPANY_NAME
+            VALUE "FileDescription",	"ReactOS Access Control Editor\0"
+            VALUE "FileVersion",	RES_STR_FILE_VERSION
+            VALUE "InternalName",	"acledit\0"
+            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
+            VALUE "OriginalFilename",	"acledit.dll\0"
+            VALUE "ProductName",	RES_STR_PRODUCT_NAME
+            VALUE "ProductVersion",	RES_STR_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+
diff --git a/reactos/lib/acledit/acleditint.h b/reactos/lib/acledit/acleditint.h
new file mode 100644
index 00000000000..62c3b5febb9
--- /dev/null
+++ b/reactos/lib/acledit/acleditint.h
@@ -0,0 +1,8 @@
+#ifndef __ACLEDITINT_H
+#define __ACLEDITINT_H
+
+HINSTANCE hDllInstance;
+
+#endif /* __ACLEDITINT_H */
+
+/* EOF */
diff --git a/reactos/lib/acledit/resource.h b/reactos/lib/acledit/resource.h
new file mode 100644
index 00000000000..89c5d02b7cf
--- /dev/null
+++ b/reactos/lib/acledit/resource.h
@@ -0,0 +1,8 @@
+#ifndef __DEVMGR_RESOURCE_H
+#define __DEVMGR_RESOURCE_H
+
+#define IDI_DEVMGR	100
+
+#endif /* __DEVMGR_RESOURCE_H */
+
+/* EOF */
diff --git a/reactos/lib/acledit/stubs.c b/reactos/lib/acledit/stubs.c
new file mode 100644
index 00000000000..9a40e037624
--- /dev/null
+++ b/reactos/lib/acledit/stubs.c
@@ -0,0 +1,118 @@
+/* $Id: stubs.c,v 1.1 2004/07/09 20:18:49 weiden Exp $
+ *
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS Access Control List Editor
+ * FILE:            lib/acledit/stubs.c
+ * PURPOSE:         acledit.dll stubs
+ * PROGRAMMER:      Thomas Weidenmueller <w3seek@reactos.com>
+ * NOTES:           If you implement a function, remove it from this file
+ *
+ *                  Based on guess work and on this nice article:
+ *                    http://www.sysinternals.com/ntw2k/info/acledit.shtml
+ *
+ * UPDATE HISTORY:
+ *      07/09/2004  Created
+ */
+#include <windows.h>
+#include <acledit.h>
+#include "acleditint.h"
+
+#define UNIMPLEMENTED \
+  DbgPrint("ACLEDIT:  %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__)
+
+
+DWORD
+WINAPI
+EditAuditInfo(DWORD Unknown)
+{
+  UNIMPLEMENTED;
+  return 0;
+}
+
+DWORD
+WINAPI
+EditOwnerInfo(DWORD Unknown)
+{
+  UNIMPLEMENTED;
+  return 0;
+}
+
+DWORD
+WINAPI
+EditPermissionInfo(DWORD Unknown)
+{
+  UNIMPLEMENTED;
+  return 0;
+}
+
+LONG
+WINAPI
+FMExtensionProcW(HWND hWnd,
+                 WORD wEvent,
+		 LONG lParam)
+{
+  UNIMPLEMENTED;
+  return 0;
+}
+
+DWORD
+WINAPI
+SedDiscretionaryAclEditor(HWND hWndOwner,
+                          HINSTANCE hInstance,
+                          LPCWSTR lpMachineName,
+                          PACL_DLG_CONTROL pAclDlgControl,
+                          PACL_EDIT_CONTROL pAclEditControl,
+                          LPCWSTR lpObjectName,
+                          PACL_CHANGE pChangeCallback,
+                          PVOID pChangeCallbackContext,
+                          PSECURITY_DESCRIPTOR pObjectSecurity,
+                          BOOL bNoReadPermission,
+                          BOOL bReadOnly,
+                          LPDWORD lpdwChangeContextStatus,
+                          DWORD Reserved)
+{
+  UNIMPLEMENTED;
+  return 0;
+}
+
+DWORD
+WINAPI
+SedTakeOwnership(HWND hWndOwner,
+                 HINSTANCE hInstance,
+                 LPCWSTR lpMachineName,
+                 LPCWSTR lpObjectType,
+                 LPCWSTR lpObjectName,
+                 DWORD dwObjectCount,
+                 PACL_CHANGE pChangeCallback,
+                 PVOID pChangeCallbackContext,
+                 PSECURITY_DESCRIPTOR pObjectSecurity,
+                 BOOL NoReadPermission,
+                 BOOL NoOwnerChange,
+                 LPDWORD lpdwChangeContextStatus,
+                 PACL_HELP_CONTROL pHelpInfo,
+                 DWORD Reserved)
+{
+  UNIMPLEMENTED;
+  return 0;
+}
+
+DWORD
+WINAPI
+SedSystemAclEditor(HWND hWndOwner,
+                   HINSTANCE hInstance,
+                   LPCWSTR lpMachineName,
+                   PACL_DLG_CONTROL pAclDlgControl,
+                   PACL_EDIT_CONTROL pAclEditControl,
+                   LPCWSTR lpObjectName,
+                   PACL_CHANGE pChangeCallback,
+                   PVOID pChangeCallbackContext,
+                   PSECURITY_DESCRIPTOR pObjectSecurity,
+                   BOOL bNoReadPermission,
+                   LPDWORD lpdwChangeContextStatus,
+                   DWORD Reserved)
+{
+  UNIMPLEMENTED;
+  return 0;
+}
+
+/* EOF */

From fe2b1d6967fc3bd56464c944b5699c79992ae513 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Fri, 9 Jul 2004 20:28:20 +0000
Subject: [PATCH 239/356] - Implementation of [NtGdi]GetTextFace[W] and
 [NtGdi]GetFontData[W]. - Print a message for unimplemented functions in
 GDI32.dll.

svn path=/trunk/; revision=10058
---
 reactos/iface/addsys/w32ksvc.db      |   1 +
 reactos/include/win32k/font.h        |   3 +-
 reactos/lib/gdi32/misc/stubs.c       | 341 +++++++++++++++++++++++++--
 reactos/lib/gdi32/misc/stubsa.c      |  20 +-
 reactos/lib/gdi32/misc/stubsw.c      |  24 +-
 reactos/lib/gdi32/objects/font.c     |  19 +-
 reactos/subsys/win32k/objects/text.c |  89 ++++++-
 7 files changed, 462 insertions(+), 35 deletions(-)

diff --git a/reactos/iface/addsys/w32ksvc.db b/reactos/iface/addsys/w32ksvc.db
index 4df76b7ee00..85b0b458beb 100644
--- a/reactos/iface/addsys/w32ksvc.db
+++ b/reactos/iface/addsys/w32ksvc.db
@@ -123,6 +123,7 @@ NtGdiGetEnhMetaFileDescription		3
 NtGdiGetEnhMetaFileHeader		3
 NtGdiGetEnhMetaFilePaletteEntries	3
 NtGdiGetEnhMetaFilePixelFormat		3
+NtGdiGetFontData			5
 NtGdiGetFontFamilyInfo			4
 NtGdiGetFontLanguageInfo			1
 #NtGdiGetFontResourceInfo		?
diff --git a/reactos/include/win32k/font.h b/reactos/include/win32k/font.h
index bea3c9f3ac6..c031bd427b7 100644
--- a/reactos/include/win32k/font.h
+++ b/reactos/include/win32k/font.h
@@ -1,4 +1,4 @@
-/* $Id: font.h,v 1.1 2004/03/23 00:18:54 gvg Exp $
+/* $Id: font.h,v 1.2 2004/07/09 20:28:19 navaraf Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -22,5 +22,6 @@ typedef struct tagFONTFAMILYINFO
 
 int STDCALL NtGdiGetFontFamilyInfo(HDC Dc, LPLOGFONTW LogFont, PFONTFAMILYINFO Info, DWORD Size);
 BOOL STDCALL NtGdiTranslateCharsetInfo(PDWORD Src, LPCHARSETINFO CSI, DWORD Flags);
+DWORD STDCALL NtGdiGetFontData(HDC,DWORD,DWORD,LPVOID,DWORD);
 
 #endif /* WIN32K_FONT_H_INCLUDED */
diff --git a/reactos/lib/gdi32/misc/stubs.c b/reactos/lib/gdi32/misc/stubs.c
index 5b163624222..5f780ad4d0e 100644
--- a/reactos/lib/gdi32/misc/stubs.c
+++ b/reactos/lib/gdi32/misc/stubs.c
@@ -1,4 +1,4 @@
-/* $Id: stubs.c,v 1.62 2004/05/18 13:57:41 weiden Exp $
+/* $Id: stubs.c,v 1.63 2004/07/09 20:28:20 navaraf Exp $
  *
  * reactos/lib/gdi32/misc/stubs.c
  *
@@ -28,6 +28,8 @@ typedef DWORD CHWIDTHINFO;
 typedef CHWIDTHINFO *PCHWIDTHINFO;
 #endif
 
+#define UNIMPLEMENTED DbgPrint("GDI32: %s is unimplemented, please try again later.\n", __FUNCTION__);
+
 /*
  * @unimplemented
  */
@@ -40,6 +42,7 @@ AnimatePalette(
 	CONST PALETTEENTRY	*a3
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -55,6 +58,7 @@ CancelDC(
 	HDC	a0
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -77,6 +81,7 @@ Chord(
 	int	a8
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -91,6 +96,7 @@ CloseMetaFile(
 	HDC	a0
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -105,6 +111,7 @@ CreateDIBPatternBrush(
 	UINT			a1
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -119,6 +126,7 @@ DeleteMetaFile(
 	HMETAFILE	a0
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -136,6 +144,7 @@ DrawEscape(
 	LPCSTR		a3
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -153,6 +162,7 @@ EnumObjects(
 	LPARAM		a3
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -171,6 +181,7 @@ Escape(
 	LPVOID		a4
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -187,6 +198,7 @@ ExtCreateRegion(
 	CONST RGNDATA *	a2
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -202,6 +214,7 @@ GetAspectRatioFilterEx(
 	LPSIZE	a1
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -218,6 +231,7 @@ GetBoundsRect(
 	UINT	a2
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -233,24 +247,7 @@ GetMetaRgn(
 	HRGN	a1
 	)
 {
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-
-/*
- * @unimplemented
- */
-DWORD
-STDCALL
-GetFontData(
-	HDC	a0,
-	DWORD	a1,
-	DWORD	a2,
-	LPVOID	a3,
-	DWORD	a4
-	)
-{
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -267,6 +264,7 @@ GetMetaFileBitsEx(
 	LPVOID		a2
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -282,6 +280,7 @@ GetRasterizerCaps(
 	UINT			a1
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -295,6 +294,7 @@ GetSystemPaletteUse(
 	HDC	hDc
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -309,6 +309,7 @@ GetTextCharacterExtra(
 	HDC	hDc
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -323,6 +324,7 @@ GetTextCharset(
 	HDC	hdc
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -339,6 +341,7 @@ GetTextCharsetInfo(
 	DWORD		dwFlags
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -353,6 +356,7 @@ GetFontLanguageInfo(
 	HDC 	hDc
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -368,6 +372,7 @@ PlayMetaFile(
 	HMETAFILE	a1
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -383,6 +388,7 @@ ResizePalette(
 	UINT		a1
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -397,6 +403,7 @@ SetMetaRgn(
 	HDC	hdc
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -413,6 +420,7 @@ SetBoundsRect(
 	UINT		a2
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -428,6 +436,7 @@ SetMapperFlags(
 	DWORD	a1
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -443,6 +452,7 @@ SetMetaFileBitsEx(
 	CONST BYTE	*a1
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -458,6 +468,7 @@ SetSystemPaletteUse(
 	UINT	a1
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -473,6 +484,7 @@ SetTextCharacterExtra(
 	int	a1
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -489,6 +501,7 @@ SetTextJustification(
 	int	a2
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -503,6 +516,7 @@ UpdateColors(
 	HDC	hdc
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -520,6 +534,7 @@ PlayMetaFileRecord(
 	UINT		a3
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -537,6 +552,7 @@ EnumMetaFile(
 	LPARAM			a3
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -551,6 +567,7 @@ CloseEnhMetaFile(
 	HDC	hdc
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -565,6 +582,7 @@ DeleteEnhMetaFile(
 	HENHMETAFILE	a0
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -583,6 +601,7 @@ EnumEnhMetaFile(
 	CONST RECT	*a4
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -599,6 +618,7 @@ GetEnhMetaFileBits(
 	LPBYTE		a2
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -615,6 +635,7 @@ GetEnhMetaFileHeader(
 	LPENHMETAHEADER	a2
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -631,6 +652,7 @@ GetEnhMetaFilePaletteEntries(
 	LPPALETTEENTRY	a2
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -649,6 +671,7 @@ GetWinMetaFileBits(
 	HDC		a4
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -665,6 +688,7 @@ PlayEnhMetaFile(
 	CONST RECT	*a2
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -682,6 +706,7 @@ PlayEnhMetaFileRecord(
 	UINT			a3
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -697,6 +722,7 @@ SetEnhMetaFileBits(
 	CONST BYTE	*a1
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -713,6 +739,7 @@ SetWinMetaFileBits(
 	HDC			a2,
 	CONST METAFILEPICT	*a3)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -729,6 +756,7 @@ GdiComment(
 	CONST BYTE	*a2
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -748,6 +776,7 @@ AngleArc(
 	FLOAT	a5
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -763,6 +792,7 @@ SetColorAdjustment(
 	CONST COLORADJUSTMENT	*a1
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -778,6 +808,7 @@ GetColorAdjustment(
 	LPCOLORADJUSTMENT	a1
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -792,6 +823,7 @@ EndDoc(
 	HDC	hdc
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -806,6 +838,7 @@ StartPage(
 	HDC	hdc
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -820,6 +853,7 @@ EndPage(
 	HDC	hdc
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -834,6 +868,7 @@ AbortDoc(
 	HDC	hdc
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -849,6 +884,7 @@ SetAbortProc(
 	ABORTPROC	a1
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -863,6 +899,7 @@ AbortPath(
 	HDC	hdc
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -877,6 +914,7 @@ BeginPath(
 	HDC	hdc
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -891,6 +929,7 @@ CloseFigure(
 	HDC	hdc
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -905,6 +944,7 @@ EndPath(
 	HDC	hdc
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -919,6 +959,7 @@ FillPath(
 	HDC	hdc
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -933,6 +974,7 @@ FlattenPath(
 	HDC	hdc
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -950,6 +992,7 @@ GetPath(
 	int		a3
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -964,6 +1007,7 @@ PathToRegion(
 	HDC	hdc
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -981,6 +1025,7 @@ PolyDraw(
 	int		a3
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -996,6 +1041,7 @@ SelectClipPath(
 	int	a1
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -1012,6 +1058,7 @@ SetMiterLimit(
 	PFLOAT	a2
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -1026,6 +1073,7 @@ StrokeAndFillPath(
 	HDC	hdc
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -1040,6 +1088,7 @@ StrokePath(
 	HDC	hdc
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -1054,6 +1103,7 @@ WidenPath(
 	HDC	hdc
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -1072,6 +1122,7 @@ ExtCreatePen(
 	CONST DWORD	*a4
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1087,6 +1138,7 @@ GetMiterLimit(
 	PFLOAT	a1
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -1105,6 +1157,7 @@ ScaleViewportExtEx(
 	LPSIZE	a5
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -1124,6 +1177,7 @@ ScaleWindowExtEx(
 	LPSIZE	a5
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -1138,6 +1192,7 @@ UnrealizeObject(
 	HGDIOBJ	a0
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -1150,8 +1205,12 @@ BOOL
 STDCALL
 GdiFlush()
 {
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return FALSE;
+        /*
+         * Although GdiFlush is unimplemented, it's safe to return
+         * TRUE, because we don't have GDI engine surface caching
+         * implemented yet.
+         */
+	return TRUE;
 }
 
 
@@ -1164,6 +1223,7 @@ GdiSetBatchLimit(
 	DWORD	a0
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1176,6 +1236,7 @@ DWORD
 STDCALL
 GdiGetBatchLimit()
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1191,6 +1252,7 @@ SetICMMode(
 	int	a1
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1208,6 +1270,7 @@ CheckColorsInGamut(
 	DWORD	a3
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -1222,6 +1285,7 @@ GetColorSpace(
 	HDC	hDc
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1237,6 +1301,7 @@ SetColorSpace(
 	HCOLORSPACE	a1
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -1251,6 +1316,7 @@ DeleteColorSpace(
 	HCOLORSPACE	a0
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -1266,6 +1332,7 @@ GetDeviceGammaRamp(
 	LPVOID	a1
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -1281,6 +1348,7 @@ SetDeviceGammaRamp(
 	LPVOID	a1
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -1297,6 +1365,7 @@ ColorMatchToTarget(
 	DWORD	a2
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -1313,6 +1382,7 @@ wglCopyContext(
 	UINT	a2
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -1327,6 +1397,7 @@ wglCreateContext(
 	HDC	hDc
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1342,6 +1413,7 @@ wglCreateLayerContext(
 	int	a1
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1356,6 +1428,7 @@ wglDeleteContext(
 	HGLRC	a
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -1368,6 +1441,7 @@ HGLRC
 STDCALL
 wglGetCurrentContext(VOID)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1380,6 +1454,7 @@ HDC
 STDCALL
 wglGetCurrentDC(VOID)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1394,6 +1469,7 @@ wglGetProcAddress(
 	LPCSTR		a0
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1409,6 +1485,7 @@ wglMakeCurrent(
 	HGLRC	a1
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -1424,6 +1501,7 @@ wglShareLists(
 	HGLRC	a1
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -1442,6 +1520,7 @@ wglDescribeLayerPlane(
 	LPLAYERPLANEDESCRIPTOR	a4
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -1460,6 +1539,7 @@ wglSetLayerPaletteEntries(
 	CONST COLORREF	*a4
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1478,6 +1558,7 @@ wglGetLayerPaletteEntries(
 	COLORREF	*a4
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1494,6 +1575,7 @@ wglRealizeLayerPalette(
 	BOOL		a2
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -1509,6 +1591,7 @@ wglSwapLayerBuffers(
 	UINT		a1
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -1534,6 +1617,7 @@ GdiPlayDCScript(
 	DWORD	a5
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1552,6 +1636,7 @@ GdiPlayJournal(
 	DWORD	a4
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1572,6 +1657,7 @@ GdiPlayScript(
 	DWORD	a6
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1592,6 +1678,7 @@ GetGlyphOutlineWow(
 	DWORD	a6
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1608,6 +1695,7 @@ GetRandomRgn(
 	INT	a2
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1623,6 +1711,7 @@ SelectBrushLocal(
 	DWORD	a1
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1638,6 +1727,7 @@ SelectFontLocal(
 	DWORD	a1
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1652,6 +1742,7 @@ SetFontEnumeration(
 	DWORD	a0
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1667,6 +1758,7 @@ SetRelAbs(
 	DWORD	a1
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1686,6 +1778,7 @@ gdiPlaySpoolStream(
 	DWORD	a5
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1703,6 +1796,7 @@ GetFontResourceInfo(
 	DWORD	a3
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1719,6 +1813,7 @@ AddFontMemResourceEx(
 	DWORD *pcFonts
 )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1733,6 +1828,7 @@ AddFontResourceTracking(
 	int unknown
 )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1744,6 +1840,7 @@ BOOL
 STDCALL 
 AnyLinkedFonts(VOID)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1755,6 +1852,7 @@ HBITMAP
 STDCALL
 ClearBitmapAttributes(HBITMAP hbm, DWORD dwFlags)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1766,6 +1864,7 @@ HBRUSH
 STDCALL
 ClearBrushAttributes(HBRUSH hbm, DWORD dwFlags)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1777,6 +1876,7 @@ BOOL
 STDCALL
 ColorCorrectPalette(HDC hDC,HPALETTE hPalette,DWORD dwFirstEntry,DWORD dwNumOfEntries)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1788,6 +1888,7 @@ BOOL
 STDCALL
 EnableEUDC(BOOL enable)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1799,6 +1900,7 @@ int
 STDCALL
 EndFormPage(HDC hdc)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1810,6 +1912,7 @@ BOOL
 STDCALL
 EudcLoadLinkW(LPCWSTR pBaseFaceName,LPCWSTR pEudcFontPath,INT iPriority,INT iFontLinkType)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1821,6 +1924,7 @@ BOOL
 STDCALL
 EudcUnloadLinkW(LPCWSTR pBaseFaceName,LPCWSTR pEudcFontPath)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1832,6 +1936,7 @@ BOOL
 STDCALL
 FontIsLinked(HDC hdc)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1843,6 +1948,7 @@ int
 STDCALL
 GdiAddFontResourceW(LPCWSTR filename,FLONG f,DESIGNVECTOR *pdv)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1854,6 +1960,7 @@ DWORD
 STDCALL
 GdiAddGlsBounds(HDC hdc,LPRECT prc)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1865,6 +1972,7 @@ BOOL
 STDCALL
 GdiAlphaBlend(HDC hdcDst,LONG DstX,LONG DstY,LONG DstCx,LONG DstCy,HDC hdcSrc,LONG SrcX,LONG SrcY,LONG SrcCx,LONG SrcCy,BLENDFUNCTION BlendFunction)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1876,6 +1984,7 @@ BOOL
 STDCALL
 GdiArtificialDecrementDriver(LPWSTR pDriverName,BOOL unknown)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1887,6 +1996,7 @@ BOOL
 STDCALL
 GdiCleanCacheDC(HDC hdc)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1898,6 +2008,7 @@ BOOL
 STDCALL
 GdiConsoleTextOut(HDC hdc, POLYTEXTW *lpto,UINT nStrings, RECTL *prclBounds)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1909,6 +2020,7 @@ HDC
 STDCALL
 GdiConvertAndCheckDC(HDC hdc)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1920,6 +2032,7 @@ HBITMAP
 STDCALL
 GdiConvertBitmap(HBITMAP hbm)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1931,6 +2044,7 @@ HBRUSH
 STDCALL
 GdiConvertBrush(HBRUSH hbr)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1942,6 +2056,7 @@ HDC
 STDCALL
 GdiConvertDC(HDC hdc)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1953,6 +2068,7 @@ HFONT
 STDCALL
 GdiConvertFont(HFONT hfont)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1964,6 +2080,7 @@ HPALETTE
 STDCALL
 GdiConvertPalette(HPALETTE hpal)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1975,6 +2092,7 @@ HRGN
 STDCALL
 GdiConvertRegion(HRGN hregion)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1986,6 +2104,7 @@ HENHMETAFILE
 STDCALL
 GdiConvertEnhMetaFile(HENHMETAFILE hmf)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -1997,6 +2116,7 @@ BOOL
 STDCALL
 GdiDeleteLocalDC(HDC hdc)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2008,6 +2128,7 @@ int
 STDCALL
 GdiDescribePixelFormat(HDC hdc,int ipfd,UINT cjpfd,PPIXELFORMATDESCRIPTOR ppfd)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2019,6 +2140,7 @@ BOOL
 STDCALL
 GdiDrawStream(HDC dc, ULONG l, VOID *v)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2030,6 +2152,7 @@ HGDIOBJ
 STDCALL
 GdiFixUpHandle(HGDIOBJ hobj)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2041,6 +2164,7 @@ DWORD
 STDCALL
 GdiGetCodePage(HDC hdc)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2052,6 +2176,7 @@ HBRUSH
 STDCALL
 GdiGetLocalBrush(HBRUSH hbr)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2063,6 +2188,7 @@ HDC
 STDCALL
 GdiGetLocalDC(HDC hdc)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2074,6 +2200,7 @@ HFONT
 STDCALL
 GdiGetLocalFont(HFONT hfont)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2085,6 +2212,7 @@ BOOL
 STDCALL
 GdiIsMetaFileDC(HDC hdc)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2096,6 +2224,7 @@ BOOL
 STDCALL
 GdiIsMetaPrintDC(HDC hdc)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2107,6 +2236,7 @@ BOOL
 STDCALL
 GdiIsPlayMetafileDC(HDC hdc)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2118,6 +2248,7 @@ BOOL
 STDCALL
 GdiReleaseDC(HDC hdc)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2129,6 +2260,7 @@ BOOL
 STDCALL
 GdiReleaseLocalDC(HDC hdc)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2140,6 +2272,7 @@ BOOL
 STDCALL
 GdiSetAttrs(HDC hdc)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2151,6 +2284,7 @@ VOID
 STDCALL
 GdiSetLastError(DWORD dwErrCode)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 }
 
@@ -2161,6 +2295,7 @@ BOOL
 STDCALL
 GdiSetPixelFormat(HDC hdc,int ipfd)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2172,6 +2307,7 @@ BOOL
 STDCALL
 GdiValidateHandle(HGDIOBJ hobj)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2183,6 +2319,7 @@ BOOL
 STDCALL
 GdiSwapBuffers(HDC hdc)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2194,6 +2331,7 @@ VOID
 STDCALL
 GdiSetServerAttr(HDC hdc,DWORD attr)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 }
 
@@ -2204,6 +2342,7 @@ DWORD
 STDCALL
 GetBitmapAttributes(HBITMAP hbm)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2215,6 +2354,7 @@ DWORD
 STDCALL
 GetBrushAttributes(HBRUSH hbr)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2232,6 +2372,7 @@ GetCharABCWidthsI(
 	LPABC lpabc
 )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2249,6 +2390,7 @@ GetCharWidthI(
 	LPINT lpBuffer
 )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2263,6 +2405,7 @@ GetFontUnicodeRanges(
 	LPGLYPHSET lpgs
 )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2274,6 +2417,7 @@ ULONG
 STDCALL
 GetEUDCTimeStamp(VOID)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2285,6 +2429,7 @@ DWORD
 STDCALL
 GetEUDCTimeStampExW(LPCWSTR str)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2296,6 +2441,7 @@ ULONG
 STDCALL
 GetFontAssocStatus(HDC hdc)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2307,6 +2453,7 @@ HFONT
 STDCALL
 GetHFONT(HDC dc)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2320,6 +2467,7 @@ GetLayout(
 	HDC hdc
 )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2331,6 +2479,7 @@ BOOL
 STDCALL
 GetTextExtentExPointWPri(HDC hdc,LPWSTR lpwsz,ULONG cwc,ULONG dxMax,ULONG *pcCh,PULONG pdxOut,LPSIZE psize)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2342,6 +2491,7 @@ int
 STDCALL
 GetTextFaceAliasW(HDC hdc,int cChar,LPWSTR pszOut)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2353,6 +2503,7 @@ BOOL
 STDCALL
 GetTransform(HDC hdc, DWORD iXform, LPXFORM pxf)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2364,6 +2515,7 @@ LONG
 STDCALL
 HT_Get8BPPFormatPalette(LPPALETTEENTRY pPaletteEntry, USHORT RedGamma,USHORT GreenGamma, USHORT BlueGamma)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2375,6 +2527,7 @@ LONG
 STDCALL
 HT_Get8BPPMaskPalette(LPPALETTEENTRY pPaletteEntry, BOOL Use8BPPMaskPal,BYTE CMYMask, USHORT RedGamma, USHORT GreenGamma, USHORT BlueGamma)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2386,6 +2539,7 @@ BOOL
 STDCALL
 MirrorRgn(HWND hwnd,HRGN hrgn)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2397,6 +2551,7 @@ int
 STDCALL
 NamedEscape(HDC hdc,PWCHAR pDriver,int nDriver,int iEsc,int cjIn,LPSTR pjIn,int cjOut,LPSTR pjOut)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2408,6 +2563,7 @@ DWORD
 STDCALL
 QueryFontAssocStatus(VOID)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2421,6 +2577,7 @@ RemoveFontMemResourceEx(
 	HANDLE fh
 )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2436,6 +2593,7 @@ RemoveFontResourceExA(
 	PVOID pdv
 )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2451,6 +2609,7 @@ RemoveFontResourceExW(
 	PVOID pdv
 )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2462,6 +2621,7 @@ int
 STDCALL
 RemoveFontResourceTracking(LPCSTR lpString,int unknown)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2473,6 +2633,7 @@ HBITMAP
 STDCALL
 SetBitmapAttributes(HBITMAP hbm, DWORD dwFlags)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2484,6 +2645,7 @@ HBRUSH
 STDCALL
 SetBrushAttributes(HBRUSH hbm, DWORD dwFlags)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2498,6 +2660,7 @@ SetLayout(
 	DWORD dwLayout
 )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2509,6 +2672,7 @@ DWORD
 STDCALL
 SetLayoutWidth(HDC hdc,LONG wox,DWORD dwLayout)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2520,6 +2684,7 @@ BOOL
 STDCALL
 SetMagicColors(HDC hdc,PALETTEENTRY peMagic,ULONG Index)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2531,6 +2696,7 @@ BOOL
 STDCALL
 SetVirtualResolution(HDC hdc, int cxVirtualDevicePixel,int cyVirtualDevicePixel,int cxVirtualDeviceMm, int cyVirtualDeviceMm)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2542,6 +2708,7 @@ int
 STDCALL
 StartFormPage(HDC hdc)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2553,6 +2720,7 @@ VOID
 STDCALL
 UnloadNetworkFonts(DWORD unknown)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 }
 
@@ -2563,6 +2731,7 @@ BOOL
 STDCALL
 bInitSystemAndFontsDirectoriesW(LPWSTR *SystemDir,LPWSTR *FontsDir)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2574,6 +2743,7 @@ BOOL
 STDCALL
 bMakePathNameW(LPWSTR lpBuffer,LPCWSTR lpFileName,LPWSTR *lpFilePart,DWORD unknown)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2585,6 +2755,7 @@ HFONT
 STDCALL
 CreateFontIndirectExA(const ENUMLOGFONTEXDVA *elfexd)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2602,6 +2773,7 @@ GetGlyphIndicesA(
 	DWORD fl
 )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2613,6 +2785,7 @@ UINT
 STDCALL
 GetStringBitmapA(HDC hdc,LPSTR psz,BOOL unknown,UINT cj,BYTE *lpSB)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2632,6 +2805,7 @@ GetTextExtentExPointI(
 	LPSIZE lpSize
 )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2643,6 +2817,7 @@ HFONT
 STDCALL
 CreateFontIndirectExW(const ENUMLOGFONTEXDVW *elfexd)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2660,6 +2835,7 @@ GetGlyphIndicesW(
 	DWORD fl
 )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2671,6 +2847,7 @@ UINT
 STDCALL
 GetStringBitmapW(HDC hdc,LPWSTR pwsz,BOOL unknown,UINT cj,BYTE *lpSB)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2687,6 +2864,7 @@ GetTextExtentPointI(
 	LPSIZE lpSize
 )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2700,6 +2878,7 @@ GdiFullscreenControl(FULLSCREENCONTROL FullscreenCommand,PVOID FullscreenInput,
 					DWORD FullscreenInputLength,PVOID FullscreenOutput,
 					PULONG FullscreenOutputLength)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2711,6 +2890,7 @@ INT
 STDCALL
 GdiQueryFonts(PUNIVERSAL_FONT_ID pufiFontList,ULONG nBufferSize,PLARGE_INTEGER pTimeStamp )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2722,6 +2902,7 @@ BOOL
 STDCALL
 GdiRealizationInfo(HDC hdc, PREALIZATION_INFO pri)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2733,6 +2914,7 @@ BOOL
 STDCALL
 GetCharWidthInfo(HDC hdc,PCHWIDTHINFO pChWidthInfo)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2744,6 +2926,7 @@ BOOL
 STDCALL
 GetETM(HDC hdc,EXTTEXTMETRIC *petm)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2755,6 +2938,7 @@ BOOL
 STDCALL
 GdiAddGlsRecord(HDC hdc,DWORD unknown1,LPCSTR unknown2,LPRECT unknown3)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2766,6 +2950,7 @@ HANDLE
 STDCALL
 GdiConvertMetaFilePict(HGLOBAL hMem)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2777,6 +2962,7 @@ DEVMODEW *
 STDCALL
 GdiConvertToDevmodeW(DEVMODEA *dm)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2788,6 +2974,7 @@ HENHMETAFILE
 STDCALL
 GdiCreateLocalEnhMetaFile(HENHMETAFILE hmo)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2799,6 +2986,7 @@ METAFILEPICT *
 STDCALL
 GdiCreateLocalMetaFilePict(HENHMETAFILE hmo)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2810,6 +2998,7 @@ DWORD
 STDCALL
 GdiGetCharDimensions(HDC hdc,LPTEXTMETRICW lptm,BOOL unk)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2821,6 +3010,7 @@ PSHAREDHANDLETABLE
 STDCALL
 GdiQueryTable(VOID)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2835,6 +3025,7 @@ GdiGetSpoolFileHandle(
 	LPDEVMODEW	pDevmode,
 	LPWSTR		pwszDocName)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2847,6 +3038,7 @@ STDCALL
 GdiDeleteSpoolFileHandle(
 	HANDLE	SpoolFileHandle)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2859,6 +3051,7 @@ STDCALL
 GdiGetPageCount(
 	HANDLE	SpoolFileHandle)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2871,6 +3064,7 @@ STDCALL
 GdiGetDC(
 	HANDLE	SpoolFileHandle)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2885,6 +3079,7 @@ GdiGetPageHandle(
 	DWORD	Page,
 	LPDWORD	pdwPageType)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2898,6 +3093,7 @@ GdiStartDocEMF(
 	HANDLE		SpoolFileHandle,
 	DOCINFOW	*pDocInfo)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2910,6 +3106,7 @@ STDCALL
 GdiStartPageEMF(
 	HANDLE	SpoolFileHandle)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2926,6 +3123,7 @@ GdiPlayPageEMF(
 	RECT	*prectBorder,
 	RECT	*prectClip)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2939,6 +3137,7 @@ GdiEndPageEMF(
 	HANDLE	SpoolFileHandle,
 	DWORD	dwOptimization)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2951,6 +3150,7 @@ STDCALL
 GdiEndDocEMF(
 	HANDLE	SpoolFileHandle)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2966,6 +3166,7 @@ GdiGetDevmodeForPage(
 	PDEVMODEW	*pCurrDM,
 	PDEVMODEW	*pLastDM)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2979,6 +3180,7 @@ GdiResetDCEMF(
 	HANDLE		SpoolFileHandle,
 	PDEVMODEW	pCurrDM)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -2989,6 +3191,7 @@ GdiResetDCEMF(
 HANDLE STDCALL
 BRUSHOBJ_hGetColorTransform(BRUSHOBJ *pbo)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3000,6 +3203,7 @@ PVOID STDCALL
 BRUSHOBJ_pvAllocRbrush(IN BRUSHOBJ *BrushObj,
 		       IN ULONG ObjSize)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3010,6 +3214,7 @@ BRUSHOBJ_pvAllocRbrush(IN BRUSHOBJ *BrushObj,
 PVOID STDCALL
 BRUSHOBJ_pvGetRbrush(IN BRUSHOBJ *BrushObj)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3020,6 +3225,7 @@ BRUSHOBJ_pvGetRbrush(IN BRUSHOBJ *BrushObj)
 ULONG STDCALL
 BRUSHOBJ_ulGetBrushColor(BRUSHOBJ *pbo)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3032,6 +3238,7 @@ CLIPOBJ_bEnum(IN CLIPOBJ *ClipObj,
 	      IN ULONG ObjSize,
 	      OUT ULONG *EnumRects)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3046,6 +3253,7 @@ CLIPOBJ_cEnumStart(IN CLIPOBJ *ClipObj,
 		   IN ULONG BuildOrder,
 		   IN ULONG MaxRects)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3056,6 +3264,7 @@ CLIPOBJ_cEnumStart(IN CLIPOBJ *ClipObj,
 PATHOBJ* STDCALL
 CLIPOBJ_ppoGetPath(CLIPOBJ *ClipObj)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3067,6 +3276,7 @@ VOID
 STDCALL
 EngAcquireSemaphore ( IN HSEMAPHORE hsem )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 }
 
@@ -3076,6 +3286,7 @@ EngAcquireSemaphore ( IN HSEMAPHORE hsem )
 BOOL STDCALL 
 EngAlphaBlend(SURFOBJ *psoDest,SURFOBJ *psoSrc,CLIPOBJ *pco,XLATEOBJ *pxlo,RECTL *prclDest,RECTL *prclSrc,BLENDOBJ *pBlendObj)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3088,6 +3299,7 @@ EngAssociateSurface(IN HSURF Surface,
 		    IN HDEV Dev,
 		    IN ULONG Hooks)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3108,6 +3320,7 @@ EngBitBlt(SURFOBJ *Dest,
 	  POINTL *BrushOrigin,
 	  ROP4 rop4)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3118,6 +3331,7 @@ EngBitBlt(SURFOBJ *Dest,
 BOOL STDCALL
 EngCheckAbort(SURFOBJ *pso)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3128,6 +3342,7 @@ EngCheckAbort(SURFOBJ *pso)
 FD_GLYPHSET* STDCALL
 EngComputeGlyphSet(INT nCodePage,INT nFirstChar,INT cChars)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3143,6 +3358,7 @@ EngCopyBits(SURFOBJ *Dest,
 	    RECTL *DestRect,
 	    POINTL *SourcePoint)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3157,6 +3373,7 @@ EngCreateBitmap(IN SIZEL Size,
 		IN ULONG Flags,
 		IN PVOID Bits)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3167,6 +3384,7 @@ EngCreateBitmap(IN SIZEL Size,
 CLIPOBJ* STDCALL
 EngCreateClip(VOID)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3179,6 +3397,7 @@ EngCreateDeviceBitmap(IN DHSURF Surface,
 		      IN SIZEL Size,
 		      IN ULONG Format)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3191,6 +3410,7 @@ EngCreateDeviceSurface(IN DHSURF Surface,
 		       IN SIZEL Size,
 		       IN ULONG FormatVersion)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3206,6 +3426,7 @@ EngCreatePalette(IN ULONG Mode,
 		 IN ULONG Green,
 		 IN ULONG Blue)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3217,6 +3438,7 @@ HSEMAPHORE
 STDCALL
 EngCreateSemaphore ( VOID )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3227,6 +3449,7 @@ EngCreateSemaphore ( VOID )
 VOID STDCALL
 EngDeleteClip(CLIPOBJ *ClipRegion)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 }
 
@@ -3236,6 +3459,7 @@ EngDeleteClip(CLIPOBJ *ClipRegion)
 BOOL STDCALL
 EngDeletePalette(IN HPALETTE Palette)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3246,6 +3470,7 @@ EngDeletePalette(IN HPALETTE Palette)
 VOID STDCALL
 EngDeletePath(PATHOBJ *ppo)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 }
 
@@ -3256,6 +3481,7 @@ VOID
 STDCALL
 EngDeleteSemaphore ( IN HSEMAPHORE hsem )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 }
 
@@ -3265,6 +3491,7 @@ EngDeleteSemaphore ( IN HSEMAPHORE hsem )
 BOOL STDCALL
 EngDeleteSurface(IN HSURF Surface)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3277,6 +3504,7 @@ EngEraseSurface(SURFOBJ *Surface,
 		RECTL *Rect,
 		ULONG iColor)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3287,6 +3515,7 @@ EngEraseSurface(SURFOBJ *Surface,
 BOOL STDCALL
 EngFillPath(SURFOBJ *pso,PATHOBJ *ppo,CLIPOBJ *pco,BRUSHOBJ *pbo,POINTL *pptlBrushOrg,MIX mix,FLONG flOptions)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3297,6 +3526,7 @@ EngFillPath(SURFOBJ *pso,PATHOBJ *ppo,CLIPOBJ *pco,BRUSHOBJ *pbo,POINTL *pptlBru
 PVOID STDCALL
 EngFindResource(HANDLE h,int iName,int iType,PULONG pulSize)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3307,6 +3537,7 @@ EngFindResource(HANDLE h,int iName,int iType,PULONG pulSize)
 VOID STDCALL 
 EngFreeModule(HANDLE h)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 }
 
@@ -3317,6 +3548,7 @@ VOID STDCALL
 EngGetCurrentCodePage(OUT PUSHORT OemCodePage,
 		      OUT PUSHORT AnsiCodePage)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 }
 
@@ -3326,6 +3558,7 @@ EngGetCurrentCodePage(OUT PUSHORT OemCodePage,
 LPWSTR STDCALL
 EngGetDriverName(HDEV hdev)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3336,6 +3569,7 @@ EngGetDriverName(HDEV hdev)
 LPWSTR STDCALL
 EngGetPrinterDataFileName(HDEV hdev)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3346,6 +3580,7 @@ EngGetPrinterDataFileName(HDEV hdev)
 BOOL STDCALL 
 EngGradientFill(SURFOBJ *psoDest,CLIPOBJ *pco,XLATEOBJ *pxlo,TRIVERTEX *pVertex,ULONG nVertex,PVOID pMesh,ULONG nMesh,RECTL *prclExtents,POINTL *pptlDitherOrg,ULONG ulMode)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3364,6 +3599,7 @@ EngLineTo(SURFOBJ *Surface,
 	  RECTL *RectBounds,
 	  MIX mix)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3374,6 +3610,7 @@ EngLineTo(SURFOBJ *Surface,
 HANDLE STDCALL 
 EngLoadModule(LPWSTR pwsz)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3384,6 +3621,7 @@ EngLoadModule(LPWSTR pwsz)
 SURFOBJ * STDCALL
 EngLockSurface(IN HSURF Surface)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3394,6 +3632,7 @@ EngLockSurface(IN HSURF Surface)
 BOOL STDCALL 
 EngMarkBandingSurface(HSURF hsurf)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3408,6 +3647,7 @@ EngMultiByteToUnicodeN(OUT LPWSTR UnicodeString,
 		       IN PCHAR MultiByteString,
 		       IN ULONG BytesInMultiByteString)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 }
 
@@ -3417,6 +3657,7 @@ EngMultiByteToUnicodeN(OUT LPWSTR UnicodeString,
 INT STDCALL 
 EngMultiByteToWideChar(UINT CodePage,LPWSTR WideCharString,INT BytesInWideCharString,LPSTR MultiByteString,INT BytesInMultiByteString)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3431,6 +3672,7 @@ EngPaint(IN SURFOBJ *Surface,
 	 IN POINTL *BrushOrigin,
 	 IN MIX  Mix)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3441,6 +3683,7 @@ EngPaint(IN SURFOBJ *Surface,
 BOOL STDCALL 
 EngPlgBlt(SURFOBJ *psoTrg,SURFOBJ *psoSrc,SURFOBJ *psoMsk,CLIPOBJ *pco,XLATEOBJ *pxlo,COLORADJUSTMENT *pca,POINTL *pptlBrushOrg,POINTFIX *pptfx,RECTL *prcl,POINTL *pptl,ULONG iMode)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3451,6 +3694,7 @@ EngPlgBlt(SURFOBJ *psoTrg,SURFOBJ *psoSrc,SURFOBJ *psoMsk,CLIPOBJ *pco,XLATEOBJ
 BOOL STDCALL
 EngQueryEMFInfo(HDEV hdev,EMFINFO *pEMFInfo)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3461,6 +3705,7 @@ EngQueryEMFInfo(HDEV hdev,EMFINFO *pEMFInfo)
 VOID STDCALL 
 EngQueryLocalTime(PENG_TIME_FIELDS etf)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 }
 
@@ -3471,6 +3716,7 @@ VOID
 STDCALL
 EngReleaseSemaphore ( IN HSEMAPHORE hsem )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 }
 
@@ -3480,6 +3726,7 @@ EngReleaseSemaphore ( IN HSEMAPHORE hsem )
 BOOL STDCALL 
 EngStretchBlt(SURFOBJ *psoDest,SURFOBJ *psoSrc,SURFOBJ *psoMask,CLIPOBJ *pco,XLATEOBJ *pxlo,COLORADJUSTMENT *pca,POINTL *pptlHTOrg,RECTL *prclDest,RECTL *prclSrc,POINTL *pptlMask,ULONG iMode)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3490,6 +3737,7 @@ EngStretchBlt(SURFOBJ *psoDest,SURFOBJ *psoSrc,SURFOBJ *psoMask,CLIPOBJ *pco,XLA
 BOOL STDCALL 
 EngStretchBltROP(SURFOBJ *psoDest,SURFOBJ *psoSrc,SURFOBJ *psoMask,CLIPOBJ *pco,XLATEOBJ *pxlo,COLORADJUSTMENT *pca,POINTL *pptlHTOrg,RECTL *prclDest,RECTL *prclSrc,POINTL *pptlMask,ULONG iMode,BRUSHOBJ *pbo,DWORD rop4)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3500,6 +3748,7 @@ EngStretchBltROP(SURFOBJ *psoDest,SURFOBJ *psoSrc,SURFOBJ *psoMask,CLIPOBJ *pco,
 BOOL STDCALL 
 EngStrokeAndFillPath(SURFOBJ *pso,PATHOBJ *ppo,CLIPOBJ *pco,XFORMOBJ *pxo,BRUSHOBJ *pboStroke,LINEATTRS *plineattrs,BRUSHOBJ *pboFill,POINTL *pptlBrushOrg,MIX mixFill,FLONG flOptions)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3510,6 +3759,7 @@ EngStrokeAndFillPath(SURFOBJ *pso,PATHOBJ *ppo,CLIPOBJ *pco,XFORMOBJ *pxo,BRUSHO
 BOOL STDCALL
 EngStrokePath(SURFOBJ *pso,PATHOBJ *ppo,CLIPOBJ *pco,XFORMOBJ *pxo,BRUSHOBJ *pbo,POINTL *pptlBrushOrg,LINEATTRS *plineattrs,MIX mix)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3520,6 +3770,7 @@ EngStrokePath(SURFOBJ *pso,PATHOBJ *ppo,CLIPOBJ *pco,XFORMOBJ *pxo,BRUSHOBJ *pbo
 BOOL STDCALL 
 EngTextOut(SURFOBJ *pso,STROBJ *pstro,FONTOBJ *pfo,CLIPOBJ *pco,RECTL *prclExtra,RECTL *prclOpaque,BRUSHOBJ *pboFore,BRUSHOBJ *pboOpaque,POINTL *pptlOrg,MIX mix)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3537,6 +3788,7 @@ EngTransparentBlt(IN SURFOBJ *Dest,
 		  IN ULONG TransparentColor,
 		  IN ULONG Reserved)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3551,6 +3803,7 @@ EngUnicodeToMultiByteN(OUT PCHAR MultiByteString,
 		       IN PWSTR  UnicodeString,
 		       IN ULONG  BytesInUnicodeString)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 }
 
@@ -3560,6 +3813,7 @@ EngUnicodeToMultiByteN(OUT PCHAR MultiByteString,
 VOID STDCALL 
 EngUnlockSurface(SURFOBJ *pso)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 }
 
@@ -3569,6 +3823,7 @@ EngUnlockSurface(SURFOBJ *pso)
 INT STDCALL 
 EngWideCharToMultiByte(UINT CodePage,LPWSTR WideCharString,INT BytesInWideCharString,LPSTR MultiByteString,INT BytesInMultiByteString)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3581,6 +3836,7 @@ STDCALL
 FONTOBJ_cGetAllGlyphHandles(IN FONTOBJ *FontObj,
                             IN HGLYPH  *Glyphs)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3596,6 +3852,7 @@ FONTOBJ_cGetGlyphs(IN FONTOBJ *FontObj,
                    IN HGLYPH  *GlyphHandles,
                    IN PVOID   *OutGlyphs)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3606,6 +3863,7 @@ FONTOBJ_cGetGlyphs(IN FONTOBJ *FontObj,
 PFD_GLYPHATTR STDCALL
 FONTOBJ_pQueryGlyphAttrs(FONTOBJ *pfo,ULONG iMode)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3616,6 +3874,7 @@ FONTOBJ_pQueryGlyphAttrs(FONTOBJ *pfo,ULONG iMode)
 FD_GLYPHSET *STDCALL
 FONTOBJ_pfdg(FONTOBJ *pfo)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3627,6 +3886,7 @@ IFIMETRICS*
 STDCALL
 FONTOBJ_pifi(IN FONTOBJ  *FontObj)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3639,6 +3899,7 @@ STDCALL
 FONTOBJ_pvTrueTypeFontFile(IN FONTOBJ  *FontObj,
                            IN ULONG    *FileSize)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3650,6 +3911,7 @@ XFORMOBJ*
 STDCALL
 FONTOBJ_pxoGetXform(IN FONTOBJ  *FontObj)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3663,6 +3925,7 @@ FONTOBJ_vGetInfo(IN  FONTOBJ   *FontObj,
                  IN  ULONG      InfoSize,
                  OUT PFONTINFO  FontInfo)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 }
 
@@ -3672,6 +3935,7 @@ FONTOBJ_vGetInfo(IN  FONTOBJ   *FontObj,
 BOOL STDCALL
 PATHOBJ_bEnum(PATHOBJ *ppo,PATHDATA *ppd)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3682,6 +3946,7 @@ PATHOBJ_bEnum(PATHOBJ *ppo,PATHDATA *ppd)
 BOOL STDCALL 
 PATHOBJ_bEnumClipLines(PATHOBJ *ppo,ULONG cb,CLIPLINE *pcl)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3692,6 +3957,7 @@ PATHOBJ_bEnumClipLines(PATHOBJ *ppo,ULONG cb,CLIPLINE *pcl)
 VOID STDCALL 
 PATHOBJ_vEnumStart(PATHOBJ *ppo)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 }
 
@@ -3701,6 +3967,7 @@ PATHOBJ_vEnumStart(PATHOBJ *ppo)
 VOID STDCALL
 PATHOBJ_vEnumStartClipLines(PATHOBJ *ppo,CLIPOBJ *pco,SURFOBJ *pso,LINEATTRS *pla)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 }
 
@@ -3710,6 +3977,7 @@ PATHOBJ_vEnumStartClipLines(PATHOBJ *ppo,CLIPOBJ *pco,SURFOBJ *pso,LINEATTRS *pl
 VOID STDCALL
 PATHOBJ_vGetBounds(PATHOBJ *ppo,PRECTFX prectfx)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 }
 
@@ -3719,6 +3987,7 @@ PATHOBJ_vGetBounds(PATHOBJ *ppo,PRECTFX prectfx)
 BOOL STDCALL
 STROBJ_bEnum(STROBJ *pstro,ULONG *pc,PGLYPHPOS *ppgpos)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3729,6 +3998,7 @@ STROBJ_bEnum(STROBJ *pstro,ULONG *pc,PGLYPHPOS *ppgpos)
 BOOL STDCALL
 STROBJ_bEnumPositionsOnly(STROBJ *pstro,ULONG *pc,PGLYPHPOS *ppgpos)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3739,6 +4009,7 @@ STROBJ_bEnumPositionsOnly(STROBJ *pstro,ULONG *pc,PGLYPHPOS *ppgpos)
 BOOL STDCALL
 STROBJ_bGetAdvanceWidths(STROBJ *pso,ULONG iFirst,ULONG c,POINTQF *pptqD)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3749,6 +4020,7 @@ STROBJ_bGetAdvanceWidths(STROBJ *pso,ULONG iFirst,ULONG c,POINTQF *pptqD)
 DWORD STDCALL
 STROBJ_dwGetCodePage(STROBJ  *pstro)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3759,6 +4031,7 @@ STROBJ_dwGetCodePage(STROBJ  *pstro)
 VOID STDCALL
 STROBJ_vEnumStart(STROBJ *pstro)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 }
 
@@ -3768,6 +4041,7 @@ STROBJ_vEnumStart(STROBJ *pstro)
 BOOL STDCALL
 XFORMOBJ_bApplyXform(XFORMOBJ *pxo,ULONG iMode,ULONG cPoints,PVOID pvIn,PVOID pvOut)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3778,6 +4052,7 @@ XFORMOBJ_bApplyXform(XFORMOBJ *pxo,ULONG iMode,ULONG cPoints,PVOID pvIn,PVOID pv
 ULONG STDCALL
 XFORMOBJ_iGetXform(XFORMOBJ *pxo,XFORML *pxform)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3791,6 +4066,7 @@ XLATEOBJ_cGetPalette(XLATEOBJ *XlateObj,
 		     ULONG cPal,
 		     ULONG *OutPal)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3801,6 +4077,7 @@ XLATEOBJ_cGetPalette(XLATEOBJ *XlateObj,
 HANDLE STDCALL
 XLATEOBJ_hGetColorTransform(XLATEOBJ *pxlo)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3812,6 +4089,7 @@ ULONG STDCALL
 XLATEOBJ_iXlate(XLATEOBJ *XlateObj,
 		ULONG Color)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3822,6 +4100,7 @@ XLATEOBJ_iXlate(XLATEOBJ *XlateObj,
 ULONG * STDCALL
 XLATEOBJ_piVector(XLATEOBJ *XlateObj)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3834,6 +4113,7 @@ LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal,
 HDC hdc
 )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3855,6 +4135,7 @@ LPDWORD pdwFourCC,
 LPVIDMEM pvmList
 )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3866,6 +4147,7 @@ BOOL STDCALL DdDeleteDirectDrawObject(
 LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal
 )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3878,6 +4160,7 @@ LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal,
 BOOL bPrimarySurface
 )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3889,6 +4172,7 @@ BOOL STDCALL DdDeleteSurfaceObject(
 LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal
 )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3901,6 +4185,7 @@ LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal,
 HWND hWnd
 )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3913,6 +4198,7 @@ LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal,
 LPPALETTEENTRY pColorTable
 )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3924,6 +4210,7 @@ BOOL STDCALL DdReleaseDC(
 LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal
 )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3940,6 +4227,7 @@ HANDLE hSectionApp,
 DWORD dwOffset
 )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3952,6 +4240,7 @@ LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal,
 BOOL *pbNewMode
 )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3964,6 +4253,7 @@ LPDDRAWI_DDRAWSURFACE_LCL pSurfaceFrom,
 LPDDRAWI_DDRAWSURFACE_LCL pSurfaceTo
 )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3976,6 +4266,7 @@ LPDDRAWI_DDRAWSURFACE_LCL pSurface,
 LPDDRAWI_DDRAWSURFACE_LCL pSurfaceAttached
 )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 }
 
@@ -3984,6 +4275,7 @@ LPDDRAWI_DDRAWSURFACE_LCL pSurfaceAttached
  */
 ULONG STDCALL DdQueryDisplaySettingsUniqueness(VOID)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -3997,6 +4289,7 @@ LPDDRAWI_DDRAWSURFACE_LCL pSurface,
 BOOL bRelease
 )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -4010,6 +4303,7 @@ HDC hdc,
 LPVOID lpGammaRamp
 )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -4023,6 +4317,7 @@ LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl1,
 LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl2
 )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -4041,6 +4336,7 @@ GdiPlayEMF
 	HANDLE     hPageQuery
 )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -4052,6 +4348,7 @@ BOOL
 STDCALL
 GdiInitSpool(VOID)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -4068,6 +4365,7 @@ GdiPlayPrivatePageEMF
 	RECT	*prectDocument
 )
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -4077,5 +4375,6 @@ GdiPlayPrivatePageEMF
  */
 VOID STDCALL GdiInitializeLanguagePack(DWORD InitParam)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 }
diff --git a/reactos/lib/gdi32/misc/stubsa.c b/reactos/lib/gdi32/misc/stubsa.c
index 6686617c93e..49d37c07d84 100644
--- a/reactos/lib/gdi32/misc/stubsa.c
+++ b/reactos/lib/gdi32/misc/stubsa.c
@@ -1,4 +1,4 @@
-/* $Id: stubsa.c,v 1.31 2004/04/09 20:03:13 navaraf Exp $
+/* $Id: stubsa.c,v 1.32 2004/07/09 20:28:20 navaraf Exp $
  *
  * reactos/lib/gdi32/misc/stubs.c
  *
@@ -23,6 +23,8 @@
 #include <rosrtl/logfont.h>
 #include <internal/heap.h>
 
+#define UNIMPLEMENTED DbgPrint("GDI32: %s is unimplemented, please try again later.\n", __FUNCTION__);
+
 /*
  * @implemented
  */
@@ -172,6 +174,7 @@ DeviceCapabilitiesExA(
 	CONST DEVMODEA	*pDevMode
 	)
 {
+  UNIMPLEMENTED;
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return 0;
 }
@@ -189,6 +192,7 @@ EnumFontsA (
 	LPARAM  lParam
 	)
 {
+  UNIMPLEMENTED;
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return 0;
 #if 0
@@ -291,6 +295,7 @@ GetOutlineTextMetricsA(
 	LPOUTLINETEXTMETRICA	lpOTM
 	)
 {
+  UNIMPLEMENTED;
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return 0;
 }
@@ -344,6 +349,7 @@ GetCharacterPlacementA(
 	DWORD		a5
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -404,6 +410,7 @@ StartDocA(
 	CONST DOCINFOA	*a1
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -420,6 +427,7 @@ PolyTextOutA(
 	int			a2
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -436,6 +444,7 @@ GetTextFaceA(
 	LPSTR	a2
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -452,6 +461,7 @@ GetKerningPairsA(
 	LPKERNINGPAIR	a2
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -468,6 +478,7 @@ GetLogColorSpaceA(
 	DWORD			a2
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -482,6 +493,7 @@ CreateColorSpaceA(
 	LPLOGCOLORSPACEA	a0
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -498,6 +510,7 @@ GetICMProfileA(
 	LPSTR		a2
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -513,6 +526,7 @@ SetICMProfileA(
 	LPSTR	a1
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -539,6 +553,7 @@ EnumICMProfilesA(
    * until we run out of strings or the user returns FALSE
    */
 
+  UNIMPLEMENTED;
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return 0;
 }
@@ -556,6 +571,7 @@ wglUseFontBitmapsA(
 	DWORD		a3
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -577,6 +593,7 @@ wglUseFontOutlinesA(
 	LPGLYPHMETRICSFLOAT	a7
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -594,6 +611,7 @@ UpdateICMRegKeyA(
 	UINT	a3
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
diff --git a/reactos/lib/gdi32/misc/stubsw.c b/reactos/lib/gdi32/misc/stubsw.c
index 6b513115d8a..53ecfeb4a03 100644
--- a/reactos/lib/gdi32/misc/stubsw.c
+++ b/reactos/lib/gdi32/misc/stubsw.c
@@ -1,4 +1,4 @@
-/* $Id: stubsw.c,v 1.28 2004/04/09 20:03:13 navaraf Exp $
+/* $Id: stubsw.c,v 1.29 2004/07/09 20:28:20 navaraf Exp $
  *
  * reactos/lib/gdi32/misc/stubs.c
  *
@@ -14,6 +14,8 @@
 #include <windows.h>
 #include <win32k/kapi.h>
 
+#define UNIMPLEMENTED DbgPrint("GDI32: %s is unimplemented, please try again later.\n", __FUNCTION__);
+
 /*
  * @implemented
  */
@@ -106,6 +108,7 @@ DeviceCapabilitiesExW(
 				  pOutput,
 				  pDevMode );
 #else
+  UNIMPLEMENTED;
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return 0;
 #endif
@@ -127,6 +130,7 @@ EnumFontsW(
 #if 0
   return NtGdiEnumFonts ( hDC, lpFaceName, FontFunc, lParam );
 #else
+  UNIMPLEMENTED;
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return 0;
 #endif
@@ -211,6 +215,7 @@ GetOutlineTextMetricsW(
 	LPOUTLINETEXTMETRICW	lpOTM
 	)
 {
+  UNIMPLEMENTED;
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return 0;
 }
@@ -250,6 +255,7 @@ GetCharacterPlacementW(
 	DWORD		a5
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -307,13 +313,14 @@ PolyTextOutW(
 	int			a2
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
 
 
 /*
- * @unimplemented
+ * @implemented
  */
 int
 STDCALL
@@ -323,8 +330,7 @@ GetTextFaceW(
 	LPWSTR	a2
 	)
 {
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
+	return NtGdiGetTextFace(a0, a1, a2);
 }
 
 
@@ -339,6 +345,7 @@ GetKerningPairsW(
 	LPKERNINGPAIR	a2
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -355,6 +362,7 @@ GetLogColorSpaceW(
 	DWORD			a2
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -368,6 +376,7 @@ CreateColorSpaceW(
 	LPLOGCOLORSPACEW	a0
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
@@ -384,6 +393,7 @@ GetICMProfileW(
 	LPWSTR		a2
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -399,6 +409,7 @@ SetICMProfileW(
 	LPWSTR	a1
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -424,6 +435,7 @@ EnumICMProfilesW(
    * and call the user's callback function until we run out of strings or
    * the user returns FALSE
    */
+  UNIMPLEMENTED;
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return 0;
 }
@@ -441,6 +453,7 @@ wglUseFontBitmapsW(
 	DWORD		a3
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -462,6 +475,7 @@ wglUseFontOutlinesW(
 	LPGLYPHMETRICSFLOAT	a7
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -479,6 +493,7 @@ UpdateICMRegKeyW(
 	UINT	a3
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
@@ -502,6 +517,7 @@ GetFontResourceInfoW(
 	DWORD	a3
 	)
 {
+	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
 }
diff --git a/reactos/lib/gdi32/objects/font.c b/reactos/lib/gdi32/objects/font.c
index 244649af501..1342545aff8 100644
--- a/reactos/lib/gdi32/objects/font.c
+++ b/reactos/lib/gdi32/objects/font.c
@@ -1,4 +1,4 @@
-/* $Id: font.c,v 1.5 2004/07/03 17:40:22 navaraf Exp $
+/* $Id: font.c,v 1.6 2004/07/09 20:28:20 navaraf Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -404,3 +404,20 @@ GetCharWidth32W(
 {
   return NtGdiGetCharWidth32 ( hdc, iFirstChar, iLastChar, lpBuffer );
 }
+
+
+/*
+ * @implemented
+ */
+DWORD
+STDCALL
+GetFontData(
+	HDC	a0,
+	DWORD	a1,
+	DWORD	a2,
+	LPVOID	a3,
+	DWORD	a4
+	)
+{
+	return NtGdiGetFontData(a0, a1, a2, a3, a4);
+}
diff --git a/reactos/subsys/win32k/objects/text.c b/reactos/subsys/win32k/objects/text.c
index 4b9856c8088..03291a23cf8 100644
--- a/reactos/subsys/win32k/objects/text.c
+++ b/reactos/subsys/win32k/objects/text.c
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: text.c,v 1.102 2004/07/03 17:40:27 navaraf Exp $ */
+/* $Id: text.c,v 1.103 2004/07/09 20:28:20 navaraf Exp $ */
 #include <w32k.h>
 
 #include <ft2build.h>
@@ -2498,13 +2498,31 @@ NtGdiGetTextExtentPoint32(HDC hDC,
   return TRUE;
 }
 
-int
-STDCALL
-NtGdiGetTextFace(HDC  hDC,
-                     int  Count,
-                     LPWSTR  FaceName)
+INT STDCALL
+NtGdiGetTextFace(HDC hDC, INT Count, LPWSTR FaceName)
 {
-  UNIMPLEMENTED;
+   PDC Dc;
+   PTEXTOBJ TextObj;
+   NTSTATUS Status;
+
+   Dc = DC_LockDc(hDC);
+   if (Dc == NULL)
+   {
+      SetLastWin32Error(ERROR_INVALID_HANDLE);
+      return FALSE;
+   }
+   TextObj = TEXTOBJ_LockText(Dc->w.hFont);
+   DC_UnlockDc(hDC);
+
+   Count = min(Count, wcslen(TextObj->logfont.lfFaceName));
+   Status = MmCopyToCaller(FaceName, TextObj->logfont.lfFaceName, Count * sizeof(WCHAR));
+   if (!NT_SUCCESS(Status))
+   {
+      SetLastNtError(Status);
+      return 0;
+   }
+
+   return Count;
 }
 
 BOOL
@@ -2680,6 +2698,63 @@ NtGdiTextOut(
    return NtGdiExtTextOut(hDC, XStart, YStart, 0, NULL, String, Count, NULL);
 }
 
+DWORD STDCALL
+NtGdiGetFontData(
+   HDC hDC,
+   DWORD Table,
+   DWORD Offset,
+   LPVOID Buffer,
+   DWORD Size)
+{
+   PDC Dc;
+   HFONT hFont;
+   PTEXTOBJ TextObj;
+   PFONTGDI FontGdi;
+   DWORD Result = GDI_ERROR;
+   NTSTATUS Status;
+
+   Dc = DC_LockDc(hDC);
+   if (Dc == NULL)
+   {
+      SetLastWin32Error(ERROR_INVALID_HANDLE);
+      return GDI_ERROR;
+   }
+   hFont = Dc->w.hFont;
+   TextObj = TEXTOBJ_LockText(hFont);
+   DC_UnlockDc(hDC);
+
+   if (TextObj == NULL)
+   {
+      SetLastWin32Error(ERROR_INVALID_HANDLE);
+      return GDI_ERROR;
+   }
+   
+   Status = GetFontObjectsFromTextObj(TextObj, NULL, NULL, &FontGdi);
+   if (NT_SUCCESS(Status))
+   {
+      IntLockFreeType;
+
+      if (FT_IS_SFNT(FontGdi->face))
+      {
+         if (Table)
+            Table = Table >> 24 | Table << 24 | (Table >> 8 & 0xFF00) |
+                    (Table << 8 & 0xFF0000);
+
+         if (Buffer == NULL)
+            Size = 0;
+
+         if (!FT_Load_Sfnt_Table(FontGdi->face, Table, Offset, Buffer, &Size))
+            Result = Size;
+      }
+
+      IntUnLockFreeType;
+   }
+
+   TEXTOBJ_UnlockText(hFont);
+
+   return Result; 
+}
+
 static UINT FASTCALL
 GetFontScore(LOGFONTW *LogFont, PUNICODE_STRING FaceName, PFONTGDI FontGDI)
 {

From 4f24993634486d68ad348941fe5af185b02885c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Fri, 9 Jul 2004 20:57:38 +0000
Subject: [PATCH 240/356] FindWindow() should search the threads desktop, not
 the active one.

svn path=/trunk/; revision=10059
---
 reactos/subsys/win32k/include/desktop.h |  3 +++
 reactos/subsys/win32k/ntuser/desktop.c  | 13 ++++++++++++-
 reactos/subsys/win32k/ntuser/window.c   |  4 ++--
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/reactos/subsys/win32k/include/desktop.h b/reactos/subsys/win32k/include/desktop.h
index 2c49a77caba..37292dc94a6 100644
--- a/reactos/subsys/win32k/include/desktop.h
+++ b/reactos/subsys/win32k/include/desktop.h
@@ -31,6 +31,9 @@ IntGetScreenDC(VOID);
 HWND FASTCALL
 IntGetDesktopWindow (VOID);
 
+HWND FASTCALL
+IntGetCurrentThreadDesktopWindow(VOID);
+
 PUSER_MESSAGE_QUEUE FASTCALL
 IntGetFocusMessageQueue(VOID);
 
diff --git a/reactos/subsys/win32k/ntuser/desktop.c b/reactos/subsys/win32k/ntuser/desktop.c
index dcb00662e55..8cac7116dab 100644
--- a/reactos/subsys/win32k/ntuser/desktop.c
+++ b/reactos/subsys/win32k/ntuser/desktop.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *  $Id: desktop.c,v 1.16 2004/07/03 13:55:36 navaraf Exp $
+ *  $Id: desktop.c,v 1.17 2004/07/09 20:57:38 gvg Exp $
  *
  *  COPYRIGHT:        See COPYING in the top level directory
  *  PROJECT:          ReactOS kernel
@@ -206,6 +206,17 @@ HWND FASTCALL IntGetDesktopWindow(VOID)
   return pdo->DesktopWindow;
 }
 
+HWND FASTCALL IntGetCurrentThreadDesktopWindow(VOID)
+{
+  PDESKTOP_OBJECT pdo = PsGetWin32Thread()->Desktop;
+  if (NULL == pdo)
+    {
+      DPRINT1("Thread doesn't have a desktop\n");
+      return NULL;
+    }
+  return pdo->DesktopWindow;
+}
+
 /* PUBLIC FUNCTIONS ***********************************************************/
 
 NTSTATUS FASTCALL
diff --git a/reactos/subsys/win32k/ntuser/window.c b/reactos/subsys/win32k/ntuser/window.c
index 570fc5fabbd..2c68169504a 100644
--- a/reactos/subsys/win32k/ntuser/window.c
+++ b/reactos/subsys/win32k/ntuser/window.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: window.c,v 1.242 2004/07/03 17:40:25 navaraf Exp $
+/* $Id: window.c,v 1.243 2004/07/09 20:57:38 gvg Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -2381,7 +2381,7 @@ NtUserFindWindowEx(HWND hwndParent,
   PWNDCLASS_OBJECT ClassObject = NULL;
   BOOL ClassFound;
   
-  Desktop = IntGetDesktopWindow();
+  Desktop = IntGetCurrentThreadDesktopWindow();
   
   if(hwndParent == NULL)
     hwndParent = Desktop;

From 95e1a9b2470b2c7f47e7ab039d5998f0cb314411 Mon Sep 17 00:00:00 2001
From: Hartmut Birr <osexpert@googlemail.com>
Date: Sat, 10 Jul 2004 13:05:08 +0000
Subject: [PATCH 241/356] - Fixed the comparing of video modes in
 IntInitScreenInfo.

svn path=/trunk/; revision=10060
---
 reactos/drivers/video/displays/framebuf/screen.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/reactos/drivers/video/displays/framebuf/screen.c b/reactos/drivers/video/displays/framebuf/screen.c
index b760cafac23..0ecfb8757c5 100644
--- a/reactos/drivers/video/displays/framebuf/screen.c
+++ b/reactos/drivers/video/displays/framebuf/screen.c
@@ -158,12 +158,9 @@ IntInitScreenInfo(
       ModeInfoPtr = ModeInfo;
       while (ModeCount-- > 0)
       {
-         if (ModeInfoPtr->Length == 0)
-         {
-            continue;
-         }
 
-         if (pDevMode->dmPelsWidth == ModeInfoPtr->VisScreenWidth &&
+         if (ModeInfoPtr->Length > 0 &&
+	     pDevMode->dmPelsWidth == ModeInfoPtr->VisScreenWidth &&
              pDevMode->dmPelsHeight == ModeInfoPtr->VisScreenHeight &&
              pDevMode->dmBitsPerPel == (ModeInfoPtr->BitsPerPlane *
                                         ModeInfoPtr->NumberOfPlanes) &&

From 7f900f8f7e36427f3baf18470051d32e196ce787 Mon Sep 17 00:00:00 2001
From: Hartmut Birr <osexpert@googlemail.com>
Date: Sat, 10 Jul 2004 13:08:02 +0000
Subject: [PATCH 242/356] - Fixed the return value in VirtualQueryEx if
 NtQueryVirtualMemory returns an error.

svn path=/trunk/; revision=10061
---
 reactos/lib/kernel32/mem/virtual.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reactos/lib/kernel32/mem/virtual.c b/reactos/lib/kernel32/mem/virtual.c
index dba21341ce4..0d2c91e7b37 100644
--- a/reactos/lib/kernel32/mem/virtual.c
+++ b/reactos/lib/kernel32/mem/virtual.c
@@ -1,4 +1,4 @@
-/* $Id: virtual.c,v 1.13 2004/06/13 10:35:52 navaraf Exp $
+/* $Id: virtual.c,v 1.14 2004/07/10 13:08:02 hbirr Exp $
  *
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS kernel
@@ -198,7 +198,7 @@ VirtualQueryEx(HANDLE hProcess,
   if (!NT_SUCCESS(Status))
     {
       SetLastErrorByStatus(Status);
-      return(ResultLength);
+      return 0;
     }
   return(ResultLength);
 }

From 39da3d41f97a47fbb11417c85cc88e1239a64439 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Sat, 10 Jul 2004 13:11:18 +0000
Subject: [PATCH 243/356] Fix RtlEqualSid().

svn path=/trunk/; revision=10062
---
 reactos/lib/rtl/sid.c | 127 +++++++++++++++++++++---------------------
 1 file changed, 63 insertions(+), 64 deletions(-)

diff --git a/reactos/lib/rtl/sid.c b/reactos/lib/rtl/sid.c
index a7a7cee3a34..60e742b1c68 100644
--- a/reactos/lib/rtl/sid.c
+++ b/reactos/lib/rtl/sid.c
@@ -1,4 +1,4 @@
-/* $Id: sid.c,v 1.2 2004/06/20 23:30:47 gdalsnes Exp $
+/* $Id: sid.c,v 1.3 2004/07/10 13:11:18 ekohl Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -24,15 +24,13 @@
 BOOLEAN STDCALL
 RtlValidSid(IN PSID Sid)
 {
-   if ((Sid->Revision & 0xf) != 1)
-   {
-      return(FALSE);
-   }
-   if (Sid->SubAuthorityCount > 15)
-   {
-      return(FALSE);
-   }
-   return(TRUE);
+  if (((Sid->Revision & 0xf) != 1) ||
+      (Sid->SubAuthorityCount > 15))
+    {
+      return FALSE;
+    }
+
+   return TRUE;
 }
 
 
@@ -42,7 +40,7 @@ RtlValidSid(IN PSID Sid)
 ULONG STDCALL
 RtlLengthRequiredSid(IN UCHAR SubAuthorityCount)
 {
-   return(sizeof(SID) + (SubAuthorityCount - 1) * sizeof(ULONG));
+  return (sizeof(SID) + (SubAuthorityCount - 1) * sizeof(ULONG));
 }
 
 
@@ -54,12 +52,13 @@ RtlInitializeSid(IN PSID Sid,
                  IN PSID_IDENTIFIER_AUTHORITY IdentifierAuthority,
                  IN UCHAR SubAuthorityCount)
 {
-   Sid->Revision = 1;
-   Sid->SubAuthorityCount = SubAuthorityCount;
-   memcpy(&Sid->IdentifierAuthority,
-          IdentifierAuthority,
-          sizeof(SID_IDENTIFIER_AUTHORITY));
-   return(STATUS_SUCCESS);
+  Sid->Revision = 1;
+  Sid->SubAuthorityCount = SubAuthorityCount;
+  memcpy(&Sid->IdentifierAuthority,
+         IdentifierAuthority,
+         sizeof(SID_IDENTIFIER_AUTHORITY));
+
+  return STATUS_SUCCESS;
 }
 
 
@@ -70,7 +69,7 @@ PULONG STDCALL
 RtlSubAuthoritySid(IN PSID Sid,
                    IN ULONG SubAuthority)
 {
-   return(&Sid->SubAuthority[SubAuthority]);
+  return &Sid->SubAuthority[SubAuthority];
 }
 
 
@@ -80,7 +79,7 @@ RtlSubAuthoritySid(IN PSID Sid,
 PUCHAR STDCALL
 RtlSubAuthorityCountSid(IN PSID Sid)
 {
-   return(&Sid->SubAuthorityCount);
+  return &Sid->SubAuthorityCount;
 }
 
 
@@ -91,7 +90,7 @@ BOOLEAN STDCALL
 RtlEqualSid(IN PSID Sid1,
             IN PSID Sid2)
 {
-   if (Sid1->Revision != Sid2->Revision)
+  if (Sid1->Revision != Sid2->Revision)
    {
       return(FALSE);
    }
@@ -99,7 +98,7 @@ RtlEqualSid(IN PSID Sid1,
    {
       return(FALSE);
    }
-   if (RtlCompareMemory(Sid1, Sid2, RtlLengthSid(Sid1)) != 0)
+   if (RtlCompareMemory(Sid1, Sid2, RtlLengthSid(Sid1)) != RtlLengthSid(Sid1))
    {
       return(FALSE);
    }
@@ -113,7 +112,7 @@ RtlEqualSid(IN PSID Sid1,
 ULONG STDCALL
 RtlLengthSid(IN PSID Sid)
 {
-   return(sizeof(SID) + (Sid->SubAuthorityCount-1)*4);
+  return (sizeof(SID) + (Sid->SubAuthorityCount-1) * sizeof(ULONG));
 }
 
 
@@ -125,14 +124,16 @@ RtlCopySid(ULONG BufferLength,
            PSID Dest,
            PSID Src)
 {
-   if (BufferLength < RtlLengthSid(Src))
-   {
-      return(STATUS_UNSUCCESSFUL);
-   }
-   memmove(Dest,
-           Src,
-           RtlLengthSid(Src));
-   return(STATUS_SUCCESS);
+  if (BufferLength < RtlLengthSid(Src))
+    {
+      return STATUS_UNSUCCESSFUL;
+    }
+
+  memmove(Dest,
+          Src,
+          RtlLengthSid(Src));
+
+  return STATUS_SUCCESS;
 }
 
 
@@ -181,49 +182,47 @@ RtlCopySidAndAttributesArray(ULONG Count,
 PSID_IDENTIFIER_AUTHORITY STDCALL
 RtlIdentifierAuthoritySid(IN PSID Sid)
 {
-   return(&Sid->IdentifierAuthority);
+  return &Sid->IdentifierAuthority;
 }
 
 
 /*
  * @implemented
  */
-NTSTATUS
-STDCALL
-RtlAllocateAndInitializeSid (
-   PSID_IDENTIFIER_AUTHORITY IdentifierAuthority,
-   UCHAR    SubAuthorityCount,
-   ULONG    SubAuthority0,
-   ULONG    SubAuthority1,
-   ULONG    SubAuthority2,
-   ULONG    SubAuthority3,
-   ULONG    SubAuthority4,
-   ULONG    SubAuthority5,
-   ULONG    SubAuthority6,
-   ULONG    SubAuthority7,
-   PSID    *Sid
-)
+NTSTATUS STDCALL
+RtlAllocateAndInitializeSid(PSID_IDENTIFIER_AUTHORITY IdentifierAuthority,
+			    UCHAR SubAuthorityCount,
+			    ULONG SubAuthority0,
+			    ULONG SubAuthority1,
+			    ULONG SubAuthority2,
+			    ULONG SubAuthority3,
+			    ULONG SubAuthority4,
+			    ULONG SubAuthority5,
+			    ULONG SubAuthority6,
+			    ULONG SubAuthority7,
+			    PSID *Sid)
 {
-   PSID pSid;
+  PSID pSid;
 
-   if (SubAuthorityCount > 8)
-      return STATUS_INVALID_SID;
+  if (SubAuthorityCount > 8)
+    return STATUS_INVALID_SID;
 
-   if (Sid == NULL)
-      return STATUS_INVALID_PARAMETER;
+  if (Sid == NULL)
+    return STATUS_INVALID_PARAMETER;
 
-   pSid = (PSID)ExAllocatePool(PagedPool, SubAuthorityCount * sizeof(DWORD) + 8);
-   if (pSid == NULL)
-      return STATUS_NO_MEMORY;
+  pSid = (PSID)ExAllocatePool(PagedPool,
+			      sizeof(SID) + (SubAuthorityCount - 1) * sizeof(ULONG));
+  if (pSid == NULL)
+    return STATUS_NO_MEMORY;
 
-   pSid->Revision = 1;
-   pSid->SubAuthorityCount = SubAuthorityCount;
-   memcpy (&pSid->IdentifierAuthority,
-           IdentifierAuthority,
-           sizeof(SID_IDENTIFIER_AUTHORITY));
+  pSid->Revision = 1;
+  pSid->SubAuthorityCount = SubAuthorityCount;
+  memcpy(&pSid->IdentifierAuthority,
+         IdentifierAuthority,
+         sizeof(SID_IDENTIFIER_AUTHORITY));
 
-   switch (SubAuthorityCount)
-   {
+  switch (SubAuthorityCount)
+    {
       case 8:
          pSid->SubAuthority[7] = SubAuthority7;
       case 7:
@@ -241,11 +240,11 @@ RtlAllocateAndInitializeSid (
       case 1:
          pSid->SubAuthority[0] = SubAuthority0;
          break;
-   }
+    }
 
-   *Sid = pSid;
+  *Sid = pSid;
 
-   return STATUS_SUCCESS;
+  return STATUS_SUCCESS;
 }
 
 

From 5b9cf862e014fb016c4ae4550aaa4a8d820353f2 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Sat, 10 Jul 2004 13:12:24 +0000
Subject: [PATCH 244/356] Create group SIDs for logon token.

svn path=/trunk/; revision=10063
---
 reactos/lib/advapi32/misc/logon.c | 325 ++++++++++++++++++++++++++++--
 1 file changed, 312 insertions(+), 13 deletions(-)

diff --git a/reactos/lib/advapi32/misc/logon.c b/reactos/lib/advapi32/misc/logon.c
index cfc0f6f74fa..9059f09038e 100644
--- a/reactos/lib/advapi32/misc/logon.c
+++ b/reactos/lib/advapi32/misc/logon.c
@@ -1,4 +1,4 @@
-/* $Id: logon.c,v 1.7 2004/07/07 08:41:47 gvg Exp $
+/* $Id: logon.c,v 1.8 2004/07/10 13:12:24 ekohl Exp $
  *
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS system libraries
@@ -237,6 +237,293 @@ SamGetUserSid (LPCWSTR UserName,
 }
 
 
+static BOOL STDCALL
+SamGetDomainSid(PSID *Sid)
+{
+  PSID lpSid;
+  DWORD dwLength;
+  HKEY hDomainKey;
+
+  DPRINT("SamGetDomainSid() called\n");
+
+  if (Sid != NULL)
+    *Sid = NULL;
+
+  /* Open the account domain key */
+  if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+		    L"SAM\\SAM\\Domains\\Account",
+		    0,
+		    KEY_READ,
+		    &hDomainKey))
+    {
+      DPRINT1("Failed to open the account domain key! (Error %lu)\n", GetLastError());
+      return FALSE;
+    }
+
+  /* Get SID size */
+  dwLength = 0;
+  if (RegQueryValueExW(hDomainKey,
+		       L"Sid",
+		       NULL,
+		       NULL,
+		       NULL,
+		       &dwLength))
+    {
+      DPRINT1("Failed to read the SID size! (Error %lu)\n", GetLastError());
+      RegCloseKey(hDomainKey);
+      return FALSE;
+    }
+
+  /* Allocate sid buffer */
+  DPRINT("Required SID buffer size: %lu\n", dwLength);
+  lpSid = (PSID)RtlAllocateHeap(RtlGetProcessHeap(),
+				0,
+				dwLength);
+  if (lpSid == NULL)
+    {
+      DPRINT1("Failed to allocate SID buffer!\n");
+      RegCloseKey(hDomainKey);
+      return FALSE;
+    }
+
+  /* Read sid */
+  if (RegQueryValueExW(hDomainKey,
+		       L"Sid",
+		       NULL,
+		       NULL,
+		       (LPBYTE)lpSid,
+		       &dwLength))
+    {
+      DPRINT1("Failed to read the SID! (Error %lu)\n", GetLastError());
+      RtlFreeHeap(RtlGetProcessHeap(),
+		  0,
+		  lpSid);
+      RegCloseKey(hDomainKey);
+      return FALSE;
+    }
+
+  RegCloseKey(hDomainKey);
+
+  *Sid = lpSid;
+
+  DPRINT("SamGetDomainSid() done\n");
+
+  return TRUE;
+}
+
+
+static PSID
+AppendRidToSid(PSID SrcSid,
+	       ULONG Rid)
+{
+  ULONG Rids[8] = {0, 0, 0, 0, 0, 0, 0, 0};
+  UCHAR RidCount;
+  PSID DstSid;
+  ULONG i;
+
+  RidCount = *RtlSubAuthorityCountSid(SrcSid);
+  if (RidCount >= 8)
+    return NULL;
+
+  for (i = 0; i < RidCount; i++)
+    Rids[i] = *RtlSubAuthoritySid(SrcSid, i);
+
+  Rids[RidCount] = Rid;
+  RidCount++;
+
+  RtlAllocateAndInitializeSid(RtlIdentifierAuthoritySid(SrcSid),
+			      RidCount,
+			      Rids[0],
+			      Rids[1],
+			      Rids[2],
+			      Rids[3],
+			      Rids[4],
+			      Rids[5],
+			      Rids[6],
+			      Rids[7],
+			      &DstSid);
+
+  return DstSid;
+}
+
+
+static PTOKEN_GROUPS
+AllocateGroupSids(PSID *PrimaryGroupSid,
+		  PSID *OwnerSid)
+{
+  SID_IDENTIFIER_AUTHORITY WorldAuthority = {SECURITY_WORLD_SID_AUTHORITY};
+  SID_IDENTIFIER_AUTHORITY LocalAuthority = {SECURITY_LOCAL_SID_AUTHORITY};
+  SID_IDENTIFIER_AUTHORITY SystemAuthority = {SECURITY_NT_AUTHORITY};
+  PTOKEN_GROUPS TokenGroups;
+  PSID DomainSid;
+  PSID Sid;
+  LUID Luid;
+  NTSTATUS Status;
+
+  Status = NtAllocateLocallyUniqueId(&Luid);
+  if (!NT_SUCCESS(Status))
+    {
+      return NULL;
+    }
+
+  if (!SamGetDomainSid(&DomainSid))
+    {
+      return NULL;
+    }
+
+  TokenGroups = RtlAllocateHeap(GetProcessHeap(), 0,
+                                sizeof(TOKEN_GROUPS) +
+                                8 * sizeof(SID_AND_ATTRIBUTES));
+  if (TokenGroups == NULL)
+    {
+      RtlFreeHeap (RtlGetProcessHeap (),
+		   0,
+		   DomainSid);
+      return NULL;
+    }
+
+  TokenGroups->GroupCount = 8;
+
+  Sid = AppendRidToSid(DomainSid,
+                       DOMAIN_GROUP_RID_USERS);
+
+  RtlFreeHeap(RtlGetProcessHeap(),
+	      0,
+	      DomainSid);
+
+  TokenGroups->Groups[0].Sid = Sid;
+  TokenGroups->Groups[0].Attributes = SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY;
+  *PrimaryGroupSid = Sid;
+
+
+  RtlAllocateAndInitializeSid(&WorldAuthority,
+			      1,
+			      SECURITY_WORLD_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      &Sid);
+
+  TokenGroups->Groups[1].Sid = Sid;
+  TokenGroups->Groups[1].Attributes = SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY;
+
+
+  RtlAllocateAndInitializeSid(&SystemAuthority,
+			      2,
+			      SECURITY_BUILTIN_DOMAIN_RID,
+			      DOMAIN_ALIAS_RID_ADMINS,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      &Sid);
+
+  TokenGroups->Groups[2].Sid = Sid;
+  TokenGroups->Groups[2].Attributes = SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY;
+
+  *OwnerSid = Sid;
+
+  RtlAllocateAndInitializeSid(&SystemAuthority,
+			      2,
+			      SECURITY_BUILTIN_DOMAIN_RID,
+			      DOMAIN_ALIAS_RID_USERS,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      &Sid);
+
+  TokenGroups->Groups[3].Sid = Sid;
+  TokenGroups->Groups[3].Attributes = SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY;
+
+  /* Logon SID */
+  RtlAllocateAndInitializeSid(&SystemAuthority,
+			      SECURITY_LOGON_IDS_RID_COUNT,
+			      SECURITY_LOGON_IDS_RID,
+			      Luid.HighPart,
+			      Luid.LowPart,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      &Sid);
+
+  TokenGroups->Groups[4].Sid = Sid;
+  TokenGroups->Groups[4].Attributes = SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY | SE_GROUP_LOGON_ID;
+
+  RtlAllocateAndInitializeSid(&LocalAuthority,
+			      1,
+			      SECURITY_LOCAL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      &Sid);
+
+  TokenGroups->Groups[5].Sid = Sid;
+  TokenGroups->Groups[5].Attributes = SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY;
+
+  RtlAllocateAndInitializeSid(&SystemAuthority,
+			      1,
+			      SECURITY_INTERACTIVE_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      &Sid);
+
+  TokenGroups->Groups[6].Sid = Sid;
+  TokenGroups->Groups[6].Attributes = SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY;
+
+  RtlAllocateAndInitializeSid(&SystemAuthority,
+			      1,
+			      SECURITY_AUTHENTICATED_USER_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      &Sid);
+
+  TokenGroups->Groups[7].Sid = Sid;
+  TokenGroups->Groups[7].Attributes = SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY;
+
+  return TokenGroups;
+}
+
+
+static VOID
+FreeGroupSids(PTOKEN_GROUPS TokenGroups)
+{
+  ULONG i;
+
+  for (i = 0; i < TokenGroups->GroupCount; i++)
+    {
+       if (TokenGroups->Groups[i].Sid != NULL)
+         RtlFreeHeap(GetProcessHeap(), 0, TokenGroups->Groups[i].Sid);
+    }
+
+  RtlFreeHeap(GetProcessHeap(), 0, TokenGroups);
+}
+
+
 /*
  * @unimplemented
  */
@@ -283,14 +570,15 @@ LogonUserW (LPWSTR lpszUsername,
   TOKEN_USER TokenUser;
   TOKEN_OWNER TokenOwner;
   TOKEN_PRIMARY_GROUP TokenPrimaryGroup;
-  TOKEN_GROUPS TokenGroups;
-//  PTOKEN_GROUPS TokenGroups;
+  PTOKEN_GROUPS TokenGroups;
   PTOKEN_PRIVILEGES TokenPrivileges;
   TOKEN_DEFAULT_DACL TokenDefaultDacl;
   LARGE_INTEGER ExpirationTime;
   LUID AuthenticationId;
   TOKEN_SOURCE TokenSource;
-  PSID UserSid;
+  PSID UserSid = NULL;
+  PSID PrimaryGroupSid = NULL;
+  PSID OwnerSid = NULL;
   ACL Dacl;
   NTSTATUS Status;
   SID_IDENTIFIER_AUTHORITY SystemAuthority = {SECURITY_NT_AUTHORITY};
@@ -333,21 +621,29 @@ LogonUserW (LPWSTR lpszUsername,
   TokenUser.User.Sid = UserSid;
   TokenUser.User.Attributes = 0;
 
-//  TokenGroups = NULL;
-  TokenGroups.GroupCount = 1;
-  TokenGroups.Groups[0].Sid = UserSid; /* FIXME */
-  TokenGroups.Groups[0].Attributes = SE_GROUP_ENABLED;
+  /* Allocate and initialize token groups */
+  TokenGroups = AllocateGroupSids(&PrimaryGroupSid,
+				  &OwnerSid);
+  if (NULL == TokenGroups)
+    {
+      RtlFreeSid (UserSid);
+      SetLastError(ERROR_OUTOFMEMORY);
+      return FALSE;
+    }
 
+  /* Allocate and initialize token privileges */
   TokenPrivileges = RtlAllocateHeap(GetProcessHeap(), 0,
                                     sizeof(TOKEN_PRIVILEGES)
                                     + sizeof(DefaultPrivs) / sizeof(DefaultPrivs[0])
                                       * sizeof(LUID_AND_ATTRIBUTES));
   if (NULL == TokenPrivileges)
     {
+      FreeGroupSids(TokenGroups);
       RtlFreeSid (UserSid);
       SetLastError(ERROR_OUTOFMEMORY);
       return FALSE;
     }
+
   TokenPrivileges->PrivilegeCount = 0;
   for (i = 0; i < sizeof(DefaultPrivs) / sizeof(DefaultPrivs[0]); i++)
     {
@@ -363,13 +659,14 @@ LogonUserW (LPWSTR lpszUsername,
         }
     }
 
-  TokenOwner.Owner = UserSid;
-
-  TokenPrimaryGroup.PrimaryGroup = UserSid;
+  TokenOwner.Owner = OwnerSid;
+  TokenPrimaryGroup.PrimaryGroup = PrimaryGroupSid;
+//  TokenPrimaryGroup.PrimaryGroup = UserSid;
 
   Status = RtlCreateAcl (&Dacl, sizeof(ACL), ACL_REVISION);
   if (!NT_SUCCESS(Status))
     {
+      FreeGroupSids(TokenGroups);
       RtlFreeHeap(GetProcessHeap(), 0, TokenPrivileges);
       RtlFreeSid (UserSid);
       return FALSE;
@@ -383,6 +680,8 @@ LogonUserW (LPWSTR lpszUsername,
   Status = NtAllocateLocallyUniqueId (&TokenSource.SourceIdentifier);
   if (!NT_SUCCESS(Status))
     {
+      FreeGroupSids(TokenGroups);
+      RtlFreeHeap(GetProcessHeap(), 0, TokenPrivileges);
       RtlFreeSid (UserSid);
       return FALSE;
     }
@@ -394,14 +693,14 @@ LogonUserW (LPWSTR lpszUsername,
 			  &AuthenticationId,
 			  &ExpirationTime,
 			  &TokenUser,
-//			  TokenGroups,
-			  &TokenGroups,
+			  TokenGroups,
 			  TokenPrivileges,
 			  &TokenOwner,
 			  &TokenPrimaryGroup,
 			  &TokenDefaultDacl,
 			  &TokenSource);
 
+  FreeGroupSids(TokenGroups);
   RtlFreeHeap(GetProcessHeap(), 0, TokenPrivileges);
   RtlFreeSid (UserSid);
 

From 35f4d34682b581ecaa6556d2b7d12fb659ea2c30 Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Sat, 10 Jul 2004 14:38:24 +0000
Subject: [PATCH 245/356] export GetSecurityInfo()

svn path=/trunk/; revision=10064
---
 reactos/lib/advapi32/advapi32.def |  4 ++--
 reactos/lib/advapi32/advapi32.edf |  4 ++--
 reactos/lib/advapi32/sec/misc.c   | 22 +++++++++++++++++++++-
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/reactos/lib/advapi32/advapi32.def b/reactos/lib/advapi32/advapi32.def
index d868d825633..34bfc17c4c2 100644
--- a/reactos/lib/advapi32/advapi32.def
+++ b/reactos/lib/advapi32/advapi32.def
@@ -1,4 +1,4 @@
-; $Id: advapi32.def,v 1.19 2004/05/26 09:50:09 weiden Exp $
+; $Id: advapi32.def,v 1.20 2004/07/10 14:38:23 weiden Exp $
 ;
 ; advapi32.def
 ;
@@ -155,7 +155,7 @@ GetSecurityDescriptorGroup@12
 GetSecurityDescriptorLength@4
 GetSecurityDescriptorOwner@12
 GetSecurityDescriptorSacl@16
-;GetSecurityInfo@32
+GetSecurityInfo@32
 GetServiceDisplayNameA@16
 GetServiceDisplayNameW@16
 GetServiceKeyNameA@16
diff --git a/reactos/lib/advapi32/advapi32.edf b/reactos/lib/advapi32/advapi32.edf
index b5985fed2ed..180ba865a45 100644
--- a/reactos/lib/advapi32/advapi32.edf
+++ b/reactos/lib/advapi32/advapi32.edf
@@ -1,4 +1,4 @@
-; $Id: advapi32.edf,v 1.39 2004/05/26 09:50:10 weiden Exp $
+; $Id: advapi32.edf,v 1.40 2004/07/10 14:38:23 weiden Exp $
 ;
 ; advapi32.edf
 ;
@@ -151,7 +151,7 @@ GetSecurityDescriptorGroup=GetSecurityDescriptorGroup@12
 GetSecurityDescriptorLength=GetSecurityDescriptorLength@4
 GetSecurityDescriptorOwner=GetSecurityDescriptorOwner@12
 GetSecurityDescriptorSacl=GetSecurityDescriptorSacl@16
-;GetSecurityInfo=GetSecurityInfo@32
+GetSecurityInfo=GetSecurityInfo@32
 GetServiceDisplayNameA=GetServiceDisplayNameA@16
 GetServiceDisplayNameW=GetServiceDisplayNameW@16
 GetServiceKeyNameA=GetServiceKeyNameA@16
diff --git a/reactos/lib/advapi32/sec/misc.c b/reactos/lib/advapi32/sec/misc.c
index 37c7668a196..84ad8294c0a 100644
--- a/reactos/lib/advapi32/sec/misc.c
+++ b/reactos/lib/advapi32/sec/misc.c
@@ -1,4 +1,4 @@
-/* $Id: misc.c,v 1.20 2004/07/09 20:10:45 navaraf Exp $
+/* $Id: misc.c,v 1.21 2004/07/10 14:38:24 weiden Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -668,4 +668,24 @@ SetNamedSecurityInfoA(LPSTR pObjectName,
   return ERROR_CALL_NOT_IMPLEMENTED;
 }
 
+
+/**********************************************************************
+ * GetSecurityInfo				EXPORTED
+ *
+ * @unimplemented
+ */
+DWORD STDCALL
+GetSecurityInfo(HANDLE handle,
+                SE_OBJECT_TYPE ObjectType,
+                SECURITY_INFORMATION SecurityInfo,
+                PSID* ppsidOwner,
+                PSID* ppsidGroup,
+                PACL* ppDacl,
+                PACL* ppSacl,
+                PSECURITY_DESCRIPTOR* ppSecurityDescriptor)
+{
+  DPRINT1("GetSecurityInfo: stub\n");
+  return ERROR_CALL_NOT_IMPLEMENTED;
+}
+
 /* EOF */

From 3768902d9b18801d06124f0ed539ec82d894623a Mon Sep 17 00:00:00 2001
From: Hartmut Birr <osexpert@googlemail.com>
Date: Sat, 10 Jul 2004 17:01:03 +0000
Subject: [PATCH 246/356] - Implemented NtQueryVirtualMemory for unallocated
 regions. - Fixed some minor bugs in NtQueryVirtualMemory and its related
 query functions.

svn path=/trunk/; revision=10065
---
 reactos/ntoskrnl/include/internal/mm.h |   2 +
 reactos/ntoskrnl/mm/anonmem.c          |   7 +-
 reactos/ntoskrnl/mm/marea.c            |  47 +++++++++
 reactos/ntoskrnl/mm/section.c          |   8 +-
 reactos/ntoskrnl/mm/virtual.c          | 132 +++++++++++++++++--------
 reactos/ntoskrnl/ps/create.c           |   8 +-
 6 files changed, 152 insertions(+), 52 deletions(-)

diff --git a/reactos/ntoskrnl/include/internal/mm.h b/reactos/ntoskrnl/include/internal/mm.h
index 8abd58c130d..18baa020684 100644
--- a/reactos/ntoskrnl/include/internal/mm.h
+++ b/reactos/ntoskrnl/include/internal/mm.h
@@ -203,6 +203,8 @@ NTSTATUS MmCreateMemoryArea(struct _EPROCESS* Process,
 			    PHYSICAL_ADDRESS BoundaryAddressMultiple OPTIONAL);
 MEMORY_AREA* MmOpenMemoryAreaByAddress(PMADDRESS_SPACE AddressSpace, 
 				       PVOID Address);
+ULONG MmFindGapAtAddress(PMADDRESS_SPACE AddressSpace, 
+			 PVOID Address);
 NTSTATUS MmInitMemoryAreas(VOID);
 VOID MiInitializeNonPagedPool(VOID);
 NTSTATUS MmFreeMemoryArea(PMADDRESS_SPACE AddressSpace,
diff --git a/reactos/ntoskrnl/mm/anonmem.c b/reactos/ntoskrnl/mm/anonmem.c
index c869b6c3658..0c92ce64392 100644
--- a/reactos/ntoskrnl/mm/anonmem.c
+++ b/reactos/ntoskrnl/mm/anonmem.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: anonmem.c,v 1.28 2004/06/06 08:36:31 hbirr Exp $
+/* $Id: anonmem.c,v 1.29 2004/07/10 17:01:03 hbirr Exp $
  *
  * PROJECT:     ReactOS kernel
  * FILE:        ntoskrnl/mm/anonmem.c
@@ -887,8 +887,9 @@ MmQueryAnonMem(PMEMORY_AREA MemoryArea,
    Region = MmFindRegion(MemoryArea->BaseAddress,
                          &MemoryArea->Data.VirtualMemoryData.RegionListHead,
                          Address, &RegionBase);
-   Info->AllocationBase = RegionBase;
-   Info->AllocationProtect = Region->Protect;  /* FIXME */
+   Info->BaseAddress = RegionBase;
+   Info->AllocationBase = MemoryArea->BaseAddress;
+   Info->AllocationProtect = MemoryArea->Attributes;
    Info->RegionSize = (char*)RegionBase + Region->Length - (char*)Info->BaseAddress;
    Info->State = Region->Type;
    Info->Protect = Region->Protect;
diff --git a/reactos/ntoskrnl/mm/marea.c b/reactos/ntoskrnl/mm/marea.c
index 092cb8eb263..4ea1d3f66a9 100644
--- a/reactos/ntoskrnl/mm/marea.c
+++ b/reactos/ntoskrnl/mm/marea.c
@@ -346,6 +346,53 @@ PVOID MmFindGap(PMADDRESS_SPACE AddressSpace, ULONG Length, BOOL TopDown)
    return MmFindGapBottomUp(AddressSpace, Length);
 }
 
+ULONG MmFindGapAtAddress(PMADDRESS_SPACE AddressSpace, PVOID Address)
+{
+   PLIST_ENTRY current_entry, ListHead;
+   PMEMORY_AREA current;
+
+   Address = (PVOID)PAGE_ROUND_DOWN(Address);
+
+   if (AddressSpace->LowestAddress < KERNEL_BASE)
+   {
+      if (Address >= (PVOID)KERNEL_BASE)
+      {
+         return 0;
+      }
+   }
+   else
+   {
+      if ((ULONG_PTR)Address < AddressSpace->LowestAddress)
+      {
+         return 0;
+      }
+   }
+
+   ListHead = &AddressSpace->MAreaListHead;
+
+   current_entry = ListHead->Flink;
+   while (current_entry != ListHead)
+   {
+      current = CONTAINING_RECORD(current_entry,MEMORY_AREA,Entry);
+      if (current->BaseAddress <= Address && Address < current->BaseAddress + current->Length)
+      {
+         return 0;
+      }
+      else if (current->BaseAddress > Address)
+      {
+         return (ULONG_PTR)current->BaseAddress - (ULONG_PTR)Address;
+      }
+      current_entry = current_entry->Flink;
+   }
+   if (AddressSpace->LowestAddress < KERNEL_BASE)
+   {
+      return KERNEL_BASE - (ULONG_PTR)Address;
+   }
+   else
+   {
+      return 0 - (ULONG_PTR)Address;
+   }
+}
 
 NTSTATUS INIT_FUNCTION
 MmInitMemoryAreas(VOID)
diff --git a/reactos/ntoskrnl/mm/section.c b/reactos/ntoskrnl/mm/section.c
index 9db45c2dfb8..9d8b9b32bd3 100644
--- a/reactos/ntoskrnl/mm/section.c
+++ b/reactos/ntoskrnl/mm/section.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: section.c,v 1.152 2004/06/20 10:21:48 navaraf Exp $
+/* $Id: section.c,v 1.153 2004/07/10 17:01:02 hbirr Exp $
  *
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/mm/section.c
@@ -2035,7 +2035,7 @@ MmQuerySectionView(PMEMORY_AREA MemoryArea,
          }
       }
       KeReleaseSpinLock(&Section->ViewListLock, oldIrql);
-      Info->BaseAddress = MemoryArea->BaseAddress;
+      Info->BaseAddress = RegionBaseAddress;
       Info->AllocationProtect = MemoryArea->Attributes;
       Info->Type = MEM_IMAGE;
    }
@@ -2043,10 +2043,10 @@ MmQuerySectionView(PMEMORY_AREA MemoryArea,
    {
       Info->BaseAddress = RegionBaseAddress;
       Info->AllocationBase = MemoryArea->BaseAddress;
-      Info->AllocationProtect = Region->Protect;
+      Info->AllocationProtect = MemoryArea->Attributes;
       Info->Type = MEM_MAPPED;
    }
-   Info->RegionSize = MemoryArea->Length;
+   Info->RegionSize = PAGE_ROUND_UP(MemoryArea->Length);
    Info->State = MEM_COMMIT;
    Info->Protect = Region->Protect;
 
diff --git a/reactos/ntoskrnl/mm/virtual.c b/reactos/ntoskrnl/mm/virtual.c
index 44c966ce914..403ff839235 100644
--- a/reactos/ntoskrnl/mm/virtual.c
+++ b/reactos/ntoskrnl/mm/virtual.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: virtual.c,v 1.77 2004/07/09 20:14:49 navaraf Exp $
+/* $Id: virtual.c,v 1.78 2004/07/10 17:01:02 hbirr Exp $
  *
  * PROJECT:     ReactOS kernel
  * FILE:        ntoskrnl/mm/virtual.c
@@ -132,6 +132,12 @@ NtQueryVirtualMemory (IN HANDLE ProcessHandle,
    MEMORY_AREA* MemoryArea;
    ULONG ResultLength = 0;
    PMADDRESS_SPACE AddressSpace;
+   KPROCESSOR_MODE PrevMode;
+   union
+   {
+      MEMORY_BASIC_INFORMATION BasicInfo;
+   }
+   VirtualMemoryInfo;
 
    DPRINT("NtQueryVirtualMemory(ProcessHandle %x, Address %x, "
           "VirtualMemoryInformationClass %d, VirtualMemoryInformation %x, "
@@ -139,20 +145,33 @@ NtQueryVirtualMemory (IN HANDLE ProcessHandle,
           VirtualMemoryInformationClass,VirtualMemoryInformation,
           Length,ResultLength);
 
-   Status = ObReferenceObjectByHandle(ProcessHandle,
-                                      PROCESS_QUERY_INFORMATION,
-                                      NULL,
-                                      UserMode,
-                                      (PVOID*)(&Process),
-                                      NULL);
+   PrevMode =  ExGetPreviousMode();
 
-   if (!NT_SUCCESS(Status))
+   if (PrevMode == UserMode && Address >= (PVOID)KERNEL_BASE)
    {
-      DPRINT("NtQueryVirtualMemory() = %x\n",Status);
-      return(Status);
+      return STATUS_INVALID_PARAMETER;
    }
 
-   AddressSpace = &Process->AddressSpace;
+   if (Address < (PVOID)KERNEL_BASE)
+   {
+      Status = ObReferenceObjectByHandle(ProcessHandle,
+                                         PROCESS_QUERY_INFORMATION,
+                                         NULL,
+                                         UserMode,
+                                         (PVOID*)(&Process),
+                                         NULL);
+
+      if (!NT_SUCCESS(Status))
+      {
+         DPRINT("NtQueryVirtualMemory() = %x\n",Status);
+         return(Status);
+      }
+      AddressSpace = &Process->AddressSpace;
+   }
+   else
+   {
+      AddressSpace = MmGetKernelAddressSpace();
+   }
    MmLockAddressSpace(AddressSpace);
    MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace,
                                           Address);
@@ -160,47 +179,65 @@ NtQueryVirtualMemory (IN HANDLE ProcessHandle,
    {
       case MemoryBasicInformation:
          {
-            PMEMORY_BASIC_INFORMATION Info =
-               (PMEMORY_BASIC_INFORMATION)VirtualMemoryInformation;
-
+	    PMEMORY_BASIC_INFORMATION Info = &VirtualMemoryInfo.BasicInfo;
             if (Length != sizeof(MEMORY_BASIC_INFORMATION))
             {
                MmUnlockAddressSpace(AddressSpace);
                ObDereferenceObject(Process);
                return(STATUS_INFO_LENGTH_MISMATCH);
             }
-
+            
             if (MemoryArea == NULL)
             {
+	       Info->Type = 0;
                Info->State = MEM_FREE;
+	       Info->Protect = PAGE_NOACCESS;
+	       Info->AllocationProtect = 0;
                Info->BaseAddress = (PVOID)PAGE_ROUND_DOWN(Address);
-               Info->AllocationBase = 0;
-               Info->AllocationProtect = 0;
-               /* TODO: Find the next memory area and set RegionSize! */
-               /* Since programs might depend on RegionSize for
-                * iteration, we for now just make up a value.
-                */
-               Info->RegionSize = (Address > (PVOID)0x80000000) ? 0 : 0x10000;
-               Info->Protect = PAGE_NOACCESS;
-               Info->Type = 0;
+	       Info->AllocationBase = NULL;
+	       Info->RegionSize = MmFindGapAtAddress(AddressSpace, Info->BaseAddress);
                Status = STATUS_SUCCESS;
                ResultLength = sizeof(MEMORY_BASIC_INFORMATION);
-            }
-            else if (MemoryArea->Type == MEMORY_AREA_VIRTUAL_MEMORY)
-            {
-               Status = MmQueryAnonMem(MemoryArea, Address, Info,
-                                       &ResultLength);
-            }
-            else if (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW)
-            {
-               Status = MmQuerySectionView(MemoryArea, Address, Info,
-                                           &ResultLength);
-            }
-            else
-            {
-               Status = STATUS_UNSUCCESSFUL;
-               ResultLength = 0;
-            }
+	    }
+            else 
+	    {
+	       switch(MemoryArea->Type)
+	       {
+		  case MEMORY_AREA_VIRTUAL_MEMORY:
+                     Status = MmQueryAnonMem(MemoryArea, Address, Info,
+                                             &ResultLength);
+		     break;
+	          case MEMORY_AREA_SECTION_VIEW:
+                     Status = MmQuerySectionView(MemoryArea, Address, Info,
+                                                 &ResultLength);
+                     break;
+		  case MEMORY_AREA_NO_ACCESS:
+	             Info->Type = 0;
+                     Info->State = MEM_FREE;
+	             Info->Protect = MemoryArea->Attributes;
+		     Info->AllocationProtect = MemoryArea->Attributes;
+                     Info->BaseAddress = MemoryArea->BaseAddress;
+	             Info->AllocationBase = MemoryArea->BaseAddress;
+	             Info->RegionSize = MemoryArea->Length;
+                     Status = STATUS_SUCCESS;
+                     ResultLength = sizeof(MEMORY_BASIC_INFORMATION);
+	             break;
+		  case MEMORY_AREA_SHARED_DATA:
+	             Info->Type = 0;
+                     Info->State = MEM_COMMIT;
+	             Info->Protect = MemoryArea->Attributes;
+		     Info->AllocationProtect = MemoryArea->Attributes;
+                     Info->BaseAddress = MemoryArea->BaseAddress;
+	             Info->AllocationBase = MemoryArea->BaseAddress;
+	             Info->RegionSize = MemoryArea->Length;
+                     Status = STATUS_SUCCESS;
+                     ResultLength = sizeof(MEMORY_BASIC_INFORMATION);
+		     break;
+		  default:
+	             Status = STATUS_UNSUCCESSFUL;
+                     ResultLength = 0;
+	       }
+	    }
             break;
          }
 
@@ -213,7 +250,20 @@ NtQueryVirtualMemory (IN HANDLE ProcessHandle,
    }
 
    MmUnlockAddressSpace(AddressSpace);
-   ObDereferenceObject(Process);
+   if (Address < (PVOID)KERNEL_BASE)
+   {
+      ObDereferenceObject(Process);
+   }
+
+   if (NT_SUCCESS(Status) && ResultLength > 0)
+   {
+      Status = MmCopyToCaller(VirtualMemoryInformation, &VirtualMemoryInfo, ResultLength);
+      if (!NT_SUCCESS(Status))
+      {
+         ResultLength = 0;
+      }
+   }
+   
    if (UnsafeResultLength != NULL)
    {
       MmCopyToCaller(UnsafeResultLength, &ResultLength, sizeof(ULONG));
diff --git a/reactos/ntoskrnl/ps/create.c b/reactos/ntoskrnl/ps/create.c
index afca150bba6..7ac5cba25c7 100644
--- a/reactos/ntoskrnl/ps/create.c
+++ b/reactos/ntoskrnl/ps/create.c
@@ -1,4 +1,4 @@
-/* $Id: create.c,v 1.73 2004/03/24 22:00:39 ea Exp $
+/* $Id: create.c,v 1.74 2004/07/10 17:01:03 hbirr Exp $
  *
  * COPYRIGHT:              See COPYING in the top level directory
  * PROJECT:                ReactOS kernel
@@ -481,7 +481,7 @@ PsCreateTeb(HANDLE ProcessHandle,
 
    while (TRUE)
      {
-	Status = NtQueryVirtualMemory(ProcessHandle,
+	Status = ZwQueryVirtualMemory(ProcessHandle,
 				      TebBase,
 				      MemoryBasicInformation,
 				      &Info,
@@ -489,14 +489,14 @@ PsCreateTeb(HANDLE ProcessHandle,
 				      &ResultLength);
 	if (!NT_SUCCESS(Status))
 	  {
-	     CPRINT("NtQueryVirtualMemory (Status %x)\n", Status);
+	     CPRINT("ZwQueryVirtualMemory (Status %x)\n", Status);
 	     KEBUGCHECK(0);
 	  }
 	/* FIXME: Race between this and the above check */
 	if (Info.State == MEM_FREE)
 	  {
 	     /* The TEB must reside in user space */
-	     Status = NtAllocateVirtualMemory(ProcessHandle,
+	     Status = ZwAllocateVirtualMemory(ProcessHandle,
 					      &TebBase,
 					      0,
 					      &TebSize,

From 43a041190d325c5885ba97c5e482ed87caf21370 Mon Sep 17 00:00:00 2001
From: Steven Edwards <winehacker@gmail.com>
Date: Sat, 10 Jul 2004 21:11:13 +0000
Subject: [PATCH 247/356] Removed Microsoft code.

svn path=/trunk/; revision=10066
---
 reactos/lib/mmdrv/auxil.c | 39 ---------------------------------------
 1 file changed, 39 deletions(-)

diff --git a/reactos/lib/mmdrv/auxil.c b/reactos/lib/mmdrv/auxil.c
index c4f6308060c..4d1ea8b4f05 100644
--- a/reactos/lib/mmdrv/auxil.c
+++ b/reactos/lib/mmdrv/auxil.c
@@ -36,43 +36,4 @@ APIENTRY DWORD auxMessage(UINT uDevice,
 	}
 
     return MMSYSERR_NOERROR;
-
-
-// WARNING: MS Code -- delete as soon as possible !
-/*    MMRESULT mRet;
-    AUX_DD_VOLUME Volume;
-
-    switch (uMsg) {
-    case AUXDM_GETDEVCAPS:
-        dprintf2(("AUXDM_GETDEVCAPS"));
-        return sndGetData(AuxDevice, uDevice, dwParam2, (LPBYTE)dwParam1,
-                          IOCTL_AUX_GET_CAPABILITIES);
-
-    case AUXDM_GETNUMDEVS:
-        dprintf2(("AUXDM_GETNUMDEVS"));
-        return sndGetNumDevs(AuxDevice);
-
-    case AUXDM_GETVOLUME:
-        dprintf2(("AUXDM_GETVOLUME"));
-
-        mRet = sndGetData(AuxDevice, uDevice, sizeof(Volume),
-                          (PBYTE)&Volume, IOCTL_AUX_GET_VOLUME);
-
-        if (mRet == MMSYSERR_NOERROR) {
-            *(LPDWORD)dwParam1 =
-                (DWORD)MAKELONG(HIWORD(Volume.Left),
-                                HIWORD(Volume.Right));
-        }
-
-        return mRet;
-
-    case AUXDM_SETVOLUME:
-        dprintf2(("AUXDM_SETVOLUME"));
-        Volume.Left = LOWORD(dwParam1) << 16;
-        Volume.Right = HIWORD(dwParam1) << 16;
-
-        return sndSetData(AuxDevice, uDevice, sizeof(Volume),
-                          (PBYTE)&Volume, IOCTL_AUX_SET_VOLUME);
-    }
-*/
 }

From e32637bc50d473b974656d3ca9eae6484e43edf9 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Sat, 10 Jul 2004 21:15:26 +0000
Subject: [PATCH 248/356] Fix default DACL of the logon token.

svn path=/trunk/; revision=10067
---
 reactos/lib/advapi32/misc/logon.c | 98 +++++++++++++++++++++----------
 1 file changed, 68 insertions(+), 30 deletions(-)

diff --git a/reactos/lib/advapi32/misc/logon.c b/reactos/lib/advapi32/misc/logon.c
index 9059f09038e..6935632a9d2 100644
--- a/reactos/lib/advapi32/misc/logon.c
+++ b/reactos/lib/advapi32/misc/logon.c
@@ -1,4 +1,4 @@
-/* $Id: logon.c,v 1.8 2004/07/10 13:12:24 ekohl Exp $
+/* $Id: logon.c,v 1.9 2004/07/10 21:15:26 ekohl Exp $
  *
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS system libraries
@@ -579,7 +579,8 @@ LogonUserW (LPWSTR lpszUsername,
   PSID UserSid = NULL;
   PSID PrimaryGroupSid = NULL;
   PSID OwnerSid = NULL;
-  ACL Dacl;
+  PSID LocalSystemSid;
+  PACL Dacl;
   NTSTATUS Status;
   SID_IDENTIFIER_AUTHORITY SystemAuthority = {SECURITY_NT_AUTHORITY};
   unsigned i;
@@ -626,7 +627,7 @@ LogonUserW (LPWSTR lpszUsername,
 				  &OwnerSid);
   if (NULL == TokenGroups)
     {
-      RtlFreeSid (UserSid);
+      RtlFreeSid(UserSid);
       SetLastError(ERROR_OUTOFMEMORY);
       return FALSE;
     }
@@ -639,7 +640,7 @@ LogonUserW (LPWSTR lpszUsername,
   if (NULL == TokenPrivileges)
     {
       FreeGroupSids(TokenGroups);
-      RtlFreeSid (UserSid);
+      RtlFreeSid(UserSid);
       SetLastError(ERROR_OUTOFMEMORY);
       return FALSE;
     }
@@ -661,48 +662,85 @@ LogonUserW (LPWSTR lpszUsername,
 
   TokenOwner.Owner = OwnerSid;
   TokenPrimaryGroup.PrimaryGroup = PrimaryGroupSid;
-//  TokenPrimaryGroup.PrimaryGroup = UserSid;
 
-  Status = RtlCreateAcl (&Dacl, sizeof(ACL), ACL_REVISION);
-  if (!NT_SUCCESS(Status))
+
+  Dacl = RtlAllocateHeap(GetProcessHeap(), 0, 1024);
+  if (Dacl == NULL)
     {
       FreeGroupSids(TokenGroups);
-      RtlFreeHeap(GetProcessHeap(), 0, TokenPrivileges);
-      RtlFreeSid (UserSid);
+      RtlFreeSid(UserSid);
+      SetLastError(ERROR_OUTOFMEMORY);
       return FALSE;
     }
 
-  TokenDefaultDacl.DefaultDacl = &Dacl;
-
-  memcpy (TokenSource.SourceName,
-	  "**ANON**",
-	  8);
-  Status = NtAllocateLocallyUniqueId (&TokenSource.SourceIdentifier);
+  Status = RtlCreateAcl(Dacl, 1024, ACL_REVISION);
   if (!NT_SUCCESS(Status))
     {
+      RtlFreeHeap(GetProcessHeap(), 0, Dacl);
       FreeGroupSids(TokenGroups);
       RtlFreeHeap(GetProcessHeap(), 0, TokenPrivileges);
-      RtlFreeSid (UserSid);
+      RtlFreeSid(UserSid);
       return FALSE;
     }
 
-  Status = NtCreateToken (phToken,
-			  TOKEN_ALL_ACCESS,
-			  &ObjectAttributes,
-			  TokenPrimary,
-			  &AuthenticationId,
-			  &ExpirationTime,
-			  &TokenUser,
-			  TokenGroups,
-			  TokenPrivileges,
-			  &TokenOwner,
-			  &TokenPrimaryGroup,
-			  &TokenDefaultDacl,
-			  &TokenSource);
+  RtlAddAccessAllowedAce(Dacl,
+			 ACL_REVISION,
+			 GENERIC_ALL,
+			 OwnerSid);
 
+  RtlAllocateAndInitializeSid(&SystemAuthority,
+			      1,
+			      SECURITY_LOCAL_SYSTEM_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      SECURITY_NULL_RID,
+			      &LocalSystemSid);
+
+  /* SID: S-1-5-18 */
+  RtlAddAccessAllowedAce(Dacl,
+			 ACL_REVISION,
+			 GENERIC_ALL,
+			 LocalSystemSid);
+
+  RtlFreeSid(LocalSystemSid);
+
+  TokenDefaultDacl.DefaultDacl = Dacl;
+
+  memcpy(TokenSource.SourceName,
+	 "User32  ",
+	 8);
+  Status = NtAllocateLocallyUniqueId(&TokenSource.SourceIdentifier);
+  if (!NT_SUCCESS(Status))
+    {
+      RtlFreeHeap(GetProcessHeap(), 0, Dacl);
+      FreeGroupSids(TokenGroups);
+      RtlFreeHeap(GetProcessHeap(), 0, TokenPrivileges);
+      RtlFreeSid(UserSid);
+      return FALSE;
+    }
+
+  Status = NtCreateToken(phToken,
+			 TOKEN_ALL_ACCESS,
+			 &ObjectAttributes,
+			 TokenPrimary,
+			 &AuthenticationId,
+			 &ExpirationTime,
+			 &TokenUser,
+			 TokenGroups,
+			 TokenPrivileges,
+			 &TokenOwner,
+			 &TokenPrimaryGroup,
+			 &TokenDefaultDacl,
+			 &TokenSource);
+
+  RtlFreeHeap(GetProcessHeap(), 0, Dacl);
   FreeGroupSids(TokenGroups);
   RtlFreeHeap(GetProcessHeap(), 0, TokenPrivileges);
-  RtlFreeSid (UserSid);
+  RtlFreeSid(UserSid);
 
   return NT_SUCCESS(Status);
 }

From 2396faea94b68ed751a58809063c2f754dbb1111 Mon Sep 17 00:00:00 2001
From: Steven Edwards <winehacker@gmail.com>
Date: Sat, 10 Jul 2004 21:19:46 +0000
Subject: [PATCH 249/356] Added msvfw32 ported from Wine. This fixes bug 388.

svn path=/trunk/; revision=10068
---
 reactos/lib/msvideo/.cvsignore            |    9 +
 reactos/lib/msvideo/Makefile              |    9 +
 reactos/lib/msvideo/Makefile.in           |   22 +
 reactos/lib/msvideo/Makefile.ros-template |   21 +
 reactos/lib/msvideo/drawdib.c             |  463 +++++++
 reactos/lib/msvideo/mciwnd.c              | 1419 +++++++++++++++++++++
 reactos/lib/msvideo/msvfw32.rc            |   38 +
 reactos/lib/msvideo/msvfw32.spec          |   51 +
 reactos/lib/msvideo/msvfw32.spec.def      |   43 +
 reactos/lib/msvideo/msvideo.spec          |   68 +
 reactos/lib/msvideo/msvideo16.c           |  910 +++++++++++++
 reactos/lib/msvideo/msvideo_main.c        | 1184 +++++++++++++++++
 reactos/lib/msvideo/msvideo_private.h     |   65 +
 reactos/lib/msvideo/vfw16.h               |  130 ++
 14 files changed, 4432 insertions(+)
 create mode 100644 reactos/lib/msvideo/.cvsignore
 create mode 100644 reactos/lib/msvideo/Makefile
 create mode 100644 reactos/lib/msvideo/Makefile.in
 create mode 100644 reactos/lib/msvideo/Makefile.ros-template
 create mode 100644 reactos/lib/msvideo/drawdib.c
 create mode 100644 reactos/lib/msvideo/mciwnd.c
 create mode 100644 reactos/lib/msvideo/msvfw32.rc
 create mode 100644 reactos/lib/msvideo/msvfw32.spec
 create mode 100644 reactos/lib/msvideo/msvfw32.spec.def
 create mode 100644 reactos/lib/msvideo/msvideo.spec
 create mode 100644 reactos/lib/msvideo/msvideo16.c
 create mode 100644 reactos/lib/msvideo/msvideo_main.c
 create mode 100644 reactos/lib/msvideo/msvideo_private.h
 create mode 100644 reactos/lib/msvideo/vfw16.h

diff --git a/reactos/lib/msvideo/.cvsignore b/reactos/lib/msvideo/.cvsignore
new file mode 100644
index 00000000000..8f3b3e45db8
--- /dev/null
+++ b/reactos/lib/msvideo/.cvsignore
@@ -0,0 +1,9 @@
+*.coff
+*.dll
+*.sym
+*.o
+*.d
+*.map
+*.tmp
+Makefile.ros
+oleaut32.spec.def
diff --git a/reactos/lib/msvideo/Makefile b/reactos/lib/msvideo/Makefile
new file mode 100644
index 00000000000..36ab3ede514
--- /dev/null
+++ b/reactos/lib/msvideo/Makefile
@@ -0,0 +1,9 @@
+# $Id: Makefile,v 1.1 2004/07/10 21:19:46 sedwards Exp $
+
+PATH_TO_TOP = ../..
+
+TARGET_TYPE = winedll
+
+include $(PATH_TO_TOP)/rules.mak
+
+include $(TOOLS_PATH)/helper.mk
diff --git a/reactos/lib/msvideo/Makefile.in b/reactos/lib/msvideo/Makefile.in
new file mode 100644
index 00000000000..b52a912c7be
--- /dev/null
+++ b/reactos/lib/msvideo/Makefile.in
@@ -0,0 +1,22 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = msvfw32.dll
+IMPORTS   = winmm comctl32 version user32 gdi32 advapi32 kernel32 ntdll
+ALTNAMES  = msvideo.dll
+EXTRALIBS = $(LIBUNICODE)
+
+SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
+
+C_SRCS = \
+	mciwnd.c \
+	msvideo_main.c \
+	drawdib.c
+
+C_SRCS16 = \
+	msvideo16.c
+
+@MAKE_DLL_RULES@
+
+### Dependencies:
diff --git a/reactos/lib/msvideo/Makefile.ros-template b/reactos/lib/msvideo/Makefile.ros-template
new file mode 100644
index 00000000000..6bca328078d
--- /dev/null
+++ b/reactos/lib/msvideo/Makefile.ros-template
@@ -0,0 +1,21 @@
+# $Id: Makefile.ros-template,v 1.1 2004/07/10 21:19:46 sedwards Exp $
+
+TARGET_NAME = msvfw32
+
+TARGET_OBJECTS = @C_SRCS@
+
+TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__
+
+TARGET_SDKLIBS = @IMPORTS@ libwine.a wine_uuid.a ntdll.a
+
+TARGET_BASE = $(TARGET_BASE_LIB_WINMM)
+
+TARGET_RC_SRCS = @RC_SRCS@
+TARGET_RC_BINSRC = @RC_BINSRC@
+TARGET_RC_BINARIES = @RC_BINARIES@
+
+default: all
+
+DEP_OBJECTS = $(TARGET_OBJECTS)
+
+include $(TOOLS_PATH)/depend.mk
diff --git a/reactos/lib/msvideo/drawdib.c b/reactos/lib/msvideo/drawdib.c
new file mode 100644
index 00000000000..fa4c92ff35a
--- /dev/null
+++ b/reactos/lib/msvideo/drawdib.c
@@ -0,0 +1,463 @@
+/*
+ * Copyright 2000 Bradley Baetz
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * FIXME: Some flags are ignored
+ *
+ * Handle palettes
+ */
+
+#include <string.h>
+#include "msvideo_private.h"
+
+#include "wingdi.h"
+#include "winuser.h"
+
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvideo);
+
+typedef struct tagWINE_HDD {
+    HDC                 hdc;
+    INT                 dxDst;
+    INT                 dyDst;
+    LPBITMAPINFOHEADER  lpbi;
+    INT                 dxSrc;
+    INT                 dySrc;
+    HPALETTE            hpal;		/* Palette to use for the DIB */
+    BOOL                begun;		/* DrawDibBegin has been called */
+    LPBITMAPINFOHEADER  lpbiOut;	/* Output format */
+    HIC                 hic;		/* HIC for decompression */
+    HDC                 hMemDC;		/* DC for buffering */
+    HBITMAP             hOldDib;	/* Original Dib */
+    HBITMAP             hDib;		/* DibSection */
+    LPVOID              lpvbits;	/* Buffer for holding decompressed dib */
+    HDRAWDIB            hSelf;
+    struct tagWINE_HDD* next;
+} WINE_HDD;
+
+int num_colours(LPBITMAPINFOHEADER lpbi)
+{
+	if(lpbi->biClrUsed)
+		return lpbi->biClrUsed;
+	if(lpbi->biBitCount<=8)
+		return 1<<lpbi->biBitCount;
+	return 0;
+}
+
+static WINE_HDD*        HDD_FirstHdd /* = NULL */;
+
+static WINE_HDD*       MSVIDEO_GetHddPtr(HDRAWDIB hd)
+{
+    WINE_HDD*   hdd;
+
+    for (hdd = HDD_FirstHdd; hdd != NULL && hdd->hSelf != hd; hdd = hdd->next);
+    return hdd;
+}
+
+static DWORD HDD_HandleRef = 1;
+
+/***********************************************************************
+ *		DrawDibOpen		[MSVFW32.@]
+ */
+HDRAWDIB VFWAPI DrawDibOpen(void) 
+{
+    WINE_HDD*   whdd;
+
+    TRACE("(void)\n");
+	
+    whdd = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WINE_HDD));
+    TRACE("=> %p\n", whdd);
+
+    while (MSVIDEO_GetHddPtr((HDRAWDIB)HDD_HandleRef) != NULL) HDD_HandleRef++;
+    whdd->hSelf = (HDRAWDIB)HDD_HandleRef++;
+
+    whdd->next = HDD_FirstHdd;
+    HDD_FirstHdd = whdd;
+
+    return whdd->hSelf;
+}
+
+/***********************************************************************
+ *		DrawDibClose		[MSVFW32.@]
+ */
+BOOL VFWAPI DrawDibClose(HDRAWDIB hdd) 
+{
+    WINE_HDD* whdd = MSVIDEO_GetHddPtr(hdd);
+    WINE_HDD** p;
+
+    TRACE("(%p)\n", hdd);
+
+    if (!whdd) return FALSE;
+
+    if (whdd->begun) DrawDibEnd(hdd);
+
+    for (p = &HDD_FirstHdd; *p != NULL; p = &((*p)->next))
+    {
+        if (*p == whdd)
+        {
+            *p = whdd->next;
+            break;
+        }
+    }
+
+    HeapFree(GetProcessHeap(), 0, whdd);
+
+    return TRUE;
+}
+
+/***********************************************************************
+ *		DrawDibEnd		[MSVFW32.@]
+ */
+BOOL VFWAPI DrawDibEnd(HDRAWDIB hdd) 
+{
+    BOOL ret = TRUE;
+    WINE_HDD *whdd = MSVIDEO_GetHddPtr(hdd);
+
+    TRACE("(%p)\n", hdd);
+
+    whdd->hpal = 0; /* Do not free this */
+    whdd->hdc = 0;
+    if (whdd->lpbi) 
+    {
+        HeapFree(GetProcessHeap(), 0, whdd->lpbi);
+        whdd->lpbi = NULL;
+    }
+    if (whdd->lpbiOut) 
+    {
+        HeapFree(GetProcessHeap(), 0, whdd->lpbiOut);
+        whdd->lpbiOut = NULL;
+    }
+
+    whdd->begun = FALSE;
+
+    /*if (whdd->lpvbits)
+      HeapFree(GetProcessHeap(), 0, whdd->lpvbuf);*/
+
+    if (whdd->hMemDC) 
+    {
+        SelectObject(whdd->hMemDC, whdd->hOldDib);
+        DeleteDC(whdd->hMemDC);
+        whdd->hMemDC = 0;
+    }
+
+    if (whdd->hDib) DeleteObject(whdd->hDib);
+    whdd->hDib = 0;
+
+    if (whdd->hic) 
+    {
+        ICDecompressEnd(whdd->hic);
+        ICClose(whdd->hic);
+        whdd->hic = 0;
+    }
+
+    whdd->lpvbits = NULL;
+
+    return ret;
+}
+
+/***********************************************************************
+ *              DrawDibBegin            [MSVFW32.@]
+ */
+BOOL VFWAPI DrawDibBegin(HDRAWDIB hdd,
+                         HDC      hdc,
+                         INT      dxDst,
+                         INT      dyDst,
+                         LPBITMAPINFOHEADER lpbi,
+                         INT      dxSrc,
+                         INT      dySrc,
+                         UINT     wFlags) 
+{
+    BOOL ret = TRUE;
+    WINE_HDD *whdd;
+
+    TRACE("(%p,%p,%d,%d,%p,%d,%d,0x%08lx)\n",
+          hdd, hdc, dxDst, dyDst, lpbi, dxSrc, dySrc, (DWORD)wFlags);
+
+    TRACE("lpbi: %ld,%ld/%ld,%d,%d,%ld,%ld,%ld,%ld,%ld,%ld\n",
+          lpbi->biSize, lpbi->biWidth, lpbi->biHeight, lpbi->biPlanes,
+          lpbi->biBitCount, lpbi->biCompression, lpbi->biSizeImage,
+          lpbi->biXPelsPerMeter, lpbi->biYPelsPerMeter, lpbi->biClrUsed,
+          lpbi->biClrImportant);
+
+    if (wFlags & ~(DDF_BUFFER))
+        FIXME("wFlags == 0x%08x not handled\n", wFlags & ~(DDF_BUFFER));
+
+    whdd = MSVIDEO_GetHddPtr(hdd);
+    if (!whdd) return FALSE;
+
+    if (whdd->begun) DrawDibEnd(hdd);
+
+    if (lpbi->biCompression) 
+    {
+        DWORD size = 0;
+
+        whdd->hic = ICOpen(ICTYPE_VIDEO, lpbi->biCompression, ICMODE_DECOMPRESS);
+        if (!whdd->hic) 
+        {
+            WARN("Could not open IC. biCompression == 0x%08lx\n", lpbi->biCompression);
+            ret = FALSE;
+        }
+
+        if (ret) 
+        {
+            size = ICDecompressGetFormat(whdd->hic, lpbi, NULL);
+            if (size == ICERR_UNSUPPORTED) 
+            {
+                WARN("Codec doesn't support GetFormat, giving up.\n");
+                ret = FALSE;
+            }
+        }
+
+        if (ret) 
+        {
+            whdd->lpbiOut = HeapAlloc(GetProcessHeap(), 0, size);
+
+            if (ICDecompressGetFormat(whdd->hic, lpbi, whdd->lpbiOut) != ICERR_OK)
+                ret = FALSE;
+        }
+
+        if (ret) 
+        {
+            /* FIXME: Use Ex functions if available? */
+            if (ICDecompressBegin(whdd->hic, lpbi, whdd->lpbiOut) != ICERR_OK)
+                ret = FALSE;
+            
+            TRACE("biSizeImage == %ld\n", whdd->lpbiOut->biSizeImage);
+            TRACE("biCompression == %ld\n", whdd->lpbiOut->biCompression);
+            TRACE("biBitCount == %d\n", whdd->lpbiOut->biBitCount);
+        }
+    }
+    else 
+    {
+        DWORD dwSize;
+        /* No compression */
+        TRACE("Not compressed!\n");
+        dwSize = lpbi->biSize + num_colours(lpbi)*sizeof(RGBQUAD);
+        whdd->lpbiOut = HeapAlloc(GetProcessHeap(), 0, dwSize);
+        memcpy(whdd->lpbiOut, lpbi, dwSize);
+    }
+
+    if (ret) 
+    {
+        /*whdd->lpvbuf = HeapAlloc(GetProcessHeap(), 0, whdd->lpbiOut->biSizeImage);*/
+
+        whdd->hMemDC = CreateCompatibleDC(hdc);
+        TRACE("Creating: %ld, %p\n", whdd->lpbiOut->biSize, whdd->lpvbits);
+        whdd->hDib = CreateDIBSection(whdd->hMemDC, (BITMAPINFO *)whdd->lpbiOut, DIB_RGB_COLORS, &(whdd->lpvbits), 0, 0);
+        if (!whdd->hDib) 
+        {
+            TRACE("Error: %ld\n", GetLastError());
+        }
+        TRACE("Created: %p,%p\n", whdd->hDib, whdd->lpvbits);
+        whdd->hOldDib = SelectObject(whdd->hMemDC, whdd->hDib);
+    }
+
+    if (ret) 
+    {
+        whdd->hdc = hdc;
+        whdd->dxDst = dxDst;
+        whdd->dyDst = dyDst;
+        whdd->lpbi = HeapAlloc(GetProcessHeap(), 0, lpbi->biSize);
+        memcpy(whdd->lpbi, lpbi, lpbi->biSize);
+        whdd->dxSrc = dxSrc;
+        whdd->dySrc = dySrc;
+        whdd->begun = TRUE;
+        whdd->hpal = 0;
+    } 
+    else 
+    {
+        if (whdd->hic)
+            ICClose(whdd->hic);
+        if (whdd->lpbiOut) 
+        {
+            HeapFree(GetProcessHeap(), 0, whdd->lpbiOut);
+            whdd->lpbiOut = NULL;
+        }
+    }
+
+    return ret;
+}
+
+/**********************************************************************
+ *		DrawDibDraw		[MSVFW32.@]
+ */
+BOOL VFWAPI DrawDibDraw(HDRAWDIB hdd, HDC hdc,
+                        INT xDst, INT yDst, INT dxDst, INT dyDst,
+                        LPBITMAPINFOHEADER lpbi,
+                        LPVOID lpBits,
+                        INT xSrc, INT ySrc, INT dxSrc, INT dySrc,
+                        UINT wFlags)
+{
+    WINE_HDD *whdd;
+    BOOL ret = TRUE;
+
+    TRACE("(%p,%p,%d,%d,%d,%d,%p,%p,%d,%d,%d,%d,0x%08lx)\n",
+          hdd, hdc, xDst, yDst, dxDst, dyDst, lpbi, lpBits, xSrc, ySrc, dxSrc, dySrc, (DWORD)wFlags);
+
+    whdd = MSVIDEO_GetHddPtr(hdd);
+    if (!whdd) return FALSE;
+
+    if (wFlags & ~(DDF_SAME_HDC | DDF_SAME_DRAW | DDF_NOTKEYFRAME | DDF_UPDATE | DDF_DONTDRAW))
+        FIXME("wFlags == 0x%08lx not handled\n", (DWORD)wFlags);
+
+    if (!lpBits) 
+    {
+        /* Undocumented? */
+        lpBits = (LPSTR)lpbi + (WORD)(lpbi->biSize) + (WORD)(num_colours(lpbi)*sizeof(RGBQUAD));
+    }
+
+
+#define CHANGED(x) (whdd->x != x)
+
+    if ((!whdd->begun) || 
+        (!(wFlags & DDF_SAME_HDC) && CHANGED(hdc)) || 
+        (!(wFlags & DDF_SAME_DRAW) && (CHANGED(lpbi) || CHANGED(dxSrc) || CHANGED(dySrc) || CHANGED(dxDst) || CHANGED(dyDst)))) 
+    {
+        TRACE("Something changed!\n");
+        ret = DrawDibBegin(hdd, hdc, dxDst, dyDst, lpbi, dxSrc, dySrc, 0);
+    }
+
+#undef CHANGED
+
+    if ((dxDst == -1) && (dyDst == -1)) 
+    {
+        dxDst = dxSrc;
+        dyDst = dySrc;
+    }
+
+    if (!(wFlags & DDF_UPDATE)) 
+    {
+        /* biSizeImage may be set to 0 for BI_RGB (uncompressed) bitmaps */
+        if ((lpbi->biCompression == BI_RGB) && (lpbi->biSizeImage == 0))
+            lpbi->biSizeImage = ((lpbi->biWidth * lpbi->biBitCount + 31) / 32) * 4 * lpbi->biHeight;
+
+        if (lpbi->biCompression) 
+        {
+            DWORD flags = 0;
+
+            TRACE("Compression == 0x%08lx\n", lpbi->biCompression);
+
+            if (wFlags & DDF_NOTKEYFRAME)
+                flags |= ICDECOMPRESS_NOTKEYFRAME;
+
+            ICDecompress(whdd->hic, flags, lpbi, lpBits, whdd->lpbiOut, whdd->lpvbits);
+        }
+        else
+        {
+            memcpy(whdd->lpvbits, lpBits, lpbi->biSizeImage);
+        }
+    }
+    if (!(wFlags & DDF_DONTDRAW) && whdd->hpal)
+        SelectPalette(hdc, whdd->hpal, FALSE);
+
+    if (!(StretchBlt(whdd->hdc, xDst, yDst, dxDst, dyDst, whdd->hMemDC, xSrc, ySrc, dxSrc, dySrc, SRCCOPY)))
+        ret = FALSE;
+    
+    return ret;
+}
+
+/*************************************************************************
+ *		DrawDibStart		[MSVFW32.@]
+ */
+BOOL VFWAPI DrawDibStart(HDRAWDIB hdd, DWORD rate) {
+	FIXME("(%p, %ld), stub\n", hdd, rate);
+	return TRUE;
+}
+
+/*************************************************************************
+ *		DrawDibStop		[MSVFW32.@]
+ */
+BOOL VFWAPI DrawDibStop(HDRAWDIB hdd) {
+	FIXME("(%p), stub\n", hdd);
+	return TRUE;
+}
+
+/***********************************************************************
+ *              DrawDibSetPalette       [MSVFW32.@]
+ */
+BOOL VFWAPI DrawDibSetPalette(HDRAWDIB hdd, HPALETTE hpal) 
+{
+    WINE_HDD *whdd;
+
+    TRACE("(%p, %p)\n", hdd, hpal);
+
+    whdd = MSVIDEO_GetHddPtr(hdd);
+    if (!whdd) return FALSE;
+
+    whdd->hpal = hpal;
+
+    if (whdd->begun) 
+    {
+        SelectPalette(whdd->hdc, hpal, 0);
+        RealizePalette(whdd->hdc);
+    }
+
+    return TRUE;
+}
+
+/***********************************************************************
+ *              DrawDibGetPalette       [MSVFW32.@]
+ */
+HPALETTE VFWAPI DrawDibGetPalette(HDRAWDIB hdd) 
+{
+    WINE_HDD *whdd;
+
+    TRACE("(%p)\n", hdd);
+
+    whdd = MSVIDEO_GetHddPtr(hdd);
+    if (!whdd) return FALSE;
+
+    return whdd->hpal;
+}
+
+/***********************************************************************
+ *              DrawDibRealize          [MSVFW32.@]
+ */
+UINT VFWAPI DrawDibRealize(HDRAWDIB hdd, HDC hdc, BOOL fBackground) 
+{
+    WINE_HDD *whdd;
+    HPALETTE oldPal;
+    UINT ret = 0;
+
+    FIXME("(%p, %p, %d), stub\n", hdd, hdc, fBackground);
+
+    whdd = MSVIDEO_GetHddPtr(hdd);
+    if (!whdd) return FALSE;
+
+    if (!whdd || !(whdd->begun)) 
+    {
+        ret = 0;
+        goto out;
+    }
+
+    if (!whdd->hpal)
+        whdd->hpal = CreateHalftonePalette(hdc);
+
+    oldPal = SelectPalette(hdc, whdd->hpal, fBackground);
+    ret = RealizePalette(hdc);
+
+ out:
+    TRACE("=> %u\n", ret);
+    return ret;
+}
+
+DWORD VFWAPI DrawDibProfileDisplay(LPBITMAPINFOHEADER lpbi)
+{
+    FIXME("(%p) stub\n", lpbi);
+
+    return PD_CAN_DRAW_DIB;
+}
diff --git a/reactos/lib/msvideo/mciwnd.c b/reactos/lib/msvideo/mciwnd.c
new file mode 100644
index 00000000000..9260c01e719
--- /dev/null
+++ b/reactos/lib/msvideo/mciwnd.c
@@ -0,0 +1,1419 @@
+/*
+ * Copyright 2000 Eric Pouech
+ * Copyright 2003 Dmitry Timoshkov
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * FIXME:
+ * Add support for all remaining MCI_ commands and MCIWNDM_ messages.
+ * Add support for MCIWNDF_RECORD.
+ */
+
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winreg.h"
+#include "winternl.h"
+#include "vfw.h"
+#include "digitalv.h"
+#include "commctrl.h"
+#include "wine/unicode.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(mci);
+
+extern HMODULE MSVFW32_hModule;
+static const WCHAR mciWndClassW[] = {'M','C','I','W','n','d','C','l','a','s','s',0};
+
+typedef struct
+{
+    DWORD       dwStyle;
+    MCIDEVICEID mci;
+    HDRVR       hdrv;
+    int         alias;
+    UINT        dev_type;
+    UINT        mode;
+    long        position;
+    SIZE        size; /* size of the original frame rect */
+    int         zoom;
+    LPWSTR      lpName;
+    HWND        hWnd, hwndOwner;
+    UINT        uTimer;
+    MCIERROR    lasterror;
+    WCHAR       return_string[128];
+    WORD        active_timer, inactive_timer;
+} MCIWndInfo;
+
+static LRESULT WINAPI MCIWndProc(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam);
+
+#define CTL_PLAYSTOP    0x3200
+#define CTL_MENU        0x3201
+#define CTL_TRACKBAR    0x3202
+
+/***********************************************************************
+ *                MCIWndRegisterClass                [MSVFW32.@]
+ *
+ * NOTE: Native always uses its own hInstance
+ */
+BOOL VFWAPIV MCIWndRegisterClass(void)
+{
+    WNDCLASSW wc;
+
+    /* Since we are going to register a class belonging to MSVFW32
+     * and later we will create windows with a different hInstance
+     * CS_GLOBALCLASS is needed. And because the second attempt
+     * to register a global class will fail we need to test whether
+     * the class was already registered.
+     */
+    wc.style = CS_VREDRAW | CS_HREDRAW | CS_DBLCLKS | CS_OWNDC | CS_GLOBALCLASS;
+    wc.lpfnWndProc = MCIWndProc;
+    wc.cbClsExtra = 0;
+    wc.cbWndExtra = sizeof(MCIWndInfo*);
+    wc.hInstance = MSVFW32_hModule;
+    wc.hIcon = 0;
+    wc.hCursor = LoadCursorW(0, MAKEINTRESOURCEW(IDC_ARROW));
+    wc.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
+    wc.lpszMenuName = NULL;
+    wc.lpszClassName = mciWndClassW;
+
+    if (RegisterClassW(&wc)) return TRUE;
+    if (GetLastError() == ERROR_CLASS_ALREADY_EXISTS) return TRUE;
+
+    return FALSE;
+}
+
+/***********************************************************************
+ *                MCIWndCreateW                                [MSVFW32.@]
+ */
+HWND VFWAPIV MCIWndCreateW(HWND hwndParent, HINSTANCE hInstance,
+                           DWORD dwStyle, LPCWSTR szFile)
+{
+    TRACE("%p %p %lx %s\n", hwndParent, hInstance, dwStyle, debugstr_w(szFile));
+
+    MCIWndRegisterClass();
+
+    if (!hInstance) hInstance = GetModuleHandleW(0);
+
+    if (hwndParent)
+        dwStyle |= WS_VISIBLE | WS_BORDER /*| WS_CHILD*/;
+    else
+        dwStyle |= WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX;
+
+    return CreateWindowExW(0, mciWndClassW, NULL,
+                           dwStyle | WS_CLIPSIBLINGS | WS_CLIPCHILDREN,
+                           0, 0, 300, 0,
+                           hwndParent, 0, hInstance, (LPVOID)szFile);
+}
+
+/***********************************************************************
+ *                MCIWndCreate                [MSVFW32.@]
+ *                MCIWndCreateA                [MSVFW32.@]
+ */
+HWND VFWAPIV MCIWndCreateA(HWND hwndParent, HINSTANCE hInstance,
+                           DWORD dwStyle, LPCSTR szFile)
+{
+    HWND ret;
+    UNICODE_STRING fileW;
+
+    if (szFile)
+        RtlCreateUnicodeStringFromAsciiz(&fileW, szFile);
+    else
+        fileW.Buffer = NULL;
+
+    ret = MCIWndCreateW(hwndParent, hInstance, dwStyle, fileW.Buffer);
+
+    RtlFreeUnicodeString(&fileW);
+    return ret;
+}
+
+static inline void MCIWND_notify_mode(MCIWndInfo *mwi)
+{
+    if (mwi->dwStyle & MCIWNDF_NOTIFYMODE)
+    {
+        UINT new_mode = SendMessageW(mwi->hWnd, MCIWNDM_GETMODEW, 0, 0);
+        if (new_mode != mwi->mode)
+        {
+            mwi->mode = new_mode;
+            SendMessageW(mwi->hwndOwner, MCIWNDM_NOTIFYMODE, (WPARAM)mwi->hWnd, new_mode);
+        }
+    }
+}
+
+static inline void MCIWND_notify_pos(MCIWndInfo *mwi)
+{
+    if (mwi->dwStyle & MCIWNDF_NOTIFYPOS)
+    {
+        long new_pos = SendMessageW(mwi->hWnd, MCIWNDM_GETPOSITIONW, 0, 0);
+        if (new_pos != mwi->position)
+        {
+            mwi->position = new_pos;
+            SendMessageW(mwi->hwndOwner, MCIWNDM_NOTIFYPOS, (WPARAM)mwi->hWnd, new_pos);
+        }
+    }
+}
+
+static inline void MCIWND_notify_size(MCIWndInfo *mwi)
+{
+    if (mwi->dwStyle & MCIWNDF_NOTIFYSIZE)
+        SendMessageW(mwi->hwndOwner, MCIWNDM_NOTIFYSIZE, (WPARAM)mwi->hWnd, 0);
+}
+
+static inline void MCIWND_notify_error(MCIWndInfo *mwi)
+{
+    if (mwi->dwStyle & MCIWNDF_NOTIFYERROR)
+        SendMessageW(mwi->hwndOwner, MCIWNDM_NOTIFYERROR, (WPARAM)mwi->hWnd, (LPARAM)mwi->lasterror);
+}
+
+static void MCIWND_UpdateState(MCIWndInfo *mwi)
+{
+    WCHAR buffer[1024];
+
+    if (!mwi->mci)
+    {
+        /* FIXME: get this from resources */
+        static const WCHAR no_deviceW[] = {'N','o',' ','D','e','v','i','c','e',0};
+        SetWindowTextW(mwi->hWnd, no_deviceW);
+        return;
+    }
+
+    MCIWND_notify_pos(mwi);
+
+    if (!(mwi->dwStyle & MCIWNDF_NOPLAYBAR))
+        SendDlgItemMessageW(mwi->hWnd, CTL_TRACKBAR, TBM_SETPOS, TRUE, mwi->position);
+
+    if (!(mwi->dwStyle & MCIWNDF_SHOWALL))
+        return;
+
+    if ((mwi->dwStyle & MCIWNDF_SHOWNAME) && mwi->lpName)
+        strcpyW(buffer, mwi->lpName);
+    else
+        *buffer = 0;
+
+    if (mwi->dwStyle & (MCIWNDF_SHOWPOS|MCIWNDF_SHOWMODE))
+    {
+        static const WCHAR spaceW[] = {' ',0};
+        static const WCHAR l_braceW[] = {'(',0};
+
+        if (*buffer) strcatW(buffer, spaceW);
+        strcatW(buffer, l_braceW);
+    }
+
+    if (mwi->dwStyle & MCIWNDF_SHOWPOS)
+    {
+        WCHAR posW[64];
+
+        posW[0] = 0;
+        SendMessageW(mwi->hWnd, MCIWNDM_GETPOSITIONW, 64, (LPARAM)posW);
+        strcatW(buffer, posW);
+    }
+
+    if ((mwi->dwStyle & (MCIWNDF_SHOWPOS|MCIWNDF_SHOWMODE)) == (MCIWNDF_SHOWPOS|MCIWNDF_SHOWMODE))
+    {
+        static const WCHAR dashW[] = {' ','-',' ',0};
+        strcatW(buffer, dashW);
+    }
+
+    if (mwi->dwStyle & MCIWNDF_SHOWMODE)
+    {
+        WCHAR modeW[64];
+
+        modeW[0] = 0;
+        SendMessageW(mwi->hWnd, MCIWNDM_GETMODEW, 64, (LPARAM)modeW);
+        strcatW(buffer, modeW);
+    }
+
+    if (mwi->dwStyle & (MCIWNDF_SHOWPOS|MCIWNDF_SHOWMODE))
+    {
+        static const WCHAR r_braceW[] = {')',0};
+        strcatW(buffer, r_braceW);
+    }
+
+    TRACE("=> '%s'\n", debugstr_w(buffer));
+    SetWindowTextW(mwi->hWnd, buffer);
+}
+
+static LRESULT MCIWND_Create(HWND hWnd, LPCREATESTRUCTW cs)
+{
+    HWND hChld;
+    MCIWndInfo *mwi;
+    static const WCHAR buttonW[] = {'b','u','t','t','o','n',0};
+
+    mwi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*mwi));
+    if (!mwi) return -1;
+
+    SetWindowLongW(hWnd, 0, (LPARAM)mwi);
+
+    mwi->dwStyle = cs->style;
+    /* There is no need to show stats if there is no caption */
+    if ((mwi->dwStyle & WS_CAPTION) != WS_CAPTION)
+        mwi->dwStyle &= ~MCIWNDF_SHOWALL;
+
+    mwi->hWnd = hWnd;
+    mwi->hwndOwner = cs->hwndParent;
+    mwi->active_timer = 500;
+    mwi->inactive_timer = 2000;
+    mwi->mode = MCI_MODE_NOT_READY;
+    mwi->position = -1;
+    mwi->zoom = 100;
+
+    if (!(mwi->dwStyle & MCIWNDF_NOMENU))
+    {
+        static const WCHAR menuW[] = {'M','e','n','u',0};
+
+        hChld = CreateWindowExW(0, buttonW, menuW, WS_CHILD|WS_VISIBLE, 32, cs->cy, 32, 32,
+                                hWnd, (HMENU)CTL_MENU, cs->hInstance, 0L);
+        TRACE("Get Button2: %p\n", hChld);
+    }
+
+    if (!(mwi->dwStyle & MCIWNDF_NOPLAYBAR))
+    {
+        INITCOMMONCONTROLSEX init;
+        static const WCHAR playW[] = {'P','l','a','y',0};
+
+        /* adding the other elements: play/stop button, menu button, status */
+        hChld = CreateWindowExW(0, buttonW, playW, WS_CHILD|WS_VISIBLE, 0, cs->cy, 32, 32,
+                                hWnd, (HMENU)CTL_PLAYSTOP, cs->hInstance, 0L);
+        TRACE("Get Button1: %p\n", hChld);
+
+        init.dwSize = sizeof(init);
+        init.dwICC = ICC_BAR_CLASSES;
+        InitCommonControlsEx(&init);
+
+        hChld = CreateWindowExW(0, TRACKBAR_CLASSW, NULL, WS_CHILD|WS_VISIBLE, 64, cs->cy, cs->cx - 64, 32,
+                                hWnd, (HMENU)CTL_TRACKBAR, cs->hInstance, 0L);
+        TRACE("Get status: %p\n", hChld);
+    }
+
+    /* This sets the default window size */
+    SendMessageW(hWnd, MCI_CLOSE, 0, 0);
+
+    if (cs->lpCreateParams)
+    {
+        LPARAM lParam;
+
+        /* MCI wnd class is prepared to be embedded as an MDI child window */
+        if (cs->dwExStyle & WS_EX_MDICHILD)
+        {
+            MDICREATESTRUCTW *mdics = (MDICREATESTRUCTW *)cs->lpCreateParams;
+            lParam = mdics->lParam;
+        }
+        else
+            lParam = (LPARAM)cs->lpCreateParams;
+
+        /* If it's our internal class pointer, file name is a unicode string */
+        if (cs->lpszClass == mciWndClassW)
+            SendMessageW(hWnd, MCIWNDM_OPENW, 0, lParam);
+        else
+        {
+            /* Otherwise let's try to figure out what string format is used */
+            HWND parent = cs->hwndParent;
+            if (!parent) parent = GetWindow(hWnd, GW_OWNER);
+
+            SendMessageW(hWnd, IsWindowUnicode(parent) ? MCIWNDM_OPENW : MCIWNDM_OPENA, 0, lParam);
+        }
+    }
+
+    return 0;
+}
+
+static void MCIWND_ToggleState(MCIWndInfo *mwi)
+{
+    switch (SendMessageW(mwi->hWnd, MCIWNDM_GETMODEW, 0, 0))
+    {
+    case MCI_MODE_NOT_READY:
+    case MCI_MODE_RECORD:
+    case MCI_MODE_SEEK:
+    case MCI_MODE_OPEN:
+        TRACE("Cannot do much...\n");
+        break;
+
+    case MCI_MODE_PAUSE:
+        SendMessageW(mwi->hWnd, MCI_RESUME, 0, 0);
+        break;
+
+    case MCI_MODE_PLAY:
+        SendMessageW(mwi->hWnd, MCI_PAUSE, 0, 0);
+        break;
+
+    case MCI_MODE_STOP:
+        SendMessageW(mwi->hWnd, MCI_STOP, 0, 0);
+        break;
+    }
+}
+
+static LRESULT MCIWND_Command(MCIWndInfo *mwi, WPARAM wParam, LPARAM lParam)
+{
+    switch (LOWORD(wParam))
+    {
+    case CTL_PLAYSTOP: MCIWND_ToggleState(mwi); break;
+    case CTL_MENU:
+    case CTL_TRACKBAR:
+    default:
+        FIXME("support for command %04x not implement yet\n", LOWORD(wParam));
+    }
+    return 0L;
+}
+
+static void MCIWND_notify_media(MCIWndInfo *mwi)
+{
+    if (mwi->dwStyle & (MCIWNDF_NOTIFYMEDIAA | MCIWNDF_NOTIFYMEDIAW))
+    {
+        if (!mwi->lpName)
+        {
+            static const WCHAR empty_str[1];
+            SendMessageW(mwi->hwndOwner, MCIWNDM_NOTIFYMEDIA, (WPARAM)mwi->hWnd, (LPARAM)empty_str);
+        }
+        else
+        {
+            if (mwi->dwStyle & MCIWNDF_NOTIFYANSI)
+            {
+                char *ansi_name;
+                int len;
+
+                len = WideCharToMultiByte(CP_ACP, 0, mwi->lpName, -1, NULL, 0, NULL, NULL);
+                ansi_name = HeapAlloc(GetProcessHeap(), 0, len);
+                WideCharToMultiByte(CP_ACP, 0, mwi->lpName, -1, ansi_name, len, NULL, NULL);
+
+                SendMessageW(mwi->hwndOwner, MCIWNDM_NOTIFYMEDIA, (WPARAM)mwi->hWnd, (LPARAM)ansi_name);
+
+                HeapFree(GetProcessHeap(), 0, ansi_name);
+            }
+            else
+                SendMessageW(mwi->hwndOwner, MCIWNDM_NOTIFYMEDIA, (WPARAM)mwi->hWnd, (LPARAM)mwi->lpName);
+        }
+    }
+}
+
+static MCIERROR mci_generic_command(MCIWndInfo *mwi, UINT cmd)
+{
+    MCI_GENERIC_PARMS mci_generic;
+
+    mci_generic.dwCallback = 0;
+    mwi->lasterror = mciSendCommandW(mwi->mci, cmd, 0, (DWORD_PTR)&mci_generic);
+
+    if (mwi->lasterror)
+        return mwi->lasterror;
+
+    MCIWND_notify_mode(mwi);
+    MCIWND_UpdateState(mwi);
+    return 0;
+}
+
+static LRESULT mci_get_devcaps(MCIWndInfo *mwi, UINT cap)
+{
+    MCI_GETDEVCAPS_PARMS mci_devcaps;
+
+    mci_devcaps.dwItem = cap;
+    mwi->lasterror = mciSendCommandW(mwi->mci, MCI_GETDEVCAPS,
+                                   MCI_GETDEVCAPS_ITEM,
+                                   (DWORD_PTR)&mci_devcaps);
+    if (mwi->lasterror)
+        return 0;
+
+    return mci_devcaps.dwReturn;
+}
+
+static LRESULT WINAPI MCIWndProc(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam)
+{
+    MCIWndInfo *mwi;
+
+    TRACE("%p %04x %08x %08lx\n", hWnd, wMsg, wParam, lParam);
+
+    mwi = (MCIWndInfo*)GetWindowLongW(hWnd, 0);
+    if (!mwi && wMsg != WM_CREATE)
+        return DefWindowProcW(hWnd, wMsg, wParam, lParam);
+
+    switch (wMsg)
+    {
+    case WM_CREATE:
+        MCIWND_Create(hWnd, (CREATESTRUCTW *)lParam);
+        break;
+
+    case WM_DESTROY:
+        if (mwi->uTimer)
+            KillTimer(hWnd, mwi->uTimer);
+
+        if (mwi->mci)
+            SendMessageW(hWnd, MCI_CLOSE, 0, 0);
+
+        HeapFree(GetProcessHeap(), 0, mwi);
+
+        DestroyWindow(GetDlgItem(hWnd, CTL_MENU));
+        DestroyWindow(GetDlgItem(hWnd, CTL_PLAYSTOP));
+        DestroyWindow(GetDlgItem(hWnd, CTL_TRACKBAR));
+        break;
+
+    case WM_PAINT:
+        {
+            MCI_DGV_UPDATE_PARMS mci_update;
+            PAINTSTRUCT ps;
+
+            mci_update.hDC = (wParam) ? (HDC)wParam : BeginPaint(hWnd, &ps);
+
+            mciSendCommandW(mwi->mci, MCI_UPDATE,
+                            MCI_DGV_UPDATE_HDC | MCI_DGV_UPDATE_PAINT,
+                            (DWORD_PTR)&mci_update);
+
+            if (!wParam) EndPaint(hWnd, &ps);
+            return 1;
+        }
+
+    case WM_COMMAND:
+        return MCIWND_Command(mwi, wParam, lParam);
+
+    case WM_NCACTIVATE:
+        if (mwi->uTimer)
+        {
+            KillTimer(hWnd, mwi->uTimer);
+            mwi->uTimer = SetTimer(hWnd, 1, wParam ? mwi->active_timer : mwi->inactive_timer, NULL);
+        }
+        break;
+
+    case WM_TIMER:
+        MCIWND_UpdateState(mwi);
+        return 0;
+
+    case WM_SIZE:
+        SetWindowPos(GetDlgItem(hWnd, CTL_PLAYSTOP), 0, 0, HIWORD(lParam) - 32, 0, 0, SWP_NOSIZE | SWP_NOACTIVATE);
+        SetWindowPos(GetDlgItem(hWnd, CTL_MENU), 0, 32, HIWORD(lParam) - 32, 0, 0, SWP_NOSIZE | SWP_NOACTIVATE);
+        SetWindowPos(GetDlgItem(hWnd, CTL_TRACKBAR), 0, 64, HIWORD(lParam) - 32, LOWORD(lParam) - 64, 32, SWP_NOACTIVATE);
+
+        if (!(mwi->dwStyle & MCIWNDF_NOAUTOSIZEMOVIE))
+        {
+            RECT rc;
+
+            rc.left = rc.top = 0;
+            rc.right = LOWORD(lParam);
+            rc.bottom = HIWORD(lParam);
+            if (!(mwi->dwStyle & MCIWNDF_NOPLAYBAR))
+                rc.bottom -= 32; /* subtract the height of the playbar */
+            SendMessageW(hWnd, MCIWNDM_PUT_DEST, 0, (LPARAM)&rc);
+        }
+        MCIWND_notify_size(mwi);
+        break;
+
+    case MM_MCINOTIFY:
+        MCIWND_notify_mode(mwi);
+        MCIWND_UpdateState(mwi);
+        return 0;
+
+    case MCIWNDM_OPENA:
+        {
+            UNICODE_STRING nameW;
+            TRACE("MCIWNDM_OPENA %s\n", debugstr_a((LPSTR)lParam));
+            RtlCreateUnicodeStringFromAsciiz(&nameW, (LPCSTR)lParam);
+            lParam = (LPARAM)nameW.Buffer;
+        }
+        /* fall through */
+    case MCIWNDM_OPENW:
+        {
+            RECT rc;
+            HCURSOR hCursor;
+            MCI_OPEN_PARMSW mci_open;
+            MCI_GETDEVCAPS_PARMS mci_devcaps;
+            WCHAR aliasW[64];
+            WCHAR drv_name[MAX_PATH];
+            static const WCHAR formatW[] = {'%','d',0};
+            static const WCHAR mci32W[] = {'m','c','i','3','2',0};
+            static const WCHAR system_iniW[] = {'s','y','s','t','e','m','.','i','n','i',0};
+
+            TRACE("MCIWNDM_OPENW %s\n", debugstr_w((LPWSTR)lParam));
+
+            if (wParam == MCIWNDOPENF_NEW)
+            {
+                SendMessageW(hWnd, MCIWNDM_NEWW, 0, lParam);
+                goto end_of_mci_open;
+            }
+
+            if (mwi->uTimer)
+            {
+                KillTimer(hWnd, mwi->uTimer);
+                mwi->uTimer = 0;
+            }
+
+            hCursor = LoadCursorW(0, (LPWSTR)IDC_WAIT);
+            hCursor = SetCursor(hCursor);
+
+            mci_open.lpstrElementName = (LPWSTR)lParam;
+            wsprintfW(aliasW, formatW, (int)hWnd + 1);
+            mci_open.lpstrAlias = aliasW;
+            mwi->lasterror = mciSendCommandW(mwi->mci, MCI_OPEN,
+                                             MCI_OPEN_ELEMENT | MCI_OPEN_ALIAS | MCI_WAIT,
+                                             (DWORD_PTR)&mci_open);
+            SetCursor(hCursor);
+
+            if (mwi->lasterror && !(mwi->dwStyle & MCIWNDF_NOERRORDLG))
+            {
+                /* FIXME: get the caption from resources */
+                static const WCHAR caption[] = {'M','C','I',' ','E','r','r','o','r',0};
+                WCHAR error_str[MAXERRORLENGTH];
+
+                mciGetErrorStringW(mwi->lasterror, error_str, MAXERRORLENGTH);
+                MessageBoxW(hWnd, error_str, caption, MB_ICONEXCLAMATION | MB_OK);
+                MCIWND_notify_error(mwi);
+                goto end_of_mci_open;
+            }
+
+            mwi->mci = mci_open.wDeviceID;
+            mwi->alias = (int)hWnd + 1;
+
+            mwi->lpName = HeapAlloc(GetProcessHeap(), 0, (strlenW((LPWSTR)lParam) + 1) * sizeof(WCHAR));
+            strcpyW(mwi->lpName, (LPWSTR)lParam);
+
+            MCIWND_UpdateState(mwi);
+
+            mci_devcaps.dwItem = MCI_GETDEVCAPS_DEVICE_TYPE;
+            mwi->lasterror = mciSendCommandW(mwi->mci, MCI_GETDEVCAPS,
+                                             MCI_GETDEVCAPS_ITEM,
+                                             (DWORD_PTR)&mci_devcaps);
+            if (mwi->lasterror)
+            {
+                MCIWND_notify_error(mwi);
+                goto end_of_mci_open;
+            }
+
+            mwi->dev_type = mci_devcaps.dwReturn;
+
+            drv_name[0] = 0;
+            SendMessageW(hWnd, MCIWNDM_GETDEVICEW, 256, (LPARAM)drv_name);
+            if (drv_name[0] && GetPrivateProfileStringW(mci32W, drv_name, NULL,
+                                            drv_name, MAX_PATH, system_iniW))
+                mwi->hdrv = OpenDriver(drv_name, NULL, 0);
+
+            if (mwi->dev_type == MCI_DEVTYPE_DIGITAL_VIDEO)
+            {
+                MCI_DGV_WINDOW_PARMSW mci_window;
+
+                mci_window.hWnd = hWnd;
+                mwi->lasterror = mciSendCommandW(mwi->mci, MCI_WINDOW,
+                                                 MCI_DGV_WINDOW_HWND,
+                                                 (DWORD_PTR)&mci_window);
+                if (mwi->lasterror)
+                {
+                    MCIWND_notify_error(mwi);
+                    goto end_of_mci_open;
+                }
+            }
+
+            if (SendMessageW(hWnd, MCIWNDM_GET_DEST, 0, (LPARAM)&rc) == 0)
+            {
+                mwi->size.cx = rc.right - rc.left;
+                mwi->size.cy = rc.bottom - rc.top;
+
+                rc.right = MulDiv(mwi->size.cx, mwi->zoom, 100);
+                rc.bottom = MulDiv(mwi->size.cy, mwi->zoom, 100);
+                SendMessageW(hWnd, MCIWNDM_PUT_DEST, 0, (LPARAM)&rc);
+            }
+            else
+            {
+                GetClientRect(hWnd, &rc);
+                rc.bottom = rc.top;
+            }
+
+            if (!(mwi->dwStyle & MCIWNDF_NOPLAYBAR))
+                rc.bottom += 32; /* add the height of the playbar */
+            AdjustWindowRect(&rc, GetWindowLongW(hWnd, GWL_STYLE), FALSE);
+            SetWindowPos(hWnd, 0, 0, 0, rc.right - rc.left,
+                         rc.bottom - rc.top, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
+
+            SendDlgItemMessageW(hWnd, CTL_TRACKBAR, TBM_SETRANGEMIN, 0L, 0L);
+            SendDlgItemMessageW(hWnd, CTL_TRACKBAR, TBM_SETRANGEMAX, 1,
+                                SendMessageW(hWnd, MCIWNDM_GETLENGTH, 0, 0));
+            mwi->uTimer = SetTimer(hWnd, 1, mwi->active_timer, NULL);
+
+            MCIWND_notify_media(mwi);
+
+end_of_mci_open:
+            if (wMsg == MCIWNDM_OPENA)
+                HeapFree(GetProcessHeap(), 0, (void *)lParam);
+            return mwi->lasterror;
+        }
+
+    case MCIWNDM_GETDEVICEID:
+        TRACE("MCIWNDM_GETDEVICEID\n");
+        return mwi->mci;
+
+    case MCIWNDM_GETALIAS:
+        TRACE("MCIWNDM_GETALIAS\n");
+        return mwi->alias;
+
+    case MCIWNDM_GET_SOURCE:
+        {
+            MCI_DGV_RECT_PARMS mci_rect;
+
+            mwi->lasterror = mciSendCommandW(mwi->mci, MCI_WHERE,
+                                             MCI_DGV_WHERE_SOURCE,
+                                             (DWORD_PTR)&mci_rect);
+            if (mwi->lasterror)
+            {
+                MCIWND_notify_error(mwi);
+                return mwi->lasterror;
+            }
+            *(RECT *)lParam = mci_rect.rc;
+            TRACE("MCIWNDM_GET_SOURCE: %s\n", wine_dbgstr_rect(&mci_rect.rc));
+            return 0;
+        }
+
+    case MCIWNDM_GET_DEST:
+        {
+            MCI_DGV_RECT_PARMS mci_rect;
+
+            mwi->lasterror = mciSendCommandW(mwi->mci, MCI_WHERE,
+                                             MCI_DGV_WHERE_DESTINATION,
+                                             (DWORD_PTR)&mci_rect);
+            if (mwi->lasterror)
+            {
+                MCIWND_notify_error(mwi);
+                return mwi->lasterror;
+            }
+            *(RECT *)lParam = mci_rect.rc;
+            TRACE("MCIWNDM_GET_DEST: %s\n", wine_dbgstr_rect(&mci_rect.rc));
+            return 0;
+        }
+
+    case MCIWNDM_PUT_SOURCE:
+        {
+            MCI_DGV_PUT_PARMS mci_put;
+
+            mci_put.rc = *(RECT *)lParam;
+            TRACE("MCIWNDM_PUT_SOURCE: %s\n", wine_dbgstr_rect(&mci_put.rc));
+            mwi->lasterror = mciSendCommandW(mwi->mci, MCI_PUT,
+                                             MCI_DGV_PUT_SOURCE,
+                                             (DWORD_PTR)&mci_put);
+            if (mwi->lasterror)
+            {
+                MCIWND_notify_error(mwi);
+                return mwi->lasterror;
+            }
+            return 0;
+        }
+
+    case MCIWNDM_PUT_DEST:
+        {
+            MCI_DGV_PUT_PARMS mci_put;
+
+            mci_put.rc = *(RECT *)lParam;
+            TRACE("MCIWNDM_PUT_DEST: %s\n", wine_dbgstr_rect(&mci_put.rc));
+
+            mwi->lasterror = mciSendCommandW(mwi->mci, MCI_PUT,
+                                             MCI_DGV_PUT_DESTINATION | MCI_DGV_RECT,
+                                             (DWORD_PTR)&mci_put);
+            if (mwi->lasterror)
+            {
+                MCIWND_notify_error(mwi);
+                return mwi->lasterror;
+            }
+            return 0;
+        }
+
+    case MCIWNDM_GETLENGTH:
+        {
+            MCI_STATUS_PARMS mci_status;
+
+            mci_status.dwItem = MCI_STATUS_LENGTH;
+            mwi->lasterror = mciSendCommandW(mwi->mci, MCI_STATUS,
+                                             MCI_STATUS_ITEM,
+                                             (DWORD_PTR)&mci_status);
+            if (mwi->lasterror)
+            {
+                MCIWND_notify_error(mwi);
+                return 0;
+            }
+            TRACE("MCIWNDM_GETLENGTH: %ld\n", mci_status.dwReturn);
+            return mci_status.dwReturn;
+        }
+
+    case MCIWNDM_GETSTART:
+        {
+            MCI_STATUS_PARMS mci_status;
+
+            mci_status.dwItem = MCI_STATUS_POSITION;
+            mwi->lasterror = mciSendCommandW(mwi->mci, MCI_STATUS,
+                                             MCI_STATUS_ITEM | MCI_STATUS_START,
+                                             (DWORD_PTR)&mci_status);
+            if (mwi->lasterror)
+            {
+                MCIWND_notify_error(mwi);
+                return 0;
+            }
+            TRACE("MCIWNDM_GETSTART: %ld\n", mci_status.dwReturn);
+            return mci_status.dwReturn;
+        }
+
+    case MCIWNDM_GETEND:
+        {
+            LRESULT start, length;
+
+            start = SendMessageW(hWnd, MCIWNDM_GETSTART, 0, 0);
+            length = SendMessageW(hWnd, MCIWNDM_GETLENGTH, 0, 0);
+            TRACE("MCIWNDM_GETEND: %ld\n", start + length);
+            return (start + length);
+        }
+
+    case MCIWNDM_GETPOSITIONA:
+    case MCIWNDM_GETPOSITIONW:
+        {
+            MCI_STATUS_PARMS mci_status;
+
+            TRACE("MCIWNDM_GETPOSITION\n");
+
+            /* get position string if requested */
+            if (wParam && lParam)
+            {
+                if (wMsg == MCIWNDM_GETPOSITIONA)
+                {
+                    char cmd[64];
+
+                    wsprintfA(cmd, "status %d position", mwi->alias);
+                    mwi->lasterror = mciSendStringA(cmd, (LPSTR)lParam, wParam, 0);
+                }
+                else
+                {
+
+                    WCHAR cmdW[64];
+                    static const WCHAR formatW[] = {'s','t','a','t','u','s',' ','%','d',' ','p','o','s','i','t','i','o','n',0};
+
+                    wsprintfW(cmdW, formatW, mwi->alias);
+                    mwi->lasterror = mciSendStringW(cmdW, (LPWSTR)lParam, wParam, 0);
+                }
+
+                if (mwi->lasterror)
+                    return 0;
+            }
+
+            mci_status.dwItem = MCI_STATUS_POSITION;
+            mwi->lasterror = mciSendCommandW(mwi->mci, MCI_STATUS,
+                                             MCI_STATUS_ITEM,
+                                             (DWORD_PTR)&mci_status);
+            if (mwi->lasterror)
+                return 0;
+
+            return mci_status.dwReturn;
+        }
+
+    case MCIWNDM_GETMODEA:
+    case MCIWNDM_GETMODEW:
+        {
+            MCI_STATUS_PARMS mci_status;
+
+            TRACE("MCIWNDM_GETMODE\n");
+
+            if (!mwi->mci)
+                return MCI_MODE_NOT_READY;
+
+            /* get mode string if requested */
+            if (wParam && lParam)
+            {
+                if (wMsg == MCIWNDM_GETMODEA)
+                {
+                    char cmd[64];
+
+                    wsprintfA(cmd, "status %d mode", mwi->alias);
+                    mwi->lasterror = mciSendStringA(cmd, (LPSTR)lParam, wParam, 0);
+                }
+                else
+                {
+
+                    WCHAR cmdW[64];
+                    static const WCHAR formatW[] = {'s','t','a','t','u','s',' ','%','d',' ','m','o','d','e',0};
+
+                    wsprintfW(cmdW, formatW, mwi->alias);
+                    mwi->lasterror = mciSendStringW(cmdW, (LPWSTR)lParam, wParam, 0);
+                }
+
+                if (mwi->lasterror)
+                    return MCI_MODE_NOT_READY;
+            }
+
+            mci_status.dwItem = MCI_STATUS_MODE;
+            mwi->lasterror = mciSendCommandW(mwi->mci, MCI_STATUS,
+                                             MCI_STATUS_ITEM,
+                                             (DWORD_PTR)&mci_status);
+            if (mwi->lasterror)
+                return MCI_MODE_NOT_READY;
+
+            return mci_status.dwReturn;
+        }
+
+    case MCIWNDM_PLAYFROM:
+        {
+            MCI_PLAY_PARMS mci_play;
+
+            TRACE("MCIWNDM_PLAYFROM %08lx\n", lParam);
+
+            mci_play.dwCallback = (DWORD_PTR)hWnd;
+            mci_play.dwFrom = lParam;
+            mwi->lasterror = mciSendCommandW(mwi->mci, MCI_PLAY,
+                                             MCI_FROM | MCI_NOTIFY,
+                                             (DWORD_PTR)&mci_play);
+            if (mwi->lasterror)
+            {
+                MCIWND_notify_error(mwi);
+                return mwi->lasterror;
+            }
+
+            MCIWND_notify_mode(mwi);
+            MCIWND_UpdateState(mwi);
+            return 0;
+        }
+
+    case MCIWNDM_PLAYTO:
+        {
+            MCI_PLAY_PARMS mci_play;
+
+            TRACE("MCIWNDM_PLAYTO %08lx\n", lParam);
+
+            mci_play.dwCallback = (DWORD_PTR)hWnd;
+            mci_play.dwTo = lParam;
+            mwi->lasterror = mciSendCommandW(mwi->mci, MCI_PLAY,
+                                             MCI_TO | MCI_NOTIFY,
+                                             (DWORD_PTR)&mci_play);
+            if (mwi->lasterror)
+            {
+                MCIWND_notify_error(mwi);
+                return mwi->lasterror;
+            }
+
+            MCIWND_notify_mode(mwi);
+            MCIWND_UpdateState(mwi);
+            return 0;
+        }
+
+    case MCIWNDM_PLAYREVERSE:
+        {
+            MCI_PLAY_PARMS mci_play;
+            DWORD flags = MCI_NOTIFY;
+
+            TRACE("MCIWNDM_PLAYREVERSE %08lx\n", lParam);
+
+            mci_play.dwCallback = (DWORD_PTR)hWnd;
+            mci_play.dwFrom = lParam;
+            switch (mwi->dev_type)
+            {
+            default:
+            case MCI_DEVTYPE_ANIMATION:
+                flags |= MCI_ANIM_PLAY_REVERSE;
+                break;
+
+            case MCI_DEVTYPE_DIGITAL_VIDEO:
+                flags |= MCI_DGV_PLAY_REVERSE;
+                break;
+
+#ifdef MCI_VCR_PLAY_REVERSE
+            case MCI_DEVTYPE_VCR:
+                flags |= MCI_VCR_PLAY_REVERSE;
+                break;
+#endif
+
+            case MCI_DEVTYPE_VIDEODISC:
+                flags |= MCI_VD_PLAY_REVERSE;
+                break;
+
+            }
+            mwi->lasterror = mciSendCommandW(mwi->mci, MCI_PLAY,
+                                             flags, (DWORD_PTR)&mci_play);
+            if (mwi->lasterror)
+            {
+                MCIWND_notify_error(mwi);
+                return mwi->lasterror;
+            }
+
+            MCIWND_notify_mode(mwi);
+            MCIWND_UpdateState(mwi);
+            return 0;
+        }
+
+    case MCIWNDM_GETERRORA:
+        mciGetErrorStringA(mwi->lasterror, (LPSTR)lParam, wParam);
+        TRACE("MCIWNDM_GETERRORA: %s\n", debugstr_an((LPSTR)lParam, wParam));
+        return mwi->lasterror;
+
+    case MCIWNDM_GETERRORW:
+        mciGetErrorStringW(mwi->lasterror, (LPWSTR)lParam, wParam);
+        TRACE("MCIWNDM_GETERRORW: %s\n", debugstr_wn((LPWSTR)lParam, wParam));
+        return mwi->lasterror;
+
+    case MCIWNDM_SETOWNER:
+        TRACE("MCIWNDM_SETOWNER %p\n", (HWND)wParam);
+        mwi->hwndOwner = (HWND)wParam;
+        return 0;
+
+    case MCIWNDM_SENDSTRINGA:
+        {
+            UNICODE_STRING stringW;
+
+            TRACE("MCIWNDM_SENDSTRINGA %s\n", debugstr_a((LPCSTR)lParam));
+
+            RtlCreateUnicodeStringFromAsciiz(&stringW, (LPCSTR)lParam);
+            lParam = (LPARAM)stringW.Buffer;
+        }
+        /* fall through */
+    case MCIWNDM_SENDSTRINGW:
+        {
+            WCHAR *cmdW, *p;
+
+            TRACE("MCIWNDM_SENDSTRINGW %s\n", debugstr_w((LPCWSTR)lParam));
+
+            p = strchrW((LPCWSTR)lParam, ' ');
+            if (p)
+            {
+                static const WCHAR formatW[] = {'%','d',' ',0};
+                int len, pos;
+
+                pos = p - (WCHAR *)lParam + 1;
+                len = lstrlenW((LPCWSTR)lParam) + 64;
+
+                cmdW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
+
+                memcpy(cmdW, (void *)lParam, pos * sizeof(WCHAR));
+                wsprintfW(cmdW + pos, formatW, mwi->alias);
+                strcatW(cmdW, (WCHAR *)lParam + pos);
+            }
+            else
+                cmdW = (LPWSTR)lParam;
+
+            mwi->lasterror = mciSendStringW(cmdW, mwi->return_string,
+                                            sizeof(mwi->return_string)/sizeof(mwi->return_string[0]),
+                                            0);
+            if (mwi->lasterror)
+                MCIWND_notify_error(mwi);
+
+            if (cmdW != (LPWSTR)lParam)
+                HeapFree(GetProcessHeap(), 0, cmdW);
+
+            if (wMsg == MCIWNDM_SENDSTRINGA)
+                HeapFree(GetProcessHeap(), 0, (void *)lParam);
+
+            MCIWND_UpdateState(mwi);
+            return mwi->lasterror;
+        }
+
+    case MCIWNDM_RETURNSTRINGA:
+        WideCharToMultiByte(CP_ACP, 0, mwi->return_string, -1, (LPSTR)lParam, wParam, NULL, NULL);
+        TRACE("MCIWNDM_RETURNTRINGA %s\n", debugstr_an((LPSTR)lParam, wParam));
+        return mwi->lasterror;
+
+    case MCIWNDM_RETURNSTRINGW:
+        strncpyW((LPWSTR)lParam, mwi->return_string, wParam);
+        TRACE("MCIWNDM_RETURNTRINGW %s\n", debugstr_wn((LPWSTR)lParam, wParam));
+        return mwi->lasterror;
+
+    case MCIWNDM_SETTIMERS:
+        TRACE("MCIWNDM_SETTIMERS active %d ms, inactive %d ms\n", (int)wParam, (int)lParam);
+        mwi->active_timer = (WORD)wParam;
+        mwi->inactive_timer = (WORD)lParam;
+        return 0;
+
+    case MCIWNDM_SETACTIVETIMER:
+        TRACE("MCIWNDM_SETACTIVETIMER %d ms\n", (int)wParam);
+        mwi->active_timer = (WORD)wParam;
+        return 0;
+
+    case MCIWNDM_SETINACTIVETIMER:
+        TRACE("MCIWNDM_SETINACTIVETIMER %d ms\n", (int)wParam);
+        mwi->inactive_timer = (WORD)wParam;
+        return 0;
+
+    case MCIWNDM_GETACTIVETIMER:
+        TRACE("MCIWNDM_GETACTIVETIMER: %d ms\n", mwi->active_timer);
+        return mwi->active_timer;
+
+    case MCIWNDM_GETINACTIVETIMER:
+        TRACE("MCIWNDM_GETINACTIVETIMER: %d ms\n", mwi->inactive_timer);
+        return mwi->inactive_timer;
+
+    case MCIWNDM_CHANGESTYLES:
+        TRACE("MCIWNDM_CHANGESTYLES mask %08x, set %08lx\n", wParam, lParam);
+        /* FIXME: update the visual window state as well:
+         * add/remove trackbar, autosize, etc.
+         */
+        mwi->dwStyle &= ~wParam;
+        mwi->dwStyle |= lParam & wParam;
+        return 0;
+
+    case MCIWNDM_GETSTYLES:
+        TRACE("MCIWNDM_GETSTYLES: %08lx\n", mwi->dwStyle & 0xffff);
+        return mwi->dwStyle & 0xffff;
+
+    case MCIWNDM_GETDEVICEA:
+        {
+            MCI_SYSINFO_PARMSA mci_sysinfo;
+
+            mci_sysinfo.lpstrReturn = (LPSTR)lParam;
+            mci_sysinfo.dwRetSize = wParam;
+            mwi->lasterror = mciSendCommandA(mwi->mci, MCI_SYSINFO,
+                                             MCI_SYSINFO_INSTALLNAME,
+                                             (DWORD_PTR)&mci_sysinfo);
+            TRACE("MCIWNDM_GETDEVICEA: %s\n", debugstr_an((LPSTR)lParam, wParam));
+            return 0;
+        }
+
+    case MCIWNDM_GETDEVICEW:
+        {
+            MCI_SYSINFO_PARMSW mci_sysinfo;
+
+            mci_sysinfo.lpstrReturn = (LPWSTR)lParam;
+            mci_sysinfo.dwRetSize = wParam;
+            mwi->lasterror = mciSendCommandW(mwi->mci, MCI_SYSINFO,
+                                             MCI_SYSINFO_INSTALLNAME,
+                                             (DWORD_PTR)&mci_sysinfo);
+            TRACE("MCIWNDM_GETDEVICEW: %s\n", debugstr_wn((LPWSTR)lParam, wParam));
+            return 0;
+        }
+
+    case MCIWNDM_VALIDATEMEDIA:
+        TRACE("MCIWNDM_VALIDATEMEDIA\n");
+        if (mwi->mci)
+        {
+            SendMessageW(hWnd, MCIWNDM_GETSTART, 0, 0);
+            SendMessageW(hWnd, MCIWNDM_GETLENGTH, 0, 0);
+        }
+        return 0;
+
+    case MCIWNDM_GETFILENAMEA:
+        TRACE("MCIWNDM_GETFILENAMEA: %s\n", debugstr_w(mwi->lpName));
+        if (mwi->lpName)
+            WideCharToMultiByte(CP_ACP, 0, mwi->lpName, -1, (LPSTR)lParam, wParam, NULL, NULL);
+        return 0;
+
+    case MCIWNDM_GETFILENAMEW:
+        TRACE("MCIWNDM_GETFILENAMEW: %s\n", debugstr_w(mwi->lpName));
+        if (mwi->lpName)
+            strncpyW((LPWSTR)lParam, mwi->lpName, wParam);
+        return 0;
+
+    case MCIWNDM_GETTIMEFORMATA:
+    case MCIWNDM_GETTIMEFORMATW:
+        {
+            MCI_STATUS_PARMS mci_status;
+
+            TRACE("MCIWNDM_GETTIMEFORMAT %08x %08lx\n", wParam, lParam);
+
+            /* get format string if requested */
+            if (wParam && lParam)
+            {
+                if (wMsg == MCIWNDM_GETTIMEFORMATA)
+                {
+                    char cmd[64];
+
+                    wsprintfA(cmd, "status %d time format", mwi->alias);
+                    mwi->lasterror = mciSendStringA(cmd, (LPSTR)lParam, wParam, 0);
+                    if (mwi->lasterror)
+                        return 0;
+                }
+                else
+                {
+                    WCHAR cmdW[64];
+                    static const WCHAR formatW[] = {'s','t','a','t','u','s',' ','%','d',' ','t','i','m','e',' ','f','o','r','m','a','t',0};
+
+                    wsprintfW(cmdW, formatW, mwi->alias);
+                    mwi->lasterror = mciSendStringW(cmdW, (LPWSTR)lParam, wParam, 0);
+                    if (mwi->lasterror)
+                        return 0;
+                }
+            }
+
+            mci_status.dwItem = MCI_STATUS_TIME_FORMAT ;
+            mwi->lasterror = mciSendCommandW(mwi->mci, MCI_STATUS,
+                                             MCI_STATUS_ITEM,
+                                             (DWORD_PTR)&mci_status);
+            if (mwi->lasterror)
+                return 0;
+
+            return mci_status.dwReturn;
+        }
+
+    case MCIWNDM_SETTIMEFORMATA:
+        {
+            UNICODE_STRING stringW;
+
+            TRACE("MCIWNDM_SETTIMEFORMATA %s\n", debugstr_a((LPSTR)lParam));
+
+            RtlCreateUnicodeStringFromAsciiz(&stringW, (LPCSTR)lParam);
+            lParam = (LPARAM)stringW.Buffer;
+        }
+        /* fall through */
+    case MCIWNDM_SETTIMEFORMATW:
+        {
+            static const WCHAR formatW[] = {'s','e','t',' ','%','d',' ','t','i','m','e',' ','f','o','r','m','a','t',' ',0};
+            WCHAR *cmdW;
+
+            TRACE("MCIWNDM_SETTIMEFORMATW %s\n", debugstr_w((LPWSTR)lParam));
+
+            if (mwi->mci)
+            {
+                cmdW = HeapAlloc(GetProcessHeap(), 0, (lstrlenW((LPCWSTR)lParam) + 64) * sizeof(WCHAR));
+                wsprintfW(cmdW, formatW, mwi->alias);
+                strcatW(cmdW, (WCHAR *)lParam);
+
+                mwi->lasterror = mciSendStringW(cmdW, NULL, 0, 0);
+
+                /* fix the range tracking according to the new time format */
+                if (!mwi->lasterror)
+                    SendDlgItemMessageW(hWnd, CTL_TRACKBAR, TBM_SETRANGEMAX, 1,
+                                        SendMessageW(hWnd, MCIWNDM_GETLENGTH, 0, 0));
+            }
+
+            if (wMsg == MCIWNDM_SETTIMEFORMATA)
+                HeapFree(GetProcessHeap(), 0, (void *)lParam);
+
+            return 0;
+        }
+
+    case MCIWNDM_CAN_PLAY:
+        TRACE("MCIWNDM_CAN_PLAY\n");
+        if (mwi->mci)
+            return mci_get_devcaps(mwi, MCI_GETDEVCAPS_CAN_PLAY);
+        return 0;
+
+    case MCIWNDM_CAN_RECORD:
+        TRACE("MCIWNDM_CAN_RECORD\n");
+        if (mwi->mci)
+            return mci_get_devcaps(mwi, MCI_GETDEVCAPS_CAN_RECORD);
+        return 0;
+
+    case MCIWNDM_CAN_SAVE:
+        TRACE("MCIWNDM_CAN_SAVE\n");
+        if (mwi->mci)
+            return mci_get_devcaps(mwi, MCI_GETDEVCAPS_CAN_SAVE);
+        return 0;
+
+    case MCIWNDM_CAN_EJECT:
+        TRACE("MCIWNDM_CAN_EJECT\n");
+        if (mwi->mci)
+            return mci_get_devcaps(mwi, MCI_GETDEVCAPS_CAN_EJECT);
+        return 0;
+
+    case MCIWNDM_CAN_WINDOW:
+        TRACE("MCIWNDM_CAN_WINDOW\n");
+        switch (mwi->dev_type)
+        {
+        case MCI_DEVTYPE_ANIMATION:
+        case MCI_DEVTYPE_DIGITAL_VIDEO:
+        case MCI_DEVTYPE_OVERLAY:
+            return 1;
+        }
+        return 0;
+
+    case MCIWNDM_CAN_CONFIG:
+        TRACE("MCIWNDM_CAN_CONFIG\n");
+        if (mwi->hdrv)
+            return SendDriverMessage(mwi->hdrv, DRV_QUERYCONFIGURE, 0, 0);
+        return 0;
+
+    case MCIWNDM_SETZOOM:
+        TRACE("MCIWNDM_SETZOOM %ld\n", lParam);
+        mwi->zoom = lParam;
+
+        if (mwi->mci && !(mwi->dwStyle & MCIWNDF_NOAUTOSIZEWINDOW))
+        {
+            RECT rc;
+
+            rc.left = rc.top = 0;
+            rc.right = MulDiv(mwi->size.cx, mwi->zoom, 100);
+            rc.bottom = MulDiv(mwi->size.cy, mwi->zoom, 100);
+
+            if (!(mwi->dwStyle & MCIWNDF_NOPLAYBAR))
+                rc.bottom += 32; /* add the height of the playbar */
+            AdjustWindowRect(&rc, GetWindowLongW(hWnd, GWL_STYLE), FALSE);
+            SetWindowPos(hWnd, 0, 0, 0, rc.right - rc.left, rc.bottom - rc.top,
+                         SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
+        }
+        return 0;
+
+    case MCIWNDM_GETZOOM:
+        TRACE("MCIWNDM_GETZOOM: %d\n", mwi->zoom);
+        return mwi->zoom;
+
+    case MCIWNDM_EJECT:
+        {
+            MCI_SET_PARMS mci_set;
+
+            TRACE("MCIWNDM_EJECT\n");
+
+            mci_set.dwCallback = (DWORD_PTR)hWnd;
+            mwi->lasterror = mciSendCommandW(mwi->mci, MCI_SET,
+                                             MCI_SET_DOOR_OPEN | MCI_NOTIFY,
+                                             (DWORD_PTR)&mci_set);
+            MCIWND_notify_mode(mwi);
+            MCIWND_UpdateState(mwi);
+            return mwi->lasterror;
+        }
+
+    case MCIWNDM_SETVOLUME:
+    case MCIWNDM_GETVOLUME:
+    case MCIWNDM_SETSPEED:
+    case MCIWNDM_GETSPEED:
+    case MCIWNDM_SETREPEAT:
+    case MCIWNDM_GETREPEAT:
+    case MCIWNDM_REALIZE:
+    case MCIWNDM_GETPALETTE:
+    case MCIWNDM_SETPALETTE:
+    case MCIWNDM_NEWA:
+    case MCIWNDM_NEWW:
+    case MCIWNDM_PALETTEKICK:
+    case MCIWNDM_OPENINTERFACE:
+        FIXME("support for MCIWNDM_ message WM_USER+%d not implemented\n", wMsg - WM_USER);
+        return 0;
+
+    case MCI_PLAY:
+        {
+            LRESULT end = SendMessageW(hWnd, MCIWNDM_GETEND, 0, 0);
+            return SendMessageW(hWnd, MCIWNDM_PLAYTO, 0, end);
+        }
+
+    case MCI_SEEK:
+        {
+            MCI_SEEK_PARMS mci_seek;
+
+            switch (lParam)
+            {
+            case MCIWND_START:
+                lParam = SendMessageW(hWnd, MCIWNDM_GETSTART, 0, 0);
+                break;
+
+            case MCIWND_END:
+                lParam = SendMessageW(hWnd, MCIWNDM_GETEND, 0, 0);
+                break;
+            }
+
+            mci_seek.dwTo = lParam;
+            mwi->lasterror = mciSendCommandW(mwi->mci, MCI_SEEK,
+                                             MCI_TO, (DWORD_PTR)&mci_seek);
+            if (mwi->lasterror)
+            {
+                MCIWND_notify_error(mwi);
+                return mwi->lasterror;
+            }
+            /* update window to reflect the state */
+            InvalidateRect(hWnd, NULL, TRUE);
+            return 0;
+        }
+
+    case MCI_CLOSE:
+        {
+            RECT rc;
+            MCI_GENERIC_PARMS mci_generic;
+
+            if (mwi->hdrv)
+            {
+                CloseDriver(mwi->hdrv, 0, 0);
+                mwi->hdrv = 0;
+            }
+
+            if (mwi->mci)
+            {
+                mci_generic.dwCallback = 0;
+                mwi->lasterror = mciSendCommandW(mwi->mci, MCI_CLOSE,
+                                                 0, (DWORD_PTR)&mci_generic);
+                mwi->mci = 0;
+            }
+
+            mwi->mode = MCI_MODE_NOT_READY;
+            mwi->position = -1;
+
+            if (mwi->lpName)
+            {
+                HeapFree(GetProcessHeap(), 0, mwi->lpName);
+                mwi->lpName = NULL;
+            }
+            MCIWND_UpdateState(mwi);
+
+            GetClientRect(hWnd, &rc);
+            rc.bottom = rc.top;
+            if (!(mwi->dwStyle & MCIWNDF_NOPLAYBAR))
+                rc.bottom += 32; /* add the height of the playbar */
+            AdjustWindowRect(&rc, GetWindowLongW(hWnd, GWL_STYLE), FALSE);
+            SetWindowPos(hWnd, 0, 0, 0, rc.right - rc.left,
+                         rc.bottom - rc.top, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
+
+            MCIWND_notify_media(mwi);
+            return 0;
+        }
+
+    case MCI_PAUSE:
+    case MCI_STEP:
+    case MCI_STOP:
+    case MCI_RESUME:
+        mci_generic_command(mwi, wMsg);
+        if (wMsg == MCI_STEP && !mwi->lasterror)
+        {
+            /* update window to reflect the state */
+            InvalidateRect(hWnd, NULL, TRUE);
+        }
+        return mwi->lasterror;
+
+    case MCI_CONFIGURE:
+        if (mwi->hdrv)
+            SendDriverMessage(mwi->hdrv, DRV_CONFIGURE, (LPARAM)hWnd, 0);
+        return 0;
+
+    case MCI_BREAK:
+    case MCI_CAPTURE:
+    case MCI_COPY:
+    case MCI_CUE:
+    case MCI_CUT:
+    case MCI_DELETE:
+    case MCI_ESCAPE:
+    case MCI_FREEZE:
+    case MCI_GETDEVCAPS:
+    /*case MCI_INDEX:*/
+    case MCI_INFO:
+    case MCI_LIST:
+    case MCI_LOAD:
+    /*case MCI_MARK:*/
+    case MCI_MONITOR:
+    case MCI_OPEN:
+    case MCI_PASTE:
+    case MCI_PUT:
+    case MCI_QUALITY:
+    case MCI_REALIZE:
+    case MCI_RECORD:
+    case MCI_RESERVE:
+    case MCI_RESTORE:
+    case MCI_SAVE:
+    case MCI_SET:
+    case MCI_SETAUDIO:
+    /*case MCI_SETTIMECODE:*/
+    /*case MCI_SETTUNER:*/
+    case MCI_SETVIDEO:
+    case MCI_SIGNAL:
+    case MCI_SPIN:
+    case MCI_STATUS:
+    case MCI_SYSINFO:
+    case MCI_UNDO:
+    case MCI_UNFREEZE:
+    case MCI_UPDATE:
+    case MCI_WHERE:
+    case MCI_WINDOW:
+        FIXME("support for MCI_ command %04x not implemented\n", wMsg);
+        return 0;
+    }
+
+    if (wMsg >= WM_USER)
+    {
+        FIXME("support for MCIWNDM_ message WM_USER+%d not implemented\n", wMsg - WM_USER);
+        return 0;
+    }
+
+    if (GetWindowLongW(hWnd, GWL_EXSTYLE) & WS_EX_MDICHILD)
+        return DefMDIChildProcW(hWnd, wMsg, wParam, lParam);
+
+    return DefWindowProcW(hWnd, wMsg, wParam, lParam);
+}
diff --git a/reactos/lib/msvideo/msvfw32.rc b/reactos/lib/msvideo/msvfw32.rc
new file mode 100644
index 00000000000..3a0ff963fb5
--- /dev/null
+++ b/reactos/lib/msvideo/msvfw32.rc
@@ -0,0 +1,38 @@
+#include <defines.h>
+#include <reactos/resource.h>
+
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+VS_VERSION_INFO VERSIONINFO
+	FILEVERSION	RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD
+	PRODUCTVERSION	RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD	
+	FILEFLAGSMASK	0x3fL
+#ifdef _DEBUG
+	FILEFLAGS	0x1L
+#else
+	FILEFLAGS	0x0L
+#endif
+	FILEOS		0x40004L
+	FILETYPE	0x2L
+	FILESUBTYPE	0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName",	RES_STR_COMPANY_NAME
+            VALUE "FileDescription",	"MSvideo support\0"
+            VALUE "FileVersion",	RES_STR_FILE_VERSION
+            VALUE "InternalName",	"msvfw32\0"
+            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
+            VALUE "OriginalFilename",	"msvfw32.dll\0"
+            VALUE "ProductName",	RES_STR_PRODUCT_NAME
+            VALUE "ProductVersion",	RES_STR_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
diff --git a/reactos/lib/msvideo/msvfw32.spec b/reactos/lib/msvideo/msvfw32.spec
new file mode 100644
index 00000000000..9590f91bf3a
--- /dev/null
+++ b/reactos/lib/msvideo/msvfw32.spec
@@ -0,0 +1,51 @@
+# Yes, ICCompress,ICDecompress,MCIWnd* and ICDraw* are cdecl (VFWAPIV).
+# The rest is stdcall (VFWAPI) however. -Marcus Meissner, 990124
+
+2 stdcall VideoForWindowsVersion()
+
+@ stdcall DrawDibBegin(long long long long ptr long long long)
+@ stub    DrawDibChangePalette
+@ stdcall DrawDibClose(long)
+@ stdcall DrawDibDraw(long long long long long long ptr ptr long long long long long)
+@ stdcall DrawDibEnd(long)
+@ stub    DrawDibGetBuffer
+@ stdcall DrawDibGetPalette(long)
+@ stdcall DrawDibOpen()
+@ stdcall DrawDibProfileDisplay(ptr)
+@ stdcall DrawDibRealize(long long long)
+@ stdcall DrawDibSetPalette(long long)
+@ stdcall DrawDibStart(long long)
+@ stdcall DrawDibStop(long)
+@ stub    DrawDibTime
+@ stub    GetOpenFileNamePreview
+@ stdcall GetOpenFileNamePreviewA(ptr)
+@ stdcall GetOpenFileNamePreviewW(ptr)
+@ stdcall GetSaveFileNamePreviewA(ptr)
+@ stdcall GetSaveFileNamePreviewW(ptr)
+@ stdcall ICClose(long)
+@ cdecl   ICCompress(long long ptr ptr ptr ptr ptr ptr long long long ptr ptr)
+@ stdcall ICCompressorChoose(long long ptr ptr ptr ptr)
+@ stdcall ICCompressorFree(ptr)
+@ cdecl   ICDecompress(long long ptr ptr ptr ptr)
+@ cdecl   ICDraw(long long ptr ptr long long)
+@ cdecl   ICDrawBegin(long long long long long long long long long ptr long long long long long long)
+@ stdcall ICGetDisplayFormat(long ptr ptr long long long)
+@ stdcall ICGetInfo(long ptr long)
+@ stdcall ICImageCompress(long long ptr ptr ptr long ptr)
+@ stdcall ICImageDecompress(long long ptr ptr ptr)
+@ stdcall ICInfo(long long ptr)
+@ stdcall ICInstall(long long ptr str long)
+@ stdcall ICLocate(long long ptr ptr long)
+@ stub    ICMThunk
+@ stdcall ICOpen(long long long)
+@ stdcall ICOpenFunction(long long long ptr)
+@ stdcall ICRemove(long long long)
+@ stdcall ICSendMessage(long long long long)
+@ stub    ICSeqCompressFrame
+@ stub    ICSeqCompressFrameEnd
+@ stub    ICSeqCompressFrameStart
+@ cdecl   MCIWndCreate (long long long str) MCIWndCreateA
+@ cdecl   MCIWndCreateA (long long long str)
+@ cdecl   MCIWndCreateW (long long long wstr)
+@ cdecl   MCIWndRegisterClass()
+@ stub    StretchDIB
diff --git a/reactos/lib/msvideo/msvfw32.spec.def b/reactos/lib/msvideo/msvfw32.spec.def
new file mode 100644
index 00000000000..39fd23f5e5d
--- /dev/null
+++ b/reactos/lib/msvideo/msvfw32.spec.def
@@ -0,0 +1,43 @@
+; File generated automatically from msvfw32.spec; do not edit!
+
+LIBRARY msvfw32.dll
+
+EXPORTS
+  VideoForWindowsVersion@0 @2
+  DrawDibBegin@32 @3
+  DrawDibClose@4 @5
+  DrawDibDraw@52 @6
+  DrawDibEnd@4 @7
+  DrawDibGetPalette@4 @9
+  DrawDibOpen@0 @10
+  DrawDibProfileDisplay@4 @11
+  DrawDibRealize@12 @12
+  DrawDibSetPalette@8 @13
+  DrawDibStart@8 @14
+  DrawDibStop@4 @15
+  GetOpenFileNamePreviewA@4 @18
+  GetOpenFileNamePreviewW@4 @19
+  GetSaveFileNamePreviewA@4 @20
+  GetSaveFileNamePreviewW@4 @21
+  ICClose@4 @22
+  ICCompress @23
+  ICCompressorChoose@24 @24
+  ICCompressorFree@4 @25
+  ICDecompress @26
+  ICDraw @27
+  ICDrawBegin @28
+  ICGetDisplayFormat@24 @29
+  ICGetInfo@12 @30
+  ICImageCompress@28 @31
+  ICImageDecompress@20 @32
+  ICInfo@12 @33
+  ICInstall@20 @34
+  ICLocate@20 @35
+  ICOpen@12 @37
+  ICOpenFunction@16 @38
+  ICRemove@12 @39
+  ICSendMessage@16 @40
+  MCIWndCreate=MCIWndCreateA @44
+  MCIWndCreateA @45
+  MCIWndCreateW @46
+  MCIWndRegisterClass @47
diff --git a/reactos/lib/msvideo/msvideo.spec b/reactos/lib/msvideo/msvideo.spec
new file mode 100644
index 00000000000..a6f9a876f20
--- /dev/null
+++ b/reactos/lib/msvideo/msvideo.spec
@@ -0,0 +1,68 @@
+2 pascal VideoForWindowsVersion() VideoForWindowsVersion
+20 stub VIDEOGETNUMDEVS
+21 stub VIDEOGETERRORTEXT
+22 pascal VideoCapDriverDescAndVer(word ptr word ptr word) VideoCapDriverDescAndVer16
+28 stub VIDEOOPEN
+29 stub VIDEOCLOSE
+30 stub VIDEODIALOG
+31 stub VIDEOFRAME
+32 stub VIDEOCONFIGURE
+33 stub VIDEOCONFIGURESTORAGE
+34 stub VIDEOGETCHANNELCAPS
+35 stub VIDEOUPDATE
+40 stub VIDEOSTREAMADDBUFFER
+41 stub VIDEOSTREAMFINI
+42 stub VIDEOSTREAMGETERROR
+43 stub VIDEOSTREAMGETPOSITION
+44 stub VIDEOSTREAMINIT
+46 stub VIDEOSTREAMPREPAREHEADER
+47 stub VIDEOSTREAMRESET
+49 stub VIDEOSTREAMSTART
+50 stub VIDEOSTREAMSTOP
+51 stub VIDEOSTREAMUNPREPAREHEADER
+52 stub VIDEOSTREAMALLOCHDRANDBUFFER
+53 stub VIDEOSTREAMFREEHDRANDBUFFER
+60 stub VIDEOMESSAGE
+102 pascal -ret16 DrawDibOpen() DrawDibOpen16
+103 pascal -ret16 DrawDibClose(word) DrawDibClose16
+104 pascal -ret16 DrawDibBegin(word word s_word s_word ptr s_word s_word word) DrawDibBegin16
+105 pascal -ret16 DrawDibEnd(word) DrawDibEnd16
+106 pascal -ret16 DrawDibDraw(word word s_word s_word s_word s_word ptr ptr s_word s_word s_word s_word word) DrawDibDraw16
+108 pascal -ret16 DrawDibGetPalette(word) DrawDibGetPalette16
+110 pascal -ret16 DrawDibSetPalette(word word) DrawDibSetPalette16
+111 stub DRAWDIBCHANGEPALETTE
+112 pascal -ret16 DrawDibRealize(word word word) DrawDibRealize16
+113 stub DRAWDIBTIME
+114 stub DRAWDIBPROFILEDISPLAY
+115 stub STRETCHDIB
+118 pascal -ret16 DrawDibStart(word long) DrawDibStart16
+119 pascal -ret16 DrawDibStop(word) DrawDibStop16
+120 stub DRAWDIBGETBUFFER
+200 pascal -ret16 ICInfo(long long segptr) ICInfo16
+201 stub ICINSTALL
+202 stub ICREMOVE
+203 pascal -ret16 ICOpen(long long word) ICOpen16
+204 pascal ICClose(word) ICClose16
+205 pascal ICSendMessage(word word long long) ICSendMessage16
+206 pascal -ret16 ICOpenFunction(long long word segptr) ICOpenFunction16
+207 varargs _ICMessage(word word word) ICMessage16
+212 pascal ICGetInfo(word segptr long) ICGetInfo16
+213 pascal -ret16 ICLocate(long long ptr ptr word) ICLocate16
+224 cdecl _ICCompress(word long segptr segptr segptr segptr segptr segptr long long long segptr segptr) ICCompress16
+230 cdecl _ICDecompress(word long segptr segptr segptr segptr) ICDecompress16
+232 cdecl _ICDrawBegin(word long word word word s_word s_word s_word s_word segptr s_word s_word s_word s_word long long) ICDrawBegin16
+234 cdecl _ICDraw(word long segptr segptr long long) ICDraw16
+239 pascal -ret16 ICGetDisplayFormat(word ptr ptr s_word s_word s_word) ICGetDisplayFormat16
+240 stub ICIMAGECOMPRESS
+241 stub ICIMAGEDECOMPRESS
+242 stub ICCOMPRESSORCHOOSE
+243 stub ICCOMPRESSORFREE
+244 stub ICSEQCOMPRESSFRAMESTART
+245 stub ICSEQCOMPRESSFRAMEEND
+246 stub ICSEQCOMPRESSFRAME
+250 stub _MCIWNDCREATE
+251 stub _MCIWNDREGISTERCLASS
+252 stub GETOPENFILENAMEPREVIEW
+253 stub GETSAVEFILENAMEPREVIEW
+
+300 pascal DllEntryPoint(long word word word long word) VIDEO_LibMain
diff --git a/reactos/lib/msvideo/msvideo16.c b/reactos/lib/msvideo/msvideo16.c
new file mode 100644
index 00000000000..2d5596e9b9f
--- /dev/null
+++ b/reactos/lib/msvideo/msvideo16.c
@@ -0,0 +1,910 @@
+/*
+ * msvideo 16-bit functions
+ *
+ * Copyright 1998 Marcus Meissner
+ * Copyright 2000 Bradley Baetz
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#define COM_NO_WINDOWS_H
+#include <stdio.h>
+#include <string.h>
+
+#include "msvideo_private.h"
+#include "winver.h"
+#include "winnls.h"
+#include "winreg.h"
+#include "vfw16.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvideo);
+
+/* Drivers32 settings */
+#define HKLM_DRIVERS32 "Software\\Microsoft\\Windows NT\\CurrentVersion\\Drivers32"
+
+/***********************************************************************
+ *		DrawDibOpen		[MSVIDEO.102]
+ */
+HDRAWDIB16 VFWAPI DrawDibOpen16(void)
+{
+    return HDRAWDIB_16(DrawDibOpen());
+}
+
+/***********************************************************************
+ *		DrawDibClose		[MSVIDEO.103]
+ */
+BOOL16 VFWAPI DrawDibClose16(HDRAWDIB16 hdd)
+{
+    return DrawDibClose(HDRAWDIB_32(hdd));
+}
+
+/************************************************************************
+ *		DrawDibBegin		[MSVIDEO.104]
+ */
+BOOL16 VFWAPI DrawDibBegin16(HDRAWDIB16 hdd, HDC16 hdc, INT16 dxDst,
+			     INT16 dyDst, LPBITMAPINFOHEADER lpbi, INT16 dxSrc,
+			     INT16 dySrc, UINT16 wFlags)
+{
+    return DrawDibBegin(HDRAWDIB_32(hdd), HDC_32(hdc), dxDst, dyDst, lpbi,
+			dxSrc, dySrc, wFlags);
+}
+
+/***********************************************************************
+ *		DrawDibEnd		[MSVIDEO.105]
+ */
+BOOL16 VFWAPI DrawDibEnd16(HDRAWDIB16 hdd)
+{
+    return DrawDibEnd(HDRAWDIB_32(hdd));
+}
+
+/**********************************************************************
+ *		DrawDibDraw		[MSVIDEO.106]
+ */
+BOOL16 VFWAPI DrawDibDraw16(HDRAWDIB16 hdd, HDC16 hdc, INT16 xDst, INT16 yDst,
+			    INT16 dxDst, INT16 dyDst, LPBITMAPINFOHEADER lpbi,
+			    LPVOID lpBits, INT16 xSrc, INT16 ySrc, INT16 dxSrc,
+			    INT16 dySrc, UINT16 wFlags)
+{
+    return DrawDibDraw(HDRAWDIB_32(hdd), HDC_32(hdc), xDst, yDst, dxDst,
+		       dyDst, lpbi, lpBits, xSrc, ySrc, dxSrc, dySrc, wFlags);
+}
+
+/***********************************************************************
+ *              DrawDibGetPalette       [MSVIDEO.108]
+ */
+HPALETTE16 VFWAPI DrawDibGetPalette16(HDRAWDIB16 hdd)
+{
+    return HPALETTE_16(DrawDibGetPalette(HDRAWDIB_32(hdd)));
+}
+
+/***********************************************************************
+ *              DrawDibSetPalette       [MSVIDEO.110]
+ */
+BOOL16 VFWAPI DrawDibSetPalette16(HDRAWDIB16 hdd, HPALETTE16 hpal)
+{
+    return DrawDibSetPalette(HDRAWDIB_32(hdd), HPALETTE_32(hpal));
+}
+
+/***********************************************************************
+ *              DrawDibRealize          [MSVIDEO.112]
+ */
+UINT16 VFWAPI DrawDibRealize16(HDRAWDIB16 hdd, HDC16 hdc,
+			       BOOL16 fBackground)
+{
+    return (UINT16)DrawDibRealize(HDRAWDIB_32(hdd), HDC_32(hdc), fBackground);
+}
+
+/*************************************************************************
+ *		DrawDibStart		[MSVIDEO.118]
+ */
+BOOL16 VFWAPI DrawDibStart16(HDRAWDIB16 hdd, DWORD rate)
+{
+    return DrawDibStart(HDRAWDIB_32(hdd), rate);
+}
+
+/*************************************************************************
+ *		DrawDibStop		[MSVIDEO.119]
+ */
+BOOL16 DrawDibStop16(HDRAWDIB16 hdd)
+{
+    return DrawDibStop(HDRAWDIB_32(hdd));
+}
+
+/***********************************************************************
+ *		ICOpen				[MSVIDEO.203]
+ */
+HIC16 VFWAPI ICOpen16(DWORD fccType, DWORD fccHandler, UINT16 wMode)
+{
+    return HIC_16(ICOpen(fccType, fccHandler, wMode));
+}
+
+/***********************************************************************
+ *		ICClose			[MSVIDEO.204]
+ */
+LRESULT WINAPI ICClose16(HIC16 hic)
+{
+    return ICClose(HIC_32(hic));
+}
+
+/***********************************************************************
+ *		_ICMessage			[MSVIDEO.207]
+ */
+LRESULT VFWAPIV ICMessage16( HIC16 hic, UINT16 msg, UINT16 cb, VA_LIST16 valist )
+{
+    LPWORD lpData;
+    SEGPTR segData;
+    LRESULT ret;
+    UINT16 i;
+
+    lpData = HeapAlloc(GetProcessHeap(), 0, cb);
+
+    TRACE("0x%08lx, %u, %u, ...)\n", (DWORD) hic, msg, cb);
+
+    for (i = 0; i < cb / sizeof(WORD); i++) 
+    {
+	lpData[i] = VA_ARG16(valist, WORD);
+    }
+
+    segData = MapLS(lpData);
+    ret = ICSendMessage16(hic, msg, segData, (DWORD) cb);
+    UnMapLS(segData);
+    HeapFree(GetProcessHeap(), 0, lpData);
+    return ret;
+}
+
+/***********************************************************************
+ *		ICGetInfo			[MSVIDEO.212]
+ */
+LRESULT VFWAPI ICGetInfo16(HIC16 hic, ICINFO16 * picinfo, DWORD cb)
+{
+    LRESULT ret;
+
+    TRACE("(0x%08lx,%p,%ld)\n", (DWORD) hic, picinfo, cb);
+    ret = ICSendMessage16(hic, ICM_GETINFO, (DWORD) picinfo, cb);
+    TRACE("	-> 0x%08lx\n", ret);
+    return ret;
+}
+
+/***********************************************************************
+ *		ICLocate			[MSVIDEO.213]
+ */
+HIC16 VFWAPI ICLocate16(DWORD fccType, DWORD fccHandler,
+			LPBITMAPINFOHEADER lpbiIn, LPBITMAPINFOHEADER lpbiOut,
+		       	WORD wFlags)
+{
+    return HIC_16(ICLocate(fccType, fccHandler, lpbiIn, lpbiOut, wFlags));
+}
+
+/***********************************************************************
+ *		_ICCompress			[MSVIDEO.224]
+ */
+DWORD VFWAPIV ICCompress16(HIC16 hic, DWORD dwFlags,
+			   LPBITMAPINFOHEADER lpbiOutput, LPVOID lpData,
+			   LPBITMAPINFOHEADER lpbiInput, LPVOID lpBits,
+			   LPDWORD lpckid, LPDWORD lpdwFlags,
+			   LONG lFrameNum, DWORD dwFrameSize,
+			   DWORD dwQuality, LPBITMAPINFOHEADER lpbiPrev,
+			   LPVOID lpPrev)
+{
+    DWORD ret;
+    ICCOMPRESS iccmp;
+    SEGPTR seg_iccmp;
+    
+    TRACE("(0x%08lx,%ld,%p,%p,%p,%p,...)\n", (DWORD) hic, dwFlags,
+	  lpbiOutput, lpData, lpbiInput, lpBits);
+
+    iccmp.dwFlags = dwFlags;
+
+    iccmp.lpbiOutput = lpbiOutput;
+    iccmp.lpOutput = lpData;
+    iccmp.lpbiInput = lpbiInput;
+    iccmp.lpInput = lpBits;
+
+    iccmp.lpckid = lpckid;
+    iccmp.lpdwFlags = lpdwFlags;
+    iccmp.lFrameNum = lFrameNum;
+    iccmp.dwFrameSize = dwFrameSize;
+    iccmp.dwQuality = dwQuality;
+    iccmp.lpbiPrev = lpbiPrev;
+    iccmp.lpPrev = lpPrev;
+    seg_iccmp = MapLS(&iccmp);
+    ret = ICSendMessage16(hic, ICM_COMPRESS, seg_iccmp, sizeof(ICCOMPRESS));
+    UnMapLS(seg_iccmp);
+    return ret;
+}
+
+/***********************************************************************
+ *		_ICDecompress			[MSVIDEO.230]
+ */
+DWORD VFWAPIV ICDecompress16(HIC16 hic, DWORD dwFlags,
+			     LPBITMAPINFOHEADER lpbiFormat, LPVOID lpData,
+			     LPBITMAPINFOHEADER lpbi, LPVOID lpBits)
+{
+    ICDECOMPRESS icd;
+    SEGPTR segptr;
+    DWORD ret;
+
+    TRACE("(0x%08lx,%ld,%p,%p,%p,%p)\n", (DWORD) hic, dwFlags, lpbiFormat,
+	  lpData, lpbi, lpBits);
+
+    icd.dwFlags = dwFlags;
+    icd.lpbiInput = lpbiFormat;
+    icd.lpInput = lpData;
+    icd.lpbiOutput = lpbi;
+    icd.lpOutput = lpBits;
+    icd.ckid = 0;
+    segptr = MapLS(&icd);
+    ret = ICSendMessage16(hic, ICM_DECOMPRESS, segptr, sizeof(ICDECOMPRESS));
+    UnMapLS(segptr);
+    return ret;
+}
+
+/***********************************************************************
+ *		_ICDrawBegin		[MSVIDEO.232]
+ */
+DWORD VFWAPIV ICDrawBegin16(HIC16 hic,		/* [in] */
+			    DWORD dwFlags,	/* [in] flags */
+			    HPALETTE16 hpal,	/* [in] palette to draw with */
+			    HWND16 hwnd,	/* [in] window to draw to */
+			    HDC16 hdc,		/* [in] HDC to draw to */
+			    INT16 xDst,		/* [in] destination rectangle */
+			    INT16 yDst,		/* [in] */
+			    INT16 dxDst,	/* [in] */
+			    INT16 dyDst,	/* [in] */
+			    LPBITMAPINFOHEADER lpbi,	/* [in] format of frame to draw NOTE: SEGPTR */
+			    INT16 xSrc,		/* [in] source rectangle */
+			    INT16 ySrc,		/* [in] */
+			    INT16 dxSrc,	/* [in] */
+			    INT16 dySrc,	/* [in] */
+			    DWORD dwRate,	/* [in] frames/second = (dwRate/dwScale) */
+			    DWORD dwScale)	/* [in] */
+{
+    DWORD ret;
+    ICDRAWBEGIN16 icdb;
+    SEGPTR seg_icdb;
+
+    TRACE ("(0x%08lx,%ld,0x%08lx,0x%08lx,0x%08lx,%u,%u,%u,%u,%p,%u,%u,%u,%u,%ld,%ld)\n",
+	   (DWORD) hic, dwFlags, (DWORD) hpal, (DWORD) hwnd, (DWORD) hdc,
+	   xDst, yDst, dxDst, dyDst, lpbi, xSrc, ySrc, dxSrc, dySrc, dwRate,
+	   dwScale);
+
+    icdb.dwFlags = dwFlags;
+    icdb.hpal = hpal;
+    icdb.hwnd = hwnd;
+    icdb.hdc = hdc;
+    icdb.xDst = xDst;
+    icdb.yDst = yDst;
+    icdb.dxDst = dxDst;
+    icdb.dyDst = dyDst;
+    icdb.lpbi = lpbi;		/* Keep this as SEGPTR for the mapping code to deal with */
+    icdb.xSrc = xSrc;
+    icdb.ySrc = ySrc;
+    icdb.dxSrc = dxSrc;
+    icdb.dySrc = dySrc;
+    icdb.dwRate = dwRate;
+    icdb.dwScale = dwScale;
+    seg_icdb = MapLS(&icdb);
+    ret = (DWORD) ICSendMessage16(hic, ICM_DRAW_BEGIN, seg_icdb,
+				  sizeof(ICDRAWBEGIN16));
+    UnMapLS(seg_icdb);
+    return ret;
+}
+
+/***********************************************************************
+ *		_ICDraw			[MSVIDEO.234]
+ */
+DWORD VFWAPIV ICDraw16(HIC16 hic, DWORD dwFlags,
+		       LPVOID lpFormat,	/* [???] NOTE: SEGPTR */
+		       LPVOID lpData,	/* [???] NOTE: SEGPTR */
+		       DWORD cbData, LONG lTime)
+{
+    DWORD ret;
+    ICDRAW icd;
+    SEGPTR seg_icd;
+
+    TRACE("(0x%08lx,0x%08lx,%p,%p,%ld,%ld)\n", (DWORD) hic, dwFlags,
+	  lpFormat, lpData, cbData, lTime);
+    icd.dwFlags = dwFlags;
+    icd.lpFormat = lpFormat;
+    icd.lpData = lpData;
+    icd.cbData = cbData;
+    icd.lTime = lTime;
+    seg_icd = MapLS(&icd);
+    ret = ICSendMessage16(hic, ICM_DRAW, seg_icd, sizeof(ICDRAW));
+    UnMapLS(seg_icd);
+    return ret;
+}
+
+/***********************************************************************
+ *		ICGetDisplayFormat			[MSVIDEO.239]
+ */
+HIC16 VFWAPI ICGetDisplayFormat16(HIC16 hic, LPBITMAPINFOHEADER lpbiIn,
+				  LPBITMAPINFOHEADER lpbiOut, INT16 depth,
+				  INT16 dx, INT16 dy)
+{
+    return HIC_16(ICGetDisplayFormat(HIC_32(hic), lpbiIn, lpbiOut, depth,
+				     dx, dy));
+}
+
+#define COPY(x,y) (x->y = x##16->y);
+#define COPYPTR(x,y) (x->y = MapSL((SEGPTR)x##16->y));
+
+/******************************************************************
+ *		MSVIDEO_MapICDEX16To32
+ *
+ *
+ */
+static LPVOID MSVIDEO_MapICDEX16To32(LPDWORD lParam) 
+{
+    LPVOID ret;
+
+    ICDECOMPRESSEX *icdx = HeapAlloc(GetProcessHeap(), 0, sizeof(ICDECOMPRESSEX));
+    ICDECOMPRESSEX16 *icdx16 = MapSL(*lParam);
+    ret = icdx16;
+
+    COPY(icdx, dwFlags);
+    COPYPTR(icdx, lpbiSrc);
+    COPYPTR(icdx, lpSrc);
+    COPYPTR(icdx, lpbiDst);
+    COPYPTR(icdx, lpDst);
+    COPY(icdx, xDst);
+    COPY(icdx, yDst);
+    COPY(icdx, dxDst);
+    COPY(icdx, dyDst);
+    COPY(icdx, xSrc);
+    COPY(icdx, ySrc);
+    COPY(icdx, dxSrc);
+    COPY(icdx, dySrc);
+
+    *lParam = (DWORD)(icdx);
+    return ret;
+}
+
+/******************************************************************
+ *		MSVIDEO_MapMsg16To32
+ *
+ *
+ */
+static LPVOID MSVIDEO_MapMsg16To32(UINT msg, LPDWORD lParam1, LPDWORD lParam2)
+{
+    LPVOID ret = 0;
+
+    TRACE("Mapping %d\n", msg);
+
+    switch (msg) 
+    {
+    case DRV_LOAD:
+    case DRV_ENABLE:
+    case DRV_CLOSE:
+    case DRV_DISABLE:
+    case DRV_FREE:
+    case ICM_ABOUT:
+    case ICM_CONFIGURE:
+    case ICM_COMPRESS_END:
+    case ICM_DECOMPRESS_END:
+    case ICM_DECOMPRESSEX_END:
+    case ICM_SETQUALITY:
+    case ICM_DRAW_START_PLAY:
+    case ICM_DRAW_STOP_PLAY:
+    case ICM_DRAW_REALIZE:
+    case ICM_DRAW_RENDERBUFFER:
+    case ICM_DRAW_END:
+        break;
+    case DRV_OPEN:
+    case ICM_GETDEFAULTQUALITY:
+    case ICM_GETQUALITY:
+    case ICM_SETSTATE:
+    case ICM_DRAW_WINDOW:
+    case ICM_GETBUFFERSWANTED:
+        *lParam1 = (DWORD)MapSL(*lParam1);
+        break;
+    case ICM_GETINFO:
+        {
+            ICINFO *ici = HeapAlloc(GetProcessHeap(), 0, sizeof(ICINFO));
+            ICINFO16 *ici16;
+            
+            ici16 = MapSL(*lParam1);
+            ret = ici16;
+            
+            ici->dwSize = sizeof(ICINFO);
+            COPY(ici, fccType);
+            COPY(ici, fccHandler);
+            COPY(ici, dwFlags);
+            COPY(ici, dwVersion);
+            COPY(ici, dwVersionICM);
+            MultiByteToWideChar( CP_ACP, 0, ici16->szName, -1, ici->szName, 16 );
+            MultiByteToWideChar( CP_ACP, 0, ici16->szDescription, -1, ici->szDescription, 128 );
+            MultiByteToWideChar( CP_ACP, 0, ici16->szDriver, -1, ici->szDriver, 128 );
+            *lParam1 = (DWORD)(ici);
+            *lParam2 = sizeof(ICINFO);
+        }
+        break;
+    case ICM_COMPRESS:
+        {
+            ICCOMPRESS *icc = HeapAlloc(GetProcessHeap(), 0, sizeof(ICCOMPRESS));
+            ICCOMPRESS *icc16;
+
+            icc16 = MapSL(*lParam1);
+            ret = icc16;
+
+            COPY(icc, dwFlags);
+            COPYPTR(icc, lpbiOutput);
+            COPYPTR(icc, lpOutput);
+            COPYPTR(icc, lpbiInput);
+            COPYPTR(icc, lpInput);
+            COPYPTR(icc, lpckid);
+            COPYPTR(icc, lpdwFlags);
+            COPY(icc, lFrameNum);
+            COPY(icc, dwFrameSize);
+            COPY(icc, dwQuality);
+            COPYPTR(icc, lpbiPrev);
+            COPYPTR(icc, lpPrev);
+
+            *lParam1 = (DWORD)(icc);
+            *lParam2 = sizeof(ICCOMPRESS);
+        }
+        break;
+    case ICM_DECOMPRESS:
+        {
+            ICDECOMPRESS *icd = HeapAlloc(GetProcessHeap(), 0, sizeof(ICDECOMPRESS));
+            ICDECOMPRESS *icd16; /* Same structure except for the pointers */
+
+            icd16 = MapSL(*lParam1);
+            ret = icd16;
+
+            COPY(icd, dwFlags);
+            COPYPTR(icd, lpbiInput);
+            COPYPTR(icd, lpInput);
+            COPYPTR(icd, lpbiOutput);
+            COPYPTR(icd, lpOutput);
+            COPY(icd, ckid);
+
+            *lParam1 = (DWORD)(icd);
+            *lParam2 = sizeof(ICDECOMPRESS);
+        }
+        break;
+    case ICM_COMPRESS_BEGIN:
+    case ICM_COMPRESS_GET_FORMAT:
+    case ICM_COMPRESS_GET_SIZE:
+    case ICM_COMPRESS_QUERY:
+    case ICM_DECOMPRESS_GET_FORMAT:
+    case ICM_DECOMPRESS_QUERY:
+    case ICM_DECOMPRESS_BEGIN:
+    case ICM_DECOMPRESS_SET_PALETTE:
+    case ICM_DECOMPRESS_GET_PALETTE:
+        *lParam1 = (DWORD)MapSL(*lParam1);
+        *lParam2 = (DWORD)MapSL(*lParam2);
+        break;
+    case ICM_DECOMPRESSEX_QUERY:
+        if ((*lParam2 != sizeof(ICDECOMPRESSEX16)) && (*lParam2 != 0))
+            WARN("*lParam2 has unknown value %p\n", (ICDECOMPRESSEX16*)*lParam2);
+        /* FIXME: *lParm2 is meant to be 0 or an ICDECOMPRESSEX16*, but is sizeof(ICDECOMRPESSEX16)
+         * This is because of ICMessage(). Special case it?
+         {
+         LPVOID* addr = HeapAlloc(GetProcessHeap(), 0, 2*sizeof(LPVOID));
+         addr[0] = MSVIDEO_MapICDEX16To32(lParam1);
+         if (*lParam2)
+         addr[1] = MSVIDEO_MapICDEX16To32(lParam2);
+         else
+         addr[1] = 0;
+         
+         ret = addr;
+         }
+         break;*/
+    case ICM_DECOMPRESSEX_BEGIN:
+    case ICM_DECOMPRESSEX:
+        ret = MSVIDEO_MapICDEX16To32(lParam1);
+        *lParam2 = sizeof(ICDECOMPRESSEX);
+        break;
+    case ICM_DRAW_BEGIN:
+        {
+            ICDRAWBEGIN *icdb = HeapAlloc(GetProcessHeap(), 0, sizeof(ICDRAWBEGIN));
+            ICDRAWBEGIN16 *icdb16 = MapSL(*lParam1);
+            ret = icdb16;
+
+            COPY(icdb, dwFlags);
+            icdb->hpal = HPALETTE_32(icdb16->hpal);
+            icdb->hwnd = HWND_32(icdb16->hwnd);
+            icdb->hdc = HDC_32(icdb16->hdc);
+            COPY(icdb, xDst);
+            COPY(icdb, yDst);
+            COPY(icdb, dxDst);
+            COPY(icdb, dyDst);
+            COPYPTR(icdb, lpbi);
+            COPY(icdb, xSrc);
+            COPY(icdb, ySrc);
+            COPY(icdb, dxSrc);
+            COPY(icdb, dySrc);
+            COPY(icdb, dwRate);
+            COPY(icdb, dwScale);
+
+            *lParam1 = (DWORD)(icdb);
+            *lParam2 = sizeof(ICDRAWBEGIN);
+        }
+        break;
+    case ICM_DRAW_SUGGESTFORMAT:
+        {
+            ICDRAWSUGGEST *icds = HeapAlloc(GetProcessHeap(), 0, sizeof(ICDRAWSUGGEST));
+            ICDRAWSUGGEST16 *icds16 = MapSL(*lParam1);
+
+            ret = icds16;
+
+            COPY(icds, dwFlags);
+            COPYPTR(icds, lpbiIn);
+            COPYPTR(icds, lpbiSuggest);
+            COPY(icds, dxSrc);
+            COPY(icds, dySrc);
+            COPY(icds, dxDst);
+            COPY(icds, dyDst);
+            icds->hicDecompressor = HIC_32(icds16->hicDecompressor);
+
+            *lParam1 = (DWORD)(icds);
+            *lParam2 = sizeof(ICDRAWSUGGEST);
+        }
+        break;
+    case ICM_DRAW:
+        {
+            ICDRAW *icd = HeapAlloc(GetProcessHeap(), 0, sizeof(ICDRAW));
+            ICDRAW *icd16 = MapSL(*lParam1);
+            ret = icd16;
+
+            COPY(icd, dwFlags);
+            COPYPTR(icd, lpFormat);
+            COPYPTR(icd, lpData);
+            COPY(icd, cbData);
+            COPY(icd, lTime);
+
+            *lParam1 = (DWORD)(icd);
+            *lParam2 = sizeof(ICDRAW);
+        }
+        break;
+    case ICM_DRAW_START:
+    case ICM_DRAW_STOP:
+        break;
+    default:
+        FIXME("%d is not yet handled. Expect a crash.\n", msg);
+    }
+    return ret;
+}
+
+#undef COPY
+#undef COPYPTR
+
+/******************************************************************
+ *		MSVIDEO_UnmapMsg16To32
+ *
+ *
+ */
+static void MSVIDEO_UnmapMsg16To32(UINT msg, LPVOID data16, LPDWORD lParam1, LPDWORD lParam2)
+{
+    TRACE("Unmapping %d\n", msg);
+
+#define UNCOPY(x, y) (x##16->y = x->y);
+
+    switch (msg) 
+    {
+    case ICM_GETINFO:
+        {
+            ICINFO *ici = (ICINFO*)(*lParam1);
+            ICINFO16 *ici16 = (ICINFO16*)data16;
+
+            UNCOPY(ici, fccType);
+            UNCOPY(ici, fccHandler);
+            UNCOPY(ici, dwFlags);
+            UNCOPY(ici, dwVersion);
+            UNCOPY(ici, dwVersionICM);
+            WideCharToMultiByte( CP_ACP, 0, ici->szName, -1, ici16->szName, 
+                                 sizeof(ici16->szName), NULL, NULL );
+            ici16->szName[sizeof(ici16->szName)-1] = 0;
+            WideCharToMultiByte( CP_ACP, 0, ici->szDescription, -1, ici16->szDescription, 
+                                 sizeof(ici16->szDescription), NULL, NULL );
+            ici16->szDescription[sizeof(ici16->szDescription)-1] = 0;
+            /* This just gives garbage for some reason - BB
+               lstrcpynWtoA(ici16->szDriver, ici->szDriver, 128);*/
+
+            HeapFree(GetProcessHeap(), 0, ici);
+        }
+        break;
+    case ICM_DECOMPRESS_QUERY:
+        /*{
+          LPVOID* x = data16;
+          HeapFree(GetProcessHeap(), 0, x[0]);
+          if (x[1])
+          HeapFree(GetProcessHeap(), 0, x[1]);
+          }
+          break;*/
+    case ICM_COMPRESS:
+    case ICM_DECOMPRESS:
+    case ICM_DECOMPRESSEX_QUERY:
+    case ICM_DECOMPRESSEX_BEGIN:
+    case ICM_DECOMPRESSEX:
+    case ICM_DRAW_BEGIN:
+    case ICM_DRAW_SUGGESTFORMAT:
+    case ICM_DRAW:
+        HeapFree(GetProcessHeap(), 0, data16);
+        break;
+    default:
+        ERR("Unmapping unmapped msg %d\n", msg);
+    }
+#undef UNCOPY
+}
+
+/***********************************************************************
+ *		ICInfo				[MSVIDEO.200]
+ */
+BOOL16 VFWAPI ICInfo16(DWORD fccType, DWORD fccHandler, ICINFO16 *lpicinfo)
+{
+    BOOL16 ret;
+    LPVOID lpv;
+    DWORD lParam = (DWORD)lpicinfo;
+    DWORD size = ((ICINFO*)(MapSL((SEGPTR)lpicinfo)))->dwSize;
+    
+    /* Use the mapping functions to map the ICINFO structure */
+    lpv = MSVIDEO_MapMsg16To32(ICM_GETINFO, &lParam, &size);
+
+    ret = ICInfo(fccType, fccHandler, (ICINFO*)lParam);
+
+    MSVIDEO_UnmapMsg16To32(ICM_GETINFO, lpv, &lParam, &size);
+
+    return ret;
+}
+
+/******************************************************************
+ *		IC_Callback3216
+ *
+ *
+ */
+static  LRESULT CALLBACK  IC_Callback3216(HIC hic, HDRVR hdrv, UINT msg, DWORD lp1, DWORD lp2)
+{
+    WINE_HIC*   whic;
+    LRESULT     ret = 0;
+    WORD args[8];
+
+    whic = MSVIDEO_GetHicPtr(hic);
+    if (whic)
+    {
+        switch (msg)
+        {
+        case DRV_OPEN:
+            lp2 = (DWORD)MapLS((void*)lp2);
+            break;
+        }
+        args[7] = HIWORD(hic);
+        args[6] = LOWORD(hic);
+        args[5] = HDRVR_16(whic->hdrv);
+        args[4] = msg;
+        args[3] = HIWORD(lp1);
+        args[2] = LOWORD(lp1);
+        args[1] = HIWORD(lp2);
+        args[0] = LOWORD(lp2);
+        WOWCallback16Ex( (DWORD)whic->driverproc16, WCB16_PASCAL, sizeof(args), args, &ret );
+
+        switch (msg)
+        {
+        case DRV_OPEN:
+            UnMapLS(lp2);
+            break;
+        }
+    }
+    else ret = ICERR_BADHANDLE;
+    return ret;
+}
+
+/***********************************************************************
+ *		ICOpenFunction			[MSVIDEO.206]
+ */
+HIC16 VFWAPI ICOpenFunction16(DWORD fccType, DWORD fccHandler, UINT16 wMode, FARPROC16 lpfnHandler)
+{
+    HIC         hic32;
+
+    hic32 = MSVIDEO_OpenFunction(fccType, fccHandler, wMode, 
+                                 (DRIVERPROC)IC_Callback3216, (DWORD)lpfnHandler);
+    return HIC_16(hic32);
+}
+
+/***********************************************************************
+ *		ICSendMessage			[MSVIDEO.205]
+ */
+LRESULT VFWAPI ICSendMessage16(HIC16 hic, UINT16 msg, DWORD lParam1, DWORD lParam2) 
+{
+    LRESULT     ret = ICERR_BADHANDLE;
+    WINE_HIC*   whic;
+
+    whic = MSVIDEO_GetHicPtr(HIC_32(hic));
+    if (whic)
+    {
+        /* we've got a 16 bit driver proc... call it directly */
+        if (whic->driverproc16)
+        {
+            WORD args[8];
+
+            /* FIXME: original code was passing hdrv first and hic second */
+            /* but this doesn't match what IC_Callback3216 does */
+            args[7] = HIWORD(hic);
+            args[6] = LOWORD(hic);
+            args[5] = HDRVR_16(whic->hdrv);
+            args[4] = msg;
+            args[3] = HIWORD(lParam1);
+            args[2] = LOWORD(lParam1);
+            args[1] = HIWORD(lParam2);
+            args[0] = LOWORD(lParam2);
+            WOWCallback16Ex( (DWORD)whic->driverproc16, WCB16_PASCAL, sizeof(args), args, &ret );
+        }
+        else
+        {
+            /* map the message for a 32 bit infrastructure, and pass it along */
+            void*       data16 = MSVIDEO_MapMsg16To32(msg, &lParam1, &lParam2);
+    
+            ret = MSVIDEO_SendMessage(whic, msg, lParam1, lParam2);
+            if (data16)
+                MSVIDEO_UnmapMsg16To32(msg, data16, &lParam1, &lParam2);
+        }
+    }
+    return ret;
+}
+
+/***********************************************************************
+ *		VideoCapDriverDescAndVer	[MSVIDEO.22]
+ */
+DWORD WINAPI VideoCapDriverDescAndVer16(WORD nr, LPSTR buf1, WORD buf1len,
+                                        LPSTR buf2, WORD buf2len)
+{
+    DWORD	verhandle;
+    DWORD	infosize;
+    UINT	subblocklen;
+    char	*s, buf[2048], fn[260];
+    LPBYTE	infobuf;
+    LPVOID	subblock;
+    DWORD	i, cnt = 0, lRet;
+    DWORD	bufLen, fnLen;
+    FILETIME	lastWrite;
+    HKEY	hKey;
+    BOOL        found = FALSE;
+
+    TRACE("(%d,%p,%d,%p,%d)\n", nr, buf1, buf1len, buf2, buf2len);
+    lRet = RegOpenKeyExA(HKEY_LOCAL_MACHINE, HKLM_DRIVERS32, 0, KEY_QUERY_VALUE, &hKey);
+    if (lRet == ERROR_SUCCESS) 
+    {
+	RegQueryInfoKeyA( hKey, 0, 0, 0, &cnt, 0, 0, 0, 0, 0, 0, 0);
+	for (i = 0; i < cnt; i++) 
+	{
+	    bufLen = sizeof(buf) / sizeof(buf[0]);
+	    lRet = RegEnumKeyExA(hKey, i, buf, &bufLen, 0, 0, 0, &lastWrite);
+	    if (lRet != ERROR_SUCCESS) continue;
+	    if (strncasecmp(buf, "vid", 3)) continue;
+	    if (nr--) continue;
+	    fnLen = sizeof(fn);
+	    lRet = RegQueryValueExA(hKey, buf, 0, 0, fn, &fnLen);
+	    if (lRet == ERROR_SUCCESS) found = TRUE;
+	    break;
+	}
+    	RegCloseKey( hKey );
+    } 
+
+    /* search system.ini if not found in the registry */
+    if (!found && GetPrivateProfileStringA("drivers32", NULL, NULL, buf, sizeof(buf), "system.ini"))
+    {
+	for (s = buf; *s; s += strlen(s) + 1)
+	{
+	    if (strncasecmp(s, "vid", 3)) continue;
+	    if (nr--) continue;
+	    if (GetPrivateProfileStringA("drivers32", s, NULL, fn, sizeof(fn), "system.ini"))
+		found = TRUE;
+	    break;
+	}
+    }
+
+    if (nr || !found) 
+    {
+        TRACE("No more VID* entries found nr=%d\n", nr);
+        return 20;
+    }
+    infosize = GetFileVersionInfoSizeA(fn, &verhandle);
+    if (!infosize) 
+    {
+        TRACE("%s has no fileversioninfo.\n", fn);
+        return 18;
+    }
+    infobuf = HeapAlloc(GetProcessHeap(), 0, infosize);
+    if (GetFileVersionInfoA(fn, verhandle, infosize, infobuf)) 
+    {
+        char	vbuf[200];
+        /* Yes, two space behind : */
+        /* FIXME: test for buflen */
+        sprintf(vbuf, "Version:  %d.%d.%d.%d\n", 
+                ((WORD*)infobuf)[0x0f],
+                ((WORD*)infobuf)[0x0e],
+                ((WORD*)infobuf)[0x11],
+                ((WORD*)infobuf)[0x10]
+	    );
+        TRACE("version of %s is %s\n", fn, vbuf);
+        strncpy(buf2, vbuf, buf2len);
+    }
+    else 
+    {
+        TRACE("GetFileVersionInfoA failed for %s.\n", fn);
+        strncpy(buf2, fn, buf2len); /* msvideo.dll appears to copy fn*/
+    }
+    /* FIXME: language problem? */
+    if (VerQueryValueA(	infobuf,
+                        "\\StringFileInfo\\040904E4\\FileDescription",
+                        &subblock,
+                        &subblocklen
+            )) 
+    {
+        TRACE("VQA returned %s\n", (LPCSTR)subblock);
+        strncpy(buf1, subblock, buf1len);
+    }
+    else 
+    {
+        TRACE("VQA did not return on query \\StringFileInfo\\040904E4\\FileDescription?\n");
+        strncpy(buf1, fn, buf1len); /* msvideo.dll appears to copy fn*/
+    }
+    HeapFree(GetProcessHeap(), 0, infobuf);
+    return 0;
+}
+
+/******************************************************************
+ *		IC_CallTo16
+ *
+ *
+ */
+static  LRESULT CALLBACK IC_CallTo16(HDRVR hdrv, HIC hic, UINT msg, LPARAM lp1, LPARAM lp2)
+{
+#if 0
+    WINE_HIC*   whic = IC_GetPtr(hic);
+    LRESULT     ret = 0;
+    
+    
+    if (whic->driverproc) 
+    {
+        ret = whic->driverproc(hic, whic->hdrv, msg, lParam1, lParam2);
+    }
+    else
+    {
+        ret = SendDriverMessage(whic->hdrv, msg, lParam1, lParam2);
+    }
+#else
+    FIXME("No 32=>16 conversion yet\n");
+#endif
+    return 0;
+}
+
+/**************************************************************************
+ *                      DllEntryPoint (MSVIDEO.300)
+ *
+ * MSVIDEO DLL entry point
+ *
+ */
+BOOL WINAPI VIDEO_LibMain(DWORD fdwReason, HINSTANCE hinstDLL, WORD ds,
+                          WORD wHeapSize, DWORD dwReserved1, WORD wReserved2)
+{
+    switch (fdwReason) 
+    {
+    case DLL_PROCESS_ATTACH:
+        /* hook in our 16 bit management functions */
+        pFnCallTo16 = IC_CallTo16;
+        break;
+    case DLL_PROCESS_DETACH:
+        /* remove our 16 bit management functions */
+        pFnCallTo16 = NULL;
+        break;
+    case DLL_THREAD_ATTACH:
+    case DLL_THREAD_DETACH:
+        break;
+    }
+    return TRUE;
+}
diff --git a/reactos/lib/msvideo/msvideo_main.c b/reactos/lib/msvideo/msvideo_main.c
new file mode 100644
index 00000000000..0d918edb32c
--- /dev/null
+++ b/reactos/lib/msvideo/msvideo_main.c
@@ -0,0 +1,1184 @@
+/*
+ * Copyright 1998 Marcus Meissner
+ * Copyright 2000 Bradley Baetz
+ * Copyright 2003 Michael Günnewig
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * FIXME: This all assumes 32 bit codecs
+ *		Win95 appears to prefer 32 bit codecs, even from 16 bit code.
+ *		There is the ICOpenFunction16 to worry about still, though.
+ *      
+ * TODO
+ *      - no thread safety
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include "msvideo_private.h"
+#include "winnls.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winreg.h"
+
+#include "windowsx.h"
+
+#include "wine/debug.h"
+
+/* Drivers32 settings */
+#define HKLM_DRIVERS32 "Software\\Microsoft\\Windows NT\\CurrentVersion\\Drivers32"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvideo);
+
+static inline const char *wine_dbgstr_fcc( DWORD fcc )
+{
+    return wine_dbg_sprintf("%c%c%c%c", 
+                            LOBYTE(LOWORD(fcc)), HIBYTE(LOWORD(fcc)),
+                            LOBYTE(HIWORD(fcc)), HIBYTE(HIWORD(fcc)));
+}
+
+LRESULT (CALLBACK *pFnCallTo16)(HDRVR, HIC, UINT, LPARAM, LPARAM) = NULL;
+
+static WINE_HIC*        MSVIDEO_FirstHic /* = NULL */;
+
+typedef struct _reg_driver reg_driver;
+struct _reg_driver
+{
+    DWORD       fccType;
+    DWORD       fccHandler;
+    DRIVERPROC  proc;
+    LPWSTR      name;
+    reg_driver* next;
+};
+
+static reg_driver* reg_driver_list = NULL;
+
+/* This one is a macro such that it works for both ASCII and Unicode */
+#define fourcc_to_string(str, fcc) do { \
+	(str)[0] = LOBYTE(LOWORD(fcc)); \
+	(str)[1] = HIBYTE(LOWORD(fcc)); \
+	(str)[2] = LOBYTE(HIWORD(fcc)); \
+	(str)[3] = HIBYTE(HIWORD(fcc)); \
+	} while(0)
+
+HMODULE MSVFW32_hModule;
+
+BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
+{
+    TRACE("%p,%lx,%p\n", hinst, reason, reserved);
+
+    switch(reason)
+    {
+        case DLL_PROCESS_ATTACH:
+            DisableThreadLibraryCalls(hinst);
+            MSVFW32_hModule = (HMODULE)hinst;
+            break;
+    }
+    return TRUE;
+}
+
+static int compare_fourcc(DWORD fcc1, DWORD fcc2)
+{
+  char fcc_str1[4];
+  char fcc_str2[4];
+  fourcc_to_string(fcc_str1, fcc1);
+  fourcc_to_string(fcc_str2, fcc2);
+  return strncasecmp(fcc_str1, fcc_str2, 4);
+}
+
+typedef BOOL (*enum_handler_t)(const char*, int, void*);
+
+static BOOL enum_drivers(DWORD fccType, enum_handler_t handler, void* param)
+{
+    CHAR buf[2048], fccTypeStr[5], *s;
+    DWORD i, cnt = 0, bufLen, lRet;
+    BOOL result = FALSE;
+    FILETIME lastWrite;
+    HKEY hKey;
+
+    fourcc_to_string(fccTypeStr, fccType);
+    fccTypeStr[4] = '.';
+
+    /* first, go through the registry entries */
+    lRet = RegOpenKeyExA(HKEY_LOCAL_MACHINE, HKLM_DRIVERS32, 0, KEY_QUERY_VALUE, &hKey);
+    if (lRet == ERROR_SUCCESS) 
+    {
+	RegQueryInfoKeyA( hKey, 0, 0, 0, &cnt, 0, 0, 0, 0, 0, 0, 0);
+	for (i = 0; i < cnt; i++) 
+	{
+	    bufLen = sizeof(buf) / sizeof(buf[0]);
+	    lRet = RegEnumKeyExA(hKey, i, buf, &bufLen, 0, 0, 0, &lastWrite);
+	    if (lRet != ERROR_SUCCESS) continue;
+	    if (strncasecmp(buf, fccTypeStr, 5) || buf[9] != '=') continue;
+	    if ((result = handler(buf, i, param))) break;
+	}
+    	RegCloseKey( hKey );
+    }
+    if (result) return result;
+
+    /* if that didn't work, go through the values in system.ini */
+    if (GetPrivateProfileSectionA("drivers32", buf, sizeof(buf), "system.ini")) 
+    {
+	for (s = buf; *s; cnt++, s += strlen(s) + 1)
+	{
+	    if (strncasecmp(s, fccTypeStr, 5) || s[9] != '=') continue;
+	    if ((result = handler(s, cnt, param))) break;
+	}
+    }
+
+    return result;
+}
+
+/******************************************************************
+ *		MSVIDEO_GetHicPtr
+ *
+ *
+ */
+WINE_HIC*   MSVIDEO_GetHicPtr(HIC hic)
+{
+    WINE_HIC*   whic;
+
+    for (whic = MSVIDEO_FirstHic; whic && whic->hic != hic; whic = whic->next);
+    return whic;
+}
+
+/***********************************************************************
+ *		VideoForWindowsVersion		[MSVFW32.2]
+ *		VideoForWindowsVersion		[MSVIDEO.2]
+ * Returns the version in major.minor form.
+ * In Windows95 this returns 0x040003b6 (4.950)
+ */
+DWORD WINAPI VideoForWindowsVersion(void) 
+{
+    return 0x040003B6; /* 4.950 */
+}
+
+static BOOL ICInfo_enum_handler(const char *drv, int nr, void *param)
+{
+    ICINFO *lpicinfo = (ICINFO *)param;
+    DWORD fccHandler = mmioStringToFOURCCA(drv + 5, 0);
+
+    /* exact match of fccHandler or nth driver found */
+    if ((lpicinfo->fccHandler != nr) && (lpicinfo->fccHandler != fccHandler))
+	return FALSE;
+
+    lpicinfo->fccType = mmioStringToFOURCCA(drv, 0);
+    lpicinfo->fccHandler = fccHandler;
+    lpicinfo->dwFlags = 0;
+    lpicinfo->dwVersion = 0;
+    lpicinfo->dwVersionICM = 0x104;
+    lpicinfo->szName[0] = 0;
+    lpicinfo->szDescription[0] = 0;
+    MultiByteToWideChar(CP_ACP, 0, drv + 10, -1, lpicinfo->szDriver, 
+			sizeof(lpicinfo->szDriver)/sizeof(WCHAR));
+
+    return TRUE;
+}
+
+/***********************************************************************
+ *		ICInfo				[MSVFW32.@]
+ * Get information about an installable compressor. Return TRUE if there
+ * is one.
+ *
+ * PARAMS
+ *   fccType     [I] type of compressor (e.g. 'vidc')
+ *   fccHandler  [I] real fcc for handler or <n>th compressor
+ *   lpicinfo    [O] information about compressor
+ */
+BOOL VFWAPI ICInfo( DWORD fccType, DWORD fccHandler, ICINFO *lpicinfo)
+{
+    TRACE("(%s,%s/%08lx,%p)\n", 
+          wine_dbgstr_fcc(fccType), wine_dbgstr_fcc(fccHandler), fccHandler, lpicinfo);
+
+    lpicinfo->fccHandler = fccHandler;
+    return enum_drivers(fccType, ICInfo_enum_handler, lpicinfo);
+}
+
+static DWORD IC_HandleRef = 1;
+
+/***********************************************************************
+ *		ICInstall			[MSVFW32.@]
+ */
+BOOL VFWAPI ICInstall(DWORD fccType, DWORD fccHandler, LPARAM lParam, LPSTR szDesc, UINT wFlags) 
+{
+    reg_driver* driver;
+    unsigned len;
+
+    TRACE("(%s,%s,%p,%p,0x%08x)\n", wine_dbgstr_fcc(fccType), wine_dbgstr_fcc(fccHandler), (void*)lParam, szDesc, wFlags);
+
+    /* Check if a driver is already registered */
+    for (driver = reg_driver_list; driver; driver = driver->next)
+    {
+        if (!compare_fourcc(fccType, driver->fccType) &&
+            !compare_fourcc(fccHandler, driver->fccHandler))
+            break;
+    }
+    if (driver) return FALSE;
+
+    /* Register the driver */
+    driver = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(reg_driver));
+    if (!driver) goto oom;
+    driver->fccType = fccType;
+    driver->fccHandler = fccHandler;
+
+    switch(wFlags)
+    {
+    case ICINSTALL_FUNCTION:
+        driver->proc = (DRIVERPROC)lParam;
+	driver->name = NULL;
+        break;
+    case ICINSTALL_DRIVER:
+	driver->proc = NULL;
+        len = MultiByteToWideChar(CP_ACP, 0, (char*)lParam, -1, NULL, 0);
+        driver->name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
+        if (!driver->name) goto oom;
+        MultiByteToWideChar(CP_ACP, 0, (char*)lParam, -1, driver->name, len);
+	break;
+    default:
+	ERR("Invalid flags!\n");
+	HeapFree(GetProcessHeap(), 0, driver);
+	return FALSE;
+   }
+
+   /* Insert our driver in the list*/
+   driver->next = reg_driver_list;
+   reg_driver_list = driver;
+    
+   return TRUE;
+ oom:
+   if (driver) HeapFree(GetProcessHeap(), 0, driver);
+   return FALSE;
+}
+
+/***********************************************************************
+ *		ICRemove			[MSVFW32.@]
+ */
+BOOL VFWAPI ICRemove(DWORD fccType, DWORD fccHandler, UINT wFlags) 
+{
+    reg_driver** pdriver;
+    
+    TRACE("(%s,%s,0x%08x)\n", wine_dbgstr_fcc(fccType), wine_dbgstr_fcc(fccHandler), wFlags);
+
+    /* Check if a driver is already registered */
+    for (pdriver = &reg_driver_list; *pdriver; pdriver = &(*pdriver)->next)
+    {
+        if (!compare_fourcc(fccType, (*pdriver)->fccType) &&
+            !compare_fourcc(fccHandler, (*pdriver)->fccHandler))
+            break;
+    }
+    if (!*pdriver)
+        return FALSE;
+
+    /* Remove the driver from the list */
+    *pdriver = (*pdriver)->next;
+    if ((*pdriver)->name)
+        HeapFree(GetProcessHeap(), 0, (*pdriver)->name);
+    HeapFree(GetProcessHeap(), 0, *pdriver);
+    
+    return TRUE;  
+}
+
+
+/***********************************************************************
+ *		ICOpen				[MSVFW32.@]
+ * Opens an installable compressor. Return special handle.
+ */
+HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode) 
+{
+    WCHAR		codecname[10];
+    ICOPEN		icopen;
+    HDRVR		hdrv;
+    WINE_HIC*           whic;
+    BOOL                bIs16;
+    static const WCHAR  drv32W[] = {'d','r','i','v','e','r','s','3','2','\0'};
+    reg_driver*         driver;
+
+    TRACE("(%s,%s,0x%08x)\n", wine_dbgstr_fcc(fccType), wine_dbgstr_fcc(fccHandler), wMode);
+
+    /* Check if there is a registered driver that matches */
+    driver = reg_driver_list;
+    while(driver)
+        if (!compare_fourcc(fccType, driver->fccType) &&
+            !compare_fourcc(fccHandler, driver->fccHandler))
+	    break;
+        else
+            driver = driver->next;
+
+    if (driver && driver->proc)
+	/* The driver has been registered at runtime with its driverproc */
+        return MSVIDEO_OpenFunction(fccType, fccHandler, wMode, (DRIVERPROC)driver->proc, (DWORD)NULL);
+  
+    /* Well, lParam2 is in fact a LPVIDEO_OPEN_PARMS, but it has the
+     * same layout as ICOPEN
+     */
+    icopen.dwSize		= sizeof(ICOPEN);
+    icopen.fccType		= fccType;
+    icopen.fccHandler	        = fccHandler;
+    icopen.dwVersion            = 0x00001000; /* FIXME */
+    icopen.dwFlags		= wMode;
+    icopen.dwError              = 0;
+    icopen.pV1Reserved          = NULL;
+    icopen.pV2Reserved          = NULL;
+    icopen.dnDevNode            = 0; /* FIXME */
+	
+    if (!driver) {
+        /* The driver is registered in the registry */
+	fourcc_to_string(codecname, fccType);
+        codecname[4] = '.';
+	fourcc_to_string(codecname + 5, fccHandler);
+        codecname[9] = '\0';
+
+        hdrv = OpenDriver(codecname, drv32W, (LPARAM)&icopen);
+        if (!hdrv) 
+        {
+            if (fccType == streamtypeVIDEO) 
+            {
+		codecname[0] = 'v';
+		codecname[1] = 'i';
+		codecname[2] = 'd';
+		codecname[3] = 'c';
+
+		fccType = ICTYPE_VIDEO;
+                hdrv = OpenDriver(codecname, drv32W, (LPARAM)&icopen);
+	    }
+            if (!hdrv)
+                return 0;
+	}
+    } else {
+        /* The driver has been registered at runtime with its name */
+        hdrv = OpenDriver(driver->name, NULL, (LPARAM)&icopen);
+        if (!hdrv) 
+            return 0; 
+    }
+    bIs16 = GetDriverFlags(hdrv) & 0x10000000; /* undocumented flag: WINE_GDF_16BIT */
+
+    if (bIs16 && !pFnCallTo16)
+    {
+        FIXME("Got a 16 bit driver, but no 16 bit support in msvfw\n");
+        return 0;
+    }
+    whic = HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_HIC));
+    if (!whic)
+    {
+        CloseDriver(hdrv, 0, 0);
+        return FALSE;
+    }
+    whic->hdrv          = hdrv;
+    /* FIXME: is the signature the real one ? */
+    whic->driverproc    = bIs16 ? (DRIVERPROC)pFnCallTo16 : NULL;
+    whic->driverproc16  = 0;
+    whic->type          = fccType;
+    whic->handler       = fccHandler;
+    while (MSVIDEO_GetHicPtr(HIC_32(IC_HandleRef)) != NULL) IC_HandleRef++;
+    whic->hic           = HIC_32(IC_HandleRef++);
+    whic->next          = MSVIDEO_FirstHic;
+    MSVIDEO_FirstHic = whic;
+
+    TRACE("=> %p\n", whic->hic);
+    return whic->hic;
+}
+
+/***********************************************************************
+ *		MSVIDEO_OpenFunction
+ */
+HIC MSVIDEO_OpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, 
+                         DRIVERPROC lpfnHandler, DWORD lpfnHandler16) 
+{
+    ICOPEN      icopen;
+    WINE_HIC*   whic;
+
+    TRACE("(%s,%s,%d,%p,%08lx)\n", 
+          wine_dbgstr_fcc(fccType), wine_dbgstr_fcc(fccHandler), wMode, lpfnHandler, lpfnHandler16);
+
+    icopen.dwSize		= sizeof(ICOPEN);
+    icopen.fccType		= fccType;
+    icopen.fccHandler	        = fccHandler;
+    icopen.dwVersion            = 0x00001000; /* FIXME */
+    icopen.dwFlags		= wMode;
+    icopen.dwError              = 0;
+    icopen.pV1Reserved          = NULL;
+    icopen.pV2Reserved          = NULL;
+    icopen.dnDevNode            = 0; /* FIXME */
+
+    whic = HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_HIC));
+    if (!whic) return 0;
+
+    whic->driverproc   = lpfnHandler;
+    whic->driverproc16 = lpfnHandler16;
+    while (MSVIDEO_GetHicPtr(HIC_32(IC_HandleRef)) != NULL) IC_HandleRef++;
+    whic->hic          = HIC_32(IC_HandleRef++);
+    whic->next         = MSVIDEO_FirstHic;
+    MSVIDEO_FirstHic = whic;
+
+    /* Now try opening/loading the driver. Taken from DRIVER_AddToList */
+    /* What if the function is used more than once? */
+
+    if (MSVIDEO_SendMessage(whic, DRV_LOAD, 0L, 0L) != DRV_SUCCESS) 
+    {
+        WARN("DRV_LOAD failed for hic %p\n", whic->hic);
+        MSVIDEO_FirstHic = whic->next;
+        HeapFree(GetProcessHeap(), 0, whic);
+        return 0;
+    }
+    /* return value is not checked */
+    MSVIDEO_SendMessage(whic, DRV_ENABLE, 0L, 0L);
+
+    whic->driverId = (DWORD)MSVIDEO_SendMessage(whic, DRV_OPEN, 0, (DWORD)&icopen);
+    /* FIXME: What should we put here? */
+    whic->hdrv = (HDRVR)0;
+    
+    if (whic->driverId == 0) 
+    {
+        WARN("DRV_OPEN failed for hic %p\n", whic->hic);
+        MSVIDEO_FirstHic = whic->next;
+        HeapFree(GetProcessHeap(), 0, whic);
+        return 0;
+    }
+
+    TRACE("=> %p\n", whic->hic);
+    return whic->hic;
+}
+
+/***********************************************************************
+ *		ICOpenFunction			[MSVFW32.@]
+ */
+HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, FARPROC lpfnHandler) 
+{
+    return MSVIDEO_OpenFunction(fccType, fccHandler, wMode, (DRIVERPROC)lpfnHandler, 0);
+}
+
+/***********************************************************************
+ *		ICGetInfo			[MSVFW32.@]
+ */
+LRESULT VFWAPI ICGetInfo(HIC hic, ICINFO *picinfo, DWORD cb) 
+{
+    LRESULT	ret;
+    WINE_HIC*   whic = MSVIDEO_GetHicPtr(hic);
+
+    TRACE("(%p,%p,%ld)\n", hic, picinfo, cb);
+
+    whic = MSVIDEO_GetHicPtr(hic);
+    if (!whic) return ICERR_BADHANDLE;
+    if (!picinfo) return MMSYSERR_INVALPARAM;
+
+    /* (WS) The field szDriver should be initialized because the driver 
+     * is not obliged and often will not do it. Some applications, like
+     * VirtualDub, rely on this field and will occasionally crash if it
+     * goes unitialized.
+     */
+    if (cb >= sizeof(ICINFO)) picinfo->szDriver[0] = '\0';
+
+    ret = ICSendMessage(hic, ICM_GETINFO, (DWORD)picinfo, cb);
+
+    /* (WS) When szDriver was not supplied by the driver itself, apparently 
+     * Windows will set its value equal to the driver file name. This can
+     * be obtained from the registry as we do here.
+     */
+    if (cb >= sizeof(ICINFO) && picinfo->szDriver[0] == 0)
+    {
+        ICINFO  ii;
+
+        memset(&ii, 0, sizeof(ii));
+        ii.dwSize = sizeof(ii);
+        ICInfo(picinfo->fccType, picinfo->fccHandler, &ii);
+        lstrcpyW(picinfo->szDriver, ii.szDriver);
+    }
+
+    TRACE("	-> 0x%08lx\n", ret);
+    return ret;
+}
+
+typedef struct {
+    DWORD fccType;
+    DWORD fccHandler;
+    LPBITMAPINFOHEADER lpbiIn;
+    LPBITMAPINFOHEADER lpbiOut;
+    WORD wMode;
+    DWORD querymsg;
+    HIC hic;
+} driver_info_t;
+
+static HIC try_driver(driver_info_t *info)
+{
+    HIC   hic;
+
+    if ((hic = ICOpen(info->fccType, info->fccHandler, info->wMode))) 
+    {
+	if (!ICSendMessage(hic, info->querymsg, (DWORD)info->lpbiIn, (DWORD)info->lpbiOut))
+	    return hic;
+	ICClose(hic);
+    }
+    return 0;
+}
+
+static BOOL ICLocate_enum_handler(const char *drv, int nr, void *param)
+{
+    driver_info_t *info = (driver_info_t *)param;
+    info->fccHandler = mmioStringToFOURCCA(drv + 5, 0);
+    info->hic = try_driver(info);
+    return info->hic != 0;
+}
+
+/***********************************************************************
+ *		ICLocate			[MSVFW32.@]
+ */
+HIC VFWAPI ICLocate(DWORD fccType, DWORD fccHandler, LPBITMAPINFOHEADER lpbiIn,
+                    LPBITMAPINFOHEADER lpbiOut, WORD wMode)
+{
+    driver_info_t info;
+
+    TRACE("(%s,%s,%p,%p,0x%04x)\n", 
+          wine_dbgstr_fcc(fccType), wine_dbgstr_fcc(fccHandler), lpbiIn, lpbiOut, wMode);
+
+    info.fccType = fccType;
+    info.fccHandler = fccHandler;
+    info.lpbiIn = lpbiIn;
+    info.lpbiOut = lpbiOut;
+    info.wMode = wMode;
+
+    switch (wMode) 
+    {
+    case ICMODE_FASTCOMPRESS:
+    case ICMODE_COMPRESS:
+        info.querymsg = ICM_COMPRESS_QUERY;
+        break;
+    case ICMODE_FASTDECOMPRESS:
+    case ICMODE_DECOMPRESS:
+        info.querymsg = ICM_DECOMPRESS_QUERY;
+        break;
+    case ICMODE_DRAW:
+        info.querymsg = ICM_DRAW_QUERY;
+        break;
+    default:
+        WARN("Unknown mode (%d)\n", wMode);
+        return 0;
+    }
+
+    /* Easy case: handler/type match, we just fire a query and return */
+    info.hic = try_driver(&info);
+    /* If it didn't work, try each driver in turn. 32 bit codecs only. */
+    /* FIXME: Move this to an init routine? */
+    if (!info.hic) enum_drivers(fccType, ICLocate_enum_handler, &info);
+
+    if (info.hic) 
+    {
+        TRACE("=> %p\n", info.hic);
+	return info.hic;
+    }
+
+    if (fccType == streamtypeVIDEO) 
+        return ICLocate(ICTYPE_VIDEO, fccHandler, lpbiIn, lpbiOut, wMode);
+    
+    WARN("(%s,%s,%p,%p,0x%04x) not found!\n",
+         wine_dbgstr_fcc(fccType), wine_dbgstr_fcc(fccHandler), lpbiIn, lpbiOut, wMode);
+    return 0;
+}
+
+/***********************************************************************
+ *		ICGetDisplayFormat			[MSVFW32.@]
+ */
+HIC VFWAPI ICGetDisplayFormat(
+	HIC hic,LPBITMAPINFOHEADER lpbiIn,LPBITMAPINFOHEADER lpbiOut,
+	INT depth,INT dx,INT dy)
+{
+	HIC	tmphic = hic;
+
+	TRACE("(%p,%p,%p,%d,%d,%d)!\n",hic,lpbiIn,lpbiOut,depth,dx,dy);
+
+	if (!tmphic) {
+		tmphic=ICLocate(ICTYPE_VIDEO,0,lpbiIn,NULL,ICMODE_DECOMPRESS);
+		if (!tmphic)
+			return tmphic;
+	}
+	if ((dy == lpbiIn->biHeight) && (dx == lpbiIn->biWidth))
+		dy = dx = 0; /* no resize needed */
+
+	/* Can we decompress it ? */
+	if (ICDecompressQuery(tmphic,lpbiIn,NULL) != 0)
+		goto errout; /* no, sorry */
+
+	ICDecompressGetFormat(tmphic,lpbiIn,lpbiOut);
+
+	if (lpbiOut->biCompression != 0) {
+	   FIXME("Ooch, how come decompressor outputs compressed data (%ld)??\n",
+			 lpbiOut->biCompression);
+	}
+	if (lpbiOut->biSize < sizeof(*lpbiOut)) {
+	   FIXME("Ooch, size of output BIH is too small (%ld)\n",
+			 lpbiOut->biSize);
+	   lpbiOut->biSize = sizeof(*lpbiOut);
+	}
+	if (!depth) {
+		HDC	hdc;
+
+		hdc = GetDC(0);
+		depth = GetDeviceCaps(hdc,BITSPIXEL)*GetDeviceCaps(hdc,PLANES);
+		ReleaseDC(0,hdc);
+		if (depth==15)	depth = 16;
+		if (depth<8)	depth =  8;
+	}
+	if (lpbiIn->biBitCount == 8)
+		depth = 8;
+
+	TRACE("=> %p\n", tmphic);
+	return tmphic;
+errout:
+	if (hic!=tmphic)
+		ICClose(tmphic);
+
+	TRACE("=> 0\n");
+	return 0;
+}
+
+/***********************************************************************
+ *		ICCompress			[MSVFW32.@]
+ */
+DWORD VFWAPIV
+ICCompress(
+	HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiOutput,LPVOID lpData,
+	LPBITMAPINFOHEADER lpbiInput,LPVOID lpBits,LPDWORD lpckid,
+	LPDWORD lpdwFlags,LONG lFrameNum,DWORD dwFrameSize,DWORD dwQuality,
+	LPBITMAPINFOHEADER lpbiPrev,LPVOID lpPrev)
+{
+	ICCOMPRESS	iccmp;
+
+	TRACE("(%p,%ld,%p,%p,%p,%p,...)\n",hic,dwFlags,lpbiOutput,lpData,lpbiInput,lpBits);
+
+	iccmp.dwFlags		= dwFlags;
+
+	iccmp.lpbiOutput	= lpbiOutput;
+	iccmp.lpOutput		= lpData;
+	iccmp.lpbiInput		= lpbiInput;
+	iccmp.lpInput		= lpBits;
+
+	iccmp.lpckid		= lpckid;
+	iccmp.lpdwFlags		= lpdwFlags;
+	iccmp.lFrameNum		= lFrameNum;
+	iccmp.dwFrameSize	= dwFrameSize;
+	iccmp.dwQuality		= dwQuality;
+	iccmp.lpbiPrev		= lpbiPrev;
+	iccmp.lpPrev		= lpPrev;
+	return ICSendMessage(hic,ICM_COMPRESS,(DWORD)&iccmp,sizeof(iccmp));
+}
+
+/***********************************************************************
+ *		ICDecompress			[MSVFW32.@]
+ */
+DWORD VFWAPIV  ICDecompress(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiFormat,
+				LPVOID lpData,LPBITMAPINFOHEADER lpbi,LPVOID lpBits)
+{
+	ICDECOMPRESS	icd;
+	DWORD ret;
+
+	TRACE("(%p,%ld,%p,%p,%p,%p)\n",hic,dwFlags,lpbiFormat,lpData,lpbi,lpBits);
+
+	TRACE("lpBits[0] == %lx\n",((LPDWORD)lpBits)[0]);
+
+	icd.dwFlags	= dwFlags;
+	icd.lpbiInput	= lpbiFormat;
+	icd.lpInput	= lpData;
+
+	icd.lpbiOutput	= lpbi;
+	icd.lpOutput	= lpBits;
+	icd.ckid	= 0;
+	ret = ICSendMessage(hic,ICM_DECOMPRESS,(DWORD)&icd,sizeof(ICDECOMPRESS));
+
+	TRACE("lpBits[0] == %lx\n",((LPDWORD)lpBits)[0]);
+
+	TRACE("-> %ld\n",ret);
+
+	return ret;
+}
+
+
+/***********************************************************************
+ *		ICCompressorChoose   [MSVFW32.@]
+ */
+BOOL VFWAPI ICCompressorChoose(HWND hwnd, UINT uiFlags, LPVOID pvIn,
+                               LPVOID lpData, PCOMPVARS pc, LPSTR lpszTitle)
+{
+  FIXME("(%p,0x%X,%p,%p,%p,%s),stub!\n",hwnd,uiFlags,pvIn,lpData,pc,lpszTitle);
+
+  if (pc == NULL || pc->cbSize != sizeof(COMPVARS))
+    return FALSE;
+
+  if ((pc->dwFlags & ICMF_COMPVARS_VALID) == 0) {
+    pc->dwFlags   = 0;
+    pc->fccType   = pc->fccHandler = 0;
+    pc->hic       = NULL;
+    pc->lpbiOut   = NULL;
+    pc->lpBitsOut = pc->lpBitsPrev = pc->lpState = NULL;
+    pc->lQ        = ICQUALITY_DEFAULT;
+    pc->lKey      = -1;
+    pc->lDataRate = 300; /* kB */
+    pc->lpState   = NULL;
+    pc->cbState   = 0;
+  }
+  if (pc->fccType == 0)
+    pc->fccType = ICTYPE_VIDEO;
+
+  /* FIXME */
+  
+  return FALSE;
+}
+
+
+/***********************************************************************
+ *		ICCompressorFree   [MSVFW32.@]
+ */
+void VFWAPI ICCompressorFree(PCOMPVARS pc)
+{
+  TRACE("(%p)\n",pc);
+
+  if (pc != NULL && pc->cbSize == sizeof(COMPVARS)) {
+    if (pc->hic != NULL) {
+      ICClose(pc->hic);
+      pc->hic = NULL;
+    }
+    if (pc->lpbiOut != NULL) {
+      GlobalFreePtr(pc->lpbiOut);
+      pc->lpbiOut = NULL;
+    }
+    if (pc->lpBitsOut != NULL) {
+      GlobalFreePtr(pc->lpBitsOut);
+      pc->lpBitsOut = NULL;
+    }
+    if (pc->lpBitsPrev != NULL) {
+      GlobalFreePtr(pc->lpBitsPrev);
+      pc->lpBitsPrev = NULL;
+    }
+    if (pc->lpState != NULL) {
+      GlobalFreePtr(pc->lpBitsPrev);
+      pc->lpState = NULL;
+    }
+    pc->dwFlags = 0;
+  }
+}
+
+
+/******************************************************************
+ *		MSVIDEO_SendMessage
+ *
+ *
+ */
+LRESULT MSVIDEO_SendMessage(WINE_HIC* whic, UINT msg, DWORD lParam1, DWORD lParam2)
+{
+    LRESULT     ret;
+    
+#define XX(x) case x: TRACE("(%p,"#x",0x%08lx,0x%08lx)\n",whic,lParam1,lParam2); break;
+    
+    switch (msg) {
+        /* DRV_* */
+        XX(DRV_LOAD);
+        XX(DRV_ENABLE);
+        XX(DRV_OPEN);
+        XX(DRV_CLOSE);
+        XX(DRV_DISABLE);
+        XX(DRV_FREE);
+        /* ICM_RESERVED+X */
+        XX(ICM_ABOUT);
+        XX(ICM_CONFIGURE);
+        XX(ICM_GET);
+        XX(ICM_GETINFO);
+        XX(ICM_GETDEFAULTQUALITY);
+        XX(ICM_GETQUALITY);
+        XX(ICM_GETSTATE);
+        XX(ICM_SETQUALITY);
+        XX(ICM_SET);
+        XX(ICM_SETSTATE);
+        /* ICM_USER+X */
+        XX(ICM_COMPRESS_FRAMES_INFO);
+        XX(ICM_COMPRESS_GET_FORMAT);
+        XX(ICM_COMPRESS_GET_SIZE);
+        XX(ICM_COMPRESS_QUERY);
+        XX(ICM_COMPRESS_BEGIN);
+        XX(ICM_COMPRESS);
+        XX(ICM_COMPRESS_END);
+        XX(ICM_DECOMPRESS_GET_FORMAT);
+        XX(ICM_DECOMPRESS_QUERY);
+        XX(ICM_DECOMPRESS_BEGIN);
+        XX(ICM_DECOMPRESS);
+        XX(ICM_DECOMPRESS_END);
+        XX(ICM_DECOMPRESS_SET_PALETTE);
+        XX(ICM_DECOMPRESS_GET_PALETTE);
+        XX(ICM_DRAW_QUERY);
+        XX(ICM_DRAW_BEGIN);
+        XX(ICM_DRAW_GET_PALETTE);
+        XX(ICM_DRAW_START);
+        XX(ICM_DRAW_STOP);
+        XX(ICM_DRAW_END);
+        XX(ICM_DRAW_GETTIME);
+        XX(ICM_DRAW);
+        XX(ICM_DRAW_WINDOW);
+        XX(ICM_DRAW_SETTIME);
+        XX(ICM_DRAW_REALIZE);
+        XX(ICM_DRAW_FLUSH);
+        XX(ICM_DRAW_RENDERBUFFER);
+        XX(ICM_DRAW_START_PLAY);
+        XX(ICM_DRAW_STOP_PLAY);
+        XX(ICM_DRAW_SUGGESTFORMAT);
+        XX(ICM_DRAW_CHANGEPALETTE);
+        XX(ICM_GETBUFFERSWANTED);
+        XX(ICM_GETDEFAULTKEYFRAMERATE);
+        XX(ICM_DECOMPRESSEX_BEGIN);
+        XX(ICM_DECOMPRESSEX_QUERY);
+        XX(ICM_DECOMPRESSEX);
+        XX(ICM_DECOMPRESSEX_END);
+        XX(ICM_SET_STATUS_PROC);
+    default:
+        FIXME("(%p,0x%08lx,0x%08lx,0x%08lx) unknown message\n",whic,(DWORD)msg,lParam1,lParam2);
+    }
+    
+#undef XX
+    
+    if (whic->driverproc) {
+	/* dwDriverId parameter is the value returned by the DRV_OPEN */
+        ret = whic->driverproc(whic->driverId, whic->hdrv, msg, lParam1, lParam2);
+    } else {
+        ret = SendDriverMessage(whic->hdrv, msg, lParam1, lParam2);
+    }
+
+    TRACE("	-> 0x%08lx\n", ret);
+    return ret;
+}
+
+/***********************************************************************
+ *		ICSendMessage			[MSVFW32.@]
+ */
+LRESULT VFWAPI ICSendMessage(HIC hic, UINT msg, DWORD lParam1, DWORD lParam2) 
+{
+    WINE_HIC*   whic = MSVIDEO_GetHicPtr(hic);
+
+    if (!whic) return ICERR_BADHANDLE;
+    return MSVIDEO_SendMessage(whic, msg, lParam1, lParam2);
+}
+
+/***********************************************************************
+ *		ICDrawBegin		[MSVFW32.@]
+ */
+DWORD VFWAPIV ICDrawBegin(
+	HIC                hic,     /* [in] */
+	DWORD              dwFlags, /* [in] flags */
+	HPALETTE           hpal,    /* [in] palette to draw with */
+	HWND               hwnd,    /* [in] window to draw to */
+	HDC                hdc,     /* [in] HDC to draw to */
+	INT                xDst,    /* [in] destination rectangle */
+	INT                yDst,    /* [in] */
+	INT                dxDst,   /* [in] */
+	INT                dyDst,   /* [in] */
+	LPBITMAPINFOHEADER lpbi,    /* [in] format of frame to draw */
+	INT                xSrc,    /* [in] source rectangle */
+	INT                ySrc,    /* [in] */
+	INT                dxSrc,   /* [in] */
+	INT                dySrc,   /* [in] */
+	DWORD              dwRate,  /* [in] frames/second = (dwRate/dwScale) */
+	DWORD              dwScale) /* [in] */
+{
+
+	ICDRAWBEGIN	icdb;
+
+	TRACE("(%p,%ld,%p,%p,%p,%u,%u,%u,%u,%p,%u,%u,%u,%u,%ld,%ld)\n",
+		  hic, dwFlags, hpal, hwnd, hdc, xDst, yDst, dxDst, dyDst,
+		  lpbi, xSrc, ySrc, dxSrc, dySrc, dwRate, dwScale);
+
+	icdb.dwFlags = dwFlags;
+	icdb.hpal = hpal;
+	icdb.hwnd = hwnd;
+	icdb.hdc = hdc;
+	icdb.xDst = xDst;
+	icdb.yDst = yDst;
+	icdb.dxDst = dxDst;
+	icdb.dyDst = dyDst;
+	icdb.lpbi = lpbi;
+	icdb.xSrc = xSrc;
+	icdb.ySrc = ySrc;
+	icdb.dxSrc = dxSrc;
+	icdb.dySrc = dySrc;
+	icdb.dwRate = dwRate;
+	icdb.dwScale = dwScale;
+	return ICSendMessage(hic,ICM_DRAW_BEGIN,(DWORD)&icdb,sizeof(icdb));
+}
+
+/***********************************************************************
+ *		ICDraw			[MSVFW32.@]
+ */
+DWORD VFWAPIV ICDraw(HIC hic, DWORD dwFlags, LPVOID lpFormat, LPVOID lpData, DWORD cbData, LONG lTime) {
+	ICDRAW	icd;
+
+	TRACE("(%p,%ld,%p,%p,%ld,%ld)\n",hic,dwFlags,lpFormat,lpData,cbData,lTime);
+
+	icd.dwFlags = dwFlags;
+	icd.lpFormat = lpFormat;
+	icd.lpData = lpData;
+	icd.cbData = cbData;
+	icd.lTime = lTime;
+
+	return ICSendMessage(hic,ICM_DRAW,(DWORD)&icd,sizeof(icd));
+}
+
+/***********************************************************************
+ *		ICClose			[MSVFW32.@]
+ */
+LRESULT WINAPI ICClose(HIC hic)
+{
+    WINE_HIC* whic = MSVIDEO_GetHicPtr(hic);
+    WINE_HIC** p;
+
+    TRACE("(%p)\n",hic);
+
+    if (!whic) return ICERR_BADHANDLE;
+
+    if (whic->driverproc) 
+    {
+        MSVIDEO_SendMessage(whic, DRV_CLOSE, 0, 0);
+        MSVIDEO_SendMessage(whic, DRV_DISABLE, 0, 0);
+        MSVIDEO_SendMessage(whic, DRV_FREE, 0, 0);
+    }
+    else
+    {
+        CloseDriver(whic->hdrv, 0, 0);
+    }
+
+    /* remove whic from list */
+    for (p = &MSVIDEO_FirstHic; *p != NULL; p = &((*p)->next))
+    {
+        if ((*p) == whic)
+        {
+            *p = whic->next;
+            break;
+        }
+    }
+
+    HeapFree(GetProcessHeap(), 0, whic);
+    return 0;
+}
+
+
+
+/***********************************************************************
+ *		ICImageCompress	[MSVFW32.@]
+ */
+HANDLE VFWAPI ICImageCompress(
+	HIC hic, UINT uiFlags,
+	LPBITMAPINFO lpbiIn, LPVOID lpBits,
+	LPBITMAPINFO lpbiOut, LONG lQuality,
+	LONG* plSize)
+{
+	FIXME("(%p,%08x,%p,%p,%p,%ld,%p)\n",
+		hic, uiFlags, lpbiIn, lpBits, lpbiOut, lQuality, plSize);
+
+	return NULL;
+}
+
+/***********************************************************************
+ *		ICImageDecompress	[MSVFW32.@]
+ */
+
+HANDLE VFWAPI ICImageDecompress(
+	HIC hic, UINT uiFlags, LPBITMAPINFO lpbiIn,
+	LPVOID lpBits, LPBITMAPINFO lpbiOut)
+{
+	HGLOBAL	hMem = NULL;
+	BYTE*	pMem = NULL;
+	BOOL	bReleaseIC = FALSE;
+	BYTE*	pHdr = NULL;
+	LONG	cbHdr = 0;
+	BOOL	bSucceeded = FALSE;
+	BOOL	bInDecompress = FALSE;
+	DWORD	biSizeImage;
+
+	TRACE("(%p,%08x,%p,%p,%p)\n",
+		hic, uiFlags, lpbiIn, lpBits, lpbiOut);
+
+	if ( hic == NULL )
+	{
+		hic = ICDecompressOpen( ICTYPE_VIDEO, 0, &lpbiIn->bmiHeader, (lpbiOut != NULL) ? &lpbiOut->bmiHeader : NULL );
+		if ( hic == NULL )
+		{
+			WARN("no handler\n" );
+			goto err;
+		}
+		bReleaseIC = TRUE;
+	}
+	if ( uiFlags != 0 )
+	{
+		FIXME( "unknown flag %08x\n", uiFlags );
+		goto err;
+	}
+	if ( lpbiIn == NULL || lpBits == NULL )
+	{
+		WARN("invalid argument\n");
+		goto err;
+	}
+
+	if ( lpbiOut != NULL )
+	{
+		if ( lpbiOut->bmiHeader.biSize != sizeof(BITMAPINFOHEADER) )
+			goto err;
+		cbHdr = sizeof(BITMAPINFOHEADER);
+		if ( lpbiOut->bmiHeader.biCompression == 3 )
+			cbHdr += sizeof(DWORD)*3;
+		else
+		if ( lpbiOut->bmiHeader.biBitCount <= 8 )
+		{
+			if ( lpbiOut->bmiHeader.biClrUsed == 0 )
+				cbHdr += sizeof(RGBQUAD) * (1<<lpbiOut->bmiHeader.biBitCount);
+			else
+				cbHdr += sizeof(RGBQUAD) * lpbiOut->bmiHeader.biClrUsed;
+		}
+	}
+	else
+	{
+		TRACE( "get format\n" );
+
+		cbHdr = ICDecompressGetFormatSize(hic,lpbiIn);
+		if ( cbHdr < sizeof(BITMAPINFOHEADER) )
+			goto err;
+		pHdr = (BYTE*)HeapAlloc(GetProcessHeap(),0,cbHdr+sizeof(RGBQUAD)*256);
+		if ( pHdr == NULL )
+			goto err;
+		ZeroMemory( pHdr, cbHdr+sizeof(RGBQUAD)*256 );
+		if ( ICDecompressGetFormat( hic, lpbiIn, (BITMAPINFO*)pHdr ) != ICERR_OK )
+			goto err;
+		lpbiOut = (BITMAPINFO*)pHdr;
+		if ( lpbiOut->bmiHeader.biBitCount <= 8 &&
+			 ICDecompressGetPalette( hic, lpbiIn, lpbiOut ) != ICERR_OK &&
+			 lpbiIn->bmiHeader.biBitCount == lpbiOut->bmiHeader.biBitCount )
+		{
+			if ( lpbiIn->bmiHeader.biClrUsed == 0 )
+				memcpy( lpbiOut->bmiColors, lpbiIn->bmiColors, sizeof(RGBQUAD)*(1<<lpbiOut->bmiHeader.biBitCount) );
+			else
+				memcpy( lpbiOut->bmiColors, lpbiIn->bmiColors, sizeof(RGBQUAD)*lpbiIn->bmiHeader.biClrUsed );
+		}
+		if ( lpbiOut->bmiHeader.biBitCount <= 8 &&
+			 lpbiOut->bmiHeader.biClrUsed == 0 )
+			lpbiOut->bmiHeader.biClrUsed = 1<<lpbiOut->bmiHeader.biBitCount;
+
+		lpbiOut->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
+		cbHdr = sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD)*lpbiOut->bmiHeader.biClrUsed;
+	}
+
+	biSizeImage = lpbiOut->bmiHeader.biSizeImage;
+	if ( biSizeImage == 0 )
+		biSizeImage = ((((lpbiOut->bmiHeader.biWidth * lpbiOut->bmiHeader.biBitCount + 7) >> 3) + 3) & (~3)) * abs(lpbiOut->bmiHeader.biHeight);
+
+	TRACE( "call ICDecompressBegin\n" );
+
+	if ( ICDecompressBegin( hic, lpbiIn, lpbiOut ) != ICERR_OK )
+		goto err;
+	bInDecompress = TRUE;
+
+	TRACE( "cbHdr %ld, biSizeImage %ld\n", cbHdr, biSizeImage );
+
+	hMem = GlobalAlloc( GMEM_MOVEABLE|GMEM_ZEROINIT, cbHdr + biSizeImage );
+	if ( hMem == NULL )
+	{
+		WARN( "out of memory\n" );
+		goto err;
+	}
+	pMem = (BYTE*)GlobalLock( hMem );
+	if ( pMem == NULL )
+		goto err;
+	memcpy( pMem, lpbiOut, cbHdr );
+
+	TRACE( "call ICDecompress\n" );
+	if ( ICDecompress( hic, 0, &lpbiIn->bmiHeader, lpBits, &lpbiOut->bmiHeader, pMem+cbHdr ) != ICERR_OK )
+		goto err;
+
+	bSucceeded = TRUE;
+err:
+	if ( bInDecompress )
+		ICDecompressEnd( hic );
+	if ( bReleaseIC )
+		ICClose(hic);
+	if ( pHdr != NULL )
+		HeapFree(GetProcessHeap(),0,pHdr);
+	if ( pMem != NULL )
+		GlobalUnlock( hMem );
+	if ( !bSucceeded && hMem != NULL )
+	{
+		GlobalFree(hMem); hMem = NULL;
+	}
+
+	return (HANDLE)hMem;
+}
+
+static BOOL GetFileNamePreview(LPVOID lpofn,BOOL bSave,BOOL bUnicode)
+{
+  CHAR    szFunctionName[20];
+  BOOL    (*fnGetFileName)(LPVOID);
+  HMODULE hComdlg32;
+  BOOL    ret;
+
+  FIXME("(%p,%d,%d), semi-stub!\n",lpofn,bSave,bUnicode);
+
+  lstrcpyA(szFunctionName, (bSave ? "GetSaveFileName" : "GetOpenFileName"));
+  lstrcatA(szFunctionName, (bUnicode ? "W" : "A"));
+
+  hComdlg32 = LoadLibraryA("COMDLG32.DLL");
+  if (hComdlg32 == NULL)
+    return FALSE;
+
+  fnGetFileName = (LPVOID)GetProcAddress(hComdlg32, szFunctionName);
+  if (fnGetFileName == NULL)
+    return FALSE;
+
+  /* FIXME: need to add OFN_ENABLEHOOK and our own handler */
+  ret = fnGetFileName(lpofn);
+
+  FreeLibrary(hComdlg32);
+  return ret;
+}
+
+/***********************************************************************
+ *		GetOpenFileNamePreviewA	[MSVFW32.@]
+ */
+BOOL WINAPI GetOpenFileNamePreviewA(LPOPENFILENAMEA lpofn)
+{
+  FIXME("(%p), semi-stub!\n", lpofn);
+
+  return GetFileNamePreview(lpofn, FALSE, FALSE);
+}
+
+/***********************************************************************
+ *		GetOpenFileNamePreviewW	[MSVFW32.@]
+ */
+BOOL WINAPI GetOpenFileNamePreviewW(LPOPENFILENAMEW lpofn)
+{
+  FIXME("(%p), semi-stub!\n", lpofn);
+
+  return GetFileNamePreview(lpofn, FALSE, TRUE);
+}
+
+/***********************************************************************
+ *		GetSaveFileNamePreviewA	[MSVFW32.@]
+ */
+BOOL WINAPI GetSaveFileNamePreviewA(LPOPENFILENAMEA lpofn)
+{
+  FIXME("(%p), semi-stub!\n", lpofn);
+
+  return GetFileNamePreview(lpofn, TRUE, FALSE);
+}
+
+/***********************************************************************
+ *		GetSaveFileNamePreviewW	[MSVFW32.@]
+ */
+BOOL WINAPI GetSaveFileNamePreviewW(LPOPENFILENAMEW lpofn)
+{
+  FIXME("(%p), semi-stub!\n", lpofn);
+
+  return GetFileNamePreview(lpofn, TRUE, TRUE);
+}
diff --git a/reactos/lib/msvideo/msvideo_private.h b/reactos/lib/msvideo/msvideo_private.h
new file mode 100644
index 00000000000..bf0544f2f5e
--- /dev/null
+++ b/reactos/lib/msvideo/msvideo_private.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright 1999 Marcus Meissner
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __WINE_MSVIDEO_PRIVATE_H
+#define __WINE_MSVIDEO_PRIVATE_H
+
+#define COM_NO_WINDOWS_H
+#include <stdarg.h>
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "commdlg.h"
+#include "vfw.h"
+
+/* HIC struct (same layout as Win95 one) */
+typedef struct tagWINE_HIC {
+    DWORD		magic;		/* 00: 'Smag' */
+    HANDLE		curthread;	/* 04: */
+    DWORD		type;		/* 08: */
+    DWORD		handler;	/* 0C: */
+    HDRVR		hdrv;		/* 10: */
+    DWORD		private;	/* 14:(handled by SendDriverMessage)*/
+    DRIVERPROC  	driverproc;	/* 18:(handled by SendDriverMessage)*/
+    DWORD		x1;		/* 1c: name? */
+    WORD		x2;		/* 20: */
+    DWORD		x3;		/* 22: */
+					/* 26: */
+    DWORD               driverproc16;   /* Wine specific flags */
+    HIC                 hic;
+    DWORD               driverId;
+    struct tagWINE_HIC* next;
+} WINE_HIC;
+
+HIC             MSVIDEO_OpenFunction(DWORD, DWORD, UINT, DRIVERPROC, DWORD);
+LRESULT         MSVIDEO_SendMessage(WINE_HIC*, UINT, DWORD, DWORD);
+WINE_HIC*       MSVIDEO_GetHicPtr(HIC);
+
+extern LRESULT  (CALLBACK *pFnCallTo16)(HDRVR, HIC, UINT, LPARAM, LPARAM);
+
+/* handle16 --> handle conversions */
+#define HDRAWDIB_32(h16)	((HDRAWDIB)(ULONG_PTR)(h16))
+#define HIC_32(h16)		((HIC)(ULONG_PTR)(h16))
+
+/* handle --> handle16 conversions */
+#define HDRVR_16(h32)		(LOWORD(h32))
+#define HDRAWDIB_16(h32)	(LOWORD(h32))
+#define HIC_16(h32)		(LOWORD(h32))
+
+#endif  /* __WINE_MSVIDEO_PRIVATE_H */
diff --git a/reactos/lib/msvideo/vfw16.h b/reactos/lib/msvideo/vfw16.h
new file mode 100644
index 00000000000..3257ed00039
--- /dev/null
+++ b/reactos/lib/msvideo/vfw16.h
@@ -0,0 +1,130 @@
+/*
+ * Copyright 1999 Marcus Meissner
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __WINE_VFW16_H
+#define __WINE_VFW16_H
+
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "vfw.h"
+#include "wownt32.h"
+#include "wine/windef16.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif  /* __cplusplus */
+
+typedef HANDLE16 HDRAWDIB16;
+
+#include "pshpack1.h"
+
+typedef struct {
+	DWORD dwSize;
+	DWORD fccType;
+	DWORD fccHandler;
+	DWORD dwFlags;
+	DWORD dwVersion;
+	DWORD dwVersionICM;
+	/*
+	 * under Win16, normal chars are used
+	 */
+	CHAR szName[16];
+	CHAR szDescription[128];
+	CHAR szDriver[128];
+} ICINFO16;
+
+typedef struct {
+    DWORD		dwFlags;
+    LPBITMAPINFOHEADER	lpbiSrc;
+    LPVOID		lpSrc;
+    LPBITMAPINFOHEADER	lpbiDst;
+    LPVOID		lpDst;
+
+    INT16  		xDst;       /* destination rectangle */
+    INT16		yDst;
+    INT16  		dxDst;
+    INT16  		dyDst;
+
+    INT16		xSrc;       /* source rectangle */
+    INT16  		ySrc;
+    INT16		dxSrc;
+    INT16  		dySrc;
+} ICDECOMPRESSEX16;
+
+typedef struct {
+	DWORD		dwFlags;
+	HPALETTE16	hpal;
+	HWND16		hwnd;
+	HDC16		hdc;
+	INT16		xDst;
+	INT16		yDst;
+	INT16		dxDst;
+	INT16		dyDst;
+	LPBITMAPINFOHEADER	lpbi;
+	INT16		xSrc;
+	INT16		ySrc;
+	INT16		dxSrc;
+	INT16		dySrc;
+	DWORD		dwRate;
+	DWORD		dwScale;
+} ICDRAWBEGIN16;
+
+#include "poppack.h"
+
+typedef struct {
+	DWORD dwFlags;
+	LPBITMAPINFOHEADER lpbiIn;
+	LPBITMAPINFOHEADER lpbiSuggest;
+	INT16 dxSrc;
+	INT16 dySrc;
+	INT16 dxDst;
+	INT16 dyDst;
+	HIC16 hicDecompressor;
+} ICDRAWSUGGEST16;
+
+DWORD   VFWAPIV ICDraw16(HIC16,DWORD,LPVOID,LPVOID,DWORD,LONG);
+DWORD   VFWAPIV ICDrawBegin16(HIC16,DWORD,HPALETTE16,HWND16,HDC16,INT16,
+                              INT16,INT16,INT16,LPBITMAPINFOHEADER,
+                              INT16,INT16,INT16,INT16,DWORD,DWORD);
+LRESULT WINAPI  ICClose16(HIC16);
+DWORD   VFWAPIV ICCompress16(HIC16,DWORD,LPBITMAPINFOHEADER,LPVOID,
+                             LPBITMAPINFOHEADER,LPVOID,LPDWORD,
+                             LPDWORD,LONG,DWORD,DWORD,
+                             LPBITMAPINFOHEADER,LPVOID);
+DWORD   VFWAPIV ICDecompress16(HIC16,DWORD,LPBITMAPINFOHEADER,LPVOID,
+                               LPBITMAPINFOHEADER,LPVOID);
+HIC16   VFWAPI  ICGetDisplayFormat16(HIC16,LPBITMAPINFOHEADER,
+                                     LPBITMAPINFOHEADER,INT16,INT16,
+                                     INT16);
+LRESULT VFWAPI  ICGetInfo16(HIC16,ICINFO16 *,DWORD);
+BOOL16  VFWAPI  ICInfo16(DWORD,DWORD,ICINFO16 *);
+HIC16   VFWAPI  ICLocate16(DWORD,DWORD,LPBITMAPINFOHEADER,
+                           LPBITMAPINFOHEADER,WORD);
+LRESULT VFWAPIV ICMessage16( HIC16 hic, UINT16 msg, UINT16 cb, VA_LIST16 valist );
+HIC16   VFWAPI  ICOpen16(DWORD,DWORD,UINT16);
+HIC16   VFWAPI  ICOpenFunction16(DWORD,DWORD,UINT16,FARPROC16);
+LRESULT VFWAPI  ICSendMessage16(HIC16,UINT16,DWORD,DWORD);
+
+#ifdef __cplusplus
+}
+#endif  /* __cplusplus */
+
+#endif  /* __WINE_VFW16_H */

From c01cec79d95b443ecdc447004402b938b0376cf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Sat, 10 Jul 2004 21:23:18 +0000
Subject: [PATCH 250/356] Roll back __USE_W32API test, add _tsplitpath
 definition

svn path=/trunk/; revision=10069
---
 reactos/include/tchar.h | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/reactos/include/tchar.h b/reactos/include/tchar.h
index 0ac89e0cff1..5974117f4e5 100644
--- a/reactos/include/tchar.h
+++ b/reactos/include/tchar.h
@@ -29,21 +29,15 @@
  *  DISCLAIMED. This includes but is not limited to warranties of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
  * $Author: gvg $
- * $Date: 2004/07/07 22:29:37 $
+ * $Date: 2004/07/10 21:23:18 $
  *
  */
 
 #ifndef	_ROS_TCHAR_H_
 #define _ROS_TCHAR_H_
 
-#ifdef __USE_W32API
-
-#include_next <tchar.h>
-
-#else /* Not __USE_W32API */
-
 #include <msvcrt/string.h>
 
 /*
@@ -155,6 +149,7 @@ typedef wchar_t TCHAR;
 #define	_totlower	towlower
 #define	_ttoi		_wtoi
 #define	_tcsftime	wcsftime
+#define	_tsplitpath	_wsplitpath
 
 #else	/* Not _UNICODE */
 
@@ -260,9 +255,8 @@ typedef char TCHAR;
 #define	_totlower	tolower
 #define	_ttoi		atoi
 #define _tcsftime	strftime
+#define	_tsplitpath	_splitpath
 
 #endif	/* Not _UNICODE */
 
 #endif	/* Not _TCHAR_H_ */
-
-#endif /* Not __USE_W32API */

From 14a26ef7bfda61328fbc68ef1a2041a7289d6faf Mon Sep 17 00:00:00 2001
From: Steven Edwards <winehacker@gmail.com>
Date: Sat, 10 Jul 2004 21:44:14 +0000
Subject: [PATCH 251/356] added expand.exe and msvfw32.dll to the build.

svn path=/trunk/; revision=10070
---
 reactos/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/reactos/Makefile b/reactos/Makefile
index 74d806db17a..37477547b37 100644
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.234 2004/07/09 20:18:48 weiden Exp $
+# $Id: Makefile,v 1.235 2004/07/10 21:44:14 sedwards Exp $
 #
 # Global makefile
 #
@@ -45,7 +45,7 @@ DLLS_CPL = cpl
 # epsapi psapi richedit rpcrt4 secur32 user32 version ws2help ws2_32 wsock32 wshirda mswsock
 # imagehlp imm32
 DLLS = acledit advapi32 cabinet cards comctl32 crtdll comdlg32 d3d8thk expat fmifs freetype gdi32 \
-	imm32 iphlpapi kernel32 lzexpand mpr msafd msgina msimg32 msvcrt msvcrt20 mswsock \
+	imm32 iphlpapi kernel32 lzexpand mpr msafd msgina msimg32 msvcrt msvcrt20 msvideo mswsock \
 	netapi32 ntdll ole32 oleaut32 oledlg packet psapi richedit rpcrt4 samlib secur32 \
 	setupapi shell32 shlwapi snmpapi syssetup twain unicode user32 userenv version wininet \
 	winmm winspool ws2help ws2_32 wsock32 wshirda imagehlp $(DLLS_KBD) $(DLLS_CPL)
@@ -92,7 +92,7 @@ STORAGE_DRIVERS = atapi cdrom class2 disk floppy scsiport diskdump
 
 # System applications
 # autochk cmd format services setup usetup welcome winlogon
-SYS_APPS = autochk cmd explorer format services setup taskmgr userinit usetup welcome vmwinst winlogon regedit
+SYS_APPS = autochk cmd explorer expand format services setup taskmgr userinit usetup welcome vmwinst winlogon regedit
 
 # System services
 # rpcss eventlog

From 7933210d3c38797333b003d02518caa796296641 Mon Sep 17 00:00:00 2001
From: Gero Kuehn <reactos.filter@gkware.com>
Date: Sat, 10 Jul 2004 21:58:35 +0000
Subject: [PATCH 252/356] copied HalRequestSoftwareInterrupt from uniproc
 irql.c to fix SMP builds

svn path=/trunk/; revision=10071
---
 reactos/hal/halx86/mpsirql.c | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/reactos/hal/halx86/mpsirql.c b/reactos/hal/halx86/mpsirql.c
index 42542359899..7f6b8f7c801 100644
--- a/reactos/hal/halx86/mpsirql.c
+++ b/reactos/hal/halx86/mpsirql.c
@@ -178,7 +178,6 @@ HalpLowerIrql(KIRQL NewIrql)
 VOID FASTCALL
 KfLowerIrql (KIRQL	NewIrql)
 {
-  KIRQL OldIrql;
 
   if (NewIrql > KeGetCurrentIrql ())
     {
@@ -403,3 +402,22 @@ HalEnableSystemInterrupt (ULONG Vector,
 
   return TRUE;
 }
+
+VOID FASTCALL
+HalRequestSoftwareInterrupt(
+  IN KIRQL Request)
+{
+  switch (Request)
+  {
+    case APC_LEVEL:
+      //ApcRequested = TRUE;
+      break;
+
+    case DISPATCH_LEVEL:
+      //DpcRequested = TRUE;
+      break;
+      
+    default:
+      KEBUGCHECK(0);
+  }
+}

From 948db6b780beaad2239f7b33f0845121204327af Mon Sep 17 00:00:00 2001
From: Gero Kuehn <reactos.filter@gkware.com>
Date: Sat, 10 Jul 2004 22:06:40 +0000
Subject: [PATCH 253/356] fixed PROPSHEETHEADER nPages calculation

svn path=/trunk/; revision=10072
---
 reactos/lib/cpl/access/access.c       | 4 ++--
 reactos/lib/cpl/appwiz/appwiz.c       | 4 ++--
 reactos/lib/cpl/cplsample/cplsample.c | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/reactos/lib/cpl/access/access.c b/reactos/lib/cpl/access/access.c
index 69de779a790..2dc5d0c91c3 100644
--- a/reactos/lib/cpl/access/access.c
+++ b/reactos/lib/cpl/access/access.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: access.c,v 1.1 2004/06/30 12:16:27 ekohl Exp $
+/* $Id: access.c,v 1.2 2004/07/10 22:06:39 kuehng Exp $
  *
  * PROJECT:         ReactOS System Control Panel
  * FILE:            lib/cpl/system/sysdm.c
@@ -111,7 +111,7 @@ SystemApplet(VOID)
   psh.hInstance = hApplet;
   psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLACCESS));
   psh.pszCaption = Caption;
-  psh.nPages = sizeof(psp) / sizeof(PROPSHEETHEADER);
+  psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE);
   psh.nStartPage = 0;
   psh.ppsp = psp;
   psh.pfnCallback = PropSheetProc;
diff --git a/reactos/lib/cpl/appwiz/appwiz.c b/reactos/lib/cpl/appwiz/appwiz.c
index c33f6c35a3b..6cf3f8aa04c 100644
--- a/reactos/lib/cpl/appwiz/appwiz.c
+++ b/reactos/lib/cpl/appwiz/appwiz.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: appwiz.c,v 1.2 2004/06/30 12:11:11 ekohl Exp $
+/* $Id: appwiz.c,v 1.3 2004/07/10 22:06:39 kuehng Exp $
  *
  * PROJECT:         ReactOS Software Control Panel
  * FILE:            lib/cpl/system/appwiz.c
@@ -226,7 +226,7 @@ SystemApplet(VOID)
   psh.hInstance = hApplet;
   psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM));
   psh.pszCaption = Caption;
-  psh.nPages = sizeof(psp) / sizeof(PROPSHEETHEADER);
+  psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE);
   psh.nStartPage = 0;
   psh.ppsp = psp;
   psh.pfnCallback = NULL;
diff --git a/reactos/lib/cpl/cplsample/cplsample.c b/reactos/lib/cpl/cplsample/cplsample.c
index 19ad938163f..1bcf34d6c23 100644
--- a/reactos/lib/cpl/cplsample/cplsample.c
+++ b/reactos/lib/cpl/cplsample/cplsample.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: cplsample.c,v 1.2 2004/03/08 14:20:14 weiden Exp $
+/* $Id: cplsample.c,v 1.3 2004/07/10 22:06:40 kuehng Exp $
  *
  * PROJECT:         ReactOS Sample Control Panel
  * FILE:            lib/cpl/cplsample/cplsample.c
@@ -153,7 +153,7 @@ Applet1(VOID)
   psh.hInstance = hApplet;
   psh.u1.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON_1));
   psh.pszCaption = Caption;
-  psh.nPages = sizeof(psp) / sizeof(PROPSHEETHEADER);
+  psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE);
   psh.u2.nStartPage = 0;
   psh.u3.ppsp = psp;
   psh.pfnCallback = PropSheetProc;

From b563ceb9af9d81bed5bc497a694663e99b65ff8a Mon Sep 17 00:00:00 2001
From: Gero Kuehn <reactos.filter@gkware.com>
Date: Sat, 10 Jul 2004 22:27:18 +0000
Subject: [PATCH 254/356] added
 SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall

svn path=/trunk/; revision=10073
---
 reactos/bootdata/hivesft.inf | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/reactos/bootdata/hivesft.inf b/reactos/bootdata/hivesft.inf
index 3814479b776..16bda7e32cd 100644
--- a/reactos/bootdata/hivesft.inf
+++ b/reactos/bootdata/hivesft.inf
@@ -19,11 +19,16 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders","Common
 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders","Common Templates",0x00020000,"%ALLUSERSPROFILE%\Templates"
 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders","Personal",0x00020000,"%ALLUSERSPROFILE%\My Documents"
 
+; Uninstall Application list
+HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall",,0x00000010
+
+
 ; Version Information
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CurrentVersion",0x00020000,"4.0"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CSDVersion",0x00020000,"Service Pack 6"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CurrentBuildNumber",0x00020000,"1381"
 
+
 ; Image File Execution Options (NtGlobalFlag with FLG_SHOW_LDR_SNAPS set for loadlib.exe) 
 HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\loadlib.exe","GlobalFlag",0x00000000,"0x00000002"
 ;HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\loaddll.exe","GlobalFlag",0x00000000,"0x00000002"

From 13eda5be1fbbaf66685ee11e634bac702c917f54 Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Sat, 10 Jul 2004 23:23:06 +0000
Subject: [PATCH 255/356] added some missing definitions

svn path=/trunk/; revision=10074
---
 reactos/include/accctrl.h        | 33 ++++++++++++++++++
 reactos/w32api/include/accctrl.h | 60 ++++++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+)

diff --git a/reactos/include/accctrl.h b/reactos/include/accctrl.h
index 2ffe9374e54..ac22ff7073e 100644
--- a/reactos/include/accctrl.h
+++ b/reactos/include/accctrl.h
@@ -44,6 +44,39 @@ typedef enum _SE_OBJECT_TYPE
     SE_REGISTRY_WOW64_32KEY
 } SE_OBJECT_TYPE;
 
+typedef struct _SI_OBJECT_INFO
+{
+    DWORD     dwFlags;
+    HINSTANCE hInstance;
+    LPWSTR    pszServerName;
+    LPWSTR    pszObjectName;
+    LPWSTR    pszPageTitle;
+    GUID      guidObjectType;
+} SI_OBJECT_INFO, *PSI_OBJECT_INFO;
+
+typedef struct _SI_ACCESS
+{
+    const GUID  *pguid;
+    ACCESS_MASK mask;
+    LPCWSTR     pszName;
+    DWORD       dwFlags;
+} SI_ACCESS, *PSI_ACCESS;
+
+typedef struct _SI_INHERIT_TYPE
+{
+    const GUID *pguid;
+    ULONG      dwFlags;
+    LPCWSTR    pszName;
+} SI_INHERIT_TYPE, *PSI_INHERIT_TYPE;
+
+typedef enum _SI_PAGE_TYPE
+{
+    SI_PAGE_PERM = 0, 
+    SI_PAGE_ADVPERM, 
+    SI_PAGE_AUDIT, 
+    SI_PAGE_OWNER
+} SI_PAGE_TYPE;
+
 typedef enum _TRUSTEE_TYPE
 {
     TRUSTEE_IS_UNKNOWN,
diff --git a/reactos/w32api/include/accctrl.h b/reactos/w32api/include/accctrl.h
index 6f969042f3e..4bca4432334 100644
--- a/reactos/w32api/include/accctrl.h
+++ b/reactos/w32api/include/accctrl.h
@@ -102,6 +102,36 @@ extern "C" {
 #define INHERITED_PARENT          0x10000000
 #define INHERITED_GRANDPARENT     0x20000000
 
+#define SI_EDIT_PERMS	0x00000000
+#define SI_EDIT_OWNER	0x00000001
+#define SI_EDIT_AUDITS	0x00000002
+#define SI_CONTAINER	0x00000004
+#define SI_READONLY	0x00000008
+#define SI_ADVANCED	0x00000010
+#define SI_RESET	0x00000020
+#define SI_OWNER_READONLY	0x00000040
+#define SI_EDIT_PROPERTIES	0x00000080
+#define SI_OWNER_RECURSE	0x00000100
+#define SI_NO_ACL_PROTECT	0x00000200
+#define SI_NO_TREE_APPLY	0x00000400
+#define SI_PAGE_TITLE	0x00000800
+#define SI_SERVER_IS_DC	0x00001000
+#define SI_RESET_DACL_TREE	0x00004000
+#define SI_RESET_SACL_TREE	0x00008000
+#define SI_OBJECT_GUID	0x00010000
+#define SI_EDIT_EFFECTIVE	0x00020000
+#define SI_RESET_DACL	0x00040000
+#define SI_RESET_SACL	0x00080000
+#define SI_RESET_OWNER	0x00100000
+#define SI_NO_ADDITIONAL_PERMISSION	0x00200000
+#define SI_MAY_WRITE	0x10000000
+#define SI_EDIT_ALL	(SI_EDIT_OWNER |SI_EDIT_PERMS | SI_EDIT_AUDITS)
+
+#define SI_ACCESS_SPECIFIC	0x00010000
+#define SI_ACCESS_GENERAL	0x00020000
+#define SI_ACCESS_CONTAINER	0x00040000
+#define SI_ACCESS_PROPERTY	0x00080000
+
 typedef ULONG INHERIT_FLAGS, *PINHERIT_FLAGS;
 typedef ULONG ACCESS_RIGHTS, *PACCESS_RIGHTS;
 
@@ -287,6 +317,36 @@ typedef struct {
 } INHERITED_FROMW, *PINHERITED_FROMW;
 #endif /* (_WIN32_WINNT >= 0x0501) */
 
+typedef struct _SI_OBJECT_INFO
+{
+    DWORD     dwFlags;
+    HINSTANCE hInstance;
+    LPWSTR    pszServerName;
+    LPWSTR    pszObjectName;
+    LPWSTR    pszPageTitle;
+    GUID      guidObjectType;
+} SI_OBJECT_INFO, *PSI_OBJECT_INFO;
+typedef struct _SI_ACCESS
+{
+    const GUID  *pguid;
+    ACCESS_MASK mask;
+    LPCWSTR     pszName;
+    DWORD       dwFlags;
+} SI_ACCESS, *PSI_ACCESS;
+typedef struct _SI_INHERIT_TYPE
+{
+    const GUID *pguid;
+    ULONG      dwFlags;
+    LPCWSTR    pszName;
+} SI_INHERIT_TYPE, *PSI_INHERIT_TYPE;
+typedef enum _SI_PAGE_TYPE
+{
+    SI_PAGE_PERM     = 0, 
+    SI_PAGE_ADVPERM, 
+    SI_PAGE_AUDIT, 
+    SI_PAGE_OWNER
+} SI_PAGE_TYPE;
+
 #ifdef UNICODE
 #define ACCCTRL_DEFAULT_PROVIDER ACCCTRL_DEFAULT_PROVIDERW
 typedef TRUSTEE_W TRUSTEE_, *PTRUSTEE_;

From ce4aa8ef2e961cf9a6ae33f60749892ab732f65e Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Sat, 10 Jul 2004 23:25:17 +0000
Subject: [PATCH 256/356] added a key security editor (not yet working
 properly)

svn path=/trunk/; revision=10075
---
 reactos/subsys/system/regedit/En.rc      |  25 ++
 reactos/subsys/system/regedit/framewnd.c |  10 +
 reactos/subsys/system/regedit/main.c     |  18 ++
 reactos/subsys/system/regedit/makefile   |   5 +-
 reactos/subsys/system/regedit/regproc.h  |  12 +
 reactos/subsys/system/regedit/resource.h |  19 ++
 reactos/subsys/system/regedit/security.c | 358 +++++++++++++++++++++++
 reactos/subsys/system/regedit/security.h | 125 ++++++++
 8 files changed, 571 insertions(+), 1 deletion(-)
 create mode 100644 reactos/subsys/system/regedit/security.c
 create mode 100644 reactos/subsys/system/regedit/security.h

diff --git a/reactos/subsys/system/regedit/En.rc b/reactos/subsys/system/regedit/En.rc
index b3680cf3a2d..dca80da4476 100644
--- a/reactos/subsys/system/regedit/En.rc
+++ b/reactos/subsys/system/regedit/En.rc
@@ -69,6 +69,8 @@ BEGIN
             MENUITEM "&DWORD Value",                ID_EDIT_NEW_DWORDVALUE
         END
         MENUITEM SEPARATOR
+        MENUITEM "&Permissions...",		ID_EDIT_PERMISSIONS
+        MENUITEM SEPARATOR
         MENUITEM "&Delete\tDel",                ID_EDIT_DELETE
         MENUITEM "&Rename",                     ID_EDIT_RENAME
         MENUITEM SEPARATOR
@@ -289,6 +291,29 @@ BEGIN
     IDS_FLT_ALLFILES_FLT    "*.*"
 END
 
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_ACCESS_FULLCONTROL        "Full Control"
+  IDS_ACCESS_READ               "Read"
+  IDS_ACCESS_QUERYVALUE         "Query Value"
+  IDS_ACCESS_SETVALUE           "Set Value"
+  IDS_ACCESS_CREATESUBKEY       "Create Subkey"
+  IDS_ACCESS_ENUMERATESUBKEYS   "Enumerate Subkeys"
+  IDS_ACCESS_NOTIFY             "Notify"
+  IDS_ACCESS_CREATELINK         "Create Link"
+  IDS_ACCESS_DELETE             "Delete"
+  IDS_ACCESS_WRITEDAC           "Write DAC"
+  IDS_ACCESS_WRITEOWNER         "Write Owner"
+  IDS_ACCESS_READCONTROL        "Read Control"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_INHERIT_THISKEYONLY        "This key only"
+  IDS_INHERIT_THISKEYANDSUBKEYS  "This key and subkeys"
+  IDS_INHERIT_SUBKEYSONLY        "Subkeys only"
+END
+
 /*****************************************************************/
 
 
diff --git a/reactos/subsys/system/regedit/framewnd.c b/reactos/subsys/system/regedit/framewnd.c
index c29c8a107aa..93c7c02c8dd 100644
--- a/reactos/subsys/system/regedit/framewnd.c
+++ b/reactos/subsys/system/regedit/framewnd.c
@@ -597,6 +597,16 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
     case ID_EDIT_COPYKEYNAME:
         CopyKeyName(hWnd, _T(""));
         break;
+    case ID_EDIT_PERMISSIONS:
+        if(keyPath != NULL && _tcslen(keyPath) > 0)
+        {
+          RegKeyEditPermissions(hWnd, hKey, NULL, keyPath);
+        }
+        else
+        {
+          MessageBeep(MB_ICONASTERISK);
+        }
+        break;
     case ID_REGISTRY_PRINTERSETUP:
         /*PRINTDLG pd;*/
         /*PrintDlg(&pd);*/
diff --git a/reactos/subsys/system/regedit/main.c b/reactos/subsys/system/regedit/main.c
index 520dd787060..40c9f2047f6 100644
--- a/reactos/subsys/system/regedit/main.c
+++ b/reactos/subsys/system/regedit/main.c
@@ -68,6 +68,8 @@ TCHAR szChildClass[MAX_LOADSTRING];
 
 BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
 {
+    BOOL AclUiAvailable;
+    
     WNDCLASSEX wcFrame = {
                              sizeof(WNDCLASSEX),
                              CS_HREDRAW | CS_VREDRAW/*style*/,
@@ -111,6 +113,21 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
 
     /* Initialize the Windows Common Controls DLL */
     InitCommonControls();
+    
+    AclUiAvailable = InitializeAclUiDll();
+    if(!AclUiAvailable)
+    {
+      HMENU hEditMenu;
+      int mePos;
+      /* hide the Edit/Permissions... menu entry */
+      hEditMenu = GetSubMenu(hMenuFrame, 1);
+      if(hEditMenu != NULL)
+      {
+        RemoveMenu(hEditMenu, ID_EDIT_PERMISSIONS, MF_BYCOMMAND);
+        /* remove the separator after the menu item */
+        RemoveMenu(hEditMenu, 4, MF_BYPOSITION);
+      }
+    }
 
     nClipboardFormat = RegisterClipboardFormat(strClipboardFormat);
     /* if (nClipboardFormat == 0) {
@@ -145,6 +162,7 @@ void ExitInstance(HINSTANCE hInstance)
 {
     UnregisterHexEditorClass(hInstance);
     DestroyMenu(hMenuFrame);
+    UnloadAclUiDll();
 }
 
 BOOL TranslateChildTabMessage(MSG *msg)
diff --git a/reactos/subsys/system/regedit/makefile b/reactos/subsys/system/regedit/makefile
index f9e0b2ba8bb..901550b8ac5 100644
--- a/reactos/subsys/system/regedit/makefile
+++ b/reactos/subsys/system/regedit/makefile
@@ -14,7 +14,9 @@ TARGET_NAME = regedit
 
 TARGET_CFLAGS = -D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0501 -D__USE_W32API
 	
-TARGET_GCCLIBS = msvcrt advapi32 kernel32 comctl32 comdlg32 shell32
+TARGET_GCCLIBS = msvcrt advapi32 kernel32 comctl32 comdlg32 shell32 ole32
+
+TARGET_SDKLIBS = kernel32.a advapi32.a user32.a gdi32.a wine_uuid.a ole32.a
 
 TARGET_OBJECTS = \
 	about.o \
@@ -26,6 +28,7 @@ TARGET_OBJECTS = \
 	main.o \
 	regedit.o \
 	regproc.o \
+	security.o \
 	treeview.o
 
 include $(PATH_TO_TOP)/rules.mak
diff --git a/reactos/subsys/system/regedit/regproc.h b/reactos/subsys/system/regedit/regproc.h
index cc89aa0c575..72a41b2af26 100644
--- a/reactos/subsys/system/regedit/regproc.h
+++ b/reactos/subsys/system/regedit/regproc.h
@@ -26,6 +26,8 @@
 #define SUCCESS               0
 #define KEY_VALUE_ALREADY_SET 2
 
+extern HINSTANCE hInst;
+
 typedef void (*CommandAPI)(LPSTR lpsLine);
 
 void doSetValue(LPSTR lpsLine);
@@ -71,3 +73,13 @@ HRESULT setValue(LPSTR val_name, LPSTR val_data);
  * api queryValue prototypes
  */
 void    processQueryValue(LPSTR cmdline);
+
+/*
+ * Permission prototypes
+ */
+
+BOOL InitializeAclUiDll(VOID);
+VOID UnloadAclUiDll(VOID);
+BOOL RegKeyEditPermissions(HWND hWndOwner, HKEY hKey, LPCTSTR lpMachine, LPCTSTR lpKeyName);
+
+/* EOF */
diff --git a/reactos/subsys/system/regedit/resource.h b/reactos/subsys/system/regedit/resource.h
index f3f45b677ee..4de5df11d5b 100644
--- a/reactos/subsys/system/regedit/resource.h
+++ b/reactos/subsys/system/regedit/resource.h
@@ -127,6 +127,7 @@
 #define IDS_ERR_RENVAL_CAPTION		32856
 #define IDS_ERR_RENVAL_TOEMPTY		32857
 #define ID_SWITCH_PANELS                32871
+#define ID_EDIT_PERMISSIONS		32872
 
 #define IDS_FLT_REGFILES		31001
 #define IDS_FLT_REGFILES_FLT		31002
@@ -135,6 +136,24 @@
 #define IDS_FLT_ALLFILES		31005
 #define IDS_FLT_ALLFILES_FLT		31006
 
+#define IDS_ACCESS_FULLCONTROL		31101
+#define IDS_ACCESS_READ			31102
+#define IDS_ACCESS_QUERYVALUE		31103
+#define IDS_ACCESS_SETVALUE		31104
+#define IDS_ACCESS_CREATESUBKEY		31105
+#define IDS_ACCESS_ENUMERATESUBKEYS	31106
+#define IDS_ACCESS_NOTIFY		31107
+#define IDS_ACCESS_CREATELINK		31108
+#define IDS_ACCESS_DELETE		31109
+#define IDS_ACCESS_WRITEDAC		31110
+#define IDS_ACCESS_WRITEOWNER		31111
+#define IDS_ACCESS_READCONTROL		31112
+
+#define IDS_INHERIT_THISKEYONLY		31121
+#define IDS_INHERIT_THISKEYANDSUBKEYS	31122
+#define IDS_INHERIT_SUBKEYSONLY		31123
+
+
 #define IDD_EDIT_STRING			2000
 #define IDC_VALUE_NAME			2001
 #define IDC_VALUE_DATA			2002
diff --git a/reactos/subsys/system/regedit/security.c b/reactos/subsys/system/regedit/security.c
new file mode 100644
index 00000000000..216f389f744
--- /dev/null
+++ b/reactos/subsys/system/regedit/security.c
@@ -0,0 +1,358 @@
+/*
+ * Regedit ACL Editor for Registry Keys
+ *
+ * Copyright (C) 2004 Thomas Weidenmueller <w3seek@reactos.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#define WIN32_LEAN_AND_MEAN     /* Exclude rarely-used stuff from Windows headers */
+#define INITGUID
+#include <windows.h>
+#include <tchar.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <accctrl.h>
+#include <objbase.h>
+#include <basetyps.h>
+#include <unknwn.h>
+#include "security.h"
+#include "regproc.h"
+#include "resource.h"
+
+/******************************************************************************
+   Implementation of the CRegKeySecurity interface
+ ******************************************************************************/
+ 
+SI_ACCESS RegAccess[] = {
+  {&GUID_NULL, KEY_ALL_ACCESS,         (LPWSTR)MAKEINTRESOURCE(IDS_ACCESS_FULLCONTROL),      SI_ACCESS_GENERAL | SI_ACCESS_SPECIFIC},
+  {&GUID_NULL, KEY_READ,               (LPWSTR)MAKEINTRESOURCE(IDS_ACCESS_READ),             SI_ACCESS_GENERAL},
+  {&GUID_NULL, KEY_QUERY_VALUE,        (LPWSTR)MAKEINTRESOURCE(IDS_ACCESS_QUERYVALUE),       SI_ACCESS_SPECIFIC},
+  {&GUID_NULL, KEY_SET_VALUE,          (LPWSTR)MAKEINTRESOURCE(IDS_ACCESS_SETVALUE),         SI_ACCESS_SPECIFIC},
+  {&GUID_NULL, KEY_CREATE_SUB_KEY,     (LPWSTR)MAKEINTRESOURCE(IDS_ACCESS_CREATESUBKEY),     SI_ACCESS_SPECIFIC},
+  {&GUID_NULL, KEY_ENUMERATE_SUB_KEYS, (LPWSTR)MAKEINTRESOURCE(IDS_ACCESS_ENUMERATESUBKEYS), SI_ACCESS_SPECIFIC},
+  {&GUID_NULL, KEY_NOTIFY,             (LPWSTR)MAKEINTRESOURCE(IDS_ACCESS_NOTIFY),           SI_ACCESS_SPECIFIC},
+  {&GUID_NULL, KEY_CREATE_LINK,        (LPWSTR)MAKEINTRESOURCE(IDS_ACCESS_CREATELINK),       SI_ACCESS_SPECIFIC},
+  {&GUID_NULL, DELETE,                 (LPWSTR)MAKEINTRESOURCE(IDS_ACCESS_DELETE),           SI_ACCESS_SPECIFIC},
+  {&GUID_NULL, WRITE_DAC,              (LPWSTR)MAKEINTRESOURCE(IDS_ACCESS_WRITEDAC),         SI_ACCESS_SPECIFIC},
+  {&GUID_NULL, WRITE_OWNER,            (LPWSTR)MAKEINTRESOURCE(IDS_ACCESS_WRITEOWNER),       SI_ACCESS_SPECIFIC},
+  {&GUID_NULL, READ_CONTROL,           (LPWSTR)MAKEINTRESOURCE(IDS_ACCESS_READCONTROL),      SI_ACCESS_SPECIFIC},
+};
+
+DWORD RegDefaultAccess = 1; /* KEY_READ */
+
+GENERIC_MAPPING RegAccessMasks = {
+  KEY_READ,
+  KEY_WRITE,
+  KEY_EXECUTE,
+  KEY_ALL_ACCESS
+};
+
+SI_INHERIT_TYPE RegInheritTypes[] = {
+  {&GUID_NULL, 0,                                        (LPWSTR)MAKEINTRESOURCE(IDS_INHERIT_THISKEYONLY)},
+  {&GUID_NULL, CONTAINER_INHERIT_ACE,                    (LPWSTR)MAKEINTRESOURCE(IDS_INHERIT_THISKEYANDSUBKEYS)},
+  {&GUID_NULL, INHERIT_ONLY_ACE | CONTAINER_INHERIT_ACE, (LPWSTR)MAKEINTRESOURCE(IDS_INHERIT_SUBKEYSONLY)},
+};
+
+
+LPREGKEYSECURITY CRegKeySecurity_fnConstructor(HANDLE Handle, SE_OBJECT_TYPE ObjectType, SI_OBJECT_INFO *ObjectInfo, BOOL *Btn)
+{
+  LPREGKEYSECURITY obj;
+  
+  obj = (LPREGKEYSECURITY)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(REGKEYSECURITY));
+  if(obj != NULL)
+  {
+    obj->ref = 1;
+    obj->lpVtbl = &efvt;
+    obj->Handle = Handle;
+    obj->ObjectType = ObjectType;
+    obj->ObjectInfo = *ObjectInfo;
+    obj->Btn = Btn;
+  }
+  
+  return obj;
+}
+
+HRESULT STDMETHODCALLTYPE
+CRegKeySecurity_fnQueryInterface(LPREGKEYSECURITY this, 
+                                 REFIID iid, 
+				 PVOID *pvObject)
+{
+  if(IsEqualGUID(iid, &IID_IUnknown) ||
+     IsEqualGUID(iid, &IID_CRegKeySecurity))
+  {
+    *pvObject = this;
+    return S_OK;
+  }
+  
+  *pvObject = NULL;
+  return E_NOINTERFACE;
+}
+
+ULONG STDMETHODCALLTYPE
+CRegKeySecurity_fnAddRef(LPREGKEYSECURITY this)
+{
+  return (ULONG)InterlockedIncrement(&this->ref);
+}
+
+ULONG STDMETHODCALLTYPE
+CRegKeySecurity_fnRelease(LPREGKEYSECURITY this)
+{
+  ULONG rfc;
+  
+  rfc = (ULONG)InterlockedDecrement(&this->ref);
+  if(rfc == 0)
+  {
+    HeapFree(GetProcessHeap(), 0, this);
+  }
+  return rfc;
+}
+
+HRESULT STDMETHODCALLTYPE
+CRegKeySecurity_fnGetObjectInformation(LPREGKEYSECURITY this, 
+                                       PSI_OBJECT_INFO pObjectInfo)
+{
+  *pObjectInfo = this->ObjectInfo;
+  return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE
+CRegKeySecurity_fnGetSecurity(LPREGKEYSECURITY this, 
+                              SECURITY_INFORMATION RequestedInformation,
+                              PSECURITY_DESCRIPTOR* ppSecurityDescriptor,
+                              BOOL fDefault)
+{
+  /* FIXME */
+  if(GetSecurityInfo(this->Handle, this->ObjectType, RequestedInformation, 0, 0,
+                     0, 0, ppSecurityDescriptor) == ERROR_SUCCESS)
+  {
+    return S_OK;
+  }
+  else
+  {
+    return E_ACCESSDENIED;
+  }
+}
+
+HRESULT STDMETHODCALLTYPE
+CRegKeySecurity_fnSetSecurity(LPREGKEYSECURITY this, 
+                              SECURITY_INFORMATION RequestedInformation,
+                              PSECURITY_DESCRIPTOR pSecurityDescriptor)
+{
+  /* FIXME */
+  *this->Btn = TRUE;
+  return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE
+CRegKeySecurity_fnGetAccessRights(LPREGKEYSECURITY this, 
+                                  const GUID* pguidObjectType,
+                                  DWORD dwFlags,
+                                  PSI_ACCESS* ppAccess,
+                                  ULONG* pcAccesses,
+                                  ULONG* piDefaultAccess)
+{
+  *ppAccess = RegAccess;
+  *pcAccesses = sizeof(RegAccess) / sizeof(SI_ACCESS);
+  *piDefaultAccess = RegDefaultAccess;
+  return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE
+CRegKeySecurity_fnMapGeneric(LPREGKEYSECURITY this, 
+                             const GUID* pguidObjectType,
+                             UCHAR* pAceFlags,
+                             ACCESS_MASK* pMask)
+{
+  MapGenericMask(pMask, (PGENERIC_MAPPING)&RegAccessMasks);
+  *pMask &= ~SYNCHRONIZE;
+  return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE
+CRegKeySecurity_fnGetInheritTypes(LPREGKEYSECURITY this, 
+                                  PSI_INHERIT_TYPE* ppInheritTypes,
+                                  ULONG* pcInheritTypes)
+{
+  /* FIXME */
+  if(this->ObjectInfo.dwFlags & SI_CONTAINER)
+  {
+    *ppInheritTypes = RegInheritTypes;
+    *pcInheritTypes = sizeof(RegInheritTypes) / sizeof(SI_INHERIT_TYPE);
+    return S_OK;
+  }
+  return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE
+CRegKeySecurity_fnPropertySheetPageCallback(LPREGKEYSECURITY this, 
+                                            HWND hwnd,
+                                            UINT uMsg,
+                                            SI_PAGE_TYPE uPage)
+{
+  /* FIXME */
+  return S_OK;
+}
+
+
+/******************************************************************************/
+
+#define ACLUI_DLL	_T("aclui.dll")
+#define FN_EDITSECURITY	"EditSecurity" /* no unicode, GetProcAddr doesn't accept unicode! */
+
+typedef struct _CHANGE_CONTEXT
+{
+  HKEY hKey;
+  LPTSTR KeyString;
+} CHANGE_CONTEXT, *PCHANGE_CONTEXT;
+
+typedef BOOL (WINAPI *PEDITSECURITY)(HWND hwndOwner,
+                                     LPREGKEYSECURITY psi);
+
+static PEDITSECURITY pfnEditSecurity;
+static HMODULE hAclUiDll;
+
+BOOL
+InitializeAclUiDll(VOID)
+{
+  if(!(hAclUiDll = LoadLibrary(ACLUI_DLL)))
+  {
+    return FALSE;
+  }
+  if(!(pfnEditSecurity = (PEDITSECURITY)GetProcAddress(hAclUiDll, FN_EDITSECURITY)))
+  {
+    FreeLibrary(hAclUiDll);
+    hAclUiDll = NULL;
+    return FALSE;
+  }
+  
+  return TRUE;
+}
+
+VOID
+UnloadAclUiDll(VOID)
+{
+  if(hAclUiDll != NULL)
+  {
+    FreeLibrary(hAclUiDll);
+  }
+}
+
+BOOL
+RegKeyEditPermissions(HWND hWndOwner,
+                      HKEY hKey,
+                      LPCTSTR lpMachine,
+                      LPCTSTR lpKeyName)
+{
+  BOOL Result;
+  HMODULE hAclEditDll;
+  LPWSTR Machine, KeyName;
+  HKEY hInfoKey;
+  LPREGKEYSECURITY RegKeySecurity;
+  SI_OBJECT_INFO ObjectInfo;
+  
+  if(pfnEditSecurity == NULL)
+  {
+    return FALSE;
+  }
+  
+#ifndef UNICODE
+  /* aclui.dll only accepts unicode strings, convert them */
+  if(lpMachine != NULL)
+  {
+    int lnMachine = lstrlen(lpMachine);
+    if(!(Machine = HeapAlloc(GetProcessHeap(), 0, (lnMachine + 1) * sizeof(WCHAR))))
+    {
+      SetLastError(ERROR_NOT_ENOUGH_MEMORY);
+      return FALSE;
+    }
+    if(lnMachine > 0)
+    {
+      MultiByteToWideChar(CP_ACP, 0, lpMachine, -1, Machine, lnMachine + 1);
+    }
+    else
+      *Machine = L'\0';
+  }
+  else
+    Machine = NULL;
+  
+  if(lpKeyName != NULL)
+  {
+    int lnKeyName = lstrlen(lpKeyName);
+    if(!(KeyName = HeapAlloc(GetProcessHeap(), 0, (lnKeyName + 1) * sizeof(WCHAR))))
+    {
+      if(Machine != NULL)
+      {
+        HeapFree(GetProcessHeap(), 0, Machine);
+      }
+      SetLastError(ERROR_NOT_ENOUGH_MEMORY);
+      return FALSE;
+    }
+    if(lnKeyName > 0)
+    {
+      MultiByteToWideChar(CP_ACP, 0, lpKeyName, -1, KeyName, lnKeyName + 1);
+    }
+    else
+      *KeyName = L'\0';
+  }
+  else
+    KeyName = NULL;
+#else
+  Machine = (LPWSTR)lpMachine;
+  KeyName = (LPWSTR)lpKeyName;
+#endif
+  
+    /* try to open the key again with more access rights */
+  if(RegOpenKeyEx(hKey, NULL, 0, READ_CONTROL, &hInfoKey) != ERROR_SUCCESS)
+  {
+    /* FIXME - print error with FormatMessage */
+    return FALSE;
+  }
+  
+  ObjectInfo.dwFlags = SI_EDIT_ALL  | SI_ADVANCED | SI_CONTAINER | SI_OWNER_RECURSE | SI_EDIT_PERMS;
+  ObjectInfo.hInstance = hInst;
+  ObjectInfo.pszServerName = Machine;
+  ObjectInfo.pszObjectName = KeyName;
+  ObjectInfo.pszPageTitle = KeyName;
+  
+  if(!(RegKeySecurity = CRegKeySecurity_fnConstructor(hInfoKey, SE_REGISTRY_KEY, &ObjectInfo, &Result)))
+  {
+    /* FIXME - print error with FormatMessage */
+    return FALSE;
+  }
+
+  /* display the security editor dialog */
+  pfnEditSecurity(hWndOwner, RegKeySecurity);
+  
+  /* dereference the interface, it should be destroyed here */
+  CRegKeySecurity_fnRelease(RegKeySecurity);
+
+  RegCloseKey(hInfoKey);
+  
+#ifndef UNICODE
+  if(Machine != NULL)
+  {
+    HeapFree(GetProcessHeap(), 0, Machine);
+  }
+  if(KeyName != NULL)
+  {
+    HeapFree(GetProcessHeap(), 0, KeyName);
+  }
+#endif
+  
+  return Result;
+}
+
+/* EOF */
diff --git a/reactos/subsys/system/regedit/security.h b/reactos/subsys/system/regedit/security.h
new file mode 100644
index 00000000000..a0e9f832001
--- /dev/null
+++ b/reactos/subsys/system/regedit/security.h
@@ -0,0 +1,125 @@
+#ifndef _REGEXP_SECURITY_H
+#define _REGEXP_SECURITY_H
+
+/* FIXME - remove the definition */
+DWORD STDCALL
+GetSecurityInfo(HANDLE handle,
+                SE_OBJECT_TYPE ObjectType,
+                SECURITY_INFORMATION SecurityInfo,
+                PSID* ppsidOwner,
+                PSID* ppsidGroup,
+                PACL* ppDacl,
+                PACL* ppSacl,
+                PSECURITY_DESCRIPTOR* ppSecurityDescriptor);
+
+DEFINE_GUID(IID_CRegKeySecurity, 0x965fc360, 0x16ff, 0x11d0, 0x0091, 0xcb,0x00,0xaa,0x00,0xbb,0xb7,0x23);
+
+/******************************************************************************
+   CRegKeySecurity
+ ******************************************************************************/
+
+typedef struct CRegKeySecurity *LPREGKEYSECURITY;
+
+typedef struct ifaceCRegKeySecurityVbtl ifaceCRegKeySecurityVbtl;
+struct ifaceCRegKeySecurityVbtl
+{
+  /* IUnknown */
+  HRESULT (STDMETHODCALLTYPE *QueryInterface)(LPREGKEYSECURITY this, 
+                                              REFIID iid, 
+					      PVOID *pvObject);
+  ULONG (STDMETHODCALLTYPE *AddRef)(LPREGKEYSECURITY this);
+  ULONG (STDMETHODCALLTYPE *Release)(LPREGKEYSECURITY this);
+  
+  /* CRegKeySecurity */
+  HRESULT (STDMETHODCALLTYPE *GetObjectInformation)(LPREGKEYSECURITY this, 
+                                                    PSI_OBJECT_INFO pObjectInfo);
+  HRESULT (STDMETHODCALLTYPE *GetSecurity)(LPREGKEYSECURITY this, 
+                                           SECURITY_INFORMATION RequestedInformation,
+                                           PSECURITY_DESCRIPTOR* ppSecurityDescriptor,
+                                           BOOL fDefault);
+  HRESULT (STDMETHODCALLTYPE *SetSecurity)(LPREGKEYSECURITY this, 
+                                           SECURITY_INFORMATION RequestedInformation,
+                                           PSECURITY_DESCRIPTOR pSecurityDescriptor);
+  HRESULT (STDMETHODCALLTYPE *GetAccessRights)(LPREGKEYSECURITY this, 
+                                               const GUID* pguidObjectType,
+                                               DWORD dwFlags,
+                                               PSI_ACCESS* ppAccess,
+                                               ULONG* pcAccesses,
+                                               ULONG* piDefaultAccess);
+  HRESULT (STDMETHODCALLTYPE *MapGeneric)(LPREGKEYSECURITY this, 
+                                          const GUID* pguidObjectType,
+                                          UCHAR* pAceFlags,
+                                          ACCESS_MASK* pMask);
+  HRESULT (STDMETHODCALLTYPE *GetInheritTypes)(LPREGKEYSECURITY this, 
+                                               PSI_INHERIT_TYPE* ppInheritTypes,
+                                               ULONG* pcInheritTypes);
+  HRESULT (STDMETHODCALLTYPE *PropertySheetPageCallback)(LPREGKEYSECURITY this, 
+                                                         HWND hwnd,
+                                                         UINT uMsg,
+                                                         SI_PAGE_TYPE uPage);
+};
+
+typedef struct CRegKeySecurity
+{
+  /* IUnknown fields */
+  ifaceCRegKeySecurityVbtl* lpVtbl;
+  DWORD ref;
+  /* CRegKeySecurity fields */
+  HANDLE Handle;
+  SE_OBJECT_TYPE ObjectType;
+  SI_OBJECT_INFO ObjectInfo;
+  BOOL *Btn;
+} REGKEYSECURITY;
+
+HRESULT STDMETHODCALLTYPE CRegKeySecurity_fnQueryInterface(LPREGKEYSECURITY this,
+                                                           REFIID iid,
+							   PVOID *pvObject);
+ULONG STDMETHODCALLTYPE CRegKeySecurity_fnAddRef(LPREGKEYSECURITY this);
+ULONG STDMETHODCALLTYPE CRegKeySecurity_fnRelease(LPREGKEYSECURITY this);
+HRESULT STDMETHODCALLTYPE CRegKeySecurity_fnGetObjectInformation(LPREGKEYSECURITY this,
+                                                                 PSI_OBJECT_INFO pObjectInfo);
+HRESULT STDMETHODCALLTYPE CRegKeySecurity_fnGetSecurity(LPREGKEYSECURITY this, 
+                                                        SECURITY_INFORMATION RequestedInformation,
+                                                        PSECURITY_DESCRIPTOR* ppSecurityDescriptor,
+                                                        BOOL fDefault);
+HRESULT STDMETHODCALLTYPE CRegKeySecurity_fnSetSecurity(LPREGKEYSECURITY this, 
+                                                        SECURITY_INFORMATION RequestedInformation,
+                                                        PSECURITY_DESCRIPTOR pSecurityDescriptor);
+HRESULT STDMETHODCALLTYPE CRegKeySecurity_fnGetAccessRights(LPREGKEYSECURITY this, 
+                                                            const GUID* pguidObjectType,
+                                                            DWORD dwFlags,
+                                                            PSI_ACCESS* ppAccess,
+                                                            ULONG* pcAccesses,
+                                                            ULONG* piDefaultAccess);
+HRESULT STDMETHODCALLTYPE CRegKeySecurity_fnMapGeneric(LPREGKEYSECURITY this, 
+                                                       const GUID* pguidObjectType,
+                                                       UCHAR* pAceFlags,
+                                                       ACCESS_MASK* pMask);
+HRESULT STDMETHODCALLTYPE CRegKeySecurity_fnGetInheritTypes(LPREGKEYSECURITY this, 
+                                                            PSI_INHERIT_TYPE* ppInheritTypes,
+                                                            ULONG* pcInheritTypes);
+HRESULT STDMETHODCALLTYPE CRegKeySecurity_fnPropertySheetPageCallback(LPREGKEYSECURITY this, 
+                                                                      HWND hwnd,
+                                                                      UINT uMsg,
+                                                                      SI_PAGE_TYPE uPage);
+
+static ifaceCRegKeySecurityVbtl efvt =
+{
+  /* IUnknown methods */
+  CRegKeySecurity_fnQueryInterface,
+  CRegKeySecurity_fnAddRef,
+  CRegKeySecurity_fnRelease,
+  
+  /* CRegKeySecurity methods */
+  CRegKeySecurity_fnGetObjectInformation,
+  CRegKeySecurity_fnGetSecurity,
+  CRegKeySecurity_fnSetSecurity,
+  CRegKeySecurity_fnGetAccessRights,
+  CRegKeySecurity_fnMapGeneric,
+  CRegKeySecurity_fnGetInheritTypes,
+  CRegKeySecurity_fnPropertySheetPageCallback
+};
+
+#endif /* _REGEXP_SECURITY_H */
+
+/* EOF */

From 85cec6dde56b8b5f03a4167b41b0ec2658edec74 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sun, 11 Jul 2004 02:10:48 +0000
Subject: [PATCH 257/356] - Fixed locking in NtGdiGetCharWidth32. This caused
 problems with AbiWord reported by Jason Filby.

svn path=/trunk/; revision=10076
---
 reactos/subsys/win32k/objects/text.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/reactos/subsys/win32k/objects/text.c b/reactos/subsys/win32k/objects/text.c
index 03291a23cf8..41637e9e6e2 100644
--- a/reactos/subsys/win32k/objects/text.c
+++ b/reactos/subsys/win32k/objects/text.c
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: text.c,v 1.103 2004/07/09 20:28:20 navaraf Exp $ */
+/* $Id: text.c,v 1.104 2004/07/11 02:10:48 navaraf Exp $ */
 #include <w32k.h>
 
 #include <ft2build.h>
@@ -2016,10 +2016,17 @@ NtGdiGetCharWidth32(HDC  hDC,
       SetLastWin32Error(ERROR_INVALID_HANDLE);
       return FALSE;
    }
-   TextObj = TEXTOBJ_LockText(hFont);
    hFont = dc->w.hFont;
+   TextObj = TEXTOBJ_LockText(hFont);
    DC_UnlockDc(hDC);
 
+   if (TextObj == NULL)
+   {
+      ExFreePool(SafeBuffer);
+      SetLastWin32Error(ERROR_INVALID_HANDLE);
+      return FALSE;
+   }
+
    if (!NT_SUCCESS(GetFontObjectsFromTextObj(TextObj, NULL, NULL, &FontGDI)))
    {
       ExFreePool(SafeBuffer);

From f85cea6c2c58cf49cb4fd18bedec1b19e8a599f9 Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Sun, 11 Jul 2004 13:31:28 +0000
Subject: [PATCH 258/356] register the winlogon application directly after
 startup

svn path=/trunk/; revision=10078
---
 reactos/subsys/system/winlogon/winlogon.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/reactos/subsys/system/winlogon/winlogon.c b/reactos/subsys/system/winlogon/winlogon.c
index 9a3b4f4f891..5ad3267aa3c 100644
--- a/reactos/subsys/system/winlogon/winlogon.c
+++ b/reactos/subsys/system/winlogon/winlogon.c
@@ -1,4 +1,4 @@
-/* $Id: winlogon.c,v 1.32 2004/07/08 14:41:38 ekohl Exp $
+/* $Id: winlogon.c,v 1.33 2004/07/11 13:31:28 weiden Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -546,6 +546,14 @@ WinMain(HINSTANCE hInstance,
   
   hAppInstance = hInstance;
   
+  if(!RegisterLogonProcess(GetCurrentProcessId(), TRUE))
+  {
+    DbgPrint("WL: Could not register logon process\n");
+    NtShutdownSystem(ShutdownNoReboot);
+    ExitProcess(0);
+    return 0;
+  }
+  
 #if START_LSASS
    if (StartProcess(L"StartLsass"))
      {
@@ -565,14 +573,6 @@ WinMain(HINSTANCE hInstance,
   }
   
   WLSession->LogonStatus = LOGON_INITIALIZING;
-
-  if(!RegisterLogonProcess(GetCurrentProcessId(), TRUE))
-  {
-    DbgPrint("WL: Could not register logon process\n");
-    NtShutdownSystem(ShutdownNoReboot);
-    ExitProcess(0);
-    return 0;
-  }
   
   if(!WlxCreateWindowStationAndDesktops(WLSession))
   {

From 8d58125bdcae19bd5d3861fe296d4997a960ba0b Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Sun, 11 Jul 2004 13:33:40 +0000
Subject: [PATCH 259/356] Fix typo in SetSecurityDescriptorOwner().

svn path=/trunk/; revision=10079
---
 reactos/lib/advapi32/sec/sec.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reactos/lib/advapi32/sec/sec.c b/reactos/lib/advapi32/sec/sec.c
index 77d3b21f0d7..447fde72064 100644
--- a/reactos/lib/advapi32/sec/sec.c
+++ b/reactos/lib/advapi32/sec/sec.c
@@ -1,4 +1,4 @@
-/* $Id: sec.c,v 1.20 2004/03/25 11:30:07 ekohl Exp $
+/* $Id: sec.c,v 1.21 2004/07/11 13:33:40 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -358,7 +358,7 @@ SetSecurityDescriptorOwner (
 {
 	NTSTATUS Status;
 
-	Status = RtlSetGroupSecurityDescriptor (pSecurityDescriptor,
+	Status = RtlSetOwnerSecurityDescriptor (pSecurityDescriptor,
 	                                        pOwner,
 	                                        bOwnerDefaulted);
 	if (!NT_SUCCESS(Status))

From 839cdb0644312945abe59ffe6a3dd00391d75d78 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Sun, 11 Jul 2004 16:09:37 +0000
Subject: [PATCH 260/356] Add missing security constants.

svn path=/trunk/; revision=10080
---
 reactos/include/ddk/setypes.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/reactos/include/ddk/setypes.h b/reactos/include/ddk/setypes.h
index 087e110dbb6..b6a5e0e2e95 100644
--- a/reactos/include/ddk/setypes.h
+++ b/reactos/include/ddk/setypes.h
@@ -1,4 +1,4 @@
-/* $Id: setypes.h,v 1.14 2004/07/07 17:20:35 ekohl Exp $
+/* $Id: setypes.h,v 1.15 2004/07/11 16:09:37 ekohl Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory for details
  * PROJECT:           ReactOS kernel
@@ -51,6 +51,7 @@
 
 /* SECURITY_DESCRIPTOR_CONTROL */
 #define SECURITY_DESCRIPTOR_REVISION	(1)
+#define SECURITY_DESCRIPTOR_REVISION1	(1)
 #define SECURITY_DESCRIPTOR_MIN_LENGTH	(20)
 #define SE_OWNER_DEFAULTED	(1)
 #define SE_GROUP_DEFAULTED	(2)
@@ -66,6 +67,10 @@
 #define SE_PRIVILEGE_USED_FOR_ACCESS	(0x80000000L)
 #define PRIVILEGE_SET_ALL_NECESSARY	(0x1)
 
+/* SID */
+#define SID_REVISION		(1)
+#define SID_MAX_SUB_AUTHORITIES	(15)
+
 typedef struct _ACCESS_TOKEN
 {
   TOKEN_SOURCE			TokenSource;               /* 0x00 */

From c8d9ece95d06417d75e4bb947cec53470a53b5e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Sun, 11 Jul 2004 16:13:44 +0000
Subject: [PATCH 261/356] Jens Collin <jens.collin@lakhei.com> Add PATHEXT env
 var and use it to locate command

svn path=/trunk/; revision=10081
---
 reactos/bootdata/hivesys.inf      |   1 +
 reactos/subsys/system/cmd/misc.c  |   9 +-
 reactos/subsys/system/cmd/where.c | 288 +++++++++++-------------------
 3 files changed, 111 insertions(+), 187 deletions(-)

diff --git a/reactos/bootdata/hivesys.inf b/reactos/bootdata/hivesys.inf
index 91b22a28602..3864f4ab69e 100644
--- a/reactos/bootdata/hivesys.inf
+++ b/reactos/bootdata/hivesys.inf
@@ -103,6 +103,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x000
 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x00020000,"%SystemRoot%"
 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x00020000,"%SystemDrive%\TEMP"
 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x00020000,"%SystemDrive%\TEMP"
+HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","PATHEXT",0x00020000,".COM;.EXE;.BAT;.CMD"
 
 ; Known DLLs
 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\KnownDlls","DllDirectory",0x00020000,"%SystemRoot%\system32"
diff --git a/reactos/subsys/system/cmd/misc.c b/reactos/subsys/system/cmd/misc.c
index 4424e20c42f..454435e87d4 100644
--- a/reactos/subsys/system/cmd/misc.c
+++ b/reactos/subsys/system/cmd/misc.c
@@ -133,7 +133,7 @@ static BOOL add_entry (LPINT ac, LPTSTR **arg, LPCTSTR entry)
 		return FALSE;
 	}
 	_tcscpy (q, entry);
-		
+
 	oldarg = *arg;
 	*arg = realloc (oldarg, (*ac + 2) * sizeof (LPTSTR));
 	if (NULL == *arg)
@@ -359,7 +359,8 @@ BOOL IsValidPathName (LPCTSTR pszPath)
 
 BOOL IsValidFileName (LPCTSTR pszPath)
 {
-	return (GetFileAttributes (pszPath) != 0xFFFFFFFF);
+	DWORD attr = GetFileAttributes (pszPath);
+	return (attr != 0xFFFFFFFF && (! (attr & FILE_ATTRIBUTE_DIRECTORY)) );
 }
 
 
@@ -513,7 +514,7 @@ INT FilePromptYN (LPTSTR szFormat, ...)
 		ConInKey (&ir);
                 cKey = _totlower (ir.Event.KeyEvent.uChar.AsciiChar);
                 if (_tcschr (szKeys, cKey[0]) == NULL)
-                        cKey = 0;                        
+                        cKey = 0;
 
 
 	}
@@ -582,7 +583,7 @@ INT FilePromptYNA (LPTSTR szFormat, ...)
 		ConInKey (&ir);
                 cKey = _totlower (ir.Event.KeyEvent.uChar.AsciiChar);
                 if (_tcschr (szKeys, cKey[0]) == NULL)
-                        cKey = 0;                        
+                        cKey = 0;
 
 
 	}
diff --git a/reactos/subsys/system/cmd/where.c b/reactos/subsys/system/cmd/where.c
index 04bcc195445..701b2cce5c7 100644
--- a/reactos/subsys/system/cmd/where.c
+++ b/reactos/subsys/system/cmd/where.c
@@ -67,6 +67,11 @@
  *
  *    20-Apr-1999 (Eric Kohl <ekohl@abo.rhein-zeitung.de>)
  *        Some minor changes and improvements.
+ *
+
+ *    10-Jul-2004 (Jens Collin <jens.collin@lakhei.com>)
+ *        Fixed searxhing for files with specific extensions in PATHEXT order..
+ *
  */
 
 #include "config.h"
@@ -82,29 +87,23 @@
 #define ENV_BUFFER_SIZE  1024
 
 
-static LPTSTR ext[]  = {_T(".bat"), _T(".cmd"), _T(".com"), _T(".exe")};
-static INT nExtCount = sizeof(ext) / sizeof(LPTSTR);
-
-
 /* searches for file using path info. */
 
 BOOL
-SearchForExecutable (LPCTSTR pFileName, LPTSTR pFullName)
+SearchForExecutableSingle (LPCTSTR pFileName, LPTSTR pFullName, LPTSTR pExtension)
 {
 	TCHAR  szPathBuffer[MAX_PATH];
 	LPTSTR pszBuffer = NULL;
 	DWORD  dwBuffer, len;
-	INT    n;
-	LPTSTR p,s,f;
-
-
-	/* initialize full name buffer */
+	LPTSTR s,f;
+	// initialize full name buffer
 	*pFullName = _T('\0');
 
 #ifdef _DEBUG
-	DebugPrintf (_T("SearchForExecutable: \'%s\'\n"), pFileName);
+	DebugPrintf (_T("SearchForExecutableSingle: \'%s\' with ext: \'%s\'\n"), pFileName, pExtension);
 #endif
 
+	// Check if valid directly on specified path
 	if (_tcschr (pFileName, _T('\\')) != NULL)
 	{
 		LPTSTR pFilePart;
@@ -120,47 +119,45 @@ SearchForExecutable (LPCTSTR pFileName, LPTSTR pFullName)
 
 		if(pFilePart == 0)
 			return FALSE;
+		// Add extension and test file:
+		if (pExtension)
+			_tcscat(szPathBuffer, pExtension);
 
-
-                if (_tcschr (pFilePart, _T('.')) != NULL)
-                {
+		if (IsValidFileName (szPathBuffer))
+		{
 #ifdef _DEBUG
-                        DebugPrintf (_T("Filename extension!\n"));
+			DebugPrintf (_T("Found: \'%s\'\n"), szPathBuffer);
 #endif
-                        _tcscpy (pFullName, szPathBuffer);
-                        return TRUE;
+			_tcscpy (pFullName, szPathBuffer);
+			return TRUE;
+		}
+		return FALSE;
+	}
 
-                }
-                else
-                {
+	// search in current directory
+	len = GetCurrentDirectory (MAX_PATH, szPathBuffer);
+	if (szPathBuffer[len - 1] != _T('\\'))
+	{
+		szPathBuffer[len] = _T('\\');
+		szPathBuffer[len + 1] = _T('\0');
+	}
+	_tcscat (szPathBuffer, pFileName);
+
+	if (pExtension)
+		_tcscat (szPathBuffer, pExtension);
+
+	if (IsValidFileName (szPathBuffer))
+	{
 #ifdef _DEBUG
-                        DebugPrintf (_T("No filename extension!\n"));
+		DebugPrintf (_T("Found: \'%s\'\n"), szPathBuffer);
 #endif
+		_tcscpy (pFullName, szPathBuffer);
+		return TRUE;
+	}
 
-                        p = szPathBuffer + _tcslen (szPathBuffer);
 
-                        for (n = 0; n < nExtCount; n++)
-                        {
-                                _tcscpy (p, ext[n]);
 
-#ifdef _DEBUG
-                                DebugPrintf (_T("Testing: \'%s\'\n"), szPathBuffer);
-#endif
-
-                                if (IsValidFileName (szPathBuffer))
-                                {
-#ifdef _DEBUG
-                                        DebugPrintf (_T("Found: \'%s\'\n"), szPathBuffer);
-#endif
-                                        _tcscpy (pFullName, szPathBuffer);
-                                        return TRUE;
-                                }
-                        }
-                        return FALSE;
-                }
-        }
-
-	/* load environment varable PATH into buffer */
+	// load environment varable PATH into buffer
 	pszBuffer = (LPTSTR)malloc (ENV_BUFFER_SIZE * sizeof(TCHAR));
 	dwBuffer = GetEnvironmentVariable (_T("PATH"), pszBuffer, ENV_BUFFER_SIZE);
 	if (dwBuffer > ENV_BUFFER_SIZE)
@@ -169,16 +166,26 @@ SearchForExecutable (LPCTSTR pFileName, LPTSTR pFullName)
 		GetEnvironmentVariable (_T("PATH"), pszBuffer, dwBuffer * sizeof (TCHAR));
 	}
 
-	if (!(p = _tcsrchr (pFileName, _T('.'))) ||
-		_tcschr (p + 1, _T('\\')))
-	{
-		/* There is no extension ==> test all the extensions. */
-#ifdef _DEBUG
-		DebugPrintf (_T("No filename extension!\n"));
-#endif
 
-		/* search in current directory */
-		len = GetCurrentDirectory (MAX_PATH, szPathBuffer);
+	// search in PATH
+	s = pszBuffer;
+	while (s && *s)
+	{
+		f = _tcschr (s, _T(';'));
+
+		if (f)
+		{
+			_tcsncpy (szPathBuffer, s, (size_t)(f-s));
+			szPathBuffer[f-s] = _T('\0');
+			s = f + 1;
+		}
+		else
+		{
+			_tcscpy (szPathBuffer, s);
+			s = NULL;
+		}
+
+		len = _tcslen(szPathBuffer);
 		if (szPathBuffer[len - 1] != _T('\\'))
 		{
 			szPathBuffer[len] = _T('\\');
@@ -186,95 +193,9 @@ SearchForExecutable (LPCTSTR pFileName, LPTSTR pFullName)
 		}
 		_tcscat (szPathBuffer, pFileName);
 
-		p = szPathBuffer + _tcslen (szPathBuffer);
+		if (pExtension)
+			_tcscat (szPathBuffer, pExtension);
 
-		for (n = 0; n < nExtCount; n++)
-		{
-			_tcscpy (p, ext[n]);
-
-#ifdef _DEBUG
-			DebugPrintf (_T("Testing: \'%s\'\n"), szPathBuffer);
-#endif
-
-			if (IsValidFileName (szPathBuffer))
-			{
-#ifdef _DEBUG
-				DebugPrintf (_T("Found: \'%s\'\n"), szPathBuffer);
-#endif
-				free (pszBuffer);
-				_tcscpy (pFullName, szPathBuffer);
-				return TRUE;
-			}
-		}
-
-		/* search in PATH */
-		s = pszBuffer;
-		while (s && *s)
-		{
-			f = _tcschr (s, _T(';'));
-
-			if (f)
-			{
-				_tcsncpy (szPathBuffer, s, (size_t)(f-s));
-				szPathBuffer[f-s] = _T('\0');
-				s = f + 1;
-			}
-			else
-			{
-				_tcscpy (szPathBuffer, s);
-				s = NULL;
-			}
-
-			len = _tcslen(szPathBuffer);
-			if (szPathBuffer[len - 1] != _T('\\'))
-			{
-				szPathBuffer[len] = _T('\\');
-				szPathBuffer[len + 1] = _T('\0');
-			}
-			_tcscat (szPathBuffer, pFileName);
-
-			p = szPathBuffer + _tcslen (szPathBuffer);
-
-			for (n = 0; n < nExtCount; n++)
-			{
-				_tcscpy (p, ext[n]);
-
-#ifdef _DEBUG
-				DebugPrintf (_T("Testing: \'%s\'\n"), szPathBuffer);
-#endif
-
-				if (IsValidFileName (szPathBuffer))
-				{
-#ifdef _DEBUG
-					DebugPrintf (_T("Found: \'%s\'\n"), szPathBuffer);
-#endif
-					free (pszBuffer);
-					_tcscpy (pFullName, szPathBuffer);
-					return TRUE;
-				}
-			}
-		}
-	}
-	else
-	{
-		/* There is an extension and it is in the last path component, */
-		/* so don't test all the extensions. */
-#ifdef _DEBUG
-		DebugPrintf (_T("Filename extension!\n"));
-#endif
-
-		/* search in current directory */
-		len = GetCurrentDirectory (MAX_PATH, szPathBuffer);
-		if (szPathBuffer[len - 1] != _T('\\'))
-		{
-			szPathBuffer[len] = _T('\\');
-			szPathBuffer[len + 1] = _T('\0');
-		}
-		_tcscat (szPathBuffer, pFileName);
-
-#ifdef _DEBUG
-		DebugPrintf (_T("Testing: \'%s\'\n"), szPathBuffer);
-#endif
 		if (IsValidFileName (szPathBuffer))
 		{
 #ifdef _DEBUG
@@ -284,50 +205,51 @@ SearchForExecutable (LPCTSTR pFileName, LPTSTR pFullName)
 			_tcscpy (pFullName, szPathBuffer);
 			return TRUE;
 		}
-
-
-		/* search in PATH */
-		s = pszBuffer;
-		while (s && *s)
-		{
-			f = _tcschr (s, _T(';'));
-
-			if (f)
-			{
-				_tcsncpy (szPathBuffer, s, (size_t)(f-s));
-				szPathBuffer[f-s] = _T('\0');
-				s = f + 1;
-			}
-			else
-			{
-				_tcscpy (szPathBuffer, s);
-				s = NULL;
-			}
-
-			len = _tcslen(szPathBuffer);
-			if (szPathBuffer[len - 1] != _T('\\'))
-			{
-				szPathBuffer[len] = _T('\\');
-				szPathBuffer[len + 1] = _T('\0');
-			}
-			_tcscat (szPathBuffer, pFileName);
-
-#ifdef _DEBUG
-			DebugPrintf (_T("Testing: \'%s\'\n"), szPathBuffer);
-#endif
-			if (IsValidFileName (szPathBuffer))
-			{
-#ifdef _DEBUG
-				DebugPrintf (_T("Found: \'%s\'\n"), szPathBuffer);
-#endif
-				free (pszBuffer);
-				_tcscpy (pFullName, szPathBuffer);
-				return TRUE;
-			}
-		}
 	}
-
 	free (pszBuffer);
-
+	return FALSE;
+}
+
+
+BOOL
+SearchForExecutable (LPCTSTR pFileName, LPTSTR pFullName)
+{
+	LPTSTR pszBuffer = NULL;
+	LPTSTR pCh;
+	DWORD  dwBuffer;
+#ifdef _DEBUG
+	DebugPrintf (_T("SearchForExecutable: \'%s\'\n"), pFileName);
+#endif
+	// check the filename directly
+	if (SearchForExecutableSingle(pFileName, pFullName, NULL))
+	{
+		return TRUE;
+	}
+
+	// load environment varable PATHEXT
+	pszBuffer = (LPTSTR)malloc (ENV_BUFFER_SIZE * sizeof(TCHAR));
+	dwBuffer = GetEnvironmentVariable (_T("PATHEXT"), pszBuffer, ENV_BUFFER_SIZE);
+	if (dwBuffer > ENV_BUFFER_SIZE)
+	{
+		pszBuffer = (LPTSTR)realloc (pszBuffer, dwBuffer * sizeof (TCHAR));
+		GetEnvironmentVariable (_T("PATHEXT"), pszBuffer, dwBuffer * sizeof (TCHAR));
+	}
+
+#ifdef _DEBUG
+	DebugPrintf (_T("SearchForExecutable(): Loaded PATHEXT: %s\n"), pszBuffer);
+#endif
+
+	pCh = _tcstok(pszBuffer, ";");
+	while (pCh)
+	{
+		if (SearchForExecutableSingle(pFileName, pFullName, pCh))
+		{
+			free(pszBuffer);
+			return TRUE;
+		}
+		pCh = _tcstok(NULL, ";");
+	}
+
+	free(pszBuffer);
 	return FALSE;
 }

From 093e925a663cbb3989f10b0d249dea276390d733 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Sun, 11 Jul 2004 16:23:12 +0000
Subject: [PATCH 262/356] Use default PATHEXT if none found in environment

svn path=/trunk/; revision=10082
---
 reactos/subsys/system/cmd/where.c | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/reactos/subsys/system/cmd/where.c b/reactos/subsys/system/cmd/where.c
index 701b2cce5c7..9d6cfd8611b 100644
--- a/reactos/subsys/system/cmd/where.c
+++ b/reactos/subsys/system/cmd/where.c
@@ -96,14 +96,14 @@ SearchForExecutableSingle (LPCTSTR pFileName, LPTSTR pFullName, LPTSTR pExtensio
 	LPTSTR pszBuffer = NULL;
 	DWORD  dwBuffer, len;
 	LPTSTR s,f;
-	// initialize full name buffer
+	/* initialize full name buffer */
 	*pFullName = _T('\0');
 
 #ifdef _DEBUG
 	DebugPrintf (_T("SearchForExecutableSingle: \'%s\' with ext: \'%s\'\n"), pFileName, pExtension);
 #endif
 
-	// Check if valid directly on specified path
+	/* Check if valid directly on specified path */
 	if (_tcschr (pFileName, _T('\\')) != NULL)
 	{
 		LPTSTR pFilePart;
@@ -119,7 +119,7 @@ SearchForExecutableSingle (LPCTSTR pFileName, LPTSTR pFullName, LPTSTR pExtensio
 
 		if(pFilePart == 0)
 			return FALSE;
-		// Add extension and test file:
+		/* Add extension and test file: */
 		if (pExtension)
 			_tcscat(szPathBuffer, pExtension);
 
@@ -134,7 +134,7 @@ SearchForExecutableSingle (LPCTSTR pFileName, LPTSTR pFullName, LPTSTR pExtensio
 		return FALSE;
 	}
 
-	// search in current directory
+	/* search in current directory */
 	len = GetCurrentDirectory (MAX_PATH, szPathBuffer);
 	if (szPathBuffer[len - 1] != _T('\\'))
 	{
@@ -157,7 +157,7 @@ SearchForExecutableSingle (LPCTSTR pFileName, LPTSTR pFullName, LPTSTR pExtensio
 
 
 
-	// load environment varable PATH into buffer
+	/* load environment varable PATH into buffer */
 	pszBuffer = (LPTSTR)malloc (ENV_BUFFER_SIZE * sizeof(TCHAR));
 	dwBuffer = GetEnvironmentVariable (_T("PATH"), pszBuffer, ENV_BUFFER_SIZE);
 	if (dwBuffer > ENV_BUFFER_SIZE)
@@ -167,7 +167,7 @@ SearchForExecutableSingle (LPCTSTR pFileName, LPTSTR pFullName, LPTSTR pExtensio
 	}
 
 
-	// search in PATH
+	/* search in PATH */
 	s = pszBuffer;
 	while (s && *s)
 	{
@@ -214,19 +214,20 @@ SearchForExecutableSingle (LPCTSTR pFileName, LPTSTR pFullName, LPTSTR pExtensio
 BOOL
 SearchForExecutable (LPCTSTR pFileName, LPTSTR pFullName)
 {
+	static TCHAR pszDefaultPathExt[] = _T(".COM;.EXE;.BAT;.CMD");
 	LPTSTR pszBuffer = NULL;
 	LPTSTR pCh;
 	DWORD  dwBuffer;
 #ifdef _DEBUG
 	DebugPrintf (_T("SearchForExecutable: \'%s\'\n"), pFileName);
 #endif
-	// check the filename directly
+	/* check the filename directly */
 	if (SearchForExecutableSingle(pFileName, pFullName, NULL))
 	{
 		return TRUE;
 	}
 
-	// load environment varable PATHEXT
+	/* load environment varable PATHEXT */
 	pszBuffer = (LPTSTR)malloc (ENV_BUFFER_SIZE * sizeof(TCHAR));
 	dwBuffer = GetEnvironmentVariable (_T("PATHEXT"), pszBuffer, ENV_BUFFER_SIZE);
 	if (dwBuffer > ENV_BUFFER_SIZE)
@@ -234,6 +235,10 @@ SearchForExecutable (LPCTSTR pFileName, LPTSTR pFullName)
 		pszBuffer = (LPTSTR)realloc (pszBuffer, dwBuffer * sizeof (TCHAR));
 		GetEnvironmentVariable (_T("PATHEXT"), pszBuffer, dwBuffer * sizeof (TCHAR));
 	}
+	else if (0 == dwBuffer)
+	{
+		_tcscpy(pszBuffer, pszDefaultPathExt);
+	}
 
 #ifdef _DEBUG
 	DebugPrintf (_T("SearchForExecutable(): Loaded PATHEXT: %s\n"), pszBuffer);

From 02c02382be619ce45080cce86e7fdfc43d64f69a Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Sun, 11 Jul 2004 22:35:07 +0000
Subject: [PATCH 263/356] do not statically link to ole32.dll, import the
 functions dynamically instead. This is required since winlogon statically
 links to userenv.dll and then ole32.dll would automatically be loaded which
 causes ole32.dll to register a window class before the first window station
 is created (-> the ole32 window class(es) couldn't be registered). Besides
 it's bad to have winlogon depend on ole32.dll

svn path=/trunk/; revision=10083
---
 reactos/lib/userenv/desktop.c  | 47 ++++++++++++++---------
 reactos/lib/userenv/internal.h | 32 +++++++++++++++-
 reactos/lib/userenv/makefile   |  2 +-
 reactos/lib/userenv/misc.c     | 69 +++++++++++++++++++++++++++++++++-
 4 files changed, 130 insertions(+), 20 deletions(-)

diff --git a/reactos/lib/userenv/desktop.c b/reactos/lib/userenv/desktop.c
index 6163db7411e..942b5ac4df6 100644
--- a/reactos/lib/userenv/desktop.c
+++ b/reactos/lib/userenv/desktop.c
@@ -1,4 +1,4 @@
-/* $Id: desktop.c,v 1.6 2004/05/07 11:18:53 ekohl Exp $
+/* $Id: desktop.c,v 1.7 2004/07/11 22:35:07 weiden Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -150,6 +150,7 @@ AddDesktopItemW (BOOL bCommonDesktop,
 		 WORD wHotKey,
 		 INT iShowCmd)
 {
+  DYN_FUNCS Ole32;
   WCHAR szLinkPath[MAX_PATH];
   WCHAR szArguments[MAX_PATH];
   WCHAR szCommand[MAX_PATH];
@@ -216,16 +217,20 @@ AddDesktopItemW (BOOL bCommonDesktop,
   DPRINT ("szCommand: '%S'\n", szCommand);
   DPRINT ("szArguments: '%S'\n", szArguments);
 
-  CoInitialize(NULL);
+  /* dynamically load ole32.dll */
+  LoadDynamicImports(&DynOle32, &Ole32);
 
-  hr = CoCreateInstance(&CLSID_ShellLink,
-                        NULL,
-                        CLSCTX_INPROC_SERVER,
-                        &IID_IShellLinkW,
-                       (LPVOID*)&psl);
+  Ole32.fn.CoInitialize(NULL);
+
+  hr = Ole32.fn.CoCreateInstance(&CLSID_ShellLink,
+                                 NULL,
+                                 CLSCTX_INPROC_SERVER,
+                                 &IID_IShellLinkW,
+                                 (LPVOID*)&psl);
   if (!SUCCEEDED(hr))
     {
-      CoUninitialize();
+      Ole32.fn.CoUninitialize();
+      UnloadDynamicImports(&Ole32);
       return FALSE;
     }
 
@@ -275,7 +280,9 @@ AddDesktopItemW (BOOL bCommonDesktop,
 
   psl->lpVtbl->Release(psl);
 
-  CoUninitialize();
+  Ole32.fn.CoUninitialize();
+  
+  UnloadDynamicImports(&Ole32);
 
   DPRINT ("AddDesktopItemW() done\n");
 
@@ -428,6 +435,7 @@ AddItemW (LPCWSTR lpGroupName,
 	  WORD wHotKey,
 	  INT iShowCmd)
 {
+  DYN_FUNCS Ole32;
   WCHAR szLinkPath[MAX_PATH];
   WCHAR szArguments[MAX_PATH];
   WCHAR szCommand[MAX_PATH];
@@ -499,16 +507,20 @@ AddItemW (LPCWSTR lpGroupName,
   DPRINT ("szCommand: '%S'\n", szCommand);
   DPRINT ("szArguments: '%S'\n", szArguments);
 
-  CoInitialize(NULL);
+  /* dynamically load ole32.dll */
+  LoadDynamicImports(&DynOle32, &Ole32);
 
-  hr = CoCreateInstance(&CLSID_ShellLink,
-                        NULL,
-                        CLSCTX_INPROC_SERVER,
-                        &IID_IShellLinkW,
-                       (LPVOID*)&psl);
+  Ole32.fn.CoInitialize(NULL);
+
+  hr = Ole32.fn.CoCreateInstance(&CLSID_ShellLink,
+                                 NULL,
+                                 CLSCTX_INPROC_SERVER,
+                                 &IID_IShellLinkW,
+                                 (LPVOID*)&psl);
   if (!SUCCEEDED(hr))
     {
-      CoUninitialize();
+      Ole32.fn.CoUninitialize();
+      UnloadDynamicImports(&Ole32);
       return FALSE;
     }
 
@@ -558,7 +570,8 @@ AddItemW (LPCWSTR lpGroupName,
 
   psl->lpVtbl->Release(psl);
 
-  CoUninitialize();
+  Ole32.fn.CoUninitialize();
+  UnloadDynamicImports(&Ole32);
 
   DPRINT ("AddItemW() done\n");
 
diff --git a/reactos/lib/userenv/internal.h b/reactos/lib/userenv/internal.h
index 8343e2d4354..fdeecd9924a 100644
--- a/reactos/lib/userenv/internal.h
+++ b/reactos/lib/userenv/internal.h
@@ -1,4 +1,4 @@
-/* $Id: internal.h,v 1.6 2004/05/07 11:18:53 ekohl Exp $ 
+/* $Id: internal.h,v 1.7 2004/07/11 22:35:07 weiden Exp $ 
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -37,6 +37,36 @@ BOOL
 RemoveDirectoryPath (LPCWSTR lpPathName);
 
 /* misc.c */
+typedef struct _DYN_FUNCS
+{
+  HMODULE hModule;
+  union
+  {
+    PVOID foo;
+    struct
+    {
+      HRESULT (STDCALL *CoInitialize)(LPVOID pvReserved);
+      HRESULT (STDCALL *CoCreateInstance)(REFCLSID rclsid, LPUNKNOWN pUnkOuter, DWORD dwClsContext, REFIID riid, LPVOID * ppv);
+      HRESULT (STDCALL *CoUninitialize)(VOID);
+    };
+  } fn;
+} DYN_FUNCS, *PDYN_FUNCS;
+
+typedef struct _DYN_MODULE
+{
+  LPWSTR Library;    /* dll file name */
+  int nFunctions;    /* number of functions in the Functions array */
+  LPSTR *Functions;  /* function names */
+} DYN_MODULE, *PDYN_MODULE;
+
+extern DYN_MODULE DynOle32;
+
+BOOL
+LoadDynamicImports(PDYN_MODULE Module, PDYN_FUNCS DynFuncs);
+
+VOID
+UnloadDynamicImports(PDYN_FUNCS DynFuncs);
+
 LPWSTR
 AppendBackslash (LPWSTR String);
 
diff --git a/reactos/lib/userenv/makefile b/reactos/lib/userenv/makefile
index 18c5e800746..ba98f620ce5 100644
--- a/reactos/lib/userenv/makefile
+++ b/reactos/lib/userenv/makefile
@@ -13,7 +13,7 @@ TARGET_CFLAGS += -DUNICODE -D_UNICODE -Wall -Werror
 
 TARGET_LFLAGS = -nostdlib -nostartfiles
 
-TARGET_SDKLIBS = ntdll.a kernel32.a advapi32.a ole32.a wine_uuid.a
+TARGET_SDKLIBS = ntdll.a kernel32.a advapi32.a wine_uuid.a
 
 TARGET_OBJECTS = desktop.o directory.o environment.o profile.o misc.o \
                  registry.o setup.o userenv.o
diff --git a/reactos/lib/userenv/misc.c b/reactos/lib/userenv/misc.c
index 4548eaa98ff..d57f89b2e98 100644
--- a/reactos/lib/userenv/misc.c
+++ b/reactos/lib/userenv/misc.c
@@ -1,4 +1,4 @@
-/* $Id: misc.c,v 1.2 2004/03/13 20:49:07 ekohl Exp $
+/* $Id: misc.c,v 1.3 2004/07/11 22:35:07 weiden Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -91,4 +91,71 @@ GetUserSidFromToken (HANDLE hToken,
   return TRUE;
 }
 
+/* Dynamic DLL loading interface **********************************************/
+
+/* OLE32.DLL import table */
+LPSTR Ole32Imports[] =
+{
+  "CoInitialize",
+  "CoCreateInstance",
+  "CoUninitialize",
+};
+
+DYN_MODULE DynOle32 = 
+{
+  L"ole32.dll",
+  sizeof(Ole32Imports) / sizeof(LPSTR),
+  Ole32Imports
+};
+
+/*
+   Use this function to load functions from other modules. We cannot statically
+   link to e.g. ole32.dll because those dlls would get loaded on startup with
+   winlogon and they may try to register classes etc when not even a window station
+   has been created!
+*/
+
+BOOL
+LoadDynamicImports(PDYN_MODULE Module, PDYN_FUNCS DynFuncs)
+{
+  int i;
+  PVOID *fn;
+  
+  ZeroMemory(DynFuncs, sizeof(DYN_FUNCS));
+  
+  DynFuncs->hModule = LoadLibraryW(Module->Library);
+  if(!DynFuncs->hModule)
+  {
+    return FALSE;
+  }
+  
+  /* begin with the first function */
+  fn = &DynFuncs->fn.foo; /* warning: assignment from incompatible pointer type */
+  
+  /* load the imports */
+  for(i = 0; i < Module->nFunctions; i++)
+  {
+    *fn = GetProcAddress(DynFuncs->hModule, Module->Functions[i]);
+    if(*fn == NULL)
+    {
+      FreeLibrary(DynFuncs->hModule);
+      DynFuncs->hModule = (HMODULE)0;
+      return FALSE;
+    }
+    fn++;
+  }
+  
+  return TRUE;
+}
+
+VOID
+UnloadDynamicImports(PDYN_FUNCS DynFuncs)
+{
+  if(DynFuncs->hModule)
+  {
+    FreeLibrary(DynFuncs->hModule);
+    DynFuncs->hModule = (HMODULE)0;
+  }
+}
+
 /* EOF */

From 6535d130b795bc97d4f8f3306d97bf927e2afabc Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Sun, 11 Jul 2004 23:08:31 +0000
Subject: [PATCH 264/356] removed wrong comments

svn path=/trunk/; revision=10085
---
 reactos/lib/userenv/misc.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/reactos/lib/userenv/misc.c b/reactos/lib/userenv/misc.c
index d57f89b2e98..1e1eb99ac24 100644
--- a/reactos/lib/userenv/misc.c
+++ b/reactos/lib/userenv/misc.c
@@ -1,4 +1,4 @@
-/* $Id: misc.c,v 1.3 2004/07/11 22:35:07 weiden Exp $
+/* $Id: misc.c,v 1.4 2004/07/11 23:08:31 weiden Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -129,8 +129,7 @@ LoadDynamicImports(PDYN_MODULE Module, PDYN_FUNCS DynFuncs)
     return FALSE;
   }
   
-  /* begin with the first function */
-  fn = &DynFuncs->fn.foo; /* warning: assignment from incompatible pointer type */
+  fn = &DynFuncs->fn.foo;
   
   /* load the imports */
   for(i = 0; i < Module->nFunctions; i++)

From ad9cdc4edc68fb1a44c20aab2c991dbddaab43ed Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Mon, 12 Jul 2004 10:33:04 +0000
Subject: [PATCH 265/356] simplified dynamic loading of dlls

svn path=/trunk/; revision=10086
---
 reactos/lib/userenv/desktop.c  | 14 +++++++++++---
 reactos/lib/userenv/internal.h |  5 ++---
 reactos/lib/userenv/misc.c     | 23 ++++++++++-------------
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/reactos/lib/userenv/desktop.c b/reactos/lib/userenv/desktop.c
index 942b5ac4df6..b7be157e1a8 100644
--- a/reactos/lib/userenv/desktop.c
+++ b/reactos/lib/userenv/desktop.c
@@ -1,4 +1,4 @@
-/* $Id: desktop.c,v 1.7 2004/07/11 22:35:07 weiden Exp $
+/* $Id: desktop.c,v 1.8 2004/07/12 10:33:04 weiden Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -218,7 +218,11 @@ AddDesktopItemW (BOOL bCommonDesktop,
   DPRINT ("szArguments: '%S'\n", szArguments);
 
   /* dynamically load ole32.dll */
-  LoadDynamicImports(&DynOle32, &Ole32);
+  if(!LoadDynamicImports(&DynOle32, &Ole32))
+  {
+    DPRINT1("USERENV: Unable to load OLE32.DLL\n");
+    return FALSE;
+  }
 
   Ole32.fn.CoInitialize(NULL);
 
@@ -508,7 +512,11 @@ AddItemW (LPCWSTR lpGroupName,
   DPRINT ("szArguments: '%S'\n", szArguments);
 
   /* dynamically load ole32.dll */
-  LoadDynamicImports(&DynOle32, &Ole32);
+  if(!LoadDynamicImports(&DynOle32, &Ole32))
+  {
+    DPRINT1("USERENV: Unable to load OLE32.DLL\n");
+    return FALSE;
+  }
 
   Ole32.fn.CoInitialize(NULL);
 
diff --git a/reactos/lib/userenv/internal.h b/reactos/lib/userenv/internal.h
index fdeecd9924a..f540e1922b6 100644
--- a/reactos/lib/userenv/internal.h
+++ b/reactos/lib/userenv/internal.h
@@ -1,4 +1,4 @@
-/* $Id: internal.h,v 1.7 2004/07/11 22:35:07 weiden Exp $ 
+/* $Id: internal.h,v 1.8 2004/07/12 10:33:04 weiden Exp $ 
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -55,8 +55,7 @@ typedef struct _DYN_FUNCS
 typedef struct _DYN_MODULE
 {
   LPWSTR Library;    /* dll file name */
-  int nFunctions;    /* number of functions in the Functions array */
-  LPSTR *Functions;  /* function names */
+  LPSTR Functions[]; /* function names */
 } DYN_MODULE, *PDYN_MODULE;
 
 extern DYN_MODULE DynOle32;
diff --git a/reactos/lib/userenv/misc.c b/reactos/lib/userenv/misc.c
index 1e1eb99ac24..3830baec420 100644
--- a/reactos/lib/userenv/misc.c
+++ b/reactos/lib/userenv/misc.c
@@ -1,4 +1,4 @@
-/* $Id: misc.c,v 1.4 2004/07/11 23:08:31 weiden Exp $
+/* $Id: misc.c,v 1.5 2004/07/12 10:33:04 weiden Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -94,18 +94,15 @@ GetUserSidFromToken (HANDLE hToken,
 /* Dynamic DLL loading interface **********************************************/
 
 /* OLE32.DLL import table */
-LPSTR Ole32Imports[] =
-{
-  "CoInitialize",
-  "CoCreateInstance",
-  "CoUninitialize",
-};
-
 DYN_MODULE DynOle32 = 
 {
   L"ole32.dll",
-  sizeof(Ole32Imports) / sizeof(LPSTR),
-  Ole32Imports
+  {
+    "CoInitialize",
+    "CoCreateInstance",
+    "CoUninitialize",
+    NULL
+  }
 };
 
 /*
@@ -118,7 +115,7 @@ DYN_MODULE DynOle32 =
 BOOL
 LoadDynamicImports(PDYN_MODULE Module, PDYN_FUNCS DynFuncs)
 {
-  int i;
+  LPSTR *fname;
   PVOID *fn;
   
   ZeroMemory(DynFuncs, sizeof(DYN_FUNCS));
@@ -132,9 +129,9 @@ LoadDynamicImports(PDYN_MODULE Module, PDYN_FUNCS DynFuncs)
   fn = &DynFuncs->fn.foo;
   
   /* load the imports */
-  for(i = 0; i < Module->nFunctions; i++)
+  for(fname = Module->Functions; *fname != NULL; fname++)
   {
-    *fn = GetProcAddress(DynFuncs->hModule, Module->Functions[i]);
+    *fn = GetProcAddress(DynFuncs->hModule, *fname);
     if(*fn == NULL)
     {
       FreeLibrary(DynFuncs->hModule);

From 72b6ef30e795c6d9e9c888458ab92f8fb5a577e9 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Mon, 12 Jul 2004 12:05:49 +0000
Subject: [PATCH 266/356] Fix NtAccessCheck() prototype.

svn path=/trunk/; revision=10087
---
 reactos/include/ntos/zw.h          | 15 +++++++++------
 reactos/include/wine/winternl.h    |  2 +-
 reactos/lib/advapi32/token/token.c | 16 +++++++++++++---
 reactos/ntoskrnl/se/semgr.c        |  6 +++---
 reactos/w32api/include/ddk/ntapi.h |  2 +-
 5 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/reactos/include/ntos/zw.h b/reactos/include/ntos/zw.h
index cfb24fa142c..58622d3295f 100755
--- a/reactos/include/ntos/zw.h
+++ b/reactos/include/ntos/zw.h
@@ -1,5 +1,5 @@
 
-/* $Id: zw.h,v 1.25 2004/06/13 10:35:51 navaraf Exp $
+/* $Id: zw.h,v 1.26 2004/07/12 12:00:15 ekohl Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -4544,7 +4544,10 @@ NtQueryOleDirectoryFile (
  *	  ReturnLength = Bytes written
  *	  GrantedAccess = 
  *	  AccessStatus = Indicates if the ClientToken allows the requested access
- * REMARKS: The arguments map to the win32 AccessCheck 
+ * REMARKS: The arguments map to the win32 AccessCheck
+ *	 Gary Nebbett is wrong:
+ *	   The 7th argument is a PACCESS_MASK, not a PULONG.
+ *	   The 8th argument is a PNTSTATUS, not a PBOOLEAN.
  * RETURNS: Status
  */
 
@@ -4557,8 +4560,8 @@ NtAccessCheck(
 	IN PGENERIC_MAPPING GenericMapping,
 	OUT PPRIVILEGE_SET PrivilegeSet,
 	OUT PULONG ReturnLength,
-	OUT PULONG GrantedAccess,
-	OUT PBOOLEAN AccessStatus
+	OUT PACCESS_MASK GrantedAccess,
+	OUT PNTSTATUS AccessStatus
 	);
 
 NTSTATUS
@@ -4570,8 +4573,8 @@ ZwAccessCheck(
 	IN PGENERIC_MAPPING GenericMapping,
 	OUT PPRIVILEGE_SET PrivilegeSet,
 	OUT PULONG ReturnLength,
-	OUT PULONG GrantedAccess,
-	OUT PBOOLEAN AccessStatus
+	OUT PACCESS_MASK GrantedAccess,
+	OUT PNTSTATUS AccessStatus
 	);
 
 NTSTATUS
diff --git a/reactos/include/wine/winternl.h b/reactos/include/wine/winternl.h
index 7e6e09fc562..d122c540aff 100644
--- a/reactos/include/wine/winternl.h
+++ b/reactos/include/wine/winternl.h
@@ -966,7 +966,7 @@ void      WINAPI LdrInitializeThunk(HANDLE,LPVOID,ULONG,ULONG);
 NTSTATUS  WINAPI LdrLoadDll(LPCWSTR, DWORD, const UNICODE_STRING*, HMODULE*);
 void      WINAPI LdrShutdownProcess(void);
 void      WINAPI LdrShutdownThread(void);
-NTSTATUS  WINAPI NtAccessCheck(PSECURITY_DESCRIPTOR,HANDLE,ACCESS_MASK,PGENERIC_MAPPING,PPRIVILEGE_SET,PULONG,PULONG,PBOOLEAN);
+NTSTATUS  WINAPI NtAccessCheck(PSECURITY_DESCRIPTOR,HANDLE,ACCESS_MASK,PGENERIC_MAPPING,PPRIVILEGE_SET,PULONG,PACCESS_MASK,PNTSTATUS);
 NTSTATUS  WINAPI NtAdjustPrivilegesToken(HANDLE,BOOLEAN,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD);
 NTSTATUS  WINAPI NtAllocateVirtualMemory(HANDLE,PVOID*,PVOID,ULONG*,ULONG,ULONG);
 NTSTATUS  WINAPI NtCancelTimer(HANDLE, BOOLEAN*);
diff --git a/reactos/lib/advapi32/token/token.c b/reactos/lib/advapi32/token/token.c
index 97a8e191d2c..de3c63dd10a 100644
--- a/reactos/lib/advapi32/token/token.c
+++ b/reactos/lib/advapi32/token/token.c
@@ -1,4 +1,4 @@
-/* $Id: token.c,v 1.11 2004/07/06 22:07:25 gvg Exp $
+/* $Id: token.c,v 1.12 2004/07/12 12:05:49 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -143,6 +143,7 @@ AccessCheck (PSECURITY_DESCRIPTOR pSecurityDescriptor,
 	     LPBOOL AccessStatus)
 {
   NTSTATUS Status;
+  NTSTATUS AccessStat;
 
   Status = NtAccessCheck (pSecurityDescriptor,
 			  ClientToken,
@@ -150,14 +151,23 @@ AccessCheck (PSECURITY_DESCRIPTOR pSecurityDescriptor,
 			  GenericMapping,
 			  PrivilegeSet,
 			  (PULONG)PrivilegeSetLength,
-			  (PULONG)GrantedAccess,
-			  (PBOOLEAN)AccessStatus);
+			  (PACCESS_MASK)GrantedAccess,
+			  &AccessStat);
   if (!NT_SUCCESS (Status))
     {
       SetLastError (RtlNtStatusToDosError (Status));
       return FALSE;
     }
 
+  if (!NT_SUCCESS (AccessStat))
+    {
+      SetLastError (RtlNtStatusToDosError (Status));
+      *AccessStatus = FALSE;
+      return TRUE;
+    }
+
+  *AccessStatus = TRUE;
+
   return TRUE;
 }
 
diff --git a/reactos/ntoskrnl/se/semgr.c b/reactos/ntoskrnl/se/semgr.c
index fc08889145b..47f8e98b696 100644
--- a/reactos/ntoskrnl/se/semgr.c
+++ b/reactos/ntoskrnl/se/semgr.c
@@ -1,4 +1,4 @@
-/* $Id: semgr.c,v 1.30 2004/05/20 12:42:11 ekohl Exp $
+/* $Id: semgr.c,v 1.31 2004/07/12 12:04:17 ekohl Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -208,8 +208,8 @@ NtAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
 	      IN PGENERIC_MAPPING GenericMapping,
 	      OUT PPRIVILEGE_SET PrivilegeSet,
 	      OUT PULONG ReturnLength,
-	      OUT PULONG GrantedAccess,
-	      OUT PBOOLEAN AccessStatus)
+	      OUT PACCESS_MASK GrantedAccess,
+	      OUT PNTSTATUS AccessStatus)
 {
   UNIMPLEMENTED;
   return(STATUS_NOT_IMPLEMENTED);
diff --git a/reactos/w32api/include/ddk/ntapi.h b/reactos/w32api/include/ddk/ntapi.h
index eedf2daba30..5ef36597f6a 100644
--- a/reactos/w32api/include/ddk/ntapi.h
+++ b/reactos/w32api/include/ddk/ntapi.h
@@ -2402,7 +2402,7 @@ ZwAccessCheck(
 	IN PPRIVILEGE_SET  PrivilegeSet,
 	IN PULONG  PrivilegeSetLength,
 	OUT PACCESS_MASK  GrantedAccess,
-	OUT PBOOLEAN  AccessStatus);
+	OUT PNTSTATUS  AccessStatus);
 
 NTOSAPI
 NTSTATUS

From 32e7b224daefb64701ddfc052a2513becca5453f Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Mon, 12 Jul 2004 13:51:29 +0000
Subject: [PATCH 267/356] Define missing PNTSTATUS.

svn path=/trunk/; revision=10088
---
 reactos/include/wine/winternl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reactos/include/wine/winternl.h b/reactos/include/wine/winternl.h
index d122c540aff..0f5b7aa8371 100644
--- a/reactos/include/wine/winternl.h
+++ b/reactos/include/wine/winternl.h
@@ -33,7 +33,7 @@ extern "C" {
  * Fundamental types and data structures
  */
 
-typedef LONG NTSTATUS;
+typedef LONG NTSTATUS, *PNTSTATUS;
 
 typedef CONST char *PCSZ;
 

From ef8c92364bde11a2c3b04b04a5372033ad24a50c Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Mon, 12 Jul 2004 15:08:43 +0000
Subject: [PATCH 268/356] added stubs for the Hid User Library (hid.dll)

svn path=/trunk/; revision=10089
---
 reactos/lib/hid/.cvsignore         |   8 +
 reactos/lib/hid/Makefile           |  50 +++
 reactos/lib/hid/hid.c              | 112 +++++
 reactos/lib/hid/hid.def            |  48 +++
 reactos/lib/hid/hid.edf            |  48 +++
 reactos/lib/hid/hid.rc             |  39 ++
 reactos/lib/hid/internal.h         |   8 +
 reactos/lib/hid/stubs.c            | 655 +++++++++++++++++++++++++++++
 reactos/w32api/include/ddk/hidpi.h |  33 +-
 9 files changed, 1000 insertions(+), 1 deletion(-)
 create mode 100644 reactos/lib/hid/.cvsignore
 create mode 100644 reactos/lib/hid/Makefile
 create mode 100644 reactos/lib/hid/hid.c
 create mode 100644 reactos/lib/hid/hid.def
 create mode 100644 reactos/lib/hid/hid.edf
 create mode 100644 reactos/lib/hid/hid.rc
 create mode 100644 reactos/lib/hid/internal.h
 create mode 100644 reactos/lib/hid/stubs.c

diff --git a/reactos/lib/hid/.cvsignore b/reactos/lib/hid/.cvsignore
new file mode 100644
index 00000000000..9103a525d39
--- /dev/null
+++ b/reactos/lib/hid/.cvsignore
@@ -0,0 +1,8 @@
+*.coff
+*.dll
+*.d
+*.a
+*.o
+*.sym
+*.map
+*.tmp
diff --git a/reactos/lib/hid/Makefile b/reactos/lib/hid/Makefile
new file mode 100644
index 00000000000..fa7242cda46
--- /dev/null
+++ b/reactos/lib/hid/Makefile
@@ -0,0 +1,50 @@
+# $Id: Makefile,v 1.1 2004/07/12 15:08:43 weiden Exp $
+
+PATH_TO_TOP = ../..
+
+TARGET_TYPE = dynlink
+
+TARGET_NAME = hid
+
+TARGET_INSTALLDIR = system32
+
+TARGET_BASE = $(TARGET_BASE_LIB_ACLEDIT)
+
+TARGET_CFLAGS = \
+ -D_WIN32_IE=0x0600 \
+ -D_WIN32_WINNT=0x0501 \
+ -I./include \
+ -DUNICODE \
+ -D_UNICODE \
+ -D__REACTOS__ \
+ -D__USE_W32API \
+ -D_HIDPI_ \
+ -D_HIDPI_NO_FUNCTION_MACROS_ \
+ -Wall \
+ -Werror \
+ -fno-builtin
+
+TARGET_LFLAGS = -nostartfiles -nostdlib
+
+TARGET_SDKLIBS = ntdll.a kernel32.a advapi32.a
+
+TARGET_GCCLIBS = gcc
+
+TARGET_PCH = 
+
+TARGET_CLEAN = 
+
+TARGET_OBJECTS = hid.o stubs.o
+
+DEP_OBJECTS = $(TARGET_OBJECTS)
+
+include $(PATH_TO_TOP)/rules.mak
+
+include $(TOOLS_PATH)/helper.mk
+
+include $(TOOLS_PATH)/depend.mk
+
+%/TAGS:
+	etags -o $(@D)/TAGS $(@D)/\*.c
+
+etags: ./TAGS
diff --git a/reactos/lib/hid/hid.c b/reactos/lib/hid/hid.c
new file mode 100644
index 00000000000..0ac91303b8c
--- /dev/null
+++ b/reactos/lib/hid/hid.c
@@ -0,0 +1,112 @@
+/*
+ *  ReactOS kernel
+ *  Copyright (C) 2004 ReactOS Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+/* $Id: hid.c,v 1.1 2004/07/12 15:08:43 weiden Exp $
+ *
+ * PROJECT:         ReactOS Hid User Library
+ * FILE:            lib/hid/hid.c
+ * PURPOSE:         ReactOS Hid User Library
+ *
+ * UPDATE HISTORY:
+ *      07/12/2004  Created
+ */
+#include <windows.h>
+#include <ddk/hidpi.h>
+#include "internal.h"
+
+HINSTANCE hDllInstance;
+
+BOOL STDCALL
+DllMain(HINSTANCE hinstDLL,
+        DWORD dwReason,
+        LPVOID lpvReserved)
+{
+  switch(dwReason)
+  {
+    case DLL_PROCESS_ATTACH:
+      hDllInstance = hinstDLL;
+      break;
+    
+    case DLL_THREAD_ATTACH:
+      break;
+    
+    case DLL_THREAD_DETACH:
+      break;
+    
+    case DLL_PROCESS_DETACH:
+      break;
+  }
+  return TRUE;
+}
+
+/*
+ * HidP_GetButtonCaps							EXPORTED
+ *
+ * @implemented
+ */
+HIDAPI
+NTSTATUS DDKAPI
+HidP_GetButtonCaps(IN HIDP_REPORT_TYPE ReportType,
+                   OUT PHIDP_BUTTON_CAPS ButtonCaps,
+                   IN OUT PULONG ButtonCapsLength,
+                   IN PHIDP_PREPARSED_DATA PreparsedData)
+{
+  return HidP_GetSpecificButtonCaps(ReportType, 0, 0, 0, ButtonCaps, ButtonCapsLength, PreparsedData);
+}
+
+
+/*
+ * HidP_GetValueCaps							EXPORTED
+ *
+ * @implemented
+ */
+HIDAPI
+NTSTATUS DDKAPI
+HidP_GetValueCaps(IN HIDP_REPORT_TYPE ReportType,
+                  OUT PHIDP_VALUE_CAPS ValueCaps,
+                  IN OUT PULONG ValueCapsLength,
+                  IN PHIDP_PREPARSED_DATA PreparsedData)
+{
+  return HidP_GetSpecificValueCaps (ReportType, 0, 0, 0, ValueCaps, ValueCapsLength, PreparsedData);
+}
+
+
+/*
+ * HidD_Hello								EXPORTED
+ *
+ * Undocumented easter egg function. It fills the buffer with "Hello\nI hate Jello\n"
+ * and returns number of bytes filled in (lstrlen(Buffer) + 1 == 20)
+ *
+ * Bugs: - doesn't check Buffer for NULL
+ *       - always returns 20 even if BufferLength < 20 but doesn't produce a buffer overflow
+ *
+ * @implemented
+ */
+HIDAPI
+ULONG DDKAPI
+HidD_Hello(OUT PCHAR Buffer,
+           IN ULONG BufferLength)
+{
+  const PCHAR const HelloString = "Hello\nI hate Jello\n";
+  int StrSize = lstrlenA(HelloString) + sizeof(CHAR);
+  
+  memcpy(Buffer, HelloString, min(StrSize, BufferLength));
+  return StrSize;
+}
+
+/* EOF */
diff --git a/reactos/lib/hid/hid.def b/reactos/lib/hid/hid.def
new file mode 100644
index 00000000000..4b20fa5ef9c
--- /dev/null
+++ b/reactos/lib/hid/hid.def
@@ -0,0 +1,48 @@
+LIBRARY hid.dll
+
+EXPORTS
+HidD_FlushQueue@4
+HidD_FreePreparsedData@4
+HidD_GetAttributes@8
+HidD_GetConfiguration@12
+HidD_GetFeature@12
+HidD_GetHidGuid@4
+HidD_GetIndexedString@16
+HidD_GetInputReport@12
+HidD_GetManufacturerString@12
+HidD_GetMsGenreDescriptor@12
+HidD_GetNumInputBuffers@8
+HidD_GetPhysicalDescriptor@12
+HidD_GetPreparsedData@8
+HidD_GetProductString@12
+HidD_GetSerialNumberString@12
+HidD_Hello@8
+HidD_SetConfiguration@12
+HidD_SetFeature@12
+HidP_GetButtonCaps@16
+HidP_GetCaps@8
+HidP_GetData@24
+HidP_GetExtendedAttributes@20
+HidP_GetLinkCollectionNodes@12
+HidP_GetScaledUsageValue@32
+HidP_GetSpecificButtonCaps@28
+HidP_GetSpecificValueCaps@28
+HidP_GetUsageValue@32
+HidP_GetUsageValueArray@36
+HidP_GetUsages@32
+HidP_GetUsagesEx@28
+HidP_GetValueCaps@16
+HidP_InitializeReportForID@20
+HidP_MaxDataListLength@8
+HidP_MaxUsageListLength@12
+HidP_SetData@24
+HidP_SetScaledUsageValue@32
+HidP_SetUsageValue@32
+HidP_SetUsageValueArray@36
+HidP_SetUsages@32
+HidP_TranslateUsagesToI8042ScanCodes@24
+HidP_UnsetUsages@32
+HidP_UsageListDifference@20
+;HidservInstaller@0
+
+; EOF
diff --git a/reactos/lib/hid/hid.edf b/reactos/lib/hid/hid.edf
new file mode 100644
index 00000000000..0439b56dc2c
--- /dev/null
+++ b/reactos/lib/hid/hid.edf
@@ -0,0 +1,48 @@
+LIBRARY hid.dll
+
+EXPORTS
+HidD_FlushQueue=HidD_FlushQueue@4
+HidD_FreePreparsedData=HidD_FreePreparsedData@4
+HidD_GetAttributes=HidD_GetAttributes@8
+HidD_GetConfiguration=HidD_GetConfiguration@12
+HidD_GetFeature=HidD_GetFeature@12
+HidD_GetHidGuid=HidD_GetHidGuid@4
+HidD_GetIndexedString=HidD_GetIndexedString@16
+HidD_GetInputReport=HidD_GetInputReport@12
+HidD_GetManufacturerString=HidD_GetManufacturerString@12
+HidD_GetMsGenreDescriptor=HidD_GetMsGenreDescriptor@12
+HidD_GetNumInputBuffers=HidD_GetNumInputBuffers@8
+HidD_GetPhysicalDescriptor=HidD_GetPhysicalDescriptor@12
+HidD_GetPreparsedData=HidD_GetPreparsedData@8
+HidD_GetProductString=HidD_GetProductString@12
+HidD_GetSerialNumberString=HidD_GetSerialNumberString@12
+HidD_Hello=HidD_Hello@8
+HidD_SetConfiguration=HidD_SetConfiguration@12
+HidD_SetFeature=HidD_SetFeature@12
+HidP_GetButtonCaps=HidP_GetButtonCaps@16
+HidP_GetCaps=HidP_GetCaps@8
+HidP_GetData=HidP_GetData@24
+HidP_GetExtendedAttributes=HidP_GetExtendedAttributes@20
+HidP_GetLinkCollectionNodes=HidP_GetLinkCollectionNodes@12
+HidP_GetScaledUsageValue=HidP_GetScaledUsageValue@32
+HidP_GetSpecificButtonCaps=HidP_GetSpecificButtonCaps@28
+HidP_GetSpecificValueCaps=HidP_GetSpecificValueCaps@28
+HidP_GetUsageValue=HidP_GetUsageValue@32
+HidP_GetUsageValueArray=HidP_GetUsageValueArray@36
+HidP_GetUsages=HidP_GetUsages@32
+HidP_GetUsagesEx=HidP_GetUsagesEx@28
+HidP_GetValueCaps=HidP_GetValueCaps@16
+HidP_InitializeReportForID=HidP_InitializeReportForID@20
+HidP_MaxDataListLength=HidP_MaxDataListLength@8
+HidP_MaxUsageListLength=HidP_MaxUsageListLength@12
+HidP_SetData=HidP_SetData@24
+HidP_SetScaledUsageValue=HidP_SetScaledUsageValue@32
+HidP_SetUsageValue=HidP_SetUsageValue@32
+HidP_SetUsageValueArray=HidP_SetUsageValueArray@36
+HidP_SetUsages=HidP_SetUsages@32
+HidP_TranslateUsagesToI8042ScanCodes=HidP_TranslateUsagesToI8042ScanCodes@24
+HidP_UnsetUsages=HidP_UnsetUsages@32
+HidP_UsageListDifference=HidP_UsageListDifference@20
+;HidservInstaller=HidservInstaller@0
+
+; EOF
diff --git a/reactos/lib/hid/hid.rc b/reactos/lib/hid/hid.rc
new file mode 100644
index 00000000000..bafd3927031
--- /dev/null
+++ b/reactos/lib/hid/hid.rc
@@ -0,0 +1,39 @@
+#include <reactos/resource.h>
+#include <defines.h>
+
+LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+
+VS_VERSION_INFO VERSIONINFO
+	FILEVERSION	RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD
+	PRODUCTVERSION	RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD	
+	FILEFLAGSMASK	0x3fL
+#ifdef _DEBUG
+	FILEFLAGS	0x1L
+#else
+	FILEFLAGS	0x0L
+#endif
+	FILEOS		0x40004L
+	FILETYPE	0x2L
+	FILESUBTYPE	0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName",	RES_STR_COMPANY_NAME
+            VALUE "FileDescription",	"ReactOS Hid User Library\0"
+            VALUE "FileVersion",	RES_STR_FILE_VERSION
+            VALUE "InternalName",	"hid\0"
+            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
+            VALUE "OriginalFilename",	"hid.dll\0"
+            VALUE "ProductName",	RES_STR_PRODUCT_NAME
+            VALUE "ProductVersion",	RES_STR_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+
diff --git a/reactos/lib/hid/internal.h b/reactos/lib/hid/internal.h
new file mode 100644
index 00000000000..114b97b8bb5
--- /dev/null
+++ b/reactos/lib/hid/internal.h
@@ -0,0 +1,8 @@
+#ifndef __HIDINTERNAL_H
+#define __HIDINTERNAL_H
+
+extern HINSTANCE hDllInstance;
+
+#endif /* __HIDINTERNAL_H */
+
+/* EOF */
diff --git a/reactos/lib/hid/stubs.c b/reactos/lib/hid/stubs.c
new file mode 100644
index 00000000000..25b5f8d915a
--- /dev/null
+++ b/reactos/lib/hid/stubs.c
@@ -0,0 +1,655 @@
+/* $Id: stubs.c,v 1.1 2004/07/12 15:08:43 weiden Exp $
+ *
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS Hid User Library
+ * FILE:            lib/hid/stubs.c
+ * PURPOSE:         hid.dll stubs
+ * NOTES:           If you implement a function, remove it from this file
+ *
+ * UPDATE HISTORY:
+ *      07/12/2004  Created
+ */
+#include <windows.h>
+#include <ddk/hidpi.h>
+#include "internal.h"
+
+#define UNIMPLEMENTED \
+  DbgPrint("HID:  %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__)
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+BOOLEAN DDKAPI
+HidD_FlushQueue(IN HANDLE HidDeviceObject)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+BOOLEAN DDKAPI
+HidD_FreePreparsedData(IN PHIDP_PREPARSED_DATA PreparsedData)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+BOOLEAN DDKAPI
+HidD_GetAttributes(IN HANDLE HidDeviceObject,
+                   OUT PHIDD_ATTRIBUTES Attributes)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+BOOLEAN DDKAPI
+HidD_GetConfiguration(IN HANDLE HidDeviceObject,
+                      OUT PHIDD_CONFIGURATION Configuration,
+                      IN ULONG ConfigurationLength)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+BOOLEAN DDKAPI
+HidD_GetFeature(IN HANDLE HidDeviceObject,
+                OUT PVOID ReportBuffer,
+                IN ULONG ReportBufferLength)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+VOID DDKAPI
+HidD_GetHidGuid(OUT LPGUID HidGuid)
+{
+  UNIMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+BOOLEAN DDKAPI
+HidD_GetIndexedString(IN HANDLE HidDeviceObject,
+                      IN ULONG StringIndex,
+                      OUT PVOID Buffer,
+                      IN ULONG BufferLength)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+BOOLEAN DDKAPI
+HidD_GetInputReport(IN HANDLE HidDeviceObject,
+                    IN OUT PVOID ReportBuffer,
+                    IN ULONG ReportBufferLength)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+BOOLEAN DDKAPI
+HidD_GetManufacturerString(IN HANDLE HidDeviceObject,
+                           OUT PVOID Buffer,
+                           IN ULONG BufferLength)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+BOOLEAN DDKAPI
+HidD_GetMsGenreDescriptor(IN HANDLE HidDeviceObject,
+                          OUT PVOID Buffer,
+                          IN ULONG BufferLength)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+BOOLEAN DDKAPI
+HidD_GetNumInputBuffers(IN HANDLE HidDeviceObject,
+                        OUT PULONG NumberBuffers)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+BOOLEAN DDKAPI
+HidD_GetPhysicalDescriptor(IN HANDLE HidDeviceObject,
+                           OUT PVOID Buffer,
+                           IN ULONG BufferLength)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+BOOLEAN DDKAPI
+HidD_GetPreparsedData(IN HANDLE HidDeviceObject,
+                      OUT PHIDP_PREPARSED_DATA *PreparsedData)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+BOOLEAN DDKAPI
+HidD_GetProductString(IN HANDLE HidDeviceObject,
+                      OUT PVOID Buffer,
+                      IN ULONG BufferLength)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+BOOLEAN DDKAPI
+HidD_GetSerialNumberString(IN HANDLE HidDeviceObject,
+                           OUT PVOID Buffer,
+                           IN ULONG BufferLength)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+BOOLEAN DDKAPI
+HidD_SetConfiguration(IN HANDLE HidDeviceObject,
+                      IN PHIDD_CONFIGURATION Configuration,
+                      IN ULONG ConfigurationLength)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+BOOLEAN DDKAPI
+HidD_SetFeature(IN HANDLE HidDeviceObject,
+                IN PVOID ReportBuffer,
+                IN ULONG ReportBufferLength)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+BOOLEAN DDKAPI
+HidD_SetNumInputBuffers(IN HANDLE  HidDeviceObject,
+                        OUT ULONG  NumberBuffers)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+BOOLEAN DDKAPI
+HidD_SetOutputReport(IN HANDLE HidDeviceObject,
+                     IN PVOID ReportBuffer,
+                     IN ULONG ReportBufferLength)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+NTSTATUS DDKAPI
+HidP_GetCaps(IN PHIDP_PREPARSED_DATA PreparsedData,
+             OUT PHIDP_CAPS Capabilities)
+{
+  UNIMPLEMENTED;
+  return HIDP_STATUS_NOT_IMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+NTSTATUS DDKAPI
+HidP_GetData(IN HIDP_REPORT_TYPE ReportType,
+             OUT PHIDP_DATA DataList,
+             IN OUT PULONG DataLength,
+             IN PHIDP_PREPARSED_DATA PreparsedData,
+             IN PCHAR Report,
+             IN ULONG ReportLength)
+{
+  UNIMPLEMENTED;
+  return HIDP_STATUS_NOT_IMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+NTSTATUS DDKAPI
+HidP_GetExtendedAttributes(IN HIDP_REPORT_TYPE ReportType,
+                           IN USHORT DataIndex,
+                           IN PHIDP_PREPARSED_DATA PreparsedData,
+                           OUT PHIDP_EXTENDED_ATTRIBUTES Attributes,
+                           IN OUT PULONG LengthAttributes)
+{
+  UNIMPLEMENTED;
+  return HIDP_STATUS_NOT_IMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+NTSTATUS DDKAPI
+HidP_GetLinkCollectionNodes(OUT PHIDP_LINK_COLLECTION_NODE LinkCollectionNodes,
+                            IN OUT PULONG LinkCollectionNodesLength,
+                            IN PHIDP_PREPARSED_DATA PreparsedData)
+{
+  UNIMPLEMENTED;
+  return HIDP_STATUS_NOT_IMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+NTSTATUS DDKAPI
+HidP_GetScaledUsageValue(IN HIDP_REPORT_TYPE ReportType,
+                         IN USAGE UsagePage,
+                         IN USHORT LinkCollection OPTIONAL,
+                         IN USAGE Usage,
+                         OUT PLONG UsageValue,
+                         IN PHIDP_PREPARSED_DATA PreparsedData,
+                         IN PCHAR Report,
+                         IN ULONG ReportLength)
+{
+  UNIMPLEMENTED;
+  return HIDP_STATUS_NOT_IMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+NTSTATUS DDKAPI
+HidP_GetSpecificButtonCaps(IN HIDP_REPORT_TYPE ReportType,
+                           IN USAGE UsagePage,
+                           IN USHORT LinkCollection,
+                           IN USAGE Usage,
+                           OUT PHIDP_BUTTON_CAPS ButtonCaps,
+                           IN OUT PULONG ButtonCapsLength,
+                           IN PHIDP_PREPARSED_DATA PreparsedData)
+{
+  UNIMPLEMENTED;
+  return HIDP_STATUS_NOT_IMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+NTSTATUS DDKAPI
+HidP_GetSpecificValueCaps(IN HIDP_REPORT_TYPE ReportType,
+                          IN USAGE UsagePage,
+                          IN USHORT LinkCollection,
+                          IN USAGE Usage,
+                          OUT PHIDP_VALUE_CAPS ValueCaps,
+                          IN OUT PULONG ValueCapsLength,
+                          IN PHIDP_PREPARSED_DATA PreparsedData)
+{
+  UNIMPLEMENTED;
+  return HIDP_STATUS_NOT_IMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+NTSTATUS DDKAPI
+HidP_GetUsageValue(IN HIDP_REPORT_TYPE ReportType,
+                   IN USAGE UsagePage,
+                   IN USHORT LinkCollection,
+                   IN USAGE Usage,
+                   OUT PULONG UsageValue,
+                   IN PHIDP_PREPARSED_DATA PreparsedData,
+                   IN PCHAR Report,
+                   IN ULONG ReportLength)
+{
+  UNIMPLEMENTED;
+  return HIDP_STATUS_NOT_IMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+NTSTATUS DDKAPI
+HidP_GetUsageValueArray(IN HIDP_REPORT_TYPE ReportType,
+                        IN USAGE UsagePage,
+                        IN USHORT LinkCollection  OPTIONAL,
+                        IN USAGE Usage,
+                        OUT PCHAR UsageValue,
+                        IN USHORT UsageValueByteLength,
+                        IN PHIDP_PREPARSED_DATA PreparsedData,
+                        IN PCHAR Report,
+                        IN ULONG ReportLength)
+{
+  UNIMPLEMENTED;
+  return HIDP_STATUS_NOT_IMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+NTSTATUS DDKAPI
+HidP_GetUsages(IN HIDP_REPORT_TYPE ReportType,
+               IN USAGE UsagePage,
+               IN USHORT LinkCollection  OPTIONAL,
+               OUT USAGE *UsageList,
+               IN OUT ULONG *UsageLength,
+               IN PHIDP_PREPARSED_DATA PreparsedData,
+               IN PCHAR Report,
+               IN ULONG ReportLength)
+{
+  UNIMPLEMENTED;
+  return HIDP_STATUS_NOT_IMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+NTSTATUS DDKAPI
+HidP_GetUsagesEx(IN HIDP_REPORT_TYPE ReportType,
+                 IN USHORT LinkCollection,
+                 OUT PUSAGE_AND_PAGE ButtonList,
+                 IN OUT ULONG *UsageLength,
+                 IN PHIDP_PREPARSED_DATA PreparsedData,
+                 IN PCHAR Report,
+                 IN ULONG ReportLength)
+{
+  UNIMPLEMENTED;
+  return HIDP_STATUS_NOT_IMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+NTSTATUS DDKAPI
+HidP_InitializeReportForID(IN HIDP_REPORT_TYPE ReportType,
+                           IN UCHAR ReportID,
+                           IN PHIDP_PREPARSED_DATA PreparsedData,
+                           IN OUT PCHAR Report,
+                           IN ULONG ReportLength)
+{
+  UNIMPLEMENTED;
+  return HIDP_STATUS_NOT_IMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+ULONG DDKAPI
+HidP_MaxDataListLength(IN HIDP_REPORT_TYPE  ReportType,
+                       IN PHIDP_PREPARSED_DATA  PreparsedData)
+{
+  UNIMPLEMENTED;
+  return 0;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+ULONG DDKAPI
+HidP_MaxUsageListLength(IN HIDP_REPORT_TYPE ReportType,
+                        IN USAGE UsagePage OPTIONAL,
+                        IN PHIDP_PREPARSED_DATA PreparsedData)
+{
+  UNIMPLEMENTED;
+  return 0;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+NTSTATUS DDKAPI
+HidP_SetData(IN HIDP_REPORT_TYPE ReportType,
+             IN PHIDP_DATA DataList,
+             IN OUT PULONG DataLength,
+             IN PHIDP_PREPARSED_DATA PreparsedData,
+             IN OUT PCHAR Report,
+             IN ULONG ReportLength)
+{
+  UNIMPLEMENTED;
+  return HIDP_STATUS_NOT_IMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+NTSTATUS DDKAPI
+HidP_SetScaledUsageValue(IN HIDP_REPORT_TYPE ReportType,
+                         IN USAGE UsagePage, 
+                         IN USHORT LinkCollection OPTIONAL,
+                         IN USAGE Usage,
+                         IN LONG UsageValue,
+                         IN PHIDP_PREPARSED_DATA PreparsedData,
+                         IN OUT PCHAR Report,
+                         IN ULONG ReportLength)
+{
+  UNIMPLEMENTED;
+  return HIDP_STATUS_NOT_IMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+NTSTATUS DDKAPI
+HidP_SetUsageValue(IN HIDP_REPORT_TYPE ReportType,
+                   IN USAGE UsagePage,
+                   IN USHORT LinkCollection,
+                   IN USAGE Usage,
+                   IN ULONG UsageValue,
+                   IN PHIDP_PREPARSED_DATA PreparsedData,
+                   IN OUT PCHAR Report,
+                   IN ULONG ReportLength)
+{
+  UNIMPLEMENTED;
+  return HIDP_STATUS_NOT_IMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+NTSTATUS DDKAPI
+HidP_SetUsageValueArray(IN HIDP_REPORT_TYPE ReportType,
+                        IN USAGE UsagePage,
+                        IN USHORT LinkCollection OPTIONAL,
+                        IN USAGE Usage,
+                        IN PCHAR UsageValue,
+                        IN USHORT UsageValueByteLength,
+                        IN PHIDP_PREPARSED_DATA PreparsedData,
+                        OUT PCHAR Report,
+                        IN ULONG ReportLength)
+{
+  UNIMPLEMENTED;
+  return HIDP_STATUS_NOT_IMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+NTSTATUS DDKAPI
+HidP_SetUsages(IN HIDP_REPORT_TYPE ReportType,
+               IN USAGE UsagePage,
+               IN USHORT LinkCollection OPTIONAL,
+               IN PUSAGE UsageList,
+               IN OUT PULONG UsageLength,
+               IN PHIDP_PREPARSED_DATA PreparsedData,
+               IN OUT PCHAR Report,
+               IN ULONG ReportLength)
+{
+  UNIMPLEMENTED;
+  return HIDP_STATUS_NOT_IMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+NTSTATUS DDKAPI
+HidP_TranslateUsagesToI8042ScanCodes(IN PUSAGE ChangedUsageList,
+                                     IN ULONG UsageListLength,
+                                     IN HIDP_KEYBOARD_DIRECTION KeyAction,
+                                     IN OUT PHIDP_KEYBOARD_MODIFIER_STATE ModifierState,
+                                     IN PHIDP_INSERT_SCANCODES InsertCodesProcedure,
+                                     IN PVOID InsertCodesContext)
+{
+  UNIMPLEMENTED;
+  return HIDP_STATUS_NOT_IMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+NTSTATUS DDKAPI
+HidP_UnsetUsages(IN HIDP_REPORT_TYPE ReportType,
+                 IN USAGE UsagePage,
+                 IN USHORT LinkCollection OPTIONAL,
+                 IN PUSAGE UsageList,
+                 IN OUT PULONG UsageLength,
+                 IN PHIDP_PREPARSED_DATA PreparsedData,
+                 IN OUT PCHAR Report,
+                 IN ULONG ReportLength)
+{
+  UNIMPLEMENTED;
+  return HIDP_STATUS_NOT_IMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+HIDAPI
+NTSTATUS DDKAPI
+HidP_UsageListDifference(IN PUSAGE PreviousUsageList,
+                         IN PUSAGE CurrentUsageList,
+                         OUT PUSAGE BreakUsageList,
+                         OUT PUSAGE MakeUsageList,
+                         IN ULONG UsageListLength)
+{
+  UNIMPLEMENTED;
+  return HIDP_STATUS_NOT_IMPLEMENTED;
+}
+
+/* EOF */
diff --git a/reactos/w32api/include/ddk/hidpi.h b/reactos/w32api/include/ddk/hidpi.h
index d6021782f20..a9ac5bc9df8 100644
--- a/reactos/w32api/include/ddk/hidpi.h
+++ b/reactos/w32api/include/ddk/hidpi.h
@@ -84,6 +84,19 @@ typedef struct _USAGE_AND_PAGE {
   USAGE  UsagePage;
 } USAGE_AND_PAGE, *PUSAGE_AND_PAGE;
 
+typedef struct _HIDD_ATTRIBUTES {
+  ULONG   Size;
+  USHORT  VendorID;
+  USHORT  ProductID;
+  USHORT  VersionNumber;
+} HIDD_ATTRIBUTES, *PHIDD_ATTRIBUTES;
+
+typedef struct _HIDD_CONFIGURATION {
+  PVOID  cookie;
+  ULONG  size;
+  ULONG  RingBufferSize;
+} HIDD_CONFIGURATION, *PHIDD_CONFIGURATION;
+
 HIDAPI
 NTSTATUS
 DDKAPI
@@ -256,7 +269,7 @@ typedef enum _HIDP_REPORT_TYPE {
 #define HIDP_STATUS_I8242_TRANS_UNKNOWN     HIDP_STATUS_I8042_TRANS_UNKNOWN
 
 
-
+#if !defined(_HIDPI_NO_FUNCTION_MACROS_)
 /*
  * NTSTATUS
  * HidP_GetButtonCaps(
@@ -301,6 +314,8 @@ typedef enum _HIDP_REPORT_TYPE {
 #define HidP_GetButtonsEx(RT, LC, BL, UL, PD, R, RL)  \
   HidP_GetUsagesEx(RT, LC, BL, UL, PD, R, RL)
 
+#endif /* _HIDPI_NO_FUNCTION_MACROS_ */
+
 HIDAPI
 NTSTATUS
 DDKAPI
@@ -426,6 +441,8 @@ HidP_GetUsageValueArray(
   IN PCHAR  Report,
   IN ULONG  ReportLength);
 
+#if !defined(_HIDPI_NO_FUNCTION_MACROS_)
+
 /*
  * NTSTATUS
  * HidP_GetValueCaps(
@@ -437,6 +454,8 @@ HidP_GetUsageValueArray(
 #define HidP_GetValueCaps(_Type_, _Caps_, _Len_, _Data_) \
   HidP_GetSpecificValueCaps (_Type_, 0, 0, 0, _Caps_, _Len_, _Data_)
 
+#endif /* _HIDPI_NO_FUNCTION_MACROS_ */
+
 HIDAPI
 NTSTATUS
 DDKAPI
@@ -447,6 +466,8 @@ HidP_InitializeReportForID(
   IN OUT PCHAR  Report,
   IN ULONG  ReportLength);
 
+#if !defined(_HIDPI_NO_FUNCTION_MACROS_)
+
 /*
  * BOOLEAN
  * HidP_IsSameUsageAndPage(
@@ -455,6 +476,8 @@ HidP_InitializeReportForID(
  */
 #define HidP_IsSameUsageAndPage(u1, u2) ((* (PULONG) &u1) == (* (PULONG) &u2))
 
+#endif /* _HIDPI_NO_FUNCTION_MACROS_ */
+
 HIDAPI
 ULONG
 DDKAPI
@@ -470,6 +493,8 @@ HidP_MaxUsageListLength(
   IN USAGE  UsagePage  OPTIONAL,
   IN PHIDP_PREPARSED_DATA  PreparsedData);
 
+#if !defined(_HIDPI_NO_FUNCTION_MACROS_)
+
 /*
  * NTSTATUS
  * HidP_SetButtons(
@@ -485,6 +510,8 @@ HidP_MaxUsageListLength(
 #define HidP_SetButtons(RT, UP, LC, UL1, UL2, PD, R, RL) \
   HidP_SetUsages(RT, UP, LC, UL1, UL2, PD, R, RL)
 
+#endif /* _HIDPI_NO_FUNCTION_MACROS_ */
+
 HIDAPI
 NTSTATUS
 DDKAPI
@@ -549,6 +576,8 @@ HidP_SetUsageValueArray(
   OUT PCHAR  Report,
   IN ULONG  ReportLength);
 
+#if !defined(_HIDPI_NO_FUNCTION_MACROS_)
+
 /*
  * NTSTATUS
  * HidP_UnsetButtons(
@@ -564,6 +593,8 @@ HidP_SetUsageValueArray(
 #define HidP_UnsetButtons(RT, UP, LC, UL1, UL2, PD, R, RL) \
   HidP_UnsetUsages(RT, UP, LC, UL1, UL2, PD, R, RL)
 
+#endif /* _HIDPI_NO_FUNCTION_MACROS_ */
+
 HIDAPI
 NTSTATUS
 DDKAPI

From 32b2a4dc1ad3aef91b46e4a2db687f6379f7f603 Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Mon, 12 Jul 2004 16:04:37 +0000
Subject: [PATCH 269/356] implementation of HidD_GetHidGuid()

svn path=/trunk/; revision=10090
---
 reactos/lib/hid/hid.c      | 21 +++++++++++++++++++--
 reactos/lib/hid/internal.h |  1 +
 reactos/lib/hid/stubs.c    | 13 +------------
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/reactos/lib/hid/hid.c b/reactos/lib/hid/hid.c
index 0ac91303b8c..4a071eb0489 100644
--- a/reactos/lib/hid/hid.c
+++ b/reactos/lib/hid/hid.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: hid.c,v 1.1 2004/07/12 15:08:43 weiden Exp $
+/* $Id: hid.c,v 1.2 2004/07/12 16:04:37 weiden Exp $
  *
  * PROJECT:         ReactOS Hid User Library
  * FILE:            lib/hid/hid.c
@@ -31,6 +31,9 @@
 
 HINSTANCE hDllInstance;
 
+/* device interface GUID for HIDClass devices */
+const GUID HidClassGuid = {0x4D1E55B2, 0xF16F, 0x11CF, {0x88,0xCB,0x00,0x11,0x11,0x00,0x00,0x30}};
+
 BOOL STDCALL
 DllMain(HINSTANCE hinstDLL,
         DWORD dwReason,
@@ -54,6 +57,7 @@ DllMain(HINSTANCE hinstDLL,
   return TRUE;
 }
 
+
 /*
  * HidP_GetButtonCaps							EXPORTED
  *
@@ -70,6 +74,19 @@ HidP_GetButtonCaps(IN HIDP_REPORT_TYPE ReportType,
 }
 
 
+/*
+ * HidD_GetHidGuid							EXPORTED
+ *
+ * @implemented
+ */
+HIDAPI
+VOID DDKAPI
+HidD_GetHidGuid(OUT LPGUID HidGuid)
+{
+  *HidGuid = HidClassGuid;
+}
+
+
 /*
  * HidP_GetValueCaps							EXPORTED
  *
@@ -103,7 +120,7 @@ HidD_Hello(OUT PCHAR Buffer,
            IN ULONG BufferLength)
 {
   const PCHAR const HelloString = "Hello\nI hate Jello\n";
-  int StrSize = lstrlenA(HelloString) + sizeof(CHAR);
+  ULONG StrSize = lstrlenA(HelloString) + sizeof(CHAR);
   
   memcpy(Buffer, HelloString, min(StrSize, BufferLength));
   return StrSize;
diff --git a/reactos/lib/hid/internal.h b/reactos/lib/hid/internal.h
index 114b97b8bb5..a80c88a1c89 100644
--- a/reactos/lib/hid/internal.h
+++ b/reactos/lib/hid/internal.h
@@ -2,6 +2,7 @@
 #define __HIDINTERNAL_H
 
 extern HINSTANCE hDllInstance;
+extern const GUID HidClassGuid;
 
 #endif /* __HIDINTERNAL_H */
 
diff --git a/reactos/lib/hid/stubs.c b/reactos/lib/hid/stubs.c
index 25b5f8d915a..99fc32e5b4e 100644
--- a/reactos/lib/hid/stubs.c
+++ b/reactos/lib/hid/stubs.c
@@ -1,4 +1,4 @@
-/* $Id: stubs.c,v 1.1 2004/07/12 15:08:43 weiden Exp $
+/* $Id: stubs.c,v 1.2 2004/07/12 16:04:37 weiden Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS Hid User Library
@@ -82,17 +82,6 @@ HidD_GetFeature(IN HANDLE HidDeviceObject,
 }
 
 
-/*
- * @unimplemented
- */
-HIDAPI
-VOID DDKAPI
-HidD_GetHidGuid(OUT LPGUID HidGuid)
-{
-  UNIMPLEMENTED;
-}
-
-
 /*
  * @unimplemented
  */

From 11997022fdd98d02792e531c1b5f4dfc7708e64b Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Mon, 12 Jul 2004 16:27:46 +0000
Subject: [PATCH 270/356] forgot to export 2 functions

svn path=/trunk/; revision=10091
---
 reactos/lib/hid/hid.def | 2 ++
 reactos/lib/hid/hid.edf | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/reactos/lib/hid/hid.def b/reactos/lib/hid/hid.def
index 4b20fa5ef9c..7fe843f0237 100644
--- a/reactos/lib/hid/hid.def
+++ b/reactos/lib/hid/hid.def
@@ -19,6 +19,8 @@ HidD_GetSerialNumberString@12
 HidD_Hello@8
 HidD_SetConfiguration@12
 HidD_SetFeature@12
+HidD_SetNumInputBuffers@8
+HidD_SetOutputReport@12
 HidP_GetButtonCaps@16
 HidP_GetCaps@8
 HidP_GetData@24
diff --git a/reactos/lib/hid/hid.edf b/reactos/lib/hid/hid.edf
index 0439b56dc2c..fd2ac9549ce 100644
--- a/reactos/lib/hid/hid.edf
+++ b/reactos/lib/hid/hid.edf
@@ -19,6 +19,8 @@ HidD_GetSerialNumberString=HidD_GetSerialNumberString@12
 HidD_Hello=HidD_Hello@8
 HidD_SetConfiguration=HidD_SetConfiguration@12
 HidD_SetFeature=HidD_SetFeature@12
+HidD_SetNumInputBuffers=HidD_SetNumInputBuffers@8
+HidD_SetOutputReport=HidD_SetOutputReport@12
 HidP_GetButtonCaps=HidP_GetButtonCaps@16
 HidP_GetCaps=HidP_GetCaps@8
 HidP_GetData=HidP_GetData@24

From 16a868a4e7407afbc19d47ba2bfc19bc2263bd4c Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Mon, 12 Jul 2004 19:39:29 +0000
Subject: [PATCH 271/356] Replace hardcoded values by new constants.

svn path=/trunk/; revision=10092
---
 reactos/lib/rtl/sid.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/reactos/lib/rtl/sid.c b/reactos/lib/rtl/sid.c
index 60e742b1c68..77f01a21439 100644
--- a/reactos/lib/rtl/sid.c
+++ b/reactos/lib/rtl/sid.c
@@ -1,4 +1,4 @@
-/* $Id: sid.c,v 1.3 2004/07/10 13:11:18 ekohl Exp $
+/* $Id: sid.c,v 1.4 2004/07/12 19:39:29 ekohl Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -24,8 +24,8 @@
 BOOLEAN STDCALL
 RtlValidSid(IN PSID Sid)
 {
-  if (((Sid->Revision & 0xf) != 1) ||
-      (Sid->SubAuthorityCount > 15))
+  if ((Sid->Revision != SID_REVISION) ||
+      (Sid->SubAuthorityCount > SID_MAX_SUB_AUTHORITIES))
     {
       return FALSE;
     }
@@ -52,7 +52,7 @@ RtlInitializeSid(IN PSID Sid,
                  IN PSID_IDENTIFIER_AUTHORITY IdentifierAuthority,
                  IN UCHAR SubAuthorityCount)
 {
-  Sid->Revision = 1;
+  Sid->Revision = SID_REVISION;
   Sid->SubAuthorityCount = SubAuthorityCount;
   memcpy(&Sid->IdentifierAuthority,
          IdentifierAuthority,
@@ -215,7 +215,7 @@ RtlAllocateAndInitializeSid(PSID_IDENTIFIER_AUTHORITY IdentifierAuthority,
   if (pSid == NULL)
     return STATUS_NO_MEMORY;
 
-  pSid->Revision = 1;
+  pSid->Revision = SID_REVISION;
   pSid->SubAuthorityCount = SubAuthorityCount;
   memcpy(&pSid->IdentifierAuthority,
          IdentifierAuthority,

From 4ce7742222b1de82f599d9d12ca79051840a013a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Mon, 12 Jul 2004 20:09:35 +0000
Subject: [PATCH 272/356] Shutdown step 1: inform winlogon

svn path=/trunk/; revision=10094
---
 reactos/include/reactos/winlogon.h        |  28 ++++++
 reactos/lib/user32/misc/exit.c            |  56 ++++++++++-
 reactos/lib/user32/misc/misc.c            |  31 +++++-
 reactos/subsys/csrss/api/user.c           |  13 +--
 reactos/subsys/csrss/include/api.h        |   5 +-
 reactos/subsys/csrss/init.c               |   3 +-
 reactos/subsys/csrss/makefile             |   4 +-
 reactos/subsys/csrss/win32csr/Makefile    |   6 +-
 reactos/subsys/csrss/win32csr/dllmain.c   |   5 +-
 reactos/subsys/csrss/win32csr/exitros.c   | 112 ++++++++++++++++++++++
 reactos/subsys/system/winlogon/makefile   |   9 +-
 reactos/subsys/system/winlogon/sas.c      | 111 +++++++++++++++++----
 reactos/subsys/system/winlogon/setup.c    |   8 +-
 reactos/subsys/system/winlogon/winlogon.c |  27 ++----
 reactos/subsys/system/winlogon/winlogon.h |   5 +-
 reactos/subsys/system/winlogon/wlx.c      |  13 ++-
 reactos/subsys/win32k/ntuser/csr.c        |   4 +-
 reactos/subsys/win32k/ntuser/misc.c       |  21 +++-
 18 files changed, 385 insertions(+), 76 deletions(-)
 create mode 100644 reactos/include/reactos/winlogon.h
 create mode 100644 reactos/subsys/csrss/win32csr/exitros.c

diff --git a/reactos/include/reactos/winlogon.h b/reactos/include/reactos/winlogon.h
new file mode 100644
index 00000000000..9c385be649e
--- /dev/null
+++ b/reactos/include/reactos/winlogon.h
@@ -0,0 +1,28 @@
+/* $Id: winlogon.h,v 1.1 2004/07/12 20:09:35 gvg Exp $
+ *
+ * COPYRIGHT:   See COPYING in the top level directory
+ * PROJECT:     ReactOS kernel
+ * FILE:        include/reactos/winlogon.h
+ * PURPOSE:     Interface to winlogon
+ * PROGRAMMER:  David Welch (welch@mcmail.com)
+ * REVISIONS:
+ * 	1999-11-06 (ea)
+ * 		Moved from include/internal in include/reactos
+ *		to be used by buildno.
+ *	2002-01-17 (ea)
+ *		KERNEL_VERSION removed. Use
+ *		reactos/buildno.h:KERNEL_VERSION_STR instead.
+ */
+
+#ifndef REACTOS_WINLOGON_H_INCLUDED
+#define REACTOS_WINLOGON_H_INCLUDED
+
+#define WINLOGON_DESKTOP   L"Winlogon"
+#define WINLOGON_SAS_CLASS L"SAS window class"
+#define WINLOGON_SAS_TITLE L"SAS"
+
+#define PM_WINLOGON_EXITWINDOWS WM_APP
+
+#endif /* REACTOS_WINLOGON_H_INCLUDED */
+
+/* EOF */
diff --git a/reactos/lib/user32/misc/exit.c b/reactos/lib/user32/misc/exit.c
index aecca3bf529..138d68cae46 100644
--- a/reactos/lib/user32/misc/exit.c
+++ b/reactos/lib/user32/misc/exit.c
@@ -1,4 +1,4 @@
-/* $Id: exit.c,v 1.4 2004/04/09 20:03:14 navaraf Exp $
+/* $Id: exit.c,v 1.5 2004/07/12 20:09:34 gvg Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
@@ -13,6 +13,60 @@
 #include <ntos.h>
 #include <ntdll/csr.h>
 
+/*
+ * Sequence of events:
+ *
+ * - App (usually explorer) calls ExitWindowsEx()
+ * - ExitWindowsEx() sends a message to CSRSS (note: investigation shows it
+ *   doesn't transfer to kernel mode)
+ * - CSRSS impersonates the caller and sends a message to a hidden WinLogon window
+ * - WinLogon sends a SAS event to the GINA, asking for permission (e.g. if the
+ *   required rights are granted) to proceed
+ * - WinLogon enters pending log-out state
+ * - WinLogon impersonates the interactive user and calls ExitWindowsEx() again,
+ *   passing some special internal flags
+ * - CSRSS loops over all processes of the interactive user (sorted by their
+ *   SetProcessShutdownParameters() level), sending WM_QUERYENDSESSION and
+ *   WM_ENDSESSION messages to its top-level windows. If the messages aren't
+ *   processed within the timeout period (registry key HKCU\Control Panel\Desktop\HungAppTimeout)
+ *   CSRSS will put up a dialog box asking if the process should be terminated.
+ *   Using the registry key HKCU\Control Panel\Desktop\AutoEndTask you can
+ *   specify that the dialog box shouldn't be shown and CSRSS should just
+ *   terminates the thread. If the the WM_ENDSESSION message is processed
+ *   but the thread doesn't terminate within the timeout specified by
+ *   HKCU\Control Panel\Desktop\WaitToKillAppTimeout CSRSS will terminate
+ *   the thread. When all the top-level windows have been destroyed CSRSS
+ *   will terminate the process.
+ *   If the process is a console process, CSRSS will send a CTRL_LOGOFF_EVENT
+ *   to the console control handler on logoff. No event is sent on shutdown.
+ *   If the handler doesn't respond in time the same activities as for GUI
+ *   apps (i.e. display dialog box etc) take place. This also happens if
+ *   the handler returns TRUE.
+ * - This ends the processing for the first ExitWindowsEx() call from WinLogon.
+ *   Execution continues in WinLogon, which calls ExitWindowsEx() again to
+ *   terminate COM processes in the interactive user's session.
+ * - WinLogon stops impersonating the interactive user (whos processes are
+ *   all dead by now). and enters log-out state 
+ * - If the ExitWindowsEx() request was for a logoff, WinLogon sends a SAS
+ *   event (to display the "press ctrl+alt+del") to the GINA. WinLogon then
+ *   waits for the GINA to send a SAS event to login. 
+ * - If the ExitWindowsEx() request was for shutdown/restart, WinLogon calls
+ *   ExitWindowsEx() again in the system process context.
+ * - CSRSS goes through the motions of sending WM_QUERYENDSESSION/WM_ENDSESSION
+ *   to GUI processes running in the system process context but won't display
+ *   dialog boxes or kill threads/processes. Same for console processes,
+ *   using the CTRL_SHUTDOWN_EVENT. The Service Control Manager is one of
+ *   these console processes and has a special timeout value WaitToKillServiceTimeout.
+ * - WinLogon calls ADVAPI32.InitiateSystemShutdown()
+ * - ADVAPI32.InitiateSystemShutdown*() issues a "InitiateSystemShutdown" request
+ *   to the SM (SMSS API # 1)
+ * - the SM propagates the shutdown request to every environment subsystem it
+ *   started since bootstrap time (still active ones, of course)
+ * - each environment subsystem, on shutdown request, releases every resource
+ *   it aquired during its life (processes, memory etc), then dies
+ * - when every environment subsystem has gone to bed, the SM actually initiates
+ *   to shutdown the kernel and executive by calling NtShutdownSystem.
+ */
 /*
  * @implemented
  */
diff --git a/reactos/lib/user32/misc/misc.c b/reactos/lib/user32/misc/misc.c
index 1ad07afabed..6327c48bc25 100644
--- a/reactos/lib/user32/misc/misc.c
+++ b/reactos/lib/user32/misc/misc.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: misc.c,v 1.6 2004/07/08 14:35:10 ekohl Exp $
+/* $Id: misc.c,v 1.7 2004/07/12 20:09:34 gvg Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/misc/misc.c
@@ -31,6 +31,7 @@
 #include <windows.h>
 #include <user32.h>
 #include <debug.h>
+#include <ntdll/csr.h>
 
 /* FUNCTIONS *****************************************************************/
 
@@ -76,3 +77,31 @@ RegisterLogonProcess(DWORD dwProcessId, BOOL bRegister)
 			    (DWORD)bRegister,
 			    TWOPARAM_ROUTINE_REGISTERLOGONPROC);
 }
+
+/*
+ * @implemented
+ */
+BOOL
+STDCALL
+SetLogonNotifyWindow (HWND Wnd, HWINSTA WinSta)
+{
+  /* Maybe we should call NtUserSetLogonNotifyWindow and let that one inform CSRSS??? */
+  CSRSS_API_REQUEST Request;
+  CSRSS_API_REPLY Reply;
+  NTSTATUS Status;
+
+  Request.Type = CSRSS_SET_LOGON_NOTIFY_WINDOW;
+  Request.Data.SetLogonNotifyWindowRequest.LogonNotifyWindow = Wnd;
+
+  Status = CsrClientCallServer(&Request,
+			       &Reply,
+			       sizeof(CSRSS_API_REQUEST),
+			       sizeof(CSRSS_API_REPLY));
+  if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Reply.Status))
+    {
+      SetLastError(RtlNtStatusToDosError(Status));
+      return(FALSE);
+    }
+
+  return(TRUE);
+}
diff --git a/reactos/subsys/csrss/api/user.c b/reactos/subsys/csrss/api/user.c
index 9a8b9760b08..5b5969b5c7c 100644
--- a/reactos/subsys/csrss/api/user.c
+++ b/reactos/subsys/csrss/api/user.c
@@ -1,4 +1,4 @@
-/* $Id: user.c,v 1.3 2004/04/09 20:03:15 navaraf Exp $
+/* $Id: user.c,v 1.4 2004/07/12 20:09:34 gvg Exp $
  *
  * reactos/subsys/csrss/api/user.c
  *
@@ -51,15 +51,4 @@ CSR_API(CsrRegisterServicesProcess)
   return(Status);
 }
 
-
-CSR_API(CsrExitReactos)
-{
-  Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY);
-  Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - LPC_MESSAGE_BASE_SIZE;
-
-  Reply->Status = STATUS_NOT_IMPLEMENTED;
-
-  return(STATUS_NOT_IMPLEMENTED);
-}
-
 /* EOF */
diff --git a/reactos/subsys/csrss/include/api.h b/reactos/subsys/csrss/include/api.h
index 5aa8f6f3090..aac6096faac 100644
--- a/reactos/subsys/csrss/include/api.h
+++ b/reactos/subsys/csrss/include/api.h
@@ -1,4 +1,4 @@
-/* $Id: api.h,v 1.5 2004/07/03 17:15:02 hbirr Exp $
+/* $Id: api.h,v 1.6 2004/07/12 20:09:34 gvg Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -131,6 +131,9 @@ CSR_API(CsrExitReactos);
 CSR_API(CsrGetShutdownParameters);
 CSR_API(CsrSetShutdownParameters);
 
+CSR_API(CsrSetLogonNotifyWindow);
+CSR_API(CsrRegisterLogonProcess);
+
 #endif /* ndef API_H_INCLUDED */
 
 /* EOF */
diff --git a/reactos/subsys/csrss/init.c b/reactos/subsys/csrss/init.c
index 220e88383b0..ac08b1e4bdf 100644
--- a/reactos/subsys/csrss/init.c
+++ b/reactos/subsys/csrss/init.c
@@ -1,4 +1,4 @@
-/* $Id: init.c,v 1.28 2004/07/03 17:15:02 hbirr Exp $
+/* $Id: init.c,v 1.29 2004/07/12 20:09:34 gvg Exp $
  * 
  * reactos/subsys/csrss/init.c
  *
@@ -207,7 +207,6 @@ CSRSS_API_DEFINITION NativeDefinitions[] =
     CSRSS_DEFINE_API(CSRSS_TERMINATE_PROCESS,            CsrTerminateProcess),
     CSRSS_DEFINE_API(CSRSS_CONNECT_PROCESS,              CsrConnectProcess),
     CSRSS_DEFINE_API(CSRSS_REGISTER_SERVICES_PROCESS,    CsrRegisterServicesProcess),
-    CSRSS_DEFINE_API(CSRSS_EXIT_REACTOS,                 CsrExitReactos),
     CSRSS_DEFINE_API(CSRSS_GET_SHUTDOWN_PARAMETERS,      CsrGetShutdownParameters),
     CSRSS_DEFINE_API(CSRSS_SET_SHUTDOWN_PARAMETERS,      CsrSetShutdownParameters),
     CSRSS_DEFINE_API(CSRSS_GET_INPUT_HANDLE,             CsrGetInputHandle),
diff --git a/reactos/subsys/csrss/makefile b/reactos/subsys/csrss/makefile
index 886a8af589b..351a67b221e 100644
--- a/reactos/subsys/csrss/makefile
+++ b/reactos/subsys/csrss/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.29 2004/05/28 21:33:41 gvg Exp $
+# $Id: makefile,v 1.30 2004/07/12 20:09:34 gvg Exp $
 
 PATH_TO_TOP = ../..
 
@@ -13,7 +13,7 @@ TARGET_SDKLIBS = rosrtl.a ntdll.a
 
 TARGET_INSTALLDIR = system32
 
-TARGET_CFLAGS = -D__NTAPP__ -Wall -Werror -Iinclude
+TARGET_CFLAGS = -D__NTAPP__ -D__USE_W32API -Wall -Werror -Iinclude
 
 TARGET_LFLAGS = -nostdlib
 
diff --git a/reactos/subsys/csrss/win32csr/Makefile b/reactos/subsys/csrss/win32csr/Makefile
index 084a56bcc13..778dd782218 100644
--- a/reactos/subsys/csrss/win32csr/Makefile
+++ b/reactos/subsys/csrss/win32csr/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 2004/01/11 17:31:15 gvg Exp $
+# $Id: Makefile,v 1.4 2004/07/12 20:09:34 gvg Exp $
 
 PATH_TO_TOP = ../../..
 
@@ -9,13 +9,13 @@ TARGET_NAME = win32csr
 TARGET_BASE = 0x5ffb0000
 
 # require os code to explicitly request A/W version of structs/functions
-TARGET_CFLAGS += -D_DISABLE_TIDENTS -Wall -Werror -I../include
+TARGET_CFLAGS += -D__USE_W32API -D_DISABLE_TIDENTS -Wall -Werror -I../include
 
 TARGET_LFLAGS = -nostartfiles -nostdlib
 
 TARGET_SDKLIBS = ntdll.a kernel32.a user32.a gdi32.a
 
-TARGET_OBJECTS = dllmain.o conio.o desktopbg.o guiconsole.o tuiconsole.o
+TARGET_OBJECTS = dllmain.o conio.o desktopbg.o exitros.o guiconsole.o tuiconsole.o
 
 TARGET_ENTRY = _DllMain@12
 
diff --git a/reactos/subsys/csrss/win32csr/dllmain.c b/reactos/subsys/csrss/win32csr/dllmain.c
index 2de47cf71e8..a084b5b55dd 100644
--- a/reactos/subsys/csrss/win32csr/dllmain.c
+++ b/reactos/subsys/csrss/win32csr/dllmain.c
@@ -1,4 +1,4 @@
-/* $Id: dllmain.c,v 1.5 2004/05/28 21:33:41 gvg Exp $
+/* $Id: dllmain.c,v 1.6 2004/07/12 20:09:34 gvg Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -55,6 +55,7 @@ static CSRSS_API_DEFINITION Win32CsrApiDefinitions[] =
     CSRSS_DEFINE_API(CSRSS_READ_CONSOLE_OUTPUT_CHAR,     CsrReadConsoleOutputChar),
     CSRSS_DEFINE_API(CSRSS_READ_CONSOLE_OUTPUT_ATTRIB,   CsrReadConsoleOutputAttrib),
     CSRSS_DEFINE_API(CSRSS_GET_NUM_INPUT_EVENTS,         CsrGetNumberOfConsoleInputEvents),
+    CSRSS_DEFINE_API(CSRSS_EXIT_REACTOS,                 CsrExitReactos),
     CSRSS_DEFINE_API(CSRSS_PEEK_CONSOLE_INPUT,           CsrPeekConsoleInput),
     CSRSS_DEFINE_API(CSRSS_READ_CONSOLE_OUTPUT,          CsrReadConsoleOutput),
     CSRSS_DEFINE_API(CSRSS_WRITE_CONSOLE_INPUT,          CsrWriteConsoleInput),
@@ -62,6 +63,8 @@ static CSRSS_API_DEFINITION Win32CsrApiDefinitions[] =
     CSRSS_DEFINE_API(CSRSS_CREATE_DESKTOP,               CsrCreateDesktop),
     CSRSS_DEFINE_API(CSRSS_SHOW_DESKTOP,                 CsrShowDesktop),
     CSRSS_DEFINE_API(CSRSS_HIDE_DESKTOP,                 CsrHideDesktop),
+    CSRSS_DEFINE_API(CSRSS_SET_LOGON_NOTIFY_WINDOW,      CsrSetLogonNotifyWindow),
+    CSRSS_DEFINE_API(CSRSS_REGISTER_LOGON_PROCESS,       CsrRegisterLogonProcess),
     { 0, 0, 0, NULL }
   };
 
diff --git a/reactos/subsys/csrss/win32csr/exitros.c b/reactos/subsys/csrss/win32csr/exitros.c
new file mode 100644
index 00000000000..523ae875d72
--- /dev/null
+++ b/reactos/subsys/csrss/win32csr/exitros.c
@@ -0,0 +1,112 @@
+/* $Id: exitros.c,v 1.1 2004/07/12 20:09:34 gvg Exp $
+ *
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS CSRSS subsystem
+ * FILE:            subsys/csrss/win32csr/exitros.c
+ * PURPOSE:         Logout/shutdown
+ */
+
+/* INCLUDES ******************************************************************/
+
+#include <windows.h>
+#include <reactos/winlogon.h>
+#include "api.h"
+#include "win32csr.h"
+
+#define NDEBUG
+#include <debug.h>
+
+static HWND LogonNotifyWindow = NULL;
+static DWORD LogonProcess = 0;
+
+CSR_API(CsrRegisterLogonProcess)
+{
+  Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY);
+  Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - LPC_MESSAGE_BASE_SIZE;
+
+  if (Request->Data.RegisterLogonProcessRequest.Register)
+    {
+      if (0 != LogonProcess)
+        {
+          Reply->Status = STATUS_LOGON_SESSION_EXISTS;
+          return Reply->Status;
+        }
+      LogonProcess = Request->Data.RegisterLogonProcessRequest.ProcessId;
+    }
+  else
+    {
+      if ((DWORD) Request->Header.ClientId.UniqueProcess != LogonProcess)
+        {
+          DPRINT1("Current logon process 0x%x, can't deregister from process 0x%x\n",
+                  LogonProcess, Request->Header.ClientId.UniqueProcess);
+          Reply->Status = STATUS_NOT_LOGON_PROCESS;
+          return Reply->Status;
+        }
+      LogonProcess = 0;
+    }
+
+  Reply->Status = STATUS_SUCCESS;
+
+  return Reply->Status;
+}
+
+CSR_API(CsrSetLogonNotifyWindow)
+{
+  DWORD WindowCreator;
+
+  Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY);
+  Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - LPC_MESSAGE_BASE_SIZE;
+
+  if (0 == GetWindowThreadProcessId(Request->Data.SetLogonNotifyWindowRequest.LogonNotifyWindow,
+                                    &WindowCreator))
+    {
+      DPRINT1("Can't get window creator\n");
+      Reply->Status = STATUS_INVALID_HANDLE;
+      return Reply->Status;
+    }
+  if (WindowCreator != LogonProcess)
+    {
+      DPRINT1("Trying to register window not created by winlogon as notify window\n");
+      Reply->Status = STATUS_ACCESS_DENIED;
+      return Reply->Status;
+    }
+
+  LogonNotifyWindow = Request->Data.SetLogonNotifyWindowRequest.LogonNotifyWindow;
+
+  Reply->Status = STATUS_SUCCESS;
+
+  return Reply->Status;
+}
+
+CSR_API(CsrExitReactos)
+{
+  Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY);
+  Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - LPC_MESSAGE_BASE_SIZE;
+
+  if (NULL == LogonNotifyWindow)
+    {
+      DPRINT1("No LogonNotifyWindow registered\n");
+      Reply->Status = STATUS_NOT_FOUND;
+      return Reply->Status;
+    }
+
+  /* FIXME Inside 2000 says we should impersonate the caller here */
+  Reply->Status = SendMessageW(LogonNotifyWindow, PM_WINLOGON_EXITWINDOWS,
+                               (WPARAM) Request->Header.ClientId.UniqueProcess,
+                               (LPARAM) Request->Data.ExitReactosRequest.Flags);
+  /* If the message isn't handled, the return value is 0, so 0 doesn't indicate success.
+     Success is indicated by a 1 return value, if anything besides 0 or 1 it's a
+     NTSTATUS value */
+  if (1 == Reply->Status)
+    {
+      Reply->Status = STATUS_SUCCESS;
+    }
+  else if (0 == Reply->Status)
+    {
+      Reply->Status = STATUS_NOT_IMPLEMENTED;
+    }
+
+  return Reply->Status;
+}
+
+/* EOF */
diff --git a/reactos/subsys/system/winlogon/makefile b/reactos/subsys/system/winlogon/makefile
index 54cc7098998..6470e0be2c9 100644
--- a/reactos/subsys/system/winlogon/makefile
+++ b/reactos/subsys/system/winlogon/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.10 2004/03/28 12:21:41 weiden Exp $
+# $Id: makefile,v 1.11 2004/07/12 20:09:35 gvg Exp $
 
 PATH_TO_TOP = ../../..
 
@@ -14,10 +14,15 @@ TARGET_SDKLIBS = ntdll.a kernel32.a user32.a advapi32.a userenv.a secur32.a
 
 TARGET_OBJECTS = setup.o winlogon.o wlx.o sas.o
 
-TARGET_CFLAGS = -Wall -Werror -DUNICODE -D_UNICODE -I./ -I../../../include
+TARGET_CFLAGS = -Wall -Werror -D__USE_W32API -DUNICODE -D_UNICODE -I./
 
 include $(PATH_TO_TOP)/rules.mak
 
 include $(TOOLS_PATH)/helper.mk
 
+# Automatic dependency tracking
+DEP_OBJECTS := $(TARGET_OBJECTS)
+
+include $(PATH_TO_TOP)/tools/depend.mk
+
 # EOF
diff --git a/reactos/subsys/system/winlogon/sas.c b/reactos/subsys/system/winlogon/sas.c
index 739baaf39b1..db26fecf1b9 100644
--- a/reactos/subsys/system/winlogon/sas.c
+++ b/reactos/subsys/system/winlogon/sas.c
@@ -1,4 +1,4 @@
-/* $Id: sas.c,v 1.1 2004/03/28 12:21:41 weiden Exp $
+/* $Id: sas.c,v 1.2 2004/07/12 20:09:35 gvg Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -16,15 +16,22 @@
 #include <ntsecapi.h>
 #include <wchar.h>
 #include <userenv.h>
+#include <reactos/winlogon.h>
 
 #include "setup.h"
 #include "winlogon.h"
 #include "resource.h"
 
-#define SAS_CLASS   L"SAS window class"
+#define NDEBUG
+#include <debug.h>
+
 #define HK_CTRL_ALT_DEL 0
 #define HK_CTRL_SHIFT_ESC   1
 
+#ifdef __USE_W32API
+extern BOOL STDCALL SetLogonNotifyWindow(HWND Wnd, HWINSTA WinSta);
+#endif
+
 void
 DispatchSAS(PWLSESSION Session, DWORD dwSasType)
 {
@@ -48,7 +55,7 @@ SetupSAS(PWLSESSION Session, HWND hwndSAS)
   /* Register Ctrl+Alt+Del Hotkey */
   if(!RegisterHotKey(hwndSAS, HK_CTRL_ALT_DEL, MOD_CONTROL | MOD_ALT, VK_DELETE))
   {
-    DbgPrint("WL-SAS: Unable to register Ctrl+Alt+Del hotkey!\n");
+    DPRINT1("WL-SAS: Unable to register Ctrl+Alt+Del hotkey!\n");
     return FALSE;
   }
   
@@ -56,7 +63,7 @@ SetupSAS(PWLSESSION Session, HWND hwndSAS)
   Session->TaskManHotkey = RegisterHotKey(hwndSAS, HK_CTRL_SHIFT_ESC, MOD_CONTROL | MOD_SHIFT, VK_ESCAPE);
   if(!Session->TaskManHotkey)
   {
-    DbgPrint("WL-SAS: Warning: Unable to register Ctrl+Alt+Esc hotkey!\n");
+    DPRINT1("WL-SAS: Warning: Unable to register Ctrl+Alt+Esc hotkey!\n");
   }
   return TRUE;
 }
@@ -76,6 +83,78 @@ DestroySAS(PWLSESSION Session, HWND hwndSAS)
   return TRUE;
 }
 
+#define EWX_ACTION_MASK 0x0b
+static LRESULT
+HandleExitWindows(DWORD RequestingProcessId, UINT Flags)
+{
+  UINT Action;
+  HANDLE Process;
+  HANDLE Token;
+  BOOL CheckResult;
+  PPRIVILEGE_SET PrivSet;
+
+  /* Check parameters */
+  Action = Flags & EWX_ACTION_MASK;
+  if (EWX_LOGOFF != Action && EWX_SHUTDOWN != Action && EWX_REBOOT != Action
+      && EWX_POWEROFF != Action)
+  {
+    DPRINT1("Invalid ExitWindows action 0x%x\n", Action);
+    return STATUS_INVALID_PARAMETER;
+  }
+
+  /* Check privilege */
+  if (EWX_LOGOFF != Action)
+  {
+    Process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, RequestingProcessId);
+    if (NULL == Process)
+    {
+      DPRINT1("OpenProcess failed with error %d\n", GetLastError());
+      return STATUS_INVALID_HANDLE;
+    }
+    if (! OpenProcessToken(Process, TOKEN_QUERY, &Token))
+    {
+      DPRINT1("OpenProcessToken failed with error %d\n", GetLastError());
+      CloseHandle(Process);
+      return STATUS_INVALID_HANDLE;
+    }
+    CloseHandle(Process);
+    PrivSet = HeapAlloc(GetProcessHeap(), 0, sizeof(PRIVILEGE_SET) + sizeof(LUID_AND_ATTRIBUTES));
+    if (NULL == PrivSet)
+    {
+      DPRINT1("Failed to allocate mem for privilege set\n");
+      CloseHandle(Token);
+      return STATUS_NO_MEMORY;
+    }
+    PrivSet->PrivilegeCount = 1;
+    PrivSet->Control = PRIVILEGE_SET_ALL_NECESSARY;
+    if (! LookupPrivilegeValue(NULL, SE_SHUTDOWN_NAME, &PrivSet->Privilege[0].Luid))
+    {
+      DPRINT1("LookupPrivilegeValue failed with error %d\n", GetLastError());
+      HeapFree(GetProcessHeap(), 0, PrivSet);
+      CloseHandle(Token);
+      return STATUS_UNSUCCESSFUL;
+    }
+    if (! PrivilegeCheck(Token, PrivSet, &CheckResult))
+    {
+      DPRINT1("PrivilegeCheck failed with error %d\n", GetLastError());
+      HeapFree(GetProcessHeap(), 0, PrivSet);
+      CloseHandle(Token);
+      return STATUS_ACCESS_DENIED;
+    }
+    HeapFree(GetProcessHeap(), 0, PrivSet);
+    CloseHandle(Token);
+    if (! CheckResult)
+    {
+      DPRINT1("SE_SHUTDOWN privilege not enabled\n");
+      return STATUS_ACCESS_DENIED;
+    }
+  }
+
+  /* FIXME actually start logoff/shutdown now */
+
+  return 1;
+}
+
 LRESULT CALLBACK
 SASProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
@@ -91,10 +170,10 @@ SASProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
       switch(wParam)
       {
         case HK_CTRL_ALT_DEL:
-          DbgPrint("SAS: CTR+ALT+DEL\n");
+          DPRINT1("SAS: CTR+ALT+DEL\n");
           break;
         case HK_CTRL_SHIFT_ESC:
-          DbgPrint("SAS: CTR+SHIFT+ESC\n");
+          DPRINT1("SAS: CTR+SHIFT+ESC\n");
           break;
       }
       return 0;
@@ -108,6 +187,10 @@ SASProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
       }
       return 0;
     }
+    case PM_WINLOGON_EXITWINDOWS:
+    {
+      return HandleExitWindows((DWORD) wParam, (UINT) lParam);
+    }
     case WM_DESTROY:
     {
       DestroySAS(Session, hwnd);
@@ -134,33 +217,29 @@ InitializeSAS(PWLSESSION Session)
   swc.hCursor = NULL;
   swc.hbrBackground = NULL;
   swc.lpszMenuName = NULL;
-  swc.lpszClassName = SAS_CLASS;
+  swc.lpszClassName = WINLOGON_SAS_CLASS;
   swc.hIconSm = NULL;
   RegisterClassEx(&swc);
   
   /* create invisible SAS window */
-  Session->SASWindow = CreateWindowEx(0, SAS_CLASS, L"SAS", WS_OVERLAPPEDWINDOW,
+  Session->SASWindow = CreateWindowEx(0, WINLOGON_SAS_CLASS, WINLOGON_SAS_TITLE, WS_POPUP,
                                       0, 0, 0, 0, 0, 0, hAppInstance, NULL);
   if(!Session->SASWindow)
   {
-    DbgPrint("WL: Failed to create SAS window\n");
+    DPRINT1("WL: Failed to create SAS window\n");
     return FALSE;
   }
   
   /* Save the Session pointer so the window proc can access it */
   SetWindowLong(Session->SASWindow, GWL_USERDATA, (LONG)Session);
   
-  #if 0
-  /* Register SAS window to receive SAS notifications
-     FIXME - SetLogonNotifyWindow() takes only one parameter,
-             definition in funcs.h is wrong! */
-  if(!SetLogonNotifyWindow(Session->SASWindow))
+  /* Register SAS window to receive SAS notifications */
+  if(!SetLogonNotifyWindow(Session->SASWindow, Session->InteractiveWindowStation))
   {
     UninitSAS(Session);
-    DbgPrint("WL: Failed to register SAS window\n");
+    DPRINT1("WL: Failed to register SAS window\n");
     return FALSE;
   }
-  #endif
   
   return TRUE;
 }
diff --git a/reactos/subsys/system/winlogon/setup.c b/reactos/subsys/system/winlogon/setup.c
index 610f0b9d2b8..70ea348b37c 100644
--- a/reactos/subsys/system/winlogon/setup.c
+++ b/reactos/subsys/system/winlogon/setup.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: setup.c,v 1.3 2004/06/04 23:46:02 navaraf Exp $
+/* $Id: setup.c,v 1.4 2004/07/12 20:09:35 gvg Exp $
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS winlogon
  * FILE:            subsys/system/winlogon/setup.h
@@ -43,7 +43,7 @@ DWORD
 GetSetupType(VOID)
 {
   DWORD dwError;
-  HANDLE hKey;
+  HKEY hKey;
   DWORD dwType;
   DWORD dwSize;
   DWORD dwSetupType;
@@ -79,7 +79,7 @@ BOOL
 SetSetupType (DWORD dwSetupType)
 {
   DWORD dwError;
-  HANDLE hKey;
+  HKEY hKey;
 
   dwError = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
 			 L"SYSTEM\\Setup", //TEXT("SYSTEM\\Setup"),
@@ -116,7 +116,7 @@ RunSetup (VOID)
   WCHAR CommandLine[MAX_PATH];
   BOOLEAN Result;
   DWORD dwError;
-  HANDLE hKey;
+  HKEY hKey;
   DWORD dwType;
   DWORD dwSize;
   DWORD dwExitCode;
diff --git a/reactos/subsys/system/winlogon/winlogon.c b/reactos/subsys/system/winlogon/winlogon.c
index 5ad3267aa3c..61aae7db220 100644
--- a/reactos/subsys/system/winlogon/winlogon.c
+++ b/reactos/subsys/system/winlogon/winlogon.c
@@ -1,4 +1,4 @@
-/* $Id: winlogon.c,v 1.33 2004/07/11 13:31:28 weiden Exp $
+/* $Id: winlogon.c,v 1.34 2004/07/12 20:09:35 gvg Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -219,7 +219,7 @@ StartLsass (VOID)
 
 
 static BOOLEAN
-OpenRegistryKey (HANDLE *WinLogonKey)
+OpenRegistryKey (HKEY *WinLogonKey)
 {
    return ERROR_SUCCESS == RegOpenKeyEx(HKEY_LOCAL_MACHINE,
                                         L"SOFTWARE\\ReactOS\\Windows NT\\CurrentVersion\\WinLogon",
@@ -232,7 +232,7 @@ OpenRegistryKey (HANDLE *WinLogonKey)
 static BOOLEAN StartProcess(PWCHAR ValueName)
 {
    BOOL StartIt;
-   HANDLE WinLogonKey;
+   HKEY WinLogonKey;
    DWORD Type;
    DWORD Size;
    DWORD StartValue;
@@ -262,7 +262,7 @@ static BOOLEAN StartProcess(PWCHAR ValueName)
 /*
 static BOOL RestartShell(void)
 {
-  HANDLE WinLogonKey;
+  HKEY WinLogonKey;
   DWORD Type, Size, Value;
   
   if(OpenRegistryKey(&WinLogonKey))
@@ -338,7 +338,7 @@ HandleHotKey(MSG *Msg)
 #if SUPPORT_CONSOLESTART
 static BOOL StartIntoGUI(VOID)
 {
-  HANDLE WinLogonKey;
+  HKEY WinLogonKey;
   DWORD Type, Size, Value;
   
   if(OpenRegistryKey(&WinLogonKey))
@@ -366,7 +366,7 @@ static BOOL StartIntoGUI(VOID)
 static PWCHAR
 GetShell (WCHAR *CommandLine)
 {
-   HANDLE WinLogonKey;
+   HKEY WinLogonKey;
    BOOL GotCommandLine;
    DWORD Type;
    DWORD Size;
@@ -492,10 +492,6 @@ DoLogonUser (PWCHAR Name,
       return FALSE;
     }
 
-  /* Process the global hotkeys on #if 0 */
-#if 0
-  WaitForSingleObject (ProcessInformation.hProcess, INFINITE);
-#else
   RegisterHotKeys();
 
   while (WaitForSingleObject (ProcessInformation.hProcess, 100) != WAIT_OBJECT_0)
@@ -510,7 +506,7 @@ DoLogonUser (PWCHAR Name,
   }
 
   UnregisterHotKeys();
-#endif
+
   CloseHandle (ProcessInformation.hProcess);
   CloseHandle (ProcessInformation.hThread);
 
@@ -543,7 +539,7 @@ WinMain(HINSTANCE hInstance,
   ULONG AuthenticationPackage;
 #endif
   NTSTATUS Status;
-  
+
   hAppInstance = hInstance;
   
   if(!RegisterLogonProcess(GetCurrentProcessId(), TRUE))
@@ -614,18 +610,13 @@ WinMain(HINSTANCE hInstance,
   
 #if SUPPORT_CONSOLESTART
  StartConsole = !StartIntoGUI();
- if(!StartConsole)
- {
 #endif
-  if(!InitializeSAS(WLSession))
+ if(!InitializeSAS(WLSession))
   {
     DbgPrint("WL: Failed to initialize SAS\n");
     ExitProcess(2);
     return 2;
   }
-#if SUPPORT_CONSOLESTART
- }
-#endif
   
   InitServices();
    
diff --git a/reactos/subsys/system/winlogon/winlogon.h b/reactos/subsys/system/winlogon/winlogon.h
index be205c49a5c..b6aaeebaa0f 100644
--- a/reactos/subsys/system/winlogon/winlogon.h
+++ b/reactos/subsys/system/winlogon/winlogon.h
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: winlogon.h,v 1.3 2004/03/28 12:21:41 weiden Exp $
+/* $Id: winlogon.h,v 1.4 2004/07/12 20:09:35 gvg Exp $
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS winlogon
  * FILE:            subsys/system/winlogon/winlogon.h
@@ -110,7 +110,7 @@ typedef struct _MSGINAFUNCTIONS
 
 typedef struct _MSGINAINSTANCE
 {
-  HANDLE hDllInstance;
+  HMODULE hDllInstance;
   MSGINAFUNCTIONS Functions;
   PVOID Context;
   DWORD Version;
@@ -125,6 +125,7 @@ typedef struct _WLSESSION
   BOOL TaskManHotkey;
   HWND SASWindow;
   HWINSTA InteractiveWindowStation;
+  LPWSTR InteractiveWindowStationName;
   HDESK ApplicationDesktop;
   HDESK WinlogonDesktop;
   HDESK ScreenSaverDesktop;
diff --git a/reactos/subsys/system/winlogon/wlx.c b/reactos/subsys/system/winlogon/wlx.c
index 494bb7916d9..1be312b0ca8 100644
--- a/reactos/subsys/system/winlogon/wlx.c
+++ b/reactos/subsys/system/winlogon/wlx.c
@@ -1,4 +1,4 @@
-/* $Id: wlx.c,v 1.4 2004/03/28 12:21:41 weiden Exp $
+/* $Id: wlx.c,v 1.5 2004/07/12 20:09:35 gvg Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <WinWlx.h>
 #include <wchar.h>
+#include <reactos/winlogon.h>
 
 #include "setup.h"
 #include "winlogon.h"
@@ -493,7 +494,7 @@ static void
 GetMsGinaPath(WCHAR *path)
 {
   DWORD Status, Type, Size;
-  HANDLE hKey;
+  HKEY hKey;
   
   Status = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
                         L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon",
@@ -652,7 +653,7 @@ MsGinaInit(void)
   WLSession->MsGina.Version = GinaDllVersion;
   WLSession->SuppressStatus = FALSE;
   
-  if(!WLSession->MsGina.Functions.WlxInitialize(WLSession->InteractiveWindowStation,
+  if(!WLSession->MsGina.Functions.WlxInitialize(WLSession->InteractiveWindowStationName,
                                                (HANDLE)WLSession,
                                                NULL,
                                                (PVOID)&FunctionTable,
@@ -670,7 +671,9 @@ WlxCreateWindowStationAndDesktops(PWLSESSION Session)
   /*
    * Create the interactive window station
    */
-  Session->InteractiveWindowStation = CreateWindowStation(L"WinSta0", 0, GENERIC_ALL, NULL);
+  Session->InteractiveWindowStationName = L"WinSta0";
+  Session->InteractiveWindowStation = CreateWindowStation(Session->InteractiveWindowStationName,
+                                                          0, GENERIC_ALL, NULL);
   if(!Session->InteractiveWindowStation)
   {
     DbgPrint("WL: Failed to create window station (0x%X)\n", GetLastError());
@@ -696,7 +699,7 @@ WlxCreateWindowStationAndDesktops(PWLSESSION Session)
   /*
    * Create the winlogon desktop
    */
-  Session->WinlogonDesktop = CreateDesktop(L"Winlogon",
+  Session->WinlogonDesktop = CreateDesktop(WINLOGON_DESKTOP,
                                            NULL,
                                            NULL,
                                            0,      /* FIXME: Set some flags */
diff --git a/reactos/subsys/win32k/ntuser/csr.c b/reactos/subsys/win32k/ntuser/csr.c
index abf1ee9680a..e42d650ebec 100644
--- a/reactos/subsys/win32k/ntuser/csr.c
+++ b/reactos/subsys/win32k/ntuser/csr.c
@@ -1,4 +1,4 @@
-/* $Id: csr.c,v 1.1 2004/05/28 21:33:41 gvg Exp $
+/* $Id: csr.c,v 1.2 2004/07/12 20:09:35 gvg Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -73,7 +73,7 @@ CsrNotify(PCSRSS_API_REQUEST Request, PCSRSS_API_REPLY Reply)
       Status = Reply->Status;
     }
 
-  return STATUS_SUCCESS;
+  return Status;
 }
 
 /* EOF */
diff --git a/reactos/subsys/win32k/ntuser/misc.c b/reactos/subsys/win32k/ntuser/misc.c
index e786c0be3fa..67841b6e12a 100644
--- a/reactos/subsys/win32k/ntuser/misc.c
+++ b/reactos/subsys/win32k/ntuser/misc.c
@@ -1,4 +1,4 @@
-/* $Id: misc.c,v 1.82 2004/07/08 14:36:18 ekohl Exp $
+/* $Id: misc.c,v 1.83 2004/07/12 20:09:35 gvg Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -37,12 +37,14 @@ PUSER_MESSAGE_QUEUE W32kGetPrimitiveMessageQueue() {
 }
 
 BOOL FASTCALL
-IntRegisterLogonProcess(DWORD dwProcessId, BOOL bRegister)
+IntRegisterLogonProcess(DWORD ProcessId, BOOL Register)
 {
   PEPROCESS Process;
   NTSTATUS Status;
+  CSRSS_API_REQUEST Request;
+  CSRSS_API_REPLY Reply;
 
-  Status = PsLookupProcessByProcessId((PVOID)dwProcessId,
+  Status = PsLookupProcessByProcessId((PVOID)ProcessId,
 				      &Process);
   if (!NT_SUCCESS(Status))
   {
@@ -50,7 +52,7 @@ IntRegisterLogonProcess(DWORD dwProcessId, BOOL bRegister)
     return FALSE;
   }
 
-  if (bRegister)
+  if (Register)
   {
     /* Register the logon process */
     if (LogonProcess != NULL)
@@ -75,6 +77,17 @@ IntRegisterLogonProcess(DWORD dwProcessId, BOOL bRegister)
 
   ObDereferenceObject(Process);
 
+  Request.Type = CSRSS_REGISTER_LOGON_PROCESS;
+  Request.Data.RegisterLogonProcessRequest.ProcessId = ProcessId;
+  Request.Data.RegisterLogonProcessRequest.Register = Register;
+
+  Status = CsrNotify(&Request, &Reply);
+  if (! NT_SUCCESS(Status))
+  {
+    DPRINT1("Failed to register logon process with CSRSS\n");
+    return FALSE;
+  }
+
   return TRUE;
 }
 

From a1f4820c318460600d826b1b5de2ba97e587db3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Mon, 12 Jul 2004 20:26:35 +0000
Subject: [PATCH 273/356] Shutdown step 1: inform winlogon (forgotten file)

svn path=/trunk/; revision=10095
---
 reactos/include/csrss/csrss.h | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/reactos/include/csrss/csrss.h b/reactos/include/csrss/csrss.h
index 20ed9dab918..392e23b29d2 100644
--- a/reactos/include/csrss/csrss.h
+++ b/reactos/include/csrss/csrss.h
@@ -532,6 +532,25 @@ typedef struct
 {
 } CSRSS_HIDE_DESKTOP_REPLY, *PCSRSS_HIDE_DESKTOP_REPLY;
 
+typedef struct
+{
+  HWND LogonNotifyWindow;
+} CSRSS_SET_LOGON_NOTIFY_WINDOW_REQUEST, *PCSRSS_SET_LOGON_NOTIFY_WINDOW_REQUEST;
+
+typedef struct
+{
+} CSRSS_SET_LOGON_NOTIFY_WINDOW_REPLY, *PCSRSS_SET_LOGON_NOTIFY_WINDOW_REPLY;
+
+typedef struct
+{
+  DWORD ProcessId;
+  BOOL Register;
+} CSRSS_REGISTER_LOGON_PROCESS_REQUEST, *PCSRSS_REGISTER_LOGON_PROCESS_REQUEST;
+
+typedef struct
+{
+} CSRSS_REGISTER_LOGON_PROCESS_REPLY, *PCSRSS_REGISTER_LOGON_PROCESS_REPLY;
+
 #define CSRSS_MAX_WRITE_CONSOLE_REQUEST       \
       (MAX_MESSAGE_DATA - sizeof(ULONG) - sizeof(CSRSS_WRITE_CONSOLE_REQUEST))
 
@@ -597,6 +616,8 @@ typedef struct
 #define CSRSS_SHOW_DESKTOP                  (0x2C)
 #define CSRSS_HIDE_DESKTOP                  (0x2D)
 #define CSRSS_SET_CONSOLE_ICON              (0x2E)
+#define CSRSS_SET_LOGON_NOTIFY_WINDOW       (0x2F)
+#define CSRSS_REGISTER_LOGON_PROCESS        (0x30)
 
 /* Keep in sync with definition below. */
 #define CSRSS_REQUEST_HEADER_SIZE (LPC_MESSAGE_BASE_SIZE + sizeof(ULONG))
@@ -656,6 +677,8 @@ typedef struct
         CSRSS_SHOW_DESKTOP_REQUEST ShowDesktopRequest;
         CSRSS_HIDE_DESKTOP_REQUEST HideDesktopRequest;
         CSRSS_CONSOLE_SET_WINDOW_ICON ConsoleSetWindowIconRequest;
+        CSRSS_SET_LOGON_NOTIFY_WINDOW_REQUEST SetLogonNotifyWindowRequest;
+        CSRSS_REGISTER_LOGON_PROCESS_REQUEST RegisterLogonProcessRequest;
       } Data;
     };
   };
@@ -703,6 +726,8 @@ typedef struct
         CSRSS_SHOW_DESKTOP_REPLY ShowDesktopReply;
         CSRSS_HIDE_DESKTOP_REPLY HideDesktopReply;
         CSRSS_CONSOLE_SET_WINDOW_ICON ConsoleSetWindowIconReply;
+        CSRSS_SET_LOGON_NOTIFY_WINDOW_REPLY SetLogonNotifyWindowReply;
+        CSRSS_REGISTER_LOGON_PROCESS_REPLY RegisterLogonProcessReply;
       } Data;
     };
   };

From aa38cd0cd154c4e6140b334b8bceb4e77e0affae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Mon, 12 Jul 2004 20:32:16 +0000
Subject: [PATCH 274/356] Marcus Meissner <marcus@jet.franken.de> - Fixed
 double applet = applet = assignment. - Removed sic_hdpa only used in 1 C file
 as static var. - Make VT_Shell_IMalloc32 and related variables static.

svn path=/trunk/; revision=10096
---
 reactos/lib/shell32/control.c      | 4 ++--
 reactos/lib/shell32/shell32_main.h | 1 -
 reactos/lib/shell32/shellole.c     | 6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/reactos/lib/shell32/control.c b/reactos/lib/shell32/control.c
index 72c697742a6..826f0db6b15 100644
--- a/reactos/lib/shell32/control.c
+++ b/reactos/lib/shell32/control.c
@@ -171,7 +171,7 @@ static BOOL	Control_Localize(const CPanel* panel, unsigned cx, unsigned cy,
     RECT	rc;
 
     GetClientRect(panel->hWnd, &rc);
-    for (applet = panel->first; applet; applet = applet = applet->next) {
+    for (applet = panel->first; applet; applet = applet->next) {
         for (i = 0; i < applet->count; i++) {
 	    if (!applet->info[i].dwSize) continue;
 	    if (x + XSTEP >= rc.right - rc.left) {
@@ -201,7 +201,7 @@ static LRESULT Control_WndProc_Paint(const CPanel* panel, WPARAM wParam)
     hdc = (wParam) ? (HDC)wParam : BeginPaint(panel->hWnd, &ps);
     hOldFont = SelectObject(hdc, GetStockObject(ANSI_VAR_FONT));
     GetClientRect(panel->hWnd, &rc);
-    for (applet = panel->first; applet; applet = applet = applet->next) {
+    for (applet = panel->first; applet; applet = applet->next) {
         for (i = 0; i < applet->count; i++) {
 	    if (x + XSTEP >= rc.right - rc.left) {
 	        x = 0;
diff --git a/reactos/lib/shell32/shell32_main.h b/reactos/lib/shell32/shell32_main.h
index 934af5855d3..6ecdabe776c 100644
--- a/reactos/lib/shell32/shell32_main.h
+++ b/reactos/lib/shell32/shell32_main.h
@@ -44,7 +44,6 @@ extern HMODULE	huser32;
 extern HINSTANCE shell32_hInstance;
 extern HIMAGELIST	ShellSmallIconList;
 extern HIMAGELIST	ShellBigIconList;
-extern HDPA		sic_hdpa;
 
 BOOL WINAPI Shell_GetImageList(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList);
 
diff --git a/reactos/lib/shell32/shellole.c b/reactos/lib/shell32/shellole.c
index e53f21f21b2..ccced91b89a 100644
--- a/reactos/lib/shell32/shellole.c
+++ b/reactos/lib/shell32/shellole.c
@@ -297,7 +297,7 @@ DWORD WINAPI SHCLSIDFromStringAW (LPVOID clsid, CLSID *id)
  */
 
 /* set the vtable later */
-extern ICOM_VTABLE(IMalloc) VT_Shell_IMalloc32;
+static ICOM_VTABLE(IMalloc) VT_Shell_IMalloc32;
 
 /* this is the static object instance */
 typedef struct {
@@ -305,10 +305,10 @@ typedef struct {
 	DWORD dummy;
 } _ShellMalloc;
 
-_ShellMalloc Shell_Malloc = { &VT_Shell_IMalloc32,1};
+static _ShellMalloc Shell_Malloc = { &VT_Shell_IMalloc32,1};
 
 /* this is the global allocator of shell32 */
-IMalloc * ShellTaskAllocator = NULL;
+static IMalloc * ShellTaskAllocator = NULL;
 
 /******************************************************************************
  *              IShellMalloc_QueryInterface        [VTABLE]

From 55dc46bf13564450a140dd307c328168cff365ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Mon, 12 Jul 2004 20:53:24 +0000
Subject: [PATCH 275/356] Use string resources for ExitWindowsDialog() and
 RestartDialogEx() to allow internationalization.

svn path=/trunk/; revision=10097
---
 reactos/lib/shell32/dialogs.c        | 79 +++++++++++++++++-----------
 reactos/lib/shell32/shell32_En.rc    |  9 ++++
 reactos/lib/shell32/shresdef.h       |  5 ++
 reactos/lib/shell32/winehq2ros.patch | 20 +++++++
 4 files changed, 81 insertions(+), 32 deletions(-)
 create mode 100644 reactos/lib/shell32/winehq2ros.patch

diff --git a/reactos/lib/shell32/dialogs.c b/reactos/lib/shell32/dialogs.c
index bd19cd458d5..93b09f1ffcc 100644
--- a/reactos/lib/shell32/dialogs.c
+++ b/reactos/lib/shell32/dialogs.c
@@ -36,6 +36,7 @@
 #include "shellapi.h"
 #include "shlobj.h"
 #include "shell32_main.h"
+#include "shresdef.h"
 #include "undocshell.h"
 
 typedef struct
@@ -378,31 +379,47 @@ void FillList (HWND hCb, char *pszLatest)
     }
 
 
+/*************************************************************************
+ * ConfirmDialog				[internal]
+ *
+ * Put up a confirm box, return TRUE if the user confirmed
+ */
+static BOOL ConfirmDialog(HWND hWndOwner, UINT PromptId, UINT TitleId)
+{
+  WCHAR Prompt[256];
+  WCHAR Title[256];
+
+  LoadStringW(shell32_hInstance, PromptId, Prompt, sizeof(Prompt) / sizeof(WCHAR));
+  LoadStringW(shell32_hInstance, TitleId, Title, sizeof(Title) / sizeof(WCHAR));
+  return MessageBoxW(hWndOwner, Prompt, Title, MB_YESNO|MB_ICONQUESTION) == IDYES;
+}
+
+
 /*************************************************************************
  * RestartDialogEx				[SHELL32.730]
  */
 
-int WINAPI RestartDialogEx(HWND hwndOwner, LPCWSTR lpwstrReason, UINT uFlags, UINT uReason)
+int WINAPI RestartDialogEx(HWND hWndOwner, LPCWSTR lpwstrReason, DWORD uFlags, DWORD uReason)
 {
-    TRACE("(%p)\n", hwndOwner);
+    TRACE("(%p)\n", hWndOwner);
 
     /*FIXME: use uReason */
 
-    if (MessageBoxA(hwndOwner, "Do you want to restart the system?", "Restart", MB_YESNO|MB_ICONQUESTION) == IDYES)
+    if (ConfirmDialog(hWndOwner, IDS_RESTART_PROMPT, IDS_RESTART_TITLE))
     {
-	if (SHELL_OsIsUnicode())
-	{
-	    HANDLE hToken;
-	    TOKEN_PRIVILEGES npr = {1, {{{0, 0}, SE_PRIVILEGE_ENABLED}}};
+        HANDLE hToken;
+        TOKEN_PRIVILEGES npr;
 
-	    /* enable shutdown privilege for current process */
-	    OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken);
-	    LookupPrivilegeValueA(0, "SeShutdownPrivilege", &npr.Privileges[0].Luid);
-	    AdjustTokenPrivileges(hToken, FALSE, &npr, 0, 0, 0);
-	    CloseHandle(hToken);
-	}
-
-	ExitWindowsEx(EWX_REBOOT, 0);
+        /* enable shutdown privilege for current process */
+        if (OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken))
+        {
+            LookupPrivilegeValueA(0, "SeShutdownPrivilege", &npr.Privileges[0].Luid);
+            npr.PrivilegeCount = 1;
+            npr.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
+            AdjustTokenPrivileges(hToken, FALSE, &npr, 0, 0, 0);
+            CloseHandle(hToken);
+        }
+        ExitWindowsEx(EWX_REBOOT, 0);
     }
 
     return 0;
@@ -413,9 +430,9 @@ int WINAPI RestartDialogEx(HWND hwndOwner, LPCWSTR lpwstrReason, UINT uFlags, UI
  * RestartDialog				[SHELL32.59]
  */
 
-int WINAPI RestartDialog(HWND hwndOwner, LPCWSTR lpstrReason, UINT uFlags)
+int WINAPI RestartDialog(HWND hWndOwner, LPCWSTR lpstrReason, DWORD uFlags)
 {
-    return RestartDialogEx(hwndOwner, lpstrReason, uFlags, 0);
+    return RestartDialogEx(hWndOwner, lpstrReason, uFlags, 0);
 }
 
 
@@ -429,22 +446,20 @@ void WINAPI ExitWindowsDialog (HWND hWndOwner)
 {
     TRACE("(%p)\n", hWndOwner);
 
-    if (MessageBoxA(hWndOwner, "Do you want to shutdown?", "Shutdown", MB_YESNO|MB_ICONQUESTION) == IDYES)
+    if (ConfirmDialog(hWndOwner, IDS_SHUTDOWN_PROMPT, IDS_SHUTDOWN_TITLE))
     {
-	if (SHELL_OsIsUnicode())
-	{
-	    HANDLE hToken;
-	    TOKEN_PRIVILEGES npr = {1, {{{0, 0}, SE_PRIVILEGE_ENABLED}}};
+        HANDLE hToken;
+        TOKEN_PRIVILEGES npr;
 
-	    /* enable shutdown privilege for current process */
-	    OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken);
-	    LookupPrivilegeValueA(0, "SeShutdownPrivilege", &npr.Privileges[0].Luid);
-	    AdjustTokenPrivileges(hToken, FALSE, &npr, 0, 0, 0);
-	    CloseHandle(hToken);
-
-	    ExitWindowsEx(EWX_SHUTDOWN, 0);
-	}
-	else
-	    SendMessageA(hWndOwner, WM_QUIT, 0, 0);
+        /* enable shutdown privilege for current process */
+        if (OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken))
+        {
+            LookupPrivilegeValueA(0, "SeShutdownPrivilege", &npr.Privileges[0].Luid);
+            npr.PrivilegeCount = 1;
+            npr.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
+            AdjustTokenPrivileges(hToken, FALSE, &npr, 0, 0, 0);
+            CloseHandle(hToken);
+        }
+        ExitWindowsEx(EWX_SHUTDOWN, 0);
     }
 }
diff --git a/reactos/lib/shell32/shell32_En.rc b/reactos/lib/shell32/shell32_En.rc
index 6b5c680bc71..fdfd6ea32d4 100644
--- a/reactos/lib/shell32/shell32_En.rc
+++ b/reactos/lib/shell32/shell32_En.rc
@@ -177,3 +177,12 @@ BEGIN
 	IDS_SHV_COLUMN8		"Name"
 	IDS_SHV_COLUMN9		"Comments"
 END
+
+/* message box strings */
+STRINGTABLE DISCARDABLE
+{
+	IDS_RESTART_TITLE	"Restart"
+	IDS_RESTART_PROMPT	"Do you want to restart the system?"
+	IDS_SHUTDOWN_TITLE	"Shutdown"
+	IDS_SHUTDOWN_PROMPT	"Do you want to shutdown?"
+}
diff --git a/reactos/lib/shell32/shresdef.h b/reactos/lib/shell32/shresdef.h
index 3bb0d4780f4..f9bd69531ca 100644
--- a/reactos/lib/shell32/shresdef.h
+++ b/reactos/lib/shell32/shresdef.h
@@ -51,6 +51,11 @@
 #define IDS_OVERWRITEFILE_CAPTION 36
 #define IDS_OVERWRITEFILE_TEXT	37
 
+#define IDS_RESTART_TITLE      40
+#define IDS_RESTART_PROMPT     41
+#define IDS_SHUTDOWN_TITLE     42
+#define IDS_SHUTDOWN_PROMPT    43
+
 /* browse for folder dialog box */
 #define IDD_STATUS		0x3743
 #define IDD_TITLE		0x3742
diff --git a/reactos/lib/shell32/winehq2ros.patch b/reactos/lib/shell32/winehq2ros.patch
new file mode 100644
index 00000000000..ca95d52910d
--- /dev/null
+++ b/reactos/lib/shell32/winehq2ros.patch
@@ -0,0 +1,20 @@
+Index: shell32_En.rc
+===================================================================
+RCS file: /home/wine/wine/dlls/shell32/shell32_En.rc,v
+retrieving revision 1.14
+diff -u -r1.14 shell32_En.rc
+--- shell32_En.rc	9 Jul 2004 22:51:19 -0000	1.14
++++ shell32_En.rc	12 Jul 2004 21:01:03 -0000
+@@ -181,8 +181,8 @@
+ /* message box strings */
+ STRINGTABLE DISCARDABLE
+ {
+-       IDS_RESTART_TITLE       "Restart"
+-       IDS_RESTART_PROMPT      "Do you want to simulate a Windows reboot?"
+-       IDS_SHUTDOWN_TITLE      "Shutdown"
+-       IDS_SHUTDOWN_PROMPT     "Do you want to shutdown your Wine session?"
++	IDS_RESTART_TITLE	"Restart"
++	IDS_RESTART_PROMPT	"Do you want to restart the system?"
++	IDS_SHUTDOWN_TITLE	"Shutdown"
++	IDS_SHUTDOWN_PROMPT	"Do you want to shutdown?"
+ }

From 935851acb66bc5b73f4c927c7c2b8dcbe1198d6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Mon, 12 Jul 2004 21:26:39 +0000
Subject: [PATCH 276/356] =?UTF-8?q?Ilya=20Korniyko=20<k=5Filya@ukr.net>=20?=
 =?UTF-8?q?-=20Added=20Ukrainian=20translations.=20Jos=EF=BF=BD=20Manuel?=
 =?UTF-8?q?=20Ferrer=20Ortiz=20<jmfo1982@yahoo.es>=20-=20Updated=20the=20S?=
 =?UTF-8?q?panish=20shell32=20translation=20and=20made=20some=20correction?=
 =?UTF-8?q?s=20to=20=20=20other=20language=20files.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/trunk/; revision=10098
---
 reactos/lib/shell32/shell32_En.rc |   2 +-
 reactos/lib/shell32/shell32_Es.rc | 137 ++++++++++++++++++++++-
 reactos/lib/shell32/shell32_Uk.rc | 177 ++++++++++++++++++++++++++++++
 reactos/lib/shell32/shres.rc      |   3 +-
 4 files changed, 313 insertions(+), 6 deletions(-)
 create mode 100644 reactos/lib/shell32/shell32_Uk.rc

diff --git a/reactos/lib/shell32/shell32_En.rc b/reactos/lib/shell32/shell32_En.rc
index fdfd6ea32d4..ba646005c48 100644
--- a/reactos/lib/shell32/shell32_En.rc
+++ b/reactos/lib/shell32/shell32_En.rc
@@ -81,7 +81,7 @@ BEGIN
 	  MENUITEM "C&ut",		FCIDM_SHVIEW_CUT
 	  MENUITEM "&Copy",		FCIDM_SHVIEW_COPY
 	  MENUITEM SEPARATOR
-	  MENUITEM "&Create Link",	FCIDM_SHVIEW_CREATELINK
+	  MENUITEM "Create &Link",	FCIDM_SHVIEW_CREATELINK
 	  MENUITEM "&Delete",		FCIDM_SHVIEW_DELETE
 	  MENUITEM "&Rename",		FCIDM_SHVIEW_RENAME
 	  MENUITEM SEPARATOR
diff --git a/reactos/lib/shell32/shell32_Es.rc b/reactos/lib/shell32/shell32_Es.rc
index 09b12960399..43e2fb8a5b6 100644
--- a/reactos/lib/shell32/shell32_Es.rc
+++ b/reactos/lib/shell32/shell32_Es.rc
@@ -1,6 +1,6 @@
 /*
  * Copyright 1998 Juergen Schmied
- * Copyright 2003 José Manuel Ferrer Ortiz
+ * Copyright 2003,2004 José Manuel Ferrer Ortiz
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,98 @@
 
 LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
 
+MENU_001 MENU DISCARDABLE
+BEGIN
+	MENUITEM "Iconos &grandes",	FCIDM_SHVIEW_BIGICON
+	MENUITEM "Iconos &pequeños",	FCIDM_SHVIEW_SMALLICON
+	MENUITEM "&Lista",		FCIDM_SHVIEW_LISTVIEW
+	MENUITEM "&Detalles",		FCIDM_SHVIEW_REPORTVIEW
+END
+
+/*
+ shellview background menu
+*/
+MENU_002 MENU DISCARDABLE
+BEGIN
+	POPUP""
+	BEGIN
+	  POPUP "&Ver"
+	  BEGIN
+	    MENUITEM "Iconos &grandes",     FCIDM_SHVIEW_BIGICON
+	    MENUITEM "Iconos &pequeños",    FCIDM_SHVIEW_SMALLICON
+	    MENUITEM "&Lista",              FCIDM_SHVIEW_LISTVIEW
+	    MENUITEM "&Detalles",           FCIDM_SHVIEW_REPORTVIEW
+	  END
+	  MENUITEM SEPARATOR
+	  POPUP "Ordenar &iconos"
+	  BEGIN
+	    MENUITEM "Por &nombre",	0x30	/* column 0 */
+	    MENUITEM "Por &tipo",	0x32	/* column 2 */
+	    MENUITEM "Por t&amaño",	0x31	/* ... */
+	    MENUITEM "Por &fecha",	0x33
+	    MENUITEM SEPARATOR
+	    MENUITEM "&Ordenar automáticamente",	FCIDM_SHVIEW_AUTOARRANGE
+	  END
+	  MENUITEM "Alinear iconos",		FCIDM_SHVIEW_SNAPTOGRID
+	  MENUITEM SEPARATOR
+	  MENUITEM "Actualizar",		FCIDM_SHVIEW_REFRESH
+	  MENUITEM SEPARATOR
+	  MENUITEM "Pegar",			FCIDM_SHVIEW_INSERT
+	  MENUITEM "Pegar acceso directo",	FCIDM_SHVIEW_INSERTLINK
+	  MENUITEM SEPARATOR
+	  POPUP "Nuevo"
+	  BEGIN
+	    MENUITEM "Nueva &carpeta",		FCIDM_SHVIEW_NEWFOLDER
+	    MENUITEM "Nuevo &acceso directo",	FCIDM_SHVIEW_NEWLINK
+	    MENUITEM SEPARATOR
+	  END
+	  MENUITEM SEPARATOR
+	  MENUITEM "Propiedades",	FCIDM_SHVIEW_PROPERTIES
+	END
+END
+
+/*
+ shellview item menu
+*/
+MENU_SHV_FILE MENU DISCARDABLE
+BEGIN
+	POPUP""
+	BEGIN
+	  MENUITEM "E&xplorar",			FCIDM_SHVIEW_EXPLORE
+	  MENUITEM "&Abrir",			FCIDM_SHVIEW_OPEN
+	  MENUITEM SEPARATOR
+	  MENUITEM "C&ortar",			FCIDM_SHVIEW_CUT
+	  MENUITEM "&Copiar",			FCIDM_SHVIEW_COPY
+	  MENUITEM SEPARATOR
+	  MENUITEM "C&rear acceso directo",	FCIDM_SHVIEW_CREATELINK
+	  MENUITEM "&Eliminar",			FCIDM_SHVIEW_DELETE
+	  MENUITEM "Re&nombrar",		FCIDM_SHVIEW_RENAME
+	  MENUITEM SEPARATOR
+	  MENUITEM "&Propiedades",		FCIDM_SHVIEW_PROPERTIES
+	END
+END
+
+SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK
+CAPTION "Explorar carpeta"
+FONT 8, "Helv"
+{
+ DEFPUSHBUTTON "Aceptar", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancelar", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP
+ LTEXT "", IDD_TITLE, 4, 4, 180, 12
+ LTEXT "", IDD_STATUS, 4, 25, 180, 12
+ CONTROL "", IDD_TREEVIEW, "SysTreeView32",
+ 	TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT |
+	WS_BORDER | WS_TABSTOP,
+	4, 40, 180, 120
+}
+
 SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Acerca de %s"
 FONT 10, "Helv"
 {
- DEFPUSHBUTTON "Aceptar", IDOK, 153, 130, 50, 12
+ DEFPUSHBUTTON "Aceptar", IDOK, 153, 130, 50, 12, WS_TABSTOP
  LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
  ICON "", 1088, 189, 10, 14, 16
  LTEXT "", 100, 8, 10, 137, 33
@@ -45,8 +131,42 @@ FONT 8, "Helv"
  PUSHBUTTON "&Examinar...", 12288, 170, 63, 50, 14, WS_TABSTOP
 }
 
-/*      columns in the shellview        */
-STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
+/*
+	special folders
+*/
+STRINGTABLE DISCARDABLE
+{
+	IDS_DESKTOP		"Escritorio"
+	IDS_MYCOMPUTER		"Mi PC"
+}
+
+/*
+	context menus
+*/
+STRINGTABLE DISCARDABLE
+{
+	IDS_VIEW_LARGE		"Iconos &grandes"
+	IDS_VIEW_SMALL		"Iconos &pequeños"
+	IDS_VIEW_LIST		"&Lista"
+	IDS_VIEW_DETAILS	"&Detalles"
+	IDS_SELECT		"Seleccionar"
+	IDS_OPEN		"Abrir"
+}
+
+STRINGTABLE DISCARDABLE
+{
+	IDS_CREATEFOLDER_DENIED "No se puede crear nueva carpeta: Permiso denegado."
+	IDS_CREATEFOLDER_CAPTION "Error durante la creación de una nueva carpeta"
+	IDS_DELETEITEM_CAPTION "Confirmar eliminación de archivo"
+	IDS_DELETEFOLDER_CAPTION "Confirmar eliminación de carpeta"
+	IDS_DELETEITEM_TEXT "¿Seguro que desea eliminar '%1'?"
+	IDS_DELETEMULTIPLE_TEXT "¿Seguro que desea eliminar estos %1 elementos?"
+	IDS_OVERWRITEFILE_TEXT "¿Sobreescribir el archivo '%1'?"
+	IDS_OVERWRITEFILE_CAPTION "Confirmar sobreescritura de archivo"
+}
+
+/*	columns in the shellview	*/
+STRINGTABLE
 BEGIN
 	IDS_SHV_COLUMN1         "Archivo"
 	IDS_SHV_COLUMN2         "Tamaño"
@@ -58,3 +178,12 @@ BEGIN
 	IDS_SHV_COLUMN8         "Nombre"
 	IDS_SHV_COLUMN9         "Comentarios"
 END
+
+/* message box strings */
+STRINGTABLE DISCARDABLE
+{
+	IDS_RESTART_TITLE	"Reiniciar"
+	IDS_RESTART_PROMPT	"¿Desea simular un reinicio de Windows?"
+	IDS_SHUTDOWN_TITLE	"Apagar"
+	IDS_SHUTDOWN_PROMPT	"¿Desea terminar su sesión Wine?"
+}
diff --git a/reactos/lib/shell32/shell32_Uk.rc b/reactos/lib/shell32/shell32_Uk.rc
new file mode 100644
index 00000000000..6c71a341e7f
--- /dev/null
+++ b/reactos/lib/shell32/shell32_Uk.rc
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2004 Ilya Korniyko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
+
+MENU_001 MENU DISCARDABLE
+BEGIN
+	MENUITEM "&Âåëèê³ ²êîíêè",	FCIDM_SHVIEW_BIGICON
+	MENUITEM "&Ìàë³ ²êîíêè",	FCIDM_SHVIEW_SMALLICON
+	MENUITEM "&Ñïèñîê",		FCIDM_SHVIEW_LISTVIEW
+	MENUITEM "&Ïîäðîáèö³",		FCIDM_SHVIEW_REPORTVIEW
+END
+
+/*
+ shellview background menu
+*/
+MENU_002 MENU DISCARDABLE
+BEGIN
+	POPUP""
+	BEGIN
+	  POPUP "&Âèãëÿä"
+	  BEGIN
+	    MENUITEM "&Âåëèê³ ²êîíêè",	FCIDM_SHVIEW_BIGICON
+	    MENUITEM "&Ìàë³ ²êîíêè",	FCIDM_SHVIEW_SMALLICON
+	    MENUITEM "&Ñïèñîê",		FCIDM_SHVIEW_LISTVIEW
+	    MENUITEM "&Ïîäðîáèö³",	FCIDM_SHVIEW_REPORTVIEW
+	  END
+	  MENUITEM SEPARATOR
+	  POPUP "Âïîðÿäêóâàòè &²êîíêè"
+	  BEGIN
+	    MENUITEM "Çà &Íàçâîþ",	0x30	/* column 0 */
+	    MENUITEM "Çà &Òèïîì",	0x32	/* column 2 */
+	    MENUITEM "Çà &Ðîçì³ðîì",	0x31	/* ... */
+	    MENUITEM "Çà &Äàòîþ",	0x33
+	    MENUITEM SEPARATOR
+	    MENUITEM "&Àâòîìàòè÷íî",	FCIDM_SHVIEW_AUTOARRANGE
+	  END
+	  MENUITEM "Âèð³âíÿòè ²êîíêè",	FCIDM_SHVIEW_SNAPTOGRID
+	  MENUITEM SEPARATOR
+	  MENUITEM "Îíîâèòè",		FCIDM_SHVIEW_REFRESH
+	  MENUITEM SEPARATOR
+	  MENUITEM "Âñòàâèòè",		FCIDM_SHVIEW_INSERT
+	  MENUITEM "Âñòàâèòè Ïîñèëàííÿ",	FCIDM_SHVIEW_INSERTLINK
+	  MENUITEM SEPARATOR
+	  POPUP "Ñòâîðèòè"
+	  BEGIN
+	    MENUITEM "Íîâà &Òåêà",	FCIDM_SHVIEW_NEWFOLDER
+	    MENUITEM "Íîâå &Ïîñèëàííÿ",	FCIDM_SHVIEW_NEWLINK
+	    MENUITEM SEPARATOR
+	  END
+	  MENUITEM SEPARATOR
+	  MENUITEM "Âëàñòèâîñò³",	FCIDM_SHVIEW_PROPERTIES
+	END
+END
+
+/*
+ shellview item menu
+*/
+MENU_SHV_FILE MENU DISCARDABLE
+BEGIN
+	POPUP""
+	BEGIN
+	  MENUITEM "&Ïðîâ³äíèê",		FCIDM_SHVIEW_EXPLORE
+	  MENUITEM "&³äêðèòè",		FCIDM_SHVIEW_OPEN
+	  MENUITEM SEPARATOR
+	  MENUITEM "Âè&ð³çàòè",		FCIDM_SHVIEW_CUT
+	  MENUITEM "&Êîï³ÿ",		FCIDM_SHVIEW_COPY
+	  MENUITEM SEPARATOR
+	  MENUITEM "&Ñòâîðèòè Ïîñèëàííÿ",	FCIDM_SHVIEW_CREATELINK
+	  MENUITEM "Âè&äàëèòè",		FCIDM_SHVIEW_DELETE
+	  MENUITEM "Ïåðå&éìåíóâàòè",		FCIDM_SHVIEW_RENAME
+	  MENUITEM SEPARATOR
+	  MENUITEM "&Âëàñòèâîñò³",	FCIDM_SHVIEW_PROPERTIES
+	END
+END
+
+SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK
+CAPTION "Îãëÿä äî òåêè"
+FONT 8, "Helv"
+{
+ DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "³äì³íà", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP
+ LTEXT "", IDD_TITLE, 4, 4, 180, 12
+ LTEXT "", IDD_STATUS, 4, 25, 180, 12
+ CONTROL "", IDD_TREEVIEW, "SysTreeView32",
+ 	TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT |
+	WS_BORDER | WS_TABSTOP,
+	4, 40, 180, 120
+}
+
+SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Ïðî %s"
+FONT 10, "Helv"
+{
+ DEFPUSHBUTTON "OK", IDOK, 153, 130, 50, 12, WS_TABSTOP
+ LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
+ ICON "", 1088, 189, 10, 14, 16
+ LTEXT "", 100, 8, 10, 137, 33
+ LTEXT "Ðîçðîáíèêè Wine:", 98, 8, 55, 137, 10
+}
+
+SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION ""
+FONT 8, "Helv"
+{
+ ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE
+ LTEXT "Ââåä³òü ³ì'ÿ ïðîãðàìè, òåêè, äîêóìåíòó ÷è ðåñóðñ ²íòåðíåòó, ³ Wine â³äêðèº ¿õ.", 12289, 36, 11, 182, 18
+ LTEXT "&³äêðèòè:", 12305, 7, 39, 24, 10
+ CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
+ DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP
+ PUSHBUTTON "³äì³íà", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP
+ PUSHBUTTON "&Îãëÿä...", 12288, 170, 63, 50, 14, WS_TABSTOP
+}
+
+/*
+	special folders
+*/
+STRINGTABLE DISCARDABLE
+{
+	IDS_DESKTOP		"Ñò³ëüíèöÿ"
+	IDS_MYCOMPUTER		"̳é Êîìï'þòåð"
+}
+
+/*
+	context menus
+*/
+STRINGTABLE DISCARDABLE
+{
+	IDS_VIEW_LARGE		"&Âåëèê³ ²êîíêè"
+	IDS_VIEW_SMALL		"&Ìàë³ ²êîíêè"
+	IDS_VIEW_LIST		"&Ñïèñîê"
+	IDS_VIEW_DETAILS	"&Ïîäðîáèö³"
+	IDS_SELECT		"Âè&áðàòè"
+	IDS_OPEN		"³&äêðèòè"
+}
+
+STRINGTABLE DISCARDABLE
+{
+	IDS_CREATEFOLDER_DENIED "Íå âäàëîñÿ ñòâîðèòè íîâó òåêó: ³äìîâà ó äîñòóï³."
+	IDS_CREATEFOLDER_CAPTION "Ïîìèëêà ïðè ñòâîðåíí³ íîâî¿ òåêè"
+	IDS_DELETEITEM_CAPTION "ϳäòâåðäæåííÿ âèëó÷åííÿ ôàéëó"
+	IDS_DELETEFOLDER_CAPTION "ϳäòâåðäæåííÿ âèëó÷åííÿ òåêè"
+	IDS_DELETEITEM_TEXT "Âè âïåâíåí³, ùî õî÷åòå âèëó÷èòè '%1'?"
+	IDS_DELETEMULTIPLE_TEXT "Âè âïåâíåí³, ùî õî÷åòå âèëó÷èòè ö³ %1 åëåìåíòè(³â)?"
+	IDS_OVERWRITEFILE_TEXT "Ïåðåïèñàòè Ôàéë %1?"
+	IDS_OVERWRITEFILE_CAPTION "ϳäòâåðäæåííÿ Ïåðåçàïèñó Ôàéëó"
+}
+
+/*	columns in the shellview	*/
+STRINGTABLE
+BEGIN
+	IDS_SHV_COLUMN1		"Ôàéë"
+	IDS_SHV_COLUMN2		"Ðîçì³ð"
+	IDS_SHV_COLUMN3		"Òèï"
+	IDS_SHV_COLUMN4		"Çì³íåíî"
+	IDS_SHV_COLUMN5		"Àòðèáóòè"
+	IDS_SHV_COLUMN6		"Ðîçì³ð"
+	IDS_SHV_COLUMN7		"³ëüíèé Ðîçì³ð"
+END
diff --git a/reactos/lib/shell32/shres.rc b/reactos/lib/shell32/shres.rc
index 69a384ce283..02350abaf56 100644
--- a/reactos/lib/shell32/shres.rc
+++ b/reactos/lib/shell32/shres.rc
@@ -9037,6 +9037,7 @@ END
 #include "shell32_Fr.rc"
 #include "shell32_Hu.rc"
 #include "shell32_It.rc"
+#include "shell32_Ja.rc"
 #include "shell32_Ko.rc"
 #include "shell32_Nl.rc"
 #include "shell32_No.rc"
@@ -9046,6 +9047,6 @@ END
 #include "shell32_Si.rc"
 #include "shell32_Sk.rc"
 #include "shell32_Sv.rc"
+#include "shell32_Uk.rc"
 #include "shell32_Wa.rc"
-#include "shell32_Ja.rc"
 #include "shell32_Zh.rc"

From bd1c1f6d7b1defb85dd33d2f7f4b6467c8cec253 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Mon, 12 Jul 2004 22:01:22 +0000
Subject: [PATCH 277/356] Fix syntax problem for some windres versions

svn path=/trunk/; revision=10099
---
 reactos/lib/shell32/shell32_Es.rc | 4 ++--
 reactos/lib/shell32/shell32_Uk.rc | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/reactos/lib/shell32/shell32_Es.rc b/reactos/lib/shell32/shell32_Es.rc
index 43e2fb8a5b6..d7f94080c9d 100644
--- a/reactos/lib/shell32/shell32_Es.rc
+++ b/reactos/lib/shell32/shell32_Es.rc
@@ -32,7 +32,7 @@ END
 */
 MENU_002 MENU DISCARDABLE
 BEGIN
-	POPUP""
+	POPUP ""
 	BEGIN
 	  POPUP "&Ver"
 	  BEGIN
@@ -74,7 +74,7 @@ END
 */
 MENU_SHV_FILE MENU DISCARDABLE
 BEGIN
-	POPUP""
+	POPUP ""
 	BEGIN
 	  MENUITEM "E&xplorar",			FCIDM_SHVIEW_EXPLORE
 	  MENUITEM "&Abrir",			FCIDM_SHVIEW_OPEN
diff --git a/reactos/lib/shell32/shell32_Uk.rc b/reactos/lib/shell32/shell32_Uk.rc
index 6c71a341e7f..fddb0beb833 100644
--- a/reactos/lib/shell32/shell32_Uk.rc
+++ b/reactos/lib/shell32/shell32_Uk.rc
@@ -31,7 +31,7 @@ END
 */
 MENU_002 MENU DISCARDABLE
 BEGIN
-	POPUP""
+	POPUP ""
 	BEGIN
 	  POPUP "&Âèãëÿä"
 	  BEGIN
@@ -73,7 +73,7 @@ END
 */
 MENU_SHV_FILE MENU DISCARDABLE
 BEGIN
-	POPUP""
+	POPUP ""
 	BEGIN
 	  MENUITEM "&Ïðîâ³äíèê",		FCIDM_SHVIEW_EXPLORE
 	  MENUITEM "&³äêðèòè",		FCIDM_SHVIEW_OPEN

From 0cffba8389fa2dee47c4ed137f8b659ced21a269 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Mon, 12 Jul 2004 22:03:09 +0000
Subject: [PATCH 278/356] Robert Shearman <R.J.Shearman@warwick.ac.uk> - Make
 ole32 a delay-load import of shell32. (except that the ReactOS build system
 doesn't handle delay-load imports yet, so make it a normal import)

svn path=/trunk/; revision=10100
---
 reactos/lib/shell32/Makefile.in           |  4 +-
 reactos/lib/shell32/Makefile.ros-template |  4 +-
 reactos/lib/shell32/clipboard.c           | 37 ---------------
 reactos/lib/shell32/shell32_main.h        | 14 ------
 reactos/lib/shell32/shellole.c            | 39 ++++------------
 reactos/lib/shell32/shellord.c            |  9 ++--
 reactos/lib/shell32/shlview.c             | 21 +++------
 reactos/lib/shell32/shv_item_cmenu.c      | 56 +++--------------------
 8 files changed, 29 insertions(+), 155 deletions(-)

diff --git a/reactos/lib/shell32/Makefile.in b/reactos/lib/shell32/Makefile.in
index 7f2fe6052c1..01b637d52b1 100644
--- a/reactos/lib/shell32/Makefile.in
+++ b/reactos/lib/shell32/Makefile.in
@@ -4,8 +4,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shell32.dll
-# fixme: avoid ole32.dll import
-IMPORTS   = ole32 shlwapi comctl32 user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = shlwapi comctl32 user32 gdi32 advapi32 kernel32
+DELAYIMPORTS = ole32
 ALTNAMES  = shell.dll
 EXTRALIBS = $(LIBUUID) $(LIBUNICODE)
 
diff --git a/reactos/lib/shell32/Makefile.ros-template b/reactos/lib/shell32/Makefile.ros-template
index 4f5efabbd62..7346ce5b19c 100644
--- a/reactos/lib/shell32/Makefile.ros-template
+++ b/reactos/lib/shell32/Makefile.ros-template
@@ -1,4 +1,4 @@
-# $Id: Makefile.ros-template,v 1.3 2004/05/29 21:24:46 hbirr Exp $
+# $Id: Makefile.ros-template,v 1.4 2004/07/12 22:03:09 gvg Exp $
 
 TARGET_NAME = shell32
 
@@ -6,7 +6,7 @@ TARGET_OBJECTS = @C_SRCS@
 
 TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__
 
-TARGET_SDKLIBS = libwine.a @IMPORTS@ wine_uuid.a
+TARGET_SDKLIBS = libwine.a @IMPORTS@ ole32.a wine_uuid.a ntdll.a
 
 TARGET_BASE = $(TARGET_BASE_LIB_SHELL32)
 
diff --git a/reactos/lib/shell32/clipboard.c b/reactos/lib/shell32/clipboard.c
index ad1e0bf226a..71c929365b9 100644
--- a/reactos/lib/shell32/clipboard.c
+++ b/reactos/lib/shell32/clipboard.c
@@ -52,43 +52,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
-HRESULT (WINAPI *pOleInitialize)(LPVOID reserved);
-void    (WINAPI *pOleUninitialize)(void);
-HRESULT (WINAPI *pRegisterDragDrop)(HWND hwnd, IDropTarget* pDropTarget);
-HRESULT (WINAPI *pRevokeDragDrop)(HWND hwnd);
-HRESULT (WINAPI *pDoDragDrop)(LPDATAOBJECT,LPDROPSOURCE,DWORD,DWORD*);
-void 	(WINAPI *pReleaseStgMedium)(STGMEDIUM* pmedium);
-HRESULT (WINAPI *pOleSetClipboard)(IDataObject* pDataObj);
-HRESULT (WINAPI *pOleGetClipboard)(IDataObject** ppDataObj);
-
-/**************************************************************************
- * GetShellOle
- *
- * make sure OLE32.DLL is loaded
- */
-BOOL GetShellOle(void)
-{
-    static HANDLE hOle32 = NULL;
-    if(!hOle32)
-    {
-        hOle32 = LoadLibraryA("ole32.dll");
-        if(hOle32)
-        {
-            pOleInitialize=(void*)GetProcAddress(hOle32,"OleInitialize");
-            pOleUninitialize=(void*)GetProcAddress(hOle32,"OleUninitialize");
-            pRegisterDragDrop=(void*)GetProcAddress(hOle32,"RegisterDragDrop");
-            pRevokeDragDrop=(void*)GetProcAddress(hOle32,"RevokeDragDrop");
-            pDoDragDrop=(void*)GetProcAddress(hOle32,"DoDragDrop");
-            pReleaseStgMedium=(void*)GetProcAddress(hOle32,"ReleaseStgMedium");
-            pOleSetClipboard=(void*)GetProcAddress(hOle32,"OleSetClipboard");
-            pOleGetClipboard=(void*)GetProcAddress(hOle32,"OleGetClipboard");
-
-            pOleInitialize(NULL);
-        }
-    }
-    return TRUE;
-}
-
 /**************************************************************************
  * RenderHDROP
  *
diff --git a/reactos/lib/shell32/shell32_main.h b/reactos/lib/shell32/shell32_main.h
index 6ecdabe776c..7787fb4a121 100644
--- a/reactos/lib/shell32/shell32_main.h
+++ b/reactos/lib/shell32/shell32_main.h
@@ -130,20 +130,6 @@ HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uI
 BOOL SYSTRAY_Init(void);
 #endif
 
-/* OLE32 */
-extern HINSTANCE hShellOle32;
-
-extern HRESULT (WINAPI *pOleInitialize)(LPVOID reserved);
-extern void    (WINAPI *pOleUninitialize)(void);
-extern HRESULT (WINAPI *pRegisterDragDrop)(HWND hwnd, IDropTarget* pDropTarget);
-extern HRESULT (WINAPI *pRevokeDragDrop)(HWND hwnd);
-extern HRESULT (WINAPI *pDoDragDrop)(LPDATAOBJECT,LPDROPSOURCE,DWORD,DWORD*);
-extern void    (WINAPI *pReleaseStgMedium)(STGMEDIUM* pmedium);
-extern HRESULT (WINAPI *pOleSetClipboard)(IDataObject* pDataObj);
-extern HRESULT (WINAPI *pOleGetClipboard)(IDataObject** ppDataObj);
-extern HRESULT (WINAPI *pCoCreateInstance)(REFCLSID rclsid, LPUNKNOWN pUnkOuter, DWORD dwClsContext, REFIID iid, LPVOID *ppv);
-
-BOOL GetShellOle(void);
 
 HGLOBAL RenderHDROP(LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl);
 HGLOBAL RenderSHELLIDLIST (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl);
diff --git a/reactos/lib/shell32/shellole.c b/reactos/lib/shell32/shellole.c
index ccced91b89a..56acf78e81e 100644
--- a/reactos/lib/shell32/shellole.c
+++ b/reactos/lib/shell32/shellole.c
@@ -71,30 +71,6 @@ struct {
 	{NULL,NULL}
 };
 
-/*************************************************************************
- * __CoCreateInstance [internal]
- *
- * NOTES
- *   wraper for late bound call to OLE32.DLL
- *
- */
-HRESULT (WINAPI *pCoCreateInstance)(REFCLSID rclsid, LPUNKNOWN pUnkOuter, DWORD dwClsContext, REFIID iid, LPVOID *ppv) = NULL;
-
-void * __GetExternalFunc(HMODULE * phModule, LPCWSTR szModuleName, LPCSTR szProcName)
-{
-	if (!*phModule) *phModule = GetModuleHandleW(szModuleName);
-	if (!*phModule) *phModule = LoadLibraryW(szModuleName);
-	if (*phModule) return GetProcAddress(*phModule, szProcName);
-	return NULL;
-}
-
-HRESULT  __CoCreateInstance(REFCLSID rclsid, LPUNKNOWN pUnkOuter, DWORD dwClsContext, REFIID iid, LPVOID *ppv)
-{
-	if(!pCoCreateInstance) pCoCreateInstance = __GetExternalFunc(&hShellOle32, sOLE32, "CoCreateInstance");
-	if(!pCoCreateInstance) return E_FAIL;
-	return pCoCreateInstance(rclsid, pUnkOuter, dwClsContext, iid, ppv);
-}
-
 /*************************************************************************
  * SHCoCreateInstance [SHELL32.102]
  *
@@ -211,7 +187,7 @@ LRESULT WINAPI SHCoCreateInstance(
 	} else {
 
 	    /* load a external dll in the usual way */
-	    hres = __CoCreateInstance(myclsid, pUnkOuter, CLSCTX_INPROC_SERVER, refiid, ppv);
+	    hres = CoCreateInstance(myclsid, pUnkOuter, CLSCTX_INPROC_SERVER, refiid, ppv);
 	    goto end;
 	}
 
@@ -437,17 +413,18 @@ static ICOM_VTABLE(IMalloc) VT_Shell_IMalloc32 =
  */
 HRESULT WINAPI SHGetMalloc(LPMALLOC *lpmal)
 {
-	HRESULT (WINAPI *pCoGetMalloc)(DWORD,LPMALLOC *);
-	HMODULE hOle32;
-
 	TRACE("(%p)\n", lpmal);
 
 	if (!ShellTaskAllocator)
 	{
-		hOle32 = GetModuleHandleA("OLE32.DLL");
+		HMODULE hOle32 = GetModuleHandleA("OLE32.DLL");
+		/* this is very suspect. we should not being using a different
+		 * allocator from deallocator based on something undeterministic
+		 * like whether ole32 is loaded. as it happens currently, they
+		 * both map to the same allocator deep down, but this could
+		 * change in the future. */
 		if(hOle32) {
-			pCoGetMalloc = (void*) GetProcAddress(hOle32, "CoGetMalloc");
-			if (pCoGetMalloc) pCoGetMalloc(MEMCTX_TASK, &ShellTaskAllocator);
+			CoGetMalloc(MEMCTX_TASK, &ShellTaskAllocator);
 			TRACE("got ole32 IMalloc\n");
 		}
 		if(!ShellTaskAllocator) {
diff --git a/reactos/lib/shell32/shellord.c b/reactos/lib/shell32/shellord.c
index d6521fa4b75..c16b66255d2 100644
--- a/reactos/lib/shell32/shellord.c
+++ b/reactos/lib/shell32/shellord.c
@@ -426,8 +426,7 @@ HRESULT WINAPI SHRegisterDragDrop(
 	LPDROPTARGET pDropTarget)
 {
 	FIXME("(%p,%p):stub.\n", hWnd, pDropTarget);
-	if (GetShellOle()) return pRegisterDragDrop(hWnd, pDropTarget);
-        return 0;
+	return RegisterDragDrop(hWnd, pDropTarget);
 }
 
 /*************************************************************************
@@ -439,8 +438,7 @@ HRESULT WINAPI SHRegisterDragDrop(
 HRESULT WINAPI SHRevokeDragDrop(HWND hWnd)
 {
     FIXME("(%p):stub.\n",hWnd);
-    if (GetShellOle()) return pRevokeDragDrop(hWnd);
-    return 0;
+    return RevokeDragDrop(hWnd);
 }
 
 /*************************************************************************
@@ -458,8 +456,7 @@ HRESULT WINAPI SHDoDragDrop(
 {
     FIXME("(%p %p %p 0x%08lx %p):stub.\n",
     hWnd, lpDataObject, lpDropSource, dwOKEffect, pdwEffect);
-	if (GetShellOle()) return pDoDragDrop(lpDataObject, lpDropSource, dwOKEffect, pdwEffect);
-        return 0;
+	return DoDragDrop(lpDataObject, lpDropSource, dwOKEffect, pdwEffect);
 }
 
 /*************************************************************************
diff --git a/reactos/lib/shell32/shlview.c b/reactos/lib/shell32/shlview.c
index adae9a68c6b..ec0ebb2017c 100644
--- a/reactos/lib/shell32/shlview.c
+++ b/reactos/lib/shell32/shlview.c
@@ -656,13 +656,10 @@ static LRESULT ShellView_OnCreate(IShellViewImpl * This)
 	  }
 	}
 
-	if(GetShellOle() && pRegisterDragDrop)
+	if (SUCCEEDED(IShellFolder_CreateViewObject(This->pSFParent, This->hWnd, &IID_IDropTarget, (LPVOID*)&pdt)))
 	{
-	  if (SUCCEEDED(IShellFolder_CreateViewObject(This->pSFParent, This->hWnd, &IID_IDropTarget, (LPVOID*)&pdt)))
-	  {
-	    pRegisterDragDrop(This->hWnd, pdt);
+	    RegisterDragDrop(This->hWnd, pdt);
 	    IDropTarget_Release(pdt);
-	  }
 	}
 
 	/* register for receiving notifications */
@@ -1343,10 +1340,8 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn
 	      DWORD dwAttributes = SFGAO_CANLINK;
 	      DWORD dwEffect = DROPEFFECT_COPY | DROPEFFECT_MOVE;
 
-	      if(GetShellOle() && pDoDragDrop)
+	      if (SUCCEEDED(IShellFolder_GetUIObjectOf(This->pSFParent, This->hWnd, This->cidl, (LPCITEMIDLIST*)This->apidl, &IID_IDataObject,0,(LPVOID *)&pda)))
 	      {
-	        if (SUCCEEDED(IShellFolder_GetUIObjectOf(This->pSFParent, This->hWnd, This->cidl, (LPCITEMIDLIST*)This->apidl, &IID_IDataObject,0,(LPVOID *)&pda)))
-	        {
 	          IDropSource * pds = (IDropSource*)&(This->lpvtblDropSource);	/* own DropSource interface */
 
 	  	  if (SUCCEEDED(IShellFolder_GetAttributesOf(This->pSFParent, This->cidl, (LPCITEMIDLIST*)This->apidl, &dwAttributes)))
@@ -1360,10 +1355,9 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn
 	          if (pds)
 	          {
 	            DWORD dwEffect;
-		    pDoDragDrop(pda, pds, dwEffect, &dwEffect);
+		    DoDragDrop(pda, pds, dwEffect, &dwEffect);
 		  }
 	          IDataObject_Release(pda);
-	        }
 	      }
 	    }
 	    break;
@@ -1568,10 +1562,9 @@ static LRESULT CALLBACK ShellView_WndProc(HWND hWnd, UINT uMessage, WPARAM wPara
 
 	  case WM_GETDLGCODE:   return SendMessageA(pThis->hWndList,uMessage,0,0);
 
-	  case WM_DESTROY:	if(GetShellOle() && pRevokeDragDrop)
-				{
-	  			  pRevokeDragDrop(pThis->hWnd);
-				}
+
+	  case WM_DESTROY:	
+	  			RevokeDragDrop(pThis->hWnd);
 				SHChangeNotifyDeregister(pThis->hNotify);
 	                        break;
 
diff --git a/reactos/lib/shell32/shv_item_cmenu.c b/reactos/lib/shell32/shv_item_cmenu.c
index c5beee9be7a..a9c4cb6221e 100644
--- a/reactos/lib/shell32/shv_item_cmenu.c
+++ b/reactos/lib/shell32/shv_item_cmenu.c
@@ -366,62 +366,20 @@ static BOOL DoCopyOrCut(
 
 	TRACE("(%p)->(wnd=%p,bCut=0x%08x)\n",This, hwnd, bCut);
 
-	if(GetShellOle())
+	/* get the active IShellView */
+	if ((lpSB = (LPSHELLBROWSER)SendMessageA(hwnd, CWM_GETISHELLBROWSER,0,0)))
 	{
-	  /* get the active IShellView */
-	  if ((lpSB = (LPSHELLBROWSER)SendMessageA(hwnd, CWM_GETISHELLBROWSER,0,0)))
+	  if (SUCCEEDED(IShellBrowser_QueryActiveShellView(lpSB, &lpSV)))
 	  {
-	    if (SUCCEEDED(IShellBrowser_QueryActiveShellView(lpSB, &lpSV)))
+	    if (SUCCEEDED(IShellView_GetItemObject(lpSV, SVGIO_SELECTION, &IID_IDataObject, (LPVOID*)&lpDo)))
 	    {
-	      if (SUCCEEDED(IShellView_GetItemObject(lpSV, SVGIO_SELECTION, &IID_IDataObject, (LPVOID*)&lpDo)))
-	      {
-	        pOleSetClipboard(lpDo);
-	        IDataObject_Release(lpDo);
-	      }
-	      IShellView_Release(lpSV);
+	      OleSetClipboard(lpDo);
+	      IDataObject_Release(lpDo);
 	    }
+	    IShellView_Release(lpSV);
 	  }
 	}
 	return TRUE;
-#if 0
-/*
-  the following code does the copy operation witout ole32.dll
-  we might need this possibility too (js)
-*/
-	BOOL bSuccess = FALSE;
-
-	TRACE("(%p)\n", iface);
-
-	if(OpenClipboard(NULL))
-	{
-	  if(EmptyClipboard())
-	  {
-	    IPersistFolder2 * ppf2;
-	    IShellFolder_QueryInterface(This->pSFParent, &IID_IPersistFolder2, (LPVOID*)&ppf2);
-	    if (ppf2)
-	    {
-	      LPITEMIDLIST pidl;
-	      IPersistFolder2_GetCurFolder(ppf2, &pidl);
-	      if(pidl)
-	      {
-	        HGLOBAL hMem;
-
-		hMem = RenderHDROP(pidl, This->apidl, This->cidl);
-
-		if(SetClipboardData(CF_HDROP, hMem))
-		{
-		  bSuccess = TRUE;
-		}
-	        SHFree(pidl);
-	      }
-	      IPersistFolder2_Release(ppf2);
-	    }
-
-	  }
-	  CloseClipboard();
-	}
- 	return bSuccess;
-#endif
 }
 /**************************************************************************
 * ISvItemCm_fnInvokeCommand()

From 9a26dd9c781539cae83775f5734ed71d01a42a7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Mon, 12 Jul 2004 22:07:34 +0000
Subject: [PATCH 279/356] Fix RestartDialog() and RestartDialogEx() prototypes

svn path=/trunk/; revision=10101
---
 reactos/w32api/include/shlobj.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reactos/w32api/include/shlobj.h b/reactos/w32api/include/shlobj.h
index 761d35286dd..f71f632d93f 100644
--- a/reactos/w32api/include/shlobj.h
+++ b/reactos/w32api/include/shlobj.h
@@ -1637,8 +1637,8 @@ void WINAPI ILFree(LPITEMIDLIST);
 HRESULT WINAPI SHCoCreateInstance(LPCWSTR,REFCLSID,IUnknown*,REFIID,void**);
 #endif
 
-int WINAPI RestartDialog(HWND,LPCWSTR,UINT);
-int WINAPI RestartDialogEx(HWND,LPCWSTR,UINT,UINT);
+int WINAPI RestartDialog(HWND,LPCWSTR,DWORD);
+int WINAPI RestartDialogEx(HWND,LPCWSTR,DWORD,DWORD);
 
 ULONG WINAPI SHChangeNotifyRegister(HWND,int,LONG,UINT,int,SHChangeNotifyEntry *);
 BOOL WINAPI SHChangeNotifyDeregister(ULONG);

From 1605dba90a290daa3fa01ef361f14f35bbde56bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Mon, 12 Jul 2004 22:34:27 +0000
Subject: [PATCH 280/356] SetLogonNotifyWindow is now implemented

svn path=/trunk/; revision=10102
---
 reactos/lib/user32/misc/stubs.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/reactos/lib/user32/misc/stubs.c b/reactos/lib/user32/misc/stubs.c
index ee758dbb71e..c0f0e938164 100644
--- a/reactos/lib/user32/misc/stubs.c
+++ b/reactos/lib/user32/misc/stubs.c
@@ -1,4 +1,4 @@
-/* $Id: stubs.c,v 1.63 2004/05/21 10:09:31 weiden Exp $
+/* $Id: stubs.c,v 1.64 2004/07/12 22:34:27 gvg Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
@@ -372,17 +372,6 @@ RegisterTasklist ( DWORD x )
   return FALSE;
 }
 
-/*
- * @unimplemented
- */
-DWORD
-STDCALL
-SetLogonNotifyWindow ( HWINSTA hwinsta, HWND hwnd )
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
 /*
  * @unimplemented
  */

From 6e5edb7df94ee1f7956e30b2c58fbd6ee1d2cd65 Mon Sep 17 00:00:00 2001
From: James Tabor <james.tabor@reactos.org>
Date: Tue, 13 Jul 2004 02:43:06 +0000
Subject: [PATCH 281/356] Force a rebuild of the partition table if it already
 exists with a DeviceObject.

svn path=/trunk/; revision=10103
---
 reactos/drivers/storage/disk/disk.c | 36 +++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/reactos/drivers/storage/disk/disk.c b/reactos/drivers/storage/disk/disk.c
index f457bc3bbc0..5a529d7b58d 100644
--- a/reactos/drivers/storage/disk/disk.c
+++ b/reactos/drivers/storage/disk/disk.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: disk.c,v 1.44 2004/07/05 21:42:05 hbirr Exp $
+/* $Id: disk.c,v 1.45 2004/07/13 02:43:06 jimtabor Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -870,13 +870,29 @@ DiskBuildPartitionTable(IN PDEVICE_OBJECT DiskDeviceObject,
       return Status;
     }
 
+/* 
+   A previous partition table may exist for this Device Object.
+   We will need to delete this data and force a rebuild.
+ */
+  if(DiskDeviceExtension->StartingOffset.QuadPart)
+  {
+     DPRINT("Partition already installed!\n");
+     DiskData->PartitionType = 0;
+     DiskData->PartitionNumber = 0;
+     DiskData->PartitionOrdinal = 0;
+     DiskData->HiddenSectors = 0;
+     DiskData->BootIndicator = 0;
+     DiskData->DriveNotReady = FALSE;
+     DiskDeviceExtension->StartingOffset.QuadPart = 0;
+     DiskDeviceExtension->PartitionLength.QuadPart = 0;
+  }
+
   /* Read partition table */
-  Status = IoReadPartitionTable(DiskDeviceExtension->PhysicalDevice,
+  Status = IoReadPartitionTable(DiskDeviceObject,
 				DiskDeviceExtension->DiskGeometry->BytesPerSector,
 				TRUE,
 				&PartitionList);
 
-
   DPRINT("IoReadPartitionTable(): Status: %lx\n", Status);
 
   if (!NT_SUCCESS(Status))
@@ -925,14 +941,14 @@ DiskBuildPartitionTable(IN PDEVICE_OBJECT DiskDeviceObject,
 	}
       else
         {
-      	  DiskData->PartitionType = 0;
-      	  DiskData->PartitionNumber = 1;
-      	  DiskData->PartitionOrdinal = 0;
-          DiskData->HiddenSectors = 0;
- 	  DiskData->BootIndicator = 0;
-  	  DiskData->DriveNotReady = FALSE;
-          DiskDeviceExtension->PartitionLength.QuadPart += DiskDeviceExtension->StartingOffset.QuadPart;
+	  DiskData->PartitionType = 0;
+	  DiskData->PartitionNumber = 1;
+	  DiskData->PartitionOrdinal = 0;
+	  DiskData->HiddenSectors = 0;
+	  DiskData->BootIndicator = 0;
+	  DiskData->DriveNotReady = FALSE;
 	  DiskDeviceExtension->StartingOffset.QuadPart = 0;
+	  DiskDeviceExtension->PartitionLength.QuadPart += DiskDeviceExtension->StartingOffset.QuadPart;
 	}    
     }
 

From eda69bc46ff85f60d13ea80882f338e015f0dab3 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Tue, 13 Jul 2004 08:43:35 +0000
Subject: [PATCH 282/356] NtDuplicateToken() must create and return a handle to
 the duplicated token.

svn path=/trunk/; revision=10104
---
 reactos/ntoskrnl/se/token.c | 79 +++++++++++++++++++++++--------------
 1 file changed, 50 insertions(+), 29 deletions(-)

diff --git a/reactos/ntoskrnl/se/token.c b/reactos/ntoskrnl/se/token.c
index f929bdffd76..003300c2bbb 100644
--- a/reactos/ntoskrnl/se/token.c
+++ b/reactos/ntoskrnl/se/token.c
@@ -1,4 +1,4 @@
-/* $Id: token.c,v 1.36 2004/07/06 22:07:26 gvg Exp $
+/* $Id: token.c,v 1.37 2004/07/13 08:43:35 ekohl Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -827,40 +827,61 @@ NtDuplicateToken(IN HANDLE ExistingTokenHandle,
 		 IN TOKEN_TYPE TokenType,
 		 OUT PHANDLE NewTokenHandle)
 {
-   PACCESS_TOKEN Token;
-   PACCESS_TOKEN NewToken;
-   NTSTATUS Status;
-   ULONG ExistingImpersonationLevel;
-   
-   Status = ObReferenceObjectByHandle(ExistingTokenHandle,
-				      TOKEN_DUPLICATE,
-				      SepTokenObjectType,
-				      UserMode,
-				      (PVOID*)&Token,
-				      NULL);
-   if (!NT_SUCCESS(Status))
+  KPROCESSOR_MODE PreviousMode;
+  PACCESS_TOKEN Token;
+  PACCESS_TOKEN NewToken;
+  NTSTATUS Status;
+  ULONG ExistingImpersonationLevel;
+
+  PreviousMode = KeGetPreviousMode();
+  Status = ObReferenceObjectByHandle(ExistingTokenHandle,
+				     TOKEN_DUPLICATE,
+				     SepTokenObjectType,
+				     PreviousMode,
+				     (PVOID*)&Token,
+				     NULL);
+  if (!NT_SUCCESS(Status))
     {
-      DPRINT1 ("Failed to reference token (Status %lx)\n", Status);
-      return Status;
-    }
-   
-   ExistingImpersonationLevel = Token->ImpersonationLevel;
-   Status = SepDuplicateToken(Token,
-		     ObjectAttributes,
-		     ImpersonationLevel,
-		     TokenType,
-		     ExistingImpersonationLevel,
-		     KeGetPreviousMode(),
-		     &NewToken);
-   if (!NT_SUCCESS(Status))
-    {
-      DPRINT1 ("Failed to duplicate token (Status %lx)\n", Status);
+      DPRINT1("Failed to reference token (Status %lx)\n", Status);
       return Status;
     }
 
-   return STATUS_SUCCESS;
+  ExistingImpersonationLevel = Token->ImpersonationLevel;
+  Status = SepDuplicateToken(Token,
+			     ObjectAttributes,
+			     TokenType,
+			     ImpersonationLevel,
+			     ExistingImpersonationLevel,
+			     PreviousMode,
+			     &NewToken);
+
+  ObDereferenceObject(Token);
+
+  if (!NT_SUCCESS(Status))
+    {
+      DPRINT1("Failed to duplicate token (Status %lx)\n", Status);
+      return Status;
+    }
+
+  Status = ObInsertObject((PVOID)NewToken,
+			  NULL,
+			  DesiredAccess,
+			  0,
+			  NULL,
+			  NewTokenHandle);
+
+  ObDereferenceObject(NewToken);
+
+  if (!NT_SUCCESS(Status))
+    {
+      DPRINT1("Failed to create token handle (Status %lx)\n");
+      return Status;
+    }
+
+  return STATUS_SUCCESS;
 }
 
+
 VOID SepAdjustGroups(PACCESS_TOKEN Token,
 		     ULONG a,
 		     BOOLEAN ResetToDefault,

From 3ed7b52fb99dafa358437d022c91cb6f5eba0436 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Tue, 13 Jul 2004 11:48:32 +0000
Subject: [PATCH 283/356] NtOpenThreadToken() opens the thread token if
 OpenAsSelf is FALSE.

svn path=/trunk/; revision=10105
---
 reactos/ntoskrnl/ps/create.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/reactos/ntoskrnl/ps/create.c b/reactos/ntoskrnl/ps/create.c
index 7ac5cba25c7..5539cc02237 100644
--- a/reactos/ntoskrnl/ps/create.c
+++ b/reactos/ntoskrnl/ps/create.c
@@ -1,4 +1,4 @@
-/* $Id: create.c,v 1.74 2004/07/10 17:01:03 hbirr Exp $
+/* $Id: create.c,v 1.75 2004/07/13 11:48:32 ekohl Exp $
  *
  * COPYRIGHT:              See COPYING in the top level directory
  * PROJECT:                ReactOS kernel
@@ -64,9 +64,9 @@ PsAssignImpersonationToken(PETHREAD Thread,
    if (TokenHandle != NULL)
      {
 	Status = ObReferenceObjectByHandle(TokenHandle,
-					   0,
+					   TOKEN_IMPERSONATE,
 					   SepTokenObjectType,
-					   UserMode,
+					   KeGetPreviousMode(),
 					   (PVOID*)&Token,
 					   NULL);
 	if (!NT_SUCCESS(Status))
@@ -83,13 +83,14 @@ PsAssignImpersonationToken(PETHREAD Thread,
 
    PsImpersonateClient(Thread,
 		       Token,
-		       0,
-		       0,
+		       FALSE,
+		       FALSE,
 		       ImpersonationLevel);
    if (Token != NULL)
      {
 	ObDereferenceObject(Token);
      }
+
    return(STATUS_SUCCESS);
 }
 
@@ -260,6 +261,10 @@ NtOpenThreadToken (IN HANDLE ThreadHandle,
      }
 
   if (OpenAsSelf)
+    {
+      Token = Thread->ThreadsProcess->Token;
+    }
+  else
     {
       if (Thread->ActiveImpersonationInfo == FALSE)
 	{
@@ -269,10 +274,6 @@ NtOpenThreadToken (IN HANDLE ThreadHandle,
 
       Token = Thread->ImpersonationInfo->Token;
     }
-  else
-    {
-      Token = Thread->ThreadsProcess->Token;
-    }
 
   if (Token == NULL)
     {

From 3e7bd9bd7901155b78b4ce6d964bfa7c4b1741c2 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Tue, 13 Jul 2004 11:52:09 +0000
Subject: [PATCH 284/356] RtlImpersonateSelf(): Set impersonation level in call
 to NtDuplicateToken().

svn path=/trunk/; revision=10106
---
 reactos/lib/rtl/security.c | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/reactos/lib/rtl/security.c b/reactos/lib/rtl/security.c
index c50ec28863d..6939ed8d7d9 100644
--- a/reactos/lib/rtl/security.c
+++ b/reactos/lib/rtl/security.c
@@ -1,4 +1,4 @@
-/* $Id: security.c,v 1.1 2004/05/31 19:29:02 gdalsnes Exp $
+/* $Id: security.c,v 1.2 2004/07/13 11:52:09 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -24,8 +24,6 @@
 NTSTATUS STDCALL
 RtlImpersonateSelf(IN SECURITY_IMPERSONATION_LEVEL ImpersonationLevel)
 {
-   OBJECT_ATTRIBUTES ObjectAttributes;
-   SECURITY_QUALITY_OF_SERVICE SecQos;
    HANDLE ProcessToken;
    HANDLE ImpersonationToken;
    NTSTATUS Status;
@@ -34,28 +32,20 @@ RtlImpersonateSelf(IN SECURITY_IMPERSONATION_LEVEL ImpersonationLevel)
                                TOKEN_DUPLICATE,
                                &ProcessToken);
    if (!NT_SUCCESS(Status))
+   {
+      DPRINT1("NtOpenProcessToken() failed (Status %lx)\n", Status);
       return(Status);
-
-   SecQos.Length = sizeof(SECURITY_QUALITY_OF_SERVICE);
-   SecQos.ImpersonationLevel = ImpersonationLevel;
-   SecQos.ContextTrackingMode = SECURITY_DYNAMIC_TRACKING;
-   SecQos.EffectiveOnly = FALSE;
-
-   ObjectAttributes.Length = sizeof(OBJECT_ATTRIBUTES);
-   ObjectAttributes.RootDirectory = 0;
-   ObjectAttributes.ObjectName = NULL;
-   ObjectAttributes.Attributes = 0;
-   ObjectAttributes.SecurityDescriptor = NULL;
-   ObjectAttributes.SecurityQualityOfService = &SecQos;
+   }
 
    Status = NtDuplicateToken(ProcessToken,
                              TOKEN_IMPERSONATE,
-                             &ObjectAttributes,
-                             0,
+                             NULL,
+                             ImpersonationLevel,
                              TokenImpersonation,
                              &ImpersonationToken);
    if (!NT_SUCCESS(Status))
    {
+      DPRINT1("NtDuplicateToken() failed (Status %lx)\n", Status);
       NtClose(ProcessToken);
       return(Status);
    }
@@ -64,6 +54,11 @@ RtlImpersonateSelf(IN SECURITY_IMPERSONATION_LEVEL ImpersonationLevel)
                                    ThreadImpersonationToken,
                                    &ImpersonationToken,
                                    sizeof(HANDLE));
+   if (!NT_SUCCESS(Status))
+   {
+     DPRINT1("NtSetInformationThread() failed (Status %lx)\n", Status);
+   }
+
    NtClose(ImpersonationToken);
    NtClose(ProcessToken);
 

From 4cc77e37cc8d1a7d42a4c7d686a11fc5f1f64421 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Tue, 13 Jul 2004 16:57:35 +0000
Subject: [PATCH 285/356] Move some access rights so they are usable form
 kernel-mode.

svn path=/trunk/; revision=10107
---
 reactos/include/defines.h    | 2 --
 reactos/include/ntos/ntdef.h | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/reactos/include/defines.h b/reactos/include/defines.h
index ffd0b5fc647..e9602ebfab4 100644
--- a/reactos/include/defines.h
+++ b/reactos/include/defines.h
@@ -534,8 +534,6 @@ extern "C" {
 #define PIPE_ACCESS_DUPLEX	(3)
 #define PIPE_ACCESS_INBOUND	(1)
 #define PIPE_ACCESS_OUTBOUND	(2)
-#define WRITE_DAC	(0x40000L)
-#define WRITE_OWNER	(0x80000L)
 #define ACCESS_SYSTEM_SECURITY	(0x1000000L)
 #define PIPE_TYPE_BYTE	(0)
 #define PIPE_TYPE_MESSAGE	(4)
diff --git a/reactos/include/ntos/ntdef.h b/reactos/include/ntos/ntdef.h
index 0230201ad3d..cfa22d98110 100644
--- a/reactos/include/ntos/ntdef.h
+++ b/reactos/include/ntos/ntdef.h
@@ -19,6 +19,8 @@
 
 #define DELETE		(0x00010000L)
 #define READ_CONTROL	(0x00020000L)
+#define WRITE_DAC	(0x00040000L)
+#define WRITE_OWNER	(0x00080000L)
 #define SYNCHRONIZE	(0x00100000L)
 
 #define DUPLICATE_CLOSE_SOURCE	(1)

From 91946de006790401796272ee91962df209c5db2f Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Tue, 13 Jul 2004 16:59:35 +0000
Subject: [PATCH 286/356] First experimental implementstion of NtAccessCheck().
 This should fix bug #362.

svn path=/trunk/; revision=10108
---
 reactos/ntoskrnl/se/semgr.c | 249 +++++++++++++++++++++++++++---------
 1 file changed, 189 insertions(+), 60 deletions(-)

diff --git a/reactos/ntoskrnl/se/semgr.c b/reactos/ntoskrnl/se/semgr.c
index 47f8e98b696..88c0a0e726a 100644
--- a/reactos/ntoskrnl/se/semgr.c
+++ b/reactos/ntoskrnl/se/semgr.c
@@ -1,4 +1,4 @@
-/* $Id: semgr.c,v 1.31 2004/07/12 12:04:17 ekohl Exp $
+/* $Id: semgr.c,v 1.32 2004/07/13 16:59:35 ekohl Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -201,21 +201,6 @@ NtAllocateUuids(PULARGE_INTEGER Time,
 }
 
 
-NTSTATUS STDCALL
-NtAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
-	      IN HANDLE ClientToken,
-	      IN ACCESS_MASK DesiredAccess,
-	      IN PGENERIC_MAPPING GenericMapping,
-	      OUT PPRIVILEGE_SET PrivilegeSet,
-	      OUT PULONG ReturnLength,
-	      OUT PACCESS_MASK GrantedAccess,
-	      OUT PNTSTATUS AccessStatus)
-{
-  UNIMPLEMENTED;
-  return(STATUS_NOT_IMPLEMENTED);
-}
-
-
 /*
  * @implemented
  */
@@ -404,46 +389,35 @@ SeAssignSecurity(PSECURITY_DESCRIPTOR ParentDescriptor,
 #endif
 }
 
-BOOLEAN SepSidInToken(PACCESS_TOKEN Token,
-		      PSID Sid)
+
+static BOOLEAN
+SepSidInToken(PACCESS_TOKEN Token,
+	      PSID Sid)
 {
-   ULONG i;
-   
-   if (Token->UserAndGroupCount == 0)
-     {
-	return(FALSE);
-     }
-   
-   for (i=0; i<Token->UserAndGroupCount; i++)
-     {
-	if (RtlEqualSid(Sid, Token->UserAndGroups[i].Sid))
-	  {
-	     if (i == 0 ||
-		 (!(Token->UserAndGroups[i].Attributes & SE_GROUP_ENABLED)))
-	       {
-		  return(TRUE);
-	       }
-	     return(FALSE);
-	  }
-     }
-   return(FALSE);
+  ULONG i;
+
+  if (Token->UserAndGroupCount == 0)
+  {
+    return FALSE;
+  }
+
+  for (i=0; i<Token->UserAndGroupCount; i++)
+  {
+    if (RtlEqualSid(Sid, Token->UserAndGroups[i].Sid))
+    {
+      if (Token->UserAndGroups[i].Attributes & SE_GROUP_ENABLED)
+      {
+        return TRUE;
+      }
+
+      return FALSE;
+    }
+  }
+
+  return FALSE;
 }
 
 
-/*
- * @implemented
- */
-BOOLEAN STDCALL
-SeAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
-	      IN PSECURITY_SUBJECT_CONTEXT SubjectSecurityContext,
-	      IN BOOLEAN SubjectContextLocked,
-	      IN ACCESS_MASK DesiredAccess,
-	      IN ACCESS_MASK PreviouslyGrantedAccess,
-	      OUT PPRIVILEGE_SET* Privileges,
-	      IN PGENERIC_MAPPING GenericMapping,
-	      IN KPROCESSOR_MODE AccessMode,
-	      OUT PACCESS_MODE GrantedAccess,
-	      OUT PNTSTATUS AccessStatus)
 /*
  * FUNCTION: Determines whether the requested access rights can be granted
  * to an object protected by a security descriptor and an object owner
@@ -459,7 +433,20 @@ SeAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
  *      GrantedAccess (OUT) = On return specifies the access granted
  *      AccessStatus (OUT) = Status indicating why access was denied
  * RETURNS: If access was granted, returns TRUE
+ *
+ * @implemented
  */
+BOOLEAN STDCALL
+SeAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
+	      IN PSECURITY_SUBJECT_CONTEXT SubjectSecurityContext,
+	      IN BOOLEAN SubjectContextLocked,
+	      IN ACCESS_MASK DesiredAccess,
+	      IN ACCESS_MASK PreviouslyGrantedAccess,
+	      OUT PPRIVILEGE_SET* Privileges,
+	      IN PGENERIC_MAPPING GenericMapping,
+	      IN KPROCESSOR_MODE AccessMode,
+	      OUT PACCESS_MASK GrantedAccess,
+	      OUT PNTSTATUS AccessStatus)
 {
    ULONG i;
    PACL Dacl;
@@ -472,10 +459,6 @@ SeAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
 
    CurrentAccess = PreviouslyGrantedAccess;
 
-   /*
-    * Ignore the SACL for now
-    */
-
    /*
     * Check the DACL
     */
@@ -485,7 +468,8 @@ SeAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
 					 &Defaulted);
    if (!NT_SUCCESS(Status))
      {
-	return(Status);
+	*AccessStatus = Status;
+	return FALSE;
      }
 
    CurrentAce = (PACE)(Dacl + 1);
@@ -501,12 +485,12 @@ SeAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
 		  return(STATUS_SUCCESS);
 	       }
 	  }
+
 	if (CurrentAce->Header.AceType == ACCESS_ALLOWED_ACE_TYPE)
 	  {
 	     if (SepSidInToken(SubjectSecurityContext->ClientToken, Sid))
 	       {
-		  CurrentAccess = CurrentAccess | 
-		    CurrentAce->AccessMask;
+		  CurrentAccess |= CurrentAce->AccessMask;
 	       }
 	  }
      }
@@ -521,7 +505,152 @@ SeAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
      }
    *GrantedAccess = CurrentAccess;
 
-   return(STATUS_SUCCESS);
+   return TRUE;
+}
+
+
+NTSTATUS STDCALL
+NtAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
+	      IN HANDLE TokenHandle,
+	      IN ACCESS_MASK DesiredAccess,
+	      IN PGENERIC_MAPPING GenericMapping,
+	      OUT PPRIVILEGE_SET PrivilegeSet,
+	      OUT PULONG ReturnLength,
+	      OUT PACCESS_MASK GrantedAccess,
+	      OUT PNTSTATUS AccessStatus)
+{
+  KPROCESSOR_MODE PreviousMode;
+  PACCESS_TOKEN Token;
+  BOOLEAN Present;
+  BOOLEAN Defaulted;
+  PACE CurrentAce;
+  PACL Dacl;
+  PSID Sid;
+  ACCESS_MASK CurrentAccess;
+  ULONG i;
+  NTSTATUS Status;
+
+  DPRINT("NtAccessCheck() called\n");
+
+  PreviousMode = KeGetPreviousMode();
+  if (PreviousMode == KernelMode)
+    {
+      *GrantedAccess = DesiredAccess;
+      *AccessStatus = STATUS_SUCCESS;
+      return STATUS_SUCCESS;
+    }
+
+  Status = ObReferenceObjectByHandle(TokenHandle,
+				     TOKEN_QUERY,
+				     SepTokenObjectType,
+				     PreviousMode,
+				     (PVOID*)&Token,
+				     NULL);
+  if (!NT_SUCCESS(Status))
+    {
+      DPRINT1("Failed to reference token (Status %lx)\n", Status);
+      return Status;
+    }
+
+  /* Check token type */
+  if (Token->TokenType != TokenImpersonation)
+    {
+      DPRINT1("No impersonation token\n");
+      ObDereferenceObject(Token);
+      return STATUS_ACCESS_VIOLATION;
+    }
+
+  /* Check impersonation level */
+  if (Token->ImpersonationLevel < SecurityAnonymous)
+    {
+      DPRINT1("Invalid impersonation level\n");
+      ObDereferenceObject(Token);
+      return STATUS_ACCESS_VIOLATION;
+    }
+
+  /* Get the DACL */
+  Status = RtlGetDaclSecurityDescriptor(SecurityDescriptor,
+					&Present,
+					&Dacl,
+					&Defaulted);
+  if (!NT_SUCCESS(Status))
+    {
+      DPRINT1("RtlGetDaclSecurityDescriptor() failed (Status %lx)\n", Status);
+      ObDereferenceObject(Token);
+      return Status;
+   }
+
+  /* RULE 1: Grant desired access if the object is unprotected */
+  if (Dacl == NULL)
+    {
+      *GrantedAccess = DesiredAccess;
+      *AccessStatus = STATUS_SUCCESS;
+      return STATUS_SUCCESS;
+    }
+
+  CurrentAccess = 0;
+
+  /* FIXME: RULE 2: Check token for 'take ownership' privilege */
+
+  /* RULE 3: Check whether the token is the owner */
+  Status = RtlGetOwnerSecurityDescriptor(SecurityDescriptor,
+					 &Sid,
+					 &Defaulted);
+  if (!NT_SUCCESS(Status))
+    {
+      DPRINT1("RtlGetOwnerSecurityDescriptor() failed (Status %lx)\n", Status);
+      ObDereferenceObject(Token);
+      return Status;
+   }
+
+  if (SepSidInToken(Token, Sid))
+    {
+      CurrentAccess |= (READ_CONTROL | WRITE_DAC);
+      if (DesiredAccess == CurrentAccess)
+	{
+	  *AccessStatus = STATUS_SUCCESS;
+	  *GrantedAccess = CurrentAccess;
+	  return STATUS_SUCCESS;
+	}
+    }
+
+  /* RULE 4: Grant rights according to the DACL */
+  CurrentAce = (PACE)(Dacl + 1);
+  for (i = 0; i < Dacl->AceCount; i++)
+    {
+      Sid = (PSID)(CurrentAce + 1);
+      if (CurrentAce->Header.AceType == ACCESS_DENIED_ACE_TYPE)
+	{
+	  if (SepSidInToken(Token, Sid))
+	    {
+	      *AccessStatus = STATUS_ACCESS_DENIED;
+	      *GrantedAccess = 0;
+	      return STATUS_SUCCESS;
+	    }
+	}
+
+      if (CurrentAce->Header.AceType == ACCESS_ALLOWED_ACE_TYPE)
+	{
+	  if (SepSidInToken(Token, Sid))
+	    {
+	      CurrentAccess |= CurrentAce->AccessMask;
+	    }
+	}
+    }
+
+  DPRINT("CurrentAccess %08lx\n DesiredAccess %08lx\n",
+         CurrentAccess, DesiredAccess);
+
+  ObDereferenceObject(Token);
+
+  *GrantedAccess = CurrentAccess & DesiredAccess;
+
+  *AccessStatus =
+    (*GrantedAccess == DesiredAccess) ? STATUS_SUCCESS : STATUS_ACCESS_DENIED;
+
+  DPRINT("NtAccessCheck() done\n");
+
+  return STATUS_SUCCESS;
 }
 
 /* EOF */

From cbda3034090944ba967288ae2ffc13131c469911 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Wed, 14 Jul 2004 02:40:45 +0000
Subject: [PATCH 287/356] - Revert part of my last TLS patch.

svn path=/trunk/; revision=10109
---
 reactos/lib/ntdll/ldr/utils.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reactos/lib/ntdll/ldr/utils.c b/reactos/lib/ntdll/ldr/utils.c
index 0ed85b43db0..e2fe92bc150 100644
--- a/reactos/lib/ntdll/ldr/utils.c
+++ b/reactos/lib/ntdll/ldr/utils.c
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.98 2004/07/09 20:08:05 navaraf Exp $
+/* $Id: utils.c,v 1.99 2004/07/14 02:40:45 navaraf Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -253,7 +253,7 @@ LdrpInitializeTlsForProccess(VOID)
                TlsData->TlsDataSize = TlsDirectory->EndAddressOfRawData - TlsDirectory->StartAddressOfRawData;
                TlsData->TlsZeroSize = TlsDirectory->SizeOfZeroFill;
                if (TlsDirectory->AddressOfCallBacks)
-                 TlsData->TlsAddressOfCallBacks = *(PIMAGE_TLS_CALLBACK)RVA(Module->BaseAddress, TlsDirectory->AddressOfCallBacks);
+                 TlsData->TlsAddressOfCallBacks = *TlsDirectory->AddressOfCallBacks;
                else
                  TlsData->TlsAddressOfCallBacks = NULL;
                TlsData->Module = Module;

From 6e17c87e599a110fdca205adb6bb6fe8da4e2aa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Wed, 14 Jul 2004 06:52:29 +0000
Subject: [PATCH 288/356] Split "old-style Win 3.1" file dialog into 16 and 32
 bit code

svn path=/trunk/; revision=10110
---
 reactos/lib/comdlg32/Makefile.in      |    3 +-
 reactos/lib/comdlg32/filedlg.c        |  333 +++++-
 reactos/lib/comdlg32/filedlg16.c      | 1496 +++----------------------
 reactos/lib/comdlg32/filedlg31.c      |  931 +++++++++++++++
 reactos/lib/comdlg32/filedlg31.h      |   67 ++
 reactos/lib/comdlg32/winehq2ros.patch |   93 --
 6 files changed, 1476 insertions(+), 1447 deletions(-)
 create mode 100644 reactos/lib/comdlg32/filedlg31.c
 create mode 100644 reactos/lib/comdlg32/filedlg31.h

diff --git a/reactos/lib/comdlg32/Makefile.in b/reactos/lib/comdlg32/Makefile.in
index 91949b80fe5..0490723b5f0 100644
--- a/reactos/lib/comdlg32/Makefile.in
+++ b/reactos/lib/comdlg32/Makefile.in
@@ -13,9 +13,10 @@ C_SRCS = \
 	cdlg32.c \
 	colordlg.c \
 	filedlg.c \
+	filedlg31.c \
 	filedlgbrowser.c \
-	finddlg32.c \
 	filetitle.c \
+	finddlg32.c \
 	fontdlg.c \
 	printdlg.c
 
diff --git a/reactos/lib/comdlg32/filedlg.c b/reactos/lib/comdlg32/filedlg.c
index 933fe9be4b2..aef7f774729 100644
--- a/reactos/lib/comdlg32/filedlg.c
+++ b/reactos/lib/comdlg32/filedlg.c
@@ -68,6 +68,7 @@
 #include "commdlg.h"
 #include "dlgs.h"
 #include "cdlg.h"
+#include "filedlg31.h"
 #include "wine/debug.h"
 #include "cderr.h"
 #include "shellapi.h"
@@ -104,6 +105,11 @@ typedef struct tagLookInInfo
   UINT uSelectedItem;
 } LookInInfos;
 
+typedef struct tagFD32_PRIVATE
+{
+    OPENFILENAMEA *ofnA; /* original structure if 32bits ansi dialog */
+} FD32_PRIVATE, *PFD32_PRIVATE;
+
 
 /***********************************************************************
  * Defines and global variables
@@ -223,10 +229,6 @@ HRESULT FILEDLG95_HandleCustomDialogMessages(HWND hwnd, UINT uMsg, WPARAM wParam
 BOOL FILEDLG95_OnOpenMultipleFiles(HWND hwnd, LPWSTR lpstrFileList, UINT nFileCount, UINT sizeUsed);
 static BOOL BrowseSelectedFolder(HWND hwnd);
 
-/* old style dialogs */
-extern BOOL GetFileName31A(LPOPENFILENAMEA lpofn, UINT dlgType);
-extern BOOL GetFileName31W(LPOPENFILENAMEW lpofn, UINT dlgType);
-
 /***********************************************************************
  *      GetFileName95
  *
@@ -3272,6 +3274,321 @@ static void MemFree(void *mem)
     }
 }
 
+/*
+ * Old-style (win3.1) dialogs */
+
+/***********************************************************************
+ *           FD32_GetTemplate                                  [internal]
+ *
+ * Get a template (or FALSE if failure) when 16 bits dialogs are used
+ * by a 32 bits application
+ *
+ */
+static BOOL FD32_GetTemplate(PFD31_DATA lfs)
+{
+    LPOPENFILENAMEW ofnW = &lfs->ofnW;
+    PFD32_PRIVATE priv = (PFD32_PRIVATE) lfs->private1632;
+    HANDLE hDlgTmpl;
+
+    if (ofnW->Flags & OFN_ENABLETEMPLATEHANDLE)
+    {
+	if (!(lfs->template = LockResource( ofnW->hInstance )))
+	{
+	    COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
+	    return FALSE;
+	}
+    }
+    else if (ofnW->Flags & OFN_ENABLETEMPLATE)
+    {
+	HRSRC hResInfo;
+        if (priv->ofnA)
+	    hResInfo = FindResourceA(priv->ofnA->hInstance,
+				 priv->ofnA->lpTemplateName,
+                                 (LPSTR)RT_DIALOG);
+        else
+	    hResInfo = FindResourceW(ofnW->hInstance,
+				 ofnW->lpTemplateName,
+                                 (LPWSTR)RT_DIALOG);
+        if (!hResInfo)
+	{
+	    COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
+	    return FALSE;
+	}
+	if (!(hDlgTmpl = LoadResource(ofnW->hInstance,
+				hResInfo)) ||
+		    !(lfs->template = LockResource(hDlgTmpl)))
+	{
+	    COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
+	    return FALSE;
+	}
+    } else { /* get it from internal Wine resource */
+	HRSRC hResInfo;
+	if (!(hResInfo = FindResourceA(COMDLG32_hInstance,
+             lfs->open? "OPEN_FILE":"SAVE_FILE", (LPSTR)RT_DIALOG)))
+	{
+	    COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
+	    return FALSE;
+        }
+        if (!(hDlgTmpl = LoadResource(COMDLG32_hInstance, hResInfo )) ||
+                !(lfs->template = LockResource( hDlgTmpl )))
+        {
+            COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
+            return FALSE;
+        }
+    }
+    return TRUE;
+}
+
+
+/************************************************************************
+ *                              FD32_Init          [internal]
+ *      called from the common 16/32 code to initialize 32 bit data
+ */
+static BOOL CALLBACK FD32_Init(LPARAM lParam, PFD31_DATA lfs, DWORD data)
+{
+    BOOL IsUnicode = (BOOL) data;
+    PFD32_PRIVATE priv;
+
+    priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(FD32_PRIVATE));
+    lfs->private1632 = priv;
+    if (NULL == lfs->private1632) return FALSE;
+    if (IsUnicode)
+    {
+        lfs->ofnW = *((LPOPENFILENAMEW) lParam);
+        if (lfs->ofnW.Flags & OFN_ENABLEHOOK)
+            if (lfs->ofnW.lpfnHook)
+                lfs->hook = TRUE;
+    }
+    else
+    {
+        priv->ofnA = (LPOPENFILENAMEA) lParam;
+        if (priv->ofnA->Flags & OFN_ENABLEHOOK)
+            if (priv->ofnA->lpfnHook)
+                lfs->hook = TRUE;
+        FD31_MapOfnStructA(priv->ofnA, &lfs->ofnW, lfs->open);
+    }
+
+    if (! FD32_GetTemplate(lfs)) return FALSE;
+
+    return TRUE;
+}
+
+/***********************************************************************
+ *                              FD32_CallWindowProc          [internal]
+ *
+ *      called from the common 16/32 code to call the appropriate hook
+ */
+BOOL CALLBACK FD32_CallWindowProc(PFD31_DATA lfs, UINT wMsg, WPARAM wParam,
+                                 LPARAM lParam)
+{
+    PFD32_PRIVATE priv = (PFD32_PRIVATE) lfs->private1632;
+
+    if (priv->ofnA)
+    {
+        return (BOOL) CallWindowProcA(
+          (WNDPROC)priv->ofnA->lpfnHook, lfs->hwnd,
+          wMsg, wParam, lParam);
+    }
+
+    return (BOOL) CallWindowProcW(
+          (WNDPROC)lfs->ofnW.lpfnHook, lfs->hwnd,
+          wMsg, wParam, lParam);
+}
+
+/***********************************************************************
+ *                              FD32_UpdateResult            [internal]
+ *          update the real client structures if any
+ */
+static void CALLBACK FD32_UpdateResult(PFD31_DATA lfs)
+{
+    PFD32_PRIVATE priv = (PFD32_PRIVATE) lfs->private1632;
+    LPOPENFILENAMEW ofnW = &lfs->ofnW;
+
+    if (priv->ofnA)
+    {
+        if (ofnW->nMaxFile &&
+            !WideCharToMultiByte( CP_ACP, 0, ofnW->lpstrFile, -1,
+                                  priv->ofnA->lpstrFile, ofnW->nMaxFile, NULL, NULL ))
+            priv->ofnA->lpstrFile[ofnW->nMaxFile-1] = 0;
+        priv->ofnA->nFileOffset = ofnW->nFileOffset;
+        priv->ofnA->nFileExtension = ofnW->nFileExtension;
+    }
+}
+
+/***********************************************************************
+ *                              FD32_UpdateFileTitle            [internal]
+ *          update the real client structures if any
+ */
+static void CALLBACK FD32_UpdateFileTitle(PFD31_DATA lfs)
+{
+    PFD32_PRIVATE priv = (PFD32_PRIVATE) lfs->private1632;
+    LPOPENFILENAMEW ofnW = &lfs->ofnW;
+
+    if (priv->ofnA)
+    {
+        if (!WideCharToMultiByte( CP_ACP, 0, ofnW->lpstrFileTitle, -1,
+                                  priv->ofnA->lpstrFileTitle, ofnW->nMaxFileTitle, NULL, NULL ))
+            priv->ofnA->lpstrFileTitle[ofnW->nMaxFileTitle-1] = 0;
+    }
+}
+
+
+/***********************************************************************
+ *                              FD32_SendLbGetCurSel         [internal]
+ *          retrieve selected listbox item
+ */
+static LRESULT CALLBACK FD32_SendLbGetCurSel(PFD31_DATA lfs)
+{
+    return SendDlgItemMessageW(lfs->hwnd, lst1, LB_GETCURSEL, 0, 0);
+}
+
+
+/************************************************************************
+ *                              FD32_Destroy          [internal]
+ *      called from the common 16/32 code to cleanup 32 bit data
+ */
+static void CALLBACK FD32_Destroy(PFD31_DATA lfs)
+{
+    PFD32_PRIVATE priv = (PFD32_PRIVATE) lfs->private1632;
+
+    /* if ofnW has been allocated, have to free everything in it */
+    if (NULL != priv && NULL != priv->ofnA)
+        FD31_FreeOfnW(&lfs->ofnW);
+}
+
+static void FD32_SetupCallbacks(PFD31_CALLBACKS callbacks)
+{
+    callbacks->Init = FD32_Init;
+    callbacks->CWP = FD32_CallWindowProc;
+    callbacks->UpdateResult = FD32_UpdateResult;
+    callbacks->UpdateFileTitle = FD32_UpdateFileTitle;
+    callbacks->SendLbGetCurSel = FD32_SendLbGetCurSel;
+    callbacks->Destroy = FD32_Destroy;
+}
+
+/***********************************************************************
+ *                              FD32_WMMeasureItem           [internal]
+ */
+static LONG FD32_WMMeasureItem(HWND hWnd, WPARAM wParam, LPARAM lParam)
+{
+    LPMEASUREITEMSTRUCT lpmeasure;
+
+    lpmeasure = (LPMEASUREITEMSTRUCT)lParam;
+    lpmeasure->itemHeight = FD31_GetFldrHeight();
+    return TRUE;
+}
+
+
+/***********************************************************************
+ *           FileOpenDlgProc                                    [internal]
+ *      Used for open and save, in fact.
+ */
+static INT_PTR CALLBACK FD32_FileOpenDlgProc(HWND hWnd, UINT wMsg,
+                                             WPARAM wParam, LPARAM lParam)
+{
+    PFD31_DATA lfs = (PFD31_DATA)GetPropA(hWnd,FD31_OFN_PROP);
+
+    TRACE("msg=%x wparam=%x lParam=%lx\n", wMsg, wParam, lParam);
+    if ((wMsg != WM_INITDIALOG) && lfs && lfs->hook)
+        {
+            INT_PTR lRet;
+            lRet  = (INT_PTR)FD31_CallWindowProc(lfs, wMsg, wParam, lParam);
+            if (lRet)
+                return lRet;         /* else continue message processing */
+        }
+    switch (wMsg)
+    {
+    case WM_INITDIALOG:
+        return FD31_WMInitDialog(hWnd, wParam, lParam);
+
+    case WM_MEASUREITEM:
+        return FD32_WMMeasureItem(hWnd, wParam, lParam);
+
+    case WM_DRAWITEM:
+        return FD31_WMDrawItem(hWnd, wParam, lParam, !lfs->open, (DRAWITEMSTRUCT *)lParam);
+
+    case WM_COMMAND:
+        return FD31_WMCommand(hWnd, lParam, HIWORD(wParam), LOWORD(wParam), lfs);
+#if 0
+    case WM_CTLCOLOR:
+         SetBkColor((HDC16)wParam, 0x00C0C0C0);
+         switch (HIWORD(lParam))
+         {
+	 case CTLCOLOR_BTN:
+	     SetTextColor((HDC16)wParam, 0x00000000);
+             return hGRAYBrush;
+	case CTLCOLOR_STATIC:
+             SetTextColor((HDC16)wParam, 0x00000000);
+             return hGRAYBrush;
+	}
+      break;
+#endif
+    }
+    return FALSE;
+}
+
+
+/***********************************************************************
+ *           GetFileName31A                                 [internal]
+ *
+ * Creates a win31 style dialog box for the user to select a file to open/save.
+ */
+static BOOL GetFileName31A(LPOPENFILENAMEA lpofn, /* addess of structure with data*/
+                           UINT dlgType /* type dialogue : open/save */
+                           )
+{
+    HINSTANCE hInst;
+    BOOL bRet = FALSE;
+    PFD31_DATA lfs;
+    FD31_CALLBACKS callbacks;
+
+    if (!lpofn || !FD31_Init()) return FALSE;
+
+    TRACE("ofn flags %08lx\n", lpofn->Flags);
+    FD32_SetupCallbacks(&callbacks);
+    lfs = FD31_AllocPrivate((LPARAM) lpofn, dlgType, &callbacks, (DWORD) FALSE);
+    if (lfs)
+    {
+        hInst = (HINSTANCE)GetWindowLongA( lpofn->hwndOwner, GWL_HINSTANCE );
+        bRet = DialogBoxIndirectParamA( hInst, lfs->template, lpofn->hwndOwner,
+                                        FD32_FileOpenDlgProc, (LPARAM)lfs);
+        FD31_DestroyPrivate(lfs);
+    }
+
+    TRACE("return lpstrFile='%s' !\n", lpofn->lpstrFile);
+    return bRet;
+}
+
+/***********************************************************************
+ *           GetFileName31W                                 [internal]
+ *
+ * Creates a win31 style dialog box for the user to select a file to open/save
+ */
+static BOOL GetFileName31W(LPOPENFILENAMEW lpofn, /* addess of structure with data*/
+                           UINT dlgType /* type dialogue : open/save */
+                           )
+{
+    HINSTANCE hInst;
+    BOOL bRet = FALSE;
+    PFD31_DATA lfs;
+    FD31_CALLBACKS callbacks;
+
+    if (!lpofn || !FD31_Init()) return FALSE;
+
+    FD32_SetupCallbacks(&callbacks);
+    lfs = FD31_AllocPrivate((LPARAM) lpofn, dlgType, &callbacks, (DWORD) FALSE);
+    if (lfs)
+    {
+        hInst = (HINSTANCE)GetWindowLongA( lpofn->hwndOwner, GWL_HINSTANCE );
+        bRet = DialogBoxIndirectParamW( hInst, lfs->template, lpofn->hwndOwner,
+                                        FD32_FileOpenDlgProc, (LPARAM)lfs);
+        FD31_DestroyPrivate(lfs);
+    }
+
+    TRACE("return lpstrFile=%s !\n", debugstr_w(lpofn->lpstrFile));
+    return bRet;
+}
+
 /* ------------------ APIs ---------------------- */
 
 /***********************************************************************
@@ -3287,7 +3604,6 @@ static void MemFree(void *mem)
 BOOL WINAPI GetOpenFileNameA(
 	LPOPENFILENAMEA ofn) /* [in/out] address of init structure */
 {
-#if 0 /* FIXME GetFileName31A uses 16 bit stuff */
     BOOL win16look = FALSE;
 
     if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE))
@@ -3296,7 +3612,6 @@ BOOL WINAPI GetOpenFileNameA(
     if (win16look)
         return GetFileName31A(ofn, OPEN_DIALOG);
     else
-#endif
         return GetFileDialog95A(ofn, OPEN_DIALOG);
 }
 
@@ -3313,7 +3628,6 @@ BOOL WINAPI GetOpenFileNameA(
 BOOL WINAPI GetOpenFileNameW(
 	LPOPENFILENAMEW ofn) /* [in/out] address of init structure */
 {
-#if 0 /* FIXME GetFileName31W uses 16 bit stuff */
     BOOL win16look = FALSE;
 
     if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE))
@@ -3322,7 +3636,6 @@ BOOL WINAPI GetOpenFileNameW(
     if (win16look)
         return GetFileName31W(ofn, OPEN_DIALOG);
     else
-#endif
         return GetFileDialog95W(ofn, OPEN_DIALOG);
 }
 
@@ -3340,7 +3653,6 @@ BOOL WINAPI GetOpenFileNameW(
 BOOL WINAPI GetSaveFileNameA(
 	LPOPENFILENAMEA ofn) /* [in/out] address of init structure */
 {
-#if 0 /* FIXME GetFileName31A uses 16 bit stuff */
     BOOL win16look = FALSE;
 
     if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE))
@@ -3349,7 +3661,6 @@ BOOL WINAPI GetSaveFileNameA(
     if (win16look)
         return GetFileName31A(ofn, SAVE_DIALOG);
     else
-#endif
         return GetFileDialog95A(ofn, SAVE_DIALOG);
 }
 
@@ -3366,7 +3677,6 @@ BOOL WINAPI GetSaveFileNameA(
 BOOL WINAPI GetSaveFileNameW(
 	LPOPENFILENAMEW ofn) /* [in/out] address of init structure */
 {
-#if 0 /* FIXME GetFileName31W uses 16 bit stuff */
     BOOL win16look = FALSE;
 
     if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE))
@@ -3375,6 +3685,5 @@ BOOL WINAPI GetSaveFileNameW(
     if (win16look)
         return GetFileName31W(ofn, SAVE_DIALOG);
     else
-#endif
         return GetFileDialog95W(ofn, SAVE_DIALOG);
 }
diff --git a/reactos/lib/comdlg32/filedlg16.c b/reactos/lib/comdlg32/filedlg16.c
index 0227b8f11b9..acad211982b 100644
--- a/reactos/lib/comdlg32/filedlg16.c
+++ b/reactos/lib/comdlg32/filedlg16.c
@@ -18,174 +18,82 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#include <ctype.h>
-#include <stdlib.h>
 #include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
 #include "windef.h"
 #include "winbase.h"
-#include "winnls.h"
-#include "wingdi.h"
-#include "winuser.h"
 #include "wine/winbase16.h"
+#include "winuser.h"
 #include "wine/winuser16.h"
-#include "wine/unicode.h"
 #include "wine/debug.h"
 #include "cderr.h"
-#include "winreg.h"
-#include "winternl.h"
-#include "winuser.h"
 #include "commdlg.h"
-#include "cderr.h"
-#include "winreg.h"
-#include "winternl.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
 
 #include "cdlg.h"
 #include "cdlg16.h"
+#include "filedlg31.h"
 
-#define BUFFILE 512
-#define BUFFILEALLOC 512 * sizeof(WCHAR)
-
-struct FSPRIVATE
+typedef struct tagFD16_PRIVATE
 {
-    HWND hwnd; /* file dialog window handle */
-    BOOL hook; /* TRUE if the dialog is hooked */
-    UINT lbselchstring; /* registered message id */
-    UINT fileokstring; /* registered message id */
-    LPARAM lParam; /* save original lparam */
     HANDLE16 hDlgTmpl16; /* handle for resource 16 */
     HANDLE16 hResource16; /* handle for allocated resource 16 */
     HANDLE16 hGlobal16; /* 16 bits mem block (resources) */
-    LPCVOID template; /* template for 32 bits resource */
-    BOOL open; /* TRUE if open dialog, FALSE if save dialog */
-    OPENFILENAMEW *ofnW; /* original structure or work struct */
-    OPENFILENAMEA *ofnA; /* original structure if 32bits ansi dialog */
     OPENFILENAME16 *ofn16; /* original structure if 16 bits dialog */
-};
+} FD16_PRIVATE, *PFD16_PRIVATE;
 
-#define LFSPRIVATE struct FSPRIVATE *
-#define LFS16 1
-#define LFS32A 2
-#define LFS32W 3
-#define OFN_PROP "FILEDLG_OFN"
-
-static const WCHAR FILE_star[] = {'*','.','*', 0};
-static const WCHAR FILE_bslash[] = {'\\', 0};
-static const WCHAR FILE_specc[] = {'%','c',':', 0};
-static const int fldrHeight = 16;
-static const int fldrWidth = 20;
-
-static HICON hFolder = 0;
-static HICON hFolder2 = 0;
-static HICON hFloppy = 0;
-static HICON hHDisk = 0;
-static HICON hCDRom = 0;
-static HICON hNet = 0;
-
-/***********************************************************************
- * 				FileDlg_Init			[internal]
+/************************************************************************
+ *                              FD16_MapOfnStruct16          [internal]
+ *      map a 16 bits structure to an Unicode one
  */
-static BOOL FileDlg_Init(void)
+void FD16_MapOfnStruct16(LPOPENFILENAME16 ofn16, LPOPENFILENAMEW ofnW, BOOL open)
 {
-    static BOOL initialized = 0;
-
-    if (!initialized) {
-        hFolder  = LoadImageA( COMDLG32_hInstance, "FOLDER", IMAGE_ICON, 16, 16, LR_SHARED );
-        hFolder2 = LoadImageA( COMDLG32_hInstance, "FOLDER2", IMAGE_ICON, 16, 16, LR_SHARED );
-        hFloppy  = LoadImageA( COMDLG32_hInstance, "FLOPPY", IMAGE_ICON, 16, 16, LR_SHARED );
-        hHDisk   = LoadImageA( COMDLG32_hInstance, "HDISK", IMAGE_ICON, 16, 16, LR_SHARED );
-        hCDRom   = LoadImageA( COMDLG32_hInstance, "CDROM", IMAGE_ICON, 16, 16, LR_SHARED );
-        hNet     = LoadImageA( COMDLG32_hInstance, "NETWORK", IMAGE_ICON, 16, 16, LR_SHARED );
-	if (hFolder == 0 || hFolder2 == 0 || hFloppy == 0 ||
-	    hHDisk == 0 || hCDRom == 0 || hNet == 0)
-	{
-	    ERR("Error loading icons !\n");
-	    return FALSE;
-	}
-	initialized = TRUE;
-    }
-    return TRUE;
+    OPENFILENAMEA ofnA;
+    /* first convert to linear pointers */
+    memset(&ofnA, 0, sizeof(OPENFILENAMEA));
+    ofnA.lStructSize = sizeof(OPENFILENAMEA);
+    ofnA.hwndOwner = HWND_32(ofn16->hwndOwner);
+    ofnA.hInstance = HINSTANCE_32(ofn16->hInstance);
+    if (ofn16->lpstrFilter)
+        ofnA.lpstrFilter = MapSL(ofn16->lpstrFilter);
+    if (ofn16->lpstrCustomFilter)
+        ofnA.lpstrCustomFilter = MapSL(ofn16->lpstrCustomFilter);
+    ofnA.nMaxCustFilter = ofn16->nMaxCustFilter;
+    ofnA.nFilterIndex = ofn16->nFilterIndex;
+    ofnA.lpstrFile = MapSL(ofn16->lpstrFile);
+    ofnA.nMaxFile = ofn16->nMaxFile;
+    ofnA.lpstrFileTitle = MapSL(ofn16->lpstrFileTitle);
+    ofnA.nMaxFileTitle = ofn16->nMaxFileTitle;
+    ofnA.lpstrInitialDir = MapSL(ofn16->lpstrInitialDir);
+    ofnA.lpstrTitle = MapSL(ofn16->lpstrTitle);
+    ofnA.Flags = ofn16->Flags;
+    ofnA.nFileOffset = ofn16->nFileOffset;
+    ofnA.nFileExtension = ofn16->nFileExtension;
+    ofnA.lpstrDefExt = MapSL(ofn16->lpstrDefExt);
+    if (HIWORD(ofn16->lpTemplateName))
+        ofnA.lpTemplateName = MapSL(ofn16->lpTemplateName);
+    else
+        ofnA.lpTemplateName = (LPSTR) ofn16->lpTemplateName; /* ressource number */
+    /* now calls the 32 bits Ansi to Unicode version to complete the job */
+    FD31_MapOfnStructA(&ofnA, ofnW, open);
 }
 
 /***********************************************************************
- *           Get32BitsTemplate                                  [internal]
- *
- * Get a template (or FALSE if failure) when 16 bits dialogs are used
- * by a 32 bits application
- *
- */
-BOOL Get32BitsTemplate(LFSPRIVATE lfs)
-{
-    LPOPENFILENAMEW ofnW = lfs->ofnW;
-    HANDLE hDlgTmpl;
-
-    if (ofnW->Flags & OFN_ENABLETEMPLATEHANDLE)
-    {
-	if (!(lfs->template = LockResource( ofnW->hInstance )))
-	{
-	    COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
-	    return FALSE;
-	}
-    }
-    else if (ofnW->Flags & OFN_ENABLETEMPLATE)
-    {
-	HRSRC hResInfo;
-        if (lfs->ofnA)
-	    hResInfo = FindResourceA(lfs->ofnA->hInstance,
-				 lfs->ofnA->lpTemplateName,
-                                 (LPSTR)RT_DIALOG);
-        else
-	    hResInfo = FindResourceW(ofnW->hInstance,
-				 ofnW->lpTemplateName,
-                                 (LPWSTR)RT_DIALOG);
-        if (!hResInfo)
-	{
-	    COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
-	    return FALSE;
-	}
-	if (!(hDlgTmpl = LoadResource(ofnW->hInstance,
-				hResInfo)) ||
-		    !(lfs->template = LockResource(hDlgTmpl)))
-	{
-	    COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
-	    return FALSE;
-	}
-    } else { /* get it from internal Wine resource */
-	HRSRC hResInfo;
-	if (!(hResInfo = FindResourceA(COMDLG32_hInstance,
-             lfs->open? "OPEN_FILE":"SAVE_FILE", (LPSTR)RT_DIALOG)))
-	{
-	    COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
-	    return FALSE;
-        }
-        if (!(hDlgTmpl = LoadResource(COMDLG32_hInstance, hResInfo )) ||
-                !(lfs->template = LockResource( hDlgTmpl )))
-        {
-            COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
-            return FALSE;
-        }
-    }
-    return TRUE;
-}
-
-/***********************************************************************
- *           Get16BitsTemplate                                [internal]
+ *           FD16_GetTemplate                                [internal]
  *
  * Get a template (FALSE if failure) when 16 bits dialogs are used
  * by a 16 bits application
  *
  */
-BOOL Get16BitsTemplate(LFSPRIVATE lfs)
+BOOL FD16_GetTemplate(PFD31_DATA lfs)
 {
-    LPOPENFILENAME16 ofn16 = lfs->ofn16;
+    PFD16_PRIVATE priv = (PFD16_PRIVATE) lfs->private1632;
+    LPOPENFILENAME16 ofn16 = priv->ofn16;
     LPCVOID template;
     HGLOBAL16 hGlobal16 = 0;
 
     if (ofn16->Flags & OFN_ENABLETEMPLATEHANDLE)
-        lfs->hDlgTmpl16 = ofn16->hInstance;
+        priv->hDlgTmpl16 = ofn16->hInstance;
     else if (ofn16->Flags & OFN_ENABLETEMPLATE)
     {
 	HANDLE16 hResInfo;
@@ -196,12 +104,12 @@ BOOL Get16BitsTemplate(LFSPRIVATE lfs)
 	    COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
 	    return FALSE;
 	}
-	if (!(lfs->hDlgTmpl16 = LoadResource16( ofn16->hInstance, hResInfo )))
+	if (!(priv->hDlgTmpl16 = LoadResource16( ofn16->hInstance, hResInfo )))
 	{
 	    COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
 	    return FALSE;
 	}
-        lfs->hResource16 = lfs->hDlgTmpl16;
+        priv->hResource16 = priv->hDlgTmpl16;
     }
     else
     { /* get resource from (32 bits) own Wine resource; convert it to 16 */
@@ -239,276 +147,69 @@ BOOL Get16BitsTemplate(LFSPRIVATE lfs)
             return FALSE;
         }
         ConvertDialog32To16((LPVOID)template32, size, (LPVOID)template);
-        lfs->hDlgTmpl16 = hGlobal16;
-        lfs->hGlobal16 = hGlobal16;
+        priv->hDlgTmpl16 = hGlobal16;
+        priv->hGlobal16 = hGlobal16;
     }
     return TRUE;
 }
 
-/***********************************************************************
- *                              FILEDLG_StripEditControl        [internal]
- * Strip pathnames off the contents of the edit control.
+/************************************************************************
+ *                              FD16_Init          [internal]
+ *      called from the common 16/32 code to initialize 16 bit data
  */
-static void FILEDLG_StripEditControl(HWND hwnd)
+static BOOL CALLBACK FD16_Init(LPARAM lParam, PFD31_DATA lfs, DWORD data)
 {
-    WCHAR temp[BUFFILE], *cp;
+    PFD16_PRIVATE priv;
 
-    GetDlgItemTextW( hwnd, edt1, temp, sizeof(temp)/sizeof(WCHAR));
-    cp = strrchrW(temp, '\\');
-    if (cp != NULL) {
-	strcpyW(temp, cp+1);
-    }
-    cp = strrchrW(temp, ':');
-    if (cp != NULL) {
-	strcpyW(temp, cp+1);
-    }
-    /* FIXME: shouldn't we do something with the result here? ;-) */
+    priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(FD16_PRIVATE));
+    lfs->private1632 = priv;
+    if (NULL == lfs->private1632) return FALSE;
+
+    priv->ofn16 = MapSL(lParam);
+    if (priv->ofn16->Flags & OFN_ENABLEHOOK)
+        if (priv->ofn16->lpfnHook)
+            lfs->hook = TRUE;
+
+    FD16_MapOfnStruct16(priv->ofn16, &lfs->ofnW, lfs->open);
+
+    if (! FD16_GetTemplate(lfs)) return FALSE;
+
+    return TRUE;
 }
 
 /***********************************************************************
- *                              FILEDLG_CallWindowProc          [internal]
+ *                              FD16_CallWindowProc          [internal]
  *
- *      Call the appropriate hook
+ *      called from the common 16/32 code to call the appropriate hook
  */
-static BOOL FILEDLG_CallWindowProc(LFSPRIVATE lfs, UINT wMsg, WPARAM wParam,
-                                   LPARAM lParam)
+BOOL CALLBACK FD16_CallWindowProc(PFD31_DATA lfs, UINT wMsg, WPARAM wParam,
+                                 LPARAM lParam)
 {
-    if (lfs->ofnA)
-    {
-        return (BOOL) CallWindowProcA(
-          (WNDPROC)lfs->ofnA->lpfnHook, lfs->hwnd,
-          wMsg, wParam, lParam);
-    }
+    PFD16_PRIVATE priv = (PFD16_PRIVATE) lfs->private1632;
 
-    if (lfs->ofnW)
+    if (priv->ofn16)
     {
-        return (BOOL) CallWindowProcW(
-          (WNDPROC)lfs->ofnW->lpfnHook, lfs->hwnd,
-          wMsg, wParam, lParam);
+        return (BOOL16) CallWindowProc16(
+          (WNDPROC16)priv->ofn16->lpfnHook, HWND_16(lfs->hwnd),
+          (UINT16)wMsg, (WPARAM16)wParam, lParam);
     }
     return FALSE;
 }
 
-/***********************************************************************
- * 				FILEDLG_ScanDir                 [internal]
- */
-static BOOL FILEDLG_ScanDir(HWND hWnd, LPWSTR newPath)
-{
-    WCHAR		buffer[BUFFILE];
-    HWND 		hdlg, hdlgDir;
-    LRESULT             lRet = TRUE;
-    HCURSOR             hCursorWait, oldCursor;
-
-    TRACE("Trying to change to %s\n", debugstr_w(newPath));
-    if  ( newPath[0] && !SetCurrentDirectoryW( newPath ))
-        return FALSE;
-    lstrcpynW(buffer, newPath, sizeof(buffer)/sizeof(WCHAR));
-
-    /* get the list of spec files */
-    GetDlgItemTextW(hWnd, edt1, buffer, sizeof(buffer)/sizeof(WCHAR));
-
-    hCursorWait = LoadCursorA(0, (LPSTR)IDC_WAIT);
-    oldCursor = SetCursor(hCursorWait);
-
-    /* list of files */
-    if ((hdlg = GetDlgItem(hWnd, lst1)) != 0) {
-        WCHAR*	scptr; /* ptr on semi-colon */
-	WCHAR*	filter = buffer;
-
-	TRACE("Using filter %s\n", debugstr_w(filter));
-	SendMessageW(hdlg, LB_RESETCONTENT, 0, 0);
-	while (filter) {
-	    scptr = strchrW(filter, ';');
-	    if (scptr)	*scptr = 0;
-            while (*filter == ' ') filter++;
-	    TRACE("Using file spec %s\n", debugstr_w(filter));
-	    if (SendMessageW(hdlg, LB_DIR, 0, (LPARAM)filter) == LB_ERR)
-	        return FALSE;
-	    if (scptr) *scptr = ';';
-	        filter = (scptr) ? (scptr + 1) : 0;
-	 }
-    }
-
-    /* list of directories */
-    strcpyW(buffer, FILE_star);
-
-    if ((hdlgDir = GetDlgItem(hWnd, lst2)) != 0) {
-        lRet = DlgDirListW(hWnd, buffer, lst2, stc1, DDL_EXCLUSIVE | DDL_DIRECTORY);
-    }
-    SetCursor(oldCursor);
-    return lRet;
-}
 
 /***********************************************************************
- * 				FILEDLG_GetFileType		[internal]
+ *                              FD31_UpdateResult            [internal]
+ *          update the real client structures
  */
-
-static LPWSTR FILEDLG_GetFileType(LPWSTR cfptr, LPWSTR fptr, WORD index)
+static void CALLBACK FD16_UpdateResult(PFD31_DATA lfs)
 {
-  int n, i;
-  i = 0;
-  if (cfptr)
-    for ( ;(n = lstrlenW(cfptr)) != 0; i++)
-      {
-	cfptr += n + 1;
-	if (i == index)
-	  return cfptr;
-	cfptr += lstrlenW(cfptr) + 1;
-      }
-  if (fptr)
-    for ( ;(n = lstrlenW(fptr)) != 0; i++)
-      {
-	fptr += n + 1;
-	if (i == index)
-	  return fptr;
-	fptr += lstrlenW(fptr) + 1;
-    }
-  return (LPWSTR) FILE_star; /* FIXME */
-}
+    PFD16_PRIVATE priv = (PFD16_PRIVATE) lfs->private1632;
+    LPOPENFILENAMEW ofnW = &lfs->ofnW;
 
-/***********************************************************************
- *                              FILEDLG_WMDrawItem              [internal]
- */
-static LONG FILEDLG_WMDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam,
-       int savedlg, LPDRAWITEMSTRUCT lpdis)
-{
-    WCHAR *str;
-    HICON hIcon;
-    COLORREF oldText = 0, oldBk = 0;
-
-    if (lpdis->CtlType == ODT_LISTBOX && lpdis->CtlID == lst1)
-    {
-        if (!(str = HeapAlloc(GetProcessHeap(), 0, BUFFILEALLOC))) return FALSE;
-	SendMessageW(lpdis->hwndItem, LB_GETTEXT, lpdis->itemID,
-                      (LPARAM)str);
-
-	if ((lpdis->itemState & ODS_SELECTED) && !savedlg)
-	{
-	    oldBk = SetBkColor( lpdis->hDC, GetSysColor( COLOR_HIGHLIGHT ) );
-	    oldText = SetTextColor( lpdis->hDC, GetSysColor(COLOR_HIGHLIGHTTEXT));
-	}
-	if (savedlg)
-	    SetTextColor(lpdis->hDC,GetSysColor(COLOR_GRAYTEXT) );
-
-	ExtTextOutW(lpdis->hDC, lpdis->rcItem.left + 1,
-                  lpdis->rcItem.top + 1, ETO_OPAQUE | ETO_CLIPPED,
-                  &(lpdis->rcItem), str, lstrlenW(str), NULL);
-
-	if (lpdis->itemState & ODS_SELECTED)
-	    DrawFocusRect( lpdis->hDC, &(lpdis->rcItem) );
-
-	if ((lpdis->itemState & ODS_SELECTED) && !savedlg)
-	{
-	    SetBkColor( lpdis->hDC, oldBk );
-	    SetTextColor( lpdis->hDC, oldText );
-	}
-        HeapFree(GetProcessHeap(), 0, str);
-	return TRUE;
-    }
-
-    if (lpdis->CtlType == ODT_LISTBOX && lpdis->CtlID == lst2)
-    {
-        if (!(str = HeapAlloc(GetProcessHeap(), 0, BUFFILEALLOC)))
-            return FALSE;
-	SendMessageW(lpdis->hwndItem, LB_GETTEXT, lpdis->itemID,
-                      (LPARAM)str);
-
-	if (lpdis->itemState & ODS_SELECTED)
-	{
-	    oldBk = SetBkColor( lpdis->hDC, GetSysColor( COLOR_HIGHLIGHT ) );
-	    oldText = SetTextColor( lpdis->hDC, GetSysColor(COLOR_HIGHLIGHTTEXT));
-	}
-	ExtTextOutW(lpdis->hDC, lpdis->rcItem.left + fldrWidth,
-                  lpdis->rcItem.top + 1, ETO_OPAQUE | ETO_CLIPPED,
-                  &(lpdis->rcItem), str, lstrlenW(str), NULL);
-
-	if (lpdis->itemState & ODS_SELECTED)
-	    DrawFocusRect( lpdis->hDC, &(lpdis->rcItem) );
-
-	if (lpdis->itemState & ODS_SELECTED)
-	{
-	    SetBkColor( lpdis->hDC, oldBk );
-	    SetTextColor( lpdis->hDC, oldText );
-	}
-	DrawIcon(lpdis->hDC, lpdis->rcItem.left, lpdis->rcItem.top, hFolder);
-        HeapFree(GetProcessHeap(), 0, str);
-	return TRUE;
-    }
-    if (lpdis->CtlType == ODT_COMBOBOX && lpdis->CtlID == cmb2)
-    {
-        char root[] = "a:";
-        if (!(str = HeapAlloc(GetProcessHeap(), 0, BUFFILEALLOC)))
-            return FALSE;
-	SendMessageW(lpdis->hwndItem, CB_GETLBTEXT, lpdis->itemID,
-                      (LPARAM)str);
-        root[0] += str[2] - 'a';
-        switch(GetDriveTypeA(root))
-        {
-        case DRIVE_REMOVABLE: hIcon = hFloppy; break;
-        case DRIVE_CDROM:     hIcon = hCDRom; break;
-        case DRIVE_REMOTE:    hIcon = hNet; break;
-        case DRIVE_FIXED:
-        default:           hIcon = hHDisk; break;
-        }
-	if (lpdis->itemState & ODS_SELECTED)
-	{
-	    oldBk = SetBkColor( lpdis->hDC, GetSysColor( COLOR_HIGHLIGHT ) );
-	    oldText = SetTextColor( lpdis->hDC, GetSysColor(COLOR_HIGHLIGHTTEXT));
-	}
-	ExtTextOutW(lpdis->hDC, lpdis->rcItem.left + fldrWidth,
-                  lpdis->rcItem.top + 1, ETO_OPAQUE | ETO_CLIPPED,
-                  &(lpdis->rcItem), str, lstrlenW(str), NULL);
-
-	if (lpdis->itemState & ODS_SELECTED)
-	{
-	    SetBkColor( lpdis->hDC, oldBk );
-	    SetTextColor( lpdis->hDC, oldText );
-	}
-	DrawIcon(lpdis->hDC, lpdis->rcItem.left, lpdis->rcItem.top, hIcon);
-        HeapFree(GetProcessHeap(), 0, str);
-	return TRUE;
-    }
-    return FALSE;
-}
-
-/***********************************************************************
- *                              FILEDLG_UpdateResult            [internal]
- *      update the displayed file name (with path)
- */
-void FILEDLG_UpdateResult(LFSPRIVATE lfs, WCHAR *tmpstr)
-{
-    int lenstr2;
-    LPOPENFILENAMEW ofnW = lfs->ofnW;
-    WCHAR tmpstr2[BUFFILE];
-    WCHAR *bs;
-
-    TRACE("%s\n", debugstr_w(tmpstr));
-    if(ofnW->Flags & OFN_NOVALIDATE)
-        tmpstr2[0] = '\0';
-    else
-        GetCurrentDirectoryW(BUFFILE, tmpstr2);
-    lenstr2 = strlenW(tmpstr2);
-    if (lenstr2 > 3)
-        tmpstr2[lenstr2++]='\\';
-    lstrcpynW(tmpstr2+lenstr2, tmpstr, BUFFILE-lenstr2);
-    if (ofnW->lpstrFile)
-        lstrcpynW(ofnW->lpstrFile, tmpstr2, ofnW->nMaxFile);
-    if((bs = strrchrW(tmpstr2, '\\')) != NULL)
-        ofnW->nFileOffset = bs - tmpstr2 +1;
-    else
-        ofnW->nFileOffset = 0;
-    ofnW->nFileExtension = 0;
-    while(tmpstr2[ofnW->nFileExtension] != '.' && tmpstr2[ofnW->nFileExtension] != '\0')
-        ofnW->nFileExtension++;
-    if (tmpstr2[ofnW->nFileExtension] == '\0')
-        ofnW->nFileExtension = 0;
-    else
-        ofnW->nFileExtension++;
-    /* update the real client structures if any */
-    if (lfs->ofn16)
+    if (priv->ofn16)
     { /* we have to convert to short (8.3) path */
 	char tmp[1024]; /* MAX_PATHNAME_LEN */
-	LPOPENFILENAME16 ofn16 = lfs->ofn16;
+	LPOPENFILENAME16 ofn16 = priv->ofn16;
         char *dest = MapSL(ofn16->lpstrFile);
         char *bs16;
         if (!WideCharToMultiByte( CP_ACP, 0, ofnW->lpstrFile, -1,
@@ -529,359 +230,74 @@ void FILEDLG_UpdateResult(LFSPRIVATE lfs, WCHAR *tmpstr)
         else
             ofn16->nFileExtension++;
     }
-    if (lfs->ofnA)
-    {
-        if (ofnW->nMaxFile &&
-            !WideCharToMultiByte( CP_ACP, 0, ofnW->lpstrFile, -1,
-                                  lfs->ofnA->lpstrFile, ofnW->nMaxFile, NULL, NULL ))
-            lfs->ofnA->lpstrFile[ofnW->nMaxFile-1] = 0;
-        lfs->ofnA->nFileOffset = ofnW->nFileOffset;
-        lfs->ofnA->nFileExtension = ofnW->nFileExtension;
-    }
 }
 
+
 /***********************************************************************
- *                              FILEDLG_UpdateFileTitle         [internal]
- *      update the displayed file name (without path)
+ *                              FD16_UpdateFileTitle         [internal]
+ *          update the real client structures
  */
-void FILEDLG_UpdateFileTitle(LFSPRIVATE lfs)
+static void CALLBACK FD16_UpdateFileTitle(PFD31_DATA lfs)
 {
-  LONG lRet;
-  LPOPENFILENAMEW ofnW = lfs->ofnW;
-  if (ofnW->lpstrFileTitle != NULL)
-  {
-    lRet = SendDlgItemMessageW(lfs->hwnd, lst1, LB_GETCURSEL, 0, 0);
-    SendDlgItemMessageW(lfs->hwnd, lst1, LB_GETTEXT, lRet,
-                             (LPARAM)ofnW->lpstrFileTitle );
-    if (lfs->ofn16)
+    PFD16_PRIVATE priv = (PFD16_PRIVATE) lfs->private1632;
+    LPOPENFILENAMEW ofnW = &lfs->ofnW;
+
+    if (priv->ofn16)
     {
-        char *dest = MapSL(lfs->ofn16->lpstrFileTitle);
+        char *dest = MapSL(priv->ofn16->lpstrFileTitle);
         if (!WideCharToMultiByte( CP_ACP, 0, ofnW->lpstrFileTitle, -1,
                                   dest, ofnW->nMaxFileTitle, NULL, NULL ))
             dest[ofnW->nMaxFileTitle-1] = 0;
     }
-    if (lfs->ofnA)
-    {
-        if (!WideCharToMultiByte( CP_ACP, 0, ofnW->lpstrFileTitle, -1,
-                                  lfs->ofnA->lpstrFileTitle, ofnW->nMaxFileTitle, NULL, NULL ))
-            lfs->ofnA->lpstrFileTitle[ofnW->nMaxFileTitle-1] = 0;
-    }
-  }
 }
 
+
 /***********************************************************************
- *                              FILEDLG_DirListDblClick         [internal]
+ *                              FD16_SendLbGetCurSel         [internal]
+ *          retrieve selected listbox item
  */
-static LRESULT FILEDLG_DirListDblClick( LFSPRIVATE lfs )
+static LRESULT CALLBACK FD16_SendLbGetCurSel(PFD31_DATA lfs)
 {
-  LONG lRet;
-  HWND hWnd = lfs->hwnd;
-  LPWSTR pstr;
-  WCHAR tmpstr[BUFFILE];
-
-  /* get the raw string (with brackets) */
-  lRet = SendDlgItemMessageW(hWnd, lst2, LB_GETCURSEL, 0, 0);
-  if (lRet == LB_ERR) return TRUE;
-  pstr = HeapAlloc(GetProcessHeap(), 0, BUFFILEALLOC);
-  SendDlgItemMessageW(hWnd, lst2, LB_GETTEXT, lRet,
-		     (LPARAM)pstr);
-  strcpyW( tmpstr, pstr );
-  HeapFree(GetProcessHeap(), 0, pstr);
-  /* get the selected directory in tmpstr */
-  if (tmpstr[0] == '[')
-    {
-      tmpstr[lstrlenW(tmpstr) - 1] = 0;
-      strcpyW(tmpstr,tmpstr+1);
-    }
-  strcatW(tmpstr, FILE_bslash);
-
-  FILEDLG_ScanDir(hWnd, tmpstr);
-  /* notify the app */
-  if (lfs->hook)
-    {
-      if (FILEDLG_CallWindowProc(lfs, lfs->lbselchstring, lst2,
-              MAKELONG(lRet,CD_LBSELCHANGE)))
-        return TRUE;
-    }
-  return TRUE;
+    return SendDlgItemMessageW(lfs->hwnd, lst1, LB_GETCURSEL16, 0, 0);
 }
 
-/***********************************************************************
- *                              FILEDLG_FileListSelect         [internal]
- *    called when a new item is picked in the file list
+
+/************************************************************************
+ *                              FD16_Destroy          [internal]
+ *      called from the common 16/32 code to cleanup 32 bit data
  */
-static LRESULT FILEDLG_FileListSelect( LFSPRIVATE lfs )
+static void CALLBACK FD16_Destroy(PFD31_DATA lfs)
 {
-    LONG lRet;
-    HWND hWnd = lfs->hwnd;
-    LPWSTR pstr;
+    PFD16_PRIVATE priv = (PFD16_PRIVATE) lfs->private1632;
 
-    lRet = SendDlgItemMessageW(hWnd, lst1, LB_GETCURSEL16, 0, 0);
-    if (lRet == LB_ERR)
-        return TRUE;
-
-    /* set the edit control to the choosen file */
-    if ((pstr = HeapAlloc(GetProcessHeap(), 0, BUFFILEALLOC)))
+    /* free resources for a 16 bits dialog */
+    if (NULL != priv)
     {
-        SendDlgItemMessageW(hWnd, lst1, LB_GETTEXT, lRet,
-                       (LPARAM)pstr);
-        SetDlgItemTextW( hWnd, edt1, pstr );
-        HeapFree(GetProcessHeap(), 0, pstr);
-    }
-    if (lfs->hook)
-    {
-        FILEDLG_CallWindowProc(lfs, lfs->lbselchstring, lst1,
-                           MAKELONG(lRet,CD_LBSELCHANGE));
-    }
-    /* FIXME: for OFN_ALLOWMULTISELECT we need CD_LBSELSUB, CD_SELADD,
-           CD_LBSELNOITEMS */
-    return TRUE;
-}
-
-/***********************************************************************
- *                              FILEDLG_TestPath      [internal]
- *      before accepting the file name, test if it includes wild cards
- *      tries to scan the directory and returns TRUE if no error.
- */
-static LRESULT FILEDLG_TestPath( LFSPRIVATE lfs, LPWSTR path )
-{
-    HWND hWnd = lfs->hwnd;
-    LPWSTR pBeginFileName, pstr2;
-    WCHAR tmpstr2[BUFFILE];
-
-    pBeginFileName = strrchrW(path, '\\');
-    if (pBeginFileName == NULL)
-	pBeginFileName = strrchrW(path, ':');
-
-    if (strchrW(path,'*') != NULL || strchrW(path,'?') != NULL)
-    {
-        /* edit control contains wildcards */
-        if (pBeginFileName != NULL)
+        if (priv->hResource16) FreeResource16(priv->hResource16);
+        if (priv->hGlobal16)
         {
-	    lstrcpynW(tmpstr2, pBeginFileName + 1, BUFFILE);
-	    *(pBeginFileName + 1) = 0;
-	}
-	else
-	{
-	    strcpyW(tmpstr2, path);
-            if(!(lfs->ofnW->Flags & OFN_NOVALIDATE))
-                *path = 0;
+            GlobalUnlock16(priv->hGlobal16);
+            GlobalFree16(priv->hGlobal16);
         }
-
-        TRACE("path=%s, tmpstr2=%s\n", debugstr_w(path), debugstr_w(tmpstr2));
-        SetDlgItemTextW( hWnd, edt1, tmpstr2 );
-        FILEDLG_ScanDir(hWnd, path);
-        return (lfs->ofnW->Flags & OFN_NOVALIDATE) ? TRUE : FALSE;
+        FD31_FreeOfnW(&lfs->ofnW);
     }
-
-    /* no wildcards, we might have a directory or a filename */
-    /* try appending a wildcard and reading the directory */
-
-    pstr2 = path + lstrlenW(path);
-    if (pBeginFileName == NULL || *(pBeginFileName + 1) != 0)
-        strcatW(path, FILE_bslash);
-
-    /* if ScanDir succeeds, we have changed the directory */
-    if (FILEDLG_ScanDir(hWnd, path))
-        return FALSE; /* and path is not a valid file name */
-
-    /* if not, this must be a filename */
-
-    *pstr2 = 0; /* remove the wildcard added before */
-
-    if (pBeginFileName != NULL)
-    {
-        /* strip off the pathname */
-        *pBeginFileName = 0;
-        SetDlgItemTextW( hWnd, edt1, pBeginFileName + 1 );
-
-        lstrcpynW(tmpstr2, pBeginFileName + 1, sizeof(tmpstr2)/sizeof(WCHAR) );
-        /* Should we MessageBox() if this fails? */
-        if (!FILEDLG_ScanDir(hWnd, path))
-        {
-            return FALSE;
-        }
-        strcpyW(path, tmpstr2);
-    }
-    else
-        SetDlgItemTextW( hWnd, edt1, path );
-    return TRUE;
 }
 
-/***********************************************************************
- *                              FILEDLG_Validate               [internal]
- *   called on: click Ok button, Enter in edit, DoubleClick in file list
- */
-static LRESULT FILEDLG_Validate( LFSPRIVATE lfs, LPWSTR path, UINT control, INT itemIndex,
-                                 BOOL internalUse )
+static void FD16_SetupCallbacks(PFD31_CALLBACKS callbacks)
 {
-    LONG lRet;
-    HWND hWnd = lfs->hwnd;
-    OPENFILENAMEW ofnsav;
-    LPOPENFILENAMEW ofnW = lfs->ofnW;
-    WCHAR filename[BUFFILE];
-
-    ofnsav = *ofnW; /* for later restoring */
-
-    /* get current file name */
-    if (path)
-        lstrcpynW(filename, path, sizeof(filename)/sizeof(WCHAR));
-    else
-        GetDlgItemTextW( hWnd, edt1, filename, sizeof(filename)/sizeof(WCHAR));
-
-    TRACE("got filename = %s\n", debugstr_w(filename));
-    /* if we did not click in file list to get there */
-    if (control != lst1)
-    {
-        if (!FILEDLG_TestPath( lfs, filename) )
-           return FALSE;
-    }
-    FILEDLG_UpdateResult(lfs, filename);
-
-    if (internalUse)
-    { /* called internally after a change in a combo */
-        if (lfs->hook)
-        {
-             FILEDLG_CallWindowProc(lfs, lfs->lbselchstring, control,
-                             MAKELONG(itemIndex,CD_LBSELCHANGE));
-        }
-        return TRUE;
-    }
-
-    FILEDLG_UpdateFileTitle(lfs);
-    if (lfs->hook)
-    {
-        lRet = (BOOL)FILEDLG_CallWindowProc(lfs, lfs->fileokstring,
-                  0, lfs->lParam );
-        if (lRet)
-        {
-            *ofnW = ofnsav; /* restore old state */
-            return FALSE;
-        }
-    }
-    if ((ofnW->Flags & OFN_ALLOWMULTISELECT) && (ofnW->Flags & OFN_EXPLORER))
-    {
-        if (ofnW->lpstrFile)
-        {
-            LPWSTR str = (LPWSTR)ofnW->lpstrFile;
-            LPWSTR ptr = strrchrW(str, '\\');
-	    str[lstrlenW(str) + 1] = '\0';
-	    *ptr = 0;
-        }
-    }
-    return TRUE;
+    callbacks->Init = FD16_Init;
+    callbacks->CWP = FD16_CallWindowProc;
+    callbacks->UpdateResult = FD16_UpdateResult;
+    callbacks->UpdateFileTitle = FD16_UpdateFileTitle;
+    callbacks->SendLbGetCurSel = FD16_SendLbGetCurSel;
+    callbacks->Destroy = FD16_Destroy;
 }
 
 /***********************************************************************
- *                              FILEDLG_DiskChange             [internal]
- *    called when a new item is picked in the disk selection combo
- */
-static LRESULT FILEDLG_DiskChange( LFSPRIVATE lfs )
-{
-    LONG lRet;
-    HWND hWnd = lfs->hwnd;
-    LPWSTR pstr;
-    WCHAR diskname[BUFFILE];
-
-    FILEDLG_StripEditControl(hWnd);
-    lRet = SendDlgItemMessageW(hWnd, cmb2, CB_GETCURSEL, 0, 0L);
-    if (lRet == LB_ERR)
-        return 0;
-    pstr = HeapAlloc(GetProcessHeap(), 0, BUFFILEALLOC);
-    SendDlgItemMessageW(hWnd, cmb2, CB_GETLBTEXT, lRet,
-                         (LPARAM)pstr);
-    wsprintfW(diskname, FILE_specc, pstr[2]);
-    HeapFree(GetProcessHeap(), 0, pstr);
-
-    return FILEDLG_Validate( lfs, diskname, cmb2, lRet, TRUE );
-}
-
-/***********************************************************************
- *                              FILEDLG_FileTypeChange         [internal]
- *    called when a new item is picked in the file type combo
- */
-static LRESULT FILEDLG_FileTypeChange( LFSPRIVATE lfs )
-{
-    LONG lRet;
-    WCHAR diskname[BUFFILE];
-    LPWSTR pstr;
-
-    diskname[0] = 0;
-
-    lRet = SendDlgItemMessageW(lfs->hwnd, cmb1, CB_GETCURSEL, 0, 0);
-    if (lRet == LB_ERR)
-        return TRUE;
-    pstr = (LPWSTR)SendDlgItemMessageW(lfs->hwnd, cmb1, CB_GETITEMDATA, lRet, 0);
-    TRACE("Selected filter : %s\n", debugstr_w(pstr));
-    SetDlgItemTextW( lfs->hwnd, edt1, pstr );
-
-    return FILEDLG_Validate( lfs, NULL, cmb1, lRet, TRUE );
-}
-
-/***********************************************************************
- *                              FILEDLG_WMCommand               [internal]
- */
-static LRESULT FILEDLG_WMCommand(HWND hWnd, LPARAM lParam, UINT notification,
-       UINT control, LFSPRIVATE lfs )
-{
-    switch (control)
-    {
-        case lst1: /* file list */
-        FILEDLG_StripEditControl(hWnd);
-        if (notification == LBN_DBLCLK)
-        {
-            if (FILEDLG_Validate( lfs, NULL, control, 0, FALSE ))
-                EndDialog(hWnd, TRUE);
-            return TRUE;
-        }
-        else if (notification == LBN_SELCHANGE)
-            return FILEDLG_FileListSelect( lfs );
-        break;
-
-        case lst2: /* directory list */
-        FILEDLG_StripEditControl(hWnd);
-        if (notification == LBN_DBLCLK)
-            return FILEDLG_DirListDblClick( lfs );
-        break;
-
-        case cmb1: /* file type drop list */
-        if (notification == CBN_SELCHANGE)
-            return FILEDLG_FileTypeChange( lfs );
-        break;
-
-        case chx1:
-        break;
-
-        case pshHelp:
-        break;
-
-        case cmb2: /* disk dropdown combo */
-        if (notification == CBN_SELCHANGE)
-            return FILEDLG_DiskChange( lfs );
-        break;
-
-        case IDOK:
-        TRACE("OK pressed\n");
-        if (FILEDLG_Validate( lfs, NULL, control, 0, FALSE ))
-            EndDialog(hWnd, TRUE);
-        return TRUE;
-
-        case IDCANCEL:
-        EndDialog(hWnd, FALSE);
-        return TRUE;
-
-        case IDABORT: /* can be sent by the hook procedure */
-        EndDialog(hWnd, TRUE);
-        return TRUE;
-    }
-    return FALSE;
-}
-
-/***********************************************************************
- *                              FILEDLG_MapDrawItemStruct       [internal]
+ *                              FD16_MapDrawItemStruct       [internal]
  *      map a 16 bits drawitem struct to 32
  */
-static void FILEDLG_MapDrawItemStruct(LPDRAWITEMSTRUCT16 lpdis16, LPDRAWITEMSTRUCT lpdis)
+static void FD16_MapDrawItemStruct(LPDRAWITEMSTRUCT16 lpdis16, LPDRAWITEMSTRUCT lpdis)
 {
     lpdis->CtlType = lpdis16->CtlType;
     lpdis->CtlID = lpdis16->CtlID;
@@ -897,593 +313,51 @@ static void FILEDLG_MapDrawItemStruct(LPDRAWITEMSTRUCT16 lpdis16, LPDRAWITEMSTRU
     lpdis->itemData = lpdis16->itemData;
 }
 
-/************************************************************************
- *                              FILEDLG_MapStringPairsToW       [internal]
- *      map string pairs to Unicode
- */
-static LPWSTR FILEDLG_MapStringPairsToW(LPCSTR strA, UINT size)
-{
-    LPCSTR s;
-    LPWSTR x;
-    int n, len;
-
-    s = strA;
-    while (*s)
-        s = s+strlen(s)+1;
-    s++;
-    n = s + 1 - strA; /* Don't forget the other \0 */
-    if (n < size) n = size;
-
-    len = MultiByteToWideChar( CP_ACP, 0, strA, n, NULL, 0 );
-    x = HeapAlloc(GetProcessHeap(),0, len * sizeof(WCHAR));
-    MultiByteToWideChar( CP_ACP, 0, strA, n, x, len );
-    return x;
-}
-
-
-/************************************************************************
- *                              FILEDLG_DupToW                  [internal]
- *      duplicates an Ansi string to unicode, with a buffer size
- */
-LPWSTR FILEDLG_DupToW(LPCSTR str, DWORD size)
-{
-    LPWSTR strW = NULL;
-    if (str && (size > 0))
-    {
-        strW = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR));
-        if (strW) MultiByteToWideChar( CP_ACP, 0, str, -1, strW, size );
-    }
-    return strW;
-}
-
-
-/************************************************************************
- *                              FILEDLG_MapOfnStructA          [internal]
- *      map a 32 bits Ansi structure to an Unicode one
- */
-void FILEDLG_MapOfnStructA(LPOPENFILENAMEA ofnA, LPOPENFILENAMEW ofnW, BOOL open)
-{
-    LPCSTR str;
-    UNICODE_STRING usBuffer;
-
-    ofnW->lStructSize = sizeof(OPENFILENAMEW);
-    ofnW->hwndOwner = ofnA->hwndOwner;
-    ofnW->hInstance = ofnA->hInstance;
-    if (ofnA->lpstrFilter)
-        ofnW->lpstrFilter = FILEDLG_MapStringPairsToW(ofnA->lpstrFilter, 0);
-
-    if ((ofnA->lpstrCustomFilter) && (*(ofnA->lpstrCustomFilter)))
-        ofnW->lpstrCustomFilter = FILEDLG_MapStringPairsToW(ofnA->lpstrCustomFilter, ofnA->nMaxCustFilter);
-    ofnW->nMaxCustFilter = ofnA->nMaxCustFilter;
-    ofnW->nFilterIndex = ofnA->nFilterIndex;
-    ofnW->nMaxFile = ofnA->nMaxFile;
-    ofnW->lpstrFile = FILEDLG_DupToW(ofnA->lpstrFile, ofnW->nMaxFile);
-    ofnW->nMaxFileTitle = ofnA->nMaxFileTitle;
-    ofnW->lpstrFileTitle = FILEDLG_DupToW(ofnA->lpstrFileTitle, ofnW->nMaxFileTitle);
-    if (ofnA->lpstrInitialDir)
-    {
-        RtlCreateUnicodeStringFromAsciiz (&usBuffer,ofnA->lpstrInitialDir);
-        ofnW->lpstrInitialDir = usBuffer.Buffer;
-    }
-    if (ofnA->lpstrTitle)
-        str = ofnA->lpstrTitle;
-    else
-        /* Allocates default title (FIXME : get it from resource) */
-        str = open ? "Open File" : "Save as";
-    RtlCreateUnicodeStringFromAsciiz (&usBuffer,str);
-    ofnW->lpstrTitle = usBuffer.Buffer;
-    ofnW->Flags = ofnA->Flags;
-    ofnW->nFileOffset = ofnA->nFileOffset;
-    ofnW->nFileExtension = ofnA->nFileExtension;
-    ofnW->lpstrDefExt = FILEDLG_DupToW(ofnA->lpstrDefExt, 3);
-    if ((ofnA->Flags & OFN_ENABLETEMPLATE) && (ofnA->lpTemplateName))
-    {
-        if (HIWORD(ofnA->lpTemplateName))
-        {
-            RtlCreateUnicodeStringFromAsciiz (&usBuffer,ofnA->lpTemplateName);
-            ofnW->lpTemplateName = usBuffer.Buffer;
-        }
-        else /* numbered resource */
-            ofnW->lpTemplateName = (LPWSTR) ofnA->lpTemplateName;
-    }
-}
-
-/************************************************************************
- *                              FILEDLG_MapOfnStruct16          [internal]
- *      map a 16 bits structure to an Unicode one
- */
-void FILEDLG_MapOfnStruct16(LPOPENFILENAME16 ofn16, LPOPENFILENAMEW ofnW, BOOL open)
-{
-    OPENFILENAMEA ofnA;
-    /* first convert to linear pointers */
-    memset(&ofnA, 0, sizeof(OPENFILENAMEA));
-    ofnA.lStructSize = sizeof(OPENFILENAMEA);
-    ofnA.hwndOwner = HWND_32(ofn16->hwndOwner);
-    ofnA.hInstance = HINSTANCE_32(ofn16->hInstance);
-    if (ofn16->lpstrFilter)
-        ofnA.lpstrFilter = MapSL(ofn16->lpstrFilter);
-    if (ofn16->lpstrCustomFilter)
-        ofnA.lpstrCustomFilter = MapSL(ofn16->lpstrCustomFilter);
-    ofnA.nMaxCustFilter = ofn16->nMaxCustFilter;
-    ofnA.nFilterIndex = ofn16->nFilterIndex;
-    ofnA.lpstrFile = MapSL(ofn16->lpstrFile);
-    ofnA.nMaxFile = ofn16->nMaxFile;
-    ofnA.lpstrFileTitle = MapSL(ofn16->lpstrFileTitle);
-    ofnA.nMaxFileTitle = ofn16->nMaxFileTitle;
-    ofnA.lpstrInitialDir = MapSL(ofn16->lpstrInitialDir);
-    ofnA.lpstrTitle = MapSL(ofn16->lpstrTitle);
-    ofnA.Flags = ofn16->Flags;
-    ofnA.nFileOffset = ofn16->nFileOffset;
-    ofnA.nFileExtension = ofn16->nFileExtension;
-    ofnA.lpstrDefExt = MapSL(ofn16->lpstrDefExt);
-    if (HIWORD(ofn16->lpTemplateName))
-        ofnA.lpTemplateName = MapSL(ofn16->lpTemplateName);
-    else
-        ofnA.lpTemplateName = (LPSTR) ofn16->lpTemplateName; /* ressource number */
-    /* now calls the 32 bits Ansi to Unicode version to complete the job */
-    FILEDLG_MapOfnStructA(&ofnA, ofnW, open);
-}
-
-/************************************************************************
- *                              FILEDLG_DestroyPrivate            [internal]
- *      destroys the private object
- */
-static void FILEDLG_DestroyPrivate(LFSPRIVATE lfs)
-{
-    HWND hwnd;
-    if (!lfs) return;
-    hwnd = lfs->hwnd;
-    /* free resources for a 16 bits dialog */
-    if (lfs->hResource16) FreeResource16(lfs->hResource16);
-    if (lfs->hGlobal16)
-    {
-        GlobalUnlock16(lfs->hGlobal16);
-        GlobalFree16(lfs->hGlobal16);
-    }
-    /* if ofnW has been allocated, have to free everything in it */
-    if (lfs->ofn16 || lfs->ofnA)
-    {
-       LPOPENFILENAMEW ofnW = lfs->ofnW;
-       if (ofnW->lpstrFilter) HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrFilter);
-       if (ofnW->lpstrCustomFilter) HeapFree(GetProcessHeap(), 0, ofnW->lpstrCustomFilter);
-       if (ofnW->lpstrFile) HeapFree(GetProcessHeap(), 0, ofnW->lpstrFile);
-       if (ofnW->lpstrFileTitle) HeapFree(GetProcessHeap(), 0, ofnW->lpstrFileTitle);
-       if (ofnW->lpstrInitialDir) HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrInitialDir);
-       if (ofnW->lpstrTitle) HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrTitle);
-       if ((ofnW->lpTemplateName) && (HIWORD(ofnW->lpTemplateName)))
-           HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpTemplateName);
-       HeapFree(GetProcessHeap(), 0, ofnW);
-    }
-    TRACE("destroying private allocation %p\n", lfs);
-    HeapFree(GetProcessHeap(), 0, lfs);
-    RemovePropA(hwnd, OFN_PROP);
-}
-
-/************************************************************************
- *                              FILEDLG_AllocPrivate            [internal]
- *      allocate a private object to hold 32 bits Unicode
- *      structure that will be used throughtout the calls, while
- *      keeping available the original structures and a few variables
- *      On entry : type = dialog procedure type (16,32A,32W)
- *                 dlgType = dialog type (open or save)
- */
-static LFSPRIVATE FILEDLG_AllocPrivate(LPARAM lParam, int type, UINT dlgType)
-{
-    LFSPRIVATE lfs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct FSPRIVATE));
-    LFSPRIVATE ret;
-    TRACE("alloc private buf %p\n", lfs);
-    if (!lfs) return NULL;
-    lfs->hook = FALSE;
-    lfs->lParam = lParam;
-    if (dlgType == OPEN_DIALOG)
-        lfs->open = TRUE;
-    else
-        lfs->open = FALSE;
-    lfs->lbselchstring = RegisterWindowMessageA(LBSELCHSTRINGA);
-    lfs->fileokstring = RegisterWindowMessageA(FILEOKSTRINGA);
-    switch(type)
-    {
-        case LFS16:
-        lfs->ofn16 = MapSL(lParam);
-        if (lfs->ofn16->Flags & OFN_ENABLEHOOK)
-            if (lfs->ofn16->lpfnHook)
-                lfs->hook = TRUE;
-
-        break;
-
-        case LFS32A:
-        lfs->ofnA = (LPOPENFILENAMEA) lParam;
-        if (lfs->ofnA->Flags & OFN_ENABLEHOOK)
-            if (lfs->ofnA->lpfnHook)
-                lfs->hook = TRUE;
-        break;
-
-        case LFS32W:
-        lfs->ofnW = (LPOPENFILENAMEW) lParam;
-        if (lfs->ofnW->Flags & OFN_ENABLEHOOK)
-            if (lfs->ofnW->lpfnHook)
-                lfs->hook = TRUE;
-        break;
-    }
-    ret = lfs;
-    if (!lfs->ofnW)
-    { /* this structure is needed internally, so create it */
-        lfs->ofnW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(OPENFILENAMEW));
-        if (lfs->ofnW)
-        {
-            if (lfs->ofn16)
-                FILEDLG_MapOfnStruct16(lfs->ofn16, lfs->ofnW, lfs->open);
-            if (lfs->ofnA)
-                FILEDLG_MapOfnStructA(lfs->ofnA, lfs->ofnW, lfs->open);
-        }
-        else
-            ret = NULL;
-    }
-    if (lfs->ofn16)
-    {
-        if (!Get16BitsTemplate(lfs)) ret = NULL;
-    }
-    else
-        if (!Get32BitsTemplate(lfs)) ret = NULL;
-    if (!ret) FILEDLG_DestroyPrivate(lfs);
-    return ret;
-}
 
 /***********************************************************************
- *                              FILEDLG_CallWindowProc16          [internal]
- *
- *      Call the appropriate hook
+ *                              FD16_WMMeasureItem16         [internal]
  */
-static BOOL FILEDLG_CallWindowProc16(LFSPRIVATE lfs, UINT wMsg, WPARAM wParam,
-                                   LPARAM lParam)
-{
-    if (lfs->ofn16)
-    {
-        return (BOOL16) CallWindowProc16(
-          (WNDPROC16)lfs->ofn16->lpfnHook, HWND_16(lfs->hwnd),
-          (UINT16)wMsg, (WPARAM16)wParam, lParam);
-    }
-    return FALSE;
-}
-
-/***********************************************************************
- *                              FILEDLG_WMInitDialog            [internal]
- */
-
-static LONG FILEDLG_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam)
-{
-  int i, n;
-  WCHAR tmpstr[BUFFILE];
-  LPWSTR pstr, old_pstr;
-  LPOPENFILENAMEW ofn;
-  LFSPRIVATE lfs = (LFSPRIVATE) lParam;
-
-  if (!lfs) return FALSE;
-  SetPropA(hWnd, OFN_PROP, (HANDLE)lfs);
-  lfs->hwnd = hWnd;
-  ofn = lfs->ofnW;
-
-  TRACE("flags=%lx initialdir=%s\n", ofn->Flags, debugstr_w(ofn->lpstrInitialDir));
-
-  SetWindowTextW( hWnd, ofn->lpstrTitle );
-  /* read custom filter information */
-  if (ofn->lpstrCustomFilter)
-    {
-      pstr = ofn->lpstrCustomFilter;
-      n = 0;
-      TRACE("lpstrCustomFilter = %p\n", pstr);
-      while(*pstr)
-	{
-	  old_pstr = pstr;
-          i = SendDlgItemMessageW(hWnd, cmb1, CB_ADDSTRING, 0,
-                                   (LPARAM)(ofn->lpstrCustomFilter) + n );
-          n += lstrlenW(pstr) + 1;
-	  pstr += lstrlenW(pstr) + 1;
-	  TRACE("add str=%s associated to %s\n",
-                debugstr_w(old_pstr), debugstr_w(pstr));
-          SendDlgItemMessageW(hWnd, cmb1, CB_SETITEMDATA, i, (LPARAM)pstr);
-          n += lstrlenW(pstr) + 1;
-	  pstr += lstrlenW(pstr) + 1;
-	}
-    }
-  /* read filter information */
-  if (ofn->lpstrFilter) {
-	pstr = (LPWSTR) ofn->lpstrFilter;
-	n = 0;
-	while(*pstr) {
-	  old_pstr = pstr;
-	  i = SendDlgItemMessageW(hWnd, cmb1, CB_ADDSTRING, 0,
-				       (LPARAM)(ofn->lpstrFilter + n) );
-	  n += lstrlenW(pstr) + 1;
-	  pstr += lstrlenW(pstr) + 1;
-	  TRACE("add str=%s associated to %s\n",
-                debugstr_w(old_pstr), debugstr_w(pstr));
-	  SendDlgItemMessageW(hWnd, cmb1, CB_SETITEMDATA, i, (LPARAM)pstr);
-	  n += lstrlenW(pstr) + 1;
-	  pstr += lstrlenW(pstr) + 1;
-	}
-  }
-  /* set default filter */
-  if (ofn->nFilterIndex == 0 && ofn->lpstrCustomFilter == NULL)
-  	ofn->nFilterIndex = 1;
-  SendDlgItemMessageW(hWnd, cmb1, CB_SETCURSEL, ofn->nFilterIndex - 1, 0);
-  lstrcpynW(tmpstr, FILEDLG_GetFileType(ofn->lpstrCustomFilter,
-	     (LPWSTR)ofn->lpstrFilter, ofn->nFilterIndex - 1),BUFFILE);
-  TRACE("nFilterIndex = %ld, SetText of edt1 to %s\n",
-  			ofn->nFilterIndex, debugstr_w(tmpstr));
-  SetDlgItemTextW( hWnd, edt1, tmpstr );
-  /* get drive list */
-  *tmpstr = 0;
-  DlgDirListComboBoxW(hWnd, tmpstr, cmb2, 0, DDL_DRIVES | DDL_EXCLUSIVE);
-  /* read initial directory */
-  /* FIXME: Note that this is now very version-specific (See MSDN description of
-   * the OPENFILENAME structure).  For example under 2000/XP any path in the
-   * lpstrFile overrides the lpstrInitialDir, but not under 95/98/ME
-   */
-  if (ofn->lpstrInitialDir != NULL)
-    {
-      int len;
-      lstrcpynW(tmpstr, ofn->lpstrInitialDir, 511);
-      len = lstrlenW(tmpstr);
-      if (len > 0 && tmpstr[len-1] != '\\'  && tmpstr[len-1] != ':') {
-        tmpstr[len]='\\';
-        tmpstr[len+1]='\0';
-      }
-    }
-  else
-    *tmpstr = 0;
-  if (!FILEDLG_ScanDir(hWnd, tmpstr)) {
-    *tmpstr = 0;
-    if (!FILEDLG_ScanDir(hWnd, tmpstr))
-      WARN("Couldn't read initial directory %s!\n", debugstr_w(tmpstr));
-  }
-  /* select current drive in combo 2, omit missing drives */
-  {
-      char dir[MAX_PATH];
-      char str[4] = "a:\\";
-      GetCurrentDirectoryA( sizeof(dir), dir );
-      for(i = 0, n = -1; i < 26; i++)
-      {
-          str[0] = 'a' + i;
-          if (GetDriveTypeA(str) > DRIVE_NO_ROOT_DIR) n++;
-          if (toupper(str[0]) == toupper(dir[0])) break;
-      }
-  }
-  SendDlgItemMessageW(hWnd, cmb2, CB_SETCURSEL, n, 0);
-  if (!(ofn->Flags & OFN_SHOWHELP))
-    ShowWindow(GetDlgItem(hWnd, pshHelp), SW_HIDE);
-  if (ofn->Flags & OFN_HIDEREADONLY)
-    ShowWindow(GetDlgItem(hWnd, chx1), SW_HIDE);
-  if (lfs->hook)
-      return (BOOL) FILEDLG_CallWindowProc(lfs, WM_INITDIALOG, wParam, lfs->lParam);
-  return TRUE;
-}
-
-
-
-
-/***********************************************************************
- *                              FILEDLG_WMInitDialog16            [internal]
- *      The is a duplicate of the 32bit FILEDLG_WMInitDialog function 
- *      The only differnce is that it calls FILEDLG_CallWindowProc16 
- *      for a 16 bit Window Proc.
- */
-
-static LONG FILEDLG_WMInitDialog16(HWND hWnd, WPARAM wParam, LPARAM lParam)
-{
-  int i, n;
-  WCHAR tmpstr[BUFFILE];
-  LPWSTR pstr, old_pstr;
-  LPOPENFILENAMEW ofn;
-  LFSPRIVATE lfs = (LFSPRIVATE) lParam;
-
-  if (!lfs) return FALSE;
-  SetPropA(hWnd, OFN_PROP, (HANDLE)lfs);
-  lfs->hwnd = hWnd;
-  ofn = lfs->ofnW;
-
-  TRACE("flags=%lx initialdir=%s\n", ofn->Flags, debugstr_w(ofn->lpstrInitialDir));
-
-  SetWindowTextW( hWnd, ofn->lpstrTitle );
-  /* read custom filter information */
-  if (ofn->lpstrCustomFilter)
-    {
-      pstr = ofn->lpstrCustomFilter;
-      n = 0;
-      TRACE("lpstrCustomFilter = %p\n", pstr);
-      while(*pstr)
-	{
-	  old_pstr = pstr;
-          i = SendDlgItemMessageW(hWnd, cmb1, CB_ADDSTRING, 0,
-                                   (LPARAM)(ofn->lpstrCustomFilter) + n );
-          n += lstrlenW(pstr) + 1;
-	  pstr += lstrlenW(pstr) + 1;
-	  TRACE("add str=%s associated to %s\n",
-                debugstr_w(old_pstr), debugstr_w(pstr));
-          SendDlgItemMessageW(hWnd, cmb1, CB_SETITEMDATA, i, (LPARAM)pstr);
-          n += lstrlenW(pstr) + 1;
-	  pstr += lstrlenW(pstr) + 1;
-	}
-    }
-  /* read filter information */
-  if (ofn->lpstrFilter) {
-	pstr = (LPWSTR) ofn->lpstrFilter;
-	n = 0;
-	while(*pstr) {
-	  old_pstr = pstr;
-	  i = SendDlgItemMessageW(hWnd, cmb1, CB_ADDSTRING, 0,
-				       (LPARAM)(ofn->lpstrFilter + n) );
-	  n += lstrlenW(pstr) + 1;
-	  pstr += lstrlenW(pstr) + 1;
-	  TRACE("add str=%s associated to %s\n",
-                debugstr_w(old_pstr), debugstr_w(pstr));
-	  SendDlgItemMessageW(hWnd, cmb1, CB_SETITEMDATA, i, (LPARAM)pstr);
-	  n += lstrlenW(pstr) + 1;
-	  pstr += lstrlenW(pstr) + 1;
-	}
-  }
-  /* set default filter */
-  if (ofn->nFilterIndex == 0 && ofn->lpstrCustomFilter == NULL)
-  	ofn->nFilterIndex = 1;
-  SendDlgItemMessageW(hWnd, cmb1, CB_SETCURSEL, ofn->nFilterIndex - 1, 0);
-  lstrcpynW(tmpstr, FILEDLG_GetFileType(ofn->lpstrCustomFilter,
-	     (LPWSTR)ofn->lpstrFilter, ofn->nFilterIndex - 1),BUFFILE);
-  TRACE("nFilterIndex = %ld, SetText of edt1 to %s\n",
-  			ofn->nFilterIndex, debugstr_w(tmpstr));
-  SetDlgItemTextW( hWnd, edt1, tmpstr );
-  /* get drive list */
-  *tmpstr = 0;
-  DlgDirListComboBoxW(hWnd, tmpstr, cmb2, 0, DDL_DRIVES | DDL_EXCLUSIVE);
-  /* read initial directory */
-  /* FIXME: Note that this is now very version-specific (See MSDN description of
-   * the OPENFILENAME structure).  For example under 2000/XP any path in the
-   * lpstrFile overrides the lpstrInitialDir, but not under 95/98/ME
-   */
-  if (ofn->lpstrInitialDir != NULL)
-    {
-      int len;
-      lstrcpynW(tmpstr, ofn->lpstrInitialDir, 511);
-      len = lstrlenW(tmpstr);
-      if (len > 0 && tmpstr[len-1] != '\\'  && tmpstr[len-1] != ':') {
-        tmpstr[len]='\\';
-        tmpstr[len+1]='\0';
-      }
-    }
-  else
-    *tmpstr = 0;
-  if (!FILEDLG_ScanDir(hWnd, tmpstr)) {
-    *tmpstr = 0;
-    if (!FILEDLG_ScanDir(hWnd, tmpstr))
-      WARN("Couldn't read initial directory %s!\n", debugstr_w(tmpstr));
-  }
-  /* select current drive in combo 2, omit missing drives */
-  {
-      char dir[MAX_PATH];
-      char str[4] = "a:\\";
-      GetCurrentDirectoryA( sizeof(dir), dir );
-      for(i = 0, n = -1; i < 26; i++)
-      {
-          str[0] = 'a' + i;
-          if (GetDriveTypeA(str) > DRIVE_NO_ROOT_DIR) n++;
-          if (toupper(str[0]) == toupper(dir[0])) break;
-      }
-  }
-  SendDlgItemMessageW(hWnd, cmb2, CB_SETCURSEL, n, 0);
-  if (!(ofn->Flags & OFN_SHOWHELP))
-    ShowWindow(GetDlgItem(hWnd, pshHelp), SW_HIDE);
-  if (ofn->Flags & OFN_HIDEREADONLY)
-    ShowWindow(GetDlgItem(hWnd, chx1), SW_HIDE);
-  if (lfs->hook)
-      return (BOOL) FILEDLG_CallWindowProc16(lfs, WM_INITDIALOG, wParam, lfs->lParam);
-  return TRUE;
-}
-
-/***********************************************************************
- *                              FILEDLG_WMMeasureItem           [internal]
- */
-static LONG FILEDLG_WMMeasureItem(HWND hWnd, WPARAM wParam, LPARAM lParam)
-{
-    LPMEASUREITEMSTRUCT lpmeasure;
-
-    lpmeasure = (LPMEASUREITEMSTRUCT)lParam;
-    lpmeasure->itemHeight = fldrHeight;
-    return TRUE;
-}
-
-
-/***********************************************************************
- *                              FILEDLG_WMMeasureItem16         [internal]
- */
-static LONG FILEDLG_WMMeasureItem16(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam)
+static LONG FD16_WMMeasureItem(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam)
 {
     LPMEASUREITEMSTRUCT16 lpmeasure;
 
     lpmeasure = MapSL(lParam);
-    lpmeasure->itemHeight = fldrHeight;
+    lpmeasure->itemHeight = FD31_GetFldrHeight();
     return TRUE;
 }
 
 /* ------------------ Dialog procedures ---------------------- */
 
 /***********************************************************************
- *           FileOpenDlgProc                                    [internal]
- *      Used for open and save, in fact.
+ *           FileOpenDlgProc16   (COMMDLG.6)
  */
-static INT_PTR CALLBACK FileOpenDlgProc(HWND hWnd, UINT wMsg,
-                                      WPARAM wParam, LPARAM lParam)
-{
-    LFSPRIVATE lfs = (LFSPRIVATE)GetPropA(hWnd,OFN_PROP);
-
-    TRACE("msg=%x wparam=%x lParam=%lx\n", wMsg, wParam, lParam);
-    if ((wMsg != WM_INITDIALOG) && lfs && lfs->hook)
-        {
-            INT_PTR lRet;
-            lRet  = (INT_PTR)FILEDLG_CallWindowProc(lfs, wMsg, wParam, lParam);
-            if (lRet)
-                return lRet;         /* else continue message processing */
-        }
-    switch (wMsg)
-    {
-    case WM_INITDIALOG:
-        return FILEDLG_WMInitDialog(hWnd, wParam, lParam);
-
-    case WM_MEASUREITEM:
-        return FILEDLG_WMMeasureItem(hWnd, wParam, lParam);
-
-    case WM_DRAWITEM:
-        return FILEDLG_WMDrawItem(hWnd, wParam, lParam, !lfs->open, (DRAWITEMSTRUCT *)lParam);
-
-    case WM_COMMAND:
-        return FILEDLG_WMCommand(hWnd, lParam, HIWORD(wParam), LOWORD(wParam), lfs);
-#if 0
-    case WM_CTLCOLOR:
-         SetBkColor((HDC16)wParam, 0x00C0C0C0);
-         switch (HIWORD(lParam))
-         {
-	 case CTLCOLOR_BTN:
-	     SetTextColor((HDC16)wParam, 0x00000000);
-             return hGRAYBrush;
-	case CTLCOLOR_STATIC:
-             SetTextColor((HDC16)wParam, 0x00000000);
-             return hGRAYBrush;
-	}
-      break;
-#endif
-    }
-    return FALSE;
-}
-
-/***********************************************************************
- *           FileOpenDlgProc   (COMMDLG.6)
- */
-BOOL16 CALLBACK FileOpenDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam,
-                               LPARAM lParam)
+BOOL16 CALLBACK FileOpenDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, LPARAM lParam)
 {
     HWND hWnd = HWND_32(hWnd16);
-    LFSPRIVATE lfs = (LFSPRIVATE)GetPropA(hWnd,OFN_PROP);
+    PFD31_DATA lfs = (PFD31_DATA)GetPropA(hWnd,FD31_OFN_PROP);
     DRAWITEMSTRUCT dis;
 
     TRACE("msg=%x wparam=%x lParam=%lx\n", wMsg, wParam, lParam);
     if ((wMsg != WM_INITDIALOG) && lfs && lfs->hook)
         {
-            LRESULT lRet = (BOOL16)FILEDLG_CallWindowProc16(lfs, wMsg, wParam, lParam);
+            LRESULT lRet = (BOOL16)FD31_CallWindowProc(lfs, wMsg, wParam, lParam);
             if (lRet)
                 return lRet;         /* else continue message processing */
         }
     switch (wMsg)
     {
     case WM_INITDIALOG:
-        return FILEDLG_WMInitDialog16(hWnd, wParam, lParam);
+        return FD31_WMInitDialog(hWnd, wParam, lParam);
 
     case WM_MEASUREITEM:
-        return FILEDLG_WMMeasureItem16(hWnd16, wParam, lParam);
+        return FD16_WMMeasureItem(hWnd16, wParam, lParam);
 
     case WM_DRAWITEM:
-        FILEDLG_MapDrawItemStruct(MapSL(lParam), &dis);
-        return FILEDLG_WMDrawItem(hWnd, wParam, lParam, FALSE, &dis);
+        FD16_MapDrawItemStruct(MapSL(lParam), &dis);
+        return FD31_WMDrawItem(hWnd, wParam, lParam, FALSE, &dis);
 
     case WM_COMMAND:
-        return FILEDLG_WMCommand(hWnd, lParam, HIWORD(lParam),wParam, lfs);
+        return FD31_WMCommand(hWnd, lParam, HIWORD(lParam),wParam, lfs);
 #if 0
     case WM_CTLCOLOR:
          SetBkColor((HDC16)wParam, 0x00C0C0C0);
@@ -1503,36 +377,35 @@ BOOL16 CALLBACK FileOpenDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam,
 }
 
 /***********************************************************************
- *           FileSaveDlgProc   (COMMDLG.7)
+ *           FileSaveDlgProc16   (COMMDLG.7)
  */
-BOOL16 CALLBACK FileSaveDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam,
-                               LPARAM lParam)
+BOOL16 CALLBACK FileSaveDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, LPARAM lParam)
 {
  HWND hWnd = HWND_32(hWnd16);
- LFSPRIVATE lfs = (LFSPRIVATE)GetPropA(hWnd,OFN_PROP);
+ PFD31_DATA lfs = (PFD31_DATA)GetPropA(hWnd,FD31_OFN_PROP);
  DRAWITEMSTRUCT dis;
 
  TRACE("msg=%x wparam=%x lParam=%lx\n", wMsg, wParam, lParam);
  if ((wMsg != WM_INITDIALOG) && lfs && lfs->hook)
   {
    LRESULT  lRet;
-   lRet = (BOOL16)FILEDLG_CallWindowProc16(lfs, wMsg, wParam, lParam);
+   lRet = (BOOL16)FD31_CallWindowProc(lfs, wMsg, wParam, lParam);
    if (lRet)
     return lRet;         /* else continue message processing */
   }
   switch (wMsg) {
    case WM_INITDIALOG:
-      return FILEDLG_WMInitDialog16(hWnd, wParam, lParam);
+      return FD31_WMInitDialog(hWnd, wParam, lParam);
 
    case WM_MEASUREITEM:
-      return FILEDLG_WMMeasureItem16(hWnd16, wParam, lParam);
+      return FD16_WMMeasureItem(hWnd16, wParam, lParam);
 
    case WM_DRAWITEM:
-      FILEDLG_MapDrawItemStruct(MapSL(lParam), &dis);
-      return FILEDLG_WMDrawItem(hWnd, wParam, lParam, TRUE, &dis);
+      FD16_MapDrawItemStruct(MapSL(lParam), &dis);
+      return FD31_WMDrawItem(hWnd, wParam, lParam, TRUE, &dis);
 
    case WM_COMMAND:
-      return FILEDLG_WMCommand(hWnd, lParam, HIWORD(lParam), wParam, lfs);
+      return FD31_WMCommand(hWnd, lParam, HIWORD(lParam), wParam, lfs);
   }
 
   /*
@@ -1553,73 +426,6 @@ BOOL16 CALLBACK FileSaveDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam,
   return FALSE;
 }
 
-
-
-/***********************************************************************
- *           GetFileName31A                                 [internal]
- *
- * Creates a win31 style dialog box for the user to select a file to open/save.
- */
-BOOL GetFileName31A(
-                    LPOPENFILENAMEA lpofn, /* addess of structure with data*/
-                    UINT dlgType /* type dialogue : open/save */
-                    )
-{
-    HINSTANCE hInst;
-    BOOL bRet = FALSE;
-    LFSPRIVATE lfs;
-
-    if (!lpofn || !FileDlg_Init()) return FALSE;
-
-    TRACE("ofn flags %08lx\n", lpofn->Flags);
-    lfs = FILEDLG_AllocPrivate((LPARAM) lpofn, LFS32A, dlgType);
-    if (lfs)
-    {
-        hInst = (HINSTANCE)GetWindowLongA( lpofn->hwndOwner, GWL_HINSTANCE );
-        bRet = DialogBoxIndirectParamA( hInst, lfs->template, lpofn->hwndOwner,
-                                        FileOpenDlgProc, (LPARAM)lfs);
-        FILEDLG_DestroyPrivate(lfs);
-    }
-
-    TRACE("return lpstrFile='%s' !\n", lpofn->lpstrFile);
-    return bRet;
-}
-
-/***********************************************************************
- *           GetFileName31W                                 [internal]
- *
- * Creates a win31 style dialog box for the user to select a file to open/save
- */
-BOOL GetFileName31W(
-                    LPOPENFILENAMEW lpofn, /* addess of structure with data*/
-                    UINT dlgType /* type dialogue : open/save */
-                    )
-{
-    HINSTANCE hInst;
-    BOOL bRet = FALSE;
-    LFSPRIVATE lfs;
-
-    if (!lpofn || !FileDlg_Init()) return FALSE;
-
-    lfs = FILEDLG_AllocPrivate((LPARAM) lpofn, LFS32W, dlgType);
-    if (lfs)
-    {
-        hInst = (HINSTANCE)GetWindowLongA( lpofn->hwndOwner, GWL_HINSTANCE );
-        bRet = DialogBoxIndirectParamW( hInst, lfs->template, lpofn->hwndOwner,
-                                        FileOpenDlgProc, (LPARAM)lfs);
-        FILEDLG_DestroyPrivate(lfs);
-    }
-
-    TRACE("return lpstrFile=%s !\n", debugstr_w(lpofn->lpstrFile));
-    return bRet;
-}
-
-
-
-
-
-
-
 /* ------------------ APIs ---------------------- */
 
 /***********************************************************************
@@ -1641,19 +447,23 @@ BOOL16 WINAPI GetOpenFileName16(
     HINSTANCE16 hInst;
     BOOL bRet = FALSE;
     LPOPENFILENAME16 lpofn = MapSL(ofn);
-    LFSPRIVATE lfs;
+    PFD31_DATA lfs;
     FARPROC16 ptr;
+    FD31_CALLBACKS callbacks;
+    PFD16_PRIVATE priv;
 
-    if (!lpofn || !FileDlg_Init()) return FALSE;
+    if (!lpofn || !FD31_Init()) return FALSE;
 
-    lfs = FILEDLG_AllocPrivate((LPARAM) ofn, LFS16, OPEN_DIALOG);
+    FD16_SetupCallbacks(&callbacks);
+    lfs = FD31_AllocPrivate((LPARAM) ofn, OPEN_DIALOG, &callbacks, 0);
     if (lfs)
     {
+        priv = (PFD16_PRIVATE) lfs->private1632;
         hInst = GetWindowWord( HWND_32(lpofn->hwndOwner), GWL_HINSTANCE );
         ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 6);
-        bRet = DialogBoxIndirectParam16( hInst, lfs->hDlgTmpl16, lpofn->hwndOwner,
+        bRet = DialogBoxIndirectParam16( hInst, priv->hDlgTmpl16, lpofn->hwndOwner,
                                          (DLGPROC16) ptr, (LPARAM) lfs);
-        FILEDLG_DestroyPrivate(lfs);
+        FD31_DestroyPrivate(lfs);
     }
 
     TRACE("return lpstrFile='%s' !\n", (char *)MapSL(lpofn->lpstrFile));
@@ -1679,19 +489,23 @@ BOOL16 WINAPI GetSaveFileName16(
     HINSTANCE16 hInst;
     BOOL bRet = FALSE;
     LPOPENFILENAME16 lpofn = MapSL(ofn);
-    LFSPRIVATE lfs;
+    PFD31_DATA lfs;
     FARPROC16 ptr;
+    FD31_CALLBACKS callbacks;
+    PFD16_PRIVATE priv;
 
-    if (!lpofn || !FileDlg_Init()) return FALSE;
+    if (!lpofn || !FD31_Init()) return FALSE;
 
-    lfs = FILEDLG_AllocPrivate((LPARAM) ofn, LFS16, SAVE_DIALOG);
+    FD16_SetupCallbacks(&callbacks);
+    lfs = FD31_AllocPrivate((LPARAM) ofn, SAVE_DIALOG, &callbacks, 0);
     if (lfs)
     {
+        priv = (PFD16_PRIVATE) lfs->private1632;
         hInst = GetWindowWord( HWND_32(lpofn->hwndOwner), GWL_HINSTANCE );
         ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 7);
-        bRet = DialogBoxIndirectParam16( hInst, lfs->hDlgTmpl16, lpofn->hwndOwner,
+        bRet = DialogBoxIndirectParam16( hInst, priv->hDlgTmpl16, lpofn->hwndOwner,
                                          (DLGPROC16) ptr, (LPARAM) lfs);
-        FILEDLG_DestroyPrivate(lfs);
+        FD31_DestroyPrivate(lfs);
     }
 
     TRACE("return lpstrFile='%s' !\n", (char *)MapSL(lpofn->lpstrFile));
diff --git a/reactos/lib/comdlg32/filedlg31.c b/reactos/lib/comdlg32/filedlg31.c
new file mode 100644
index 00000000000..92fa3093c18
--- /dev/null
+++ b/reactos/lib/comdlg32/filedlg31.c
@@ -0,0 +1,931 @@
+/*
+ * COMMDLG - File Dialogs
+ *
+ * Copyright 1994 Martin Ayotte
+ * Copyright 1996 Albrecht Kleine
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#include <ctype.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "wine/unicode.h"
+#include "wine/debug.h"
+#include "cderr.h"
+#include "winreg.h"
+#include "winternl.h"
+#include "winuser.h"
+#include "commdlg.h"
+#include "cderr.h"
+#include "winreg.h"
+#include "winternl.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
+
+#include "cdlg.h"
+#include "filedlg31.h"
+
+#define BUFFILE 512
+#define BUFFILEALLOC 512 * sizeof(WCHAR)
+
+static const WCHAR FILE_star[] = {'*','.','*', 0};
+static const WCHAR FILE_bslash[] = {'\\', 0};
+static const WCHAR FILE_specc[] = {'%','c',':', 0};
+static const int fldrHeight = 16;
+static const int fldrWidth = 20;
+
+static HICON hFolder = 0;
+static HICON hFolder2 = 0;
+static HICON hFloppy = 0;
+static HICON hHDisk = 0;
+static HICON hCDRom = 0;
+static HICON hNet = 0;
+
+/***********************************************************************
+ * 				FD31_Init			[internal]
+ */
+BOOL FD31_Init(void)
+{
+    static BOOL initialized = 0;
+
+    if (!initialized) {
+        hFolder  = LoadImageA( COMDLG32_hInstance, "FOLDER", IMAGE_ICON, 16, 16, LR_SHARED );
+        hFolder2 = LoadImageA( COMDLG32_hInstance, "FOLDER2", IMAGE_ICON, 16, 16, LR_SHARED );
+        hFloppy  = LoadImageA( COMDLG32_hInstance, "FLOPPY", IMAGE_ICON, 16, 16, LR_SHARED );
+        hHDisk   = LoadImageA( COMDLG32_hInstance, "HDISK", IMAGE_ICON, 16, 16, LR_SHARED );
+        hCDRom   = LoadImageA( COMDLG32_hInstance, "CDROM", IMAGE_ICON, 16, 16, LR_SHARED );
+        hNet     = LoadImageA( COMDLG32_hInstance, "NETWORK", IMAGE_ICON, 16, 16, LR_SHARED );
+	if (hFolder == 0 || hFolder2 == 0 || hFloppy == 0 ||
+	    hHDisk == 0 || hCDRom == 0 || hNet == 0)
+	{
+	    ERR("Error loading icons !\n");
+	    return FALSE;
+	}
+	initialized = TRUE;
+    }
+    return TRUE;
+}
+
+/***********************************************************************
+ *                              FD31_StripEditControl        [internal]
+ * Strip pathnames off the contents of the edit control.
+ */
+static void FD31_StripEditControl(HWND hwnd)
+{
+    WCHAR temp[BUFFILE], *cp;
+
+    GetDlgItemTextW( hwnd, edt1, temp, sizeof(temp)/sizeof(WCHAR));
+    cp = strrchrW(temp, '\\');
+    if (cp != NULL) {
+	strcpyW(temp, cp+1);
+    }
+    cp = strrchrW(temp, ':');
+    if (cp != NULL) {
+	strcpyW(temp, cp+1);
+    }
+    /* FIXME: shouldn't we do something with the result here? ;-) */
+}
+
+/***********************************************************************
+ *                              FD31_CallWindowProc          [internal]
+ *
+ *      Call the appropriate hook
+ */
+BOOL FD31_CallWindowProc(PFD31_DATA lfs, UINT wMsg, WPARAM wParam,
+                         LPARAM lParam)
+{
+    return lfs->callbacks->CWP(lfs, wMsg, wParam, lParam);
+}
+
+/***********************************************************************
+ * 				FD31_ScanDir                 [internal]
+ */
+static BOOL FD31_ScanDir(HWND hWnd, LPWSTR newPath)
+{
+    WCHAR		buffer[BUFFILE];
+    HWND 		hdlg, hdlgDir;
+    LRESULT             lRet = TRUE;
+    HCURSOR             hCursorWait, oldCursor;
+
+    TRACE("Trying to change to %s\n", debugstr_w(newPath));
+    if  ( newPath[0] && !SetCurrentDirectoryW( newPath ))
+        return FALSE;
+    lstrcpynW(buffer, newPath, sizeof(buffer)/sizeof(WCHAR));
+
+    /* get the list of spec files */
+    GetDlgItemTextW(hWnd, edt1, buffer, sizeof(buffer)/sizeof(WCHAR));
+
+    hCursorWait = LoadCursorA(0, (LPSTR)IDC_WAIT);
+    oldCursor = SetCursor(hCursorWait);
+
+    /* list of files */
+    if ((hdlg = GetDlgItem(hWnd, lst1)) != 0) {
+        WCHAR*	scptr; /* ptr on semi-colon */
+	WCHAR*	filter = buffer;
+
+	TRACE("Using filter %s\n", debugstr_w(filter));
+	SendMessageW(hdlg, LB_RESETCONTENT, 0, 0);
+	while (filter) {
+	    scptr = strchrW(filter, ';');
+	    if (scptr)	*scptr = 0;
+            while (*filter == ' ') filter++;
+	    TRACE("Using file spec %s\n", debugstr_w(filter));
+	    if (SendMessageW(hdlg, LB_DIR, 0, (LPARAM)filter) == LB_ERR)
+	        return FALSE;
+	    if (scptr) *scptr = ';';
+	        filter = (scptr) ? (scptr + 1) : 0;
+	 }
+    }
+
+    /* list of directories */
+    strcpyW(buffer, FILE_star);
+
+    if ((hdlgDir = GetDlgItem(hWnd, lst2)) != 0) {
+        lRet = DlgDirListW(hWnd, buffer, lst2, stc1, DDL_EXCLUSIVE | DDL_DIRECTORY);
+    }
+    SetCursor(oldCursor);
+    return lRet;
+}
+
+/***********************************************************************
+ * 				FD31_GetFileType		[internal]
+ */
+
+static LPWSTR FD31_GetFileType(LPWSTR cfptr, LPWSTR fptr, WORD index)
+{
+  int n, i;
+  i = 0;
+  if (cfptr)
+    for ( ;(n = lstrlenW(cfptr)) != 0; i++)
+      {
+	cfptr += n + 1;
+	if (i == index)
+	  return cfptr;
+	cfptr += lstrlenW(cfptr) + 1;
+      }
+  if (fptr)
+    for ( ;(n = lstrlenW(fptr)) != 0; i++)
+      {
+	fptr += n + 1;
+	if (i == index)
+	  return fptr;
+	fptr += lstrlenW(fptr) + 1;
+    }
+  return (LPWSTR) FILE_star; /* FIXME */
+}
+
+/***********************************************************************
+ *                              FD31_WMDrawItem              [internal]
+ */
+LONG FD31_WMDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam,
+       int savedlg, LPDRAWITEMSTRUCT lpdis)
+{
+    WCHAR *str;
+    HICON hIcon;
+    COLORREF oldText = 0, oldBk = 0;
+
+    if (lpdis->CtlType == ODT_LISTBOX && lpdis->CtlID == lst1)
+    {
+        if (!(str = HeapAlloc(GetProcessHeap(), 0, BUFFILEALLOC))) return FALSE;
+	SendMessageW(lpdis->hwndItem, LB_GETTEXT, lpdis->itemID,
+                      (LPARAM)str);
+
+	if ((lpdis->itemState & ODS_SELECTED) && !savedlg)
+	{
+	    oldBk = SetBkColor( lpdis->hDC, GetSysColor( COLOR_HIGHLIGHT ) );
+	    oldText = SetTextColor( lpdis->hDC, GetSysColor(COLOR_HIGHLIGHTTEXT));
+	}
+	if (savedlg)
+	    SetTextColor(lpdis->hDC,GetSysColor(COLOR_GRAYTEXT) );
+
+	ExtTextOutW(lpdis->hDC, lpdis->rcItem.left + 1,
+                  lpdis->rcItem.top + 1, ETO_OPAQUE | ETO_CLIPPED,
+                  &(lpdis->rcItem), str, lstrlenW(str), NULL);
+
+	if (lpdis->itemState & ODS_SELECTED)
+	    DrawFocusRect( lpdis->hDC, &(lpdis->rcItem) );
+
+	if ((lpdis->itemState & ODS_SELECTED) && !savedlg)
+	{
+	    SetBkColor( lpdis->hDC, oldBk );
+	    SetTextColor( lpdis->hDC, oldText );
+	}
+        HeapFree(GetProcessHeap(), 0, str);
+	return TRUE;
+    }
+
+    if (lpdis->CtlType == ODT_LISTBOX && lpdis->CtlID == lst2)
+    {
+        if (!(str = HeapAlloc(GetProcessHeap(), 0, BUFFILEALLOC)))
+            return FALSE;
+	SendMessageW(lpdis->hwndItem, LB_GETTEXT, lpdis->itemID,
+                      (LPARAM)str);
+
+	if (lpdis->itemState & ODS_SELECTED)
+	{
+	    oldBk = SetBkColor( lpdis->hDC, GetSysColor( COLOR_HIGHLIGHT ) );
+	    oldText = SetTextColor( lpdis->hDC, GetSysColor(COLOR_HIGHLIGHTTEXT));
+	}
+	ExtTextOutW(lpdis->hDC, lpdis->rcItem.left + fldrWidth,
+                  lpdis->rcItem.top + 1, ETO_OPAQUE | ETO_CLIPPED,
+                  &(lpdis->rcItem), str, lstrlenW(str), NULL);
+
+	if (lpdis->itemState & ODS_SELECTED)
+	    DrawFocusRect( lpdis->hDC, &(lpdis->rcItem) );
+
+	if (lpdis->itemState & ODS_SELECTED)
+	{
+	    SetBkColor( lpdis->hDC, oldBk );
+	    SetTextColor( lpdis->hDC, oldText );
+	}
+	DrawIcon(lpdis->hDC, lpdis->rcItem.left, lpdis->rcItem.top, hFolder);
+        HeapFree(GetProcessHeap(), 0, str);
+	return TRUE;
+    }
+    if (lpdis->CtlType == ODT_COMBOBOX && lpdis->CtlID == cmb2)
+    {
+        char root[] = "a:";
+        if (!(str = HeapAlloc(GetProcessHeap(), 0, BUFFILEALLOC)))
+            return FALSE;
+	SendMessageW(lpdis->hwndItem, CB_GETLBTEXT, lpdis->itemID,
+                      (LPARAM)str);
+        root[0] += str[2] - 'a';
+        switch(GetDriveTypeA(root))
+        {
+        case DRIVE_REMOVABLE: hIcon = hFloppy; break;
+        case DRIVE_CDROM:     hIcon = hCDRom; break;
+        case DRIVE_REMOTE:    hIcon = hNet; break;
+        case DRIVE_FIXED:
+        default:           hIcon = hHDisk; break;
+        }
+	if (lpdis->itemState & ODS_SELECTED)
+	{
+	    oldBk = SetBkColor( lpdis->hDC, GetSysColor( COLOR_HIGHLIGHT ) );
+	    oldText = SetTextColor( lpdis->hDC, GetSysColor(COLOR_HIGHLIGHTTEXT));
+	}
+	ExtTextOutW(lpdis->hDC, lpdis->rcItem.left + fldrWidth,
+                  lpdis->rcItem.top + 1, ETO_OPAQUE | ETO_CLIPPED,
+                  &(lpdis->rcItem), str, lstrlenW(str), NULL);
+
+	if (lpdis->itemState & ODS_SELECTED)
+	{
+	    SetBkColor( lpdis->hDC, oldBk );
+	    SetTextColor( lpdis->hDC, oldText );
+	}
+	DrawIcon(lpdis->hDC, lpdis->rcItem.left, lpdis->rcItem.top, hIcon);
+        HeapFree(GetProcessHeap(), 0, str);
+	return TRUE;
+    }
+    return FALSE;
+}
+
+/***********************************************************************
+ *                              FD31_UpdateResult            [internal]
+ *      update the displayed file name (with path)
+ */
+void FD31_UpdateResult(PFD31_DATA lfs, WCHAR *tmpstr)
+{
+    int lenstr2;
+    LPOPENFILENAMEW ofnW = &lfs->ofnW;
+    WCHAR tmpstr2[BUFFILE];
+    WCHAR *bs;
+
+    TRACE("%s\n", debugstr_w(tmpstr));
+    if(ofnW->Flags & OFN_NOVALIDATE)
+        tmpstr2[0] = '\0';
+    else
+        GetCurrentDirectoryW(BUFFILE, tmpstr2);
+    lenstr2 = strlenW(tmpstr2);
+    if (lenstr2 > 3)
+        tmpstr2[lenstr2++]='\\';
+    lstrcpynW(tmpstr2+lenstr2, tmpstr, BUFFILE-lenstr2);
+    if (ofnW->lpstrFile)
+        lstrcpynW(ofnW->lpstrFile, tmpstr2, ofnW->nMaxFile);
+    if((bs = strrchrW(tmpstr2, '\\')) != NULL)
+        ofnW->nFileOffset = bs - tmpstr2 +1;
+    else
+        ofnW->nFileOffset = 0;
+    ofnW->nFileExtension = 0;
+    while(tmpstr2[ofnW->nFileExtension] != '.' && tmpstr2[ofnW->nFileExtension] != '\0')
+        ofnW->nFileExtension++;
+    if (tmpstr2[ofnW->nFileExtension] == '\0')
+        ofnW->nFileExtension = 0;
+    else
+        ofnW->nFileExtension++;
+    /* update the real client structures if any */
+    lfs->callbacks->UpdateResult(lfs);
+}
+
+/***********************************************************************
+ *                              FD31_UpdateFileTitle         [internal]
+ *      update the displayed file name (without path)
+ */
+void FD31_UpdateFileTitle(PFD31_DATA lfs)
+{
+  LONG lRet;
+  LPOPENFILENAMEW ofnW = &lfs->ofnW;
+  if (ofnW->lpstrFileTitle != NULL)
+  {
+    lRet = SendDlgItemMessageW(lfs->hwnd, lst1, LB_GETCURSEL, 0, 0);
+    SendDlgItemMessageW(lfs->hwnd, lst1, LB_GETTEXT, lRet,
+                             (LPARAM)ofnW->lpstrFileTitle );
+    lfs->callbacks->UpdateFileTitle(lfs);
+  }
+}
+
+/***********************************************************************
+ *                              FD31_DirListDblClick         [internal]
+ */
+static LRESULT FD31_DirListDblClick( PFD31_DATA lfs )
+{
+  LONG lRet;
+  HWND hWnd = lfs->hwnd;
+  LPWSTR pstr;
+  WCHAR tmpstr[BUFFILE];
+
+  /* get the raw string (with brackets) */
+  lRet = SendDlgItemMessageW(hWnd, lst2, LB_GETCURSEL, 0, 0);
+  if (lRet == LB_ERR) return TRUE;
+  pstr = HeapAlloc(GetProcessHeap(), 0, BUFFILEALLOC);
+  SendDlgItemMessageW(hWnd, lst2, LB_GETTEXT, lRet,
+		     (LPARAM)pstr);
+  strcpyW( tmpstr, pstr );
+  HeapFree(GetProcessHeap(), 0, pstr);
+  /* get the selected directory in tmpstr */
+  if (tmpstr[0] == '[')
+    {
+      tmpstr[lstrlenW(tmpstr) - 1] = 0;
+      strcpyW(tmpstr,tmpstr+1);
+    }
+  strcatW(tmpstr, FILE_bslash);
+
+  FD31_ScanDir(hWnd, tmpstr);
+  /* notify the app */
+  if (lfs->hook)
+    {
+      if (FD31_CallWindowProc(lfs, lfs->lbselchstring, lst2,
+              MAKELONG(lRet,CD_LBSELCHANGE)))
+        return TRUE;
+    }
+  return TRUE;
+}
+
+/***********************************************************************
+ *                              FD31_FileListSelect         [internal]
+ *    called when a new item is picked in the file list
+ */
+static LRESULT FD31_FileListSelect( PFD31_DATA lfs )
+{
+    LONG lRet;
+    HWND hWnd = lfs->hwnd;
+    LPWSTR pstr;
+
+    lRet = lfs->callbacks->SendLbGetCurSel(lfs);
+    if (lRet == LB_ERR)
+        return TRUE;
+
+    /* set the edit control to the choosen file */
+    if ((pstr = HeapAlloc(GetProcessHeap(), 0, BUFFILEALLOC)))
+    {
+        SendDlgItemMessageW(hWnd, lst1, LB_GETTEXT, lRet,
+                       (LPARAM)pstr);
+        SetDlgItemTextW( hWnd, edt1, pstr );
+        HeapFree(GetProcessHeap(), 0, pstr);
+    }
+    if (lfs->hook)
+    {
+        FD31_CallWindowProc(lfs, lfs->lbselchstring, lst1,
+                           MAKELONG(lRet,CD_LBSELCHANGE));
+    }
+    /* FIXME: for OFN_ALLOWMULTISELECT we need CD_LBSELSUB, CD_SELADD,
+           CD_LBSELNOITEMS */
+    return TRUE;
+}
+
+/***********************************************************************
+ *                              FD31_TestPath      [internal]
+ *      before accepting the file name, test if it includes wild cards
+ *      tries to scan the directory and returns TRUE if no error.
+ */
+static LRESULT FD31_TestPath( PFD31_DATA lfs, LPWSTR path )
+{
+    HWND hWnd = lfs->hwnd;
+    LPWSTR pBeginFileName, pstr2;
+    WCHAR tmpstr2[BUFFILE];
+
+    pBeginFileName = strrchrW(path, '\\');
+    if (pBeginFileName == NULL)
+	pBeginFileName = strrchrW(path, ':');
+
+    if (strchrW(path,'*') != NULL || strchrW(path,'?') != NULL)
+    {
+        /* edit control contains wildcards */
+        if (pBeginFileName != NULL)
+        {
+	    lstrcpynW(tmpstr2, pBeginFileName + 1, BUFFILE);
+	    *(pBeginFileName + 1) = 0;
+	}
+	else
+	{
+	    strcpyW(tmpstr2, path);
+            if(!(lfs->ofnW.Flags & OFN_NOVALIDATE))
+                *path = 0;
+        }
+
+        TRACE("path=%s, tmpstr2=%s\n", debugstr_w(path), debugstr_w(tmpstr2));
+        SetDlgItemTextW( hWnd, edt1, tmpstr2 );
+        FD31_ScanDir(hWnd, path);
+        return (lfs->ofnW.Flags & OFN_NOVALIDATE) ? TRUE : FALSE;
+    }
+
+    /* no wildcards, we might have a directory or a filename */
+    /* try appending a wildcard and reading the directory */
+
+    pstr2 = path + lstrlenW(path);
+    if (pBeginFileName == NULL || *(pBeginFileName + 1) != 0)
+        strcatW(path, FILE_bslash);
+
+    /* if ScanDir succeeds, we have changed the directory */
+    if (FD31_ScanDir(hWnd, path))
+        return FALSE; /* and path is not a valid file name */
+
+    /* if not, this must be a filename */
+
+    *pstr2 = 0; /* remove the wildcard added before */
+
+    if (pBeginFileName != NULL)
+    {
+        /* strip off the pathname */
+        *pBeginFileName = 0;
+        SetDlgItemTextW( hWnd, edt1, pBeginFileName + 1 );
+
+        lstrcpynW(tmpstr2, pBeginFileName + 1, sizeof(tmpstr2)/sizeof(WCHAR) );
+        /* Should we MessageBox() if this fails? */
+        if (!FD31_ScanDir(hWnd, path))
+        {
+            return FALSE;
+        }
+        strcpyW(path, tmpstr2);
+    }
+    else
+        SetDlgItemTextW( hWnd, edt1, path );
+    return TRUE;
+}
+
+/***********************************************************************
+ *                              FD31_Validate               [internal]
+ *   called on: click Ok button, Enter in edit, DoubleClick in file list
+ */
+static LRESULT FD31_Validate( PFD31_DATA lfs, LPWSTR path, UINT control, INT itemIndex,
+                                 BOOL internalUse )
+{
+    LONG lRet;
+    HWND hWnd = lfs->hwnd;
+    OPENFILENAMEW ofnsav;
+    LPOPENFILENAMEW ofnW = &lfs->ofnW;
+    WCHAR filename[BUFFILE];
+
+    ofnsav = *ofnW; /* for later restoring */
+
+    /* get current file name */
+    if (path)
+        lstrcpynW(filename, path, sizeof(filename)/sizeof(WCHAR));
+    else
+        GetDlgItemTextW( hWnd, edt1, filename, sizeof(filename)/sizeof(WCHAR));
+
+    TRACE("got filename = %s\n", debugstr_w(filename));
+    /* if we did not click in file list to get there */
+    if (control != lst1)
+    {
+        if (!FD31_TestPath( lfs, filename) )
+           return FALSE;
+    }
+    FD31_UpdateResult(lfs, filename);
+
+    if (internalUse)
+    { /* called internally after a change in a combo */
+        if (lfs->hook)
+        {
+             FD31_CallWindowProc(lfs, lfs->lbselchstring, control,
+                             MAKELONG(itemIndex,CD_LBSELCHANGE));
+        }
+        return TRUE;
+    }
+
+    FD31_UpdateFileTitle(lfs);
+    if (lfs->hook)
+    {
+        lRet = (BOOL)FD31_CallWindowProc(lfs, lfs->fileokstring,
+                  0, lfs->lParam );
+        if (lRet)
+        {
+            *ofnW = ofnsav; /* restore old state */
+            return FALSE;
+        }
+    }
+    if ((ofnW->Flags & OFN_ALLOWMULTISELECT) && (ofnW->Flags & OFN_EXPLORER))
+    {
+        if (ofnW->lpstrFile)
+        {
+            LPWSTR str = (LPWSTR)ofnW->lpstrFile;
+            LPWSTR ptr = strrchrW(str, '\\');
+	    str[lstrlenW(str) + 1] = '\0';
+	    *ptr = 0;
+        }
+    }
+    return TRUE;
+}
+
+/***********************************************************************
+ *                              FD31_DiskChange             [internal]
+ *    called when a new item is picked in the disk selection combo
+ */
+static LRESULT FD31_DiskChange( PFD31_DATA lfs )
+{
+    LONG lRet;
+    HWND hWnd = lfs->hwnd;
+    LPWSTR pstr;
+    WCHAR diskname[BUFFILE];
+
+    FD31_StripEditControl(hWnd);
+    lRet = SendDlgItemMessageW(hWnd, cmb2, CB_GETCURSEL, 0, 0L);
+    if (lRet == LB_ERR)
+        return 0;
+    pstr = HeapAlloc(GetProcessHeap(), 0, BUFFILEALLOC);
+    SendDlgItemMessageW(hWnd, cmb2, CB_GETLBTEXT, lRet,
+                         (LPARAM)pstr);
+    wsprintfW(diskname, FILE_specc, pstr[2]);
+    HeapFree(GetProcessHeap(), 0, pstr);
+
+    return FD31_Validate( lfs, diskname, cmb2, lRet, TRUE );
+}
+
+/***********************************************************************
+ *                              FD31_FileTypeChange         [internal]
+ *    called when a new item is picked in the file type combo
+ */
+static LRESULT FD31_FileTypeChange( PFD31_DATA lfs )
+{
+    LONG lRet;
+    WCHAR diskname[BUFFILE];
+    LPWSTR pstr;
+
+    diskname[0] = 0;
+
+    lRet = SendDlgItemMessageW(lfs->hwnd, cmb1, CB_GETCURSEL, 0, 0);
+    if (lRet == LB_ERR)
+        return TRUE;
+    pstr = (LPWSTR)SendDlgItemMessageW(lfs->hwnd, cmb1, CB_GETITEMDATA, lRet, 0);
+    TRACE("Selected filter : %s\n", debugstr_w(pstr));
+    SetDlgItemTextW( lfs->hwnd, edt1, pstr );
+
+    return FD31_Validate( lfs, NULL, cmb1, lRet, TRUE );
+}
+
+/***********************************************************************
+ *                              FD31_WMCommand               [internal]
+ */
+LRESULT FD31_WMCommand(HWND hWnd, LPARAM lParam, UINT notification,
+       UINT control, PFD31_DATA lfs )
+{
+    switch (control)
+    {
+        case lst1: /* file list */
+        FD31_StripEditControl(hWnd);
+        if (notification == LBN_DBLCLK)
+        {
+            if (FD31_Validate( lfs, NULL, control, 0, FALSE ))
+                EndDialog(hWnd, TRUE);
+            return TRUE;
+        }
+        else if (notification == LBN_SELCHANGE)
+            return FD31_FileListSelect( lfs );
+        break;
+
+        case lst2: /* directory list */
+        FD31_StripEditControl(hWnd);
+        if (notification == LBN_DBLCLK)
+            return FD31_DirListDblClick( lfs );
+        break;
+
+        case cmb1: /* file type drop list */
+        if (notification == CBN_SELCHANGE)
+            return FD31_FileTypeChange( lfs );
+        break;
+
+        case chx1:
+        break;
+
+        case pshHelp:
+        break;
+
+        case cmb2: /* disk dropdown combo */
+        if (notification == CBN_SELCHANGE)
+            return FD31_DiskChange( lfs );
+        break;
+
+        case IDOK:
+        TRACE("OK pressed\n");
+        if (FD31_Validate( lfs, NULL, control, 0, FALSE ))
+            EndDialog(hWnd, TRUE);
+        return TRUE;
+
+        case IDCANCEL:
+        EndDialog(hWnd, FALSE);
+        return TRUE;
+
+        case IDABORT: /* can be sent by the hook procedure */
+        EndDialog(hWnd, TRUE);
+        return TRUE;
+    }
+    return FALSE;
+}
+
+/************************************************************************
+ *                              FD31_MapStringPairsToW       [internal]
+ *      map string pairs to Unicode
+ */
+static LPWSTR FD31_MapStringPairsToW(LPCSTR strA, UINT size)
+{
+    LPCSTR s;
+    LPWSTR x;
+    int n, len;
+
+    s = strA;
+    while (*s)
+        s = s+strlen(s)+1;
+    s++;
+    n = s + 1 - strA; /* Don't forget the other \0 */
+    if (n < size) n = size;
+
+    len = MultiByteToWideChar( CP_ACP, 0, strA, n, NULL, 0 );
+    x = HeapAlloc(GetProcessHeap(),0, len * sizeof(WCHAR));
+    MultiByteToWideChar( CP_ACP, 0, strA, n, x, len );
+    return x;
+}
+
+
+/************************************************************************
+ *                              FD31_DupToW                  [internal]
+ *      duplicates an Ansi string to unicode, with a buffer size
+ */
+static LPWSTR FD31_DupToW(LPCSTR str, DWORD size)
+{
+    LPWSTR strW = NULL;
+    if (str && (size > 0))
+    {
+        strW = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR));
+        if (strW) MultiByteToWideChar( CP_ACP, 0, str, -1, strW, size );
+    }
+    return strW;
+}
+
+/************************************************************************
+ *                              FD31_MapOfnStructA          [internal]
+ *      map a 32 bits Ansi structure to an Unicode one
+ */
+void FD31_MapOfnStructA(LPOPENFILENAMEA ofnA, LPOPENFILENAMEW ofnW, BOOL open)
+{
+    LPCSTR str;
+    UNICODE_STRING usBuffer;
+
+    ofnW->lStructSize = sizeof(OPENFILENAMEW);
+    ofnW->hwndOwner = ofnA->hwndOwner;
+    ofnW->hInstance = ofnA->hInstance;
+    if (ofnA->lpstrFilter)
+        ofnW->lpstrFilter = FD31_MapStringPairsToW(ofnA->lpstrFilter, 0);
+
+    if ((ofnA->lpstrCustomFilter) && (*(ofnA->lpstrCustomFilter)))
+        ofnW->lpstrCustomFilter = FD31_MapStringPairsToW(ofnA->lpstrCustomFilter, ofnA->nMaxCustFilter);
+    ofnW->nMaxCustFilter = ofnA->nMaxCustFilter;
+    ofnW->nFilterIndex = ofnA->nFilterIndex;
+    ofnW->nMaxFile = ofnA->nMaxFile;
+    ofnW->lpstrFile = FD31_DupToW(ofnA->lpstrFile, ofnW->nMaxFile);
+    ofnW->nMaxFileTitle = ofnA->nMaxFileTitle;
+    ofnW->lpstrFileTitle = FD31_DupToW(ofnA->lpstrFileTitle, ofnW->nMaxFileTitle);
+    if (ofnA->lpstrInitialDir)
+    {
+        RtlCreateUnicodeStringFromAsciiz (&usBuffer,ofnA->lpstrInitialDir);
+        ofnW->lpstrInitialDir = usBuffer.Buffer;
+    }
+    if (ofnA->lpstrTitle)
+        str = ofnA->lpstrTitle;
+    else
+        /* Allocates default title (FIXME : get it from resource) */
+        str = open ? "Open File" : "Save as";
+    RtlCreateUnicodeStringFromAsciiz (&usBuffer,str);
+    ofnW->lpstrTitle = usBuffer.Buffer;
+    ofnW->Flags = ofnA->Flags;
+    ofnW->nFileOffset = ofnA->nFileOffset;
+    ofnW->nFileExtension = ofnA->nFileExtension;
+    ofnW->lpstrDefExt = FD31_DupToW(ofnA->lpstrDefExt, 3);
+    if ((ofnA->Flags & OFN_ENABLETEMPLATE) && (ofnA->lpTemplateName))
+    {
+        if (HIWORD(ofnA->lpTemplateName))
+        {
+            RtlCreateUnicodeStringFromAsciiz (&usBuffer,ofnA->lpTemplateName);
+            ofnW->lpTemplateName = usBuffer.Buffer;
+        }
+        else /* numbered resource */
+            ofnW->lpTemplateName = (LPWSTR) ofnA->lpTemplateName;
+    }
+}
+
+
+/************************************************************************
+ *                              FD31_FreeOfnW          [internal]
+ *      Undo all allocations done by FD31_MapOfnStructA
+ */
+void FD31_FreeOfnW(LPOPENFILENAMEW ofnW)
+{
+   if (ofnW->lpstrFilter) HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrFilter);
+   if (ofnW->lpstrCustomFilter) HeapFree(GetProcessHeap(), 0, ofnW->lpstrCustomFilter);
+   if (ofnW->lpstrFile) HeapFree(GetProcessHeap(), 0, ofnW->lpstrFile);
+   if (ofnW->lpstrFileTitle) HeapFree(GetProcessHeap(), 0, ofnW->lpstrFileTitle);
+   if (ofnW->lpstrInitialDir) HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrInitialDir);
+   if (ofnW->lpstrTitle) HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrTitle);
+   if ((ofnW->lpTemplateName) && (HIWORD(ofnW->lpTemplateName)))
+       HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpTemplateName);
+}
+
+/************************************************************************
+ *                              FD31_DestroyPrivate            [internal]
+ *      destroys the private object
+ */
+void FD31_DestroyPrivate(PFD31_DATA lfs)
+{
+    HWND hwnd;
+    if (!lfs) return;
+    hwnd = lfs->hwnd;
+    TRACE("destroying private allocation %p\n", lfs);
+    lfs->callbacks->Destroy(lfs);
+    HeapFree(GetProcessHeap(), 0, lfs);
+    RemovePropA(hwnd, FD31_OFN_PROP);
+}
+
+/************************************************************************
+ *                              FD31_AllocPrivate            [internal]
+ *      allocate a private object to hold 32 bits Unicode
+ *      structure that will be used throughtout the calls, while
+ *      keeping available the original structures and a few variables
+ *      On entry : type = dialog procedure type (16,32A,32W)
+ *                 dlgType = dialog type (open or save)
+ */
+PFD31_DATA FD31_AllocPrivate(LPARAM lParam, UINT dlgType,
+                             PFD31_CALLBACKS callbacks, DWORD data)
+{
+    PFD31_DATA lfs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(FD31_DATA));
+
+    TRACE("alloc private buf %p\n", lfs);
+    if (!lfs) return NULL;
+    lfs->hook = FALSE;
+    lfs->lParam = lParam;
+    lfs->open = (dlgType == OPEN_DIALOG);
+    lfs->callbacks = callbacks;
+    if (! lfs->callbacks->Init(lParam, lfs, data))
+    {
+        FD31_DestroyPrivate(lfs);
+        return NULL;
+    }
+    lfs->lbselchstring = RegisterWindowMessageA(LBSELCHSTRINGA);
+    lfs->fileokstring = RegisterWindowMessageA(FILEOKSTRINGA);
+
+    return lfs;
+}
+
+/***********************************************************************
+ *                              FD31_WMInitDialog            [internal]
+ */
+
+LONG FD31_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam)
+{
+  int i, n;
+  WCHAR tmpstr[BUFFILE];
+  LPWSTR pstr, old_pstr;
+  LPOPENFILENAMEW ofn;
+  PFD31_DATA lfs = (PFD31_DATA) lParam;
+
+  if (!lfs) return FALSE;
+  SetPropA(hWnd, FD31_OFN_PROP, (HANDLE)lfs);
+  lfs->hwnd = hWnd;
+  ofn = &lfs->ofnW;
+
+  TRACE("flags=%lx initialdir=%s\n", ofn->Flags, debugstr_w(ofn->lpstrInitialDir));
+
+  SetWindowTextW( hWnd, ofn->lpstrTitle );
+  /* read custom filter information */
+  if (ofn->lpstrCustomFilter)
+    {
+      pstr = ofn->lpstrCustomFilter;
+      n = 0;
+      TRACE("lpstrCustomFilter = %p\n", pstr);
+      while(*pstr)
+	{
+	  old_pstr = pstr;
+          i = SendDlgItemMessageW(hWnd, cmb1, CB_ADDSTRING, 0,
+                                   (LPARAM)(ofn->lpstrCustomFilter) + n );
+          n += lstrlenW(pstr) + 1;
+	  pstr += lstrlenW(pstr) + 1;
+	  TRACE("add str=%s associated to %s\n",
+                debugstr_w(old_pstr), debugstr_w(pstr));
+          SendDlgItemMessageW(hWnd, cmb1, CB_SETITEMDATA, i, (LPARAM)pstr);
+          n += lstrlenW(pstr) + 1;
+	  pstr += lstrlenW(pstr) + 1;
+	}
+    }
+  /* read filter information */
+  if (ofn->lpstrFilter) {
+	pstr = (LPWSTR) ofn->lpstrFilter;
+	n = 0;
+	while(*pstr) {
+	  old_pstr = pstr;
+	  i = SendDlgItemMessageW(hWnd, cmb1, CB_ADDSTRING, 0,
+				       (LPARAM)(ofn->lpstrFilter + n) );
+	  n += lstrlenW(pstr) + 1;
+	  pstr += lstrlenW(pstr) + 1;
+	  TRACE("add str=%s associated to %s\n",
+                debugstr_w(old_pstr), debugstr_w(pstr));
+	  SendDlgItemMessageW(hWnd, cmb1, CB_SETITEMDATA, i, (LPARAM)pstr);
+	  n += lstrlenW(pstr) + 1;
+	  pstr += lstrlenW(pstr) + 1;
+	}
+  }
+  /* set default filter */
+  if (ofn->nFilterIndex == 0 && ofn->lpstrCustomFilter == NULL)
+  	ofn->nFilterIndex = 1;
+  SendDlgItemMessageW(hWnd, cmb1, CB_SETCURSEL, ofn->nFilterIndex - 1, 0);
+  lstrcpynW(tmpstr, FD31_GetFileType(ofn->lpstrCustomFilter,
+	     (LPWSTR)ofn->lpstrFilter, ofn->nFilterIndex - 1),BUFFILE);
+  TRACE("nFilterIndex = %ld, SetText of edt1 to %s\n",
+  			ofn->nFilterIndex, debugstr_w(tmpstr));
+  SetDlgItemTextW( hWnd, edt1, tmpstr );
+  /* get drive list */
+  *tmpstr = 0;
+  DlgDirListComboBoxW(hWnd, tmpstr, cmb2, 0, DDL_DRIVES | DDL_EXCLUSIVE);
+  /* read initial directory */
+  /* FIXME: Note that this is now very version-specific (See MSDN description of
+   * the OPENFILENAME structure).  For example under 2000/XP any path in the
+   * lpstrFile overrides the lpstrInitialDir, but not under 95/98/ME
+   */
+  if (ofn->lpstrInitialDir != NULL)
+    {
+      int len;
+      lstrcpynW(tmpstr, ofn->lpstrInitialDir, 511);
+      len = lstrlenW(tmpstr);
+      if (len > 0 && tmpstr[len-1] != '\\'  && tmpstr[len-1] != ':') {
+        tmpstr[len]='\\';
+        tmpstr[len+1]='\0';
+      }
+    }
+  else
+    *tmpstr = 0;
+  if (!FD31_ScanDir(hWnd, tmpstr)) {
+    *tmpstr = 0;
+    if (!FD31_ScanDir(hWnd, tmpstr))
+      WARN("Couldn't read initial directory %s!\n", debugstr_w(tmpstr));
+  }
+  /* select current drive in combo 2, omit missing drives */
+  {
+      char dir[MAX_PATH];
+      char str[4] = "a:\\";
+      GetCurrentDirectoryA( sizeof(dir), dir );
+      for(i = 0, n = -1; i < 26; i++)
+      {
+          str[0] = 'a' + i;
+          if (GetDriveTypeA(str) > DRIVE_NO_ROOT_DIR) n++;
+          if (toupper(str[0]) == toupper(dir[0])) break;
+      }
+  }
+  SendDlgItemMessageW(hWnd, cmb2, CB_SETCURSEL, n, 0);
+  if (!(ofn->Flags & OFN_SHOWHELP))
+    ShowWindow(GetDlgItem(hWnd, pshHelp), SW_HIDE);
+  if (ofn->Flags & OFN_HIDEREADONLY)
+    ShowWindow(GetDlgItem(hWnd, chx1), SW_HIDE);
+  if (lfs->hook)
+      return (BOOL) FD31_CallWindowProc(lfs, WM_INITDIALOG, wParam, lfs->lParam);
+  return TRUE;
+}
+
+int FD31_GetFldrHeight(void)
+{
+  return fldrHeight;
+}
diff --git a/reactos/lib/comdlg32/filedlg31.h b/reactos/lib/comdlg32/filedlg31.h
new file mode 100644
index 00000000000..f646cb80db0
--- /dev/null
+++ b/reactos/lib/comdlg32/filedlg31.h
@@ -0,0 +1,67 @@
+/*
+ * Win3.1 style File Dialog interface (32 bit)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _WINE_DLL_FILEDLG31_H
+#define _WINE_DLL_FILEDLG31_H
+
+#define FD31_OFN_PROP "FILEDLG_OFN"
+
+/* Forward declare */
+typedef struct tagFD31_DATA *PFD31_DATA;
+
+typedef struct tagFD31_CALLBACKS
+{
+    BOOL (CALLBACK *Init)(LPARAM lParam, PFD31_DATA lfs, DWORD data);
+    BOOL (CALLBACK *CWP)(PFD31_DATA lfs, UINT wMsg, WPARAM wParam,
+                        LPARAM lParam); /* CWP instead of CallWindowProc to avoid macro expansion */
+    void (CALLBACK *UpdateResult)(PFD31_DATA lfs);
+    void (CALLBACK *UpdateFileTitle)(PFD31_DATA lfs);
+    LRESULT (CALLBACK *SendLbGetCurSel)(PFD31_DATA lfs);
+    void (CALLBACK *Destroy)(PFD31_DATA lfs);
+} FD31_CALLBACKS, *PFD31_CALLBACKS;
+
+typedef struct tagFD31_DATA
+{
+    HWND hwnd; /* file dialog window handle */
+    BOOL hook; /* TRUE if the dialog is hooked */
+    UINT lbselchstring; /* registered message id */
+    UINT fileokstring; /* registered message id */
+    LPARAM lParam; /* save original lparam */
+    LPCVOID template; /* template for 32 bits resource */
+    BOOL open; /* TRUE if open dialog, FALSE if save dialog */
+    OPENFILENAMEW ofnW; /* copy of original structure or work struct */
+    LPVOID private1632; /* 16/32 bit caller private data */
+    PFD31_CALLBACKS callbacks; /* callbacks to handle 16/32 bit differences */
+} FD31_DATA;
+
+extern BOOL FD31_Init(void);
+extern PFD31_DATA FD31_AllocPrivate(LPARAM lParam, UINT dlgType,
+                                    PFD31_CALLBACKS callbacks, DWORD data);
+extern void FD31_DestroyPrivate(PFD31_DATA lfs);
+extern void FD31_MapOfnStructA(LPOPENFILENAMEA ofnA, LPOPENFILENAMEW ofnW, BOOL open);
+extern void FD31_FreeOfnW(LPOPENFILENAMEW ofnW);
+extern BOOL FD31_CallWindowProc(PFD31_DATA lfs, UINT wMsg, WPARAM wParam,
+                                LPARAM lParam);
+extern LONG FD31_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam);
+extern LONG FD31_WMDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam,
+                            int savedlg, LPDRAWITEMSTRUCT lpdis);
+extern LRESULT FD31_WMCommand(HWND hWnd, LPARAM lParam, UINT notification,
+                              UINT control, PFD31_DATA lfs);
+extern int FD31_GetFldrHeight(void);
+
+#endif /* _WINE_DLL_FILEDLG31_H */
diff --git a/reactos/lib/comdlg32/winehq2ros.patch b/reactos/lib/comdlg32/winehq2ros.patch
index fa9408763a0..78a919fb100 100644
--- a/reactos/lib/comdlg32/winehq2ros.patch
+++ b/reactos/lib/comdlg32/winehq2ros.patch
@@ -1,96 +1,3 @@
-Index: Makefile.in
-===================================================================
-RCS file: /home/wine/wine/dlls/commdlg/Makefile.in,v
-retrieving revision 1.39
-diff -u -r1.39 Makefile.in
---- Makefile.in	12 Apr 2004 22:03:55 -0000	1.39
-+++ Makefile.in	16 Jun 2004 07:02:56 -0000
-@@ -13,7 +13,6 @@
- 	cdlg32.c \
- 	colordlg.c \
- 	filedlg.c \
--	filedlg16.c \
- 	filedlgbrowser.c \
- 	finddlg32.c \
- 	filetitle.c \
-@@ -22,6 +21,7 @@
- 
- C_SRCS16 = \
- 	colordlg16.c \
-+	filedlg16.c \
- 	finddlg.c \
- 	fontdlg16.c \
- 	generic.c \
-Index: filedlg.c
-===================================================================
-RCS file: /home/wine/wine/dlls/commdlg/filedlg.c,v
-retrieving revision 1.80
-diff -u -r1.80 filedlg.c
---- filedlg.c	12 May 2004 00:12:04 -0000	1.80
-+++ filedlg.c	16 Jun 2004 07:02:57 -0000
-@@ -3287,6 +3287,7 @@
- BOOL WINAPI GetOpenFileNameA(
- 	LPOPENFILENAMEA ofn) /* [in/out] address of init structure */
- {
-+#if 0 /* FIXME GetFileName31A uses 16 bit stuff */
-     BOOL win16look = FALSE;
- 
-     if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE))
-@@ -3295,6 +3296,7 @@
-     if (win16look)
-         return GetFileName31A(ofn, OPEN_DIALOG);
-     else
-+#endif
-         return GetFileDialog95A(ofn, OPEN_DIALOG);
- }
- 
-@@ -3311,6 +3313,7 @@
- BOOL WINAPI GetOpenFileNameW(
- 	LPOPENFILENAMEW ofn) /* [in/out] address of init structure */
- {
-+#if 0 /* FIXME GetFileName31W uses 16 bit stuff */
-     BOOL win16look = FALSE;
- 
-     if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE))
-@@ -3319,6 +3322,7 @@
-     if (win16look)
-         return GetFileName31W(ofn, OPEN_DIALOG);
-     else
-+#endif
-         return GetFileDialog95W(ofn, OPEN_DIALOG);
- }
- 
-@@ -3336,6 +3340,7 @@
- BOOL WINAPI GetSaveFileNameA(
- 	LPOPENFILENAMEA ofn) /* [in/out] address of init structure */
- {
-+#if 0 /* FIXME GetFileName31A uses 16 bit stuff */
-     BOOL win16look = FALSE;
- 
-     if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE))
-@@ -3344,6 +3349,7 @@
-     if (win16look)
-         return GetFileName31A(ofn, SAVE_DIALOG);
-     else
-+#endif
-         return GetFileDialog95A(ofn, SAVE_DIALOG);
- }
- 
-@@ -3360,6 +3366,7 @@
- BOOL WINAPI GetSaveFileNameW(
- 	LPOPENFILENAMEW ofn) /* [in/out] address of init structure */
- {
-+#if 0 /* FIXME GetFileName31W uses 16 bit stuff */
-     BOOL win16look = FALSE;
- 
-     if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE))
-@@ -3368,5 +3375,6 @@
-     if (win16look)
-         return GetFileName31W(ofn, SAVE_DIALOG);
-     else
-+#endif
-         return GetFileDialog95W(ofn, SAVE_DIALOG);
- }
 Index: printdlg.c
 ===================================================================
 RCS file: /home/wine/wine/dlls/commdlg/printdlg.c,v

From c6ec21e2078e60c1f49f6aa9f6618a790f0d8fb8 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Wed, 14 Jul 2004 14:25:31 +0000
Subject: [PATCH 289/356] - Move access checks from NtAccessCheck() to
 SeAccessCheck(). - Check for 'take ownership' privilege.

svn path=/trunk/; revision=10111
---
 reactos/ntoskrnl/include/internal/se.h |   7 +
 reactos/ntoskrnl/se/semgr.c            | 342 +++++++++++++------------
 2 files changed, 179 insertions(+), 170 deletions(-)

diff --git a/reactos/ntoskrnl/include/internal/se.h b/reactos/ntoskrnl/include/internal/se.h
index f98ccaacaf8..b9d7e338696 100644
--- a/reactos/ntoskrnl/include/internal/se.h
+++ b/reactos/ntoskrnl/include/internal/se.h
@@ -136,6 +136,13 @@ SeReleaseLuidAndAttributesArray(PLUID_AND_ATTRIBUTES Privilege,
 				KPROCESSOR_MODE PreviousMode,
 				ULONG a);
 
+BOOLEAN
+SepPrivilegeCheck(PACCESS_TOKEN Token,
+		  PLUID_AND_ATTRIBUTES Privileges,
+		  ULONG PrivilegeCount,
+		  ULONG PrivilegeControl,
+		  KPROCESSOR_MODE PreviousMode);
+
 
 #endif /* __NTOSKRNL_INCLUDE_INTERNAL_SE_H */
 
diff --git a/reactos/ntoskrnl/se/semgr.c b/reactos/ntoskrnl/se/semgr.c
index 88c0a0e726a..ebc38ec27ba 100644
--- a/reactos/ntoskrnl/se/semgr.c
+++ b/reactos/ntoskrnl/se/semgr.c
@@ -1,4 +1,4 @@
-/* $Id: semgr.c,v 1.32 2004/07/13 16:59:35 ekohl Exp $
+/* $Id: semgr.c,v 1.33 2004/07/14 14:25:31 ekohl Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -15,6 +15,7 @@
 #include <internal/ps.h>
 #include <internal/se.h>
 
+#define NDEBUG
 #include <internal/debug.h>
 
 #define TAG_SXPT   TAG('S', 'X', 'P', 'T')
@@ -273,50 +274,55 @@ SeDeassignSecurity(PSECURITY_DESCRIPTOR* SecurityDescriptor)
 
 
 #if 0
-VOID SepGetDefaultsSubjectContext(PSECURITY_SUBJECT_CONTEXT SubjectContext,
-				  PSID* Owner,
-				  PSID* PrimaryGroup,
-				  PSID* ProcessOwner,
-				  PSID* ProcessPrimaryGroup,
-				  PACL* DefaultDacl)
+VOID
+SepGetDefaultsSubjectContext(PSECURITY_SUBJECT_CONTEXT SubjectContext,
+			     PSID* Owner,
+			     PSID* PrimaryGroup,
+			     PSID* ProcessOwner,
+			     PSID* ProcessPrimaryGroup,
+			     PACL* DefaultDacl)
 {
-   PACCESS_TOKEN Token;
-   
-   if (SubjectContext->ClientToken != NULL)
-     {
+  PACCESS_TOKEN Token;
+
+  if (SubjectContext->ClientToken != NULL)
+    {
 	Token = SubjectContext->ClientToken;
-     }
-   else
-     {
+    }
+  else
+    {
 	Token = SubjectContext->PrimaryToken;
-     }
-   *Owner = Token->UserAndGroups[Token->DefaultOwnerIndex].Sid;
-   *PrimaryGroup = Token->PrimaryGroup;
-   *DefaultDacl = Token->DefaultDacl;
-   *ProcessOwner = SubjectContext->PrimaryToken->
-     UserAndGroups[Token->DefaultOwnerIndex].Sid;
-   *ProcessPrimaryGroup = SubjectContext->PrimaryToken->PrimaryGroup;
+    }
+  *Owner = Token->UserAndGroups[Token->DefaultOwnerIndex].Sid;
+  *PrimaryGroup = Token->PrimaryGroup;
+  *DefaultDacl = Token->DefaultDacl;
+  *ProcessOwner = SubjectContext->PrimaryToken->
+    UserAndGroups[Token->DefaultOwnerIndex].Sid;
+  *ProcessPrimaryGroup = SubjectContext->PrimaryToken->PrimaryGroup;
 }
 
-NTSTATUS SepInheritAcl(PACL Acl,
-		       BOOLEAN IsDirectoryObject,
-		       PSID Owner,
-		       PSID PrimaryGroup,
-		       PACL DefaultAcl,
-		       PSID ProcessOwner,
-		       PSID ProcessGroup,
-		       PGENERIC_MAPPING GenericMapping)
+
+NTSTATUS
+SepInheritAcl(PACL Acl,
+	      BOOLEAN IsDirectoryObject,
+	      PSID Owner,
+	      PSID PrimaryGroup,
+	      PACL DefaultAcl,
+	      PSID ProcessOwner,
+	      PSID ProcessGroup,
+	      PGENERIC_MAPPING GenericMapping)
 {
-   if (Acl == NULL)
-     {
+  if (Acl == NULL)
+    {
 	return(STATUS_UNSUCCESSFUL);
-     }
-   if (Acl->AclRevision != 2 &&
-       Acl->AclRevision != 3 )
-     {
+    }
+
+  if (Acl->AclRevision != 2 &&
+      Acl->AclRevision != 3 )
+    {
 	return(STATUS_UNSUCCESSFUL);
-     }
-   
+    }
+
+
 }
 #endif
 
@@ -448,64 +454,117 @@ SeAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
 	      OUT PACCESS_MASK GrantedAccess,
 	      OUT PNTSTATUS AccessStatus)
 {
-   ULONG i;
-   PACL Dacl;
-   BOOLEAN Present;
-   BOOLEAN Defaulted;
-   NTSTATUS Status;
-   PACE CurrentAce;
-   PSID Sid;
-   ACCESS_MASK CurrentAccess;
+  LUID_AND_ATTRIBUTES Privilege;
+  ACCESS_MASK CurrentAccess;
+  PACCESS_TOKEN Token;
+  ULONG i;
+  PACL Dacl;
+  BOOLEAN Present;
+  BOOLEAN Defaulted;
+  PACE CurrentAce;
+  PSID Sid;
+  NTSTATUS Status;
 
-   CurrentAccess = PreviouslyGrantedAccess;
+  CurrentAccess = PreviouslyGrantedAccess;
 
-   /*
-    * Check the DACL
-    */
-   Status = RtlGetDaclSecurityDescriptor(SecurityDescriptor,
-					 &Present,
-					 &Dacl,
+  Token = SubjectSecurityContext->ClientToken ?
+	    SubjectSecurityContext->ClientToken : SubjectSecurityContext->PrimaryToken;
+
+  /* Get the DACL */
+  Status = RtlGetDaclSecurityDescriptor(SecurityDescriptor,
+					&Present,
+					&Dacl,
+					&Defaulted);
+  if (!NT_SUCCESS(Status))
+    {
+      *AccessStatus = Status;
+      return FALSE;
+    }
+
+  /* RULE 1: Grant desired access if the object is unprotected */
+  if (Dacl == NULL)
+    {
+      *GrantedAccess = DesiredAccess;
+      *AccessStatus = STATUS_SUCCESS;
+      return TRUE;
+    }
+
+  CurrentAccess = PreviouslyGrantedAccess;
+
+  /* RULE 2: Check token for 'take ownership' privilege */
+  Privilege.Luid = SeTakeOwnershipPrivilege;
+  Privilege.Attributes = SE_PRIVILEGE_ENABLED;
+
+  if (SepPrivilegeCheck(Token,
+			&Privilege,
+			1,
+			PRIVILEGE_SET_ALL_NECESSARY,
+			AccessMode))
+    {
+      CurrentAccess |= WRITE_OWNER;
+      if (DesiredAccess == CurrentAccess)
+	{
+	  *GrantedAccess = CurrentAccess;
+	  *AccessStatus = STATUS_SUCCESS;
+	  return TRUE;
+	}
+    }
+
+  /* RULE 3: Check whether the token is the owner */
+  Status = RtlGetOwnerSecurityDescriptor(SecurityDescriptor,
+					 &Sid,
 					 &Defaulted);
-   if (!NT_SUCCESS(Status))
-     {
-	*AccessStatus = Status;
-	return FALSE;
-     }
+  if (!NT_SUCCESS(Status))
+    {
+      DPRINT1("RtlGetOwnerSecurityDescriptor() failed (Status %lx)\n", Status);
+      *AccessStatus = Status;
+      return FALSE;
+   }
 
-   CurrentAce = (PACE)(Dacl + 1);
-   for (i = 0; i < Dacl->AceCount; i++)
-     {
-	Sid = (PSID)(CurrentAce + 1);
-	if (CurrentAce->Header.AceType == ACCESS_DENIED_ACE_TYPE)
-	  {
-	     if (SepSidInToken(SubjectSecurityContext->ClientToken, Sid))
-	       {
-		  *AccessStatus = STATUS_ACCESS_DENIED;
-		  *GrantedAccess = 0;
-		  return(STATUS_SUCCESS);
-	       }
-	  }
+  if (SepSidInToken(Token, Sid))
+    {
+      CurrentAccess |= (READ_CONTROL | WRITE_DAC);
+      if (DesiredAccess == CurrentAccess)
+	{
+	  *GrantedAccess = CurrentAccess;
+	  *AccessStatus = STATUS_SUCCESS;
+	  return TRUE;
+	}
+    }
 
-	if (CurrentAce->Header.AceType == ACCESS_ALLOWED_ACE_TYPE)
-	  {
-	     if (SepSidInToken(SubjectSecurityContext->ClientToken, Sid))
-	       {
-		  CurrentAccess |= CurrentAce->AccessMask;
-	       }
-	  }
-     }
-   if (!(CurrentAccess & DesiredAccess) &&
-       !((~CurrentAccess) & DesiredAccess))
-     {
-	*AccessStatus = STATUS_ACCESS_DENIED;
-     }
-   else
-     {
-	*AccessStatus = STATUS_SUCCESS;
-     }
-   *GrantedAccess = CurrentAccess;
+  /* RULE 4: Grant rights according to the DACL */
+  CurrentAce = (PACE)(Dacl + 1);
+  for (i = 0; i < Dacl->AceCount; i++)
+    {
+      Sid = (PSID)(CurrentAce + 1);
+      if (CurrentAce->Header.AceType == ACCESS_DENIED_ACE_TYPE)
+	{
+	  if (SepSidInToken(Token, Sid))
+	    {
+	      *GrantedAccess = 0;
+	      *AccessStatus = STATUS_ACCESS_DENIED;
+	      return TRUE;
+	    }
+	}
 
-   return TRUE;
+      if (CurrentAce->Header.AceType == ACCESS_ALLOWED_ACE_TYPE)
+	{
+	  if (SepSidInToken(Token, Sid))
+	    {
+	      CurrentAccess |= CurrentAce->AccessMask;
+	    }
+	}
+    }
+
+  DPRINT("CurrentAccess %08lx\n DesiredAccess %08lx\n",
+         CurrentAccess, DesiredAccess);
+
+  *GrantedAccess = CurrentAccess & DesiredAccess;
+
+  *AccessStatus =
+    (*GrantedAccess == DesiredAccess) ? STATUS_SUCCESS : STATUS_ACCESS_DENIED;
+
+  return TRUE;
 }
 
 
@@ -519,15 +578,9 @@ NtAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
 	      OUT PACCESS_MASK GrantedAccess,
 	      OUT PNTSTATUS AccessStatus)
 {
+  SECURITY_SUBJECT_CONTEXT SubjectSecurityContext;
   KPROCESSOR_MODE PreviousMode;
   PACCESS_TOKEN Token;
-  BOOLEAN Present;
-  BOOLEAN Defaulted;
-  PACE CurrentAce;
-  PACL Dacl;
-  PSID Sid;
-  ACCESS_MASK CurrentAccess;
-  ULONG i;
   NTSTATUS Status;
 
   DPRINT("NtAccessCheck() called\n");
@@ -568,89 +621,38 @@ NtAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
       return STATUS_ACCESS_VIOLATION;
     }
 
-  /* Get the DACL */
-  Status = RtlGetDaclSecurityDescriptor(SecurityDescriptor,
-					&Present,
-					&Dacl,
-					&Defaulted);
-  if (!NT_SUCCESS(Status))
-    {
-      DPRINT1("RtlGetDaclSecurityDescriptor() failed (Status %lx)\n", Status);
-      ObDereferenceObject(Token);
-      return Status;
-   }
+  RtlZeroMemory(&SubjectSecurityContext,
+		sizeof(SECURITY_SUBJECT_CONTEXT));
+  SubjectSecurityContext.ClientToken = Token;
+  SubjectSecurityContext.ImpersonationLevel = Token->ImpersonationLevel;
 
-  /* RULE 1: Grant desired access if the object is unprotected */
-  if (Dacl == NULL)
+  /* FIXME: Lock subject context */
+
+  if (!SeAccessCheck(SecurityDescriptor,
+		     &SubjectSecurityContext,
+		     TRUE,
+		     DesiredAccess,
+		     0,
+		     &PrivilegeSet,
+		     GenericMapping,
+		     PreviousMode,
+		     GrantedAccess,
+		     AccessStatus))
     {
-      *GrantedAccess = DesiredAccess;
-      *AccessStatus = STATUS_SUCCESS;
-      return STATUS_SUCCESS;
+      Status = *AccessStatus;
+    }
+  else
+    {
+      Status = STATUS_SUCCESS;
     }
 
-  CurrentAccess = 0;
-
-  /* FIXME: RULE 2: Check token for 'take ownership' privilege */
-
-  /* RULE 3: Check whether the token is the owner */
-  Status = RtlGetOwnerSecurityDescriptor(SecurityDescriptor,
-					 &Sid,
-					 &Defaulted);
-  if (!NT_SUCCESS(Status))
-    {
-      DPRINT1("RtlGetOwnerSecurityDescriptor() failed (Status %lx)\n", Status);
-      ObDereferenceObject(Token);
-      return Status;
-   }
-
-  if (SepSidInToken(Token, Sid))
-    {
-      CurrentAccess |= (READ_CONTROL | WRITE_DAC);
-      if (DesiredAccess == CurrentAccess)
-	{
-	  *AccessStatus = STATUS_SUCCESS;
-	  *GrantedAccess = CurrentAccess;
-	  return STATUS_SUCCESS;
-	}
-    }
-
-  /* RULE 4: Grant rights according to the DACL */
-  CurrentAce = (PACE)(Dacl + 1);
-  for (i = 0; i < Dacl->AceCount; i++)
-    {
-      Sid = (PSID)(CurrentAce + 1);
-      if (CurrentAce->Header.AceType == ACCESS_DENIED_ACE_TYPE)
-	{
-	  if (SepSidInToken(Token, Sid))
-	    {
-	      *AccessStatus = STATUS_ACCESS_DENIED;
-	      *GrantedAccess = 0;
-	      return STATUS_SUCCESS;
-	    }
-	}
-
-      if (CurrentAce->Header.AceType == ACCESS_ALLOWED_ACE_TYPE)
-	{
-	  if (SepSidInToken(Token, Sid))
-	    {
-	      CurrentAccess |= CurrentAce->AccessMask;
-	    }
-	}
-    }
-
-  DPRINT("CurrentAccess %08lx\n DesiredAccess %08lx\n",
-         CurrentAccess, DesiredAccess);
+  /* FIXME: Unlock subject context */
 
   ObDereferenceObject(Token);
 
-  *GrantedAccess = CurrentAccess & DesiredAccess;
-
-  *AccessStatus =
-    (*GrantedAccess == DesiredAccess) ? STATUS_SUCCESS : STATUS_ACCESS_DENIED;
-
   DPRINT("NtAccessCheck() done\n");
 
-  return STATUS_SUCCESS;
+  return Status;
 }
 
 /* EOF */

From 93cfddbb389df10177cc5124cdb9f661fe57794c Mon Sep 17 00:00:00 2001
From: Steven Edwards <winehacker@gmail.com>
Date: Wed, 14 Jul 2004 16:24:00 +0000
Subject: [PATCH 290/356] Added licensing page to usetup.

svn path=/trunk/; revision=10112
---
 reactos/subsys/system/usetup/usetup.c | 63 +++++++++++++++++++++++++--
 1 file changed, 60 insertions(+), 3 deletions(-)

diff --git a/reactos/subsys/system/usetup/usetup.c b/reactos/subsys/system/usetup/usetup.c
index b52cc8308a2..7e2a670f83d 100644
--- a/reactos/subsys/system/usetup/usetup.c
+++ b/reactos/subsys/system/usetup/usetup.c
@@ -56,6 +56,7 @@ typedef enum _PAGE_NUMBER
 {
   START_PAGE,
   INTRO_PAGE,
+  LICENSE_PAGE,
   INSTALL_INTRO_PAGE,
 
 //  SCSI_CONTROLLER_PAGE,
@@ -707,9 +708,10 @@ IntroPage(PINPUT_RECORD Ir)
   SetTextXY(6, 12, "computer and prepares the second part of the setup.");
 
   SetTextXY(8, 15, "\x07  Press ENTER to install ReactOS.");
-  SetTextXY(8, 17, "\x07  Press E to start the emergency console.");
-  SetTextXY(8, 19, "\x07  Press R to repair ReactOS.");
-  SetTextXY(8, 21, "\x07  Press F3 to quit without installing ReactOS.");
+  SetTextXY(8, 17, "\x07  Press L to view the licensing terms for ReactOS.");
+  SetTextXY(8, 19, "\x07  Press E to start the emergency console.");
+  SetTextXY(8, 21, "\x07  Press R to repair ReactOS.");
+  SetTextXY(8, 23, "\x07  Press F3 to quit without installing ReactOS.");
 
   SetStatusText("   ENTER = Continue   F3 = Quit");
 
@@ -733,6 +735,10 @@ IntroPage(PINPUT_RECORD Ir)
 	{
 	  return INSTALL_INTRO_PAGE;
 	}
+      else if (toupper(Ir->Event.KeyEvent.uChar.AsciiChar) == 'L') /* L */
+	{
+	  return LICENSE_PAGE;
+	}
       else if (toupper(Ir->Event.KeyEvent.uChar.AsciiChar) == 'E') /* E */
 	{
 	  return EMERGENCY_INTRO_PAGE;
@@ -746,6 +752,52 @@ IntroPage(PINPUT_RECORD Ir)
   return INTRO_PAGE;
 }
 
+/*
+ * License Page
+ * RETURNS
+ *	Back to main setup page.
+ */
+static PAGE_NUMBER
+LicensePage(PINPUT_RECORD Ir)
+{
+  SetHighlightedTextXY(6, 8, "Licensing:");
+
+  SetTextXY(8, 11, "The ReactOS System is licensed under the terms of the");
+  SetTextXY(8, 12, "GNU GPL with parts containing code from other compatible");
+  SetTextXY(8, 13, "licenses such as the X11 or BSD and GNU LGPL licenses.");
+  SetTextXY(8, 14, "All software that is part of the ReactOS system is");
+  SetTextXY(8, 15, "therefore released under the GNU GPL as well as maintaining");
+  SetTextXY(8, 16, "the original license.");
+
+  SetTextXY(8, 18, "This software comes with NO WARRANTY or restrictions on usage");
+  SetTextXY(8, 19, "save applicable local and international law. The licensing of");
+  SetTextXY(8, 20, "ReactOS only covers distribution to third parties.");
+
+  SetTextXY(8, 22, "If for some resion you did not receive a copy of the");
+  SetTextXY(8, 23, "GNU General Public License with ReactOS please visit");
+  SetHighlightedTextXY(8, 25, "http://www.gnu.org/licenses/licenses.html");
+  
+  SetStatusText("ENTER = Continue   F3 = Quit");
+
+  while (TRUE)
+    {
+      ConInKey(Ir);
+
+      if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
+	  (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */
+	{
+	  if (ConfirmQuit(Ir) == TRUE)
+	    return QUIT_PAGE;
+	  break;
+	}
+      else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */
+	{
+	  return INTRO_PAGE;
+	}
+    }
+
+  return LICENSE_PAGE;
+}
 
 static PAGE_NUMBER
 EmergencyIntroPage(PINPUT_RECORD Ir)
@@ -3686,6 +3738,11 @@ NtProcessStartup(PPEB Peb)
 	    Page = StartPage(&Ir);
 	    break;
 
+	  /* License page */
+	  case LICENSE_PAGE:
+	    Page = LicensePage(&Ir);
+	    break;
+
 	  /* Intro page */
 	  case INTRO_PAGE:
 	    Page = IntroPage(&Ir);

From d1d2a0a14a17c82c0c8b4b5b4f52d05d75e8ccf6 Mon Sep 17 00:00:00 2001
From: Steven Edwards <winehacker@gmail.com>
Date: Wed, 14 Jul 2004 17:47:03 +0000
Subject: [PATCH 291/356] Use Bitstream Vera Sans for Helv subsititute. This
 makes the Run dialog readable. Thanks to Filip Navara.

svn path=/trunk/; revision=10114
---
 reactos/bootdata/hivesft.inf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reactos/bootdata/hivesft.inf b/reactos/bootdata/hivesft.inf
index 16bda7e32cd..97f688374f0 100644
--- a/reactos/bootdata/hivesft.inf
+++ b/reactos/bootdata/hivesft.inf
@@ -56,5 +56,5 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Times Ne
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Sans Serif",0x00000000,"Bitstream Vera Sans"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg",0x00000000,"Bitstream Vera Sans"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg 2",0x00000000,"Bitstream Vera Sans"
-
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Helv",0x00000000,"Bitstream Vera Sans"
 ; EOF

From d0ba990059db44a703ea7cbe0236c6aa6f148d78 Mon Sep 17 00:00:00 2001
From: Steven Edwards <winehacker@gmail.com>
Date: Wed, 14 Jul 2004 18:30:54 +0000
Subject: [PATCH 292/356] Sync msacm32 with Winehq cvs. will merge my tweaks
 soon. This gets Winamp5 loading.

svn path=/trunk/; revision=10115
---
 reactos/lib/msacm/Makefile.in           |    2 +
 reactos/lib/msacm/Makefile.ros          |   33 +-
 reactos/lib/msacm/Makefile.ros-template |    6 +-
 reactos/lib/msacm/driver.c              |  185 +++-
 reactos/lib/msacm/format.c              |   34 +-
 reactos/lib/msacm/internal.c            |   78 +-
 reactos/lib/msacm/makefile              |   16 +-
 reactos/lib/msacm/msacm.rc              |    2 +
 reactos/lib/msacm/msacm32_main.c        |   12 +
 reactos/lib/msacm/msacm_Es.rc           |   56 ++
 reactos/lib/msacm/msacm_It.rc           |    2 +-
 reactos/lib/msacm/msacm_Ja.rc           |   56 ++
 reactos/lib/msacm/pcmconverter.c        | 1223 +++++++++++++++++++++++
 reactos/lib/msacm/stream.c              |  478 +++++++++
 reactos/lib/msacm/wineacm.h             |  363 +++++++
 15 files changed, 2418 insertions(+), 128 deletions(-)
 create mode 100644 reactos/lib/msacm/msacm_Es.rc
 create mode 100644 reactos/lib/msacm/msacm_Ja.rc
 create mode 100644 reactos/lib/msacm/pcmconverter.c
 create mode 100644 reactos/lib/msacm/stream.c
 create mode 100644 reactos/lib/msacm/wineacm.h

diff --git a/reactos/lib/msacm/Makefile.in b/reactos/lib/msacm/Makefile.in
index f4cb7c1376c..247b6816e67 100644
--- a/reactos/lib/msacm/Makefile.in
+++ b/reactos/lib/msacm/Makefile.in
@@ -22,6 +22,8 @@ C_SRCS16 = \
 
 RC_SRCS = msacm.rc
 
+SUBDIRS = tests
+
 @MAKE_DLL_RULES@
 
 ### Dependencies:
diff --git a/reactos/lib/msacm/Makefile.ros b/reactos/lib/msacm/Makefile.ros
index 3fc9715f3e9..e53d73cd5ac 100644
--- a/reactos/lib/msacm/Makefile.ros
+++ b/reactos/lib/msacm/Makefile.ros
@@ -1,21 +1,12 @@
-# $Id: Makefile.ros,v 1.1 2004/03/10 15:22:44 silverblade Exp $
-
-TARGET_NAME = msacm32
-
-TARGET_OBJECTS = driver.o filter.o format.o internal.o msacm32_main.o pcmconverter.o stream.o
-
-TARGET_CFLAGS =  -D__REACTOS__
-
-TARGET_SDKLIBS =  winmm.a libwine.a advapi32.a kernel32.a ws2_32.a wine_uuid.a ntdll.a
-
-TARGET_BASE = 0x77300000
-
-TARGET_RC_SRCS = msacm.rc
-TARGET_RC_BINSRC = msacm.rc
-TARGET_RC_BINARIES = 
-
-default: all
-
-DEP_OBJECTS = $(TARGET_OBJECTS)
-
-include $(TOOLS_PATH)/depend.mk
+# $Id: Makefile.ros,v 1.2 2004/07/14 18:30:54 sedwards Exp $
+TARGET_NAME = msacm32
+TARGET_OBJECTS = driver.o filter.o format.o internal.o msacm32_main.o pcmconverter.o stream.o
+TARGET_CFLAGS =  -D__REACTOS__
+TARGET_SDKLIBS = winmm.a user32.a advapi32.a kernel32.a ntdll.a libwine.a
+TARGET_BASE = $(TARGET_BASE_LIB_MSACM)
+TARGET_RC_SRCS = msacm.rc
+TARGET_RC_BINSRC = 
+TARGET_RC_BINARIES = 
+default: all
+DEP_OBJECTS = $(TARGET_OBJECTS)
+include $(TOOLS_PATH)/depend.mk
diff --git a/reactos/lib/msacm/Makefile.ros-template b/reactos/lib/msacm/Makefile.ros-template
index ad08d203471..b9a2fa1f289 100644
--- a/reactos/lib/msacm/Makefile.ros-template
+++ b/reactos/lib/msacm/Makefile.ros-template
@@ -1,12 +1,12 @@
-# $Id: Makefile.ros-template,v 1.2 2004/05/29 21:24:44 hbirr Exp $
+# $Id: Makefile.ros-template,v 1.3 2004/07/14 18:30:54 sedwards Exp $
 
-TARGET_NAME = iphlpapi
+TARGET_NAME = msacm32
 
 TARGET_OBJECTS = @C_SRCS@
 
 TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__
 
-TARGET_SDKLIBS = @IMPORTS@ libwine.a advapi32.a kernel32.a ws2_32.a wine_uuid.a ntdll.a
+TARGET_SDKLIBS = @IMPORTS@ ntdll.a libwine.a
 
 TARGET_BASE = $(TARGET_BASE_LIB_MSACM)
 
diff --git a/reactos/lib/msacm/driver.c b/reactos/lib/msacm/driver.c
index b473f9c4d73..dab014f4db3 100644
--- a/reactos/lib/msacm/driver.c
+++ b/reactos/lib/msacm/driver.c
@@ -49,19 +49,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(msacm);
 MMRESULT WINAPI acmDriverAddA(PHACMDRIVERID phadid, HINSTANCE hinstModule,
 			      LPARAM lParam, DWORD dwPriority, DWORD fdwAdd)
 {
-    if (!phadid)
+    TRACE("(%p, %p, %08lx, %08lx, %08lx)\n",
+          phadid, hinstModule, lParam, dwPriority, fdwAdd);
+
+    if (!phadid) {
+        WARN("invalid parameter\n");
 	return MMSYSERR_INVALPARAM;
+    }
 
     /* Check if any unknown flags */
     if (fdwAdd &
 	~(ACM_DRIVERADDF_FUNCTION|ACM_DRIVERADDF_NOTIFYHWND|
-	  ACM_DRIVERADDF_GLOBAL))
+	  ACM_DRIVERADDF_GLOBAL)) {
+        WARN("invalid flag\n");
 	return MMSYSERR_INVALFLAG;
+    }
 
     /* Check if any incompatible flags */
     if ((fdwAdd & ACM_DRIVERADDF_FUNCTION) &&
-	(fdwAdd & ACM_DRIVERADDF_NOTIFYHWND))
+	(fdwAdd & ACM_DRIVERADDF_NOTIFYHWND)) {
+        WARN("invalid flag\n");
 	return MMSYSERR_INVALFLAG;
+    }
 
     /* FIXME: in fact, should GetModuleFileName(hinstModule) and do a
      * LoadDriver on it, to be sure we can call SendDriverMessage on the
@@ -98,12 +107,18 @@ MMRESULT WINAPI acmDriverClose(HACMDRIVER had, DWORD fdwClose)
     PWINE_ACMDRIVERID	padid;
     PWINE_ACMDRIVER*	tpad;
 
-    if (fdwClose)
+    TRACE("(%p, %08lx)\n", had, fdwClose);
+
+    if (fdwClose) {
+        WARN("invalid flag\n");
 	return MMSYSERR_INVALFLAG;
+    }
 
     pad = MSACM_GetDriver(had);
-    if (!pad)
+    if (!pad) {
+        WARN("invalid handle\n");
 	return MMSYSERR_INVALHANDLE;
+    }
 
     padid = pad->obj.pACMDriverID;
 
@@ -132,29 +147,44 @@ MMRESULT WINAPI acmDriverDetailsA(HACMDRIVERID hadid, PACMDRIVERDETAILSA padd, D
     MMRESULT mmr;
     ACMDRIVERDETAILSW	addw;
 
+    TRACE("(%p, %p, %08lx)\n", hadid, padd, fdwDetails);
+
+    if (!padd) {
+        WARN("invalid parameter\n");
+        return MMSYSERR_INVALPARAM;
+    }
+
+    if (padd->cbStruct < 4) {
+        WARN("invalid parameter\n");
+        return MMSYSERR_INVALPARAM;
+    }
+
     addw.cbStruct = sizeof(addw);
     mmr = acmDriverDetailsW(hadid, &addw, fdwDetails);
     if (mmr == 0) {
-	padd->fccType = addw.fccType;
-	padd->fccComp = addw.fccComp;
-	padd->wMid = addw.wMid;
-	padd->wPid = addw.wPid;
-	padd->vdwACM = addw.vdwACM;
-	padd->vdwDriver = addw.vdwDriver;
-	padd->fdwSupport = addw.fdwSupport;
-	padd->cFormatTags = addw.cFormatTags;
-	padd->cFilterTags = addw.cFilterTags;
-	padd->hicon = addw.hicon;
-        WideCharToMultiByte( CP_ACP, 0, addw.szShortName, -1, padd->szShortName,
-                             sizeof(padd->szShortName), NULL, NULL );
-        WideCharToMultiByte( CP_ACP, 0, addw.szLongName, -1, padd->szLongName,
-                             sizeof(padd->szLongName), NULL, NULL );
-        WideCharToMultiByte( CP_ACP, 0, addw.szCopyright, -1, padd->szCopyright,
-                             sizeof(padd->szCopyright), NULL, NULL );
-        WideCharToMultiByte( CP_ACP, 0, addw.szLicensing, -1, padd->szLicensing,
-                             sizeof(padd->szLicensing), NULL, NULL );
-        WideCharToMultiByte( CP_ACP, 0, addw.szFeatures, -1, padd->szFeatures,
-                             sizeof(padd->szFeatures), NULL, NULL );
+        ACMDRIVERDETAILSA padda;
+
+        padda.fccType = addw.fccType;
+        padda.fccComp = addw.fccComp;
+        padda.wMid = addw.wMid;
+        padda.wPid = addw.wPid;
+        padda.vdwACM = addw.vdwACM;
+        padda.vdwDriver = addw.vdwDriver;
+        padda.fdwSupport = addw.fdwSupport;
+        padda.cFormatTags = addw.cFormatTags;
+        padda.cFilterTags = addw.cFilterTags;
+        padda.hicon = addw.hicon;
+        WideCharToMultiByte( CP_ACP, 0, addw.szShortName, -1, padda.szShortName,
+                             sizeof(padda.szShortName), NULL, NULL );
+        WideCharToMultiByte( CP_ACP, 0, addw.szLongName, -1, padda.szLongName,
+                             sizeof(padda.szLongName), NULL, NULL );
+        WideCharToMultiByte( CP_ACP, 0, addw.szCopyright, -1, padda.szCopyright,
+                             sizeof(padda.szCopyright), NULL, NULL );
+        WideCharToMultiByte( CP_ACP, 0, addw.szLicensing, -1, padda.szLicensing,
+                             sizeof(padda.szLicensing), NULL, NULL );
+        WideCharToMultiByte( CP_ACP, 0, addw.szFeatures, -1, padda.szFeatures,
+                             sizeof(padda.szFeatures), NULL, NULL );
+        memcpy(padd, &padda, min(padd->cbStruct, sizeof(*padd)));
     }
     return mmr;
 }
@@ -167,14 +197,30 @@ MMRESULT WINAPI acmDriverDetailsW(HACMDRIVERID hadid, PACMDRIVERDETAILSW padd, D
     HACMDRIVER acmDrvr;
     MMRESULT mmr;
 
-    if (fdwDetails)
+    TRACE("(%p, %p, %08lx)\n", hadid, padd, fdwDetails);
+
+    if (!padd) {
+        WARN("invalid parameter\n");
+        return MMSYSERR_INVALPARAM;
+    }
+
+    if (padd->cbStruct < 4) {
+        WARN("invalid parameter\n");
+        return MMSYSERR_INVALPARAM;
+    }
+
+    if (fdwDetails) {
+        WARN("invalid flag\n");
 	return MMSYSERR_INVALFLAG;
+    }
 
     mmr = acmDriverOpen(&acmDrvr, hadid, 0);
     if (mmr == MMSYSERR_NOERROR) {
-	mmr = (MMRESULT)MSACM_Message(acmDrvr, ACMDM_DRIVER_DETAILS, (LPARAM)padd,  0);
+        ACMDRIVERDETAILSW paddw;
+        mmr = (MMRESULT)MSACM_Message(acmDrvr, ACMDM_DRIVER_DETAILS, (LPARAM)&paddw,  0);
 
 	acmDriverClose(acmDrvr, 0);
+        memcpy(padd, &paddw, min(padd->cbStruct, sizeof(*padd)));
     }
 
     return mmr;
@@ -188,10 +234,17 @@ MMRESULT WINAPI acmDriverEnum(ACMDRIVERENUMCB fnCallback, DWORD dwInstance, DWOR
     PWINE_ACMDRIVERID	padid;
     DWORD		fdwSupport;
 
-    if (!fnCallback) return MMSYSERR_INVALPARAM;
+    TRACE("(%p, %08lx, %08lx)\n", fnCallback, dwInstance, fdwEnum);
 
-    if (fdwEnum & ~(ACM_DRIVERENUMF_NOLOCAL|ACM_DRIVERENUMF_DISABLED))
+    if (!fnCallback) {
+        WARN("invalid parameter\n");
+        return MMSYSERR_INVALPARAM;
+    }
+
+    if (fdwEnum & ~(ACM_DRIVERENUMF_NOLOCAL|ACM_DRIVERENUMF_DISABLED)) {
+        WARN("invalid flag\n");
 	return MMSYSERR_INVALFLAG;
+    }
 
     for (padid = MSACM_pFirstACMDriverID; padid; padid = padid->pNextACMDriverID) {
 	fdwSupport = padid->fdwSupport;
@@ -216,15 +269,23 @@ MMRESULT WINAPI acmDriverID(HACMOBJ hao, PHACMDRIVERID phadid, DWORD fdwDriverID
 {
     PWINE_ACMOBJ pao;
 
-    if (!phadid)
-	return MMSYSERR_INVALPARAM;
+    TRACE("(%p, %p, %08lx)\n", hao, phadid, fdwDriverID);
 
-    if (fdwDriverID)
+    if (fdwDriverID) {
+        WARN("invalid flag\n");
 	return MMSYSERR_INVALFLAG;
+    }
 
     pao = MSACM_GetObj(hao, WINE_ACMOBJ_DONTCARE);
-    if (!pao)
+    if (!pao) {
+        WARN("invalid handle\n");
 	return MMSYSERR_INVALHANDLE;
+    }
+
+    if (!phadid) {
+        WARN("invalid parameter\n");
+        return MMSYSERR_INVALPARAM;
+    }
 
     *phadid = (HACMDRIVERID) pao->pACMDriverID;
 
@@ -237,11 +298,15 @@ MMRESULT WINAPI acmDriverID(HACMOBJ hao, PHACMDRIVERID phadid, DWORD fdwDriverID
  */
 LRESULT WINAPI acmDriverMessage(HACMDRIVER had, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
 {
+    TRACE("(%p, %04x, %08lx, %08lx\n", had, uMsg, lParam1, lParam2);
+
     if ((uMsg >= ACMDM_USER && uMsg < ACMDM_RESERVED_LOW) ||
 	uMsg == ACMDM_DRIVER_ABOUT ||
 	uMsg == DRV_QUERYCONFIGURE ||
 	uMsg == DRV_CONFIGURE)
 	return MSACM_Message(had, uMsg, lParam1, lParam2);
+
+    WARN("invalid parameter\n");
     return MMSYSERR_INVALPARAM;
 }
 
@@ -256,19 +321,27 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpe
 
     TRACE("(%p, %p, %08lu)\n", phad, hadid, fdwOpen);
 
-    if (!phad)
+    if (!phad) {
+        WARN("invalid parameter\n");
 	return MMSYSERR_INVALPARAM;
+    }
 
-    if (fdwOpen)
+    if (fdwOpen) {
+        WARN("invalid flag\n");
 	return MMSYSERR_INVALFLAG;
+    }
 
     padid = MSACM_GetDriverID(hadid);
-    if (!padid)
+    if (!padid) {
+        WARN("invalid handle\n");
 	return MMSYSERR_INVALHANDLE;
+    }
 
     pad = HeapAlloc(MSACM_hHeap, 0, sizeof(WINE_ACMDRIVER));
-    if (!pad)
+    if (!pad) {
+        WARN("no memory\n");
         return MMSYSERR_NOMEM;
+    }
 
     pad->obj.dwType = WINE_ACMOBJ_DRIVER;
     pad->obj.pACMDriverID = padid;
@@ -317,6 +390,7 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpe
 
     return MMSYSERR_NOERROR;
  gotError:
+    WARN("failed: ret = %08x\n", ret);
     if (pad && !pad->hDrvr)
 	HeapFree(MSACM_hHeap, 0, pad);
     return ret;
@@ -335,25 +409,35 @@ MMRESULT WINAPI acmDriverPriority(HACMDRIVERID hadid, DWORD dwPriority, DWORD fd
     HKEY hPriorityKey;
     DWORD dwPriorityCounter;
 
+    TRACE("(%p, %08lx, %08lx)\n", hadid, dwPriority, fdwPriority);
+
     padid = MSACM_GetDriverID(hadid);
-    if (!padid)
+    if (!padid) {
+        WARN("invalid handle\n");
 	return MMSYSERR_INVALHANDLE;
+    }
 
     /* Check for unknown flags */
     if (fdwPriority &
 	~(ACM_DRIVERPRIORITYF_ENABLE|ACM_DRIVERPRIORITYF_DISABLE|
-	  ACM_DRIVERPRIORITYF_BEGIN|ACM_DRIVERPRIORITYF_END))
+	  ACM_DRIVERPRIORITYF_BEGIN|ACM_DRIVERPRIORITYF_END)) {
+        WARN("invalid flag\n");
 	return MMSYSERR_INVALFLAG;
+    }
 
     /* Check for incompatible flags */
     if ((fdwPriority & ACM_DRIVERPRIORITYF_ENABLE) &&
-	(fdwPriority & ACM_DRIVERPRIORITYF_DISABLE))
+	(fdwPriority & ACM_DRIVERPRIORITYF_DISABLE)) {
+        WARN("invalid flag\n");
 	return MMSYSERR_INVALFLAG;
+    }
 
     /* Check for incompatible flags */
     if ((fdwPriority & ACM_DRIVERPRIORITYF_BEGIN) &&
-	(fdwPriority & ACM_DRIVERPRIORITYF_END))
+	(fdwPriority & ACM_DRIVERPRIORITYF_END)) {
+        WARN("invalid flag\n");
 	return MMSYSERR_INVALFLAG;
+    }
 
     lError = RegOpenKeyA(HKEY_CURRENT_USER,
 			 "Software\\Microsoft\\Multimedia\\"
@@ -361,8 +445,10 @@ MMRESULT WINAPI acmDriverPriority(HACMDRIVERID hadid, DWORD dwPriority, DWORD fd
 			 &hPriorityKey
 			 );
     /* FIXME: Create key */
-    if (lError != ERROR_SUCCESS)
+    if (lError != ERROR_SUCCESS) {
+        WARN("RegOpenKeyA failed\n");
 	return MMSYSERR_ERROR;
+    }
 
     for (dwPriorityCounter = 1; ; dwPriorityCounter++)	{
 	snprintf(szSubKey, 17, "Priority%ld", dwPriorityCounter);
@@ -377,6 +463,7 @@ MMRESULT WINAPI acmDriverPriority(HACMDRIVERID hadid, DWORD dwPriority, DWORD fd
 
     RegCloseKey(hPriorityKey);
 
+    WARN("RegQueryValueA failed\n");
     return MMSYSERR_ERROR;
 }
 
@@ -387,12 +474,18 @@ MMRESULT WINAPI acmDriverRemove(HACMDRIVERID hadid, DWORD fdwRemove)
 {
     PWINE_ACMDRIVERID padid;
 
-    padid = MSACM_GetDriverID(hadid);
-    if (!padid)
-	return MMSYSERR_INVALHANDLE;
+    TRACE("(%p, %08lx)\n", hadid, fdwRemove);
 
-    if (fdwRemove)
+    padid = MSACM_GetDriverID(hadid);
+    if (!padid) {
+        WARN("invalid handle\n");
+	return MMSYSERR_INVALHANDLE;
+    }
+
+    if (fdwRemove) {
+        WARN("invalid flag\n");
 	return MMSYSERR_INVALFLAG;
+    }
 
     MSACM_UnregisterDriver(padid);
 
diff --git a/reactos/lib/msacm/format.c b/reactos/lib/msacm/format.c
index b6825689140..b64f8b0db5d 100644
--- a/reactos/lib/msacm/format.c
+++ b/reactos/lib/msacm/format.c
@@ -317,8 +317,8 @@ MMRESULT WINAPI acmFormatDetailsA(HACMDRIVER had, PACMFORMATDETAILSA pafd,
 MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD fdwDetails)
 {
     MMRESULT			mmr;
-    static WCHAR		fmt1[] = {'%','d',' ','H','z',0};
-    static WCHAR		fmt2[] = {';',' ','%','d',' ','b','i','t','s',0};
+    static const WCHAR		fmt1[] = {'%','d',' ','H','z',0};
+    static const WCHAR		fmt2[] = {';',' ','%','d',' ','b','i','t','s',0};
     ACMFORMATTAGDETAILSA	aftd;
 
     TRACE("(%p, %p, %ld)\n", had, pafd, fdwDetails);
@@ -411,6 +411,12 @@ MMRESULT WINAPI acmFormatEnumA(HACMDRIVER had, PACMFORMATDETAILSA pafda,
     ACMFORMATDETAILSW		afdw;
     struct MSACM_FormatEnumWtoA_Instance afei;
 
+    if (!pafda)
+        return MMSYSERR_INVALPARAM;
+
+    if (pafda->cbStruct < sizeof(*pafda))
+        return MMSYSERR_INVALPARAM;
+
     memset(&afdw, 0, sizeof(afdw));
     afdw.cbStruct = sizeof(afdw);
     afdw.dwFormatIndex = pafda->dwFormatIndex;
@@ -489,7 +495,11 @@ MMRESULT WINAPI acmFormatEnumW(HACMDRIVER had, PACMFORMATDETAILSW pafd,
     TRACE("(%p, %p, %p, %ld, %ld)\n",
 	  had, pafd, fnCallback, dwInstance, fdwEnum);
 
-    if (pafd->cbStruct < sizeof(*pafd)) return MMSYSERR_INVALPARAM;
+    if (!pafd)
+        return MMSYSERR_INVALPARAM;
+
+    if (pafd->cbStruct < sizeof(*pafd))
+        return MMSYSERR_INVALPARAM;
 
     if (fdwEnum & (ACM_FORMATENUMF_WFORMATTAG|ACM_FORMATENUMF_NCHANNELS|
 		   ACM_FORMATENUMF_NSAMPLESPERSEC|ACM_FORMATENUMF_WBITSPERSAMPLE|
@@ -731,6 +741,15 @@ MMRESULT WINAPI acmFormatTagEnumA(HACMDRIVER had, PACMFORMATTAGDETAILSA paftda,
     ACMFORMATTAGDETAILSW	aftdw;
     struct MSACM_FormatTagEnumWtoA_Instance aftei;
 
+    if (!paftda)
+        return MMSYSERR_INVALPARAM;
+
+    if (paftda->cbStruct < sizeof(*paftda))
+        return MMSYSERR_INVALPARAM;
+
+    if (fdwEnum != 0)
+        return MMSYSERR_INVALFLAG;
+
     memset(&aftdw, 0, sizeof(aftdw));
     aftdw.cbStruct = sizeof(aftdw);
     aftdw.dwFormatTagIndex = paftda->dwFormatTagIndex;
@@ -758,7 +777,14 @@ MMRESULT WINAPI acmFormatTagEnumW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd,
     TRACE("(%p, %p, %p, %ld, %ld)\n",
 	  had, paftd, fnCallback, dwInstance, fdwEnum);
 
-    if (paftd->cbStruct < sizeof(*paftd)) return MMSYSERR_INVALPARAM;
+    if (!paftd)
+        return MMSYSERR_INVALPARAM;
+
+    if (paftd->cbStruct < sizeof(*paftd))
+        return MMSYSERR_INVALPARAM;
+
+    if (fdwEnum != 0)
+        return MMSYSERR_INVALFLAG;
 
     /* (WS) MSDN info page says that if had != 0, then we should find
      * the specific driver to get its tags from. Therefore I'm removing
diff --git a/reactos/lib/msacm/internal.c b/reactos/lib/msacm/internal.c
index d54c7640214..9cb8002a380 100644
--- a/reactos/lib/msacm/internal.c
+++ b/reactos/lib/msacm/internal.c
@@ -236,7 +236,7 @@ static	BOOL MSACM_WriteCache(PWINE_ACMDRIVERID padid)
 /***********************************************************************
  *           MSACM_RegisterDriver()
  */
-PWINE_ACMDRIVERID MSACM_RegisterDriver(LPWSTR pszDriverAlias, LPWSTR pszFileName,
+PWINE_ACMDRIVERID MSACM_RegisterDriver(LPCWSTR pszDriverAlias, LPCWSTR pszFileName,
 				       HINSTANCE hinstModule)
 {
     PWINE_ACMDRIVERID	padid;
@@ -283,48 +283,50 @@ PWINE_ACMDRIVERID MSACM_RegisterDriver(LPWSTR pszDriverAlias, LPWSTR pszFileName
  */
 void MSACM_RegisterAllDrivers(void)
 {
-    LPWSTR pszBuffer;
-    DWORD dwBufferLength;
-    static WCHAR msacm32[] = {'m','s','a','c','m','3','2','.','d','l','l','\0'};
-    static WCHAR msacmW[] = {'M','S','A','C','M','.'};
-    static WCHAR drv32[] = {'d','r','i','v','e','r','s','3','2','\0'};
-    static WCHAR sys[] = {'s','y','s','t','e','m','.','i','n','i','\0'};
+    static const WCHAR msacm32[] = {'m','s','a','c','m','3','2','.','d','l','l','\0'};
+    static const WCHAR msacmW[] = {'M','S','A','C','M','.'};
+    static const WCHAR drv32[] = {'d','r','i','v','e','r','s','3','2','\0'};
+    static const WCHAR sys[] = {'s','y','s','t','e','m','.','i','n','i','\0'};
+    static const WCHAR drvkey[] = {'S','o','f','t','w','a','r','e','\\',
+				   'M','i','c','r','o','s','o','f','t','\\',
+				   'W','i','n','d','o','w','s',' ','N','T','\\',
+				   'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\',
+				   'D','r','i','v','e','r','s','3','2','\0'};
+    DWORD i, cnt = 0, bufLen, lRet;
+    WCHAR buf[2048], *name, *s;
+    FILETIME lastWrite;
+    HKEY hKey;
 
-    /* FIXME
-     *  What if the user edits system.ini while the program is running?
-     *  Does Windows handle that?
-     */
-    if (MSACM_pFirstACMDriverID)
-	return;
+    /* FIXME: What if the user edits system.ini while the program is running?
+     * Does Windows handle that?  */
+    if (MSACM_pFirstACMDriverID) return;
 
-    /* FIXME: Does not work! How do I determine the section length? */
-    dwBufferLength = 1024;
-/* EPP 	GetPrivateProfileSectionA("drivers32", NULL, 0, "system.ini"); */
-
-    pszBuffer = (LPWSTR) HeapAlloc(MSACM_hHeap, 0, dwBufferLength * sizeof(WCHAR));
-    if (GetPrivateProfileSectionW(drv32, pszBuffer, dwBufferLength, sys))
-    {
-	LPWSTR s = pszBuffer, s2;
-
-	while (*s)
-        {
-            CharUpperBuffW(s, 6);
-            if (memcmp(s, msacmW, 6 * sizeof(WCHAR)) == 0)
-            {
-                s2 = s;
-		while (*s2 != '\0' && *s2 != '=') s2++;
-		if (*s2)
-                {
-		    *s2 = '\0';
-		    MSACM_RegisterDriver(s, s2 + 1, 0);
-		    *s2 = '=';
-		}
-	    }
-	    s += strlenW(s) + 1; /* Either next char or \0 */
+    lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, drvkey, 0, KEY_QUERY_VALUE, &hKey);
+    if (lRet == ERROR_SUCCESS) {
+	RegQueryInfoKeyW( hKey, 0, 0, 0, &cnt, 0, 0, 0, 0, 0, 0, 0);
+	for (i = 0; i < cnt; i++) {
+	    bufLen = sizeof(buf) / sizeof(buf[0]);
+	    lRet = RegEnumKeyExW(hKey, i, buf, &bufLen, 0, 0, 0, &lastWrite);
+	    if (lRet != ERROR_SUCCESS) continue;
+	    if (strncmpiW(buf, msacmW, sizeof(msacmW)/sizeof(msacmW[0]))) continue;
+	    if (!(name = strchrW(buf, '='))) continue;
+	    *name = 0;
+	    MSACM_RegisterDriver(buf, name + 1, 0);
 	}
+    	RegCloseKey( hKey );
     }
 
-    HeapFree(MSACM_hHeap, 0, pszBuffer);
+    if (GetPrivateProfileSectionW(drv32, buf, sizeof(buf)/sizeof(buf[0]), sys))
+    {
+	for(s = buf; *s;  s += strlenW(s) + 1)
+	{
+	    if (strncmpiW(s, msacmW, sizeof(msacmW)/sizeof(msacmW[0]))) continue;
+	    if (!(name = strchrW(s, '='))) continue;
+	    *name = 0;
+	    MSACM_RegisterDriver(s, name + 1, 0);
+	    *name = '=';
+	}
+    }
 
     MSACM_RegisterDriver(msacm32, msacm32, 0);
 }
diff --git a/reactos/lib/msacm/makefile b/reactos/lib/msacm/makefile
index 24c40308492..fbf1cf844af 100644
--- a/reactos/lib/msacm/makefile
+++ b/reactos/lib/msacm/makefile
@@ -1,23 +1,9 @@
-# $Id: makefile
+# $Id: makefile,v 1.2 2004/07/14 18:30:54 sedwards Exp $
 
 PATH_TO_TOP = ../..
 
 TARGET_TYPE = winedll
 
-TARGET_NAME = msacm32
-
-TARGET_BASE = 0x777c0000
-
-TARGET_CFLAGS += -DYDEBUG -DUNICODE -D_UNICODE -D__USE_W32API -D__REACTOS__ -Wall -Werror
-# -D_WIN32_WINNT=0x0500
-
-TARGET_SDKLIBS = ntdll.a winmm.a
-
-DEP_OBJECTS = $(TARGET_OBJECTS)
-
 include $(PATH_TO_TOP)/rules.mak
 
 include $(TOOLS_PATH)/helper.mk
-
-include $(TOOLS_PATH)/depend.mk
-
diff --git a/reactos/lib/msacm/msacm.rc b/reactos/lib/msacm/msacm.rc
index 3aee776beeb..186ab00b7de 100644
--- a/reactos/lib/msacm/msacm.rc
+++ b/reactos/lib/msacm/msacm.rc
@@ -24,7 +24,9 @@
 #include "wineacm.h"
 
 #include "msacm_En.rc"
+#include "msacm_Es.rc"
 #include "msacm_Fr.rc"
 #include "msacm_It.rc"
+#include "msacm_Ja.rc"
 #include "msacm_Nl.rc"
 #include "msacm_Pt.rc"
diff --git a/reactos/lib/msacm/msacm32_main.c b/reactos/lib/msacm/msacm32_main.c
index 6ca97e9e3be..dde962a2dfe 100644
--- a/reactos/lib/msacm/msacm32_main.c
+++ b/reactos/lib/msacm/msacm32_main.c
@@ -120,6 +120,7 @@ MMRESULT WINAPI acmMetrics(HACMOBJ hao, UINT uMetric, LPVOID pMetric)
 	/* fall through */
     case ACM_METRIC_COUNT_LOCAL_DRIVERS:
 	if (hao) return MMSYSERR_INVALHANDLE;
+        if (!pMetric) return MMSYSERR_INVALPARAM;
 	for (padid = MSACM_pFirstACMDriverID; padid; padid = padid->pNextACMDriverID)
 	    if (!(padid->fdwSupport & ACMDRIVERDETAILS_SUPPORTF_DISABLED) && CheckLocal(padid))
 		val++;
@@ -131,6 +132,7 @@ MMRESULT WINAPI acmMetrics(HACMOBJ hao, UINT uMetric, LPVOID pMetric)
 	/* fall through */
     case ACM_METRIC_COUNT_LOCAL_CODECS:
 	if (hao) return MMSYSERR_INVALHANDLE;
+        if (!pMetric) return MMSYSERR_INVALPARAM;
 	for (padid = MSACM_pFirstACMDriverID; padid; padid = padid->pNextACMDriverID)
 	    if (!(padid->fdwSupport & ACMDRIVERDETAILS_SUPPORTF_DISABLED) &&
 		(padid->fdwSupport & ACMDRIVERDETAILS_SUPPORTF_CODEC) &&
@@ -144,6 +146,7 @@ MMRESULT WINAPI acmMetrics(HACMOBJ hao, UINT uMetric, LPVOID pMetric)
 	/* fall through */
     case ACM_METRIC_COUNT_LOCAL_CONVERTERS:
 	if (hao) return MMSYSERR_INVALHANDLE;
+        if (!pMetric) return MMSYSERR_INVALPARAM;
 	for (padid = MSACM_pFirstACMDriverID; padid; padid = padid->pNextACMDriverID)
 	    if (!(padid->fdwSupport & ACMDRIVERDETAILS_SUPPORTF_DISABLED) &&
 		 (padid->fdwSupport & ACMDRIVERDETAILS_SUPPORTF_CONVERTER) &&
@@ -157,6 +160,7 @@ MMRESULT WINAPI acmMetrics(HACMOBJ hao, UINT uMetric, LPVOID pMetric)
 	/* fall through */
     case ACM_METRIC_COUNT_LOCAL_FILTERS:
 	if (hao) return MMSYSERR_INVALHANDLE;
+        if (!pMetric) return MMSYSERR_INVALPARAM;
 	for (padid = MSACM_pFirstACMDriverID; padid; padid = padid->pNextACMDriverID)
 	    if (!(padid->fdwSupport & ACMDRIVERDETAILS_SUPPORTF_DISABLED) &&
 		(padid->fdwSupport & ACMDRIVERDETAILS_SUPPORTF_FILTER) &&
@@ -170,6 +174,7 @@ MMRESULT WINAPI acmMetrics(HACMOBJ hao, UINT uMetric, LPVOID pMetric)
 	/* fall through */
     case ACM_METRIC_COUNT_LOCAL_DISABLED:
 	if (hao) return MMSYSERR_INVALHANDLE;
+        if (!pMetric) return MMSYSERR_INVALPARAM;
 	for (padid = MSACM_pFirstACMDriverID; padid; padid = padid->pNextACMDriverID)
 	    if ((padid->fdwSupport & ACMDRIVERDETAILS_SUPPORTF_DISABLED) && CheckLocal(padid))
 		val++;
@@ -204,10 +209,17 @@ MMRESULT WINAPI acmMetrics(HACMOBJ hao, UINT uMetric, LPVOID pMetric)
 	} else {
 	    return MMSYSERR_INVALHANDLE;
 	}
+        if (!pMetric) return MMSYSERR_INVALPARAM;
 	*(LPDWORD)pMetric = val;
         break;
 
     case ACM_METRIC_COUNT_HARDWARE:
+        if (hao) return MMSYSERR_INVALHANDLE;
+        if (!pMetric) return MMSYSERR_INVALPARAM;
+        *(LPDWORD)pMetric = 0;
+        FIXME("ACM_METRIC_COUNT_HARDWARE not implemented\n");
+        break;
+
     case ACM_METRIC_HARDWARE_WAVE_INPUT:
     case ACM_METRIC_HARDWARE_WAVE_OUTPUT:
     case ACM_METRIC_MAX_SIZE_FILTER:
diff --git a/reactos/lib/msacm/msacm_Es.rc b/reactos/lib/msacm/msacm_Es.rc
new file mode 100644
index 00000000000..642e06780c5
--- /dev/null
+++ b/reactos/lib/msacm/msacm_Es.rc
@@ -0,0 +1,56 @@
+/*
+ * Spanish resource file for MS ACM
+ *
+ * Copyright 2004 José Manuel Ferrer Ortiz
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
+
+DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE  10, 20, 225, 100
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Selección de sonido"
+FONT 8, "MS Shell Dlg"
+BEGIN
+
+    LTEXT           "&Nombre:", -1, 5, 5, 115, 8, NOT WS_GROUP
+
+    COMBOBOX        IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60,
+                    CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+
+    PUSHBUTTON      "&Guardar como...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14
+    PUSHBUTTON      "&Eliminar", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14
+
+    LTEXT           "&Formato:", -1, 5, 41, 44, 8, NOT WS_GROUP
+
+    COMBOBOX        IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60,
+                    CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+
+    LTEXT           "A&tributos:", -1, 5, 59, 44, 8, NOT WS_GROUP
+
+#if 0
+    COMBOBOX        IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60,
+                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP |
+                    CBS_OWNERDRAWFIXED | CBS_HASSTRINGS
+#else
+    COMBOBOX        IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60,
+                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+#endif
+    DEFPUSHBUTTON   "Aceptar", IDOK, 48, 80, 40, 14
+    PUSHBUTTON      "Cancelar", IDCANCEL, 92, 80, 40, 14
+    PUSHBUTTON      "&Ayuda", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14
+
+END
diff --git a/reactos/lib/msacm/msacm_It.rc b/reactos/lib/msacm/msacm_It.rc
index 40d93d64e3e..4fdfb93a9aa 100644
--- a/reactos/lib/msacm/msacm_It.rc
+++ b/reactos/lib/msacm/msacm_It.rc
@@ -2,7 +2,7 @@
  * Italian resource file for MS ACM
  *
  * Copyright 2000 Eric Pouech
- * Copyright 2003 Ivan Leo Murray-Smith
+ * Copyright 2003 Ivan Leo Puoti
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/reactos/lib/msacm/msacm_Ja.rc b/reactos/lib/msacm/msacm_Ja.rc
new file mode 100644
index 00000000000..01e7ba31372
--- /dev/null
+++ b/reactos/lib/msacm/msacm_Ja.rc
@@ -0,0 +1,56 @@
+/*
+ * Japanese resource file for MS ACM
+ *
+ * Copyright 2000 Hajime Segawa
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
+DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE  10, 20, 225, 100
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ƒTƒEƒ“ƒh‚Ì‘I‘ð"
+FONT 9, "MS UI Gothic"
+BEGIN
+
+    LTEXT           "–¼‘O(&N):", -1, 5, 5, 115, 8, NOT WS_GROUP
+
+    COMBOBOX        IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60,
+                    CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+
+    PUSHBUTTON      "–¼‘O‚ð•t‚¯‚Ä•Û‘¶(&S)...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14
+    PUSHBUTTON      "��(&R)", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14
+
+    LTEXT           "ƒtƒH�[ƒ}ƒbƒg(&F):", -1, 5, 41, 44, 8, NOT WS_GROUP
+
+    COMBOBOX        IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60,
+                    CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+
+    LTEXT           "‘®�«(&A):", -1, 5, 59, 44, 8, NOT WS_GROUP
+
+#if 0
+    COMBOBOX        IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60,
+                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP |
+                    CBS_OWNERDRAWFIXED | CBS_HASSTRINGS
+#else
+    COMBOBOX        IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60,
+                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+#endif
+    DEFPUSHBUTTON   "OK", IDOK, 48, 80, 40, 14
+    PUSHBUTTON      "ƒLƒƒƒ“ƒZƒ‹", IDCANCEL, 92, 80, 40, 14
+    PUSHBUTTON      "ƒwƒ‹ƒv(&H)", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14
+
+END
diff --git a/reactos/lib/msacm/pcmconverter.c b/reactos/lib/msacm/pcmconverter.c
new file mode 100644
index 00000000000..3f335d005ce
--- /dev/null
+++ b/reactos/lib/msacm/pcmconverter.c
@@ -0,0 +1,1223 @@
+/* -*- tab-width: 8; c-basic-offset: 4 -*- */
+
+/*
+ *      MSACM32 library
+ *
+ *      Copyright 2000		Eric Pouech
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *	FIXME / TODO list
+ *	+ most of the computation should be done in fixed point arithmetic
+ *	  instead of floating point (16 bits for integral part, and 16 bits
+ *	  for fractional part for example)
+ *	+ implement PCM_FormatSuggest function
+ *	+ get rid of hack for PCM_DriverProc (msacm32.dll shouldn't export
+ *	  a DriverProc, but this would require implementing a generic
+ *	  embedded driver handling scheme in msacm32.dll which isn't done yet
+ */
+
+#include "config.h"
+
+#include <assert.h>
+#include <stdarg.h>
+#include <string.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "mmsystem.h"
+#include "mmreg.h"
+#include "msacm.h"
+#include "wingdi.h"
+#include "winnls.h"
+#include "winuser.h"
+
+#include "msacmdrv.h"
+#include "wineacm.h"
+
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msacm);
+
+/***********************************************************************
+ *           PCM_drvOpen
+ */
+static	DWORD	PCM_drvOpen(LPCSTR str, PACMDRVOPENDESCW adod)
+{
+    TRACE("(%p, %p)\n", str, adod);
+
+    return (adod == NULL) ||
+	(adod->fccType == ACMDRIVERDETAILS_FCCTYPE_AUDIOCODEC &&
+	 adod->fccComp == ACMDRIVERDETAILS_FCCCOMP_UNDEFINED);
+}
+
+/***********************************************************************
+ *           PCM_drvClose
+ */
+static	DWORD	PCM_drvClose(DWORD dwDevID)
+{
+    TRACE("(%ld)\n", dwDevID);
+
+    return 1;
+}
+
+#define	NUM_PCM_FORMATS	(sizeof(PCM_Formats) / sizeof(PCM_Formats[0]))
+#define	NUM_OF(a,b)	(((a)+(b)-1)/(b))
+
+/* flags for fdwDriver */
+#define PCM_RESAMPLE	1
+
+/* data used while converting */
+typedef struct tagAcmPcmData {
+    /* conversion routine, depending if rate conversion is required */
+    union {
+	void (*cvtKeepRate)(const unsigned char*, int, unsigned char*);
+	void (*cvtChangeRate)(struct tagAcmPcmData*, const unsigned char*,
+			      LPDWORD, unsigned char*, LPDWORD);
+    } cvt;
+    /* the following fields are used only with rate conversion) */
+    DWORD	srcPos;		/* position in source stream */
+    double	dstPos;		/* position in destination stream */
+    double	dstIncr;	/* value to increment dst stream when src stream
+				   is incremented by 1 */
+    /* last source stream value read */
+    union {
+	unsigned char	b;	/*  8 bit value */
+	short		s;	/* 16 bit value */
+    } last[2]; /* two channels max (stereo) */
+} AcmPcmData;
+
+/* table to list all supported formats... those are the basic ones. this
+ * also helps given a unique index to each of the supported formats
+ */
+static	struct {
+    int		nChannels;
+    int		nBits;
+    int		rate;
+} PCM_Formats[] = {
+    {1,  8,  8000}, {2,  8,  8000}, {1, 16,  8000}, {2, 16,  8000},
+    {1,  8, 11025}, {2,  8, 11025}, {1, 16, 11025}, {2, 16, 11025},
+    {1,  8, 22050}, {2,  8, 22050}, {1, 16, 22050}, {2, 16, 22050},
+    {1,  8, 44100}, {2,  8, 44100}, {1, 16, 44100}, {2, 16, 44100},
+    {1,  8, 48000}, {2,  8, 48000}, {1, 16, 48000}, {2, 16, 48000},
+    {1,  8, 96000}, {2,  8, 96000}, {1, 16, 96000}, {2, 16, 96000}
+};
+
+/***********************************************************************
+ *           PCM_GetFormatIndex
+ */
+static DWORD PCM_GetFormatIndex(LPWAVEFORMATEX wfx)
+{
+    int i;
+    TRACE("(%p)\n", wfx);
+
+    for (i = 0; i < NUM_PCM_FORMATS; i++) {
+	if (wfx->nChannels == PCM_Formats[i].nChannels &&
+	    wfx->nSamplesPerSec == PCM_Formats[i].rate &&
+	    wfx->wBitsPerSample == PCM_Formats[i].nBits)
+	    return i;
+    }
+    return 0xFFFFFFFF;
+}
+
+/* PCM Conversions:
+ *
+ * parameters:
+ *	+ 8 bit unsigned vs 16 bit signed
+ *	+ mono vs stereo (1 or 2 channels)
+ *	+ sampling rate (8.0, 11.025, 22.05, 44.1 kHz are defined, but algo
+ *	  shall work in all cases)
+ *
+ * mono => stereo: copy the same sample on Left & Right channels
+ * stereo =) mono: use the average value of samples from Left & Right channels
+ * resampling; we lookup for each destination sample the two source adjacent
+ *      samples were src <= dst < src+1 (dst is increased by a fractional
+ *      value which is equivalent to the increment by one on src); then we
+ *      use a linear interpolation between src and src+1
+ */
+
+/***********************************************************************
+ *           C816
+ *
+ * Converts a 8 bit sample to a 16 bit one
+ */
+static inline short C816(unsigned char b)
+{
+    return (short)((b+(b << 8))-32768);
+}
+
+/***********************************************************************
+ *           C168
+ *
+ * Converts a 16 bit sample to a 8 bit one (data loss !!)
+ */
+static inline unsigned char C168(short s)
+{
+    return HIBYTE(s) ^ (unsigned char)0x80;
+}
+
+/***********************************************************************
+ *           R16
+ *
+ * Read a 16 bit sample (correctly handles endianess)
+ */
+static inline short  R16(const unsigned char* src)
+{
+    return (short)((unsigned short)src[0] | ((unsigned short)src[1] << 8));
+}
+
+/***********************************************************************
+ *           W16
+ *
+ * Write a 16 bit sample (correctly handles endianess)
+ */
+static inline void  W16(unsigned char* dst, short s)
+{
+    dst[0] = LOBYTE(s);
+    dst[1] = HIBYTE(s);
+}
+
+/***********************************************************************
+ *           M16
+ *
+ * Convert the (l,r) 16 bit stereo sample into a 16 bit mono
+ * (takes the mid-point of the two values)
+ */
+static inline short M16(short l, short r)
+{
+    return (l + r) / 2;
+}
+
+/***********************************************************************
+ *           M8
+ *
+ * Convert the (l,r) 8 bit stereo sample into a 8 bit mono
+ * (takes the mid-point of the two values)
+ */
+static inline unsigned char M8(unsigned char a, unsigned char b)
+{
+    return (unsigned char)((a + b) / 2);
+}
+
+/* the conversion routines without rate conversion are labelled cvt<X><Y><N><M>K
+ * where :
+ * <X> is the (M)ono/(S)tereo configuration of  input channel
+ * <Y> is the (M)ono/(S)tereo configuration of output channel
+ * <N> is the number of bits of  input channel (8 or 16)
+ * <M> is the number of bits of output channel (8 or 16)
+ *
+ * in the parameters, ns is always the number of samples, so the size of input
+ * buffer (resp output buffer) is ns * (<X> == 'Mono' ? 1:2) * (<N> == 8 ? 1:2)
+ */
+
+static	void cvtMM88K(const unsigned char* src, int ns, unsigned char* dst)
+{
+    TRACE("(%p, %d, %p)\n", src, ns, dst);
+    memcpy(dst, src, ns);
+}
+
+static	void cvtSS88K(const unsigned char* src, int ns, unsigned char* dst)
+{
+    TRACE("(%p, %d, %p)\n", src, ns, dst);
+    memcpy(dst, src, ns * 2);
+}
+
+static	void cvtMM1616K(const unsigned char* src, int ns, unsigned char* dst)
+{
+    TRACE("(%p, %d, %p)\n", src, ns, dst);
+    memcpy(dst, src, ns * 2);
+}
+
+static	void cvtSS1616K(const unsigned char* src, int ns, unsigned char* dst)
+{
+    TRACE("(%p, %d, %p)\n", src, ns, dst);
+    memcpy(dst, src, ns * 4);
+}
+
+static	void cvtMS88K(const unsigned char* src, int ns, unsigned char* dst)
+{
+    TRACE("(%p, %d, %p)\n", src, ns, dst);
+
+    while (ns--) {
+	*dst++ = *src;
+	*dst++ = *src++;
+    }
+}
+
+static	void cvtMS816K(const unsigned char* src, int ns, unsigned char* dst)
+{
+    short	v;
+    TRACE("(%p, %d, %p)\n", src, ns, dst);
+
+    while (ns--) {
+	v = C816(*src++);
+	W16(dst, v);		dst += 2;
+	W16(dst, v);		dst += 2;
+    }
+}
+
+static	void cvtMS168K(const unsigned char* src, int ns, unsigned char* dst)
+{
+    unsigned char v;
+    TRACE("(%p, %d, %p)\n", src, ns, dst);
+
+    while (ns--) {
+	v = C168(R16(src));		src += 2;
+	*dst++ = v;
+	*dst++ = v;
+    }
+}
+
+static	void cvtMS1616K(const unsigned char* src, int ns, unsigned char* dst)
+{
+    short	v;
+    TRACE("(%p, %d, %p)\n", src, ns, dst);
+
+    while (ns--) {
+	v = R16(src);		src += 2;
+	W16(dst, v);		dst += 2;
+	W16(dst, v);		dst += 2;
+    }
+}
+
+static	void cvtSM88K(const unsigned char* src, int ns, unsigned char* dst)
+{
+    TRACE("(%p, %d, %p)\n", src, ns, dst);
+
+    while (ns--) {
+	*dst++ = M8(src[0], src[1]);
+	src += 2;
+    }
+}
+
+static	void cvtSM816K(const unsigned char* src, int ns, unsigned char* dst)
+{
+    short	v;
+    TRACE("(%p, %d, %p)\n", src, ns, dst);
+
+    while (ns--) {
+	v = M16(C816(src[0]), C816(src[1]));
+	src += 2;
+	W16(dst, v);		dst += 2;
+    }
+}
+
+static	void cvtSM168K(const unsigned char* src, int ns, unsigned char* dst)
+{
+    TRACE("(%p, %d, %p)\n", src, ns, dst);
+
+    while (ns--) {
+	*dst++ = C168(M16(R16(src), R16(src + 2)));
+	src += 4;
+    }
+}
+
+static	void cvtSM1616K(const unsigned char* src, int ns, unsigned char* dst)
+{
+    TRACE("(%p, %d, %p)\n", src, ns, dst);
+
+    while (ns--) {
+	W16(dst, M16(R16(src),R16(src+2)));	dst += 2;
+	src += 4;
+    }
+}
+
+static	void cvtMM816K(const unsigned char* src, int ns, unsigned char* dst)
+{
+    TRACE("(%p, %d, %p)\n", src, ns, dst);
+
+    while (ns--) {
+	W16(dst, C816(*src++));		dst += 2;
+    }
+}
+
+static	void cvtSS816K(const unsigned char* src, int ns, unsigned char* dst)
+{
+    TRACE("(%p, %d, %p)\n", src, ns, dst);
+
+    while (ns--) {
+	W16(dst, C816(*src++));	dst += 2;
+	W16(dst, C816(*src++));	dst += 2;
+    }
+}
+
+static	void cvtMM168K(const unsigned char* src, int ns, unsigned char* dst)
+{
+    TRACE("(%p, %d, %p)\n", src, ns, dst);
+
+    while (ns--) {
+	*dst++ = C168(R16(src));	src += 2;
+    }
+}
+
+static	void cvtSS168K(const unsigned char* src, int ns, unsigned char* dst)
+{
+    TRACE("(%p, %d, %p)\n", src, ns, dst);
+
+    while (ns--) {
+	*dst++ = C168(R16(src));	src += 2;
+	*dst++ = C168(R16(src));	src += 2;
+    }
+}
+
+static	void (*PCM_ConvertKeepRate[16])(const unsigned char*, int, unsigned char*) = {
+    cvtSS88K,	cvtSM88K,   cvtMS88K,   cvtMM88K,
+    cvtSS816K,	cvtSM816K,  cvtMS816K,  cvtMM816K,
+    cvtSS168K,	cvtSM168K,  cvtMS168K,  cvtMM168K,
+    cvtSS1616K, cvtSM1616K, cvtMS1616K, cvtMM1616K,
+};
+
+/***********************************************************************
+ *           I
+ *
+ * Interpolate the value at r (r in ]0, 1]) between the two points v1 and v2
+ * Linear interpolation is used
+ */
+static	inline double	I(double v1, double v2, double r)
+{
+    if (0.0 >= r || r > 1.0) FIXME("r!! %f\n", r);
+    return (1.0 - r) * v1 + r * v2;
+}
+
+static	void cvtSS88C(AcmPcmData* apd, const unsigned char* src, LPDWORD nsrc,
+		      unsigned char* dst, LPDWORD ndst)
+{
+    double     		r;
+    TRACE("(%p, %p, %p, %p, %p)\n", apd, src, nsrc, dst, ndst);
+
+    while (*nsrc != 0 && *ndst != 0) {
+	while ((r = (double)apd->srcPos - apd->dstPos) <= 0) {
+	    if (*nsrc == 0) return;
+	    apd->last[0].b = *src++;
+	    apd->last[1].b = *src++;
+	    apd->srcPos++;
+	    (*nsrc)--;
+	}
+	/* now do the interpolation */
+	*dst++ = I(apd->last[0].b, src[0], r);
+	*dst++ = I(apd->last[1].b, src[1], r);
+	apd->dstPos += apd->dstIncr;
+	(*ndst)--;
+    }
+}
+
+/* the conversion routines with rate conversion are labelled cvt<X><Y><N><M>C
+ * where :
+ * <X> is the (M)ono/(S)tereo configuration of  input channel
+ * <Y> is the (M)ono/(S)tereo configuration of output channel
+ * <N> is the number of bits of  input channel (8 or 16)
+ * <M> is the number of bits of output channel (8 or 16)
+ *
+ */
+static	void cvtSM88C(AcmPcmData* apd, const unsigned char* src, LPDWORD nsrc,
+		      unsigned char* dst, LPDWORD ndst)
+{
+    double   	r;
+    TRACE("(%p, %p, %p, %p, %p)\n", apd, src, nsrc, dst, ndst);
+
+    while (*nsrc != 0 && *ndst != 0) {
+	while ((r = (double)apd->srcPos - apd->dstPos) <= 0) {
+	    if (*nsrc == 0) return;
+	    apd->last[0].b = *src++;
+	    apd->last[1].b = *src++;
+	    apd->srcPos++;
+	    (*nsrc)--;
+	}
+	/* now do the interpolation */
+        if (*nsrc)	/* don't go off end of data */
+            *dst++ = I(M8(apd->last[0].b, apd->last[1].b), M8(src[0], src[1]), r);
+        else
+            *dst++ = M8(apd->last[0].b, apd->last[1].b);
+	apd->dstPos += apd->dstIncr;
+	(*ndst)--;
+    }
+}
+
+static	void cvtMS88C(AcmPcmData* apd, const unsigned char* src, LPDWORD nsrc,
+		      unsigned char* dst, LPDWORD ndst)
+{
+    double	r;
+    TRACE("(%p, %p, %p, %p, %p)\n", apd, src, nsrc, dst, ndst);
+
+    while (*nsrc != 0 && *ndst != 0) {
+	while ((r = (double)apd->srcPos - apd->dstPos) <= 0) {
+	    if (*nsrc == 0) return;
+	    apd->last[0].b = *src++;
+	    apd->srcPos++;
+	    (*nsrc)--;
+	}
+	/* now do the interpolation */
+        if (*nsrc)	/* don't go off end of data */
+            dst[0] = dst[1] = I(apd->last[0].b, src[0], r);
+        else
+            dst[0] = dst[1] = apd->last[0].b;
+	dst += 2;
+	apd->dstPos += apd->dstIncr;
+	(*ndst)--;
+    }
+}
+
+static	void cvtMM88C(AcmPcmData* apd, const unsigned char* src, LPDWORD nsrc,
+		      unsigned char* dst, LPDWORD ndst)
+{
+    double     	r;
+    TRACE("(%p, %p, %p, %p, %p)\n", apd, src, nsrc, dst, ndst);
+
+    while (*nsrc != 0 && *ndst != 0) {
+	while ((r = (double)apd->srcPos - apd->dstPos) <= 0) {
+	    if (*nsrc == 0) return;
+	    apd->last[0].b = *src++;
+	    apd->srcPos++;
+	    (*nsrc)--;
+	}
+	/* now do the interpolation */
+        if (*nsrc)	/* don't go off end of data */
+            *dst++ = I(apd->last[0].b, src[0], r);
+        else
+            *dst++ = apd->last[0].b;
+	apd->dstPos += apd->dstIncr;
+	(*ndst)--;
+    }
+}
+
+static	void cvtSS816C(AcmPcmData* apd, const unsigned char* src, LPDWORD nsrc,
+		       unsigned char* dst, LPDWORD ndst)
+{
+    double	r;
+    TRACE("(%p, %p, %p, %p, %p)\n", apd, src, nsrc, dst, ndst);
+
+    while (*nsrc != 0 && *ndst != 0) {
+	while ((r = (double)apd->srcPos - apd->dstPos) <= 0) {
+	    if (*nsrc == 0) return;
+	    apd->last[0].b = *src++;
+	    apd->last[1].b = *src++;
+	    apd->srcPos++;
+	    (*nsrc)--;
+	}
+	/* now do the interpolation */
+        if (*nsrc)	/* don't go off end of data */
+            W16(dst, I(C816(apd->last[0].b), C816(src[0]), r));
+        else
+            W16(dst, C816(apd->last[0].b));
+        dst += 2;
+        if (*nsrc)	/* don't go off end of data */
+	    W16(dst, I(C816(apd->last[1].b), C816(src[1]), r));
+        else
+	    W16(dst, C816(apd->last[1].b));
+        dst += 2;
+	apd->dstPos += apd->dstIncr;
+	(*ndst)--;
+    }
+}
+
+static	void cvtSM816C(AcmPcmData* apd, const unsigned char* src, LPDWORD nsrc,
+			unsigned char* dst, LPDWORD ndst)
+{
+    double     	r;
+    TRACE("(%p, %p, %p, %p, %p)\n", apd, src, nsrc, dst, ndst);
+
+    while (*nsrc != 0 && *ndst != 0) {
+	while ((r = (double)apd->srcPos - apd->dstPos) <= 0) {
+	    if (*nsrc == 0) return;
+	    apd->last[0].b = *src++;
+	    apd->last[1].b = *src++;
+	    apd->srcPos++;
+	    (*nsrc)--;
+	}
+	/* now do the interpolation */
+        if (*nsrc)	/* don't go off end of data */
+            W16(dst, I(M16(C816(apd->last[0].b), C816(apd->last[1].b)),
+                       M16(C816(src[0]), C816(src[1])), r));
+        else
+            W16(dst, M16(C816(apd->last[0].b), C816(apd->last[1].b)));
+	dst += 2;
+	apd->dstPos += apd->dstIncr;
+	(*ndst)--;
+    }
+}
+
+static	void cvtMS816C(AcmPcmData* apd, const unsigned char* src, LPDWORD nsrc,
+			unsigned char* dst, LPDWORD ndst)
+{
+    double     	r;
+    short	v;
+    TRACE("(%p, %p, %p->(%ld), %p, %p->(%ld))\n", apd, src, nsrc, *nsrc, dst, ndst, *ndst);
+
+    while (*nsrc != 0 && *ndst != 0) {
+	while ((r = (double)apd->srcPos - apd->dstPos) <= 0) {
+	    if (*nsrc == 0) return;
+	    apd->last[0].b = *src++;
+	    apd->srcPos++;
+	    (*nsrc)--;
+	}
+	/* now do the interpolation */
+        if (*nsrc)	/* don't go off end of data */
+	    v = I(C816(apd->last[0].b), C816(src[0]), r);
+        else
+            v = C816(apd->last[0].b);
+	W16(dst, v);		dst += 2;
+	W16(dst, v);		dst += 2;
+	apd->dstPos += apd->dstIncr;
+	(*ndst)--;
+    }
+}
+
+static	void cvtMM816C(AcmPcmData* apd, const unsigned char* src, LPDWORD nsrc,
+			unsigned char* dst, LPDWORD ndst)
+{
+    double     	r;
+    TRACE("(%p, %p, %p, %p, %p)\n", apd, src, nsrc, dst, ndst);
+
+    while (*nsrc != 0 && *ndst != 0) {
+	while ((r = (double)apd->srcPos - apd->dstPos) <= 0) {
+	    if (*nsrc == 0) return;
+	    apd->last[0].b = *src++;
+	    apd->srcPos++;
+	    (*nsrc)--;
+	}
+	/* now do the interpolation */
+        if (*nsrc)	/* don't go off end of data */
+	    W16(dst, I(C816(apd->last[0].b), C816(src[0]), r));
+        else
+            W16(dst, C816(apd->last[0].b));
+	dst += 2;
+	apd->dstPos += apd->dstIncr;
+	(*ndst)--;
+    }
+}
+
+static	void cvtSS168C(AcmPcmData* apd, const unsigned char* src, LPDWORD nsrc,
+			unsigned char* dst, LPDWORD ndst)
+{
+    double     	r;
+    TRACE("(%p, %p, %p, %p, %p)\n", apd, src, nsrc, dst, ndst);
+
+    while (*nsrc != 0 && *ndst != 0) {
+	while ((r = (double)apd->srcPos - apd->dstPos) <= 0) {
+	    if (*nsrc == 0) return;
+	    apd->last[0].s = R16(src);	src += 2;
+	    apd->last[1].s = R16(src);	src += 2;
+	    apd->srcPos++;
+	    (*nsrc)--;
+	}
+	/* now do the interpolation */
+        if (*nsrc) {	/* don't go off end of data */
+	    *dst++ = C168(I(apd->last[0].s, R16(src)  , r));
+	    *dst++ = C168(I(apd->last[1].s, R16(src+2), r));
+        } else {
+	    *dst++ = C168(apd->last[0].s);
+	    *dst++ = C168(apd->last[1].s);
+        }
+	apd->dstPos += apd->dstIncr;
+	(*ndst)--;
+    }
+}
+
+static	void cvtSM168C(AcmPcmData* apd, const unsigned char* src, LPDWORD nsrc,
+			unsigned char* dst, LPDWORD ndst)
+{
+    double     	r;
+    TRACE("(%p, %p, %p, %p, %p)\n", apd, src, nsrc, dst, ndst);
+
+    while (*nsrc != 0 && *ndst != 0) {
+	while ((r = (double)apd->srcPos - apd->dstPos) <= 0) {
+	    if (*nsrc == 0) return;
+	    apd->last[0].s = R16(src);	src += 2;
+	    apd->last[1].s = R16(src);	src += 2;
+	    apd->srcPos++;
+	    (*nsrc)--;
+	}
+	/* now do the interpolation */
+        if (*nsrc)	/* don't go off end of data */
+	    *dst++ = C168(I(M16(apd->last[0].s, apd->last[1].s),
+			    M16(R16(src), R16(src + 2)), r));
+        else
+	    *dst++ = C168(M16(apd->last[0].s, apd->last[1].s));
+	apd->dstPos += apd->dstIncr;
+	(*ndst)--;
+    }
+}
+
+
+static	void cvtMS168C(AcmPcmData* apd, const unsigned char* src, LPDWORD nsrc,
+			unsigned char* dst, LPDWORD ndst)
+{
+    double     	r;
+    TRACE("(%p, %p, %p, %p, %p)\n", apd, src, nsrc, dst, ndst);
+
+    while (*nsrc != 0 && *ndst != 0) {
+	while ((r = (double)apd->srcPos - apd->dstPos) <= 0) {
+	    if (*nsrc == 0) return;
+	    apd->last[0].s = R16(src);	src += 2;
+	    apd->srcPos++;
+	    (*nsrc)--;
+	}
+	/* now do the interpolation */
+        if (*nsrc)	/* don't go off end of data */
+	    dst[0] = dst[1] = C168(I(apd->last[0].s, R16(src), r));
+        else
+	    dst[0] = dst[1] = C168(apd->last[0].s);
+        dst += 2;
+	apd->dstPos += apd->dstIncr;
+	(*ndst)--;
+    }
+}
+
+
+static	void cvtMM168C(AcmPcmData* apd, const unsigned char* src, LPDWORD nsrc,
+			unsigned char* dst, LPDWORD ndst)
+{
+    double     	r;
+    TRACE("(%p, %p, %p, %p, %p)\n", apd, src, nsrc, dst, ndst);
+
+    while (*nsrc != 0 && *ndst != 0) {
+	while ((r = (double)apd->srcPos - apd->dstPos) <= 0) {
+	    if (*nsrc == 0) return;
+	    apd->last[0].s = R16(src);	src += 2;
+	    apd->srcPos++;
+	    (*nsrc)--;
+	}
+	/* now do the interpolation */
+        if (*nsrc)	/* don't go off end of data */
+	    *dst++ = C168(I(apd->last[0].s, R16(src), r));
+        else
+	    *dst++ = C168(apd->last[0].s);
+	apd->dstPos += apd->dstIncr;
+	(*ndst)--;
+    }
+}
+
+static	void cvtSS1616C(AcmPcmData* apd, const unsigned char* src, LPDWORD nsrc,
+			unsigned char* dst, LPDWORD ndst)
+{
+    double     	r;
+    TRACE("(%p, %p, %p, %p, %p)\n", apd, src, nsrc, dst, ndst);
+
+    while (*nsrc != 0 && *ndst != 0) {
+	while ((r = (double)apd->srcPos - apd->dstPos) <= 0) {
+	    if (*nsrc == 0) return;
+	    apd->last[0].s = R16(src);	src += 2;
+	    apd->last[1].s = R16(src);	src += 2;
+	    apd->srcPos++;
+	    (*nsrc)--;
+	}
+	/* now do the interpolation */
+        if (*nsrc)	/* don't go off end of data */
+	    W16(dst, I(apd->last[0].s, R16(src), r));
+        else
+	    W16(dst, apd->last[0].s);
+        dst += 2;
+        if (*nsrc)	/* don't go off end of data */
+	    W16(dst, I(apd->last[1].s, R16(src+2), r));
+        else
+	    W16(dst, apd->last[1].s);
+        dst += 2;
+	apd->dstPos += apd->dstIncr;
+	(*ndst)--;
+    }
+}
+
+static	void cvtSM1616C(AcmPcmData* apd, const unsigned char* src, LPDWORD nsrc,
+			unsigned char* dst, LPDWORD ndst)
+{
+    double     	r;
+    TRACE("(%p, %p, %p, %p, %p)\n", apd, src, nsrc, dst, ndst);
+
+    while (*nsrc != 0 && *ndst != 0) {
+	while ((r = (double)apd->srcPos - apd->dstPos) <= 0) {
+	    if (*nsrc == 0) return;
+	    apd->last[0].s = R16(src);	src += 2;
+	    apd->last[1].s = R16(src);	src += 2;
+	    apd->srcPos++;
+	    (*nsrc)--;
+	}
+	/* now do the interpolation */
+        if (*nsrc)	/* don't go off end of data */
+            W16(dst, I(M16(apd->last[0].s, apd->last[1].s),
+ 		       M16(R16(src), R16(src+2)), r));
+        else
+            W16(dst, M16(apd->last[0].s, apd->last[1].s));
+ 	dst += 2;
+	apd->dstPos += apd->dstIncr;
+	(*ndst)--;
+    }
+}
+
+static	void cvtMS1616C(AcmPcmData* apd, const unsigned char* src, LPDWORD nsrc,
+			unsigned char* dst, LPDWORD ndst)
+{
+    double     	r;
+    short	v;
+    TRACE("(%p, %p, %p, %p, %p)\n", apd, src, nsrc, dst, ndst);
+
+    while (*nsrc != 0 && *ndst != 0) {
+	while ((r = (double)apd->srcPos - apd->dstPos) <= 0) {
+	    if (*nsrc == 0) return;
+	    apd->last[0].s = R16(src);	src += 2;
+	    apd->srcPos++;
+	    (*nsrc)--;
+	}
+	/* now do the interpolation */
+        if (*nsrc)	/* don't go off end of data */
+	    v = I(apd->last[0].s, R16(src), r);
+        else
+	    v = apd->last[0].s;
+	W16(dst, v);		dst += 2;
+	W16(dst, v);		dst += 2;
+	apd->dstPos += apd->dstIncr;
+	(*ndst)--;
+    }
+}
+
+static	void cvtMM1616C(AcmPcmData* apd, const unsigned char* src, LPDWORD nsrc,
+			unsigned char* dst, LPDWORD ndst)
+{
+    double     	r;
+    TRACE("(%p, %p, %p, %p, %p)\n", apd, src, nsrc, dst, ndst);
+
+    while (*nsrc != 0 && *ndst != 0) {
+	while ((r = (double)apd->srcPos - apd->dstPos) <= 0) {
+	    if (*nsrc == 0) return;
+	    apd->last[0].s = R16(src);	src += 2;
+	    apd->srcPos++;
+	    (*nsrc)--;
+	}
+	/* now do the interpolation */
+        if (*nsrc)	/* don't go off end of data */
+	    W16(dst, I(apd->last[0].s, R16(src), r));
+        else
+	    W16(dst, apd->last[0].s);
+        dst += 2;
+	apd->dstPos += apd->dstIncr;
+	(*ndst)--;
+    }
+}
+
+static	void (*PCM_ConvertChangeRate[16])(AcmPcmData* apd,
+					  const unsigned char* src, LPDWORD nsrc,
+					  unsigned char* dst, LPDWORD ndst) = {
+    cvtSS88C,   cvtSM88C,   cvtMS88C,   cvtMM88C,
+    cvtSS816C,	cvtSM816C,  cvtMS816C,  cvtMM816C,
+    cvtSS168C,	cvtSM168C,  cvtMS168C,  cvtMM168C,
+    cvtSS1616C, cvtSM1616C, cvtMS1616C, cvtMM1616C,
+};
+
+/***********************************************************************
+ *           PCM_DriverDetails
+ *
+ */
+static	LRESULT PCM_DriverDetails(PACMDRIVERDETAILSW add)
+{
+    TRACE("(%p)\n", add);
+
+    add->fccType = ACMDRIVERDETAILS_FCCTYPE_AUDIOCODEC;
+    add->fccComp = ACMDRIVERDETAILS_FCCCOMP_UNDEFINED;
+    add->wMid = 0xFF;
+    add->wPid = 0x00;
+    add->vdwACM = 0x01000000;
+    add->vdwDriver = 0x01000000;
+    add->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CONVERTER;
+    add->cFormatTags = 1;
+    add->cFilterTags = 0;
+    add->hicon = NULL;
+    MultiByteToWideChar( CP_ACP, 0, "WINE-PCM", -1,
+                         add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR) );
+    MultiByteToWideChar( CP_ACP, 0, "Wine PCM converter", -1,
+                         add->szLongName, sizeof(add->szLongName)/sizeof(WCHAR) );
+    MultiByteToWideChar( CP_ACP, 0, "Brought to you by the Wine team...", -1,
+                         add->szCopyright, sizeof(add->szCopyright)/sizeof(WCHAR) );
+    MultiByteToWideChar( CP_ACP, 0, "Refer to LICENSE file", -1,
+                         add->szLicensing, sizeof(add->szLicensing)/sizeof(WCHAR) );
+    add->szFeatures[0] = 0;
+
+    return MMSYSERR_NOERROR;
+}
+
+/***********************************************************************
+ *           PCM_FormatTagDetails
+ *
+ */
+static	LRESULT	PCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery)
+{
+    TRACE("(%p, %08lx)\n", aftd, dwQuery);
+
+    switch (dwQuery) {
+    case ACM_FORMATTAGDETAILSF_INDEX:
+	if (aftd->dwFormatTagIndex != 0) {
+            WARN("not possible\n");
+            return ACMERR_NOTPOSSIBLE;
+        }
+	break;
+    case ACM_FORMATTAGDETAILSF_FORMATTAG:
+	if (aftd->dwFormatTag != WAVE_FORMAT_PCM) {
+            WARN("not possible\n");
+            return ACMERR_NOTPOSSIBLE;
+        }
+	break;
+    case ACM_FORMATTAGDETAILSF_LARGESTSIZE:
+	if (aftd->dwFormatTag != WAVE_FORMAT_UNKNOWN &&
+	    aftd->dwFormatTag != WAVE_FORMAT_PCM) {
+            WARN("not possible\n");
+	    return ACMERR_NOTPOSSIBLE;
+        }
+	break;
+    default:
+	WARN("Unsupported query %08lx\n", dwQuery);
+	return MMSYSERR_NOTSUPPORTED;
+    }
+
+    aftd->dwFormatTagIndex = 0;
+    aftd->dwFormatTag = WAVE_FORMAT_PCM;
+    aftd->cbFormatSize = sizeof(PCMWAVEFORMAT);
+    aftd->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CONVERTER;
+    aftd->cStandardFormats = NUM_PCM_FORMATS;
+    aftd->szFormatTag[0] = 0;
+
+    return MMSYSERR_NOERROR;
+}
+
+/***********************************************************************
+ *           PCM_FormatDetails
+ *
+ */
+static	LRESULT	PCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery)
+{
+    TRACE("(%p, %08lx)\n", afd, dwQuery);
+
+    switch (dwQuery) {
+    case ACM_FORMATDETAILSF_FORMAT:
+	if (PCM_GetFormatIndex(afd->pwfx) == 0xFFFFFFFF) {
+            return ACMERR_NOTPOSSIBLE;
+            WARN("not possible\n");
+        }
+	break;
+    case ACM_FORMATDETAILSF_INDEX:
+	assert(afd->dwFormatIndex < NUM_PCM_FORMATS);
+	afd->pwfx->wFormatTag = WAVE_FORMAT_PCM;
+	afd->pwfx->nChannels = PCM_Formats[afd->dwFormatIndex].nChannels;
+	afd->pwfx->nSamplesPerSec = PCM_Formats[afd->dwFormatIndex].rate;
+	afd->pwfx->wBitsPerSample = PCM_Formats[afd->dwFormatIndex].nBits;
+	/* native MSACM uses a PCMWAVEFORMAT structure, so cbSize is not
+	 * accessible afd->pwfx->cbSize = 0;
+	 */
+	afd->pwfx->nBlockAlign =
+	    (afd->pwfx->nChannels * afd->pwfx->wBitsPerSample) / 8;
+	afd->pwfx->nAvgBytesPerSec =
+	    afd->pwfx->nSamplesPerSec * afd->pwfx->nBlockAlign;
+	break;
+    default:
+	WARN("Unsupported query %08lx\n", dwQuery);
+	return MMSYSERR_NOTSUPPORTED;
+    }
+
+    afd->dwFormatTag = WAVE_FORMAT_PCM;
+    afd->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CONVERTER;
+    afd->szFormat[0] = 0; /* let MSACM format this for us... */
+    afd->cbwfx = sizeof(PCMWAVEFORMAT);
+
+    return MMSYSERR_NOERROR;
+}
+
+/***********************************************************************
+ *           PCM_FormatSuggest
+ *
+ */
+static	LRESULT	PCM_FormatSuggest(PACMDRVFORMATSUGGEST adfs)
+{
+    TRACE("(%p)\n", adfs);
+
+    /* some tests ... */
+    if (adfs->cbwfxSrc < sizeof(PCMWAVEFORMAT) ||
+	adfs->cbwfxDst < sizeof(PCMWAVEFORMAT) ||
+	PCM_GetFormatIndex(adfs->pwfxSrc) == 0xFFFFFFFF) {
+            WARN("not possible\n");
+            return ACMERR_NOTPOSSIBLE;
+       }
+
+    /* is no suggestion for destination, then copy source value */
+    if (!(adfs->fdwSuggest & ACM_FORMATSUGGESTF_NCHANNELS)) {
+	adfs->pwfxDst->nChannels = adfs->pwfxSrc->nChannels;
+    }
+    if (!(adfs->fdwSuggest & ACM_FORMATSUGGESTF_NSAMPLESPERSEC)) {
+	adfs->pwfxDst->nSamplesPerSec = adfs->pwfxSrc->nSamplesPerSec;
+    }
+    if (!(adfs->fdwSuggest & ACM_FORMATSUGGESTF_WBITSPERSAMPLE)) {
+	adfs->pwfxDst->wBitsPerSample = adfs->pwfxSrc->wBitsPerSample;
+    }
+    if (!(adfs->fdwSuggest & ACM_FORMATSUGGESTF_WFORMATTAG)) {
+	if (adfs->pwfxSrc->wFormatTag != WAVE_FORMAT_PCM) {
+            WARN("not possible\n");
+            return ACMERR_NOTPOSSIBLE;
+        }
+	adfs->pwfxDst->wFormatTag = adfs->pwfxSrc->wFormatTag;
+    }
+    /* check if result is ok */
+    if (PCM_GetFormatIndex(adfs->pwfxDst) == 0xFFFFFFFF) {
+        WARN("not possible\n");
+        return ACMERR_NOTPOSSIBLE;
+    }
+
+    /* recompute other values */
+    adfs->pwfxDst->nBlockAlign = (adfs->pwfxDst->nChannels * adfs->pwfxDst->wBitsPerSample) / 8;
+    adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * adfs->pwfxDst->nBlockAlign;
+
+    return MMSYSERR_NOERROR;
+}
+
+/***********************************************************************
+ *           PCM_Reset
+ *
+ */
+static	void	PCM_Reset(AcmPcmData* apd, int srcNumBits)
+{
+    TRACE("(%p, %d)\n", apd, srcNumBits);
+
+    apd->srcPos = 0;
+    apd->dstPos = 0;
+    /* initialize with neutral value */
+    if (srcNumBits == 16) {
+	apd->last[0].s = 0;
+	apd->last[1].s = 0;
+    } else {
+	apd->last[0].b = (BYTE)0x80;
+	apd->last[1].b = (BYTE)0x80;
+    }
+}
+
+/***********************************************************************
+ *           PCM_StreamOpen
+ *
+ */
+static	LRESULT	PCM_StreamOpen(PACMDRVSTREAMINSTANCE adsi)
+{
+    AcmPcmData*	apd;
+    int		idx = 0;
+
+    TRACE("(%p)\n", adsi);
+
+    assert(!(adsi->fdwOpen & ACM_STREAMOPENF_ASYNC));
+
+    if (PCM_GetFormatIndex(adsi->pwfxSrc) == 0xFFFFFFFF ||
+	PCM_GetFormatIndex(adsi->pwfxDst) == 0xFFFFFFFF) {
+        WARN("not possible\n");
+	return ACMERR_NOTPOSSIBLE;
+    }
+
+    apd = HeapAlloc(GetProcessHeap(), 0, sizeof(AcmPcmData));
+    if (apd == 0) {
+        WARN("no memory\n");
+        return MMSYSERR_NOMEM;
+    }
+
+    adsi->dwDriver = (DWORD)apd;
+    adsi->fdwDriver = 0;
+
+    if (adsi->pwfxSrc->wBitsPerSample == 16) idx += 8;
+    if (adsi->pwfxDst->wBitsPerSample == 16) idx += 4;
+    if (adsi->pwfxSrc->nChannels      == 1)  idx += 2;
+    if (adsi->pwfxDst->nChannels      == 1)  idx += 1;
+
+    if (adsi->pwfxSrc->nSamplesPerSec == adsi->pwfxDst->nSamplesPerSec) {
+	apd->cvt.cvtKeepRate = PCM_ConvertKeepRate[idx];
+    } else {
+	adsi->fdwDriver |= PCM_RESAMPLE;
+	apd->dstIncr = (double)(adsi->pwfxSrc->nSamplesPerSec) /
+	    (double)(adsi->pwfxDst->nSamplesPerSec);
+	PCM_Reset(apd, adsi->pwfxSrc->wBitsPerSample);
+	apd->cvt.cvtChangeRate = PCM_ConvertChangeRate[idx];
+    }
+
+    return MMSYSERR_NOERROR;
+}
+
+/***********************************************************************
+ *           PCM_StreamClose
+ *
+ */
+static	LRESULT	PCM_StreamClose(PACMDRVSTREAMINSTANCE adsi)
+{
+    TRACE("(%p)\n", adsi);
+
+    HeapFree(GetProcessHeap(), 0, (void*)adsi->dwDriver);
+    return MMSYSERR_NOERROR;
+}
+
+/***********************************************************************
+ *           PCM_round
+ *
+ */
+static	inline DWORD	PCM_round(DWORD a, DWORD b, DWORD c)
+{
+    assert(c);
+    /* to be sure, always return an entire number of c... */
+    return ((double)a * (double)b + (double)c - 1) / (double)c;
+}
+
+/***********************************************************************
+ *           PCM_StreamSize
+ *
+ */
+static	LRESULT PCM_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE adss)
+{
+    DWORD	srcMask = ~(adsi->pwfxSrc->nBlockAlign - 1);
+    DWORD	dstMask = ~(adsi->pwfxDst->nBlockAlign - 1);
+
+    TRACE("(%p, %p)\n", adsi, adss);
+
+    switch (adss->fdwSize) {
+    case ACM_STREAMSIZEF_DESTINATION:
+	/* cbDstLength => cbSrcLength */
+	adss->cbSrcLength = PCM_round(adss->cbDstLength & dstMask,
+				      adsi->pwfxSrc->nAvgBytesPerSec,
+				      adsi->pwfxDst->nAvgBytesPerSec) & srcMask;
+	break;
+    case ACM_STREAMSIZEF_SOURCE:
+	/* cbSrcLength => cbDstLength */
+	adss->cbDstLength =  PCM_round(adss->cbSrcLength & srcMask,
+				       adsi->pwfxDst->nAvgBytesPerSec,
+				       adsi->pwfxSrc->nAvgBytesPerSec) & dstMask;
+	break;
+    default:
+	WARN("Unsupported query %08lx\n", adss->fdwSize);
+	return MMSYSERR_NOTSUPPORTED;
+    }
+    return MMSYSERR_NOERROR;
+}
+
+/***********************************************************************
+ *           PCM_StreamConvert
+ *
+ */
+static LRESULT PCM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER adsh)
+{
+    AcmPcmData*	apd = (AcmPcmData*)adsi->dwDriver;
+    DWORD	nsrc = NUM_OF(adsh->cbSrcLength, adsi->pwfxSrc->nBlockAlign);
+    DWORD	ndst = NUM_OF(adsh->cbDstLength, adsi->pwfxDst->nBlockAlign);
+
+    TRACE("(%p, %p)\n", adsi, adsh);
+
+    TRACE("nsrc=%ld,adsh->cbSrcLength=%ld\n", nsrc, adsh->cbSrcLength);
+    TRACE("ndst=%ld,adsh->cbDstLength=%ld\n", ndst, adsh->cbDstLength);
+    TRACE("src [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%lu, nAvgBytesPerSec=%lu, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n",
+          adsi->pwfxSrc->wFormatTag, adsi->pwfxSrc->nChannels, adsi->pwfxSrc->nSamplesPerSec, adsi->pwfxSrc->nAvgBytesPerSec,
+          adsi->pwfxSrc->nBlockAlign, adsi->pwfxSrc->wBitsPerSample, adsi->pwfxSrc->cbSize);
+    TRACE("dst [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%lu, nAvgBytesPerSec=%lu, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n",
+          adsi->pwfxDst->wFormatTag, adsi->pwfxDst->nChannels, adsi->pwfxDst->nSamplesPerSec, adsi->pwfxDst->nAvgBytesPerSec,
+          adsi->pwfxDst->nBlockAlign, adsi->pwfxDst->wBitsPerSample, adsi->pwfxDst->cbSize);
+
+    if (adsh->fdwConvert &
+	~(ACM_STREAMCONVERTF_BLOCKALIGN|
+	  ACM_STREAMCONVERTF_END|
+	  ACM_STREAMCONVERTF_START)) {
+	FIXME("Unsupported fdwConvert (%08lx), ignoring it\n", adsh->fdwConvert);
+    }
+    /* ACM_STREAMCONVERTF_BLOCKALIGN
+     *	currently all conversions are block aligned, so do nothing for this flag
+     * ACM_STREAMCONVERTF_END
+     *	no pending data, so do nothing for this flag
+     */
+    if ((adsh->fdwConvert & ACM_STREAMCONVERTF_START) &&
+	(adsi->fdwDriver & PCM_RESAMPLE)) {
+	PCM_Reset(apd, adsi->pwfxSrc->wBitsPerSample);
+    }
+
+    /* do the job */
+    if (adsi->fdwDriver & PCM_RESAMPLE) {
+	DWORD	nsrc2 = nsrc;
+	DWORD	ndst2 = ndst;
+
+	apd->cvt.cvtChangeRate(apd, adsh->pbSrc, &nsrc2, adsh->pbDst, &ndst2);
+	nsrc -= nsrc2;
+	ndst -= ndst2;
+    } else {
+	if (nsrc < ndst) ndst = nsrc; else nsrc = ndst;
+
+	/* nsrc is now equal to ndst */
+	apd->cvt.cvtKeepRate(adsh->pbSrc, nsrc, adsh->pbDst);
+    }
+
+    adsh->cbSrcLengthUsed = nsrc * adsi->pwfxSrc->nBlockAlign;
+    adsh->cbDstLengthUsed = ndst * adsi->pwfxDst->nBlockAlign;
+
+    return MMSYSERR_NOERROR;
+}
+
+/**************************************************************************
+ * 			DriverProc (MSACM32.@)
+ */
+LRESULT CALLBACK	PCM_DriverProc(DWORD dwDevID, HDRVR hDriv, UINT wMsg,
+				       LPARAM dwParam1, LPARAM dwParam2)
+{
+    TRACE("(%08lx %08lx %u %08lx %08lx);\n",
+	  dwDevID, (DWORD)hDriv, wMsg, dwParam1, dwParam2);
+
+    switch (wMsg) {
+    case DRV_LOAD:		return 1;
+    case DRV_FREE:		return 1;
+    case DRV_OPEN:		return PCM_drvOpen((LPSTR)dwParam1, (PACMDRVOPENDESCW)dwParam2);
+    case DRV_CLOSE:		return PCM_drvClose(dwDevID);
+    case DRV_ENABLE:		return 1;
+    case DRV_DISABLE:		return 1;
+    case DRV_QUERYCONFIGURE:	return 1;
+    case DRV_CONFIGURE:		MessageBoxA(0, "MSACM PCM filter !", "Wine Driver", MB_OK); return 1;
+    case DRV_INSTALL:		return DRVCNF_RESTART;
+    case DRV_REMOVE:		return DRVCNF_RESTART;
+
+    case ACMDM_DRIVER_NOTIFY:
+	/* no caching from other ACM drivers is done so far */
+	return MMSYSERR_NOERROR;
+
+    case ACMDM_DRIVER_DETAILS:
+	return PCM_DriverDetails((PACMDRIVERDETAILSW)dwParam1);
+
+    case ACMDM_FORMATTAG_DETAILS:
+	return PCM_FormatTagDetails((PACMFORMATTAGDETAILSW)dwParam1, dwParam2);
+
+    case ACMDM_FORMAT_DETAILS:
+	return PCM_FormatDetails((PACMFORMATDETAILSW)dwParam1, dwParam2);
+
+    case ACMDM_FORMAT_SUGGEST:
+	return PCM_FormatSuggest((PACMDRVFORMATSUGGEST)dwParam1);
+
+    case ACMDM_STREAM_OPEN:
+	return PCM_StreamOpen((PACMDRVSTREAMINSTANCE)dwParam1);
+
+    case ACMDM_STREAM_CLOSE:
+	return PCM_StreamClose((PACMDRVSTREAMINSTANCE)dwParam1);
+
+    case ACMDM_STREAM_SIZE:
+	return PCM_StreamSize((PACMDRVSTREAMINSTANCE)dwParam1, (PACMDRVSTREAMSIZE)dwParam2);
+
+    case ACMDM_STREAM_CONVERT:
+	return PCM_StreamConvert((PACMDRVSTREAMINSTANCE)dwParam1, (PACMDRVSTREAMHEADER)dwParam2);
+
+    case ACMDM_HARDWARE_WAVE_CAPS_INPUT:
+    case ACMDM_HARDWARE_WAVE_CAPS_OUTPUT:
+	/* this converter is not a hardware driver */
+    case ACMDM_FILTERTAG_DETAILS:
+    case ACMDM_FILTER_DETAILS:
+	/* this converter is not a filter */
+    case ACMDM_STREAM_RESET:
+	/* only needed for asynchronous driver... we aren't, so just say it */
+    case ACMDM_STREAM_PREPARE:
+    case ACMDM_STREAM_UNPREPARE:
+	/* nothing special to do here... so don't do anything */
+	return MMSYSERR_NOTSUPPORTED;
+
+    default:
+	return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
+    }
+    return 0;
+}
diff --git a/reactos/lib/msacm/stream.c b/reactos/lib/msacm/stream.c
new file mode 100644
index 00000000000..5c427ec62d4
--- /dev/null
+++ b/reactos/lib/msacm/stream.c
@@ -0,0 +1,478 @@
+/* -*- tab-width: 8; c-basic-offset: 4 -*- */
+
+/*
+ *      MSACM32 library
+ *
+ *      Copyright 1998  Patrik Stridvall
+ *		  1999	Eric Pouech
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/* TODO
+ * 	+ asynchronous conversion is not implemented
+ *	+ callback/notification
+ *	* acmStreamMessage
+ *	+ properly close ACM streams
+ */
+
+#include <stdarg.h>
+#include <string.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "wine/debug.h"
+#include "mmsystem.h"
+#include "mmreg.h"
+#include "msacm.h"
+#include "msacmdrv.h"
+#include "wineacm.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msacm);
+
+static PWINE_ACMSTREAM	ACM_GetStream(HACMSTREAM has)
+{
+    TRACE("(%p)\n", has);
+
+    return (PWINE_ACMSTREAM)has;
+}
+
+/***********************************************************************
+ *           acmStreamClose (MSACM32.@)
+ */
+MMRESULT WINAPI acmStreamClose(HACMSTREAM has, DWORD fdwClose)
+{
+    PWINE_ACMSTREAM	was;
+    MMRESULT		ret;
+
+    TRACE("(%p, %ld)\n", has, fdwClose);
+
+    if ((was = ACM_GetStream(has)) == NULL) {
+        WARN("invalid handle\n");
+	return MMSYSERR_INVALHANDLE;
+    }
+    ret = SendDriverMessage(was->pDrv->hDrvr, ACMDM_STREAM_CLOSE, (DWORD)&was->drvInst, 0);
+    if (ret == MMSYSERR_NOERROR) {
+	if (was->hAcmDriver)
+	    acmDriverClose(was->hAcmDriver, 0L);
+	HeapFree(MSACM_hHeap, 0, was);
+    }
+    TRACE("=> (%d)\n", ret);
+    return ret;
+}
+
+/***********************************************************************
+ *           acmStreamConvert (MSACM32.@)
+ */
+MMRESULT WINAPI acmStreamConvert(HACMSTREAM has, PACMSTREAMHEADER pash,
+				 DWORD fdwConvert)
+{
+    PWINE_ACMSTREAM	was;
+    MMRESULT		ret = MMSYSERR_NOERROR;
+    PACMDRVSTREAMHEADER	padsh;
+
+    TRACE("(%p, %p, %ld)\n", has, pash, fdwConvert);
+
+    if ((was = ACM_GetStream(has)) == NULL) {
+        WARN("invalid handle\n");
+	return MMSYSERR_INVALHANDLE;
+    }
+    if (!pash || pash->cbStruct < sizeof(ACMSTREAMHEADER)) {
+        WARN("invalid parameter\n");
+	return MMSYSERR_INVALPARAM;
+    }
+    if (!(pash->fdwStatus & ACMSTREAMHEADER_STATUSF_PREPARED)) {
+        WARN("unprepared header\n");
+	return ACMERR_UNPREPARED;
+    }
+
+    /* Note: the ACMSTREAMHEADER and ACMDRVSTREAMHEADER structs are of same
+     * size. some fields are private to msacm internals, and are exposed
+     * in ACMSTREAMHEADER in the dwReservedDriver array
+     */
+    padsh = (PACMDRVSTREAMHEADER)pash;
+
+    /* check that pointers have not been modified */
+    if (padsh->pbPreparedSrc != padsh->pbSrc ||
+	padsh->cbPreparedSrcLength < padsh->cbSrcLength ||
+	padsh->pbPreparedDst != padsh->pbDst ||
+	padsh->cbPreparedDstLength < padsh->cbDstLength) {
+        WARN("invalid parameter\n");
+	return MMSYSERR_INVALPARAM;
+    }
+
+    padsh->fdwConvert = fdwConvert;
+
+    ret = SendDriverMessage(was->pDrv->hDrvr, ACMDM_STREAM_CONVERT, (DWORD)&was->drvInst, (DWORD)padsh);
+    if (ret == MMSYSERR_NOERROR) {
+	padsh->fdwStatus |= ACMSTREAMHEADER_STATUSF_DONE;
+    }
+    TRACE("=> (%d)\n", ret);
+    return ret;
+}
+
+/***********************************************************************
+ *           acmStreamMessage (MSACM32.@)
+ */
+MMRESULT WINAPI acmStreamMessage(HACMSTREAM has, UINT uMsg, LPARAM lParam1,
+				 LPARAM lParam2)
+{
+    FIXME("(%p, %u, %ld, %ld): stub\n", has, uMsg, lParam1, lParam2);
+    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+    return MMSYSERR_ERROR;
+}
+
+/***********************************************************************
+ *           acmStreamOpen (MSACM32.@)
+ */
+MMRESULT WINAPI acmStreamOpen(PHACMSTREAM phas, HACMDRIVER had, PWAVEFORMATEX pwfxSrc,
+			      PWAVEFORMATEX pwfxDst, PWAVEFILTER pwfltr, DWORD dwCallback,
+			      DWORD dwInstance, DWORD fdwOpen)
+{
+    PWINE_ACMSTREAM	was;
+    PWINE_ACMDRIVER	wad;
+    MMRESULT		ret;
+    int			wfxSrcSize;
+    int			wfxDstSize;
+    WAVEFORMATEX	wfxSrc, wfxDst;
+
+    TRACE("(%p, %p, %p, %p, %p, %ld, %ld, %ld)\n",
+	  phas, had, pwfxSrc, pwfxDst, pwfltr, dwCallback, dwInstance, fdwOpen);
+
+    /* NOTE: pwfxSrc and/or pwfxDst can point to a structure smaller than
+     * WAVEFORMATEX so don't use them directly when not sure */
+    if (pwfxSrc->wFormatTag == WAVE_FORMAT_PCM) {
+        memcpy(&wfxSrc, pwfxSrc, sizeof(PCMWAVEFORMAT));
+        wfxSrc.wBitsPerSample = pwfxSrc->wBitsPerSample;
+        wfxSrc.cbSize = 0;
+        pwfxSrc = &wfxSrc;
+    }
+
+    if (pwfxDst->wFormatTag == WAVE_FORMAT_PCM) {
+        memcpy(&wfxDst, pwfxDst, sizeof(PCMWAVEFORMAT));
+        wfxDst.wBitsPerSample = pwfxDst->wBitsPerSample;
+        wfxDst.cbSize = 0;
+        pwfxDst = &wfxDst;
+    }
+
+    TRACE("src [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%lu, nAvgBytesPerSec=%lu, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n",
+	  pwfxSrc->wFormatTag, pwfxSrc->nChannels, pwfxSrc->nSamplesPerSec, pwfxSrc->nAvgBytesPerSec,
+	  pwfxSrc->nBlockAlign, pwfxSrc->wBitsPerSample, pwfxSrc->cbSize);
+
+    TRACE("dst [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%lu, nAvgBytesPerSec=%lu, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n",
+	  pwfxDst->wFormatTag, pwfxDst->nChannels, pwfxDst->nSamplesPerSec, pwfxDst->nAvgBytesPerSec,
+	  pwfxDst->nBlockAlign, pwfxDst->wBitsPerSample, pwfxDst->cbSize);
+
+    /* (WS) In query mode, phas should be NULL. If it is not, then instead
+     * of returning an error we are making sure it is NULL, preventing some
+     * applications that pass garbage for phas from crashing.
+     */
+    if (fdwOpen & ACM_STREAMOPENF_QUERY) phas = NULL;
+
+    if (pwfltr && (pwfxSrc->wFormatTag != pwfxDst->wFormatTag)) {
+        WARN("invalid parameter\n");
+        return MMSYSERR_INVALPARAM;
+    }
+
+    wfxSrcSize = wfxDstSize = sizeof(WAVEFORMATEX);
+    if (pwfxSrc->wFormatTag != WAVE_FORMAT_PCM) wfxSrcSize += pwfxSrc->cbSize;
+    if (pwfxDst->wFormatTag != WAVE_FORMAT_PCM) wfxDstSize += pwfxDst->cbSize;
+
+    was = HeapAlloc(MSACM_hHeap, 0, sizeof(*was) + wfxSrcSize + wfxDstSize +
+		    ((pwfltr) ? sizeof(WAVEFILTER) : 0));
+    if (was == NULL) {
+        WARN("no memory\n");
+	return MMSYSERR_NOMEM;
+    }
+
+    was->drvInst.cbStruct = sizeof(was->drvInst);
+    was->drvInst.pwfxSrc = (PWAVEFORMATEX)((LPSTR)was + sizeof(*was));
+    memcpy(was->drvInst.pwfxSrc, pwfxSrc, wfxSrcSize);
+    was->drvInst.pwfxDst = (PWAVEFORMATEX)((LPSTR)was + sizeof(*was) + wfxSrcSize);
+    memcpy(was->drvInst.pwfxDst, pwfxDst, wfxDstSize);
+    if (pwfltr) {
+	was->drvInst.pwfltr = (PWAVEFILTER)((LPSTR)was + sizeof(*was) + wfxSrcSize + wfxDstSize);
+	memcpy(was->drvInst.pwfltr, pwfltr, sizeof(WAVEFILTER));
+    } else {
+	was->drvInst.pwfltr = NULL;
+    }
+    was->drvInst.dwCallback = dwCallback;
+    was->drvInst.dwInstance = dwInstance;
+    was->drvInst.fdwOpen = fdwOpen;
+    was->drvInst.fdwDriver = 0L;
+    was->drvInst.dwDriver = 0L;
+    /* real value will be stored once ACMDM_STREAM_OPEN succeeds */
+    was->drvInst.has = 0L;
+
+    if (had) {
+	if (!(wad = MSACM_GetDriver(had))) {
+	    ret = MMSYSERR_INVALPARAM;
+	    goto errCleanUp;
+	}
+
+	was->obj.dwType = WINE_ACMOBJ_STREAM;
+	was->obj.pACMDriverID = wad->obj.pACMDriverID;
+	was->pDrv = wad;
+	was->hAcmDriver = 0; /* not to close it in acmStreamClose */
+
+	ret = SendDriverMessage(wad->hDrvr, ACMDM_STREAM_OPEN, (DWORD)&was->drvInst, 0L);
+	if (ret != MMSYSERR_NOERROR)
+	    goto errCleanUp;
+    } else {
+	PWINE_ACMDRIVERID wadi;
+
+	ret = ACMERR_NOTPOSSIBLE;
+	for (wadi = MSACM_pFirstACMDriverID; wadi; wadi = wadi->pNextACMDriverID) {
+	    if ((wadi->fdwSupport & ACMDRIVERDETAILS_SUPPORTF_DISABLED) ||
+		!MSACM_FindFormatTagInCache(wadi, pwfxSrc->wFormatTag, NULL) ||
+		!MSACM_FindFormatTagInCache(wadi, pwfxDst->wFormatTag, NULL))
+		continue;
+	    ret = acmDriverOpen(&had, (HACMDRIVERID)wadi, 0L);
+	    if (ret != MMSYSERR_NOERROR)
+		continue;
+	    if ((wad = MSACM_GetDriver(had)) != 0) {
+		was->obj.dwType = WINE_ACMOBJ_STREAM;
+		was->obj.pACMDriverID = wad->obj.pACMDriverID;
+		was->pDrv = wad;
+		was->hAcmDriver = had;
+
+		ret = SendDriverMessage(wad->hDrvr, ACMDM_STREAM_OPEN, (DWORD)&was->drvInst, 0L);
+		TRACE("%s => %08x\n", debugstr_w(wadi->pszDriverAlias), ret);
+		if (ret == MMSYSERR_NOERROR) {
+		    if (fdwOpen & ACM_STREAMOPENF_QUERY) {
+			acmDriverClose(had, 0L);
+		    }
+		    break;
+		}
+	    }
+	    /* no match, close this acm driver and try next one */
+	    acmDriverClose(had, 0L);
+	}
+	if (ret != MMSYSERR_NOERROR) {
+	    ret = ACMERR_NOTPOSSIBLE;
+	    goto errCleanUp;
+	}
+    }
+    ret = MMSYSERR_NOERROR;
+    was->drvInst.has = (HACMSTREAM)was;
+    if (!(fdwOpen & ACM_STREAMOPENF_QUERY)) {
+	if (phas)
+	    *phas = (HACMSTREAM)was;
+	TRACE("=> (%d)\n", ret);
+	return ret;
+    }
+errCleanUp:
+    if (phas)
+	*phas = NULL;
+    HeapFree(MSACM_hHeap, 0, was);
+    TRACE("=> (%d)\n", ret);
+    return ret;
+}
+
+
+/***********************************************************************
+ *           acmStreamPrepareHeader (MSACM32.@)
+ */
+MMRESULT WINAPI acmStreamPrepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash,
+				       DWORD fdwPrepare)
+{
+    PWINE_ACMSTREAM	was;
+    MMRESULT		ret = MMSYSERR_NOERROR;
+    PACMDRVSTREAMHEADER	padsh;
+
+    TRACE("(%p, %p, %ld)\n", has, pash, fdwPrepare);
+
+    if ((was = ACM_GetStream(has)) == NULL) {
+        WARN("invalid handle\n");
+	return MMSYSERR_INVALHANDLE;
+    }
+    if (!pash || pash->cbStruct < sizeof(ACMSTREAMHEADER)) {
+        WARN("invalid parameter\n");
+	return MMSYSERR_INVALPARAM;
+    }
+    if (fdwPrepare)
+	ret = MMSYSERR_INVALFLAG;
+
+    if (pash->fdwStatus & ACMSTREAMHEADER_STATUSF_DONE)
+	return MMSYSERR_NOERROR;
+
+    /* Note: the ACMSTREAMHEADER and ACMDRVSTREAMHEADER structs are of same
+     * size. some fields are private to msacm internals, and are exposed
+     * in ACMSTREAMHEADER in the dwReservedDriver array
+     */
+    padsh = (PACMDRVSTREAMHEADER)pash;
+
+    padsh->fdwConvert = fdwPrepare;
+    padsh->padshNext = NULL;
+    padsh->fdwDriver = padsh->dwDriver = 0L;
+
+    padsh->fdwPrepared = 0;
+    padsh->dwPrepared = 0;
+    padsh->pbPreparedSrc = 0;
+    padsh->cbPreparedSrcLength = 0;
+    padsh->pbPreparedDst = 0;
+    padsh->cbPreparedDstLength = 0;
+
+    ret = SendDriverMessage(was->pDrv->hDrvr, ACMDM_STREAM_PREPARE, (DWORD)&was->drvInst, (DWORD)padsh);
+    if (ret == MMSYSERR_NOERROR || ret == MMSYSERR_NOTSUPPORTED) {
+	ret = MMSYSERR_NOERROR;
+	padsh->fdwStatus &= ~(ACMSTREAMHEADER_STATUSF_DONE|ACMSTREAMHEADER_STATUSF_INQUEUE);
+	padsh->fdwStatus |= ACMSTREAMHEADER_STATUSF_PREPARED;
+	padsh->fdwPrepared = padsh->fdwStatus;
+	padsh->dwPrepared = 0;
+	padsh->pbPreparedSrc = padsh->pbSrc;
+	padsh->cbPreparedSrcLength = padsh->cbSrcLength;
+	padsh->pbPreparedDst = padsh->pbDst;
+	padsh->cbPreparedDstLength = padsh->cbDstLength;
+    } else {
+	padsh->fdwPrepared = 0;
+	padsh->dwPrepared = 0;
+	padsh->pbPreparedSrc = 0;
+	padsh->cbPreparedSrcLength = 0;
+	padsh->pbPreparedDst = 0;
+	padsh->cbPreparedDstLength = 0;
+    }
+    TRACE("=> (%d)\n", ret);
+    return ret;
+}
+
+/***********************************************************************
+ *           acmStreamReset (MSACM32.@)
+ */
+MMRESULT WINAPI acmStreamReset(HACMSTREAM has, DWORD fdwReset)
+{
+    PWINE_ACMSTREAM	was;
+    MMRESULT		ret = MMSYSERR_NOERROR;
+
+    TRACE("(%p, %ld)\n", has, fdwReset);
+
+    if (fdwReset) {
+        WARN("invalid flag\n");
+	ret = MMSYSERR_INVALFLAG;
+    } else if ((was = ACM_GetStream(has)) == NULL) {
+        WARN("invalid handle\n");
+	return MMSYSERR_INVALHANDLE;
+    } else if (was->drvInst.fdwOpen & ACM_STREAMOPENF_ASYNC) {
+	ret = SendDriverMessage(was->pDrv->hDrvr, ACMDM_STREAM_RESET, (DWORD)&was->drvInst, 0);
+    }
+    TRACE("=> (%d)\n", ret);
+    return ret;
+}
+
+/***********************************************************************
+ *           acmStreamSize (MSACM32.@)
+ */
+MMRESULT WINAPI acmStreamSize(HACMSTREAM has, DWORD cbInput,
+			      LPDWORD pdwOutputBytes, DWORD fdwSize)
+{
+    PWINE_ACMSTREAM	was;
+    ACMDRVSTREAMSIZE	adss;
+    MMRESULT		ret;
+
+    TRACE("(%p, %ld, %p, %ld)\n", has, cbInput, pdwOutputBytes, fdwSize);
+
+    if ((was = ACM_GetStream(has)) == NULL) {
+        WARN("invalid handle\n");
+	return MMSYSERR_INVALHANDLE;
+    }
+    if ((fdwSize & ~ACM_STREAMSIZEF_QUERYMASK) != 0) {
+        WARN("invalid flag\n");
+	return MMSYSERR_INVALFLAG;
+    }
+
+    *pdwOutputBytes = 0L;
+
+    switch (fdwSize & ACM_STREAMSIZEF_QUERYMASK) {
+    case ACM_STREAMSIZEF_DESTINATION:
+	adss.cbDstLength = cbInput;
+	adss.cbSrcLength = 0;
+	break;
+    case ACM_STREAMSIZEF_SOURCE:
+	adss.cbSrcLength = cbInput;
+	adss.cbDstLength = 0;
+	break;
+    default:
+        WARN("invalid flag\n");
+	return MMSYSERR_INVALFLAG;
+    }
+
+    adss.cbStruct = sizeof(adss);
+    adss.fdwSize = fdwSize;
+    ret = SendDriverMessage(was->pDrv->hDrvr, ACMDM_STREAM_SIZE,
+			    (DWORD)&was->drvInst, (DWORD)&adss);
+    if (ret == MMSYSERR_NOERROR) {
+	switch (fdwSize & ACM_STREAMSIZEF_QUERYMASK) {
+	case ACM_STREAMSIZEF_DESTINATION:
+	    *pdwOutputBytes = adss.cbSrcLength;
+	    break;
+	case ACM_STREAMSIZEF_SOURCE:
+	    *pdwOutputBytes = adss.cbDstLength;
+	    break;
+	}
+    }
+    TRACE("=> (%d) [%lu]\n", ret, *pdwOutputBytes);
+    return ret;
+}
+
+/***********************************************************************
+ *           acmStreamUnprepareHeader (MSACM32.@)
+ */
+MMRESULT WINAPI acmStreamUnprepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash,
+					 DWORD fdwUnprepare)
+{
+    PWINE_ACMSTREAM	was;
+    MMRESULT		ret = MMSYSERR_NOERROR;
+    PACMDRVSTREAMHEADER	padsh;
+
+    TRACE("(%p, %p, %ld)\n", has, pash, fdwUnprepare);
+
+    if ((was = ACM_GetStream(has)) == NULL) {
+        WARN("invalid handle\n");
+	return MMSYSERR_INVALHANDLE;
+    }
+    if (!pash || pash->cbStruct < sizeof(ACMSTREAMHEADER)) {
+        WARN("invalid parameter\n");
+	return MMSYSERR_INVALPARAM;
+    }
+    if (!(pash->fdwStatus & ACMSTREAMHEADER_STATUSF_PREPARED)) {
+        WARN("unprepared header\n");
+	return ACMERR_UNPREPARED;
+    }
+
+    /* Note: the ACMSTREAMHEADER and ACMDRVSTREAMHEADER structs are of same
+     * size. some fields are private to msacm internals, and are exposed
+     * in ACMSTREAMHEADER in the dwReservedDriver array
+     */
+    padsh = (PACMDRVSTREAMHEADER)pash;
+
+    /* check that pointers have not been modified */
+    if (padsh->pbPreparedSrc != padsh->pbSrc ||
+	padsh->cbPreparedSrcLength < padsh->cbSrcLength ||
+	padsh->pbPreparedDst != padsh->pbDst ||
+	padsh->cbPreparedDstLength < padsh->cbDstLength) {
+        WARN("invalid parameter\n");
+	return MMSYSERR_INVALPARAM;
+    }
+
+    padsh->fdwConvert = fdwUnprepare;
+
+    ret = SendDriverMessage(was->pDrv->hDrvr, ACMDM_STREAM_UNPREPARE, (DWORD)&was->drvInst, (DWORD)padsh);
+    if (ret == MMSYSERR_NOERROR || ret == MMSYSERR_NOTSUPPORTED) {
+	ret = MMSYSERR_NOERROR;
+	padsh->fdwStatus &= ~(ACMSTREAMHEADER_STATUSF_DONE|ACMSTREAMHEADER_STATUSF_INQUEUE|ACMSTREAMHEADER_STATUSF_PREPARED);
+    }
+    TRACE("=> (%d)\n", ret);
+    return ret;
+}
diff --git a/reactos/lib/msacm/wineacm.h b/reactos/lib/msacm/wineacm.h
new file mode 100644
index 00000000000..5244bfb1800
--- /dev/null
+++ b/reactos/lib/msacm/wineacm.h
@@ -0,0 +1,363 @@
+/* -*- tab-width: 8; c-basic-offset: 4 -*- */
+/*
+ * Copyright 2000 Eric Pouech
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __WINE_WINEACM_H
+#define __WINE_WINEACM_H
+
+#ifndef __REACTOS__
+#include "wine/windef16.h"
+//#include "wine/mmsystem16.h"
+
+/***********************************************************************
+ * Win16 definitions
+ */
+typedef BOOL16 (CALLBACK *ACMDRIVERENUMCB16)(
+  HACMDRIVERID16 hadid, DWORD dwInstance, DWORD fdwSupport
+);
+typedef UINT (CALLBACK *ACMFILTERCHOOSEHOOKPROC16)(
+  HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
+);
+typedef UINT16 (CALLBACK *ACMFORMATCHOOSEHOOKPROC16)(
+  HWND16 hwnd, UINT16 uMsg, WPARAM16 wParam, LPARAM lParam
+);
+
+typedef struct _ACMDRIVERDETAILS16
+{
+  DWORD   cbStruct;
+
+  FOURCC  fccType;
+  FOURCC  fccComp;
+
+  WORD    wMid;
+  WORD    wPid;
+
+  DWORD   vdwACM;
+  DWORD   vdwDriver;
+
+  DWORD   fdwSupport;
+  DWORD   cFormatTags;
+  DWORD   cFilterTags;
+
+  HICON16 hicon;
+
+  CHAR    szShortName[ACMDRIVERDETAILS_SHORTNAME_CHARS];
+  CHAR    szLongName[ACMDRIVERDETAILS_LONGNAME_CHARS];
+  CHAR    szCopyright[ACMDRIVERDETAILS_COPYRIGHT_CHARS];
+  CHAR    szLicensing[ACMDRIVERDETAILS_LICENSING_CHARS];
+  CHAR    szFeatures[ACMDRIVERDETAILS_FEATURES_CHARS];
+} ACMDRIVERDETAILS16, *NPACMDRIVERDETAILS16, *LPACMDRIVERDETAILS16;
+
+typedef struct _ACMFILTERCHOOSE16
+{
+  DWORD          cbStruct;
+  DWORD          fdwStyle;
+
+  HWND16         hwndOwner;
+
+  LPWAVEFILTER   pwfltr;
+  DWORD          cbwfltr;
+
+  LPCSTR         pszTitle;
+
+  char           szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS];
+  char           szFilter[ACMFILTERDETAILS_FILTER_CHARS];
+  LPSTR          pszName;
+  DWORD          cchName;
+
+  DWORD          fdwEnum;
+  LPWAVEFILTER   pwfltrEnum;
+
+  HINSTANCE16    hInstance;
+  LPCSTR         pszTemplateName;
+  LPARAM         lCustData;
+  ACMFILTERCHOOSEHOOKPROC16 pfnHook;
+} ACMFILTERCHOOSE16, *NPACMFILTERCHOOSE16, *LPACMFILTERCHOOSE16;
+
+typedef struct _ACMFILTERDETAILS16
+{
+  DWORD          cbStruct;
+  DWORD          dwFilterIndex;
+  DWORD          dwFilterTag;
+  DWORD          fdwSupport;
+  LPWAVEFILTER   pwfltr;
+  DWORD          cbwfltr;
+  CHAR           szFilter[ACMFILTERDETAILS_FILTER_CHARS];
+} ACMFILTERDETAILS16, *NPACMFILTERDETAILS16, *LPACMFILTERDETAILS16;
+
+typedef struct _ACMFILTERTAGDETAILS16
+{
+  DWORD cbStruct;
+  DWORD dwFilterTagIndex;
+  DWORD dwFilterTag;
+  DWORD cbFilterSize;
+  DWORD fdwSupport;
+  DWORD cStandardFilters;
+  CHAR  szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS];
+} ACMFILTERTAGDETAILS16, *NPACMFILTERTAGDETAILS16, *LPACMFILTERTAGDETAILS16;
+
+typedef struct _ACMFORMATCHOOSE16
+{
+  DWORD            cbStruct;
+  DWORD            fdwStyle;
+
+  HWND16           hwndOwner;
+
+  LPWAVEFORMATEX   pwfx;
+  DWORD            cbwfx;
+  LPCSTR           pszTitle;
+
+  CHAR             szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS];
+  CHAR             szFormat[ACMFORMATDETAILS_FORMAT_CHARS];
+
+  LPSTR            pszName;
+  DWORD            cchName;
+
+  DWORD            fdwEnum;
+  LPWAVEFORMATEX   pwfxEnum;
+
+  HINSTANCE16      hInstance;
+  LPCSTR           pszTemplateName;
+  LPARAM           lCustData;
+  ACMFORMATCHOOSEHOOKPROC16 pfnHook;
+} ACMFORMATCHOOSE16, *NPACMFORMATCHOOSE16, *LPACMFORMATCHOOSE16;
+
+typedef struct _ACMFORMATDETAILS16
+{
+    DWORD            cbStruct;
+    DWORD            dwFormatIndex;
+    DWORD            dwFormatTag;
+    DWORD            fdwSupport;
+    LPWAVEFORMATEX   pwfx;
+    DWORD            cbwfx;
+    CHAR             szFormat[ACMFORMATDETAILS_FORMAT_CHARS];
+} ACMFORMATDETAILS16, *NPACMFORMATDETAILS16, *LPACMFORMATDETAILS16;
+
+typedef struct _ACMFORMATTAGDETAILS16
+{
+  DWORD cbStruct;
+  DWORD dwFormatTagIndex;
+  DWORD dwFormatTag;
+  DWORD cbFormatSize;
+  DWORD fdwSupport;
+  DWORD cStandardFormats;
+  CHAR  szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS];
+} ACMFORMATTAGDETAILS16, *NPACMFORMATTAGDETAILS16, *LPACMFORMATTAGDETAILS16;
+
+typedef ACMSTREAMHEADER ACMSTREAMHEADER16, *NPACMSTREAMHEADER16, *LPACMSTREAMHEADER16;
+
+typedef BOOL16 (CALLBACK *ACMFILTERENUMCB16)(
+ HACMDRIVERID16 hadid, LPACMFILTERDETAILS16 pafd,
+ DWORD dwInstance, DWORD fdwSupport
+);
+
+typedef BOOL16 (CALLBACK *ACMFILTERTAGENUMCB16)(
+  HACMDRIVERID16 hadid, LPACMFILTERTAGDETAILS16 paftd,
+  DWORD dwInstance, DWORD fdwSupport
+);
+
+typedef BOOL16 (CALLBACK *ACMFORMATENUMCB16)(
+  HACMDRIVERID16 hadid, LPACMFORMATDETAILS16 pafd,
+  DWORD dwInstance, DWORD fdwSupport
+);
+
+typedef BOOL16 (CALLBACK *ACMFORMATTAGENUMCB16)(
+  HACMDRIVERID16 hadid, LPACMFORMATTAGDETAILS16 paftd,
+  DWORD dwInstance, DWORD fdwSupport
+);
+
+/***********************************************************************
+ * Functions - Win16
+ */
+
+DWORD WINAPI acmGetVersion16(
+);
+MMRESULT16 WINAPI acmMetrics16(
+  HACMOBJ16 hao, UINT16 uMetric, LPVOID pMetric
+);
+MMRESULT16 WINAPI acmDriverEnum16(
+  ACMDRIVERENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum
+);
+MMRESULT16 WINAPI acmDriverDetails16(
+  HACMDRIVERID16 hadid, LPACMDRIVERDETAILS16 padd, DWORD fdwDetails
+);
+MMRESULT16 WINAPI acmDriverAdd16(
+  LPHACMDRIVERID16 phadid, HINSTANCE16 hinstModule,
+  LPARAM lParam, DWORD dwPriority, DWORD fdwAdd
+);
+MMRESULT16 WINAPI acmDriverRemove16(
+  HACMDRIVERID16 hadid, DWORD fdwRemove
+);
+MMRESULT16 WINAPI acmDriverOpen16(
+  LPHACMDRIVER16 phad, HACMDRIVERID16 hadid, DWORD fdwOpen
+);
+MMRESULT16 WINAPI acmDriverClose16(
+  HACMDRIVER16 had, DWORD fdwClose
+);
+LRESULT WINAPI acmDriverMessage16(
+  HACMDRIVER16 had, UINT16 uMsg, LPARAM lParam1, LPARAM lParam2
+);
+MMRESULT16 WINAPI acmDriverID16(
+  HACMOBJ16 hao, LPHACMDRIVERID16 phadid, DWORD fdwDriverID
+);
+MMRESULT16 WINAPI acmDriverPriority16(
+ HACMDRIVERID16 hadid, DWORD dwPriority, DWORD fdwPriority
+);
+MMRESULT16 WINAPI acmFormatTagDetails16(
+  HACMDRIVER16 had, LPACMFORMATTAGDETAILS16 paftd, DWORD fdwDetails
+);
+MMRESULT16 WINAPI acmFormatTagEnum16(
+  HACMDRIVER16 had, LPACMFORMATTAGDETAILS16 paftd,
+  ACMFORMATTAGENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum
+);
+MMRESULT16 WINAPI acmFormatChoose16(
+  LPACMFORMATCHOOSE16 pafmtc
+);
+MMRESULT16 WINAPI acmFormatDetails16(
+  HACMDRIVER16 had, LPACMFORMATDETAILS16 pafd, DWORD fdwDetails
+);
+MMRESULT16 WINAPI acmFormatEnum16(
+  HACMDRIVER16 had, LPACMFORMATDETAILS16 pafd,
+  ACMFORMATENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum
+);
+MMRESULT16 WINAPI acmFormatSuggest16(
+  HACMDRIVER16 had, LPWAVEFORMATEX pwfxSrc,
+  LPWAVEFORMATEX pwfxDst, DWORD cbwfxDst, DWORD fdwSuggest
+);
+MMRESULT16 WINAPI acmFilterTagDetails16(
+  HACMDRIVER16 had, LPACMFILTERTAGDETAILS16 paftd, DWORD fdwDetails
+);
+MMRESULT16 WINAPI acmFilterTagEnum16(
+  HACMDRIVER16 had, LPACMFILTERTAGDETAILS16 paftd,
+  ACMFILTERTAGENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum
+);
+MMRESULT16 WINAPI acmFilterChoose16(
+  LPACMFILTERCHOOSE16 pafltrc
+);
+MMRESULT16 WINAPI acmFilterDetails16(
+  HACMDRIVER16 had, LPACMFILTERDETAILS16 pafd, DWORD fdwDetails
+);
+MMRESULT16 WINAPI acmFilterEnum16(
+  HACMDRIVER16 had, LPACMFILTERDETAILS16 pafd,
+  ACMFILTERENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum
+);
+MMRESULT16 WINAPI acmStreamOpen16(
+  LPHACMSTREAM16 phas, HACMDRIVER16 had,
+  LPWAVEFORMATEX pwfxSrc, LPWAVEFORMATEX pwfxDst,
+  LPWAVEFILTER pwfltr, DWORD dwCallback,
+  DWORD dwInstance, DWORD fdwOpen
+);
+MMRESULT16 WINAPI acmStreamClose16(
+  HACMSTREAM16 has, DWORD fdwClose
+);
+MMRESULT16 WINAPI acmStreamSize16(
+  HACMSTREAM16 has, DWORD cbInput,
+  LPDWORD pdwOutputBytes, DWORD fdwSize
+);
+MMRESULT16 WINAPI acmStreamConvert16(
+  HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwConvert
+);
+MMRESULT16 WINAPI acmStreamReset16(
+  HACMSTREAM16 has, DWORD fdwReset
+);
+MMRESULT16 WINAPI acmStreamPrepareHeader16(
+  HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwPrepare
+);
+MMRESULT16 WINAPI acmStreamUnprepareHeader16(
+  HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwUnprepare
+);
+#endif
+
+/***********************************************************************
+ * Wine specific - Win32
+ */
+typedef struct _WINE_ACMDRIVERID *PWINE_ACMDRIVERID;
+typedef struct _WINE_ACMDRIVER   *PWINE_ACMDRIVER;
+
+#define WINE_ACMOBJ_DONTCARE	0x5EED0000
+#define WINE_ACMOBJ_DRIVERID	0x5EED0001
+#define WINE_ACMOBJ_DRIVER	0x5EED0002
+#define WINE_ACMOBJ_STREAM	0x5EED0003
+
+typedef struct _WINE_ACMOBJ
+{
+    DWORD		dwType;
+    PWINE_ACMDRIVERID	pACMDriverID;
+} WINE_ACMOBJ, *PWINE_ACMOBJ;
+
+typedef struct _WINE_ACMDRIVER
+{
+    WINE_ACMOBJ		obj;
+    HDRVR      		hDrvr;
+    PWINE_ACMDRIVER	pNextACMDriver;
+} WINE_ACMDRIVER;
+
+typedef struct _WINE_ACMSTREAM
+{
+    WINE_ACMOBJ		obj;
+    PWINE_ACMDRIVER	pDrv;
+    ACMDRVSTREAMINSTANCE drvInst;
+    HACMDRIVER		hAcmDriver;
+} WINE_ACMSTREAM, *PWINE_ACMSTREAM;
+
+typedef struct _WINE_ACMDRIVERID
+{
+    WINE_ACMOBJ		obj;
+    LPWSTR		pszDriverAlias;
+    LPWSTR              pszFileName;
+    HINSTANCE		hInstModule;          /* NULL if global */
+    PWINE_ACMDRIVER     pACMDriverList;
+    PWINE_ACMDRIVERID   pNextACMDriverID;
+    PWINE_ACMDRIVERID	pPrevACMDriverID;
+    /* information about the driver itself, either gotten from registry or driver itself */
+    DWORD		cFilterTags;
+    DWORD		cFormatTags;
+    DWORD		fdwSupport;
+    struct {
+	DWORD			dwFormatTag;
+	DWORD			cbwfx;
+    }* 			aFormatTag;
+} WINE_ACMDRIVERID;
+
+/* From internal.c */
+extern HANDLE MSACM_hHeap;
+extern PWINE_ACMDRIVERID MSACM_pFirstACMDriverID;
+extern PWINE_ACMDRIVERID MSACM_pLastACMDriverID;
+extern PWINE_ACMDRIVERID MSACM_RegisterDriver(LPCWSTR pszDriverAlias, LPCWSTR pszFileName,
+					      HINSTANCE hinstModule);
+extern void MSACM_RegisterAllDrivers(void);
+extern PWINE_ACMDRIVERID MSACM_UnregisterDriver(PWINE_ACMDRIVERID p);
+extern void MSACM_UnregisterAllDrivers(void);
+extern PWINE_ACMDRIVERID MSACM_GetDriverID(HACMDRIVERID hDriverID);
+extern PWINE_ACMDRIVER MSACM_GetDriver(HACMDRIVER hDriver);
+extern PWINE_ACMOBJ MSACM_GetObj(HACMOBJ hObj, DWORD type);
+
+extern MMRESULT MSACM_Message(HACMDRIVER, UINT, LPARAM, LPARAM);
+extern BOOL MSACM_FindFormatTagInCache(WINE_ACMDRIVERID*, DWORD, LPDWORD);
+
+/* From msacm32.c */
+extern HINSTANCE MSACM_hInstance32;
+
+/* From pcmcnvtr.c */
+LRESULT CALLBACK	PCM_DriverProc(DWORD dwDevID, HDRVR hDriv, UINT wMsg,
+				       LPARAM dwParam1, LPARAM dwParam2);
+
+/* Dialog box templates */
+#include "msacmdlg.h"
+
+#endif /* __WINE_WINEACM_H */

From dcbabca8728c922efd2bc97dedf10872f092c571 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Wed, 14 Jul 2004 20:48:58 +0000
Subject: [PATCH 293/356] - Change the prototype of DIB_*_BitBlt* functions to
 take a pointer to a BLTINFO structure instead of many parameters. - Make
 DIB_GetSource and DIB_GetSourceIndex macros. - Add IntEngCreateSrcMonoXlate.
 - Change the semantics of IntEngCreate*Xlate functions to treat palette mode
 == 0 as mode of the passed palette. - Add XlateBrush and XlatePen to the DC
 structure. - Fixed the bad design decision that caused mess when one brush
 was selected into more than one DC. - Remove incorrect Int[Get/Set]DCColor
 implementation (used by [Get/Set]DC[Pen/Brush]Color). - Get rid of compiler
 warnings in Win32k.

svn path=/trunk/; revision=10116
---
 reactos/include/win32k/brush.h           |  12 +-
 reactos/include/win32k/dc.h              |   3 +
 reactos/subsys/win32k/dib/dib.c          |  81 ++---
 reactos/subsys/win32k/dib/dib.h          | 209 ++++++------
 reactos/subsys/win32k/dib/dib16bpp.c     | 248 +++++++-------
 reactos/subsys/win32k/dib/dib1bpp.c      | 221 ++++++-------
 reactos/subsys/win32k/dib/dib24bpp.c     | 198 +++++-------
 reactos/subsys/win32k/dib/dib32bpp.c     | 247 +++++++-------
 reactos/subsys/win32k/dib/dib4bpp.c      | 251 +++++++--------
 reactos/subsys/win32k/dib/dib8bpp.c      | 253 +++++++--------
 reactos/subsys/win32k/eng/bitblt.c       |  60 +++-
 reactos/subsys/win32k/eng/copybits.c     |  38 ++-
 reactos/subsys/win32k/eng/lineto.c       |  16 +-
 reactos/subsys/win32k/eng/mouse.c        |   9 +-
 reactos/subsys/win32k/eng/xlate.c        |  72 ++++-
 reactos/subsys/win32k/include/inteng.h   |   5 +
 reactos/subsys/win32k/include/intgdi.h   |   6 +
 reactos/subsys/win32k/ntuser/winpos.c    | 102 +++---
 reactos/subsys/win32k/objects/bitmaps.c  | 166 +++-------
 reactos/subsys/win32k/objects/brush.c    |  90 ++++--
 reactos/subsys/win32k/objects/cliprgn.c  |   6 +-
 reactos/subsys/win32k/objects/color.c    |  11 +-
 reactos/subsys/win32k/objects/coord.c    |   8 +-
 reactos/subsys/win32k/objects/dc.c       | 391 +++++------------------
 reactos/subsys/win32k/objects/fillshap.c | 132 ++++----
 reactos/subsys/win32k/objects/icm.c      |  13 +-
 reactos/subsys/win32k/objects/line.c     |  12 +-
 reactos/subsys/win32k/objects/metafile.c |  28 +-
 reactos/subsys/win32k/objects/paint.c    |   5 +-
 reactos/subsys/win32k/objects/path.c     |  14 +-
 reactos/subsys/win32k/objects/pen.c      |   4 +-
 reactos/subsys/win32k/objects/print.c    |   9 +-
 reactos/subsys/win32k/objects/region.c   |   7 +-
 reactos/subsys/win32k/objects/text.c     |  31 +-
 reactos/subsys/win32k/objects/wingl.c    |   8 +-
 35 files changed, 1322 insertions(+), 1644 deletions(-)

diff --git a/reactos/include/win32k/brush.h b/reactos/include/win32k/brush.h
index 1c6a9050740..e191ec63e21 100644
--- a/reactos/include/win32k/brush.h
+++ b/reactos/include/win32k/brush.h
@@ -36,14 +36,9 @@ typedef struct
    COLORREF crBack;
    COLORREF crFore;
    ULONG ulPalTime;
-#if 0
    ULONG ulSurfTime;
    PVOID ulRealization;
    ULONG Unknown4C[3];
-#else
-   BRUSHOBJ BrushObject;
-   ULONG Unknown50[2];
-#endif
    POINT ptPenWidth;
    ULONG ulPenStyle;
    DWORD *pStyle;
@@ -51,6 +46,13 @@ typedef struct
    ULONG Unknown6C;
 } GDIBRUSHOBJ, *PGDIBRUSHOBJ;
 
+typedef struct
+{
+   BRUSHOBJ BrushObject;
+   PGDIBRUSHOBJ GdiBrushObject;
+   XLATEOBJ *XlateObject;
+} GDIBRUSHINST, *PGDIBRUSHINST;
+
 /* GDI Brush Attributes */
 
 #define GDIBRUSH_NEED_BK_CLR		0x0002 /* Background color is needed */
diff --git a/reactos/include/win32k/dc.h b/reactos/include/win32k/dc.h
index dc7cf9e0cae..f0733848462 100644
--- a/reactos/include/win32k/dc.h
+++ b/reactos/include/win32k/dc.h
@@ -100,6 +100,9 @@ typedef struct _DC
 
   CLIPOBJ *CombinedClip;
 
+  XLATEOBJ *XlateBrush;
+  XLATEOBJ *XlatePen;
+
   INT  saveLevel;
 
   WIN_DC_INFO  w;
diff --git a/reactos/subsys/win32k/dib/dib.c b/reactos/subsys/win32k/dib/dib.c
index 2ed9d8a906a..07471c237d2 100644
--- a/reactos/subsys/win32k/dib/dib.c
+++ b/reactos/subsys/win32k/dib/dib.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dib.c,v 1.11 2004/07/03 13:55:35 navaraf Exp $ */
+/* $Id: dib.c,v 1.12 2004/07/14 20:48:56 navaraf Exp $ */
 #include <w32k.h>
 
 /* Static data */
@@ -29,106 +29,66 @@ DIB_FUNCTIONS DibFunctionsForBitmapFormat[] =
    /* 0 */
    {
       Dummy_PutPixel, Dummy_GetPixel, Dummy_HLine, Dummy_VLine,
-      Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt
+      Dummy_BitBlt, Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt
    },
    /* BMF_1BPP */
    {
       DIB_1BPP_PutPixel, DIB_1BPP_GetPixel, DIB_1BPP_HLine, DIB_1BPP_VLine,
-      DIB_1BPP_BitBlt, DIB_1BPP_StretchBlt, DIB_1BPP_TransparentBlt
+      DIB_1BPP_BitBlt, DIB_1BPP_BitBltSrcCopy, DIB_1BPP_StretchBlt,
+      DIB_1BPP_TransparentBlt
    },
    /* BMF_4BPP */
    {
       DIB_4BPP_PutPixel, DIB_4BPP_GetPixel, DIB_4BPP_HLine, DIB_4BPP_VLine,
-      DIB_4BPP_BitBlt, DIB_4BPP_StretchBlt, DIB_4BPP_TransparentBlt
+      DIB_4BPP_BitBlt, DIB_4BPP_BitBltSrcCopy, DIB_4BPP_StretchBlt,
+      DIB_4BPP_TransparentBlt
    },
    /* BMF_8BPP */
    {
       DIB_8BPP_PutPixel, DIB_8BPP_GetPixel, DIB_8BPP_HLine, DIB_8BPP_VLine,
-      DIB_8BPP_BitBlt, DIB_8BPP_StretchBlt, DIB_8BPP_TransparentBlt
+      DIB_8BPP_BitBlt, DIB_8BPP_BitBltSrcCopy, DIB_8BPP_StretchBlt,
+      DIB_8BPP_TransparentBlt
    },
    /* BMF_16BPP */
    {
       DIB_16BPP_PutPixel, DIB_16BPP_GetPixel, DIB_16BPP_HLine, DIB_16BPP_VLine,
-      DIB_16BPP_BitBlt, DIB_16BPP_StretchBlt, DIB_16BPP_TransparentBlt
+      DIB_16BPP_BitBlt, DIB_16BPP_BitBltSrcCopy, DIB_16BPP_StretchBlt,
+      DIB_16BPP_TransparentBlt
    },
    /* BMF_24BPP */
    {
       DIB_24BPP_PutPixel, DIB_24BPP_GetPixel, DIB_24BPP_HLine, DIB_24BPP_VLine,
-      DIB_24BPP_BitBlt, DIB_24BPP_StretchBlt, DIB_24BPP_TransparentBlt
+      DIB_24BPP_BitBlt, DIB_24BPP_BitBltSrcCopy, DIB_24BPP_StretchBlt,
+      DIB_24BPP_TransparentBlt
    },
    /* BMF_32BPP */
    {
       DIB_32BPP_PutPixel, DIB_32BPP_GetPixel, DIB_32BPP_HLine, DIB_32BPP_VLine,
-      DIB_32BPP_BitBlt, DIB_32BPP_StretchBlt, DIB_32BPP_TransparentBlt
+      DIB_32BPP_BitBlt, DIB_32BPP_BitBltSrcCopy, DIB_32BPP_StretchBlt,
+      DIB_32BPP_TransparentBlt
    },
    /* BMF_4RLE */
    {
       Dummy_PutPixel, Dummy_GetPixel, Dummy_HLine, Dummy_VLine,
-      Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt
+      Dummy_BitBlt, Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt
    },
    /* BMF_8RLE */
    {
       Dummy_PutPixel, Dummy_GetPixel, Dummy_HLine, Dummy_VLine,
-      Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt
+      Dummy_BitBlt, Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt
    },
    /* BMF_JPEG */
    {
       Dummy_PutPixel, Dummy_GetPixel, Dummy_HLine, Dummy_VLine,
-      Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt
+      Dummy_BitBlt, Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt
    },
    /* BMF_PNG */
    {
       Dummy_PutPixel, Dummy_GetPixel, Dummy_HLine, Dummy_VLine,
-      Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt
+      Dummy_BitBlt, Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt
    }
 };
 
-ULONG
-DIB_GetSource(SURFOBJ* SourceSurf, ULONG sx, ULONG sy, XLATEOBJ* ColorTranslation)
-{
-  switch (SourceSurf->iBitmapFormat)
-    {
-    case BMF_1BPP:
-      return(XLATEOBJ_iXlate(ColorTranslation, DIB_1BPP_GetPixel(SourceSurf, sx, sy)));
-    case BMF_4BPP:
-      return(XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)));
-    case BMF_8BPP:
-      return(XLATEOBJ_iXlate(ColorTranslation, DIB_8BPP_GetPixel(SourceSurf, sx, sy)));
-    case BMF_16BPP:
-      return(XLATEOBJ_iXlate(ColorTranslation, DIB_16BPP_GetPixel(SourceSurf, sx, sy)));
-    case BMF_24BPP:
-      return(XLATEOBJ_iXlate(ColorTranslation, DIB_24BPP_GetPixel(SourceSurf, sx, sy)));
-    case BMF_32BPP:
-      return(XLATEOBJ_iXlate(ColorTranslation, DIB_32BPP_GetPixel(SourceSurf, sx, sy)));
-    default:
-      DPRINT1("DIB_GetSource: Unhandled number of bits per pixel in source (%d).\n", BitsPerFormat(SourceSurf->iBitmapFormat));
-      return(0);
-    }
-}
-
-ULONG
-DIB_GetSourceIndex(SURFOBJ* SourceSurf, ULONG sx, ULONG sy)
-{
-  switch (SourceSurf->iBitmapFormat)
-    {
-    case BMF_1BPP:
-      return DIB_1BPP_GetPixel(SourceSurf, sx, sy);
-    case BMF_4BPP:
-      return DIB_4BPP_GetPixel(SourceSurf, sx, sy);
-    case BMF_8BPP:
-      return DIB_8BPP_GetPixel(SourceSurf, sx, sy);
-    case BMF_16BPP:
-      return DIB_16BPP_GetPixel(SourceSurf, sx, sy);
-    case BMF_24BPP:
-      return DIB_24BPP_GetPixel(SourceSurf, sx, sy);
-    case BMF_32BPP:
-      return DIB_32BPP_GetPixel(SourceSurf, sx, sy);
-    default:
-      DPRINT1("DIB_GetOriginalSource: Unhandled number of bits per pixel in source (%d).\n", BitsPerFormat(SourceSurf->iBitmapFormat));
-      return(0);
-    }
-}
-
 ULONG
 DIB_DoRop(ULONG Rop, ULONG Dest, ULONG Source, ULONG Pattern)
 {
@@ -249,10 +209,7 @@ VOID Dummy_VLine(SURFOBJ* SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
   return;
 }
 
-BOOLEAN Dummy_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                     RECTL*  DestRect,  POINTL  *SourcePoint,
-                     BRUSHOBJ* BrushObj, POINTL BrushOrign,
-                     XLATEOBJ *ColorTranslation, ULONG Rop4)
+BOOLEAN Dummy_BitBlt(PBLTINFO BltInfo)
 {
   return FALSE;
 }
diff --git a/reactos/subsys/win32k/dib/dib.h b/reactos/subsys/win32k/dib/dib.h
index b6ca70fa58c..909c779fa2d 100644
--- a/reactos/subsys/win32k/dib/dib.h
+++ b/reactos/subsys/win32k/dib/dib.h
@@ -1,11 +1,25 @@
 #ifndef _W32K_DIB_DIB_H
 #define _W32K_DIB_DIB_H
 
+typedef struct _BLTINFO
+{
+   SURFOBJ *DestSurface;
+   SURFOBJ *SourceSurface;
+   SURFOBJ *PatternSurface;
+   XLATEOBJ *XlateSourceToDest;
+   XLATEOBJ *XlatePatternToDest;
+   RECTL DestRect;
+   POINTL SourcePoint;
+   BRUSHOBJ *Brush;
+   POINTL BrushOrigin;
+   ULONG Rop4;
+} BLTINFO, *PBLTINFO;
+
 typedef VOID (*PFN_DIB_PutPixel)(SURFOBJ*,LONG,LONG,ULONG);
 typedef ULONG (*PFN_DIB_GetPixel)(SURFOBJ*,LONG,LONG);
 typedef VOID (*PFN_DIB_HLine)(SURFOBJ*,LONG,LONG,LONG,ULONG);
 typedef VOID (*PFN_DIB_VLine)(SURFOBJ*,LONG,LONG,LONG,ULONG);
-typedef BOOLEAN (*PFN_DIB_BitBlt)(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,BRUSHOBJ*,POINTL,XLATEOBJ*,ULONG);
+typedef BOOLEAN (*PFN_DIB_BitBlt)(PBLTINFO);
 typedef BOOLEAN (*PFN_DIB_StretchBlt)(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG);
 typedef BOOLEAN (*PFN_DIB_TransparentBlt)(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG);
 
@@ -16,137 +30,92 @@ typedef struct
   PFN_DIB_HLine          DIB_HLine;
   PFN_DIB_VLine          DIB_VLine;
   PFN_DIB_BitBlt         DIB_BitBlt;
+  PFN_DIB_BitBlt         DIB_BitBltSrcCopy;
   PFN_DIB_StretchBlt     DIB_StretchBlt;
   PFN_DIB_TransparentBlt DIB_TransparentBlt;
 } DIB_FUNCTIONS;
 
 extern DIB_FUNCTIONS DibFunctionsForBitmapFormat[];
 
+VOID Dummy_PutPixel(SURFOBJ*,LONG,LONG,ULONG);
+ULONG Dummy_GetPixel(SURFOBJ*,LONG,LONG);
+VOID Dummy_HLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
+VOID Dummy_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
+BOOLEAN Dummy_BitBlt(PBLTINFO);
+BOOLEAN Dummy_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG);
+BOOLEAN Dummy_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG);
+
+VOID DIB_1BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG);
+ULONG DIB_1BPP_GetPixel(SURFOBJ*,LONG,LONG);
+VOID DIB_1BPP_HLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
+VOID DIB_1BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
+BOOLEAN DIB_1BPP_BitBlt(PBLTINFO);
+BOOLEAN DIB_1BPP_BitBltSrcCopy(PBLTINFO);
+BOOLEAN DIB_1BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG);
+BOOLEAN DIB_1BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG);
+
+VOID DIB_4BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG);
+ULONG DIB_4BPP_GetPixel(SURFOBJ*,LONG,LONG);
+VOID DIB_4BPP_HLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
+VOID DIB_4BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
+BOOLEAN DIB_4BPP_BitBlt(PBLTINFO);
+BOOLEAN DIB_4BPP_BitBltSrcCopy(PBLTINFO);
+BOOLEAN DIB_4BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG);
+BOOLEAN DIB_4BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG);
+
+VOID DIB_8BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG);
+ULONG DIB_8BPP_GetPixel(SURFOBJ*,LONG,LONG);
+VOID DIB_8BPP_HLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
+VOID DIB_8BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
+BOOLEAN DIB_8BPP_BitBlt(PBLTINFO);
+BOOLEAN DIB_8BPP_BitBltSrcCopy(PBLTINFO);
+BOOLEAN DIB_8BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG);
+BOOLEAN DIB_8BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG);
+
+VOID DIB_16BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG);
+ULONG DIB_16BPP_GetPixel(SURFOBJ*,LONG,LONG);
+VOID DIB_16BPP_HLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
+VOID DIB_16BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
+BOOLEAN DIB_16BPP_BitBlt(PBLTINFO);
+BOOLEAN DIB_16BPP_BitBltSrcCopy(PBLTINFO);
+BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG);
+BOOLEAN DIB_16BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG);
+
+VOID DIB_24BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG);
+ULONG DIB_24BPP_GetPixel(SURFOBJ*,LONG,LONG);
+VOID DIB_24BPP_HLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
+VOID DIB_24BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
+BOOLEAN DIB_24BPP_BitBlt(PBLTINFO);
+BOOLEAN DIB_24BPP_BitBltSrcCopy(PBLTINFO);
+BOOLEAN DIB_24BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG);
+BOOLEAN DIB_24BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG);
+
+VOID DIB_32BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG);
+ULONG DIB_32BPP_GetPixel(SURFOBJ*,LONG,LONG);
+VOID DIB_32BPP_HLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
+VOID DIB_32BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG);
+BOOLEAN DIB_32BPP_BitBlt(PBLTINFO);
+BOOLEAN DIB_32BPP_BitBltSrcCopy(PBLTINFO);
+BOOLEAN DIB_32BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG);
+BOOLEAN DIB_32BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG);
+
+#define ROP_USES_SOURCE(Rop4) (((Rop4 & 0xCC0000) >> 2) != (Rop4 & 0x330000))
+#define ROP_USES_PATTERN(Rop4) (((Rop4 & 0xF00000) >> 4) != (Rop4 & 0x0F0000))
+
 extern unsigned char notmask[2];
 extern unsigned char altnotmask[2];
 #define MASK1BPP(x) (1<<(7-((x)&7)))
-ULONG   DIB_DoRop(ULONG Rop, ULONG Dest, ULONG Source, ULONG Pattern);
-ULONG   DIB_GetSource(SURFOBJ* SourceSurf, ULONG sx, ULONG sy, XLATEOBJ* ColorTranslation);
-ULONG   DIB_GetSourceIndex(SURFOBJ* SourceSurf, ULONG sx, ULONG sy);
 
-VOID Dummy_PutPixel(SURFOBJ* SurfObj, LONG x, LONG y, ULONG c);
-ULONG Dummy_GetPixel(SURFOBJ* SurfObj, LONG x, LONG y);
-VOID Dummy_HLine(SURFOBJ* SurfObj, LONG x1, LONG x2, LONG y, ULONG c);
-VOID Dummy_VLine(SURFOBJ* SurfObj, LONG x, LONG y1, LONG y2, ULONG c);
-BOOLEAN Dummy_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                     RECTL*  DestRect,  POINTL  *SourcePoint,
-                     BRUSHOBJ* BrushObj, POINTL BrushOrign,
-                     XLATEOBJ *ColorTranslation, ULONG Rop4);
-BOOLEAN Dummy_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                         RECTL*  DestRect,  RECTL  *SourceRect,
-                         POINTL* MaskOrigin, POINTL BrushOrign,
-                         CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
-                         ULONG Mode);
-BOOLEAN Dummy_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                             RECTL*  DestRect,  POINTL  *SourcePoint,
-                             XLATEOBJ *ColorTranslation, ULONG iTransColor);
+ULONG DIB_DoRop(ULONG Rop, ULONG Dest, ULONG Source, ULONG Pattern);
 
-VOID    DIB_1BPP_PutPixel(SURFOBJ* SurfObj, LONG x, LONG y, ULONG c);
-ULONG   DIB_1BPP_GetPixel(SURFOBJ* SurfObj, LONG x, LONG y);
-VOID    DIB_1BPP_HLine(SURFOBJ* SurfObj, LONG x1, LONG x2, LONG y, ULONG c);
-VOID    DIB_1BPP_VLine(SURFOBJ* SurfObj, LONG x, LONG y1, LONG y2, ULONG c);
-BOOLEAN DIB_1BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                        RECTL* DestRect, POINTL *SourcePoint,
-                        BRUSHOBJ* Brush, POINTL BrushOrigin,
-                        XLATEOBJ *ColorTranslation, ULONG Rop4);
-BOOLEAN DIB_1BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                            RECTL* DestRect, RECTL *SourceRect,
-                            POINTL* MaskOrigin, POINTL BrushOrigin,
-                            CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
-                            ULONG Mode);
-BOOLEAN DIB_1BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                                RECTL*  DestRect,  POINTL  *SourcePoint,
-                                XLATEOBJ *ColorTranslation, ULONG iTransColor);
+#define DIB_GetSource(SourceSurf,sx,sy,ColorTranslation)      \
+   XLATEOBJ_iXlate(ColorTranslation,                          \
+      DibFunctionsForBitmapFormat[SourceSurf->iBitmapFormat]. \
+      DIB_GetPixel(SourceSurf, sx, sy))
 
-VOID    DIB_4BPP_PutPixel(SURFOBJ* SurfObj, LONG x, LONG y, ULONG c);
-ULONG   DIB_4BPP_GetPixel(SURFOBJ* SurfObj, LONG x, LONG y);
-VOID    DIB_4BPP_HLine(SURFOBJ* SurfObj, LONG x1, LONG x2, LONG y, ULONG c);
-VOID    DIB_4BPP_VLine(SURFOBJ* SurfObj, LONG x, LONG y1, LONG y2, ULONG c);
-BOOLEAN DIB_4BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                        RECTL* DestRect, POINTL *SourcePoint,
-                        BRUSHOBJ* Brush, POINTL BrushOrigin,
-                        XLATEOBJ *ColorTranslation, ULONG Rop4);
-BOOLEAN DIB_4BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                            RECTL* DestRect, RECTL *SourceRect,
-                            POINTL* MaskOrigin, POINTL BrushOrigin,
-                            CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
-                            ULONG Mode);
-BOOLEAN DIB_4BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                                RECTL*  DestRect,  POINTL  *SourcePoint,
-                                XLATEOBJ *ColorTranslation, ULONG iTransColor);
-
-VOID    DIB_8BPP_PutPixel(SURFOBJ* SurfObj, LONG x, LONG y, ULONG c);
-ULONG   DIB_8BPP_GetPixel(SURFOBJ* SurfObj, LONG x, LONG y);
-VOID    DIB_8BPP_HLine(SURFOBJ* SurfObj, LONG x1, LONG x2, LONG y, ULONG c);
-VOID    DIB_8BPP_VLine(SURFOBJ* SurfObj, LONG x, LONG y1, LONG y2, ULONG c);
-BOOLEAN DIB_8BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                        RECTL* DestRect, POINTL *SourcePoint,
-                        BRUSHOBJ* Brush, POINTL BrushOrigin,
-                        XLATEOBJ *ColorTranslation, ULONG Rop4);
-BOOLEAN DIB_8BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                            RECTL* DestRect, RECTL *SourceRect,
-                            POINTL* MaskOrigin, POINTL BrushOrigin,
-                            CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
-                            ULONG Mode);
-BOOLEAN DIB_8BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                                RECTL*  DestRect,  POINTL  *SourcePoint,
-                                XLATEOBJ *ColorTranslation, ULONG iTransColor);
-
-VOID    DIB_16BPP_PutPixel(SURFOBJ* SurfObj, LONG x, LONG y, ULONG c);
-ULONG   DIB_16BPP_GetPixel(SURFOBJ* SurfObj, LONG x, LONG y);
-VOID    DIB_16BPP_HLine(SURFOBJ* SurfObj, LONG x1, LONG x2, LONG y, ULONG c);
-VOID    DIB_16BPP_VLine(SURFOBJ* SurfObj, LONG x, LONG y1, LONG y2, ULONG c);
-BOOLEAN DIB_16BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                         RECTL* DestRect, POINTL *SourcePoint,
-                         BRUSHOBJ* Brush, POINTL BrushOrigin,
-                         XLATEOBJ *ColorTranslation, ULONG Rop4);
-BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                             RECTL* DestRect, RECTL *SourceRect,
-                             POINTL* MaskOrigin, POINTL BrushOrigin,
-                             CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
-                             ULONG Mode);
-BOOLEAN DIB_16BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                                 RECTL*  DestRect,  POINTL  *SourcePoint,
-                                 XLATEOBJ *ColorTranslation, ULONG iTransColor);
-
-VOID    DIB_24BPP_PutPixel(SURFOBJ* SurfObj, LONG x, LONG y, ULONG c);
-ULONG   DIB_24BPP_GetPixel(SURFOBJ* SurfObj, LONG x, LONG y);
-VOID    DIB_24BPP_HLine(SURFOBJ* SurfObj, LONG x1, LONG x2, LONG y, ULONG c);
-VOID    DIB_24BPP_VLine(SURFOBJ* SurfObj, LONG x, LONG y1, LONG y2, ULONG c);
-BOOLEAN DIB_24BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                         RECTL* DestRect, POINTL *SourcePoint,
-                         BRUSHOBJ* Brush, POINTL BrushOrigin,
-                         XLATEOBJ *ColorTranslation, ULONG Rop4);
-BOOLEAN DIB_24BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                             RECTL* DestRect, RECTL *SourceRect,
-                             POINTL* MaskOrigin, POINTL BrushOrigin,
-                             CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
-                             ULONG Mode);
-BOOLEAN DIB_24BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                                 RECTL*  DestRect,  POINTL  *SourcePoint,
-                                 XLATEOBJ *ColorTranslation, ULONG iTransColor);
-
-VOID    DIB_32BPP_PutPixel(SURFOBJ* SurfObj, LONG x, LONG y, ULONG c);
-ULONG   DIB_32BPP_GetPixel(SURFOBJ* SurfObj, LONG x, LONG y);
-VOID    DIB_32BPP_HLine(SURFOBJ* SurfObj, LONG x1, LONG x2, LONG y, ULONG c);
-VOID    DIB_32BPP_VLine(SURFOBJ* SurfObj, LONG x, LONG y1, LONG y2, ULONG c);
-BOOLEAN DIB_32BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                         RECTL* DestRect, POINTL *SourcePoint,
-                         BRUSHOBJ* Brush, POINTL BrushOrigin,
-                         XLATEOBJ *ColorTranslation, ULONG Rop4);
-BOOLEAN DIB_32BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                             RECTL* DestRect, RECTL *SourceRect,
-                             POINTL* MaskOrigin, POINTL BrushOrigin,
-                             CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation,
-                             ULONG Mode);
-BOOLEAN DIB_32BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-                                 RECTL*  DestRect,  POINTL  *SourcePoint,
-                                 XLATEOBJ *ColorTranslation, ULONG iTransColor);
+#define DIB_GetSourceIndex(SourceSurf,sx,sy)                  \
+   DibFunctionsForBitmapFormat[SourceSurf->iBitmapFormat].    \
+      DIB_GetPixel(SourceSurf, sx, sy)
 
 #endif /* _W32K_DIB_DIB_H */
 
diff --git a/reactos/subsys/win32k/dib/dib16bpp.c b/reactos/subsys/win32k/dib/dib16bpp.c
index 339bcb66c0d..33cc1e46cbe 100644
--- a/reactos/subsys/win32k/dib/dib16bpp.c
+++ b/reactos/subsys/win32k/dib/dib16bpp.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dib16bpp.c,v 1.34 2004/07/03 17:40:24 navaraf Exp $ */
+/* $Id: dib16bpp.c,v 1.35 2004/07/14 20:48:56 navaraf Exp $ */
 #include <w32k.h>
 
 VOID
@@ -67,32 +67,30 @@ DIB_16BPP_VLine(SURFOBJ *SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
   }
 }
 
-BOOLEAN STATIC
-DIB_16BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-		        PRECTL  DestRect,  POINTL  *SourcePoint,
-		        XLATEOBJ *ColorTranslation)
+BOOLEAN
+DIB_16BPP_BitBltSrcCopy(PBLTINFO BltInfo)
 {
   LONG     i, j, sx, sy, xColor, f1;
   PBYTE    SourceBits, DestBits, SourceLine, DestLine;
   PBYTE    SourceBits_4BPP, SourceLine_4BPP;
-  DestBits = DestSurf->pvScan0 + (DestRect->top * DestSurf->lDelta) + 2 * DestRect->left;
+  DestBits = BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.top * BltInfo->DestSurface->lDelta) + 2 * BltInfo->DestRect.left;
 
-  switch(SourceSurf->iBitmapFormat)
+  switch(BltInfo->SourceSurface->iBitmapFormat)
   {
     case BMF_1BPP:
-      sx = SourcePoint->x;
-      sy = SourcePoint->y;
+      sx = BltInfo->SourcePoint.x;
+      sy = BltInfo->SourcePoint.y;
 
-      for (j=DestRect->top; j<DestRect->bottom; j++)
+      for (j=BltInfo->DestRect.top; j<BltInfo->DestRect.bottom; j++)
       {
-        sx = SourcePoint->x;
-        for (i=DestRect->left; i<DestRect->right; i++)
+        sx = BltInfo->SourcePoint.x;
+        for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++)
         {
-          if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0)
+          if(DIB_1BPP_GetPixel(BltInfo->SourceSurface, sx, sy) == 0)
           {
-            DIB_16BPP_PutPixel(DestSurf, i, j, XLATEOBJ_iXlate(ColorTranslation, 0));
+            DIB_16BPP_PutPixel(BltInfo->DestSurface, i, j, XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, 0));
           } else {
-            DIB_16BPP_PutPixel(DestSurf, i, j, XLATEOBJ_iXlate(ColorTranslation, 1));
+            DIB_16BPP_PutPixel(BltInfo->DestSurface, i, j, XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, 1));
           }
           sx++;
         }
@@ -101,161 +99,161 @@ DIB_16BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       break;
 
     case BMF_4BPP:
-      SourceBits_4BPP = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + (SourcePoint->x >> 1);
+      SourceBits_4BPP = BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + (BltInfo->SourcePoint.x >> 1);
 
-      for (j=DestRect->top; j<DestRect->bottom; j++)
+      for (j=BltInfo->DestRect.top; j<BltInfo->DestRect.bottom; j++)
       {
         SourceLine_4BPP = SourceBits_4BPP;
-        sx = SourcePoint->x;
+        sx = BltInfo->SourcePoint.x;
         f1 = sx & 1;
 
-        for (i=DestRect->left; i<DestRect->right; i++)
+        for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++)
         {
-          xColor = XLATEOBJ_iXlate(ColorTranslation,
+          xColor = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest,
               (*SourceLine_4BPP & altnotmask[f1]) >> (4 * (1 - f1)));
-          DIB_16BPP_PutPixel(DestSurf, i, j, xColor);
+          DIB_16BPP_PutPixel(BltInfo->DestSurface, i, j, xColor);
           if(f1 == 1) { SourceLine_4BPP++; f1 = 0; } else { f1 = 1; }
           sx++;
         }
 
-        SourceBits_4BPP += SourceSurf->lDelta;
+        SourceBits_4BPP += BltInfo->SourceSurface->lDelta;
       }
       break;
 
     case BMF_8BPP:
-      SourceLine = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + SourcePoint->x;
+      SourceLine = BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + BltInfo->SourcePoint.x;
       DestLine = DestBits;
 
-      for (j = DestRect->top; j < DestRect->bottom; j++)
+      for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++)
       {
         SourceBits = SourceLine;
         DestBits = DestLine;
 
-        for (i = DestRect->left; i < DestRect->right; i++)
+        for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++)
         {
-          *((WORD *)DestBits) = (WORD)XLATEOBJ_iXlate(ColorTranslation, *SourceBits);
+          *((WORD *)DestBits) = (WORD)XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *SourceBits);
           SourceBits += 1;
 	  DestBits += 2;
         }
 
-        SourceLine += SourceSurf->lDelta;
-        DestLine += DestSurf->lDelta;
+        SourceLine += BltInfo->SourceSurface->lDelta;
+        DestLine += BltInfo->DestSurface->lDelta;
       }
       break;
 
     case BMF_16BPP:
-      if (NULL == ColorTranslation || 0 != (ColorTranslation->flXlate & XO_TRIVIAL))
+      if (NULL == BltInfo->XlateSourceToDest || 0 != (BltInfo->XlateSourceToDest->flXlate & XO_TRIVIAL))
       {
-	if (DestRect->top < SourcePoint->y)
+	if (BltInfo->DestRect.top < BltInfo->SourcePoint.y)
 	  {
-	    SourceBits = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + 2 * SourcePoint->x;
-	    for (j = DestRect->top; j < DestRect->bottom; j++)
+	    SourceBits = BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + 2 * BltInfo->SourcePoint.x;
+	    for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++)
 	      {
-		RtlMoveMemory(DestBits, SourceBits, 2 * (DestRect->right - DestRect->left));
-		SourceBits += SourceSurf->lDelta;
-		DestBits += DestSurf->lDelta;
+		RtlMoveMemory(DestBits, SourceBits, 2 * (BltInfo->DestRect.right - BltInfo->DestRect.left));
+		SourceBits += BltInfo->SourceSurface->lDelta;
+		DestBits += BltInfo->DestSurface->lDelta;
 	      }
 	  }
 	else
 	  {
-	    SourceBits = SourceSurf->pvScan0 + ((SourcePoint->y + DestRect->bottom - DestRect->top - 1) * SourceSurf->lDelta) + 2 * SourcePoint->x;
-	    DestBits = DestSurf->pvScan0 + ((DestRect->bottom - 1) * DestSurf->lDelta) + 2 * DestRect->left;
-	    for (j = DestRect->bottom - 1; DestRect->top <= j; j--)
+	    SourceBits = BltInfo->SourceSurface->pvScan0 + ((BltInfo->SourcePoint.y + BltInfo->DestRect.bottom - BltInfo->DestRect.top - 1) * BltInfo->SourceSurface->lDelta) + 2 * BltInfo->SourcePoint.x;
+	    DestBits = BltInfo->DestSurface->pvScan0 + ((BltInfo->DestRect.bottom - 1) * BltInfo->DestSurface->lDelta) + 2 * BltInfo->DestRect.left;
+	    for (j = BltInfo->DestRect.bottom - 1; BltInfo->DestRect.top <= j; j--)
 	      {
-		RtlMoveMemory(DestBits, SourceBits, 2 * (DestRect->right - DestRect->left));
-		SourceBits -= SourceSurf->lDelta;
-		DestBits -= DestSurf->lDelta;
+		RtlMoveMemory(DestBits, SourceBits, 2 * (BltInfo->DestRect.right - BltInfo->DestRect.left));
+		SourceBits -= BltInfo->SourceSurface->lDelta;
+		DestBits -= BltInfo->DestSurface->lDelta;
 	      }
 	  }
       }
       else
       {
-	if (DestRect->top < SourcePoint->y)
+	if (BltInfo->DestRect.top < BltInfo->SourcePoint.y)
 	  {
-	    SourceLine = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + 2 * SourcePoint->x;
+	    SourceLine = BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + 2 * BltInfo->SourcePoint.x;
 	    DestLine = DestBits;
-	    for (j = DestRect->top; j < DestRect->bottom; j++)
+	    for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++)
 	      {
 		SourceBits = SourceLine;
 		DestBits = DestLine;
-	        for (i = DestRect->left; i < DestRect->right; i++)
+	        for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++)
 		  {
-		    *((WORD *)DestBits) = (WORD)XLATEOBJ_iXlate(ColorTranslation, *((WORD *)SourceBits));
+		    *((WORD *)DestBits) = (WORD)XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *((WORD *)SourceBits));
 		    SourceBits += 2;
 		    DestBits += 2;
 	          }
-		SourceLine += SourceSurf->lDelta;
-		DestLine += DestSurf->lDelta;
+		SourceLine += BltInfo->SourceSurface->lDelta;
+		DestLine += BltInfo->DestSurface->lDelta;
 	      }
 	  }
 	else
 	  {
-	    SourceLine = SourceSurf->pvScan0 + ((SourcePoint->y + DestRect->bottom - DestRect->top - 1) * SourceSurf->lDelta) + 2 * SourcePoint->x;
-	    DestLine = DestSurf->pvScan0 + ((DestRect->bottom - 1) * DestSurf->lDelta) + 2 * DestRect->left;
-	    for (j = DestRect->bottom - 1; DestRect->top <= j; j--)
+	    SourceLine = BltInfo->SourceSurface->pvScan0 + ((BltInfo->SourcePoint.y + BltInfo->DestRect.bottom - BltInfo->DestRect.top - 1) * BltInfo->SourceSurface->lDelta) + 2 * BltInfo->SourcePoint.x;
+	    DestLine = BltInfo->DestSurface->pvScan0 + ((BltInfo->DestRect.bottom - 1) * BltInfo->DestSurface->lDelta) + 2 * BltInfo->DestRect.left;
+	    for (j = BltInfo->DestRect.bottom - 1; BltInfo->DestRect.top <= j; j--)
 	      {
 		SourceBits = SourceLine;
 		DestBits = DestLine;
-	        for (i = DestRect->left; i < DestRect->right; i++)
+	        for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++)
 		  {
-		    *((WORD *)DestBits) = (WORD)XLATEOBJ_iXlate(ColorTranslation, *((WORD *)SourceBits));
+		    *((WORD *)DestBits) = (WORD)XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *((WORD *)SourceBits));
 		    SourceBits += 2;
 		    DestBits += 2;
 	          }
-		SourceLine -= SourceSurf->lDelta;
-		DestLine -= DestSurf->lDelta;
+		SourceLine -= BltInfo->SourceSurface->lDelta;
+		DestLine -= BltInfo->DestSurface->lDelta;
 	      }
 	  }
       }
       break;
 
     case BMF_24BPP:
-      SourceLine = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + 3 * SourcePoint->x;
+      SourceLine = BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + 3 * BltInfo->SourcePoint.x;
       DestLine = DestBits;
 
-      for (j = DestRect->top; j < DestRect->bottom; j++)
+      for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++)
       {
         SourceBits = SourceLine;
         DestBits = DestLine;
 
-        for (i = DestRect->left; i < DestRect->right; i++)
+        for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++)
         {
           xColor = (*(SourceBits + 2) << 0x10) +
              (*(SourceBits + 1) << 0x08) +
              (*(SourceBits));
-          *((WORD *)DestBits) = (WORD)XLATEOBJ_iXlate(ColorTranslation, xColor);
+          *((WORD *)DestBits) = (WORD)XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor);
           SourceBits += 3;
 	  DestBits += 2;
         }
 
-        SourceLine += SourceSurf->lDelta;
-        DestLine += DestSurf->lDelta;
+        SourceLine += BltInfo->SourceSurface->lDelta;
+        DestLine += BltInfo->DestSurface->lDelta;
       }
       break;
 
     case BMF_32BPP:
-      SourceLine = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + 4 * SourcePoint->x;
+      SourceLine = BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + 4 * BltInfo->SourcePoint.x;
       DestLine = DestBits;
 
-      for (j = DestRect->top; j < DestRect->bottom; j++)
+      for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++)
       {
         SourceBits = SourceLine;
         DestBits = DestLine;
 
-        for (i = DestRect->left; i < DestRect->right; i++)
+        for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++)
         {
-          *((WORD *)DestBits) = (WORD)XLATEOBJ_iXlate(ColorTranslation, *((PDWORD) SourceBits));
+          *((WORD *)DestBits) = (WORD)XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *((PDWORD) SourceBits));
           SourceBits += 4;
 	  DestBits += 2;
         }
 
-        SourceLine += SourceSurf->lDelta;
-        DestLine += DestSurf->lDelta;
+        SourceLine += BltInfo->SourceSurface->lDelta;
+        DestLine += BltInfo->DestSurface->lDelta;
       }
       break;
 
     default:
-      DPRINT1("DIB_16BPP_Bitblt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat));
+      DPRINT1("DIB_16BPP_Bitblt: Unhandled Source BPP: %u\n", BitsPerFormat(BltInfo->SourceSurface->iBitmapFormat));
       return FALSE;
   }
 
@@ -263,124 +261,94 @@ DIB_16BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
 }
 
 BOOLEAN
-DIB_16BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-		 PRECTL  DestRect,  POINTL  *SourcePoint,
-		 BRUSHOBJ *Brush,   POINTL BrushOrigin,
-		 XLATEOBJ *ColorTranslation, ULONG Rop4)
+DIB_16BPP_BitBlt(PBLTINFO BltInfo)
 {
-   ULONG X, Y;
+   ULONG DestX, DestY;
    ULONG SourceX, SourceY;
-   ULONG wd, Dest, Source = 0, Pattern = 0;
-   PULONG DestBits;
+   ULONG PatternY = 0;
+   ULONG Dest, Source = 0, Pattern = 0;
    BOOL UsesSource;
    BOOL UsesPattern;
+   PULONG DestBits;
    ULONG RoundedRight;
-   /* Pattern brushes */
-   PGDIBRUSHOBJ GdiBrush = NULL;
-   HBITMAP PatternSurface = NULL;
-   SURFOBJ *PatternObj = NULL;
-   ULONG PatternWidth = 0, PatternHeight = 0, PatternY = 0;
 
-   if (Rop4 == SRCCOPY)
-   {
-      return DIB_16BPP_BitBltSrcCopy(
-         DestSurf,
-         SourceSurf,
-         DestRect,
-         SourcePoint,
-         ColorTranslation);
-   }
-
-   UsesSource = ((Rop4 & 0xCC0000) >> 2) != (Rop4 & 0x330000);
-   UsesPattern = (((Rop4 & 0xF00000) >> 4) != (Rop4 & 0x0F0000)) && Brush;  
+   UsesSource = ROP_USES_SOURCE(BltInfo->Rop4);
+   UsesPattern = ROP_USES_PATTERN(BltInfo->Rop4);  
       
+   RoundedRight = BltInfo->DestRect.right -
+                  ((BltInfo->DestRect.right - BltInfo->DestRect.left) & 0x1);
+   SourceY = BltInfo->SourcePoint.y;
+   DestBits = (PULONG)(
+      BltInfo->DestSurface->pvScan0 +
+      (BltInfo->DestRect.left << 1) +
+      BltInfo->DestRect.top * BltInfo->DestSurface->lDelta);
+
    if (UsesPattern)
    {
-      if (Brush->iSolidColor == 0xFFFFFFFF)
+      if (BltInfo->PatternSurface)
       {
-         PBITMAPOBJ PatternBitmap;
-
-         GdiBrush = CONTAINING_RECORD(
-            Brush,
-            GDIBRUSHOBJ,
-            BrushObject);
-
-         PatternSurface = GdiBrush->hbmPattern;
-         PatternBitmap = BITMAPOBJ_LockBitmap(GdiBrush->hbmPattern);
-
-         PatternObj = &PatternBitmap->SurfObj;
-         PatternWidth = PatternObj->sizlBitmap.cx;
-         PatternHeight = PatternObj->sizlBitmap.cy;
-         
-         UsesPattern = TRUE;
+         PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % 
+                    BltInfo->PatternSurface->sizlBitmap.cy;
       }
       else
       {
-         UsesPattern = FALSE;
-         Pattern = (Brush->iSolidColor & 0xFFFF) |
-                    ((Brush->iSolidColor & 0xFFFF) << 16);
+         Pattern = BltInfo->Brush->iSolidColor |
+                   (BltInfo->Brush->iSolidColor << 16);
       }
    }
-   
-   wd = ((DestRect->right - DestRect->left) << 1) - DestSurf->lDelta;
-   RoundedRight = DestRect->right - ((DestRect->right - DestRect->left) & 0x1);
-   SourceY = SourcePoint->y;
-   DestBits = (PULONG)(
-      DestSurf->pvScan0 +
-      (DestRect->left << 1) +
-      DestRect->top * DestSurf->lDelta);
 
-   for (Y = DestRect->top; Y < DestRect->bottom; Y++)
+   for (DestY = BltInfo->DestRect.top; DestY < BltInfo->DestRect.bottom; DestY++)
    {
-      SourceX = SourcePoint->x;
+      SourceX = BltInfo->SourcePoint.x;
       
-      if(UsesPattern)
-        PatternY = (Y + BrushOrigin.y) % PatternHeight;
-      
-      for (X = DestRect->left; X < RoundedRight; X += 2, DestBits++, SourceX += 2)
+      for (DestX = BltInfo->DestRect.left; DestX < RoundedRight; DestX += 2, DestBits++, SourceX += 2)
       {
          Dest = *DestBits;
  
          if (UsesSource)
          {
-            Source = DIB_GetSource(SourceSurf, SourceX, SourceY, ColorTranslation);
-            Source |= DIB_GetSource(SourceSurf, SourceX + 1, SourceY, ColorTranslation) << 16;
+            Source = DIB_GetSource(BltInfo->SourceSurface, SourceX, SourceY, BltInfo->XlateSourceToDest);
+            Source |= DIB_GetSource(BltInfo->SourceSurface, SourceX + 1, SourceY, BltInfo->XlateSourceToDest) << 16;
          }
 
-         if (UsesPattern)
+         if (BltInfo->PatternSurface)
 	 {
-            Pattern = (DIB_1BPP_GetPixel(PatternObj, (X + BrushOrigin.x) % PatternWidth, PatternY) ? GdiBrush->crFore : GdiBrush->crBack);
-            Pattern |= (DIB_1BPP_GetPixel(PatternObj, (X + BrushOrigin.x + 1) % PatternWidth, PatternY) ? GdiBrush->crFore : GdiBrush->crBack) << 16;
+            Pattern = DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest);
+            Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 1) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 16;
          }
 
-         *DestBits = DIB_DoRop(Rop4, Dest, Source, Pattern);
+         *DestBits = DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern);
       }
 
-      if (X < DestRect->right)
+      if (DestX < BltInfo->DestRect.right)
       {
          Dest = *((PUSHORT)DestBits);
 
          if (UsesSource)
          {
-            Source = DIB_GetSource(SourceSurf, SourceX, SourceY, ColorTranslation);
+            Source = DIB_GetSource(BltInfo->SourceSurface, SourceX, SourceY, BltInfo->XlateSourceToDest);
          }
 
-         if (UsesPattern)
+         if (BltInfo->PatternSurface)
          {
-            Pattern = DIB_1BPP_GetPixel(PatternObj, (X + BrushOrigin.x) % PatternWidth, PatternY) ? GdiBrush->crFore : GdiBrush->crBack;
+            Pattern = DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest);
          }				
 
-         DIB_16BPP_PutPixel(DestSurf, X, Y, DIB_DoRop(Rop4, Dest, Source, Pattern) & 0xFFFF);
+         DIB_16BPP_PutPixel(BltInfo->DestSurface, DestX, DestY, DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern) & 0xFFFF);
          DestBits = (PULONG)((ULONG_PTR)DestBits + 2);
       }
 
       SourceY++;
+      if (BltInfo->PatternSurface)
+      {
+         PatternY++;
+         PatternY %= BltInfo->PatternSurface->sizlBitmap.cy;
+      }
       DestBits = (PULONG)(
-         (ULONG_PTR)DestBits - wd);
+         (ULONG_PTR)DestBits -
+         ((BltInfo->DestRect.right - BltInfo->DestRect.left) << 1) +
+         BltInfo->DestSurface->lDelta);
    }
-
-   if (PatternSurface != NULL)
-      BITMAPOBJ_UnlockBitmap(PatternSurface);
   
    return TRUE;
 }
diff --git a/reactos/subsys/win32k/dib/dib1bpp.c b/reactos/subsys/win32k/dib/dib1bpp.c
index bace95e7501..cdc4ef2b634 100644
--- a/reactos/subsys/win32k/dib/dib1bpp.c
+++ b/reactos/subsys/win32k/dib/dib1bpp.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dib1bpp.c,v 1.31 2004/07/03 17:40:24 navaraf Exp $ */
+/* $Id: dib1bpp.c,v 1.32 2004/07/14 20:48:56 navaraf Exp $ */
 #include <w32k.h>
 
 VOID
@@ -227,30 +227,27 @@ DIB_1BPP_BitBltSrcCopy_From1BPP (
 }
 
 BOOLEAN
-DIB_1BPP_BitBltSrcCopy(
-	SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-	PRECTL  DestRect,  POINTL  *SourcePoint,
-	XLATEOBJ *ColorTranslation)
+DIB_1BPP_BitBltSrcCopy(PBLTINFO BltInfo)
 {
-	LONG i, j, sx, sy = SourcePoint->y;
+	LONG i, j, sx, sy = BltInfo->SourcePoint.y;
 
-	switch ( SourceSurf->iBitmapFormat )
+	switch ( BltInfo->SourceSurface->iBitmapFormat )
 	{
 	case BMF_1BPP:
-		DIB_1BPP_BitBltSrcCopy_From1BPP ( DestSurf, SourceSurf, DestRect, SourcePoint );
+		DIB_1BPP_BitBltSrcCopy_From1BPP ( BltInfo->DestSurface, BltInfo->SourceSurface, &BltInfo->DestRect, &BltInfo->SourcePoint );
 		break;
 
 	case BMF_4BPP:
-		for (j=DestRect->top; j<DestRect->bottom; j++)
+		for (j=BltInfo->DestRect.top; j<BltInfo->DestRect.bottom; j++)
 		{
-			sx = SourcePoint->x;
-			for (i=DestRect->left; i<DestRect->right; i++)
+			sx = BltInfo->SourcePoint.x;
+			for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++)
 			{
-				if(XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)) == 0)
+				if(XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_4BPP_GetPixel(BltInfo->SourceSurface, sx, sy)) == 0)
 				{
-					DIB_1BPP_PutPixel(DestSurf, i, j, 0);
+					DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 0);
 				} else {
-					DIB_1BPP_PutPixel(DestSurf, i, j, 1);
+					DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 1);
 				}
 				sx++;
 			}
@@ -259,16 +256,16 @@ DIB_1BPP_BitBltSrcCopy(
 		break;
 
 	case BMF_8BPP:
-		for (j=DestRect->top; j<DestRect->bottom; j++)
+		for (j=BltInfo->DestRect.top; j<BltInfo->DestRect.bottom; j++)
 		{
-			sx = SourcePoint->x;
-			for (i=DestRect->left; i<DestRect->right; i++)
+			sx = BltInfo->SourcePoint.x;
+			for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++)
 			{
-				if(XLATEOBJ_iXlate(ColorTranslation, DIB_8BPP_GetPixel(SourceSurf, sx, sy)) == 0)
+				if(XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_8BPP_GetPixel(BltInfo->SourceSurface, sx, sy)) == 0)
 				{
-					DIB_1BPP_PutPixel(DestSurf, i, j, 0);
+					DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 0);
 				} else {
-					DIB_1BPP_PutPixel(DestSurf, i, j, 1);
+					DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 1);
 				}
 				sx++;
 			}
@@ -277,16 +274,16 @@ DIB_1BPP_BitBltSrcCopy(
 		break;
 
 	case BMF_16BPP:
-		for (j=DestRect->top; j<DestRect->bottom; j++)
+		for (j=BltInfo->DestRect.top; j<BltInfo->DestRect.bottom; j++)
 		{
-			sx = SourcePoint->x;
-			for (i=DestRect->left; i<DestRect->right; i++)
+			sx = BltInfo->SourcePoint.x;
+			for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++)
 			{
-				if(XLATEOBJ_iXlate(ColorTranslation, DIB_16BPP_GetPixel(SourceSurf, sx, sy)) == 0)
+				if(XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_16BPP_GetPixel(BltInfo->SourceSurface, sx, sy)) == 0)
 				{
-					DIB_1BPP_PutPixel(DestSurf, i, j, 0);
+					DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 0);
 				} else {
-					DIB_1BPP_PutPixel(DestSurf, i, j, 1);
+					DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 1);
 				}
 				sx++;
 			}
@@ -295,16 +292,16 @@ DIB_1BPP_BitBltSrcCopy(
 		break;
 
 	case BMF_24BPP:
-		for (j=DestRect->top; j<DestRect->bottom; j++)
+		for (j=BltInfo->DestRect.top; j<BltInfo->DestRect.bottom; j++)
 		{
-			sx = SourcePoint->x;
-			for (i=DestRect->left; i<DestRect->right; i++)
+			sx = BltInfo->SourcePoint.x;
+			for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++)
 			{
-				if(XLATEOBJ_iXlate(ColorTranslation, DIB_24BPP_GetPixel(SourceSurf, sx, sy)) == 0)
+				if(XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_24BPP_GetPixel(BltInfo->SourceSurface, sx, sy)) == 0)
 				{
-					DIB_1BPP_PutPixel(DestSurf, i, j, 0);
+					DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 0);
 				} else {
-					DIB_1BPP_PutPixel(DestSurf, i, j, 1);
+					DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 1);
 				}
 				sx++;
 			}
@@ -313,16 +310,16 @@ DIB_1BPP_BitBltSrcCopy(
 		break;
 
 	case BMF_32BPP:
-		for (j=DestRect->top; j<DestRect->bottom; j++)
+		for (j=BltInfo->DestRect.top; j<BltInfo->DestRect.bottom; j++)
 		{
-			sx = SourcePoint->x;
-			for (i=DestRect->left; i<DestRect->right; i++)
+			sx = BltInfo->SourcePoint.x;
+			for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++)
 			{
-				if(XLATEOBJ_iXlate(ColorTranslation, DIB_32BPP_GetPixel(SourceSurf, sx, sy)) == 0)
+				if(XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_32BPP_GetPixel(BltInfo->SourceSurface, sx, sy)) == 0)
 				{
-					DIB_1BPP_PutPixel(DestSurf, i, j, 0);
+					DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 0);
 				} else {
-					DIB_1BPP_PutPixel(DestSurf, i, j, 1);
+					DIB_1BPP_PutPixel(BltInfo->DestSurface, i, j, 1);
 				}
 				sx++;
 			}
@@ -331,7 +328,7 @@ DIB_1BPP_BitBltSrcCopy(
 		break;
 
 	default:
-		DbgPrint("DIB_1BPP_BitBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat));
+		DbgPrint("DIB_1BPP_BitBlt: Unhandled Source BPP: %u\n", BitsPerFormat(BltInfo->SourceSurface->iBitmapFormat));
 		return FALSE;
 	}
 
@@ -339,99 +336,70 @@ DIB_1BPP_BitBltSrcCopy(
 }
 
 BOOLEAN
-DIB_1BPP_BitBlt(
-	SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-	PRECTL  DestRect,  POINTL  *SourcePoint,
-	BRUSHOBJ *Brush,   POINTL BrushOrigin,
-	XLATEOBJ *ColorTranslation, ULONG Rop4)
+DIB_1BPP_BitBlt(PBLTINFO BltInfo)
 {
-   ULONG X, Y, SourceX, SourceY, k;
+   ULONG DestX, DestY;
+   ULONG SourceX, SourceY;
+   ULONG PatternY = 0;
    ULONG Dest, Source = 0, Pattern = 0;
+   ULONG Index;
+   BOOLEAN UsesSource;
+   BOOLEAN UsesPattern;
    PULONG DestBits;
-   BOOL UsesSource;
-   BOOL UsesPattern;
    ULONG RoundedRight;
-   BYTE NoBits;
-   /* Pattern brushes */
-   PGDIBRUSHOBJ GdiBrush = NULL;
-   HBITMAP PatternSurface = NULL;
-   SURFOBJ *PatternObj = NULL;
-   ULONG PatternWidth = 0, PatternHeight = 0, PatternY = 0;
+/*   BYTE NoBits;*/
 
-   if (Rop4 == SRCCOPY)
-   {
-      return DIB_1BPP_BitBltSrcCopy(
-         DestSurf,
-         SourceSurf,
-         DestRect,
-         SourcePoint,
-         ColorTranslation);
-   }
+   UsesSource = ROP_USES_SOURCE(BltInfo->Rop4);
+   UsesPattern = ROP_USES_PATTERN(BltInfo->Rop4);
 
-   UsesSource = ((Rop4 & 0xCC0000) >> 2) != (Rop4 & 0x330000);
-   UsesPattern = (((Rop4 & 0xF00000) >> 4) != (Rop4 & 0x0F0000)) && Brush;  
+   RoundedRight = BltInfo->DestRect.right - 
+                  ((BltInfo->DestRect.right - BltInfo->DestRect.left) & 31);
+   SourceY = BltInfo->SourcePoint.y;
 
    if (UsesPattern)
    {
-      if (Brush->iSolidColor == 0xFFFFFFFF)
+      if (BltInfo->PatternSurface)
       {
-         PBITMAPOBJ PatternBitmap;
-
-         GdiBrush = CONTAINING_RECORD(
-            Brush,
-            GDIBRUSHOBJ,
-            BrushObject);
-
-         PatternSurface = GdiBrush->hbmPattern;
-         PatternBitmap = BITMAPOBJ_LockBitmap(GdiBrush->hbmPattern);
-
-         PatternObj = &PatternBitmap->SurfObj;
-         PatternWidth = PatternObj->sizlBitmap.cx;
-         PatternHeight = PatternObj->sizlBitmap.cy;
-         
-         UsesPattern = TRUE;
+         PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % 
+                    BltInfo->PatternSurface->sizlBitmap.cy;
       }
       else
       {
-         UsesPattern = FALSE;
-         Pattern = Brush->iSolidColor;
+         /* FIXME: Shouldn't it be expanded? */
+         Pattern = BltInfo->Brush->iSolidColor;
       }
    }
 
-   RoundedRight = DestRect->right - ((DestRect->right - DestRect->left) & 31);
-   SourceY = SourcePoint->y;
-   
-   for (Y = DestRect->top; Y < DestRect->bottom; Y++)
+   for (DestY = BltInfo->DestRect.top; DestY < BltInfo->DestRect.bottom; DestY++)
    {
-      SourceX = SourcePoint->x;
+      DestX = BltInfo->DestRect.left;
+      SourceX = BltInfo->SourcePoint.x;
       DestBits = (PULONG)(
-         DestSurf->pvScan0 +
-         (DestRect->left >> 3) +
-         Y * DestSurf->lDelta);
+         BltInfo->DestSurface->pvScan0 +
+         (BltInfo->DestRect.left >> 3) +
+         DestY * BltInfo->DestSurface->lDelta);
 
-      if(UsesPattern)
-        PatternY = (Y + BrushOrigin.y) % PatternHeight;
-
-      X = DestRect->left;
-      if (X & 31)
+      if (DestX & 31)
       {
+#if 0
          /* FIXME: This case is completely untested!!! */
          
          Dest = *((PBYTE)DestBits);
-         NoBits = 31 - (X & 31);
+         NoBits = 31 - (DestX & 31);
 
          if (UsesSource)
          {
             Source = 0;
-            for (k = 31 - NoBits; k < NoBits; k++)
-               Source |= (DIB_GetSource(SourceSurf, SourceX + k, SourceY, ColorTranslation) << (31 - k));
+            /* FIXME: This is incorrect! */
+            for (Index = 31 - NoBits; Index >= 0; Index++)
+               Source |= (DIB_GetSource(SourceSurf, SourceX + Index, SourceY, ColorTranslation) << (31 - Index));
          }
 
-         if (UsesPattern)
+         if (BltInfo->PatternSurface)
          {
             Pattern = 0;
-            for (k = 31 - NoBits; k < NoBits; k++)
-               Pattern |= (DIB_1BPP_GetPixel(PatternObj, (X + BrushOrigin.x + k) % PatternWidth, PatternY) << (31 - k));
+            for (k = 31 - NoBits; k >= 0; k++)
+               Pattern |= (DIB_GetSource(PatternObj, (X + BrushOrigin.x + k) % PatternWidth, PatternY, BltInfo->XlatePatternToDest) << (31 - k));
          }
 
          Dest = DIB_DoRop(Rop4, Dest, Source, Pattern);	    
@@ -440,69 +408,72 @@ DIB_1BPP_BitBlt(
 
          *DestBits = Dest;
          
-         X += NoBits;
+         DestX += NoBits;
          SourceX += NoBits;
+#endif
       }
 
-      for (; X < RoundedRight; X += 32, DestBits++, SourceX++)
+      for (; DestX < RoundedRight; DestX += 32, DestBits++, SourceX++)
       {
          Dest = *DestBits;
 
          if (UsesSource)
          {
             Source = 0;
-            for (k = 0; k < 8; k++)
+            for (Index = 0; Index < 8; Index++)
             {
-               Source |= (DIB_GetSource(SourceSurf, SourceX + k, SourceY, ColorTranslation) << (7 - k));
-               Source |= (DIB_GetSource(SourceSurf, SourceX + k + 8, SourceY, ColorTranslation) << (8 + (7 - k)));
-               Source |= (DIB_GetSource(SourceSurf, SourceX + k + 16, SourceY, ColorTranslation) << (16 + (7 - k)));
-               Source |= (DIB_GetSource(SourceSurf, SourceX + k + 24, SourceY, ColorTranslation) << (24 + (7 - k)));
+               Source |= DIB_GetSource(BltInfo->SourceSurface, SourceX + Index, SourceY, BltInfo->XlateSourceToDest) << (7 - Index);
+               Source |= DIB_GetSource(BltInfo->SourceSurface, SourceX + Index + 8, SourceY, BltInfo->XlateSourceToDest) << (8 + (7 - Index));
+               Source |= DIB_GetSource(BltInfo->SourceSurface, SourceX + Index + 16, SourceY, BltInfo->XlateSourceToDest) << (16 + (7 - Index));
+               Source |= DIB_GetSource(BltInfo->SourceSurface, SourceX + Index + 24, SourceY, BltInfo->XlateSourceToDest) << (24 + (7 - Index));
             }
          }
 
-         if (UsesPattern)
+         if (BltInfo->PatternSurface)
          {
             Pattern = 0;
-            for (k = 0; k < 8; k++)
+            for (Index = 0; Index < 8; Index++)
             {
-               Pattern |= (DIB_1BPP_GetPixel(PatternObj, (X + BrushOrigin.x + k) % PatternWidth, PatternY) << (7 - k));
-               Pattern |= (DIB_1BPP_GetPixel(PatternObj, (X + BrushOrigin.x + k + 8) % PatternWidth, PatternY) << (8 + (7 - k)));
-               Pattern |= (DIB_1BPP_GetPixel(PatternObj, (X + BrushOrigin.x + k + 16) % PatternWidth, PatternY) << (16 + (7 - k)));
-               Pattern |= (DIB_1BPP_GetPixel(PatternObj, (X + BrushOrigin.x + k + 24) % PatternWidth, PatternY) << (24 + (7 - k)));
+               Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + Index) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << (7 - Index);
+               Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + Index + 8) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << (8 + (7 - Index));
+               Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + Index + 16) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << (16 + (7 - Index));
+               Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + Index + 24) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << (24 + (7 - Index));
             }
          }
 
-         *DestBits = DIB_DoRop(Rop4, Dest, Source, Pattern);	    
+         *DestBits = DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern);	    
       }
 
-      if (X < DestRect->right)
+      if (DestX < BltInfo->DestRect.right)
       {
 //         Dest = *DestBits;
-         for (; X < DestRect->right; X++, SourceX++)
+         for (; DestX < BltInfo->DestRect.right; DestX++, SourceX++)
          {
 //            Dest = *DestBits;
-            Dest = DIB_1BPP_GetPixel(DestSurf, X, Y);
+            Dest = DIB_1BPP_GetPixel(BltInfo->DestSurface, DestX, DestY);
 
             if (UsesSource)
             {
-               Source = DIB_GetSource(SourceSurf, SourceX, SourceY, ColorTranslation);
+               Source = DIB_GetSource(BltInfo->SourceSurface, SourceX, SourceY, BltInfo->XlateSourceToDest);
             }
 
-            if (UsesPattern)
+            if (BltInfo->PatternSurface)
             {
-               Pattern = DIB_1BPP_GetPixel(PatternObj, (X + BrushOrigin.x) % PatternWidth, PatternY);
+               Pattern = DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest);
             }
 
-            DIB_1BPP_PutPixel(DestSurf, X, Y, DIB_DoRop(Rop4, Dest, Source, Pattern) & 0xF);
+            DIB_1BPP_PutPixel(BltInfo->DestSurface, DestX, DestY, DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern) & 0xF);
 //            Dest >>= 1;
          }
       }
 
       SourceY++;
+      if (BltInfo->PatternSurface)
+      {
+         PatternY++;
+         PatternY %= BltInfo->PatternSurface->sizlBitmap.cy;
+      }
    }
-
-   if (PatternSurface != NULL)
-      BITMAPOBJ_UnlockBitmap(PatternSurface);
   
    return TRUE;
 }
diff --git a/reactos/subsys/win32k/dib/dib24bpp.c b/reactos/subsys/win32k/dib/dib24bpp.c
index 9d158967ab6..7b7ebabba0d 100644
--- a/reactos/subsys/win32k/dib/dib24bpp.c
+++ b/reactos/subsys/win32k/dib/dib24bpp.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dib24bpp.c,v 1.30 2004/07/03 17:40:24 navaraf Exp $ */
+/* $Id: dib24bpp.c,v 1.31 2004/07/14 20:48:56 navaraf Exp $ */
 #include <w32k.h>
 
 VOID
@@ -66,33 +66,31 @@ DIB_24BPP_VLine(SURFOBJ *SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
 }
 
 BOOLEAN
-DIB_24BPP_BitBltSrcCopy(  SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-		          PRECTL  DestRect,  POINTL  *SourcePoint,
-		          XLATEOBJ *ColorTranslation)
+DIB_24BPP_BitBltSrcCopy(PBLTINFO BltInfo)
 {
   LONG     i, j, sx, sy, xColor, f1;
   PBYTE    SourceBits, DestBits, SourceLine, DestLine;
   PBYTE    SourceBits_4BPP, SourceLine_4BPP;
   PWORD    SourceBits_16BPP, SourceLine_16BPP;
 
-  DestBits = DestSurf->pvScan0 + (DestRect->top * DestSurf->lDelta) + DestRect->left * 3;
+  DestBits = BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.top * BltInfo->DestSurface->lDelta) + BltInfo->DestRect.left * 3;
 
-  switch(SourceSurf->iBitmapFormat)
+  switch(BltInfo->SourceSurface->iBitmapFormat)
   {
     case BMF_1BPP:
-      sx = SourcePoint->x;
-      sy = SourcePoint->y;
+      sx = BltInfo->SourcePoint.x;
+      sy = BltInfo->SourcePoint.y;
 
-      for (j=DestRect->top; j<DestRect->bottom; j++)
+      for (j=BltInfo->DestRect.top; j<BltInfo->DestRect.bottom; j++)
       {
-        sx = SourcePoint->x;
-        for (i=DestRect->left; i<DestRect->right; i++)
+        sx = BltInfo->SourcePoint.x;
+        for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++)
         {
-          if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0)
+          if(DIB_1BPP_GetPixel(BltInfo->SourceSurface, sx, sy) == 0)
           {
-            DIB_24BPP_PutPixel(DestSurf, i, j, XLATEOBJ_iXlate(ColorTranslation, 0));
+            DIB_24BPP_PutPixel(BltInfo->DestSurface, i, j, XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, 0));
           } else {
-            DIB_24BPP_PutPixel(DestSurf, i, j, XLATEOBJ_iXlate(ColorTranslation, 1));
+            DIB_24BPP_PutPixel(BltInfo->DestSurface, i, j, XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, 1));
           }
           sx++;
         }
@@ -101,18 +99,18 @@ DIB_24BPP_BitBltSrcCopy(  SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       break;
 
     case BMF_4BPP:
-      SourceBits_4BPP = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + (SourcePoint->x >> 1);
+      SourceBits_4BPP = BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + (BltInfo->SourcePoint.x >> 1);
 
-      for (j=DestRect->top; j<DestRect->bottom; j++)
+      for (j=BltInfo->DestRect.top; j<BltInfo->DestRect.bottom; j++)
       {
         SourceLine_4BPP = SourceBits_4BPP;
         DestLine = DestBits;
-        sx = SourcePoint->x;
+        sx = BltInfo->SourcePoint.x;
         f1 = sx & 1;
 
-        for (i=DestRect->left; i<DestRect->right; i++)
+        for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++)
         {
-          xColor = XLATEOBJ_iXlate(ColorTranslation,
+          xColor = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest,
               (*SourceLine_4BPP & altnotmask[f1]) >> (4 * (1 - f1)));
           *DestLine++ = xColor & 0xff;
           *(PWORD)DestLine = xColor >> 8;
@@ -121,114 +119,114 @@ DIB_24BPP_BitBltSrcCopy(  SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
           sx++;
         }
 
-        SourceBits_4BPP += SourceSurf->lDelta;
-        DestBits += DestSurf->lDelta;
+        SourceBits_4BPP += BltInfo->SourceSurface->lDelta;
+        DestBits += BltInfo->DestSurface->lDelta;
       }
       break;
 
     case BMF_8BPP:
-      SourceLine = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + SourcePoint->x;
+      SourceLine = BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + BltInfo->SourcePoint.x;
       DestLine = DestBits;
 
-      for (j = DestRect->top; j < DestRect->bottom; j++)
+      for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++)
       {
         SourceBits = SourceLine;
         DestBits = DestLine;
 
-        for (i = DestRect->left; i < DestRect->right; i++)
+        for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++)
         {
-          xColor = XLATEOBJ_iXlate(ColorTranslation, *SourceBits);
+          xColor = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *SourceBits);
           *DestBits = xColor & 0xff;
           *(PWORD)(DestBits + 1) = xColor >> 8;
           SourceBits += 1;
 	  DestBits += 3;
         }
 
-        SourceLine += SourceSurf->lDelta;
-        DestLine += DestSurf->lDelta;
+        SourceLine += BltInfo->SourceSurface->lDelta;
+        DestLine += BltInfo->DestSurface->lDelta;
       }
       break;
 
     case BMF_16BPP:
-      SourceBits_16BPP = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + 2 * SourcePoint->x;
+      SourceBits_16BPP = BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + 2 * BltInfo->SourcePoint.x;
 
-      for (j=DestRect->top; j<DestRect->bottom; j++)
+      for (j=BltInfo->DestRect.top; j<BltInfo->DestRect.bottom; j++)
       {
         SourceLine_16BPP = SourceBits_16BPP;
         DestLine = DestBits;
 
-        for (i=DestRect->left; i<DestRect->right; i++)
+        for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++)
         {
-          xColor = XLATEOBJ_iXlate(ColorTranslation, *SourceLine_16BPP);
+          xColor = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *SourceLine_16BPP);
           *DestLine++ = xColor & 0xff;
           *(PWORD)DestLine = xColor >> 8;
           DestLine += 2;
           SourceLine_16BPP++;
         }
 
-        SourceBits_16BPP = (PWORD)((PBYTE)SourceBits_16BPP + SourceSurf->lDelta);
-        DestBits += DestSurf->lDelta;
+        SourceBits_16BPP = (PWORD)((PBYTE)SourceBits_16BPP + BltInfo->SourceSurface->lDelta);
+        DestBits += BltInfo->DestSurface->lDelta;
       }
       break;
 
     case BMF_24BPP:
-      if (NULL == ColorTranslation || 0 != (ColorTranslation->flXlate & XO_TRIVIAL))
+      if (NULL == BltInfo->XlateSourceToDest || 0 != (BltInfo->XlateSourceToDest->flXlate & XO_TRIVIAL))
       {
-	if (DestRect->top < SourcePoint->y)
+	if (BltInfo->DestRect.top < BltInfo->SourcePoint.y)
 	  {
-	    SourceBits = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + 3 * SourcePoint->x;
-	    for (j = DestRect->top; j < DestRect->bottom; j++)
+	    SourceBits = BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + 3 * BltInfo->SourcePoint.x;
+	    for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++)
 	      {
-		RtlMoveMemory(DestBits, SourceBits, 3 * (DestRect->right - DestRect->left));
-		SourceBits += SourceSurf->lDelta;
-		DestBits += DestSurf->lDelta;
+		RtlMoveMemory(DestBits, SourceBits, 3 * (BltInfo->DestRect.right - BltInfo->DestRect.left));
+		SourceBits += BltInfo->SourceSurface->lDelta;
+		DestBits += BltInfo->DestSurface->lDelta;
 	      }
 	  }
 	else
 	  {
-	    SourceBits = SourceSurf->pvScan0 + ((SourcePoint->y + DestRect->bottom - DestRect->top - 1) * SourceSurf->lDelta) + 3 * SourcePoint->x;
-	    DestBits = DestSurf->pvScan0 + ((DestRect->bottom - 1) * DestSurf->lDelta) + 3 * DestRect->left;
-	    for (j = DestRect->bottom - 1; DestRect->top <= j; j--)
+	    SourceBits = BltInfo->SourceSurface->pvScan0 + ((BltInfo->SourcePoint.y + BltInfo->DestRect.bottom - BltInfo->DestRect.top - 1) * BltInfo->SourceSurface->lDelta) + 3 * BltInfo->SourcePoint.x;
+	    DestBits = BltInfo->DestSurface->pvScan0 + ((BltInfo->DestRect.bottom - 1) * BltInfo->DestSurface->lDelta) + 3 * BltInfo->DestRect.left;
+	    for (j = BltInfo->DestRect.bottom - 1; BltInfo->DestRect.top <= j; j--)
 	      {
-		RtlMoveMemory(DestBits, SourceBits, 3 * (DestRect->right - DestRect->left));
-		SourceBits -= SourceSurf->lDelta;
-		DestBits -= DestSurf->lDelta;
+		RtlMoveMemory(DestBits, SourceBits, 3 * (BltInfo->DestRect.right - BltInfo->DestRect.left));
+		SourceBits -= BltInfo->SourceSurface->lDelta;
+		DestBits -= BltInfo->DestSurface->lDelta;
 	      }
 	  }
       }
       else
       {
 	/* FIXME */
-	DPRINT1("DIB_24BPP_Bitblt: Unhandled ColorTranslation for 16 -> 16 copy\n");
+	DPRINT1("DIB_24BPP_Bitblt: Unhandled BltInfo->XlateSourceToDest for 16 -> 16 copy\n");
         return FALSE;
       }
       break;
 
     case BMF_32BPP:
-      SourceLine = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + 4 * SourcePoint->x;
+      SourceLine = BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + 4 * BltInfo->SourcePoint.x;
       DestLine = DestBits;
 
-      for (j = DestRect->top; j < DestRect->bottom; j++)
+      for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++)
       {
         SourceBits = SourceLine;
         DestBits = DestLine;
 
-        for (i = DestRect->left; i < DestRect->right; i++)
+        for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++)
         {
-          xColor = XLATEOBJ_iXlate(ColorTranslation, *((PDWORD) SourceBits));
+          xColor = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *((PDWORD) SourceBits));
           *DestBits = xColor & 0xff;
           *(PWORD)(DestBits + 1) = xColor >> 8;
           SourceBits += 4;
 	  DestBits += 3;
         }
 
-        SourceLine += SourceSurf->lDelta;
-        DestLine += DestSurf->lDelta;
+        SourceLine += BltInfo->SourceSurface->lDelta;
+        DestLine += BltInfo->DestSurface->lDelta;
       }
       break;
 
     default:
-      DbgPrint("DIB_24BPP_Bitblt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat));
+      DbgPrint("DIB_24BPP_Bitblt: Unhandled Source BPP: %u\n", BitsPerFormat(BltInfo->SourceSurface->iBitmapFormat));
       return FALSE;
   }
 
@@ -236,102 +234,70 @@ DIB_24BPP_BitBltSrcCopy(  SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
 }
 
 BOOLEAN
-DIB_24BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-		 PRECTL  DestRect,  POINTL  *SourcePoint,
-		 BRUSHOBJ *Brush,   POINTL BrushOrigin,
-		 XLATEOBJ *ColorTranslation, ULONG Rop4)
+DIB_24BPP_BitBlt(PBLTINFO BltInfo)
 {
-   ULONG X, Y;
+   ULONG DestX, DestY;
    ULONG SourceX, SourceY;
+   ULONG PatternY = 0;
    ULONG Dest, Source = 0, Pattern = 0;
-   PBYTE DestBits;
    BOOL UsesSource;
    BOOL UsesPattern;
-   /* Pattern brushes */
-   PGDIBRUSHOBJ GdiBrush = NULL;
-   HBITMAP PatternSurface = NULL;
-   SURFOBJ *PatternObj = NULL;
-   ULONG PatternWidth = 0, PatternHeight = 0, PatternY = 0;
+   PBYTE DestBits;
 
-   if (Rop4 == SRCCOPY)
-   {
-      return DIB_24BPP_BitBltSrcCopy(
-         DestSurf,
-         SourceSurf,
-         DestRect,
-         SourcePoint,
-         ColorTranslation);
-   }
-
-   UsesSource = ((Rop4 & 0xCC0000) >> 2) != (Rop4 & 0x330000);
-   UsesPattern = (((Rop4 & 0xF00000) >> 4) != (Rop4 & 0x0F0000)) && Brush;  
+   UsesSource = ROP_USES_SOURCE(BltInfo->Rop4);
+   UsesPattern = ROP_USES_PATTERN(BltInfo->Rop4);
       
+   SourceY = BltInfo->SourcePoint.y;
+   DestBits = (PBYTE)(
+      BltInfo->DestSurface->pvScan0 +
+      (BltInfo->DestRect.left << 1) + BltInfo->DestRect.left +
+      BltInfo->DestRect.top * BltInfo->DestSurface->lDelta);
+
    if (UsesPattern)
    {
-      if (Brush->iSolidColor == 0xFFFFFFFF)
+      if (BltInfo->PatternSurface)
       {
-         PBITMAPOBJ PatternBitmap;
-
-         GdiBrush = CONTAINING_RECORD(
-            Brush,
-            GDIBRUSHOBJ,
-            BrushObject);
-
-         PatternSurface = GdiBrush->hbmPattern;
-         PatternBitmap = BITMAPOBJ_LockBitmap(GdiBrush->hbmPattern);
-
-         PatternObj = &PatternBitmap->SurfObj;
-         PatternWidth = PatternObj->sizlBitmap.cx;
-         PatternHeight = PatternObj->sizlBitmap.cy;
-         
-         UsesPattern = TRUE;
+         PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % 
+                    BltInfo->PatternSurface->sizlBitmap.cy;
       }
       else
       {
-         UsesPattern = FALSE;
-         Pattern = Brush->iSolidColor;
+         Pattern = BltInfo->Brush->iSolidColor;
       }
    }
 
-   SourceY = SourcePoint->y;
-   DestBits = (PBYTE)(
-      DestSurf->pvScan0 +
-      (DestRect->left << 1) + DestRect->left +
-      DestRect->top * DestSurf->lDelta);
-
-   for (Y = DestRect->top; Y < DestRect->bottom; Y++)
+   for (DestY = BltInfo->DestRect.top; DestY < BltInfo->DestRect.bottom; DestY++)
    {
-      SourceX = SourcePoint->x;
+      SourceX = BltInfo->SourcePoint.x;
       
-      if(UsesPattern)
-        PatternY = (Y + BrushOrigin.y) % PatternHeight;
-      
-      for (X = DestRect->left; X < DestRect->right; X++, DestBits += 3, SourceX++)
+      for (DestX = BltInfo->DestRect.left; DestX < BltInfo->DestRect.right; DestX++, DestBits += 3, SourceX++)
       {
          Dest = *((PUSHORT)DestBits) + (*(DestBits + 2) << 16);
  
          if (UsesSource)
          {
-            Source = DIB_GetSource(SourceSurf, SourceX, SourceY, ColorTranslation);
+            Source = DIB_GetSource(BltInfo->SourceSurface, SourceX, SourceY, BltInfo->XlateSourceToDest);
          }
 
-         if (UsesPattern)
+         if (BltInfo->PatternSurface)
 	 {
-            Pattern = DIB_1BPP_GetPixel(PatternObj, (X + BrushOrigin.x) % PatternWidth, PatternY) ? GdiBrush->crFore : GdiBrush->crBack;
+            Pattern = DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest);
          }
 
-         Dest = DIB_DoRop(Rop4, Dest, Source, Pattern) & 0xFFFFFF;
+         Dest = DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern) & 0xFFFFFF;
          *(PUSHORT)(DestBits) = Dest & 0xFFFF;
          *(DestBits + 2) = Dest >> 16;
       }
 
       SourceY++;
-      DestBits -= (DestRect->right - DestRect->left) * 3;
-      DestBits += DestSurf->lDelta;
+      if (BltInfo->PatternSurface)
+      {
+         PatternY++;
+         PatternY %= BltInfo->PatternSurface->sizlBitmap.cy;
+      }
+      DestBits -= (BltInfo->DestRect.right - BltInfo->DestRect.left) * 3;
+      DestBits += BltInfo->DestSurface->lDelta;
    }
-
-   if (PatternSurface != NULL)
-      BITMAPOBJ_UnlockBitmap(PatternSurface);
   
    return TRUE;
 }
diff --git a/reactos/subsys/win32k/dib/dib32bpp.c b/reactos/subsys/win32k/dib/dib32bpp.c
index a9ffaaf613c..7b9d490698b 100644
--- a/reactos/subsys/win32k/dib/dib32bpp.c
+++ b/reactos/subsys/win32k/dib/dib32bpp.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dib32bpp.c,v 1.29 2004/07/03 17:40:24 navaraf Exp $ */
+/* $Id: dib32bpp.c,v 1.30 2004/07/14 20:48:56 navaraf Exp $ */
 #include <w32k.h>
 
 VOID
@@ -67,33 +67,31 @@ DIB_32BPP_VLine(SURFOBJ *SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
 }
 
 BOOLEAN
-DIB_32BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-		        PRECTL  DestRect,  POINTL  *SourcePoint,
-		        XLATEOBJ *ColorTranslation)
+DIB_32BPP_BitBltSrcCopy(PBLTINFO BltInfo)
 {
   LONG     i, j, sx, sy, xColor, f1;
   PBYTE    SourceBits, DestBits, SourceLine, DestLine;
   PBYTE    SourceBits_4BPP, SourceLine_4BPP;
   PDWORD   Source32, Dest32;
 
-  DestBits = DestSurf->pvScan0 + (DestRect->top * DestSurf->lDelta) + 4 * DestRect->left;
+  DestBits = BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.top * BltInfo->DestSurface->lDelta) + 4 * BltInfo->DestRect.left;
 
-  switch(SourceSurf->iBitmapFormat)
+  switch(BltInfo->SourceSurface->iBitmapFormat)
   {
     case BMF_1BPP:
-      sx = SourcePoint->x;
-      sy = SourcePoint->y;
+      sx = BltInfo->SourcePoint.x;
+      sy = BltInfo->SourcePoint.y;
 
-      for (j=DestRect->top; j<DestRect->bottom; j++)
+      for (j=BltInfo->DestRect.top; j<BltInfo->DestRect.bottom; j++)
       {
-        sx = SourcePoint->x;
-        for (i=DestRect->left; i<DestRect->right; i++)
+        sx = BltInfo->SourcePoint.x;
+        for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++)
         {
-          if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0)
+          if(DIB_1BPP_GetPixel(BltInfo->SourceSurface, sx, sy) == 0)
           {
-            DIB_32BPP_PutPixel(DestSurf, i, j, XLATEOBJ_iXlate(ColorTranslation, 0));
+            DIB_32BPP_PutPixel(BltInfo->DestSurface, i, j, XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, 0));
           } else {
-            DIB_32BPP_PutPixel(DestSurf, i, j, XLATEOBJ_iXlate(ColorTranslation, 1));
+            DIB_32BPP_PutPixel(BltInfo->DestSurface, i, j, XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, 1));
           }
           sx++;
         }
@@ -102,182 +100,182 @@ DIB_32BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       break;
 
     case BMF_4BPP:
-      SourceBits_4BPP = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + (SourcePoint->x >> 1);
+      SourceBits_4BPP = BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + (BltInfo->SourcePoint.x >> 1);
 
-      for (j=DestRect->top; j<DestRect->bottom; j++)
+      for (j=BltInfo->DestRect.top; j<BltInfo->DestRect.bottom; j++)
       {
         SourceLine_4BPP = SourceBits_4BPP;
-        sx = SourcePoint->x;
+        sx = BltInfo->SourcePoint.x;
         f1 = sx & 1;
 
-        for (i=DestRect->left; i<DestRect->right; i++)
+        for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++)
         {
-          xColor = XLATEOBJ_iXlate(ColorTranslation,
+          xColor = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest,
               (*SourceLine_4BPP & altnotmask[f1]) >> (4 * (1 - f1)));
-          DIB_32BPP_PutPixel(DestSurf, i, j, xColor);
+          DIB_32BPP_PutPixel(BltInfo->DestSurface, i, j, xColor);
           if(f1 == 1) { SourceLine_4BPP++; f1 = 0; } else { f1 = 1; }
           sx++;
         }
 
-        SourceBits_4BPP += SourceSurf->lDelta;
+        SourceBits_4BPP += BltInfo->SourceSurface->lDelta;
       }
       break;
 
     case BMF_8BPP:
-      SourceLine = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + SourcePoint->x;
+      SourceLine = BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + BltInfo->SourcePoint.x;
       DestLine = DestBits;
 
-      for (j = DestRect->top; j < DestRect->bottom; j++)
+      for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++)
       {
         SourceBits = SourceLine;
         DestBits = DestLine;
 
-        for (i = DestRect->left; i < DestRect->right; i++)
+        for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++)
         {
           xColor = *SourceBits;
-          *((PDWORD) DestBits) = (DWORD)XLATEOBJ_iXlate(ColorTranslation, xColor);
+          *((PDWORD) DestBits) = (DWORD)XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor);
           SourceBits += 1;
 	  DestBits += 4;
         }
 
-        SourceLine += SourceSurf->lDelta;
-        DestLine += DestSurf->lDelta;
+        SourceLine += BltInfo->SourceSurface->lDelta;
+        DestLine += BltInfo->DestSurface->lDelta;
       }
       break;
 
     case BMF_16BPP:
-      SourceLine = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + 2 * SourcePoint->x;
+      SourceLine = BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + 2 * BltInfo->SourcePoint.x;
       DestLine = DestBits;
 
-      for (j = DestRect->top; j < DestRect->bottom; j++)
+      for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++)
       {
         SourceBits = SourceLine;
         DestBits = DestLine;
 
-        for (i = DestRect->left; i < DestRect->right; i++)
+        for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++)
         {
           xColor = *((PWORD) SourceBits);
-          *((PDWORD) DestBits) = (DWORD)XLATEOBJ_iXlate(ColorTranslation, xColor);
+          *((PDWORD) DestBits) = (DWORD)XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor);
           SourceBits += 2;
 	  DestBits += 4;
         }
 
-        SourceLine += SourceSurf->lDelta;
-        DestLine += DestSurf->lDelta;
+        SourceLine += BltInfo->SourceSurface->lDelta;
+        DestLine += BltInfo->DestSurface->lDelta;
       }
       break;
 
     case BMF_24BPP:
-      SourceLine = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + 3 * SourcePoint->x;
+      SourceLine = BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + 3 * BltInfo->SourcePoint.x;
       DestLine = DestBits;
 
-      for (j = DestRect->top; j < DestRect->bottom; j++)
+      for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++)
       {
         SourceBits = SourceLine;
         DestBits = DestLine;
 
-        for (i = DestRect->left; i < DestRect->right; i++)
+        for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++)
         {
           xColor = (*(SourceBits + 2) << 0x10) +
              (*(SourceBits + 1) << 0x08) +
              (*(SourceBits));
-          *((PDWORD)DestBits) = (DWORD)XLATEOBJ_iXlate(ColorTranslation, xColor);
+          *((PDWORD)DestBits) = (DWORD)XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor);
           SourceBits += 3;
 	  DestBits += 4;
         }
 
-        SourceLine += SourceSurf->lDelta;
-        DestLine += DestSurf->lDelta;
+        SourceLine += BltInfo->SourceSurface->lDelta;
+        DestLine += BltInfo->DestSurface->lDelta;
       }
       break;
 
     case BMF_32BPP:
-      if (NULL == ColorTranslation || 0 != (ColorTranslation->flXlate & XO_TRIVIAL))
+      if (NULL == BltInfo->XlateSourceToDest || 0 != (BltInfo->XlateSourceToDest->flXlate & XO_TRIVIAL))
       {
-	if (DestRect->top < SourcePoint->y)
+	if (BltInfo->DestRect.top < BltInfo->SourcePoint.y)
 	  {
-	    SourceBits = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + 4 * SourcePoint->x;
-	    for (j = DestRect->top; j < DestRect->bottom; j++)
+	    SourceBits = BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + 4 * BltInfo->SourcePoint.x;
+	    for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++)
 	      {
-		RtlMoveMemory(DestBits, SourceBits, 4 * (DestRect->right - DestRect->left));
-		SourceBits += SourceSurf->lDelta;
-		DestBits += DestSurf->lDelta;
+		RtlMoveMemory(DestBits, SourceBits, 4 * (BltInfo->DestRect.right - BltInfo->DestRect.left));
+		SourceBits += BltInfo->SourceSurface->lDelta;
+		DestBits += BltInfo->DestSurface->lDelta;
 	      }
 	  }
 	else
 	  {
-	    SourceBits = SourceSurf->pvScan0 + ((SourcePoint->y + DestRect->bottom - DestRect->top - 1) * SourceSurf->lDelta) + 4 * SourcePoint->x;
-	    DestBits = DestSurf->pvScan0 + ((DestRect->bottom - 1) * DestSurf->lDelta) + 4 * DestRect->left;
-	    for (j = DestRect->bottom - 1; DestRect->top <= j; j--)
+	    SourceBits = BltInfo->SourceSurface->pvScan0 + ((BltInfo->SourcePoint.y + BltInfo->DestRect.bottom - BltInfo->DestRect.top - 1) * BltInfo->SourceSurface->lDelta) + 4 * BltInfo->SourcePoint.x;
+	    DestBits = BltInfo->DestSurface->pvScan0 + ((BltInfo->DestRect.bottom - 1) * BltInfo->DestSurface->lDelta) + 4 * BltInfo->DestRect.left;
+	    for (j = BltInfo->DestRect.bottom - 1; BltInfo->DestRect.top <= j; j--)
 	      {
-		RtlMoveMemory(DestBits, SourceBits, 4 * (DestRect->right - DestRect->left));
-		SourceBits -= SourceSurf->lDelta;
-		DestBits -= DestSurf->lDelta;
+		RtlMoveMemory(DestBits, SourceBits, 4 * (BltInfo->DestRect.right - BltInfo->DestRect.left));
+		SourceBits -= BltInfo->SourceSurface->lDelta;
+		DestBits -= BltInfo->DestSurface->lDelta;
 	      }
 	  }
       }
       else
       {
-	if (DestRect->top < SourcePoint->y)
+	if (BltInfo->DestRect.top < BltInfo->SourcePoint.y)
 	  {
-	    SourceBits = (SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + 4 * SourcePoint->x);
-	    for (j = DestRect->top; j < DestRect->bottom; j++)
+	    SourceBits = (BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + 4 * BltInfo->SourcePoint.x);
+	    for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++)
 	      {
-                if (DestRect->left < SourcePoint->x)
+                if (BltInfo->DestRect.left < BltInfo->SourcePoint.x)
                   {
                     Dest32 = (DWORD *) DestBits;
                     Source32 = (DWORD *) SourceBits;
-                    for (i = DestRect->left; i < DestRect->right; i++)
+                    for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++)
                       {
-                        *Dest32++ = XLATEOBJ_iXlate(ColorTranslation, *Source32++);
+                        *Dest32++ = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *Source32++);
                       }
                   }
                 else
                   {
-                    Dest32 = (DWORD *) DestBits + (DestRect->right - DestRect->left - 1);
-                    Source32 = (DWORD *) SourceBits + (DestRect->right - DestRect->left - 1);
-                    for (i = DestRect->right - 1; DestRect->left <= i; i--)
+                    Dest32 = (DWORD *) DestBits + (BltInfo->DestRect.right - BltInfo->DestRect.left - 1);
+                    Source32 = (DWORD *) SourceBits + (BltInfo->DestRect.right - BltInfo->DestRect.left - 1);
+                    for (i = BltInfo->DestRect.right - 1; BltInfo->DestRect.left <= i; i--)
                       {
-                        *Dest32-- = XLATEOBJ_iXlate(ColorTranslation, *Source32--);
+                        *Dest32-- = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *Source32--);
                       }
                   }
-		SourceBits += SourceSurf->lDelta;
-		DestBits += DestSurf->lDelta;
+		SourceBits += BltInfo->SourceSurface->lDelta;
+		DestBits += BltInfo->DestSurface->lDelta;
 	      }
 	  }
 	else
 	  {
-	    SourceBits = SourceSurf->pvScan0 + ((SourcePoint->y + DestRect->bottom - DestRect->top - 1) * SourceSurf->lDelta) + 4 * SourcePoint->x;
-	    DestBits = DestSurf->pvScan0 + ((DestRect->bottom - 1) * DestSurf->lDelta) + 4 * DestRect->left;
-	    for (j = DestRect->bottom - 1; DestRect->top <= j; j--)
+	    SourceBits = BltInfo->SourceSurface->pvScan0 + ((BltInfo->SourcePoint.y + BltInfo->DestRect.bottom - BltInfo->DestRect.top - 1) * BltInfo->SourceSurface->lDelta) + 4 * BltInfo->SourcePoint.x;
+	    DestBits = BltInfo->DestSurface->pvScan0 + ((BltInfo->DestRect.bottom - 1) * BltInfo->DestSurface->lDelta) + 4 * BltInfo->DestRect.left;
+	    for (j = BltInfo->DestRect.bottom - 1; BltInfo->DestRect.top <= j; j--)
 	      {
-                if (DestRect->left < SourcePoint->x)
+                if (BltInfo->DestRect.left < BltInfo->SourcePoint.x)
                   {
                     Dest32 = (DWORD *) DestBits;
                     Source32 = (DWORD *) SourceBits;
-                    for (i = DestRect->left; i < DestRect->right; i++)
+                    for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++)
                       {
-                        *Dest32++ = XLATEOBJ_iXlate(ColorTranslation, *Source32++);
+                        *Dest32++ = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *Source32++);
                       }
                   }
                 else
                   {
-                    Dest32 = (DWORD *) DestBits + (DestRect->right - DestRect->left - 1);
-                    Source32 = (DWORD *) SourceBits + (DestRect->right - DestRect->left - 1);
-                    for (i = DestRect->right; DestRect->left < i; i--)
+                    Dest32 = (DWORD *) DestBits + (BltInfo->DestRect.right - BltInfo->DestRect.left - 1);
+                    Source32 = (DWORD *) SourceBits + (BltInfo->DestRect.right - BltInfo->DestRect.left - 1);
+                    for (i = BltInfo->DestRect.right; BltInfo->DestRect.left < i; i--)
                       {
-                        *Dest32-- = XLATEOBJ_iXlate(ColorTranslation, *Source32--);
+                        *Dest32-- = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *Source32--);
                       }
                   }
-		SourceBits -= SourceSurf->lDelta;
-		DestBits -= DestSurf->lDelta;
+		SourceBits -= BltInfo->SourceSurface->lDelta;
+		DestBits -= BltInfo->DestSurface->lDelta;
 	      }
 	  }
       }
       break;
 
     default:
-      DPRINT1("DIB_32BPP_Bitblt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat));
+      DPRINT1("DIB_32BPP_Bitblt: Unhandled Source BPP: %u\n", BitsPerFormat(BltInfo->SourceSurface->iBitmapFormat));
       return FALSE;
   }
 
@@ -285,101 +283,70 @@ DIB_32BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
 }
 
 BOOLEAN
-DIB_32BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-		 PRECTL  DestRect,  POINTL  *SourcePoint,
-		 BRUSHOBJ *Brush,   POINTL BrushOrigin,
-		 XLATEOBJ *ColorTranslation, ULONG Rop4)
+DIB_32BPP_BitBlt(PBLTINFO BltInfo)
 {
-   ULONG X, Y;
+   ULONG DestX, DestY;
    ULONG SourceX, SourceY;
-   ULONG Dest, Source = 0, Pattern = 0, wd;
-   PULONG DestBits;
+   ULONG PatternY = 0;
+   ULONG Dest, Source = 0, Pattern = 0;
    BOOL UsesSource;
    BOOL UsesPattern;
-   /* Pattern brushes */
-   PGDIBRUSHOBJ GdiBrush = NULL;
-   HBITMAP PatternSurface = NULL;
-   SURFOBJ *PatternObj = NULL;
-   ULONG PatternWidth = 0, PatternHeight = 0, PatternY = 0;
+   PULONG DestBits;
 
-   if (Rop4 == SRCCOPY)
-   {
-      return DIB_32BPP_BitBltSrcCopy(
-         DestSurf,
-         SourceSurf,
-         DestRect,
-         SourcePoint,
-         ColorTranslation);
-   }
+   UsesSource = ROP_USES_SOURCE(BltInfo->Rop4);
+   UsesPattern = ROP_USES_PATTERN(BltInfo->Rop4);
+
+   SourceY = BltInfo->SourcePoint.y;
+   DestBits = (PULONG)(
+      BltInfo->DestSurface->pvScan0 +
+      (BltInfo->DestRect.left << 2) +
+      BltInfo->DestRect.top * BltInfo->DestSurface->lDelta);
 
-   UsesSource = ((Rop4 & 0xCC0000) >> 2) != (Rop4 & 0x330000);
-   UsesPattern = (((Rop4 & 0xF00000) >> 4) != (Rop4 & 0x0F0000)) && Brush;  
-      
    if (UsesPattern)
    {
-      if (Brush->iSolidColor == 0xFFFFFFFF)
+      if (BltInfo->PatternSurface)
       {
-         PBITMAPOBJ PatternBitmap;
-
-         GdiBrush = CONTAINING_RECORD(
-            Brush,
-            GDIBRUSHOBJ,
-            BrushObject);
-
-         PatternSurface = GdiBrush->hbmPattern;
-         PatternBitmap = BITMAPOBJ_LockBitmap(GdiBrush->hbmPattern);
-
-         PatternObj = &PatternBitmap->SurfObj;
-         PatternWidth = PatternObj->sizlBitmap.cx;
-         PatternHeight = PatternObj->sizlBitmap.cy;
-         
-         UsesPattern = TRUE;
+         PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % 
+                    BltInfo->PatternSurface->sizlBitmap.cy;
       }
       else
       {
-         UsesPattern = FALSE;
-         Pattern = Brush->iSolidColor;
+         Pattern = BltInfo->Brush->iSolidColor;
       }
    }
-
-   SourceY = SourcePoint->y;
-   DestBits = (PULONG)(
-      DestSurf->pvScan0 +
-      (DestRect->left << 2) +
-      DestRect->top * DestSurf->lDelta);
-   wd = ((DestRect->right - DestRect->left) << 2) - DestSurf->lDelta;
    
-   for (Y = DestRect->top; Y < DestRect->bottom; Y++)
+   for (DestY = BltInfo->DestRect.top; DestY < BltInfo->DestRect.bottom; DestY++)
    {
-      SourceX = SourcePoint->x;
+      SourceX = BltInfo->SourcePoint.x;
       
-      if(UsesPattern)
-        PatternY = (Y + BrushOrigin.y) % PatternHeight;
-      
-      for (X = DestRect->left; X < DestRect->right; X++, DestBits++, SourceX++)
+      for (DestX = BltInfo->DestRect.left; DestX < BltInfo->DestRect.right; DestX++, DestBits++, SourceX++)
       {
          Dest = *DestBits;
  
          if (UsesSource)
          {
-            Source = DIB_GetSource(SourceSurf, SourceX, SourceY, ColorTranslation);
+            Source = DIB_GetSource(BltInfo->SourceSurface, SourceX, SourceY, BltInfo->XlateSourceToDest);
          }
 
-         if (UsesPattern)
+         if (BltInfo->PatternSurface)
 	 {
-            Pattern = DIB_1BPP_GetPixel(PatternObj, (X + BrushOrigin.x) % PatternWidth, PatternY) ? GdiBrush->crFore : GdiBrush->crBack;
+            Pattern = DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest);
          }
 
-         *DestBits = DIB_DoRop(Rop4, Dest, Source, Pattern);
+         *DestBits = DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern);
       }
 
       SourceY++;
+      if (BltInfo->PatternSurface)
+      {
+         PatternY++;
+         PatternY %= BltInfo->PatternSurface->sizlBitmap.cy;
+      }
       DestBits = (PULONG)(
-         (ULONG_PTR)DestBits - wd);
+         (ULONG_PTR)DestBits -
+         ((BltInfo->DestRect.right - BltInfo->DestRect.left) << 2) -
+         BltInfo->DestSurface->lDelta);
    }
-
-   if (PatternSurface != NULL)
-      BITMAPOBJ_UnlockBitmap(PatternSurface);
   
    return TRUE;
 }
diff --git a/reactos/subsys/win32k/dib/dib4bpp.c b/reactos/subsys/win32k/dib/dib4bpp.c
index 6f25051fb5f..524fc4a3228 100644
--- a/reactos/subsys/win32k/dib/dib4bpp.c
+++ b/reactos/subsys/win32k/dib/dib4bpp.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dib4bpp.c,v 1.37 2004/07/03 17:40:24 navaraf Exp $ */
+/* $Id: dib4bpp.c,v 1.38 2004/07/14 20:48:56 navaraf Exp $ */
 #include <w32k.h>
 
 VOID
@@ -60,34 +60,34 @@ DIB_4BPP_VLine(SURFOBJ *SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
   }
 }
 
-BOOLEAN STATIC
-DIB_4BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-		       PRECTL  DestRect,  POINTL  *SourcePoint,
-		       XLATEOBJ* ColorTranslation)
+BOOLEAN
+DIB_4BPP_BitBltSrcCopy(PBLTINFO BltInfo)
 {
   LONG     i, j, sx, sy, f2, xColor;
   PBYTE    SourceBits_24BPP, SourceLine_24BPP;
   PBYTE    DestBits, DestLine, SourceBits_8BPP, SourceLine_8BPP;
   PBYTE    SourceBits, SourceLine;
 
-  DestBits = DestSurf->pvScan0 + (DestRect->left>>1) + DestRect->top * DestSurf->lDelta;
+  DestBits = BltInfo->DestSurface->pvScan0 +
+             (BltInfo->DestRect.left >> 1) +
+             BltInfo->DestRect.top * BltInfo->DestSurface->lDelta;
 
-  switch(SourceSurf->iBitmapFormat)
+  switch (BltInfo->SourceSurface->iBitmapFormat)
   {
     case BMF_1BPP:
-      sx = SourcePoint->x;
-      sy = SourcePoint->y;
+      sx = BltInfo->SourcePoint.x;
+      sy = BltInfo->SourcePoint.y;
 
-      for (j=DestRect->top; j<DestRect->bottom; j++)
+      for (j=BltInfo->DestRect.top; j<BltInfo->DestRect.bottom; j++)
       {
-        sx = SourcePoint->x;
-        for (i=DestRect->left; i<DestRect->right; i++)
+        sx = BltInfo->SourcePoint.x;
+        for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++)
         {
-          if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0)
+          if(DIB_1BPP_GetPixel(BltInfo->SourceSurface, sx, sy) == 0)
           {
-            DIB_4BPP_PutPixel(DestSurf, i, j, XLATEOBJ_iXlate(ColorTranslation, 0));
+            DIB_4BPP_PutPixel(BltInfo->DestSurface, i, j, XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, 0));
           } else {
-            DIB_4BPP_PutPixel(DestSurf, i, j, XLATEOBJ_iXlate(ColorTranslation, 1));
+            DIB_4BPP_PutPixel(BltInfo->DestSurface, i, j, XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, 1));
           }
           sx++;
         }
@@ -96,21 +96,21 @@ DIB_4BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       break;
 
     case BMF_4BPP:
-      sy = SourcePoint->y;
+      sy = BltInfo->SourcePoint.y;
 
-      for (j=DestRect->top; j<DestRect->bottom; j++)
+      for (j=BltInfo->DestRect.top; j<BltInfo->DestRect.bottom; j++)
       {
-        sx = SourcePoint->x;
+        sx = BltInfo->SourcePoint.x;
 
-        for (i=DestRect->left; i<DestRect->right; i++)
+        for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++)
         {
-	  if (NULL != ColorTranslation)
+	  if (NULL != BltInfo->XlateSourceToDest)
 	  {
-	    DIB_4BPP_PutPixel(DestSurf, i, j, XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)));
+	    DIB_4BPP_PutPixel(BltInfo->DestSurface, i, j, XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, DIB_4BPP_GetPixel(BltInfo->SourceSurface, sx, sy)));
 	  }
 	  else
 	  {
-	    DIB_4BPP_PutPixel(DestSurf, i, j, DIB_4BPP_GetPixel(SourceSurf, sx, sy));
+	    DIB_4BPP_PutPixel(BltInfo->DestSurface, i, j, DIB_4BPP_GetPixel(BltInfo->SourceSurface, sx, sy));
 	  }
           sx++;
         }
@@ -119,124 +119,118 @@ DIB_4BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       break;
 
     case BMF_8BPP:
-      SourceBits_8BPP = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + SourcePoint->x;
+      SourceBits_8BPP = BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + BltInfo->SourcePoint.x;
 
-      for (j=DestRect->top; j<DestRect->bottom; j++)
+      for (j=BltInfo->DestRect.top; j<BltInfo->DestRect.bottom; j++)
       {
         SourceLine_8BPP = SourceBits_8BPP;
         DestLine = DestBits;
-        f2 = DestRect->left & 1;
+        f2 = BltInfo->DestRect.left & 1;
 
-        for (i=DestRect->left; i<DestRect->right; i++)
+        for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++)
         {
           *DestLine = (*DestLine & notmask[f2]) |
-            ((XLATEOBJ_iXlate(ColorTranslation, *SourceLine_8BPP)) << ((4 * (1 - f2))));
+            ((XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *SourceLine_8BPP)) << ((4 * (1 - f2))));
           if(f2 == 1) { DestLine++; f2 = 0; } else { f2 = 1; }
           SourceLine_8BPP++;
         }
 
-        SourceBits_8BPP += SourceSurf->lDelta;
-        DestBits += DestSurf->lDelta;
+        SourceBits_8BPP += BltInfo->SourceSurface->lDelta;
+        DestBits += BltInfo->DestSurface->lDelta;
       }
       break;
 
     case BMF_16BPP:
-      SourceLine = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + 2 * SourcePoint->x;
+      SourceLine = BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + 2 * BltInfo->SourcePoint.x;
       DestLine = DestBits;
 
-      for (j = DestRect->top; j < DestRect->bottom; j++)
+      for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++)
       {
         SourceBits = SourceLine;
         DestBits = DestLine;
-        f2 = DestRect->left & 1;
+        f2 = BltInfo->DestRect.left & 1;
 
-        for (i = DestRect->left; i < DestRect->right; i++)
+        for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++)
         {
           xColor = *((PWORD) SourceBits);
           *DestBits = (*DestBits & notmask[f2]) |
-            ((XLATEOBJ_iXlate(ColorTranslation, xColor)) << ((4 * (1 - f2))));
+            ((XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor)) << ((4 * (1 - f2))));
           if(f2 == 1) { DestBits++; f2 = 0; } else { f2 = 1; }
           SourceBits += 2;
         }
 
-        SourceLine += SourceSurf->lDelta;
-        DestLine += DestSurf->lDelta;
+        SourceLine += BltInfo->SourceSurface->lDelta;
+        DestLine += BltInfo->DestSurface->lDelta;
       }
       break;
 
     case BMF_24BPP:
-      SourceBits_24BPP = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + SourcePoint->x * 3;
+      SourceBits_24BPP = BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + BltInfo->SourcePoint.x * 3;
 
-      for (j=DestRect->top; j<DestRect->bottom; j++)
+      for (j=BltInfo->DestRect.top; j<BltInfo->DestRect.bottom; j++)
       {
         SourceLine_24BPP = SourceBits_24BPP;
         DestLine = DestBits;
-        f2 = DestRect->left & 1;
+        f2 = BltInfo->DestRect.left & 1;
 
-        for (i=DestRect->left; i<DestRect->right; i++)
+        for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++)
         {
           xColor = (*(SourceLine_24BPP + 2) << 0x10) +
              (*(SourceLine_24BPP + 1) << 0x08) +
              (*(SourceLine_24BPP));
           *DestLine = (*DestLine & notmask[f2]) |
-            ((XLATEOBJ_iXlate(ColorTranslation, xColor)) << ((4 * (1 - f2))));
+            ((XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor)) << ((4 * (1 - f2))));
           if(f2 == 1) { DestLine++; f2 = 0; } else { f2 = 1; }
           SourceLine_24BPP+=3;
         }
 
-        SourceBits_24BPP += SourceSurf->lDelta;
-        DestBits += DestSurf->lDelta;
+        SourceBits_24BPP += BltInfo->SourceSurface->lDelta;
+        DestBits += BltInfo->DestSurface->lDelta;
       }
       break;
 
     case BMF_32BPP:
-      SourceLine = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + 4 * SourcePoint->x;
+      SourceLine = BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + 4 * BltInfo->SourcePoint.x;
       DestLine = DestBits;
 
-      for (j = DestRect->top; j < DestRect->bottom; j++)
+      for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++)
       {
         SourceBits = SourceLine;
         DestBits = DestLine;
-        f2 = DestRect->left & 1;
+        f2 = BltInfo->DestRect.left & 1;
 
-        for (i = DestRect->left; i < DestRect->right; i++)
+        for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++)
         {
           xColor = *((PDWORD) SourceBits);
           *DestBits = (*DestBits & notmask[f2]) |
-            ((XLATEOBJ_iXlate(ColorTranslation, xColor)) << ((4 * (1 - f2))));
+            ((XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor)) << ((4 * (1 - f2))));
           if(f2 == 1) { DestBits++; f2 = 0; } else { f2 = 1; }
           SourceBits += 4;
         }
 
-        SourceLine += SourceSurf->lDelta;
-        DestLine += DestSurf->lDelta;
+        SourceLine += BltInfo->SourceSurface->lDelta;
+        DestLine += BltInfo->DestSurface->lDelta;
       }
       break;
 
     default:
-      DbgPrint("DIB_4BPP_Bitblt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat));
+      DbgPrint("DIB_4BPP_Bitblt: Unhandled Source BPP: %u\n", BitsPerFormat(BltInfo->SourceSurface->iBitmapFormat));
       return FALSE;
   }
   return(TRUE);
 }
 
 BOOLEAN
-DIB_4BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-		PRECTL  DestRect,  POINTL  *SourcePoint,
-		BRUSHOBJ *Brush,   POINTL BrushOrigin,
-		XLATEOBJ *ColorTranslation, ULONG Rop4)
+DIB_4BPP_BitBlt(PBLTINFO BltInfo)
 {
-   LONG i, j, sx, sy;
+   ULONG DestX, DestY;
+   ULONG SourceX, SourceY;
+   ULONG PatternY = 0;
    ULONG Dest, Source = 0, Pattern = 0;
+   BOOLEAN UsesSource;
+   BOOLEAN UsesPattern;
    PULONG DestBits;
-   BOOL UsesSource;
-   BOOL UsesPattern;
    LONG RoundedRight;
-   /* Pattern brushes */
-   PGDIBRUSHOBJ GdiBrush = NULL;
-   HBITMAP PatternSurface = NULL;
-   SURFOBJ *PatternObj = NULL;
-   ULONG PatternWidth = 0, PatternHeight = 0, PatternY = 0;
    static const ULONG ExpandSolidColor[16] = 
    {
       0x00000000 /* 0 */,
@@ -257,126 +251,107 @@ DIB_4BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       0xFFFFFFFF /* 15 */,
    };
 
-   if (Rop4 == SRCCOPY)
-   {
-      return DIB_4BPP_BitBltSrcCopy(
-         DestSurf,
-         SourceSurf,
-         DestRect,
-         SourcePoint,
-         ColorTranslation);
-   }
+   UsesSource = ROP_USES_SOURCE(BltInfo->Rop4);
+   UsesPattern = ROP_USES_PATTERN(BltInfo->Rop4);
 
-   UsesSource = ((Rop4 & 0xCC0000) >> 2) != (Rop4 & 0x330000);
-   UsesPattern = (((Rop4 & 0xF00000) >> 4) != (Rop4 & 0x0F0000)) && Brush;  
+   SourceY = BltInfo->SourcePoint.y;
+   RoundedRight = BltInfo->DestRect.right -
+                  ((BltInfo->DestRect.right - BltInfo->DestRect.left) & 0x7);
 
    if (UsesPattern)
    {
-      if (Brush->iSolidColor == 0xFFFFFFFF)
+      if (BltInfo->PatternSurface)
       {
-         PBITMAPOBJ PatternBitmap;
-
-         GdiBrush = CONTAINING_RECORD(
-            Brush,
-            GDIBRUSHOBJ,
-            BrushObject);
-
-         PatternSurface = GdiBrush->hbmPattern;
-         PatternBitmap = BITMAPOBJ_LockBitmap(GdiBrush->hbmPattern);
-
-         PatternObj = &PatternBitmap->SurfObj;
-         PatternWidth = PatternObj->sizlBitmap.cx;
-         PatternHeight = PatternObj->sizlBitmap.cy;
-
-         UsesPattern = TRUE;
+         PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % 
+                    BltInfo->PatternSurface->sizlBitmap.cy;
       }
       else
       {
-         UsesPattern = FALSE;
-         Pattern = ExpandSolidColor[Brush->iSolidColor & 0xF];
+         Pattern = ExpandSolidColor[BltInfo->Brush->iSolidColor];
       }
    }
-   
-   sy = SourcePoint->y;
-   RoundedRight = DestRect->right - ((DestRect->right - DestRect->left) & 0x7);
 
-   for (j = DestRect->top; j < DestRect->bottom; j++, sy++)
+   for (DestY = BltInfo->DestRect.top; DestY < BltInfo->DestRect.bottom; DestY++)
    {
-      DestBits = (PULONG)(DestSurf->pvScan0 + (DestRect->left >> 1) + j * DestSurf->lDelta);
-      sx = SourcePoint->x;
-      i = DestRect->left;
+      DestBits = (PULONG)(
+         BltInfo->DestSurface->pvScan0 +
+         (BltInfo->DestRect.left >> 1) +
+         DestY * BltInfo->DestSurface->lDelta);
+      SourceX = BltInfo->SourcePoint.x;
+      DestX = BltInfo->DestRect.left;
 
-      if (UsesPattern)
-         PatternY = (j + BrushOrigin.y) % PatternHeight;
-
-      if (i & 0x1)
+      if (DestX & 0x1)
       {
-         Dest = DIB_4BPP_GetPixel(DestSurf, i, j);
+         Dest = DIB_4BPP_GetPixel(BltInfo->DestSurface, DestX, DestY);
 
          if (UsesSource)
          {
-            Source = DIB_GetSource(SourceSurf, sx, sy, ColorTranslation);
+            Source = DIB_GetSource(BltInfo->SourceSurface, SourceX, SourceY, BltInfo->XlateSourceToDest);
          }
 
-         if (UsesPattern)
+         if (BltInfo->PatternSurface)
          {
-            Pattern = DIB_1BPP_GetPixel(PatternObj, (i + BrushOrigin.x) % PatternWidth, PatternY) ? GdiBrush->crFore : GdiBrush->crBack;
+            Pattern = DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest);
          }				
 
-         DIB_4BPP_PutPixel(DestSurf, i, j, DIB_DoRop(Rop4, Dest, Source, Pattern) & 0xF);
+         DIB_4BPP_PutPixel(BltInfo->DestSurface, DestX, DestY, DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern) & 0xF);
 
-         i++;
-         sx++;
+         DestX++;
+         SourceX++;
          DestBits = (PULONG)((ULONG_PTR)DestBits + 1);
       }
 
-      for (; i < RoundedRight; i += 8, sx += 8, DestBits++)
+      for (; DestX < RoundedRight; DestX += 8, SourceX += 8, DestBits++)
       {
          Dest = *DestBits;
          if (UsesSource)
          {
             Source =
-               (DIB_GetSource(SourceSurf, sx + 1, sy, ColorTranslation)) | 
-               (DIB_GetSource(SourceSurf, sx + 0, sy, ColorTranslation) << 4) |
-               (DIB_GetSource(SourceSurf, sx + 3, sy, ColorTranslation) << 8) | 
-               (DIB_GetSource(SourceSurf, sx + 2, sy, ColorTranslation) << 12) |
-               (DIB_GetSource(SourceSurf, sx + 5, sy, ColorTranslation) << 16) | 
-               (DIB_GetSource(SourceSurf, sx + 4, sy, ColorTranslation) << 20) |
-               (DIB_GetSource(SourceSurf, sx + 7, sy, ColorTranslation) << 24) | 
-               (DIB_GetSource(SourceSurf, sx + 6, sy, ColorTranslation) << 28);
+               (DIB_GetSource(BltInfo->SourceSurface, SourceX + 1, SourceY, BltInfo->XlateSourceToDest)) | 
+               (DIB_GetSource(BltInfo->SourceSurface, SourceX + 0, SourceY, BltInfo->XlateSourceToDest) << 4) |
+               (DIB_GetSource(BltInfo->SourceSurface, SourceX + 3, SourceY, BltInfo->XlateSourceToDest) << 8) | 
+               (DIB_GetSource(BltInfo->SourceSurface, SourceX + 2, SourceY, BltInfo->XlateSourceToDest) << 12) |
+               (DIB_GetSource(BltInfo->SourceSurface, SourceX + 5, SourceY, BltInfo->XlateSourceToDest) << 16) | 
+               (DIB_GetSource(BltInfo->SourceSurface, SourceX + 4, SourceY, BltInfo->XlateSourceToDest) << 20) |
+               (DIB_GetSource(BltInfo->SourceSurface, SourceX + 7, SourceY, BltInfo->XlateSourceToDest) << 24) | 
+               (DIB_GetSource(BltInfo->SourceSurface, SourceX + 6, SourceY, BltInfo->XlateSourceToDest) << 28);
          }
-         if (UsesPattern)
+         if (BltInfo->PatternSurface)
          {
-            Pattern = DIB_1BPP_GetPixel(PatternObj, (i + BrushOrigin.x + 1) % PatternWidth, PatternY) ? GdiBrush->crFore : GdiBrush->crBack;
-            Pattern |= (DIB_1BPP_GetPixel(PatternObj, (i + BrushOrigin.x + 0) % PatternWidth, PatternY) ? GdiBrush->crFore : GdiBrush->crBack) << 4;
-            Pattern |= (DIB_1BPP_GetPixel(PatternObj, (i + BrushOrigin.x + 3) % PatternWidth, PatternY) ? GdiBrush->crFore : GdiBrush->crBack) << 8;
-            Pattern |= (DIB_1BPP_GetPixel(PatternObj, (i + BrushOrigin.x + 2) % PatternWidth, PatternY) ? GdiBrush->crFore : GdiBrush->crBack) << 12;
-            Pattern |= (DIB_1BPP_GetPixel(PatternObj, (i + BrushOrigin.x + 5) % PatternWidth, PatternY) ? GdiBrush->crFore : GdiBrush->crBack) << 16;
-            Pattern |= (DIB_1BPP_GetPixel(PatternObj, (i + BrushOrigin.x + 4) % PatternWidth, PatternY) ? GdiBrush->crFore : GdiBrush->crBack) << 20;
-            Pattern |= (DIB_1BPP_GetPixel(PatternObj, (i + BrushOrigin.x + 7) % PatternWidth, PatternY) ? GdiBrush->crFore : GdiBrush->crBack) << 24;
-            Pattern |= (DIB_1BPP_GetPixel(PatternObj, (i + BrushOrigin.x + 6) % PatternWidth, PatternY) ? GdiBrush->crFore : GdiBrush->crBack) << 28;
+            Pattern = DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 1) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest);
+            Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 0) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 4;
+            Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 3) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 8;
+            Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 2) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 12;
+            Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 5) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 16;
+            Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 4) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 20;
+            Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 7) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 24;
+            Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 6) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 28;
          }
-         *DestBits = DIB_DoRop(Rop4, Dest, Source, Pattern);	    
+         *DestBits = DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern);	    
       }
 
       /* Process the rest of pixel on the line */
-      for (; i < DestRect->right; i++, sx++)
+      for (; DestX < BltInfo->DestRect.right; DestX++, SourceX++)
       {
-         Dest = DIB_4BPP_GetPixel(DestSurf, i, j);
+         Dest = DIB_4BPP_GetPixel(BltInfo->DestSurface, DestX, DestY);
          if (UsesSource)
          {
-            Source = DIB_GetSource(SourceSurf, sx, sy, ColorTranslation);
+            Source = DIB_GetSource(BltInfo->SourceSurface, SourceX, SourceY, BltInfo->XlateSourceToDest);
          }
-         if (UsesPattern)
+         if (BltInfo->PatternSurface)
          {
-            Pattern = DIB_1BPP_GetPixel(PatternObj, (i + BrushOrigin.x) % PatternWidth, PatternY) ? GdiBrush->crFore : GdiBrush->crBack;
+            Pattern = DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest);
          }				
-         DIB_4BPP_PutPixel(DestSurf, i, j, DIB_DoRop(Rop4, Dest, Source, Pattern) & 0xF);
+         DIB_4BPP_PutPixel(BltInfo->DestSurface, DestX, DestY, DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern) & 0xF);
       }	 
-   }
 
-   if (PatternSurface != NULL)
-      BITMAPOBJ_UnlockBitmap(PatternSurface);
+      SourceY++;
+      if (BltInfo->PatternSurface)
+      {
+         PatternY++;
+         PatternY %= BltInfo->PatternSurface->sizlBitmap.cy;
+      }
+   }
 
    return TRUE;
 }
diff --git a/reactos/subsys/win32k/dib/dib8bpp.c b/reactos/subsys/win32k/dib/dib8bpp.c
index 2c189913c33..c521445c6d2 100644
--- a/reactos/subsys/win32k/dib/dib8bpp.c
+++ b/reactos/subsys/win32k/dib/dib8bpp.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dib8bpp.c,v 1.28 2004/07/03 17:40:24 navaraf Exp $ */
+/* $Id: dib8bpp.c,v 1.29 2004/07/14 20:48:56 navaraf Exp $ */
 #include <w32k.h>
 
 VOID
@@ -65,32 +65,30 @@ DIB_8BPP_VLine(SURFOBJ *SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
 }
 
 BOOLEAN
-DIB_8BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-		       PRECTL  DestRect,  POINTL  *SourcePoint,
-		       XLATEOBJ *ColorTranslation)
+DIB_8BPP_BitBltSrcCopy(PBLTINFO BltInfo)
 {
   LONG     i, j, sx, sy, xColor, f1;
   PBYTE    SourceBits, DestBits, SourceLine, DestLine;
   PBYTE    SourceBits_4BPP, SourceLine_4BPP;
 
-  DestBits = DestSurf->pvScan0 + (DestRect->top * DestSurf->lDelta) + DestRect->left;
+  DestBits = BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.top * BltInfo->DestSurface->lDelta) + BltInfo->DestRect.left;
 
-  switch(SourceSurf->iBitmapFormat)
+  switch(BltInfo->SourceSurface->iBitmapFormat)
   {
     case BMF_1BPP:
-      sx = SourcePoint->x;
-      sy = SourcePoint->y;
+      sx = BltInfo->SourcePoint.x;
+      sy = BltInfo->SourcePoint.y;
 
-      for (j=DestRect->top; j<DestRect->bottom; j++)
+      for (j=BltInfo->DestRect.top; j<BltInfo->DestRect.bottom; j++)
       {
-        sx = SourcePoint->x;
-        for (i=DestRect->left; i<DestRect->right; i++)
+        sx = BltInfo->SourcePoint.x;
+        for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++)
         {
-          if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0)
+          if(DIB_1BPP_GetPixel(BltInfo->SourceSurface, sx, sy) == 0)
           {
-            DIB_8BPP_PutPixel(DestSurf, i, j, XLATEOBJ_iXlate(ColorTranslation, 0));
+            DIB_8BPP_PutPixel(BltInfo->DestSurface, i, j, XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, 0));
           } else {
-            DIB_8BPP_PutPixel(DestSurf, i, j, XLATEOBJ_iXlate(ColorTranslation, 1));
+            DIB_8BPP_PutPixel(BltInfo->DestSurface, i, j, XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, 1));
           }
           sx++;
         }
@@ -99,159 +97,159 @@ DIB_8BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
       break;
 
     case BMF_4BPP:
-      SourceBits_4BPP = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + (SourcePoint->x >> 1);
+      SourceBits_4BPP = BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + (BltInfo->SourcePoint.x >> 1);
 
-      for (j=DestRect->top; j<DestRect->bottom; j++)
+      for (j=BltInfo->DestRect.top; j<BltInfo->DestRect.bottom; j++)
       {
         SourceLine_4BPP = SourceBits_4BPP;
-        sx = SourcePoint->x;
+        sx = BltInfo->SourcePoint.x;
         f1 = sx & 1;
 
-        for (i=DestRect->left; i<DestRect->right; i++)
+        for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++)
         {
-          xColor = XLATEOBJ_iXlate(ColorTranslation,
+          xColor = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest,
               (*SourceLine_4BPP & altnotmask[f1]) >> (4 * (1 - f1)));
-          DIB_8BPP_PutPixel(DestSurf, i, j, xColor);
+          DIB_8BPP_PutPixel(BltInfo->DestSurface, i, j, xColor);
           if(f1 == 1) { SourceLine_4BPP++; f1 = 0; } else { f1 = 1; }
           sx++;
         }
 
-        SourceBits_4BPP += SourceSurf->lDelta;
+        SourceBits_4BPP += BltInfo->SourceSurface->lDelta;
       }
       break;
 
     case BMF_8BPP:
-      if (NULL == ColorTranslation || 0 != (ColorTranslation->flXlate & XO_TRIVIAL))
+      if (NULL == BltInfo->XlateSourceToDest || 0 != (BltInfo->XlateSourceToDest->flXlate & XO_TRIVIAL))
       {
-	if (DestRect->top < SourcePoint->y)
+	if (BltInfo->DestRect.top < BltInfo->SourcePoint.y)
 	  {
-	    SourceBits = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + SourcePoint->x;
-	    for (j = DestRect->top; j < DestRect->bottom; j++)
+	    SourceBits = BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + BltInfo->SourcePoint.x;
+	    for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++)
 	      {
-		RtlMoveMemory(DestBits, SourceBits, DestRect->right - DestRect->left);
-		SourceBits += SourceSurf->lDelta;
-		DestBits += DestSurf->lDelta;
+		RtlMoveMemory(DestBits, SourceBits, BltInfo->DestRect.right - BltInfo->DestRect.left);
+		SourceBits += BltInfo->SourceSurface->lDelta;
+		DestBits += BltInfo->DestSurface->lDelta;
 	      }
 	  }
 	else
 	  {
-	    SourceBits = SourceSurf->pvScan0 + ((SourcePoint->y + DestRect->bottom - DestRect->top - 1) * SourceSurf->lDelta) + SourcePoint->x;
-	    DestBits = DestSurf->pvScan0 + ((DestRect->bottom - 1) * DestSurf->lDelta) + DestRect->left;
-	    for (j = DestRect->bottom - 1; DestRect->top <= j; j--)
+	    SourceBits = BltInfo->SourceSurface->pvScan0 + ((BltInfo->SourcePoint.y + BltInfo->DestRect.bottom - BltInfo->DestRect.top - 1) * BltInfo->SourceSurface->lDelta) + BltInfo->SourcePoint.x;
+	    DestBits = BltInfo->DestSurface->pvScan0 + ((BltInfo->DestRect.bottom - 1) * BltInfo->DestSurface->lDelta) + BltInfo->DestRect.left;
+	    for (j = BltInfo->DestRect.bottom - 1; BltInfo->DestRect.top <= j; j--)
 	      {
-		RtlMoveMemory(DestBits, SourceBits, DestRect->right - DestRect->left);
-		SourceBits -= SourceSurf->lDelta;
-		DestBits -= DestSurf->lDelta;
+		RtlMoveMemory(DestBits, SourceBits, BltInfo->DestRect.right - BltInfo->DestRect.left);
+		SourceBits -= BltInfo->SourceSurface->lDelta;
+		DestBits -= BltInfo->DestSurface->lDelta;
 	      }
 	  }
       }
       else
       {
-	if (DestRect->top < SourcePoint->y)
+	if (BltInfo->DestRect.top < BltInfo->SourcePoint.y)
 	  {
-	    SourceLine = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + SourcePoint->x;
+	    SourceLine = BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + BltInfo->SourcePoint.x;
 	    DestLine = DestBits;
-	    for (j = DestRect->top; j < DestRect->bottom; j++)
+	    for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++)
 	      {
 		SourceBits = SourceLine;
 		DestBits = DestLine;
-		for (i=DestRect->left; i<DestRect->right; i++)
+		for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++)
 		  {
-		    *DestBits++ = XLATEOBJ_iXlate(ColorTranslation, *SourceBits++);
+		    *DestBits++ = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *SourceBits++);
 		  }
-		SourceLine += SourceSurf->lDelta;
-		DestLine += DestSurf->lDelta;
+		SourceLine += BltInfo->SourceSurface->lDelta;
+		DestLine += BltInfo->DestSurface->lDelta;
 	      }
 	  }
 	else
 	  {
-	    SourceLine = SourceSurf->pvScan0 + ((SourcePoint->y + DestRect->bottom - DestRect->top - 1) * SourceSurf->lDelta) + SourcePoint->x;
-	    DestLine = DestSurf->pvScan0 + ((DestRect->bottom - 1) * DestSurf->lDelta) + DestRect->left;
-	    for (j = DestRect->bottom - 1; DestRect->top <= j; j--)
+	    SourceLine = BltInfo->SourceSurface->pvScan0 + ((BltInfo->SourcePoint.y + BltInfo->DestRect.bottom - BltInfo->DestRect.top - 1) * BltInfo->SourceSurface->lDelta) + BltInfo->SourcePoint.x;
+	    DestLine = BltInfo->DestSurface->pvScan0 + ((BltInfo->DestRect.bottom - 1) * BltInfo->DestSurface->lDelta) + BltInfo->DestRect.left;
+	    for (j = BltInfo->DestRect.bottom - 1; BltInfo->DestRect.top <= j; j--)
 	      {
 		SourceBits = SourceLine;
 		DestBits = DestLine;
-		for (i=DestRect->left; i<DestRect->right; i++)
+		for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++)
 		  {
-		    *DestBits++ = XLATEOBJ_iXlate(ColorTranslation, *SourceBits++);
+		    *DestBits++ = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *SourceBits++);
 		  }
-		SourceLine -= SourceSurf->lDelta;
-		DestLine -= DestSurf->lDelta;
+		SourceLine -= BltInfo->SourceSurface->lDelta;
+		DestLine -= BltInfo->DestSurface->lDelta;
 	      }
 	  }
       }
       break;
 
     case BMF_16BPP:
-      SourceLine = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + 2 * SourcePoint->x;
+      SourceLine = BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + 2 * BltInfo->SourcePoint.x;
       DestLine = DestBits;
 
-      for (j = DestRect->top; j < DestRect->bottom; j++)
+      for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++)
       {
         SourceBits = SourceLine;
         DestBits = DestLine;
 
-        for (i = DestRect->left; i < DestRect->right; i++)
+        for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++)
         {
           xColor = *((PWORD) SourceBits);
-          *DestBits = XLATEOBJ_iXlate(ColorTranslation, xColor);
+          *DestBits = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor);
           SourceBits += 2;
 	  DestBits += 1;
         }
 
-        SourceLine += SourceSurf->lDelta;
-        DestLine += DestSurf->lDelta;
+        SourceLine += BltInfo->SourceSurface->lDelta;
+        DestLine += BltInfo->DestSurface->lDelta;
       }
       break;
 
     case BMF_24BPP:
-      SourceLine = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + 3 * SourcePoint->x;
+      SourceLine = BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + 3 * BltInfo->SourcePoint.x;
       DestLine = DestBits;
 
-      for (j = DestRect->top; j < DestRect->bottom; j++)
+      for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++)
       {
         SourceBits = SourceLine;
         DestBits = DestLine;
 
-        for (i = DestRect->left; i < DestRect->right; i++)
+        for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++)
         {
           xColor = (*(SourceBits + 2) << 0x10) +
              (*(SourceBits + 1) << 0x08) +
              (*(SourceBits));
-          *DestBits = XLATEOBJ_iXlate(ColorTranslation, xColor);
+          *DestBits = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor);
           SourceBits += 3;
 	  DestBits += 1;
         }
 
-        SourceLine += SourceSurf->lDelta;
-        DestLine += DestSurf->lDelta;
+        SourceLine += BltInfo->SourceSurface->lDelta;
+        DestLine += BltInfo->DestSurface->lDelta;
       }
       break;
 
     case BMF_32BPP:
-      SourceLine = SourceSurf->pvScan0 + (SourcePoint->y * SourceSurf->lDelta) + 4 * SourcePoint->x;
+      SourceLine = BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + 4 * BltInfo->SourcePoint.x;
       DestLine = DestBits;
 
-      for (j = DestRect->top; j < DestRect->bottom; j++)
+      for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++)
       {
         SourceBits = SourceLine;
         DestBits = DestLine;
 
-        for (i = DestRect->left; i < DestRect->right; i++)
+        for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++)
         {
           xColor = *((PDWORD) SourceBits);
-          *DestBits = XLATEOBJ_iXlate(ColorTranslation, xColor);
+          *DestBits = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor);
           SourceBits += 4;
 	  DestBits += 1;
         }
 
-        SourceLine += SourceSurf->lDelta;
-        DestLine += DestSurf->lDelta;
+        SourceLine += BltInfo->SourceSurface->lDelta;
+        DestLine += BltInfo->DestSurface->lDelta;
       }
       break;
 
     default:
-      DPRINT1("DIB_8BPP_Bitblt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat));
+      DPRINT1("DIB_8BPP_Bitblt: Unhandled Source BPP: %u\n", BitsPerFormat(BltInfo->SourceSurface->iBitmapFormat));
       return FALSE;
   }
 
@@ -259,124 +257,99 @@ DIB_8BPP_BitBltSrcCopy(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
 }
 
 BOOLEAN
-DIB_8BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
-		 PRECTL  DestRect,  POINTL  *SourcePoint,
-		 BRUSHOBJ *Brush,   POINTL BrushOrigin,
-		 XLATEOBJ *ColorTranslation, ULONG Rop4)
+DIB_8BPP_BitBlt(PBLTINFO BltInfo)
 {
-   LONG i, j, k, sx, sy;
+   ULONG DestX, DestY;
+   ULONG SourceX, SourceY;
+   ULONG PatternY = 0;
    ULONG Dest, Source = 0, Pattern = 0;
-   PULONG DestBits;
    BOOL UsesSource;
    BOOL UsesPattern;
+   PULONG DestBits;
    LONG RoundedRight;
-   /* Pattern brushes */
-   PGDIBRUSHOBJ GdiBrush = NULL;
-   HBITMAP PatternSurface = NULL;
-   SURFOBJ *PatternObj = NULL;
-   ULONG PatternWidth = 0, PatternHeight = 0, PatternY = 0;
 
-   if (Rop4 == SRCCOPY)
-   {
-      return DIB_8BPP_BitBltSrcCopy(
-         DestSurf,
-         SourceSurf,
-         DestRect,
-         SourcePoint,
-         ColorTranslation);
-   }
+   UsesSource = ROP_USES_SOURCE(BltInfo->Rop4);
+   UsesPattern = ROP_USES_PATTERN(BltInfo->Rop4);
 
-   UsesSource = ((Rop4 & 0xCC0000) >> 2) != (Rop4 & 0x330000);
-   UsesPattern = (((Rop4 & 0xF00000) >> 4) != (Rop4 & 0x0F0000)) && Brush;  
+   SourceY = BltInfo->SourcePoint.y;
+   RoundedRight = BltInfo->DestRect.right -
+                  ((BltInfo->DestRect.right - BltInfo->DestRect.left) & 0x7);
 
    if (UsesPattern)
    {
-      if (Brush->iSolidColor == 0xFFFFFFFF)
+      if (BltInfo->PatternSurface)
       {
-         PBITMAPOBJ PatternBitmap;
-
-         GdiBrush = CONTAINING_RECORD(
-            Brush,
-            GDIBRUSHOBJ,
-            BrushObject);
-
-         PatternSurface = GdiBrush->hbmPattern;
-         PatternBitmap = BITMAPOBJ_LockBitmap(GdiBrush->hbmPattern);
-
-         PatternObj = &PatternBitmap->SurfObj;
-         PatternWidth = PatternObj->sizlBitmap.cx;
-         PatternHeight = PatternObj->sizlBitmap.cy;
-         
-         UsesPattern = TRUE;
+         PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % 
+                    BltInfo->PatternSurface->sizlBitmap.cy;
       }
       else
       {
-         UsesPattern = FALSE;
-         Pattern = (Brush->iSolidColor & 0xFF) |
-                    ((Brush->iSolidColor & 0xFF) << 8) |
-                    ((Brush->iSolidColor & 0xFF) << 16) |
-                    ((Brush->iSolidColor & 0xFF) << 24);
+         Pattern = BltInfo->Brush->iSolidColor |
+                   (BltInfo->Brush->iSolidColor << 8) |
+                   (BltInfo->Brush->iSolidColor << 16) |
+                   (BltInfo->Brush->iSolidColor << 24);
       }
    }
-   
-   RoundedRight = DestRect->right - ((DestRect->right - DestRect->left) & 0x3);
-   sy = SourcePoint->y;
 
-   for (j = DestRect->top; j < DestRect->bottom; j++)
+   for (DestY = BltInfo->DestRect.top; DestY < BltInfo->DestRect.bottom; DestY++)
    {
-      sx = SourcePoint->x;
-      DestBits = (PULONG)(DestSurf->pvScan0 + DestRect->left + j * DestSurf->lDelta);
+      SourceX = BltInfo->SourcePoint.x;
+      DestBits = (PULONG)(
+         BltInfo->DestSurface->pvScan0 +
+         BltInfo->DestRect.left +
+         DestY * BltInfo->DestSurface->lDelta);
 
-      if(UsesPattern)
-        PatternY = (j + BrushOrigin.y) % PatternHeight;
-
-      for (i = DestRect->left; i < RoundedRight; i += 4, DestBits++)
+      for (DestX = BltInfo->DestRect.left; DestX < RoundedRight; DestX += 4, DestBits++)
       {
          Dest = *DestBits;
 
          if (UsesSource)
          {
-            Source = 0;
-            for (k = 0; k < 4; k++)
-               Source |= (DIB_GetSource(SourceSurf, sx + (i - DestRect->left) + k, sy, ColorTranslation) << (k * 8));
+            Source = DIB_GetSource(BltInfo->SourceSurface, SourceX + (DestX - BltInfo->DestRect.left), SourceY, BltInfo->XlateSourceToDest);
+            Source |= DIB_GetSource(BltInfo->SourceSurface, SourceX + (DestX - BltInfo->DestRect.left) + 1, SourceY, BltInfo->XlateSourceToDest) << 8;
+            Source |= DIB_GetSource(BltInfo->SourceSurface, SourceX + (DestX - BltInfo->DestRect.left) + 2, SourceY, BltInfo->XlateSourceToDest) << 16;
+            Source |= DIB_GetSource(BltInfo->SourceSurface, SourceX + (DestX - BltInfo->DestRect.left) + 3, SourceY, BltInfo->XlateSourceToDest) << 24;
          }
 
-         if (UsesPattern)
+         if (BltInfo->PatternSurface)
          {
-            Pattern = DIB_1BPP_GetPixel(PatternObj, (i + BrushOrigin.x) % PatternWidth, PatternY) ? GdiBrush->crFore : GdiBrush->crBack;
-            Pattern |= (DIB_1BPP_GetPixel(PatternObj, (i + BrushOrigin.x + 1) % PatternWidth, PatternY) ? GdiBrush->crFore : GdiBrush->crBack) << 8;
-            Pattern |= (DIB_1BPP_GetPixel(PatternObj, (i + BrushOrigin.x + 2) % PatternWidth, PatternY) ? GdiBrush->crFore : GdiBrush->crBack) << 16;
-            Pattern |= (DIB_1BPP_GetPixel(PatternObj, (i + BrushOrigin.x + 3) % PatternWidth, PatternY) ? GdiBrush->crFore : GdiBrush->crBack) << 24;
+            Pattern = DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest);
+            Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 1) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 8;
+            Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 2) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 16;
+            Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 3) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 24;
          }
-         *DestBits = DIB_DoRop(Rop4, Dest, Source, Pattern);	    
+
+         *DestBits = DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern);	    
       }
 
-      if (i < DestRect->right)
+      if (DestX < BltInfo->DestRect.right)
       {
-         for (; i < DestRect->right; i++)
+         for (; DestX < BltInfo->DestRect.right; DestX++)
          {
-            Dest = DIB_8BPP_GetPixel(DestSurf, i, j);
+            Dest = DIB_8BPP_GetPixel(BltInfo->DestSurface, DestX, DestY);
             
             if (UsesSource)
 	    {
-               Source = DIB_GetSource(SourceSurf, sx + (i - DestRect->left), sy, ColorTranslation);
+               Source = DIB_GetSource(BltInfo->SourceSurface, SourceX + (DestX - BltInfo->DestRect.left), SourceY, BltInfo->XlateSourceToDest);
             }
 
-            if (UsesPattern)
+            if (BltInfo->PatternSurface)
             {
-               Pattern = DIB_1BPP_GetPixel(PatternObj, (i + BrushOrigin.x) % PatternWidth,PatternY) ? GdiBrush->crFore : GdiBrush->crBack;
+               Pattern = DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest);
             }
 
-            DIB_8BPP_PutPixel(DestSurf, i, j, DIB_DoRop(Rop4, Dest, Source, Pattern) & 0xFFFF);
+            DIB_8BPP_PutPixel(BltInfo->DestSurface, DestX, DestY, DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern) & 0xFFFF);
          }
       }
 
-      sy++;
+      SourceY++;
+      if (BltInfo->PatternSurface)
+      {
+         PatternY++;
+         PatternY %= BltInfo->PatternSurface->sizlBitmap.cy;
+      }
    }
 
-   if (PatternSurface != NULL)
-      BITMAPOBJ_UnlockBitmap(PatternSurface);
-
    return TRUE;
 }
 
diff --git a/reactos/subsys/win32k/eng/bitblt.c b/reactos/subsys/win32k/eng/bitblt.c
index ae128872510..30ce8fc26ab 100644
--- a/reactos/subsys/win32k/eng/bitblt.c
+++ b/reactos/subsys/win32k/eng/bitblt.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: bitblt.c,v 1.57 2004/07/03 17:40:25 navaraf Exp $
+/* $Id: bitblt.c,v 1.58 2004/07/14 20:48:57 navaraf Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -88,7 +88,7 @@ BltMask(SURFOBJ* Dest,
    BYTE *tMask, *lMask;
    static BYTE maskbit[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 };
    /* Pattern brushes */
-   PGDIBRUSHOBJ GdiBrush = NULL;
+   PGDIBRUSHINST GdiBrush = NULL;
    HBITMAP PatternSurface = NULL;
    SURFOBJ *PatternObj = NULL;
    ULONG PatternWidth = 0, PatternHeight = 0, PatternY = 0;
@@ -107,11 +107,11 @@ BltMask(SURFOBJ* Dest,
 
       GdiBrush = CONTAINING_RECORD(
          Brush,
-         GDIBRUSHOBJ,
+         GDIBRUSHINST,
          BrushObject);
 
-      PatternSurface = GdiBrush->hbmPattern;
-      PatternBitmap = BITMAPOBJ_LockBitmap(GdiBrush->hbmPattern);
+      PatternSurface = GdiBrush->GdiBrushObject->hbmPattern;
+      PatternBitmap = BITMAPOBJ_LockBitmap(GdiBrush->GdiBrushObject->hbmPattern);
 
       PatternObj = &PatternBitmap->SurfObj;
       PatternWidth = PatternObj->sizlBitmap.cx;
@@ -140,7 +140,7 @@ BltMask(SURFOBJ* Dest,
             {
                DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_PutPixel(
                   Dest, DestRect->left + i, DestRect->top + j,
-                  DIB_1BPP_GetPixel(PatternObj, (DestRect->left + i) % PatternWidth, PatternY) ? GdiBrush->crFore : GdiBrush->crBack);
+                  DIB_GetSource(PatternObj, (DestRect->left + i) % PatternWidth, PatternY, GdiBrush->XlateObject));
             }
          }
          c8++;
@@ -198,18 +198,44 @@ CallDibBitBlt(SURFOBJ* OutputObj,
               POINTL* BrushOrigin,
               ROP4 Rop4)
 {
-  POINTL RealBrushOrigin;
-  if (BrushOrigin == NULL)
-    {
-      RealBrushOrigin.x = RealBrushOrigin.y = 0;
-    }
-  else
-    {
-      RealBrushOrigin = *BrushOrigin;
-    }
+   BLTINFO BltInfo;
+   PGDIBRUSHINST GdiBrush = NULL;
+   BITMAPOBJ *bmPattern;
+   BOOLEAN Result;
 
-  return DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_BitBlt(
-    OutputObj, InputObj, OutputRect, InputPoint, Brush, RealBrushOrigin, ColorTranslation, Rop4);
+   BltInfo.DestSurface = OutputObj;
+   BltInfo.SourceSurface = InputObj;
+   BltInfo.PatternSurface = NULL;
+   BltInfo.XlateSourceToDest = ColorTranslation;
+   BltInfo.DestRect = *OutputRect;
+   BltInfo.SourcePoint = *InputPoint;
+
+   if (Rop4 == SRCCOPY)
+      return DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_BitBltSrcCopy(&BltInfo);
+
+   BltInfo.XlatePatternToDest = NULL;
+   BltInfo.Brush = Brush;
+   BltInfo.BrushOrigin = *BrushOrigin;
+   BltInfo.Rop4 = Rop4;
+
+   /* Pattern brush */
+   if (ROP_USES_PATTERN(Rop4) && Brush->iSolidColor == 0xFFFFFFFF)
+   {
+      GdiBrush = CONTAINING_RECORD(Brush, GDIBRUSHINST, BrushObject);
+      bmPattern = BITMAPOBJ_LockBitmap(GdiBrush->GdiBrushObject->hbmPattern);
+      BltInfo.PatternSurface = &bmPattern->SurfObj;
+      BltInfo.XlatePatternToDest = GdiBrush->XlateObject;
+   }
+
+   Result = DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_BitBlt(&BltInfo);
+
+   /* Pattern brush */
+   if (ROP_USES_PATTERN(Rop4) && Brush->iSolidColor == 0xFFFFFFFF)
+   {
+      BITMAPOBJ_UnlockBitmap(BltInfo.PatternSurface->hsurf);
+   }
+
+   return Result;
 }
 
 INT abs(INT nm);
diff --git a/reactos/subsys/win32k/eng/copybits.c b/reactos/subsys/win32k/eng/copybits.c
index 94b45914de0..c055c054c16 100644
--- a/reactos/subsys/win32k/eng/copybits.c
+++ b/reactos/subsys/win32k/eng/copybits.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: copybits.c,v 1.25 2004/07/03 13:55:35 navaraf Exp $
+/* $Id: copybits.c,v 1.26 2004/07/14 20:48:57 navaraf Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -41,11 +41,9 @@ EngCopyBits(SURFOBJ *Dest,
 {
   BOOLEAN   ret;
   BYTE      clippingType;
-  RECTL     rclTmp;
-  POINTL    ptlTmp;
   RECT_ENUM RectEnum;
   BOOL      EnumMore;
-  POINTL BrushOrigin;
+  BLTINFO   BltInfo;
 
   MouseSafetyOnDrawStart(Source, SourcePoint->x, SourcePoint->y,
                          (SourcePoint->x + abs(DestRect->right - DestRect->left)),
@@ -114,13 +112,20 @@ EngCopyBits(SURFOBJ *Dest,
     clippingType = Clip->iDComplexity;
   }
 
-  BrushOrigin.x = BrushOrigin.y = 0;
+  BltInfo.DestSurface = Dest;
+  BltInfo.SourceSurface = Source;
+  BltInfo.PatternSurface = NULL;
+  BltInfo.XlateSourceToDest = ColorTranslation;
+  BltInfo.XlatePatternToDest = NULL;
+  BltInfo.Rop4 = SRCCOPY;
 
   switch(clippingType)
     {
       case DC_TRIVIAL:
-        DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_BitBlt(
-          Dest, Source, DestRect, SourcePoint, NULL, BrushOrigin, ColorTranslation, SRCCOPY);
+        BltInfo.DestRect = *DestRect;
+        BltInfo.SourcePoint = *SourcePoint;
+
+        DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_BitBltSrcCopy(&BltInfo);
 
         MouseSafetyOnDrawEnd(Dest);
         MouseSafetyOnDrawEnd(Source);
@@ -129,13 +134,12 @@ EngCopyBits(SURFOBJ *Dest,
 
       case DC_RECT:
         // Clip the blt to the clip rectangle
-        EngIntersectRect(&rclTmp, DestRect, &Clip->rclBounds);
+        EngIntersectRect(&BltInfo.DestRect, DestRect, &Clip->rclBounds);
 
-        ptlTmp.x = SourcePoint->x + rclTmp.left - DestRect->left;
-        ptlTmp.y = SourcePoint->y + rclTmp.top  - DestRect->top;
+        BltInfo.SourcePoint.x = SourcePoint->x + BltInfo.DestRect.left - DestRect->left;
+        BltInfo.SourcePoint.y = SourcePoint->y + BltInfo.DestRect.top  - DestRect->top;
 
-        DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_BitBlt(
-          Dest, Source, &rclTmp, &ptlTmp, NULL, BrushOrigin, ColorTranslation, SRCCOPY);
+        DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_BitBltSrcCopy(&BltInfo);
 
         MouseSafetyOnDrawEnd(Dest);
         MouseSafetyOnDrawEnd(Source);
@@ -155,13 +159,13 @@ EngCopyBits(SURFOBJ *Dest,
             RECTL* prcl    = &RectEnum.arcl[0];
 
             do {
-              EngIntersectRect(prcl, prcl, DestRect);
+              EngIntersectRect(&BltInfo.DestRect, prcl, DestRect);
 
-              ptlTmp.x = SourcePoint->x + prcl->left - DestRect->left;
-              ptlTmp.y = SourcePoint->y + prcl->top - DestRect->top;
+              BltInfo.SourcePoint.x = SourcePoint->x + prcl->left - DestRect->left;
+              BltInfo.SourcePoint.y = SourcePoint->y + prcl->top - DestRect->top;
 
-              if(!DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_BitBlt(
-                    Dest, Source, prcl, &ptlTmp, NULL, BrushOrigin, ColorTranslation, SRCCOPY)) return FALSE;
+              if(!DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_BitBltSrcCopy(&BltInfo))
+                return FALSE;
 
               prcl++;
 
diff --git a/reactos/subsys/win32k/eng/lineto.c b/reactos/subsys/win32k/eng/lineto.c
index 94bd8fee0dd..0f6f39dad9b 100644
--- a/reactos/subsys/win32k/eng/lineto.c
+++ b/reactos/subsys/win32k/eng/lineto.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: lineto.c,v 1.34 2004/07/03 13:55:35 navaraf Exp $
+ * $Id: lineto.c,v 1.35 2004/07/14 20:48:57 navaraf Exp $
  */
 #include <w32k.h>
 
@@ -40,7 +40,7 @@ TranslateRects(RECT_ENUM *RectEnum, POINTL* Translate)
 /*
  * Draw a line from top-left to bottom-right
  */
-static void FASTCALL
+void FASTCALL
 NWtoSE(SURFOBJ* OutputObj, CLIPOBJ* Clip,
        BRUSHOBJ* Brush, LONG x, LONG y, LONG deltax, LONG deltay,
        POINTL* Translate)
@@ -111,7 +111,7 @@ NWtoSE(SURFOBJ* OutputObj, CLIPOBJ* Clip,
     }
 }
 
-static void FASTCALL
+void FASTCALL
 SWtoNE(SURFOBJ* OutputObj, CLIPOBJ* Clip,
        BRUSHOBJ* Brush, LONG x, LONG y, LONG deltax, LONG deltay,
        POINTL* Translate)
@@ -181,7 +181,7 @@ SWtoNE(SURFOBJ* OutputObj, CLIPOBJ* Clip,
     }
 }
 
-static void FASTCALL
+void FASTCALL
 NEtoSW(SURFOBJ* OutputObj, CLIPOBJ* Clip,
        BRUSHOBJ* Brush, LONG x, LONG y, LONG deltax, LONG deltay,
        POINTL* Translate)
@@ -251,7 +251,7 @@ NEtoSW(SURFOBJ* OutputObj, CLIPOBJ* Clip,
     }
 }
 
-static void FASTCALL
+void FASTCALL
 SEtoNW(SURFOBJ* OutputObj, CLIPOBJ* Clip,
        BRUSHOBJ* Brush, LONG x, LONG y, LONG deltax, LONG deltay,
        POINTL* Translate)
@@ -492,15 +492,15 @@ IntEngLineTo(BITMAPOBJ *DestObj,
 {
   BOOLEAN ret;
   SURFOBJ *DestSurf = &DestObj->SurfObj;
-  PGDIBRUSHOBJ GdiBrush;
+  PGDIBRUSHINST GdiBrush;
   RECTL b;
 
   GdiBrush = CONTAINING_RECORD(
      Brush,
-     GDIBRUSHOBJ,
+     GDIBRUSHINST,
      BrushObject);
 
-  if (GdiBrush->flAttrs & GDIBRUSH_IS_NULL)
+  if (GdiBrush->GdiBrushObject->flAttrs & GDIBRUSH_IS_NULL)
     return TRUE;
 
   /* No success yet */
diff --git a/reactos/subsys/win32k/eng/mouse.c b/reactos/subsys/win32k/eng/mouse.c
index e580cd5c59d..f6f9e60c923 100644
--- a/reactos/subsys/win32k/eng/mouse.c
+++ b/reactos/subsys/win32k/eng/mouse.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: mouse.c,v 1.75 2004/07/03 17:40:25 navaraf Exp $
+/* $Id: mouse.c,v 1.76 2004/07/14 20:48:57 navaraf Exp $
  *
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Mouse
@@ -591,18 +591,13 @@ EngSetPointerShape(
       HPALETTE BWPalette, DestPalette;
       ULONG BWColors[] = {0, 0xFFFFFF};
       PDC Dc;
-      PPALGDI PalObj;
-      LONG DestMode;
 
       BWPalette = EngCreatePalette(PAL_INDEXED, sizeof(BWColors) / sizeof(ULONG),
          BWColors, 0, 0, 0);
       Dc = DC_LockDc(IntGetScreenDC());
       DestPalette = Dc->w.hPalette;
-      PalObj = PALETTE_LockPalette(DestPalette);
-      DestMode = PalObj->Mode;
-      PALETTE_UnlockPalette(DestPalette);
       DC_UnlockDc(IntGetScreenDC());
-      ppdev->PointerXlateObject = IntEngCreateXlate(DestMode, PAL_INDEXED,
+      ppdev->PointerXlateObject = IntEngCreateXlate(0, PAL_INDEXED,
          DestPalette, BWPalette);
       EngDeletePalette(BWPalette);
    }
diff --git a/reactos/subsys/win32k/eng/xlate.c b/reactos/subsys/win32k/eng/xlate.c
index 8ff75a93b31..e69938e03b3 100644
--- a/reactos/subsys/win32k/eng/xlate.c
+++ b/reactos/subsys/win32k/eng/xlate.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: xlate.c,v 1.40 2004/07/04 17:09:45 navaraf Exp $
+/* $Id: xlate.c,v 1.41 2004/07/14 20:48:57 navaraf Exp $
  * 
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -162,6 +162,11 @@ IntEngCreateXlate(USHORT DestPalType, USHORT SourcePalType,
    else if (PaletteDest != NULL)
       DestPalGDI = PALETTE_LockPalette(PaletteDest);
 
+   if (SourcePalType == 0)
+      SourcePalType = SourcePalGDI->Mode;
+   if (DestPalType == 0)
+      DestPalType = DestPalGDI->Mode;
+
    XlateObj->iSrcType = SourcePalType;
    XlateObj->iDstType = DestPalType;
    XlateObj->flXlate = 0;
@@ -269,15 +274,21 @@ XLATEOBJ * STDCALL IntEngCreateMonoXlate(
    USHORT SourcePalType, HPALETTE PaletteDest, HPALETTE PaletteSource,
    ULONG BackgroundColor)
 {
-   HPALETTE NewXlate;
+   ULONG NewXlate;
    XLATEOBJ *XlateObj;
    XLATEGDI *XlateGDI;
    PALGDI *SourcePalGDI;
 
-   NewXlate = (HPALETTE)CreateGDIHandle(sizeof(XLATEGDI), sizeof(XLATEOBJ), (PVOID*)&XlateGDI, (PVOID*)&XlateObj);
+   NewXlate = CreateGDIHandle(sizeof(XLATEGDI), sizeof(XLATEOBJ), (PVOID*)&XlateGDI, (PVOID*)&XlateObj);
    if (!ValidEngHandle(NewXlate))
       return NULL;
 
+   SourcePalGDI = PALETTE_LockPalette(PaletteSource);
+   ASSERT(SourcePalGDI);
+
+   if (SourcePalType == 0)
+      SourcePalType = SourcePalGDI->Mode;
+
    XlateObj->iSrcType = SourcePalType;
    XlateObj->iDstType = PAL_INDEXED;
 
@@ -303,18 +314,69 @@ XLATEOBJ * STDCALL IntEngCreateMonoXlate(
          break;
       case PAL_BITFIELDS:
          {
-            SourcePalGDI = PALETTE_LockPalette(PaletteSource);
             BitMasksFromPal(SourcePalType, SourcePalGDI, &XlateGDI->RedMask,
                &XlateGDI->BlueMask, &XlateGDI->GreenMask);
             XlateGDI->RedShift = CalculateShift(0xFF) - CalculateShift(XlateGDI->RedMask);
             XlateGDI->GreenShift = CalculateShift(0xFF00) - CalculateShift(XlateGDI->GreenMask);
             XlateGDI->BlueShift = CalculateShift(0xFF0000) - CalculateShift(XlateGDI->BlueMask);
             XlateGDI->BackgroundColor = ShiftAndMask(XlateGDI, BackgroundColor);
-            PALETTE_UnlockPalette(PaletteSource);
          }
          break;
    }
 
+   PALETTE_UnlockPalette(PaletteSource);
+
+   return XlateObj;
+}
+
+XLATEOBJ * STDCALL
+IntEngCreateSrcMonoXlate(HPALETTE PaletteDest,
+                         ULONG ForegroundColor,
+                         ULONG BackgroundColor)
+{
+   ULONG NewXlate;
+   XLATEOBJ *XlateObj;
+   XLATEGDI *XlateGDI;
+   PALGDI *DestPalGDI;
+
+   DestPalGDI = PALETTE_LockPalette(PaletteDest);
+   if (DestPalGDI == NULL)
+      return NULL;
+
+   NewXlate = CreateGDIHandle(sizeof(XLATEGDI), sizeof(XLATEOBJ), (PVOID*)&XlateGDI, (PVOID*)&XlateObj);
+   if (!ValidEngHandle(NewXlate))
+      return NULL;
+
+   XlateGDI->translationTable = EngAllocMem(0, sizeof(ULONG) * 2, 0);
+   if (XlateGDI->translationTable == NULL)
+   {
+      FreeGDIHandle(NewXlate);
+      return NULL;
+   }
+
+   XlateObj->pulXlate = XlateGDI->translationTable;
+
+   XlateObj->iSrcType = PAL_INDEXED;
+   XlateObj->iDstType = DestPalGDI->Mode;
+
+   /* Store handles of palettes in internal Xlate GDI object (or NULLs) */
+   XlateGDI->SourcePal = NULL;
+   XlateGDI->DestPal = PaletteDest;
+
+   XlateObj->flXlate = XO_TABLE;
+
+   BitMasksFromPal(DestPalGDI->Mode, DestPalGDI, &XlateGDI->RedMask,
+      &XlateGDI->BlueMask, &XlateGDI->GreenMask);
+
+   XlateGDI->RedShift = CalculateShift(RGB(255, 0, 0)) - CalculateShift(XlateGDI->RedMask);
+   XlateGDI->GreenShift = CalculateShift(RGB(0, 255, 0)) - CalculateShift(XlateGDI->GreenMask);
+   XlateGDI->BlueShift = CalculateShift(RGB(0, 0, 255)) - CalculateShift(XlateGDI->BlueMask);
+
+   XlateGDI->translationTable[0] = ShiftAndMask(XlateGDI, BackgroundColor);
+   XlateGDI->translationTable[1] = ShiftAndMask(XlateGDI, ForegroundColor);
+
+   PALETTE_UnlockPalette(PaletteDest);
+
    return XlateObj;
 }
 
diff --git a/reactos/subsys/win32k/include/inteng.h b/reactos/subsys/win32k/include/inteng.h
index 2f55e696e71..b6d2744f865 100644
--- a/reactos/subsys/win32k/include/inteng.h
+++ b/reactos/subsys/win32k/include/inteng.h
@@ -65,6 +65,11 @@ IntEngCreateMonoXlate(USHORT SourcePalType,
                       HPALETTE PaletteDest,
                       HPALETTE PaletteSource,
                       ULONG BackgroundColor);
+
+XLATEOBJ * STDCALL
+IntEngCreateSrcMonoXlate(HPALETTE PaletteDest,
+                         ULONG ForegroundColor,
+                         ULONG BackgroundColor);
 			
 BOOL STDCALL
 IntEngPolyline(BITMAPOBJ *DestSurf,
diff --git a/reactos/subsys/win32k/include/intgdi.h b/reactos/subsys/win32k/include/intgdi.h
index 74ae67f91da..5f7c966058f 100644
--- a/reactos/subsys/win32k/include/intgdi.h
+++ b/reactos/subsys/win32k/include/intgdi.h
@@ -3,6 +3,12 @@
 
 /* Brush functions */
 
+XLATEOBJ* FASTCALL
+IntGdiCreateBrushXlate(PDC Dc, GDIBRUSHOBJ *BrushObj, BOOLEAN *Failed);
+
+VOID FASTCALL
+IntGdiInitBrushInstance(GDIBRUSHINST *BrushInst, PGDIBRUSHOBJ BrushObj, XLATEOBJ *XlateObj);
+
 HBRUSH FASTCALL
 IntGdiCreateBrushIndirect(PLOGBRUSH lb);
 
diff --git a/reactos/subsys/win32k/ntuser/winpos.c b/reactos/subsys/win32k/ntuser/winpos.c
index f9f7bd91631..8dd43ff5d0f 100644
--- a/reactos/subsys/win32k/ntuser/winpos.c
+++ b/reactos/subsys/win32k/ntuser/winpos.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: winpos.c,v 1.118 2004/06/20 22:27:19 gvg Exp $
+/* $Id: winpos.c,v 1.119 2004/07/14 20:48:57 navaraf Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -98,6 +98,22 @@ NtUserGetClientOrigin(HWND hWnd, LPPOINT Point)
   return Ret;
 }
 
+/*******************************************************************
+ *         WinPosCanActivateWindow
+ *
+ * Check if we can activate the specified window.
+ */
+static BOOL WinPosCanActivateWindow(HWND hWnd)
+{
+   LONG Style;
+
+   if (!hWnd) return FALSE;
+   Style = NtUserGetWindowLong(hWnd, GWL_STYLE, FALSE);
+   if (!(Style & WS_VISIBLE)) return FALSE;
+   if ((Style & (WS_POPUP | WS_CHILD)) == WS_CHILD) return FALSE;
+   return !(Style & WS_DISABLED);
+}
+
 /*******************************************************************
  *         WinPosActivateOtherWindow
  *
@@ -106,63 +122,37 @@ NtUserGetClientOrigin(HWND hWnd, LPPOINT Point)
 VOID FASTCALL
 WinPosActivateOtherWindow(PWINDOW_OBJECT Window)
 {
-  PWINDOW_OBJECT Wnd, Old;
-  int TryTopmost;
-  
-  if (!Window || IntIsDesktopWindow(Window))
-  {
-    IntSetFocusMessageQueue(NULL);
-    return;
-  }
-  Wnd = Window;
-  for(;;)
-  {
-    HWND *List, *phWnd;
-    
-    Old = Wnd;
-    Wnd = IntGetParentObject(Wnd);
-    if(Old != Window)
-    {
-      IntReleaseWindowObject(Old);
-    }
-    if(!Wnd)
-    {
-      IntSetFocusMessageQueue(NULL);
-      return;
-    }
-    
-    if((List = IntWinListChildren(Wnd)))
-    {
-      for(TryTopmost = 0; TryTopmost <= 1; TryTopmost++)
+   HWND hwndTo = NULL, fg;
+   PWINDOW_OBJECT wndTo;
+
+   if ((Window->Style & WS_POPUP) && (hwndTo = Window->Owner))
+   {
+      hwndTo = NtUserGetAncestor(hwndTo, GA_ROOT);
+      if (WinPosCanActivateWindow(hwndTo))
+         goto done;
+   }
+
+   for (hwndTo = NtUserGetWindow(Window->Self, GW_HWNDNEXT);
+        hwndTo != NULL;
+        hwndTo = NtUserGetWindow(hwndTo, GW_HWNDNEXT))
+   {
+      if (WinPosCanActivateWindow(hwndTo)) break;
+   }
+
+done:
+   fg = NtUserGetForegroundWindow();
+   if (!fg || (Window->Self == fg))
+   {
+      wndTo = IntGetWindowObject(hwndTo);
+      if (wndTo != NULL && IntSetForegroundWindow(wndTo))
       {
-        for(phWnd = List; *phWnd; phWnd++)
-        {
-          PWINDOW_OBJECT Child;
-        
-          if((*phWnd) == Window->Self)
-          {
-            continue;
-          }
-        
-          if((Child = IntGetWindowObject(*phWnd)))
-          {
-            if(((! TryTopmost && (0 == (Child->ExStyle & WS_EX_TOPMOST)))
-                || (TryTopmost && (0 != (Child->ExStyle & WS_EX_TOPMOST))))
-               && IntSetForegroundWindow(Child))
-            {
-              ExFreePool(List);
-              IntReleaseWindowObject(Wnd);
-              IntReleaseWindowObject(Child);
-              return;
-            }
-            IntReleaseWindowObject(Child);
-          }
-        }
+         IntReleaseWindowObject(wndTo);
+         return;
       }
-      ExFreePool(List);
-    }
-  }
-  IntReleaseWindowObject(Wnd);
+      IntReleaseWindowObject(wndTo);
+   }
+   if (!NtUserSetActiveWindow(hwndTo))
+      NtUserSetActiveWindow(0);
 }
 
 VOID STATIC FASTCALL
diff --git a/reactos/subsys/win32k/objects/bitmaps.c b/reactos/subsys/win32k/objects/bitmaps.c
index 12f7d091d28..02d2f8afa19 100644
--- a/reactos/subsys/win32k/objects/bitmaps.c
+++ b/reactos/subsys/win32k/objects/bitmaps.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: bitmaps.c,v 1.78 2004/07/07 16:36:08 navaraf Exp $ */
+/* $Id: bitmaps.c,v 1.79 2004/07/14 20:48:57 navaraf Exp $ */
 #include <w32k.h>
 
 #define IN_RECT(r,x,y) \
@@ -45,14 +45,12 @@ NtGdiBitBlt(
 	RECTL DestRect;
 	POINTL SourcePoint, BrushOrigin;
 	BOOL Status;
-	PPALGDI PalDestGDI, PalSourceGDI;
 	XLATEOBJ *XlateObj = NULL;
 	HPALETTE SourcePalette = 0, DestPalette = 0;
-	ULONG SourceMode, DestMode;
 	PGDIBRUSHOBJ BrushObj;
-	BOOL UsesSource = ((ROP & 0xCC0000) >> 2) != (ROP & 0x330000);
-	BOOL UsesPattern = TRUE;//((ROP & 0xF00000) >> 4) != (ROP & 0x0F0000);
-	HPALETTE Mono = NULL;
+	GDIBRUSHINST BrushInst;
+	BOOL UsesSource = ROP_USES_SOURCE(ROP);
+	BOOL UsesPattern = ROP_USES_PATTERN(ROP);
 
 	DCDest = DC_LockDc(hDCDest);
 	if (NULL == DCDest)
@@ -133,6 +131,7 @@ NtGdiBitBlt(
 			return FALSE;
 		}
 		BrushOrigin = BrushObj->ptOrigin;
+		IntGdiInitBrushInstance(&BrushInst, BrushObj, DCDest->XlateBrush);
 	}
 	else
 	{
@@ -148,98 +147,49 @@ NtGdiBitBlt(
 		if (DCSrc->w.hPalette != 0)
 			SourcePalette = DCSrc->w.hPalette;
 
-		PalSourceGDI = PALETTE_LockPalette(SourcePalette);
-		if (NULL == PalSourceGDI)
+		/* KB41464 details how to convert between mono and color */
+		if (DCDest->w.bitsPerPixel == DCSrc->w.bitsPerPixel == 1)
 		{
-			if (UsesSource && hDCSrc != hDCDest)
-			{
-				DC_UnlockDc(hDCSrc);
-			}
-			DC_UnlockDc(hDCDest);
-			SetLastWin32Error(ERROR_INVALID_HANDLE);
-			return FALSE;
-		}
-		SourceMode = PalSourceGDI->Mode;
-		PALETTE_UnlockPalette(SourcePalette);
-
-		if (DestPalette == SourcePalette)
-		{
-			DestMode = SourceMode;
+			XlateObj = NULL;
 		}
 		else
 		{
-			PalDestGDI = PALETTE_LockPalette(DestPalette);
-			if (NULL == PalDestGDI)
+			if (DCDest->w.bitsPerPixel == 1)
+			{
+				XlateObj = IntEngCreateMonoXlate(0, DestPalette, SourcePalette, DCSrc->w.backgroundColor);
+			}
+			else if (DCSrc->w.bitsPerPixel == 1)
+			{
+				XlateObj = IntEngCreateSrcMonoXlate(DestPalette, DCSrc->w.backgroundColor, DCSrc->w.textColor);
+			}
+			else
+			{
+				XlateObj = IntEngCreateXlate(0, 0, DestPalette, SourcePalette);
+			}
+			if (NULL == XlateObj)
 			{
 				if (UsesSource && hDCSrc != hDCDest)
 				{
 					DC_UnlockDc(hDCSrc);
 				}
 				DC_UnlockDc(hDCDest);
-				SetLastWin32Error(ERROR_INVALID_HANDLE);
+				SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES);
 				return FALSE;
 			}
-			DestMode = PalDestGDI->Mode;
-			PALETTE_UnlockPalette(DestPalette);
-		}
-
-		/* KB41464 details how to convert between mono and color */
-		if (DCDest->w.bitsPerPixel == 1)
-		{
-			XlateObj = (XLATEOBJ*)IntEngCreateMonoXlate(SourceMode, DestPalette,
-				SourcePalette, DCSrc->w.backgroundColor);
-		}
-		else if (DCSrc->w.bitsPerPixel == 1)
-		{
-			ULONG Colors[2];
-
-			Colors[0] = DCSrc->w.textColor;
-			Colors[1] = DCSrc->w.backgroundColor;
-			Mono = PALETTE_AllocPaletteIndexedRGB(2, (RGBQUAD*)Colors);
-			if (NULL != Mono)
-			{
-				XlateObj = (XLATEOBJ*)IntEngCreateXlate(DestMode, PAL_INDEXED, DestPalette, Mono);
-			}
-			else
-			{
-				XlateObj = NULL;
-			}
-		}
-		else
-		{
-			XlateObj = (XLATEOBJ*)IntEngCreateXlate(DestMode, SourceMode, DestPalette, SourcePalette);
-		}
-		if (NULL == XlateObj)
-		{
-			if (NULL != Mono)
-			{
-				EngDeletePalette(Mono);
-			}
-			if (UsesSource && hDCSrc != hDCDest)
-			{
-				DC_UnlockDc(hDCSrc);
-			}
-			DC_UnlockDc(hDCDest);
-			SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES);
-			return FALSE;
 		}
 	}
 
 	/* Perform the bitblt operation */
 	Status = IntEngBitBlt(BitmapDest, BitmapSrc, NULL, DCDest->CombinedClip, XlateObj,
-		&DestRect, &SourcePoint, NULL, &BrushObj->BrushObject, &BrushOrigin, ROP);
+		&DestRect, &SourcePoint, NULL, BrushObj ? &BrushInst.BrushObject : NULL, &BrushOrigin, ROP);
 
-	if (UsesSource)
+	if (UsesSource && XlateObj != NULL)
 		EngDeleteXlate(XlateObj);
 	BITMAPOBJ_UnlockBitmap(DCDest->w.hBitmap);
 	if (UsesSource && DCSrc->w.hBitmap != DCDest->w.hBitmap)
 	{
 		BITMAPOBJ_UnlockBitmap(DCSrc->w.hBitmap);
 	}
-	if (NULL != Mono)
-	{
-		EngDeletePalette(Mono);
-	}
 	if (UsesPattern)
 	{
 		BRUSHOBJ_UnlockBrush(DCDest->w.hBrush);
@@ -547,6 +497,7 @@ NtGdiExtFloodFill(
 	UINT  FillType)
 {
 	UNIMPLEMENTED;
+	return FALSE;
 }
 
 BOOL STDCALL
@@ -588,8 +539,6 @@ NtGdiGetPixel(HDC hDC, INT XPos, INT YPos)
 	BITMAPOBJ *BitmapObject;
 	SURFOBJ *SurfaceObject;
 	HPALETTE Pal = 0;
-	PPALGDI PalGDI;
-	USHORT PalMode;
 	XLATEOBJ *XlateObj;
 
 	dc = DC_LockDc (hDC);
@@ -608,25 +557,18 @@ NtGdiGetPixel(HDC hDC, INT XPos, INT YPos)
 		{
 			if ( dc->w.hPalette != 0 )
 				Pal = dc->w.hPalette;
-			PalGDI = PALETTE_LockPalette(Pal);
-			if ( PalGDI )
+			/* FIXME: Verify if it shouldn't be PAL_BGR! */
+			XlateObj = (XLATEOBJ*)IntEngCreateXlate ( PAL_RGB, 0, NULL, Pal );
+			if ( XlateObj )
 			{
-				PalMode = PalGDI->Mode;
-				PALETTE_UnlockPalette(Pal);
-
-				/* FIXME: Verify if it shouldn't be PAL_BGR! */
-				XlateObj = (XLATEOBJ*)IntEngCreateXlate ( PAL_RGB, PalMode, NULL, Pal );
-				if ( XlateObj )
+				// check if this DC has a DIB behind it...
+				if ( SurfaceObject->pvScan0 ) // STYPE_BITMAP == SurfaceObject->iType
 				{
-					// check if this DC has a DIB behind it...
-					if ( SurfaceObject->pvScan0 ) // STYPE_BITMAP == SurfaceObject->iType
-					{
-						ASSERT ( SurfaceObject->lDelta );
-						Result = XLATEOBJ_iXlate(XlateObj,
-							DibFunctionsForBitmapFormat[SurfaceObject->iBitmapFormat].DIB_GetPixel ( SurfaceObject, XPos, YPos ) );
-					}
-					EngDeleteXlate(XlateObj);
+					ASSERT ( SurfaceObject->lDelta );
+					Result = XLATEOBJ_iXlate(XlateObj,
+						DibFunctionsForBitmapFormat[SurfaceObject->iBitmapFormat].DIB_GetPixel ( SurfaceObject, XPos, YPos ) );
 				}
+				EngDeleteXlate(XlateObj);
 			}
 		}
 		BITMAPOBJ_UnlockBitmap(dc->w.hBitmap);
@@ -897,6 +839,7 @@ NtGdiPlgBlt(
 	INT  yMask)
 {
 	UNIMPLEMENTED;
+	return FALSE;
 }
 
 LONG STDCALL
@@ -1049,10 +992,8 @@ NtGdiStretchBlt(
 	RECTL DestRect;
 	RECTL SourceRect;
 	BOOL Status;
-	PPALGDI PalDestGDI, PalSourceGDI;
 	XLATEOBJ *XlateObj = NULL;
 	HPALETTE SourcePalette = 0, DestPalette = 0;
-	ULONG SourceMode, DestMode;
 	PGDIBRUSHOBJ BrushObj;
 	BOOL UsesSource = ((ROP & 0xCC0000) >> 2) != (ROP & 0x330000);
 	BOOL UsesPattern = ((ROP & 0xF00000) >> 4) != (ROP & 0x0F0000);
@@ -1154,43 +1095,8 @@ NtGdiStretchBlt(
 		if (DCSrc->w.hPalette != 0)
 			SourcePalette = DCSrc->w.hPalette;
 
-		PalSourceGDI = PALETTE_LockPalette(SourcePalette);
-		if (NULL == PalSourceGDI)
-		{
-			if (UsesSource && hDCSrc != hDCDest)
-			{
-				DC_UnlockDc(hDCSrc);
-			}
-			DC_UnlockDc(hDCDest);
-			SetLastWin32Error(ERROR_INVALID_HANDLE);
-			return FALSE;
-		}
-		SourceMode = PalSourceGDI->Mode;
-		PALETTE_UnlockPalette(SourcePalette);
-
-		if (DestPalette == SourcePalette)
-		{
-			DestMode = SourceMode;
-		}
-		else
-		{
-			PalDestGDI = PALETTE_LockPalette(DestPalette);
-			if (NULL == PalDestGDI)
-			{
-				if (UsesSource && hDCSrc != hDCDest)
-				{
-					DC_UnlockDc(hDCSrc);
-				}
-				DC_UnlockDc(hDCDest);
-				SetLastWin32Error(ERROR_INVALID_HANDLE);
-				return FALSE;
-			}
-			DestMode = PalDestGDI->Mode;
-			PALETTE_UnlockPalette(DestPalette);
-		}
-
 		/* FIXME: Use the same logic for create XLATEOBJ as in NtGdiBitBlt. */
-		XlateObj = (XLATEOBJ*)IntEngCreateXlate(DestMode, SourceMode, DestPalette, SourcePalette);
+		XlateObj = (XLATEOBJ*)IntEngCreateXlate(0, 0, DestPalette, SourcePalette);
 		if (NULL == XlateObj)
 		{
 			if (UsesSource && hDCSrc != hDCDest)
diff --git a/reactos/subsys/win32k/objects/brush.c b/reactos/subsys/win32k/objects/brush.c
index 4ab20927155..77ee6f142c8 100644
--- a/reactos/subsys/win32k/objects/brush.c
+++ b/reactos/subsys/win32k/objects/brush.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: brush.c,v 1.39 2004/07/03 17:40:27 navaraf Exp $
+ * $Id: brush.c,v 1.40 2004/07/14 20:48:57 navaraf Exp $
  */
 #include <w32k.h>
 
@@ -45,6 +45,56 @@ Brush_InternalDelete( PGDIBRUSHOBJ pBrush )
   return TRUE;
 }
 
+XLATEOBJ* FASTCALL
+IntGdiCreateBrushXlate(PDC Dc, GDIBRUSHOBJ *BrushObj, BOOLEAN *Failed)
+{
+   XLATEOBJ *Result = NULL;
+
+   if (BrushObj->flAttrs & GDIBRUSH_IS_NULL)
+   {
+      Result = NULL;
+      *Failed = FALSE;
+   }
+   else if (BrushObj->flAttrs & GDIBRUSH_IS_SOLID)
+   {
+      Result = IntEngCreateXlate(0, PAL_RGB, Dc->w.hPalette, NULL);
+      *Failed = FALSE;
+   }
+   else
+   {
+      BITMAPOBJ *Pattern = BITMAPOBJ_LockBitmap(BrushObj->hbmPattern);
+      if (Pattern == NULL)
+         return NULL;
+
+      /* Special case: 1bpp pattern */
+      if (Pattern->SurfObj.iBitmapFormat == BMF_1BPP)
+      {
+         if (Dc->w.bitsPerPixel != 1)
+            Result = IntEngCreateSrcMonoXlate(Dc->w.hPalette, Dc->w.textColor, Dc->w.backgroundColor);
+      }
+
+      BITMAPOBJ_UnlockBitmap(BrushObj->hbmPattern);
+      *Failed = FALSE;
+   }
+
+   return Result;
+}
+
+VOID FASTCALL
+IntGdiInitBrushInstance(GDIBRUSHINST *BrushInst, PGDIBRUSHOBJ BrushObj, XLATEOBJ *XlateObj)
+{
+   if (BrushObj->flAttrs & GDIBRUSH_IS_NULL)
+      BrushInst->BrushObject.iSolidColor = 0;			
+   else if (BrushObj->flAttrs & GDIBRUSH_IS_SOLID)
+      BrushInst->BrushObject.iSolidColor = XLATEOBJ_iXlate(XlateObj, BrushObj->BrushAttr.lbColor);
+   else
+      BrushInst->BrushObject.iSolidColor = 0xFFFFFFFF;
+   BrushInst->BrushObject.pvRbrush = BrushObj->ulRealization;
+   BrushInst->BrushObject.flColorType = 0;
+   BrushInst->GdiBrushObject = BrushObj;
+   BrushInst->XlateObject = XlateObj;
+}
+
 HBRUSH FASTCALL
 IntGdiCreateBrushIndirect(PLOGBRUSH LogBrush)
 {
@@ -54,21 +104,23 @@ IntGdiCreateBrushIndirect(PLOGBRUSH LogBrush)
    
    switch (LogBrush->lbStyle)
    {
-     case BS_HATCHED:
-       if(!(hPattern = NtGdiCreateBitmap(8, 8, 1, 1, HatchBrushes[LogBrush->lbHatch])))
-       {
-         SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
-         return NULL;
-       }
-       break;
+      case BS_HATCHED:
+         hPattern = NtGdiCreateBitmap(8, 8, 1, 1, HatchBrushes[LogBrush->lbHatch]);
+         if (hPattern == NULL)
+         {
+            SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
+            return NULL;
+         }
+         break;
      
-     case BS_PATTERN:
-       if(!(hPattern = BITMAPOBJ_CopyBitmap((HBITMAP)LogBrush->lbHatch)))
-       {
-         SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
-         return NULL;
-       }
-       break;
+      case BS_PATTERN:
+         hPattern = BITMAPOBJ_CopyBitmap((HBITMAP)LogBrush->lbHatch);
+         if (hPattern == NULL)
+         {
+            SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
+            return NULL;
+         }
+         break;
    }
    
    hBrush = BRUSHOBJ_AllocBrush();
@@ -89,7 +141,6 @@ IntGdiCreateBrushIndirect(PLOGBRUSH LogBrush)
       case BS_SOLID:
          BrushObject->flAttrs |= GDIBRUSH_IS_SOLID;
          BrushObject->BrushAttr.lbColor = LogBrush->lbColor & 0xFFFFFF;
-         BrushObject->BrushObject.iSolidColor = BrushObject->BrushAttr.lbColor;
          /* FIXME: Fill in the rest of fields!!! */
          break;
 
@@ -97,13 +148,11 @@ IntGdiCreateBrushIndirect(PLOGBRUSH LogBrush)
          BrushObject->flAttrs |= GDIBRUSH_IS_HATCH;
          BrushObject->hbmPattern = hPattern;
          BrushObject->BrushAttr.lbColor = LogBrush->lbColor & 0xFFFFFF;
-         BrushObject->BrushObject.iSolidColor = 0xFFFFFFFF;
          break;
 
       case BS_PATTERN:
          BrushObject->flAttrs |= GDIBRUSH_IS_BITMAP;
          BrushObject->hbmPattern = hPattern;
-         BrushObject->BrushObject.iSolidColor = 0xFFFFFFFF;
          /* FIXME: Fill in the rest of fields!!! */
          break;
 
@@ -128,6 +177,7 @@ IntPatBlt(
 {
    RECTL DestRect;
    BITMAPOBJ *BitmapObj;
+   GDIBRUSHINST BrushInst;
    POINTL BrushOrigin;
    BOOL ret = TRUE;
 
@@ -166,6 +216,8 @@ IntPatBlt(
       BrushOrigin.x = BrushObj->ptOrigin.x + dc->w.DCOrgX;
       BrushOrigin.y = BrushObj->ptOrigin.y + dc->w.DCOrgY;
 
+      IntGdiInitBrushInstance(&BrushInst, BrushObj, dc->XlateBrush);
+
       ret = IntEngBitBlt(
          BitmapObj,
          NULL,
@@ -175,7 +227,7 @@ IntPatBlt(
          &DestRect,
          NULL,
          NULL,
-         &BrushObj->BrushObject,
+         &BrushInst.BrushObject,
          &BrushOrigin,
          ROP);
    }
diff --git a/reactos/subsys/win32k/objects/cliprgn.c b/reactos/subsys/win32k/objects/cliprgn.c
index c2b3bb6dcc8..81b29f9d8c2 100644
--- a/reactos/subsys/win32k/objects/cliprgn.c
+++ b/reactos/subsys/win32k/objects/cliprgn.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: cliprgn.c,v 1.41 2004/07/07 16:34:33 navaraf Exp $ */
+/* $Id: cliprgn.c,v 1.42 2004/07/14 20:48:58 navaraf Exp $ */
 #include <w32k.h>
 
 int FASTCALL
@@ -220,6 +220,7 @@ int STDCALL NtGdiGetMetaRgn(HDC  hDC,
                     HRGN  hrgn)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 int STDCALL NtGdiExcludeClipRect(HDC  hDC,
@@ -328,6 +329,7 @@ int STDCALL NtGdiOffsetClipRgn(HDC  hDC,
                        int  YOffset)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 BOOL STDCALL NtGdiPtVisible(HDC  hDC,
@@ -389,6 +391,7 @@ BOOL STDCALL NtGdiSelectClipPath(HDC  hDC,
                          int  Mode)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 INT STDCALL
@@ -400,6 +403,7 @@ NtGdiSelectClipRgn(HDC hDC, HRGN hRgn)
 int STDCALL NtGdiSetMetaRgn(HDC  hDC)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 /* EOF */
diff --git a/reactos/subsys/win32k/objects/color.c b/reactos/subsys/win32k/objects/color.c
index bd4010937e1..f9070b0bbbb 100644
--- a/reactos/subsys/win32k/objects/color.c
+++ b/reactos/subsys/win32k/objects/color.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: color.c,v 1.49 2004/07/04 17:09:45 navaraf Exp $ */
+/* $Id: color.c,v 1.50 2004/07/14 20:48:58 navaraf Exp $ */
 #include <w32k.h>
 
 // FIXME: Use PXLATEOBJ logicalToSystem instead of int *mapping
@@ -135,7 +135,8 @@ HPALETTE STDCALL NtGdiCreatePalette(CONST PLOGPALETTE palette)
 BOOL STDCALL NtGdiGetColorAdjustment(HDC  hDC,
                              LPCOLORADJUSTMENT  ca)
 {
-  UNIMPLEMENTED;
+   UNIMPLEMENTED;
+   return FALSE;
 }
 
 unsigned short GetNumberOfBits(unsigned int dwMask)
@@ -422,6 +423,7 @@ BOOL STDCALL NtGdiResizePalette(HPALETTE  hpal,
   return TRUE; */
 
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 /*!
@@ -478,7 +480,8 @@ HPALETTE STDCALL NtGdiSelectPalette(HDC  hDC,
 BOOL STDCALL NtGdiSetColorAdjustment(HDC  hDC,
                              CONST LPCOLORADJUSTMENT  ca)
 {
-  UNIMPLEMENTED;
+   UNIMPLEMENTED;
+   return FALSE;
 }
 
 UINT STDCALL NtGdiSetPaletteEntries(HPALETTE  hpal,
@@ -515,12 +518,14 @@ UINT STDCALL
 NtGdiSetSystemPaletteUse(HDC hDC, UINT Usage)
 {
    UNIMPLEMENTED;
+   return 0;
 }
 
 BOOL STDCALL
 NtGdiUnrealizeObject(HGDIOBJ hgdiobj)
 {
    UNIMPLEMENTED;
+   return FALSE;
 }
 
 BOOL STDCALL
diff --git a/reactos/subsys/win32k/objects/coord.c b/reactos/subsys/win32k/objects/coord.c
index 8bc3d35b67a..d3893d6e3dc 100644
--- a/reactos/subsys/win32k/objects/coord.c
+++ b/reactos/subsys/win32k/objects/coord.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: coord.c,v 1.25 2004/06/18 15:18:54 navaraf Exp $
+/* $Id: coord.c,v 1.26 2004/07/14 20:48:58 navaraf Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -481,7 +481,8 @@ NtGdiScaleViewportExtEx(HDC  hDC,
                              int  Ydenom,
                              LPSIZE  Size)
 {
-  UNIMPLEMENTED;
+   UNIMPLEMENTED;
+   return FALSE;
 }
 
 BOOL
@@ -493,7 +494,8 @@ NtGdiScaleWindowExtEx(HDC  hDC,
                            int  Ydenom,
                            LPSIZE  Size)
 {
-  UNIMPLEMENTED;
+   UNIMPLEMENTED;
+   return FALSE;
 }
 
 int
diff --git a/reactos/subsys/win32k/objects/dc.c b/reactos/subsys/win32k/objects/dc.c
index 9667640e560..f016a3bad11 100644
--- a/reactos/subsys/win32k/objects/dc.c
+++ b/reactos/subsys/win32k/objects/dc.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dc.c,v 1.143 2004/07/03 17:40:27 navaraf Exp $
+/* $Id: dc.c,v 1.144 2004/07/14 20:48:58 navaraf Exp $
  *
  * DC.C - Device context functions
  *
@@ -120,6 +120,7 @@ BOOL STDCALL
 NtGdiCancelDC(HDC  hDC)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 HDC STDCALL
@@ -869,6 +870,10 @@ NtGdiDeleteDC(HDC  DCHandle)
     {
       NtGdiDeleteObject (DCToDelete->w.hFirstBitmap);
     }
+    if (DCToDelete->XlateBrush != NULL)
+      EngDeleteXlate(DCToDelete->XlateBrush);
+    if (DCToDelete->XlatePen != NULL)
+      EngDeleteXlate(DCToDelete->XlatePen);
   }
   if (DCToDelete->w.hClipRgn)
   {
@@ -902,6 +907,7 @@ NtGdiDrawEscape(HDC  hDC,
                LPCSTR  lpszInData)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 INT STDCALL
@@ -911,6 +917,7 @@ NtGdiEnumObjects(HDC  hDC,
                 LPARAM  lParam)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 DC_GET_VAL( COLORREF, NtGdiGetBkColor, w.backgroundColor )
@@ -1613,6 +1620,7 @@ HDC STDCALL
 NtGdiResetDC(HDC  hDC, CONST DEVMODEW *InitData)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 BOOL STDCALL
@@ -1741,12 +1749,10 @@ NtGdiSelectObject(HDC  hDC, HGDIOBJ  hGDIObj)
   PGDIBRUSHOBJ pen;
   PGDIBRUSHOBJ brush;
   XLATEOBJ *XlateObj;
-  PPALGDI PalGDI;
   DWORD objectType;
-  COLORREF MonoColorMap[2];
   ULONG NumColors = 0;
   HRGN hVisRgn;
-  USHORT Mode;
+  BOOLEAN Failed;
 
   if(!hDC || !hGDIObj) return NULL;
   
@@ -1762,101 +1768,49 @@ NtGdiSelectObject(HDC  hDC, HGDIOBJ  hGDIObj)
   switch (objectType)
   {
     case GDI_OBJECT_TYPE_PEN:
-      objOrg = NULL;
-      /* Convert the color of the pen to the format of the DC */
-      PalGDI = PALETTE_LockPalette(dc->w.hPalette);
-      if (NULL != PalGDI)
-        {
-          Mode = PalGDI->Mode;
-          PALETTE_UnlockPalette(dc->w.hPalette);
-          XlateObj = (XLATEOBJ*)IntEngCreateXlate(Mode, PAL_RGB, dc->w.hPalette, NULL);
-          if (NULL != XlateObj)
-            {
-              pen = PENOBJ_LockPen((HPEN) hGDIObj);
-              if (NULL != pen)
-                {
-                  if (pen->flAttrs & GDIBRUSH_IS_SOLID)
-                    {
-                      pen->BrushObject.iSolidColor = 
-                        XLATEOBJ_iXlate(XlateObj, pen->BrushAttr.lbColor);
-                    }
-                  else
-                    {
-                      pen->BrushObject.iSolidColor = 0xFFFFFFFF;
-                    }
-                  pen->crBack = XLATEOBJ_iXlate(XlateObj, dc->w.backgroundColor);
-                  pen->crFore = XLATEOBJ_iXlate(XlateObj, dc->w.textColor);
-                  PENOBJ_UnlockPen((HPEN) hGDIObj);
-                  objOrg = (HGDIOBJ)dc->w.hPen;
-                  dc->w.hPen = hGDIObj;
-                }
-              else
-                {
-                  SetLastWin32Error(ERROR_INVALID_HANDLE);
-                }
-              EngDeleteXlate(XlateObj);
-	    }
-          else
-            {
-              SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES);
-            }
-        }
-      else
-        {
-          SetLastWin32Error(ERROR_INVALID_HANDLE);
-        }
+      pen = PENOBJ_LockPen((HPEN) hGDIObj);
+      if (pen == NULL)
+      {
+        SetLastWin32Error(ERROR_INVALID_HANDLE);
+        break;
+      }
+
+      XlateObj = IntGdiCreateBrushXlate(dc, pen, &Failed);
+      PENOBJ_UnlockPen((HPEN) hGDIObj);
+      if (Failed)
+      {
+        SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES);
+        break;
+      }
+
+      objOrg = (HGDIOBJ)dc->w.hPen;
+      dc->w.hPen = hGDIObj;
+      if (dc->XlatePen != NULL)
+        EngDeleteXlate(dc->XlatePen);
+      dc->XlatePen = XlateObj;
       break;
 
     case GDI_OBJECT_TYPE_BRUSH:
-      objOrg = NULL;
-      /* Convert the color of the brush to the format of the DC */
-      PalGDI = PALETTE_LockPalette(dc->w.hPalette);
-      if (NULL != PalGDI)
-        {
-	  Mode = PalGDI->Mode;
-          PALETTE_UnlockPalette(dc->w.hPalette);
-          XlateObj = (XLATEOBJ*)IntEngCreateXlate(Mode, PAL_RGB, dc->w.hPalette, NULL);
-          if (NULL != XlateObj)
-            {
-              brush = BRUSHOBJ_LockBrush((HBRUSH) hGDIObj);
-              if (NULL != brush)
-                {
-                  if (brush->flAttrs & GDIBRUSH_IS_SOLID)
-                    {
-                      brush->BrushObject.iSolidColor = 
-                        XLATEOBJ_iXlate(XlateObj, brush->BrushAttr.lbColor);
-                    }
-                  else
-                    {
-                      brush->BrushObject.iSolidColor = 0xFFFFFFFF;
-                    }
-                  brush->crBack = XLATEOBJ_iXlate(XlateObj, dc->w.backgroundColor);
-                  brush->crFore = XLATEOBJ_iXlate(XlateObj, ((brush->flAttrs & GDIBRUSH_IS_HATCH) ? 
-                                                             brush->BrushAttr.lbColor : dc->w.textColor));
-                  /* according to the documentation of SetBrushOrgEx(), the origin is assigned to the
-                     next brush selected into the DC, so we should set it here */
-                  brush->ptOrigin.x = dc->w.brushOrgX;
-                  brush->ptOrigin.y = dc->w.brushOrgY;
-                  
-                  BRUSHOBJ_UnlockBrush((HBRUSH) hGDIObj);
-                  objOrg = (HGDIOBJ)dc->w.hBrush;
-                  dc->w.hBrush = (HBRUSH) hGDIObj;
-                }
-              else
-                {
-                  SetLastWin32Error(ERROR_INVALID_HANDLE);
-                }
-              EngDeleteXlate(XlateObj);
-            }
-          else
-            {
-              SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES);
-            }
-        }
-      else
-        {
-          SetLastWin32Error(ERROR_INVALID_HANDLE);
-        }
+      brush = BRUSHOBJ_LockBrush((HPEN) hGDIObj);
+      if (brush == NULL)
+      {
+        SetLastWin32Error(ERROR_INVALID_HANDLE);
+        break;
+      }
+
+      XlateObj = IntGdiCreateBrushXlate(dc, brush, &Failed);
+      BRUSHOBJ_UnlockBrush((HPEN) hGDIObj);
+      if (Failed)
+      {
+        SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES);
+        break;
+      }
+
+      objOrg = (HGDIOBJ)dc->w.hBrush;
+      dc->w.hBrush = hGDIObj;
+      if (dc->XlateBrush != NULL)
+        EngDeleteXlate(dc->XlateBrush);
+      dc->XlateBrush = XlateObj;
       break;
 
     case GDI_OBJECT_TYPE_FONT:
@@ -1907,18 +1861,13 @@ NtGdiSelectObject(HDC  hDC, HGDIOBJ  hGDIObj)
       else
       {
         dc->w.bitsPerPixel = BitsPerFormat(pb->SurfObj.iBitmapFormat);
-        if (1 == dc->w.bitsPerPixel)
-          {
-            MonoColorMap[0] = RGB(0, 0, 0);
-            MonoColorMap[1] = RGB(255, 255, 255);
-            dc->w.hPalette = PALETTE_AllocPaletteIndexedRGB(2, (RGBQUAD*)MonoColorMap);
-          }
-        else
-          {
-            dc->w.hPalette = dc->DevInfo->hpalDefault;
-          }
+        dc->w.hPalette = dc->DevInfo->hpalDefault;
       }
 
+      /* Reselect brush and pen to regenerate the XLATEOBJs. */
+      NtGdiSelectObject ( hDC, dc->w.hBrush );
+      NtGdiSelectObject ( hDC, dc->w.hPen );
+
       DC_UnlockDc ( hDC );
       hVisRgn = NtGdiCreateRectRgn ( 0, 0, pb->SurfObj.sizlBitmap.cx, pb->SurfObj.sizlBitmap.cy );
       NtGdiSelectVisRgn ( hDC, hVisRgn );
@@ -2034,6 +1983,8 @@ DC_AllocDC(PUNICODE_STRING Driver)
   NewDC->wndExtY = 1.0f;
   NewDC->vportExtX = 1.0f;
   NewDC->vportExtY = 1.0f;
+  NewDC->w.textColor = 0;
+  NewDC->w.backgroundColor = 0xffffff;
 
   NewDC->w.hFont = NtGdiGetStockObject(SYSTEM_FONT);
   TextIntRealizeFont(NewDC->w.hFont);
@@ -2183,89 +2134,20 @@ IntIsPrimarySurface(SURFOBJ *SurfObj)
 COLORREF FASTCALL
 IntGetDCColor(HDC hDC, ULONG Object)
 {
-  COLORREF Result;
-  DC *dc;
-  PPALGDI PalGDI;
-  PGDIBRUSHOBJ pen;
-  PGDIBRUSHOBJ brush;
-  XLATEOBJ *XlateObj;
-  HPALETTE Pal = 0;
-  USHORT Mode;
-  ULONG iColor;
-  
-  if(!(dc = DC_LockDc(hDC)))
-  {
-    SetLastWin32Error(ERROR_INVALID_HANDLE);
-    return CLR_INVALID;
-  }
-  
-  switch(Object)
-  {
-    case OBJ_PEN:
-    {
-      if(!(pen = PENOBJ_LockPen(dc->w.hPen)))
-      {
-        DC_UnlockDc(hDC);
-        return CLR_INVALID;
-      }
-      if(!(pen->flAttrs & GDIBRUSH_IS_SOLID))
-      {
-        /* FIXME - just bail here? */
-        PENOBJ_UnlockPen(dc->w.hPen);
-        DC_UnlockDc(hDC);
-        return CLR_INVALID;
-      }
-      iColor = pen->BrushObject.iSolidColor;
-      PENOBJ_UnlockPen(dc->w.hPen);
-      break;
-    }
-    case OBJ_BRUSH:
-    {
-      if(!(brush = BRUSHOBJ_LockBrush(dc->w.hBrush)))
-      {
-        DC_UnlockDc(hDC);
-        return CLR_INVALID;
-      }
-      if(!(brush->flAttrs & GDIBRUSH_IS_SOLID))
-      {
-        /* FIXME - just bail here? */
-        BRUSHOBJ_UnlockBrush(dc->w.hBrush);
-        DC_UnlockDc(hDC);
-        return CLR_INVALID;
-      }
-      iColor = brush->BrushObject.iSolidColor;
-      BRUSHOBJ_UnlockBrush(dc->w.hBrush);
-      break;
-    }
-    default:
-    {
-      DC_UnlockDc(hDC);
-      SetLastWin32Error(ERROR_INVALID_PARAMETER);
-      return CLR_INVALID;
-    }
-  }
-  
-  /* translate the color into RGB */
-  
-  if(dc->w.hPalette)
-    Pal = dc->w.hPalette;
-  
-  Result = CLR_INVALID;
-  
-  if((PalGDI = PALETTE_LockPalette(dc->w.hPalette)))
-  {
-    Mode = PalGDI->Mode;
-    PALETTE_UnlockPalette(dc->w.hPalette);
-    XlateObj = (XLATEOBJ*)IntEngCreateXlate(PAL_RGB, Mode, NULL, Pal);
-    if(XlateObj)
-    {
-      Result = XLATEOBJ_iXlate(XlateObj, iColor);
-      EngDeleteXlate(XlateObj);
-    }
-  }
-  
-  DC_UnlockDc(hDC);
-  return Result;
+   /*
+    * The previous implementation was completly incorrect. It modified the
+    * brush that was currently selected into the device context, but in fact
+    * the DC pen/brush color should be stored directly in the device context
+    * (at address 0x2C of the user mode DC object memory on Windows 2K/XP).
+    * The actual color is then used when DC_BRUSH/DC_PEN object is selected
+    * into the device context and BRUSHOBJ for drawing is composed (belongs
+    * to IntGdiInitBrushInstance in the current ReactOS implementation). Also
+    * the implementation should be moved to user mode GDI32.dll when UM
+    * mapped GDI objects will be implemented.
+    */
+
+   DPRINT("WIN32K:IntGetDCColor is unimplemented\n");
+   return 0xFFFFFF; /* The default DC color. */
 }
 
 /*
@@ -2275,133 +2157,10 @@ IntGetDCColor(HDC hDC, ULONG Object)
 COLORREF FASTCALL
 IntSetDCColor(HDC hDC, ULONG Object, COLORREF Color)
 {
-  COLORREF Result;
-  DC *dc;
-  PPALGDI PalGDI;
-  PGDIBRUSHOBJ pen;
-  PGDIBRUSHOBJ brush;
-  XLATEOBJ *XlateObj;
-  HPALETTE Pal = 0;
-  USHORT Mode;
-  ULONG iColor;
-  
-  if(Color == CLR_INVALID)
-  {
-    SetLastWin32Error(ERROR_INVALID_PARAMETER);
-    return CLR_INVALID;
-  }
-  
-  if(!(dc = DC_LockDc(hDC)))
-  {
-    SetLastWin32Error(ERROR_INVALID_HANDLE);
-    return CLR_INVALID;
-  }
-  
-  switch(Object)
-  {
-    case OBJ_PEN:
-    {
-      if(!(pen = PENOBJ_LockPen(dc->w.hPen)))
-      {
-        DC_UnlockDc(hDC);
-        return CLR_INVALID;
-      }
-      if(!(pen->flAttrs & GDIBRUSH_IS_SOLID))
-      {
-        /* FIXME - just bail here? */
-        PENOBJ_UnlockPen(dc->w.hPen);
-        DC_UnlockDc(hDC);
-        return CLR_INVALID;
-      }
-      
-      /* save old color index, translate it to RGB later */
-      iColor = pen->BrushObject.iSolidColor;
-      
-      if(!(PalGDI = PALETTE_LockPalette(dc->w.hPalette)))
-      {
-        PENOBJ_UnlockPen(dc->w.hPen);
-        DC_UnlockDc(hDC);
-        return CLR_INVALID;
-      }
-      Mode = PalGDI->Mode;
-      PALETTE_UnlockPalette(dc->w.hPalette);
-      if(!(XlateObj = (XLATEOBJ*)IntEngCreateXlate(Mode, PAL_RGB, dc->w.hPalette, NULL)))
-      {
-        PENOBJ_UnlockPen(dc->w.hPen);
-        DC_UnlockDc(hDC);
-        return CLR_INVALID;
-      }
-      pen->BrushObject.iSolidColor = XLATEOBJ_iXlate(XlateObj, (ULONG)Color);
-      EngDeleteXlate(XlateObj);
-      PENOBJ_UnlockPen(dc->w.hPen);
-      break;
-    }
-    case OBJ_BRUSH:
-    {
-      if(!(brush = BRUSHOBJ_LockBrush(dc->w.hBrush)))
-      {
-        DC_UnlockDc(hDC);
-        return CLR_INVALID;
-      }
-      if(!(brush->flAttrs & GDIBRUSH_IS_SOLID))
-      {
-        /* FIXME - just bail here? */
-        BRUSHOBJ_UnlockBrush(dc->w.hBrush);
-        DC_UnlockDc(hDC);
-        return CLR_INVALID;
-      }
-      
-      /* save old color index, translate it to RGB later */
-      iColor = brush->BrushObject.iSolidColor;
-      
-      if(!(PalGDI = PALETTE_LockPalette(dc->w.hPalette)))
-      {
-        PENOBJ_UnlockPen(dc->w.hPen);
-        DC_UnlockDc(hDC);
-        return CLR_INVALID;
-      }
-      Mode = PalGDI->Mode;
-      PALETTE_UnlockPalette(dc->w.hPalette);
-      if(!(XlateObj = (XLATEOBJ*)IntEngCreateXlate(Mode, PAL_RGB, dc->w.hPalette, NULL)))
-      {
-        PENOBJ_UnlockPen(dc->w.hPen);
-        DC_UnlockDc(hDC);
-        return CLR_INVALID;
-      }
-      brush->BrushObject.iSolidColor = XLATEOBJ_iXlate(XlateObj, (ULONG)Color);
-      EngDeleteXlate(XlateObj);
-      BRUSHOBJ_UnlockBrush(dc->w.hBrush);
-      break;
-    }
-    default:
-    {
-      DC_UnlockDc(hDC);
-      SetLastWin32Error(ERROR_INVALID_PARAMETER);
-      return CLR_INVALID;
-    }
-  }
-  
-  /* translate the old color into RGB */
-  
-  if(dc->w.hPalette)
-    Pal = dc->w.hPalette;
-  
-  Result = CLR_INVALID;
-  
-  if((PalGDI = PALETTE_LockPalette(dc->w.hPalette)))
-  {
-    Mode = PalGDI->Mode;
-    PALETTE_UnlockPalette(dc->w.hPalette);
-    XlateObj = (XLATEOBJ*)IntEngCreateXlate(PAL_RGB, Mode, NULL, Pal);
-    if(XlateObj)
-    {
-      Result = XLATEOBJ_iXlate(XlateObj, iColor);
-      EngDeleteXlate(XlateObj);
-    }
-  }
-  
-  DC_UnlockDc(hDC);
-  return Result;
+   /* See the comment in IntGetDCColor. */
+
+   DPRINT("WIN32K:IntSetDCColor is unimplemented\n");
+   return CLR_INVALID;
 }
 
 /* EOF */
diff --git a/reactos/subsys/win32k/objects/fillshap.c b/reactos/subsys/win32k/objects/fillshap.c
index e5f530da0a5..3894c2b303e 100644
--- a/reactos/subsys/win32k/objects/fillshap.c
+++ b/reactos/subsys/win32k/objects/fillshap.c
@@ -16,24 +16,24 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: fillshap.c,v 1.51 2004/07/03 13:55:36 navaraf Exp $ */
+/* $Id: fillshap.c,v 1.52 2004/07/14 20:48:58 navaraf Exp $ */
 #include <w32k.h>
 
 /*
  * a couple macros to fill a single pixel or a line
  */
-#define PUTPIXEL(x,y,brushObj)         \
+#define PUTPIXEL(x,y,BrushInst)        \
   ret = ret && IntEngLineTo(BitmapObj, \
        dc->CombinedClip,               \
-       &brushObj->BrushObject,         \
+       &BrushInst.BrushObject,         \
        x, y, (x)+1, y,                 \
        &RectBounds,                    \
        dc->w.ROPmode);
 
-#define PUTLINE(x1,y1,x2,y2,brushObj)  \
+#define PUTLINE(x1,y1,x2,y2,BrushInst) \
   ret = ret && IntEngLineTo(BitmapObj, \
        dc->CombinedClip,               \
-       &brushObj->BrushObject,         \
+       &BrushInst.BrushObject,         \
        x1, y1, x2, y2,                 \
        &RectBounds,                    \
        dc->w.ROPmode);
@@ -45,6 +45,7 @@ IntGdiPolygon(PDC    dc,
 {
   BITMAPOBJ *BitmapObj;
   PGDIBRUSHOBJ PenBrushObj, FillBrushObj;
+  GDIBRUSHINST PenBrushInst, FillBrushInst;
   BOOL ret = FALSE; // default to failure
   RECTL DestRect;
   int CurrentPoint;
@@ -88,11 +89,15 @@ IntGdiPolygon(PDC    dc,
 	FillBrushObj = BRUSHOBJ_LockBrush(dc->w.hBrush);
 	ASSERT(FillBrushObj);
 	if (!(FillBrushObj->flAttrs & GDIBRUSH_IS_NULL))
-	  ret = FillPolygon ( dc, BitmapObj, &FillBrushObj->BrushObject, dc->w.ROPmode, UnsafePoints, Count, DestRect );
+	{
+          IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush);
+	  ret = FillPolygon ( dc, BitmapObj, &FillBrushInst.BrushObject, dc->w.ROPmode, UnsafePoints, Count, DestRect );
+	}
 	BRUSHOBJ_UnlockBrush(dc->w.hBrush);
 
 	/* get BRUSHOBJ from current pen. */
 	PenBrushObj = PENOBJ_LockPen(dc->w.hPen);
+        IntGdiInitBrushInstance(&PenBrushInst, PenBrushObj, dc->XlatePen);
 
 	// Draw the Polygon Edges with the current pen ( if not a NULL pen )
 	if (!(PenBrushObj->flAttrs & GDIBRUSH_IS_NULL))
@@ -114,7 +119,7 @@ IntGdiPolygon(PDC    dc,
 	    //DPRINT("Polygon Making line from (%d,%d) to (%d,%d)\n", From.x, From.y, To.x, To.y );
 	    ret = IntEngLineTo(BitmapObj,
 			       dc->CombinedClip,
-			       &PenBrushObj->BrushObject,
+			       &PenBrushInst.BrushObject,
 			       From.x,
 			       From.y,
 			       To.x,
@@ -173,6 +178,7 @@ NtGdiChord(HDC  hDC,
                 int  YRadial2)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 /*
@@ -206,6 +212,7 @@ NtGdiEllipse(
    int RadiusX, RadiusY;
    int Temp;
    PGDIBRUSHOBJ FillBrush, PenBrush;
+   GDIBRUSHINST FillBrushInst, PenBrushInst;
    BITMAPOBJ *BitmapObj;
    RECTL RectBounds;
    PDC dc;
@@ -252,6 +259,9 @@ NtGdiEllipse(
    BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap);
    ASSERT(BitmapObj);
 
+   IntGdiInitBrushInstance(&FillBrushInst, FillBrush, dc->XlateBrush);
+   IntGdiInitBrushInstance(&PenBrushInst, PenBrush, dc->XlatePen);
+
    nLeftRect += dc->w.DCOrgX;
    nRightRect += dc->w.DCOrgX - 1;
    nTopRect += dc->w.DCOrgY;
@@ -319,10 +329,10 @@ NtGdiEllipse(
       
       if ((A > da) && (A < db))
       {
-         PUTLINE(CenterX - D, CenterY + A, CenterX + D, CenterY + A, FillBrush);
+         PUTLINE(CenterX - D, CenterY + A, CenterX + D, CenterY + A, FillBrushInst);
          if (A)
          {
-            PUTLINE(CenterX - D, CenterY - A, CenterX + D, CenterY - A, FillBrush);
+            PUTLINE(CenterX - D, CenterY - A, CenterX + D, CenterY - A, FillBrushInst);
          }
          da = A;
       }
@@ -333,8 +343,8 @@ NtGdiEllipse(
       
       if ((B < db) && (B > da))
       { 
-         PUTLINE(CenterX - C, CenterY + B, CenterX + C, CenterY + B, FillBrush);
-         PUTLINE(CenterX - C, CenterY - B, CenterX + C, CenterY - B, FillBrush);
+         PUTLINE(CenterX - C, CenterY + B, CenterX + C, CenterY + B, FillBrushInst);
+         PUTLINE(CenterX - C, CenterY - B, CenterX + C, CenterY - B, FillBrushInst);
          db = B;
       }
 
@@ -344,27 +354,27 @@ NtGdiEllipse(
 
       if (Cond1)
       {
-         PUTPIXEL(CenterX + C, CenterY + B, PenBrush);
+         PUTPIXEL(CenterX + C, CenterY + B, PenBrushInst);
          if (C)
-            PUTPIXEL(CenterX - C, CenterY + B, PenBrush);
+            PUTPIXEL(CenterX - C, CenterY + B, PenBrushInst);
          if (B)
          {
-            PUTPIXEL(CenterX + C, CenterY - B, PenBrush);
+            PUTPIXEL(CenterX + C, CenterY - B, PenBrushInst);
             if (C)
-               PUTPIXEL(CenterX - C, CenterY - B, PenBrush);
+               PUTPIXEL(CenterX - C, CenterY - B, PenBrushInst);
          }
       }
 
       if (Cond2)
       {
-         PUTPIXEL(CenterX + D, CenterY + A, PenBrush);
+         PUTPIXEL(CenterX + D, CenterY + A, PenBrushInst);
          if (D)
-            PUTPIXEL(CenterX - D, CenterY + A, PenBrush);
+            PUTPIXEL(CenterX - D, CenterY + A, PenBrushInst);
          if (A)
          {
-            PUTPIXEL(CenterX + D, CenterY - A, PenBrush);
+            PUTPIXEL(CenterX + D, CenterY - A, PenBrushInst);
             if (D)
-               PUTPIXEL(CenterX - D, CenterY - A, PenBrush);
+               PUTPIXEL(CenterX - D, CenterY - A, PenBrushInst);
          }
       }
    } while (B > A);
@@ -922,6 +932,7 @@ IntRectangle(PDC dc,
 {
   BITMAPOBJ *BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap);
   PGDIBRUSHOBJ PenBrushObj, FillBrushObj;
+  GDIBRUSHINST PenBrushInst, FillBrushInst;
   BOOL       ret = FALSE; // default to failure
   RECTL      DestRect;
 
@@ -945,6 +956,7 @@ IntRectangle(PDC dc,
     DestRect.bottom = BottomRect;
 
     FillBrushObj = BRUSHOBJ_LockBrush(dc->w.hBrush);
+    IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush);
 
     if ( FillBrushObj )
     {
@@ -958,7 +970,7 @@ IntRectangle(PDC dc,
                            &DestRect,
                            NULL,
                            NULL,
-                           &FillBrushObj->BrushObject,
+                           &FillBrushInst.BrushObject,
                            NULL,
                            PATCOPY);
       }
@@ -975,6 +987,8 @@ IntRectangle(PDC dc,
       return FALSE;
     }
 
+    IntGdiInitBrushInstance(&PenBrushInst, PenBrushObj, dc->XlatePen);
+
     // Draw the rectangle with the current pen
 
     ret = TRUE; // change default to success
@@ -983,28 +997,28 @@ IntRectangle(PDC dc,
     {
       ret = ret && IntEngLineTo(BitmapObj,
 			 dc->CombinedClip,
-			 &PenBrushObj->BrushObject,
+			 &PenBrushInst.BrushObject,
 			 LeftRect, TopRect, RightRect, TopRect,
 			 &DestRect, // Bounding rectangle
 			 dc->w.ROPmode); // MIX
 
       ret = ret && IntEngLineTo(BitmapObj,
 			 dc->CombinedClip,
-			 &PenBrushObj->BrushObject,
+			 &PenBrushInst.BrushObject,
 			 RightRect, TopRect, RightRect, BottomRect,
 			 &DestRect, // Bounding rectangle
 			 dc->w.ROPmode); // MIX
 
       ret = ret && IntEngLineTo(BitmapObj,
 			 dc->CombinedClip,
-			 &PenBrushObj->BrushObject,
+			 &PenBrushInst.BrushObject,
 			 RightRect, BottomRect, LeftRect, BottomRect,
 			 &DestRect, // Bounding rectangle
 			 dc->w.ROPmode); // MIX
 
       ret = ret && IntEngLineTo(BitmapObj,
 			 dc->CombinedClip,
-			 &PenBrushObj->BrushObject,
+			 &PenBrushInst.BrushObject,
 			 LeftRect, BottomRect, LeftRect, TopRect,
 			 &DestRect, // Bounding rectangle
 			 dc->w.ROPmode); // MIX */
@@ -1059,6 +1073,7 @@ IntRoundRect(
 {
   BITMAPOBJ   *BitmapObj;
   PGDIBRUSHOBJ   PenBrushObj, FillBrushObj;
+  GDIBRUSHINST FillBrushInst, PenBrushInst;
   RECTL      RectBounds;
   int i, col, row, width, height, x1, x1start, x2, x2start, y1, y2;
   int xradius, yradius;
@@ -1108,6 +1123,9 @@ IntRoundRect(
     PenBrushObj = NULL;
   }
 
+  IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush);
+  IntGdiInitBrushInstance(&PenBrushInst, PenBrushObj, dc->XlatePen);
+
   right--;
   bottom--;
 
@@ -1148,20 +1166,20 @@ IntRoundRect(
     if ( d >= 0 )
     {
       if ( FillBrushObj )
-        PUTLINE ( x1, y1, x2, y1, FillBrushObj );
+        PUTLINE ( x1, y1, x2, y1, FillBrushInst );
       if ( first )
       {
 	if ( PenBrushObj )
 	{
 	  if ( x1start > x1 )
 	  {
-	    PUTLINE ( x1, y1, x1start, y1, PenBrushObj );
-	    PUTLINE ( x2start+1, y2, x2+1, y2, PenBrushObj );
+	    PUTLINE ( x1, y1, x1start, y1, PenBrushInst );
+	    PUTLINE ( x2start+1, y2, x2+1, y2, PenBrushInst );
 	  }
 	  else
 	  {
-	    PUTPIXEL ( x1, y1, PenBrushObj );
-	    PUTPIXEL ( x2, y2, PenBrushObj );
+	    PUTPIXEL ( x1, y1, PenBrushInst );
+	    PUTPIXEL ( x2, y2, PenBrushInst );
 	  }
 	}
 	first = FALSE;
@@ -1169,18 +1187,18 @@ IntRoundRect(
       else
       {
 	if ( FillBrushObj )
-	  PUTLINE ( x1, y2, x2, y2, FillBrushObj );
+	  PUTLINE ( x1, y2, x2, y2, FillBrushInst );
 	if ( PenBrushObj )
 	{
 	  if ( x1start >= x1 )
 	  {
-	    PUTLINE ( x1, y1, x1start+1, y1, PenBrushObj );
-	    PUTLINE ( x2start, y2, x2+1, y2, PenBrushObj );
+	    PUTLINE ( x1, y1, x1start+1, y1, PenBrushInst );
+	    PUTLINE ( x2start, y2, x2+1, y2, PenBrushInst );
 	  }
 	  else
 	  {
-	    PUTPIXEL ( x1, y1, PenBrushObj );
-	    PUTPIXEL ( x2, y2, PenBrushObj );
+	    PUTPIXEL ( x1, y1, PenBrushInst );
+	    PUTPIXEL ( x2, y2, PenBrushInst );
 	  }
 	}
       }
@@ -1188,13 +1206,13 @@ IntRoundRect(
       {
 	if ( x1start > x1 )
 	{
-	  PUTLINE ( x1, y2, x1start+1, y2, PenBrushObj );
-	  PUTLINE ( x2start, y1, x2+1, y1, PenBrushObj );
+	  PUTLINE ( x1, y2, x1start+1, y2, PenBrushInst );
+	  PUTLINE ( x2start, y1, x2+1, y1, PenBrushInst );
 	}
 	else
 	{
-	  PUTPIXEL ( x1, y2, PenBrushObj );
-	  PUTPIXEL ( x2, y1, PenBrushObj );
+	  PUTPIXEL ( x1, y2, PenBrushInst );
+	  PUTPIXEL ( x2, y1, PenBrushInst );
 	}
       }
       x1start = x1-1;
@@ -1224,15 +1242,15 @@ IntRoundRect(
   {
     if ( FillBrushObj )
     {
-      PUTLINE ( x1, y1, x2, y1, FillBrushObj );
-      PUTLINE ( x1, y2, x2, y2, FillBrushObj );
+      PUTLINE ( x1, y1, x2, y1, FillBrushInst );
+      PUTLINE ( x1, y2, x2, y2, FillBrushInst );
     }
     if ( PenBrushObj )
     {
-      PUTPIXEL ( x2, y1, PenBrushObj );
-      PUTPIXEL ( x1, y2, PenBrushObj );
-      PUTPIXEL ( x2, y2, PenBrushObj );
-      PUTPIXEL ( x1, y1, PenBrushObj );
+      PUTPIXEL ( x2, y1, PenBrushInst );
+      PUTPIXEL ( x1, y2, PenBrushInst );
+      PUTPIXEL ( x2, y2, PenBrushInst );
+      PUTPIXEL ( x1, y1, PenBrushInst );
     }
 
     if ( d <= 0 )
@@ -1247,22 +1265,22 @@ IntRoundRect(
 
   if ( FillBrushObj )
   {
-    PUTLINE ( left, y1, right, y1, FillBrushObj );
-    PUTLINE ( left, y2, right, y2, FillBrushObj );
+    PUTLINE ( left, y1, right, y1, FillBrushInst );
+    PUTLINE ( left, y2, right, y2, FillBrushInst );
   }
   if ( PenBrushObj )
   {
     if ( x1 > (left+1) )
     {
-      PUTLINE ( left, y1, x1, y1, PenBrushObj );
-      PUTLINE ( x2+1, y1, right, y1, PenBrushObj );
-      PUTLINE ( left+1, y2, x1, y2, PenBrushObj );
-      PUTLINE ( x2+1, y2, right+1, y2, PenBrushObj );
+      PUTLINE ( left, y1, x1, y1, PenBrushInst );
+      PUTLINE ( x2+1, y1, right, y1, PenBrushInst );
+      PUTLINE ( left+1, y2, x1, y2, PenBrushInst );
+      PUTLINE ( x2+1, y2, right+1, y2, PenBrushInst );
     }
     else
     {
-      PUTPIXEL ( left, y1, PenBrushObj );
-      PUTPIXEL ( right, y2, PenBrushObj );
+      PUTPIXEL ( left, y1, PenBrushInst );
+      PUTPIXEL ( right, y2, PenBrushInst );
     }
   }
 
@@ -1274,15 +1292,15 @@ IntRoundRect(
   if ( FillBrushObj )
   {
     for ( i = y1+1; i < y2; i++ )
-      PUTLINE ( left, i, right, i, FillBrushObj );
+      PUTLINE ( left, i, right, i, FillBrushInst );
   }
 
   if ( PenBrushObj )
   {
-    PUTLINE ( x1,    top,    x2,    top,    PenBrushObj );
-    PUTLINE ( right, y1,     right, y2,     PenBrushObj );
-    PUTLINE ( x2,    bottom, x1,    bottom, PenBrushObj );
-    PUTLINE ( left,  y2,     left,  y1,     PenBrushObj );
+    PUTLINE ( x1,    top,    x2,    top,    PenBrushInst );
+    PUTLINE ( right, y1,     right, y2,     PenBrushInst );
+    PUTLINE ( x2,    bottom, x1,    bottom, PenBrushInst );
+    PUTLINE ( left,  y2,     left,  y1,     PenBrushInst );
   }
 
   BITMAPOBJ_UnlockBitmap(dc->w.hBitmap);
diff --git a/reactos/subsys/win32k/objects/icm.c b/reactos/subsys/win32k/objects/icm.c
index 3eb9470ac24..ae016b8a491 100644
--- a/reactos/subsys/win32k/objects/icm.c
+++ b/reactos/subsys/win32k/objects/icm.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: icm.c,v 1.10 2004/05/10 17:07:20 weiden Exp $ */
+/* $Id: icm.c,v 1.11 2004/07/14 20:48:58 navaraf Exp $ */
 #include <w32k.h>
 
 BOOL
@@ -27,6 +27,7 @@ NtGdiCheckColorsInGamut(HDC  hDC,
                              UINT  Count)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 BOOL
@@ -36,6 +37,7 @@ NtGdiColorMatchToTarget(HDC  hDC,
                              DWORD  Action)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 HCOLORSPACE
@@ -43,6 +45,7 @@ STDCALL
 NtGdiCreateColorSpace(LPLOGCOLORSPACEW  LogColorSpace)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 BOOL
@@ -50,6 +53,7 @@ STDCALL
 NtGdiDeleteColorSpace(HCOLORSPACE  hColorSpace)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 INT
@@ -81,6 +85,7 @@ NtGdiGetDeviceGammaRamp(HDC  hDC,
                              LPVOID  Ramp)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 BOOL
@@ -90,6 +95,7 @@ NtGdiGetICMProfile(HDC  hDC,
                         LPWSTR  Filename)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 BOOL
@@ -99,6 +105,7 @@ NtGdiGetLogColorSpace(HCOLORSPACE  hColorSpace,
                            DWORD  Size)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 HCOLORSPACE
@@ -107,6 +114,7 @@ NtGdiSetColorSpace(HDC  hDC,
                                HCOLORSPACE  hColorSpace)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 BOOL
@@ -115,6 +123,7 @@ NtGdiSetDeviceGammaRamp(HDC  hDC,
                              LPVOID  Ramp)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 INT
@@ -145,6 +154,7 @@ NtGdiSetICMProfile(HDC  hDC,
                         LPWSTR  Filename)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 BOOL
@@ -155,6 +165,7 @@ NtGdiUpdateICMRegKey(DWORD  Reserved,
                           UINT  Command)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 /* EOF */
diff --git a/reactos/subsys/win32k/objects/line.c b/reactos/subsys/win32k/objects/line.c
index ade99359842..e80509be181 100644
--- a/reactos/subsys/win32k/objects/line.c
+++ b/reactos/subsys/win32k/objects/line.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: line.c,v 1.36 2004/07/03 22:36:01 navaraf Exp $ */
+/* $Id: line.c,v 1.37 2004/07/14 20:48:58 navaraf Exp $ */
 #include <w32k.h>
 
 // Some code from the WINE project source (www.winehq.com)
@@ -54,6 +54,7 @@ IntGdiLineTo(DC  *dc,
   BITMAPOBJ *BitmapObj;
   BOOL      Ret = TRUE;
   PGDIBRUSHOBJ PenBrushObj;
+  GDIBRUSHINST PenBrushInst;
   RECTL     Bounds;
   POINT     Points[2];
 
@@ -101,9 +102,10 @@ IntGdiLineTo(DC  *dc,
 
       if (!(PenBrushObj->flAttrs & GDIBRUSH_IS_NULL))
       {
+        IntGdiInitBrushInstance(&PenBrushInst, PenBrushObj, dc->XlatePen);
         Ret = IntEngLineTo(BitmapObj,
                            dc->CombinedClip,
-                           &PenBrushObj->BrushObject,
+                           &PenBrushInst.BrushObject,
                            Points[0].x, Points[0].y,
                            Points[1].x, Points[1].y,
                            &Bounds,
@@ -190,6 +192,7 @@ IntGdiPolyline(DC      *dc,
 {
    BITMAPOBJ *BitmapObj;
    GDIBRUSHOBJ *PenBrushObj;
+   GDIBRUSHINST PenBrushInst;
    LPPOINT Points;
    BOOL Ret = TRUE;
    LONG i;
@@ -219,8 +222,9 @@ IntGdiPolyline(DC      *dc,
             Points[i].y += dc->w.DCOrgY;
          }
 
+         IntGdiInitBrushInstance(&PenBrushInst, PenBrushObj, dc->XlatePen);
          Ret = IntEngPolyline(BitmapObj, dc->CombinedClip,
-     			   &PenBrushObj->BrushObject, Points, Count,
+     			   &PenBrushInst.BrushObject, Points, Count,
      			   dc->w.ROPmode);
 
          BITMAPOBJ_UnlockBitmap(dc->w.hBitmap);
@@ -337,6 +341,7 @@ NtGdiAngleArc(HDC  hDC,
              FLOAT  SweepAngle)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 BOOL
@@ -611,6 +616,7 @@ NtGdiPolyDraw(HDC            hDC,
              int            Count)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 BOOL
diff --git a/reactos/subsys/win32k/objects/metafile.c b/reactos/subsys/win32k/objects/metafile.c
index 97a48ee395d..bb382a158dc 100644
--- a/reactos/subsys/win32k/objects/metafile.c
+++ b/reactos/subsys/win32k/objects/metafile.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: metafile.c,v 1.10 2004/05/10 17:07:20 weiden Exp $ */
+/* $Id: metafile.c,v 1.11 2004/07/14 20:48:58 navaraf Exp $ */
 #include <w32k.h>
 
 HENHMETAFILE
@@ -24,6 +24,7 @@ STDCALL
 NtGdiCloseEnhMetaFile(HDC  hDC)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 HMETAFILE
@@ -31,6 +32,7 @@ STDCALL
 NtGdiCloseMetaFile(HDC  hDC)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 HENHMETAFILE
@@ -39,6 +41,7 @@ NtGdiCopyEnhMetaFile(HENHMETAFILE  Src,
                                   LPCWSTR  File)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 HMETAFILE
@@ -47,6 +50,7 @@ NtGdiCopyMetaFile(HMETAFILE  Src,
                             LPCWSTR  File)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 HDC
@@ -57,6 +61,7 @@ NtGdiCreateEnhMetaFile(HDC  hDCRef,
                            LPCWSTR  Description)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 HDC
@@ -64,6 +69,7 @@ STDCALL
 NtGdiCreateMetaFile(LPCWSTR  File)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 BOOL
@@ -71,6 +77,7 @@ STDCALL
 NtGdiDeleteEnhMetaFile(HENHMETAFILE  emf)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 BOOL
@@ -78,6 +85,7 @@ STDCALL
 NtGdiDeleteMetaFile(HMETAFILE  mf)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 BOOL
@@ -89,6 +97,7 @@ NtGdiEnumEnhMetaFile(HDC  hDC,
                           CONST LPRECT  Rect)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 BOOL
@@ -99,6 +108,7 @@ NtGdiEnumMetaFile(HDC  hDC,
                        LPARAM  lParam)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 BOOL
@@ -108,6 +118,7 @@ NtGdiGdiComment(HDC  hDC,
                      CONST LPBYTE  Data)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 HENHMETAFILE
@@ -115,6 +126,7 @@ STDCALL
 NtGdiGetEnhMetaFile(LPCWSTR  MetaFile)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 UINT
@@ -124,6 +136,7 @@ NtGdiGetEnhMetaFileBits(HENHMETAFILE  hemf,
                              LPBYTE  Buffer)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 UINT
@@ -133,6 +146,7 @@ NtGdiGetEnhMetaFileDescription(HENHMETAFILE  hemf,
                                     LPWSTR  Description)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 UINT
@@ -142,6 +156,7 @@ NtGdiGetEnhMetaFileHeader(HENHMETAFILE  hemf,
                                LPENHMETAHEADER  emh)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 UINT
@@ -151,6 +166,7 @@ NtGdiGetEnhMetaFilePaletteEntries(HENHMETAFILE  hemf,
                                        LPPALETTEENTRY  pe)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 HMETAFILE
@@ -158,6 +174,7 @@ STDCALL
 NtGdiGetMetaFile(LPCWSTR  MetaFile)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 UINT
@@ -167,6 +184,7 @@ NtGdiGetMetaFileBitsEx(HMETAFILE  hmf,
                             LPVOID  Data)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 UINT
@@ -178,6 +196,7 @@ NtGdiGetWinMetaFileBits(HENHMETAFILE  hemf,
                              HDC  Ref)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 BOOL
@@ -187,6 +206,7 @@ NtGdiPlayEnhMetaFile(HDC  hDC,
                           CONST PRECT  Rect)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 BOOL
@@ -197,6 +217,7 @@ NtGdiPlayEnhMetaFileRecord(HDC  hDC,
                                 UINT  Handles)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 BOOL
@@ -205,6 +226,7 @@ NtGdiPlayMetaFile(HDC  hDC,
                        HMETAFILE  hmf)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 BOOL
@@ -215,6 +237,7 @@ NtGdiPlayMetaFileRecord(HDC  hDC,
                              UINT  Handles)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 HENHMETAFILE
@@ -223,6 +246,7 @@ NtGdiSetEnhMetaFileBits(UINT  BufSize,
                                      CONST PBYTE  Data)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 HMETAFILE
@@ -231,6 +255,7 @@ NtGdiSetMetaFileBitsEx(UINT  Size,
                                  CONST PBYTE  Data)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 HENHMETAFILE
@@ -242,6 +267,7 @@ NtGdiSetWinMetaFileBits(UINT  BufSize,
 				     PVOID mfp)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 /* EOF */
diff --git a/reactos/subsys/win32k/objects/paint.c b/reactos/subsys/win32k/objects/paint.c
index 8cb6d9b9842..7d9b0b6be48 100644
--- a/reactos/subsys/win32k/objects/paint.c
+++ b/reactos/subsys/win32k/objects/paint.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: paint.c,v 1.11 2004/05/10 17:07:20 weiden Exp $ */
+/* $Id: paint.c,v 1.12 2004/07/14 20:48:58 navaraf Exp $ */
 #include <w32k.h>
 
 BOOL
@@ -24,6 +24,7 @@ STDCALL
 NtGdiGdiFlush(VOID)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 DWORD
@@ -31,6 +32,7 @@ STDCALL
 NtGdiGdiGetBatchLimit(VOID)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 DWORD
@@ -38,6 +40,7 @@ STDCALL
 NtGdiGdiSetBatchLimit(DWORD  Limit)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 UINT
diff --git a/reactos/subsys/win32k/objects/path.c b/reactos/subsys/win32k/objects/path.c
index 005df53c83b..bd63a413023 100644
--- a/reactos/subsys/win32k/objects/path.c
+++ b/reactos/subsys/win32k/objects/path.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: path.c,v 1.23 2004/07/03 17:40:27 navaraf Exp $ */
+/* $Id: path.c,v 1.24 2004/07/14 20:48:58 navaraf Exp $ */
 #include <w32k.h>
 #include <win32k/float.h>
 
@@ -43,6 +43,7 @@ STDCALL
 NtGdiAbortPath(HDC  hDC)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 BOOL
@@ -50,6 +51,7 @@ STDCALL
 NtGdiBeginPath(HDC  hDC)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 BOOL
@@ -81,6 +83,7 @@ STDCALL
 NtGdiEndPath(HDC  hDC)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 BOOL
@@ -88,6 +91,7 @@ STDCALL
 NtGdiFillPath(HDC  hDC)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 BOOL
@@ -95,6 +99,7 @@ STDCALL
 NtGdiFlattenPath(HDC  hDC)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 
@@ -104,6 +109,7 @@ NtGdiGetMiterLimit(HDC  hDC,
                         PFLOAT  Limit)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 INT
@@ -114,6 +120,7 @@ NtGdiGetPath(HDC  hDC,
                  INT  nSize)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 HRGN
@@ -121,6 +128,7 @@ STDCALL
 NtGdiPathToRegion(HDC  hDC)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 BOOL
@@ -130,6 +138,7 @@ NtGdiSetMiterLimit(HDC  hDC,
                         PFLOAT  OldLimit)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 BOOL
@@ -137,6 +146,7 @@ STDCALL
 NtGdiStrokeAndFillPath(HDC  hDC)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 BOOL
@@ -144,6 +154,7 @@ STDCALL
 NtGdiStrokePath(HDC  hDC)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 BOOL
@@ -151,6 +162,7 @@ STDCALL
 NtGdiWidenPath(HDC  hDC)
 {
    UNIMPLEMENTED;
+   return FALSE;
 }
 
 /***********************************************************************
diff --git a/reactos/subsys/win32k/objects/pen.c b/reactos/subsys/win32k/objects/pen.c
index f1ee19efa56..d267a43365c 100644
--- a/reactos/subsys/win32k/objects/pen.c
+++ b/reactos/subsys/win32k/objects/pen.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: pen.c,v 1.15 2004/05/10 17:07:20 weiden Exp $
+ * $Id: pen.c,v 1.16 2004/07/14 20:48:58 navaraf Exp $
  */
 #include <w32k.h>
 
@@ -45,7 +45,6 @@ IntGdiCreatePenIndirect(PLOGPEN LogPen)
    PenObject->ptPenWidth = LogPen->lopnWidth;
    PenObject->ulPenStyle = LogPen->lopnStyle;
    PenObject->BrushAttr.lbColor = LogPen->lopnColor;
-   PenObject->BrushObject.iSolidColor = LogPen->lopnColor;
    PenObject->flAttrs = GDIBRUSH_IS_OLDSTYLEPEN;
    switch (LogPen->lopnStyle)
    {
@@ -114,6 +113,7 @@ NtGdiExtCreatePen(
    CONST PDWORD Style)
 {
    UNIMPLEMENTED;
+   return 0;
 }
 
 /* EOF */
diff --git a/reactos/subsys/win32k/objects/print.c b/reactos/subsys/win32k/objects/print.c
index 6f13519655a..5d7cddb0d41 100644
--- a/reactos/subsys/win32k/objects/print.c
+++ b/reactos/subsys/win32k/objects/print.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: print.c,v 1.19 2004/07/03 13:55:37 navaraf Exp $ */
+/* $Id: print.c,v 1.20 2004/07/14 20:48:58 navaraf Exp $ */
 #include <w32k.h>
 
 INT
@@ -24,6 +24,7 @@ STDCALL
 NtGdiAbortDoc(HDC  hDC)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 INT
@@ -31,6 +32,7 @@ STDCALL
 NtGdiEndDoc(HDC  hDC)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 INT
@@ -38,6 +40,7 @@ STDCALL
 NtGdiEndPage(HDC  hDC)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 INT
@@ -49,6 +52,7 @@ NtGdiEscape(HDC  hDC,
                 LPVOID  OutData)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 INT
@@ -184,6 +188,7 @@ NtGdiSetAbortProc(HDC  hDC,
                       ABORTPROC  AbortProc)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 INT
@@ -192,6 +197,7 @@ NtGdiStartDoc(HDC  hDC,
                   CONST LPDOCINFOW  di)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 INT
@@ -199,5 +205,6 @@ STDCALL
 NtGdiStartPage(HDC  hDC)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 /* EOF */
diff --git a/reactos/subsys/win32k/objects/region.c b/reactos/subsys/win32k/objects/region.c
index 21658a98a9f..bdaad1e32b4 100644
--- a/reactos/subsys/win32k/objects/region.c
+++ b/reactos/subsys/win32k/objects/region.c
@@ -113,7 +113,7 @@ SOFTWARE.
  * the y-x-banding that's so nice to have...
  */
 
-/* $Id: region.c,v 1.61 2004/07/03 17:40:27 navaraf Exp $ */
+/* $Id: region.c,v 1.62 2004/07/14 20:48:58 navaraf Exp $ */
 #include <w32k.h>
 #include <win32k/float.h>
 
@@ -2396,6 +2396,7 @@ NtGdiPaintRgn(HDC  hDC,
   CLIPOBJ* ClipRegion;
   BOOL bRet = FALSE;
   PGDIBRUSHOBJ pBrush;
+  GDIBRUSHINST BrushInst;
   POINTL BrushOrigin;
   BITMAPOBJ *BitmapObj;
 
@@ -2432,13 +2433,15 @@ NtGdiPaintRgn(HDC  hDC,
   ASSERT( ClipRegion );
   pBrush = BRUSHOBJ_LockBrush(dc->w.hBrush);
   ASSERT(pBrush);
+  IntGdiInitBrushInstance(&BrushInst, pBrush, dc->XlateBrush);
+  
   BrushOrigin.x = dc->w.brushOrgX;
   BrushOrigin.y = dc->w.brushOrgY;
   BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap);
 
   bRet = IntEngPaint(BitmapObj,
 	 ClipRegion,
-	 &pBrush->BrushObject,
+	 &BrushInst.BrushObject,
 	 &BrushOrigin,
 	 0xFFFF);//FIXME:don't know what to put here
 
diff --git a/reactos/subsys/win32k/objects/text.c b/reactos/subsys/win32k/objects/text.c
index 41637e9e6e2..355b726bd17 100644
--- a/reactos/subsys/win32k/objects/text.c
+++ b/reactos/subsys/win32k/objects/text.c
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: text.c,v 1.104 2004/07/11 02:10:48 navaraf Exp $ */
+/* $Id: text.c,v 1.105 2004/07/14 20:48:58 navaraf Exp $ */
 #include <w32k.h>
 
 #include <ft2build.h>
@@ -648,6 +648,7 @@ NtGdiCreateScalableFontResource(DWORD  Hidden,
                                      LPCWSTR  CurrentPath)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 /*************************************************************************
@@ -1494,6 +1495,7 @@ NtGdiEnumFonts(HDC  hDC,
                    LPARAM  lParam)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 BOOL STDCALL
@@ -1525,8 +1527,10 @@ NtGdiExtTextOut(
    POINTL SourcePoint, BrushOrigin;
    HBRUSH hBrushFg = NULL;
    PGDIBRUSHOBJ BrushFg = NULL;
+   GDIBRUSHINST BrushFgInst;
    HBRUSH hBrushBg = NULL;
    PGDIBRUSHOBJ BrushBg = NULL;
+   GDIBRUSHINST BrushBgInst;
    HBITMAP HSourceGlyph;
    SURFOBJ *SourceGlyphSurf;
    SIZEL bitSize;
@@ -1587,12 +1591,14 @@ NtGdiExtTextOut(
    XlateObj = (XLATEOBJ*)IntEngCreateXlate(Mode, PAL_RGB, dc->w.hPalette, NULL);
    hBrushFg = NtGdiCreateSolidBrush(XLATEOBJ_iXlate(XlateObj, dc->w.textColor));
    BrushFg = BRUSHOBJ_LockBrush(hBrushFg);
+   IntGdiInitBrushInstance(&BrushFgInst, BrushFg, NULL);
    if ((fuOptions & ETO_OPAQUE) || dc->w.backgroundMode == OPAQUE)
    {
       hBrushBg = NtGdiCreateSolidBrush(XLATEOBJ_iXlate(XlateObj, dc->w.backgroundColor));
       if (hBrushBg)
       {
          BrushBg = BRUSHOBJ_LockBrush(hBrushBg);
+         IntGdiInitBrushInstance(&BrushBgInst, BrushBg, NULL);
       }
       else
       {
@@ -1625,7 +1631,7 @@ NtGdiExtTextOut(
          &DestRect,
          &SourcePoint,
          &SourcePoint,
-         &BrushBg->BrushObject,
+         &BrushBgInst.BrushObject,
          &BrushOrigin,
          PATCOPY);
       fuOptions &= ~ETO_OPAQUE;
@@ -1839,7 +1845,7 @@ NtGdiExtTextOut(
             &DestRect,
             &SourcePoint,
             &SourcePoint,
-            &BrushBg->BrushObject,
+            &BrushBgInst.BrushObject,
             &BrushOrigin,
             PATCOPY);
          BackgroundLeft = DestRect.right;
@@ -1878,7 +1884,7 @@ NtGdiExtTextOut(
          &DestRect,
          &SourcePoint,
          (PPOINTL)&MaskRect,
-         &BrushFg->BrushObject,
+         &BrushFgInst.BrushObject,
          &BrushOrigin);
 
       EngUnlockSurface(SourceGlyphSurf);
@@ -1944,6 +1950,7 @@ NtGdiGetAspectRatioFilterEx(HDC  hDC,
                                  LPSIZE  AspectRatio)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 BOOL
@@ -1965,6 +1972,7 @@ NtGdiGetCharABCWidthsFloat(HDC  hDC,
                                 LPABCFLOAT  abcF)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 DWORD
@@ -1977,6 +1985,7 @@ NtGdiGetCharacterPlacement(HDC  hDC,
                                  DWORD  Flags)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 BOOL
@@ -2090,6 +2099,7 @@ NtGdiGetCharWidthFloat(HDC  hDC,
                             PFLOAT  Buffer)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 DWORD
@@ -2097,6 +2107,7 @@ STDCALL
 NtGdiGetFontLanguageInfo(HDC  hDC)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 DWORD
@@ -2110,8 +2121,7 @@ NtGdiGetGlyphOutline(HDC  hDC,
                            CONST LPMAT2 mat2)
 {
   UNIMPLEMENTED;
-
-
+  return 0;
 }
 
 DWORD
@@ -2121,6 +2131,7 @@ NtGdiGetKerningPairs(HDC  hDC,
                            LPKERNINGPAIR  krnpair)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 UINT
@@ -2130,6 +2141,7 @@ NtGdiGetOutlineTextMetrics(HDC  hDC,
                                 LPOUTLINETEXTMETRICW  otm)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 BOOL
@@ -2138,6 +2150,7 @@ NtGdiGetRasterizerCaps(LPRASTERIZER_STATUS  rs,
                             UINT  Size)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 UINT
@@ -2145,6 +2158,7 @@ STDCALL
 NtGdiGetTextCharset(HDC  hDC)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 UINT
@@ -2154,6 +2168,7 @@ NtGdiGetTextCharsetInfo(HDC  hDC,
                              DWORD  Flags)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 static BOOL
@@ -2625,6 +2640,7 @@ NtGdiPolyTextOut(HDC  hDC,
                       int  Count)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 BOOL
@@ -2632,6 +2648,7 @@ STDCALL
 NtGdiRemoveFontResource(LPCWSTR  FileName)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 DWORD
@@ -2640,6 +2657,7 @@ NtGdiSetMapperFlags(HDC  hDC,
                           DWORD  Flag)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 UINT
@@ -2692,6 +2710,7 @@ NtGdiSetTextJustification(HDC  hDC,
                                int  BreakCount)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 BOOL STDCALL
diff --git a/reactos/subsys/win32k/objects/wingl.c b/reactos/subsys/win32k/objects/wingl.c
index f58f7369b2d..2fc41d49e83 100644
--- a/reactos/subsys/win32k/objects/wingl.c
+++ b/reactos/subsys/win32k/objects/wingl.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: wingl.c,v 1.8 2004/05/10 17:07:20 weiden Exp $ */
+/* $Id: wingl.c,v 1.9 2004/07/14 20:48:58 navaraf Exp $ */
 #include <w32k.h>
 
 INT
@@ -25,6 +25,7 @@ NtGdiChoosePixelFormat(HDC  hDC,
                            CONST PPIXELFORMATDESCRIPTOR  pfd)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 
@@ -36,6 +37,7 @@ NtGdiDescribePixelFormat(HDC  hDC,
                              LPPIXELFORMATDESCRIPTOR  pfd)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 UINT
@@ -45,6 +47,7 @@ NtGdiGetEnhMetaFilePixelFormat(HENHMETAFILE  hEMF,
                                     CONST PPIXELFORMATDESCRIPTOR  pfd)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 INT
@@ -52,6 +55,7 @@ STDCALL
 NtGdiGetPixelFormat(HDC  hDC)
 {
   UNIMPLEMENTED;
+  return 0;
 }
 
 BOOL
@@ -61,6 +65,7 @@ NtGdiSetPixelFormat(HDC  hDC,
                          CONST PPIXELFORMATDESCRIPTOR  pfd)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 BOOL
@@ -68,6 +73,7 @@ STDCALL
 NtGdiSwapBuffers(HDC  hDC)
 {
   UNIMPLEMENTED;
+  return FALSE;
 }
 
 /* EOF */

From 219e1664cfe01a58e8457394308d7adff8fa9085 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Wed, 14 Jul 2004 20:52:13 +0000
Subject: [PATCH 294/356] - Add FIXME comment to LoadIconImage.

svn path=/trunk/; revision=10117
---
 reactos/lib/user32/windows/bitmap.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/reactos/lib/user32/windows/bitmap.c b/reactos/lib/user32/windows/bitmap.c
index a75e2a66b33..166dbfa546c 100644
--- a/reactos/lib/user32/windows/bitmap.c
+++ b/reactos/lib/user32/windows/bitmap.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: bitmap.c,v 1.30 2004/06/23 05:04:30 ion Exp $
+/* $Id: bitmap.c,v 1.31 2004/07/14 20:52:13 navaraf Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/input.c
@@ -337,6 +337,14 @@ LoadIconImage(HINSTANCE hinst, LPCWSTR lpszName, INT width, INT height, UINT fuL
   }
   else
   {
+      /*
+       * FIXME: This code is incorrect and is likely to crash in many cases. 
+       * In the file the cursor/icon directory records are stored like
+       * CURSORICONFILEDIR, but we treat them like CURSORICONDIR. In Wine
+       * this is solved by creating a fake cursor/icon directory in memory
+       * and passing that to CURSORICON_FindBestIcon.
+       */
+
       if (fuLoad & LR_SHARED)
       {
         DbgPrint("FIXME: need LR_SHARED support for loading icon images from files\n");

From 3baccc96f1a0736c5368a21818b28dd576b8ea9d Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Wed, 14 Jul 2004 21:45:05 +0000
Subject: [PATCH 295/356] - Accidently commited this file with my last patch.
 Reverting.

svn path=/trunk/; revision=10118
---
 reactos/subsys/win32k/ntuser/winpos.c | 102 ++++++++++++++------------
 1 file changed, 56 insertions(+), 46 deletions(-)

diff --git a/reactos/subsys/win32k/ntuser/winpos.c b/reactos/subsys/win32k/ntuser/winpos.c
index 8dd43ff5d0f..6cbdc44a0e9 100644
--- a/reactos/subsys/win32k/ntuser/winpos.c
+++ b/reactos/subsys/win32k/ntuser/winpos.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: winpos.c,v 1.119 2004/07/14 20:48:57 navaraf Exp $
+/* $Id: winpos.c,v 1.120 2004/07/14 21:45:05 navaraf Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -98,22 +98,6 @@ NtUserGetClientOrigin(HWND hWnd, LPPOINT Point)
   return Ret;
 }
 
-/*******************************************************************
- *         WinPosCanActivateWindow
- *
- * Check if we can activate the specified window.
- */
-static BOOL WinPosCanActivateWindow(HWND hWnd)
-{
-   LONG Style;
-
-   if (!hWnd) return FALSE;
-   Style = NtUserGetWindowLong(hWnd, GWL_STYLE, FALSE);
-   if (!(Style & WS_VISIBLE)) return FALSE;
-   if ((Style & (WS_POPUP | WS_CHILD)) == WS_CHILD) return FALSE;
-   return !(Style & WS_DISABLED);
-}
-
 /*******************************************************************
  *         WinPosActivateOtherWindow
  *
@@ -122,37 +106,63 @@ static BOOL WinPosCanActivateWindow(HWND hWnd)
 VOID FASTCALL
 WinPosActivateOtherWindow(PWINDOW_OBJECT Window)
 {
-   HWND hwndTo = NULL, fg;
-   PWINDOW_OBJECT wndTo;
-
-   if ((Window->Style & WS_POPUP) && (hwndTo = Window->Owner))
-   {
-      hwndTo = NtUserGetAncestor(hwndTo, GA_ROOT);
-      if (WinPosCanActivateWindow(hwndTo))
-         goto done;
-   }
-
-   for (hwndTo = NtUserGetWindow(Window->Self, GW_HWNDNEXT);
-        hwndTo != NULL;
-        hwndTo = NtUserGetWindow(hwndTo, GW_HWNDNEXT))
-   {
-      if (WinPosCanActivateWindow(hwndTo)) break;
-   }
-
-done:
-   fg = NtUserGetForegroundWindow();
-   if (!fg || (Window->Self == fg))
-   {
-      wndTo = IntGetWindowObject(hwndTo);
-      if (wndTo != NULL && IntSetForegroundWindow(wndTo))
+  PWINDOW_OBJECT Wnd, Old;
+  int TryTopmost;
+  
+  if (!Window || IntIsDesktopWindow(Window))
+  {
+    IntSetFocusMessageQueue(NULL);
+    return;
+  }
+  Wnd = Window;
+  for(;;)
+  {
+    HWND *List, *phWnd;
+    
+    Old = Wnd;
+    Wnd = IntGetParentObject(Wnd);
+    if(Old != Window)
+    {
+      IntReleaseWindowObject(Old);
+    }
+    if(!Wnd)
+    {
+      IntSetFocusMessageQueue(NULL);
+      return;
+    }
+    
+    if((List = IntWinListChildren(Wnd)))
+    {
+      for(TryTopmost = 0; TryTopmost <= 1; TryTopmost++)
       {
-         IntReleaseWindowObject(wndTo);
-         return;
+        for(phWnd = List; *phWnd; phWnd++)
+        {
+          PWINDOW_OBJECT Child;
+        
+          if((*phWnd) == Window->Self)
+          {
+            continue;
+          }
+        
+          if((Child = IntGetWindowObject(*phWnd)))
+          {
+            if(((! TryTopmost && (0 == (Child->ExStyle & WS_EX_TOPMOST)))
+                || (TryTopmost && (0 != (Child->ExStyle & WS_EX_TOPMOST))))
+               && IntSetForegroundWindow(Child))
+            {
+              ExFreePool(List);
+              IntReleaseWindowObject(Wnd);
+              IntReleaseWindowObject(Child);
+              return;
+            }
+            IntReleaseWindowObject(Child);
+          }
+        }
       }
-      IntReleaseWindowObject(wndTo);
-   }
-   if (!NtUserSetActiveWindow(hwndTo))
-      NtUserSetActiveWindow(0);
+      ExFreePool(List);
+    }
+  }
+  IntReleaseWindowObject(Wnd);
 }
 
 VOID STATIC FASTCALL

From 383e5a9c1af880dfa155ade3098666d37fc19500 Mon Sep 17 00:00:00 2001
From: Steven Edwards <winehacker@gmail.com>
Date: Wed, 14 Jul 2004 21:52:23 +0000
Subject: [PATCH 296/356] Warn rather than bail on HWND_MESSAGE windows
 request. This gets the Scintilla Editor from theopencd to work.

svn path=/trunk/; revision=10119
---
 reactos/subsys/win32k/ntuser/window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reactos/subsys/win32k/ntuser/window.c b/reactos/subsys/win32k/ntuser/window.c
index 2c68169504a..14d7c63ce5c 100644
--- a/reactos/subsys/win32k/ntuser/window.c
+++ b/reactos/subsys/win32k/ntuser/window.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: window.c,v 1.243 2004/07/09 20:57:38 gvg Exp $
+/* $Id: window.c,v 1.244 2004/07/14 21:52:23 sedwards Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -1430,7 +1430,7 @@ IntCreateWindowEx(DWORD dwExStyle,
        * native ole32.OleInitialize uses HWND_MESSAGE to create the
        * message window (style: WS_POPUP|WS_DISABLED)
        */
-      UNIMPLEMENTED;
+      DPRINT1("FIXME - Parent is HWND_MESSAGE\n");
     }
   else if (hWndParent)
     {

From c26b523ad9418b369e333272e704ce89619c46fb Mon Sep 17 00:00:00 2001
From: Steven Edwards <winehacker@gmail.com>
Date: Wed, 14 Jul 2004 22:20:07 +0000
Subject: [PATCH 297/356] added Spanish translation by Carlos Garcia Gomez.

svn path=/trunk/; revision=10120
---
 .../subsys/system/explorer/explorer_intres.rc | 466 ++++++++++++++++++
 1 file changed, 466 insertions(+)

diff --git a/reactos/subsys/system/explorer/explorer_intres.rc b/reactos/subsys/system/explorer/explorer_intres.rc
index 488e700781c..92870286710 100644
--- a/reactos/subsys/system/explorer/explorer_intres.rc
+++ b/reactos/subsys/system/explorer/explorer_intres.rc
@@ -1423,7 +1423,473 @@ END
 #endif    // Portuguese (Portugal) resources
 /////////////////////////////////////////////////////////////////////////////
 
+/////////////////////////////////////////////////////////////////////////////
+// Spanish (Spain) resources
 
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_SPANISH, SUBLANG_SPANISH
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Menu
+//
+
+IDM_MDIFRAME MENU PRELOAD DISCARDABLE 
+BEGIN
+    POPUP "&Archivo"
+    BEGIN
+        MENUITEM "&Salir",                       ID_FILE_EXIT
+    END
+    POPUP "&Ver"
+    BEGIN
+        MENUITEM "&Herramientas",                    ID_VIEW_TOOL_BAR
+        MENUITEM "Barra &Extra",                  ID_VIEW_EXTRA_BAR
+        MENUITEM "Barra de &Unidades",                   
+ID_VIEW_DRIVE_BAR, CHECKED
+        MENUITEM "Barra &Lateral",                   ID_VIEW_SIDE_BAR
+        MENUITEM "Barra de &Estado",                 ID_VIEW_STATUSBAR
+        MENUITEM SEPARATOR
+        MENUITEM "&Actualizar\tF5",                ID_REFRESH
+        MENUITEM "P&antalla Completa\tCtrl+Shift+S",  
+ID_VIEW_FULLSCREEN
+        MENUITEM "&SDI",                        ID_VIEW_SDI
+    END
+    POPUP "&Ventana"
+    BEGIN
+        MENUITEM "Nueva &Ventana",                 ID_WINDOW_NEW
+        MENUITEM "Cascada\tShift+F5",         ID_WINDOW_CASCADE
+        MENUITEM "Mosaico &Horizontal",          ID_WINDOW_TILE_HORZ
+        MENUITEM "Mosaico &Vertical\tShift+F4",  ID_WINDOW_TILE_VERT
+        MENUITEM "Agrupar Automaticamente",       ID_WINDOW_AUTOSORT
+        MENUITEM "Agrupar &Simbolos",            ID_WINDOW_ARRANGE
+    END
+    POPUP "A&yuda"
+    BEGIN
+        MENUITEM "Explorer &FAQ...",            ID_EXPLORER_FAQ
+        MENUITEM "&Acerca de Explorer...",          ID_ABOUT_EXPLORER
+        MENUITEM "Acerca de &OS...",                ID_ABOUT_WINDOWS
+    END
+END
+
+IDM_SDIFRAME MENU PRELOAD DISCARDABLE 
+BEGIN
+    POPUP "&Archivo"
+    BEGIN
+        MENUITEM "S&alir",                       ID_FILE_EXIT
+    END
+    POPUP "&Ver"
+    BEGIN
+        MENUITEM "&Barra de Herramientas",                    
+ID_VIEW_TOOL_BAR
+        MENUITEM "Barra &Lateral",                   ID_VIEW_SIDE_BAR, 
+GRAYED
+        MENUITEM "Barra de &Estado",                 ID_VIEW_STATUSBAR
+        MENUITEM SEPARATOR
+        MENUITEM "&Actualizar\tF5",                ID_REFRESH
+        MENUITEM "P&antalla Completa\tCtrl+Shift+S",  
+ID_VIEW_FULLSCREEN
+        MENUITEM "&MDI",                        ID_VIEW_MDI
+    END
+    POPUP "&Ayuda"
+    BEGIN
+        MENUITEM "Explorer &FAQ...",            ID_EXPLORER_FAQ
+        MENUITEM "&Acerca de Explorer...",          ID_ABOUT_EXPLORER
+        MENUITEM "Acerca de &OS...",                ID_ABOUT_WINDOWS
+    END
+END
+
+IDM_WINEFILE MENU FIXED IMPURE 
+BEGIN
+    POPUP "&Archivo"
+    BEGIN
+        MENUITEM "&Abrir\tEnter",                101
+        MENUITEM "&Mover...\tF7",                106
+        MENUITEM "&Copiar...\tF8",                107
+        MENUITEM "&en el Portapapeles...\tF9",        118
+        MENUITEM "&Eliminar\tDel",                108
+        MENUITEM "Re&nombrar...",                  109
+        MENUITEM "Prop&iedades...\tAlt+Enter",   ID_EDIT_PROPERTIES
+        MENUITEM SEPARATOR
+        MENUITEM "C&omprimir...",                119
+        MENUITEM "Desc&omprimir...",              120
+        MENUITEM SEPARATOR
+        MENUITEM "&Ejecutar...",                     ID_EXECUTE
+        MENUITEM "&Imprimir...",                   102
+        MENUITEM "Asociar...",                103
+        MENUITEM SEPARATOR
+        MENUITEM "Cr&ear Directorio...",        ID_EXECUTE
+        MENUITEM "Busca&r...",                  104
+        MENUITEM "&Seleccionar Archivos...",            116
+        MENUITEM SEPARATOR
+        MENUITEM "S&alir\tAlt+X",                ID_FILE_EXIT
+    END
+    POPUP "&Disco"
+    BEGIN
+        MENUITEM "&Copiar Disco...",               201
+        MENUITEM "&Etiqueta del Disco...",              202
+        MENUITEM SEPARATOR
+        MENUITEM "&Formateart Disco...",             203
+        MENUITEM SEPARATOR
+        MENUITEM "Conectar a &Unidad de Red",      252
+        MENUITEM "&Desconectar Unidad de Red",   253
+        MENUITEM SEPARATOR
+        MENUITEM "Guardar como...",                 254
+        MENUITEM "&Eliminar Guardado...",            255
+        MENUITEM SEPARATOR
+        MENUITEM "&Seleccionar Unidad...",            251
+    END
+    POPUP "&Directorios"
+    BEGIN
+        MENUITEM "&Siguiente Nivel\t+",              301
+        MENUITEM "Expandir &Arbol\t*",             302
+        MENUITEM "Expandir &Todo\tStrg+*",         303
+        MENUITEM "Contraer &Arbol\t-",           304
+        MENUITEM SEPARATOR
+        MENUITEM "&Marcar Hijos",                505
+    END
+    POPUP "&Ver"
+    BEGIN
+        MENUITEM "A&rbol y Directorio",         413
+        MENUITEM "Solo Arb&ol",                  411
+        MENUITEM "S&olo Directorio",             412
+        MENUITEM SEPARATOR
+        MENUITEM "Sp&lit",                      414
+        MENUITEM SEPARATOR
+        MENUITEM "&Nombre",                       ID_VIEW_NAME
+        MENUITEM "&Todos Los Detalles del Archivo",           
+ID_VIEW_ALL_ATTRIBUTES
+        , CHECKED
+        MENUITEM "Detalles &Parciales...",         
+ID_VIEW_SELECTED_ATTRIBUTES
+        MENUITEM SEPARATOR
+        MENUITEM "&Ordenar por Nombre",               404
+        MENUITEM "Ordenar &por Tipo",               405
+        MENUITEM "Ord&enar por Tamaño",               406
+        MENUITEM "Or&denar por Fecha",               407
+        MENUITEM SEPARATOR
+        MENUITEM "Ordenar por &...",                409
+    END
+    POPUP "&Opciones"
+    BEGIN
+        MENUITEM "&Confirmacion...",            65535
+        MENUITEM "&Fuente...",                    65535
+        MENUITEM "Personalizar la &Barra de Herramientas...",       
+65535
+        MENUITEM SEPARATOR
+        MENUITEM "Barra de Herramien&tas",                    
+ID_VIEW_TOOL_BAR, CHECKED
+        MENUITEM "Barra de Uni&dades",                   
+ID_VIEW_DRIVE_BAR, CHECKED
+        MENUITEM "Barra &Lateral",                   ID_VIEW_SIDE_BAR
+        MENUITEM "Barra de E&stado",                 ID_VIEW_STATUSBAR, 
+CHECKED
+        MENUITEM "Pantalla Com&pleta\tCtrl+Shift+S",  
+ID_VIEW_FULLSCREEN
+    END
+    POPUP "&Seguridad"
+    BEGIN
+        MENUITEM "&Aceso...",                  605
+        MENUITEM "&Entrada...",                 606
+        MENUITEM "&Propietario...",                   607
+    END
+    POPUP "&Ventana"
+    BEGIN
+        MENUITEM "Nueva &Ventana",                 ID_WINDOW_NEW
+        MENUITEM "Cascada\tCtrl+F5",          ID_WINDOW_CASCADE
+        MENUITEM "Mosaico &Horizontal",          ID_WINDOW_TILE_HORZ
+        MENUITEM "Mosaico &Vertical\tCtrl+F4",   ID_WINDOW_TILE_VERT
+        MENUITEM "Agrupar Automaticamente",       ID_WINDOW_AUTOSORT
+        MENUITEM "Agrupar &Simbolos",            ID_WINDOW_ARRANGE
+        MENUITEM "&Actualizar\tF5",                ID_REFRESH
+    END
+    POPUP "&?"
+    BEGIN
+        MENUITEM "&Temas de Ayuda\tF1",            ID_HELP
+        MENUITEM "Ayuda y &Buscar...\tF1",         ID_HELP
+        MENUITEM "&Usando la Ayuda\tF1",             ID_HELP_USING
+        MENUITEM SEPARATOR
+        MENUITEM "Info sobre &ArchivoWine...",     ID_ABOUT_WINEFILE
+    END
+END
+
+IDM_DESKTOPBAR MENU DISCARDABLE 
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "&Configuracion...",                
+ID_DESKTOPBAR_SETTINGS
+        MENUITEM "&Administrador de Tareas...",            ID_TASKMGR
+        MENUITEM SEPARATOR
+        MENUITEM "&Acerca de Explorer...",          ID_ABOUT_EXPLORER
+    END
+END
+
+IDM_VOLUME MENU DISCARDABLE 
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "Abrir Control de Volumen",         ID_TRAY_VOLUME
+        MENUITEM "Ajustar Propiedades de Audio",     
+ID_VOLUME_PROPERTIES
+    END
+END
+
+IDM_NOTIFYAREA MENU DISCARDABLE 
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "&Mostrar iconos ocultos",          
+ID_SHOW_HIDDEN_ICONS
+        MENUITEM "&Configurar Notificaciones...", ID_CONFIG_NOTIFYAREA
+        MENUITEM "Ajustar Fecha/&Hora...",        ID_CONFIG_TIME
+        MENUITEM SEPARATOR
+        MENUITEM "&Acerca de Explorer...",          ID_ABOUT_EXPLORER
+    END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_EXECUTE DIALOG FIXED IMPURE  15, 13, 210, 63
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Execute"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL         "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,162,10
+    CONTROL         "&Command:",-1,"Static",SS_LEFTNOWORDWRAP | 
+WS_GROUP,3,
+                    18,60,10
+    EDITTEXT        201,3,29,134,12,ES_AUTOHSCROLL
+    CONTROL         "As &Symbol",214,"Button",BS_AUTOCHECKBOX | 
+WS_TABSTOP,3,
+                    45,71,12
+    DEFPUSHBUTTON   "&Aceptar",1,158,6,47,14
+    PUSHBUTTON      "&Cancelar",2,158,23,47,14
+    PUSHBUTTON      "&Ayuda",254,158,43,47,14
+END
+
+IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65
+STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | 
+WS_CAPTION | 
+    WS_SYSMENU | WS_THICKFRAME
+EXSTYLE WS_EX_APPWINDOW
+CAPTION "Buscar Programa en el menu Inicio"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+    LTEXT           "&Filtro:",IDC_STATIC,7,9,18,8
+    EDITTEXT        IDC_FILTER,34,7,100,14,ES_AUTOHSCROLL
+    CONTROL         
+"List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | 
+                    LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | 
+                    WS_TABSTOP,7,25,186,33
+    PUSHBUTTON      "&Marcar Entradas",IDC_CHECK_ENTRIES,143,7,50,14
+END
+
+IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE  0, 0, 212, 194
+STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Propiedades de Pantalla"
+FONT 8, "MS Sans Serif"
+BEGIN
+    LTEXT           "Por favor seleccione su algoritmo de alineamiento preferido:",
+                    IDC_STATIC,7,7,166,8
+    CONTROL         "izquierda/arriba abajo",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | 
+                    BS_BOTTOM | WS_TABSTOP,7,25,46,44
+    CONTROL         "izquierda/arriba derecha",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | 
+                    BS_BOTTOM | WS_TABSTOP,57,25,46,44
+    CONTROL         "derecha/arriba izquierda",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | 
+                    BS_BOTTOM | WS_TABSTOP,110,25,46,44
+    CONTROL         "derecha/arriba abajo",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | 
+                    BS_BOTTOM | WS_TABSTOP,159,25,46,44
+    CONTROL         "derecha/abajo arriba",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | 
+                    BS_BOTTOM | WS_TABSTOP,7,73,46,44
+    CONTROL         "izquierda/abajo derecha",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | 
+                    BS_BOTTOM | WS_TABSTOP,57,73,46,44
+    CONTROL         "derecha/abajo izquierda",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | 
+                    BS_BOTTOM | WS_TABSTOP,110,73,46,44
+    CONTROL         "derecha/abajo",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | 
+                    BS_BOTTOM | WS_TABSTOP,159,73,46,44
+    CONTROL         "borde inferior",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | 
+                    BS_BOTTOM | WS_TABSTOP,7,121,46,44
+    CONTROL         "borde H/V",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | 
+                    BS_BOTTOM | WS_TABSTOP,57,121,46,44
+    CONTROL         "round about",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | 
+                    BS_BOTTOM | WS_TABSTOP,110,121,46,44
+    CONTROL         "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | 
+                    WS_TABSTOP,159,121,46,44
+    CONTROL         "Mostrar &Version",ID_DESKTOP_VERSION,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10
+END
+
+IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE  0, 0, 210, 194
+STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Propiedades de la Barra de Tareas"
+FONT 8, "MS Sans Serif"
+BEGIN
+    CONTROL         "Mostrar &Reloj",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,7,152,52,10
+    CONTROL         "&Ocultar iconos de notificacion inactivos",
+                    ID_HIDE_INACTIVE_ICONS,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,7,174,111,10
+    PUSHBUTTON      "&Notificaciones...",ID_CONFIG_NOTIFYAREA,153,173,50,14
+END
+
+IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE  0, 0, 210, 194
+STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Propiedades del Menu Inicio"
+FONT 8, "MS Sans Serif"
+BEGIN
+END
+
+IDD_NOTIFYAREA DIALOGEX 0, 0, 207, 150
+STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | 
+WS_CAPTION | 
+    WS_SYSMENU | WS_THICKFRAME
+EXSTYLE WS_EX_APPWINDOW
+CAPTION "Configure Notification Icons"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+    CONTROL         "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | 
+                    TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,193,31
+    LTEXT           "&Texto de Info de herramientas:",IDC_LABEL1,7,44,40,8
+    EDITTEXT        IDC_NOTIFY_TOOLTIP,55,42,145,14,ES_AUTOHSCROLL
+    LTEXT           "Titulo de la V&entana:",IDC_LABEL2,7,63,44,8
+    EDITTEXT        IDC_NOTIFY_TITLE,55,60,145,14,ES_AUTOHSCROLL
+    LTEXT           "Parche del &Modulo:",IDC_LABEL3,7,81,43,8
+    EDITTEXT        IDC_NOTIFY_MODULE,55,78,145,14,ES_AUTOHSCROLL
+    GROUPBOX        "Modo de &Display",IDC_LABEL4,7,95,157,28
+    CONTROL         "&Mostrar",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | 
+                    WS_TABSTOP,15,107,33,10
+    CONTROL         "&Ocultar",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON,66,
+                    107,29,10
+    CONTROL         "A&utoocultar",IDC_NOTIFY_AUTOHIDE,"Button",
+                    BS_AUTORADIOBUTTON,112,107,43,10
+    ICON            "",IDC_PICTURE,173,100,20,20
+    CONTROL         "Mostrar Ocultos",ID_SHOW_HIDDEN_ICONS,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,131,56,10
+    DEFPUSHBUTTON   "&Aceptar",IDOK,91,129,50,14,WS_GROUP
+    PUSHBUTTON      "&Cancelar",IDCANCEL,150,129,50,14
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE 
+BEGIN
+    IDD_SEARCH_PROGRAM, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 193
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 58
+    END
+
+    IDD_DESKBAR_DESKTOP, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 205
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 187
+    END
+
+    IDD_DESKBAR_TASKBAR, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 203
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 187
+    END
+
+    IDD_DESKBAR_STARTMENU, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 203
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 187
+    END
+
+    IDD_NOTIFYAREA, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 200
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 143
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    IDS_TITLE               "Reactos Explorer"
+    IDS_START               "Iniciar"
+    IDS_LOGOFF              "Salir..."
+    IDS_SHUTDOWN            "Apagar..."
+    IDS_LAUNCH              "Ejecutar..."
+    IDS_START_HELP          "Ayuda"
+    IDS_SEARCH_FILES        "Buscar..."
+    IDS_DOCUMENTS           "Documentos"
+    IDS_FAVORITES           "Favoritos"
+    IDS_PROGRAMS            "Programas"
+    IDS_SETTINGS            "Configuracion"
+    IDS_EXPLORE             "Explorar"
+    IDS_EMPTY               "(Vacio)"
+    IDS_RECENT              "Documentos Recientes"
+    IDS_ADMIN               "Administracion"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    IDS_NETWORK             "Res"
+    IDS_CONNECTIONS         "Conexiones de Red"
+    IDS_DRIVES              "Unidades"
+    IDS_SEARCH_COMPUTER     "Buscar PC..."
+    IDS_SETTINGS_MENU       "Menus de Configuracion"
+    IDS_CONTROL_PANEL       "Panel de Control"
+    IDS_PRINTERS            "Impresoras"
+    IDS_BROWSE              "Explorer Archivos"
+    IDS_SEARCH_PRG          "Buscar Programas..."
+    IDS_ALL_USERS           "Todos los Usuarios\\"
+    IDS_SEARCH              "Buscar"
+    IDS_ABOUT_EXPLORER      "&Acerca de Explorer..."
+    IDS_LAUNCH_MANY_PROGRAMS 
+                            "Ha seleccionado mas de un programa.\n¿Está seguro de que desea ejecutarlos todos ?"
+    IDS_DESKTOPBAR_SETTINGS "Configuracion del Escritorio"
+    IDS_DESKTOP             "Escritorio"
+    IDS_TASKBAR             "Barra de Tareas"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    IDS_STARTMENU           "Menu Inicio"
+    IDS_MINIMIZE_ALL        "mimimizar todas las ventanas"
+    IDS_DESKTOP_NUM         "Escritorio %d"
+    IDS_VOLUME              "Volumen"
+    IDS_ITEMS_CUR           "Objetos Actuales"
+    IDS_ITEMS_CONFIGURED    "configuracion"
+    IDS_ITEMS_VISIBLE       "visible"
+    IDS_ITEMS_HIDDEN        "oculto"
+    IDS_NOTIFY_SHOW         "mostrar"
+    IDS_NOTIFY_HIDE         "ocultar"
+    IDS_NOTIFY_AUTOHIDE     "autoocultar"
+END
+
+#endif    // Spansih (Spain) resources
+/////////////////////////////////////////////////////////////////////////////
 
 #ifndef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////

From 9ce1fe0ddb9ad6fea3ea82d3be3b8af4c2e647ee Mon Sep 17 00:00:00 2001
From: Art Yerkes <art.yerkes@gmail.com>
Date: Thu, 15 Jul 2004 02:03:07 +0000
Subject: [PATCH 298/356] Small changes to debug output in catalog, handle,
 upcall. ns.c -- getservbyport contributed by Cameron Palmer.

svn path=/trunk/; revision=10121
---
 reactos/lib/ws2_32/include/ws2_32.h |   9 ++
 reactos/lib/ws2_32/misc/catalog.c   |   4 +-
 reactos/lib/ws2_32/misc/dllmain.c   |   1 +
 reactos/lib/ws2_32/misc/handle.c    |   8 +-
 reactos/lib/ws2_32/misc/ns.c        | 161 +++++++++++++++++++++++++++-
 reactos/lib/ws2_32/misc/upcall.c    |   2 +-
 6 files changed, 176 insertions(+), 9 deletions(-)

diff --git a/reactos/lib/ws2_32/include/ws2_32.h b/reactos/lib/ws2_32/include/ws2_32.h
index 3abe94b777f..820171d9ed6 100644
--- a/reactos/lib/ws2_32/include/ws2_32.h
+++ b/reactos/lib/ws2_32/include/ws2_32.h
@@ -37,11 +37,20 @@ typedef struct _WINSOCK_GETSERVBYNAME_CACHE {
     CHAR Data[1];
 } WINSOCK_GETSERVBYNAME_CACHE, *PWINSOCK_GETSERVBYNAME_CACHE;
 
+typedef struct _WINSOCK_GETSERVBYPORT_CACHE {
+    UINT Size;
+    SERVENT ServerEntry;
+    PCHAR Aliases[WS2_INTERNAL_MAX_ALIAS];
+    CHAR Data[1];
+} WINSOCK_GETSERVBYPORT_CACHE, *PWINSOCK_GETSERVBYPORT_CACHE;
+
 typedef struct _WINSOCK_THREAD_BLOCK {
     INT LastErrorValue;     /* Error value from last function that failed */
     CHAR Intoa[16];         /* Buffer for inet_ntoa() */
     PWINSOCK_GETSERVBYNAME_CACHE 
     Getservbyname;          /* Buffer used by getservbyname */
+    PWINSOCK_GETSERVBYPORT_CACHE
+    Getservbyport;          /* Buffer used by getservbyname */
 } WINSOCK_THREAD_BLOCK, *PWINSOCK_THREAD_BLOCK;
 
 
diff --git a/reactos/lib/ws2_32/misc/catalog.c b/reactos/lib/ws2_32/misc/catalog.c
index e94e8d29290..6ad9caf230e 100644
--- a/reactos/lib/ws2_32/misc/catalog.c
+++ b/reactos/lib/ws2_32/misc/catalog.c
@@ -188,7 +188,7 @@ INT LoadProvider(
 {
   INT Status;
 
-  WS_DbgPrint(MAX_TRACE, ("Loading provider at (0x%X)  Name (%wZ).\n",
+  WS_DbgPrint(MID_TRACE, ("Loading provider at (0x%X)  Name (%wZ).\n",
     Provider, &Provider->LibraryName));
 
   if (NULL == Provider->hModule)
@@ -221,7 +221,7 @@ INT LoadProvider(
   } else
     Status = NO_ERROR;
 
-  WS_DbgPrint(MAX_TRACE, ("Status (%d).\n", Status));
+  WS_DbgPrint(MID_TRACE, ("Status (%d).\n", Status));
 
   return Status;
 }
diff --git a/reactos/lib/ws2_32/misc/dllmain.c b/reactos/lib/ws2_32/misc/dllmain.c
index 0b79ab9d019..46a907f5a75 100644
--- a/reactos/lib/ws2_32/misc/dllmain.c
+++ b/reactos/lib/ws2_32/misc/dllmain.c
@@ -668,6 +668,7 @@ DllMain(HANDLE hInstDll,
 
     p->LastErrorValue = NO_ERROR;
     p->Getservbyname  = NULL;
+    p->Getservbyport  = NULL;
 
     NtCurrentTeb()->WinSockData = p;
     break;
diff --git a/reactos/lib/ws2_32/misc/handle.c b/reactos/lib/ws2_32/misc/handle.c
index 7e6dcc52819..4590574083b 100644
--- a/reactos/lib/ws2_32/misc/handle.c
+++ b/reactos/lib/ws2_32/misc/handle.c
@@ -161,6 +161,8 @@ CreateProviderHandleTable(
   NewBlock = (PPROVIDER_HANDLE_BLOCK)HeapAlloc(
       GlobalHeap, 0, sizeof(PROVIDER_HANDLE_BLOCK));
 
+  WS_DbgPrint(MID_TRACE,("using table entry %x\n", NewBlock));
+
   if (!NewBlock)
       return (HANDLE)0;
 
@@ -209,12 +211,14 @@ ReferenceProviderByHandle(
 {
   PPROVIDER_HANDLE ProviderHandle;
 
-	WS_DbgPrint(MAX_TRACE, ("Handle (0x%X)  Provider (0x%X).\n", Handle, Provider));
+  WS_DbgPrint(MID_TRACE, ("Handle (0x%X)  Provider (0x%X).\n", Handle, Provider));
 
   EnterCriticalSection(&ProviderHandleTableLock);
 
   ProviderHandle = GetProviderByHandle(ProviderHandleTable, Handle);
 
+  WS_DbgPrint(MID_TRACE, ("ProviderHanddle is %x\n", ProviderHandle));
+
   LeaveCriticalSection(&ProviderHandleTableLock);
 
   if (ProviderHandle) {
@@ -256,6 +260,8 @@ InitProviderHandleTable(VOID)
   if (!ProviderHandleTable)
     return FALSE;
 
+  WS_DbgPrint(MID_TRACE,("Called\n"));
+
   ZeroMemory(ProviderHandleTable, sizeof(PROVIDER_HANDLE_BLOCK));
 
   InitializeListHead(&ProviderHandleTable->Entry);
diff --git a/reactos/lib/ws2_32/misc/ns.c b/reactos/lib/ws2_32/misc/ns.c
index 3121a3cda20..177039ccb4b 100644
--- a/reactos/lib/ws2_32/misc/ns.c
+++ b/reactos/lib/ws2_32/misc/ns.c
@@ -7,7 +7,6 @@
  * REVISIONS:
  *   CSH 01/09-2000 Created
  */
-#define __NO_CTYPE_INLINES
 #include <ctype.h>
 #include <ws2_32.h>
 
@@ -482,6 +481,7 @@ static BOOL DecodeServEntFromString( IN  PCHAR ServiceString,
 LPSERVENT
 EXPORT
 getservbyname(
+
     IN  CONST CHAR FAR* name, 
     IN  CONST CHAR FAR* proto)
 {
@@ -568,8 +568,8 @@ getservbyname(
 				     WS2_INTERNAL_MAX_ALIAS ) &&
 	    !strcmp( ServiceName, name ) &&
 	    (proto ? !strcmp( ProtocolStr, proto ) : TRUE) ) {
-	    WS_DbgPrint(MAX_TRACE,("Found the service entry.\n"));
 
+	    WS_DbgPrint(MAX_TRACE,("Found the service entry.\n"));
 	    Found = TRUE;
 	    SizeNeeded = sizeof(WINSOCK_GETSERVBYNAME_CACHE) + 
 		(NextLine - ThisLine);
@@ -640,7 +640,7 @@ getservbyname(
 
 
 /*
- * @unimplemented
+ * @implemented
  */
 LPSERVENT
 EXPORT
@@ -648,9 +648,160 @@ getservbyport(
     IN  INT port, 
     IN  CONST CHAR FAR* proto)
 {
-    UNIMPLEMENTED
+    BOOL  Found = FALSE;
+    HANDLE ServicesFile;
+    CHAR ServiceDBData[BUFSIZ] = { 0 };
+    PCHAR SystemDirectory = ServiceDBData; /* Reuse this stack space */
+    PCHAR ServicesFileLocation = "\\drivers\\etc\\services";
+    PCHAR ThisLine = 0, NextLine = 0, ServiceName = 0, PortNumberStr = 0, 
+	ProtocolStr = 0, Comment = 0;
+    PCHAR Aliases[WS2_INTERNAL_MAX_ALIAS] = { 0 };
+    UINT i,SizeNeeded = 0, 
+	SystemDirSize = sizeof(ServiceDBData) - 1;
+    DWORD ReadSize = 0, ValidData = 0;
+    PWINSOCK_THREAD_BLOCK p = NtCurrentTeb()->WinSockData;
+    
+    if( !p ) {
+	WSASetLastError( WSANOTINITIALISED );
+	return NULL;
+    }
+
+    if ( !port ) {
+        WSASetLastError( WSANO_RECOVERY );
+        return NULL;
+    }
+ 
+    if( !GetSystemDirectoryA( SystemDirectory, SystemDirSize ) ) {
+	WSASetLastError( WSANO_RECOVERY );
+	WS_DbgPrint(MIN_TRACE, ("Could not get windows system directory.\n"));
+	return NULL; /* Can't get system directory */
+    }
+    
+    strncat( SystemDirectory, ServicesFileLocation, SystemDirSize );
+
+    ServicesFile = CreateFileA( SystemDirectory,
+				GENERIC_READ,
+				FILE_SHARE_READ,
+				NULL,
+				OPEN_EXISTING,
+				FILE_ATTRIBUTE_NORMAL | 
+				FILE_FLAG_SEQUENTIAL_SCAN,
+				NULL );
+
+    if( ServicesFile == INVALID_HANDLE_VALUE ) {
+	WSASetLastError( WSANO_RECOVERY );
+	return NULL;
+    }
+
+    /* Scan the services file ... 
+     *
+     * We will read up to BUFSIZ bytes per pass, until the buffer does not
+     * contain a full line, then we will try to read more.
+     *
+     * We fall from the loop if the buffer does not have a line terminator.
+     */
+
+    /* Initial Read */
+    while( !Found &&
+	   ReadFile( ServicesFile, ServiceDBData + ValidData,
+		     sizeof( ServiceDBData ) - ValidData,
+		     &ReadSize, NULL ) ) {
+	ValidData += ReadSize;
+	ReadSize = 0;
+	NextLine = ThisLine = ServiceDBData;
+
+	/* Find the beginning of the next line */
+	while( NextLine < ServiceDBData + ValidData &&
+	       *NextLine != '\r' && *NextLine != '\n' ) NextLine++;
+	
+	/* Zero and skip, so we can treat what we have as a string */
+	if( NextLine >= ServiceDBData + ValidData ) 
+	    break;
+
+	*NextLine = 0; NextLine++;
+
+	Comment = strchr( ThisLine, '#' );
+	if( Comment ) *Comment = 0; /* Terminate at comment start */
+
+	if( DecodeServEntFromString( ThisLine, 
+				     &ServiceName, 
+				     &PortNumberStr,
+				     &ProtocolStr,
+				     Aliases,
+				     WS2_INTERNAL_MAX_ALIAS ) &&
+	    (htons(atoi( PortNumberStr )) == port ) &&
+	    (proto ? !strcmp( ProtocolStr, proto ) : TRUE) ) {
+
+            WS_DbgPrint(MAX_TRACE,("Found the port entry.\n"));
+
+	    Found = TRUE;
+	    SizeNeeded = sizeof(WINSOCK_GETSERVBYPORT_CACHE) + 
+		(NextLine - ThisLine);
+	    break;
+	}
+
+	/* Get rid of everything we read so far */
+	while( NextLine <= ServiceDBData + ValidData &&
+	       isspace( *NextLine ) ) NextLine++;
+
+	WS_DbgPrint(MAX_TRACE,("About to move %d chars\n", 
+			       ServiceDBData + ValidData - NextLine));
+
+	memmove( ServiceDBData, NextLine, 
+		 ServiceDBData + ValidData - NextLine );
+	ValidData -= NextLine - ServiceDBData;
+	WS_DbgPrint(MAX_TRACE,("Valid bytes: %d\n", ValidData));
+    }
+
+    /* This we'll do no matter what */
+    CloseHandle( ServicesFile );
+    
+    if( !Found ) {
+	WS_DbgPrint(MAX_TRACE,("Not found\n"));
+	WSASetLastError( WSANO_DATA );
+	return NULL;
+    }
+    
+    if( !p->Getservbyport || p->Getservbyport->Size < SizeNeeded ) {
+	/* Free previous getservbyport buffer, allocate bigger */
+	if( p->Getservbyport ) 
+	    HeapFree(GlobalHeap, 0, p->Getservbyport);
+	p->Getservbyport = HeapAlloc(GlobalHeap, 0, SizeNeeded);
+	if( !p->Getservbyport ) {
+	    WS_DbgPrint(MIN_TRACE,("Couldn't allocate %d bytes\n", 
+				   SizeNeeded));
+	    WSASetLastError( WSATRY_AGAIN );
+	    return NULL;
+	}
+        p->Getservbyport->Size = SizeNeeded;
+    }
+    /* Copy the data */
+    memmove( p->Getservbyport->Data, 
+	     ThisLine,
+	     NextLine - ThisLine );
+
+    ADJ_PTR(PortNumberStr,ThisLine,p->Getservbyport->Data);
+    ADJ_PTR(ProtocolStr,ThisLine,p->Getservbyport->Data);
+    WS_DbgPrint(MAX_TRACE,
+		("Port Number: %s, Protocol: %s\n", PortNumberStr, ProtocolStr));
+		
+    for( i = 0; Aliases[i]; i++ ) {
+	ADJ_PTR(Aliases[i],ThisLine,p->Getservbyport->Data);
+	WS_DbgPrint(MAX_TRACE,("Aliases %d: %s\n", i, Aliases[i]));
+    }
+
+    memcpy(p->Getservbyport,Aliases,sizeof(Aliases));
+
+    /* Create the struct proper */
+    p->Getservbyport->ServerEntry.s_name = ServiceName;
+    p->Getservbyport->ServerEntry.s_aliases = p->Getservbyport->Aliases;
+    p->Getservbyport->ServerEntry.s_port = port;
+    p->Getservbyport->ServerEntry.s_proto = ProtocolStr;
+
+    WS_DbgPrint(MID_TRACE,("s_name: %s\n", ServiceName));
+
+    return &p->Getservbyport->ServerEntry;
 
-    return (LPSERVENT)NULL;
 }
 
 
diff --git a/reactos/lib/ws2_32/misc/upcall.c b/reactos/lib/ws2_32/misc/upcall.c
index 4264206930a..cfcf804dac3 100644
--- a/reactos/lib/ws2_32/misc/upcall.c
+++ b/reactos/lib/ws2_32/misc/upcall.c
@@ -131,7 +131,7 @@ WPUModifyIFSHandle(
   PCATALOG_ENTRY Provider;
   SOCKET Socket;
 
-  WS_DbgPrint(MAX_TRACE, ("dwCatalogEntryId (%d)  ProposedHandle (0x%X).\n",
+  WS_DbgPrint(MID_TRACE, ("dwCatalogEntryId (%d)  ProposedHandle (0x%X).\n",
     dwCatalogEntryId, ProposedHandle));
 
   Provider = LocateProviderById(dwCatalogEntryId);

From e6f5d067e0719429a9dcc83d985b7246a6c2047f Mon Sep 17 00:00:00 2001
From: Art Yerkes <art.yerkes@gmail.com>
Date: Thu, 15 Jul 2004 03:21:47 +0000
Subject: [PATCH 299/356] oskittcp: fixed handling of uio in send. afd: fixed
 send. tcpip: fixed double-complete of send irp.

svn path=/trunk/; revision=10122
---
 reactos/drivers/lib/oskittcp/oskittcp/interface.c   | 2 ++
 reactos/drivers/lib/oskittcp/oskittcp/uipc_socket.c | 4 ++++
 reactos/drivers/net/tcpip/tcpip/irp.c               | 2 ++
 reactos/drivers/net/tcpip/tcpip/main.c              | 7 ++++++-
 reactos/drivers/net/tcpip/transport/tcp/tcp.c       | 2 +-
 5 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/reactos/drivers/lib/oskittcp/oskittcp/interface.c b/reactos/drivers/lib/oskittcp/oskittcp/interface.c
index b4fc0baea62..f37494d9faf 100644
--- a/reactos/drivers/lib/oskittcp/oskittcp/interface.c
+++ b/reactos/drivers/lib/oskittcp/oskittcp/interface.c
@@ -207,9 +207,11 @@ int OskitTCPSend( void *socket, OSK_PCHAR Data, OSK_UINT Len,
     struct uio uio = { 0 };
     int error = 0;
     OskitDumpBuffer( Data, Len );
+    uio.uio_resid = Len;
     mb.m_data = Data;
     mb.m_len  = Len;
     error = sosend( socket, NULL, &uio, (struct mbuf *)&mb, NULL, 0 );
+    printf("uio.uio_resid = %d\n", uio.uio_resid);
     *OutLen = uio.uio_resid;
     return error;
 }
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/uipc_socket.c b/reactos/drivers/lib/oskittcp/oskittcp/uipc_socket.c
index b90b95bdf5f..1320b84268b 100644
--- a/reactos/drivers/lib/oskittcp/oskittcp/uipc_socket.c
+++ b/reactos/drivers/lib/oskittcp/oskittcp/uipc_socket.c
@@ -440,8 +440,12 @@ nopages:
 					MH_ALIGN(m, len);
 			}
 			space -= len;
+#ifndef __REACTOS__
 			error = uiomove(mtod(m, caddr_t), (int)len, uio);
 			resid = uio->uio_resid;
+#else
+			resid = 0;
+#endif
 			m->m_len = len;
 			*mp = m;
 			top->m_pkthdr.len += len;
diff --git a/reactos/drivers/net/tcpip/tcpip/irp.c b/reactos/drivers/net/tcpip/tcpip/irp.c
index a19e10fabc2..101d89ad38c 100644
--- a/reactos/drivers/net/tcpip/tcpip/irp.c
+++ b/reactos/drivers/net/tcpip/tcpip/irp.c
@@ -16,6 +16,8 @@
 #include <info.h>
 
 NTSTATUS IRPFinish( PIRP Irp, NTSTATUS Status ) {
+    TI_DbgPrint(MID_TRACE,("Called: Irp %x, Status %x Event %x\n", Irp, Status, Irp->UserEvent));
+
     IoSetCancelRoutine( Irp, NULL );
 
     if( Status == STATUS_PENDING )
diff --git a/reactos/drivers/net/tcpip/tcpip/main.c b/reactos/drivers/net/tcpip/tcpip/main.c
index e7d4ee3f5de..6a29849489b 100644
--- a/reactos/drivers/net/tcpip/tcpip/main.c
+++ b/reactos/drivers/net/tcpip/tcpip/main.c
@@ -488,6 +488,7 @@ TiDispatchInternal(
  */
 {
   NTSTATUS Status;
+  BOOL Complete = TRUE;
   PIO_STACK_LOCATION IrpSp;
 
   IrpSp = IoGetCurrentIrpStackLocation(Irp);
@@ -509,6 +510,7 @@ TiDispatchInternal(
 
   case TDI_SEND:
     Status = DispTdiSend(Irp);
+    Complete = FALSE; /* Completed in DispTdiSend */
     break;
 
   case TDI_SEND_DATAGRAM:
@@ -562,7 +564,10 @@ TiDispatchInternal(
 
   TI_DbgPrint(DEBUG_IRP, ("Leaving. Status = (0x%X).\n", Status));
 
-  return IRPFinish( Irp, Status );
+  if( Complete ) 
+      IRPFinish( Irp, Status );
+
+  return Status;
 }
 
 
diff --git a/reactos/drivers/net/tcpip/transport/tcp/tcp.c b/reactos/drivers/net/tcpip/transport/tcp/tcp.c
index 71745bfef3e..664685d1c23 100644
--- a/reactos/drivers/net/tcpip/transport/tcp/tcp.c
+++ b/reactos/drivers/net/tcpip/transport/tcp/tcp.c
@@ -290,7 +290,7 @@ NTSTATUS TCPSendData
 			   Connection->SocketContext));
 
     Status = OskitTCPSend( Connection->SocketContext, 
-			 BufferData, PacketSize, (OSK_UINT *)DataUsed, 0 );
+			 BufferData, PacketSize, DataUsed, 0 );
 
     KeReleaseSpinLock(&Connection->Lock, OldIrql);
 

From b1fb96b44c98ba12c80d13079a0d1c20f7507e7a Mon Sep 17 00:00:00 2001
From: James Tabor <james.tabor@reactos.org>
Date: Thu, 15 Jul 2004 04:04:08 +0000
Subject: [PATCH 300/356] Clear Partition0 DriveNotReady, for Removable Media.

svn path=/trunk/; revision=10124
---
 reactos/drivers/storage/disk/disk.c | 31 ++++++++++-------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/reactos/drivers/storage/disk/disk.c b/reactos/drivers/storage/disk/disk.c
index 5a529d7b58d..b128c699402 100644
--- a/reactos/drivers/storage/disk/disk.c
+++ b/reactos/drivers/storage/disk/disk.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: disk.c,v 1.45 2004/07/13 02:43:06 jimtabor Exp $
+/* $Id: disk.c,v 1.46 2004/07/15 04:04:08 jimtabor Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -850,8 +850,8 @@ DiskBuildPartitionTable(IN PDEVICE_OBJECT DiskDeviceObject,
                         IN PIRP Irp)
 {
   PDRIVE_LAYOUT_INFORMATION PartitionList = NULL;
-  PDEVICE_EXTENSION DiskDeviceExtension;
-  PDISK_DATA DiskData;
+  PDEVICE_EXTENSION DiskDeviceExtension, DDE;
+  PDISK_DATA DiskData, DD;
   PPARTITION_INFORMATION PartitionEntry;
   ULONG PartitionNumber;
   NTSTATUS Status;
@@ -861,6 +861,12 @@ DiskBuildPartitionTable(IN PDEVICE_OBJECT DiskDeviceObject,
   DiskDeviceExtension = (PDEVICE_EXTENSION)DiskDeviceObject->DeviceExtension;
   DiskData = (PDISK_DATA)(DiskDeviceExtension + 1);
 
+  DDE = (PDEVICE_EXTENSION) DiskDeviceExtension->PhysicalDevice->DeviceExtension;
+  DD = (PDISK_DATA)(DDE +1);
+
+  /* Clear flag for Partition0, just incase it was set. */
+  DD->DriveNotReady = FALSE;
+
   Status = ScsiClassReadDriveCapacity(DiskDeviceObject);
   if (!NT_SUCCESS(Status))
     {
@@ -870,25 +876,8 @@ DiskBuildPartitionTable(IN PDEVICE_OBJECT DiskDeviceObject,
       return Status;
     }
 
-/* 
-   A previous partition table may exist for this Device Object.
-   We will need to delete this data and force a rebuild.
- */
-  if(DiskDeviceExtension->StartingOffset.QuadPart)
-  {
-     DPRINT("Partition already installed!\n");
-     DiskData->PartitionType = 0;
-     DiskData->PartitionNumber = 0;
-     DiskData->PartitionOrdinal = 0;
-     DiskData->HiddenSectors = 0;
-     DiskData->BootIndicator = 0;
-     DiskData->DriveNotReady = FALSE;
-     DiskDeviceExtension->StartingOffset.QuadPart = 0;
-     DiskDeviceExtension->PartitionLength.QuadPart = 0;
-  }
-
   /* Read partition table */
-  Status = IoReadPartitionTable(DiskDeviceObject,
+  Status = IoReadPartitionTable(DiskDeviceExtension->PhysicalDevice,
 				DiskDeviceExtension->DiskGeometry->BytesPerSector,
 				TRUE,
 				&PartitionList);

From 64b9c0f3cc7d3773b517e792e627930371ecdded Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Thu, 15 Jul 2004 08:15:49 +0000
Subject: [PATCH 301/356] Implement RtlAddAuditAccessAceEx().

svn path=/trunk/; revision=10125
---
 reactos/include/ntdll/rtl.h     | 11 +++++-
 reactos/lib/ntdll/def/ntdll.def |  3 +-
 reactos/lib/ntdll/def/ntdll.edf |  3 +-
 reactos/lib/rtl/acl.c           | 69 +++++++++++++++++++++++++++++++++
 4 files changed, 83 insertions(+), 3 deletions(-)

diff --git a/reactos/include/ntdll/rtl.h b/reactos/include/ntdll/rtl.h
index 7d9895e9a63..7a516483450 100644
--- a/reactos/include/ntdll/rtl.h
+++ b/reactos/include/ntdll/rtl.h
@@ -1,4 +1,4 @@
-/* $Id: rtl.h,v 1.45 2004/07/08 22:05:48 gvg Exp $
+/* $Id: rtl.h,v 1.46 2004/07/15 08:15:49 ekohl Exp $
  *
  */
 
@@ -131,6 +131,15 @@ RtlAddAccessDeniedAceEx (IN OUT PACL Acl,
 			 IN ACCESS_MASK AccessMask,
 			 IN PSID Sid);
 
+NTSTATUS STDCALL
+RtlAddAuditAccessAceEx(IN OUT PACL Acl,
+		       IN ULONG Revision,
+                       IN ULONG Flags,
+                       IN ACCESS_MASK AccessMask,
+                       IN PSID Sid,
+                       IN BOOLEAN Success,
+                       IN BOOLEAN Failure);
+
 VOID STDCALL
 RtlDeleteCriticalSection (PCRITICAL_SECTION CriticalSection);
 
diff --git a/reactos/lib/ntdll/def/ntdll.def b/reactos/lib/ntdll/def/ntdll.def
index eabbc65de8a..1b64289a368 100644
--- a/reactos/lib/ntdll/def/ntdll.def
+++ b/reactos/lib/ntdll/def/ntdll.def
@@ -1,4 +1,4 @@
-; $Id: ntdll.def,v 1.124 2004/07/08 00:40:30 weiden Exp $
+; $Id: ntdll.def,v 1.125 2004/07/15 08:15:20 ekohl Exp $
 ;
 ; ReactOS Operating System
 ;
@@ -294,6 +294,7 @@ RtlAddAce@20
 RtlAddAtomToAtomTable@12
 ;RtlAddAttributeActionToRXact
 RtlAddAuditAccessAce@24
+RtlAddAuditAccessAceEx@28
 ;RtlAddCompoundAce
 RtlAddRange@36
 RtlAdjustPrivilege@16
diff --git a/reactos/lib/ntdll/def/ntdll.edf b/reactos/lib/ntdll/def/ntdll.edf
index ebfbc5a1778..356d63b8006 100644
--- a/reactos/lib/ntdll/def/ntdll.edf
+++ b/reactos/lib/ntdll/def/ntdll.edf
@@ -1,4 +1,4 @@
-; $Id: ntdll.edf,v 1.114 2004/07/08 00:40:30 weiden Exp $
+; $Id: ntdll.edf,v 1.115 2004/07/15 08:15:21 ekohl Exp $
 ;
 ; ReactOS Operating System
 ;
@@ -294,6 +294,7 @@ RtlAddAce=RtlAddAce@20
 RtlAddAtomToAtomTable=RtlAddAtomToAtomTable@12
 ;RtlAddAttributeActionToRXact
 RtlAddAuditAccessAce=RtlAddAuditAccessAce@24
+RtlAddAuditAccessAceEx=RtlAddAuditAccessAceEx@28
 ;RtlAddCompoundAce
 RtlAddRange=RtlAddRange@36
 RtlAdjustPrivilege=RtlAdjustPrivilege@16
diff --git a/reactos/lib/rtl/acl.c b/reactos/lib/rtl/acl.c
index 1e27a2ed000..c401def39b7 100644
--- a/reactos/lib/rtl/acl.c
+++ b/reactos/lib/rtl/acl.c
@@ -395,6 +395,75 @@ RtlAddAuditAccessAce(PACL Acl,
 }
 
 
+/*
+ * @implemented
+ */
+NTSTATUS STDCALL
+RtlAddAuditAccessAceEx(PACL Acl,
+                       ULONG Revision,
+                       ULONG Flags,
+                       ACCESS_MASK AccessMask,
+                       PSID Sid,
+                       BOOLEAN Success,
+                       BOOLEAN Failure)
+{
+  PACE Ace;
+
+  if (Success != FALSE)
+  {
+    Flags |= SUCCESSFUL_ACCESS_ACE_FLAG;
+  }
+
+  if (Failure != FALSE)
+  {
+    Flags |= FAILED_ACCESS_ACE_FLAG;
+  }
+
+  if (!RtlValidSid(Sid))
+  {
+    return STATUS_INVALID_SID;
+  }
+
+  if (Acl->AclRevision > MAX_ACL_REVISION ||
+      Revision > MAX_ACL_REVISION)
+  {
+    return STATUS_REVISION_MISMATCH;
+  }
+
+  if (Revision < Acl->AclRevision)
+  {
+    Revision = Acl->AclRevision;
+  }
+
+  if (!RtlFirstFreeAce(Acl, &Ace))
+  {
+    return STATUS_INVALID_ACL;
+  }
+
+  if (Ace == NULL)
+  {
+    return STATUS_ALLOTTED_SPACE_EXCEEDED;
+  }
+
+  if (((PVOID)Ace + RtlLengthSid(Sid) + sizeof(ACE)) >= ((PVOID)Acl + Acl->AclSize))
+  {
+    return STATUS_ALLOTTED_SPACE_EXCEEDED;
+  }
+
+  Ace->Header.AceFlags = Flags;
+  Ace->Header.AceType = SYSTEM_AUDIT_ACE_TYPE;
+  Ace->Header.AceSize = RtlLengthSid(Sid) + sizeof(ACE);
+  Ace->AccessMask = AccessMask;
+  RtlCopySid(RtlLengthSid(Sid),
+             (PSID)(Ace + 1),
+             Sid);
+  Acl->AceCount++;
+  Acl->AclRevision = Revision;
+
+  return STATUS_SUCCESS;
+}
+
+
 static VOID
 RtlpDeleteData(PVOID Ace,
                ULONG AceSize,

From 3281baa0bf174e07fe46c25c3ba9e1e80e88e01a Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Thu, 15 Jul 2004 18:13:22 +0000
Subject: [PATCH 302/356] - Minor correction to DIB_32BPP_BitBlt that I broke
 with my last patch.

svn path=/trunk/; revision=10126
---
 reactos/subsys/win32k/dib/dib32bpp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reactos/subsys/win32k/dib/dib32bpp.c b/reactos/subsys/win32k/dib/dib32bpp.c
index 7b9d490698b..95f74dfa9cd 100644
--- a/reactos/subsys/win32k/dib/dib32bpp.c
+++ b/reactos/subsys/win32k/dib/dib32bpp.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dib32bpp.c,v 1.30 2004/07/14 20:48:56 navaraf Exp $ */
+/* $Id: dib32bpp.c,v 1.31 2004/07/15 18:13:22 navaraf Exp $ */
 #include <w32k.h>
 
 VOID
@@ -344,7 +344,7 @@ DIB_32BPP_BitBlt(PBLTINFO BltInfo)
       }
       DestBits = (PULONG)(
          (ULONG_PTR)DestBits -
-         ((BltInfo->DestRect.right - BltInfo->DestRect.left) << 2) -
+         ((BltInfo->DestRect.right - BltInfo->DestRect.left) << 2) +
          BltInfo->DestSurface->lDelta);
    }
   

From 4fd7ec5f638dc18974f95d1fd3cba425b7d780ac Mon Sep 17 00:00:00 2001
From: Martin Fuchs <fuchs.martin@gmail.com>
Date: Thu, 15 Jul 2004 20:43:18 +0000
Subject: [PATCH 303/356] replace BUFFER_LEN by dynamic allocations

svn path=/trunk/; revision=10132
---
 .../system/explorer/utility/xmlstorage.cpp    |  4 +-
 .../system/explorer/utility/xmlstorage.h      | 63 +++++++++++++------
 2 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/reactos/subsys/system/explorer/utility/xmlstorage.cpp b/reactos/subsys/system/explorer/utility/xmlstorage.cpp
index da863514833..cd18cb7a3a8 100644
--- a/reactos/subsys/system/explorer/utility/xmlstorage.cpp
+++ b/reactos/subsys/system/explorer/utility/xmlstorage.cpp
@@ -238,7 +238,7 @@ std::string XMLReaderBase::get_error_string() const
 
 std::string EncodeXMLString(LPCTSTR s)
 {
-	TCHAR buffer[BUFFER_LEN];
+	LPTSTR buffer = (LPTSTR)alloca(5*sizeof(TCHAR)*_tcslen(s));	// worst case. "&amp;"
 	LPTSTR o = buffer;
 
 	for(LPCTSTR p=s; *p; ++p)
@@ -264,7 +264,7 @@ std::string EncodeXMLString(LPCTSTR s)
 
 String DecodeXMLString(LPCTSTR s)
 {
-	TCHAR buffer[BUFFER_LEN];
+	LPTSTR buffer = (LPTSTR)alloca(sizeof(TCHAR)*_tcslen(s));
 	LPTSTR o = buffer;
 
 	for(LPCTSTR p=s; *p; ++p)
diff --git a/reactos/subsys/system/explorer/utility/xmlstorage.h b/reactos/subsys/system/explorer/utility/xmlstorage.h
index 686e6b30515..57f96b13a41 100644
--- a/reactos/subsys/system/explorer/utility/xmlstorage.h
+++ b/reactos/subsys/system/explorer/utility/xmlstorage.h
@@ -50,6 +50,7 @@
 #define _UNICODE
 #endif
 #include <tchar.h>
+#include <malloc.h>
 
 #include <fstream>
 #include <sstream>
@@ -95,15 +96,15 @@ struct String
 	String(LPCSTR s, int l) {assign(s, l);}
 	String(const std::string& other) {assign(other.c_str());}
 	String& operator=(LPCSTR s) {assign(s); return *this;}
-	void assign(LPCSTR s) {if (s) {TCHAR b[BUFFER_LEN]; super::assign(b, MultiByteToWideChar(CP_ACP, 0, s, -1, b, BUFFER_LEN)-1);} else erase();}
-	void assign(LPCSTR s, int l) {if (s) {TCHAR b[BUFFER_LEN]; super::assign(b, MultiByteToWideChar(CP_ACP, 0, s, l, b, BUFFER_LEN));} else erase();}
+	void assign(LPCSTR s) {if (s) {int bl=strlen(s); LPWSTR b=(LPWSTR)alloca(sizeof(WCHAR)*bl); super::assign(b, MultiByteToWideChar(CP_ACP, 0, s, bl, b, bl));} else erase();}
+	void assign(LPCSTR s, int l) {if (s) {int bl=l; LPWSTR b=(LPWSTR)alloca(sizeof(WCHAR)*bl); super::assign(b, MultiByteToWideChar(CP_ACP, 0, s, l, b, bl));} else erase();}
 #else
 	String(LPCWSTR s) {assign(s);}
 	String(LPCWSTR s, int l) {assign(s, l);}
 	String(const std::wstring& other) {assign(other.c_str());}
 	String& operator=(LPCWSTR s) {assign(s); return *this;}
-	void assign(LPCWSTR s) {if (s) {char b[BUFFER_LEN]; super::assign(b, WideCharToMultiByte(CP_ACP, 0, s, -1, b, BUFFER_LEN, 0, 0)-1);} else erase();}
-	void assign(LPCWSTR s, int l) {if (s) {char b[BUFFER_LEN]; super::assign(b, WideCharToMultiByte(CP_ACP, 0, s, l, b, BUFFER_LEN, 0, 0));} else erase();}
+	void assign(LPCWSTR s) {if (s) {int bl=wcslen(s); LPSTR b=(LPSTR)alloca(bl); super::assign(b, WideCharToMultiByte(CP_ACP, 0, s, bl, b, bl, 0, 0));} else erase();}
+	void assign(LPCWSTR s, int l) {int bl=l; if (s) {LPSTR b=(LPSTR)alloca(bl); super::assign(b, WideCharToMultiByte(CP_ACP, 0, s, l, b, bl, 0, 0));} else erase();}
 #endif
 
 	String& operator=(LPCTSTR s) {if (s) super::assign(s); else erase(); return *this;}
@@ -114,9 +115,9 @@ struct String
 	operator LPCTSTR() const {return c_str();}
 
 #ifdef UNICODE
-	operator std::string() const {char b[BUFFER_LEN]; return std::string(b, WideCharToMultiByte(CP_ACP, 0, c_str(), -1, b, BUFFER_LEN, 0, 0)-1);}
+	operator std::string() const {int bl=length(); LPSTR b=(LPSTR)alloca(bl); return std::string(b, WideCharToMultiByte(CP_ACP, 0, c_str(), bl, b, bl, 0, 0));}
 #else
-	operator std::wstring() const {WCHAR b[BUFFER_LEN]; return std::wstring(b, MultiByteToWideChar(CP_ACP, 0, c_str(), -1, b, BUFFER_LEN)-1);}
+	operator std::wstring() const {int bl=length(); LPWSTR b=(LPWSTR)alloca(sizeof(WCHAR)*bl); return std::wstring(b, MultiByteToWideChar(CP_ACP, 0, c_str(), bl, b, bl));}
 #endif
 
 	String& printf(LPCTSTR fmt, ...)
@@ -167,15 +168,17 @@ struct String
 
 inline void assign_utf8(String& s, const char* str)
 {
-	TCHAR buffer[BUFFER_LEN];
+	int lutf8 = strlen(str);
 
 #ifdef UNICODE
-	int l = MultiByteToWideChar(CP_UTF8, 0, str, -1, buffer, BUFFER_LEN) - 1;
+	LPTSTR buffer = (LPTSTR)alloca(lutf8);
+	int l = MultiByteToWideChar(CP_UTF8, 0, str, lutf8, buffer, lutf8);
 #else
-	WCHAR wbuffer[BUFFER_LEN];
+	LPWSTR wbuffer = (LPWSTR)alloca(sizeof(WCHAR)*lutf8);
+	int l = MultiByteToWideChar(CP_UTF8, 0, str, lutf8, wbuffer, lutf8);
 
-	int l = MultiByteToWideChar(CP_UTF8, 0, str, -1, wbuffer, BUFFER_LEN) - 1;
-	l = WideCharToMultiByte(CP_ACP, 0, wbuffer, l, buffer, BUFFER_LEN, 0, 0);
+	int bl=2*l; LPSTR buffer = (LPSTR)alloca(bl);
+	l = WideCharToMultiByte(CP_ACP, 0, wbuffer, l, buffer, bl, 0, 0);
 #endif
 
 	s.assign(buffer, l);
@@ -183,15 +186,15 @@ inline void assign_utf8(String& s, const char* str)
 
 inline std::string get_utf8(LPCTSTR s, int l)
 {
-	char buffer[BUFFER_LEN];
-
 #ifdef UNICODE
-	l = WideCharToMultiByte(CP_UTF8, 0, s, l, buffer, BUFFER_LEN, 0, 0);
+	LPSTR buffer = (LPSTR)alloca(l);
+	l = WideCharToMultiByte(CP_UTF8, 0, s, l, buffer, l, 0, 0);
 #else
-	WCHAR wbuffer[BUFFER_LEN];
+	LPWSTR wbuffer = (LPWSTR)alloca(sizeof(WCHAR)*l);
+	l = MultiByteToWideChar(CP_ACP, 0, s, l, wbuffer, l);
 
-	l = MultiByteToWideChar(CP_ACP, 0, s, l, wbuffer, BUFFER_LEN);
-	l = WideCharToMultiByte(CP_UTF8, 0, wbuffer, l, buffer, BUFFER_LEN, 0, 0);
+	int bl=2*l; LPSTR buffer = (LPSTR)alloca(bl);
+	l = WideCharToMultiByte(CP_UTF8, 0, wbuffer, l, buffer, bl, 0, 0);
 #endif
 
 	return std::string(buffer, l);
@@ -1282,6 +1285,11 @@ struct XMLString
 		return _value;
 	}
 
+	const String& c_str() const
+	{
+		return _value;
+	}
+
 protected:
 	String	_value;
 
@@ -1320,6 +1328,25 @@ protected:
 };
 
 
+template<typename T>
+	inline void read_option(T& var, const_XMLPos& cfg, LPCTSTR key)
+	{
+		const String& val = cfg.get(key);
+
+		if (!val.empty())
+			var = val;
+	}
+
+template<>
+	inline void read_option(int& var, const_XMLPos& cfg, LPCTSTR key)
+	{
+		const String& val = cfg.get(key);
+
+		if (!val.empty())
+			var = _ttoi(val);
+	}
+
+
 #ifdef _MSC_VER
 #pragma warning(disable: 4355)
 #endif
@@ -1392,7 +1419,7 @@ struct XMLReader : public XMLReaderBase
 		if (!_in.good())
 			return -1;
 
-		_in.read(buffer, BUFFER_LEN);
+		_in.read(buffer, len);
 
 		return _in.gcount();
 	}

From e7d21fa39eb38532a6810edc80c0905dbbd51609 Mon Sep 17 00:00:00 2001
From: Martin Fuchs <fuchs.martin@gmail.com>
Date: Thu, 15 Jul 2004 21:04:02 +0000
Subject: [PATCH 304/356] ignore unexpected exceptions while extracting icons

svn path=/trunk/; revision=10133
---
 reactos/subsys/system/explorer/shell/shellfs.cpp     | 12 ++++++++++--
 reactos/subsys/system/explorer/taskbar/startmenu.cpp |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/reactos/subsys/system/explorer/shell/shellfs.cpp b/reactos/subsys/system/explorer/shell/shellfs.cpp
index 9fb227483b3..ca849de618e 100644
--- a/reactos/subsys/system/explorer/shell/shellfs.cpp
+++ b/reactos/subsys/system/explorer/shell/shellfs.cpp
@@ -306,7 +306,11 @@ void ShellDirectory::read_directory(int scan_flags)
 				if (w32fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
 					entry->_icon_id = ICID_FOLDER;
 				else if (scan_flags & SCAN_EXTRACT_ICONS)
-					entry->extract_icon();
+					try {
+						entry->extract_icon();
+					} catch(COMException&) {
+						// ignore unexpected exceptions while extracting icons
+					}
 
 				last = entry;
 			} while(FindNextFile(hFind, &w32fd));
@@ -408,7 +412,11 @@ void ShellDirectory::read_directory(int scan_flags)
 					if (!(entry->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ||
 						!(attribs & SFGAO_FILESYSTEM)) {
 						if (scan_flags & SCAN_EXTRACT_ICONS)
-							entry->extract_icon();
+							try {
+								entry->extract_icon();
+							} catch(COMException&) {
+								// ignore unexpected exceptions while extracting icons
+							}
 					} else if (entry->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
 						entry->_icon_id = ICID_FOLDER;
 					else
diff --git a/reactos/subsys/system/explorer/taskbar/startmenu.cpp b/reactos/subsys/system/explorer/taskbar/startmenu.cpp
index f4a9da2de3a..7ffef196dae 100644
--- a/reactos/subsys/system/explorer/taskbar/startmenu.cpp
+++ b/reactos/subsys/system/explorer/taskbar/startmenu.cpp
@@ -153,7 +153,7 @@ HWND StartMenu::Create(int x, int y, const StartMenuFolders& folders, HWND hwndP
 }
 
 
-LRESULT	StartMenu::Init(LPCREATESTRUCT pcs)
+LRESULT StartMenu::Init(LPCREATESTRUCT pcs)
 {
 	try {
 		AddEntries();

From 3ab4ec1f54dea271d3a16c8b27f00add8624d890 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Thu, 15 Jul 2004 21:14:51 +0000
Subject: [PATCH 305/356] - Handle indexed palettes in
 IntEngCreateSrcMonoXlate.

svn path=/trunk/; revision=10135
---
 reactos/subsys/win32k/eng/xlate.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/reactos/subsys/win32k/eng/xlate.c b/reactos/subsys/win32k/eng/xlate.c
index e69938e03b3..5824aded274 100644
--- a/reactos/subsys/win32k/eng/xlate.c
+++ b/reactos/subsys/win32k/eng/xlate.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: xlate.c,v 1.41 2004/07/14 20:48:57 navaraf Exp $
+/* $Id: xlate.c,v 1.42 2004/07/15 21:14:51 navaraf Exp $
  * 
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -375,6 +375,20 @@ IntEngCreateSrcMonoXlate(HPALETTE PaletteDest,
    XlateGDI->translationTable[0] = ShiftAndMask(XlateGDI, BackgroundColor);
    XlateGDI->translationTable[1] = ShiftAndMask(XlateGDI, ForegroundColor);
 
+   if (XlateObj->iDstType == PAL_INDEXED)
+   {
+      XlateGDI->translationTable[0] =
+         ClosestColorMatch(XlateGDI,
+                           (LPPALETTEENTRY)&XlateGDI->translationTable[0],
+                           DestPalGDI->IndexedColors,
+                           DestPalGDI->NumColors);
+      XlateGDI->translationTable[1] = 
+         ClosestColorMatch(XlateGDI,
+                           (LPPALETTEENTRY)&XlateGDI->translationTable[1],
+                           DestPalGDI->IndexedColors,
+                           DestPalGDI->NumColors);
+   }
+
    PALETTE_UnlockPalette(PaletteDest);
 
    return XlateObj;

From 28e3667b69c0cc787ae0c6489a7efc7c669cb5ce Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Fri, 16 Jul 2004 13:45:02 +0000
Subject: [PATCH 306/356] Fixed prototypes to work in MSVC.

svn path=/trunk/; revision=10139
---
 reactos/include/ddk/fsfuncs.h | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/reactos/include/ddk/fsfuncs.h b/reactos/include/ddk/fsfuncs.h
index 9a3fd3fbcfe..9dcd252badc 100644
--- a/reactos/include/ddk/fsfuncs.h
+++ b/reactos/include/ddk/fsfuncs.h
@@ -1,6 +1,6 @@
 #ifndef __INCLUDE_DDK_FSFUNCS_H
 #define __INCLUDE_DDK_FSFUNCS_H
-/* $Id: fsfuncs.h,v 1.25 2004/06/27 11:23:57 navaraf Exp $ */
+/* $Id: fsfuncs.h,v 1.26 2004/07/16 13:45:02 ion Exp $ */
 #define FlagOn(x,f) ((x) & (f))
 
 #include <ntos/fstypes.h>
@@ -58,8 +58,8 @@ FsRtlFreeFileLock(
 	IN PFILE_LOCK FileLock
 	);
 
-STDCALL
 VOID
+STDCALL
 FsRtlAcquireFileExclusive (
     IN PFILE_OBJECT FileObject
     );
@@ -348,15 +348,15 @@ FsRtlInitializeTunnelCache (
     IN PTUNNEL Cache
     );
 
-STDCALL
 NTSTATUS
+STDCALL
 FsRtlInsertPerFileObjectContext (
     IN PFSRTL_ADVANCED_FCB_HEADER PerFileObjectContext,
     IN PVOID /* PFSRTL_PER_FILE_OBJECT_CONTEXT*/ Ptr
     );
 
-STDCALL
 NTSTATUS
+STDCALL
 FsRtlInsertPerStreamContext (
     IN PFSRTL_ADVANCED_FCB_HEADER PerStreamContext,
     IN PFSRTL_PER_STREAM_CONTEXT Ptr
@@ -425,8 +425,8 @@ BOOLEAN STDCALL
 FsRtlLookupLastLargeMcbEntry(IN PLARGE_MCB Mcb,
 			     OUT PLONGLONG Vbn,
 			     OUT PLONGLONG Lbn);
-STDCALL
 BOOLEAN
+STDCALL
 FsRtlLookupLastLargeMcbEntryAndIndex (
     IN PLARGE_MCB OpaqueMcb,
     OUT PLONGLONG LargeVbn,
@@ -444,16 +444,17 @@ FsRtlLookupMcbEntry (IN PMCB     Mcb,
 		     OUT PLBN    Lbn,
 		     OUT PULONG  SectorCount OPTIONAL,
 		     OUT PULONG  Index);
-STDCALL
+
 PFSRTL_PER_STREAM_CONTEXT
+STDCALL
 FsRtlLookupPerStreamContextInternal (
     IN PFSRTL_ADVANCED_FCB_HEADER StreamContext,
     IN PVOID OwnerId OPTIONAL,
     IN PVOID InstanceId OPTIONAL
     );
 
-STDCALL
 PVOID /* PFSRTL_PER_FILE_OBJECT_CONTEXT*/
+STDCALL
 FsRtlLookupPerFileObjectContext (
     IN PFSRTL_ADVANCED_FCB_HEADER StreamContext,
     IN PVOID OwnerId OPTIONAL,
@@ -534,8 +535,9 @@ BOOLEAN (*PCHECK_FOR_TRAVERSE_ACCESS) (
 	IN	PVOID				TargetContext,
 	IN	PSECURITY_SUBJECT_CONTEXT	SubjectContext
 	);
-STDCALL
+
 VOID
+STDCALL
 FsRtlNotifyFilterChangeDirectory (
     IN PNOTIFY_SYNC NotifySync,
     IN PLIST_ENTRY NotifyList,
@@ -550,8 +552,8 @@ FsRtlNotifyFilterChangeDirectory (
     IN PFILTER_REPORT_CHANGE FilterCallback OPTIONAL
     );
 
-STDCALL
 VOID
+STDCALL
 FsRtlNotifyFilterReportChange (
     IN PNOTIFY_SYNC NotifySync,
     IN PLIST_ENTRY NotifyList,
@@ -695,8 +697,8 @@ FsRtlProcessFileLock (
     IN PVOID        Context OPTIONAL
     );
 
-STDCALL
 NTSTATUS
+STDCALL
 FsRtlRegisterFileSystemFilterCallbacks (
     IN PVOID		Unknown1,
     IN PVOID		Unknown2
@@ -707,8 +709,8 @@ FsRtlRegisterUncProvider(IN OUT PHANDLE Handle,
 			 IN PUNICODE_STRING RedirectorDeviceName,
 			 IN BOOLEAN MailslotsSupported);
 
-STDCALL
 VOID
+STDCALL
 FsRtlReleaseFile (
     IN PFILE_OBJECT FileObject
     );
@@ -723,24 +725,24 @@ FsRtlRemoveMcbEntry (IN PMCB     Mcb,
 		     IN VBN      Vbn,
 		     IN ULONG    SectorCount);
 
-STDCALL
 PFSRTL_PER_STREAM_CONTEXT
+STDCALL
 FsRtlRemovePerStreamContext (
     IN PFSRTL_ADVANCED_FCB_HEADER StreamContext,
     IN PVOID Unknown1 OPTIONAL,
     IN PVOID Unknown2 OPTIONAL
     );
 
-STDCALL
 PVOID /* PFSRTL_PER_FILE_OBJECT_CONTEXT*/
+STDCALL
 FsRtlRemovePerFileObjectContext (
    IN PFSRTL_ADVANCED_FCB_HEADER PerFileObjectContext,
     IN PVOID OwnerId OPTIONAL,
     IN PVOID InstanceId OPTIONAL
     );
 
-STDCALL
 VOID
+STDCALL
 FsRtlResetLargeMcb (
     IN PLARGE_MCB Mcb,
     IN BOOLEAN SelfSynchronized
@@ -759,8 +761,8 @@ FsRtlSyncVolumes (
 	DWORD	Unknown2
 	);
 
-STDCALL
 VOID
+STDCALL
 FsRtlTeardownPerStreamContexts (
   IN PFSRTL_ADVANCED_FCB_HEADER AdvancedHeader
   );

From 243d59c9e64051edd02b205647ccae612ad063cd Mon Sep 17 00:00:00 2001
From: Gregor Anich <blight@blight.eu.org>
Date: Fri, 16 Jul 2004 16:16:16 +0000
Subject: [PATCH 307/356] Fix some bugs, works on Windows and ReactOS with Mesa
 and NVIDIA driver. x86 asm version of gl dispatch functions work now too (in
 gl.c)

svn path=/trunk/; revision=10141
---
 reactos/lib/opengl32/gl.c       |  24 ++-
 reactos/lib/opengl32/icdtable.h |   4 +-
 reactos/lib/opengl32/opengl32.c | 290 ++++++++++++++------------
 reactos/lib/opengl32/opengl32.h |  92 +++++----
 reactos/lib/opengl32/wgl.c      | 355 +++++++++++++++++++++-----------
 5 files changed, 474 insertions(+), 291 deletions(-)

diff --git a/reactos/lib/opengl32/gl.c b/reactos/lib/opengl32/gl.c
index 8c29cc4a150..a568a6395c2 100644
--- a/reactos/lib/opengl32/gl.c
+++ b/reactos/lib/opengl32/gl.c
@@ -20,7 +20,7 @@
  * On other machines we use C to forward the calls (slow...)
  */
 
-#define WIN32_LEAN_AND_MEAN
+#define WIN32_LEANER_AND_MEANER
 #include <windows.h>
 #include "teb.h"
 
@@ -58,13 +58,25 @@ int STDCALL glEmptyFunc56( long l1, long l2, long l3, long l4, long l5,
                            long l11, long l12, long l13, long l14 )
                            { return 0; }
 
-#if 1//!defined(_M_IX86)
+#if defined(_M_IX86)
+# define FOO(x) #x
+# define X(func, ret, typeargs, args, icdidx, tebidx, stack)          \
+__asm__(".globl _"#func"@"#stack                      "\n\t"          \
+        "_"#func"@"#stack":"                          "\n\t"          \
+        "	movl %fs:0x18, %eax"                "\n\t"          \
+        "       movl 0xbe8(%eax), %eax"             "\n\t"          \
+        "       jmp *"FOO((icdidx*4))"(%eax)"        "\n\t");
+        
+GLFUNCS_MACRO
+# undef FOO
+# undef X
+#else /* defined(_M_IX86) */
 # define X(func, ret, typeargs, args, icdidx, tebidx, stack)          \
 ret STDCALL func typeargs                                             \
 {                                                                     \
-    PROC *table;                                                      \
+	PROC *table;                                                      \
 	PROC fn;                                                          \
-	if (tebidx >= 0)                                                  \
+	if (tebidx >= 10000)                                                  \
 	{                                                                 \
 		table = (PROC *)NtCurrentTeb()->glDispatchTable;              \
 		fn = table[tebidx];                                           \
@@ -79,7 +91,7 @@ ret STDCALL func typeargs                                             \
 
 GLFUNCS_MACRO
 
-#undef X
-#endif//non-x86 architectures
+# undef X
+#endif /* !defined(_M_IX86) */
 
 /* EOF */
diff --git a/reactos/lib/opengl32/icdtable.h b/reactos/lib/opengl32/icdtable.h
index 79506ab9c3e..9c36ae83b55 100644
--- a/reactos/lib/opengl32/icdtable.h
+++ b/reactos/lib/opengl32/icdtable.h
@@ -14,8 +14,8 @@ enum icdoffsets_e
 
 typedef struct tagICDTable
 {
-	DWORD	num_funcs; /* Normally 336 (0x150) */
-	PROC	dispatch_table[812];
+	DWORD	num_funcs; /*!< Normally 336 (0x150) -- the number of functions in OpenGL 1.1 */
+	PROC	dispatch_table[812]; /*!< Table containing \a num_funcs pointers to OpenGL functions */
 } ICDTable, *PICDTable;
 
 #endif /* OPENGL32_PRIVATE_ICDTABLE_H */
diff --git a/reactos/lib/opengl32/opengl32.c b/reactos/lib/opengl32/opengl32.c
index 4ce8e046d44..1087efc3909 100644
--- a/reactos/lib/opengl32/opengl32.c
+++ b/reactos/lib/opengl32/opengl32.c
@@ -1,4 +1,4 @@
-/* $Id: opengl32.c,v 1.16 2004/03/01 19:36:20 navaraf Exp $
+/* $Id: opengl32.c,v 1.17 2004/07/16 16:16:16 blight Exp $
  *
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS kernel
@@ -17,21 +17,65 @@
 #include <string.h>
 #include "opengl32.h"
 
+
 /* function prototypes */
-/*static BOOL OPENGL32_LoadDrivers();*/
 static void OPENGL32_AppendICD( GLDRIVERDATA *icd );
 static void OPENGL32_RemoveICD( GLDRIVERDATA *icd );
 static GLDRIVERDATA *OPENGL32_LoadDriver( LPCWSTR regKey );
 static DWORD OPENGL32_InitializeDriver( GLDRIVERDATA *icd );
 static BOOL OPENGL32_UnloadDriver( GLDRIVERDATA *icd );
+static DWORD OPENGL32_RegGetDriverInfo( LPCWSTR driver, GLDRIVERDATA *icd );
+
 
 /* global vars */
 DWORD OPENGL32_tls;
 GLPROCESSDATA OPENGL32_processdata;
 
 
-static
-void
+static BOOL
+OPENGL32_ThreadAttach()
+{
+	GLTHREADDATA* lpData = NULL;
+	PROC *dispatchTable = NULL;
+	TEB *teb = NULL;
+
+	dispatchTable = (PROC*)HeapAlloc( GetProcessHeap(),
+	                                  HEAP_GENERATE_EXCEPTIONS | HEAP_ZERO_MEMORY,
+	                                  sizeof (((ICDTable *)(0))->dispatch_table) );
+	if (dispatchTable == NULL)
+	{
+		DBGPRINT( "Error: Couldn't allocate GL dispatch table" );
+		return FALSE;
+	}
+
+	lpData = (GLTHREADDATA*)HeapAlloc( GetProcessHeap(),
+	                                   HEAP_GENERATE_EXCEPTIONS | HEAP_ZERO_MEMORY,
+	                                   sizeof (GLTHREADDATA) );
+	if (lpData == NULL)
+	{
+		DBGPRINT( "Error: Couldn't allocate GLTHREADDATA" );
+		HeapFree( GetProcessHeap(), 0, dispatchTable );
+		return FALSE;
+	}
+
+	teb = NtCurrentTeb();
+
+	/* initialize dispatch table with empty functions */
+	#define X(func, ret, typeargs, args, icdidx, tebidx, stack)            \
+		dispatchTable[icdidx] = (PROC)glEmptyFunc##stack;                  \
+		if (tebidx >= 0)                                                   \
+			teb->glDispatchTable[tebidx] = (PVOID)glEmptyFunc##stack;
+	GLFUNCS_MACRO
+	#undef X
+
+	teb->glTable = dispatchTable;
+	TlsSetValue( OPENGL32_tls, lpData );
+	
+	return TRUE;
+}
+
+
+static void
 OPENGL32_ThreadDetach()
 {
 	/* FIXME - do we need to release some HDC or something? */
@@ -56,8 +100,47 @@ OPENGL32_ThreadDetach()
 }
 
 
-static
-void
+static BOOL
+OPENGL32_ProcessAttach()
+{
+	SECURITY_ATTRIBUTES attrib = { sizeof (SECURITY_ATTRIBUTES), /* nLength */
+	                               NULL, /* lpSecurityDescriptor */
+	                               TRUE /* bInheritHandle */ };
+
+	OPENGL32_tls = TlsAlloc();
+	if (0xFFFFFFFF == OPENGL32_tls)
+		return FALSE;
+
+	memset( &OPENGL32_processdata, 0, sizeof (OPENGL32_processdata) );
+
+	/* create driver, glrc & dcdata list mutex */
+	OPENGL32_processdata.driver_mutex = CreateMutex( &attrib, FALSE, NULL );
+	if (OPENGL32_processdata.driver_mutex == NULL)
+	{
+		DBGPRINT( "Error: Couldn't create driver_list mutex (%d)",
+		          GetLastError() );
+		return FALSE;
+	}
+	OPENGL32_processdata.glrc_mutex = CreateMutex( &attrib, FALSE, NULL );
+	if (OPENGL32_processdata.glrc_mutex == NULL)
+	{
+		DBGPRINT( "Error: Couldn't create glrc_list mutex (%d)",
+		          GetLastError() );
+		return FALSE;
+	}
+	OPENGL32_processdata.dcdata_mutex = CreateMutex( &attrib, FALSE, NULL );
+	if (OPENGL32_processdata.dcdata_mutex == NULL)
+	{
+		DBGPRINT( "Error: Couldn't create dcdata_list mutex (%d)",
+		          GetLastError() );
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+
+static void
 OPENGL32_ProcessDetach()
 {
 	GLDRIVERDATA *icd, *icd2;
@@ -106,17 +189,9 @@ OPENGL32_ProcessDetach()
 }
 
 
-BOOL
-WINAPI
+BOOL WINAPI
 DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved)
 {
-	GLTHREADDATA* lpData = NULL;
-	PROC *dispatchTable = NULL;
-	TEB *teb = NULL;
-	SECURITY_ATTRIBUTES attrib = { sizeof (SECURITY_ATTRIBUTES), /* nLength */
-	                               NULL, /* lpSecurityDescriptor */
-	                               TRUE /* bInheritHandle */ };
-
 	DBGPRINT( "Info: Called!" );
 	switch ( Reason )
 	{
@@ -125,71 +200,15 @@ DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved)
 	 */
 	case DLL_PROCESS_ATTACH:
 		DBGTRACE( "Process attach" );
-		OPENGL32_tls = TlsAlloc();
-		if ( 0xFFFFFFFF == OPENGL32_tls )
+		if (!OPENGL32_ProcessAttach())
 			return FALSE;
-
-		memset( &OPENGL32_processdata, 0, sizeof (OPENGL32_processdata) );
-
-		/* create driver, glrc & dcdata list mutex */
-		OPENGL32_processdata.driver_mutex = CreateMutex( &attrib, FALSE, NULL );
-		if (OPENGL32_processdata.driver_mutex == NULL)
-		{
-			DBGPRINT( "Error: Couldn't create driver_list mutex (%d)",
-			          GetLastError() );
-			return FALSE;
-		}
-		OPENGL32_processdata.glrc_mutex = CreateMutex( &attrib, FALSE, NULL );
-		if (OPENGL32_processdata.glrc_mutex == NULL)
-		{
-			DBGPRINT( "Error: Couldn't create glrc_list mutex (%d)",
-			          GetLastError() );
-			return FALSE;
-		}
-		OPENGL32_processdata.dcdata_mutex = CreateMutex( &attrib, FALSE, NULL );
-		if (OPENGL32_processdata.dcdata_mutex == NULL)
-		{
-			DBGPRINT( "Error: Couldn't create dcdata_list mutex (%d)",
-			          GetLastError() );
-			return FALSE;
-		}
-
 		/* No break: Initialize the index for first thread. */
 
 	/* The attached process creates a new thread. */
 	case DLL_THREAD_ATTACH:
 		DBGTRACE( "Thread attach" );
-		dispatchTable = (PROC*)HeapAlloc( GetProcessHeap(),
-		                            HEAP_GENERATE_EXCEPTIONS | HEAP_ZERO_MEMORY,
-		                            sizeof (((ICDTable *)(0))->dispatch_table) );
-		if (dispatchTable == NULL)
-		{
-			DBGPRINT( "Error: Couldn't allocate GL dispatch table" );
+		if (!OPENGL32_ThreadAttach())
 			return FALSE;
-		}
-
-		lpData = (GLTHREADDATA*)HeapAlloc( GetProcessHeap(),
-		                            HEAP_GENERATE_EXCEPTIONS | HEAP_ZERO_MEMORY,
-		                            sizeof (GLTHREADDATA) );
-		if (lpData == NULL)
-		{
-			DBGPRINT( "Error: Couldn't allocate GLTHREADDATA" );
-			HeapFree( GetProcessHeap(), 0, dispatchTable );
-			return FALSE;
-		}
-
-		teb = NtCurrentTeb();
-
-		/* initialize dispatch table with empty functions */
-		#define X(func, ret, typeargs, args, icdidx, tebidx, stack)            \
-			dispatchTable[icdidx] = (PROC)glEmptyFunc##stack;                  \
-			if (tebidx >= 0)                                                   \
-				teb->glDispatchTable[tebidx] = (PVOID)glEmptyFunc##stack;
-		GLFUNCS_MACRO
-		#undef X
-
-		teb->glTable = dispatchTable;
-		TlsSetValue( OPENGL32_tls, lpData );
 		break;
 
 	/* The thread of the attached process terminates. */
@@ -206,16 +225,18 @@ DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved)
 		OPENGL32_ProcessDetach();
 		break;
 	}
+
 	return TRUE;
 }
 
 
-/* FUNCTION: Append ICD to linked list.
- * ARGUMENTS: [IN] icd: GLDRIVERDATA to append to list
- * NOTES: Only call this when you hold the driver_mutex
+/*! \brief Append ICD to linked list.
+ *
+ * \param icd  GLDRIVERDATA to append to list
+ *
+ * \note Only call this when you hold the driver_mutex.
  */
-static
-void
+static void
 OPENGL32_AppendICD( GLDRIVERDATA *icd )
 {
 	if (OPENGL32_processdata.driver_list == NULL)
@@ -230,12 +251,13 @@ OPENGL32_AppendICD( GLDRIVERDATA *icd )
 }
 
 
-/* FUNCTION: Remove ICD from linked list.
- * ARGUMENTS: [IN] icd: GLDRIVERDATA to remove from list
- * NOTES: Only call this when you hold the driver_mutex
+/*! \brief Remove ICD from linked list.
+ *
+ * \param icd  GLDRIVERDATA to remove from list
+ *
+ * \note Only call this when you hold the driver_mutex.
  */
-static
-void
+static void
 OPENGL32_RemoveICD( GLDRIVERDATA *icd )
 {
 	if (icd == OPENGL32_processdata.driver_list)
@@ -257,14 +279,16 @@ OPENGL32_RemoveICD( GLDRIVERDATA *icd )
 }
 
 
-/* FUNCTION:  Load an ICD.
- * ARGUMENTS: [IN] driver:  Name of display driver.
- * RETURNS:   error code; ERROR_SUCCESS on success
+/*! \brief  Load an ICD.
  *
- * TODO: call SetLastError() where appropriate
+ * \param driver  Name of installable client driver.
+ *
+ * \return Pointer to an allocated GLDRIVERDATA struct.
+ * \retval NULL  Failure.
+ *
+ * \todo Call SetLastError() where appropriate.
  */
-static
-GLDRIVERDATA*
+static GLDRIVERDATA *
 OPENGL32_LoadDriver( LPCWSTR driver )
 {
 	LONG ret;
@@ -316,10 +340,12 @@ OPENGL32_LoadDriver( LPCWSTR driver )
 }
 
 
-/* FUNCTION:  Initialize a driver (Load DLL, DrvXXX and glXXX procs)
- * ARGUMENTS: [IN] icd:  ICD to initialize with the dll, version, driverVersion
- *                       and flags already filled.
- * RETURNS:   error code; ERROR_SUCCESS on success
+/*! \brief Initialize a driver (Load DLL and DrvXxx procs)
+ *
+ * \param icd  ICD to initialize with the dll, version, driverVersion
+ *             and flags already filled.
+ * \return Error code.
+ * \retval ERROR_SUCCESS  Success
  */
 #define LOAD_DRV_PROC( icd, proc, required ) \
 	*(char**)&icd->proc = (char*)GetProcAddress( icd->handle, #proc ); \
@@ -329,8 +355,7 @@ OPENGL32_LoadDriver( LPCWSTR driver )
 		return GetLastError(); \
 	}
 
-static
-DWORD
+static DWORD
 OPENGL32_InitializeDriver( GLDRIVERDATA *icd )
 {
 	/* check version */
@@ -394,11 +419,12 @@ OPENGL32_InitializeDriver( GLDRIVERDATA *icd )
 }
 
 
-/* FUNCTION: Unload loaded ICD.
- * RETURNS:  TRUE on success, FALSE otherwise.
+/*! \brief Unload ICD.
+ *
+ * \retval  TRUE  Success.
+ * \retval  FALSE Failure.
  */
-static
-BOOL
+static BOOL
 OPENGL32_UnloadDriver( GLDRIVERDATA *icd )
 {
 	BOOL allOk = TRUE;
@@ -428,11 +454,13 @@ OPENGL32_UnloadDriver( GLDRIVERDATA *icd )
 }
 
 
-/* FUNCTION: Load ICD (shared ICD data)
- * RETURNS:  GLDRIVERDATA pointer on success, NULL otherwise.
+/*! \brief Load ICD (shared ICD data)
+ *
+ * \return Pointer to an allocated GLDRIVERDATA on success.
+ * \retval NULL  Failure.
  */
-GLDRIVERDATA*
-OPENGL32_LoadICD ( LPCWSTR driver )
+GLDRIVERDATA *
+OPENGL32_LoadICD( LPCWSTR driver )
 {
 	GLDRIVERDATA *icd;
 
@@ -472,8 +500,10 @@ OPENGL32_LoadICD ( LPCWSTR driver )
 }
 
 
-/* FUNCTION: Unload ICD (shared ICD data)
- * RETURNS:  TRUE on success, FALSE otherwise.
+/*! \brief Unload ICD (shared ICD data)
+ *
+ * \retval TRUE   Success.
+ * \retval FALSE  Failure.
  */
 BOOL
 OPENGL32_UnloadICD( GLDRIVERDATA *icd )
@@ -489,8 +519,8 @@ OPENGL32_UnloadICD( GLDRIVERDATA *icd )
 	}
 
 	icd->refcount--;
-	//if (icd->refcount == 0)
-	if (0)
+	if (icd->refcount == 0)
+//	if (0)
 		ret = OPENGL32_UnloadDriver( icd );
 	/* FIXME: InitializeICD crashes when called a second time */
 
@@ -502,21 +532,24 @@ OPENGL32_UnloadICD( GLDRIVERDATA *icd )
 }
 
 
-/* FUNCTION: Enumerate OpenGLDrivers (from registry)
- * ARGUMENTS: [IN]  idx   Index of the driver to get information about
- *            [OUT] name  Pointer to an array of WCHARs (can be NULL)
- *            [I,O] cName Pointer to a DWORD. Input is len of name array;
- *                        Output is length of the drivername.
- *                        Can be NULL if name is NULL.
- * RETURNS: Error code (ERROR_NO_MORE_ITEMS at end of list); On failure all
- *          OUT vars are left untouched.
+/*! \brief Enumerate OpenGLDrivers (from registry)
+ *
+ * \param idx    Index of the driver to get information about.
+ * \param name   Pointer to an array of WCHARs (can be NULL)
+ * \param cName  Pointer to a DWORD. Input is len of name array.
+ *               Output is length of the drivername.
+ *               Can be NULL if name is NULL.
+ *
+ * \return Error code 
+ * \retval ERROR_NO_MORE_ITEMS  End of driver list.
+ * \retval ERROR_SUCCESS        Success.
  */
+#if 0 /* unused */
 DWORD
 OPENGL32_RegEnumDrivers( DWORD idx, LPWSTR name, LPDWORD cName )
 {
 	HKEY hKey;
-	LPCWSTR subKey =
-		L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\OpenGLDrivers\\";
+	LPCWSTR subKey = OPENGL_DRIVERS_SUBKEY;
 	LONG ret;
 	DWORD size;
 	WCHAR driver[256];
@@ -550,22 +583,25 @@ OPENGL32_RegEnumDrivers( DWORD idx, LPWSTR name, LPDWORD cName )
 	RegCloseKey( hKey );
 	return ERROR_SUCCESS;
 }
+#endif /* 0 -- unused */
 
 
-/* FUNCTION: Get registry values for a driver given a name
- * ARGUMENTS: [IN]  idx   Index of the driver to get information about
- *            [OUT] icd   Pointer to GLDRIVERDATA. On success the following
- *                        fields are filled: driver_name, dll, version,
- *                        driver_version and flags.
- * RETURNS: Error code; On failure all OUT vars are left untouched.
+/*! \brief Get registry values for a driver given a name.
+ *
+ * \param driver  Name of the driver to get information about.
+ * \param icd     Pointer to GLDRIVERDATA.
+ *
+ * \return Error code. 
+ * \retval ERROR_SUCCESS  Success.
+ *
+ * \note On success the following fields of \a icd are filled: \a driver_name,
+ *       \a dll, \a version, \a driver_version and \a flags.
  */
-/*static*/
-DWORD
+static DWORD
 OPENGL32_RegGetDriverInfo( LPCWSTR driver, GLDRIVERDATA *icd )
 {
 	HKEY hKey;
-	WCHAR subKey[1024] =
-		L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\OpenGLDrivers\\";
+	WCHAR subKey[1024] = OPENGL_DRIVERS_SUBKEY;
 	LONG ret;
 	DWORD type, size;
 
diff --git a/reactos/lib/opengl32/opengl32.h b/reactos/lib/opengl32/opengl32.h
index 808aa88a8c7..c531b7d3c8a 100644
--- a/reactos/lib/opengl32/opengl32.h
+++ b/reactos/lib/opengl32/opengl32.h
@@ -1,4 +1,4 @@
-/* $Id: opengl32.h,v 1.15 2004/03/01 19:36:21 navaraf Exp $
+/* $Id: opengl32.h,v 1.16 2004/07/16 16:16:16 blight Exp $
  *
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS kernel
@@ -14,7 +14,15 @@
 
 #ifdef __cplusplus
 extern "C" {
-#endif//__cplusplus
+#endif /* __cplusplus */
+
+#define NDEBUG
+
+#ifndef PFD_GENERIC_ACCELERATED
+# define PFD_GENERIC_ACCELERATED 0x00001000
+#endif
+
+#define OPENGL_DRIVERS_SUBKEY L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\OpenGLDrivers\\"
 
 /* gl function list */
 #include "glfuncs.h"
@@ -25,7 +33,7 @@ extern "C" {
 /* debug flags */
 #if !defined(NDEBUG)
 # define DEBUG_OPENGL32
-# define DEBUG_OPENGL32_BRKPTS		/* enable breakpoints */
+/*# define DEBUG_OPENGL32_BRKPTS*/		/* enable breakpoints */
 # define DEBUG_OPENGL32_ICD_EXPORTS	/* dumps the list of (un)supported glXXX
                                        functions when an ICD is loaded. */
 # define DEBUG_OPENGL32_TRACE       /* prints much information about whats going on */
@@ -40,11 +48,13 @@ ULONG DbgPrint(PCH Format,...);
 #  include <debug.h>
 #  define DBGPRINT( fmt, args... ) \
           DPRINT( "OpenGL32.DLL: %s: "fmt"\n", __FUNCTION__, ##args )
-# else
-#  define DBGPRINT( ... ) do {} while (0)
 # endif
 #endif
 
+#ifndef DBGPRINT
+# define DBGPRINT( ... ) do {} while (0)
+#endif
+
 #ifdef DEBUG_OPENGL32_BRKPTS
 # if defined(__GNUC__)
 #  define DBGBREAK() __asm__( "int $3" );
@@ -53,10 +63,14 @@ ULONG DbgPrint(PCH Format,...);
 # else
 #  error Unsupported compiler!
 # endif
+#else
+# define DBGBREAK() do {} while (0)
 #endif
 
 #ifdef DEBUG_OPENGL32_TRACE
 # define DBGTRACE( args... ) DBGPRINT( args )
+#else
+# define DBGTRACE( ... ) do {} while (0)
 #endif
 
 /* function/data attributes */
@@ -66,7 +80,7 @@ ULONG DbgPrint(PCH Format,...);
 #  define SHARED
 #  ifndef STDCALL
 #    define STDCALL __stdcall
-#  endif/*STDCALL*/
+#  endif /* STDCALL */
 #else /* GCC */
 #  define NAKED __attribute__((naked))
 #  define SHARED __attribute__((section("shared"), shared))
@@ -74,7 +88,7 @@ ULONG DbgPrint(PCH Format,...);
 
 #ifdef APIENTRY
 #undef APIENTRY
-#endif//APIENTRY
+#endif /* APIENTRY */
 #define APIENTRY EXPORT __stdcall
 
 /* gl function list */
@@ -104,14 +118,14 @@ typedef DWORD APIENTRY (*SetContextCallBack)( const ICDTable * );
 /* OpenGL ICD data */
 typedef struct tagGLDRIVERDATA
 {
-	HMODULE handle;                 /* DLL handle */
-	UINT    refcount;               /* number of references to this ICD */
-	WCHAR   driver_name[256];       /* name of display driver */
+	HMODULE handle;                 /*!< DLL handle */
+	UINT    refcount;               /*!< Number of references to this ICD */
+	WCHAR   driver_name[256];       /*!< Name of ICD driver */
 
-	WCHAR   dll[256];               /* Dll value from registry */
-	DWORD   version;                /* Version value from registry */
-	DWORD   driver_version;         /* DriverVersion value from registry */
-	DWORD   flags;                  /* Flags value from registry */
+	WCHAR   dll[256];               /*!< Dll filename from registry */
+	DWORD   version;                /*!< Version value from registry */
+	DWORD   driver_version;         /*!< DriverVersion value from registry */
+	DWORD   flags;                  /*!< Flags value from registry */
 
 	BOOL      APIENTRY (*DrvCopyContext)( HGLRC, HGLRC, UINT );
 	HGLRC     APIENTRY (*DrvCreateContext)( HDC );
@@ -121,11 +135,11 @@ typedef struct tagGLDRIVERDATA
 	int       APIENTRY (*DrvDescribePixelFormat)( IN HDC, IN int, IN UINT, OUT LPPIXELFORMATDESCRIPTOR );
 	int       APIENTRY (*DrvGetLayerPaletteEntries)( HDC, int, int, int, COLORREF * );
 	PROC      APIENTRY (*DrvGetProcAddress)( LPCSTR lpProcName );
-	void      APIENTRY (*DrvReleaseContext)();
+	void      APIENTRY (*DrvReleaseContext)( HGLRC hglrc ); /* maybe returns BOOL? */
 	BOOL      APIENTRY (*DrvRealizeLayerPalette)( HDC, int, BOOL );
 	PICDTable APIENTRY (*DrvSetContext)( HDC hdc, HGLRC hglrc, SetContextCallBack callback );
 	int       APIENTRY (*DrvSetLayerPaletteEntries)( HDC, int, int, int, CONST COLORREF * );
-	BOOL      APIENTRY (*DrvSetPixelFormat)( IN HDC, IN int, IN CONST PIXELFORMATDESCRIPTOR * );
+	BOOL      APIENTRY (*DrvSetPixelFormat)( IN HDC, IN int ); /*, IN CONST PIXELFORMATDESCRIPTOR * );*/
 	BOOL      APIENTRY (*DrvShareLists)( HGLRC, HGLRC );
 	BOOL      APIENTRY (*DrvSwapBuffers)( HDC );
 	BOOL      APIENTRY (*DrvSwapLayerBuffers)( HDC, UINT );
@@ -137,12 +151,12 @@ typedef struct tagGLDRIVERDATA
 /* Our private OpenGL context (stored in TLS) */
 typedef struct tagGLRC
 {
-	GLDRIVERDATA *icd;  /* driver used for this context */
-	HDC     hdc;        /* DC handle */
-	BOOL    is_current; /* wether this context is current for some DC */
-	DWORD   thread_id;  /* thread holding this context */
+	GLDRIVERDATA *icd;  /*!< driver used for this context */
+	HDC     hdc;        /*!< DC handle */
+	BOOL    is_current; /*!< Wether this context is current for some DC */
+	DWORD   thread_id;  /*!< Thread holding this context */
 
-	HGLRC   hglrc;      /* GLRC from DrvCreateContext */
+	HGLRC   hglrc;      /*!< GLRC from DrvCreateContext (ICD internal) */
 
 	struct tagGLRC *next; /* linked list */
 } GLRC;
@@ -150,9 +164,9 @@ typedef struct tagGLRC
 /* OpenGL private device context data */
 typedef struct tagGLDCDATA
 {
-	HDC hdc;           /* device context handle for which this data is */
-	GLDRIVERDATA *icd; /* driver used for this DC */
-	int pixel_format;  /* selected pixel format */
+	HDC hdc;           /*!< Device context handle for which this data is */
+	GLDRIVERDATA *icd; /*!< Driver used for this DC */
+	int pixel_format;  /*!< Selected pixel format */
 
 	struct tagGLDCDATA *next; /* linked list */
 } GLDCDATA;
@@ -161,18 +175,18 @@ typedef struct tagGLDCDATA
 /* Process data */
 typedef struct tagGLPROCESSDATA
 {
-	GLDRIVERDATA *driver_list;  /* list of loaded drivers */
-	HANDLE        driver_mutex; /* mutex to protect driver list */
-	GLRC         *glrc_list;    /* list of GL rendering contexts */
-	HANDLE        glrc_mutex;   /* mutex to protect glrc list */
-	GLDCDATA     *dcdata_list;  /* list of GL private DC data */
-	HANDLE        dcdata_mutex; /* mutex to protect glrc list */
+	GLDRIVERDATA *driver_list;  /*!< List of loaded drivers */
+	HANDLE        driver_mutex; /*!< Mutex to protect driver list */
+	GLRC         *glrc_list;    /*!< List of GL rendering contexts */
+	HANDLE        glrc_mutex;   /*!< Mutex to protect glrc list */
+	GLDCDATA     *dcdata_list;  /*!< List of GL private DC data */
+	HANDLE        dcdata_mutex; /*!< Mutex to protect glrc list */
 } GLPROCESSDATA;
 
 /* TLS data */
 typedef struct tagGLTHREADDATA
 {
-	GLRC   *glrc;      /* current GL rendering context */
+	GLRC   *glrc;      /*!< current GL rendering context */
 } GLTHREADDATA;
 
 extern DWORD OPENGL32_tls;
@@ -180,11 +194,9 @@ extern GLPROCESSDATA OPENGL32_processdata;
 #define OPENGL32_threaddata ((GLTHREADDATA *)TlsGetValue( OPENGL32_tls ))
 
 /* function prototypes */
-/*GLDRIVERDATA *OPENGL32_LoadICDForHDC( HDC hdc );*/
 GLDRIVERDATA *OPENGL32_LoadICD( LPCWSTR driver );
 BOOL OPENGL32_UnloadICD( GLDRIVERDATA *icd );
-DWORD OPENGL32_RegEnumDrivers( DWORD idx, LPWSTR name, LPDWORD cName );
-DWORD OPENGL32_RegGetDriverInfo( LPCWSTR driver, GLDRIVERDATA *icd );
+
 
 /* empty gl functions from gl.c */
 int STDCALL glEmptyFunc0();
@@ -209,14 +221,18 @@ int STDCALL glEmptyFunc52( long, long, long, long, long, long, long, long,
 int STDCALL glEmptyFunc56( long, long, long, long, long, long, long, long,
                            long, long, long, long, long, long );
 
+#ifdef OPENGL32_GL_FUNC_PROTOTYPES
+
 #define X(func,ret,typeargs,args,icdidx,tebidx,stack) EXPORT ret STDCALL func typeargs;
 GLFUNCS_MACRO
 #undef X
 
-#ifdef __cplusplus
-}; // extern "C"
-#endif//__cplusplus
+#endif /* OPENGL32_GL_FUNC_PROTOTYPES */
 
-#endif//OPENGL32_PRIVATE_H
+#ifdef __cplusplus
+}; /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* OPENGL32_PRIVATE_H */
 
 /* EOF */
diff --git a/reactos/lib/opengl32/wgl.c b/reactos/lib/opengl32/wgl.c
index 5c7d5d1ccc6..d506c3a64fd 100644
--- a/reactos/lib/opengl32/wgl.c
+++ b/reactos/lib/opengl32/wgl.c
@@ -10,29 +10,33 @@
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+#include <stdlib.h>
+#include <string.h>
 #include "teb.h"
+#define OPENGL32_GL_FUNC_PROTOTYPES
 #include "opengl32.h"
 
 #ifdef __cplusplus
 extern "C" {
-#endif//__cplusplus
+#endif /* __cplusplus */
 
-#ifdef _MSC_VER
-#define UNIMPLEMENTED DBGPRINT( "UNIMPLEMENTED" )
-#endif//_MSC_VER
+#if !defined(UNIMPLEMENTED)
+# define UNIMPLEMENTED DBGPRINT( "UNIMPLEMENTED" )
+#endif
 
 
-#define EXT_GET_DRIVERINFO		0x1101 /* ExtEscape code to get driver info */
+#define EXT_GET_DRIVERINFO		0x1101 /*!< ExtEscape code to get driver info */
 typedef struct tagEXTDRIVERINFO
 {
-	DWORD version;          /* driver interface version */
-	DWORD driver_version;	/* driver version */
-	WCHAR driver_name[256]; /* driver name */
+	DWORD version;          /*!< Driver interface version */
+	DWORD driver_version;	/*!< Driver version */
+	WCHAR driver_name[256]; /*!< Driver name */
 } EXTDRIVERINFO;
 
 
-/* FUNCTION: Append OpenGL Rendering Context (GLRC) to list
- * ARGUMENTS: [IN] glrc: GLRC to append to list
+/*! \brief Append OpenGL Rendering Context (GLRC) to list
+ *
+ * \param glrc [IN] Pointer to GLRC to append to list
  */
 static
 void
@@ -62,8 +66,9 @@ ROSGL_AppendContext( GLRC *glrc )
 }
 
 
-/* FUNCTION: Remove OpenGL Rendering Context (GLRC) from list
- * ARGUMENTS: [IN] glrc: GLRC to remove from list
+/*! \brief Remove OpenGL Rendering Context (GLRC) from list
+ *
+ * \param glrc [IN] Pointer to GLRC to remove from list
  */
 static
 void
@@ -100,8 +105,10 @@ ROSGL_RemoveContext( GLRC *glrc )
 }
 
 
-/* FUNCTION: Create a new GL Context (GLRC) and append it to the list
- * RETURNS: Pointer to new GLRC on success; NULL on failure
+/*! \brief Create a new GL Context (GLRC) and append it to the list
+ *
+ * \return Pointer to new GLRC on success
+ * \retval NULL Returned on failure (i.e. Out of memory)
  */
 static
 GLRC *
@@ -120,9 +127,12 @@ ROSGL_NewContext()
 }
 
 
-/* FUNCTION: Delete a GL Context (GLRC) and remove it from the list
- * ARGUMENTS: [IN] glrc  GLRC to delete
- * RETURNS: TRUE if there were no error; FALSE otherwise
+/*! \brief Delete a GL Context (GLRC) and remove it from the list
+ *
+ * \param glrc [IN] Pointer to GLRC to delete
+ *
+ * \retval TRUE  Success
+ * \retval FALSE Failure
  */
 static
 BOOL
@@ -142,8 +152,12 @@ ROSGL_DeleteContext( GLRC *glrc )
 }
 
 
-/* FUNCTION: Check wether a GLRC is in the list
- * ARGUMENTS: [IN] glrc: GLRC to remove from list
+/*! \brief Check wether a GLRC is in the list
+ *
+ * \param glrc [IN] Pointer to GLRC to look for in the list
+ *
+ * \retval TRUE  GLRC was found
+ * \retval FALSE GLRC was not found
  */
 static
 BOOL
@@ -175,10 +189,15 @@ ROSGL_ContainsContext( GLRC *glrc )
 }
 
 
-/* FUNCTION: Get GL private DC data. Adds an empty GLDCDATA to the list if
- *           there is no data for the given DC and returns it.
- * ARGUMENTS: [IN] hdc  Device Context for which to get the data
- * RETURNS: Pointer to GLDCDATA on success; NULL on failure
+/*! \brief Get GL private DC data.
+ *
+ * This function adds an empty GLDCDATA to the list if there is no data for the
+ * given DC yet.
+ *
+ * \param hdc [IN] Handle to a Device Context for which to get the data
+ *
+ * \return Pointer to GLDCDATA on success
+ * \retval NULL on failure
  */
 static
 GLDCDATA *
@@ -238,9 +257,15 @@ ROSGL_GetPrivateDCData( HDC hdc )
 }
 
 
-/* FUNCTION: Get ICD from HDC
- * RETURNS:  GLDRIVERDATA pointer on success, NULL otherwise.
- * NOTES: Make sure the handle you pass in is one for a DC!
+/*! \brief Get ICD from HDC.
+ *
+ * This function asks the display driver which OpenGL ICD to load for the given
+ * HDC, loads it and returns a pointer to a GLDRIVERDATA struct on success.
+ *
+ * \param hdc [IN] Handle for DC for which to load/get the ICD
+ *
+ * \return Pointer to GLDRIVERDATA
+ * \retval NULL Failure.
  */
 static
 GLDRIVERDATA *
@@ -253,43 +278,78 @@ ROSGL_ICDForHDC( HDC hdc )
 		return NULL;
 
 	if (dcdata->icd == NULL)
-#if 1
 	{
-		DWORD dwInput = 0;
-		LONG ret;
+		LPCWSTR driverName;
 		EXTDRIVERINFO info;
 
-		/* get driver name */
-		ret = ExtEscape( hdc, EXT_GET_DRIVERINFO, sizeof (dwInput), (LPCSTR)&dwInput,
-						 sizeof (EXTDRIVERINFO), (LPSTR)&info );
-		if (ret < 0)
+		driverName = _wgetenv( L"OPENGL32_DRIVER" );
+		if (driverName == NULL)
 		{
-			DBGPRINT( "Warning: ExtEscape to get the drivername failed!!! (%d)", GetLastError() );
-			return 0;
-		}
+			DWORD dwInput = 0;
+			LONG ret;
 
+			/* get driver name */
+			ret = ExtEscape( hdc, EXT_GET_DRIVERINFO, sizeof (dwInput), (LPCSTR)&dwInput,
+			                 sizeof (EXTDRIVERINFO), (LPSTR)&info );
+			if (ret < 0)
+			{
+				HKEY hKey;
+				DWORD type, size;
+
+				DBGPRINT( "Warning: ExtEscape to get the drivername failed!!! (%d)", GetLastError() );
+				if (MessageBox( WindowFromDC( hdc ), L"Couldn't get installable client driver name!\nUsing default driver.",
+				                L"OPENGL32.dll: Warning", MB_OKCANCEL | MB_ICONWARNING ) == IDCANCEL)
+				{
+					SetLastError( ret );
+					return NULL;
+				}
+
+				/* open registry key */
+				ret = RegOpenKeyExW( HKEY_LOCAL_MACHINE, OPENGL_DRIVERS_SUBKEY, 0, KEY_READ, &hKey );
+				if (ret != ERROR_SUCCESS)
+				{
+					DBGPRINT( "Error: Couldn't open registry key '%ws'", OPENGL_DRIVERS_SUBKEY );
+					SetLastError( ret );
+					return NULL;
+				}
+
+				/* query value */
+				size = sizeof (info.driver_name);
+				ret = RegQueryValueExW( hKey, L"DefaultDriver", 0, &type, (LPBYTE)info.driver_name, &size );
+				RegCloseKey( hKey );
+				if (ret != ERROR_SUCCESS || type != REG_SZ)
+				{
+					DBGPRINT( "Error: Couldn't query DefaultDriver value or not a string" );
+					SetLastError( ret );
+					return NULL;
+				}
+			}
+		}
+		else
+		{
+			wcsncpy( info.driver_name, driverName, sizeof (info.driver_name) / sizeof (info.driver_name[0]) );
+		}
 		/* load driver (or get a reference) */
 		dcdata->icd = OPENGL32_LoadICD( info.driver_name );
 	}
-#else
-		dcdata->icd = OPENGL32_LoadICD( L"OGLICD" );
-#endif
 
 	return dcdata->icd;
 }
 
 
-/* FUNCTION: SetContextCallBack passed to DrvSetContext. Gets called whenever
- *           the current GL context (dispatch table) is to be changed.
- * ARGUMENTS: [IN] table  Function pointer table (first DWORD is number of
- *                        functions)
- * RETURNS: unkown (maybe void?)
+/*! \brief SetContextCallBack passed to DrvSetContext.
+ *
+ * This function gets called by the OpenGL driver whenever the current GL
+ * context (dispatch table) is to be changed.
+ *
+ * \param table [IN] Function pointer table (first DWORD is number of functions)
+ *
+ * \return unkown (maybe void? ERROR_SUCCESS at the moment)
  */
 DWORD
 CALLBACK
 ROSGL_SetContextCallBack( const ICDTable *table )
 {
-/*	UINT i;*/
 	TEB *teb;
 	PROC *tebTable, *tebDispatchTable;
 	INT size;
@@ -298,6 +358,8 @@ ROSGL_SetContextCallBack( const ICDTable *table )
 	tebTable = (PROC *)teb->glTable;
 	tebDispatchTable = (PROC *)teb->glDispatchTable;
 
+	DBGTRACE( "Called!" );
+
 	if (table != NULL)
 	{
 		DBGPRINT( "Function count: %d\n", table->num_funcs );
@@ -314,18 +376,6 @@ ROSGL_SetContextCallBack( const ICDTable *table )
 		memset( tebTable, 0, sizeof (table->dispatch_table) );
 	}
 
-	/* FIXME: pull in software fallbacks -- need mesa */
-#if 0 /* unused atm */
-	for (i = 0; i < (sizeof (table->dispatch_table) / sizeof (PROC)); i++)
-	{
-		if (tebTable[i] == NULL)
-		{
-			/* FIXME: fallback */
-			DBGPRINT( "Warning: GL proc #%d is NULL!", i );
-		}
-	}
-#endif
-
 	/* put in empty functions as long as we dont have a fallback */
 	#define X(func, ret, typeargs, args, icdidx, tebidx, stack)            \
 		if (tebTable[icdidx] == NULL)                                      \
@@ -344,13 +394,27 @@ ROSGL_SetContextCallBack( const ICDTable *table )
 	GLFUNCS_MACRO
 	#undef X
 
+	DBGPRINT( "Done." );
+/*	DBGBREAK();*/
+
 	return ERROR_SUCCESS;
 }
 
 
-/* FUNCTION: Attempts to find the best matching pixel format for HDC
- * ARGUMENTS: [IN] pdf  PFD describing what kind of format you want
- * RETURNS: one-based positive format index on success, 0 on failure
+/*! \brief Attempts to find the best matching pixel format for HDC
+ *
+ * This function is comparing each available format with the preferred one
+ * and returns the one which is closest to it.
+ * If PFD_DOUBLEBUFFER, PFD_STEREO or one of PFD_DRAW_TO_WINDOW,
+ * PFD_DRAW_TO_BITMAP, PFD_SUPPORT_GDI and PDF_SUPPORT_OPENGL is given then
+ * only formats which also support those will be enumerated (unless
+ * PFD_DOUBLEBUFFER_DONTCARE or PFD_STEREO_DONTCARE is also set)
+ *
+ * \param hdc [IN] Handle to DC for which to get a pixel format index
+ * \param pfd [IN] PFD describing what kind of format you want
+ *
+ * \return Pixel format index
+ * \retval 0 Failed to find a suitable format
  */
 #define BUFFERDEPTH_SCORE(want, have) \
 	((want == 0) ? (0) : ((want < have) ? (1) : ((want > have) ? (3) : (0))))
@@ -382,7 +446,6 @@ rosglChoosePixelFormat( HDC hdc, CONST PIXELFORMATDESCRIPTOR *pfd )
 	}
 
 	/* get number of formats */
-//	__asm__( "int $3" );
 	icdNumFormats = icd->DrvDescribePixelFormat( hdc, 1,
 	                                 sizeof (PIXELFORMATDESCRIPTOR), &icdPfd );
 	if (icdNumFormats == 0)
@@ -403,6 +466,11 @@ rosglChoosePixelFormat( HDC hdc, CONST PIXELFORMATDESCRIPTOR *pfd )
 			break;
 		}
 
+		if ((pfd->dwFlags & PFD_GENERIC_ACCELERATED) != 0) /* we do not support such kind of drivers */
+		{
+			continue;
+		}
+
 		/* compare flags */
 		if ((pfd->dwFlags & compareFlags) != (icdPfd.dwFlags & compareFlags))
 			continue;
@@ -444,11 +512,14 @@ rosglChoosePixelFormat( HDC hdc, CONST PIXELFORMATDESCRIPTOR *pfd )
 }
 
 
-/* FUNCTION: Copy data specified by mask from one GLRC to another.
- * ARGUMENTS: [IN]  src  Source GLRC
- *            [OUT] dst  Destination GLRC
- *            [IN]  mask Bitfield like given to glPushAttrib()
- * RETURN: TRUE on success, FALSE on failure
+/*! \brief Copy data specified by mask from one GLRC to another.
+ *
+ * \param src  [IN] Source GLRC
+ * \param src  [OUT] Destination GLRC
+ * \param mask [IN] Bitfield like given to glPushAttrib()
+ *
+ * \retval TRUE  Success
+ * \retval FALSE Failure
  */
 BOOL
 APIENTRY
@@ -481,11 +552,15 @@ rosglCopyContext( HGLRC hsrc, HGLRC hdst, UINT mask )
 }
 
 
-/* FUNCTION: Create a new GL Rendering Context for the given plane on
- *           the given DC.
- * ARGUMENTS: [IN] hdc   Handle for DC for which to create context
- *            [IN] layer Layer number to bind (draw?) to
- * RETURNS: NULL on failure, new GLRC on success
+/*! \brief Create a new GL Rendering Context.
+ *
+ * This function can create over- or underlay surfaces.
+ *
+ * \param hdc [IN] Handle for DC for which to create context
+ * \param layer [IN] Layer number to bind (draw?) to
+ *
+ * \return Handle for the created GLRC
+ * \retval NULL Failure
  */
 HGLRC
 APIENTRY
@@ -495,6 +570,8 @@ rosglCreateLayerContext( HDC hdc, int layer )
 	GLRC *glrc;
 	HGLRC drvHglrc = NULL;
 
+	DBGTRACE( "Called!" );
+
 /*	if (GetObjectType( hdc ) != OBJ_DC)
 	{
 		DBGPRINT( "Error: hdc is not a DC handle!" );
@@ -542,9 +619,12 @@ rosglCreateLayerContext( HDC hdc, int layer )
 }
 
 
-/* FUNCTION: Create a new GL Rendering Context for the given DC.
- * ARGUMENTS: [IN] hdc  Handle for DC for which to create context
- * RETURNS: NULL on failure, new GLRC on success
+/*! \brief Create a new GL Rendering Context.
+ *
+ * \param hdc [IN] Handle for DC for which to create context
+ *
+ * \return Handle for the created GLRC
+ * \retval NULL Failure
  */
 HGLRC
 APIENTRY
@@ -554,9 +634,12 @@ rosglCreateContext( HDC hdc )
 }
 
 
-/* FUNCTION: Delete an OpenGL context
- * ARGUMENTS: [IN] hglrc  Handle to GLRC to delete; must not be a threads RC!
- * RETURNS: TRUE on success, FALSE otherwise
+/*! \brief Delete an OpenGL context
+ *
+ * \param hglrc [IN] Handle to GLRC to delete; must not be a threads current RC!
+ *
+ * \retval TRUE  Success
+ * \retval FALSE Failure (i.e. GLRC is current for a thread)
  */
 BOOL
 APIENTRY
@@ -603,13 +686,15 @@ rosglDescribeLayerPlane( HDC hdc, int iPixelFormat, int iLayerPlane,
 }
 
 
-/* FUNCTION: Gets information about the pixelformat specified by iFormat and
- *           puts it into pfd.
- * ARGUMENTS: [IN] hdc      Handle to DC
- *            [IN] iFormat  Pixelformat index
- *            [IN] nBytes   sizeof (pfd) - at most nBytes are copied into pfd
- *            [OUT] pfd     Pointer to a PIXELFORMATDESCRIPTOR
- * RETURNS: Maximum pixelformat index/number of formats on success; 0 on failure
+/*! \brief Gets information about a pixelformat.
+ *
+ * \param hdc     [IN]  Handle to DC
+ * \param iFormat [IN]  Pixelformat index
+ * \param nBytes  [IN]  sizeof (pfd) - at most nBytes are copied into pfd
+ * \param pfd     [OUT] Pointer to a PIXELFORMATDESCRIPTOR
+ *
+ * \return Maximum pixelformat index/number of formats
+ * \retval 0 Failure
  */
 int
 APIENTRY
@@ -626,13 +711,14 @@ rosglDescribePixelFormat( HDC hdc, int iFormat, UINT nBytes,
 			DBGPRINT( "Error: DrvDescribePixelFormat(format=%d) failed (%d)", iFormat, GetLastError() );
 	}
 
-	/* FIXME: implement own functionality? */
 	return ret;
 }
 
 
-/* FUNCTION: Return the current GLRC
- * RETURNS: Current GLRC (NULL if none was set current)
+/*! \brief Return the thread's current GLRC
+ *
+ * \return Handle for thread's current GLRC
+ * \retval NULL No current GLRC set
  */
 HGLRC
 APIENTRY
@@ -642,8 +728,10 @@ rosglGetCurrentContext()
 }
 
 
-/* FUNCTION: Return the current DC
- * RETURNS: NULL on failure, current DC otherwise
+/*! \brief Return the thread's current DC
+ *
+ * \return Handle for thread's current DC
+ * \retval NULL No current DC/GLRC set
  */
 HDC
 APIENTRY
@@ -667,9 +755,12 @@ rosglGetLayerPaletteEntries( HDC hdc, int iLayerPlane, int iStart,
 }
 
 
-/* FUNCTION: Returns the current pixelformat for the given hdc.
- * ARGUMENTS: [IN] hdc  Handle to DC of which to get the pixelformat
- * RETURNS: Pixelformat index on success; 0 on failure
+/*! \brief Returns the current pixelformat.
+ *
+ * \param hdc [IN] Handle to DC to get the pixelformat from
+ *
+ * \return Pixelformat index
+ * \retval 0 Failure
  */
 int
 WINAPI
@@ -690,9 +781,15 @@ rosglGetPixelFormat( HDC hdc )
 }
 
 
-/* FUNCTION: Get the address for an OpenGL extension function from the current ICD.
- * ARGUMENTS: [IN] proc:  Name of the function to look for
- * RETURNS: The address of the proc or NULL on failure.
+/*! \brief Get the address for an OpenGL extension function.
+ *
+ * The addresses this function returns are only valid within the same thread
+ * which it was called from.
+ *
+ * \param proc [IN] Name of the function to look for
+ *
+ * \return The address of the proc
+ * \retval NULL Failure
  */
 PROC
 APIENTRY
@@ -704,7 +801,7 @@ rosglGetProcAddress( LPCSTR proc )
 		return NULL;
 	}
 
-	if (proc[0] == 'g' && proc[1] == 'l') /* glXXX */
+	if (proc[0] == 'g' && proc[1] == 'l' && proc[2] != 'u') /* glXXX */
 	{
 		PROC glXXX = NULL;
 		GLDRIVERDATA *icd = OPENGL32_threaddata->glrc->icd;
@@ -733,10 +830,13 @@ rosglGetProcAddress( LPCSTR proc )
 }
 
 
-/* FUNCTION: make the given GLRC the threads current GLRC for hdc
- * ARGUMENTS: [IN] hdc   Handle for a DC to be drawn on
- *            [IN] hglrc Handle for a GLRC to make current
- * RETURNS: TRUE on success, FALSE otherwise
+/*! \brief Make the given GLRC the threads current GLRC for hdc
+ *
+ * \param hdc   [IN] Handle for a DC to be drawn on
+ * \param hglrc [IN] Handle for a GLRC to make current
+ *
+ * \retval TRUE  Success
+ * \retval FALSE Failure
  */
 BOOL
 APIENTRY
@@ -745,6 +845,8 @@ rosglMakeCurrent( HDC hdc, HGLRC hglrc )
 	GLRC *glrc = (GLRC *)hglrc;
 	ICDTable *icdTable = NULL;
 
+	DBGTRACE( "Called!" );
+
 	/* flush current context */
 	if (OPENGL32_threaddata->glrc != NULL)
 	{
@@ -756,7 +858,9 @@ rosglMakeCurrent( HDC hdc, HGLRC hglrc )
 	{
 		if (OPENGL32_threaddata->glrc != NULL)
 		{
-			OPENGL32_threaddata->glrc->is_current = FALSE;
+			glrc = OPENGL32_threaddata->glrc;
+			glrc->icd->DrvReleaseContext( glrc->hglrc );
+			glrc->is_current = FALSE;
 			OPENGL32_threaddata->glrc = NULL;
 		}
 	}
@@ -786,8 +890,10 @@ rosglMakeCurrent( HDC hdc, HGLRC hglrc )
 		/* call the ICD */
 		if (glrc->hglrc != NULL)
 		{
+			DBGPRINT( "Info: Calling DrvSetContext!" );
+			DBGBREAK();
 			icdTable = glrc->icd->DrvSetContext( hdc, glrc->hglrc,
-												 ROSGL_SetContextCallBack );
+			                                     ROSGL_SetContextCallBack );
 			if (icdTable == NULL)
 			{
 				DBGPRINT( "Error: DrvSetContext failed (%d)\n", GetLastError() );
@@ -805,7 +911,7 @@ rosglMakeCurrent( HDC hdc, HGLRC hglrc )
 		OPENGL32_threaddata->glrc = glrc;
 	}
 
-	if (ROSGL_SetContextCallBack( icdTable ) != ERROR_SUCCESS)
+	if (ROSGL_SetContextCallBack( icdTable ) != ERROR_SUCCESS && icdTable == NULL)
 	{
 		DBGPRINT( "Warning: ROSGL_SetContextCallBack failed!" );
 	}
@@ -833,11 +939,14 @@ rosglSetLayerPaletteEntries( HDC hdc, int iLayerPlane, int iStart,
 }
 
 
-/* FUNCTION: Set pixelformat of given DC
- * ARGUMENTS: [IN] hdc      Handle to DC for which to set the format
- *            [IN] iFormat  Index of the pixelformat to set
- *            [IN] pfd      Not sure what this is for
- * RETURNS: TRUE on success, FALSE on failure
+/*! \brief Set a DCs pixelformat
+ *
+ * \param hdc     [IN] Handle to DC for which to set the format
+ * \param iFormat [IN] Index of the pixelformat to set
+ * \param pfd     [IN] Not sure what this is for
+ *
+ * \retval TRUE  Success
+ * \retval FALSE Failure
  */
 BOOL
 WINAPI
@@ -857,7 +966,7 @@ rosglSetPixelFormat( HDC hdc, int iFormat, CONST PIXELFORMATDESCRIPTOR *pfd )
 	}
 
 	/* call ICD */
-	if (!icd->DrvSetPixelFormat( hdc, iFormat, pfd ))
+	if (!icd->DrvSetPixelFormat( hdc, iFormat/*, pfd*/ ))
 	{
 		DBGPRINT( "Warning: DrvSetPixelFormat(format=%d) failed (%d)",
 		          iFormat, GetLastError() );
@@ -877,10 +986,15 @@ rosglSetPixelFormat( HDC hdc, int iFormat, CONST PIXELFORMATDESCRIPTOR *pfd )
 }
 
 
-/* FUNCTION: Enable display-list sharing between multiple GLRCs
- * ARGUMENTS: [IN] hglrc1 GLRC number 1
- *            [IN] hglrc2 GLRC number 2
- * RETURNS: TRUE on success, FALSE on failure
+/*! \brief Enable display-list sharing between multiple GLRCs
+ *
+ * This will only work if both GLRCs are from the same driver.
+ *
+ * \param hglrc1 [IN] GLRC number 1
+ * \param hglrc2 [IN] GLRC number 2
+ *
+ * \retval TRUE  Success
+ * \retval FALSE Failure
  */
 BOOL
 APIENTRY
@@ -913,17 +1027,22 @@ rosglShareLists( HGLRC hglrc1, HGLRC hglrc2 )
 }
 
 
-/* FUNCTION: Flushes GL and swaps front/back buffer if appropriate
- * ARGUMENTS: [IN] hdc  Handle to device context to swap buffers for
- * RETURNS: TRUE on success, FALSE on failure
+/*! \brief Flushes GL and swaps front/back buffer if appropriate
+ *
+ * \param hdc [IN] Handle to device context to swap buffers for
+ *
+ * \retval TRUE  Success
+ * \retval FALSE Failure
  */
 BOOL
 APIENTRY
 rosglSwapBuffers( HDC hdc )
 {
 	GLDRIVERDATA *icd = ROSGL_ICDForHDC( hdc );
+	DBGTRACE( "Called!" );
 	if (icd != NULL)
 	{
+		DBGPRINT( "Swapping buffers!" );
 		if (!icd->DrvSwapBuffers( hdc ))
 		{
 			DBGPRINT( "Error: DrvSwapBuffers failed (%d)", GetLastError() );
@@ -986,7 +1105,7 @@ rosglUseFontOutlinesW( HDC hdc, DWORD first, DWORD count, DWORD listBase,
 }
 
 #ifdef __cplusplus
-}; // extern "C"
-#endif//__cplusplus
+}; /* extern "C" */
+#endif /* __cplusplus */
 
 /* EOF */

From 9d8706171359a415fb77b03c6e11e0d5821eb06a Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Fri, 16 Jul 2004 17:20:23 +0000
Subject: [PATCH 308/356] Implement security descriptor cache.

svn path=/trunk/; revision=10142
---
 reactos/ntoskrnl/Makefile              |  23 +-
 reactos/ntoskrnl/include/internal/ob.h |  17 +-
 reactos/ntoskrnl/ob/namespc.c          |   5 +-
 reactos/ntoskrnl/ob/object.c           | 135 ++++++-----
 reactos/ntoskrnl/ob/sdcache.c          | 312 +++++++++++++++++++++++++
 reactos/ntoskrnl/ob/security.c         |  29 ++-
 6 files changed, 450 insertions(+), 71 deletions(-)
 create mode 100644 reactos/ntoskrnl/ob/sdcache.c

diff --git a/reactos/ntoskrnl/Makefile b/reactos/ntoskrnl/Makefile
index ddfb1eddd28..8a4523c0d6b 100644
--- a/reactos/ntoskrnl/Makefile
+++ b/reactos/ntoskrnl/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.129 2004/07/02 21:02:54 royce Exp $
+# $Id: Makefile,v 1.130 2004/07/16 17:20:23 ekohl Exp $
 #
 # ReactOS Operating System
 #
@@ -130,7 +130,7 @@ OBJECTS_KE = \
 	ke/catch.o \
 	ke/critical.o \
 	ke/dpc.o \
-        ke/device.o \
+	ke/device.o \
 	ke/error.o \
 	ke/event.o \
 	ke/kqueue.o \
@@ -138,7 +138,7 @@ OBJECTS_KE = \
 	ke/main.o \
 	ke/mutex.o \
 	ke/process.o \
-        ke/profile.o \
+	ke/profile.o \
 	ke/queue.o \
 	ke/sem.o \
 	ke/spinlock.o \
@@ -223,9 +223,9 @@ OBJECTS_IO = \
 	io/timer.o \
 	io/vpb.o \
 	io/wdm.o \
+	io/wmi.o \
 	io/xhaldisp.o \
-        io/xhaldrv.o \
-        io/wmi.o
+	io/xhaldrv.o
 
 # Object Manager (Ob)
 OBJECTS_OB = \
@@ -234,6 +234,7 @@ OBJECTS_OB = \
 	ob/namespc.o \
 	ob/ntobj.o \
 	ob/object.o \
+	ob/sdcache.o \
 	ob/security.o \
 	ob/symlink.o
 
@@ -265,12 +266,12 @@ OBJECTS_EX = \
 	ex/napi.o \
 	ex/power.o \
 	ex/resource.o \
-        ex/rundown.o \
+	ex/rundown.o \
 	ex/stree.o \
-        ex/synch.o \
+	ex/synch.o \
 	ex/sysinfo.o \
-        ex/time.o \
-        ex/util.o \
+	ex/time.o \
+	ex/util.o \
 	ex/win32k.o \
 	ex/work.o \
 	ex/zone.o
@@ -359,9 +360,9 @@ OBJECTS_CC = \
 # Kernel Debugger Support (Kd)
 OBJECTS_KD = \
 	kd/dlog.o \
-    kd/gdbstub.o \
+	kd/gdbstub.o \
 	kd/kdebug.o \
-    kd/mda.o \
+	kd/mda.o \
 	kd/service.o
 
 # Boot video (Inbv)
diff --git a/reactos/ntoskrnl/include/internal/ob.h b/reactos/ntoskrnl/include/internal/ob.h
index fc061e3bd92..e6184dcbafb 100644
--- a/reactos/ntoskrnl/include/internal/ob.h
+++ b/reactos/ntoskrnl/include/internal/ob.h
@@ -133,8 +133,21 @@ ObDuplicateObject(PEPROCESS SourceProcess,
 		  BOOLEAN InheritHandle,
 		  ULONG	Options);
 
-ULONG 
-ObpGetHandleCountbyHandleTable(PHANDLE_TABLE HandleTable);
+ULONG
+ObpGetHandleCountByHandleTable(PHANDLE_TABLE HandleTable);
+
+
+/* Security descriptor cache functions */
+
+NTSTATUS
+ObpInitSdCache(VOID);
+
+NTSTATUS
+ObpAddSecurityDescriptor(IN PSECURITY_DESCRIPTOR SourceSD,
+			 OUT PSECURITY_DESCRIPTOR *DestinationSD);
+
+NTSTATUS
+ObpRemoveSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor);
 
 
 #endif /* __INCLUDE_INTERNAL_OBJMGR_H */
diff --git a/reactos/ntoskrnl/ob/namespc.c b/reactos/ntoskrnl/ob/namespc.c
index f374c95a6e8..0c18f2e2ec3 100644
--- a/reactos/ntoskrnl/ob/namespc.c
+++ b/reactos/ntoskrnl/ob/namespc.c
@@ -1,4 +1,4 @@
-/* $Id: namespc.c,v 1.44 2003/11/17 02:12:51 hyperion Exp $
+/* $Id: namespc.c,v 1.45 2004/07/16 17:19:15 ekohl Exp $
  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
@@ -349,6 +349,9 @@ ObInit(VOID)
   OBJECT_ATTRIBUTES ObjectAttributes;
   UNICODE_STRING Name;
 
+  /* Initialize the security descriptor cache */
+  ObpInitSdCache();
+
   /* create 'directory' object type */
   ObDirectoryType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE));
   
diff --git a/reactos/ntoskrnl/ob/object.c b/reactos/ntoskrnl/ob/object.c
index 81eabe93747..a83d29e93b8 100644
--- a/reactos/ntoskrnl/ob/object.c
+++ b/reactos/ntoskrnl/ob/object.c
@@ -1,4 +1,4 @@
-/* $Id: object.c,v 1.77 2004/03/12 00:46:35 dwelch Exp $
+/* $Id: object.c,v 1.78 2004/07/16 17:19:15 ekohl Exp $
  * 
  * COPYRIGHT:     See COPYING in the top level directory
  * PROJECT:       ReactOS kernel
@@ -36,14 +36,14 @@ typedef struct _RETENTION_CHECK_PARAMS
 
 PVOID HEADER_TO_BODY(POBJECT_HEADER obj)
 {
-   return(((char*)obj)+sizeof(OBJECT_HEADER)-sizeof(COMMON_BODY_HEADER));
+  return(((char*)obj)+sizeof(OBJECT_HEADER)-sizeof(COMMON_BODY_HEADER));
 }
 
 
 POBJECT_HEADER BODY_TO_HEADER(PVOID body)
 {
-   PCOMMON_BODY_HEADER chdr = (PCOMMON_BODY_HEADER)body;
-   return(CONTAINING_RECORD((&(chdr->Type)),OBJECT_HEADER,Type));
+  PCOMMON_BODY_HEADER chdr = (PCOMMON_BODY_HEADER)body;
+  return(CONTAINING_RECORD((&(chdr->Type)),OBJECT_HEADER,Type));
 }
 
 
@@ -76,44 +76,44 @@ ObFindObject(POBJECT_ATTRIBUTES ObjectAttributes,
 	     PUNICODE_STRING RemainingPath,
 	     POBJECT_TYPE ObjectType)
 {
-   PVOID NextObject;
-   PVOID CurrentObject;
-   PVOID RootObject;
-   POBJECT_HEADER CurrentHeader;
-   NTSTATUS Status;
-   PWSTR current;
-   UNICODE_STRING PathString;
-   ULONG Attributes;
-   PUNICODE_STRING ObjectName;
+  PVOID NextObject;
+  PVOID CurrentObject;
+  PVOID RootObject;
+  POBJECT_HEADER CurrentHeader;
+  NTSTATUS Status;
+  PWSTR current;
+  UNICODE_STRING PathString;
+  ULONG Attributes;
+  PUNICODE_STRING ObjectName;
 
-   DPRINT("ObFindObject(ObjectAttributes %x, ReturnedObject %x, "
-	  "RemainingPath %x)\n",ObjectAttributes,ReturnedObject,RemainingPath);
-   DPRINT("ObjectAttributes->ObjectName %wZ\n",
-	  ObjectAttributes->ObjectName);
+  DPRINT("ObFindObject(ObjectAttributes %x, ReturnedObject %x, "
+	 "RemainingPath %x)\n",ObjectAttributes,ReturnedObject,RemainingPath);
+  DPRINT("ObjectAttributes->ObjectName %wZ\n",
+	 ObjectAttributes->ObjectName);
 
-   RtlInitUnicodeString (RemainingPath, NULL);
+  RtlInitUnicodeString (RemainingPath, NULL);
 
-   if (ObjectAttributes->RootDirectory == NULL)
-     {
-	ObReferenceObjectByPointer(NameSpaceRoot,
-				   DIRECTORY_TRAVERSE,
-				   NULL,
-				   UserMode);
-	CurrentObject = NameSpaceRoot;
-     }
-   else
-     {
-	Status = ObReferenceObjectByHandle(ObjectAttributes->RootDirectory,
-					   DIRECTORY_TRAVERSE,
-					   NULL,
-					   UserMode,
-					   &CurrentObject,
-					   NULL);
-	if (!NT_SUCCESS(Status))
-	  {
-	     return(Status);
-	  }
-     }
+  if (ObjectAttributes->RootDirectory == NULL)
+    {
+      ObReferenceObjectByPointer(NameSpaceRoot,
+				 DIRECTORY_TRAVERSE,
+				 NULL,
+				 UserMode);
+      CurrentObject = NameSpaceRoot;
+    }
+  else
+    {
+      Status = ObReferenceObjectByHandle(ObjectAttributes->RootDirectory,
+					 DIRECTORY_TRAVERSE,
+					 NULL,
+					 UserMode,
+					 &CurrentObject,
+					 NULL);
+      if (!NT_SUCCESS(Status))
+	{
+	  return Status;
+	}
+    }
 
   ObjectName = ObjectAttributes->ObjectName;
   if (ObjectName->Length == 0 ||
@@ -148,13 +148,13 @@ ObFindObject(POBJECT_ATTRIBUTES ObjectAttributes,
 
   current = PathString.Buffer;
 
-   RootObject = CurrentObject;
-   Attributes = ObjectAttributes->Attributes;
-   if (ObjectType == ObSymbolicLinkType)
-     Attributes |= OBJ_OPENLINK;
+  RootObject = CurrentObject;
+  Attributes = ObjectAttributes->Attributes;
+  if (ObjectType == ObSymbolicLinkType)
+    Attributes |= OBJ_OPENLINK;
 
-   while (TRUE)
-     {
+  while (TRUE)
+    {
 	DPRINT("current %S\n",current);
 	CurrentHeader = BODY_TO_HEADER(CurrentObject);
 
@@ -189,14 +189,14 @@ ObFindObject(POBJECT_ATTRIBUTES ObjectAttributes,
 	  }
 	ObDereferenceObject(CurrentObject);
 	CurrentObject = NextObject;
-     }
-   
-   if (current)
-      RtlCreateUnicodeString (RemainingPath, current);
-   RtlFreeUnicodeString (&PathString);
-   *ReturnedObject = CurrentObject;
-   
-   return(STATUS_SUCCESS);
+    }
+
+  if (current)
+     RtlCreateUnicodeString (RemainingPath, current);
+  RtlFreeUnicodeString (&PathString);
+  *ReturnedObject = CurrentObject;
+
+  return STATUS_SUCCESS;
 }
 
 
@@ -451,6 +451,30 @@ ObCreateObject (IN KPROCESSOR_MODE ObjectAttributesAccessMode OPTIONAL,
     }
   RtlFreeUnicodeString( &RemainingPath );
 
+  if (Header->ObjectType != NULL)
+    {
+      /* FIXME: Call SeAssignSecurity() to create a new security descriptor */
+
+      if (Header->ObjectType->Security != NULL)
+	{
+	  /* FIXME: Call the security method */
+	  Status = STATUS_SUCCESS;
+	}
+      else
+	{
+	  /* Assign the security descriptor to the object header */
+	  if (ObjectAttributes != NULL && ObjectAttributes->SecurityDescriptor != NULL)
+	    {
+	      Status = ObpAddSecurityDescriptor(ObjectAttributes->SecurityDescriptor,
+						&Header->SecurityDescriptor);
+	    }
+	  else
+	    {
+	      Status = STATUS_SUCCESS;
+	    }
+	}
+    }
+
   if (Object != NULL)
     {
       *Object = HEADER_TO_BODY(Header);
@@ -574,6 +598,11 @@ ObpDeleteObject(POBJECT_HEADER Header)
       KEBUGCHECK(0);
     }
 
+  if (Header->SecurityDescriptor != NULL)
+    {
+      ObpRemoveSecurityDescriptor(Header->SecurityDescriptor);
+    }
+
   if (Header->ObjectType != NULL &&
       Header->ObjectType->Delete != NULL)
     {
diff --git a/reactos/ntoskrnl/ob/sdcache.c b/reactos/ntoskrnl/ob/sdcache.c
new file mode 100644
index 00000000000..0b26490ce3a
--- /dev/null
+++ b/reactos/ntoskrnl/ob/sdcache.c
@@ -0,0 +1,312 @@
+/* $Id: sdcache.c,v 1.1 2004/07/16 17:19:15 ekohl Exp $
+ *
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS kernel
+ * FILE:            ntoskrnl/ps/kill.c
+ * PURPOSE:         Terminating a thread
+ * PROGRAMMER:      David Welch (welch@cwcom.net)
+ * UPDATE HISTORY:
+ *                  Created 22/05/98
+ */
+
+/* INCLUDES *****************************************************************/
+
+#include <ddk/ntddk.h>
+#include <internal/ob.h>
+
+#define NDEBUG
+#include <internal/debug.h>
+
+
+/* TYPES ********************************************************************/
+
+typedef struct _SD_CACHE_ENTRY
+{
+  LIST_ENTRY ListEntry;
+  ULONG HashValue;
+  ULONG Index;
+  ULONG RefCount;
+} SD_CACHE_ENTRY, *PSD_CACHE_ENTRY;
+
+
+/* GLOBALS ******************************************************************/
+
+PLIST_ENTRY ObpSdCache;
+KSPIN_LOCK ObpSdCacheSpinLock;
+KIRQL ObpSdCacheIrql;
+
+
+#define SD_CACHE_ENTRIES 0x100
+
+/* FUNCTIONS ****************************************************************/
+
+NTSTATUS
+ObpInitSdCache(VOID)
+{
+  ULONG i;
+
+  ObpSdCache = ExAllocatePool(NonPagedPool,
+			      SD_CACHE_ENTRIES * sizeof(LIST_ENTRY));
+  if (ObpSdCache == NULL)
+    {
+      return STATUS_INSUFFICIENT_RESOURCES;
+    }
+
+  for (i = 0; i < SD_CACHE_ENTRIES; i++)
+    {
+      InitializeListHead(&ObpSdCache[i]);
+    }
+
+  KeInitializeSpinLock(&ObpSdCacheSpinLock);
+
+  return STATUS_SUCCESS;
+}
+
+
+static VOID
+ObpSdCacheLock(VOID)
+{
+  KeAcquireSpinLock(&ObpSdCacheSpinLock,
+		    &ObpSdCacheIrql);
+}
+
+
+static VOID
+ObpSdCacheUnlock(VOID)
+{
+  KeReleaseSpinLock(&ObpSdCacheSpinLock,
+		    ObpSdCacheIrql);
+}
+
+
+static ULONG
+ObpHash(PVOID Buffer,
+	ULONG Length)
+{
+  PUCHAR Ptr;
+  ULONG Value;
+  ULONG i;
+
+  Ptr = (PUCHAR)Buffer;
+  Value = 0;
+  for (i = 0; i < Length; i++)
+    {
+      Value += *Ptr;
+      Ptr++;
+    }
+
+  return Value;
+}
+
+
+static ULONG
+ObpHashSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor)
+{
+  ULONG Value;
+  BOOLEAN Defaulted;
+  BOOLEAN DaclPresent;
+  BOOLEAN SaclPresent;
+  PSID Owner = NULL;
+  PSID Group = NULL;
+  PACL Dacl = NULL;
+  PACL Sacl = NULL;
+
+  RtlGetOwnerSecurityDescriptor(SecurityDescriptor,
+				&Owner,
+				&Defaulted);
+
+  RtlGetGroupSecurityDescriptor(SecurityDescriptor,
+				&Group,
+				&Defaulted);
+
+  RtlGetDaclSecurityDescriptor(SecurityDescriptor,
+			       &DaclPresent,
+			       &Dacl,
+			       &Defaulted);
+
+  RtlGetSaclSecurityDescriptor(SecurityDescriptor,
+			       &SaclPresent,
+			       &Sacl,
+			       &Defaulted);
+
+  Value = 0;
+  if (Owner != NULL)
+    {
+      Value += ObpHash(Owner, RtlLengthSid(Owner));
+    }
+
+  if (Group != NULL)
+    {
+      Value += ObpHash(Group, RtlLengthSid(Group));
+    }
+
+  if (DaclPresent == TRUE && Dacl != NULL)
+    {
+      Value += ObpHash(Dacl, Dacl->AclSize);
+    }
+
+  if (SaclPresent == TRUE && Sacl != NULL)
+    {
+      Value += ObpHash(Sacl, Sacl->AclSize);
+    }
+
+  return Value;
+}
+
+
+static PSD_CACHE_ENTRY
+ObpCreateCacheEntry(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
+		    IN ULONG HashValue,
+		    IN ULONG Index,
+		    OUT PSECURITY_DESCRIPTOR *NewSD)
+{
+  PSECURITY_DESCRIPTOR Sd;
+  PSD_CACHE_ENTRY CacheEntry;
+  ULONG Length;
+
+  DPRINT("ObpCreateCacheEntry() called\n");
+
+  Length = RtlLengthSecurityDescriptor(SecurityDescriptor);
+
+  CacheEntry = ExAllocatePool(NonPagedPool,
+			      sizeof(SD_CACHE_ENTRY) + Length);
+  if (CacheEntry == NULL)
+    {
+      DPRINT1("ExAllocatePool() failed\n");
+      return NULL;
+    }
+
+  CacheEntry->HashValue = HashValue;
+  CacheEntry->Index = Index;
+  CacheEntry->RefCount = 1;
+
+  Sd = (PSECURITY_DESCRIPTOR)(CacheEntry + 1);
+  RtlCopyMemory(Sd,
+		SecurityDescriptor,
+		Length);
+
+  *NewSD = Sd;
+
+  DPRINT("ObpCreateCacheEntry() done\n");
+
+  return CacheEntry;
+}
+
+
+static BOOLEAN
+ObpCompareSecurityDescriptors(IN PSECURITY_DESCRIPTOR Sd1,
+			      IN PSECURITY_DESCRIPTOR Sd2)
+{
+  ULONG Length1;
+  ULONG Length2;
+
+  Length1 = RtlLengthSecurityDescriptor(Sd1);
+  Length2 = RtlLengthSecurityDescriptor(Sd2);
+  if (Length1 != Length2)
+    return FALSE;
+
+  if (RtlCompareMemory(Sd1, Sd2, Length1) != Length1)
+    return FALSE;
+
+  return TRUE;
+}
+
+
+NTSTATUS
+ObpAddSecurityDescriptor(IN PSECURITY_DESCRIPTOR SourceSD,
+			 OUT PSECURITY_DESCRIPTOR *DestinationSD)
+{
+  PSECURITY_DESCRIPTOR Sd;
+  PLIST_ENTRY CurrentEntry;
+  PSD_CACHE_ENTRY CacheEntry;
+  ULONG HashValue;
+  ULONG Index;
+  NTSTATUS Status;
+
+  DPRINT("ObpAddSecurityDescriptor() called\n");
+
+  HashValue = ObpHashSecurityDescriptor(SourceSD);
+  Index = HashValue & 0xFF;
+
+  ObpSdCacheLock();
+
+  if (!IsListEmpty(&ObpSdCache[Index]))
+    {
+      CurrentEntry = ObpSdCache[Index].Flink;
+      while (CurrentEntry != &ObpSdCache[Index])
+	{
+	  CacheEntry = CONTAINING_RECORD(CurrentEntry,
+					 SD_CACHE_ENTRY,
+					 ListEntry);
+	  Sd = (PSECURITY_DESCRIPTOR)(CacheEntry + 1);
+
+	  if (CacheEntry->HashValue == HashValue &&
+	      ObpCompareSecurityDescriptors(SourceSD, Sd))
+	    {
+	      CacheEntry->RefCount++;
+	      DPRINT("RefCount %lu\n", CacheEntry->RefCount);
+	      *DestinationSD = Sd;
+
+	      ObpSdCacheUnlock();
+
+	      DPRINT("ObpAddSecurityDescriptor() done\n");
+
+	      return STATUS_SUCCESS;
+	    }
+
+	  CurrentEntry = CurrentEntry->Flink;
+	}
+    }
+
+  CacheEntry = ObpCreateCacheEntry(SourceSD,
+				   HashValue,
+				   Index,
+				   DestinationSD);
+  if (CacheEntry == NULL)
+    {
+      DPRINT1("ObpCreateCacheEntry() failed\n");
+      Status = STATUS_INSUFFICIENT_RESOURCES;
+    }
+  else
+    {
+      DPRINT("RefCount 1\n");
+      InsertTailList(&ObpSdCache[Index], &CacheEntry->ListEntry);
+      Status = STATUS_SUCCESS;
+    }
+
+  ObpSdCacheUnlock();
+
+  DPRINT("ObpAddSecurityDescriptor() done\n");
+
+  return Status;
+}
+
+
+NTSTATUS
+ObpRemoveSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor)
+{
+  PSD_CACHE_ENTRY CacheEntry;
+
+  DPRINT("ObpRemoveSecurityDescriptor() called\n");
+
+  ObpSdCacheLock();
+
+  CacheEntry = (PSD_CACHE_ENTRY)((ULONG_PTR)SecurityDescriptor - sizeof(SD_CACHE_ENTRY));
+
+  CacheEntry->RefCount--;
+  DPRINT("RefCount %lu\n", CacheEntry->RefCount);
+  if (CacheEntry->RefCount == 0)
+    {
+      DPRINT("Remove cache entry\n");
+      RemoveEntryList(&CacheEntry->ListEntry);
+      ExFreePool(CacheEntry);
+    }
+
+  ObpSdCacheUnlock();
+
+  DPRINT("ObpRemoveSecurityDescriptor() done\n");
+
+  return STATUS_SUCCESS;
+}
+
+/* EOF */
diff --git a/reactos/ntoskrnl/ob/security.c b/reactos/ntoskrnl/ob/security.c
index d93165cda2c..b5c00dab365 100644
--- a/reactos/ntoskrnl/ob/security.c
+++ b/reactos/ntoskrnl/ob/security.c
@@ -56,7 +56,7 @@ ObReleaseObjectSecurity(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
 
 
 /*
- * @unimplemented
+ * @implemented
  */
 NTSTATUS STDCALL
 NtQuerySecurityObject(IN HANDLE Handle,
@@ -81,7 +81,7 @@ NtQuerySecurityObject(IN HANDLE Handle,
     }
 
   Header = BODY_TO_HEADER(Object);
-  if (Header->ObjectType != NULL &&
+  if (Header->ObjectType == NULL &&
       Header->ObjectType->Security != NULL)
     {
       Status = Header->ObjectType->Security(Object,
@@ -93,12 +93,33 @@ NtQuerySecurityObject(IN HANDLE Handle,
     }
   else
     {
-      Status = STATUS_NOT_IMPLEMENTED;
+      if (Header->SecurityDescriptor != NULL)
+	{
+	  /* FIXME: Use SecurityInformation */
+	  *ResultLength = RtlLengthSecurityDescriptor(Header->SecurityDescriptor);
+	  if (Length >= *ResultLength)
+	    {
+	      RtlCopyMemory(SecurityDescriptor,
+			    Header->SecurityDescriptor,
+			    *ResultLength);
+
+	      Status = STATUS_SUCCESS;
+	    }
+	  else
+	    {
+	      Status = STATUS_BUFFER_TOO_SMALL;
+	    }
+	}
+      else
+	{
+	  *ResultLength = 0;
+	  Status = STATUS_UNSUCCESSFUL;
+	}
     }
 
   ObDereferenceObject(Object);
 
-  return(Status);
+  return Status;
 }
 
 

From fbdcc7cb6f48bfb45c7a716f8f8d3991cd31d7f7 Mon Sep 17 00:00:00 2001
From: Art Yerkes <art.yerkes@gmail.com>
Date: Fri, 16 Jul 2004 17:21:05 +0000
Subject: [PATCH 309/356] Fonts converted by Larry Snyder Converted suitably
 licensed X fonts from type 1 to TTF for use in ROS.

svn path=/trunk/; revision=10143
---
 reactos/media/fonts/COPYRIGHT.IBM       |   9 +++++++++
 reactos/media/fonts/Copyright.Bitstream |  11 +++++++++++
 reactos/media/fonts/UTBI____.ttf        | Bin 0 -> 101284 bytes
 reactos/media/fonts/UTB_____.ttf        | Bin 0 -> 98740 bytes
 reactos/media/fonts/UTI_____.ttf        | Bin 0 -> 114404 bytes
 reactos/media/fonts/UTRG____.ttf        | Bin 0 -> 110316 bytes
 reactos/media/fonts/c0419bt_.ttf        | Bin 0 -> 71564 bytes
 reactos/media/fonts/c0582bt_.ttf        | Bin 0 -> 70368 bytes
 reactos/media/fonts/c0583bt_.ttf        | Bin 0 -> 62772 bytes
 reactos/media/fonts/c0611bt_.ttf        | Bin 0 -> 61740 bytes
 reactos/media/fonts/c0632bt_.ttf        | Bin 0 -> 61452 bytes
 reactos/media/fonts/c0633bt_.ttf        | Bin 0 -> 62188 bytes
 reactos/media/fonts/c0648bt_.ttf        | Bin 0 -> 67348 bytes
 reactos/media/fonts/c0649bt_.ttf        | Bin 0 -> 69152 bytes
 reactos/media/fonts/cour.ttf            | Bin 0 -> 144456 bytes
 reactos/media/fonts/courb.ttf           | Bin 0 -> 122944 bytes
 reactos/media/fonts/courbi.ttf          | Bin 0 -> 122068 bytes
 17 files changed, 20 insertions(+)
 create mode 100644 reactos/media/fonts/COPYRIGHT.IBM
 create mode 100644 reactos/media/fonts/Copyright.Bitstream
 create mode 100644 reactos/media/fonts/UTBI____.ttf
 create mode 100644 reactos/media/fonts/UTB_____.ttf
 create mode 100644 reactos/media/fonts/UTI_____.ttf
 create mode 100644 reactos/media/fonts/UTRG____.ttf
 create mode 100644 reactos/media/fonts/c0419bt_.ttf
 create mode 100644 reactos/media/fonts/c0582bt_.ttf
 create mode 100644 reactos/media/fonts/c0583bt_.ttf
 create mode 100644 reactos/media/fonts/c0611bt_.ttf
 create mode 100644 reactos/media/fonts/c0632bt_.ttf
 create mode 100644 reactos/media/fonts/c0633bt_.ttf
 create mode 100644 reactos/media/fonts/c0648bt_.ttf
 create mode 100644 reactos/media/fonts/c0649bt_.ttf
 create mode 100644 reactos/media/fonts/cour.ttf
 create mode 100644 reactos/media/fonts/courb.ttf
 create mode 100644 reactos/media/fonts/courbi.ttf

diff --git a/reactos/media/fonts/COPYRIGHT.IBM b/reactos/media/fonts/COPYRIGHT.IBM
new file mode 100644
index 00000000000..5e50d448f28
--- /dev/null
+++ b/reactos/media/fonts/COPYRIGHT.IBM
@@ -0,0 +1,9 @@
+IBM Courier - Copyright (c) IBM Corporation 1990, 1991
+
+You are hereby granted permission under the terms of the IBM/MIT X Consortium
+Courier Typefont agreement to execute, reproduce, distribute, display, market,
+sell and otherwise transfer copies of the IBM Courier font to third parties.
+
+The font is provided "AS IS" without charge.  NO WARRANTIES OR INDEMNIFICATION
+ARE GIVEN, WHETHER EXPRESS OR IMPLIED INCLUDING, BUT LIMITED TO THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/reactos/media/fonts/Copyright.Bitstream b/reactos/media/fonts/Copyright.Bitstream
new file mode 100644
index 00000000000..a77490018a6
--- /dev/null
+++ b/reactos/media/fonts/Copyright.Bitstream
@@ -0,0 +1,11 @@
+(c) Copyright 1989-1992, Bitstream Inc., Cambridge, MA.
+
+You are hereby granted permission under all Bitstream propriety rights
+to use, copy, modify, sublicense, sell, and redistribute the 4 Bitstream
+Charter (r) Type 1 outline fonts and the 4 Courier Type 1 outline fonts
+for any purpose and without restriction; provided, that this notice is
+left intact on all copies of such fonts and that Bitstream's trademark
+is acknowledged as shown below on all unmodified copies of the 4 Charter
+Type 1 fonts.
+
+BITSTREAM CHARTER is a registered trademark of Bitstream Inc.
diff --git a/reactos/media/fonts/UTBI____.ttf b/reactos/media/fonts/UTBI____.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..d1b4c7893d37427e3057826af5ec864cb7a9f151
GIT binary patch
literal 101284
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
E5BzS~pa1{>

literal 0
HcmV?d00001

diff --git a/reactos/media/fonts/UTB_____.ttf b/reactos/media/fonts/UTB_____.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..4d027c4892dc70f5b5f9678028fccf50d6d3a88b
GIT binary patch
literal 98740
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
Gv+o~Wkx-%l

literal 0
HcmV?d00001

diff --git a/reactos/media/fonts/UTI_____.ttf b/reactos/media/fonts/UTI_____.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..6606a72723aa3753425ea88a27442b627a7ba7f0
GIT binary patch
literal 114404
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

literal 0
HcmV?d00001

diff --git a/reactos/media/fonts/UTRG____.ttf b/reactos/media/fonts/UTRG____.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..9904ebe5d7436dad5911d9a98a53f19550313dc0
GIT binary patch
literal 110316
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

literal 0
HcmV?d00001

diff --git a/reactos/media/fonts/c0419bt_.ttf b/reactos/media/fonts/c0419bt_.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..4c8a116cf9e401496bf80ea59929c7f4b59b6763
GIT binary patch
literal 71564
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

literal 0
HcmV?d00001

diff --git a/reactos/media/fonts/c0582bt_.ttf b/reactos/media/fonts/c0582bt_.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..107c54970fca04031e07800e9feeb4dfca4763b7
GIT binary patch
literal 70368
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
S4gQDv5%{>qY4zju7ykzqk2e$m

literal 0
HcmV?d00001

diff --git a/reactos/media/fonts/c0583bt_.ttf b/reactos/media/fonts/c0583bt_.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..8402ef63f95594ece1c1762ddc4116bbcc6b0812
GIT binary patch
literal 62772
zcmeFa37A|*bv9gedwSp3+xxyv&vehyJ>9cwq|s=%wb|BY%Se`NdBegs#>VVk!e=lz
z##;gblVJ7)X8~j>5C|BE6R=rAz9eQ%AYluEumpl<{`XYf+qY+t<PiS<`M>A+Mmk+}
z>(;%u>eQ)I=bSoK#W-Wkho3&ic3iY~%Lm{4*a61OcOvzBJNFKa-s5=39>(}<as7fz
zHeRs*%DL<Rgs~r9ggjrr;`$>ex7@ySnz6+Das7oWZn-(jp0WKlV})VlPhWZRs_RED
zxams9a<9TWj$U=$ZC55opV^N4yBPcA<0p<?f9sz*Ek9(;a+0y|^oip~j{W18=dVCs
z7oKmQK!UlhtjG06To+GVfAg)$@6SAn>wjg;^p@*xxZ=nU59IJHE*XF3`XjfVRF;%m
z5kG;1><f=vfBX#(d;#_O&NImW;*&Srbn^$k_4yYw_Jb{qDXx<@9zS_Q^N+sGSpJ`p
ze;XrQD2#3R<AcMOd#8WOVkUYq`$%f(F%hQO?=O96@voIfOxNPtPI<*2o>N}AG{e>@
z2baFI^q0yb;!WC35&Vlt`4@JQS=r^lHGPRO2Yrsei+-4*98~_CnUV76%00OEdKvPs
zuu=9)%4fEti4<z5<!?WE+l@D|IcCnsWEo7?@-aOR|D-aHcoq*HM2J5MHMj!d#en00
z3Bc2UCjpNDt^^bT?*r@rd>U{9FsX&J2)6>Z0X6|H1k3=o1N8j#>>z;NL*Y$;d0^<5
z2=jmpAO|P_s(=`P(hmd10CX>c{69q)2hja-E$r9g^bQvQ*c18aTNS_p;IjZK^8+$m
z`Yyt!04)GLM`fb#QFv5~Q#tkk<^T-<>bLX@g!Dbii|>eV3L({*@>4le$oFl8RBpt@
zJKl)!KL8Yt0;oKj0lNTHt^oi&Pv4^V{R}|mp!{D4d=-HD3mj0{Z_|M4KxO+HfZFRS
zzzu+V0ST1jO9*cSQ2tK>UIVxta0h_WzX!Ml@E*XQ0p1Dt5dirJM@wHpoZd;_CY)OV
z`v83a!VPfJ#RYIr?YR~R98=r&0<~=~=<Q11=>=+MYS&(<;F{W%+HWnOc3cTm-d@n#
zF^}|KpthuT>;=6YDUECSDI^-BG%5>~={dlCfD(Y-N%go4pla|q!Wn=9C<9&zxF108
ze>32-=$8M&@wWs2L?B~3I&?8bNt|~!a>O<^5!F&eGW`tc4|Y@dMk9)cv<tjkyx&Nn
z8ym}<r+1X)t&Iq#kbg>CiURb$X;oZ%->USDJ9Zei<o7!wfmo0V_`cn0W@fVm|L}(&
zEv8*jAd@U2gSa++DD#T+WtaK|LM^JN$oF=WjaSN~HNV!I>8x>!)ne`5lwXs-sI0?k
zVV2+EpY{2_YgJY=o;9Pe7K?S&z32N{EB@BZi@G{(R))KjMGM4-^a~2Ln>|U0YJY^r
z^Z%VCkN8se4OGc)NzVJuv%J!3wc+1df2gZV)OD?!Yd^A9&fc{D##17zk>4iJW)VfT
z8Ogmbe;#og{?^Qfy1MN)hP#xd8z8g1mWjO=J?UEXTz6OBTb*KjReaWJv*X1C=l)yk
zMdAs2&%;_K5umPKhn?B&4*bKP_@T(MzqM2KEGzD=xYTp473x{_&~8J_CJN!`rmgiL
zrJXf{qvu&$&(o-@&*@;e-TlK$^msR-C#(v4GOxPVn_#@jh-vrr1bP+4?G7h?34YB#
z=jw;WH&9o<sH>Jid}7siRwZ;xL65DtyW&!2T{F?)>`m6|EbG~Or~9>Kk+bG-_PkbR
zk_o75(B))Krwjk^XZ+CB`TyuK@r;pm*`<D=huRmk+%6;8cwS~%`%Z7Jv&LOLua&Qn
zzo={2<7RHR%Ps!2!0pl_l!^;nE=!WR<!^7+-t-mmHL~eRBBUSshL)%WD_+ubdA1BL
zkK5CeO+-ar)HUk!Fi+2)*NAITZ%>kOvm0A+cg5w|vQav{*em|gg-D?vp9U2FHU7M-
z%S&(cpsoqOkNJFl{KKF4p~$kobKF9{wVzq`0=hU`Ha%S{ftJ(nUG;+Jncz2Gq<<7i
z_(NS&0YCHm1NetO<43=sRC-+Al2^vB_Lz}ymKfeEUcLNwfRgEl{)|^qLI7X<_5Sca
z<5MywKY_Yt!$B5&9)F?G^T>4mEX&@aU5G&c2?QzjKloZmyr8!vp)g&cuDNiC;mslO
zrv=)je$~A#Gp+bFa;><r{4%`!vU_Dbjxr)O7^0kK%iVqK?2+*5hsE1a*OD4xk%)?a
z_`{C~wO>j)@1J~N?QG||hbQQ^s^!s2pr@|=zUPx_yhyK%tPSc~i^o{(e1FliWQea$
zUn5Cm($d$uEz*|%td(u`x7JLF$5%Zp5>VGhD#?;-|0R|sFTawv)=FFU&^a&kr$tCV
z3H&6IDZ~hV!+)sjXeQ0l&*LwXc^;X5jVySrcykIt3NZ?`q+jE0^yuo6iVvW!?R<{q
za@m~zCu8)R)e;eCv2LhmUL(}Aid#JwJ<(-PAzizb6<_RLEX(!$FS7YuzMEUVO#U*)
zCW{4D==sYVaU-h7^w7xj8;ce3CVG9oKrw<}?=N3G%fqPae1DZytNm5+rv)o6MC!6z
zGQ*m`%knL|SoH<{y;_JsPtnV><`-n5$hyY;{{Ehado!V~+Z%OOuQ%`yfA|rxLG6Nq
zbN^`%o;#C#@7j69C&evM0>miP<7+=dsb|g6Xso&=s)M@X&m_V0D<)@<l1M>JDKm?L
z*(636@(x|Rn!QFODeP|cTkN%%JzD$k3U)nvA$vWZ{9{<7P3+t3TbO4uGYe*`PGFwP
z!JN#++|0wg%*XsJz=ABq!Yl$?Zj{AXoF!P2rC6F}SeE5jo)uV;l~|coSe5m&8XI7P
ztj-#2hz+w5%xE=Pi;b~1>#%V)!6w-hn`Sd?maW4~*2~xiHqSP)1-6N8W?R@+%*<_P
zJJ<#6Lbj9bV!PQMwwGPRE@qdoeQZBFzz(uQ>{50aJB+zC`S)UWoZZ51!+hI|*elpe
z+56bF><!(@uV*%PHG2uWnccwt7kef99Q!o8jy)jmKaSrQup{g!yNVrSUuIXbJJ{3g
zb?h4U4EqB6JbM-UJN7m9PwboQ<?J8WP3%T?7yBxEBfFJ-g+0r@!ER^2!yaM}vp2Ix
z*zdA?*jw16?Dv4vx3PDyx3k}8f55)T9%Jue?_}>{?`7|1|H$rTA7Jlif5`rb{Vn?v
zdysvQ{R#V1_F?vC>_hB6c8dKudxD*2XV}NsN7zT%U$DPtA7@Xpzhs|apJJb6|C_yu
z{Wbdx`z!Vo`)Brb_BX7Le;IWcMN9Odr7Wl`wOs|cc>!>-#P{+e{8oOy@+sxnY$zMg
zrnC8MIXj%4%;od3r6oLT#xo8)6GQ6}E*|B3_zSwv1hdg>GMg38OlZ%%46XJub|+&?
z-;hAKTpC~e;&Z2-`vZ#8-`DqkecRVZzxMvG9_XRb8g6U^Y~Yw=p<LqcS8S0h+@fEK
zP^Z%S*QC;y0mr}jc6;mphwb(TP~iJOiA0k`p)VFRdW)dpoBwaC{sw#F|9@H)-J1<=
zKgI03_Wv>GZ#Zy@FWq&DZA?7@u4}sdaQzhHgW2rD)f*q@FTjN|h=f`WG1Fjn)8nSn
zrak)$2eS8M@7a3np6sUVi6h4z?<<KAH;&(PU?}@I+q?g2{9d#__xRj_L^pc;z=27;
zr;px)N09xV19-zV+8Ypxq@m}K$vn6{`?#sRYya;3kH2bT;_<nS2NJnlcH!}l?b`qN
z$2KN%2M!>YrCU;z_~lnewK7{#W=jqCZSpO9@eaJ=z&-cSJNND{<R1UnJ@+K;K|QqV
zQ=F|#n9~waaXf;GFP!49+J$Ek6mkhlDC7z`6zjl7e9At!eeeDS6fAe3&Irc?;GkeI
zOc~&(rMtxd|0p62j80jMVjgB20CVLSl6n$OgQs8&9KZ`?jlhRO7#HAS!u(6KOyQqk
zZe;`WD<_ywd8HU%6?Vnar})p5_u<*~?6apaD7KjiuSok&G4+}CW{etb_FaH-+4=;U
zxeYc;Uu|O`Y-6x%V?b-8>$fp{wZRJ77*N_6FxnUf+F<i-=DzF{YvXM*&&apVKZ`1s
zhEB1@&>6ghV|48sI0LRvHSWWwCy<#TvkPGeAx9WPNa+cLO@vv5S-gYdHN<O(Q@%;W
z>A7{!43CsL1*@su9F3&7wb{`lqv6m1u4Ulig?xF2Bcnx&<i}c5xRwFmYMC+5DwR;g
zIqej|a5merPGz&}96S<0@{9w?Vf$z{+qO(+v+JGzb@C*?yA}?aKl3-@w^TY=Dt$Z@
zQA2%y{_$EgWco;{h?KuUn{amV(%t+y<xxlqPo82sQH5QAxo4k%u%i5Gy%XpT1KnYu
zI}A*Pf$lIf1D!ijL&8L2=n15YtQJHffHHvEW)pz2hLM#pKQlyxwXpvbOARHSfb?UZ
zJ)k8NDWTYt&`$~dlyC+^GRJ^N&64s_i*hQL4Us6I3K$1$0hliv9_eWKYysJ6MNRYO
zXnU+x9^&P();f+vv_zV#)D#&W4guwr23o)p4&geD6bqV0Z<F#L*@NDAD3bCA9Tu~5
zy1!H%s2{xMy?v(IK%Xb(a->y1=VO6@-Q9>+>&5b+b<>ybH(8a48unZBvrcQYIF(5`
z{2{xV%%#$Cf1!H){jN$iZyhjM%#nC%+BE77#$)+ZBH=B>Hcs!p_*xZKC)<lGkSUHY
z{X74Oaw}xV4Ep0bwv&TM%jh(Nf?UxdNMu2p1F?{Z#YLCu8xSoQLd%7K#Sj`Igq8~d
zL%3mq_!$9|0d2r0fVg4D>tX=v&=Y{I0PTq~o+yidZTxNmP|H%ET0qM#fMyut7a)EC
z;*`Fd`j}{KGqt6eIlHYrMF~^PM2$Ow#x01Vrx5cZ2JVSwR`q5kfmuZ}t7v8w&8&(q
zPa#Xc%wk1E1yleXz-9nZLa;Tf5DkPw9;J|PD4kYWwlgRq*b}d;$QLBq2#2g@>W^cs
z&hc=$mCcNm!{PE+Cfh29KVL|vi^X)h@FM(Br1*t!r6&ur{+re6@r4#o*(@G!i2p}&
zq!<bnN0O;w8OHPZcs!R|d<%Xk5?_&lPnd$9pzRJ**b}g!o1#%Cmi}FFDI?G?wzJ<k
zg9HVNg=l9Bq7eWQ29d-jfcdi1z=@A3{=fv7DEep}eN=A{C*j{o_}5x!6D4et4H8E)
z)I>8lfn&3dV>2NhI5q>vX5bjkC?J6KXz=xD@C^tz459Z?KWdJ4RO&$uWvtcipnD+z
zN=2VT|DqduhnqD`DFWFZZdD~i%%iV<W4J$?DNJW~*2*&j(bh!5;l6N7awz7u`NH|2
zGor@afsoJnV!PcL3<iSkXv6ID#B8<EipOvDem`B$_Q!Xr3AH+&o7htx@YlkV^KQQ>
z8cGzM9%s-Wh<V?Utj1k2b-)^LMA8Edvpqz3=Im+Sfuui=zVhlb=qU=6H?24M(Kq~{
zEkF8(AAQ3Q4Coj&5duw;f4QE;koET%OuhpULl)^1Q9u<i4%h<N4>$q174TZXBY<}U
zP60jxaD#&REc}WvN?5!cSkqV-xA)mSFYs{XR-4mo%6RyMGU#^L6-(cDJltt^T1`(=
zJ)T^e=ATe5M%P9?$ni3wQ;Qu@JE+ADYO$l$?LGDIQ$0{IK^f0tw6y{$<bG5EbO4(H
z`v6w~UIO?nz{7xd0X_`)G{Ais5I`Cg{6v8O)PtJX0<IbkfguYLC|9U!&2s)er#lrc
zl_%r<Zf9twe8Uap8RcS+!!=aic;}8+ym)M#$KkFIz3#EcUOzlY^?GD!ia&&UC8%C1
z>Sfp4$By=~qkZgXA3NHow_c3u1vQQ86_E7`;OPMB6+pcLs8;~>3ZPyA)GL5`1yHX5
z>J>n}0;pF&uU7!|3W$2C#2?zI1qK*{%!zk+_~TA@8ud!2dMfs$tk)eE%-uRYHtTVC
z>O-%8?6KDk*HN!4*{8tk=fM`gd>VsW2@(*{Pr7IXP!{8z4XtH^4sSzl8?<#BtQ0or
z&Nk@AHt4=K=(jdm%)dqCTL1-&z=^lnzzB#X=&^h^Hq?zxYB30&;NLUEzeDKTaboT?
zYPSf9Eh2JyXNa}5cj~cxH*KgJo77?;0`LGi!g{$19C<nMh#^j5k4D-=6YX`NddgWr
z9Mn&eQ-^=XYPMV4isHNDpw*YR+7+v1<3_91?9O|whwk(#il@(P?z6qr<Ma%GU~cDM
zGllw*&1OnoiEPf8xzBm?%}z(m0k@@NDU(gH+p12xY5cWjhZ(QFyG^uJgokNcnZ~HM
z?hKJG&`-mW1=#R{!O;j8(Zb9#urGM=j8$au;+BeAR)lGi`-sg!suLp!sv$XG3KgTC
zFu=q7@`S1;AC0Ed(MKuvc8b0Ih`3IQJE>IkQ4vE)@SXQ99pS$Np*F}Gk}q|+zXcRx
z0fku5pDmyeNDh}lcsCJ;9{@|%n26P6Ao@pUxBq5;-~Be9Vk`Oi!W;Y!r^UATO~2x{
zxb1z5_}&ioUd7F0sAGv*+ax4%C#vUv7B#mb2Rz_`972i*HSSP#!RK=juu%Ej5xdJ}
z=MSnL`{K3l^|)u8E_KF9^R{^M(@VeLZ-Pz2$u5y~p;rmPWX-y0<Yy=HgOWFUfLN^%
z0<DOsfC``k*bERtpcrr@qxtlBW2n;^YK&i8Z8iJ*n=M&}6HA}M82V9=CwhnvNYnb8
z57_hpn?7LE2W<M#-+btAKJ+&q`kN2^&4>QxLx1z3zxnk3=0ktOfQv!V2b4sp_n0su
zijh#T2|?F_5%MoNRe!K-v+%SQS^TCYmWZp)h(|dlB4N*SZ$?2CHi>aRtI2?$l?q1=
z9Wsk=n4bY4o<rRGtS&ZbqPU8BsHlgEdZ?&}6q~#l(o?!%p8~^7fnlb=FjHWdsh)wr
zLCA&`vnwKK98|~*4!k9#%V!}BZ6OS8Aq;IH3~eN25?MTfp+{?^IKCc7BgN53aWoQ%
zo5Le!As`qsnn?)ZQe5YQ?StzIg>?tpor80Q!ra03=<G~$bavJ^xcAlzF1U5?;Nafd
zc2KCque<u1>#x7&8d_ig+QK>prBAsHl^Hw(gPa00Yu|uAOoymeAxT1RluoKJNsw<4
zokLR)B4NMmriGl~?^E3WRMcJ@y)EGhdv{`XD6{x=`aQ&dW*N!5b2c@)m{wEiNF<$7
z`CCwiSrp_KXtO$d@C=N*3J9IL3bhj{m25~z=T4yC3G_RGekaiH6o{it1IRR>HSADV
zj80PFlRZtM2_2$IlE63B2yey+fF^OHN!(}>H=4vP-fTja60(3hf%E2Mb;nwTywzi(
z%F{q5<z>hl%@%L~*2{m&ZK1`tPgOrXx33wsIXwaIh)=ET9Ua=%N=!^X@V+rM(wF!9
zhYFRC&92**vWElCxoplCk0ypU_D@{dd{rwJw(O8?vvui*{HMUn9DDi<kfaDXQ{bWo
zT-1Pz8gNkqE@~+8X*^V8vtp2mYOzx+Dv?J<^e7&P;(;h0h~fca3kuqFLl<Qegfd{a
zOT{)yun_^!+ih$DZzok(Bh)YmH4H)xgHXdDRH^Dt0C9slZU^zHLEv@}xE%y;2k~JH
zZY0)7HAAraG&B#Woef2Z1+z+L)<l@59N+~y&0F~06Yb38CGEzxW-=XjWlDqbp<!37
z980NIchD8ghFx1?m3-O@6?ANCeQ;qo*5Eq>+h^)qTS;G{5L7epCK|0Li(wn*!Hh3p
zQxuccpHwgO_&u>;u$1&iYg5JH^{B0aSplYam6sqk#_m4@f+O=WQ6};ABvB^9!DsZ|
zVj*N%R%6dVr>3?8ozi$heT@)XWELP6qAcFW@m>l&2t6R`BCrWn5A8%`J_tzSZXJD)
zo0=v$_M;0ziy$-!L4gKLedN@-<X9n3!%Zj17k=k=@)n1!&#}*IGFzQ?hcy&6IW6H%
ziaP1%Fm;>R{EfKD{#iv?{4qc2v?*RwWbs|xX19fc4tp^)6OPA2p?EwzlTN!LUVa%W
zz}Y77T}3&8*_X#ou@RJe6flC47Es~>6e{2nbr?m871old&Q#YTOo`Z`E@CT$*h&v#
zHEt{LNK2a%qE(2^o`*Cm$kGsfnzUBZbxH2%CBd>rb=u&pi638@sSj>xCGU9Ep~E@V
zohek+@#%??NHLr8q#`zz&t)T#?05J*fpq7>p=(Z7D{3CzrW38^wA<^-7QY`1#~`n~
z2n2ND(vK87`g9K5?t^4dJH>_o4d5jJOa*|cyu^(KkqDp+XahC@#8823j2^=yHlVVq
zqq2%VPLp9(bm1!ccvWQ2AbX~3Npce^-BNR<iM;`h0tc8$P@o$KBBlo}V?~4n;0mAv
z*bESM0-f#Y{a2$qj{-5?O6n{bkf5<Xt<IM#8%I-_iQUcSp2_U+{+I0-9&#rK(-$5H
zjMpm7vHohCA4sIK<2wc$J35*2ma8}J`K`-aJ~%g76_f4AFPc*m!^1O^DCo@6fAW7+
zPJp3bd>TTQS;$vrLILV$8#+ycB=d?okZ_sq@-$6(H#%XEP!J>(P)C--E(SD`u0aT6
zusV`VX7ca>PNdNZ7OeLxYN*QXrZhhge`}x1ebDMqKJW#F|JV~Ln=Gas$ynmKe{ebM
z7KfRC%MMaEvF+#&UbJ%>oVd*sWR+83ydmq;0Akehfny6UB7icW4cG*boIJ?}L}jS6
zn@~j)T0DTb8*#Vf=_6?G5w!OR+Is};Jt7|UB7|!kxXA#r%hs1Yv4ls-h)b^-@8U;e
z@dkcW!VjcGVp4fvzNL{!i{<fJLcWZV+C$W*4Wd=_X?O+T-#B0kfQVJqI^24qrv_fz
z06jH8PYuvhL(&r&JaiThTVv0_(CMKjQ&0S(<1G-?=;-dr%=HtK*{O?~&5Ne8lUrN0
z+E{C#)-tynjdrJA@9^o^rm_4?Bas+dS3Ft|?QB-&M-s{54dvF(x0ObQ%f-==#gCQ8
zn$`Z%5n@qn2inaFp6^8ee9GvbX>>H=V5kSRZw$~6m;h`AP*tf5lkGc%E(}8mWyPu-
zH1A4fL$Ws)vbxY3q%BDSMjuCF)Buomx}$J`5(=_K>}U~b^@{<unp}?&8rU}h=O$p^
z1niSse;Q^HFSDc3Fjn*!@Vdq(9qHX+mJAGc>OE6gyZfflefRVCYCZFM>b)0G?@gDt
zTr<D-?#o+#>b)Gj7kE*m?!rF^e5&l$=b^nA$RWf?mZ&4f&}gJC83tuyD#pOW^U-ho
zy}C}PF*H8WXh7c?YIhoq@k^>rkV0#W4{8xn2cb)fI%L>!*^|5dH-H8Xp#KKYe*@^h
z0fBgi4lX;PCcLgiGLlT7dU~n5fiVz6Ci4v0Vlh0?*n`nYT|*&#5(OtEtuwenGvx=h
zg1=*>ii&p+vRS2}R8h7tz8V5ynjn6V)g&Z{q|`Mwm4p$pQzBL`R4_MJ9DzVAWb-)}
zZ-*D8%I|XeY@t{nu=o^j|A8&yS2Jewhn#9Ks5(DnHp9>#vHkXaKp$wJ$R1VN{4<yX
zOM!Qwg~>XiNlR8@GZ?isqPCzhAx=P2AVx==Txc6|jLu1v<ig7@50Vvtzmt9!m&N%}
zG6)d-r5>S|ufPLpui*h05qJo8O|WKx5v!R72ceYKAx`>%2CtLfO=wtrsnZKI_yfER
zM0}F)knY7phVXD77OWE<Zh{{FL**Fy!UTJd(HG8u5%$;{*J2sem9dB&r6Z;xm{0^P
zA_68vGe{9Ip$G`?3GjZBvPga$2mXj9O?5fF(S1&{0f@9TXZYXjJRLA<A)5;^Nhm@P
zlr#arVwD6t!{0qxuQ!|Z`e@ngQUl>~%HODk6Fvyr7DvF_pK5Nb9y)&LKq?kbZO#o2
z<a71L-}++VfWzevrJ{uzEVd4Z-(?-1b*ll#;hpOaspXKW22&D`^GlyooXT6EZ%?r&
zB_0FlHfKQC3Tj5NCSvEbl1M&7=BWtb(}HIsfHI&B*aRS^PLq|wvL|RZOpG|p1kGkZ
zNLBHzVZ>r0W<$)47|r3GhdG15@#+bDe*#tyUd}^c3WsPa0DWG}1Wfhv>@GKuLnTyA
zjXUty_E}AZYRerBGz!sL#((iHcfC5hWzViu&FAvXbY62$VeZhx6&J^nVP}@VjMws0
zjxC{JVJLawMKg1EzUtn4{h?60@SzXxyX!#X#kYJo774`M0?$jo1koN*<}nfu!$(Bx
zw;B$Nxk#-e3wcUlDNk6+%i#*bwrCL==k%UUBOmo{!jVVzb)bUusT80eP$L7G=<HGk
zo8m#)|6t(6BxR6hKA_}?E;+?31#72b{Sc`yugGNDwmYg&VzM9hg<LlCn{Dk(=1p|V
zANpeW$<3Rujbt*ani=EQshM=t><qdW_m5FZCNeSc*3W&8WVbx(J&t;(Kn_Ff+h;%-
zQujWCOKIf<$=D&;t)+$gksc8})eo^Ws9illh7Bn`<nUMyJvWD*n?ujd2}&bzo+Pvg
z!jW#D)#P;p+r4%rfo;vqA;h&buw57QNA@I|iy|_6g3OP<qN3DUS`@5^@6fkMey$)K
z0=}DsP1tUP6ikL>nB^t+BT3jKgnH<esvfyKlOD6##?qN@TytW5dnB7F?rP+d<L$=q
z?yZ|QZQOWaGz}!T)6qTKFDQrR$IA0+!o@F-7jwzmf1Vy}q#gv3ah8F+)l~KZv2Qzr
z5-Orki4GYA+Jk6;AUb3a9Wn?s=|tE&e<ZL_Cz`AGOo$sY6O?73zy}oIwKhbefGS`d
zumwQ<ynrkbnZ=3-SpzG84q!7t*ev8=sER?kI|<%ZyO(K0{8RRjUk&q6Mh#hAt@id^
zySL}Zhf4lnyfS~Fx&G?y{r%fdtSc-iO}|IYzA_tA)q%ldM~@s2$HUoZs8&$xyH9SM
zyJ7E;umLL|5=oOTR^w@D?iz&jNHTs9Eg0--*n>#PLt52DP&*<qKtEstuoXZRCewwJ
z9z;l;k-|7aN~f-v)I?LMH0XGb6Pn{aXx6CDpie`=)c8e}9)VzbUNbbliADemmF;9h
zJK6A{4eew@JK03BsmLZ2kpx4kw-a$Gbc3JZI!u$Qkx`+87HZrIuYz8(#^kA-QG=>F
zpnS#VwqCmLPplrB;2XAfI(unq(@pisxh)&YhsQgYUdIny{$alOCh!VL%g#jMRr?R!
zT?j)7pm}(v<iRJ#*_Y2ih)}@IXzb}j%pqbh9fNh!c#uLliSKz35}Ij}$bono@jirv
zW(p^}JzwkS24*{i$W9OLHJ=aB^I=}bz(il7p6>(_<@Z8(r{uNLcH57;(wa1cFOub9
z7~wENk{L!27q%OOqckj$O;gZ2re?y;F=^za1nrunR5^dqi{@sI|1cARiC6uni${}c
zBsqG?KSg2i4P_QjrqeB(bu69c_bKzi`1M&VA85YZ(n)8IXVNYE{gYX&N4O;(kjx`R
zdKL|{OsN3RP4=l?>>3y+Jkz+p8qb999BM;z0EFMMv*UM^@H^Ur-(G9o^Tn@Wt*hay
zq}LH%2N6<lts|_TAFs<sKFN@Q(w}5PghWDV1Sq{YLCZDnKQ}(#s6r@ShRYc2PY0E~
z@P+=TQ*0JxS_h~;i}4v{vmic;^0pCggQI{SOEq>aUW~^;Ok~KT7@=9`605kg=D=dm
z@(AI2M2ZMmv~XNB9yzI;hfj|n%Q^Wpx)#b(Mg_`*=(F(b4(y>M&&zRcfD;W1X_h1}
zA<puT+k<{JLL5A7bv41kFWz39=#Y8zaS}4jE=RSqvAq839sRYnIQh}5{5v32sNrn;
zW{byVvv^(h`YxTNb0K4NK+{v)e2Ps2?=t|mW@V7AK?0%`6`_!L9I<BNaTJm(*)&4Q
zp2-)Cnt|k}5>kooC>%vtMA+2AiEa~VLYvVdtEk_Y`_UMAZ+DnNn~@5<mRJ`;6G^d-
z7#$Uqm>e0R^e#aaqAo$*fz*@<GG_P49RnOQN?i#Lv%%m!z1O`m3Yoh3%ZYWrBAaa4
zY^{_O0v{#8?-f!;N#S0)ZF`je9mJ7ny1n>-kod;#yHAEfOhNid)ao!8&aadWEXz)u
z!I+~!6fow)R`KKv(Q&4SXLu>WON1>su|;rVnnt97P0okY#5Wl?q6lMDb*;aznnsf}
zimv}r5@7f2!Gf*q;#aje0-jekgtHlS@qtJt6(bRrq}oh`c;*=T`9{=Zg#13J9;B;~
z$qv+Tb{;rP#UJjekB1UGE9>JyeF~@#1S%^cDxd=B05$_izMu-~qI|c4Xj5`us5DH%
zye=FLO(a1XGyjT(>euf`wC*^(&4J1FXf_a}SsF(u7f)AI+itr53sLdN;*ae0&6(*!
zpVJ=;9<LPLYRVTYMP0sptMDU<3Bm=*P7CO3^XzZVK>1fR8F>&zr2bPUoFJs@^=I!P
zlZ1-N9^51-A)(=hOd5lfFenq2t2<=qOPrr|5!)hpocb-5h{lc<!ZE-cVEr?vv2+Cn
z8)2s4!b~Aq7)Yfc{4^o@$ettS(kj+-_M8sCIUY)7Z_TDUipBKCk@>vY+BcrgO#4F~
zr#&(@)R4Uh{LVI}^`eLQKbX`Q^`j2Iw|H_pZ)a4SFA*5Nq%wGDd4GC<Je`1l5TvpW
z_%E@$i7lg!fHLYv+|7z{Mh+qsq~yQ>W8h`_P@?rGgHNr}e+;(t{Ck|xb-?_=NQ_Yc
z3Z)++jv><QPN!1ofdTscJdL#jU&Z*VLWo&_sY&J6MboKRECr*}1N%sfc_<FY+ohkP
zuE$W<X{^c780V_tuuXIVXR@w=S92qiT!Sdd5SmHcB{vRY9)856Xh$q03SuA+JDRvT
z4H}m*2>-ZO05kw3<k@{v$QwcaDJ_>68TG-hSDl{XCWyvB%MfN4dwDJtaBaL)6P&-!
zk&f>mp6VeD@P))?ty^qF6t>OQZjy)C@{V}g@q)_~Z?c#3^4eG9;c)z`i(l@gnB?O3
zIGF<D*b#3Va5%<L{5EK%1MqamMw01lbO)gv=yeJrn#$r1g;j)Ajn3-bUTr1RTYFHy
zN^u;b978=h0+bNw>E;^K7p-MQlhBAErEHqB%^)QzQi!)u`KY|qtE+ODGbj!OC(RfY
zlg9gXbB8v<DZ<*p-zr4C*QL{AR(oK?uiF1wPmr?ou0Ds)<+7dTe@8Y@8sHWpZi|l}
zU;KHm{Ksux&*C3~{gDhf2N}?bq3a`tkBkc#CXWDcb+`?IwoK3(P0$)m&>Cq%LAudM
zn;FrhCLEs2K~m$9YmvG{oESn@`%Kcuh+)$Bi7YlmqJS!39IypII(bQ-YlItZsq0W6
z=QVhJX4|%z*{$38&i<{(r>Bl@t0A13KEAd8$Q6eVA3b{b@D(4QKe@XOO?zGoiC-!B
z0#k;Sd3>Y9K94p873my{B&-xTmRHDIM4!a99OuUzDS*^#Dby$BC|*1}X=<F!z+HqW
zF+!Ah2E9Z#H4+I*Q%?jj_}GCMbz>SCcu4w6qYCn?m|JL$Vv>yO_O)f60*3wPdkZ(;
zys-B+{Ouhf=J#%0(Rhl_?AUhl(gTN&9P1@6!dq<V3XQH7c>EOGgpY0pB+ieWO(>@y
z<@5u!=cKFCkaYdnw}lMhvv^>(JF~4J$G}#Wu$ArUw}wfG=3wQ-Can+PAaRn7vOpj8
z<#UiEVfdURN#(<e4pBbhLd1k=j=zPtEbnrnwKm}B(lZZN;}t7Lpfvfz=r-R5ykN8`
zI(U0_$+}$KfJGEruM`yBzx9gAKA*c(tHi3=m{Toz1JSwBXn(mBP%GJlGn|TqM!ICb
z-`n1HsJY>Wo%Q<88#Zh>xvS309;@9NPKFazY(nMoxDp|6E<7sx17<pvL+B6i{~>K<
z67`t^l+NF-lc=^nCrZksKIBV#6B$IvKtXx}g*l8+RrEROia-jCt~gVi1ff>9xpUOI
zxgIv%JFPEFf|~oS=q)6L=uTy_1*rtm1x&6~qB2<U71CD{sGPKcQF)wLibdo`dZjd)
zkjPFx4rC6cpJfAOuX196NS5L4u1tnem1ief_2E62ctQ;tCp8U4SWzd(oleWHKAUMG
zlbMbM?YHt>$^LTYo|i^mjZsoJr|!P6vomA~*k3_{m(K%-AvO+vo&`VO!hU#)ZAIa?
z0p`&<=UJ1q6*ba%Q5bQl_RAq`O6TrV;5bw0B~y@CreKDh0^`*sn^hc2Gf5epP?LQO
z$z~I^n^-zQgR0iqR{NF{|0i3@xX%B_!T-n68sp;M7W@+bm#deCq`xp`1|nTIGOb%-
z@)X^ORxXKYl}cGmvxtRGBB}g#TiBnDaZ@zo3Ah~A^3nQexHjA0zpfU^P3;|Bzs?p3
zMSWZer@R5DtuM2=(F#{5%ZK*ec2jvXrl}&Co6Om`!>_ux7Yot2-{W+~%VVY5!e}xP
zu!pjT&B>_E<+sn&(m~bhvIQ^Ne&_|-Li!B))s(UkbE42SNiQMiXdSmvLR7Sez*kAW
zP0G>K7@WqKAQmDfbxmE}CbE|5wr1rQl5cmi4)b~Ncu6Z7k|3Ux$0~)cGWr&hZTDPh
zimR!pnVTGuAb&?N;xKWuno{H3bfu=2#!?x`#8<e~L@L#He<12Hn?2FM{e7ua+^ab3
zS1dlDLP;eC%Uqz>3&2kX*k6#+L^d&mD5d!s0EPgvT}%5V>1Jfjmdt}XX&x!mNoi=S
zbq7yv&6GiSt1Q(e!WMW73Ei|{N=j``youOQ2`QTC$%+WA1*!l#fXx6RM^eU!myro3
z3&=s73+h5Ktxyz8dD^7P_E?rQ!kgh6goy$o^WfA3x_&DA(rjwXcGYd`_P1lYVPa|h
z^wfqWX{31WB{wD}_Rl;Ad|@h6@ZTEt4A69nRrVWgv@;OU%MX_;qht@(O*2w1Jq<xG
zsB4uyDiP*=JSNDb&?TkIt5g}FDM1JLecCnVb`t#`G}~N3-?TsIvYH>UHB;%|CW*oQ
z;@e0drMb2C;sH<4*=KeJJp5f?TVksIo%~>rzBGj;BwF1xf!nBx=Kp6TXsvB<6@%B4
zd(#t`Ehi~R8d#)j7<pryhB#o>{4&TWOqvqepc+Cml6Q!wtWo6w9;D@{8JdXfX<Y+7
zf7@q;5U#p>b_*XO&VEZKJ?;)nyGMpSvwk;}Y9x%=hLt{t*QL6>PD|f`A$P!OR&0I`
z|05uU(DcnO4h?;gr?sm+9=}Zi(%c*~lAwbk=wJr@W*zot&~T+GiUw-Nh|I@&*oNlc
zW#CGiz!eGP!KL{St?fGl?FGp3f}>Q$Am{_S^dXYWznT@uhDa1p1&jl>0I1IpW{0{D
z(^SJ00W7nS+<S&i%-_;{wp4$>u$!Gq9t^vSX{*{X)Fv2^tSbKn9Ph@{**mi7*7gfJ
z>FkX#Vj$_aUL(_Ao=uN#m>W)IF~u-$H^210>v)HBqo(Ql>-m^8Uwrt_^t8(^>l>A6
z@A*rTc{qAMmU08v4R+@l%$UeEq^B{vKgd$RgpU7Jd`B~z8V%BGpIFIv=zT?I7MS${
zF?z2wW)TLEI=GV2sA92m*LY1f9s_$w9y1+krPHs1)0=t6R;3<K+>lANY<JAjwD@ym
z!Jc~^IF6vWx4lh<Ke<&mAzs75ZaDTvLFYvMYwUfr-UEzNuCMwZulJyN=o0fuYVyfC
z$1zdfzbtjIYol}#LA!bgT9f=hzcegRKX-u;X>qIO#fin?Vo0MIY%VQ2@XUwPzFeQs
z;f23YqUja}Gp8Ejop{o{_+Rfxq*@lPI3wZ3kHnKUGq*m>-;_&@TW$_U-F=BrJg|7@
zPP%?YAnLXxLhgu-zk=}e*`@9LeZW(gO`d_FR6%z##&E;hK=(N22uaT%QJ0}zNpT}a
zg+(vmx$sK^ccpPe4!r~XCxLJ{@K7$lb*nFsd+37!k8;WrD3_mmdpJ-QG<ss`(+aK0
z3DTMzIQ8mn<c7%RhREiI$mWKy<;I#EH`e61u_nijH92mq$#G*%jvH%o+*p%?%}r?u
z;@=|jEdZ^_aiff3Y6Bnos^JeMSA4@fRJp}sD`SGh$x{}4g(Ax3?ub*3Ct}aNMMSWD
z9pUEz;O9nxpLscVM{}fl@6kjWqq7*jM<UFoAx!GE(o`;OCW18xSsT06Z<m+~__l7%
z=N?k#1D@x$09Apoa(S6hg>szW@8UmJ-ind^>i;*^FU6jPM;$HlBd02AV1+s@*}B2E
z#5(#6dF;r=dk<mrU8~*ouqzV5kKKwb&EL#FU_+AI`?weXVSKfkUrFU&`YuibdC}4c
zSa2BY$fzcAksVC}(K<4-wth@sPNp1Gy|(AxX?MHr%E71OLvEkfGvuPpPC0vuZ{crH
zE&{#mI)gsl^<=T&A_6D_+JH>}L&(=0sEtPI^+|D}7^Y{@Fv4BBx2j&wFY0q(<!#?f
zY)+FU<59->VYl7hXZ@~6!MfW%3)bB#thMwLWt2Yye%oX}B?S-GZb0Q(sAJENbwz41
zr!k|BbtZyqwD3*hmR{r|wS_EwG{XWfI?~-Oh(rKoKpU_LVAMu)PJ#=UHiByW#TXwA
zf2K2}p+HKdPTM0w;Zs<JFU<raAgB?PYy_g>2t-BcgY7`S9uZ~DBl9_z=3^x6j)N7@
z3k`G4QMG6F3ofxx!P<aasjU|0KOw_vLyg(?UcU3dP1lT#U!?Yz3;uZG<W-&R_24aP
ze_(vNQra+nZ95h9$2%7+Y~Ag!AM^&iiAZ@kJh-90&ul3bVkyk5qYW}>gAR5VDX=Dw
z8f`#$b^x~y;MqhWu4(+2%h^amA45v=+0%H?AzVm_4Quwpe%KHD#lH#sZUvA$Ks`h1
z&^in75qrm?z;1hJ?&n4W8T?*rF@+uhqon~rYC1k(*&&7k@;5){+9UFNRoS3uoE$P2
z^_DCmxrml5q9u!HNsP<jss-2>ipUJH5S*D>$1sth=aF`)@0d{OU?NMdd<ciq$|qCX
z<?LfRb10>*FE%fl&F5z?ZXT|`Jldb~uNxj-=TG&A!{l1>ZVbZN&xF<Dx=Th!_s-<k
zSAzMW<iw^;6Um`GZSo4ARkTqa{iN~V@{`g~Wgt^CcN+<YQH&<S<jgHPkqzTj6i@|>
z1GWID0iTbb6bM##8zFt$gH<+>HQl86N8P1VP>qM8uJWPOa6Y(oLuq^<=MBVwh~~`E
zg>re}@Wc-Oo=UN}E0qd`*3+gC)7wMXm>?1!$c2k@mo!KB&6Pk6dEjRfG+f4Ni=><}
z7zf=tz(>fiNHmLV@PZ42Qc9xvJ0M1B&y};~y0M9NO&QgB$tZZqDBd~>UNQ<^GTOsS
zG)`gA?keV@De(q#>7D5@Sc);RL)v>qC&>y(vLgO<@Vgm6BpF7-RJzP%NM^P{%#H%8
zfN{VU0A()1(O^hqrU9db0Ymqigvba%Lkit9Vr{wZ`=E{$Ov^}_Z=pHYNBl0*YqqCi
zTZf1C%oGaKdxkF@Uq9SK%?cLSWmHdK(FKE5IG=@|(B9F}OXiC8mo08xLDFb5qUjp{
z9Ew<Fe~9T~v=?m()Q^(tMnkYC@R=G?Xaz<=Tv1J`UCm!xEn!f!F$I4H@8#${#J_2P
zz)~^EwP{vg0Xh}*bp?o}4M4zL@Lp02X<-Gd!jzSE5{Lq-fN{VUfUrBQP0(^dSq|Rw
zSS9-I*lm@m!K^0~&Cl#>PhUaQd~~LBXk8&!UVM^UZ3~@iVozQdPy_KuxS9<TF*kv$
z!qkNW*}#s*2(}vJ(D<2BQeF*}?suhsvs^%LMOk&;oJ5>FIw`Hy#fydpgE)=ZX>ytF
z#S2YWiONP%*(fSYrnV?58x?pV`w^K#2|opdgTN215tDP&Euo!A?X29=yl13s4Fgus
z5`L+qXhJxYl(&&4GR9-Ay^}Ljv1oK4IGn$l2<_@4^t<?Dd4C(t<HJ#JWWE+iW<xQo
zEcTHP@7JUwZzl3JF^1)rrj<$lG~}dNo{?TnbD*UeP>oqo%{r7`_Hdd+)g%Qcdbbm8
z>O}8$qIb(R#WToC104xBw2M^?FCudj5eGSvQJfH7gxb=CCzVv-=&4Q@{hEi9L6+L2
zuaTe`Xt2kIl<O*jPRYTE1~t(hYx_Ww;W{a^SP@YH6+j2D86dko^jCCyD&L6M%z~y%
zpTMlNSkJtycT0y>A$AC=Ci@>v0UPW9V;(7(&`fx=r?)?M^Q(7mhjp*jpKqkxJU3q+
z*)y3d%v{{uH=Nu>gWpYo++d=;u+UBn<^tDVdnA)r({@*~Q7}6#p<s4u*YF5NyNMX~
zl4>tLF2*_X^&?qijQ!G>`!%B#4Vz#ah}P%f;PDSSB$HeUsYIO=)(}#!kmd)h(-$0&
zn$74RHIgD~J%Y!o7F%UyGF+|KG9gmSoyU8POo%jnN)v(lG<^+^kq|<Lk`bX7lX0YL
z3_(YsrCT0_dQwlSG0l*ookB3+DhjysZG`qje;|+57WyScF7>-g7w@>_S~=bRhR(P*
z)gOO@Hu+BChbQpanM?M6Nc1I~$EZY=N1-PSu{X)xvbt+29Oy9)^cV+vi~~K!A?S^i
zEQdgH8RlCs*RBJHrqLN>-ypm<XbpuX&ZQ|KP2$`cn#V*BCVrg;T1arFK}$}fH;_U@
zBlN1?88gtSI=X5Lg06qxzx8?45Cja9$rTMlcQ;>^6ijCELxR-^hrTx{8&ajP)fPyr
z(Ui~J=T@(S89?VRKhPYB6gIas!`~zDGRz)ch8MU4L*8AvCXj|-9WO=T1rDpIkFl;<
z<H!aov^h+{5)4$(q$5_F$e}9(tYm<P4ElQp{XHXCw9b+-ysyAbkhW~=>D-_j$*X}g
z?l+L50y!S@BhOwi7gNJynRFpw{sY3$QgRh?p8Na1&Xm-sBT(#=c$TmeUOY%+RReT0
zfxbJ*-g}0|Y7~>2vI43nGiw3ic$YzHCR<~C(xfQ^8=48<5T43JDP?KGj{_;^T<lH8
z-ngbQ65pp1wD1sCq@b@&;2!PA1BCT>QPG}D*lou!O#*Q+O|IGP!u}3l@Yz$D>$0g}
zBv}X+UX6|HFm-q9v@f)4#_8WrMmO?D-0yc@#jiB`{kd=?6ZM-dYN+@q&E5?J!?q)x
z<9@HM19<(5@1^DRz@^-K;FT!mc1dZp!bn$|RtcVG7b~S&q`MjhjmBRw9Q#jGYu}%`
znnvBl57O_|Qk)Afa=k0?cT?Gxet~wr3S;d8&&$<Uv}jSTl9B76%H6gn*@0|b5rm|(
zml4vGqofIHhl(~^PB}Mst$v!vut5xS)b?{dY(t|TBZr0*gIo-E360bA(vKm0&w(h&
z3@1k1)f<oLk|7BMq)8ADCuzu!FpH3cg0<*tj=2PVb=7-V_%wk?($mUop<9A)f#ztu
z6>MEhUqY%>My-u_VsEOVreIS{?9n4PB;pM#-P#cH6z9g%;dUAtl8e|p7N4xI)!w%(
zhB@RPw9~3LXl~ZAdU0Tm_D1H=%`xVpJx6&SG93gQvcj03l`ThG4UpYhj=wZt=0pm$
zmK*UV!URIv))IRug1rTCMN{Q8CWnzTfjHrbw*I6zje8VUF*Ps<U&eTMY#!<IhE-#P
zHqBu)_NuYDmszYdvqKO-1)j&)ynK2OWyE7x0uO#M2);o!>$S#aA>{V(h;AEpM`qR`
zC(HD>B~>f8Ex5Q1lNA;km-i-z4(-}b%cS78b#J>p-nv)DzfTQU-hBBHvAMO>Z#&SH
zf?%vqlIV$n5x~$&MPO6c1!(mL`A>qFX@58RN0yigz*YbeGpWKEnZ<%g1W*RF0h<7Z
zsZ7%#)<SxBKO?I!r-aapLl}@k7?9+CMx<_OGO7)cD1g=-j{~*<gzwf0e=YMesZ{BZ
zwls5eQ@Ol}!iDnU&&Wiud1`WNC_nrS(v)<K3E>mr;z(+8`}WDyXc0RT!YsZti#5kj
zL&BS8i_*KERy&Z8PF{MnvkFltc`}pDid-o@tY6ULEb?T5SJFdi{)M&{BHy5<j@KqK
zH}O~#cx?i&%^sv_4sQn1j5VVg7t;8Y803f1`$}SvH24v9D=H!_kCfhA<Op|8M+ho?
zf{ml}(t&1J)PwvE`-O>k+3ZkPaunpLTd&HMaMJ{{mF7S}5-0c2DDX7>q=e?596czk
zSTlQuD;wjp)39Gfg%wL^1^Y-6ppk-qpq+_?3iEm7YwnvZM8bFRb;+Szkjz=RU@%9E
zDD!BaeQ2M4IFx+fSOG!4VrV|_k!h6P4m8-IWcg4#>4Za^gL*0HqSBB^4zB0fQdb`~
zHD`9CZ8R0kNYD&8qHStun?BJtWW)uZM4^aWTKZVg0$H~})-5zn3uN5_8Bke0Lb8w!
zMltaim6o_9tz|c#Rk@NQva~X`n-$R=r0*9DX#9W07b?ShX7Z$89UM&x<6@G=?9b6p
zlk_rb522s!yDJ<i%<gMa{`rE?u6FCK^D*E*skH-4jKu$^fbnVA76;f#xjPBX(a^NH
zM{Gi(qfgs~*ua)Hz#0k05Ue9iCuXv#5i!$SQ`$Z)<PTdCGna-@pevn9+bR*R-2c=X
z=JyEE<cCz<Qkdc=lB0(vN86RO7Zwyp<05TsZzdu{_VAW=t6oSI9WKWuZx!R*g-btH
zy!;Dn9s4=_>CvlcE7m!!ZOG|M`kx>jX_KHt@;VWmG>8rs1g!?q<Adn&v=+5@SffP~
znn__89Ca8Rbr>9V7#wxDhdF4fj)AaM21CtYYX~tjB=^inWA}L+R7hp2>%>_Han?bc
zbr5GA#92o%V8o^whVI%6sQbpITTmit$62}FkH`*_4df?f5=~Hke=-*JM&drd%V{6k
zS*`?16V;3N9zDE%A(*O0LV;|tk*ij{+2P#KmeJU?SCzL|LW%f>Y{Kph*alJ|at^V$
z=BF06hohs@VKowu#KS(H-E6i7vm?bVyKQJ9&|-DzXG&4o2RrK>a*oQdcM&)6p=C&z
zwIZbcPoW_<^sb0BOk5<Zkn~2qkTh>v19?vSiOf0z^3>&Ji89D!dLLbB(x&}PXOsdK
zF{U$(bgB@4kjV7G)L?wDlJ|vD#hKmp*7k73hHTUmZwz_ksqBr!E?+)8h)v0`*L6M>
zNXFvxb?3{0ha66uAHweMHTGpW0+F9o4Wkm#DA^2X2tSQMzQ!_w+Yg|2y(1gRUc|0Q
z8X%WGQlj;qylPC+Bx8dxS8aK02wZyCroEHSiAE}&lO;vzjKNIG%!V8_Lwog#tv{vU
z3j!p%G~B45r~VR>(w<b~(5@Y}u}tRDL>gigtxUNzNs?})v<YGo#+>j!wL23KphzM8
z2ymE!eHpv@q8D`irZh##sHo;QWh59CB^iJ9f(tX9qDbzbXb0lyWk7{E8SM(V!cl5~
zuW;2c@#`&4PuL$)-8S=UsR}Qn#f1AWrRYr*{q3R$PC-^zz=`eJXgqB{^Nb7^u>n0_
z`ZnrxGwL*kb6_-qLYt2@s<5gxS9xJ-wl2YD^bG=}=uU&HZu68)rK>lm@l6wRqw>1n
z<ua!*s;it1%gD|6yZ$NIN((JK#D8urXR}4~EXfi#lbx#4v_>+tO@paj>LOsqT*_uj
zwuxdq5{c_L`1jLljBs-L-*sGo<0t4ig)xj>{lLd8POQ=Ju}WEJ5)W<m=#Kw0pQzIq
z7qR0K5OEs5=rSg0fyR*YdPSWUe7PVVrwJR189RaW_(joNV?{gmfb@3o9{5FBuv3Wa
zDcFr)?I13#vsmp;Zc*PhSroWM-7=Exo1N~<jGV}(S|+pUrjuf27t%AWagjP<wwtef
zsql&#t1m3n$7n&<i(kT_evH*;X6U-jZ+JQJ<kZrP=tm747NOx-^V~3KZq?AXYNk<>
zz93r>f7RD45R0PiDWo_~#!)iUN_&O0vX`JJmVt690CpGBNQ*QUDJ>IjJH392J>8El
zQs??B@Y_u0%k;CO@xaRN$3H=4XcClYI}r6Kzo4fB5*}a|#r~e3KxvNCp3^=!dyqGi
zPcyLFP;jz97a*~cD+TQ#EmvGtyLOFL>_+Rn=!rUCB~^p`n!r*-hoZSuxc|!yNDJZ!
z1`J17GmwKl7+w}{G%0~(CS-O+0*jxYivHlCkxZ};7d$%^``4p+IB90KzyR7el8paS
zoy}xs$r?J6ivL24w{Kk9!v9`bfX%LXhBP50lFg3BN*YZ_2TG#>$dD<uBf2Bj5x2;T
zPv5eWHba%ALZQS?fTGmaw2An+kRpgX&TwwVK@eeDI9H4KN;8d?!yok|-8Qw7$zXM-
zE8&a=-L1w<$u}4+Mm?rJ%nZf)EJGt3sx#H_fZJ>DGnp&>!{za6)NGDc#>>O~MXRaL
z=JgJQ`lqY&Xs7>J{4ai$DFm8{(bS5*FEy3iO=BSKGi)ZoQg~ev1^M|^nM6EG@JukD
z3z<GZzrWgzr|~|*(f`(Qgq1%S_T-cz@C4lCaV>Wqq&Wv7P_K@o5WXbpPY&pCL6c2M
z{a43VN34aV#hUO~Cuf2b=T}5(sc1A6j(Pe7ii#-%L5khy28vt)Mf}LfkVRt1<N><o
ztJD3Vff!t`1%@hwp(-#GPKKO)5=UX6aRcf!%6_0!_{(5TC}}%$=em{B#o!#OK?0LX
zK46+%dBsG&wlZZ@?Qdri?dFIY%*G>5e^~7wODE|%lu1M!fiO?|a*2Q&Wp_IxAzwb>
zr?|(dQuBOv>8Jc&<rox%1p9L-^>ugOU&}M;G>lR3R}$UJB6q`DYm*b|P{u@rF$SK2
zOvKT}s0~f1qEl{gPdn5(VaRa8kl}<O!-);<o!H>si4E?Z@J@DOgL@}7xOZZMdnY!y
zcj_D5JF&q%W)x{Tnjoqf9u%t%)P&qS1Fa1j<1a*4%m;Z4vk};OwmDdDwd#Y-(PS={
zH1ip6B;sBC1pmiEqfsa}h6LShUizA1R_=z*v58!fqz@|e5eqI>?>dKOq{Wk2)awjp
zlJw<aBdDQ*MpTFtsUV<1Q2uJq40&n-oG0ayB>nK02!FpL9}f)rBhLKp_(0mfekwOw
zPP_f#L;LNfa@96~U3OEg?RA@}ShH35ck<cn=2jpu8ORRC#y0pduMo;l+OJC{l<Tae
z&O)Vs^LWvG6qm;_&&hT{Cu7R3>=Mq;;LtrxvY`B;j(btZy<nt!p-An8BDGhj*G**D
zD_Xt@lOwGaqrK6ZVw*#$%+*oZI#}?GmQx?H=1B^e@7Y$-n0V3#HBE2;FP7W$%5zqT
z1DFM|kb*@@EQ)7EL<Lj;9l&M)sf09m(J~t1HPhe?GZ^6KMRDix@Gf0D+Xd}x7jEr>
zcD4)J*)E}-anim9q>m+54#}>j8)&2@Ku*i*XDEnGeW&CM23l5M!J(~k!6tq04EkPg
zw%Tm{!*(~OzwGcew+C~LL<k-={y-X&5jGDF-3f%ePW!r`zvl5AJG||n$rMY4+}6-=
zp%!rQ{YhAG@@{`AjAa~7yE71Wcv7m@3V%h1-Hj;>Cr*=3rPR?BGL~oK7hY5!>^G~S
zq;Ig2jm!>69{PXA{_*7Phn}Kbg$DiV8R%BD7?f-wv^97Q?WhxzrX?7AbZYaQMuN7L
zf*>Z$@1n7(U#1X~jJDTEO(YCE0p3qvk})}7LOzb9Y0!Q_($0>>+@K^Fryw$QaAzD)
z1+`5eBunrtsBT^N9mK-ta3_Uu0e6Hw0^cFkR!Wg#Vt<92qMx-zGtOdto5-Zi9SQR`
z?YbsJ&&uU+H9v`I2<5<jrJhI}PG_37RI^mtU%0(gdfUcqdiJ?2{LVMNt5|$#?m)5F
zOz>Y}4g#Xq$NzFHt*Ys<b*0kAQt7r>s)H5v@!P}|Z3z!sz>Ad;@P<*Gt*LcU%?1TD
z%PvaZ)^x53hrC7noMvaF)sX6Z-t`G(phm?bHH2hZ7#4~gsVkCcLlMRPzjTEY#^6*g
ztyS1-Ay0e0Ya%G$<-GLLvEf+U8F5!K=KNNNuYcZQO*H0*#zsVHHEp);cKG`*DCQ3B
zPUXTeC0pjvfNyBFzP=XH5+<=L{Ng{;csRH8u#$k!^ej#z{g*S~FL2Qm^_)g*Jz`)$
zc0^);e!v7^D}Wf#denlUHe%mV3!bG-%*p^d3Uw2JY?O3BR!49p+BXay-=HND$!X$V
zF8`B$6=XG_`I<b~X&oP!7SGi24Ee`NtHL(iCtL0Au8ga(QNv+abG1MMZIdPUIF&|>
zrXXW-Au5p=FLve1Lyi=~l(0^TqfXi#@+=~*hvSdr_(k>sSg3?owWR_x))3fWg^tXj
zLsR%?Ot3JGXM+#tYQe}0ONG|Mmk(62J}}<N249!!52{B++ThmY#s@<gm&-Z-P!K)<
zuGpYAU`<?E3j0RAv26azxjh3DPN&ZtU6npK*>b7H`Z0GJ=MA}v_2X{Xs1?{!KcZxm
zKY&O$%>Go{O$&XOMqv{$WdiQB10^hoL;z(#8?XsLEoehF8y*?OBmQS)*VVf|86@Dg
zCXJF65C9$GRRIB1Kmg<(sP_}&JPNsqGtJA&sh@Lt#}1FIql4c%l@8eg)s9Nba;&Nq
zh^19G9Wg;bUaoR9nmUll92nhSpPCvxFnTbPIXHSCJer+s?BDHA_p53@b{kArRkfN9
z{QH5%#AE}RvRPzmOinZoG!J<LxkLYfT!DbhO(FIBpW!rE+Cu{#>2lY7GQ;aNGuBjq
zW`Q0rhzCB6v<4K4FfH`Jc7;6cu`6D6PW38wPnz%X_&#WfMlB!oL5)<{QTV}sOCdk_
zD!cD_c*0BGptE6eHYQh6y+G&mj~6SEHKot!5SrOnBshsOP!AHcqo@luBF7ZKa!>lE
zmWJiuXcj^9Uj99Cu9ftzPkWV#k7?&zY3}xXVx_x1obMHLpY*;Lr(O{*-pGplDgL|Y
z`a|sR<xX(416&9tl59jeZIc8^8#`&9b7a_y0al*Ip|f79lpBw@=~al6ULQex7;&j0
zlbg0?F&{)X7(_Q1L^l{jH=rXTqzNF3M+Wf-p}v5S=Gw^tkK!f7X$F+;HxP%+Oy(G~
zSb;%eSPF@Lgfs;vxC{8Wc5spq&!Idk#B^3CbN*>l)aUT`U0}6d&=;`#qNdp^`j)5k
z%^b2hd|`+6A-CP>{%xy0>~mP}y3>IZ*Lu^ej=QA%^L60)c7f-%+$&HnM<?Vc&j^0L
z7Dl^OI%^d;f63~Styv0=Q>2UhrFt3Al3>Qf6}n}>*%fGtmHv<@18kl^D`-<27BvbK
zc0HohZ}!D}4qxAeR_ld*e!DN$H^YxPtiG@v*l{@B_gNibpUrV6?X60C0j-A*6`jwx
zk58Y0@T*|48I9tYZP5hnAh1F#kD8H&<^_b(ca!3@cMgp{lzIv75(Vr-xDV8@1@Qyj
zkw~-i89qjRqyzNzSOQng04`9Dg`OO}4)UTm@1z_%rN0`fSyKXueJB=q7m7t|D$jGY
zj6NGdbWQanuX-}26S2w~(>y21Z8d~j5pDxq450eX`KZ29f+P1p;TH%hrU6k(D7wt1
zEvQ7M(h9dQt0w&!KHx&e8Qalr+dg(_G~|nzYxzJXo6Q6QWG;Ihna_9=b|q}^P0n;`
z&>wM|`^dFWOb!djL%zQ~=KaIAs`A<pOl|59=m*YCKll#DR$JG<&ZT}CmNnSuVZ5ii
z#PcOxyb?p%zZpABOroY{)R<0fnnFAPu0$Rvw8WR@=A@~bBx%}QS7MK7W|W>mXn32Q
zpAxiXCWb|G)xJNyMsuUNS1vb}1VCpwNk1Xd1Zjm5wQLM=qG$3d=m5rhS`mZSipKC`
z9Khm<vo)z`sxKPIZ`+E)Y0s)QLzDR44<9axYyKyF{$g%f+X()&^j-F+%8R%UYV6wU
z%!F==bIN+wnR)E`Iy3Hz)|@_%yXM5s(VX43^ke=FWiLz-*Yw)oEU3K~wI+<vfIuP6
zg+qk4yjnFmziJ_nVZo6zTheSSHy6}xFJoQ*Mk&A>Gj@J{BAHC34?98;+hK|wqS&EK
zC>9U$b@6B{ek>G?1&>i|@#EB&QI8+-e?~n<NJ^kR^k`n3zAZ;<3bUw(4Ix?mC>-wA
zN82UJpeIc%HWG|EHmSi#$5&EEXyo-Gv>>#A_KiKIXwFk8DVo_^j$b4U6Kh6C??$wZ
z%(~RWKh;xnXzhnqV&Y#=^TZW|j$<*zUa}k|F9ANDVxQ;t@rOYp!_x1s>lM7#p7pRt
zVQD#rlimXjV916U_^F9nZNi%<hQq~#m$zyY6E%t<Mc}=$^k>SLaso>3y~f<96@8!Z
zLNmT3TF~lQ*u>Dw29P4P6uDLqS4c^ATSA+wFjRAGnph~2AR=&UYF1-Tf?U{W9?Xr`
z5PPOi(rypB7rgF>4MEvo@QY2d(N!e_)x1ghf9i|BUQh~*I~`sXQ^RAn-TUA4;O{FZ
zXsLezEU+35@t-f+tpOj73COg+={me=KURGZ?R^a!Jl)QJ59s@E;Cl7p5npR$vkd}%
zVXiTR5Do%3>+~ppExR5p6tW1cZ?HaSI;9IzoeNT(3w+oGmBK|T#cALfy8{440U&~r
zI3;EtAUSpADJ;T$DOP$~+!j+BN34=4dOa=mbZbYfx?!nfSK+(g72mD0izEe|^HfH;
z>QcHD67!HEAIc-oYLwPnlAB4~%%WVRAkrG@-t%9ZTH3NhVc)K;Or`SD%G8hH`f{8R
zD=I)|#O{+TRYmc!QdJY3_1d5=H{jgcA45l>qx>G1b<s|~J=>u#<l&VN1lv;=;FFl2
z#@Y-Gp?CKe6KeOHIwV)(3HE7$r)4<N5!H*l_vm=Bx#ZcoQpteQfop2$RcGnqXkD|l
z=VV>dG46%j`By^j9AaNFbPOjvY{(^ENWW{Hy)8RDIiQl>AO%3V2n>%{Fm(|DlmTtP
zCIIOTq^T%)glNK!xLu1A&seFBkmN{HjsI;uLkh%F$mrEGNO>k3`$_>>oYcBTIv-gn
zInRD|Wy;#J^j&9>uM_YOm}Pf?Z_uu+UpOP?4XA&g!5Rw%W@n1QmlsS%>+@@^ToCwO
zYmz~<RTNwz3N8@^m(ULrq!k<Jp<U72PExWseN-dy-fc$&&G)YBJ?}9jQgTR89~TIg
z<6fmFUh0W|tCmjJ2%Z{{kpX_c9-F2uJ;mMSA+s)h31<;J0(&Ew$A&Ofu#;VZevWl_
z+kh|H$NdbZNfowH#I8YXmxvui?3jqHd9J(#Yh+fhnGqOX>s)zAzl2CorSR`XypDKX
zPIGMp<~IWK8-e+a;LjUD^5RX~@QH2c3)|2awxKU<lQ--rVhqp^m;h`AXh+u{!;NFO
zaSS((;l?r1dk*4zFX}epDl7LoYSnde1%_zE%PHY<sSJ%_XxS|AKvwSOeKh?#@Wl%t
zE~6e+L{vZp&;e`)P@krC=A`{>MtBv%3lLrpS}?89YI={XCj%B4uk>T-)pO*fV{MFu
z+zqAoJ%h{6s&7@oU(ipnzt?J!ht``B9F(WtSHj^6PQ4#1g+EUx-qXqVS1fx04!i$6
zrPAHA9(2FC=Q#T}uQ=;I8PDb71ZPPHG2V!ChJJwgR42S+aH@vh+oj!s&Z-x^c&&a<
zW?ucAAu{vgKz3>uIwC0oC<EGnO#o^aV>O+&MU$BAAgPZe5nAQZ-TlCdhNXYBrnv*y
z3?PrhWhY&UIdaXl4r96SMkI-mxN1ii=>Llj7NP@&9*z`yjuz?*q~yUu#||BU8(m6?
z<m!X@++h8|TqWr8g_GL3LZR5u>QjXv>+>Jrob=yAjl(n>(+7D60xX@jMvM}&9~}I;
zMmc`hlG&z&tUgoUclZwuDNd_msd<&xBKIfpo^Ocvq)vmLT|#am0n$U~Kw|~6CJ=WG
zc^0d=!r$N5hhwA^n|X=(ls7BhnnkfXl|$OzC9mPXg8#vT(9EtqjaPW^&h-h=taLC9
zEw+I{1dXC#pBDxDyeQb`MZrEV3if$Xu+NKveO?so^P=ecyeQb`1#%yamMED@C4<L_
zW_%&V*@@1joiHR%97hWX+oQ_AU~xMX%j;inQ5<f|Z@B^imy$Eva5DD#^@`7CGhb`R
zVmQujSHk>j%BwI2-9>wMB=j<`=7pEw_LYEJ0Cxi(0=yIOA;6~q+TJt{lo|XLWp<!|
z7-*z=L2Tv>G);YToh)wZ7Iadfq%Rw4qtB<x;{_qOO4kLsU^&BKEXAo_LG08Y@}+CB
zSiYkMy#bHg7WAcR@pN)rId1B6x}0GbcGR$WEe^LML{Y031cI;Mp%nPvDObT}U856S
zrMyfUuD7d)X!;)14!P+T3I*$9SEHtxdH#2H%i>cOJ2nw(TkJ~P=5*T9;)lL*qvGfP
zsyqP3eFgbe;tWek2dg*Wy#%+f1l$6+8}Ja|oq!JkJ_XQlY6ngsm;<MFlr%v&rSFiM
zi^7eH8872FM(|S{h)~~`x4E1yyC*ihP_JX|-{TAVbIPHh*^S)|LzP@8l&ge-Nr&9G
z;(Lmd-=Mtlf2zlPuNqHO%E@F|xiDTSCsJivynl;ggMNOekab=nr8ruu9YtM8Q)FOZ
z7M+2urJ+iLOaNl2#^>yatf2r&N|P*&gmE%r5W>RfCB6KsS2Ve$6pt11@p$RSh!hKm
zD4U|?QY@J-#<dW*R@i&^Pxv2WGJ#}{+aR5z{AA%KGM06~HR8071u3YSynHr>Olx~c
zUlI&Hj=ID#!pAYf$1%dwG2&=pnk<#QhL)J7L|g0LJ$hsJ9=!RUP;oe!7$#+XI6>h;
zDIPBtsYbWz$;shj2-#BclDLQW{@Id>6B8NUzfF!nbdCb`48aL#{!&HpR1{A|@l+I#
z#slbfVca6WI<WyY#t^cZ$>}dRZE1#kXr8n>orY}M%ov+3j5YbV+i$Lp&Q8WgD$$5F
z7)|@@BbH!oy`l`2Y7M(D=nUWt<NlKAg@pHa@}Daa<#z?`bk3l^%2UTrqZp7w#5|`8
z`q8Y6I`1a8B*`>s@1-se_wq`~n3$>XA-4tdzh>7v6MRsMK9*G8=(K08xN&LX<=vR*
zZ$DZ}a!?gSb?Exofm?JyG3=7P+yoA90*5z&!_zL@XhLc@X;;C~<aBCWTO1oFhRG&>
zq+0C{sBVA%wn}|rQ_`E8EsXjCj(yd9eGeA=arPR%i1FlMIi83;%OoH1;A<Xy&4aIb
z@HG#{6A$=^2Ykc>KH>o%@qmwbz(+jbBOaZPc)&;S9`F%i8zXE{5v7ZjKAvck2k;J-
zl9|vmE3aKPoVfjdw{l~j9mC1o9EKBn-!%@}EEW4;Y4%C%Ri<$%+6Rlc6y}48iwYNg
z?0!X7$%xx7O_B*=kwkkheFZ;9m3jDZUc#$#)?ou)aE9#$zNuLaIZ3W=B>OD!Z`!qa
zH^MoD8xUTIkXEzqMM#SL{;ssFxfvTuym3r5UPWsDs=cOqcN7pg44)+OhT@<`Dj7NK
z?L>_H8>Dk6sKW~Us(=ch1K128p-fjDn#g+2$zJS|fjUsVN~p(fgnQ^3@rw{%3<8%r
zl|-=K<s#S~M$XgAE*MdR(j{4Vq>^_TdMEkwuRbrTf+rPwFdh$hlZ*e*=Z*OtEqEc{
zIBc>z$NIcczoUuE8vsp5AnxOjCB1=oJa~V#6!H5a<?8+anV$ZAT48ZZET}jlp$_L4
zz6-LKjB@xghawIo6uX{gESh&&2V?Pz;<38*Ess5oy~a%N<+~4i8r}w;GX|9Y(HZD;
zitrnub;!_az;#rFbjUrVBJ_Uv!@|BO9YjQbTx)R;TyKD~ja@R(HhdJ;#WoslS~TG(
zVq|BOBP`Lbl)2<_eYD{tEfvE@Y>1G8O{aN}1GWH2P=+)NrI+lCVlrMcG@N~-Fu@dh
zI!BX#&RUDcOF_RazqPP#%cYlu2GsdrHl6YYBZqbmP8WTb2eY2~@JwPzy(;LmExzCH
z=a&wsA$K?uS=X6dZ|<{g#?IiXKV9}0#)=Dl=5)O7^ZlMTWpe~lnjEB`^)baBH&*qL
ze~1+{WyQ!Apb*ui-P)wxb_RDl&(dC7R^gRG$1fPu>#H{M)y%n2HMCweNjm7Hrj+8%
zv_U)hXESYWF>Mt<4%KADr7zN#^n28U8%XV*fJioU+NF>1yUsAD>*jWicfoK*<V}oB
z_6~VgNZJiUuhY5Eb7sg@Zl^cmvAtp0*&#=Qwz$XPw$}etKSSi^^|pk^<1`<9w0o8a
z2Ee6{D09l~s7ip1b1w)D_@mv|iQq<1>JiW=?QSDz(+oCd2KP4qKh0eWcvQvppSzFj
zZnDYlW}nGEvYXBBhE1|bc7Y_D2M|I?AP_<Vgf{^K1Tnz`6ctgySFN>*#aFGh+WJ>(
zty)DSimh5})gtx%z(>_u`_x)rf2+Cw-<i3aO$ccFef_?F;hS@3Pww73J9FmDnRCvZ
z1MaN__ttW5K*|IkI#&-X1|@$a4@N~kFoCj6pm7tZ--HF2JQzvWD{f5LWt8|zX|ARO
zvPmN*SV&_uATco@6m<r>9zofpf1*r8<W;BQmS1`!1&>7rUCcSMgDOYyY3t-fiJ(-W
z%tjH-6E|Z*K!T@$c;xTHU4_CCzGuXy-$Z*C+BinQsrXoOw-(yuJEcB<L2aucD`7?u
zwmF8JunvC6ZcWijN)pkS4C#!<9FMka1?7rpsFR*CuU+M@cGns**RAp=y-#IjIkOGA
z<g&{tV}v)Eg;>6Neaq^L=_8z`K*CrDvCd?(7Rf5s6tc35%%PKbjYL=4R1QPrQ}N@!
zeEg0tq0$m$#86Mdbt<lu4kdzm5_MwRb-0q7)=cF(XOs_3m^g}sEj@8&(>To*${WN_
z1sTv1L(>IYcrjwf%PTIdZ<LY-?M5yYjFSQ5WWYEX@HhjfJCc*bXcHO6NLH@JwT@&a
zCDW~g_>%?a>-fH!yLR!Q2ghAKXfjd~u=I?Biw}HPwRO{{*J!h}MHP!e4b3feMQa+~
zb(^et`MKYYgzOfJ-C~y_-=@zd_wS{n(&`n<S4)yKI8tP=1ut5*?3)3bjxQH}U*ddy
z312Q8HkDR=T~b+QFi>jvfnTOlDSE+Dc9XDaij|on15>U?^u+NcT0XSLbM&H!x0yVa
zFa{Tc8XO%s<=j1AK>Qe%FsBuAoD*)ybhe)C%XqXN6&Fe|N;OIg3STUaIa{wAlP3j^
zx}y?PLZvFGZm+0lulD)Gwcv&FWU{=xCizlo2{<@uR^01N%qlK!PT<;nMO}HUzCKo7
zcW#>T!wnO9=Wd+m)`E>ROYqx*FQG!^WcrEo-vILmxHAzM`8R0E?<E8M=0FLfOhsu%
zAt{CyT{`(wiaSKQ4`S6*Kt=SImeI~qtn_KCY7-H4(-;R1#rrT#_T_X(d0J;FT0}ZV
zhR2gV|7*y<{Oj11kPOMY!-%Jnfxrt7%2K?PVuA>}6;FB>19vi^aGe)iO|hWx7;+^N
z<_EE>6dzOA7`c0Z?WJ^L_`CE6jn`SOKc%h7>vl)2Q_I?l>ab?J?~>*^{CT#_oIF=a
zO<-AB!Lo{JEkErl_M5$4PmayLs43bYSt`m`w@q~y;INRR&YxUR;kEXet!5nA3<vCU
zf|0hFmu5uEab&|~4aGeePJRYT<-!>#H|rLA70SGwS}T;LIXxH(4@x7_BC+UYxM)$I
zqoh`8u!ye+=OisUPWUG2k>iAGLR(WYbmDAam^?)IOcncSJKjior1aTgg^<#|Lg~ZA
zf+#5S)<MwfBqf489V0FTjtuhjpo1WC@we3Z$YVqZFI<R)(=ZnwxJW_jAKZp<y<D5A
zH`<Mc-BU?=-RoUVpKV!&-D4y2JfhLMjG0*(OCF&UYW9~JG#TRa%fi#9z;P9bw@}`X
z7;12Hg4<RNW#UO?Y$0JlP^0jtsf1uaTXYetmi(o^Qko!zX6j~&c7`n<F(CsgJbDJM
zH7Knpv{YM^n^V*=;jsIJBZ7)(fvHOEn##)fY@zTAUn4^3MsFs0gGLJN((%px_#-`{
zUE;~3BE%R8f*(dET_<UK`2=*1Zdb|B&u3ml>ayibYt5@Ry0YtL=U7HQHJGwp>R4GR
z#VT<p@*{>Ed=6A3D27QvjaOQm(UvR?m1;F@$^25=$OT5bO|5MTFRh|5Cc4a8eAa3b
z{`E=vY@kryD$Y+2<0n{Hom4}rXe3zTT$D0}2)}odq!ioziTEg)I4z(}BrxMqZz)rp
zsEK0(BvTaQo`zA5I^iUzBHyJav2xZS%~6$TO+W~*d=WC4{6)bs#84bR#TT8ZA#t5A
zWyeeLC1gV7(2X8ziwmU~r5dFLMaYB*`2td*-xgGk;*s1GgS=5SX655?Il0;)72D9^
zJQ2q|<SU656hup;*_^*NRdj`?$MW-I)5Fo}`LV9!GTG%V)21~yPn*`VAAI%MIfV_~
zQ>Jt`6b8es{$x9N>t?e};jQQw@Fye2c#`UD{FcvzOd+yHTQI7X7->GWDlzDl;477w
zT9ueuBEYm2S2~7HTNzP9M+p-l#A6^Qq12$XqG(rA)-c*_rL#*bvS6CqDPn$lOw*Al
z$c{^_kAh(2@EJ)FQju$3jI0k!y$|xA5AvT6@}G~d-?Y`Dv%Tcu&qp_bp-W)s68O0Z
z3>^i{!SLXGiNXO90H3dSBI`Vt+VPq6dyo-vI8q#XqQ%etx@QM5NzclGm1`HxYT2}^
zJX)pA)GjJ1HoI+E_Iyu%le@s8rQpiQiQ2Yl&AeGlyg94e)^7IrV$#+`gI=xHn=l$$
zZJv9MB@p*BCd=~YkllOK0aX}$omBW|$?viAM)7&0_+8`h`ceFzarpFeb`l;El6d|}
z7~Tp<C<`S0Fg#7gSP#RERK@0|Mtv^2dM*ZWE(UQf25~N@bB1dzA9V?%E^733s-cfF
z@H7WX7-cF-Gm7AMm24Itx4D=U<cBy3(ntlqNZ1s29_w+!RZ$Zx_#u*;cm|zeJYQn-
zIX5Cgj`3OxYSU38fj_mnld7D&T`8`y1*9Nc=?j4IqmWBS8Epz8Chl7`>aQx!++bOR
zIOH6gpAx7@P&dKu%R@$R(I`XOJbQMSsACtotnMj>An(7Af(&TCO9#HMpg&n`&)Q8V
zRBKCy!-uaI>nXCnI}3a+ZI(5Aq?>zC7C35ZR69?g_a3Dc%_vQrEocHU)}5+^suOtf
zam!%mBdr){4$~7k<T=feu@5wd#S=8A;ECo0e%ClW(VW2V8HXpD6ZoA9p64^>&!<>#
z^nAvjFYxqyf!{R_PtO<lJ>&57e1YGo;CZf2HT_;Xv#MifW9Lil=Q$?%dn-6T^<IIe
z_X>RKy#i0~75LP9k9|(+y#i0~757uN1bQ#eg{F1`KbgPxA_dQLPVx3k9oHU#r}hYZ
zsyzZv?GgA?dyaihsyz{mV~LvXPx9xd?&o<_czbHcwTI_DP<;>gHv*r*&iVuwv|r%&
zjpBEW!=E>b-!l%Me$Gz9!+b5C^9A^F0zA1>Y8WPs8x~B`JCFv#jv85J?Mg6lyP5oy
zIU6}%{)B_*PZNuAHZmFPqha)m6jqG_Yr>Hq)4Kt+`6;<@KG@iNu(A1IWAnkr=JTb2
z)EA3J#f=G4;RGdlI;zw#o+CkHPro6Rnqe4BQG&A$@tt%KHPVy+|0ZepN*?tuCvbT2
zST5BJ!y6gjioQ0rgY@|cxYQUrJ7<)h&Q|ED6nqMK27qtkbjgpefG&Bgc22L&9Di0O
zE~9v&SApL(4o~zd@O#GLiCzVMr-BzThY5eVcs?LKU*PHa0#EZZji=`eJk7T>KK&e;
zpM>WzE>-k<+kwacpAvY=8&Ji6*8+|wK1KHnJiS-oQ|}dcdauBz-h1qGQtuUbdat-Y
z^<Ex}Om!9TUHrYor|7*r?h|j%VvaxS?Xh@jkHGI5ho|-k{GM@m>IZ?}so;4m7Zu&V
zj6Z)5pwe&B$GknuIi9x%Y$71F!WVlUR;|VCm4o;ZNC^zS(SYf$#w;YScrx=*pm8f}
z;OwCR^E+)7Q~co5>S9Ixl18Kz%EIABxMP!&g|-GleMlMtQUH-#HtpTXHJc1wq*^42
zhPYQ0S5k)(j;wZcPowgAwsLL5wG9l5?pc63-9wfx9uuLQj8^=}Gfu~lFFhFoD4P^{
z%Q^~Fz$Pf*4#_2C#>9pE5S?Sb6QQrbWk#SRYn~}fQWg5W-rZiWzfh9$^Hq}0@}LE|
zri#3I*u3i!HbYTR@0jGpL41|NTN&`F)qb7buJa@Ii8n62n{Tv~?epN@zA|sVy48}I
zX=%LypFG()&b~gUJKMznx@(=?zHXPtgWVmDn5()~r$HDjWlN=wVT_gv)<ha5#M|KG
zXQXYQu=+Z2pA%Ap6Dyq)v(kx?cCrm9r=nbdawW>mDEm<!Ls7g(oUr;r%SWlBUcux3
zgn|!l>=pvx`vFi&0Q@=tz8_#qQTk9$NBIWIH7K{D+>i2W6g-jy*aozv0c~kOTN==o
z2EJgB5^eeDf}t!2P>&wOp(*TZL54H%n}s;qjhZ--MdT7WipIT+_3n?f=27GHsJKvy
zQL0f|P`Xhzq3l4p2<2*&TTl+5JdTnLePlPDR(=G9$3mgK2sS59?)%Se3{YcN+3-05
zuNhL(;WNw=_!Bt>C`M6%J2rG&YA-64l|=jNk^|9bELIZTQh)l=l2~F+Xi0oyOHnuy
z3@)#zToDY0rRGd?UKa9<YV=-jw6rX0Ey#Bm5L7G__ZHPgU9M;{7?RrRHkX#f%A(PM
z+S-##qh(8?C)aPBQxu*PT3%VX3Xh2di&kvT@i*n>7<2NSHC0tLMw2l&C(C8a&ch}*
zgv~BUMZ!+#dx)d@1cdieaTZscvnTIr>#;)u4T0G4)7dm`pbRMXG0dVRF0T(RAvT9Q
zuTt8W?{s*qrWah^Df{pm$SY%MwwtYy_6<Yru3{_sT0aA|dH?0~D~{fiMSU9h%MA3-
zQq-4<P5DYph?STSD={HfVnVDOrR%lFcH%g?CaZB3?}A0Bt>!gk&BVMA;tnYEKStqk
zG<gP^T!m{huJoDM<!W5X>0$oAOZi$#emrWmhQ}R0mZ%u91%p+XsofUg7CcyW{>4d9
ztIg1q>ijrCo|Bm|U1!WwBMM>@BA{xuh=Y2@(2t9J-gw!+HVvxOnc7)iOSaCiA*&hJ
zY>W3XpT)SOHXBX{GzW?#33Fg0c2smWE*)5sbWGV;JkrEY%Ryinr8kvs=1ESMNs`Cu
z^iUx>$9f7-t)g=ywNlr33%T%e5>bmpq~Ziz(-aRj11fnalTd0<T2aVOLT$*x=+M=Q
zD;ZX3fut+tD4}Z!uJm`|NG=vqVM|PH{!3_UUos}iqN18jFVYj-_iN}YHNuL5<E~)D
zM3OaFwH52hi4uxZmZ`7Fa6&(b42Y@ovAL*wfTPu#PI}RmejIV3l)Fn9pTi*0DhJYS
zBOV0e;Zb5tPHuJ`u_Id1Il-w?*D)NtMD-ey%&b^)w=PHDRBX34arJ?z7`~n+%C@$`
z+dNd3oZiwHUR7PSVvDqN^?lOiVY_KB6a-VQ2wSY*M&P_GckrC<<rf6)aDl~GWACTR
z##rki9KDH668Hk;wwsJrC(v37U<7+OBpk9kO##-6@z$g^Pa2H32IH+kFKaN~8b00$
z+-Ab<<m5;?Hu_vL>SC&>_0q$pq*qHLCRoG9rUk;8Gq}>y?h5urZ02c1Nr^}LKN#NV
zwI~#QR2V*J3@TCLq-Yg3_!23?`&gawnBY1+D0b{5L(yoc#8_B9tB;qL$Lr6HyUf;W
z>?TZ?K<mcd-i@u5R&!o~_g1Uf6*s)?4HSC55wqpx+45~=^IPUFEX%XIbMtI5>04ZG
z75i?|ONf0p*E68+zm&VA6)G}O=~!qOzeZRi#YE7c&61fckeC2;z><PvSrZnBf0p2v
ztMN}YJaXyo5xj!N@iJ+Z^n~ha2)O^PKAM-2kuOkFf-FknI;SESte_(OGf)F}=4krQ
zMV0YjFkXqC39-eh$*Nq~7+jF=_h2reE5az`SU^m~4hp46FkCkCKsNJ0HuFF>^FTJE
zDDIf1xGjv^b3nR<Dbg(j=@x=?3qiVtAl*WKtKrBP?n%xM5>Ysa4K5#$FUXrOB*X?z
zC{`|92Lz^S%pasOZ=~4cjYJ+SbJ<7c+FdUDs|sdu#Op0C_Ie|dIqr13ov!>~3WIT^
zy;vOjb_;8g>JdKxzqA>JxU6FLg6$b?(xT~FG+m3P3on{k_=WZOrS<3#3YWt>WMZ0C
zVT`C}3BC_Xoh&16<;9oD2JAybF!5I{u(V^LjAv9QBVt8)iXkgDm$ZIfnYU>~Bk|wH
zF?Q~1LR1q&{#vt3BW5rq2EotJqvAp-MyW<=K@mTrk!SRwCRg(qr3ax<5j8phnhFBL
zqeNT7V;pVBaz?W87-Oem#ZF1Oa3ZHr{?@_@Z?e@ItXSxpv_@yt!KJ)qQfb_k2zByL
z*~Te{ikjB&BmkkAtCE(2<rL+g&b=Vce`S$f>J1e|)f!utCDZ4#8>}8%h&~yNTGusq
zrV<2Hb~O}fXdZ*w5XaOj{SqVl{Zv0sIQ2gvt%$PliLj;Q#HqMvq%9?B{gmi<+=Bka
zL0jry9V$+g2uc;oY!vF>Y-rQSyh&zKQ6s~&aO|M|<*ZTy)z?WBv|IEq4jiX7<KU$x
z<n80`zteaoN}P65OMlOG1$>R}JSj0dn(xnW=TA}hSuFX5z8O;_DXvycu9=k^%y9Y>
z>iTtHsvf&bm1UUcyB__TX_Q_A%3H3@)V*r7W|YjEf32q=o|!%J2i|`xS-<p!DjU4w
za*7FpoK0c}InncMG5)*(<y4dlP_9I|8D&4pV<^fFQi~lVW**oG%>W~2fDyBS4icv3
z4&lR;TQ>mNi;f@%fJhzjq)k7qg(h%s9@>yRzr>!5Z^F@USoWt$%IQlS^7w(p>hM~I
zPSYE_Hm7;Vpv7tR<__+#6j<%KJETu6Zkv<-YB$)u<{d*8q@2th+F@~63vzdWUpnR6
zRJE#Gz&EEu33(a(WzpJBl)|He5vr+<K}2p{8hZmOc_@=mYEW8Hh-cEWNeMg_qWy8y
z<EXdd+6o2{!d(<vnB;FtcmqdBvJHx~zk+F!zGWDUIF*`~*e?Yu*QSX^F_wkLo^b(1
znIyg}!{jD>4s=QfVY+(xMiuvr9+(TMY)GqY{)r{G*dH!+*o+Rl-QckYV|j_`iyNQu
zy9<9(nD2LaG`aRjn<f_)9K9jSlsmFgM;GZvi`8VZIc)h6cc2t0J`p-FV077xwXvDg
zDy8eQoWY<o>sggGr%<Ie+dg$@Oqj;cY0O#X%;zBMIOUs=&+`^=Z7&qp3)qG5P^K<J
zsRF;QN5=@ciH--8f3_e55nW4cV*Kb*IszmlLm^R%ZWe!Ur`11MPOf<rN18g7bSEO`
zbUD5#;Q=Iu=HN==Spzybq)YreeP~t2gf<2u$~o<e`E*TUcSJ{i?%lTSy|3-esTQ5i
z60%uswks_;8ODn<3>k2Lt295jPwM^3t{gc(2ZrK^B`eDkvDqvIIk)Ncl3wlEk6(Hx
z`@3|zYAb}j0+RTIFM&dC!qtp+4g4$^{fy(04I=0E7kY~BDRLLuTp79cN$onDQL4*!
zg~P7wcU3l1NUgQnM*aa3R$<T(-d1%I_EF^wS}BU8OI8S>z4M`yX|zb5r)zAyv;cE6
z<PW-;+LVo(h)vMYI&dW;q9P(d<v^Vss2bPf<Typ<<#ap{`w-uzZR6XtOa6i#n)^bk
zU+BhO?INmO<fAH;2k7G&w23>DYG+dI4E!Yg0G?-t%M`WjlkxjGqCY<bhU7R}C2!|A
zC>WYk!6V4wTMr(g2anKW_Uk#1@Z+`!{5DD;kSD<pQVW)H&@wFtOmL!647ogq37x_q
z{Q-Ii+yvV+vE*lC$<M};Pf;!5sER^tiEOm6s$gEF?6Y)!GXM-Vql|}sCr^3A5abMs
znwX@HAD=cRMe<x?8<#B^1CWYlifl8_j87j^M;@0?`@KBbjMv}pjW4S}a!5)d(=oZ>
zJ<3=zyIRRxGV&ub?30OBwHbNT?5~gJnkhLSyd%tc$DNQ@I-$$l$gUHf{ysj%F&bd2
z+`A$Jw!?|ZIu2r7eT-7*kk^c;!2=8fiP1*qkQ3FyBk6+@U0^_j>myB0J=jSJI$i9d
zNPR=`Ly6W?-ka69mDDVxULno1m6I!VmN?FYt!vsRc0w9(TdH?Y%uo<Ap8N>MvGVtu
z<~1c7gPB&lBimExb|5OR#g-dFOjxTf$AbKvB|h_)Ctxux+qPAW=j<w-uQoQ#<1EtY
zbY6$mty1Z&rc902Y%kJhA;hdRV#*KXP9D*pfc5O#C!INt-J^5PM#PgxRXa#F6A>>9
z#TXf|d6>AFpfM`shXv@sn5fZqWd<#}c6`B(31!E_?3hq?P<LwZYDd*=aT1r~6b^Wp
zs9xFa(xMwmO_LC&NeI&<gh32pnuPEmNE+zbv;(FOPMR1p;h`e7z@z?|<UhvUIi=I)
zxyoh~&svBeaZY!kBUm!c<g`G{2u8j6X1B|cm1A*)621Z?ugaGmESjEQ8nBjnbF7(J
znFaRJ3`wnnR?6zKS)FjkG-px#U9%@-b7S|5rtbwGKZ3riVCzNx9*Xk7yMhjqxX=|Y
zbVVvsLyD6q@rZZ_&{Krjh0+(eQyt*Om)z(8<d#BdLE#;clI%(R<cmUsN+`X@{c_$-
zI_WI6+F{CdNIF%%<Mpt~9d?z(ym?4OZ`J2G^NJ_C>ss<EX2+zOT#Mah&Cryajj>#}
zE6?mL_c}Z{W@|T@JofD7DW3AO3MkQFBNH|(vTZHH?}zOika+QT5jXN76~&DVuwF=F
zn3zG7Ld-PU@oO-Jv-lJa0^<P>w&PQ(J9I=3@Ma%9Rx;KhMu#sj2zexAki#mmc8UlD
z&ENRIlZj&yk5C{=#|#mOazBqsIm0m_D&_e2l&N^=S?KUn)92DKqQ{RdLkHH;51c6*
z@gpfLQtD@=y?73S2|2k8opR5?1COty15a0+u}EqWM_j#<$m0=F|7LP&St3zZI=Nsp
zqPbJDweZO0<rOLwk7z#f2t_oP>iN(p;E;5QYOlIkeVfLi*{yBT?$th_{VXGyaj7n>
z+obzQe~)2~;q}ZjGM~x1!?@UZAlsAOoqa?0(VTNklTCM;H<&-SJes@1>a)IOyThJq
zzuM95IPBc&^1JTLYs;^8>)r2o)_6YiZt#BLySpG>@R(oYU+llu|4G0T*icwp_<8W+
zqV+|egf0&EM=Bx@6t@+BIB9ycIQn_X-qN*Y#bwvU`ePrKf2Vw;;)2TR$_L`%_+{|}
ziNeID#7C1iOj$PNj;Y(Geo%F|dTaF!HQ}09lAh$M+Rb&*x&?Lj)YsK-t^csW->{<L
z;c4B|bEe<kXl}f%@o?j3GZ)T$V&)f3i<{1CdUw{sSvSslui4*xM)S3^uWOm#@=@#I
zIS1y>X=`Zv&OGzH59hzretY|Y_D9=~v>#n?c)=?R-d*tFf{~8Q4o62}N30{+(cH1H
zV^zoIj#E2!cU;<WZO6?WcXu4>c%tKlj<-7g*75nmjD@+Kg`Kg^WM^~d!p>Eln>$bK
z+}(L;=e3<Tci!E3sPl==7dqeS{9EVeT^U`uUB0ep*VIMk#Zwn=UUFc`>)p>Sy<q9y
zr3aQ3ExT^{bt~#tJg{<bRne*ys~%f@*_zEg`kr%oF6sGTZ8yf!j6IyBjOhwoMO^}Z
zg;J+;Fk6(m8uU1%)HRrL=PPwODR8Y)&j9{brLM<b`4CCs8q%U3z!p)|v8W;*mZ;;1
ztn{E#S3^Jlq*B+gsPw*4#|BlEr_?i8R8^(a^=!VXXXe1x(+B%DZrbLrtf{H+_YC=a
z`u*Gcw{Bm%rEh3c?|T1f1A`~|*PiZg?Atc9ZLqiJWPfY_It0?1v1N;&e{sk^*gMoa
zcxvx@U}p~WZ|Ga!+rO=^XG?76!1lqu-a&t5g?~Zcwso5p_HNw1rDw3YeSTNljK)Mo
zva4%W_k#9?UB}+&ZyeaNesS;MP~SkmKOU<ntBh4B_f%H!M>Tep(LMiSbKw;;z_!BX
zItbhAMwmFaK`tRj(i$uke%6CwA=nSN9dIk)S`1qs@S9jKBEtBQ`d|RxJ_)t8c#a<m
zr#?Jo2xSm=^dOj*A1iD>0_DU|^TQCk1^@kH-bnADdxua4p%9?wihHSb{ZJG10n>}x
zHq?6X?HF(OcK!_d4z-!uyMVuY9on`K_isdNx8VLks3O~8{Ow|GczYvM?G=!?yYPP&
z47&^Pw}q(FyT0m)^veeDy!8+m>77G(7q!k05g~>rmZ1%F9se9^SGrY=cu(2rbN;iv
zi<v+QZ2Xgd1M6XG&T)(aprer>p@PaYF#GfngeXsi5$k#mW||p#rd(*SZJ22etOFz&
z<YRsDV1Mm{F4m7Vvk+c~MUZmBn1RKR8ltQO9t36h;pO<DmFS8DyuhYF|62utpa$Js
zi_@+3utrXUNKKu;A6`S`csd)xLMzT+%*CM0!{D@|n>sKMo#>)P=;9?9nx$C1mxE)h
zWUFA=T!W#!30|`2vj?Cpx*1xd2ce0)2VCJ0dx-s<{es=icC&{iH7xWOvPY5a>0Wjl
z`!P7tjTn?~v6tA(l7_v?j<QSHYlw9F278nJj{S^X#=ghif{)Oh?0R+sdy&1(e!%X6
z3&O9F!DB7^2?+NNPJWLgy5W=TDfSz7m^}@mJi>kp5_^{Yl)b~AW6y)=Uck=yU692|
zAd}4?jgvtjTREwm0@6JdQ)N3m2u?>{uAS@*$RxjKyVyDGTu8PD*&o;??3?U|>|*vl
zToL}t{><KEd%)ZNgq$KDu#ecs?C<Of_BZwk`v?1w{RK)fjW*W5ean`dt-XVN1MAm;
zwe$}5uFp8RXWifc0vLc-;vky@A9D7YUdCwa<S#MedcaI(kiWplX95~o7GO3!&Ho81
z$ObgA96%(g1cc@hKFPVv3}|H*KpV?Nc4s@Y0wUlKpp)6<&p<5%^OyrLAG(=OK{+l!
z4|J-Zf`ak^eatO?0!s1#`Z)|hQu`QG<pT`D1NLK3mtXz}6czx4mo;F71?7K$+6Yc!
zMSxKj0xZEU?n6*t1Q2-)0b^{E{C7}d6tIHBN>(C&0IDnnOt3P*$t)(n4+<>@MEXU*
zDpm<t4fr=uY#b1ojsR=nA^BHO?-am#HWjdeRmpz=C07GZ=Ma(g<v)X}lYlc>EnpL?
zLnMM(tR4{FDS)%tG{6?XKZ4??1I}SH0Oztsc>cDrnSk?H6X1L{Oa239LNnk34m;Rv
z`CZJ47Qjx{3fRTw04`#4<=<nLv;i(*^8mX6-@%NT54eoA11?AAl(#W^IsjL)g@CJA
zr~DRXQWxMF4tv-l)Yr1b^6x<BO90oiZopo)RDKgQz6@|9TMoDh@D0%R3c$^5CE!VH
zmHav=eKp|8Yz<&P>j4~KYY|IfD~G4Bb*K-r_3}|-?||Fb2Egrz^!O@f#3sPgSRddH
zz*jIgHUpl)P69lWZINHbOgS0wEY=UWiwyvt&9=%fVcrltmz@H*8}Y1O#B3P?JdbSy
zJfCfsUjT<V74SlK8sJ5M&tq2a0K6D+Tc5{lI|J|%cBcFsxWi7sOX1J|9O9ktlAi@v
zAb2@D8*nc>M}7vg?_9v|u-$<B*dF<};6mpCUd7G_yqd#n*ah+t$SfBEewSSYcpdwO
z{4_Ys#emndZvuXwT_PU_ry=+Q_AS60*`?swHzAAEZ@>XA1N;%Y9PnngSAGilgsuR*
zg~MCfcjPC*)%F4Ym|Y2YJG)AL0$l29z&qGAfInr|%D)CTBX}44F5unlI{9&My6*wr
z!>$Lsmwg{_Kf6Kx71n?s03P7*es-h$7`V|*fWz#EfDf=A$-e}ry&3Qj`yarE*e&v-
z;I{;S!EOb7nB4~W2>Y@82>9;pfWKrv0ep<zAwLW*`cuHiIYhhUUx1I^1^6Vp8}KRi
zGx_J>srLXLX7>U<&GrKx0elD?_CCO8*a5(2+5Pe%aN2`_&$D5`7uW;xgW%W?0=~rI
z%j}T+0DR3J0(_PI9PlXn1>kG!VR;xl{}I49*rR}N0v-ha|0UpC>@mQ%*{|gL!OI^9
z{5|_M;JfSz`2aZclYsAW_(%2>>VHB$s{6p94+H*%Jq`F*c0}F}?)+Q8_t`Um9{}D9
zp8YJ~hwM4Pf3WA}d%($G0Q{J}2>1zmN&Xr8l)Vi28HfMNUP1kH_Nsh0`zJdJ_yv0n
U@Jsf(d>0#GZve{dP5G|>1G(7jApigX

literal 0
HcmV?d00001

diff --git a/reactos/media/fonts/c0611bt_.ttf b/reactos/media/fonts/c0611bt_.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..3756d90fd7ac13899bfe143efa1faf79998b820e
GIT binary patch
literal 61740
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%0AGIA3gK~IZitfSnG{b
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
Q_`U2DdkZkm-j3h<zdf}R00000

literal 0
HcmV?d00001

diff --git a/reactos/media/fonts/c0632bt_.ttf b/reactos/media/fonts/c0632bt_.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..a853b423880c613785162c0b4dda98b58d1ca4fe
GIT binary patch
literal 61452
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
E0PUQLs{jB1

literal 0
HcmV?d00001

diff --git a/reactos/media/fonts/c0633bt_.ttf b/reactos/media/fonts/c0633bt_.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..b463dd2727f7aa395790e0526c9240918cf9df6b
GIT binary patch
literal 62188
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

literal 0
HcmV?d00001

diff --git a/reactos/media/fonts/c0648bt_.ttf b/reactos/media/fonts/c0648bt_.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..3f9e84cbb4f3608ac99a39645f9f988c785d7009
GIT binary patch
literal 67348
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
H<mdkjY6YIq

literal 0
HcmV?d00001

diff --git a/reactos/media/fonts/c0649bt_.ttf b/reactos/media/fonts/c0649bt_.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..cd5da5635cd14cba5768be87b76b1ce584e05d19
GIT binary patch
literal 69152
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

literal 0
HcmV?d00001

diff --git a/reactos/media/fonts/cour.ttf b/reactos/media/fonts/cour.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..d5af139f7671ede29c2d2860ecf78b5e1ca68338
GIT binary patch
literal 144456
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%0DLPNld5X?cbe^K~6rHE&JVoazI#1Dgiq2DXo}%*<
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

literal 0
HcmV?d00001

diff --git a/reactos/media/fonts/courb.ttf b/reactos/media/fonts/courb.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..c6c63c5a38a0ecb647e2dacb3a8d485ccb1ff682
GIT binary patch
literal 122944
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

literal 0
HcmV?d00001

diff --git a/reactos/media/fonts/courbi.ttf b/reactos/media/fonts/courbi.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..651f37e890bd5420e42b5229b40338b8ac318621
GIT binary patch
literal 122068
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
GSN{ik3}X=h

literal 0
HcmV?d00001


From fa2ac0c0ca84c8d6798a933e224e456c912c96ef Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Fri, 16 Jul 2004 19:54:05 +0000
Subject: [PATCH 310/356] Fix an old typo.

svn path=/trunk/; revision=10144
---
 reactos/ntoskrnl/ex/sysinfo.c | 22 ++++++------
 reactos/ntoskrnl/ob/handle.c  | 63 +++++++++++++++++++----------------
 2 files changed, 45 insertions(+), 40 deletions(-)

diff --git a/reactos/ntoskrnl/ex/sysinfo.c b/reactos/ntoskrnl/ex/sysinfo.c
index 9c238b8802d..bb04e18b083 100644
--- a/reactos/ntoskrnl/ex/sysinfo.c
+++ b/reactos/ntoskrnl/ex/sysinfo.c
@@ -1,4 +1,4 @@
-/* $Id: sysinfo.c,v 1.37 2004/06/23 21:01:27 ion Exp $
+/* $Id: sysinfo.c,v 1.38 2004/07/16 19:49:15 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -497,7 +497,7 @@ QSI_DEF(SystemPerformanceInformation)
 QSI_DEF(SystemTimeOfDayInformation)
 {
 	LARGE_INTEGER CurrentTime;
- 
+
 	PSYSTEM_TIMEOFDAY_INFORMATION Sti
 		= (PSYSTEM_TIMEOFDAY_INFORMATION) Buffer;
 
@@ -593,24 +593,24 @@ QSI_DEF(SystemProcessInformation)
 		SpiCur->BasePriority = pr->Pcb.BasePriority;
 		SpiCur->ProcessId = pr->UniqueProcessId;
 		SpiCur->InheritedFromProcessId = (DWORD)(pr->InheritedFromUniqueProcessId);
-		SpiCur->HandleCount = ObpGetHandleCountbyHandleTable(&pr->HandleTable);
+		SpiCur->HandleCount = ObpGetHandleCountByHandleTable(&pr->HandleTable);
 		SpiCur->VmCounters.PeakVirtualSize = pr->PeakVirtualSize;
 		SpiCur->VmCounters.VirtualSize = pr->VirtualSize.QuadPart;
 		SpiCur->VmCounters.PageFaultCount = pr->LastFaultCount;
 		SpiCur->VmCounters.PeakWorkingSetSize = pr->Vm.PeakWorkingSetSize; // Is this right using ->Vm. here ?
 		SpiCur->VmCounters.WorkingSetSize = pr->Vm.WorkingSetSize; // Is this right using ->Vm. here ?
 		SpiCur->VmCounters.QuotaPeakPagedPoolUsage =
- 					pr->QuotaPeakPoolUsage[0];
+					pr->QuotaPeakPoolUsage[0];
 		SpiCur->VmCounters.QuotaPagedPoolUsage =
-					pr->QuotaPoolUsage[0]; 
+					pr->QuotaPoolUsage[0];
 		SpiCur->VmCounters.QuotaPeakNonPagedPoolUsage =
-					pr->QuotaPeakPoolUsage[1]; 
-		SpiCur->VmCounters.QuotaNonPagedPoolUsage = 
-					pr->QuotaPoolUsage[1]; 
+					pr->QuotaPeakPoolUsage[1];
+		SpiCur->VmCounters.QuotaNonPagedPoolUsage =
+					pr->QuotaPoolUsage[1];
 		SpiCur->VmCounters.PagefileUsage = pr->PagefileUsage; // FIXME
 		SpiCur->VmCounters.PeakPagefileUsage = pr->PeakPagefileUsage;
-                // KJK::Hyperion: I don't know what does this mean. VM_COUNTERS
-                // doesn't seem to contain any equivalent field
+		// KJK::Hyperion: I don't know what does this mean. VM_COUNTERS
+		// doesn't seem to contain any equivalent field
 		//SpiCur->TotalPrivateBytes = pr->NumberOfPrivatePages; //FIXME: bytes != pages
 
 		pr = PsGetNextProcess(pr);
@@ -627,7 +627,7 @@ QSI_DEF(SystemProcessInformation)
 	*ReqSize = ovlSize;
 	if (pr != NULL)
 	  {
-            ObDereferenceObject(pr);
+	    ObDereferenceObject(pr);
 	  }
 	return (STATUS_SUCCESS);
 }
diff --git a/reactos/ntoskrnl/ob/handle.c b/reactos/ntoskrnl/ob/handle.c
index edd5a8a64a8..3bc6c843b23 100644
--- a/reactos/ntoskrnl/ob/handle.c
+++ b/reactos/ntoskrnl/ob/handle.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: handle.c,v 1.56 2004/05/04 20:18:52 jimtabor Exp $
+/* $Id: handle.c,v 1.57 2004/07/16 19:54:05 ekohl Exp $
  *
  * COPYRIGHT:          See COPYING in the top level directory
  * PROJECT:            ReactOS kernel
@@ -950,39 +950,44 @@ ObInsertObject(IN PVOID Object,
 }
 
 
-ULONG 
-ObpGetHandleCountbyHandleTable(PHANDLE_TABLE HandleTable)
+ULONG
+ObpGetHandleCountByHandleTable(PHANDLE_TABLE HandleTable)
 {
-unsigned int i, Count=0;
-PHANDLE_BLOCK blk;
-POBJECT_HEADER Header;
-PVOID ObjectBody;
-KIRQL oldIrql;
+  PHANDLE_BLOCK blk;
+  POBJECT_HEADER Header;
+  PVOID ObjectBody;
+  KIRQL OldIrql;
+  PLIST_ENTRY current;
+  ULONG i;
+  ULONG Count=0;
 
-PLIST_ENTRY current = HandleTable->ListHead.Flink;
-
-  KeAcquireSpinLock(&HandleTable->ListLock, &oldIrql);
+  KeAcquireSpinLock(&HandleTable->ListLock, &OldIrql);
 
+  current = HandleTable->ListHead.Flink;
   while (current != &HandleTable->ListHead)
-       {
-	  blk = CONTAINING_RECORD(current, HANDLE_BLOCK, entry);
+    {
+      blk = CONTAINING_RECORD(current, HANDLE_BLOCK, entry);
 
-	  for ( i=0; i<HANDLE_BLOCK_ENTRIES; i++)
-	     {
-	         ObjectBody = OB_ENTRY_TO_POINTER(blk->handles[i].ObjectBody);
-	     
-	         if (ObjectBody != NULL)
-	           {
-		     Header = BODY_TO_HEADER(ObjectBody);
-		     /* Make sure this is real. */
-		     if (Header->ObjectType != NULL)
-		         Count++;
-		   }
-	     }
-          current = current->Flink;
-       }
-  KeReleaseSpinLock(&HandleTable->ListLock, oldIrql);
-  return (Count);	
+      for (i = 0; i < HANDLE_BLOCK_ENTRIES; i++)
+	{
+	  ObjectBody = OB_ENTRY_TO_POINTER(blk->handles[i].ObjectBody);
+	  if (ObjectBody != NULL)
+	    {
+	      Header = BODY_TO_HEADER(ObjectBody);
+
+	      /* Make sure this is real. */
+	      if (Header->ObjectType != NULL)
+		Count++;
+	    }
+	}
+
+      current = current->Flink;
+    }
+
+  KeReleaseSpinLock(&HandleTable->ListLock,
+		    OldIrql);
+
+  return Count;
 }
 
 /* EOF */

From f82a992ec206f1adff198663d14180ebe851ae0a Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Fri, 16 Jul 2004 20:20:53 +0000
Subject: [PATCH 311/356] fixed typo

svn path=/trunk/; revision=10145
---
 reactos/ntoskrnl/ps/process.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reactos/ntoskrnl/ps/process.c b/reactos/ntoskrnl/ps/process.c
index 5c2580f7259..d3d64807294 100644
--- a/reactos/ntoskrnl/ps/process.c
+++ b/reactos/ntoskrnl/ps/process.c
@@ -1,4 +1,4 @@
-/* $Id: process.c,v 1.132 2004/07/07 16:28:35 navaraf Exp $
+/* $Id: process.c,v 1.133 2004/07/16 20:20:53 weiden Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -1125,7 +1125,7 @@ NtQueryInformationProcess(IN  HANDLE ProcessHandle,
 	else
 	{
 	  PULONG HandleCount = (PULONG)ProcessInformation;
-	  *HandleCount = ObpGetHandleCountbyHandleTable(&Process->HandleTable);
+	  *HandleCount = ObpGetHandleCountByHandleTable(&Process->HandleTable);
 	  if (ReturnLength)
 	  {
 	    *ReturnLength = sizeof(ULONG);

From 016e6a3f65a0ebe84e1ee0e8e80c675bc8d7d775 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Fri, 16 Jul 2004 20:24:59 +0000
Subject: [PATCH 312/356] - Implementation of mmTaskCreate. Based on patch by
 Eric Pouech.

svn path=/trunk/; revision=10146
---
 reactos/include/mmddk.h      | 10 ++++++++
 reactos/lib/winmm/winmm.c    | 49 +++++++++++++++++++++++++++++++++++-
 reactos/lib/winmm/winmm.spec |  1 +
 3 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/reactos/include/mmddk.h b/reactos/include/mmddk.h
index 15ef1ad763e..29f7b7cba0f 100644
--- a/reactos/include/mmddk.h
+++ b/reactos/include/mmddk.h
@@ -449,6 +449,16 @@ BOOL			WINAPI	mciFreeCommandResource(UINT uTable);
 BOOL		 	WINAPI	DriverCallback(DWORD dwCallBack, UINT uFlags, HDRVR hDev,
 					       UINT wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2);
 
+typedef void (*LPTASKCALLBACK)(DWORD dwInst);
+
+#define TASKERR_NOTASKSUPPORT 1
+#define TASKERR_OUTOFMEMORY   2
+MMRESULT WINAPI mmTaskCreate(LPTASKCALLBACK, HANDLE*, DWORD);
+void     WINAPI mmTaskBlock(HANDLE);
+BOOL     WINAPI mmTaskSignal(HANDLE);
+void     WINAPI mmTaskYield(void);
+HANDLE   WINAPI mmGetCurrentTask(void);
+
 #ifdef __WINESRC__
 #define  WAVE_DIRECTSOUND               0x0080
 #endif
diff --git a/reactos/lib/winmm/winmm.c b/reactos/lib/winmm/winmm.c
index 575f5105493..3df138046e3 100644
--- a/reactos/lib/winmm/winmm.c
+++ b/reactos/lib/winmm/winmm.c
@@ -102,8 +102,9 @@ static	void WINMM_DeleteIData(void)
 	 * inside WINMM_IData */
         CloseHandle(WINMM_IData->psStopEvent);
         CloseHandle(WINMM_IData->psLastEvent);
+        WINMM_IData->cs.DebugInfo = NULL;
         DeleteCriticalSection(&WINMM_IData->cs);
-	HeapFree(GetProcessHeap(), 0, WINMM_IData);
+        HeapFree(GetProcessHeap(), 0, WINMM_IData);
         WINMM_IData = NULL;
     }
 }
@@ -3176,3 +3177,49 @@ UINT WINAPI waveInMessage(HWAVEIN hWaveIn, UINT uMessage,
 
     return MMDRV_Message(wmld, uMessage, dwParam1, dwParam2, TRUE);
 }
+
+struct mm_starter
+{
+    LPTASKCALLBACK      cb;
+    DWORD               client;
+    HANDLE              event;
+};
+
+DWORD WINAPI mmTaskRun(void* pmt)
+{
+    struct mm_starter mms;
+
+    memcpy(&mms, pmt, sizeof(struct mm_starter));
+    HeapFree(GetProcessHeap(), 0, pmt);
+    mms.cb(mms.client);
+    if (mms.event) SetEvent(mms.event);
+    return 0;
+}
+
+MMRESULT WINAPI mmTaskCreate(LPTASKCALLBACK cb, HANDLE* ph, DWORD client)
+{
+    HANDLE               hThread;
+    HANDLE               hEvent;
+    struct mm_starter   *mms;
+
+    mms = HeapAlloc(GetProcessHeap(), 0, sizeof(struct mm_starter));
+    if (mms == NULL) { return TASKERR_OUTOFMEMORY; }
+
+    mms->cb = cb;
+    mms->client = client;
+    if (ph) {
+        mms->event = hEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
+    } else {
+        mms->event = NULL;
+    }
+
+    hThread = CreateThread(0, 0, mmTaskRun, (LPVOID)&mms, 0, NULL);
+    if (!hThread) {
+        HeapFree(GetProcessHeap(), 0, mms);
+        CloseHandle(hEvent);
+        return TASKERR_OUTOFMEMORY;
+    }
+    if (ph) *ph = hEvent;
+    CloseHandle(hThread);
+    return 0;
+}
diff --git a/reactos/lib/winmm/winmm.spec b/reactos/lib/winmm/winmm.spec
index dc13c46b537..7dd06bced9a 100644
--- a/reactos/lib/winmm/winmm.spec
+++ b/reactos/lib/winmm/winmm.spec
@@ -135,6 +135,7 @@
 @ stdcall mmioStringToFOURCCW(wstr long)
 @ stdcall mmioWrite(long ptr long)
 @ stdcall mmsystemGetVersion()
+@ stdcall mmTaskCreate(ptr ptr long)
 @ stdcall sndPlaySoundA(ptr long)
 @ stdcall sndPlaySoundW(ptr long)
 @ stdcall timeBeginPeriod(long)

From 15971f9aa54d1720690005b64a4db3586c257bc3 Mon Sep 17 00:00:00 2001
From: Jens Collin <jens.collin@lakhei.com>
Date: Fri, 16 Jul 2004 20:39:06 +0000
Subject: [PATCH 313/356] ShellExecute is run when executable is not found to
 open for example Notepad files by typing "myfile.txt".

svn path=/trunk/; revision=10147
---
 reactos/subsys/system/cmd/cmd.c | 106 +++++++++++++++++++++++++++-----
 1 file changed, 91 insertions(+), 15 deletions(-)

diff --git a/reactos/subsys/system/cmd/cmd.c b/reactos/subsys/system/cmd/cmd.c
index 7fc6c6692b8..b979d3b9d80 100644
--- a/reactos/subsys/system/cmd/cmd.c
+++ b/reactos/subsys/system/cmd/cmd.c
@@ -1,4 +1,4 @@
-/* $Id: cmd.c,v 1.16 2004/06/21 18:57:22 weiden Exp $
+/* $Id: cmd.c,v 1.17 2004/07/16 20:39:06 jc Exp $
  *
  *  CMD.C - command-line interface.
  *
@@ -37,7 +37,7 @@
  *        message!
  *
  *        changed the format to call internal commands (again) so that if
- *        they want to split their commands, they can do it themselves 
+ *        they want to split their commands, they can do it themselves
  *        (none of the internal functions so far need that much power, anyway)
  *
  *    27 Aug 1996 (Tim Norman)
@@ -124,8 +124,11 @@
  *       Make MakeSureDirectoryPathExistsEx unicode safe.
  *
  *    28-Mai-2004 (Hartmut Birr)
- *       Removed MakeSureDirectoryPathExistsEx. 
+ *       Removed MakeSureDirectoryPathExistsEx.
  *       Use the current directory if GetTempPath fails.
+ *
+ *    12-Jul-2004 (Jens Collin <jens.collin@lakhei.com>)
+ *       Added ShellExecute call when all else fails to be able to "launch" any file.
  */
 
 #include "config.h"
@@ -146,6 +149,8 @@
 #include "cmd.h"
 #include "batch.h"
 
+#include <shellapi.h>
+
 typedef NTSTATUS (STDCALL *NtQueryInformationProcessProc)(HANDLE, PROCESSINFOCLASS,
                                                           PVOID, ULONG, PULONG);
 typedef NTSTATUS (STDCALL *NtReadVirtualMemoryProc)(HANDLE, PVOID, PVOID, ULONG, PULONG);
@@ -241,6 +246,68 @@ static BOOL IsConsoleProcess(HANDLE Process)
 }
 
 
+
+#ifdef _UNICODE
+#define SHELLEXECUTETEXT   	L"ShellExecuteW"
+#else
+#define SHELLEXECUTETEXT   	"ShellExecuteA"
+#endif
+
+typedef HINSTANCE (WINAPI *MYEX)(
+    HWND hwnd,
+    LPCTSTR lpOperation,
+    LPCTSTR lpFile,
+    LPCTSTR lpParameters,
+    LPCTSTR lpDirectory,
+    INT nShowCmd
+);
+
+
+
+static BOOL RunFile(LPTSTR filename)
+{
+	HMODULE 	hShell32;
+	MYEX		hShExt;
+	HINSTANCE	ret;
+
+#ifdef _DEBUG
+		DebugPrintf (_T("RunFile(%s)\n"), filename);
+#endif
+	hShell32 = LoadLibrary(_T("SHELL32.DLL"));
+	if (!hShell32)
+	{
+#ifdef _DEBUG
+		DebugPrintf (_T("RunFile: couldn't load SHELL32.DLL!\n"));
+#endif
+		return FALSE;
+	}
+
+	hShExt = (MYEX)(FARPROC)GetProcAddress(hShell32, SHELLEXECUTETEXT);
+	if (!hShExt)
+	{
+#ifdef _DEBUG
+		DebugPrintf (_T("RunFile: couldn't find ShellExecuteA/W in SHELL32.DLL!\n"));
+#endif
+		FreeLibrary(hShell32);
+		return FALSE;
+	}
+
+#ifdef _DEBUG
+	DebugPrintf (_T("RunFile: ShellExecuteA/W is at %x\n"), hShExt);
+#endif
+
+	ret = (hShExt)(NULL, _T("open"), filename, NULL, NULL, SW_SHOWNORMAL);
+
+#ifdef _DEBUG
+	DebugPrintf (_T("RunFile: ShellExecuteA/W returned %d\n"), (DWORD)ret);
+#endif
+
+	FreeLibrary(hShell32);
+	return (((DWORD)ret) > 32);
+}
+
+
+
 /*
  * This command (in first) was not found in the command table
  *
@@ -263,7 +330,7 @@ Execute (LPTSTR full, LPTSTR first, LPTSTR rest)
 
 	/* check for a drive change */
 	if ((_istalpha (first[0])) && (!_tcscmp (first + 1, _T(":"))))
-	{	
+	{
 		BOOL working = TRUE;
 		if (!SetCurrentDirectory(first))
 		/* Guess they changed disc or something, handle that gracefully and get to root */
@@ -353,8 +420,17 @@ Execute (LPTSTR full, LPTSTR first, LPTSTR rest)
 		}
 		else
 		{
-			ErrorMessage (GetLastError (),
-			              _T("Error executing CreateProcess()!!\n"));
+#ifdef _DEBUG
+			DebugPrintf (_T("[ShellExecute: %s]\n"), full);
+#endif
+			// See if we can run this with ShellExecute() ie myfile.xls
+			if (!RunFile(full))
+			{
+#ifdef _DEBUG
+				DebugPrintf (_T("[ShellExecute failed!: %s]\n"), full);
+#endif
+				error_bad_command ();
+			}
 		}
 		// restore console mode
 		SetConsoleMode( GetStdHandle( STD_INPUT_HANDLE ),
@@ -420,7 +496,7 @@ DoCommand (LPTSTR line)
 
 		/* Terminate first word */
 		*cp = _T('\0');
-		
+
 		/* commands are limited to MAX_PATH */
 		if(_tcslen(com) > MAX_PATH)
 		{
@@ -591,16 +667,16 @@ VOID ParseCommandLine (LPTSTR cmd)
 
 		/* Create unique temporary file name */
 		GetTempFileName (szTempPath, _T("CMD"), 0, szFileName[1]);
-      
+
 		/* Set current stdout to temporary file */
 		hFile[1] = CreateFile (szFileName[1], GENERIC_WRITE, 0, &sa,
 				       TRUNCATE_EXISTING, FILE_ATTRIBUTE_TEMPORARY, NULL);
-                   
+
       if (hFile[1] == INVALID_HANDLE_VALUE){
          ConErrPrintf (_T("Error creating temporary file for pipe data\n"));
          return;
       }
-                   
+
 		SetStdHandle (STD_OUTPUT_HANDLE, hFile[1]);
 
 		DoCommand (s);
@@ -747,7 +823,7 @@ VOID ParseCommandLine (LPTSTR cmd)
 	/* close old stdin file */
 #if 0  /* buggy implementation */
 	SetStdHandle (STD_INPUT_HANDLE, hOldConIn);
-	if ((hFile[0] != INVALID_HANDLE_VALUE) && 
+	if ((hFile[0] != INVALID_HANDLE_VALUE) &&
 		(hFile[0] != hOldConIn))
 	{
 		/* delete old stdin file, if it is a real file */
@@ -835,7 +911,7 @@ VOID ParseCommandLine (LPTSTR cmd)
  *
  */
 
-static INT 
+static INT
 ProcessInput (BOOL bFlag)
 {
 	TCHAR commandline[CMDLINE_LENGTH];
@@ -1248,7 +1324,7 @@ static VOID Cleanup (int argc, TCHAR *argv[])
 	FreeLastPath ();
 #endif
 
-#ifdef FEATURE_HISTORY	
+#ifdef FEATURE_HISTORY
 	CleanHistory();
 #endif
 
@@ -1329,8 +1405,8 @@ int main (int argc, char *argv[])
 
   SetFileApisToOEM();
 
-  hConsole = CreateFile(_T("CONOUT$"), GENERIC_READ|GENERIC_WRITE, 
-                        FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, 
+  hConsole = CreateFile(_T("CONOUT$"), GENERIC_READ|GENERIC_WRITE,
+                        FILE_SHARE_READ|FILE_SHARE_WRITE, NULL,
 			OPEN_EXISTING, 0, NULL);
   if (GetConsoleScreenBufferInfo(hConsole, &Info) == FALSE)
     {

From a3ce97af9b8bca023ac1cef061b3e7352d7f679e Mon Sep 17 00:00:00 2001
From: Gregor Anich <blight@blight.eu.org>
Date: Fri, 16 Jul 2004 21:50:40 +0000
Subject: [PATCH 314/356] Import Mesa-6.0.1 for use as software OpenGL
 renderer.

svn path=/trunk/; revision=10148
---
 reactos/lib/mesa32/Makefile                   |  256 +
 reactos/lib/mesa32/Mesa.dsw                   |  179 +
 reactos/lib/mesa32/README.ReactOS             |    8 +
 reactos/lib/mesa32/include/GL/amesa.h         |   65 +
 reactos/lib/mesa32/include/GL/dmesa.h         |  148 +
 reactos/lib/mesa32/include/GL/fxmesa.h        |  103 +
 reactos/lib/mesa32/include/GL/ggimesa.h       |   85 +
 reactos/lib/mesa32/include/GL/gl.h            | 2241 +++++++
 reactos/lib/mesa32/include/GL/gl_mangle.h     | 1356 ++++
 reactos/lib/mesa32/include/GL/glext.h         | 5919 +++++++++++++++++
 reactos/lib/mesa32/include/GL/glu.h           |  340 +
 reactos/lib/mesa32/include/GL/glu_mangle.h    |   86 +
 reactos/lib/mesa32/include/GL/glx.h           |  504 ++
 reactos/lib/mesa32/include/GL/glx_mangle.h    |   55 +
 reactos/lib/mesa32/include/GL/glxext.h        |  607 ++
 .../lib/mesa32/include/GL/internal/glcore.h   |  471 ++
 reactos/lib/mesa32/include/GL/mesa_wgl.h      |  123 +
 reactos/lib/mesa32/include/GL/mglmesa.h       |   79 +
 reactos/lib/mesa32/include/GL/osmesa.h        |  274 +
 reactos/lib/mesa32/include/GL/svgamesa.h      |   97 +
 reactos/lib/mesa32/include/GL/uglglutshapes.h |   45 +
 reactos/lib/mesa32/include/GL/uglmesa.h       |  155 +
 reactos/lib/mesa32/include/GL/vms_x_fix.h     |  880 +++
 reactos/lib/mesa32/include/GL/wmesa.h         |  140 +
 reactos/lib/mesa32/include/GL/xmesa.h         |  390 ++
 reactos/lib/mesa32/include/GL/xmesa_x.h       |   90 +
 reactos/lib/mesa32/include/GL/xmesa_xf86.h    |  187 +
 reactos/lib/mesa32/mesa32.def                 |  138 +
 reactos/lib/mesa32/mesa32.edf                 |  107 +
 29 files changed, 15128 insertions(+)
 create mode 100644 reactos/lib/mesa32/Makefile
 create mode 100644 reactos/lib/mesa32/Mesa.dsw
 create mode 100644 reactos/lib/mesa32/README.ReactOS
 create mode 100644 reactos/lib/mesa32/include/GL/amesa.h
 create mode 100644 reactos/lib/mesa32/include/GL/dmesa.h
 create mode 100644 reactos/lib/mesa32/include/GL/fxmesa.h
 create mode 100644 reactos/lib/mesa32/include/GL/ggimesa.h
 create mode 100644 reactos/lib/mesa32/include/GL/gl.h
 create mode 100644 reactos/lib/mesa32/include/GL/gl_mangle.h
 create mode 100644 reactos/lib/mesa32/include/GL/glext.h
 create mode 100644 reactos/lib/mesa32/include/GL/glu.h
 create mode 100644 reactos/lib/mesa32/include/GL/glu_mangle.h
 create mode 100644 reactos/lib/mesa32/include/GL/glx.h
 create mode 100644 reactos/lib/mesa32/include/GL/glx_mangle.h
 create mode 100644 reactos/lib/mesa32/include/GL/glxext.h
 create mode 100644 reactos/lib/mesa32/include/GL/internal/glcore.h
 create mode 100644 reactos/lib/mesa32/include/GL/mesa_wgl.h
 create mode 100644 reactos/lib/mesa32/include/GL/mglmesa.h
 create mode 100644 reactos/lib/mesa32/include/GL/osmesa.h
 create mode 100644 reactos/lib/mesa32/include/GL/svgamesa.h
 create mode 100644 reactos/lib/mesa32/include/GL/uglglutshapes.h
 create mode 100644 reactos/lib/mesa32/include/GL/uglmesa.h
 create mode 100644 reactos/lib/mesa32/include/GL/vms_x_fix.h
 create mode 100644 reactos/lib/mesa32/include/GL/wmesa.h
 create mode 100644 reactos/lib/mesa32/include/GL/xmesa.h
 create mode 100644 reactos/lib/mesa32/include/GL/xmesa_x.h
 create mode 100644 reactos/lib/mesa32/include/GL/xmesa_xf86.h
 create mode 100644 reactos/lib/mesa32/mesa32.def
 create mode 100644 reactos/lib/mesa32/mesa32.edf

diff --git a/reactos/lib/mesa32/Makefile b/reactos/lib/mesa32/Makefile
new file mode 100644
index 00000000000..0566a2f5944
--- /dev/null
+++ b/reactos/lib/mesa32/Makefile
@@ -0,0 +1,256 @@
+# configuration vars:
+#
+
+# MESA_HAVE_MMX
+# MESA_HAVE_SSE
+# MESA_HAVE_3DNOW
+# MESA_HAVE_X86
+
+#MESA_HAVE_MMX=1
+#MESA_HAVE_SSE=1
+#MESA_HAVE_3DNOW=1
+#MESA_HAVE_X86=1
+
+MESA_INCLUDE_DIRS = \
+	-Iinclude \
+	-Isrc \
+	-Isrc/main \
+	-Isrc/glapi \
+	-Isrc/math \
+	-Isrc/tnl \
+	-Isrc/swrast \
+	-Isrc/swrast_setup
+
+MESA_MAIN_OBJECTS = \
+	src/main/api_arrayelt.o \
+	src/main/api_loopback.o \
+	src/main/api_noop.o \
+	src/main/api_validate.o \
+	src/main/accum.o \
+	src/main/arbparse.o \
+	src/main/arbprogram.o \
+	src/main/arbfragparse.o \
+	src/main/arbvertparse.o \
+	src/main/attrib.o \
+	src/main/blend.o \
+	src/main/bufferobj.o \
+	src/main/buffers.o \
+	src/main/clip.o \
+	src/main/colortab.o \
+	src/main/context.o \
+	src/main/convolve.o \
+	src/main/debug.o \
+	src/main/depth.o \
+	src/main/dispatch.o \
+	src/main/dlist.o \
+	src/main/drawpix.o \
+	src/main/enable.o \
+	src/main/enums.o \
+	src/main/eval.o \
+	src/main/extensions.o \
+	src/main/feedback.o \
+	src/main/fog.o \
+	src/main/get.o \
+	src/main/hash.o \
+	src/main/hint.o \
+	src/main/histogram.o \
+	src/main/image.o \
+	src/main/imports.o \
+	src/main/light.o \
+	src/main/lines.o \
+	src/main/matrix.o \
+	src/main/nvprogram.o \
+	src/main/nvfragparse.o \
+	src/main/nvvertexec.o \
+	src/main/nvvertparse.o \
+	src/main/occlude.o \
+	src/main/pixel.o \
+	src/main/points.o \
+	src/main/polygon.o \
+	src/main/program.o \
+	src/main/rastpos.o \
+	src/main/state.o \
+	src/main/stencil.o \
+	src/main/texcompress.o \
+	src/main/texformat.o \
+	src/main/teximage.o \
+	src/main/texobj.o \
+	src/main/texstate.o \
+	src/main/texstore.o \
+	src/main/texutil.o \
+	src/main/varray.o \
+	src/main/vtxfmt.o
+
+MESA_GLAPI_OBJECTS = \
+	src/glapi/glapi.o \
+	src/glapi/glthread.o
+
+MESA_MATH_OBJECTS = \
+	src/math/m_debug_clip.o \
+	src/math/m_debug_norm.o \
+	src/math/m_debug_xform.o \
+	src/math/m_eval.o \
+	src/math/m_matrix.o \
+	src/math/m_translate.o \
+	src/math/m_vector.o \
+	src/math/m_xform.o
+
+MESA_ARRAY_CACHE_OBJECTS = \
+	src/array_cache/ac_context.o \
+	src/array_cache/ac_import.o
+
+MESA_SWRAST_OBJECTS = \
+	src/swrast/s_aaline.o \
+	src/swrast/s_aatriangle.o \
+	src/swrast/s_accum.o \
+	src/swrast/s_alpha.o \
+	src/swrast/s_alphabuf.o \
+	src/swrast/s_bitmap.o \
+	src/swrast/s_blend.o \
+	src/swrast/s_buffers.o \
+	src/swrast/s_copypix.o \
+	src/swrast/s_context.o \
+	src/swrast/s_depth.o \
+	src/swrast/s_drawpix.o \
+	src/swrast/s_feedback.o \
+	src/swrast/s_fog.o \
+	src/swrast/s_imaging.o \
+	src/swrast/s_lines.o \
+	src/swrast/s_logic.o \
+	src/swrast/s_masking.o \
+	src/swrast/s_nvfragprog.o \
+	src/swrast/s_pixeltex.o \
+	src/swrast/s_points.o \
+	src/swrast/s_readpix.o \
+	src/swrast/s_span.o \
+	src/swrast/s_stencil.o \
+	src/swrast/s_texture.o \
+	src/swrast/s_texstore.o \
+	src/swrast/s_triangle.o \
+	src/swrast/s_zoom.o
+
+MESA_SWRAST_SETUP_OBJECTS = \
+	src/swrast_setup/ss_context.o \
+	src/swrast_setup/ss_triangle.o
+
+MESA_TNL_OBJECTS = \
+	src/tnl/t_array_api.o \
+	src/tnl/t_array_import.o \
+	src/tnl/t_context.o \
+	src/tnl/t_pipeline.o \
+	src/tnl/t_save_api.o \
+	src/tnl/t_save_loopback.o \
+	src/tnl/t_save_playback.o \
+	src/tnl/t_vb_fog.o \
+	src/tnl/t_vb_light.o \
+	src/tnl/t_vb_normals.o \
+	src/tnl/t_vb_points.o \
+	src/tnl/t_vb_program.o \
+	src/tnl/t_vb_render.o \
+	src/tnl/t_vb_texgen.o \
+	src/tnl/t_vb_texmat.o \
+	src/tnl/t_vb_vertex.o \
+	src/tnl/t_vertex.o \
+	src/tnl/t_vtx_api.o \
+	src/tnl/t_vtx_eval.o \
+	src/tnl/t_vtx_exec.o 
+
+MESA_SPARC_OBJECTS =			\
+	src/sparc/clip.o		\
+	src/sparc/glapi_sparc.o	\
+	src/sparc/norm.o		\
+	src/sparc/xform.o
+
+MESA_X86_OBJECTS = \
+	src/x86/x86.o \
+	src/x86/glapi_x86.o \
+	src/x86/common_x86.o \
+	src/x86/common_x86_asm.o \
+	src/x86/x86_xform2.o \
+	src/x86/x86_xform3.o \
+	src/x86/x86_xform4.o \
+	src/x86/x86_cliptest.o
+
+MESA_X86_MMX_OBJECTS = \
+	src/x86/mmx_blend.o
+
+MESA_X86_SSE_OBJECTS = \
+	src/x86/sse.o \
+	src/x86/sse_xform2.o \
+	src/x86/sse_xform3.o \
+	src/x86/sse_xform4.o \
+	src/x86/sse_normal.o
+
+MESA_X86_K3D_OBJECTS = \
+	src/x86/3dnow.o \
+	src/x86/3dnow_xform2.o \
+	src/x86/3dnow_xform3.o \
+	src/x86/3dnow_xform4.o \
+	src/x86/3dnow_normal.o
+
+MESA_CORE_OBJECTS = \
+	$(MESA_MAIN_OBJECTS) \
+	$(MESA_GLAPI_OBJECTS) \
+	$(MESA_MATH_OBJECTS) \
+	$(MESA_ARRAY_CACHE_OBJECTS) \
+	$(MESA_TNL_OBJECTS) \
+	$(MESA_SWRAST_OBJECTS) \
+	$(MESA_SWRAST_SETUP_OBJECTS)
+
+MESA_DRIVER_OBJECTS = \
+	src/drivers/windows/gdi/wmesa.o \
+	src/drivers/windows/icd/icd.o
+
+MESA_CFLAGS = -DBUILD_GL32 -D_OPENGL32_ -D_MSC_VER -DUSE_MGL_NAMESPACE $(MESA_INCLUDE_DIRS)
+
+ifeq ($(MESA_HAVE_MMX),1)
+MESA_X86_OBJECTS += $(MESA_X86_MMX_OBJECTS)
+MESA_CFLAGS += -DUSE_MMX_ASM
+MESA_HAVE_X86 = 1
+endif
+
+ifeq ($(MESA_HAVE_SSE),1)
+MESA_X86_OBJECTS += $(MESA_X86_SSE_OBJECTS)
+MESA_CFLAGS += -DUSE_SSE_ASM
+MESA_HAVE_X86 = 1
+endif
+
+ifeq ($(MESA_HAVE_3DNOW),1)
+MESA_X86_OBJECTS += $(MESA_X86_K3D_OBJECTS)
+MESA_CFLAGS += -DUSE_3DNOW_ASM
+MESA_HAVE_X86 = 1
+endif
+
+ifeq ($(MESA_HAVE_X86),1)
+MESA_CFLAGS += -DUSE_X86_ASM
+else
+MESA_X86_OBJECTS =
+endif
+
+
+PATH_TO_TOP = ../..
+
+TARGET_TYPE = dynlink
+
+TARGET_NORC = yes
+
+TARGET_NAME = mesa32
+
+TARGET_BASE = $(TARGET_BASE_LIB_MESA32)
+
+TARGET_CFLAGS = -D__USE_W32API -Wall $(MESA_CFLAGS)
+
+TARGET_GCCLIBS = gdi32
+
+TARGET_OBJECTS = $(MESA_CORE_OBJECTS) $(MESA_X86_OBJECTS) $(MESA_DRIVER_OBJECTS)
+
+
+DEP_OBJECTS = $(TARGET_OBJECTS)
+
+include $(PATH_TO_TOP)/rules.mak
+
+include $(TOOLS_PATH)/helper.mk
+
+#include $(TOOLS_PATH)/depend.mk
+
+# EOF
diff --git a/reactos/lib/mesa32/Mesa.dsw b/reactos/lib/mesa32/Mesa.dsw
new file mode 100644
index 00000000000..5980b5c89e6
--- /dev/null
+++ b/reactos/lib/mesa32/Mesa.dsw
@@ -0,0 +1,179 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "array_cache"=".\SRC\MESA\array_cache\array_cache.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "gdi"=".\src\mesa\drivers\windows\gdi\gdi.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name array_cache
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name main
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name math
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name swrast_setup
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name swrast
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name tnl
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name glapi
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "glapi"=".\SRC\MESA\glapi\glapi.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "glu"=".\src\glu\sgi\glu.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name gdi
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "glut"=".\src\glut\glx\glut.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name glu
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "main"=".\SRC\MESA\main\main.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "math"=".\SRC\MESA\math\math.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "osmesa"=".\SRC\MESA\DRIVERS\osmesa\osmesa.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name gdi
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "swrast"=".\SRC\MESA\swrast\swrast.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "swrast_setup"=".\SRC\MESA\swrast_setup\swrast_setup.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "tnl"=".\SRC\MESA\tnl\tnl.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/reactos/lib/mesa32/README.ReactOS b/reactos/lib/mesa32/README.ReactOS
new file mode 100644
index 00000000000..c0c75fed9ef
--- /dev/null
+++ b/reactos/lib/mesa32/README.ReactOS
@@ -0,0 +1,8 @@
+This is Mesa-6.0.1 (http://www.mesa3d.org/) with an ICD interface.
+
+The ICD functions are in src/drivers/windows/icd/icd.c
+I have created a new Makefile for ReactOS which will build Mesa with the ICD
+interface. I have not adjusted the Visual C++ project/workspace files.
+
+ --blight
+ 
\ No newline at end of file
diff --git a/reactos/lib/mesa32/include/GL/amesa.h b/reactos/lib/mesa32/include/GL/amesa.h
new file mode 100644
index 00000000000..852d34cf4f5
--- /dev/null
+++ b/reactos/lib/mesa32/include/GL/amesa.h
@@ -0,0 +1,65 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.3
+ * 
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/* Allegro (DJGPP) driver by Bernhard Tschirren (bernie-t@geocities.com) */
+
+
+#ifndef AMESA_H
+#define AMESA_H
+
+
+#define AMESA_MAJOR_VERSION 3
+#define AMESA_MINOR_VERSION 3
+
+
+typedef struct amesa_visual  *AMesaVisual;
+typedef struct amesa_buffer  *AMesaBuffer;
+typedef struct amesa_context *AMesaContext;
+
+
+extern AMesaVisual AMesaCreateVisual(GLboolean dbFlag, GLint depth,
+                                     GLint depthSize,
+                                     GLint stencilSize,
+                                     GLint accumSize);
+
+extern void AMesaDestroyVisual(AMesaVisual visual);
+
+extern AMesaBuffer AMesaCreateBuffer(AMesaVisual visual,
+                                     GLint width, GLint height);
+
+extern void AMesaDestroyBuffer(AMesaBuffer buffer);
+
+
+extern AMesaContext AMesaCreateContext(AMesaVisual visual,
+                                       AMesaContext sharelist);
+
+extern void AMesaDestroyContext(AMesaContext context);
+
+extern GLboolean AMesaMakeCurrent(AMesaContext context, AMesaBuffer buffer);
+
+extern void AMesaSwapBuffers(AMesaBuffer buffer);
+
+
+#endif /* AMESA_H */
diff --git a/reactos/lib/mesa32/include/GL/dmesa.h b/reactos/lib/mesa32/include/GL/dmesa.h
new file mode 100644
index 00000000000..364792ac1ab
--- /dev/null
+++ b/reactos/lib/mesa32/include/GL/dmesa.h
@@ -0,0 +1,148 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.0
+ * 
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * DOS/DJGPP device driver v1.5 for Mesa
+ *
+ *  Copyright (C) 2002 - Borca Daniel
+ *  Email : dborca@users.sourceforge.net
+ *  Web   : http://www.geocities.com/dborca
+ */
+
+
+#ifndef DMESA_H_included
+#define DMESA_H_included
+
+#define DMESA_MAJOR_VERSION 5
+#define DMESA_MINOR_VERSION 0
+
+/* Sample Usage:
+ *
+ * 1. Call DMesaCreateVisual() to initialize graphics.
+ * 2. Call DMesaCreateContext() to create a DMesa rendering context.
+ * 3. Call DMesaCreateBuffer() to define the window.
+ * 4. Call DMesaMakeCurrent() to bind the DMesaBuffer to a DMesaContext.
+ * 5. Make gl* calls to render your graphics.
+ * 6. Use DMesaSwapBuffers() when double buffering to swap front/back buffers.
+ * 7. Before exiting, destroy DMesaBuffer, DMesaContext and DMesaVisual.
+ */
+
+typedef struct dmesa_context *DMesaContext;
+typedef struct dmesa_visual *DMesaVisual;
+typedef struct dmesa_buffer *DMesaBuffer;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Create a new Visual and set graphics mode.
+ */
+DMesaVisual DMesaCreateVisual (GLint width,        /* X res */
+                               GLint height,       /* Y res */
+                               GLint colDepth,     /* BPP */
+                               GLint refresh,      /* refresh rate: 0=default */
+                               GLboolean dbFlag,   /* double-buffered */
+                               GLboolean rgbFlag,  /* RGB mode */
+                               GLint alphaSize,    /* requested bits/alpha */
+                               GLint depthSize,    /* requested bits/depth */
+                               GLint stencilSize,  /* requested bits/stencil */
+                               GLint accumSize);   /* requested bits/accum */
+
+/*
+ * Destroy Visual and restore screen.
+ */
+void DMesaDestroyVisual (DMesaVisual v);
+
+
+
+/*
+ * Create a new Context for rendering.
+ */
+DMesaContext DMesaCreateContext (DMesaVisual visual, DMesaContext share);
+
+/*
+ * Destroy Context.
+ */
+void DMesaDestroyContext (DMesaContext c);
+
+/*
+ * Return a handle to the current context.
+ */
+void *DMesaGetCurrentContext (void);
+
+
+
+/*
+ * Create a new Buffer (window).
+ */
+DMesaBuffer DMesaCreateBuffer (DMesaVisual visual,
+                               GLint xpos, GLint ypos,
+                               GLint width, GLint height);
+
+/*
+ * Destroy Buffer.
+ */
+void DMesaDestroyBuffer (DMesaBuffer b);
+
+/*
+ * Swap the front and back buffers for the given Buffer.
+ * No action is taken if the buffer is not double buffered.
+ */
+void DMesaSwapBuffers (DMesaBuffer b);
+
+/*
+ * Bind Buffer to Context and make the Context the current one.
+ */
+GLboolean DMesaMakeCurrent (DMesaContext c, DMesaBuffer b);
+
+
+
+/*
+ * Move/Resize current Buffer.
+ */
+GLboolean DMesaMoveBuffer (GLint xpos, GLint ypos);
+GLboolean DMesaResizeBuffer (GLint width, GLint height);
+
+/*
+ * Set palette index, using normalized values.
+ */
+void DMesaSetCI (int ndx, GLfloat red, GLfloat green, GLfloat blue);
+
+/*
+ * DMesa state retrieval.
+ */
+#define DMESA_GET_SCREEN_SIZE 0x0100
+#define DMESA_GET_DRIVER_CAPS 0x0200
+#define DMESA_GET_VIDEO_MODES 0x0300
+
+#define DMESA_DRIVER_SWDB_BIT 0x1 /* software double-buffered */
+#define DMESA_DRIVER_LLWO_BIT 0x2 /* lower-left window origin */
+int DMesaGetIntegerv (GLenum pname, GLint *params);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/reactos/lib/mesa32/include/GL/fxmesa.h b/reactos/lib/mesa32/include/GL/fxmesa.h
new file mode 100644
index 00000000000..5c63a8db658
--- /dev/null
+++ b/reactos/lib/mesa32/include/GL/fxmesa.h
@@ -0,0 +1,103 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.0
+ * Copyright (C) 1995-2001  Brian Paul
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
+/*
+ * FXMesa - 3Dfx Glide driver for Mesa.  Contributed by David Bucciarelli
+ *
+ * NOTE: This version requires Glide3 (http://sourceforge.net/projects/glide)
+ */
+
+
+#ifndef FXMESA_H
+#define FXMESA_H
+
+
+#include <glide.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#define FXMESA_MAJOR_VERSION 5
+#define FXMESA_MINOR_VERSION 0
+
+
+/*
+ * Values for attribList parameter to fxMesaCreateContext():
+ */
+#define FXMESA_NONE		0	/* to terminate attribList */
+#define FXMESA_DOUBLEBUFFER	10
+#define FXMESA_ALPHA_SIZE	11      /* followed by an integer */
+#define FXMESA_DEPTH_SIZE	12      /* followed by an integer */
+#define FXMESA_STENCIL_SIZE	13      /* followed by an integer */
+#define FXMESA_ACCUM_SIZE	14      /* followed by an integer */
+#define FXMESA_COLORDEPTH	20      /* followed by an integer */
+#define FXMESA_SHARE_CONTEXT 990099	/* keep in sync with xmesa1.c! */
+
+
+
+typedef struct tfxMesaContext *fxMesaContext;
+
+
+#if defined (__BEOS__)
+#pragma export on
+#endif
+
+
+GLAPI fxMesaContext GLAPIENTRY fxMesaCreateContext(GLuint win, GrScreenResolution_t,
+						  GrScreenRefresh_t,
+						  const GLint attribList[]);
+
+GLAPI fxMesaContext GLAPIENTRY fxMesaCreateBestContext(GLuint win,
+						      GLint width, GLint height,
+						      const GLint attribList[]);
+GLAPI void GLAPIENTRY fxMesaDestroyContext(fxMesaContext ctx);
+
+GLAPI GLint GLAPIENTRY fxMesaSelectCurrentBoard(int n);
+
+GLAPI void GLAPIENTRY fxMesaMakeCurrent(fxMesaContext ctx);
+
+GLAPI void * GLAPIENTRY fxMesaGetCurrentContext(void);
+
+GLAPI void GLAPIENTRY fxMesaSwapBuffers(void);
+
+GLAPI void GLAPIENTRY fxMesaSetNearFar(GLfloat nearVal, GLfloat farVal);
+
+GLAPI void GLAPIENTRY fxMesaUpdateScreenSize(fxMesaContext ctx);
+
+GLAPI void GLAPIENTRY fxCloseHardware(void);
+
+GLAPI void GLAPIENTRY fxGetScreenGeometry (GLint *w, GLint *h);
+
+
+#if defined (__BEOS__)
+#pragma export off
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif
diff --git a/reactos/lib/mesa32/include/GL/ggimesa.h b/reactos/lib/mesa32/include/GL/ggimesa.h
new file mode 100644
index 00000000000..90e0b422225
--- /dev/null
+++ b/reactos/lib/mesa32/include/GL/ggimesa.h
@@ -0,0 +1,85 @@
+/*
+ * Mesa 3-D graphics library GGI bindings (GGIGL [giggle])
+ * Version:  4.0
+ * Copyright (C) 1995-2000  Brian Paul
+ * Copyright (C) 1998  Uwe Maurer
+ * Copyrigth (C) 2001 Filip Spacek
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
+#ifndef GGIMESA_H
+#define GGIMESA_H
+
+#define GGIMESA_MAJOR_VERSION 4
+#define GGIMESA_MINOR_VERSION 0
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <ggi/ggi.h>
+#include "GL/gl.h"
+  
+typedef struct ggi_mesa_context *ggi_mesa_context_t;
+
+/*
+ * Initialize Mesa GGI extension
+ */
+int ggiMesaInit(void);
+/*
+ * Clean up Mesa GGI exension
+ */
+int ggiMesaExit(void);
+
+/*
+ * Attach Mesa GGI extension to the visual 'vis'
+ */
+int ggiMesaAttach(ggi_visual_t vis);
+/*
+ * Detach Mesa GGI extension from the visual 'vis'
+ */
+int ggiMesaDetach(ggi_visual_t vis);
+
+int ggiMesaExtendVisual(ggi_visual_t vis, GLboolean alpha_flag,
+			GLboolean stereo_flag, GLint depth_size,
+			GLint stencil_size, GLint accum_red_size,
+			GLint accum_green_size, GLint accum_blue_size,
+			GLint accum_alpha_size, GLint num_samples);
+
+/*
+ * Create a new context capable of displaying on the visual vis.
+ */
+ggi_mesa_context_t ggiMesaCreateContext(ggi_visual_t vis);
+/*
+ * Destroy the context 'ctx'
+ */
+void ggiMesaDestroyContext(ggi_mesa_context_t ctx);
+
+/*
+ * Make context 'ctx' the current context and bind it to visual 'vis'.
+ * Note that the context must have been created with respect to that visual.
+ */
+void ggiMesaMakeCurrent(ggi_mesa_context_t ctx, ggi_visual_t vis);
+
+void ggiMesaSwapBuffers(void);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/reactos/lib/mesa32/include/GL/gl.h b/reactos/lib/mesa32/include/GL/gl.h
new file mode 100644
index 00000000000..56b883b1c3a
--- /dev/null
+++ b/reactos/lib/mesa32/include/GL/gl.h
@@ -0,0 +1,2241 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0.1
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef __gl_h_
+#define __gl_h_
+
+#if defined(USE_MGL_NAMESPACE)
+#include "gl_mangle.h"
+#endif
+
+
+/**********************************************************************
+ * Begin system-specific stuff. Do not do any of this when building
+ * for SciTech SNAP, as this is all done before this header file is
+ * included. 
+ */
+#if !defined(__SCITECH_SNAP__)
+
+#include <stddef.h>     /* to get ptrdiff_t, used below */
+
+#if defined(__BEOS__)
+#include <stdlib.h>     /* to get some BeOS-isms */
+#endif
+
+#if !defined(OPENSTEP) && (defined(NeXT) || defined(NeXT_PDO))
+#define OPENSTEP
+#endif
+
+#if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__)
+#define __WIN32__
+#endif
+
+#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__))
+#  if defined(_MSC_VER) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
+#    define GLAPI __declspec(dllexport)
+#  elif defined(_MSC_VER) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
+#    define GLAPI __declspec(dllimport)
+#  else /* for use with static link lib build of Win32 edition only */
+#    define GLAPI extern
+#  endif /* _STATIC_MESA support */
+#  define GLAPIENTRY __stdcall
+#else
+/* non-Windows compilation */
+#  define GLAPI extern
+#  define GLAPIENTRY
+#endif /* WIN32 / CYGWIN bracket */
+
+#if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__)
+#  define PRAGMA_EXPORT_SUPPORTED		1
+#endif
+
+/*
+ * WINDOWS: Include windows.h here to define APIENTRY.
+ * It is also useful when applications include this file by
+ * including only glut.h, since glut.h depends on windows.h.
+ * Applications needing to include windows.h with parms other
+ * than "WIN32_LEAN_AND_MEAN" may include windows.h before
+ * glut.h or gl.h.
+ */
+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__)
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#endif
+
+#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP) && !defined(__CYGWIN__)
+#include <GL/mesa_wgl.h>
+#endif
+
+#if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED
+#pragma import on
+#endif
+
+#ifndef APIENTRY
+#define APIENTRY GLAPIENTRY
+#endif
+#define APIENTRYP APIENTRY *
+
+#ifndef GLAPIENTRYP
+#define GLAPIENTRYP GLAPIENTRY *
+#endif
+
+#ifdef CENTERLINE_CLPP
+#define signed
+#endif
+
+#if defined(PRAGMA_EXPORT_SUPPORTED)
+#pragma export on
+#endif
+
+#endif /* !__SCITECH_SNAP__ */
+/*
+ * End system-specific stuff.
+ **********************************************************************/
+
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
+#define GL_VERSION_1_1   1
+#define GL_VERSION_1_2   1
+#define GL_VERSION_1_3   1
+#define GL_ARB_imaging   1
+
+
+/*
+ * Datatypes
+ */
+typedef unsigned int	GLenum;
+typedef unsigned char	GLboolean;
+typedef unsigned int	GLbitfield;
+typedef void		GLvoid;
+typedef signed char	GLbyte;		/* 1-byte signed */
+typedef short		GLshort;	/* 2-byte signed */
+typedef int		GLint;		/* 4-byte signed */
+typedef unsigned char	GLubyte;	/* 1-byte unsigned */
+typedef unsigned short	GLushort;	/* 2-byte unsigned */
+typedef unsigned int	GLuint;		/* 4-byte unsigned */
+typedef int		GLsizei;	/* 4-byte signed */
+typedef float		GLfloat;	/* single precision float */
+typedef float		GLclampf;	/* single precision float in [0,1] */
+typedef double		GLdouble;	/* double precision float */
+typedef double		GLclampd;	/* double precision float in [0,1] */
+
+
+
+/*
+ * Constants
+ */
+
+/* Boolean values */
+#define GL_FALSE				0x0
+#define GL_TRUE					0x1
+
+/* Data types */
+#define GL_BYTE					0x1400
+#define GL_UNSIGNED_BYTE			0x1401
+#define GL_SHORT				0x1402
+#define GL_UNSIGNED_SHORT			0x1403
+#define GL_INT					0x1404
+#define GL_UNSIGNED_INT				0x1405
+#define GL_FLOAT				0x1406
+#define GL_DOUBLE				0x140A
+#define GL_2_BYTES				0x1407
+#define GL_3_BYTES				0x1408
+#define GL_4_BYTES				0x1409
+
+/* Primitives */
+#define GL_POINTS				0x0000
+#define GL_LINES				0x0001
+#define GL_LINE_LOOP				0x0002
+#define GL_LINE_STRIP				0x0003
+#define GL_TRIANGLES				0x0004
+#define GL_TRIANGLE_STRIP			0x0005
+#define GL_TRIANGLE_FAN				0x0006
+#define GL_QUADS				0x0007
+#define GL_QUAD_STRIP				0x0008
+#define GL_POLYGON				0x0009
+
+/* Vertex Arrays */
+#define GL_VERTEX_ARRAY				0x8074
+#define GL_NORMAL_ARRAY				0x8075
+#define GL_COLOR_ARRAY				0x8076
+#define GL_INDEX_ARRAY				0x8077
+#define GL_TEXTURE_COORD_ARRAY			0x8078
+#define GL_EDGE_FLAG_ARRAY			0x8079
+#define GL_VERTEX_ARRAY_SIZE			0x807A
+#define GL_VERTEX_ARRAY_TYPE			0x807B
+#define GL_VERTEX_ARRAY_STRIDE			0x807C
+#define GL_NORMAL_ARRAY_TYPE			0x807E
+#define GL_NORMAL_ARRAY_STRIDE			0x807F
+#define GL_COLOR_ARRAY_SIZE			0x8081
+#define GL_COLOR_ARRAY_TYPE			0x8082
+#define GL_COLOR_ARRAY_STRIDE			0x8083
+#define GL_INDEX_ARRAY_TYPE			0x8085
+#define GL_INDEX_ARRAY_STRIDE			0x8086
+#define GL_TEXTURE_COORD_ARRAY_SIZE		0x8088
+#define GL_TEXTURE_COORD_ARRAY_TYPE		0x8089
+#define GL_TEXTURE_COORD_ARRAY_STRIDE		0x808A
+#define GL_EDGE_FLAG_ARRAY_STRIDE		0x808C
+#define GL_VERTEX_ARRAY_POINTER			0x808E
+#define GL_NORMAL_ARRAY_POINTER			0x808F
+#define GL_COLOR_ARRAY_POINTER			0x8090
+#define GL_INDEX_ARRAY_POINTER			0x8091
+#define GL_TEXTURE_COORD_ARRAY_POINTER		0x8092
+#define GL_EDGE_FLAG_ARRAY_POINTER		0x8093
+#define GL_V2F					0x2A20
+#define GL_V3F					0x2A21
+#define GL_C4UB_V2F				0x2A22
+#define GL_C4UB_V3F				0x2A23
+#define GL_C3F_V3F				0x2A24
+#define GL_N3F_V3F				0x2A25
+#define GL_C4F_N3F_V3F				0x2A26
+#define GL_T2F_V3F				0x2A27
+#define GL_T4F_V4F				0x2A28
+#define GL_T2F_C4UB_V3F				0x2A29
+#define GL_T2F_C3F_V3F				0x2A2A
+#define GL_T2F_N3F_V3F				0x2A2B
+#define GL_T2F_C4F_N3F_V3F			0x2A2C
+#define GL_T4F_C4F_N3F_V4F			0x2A2D
+
+/* Matrix Mode */
+#define GL_MATRIX_MODE				0x0BA0
+#define GL_MODELVIEW				0x1700
+#define GL_PROJECTION				0x1701
+#define GL_TEXTURE				0x1702
+
+/* Points */
+#define GL_POINT_SMOOTH				0x0B10
+#define GL_POINT_SIZE				0x0B11
+#define GL_POINT_SIZE_GRANULARITY 		0x0B13
+#define GL_POINT_SIZE_RANGE			0x0B12
+
+/* Lines */
+#define GL_LINE_SMOOTH				0x0B20
+#define GL_LINE_STIPPLE				0x0B24
+#define GL_LINE_STIPPLE_PATTERN			0x0B25
+#define GL_LINE_STIPPLE_REPEAT			0x0B26
+#define GL_LINE_WIDTH				0x0B21
+#define GL_LINE_WIDTH_GRANULARITY		0x0B23
+#define GL_LINE_WIDTH_RANGE			0x0B22
+
+/* Polygons */
+#define GL_POINT				0x1B00
+#define GL_LINE					0x1B01
+#define GL_FILL					0x1B02
+#define GL_CW					0x0900
+#define GL_CCW					0x0901
+#define GL_FRONT				0x0404
+#define GL_BACK					0x0405
+#define GL_POLYGON_MODE				0x0B40
+#define GL_POLYGON_SMOOTH			0x0B41
+#define GL_POLYGON_STIPPLE			0x0B42
+#define GL_EDGE_FLAG				0x0B43
+#define GL_CULL_FACE				0x0B44
+#define GL_CULL_FACE_MODE			0x0B45
+#define GL_FRONT_FACE				0x0B46
+#define GL_POLYGON_OFFSET_FACTOR		0x8038
+#define GL_POLYGON_OFFSET_UNITS			0x2A00
+#define GL_POLYGON_OFFSET_POINT			0x2A01
+#define GL_POLYGON_OFFSET_LINE			0x2A02
+#define GL_POLYGON_OFFSET_FILL			0x8037
+
+/* Display Lists */
+#define GL_COMPILE				0x1300
+#define GL_COMPILE_AND_EXECUTE			0x1301
+#define GL_LIST_BASE				0x0B32
+#define GL_LIST_INDEX				0x0B33
+#define GL_LIST_MODE				0x0B30
+
+/* Depth buffer */
+#define GL_NEVER				0x0200
+#define GL_LESS					0x0201
+#define GL_EQUAL				0x0202
+#define GL_LEQUAL				0x0203
+#define GL_GREATER				0x0204
+#define GL_NOTEQUAL				0x0205
+#define GL_GEQUAL				0x0206
+#define GL_ALWAYS				0x0207
+#define GL_DEPTH_TEST				0x0B71
+#define GL_DEPTH_BITS				0x0D56
+#define GL_DEPTH_CLEAR_VALUE			0x0B73
+#define GL_DEPTH_FUNC				0x0B74
+#define GL_DEPTH_RANGE				0x0B70
+#define GL_DEPTH_WRITEMASK			0x0B72
+#define GL_DEPTH_COMPONENT			0x1902
+
+/* Lighting */
+#define GL_LIGHTING				0x0B50
+#define GL_LIGHT0				0x4000
+#define GL_LIGHT1				0x4001
+#define GL_LIGHT2				0x4002
+#define GL_LIGHT3				0x4003
+#define GL_LIGHT4				0x4004
+#define GL_LIGHT5				0x4005
+#define GL_LIGHT6				0x4006
+#define GL_LIGHT7				0x4007
+#define GL_SPOT_EXPONENT			0x1205
+#define GL_SPOT_CUTOFF				0x1206
+#define GL_CONSTANT_ATTENUATION			0x1207
+#define GL_LINEAR_ATTENUATION			0x1208
+#define GL_QUADRATIC_ATTENUATION		0x1209
+#define GL_AMBIENT				0x1200
+#define GL_DIFFUSE				0x1201
+#define GL_SPECULAR				0x1202
+#define GL_SHININESS				0x1601
+#define GL_EMISSION				0x1600
+#define GL_POSITION				0x1203
+#define GL_SPOT_DIRECTION			0x1204
+#define GL_AMBIENT_AND_DIFFUSE			0x1602
+#define GL_COLOR_INDEXES			0x1603
+#define GL_LIGHT_MODEL_TWO_SIDE			0x0B52
+#define GL_LIGHT_MODEL_LOCAL_VIEWER		0x0B51
+#define GL_LIGHT_MODEL_AMBIENT			0x0B53
+#define GL_FRONT_AND_BACK			0x0408
+#define GL_SHADE_MODEL				0x0B54
+#define GL_FLAT					0x1D00
+#define GL_SMOOTH				0x1D01
+#define GL_COLOR_MATERIAL			0x0B57
+#define GL_COLOR_MATERIAL_FACE			0x0B55
+#define GL_COLOR_MATERIAL_PARAMETER		0x0B56
+#define GL_NORMALIZE				0x0BA1
+
+/* User clipping planes */
+#define GL_CLIP_PLANE0				0x3000
+#define GL_CLIP_PLANE1				0x3001
+#define GL_CLIP_PLANE2				0x3002
+#define GL_CLIP_PLANE3				0x3003
+#define GL_CLIP_PLANE4				0x3004
+#define GL_CLIP_PLANE5				0x3005
+
+/* Accumulation buffer */
+#define GL_ACCUM_RED_BITS			0x0D58
+#define GL_ACCUM_GREEN_BITS			0x0D59
+#define GL_ACCUM_BLUE_BITS			0x0D5A
+#define GL_ACCUM_ALPHA_BITS			0x0D5B
+#define GL_ACCUM_CLEAR_VALUE			0x0B80
+#define GL_ACCUM				0x0100
+#define GL_ADD					0x0104
+#define GL_LOAD					0x0101
+#define GL_MULT					0x0103
+#define GL_RETURN				0x0102
+
+/* Alpha testing */
+#define GL_ALPHA_TEST				0x0BC0
+#define GL_ALPHA_TEST_REF			0x0BC2
+#define GL_ALPHA_TEST_FUNC			0x0BC1
+
+/* Blending */
+#define GL_BLEND				0x0BE2
+#define GL_BLEND_SRC				0x0BE1
+#define GL_BLEND_DST				0x0BE0
+#define GL_ZERO					0x0
+#define GL_ONE					0x1
+#define GL_SRC_COLOR				0x0300
+#define GL_ONE_MINUS_SRC_COLOR			0x0301
+#define GL_SRC_ALPHA				0x0302
+#define GL_ONE_MINUS_SRC_ALPHA			0x0303
+#define GL_DST_ALPHA				0x0304
+#define GL_ONE_MINUS_DST_ALPHA			0x0305
+#define GL_DST_COLOR				0x0306
+#define GL_ONE_MINUS_DST_COLOR			0x0307
+#define GL_SRC_ALPHA_SATURATE			0x0308
+
+/* Render Mode */
+#define GL_FEEDBACK				0x1C01
+#define GL_RENDER				0x1C00
+#define GL_SELECT				0x1C02
+
+/* Feedback */
+#define GL_2D					0x0600
+#define GL_3D					0x0601
+#define GL_3D_COLOR				0x0602
+#define GL_3D_COLOR_TEXTURE			0x0603
+#define GL_4D_COLOR_TEXTURE			0x0604
+#define GL_POINT_TOKEN				0x0701
+#define GL_LINE_TOKEN				0x0702
+#define GL_LINE_RESET_TOKEN			0x0707
+#define GL_POLYGON_TOKEN			0x0703
+#define GL_BITMAP_TOKEN				0x0704
+#define GL_DRAW_PIXEL_TOKEN			0x0705
+#define GL_COPY_PIXEL_TOKEN			0x0706
+#define GL_PASS_THROUGH_TOKEN			0x0700
+#define GL_FEEDBACK_BUFFER_POINTER		0x0DF0
+#define GL_FEEDBACK_BUFFER_SIZE			0x0DF1
+#define GL_FEEDBACK_BUFFER_TYPE			0x0DF2
+
+/* Selection */
+#define GL_SELECTION_BUFFER_POINTER		0x0DF3
+#define GL_SELECTION_BUFFER_SIZE		0x0DF4
+
+/* Fog */
+#define GL_FOG					0x0B60
+#define GL_FOG_MODE				0x0B65
+#define GL_FOG_DENSITY				0x0B62
+#define GL_FOG_COLOR				0x0B66
+#define GL_FOG_INDEX				0x0B61
+#define GL_FOG_START				0x0B63
+#define GL_FOG_END				0x0B64
+#define GL_LINEAR				0x2601
+#define GL_EXP					0x0800
+#define GL_EXP2					0x0801
+
+/* Logic Ops */
+#define GL_LOGIC_OP				0x0BF1
+#define GL_INDEX_LOGIC_OP			0x0BF1
+#define GL_COLOR_LOGIC_OP			0x0BF2
+#define GL_LOGIC_OP_MODE			0x0BF0
+#define GL_CLEAR				0x1500
+#define GL_SET					0x150F
+#define GL_COPY					0x1503
+#define GL_COPY_INVERTED			0x150C
+#define GL_NOOP					0x1505
+#define GL_INVERT				0x150A
+#define GL_AND					0x1501
+#define GL_NAND					0x150E
+#define GL_OR					0x1507
+#define GL_NOR					0x1508
+#define GL_XOR					0x1506
+#define GL_EQUIV				0x1509
+#define GL_AND_REVERSE				0x1502
+#define GL_AND_INVERTED				0x1504
+#define GL_OR_REVERSE				0x150B
+#define GL_OR_INVERTED				0x150D
+
+/* Stencil */
+#define GL_STENCIL_TEST				0x0B90
+#define GL_STENCIL_WRITEMASK			0x0B98
+#define GL_STENCIL_BITS				0x0D57
+#define GL_STENCIL_FUNC				0x0B92
+#define GL_STENCIL_VALUE_MASK			0x0B93
+#define GL_STENCIL_REF				0x0B97
+#define GL_STENCIL_FAIL				0x0B94
+#define GL_STENCIL_PASS_DEPTH_PASS		0x0B96
+#define GL_STENCIL_PASS_DEPTH_FAIL		0x0B95
+#define GL_STENCIL_CLEAR_VALUE			0x0B91
+#define GL_STENCIL_INDEX			0x1901
+#define GL_KEEP					0x1E00
+#define GL_REPLACE				0x1E01
+#define GL_INCR					0x1E02
+#define GL_DECR					0x1E03
+
+/* Buffers, Pixel Drawing/Reading */
+#define GL_NONE					0x0
+#define GL_LEFT					0x0406
+#define GL_RIGHT				0x0407
+/*GL_FRONT					0x0404 */
+/*GL_BACK					0x0405 */
+/*GL_FRONT_AND_BACK				0x0408 */
+#define GL_FRONT_LEFT				0x0400
+#define GL_FRONT_RIGHT				0x0401
+#define GL_BACK_LEFT				0x0402
+#define GL_BACK_RIGHT				0x0403
+#define GL_AUX0					0x0409
+#define GL_AUX1					0x040A
+#define GL_AUX2					0x040B
+#define GL_AUX3					0x040C
+#define GL_COLOR_INDEX				0x1900
+#define GL_RED					0x1903
+#define GL_GREEN				0x1904
+#define GL_BLUE					0x1905
+#define GL_ALPHA				0x1906
+#define GL_LUMINANCE				0x1909
+#define GL_LUMINANCE_ALPHA			0x190A
+#define GL_ALPHA_BITS				0x0D55
+#define GL_RED_BITS				0x0D52
+#define GL_GREEN_BITS				0x0D53
+#define GL_BLUE_BITS				0x0D54
+#define GL_INDEX_BITS				0x0D51
+#define GL_SUBPIXEL_BITS			0x0D50
+#define GL_AUX_BUFFERS				0x0C00
+#define GL_READ_BUFFER				0x0C02
+#define GL_DRAW_BUFFER				0x0C01
+#define GL_DOUBLEBUFFER				0x0C32
+#define GL_STEREO				0x0C33
+#define GL_BITMAP				0x1A00
+#define GL_COLOR				0x1800
+#define GL_DEPTH				0x1801
+#define GL_STENCIL				0x1802
+#define GL_DITHER				0x0BD0
+#define GL_RGB					0x1907
+#define GL_RGBA					0x1908
+
+/* Implementation limits */
+#define GL_MAX_LIST_NESTING			0x0B31
+#define GL_MAX_ATTRIB_STACK_DEPTH		0x0D35
+#define GL_MAX_MODELVIEW_STACK_DEPTH		0x0D36
+#define GL_MAX_NAME_STACK_DEPTH			0x0D37
+#define GL_MAX_PROJECTION_STACK_DEPTH		0x0D38
+#define GL_MAX_TEXTURE_STACK_DEPTH		0x0D39
+#define GL_MAX_EVAL_ORDER			0x0D30
+#define GL_MAX_LIGHTS				0x0D31
+#define GL_MAX_CLIP_PLANES			0x0D32
+#define GL_MAX_TEXTURE_SIZE			0x0D33
+#define GL_MAX_PIXEL_MAP_TABLE			0x0D34
+#define GL_MAX_VIEWPORT_DIMS			0x0D3A
+#define GL_MAX_CLIENT_ATTRIB_STACK_DEPTH	0x0D3B
+
+/* Gets */
+#define GL_ATTRIB_STACK_DEPTH			0x0BB0
+#define GL_CLIENT_ATTRIB_STACK_DEPTH		0x0BB1
+#define GL_COLOR_CLEAR_VALUE			0x0C22
+#define GL_COLOR_WRITEMASK			0x0C23
+#define GL_CURRENT_INDEX			0x0B01
+#define GL_CURRENT_COLOR			0x0B00
+#define GL_CURRENT_NORMAL			0x0B02
+#define GL_CURRENT_RASTER_COLOR			0x0B04
+#define GL_CURRENT_RASTER_DISTANCE		0x0B09
+#define GL_CURRENT_RASTER_INDEX			0x0B05
+#define GL_CURRENT_RASTER_POSITION		0x0B07
+#define GL_CURRENT_RASTER_TEXTURE_COORDS	0x0B06
+#define GL_CURRENT_RASTER_POSITION_VALID	0x0B08
+#define GL_CURRENT_TEXTURE_COORDS		0x0B03
+#define GL_INDEX_CLEAR_VALUE			0x0C20
+#define GL_INDEX_MODE				0x0C30
+#define GL_INDEX_WRITEMASK			0x0C21
+#define GL_MODELVIEW_MATRIX			0x0BA6
+#define GL_MODELVIEW_STACK_DEPTH		0x0BA3
+#define GL_NAME_STACK_DEPTH			0x0D70
+#define GL_PROJECTION_MATRIX			0x0BA7
+#define GL_PROJECTION_STACK_DEPTH		0x0BA4
+#define GL_RENDER_MODE				0x0C40
+#define GL_RGBA_MODE				0x0C31
+#define GL_TEXTURE_MATRIX			0x0BA8
+#define GL_TEXTURE_STACK_DEPTH			0x0BA5
+#define GL_VIEWPORT				0x0BA2
+
+/* Evaluators */
+#define GL_AUTO_NORMAL				0x0D80
+#define GL_MAP1_COLOR_4				0x0D90
+#define GL_MAP1_INDEX				0x0D91
+#define GL_MAP1_NORMAL				0x0D92
+#define GL_MAP1_TEXTURE_COORD_1			0x0D93
+#define GL_MAP1_TEXTURE_COORD_2			0x0D94
+#define GL_MAP1_TEXTURE_COORD_3			0x0D95
+#define GL_MAP1_TEXTURE_COORD_4			0x0D96
+#define GL_MAP1_VERTEX_3			0x0D97
+#define GL_MAP1_VERTEX_4			0x0D98
+#define GL_MAP2_COLOR_4				0x0DB0
+#define GL_MAP2_INDEX				0x0DB1
+#define GL_MAP2_NORMAL				0x0DB2
+#define GL_MAP2_TEXTURE_COORD_1			0x0DB3
+#define GL_MAP2_TEXTURE_COORD_2			0x0DB4
+#define GL_MAP2_TEXTURE_COORD_3			0x0DB5
+#define GL_MAP2_TEXTURE_COORD_4			0x0DB6
+#define GL_MAP2_VERTEX_3			0x0DB7
+#define GL_MAP2_VERTEX_4			0x0DB8
+#define GL_MAP1_GRID_DOMAIN			0x0DD0
+#define GL_MAP1_GRID_SEGMENTS			0x0DD1
+#define GL_MAP2_GRID_DOMAIN			0x0DD2
+#define GL_MAP2_GRID_SEGMENTS			0x0DD3
+#define GL_COEFF				0x0A00
+#define GL_DOMAIN				0x0A02
+#define GL_ORDER				0x0A01
+
+/* Hints */
+#define GL_FOG_HINT				0x0C54
+#define GL_LINE_SMOOTH_HINT			0x0C52
+#define GL_PERSPECTIVE_CORRECTION_HINT		0x0C50
+#define GL_POINT_SMOOTH_HINT			0x0C51
+#define GL_POLYGON_SMOOTH_HINT			0x0C53
+#define GL_DONT_CARE				0x1100
+#define GL_FASTEST				0x1101
+#define GL_NICEST				0x1102
+
+/* Scissor box */
+#define GL_SCISSOR_TEST				0x0C11
+#define GL_SCISSOR_BOX				0x0C10
+
+/* Pixel Mode / Transfer */
+#define GL_MAP_COLOR				0x0D10
+#define GL_MAP_STENCIL				0x0D11
+#define GL_INDEX_SHIFT				0x0D12
+#define GL_INDEX_OFFSET				0x0D13
+#define GL_RED_SCALE				0x0D14
+#define GL_RED_BIAS				0x0D15
+#define GL_GREEN_SCALE				0x0D18
+#define GL_GREEN_BIAS				0x0D19
+#define GL_BLUE_SCALE				0x0D1A
+#define GL_BLUE_BIAS				0x0D1B
+#define GL_ALPHA_SCALE				0x0D1C
+#define GL_ALPHA_BIAS				0x0D1D
+#define GL_DEPTH_SCALE				0x0D1E
+#define GL_DEPTH_BIAS				0x0D1F
+#define GL_PIXEL_MAP_S_TO_S_SIZE		0x0CB1
+#define GL_PIXEL_MAP_I_TO_I_SIZE		0x0CB0
+#define GL_PIXEL_MAP_I_TO_R_SIZE		0x0CB2
+#define GL_PIXEL_MAP_I_TO_G_SIZE		0x0CB3
+#define GL_PIXEL_MAP_I_TO_B_SIZE		0x0CB4
+#define GL_PIXEL_MAP_I_TO_A_SIZE		0x0CB5
+#define GL_PIXEL_MAP_R_TO_R_SIZE		0x0CB6
+#define GL_PIXEL_MAP_G_TO_G_SIZE		0x0CB7
+#define GL_PIXEL_MAP_B_TO_B_SIZE		0x0CB8
+#define GL_PIXEL_MAP_A_TO_A_SIZE		0x0CB9
+#define GL_PIXEL_MAP_S_TO_S			0x0C71
+#define GL_PIXEL_MAP_I_TO_I			0x0C70
+#define GL_PIXEL_MAP_I_TO_R			0x0C72
+#define GL_PIXEL_MAP_I_TO_G			0x0C73
+#define GL_PIXEL_MAP_I_TO_B			0x0C74
+#define GL_PIXEL_MAP_I_TO_A			0x0C75
+#define GL_PIXEL_MAP_R_TO_R			0x0C76
+#define GL_PIXEL_MAP_G_TO_G			0x0C77
+#define GL_PIXEL_MAP_B_TO_B			0x0C78
+#define GL_PIXEL_MAP_A_TO_A			0x0C79
+#define GL_PACK_ALIGNMENT			0x0D05
+#define GL_PACK_LSB_FIRST			0x0D01
+#define GL_PACK_ROW_LENGTH			0x0D02
+#define GL_PACK_SKIP_PIXELS			0x0D04
+#define GL_PACK_SKIP_ROWS			0x0D03
+#define GL_PACK_SWAP_BYTES			0x0D00
+#define GL_UNPACK_ALIGNMENT			0x0CF5
+#define GL_UNPACK_LSB_FIRST			0x0CF1
+#define GL_UNPACK_ROW_LENGTH			0x0CF2
+#define GL_UNPACK_SKIP_PIXELS			0x0CF4
+#define GL_UNPACK_SKIP_ROWS			0x0CF3
+#define GL_UNPACK_SWAP_BYTES			0x0CF0
+#define GL_ZOOM_X				0x0D16
+#define GL_ZOOM_Y				0x0D17
+
+/* Texture mapping */
+#define GL_TEXTURE_ENV				0x2300
+#define GL_TEXTURE_ENV_MODE			0x2200
+#define GL_TEXTURE_1D				0x0DE0
+#define GL_TEXTURE_2D				0x0DE1
+#define GL_TEXTURE_WRAP_S			0x2802
+#define GL_TEXTURE_WRAP_T			0x2803
+#define GL_TEXTURE_MAG_FILTER			0x2800
+#define GL_TEXTURE_MIN_FILTER			0x2801
+#define GL_TEXTURE_ENV_COLOR			0x2201
+#define GL_TEXTURE_GEN_S			0x0C60
+#define GL_TEXTURE_GEN_T			0x0C61
+#define GL_TEXTURE_GEN_MODE			0x2500
+#define GL_TEXTURE_BORDER_COLOR			0x1004
+#define GL_TEXTURE_WIDTH			0x1000
+#define GL_TEXTURE_HEIGHT			0x1001
+#define GL_TEXTURE_BORDER			0x1005
+#define GL_TEXTURE_COMPONENTS			0x1003
+#define GL_TEXTURE_RED_SIZE			0x805C
+#define GL_TEXTURE_GREEN_SIZE			0x805D
+#define GL_TEXTURE_BLUE_SIZE			0x805E
+#define GL_TEXTURE_ALPHA_SIZE			0x805F
+#define GL_TEXTURE_LUMINANCE_SIZE		0x8060
+#define GL_TEXTURE_INTENSITY_SIZE		0x8061
+#define GL_NEAREST_MIPMAP_NEAREST		0x2700
+#define GL_NEAREST_MIPMAP_LINEAR		0x2702
+#define GL_LINEAR_MIPMAP_NEAREST		0x2701
+#define GL_LINEAR_MIPMAP_LINEAR			0x2703
+#define GL_OBJECT_LINEAR			0x2401
+#define GL_OBJECT_PLANE				0x2501
+#define GL_EYE_LINEAR				0x2400
+#define GL_EYE_PLANE				0x2502
+#define GL_SPHERE_MAP				0x2402
+#define GL_DECAL				0x2101
+#define GL_MODULATE				0x2100
+#define GL_NEAREST				0x2600
+#define GL_REPEAT				0x2901
+#define GL_CLAMP				0x2900
+#define GL_S					0x2000
+#define GL_T					0x2001
+#define GL_R					0x2002
+#define GL_Q					0x2003
+#define GL_TEXTURE_GEN_R			0x0C62
+#define GL_TEXTURE_GEN_Q			0x0C63
+
+/* Utility */
+#define GL_VENDOR				0x1F00
+#define GL_RENDERER				0x1F01
+#define GL_VERSION				0x1F02
+#define GL_EXTENSIONS				0x1F03
+
+/* Errors */
+#define GL_NO_ERROR 				0x0
+#define GL_INVALID_VALUE			0x0501
+#define GL_INVALID_ENUM				0x0500
+#define GL_INVALID_OPERATION			0x0502
+#define GL_STACK_OVERFLOW			0x0503
+#define GL_STACK_UNDERFLOW			0x0504
+#define GL_OUT_OF_MEMORY			0x0505
+
+/* glPush/PopAttrib bits */
+#define GL_CURRENT_BIT				0x00000001
+#define GL_POINT_BIT				0x00000002
+#define GL_LINE_BIT				0x00000004
+#define GL_POLYGON_BIT				0x00000008
+#define GL_POLYGON_STIPPLE_BIT			0x00000010
+#define GL_PIXEL_MODE_BIT			0x00000020
+#define GL_LIGHTING_BIT				0x00000040
+#define GL_FOG_BIT				0x00000080
+#define GL_DEPTH_BUFFER_BIT			0x00000100
+#define GL_ACCUM_BUFFER_BIT			0x00000200
+#define GL_STENCIL_BUFFER_BIT			0x00000400
+#define GL_VIEWPORT_BIT				0x00000800
+#define GL_TRANSFORM_BIT			0x00001000
+#define GL_ENABLE_BIT				0x00002000
+#define GL_COLOR_BUFFER_BIT			0x00004000
+#define GL_HINT_BIT				0x00008000
+#define GL_EVAL_BIT				0x00010000
+#define GL_LIST_BIT				0x00020000
+#define GL_TEXTURE_BIT				0x00040000
+#define GL_SCISSOR_BIT				0x00080000
+#define GL_ALL_ATTRIB_BITS			0x000FFFFF
+
+
+/* OpenGL 1.1 */
+#define GL_PROXY_TEXTURE_1D			0x8063
+#define GL_PROXY_TEXTURE_2D			0x8064
+#define GL_TEXTURE_PRIORITY			0x8066
+#define GL_TEXTURE_RESIDENT			0x8067
+#define GL_TEXTURE_BINDING_1D			0x8068
+#define GL_TEXTURE_BINDING_2D			0x8069
+#define GL_TEXTURE_INTERNAL_FORMAT		0x1003
+#define GL_ALPHA4				0x803B
+#define GL_ALPHA8				0x803C
+#define GL_ALPHA12				0x803D
+#define GL_ALPHA16				0x803E
+#define GL_LUMINANCE4				0x803F
+#define GL_LUMINANCE8				0x8040
+#define GL_LUMINANCE12				0x8041
+#define GL_LUMINANCE16				0x8042
+#define GL_LUMINANCE4_ALPHA4			0x8043
+#define GL_LUMINANCE6_ALPHA2			0x8044
+#define GL_LUMINANCE8_ALPHA8			0x8045
+#define GL_LUMINANCE12_ALPHA4			0x8046
+#define GL_LUMINANCE12_ALPHA12			0x8047
+#define GL_LUMINANCE16_ALPHA16			0x8048
+#define GL_INTENSITY				0x8049
+#define GL_INTENSITY4				0x804A
+#define GL_INTENSITY8				0x804B
+#define GL_INTENSITY12				0x804C
+#define GL_INTENSITY16				0x804D
+#define GL_R3_G3_B2				0x2A10
+#define GL_RGB4					0x804F
+#define GL_RGB5					0x8050
+#define GL_RGB8					0x8051
+#define GL_RGB10				0x8052
+#define GL_RGB12				0x8053
+#define GL_RGB16				0x8054
+#define GL_RGBA2				0x8055
+#define GL_RGBA4				0x8056
+#define GL_RGB5_A1				0x8057
+#define GL_RGBA8				0x8058
+#define GL_RGB10_A2				0x8059
+#define GL_RGBA12				0x805A
+#define GL_RGBA16				0x805B
+#define GL_CLIENT_PIXEL_STORE_BIT		0x00000001
+#define GL_CLIENT_VERTEX_ARRAY_BIT		0x00000002
+#define GL_ALL_CLIENT_ATTRIB_BITS 		0xFFFFFFFF
+#define GL_CLIENT_ALL_ATTRIB_BITS 		0xFFFFFFFF
+
+
+
+/*
+ * Miscellaneous
+ */
+
+GLAPI void GLAPIENTRY glClearIndex( GLfloat c );
+
+GLAPI void GLAPIENTRY glClearColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha );
+
+GLAPI void GLAPIENTRY glClear( GLbitfield mask );
+
+GLAPI void GLAPIENTRY glIndexMask( GLuint mask );
+
+GLAPI void GLAPIENTRY glColorMask( GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha );
+
+GLAPI void GLAPIENTRY glAlphaFunc( GLenum func, GLclampf ref );
+
+GLAPI void GLAPIENTRY glBlendFunc( GLenum sfactor, GLenum dfactor );
+
+GLAPI void GLAPIENTRY glLogicOp( GLenum opcode );
+
+GLAPI void GLAPIENTRY glCullFace( GLenum mode );
+
+GLAPI void GLAPIENTRY glFrontFace( GLenum mode );
+
+GLAPI void GLAPIENTRY glPointSize( GLfloat size );
+
+GLAPI void GLAPIENTRY glLineWidth( GLfloat width );
+
+GLAPI void GLAPIENTRY glLineStipple( GLint factor, GLushort pattern );
+
+GLAPI void GLAPIENTRY glPolygonMode( GLenum face, GLenum mode );
+
+GLAPI void GLAPIENTRY glPolygonOffset( GLfloat factor, GLfloat units );
+
+GLAPI void GLAPIENTRY glPolygonStipple( const GLubyte *mask );
+
+GLAPI void GLAPIENTRY glGetPolygonStipple( GLubyte *mask );
+
+GLAPI void GLAPIENTRY glEdgeFlag( GLboolean flag );
+
+GLAPI void GLAPIENTRY glEdgeFlagv( const GLboolean *flag );
+
+GLAPI void GLAPIENTRY glScissor( GLint x, GLint y, GLsizei width, GLsizei height);
+
+GLAPI void GLAPIENTRY glClipPlane( GLenum plane, const GLdouble *equation );
+
+GLAPI void GLAPIENTRY glGetClipPlane( GLenum plane, GLdouble *equation );
+
+GLAPI void GLAPIENTRY glDrawBuffer( GLenum mode );
+
+GLAPI void GLAPIENTRY glReadBuffer( GLenum mode );
+
+GLAPI void GLAPIENTRY glEnable( GLenum cap );
+
+GLAPI void GLAPIENTRY glDisable( GLenum cap );
+
+GLAPI GLboolean GLAPIENTRY glIsEnabled( GLenum cap );
+
+
+GLAPI void GLAPIENTRY glEnableClientState( GLenum cap );  /* 1.1 */
+
+GLAPI void GLAPIENTRY glDisableClientState( GLenum cap );  /* 1.1 */
+
+
+GLAPI void GLAPIENTRY glGetBooleanv( GLenum pname, GLboolean *params );
+
+GLAPI void GLAPIENTRY glGetDoublev( GLenum pname, GLdouble *params );
+
+GLAPI void GLAPIENTRY glGetFloatv( GLenum pname, GLfloat *params );
+
+GLAPI void GLAPIENTRY glGetIntegerv( GLenum pname, GLint *params );
+
+
+GLAPI void GLAPIENTRY glPushAttrib( GLbitfield mask );
+
+GLAPI void GLAPIENTRY glPopAttrib( void );
+
+
+GLAPI void GLAPIENTRY glPushClientAttrib( GLbitfield mask );  /* 1.1 */
+
+GLAPI void GLAPIENTRY glPopClientAttrib( void );  /* 1.1 */
+
+
+GLAPI GLint GLAPIENTRY glRenderMode( GLenum mode );
+
+GLAPI GLenum GLAPIENTRY glGetError( void );
+
+GLAPI const GLubyte* GLAPIENTRY glGetString( GLenum name );
+
+GLAPI void GLAPIENTRY glFinish( void );
+
+GLAPI void GLAPIENTRY glFlush( void );
+
+GLAPI void GLAPIENTRY glHint( GLenum target, GLenum mode );
+
+
+/*
+ * Depth Buffer
+ */
+
+GLAPI void GLAPIENTRY glClearDepth( GLclampd depth );
+
+GLAPI void GLAPIENTRY glDepthFunc( GLenum func );
+
+GLAPI void GLAPIENTRY glDepthMask( GLboolean flag );
+
+GLAPI void GLAPIENTRY glDepthRange( GLclampd near_val, GLclampd far_val );
+
+
+/*
+ * Accumulation Buffer
+ */
+
+GLAPI void GLAPIENTRY glClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha );
+
+GLAPI void GLAPIENTRY glAccum( GLenum op, GLfloat value );
+
+
+/*
+ * Transformation
+ */
+
+GLAPI void GLAPIENTRY glMatrixMode( GLenum mode );
+
+GLAPI void GLAPIENTRY glOrtho( GLdouble left, GLdouble right,
+                                 GLdouble bottom, GLdouble top,
+                                 GLdouble near_val, GLdouble far_val );
+
+GLAPI void GLAPIENTRY glFrustum( GLdouble left, GLdouble right,
+                                   GLdouble bottom, GLdouble top,
+                                   GLdouble near_val, GLdouble far_val );
+
+GLAPI void GLAPIENTRY glViewport( GLint x, GLint y,
+                                    GLsizei width, GLsizei height );
+
+GLAPI void GLAPIENTRY glPushMatrix( void );
+
+GLAPI void GLAPIENTRY glPopMatrix( void );
+
+GLAPI void GLAPIENTRY glLoadIdentity( void );
+
+GLAPI void GLAPIENTRY glLoadMatrixd( const GLdouble *m );
+GLAPI void GLAPIENTRY glLoadMatrixf( const GLfloat *m );
+
+GLAPI void GLAPIENTRY glMultMatrixd( const GLdouble *m );
+GLAPI void GLAPIENTRY glMultMatrixf( const GLfloat *m );
+
+GLAPI void GLAPIENTRY glRotated( GLdouble angle,
+                                   GLdouble x, GLdouble y, GLdouble z );
+GLAPI void GLAPIENTRY glRotatef( GLfloat angle,
+                                   GLfloat x, GLfloat y, GLfloat z );
+
+GLAPI void GLAPIENTRY glScaled( GLdouble x, GLdouble y, GLdouble z );
+GLAPI void GLAPIENTRY glScalef( GLfloat x, GLfloat y, GLfloat z );
+
+GLAPI void GLAPIENTRY glTranslated( GLdouble x, GLdouble y, GLdouble z );
+GLAPI void GLAPIENTRY glTranslatef( GLfloat x, GLfloat y, GLfloat z );
+
+
+/*
+ * Display Lists
+ */
+
+GLAPI GLboolean GLAPIENTRY glIsList( GLuint list );
+
+GLAPI void GLAPIENTRY glDeleteLists( GLuint list, GLsizei range );
+
+GLAPI GLuint GLAPIENTRY glGenLists( GLsizei range );
+
+GLAPI void GLAPIENTRY glNewList( GLuint list, GLenum mode );
+
+GLAPI void GLAPIENTRY glEndList( void );
+
+GLAPI void GLAPIENTRY glCallList( GLuint list );
+
+GLAPI void GLAPIENTRY glCallLists( GLsizei n, GLenum type,
+                                     const GLvoid *lists );
+
+GLAPI void GLAPIENTRY glListBase( GLuint base );
+
+
+/*
+ * Drawing Functions
+ */
+
+GLAPI void GLAPIENTRY glBegin( GLenum mode );
+
+GLAPI void GLAPIENTRY glEnd( void );
+
+
+GLAPI void GLAPIENTRY glVertex2d( GLdouble x, GLdouble y );
+GLAPI void GLAPIENTRY glVertex2f( GLfloat x, GLfloat y );
+GLAPI void GLAPIENTRY glVertex2i( GLint x, GLint y );
+GLAPI void GLAPIENTRY glVertex2s( GLshort x, GLshort y );
+
+GLAPI void GLAPIENTRY glVertex3d( GLdouble x, GLdouble y, GLdouble z );
+GLAPI void GLAPIENTRY glVertex3f( GLfloat x, GLfloat y, GLfloat z );
+GLAPI void GLAPIENTRY glVertex3i( GLint x, GLint y, GLint z );
+GLAPI void GLAPIENTRY glVertex3s( GLshort x, GLshort y, GLshort z );
+
+GLAPI void GLAPIENTRY glVertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w );
+GLAPI void GLAPIENTRY glVertex4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w );
+GLAPI void GLAPIENTRY glVertex4i( GLint x, GLint y, GLint z, GLint w );
+GLAPI void GLAPIENTRY glVertex4s( GLshort x, GLshort y, GLshort z, GLshort w );
+
+GLAPI void GLAPIENTRY glVertex2dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glVertex2fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glVertex2iv( const GLint *v );
+GLAPI void GLAPIENTRY glVertex2sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glVertex3dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glVertex3fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glVertex3iv( const GLint *v );
+GLAPI void GLAPIENTRY glVertex3sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glVertex4dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glVertex4fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glVertex4iv( const GLint *v );
+GLAPI void GLAPIENTRY glVertex4sv( const GLshort *v );
+
+
+GLAPI void GLAPIENTRY glNormal3b( GLbyte nx, GLbyte ny, GLbyte nz );
+GLAPI void GLAPIENTRY glNormal3d( GLdouble nx, GLdouble ny, GLdouble nz );
+GLAPI void GLAPIENTRY glNormal3f( GLfloat nx, GLfloat ny, GLfloat nz );
+GLAPI void GLAPIENTRY glNormal3i( GLint nx, GLint ny, GLint nz );
+GLAPI void GLAPIENTRY glNormal3s( GLshort nx, GLshort ny, GLshort nz );
+
+GLAPI void GLAPIENTRY glNormal3bv( const GLbyte *v );
+GLAPI void GLAPIENTRY glNormal3dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glNormal3fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glNormal3iv( const GLint *v );
+GLAPI void GLAPIENTRY glNormal3sv( const GLshort *v );
+
+
+GLAPI void GLAPIENTRY glIndexd( GLdouble c );
+GLAPI void GLAPIENTRY glIndexf( GLfloat c );
+GLAPI void GLAPIENTRY glIndexi( GLint c );
+GLAPI void GLAPIENTRY glIndexs( GLshort c );
+GLAPI void GLAPIENTRY glIndexub( GLubyte c );  /* 1.1 */
+
+GLAPI void GLAPIENTRY glIndexdv( const GLdouble *c );
+GLAPI void GLAPIENTRY glIndexfv( const GLfloat *c );
+GLAPI void GLAPIENTRY glIndexiv( const GLint *c );
+GLAPI void GLAPIENTRY glIndexsv( const GLshort *c );
+GLAPI void GLAPIENTRY glIndexubv( const GLubyte *c );  /* 1.1 */
+
+GLAPI void GLAPIENTRY glColor3b( GLbyte red, GLbyte green, GLbyte blue );
+GLAPI void GLAPIENTRY glColor3d( GLdouble red, GLdouble green, GLdouble blue );
+GLAPI void GLAPIENTRY glColor3f( GLfloat red, GLfloat green, GLfloat blue );
+GLAPI void GLAPIENTRY glColor3i( GLint red, GLint green, GLint blue );
+GLAPI void GLAPIENTRY glColor3s( GLshort red, GLshort green, GLshort blue );
+GLAPI void GLAPIENTRY glColor3ub( GLubyte red, GLubyte green, GLubyte blue );
+GLAPI void GLAPIENTRY glColor3ui( GLuint red, GLuint green, GLuint blue );
+GLAPI void GLAPIENTRY glColor3us( GLushort red, GLushort green, GLushort blue );
+
+GLAPI void GLAPIENTRY glColor4b( GLbyte red, GLbyte green,
+                                   GLbyte blue, GLbyte alpha );
+GLAPI void GLAPIENTRY glColor4d( GLdouble red, GLdouble green,
+                                   GLdouble blue, GLdouble alpha );
+GLAPI void GLAPIENTRY glColor4f( GLfloat red, GLfloat green,
+                                   GLfloat blue, GLfloat alpha );
+GLAPI void GLAPIENTRY glColor4i( GLint red, GLint green,
+                                   GLint blue, GLint alpha );
+GLAPI void GLAPIENTRY glColor4s( GLshort red, GLshort green,
+                                   GLshort blue, GLshort alpha );
+GLAPI void GLAPIENTRY glColor4ub( GLubyte red, GLubyte green,
+                                    GLubyte blue, GLubyte alpha );
+GLAPI void GLAPIENTRY glColor4ui( GLuint red, GLuint green,
+                                    GLuint blue, GLuint alpha );
+GLAPI void GLAPIENTRY glColor4us( GLushort red, GLushort green,
+                                    GLushort blue, GLushort alpha );
+
+
+GLAPI void GLAPIENTRY glColor3bv( const GLbyte *v );
+GLAPI void GLAPIENTRY glColor3dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glColor3fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glColor3iv( const GLint *v );
+GLAPI void GLAPIENTRY glColor3sv( const GLshort *v );
+GLAPI void GLAPIENTRY glColor3ubv( const GLubyte *v );
+GLAPI void GLAPIENTRY glColor3uiv( const GLuint *v );
+GLAPI void GLAPIENTRY glColor3usv( const GLushort *v );
+
+GLAPI void GLAPIENTRY glColor4bv( const GLbyte *v );
+GLAPI void GLAPIENTRY glColor4dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glColor4fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glColor4iv( const GLint *v );
+GLAPI void GLAPIENTRY glColor4sv( const GLshort *v );
+GLAPI void GLAPIENTRY glColor4ubv( const GLubyte *v );
+GLAPI void GLAPIENTRY glColor4uiv( const GLuint *v );
+GLAPI void GLAPIENTRY glColor4usv( const GLushort *v );
+
+
+GLAPI void GLAPIENTRY glTexCoord1d( GLdouble s );
+GLAPI void GLAPIENTRY glTexCoord1f( GLfloat s );
+GLAPI void GLAPIENTRY glTexCoord1i( GLint s );
+GLAPI void GLAPIENTRY glTexCoord1s( GLshort s );
+
+GLAPI void GLAPIENTRY glTexCoord2d( GLdouble s, GLdouble t );
+GLAPI void GLAPIENTRY glTexCoord2f( GLfloat s, GLfloat t );
+GLAPI void GLAPIENTRY glTexCoord2i( GLint s, GLint t );
+GLAPI void GLAPIENTRY glTexCoord2s( GLshort s, GLshort t );
+
+GLAPI void GLAPIENTRY glTexCoord3d( GLdouble s, GLdouble t, GLdouble r );
+GLAPI void GLAPIENTRY glTexCoord3f( GLfloat s, GLfloat t, GLfloat r );
+GLAPI void GLAPIENTRY glTexCoord3i( GLint s, GLint t, GLint r );
+GLAPI void GLAPIENTRY glTexCoord3s( GLshort s, GLshort t, GLshort r );
+
+GLAPI void GLAPIENTRY glTexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q );
+GLAPI void GLAPIENTRY glTexCoord4f( GLfloat s, GLfloat t, GLfloat r, GLfloat q );
+GLAPI void GLAPIENTRY glTexCoord4i( GLint s, GLint t, GLint r, GLint q );
+GLAPI void GLAPIENTRY glTexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q );
+
+GLAPI void GLAPIENTRY glTexCoord1dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glTexCoord1fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glTexCoord1iv( const GLint *v );
+GLAPI void GLAPIENTRY glTexCoord1sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glTexCoord2dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glTexCoord2fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glTexCoord2iv( const GLint *v );
+GLAPI void GLAPIENTRY glTexCoord2sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glTexCoord3dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glTexCoord3fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glTexCoord3iv( const GLint *v );
+GLAPI void GLAPIENTRY glTexCoord3sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glTexCoord4dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glTexCoord4fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glTexCoord4iv( const GLint *v );
+GLAPI void GLAPIENTRY glTexCoord4sv( const GLshort *v );
+
+
+GLAPI void GLAPIENTRY glRasterPos2d( GLdouble x, GLdouble y );
+GLAPI void GLAPIENTRY glRasterPos2f( GLfloat x, GLfloat y );
+GLAPI void GLAPIENTRY glRasterPos2i( GLint x, GLint y );
+GLAPI void GLAPIENTRY glRasterPos2s( GLshort x, GLshort y );
+
+GLAPI void GLAPIENTRY glRasterPos3d( GLdouble x, GLdouble y, GLdouble z );
+GLAPI void GLAPIENTRY glRasterPos3f( GLfloat x, GLfloat y, GLfloat z );
+GLAPI void GLAPIENTRY glRasterPos3i( GLint x, GLint y, GLint z );
+GLAPI void GLAPIENTRY glRasterPos3s( GLshort x, GLshort y, GLshort z );
+
+GLAPI void GLAPIENTRY glRasterPos4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w );
+GLAPI void GLAPIENTRY glRasterPos4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w );
+GLAPI void GLAPIENTRY glRasterPos4i( GLint x, GLint y, GLint z, GLint w );
+GLAPI void GLAPIENTRY glRasterPos4s( GLshort x, GLshort y, GLshort z, GLshort w );
+
+GLAPI void GLAPIENTRY glRasterPos2dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glRasterPos2fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glRasterPos2iv( const GLint *v );
+GLAPI void GLAPIENTRY glRasterPos2sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glRasterPos3dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glRasterPos3fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glRasterPos3iv( const GLint *v );
+GLAPI void GLAPIENTRY glRasterPos3sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glRasterPos4dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glRasterPos4fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glRasterPos4iv( const GLint *v );
+GLAPI void GLAPIENTRY glRasterPos4sv( const GLshort *v );
+
+
+GLAPI void GLAPIENTRY glRectd( GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2 );
+GLAPI void GLAPIENTRY glRectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 );
+GLAPI void GLAPIENTRY glRecti( GLint x1, GLint y1, GLint x2, GLint y2 );
+GLAPI void GLAPIENTRY glRects( GLshort x1, GLshort y1, GLshort x2, GLshort y2 );
+
+
+GLAPI void GLAPIENTRY glRectdv( const GLdouble *v1, const GLdouble *v2 );
+GLAPI void GLAPIENTRY glRectfv( const GLfloat *v1, const GLfloat *v2 );
+GLAPI void GLAPIENTRY glRectiv( const GLint *v1, const GLint *v2 );
+GLAPI void GLAPIENTRY glRectsv( const GLshort *v1, const GLshort *v2 );
+
+
+/*
+ * Vertex Arrays  (1.1)
+ */
+
+GLAPI void GLAPIENTRY glVertexPointer( GLint size, GLenum type,
+                                       GLsizei stride, const GLvoid *ptr );
+
+GLAPI void GLAPIENTRY glNormalPointer( GLenum type, GLsizei stride,
+                                       const GLvoid *ptr );
+
+GLAPI void GLAPIENTRY glColorPointer( GLint size, GLenum type,
+                                      GLsizei stride, const GLvoid *ptr );
+
+GLAPI void GLAPIENTRY glIndexPointer( GLenum type, GLsizei stride,
+                                      const GLvoid *ptr );
+
+GLAPI void GLAPIENTRY glTexCoordPointer( GLint size, GLenum type,
+                                         GLsizei stride, const GLvoid *ptr );
+
+GLAPI void GLAPIENTRY glEdgeFlagPointer( GLsizei stride, const GLvoid *ptr );
+
+GLAPI void GLAPIENTRY glGetPointerv( GLenum pname, GLvoid **params );
+
+GLAPI void GLAPIENTRY glArrayElement( GLint i );
+
+GLAPI void GLAPIENTRY glDrawArrays( GLenum mode, GLint first, GLsizei count );
+
+GLAPI void GLAPIENTRY glDrawElements( GLenum mode, GLsizei count,
+                                      GLenum type, const GLvoid *indices );
+
+GLAPI void GLAPIENTRY glInterleavedArrays( GLenum format, GLsizei stride,
+                                           const GLvoid *pointer );
+
+/*
+ * Lighting
+ */
+
+GLAPI void GLAPIENTRY glShadeModel( GLenum mode );
+
+GLAPI void GLAPIENTRY glLightf( GLenum light, GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glLighti( GLenum light, GLenum pname, GLint param );
+GLAPI void GLAPIENTRY glLightfv( GLenum light, GLenum pname,
+                                 const GLfloat *params );
+GLAPI void GLAPIENTRY glLightiv( GLenum light, GLenum pname,
+                                 const GLint *params );
+
+GLAPI void GLAPIENTRY glGetLightfv( GLenum light, GLenum pname,
+                                    GLfloat *params );
+GLAPI void GLAPIENTRY glGetLightiv( GLenum light, GLenum pname,
+                                    GLint *params );
+
+GLAPI void GLAPIENTRY glLightModelf( GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glLightModeli( GLenum pname, GLint param );
+GLAPI void GLAPIENTRY glLightModelfv( GLenum pname, const GLfloat *params );
+GLAPI void GLAPIENTRY glLightModeliv( GLenum pname, const GLint *params );
+
+GLAPI void GLAPIENTRY glMaterialf( GLenum face, GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glMateriali( GLenum face, GLenum pname, GLint param );
+GLAPI void GLAPIENTRY glMaterialfv( GLenum face, GLenum pname, const GLfloat *params );
+GLAPI void GLAPIENTRY glMaterialiv( GLenum face, GLenum pname, const GLint *params );
+
+GLAPI void GLAPIENTRY glGetMaterialfv( GLenum face, GLenum pname, GLfloat *params );
+GLAPI void GLAPIENTRY glGetMaterialiv( GLenum face, GLenum pname, GLint *params );
+
+GLAPI void GLAPIENTRY glColorMaterial( GLenum face, GLenum mode );
+
+
+/*
+ * Raster functions
+ */
+
+GLAPI void GLAPIENTRY glPixelZoom( GLfloat xfactor, GLfloat yfactor );
+
+GLAPI void GLAPIENTRY glPixelStoref( GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glPixelStorei( GLenum pname, GLint param );
+
+GLAPI void GLAPIENTRY glPixelTransferf( GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glPixelTransferi( GLenum pname, GLint param );
+
+GLAPI void GLAPIENTRY glPixelMapfv( GLenum map, GLsizei mapsize,
+                                    const GLfloat *values );
+GLAPI void GLAPIENTRY glPixelMapuiv( GLenum map, GLsizei mapsize,
+                                     const GLuint *values );
+GLAPI void GLAPIENTRY glPixelMapusv( GLenum map, GLsizei mapsize,
+                                     const GLushort *values );
+
+GLAPI void GLAPIENTRY glGetPixelMapfv( GLenum map, GLfloat *values );
+GLAPI void GLAPIENTRY glGetPixelMapuiv( GLenum map, GLuint *values );
+GLAPI void GLAPIENTRY glGetPixelMapusv( GLenum map, GLushort *values );
+
+GLAPI void GLAPIENTRY glBitmap( GLsizei width, GLsizei height,
+                                GLfloat xorig, GLfloat yorig,
+                                GLfloat xmove, GLfloat ymove,
+                                const GLubyte *bitmap );
+
+GLAPI void GLAPIENTRY glReadPixels( GLint x, GLint y,
+                                    GLsizei width, GLsizei height,
+                                    GLenum format, GLenum type,
+                                    GLvoid *pixels );
+
+GLAPI void GLAPIENTRY glDrawPixels( GLsizei width, GLsizei height,
+                                    GLenum format, GLenum type,
+                                    const GLvoid *pixels );
+
+GLAPI void GLAPIENTRY glCopyPixels( GLint x, GLint y,
+                                    GLsizei width, GLsizei height,
+                                    GLenum type );
+
+/*
+ * Stenciling
+ */
+
+GLAPI void GLAPIENTRY glStencilFunc( GLenum func, GLint ref, GLuint mask );
+
+GLAPI void GLAPIENTRY glStencilMask( GLuint mask );
+
+GLAPI void GLAPIENTRY glStencilOp( GLenum fail, GLenum zfail, GLenum zpass );
+
+GLAPI void GLAPIENTRY glClearStencil( GLint s );
+
+
+
+/*
+ * Texture mapping
+ */
+
+GLAPI void GLAPIENTRY glTexGend( GLenum coord, GLenum pname, GLdouble param );
+GLAPI void GLAPIENTRY glTexGenf( GLenum coord, GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glTexGeni( GLenum coord, GLenum pname, GLint param );
+
+GLAPI void GLAPIENTRY glTexGendv( GLenum coord, GLenum pname, const GLdouble *params );
+GLAPI void GLAPIENTRY glTexGenfv( GLenum coord, GLenum pname, const GLfloat *params );
+GLAPI void GLAPIENTRY glTexGeniv( GLenum coord, GLenum pname, const GLint *params );
+
+GLAPI void GLAPIENTRY glGetTexGendv( GLenum coord, GLenum pname, GLdouble *params );
+GLAPI void GLAPIENTRY glGetTexGenfv( GLenum coord, GLenum pname, GLfloat *params );
+GLAPI void GLAPIENTRY glGetTexGeniv( GLenum coord, GLenum pname, GLint *params );
+
+
+GLAPI void GLAPIENTRY glTexEnvf( GLenum target, GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glTexEnvi( GLenum target, GLenum pname, GLint param );
+
+GLAPI void GLAPIENTRY glTexEnvfv( GLenum target, GLenum pname, const GLfloat *params );
+GLAPI void GLAPIENTRY glTexEnviv( GLenum target, GLenum pname, const GLint *params );
+
+GLAPI void GLAPIENTRY glGetTexEnvfv( GLenum target, GLenum pname, GLfloat *params );
+GLAPI void GLAPIENTRY glGetTexEnviv( GLenum target, GLenum pname, GLint *params );
+
+
+GLAPI void GLAPIENTRY glTexParameterf( GLenum target, GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glTexParameteri( GLenum target, GLenum pname, GLint param );
+
+GLAPI void GLAPIENTRY glTexParameterfv( GLenum target, GLenum pname,
+                                          const GLfloat *params );
+GLAPI void GLAPIENTRY glTexParameteriv( GLenum target, GLenum pname,
+                                          const GLint *params );
+
+GLAPI void GLAPIENTRY glGetTexParameterfv( GLenum target,
+                                           GLenum pname, GLfloat *params);
+GLAPI void GLAPIENTRY glGetTexParameteriv( GLenum target,
+                                           GLenum pname, GLint *params );
+
+GLAPI void GLAPIENTRY glGetTexLevelParameterfv( GLenum target, GLint level,
+                                                GLenum pname, GLfloat *params );
+GLAPI void GLAPIENTRY glGetTexLevelParameteriv( GLenum target, GLint level,
+                                                GLenum pname, GLint *params );
+
+
+GLAPI void GLAPIENTRY glTexImage1D( GLenum target, GLint level,
+                                    GLint internalFormat,
+                                    GLsizei width, GLint border,
+                                    GLenum format, GLenum type,
+                                    const GLvoid *pixels );
+
+GLAPI void GLAPIENTRY glTexImage2D( GLenum target, GLint level,
+                                    GLint internalFormat,
+                                    GLsizei width, GLsizei height,
+                                    GLint border, GLenum format, GLenum type,
+                                    const GLvoid *pixels );
+
+GLAPI void GLAPIENTRY glGetTexImage( GLenum target, GLint level,
+                                     GLenum format, GLenum type,
+                                     GLvoid *pixels );
+
+
+/* 1.1 functions */
+
+GLAPI void GLAPIENTRY glGenTextures( GLsizei n, GLuint *textures );
+
+GLAPI void GLAPIENTRY glDeleteTextures( GLsizei n, const GLuint *textures);
+
+GLAPI void GLAPIENTRY glBindTexture( GLenum target, GLuint texture );
+
+GLAPI void GLAPIENTRY glPrioritizeTextures( GLsizei n,
+                                            const GLuint *textures,
+                                            const GLclampf *priorities );
+
+GLAPI GLboolean GLAPIENTRY glAreTexturesResident( GLsizei n,
+                                                  const GLuint *textures,
+                                                  GLboolean *residences );
+
+GLAPI GLboolean GLAPIENTRY glIsTexture( GLuint texture );
+
+
+GLAPI void GLAPIENTRY glTexSubImage1D( GLenum target, GLint level,
+                                       GLint xoffset,
+                                       GLsizei width, GLenum format,
+                                       GLenum type, const GLvoid *pixels );
+
+
+GLAPI void GLAPIENTRY glTexSubImage2D( GLenum target, GLint level,
+                                       GLint xoffset, GLint yoffset,
+                                       GLsizei width, GLsizei height,
+                                       GLenum format, GLenum type,
+                                       const GLvoid *pixels );
+
+
+GLAPI void GLAPIENTRY glCopyTexImage1D( GLenum target, GLint level,
+                                        GLenum internalformat,
+                                        GLint x, GLint y,
+                                        GLsizei width, GLint border );
+
+
+GLAPI void GLAPIENTRY glCopyTexImage2D( GLenum target, GLint level,
+                                        GLenum internalformat,
+                                        GLint x, GLint y,
+                                        GLsizei width, GLsizei height,
+                                        GLint border );
+
+
+GLAPI void GLAPIENTRY glCopyTexSubImage1D( GLenum target, GLint level,
+                                           GLint xoffset, GLint x, GLint y,
+                                           GLsizei width );
+
+
+GLAPI void GLAPIENTRY glCopyTexSubImage2D( GLenum target, GLint level,
+                                           GLint xoffset, GLint yoffset,
+                                           GLint x, GLint y,
+                                           GLsizei width, GLsizei height );
+
+
+/*
+ * Evaluators
+ */
+
+GLAPI void GLAPIENTRY glMap1d( GLenum target, GLdouble u1, GLdouble u2,
+                               GLint stride,
+                               GLint order, const GLdouble *points );
+GLAPI void GLAPIENTRY glMap1f( GLenum target, GLfloat u1, GLfloat u2,
+                               GLint stride,
+                               GLint order, const GLfloat *points );
+
+GLAPI void GLAPIENTRY glMap2d( GLenum target,
+		     GLdouble u1, GLdouble u2, GLint ustride, GLint uorder,
+		     GLdouble v1, GLdouble v2, GLint vstride, GLint vorder,
+		     const GLdouble *points );
+GLAPI void GLAPIENTRY glMap2f( GLenum target,
+		     GLfloat u1, GLfloat u2, GLint ustride, GLint uorder,
+		     GLfloat v1, GLfloat v2, GLint vstride, GLint vorder,
+		     const GLfloat *points );
+
+GLAPI void GLAPIENTRY glGetMapdv( GLenum target, GLenum query, GLdouble *v );
+GLAPI void GLAPIENTRY glGetMapfv( GLenum target, GLenum query, GLfloat *v );
+GLAPI void GLAPIENTRY glGetMapiv( GLenum target, GLenum query, GLint *v );
+
+GLAPI void GLAPIENTRY glEvalCoord1d( GLdouble u );
+GLAPI void GLAPIENTRY glEvalCoord1f( GLfloat u );
+
+GLAPI void GLAPIENTRY glEvalCoord1dv( const GLdouble *u );
+GLAPI void GLAPIENTRY glEvalCoord1fv( const GLfloat *u );
+
+GLAPI void GLAPIENTRY glEvalCoord2d( GLdouble u, GLdouble v );
+GLAPI void GLAPIENTRY glEvalCoord2f( GLfloat u, GLfloat v );
+
+GLAPI void GLAPIENTRY glEvalCoord2dv( const GLdouble *u );
+GLAPI void GLAPIENTRY glEvalCoord2fv( const GLfloat *u );
+
+GLAPI void GLAPIENTRY glMapGrid1d( GLint un, GLdouble u1, GLdouble u2 );
+GLAPI void GLAPIENTRY glMapGrid1f( GLint un, GLfloat u1, GLfloat u2 );
+
+GLAPI void GLAPIENTRY glMapGrid2d( GLint un, GLdouble u1, GLdouble u2,
+                                   GLint vn, GLdouble v1, GLdouble v2 );
+GLAPI void GLAPIENTRY glMapGrid2f( GLint un, GLfloat u1, GLfloat u2,
+                                   GLint vn, GLfloat v1, GLfloat v2 );
+
+GLAPI void GLAPIENTRY glEvalPoint1( GLint i );
+
+GLAPI void GLAPIENTRY glEvalPoint2( GLint i, GLint j );
+
+GLAPI void GLAPIENTRY glEvalMesh1( GLenum mode, GLint i1, GLint i2 );
+
+GLAPI void GLAPIENTRY glEvalMesh2( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 );
+
+
+/*
+ * Fog
+ */
+
+GLAPI void GLAPIENTRY glFogf( GLenum pname, GLfloat param );
+
+GLAPI void GLAPIENTRY glFogi( GLenum pname, GLint param );
+
+GLAPI void GLAPIENTRY glFogfv( GLenum pname, const GLfloat *params );
+
+GLAPI void GLAPIENTRY glFogiv( GLenum pname, const GLint *params );
+
+
+/*
+ * Selection and Feedback
+ */
+
+GLAPI void GLAPIENTRY glFeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer );
+
+GLAPI void GLAPIENTRY glPassThrough( GLfloat token );
+
+GLAPI void GLAPIENTRY glSelectBuffer( GLsizei size, GLuint *buffer );
+
+GLAPI void GLAPIENTRY glInitNames( void );
+
+GLAPI void GLAPIENTRY glLoadName( GLuint name );
+
+GLAPI void GLAPIENTRY glPushName( GLuint name );
+
+GLAPI void GLAPIENTRY glPopName( void );
+
+
+
+/*
+ * OpenGL 1.2
+ */
+
+#define GL_RESCALE_NORMAL			0x803A
+#define GL_CLAMP_TO_EDGE			0x812F
+#define GL_MAX_ELEMENTS_VERTICES		0x80E8
+#define GL_MAX_ELEMENTS_INDICES			0x80E9
+#define GL_BGR					0x80E0
+#define GL_BGRA					0x80E1
+#define GL_UNSIGNED_BYTE_3_3_2			0x8032
+#define GL_UNSIGNED_BYTE_2_3_3_REV		0x8362
+#define GL_UNSIGNED_SHORT_5_6_5			0x8363
+#define GL_UNSIGNED_SHORT_5_6_5_REV		0x8364
+#define GL_UNSIGNED_SHORT_4_4_4_4		0x8033
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV		0x8365
+#define GL_UNSIGNED_SHORT_5_5_5_1		0x8034
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV		0x8366
+#define GL_UNSIGNED_INT_8_8_8_8			0x8035
+#define GL_UNSIGNED_INT_8_8_8_8_REV		0x8367
+#define GL_UNSIGNED_INT_10_10_10_2		0x8036
+#define GL_UNSIGNED_INT_2_10_10_10_REV		0x8368
+#define GL_LIGHT_MODEL_COLOR_CONTROL		0x81F8
+#define GL_SINGLE_COLOR				0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR		0x81FA
+#define GL_TEXTURE_MIN_LOD			0x813A
+#define GL_TEXTURE_MAX_LOD			0x813B
+#define GL_TEXTURE_BASE_LEVEL			0x813C
+#define GL_TEXTURE_MAX_LEVEL			0x813D
+#define GL_SMOOTH_POINT_SIZE_RANGE		0x0B12
+#define GL_SMOOTH_POINT_SIZE_GRANULARITY	0x0B13
+#define GL_SMOOTH_LINE_WIDTH_RANGE		0x0B22
+#define GL_SMOOTH_LINE_WIDTH_GRANULARITY	0x0B23
+#define GL_ALIASED_POINT_SIZE_RANGE		0x846D
+#define GL_ALIASED_LINE_WIDTH_RANGE		0x846E
+#define GL_PACK_SKIP_IMAGES			0x806B
+#define GL_PACK_IMAGE_HEIGHT			0x806C
+#define GL_UNPACK_SKIP_IMAGES			0x806D
+#define GL_UNPACK_IMAGE_HEIGHT			0x806E
+#define GL_TEXTURE_3D				0x806F
+#define GL_PROXY_TEXTURE_3D			0x8070
+#define GL_TEXTURE_DEPTH			0x8071
+#define GL_TEXTURE_WRAP_R			0x8072
+#define GL_MAX_3D_TEXTURE_SIZE			0x8073
+#define GL_TEXTURE_BINDING_3D			0x806A
+
+GLAPI void GLAPIENTRY glDrawRangeElements( GLenum mode, GLuint start,
+	GLuint end, GLsizei count, GLenum type, const GLvoid *indices );
+
+GLAPI void GLAPIENTRY glTexImage3D( GLenum target, GLint level,
+                                      GLint internalFormat,
+                                      GLsizei width, GLsizei height,
+                                      GLsizei depth, GLint border,
+                                      GLenum format, GLenum type,
+                                      const GLvoid *pixels );
+
+GLAPI void GLAPIENTRY glTexSubImage3D( GLenum target, GLint level,
+                                         GLint xoffset, GLint yoffset,
+                                         GLint zoffset, GLsizei width,
+                                         GLsizei height, GLsizei depth,
+                                         GLenum format,
+                                         GLenum type, const GLvoid *pixels);
+
+GLAPI void GLAPIENTRY glCopyTexSubImage3D( GLenum target, GLint level,
+                                             GLint xoffset, GLint yoffset,
+                                             GLint zoffset, GLint x,
+                                             GLint y, GLsizei width,
+                                             GLsizei height );
+
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+
+
+/*
+ * GL_ARB_imaging
+ */
+
+#define GL_CONSTANT_COLOR			0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR		0x8002
+#define GL_CONSTANT_ALPHA			0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA		0x8004
+#define GL_COLOR_TABLE				0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE		0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE	0x80D2
+#define GL_PROXY_COLOR_TABLE			0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE	0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE	0x80D5
+#define GL_COLOR_TABLE_SCALE			0x80D6
+#define GL_COLOR_TABLE_BIAS			0x80D7
+#define GL_COLOR_TABLE_FORMAT			0x80D8
+#define GL_COLOR_TABLE_WIDTH			0x80D9
+#define GL_COLOR_TABLE_RED_SIZE			0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE		0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE		0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE		0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE		0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE		0x80DF
+#define GL_CONVOLUTION_1D			0x8010
+#define GL_CONVOLUTION_2D			0x8011
+#define GL_SEPARABLE_2D				0x8012
+#define GL_CONVOLUTION_BORDER_MODE		0x8013
+#define GL_CONVOLUTION_FILTER_SCALE		0x8014
+#define GL_CONVOLUTION_FILTER_BIAS		0x8015
+#define GL_REDUCE				0x8016
+#define GL_CONVOLUTION_FORMAT			0x8017
+#define GL_CONVOLUTION_WIDTH			0x8018
+#define GL_CONVOLUTION_HEIGHT			0x8019
+#define GL_MAX_CONVOLUTION_WIDTH		0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT		0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE		0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE		0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE		0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE		0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS		0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS		0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS		0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS		0x8023
+#define GL_CONSTANT_BORDER			0x8151
+#define GL_REPLICATE_BORDER			0x8153
+#define GL_CONVOLUTION_BORDER_COLOR		0x8154
+#define GL_COLOR_MATRIX				0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH		0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH		0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE		0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE	0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE		0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE	0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS		0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS		0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS		0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS		0x80BB
+#define GL_HISTOGRAM				0x8024
+#define GL_PROXY_HISTOGRAM			0x8025
+#define GL_HISTOGRAM_WIDTH			0x8026
+#define GL_HISTOGRAM_FORMAT			0x8027
+#define GL_HISTOGRAM_RED_SIZE			0x8028
+#define GL_HISTOGRAM_GREEN_SIZE			0x8029
+#define GL_HISTOGRAM_BLUE_SIZE			0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE			0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE		0x802C
+#define GL_HISTOGRAM_SINK			0x802D
+#define GL_MINMAX				0x802E
+#define GL_MINMAX_FORMAT			0x802F
+#define GL_MINMAX_SINK				0x8030
+#define GL_TABLE_TOO_LARGE			0x8031
+#define GL_BLEND_EQUATION			0x8009
+#define GL_MIN					0x8007
+#define GL_MAX					0x8008
+#define GL_FUNC_ADD				0x8006
+#define GL_FUNC_SUBTRACT			0x800A
+#define GL_FUNC_REVERSE_SUBTRACT		0x800B
+#define GL_BLEND_COLOR				0x8005
+
+
+GLAPI void GLAPIENTRY glColorTable( GLenum target, GLenum internalformat,
+                                    GLsizei width, GLenum format,
+                                    GLenum type, const GLvoid *table );
+
+GLAPI void GLAPIENTRY glColorSubTable( GLenum target,
+                                       GLsizei start, GLsizei count,
+                                       GLenum format, GLenum type,
+                                       const GLvoid *data );
+
+GLAPI void GLAPIENTRY glColorTableParameteriv(GLenum target, GLenum pname,
+                                              const GLint *params);
+
+GLAPI void GLAPIENTRY glColorTableParameterfv(GLenum target, GLenum pname,
+                                              const GLfloat *params);
+
+GLAPI void GLAPIENTRY glCopyColorSubTable( GLenum target, GLsizei start,
+                                           GLint x, GLint y, GLsizei width );
+
+GLAPI void GLAPIENTRY glCopyColorTable( GLenum target, GLenum internalformat,
+                                        GLint x, GLint y, GLsizei width );
+
+GLAPI void GLAPIENTRY glGetColorTable( GLenum target, GLenum format,
+                                       GLenum type, GLvoid *table );
+
+GLAPI void GLAPIENTRY glGetColorTableParameterfv( GLenum target, GLenum pname,
+                                                  GLfloat *params );
+
+GLAPI void GLAPIENTRY glGetColorTableParameteriv( GLenum target, GLenum pname,
+                                                  GLint *params );
+
+GLAPI void GLAPIENTRY glBlendEquation( GLenum mode );
+
+GLAPI void GLAPIENTRY glBlendColor( GLclampf red, GLclampf green,
+                                    GLclampf blue, GLclampf alpha );
+
+GLAPI void GLAPIENTRY glHistogram( GLenum target, GLsizei width,
+				   GLenum internalformat, GLboolean sink );
+
+GLAPI void GLAPIENTRY glResetHistogram( GLenum target );
+
+GLAPI void GLAPIENTRY glGetHistogram( GLenum target, GLboolean reset,
+				      GLenum format, GLenum type,
+				      GLvoid *values );
+
+GLAPI void GLAPIENTRY glGetHistogramParameterfv( GLenum target, GLenum pname,
+						 GLfloat *params );
+
+GLAPI void GLAPIENTRY glGetHistogramParameteriv( GLenum target, GLenum pname,
+						 GLint *params );
+
+GLAPI void GLAPIENTRY glMinmax( GLenum target, GLenum internalformat,
+				GLboolean sink );
+
+GLAPI void GLAPIENTRY glResetMinmax( GLenum target );
+
+GLAPI void GLAPIENTRY glGetMinmax( GLenum target, GLboolean reset,
+                                   GLenum format, GLenum types,
+                                   GLvoid *values );
+
+GLAPI void GLAPIENTRY glGetMinmaxParameterfv( GLenum target, GLenum pname,
+					      GLfloat *params );
+
+GLAPI void GLAPIENTRY glGetMinmaxParameteriv( GLenum target, GLenum pname,
+					      GLint *params );
+
+GLAPI void GLAPIENTRY glConvolutionFilter1D( GLenum target,
+	GLenum internalformat, GLsizei width, GLenum format, GLenum type,
+	const GLvoid *image );
+
+GLAPI void GLAPIENTRY glConvolutionFilter2D( GLenum target,
+	GLenum internalformat, GLsizei width, GLsizei height, GLenum format,
+	GLenum type, const GLvoid *image );
+
+GLAPI void GLAPIENTRY glConvolutionParameterf( GLenum target, GLenum pname,
+	GLfloat params );
+
+GLAPI void GLAPIENTRY glConvolutionParameterfv( GLenum target, GLenum pname,
+	const GLfloat *params );
+
+GLAPI void GLAPIENTRY glConvolutionParameteri( GLenum target, GLenum pname,
+	GLint params );
+
+GLAPI void GLAPIENTRY glConvolutionParameteriv( GLenum target, GLenum pname,
+	const GLint *params );
+
+GLAPI void GLAPIENTRY glCopyConvolutionFilter1D( GLenum target,
+	GLenum internalformat, GLint x, GLint y, GLsizei width );
+
+GLAPI void GLAPIENTRY glCopyConvolutionFilter2D( GLenum target,
+	GLenum internalformat, GLint x, GLint y, GLsizei width,
+	GLsizei height);
+
+GLAPI void GLAPIENTRY glGetConvolutionFilter( GLenum target, GLenum format,
+	GLenum type, GLvoid *image );
+
+GLAPI void GLAPIENTRY glGetConvolutionParameterfv( GLenum target, GLenum pname,
+	GLfloat *params );
+
+GLAPI void GLAPIENTRY glGetConvolutionParameteriv( GLenum target, GLenum pname,
+	GLint *params );
+
+GLAPI void GLAPIENTRY glSeparableFilter2D( GLenum target,
+	GLenum internalformat, GLsizei width, GLsizei height, GLenum format,
+	GLenum type, const GLvoid *row, const GLvoid *column );
+
+GLAPI void GLAPIENTRY glGetSeparableFilter( GLenum target, GLenum format,
+	GLenum type, GLvoid *row, GLvoid *column, GLvoid *span );
+
+typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
+typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target);
+
+
+
+/*
+ * OpenGL 1.3
+ */
+
+/* multitexture */
+#define GL_TEXTURE0				0x84C0
+#define GL_TEXTURE1				0x84C1
+#define GL_TEXTURE2				0x84C2
+#define GL_TEXTURE3				0x84C3
+#define GL_TEXTURE4				0x84C4
+#define GL_TEXTURE5				0x84C5
+#define GL_TEXTURE6				0x84C6
+#define GL_TEXTURE7				0x84C7
+#define GL_TEXTURE8				0x84C8
+#define GL_TEXTURE9				0x84C9
+#define GL_TEXTURE10				0x84CA
+#define GL_TEXTURE11				0x84CB
+#define GL_TEXTURE12				0x84CC
+#define GL_TEXTURE13				0x84CD
+#define GL_TEXTURE14				0x84CE
+#define GL_TEXTURE15				0x84CF
+#define GL_TEXTURE16				0x84D0
+#define GL_TEXTURE17				0x84D1
+#define GL_TEXTURE18				0x84D2
+#define GL_TEXTURE19				0x84D3
+#define GL_TEXTURE20				0x84D4
+#define GL_TEXTURE21				0x84D5
+#define GL_TEXTURE22				0x84D6
+#define GL_TEXTURE23				0x84D7
+#define GL_TEXTURE24				0x84D8
+#define GL_TEXTURE25				0x84D9
+#define GL_TEXTURE26				0x84DA
+#define GL_TEXTURE27				0x84DB
+#define GL_TEXTURE28				0x84DC
+#define GL_TEXTURE29				0x84DD
+#define GL_TEXTURE30				0x84DE
+#define GL_TEXTURE31				0x84DF
+#define GL_ACTIVE_TEXTURE			0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE		0x84E1
+#define GL_MAX_TEXTURE_UNITS			0x84E2
+/* texture_cube_map */
+#define GL_NORMAL_MAP				0x8511
+#define GL_REFLECTION_MAP			0x8512
+#define GL_TEXTURE_CUBE_MAP			0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP		0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X		0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X		0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y		0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y		0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z		0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z		0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP		0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE		0x851C
+/* texture_compression */
+#define GL_COMPRESSED_ALPHA			0x84E9
+#define GL_COMPRESSED_LUMINANCE			0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA		0x84EB
+#define GL_COMPRESSED_INTENSITY			0x84EC
+#define GL_COMPRESSED_RGB			0x84ED
+#define GL_COMPRESSED_RGBA			0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT		0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE	0x86A0
+#define GL_TEXTURE_COMPRESSED			0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS	0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS		0x86A3
+/* multisample */
+#define GL_MULTISAMPLE				0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE		0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE			0x809F
+#define GL_SAMPLE_COVERAGE			0x80A0
+#define GL_SAMPLE_BUFFERS			0x80A8
+#define GL_SAMPLES				0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE		0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT		0x80AB
+#define GL_MULTISAMPLE_BIT			0x20000000
+/* transpose_matrix */
+#define GL_TRANSPOSE_MODELVIEW_MATRIX		0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX		0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX		0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX		0x84E6
+/* texture_env_combine */
+#define GL_COMBINE				0x8570
+#define GL_COMBINE_RGB				0x8571
+#define GL_COMBINE_ALPHA			0x8572
+#define GL_SOURCE0_RGB				0x8580
+#define GL_SOURCE1_RGB				0x8581
+#define GL_SOURCE2_RGB				0x8582
+#define GL_SOURCE0_ALPHA			0x8588
+#define GL_SOURCE1_ALPHA			0x8589
+#define GL_SOURCE2_ALPHA			0x858A
+#define GL_OPERAND0_RGB				0x8590
+#define GL_OPERAND1_RGB				0x8591
+#define GL_OPERAND2_RGB				0x8592
+#define GL_OPERAND0_ALPHA			0x8598
+#define GL_OPERAND1_ALPHA			0x8599
+#define GL_OPERAND2_ALPHA			0x859A
+#define GL_RGB_SCALE				0x8573
+#define GL_ADD_SIGNED				0x8574
+#define GL_INTERPOLATE				0x8575
+#define GL_SUBTRACT				0x84E7
+#define GL_CONSTANT				0x8576
+#define GL_PRIMARY_COLOR			0x8577
+#define GL_PREVIOUS				0x8578
+/* texture_env_dot3 */
+#define GL_DOT3_RGB				0x86AE
+#define GL_DOT3_RGBA				0x86AF
+/* texture_border_clamp */
+#define GL_CLAMP_TO_BORDER			0x812D
+
+GLAPI void GLAPIENTRY glActiveTexture( GLenum texture );
+
+GLAPI void GLAPIENTRY glClientActiveTexture( GLenum texture );
+
+GLAPI void GLAPIENTRY glCompressedTexImage1D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data );
+
+GLAPI void GLAPIENTRY glCompressedTexImage2D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data );
+
+GLAPI void GLAPIENTRY glCompressedTexImage3D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data );
+
+GLAPI void GLAPIENTRY glCompressedTexSubImage1D( GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data );
+
+GLAPI void GLAPIENTRY glCompressedTexSubImage2D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data );
+
+GLAPI void GLAPIENTRY glCompressedTexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data );
+
+GLAPI void GLAPIENTRY glGetCompressedTexImage( GLenum target, GLint lod, GLvoid *img );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1d( GLenum target, GLdouble s );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1dv( GLenum target, const GLdouble *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1f( GLenum target, GLfloat s );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1fv( GLenum target, const GLfloat *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1i( GLenum target, GLint s );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1iv( GLenum target, const GLint *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1s( GLenum target, GLshort s );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1sv( GLenum target, const GLshort *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2d( GLenum target, GLdouble s, GLdouble t );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2dv( GLenum target, const GLdouble *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2f( GLenum target, GLfloat s, GLfloat t );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2fv( GLenum target, const GLfloat *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2i( GLenum target, GLint s, GLint t );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2iv( GLenum target, const GLint *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2s( GLenum target, GLshort s, GLshort t );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2sv( GLenum target, const GLshort *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3d( GLenum target, GLdouble s, GLdouble t, GLdouble r );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3dv( GLenum target, const GLdouble *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3f( GLenum target, GLfloat s, GLfloat t, GLfloat r );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3fv( GLenum target, const GLfloat *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3i( GLenum target, GLint s, GLint t, GLint r );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3iv( GLenum target, const GLint *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3s( GLenum target, GLshort s, GLshort t, GLshort r );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3sv( GLenum target, const GLshort *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4d( GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4dv( GLenum target, const GLdouble *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4f( GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4fv( GLenum target, const GLfloat *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4i( GLenum target, GLint s, GLint t, GLint r, GLint q );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4iv( GLenum target, const GLint *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4s( GLenum target, GLshort s, GLshort t, GLshort r, GLshort q );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4sv( GLenum target, const GLshort *v );
+
+
+GLAPI void GLAPIENTRY glLoadTransposeMatrixd( const GLdouble m[16] );
+
+GLAPI void GLAPIENTRY glLoadTransposeMatrixf( const GLfloat m[16] );
+
+GLAPI void GLAPIENTRY glMultTransposeMatrixd( const GLdouble m[16] );
+
+GLAPI void GLAPIENTRY glMultTransposeMatrixf( const GLfloat m[16] );
+
+GLAPI void GLAPIENTRY glSampleCoverage( GLclampf value, GLboolean invert );
+
+typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m);
+typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, void *img);
+
+
+/*
+ * GL_ARB_multitexture (ARB extension 1 and OpenGL 1.2.1)
+ */
+#ifndef GL_ARB_multitexture
+#define GL_ARB_multitexture 1
+
+#define GL_TEXTURE0_ARB				0x84C0
+#define GL_TEXTURE1_ARB				0x84C1
+#define GL_TEXTURE2_ARB				0x84C2
+#define GL_TEXTURE3_ARB				0x84C3
+#define GL_TEXTURE4_ARB				0x84C4
+#define GL_TEXTURE5_ARB				0x84C5
+#define GL_TEXTURE6_ARB				0x84C6
+#define GL_TEXTURE7_ARB				0x84C7
+#define GL_TEXTURE8_ARB				0x84C8
+#define GL_TEXTURE9_ARB				0x84C9
+#define GL_TEXTURE10_ARB			0x84CA
+#define GL_TEXTURE11_ARB			0x84CB
+#define GL_TEXTURE12_ARB			0x84CC
+#define GL_TEXTURE13_ARB			0x84CD
+#define GL_TEXTURE14_ARB			0x84CE
+#define GL_TEXTURE15_ARB			0x84CF
+#define GL_TEXTURE16_ARB			0x84D0
+#define GL_TEXTURE17_ARB			0x84D1
+#define GL_TEXTURE18_ARB			0x84D2
+#define GL_TEXTURE19_ARB			0x84D3
+#define GL_TEXTURE20_ARB			0x84D4
+#define GL_TEXTURE21_ARB			0x84D5
+#define GL_TEXTURE22_ARB			0x84D6
+#define GL_TEXTURE23_ARB			0x84D7
+#define GL_TEXTURE24_ARB			0x84D8
+#define GL_TEXTURE25_ARB			0x84D9
+#define GL_TEXTURE26_ARB			0x84DA
+#define GL_TEXTURE27_ARB			0x84DB
+#define GL_TEXTURE28_ARB			0x84DC
+#define GL_TEXTURE29_ARB			0x84DD
+#define GL_TEXTURE30_ARB			0x84DE
+#define GL_TEXTURE31_ARB			0x84DF
+#define GL_ACTIVE_TEXTURE_ARB			0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE_ARB		0x84E1
+#define GL_MAX_TEXTURE_UNITS_ARB		0x84E2
+
+GLAPI void GLAPIENTRY glActiveTextureARB(GLenum texture);
+GLAPI void GLAPIENTRY glClientActiveTextureARB(GLenum texture);
+GLAPI void GLAPIENTRY glMultiTexCoord1dARB(GLenum target, GLdouble s);
+GLAPI void GLAPIENTRY glMultiTexCoord1dvARB(GLenum target, const GLdouble *v);
+GLAPI void GLAPIENTRY glMultiTexCoord1fARB(GLenum target, GLfloat s);
+GLAPI void GLAPIENTRY glMultiTexCoord1fvARB(GLenum target, const GLfloat *v);
+GLAPI void GLAPIENTRY glMultiTexCoord1iARB(GLenum target, GLint s);
+GLAPI void GLAPIENTRY glMultiTexCoord1ivARB(GLenum target, const GLint *v);
+GLAPI void GLAPIENTRY glMultiTexCoord1sARB(GLenum target, GLshort s);
+GLAPI void GLAPIENTRY glMultiTexCoord1svARB(GLenum target, const GLshort *v);
+GLAPI void GLAPIENTRY glMultiTexCoord2dARB(GLenum target, GLdouble s, GLdouble t);
+GLAPI void GLAPIENTRY glMultiTexCoord2dvARB(GLenum target, const GLdouble *v);
+GLAPI void GLAPIENTRY glMultiTexCoord2fARB(GLenum target, GLfloat s, GLfloat t);
+GLAPI void GLAPIENTRY glMultiTexCoord2fvARB(GLenum target, const GLfloat *v);
+GLAPI void GLAPIENTRY glMultiTexCoord2iARB(GLenum target, GLint s, GLint t);
+GLAPI void GLAPIENTRY glMultiTexCoord2ivARB(GLenum target, const GLint *v);
+GLAPI void GLAPIENTRY glMultiTexCoord2sARB(GLenum target, GLshort s, GLshort t);
+GLAPI void GLAPIENTRY glMultiTexCoord2svARB(GLenum target, const GLshort *v);
+GLAPI void GLAPIENTRY glMultiTexCoord3dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r);
+GLAPI void GLAPIENTRY glMultiTexCoord3dvARB(GLenum target, const GLdouble *v);
+GLAPI void GLAPIENTRY glMultiTexCoord3fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r);
+GLAPI void GLAPIENTRY glMultiTexCoord3fvARB(GLenum target, const GLfloat *v);
+GLAPI void GLAPIENTRY glMultiTexCoord3iARB(GLenum target, GLint s, GLint t, GLint r);
+GLAPI void GLAPIENTRY glMultiTexCoord3ivARB(GLenum target, const GLint *v);
+GLAPI void GLAPIENTRY glMultiTexCoord3sARB(GLenum target, GLshort s, GLshort t, GLshort r);
+GLAPI void GLAPIENTRY glMultiTexCoord3svARB(GLenum target, const GLshort *v);
+GLAPI void GLAPIENTRY glMultiTexCoord4dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+GLAPI void GLAPIENTRY glMultiTexCoord4dvARB(GLenum target, const GLdouble *v);
+GLAPI void GLAPIENTRY glMultiTexCoord4fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+GLAPI void GLAPIENTRY glMultiTexCoord4fvARB(GLenum target, const GLfloat *v);
+GLAPI void GLAPIENTRY glMultiTexCoord4iARB(GLenum target, GLint s, GLint t, GLint r, GLint q);
+GLAPI void GLAPIENTRY glMultiTexCoord4ivARB(GLenum target, const GLint *v);
+GLAPI void GLAPIENTRY glMultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+GLAPI void GLAPIENTRY glMultiTexCoord4svARB(GLenum target, const GLshort *v);
+
+typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
+
+#endif /* GL_ARB_multitexture */
+
+
+
+/*
+ * Define this token if you want "old-style" header file behaviour (extensions
+ * defined in gl.h).  Otherwise, extensions will be included from glext.h.
+ */
+#if defined(GL_GLEXT_LEGACY)
+
+/* All extensions that used to be here are now found in glext.h */
+
+#else  /* GL_GLEXT_LEGACY */
+
+#include <GL/glext.h>
+
+#endif  /* GL_GLEXT_LEGACY */
+
+
+
+/*
+ * ???. GL_MESA_trace
+ * XXX obsolete
+ */
+#ifndef GL_MESA_trace
+#define GL_MESA_trace 1
+
+#define GL_TRACE_ALL_BITS_MESA			0xFFFF
+#define GL_TRACE_OPERATIONS_BIT_MESA		0x0001
+#define GL_TRACE_PRIMITIVES_BIT_MESA		0x0002
+#define GL_TRACE_ARRAYS_BIT_MESA		0x0004
+#define GL_TRACE_TEXTURES_BIT_MESA		0x0008
+#define GL_TRACE_PIXELS_BIT_MESA		0x0010
+#define GL_TRACE_ERRORS_BIT_MESA		0x0020
+#define GL_TRACE_MASK_MESA			0x8755
+#define GL_TRACE_NAME_MESA			0x8756
+
+GLAPI void GLAPIENTRY glEnableTraceMESA( GLbitfield mask );
+GLAPI void GLAPIENTRY glDisableTraceMESA( GLbitfield mask );
+GLAPI void GLAPIENTRY glNewTraceMESA( GLbitfield mask, const GLubyte * traceName );
+GLAPI void GLAPIENTRY glEndTraceMESA( void );
+GLAPI void GLAPIENTRY glTraceAssertAttribMESA( GLbitfield attribMask );
+GLAPI void GLAPIENTRY glTraceCommentMESA( const GLubyte * comment );
+GLAPI void GLAPIENTRY glTraceTextureMESA( GLuint name, const GLubyte* comment );
+GLAPI void GLAPIENTRY glTraceListMESA( GLuint name, const GLubyte* comment );
+GLAPI void GLAPIENTRY glTracePointerMESA( GLvoid* pointer, const GLubyte* comment );
+GLAPI void GLAPIENTRY glTracePointerRangeMESA( const GLvoid* first, const GLvoid* last, const GLubyte* comment );
+
+#endif /* GL_MESA_trace */
+
+
+/*
+ * ???. GL_MESA_packed_depth_stencil
+ * XXX obsolete
+ */
+#ifndef GL_MESA_packed_depth_stencil
+#define GL_MESA_packed_depth_stencil 1
+
+#define GL_DEPTH_STENCIL_MESA			0x8750
+#define GL_UNSIGNED_INT_24_8_MESA		0x8751
+#define GL_UNSIGNED_INT_8_24_REV_MESA		0x8752
+#define GL_UNSIGNED_SHORT_15_1_MESA		0x8753
+#define GL_UNSIGNED_SHORT_1_15_REV_MESA		0x8754
+
+#endif /* GL_MESA_packed_depth_stencil */
+
+
+#ifndef GL_MESA_program_debug
+#define GL_MESA_program_debug 1
+
+#define GL_FRAGMENT_PROGRAM_POSITION_MESA       0x8bb0
+#define GL_FRAGMENT_PROGRAM_CALLBACK_MESA       0x8bb1
+#define GL_FRAGMENT_PROGRAM_CALLBACK_FUNC_MESA  0x8bb2
+#define GL_FRAGMENT_PROGRAM_CALLBACK_DATA_MESA  0x8bb3
+#define GL_VERTEX_PROGRAM_POSITION_MESA         0x8bb4
+#define GL_VERTEX_PROGRAM_CALLBACK_MESA         0x8bb5
+#define GL_VERTEX_PROGRAM_CALLBACK_FUNC_MESA    0x8bb6
+#define GL_VERTEX_PROGRAM_CALLBACK_DATA_MESA    0x8bb7
+
+typedef void (*GLprogramcallbackMESA)(GLenum target, GLvoid *data);
+
+extern void
+glProgramCallbackMESA(GLenum target, GLprogramcallbackMESA callback,
+                      GLvoid *data);
+
+extern void
+glGetProgramRegisterfvMESA(GLenum target, GLsizei len, const GLubyte *name,
+                           GLfloat *v);
+
+#endif /* GL_MESA_program_debug */
+
+
+/**
+ ** NOTE!!!!!  If you add new functions to this file, or update
+ ** glext.h be sure to regenerate the gl_mangle.h file.  See comments
+ ** in that file for details.
+ **/
+
+
+/**********************************************************************
+ * Begin system-specific stuff
+ */
+#if defined(PRAGMA_EXPORT_SUPPORTED)
+#pragma export off
+#endif
+
+#if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED
+#pragma import off
+#endif
+/*
+ * End system-specific stuff
+ **********************************************************************/
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __gl_h_ */
diff --git a/reactos/lib/mesa32/include/GL/gl_mangle.h b/reactos/lib/mesa32/include/GL/gl_mangle.h
new file mode 100644
index 00000000000..bd7e4ee8cee
--- /dev/null
+++ b/reactos/lib/mesa32/include/GL/gl_mangle.h
@@ -0,0 +1,1356 @@
+#if 0
+#define GL_MANGLE_C1 "DO NOT EDIT!!! - TO REGENERATE from gl.h, EXECUTE THIS FILE IN SHELL (/bin/sh) and save the output"
+#define GL_MANGLE_C2 "This file is used to create GL function protypes and aliases for the function names"
+	files="gl.h glext.h"
+#define GL_MANGLE_C3 "get regeneration header - copy everything in this file above the 'REGENERATE_TO_END' line"
+	awk 	'!done; /^\/\*REGENERATE_TO_END/ {done=1}' $0
+	echo ""
+#define GL_MANGLE_C4 get aliases
+	grep '^GLAPI' $files | sed -e 's/.*ENTRY gl\([^( ]*\).*$/#define gl\1		MANGLE(\1)/' | sort | uniq
+	echo ""
+	echo "#endif /* GL_MANGLE_H */"
+	exit
+#endif /* REGENERATION */
+
+/*
+ * If you compile Mesa with USE_MGL_NAMESPACE defined then you can link
+ * your application both with OpenGL and Mesa.  The Mesa functions will
+ * be redefined so they are prefixed with "mgl" instead of "gl".
+ * Mgl contributed by Randy Frank (rfrank@rsinc.com)
+ * Regneration code contributed by Ray Tice (rayt@ma.ultra.net)
+ */
+
+#ifndef GL_MANGLE_H
+#define GL_MANGLE_H
+
+#ifndef   MANGLE
+#define   MANGLE(x) mgl##x
+#endif  /*MANGLE*/
+
+/* Internal symbols which may collide with other OpenGL implementations. */
+#define __glCoreCreateContext __mglCoreCreateContext
+#define __glCoreNopDispatch   __mglCoreNopDispatch
+
+/*REGENERATE_TO_END-----------ALL LINES BELOW HERE GET REPLACED ON REGENERATION */
+
+#define glAccum		MANGLE(Accum)
+#define glActiveStencilFaceEXT		MANGLE(ActiveStencilFaceEXT)
+#define glActiveTextureARB		MANGLE(ActiveTextureARB)
+#define glActiveTexture		MANGLE(ActiveTexture)
+#define glAlphaFragmentOp1ATI		MANGLE(AlphaFragmentOp1ATI)
+#define glAlphaFragmentOp2ATI		MANGLE(AlphaFragmentOp2ATI)
+#define glAlphaFragmentOp3ATI		MANGLE(AlphaFragmentOp3ATI)
+#define glAlphaFunc		MANGLE(AlphaFunc)
+#define glApplyTextureEXT		MANGLE(ApplyTextureEXT)
+#define glAreProgramsResidentNV		MANGLE(AreProgramsResidentNV)
+#define glAreTexturesResidentEXT		MANGLE(AreTexturesResidentEXT)
+#define glAreTexturesResident		MANGLE(AreTexturesResident)
+#define glArrayElementEXT		MANGLE(ArrayElementEXT)
+#define glArrayElement		MANGLE(ArrayElement)
+#define glArrayObjectATI		MANGLE(ArrayObjectATI)
+#define glAsyncMarkerSGIX		MANGLE(AsyncMarkerSGIX)
+#define glAttachObjectARB		MANGLE(AttachObjectARB)
+#define glBeginFragmentShaderATI		MANGLE(BeginFragmentShaderATI)
+#define glBegin		MANGLE(Begin)
+#define glBeginOcclusionQueryNV		MANGLE(BeginOcclusionQueryNV)
+#define glBeginQueryARB		MANGLE(BeginQueryARB)
+#define glBeginQuery		MANGLE(BeginQuery)
+#define glBeginVertexShaderEXT		MANGLE(BeginVertexShaderEXT)
+#define glBindAttribLocationARB		MANGLE(BindAttribLocationARB)
+#define glBindBufferARB		MANGLE(BindBufferARB)
+#define glBindBuffer		MANGLE(BindBuffer)
+#define glBindFragmentShaderATI		MANGLE(BindFragmentShaderATI)
+#define glBindLightParameterEXT		MANGLE(BindLightParameterEXT)
+#define glBindMaterialParameterEXT		MANGLE(BindMaterialParameterEXT)
+#define glBindParameterEXT		MANGLE(BindParameterEXT)
+#define glBindProgramARB		MANGLE(BindProgramARB)
+#define glBindProgramNV		MANGLE(BindProgramNV)
+#define glBindTexGenParameterEXT		MANGLE(BindTexGenParameterEXT)
+#define glBindTextureEXT		MANGLE(BindTextureEXT)
+#define glBindTexture		MANGLE(BindTexture)
+#define glBindTextureUnitParameterEXT		MANGLE(BindTextureUnitParameterEXT)
+#define glBindVertexArrayAPPLE		MANGLE(BindVertexArrayAPPLE)
+#define glBindVertexShaderEXT		MANGLE(BindVertexShaderEXT)
+#define glBinormal3bEXT		MANGLE(Binormal3bEXT)
+#define glBinormal3bvEXT		MANGLE(Binormal3bvEXT)
+#define glBinormal3dEXT		MANGLE(Binormal3dEXT)
+#define glBinormal3dvEXT		MANGLE(Binormal3dvEXT)
+#define glBinormal3fEXT		MANGLE(Binormal3fEXT)
+#define glBinormal3fvEXT		MANGLE(Binormal3fvEXT)
+#define glBinormal3iEXT		MANGLE(Binormal3iEXT)
+#define glBinormal3ivEXT		MANGLE(Binormal3ivEXT)
+#define glBinormal3sEXT		MANGLE(Binormal3sEXT)
+#define glBinormal3svEXT		MANGLE(Binormal3svEXT)
+#define glBinormalPointerEXT		MANGLE(BinormalPointerEXT)
+#define glBitmap		MANGLE(Bitmap)
+#define glBlendColorEXT		MANGLE(BlendColorEXT)
+#define glBlendColor		MANGLE(BlendColor)
+#define glBlendEquationEXT		MANGLE(BlendEquationEXT)
+#define glBlendEquation		MANGLE(BlendEquation)
+#define glBlendEquationSeparateEXT		MANGLE(BlendEquationSeparateEXT)
+#define glBlendFunc		MANGLE(BlendFunc)
+#define glBlendFuncSeparateEXT		MANGLE(BlendFuncSeparateEXT)
+#define glBlendFuncSeparateINGR		MANGLE(BlendFuncSeparateINGR)
+#define glBlendFuncSeparate		MANGLE(BlendFuncSeparate)
+#define glBufferDataARB		MANGLE(BufferDataARB)
+#define glBufferData		MANGLE(BufferData)
+#define glBufferSubDataARB		MANGLE(BufferSubDataARB)
+#define glBufferSubData		MANGLE(BufferSubData)
+#define glCallList		MANGLE(CallList)
+#define glCallLists		MANGLE(CallLists)
+#define glClearAccum		MANGLE(ClearAccum)
+#define glClearColor		MANGLE(ClearColor)
+#define glClearDepth		MANGLE(ClearDepth)
+#define glClearIndex		MANGLE(ClearIndex)
+#define glClear		MANGLE(Clear)
+#define glClearStencil		MANGLE(ClearStencil)
+#define glClientActiveTextureARB		MANGLE(ClientActiveTextureARB)
+#define glClientActiveTexture		MANGLE(ClientActiveTexture)
+#define glClientActiveVertexStreamATI		MANGLE(ClientActiveVertexStreamATI)
+#define glClipPlane		MANGLE(ClipPlane)
+#define glColor3b		MANGLE(Color3b)
+#define glColor3bv		MANGLE(Color3bv)
+#define glColor3d		MANGLE(Color3d)
+#define glColor3dv		MANGLE(Color3dv)
+#define glColor3f		MANGLE(Color3f)
+#define glColor3fVertex3fSUN		MANGLE(Color3fVertex3fSUN)
+#define glColor3fVertex3fvSUN		MANGLE(Color3fVertex3fvSUN)
+#define glColor3fv		MANGLE(Color3fv)
+#define glColor3hNV		MANGLE(Color3hNV)
+#define glColor3hvNV		MANGLE(Color3hvNV)
+#define glColor3i		MANGLE(Color3i)
+#define glColor3iv		MANGLE(Color3iv)
+#define glColor3s		MANGLE(Color3s)
+#define glColor3sv		MANGLE(Color3sv)
+#define glColor3ub		MANGLE(Color3ub)
+#define glColor3ubv		MANGLE(Color3ubv)
+#define glColor3ui		MANGLE(Color3ui)
+#define glColor3uiv		MANGLE(Color3uiv)
+#define glColor3us		MANGLE(Color3us)
+#define glColor3usv		MANGLE(Color3usv)
+#define glColor4b		MANGLE(Color4b)
+#define glColor4bv		MANGLE(Color4bv)
+#define glColor4d		MANGLE(Color4d)
+#define glColor4dv		MANGLE(Color4dv)
+#define glColor4f		MANGLE(Color4f)
+#define glColor4fNormal3fVertex3fSUN		MANGLE(Color4fNormal3fVertex3fSUN)
+#define glColor4fNormal3fVertex3fvSUN		MANGLE(Color4fNormal3fVertex3fvSUN)
+#define glColor4fv		MANGLE(Color4fv)
+#define glColor4hNV		MANGLE(Color4hNV)
+#define glColor4hvNV		MANGLE(Color4hvNV)
+#define glColor4i		MANGLE(Color4i)
+#define glColor4iv		MANGLE(Color4iv)
+#define glColor4s		MANGLE(Color4s)
+#define glColor4sv		MANGLE(Color4sv)
+#define glColor4ub		MANGLE(Color4ub)
+#define glColor4ubVertex2fSUN		MANGLE(Color4ubVertex2fSUN)
+#define glColor4ubVertex2fvSUN		MANGLE(Color4ubVertex2fvSUN)
+#define glColor4ubVertex3fSUN		MANGLE(Color4ubVertex3fSUN)
+#define glColor4ubVertex3fvSUN		MANGLE(Color4ubVertex3fvSUN)
+#define glColor4ubv		MANGLE(Color4ubv)
+#define glColor4ui		MANGLE(Color4ui)
+#define glColor4uiv		MANGLE(Color4uiv)
+#define glColor4us		MANGLE(Color4us)
+#define glColor4usv		MANGLE(Color4usv)
+#define glColorFragmentOp1ATI		MANGLE(ColorFragmentOp1ATI)
+#define glColorFragmentOp2ATI		MANGLE(ColorFragmentOp2ATI)
+#define glColorFragmentOp3ATI		MANGLE(ColorFragmentOp3ATI)
+#define glColorMask		MANGLE(ColorMask)
+#define glColorMaterial		MANGLE(ColorMaterial)
+#define glColorPointerEXT		MANGLE(ColorPointerEXT)
+#define glColorPointerListIBM		MANGLE(ColorPointerListIBM)
+#define glColorPointer		MANGLE(ColorPointer)
+#define glColorPointervINTEL		MANGLE(ColorPointervINTEL)
+#define glColorSubTableEXT		MANGLE(ColorSubTableEXT)
+#define glColorSubTable		MANGLE(ColorSubTable)
+#define glColorTableEXT		MANGLE(ColorTableEXT)
+#define glColorTable		MANGLE(ColorTable)
+#define glColorTableParameterfv		MANGLE(ColorTableParameterfv)
+#define glColorTableParameterfvSGI		MANGLE(ColorTableParameterfvSGI)
+#define glColorTableParameteriv		MANGLE(ColorTableParameteriv)
+#define glColorTableParameterivSGI		MANGLE(ColorTableParameterivSGI)
+#define glColorTableSGI		MANGLE(ColorTableSGI)
+#define glCombinerInputNV		MANGLE(CombinerInputNV)
+#define glCombinerOutputNV		MANGLE(CombinerOutputNV)
+#define glCombinerParameterfNV		MANGLE(CombinerParameterfNV)
+#define glCombinerParameterfvNV		MANGLE(CombinerParameterfvNV)
+#define glCombinerParameteriNV		MANGLE(CombinerParameteriNV)
+#define glCombinerParameterivNV		MANGLE(CombinerParameterivNV)
+#define glCombinerStageParameterfvNV		MANGLE(CombinerStageParameterfvNV)
+#define glCompileShaderARB		MANGLE(CompileShaderARB)
+#define glCompressedTexImage1DARB		MANGLE(CompressedTexImage1DARB)
+#define glCompressedTexImage1D		MANGLE(CompressedTexImage1D)
+#define glCompressedTexImage2DARB		MANGLE(CompressedTexImage2DARB)
+#define glCompressedTexImage2D		MANGLE(CompressedTexImage2D)
+#define glCompressedTexImage3DARB		MANGLE(CompressedTexImage3DARB)
+#define glCompressedTexImage3D		MANGLE(CompressedTexImage3D)
+#define glCompressedTexSubImage1DARB		MANGLE(CompressedTexSubImage1DARB)
+#define glCompressedTexSubImage1D		MANGLE(CompressedTexSubImage1D)
+#define glCompressedTexSubImage2DARB		MANGLE(CompressedTexSubImage2DARB)
+#define glCompressedTexSubImage2D		MANGLE(CompressedTexSubImage2D)
+#define glCompressedTexSubImage3DARB		MANGLE(CompressedTexSubImage3DARB)
+#define glCompressedTexSubImage3D		MANGLE(CompressedTexSubImage3D)
+#define glConvolutionFilter1DEXT		MANGLE(ConvolutionFilter1DEXT)
+#define glConvolutionFilter1D		MANGLE(ConvolutionFilter1D)
+#define glConvolutionFilter2DEXT		MANGLE(ConvolutionFilter2DEXT)
+#define glConvolutionFilter2D		MANGLE(ConvolutionFilter2D)
+#define glConvolutionParameterfEXT		MANGLE(ConvolutionParameterfEXT)
+#define glConvolutionParameterf		MANGLE(ConvolutionParameterf)
+#define glConvolutionParameterfvEXT		MANGLE(ConvolutionParameterfvEXT)
+#define glConvolutionParameterfv		MANGLE(ConvolutionParameterfv)
+#define glConvolutionParameteriEXT		MANGLE(ConvolutionParameteriEXT)
+#define glConvolutionParameteri		MANGLE(ConvolutionParameteri)
+#define glConvolutionParameterivEXT		MANGLE(ConvolutionParameterivEXT)
+#define glConvolutionParameteriv		MANGLE(ConvolutionParameteriv)
+#define glCopyColorSubTableEXT		MANGLE(CopyColorSubTableEXT)
+#define glCopyColorSubTable		MANGLE(CopyColorSubTable)
+#define glCopyColorTable		MANGLE(CopyColorTable)
+#define glCopyColorTableSGI		MANGLE(CopyColorTableSGI)
+#define glCopyConvolutionFilter1DEXT		MANGLE(CopyConvolutionFilter1DEXT)
+#define glCopyConvolutionFilter1D		MANGLE(CopyConvolutionFilter1D)
+#define glCopyConvolutionFilter2DEXT		MANGLE(CopyConvolutionFilter2DEXT)
+#define glCopyConvolutionFilter2D		MANGLE(CopyConvolutionFilter2D)
+#define glCopyPixels		MANGLE(CopyPixels)
+#define glCopyTexImage1DEXT		MANGLE(CopyTexImage1DEXT)
+#define glCopyTexImage1D		MANGLE(CopyTexImage1D)
+#define glCopyTexImage2DEXT		MANGLE(CopyTexImage2DEXT)
+#define glCopyTexImage2D		MANGLE(CopyTexImage2D)
+#define glCopyTexSubImage1DEXT		MANGLE(CopyTexSubImage1DEXT)
+#define glCopyTexSubImage1D		MANGLE(CopyTexSubImage1D)
+#define glCopyTexSubImage2DEXT		MANGLE(CopyTexSubImage2DEXT)
+#define glCopyTexSubImage2D		MANGLE(CopyTexSubImage2D)
+#define glCopyTexSubImage3DEXT		MANGLE(CopyTexSubImage3DEXT)
+#define glCopyTexSubImage3D		MANGLE(CopyTexSubImage3D)
+#define glCreateProgramObjectARB		MANGLE(CreateProgramObjectARB)
+#define glCreateShaderObjectARB		MANGLE(CreateShaderObjectARB)
+#define glCullFace		MANGLE(CullFace)
+#define glCullParameterdvEXT		MANGLE(CullParameterdvEXT)
+#define glCullParameterfvEXT		MANGLE(CullParameterfvEXT)
+#define glCurrentPaletteMatrixARB		MANGLE(CurrentPaletteMatrixARB)
+#define glDeformationMap3dSGIX		MANGLE(DeformationMap3dSGIX)
+#define glDeformationMap3fSGIX		MANGLE(DeformationMap3fSGIX)
+#define glDeformSGIX		MANGLE(DeformSGIX)
+#define glDeleteAsyncMarkersSGIX		MANGLE(DeleteAsyncMarkersSGIX)
+#define glDeleteBuffersARB		MANGLE(DeleteBuffersARB)
+#define glDeleteBuffers		MANGLE(DeleteBuffers)
+#define glDeleteFencesAPPLE		MANGLE(DeleteFencesAPPLE)
+#define glDeleteFencesNV		MANGLE(DeleteFencesNV)
+#define glDeleteFragmentShaderATI		MANGLE(DeleteFragmentShaderATI)
+#define glDeleteLists		MANGLE(DeleteLists)
+#define glDeleteObjectARB		MANGLE(DeleteObjectARB)
+#define glDeleteOcclusionQueriesNV		MANGLE(DeleteOcclusionQueriesNV)
+#define glDeleteProgramsARB		MANGLE(DeleteProgramsARB)
+#define glDeleteProgramsNV		MANGLE(DeleteProgramsNV)
+#define glDeleteQueriesARB		MANGLE(DeleteQueriesARB)
+#define glDeleteQueries		MANGLE(DeleteQueries)
+#define glDeleteTexturesEXT		MANGLE(DeleteTexturesEXT)
+#define glDeleteTextures		MANGLE(DeleteTextures)
+#define glDeleteVertexArraysAPPLE		MANGLE(DeleteVertexArraysAPPLE)
+#define glDeleteVertexShaderEXT		MANGLE(DeleteVertexShaderEXT)
+#define glDepthBoundsEXT		MANGLE(DepthBoundsEXT)
+#define glDepthFunc		MANGLE(DepthFunc)
+#define glDepthMask		MANGLE(DepthMask)
+#define glDepthRange		MANGLE(DepthRange)
+#define glDetachObjectARB		MANGLE(DetachObjectARB)
+#define glDetailTexFuncSGIS		MANGLE(DetailTexFuncSGIS)
+#define glDisableClientState		MANGLE(DisableClientState)
+#define glDisable		MANGLE(Disable)
+#define glDisableTraceMESA		MANGLE(DisableTraceMESA)
+#define glDisableVariantClientStateEXT		MANGLE(DisableVariantClientStateEXT)
+#define glDisableVertexAttribArrayARB		MANGLE(DisableVertexAttribArrayARB)
+#define glDrawArraysEXT		MANGLE(DrawArraysEXT)
+#define glDrawArrays		MANGLE(DrawArrays)
+#define glDrawBuffer		MANGLE(DrawBuffer)
+#define glDrawBuffersATI		MANGLE(DrawBuffersATI)
+#define glDrawElementArrayAPPLE		MANGLE(DrawElementArrayAPPLE)
+#define glDrawElementArrayATI		MANGLE(DrawElementArrayATI)
+#define glDrawElements		MANGLE(DrawElements)
+#define glDrawMeshArraysSUN		MANGLE(DrawMeshArraysSUN)
+#define glDrawPixels		MANGLE(DrawPixels)
+#define glDrawRangeElementArrayAPPLE		MANGLE(DrawRangeElementArrayAPPLE)
+#define glDrawRangeElementArrayATI		MANGLE(DrawRangeElementArrayATI)
+#define glDrawRangeElementsEXT		MANGLE(DrawRangeElementsEXT)
+#define glDrawRangeElements		MANGLE(DrawRangeElements)
+#define glEdgeFlag		MANGLE(EdgeFlag)
+#define glEdgeFlagPointerEXT		MANGLE(EdgeFlagPointerEXT)
+#define glEdgeFlagPointerListIBM		MANGLE(EdgeFlagPointerListIBM)
+#define glEdgeFlagPointer		MANGLE(EdgeFlagPointer)
+#define glEdgeFlagv		MANGLE(EdgeFlagv)
+#define glElementPointerAPPLE		MANGLE(ElementPointerAPPLE)
+#define glElementPointerATI		MANGLE(ElementPointerATI)
+#define glEnableClientState		MANGLE(EnableClientState)
+#define glEnable		MANGLE(Enable)
+#define glEnableTraceMESA		MANGLE(EnableTraceMESA)
+#define glEnableVariantClientStateEXT		MANGLE(EnableVariantClientStateEXT)
+#define glEnableVertexAttribArrayARB		MANGLE(EnableVertexAttribArrayARB)
+#define glEndFragmentShaderATI		MANGLE(EndFragmentShaderATI)
+#define glEndList		MANGLE(EndList)
+#define glEnd		MANGLE(End)
+#define glEndOcclusionQueryNV		MANGLE(EndOcclusionQueryNV)
+#define glEndQueryARB		MANGLE(EndQueryARB)
+#define glEndQuery		MANGLE(EndQuery)
+#define glEndTraceMESA		MANGLE(EndTraceMESA)
+#define glEndVertexShaderEXT		MANGLE(EndVertexShaderEXT)
+#define glEvalCoord1d		MANGLE(EvalCoord1d)
+#define glEvalCoord1dv		MANGLE(EvalCoord1dv)
+#define glEvalCoord1f		MANGLE(EvalCoord1f)
+#define glEvalCoord1fv		MANGLE(EvalCoord1fv)
+#define glEvalCoord2d		MANGLE(EvalCoord2d)
+#define glEvalCoord2dv		MANGLE(EvalCoord2dv)
+#define glEvalCoord2f		MANGLE(EvalCoord2f)
+#define glEvalCoord2fv		MANGLE(EvalCoord2fv)
+#define glEvalMapsNV		MANGLE(EvalMapsNV)
+#define glEvalMesh1		MANGLE(EvalMesh1)
+#define glEvalMesh2		MANGLE(EvalMesh2)
+#define glEvalPoint1		MANGLE(EvalPoint1)
+#define glEvalPoint2		MANGLE(EvalPoint2)
+#define glExecuteProgramNV		MANGLE(ExecuteProgramNV)
+#define glExtractComponentEXT		MANGLE(ExtractComponentEXT)
+#define glFeedbackBuffer		MANGLE(FeedbackBuffer)
+#define glFinalCombinerInputNV		MANGLE(FinalCombinerInputNV)
+#define glFinishAsyncSGIX		MANGLE(FinishAsyncSGIX)
+#define glFinishFenceAPPLE		MANGLE(FinishFenceAPPLE)
+#define glFinishFenceNV		MANGLE(FinishFenceNV)
+#define glFinish		MANGLE(Finish)
+#define glFinishObjectAPPLE		MANGLE(FinishObjectAPPLE)
+#define glFinishTextureSUNX		MANGLE(FinishTextureSUNX)
+#define glFlush		MANGLE(Flush)
+#define glFlushPixelDataRangeNV		MANGLE(FlushPixelDataRangeNV)
+#define glFlushRasterSGIX		MANGLE(FlushRasterSGIX)
+#define glFlushVertexArrayRangeAPPLE		MANGLE(FlushVertexArrayRangeAPPLE)
+#define glFlushVertexArrayRangeNV		MANGLE(FlushVertexArrayRangeNV)
+#define glFogCoorddEXT		MANGLE(FogCoorddEXT)
+#define glFogCoordd		MANGLE(FogCoordd)
+#define glFogCoorddvEXT		MANGLE(FogCoorddvEXT)
+#define glFogCoorddv		MANGLE(FogCoorddv)
+#define glFogCoordfEXT		MANGLE(FogCoordfEXT)
+#define glFogCoordf		MANGLE(FogCoordf)
+#define glFogCoordfvEXT		MANGLE(FogCoordfvEXT)
+#define glFogCoordfv		MANGLE(FogCoordfv)
+#define glFogCoordhNV		MANGLE(FogCoordhNV)
+#define glFogCoordhvNV		MANGLE(FogCoordhvNV)
+#define glFogCoordPointerEXT		MANGLE(FogCoordPointerEXT)
+#define glFogCoordPointerListIBM		MANGLE(FogCoordPointerListIBM)
+#define glFogCoordPointer		MANGLE(FogCoordPointer)
+#define glFogf		MANGLE(Fogf)
+#define glFogFuncSGIS		MANGLE(FogFuncSGIS)
+#define glFogfv		MANGLE(Fogfv)
+#define glFogi		MANGLE(Fogi)
+#define glFogiv		MANGLE(Fogiv)
+#define glFragmentColorMaterialSGIX		MANGLE(FragmentColorMaterialSGIX)
+#define glFragmentLightfSGIX		MANGLE(FragmentLightfSGIX)
+#define glFragmentLightfvSGIX		MANGLE(FragmentLightfvSGIX)
+#define glFragmentLightiSGIX		MANGLE(FragmentLightiSGIX)
+#define glFragmentLightivSGIX		MANGLE(FragmentLightivSGIX)
+#define glFragmentLightModelfSGIX		MANGLE(FragmentLightModelfSGIX)
+#define glFragmentLightModelfvSGIX		MANGLE(FragmentLightModelfvSGIX)
+#define glFragmentLightModeliSGIX		MANGLE(FragmentLightModeliSGIX)
+#define glFragmentLightModelivSGIX		MANGLE(FragmentLightModelivSGIX)
+#define glFragmentMaterialfSGIX		MANGLE(FragmentMaterialfSGIX)
+#define glFragmentMaterialfvSGIX		MANGLE(FragmentMaterialfvSGIX)
+#define glFragmentMaterialiSGIX		MANGLE(FragmentMaterialiSGIX)
+#define glFragmentMaterialivSGIX		MANGLE(FragmentMaterialivSGIX)
+#define glFrameZoomSGIX		MANGLE(FrameZoomSGIX)
+#define glFreeObjectBufferATI		MANGLE(FreeObjectBufferATI)
+#define glFrontFace		MANGLE(FrontFace)
+#define glFrustum		MANGLE(Frustum)
+#define glGenAsyncMarkersSGIX		MANGLE(GenAsyncMarkersSGIX)
+#define glGenBuffersARB		MANGLE(GenBuffersARB)
+#define glGenBuffers		MANGLE(GenBuffers)
+#define glGenFencesAPPLE		MANGLE(GenFencesAPPLE)
+#define glGenFencesNV		MANGLE(GenFencesNV)
+#define glGenFragmentShadersATI		MANGLE(GenFragmentShadersATI)
+#define glGenLists		MANGLE(GenLists)
+#define glGenOcclusionQueriesNV		MANGLE(GenOcclusionQueriesNV)
+#define glGenProgramsARB		MANGLE(GenProgramsARB)
+#define glGenProgramsNV		MANGLE(GenProgramsNV)
+#define glGenQueriesARB		MANGLE(GenQueriesARB)
+#define glGenQueries		MANGLE(GenQueries)
+#define glGenSymbolsEXT		MANGLE(GenSymbolsEXT)
+#define glGenTexturesEXT		MANGLE(GenTexturesEXT)
+#define glGenTextures		MANGLE(GenTextures)
+#define glGenVertexArraysAPPLE		MANGLE(GenVertexArraysAPPLE)
+#define glGenVertexShadersEXT		MANGLE(GenVertexShadersEXT)
+#define glGetActiveAttribARB		MANGLE(GetActiveAttribARB)
+#define glGetActiveUniformARB		MANGLE(GetActiveUniformARB)
+#define glGetArrayObjectfvATI		MANGLE(GetArrayObjectfvATI)
+#define glGetArrayObjectivATI		MANGLE(GetArrayObjectivATI)
+#define glGetAttachedObjectsARB		MANGLE(GetAttachedObjectsARB)
+#define glGetAttribLocationARB		MANGLE(GetAttribLocationARB)
+#define glGetBooleanv		MANGLE(GetBooleanv)
+#define glGetBufferParameterivARB		MANGLE(GetBufferParameterivARB)
+#define glGetBufferParameteriv		MANGLE(GetBufferParameteriv)
+#define glGetBufferPointervARB		MANGLE(GetBufferPointervARB)
+#define glGetBufferPointerv		MANGLE(GetBufferPointerv)
+#define glGetBufferSubDataARB		MANGLE(GetBufferSubDataARB)
+#define glGetBufferSubData		MANGLE(GetBufferSubData)
+#define glGetClipPlane		MANGLE(GetClipPlane)
+#define glGetColorTableEXT		MANGLE(GetColorTableEXT)
+#define glGetColorTable		MANGLE(GetColorTable)
+#define glGetColorTableParameterfvEXT		MANGLE(GetColorTableParameterfvEXT)
+#define glGetColorTableParameterfv		MANGLE(GetColorTableParameterfv)
+#define glGetColorTableParameterfvSGI		MANGLE(GetColorTableParameterfvSGI)
+#define glGetColorTableParameterivEXT		MANGLE(GetColorTableParameterivEXT)
+#define glGetColorTableParameteriv		MANGLE(GetColorTableParameteriv)
+#define glGetColorTableParameterivSGI		MANGLE(GetColorTableParameterivSGI)
+#define glGetColorTableSGI		MANGLE(GetColorTableSGI)
+#define glGetCombinerInputParameterfvNV		MANGLE(GetCombinerInputParameterfvNV)
+#define glGetCombinerInputParameterivNV		MANGLE(GetCombinerInputParameterivNV)
+#define glGetCombinerOutputParameterfvNV		MANGLE(GetCombinerOutputParameterfvNV)
+#define glGetCombinerOutputParameterivNV		MANGLE(GetCombinerOutputParameterivNV)
+#define glGetCombinerStageParameterfvNV		MANGLE(GetCombinerStageParameterfvNV)
+#define glGetCompressedTexImageARB		MANGLE(GetCompressedTexImageARB)
+#define glGetCompressedTexImage		MANGLE(GetCompressedTexImage)
+#define glGetConvolutionFilterEXT		MANGLE(GetConvolutionFilterEXT)
+#define glGetConvolutionFilter		MANGLE(GetConvolutionFilter)
+#define glGetConvolutionParameterfvEXT		MANGLE(GetConvolutionParameterfvEXT)
+#define glGetConvolutionParameterfv		MANGLE(GetConvolutionParameterfv)
+#define glGetConvolutionParameterivEXT		MANGLE(GetConvolutionParameterivEXT)
+#define glGetConvolutionParameteriv		MANGLE(GetConvolutionParameteriv)
+#define glGetDetailTexFuncSGIS		MANGLE(GetDetailTexFuncSGIS)
+#define glGetDoublev		MANGLE(GetDoublev)
+#define glGetError		MANGLE(GetError)
+#define glGetFenceivNV		MANGLE(GetFenceivNV)
+#define glGetFinalCombinerInputParameterfvNV		MANGLE(GetFinalCombinerInputParameterfvNV)
+#define glGetFinalCombinerInputParameterivNV		MANGLE(GetFinalCombinerInputParameterivNV)
+#define glGetFloatv		MANGLE(GetFloatv)
+#define glGetFogFuncSGIS		MANGLE(GetFogFuncSGIS)
+#define glGetFragmentLightfvSGIX		MANGLE(GetFragmentLightfvSGIX)
+#define glGetFragmentLightivSGIX		MANGLE(GetFragmentLightivSGIX)
+#define glGetFragmentMaterialfvSGIX		MANGLE(GetFragmentMaterialfvSGIX)
+#define glGetFragmentMaterialivSGIX		MANGLE(GetFragmentMaterialivSGIX)
+#define glGetHandleARB		MANGLE(GetHandleARB)
+#define glGetHistogramEXT		MANGLE(GetHistogramEXT)
+#define glGetHistogram		MANGLE(GetHistogram)
+#define glGetHistogramParameterfvEXT		MANGLE(GetHistogramParameterfvEXT)
+#define glGetHistogramParameterfv		MANGLE(GetHistogramParameterfv)
+#define glGetHistogramParameterivEXT		MANGLE(GetHistogramParameterivEXT)
+#define glGetHistogramParameteriv		MANGLE(GetHistogramParameteriv)
+#define glGetImageTransformParameterfvHP		MANGLE(GetImageTransformParameterfvHP)
+#define glGetImageTransformParameterivHP		MANGLE(GetImageTransformParameterivHP)
+#define glGetInfoLogARB		MANGLE(GetInfoLogARB)
+#define glGetInstrumentsSGIX		MANGLE(GetInstrumentsSGIX)
+#define glGetIntegerv		MANGLE(GetIntegerv)
+#define glGetInvariantBooleanvEXT		MANGLE(GetInvariantBooleanvEXT)
+#define glGetInvariantFloatvEXT		MANGLE(GetInvariantFloatvEXT)
+#define glGetInvariantIntegervEXT		MANGLE(GetInvariantIntegervEXT)
+#define glGetLightfv		MANGLE(GetLightfv)
+#define glGetLightiv		MANGLE(GetLightiv)
+#define glGetListParameterfvSGIX		MANGLE(GetListParameterfvSGIX)
+#define glGetListParameterivSGIX		MANGLE(GetListParameterivSGIX)
+#define glGetLocalConstantBooleanvEXT		MANGLE(GetLocalConstantBooleanvEXT)
+#define glGetLocalConstantFloatvEXT		MANGLE(GetLocalConstantFloatvEXT)
+#define glGetLocalConstantIntegervEXT		MANGLE(GetLocalConstantIntegervEXT)
+#define glGetMapAttribParameterfvNV		MANGLE(GetMapAttribParameterfvNV)
+#define glGetMapAttribParameterivNV		MANGLE(GetMapAttribParameterivNV)
+#define glGetMapControlPointsNV		MANGLE(GetMapControlPointsNV)
+#define glGetMapdv		MANGLE(GetMapdv)
+#define glGetMapfv		MANGLE(GetMapfv)
+#define glGetMapiv		MANGLE(GetMapiv)
+#define glGetMapParameterfvNV		MANGLE(GetMapParameterfvNV)
+#define glGetMapParameterivNV		MANGLE(GetMapParameterivNV)
+#define glGetMaterialfv		MANGLE(GetMaterialfv)
+#define glGetMaterialiv		MANGLE(GetMaterialiv)
+#define glGetMinmaxEXT		MANGLE(GetMinmaxEXT)
+#define glGetMinmax		MANGLE(GetMinmax)
+#define glGetMinmaxParameterfvEXT		MANGLE(GetMinmaxParameterfvEXT)
+#define glGetMinmaxParameterfv		MANGLE(GetMinmaxParameterfv)
+#define glGetMinmaxParameterivEXT		MANGLE(GetMinmaxParameterivEXT)
+#define glGetMinmaxParameteriv		MANGLE(GetMinmaxParameteriv)
+#define glGetObjectBufferfvATI		MANGLE(GetObjectBufferfvATI)
+#define glGetObjectBufferivATI		MANGLE(GetObjectBufferivATI)
+#define glGetObjectParameterfvARB		MANGLE(GetObjectParameterfvARB)
+#define glGetObjectParameterivARB		MANGLE(GetObjectParameterivARB)
+#define glGetOcclusionQueryivNV		MANGLE(GetOcclusionQueryivNV)
+#define glGetOcclusionQueryuivNV		MANGLE(GetOcclusionQueryuivNV)
+#define glGetPixelMapfv		MANGLE(GetPixelMapfv)
+#define glGetPixelMapuiv		MANGLE(GetPixelMapuiv)
+#define glGetPixelMapusv		MANGLE(GetPixelMapusv)
+#define glGetPixelTexGenParameterfvSGIS		MANGLE(GetPixelTexGenParameterfvSGIS)
+#define glGetPixelTexGenParameterivSGIS		MANGLE(GetPixelTexGenParameterivSGIS)
+#define glGetPointervEXT		MANGLE(GetPointervEXT)
+#define glGetPointerv		MANGLE(GetPointerv)
+#define glGetPolygonStipple		MANGLE(GetPolygonStipple)
+#define glGetProgramEnvParameterdvARB		MANGLE(GetProgramEnvParameterdvARB)
+#define glGetProgramEnvParameterfvARB		MANGLE(GetProgramEnvParameterfvARB)
+#define glGetProgramivARB		MANGLE(GetProgramivARB)
+#define glGetProgramivNV		MANGLE(GetProgramivNV)
+#define glGetProgramLocalParameterdvARB		MANGLE(GetProgramLocalParameterdvARB)
+#define glGetProgramLocalParameterfvARB		MANGLE(GetProgramLocalParameterfvARB)
+#define glGetProgramNamedParameterdvNV		MANGLE(GetProgramNamedParameterdvNV)
+#define glGetProgramNamedParameterfvNV		MANGLE(GetProgramNamedParameterfvNV)
+#define glGetProgramParameterdvNV		MANGLE(GetProgramParameterdvNV)
+#define glGetProgramParameterfvNV		MANGLE(GetProgramParameterfvNV)
+#define glGetProgramStringARB		MANGLE(GetProgramStringARB)
+#define glGetProgramStringNV		MANGLE(GetProgramStringNV)
+#define glGetQueryivARB		MANGLE(GetQueryivARB)
+#define glGetQueryiv		MANGLE(GetQueryiv)
+#define glGetQueryObjectivARB		MANGLE(GetQueryObjectivARB)
+#define glGetQueryObjectiv		MANGLE(GetQueryObjectiv)
+#define glGetQueryObjectuivARB		MANGLE(GetQueryObjectuivARB)
+#define glGetQueryObjectuiv		MANGLE(GetQueryObjectuiv)
+#define glGetSeparableFilterEXT		MANGLE(GetSeparableFilterEXT)
+#define glGetSeparableFilter		MANGLE(GetSeparableFilter)
+#define glGetShaderSourceARB		MANGLE(GetShaderSourceARB)
+#define glGetSharpenTexFuncSGIS		MANGLE(GetSharpenTexFuncSGIS)
+#define glGetString		MANGLE(GetString)
+#define glGetTexBumpParameterfvATI		MANGLE(GetTexBumpParameterfvATI)
+#define glGetTexBumpParameterivATI		MANGLE(GetTexBumpParameterivATI)
+#define glGetTexEnvfv		MANGLE(GetTexEnvfv)
+#define glGetTexEnviv		MANGLE(GetTexEnviv)
+#define glGetTexFilterFuncSGIS		MANGLE(GetTexFilterFuncSGIS)
+#define glGetTexGendv		MANGLE(GetTexGendv)
+#define glGetTexGenfv		MANGLE(GetTexGenfv)
+#define glGetTexGeniv		MANGLE(GetTexGeniv)
+#define glGetTexImage		MANGLE(GetTexImage)
+#define glGetTexLevelParameterfv		MANGLE(GetTexLevelParameterfv)
+#define glGetTexLevelParameteriv		MANGLE(GetTexLevelParameteriv)
+#define glGetTexParameterfv		MANGLE(GetTexParameterfv)
+#define glGetTexParameteriv		MANGLE(GetTexParameteriv)
+#define glGetTrackMatrixivNV		MANGLE(GetTrackMatrixivNV)
+#define glGetUniformfvARB		MANGLE(GetUniformfvARB)
+#define glGetUniformivARB		MANGLE(GetUniformivARB)
+#define glGetUniformLocationARB		MANGLE(GetUniformLocationARB)
+#define glGetVariantArrayObjectfvATI		MANGLE(GetVariantArrayObjectfvATI)
+#define glGetVariantArrayObjectivATI		MANGLE(GetVariantArrayObjectivATI)
+#define glGetVariantBooleanvEXT		MANGLE(GetVariantBooleanvEXT)
+#define glGetVariantFloatvEXT		MANGLE(GetVariantFloatvEXT)
+#define glGetVariantIntegervEXT		MANGLE(GetVariantIntegervEXT)
+#define glGetVariantPointervEXT		MANGLE(GetVariantPointervEXT)
+#define glGetVertexAttribArrayObjectfvATI		MANGLE(GetVertexAttribArrayObjectfvATI)
+#define glGetVertexAttribArrayObjectivATI		MANGLE(GetVertexAttribArrayObjectivATI)
+#define glGetVertexAttribdvARB		MANGLE(GetVertexAttribdvARB)
+#define glGetVertexAttribdvNV		MANGLE(GetVertexAttribdvNV)
+#define glGetVertexAttribfvARB		MANGLE(GetVertexAttribfvARB)
+#define glGetVertexAttribfvNV		MANGLE(GetVertexAttribfvNV)
+#define glGetVertexAttribivARB		MANGLE(GetVertexAttribivARB)
+#define glGetVertexAttribivNV		MANGLE(GetVertexAttribivNV)
+#define glGetVertexAttribPointervARB		MANGLE(GetVertexAttribPointervARB)
+#define glGetVertexAttribPointervNV		MANGLE(GetVertexAttribPointervNV)
+#define glGlobalAlphaFactorbSUN		MANGLE(GlobalAlphaFactorbSUN)
+#define glGlobalAlphaFactordSUN		MANGLE(GlobalAlphaFactordSUN)
+#define glGlobalAlphaFactorfSUN		MANGLE(GlobalAlphaFactorfSUN)
+#define glGlobalAlphaFactoriSUN		MANGLE(GlobalAlphaFactoriSUN)
+#define glGlobalAlphaFactorsSUN		MANGLE(GlobalAlphaFactorsSUN)
+#define glGlobalAlphaFactorubSUN		MANGLE(GlobalAlphaFactorubSUN)
+#define glGlobalAlphaFactoruiSUN		MANGLE(GlobalAlphaFactoruiSUN)
+#define glGlobalAlphaFactorusSUN		MANGLE(GlobalAlphaFactorusSUN)
+#define glHint		MANGLE(Hint)
+#define glHintPGI		MANGLE(HintPGI)
+#define glHistogramEXT		MANGLE(HistogramEXT)
+#define glHistogram		MANGLE(Histogram)
+#define glIglooInterfaceSGIX		MANGLE(IglooInterfaceSGIX)
+#define glImageTransformParameterfHP		MANGLE(ImageTransformParameterfHP)
+#define glImageTransformParameterfvHP		MANGLE(ImageTransformParameterfvHP)
+#define glImageTransformParameteriHP		MANGLE(ImageTransformParameteriHP)
+#define glImageTransformParameterivHP		MANGLE(ImageTransformParameterivHP)
+#define glIndexd		MANGLE(Indexd)
+#define glIndexdv		MANGLE(Indexdv)
+#define glIndexf		MANGLE(Indexf)
+#define glIndexFuncEXT		MANGLE(IndexFuncEXT)
+#define glIndexfv		MANGLE(Indexfv)
+#define glIndexi		MANGLE(Indexi)
+#define glIndexiv		MANGLE(Indexiv)
+#define glIndexMask		MANGLE(IndexMask)
+#define glIndexMaterialEXT		MANGLE(IndexMaterialEXT)
+#define glIndexPointerEXT		MANGLE(IndexPointerEXT)
+#define glIndexPointerListIBM		MANGLE(IndexPointerListIBM)
+#define glIndexPointer		MANGLE(IndexPointer)
+#define glIndexs		MANGLE(Indexs)
+#define glIndexsv		MANGLE(Indexsv)
+#define glIndexub		MANGLE(Indexub)
+#define glIndexubv		MANGLE(Indexubv)
+#define glInitNames		MANGLE(InitNames)
+#define glInsertComponentEXT		MANGLE(InsertComponentEXT)
+#define glInstrumentsBufferSGIX		MANGLE(InstrumentsBufferSGIX)
+#define glInterleavedArrays		MANGLE(InterleavedArrays)
+#define glIsAsyncMarkerSGIX		MANGLE(IsAsyncMarkerSGIX)
+#define glIsBufferARB		MANGLE(IsBufferARB)
+#define glIsBuffer		MANGLE(IsBuffer)
+#define glIsEnabled		MANGLE(IsEnabled)
+#define glIsFenceAPPLE		MANGLE(IsFenceAPPLE)
+#define glIsFenceNV		MANGLE(IsFenceNV)
+#define glIsList		MANGLE(IsList)
+#define glIsObjectBufferATI		MANGLE(IsObjectBufferATI)
+#define glIsOcclusionQueryNV		MANGLE(IsOcclusionQueryNV)
+#define glIsProgramARB		MANGLE(IsProgramARB)
+#define glIsProgramNV		MANGLE(IsProgramNV)
+#define glIsQueryARB		MANGLE(IsQueryARB)
+#define glIsQuery		MANGLE(IsQuery)
+#define glIsTextureEXT		MANGLE(IsTextureEXT)
+#define glIsTexture		MANGLE(IsTexture)
+#define glIsVariantEnabledEXT		MANGLE(IsVariantEnabledEXT)
+#define glIsVertexArrayAPPLE		MANGLE(IsVertexArrayAPPLE)
+#define glLightEnviSGIX		MANGLE(LightEnviSGIX)
+#define glLightf		MANGLE(Lightf)
+#define glLightfv		MANGLE(Lightfv)
+#define glLighti		MANGLE(Lighti)
+#define glLightiv		MANGLE(Lightiv)
+#define glLightModelf		MANGLE(LightModelf)
+#define glLightModelfv		MANGLE(LightModelfv)
+#define glLightModeli		MANGLE(LightModeli)
+#define glLightModeliv		MANGLE(LightModeliv)
+#define glLineStipple		MANGLE(LineStipple)
+#define glLineWidth		MANGLE(LineWidth)
+#define glLinkProgramARB		MANGLE(LinkProgramARB)
+#define glListBase		MANGLE(ListBase)
+#define glListParameterfSGIX		MANGLE(ListParameterfSGIX)
+#define glListParameterfvSGIX		MANGLE(ListParameterfvSGIX)
+#define glListParameteriSGIX		MANGLE(ListParameteriSGIX)
+#define glListParameterivSGIX		MANGLE(ListParameterivSGIX)
+#define glLoadIdentityDeformationMapSGIX		MANGLE(LoadIdentityDeformationMapSGIX)
+#define glLoadIdentity		MANGLE(LoadIdentity)
+#define glLoadMatrixd		MANGLE(LoadMatrixd)
+#define glLoadMatrixf		MANGLE(LoadMatrixf)
+#define glLoadName		MANGLE(LoadName)
+#define glLoadProgramNV		MANGLE(LoadProgramNV)
+#define glLoadTransposeMatrixdARB		MANGLE(LoadTransposeMatrixdARB)
+#define glLoadTransposeMatrixd		MANGLE(LoadTransposeMatrixd)
+#define glLoadTransposeMatrixfARB		MANGLE(LoadTransposeMatrixfARB)
+#define glLoadTransposeMatrixf		MANGLE(LoadTransposeMatrixf)
+#define glLockArraysEXT		MANGLE(LockArraysEXT)
+#define glLogicOp		MANGLE(LogicOp)
+#define glMap1d		MANGLE(Map1d)
+#define glMap1f		MANGLE(Map1f)
+#define glMap2d		MANGLE(Map2d)
+#define glMap2f		MANGLE(Map2f)
+#define glMapBufferARB		MANGLE(MapBufferARB)
+#define glMapBuffer		MANGLE(MapBuffer)
+#define glMapControlPointsNV		MANGLE(MapControlPointsNV)
+#define glMapGrid1d		MANGLE(MapGrid1d)
+#define glMapGrid1f		MANGLE(MapGrid1f)
+#define glMapGrid2d		MANGLE(MapGrid2d)
+#define glMapGrid2f		MANGLE(MapGrid2f)
+#define glMapObjectBufferATI		MANGLE(MapObjectBufferATI)
+#define glMapParameterfvNV		MANGLE(MapParameterfvNV)
+#define glMapParameterivNV		MANGLE(MapParameterivNV)
+#define glMaterialf		MANGLE(Materialf)
+#define glMaterialfv		MANGLE(Materialfv)
+#define glMateriali		MANGLE(Materiali)
+#define glMaterialiv		MANGLE(Materialiv)
+#define glMatrixIndexPointerARB		MANGLE(MatrixIndexPointerARB)
+#define glMatrixIndexubvARB		MANGLE(MatrixIndexubvARB)
+#define glMatrixIndexuivARB		MANGLE(MatrixIndexuivARB)
+#define glMatrixIndexusvARB		MANGLE(MatrixIndexusvARB)
+#define glMatrixMode		MANGLE(MatrixMode)
+#define glMinmaxEXT		MANGLE(MinmaxEXT)
+#define glMinmax		MANGLE(Minmax)
+#define glMultiDrawArraysEXT		MANGLE(MultiDrawArraysEXT)
+#define glMultiDrawArrays		MANGLE(MultiDrawArrays)
+#define glMultiDrawElementArrayAPPLE		MANGLE(MultiDrawElementArrayAPPLE)
+#define glMultiDrawElementsEXT		MANGLE(MultiDrawElementsEXT)
+#define glMultiDrawElements		MANGLE(MultiDrawElements)
+#define glMultiDrawRangeElementArrayAPPLE		MANGLE(MultiDrawRangeElementArrayAPPLE)
+#define glMultiModeDrawArraysIBM		MANGLE(MultiModeDrawArraysIBM)
+#define glMultiModeDrawElementsIBM		MANGLE(MultiModeDrawElementsIBM)
+#define glMultiTexCoord1dARB		MANGLE(MultiTexCoord1dARB)
+#define glMultiTexCoord1d		MANGLE(MultiTexCoord1d)
+#define glMultiTexCoord1dvARB		MANGLE(MultiTexCoord1dvARB)
+#define glMultiTexCoord1dv		MANGLE(MultiTexCoord1dv)
+#define glMultiTexCoord1fARB		MANGLE(MultiTexCoord1fARB)
+#define glMultiTexCoord1f		MANGLE(MultiTexCoord1f)
+#define glMultiTexCoord1fvARB		MANGLE(MultiTexCoord1fvARB)
+#define glMultiTexCoord1fv		MANGLE(MultiTexCoord1fv)
+#define glMultiTexCoord1hNV		MANGLE(MultiTexCoord1hNV)
+#define glMultiTexCoord1hvNV		MANGLE(MultiTexCoord1hvNV)
+#define glMultiTexCoord1iARB		MANGLE(MultiTexCoord1iARB)
+#define glMultiTexCoord1i		MANGLE(MultiTexCoord1i)
+#define glMultiTexCoord1ivARB		MANGLE(MultiTexCoord1ivARB)
+#define glMultiTexCoord1iv		MANGLE(MultiTexCoord1iv)
+#define glMultiTexCoord1sARB		MANGLE(MultiTexCoord1sARB)
+#define glMultiTexCoord1s		MANGLE(MultiTexCoord1s)
+#define glMultiTexCoord1svARB		MANGLE(MultiTexCoord1svARB)
+#define glMultiTexCoord1sv		MANGLE(MultiTexCoord1sv)
+#define glMultiTexCoord2dARB		MANGLE(MultiTexCoord2dARB)
+#define glMultiTexCoord2d		MANGLE(MultiTexCoord2d)
+#define glMultiTexCoord2dvARB		MANGLE(MultiTexCoord2dvARB)
+#define glMultiTexCoord2dv		MANGLE(MultiTexCoord2dv)
+#define glMultiTexCoord2fARB		MANGLE(MultiTexCoord2fARB)
+#define glMultiTexCoord2f		MANGLE(MultiTexCoord2f)
+#define glMultiTexCoord2fvARB		MANGLE(MultiTexCoord2fvARB)
+#define glMultiTexCoord2fv		MANGLE(MultiTexCoord2fv)
+#define glMultiTexCoord2hNV		MANGLE(MultiTexCoord2hNV)
+#define glMultiTexCoord2hvNV		MANGLE(MultiTexCoord2hvNV)
+#define glMultiTexCoord2iARB		MANGLE(MultiTexCoord2iARB)
+#define glMultiTexCoord2i		MANGLE(MultiTexCoord2i)
+#define glMultiTexCoord2ivARB		MANGLE(MultiTexCoord2ivARB)
+#define glMultiTexCoord2iv		MANGLE(MultiTexCoord2iv)
+#define glMultiTexCoord2sARB		MANGLE(MultiTexCoord2sARB)
+#define glMultiTexCoord2s		MANGLE(MultiTexCoord2s)
+#define glMultiTexCoord2svARB		MANGLE(MultiTexCoord2svARB)
+#define glMultiTexCoord2sv		MANGLE(MultiTexCoord2sv)
+#define glMultiTexCoord3dARB		MANGLE(MultiTexCoord3dARB)
+#define glMultiTexCoord3d		MANGLE(MultiTexCoord3d)
+#define glMultiTexCoord3dvARB		MANGLE(MultiTexCoord3dvARB)
+#define glMultiTexCoord3dv		MANGLE(MultiTexCoord3dv)
+#define glMultiTexCoord3fARB		MANGLE(MultiTexCoord3fARB)
+#define glMultiTexCoord3f		MANGLE(MultiTexCoord3f)
+#define glMultiTexCoord3fvARB		MANGLE(MultiTexCoord3fvARB)
+#define glMultiTexCoord3fv		MANGLE(MultiTexCoord3fv)
+#define glMultiTexCoord3hNV		MANGLE(MultiTexCoord3hNV)
+#define glMultiTexCoord3hvNV		MANGLE(MultiTexCoord3hvNV)
+#define glMultiTexCoord3iARB		MANGLE(MultiTexCoord3iARB)
+#define glMultiTexCoord3i		MANGLE(MultiTexCoord3i)
+#define glMultiTexCoord3ivARB		MANGLE(MultiTexCoord3ivARB)
+#define glMultiTexCoord3iv		MANGLE(MultiTexCoord3iv)
+#define glMultiTexCoord3sARB		MANGLE(MultiTexCoord3sARB)
+#define glMultiTexCoord3s		MANGLE(MultiTexCoord3s)
+#define glMultiTexCoord3svARB		MANGLE(MultiTexCoord3svARB)
+#define glMultiTexCoord3sv		MANGLE(MultiTexCoord3sv)
+#define glMultiTexCoord4dARB		MANGLE(MultiTexCoord4dARB)
+#define glMultiTexCoord4d		MANGLE(MultiTexCoord4d)
+#define glMultiTexCoord4dvARB		MANGLE(MultiTexCoord4dvARB)
+#define glMultiTexCoord4dv		MANGLE(MultiTexCoord4dv)
+#define glMultiTexCoord4fARB		MANGLE(MultiTexCoord4fARB)
+#define glMultiTexCoord4f		MANGLE(MultiTexCoord4f)
+#define glMultiTexCoord4fvARB		MANGLE(MultiTexCoord4fvARB)
+#define glMultiTexCoord4fv		MANGLE(MultiTexCoord4fv)
+#define glMultiTexCoord4hNV		MANGLE(MultiTexCoord4hNV)
+#define glMultiTexCoord4hvNV		MANGLE(MultiTexCoord4hvNV)
+#define glMultiTexCoord4iARB		MANGLE(MultiTexCoord4iARB)
+#define glMultiTexCoord4i		MANGLE(MultiTexCoord4i)
+#define glMultiTexCoord4ivARB		MANGLE(MultiTexCoord4ivARB)
+#define glMultiTexCoord4iv		MANGLE(MultiTexCoord4iv)
+#define glMultiTexCoord4sARB		MANGLE(MultiTexCoord4sARB)
+#define glMultiTexCoord4s		MANGLE(MultiTexCoord4s)
+#define glMultiTexCoord4svARB		MANGLE(MultiTexCoord4svARB)
+#define glMultiTexCoord4sv		MANGLE(MultiTexCoord4sv)
+#define glMultMatrixd		MANGLE(MultMatrixd)
+#define glMultMatrixf		MANGLE(MultMatrixf)
+#define glMultTransposeMatrixdARB		MANGLE(MultTransposeMatrixdARB)
+#define glMultTransposeMatrixd		MANGLE(MultTransposeMatrixd)
+#define glMultTransposeMatrixfARB		MANGLE(MultTransposeMatrixfARB)
+#define glMultTransposeMatrixf		MANGLE(MultTransposeMatrixf)
+#define glNewList		MANGLE(NewList)
+#define glNewObjectBufferATI		MANGLE(NewObjectBufferATI)
+#define glNewTraceMESA		MANGLE(NewTraceMESA)
+#define glNormal3b		MANGLE(Normal3b)
+#define glNormal3bv		MANGLE(Normal3bv)
+#define glNormal3d		MANGLE(Normal3d)
+#define glNormal3dv		MANGLE(Normal3dv)
+#define glNormal3f		MANGLE(Normal3f)
+#define glNormal3fVertex3fSUN		MANGLE(Normal3fVertex3fSUN)
+#define glNormal3fVertex3fvSUN		MANGLE(Normal3fVertex3fvSUN)
+#define glNormal3fv		MANGLE(Normal3fv)
+#define glNormal3hNV		MANGLE(Normal3hNV)
+#define glNormal3hvNV		MANGLE(Normal3hvNV)
+#define glNormal3i		MANGLE(Normal3i)
+#define glNormal3iv		MANGLE(Normal3iv)
+#define glNormal3s		MANGLE(Normal3s)
+#define glNormal3sv		MANGLE(Normal3sv)
+#define glNormalPointerEXT		MANGLE(NormalPointerEXT)
+#define glNormalPointerListIBM		MANGLE(NormalPointerListIBM)
+#define glNormalPointer		MANGLE(NormalPointer)
+#define glNormalPointervINTEL		MANGLE(NormalPointervINTEL)
+#define glNormalStream3bATI		MANGLE(NormalStream3bATI)
+#define glNormalStream3bvATI		MANGLE(NormalStream3bvATI)
+#define glNormalStream3dATI		MANGLE(NormalStream3dATI)
+#define glNormalStream3dvATI		MANGLE(NormalStream3dvATI)
+#define glNormalStream3fATI		MANGLE(NormalStream3fATI)
+#define glNormalStream3fvATI		MANGLE(NormalStream3fvATI)
+#define glNormalStream3iATI		MANGLE(NormalStream3iATI)
+#define glNormalStream3ivATI		MANGLE(NormalStream3ivATI)
+#define glNormalStream3sATI		MANGLE(NormalStream3sATI)
+#define glNormalStream3svATI		MANGLE(NormalStream3svATI)
+#define glOrtho		MANGLE(Ortho)
+#define glPassTexCoordATI		MANGLE(PassTexCoordATI)
+#define glPassThrough		MANGLE(PassThrough)
+#define glPixelDataRangeNV		MANGLE(PixelDataRangeNV)
+#define glPixelMapfv		MANGLE(PixelMapfv)
+#define glPixelMapuiv		MANGLE(PixelMapuiv)
+#define glPixelMapusv		MANGLE(PixelMapusv)
+#define glPixelStoref		MANGLE(PixelStoref)
+#define glPixelStorei		MANGLE(PixelStorei)
+#define glPixelTexGenParameterfSGIS		MANGLE(PixelTexGenParameterfSGIS)
+#define glPixelTexGenParameterfvSGIS		MANGLE(PixelTexGenParameterfvSGIS)
+#define glPixelTexGenParameteriSGIS		MANGLE(PixelTexGenParameteriSGIS)
+#define glPixelTexGenParameterivSGIS		MANGLE(PixelTexGenParameterivSGIS)
+#define glPixelTexGenSGIX		MANGLE(PixelTexGenSGIX)
+#define glPixelTransferf		MANGLE(PixelTransferf)
+#define glPixelTransferi		MANGLE(PixelTransferi)
+#define glPixelTransformParameterfEXT		MANGLE(PixelTransformParameterfEXT)
+#define glPixelTransformParameterfvEXT		MANGLE(PixelTransformParameterfvEXT)
+#define glPixelTransformParameteriEXT		MANGLE(PixelTransformParameteriEXT)
+#define glPixelTransformParameterivEXT		MANGLE(PixelTransformParameterivEXT)
+#define glPixelZoom		MANGLE(PixelZoom)
+#define glPNTrianglesfATI		MANGLE(PNTrianglesfATI)
+#define glPNTrianglesiATI		MANGLE(PNTrianglesiATI)
+#define glPointParameterfARB		MANGLE(PointParameterfARB)
+#define glPointParameterfEXT		MANGLE(PointParameterfEXT)
+#define glPointParameterf		MANGLE(PointParameterf)
+#define glPointParameterfSGIS		MANGLE(PointParameterfSGIS)
+#define glPointParameterfvARB		MANGLE(PointParameterfvARB)
+#define glPointParameterfvEXT		MANGLE(PointParameterfvEXT)
+#define glPointParameterfv		MANGLE(PointParameterfv)
+#define glPointParameterfvSGIS		MANGLE(PointParameterfvSGIS)
+#define glPointParameteri		MANGLE(PointParameteri)
+#define glPointParameteriNV		MANGLE(PointParameteriNV)
+#define glPointParameteriv		MANGLE(PointParameteriv)
+#define glPointParameterivNV		MANGLE(PointParameterivNV)
+#define glPointSize		MANGLE(PointSize)
+#define glPollAsyncSGIX		MANGLE(PollAsyncSGIX)
+#define glPollInstrumentsSGIX		MANGLE(PollInstrumentsSGIX)
+#define glPolygonMode		MANGLE(PolygonMode)
+#define glPolygonOffsetEXT		MANGLE(PolygonOffsetEXT)
+#define glPolygonOffset		MANGLE(PolygonOffset)
+#define glPolygonStipple		MANGLE(PolygonStipple)
+#define glPopAttrib		MANGLE(PopAttrib)
+#define glPopClientAttrib		MANGLE(PopClientAttrib)
+#define glPopMatrix		MANGLE(PopMatrix)
+#define glPopName		MANGLE(PopName)
+#define glPrimitiveRestartIndexNV		MANGLE(PrimitiveRestartIndexNV)
+#define glPrimitiveRestartNV		MANGLE(PrimitiveRestartNV)
+#define glPrioritizeTexturesEXT		MANGLE(PrioritizeTexturesEXT)
+#define glPrioritizeTextures		MANGLE(PrioritizeTextures)
+#define glProgramEnvParameter4dARB		MANGLE(ProgramEnvParameter4dARB)
+#define glProgramEnvParameter4dvARB		MANGLE(ProgramEnvParameter4dvARB)
+#define glProgramEnvParameter4fARB		MANGLE(ProgramEnvParameter4fARB)
+#define glProgramEnvParameter4fvARB		MANGLE(ProgramEnvParameter4fvARB)
+#define glProgramLocalParameter4dARB		MANGLE(ProgramLocalParameter4dARB)
+#define glProgramLocalParameter4dvARB		MANGLE(ProgramLocalParameter4dvARB)
+#define glProgramLocalParameter4fARB		MANGLE(ProgramLocalParameter4fARB)
+#define glProgramLocalParameter4fvARB		MANGLE(ProgramLocalParameter4fvARB)
+#define glProgramNamedParameter4dNV		MANGLE(ProgramNamedParameter4dNV)
+#define glProgramNamedParameter4dvNV		MANGLE(ProgramNamedParameter4dvNV)
+#define glProgramNamedParameter4fNV		MANGLE(ProgramNamedParameter4fNV)
+#define glProgramNamedParameter4fvNV		MANGLE(ProgramNamedParameter4fvNV)
+#define glProgramParameter4dNV		MANGLE(ProgramParameter4dNV)
+#define glProgramParameter4dvNV		MANGLE(ProgramParameter4dvNV)
+#define glProgramParameter4fNV		MANGLE(ProgramParameter4fNV)
+#define glProgramParameter4fvNV		MANGLE(ProgramParameter4fvNV)
+#define glProgramParameters4dvNV		MANGLE(ProgramParameters4dvNV)
+#define glProgramParameters4fvNV		MANGLE(ProgramParameters4fvNV)
+#define glProgramStringARB		MANGLE(ProgramStringARB)
+#define glPushAttrib		MANGLE(PushAttrib)
+#define glPushClientAttrib		MANGLE(PushClientAttrib)
+#define glPushMatrix		MANGLE(PushMatrix)
+#define glPushName		MANGLE(PushName)
+#define glRasterPos2d		MANGLE(RasterPos2d)
+#define glRasterPos2dv		MANGLE(RasterPos2dv)
+#define glRasterPos2f		MANGLE(RasterPos2f)
+#define glRasterPos2fv		MANGLE(RasterPos2fv)
+#define glRasterPos2i		MANGLE(RasterPos2i)
+#define glRasterPos2iv		MANGLE(RasterPos2iv)
+#define glRasterPos2s		MANGLE(RasterPos2s)
+#define glRasterPos2sv		MANGLE(RasterPos2sv)
+#define glRasterPos3d		MANGLE(RasterPos3d)
+#define glRasterPos3dv		MANGLE(RasterPos3dv)
+#define glRasterPos3f		MANGLE(RasterPos3f)
+#define glRasterPos3fv		MANGLE(RasterPos3fv)
+#define glRasterPos3i		MANGLE(RasterPos3i)
+#define glRasterPos3iv		MANGLE(RasterPos3iv)
+#define glRasterPos3s		MANGLE(RasterPos3s)
+#define glRasterPos3sv		MANGLE(RasterPos3sv)
+#define glRasterPos4d		MANGLE(RasterPos4d)
+#define glRasterPos4dv		MANGLE(RasterPos4dv)
+#define glRasterPos4f		MANGLE(RasterPos4f)
+#define glRasterPos4fv		MANGLE(RasterPos4fv)
+#define glRasterPos4i		MANGLE(RasterPos4i)
+#define glRasterPos4iv		MANGLE(RasterPos4iv)
+#define glRasterPos4s		MANGLE(RasterPos4s)
+#define glRasterPos4sv		MANGLE(RasterPos4sv)
+#define glReadBuffer		MANGLE(ReadBuffer)
+#define glReadInstrumentsSGIX		MANGLE(ReadInstrumentsSGIX)
+#define glReadPixels		MANGLE(ReadPixels)
+#define glRectd		MANGLE(Rectd)
+#define glRectdv		MANGLE(Rectdv)
+#define glRectf		MANGLE(Rectf)
+#define glRectfv		MANGLE(Rectfv)
+#define glRecti		MANGLE(Recti)
+#define glRectiv		MANGLE(Rectiv)
+#define glRects		MANGLE(Rects)
+#define glRectsv		MANGLE(Rectsv)
+#define glReferencePlaneSGIX		MANGLE(ReferencePlaneSGIX)
+#define glRenderMode		MANGLE(RenderMode)
+#define glReplacementCodePointerSUN		MANGLE(ReplacementCodePointerSUN)
+#define glReplacementCodeubSUN		MANGLE(ReplacementCodeubSUN)
+#define glReplacementCodeubvSUN		MANGLE(ReplacementCodeubvSUN)
+#define glReplacementCodeuiColor3fVertex3fSUN		MANGLE(ReplacementCodeuiColor3fVertex3fSUN)
+#define glReplacementCodeuiColor3fVertex3fvSUN		MANGLE(ReplacementCodeuiColor3fVertex3fvSUN)
+#define glReplacementCodeuiColor4fNormal3fVertex3fSUN		MANGLE(ReplacementCodeuiColor4fNormal3fVertex3fSUN)
+#define glReplacementCodeuiColor4fNormal3fVertex3fvSUN		MANGLE(ReplacementCodeuiColor4fNormal3fVertex3fvSUN)
+#define glReplacementCodeuiColor4ubVertex3fSUN		MANGLE(ReplacementCodeuiColor4ubVertex3fSUN)
+#define glReplacementCodeuiColor4ubVertex3fvSUN		MANGLE(ReplacementCodeuiColor4ubVertex3fvSUN)
+#define glReplacementCodeuiNormal3fVertex3fSUN		MANGLE(ReplacementCodeuiNormal3fVertex3fSUN)
+#define glReplacementCodeuiNormal3fVertex3fvSUN		MANGLE(ReplacementCodeuiNormal3fVertex3fvSUN)
+#define glReplacementCodeuiSUN		MANGLE(ReplacementCodeuiSUN)
+#define glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN		MANGLE(ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN)
+#define glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN		MANGLE(ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN)
+#define glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN		MANGLE(ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN)
+#define glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN		MANGLE(ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN)
+#define glReplacementCodeuiTexCoord2fVertex3fSUN		MANGLE(ReplacementCodeuiTexCoord2fVertex3fSUN)
+#define glReplacementCodeuiTexCoord2fVertex3fvSUN		MANGLE(ReplacementCodeuiTexCoord2fVertex3fvSUN)
+#define glReplacementCodeuiVertex3fSUN		MANGLE(ReplacementCodeuiVertex3fSUN)
+#define glReplacementCodeuiVertex3fvSUN		MANGLE(ReplacementCodeuiVertex3fvSUN)
+#define glReplacementCodeuivSUN		MANGLE(ReplacementCodeuivSUN)
+#define glReplacementCodeusSUN		MANGLE(ReplacementCodeusSUN)
+#define glReplacementCodeusvSUN		MANGLE(ReplacementCodeusvSUN)
+#define glRequestResidentProgramsNV		MANGLE(RequestResidentProgramsNV)
+#define glResetHistogramEXT		MANGLE(ResetHistogramEXT)
+#define glResetHistogram		MANGLE(ResetHistogram)
+#define glResetMinmaxEXT		MANGLE(ResetMinmaxEXT)
+#define glResetMinmax		MANGLE(ResetMinmax)
+#define glResizeBuffersMESA		MANGLE(ResizeBuffersMESA)
+#define glRotated		MANGLE(Rotated)
+#define glRotatef		MANGLE(Rotatef)
+#define glSampleCoverageARB		MANGLE(SampleCoverageARB)
+#define glSampleCoverage		MANGLE(SampleCoverage)
+#define glSampleMapATI		MANGLE(SampleMapATI)
+#define glSampleMaskEXT		MANGLE(SampleMaskEXT)
+#define glSampleMaskSGIS		MANGLE(SampleMaskSGIS)
+#define glSamplePatternEXT		MANGLE(SamplePatternEXT)
+#define glSamplePatternSGIS		MANGLE(SamplePatternSGIS)
+#define glScaled		MANGLE(Scaled)
+#define glScalef		MANGLE(Scalef)
+#define glScissor		MANGLE(Scissor)
+#define glSecondaryColor3bEXT		MANGLE(SecondaryColor3bEXT)
+#define glSecondaryColor3b		MANGLE(SecondaryColor3b)
+#define glSecondaryColor3bvEXT		MANGLE(SecondaryColor3bvEXT)
+#define glSecondaryColor3bv		MANGLE(SecondaryColor3bv)
+#define glSecondaryColor3dEXT		MANGLE(SecondaryColor3dEXT)
+#define glSecondaryColor3d		MANGLE(SecondaryColor3d)
+#define glSecondaryColor3dvEXT		MANGLE(SecondaryColor3dvEXT)
+#define glSecondaryColor3dv		MANGLE(SecondaryColor3dv)
+#define glSecondaryColor3fEXT		MANGLE(SecondaryColor3fEXT)
+#define glSecondaryColor3f		MANGLE(SecondaryColor3f)
+#define glSecondaryColor3fvEXT		MANGLE(SecondaryColor3fvEXT)
+#define glSecondaryColor3fv		MANGLE(SecondaryColor3fv)
+#define glSecondaryColor3hNV		MANGLE(SecondaryColor3hNV)
+#define glSecondaryColor3hvNV		MANGLE(SecondaryColor3hvNV)
+#define glSecondaryColor3iEXT		MANGLE(SecondaryColor3iEXT)
+#define glSecondaryColor3i		MANGLE(SecondaryColor3i)
+#define glSecondaryColor3ivEXT		MANGLE(SecondaryColor3ivEXT)
+#define glSecondaryColor3iv		MANGLE(SecondaryColor3iv)
+#define glSecondaryColor3sEXT		MANGLE(SecondaryColor3sEXT)
+#define glSecondaryColor3s		MANGLE(SecondaryColor3s)
+#define glSecondaryColor3svEXT		MANGLE(SecondaryColor3svEXT)
+#define glSecondaryColor3sv		MANGLE(SecondaryColor3sv)
+#define glSecondaryColor3ubEXT		MANGLE(SecondaryColor3ubEXT)
+#define glSecondaryColor3ub		MANGLE(SecondaryColor3ub)
+#define glSecondaryColor3ubvEXT		MANGLE(SecondaryColor3ubvEXT)
+#define glSecondaryColor3ubv		MANGLE(SecondaryColor3ubv)
+#define glSecondaryColor3uiEXT		MANGLE(SecondaryColor3uiEXT)
+#define glSecondaryColor3ui		MANGLE(SecondaryColor3ui)
+#define glSecondaryColor3uivEXT		MANGLE(SecondaryColor3uivEXT)
+#define glSecondaryColor3uiv		MANGLE(SecondaryColor3uiv)
+#define glSecondaryColor3usEXT		MANGLE(SecondaryColor3usEXT)
+#define glSecondaryColor3us		MANGLE(SecondaryColor3us)
+#define glSecondaryColor3usvEXT		MANGLE(SecondaryColor3usvEXT)
+#define glSecondaryColor3usv		MANGLE(SecondaryColor3usv)
+#define glSecondaryColorPointerEXT		MANGLE(SecondaryColorPointerEXT)
+#define glSecondaryColorPointerListIBM		MANGLE(SecondaryColorPointerListIBM)
+#define glSecondaryColorPointer		MANGLE(SecondaryColorPointer)
+#define glSelectBuffer		MANGLE(SelectBuffer)
+#define glSeparableFilter2DEXT		MANGLE(SeparableFilter2DEXT)
+#define glSeparableFilter2D		MANGLE(SeparableFilter2D)
+#define glSetFenceAPPLE		MANGLE(SetFenceAPPLE)
+#define glSetFenceNV		MANGLE(SetFenceNV)
+#define glSetFragmentShaderConstantATI		MANGLE(SetFragmentShaderConstantATI)
+#define glSetInvariantEXT		MANGLE(SetInvariantEXT)
+#define glSetLocalConstantEXT		MANGLE(SetLocalConstantEXT)
+#define glShadeModel		MANGLE(ShadeModel)
+#define glShaderOp1EXT		MANGLE(ShaderOp1EXT)
+#define glShaderOp2EXT		MANGLE(ShaderOp2EXT)
+#define glShaderOp3EXT		MANGLE(ShaderOp3EXT)
+#define glShaderSourceARB		MANGLE(ShaderSourceARB)
+#define glSharpenTexFuncSGIS		MANGLE(SharpenTexFuncSGIS)
+#define glSpriteParameterfSGIX		MANGLE(SpriteParameterfSGIX)
+#define glSpriteParameterfvSGIX		MANGLE(SpriteParameterfvSGIX)
+#define glSpriteParameteriSGIX		MANGLE(SpriteParameteriSGIX)
+#define glSpriteParameterivSGIX		MANGLE(SpriteParameterivSGIX)
+#define glStartInstrumentsSGIX		MANGLE(StartInstrumentsSGIX)
+#define glStencilFunc		MANGLE(StencilFunc)
+#define glStencilFuncSeparateATI		MANGLE(StencilFuncSeparateATI)
+#define glStencilMask		MANGLE(StencilMask)
+#define glStencilOp		MANGLE(StencilOp)
+#define glStencilOpSeparateATI		MANGLE(StencilOpSeparateATI)
+#define glStopInstrumentsSGIX		MANGLE(StopInstrumentsSGIX)
+#define glSwizzleEXT		MANGLE(SwizzleEXT)
+#define glTagSampleBufferSGIX		MANGLE(TagSampleBufferSGIX)
+#define glTangent3bEXT		MANGLE(Tangent3bEXT)
+#define glTangent3bvEXT		MANGLE(Tangent3bvEXT)
+#define glTangent3dEXT		MANGLE(Tangent3dEXT)
+#define glTangent3dvEXT		MANGLE(Tangent3dvEXT)
+#define glTangent3fEXT		MANGLE(Tangent3fEXT)
+#define glTangent3fvEXT		MANGLE(Tangent3fvEXT)
+#define glTangent3iEXT		MANGLE(Tangent3iEXT)
+#define glTangent3ivEXT		MANGLE(Tangent3ivEXT)
+#define glTangent3sEXT		MANGLE(Tangent3sEXT)
+#define glTangent3svEXT		MANGLE(Tangent3svEXT)
+#define glTangentPointerEXT		MANGLE(TangentPointerEXT)
+#define glTbufferMask3DFX		MANGLE(TbufferMask3DFX)
+#define glTestFenceAPPLE		MANGLE(TestFenceAPPLE)
+#define glTestFenceNV		MANGLE(TestFenceNV)
+#define glTestObjectAPPLE		MANGLE(TestObjectAPPLE)
+#define glTexBumpParameterfvATI		MANGLE(TexBumpParameterfvATI)
+#define glTexBumpParameterivATI		MANGLE(TexBumpParameterivATI)
+#define glTexCoord1d		MANGLE(TexCoord1d)
+#define glTexCoord1dv		MANGLE(TexCoord1dv)
+#define glTexCoord1f		MANGLE(TexCoord1f)
+#define glTexCoord1fv		MANGLE(TexCoord1fv)
+#define glTexCoord1hNV		MANGLE(TexCoord1hNV)
+#define glTexCoord1hvNV		MANGLE(TexCoord1hvNV)
+#define glTexCoord1i		MANGLE(TexCoord1i)
+#define glTexCoord1iv		MANGLE(TexCoord1iv)
+#define glTexCoord1s		MANGLE(TexCoord1s)
+#define glTexCoord1sv		MANGLE(TexCoord1sv)
+#define glTexCoord2d		MANGLE(TexCoord2d)
+#define glTexCoord2dv		MANGLE(TexCoord2dv)
+#define glTexCoord2fColor3fVertex3fSUN		MANGLE(TexCoord2fColor3fVertex3fSUN)
+#define glTexCoord2fColor3fVertex3fvSUN		MANGLE(TexCoord2fColor3fVertex3fvSUN)
+#define glTexCoord2fColor4fNormal3fVertex3fSUN		MANGLE(TexCoord2fColor4fNormal3fVertex3fSUN)
+#define glTexCoord2fColor4fNormal3fVertex3fvSUN		MANGLE(TexCoord2fColor4fNormal3fVertex3fvSUN)
+#define glTexCoord2fColor4ubVertex3fSUN		MANGLE(TexCoord2fColor4ubVertex3fSUN)
+#define glTexCoord2fColor4ubVertex3fvSUN		MANGLE(TexCoord2fColor4ubVertex3fvSUN)
+#define glTexCoord2f		MANGLE(TexCoord2f)
+#define glTexCoord2fNormal3fVertex3fSUN		MANGLE(TexCoord2fNormal3fVertex3fSUN)
+#define glTexCoord2fNormal3fVertex3fvSUN		MANGLE(TexCoord2fNormal3fVertex3fvSUN)
+#define glTexCoord2fVertex3fSUN		MANGLE(TexCoord2fVertex3fSUN)
+#define glTexCoord2fVertex3fvSUN		MANGLE(TexCoord2fVertex3fvSUN)
+#define glTexCoord2fv		MANGLE(TexCoord2fv)
+#define glTexCoord2hNV		MANGLE(TexCoord2hNV)
+#define glTexCoord2hvNV		MANGLE(TexCoord2hvNV)
+#define glTexCoord2i		MANGLE(TexCoord2i)
+#define glTexCoord2iv		MANGLE(TexCoord2iv)
+#define glTexCoord2s		MANGLE(TexCoord2s)
+#define glTexCoord2sv		MANGLE(TexCoord2sv)
+#define glTexCoord3d		MANGLE(TexCoord3d)
+#define glTexCoord3dv		MANGLE(TexCoord3dv)
+#define glTexCoord3f		MANGLE(TexCoord3f)
+#define glTexCoord3fv		MANGLE(TexCoord3fv)
+#define glTexCoord3hNV		MANGLE(TexCoord3hNV)
+#define glTexCoord3hvNV		MANGLE(TexCoord3hvNV)
+#define glTexCoord3i		MANGLE(TexCoord3i)
+#define glTexCoord3iv		MANGLE(TexCoord3iv)
+#define glTexCoord3s		MANGLE(TexCoord3s)
+#define glTexCoord3sv		MANGLE(TexCoord3sv)
+#define glTexCoord4d		MANGLE(TexCoord4d)
+#define glTexCoord4dv		MANGLE(TexCoord4dv)
+#define glTexCoord4fColor4fNormal3fVertex4fSUN		MANGLE(TexCoord4fColor4fNormal3fVertex4fSUN)
+#define glTexCoord4fColor4fNormal3fVertex4fvSUN		MANGLE(TexCoord4fColor4fNormal3fVertex4fvSUN)
+#define glTexCoord4f		MANGLE(TexCoord4f)
+#define glTexCoord4fVertex4fSUN		MANGLE(TexCoord4fVertex4fSUN)
+#define glTexCoord4fVertex4fvSUN		MANGLE(TexCoord4fVertex4fvSUN)
+#define glTexCoord4fv		MANGLE(TexCoord4fv)
+#define glTexCoord4hNV		MANGLE(TexCoord4hNV)
+#define glTexCoord4hvNV		MANGLE(TexCoord4hvNV)
+#define glTexCoord4i		MANGLE(TexCoord4i)
+#define glTexCoord4iv		MANGLE(TexCoord4iv)
+#define glTexCoord4s		MANGLE(TexCoord4s)
+#define glTexCoord4sv		MANGLE(TexCoord4sv)
+#define glTexCoordPointerEXT		MANGLE(TexCoordPointerEXT)
+#define glTexCoordPointerListIBM		MANGLE(TexCoordPointerListIBM)
+#define glTexCoordPointer		MANGLE(TexCoordPointer)
+#define glTexCoordPointervINTEL		MANGLE(TexCoordPointervINTEL)
+#define glTexEnvf		MANGLE(TexEnvf)
+#define glTexEnvfv		MANGLE(TexEnvfv)
+#define glTexEnvi		MANGLE(TexEnvi)
+#define glTexEnviv		MANGLE(TexEnviv)
+#define glTexFilterFuncSGIS		MANGLE(TexFilterFuncSGIS)
+#define glTexGend		MANGLE(TexGend)
+#define glTexGendv		MANGLE(TexGendv)
+#define glTexGenf		MANGLE(TexGenf)
+#define glTexGenfv		MANGLE(TexGenfv)
+#define glTexGeni		MANGLE(TexGeni)
+#define glTexGeniv		MANGLE(TexGeniv)
+#define glTexImage1D		MANGLE(TexImage1D)
+#define glTexImage2D		MANGLE(TexImage2D)
+#define glTexImage3DEXT		MANGLE(TexImage3DEXT)
+#define glTexImage3D		MANGLE(TexImage3D)
+#define glTexImage4DSGIS		MANGLE(TexImage4DSGIS)
+#define glTexParameterf		MANGLE(TexParameterf)
+#define glTexParameterfv		MANGLE(TexParameterfv)
+#define glTexParameteri		MANGLE(TexParameteri)
+#define glTexParameteriv		MANGLE(TexParameteriv)
+#define glTexSubImage1DEXT		MANGLE(TexSubImage1DEXT)
+#define glTexSubImage1D		MANGLE(TexSubImage1D)
+#define glTexSubImage2DEXT		MANGLE(TexSubImage2DEXT)
+#define glTexSubImage2D		MANGLE(TexSubImage2D)
+#define glTexSubImage3DEXT		MANGLE(TexSubImage3DEXT)
+#define glTexSubImage3D		MANGLE(TexSubImage3D)
+#define glTexSubImage4DSGIS		MANGLE(TexSubImage4DSGIS)
+#define glTextureColorMaskSGIS		MANGLE(TextureColorMaskSGIS)
+#define glTextureLightEXT		MANGLE(TextureLightEXT)
+#define glTextureMaterialEXT		MANGLE(TextureMaterialEXT)
+#define glTextureNormalEXT		MANGLE(TextureNormalEXT)
+#define glTraceAssertAttribMESA		MANGLE(TraceAssertAttribMESA)
+#define glTraceCommentMESA		MANGLE(TraceCommentMESA)
+#define glTraceListMESA		MANGLE(TraceListMESA)
+#define glTracePointerMESA		MANGLE(TracePointerMESA)
+#define glTracePointerRangeMESA		MANGLE(TracePointerRangeMESA)
+#define glTraceTextureMESA		MANGLE(TraceTextureMESA)
+#define glTrackMatrixNV		MANGLE(TrackMatrixNV)
+#define glTranslated		MANGLE(Translated)
+#define glTranslatef		MANGLE(Translatef)
+#define glUniform1fARB		MANGLE(Uniform1fARB)
+#define glUniform1fvARB		MANGLE(Uniform1fvARB)
+#define glUniform1iARB		MANGLE(Uniform1iARB)
+#define glUniform1ivARB		MANGLE(Uniform1ivARB)
+#define glUniform2fARB		MANGLE(Uniform2fARB)
+#define glUniform2fvARB		MANGLE(Uniform2fvARB)
+#define glUniform2iARB		MANGLE(Uniform2iARB)
+#define glUniform2ivARB		MANGLE(Uniform2ivARB)
+#define glUniform3fARB		MANGLE(Uniform3fARB)
+#define glUniform3fvARB		MANGLE(Uniform3fvARB)
+#define glUniform3iARB		MANGLE(Uniform3iARB)
+#define glUniform3ivARB		MANGLE(Uniform3ivARB)
+#define glUniform4fARB		MANGLE(Uniform4fARB)
+#define glUniform4fvARB		MANGLE(Uniform4fvARB)
+#define glUniform4iARB		MANGLE(Uniform4iARB)
+#define glUniform4ivARB		MANGLE(Uniform4ivARB)
+#define glUniformMatrix2fvARB		MANGLE(UniformMatrix2fvARB)
+#define glUniformMatrix3fvARB		MANGLE(UniformMatrix3fvARB)
+#define glUniformMatrix4fvARB		MANGLE(UniformMatrix4fvARB)
+#define glUnlockArraysEXT		MANGLE(UnlockArraysEXT)
+#define glUnmapBufferARB		MANGLE(UnmapBufferARB)
+#define glUnmapBuffer		MANGLE(UnmapBuffer)
+#define glUnmapObjectBufferATI		MANGLE(UnmapObjectBufferATI)
+#define glUpdateObjectBufferATI		MANGLE(UpdateObjectBufferATI)
+#define glUseProgramObjectARB		MANGLE(UseProgramObjectARB)
+#define glValidateProgramARB		MANGLE(ValidateProgramARB)
+#define glVariantArrayObjectATI		MANGLE(VariantArrayObjectATI)
+#define glVariantbvEXT		MANGLE(VariantbvEXT)
+#define glVariantdvEXT		MANGLE(VariantdvEXT)
+#define glVariantfvEXT		MANGLE(VariantfvEXT)
+#define glVariantivEXT		MANGLE(VariantivEXT)
+#define glVariantPointerEXT		MANGLE(VariantPointerEXT)
+#define glVariantsvEXT		MANGLE(VariantsvEXT)
+#define glVariantubvEXT		MANGLE(VariantubvEXT)
+#define glVariantuivEXT		MANGLE(VariantuivEXT)
+#define glVariantusvEXT		MANGLE(VariantusvEXT)
+#define glVertex2d		MANGLE(Vertex2d)
+#define glVertex2dv		MANGLE(Vertex2dv)
+#define glVertex2f		MANGLE(Vertex2f)
+#define glVertex2fv		MANGLE(Vertex2fv)
+#define glVertex2hNV		MANGLE(Vertex2hNV)
+#define glVertex2hvNV		MANGLE(Vertex2hvNV)
+#define glVertex2i		MANGLE(Vertex2i)
+#define glVertex2iv		MANGLE(Vertex2iv)
+#define glVertex2s		MANGLE(Vertex2s)
+#define glVertex2sv		MANGLE(Vertex2sv)
+#define glVertex3d		MANGLE(Vertex3d)
+#define glVertex3dv		MANGLE(Vertex3dv)
+#define glVertex3f		MANGLE(Vertex3f)
+#define glVertex3fv		MANGLE(Vertex3fv)
+#define glVertex3hNV		MANGLE(Vertex3hNV)
+#define glVertex3hvNV		MANGLE(Vertex3hvNV)
+#define glVertex3i		MANGLE(Vertex3i)
+#define glVertex3iv		MANGLE(Vertex3iv)
+#define glVertex3s		MANGLE(Vertex3s)
+#define glVertex3sv		MANGLE(Vertex3sv)
+#define glVertex4d		MANGLE(Vertex4d)
+#define glVertex4dv		MANGLE(Vertex4dv)
+#define glVertex4f		MANGLE(Vertex4f)
+#define glVertex4fv		MANGLE(Vertex4fv)
+#define glVertex4hNV		MANGLE(Vertex4hNV)
+#define glVertex4hvNV		MANGLE(Vertex4hvNV)
+#define glVertex4i		MANGLE(Vertex4i)
+#define glVertex4iv		MANGLE(Vertex4iv)
+#define glVertex4s		MANGLE(Vertex4s)
+#define glVertex4sv		MANGLE(Vertex4sv)
+#define glVertexArrayParameteriAPPLE		MANGLE(VertexArrayParameteriAPPLE)
+#define glVertexArrayRangeAPPLE		MANGLE(VertexArrayRangeAPPLE)
+#define glVertexArrayRangeNV		MANGLE(VertexArrayRangeNV)
+#define glVertexAttrib1dARB		MANGLE(VertexAttrib1dARB)
+#define glVertexAttrib1dNV		MANGLE(VertexAttrib1dNV)
+#define glVertexAttrib1dvARB		MANGLE(VertexAttrib1dvARB)
+#define glVertexAttrib1dvNV		MANGLE(VertexAttrib1dvNV)
+#define glVertexAttrib1fARB		MANGLE(VertexAttrib1fARB)
+#define glVertexAttrib1fNV		MANGLE(VertexAttrib1fNV)
+#define glVertexAttrib1fvARB		MANGLE(VertexAttrib1fvARB)
+#define glVertexAttrib1fvNV		MANGLE(VertexAttrib1fvNV)
+#define glVertexAttrib1hNV		MANGLE(VertexAttrib1hNV)
+#define glVertexAttrib1hvNV		MANGLE(VertexAttrib1hvNV)
+#define glVertexAttrib1sARB		MANGLE(VertexAttrib1sARB)
+#define glVertexAttrib1sNV		MANGLE(VertexAttrib1sNV)
+#define glVertexAttrib1svARB		MANGLE(VertexAttrib1svARB)
+#define glVertexAttrib1svNV		MANGLE(VertexAttrib1svNV)
+#define glVertexAttrib2dARB		MANGLE(VertexAttrib2dARB)
+#define glVertexAttrib2dNV		MANGLE(VertexAttrib2dNV)
+#define glVertexAttrib2dvARB		MANGLE(VertexAttrib2dvARB)
+#define glVertexAttrib2dvNV		MANGLE(VertexAttrib2dvNV)
+#define glVertexAttrib2fARB		MANGLE(VertexAttrib2fARB)
+#define glVertexAttrib2fNV		MANGLE(VertexAttrib2fNV)
+#define glVertexAttrib2fvARB		MANGLE(VertexAttrib2fvARB)
+#define glVertexAttrib2fvNV		MANGLE(VertexAttrib2fvNV)
+#define glVertexAttrib2hNV		MANGLE(VertexAttrib2hNV)
+#define glVertexAttrib2hvNV		MANGLE(VertexAttrib2hvNV)
+#define glVertexAttrib2sARB		MANGLE(VertexAttrib2sARB)
+#define glVertexAttrib2sNV		MANGLE(VertexAttrib2sNV)
+#define glVertexAttrib2svARB		MANGLE(VertexAttrib2svARB)
+#define glVertexAttrib2svNV		MANGLE(VertexAttrib2svNV)
+#define glVertexAttrib3dARB		MANGLE(VertexAttrib3dARB)
+#define glVertexAttrib3dNV		MANGLE(VertexAttrib3dNV)
+#define glVertexAttrib3dvARB		MANGLE(VertexAttrib3dvARB)
+#define glVertexAttrib3dvNV		MANGLE(VertexAttrib3dvNV)
+#define glVertexAttrib3fARB		MANGLE(VertexAttrib3fARB)
+#define glVertexAttrib3fNV		MANGLE(VertexAttrib3fNV)
+#define glVertexAttrib3fvARB		MANGLE(VertexAttrib3fvARB)
+#define glVertexAttrib3fvNV		MANGLE(VertexAttrib3fvNV)
+#define glVertexAttrib3hNV		MANGLE(VertexAttrib3hNV)
+#define glVertexAttrib3hvNV		MANGLE(VertexAttrib3hvNV)
+#define glVertexAttrib3sARB		MANGLE(VertexAttrib3sARB)
+#define glVertexAttrib3sNV		MANGLE(VertexAttrib3sNV)
+#define glVertexAttrib3svARB		MANGLE(VertexAttrib3svARB)
+#define glVertexAttrib3svNV		MANGLE(VertexAttrib3svNV)
+#define glVertexAttrib4bvARB		MANGLE(VertexAttrib4bvARB)
+#define glVertexAttrib4dARB		MANGLE(VertexAttrib4dARB)
+#define glVertexAttrib4dNV		MANGLE(VertexAttrib4dNV)
+#define glVertexAttrib4dvARB		MANGLE(VertexAttrib4dvARB)
+#define glVertexAttrib4dvNV		MANGLE(VertexAttrib4dvNV)
+#define glVertexAttrib4fARB		MANGLE(VertexAttrib4fARB)
+#define glVertexAttrib4fNV		MANGLE(VertexAttrib4fNV)
+#define glVertexAttrib4fvARB		MANGLE(VertexAttrib4fvARB)
+#define glVertexAttrib4fvNV		MANGLE(VertexAttrib4fvNV)
+#define glVertexAttrib4hNV		MANGLE(VertexAttrib4hNV)
+#define glVertexAttrib4hvNV		MANGLE(VertexAttrib4hvNV)
+#define glVertexAttrib4ivARB		MANGLE(VertexAttrib4ivARB)
+#define glVertexAttrib4NbvARB		MANGLE(VertexAttrib4NbvARB)
+#define glVertexAttrib4NivARB		MANGLE(VertexAttrib4NivARB)
+#define glVertexAttrib4NsvARB		MANGLE(VertexAttrib4NsvARB)
+#define glVertexAttrib4NubARB		MANGLE(VertexAttrib4NubARB)
+#define glVertexAttrib4NubvARB		MANGLE(VertexAttrib4NubvARB)
+#define glVertexAttrib4NuivARB		MANGLE(VertexAttrib4NuivARB)
+#define glVertexAttrib4NusvARB		MANGLE(VertexAttrib4NusvARB)
+#define glVertexAttrib4sARB		MANGLE(VertexAttrib4sARB)
+#define glVertexAttrib4sNV		MANGLE(VertexAttrib4sNV)
+#define glVertexAttrib4svARB		MANGLE(VertexAttrib4svARB)
+#define glVertexAttrib4svNV		MANGLE(VertexAttrib4svNV)
+#define glVertexAttrib4ubNV		MANGLE(VertexAttrib4ubNV)
+#define glVertexAttrib4ubvARB		MANGLE(VertexAttrib4ubvARB)
+#define glVertexAttrib4ubvNV		MANGLE(VertexAttrib4ubvNV)
+#define glVertexAttrib4uivARB		MANGLE(VertexAttrib4uivARB)
+#define glVertexAttrib4usvARB		MANGLE(VertexAttrib4usvARB)
+#define glVertexAttribArrayObjectATI		MANGLE(VertexAttribArrayObjectATI)
+#define glVertexAttribPointerARB		MANGLE(VertexAttribPointerARB)
+#define glVertexAttribPointerNV		MANGLE(VertexAttribPointerNV)
+#define glVertexAttribs1dvNV		MANGLE(VertexAttribs1dvNV)
+#define glVertexAttribs1fvNV		MANGLE(VertexAttribs1fvNV)
+#define glVertexAttribs1hvNV		MANGLE(VertexAttribs1hvNV)
+#define glVertexAttribs1svNV		MANGLE(VertexAttribs1svNV)
+#define glVertexAttribs2dvNV		MANGLE(VertexAttribs2dvNV)
+#define glVertexAttribs2fvNV		MANGLE(VertexAttribs2fvNV)
+#define glVertexAttribs2hvNV		MANGLE(VertexAttribs2hvNV)
+#define glVertexAttribs2svNV		MANGLE(VertexAttribs2svNV)
+#define glVertexAttribs3dvNV		MANGLE(VertexAttribs3dvNV)
+#define glVertexAttribs3fvNV		MANGLE(VertexAttribs3fvNV)
+#define glVertexAttribs3hvNV		MANGLE(VertexAttribs3hvNV)
+#define glVertexAttribs3svNV		MANGLE(VertexAttribs3svNV)
+#define glVertexAttribs4dvNV		MANGLE(VertexAttribs4dvNV)
+#define glVertexAttribs4fvNV		MANGLE(VertexAttribs4fvNV)
+#define glVertexAttribs4hvNV		MANGLE(VertexAttribs4hvNV)
+#define glVertexAttribs4svNV		MANGLE(VertexAttribs4svNV)
+#define glVertexAttribs4ubvNV		MANGLE(VertexAttribs4ubvNV)
+#define glVertexBlendARB		MANGLE(VertexBlendARB)
+#define glVertexBlendEnvfATI		MANGLE(VertexBlendEnvfATI)
+#define glVertexBlendEnviATI		MANGLE(VertexBlendEnviATI)
+#define glVertexPointerEXT		MANGLE(VertexPointerEXT)
+#define glVertexPointerListIBM		MANGLE(VertexPointerListIBM)
+#define glVertexPointer		MANGLE(VertexPointer)
+#define glVertexPointervINTEL		MANGLE(VertexPointervINTEL)
+#define glVertexStream1dATI		MANGLE(VertexStream1dATI)
+#define glVertexStream1dvATI		MANGLE(VertexStream1dvATI)
+#define glVertexStream1fATI		MANGLE(VertexStream1fATI)
+#define glVertexStream1fvATI		MANGLE(VertexStream1fvATI)
+#define glVertexStream1iATI		MANGLE(VertexStream1iATI)
+#define glVertexStream1ivATI		MANGLE(VertexStream1ivATI)
+#define glVertexStream1sATI		MANGLE(VertexStream1sATI)
+#define glVertexStream1svATI		MANGLE(VertexStream1svATI)
+#define glVertexStream2dATI		MANGLE(VertexStream2dATI)
+#define glVertexStream2dvATI		MANGLE(VertexStream2dvATI)
+#define glVertexStream2fATI		MANGLE(VertexStream2fATI)
+#define glVertexStream2fvATI		MANGLE(VertexStream2fvATI)
+#define glVertexStream2iATI		MANGLE(VertexStream2iATI)
+#define glVertexStream2ivATI		MANGLE(VertexStream2ivATI)
+#define glVertexStream2sATI		MANGLE(VertexStream2sATI)
+#define glVertexStream2svATI		MANGLE(VertexStream2svATI)
+#define glVertexStream3dATI		MANGLE(VertexStream3dATI)
+#define glVertexStream3dvATI		MANGLE(VertexStream3dvATI)
+#define glVertexStream3fATI		MANGLE(VertexStream3fATI)
+#define glVertexStream3fvATI		MANGLE(VertexStream3fvATI)
+#define glVertexStream3iATI		MANGLE(VertexStream3iATI)
+#define glVertexStream3ivATI		MANGLE(VertexStream3ivATI)
+#define glVertexStream3sATI		MANGLE(VertexStream3sATI)
+#define glVertexStream3svATI		MANGLE(VertexStream3svATI)
+#define glVertexStream4dATI		MANGLE(VertexStream4dATI)
+#define glVertexStream4dvATI		MANGLE(VertexStream4dvATI)
+#define glVertexStream4fATI		MANGLE(VertexStream4fATI)
+#define glVertexStream4fvATI		MANGLE(VertexStream4fvATI)
+#define glVertexStream4iATI		MANGLE(VertexStream4iATI)
+#define glVertexStream4ivATI		MANGLE(VertexStream4ivATI)
+#define glVertexStream4sATI		MANGLE(VertexStream4sATI)
+#define glVertexStream4svATI		MANGLE(VertexStream4svATI)
+#define glVertexWeightfEXT		MANGLE(VertexWeightfEXT)
+#define glVertexWeightfvEXT		MANGLE(VertexWeightfvEXT)
+#define glVertexWeighthNV		MANGLE(VertexWeighthNV)
+#define glVertexWeighthvNV		MANGLE(VertexWeighthvNV)
+#define glVertexWeightPointerEXT		MANGLE(VertexWeightPointerEXT)
+#define glViewport		MANGLE(Viewport)
+#define glWeightbvARB		MANGLE(WeightbvARB)
+#define glWeightdvARB		MANGLE(WeightdvARB)
+#define glWeightfvARB		MANGLE(WeightfvARB)
+#define glWeightivARB		MANGLE(WeightivARB)
+#define glWeightPointerARB		MANGLE(WeightPointerARB)
+#define glWeightsvARB		MANGLE(WeightsvARB)
+#define glWeightubvARB		MANGLE(WeightubvARB)
+#define glWeightuivARB		MANGLE(WeightuivARB)
+#define glWeightusvARB		MANGLE(WeightusvARB)
+#define glWindowPos2dARB		MANGLE(WindowPos2dARB)
+#define glWindowPos2d		MANGLE(WindowPos2d)
+#define glWindowPos2dMESA		MANGLE(WindowPos2dMESA)
+#define glWindowPos2dvARB		MANGLE(WindowPos2dvARB)
+#define glWindowPos2dv		MANGLE(WindowPos2dv)
+#define glWindowPos2dvMESA		MANGLE(WindowPos2dvMESA)
+#define glWindowPos2fARB		MANGLE(WindowPos2fARB)
+#define glWindowPos2f		MANGLE(WindowPos2f)
+#define glWindowPos2fMESA		MANGLE(WindowPos2fMESA)
+#define glWindowPos2fvARB		MANGLE(WindowPos2fvARB)
+#define glWindowPos2fv		MANGLE(WindowPos2fv)
+#define glWindowPos2fvMESA		MANGLE(WindowPos2fvMESA)
+#define glWindowPos2iARB		MANGLE(WindowPos2iARB)
+#define glWindowPos2i		MANGLE(WindowPos2i)
+#define glWindowPos2iMESA		MANGLE(WindowPos2iMESA)
+#define glWindowPos2ivARB		MANGLE(WindowPos2ivARB)
+#define glWindowPos2iv		MANGLE(WindowPos2iv)
+#define glWindowPos2ivMESA		MANGLE(WindowPos2ivMESA)
+#define glWindowPos2sARB		MANGLE(WindowPos2sARB)
+#define glWindowPos2s		MANGLE(WindowPos2s)
+#define glWindowPos2sMESA		MANGLE(WindowPos2sMESA)
+#define glWindowPos2svARB		MANGLE(WindowPos2svARB)
+#define glWindowPos2sv		MANGLE(WindowPos2sv)
+#define glWindowPos2svMESA		MANGLE(WindowPos2svMESA)
+#define glWindowPos3dARB		MANGLE(WindowPos3dARB)
+#define glWindowPos3d		MANGLE(WindowPos3d)
+#define glWindowPos3dMESA		MANGLE(WindowPos3dMESA)
+#define glWindowPos3dvARB		MANGLE(WindowPos3dvARB)
+#define glWindowPos3dv		MANGLE(WindowPos3dv)
+#define glWindowPos3dvMESA		MANGLE(WindowPos3dvMESA)
+#define glWindowPos3fARB		MANGLE(WindowPos3fARB)
+#define glWindowPos3f		MANGLE(WindowPos3f)
+#define glWindowPos3fMESA		MANGLE(WindowPos3fMESA)
+#define glWindowPos3fvARB		MANGLE(WindowPos3fvARB)
+#define glWindowPos3fv		MANGLE(WindowPos3fv)
+#define glWindowPos3fvMESA		MANGLE(WindowPos3fvMESA)
+#define glWindowPos3iARB		MANGLE(WindowPos3iARB)
+#define glWindowPos3i		MANGLE(WindowPos3i)
+#define glWindowPos3iMESA		MANGLE(WindowPos3iMESA)
+#define glWindowPos3ivARB		MANGLE(WindowPos3ivARB)
+#define glWindowPos3iv		MANGLE(WindowPos3iv)
+#define glWindowPos3ivMESA		MANGLE(WindowPos3ivMESA)
+#define glWindowPos3sARB		MANGLE(WindowPos3sARB)
+#define glWindowPos3s		MANGLE(WindowPos3s)
+#define glWindowPos3sMESA		MANGLE(WindowPos3sMESA)
+#define glWindowPos3svARB		MANGLE(WindowPos3svARB)
+#define glWindowPos3sv		MANGLE(WindowPos3sv)
+#define glWindowPos3svMESA		MANGLE(WindowPos3svMESA)
+#define glWindowPos4dMESA		MANGLE(WindowPos4dMESA)
+#define glWindowPos4dvMESA		MANGLE(WindowPos4dvMESA)
+#define glWindowPos4fMESA		MANGLE(WindowPos4fMESA)
+#define glWindowPos4fvMESA		MANGLE(WindowPos4fvMESA)
+#define glWindowPos4iMESA		MANGLE(WindowPos4iMESA)
+#define glWindowPos4ivMESA		MANGLE(WindowPos4ivMESA)
+#define glWindowPos4sMESA		MANGLE(WindowPos4sMESA)
+#define glWindowPos4svMESA		MANGLE(WindowPos4svMESA)
+#define glWriteMaskEXT		MANGLE(WriteMaskEXT)
+
+#endif /* GL_MANGLE_H */
diff --git a/reactos/lib/mesa32/include/GL/glext.h b/reactos/lib/mesa32/include/GL/glext.h
new file mode 100644
index 00000000000..4260acdacdb
--- /dev/null
+++ b/reactos/lib/mesa32/include/GL/glext.h
@@ -0,0 +1,5919 @@
+#ifndef __glext_h_
+#define __glext_h_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2002 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: This software was created using the
+** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
+** not been independently verified as being compliant with the OpenGL(R)
+** version 1.2.1 Specification.
+*/
+
+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#endif
+
+#ifndef APIENTRY
+#define APIENTRY
+#endif
+#ifndef APIENTRYP
+#define APIENTRYP APIENTRY *
+#endif
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+
+/*************************************************************/
+
+/* Header file version number, required by OpenGL ABI for Linux */
+/* glext.h last updated 2004/2/23 */
+/* Current version at http://oss.sgi.com/projects/ogl-sample/registry/ */
+#define GL_GLEXT_VERSION 22
+
+#ifndef GL_VERSION_1_2
+#define GL_UNSIGNED_BYTE_3_3_2            0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
+#define GL_UNSIGNED_INT_8_8_8_8           0x8035
+#define GL_UNSIGNED_INT_10_10_10_2        0x8036
+#define GL_RESCALE_NORMAL                 0x803A
+#define GL_TEXTURE_BINDING_3D             0x806A
+#define GL_PACK_SKIP_IMAGES               0x806B
+#define GL_PACK_IMAGE_HEIGHT              0x806C
+#define GL_UNPACK_SKIP_IMAGES             0x806D
+#define GL_UNPACK_IMAGE_HEIGHT            0x806E
+#define GL_TEXTURE_3D                     0x806F
+#define GL_PROXY_TEXTURE_3D               0x8070
+#define GL_TEXTURE_DEPTH                  0x8071
+#define GL_TEXTURE_WRAP_R                 0x8072
+#define GL_MAX_3D_TEXTURE_SIZE            0x8073
+#define GL_UNSIGNED_BYTE_2_3_3_REV        0x8362
+#define GL_UNSIGNED_SHORT_5_6_5           0x8363
+#define GL_UNSIGNED_SHORT_5_6_5_REV       0x8364
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV     0x8365
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV     0x8366
+#define GL_UNSIGNED_INT_8_8_8_8_REV       0x8367
+#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
+#define GL_BGR                            0x80E0
+#define GL_BGRA                           0x80E1
+#define GL_MAX_ELEMENTS_VERTICES          0x80E8
+#define GL_MAX_ELEMENTS_INDICES           0x80E9
+#define GL_CLAMP_TO_EDGE                  0x812F
+#define GL_TEXTURE_MIN_LOD                0x813A
+#define GL_TEXTURE_MAX_LOD                0x813B
+#define GL_TEXTURE_BASE_LEVEL             0x813C
+#define GL_TEXTURE_MAX_LEVEL              0x813D
+#define GL_LIGHT_MODEL_COLOR_CONTROL      0x81F8
+#define GL_SINGLE_COLOR                   0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR        0x81FA
+#define GL_SMOOTH_POINT_SIZE_RANGE        0x0B12
+#define GL_SMOOTH_POINT_SIZE_GRANULARITY  0x0B13
+#define GL_SMOOTH_LINE_WIDTH_RANGE        0x0B22
+#define GL_SMOOTH_LINE_WIDTH_GRANULARITY  0x0B23
+#define GL_ALIASED_POINT_SIZE_RANGE       0x846D
+#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
+#endif
+
+#ifndef GL_ARB_imaging
+#define GL_CONSTANT_COLOR                 0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
+#define GL_CONSTANT_ALPHA                 0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
+#define GL_BLEND_COLOR                    0x8005
+#define GL_FUNC_ADD                       0x8006
+#define GL_MIN                            0x8007
+#define GL_MAX                            0x8008
+#define GL_BLEND_EQUATION                 0x8009
+#define GL_FUNC_SUBTRACT                  0x800A
+#define GL_FUNC_REVERSE_SUBTRACT          0x800B
+#define GL_CONVOLUTION_1D                 0x8010
+#define GL_CONVOLUTION_2D                 0x8011
+#define GL_SEPARABLE_2D                   0x8012
+#define GL_CONVOLUTION_BORDER_MODE        0x8013
+#define GL_CONVOLUTION_FILTER_SCALE       0x8014
+#define GL_CONVOLUTION_FILTER_BIAS        0x8015
+#define GL_REDUCE                         0x8016
+#define GL_CONVOLUTION_FORMAT             0x8017
+#define GL_CONVOLUTION_WIDTH              0x8018
+#define GL_CONVOLUTION_HEIGHT             0x8019
+#define GL_MAX_CONVOLUTION_WIDTH          0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT         0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE     0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE   0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE    0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE   0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS      0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS    0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS     0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS    0x8023
+#define GL_HISTOGRAM                      0x8024
+#define GL_PROXY_HISTOGRAM                0x8025
+#define GL_HISTOGRAM_WIDTH                0x8026
+#define GL_HISTOGRAM_FORMAT               0x8027
+#define GL_HISTOGRAM_RED_SIZE             0x8028
+#define GL_HISTOGRAM_GREEN_SIZE           0x8029
+#define GL_HISTOGRAM_BLUE_SIZE            0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE           0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE       0x802C
+#define GL_HISTOGRAM_SINK                 0x802D
+#define GL_MINMAX                         0x802E
+#define GL_MINMAX_FORMAT                  0x802F
+#define GL_MINMAX_SINK                    0x8030
+#define GL_TABLE_TOO_LARGE                0x8031
+#define GL_COLOR_MATRIX                   0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH       0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH   0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE    0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE  0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE   0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE  0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS     0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS   0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS    0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS   0x80BB
+#define GL_COLOR_TABLE                    0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE   0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE  0x80D2
+#define GL_PROXY_COLOR_TABLE              0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
+#define GL_COLOR_TABLE_SCALE              0x80D6
+#define GL_COLOR_TABLE_BIAS               0x80D7
+#define GL_COLOR_TABLE_FORMAT             0x80D8
+#define GL_COLOR_TABLE_WIDTH              0x80D9
+#define GL_COLOR_TABLE_RED_SIZE           0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE         0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE          0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE         0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE     0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE     0x80DF
+#define GL_CONSTANT_BORDER                0x8151
+#define GL_REPLICATE_BORDER               0x8153
+#define GL_CONVOLUTION_BORDER_COLOR       0x8154
+#endif
+
+#ifndef GL_VERSION_1_3
+#define GL_TEXTURE0                       0x84C0
+#define GL_TEXTURE1                       0x84C1
+#define GL_TEXTURE2                       0x84C2
+#define GL_TEXTURE3                       0x84C3
+#define GL_TEXTURE4                       0x84C4
+#define GL_TEXTURE5                       0x84C5
+#define GL_TEXTURE6                       0x84C6
+#define GL_TEXTURE7                       0x84C7
+#define GL_TEXTURE8                       0x84C8
+#define GL_TEXTURE9                       0x84C9
+#define GL_TEXTURE10                      0x84CA
+#define GL_TEXTURE11                      0x84CB
+#define GL_TEXTURE12                      0x84CC
+#define GL_TEXTURE13                      0x84CD
+#define GL_TEXTURE14                      0x84CE
+#define GL_TEXTURE15                      0x84CF
+#define GL_TEXTURE16                      0x84D0
+#define GL_TEXTURE17                      0x84D1
+#define GL_TEXTURE18                      0x84D2
+#define GL_TEXTURE19                      0x84D3
+#define GL_TEXTURE20                      0x84D4
+#define GL_TEXTURE21                      0x84D5
+#define GL_TEXTURE22                      0x84D6
+#define GL_TEXTURE23                      0x84D7
+#define GL_TEXTURE24                      0x84D8
+#define GL_TEXTURE25                      0x84D9
+#define GL_TEXTURE26                      0x84DA
+#define GL_TEXTURE27                      0x84DB
+#define GL_TEXTURE28                      0x84DC
+#define GL_TEXTURE29                      0x84DD
+#define GL_TEXTURE30                      0x84DE
+#define GL_TEXTURE31                      0x84DF
+#define GL_ACTIVE_TEXTURE                 0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE          0x84E1
+#define GL_MAX_TEXTURE_UNITS              0x84E2
+#define GL_TRANSPOSE_MODELVIEW_MATRIX     0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX    0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX       0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX         0x84E6
+#define GL_MULTISAMPLE                    0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE            0x809F
+#define GL_SAMPLE_COVERAGE                0x80A0
+#define GL_SAMPLE_BUFFERS                 0x80A8
+#define GL_SAMPLES                        0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
+#define GL_MULTISAMPLE_BIT                0x20000000
+#define GL_NORMAL_MAP                     0x8511
+#define GL_REFLECTION_MAP                 0x8512
+#define GL_TEXTURE_CUBE_MAP               0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP       0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X    0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X    0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y    0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y    0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z    0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z    0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP         0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE      0x851C
+#define GL_COMPRESSED_ALPHA               0x84E9
+#define GL_COMPRESSED_LUMINANCE           0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA     0x84EB
+#define GL_COMPRESSED_INTENSITY           0x84EC
+#define GL_COMPRESSED_RGB                 0x84ED
+#define GL_COMPRESSED_RGBA                0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT       0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE  0x86A0
+#define GL_TEXTURE_COMPRESSED             0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
+#define GL_CLAMP_TO_BORDER                0x812D
+#define GL_CLAMP_TO_BORDER_SGIS           0x812D
+#define GL_COMBINE                        0x8570
+#define GL_COMBINE_RGB                    0x8571
+#define GL_COMBINE_ALPHA                  0x8572
+#define GL_SOURCE0_RGB                    0x8580
+#define GL_SOURCE1_RGB                    0x8581
+#define GL_SOURCE2_RGB                    0x8582
+#define GL_SOURCE0_ALPHA                  0x8588
+#define GL_SOURCE1_ALPHA                  0x8589
+#define GL_SOURCE2_ALPHA                  0x858A
+#define GL_OPERAND0_RGB                   0x8590
+#define GL_OPERAND1_RGB                   0x8591
+#define GL_OPERAND2_RGB                   0x8592
+#define GL_OPERAND0_ALPHA                 0x8598
+#define GL_OPERAND1_ALPHA                 0x8599
+#define GL_OPERAND2_ALPHA                 0x859A
+#define GL_RGB_SCALE                      0x8573
+#define GL_ADD_SIGNED                     0x8574
+#define GL_INTERPOLATE                    0x8575
+#define GL_SUBTRACT                       0x84E7
+#define GL_CONSTANT                       0x8576
+#define GL_PRIMARY_COLOR                  0x8577
+#define GL_PREVIOUS                       0x8578
+#define GL_DOT3_RGB                       0x86AE
+#define GL_DOT3_RGBA                      0x86AF
+#endif
+
+#ifndef GL_VERSION_1_4
+#define GL_BLEND_DST_RGB                  0x80C8
+#define GL_BLEND_SRC_RGB                  0x80C9
+#define GL_BLEND_DST_ALPHA                0x80CA
+#define GL_BLEND_SRC_ALPHA                0x80CB
+#define GL_POINT_SIZE_MIN                 0x8126
+#define GL_POINT_SIZE_MAX                 0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE      0x8128
+#define GL_POINT_DISTANCE_ATTENUATION     0x8129
+#define GL_GENERATE_MIPMAP                0x8191
+#define GL_GENERATE_MIPMAP_HINT           0x8192
+#define GL_DEPTH_COMPONENT16              0x81A5
+#define GL_DEPTH_COMPONENT24              0x81A6
+#define GL_DEPTH_COMPONENT32              0x81A7
+#define GL_MIRRORED_REPEAT                0x8370
+#define GL_FOG_COORDINATE_SOURCE          0x8450
+#define GL_FOG_COORDINATE                 0x8451
+#define GL_FRAGMENT_DEPTH                 0x8452
+#define GL_CURRENT_FOG_COORDINATE         0x8453
+#define GL_FOG_COORDINATE_ARRAY_TYPE      0x8454
+#define GL_FOG_COORDINATE_ARRAY_STRIDE    0x8455
+#define GL_FOG_COORDINATE_ARRAY_POINTER   0x8456
+#define GL_FOG_COORDINATE_ARRAY           0x8457
+#define GL_COLOR_SUM                      0x8458
+#define GL_CURRENT_SECONDARY_COLOR        0x8459
+#define GL_SECONDARY_COLOR_ARRAY_SIZE     0x845A
+#define GL_SECONDARY_COLOR_ARRAY_TYPE     0x845B
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE   0x845C
+#define GL_SECONDARY_COLOR_ARRAY_POINTER  0x845D
+#define GL_SECONDARY_COLOR_ARRAY          0x845E
+#define GL_MAX_TEXTURE_LOD_BIAS           0x84FD
+#define GL_TEXTURE_FILTER_CONTROL         0x8500
+#define GL_TEXTURE_LOD_BIAS               0x8501
+#define GL_INCR_WRAP                      0x8507
+#define GL_DECR_WRAP                      0x8508
+#define GL_TEXTURE_DEPTH_SIZE             0x884A
+#define GL_DEPTH_TEXTURE_MODE             0x884B
+#define GL_TEXTURE_COMPARE_MODE           0x884C
+#define GL_TEXTURE_COMPARE_FUNC           0x884D
+#define GL_COMPARE_R_TO_TEXTURE           0x884E
+#endif
+
+#ifndef GL_VERSION_1_5
+#define GL_BUFFER_SIZE                    0x8764
+#define GL_BUFFER_USAGE                   0x8765
+#define GL_QUERY_COUNTER_BITS             0x8864
+#define GL_CURRENT_QUERY                  0x8865
+#define GL_QUERY_RESULT                   0x8866
+#define GL_QUERY_RESULT_AVAILABLE         0x8867
+#define GL_ARRAY_BUFFER                   0x8892
+#define GL_ELEMENT_ARRAY_BUFFER           0x8893
+#define GL_ARRAY_BUFFER_BINDING           0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING   0x8895
+#define GL_VERTEX_ARRAY_BUFFER_BINDING    0x8896
+#define GL_NORMAL_ARRAY_BUFFER_BINDING    0x8897
+#define GL_COLOR_ARRAY_BUFFER_BINDING     0x8898
+#define GL_INDEX_ARRAY_BUFFER_BINDING     0x8899
+#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A
+#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B
+#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C
+#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D
+#define GL_WEIGHT_ARRAY_BUFFER_BINDING    0x889E
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
+#define GL_READ_ONLY                      0x88B8
+#define GL_WRITE_ONLY                     0x88B9
+#define GL_READ_WRITE                     0x88BA
+#define GL_BUFFER_ACCESS                  0x88BB
+#define GL_BUFFER_MAPPED                  0x88BC
+#define GL_BUFFER_MAP_POINTER             0x88BD
+#define GL_STREAM_DRAW                    0x88E0
+#define GL_STREAM_READ                    0x88E1
+#define GL_STREAM_COPY                    0x88E2
+#define GL_STATIC_DRAW                    0x88E4
+#define GL_STATIC_READ                    0x88E5
+#define GL_STATIC_COPY                    0x88E6
+#define GL_DYNAMIC_DRAW                   0x88E8
+#define GL_DYNAMIC_READ                   0x88E9
+#define GL_DYNAMIC_COPY                   0x88EA
+#define GL_SAMPLES_PASSED                 0x8914
+#define GL_FOG_COORD_SOURCE               GL_FOG_COORDINATE_SOURCE
+#define GL_FOG_COORD                      GL_FOG_COORDINATE
+#define GL_CURRENT_FOG_COORD              GL_CURRENT_FOG_COORDINATE
+#define GL_FOG_COORD_ARRAY_TYPE           GL_FOG_COORDINATE_ARRAY_TYPE
+#define GL_FOG_COORD_ARRAY_STRIDE         GL_FOG_COORDINATE_ARRAY_STRIDE
+#define GL_FOG_COORD_ARRAY_POINTER        GL_FOG_COORDINATE_ARRAY_POINTER
+#define GL_FOG_COORD_ARRAY                GL_FOG_COORDINATE_ARRAY
+#define GL_FOG_COORD_ARRAY_BUFFER_BINDING GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING
+#define GL_SRC0_RGB                       GL_SOURCE0_RGB
+#define GL_SRC1_RGB                       GL_SOURCE1_RGB
+#define GL_SRC2_RGB                       GL_SOURCE2_RGB
+#define GL_SRC0_ALPHA                     GL_SOURCE0_ALPHA
+#define GL_SRC1_ALPHA                     GL_SOURCE1_ALPHA
+#define GL_SRC2_ALPHA                     GL_SOURCE2_ALPHA
+#endif
+
+#ifndef GL_ARB_multitexture
+#define GL_TEXTURE0_ARB                   0x84C0
+#define GL_TEXTURE1_ARB                   0x84C1
+#define GL_TEXTURE2_ARB                   0x84C2
+#define GL_TEXTURE3_ARB                   0x84C3
+#define GL_TEXTURE4_ARB                   0x84C4
+#define GL_TEXTURE5_ARB                   0x84C5
+#define GL_TEXTURE6_ARB                   0x84C6
+#define GL_TEXTURE7_ARB                   0x84C7
+#define GL_TEXTURE8_ARB                   0x84C8
+#define GL_TEXTURE9_ARB                   0x84C9
+#define GL_TEXTURE10_ARB                  0x84CA
+#define GL_TEXTURE11_ARB                  0x84CB
+#define GL_TEXTURE12_ARB                  0x84CC
+#define GL_TEXTURE13_ARB                  0x84CD
+#define GL_TEXTURE14_ARB                  0x84CE
+#define GL_TEXTURE15_ARB                  0x84CF
+#define GL_TEXTURE16_ARB                  0x84D0
+#define GL_TEXTURE17_ARB                  0x84D1
+#define GL_TEXTURE18_ARB                  0x84D2
+#define GL_TEXTURE19_ARB                  0x84D3
+#define GL_TEXTURE20_ARB                  0x84D4
+#define GL_TEXTURE21_ARB                  0x84D5
+#define GL_TEXTURE22_ARB                  0x84D6
+#define GL_TEXTURE23_ARB                  0x84D7
+#define GL_TEXTURE24_ARB                  0x84D8
+#define GL_TEXTURE25_ARB                  0x84D9
+#define GL_TEXTURE26_ARB                  0x84DA
+#define GL_TEXTURE27_ARB                  0x84DB
+#define GL_TEXTURE28_ARB                  0x84DC
+#define GL_TEXTURE29_ARB                  0x84DD
+#define GL_TEXTURE30_ARB                  0x84DE
+#define GL_TEXTURE31_ARB                  0x84DF
+#define GL_ACTIVE_TEXTURE_ARB             0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE_ARB      0x84E1
+#define GL_MAX_TEXTURE_UNITS_ARB          0x84E2
+#endif
+
+#ifndef GL_ARB_transpose_matrix
+#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB   0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX_ARB     0x84E6
+#endif
+
+#ifndef GL_ARB_multisample
+#define GL_MULTISAMPLE_ARB                0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB   0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_ARB        0x809F
+#define GL_SAMPLE_COVERAGE_ARB            0x80A0
+#define GL_SAMPLE_BUFFERS_ARB             0x80A8
+#define GL_SAMPLES_ARB                    0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE_ARB      0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT_ARB     0x80AB
+#define GL_MULTISAMPLE_BIT_ARB            0x20000000
+#endif
+
+#ifndef GL_ARB_texture_env_add
+#endif
+
+#ifndef GL_ARB_texture_cube_map
+#define GL_NORMAL_MAP_ARB                 0x8511
+#define GL_REFLECTION_MAP_ARB             0x8512
+#define GL_TEXTURE_CUBE_MAP_ARB           0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARB   0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARB     0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB  0x851C
+#endif
+
+#ifndef GL_ARB_texture_compression
+#define GL_COMPRESSED_ALPHA_ARB           0x84E9
+#define GL_COMPRESSED_LUMINANCE_ARB       0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB
+#define GL_COMPRESSED_INTENSITY_ARB       0x84EC
+#define GL_COMPRESSED_RGB_ARB             0x84ED
+#define GL_COMPRESSED_RGBA_ARB            0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT_ARB   0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0
+#define GL_TEXTURE_COMPRESSED_ARB         0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3
+#endif
+
+#ifndef GL_ARB_texture_border_clamp
+#define GL_CLAMP_TO_BORDER_ARB            0x812D
+#endif
+
+#ifndef GL_ARB_point_parameters
+#define GL_POINT_SIZE_MIN_ARB             0x8126
+#define GL_POINT_SIZE_MAX_ARB             0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_ARB  0x8128
+#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129
+#endif
+
+#ifndef GL_ARB_vertex_blend
+#define GL_MAX_VERTEX_UNITS_ARB           0x86A4
+#define GL_ACTIVE_VERTEX_UNITS_ARB        0x86A5
+#define GL_WEIGHT_SUM_UNITY_ARB           0x86A6
+#define GL_VERTEX_BLEND_ARB               0x86A7
+#define GL_CURRENT_WEIGHT_ARB             0x86A8
+#define GL_WEIGHT_ARRAY_TYPE_ARB          0x86A9
+#define GL_WEIGHT_ARRAY_STRIDE_ARB        0x86AA
+#define GL_WEIGHT_ARRAY_SIZE_ARB          0x86AB
+#define GL_WEIGHT_ARRAY_POINTER_ARB       0x86AC
+#define GL_WEIGHT_ARRAY_ARB               0x86AD
+#define GL_MODELVIEW0_ARB                 0x1700
+#define GL_MODELVIEW1_ARB                 0x850A
+#define GL_MODELVIEW2_ARB                 0x8722
+#define GL_MODELVIEW3_ARB                 0x8723
+#define GL_MODELVIEW4_ARB                 0x8724
+#define GL_MODELVIEW5_ARB                 0x8725
+#define GL_MODELVIEW6_ARB                 0x8726
+#define GL_MODELVIEW7_ARB                 0x8727
+#define GL_MODELVIEW8_ARB                 0x8728
+#define GL_MODELVIEW9_ARB                 0x8729
+#define GL_MODELVIEW10_ARB                0x872A
+#define GL_MODELVIEW11_ARB                0x872B
+#define GL_MODELVIEW12_ARB                0x872C
+#define GL_MODELVIEW13_ARB                0x872D
+#define GL_MODELVIEW14_ARB                0x872E
+#define GL_MODELVIEW15_ARB                0x872F
+#define GL_MODELVIEW16_ARB                0x8730
+#define GL_MODELVIEW17_ARB                0x8731
+#define GL_MODELVIEW18_ARB                0x8732
+#define GL_MODELVIEW19_ARB                0x8733
+#define GL_MODELVIEW20_ARB                0x8734
+#define GL_MODELVIEW21_ARB                0x8735
+#define GL_MODELVIEW22_ARB                0x8736
+#define GL_MODELVIEW23_ARB                0x8737
+#define GL_MODELVIEW24_ARB                0x8738
+#define GL_MODELVIEW25_ARB                0x8739
+#define GL_MODELVIEW26_ARB                0x873A
+#define GL_MODELVIEW27_ARB                0x873B
+#define GL_MODELVIEW28_ARB                0x873C
+#define GL_MODELVIEW29_ARB                0x873D
+#define GL_MODELVIEW30_ARB                0x873E
+#define GL_MODELVIEW31_ARB                0x873F
+#endif
+
+#ifndef GL_ARB_matrix_palette
+#define GL_MATRIX_PALETTE_ARB             0x8840
+#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841
+#define GL_MAX_PALETTE_MATRICES_ARB       0x8842
+#define GL_CURRENT_PALETTE_MATRIX_ARB     0x8843
+#define GL_MATRIX_INDEX_ARRAY_ARB         0x8844
+#define GL_CURRENT_MATRIX_INDEX_ARB       0x8845
+#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB    0x8846
+#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB    0x8847
+#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB  0x8848
+#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849
+#endif
+
+#ifndef GL_ARB_texture_env_combine
+#define GL_COMBINE_ARB                    0x8570
+#define GL_COMBINE_RGB_ARB                0x8571
+#define GL_COMBINE_ALPHA_ARB              0x8572
+#define GL_SOURCE0_RGB_ARB                0x8580
+#define GL_SOURCE1_RGB_ARB                0x8581
+#define GL_SOURCE2_RGB_ARB                0x8582
+#define GL_SOURCE0_ALPHA_ARB              0x8588
+#define GL_SOURCE1_ALPHA_ARB              0x8589
+#define GL_SOURCE2_ALPHA_ARB              0x858A
+#define GL_OPERAND0_RGB_ARB               0x8590
+#define GL_OPERAND1_RGB_ARB               0x8591
+#define GL_OPERAND2_RGB_ARB               0x8592
+#define GL_OPERAND0_ALPHA_ARB             0x8598
+#define GL_OPERAND1_ALPHA_ARB             0x8599
+#define GL_OPERAND2_ALPHA_ARB             0x859A
+#define GL_RGB_SCALE_ARB                  0x8573
+#define GL_ADD_SIGNED_ARB                 0x8574
+#define GL_INTERPOLATE_ARB                0x8575
+#define GL_SUBTRACT_ARB                   0x84E7
+#define GL_CONSTANT_ARB                   0x8576
+#define GL_PRIMARY_COLOR_ARB              0x8577
+#define GL_PREVIOUS_ARB                   0x8578
+#endif
+
+#ifndef GL_ARB_texture_env_crossbar
+#endif
+
+#ifndef GL_ARB_texture_env_dot3
+#define GL_DOT3_RGB_ARB                   0x86AE
+#define GL_DOT3_RGBA_ARB                  0x86AF
+#endif
+
+#ifndef GL_ARB_texture_mirrored_repeat
+#define GL_MIRRORED_REPEAT_ARB            0x8370
+#endif
+
+#ifndef GL_ARB_depth_texture
+#define GL_DEPTH_COMPONENT16_ARB          0x81A5
+#define GL_DEPTH_COMPONENT24_ARB          0x81A6
+#define GL_DEPTH_COMPONENT32_ARB          0x81A7
+#define GL_TEXTURE_DEPTH_SIZE_ARB         0x884A
+#define GL_DEPTH_TEXTURE_MODE_ARB         0x884B
+#endif
+
+#ifndef GL_ARB_shadow
+#define GL_TEXTURE_COMPARE_MODE_ARB       0x884C
+#define GL_TEXTURE_COMPARE_FUNC_ARB       0x884D
+#define GL_COMPARE_R_TO_TEXTURE_ARB       0x884E
+#endif
+
+#ifndef GL_ARB_shadow_ambient
+#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF
+#endif
+
+#ifndef GL_ARB_window_pos
+#endif
+
+#ifndef GL_ARB_vertex_program
+#define GL_COLOR_SUM_ARB                  0x8458
+#define GL_VERTEX_PROGRAM_ARB             0x8620
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB   0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB   0x8625
+#define GL_CURRENT_VERTEX_ATTRIB_ARB      0x8626
+#define GL_PROGRAM_LENGTH_ARB             0x8627
+#define GL_PROGRAM_STRING_ARB             0x8628
+#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E
+#define GL_MAX_PROGRAM_MATRICES_ARB       0x862F
+#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640
+#define GL_CURRENT_MATRIX_ARB             0x8641
+#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB  0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB    0x8643
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645
+#define GL_PROGRAM_ERROR_POSITION_ARB     0x864B
+#define GL_PROGRAM_BINDING_ARB            0x8677
+#define GL_MAX_VERTEX_ATTRIBS_ARB         0x8869
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A
+#define GL_PROGRAM_ERROR_STRING_ARB       0x8874
+#define GL_PROGRAM_FORMAT_ASCII_ARB       0x8875
+#define GL_PROGRAM_FORMAT_ARB             0x8876
+#define GL_PROGRAM_INSTRUCTIONS_ARB       0x88A0
+#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB   0x88A1
+#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2
+#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3
+#define GL_PROGRAM_TEMPORARIES_ARB        0x88A4
+#define GL_MAX_PROGRAM_TEMPORARIES_ARB    0x88A5
+#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6
+#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7
+#define GL_PROGRAM_PARAMETERS_ARB         0x88A8
+#define GL_MAX_PROGRAM_PARAMETERS_ARB     0x88A9
+#define GL_PROGRAM_NATIVE_PARAMETERS_ARB  0x88AA
+#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB
+#define GL_PROGRAM_ATTRIBS_ARB            0x88AC
+#define GL_MAX_PROGRAM_ATTRIBS_ARB        0x88AD
+#define GL_PROGRAM_NATIVE_ATTRIBS_ARB     0x88AE
+#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF
+#define GL_PROGRAM_ADDRESS_REGISTERS_ARB  0x88B0
+#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1
+#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2
+#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3
+#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4
+#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5
+#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6
+#define GL_TRANSPOSE_CURRENT_MATRIX_ARB   0x88B7
+#define GL_MATRIX0_ARB                    0x88C0
+#define GL_MATRIX1_ARB                    0x88C1
+#define GL_MATRIX2_ARB                    0x88C2
+#define GL_MATRIX3_ARB                    0x88C3
+#define GL_MATRIX4_ARB                    0x88C4
+#define GL_MATRIX5_ARB                    0x88C5
+#define GL_MATRIX6_ARB                    0x88C6
+#define GL_MATRIX7_ARB                    0x88C7
+#define GL_MATRIX8_ARB                    0x88C8
+#define GL_MATRIX9_ARB                    0x88C9
+#define GL_MATRIX10_ARB                   0x88CA
+#define GL_MATRIX11_ARB                   0x88CB
+#define GL_MATRIX12_ARB                   0x88CC
+#define GL_MATRIX13_ARB                   0x88CD
+#define GL_MATRIX14_ARB                   0x88CE
+#define GL_MATRIX15_ARB                   0x88CF
+#define GL_MATRIX16_ARB                   0x88D0
+#define GL_MATRIX17_ARB                   0x88D1
+#define GL_MATRIX18_ARB                   0x88D2
+#define GL_MATRIX19_ARB                   0x88D3
+#define GL_MATRIX20_ARB                   0x88D4
+#define GL_MATRIX21_ARB                   0x88D5
+#define GL_MATRIX22_ARB                   0x88D6
+#define GL_MATRIX23_ARB                   0x88D7
+#define GL_MATRIX24_ARB                   0x88D8
+#define GL_MATRIX25_ARB                   0x88D9
+#define GL_MATRIX26_ARB                   0x88DA
+#define GL_MATRIX27_ARB                   0x88DB
+#define GL_MATRIX28_ARB                   0x88DC
+#define GL_MATRIX29_ARB                   0x88DD
+#define GL_MATRIX30_ARB                   0x88DE
+#define GL_MATRIX31_ARB                   0x88DF
+#endif
+
+#ifndef GL_ARB_fragment_program
+#define GL_FRAGMENT_PROGRAM_ARB           0x8804
+#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB   0x8805
+#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB   0x8806
+#define GL_PROGRAM_TEX_INDIRECTIONS_ARB   0x8807
+#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808
+#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809
+#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A
+#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B
+#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C
+#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D
+#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E
+#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F
+#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810
+#define GL_MAX_TEXTURE_COORDS_ARB         0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB    0x8872
+#endif
+
+#ifndef GL_ARB_vertex_buffer_object
+#define GL_BUFFER_SIZE_ARB                0x8764
+#define GL_BUFFER_USAGE_ARB               0x8765
+#define GL_ARRAY_BUFFER_ARB               0x8892
+#define GL_ELEMENT_ARRAY_BUFFER_ARB       0x8893
+#define GL_ARRAY_BUFFER_BINDING_ARB       0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895
+#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896
+#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897
+#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898
+#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899
+#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A
+#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B
+#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C
+#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D
+#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F
+#define GL_READ_ONLY_ARB                  0x88B8
+#define GL_WRITE_ONLY_ARB                 0x88B9
+#define GL_READ_WRITE_ARB                 0x88BA
+#define GL_BUFFER_ACCESS_ARB              0x88BB
+#define GL_BUFFER_MAPPED_ARB              0x88BC
+#define GL_BUFFER_MAP_POINTER_ARB         0x88BD
+#define GL_STREAM_DRAW_ARB                0x88E0
+#define GL_STREAM_READ_ARB                0x88E1
+#define GL_STREAM_COPY_ARB                0x88E2
+#define GL_STATIC_DRAW_ARB                0x88E4
+#define GL_STATIC_READ_ARB                0x88E5
+#define GL_STATIC_COPY_ARB                0x88E6
+#define GL_DYNAMIC_DRAW_ARB               0x88E8
+#define GL_DYNAMIC_READ_ARB               0x88E9
+#define GL_DYNAMIC_COPY_ARB               0x88EA
+#endif
+
+#ifndef GL_ARB_occlusion_query
+#define GL_QUERY_COUNTER_BITS_ARB         0x8864
+#define GL_CURRENT_QUERY_ARB              0x8865
+#define GL_QUERY_RESULT_ARB               0x8866
+#define GL_QUERY_RESULT_AVAILABLE_ARB     0x8867
+#define GL_SAMPLES_PASSED_ARB             0x8914
+#endif
+
+#ifndef GL_ARB_shader_objects
+#define GL_PROGRAM_OBJECT_ARB             0x8B40
+#define GL_SHADER_OBJECT_ARB              0x8B48
+#define GL_OBJECT_TYPE_ARB                0x8B4E
+#define GL_OBJECT_SUBTYPE_ARB             0x8B4F
+#define GL_FLOAT_VEC2_ARB                 0x8B50
+#define GL_FLOAT_VEC3_ARB                 0x8B51
+#define GL_FLOAT_VEC4_ARB                 0x8B52
+#define GL_INT_VEC2_ARB                   0x8B53
+#define GL_INT_VEC3_ARB                   0x8B54
+#define GL_INT_VEC4_ARB                   0x8B55
+#define GL_BOOL_ARB                       0x8B56
+#define GL_BOOL_VEC2_ARB                  0x8B57
+#define GL_BOOL_VEC3_ARB                  0x8B58
+#define GL_BOOL_VEC4_ARB                  0x8B59
+#define GL_FLOAT_MAT2_ARB                 0x8B5A
+#define GL_FLOAT_MAT3_ARB                 0x8B5B
+#define GL_FLOAT_MAT4_ARB                 0x8B5C
+#define GL_OBJECT_DELETE_STATUS_ARB       0x8B80
+#define GL_OBJECT_COMPILE_STATUS_ARB      0x8B81
+#define GL_OBJECT_LINK_STATUS_ARB         0x8B82
+#define GL_OBJECT_VALIDATE_STATUS_ARB     0x8B83
+#define GL_OBJECT_INFO_LOG_LENGTH_ARB     0x8B84
+#define GL_OBJECT_ATTACHED_OBJECTS_ARB    0x8B85
+#define GL_OBJECT_ACTIVE_UNIFORMS_ARB     0x8B86
+#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87
+#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88
+#endif
+
+#ifndef GL_ARB_vertex_shader
+#define GL_VERTEX_SHADER_ARB              0x8B31
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A
+#define GL_MAX_VARYING_FLOATS_ARB         0x8B4B
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D
+#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB   0x8B89
+#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A
+#endif
+
+#ifndef GL_ARB_fragment_shader
+#define GL_FRAGMENT_SHADER_ARB            0x8B30
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49
+#endif
+
+#ifndef GL_ARB_shading_language_100
+#endif
+
+#ifndef GL_ARB_texture_non_power_of_two
+#endif
+
+#ifndef GL_ARB_point_sprite
+#define GL_POINT_SPRITE_ARB               0x8861
+#define GL_COORD_REPLACE_ARB              0x8862
+#endif
+
+#ifndef GL_ARB_fragment_program_shadow
+#endif
+
+#ifndef GL_EXT_abgr
+#define GL_ABGR_EXT                       0x8000
+#endif
+
+#ifndef GL_EXT_blend_color
+#define GL_CONSTANT_COLOR_EXT             0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR_EXT   0x8002
+#define GL_CONSTANT_ALPHA_EXT             0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT   0x8004
+#define GL_BLEND_COLOR_EXT                0x8005
+#endif
+
+#ifndef GL_EXT_polygon_offset
+#define GL_POLYGON_OFFSET_EXT             0x8037
+#define GL_POLYGON_OFFSET_FACTOR_EXT      0x8038
+#define GL_POLYGON_OFFSET_BIAS_EXT        0x8039
+#endif
+
+#ifndef GL_EXT_texture
+#define GL_ALPHA4_EXT                     0x803B
+#define GL_ALPHA8_EXT                     0x803C
+#define GL_ALPHA12_EXT                    0x803D
+#define GL_ALPHA16_EXT                    0x803E
+#define GL_LUMINANCE4_EXT                 0x803F
+#define GL_LUMINANCE8_EXT                 0x8040
+#define GL_LUMINANCE12_EXT                0x8041
+#define GL_LUMINANCE16_EXT                0x8042
+#define GL_LUMINANCE4_ALPHA4_EXT          0x8043
+#define GL_LUMINANCE6_ALPHA2_EXT          0x8044
+#define GL_LUMINANCE8_ALPHA8_EXT          0x8045
+#define GL_LUMINANCE12_ALPHA4_EXT         0x8046
+#define GL_LUMINANCE12_ALPHA12_EXT        0x8047
+#define GL_LUMINANCE16_ALPHA16_EXT        0x8048
+#define GL_INTENSITY_EXT                  0x8049
+#define GL_INTENSITY4_EXT                 0x804A
+#define GL_INTENSITY8_EXT                 0x804B
+#define GL_INTENSITY12_EXT                0x804C
+#define GL_INTENSITY16_EXT                0x804D
+#define GL_RGB2_EXT                       0x804E
+#define GL_RGB4_EXT                       0x804F
+#define GL_RGB5_EXT                       0x8050
+#define GL_RGB8_EXT                       0x8051
+#define GL_RGB10_EXT                      0x8052
+#define GL_RGB12_EXT                      0x8053
+#define GL_RGB16_EXT                      0x8054
+#define GL_RGBA2_EXT                      0x8055
+#define GL_RGBA4_EXT                      0x8056
+#define GL_RGB5_A1_EXT                    0x8057
+#define GL_RGBA8_EXT                      0x8058
+#define GL_RGB10_A2_EXT                   0x8059
+#define GL_RGBA12_EXT                     0x805A
+#define GL_RGBA16_EXT                     0x805B
+#define GL_TEXTURE_RED_SIZE_EXT           0x805C
+#define GL_TEXTURE_GREEN_SIZE_EXT         0x805D
+#define GL_TEXTURE_BLUE_SIZE_EXT          0x805E
+#define GL_TEXTURE_ALPHA_SIZE_EXT         0x805F
+#define GL_TEXTURE_LUMINANCE_SIZE_EXT     0x8060
+#define GL_TEXTURE_INTENSITY_SIZE_EXT     0x8061
+#define GL_REPLACE_EXT                    0x8062
+#define GL_PROXY_TEXTURE_1D_EXT           0x8063
+#define GL_PROXY_TEXTURE_2D_EXT           0x8064
+#define GL_TEXTURE_TOO_LARGE_EXT          0x8065
+#endif
+
+#ifndef GL_EXT_texture3D
+#define GL_PACK_SKIP_IMAGES_EXT           0x806B
+#define GL_PACK_IMAGE_HEIGHT_EXT          0x806C
+#define GL_UNPACK_SKIP_IMAGES_EXT         0x806D
+#define GL_UNPACK_IMAGE_HEIGHT_EXT        0x806E
+#define GL_TEXTURE_3D_EXT                 0x806F
+#define GL_PROXY_TEXTURE_3D_EXT           0x8070
+#define GL_TEXTURE_DEPTH_EXT              0x8071
+#define GL_TEXTURE_WRAP_R_EXT             0x8072
+#define GL_MAX_3D_TEXTURE_SIZE_EXT        0x8073
+#endif
+
+#ifndef GL_SGIS_texture_filter4
+#define GL_FILTER4_SGIS                   0x8146
+#define GL_TEXTURE_FILTER4_SIZE_SGIS      0x8147
+#endif
+
+#ifndef GL_EXT_subtexture
+#endif
+
+#ifndef GL_EXT_copy_texture
+#endif
+
+#ifndef GL_EXT_histogram
+#define GL_HISTOGRAM_EXT                  0x8024
+#define GL_PROXY_HISTOGRAM_EXT            0x8025
+#define GL_HISTOGRAM_WIDTH_EXT            0x8026
+#define GL_HISTOGRAM_FORMAT_EXT           0x8027
+#define GL_HISTOGRAM_RED_SIZE_EXT         0x8028
+#define GL_HISTOGRAM_GREEN_SIZE_EXT       0x8029
+#define GL_HISTOGRAM_BLUE_SIZE_EXT        0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE_EXT       0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT   0x802C
+#define GL_HISTOGRAM_SINK_EXT             0x802D
+#define GL_MINMAX_EXT                     0x802E
+#define GL_MINMAX_FORMAT_EXT              0x802F
+#define GL_MINMAX_SINK_EXT                0x8030
+#define GL_TABLE_TOO_LARGE_EXT            0x8031
+#endif
+
+#ifndef GL_EXT_convolution
+#define GL_CONVOLUTION_1D_EXT             0x8010
+#define GL_CONVOLUTION_2D_EXT             0x8011
+#define GL_SEPARABLE_2D_EXT               0x8012
+#define GL_CONVOLUTION_BORDER_MODE_EXT    0x8013
+#define GL_CONVOLUTION_FILTER_SCALE_EXT   0x8014
+#define GL_CONVOLUTION_FILTER_BIAS_EXT    0x8015
+#define GL_REDUCE_EXT                     0x8016
+#define GL_CONVOLUTION_FORMAT_EXT         0x8017
+#define GL_CONVOLUTION_WIDTH_EXT          0x8018
+#define GL_CONVOLUTION_HEIGHT_EXT         0x8019
+#define GL_MAX_CONVOLUTION_WIDTH_EXT      0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT_EXT     0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS_EXT  0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023
+#endif
+
+#ifndef GL_SGI_color_matrix
+#define GL_COLOR_MATRIX_SGI               0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH_SGI   0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB
+#endif
+
+#ifndef GL_SGI_color_table
+#define GL_COLOR_TABLE_SGI                0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2
+#define GL_PROXY_COLOR_TABLE_SGI          0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5
+#define GL_COLOR_TABLE_SCALE_SGI          0x80D6
+#define GL_COLOR_TABLE_BIAS_SGI           0x80D7
+#define GL_COLOR_TABLE_FORMAT_SGI         0x80D8
+#define GL_COLOR_TABLE_WIDTH_SGI          0x80D9
+#define GL_COLOR_TABLE_RED_SIZE_SGI       0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE_SGI     0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE_SGI      0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE_SGI     0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF
+#endif
+
+#ifndef GL_SGIS_pixel_texture
+#define GL_PIXEL_TEXTURE_SGIS             0x8353
+#define GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS 0x8354
+#define GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS 0x8355
+#define GL_PIXEL_GROUP_COLOR_SGIS         0x8356
+#endif
+
+#ifndef GL_SGIX_pixel_texture
+#define GL_PIXEL_TEX_GEN_SGIX             0x8139
+#define GL_PIXEL_TEX_GEN_MODE_SGIX        0x832B
+#endif
+
+#ifndef GL_SGIS_texture4D
+#define GL_PACK_SKIP_VOLUMES_SGIS         0x8130
+#define GL_PACK_IMAGE_DEPTH_SGIS          0x8131
+#define GL_UNPACK_SKIP_VOLUMES_SGIS       0x8132
+#define GL_UNPACK_IMAGE_DEPTH_SGIS        0x8133
+#define GL_TEXTURE_4D_SGIS                0x8134
+#define GL_PROXY_TEXTURE_4D_SGIS          0x8135
+#define GL_TEXTURE_4DSIZE_SGIS            0x8136
+#define GL_TEXTURE_WRAP_Q_SGIS            0x8137
+#define GL_MAX_4D_TEXTURE_SIZE_SGIS       0x8138
+#define GL_TEXTURE_4D_BINDING_SGIS        0x814F
+#endif
+
+#ifndef GL_SGI_texture_color_table
+#define GL_TEXTURE_COLOR_TABLE_SGI        0x80BC
+#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI  0x80BD
+#endif
+
+#ifndef GL_EXT_cmyka
+#define GL_CMYK_EXT                       0x800C
+#define GL_CMYKA_EXT                      0x800D
+#define GL_PACK_CMYK_HINT_EXT             0x800E
+#define GL_UNPACK_CMYK_HINT_EXT           0x800F
+#endif
+
+#ifndef GL_EXT_texture_object
+#define GL_TEXTURE_PRIORITY_EXT           0x8066
+#define GL_TEXTURE_RESIDENT_EXT           0x8067
+#define GL_TEXTURE_1D_BINDING_EXT         0x8068
+#define GL_TEXTURE_2D_BINDING_EXT         0x8069
+#define GL_TEXTURE_3D_BINDING_EXT         0x806A
+#endif
+
+#ifndef GL_SGIS_detail_texture
+#define GL_DETAIL_TEXTURE_2D_SGIS         0x8095
+#define GL_DETAIL_TEXTURE_2D_BINDING_SGIS 0x8096
+#define GL_LINEAR_DETAIL_SGIS             0x8097
+#define GL_LINEAR_DETAIL_ALPHA_SGIS       0x8098
+#define GL_LINEAR_DETAIL_COLOR_SGIS       0x8099
+#define GL_DETAIL_TEXTURE_LEVEL_SGIS      0x809A
+#define GL_DETAIL_TEXTURE_MODE_SGIS       0x809B
+#define GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS 0x809C
+#endif
+
+#ifndef GL_SGIS_sharpen_texture
+#define GL_LINEAR_SHARPEN_SGIS            0x80AD
+#define GL_LINEAR_SHARPEN_ALPHA_SGIS      0x80AE
+#define GL_LINEAR_SHARPEN_COLOR_SGIS      0x80AF
+#define GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS 0x80B0
+#endif
+
+#ifndef GL_EXT_packed_pixels
+#define GL_UNSIGNED_BYTE_3_3_2_EXT        0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4_EXT     0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1_EXT     0x8034
+#define GL_UNSIGNED_INT_8_8_8_8_EXT       0x8035
+#define GL_UNSIGNED_INT_10_10_10_2_EXT    0x8036
+#endif
+
+#ifndef GL_SGIS_texture_lod
+#define GL_TEXTURE_MIN_LOD_SGIS           0x813A
+#define GL_TEXTURE_MAX_LOD_SGIS           0x813B
+#define GL_TEXTURE_BASE_LEVEL_SGIS        0x813C
+#define GL_TEXTURE_MAX_LEVEL_SGIS         0x813D
+#endif
+
+#ifndef GL_SGIS_multisample
+#define GL_MULTISAMPLE_SGIS               0x809D
+#define GL_SAMPLE_ALPHA_TO_MASK_SGIS      0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_SGIS       0x809F
+#define GL_SAMPLE_MASK_SGIS               0x80A0
+#define GL_1PASS_SGIS                     0x80A1
+#define GL_2PASS_0_SGIS                   0x80A2
+#define GL_2PASS_1_SGIS                   0x80A3
+#define GL_4PASS_0_SGIS                   0x80A4
+#define GL_4PASS_1_SGIS                   0x80A5
+#define GL_4PASS_2_SGIS                   0x80A6
+#define GL_4PASS_3_SGIS                   0x80A7
+#define GL_SAMPLE_BUFFERS_SGIS            0x80A8
+#define GL_SAMPLES_SGIS                   0x80A9
+#define GL_SAMPLE_MASK_VALUE_SGIS         0x80AA
+#define GL_SAMPLE_MASK_INVERT_SGIS        0x80AB
+#define GL_SAMPLE_PATTERN_SGIS            0x80AC
+#endif
+
+#ifndef GL_EXT_rescale_normal
+#define GL_RESCALE_NORMAL_EXT             0x803A
+#endif
+
+#ifndef GL_EXT_vertex_array
+#define GL_VERTEX_ARRAY_EXT               0x8074
+#define GL_NORMAL_ARRAY_EXT               0x8075
+#define GL_COLOR_ARRAY_EXT                0x8076
+#define GL_INDEX_ARRAY_EXT                0x8077
+#define GL_TEXTURE_COORD_ARRAY_EXT        0x8078
+#define GL_EDGE_FLAG_ARRAY_EXT            0x8079
+#define GL_VERTEX_ARRAY_SIZE_EXT          0x807A
+#define GL_VERTEX_ARRAY_TYPE_EXT          0x807B
+#define GL_VERTEX_ARRAY_STRIDE_EXT        0x807C
+#define GL_VERTEX_ARRAY_COUNT_EXT         0x807D
+#define GL_NORMAL_ARRAY_TYPE_EXT          0x807E
+#define GL_NORMAL_ARRAY_STRIDE_EXT        0x807F
+#define GL_NORMAL_ARRAY_COUNT_EXT         0x8080
+#define GL_COLOR_ARRAY_SIZE_EXT           0x8081
+#define GL_COLOR_ARRAY_TYPE_EXT           0x8082
+#define GL_COLOR_ARRAY_STRIDE_EXT         0x8083
+#define GL_COLOR_ARRAY_COUNT_EXT          0x8084
+#define GL_INDEX_ARRAY_TYPE_EXT           0x8085
+#define GL_INDEX_ARRAY_STRIDE_EXT         0x8086
+#define GL_INDEX_ARRAY_COUNT_EXT          0x8087
+#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT   0x8088
+#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT   0x8089
+#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A
+#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT  0x808B
+#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT     0x808C
+#define GL_EDGE_FLAG_ARRAY_COUNT_EXT      0x808D
+#define GL_VERTEX_ARRAY_POINTER_EXT       0x808E
+#define GL_NORMAL_ARRAY_POINTER_EXT       0x808F
+#define GL_COLOR_ARRAY_POINTER_EXT        0x8090
+#define GL_INDEX_ARRAY_POINTER_EXT        0x8091
+#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092
+#define GL_EDGE_FLAG_ARRAY_POINTER_EXT    0x8093
+#endif
+
+#ifndef GL_EXT_misc_attribute
+#endif
+
+#ifndef GL_SGIS_generate_mipmap
+#define GL_GENERATE_MIPMAP_SGIS           0x8191
+#define GL_GENERATE_MIPMAP_HINT_SGIS      0x8192
+#endif
+
+#ifndef GL_SGIX_clipmap
+#define GL_LINEAR_CLIPMAP_LINEAR_SGIX     0x8170
+#define GL_TEXTURE_CLIPMAP_CENTER_SGIX    0x8171
+#define GL_TEXTURE_CLIPMAP_FRAME_SGIX     0x8172
+#define GL_TEXTURE_CLIPMAP_OFFSET_SGIX    0x8173
+#define GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8174
+#define GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX 0x8175
+#define GL_TEXTURE_CLIPMAP_DEPTH_SGIX     0x8176
+#define GL_MAX_CLIPMAP_DEPTH_SGIX         0x8177
+#define GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8178
+#define GL_NEAREST_CLIPMAP_NEAREST_SGIX   0x844D
+#define GL_NEAREST_CLIPMAP_LINEAR_SGIX    0x844E
+#define GL_LINEAR_CLIPMAP_NEAREST_SGIX    0x844F
+#endif
+
+#ifndef GL_SGIX_shadow
+#define GL_TEXTURE_COMPARE_SGIX           0x819A
+#define GL_TEXTURE_COMPARE_OPERATOR_SGIX  0x819B
+#define GL_TEXTURE_LEQUAL_R_SGIX          0x819C
+#define GL_TEXTURE_GEQUAL_R_SGIX          0x819D
+#endif
+
+#ifndef GL_SGIS_texture_edge_clamp
+#define GL_CLAMP_TO_EDGE_SGIS             0x812F
+#endif
+
+#ifndef GL_EXT_blend_minmax
+#define GL_FUNC_ADD_EXT                   0x8006
+#define GL_MIN_EXT                        0x8007
+#define GL_MAX_EXT                        0x8008
+#define GL_BLEND_EQUATION_EXT             0x8009
+#endif
+
+#ifndef GL_EXT_blend_subtract
+#define GL_FUNC_SUBTRACT_EXT              0x800A
+#define GL_FUNC_REVERSE_SUBTRACT_EXT      0x800B
+#endif
+
+#ifndef GL_EXT_blend_logic_op
+#endif
+
+#ifndef GL_SGIX_interlace
+#define GL_INTERLACE_SGIX                 0x8094
+#endif
+
+#ifndef GL_SGIX_pixel_tiles
+#define GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX 0x813E
+#define GL_PIXEL_TILE_CACHE_INCREMENT_SGIX 0x813F
+#define GL_PIXEL_TILE_WIDTH_SGIX          0x8140
+#define GL_PIXEL_TILE_HEIGHT_SGIX         0x8141
+#define GL_PIXEL_TILE_GRID_WIDTH_SGIX     0x8142
+#define GL_PIXEL_TILE_GRID_HEIGHT_SGIX    0x8143
+#define GL_PIXEL_TILE_GRID_DEPTH_SGIX     0x8144
+#define GL_PIXEL_TILE_CACHE_SIZE_SGIX     0x8145
+#endif
+
+#ifndef GL_SGIS_texture_select
+#define GL_DUAL_ALPHA4_SGIS               0x8110
+#define GL_DUAL_ALPHA8_SGIS               0x8111
+#define GL_DUAL_ALPHA12_SGIS              0x8112
+#define GL_DUAL_ALPHA16_SGIS              0x8113
+#define GL_DUAL_LUMINANCE4_SGIS           0x8114
+#define GL_DUAL_LUMINANCE8_SGIS           0x8115
+#define GL_DUAL_LUMINANCE12_SGIS          0x8116
+#define GL_DUAL_LUMINANCE16_SGIS          0x8117
+#define GL_DUAL_INTENSITY4_SGIS           0x8118
+#define GL_DUAL_INTENSITY8_SGIS           0x8119
+#define GL_DUAL_INTENSITY12_SGIS          0x811A
+#define GL_DUAL_INTENSITY16_SGIS          0x811B
+#define GL_DUAL_LUMINANCE_ALPHA4_SGIS     0x811C
+#define GL_DUAL_LUMINANCE_ALPHA8_SGIS     0x811D
+#define GL_QUAD_ALPHA4_SGIS               0x811E
+#define GL_QUAD_ALPHA8_SGIS               0x811F
+#define GL_QUAD_LUMINANCE4_SGIS           0x8120
+#define GL_QUAD_LUMINANCE8_SGIS           0x8121
+#define GL_QUAD_INTENSITY4_SGIS           0x8122
+#define GL_QUAD_INTENSITY8_SGIS           0x8123
+#define GL_DUAL_TEXTURE_SELECT_SGIS       0x8124
+#define GL_QUAD_TEXTURE_SELECT_SGIS       0x8125
+#endif
+
+#ifndef GL_SGIX_sprite
+#define GL_SPRITE_SGIX                    0x8148
+#define GL_SPRITE_MODE_SGIX               0x8149
+#define GL_SPRITE_AXIS_SGIX               0x814A
+#define GL_SPRITE_TRANSLATION_SGIX        0x814B
+#define GL_SPRITE_AXIAL_SGIX              0x814C
+#define GL_SPRITE_OBJECT_ALIGNED_SGIX     0x814D
+#define GL_SPRITE_EYE_ALIGNED_SGIX        0x814E
+#endif
+
+#ifndef GL_SGIX_texture_multi_buffer
+#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E
+#endif
+
+#ifndef GL_EXT_point_parameters
+#define GL_POINT_SIZE_MIN_EXT             0x8126
+#define GL_POINT_SIZE_MAX_EXT             0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_EXT  0x8128
+#define GL_DISTANCE_ATTENUATION_EXT       0x8129
+#endif
+
+#ifndef GL_SGIS_point_parameters
+#define GL_POINT_SIZE_MIN_SGIS            0x8126
+#define GL_POINT_SIZE_MAX_SGIS            0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_SGIS 0x8128
+#define GL_DISTANCE_ATTENUATION_SGIS      0x8129
+#endif
+
+#ifndef GL_SGIX_instruments
+#define GL_INSTRUMENT_BUFFER_POINTER_SGIX 0x8180
+#define GL_INSTRUMENT_MEASUREMENTS_SGIX   0x8181
+#endif
+
+#ifndef GL_SGIX_texture_scale_bias
+#define GL_POST_TEXTURE_FILTER_BIAS_SGIX  0x8179
+#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A
+#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B
+#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C
+#endif
+
+#ifndef GL_SGIX_framezoom
+#define GL_FRAMEZOOM_SGIX                 0x818B
+#define GL_FRAMEZOOM_FACTOR_SGIX          0x818C
+#define GL_MAX_FRAMEZOOM_FACTOR_SGIX      0x818D
+#endif
+
+#ifndef GL_SGIX_tag_sample_buffer
+#endif
+
+#ifndef GL_FfdMaskSGIX
+#define GL_TEXTURE_DEFORMATION_BIT_SGIX   0x00000001
+#define GL_GEOMETRY_DEFORMATION_BIT_SGIX  0x00000002
+#endif
+
+#ifndef GL_SGIX_polynomial_ffd
+#define GL_GEOMETRY_DEFORMATION_SGIX      0x8194
+#define GL_TEXTURE_DEFORMATION_SGIX       0x8195
+#define GL_DEFORMATIONS_MASK_SGIX         0x8196
+#define GL_MAX_DEFORMATION_ORDER_SGIX     0x8197
+#endif
+
+#ifndef GL_SGIX_reference_plane
+#define GL_REFERENCE_PLANE_SGIX           0x817D
+#define GL_REFERENCE_PLANE_EQUATION_SGIX  0x817E
+#endif
+
+#ifndef GL_SGIX_flush_raster
+#endif
+
+#ifndef GL_SGIX_depth_texture
+#define GL_DEPTH_COMPONENT16_SGIX         0x81A5
+#define GL_DEPTH_COMPONENT24_SGIX         0x81A6
+#define GL_DEPTH_COMPONENT32_SGIX         0x81A7
+#endif
+
+#ifndef GL_SGIS_fog_function
+#define GL_FOG_FUNC_SGIS                  0x812A
+#define GL_FOG_FUNC_POINTS_SGIS           0x812B
+#define GL_MAX_FOG_FUNC_POINTS_SGIS       0x812C
+#endif
+
+#ifndef GL_SGIX_fog_offset
+#define GL_FOG_OFFSET_SGIX                0x8198
+#define GL_FOG_OFFSET_VALUE_SGIX          0x8199
+#endif
+
+#ifndef GL_HP_image_transform
+#define GL_IMAGE_SCALE_X_HP               0x8155
+#define GL_IMAGE_SCALE_Y_HP               0x8156
+#define GL_IMAGE_TRANSLATE_X_HP           0x8157
+#define GL_IMAGE_TRANSLATE_Y_HP           0x8158
+#define GL_IMAGE_ROTATE_ANGLE_HP          0x8159
+#define GL_IMAGE_ROTATE_ORIGIN_X_HP       0x815A
+#define GL_IMAGE_ROTATE_ORIGIN_Y_HP       0x815B
+#define GL_IMAGE_MAG_FILTER_HP            0x815C
+#define GL_IMAGE_MIN_FILTER_HP            0x815D
+#define GL_IMAGE_CUBIC_WEIGHT_HP          0x815E
+#define GL_CUBIC_HP                       0x815F
+#define GL_AVERAGE_HP                     0x8160
+#define GL_IMAGE_TRANSFORM_2D_HP          0x8161
+#define GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8162
+#define GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8163
+#endif
+
+#ifndef GL_HP_convolution_border_modes
+#define GL_IGNORE_BORDER_HP               0x8150
+#define GL_CONSTANT_BORDER_HP             0x8151
+#define GL_REPLICATE_BORDER_HP            0x8153
+#define GL_CONVOLUTION_BORDER_COLOR_HP    0x8154
+#endif
+
+#ifndef GL_INGR_palette_buffer
+#endif
+
+#ifndef GL_SGIX_texture_add_env
+#define GL_TEXTURE_ENV_BIAS_SGIX          0x80BE
+#endif
+
+#ifndef GL_EXT_color_subtable
+#endif
+
+#ifndef GL_PGI_vertex_hints
+#define GL_VERTEX_DATA_HINT_PGI           0x1A22A
+#define GL_VERTEX_CONSISTENT_HINT_PGI     0x1A22B
+#define GL_MATERIAL_SIDE_HINT_PGI         0x1A22C
+#define GL_MAX_VERTEX_HINT_PGI            0x1A22D
+#define GL_COLOR3_BIT_PGI                 0x00010000
+#define GL_COLOR4_BIT_PGI                 0x00020000
+#define GL_EDGEFLAG_BIT_PGI               0x00040000
+#define GL_INDEX_BIT_PGI                  0x00080000
+#define GL_MAT_AMBIENT_BIT_PGI            0x00100000
+#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000
+#define GL_MAT_DIFFUSE_BIT_PGI            0x00400000
+#define GL_MAT_EMISSION_BIT_PGI           0x00800000
+#define GL_MAT_COLOR_INDEXES_BIT_PGI      0x01000000
+#define GL_MAT_SHININESS_BIT_PGI          0x02000000
+#define GL_MAT_SPECULAR_BIT_PGI           0x04000000
+#define GL_NORMAL_BIT_PGI                 0x08000000
+#define GL_TEXCOORD1_BIT_PGI              0x10000000
+#define GL_TEXCOORD2_BIT_PGI              0x20000000
+#define GL_TEXCOORD3_BIT_PGI              0x40000000
+#define GL_TEXCOORD4_BIT_PGI              0x80000000
+#define GL_VERTEX23_BIT_PGI               0x00000004
+#define GL_VERTEX4_BIT_PGI                0x00000008
+#endif
+
+#ifndef GL_PGI_misc_hints
+#define GL_PREFER_DOUBLEBUFFER_HINT_PGI   0x1A1F8
+#define GL_CONSERVE_MEMORY_HINT_PGI       0x1A1FD
+#define GL_RECLAIM_MEMORY_HINT_PGI        0x1A1FE
+#define GL_NATIVE_GRAPHICS_HANDLE_PGI     0x1A202
+#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 0x1A203
+#define GL_NATIVE_GRAPHICS_END_HINT_PGI   0x1A204
+#define GL_ALWAYS_FAST_HINT_PGI           0x1A20C
+#define GL_ALWAYS_SOFT_HINT_PGI           0x1A20D
+#define GL_ALLOW_DRAW_OBJ_HINT_PGI        0x1A20E
+#define GL_ALLOW_DRAW_WIN_HINT_PGI        0x1A20F
+#define GL_ALLOW_DRAW_FRG_HINT_PGI        0x1A210
+#define GL_ALLOW_DRAW_MEM_HINT_PGI        0x1A211
+#define GL_STRICT_DEPTHFUNC_HINT_PGI      0x1A216
+#define GL_STRICT_LIGHTING_HINT_PGI       0x1A217
+#define GL_STRICT_SCISSOR_HINT_PGI        0x1A218
+#define GL_FULL_STIPPLE_HINT_PGI          0x1A219
+#define GL_CLIP_NEAR_HINT_PGI             0x1A220
+#define GL_CLIP_FAR_HINT_PGI              0x1A221
+#define GL_WIDE_LINE_HINT_PGI             0x1A222
+#define GL_BACK_NORMALS_HINT_PGI          0x1A223
+#endif
+
+#ifndef GL_EXT_paletted_texture
+#define GL_COLOR_INDEX1_EXT               0x80E2
+#define GL_COLOR_INDEX2_EXT               0x80E3
+#define GL_COLOR_INDEX4_EXT               0x80E4
+#define GL_COLOR_INDEX8_EXT               0x80E5
+#define GL_COLOR_INDEX12_EXT              0x80E6
+#define GL_COLOR_INDEX16_EXT              0x80E7
+#define GL_TEXTURE_INDEX_SIZE_EXT         0x80ED
+#endif
+
+#ifndef GL_EXT_clip_volume_hint
+#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT  0x80F0
+#endif
+
+#ifndef GL_SGIX_list_priority
+#define GL_LIST_PRIORITY_SGIX             0x8182
+#endif
+
+#ifndef GL_SGIX_ir_instrument1
+#define GL_IR_INSTRUMENT1_SGIX            0x817F
+#endif
+
+#ifndef GL_SGIX_calligraphic_fragment
+#define GL_CALLIGRAPHIC_FRAGMENT_SGIX     0x8183
+#endif
+
+#ifndef GL_SGIX_texture_lod_bias
+#define GL_TEXTURE_LOD_BIAS_S_SGIX        0x818E
+#define GL_TEXTURE_LOD_BIAS_T_SGIX        0x818F
+#define GL_TEXTURE_LOD_BIAS_R_SGIX        0x8190
+#endif
+
+#ifndef GL_SGIX_shadow_ambient
+#define GL_SHADOW_AMBIENT_SGIX            0x80BF
+#endif
+
+#ifndef GL_EXT_index_texture
+#endif
+
+#ifndef GL_EXT_index_material
+#define GL_INDEX_MATERIAL_EXT             0x81B8
+#define GL_INDEX_MATERIAL_PARAMETER_EXT   0x81B9
+#define GL_INDEX_MATERIAL_FACE_EXT        0x81BA
+#endif
+
+#ifndef GL_EXT_index_func
+#define GL_INDEX_TEST_EXT                 0x81B5
+#define GL_INDEX_TEST_FUNC_EXT            0x81B6
+#define GL_INDEX_TEST_REF_EXT             0x81B7
+#endif
+
+#ifndef GL_EXT_index_array_formats
+#define GL_IUI_V2F_EXT                    0x81AD
+#define GL_IUI_V3F_EXT                    0x81AE
+#define GL_IUI_N3F_V2F_EXT                0x81AF
+#define GL_IUI_N3F_V3F_EXT                0x81B0
+#define GL_T2F_IUI_V2F_EXT                0x81B1
+#define GL_T2F_IUI_V3F_EXT                0x81B2
+#define GL_T2F_IUI_N3F_V2F_EXT            0x81B3
+#define GL_T2F_IUI_N3F_V3F_EXT            0x81B4
+#endif
+
+#ifndef GL_EXT_compiled_vertex_array
+#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT   0x81A8
+#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT   0x81A9
+#endif
+
+#ifndef GL_EXT_cull_vertex
+#define GL_CULL_VERTEX_EXT                0x81AA
+#define GL_CULL_VERTEX_EYE_POSITION_EXT   0x81AB
+#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC
+#endif
+
+#ifndef GL_SGIX_ycrcb
+#define GL_YCRCB_422_SGIX                 0x81BB
+#define GL_YCRCB_444_SGIX                 0x81BC
+#endif
+
+#ifndef GL_SGIX_fragment_lighting
+#define GL_FRAGMENT_LIGHTING_SGIX         0x8400
+#define GL_FRAGMENT_COLOR_MATERIAL_SGIX   0x8401
+#define GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX 0x8402
+#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX 0x8403
+#define GL_MAX_FRAGMENT_LIGHTS_SGIX       0x8404
+#define GL_MAX_ACTIVE_LIGHTS_SGIX         0x8405
+#define GL_CURRENT_RASTER_NORMAL_SGIX     0x8406
+#define GL_LIGHT_ENV_MODE_SGIX            0x8407
+#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX 0x8408
+#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX 0x8409
+#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX 0x840A
+#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX 0x840B
+#define GL_FRAGMENT_LIGHT0_SGIX           0x840C
+#define GL_FRAGMENT_LIGHT1_SGIX           0x840D
+#define GL_FRAGMENT_LIGHT2_SGIX           0x840E
+#define GL_FRAGMENT_LIGHT3_SGIX           0x840F
+#define GL_FRAGMENT_LIGHT4_SGIX           0x8410
+#define GL_FRAGMENT_LIGHT5_SGIX           0x8411
+#define GL_FRAGMENT_LIGHT6_SGIX           0x8412
+#define GL_FRAGMENT_LIGHT7_SGIX           0x8413
+#endif
+
+#ifndef GL_IBM_rasterpos_clip
+#define GL_RASTER_POSITION_UNCLIPPED_IBM  0x19262
+#endif
+
+#ifndef GL_HP_texture_lighting
+#define GL_TEXTURE_LIGHTING_MODE_HP       0x8167
+#define GL_TEXTURE_POST_SPECULAR_HP       0x8168
+#define GL_TEXTURE_PRE_SPECULAR_HP        0x8169
+#endif
+
+#ifndef GL_EXT_draw_range_elements
+#define GL_MAX_ELEMENTS_VERTICES_EXT      0x80E8
+#define GL_MAX_ELEMENTS_INDICES_EXT       0x80E9
+#endif
+
+#ifndef GL_WIN_phong_shading
+#define GL_PHONG_WIN                      0x80EA
+#define GL_PHONG_HINT_WIN                 0x80EB
+#endif
+
+#ifndef GL_WIN_specular_fog
+#define GL_FOG_SPECULAR_TEXTURE_WIN       0x80EC
+#endif
+
+#ifndef GL_EXT_light_texture
+#define GL_FRAGMENT_MATERIAL_EXT          0x8349
+#define GL_FRAGMENT_NORMAL_EXT            0x834A
+#define GL_FRAGMENT_COLOR_EXT             0x834C
+#define GL_ATTENUATION_EXT                0x834D
+#define GL_SHADOW_ATTENUATION_EXT         0x834E
+#define GL_TEXTURE_APPLICATION_MODE_EXT   0x834F
+#define GL_TEXTURE_LIGHT_EXT              0x8350
+#define GL_TEXTURE_MATERIAL_FACE_EXT      0x8351
+#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352
+/* reuse GL_FRAGMENT_DEPTH_EXT */
+#endif
+
+#ifndef GL_SGIX_blend_alpha_minmax
+#define GL_ALPHA_MIN_SGIX                 0x8320
+#define GL_ALPHA_MAX_SGIX                 0x8321
+#endif
+
+#ifndef GL_SGIX_impact_pixel_texture
+#define GL_PIXEL_TEX_GEN_Q_CEILING_SGIX   0x8184
+#define GL_PIXEL_TEX_GEN_Q_ROUND_SGIX     0x8185
+#define GL_PIXEL_TEX_GEN_Q_FLOOR_SGIX     0x8186
+#define GL_PIXEL_TEX_GEN_ALPHA_REPLACE_SGIX 0x8187
+#define GL_PIXEL_TEX_GEN_ALPHA_NO_REPLACE_SGIX 0x8188
+#define GL_PIXEL_TEX_GEN_ALPHA_LS_SGIX    0x8189
+#define GL_PIXEL_TEX_GEN_ALPHA_MS_SGIX    0x818A
+#endif
+
+#ifndef GL_EXT_bgra
+#define GL_BGR_EXT                        0x80E0
+#define GL_BGRA_EXT                       0x80E1
+#endif
+
+#ifndef GL_SGIX_async
+#define GL_ASYNC_MARKER_SGIX              0x8329
+#endif
+
+#ifndef GL_SGIX_async_pixel
+#define GL_ASYNC_TEX_IMAGE_SGIX           0x835C
+#define GL_ASYNC_DRAW_PIXELS_SGIX         0x835D
+#define GL_ASYNC_READ_PIXELS_SGIX         0x835E
+#define GL_MAX_ASYNC_TEX_IMAGE_SGIX       0x835F
+#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX     0x8360
+#define GL_MAX_ASYNC_READ_PIXELS_SGIX     0x8361
+#endif
+
+#ifndef GL_SGIX_async_histogram
+#define GL_ASYNC_HISTOGRAM_SGIX           0x832C
+#define GL_MAX_ASYNC_HISTOGRAM_SGIX       0x832D
+#endif
+
+#ifndef GL_INTEL_texture_scissor
+#endif
+
+#ifndef GL_INTEL_parallel_arrays
+#define GL_PARALLEL_ARRAYS_INTEL          0x83F4
+#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5
+#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6
+#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7
+#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8
+#endif
+
+#ifndef GL_HP_occlusion_test
+#define GL_OCCLUSION_TEST_HP              0x8165
+#define GL_OCCLUSION_TEST_RESULT_HP       0x8166
+#endif
+
+#ifndef GL_EXT_pixel_transform
+#define GL_PIXEL_TRANSFORM_2D_EXT         0x8330
+#define GL_PIXEL_MAG_FILTER_EXT           0x8331
+#define GL_PIXEL_MIN_FILTER_EXT           0x8332
+#define GL_PIXEL_CUBIC_WEIGHT_EXT         0x8333
+#define GL_CUBIC_EXT                      0x8334
+#define GL_AVERAGE_EXT                    0x8335
+#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336
+#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337
+#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT  0x8338
+#endif
+
+#ifndef GL_EXT_pixel_transform_color_table
+#endif
+
+#ifndef GL_EXT_shared_texture_palette
+#define GL_SHARED_TEXTURE_PALETTE_EXT     0x81FB
+#endif
+
+#ifndef GL_EXT_separate_specular_color
+#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT  0x81F8
+#define GL_SINGLE_COLOR_EXT               0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR_EXT    0x81FA
+#endif
+
+#ifndef GL_EXT_secondary_color
+#define GL_COLOR_SUM_EXT                  0x8458
+#define GL_CURRENT_SECONDARY_COLOR_EXT    0x8459
+#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A
+#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C
+#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D
+#define GL_SECONDARY_COLOR_ARRAY_EXT      0x845E
+#endif
+
+#ifndef GL_EXT_texture_perturb_normal
+#define GL_PERTURB_EXT                    0x85AE
+#define GL_TEXTURE_NORMAL_EXT             0x85AF
+#endif
+
+#ifndef GL_EXT_multi_draw_arrays
+#endif
+
+#ifndef GL_EXT_fog_coord
+#define GL_FOG_COORDINATE_SOURCE_EXT      0x8450
+#define GL_FOG_COORDINATE_EXT             0x8451
+#define GL_FRAGMENT_DEPTH_EXT             0x8452
+#define GL_CURRENT_FOG_COORDINATE_EXT     0x8453
+#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT  0x8454
+#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455
+#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456
+#define GL_FOG_COORDINATE_ARRAY_EXT       0x8457
+#endif
+
+#ifndef GL_REND_screen_coordinates
+#define GL_SCREEN_COORDINATES_REND        0x8490
+#define GL_INVERTED_SCREEN_W_REND         0x8491
+#endif
+
+#ifndef GL_EXT_coordinate_frame
+#define GL_TANGENT_ARRAY_EXT              0x8439
+#define GL_BINORMAL_ARRAY_EXT             0x843A
+#define GL_CURRENT_TANGENT_EXT            0x843B
+#define GL_CURRENT_BINORMAL_EXT           0x843C
+#define GL_TANGENT_ARRAY_TYPE_EXT         0x843E
+#define GL_TANGENT_ARRAY_STRIDE_EXT       0x843F
+#define GL_BINORMAL_ARRAY_TYPE_EXT        0x8440
+#define GL_BINORMAL_ARRAY_STRIDE_EXT      0x8441
+#define GL_TANGENT_ARRAY_POINTER_EXT      0x8442
+#define GL_BINORMAL_ARRAY_POINTER_EXT     0x8443
+#define GL_MAP1_TANGENT_EXT               0x8444
+#define GL_MAP2_TANGENT_EXT               0x8445
+#define GL_MAP1_BINORMAL_EXT              0x8446
+#define GL_MAP2_BINORMAL_EXT              0x8447
+#endif
+
+#ifndef GL_EXT_texture_env_combine
+#define GL_COMBINE_EXT                    0x8570
+#define GL_COMBINE_RGB_EXT                0x8571
+#define GL_COMBINE_ALPHA_EXT              0x8572
+#define GL_RGB_SCALE_EXT                  0x8573
+#define GL_ADD_SIGNED_EXT                 0x8574
+#define GL_INTERPOLATE_EXT                0x8575
+#define GL_CONSTANT_EXT                   0x8576
+#define GL_PRIMARY_COLOR_EXT              0x8577
+#define GL_PREVIOUS_EXT                   0x8578
+#define GL_SOURCE0_RGB_EXT                0x8580
+#define GL_SOURCE1_RGB_EXT                0x8581
+#define GL_SOURCE2_RGB_EXT                0x8582
+#define GL_SOURCE0_ALPHA_EXT              0x8588
+#define GL_SOURCE1_ALPHA_EXT              0x8589
+#define GL_SOURCE2_ALPHA_EXT              0x858A
+#define GL_OPERAND0_RGB_EXT               0x8590
+#define GL_OPERAND1_RGB_EXT               0x8591
+#define GL_OPERAND2_RGB_EXT               0x8592
+#define GL_OPERAND0_ALPHA_EXT             0x8598
+#define GL_OPERAND1_ALPHA_EXT             0x8599
+#define GL_OPERAND2_ALPHA_EXT             0x859A
+#endif
+
+#ifndef GL_APPLE_specular_vector
+#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0
+#endif
+
+#ifndef GL_APPLE_transform_hint
+#define GL_TRANSFORM_HINT_APPLE           0x85B1
+#endif
+
+#ifndef GL_SGIX_fog_scale
+#define GL_FOG_SCALE_SGIX                 0x81FC
+#define GL_FOG_SCALE_VALUE_SGIX           0x81FD
+#endif
+
+#ifndef GL_SUNX_constant_data
+#define GL_UNPACK_CONSTANT_DATA_SUNX      0x81D5
+#define GL_TEXTURE_CONSTANT_DATA_SUNX     0x81D6
+#endif
+
+#ifndef GL_SUN_global_alpha
+#define GL_GLOBAL_ALPHA_SUN               0x81D9
+#define GL_GLOBAL_ALPHA_FACTOR_SUN        0x81DA
+#endif
+
+#ifndef GL_SUN_triangle_list
+#define GL_RESTART_SUN                    0x0001
+#define GL_REPLACE_MIDDLE_SUN             0x0002
+#define GL_REPLACE_OLDEST_SUN             0x0003
+#define GL_TRIANGLE_LIST_SUN              0x81D7
+#define GL_REPLACEMENT_CODE_SUN           0x81D8
+#define GL_REPLACEMENT_CODE_ARRAY_SUN     0x85C0
+#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1
+#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2
+#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3
+#define GL_R1UI_V3F_SUN                   0x85C4
+#define GL_R1UI_C4UB_V3F_SUN              0x85C5
+#define GL_R1UI_C3F_V3F_SUN               0x85C6
+#define GL_R1UI_N3F_V3F_SUN               0x85C7
+#define GL_R1UI_C4F_N3F_V3F_SUN           0x85C8
+#define GL_R1UI_T2F_V3F_SUN               0x85C9
+#define GL_R1UI_T2F_N3F_V3F_SUN           0x85CA
+#define GL_R1UI_T2F_C4F_N3F_V3F_SUN       0x85CB
+#endif
+
+#ifndef GL_SUN_vertex
+#endif
+
+#ifndef GL_EXT_blend_func_separate
+#define GL_BLEND_DST_RGB_EXT              0x80C8
+#define GL_BLEND_SRC_RGB_EXT              0x80C9
+#define GL_BLEND_DST_ALPHA_EXT            0x80CA
+#define GL_BLEND_SRC_ALPHA_EXT            0x80CB
+#endif
+
+#ifndef GL_INGR_color_clamp
+#define GL_RED_MIN_CLAMP_INGR             0x8560
+#define GL_GREEN_MIN_CLAMP_INGR           0x8561
+#define GL_BLUE_MIN_CLAMP_INGR            0x8562
+#define GL_ALPHA_MIN_CLAMP_INGR           0x8563
+#define GL_RED_MAX_CLAMP_INGR             0x8564
+#define GL_GREEN_MAX_CLAMP_INGR           0x8565
+#define GL_BLUE_MAX_CLAMP_INGR            0x8566
+#define GL_ALPHA_MAX_CLAMP_INGR           0x8567
+#endif
+
+#ifndef GL_INGR_interlace_read
+#define GL_INTERLACE_READ_INGR            0x8568
+#endif
+
+#ifndef GL_EXT_stencil_wrap
+#define GL_INCR_WRAP_EXT                  0x8507
+#define GL_DECR_WRAP_EXT                  0x8508
+#endif
+
+#ifndef GL_EXT_422_pixels
+#define GL_422_EXT                        0x80CC
+#define GL_422_REV_EXT                    0x80CD
+#define GL_422_AVERAGE_EXT                0x80CE
+#define GL_422_REV_AVERAGE_EXT            0x80CF
+#endif
+
+#ifndef GL_NV_texgen_reflection
+#define GL_NORMAL_MAP_NV                  0x8511
+#define GL_REFLECTION_MAP_NV              0x8512
+#endif
+
+#ifndef GL_EXT_texture_cube_map
+#define GL_NORMAL_MAP_EXT                 0x8511
+#define GL_REFLECTION_MAP_EXT             0x8512
+#define GL_TEXTURE_CUBE_MAP_EXT           0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_EXT   0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_EXT     0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT  0x851C
+#endif
+
+#ifndef GL_SUN_convolution_border_modes
+#define GL_WRAP_BORDER_SUN                0x81D4
+#endif
+
+#ifndef GL_EXT_texture_env_add
+#endif
+
+#ifndef GL_EXT_texture_lod_bias
+#define GL_MAX_TEXTURE_LOD_BIAS_EXT       0x84FD
+#define GL_TEXTURE_FILTER_CONTROL_EXT     0x8500
+#define GL_TEXTURE_LOD_BIAS_EXT           0x8501
+#endif
+
+#ifndef GL_EXT_texture_filter_anisotropic
+#define GL_TEXTURE_MAX_ANISOTROPY_EXT     0x84FE
+#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
+#endif
+
+#ifndef GL_EXT_vertex_weighting
+#define GL_MODELVIEW0_STACK_DEPTH_EXT     GL_MODELVIEW_STACK_DEPTH
+#define GL_MODELVIEW1_STACK_DEPTH_EXT     0x8502
+#define GL_MODELVIEW0_MATRIX_EXT          GL_MODELVIEW_MATRIX
+#define GL_MODELVIEW1_MATRIX_EXT          0x8506
+#define GL_VERTEX_WEIGHTING_EXT           0x8509
+#define GL_MODELVIEW0_EXT                 GL_MODELVIEW
+#define GL_MODELVIEW1_EXT                 0x850A
+#define GL_CURRENT_VERTEX_WEIGHT_EXT      0x850B
+#define GL_VERTEX_WEIGHT_ARRAY_EXT        0x850C
+#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT   0x850D
+#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT   0x850E
+#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F
+#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510
+#endif
+
+#ifndef GL_NV_light_max_exponent
+#define GL_MAX_SHININESS_NV               0x8504
+#define GL_MAX_SPOT_EXPONENT_NV           0x8505
+#endif
+
+#ifndef GL_NV_vertex_array_range
+#define GL_VERTEX_ARRAY_RANGE_NV          0x851D
+#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV   0x851E
+#define GL_VERTEX_ARRAY_RANGE_VALID_NV    0x851F
+#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520
+#define GL_VERTEX_ARRAY_RANGE_POINTER_NV  0x8521
+#endif
+
+#ifndef GL_NV_register_combiners
+#define GL_REGISTER_COMBINERS_NV          0x8522
+#define GL_VARIABLE_A_NV                  0x8523
+#define GL_VARIABLE_B_NV                  0x8524
+#define GL_VARIABLE_C_NV                  0x8525
+#define GL_VARIABLE_D_NV                  0x8526
+#define GL_VARIABLE_E_NV                  0x8527
+#define GL_VARIABLE_F_NV                  0x8528
+#define GL_VARIABLE_G_NV                  0x8529
+#define GL_CONSTANT_COLOR0_NV             0x852A
+#define GL_CONSTANT_COLOR1_NV             0x852B
+#define GL_PRIMARY_COLOR_NV               0x852C
+#define GL_SECONDARY_COLOR_NV             0x852D
+#define GL_SPARE0_NV                      0x852E
+#define GL_SPARE1_NV                      0x852F
+#define GL_DISCARD_NV                     0x8530
+#define GL_E_TIMES_F_NV                   0x8531
+#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532
+#define GL_UNSIGNED_IDENTITY_NV           0x8536
+#define GL_UNSIGNED_INVERT_NV             0x8537
+#define GL_EXPAND_NORMAL_NV               0x8538
+#define GL_EXPAND_NEGATE_NV               0x8539
+#define GL_HALF_BIAS_NORMAL_NV            0x853A
+#define GL_HALF_BIAS_NEGATE_NV            0x853B
+#define GL_SIGNED_IDENTITY_NV             0x853C
+#define GL_SIGNED_NEGATE_NV               0x853D
+#define GL_SCALE_BY_TWO_NV                0x853E
+#define GL_SCALE_BY_FOUR_NV               0x853F
+#define GL_SCALE_BY_ONE_HALF_NV           0x8540
+#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV   0x8541
+#define GL_COMBINER_INPUT_NV              0x8542
+#define GL_COMBINER_MAPPING_NV            0x8543
+#define GL_COMBINER_COMPONENT_USAGE_NV    0x8544
+#define GL_COMBINER_AB_DOT_PRODUCT_NV     0x8545
+#define GL_COMBINER_CD_DOT_PRODUCT_NV     0x8546
+#define GL_COMBINER_MUX_SUM_NV            0x8547
+#define GL_COMBINER_SCALE_NV              0x8548
+#define GL_COMBINER_BIAS_NV               0x8549
+#define GL_COMBINER_AB_OUTPUT_NV          0x854A
+#define GL_COMBINER_CD_OUTPUT_NV          0x854B
+#define GL_COMBINER_SUM_OUTPUT_NV         0x854C
+#define GL_MAX_GENERAL_COMBINERS_NV       0x854D
+#define GL_NUM_GENERAL_COMBINERS_NV       0x854E
+#define GL_COLOR_SUM_CLAMP_NV             0x854F
+#define GL_COMBINER0_NV                   0x8550
+#define GL_COMBINER1_NV                   0x8551
+#define GL_COMBINER2_NV                   0x8552
+#define GL_COMBINER3_NV                   0x8553
+#define GL_COMBINER4_NV                   0x8554
+#define GL_COMBINER5_NV                   0x8555
+#define GL_COMBINER6_NV                   0x8556
+#define GL_COMBINER7_NV                   0x8557
+/* reuse GL_TEXTURE0_ARB */
+/* reuse GL_TEXTURE1_ARB */
+/* reuse GL_ZERO */
+/* reuse GL_NONE */
+/* reuse GL_FOG */
+#endif
+
+#ifndef GL_NV_fog_distance
+#define GL_FOG_DISTANCE_MODE_NV           0x855A
+#define GL_EYE_RADIAL_NV                  0x855B
+#define GL_EYE_PLANE_ABSOLUTE_NV          0x855C
+/* reuse GL_EYE_PLANE */
+#endif
+
+#ifndef GL_NV_texgen_emboss
+#define GL_EMBOSS_LIGHT_NV                0x855D
+#define GL_EMBOSS_CONSTANT_NV             0x855E
+#define GL_EMBOSS_MAP_NV                  0x855F
+#endif
+
+#ifndef GL_NV_blend_square
+#endif
+
+#ifndef GL_NV_texture_env_combine4
+#define GL_COMBINE4_NV                    0x8503
+#define GL_SOURCE3_RGB_NV                 0x8583
+#define GL_SOURCE3_ALPHA_NV               0x858B
+#define GL_OPERAND3_RGB_NV                0x8593
+#define GL_OPERAND3_ALPHA_NV              0x859B
+#endif
+
+#ifndef GL_MESA_resize_buffers
+#endif
+
+#ifndef GL_MESA_window_pos
+#endif
+
+#ifndef GL_EXT_texture_compression_s3tc
+#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT   0x83F0
+#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT  0x83F1
+#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT  0x83F2
+#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT  0x83F3
+#endif
+
+#ifndef GL_IBM_cull_vertex
+#define GL_CULL_VERTEX_IBM                103050
+#endif
+
+#ifndef GL_IBM_multimode_draw_arrays
+#endif
+
+#ifndef GL_IBM_vertex_array_lists
+#define GL_VERTEX_ARRAY_LIST_IBM          103070
+#define GL_NORMAL_ARRAY_LIST_IBM          103071
+#define GL_COLOR_ARRAY_LIST_IBM           103072
+#define GL_INDEX_ARRAY_LIST_IBM           103073
+#define GL_TEXTURE_COORD_ARRAY_LIST_IBM   103074
+#define GL_EDGE_FLAG_ARRAY_LIST_IBM       103075
+#define GL_FOG_COORDINATE_ARRAY_LIST_IBM  103076
+#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077
+#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM   103080
+#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM   103081
+#define GL_COLOR_ARRAY_LIST_STRIDE_IBM    103082
+#define GL_INDEX_ARRAY_LIST_STRIDE_IBM    103083
+#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084
+#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085
+#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086
+#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087
+#endif
+
+#ifndef GL_SGIX_subsample
+#define GL_PACK_SUBSAMPLE_RATE_SGIX       0x85A0
+#define GL_UNPACK_SUBSAMPLE_RATE_SGIX     0x85A1
+#define GL_PIXEL_SUBSAMPLE_4444_SGIX      0x85A2
+#define GL_PIXEL_SUBSAMPLE_2424_SGIX      0x85A3
+#define GL_PIXEL_SUBSAMPLE_4242_SGIX      0x85A4
+#endif
+
+#ifndef GL_SGIX_ycrcb_subsample
+#endif
+
+#ifndef GL_SGIX_ycrcba
+#define GL_YCRCB_SGIX                     0x8318
+#define GL_YCRCBA_SGIX                    0x8319
+#endif
+
+#ifndef GL_SGI_depth_pass_instrument
+#define GL_DEPTH_PASS_INSTRUMENT_SGIX     0x8310
+#define GL_DEPTH_PASS_INSTRUMENT_COUNTERS_SGIX 0x8311
+#define GL_DEPTH_PASS_INSTRUMENT_MAX_SGIX 0x8312
+#endif
+
+#ifndef GL_3DFX_texture_compression_FXT1
+#define GL_COMPRESSED_RGB_FXT1_3DFX       0x86B0
+#define GL_COMPRESSED_RGBA_FXT1_3DFX      0x86B1
+#endif
+
+#ifndef GL_3DFX_multisample
+#define GL_MULTISAMPLE_3DFX               0x86B2
+#define GL_SAMPLE_BUFFERS_3DFX            0x86B3
+#define GL_SAMPLES_3DFX                   0x86B4
+#define GL_MULTISAMPLE_BIT_3DFX           0x20000000
+#endif
+
+#ifndef GL_3DFX_tbuffer
+#endif
+
+#ifndef GL_EXT_multisample
+#define GL_MULTISAMPLE_EXT                0x809D
+#define GL_SAMPLE_ALPHA_TO_MASK_EXT       0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_EXT        0x809F
+#define GL_SAMPLE_MASK_EXT                0x80A0
+#define GL_1PASS_EXT                      0x80A1
+#define GL_2PASS_0_EXT                    0x80A2
+#define GL_2PASS_1_EXT                    0x80A3
+#define GL_4PASS_0_EXT                    0x80A4
+#define GL_4PASS_1_EXT                    0x80A5
+#define GL_4PASS_2_EXT                    0x80A6
+#define GL_4PASS_3_EXT                    0x80A7
+#define GL_SAMPLE_BUFFERS_EXT             0x80A8
+#define GL_SAMPLES_EXT                    0x80A9
+#define GL_SAMPLE_MASK_VALUE_EXT          0x80AA
+#define GL_SAMPLE_MASK_INVERT_EXT         0x80AB
+#define GL_SAMPLE_PATTERN_EXT             0x80AC
+#define GL_MULTISAMPLE_BIT_EXT            0x20000000
+#endif
+
+#ifndef GL_SGIX_vertex_preclip
+#define GL_VERTEX_PRECLIP_SGIX            0x83EE
+#define GL_VERTEX_PRECLIP_HINT_SGIX       0x83EF
+#endif
+
+#ifndef GL_SGIX_convolution_accuracy
+#define GL_CONVOLUTION_HINT_SGIX          0x8316
+#endif
+
+#ifndef GL_SGIX_resample
+#define GL_PACK_RESAMPLE_SGIX             0x842C
+#define GL_UNPACK_RESAMPLE_SGIX           0x842D
+#define GL_RESAMPLE_REPLICATE_SGIX        0x842E
+#define GL_RESAMPLE_ZERO_FILL_SGIX        0x842F
+#define GL_RESAMPLE_DECIMATE_SGIX         0x8430
+#endif
+
+#ifndef GL_SGIS_point_line_texgen
+#define GL_EYE_DISTANCE_TO_POINT_SGIS     0x81F0
+#define GL_OBJECT_DISTANCE_TO_POINT_SGIS  0x81F1
+#define GL_EYE_DISTANCE_TO_LINE_SGIS      0x81F2
+#define GL_OBJECT_DISTANCE_TO_LINE_SGIS   0x81F3
+#define GL_EYE_POINT_SGIS                 0x81F4
+#define GL_OBJECT_POINT_SGIS              0x81F5
+#define GL_EYE_LINE_SGIS                  0x81F6
+#define GL_OBJECT_LINE_SGIS               0x81F7
+#endif
+
+#ifndef GL_SGIS_texture_color_mask
+#define GL_TEXTURE_COLOR_WRITEMASK_SGIS   0x81EF
+#endif
+
+#ifndef GL_EXT_texture_env_dot3
+#define GL_DOT3_RGB_EXT                   0x8740
+#define GL_DOT3_RGBA_EXT                  0x8741
+#endif
+
+#ifndef GL_ATI_texture_mirror_once
+#define GL_MIRROR_CLAMP_ATI               0x8742
+#define GL_MIRROR_CLAMP_TO_EDGE_ATI       0x8743
+#endif
+
+#ifndef GL_NV_fence
+#define GL_ALL_COMPLETED_NV               0x84F2
+#define GL_FENCE_STATUS_NV                0x84F3
+#define GL_FENCE_CONDITION_NV             0x84F4
+#endif
+
+#ifndef GL_IBM_texture_mirrored_repeat
+#define GL_MIRRORED_REPEAT_IBM            0x8370
+#endif
+
+#ifndef GL_NV_evaluators
+#define GL_EVAL_2D_NV                     0x86C0
+#define GL_EVAL_TRIANGULAR_2D_NV          0x86C1
+#define GL_MAP_TESSELLATION_NV            0x86C2
+#define GL_MAP_ATTRIB_U_ORDER_NV          0x86C3
+#define GL_MAP_ATTRIB_V_ORDER_NV          0x86C4
+#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5
+#define GL_EVAL_VERTEX_ATTRIB0_NV         0x86C6
+#define GL_EVAL_VERTEX_ATTRIB1_NV         0x86C7
+#define GL_EVAL_VERTEX_ATTRIB2_NV         0x86C8
+#define GL_EVAL_VERTEX_ATTRIB3_NV         0x86C9
+#define GL_EVAL_VERTEX_ATTRIB4_NV         0x86CA
+#define GL_EVAL_VERTEX_ATTRIB5_NV         0x86CB
+#define GL_EVAL_VERTEX_ATTRIB6_NV         0x86CC
+#define GL_EVAL_VERTEX_ATTRIB7_NV         0x86CD
+#define GL_EVAL_VERTEX_ATTRIB8_NV         0x86CE
+#define GL_EVAL_VERTEX_ATTRIB9_NV         0x86CF
+#define GL_EVAL_VERTEX_ATTRIB10_NV        0x86D0
+#define GL_EVAL_VERTEX_ATTRIB11_NV        0x86D1
+#define GL_EVAL_VERTEX_ATTRIB12_NV        0x86D2
+#define GL_EVAL_VERTEX_ATTRIB13_NV        0x86D3
+#define GL_EVAL_VERTEX_ATTRIB14_NV        0x86D4
+#define GL_EVAL_VERTEX_ATTRIB15_NV        0x86D5
+#define GL_MAX_MAP_TESSELLATION_NV        0x86D6
+#define GL_MAX_RATIONAL_EVAL_ORDER_NV     0x86D7
+#endif
+
+#ifndef GL_NV_packed_depth_stencil
+#define GL_DEPTH_STENCIL_NV               0x84F9
+#define GL_UNSIGNED_INT_24_8_NV           0x84FA
+#endif
+
+#ifndef GL_NV_register_combiners2
+#define GL_PER_STAGE_CONSTANTS_NV         0x8535
+#endif
+
+#ifndef GL_NV_texture_compression_vtc
+#endif
+
+#ifndef GL_NV_texture_rectangle
+#define GL_TEXTURE_RECTANGLE_NV           0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE_NV   0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE_NV     0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV  0x84F8
+#endif
+
+#ifndef GL_NV_texture_shader
+#define GL_OFFSET_TEXTURE_RECTANGLE_NV    0x864C
+#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D
+#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E
+#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9
+#define GL_UNSIGNED_INT_S8_S8_8_8_NV      0x86DA
+#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV  0x86DB
+#define GL_DSDT_MAG_INTENSITY_NV          0x86DC
+#define GL_SHADER_CONSISTENT_NV           0x86DD
+#define GL_TEXTURE_SHADER_NV              0x86DE
+#define GL_SHADER_OPERATION_NV            0x86DF
+#define GL_CULL_MODES_NV                  0x86E0
+#define GL_OFFSET_TEXTURE_MATRIX_NV       0x86E1
+#define GL_OFFSET_TEXTURE_SCALE_NV        0x86E2
+#define GL_OFFSET_TEXTURE_BIAS_NV         0x86E3
+#define GL_OFFSET_TEXTURE_2D_MATRIX_NV    GL_OFFSET_TEXTURE_MATRIX_NV
+#define GL_OFFSET_TEXTURE_2D_SCALE_NV     GL_OFFSET_TEXTURE_SCALE_NV
+#define GL_OFFSET_TEXTURE_2D_BIAS_NV      GL_OFFSET_TEXTURE_BIAS_NV
+#define GL_PREVIOUS_TEXTURE_INPUT_NV      0x86E4
+#define GL_CONST_EYE_NV                   0x86E5
+#define GL_PASS_THROUGH_NV                0x86E6
+#define GL_CULL_FRAGMENT_NV               0x86E7
+#define GL_OFFSET_TEXTURE_2D_NV           0x86E8
+#define GL_DEPENDENT_AR_TEXTURE_2D_NV     0x86E9
+#define GL_DEPENDENT_GB_TEXTURE_2D_NV     0x86EA
+#define GL_DOT_PRODUCT_NV                 0x86EC
+#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV   0x86ED
+#define GL_DOT_PRODUCT_TEXTURE_2D_NV      0x86EE
+#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0
+#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1
+#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2
+#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3
+#define GL_HILO_NV                        0x86F4
+#define GL_DSDT_NV                        0x86F5
+#define GL_DSDT_MAG_NV                    0x86F6
+#define GL_DSDT_MAG_VIB_NV                0x86F7
+#define GL_HILO16_NV                      0x86F8
+#define GL_SIGNED_HILO_NV                 0x86F9
+#define GL_SIGNED_HILO16_NV               0x86FA
+#define GL_SIGNED_RGBA_NV                 0x86FB
+#define GL_SIGNED_RGBA8_NV                0x86FC
+#define GL_SIGNED_RGB_NV                  0x86FE
+#define GL_SIGNED_RGB8_NV                 0x86FF
+#define GL_SIGNED_LUMINANCE_NV            0x8701
+#define GL_SIGNED_LUMINANCE8_NV           0x8702
+#define GL_SIGNED_LUMINANCE_ALPHA_NV      0x8703
+#define GL_SIGNED_LUMINANCE8_ALPHA8_NV    0x8704
+#define GL_SIGNED_ALPHA_NV                0x8705
+#define GL_SIGNED_ALPHA8_NV               0x8706
+#define GL_SIGNED_INTENSITY_NV            0x8707
+#define GL_SIGNED_INTENSITY8_NV           0x8708
+#define GL_DSDT8_NV                       0x8709
+#define GL_DSDT8_MAG8_NV                  0x870A
+#define GL_DSDT8_MAG8_INTENSITY8_NV       0x870B
+#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV   0x870C
+#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D
+#define GL_HI_SCALE_NV                    0x870E
+#define GL_LO_SCALE_NV                    0x870F
+#define GL_DS_SCALE_NV                    0x8710
+#define GL_DT_SCALE_NV                    0x8711
+#define GL_MAGNITUDE_SCALE_NV             0x8712
+#define GL_VIBRANCE_SCALE_NV              0x8713
+#define GL_HI_BIAS_NV                     0x8714
+#define GL_LO_BIAS_NV                     0x8715
+#define GL_DS_BIAS_NV                     0x8716
+#define GL_DT_BIAS_NV                     0x8717
+#define GL_MAGNITUDE_BIAS_NV              0x8718
+#define GL_VIBRANCE_BIAS_NV               0x8719
+#define GL_TEXTURE_BORDER_VALUES_NV       0x871A
+#define GL_TEXTURE_HI_SIZE_NV             0x871B
+#define GL_TEXTURE_LO_SIZE_NV             0x871C
+#define GL_TEXTURE_DS_SIZE_NV             0x871D
+#define GL_TEXTURE_DT_SIZE_NV             0x871E
+#define GL_TEXTURE_MAG_SIZE_NV            0x871F
+#endif
+
+#ifndef GL_NV_texture_shader2
+#define GL_DOT_PRODUCT_TEXTURE_3D_NV      0x86EF
+#endif
+
+#ifndef GL_NV_vertex_array_range2
+#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533
+#endif
+
+#ifndef GL_NV_vertex_program
+#define GL_VERTEX_PROGRAM_NV              0x8620
+#define GL_VERTEX_STATE_PROGRAM_NV        0x8621
+#define GL_ATTRIB_ARRAY_SIZE_NV           0x8623
+#define GL_ATTRIB_ARRAY_STRIDE_NV         0x8624
+#define GL_ATTRIB_ARRAY_TYPE_NV           0x8625
+#define GL_CURRENT_ATTRIB_NV              0x8626
+#define GL_PROGRAM_LENGTH_NV              0x8627
+#define GL_PROGRAM_STRING_NV              0x8628
+#define GL_MODELVIEW_PROJECTION_NV        0x8629
+#define GL_IDENTITY_NV                    0x862A
+#define GL_INVERSE_NV                     0x862B
+#define GL_TRANSPOSE_NV                   0x862C
+#define GL_INVERSE_TRANSPOSE_NV           0x862D
+#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E
+#define GL_MAX_TRACK_MATRICES_NV          0x862F
+#define GL_MATRIX0_NV                     0x8630
+#define GL_MATRIX1_NV                     0x8631
+#define GL_MATRIX2_NV                     0x8632
+#define GL_MATRIX3_NV                     0x8633
+#define GL_MATRIX4_NV                     0x8634
+#define GL_MATRIX5_NV                     0x8635
+#define GL_MATRIX6_NV                     0x8636
+#define GL_MATRIX7_NV                     0x8637
+#define GL_CURRENT_MATRIX_STACK_DEPTH_NV  0x8640
+#define GL_CURRENT_MATRIX_NV              0x8641
+#define GL_VERTEX_PROGRAM_POINT_SIZE_NV   0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE_NV     0x8643
+#define GL_PROGRAM_PARAMETER_NV           0x8644
+#define GL_ATTRIB_ARRAY_POINTER_NV        0x8645
+#define GL_PROGRAM_TARGET_NV              0x8646
+#define GL_PROGRAM_RESIDENT_NV            0x8647
+#define GL_TRACK_MATRIX_NV                0x8648
+#define GL_TRACK_MATRIX_TRANSFORM_NV      0x8649
+#define GL_VERTEX_PROGRAM_BINDING_NV      0x864A
+#define GL_PROGRAM_ERROR_POSITION_NV      0x864B
+#define GL_VERTEX_ATTRIB_ARRAY0_NV        0x8650
+#define GL_VERTEX_ATTRIB_ARRAY1_NV        0x8651
+#define GL_VERTEX_ATTRIB_ARRAY2_NV        0x8652
+#define GL_VERTEX_ATTRIB_ARRAY3_NV        0x8653
+#define GL_VERTEX_ATTRIB_ARRAY4_NV        0x8654
+#define GL_VERTEX_ATTRIB_ARRAY5_NV        0x8655
+#define GL_VERTEX_ATTRIB_ARRAY6_NV        0x8656
+#define GL_VERTEX_ATTRIB_ARRAY7_NV        0x8657
+#define GL_VERTEX_ATTRIB_ARRAY8_NV        0x8658
+#define GL_VERTEX_ATTRIB_ARRAY9_NV        0x8659
+#define GL_VERTEX_ATTRIB_ARRAY10_NV       0x865A
+#define GL_VERTEX_ATTRIB_ARRAY11_NV       0x865B
+#define GL_VERTEX_ATTRIB_ARRAY12_NV       0x865C
+#define GL_VERTEX_ATTRIB_ARRAY13_NV       0x865D
+#define GL_VERTEX_ATTRIB_ARRAY14_NV       0x865E
+#define GL_VERTEX_ATTRIB_ARRAY15_NV       0x865F
+#define GL_MAP1_VERTEX_ATTRIB0_4_NV       0x8660
+#define GL_MAP1_VERTEX_ATTRIB1_4_NV       0x8661
+#define GL_MAP1_VERTEX_ATTRIB2_4_NV       0x8662
+#define GL_MAP1_VERTEX_ATTRIB3_4_NV       0x8663
+#define GL_MAP1_VERTEX_ATTRIB4_4_NV       0x8664
+#define GL_MAP1_VERTEX_ATTRIB5_4_NV       0x8665
+#define GL_MAP1_VERTEX_ATTRIB6_4_NV       0x8666
+#define GL_MAP1_VERTEX_ATTRIB7_4_NV       0x8667
+#define GL_MAP1_VERTEX_ATTRIB8_4_NV       0x8668
+#define GL_MAP1_VERTEX_ATTRIB9_4_NV       0x8669
+#define GL_MAP1_VERTEX_ATTRIB10_4_NV      0x866A
+#define GL_MAP1_VERTEX_ATTRIB11_4_NV      0x866B
+#define GL_MAP1_VERTEX_ATTRIB12_4_NV      0x866C
+#define GL_MAP1_VERTEX_ATTRIB13_4_NV      0x866D
+#define GL_MAP1_VERTEX_ATTRIB14_4_NV      0x866E
+#define GL_MAP1_VERTEX_ATTRIB15_4_NV      0x866F
+#define GL_MAP2_VERTEX_ATTRIB0_4_NV       0x8670
+#define GL_MAP2_VERTEX_ATTRIB1_4_NV       0x8671
+#define GL_MAP2_VERTEX_ATTRIB2_4_NV       0x8672
+#define GL_MAP2_VERTEX_ATTRIB3_4_NV       0x8673
+#define GL_MAP2_VERTEX_ATTRIB4_4_NV       0x8674
+#define GL_MAP2_VERTEX_ATTRIB5_4_NV       0x8675
+#define GL_MAP2_VERTEX_ATTRIB6_4_NV       0x8676
+#define GL_MAP2_VERTEX_ATTRIB7_4_NV       0x8677
+#define GL_MAP2_VERTEX_ATTRIB8_4_NV       0x8678
+#define GL_MAP2_VERTEX_ATTRIB9_4_NV       0x8679
+#define GL_MAP2_VERTEX_ATTRIB10_4_NV      0x867A
+#define GL_MAP2_VERTEX_ATTRIB11_4_NV      0x867B
+#define GL_MAP2_VERTEX_ATTRIB12_4_NV      0x867C
+#define GL_MAP2_VERTEX_ATTRIB13_4_NV      0x867D
+#define GL_MAP2_VERTEX_ATTRIB14_4_NV      0x867E
+#define GL_MAP2_VERTEX_ATTRIB15_4_NV      0x867F
+#endif
+
+#ifndef GL_SGIX_texture_coordinate_clamp
+#define GL_TEXTURE_MAX_CLAMP_S_SGIX       0x8369
+#define GL_TEXTURE_MAX_CLAMP_T_SGIX       0x836A
+#define GL_TEXTURE_MAX_CLAMP_R_SGIX       0x836B
+#endif
+
+#ifndef GL_SGIX_scalebias_hint
+#define GL_SCALEBIAS_HINT_SGIX            0x8322
+#endif
+
+#ifndef GL_OML_interlace
+#define GL_INTERLACE_OML                  0x8980
+#define GL_INTERLACE_READ_OML             0x8981
+#endif
+
+#ifndef GL_OML_subsample
+#define GL_FORMAT_SUBSAMPLE_24_24_OML     0x8982
+#define GL_FORMAT_SUBSAMPLE_244_244_OML   0x8983
+#endif
+
+#ifndef GL_OML_resample
+#define GL_PACK_RESAMPLE_OML              0x8984
+#define GL_UNPACK_RESAMPLE_OML            0x8985
+#define GL_RESAMPLE_REPLICATE_OML         0x8986
+#define GL_RESAMPLE_ZERO_FILL_OML         0x8987
+#define GL_RESAMPLE_AVERAGE_OML           0x8988
+#define GL_RESAMPLE_DECIMATE_OML          0x8989
+#endif
+
+#ifndef GL_NV_copy_depth_to_color
+#define GL_DEPTH_STENCIL_TO_RGBA_NV       0x886E
+#define GL_DEPTH_STENCIL_TO_BGRA_NV       0x886F
+#endif
+
+#ifndef GL_ATI_envmap_bumpmap
+#define GL_BUMP_ROT_MATRIX_ATI            0x8775
+#define GL_BUMP_ROT_MATRIX_SIZE_ATI       0x8776
+#define GL_BUMP_NUM_TEX_UNITS_ATI         0x8777
+#define GL_BUMP_TEX_UNITS_ATI             0x8778
+#define GL_DUDV_ATI                       0x8779
+#define GL_DU8DV8_ATI                     0x877A
+#define GL_BUMP_ENVMAP_ATI                0x877B
+#define GL_BUMP_TARGET_ATI                0x877C
+#endif
+
+#ifndef GL_ATI_fragment_shader
+#define GL_FRAGMENT_SHADER_ATI            0x8920
+#define GL_REG_0_ATI                      0x8921
+#define GL_REG_1_ATI                      0x8922
+#define GL_REG_2_ATI                      0x8923
+#define GL_REG_3_ATI                      0x8924
+#define GL_REG_4_ATI                      0x8925
+#define GL_REG_5_ATI                      0x8926
+#define GL_REG_6_ATI                      0x8927
+#define GL_REG_7_ATI                      0x8928
+#define GL_REG_8_ATI                      0x8929
+#define GL_REG_9_ATI                      0x892A
+#define GL_REG_10_ATI                     0x892B
+#define GL_REG_11_ATI                     0x892C
+#define GL_REG_12_ATI                     0x892D
+#define GL_REG_13_ATI                     0x892E
+#define GL_REG_14_ATI                     0x892F
+#define GL_REG_15_ATI                     0x8930
+#define GL_REG_16_ATI                     0x8931
+#define GL_REG_17_ATI                     0x8932
+#define GL_REG_18_ATI                     0x8933
+#define GL_REG_19_ATI                     0x8934
+#define GL_REG_20_ATI                     0x8935
+#define GL_REG_21_ATI                     0x8936
+#define GL_REG_22_ATI                     0x8937
+#define GL_REG_23_ATI                     0x8938
+#define GL_REG_24_ATI                     0x8939
+#define GL_REG_25_ATI                     0x893A
+#define GL_REG_26_ATI                     0x893B
+#define GL_REG_27_ATI                     0x893C
+#define GL_REG_28_ATI                     0x893D
+#define GL_REG_29_ATI                     0x893E
+#define GL_REG_30_ATI                     0x893F
+#define GL_REG_31_ATI                     0x8940
+#define GL_CON_0_ATI                      0x8941
+#define GL_CON_1_ATI                      0x8942
+#define GL_CON_2_ATI                      0x8943
+#define GL_CON_3_ATI                      0x8944
+#define GL_CON_4_ATI                      0x8945
+#define GL_CON_5_ATI                      0x8946
+#define GL_CON_6_ATI                      0x8947
+#define GL_CON_7_ATI                      0x8948
+#define GL_CON_8_ATI                      0x8949
+#define GL_CON_9_ATI                      0x894A
+#define GL_CON_10_ATI                     0x894B
+#define GL_CON_11_ATI                     0x894C
+#define GL_CON_12_ATI                     0x894D
+#define GL_CON_13_ATI                     0x894E
+#define GL_CON_14_ATI                     0x894F
+#define GL_CON_15_ATI                     0x8950
+#define GL_CON_16_ATI                     0x8951
+#define GL_CON_17_ATI                     0x8952
+#define GL_CON_18_ATI                     0x8953
+#define GL_CON_19_ATI                     0x8954
+#define GL_CON_20_ATI                     0x8955
+#define GL_CON_21_ATI                     0x8956
+#define GL_CON_22_ATI                     0x8957
+#define GL_CON_23_ATI                     0x8958
+#define GL_CON_24_ATI                     0x8959
+#define GL_CON_25_ATI                     0x895A
+#define GL_CON_26_ATI                     0x895B
+#define GL_CON_27_ATI                     0x895C
+#define GL_CON_28_ATI                     0x895D
+#define GL_CON_29_ATI                     0x895E
+#define GL_CON_30_ATI                     0x895F
+#define GL_CON_31_ATI                     0x8960
+#define GL_MOV_ATI                        0x8961
+#define GL_ADD_ATI                        0x8963
+#define GL_MUL_ATI                        0x8964
+#define GL_SUB_ATI                        0x8965
+#define GL_DOT3_ATI                       0x8966
+#define GL_DOT4_ATI                       0x8967
+#define GL_MAD_ATI                        0x8968
+#define GL_LERP_ATI                       0x8969
+#define GL_CND_ATI                        0x896A
+#define GL_CND0_ATI                       0x896B
+#define GL_DOT2_ADD_ATI                   0x896C
+#define GL_SECONDARY_INTERPOLATOR_ATI     0x896D
+#define GL_NUM_FRAGMENT_REGISTERS_ATI     0x896E
+#define GL_NUM_FRAGMENT_CONSTANTS_ATI     0x896F
+#define GL_NUM_PASSES_ATI                 0x8970
+#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI  0x8971
+#define GL_NUM_INSTRUCTIONS_TOTAL_ATI     0x8972
+#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973
+#define GL_NUM_LOOPBACK_COMPONENTS_ATI    0x8974
+#define GL_COLOR_ALPHA_PAIRING_ATI        0x8975
+#define GL_SWIZZLE_STR_ATI                0x8976
+#define GL_SWIZZLE_STQ_ATI                0x8977
+#define GL_SWIZZLE_STR_DR_ATI             0x8978
+#define GL_SWIZZLE_STQ_DQ_ATI             0x8979
+#define GL_SWIZZLE_STRQ_ATI               0x897A
+#define GL_SWIZZLE_STRQ_DQ_ATI            0x897B
+#define GL_RED_BIT_ATI                    0x00000001
+#define GL_GREEN_BIT_ATI                  0x00000002
+#define GL_BLUE_BIT_ATI                   0x00000004
+#define GL_2X_BIT_ATI                     0x00000001
+#define GL_4X_BIT_ATI                     0x00000002
+#define GL_8X_BIT_ATI                     0x00000004
+#define GL_HALF_BIT_ATI                   0x00000008
+#define GL_QUARTER_BIT_ATI                0x00000010
+#define GL_EIGHTH_BIT_ATI                 0x00000020
+#define GL_SATURATE_BIT_ATI               0x00000040
+#define GL_COMP_BIT_ATI                   0x00000002
+#define GL_NEGATE_BIT_ATI                 0x00000004
+#define GL_BIAS_BIT_ATI                   0x00000008
+#endif
+
+#ifndef GL_ATI_pn_triangles
+#define GL_PN_TRIANGLES_ATI               0x87F0
+#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1
+#define GL_PN_TRIANGLES_POINT_MODE_ATI    0x87F2
+#define GL_PN_TRIANGLES_NORMAL_MODE_ATI   0x87F3
+#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4
+#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5
+#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6
+#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7
+#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8
+#endif
+
+#ifndef GL_ATI_vertex_array_object
+#define GL_STATIC_ATI                     0x8760
+#define GL_DYNAMIC_ATI                    0x8761
+#define GL_PRESERVE_ATI                   0x8762
+#define GL_DISCARD_ATI                    0x8763
+#define GL_OBJECT_BUFFER_SIZE_ATI         0x8764
+#define GL_OBJECT_BUFFER_USAGE_ATI        0x8765
+#define GL_ARRAY_OBJECT_BUFFER_ATI        0x8766
+#define GL_ARRAY_OBJECT_OFFSET_ATI        0x8767
+#endif
+
+#ifndef GL_EXT_vertex_shader
+#define GL_VERTEX_SHADER_EXT              0x8780
+#define GL_VERTEX_SHADER_BINDING_EXT      0x8781
+#define GL_OP_INDEX_EXT                   0x8782
+#define GL_OP_NEGATE_EXT                  0x8783
+#define GL_OP_DOT3_EXT                    0x8784
+#define GL_OP_DOT4_EXT                    0x8785
+#define GL_OP_MUL_EXT                     0x8786
+#define GL_OP_ADD_EXT                     0x8787
+#define GL_OP_MADD_EXT                    0x8788
+#define GL_OP_FRAC_EXT                    0x8789
+#define GL_OP_MAX_EXT                     0x878A
+#define GL_OP_MIN_EXT                     0x878B
+#define GL_OP_SET_GE_EXT                  0x878C
+#define GL_OP_SET_LT_EXT                  0x878D
+#define GL_OP_CLAMP_EXT                   0x878E
+#define GL_OP_FLOOR_EXT                   0x878F
+#define GL_OP_ROUND_EXT                   0x8790
+#define GL_OP_EXP_BASE_2_EXT              0x8791
+#define GL_OP_LOG_BASE_2_EXT              0x8792
+#define GL_OP_POWER_EXT                   0x8793
+#define GL_OP_RECIP_EXT                   0x8794
+#define GL_OP_RECIP_SQRT_EXT              0x8795
+#define GL_OP_SUB_EXT                     0x8796
+#define GL_OP_CROSS_PRODUCT_EXT           0x8797
+#define GL_OP_MULTIPLY_MATRIX_EXT         0x8798
+#define GL_OP_MOV_EXT                     0x8799
+#define GL_OUTPUT_VERTEX_EXT              0x879A
+#define GL_OUTPUT_COLOR0_EXT              0x879B
+#define GL_OUTPUT_COLOR1_EXT              0x879C
+#define GL_OUTPUT_TEXTURE_COORD0_EXT      0x879D
+#define GL_OUTPUT_TEXTURE_COORD1_EXT      0x879E
+#define GL_OUTPUT_TEXTURE_COORD2_EXT      0x879F
+#define GL_OUTPUT_TEXTURE_COORD3_EXT      0x87A0
+#define GL_OUTPUT_TEXTURE_COORD4_EXT      0x87A1
+#define GL_OUTPUT_TEXTURE_COORD5_EXT      0x87A2
+#define GL_OUTPUT_TEXTURE_COORD6_EXT      0x87A3
+#define GL_OUTPUT_TEXTURE_COORD7_EXT      0x87A4
+#define GL_OUTPUT_TEXTURE_COORD8_EXT      0x87A5
+#define GL_OUTPUT_TEXTURE_COORD9_EXT      0x87A6
+#define GL_OUTPUT_TEXTURE_COORD10_EXT     0x87A7
+#define GL_OUTPUT_TEXTURE_COORD11_EXT     0x87A8
+#define GL_OUTPUT_TEXTURE_COORD12_EXT     0x87A9
+#define GL_OUTPUT_TEXTURE_COORD13_EXT     0x87AA
+#define GL_OUTPUT_TEXTURE_COORD14_EXT     0x87AB
+#define GL_OUTPUT_TEXTURE_COORD15_EXT     0x87AC
+#define GL_OUTPUT_TEXTURE_COORD16_EXT     0x87AD
+#define GL_OUTPUT_TEXTURE_COORD17_EXT     0x87AE
+#define GL_OUTPUT_TEXTURE_COORD18_EXT     0x87AF
+#define GL_OUTPUT_TEXTURE_COORD19_EXT     0x87B0
+#define GL_OUTPUT_TEXTURE_COORD20_EXT     0x87B1
+#define GL_OUTPUT_TEXTURE_COORD21_EXT     0x87B2
+#define GL_OUTPUT_TEXTURE_COORD22_EXT     0x87B3
+#define GL_OUTPUT_TEXTURE_COORD23_EXT     0x87B4
+#define GL_OUTPUT_TEXTURE_COORD24_EXT     0x87B5
+#define GL_OUTPUT_TEXTURE_COORD25_EXT     0x87B6
+#define GL_OUTPUT_TEXTURE_COORD26_EXT     0x87B7
+#define GL_OUTPUT_TEXTURE_COORD27_EXT     0x87B8
+#define GL_OUTPUT_TEXTURE_COORD28_EXT     0x87B9
+#define GL_OUTPUT_TEXTURE_COORD29_EXT     0x87BA
+#define GL_OUTPUT_TEXTURE_COORD30_EXT     0x87BB
+#define GL_OUTPUT_TEXTURE_COORD31_EXT     0x87BC
+#define GL_OUTPUT_FOG_EXT                 0x87BD
+#define GL_SCALAR_EXT                     0x87BE
+#define GL_VECTOR_EXT                     0x87BF
+#define GL_MATRIX_EXT                     0x87C0
+#define GL_VARIANT_EXT                    0x87C1
+#define GL_INVARIANT_EXT                  0x87C2
+#define GL_LOCAL_CONSTANT_EXT             0x87C3
+#define GL_LOCAL_EXT                      0x87C4
+#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5
+#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6
+#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7
+#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8
+#define GL_MAX_VERTEX_SHADER_LOCALS_EXT   0x87C9
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CC
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT 0x87CD
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE
+#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF
+#define GL_VERTEX_SHADER_VARIANTS_EXT     0x87D0
+#define GL_VERTEX_SHADER_INVARIANTS_EXT   0x87D1
+#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2
+#define GL_VERTEX_SHADER_LOCALS_EXT       0x87D3
+#define GL_VERTEX_SHADER_OPTIMIZED_EXT    0x87D4
+#define GL_X_EXT                          0x87D5
+#define GL_Y_EXT                          0x87D6
+#define GL_Z_EXT                          0x87D7
+#define GL_W_EXT                          0x87D8
+#define GL_NEGATIVE_X_EXT                 0x87D9
+#define GL_NEGATIVE_Y_EXT                 0x87DA
+#define GL_NEGATIVE_Z_EXT                 0x87DB
+#define GL_NEGATIVE_W_EXT                 0x87DC
+#define GL_ZERO_EXT                       0x87DD
+#define GL_ONE_EXT                        0x87DE
+#define GL_NEGATIVE_ONE_EXT               0x87DF
+#define GL_NORMALIZED_RANGE_EXT           0x87E0
+#define GL_FULL_RANGE_EXT                 0x87E1
+#define GL_CURRENT_VERTEX_EXT             0x87E2
+#define GL_MVP_MATRIX_EXT                 0x87E3
+#define GL_VARIANT_VALUE_EXT              0x87E4
+#define GL_VARIANT_DATATYPE_EXT           0x87E5
+#define GL_VARIANT_ARRAY_STRIDE_EXT       0x87E6
+#define GL_VARIANT_ARRAY_TYPE_EXT         0x87E7
+#define GL_VARIANT_ARRAY_EXT              0x87E8
+#define GL_VARIANT_ARRAY_POINTER_EXT      0x87E9
+#define GL_INVARIANT_VALUE_EXT            0x87EA
+#define GL_INVARIANT_DATATYPE_EXT         0x87EB
+#define GL_LOCAL_CONSTANT_VALUE_EXT       0x87EC
+#define GL_LOCAL_CONSTANT_DATATYPE_EXT    0x87ED
+#endif
+
+#ifndef GL_ATI_vertex_streams
+#define GL_MAX_VERTEX_STREAMS_ATI         0x876B
+#define GL_VERTEX_STREAM0_ATI             0x876C
+#define GL_VERTEX_STREAM1_ATI             0x876D
+#define GL_VERTEX_STREAM2_ATI             0x876E
+#define GL_VERTEX_STREAM3_ATI             0x876F
+#define GL_VERTEX_STREAM4_ATI             0x8770
+#define GL_VERTEX_STREAM5_ATI             0x8771
+#define GL_VERTEX_STREAM6_ATI             0x8772
+#define GL_VERTEX_STREAM7_ATI             0x8773
+#define GL_VERTEX_SOURCE_ATI              0x8774
+#endif
+
+#ifndef GL_ATI_element_array
+#define GL_ELEMENT_ARRAY_ATI              0x8768
+#define GL_ELEMENT_ARRAY_TYPE_ATI         0x8769
+#define GL_ELEMENT_ARRAY_POINTER_ATI      0x876A
+#endif
+
+#ifndef GL_SUN_mesh_array
+#define GL_QUAD_MESH_SUN                  0x8614
+#define GL_TRIANGLE_MESH_SUN              0x8615
+#endif
+
+#ifndef GL_SUN_slice_accum
+#define GL_SLICE_ACCUM_SUN                0x85CC
+#endif
+
+#ifndef GL_NV_multisample_filter_hint
+#define GL_MULTISAMPLE_FILTER_HINT_NV     0x8534
+#endif
+
+#ifndef GL_NV_depth_clamp
+#define GL_DEPTH_CLAMP_NV                 0x864F
+#endif
+
+#ifndef GL_NV_occlusion_query
+#define GL_PIXEL_COUNTER_BITS_NV          0x8864
+#define GL_CURRENT_OCCLUSION_QUERY_ID_NV  0x8865
+#define GL_PIXEL_COUNT_NV                 0x8866
+#define GL_PIXEL_COUNT_AVAILABLE_NV       0x8867
+#endif
+
+#ifndef GL_NV_point_sprite
+#define GL_POINT_SPRITE_NV                0x8861
+#define GL_COORD_REPLACE_NV               0x8862
+#define GL_POINT_SPRITE_R_MODE_NV         0x8863
+#endif
+
+#ifndef GL_NV_texture_shader3
+#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850
+#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851
+#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852
+#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853
+#define GL_OFFSET_HILO_TEXTURE_2D_NV      0x8854
+#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855
+#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856
+#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857
+#define GL_DEPENDENT_HILO_TEXTURE_2D_NV   0x8858
+#define GL_DEPENDENT_RGB_TEXTURE_3D_NV    0x8859
+#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A
+#define GL_DOT_PRODUCT_PASS_THROUGH_NV    0x885B
+#define GL_DOT_PRODUCT_TEXTURE_1D_NV      0x885C
+#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D
+#define GL_HILO8_NV                       0x885E
+#define GL_SIGNED_HILO8_NV                0x885F
+#define GL_FORCE_BLUE_TO_ONE_NV           0x8860
+#endif
+
+#ifndef GL_NV_vertex_program1_1
+#endif
+
+#ifndef GL_EXT_shadow_funcs
+#endif
+
+#ifndef GL_EXT_stencil_two_side
+#define GL_STENCIL_TEST_TWO_SIDE_EXT      0x8910
+#define GL_ACTIVE_STENCIL_FACE_EXT        0x8911
+#endif
+
+#ifndef GL_ATI_text_fragment_shader
+#define GL_TEXT_FRAGMENT_SHADER_ATI       0x8200
+#endif
+
+#ifndef GL_APPLE_client_storage
+#define GL_UNPACK_CLIENT_STORAGE_APPLE    0x85B2
+#endif
+
+#ifndef GL_APPLE_element_array
+#define GL_ELEMENT_ARRAY_APPLE            0x8768
+#define GL_ELEMENT_ARRAY_TYPE_APPLE       0x8769
+#define GL_ELEMENT_ARRAY_POINTER_APPLE    0x876A
+#endif
+
+#ifndef GL_APPLE_fence
+#define GL_DRAW_PIXELS_APPLE              0x8A0A
+#define GL_FENCE_APPLE                    0x8A0B
+#endif
+
+#ifndef GL_APPLE_vertex_array_object
+#define GL_VERTEX_ARRAY_BINDING_APPLE     0x85B5
+#endif
+
+#ifndef GL_APPLE_vertex_array_range
+#define GL_VERTEX_ARRAY_RANGE_APPLE       0x851D
+#define GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE 0x851E
+#define GL_VERTEX_ARRAY_STORAGE_HINT_APPLE 0x851F
+#define GL_VERTEX_ARRAY_RANGE_POINTER_APPLE 0x8521
+#define GL_STORAGE_CACHED_APPLE           0x85BE
+#define GL_STORAGE_SHARED_APPLE           0x85BF
+#endif
+
+#ifndef GL_APPLE_ycbcr_422
+#define GL_YCBCR_422_APPLE                0x85B9
+#define GL_UNSIGNED_SHORT_8_8_APPLE       0x85BA
+#define GL_UNSIGNED_SHORT_8_8_REV_APPLE   0x85BB
+#endif
+
+#ifndef GL_S3_s3tc
+#define GL_RGB_S3TC                       0x83A0
+#define GL_RGB4_S3TC                      0x83A1
+#define GL_RGBA_S3TC                      0x83A2
+#define GL_RGBA4_S3TC                     0x83A3
+#endif
+
+#ifndef GL_ATI_draw_buffers
+#define GL_MAX_DRAW_BUFFERS_ATI           0x8824
+#define GL_DRAW_BUFFER0_ATI               0x8825
+#define GL_DRAW_BUFFER1_ATI               0x8826
+#define GL_DRAW_BUFFER2_ATI               0x8827
+#define GL_DRAW_BUFFER3_ATI               0x8828
+#define GL_DRAW_BUFFER4_ATI               0x8829
+#define GL_DRAW_BUFFER5_ATI               0x882A
+#define GL_DRAW_BUFFER6_ATI               0x882B
+#define GL_DRAW_BUFFER7_ATI               0x882C
+#define GL_DRAW_BUFFER8_ATI               0x882D
+#define GL_DRAW_BUFFER9_ATI               0x882E
+#define GL_DRAW_BUFFER10_ATI              0x882F
+#define GL_DRAW_BUFFER11_ATI              0x8830
+#define GL_DRAW_BUFFER12_ATI              0x8831
+#define GL_DRAW_BUFFER13_ATI              0x8832
+#define GL_DRAW_BUFFER14_ATI              0x8833
+#define GL_DRAW_BUFFER15_ATI              0x8834
+#endif
+
+#ifndef GL_ATI_texture_env_combine3
+#define GL_MODULATE_ADD_ATI               0x8744
+#define GL_MODULATE_SIGNED_ADD_ATI        0x8745
+#define GL_MODULATE_SUBTRACT_ATI          0x8746
+#endif
+
+#ifndef GL_ATI_texture_float
+#define GL_RGBA_FLOAT32_ATI               0x8814
+#define GL_RGB_FLOAT32_ATI                0x8815
+#define GL_ALPHA_FLOAT32_ATI              0x8816
+#define GL_INTENSITY_FLOAT32_ATI          0x8817
+#define GL_LUMINANCE_FLOAT32_ATI          0x8818
+#define GL_LUMINANCE_ALPHA_FLOAT32_ATI    0x8819
+#define GL_RGBA_FLOAT16_ATI               0x881A
+#define GL_RGB_FLOAT16_ATI                0x881B
+#define GL_ALPHA_FLOAT16_ATI              0x881C
+#define GL_INTENSITY_FLOAT16_ATI          0x881D
+#define GL_LUMINANCE_FLOAT16_ATI          0x881E
+#define GL_LUMINANCE_ALPHA_FLOAT16_ATI    0x881F
+#endif
+
+#ifndef GL_NV_float_buffer
+#define GL_FLOAT_R_NV                     0x8880
+#define GL_FLOAT_RG_NV                    0x8881
+#define GL_FLOAT_RGB_NV                   0x8882
+#define GL_FLOAT_RGBA_NV                  0x8883
+#define GL_FLOAT_R16_NV                   0x8884
+#define GL_FLOAT_R32_NV                   0x8885
+#define GL_FLOAT_RG16_NV                  0x8886
+#define GL_FLOAT_RG32_NV                  0x8887
+#define GL_FLOAT_RGB16_NV                 0x8888
+#define GL_FLOAT_RGB32_NV                 0x8889
+#define GL_FLOAT_RGBA16_NV                0x888A
+#define GL_FLOAT_RGBA32_NV                0x888B
+#define GL_TEXTURE_FLOAT_COMPONENTS_NV    0x888C
+#define GL_FLOAT_CLEAR_COLOR_VALUE_NV     0x888D
+#define GL_FLOAT_RGBA_MODE_NV             0x888E
+#endif
+
+#ifndef GL_NV_fragment_program
+#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868
+#define GL_FRAGMENT_PROGRAM_NV            0x8870
+#define GL_MAX_TEXTURE_COORDS_NV          0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS_NV     0x8872
+#define GL_FRAGMENT_PROGRAM_BINDING_NV    0x8873
+#define GL_PROGRAM_ERROR_STRING_NV        0x8874
+#endif
+
+#ifndef GL_NV_half_float
+#define GL_HALF_FLOAT_NV                  0x140B
+#endif
+
+#ifndef GL_NV_pixel_data_range
+#define GL_WRITE_PIXEL_DATA_RANGE_NV      0x8878
+#define GL_READ_PIXEL_DATA_RANGE_NV       0x8879
+#define GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV 0x887A
+#define GL_READ_PIXEL_DATA_RANGE_LENGTH_NV 0x887B
+#define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C
+#define GL_READ_PIXEL_DATA_RANGE_POINTER_NV 0x887D
+#endif
+
+#ifndef GL_NV_primitive_restart
+#define GL_PRIMITIVE_RESTART_NV           0x8558
+#define GL_PRIMITIVE_RESTART_INDEX_NV     0x8559
+#endif
+
+#ifndef GL_NV_texture_expand_normal
+#define GL_TEXTURE_UNSIGNED_REMAP_MODE_NV 0x888F
+#endif
+
+#ifndef GL_NV_vertex_program2
+#endif
+
+#ifndef GL_ATI_map_object_buffer
+#endif
+
+#ifndef GL_ATI_separate_stencil
+#define GL_STENCIL_BACK_FUNC_ATI          0x8800
+#define GL_STENCIL_BACK_FAIL_ATI          0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803
+#endif
+
+#ifndef GL_ATI_vertex_attrib_array_object
+#endif
+
+#ifndef GL_EXT_depth_bounds_test
+#define GL_DEPTH_BOUNDS_TEST_EXT          0x8890
+#define GL_DEPTH_BOUNDS_EXT               0x8891
+#endif
+
+#ifndef GL_EXT_texture_mirror_clamp
+#define GL_MIRROR_CLAMP_EXT               0x8742
+#define GL_MIRROR_CLAMP_TO_EDGE_EXT       0x8743
+#define GL_MIRROR_CLAMP_TO_BORDER_EXT     0x8912
+#endif
+
+#ifndef GL_EXT_blend_equation_separate
+#define GL_BLEND_EQUATION_RGB_EXT         GL_BLEND_EQUATION
+#define GL_BLEND_EQUATION_ALPHA_EXT       0x883D
+#endif
+
+#ifndef GL_MESA_pack_invert
+#define GL_PACK_INVERT_MESA               0x8758
+#endif
+
+#ifndef GL_MESA_ycbcr_texture
+#define GL_UNSIGNED_SHORT_8_8_MESA        0x85BA
+#define GL_UNSIGNED_SHORT_8_8_REV_MESA    0x85BB
+#define GL_YCBCR_MESA                     0x8757
+#endif
+
+
+/*************************************************************/
+
+#include <stddef.h>
+#ifndef GL_VERSION_1_5
+/* GL types for handling large vertex buffer objects */
+typedef ptrdiff_t GLintptr;
+typedef ptrdiff_t GLsizeiptr;
+#endif
+
+#ifndef GL_ARB_vertex_buffer_object
+/* GL types for handling large vertex buffer objects */
+typedef ptrdiff_t GLintptrARB;
+typedef ptrdiff_t GLsizeiptrARB;
+#endif
+
+#ifndef GL_ARB_shader_objects
+/* GL types for handling shader object handles and characters */
+typedef char GLcharARB;		/* native character */
+typedef unsigned int GLhandleARB;	/* shader object handle */
+#endif
+
+#ifndef GL_NV_half_float
+/* GL type for representing NVIDIA "half" floating point type in host memory */
+typedef unsigned short GLhalfNV;
+#endif
+
+#ifndef GL_VERSION_1_2
+#define GL_VERSION_1_2 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendColor (GLclampf, GLclampf, GLclampf, GLclampf);
+GLAPI void APIENTRY glBlendEquation (GLenum);
+GLAPI void APIENTRY glDrawRangeElements (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
+GLAPI void APIENTRY glColorTable (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glColorTableParameterfv (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glColorTableParameteriv (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glCopyColorTable (GLenum, GLenum, GLint, GLint, GLsizei);
+GLAPI void APIENTRY glGetColorTable (GLenum, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetColorTableParameterfv (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetColorTableParameteriv (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glColorSubTable (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glCopyColorSubTable (GLenum, GLsizei, GLint, GLint, GLsizei);
+GLAPI void APIENTRY glConvolutionFilter1D (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glConvolutionFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glConvolutionParameterf (GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glConvolutionParameterfv (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glConvolutionParameteri (GLenum, GLenum, GLint);
+GLAPI void APIENTRY glConvolutionParameteriv (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glCopyConvolutionFilter1D (GLenum, GLenum, GLint, GLint, GLsizei);
+GLAPI void APIENTRY glCopyConvolutionFilter2D (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
+GLAPI void APIENTRY glGetConvolutionFilter (GLenum, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetConvolutionParameterfv (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetConvolutionParameteriv (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetSeparableFilter (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
+GLAPI void APIENTRY glSeparableFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
+GLAPI void APIENTRY glGetHistogram (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetHistogramParameterfv (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetHistogramParameteriv (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetMinmax (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetMinmaxParameterfv (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetMinmaxParameteriv (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glHistogram (GLenum, GLsizei, GLenum, GLboolean);
+GLAPI void APIENTRY glMinmax (GLenum, GLenum, GLboolean);
+GLAPI void APIENTRY glResetHistogram (GLenum);
+GLAPI void APIENTRY glResetMinmax (GLenum);
+GLAPI void APIENTRY glTexImage3D (GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glCopyTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
+typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#endif
+
+#ifndef GL_VERSION_1_3
+#define GL_VERSION_1_3 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glActiveTexture (GLenum);
+GLAPI void APIENTRY glClientActiveTexture (GLenum);
+GLAPI void APIENTRY glMultiTexCoord1d (GLenum, GLdouble);
+GLAPI void APIENTRY glMultiTexCoord1dv (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexCoord1f (GLenum, GLfloat);
+GLAPI void APIENTRY glMultiTexCoord1fv (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexCoord1i (GLenum, GLint);
+GLAPI void APIENTRY glMultiTexCoord1iv (GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexCoord1s (GLenum, GLshort);
+GLAPI void APIENTRY glMultiTexCoord1sv (GLenum, const GLshort *);
+GLAPI void APIENTRY glMultiTexCoord2d (GLenum, GLdouble, GLdouble);
+GLAPI void APIENTRY glMultiTexCoord2dv (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexCoord2f (GLenum, GLfloat, GLfloat);
+GLAPI void APIENTRY glMultiTexCoord2fv (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexCoord2i (GLenum, GLint, GLint);
+GLAPI void APIENTRY glMultiTexCoord2iv (GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexCoord2s (GLenum, GLshort, GLshort);
+GLAPI void APIENTRY glMultiTexCoord2sv (GLenum, const GLshort *);
+GLAPI void APIENTRY glMultiTexCoord3d (GLenum, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glMultiTexCoord3dv (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexCoord3f (GLenum, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glMultiTexCoord3fv (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexCoord3i (GLenum, GLint, GLint, GLint);
+GLAPI void APIENTRY glMultiTexCoord3iv (GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexCoord3s (GLenum, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glMultiTexCoord3sv (GLenum, const GLshort *);
+GLAPI void APIENTRY glMultiTexCoord4d (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glMultiTexCoord4dv (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexCoord4f (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glMultiTexCoord4fv (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexCoord4i (GLenum, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glMultiTexCoord4iv (GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexCoord4s (GLenum, GLshort, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glMultiTexCoord4sv (GLenum, const GLshort *);
+GLAPI void APIENTRY glLoadTransposeMatrixf (const GLfloat *);
+GLAPI void APIENTRY glLoadTransposeMatrixd (const GLdouble *);
+GLAPI void APIENTRY glMultTransposeMatrixf (const GLfloat *);
+GLAPI void APIENTRY glMultTransposeMatrixd (const GLdouble *);
+GLAPI void APIENTRY glSampleCoverage (GLclampf, GLboolean);
+GLAPI void APIENTRY glCompressedTexImage3D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexImage2D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexImage1D (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glGetCompressedTexImage (GLenum, GLint, GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m);
+typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, GLvoid *img);
+#endif
+
+#ifndef GL_VERSION_1_4
+#define GL_VERSION_1_4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncSeparate (GLenum, GLenum, GLenum, GLenum);
+GLAPI void APIENTRY glFogCoordf (GLfloat);
+GLAPI void APIENTRY glFogCoordfv (const GLfloat *);
+GLAPI void APIENTRY glFogCoordd (GLdouble);
+GLAPI void APIENTRY glFogCoorddv (const GLdouble *);
+GLAPI void APIENTRY glFogCoordPointer (GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glMultiDrawArrays (GLenum, GLint *, GLsizei *, GLsizei);
+GLAPI void APIENTRY glMultiDrawElements (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
+GLAPI void APIENTRY glPointParameterf (GLenum, GLfloat);
+GLAPI void APIENTRY glPointParameterfv (GLenum, const GLfloat *);
+GLAPI void APIENTRY glPointParameteri (GLenum, GLint);
+GLAPI void APIENTRY glPointParameteriv (GLenum, const GLint *);
+GLAPI void APIENTRY glSecondaryColor3b (GLbyte, GLbyte, GLbyte);
+GLAPI void APIENTRY glSecondaryColor3bv (const GLbyte *);
+GLAPI void APIENTRY glSecondaryColor3d (GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glSecondaryColor3dv (const GLdouble *);
+GLAPI void APIENTRY glSecondaryColor3f (GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glSecondaryColor3fv (const GLfloat *);
+GLAPI void APIENTRY glSecondaryColor3i (GLint, GLint, GLint);
+GLAPI void APIENTRY glSecondaryColor3iv (const GLint *);
+GLAPI void APIENTRY glSecondaryColor3s (GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glSecondaryColor3sv (const GLshort *);
+GLAPI void APIENTRY glSecondaryColor3ub (GLubyte, GLubyte, GLubyte);
+GLAPI void APIENTRY glSecondaryColor3ubv (const GLubyte *);
+GLAPI void APIENTRY glSecondaryColor3ui (GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glSecondaryColor3uiv (const GLuint *);
+GLAPI void APIENTRY glSecondaryColor3us (GLushort, GLushort, GLushort);
+GLAPI void APIENTRY glSecondaryColor3usv (const GLushort *);
+GLAPI void APIENTRY glSecondaryColorPointer (GLint, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glWindowPos2d (GLdouble, GLdouble);
+GLAPI void APIENTRY glWindowPos2dv (const GLdouble *);
+GLAPI void APIENTRY glWindowPos2f (GLfloat, GLfloat);
+GLAPI void APIENTRY glWindowPos2fv (const GLfloat *);
+GLAPI void APIENTRY glWindowPos2i (GLint, GLint);
+GLAPI void APIENTRY glWindowPos2iv (const GLint *);
+GLAPI void APIENTRY glWindowPos2s (GLshort, GLshort);
+GLAPI void APIENTRY glWindowPos2sv (const GLshort *);
+GLAPI void APIENTRY glWindowPos3d (GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glWindowPos3dv (const GLdouble *);
+GLAPI void APIENTRY glWindowPos3f (GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glWindowPos3fv (const GLfloat *);
+GLAPI void APIENTRY glWindowPos3i (GLint, GLint, GLint);
+GLAPI void APIENTRY glWindowPos3iv (const GLint *);
+GLAPI void APIENTRY glWindowPos3s (GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glWindowPos3sv (const GLshort *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+typedef void (APIENTRYP PFNGLFOGCOORDFPROC) (GLfloat coord);
+typedef void (APIENTRYP PFNGLFOGCOORDFVPROC) (const GLfloat *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDPROC) (GLdouble coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDVPROC) (const GLdouble *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DVPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FVPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IPROC) (GLint x, GLint y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IVPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SVPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DVPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FVPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IVPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SVPROC) (const GLshort *v);
+#endif
+
+#ifndef GL_VERSION_1_5
+#define GL_VERSION_1_5 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenQueries (GLsizei, GLuint *);
+GLAPI void APIENTRY glDeleteQueries (GLsizei, const GLuint *);
+GLAPI GLboolean APIENTRY glIsQuery (GLuint);
+GLAPI void APIENTRY glBeginQuery (GLenum, GLuint);
+GLAPI void APIENTRY glEndQuery (GLenum);
+GLAPI void APIENTRY glGetQueryiv (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetQueryObjectiv (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetQueryObjectuiv (GLuint, GLenum, GLuint *);
+GLAPI void APIENTRY glBindBuffer (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteBuffers (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenBuffers (GLsizei, GLuint *);
+GLAPI GLboolean APIENTRY glIsBuffer (GLuint);
+GLAPI void APIENTRY glBufferData (GLenum, GLsizeiptr, const GLvoid *, GLenum);
+GLAPI void APIENTRY glBufferSubData (GLenum, GLintptr, GLsizeiptr, const GLvoid *);
+GLAPI void APIENTRY glGetBufferSubData (GLenum, GLintptr, GLsizeiptr, GLvoid *);
+GLAPI GLvoid* APIENTRY glMapBuffer (GLenum, GLenum);
+GLAPI GLboolean APIENTRY glUnmapBuffer (GLenum);
+GLAPI void APIENTRY glGetBufferParameteriv (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetBufferPointerv (GLenum, GLenum, GLvoid* *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGENQUERIESPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISQUERYPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLENDQUERYPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
+typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
+typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
+typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
+typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data);
+typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid* *params);
+#endif
+
+#ifndef GL_ARB_multitexture
+#define GL_ARB_multitexture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glActiveTextureARB (GLenum);
+GLAPI void APIENTRY glClientActiveTextureARB (GLenum);
+GLAPI void APIENTRY glMultiTexCoord1dARB (GLenum, GLdouble);
+GLAPI void APIENTRY glMultiTexCoord1dvARB (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexCoord1fARB (GLenum, GLfloat);
+GLAPI void APIENTRY glMultiTexCoord1fvARB (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexCoord1iARB (GLenum, GLint);
+GLAPI void APIENTRY glMultiTexCoord1ivARB (GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexCoord1sARB (GLenum, GLshort);
+GLAPI void APIENTRY glMultiTexCoord1svARB (GLenum, const GLshort *);
+GLAPI void APIENTRY glMultiTexCoord2dARB (GLenum, GLdouble, GLdouble);
+GLAPI void APIENTRY glMultiTexCoord2dvARB (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexCoord2fARB (GLenum, GLfloat, GLfloat);
+GLAPI void APIENTRY glMultiTexCoord2fvARB (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexCoord2iARB (GLenum, GLint, GLint);
+GLAPI void APIENTRY glMultiTexCoord2ivARB (GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexCoord2sARB (GLenum, GLshort, GLshort);
+GLAPI void APIENTRY glMultiTexCoord2svARB (GLenum, const GLshort *);
+GLAPI void APIENTRY glMultiTexCoord3dARB (GLenum, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glMultiTexCoord3dvARB (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexCoord3fARB (GLenum, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glMultiTexCoord3fvARB (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexCoord3iARB (GLenum, GLint, GLint, GLint);
+GLAPI void APIENTRY glMultiTexCoord3ivARB (GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexCoord3sARB (GLenum, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glMultiTexCoord3svARB (GLenum, const GLshort *);
+GLAPI void APIENTRY glMultiTexCoord4dARB (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glMultiTexCoord4dvARB (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexCoord4fARB (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glMultiTexCoord4fvARB (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexCoord4iARB (GLenum, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glMultiTexCoord4ivARB (GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexCoord4sARB (GLenum, GLshort, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glMultiTexCoord4svARB (GLenum, const GLshort *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
+#endif
+
+#ifndef GL_ARB_transpose_matrix
+#define GL_ARB_transpose_matrix 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glLoadTransposeMatrixfARB (const GLfloat *);
+GLAPI void APIENTRY glLoadTransposeMatrixdARB (const GLdouble *);
+GLAPI void APIENTRY glMultTransposeMatrixfARB (const GLfloat *);
+GLAPI void APIENTRY glMultTransposeMatrixdARB (const GLdouble *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
+#endif
+
+#ifndef GL_ARB_multisample
+#define GL_ARB_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSampleCoverageARB (GLclampf, GLboolean);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert);
+#endif
+
+#ifndef GL_ARB_texture_env_add
+#define GL_ARB_texture_env_add 1
+#endif
+
+#ifndef GL_ARB_texture_cube_map
+#define GL_ARB_texture_cube_map 1
+#endif
+
+#ifndef GL_ARB_texture_compression
+#define GL_ARB_texture_compression 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCompressedTexImage3DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexImage2DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexImage1DARB (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexSubImage3DARB (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexSubImage2DARB (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexSubImage1DARB (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glGetCompressedTexImageARB (GLenum, GLint, GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint level, GLvoid *img);
+#endif
+
+#ifndef GL_ARB_texture_border_clamp
+#define GL_ARB_texture_border_clamp 1
+#endif
+
+#ifndef GL_ARB_point_parameters
+#define GL_ARB_point_parameters 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameterfARB (GLenum, GLfloat);
+GLAPI void APIENTRY glPointParameterfvARB (GLenum, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat *params);
+#endif
+
+#ifndef GL_ARB_vertex_blend
+#define GL_ARB_vertex_blend 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glWeightbvARB (GLint, const GLbyte *);
+GLAPI void APIENTRY glWeightsvARB (GLint, const GLshort *);
+GLAPI void APIENTRY glWeightivARB (GLint, const GLint *);
+GLAPI void APIENTRY glWeightfvARB (GLint, const GLfloat *);
+GLAPI void APIENTRY glWeightdvARB (GLint, const GLdouble *);
+GLAPI void APIENTRY glWeightubvARB (GLint, const GLubyte *);
+GLAPI void APIENTRY glWeightusvARB (GLint, const GLushort *);
+GLAPI void APIENTRY glWeightuivARB (GLint, const GLuint *);
+GLAPI void APIENTRY glWeightPointerARB (GLint, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glVertexBlendARB (GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLWEIGHTBVARBPROC) (GLint size, const GLbyte *weights);
+typedef void (APIENTRYP PFNGLWEIGHTSVARBPROC) (GLint size, const GLshort *weights);
+typedef void (APIENTRYP PFNGLWEIGHTIVARBPROC) (GLint size, const GLint *weights);
+typedef void (APIENTRYP PFNGLWEIGHTFVARBPROC) (GLint size, const GLfloat *weights);
+typedef void (APIENTRYP PFNGLWEIGHTDVARBPROC) (GLint size, const GLdouble *weights);
+typedef void (APIENTRYP PFNGLWEIGHTUBVARBPROC) (GLint size, const GLubyte *weights);
+typedef void (APIENTRYP PFNGLWEIGHTUSVARBPROC) (GLint size, const GLushort *weights);
+typedef void (APIENTRYP PFNGLWEIGHTUIVARBPROC) (GLint size, const GLuint *weights);
+typedef void (APIENTRYP PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLVERTEXBLENDARBPROC) (GLint count);
+#endif
+
+#ifndef GL_ARB_matrix_palette
+#define GL_ARB_matrix_palette 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCurrentPaletteMatrixARB (GLint);
+GLAPI void APIENTRY glMatrixIndexubvARB (GLint, const GLubyte *);
+GLAPI void APIENTRY glMatrixIndexusvARB (GLint, const GLushort *);
+GLAPI void APIENTRY glMatrixIndexuivARB (GLint, const GLuint *);
+GLAPI void APIENTRY glMatrixIndexPointerARB (GLint, GLenum, GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCURRENTPALETTEMATRIXARBPROC) (GLint index);
+typedef void (APIENTRYP PFNGLMATRIXINDEXUBVARBPROC) (GLint size, const GLubyte *indices);
+typedef void (APIENTRYP PFNGLMATRIXINDEXUSVARBPROC) (GLint size, const GLushort *indices);
+typedef void (APIENTRYP PFNGLMATRIXINDEXUIVARBPROC) (GLint size, const GLuint *indices);
+typedef void (APIENTRYP PFNGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif
+
+#ifndef GL_ARB_texture_env_combine
+#define GL_ARB_texture_env_combine 1
+#endif
+
+#ifndef GL_ARB_texture_env_crossbar
+#define GL_ARB_texture_env_crossbar 1
+#endif
+
+#ifndef GL_ARB_texture_env_dot3
+#define GL_ARB_texture_env_dot3 1
+#endif
+
+#ifndef GL_ARB_texture_mirrored_repeat
+#define GL_ARB_texture_mirrored_repeat 1
+#endif
+
+#ifndef GL_ARB_depth_texture
+#define GL_ARB_depth_texture 1
+#endif
+
+#ifndef GL_ARB_shadow
+#define GL_ARB_shadow 1
+#endif
+
+#ifndef GL_ARB_shadow_ambient
+#define GL_ARB_shadow_ambient 1
+#endif
+
+#ifndef GL_ARB_window_pos
+#define GL_ARB_window_pos 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glWindowPos2dARB (GLdouble, GLdouble);
+GLAPI void APIENTRY glWindowPos2dvARB (const GLdouble *);
+GLAPI void APIENTRY glWindowPos2fARB (GLfloat, GLfloat);
+GLAPI void APIENTRY glWindowPos2fvARB (const GLfloat *);
+GLAPI void APIENTRY glWindowPos2iARB (GLint, GLint);
+GLAPI void APIENTRY glWindowPos2ivARB (const GLint *);
+GLAPI void APIENTRY glWindowPos2sARB (GLshort, GLshort);
+GLAPI void APIENTRY glWindowPos2svARB (const GLshort *);
+GLAPI void APIENTRY glWindowPos3dARB (GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glWindowPos3dvARB (const GLdouble *);
+GLAPI void APIENTRY glWindowPos3fARB (GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glWindowPos3fvARB (const GLfloat *);
+GLAPI void APIENTRY glWindowPos3iARB (GLint, GLint, GLint);
+GLAPI void APIENTRY glWindowPos3ivARB (const GLint *);
+GLAPI void APIENTRY glWindowPos3sARB (GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glWindowPos3svARB (const GLshort *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DVARBPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FVARBPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IARBPROC) (GLint x, GLint y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IVARBPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SVARBPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DVARBPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FVARBPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IVARBPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SVARBPROC) (const GLshort *v);
+#endif
+
+#ifndef GL_ARB_vertex_program
+#define GL_ARB_vertex_program 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttrib1dARB (GLuint, GLdouble);
+GLAPI void APIENTRY glVertexAttrib1dvARB (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib1fARB (GLuint, GLfloat);
+GLAPI void APIENTRY glVertexAttrib1fvARB (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib1sARB (GLuint, GLshort);
+GLAPI void APIENTRY glVertexAttrib1svARB (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib2dARB (GLuint, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib2dvARB (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib2fARB (GLuint, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib2fvARB (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib2sARB (GLuint, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib2svARB (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib3dARB (GLuint, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib3dvARB (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib3fARB (GLuint, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib3fvARB (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib3sARB (GLuint, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib3svARB (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib4NbvARB (GLuint, const GLbyte *);
+GLAPI void APIENTRY glVertexAttrib4NivARB (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttrib4NsvARB (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib4NubARB (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
+GLAPI void APIENTRY glVertexAttrib4NubvARB (GLuint, const GLubyte *);
+GLAPI void APIENTRY glVertexAttrib4NuivARB (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttrib4NusvARB (GLuint, const GLushort *);
+GLAPI void APIENTRY glVertexAttrib4bvARB (GLuint, const GLbyte *);
+GLAPI void APIENTRY glVertexAttrib4dARB (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib4dvARB (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib4fARB (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib4fvARB (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib4ivARB (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttrib4sARB (GLuint, GLshort, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib4svARB (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib4ubvARB (GLuint, const GLubyte *);
+GLAPI void APIENTRY glVertexAttrib4uivARB (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttrib4usvARB (GLuint, const GLushort *);
+GLAPI void APIENTRY glVertexAttribPointerARB (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glEnableVertexAttribArrayARB (GLuint);
+GLAPI void APIENTRY glDisableVertexAttribArrayARB (GLuint);
+GLAPI void APIENTRY glProgramStringARB (GLenum, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glBindProgramARB (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteProgramsARB (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenProgramsARB (GLsizei, GLuint *);
+GLAPI void APIENTRY glProgramEnvParameter4dARB (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glProgramEnvParameter4dvARB (GLenum, GLuint, const GLdouble *);
+GLAPI void APIENTRY glProgramEnvParameter4fARB (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glProgramEnvParameter4fvARB (GLenum, GLuint, const GLfloat *);
+GLAPI void APIENTRY glProgramLocalParameter4dARB (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glProgramLocalParameter4dvARB (GLenum, GLuint, const GLdouble *);
+GLAPI void APIENTRY glProgramLocalParameter4fARB (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glProgramLocalParameter4fvARB (GLenum, GLuint, const GLfloat *);
+GLAPI void APIENTRY glGetProgramEnvParameterdvARB (GLenum, GLuint, GLdouble *);
+GLAPI void APIENTRY glGetProgramEnvParameterfvARB (GLenum, GLuint, GLfloat *);
+GLAPI void APIENTRY glGetProgramLocalParameterdvARB (GLenum, GLuint, GLdouble *);
+GLAPI void APIENTRY glGetProgramLocalParameterfvARB (GLenum, GLuint, GLfloat *);
+GLAPI void APIENTRY glGetProgramivARB (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetProgramStringARB (GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetVertexAttribdvARB (GLuint, GLenum, GLdouble *);
+GLAPI void APIENTRY glGetVertexAttribfvARB (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetVertexAttribivARB (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetVertexAttribPointervARB (GLuint, GLenum, GLvoid* *);
+GLAPI GLboolean APIENTRY glIsProgramARB (GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DARBPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SARBPROC) (GLuint index, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DARBPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SARBPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVARBPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVARBPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVARBPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVARBPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVARBPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVARBPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVARBPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVARBPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVARBPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVARBPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const GLvoid *string);
+typedef void (APIENTRYP PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint *programs);
+typedef void (APIENTRYP PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint *programs);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, GLvoid *string);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVARBPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMARBPROC) (GLuint program);
+#endif
+
+#ifndef GL_ARB_fragment_program
+#define GL_ARB_fragment_program 1
+/* All ARB_fragment_program entry points are shared with ARB_vertex_program. */
+#endif
+
+#ifndef GL_ARB_vertex_buffer_object
+#define GL_ARB_vertex_buffer_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindBufferARB (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteBuffersARB (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenBuffersARB (GLsizei, GLuint *);
+GLAPI GLboolean APIENTRY glIsBufferARB (GLuint);
+GLAPI void APIENTRY glBufferDataARB (GLenum, GLsizeiptrARB, const GLvoid *, GLenum);
+GLAPI void APIENTRY glBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, const GLvoid *);
+GLAPI void APIENTRY glGetBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, GLvoid *);
+GLAPI GLvoid* APIENTRY glMapBufferARB (GLenum, GLenum);
+GLAPI GLboolean APIENTRY glUnmapBufferARB (GLenum);
+GLAPI void APIENTRY glGetBufferParameterivARB (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetBufferPointervARB (GLenum, GLenum, GLvoid* *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer);
+typedef void (APIENTRYP PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers);
+typedef void (APIENTRYP PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint *buffers);
+typedef GLboolean (APIENTRYP PFNGLISBUFFERARBPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage);
+typedef void (APIENTRYP PFNGLBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data);
+typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERARBPROC) (GLenum target, GLenum access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERARBPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, GLvoid* *params);
+#endif
+
+#ifndef GL_ARB_occlusion_query
+#define GL_ARB_occlusion_query 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenQueriesARB (GLsizei, GLuint *);
+GLAPI void APIENTRY glDeleteQueriesARB (GLsizei, const GLuint *);
+GLAPI GLboolean APIENTRY glIsQueryARB (GLuint);
+GLAPI void APIENTRY glBeginQueryARB (GLenum, GLuint);
+GLAPI void APIENTRY glEndQueryARB (GLenum);
+GLAPI void APIENTRY glGetQueryivARB (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetQueryObjectivARB (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetQueryObjectuivARB (GLuint, GLenum, GLuint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGENQUERIESARBPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLDELETEQUERIESARBPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISQUERYARBPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINQUERYARBPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLENDQUERYARBPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETQUERYIVARBPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVARBPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVARBPROC) (GLuint id, GLenum pname, GLuint *params);
+#endif
+
+#ifndef GL_ARB_shader_objects
+#define GL_ARB_shader_objects 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDeleteObjectARB (GLhandleARB);
+GLAPI GLhandleARB APIENTRY glGetHandleARB (GLenum);
+GLAPI void APIENTRY glDetachObjectARB (GLhandleARB, GLhandleARB);
+GLAPI GLhandleARB APIENTRY glCreateShaderObjectARB (GLenum);
+GLAPI void APIENTRY glShaderSourceARB (GLhandleARB, GLsizei, const GLcharARB* *, const GLint *);
+GLAPI void APIENTRY glCompileShaderARB (GLhandleARB);
+GLAPI GLhandleARB APIENTRY glCreateProgramObjectARB (void);
+GLAPI void APIENTRY glAttachObjectARB (GLhandleARB, GLhandleARB);
+GLAPI void APIENTRY glLinkProgramARB (GLhandleARB);
+GLAPI void APIENTRY glUseProgramObjectARB (GLhandleARB);
+GLAPI void APIENTRY glValidateProgramARB (GLhandleARB);
+GLAPI void APIENTRY glUniform1fARB (GLint, GLfloat);
+GLAPI void APIENTRY glUniform2fARB (GLint, GLfloat, GLfloat);
+GLAPI void APIENTRY glUniform3fARB (GLint, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glUniform4fARB (GLint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glUniform1iARB (GLint, GLint);
+GLAPI void APIENTRY glUniform2iARB (GLint, GLint, GLint);
+GLAPI void APIENTRY glUniform3iARB (GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glUniform4iARB (GLint, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glUniform1fvARB (GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glUniform2fvARB (GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glUniform3fvARB (GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glUniform4fvARB (GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glUniform1ivARB (GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glUniform2ivARB (GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glUniform3ivARB (GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glUniform4ivARB (GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glUniformMatrix2fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix3fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix4fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glGetObjectParameterfvARB (GLhandleARB, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetObjectParameterivARB (GLhandleARB, GLenum, GLint *);
+GLAPI void APIENTRY glGetInfoLogARB (GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
+GLAPI void APIENTRY glGetAttachedObjectsARB (GLhandleARB, GLsizei, GLsizei *, GLhandleARB *);
+GLAPI GLint APIENTRY glGetUniformLocationARB (GLhandleARB, const GLcharARB *);
+GLAPI void APIENTRY glGetActiveUniformARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *);
+GLAPI void APIENTRY glGetUniformfvARB (GLhandleARB, GLint, GLfloat *);
+GLAPI void APIENTRY glGetUniformivARB (GLhandleARB, GLint, GLint *);
+GLAPI void APIENTRY glGetShaderSourceARB (GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDELETEOBJECTARBPROC) (GLhandleARB obj);
+typedef GLhandleARB (APIENTRYP PFNGLGETHANDLEARBPROC) (GLenum pname);
+typedef void (APIENTRYP PFNGLDETACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj);
+typedef GLhandleARB (APIENTRYP PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType);
+typedef void (APIENTRYP PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length);
+typedef void (APIENTRYP PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj);
+typedef GLhandleARB (APIENTRYP PFNGLCREATEPROGRAMOBJECTARBPROC) (void);
+typedef void (APIENTRYP PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj);
+typedef void (APIENTRYP PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj);
+typedef void (APIENTRYP PFNGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj);
+typedef void (APIENTRYP PFNGLVALIDATEPROGRAMARBPROC) (GLhandleARB programObj);
+typedef void (APIENTRYP PFNGLUNIFORM1FARBPROC) (GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLUNIFORM1IARBPROC) (GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog);
+typedef void (APIENTRYP PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj);
+typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+typedef void (APIENTRYP PFNGLGETUNIFORMFVARBPROC) (GLhandleARB programObj, GLint location, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETUNIFORMIVARBPROC) (GLhandleARB programObj, GLint location, GLint *params);
+typedef void (APIENTRYP PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source);
+#endif
+
+#ifndef GL_ARB_vertex_shader
+#define GL_ARB_vertex_shader 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindAttribLocationARB (GLhandleARB, GLuint, const GLcharARB *);
+GLAPI void APIENTRY glGetActiveAttribARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *);
+GLAPI GLint APIENTRY glGetAttribLocationARB (GLhandleARB, const GLcharARB *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB *name);
+typedef void (APIENTRYP PFNGLGETACTIVEATTRIBARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
+#endif
+
+#ifndef GL_ARB_fragment_shader
+#define GL_ARB_fragment_shader 1
+#endif
+
+#ifndef GL_ARB_shading_language_100
+#define GL_ARB_shading_language_100 1
+#endif
+
+#ifndef GL_ARB_texture_non_power_of_two
+#define GL_ARB_texture_non_power_of_two 1
+#endif
+
+#ifndef GL_ARB_point_sprite
+#define GL_ARB_point_sprite 1
+#endif
+
+#ifndef GL_ARB_fragment_program_shadow
+#define GL_ARB_fragment_program_shadow 1
+#endif
+
+#ifndef GL_EXT_abgr
+#define GL_EXT_abgr 1
+#endif
+
+#ifndef GL_EXT_blend_color
+#define GL_EXT_blend_color 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendColorEXT (GLclampf, GLclampf, GLclampf, GLclampf);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDCOLOREXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+#endif
+
+#ifndef GL_EXT_polygon_offset
+#define GL_EXT_polygon_offset 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPolygonOffsetEXT (GLfloat, GLfloat);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias);
+#endif
+
+#ifndef GL_EXT_texture
+#define GL_EXT_texture 1
+#endif
+
+#ifndef GL_EXT_texture3D
+#define GL_EXT_texture3D 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexImage3DEXT (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+#endif
+
+#ifndef GL_SGIS_texture_filter4
+#define GL_SGIS_texture_filter4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetTexFilterFuncSGIS (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glTexFilterFuncSGIS (GLenum, GLenum, GLsizei, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat *weights);
+typedef void (APIENTRYP PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights);
+#endif
+
+#ifndef GL_EXT_subtexture
+#define GL_EXT_subtexture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexSubImage1DEXT (GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+#endif
+
+#ifndef GL_EXT_copy_texture
+#define GL_EXT_copy_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCopyTexImage1DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint);
+GLAPI void APIENTRY glCopyTexImage2DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint);
+GLAPI void APIENTRY glCopyTexSubImage1DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei);
+GLAPI void APIENTRY glCopyTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
+GLAPI void APIENTRY glCopyTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#endif
+
+#ifndef GL_EXT_histogram
+#define GL_EXT_histogram 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetHistogramEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetHistogramParameterfvEXT (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetHistogramParameterivEXT (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetMinmaxEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetMinmaxParameterfvEXT (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetMinmaxParameterivEXT (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glHistogramEXT (GLenum, GLsizei, GLenum, GLboolean);
+GLAPI void APIENTRY glMinmaxEXT (GLenum, GLenum, GLboolean);
+GLAPI void APIENTRY glResetHistogramEXT (GLenum);
+GLAPI void APIENTRY glResetMinmaxEXT (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLRESETHISTOGRAMEXTPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLRESETMINMAXEXTPROC) (GLenum target);
+#endif
+
+#ifndef GL_EXT_convolution
+#define GL_EXT_convolution 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glConvolutionFilter1DEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glConvolutionFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glConvolutionParameterfEXT (GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glConvolutionParameterfvEXT (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glConvolutionParameteriEXT (GLenum, GLenum, GLint);
+GLAPI void APIENTRY glConvolutionParameterivEXT (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glCopyConvolutionFilter1DEXT (GLenum, GLenum, GLint, GLint, GLsizei);
+GLAPI void APIENTRY glCopyConvolutionFilter2DEXT (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
+GLAPI void APIENTRY glGetConvolutionFilterEXT (GLenum, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetConvolutionParameterfvEXT (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetConvolutionParameterivEXT (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetSeparableFilterEXT (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
+GLAPI void APIENTRY glSeparableFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
+typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
+#endif
+
+#ifndef GL_EXT_color_matrix
+#define GL_EXT_color_matrix 1
+#endif
+
+#ifndef GL_SGI_color_table
+#define GL_SGI_color_table 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorTableSGI (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glColorTableParameterfvSGI (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glColorTableParameterivSGI (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glCopyColorTableSGI (GLenum, GLenum, GLint, GLint, GLsizei);
+GLAPI void APIENTRY glGetColorTableSGI (GLenum, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetColorTableParameterfvSGI (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetColorTableParameterivSGI (GLenum, GLenum, GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint *params);
+#endif
+
+#ifndef GL_SGIX_pixel_texture
+#define GL_SGIX_pixel_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelTexGenSGIX (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPIXELTEXGENSGIXPROC) (GLenum mode);
+#endif
+
+#ifndef GL_SGIS_pixel_texture
+#define GL_SGIS_pixel_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelTexGenParameteriSGIS (GLenum, GLint);
+GLAPI void APIENTRY glPixelTexGenParameterivSGIS (GLenum, const GLint *);
+GLAPI void APIENTRY glPixelTexGenParameterfSGIS (GLenum, GLfloat);
+GLAPI void APIENTRY glPixelTexGenParameterfvSGIS (GLenum, const GLfloat *);
+GLAPI void APIENTRY glGetPixelTexGenParameterivSGIS (GLenum, GLint *);
+GLAPI void APIENTRY glGetPixelTexGenParameterfvSGIS (GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERISGISPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, GLfloat *params);
+#endif
+
+#ifndef GL_SGIS_texture4D
+#define GL_SGIS_texture4D 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexImage4DSGIS (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glTexSubImage4DSGIS (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels);
+#endif
+
+#ifndef GL_SGI_texture_color_table
+#define GL_SGI_texture_color_table 1
+#endif
+
+#ifndef GL_EXT_cmyka
+#define GL_EXT_cmyka 1
+#endif
+
+#ifndef GL_EXT_texture_object
+#define GL_EXT_texture_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glAreTexturesResidentEXT (GLsizei, const GLuint *, GLboolean *);
+GLAPI void APIENTRY glBindTextureEXT (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteTexturesEXT (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenTexturesEXT (GLsizei, GLuint *);
+GLAPI GLboolean APIENTRY glIsTextureEXT (GLuint);
+GLAPI void APIENTRY glPrioritizeTexturesEXT (GLsizei, const GLuint *, const GLclampf *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLboolean (APIENTRYP PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint *textures, GLboolean *residences);
+typedef void (APIENTRYP PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture);
+typedef void (APIENTRYP PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint *textures);
+typedef void (APIENTRYP PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint *textures);
+typedef GLboolean (APIENTRYP PFNGLISTEXTUREEXTPROC) (GLuint texture);
+typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint *textures, const GLclampf *priorities);
+#endif
+
+#ifndef GL_SGIS_detail_texture
+#define GL_SGIS_detail_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDetailTexFuncSGIS (GLenum, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glGetDetailTexFuncSGIS (GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
+typedef void (APIENTRYP PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
+#endif
+
+#ifndef GL_SGIS_sharpen_texture
+#define GL_SGIS_sharpen_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSharpenTexFuncSGIS (GLenum, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glGetSharpenTexFuncSGIS (GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
+typedef void (APIENTRYP PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
+#endif
+
+#ifndef GL_EXT_packed_pixels
+#define GL_EXT_packed_pixels 1
+#endif
+
+#ifndef GL_SGIS_texture_lod
+#define GL_SGIS_texture_lod 1
+#endif
+
+#ifndef GL_SGIS_multisample
+#define GL_SGIS_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSampleMaskSGIS (GLclampf, GLboolean);
+GLAPI void APIENTRY glSamplePatternSGIS (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern);
+#endif
+
+#ifndef GL_EXT_rescale_normal
+#define GL_EXT_rescale_normal 1
+#endif
+
+#ifndef GL_EXT_vertex_array
+#define GL_EXT_vertex_array 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glArrayElementEXT (GLint);
+GLAPI void APIENTRY glColorPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glDrawArraysEXT (GLenum, GLint, GLsizei);
+GLAPI void APIENTRY glEdgeFlagPointerEXT (GLsizei, GLsizei, const GLboolean *);
+GLAPI void APIENTRY glGetPointervEXT (GLenum, GLvoid* *);
+GLAPI void APIENTRY glIndexPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glNormalPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glTexCoordPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glVertexPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLARRAYELEMENTEXTPROC) (GLint i);
+typedef void (APIENTRYP PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean *pointer);
+typedef void (APIENTRYP PFNGLGETPOINTERVEXTPROC) (GLenum pname, GLvoid* *params);
+typedef void (APIENTRYP PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+#endif
+
+#ifndef GL_EXT_misc_attribute
+#define GL_EXT_misc_attribute 1
+#endif
+
+#ifndef GL_SGIS_generate_mipmap
+#define GL_SGIS_generate_mipmap 1
+#endif
+
+#ifndef GL_SGIX_clipmap
+#define GL_SGIX_clipmap 1
+#endif
+
+#ifndef GL_SGIX_shadow
+#define GL_SGIX_shadow 1
+#endif
+
+#ifndef GL_SGIS_texture_edge_clamp
+#define GL_SGIS_texture_edge_clamp 1
+#endif
+
+#ifndef GL_SGIS_texture_border_clamp
+#define GL_SGIS_texture_border_clamp 1
+#endif
+
+#ifndef GL_EXT_blend_minmax
+#define GL_EXT_blend_minmax 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationEXT (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDEQUATIONEXTPROC) (GLenum mode);
+#endif
+
+#ifndef GL_EXT_blend_subtract
+#define GL_EXT_blend_subtract 1
+#endif
+
+#ifndef GL_EXT_blend_logic_op
+#define GL_EXT_blend_logic_op 1
+#endif
+
+#ifndef GL_SGIX_interlace
+#define GL_SGIX_interlace 1
+#endif
+
+#ifndef GL_SGIX_pixel_tiles
+#define GL_SGIX_pixel_tiles 1
+#endif
+
+#ifndef GL_SGIX_texture_select
+#define GL_SGIX_texture_select 1
+#endif
+
+#ifndef GL_SGIX_sprite
+#define GL_SGIX_sprite 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSpriteParameterfSGIX (GLenum, GLfloat);
+GLAPI void APIENTRY glSpriteParameterfvSGIX (GLenum, const GLfloat *);
+GLAPI void APIENTRY glSpriteParameteriSGIX (GLenum, GLint);
+GLAPI void APIENTRY glSpriteParameterivSGIX (GLenum, const GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, const GLint *params);
+#endif
+
+#ifndef GL_SGIX_texture_multi_buffer
+#define GL_SGIX_texture_multi_buffer 1
+#endif
+
+#ifndef GL_EXT_point_parameters
+#define GL_EXT_point_parameters 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameterfEXT (GLenum, GLfloat);
+GLAPI void APIENTRY glPointParameterfvEXT (GLenum, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat *params);
+#endif
+
+#ifndef GL_SGIS_point_parameters
+#define GL_SGIS_point_parameters 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameterfSGIS (GLenum, GLfloat);
+GLAPI void APIENTRY glPointParameterfvSGIS (GLenum, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
+#endif
+
+#ifndef GL_SGIX_instruments
+#define GL_SGIX_instruments 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLint APIENTRY glGetInstrumentsSGIX (void);
+GLAPI void APIENTRY glInstrumentsBufferSGIX (GLsizei, GLint *);
+GLAPI GLint APIENTRY glPollInstrumentsSGIX (GLint *);
+GLAPI void APIENTRY glReadInstrumentsSGIX (GLint);
+GLAPI void APIENTRY glStartInstrumentsSGIX (void);
+GLAPI void APIENTRY glStopInstrumentsSGIX (GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLint (APIENTRYP PFNGLGETINSTRUMENTSSGIXPROC) (void);
+typedef void (APIENTRYP PFNGLINSTRUMENTSBUFFERSGIXPROC) (GLsizei size, GLint *buffer);
+typedef GLint (APIENTRYP PFNGLPOLLINSTRUMENTSSGIXPROC) (GLint *marker_p);
+typedef void (APIENTRYP PFNGLREADINSTRUMENTSSGIXPROC) (GLint marker);
+typedef void (APIENTRYP PFNGLSTARTINSTRUMENTSSGIXPROC) (void);
+typedef void (APIENTRYP PFNGLSTOPINSTRUMENTSSGIXPROC) (GLint marker);
+#endif
+
+#ifndef GL_SGIX_texture_scale_bias
+#define GL_SGIX_texture_scale_bias 1
+#endif
+
+#ifndef GL_SGIX_framezoom
+#define GL_SGIX_framezoom 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFrameZoomSGIX (GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFRAMEZOOMSGIXPROC) (GLint factor);
+#endif
+
+#ifndef GL_SGIX_tag_sample_buffer
+#define GL_SGIX_tag_sample_buffer 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTagSampleBufferSGIX (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTAGSAMPLEBUFFERSGIXPROC) (void);
+#endif
+
+#ifndef GL_SGIX_polynomial_ffd
+#define GL_SGIX_polynomial_ffd 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDeformationMap3dSGIX (GLenum, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, const GLdouble *);
+GLAPI void APIENTRY glDeformationMap3fSGIX (GLenum, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, const GLfloat *);
+GLAPI void APIENTRY glDeformSGIX (GLbitfield);
+GLAPI void APIENTRY glLoadIdentityDeformationMapSGIX (GLbitfield);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDEFORMATIONMAP3DSGIXPROC) (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points);
+typedef void (APIENTRYP PFNGLDEFORMATIONMAP3FSGIXPROC) (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points);
+typedef void (APIENTRYP PFNGLDEFORMSGIXPROC) (GLbitfield mask);
+typedef void (APIENTRYP PFNGLLOADIDENTITYDEFORMATIONMAPSGIXPROC) (GLbitfield mask);
+#endif
+
+#ifndef GL_SGIX_reference_plane
+#define GL_SGIX_reference_plane 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glReferencePlaneSGIX (const GLdouble *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLREFERENCEPLANESGIXPROC) (const GLdouble *equation);
+#endif
+
+#ifndef GL_SGIX_flush_raster
+#define GL_SGIX_flush_raster 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFlushRasterSGIX (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFLUSHRASTERSGIXPROC) (void);
+#endif
+
+#ifndef GL_SGIX_depth_texture
+#define GL_SGIX_depth_texture 1
+#endif
+
+#ifndef GL_SGIS_fog_function
+#define GL_SGIS_fog_function 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFogFuncSGIS (GLsizei, const GLfloat *);
+GLAPI void APIENTRY glGetFogFuncSGIS (GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat *points);
+typedef void (APIENTRYP PFNGLGETFOGFUNCSGISPROC) (GLfloat *points);
+#endif
+
+#ifndef GL_SGIX_fog_offset
+#define GL_SGIX_fog_offset 1
+#endif
+
+#ifndef GL_HP_image_transform
+#define GL_HP_image_transform 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glImageTransformParameteriHP (GLenum, GLenum, GLint);
+GLAPI void APIENTRY glImageTransformParameterfHP (GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glImageTransformParameterivHP (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glImageTransformParameterfvHP (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glGetImageTransformParameterivHP (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetImageTransformParameterfvHP (GLenum, GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, GLfloat *params);
+#endif
+
+#ifndef GL_HP_convolution_border_modes
+#define GL_HP_convolution_border_modes 1
+#endif
+
+#ifndef GL_SGIX_texture_add_env
+#define GL_SGIX_texture_add_env 1
+#endif
+
+#ifndef GL_EXT_color_subtable
+#define GL_EXT_color_subtable 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorSubTableEXT (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glCopyColorSubTableEXT (GLenum, GLsizei, GLint, GLint, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+#endif
+
+#ifndef GL_PGI_vertex_hints
+#define GL_PGI_vertex_hints 1
+#endif
+
+#ifndef GL_PGI_misc_hints
+#define GL_PGI_misc_hints 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glHintPGI (GLenum, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLHINTPGIPROC) (GLenum target, GLint mode);
+#endif
+
+#ifndef GL_EXT_paletted_texture
+#define GL_EXT_paletted_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorTableEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glGetColorTableEXT (GLenum, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetColorTableParameterivEXT (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetColorTableParameterfvEXT (GLenum, GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *data);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+#endif
+
+#ifndef GL_EXT_clip_volume_hint
+#define GL_EXT_clip_volume_hint 1
+#endif
+
+#ifndef GL_SGIX_list_priority
+#define GL_SGIX_list_priority 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetListParameterfvSGIX (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetListParameterivSGIX (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glListParameterfSGIX (GLuint, GLenum, GLfloat);
+GLAPI void APIENTRY glListParameterfvSGIX (GLuint, GLenum, const GLfloat *);
+GLAPI void APIENTRY glListParameteriSGIX (GLuint, GLenum, GLint);
+GLAPI void APIENTRY glListParameterivSGIX (GLuint, GLenum, const GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLLISTPARAMETERFSGIXPROC) (GLuint list, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLLISTPARAMETERISGIXPROC) (GLuint list, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, const GLint *params);
+#endif
+
+#ifndef GL_SGIX_ir_instrument1
+#define GL_SGIX_ir_instrument1 1
+#endif
+
+#ifndef GL_SGIX_calligraphic_fragment
+#define GL_SGIX_calligraphic_fragment 1
+#endif
+
+#ifndef GL_SGIX_texture_lod_bias
+#define GL_SGIX_texture_lod_bias 1
+#endif
+
+#ifndef GL_SGIX_shadow_ambient
+#define GL_SGIX_shadow_ambient 1
+#endif
+
+#ifndef GL_EXT_index_texture
+#define GL_EXT_index_texture 1
+#endif
+
+#ifndef GL_EXT_index_material
+#define GL_EXT_index_material 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glIndexMaterialEXT (GLenum, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode);
+#endif
+
+#ifndef GL_EXT_index_func
+#define GL_EXT_index_func 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glIndexFuncEXT (GLenum, GLclampf);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLINDEXFUNCEXTPROC) (GLenum func, GLclampf ref);
+#endif
+
+#ifndef GL_EXT_index_array_formats
+#define GL_EXT_index_array_formats 1
+#endif
+
+#ifndef GL_EXT_compiled_vertex_array
+#define GL_EXT_compiled_vertex_array 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glLockArraysEXT (GLint, GLsizei);
+GLAPI void APIENTRY glUnlockArraysEXT (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLUNLOCKARRAYSEXTPROC) (void);
+#endif
+
+#ifndef GL_EXT_cull_vertex
+#define GL_EXT_cull_vertex 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCullParameterdvEXT (GLenum, GLdouble *);
+GLAPI void APIENTRY glCullParameterfvEXT (GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat *params);
+#endif
+
+#ifndef GL_SGIX_ycrcb
+#define GL_SGIX_ycrcb 1
+#endif
+
+#ifndef GL_SGIX_fragment_lighting
+#define GL_SGIX_fragment_lighting 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFragmentColorMaterialSGIX (GLenum, GLenum);
+GLAPI void APIENTRY glFragmentLightfSGIX (GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glFragmentLightfvSGIX (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glFragmentLightiSGIX (GLenum, GLenum, GLint);
+GLAPI void APIENTRY glFragmentLightivSGIX (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glFragmentLightModelfSGIX (GLenum, GLfloat);
+GLAPI void APIENTRY glFragmentLightModelfvSGIX (GLenum, const GLfloat *);
+GLAPI void APIENTRY glFragmentLightModeliSGIX (GLenum, GLint);
+GLAPI void APIENTRY glFragmentLightModelivSGIX (GLenum, const GLint *);
+GLAPI void APIENTRY glFragmentMaterialfSGIX (GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glFragmentMaterialfvSGIX (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glFragmentMaterialiSGIX (GLenum, GLenum, GLint);
+GLAPI void APIENTRY glFragmentMaterialivSGIX (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glGetFragmentLightfvSGIX (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetFragmentLightivSGIX (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetFragmentMaterialfvSGIX (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetFragmentMaterialivSGIX (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glLightEnviSGIX (GLenum, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLLIGHTENVISGIXPROC) (GLenum pname, GLint param);
+#endif
+
+#ifndef GL_IBM_rasterpos_clip
+#define GL_IBM_rasterpos_clip 1
+#endif
+
+#ifndef GL_HP_texture_lighting
+#define GL_HP_texture_lighting 1
+#endif
+
+#ifndef GL_EXT_draw_range_elements
+#define GL_EXT_draw_range_elements 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawRangeElementsEXT (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+#endif
+
+#ifndef GL_WIN_phong_shading
+#define GL_WIN_phong_shading 1
+#endif
+
+#ifndef GL_WIN_specular_fog
+#define GL_WIN_specular_fog 1
+#endif
+
+#ifndef GL_EXT_light_texture
+#define GL_EXT_light_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glApplyTextureEXT (GLenum);
+GLAPI void APIENTRY glTextureLightEXT (GLenum);
+GLAPI void APIENTRY glTextureMaterialEXT (GLenum, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLTEXTURELIGHTEXTPROC) (GLenum pname);
+typedef void (APIENTRYP PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode);
+#endif
+
+#ifndef GL_SGIX_blend_alpha_minmax
+#define GL_SGIX_blend_alpha_minmax 1
+#endif
+
+#ifndef GL_EXT_bgra
+#define GL_EXT_bgra 1
+#endif
+
+#ifndef GL_SGIX_async
+#define GL_SGIX_async 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glAsyncMarkerSGIX (GLuint);
+GLAPI GLint APIENTRY glFinishAsyncSGIX (GLuint *);
+GLAPI GLint APIENTRY glPollAsyncSGIX (GLuint *);
+GLAPI GLuint APIENTRY glGenAsyncMarkersSGIX (GLsizei);
+GLAPI void APIENTRY glDeleteAsyncMarkersSGIX (GLuint, GLsizei);
+GLAPI GLboolean APIENTRY glIsAsyncMarkerSGIX (GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLASYNCMARKERSGIXPROC) (GLuint marker);
+typedef GLint (APIENTRYP PFNGLFINISHASYNCSGIXPROC) (GLuint *markerp);
+typedef GLint (APIENTRYP PFNGLPOLLASYNCSGIXPROC) (GLuint *markerp);
+typedef GLuint (APIENTRYP PFNGLGENASYNCMARKERSSGIXPROC) (GLsizei range);
+typedef void (APIENTRYP PFNGLDELETEASYNCMARKERSSGIXPROC) (GLuint marker, GLsizei range);
+typedef GLboolean (APIENTRYP PFNGLISASYNCMARKERSGIXPROC) (GLuint marker);
+#endif
+
+#ifndef GL_SGIX_async_pixel
+#define GL_SGIX_async_pixel 1
+#endif
+
+#ifndef GL_SGIX_async_histogram
+#define GL_SGIX_async_histogram 1
+#endif
+
+#ifndef GL_INTEL_parallel_arrays
+#define GL_INTEL_parallel_arrays 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexPointervINTEL (GLint, GLenum, const GLvoid* *);
+GLAPI void APIENTRY glNormalPointervINTEL (GLenum, const GLvoid* *);
+GLAPI void APIENTRY glColorPointervINTEL (GLint, GLenum, const GLvoid* *);
+GLAPI void APIENTRY glTexCoordPointervINTEL (GLint, GLenum, const GLvoid* *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
+typedef void (APIENTRYP PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const GLvoid* *pointer);
+typedef void (APIENTRYP PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
+typedef void (APIENTRYP PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
+#endif
+
+#ifndef GL_HP_occlusion_test
+#define GL_HP_occlusion_test 1
+#endif
+
+#ifndef GL_EXT_pixel_transform
+#define GL_EXT_pixel_transform 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelTransformParameteriEXT (GLenum, GLenum, GLint);
+GLAPI void APIENTRY glPixelTransformParameterfEXT (GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glPixelTransformParameterivEXT (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glPixelTransformParameterfvEXT (GLenum, GLenum, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
+#endif
+
+#ifndef GL_EXT_pixel_transform_color_table
+#define GL_EXT_pixel_transform_color_table 1
+#endif
+
+#ifndef GL_EXT_shared_texture_palette
+#define GL_EXT_shared_texture_palette 1
+#endif
+
+#ifndef GL_EXT_separate_specular_color
+#define GL_EXT_separate_specular_color 1
+#endif
+
+#ifndef GL_EXT_secondary_color
+#define GL_EXT_secondary_color 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSecondaryColor3bEXT (GLbyte, GLbyte, GLbyte);
+GLAPI void APIENTRY glSecondaryColor3bvEXT (const GLbyte *);
+GLAPI void APIENTRY glSecondaryColor3dEXT (GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glSecondaryColor3dvEXT (const GLdouble *);
+GLAPI void APIENTRY glSecondaryColor3fEXT (GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glSecondaryColor3fvEXT (const GLfloat *);
+GLAPI void APIENTRY glSecondaryColor3iEXT (GLint, GLint, GLint);
+GLAPI void APIENTRY glSecondaryColor3ivEXT (const GLint *);
+GLAPI void APIENTRY glSecondaryColor3sEXT (GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glSecondaryColor3svEXT (const GLshort *);
+GLAPI void APIENTRY glSecondaryColor3ubEXT (GLubyte, GLubyte, GLubyte);
+GLAPI void APIENTRY glSecondaryColor3ubvEXT (const GLubyte *);
+GLAPI void APIENTRY glSecondaryColor3uiEXT (GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glSecondaryColor3uivEXT (const GLuint *);
+GLAPI void APIENTRY glSecondaryColor3usEXT (GLushort, GLushort, GLushort);
+GLAPI void APIENTRY glSecondaryColor3usvEXT (const GLushort *);
+GLAPI void APIENTRY glSecondaryColorPointerEXT (GLint, GLenum, GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif
+
+#ifndef GL_EXT_texture_perturb_normal
+#define GL_EXT_texture_perturb_normal 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTextureNormalEXT (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXTURENORMALEXTPROC) (GLenum mode);
+#endif
+
+#ifndef GL_EXT_multi_draw_arrays
+#define GL_EXT_multi_draw_arrays 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiDrawArraysEXT (GLenum, GLint *, GLsizei *, GLsizei);
+GLAPI void APIENTRY glMultiDrawElementsEXT (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
+#endif
+
+#ifndef GL_EXT_fog_coord
+#define GL_EXT_fog_coord 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFogCoordfEXT (GLfloat);
+GLAPI void APIENTRY glFogCoordfvEXT (const GLfloat *);
+GLAPI void APIENTRY glFogCoorddEXT (GLdouble);
+GLAPI void APIENTRY glFogCoorddvEXT (const GLdouble *);
+GLAPI void APIENTRY glFogCoordPointerEXT (GLenum, GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFOGCOORDFEXTPROC) (GLfloat coord);
+typedef void (APIENTRYP PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDEXTPROC) (GLdouble coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif
+
+#ifndef GL_REND_screen_coordinates
+#define GL_REND_screen_coordinates 1
+#endif
+
+#ifndef GL_EXT_coordinate_frame
+#define GL_EXT_coordinate_frame 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTangent3bEXT (GLbyte, GLbyte, GLbyte);
+GLAPI void APIENTRY glTangent3bvEXT (const GLbyte *);
+GLAPI void APIENTRY glTangent3dEXT (GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glTangent3dvEXT (const GLdouble *);
+GLAPI void APIENTRY glTangent3fEXT (GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glTangent3fvEXT (const GLfloat *);
+GLAPI void APIENTRY glTangent3iEXT (GLint, GLint, GLint);
+GLAPI void APIENTRY glTangent3ivEXT (const GLint *);
+GLAPI void APIENTRY glTangent3sEXT (GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glTangent3svEXT (const GLshort *);
+GLAPI void APIENTRY glBinormal3bEXT (GLbyte, GLbyte, GLbyte);
+GLAPI void APIENTRY glBinormal3bvEXT (const GLbyte *);
+GLAPI void APIENTRY glBinormal3dEXT (GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glBinormal3dvEXT (const GLdouble *);
+GLAPI void APIENTRY glBinormal3fEXT (GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glBinormal3fvEXT (const GLfloat *);
+GLAPI void APIENTRY glBinormal3iEXT (GLint, GLint, GLint);
+GLAPI void APIENTRY glBinormal3ivEXT (const GLint *);
+GLAPI void APIENTRY glBinormal3sEXT (GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glBinormal3svEXT (const GLshort *);
+GLAPI void APIENTRY glTangentPointerEXT (GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glBinormalPointerEXT (GLenum, GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTANGENT3BEXTPROC) (GLbyte tx, GLbyte ty, GLbyte tz);
+typedef void (APIENTRYP PFNGLTANGENT3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLTANGENT3DEXTPROC) (GLdouble tx, GLdouble ty, GLdouble tz);
+typedef void (APIENTRYP PFNGLTANGENT3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLTANGENT3FEXTPROC) (GLfloat tx, GLfloat ty, GLfloat tz);
+typedef void (APIENTRYP PFNGLTANGENT3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLTANGENT3IEXTPROC) (GLint tx, GLint ty, GLint tz);
+typedef void (APIENTRYP PFNGLTANGENT3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLTANGENT3SEXTPROC) (GLshort tx, GLshort ty, GLshort tz);
+typedef void (APIENTRYP PFNGLTANGENT3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLBINORMAL3BEXTPROC) (GLbyte bx, GLbyte by, GLbyte bz);
+typedef void (APIENTRYP PFNGLBINORMAL3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLBINORMAL3DEXTPROC) (GLdouble bx, GLdouble by, GLdouble bz);
+typedef void (APIENTRYP PFNGLBINORMAL3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLBINORMAL3FEXTPROC) (GLfloat bx, GLfloat by, GLfloat bz);
+typedef void (APIENTRYP PFNGLBINORMAL3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLBINORMAL3IEXTPROC) (GLint bx, GLint by, GLint bz);
+typedef void (APIENTRYP PFNGLBINORMAL3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLBINORMAL3SEXTPROC) (GLshort bx, GLshort by, GLshort bz);
+typedef void (APIENTRYP PFNGLBINORMAL3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif
+
+#ifndef GL_EXT_texture_env_combine
+#define GL_EXT_texture_env_combine 1
+#endif
+
+#ifndef GL_APPLE_specular_vector
+#define GL_APPLE_specular_vector 1
+#endif
+
+#ifndef GL_APPLE_transform_hint
+#define GL_APPLE_transform_hint 1
+#endif
+
+#ifndef GL_SGIX_fog_scale
+#define GL_SGIX_fog_scale 1
+#endif
+
+#ifndef GL_SUNX_constant_data
+#define GL_SUNX_constant_data 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFinishTextureSUNX (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFINISHTEXTURESUNXPROC) (void);
+#endif
+
+#ifndef GL_SUN_global_alpha
+#define GL_SUN_global_alpha 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGlobalAlphaFactorbSUN (GLbyte);
+GLAPI void APIENTRY glGlobalAlphaFactorsSUN (GLshort);
+GLAPI void APIENTRY glGlobalAlphaFactoriSUN (GLint);
+GLAPI void APIENTRY glGlobalAlphaFactorfSUN (GLfloat);
+GLAPI void APIENTRY glGlobalAlphaFactordSUN (GLdouble);
+GLAPI void APIENTRY glGlobalAlphaFactorubSUN (GLubyte);
+GLAPI void APIENTRY glGlobalAlphaFactorusSUN (GLushort);
+GLAPI void APIENTRY glGlobalAlphaFactoruiSUN (GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor);
+#endif
+
+#ifndef GL_SUN_triangle_list
+#define GL_SUN_triangle_list 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glReplacementCodeuiSUN (GLuint);
+GLAPI void APIENTRY glReplacementCodeusSUN (GLushort);
+GLAPI void APIENTRY glReplacementCodeubSUN (GLubyte);
+GLAPI void APIENTRY glReplacementCodeuivSUN (const GLuint *);
+GLAPI void APIENTRY glReplacementCodeusvSUN (const GLushort *);
+GLAPI void APIENTRY glReplacementCodeubvSUN (const GLubyte *);
+GLAPI void APIENTRY glReplacementCodePointerSUN (GLenum, GLsizei, const GLvoid* *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint *code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort *code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte *code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const GLvoid* *pointer);
+#endif
+
+#ifndef GL_SUN_vertex
+#define GL_SUN_vertex 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColor4ubVertex2fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat);
+GLAPI void APIENTRY glColor4ubVertex2fvSUN (const GLubyte *, const GLfloat *);
+GLAPI void APIENTRY glColor4ubVertex3fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glColor4ubVertex3fvSUN (const GLubyte *, const GLfloat *);
+GLAPI void APIENTRY glColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glColor3fVertex3fvSUN (const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glTexCoord2fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glTexCoord2fVertex3fvSUN (const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glTexCoord4fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glTexCoord4fVertex4fvSUN (const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fSUN (GLfloat, GLfloat, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fvSUN (const GLfloat *, const GLubyte *, const GLfloat *);
+GLAPI void APIENTRY glTexCoord2fColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glTexCoord2fColor3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glReplacementCodeuiVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glReplacementCodeuiVertex3fvSUN (const GLuint *, const GLfloat *);
+GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fSUN (GLuint, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fvSUN (const GLuint *, const GLubyte *, const GLfloat *);
+GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat *tc, const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLuint rc, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLuint *rc, const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+#endif
+
+#ifndef GL_EXT_blend_func_separate
+#define GL_EXT_blend_func_separate 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncSeparateEXT (GLenum, GLenum, GLenum, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#endif
+
+#ifndef GL_INGR_blend_func_separate
+#define GL_INGR_blend_func_separate 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum, GLenum, GLenum, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINGRPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#endif
+
+#ifndef GL_INGR_color_clamp
+#define GL_INGR_color_clamp 1
+#endif
+
+#ifndef GL_INGR_interlace_read
+#define GL_INGR_interlace_read 1
+#endif
+
+#ifndef GL_EXT_stencil_wrap
+#define GL_EXT_stencil_wrap 1
+#endif
+
+#ifndef GL_EXT_422_pixels
+#define GL_EXT_422_pixels 1
+#endif
+
+#ifndef GL_NV_texgen_reflection
+#define GL_NV_texgen_reflection 1
+#endif
+
+#ifndef GL_SUN_convolution_border_modes
+#define GL_SUN_convolution_border_modes 1
+#endif
+
+#ifndef GL_EXT_texture_env_add
+#define GL_EXT_texture_env_add 1
+#endif
+
+#ifndef GL_EXT_texture_lod_bias
+#define GL_EXT_texture_lod_bias 1
+#endif
+
+#ifndef GL_EXT_texture_filter_anisotropic
+#define GL_EXT_texture_filter_anisotropic 1
+#endif
+
+#ifndef GL_EXT_vertex_weighting
+#define GL_EXT_vertex_weighting 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexWeightfEXT (GLfloat);
+GLAPI void APIENTRY glVertexWeightfvEXT (const GLfloat *);
+GLAPI void APIENTRY glVertexWeightPointerEXT (GLsizei, GLenum, GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTFVEXTPROC) (const GLfloat *weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif
+
+#ifndef GL_NV_light_max_exponent
+#define GL_NV_light_max_exponent 1
+#endif
+
+#ifndef GL_NV_vertex_array_range
+#define GL_NV_vertex_array_range 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFlushVertexArrayRangeNV (void);
+GLAPI void APIENTRY glVertexArrayRangeNV (GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void);
+typedef void (APIENTRYP PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, const GLvoid *pointer);
+#endif
+
+#ifndef GL_NV_register_combiners
+#define GL_NV_register_combiners 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCombinerParameterfvNV (GLenum, const GLfloat *);
+GLAPI void APIENTRY glCombinerParameterfNV (GLenum, GLfloat);
+GLAPI void APIENTRY glCombinerParameterivNV (GLenum, const GLint *);
+GLAPI void APIENTRY glCombinerParameteriNV (GLenum, GLint);
+GLAPI void APIENTRY glCombinerInputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum);
+GLAPI void APIENTRY glCombinerOutputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLboolean, GLboolean, GLboolean);
+GLAPI void APIENTRY glFinalCombinerInputNV (GLenum, GLenum, GLenum, GLenum);
+GLAPI void APIENTRY glGetCombinerInputParameterfvNV (GLenum, GLenum, GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetCombinerInputParameterivNV (GLenum, GLenum, GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetCombinerOutputParameterfvNV (GLenum, GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetCombinerOutputParameterivNV (GLenum, GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetFinalCombinerInputParameterfvNV (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetFinalCombinerInputParameterivNV (GLenum, GLenum, GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+typedef void (APIENTRYP PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
+typedef void (APIENTRYP PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint *params);
+#endif
+
+#ifndef GL_NV_fog_distance
+#define GL_NV_fog_distance 1
+#endif
+
+#ifndef GL_NV_texgen_emboss
+#define GL_NV_texgen_emboss 1
+#endif
+
+#ifndef GL_NV_blend_square
+#define GL_NV_blend_square 1
+#endif
+
+#ifndef GL_NV_texture_env_combine4
+#define GL_NV_texture_env_combine4 1
+#endif
+
+#ifndef GL_MESA_resize_buffers
+#define GL_MESA_resize_buffers 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glResizeBuffersMESA (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLRESIZEBUFFERSMESAPROC) (void);
+#endif
+
+#ifndef GL_MESA_window_pos
+#define GL_MESA_window_pos 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glWindowPos2dMESA (GLdouble, GLdouble);
+GLAPI void APIENTRY glWindowPos2dvMESA (const GLdouble *);
+GLAPI void APIENTRY glWindowPos2fMESA (GLfloat, GLfloat);
+GLAPI void APIENTRY glWindowPos2fvMESA (const GLfloat *);
+GLAPI void APIENTRY glWindowPos2iMESA (GLint, GLint);
+GLAPI void APIENTRY glWindowPos2ivMESA (const GLint *);
+GLAPI void APIENTRY glWindowPos2sMESA (GLshort, GLshort);
+GLAPI void APIENTRY glWindowPos2svMESA (const GLshort *);
+GLAPI void APIENTRY glWindowPos3dMESA (GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glWindowPos3dvMESA (const GLdouble *);
+GLAPI void APIENTRY glWindowPos3fMESA (GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glWindowPos3fvMESA (const GLfloat *);
+GLAPI void APIENTRY glWindowPos3iMESA (GLint, GLint, GLint);
+GLAPI void APIENTRY glWindowPos3ivMESA (const GLint *);
+GLAPI void APIENTRY glWindowPos3sMESA (GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glWindowPos3svMESA (const GLshort *);
+GLAPI void APIENTRY glWindowPos4dMESA (GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glWindowPos4dvMESA (const GLdouble *);
+GLAPI void APIENTRY glWindowPos4fMESA (GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glWindowPos4fvMESA (const GLfloat *);
+GLAPI void APIENTRY glWindowPos4iMESA (GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glWindowPos4ivMESA (const GLint *);
+GLAPI void APIENTRY glWindowPos4sMESA (GLshort, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glWindowPos4svMESA (const GLshort *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IVMESAPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SVMESAPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IVMESAPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SVMESAPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4IVMESAPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4SVMESAPROC) (const GLshort *v);
+#endif
+
+#ifndef GL_IBM_cull_vertex
+#define GL_IBM_cull_vertex 1
+#endif
+
+#ifndef GL_IBM_multimode_draw_arrays
+#define GL_IBM_multimode_draw_arrays 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiModeDrawArraysIBM (const GLenum *, const GLint *, const GLsizei *, GLsizei, GLint);
+GLAPI void APIENTRY glMultiModeDrawElementsIBM (const GLenum *, const GLsizei *, GLenum, const GLvoid* const *, GLsizei, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
+typedef void (APIENTRYP PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, GLint modestride);
+#endif
+
+#ifndef GL_IBM_vertex_array_lists
+#define GL_IBM_vertex_array_lists 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
+GLAPI void APIENTRY glSecondaryColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
+GLAPI void APIENTRY glEdgeFlagPointerListIBM (GLint, const GLboolean* *, GLint);
+GLAPI void APIENTRY glFogCoordPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
+GLAPI void APIENTRY glIndexPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
+GLAPI void APIENTRY glNormalPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
+GLAPI void APIENTRY glTexCoordPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
+GLAPI void APIENTRY glVertexPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+#endif
+
+#ifndef GL_SGIX_subsample
+#define GL_SGIX_subsample 1
+#endif
+
+#ifndef GL_SGIX_ycrcba
+#define GL_SGIX_ycrcba 1
+#endif
+
+#ifndef GL_SGIX_ycrcb_subsample
+#define GL_SGIX_ycrcb_subsample 1
+#endif
+
+#ifndef GL_SGIX_depth_pass_instrument
+#define GL_SGIX_depth_pass_instrument 1
+#endif
+
+#ifndef GL_3DFX_texture_compression_FXT1
+#define GL_3DFX_texture_compression_FXT1 1
+#endif
+
+#ifndef GL_3DFX_multisample
+#define GL_3DFX_multisample 1
+#endif
+
+#ifndef GL_3DFX_tbuffer
+#define GL_3DFX_tbuffer 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTbufferMask3DFX (GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTBUFFERMASK3DFXPROC) (GLuint mask);
+#endif
+
+#ifndef GL_EXT_multisample
+#define GL_EXT_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSampleMaskEXT (GLclampf, GLboolean);
+GLAPI void APIENTRY glSamplePatternEXT (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern);
+#endif
+
+#ifndef GL_SGIX_vertex_preclip
+#define GL_SGIX_vertex_preclip 1
+#endif
+
+#ifndef GL_SGIX_convolution_accuracy
+#define GL_SGIX_convolution_accuracy 1
+#endif
+
+#ifndef GL_SGIX_resample
+#define GL_SGIX_resample 1
+#endif
+
+#ifndef GL_SGIS_point_line_texgen
+#define GL_SGIS_point_line_texgen 1
+#endif
+
+#ifndef GL_SGIS_texture_color_mask
+#define GL_SGIS_texture_color_mask 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTextureColorMaskSGIS (GLboolean, GLboolean, GLboolean, GLboolean);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXTURECOLORMASKSGISPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+#endif
+
+#ifndef GL_SGIX_igloo_interface
+#define GL_SGIX_igloo_interface 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glIglooInterfaceSGIX (GLenum, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLIGLOOINTERFACESGIXPROC) (GLenum pname, const GLvoid *params);
+#endif
+
+#ifndef GL_EXT_texture_env_dot3
+#define GL_EXT_texture_env_dot3 1
+#endif
+
+#ifndef GL_ATI_texture_mirror_once
+#define GL_ATI_texture_mirror_once 1
+#endif
+
+#ifndef GL_NV_fence
+#define GL_NV_fence 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDeleteFencesNV (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenFencesNV (GLsizei, GLuint *);
+GLAPI GLboolean APIENTRY glIsFenceNV (GLuint);
+GLAPI GLboolean APIENTRY glTestFenceNV (GLuint);
+GLAPI void APIENTRY glGetFenceivNV (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glFinishFenceNV (GLuint);
+GLAPI void APIENTRY glSetFenceNV (GLuint, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences);
+typedef void (APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences);
+typedef GLboolean (APIENTRYP PFNGLISFENCENVPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence);
+typedef void (APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence);
+typedef void (APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition);
+#endif
+
+#ifndef GL_NV_evaluators
+#define GL_NV_evaluators 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMapControlPointsNV (GLenum, GLuint, GLenum, GLsizei, GLsizei, GLint, GLint, GLboolean, const GLvoid *);
+GLAPI void APIENTRY glMapParameterivNV (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glMapParameterfvNV (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glGetMapControlPointsNV (GLenum, GLuint, GLenum, GLsizei, GLsizei, GLboolean, GLvoid *);
+GLAPI void APIENTRY glGetMapParameterivNV (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetMapParameterfvNV (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetMapAttribParameterivNV (GLenum, GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetMapAttribParameterfvNV (GLenum, GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glEvalMapsNV (GLenum, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points);
+typedef void (APIENTRYP PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points);
+typedef void (APIENTRYP PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode);
+#endif
+
+#ifndef GL_NV_packed_depth_stencil
+#define GL_NV_packed_depth_stencil 1
+#endif
+
+#ifndef GL_NV_register_combiners2
+#define GL_NV_register_combiners2 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCombinerStageParameterfvNV (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glGetCombinerStageParameterfvNV (GLenum, GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat *params);
+#endif
+
+#ifndef GL_NV_texture_compression_vtc
+#define GL_NV_texture_compression_vtc 1
+#endif
+
+#ifndef GL_NV_texture_rectangle
+#define GL_NV_texture_rectangle 1
+#endif
+
+#ifndef GL_NV_texture_shader
+#define GL_NV_texture_shader 1
+#endif
+
+#ifndef GL_NV_texture_shader2
+#define GL_NV_texture_shader2 1
+#endif
+
+#ifndef GL_NV_vertex_array_range2
+#define GL_NV_vertex_array_range2 1
+#endif
+
+#ifndef GL_NV_vertex_program
+#define GL_NV_vertex_program 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glAreProgramsResidentNV (GLsizei, const GLuint *, GLboolean *);
+GLAPI void APIENTRY glBindProgramNV (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteProgramsNV (GLsizei, const GLuint *);
+GLAPI void APIENTRY glExecuteProgramNV (GLenum, GLuint, const GLfloat *);
+GLAPI void APIENTRY glGenProgramsNV (GLsizei, GLuint *);
+GLAPI void APIENTRY glGetProgramParameterdvNV (GLenum, GLuint, GLenum, GLdouble *);
+GLAPI void APIENTRY glGetProgramParameterfvNV (GLenum, GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetProgramivNV (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetProgramStringNV (GLuint, GLenum, GLubyte *);
+GLAPI void APIENTRY glGetTrackMatrixivNV (GLenum, GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetVertexAttribdvNV (GLuint, GLenum, GLdouble *);
+GLAPI void APIENTRY glGetVertexAttribfvNV (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetVertexAttribivNV (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetVertexAttribPointervNV (GLuint, GLenum, GLvoid* *);
+GLAPI GLboolean APIENTRY glIsProgramNV (GLuint);
+GLAPI void APIENTRY glLoadProgramNV (GLenum, GLuint, GLsizei, const GLubyte *);
+GLAPI void APIENTRY glProgramParameter4dNV (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glProgramParameter4dvNV (GLenum, GLuint, const GLdouble *);
+GLAPI void APIENTRY glProgramParameter4fNV (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glProgramParameter4fvNV (GLenum, GLuint, const GLfloat *);
+GLAPI void APIENTRY glProgramParameters4dvNV (GLenum, GLuint, GLuint, const GLdouble *);
+GLAPI void APIENTRY glProgramParameters4fvNV (GLenum, GLuint, GLuint, const GLfloat *);
+GLAPI void APIENTRY glRequestResidentProgramsNV (GLsizei, const GLuint *);
+GLAPI void APIENTRY glTrackMatrixNV (GLenum, GLuint, GLenum, GLenum);
+GLAPI void APIENTRY glVertexAttribPointerNV (GLuint, GLint, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glVertexAttrib1dNV (GLuint, GLdouble);
+GLAPI void APIENTRY glVertexAttrib1dvNV (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib1fNV (GLuint, GLfloat);
+GLAPI void APIENTRY glVertexAttrib1fvNV (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib1sNV (GLuint, GLshort);
+GLAPI void APIENTRY glVertexAttrib1svNV (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib2dNV (GLuint, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib2dvNV (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib2fNV (GLuint, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib2fvNV (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib2sNV (GLuint, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib2svNV (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib3dNV (GLuint, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib3dvNV (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib3fNV (GLuint, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib3fvNV (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib3sNV (GLuint, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib3svNV (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib4dNV (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib4dvNV (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib4fNV (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib4fvNV (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib4sNV (GLuint, GLshort, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib4svNV (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib4ubNV (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
+GLAPI void APIENTRY glVertexAttrib4ubvNV (GLuint, const GLubyte *);
+GLAPI void APIENTRY glVertexAttribs1dvNV (GLuint, GLsizei, const GLdouble *);
+GLAPI void APIENTRY glVertexAttribs1fvNV (GLuint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glVertexAttribs1svNV (GLuint, GLsizei, const GLshort *);
+GLAPI void APIENTRY glVertexAttribs2dvNV (GLuint, GLsizei, const GLdouble *);
+GLAPI void APIENTRY glVertexAttribs2fvNV (GLuint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glVertexAttribs2svNV (GLuint, GLsizei, const GLshort *);
+GLAPI void APIENTRY glVertexAttribs3dvNV (GLuint, GLsizei, const GLdouble *);
+GLAPI void APIENTRY glVertexAttribs3fvNV (GLuint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glVertexAttribs3svNV (GLuint, GLsizei, const GLshort *);
+GLAPI void APIENTRY glVertexAttribs4dvNV (GLuint, GLsizei, const GLdouble *);
+GLAPI void APIENTRY glVertexAttribs4fvNV (GLuint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glVertexAttribs4svNV (GLuint, GLsizei, const GLshort *);
+GLAPI void APIENTRY glVertexAttribs4ubvNV (GLuint, GLsizei, const GLubyte *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLboolean (APIENTRYP PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences);
+typedef void (APIENTRYP PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
+typedef void (APIENTRYP PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint *programs);
+typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte *program);
+typedef void (APIENTRYP PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLuint count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLuint count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
+typedef void (APIENTRYP PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v);
+#endif
+
+#ifndef GL_SGIX_texture_coordinate_clamp
+#define GL_SGIX_texture_coordinate_clamp 1
+#endif
+
+#ifndef GL_SGIX_scalebias_hint
+#define GL_SGIX_scalebias_hint 1
+#endif
+
+#ifndef GL_OML_interlace
+#define GL_OML_interlace 1
+#endif
+
+#ifndef GL_OML_subsample
+#define GL_OML_subsample 1
+#endif
+
+#ifndef GL_OML_resample
+#define GL_OML_resample 1
+#endif
+
+#ifndef GL_NV_copy_depth_to_color
+#define GL_NV_copy_depth_to_color 1
+#endif
+
+#ifndef GL_ATI_envmap_bumpmap
+#define GL_ATI_envmap_bumpmap 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexBumpParameterivATI (GLenum, const GLint *);
+GLAPI void APIENTRY glTexBumpParameterfvATI (GLenum, const GLfloat *);
+GLAPI void APIENTRY glGetTexBumpParameterivATI (GLenum, GLint *);
+GLAPI void APIENTRY glGetTexBumpParameterfvATI (GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERIVATIPROC) (GLenum pname, const GLint *param);
+typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERFVATIPROC) (GLenum pname, const GLfloat *param);
+typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param);
+typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param);
+#endif
+
+#ifndef GL_ATI_fragment_shader
+#define GL_ATI_fragment_shader 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint APIENTRY glGenFragmentShadersATI (GLuint);
+GLAPI void APIENTRY glBindFragmentShaderATI (GLuint);
+GLAPI void APIENTRY glDeleteFragmentShaderATI (GLuint);
+GLAPI void APIENTRY glBeginFragmentShaderATI (void);
+GLAPI void APIENTRY glEndFragmentShaderATI (void);
+GLAPI void APIENTRY glPassTexCoordATI (GLuint, GLuint, GLenum);
+GLAPI void APIENTRY glSampleMapATI (GLuint, GLuint, GLenum);
+GLAPI void APIENTRY glColorFragmentOp1ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glColorFragmentOp2ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glColorFragmentOp3ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glAlphaFragmentOp1ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glAlphaFragmentOp2ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glAlphaFragmentOp3ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glSetFragmentShaderConstantATI (GLuint, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLuint (APIENTRYP PFNGLGENFRAGMENTSHADERSATIPROC) (GLuint range);
+typedef void (APIENTRYP PFNGLBINDFRAGMENTSHADERATIPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLDELETEFRAGMENTSHADERATIPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINFRAGMENTSHADERATIPROC) (void);
+typedef void (APIENTRYP PFNGLENDFRAGMENTSHADERATIPROC) (void);
+typedef void (APIENTRYP PFNGLPASSTEXCOORDATIPROC) (GLuint dst, GLuint coord, GLenum swizzle);
+typedef void (APIENTRYP PFNGLSAMPLEMAPATIPROC) (GLuint dst, GLuint interp, GLenum swizzle);
+typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+typedef void (APIENTRYP PFNGLSETFRAGMENTSHADERCONSTANTATIPROC) (GLuint dst, const GLfloat *value);
+#endif
+
+#ifndef GL_ATI_pn_triangles
+#define GL_ATI_pn_triangles 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPNTrianglesiATI (GLenum, GLint);
+GLAPI void APIENTRY glPNTrianglesfATI (GLenum, GLfloat);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param);
+#endif
+
+#ifndef GL_ATI_vertex_array_object
+#define GL_ATI_vertex_array_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint APIENTRY glNewObjectBufferATI (GLsizei, const GLvoid *, GLenum);
+GLAPI GLboolean APIENTRY glIsObjectBufferATI (GLuint);
+GLAPI void APIENTRY glUpdateObjectBufferATI (GLuint, GLuint, GLsizei, const GLvoid *, GLenum);
+GLAPI void APIENTRY glGetObjectBufferfvATI (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetObjectBufferivATI (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glFreeObjectBufferATI (GLuint);
+GLAPI void APIENTRY glArrayObjectATI (GLenum, GLint, GLenum, GLsizei, GLuint, GLuint);
+GLAPI void APIENTRY glGetArrayObjectfvATI (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetArrayObjectivATI (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glVariantArrayObjectATI (GLuint, GLenum, GLsizei, GLuint, GLuint);
+GLAPI void APIENTRY glGetVariantArrayObjectfvATI (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetVariantArrayObjectivATI (GLuint, GLenum, GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLuint (APIENTRYP PFNGLNEWOBJECTBUFFERATIPROC) (GLsizei size, const GLvoid *pointer, GLenum usage);
+typedef GLboolean (APIENTRYP PFNGLISOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLUPDATEOBJECTBUFFERATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const GLvoid *pointer, GLenum preserve);
+typedef void (APIENTRYP PFNGLGETOBJECTBUFFERFVATIPROC) (GLuint buffer, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETOBJECTBUFFERIVATIPROC) (GLuint buffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLFREEOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLARRAYOBJECTATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (APIENTRYP PFNGLGETARRAYOBJECTFVATIPROC) (GLenum array, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETARRAYOBJECTIVATIPROC) (GLenum array, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLVARIANTARRAYOBJECTATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTFVATIPROC) (GLuint id, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTIVATIPROC) (GLuint id, GLenum pname, GLint *params);
+#endif
+
+#ifndef GL_EXT_vertex_shader
+#define GL_EXT_vertex_shader 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginVertexShaderEXT (void);
+GLAPI void APIENTRY glEndVertexShaderEXT (void);
+GLAPI void APIENTRY glBindVertexShaderEXT (GLuint);
+GLAPI GLuint APIENTRY glGenVertexShadersEXT (GLuint);
+GLAPI void APIENTRY glDeleteVertexShaderEXT (GLuint);
+GLAPI void APIENTRY glShaderOp1EXT (GLenum, GLuint, GLuint);
+GLAPI void APIENTRY glShaderOp2EXT (GLenum, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glShaderOp3EXT (GLenum, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glSwizzleEXT (GLuint, GLuint, GLenum, GLenum, GLenum, GLenum);
+GLAPI void APIENTRY glWriteMaskEXT (GLuint, GLuint, GLenum, GLenum, GLenum, GLenum);
+GLAPI void APIENTRY glInsertComponentEXT (GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glExtractComponentEXT (GLuint, GLuint, GLuint);
+GLAPI GLuint APIENTRY glGenSymbolsEXT (GLenum, GLenum, GLenum, GLuint);
+GLAPI void APIENTRY glSetInvariantEXT (GLuint, GLenum, const GLvoid *);
+GLAPI void APIENTRY glSetLocalConstantEXT (GLuint, GLenum, const GLvoid *);
+GLAPI void APIENTRY glVariantbvEXT (GLuint, const GLbyte *);
+GLAPI void APIENTRY glVariantsvEXT (GLuint, const GLshort *);
+GLAPI void APIENTRY glVariantivEXT (GLuint, const GLint *);
+GLAPI void APIENTRY glVariantfvEXT (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVariantdvEXT (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVariantubvEXT (GLuint, const GLubyte *);
+GLAPI void APIENTRY glVariantusvEXT (GLuint, const GLushort *);
+GLAPI void APIENTRY glVariantuivEXT (GLuint, const GLuint *);
+GLAPI void APIENTRY glVariantPointerEXT (GLuint, GLenum, GLuint, const GLvoid *);
+GLAPI void APIENTRY glEnableVariantClientStateEXT (GLuint);
+GLAPI void APIENTRY glDisableVariantClientStateEXT (GLuint);
+GLAPI GLuint APIENTRY glBindLightParameterEXT (GLenum, GLenum);
+GLAPI GLuint APIENTRY glBindMaterialParameterEXT (GLenum, GLenum);
+GLAPI GLuint APIENTRY glBindTexGenParameterEXT (GLenum, GLenum, GLenum);
+GLAPI GLuint APIENTRY glBindTextureUnitParameterEXT (GLenum, GLenum);
+GLAPI GLuint APIENTRY glBindParameterEXT (GLenum);
+GLAPI GLboolean APIENTRY glIsVariantEnabledEXT (GLuint, GLenum);
+GLAPI void APIENTRY glGetVariantBooleanvEXT (GLuint, GLenum, GLboolean *);
+GLAPI void APIENTRY glGetVariantIntegervEXT (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetVariantFloatvEXT (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetVariantPointervEXT (GLuint, GLenum, GLvoid* *);
+GLAPI void APIENTRY glGetInvariantBooleanvEXT (GLuint, GLenum, GLboolean *);
+GLAPI void APIENTRY glGetInvariantIntegervEXT (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetInvariantFloatvEXT (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetLocalConstantBooleanvEXT (GLuint, GLenum, GLboolean *);
+GLAPI void APIENTRY glGetLocalConstantIntegervEXT (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetLocalConstantFloatvEXT (GLuint, GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBEGINVERTEXSHADEREXTPROC) (void);
+typedef void (APIENTRYP PFNGLENDVERTEXSHADEREXTPROC) (void);
+typedef void (APIENTRYP PFNGLBINDVERTEXSHADEREXTPROC) (GLuint id);
+typedef GLuint (APIENTRYP PFNGLGENVERTEXSHADERSEXTPROC) (GLuint range);
+typedef void (APIENTRYP PFNGLDELETEVERTEXSHADEREXTPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLSHADEROP1EXTPROC) (GLenum op, GLuint res, GLuint arg1);
+typedef void (APIENTRYP PFNGLSHADEROP2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
+typedef void (APIENTRYP PFNGLSHADEROP3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
+typedef void (APIENTRYP PFNGLSWIZZLEEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+typedef void (APIENTRYP PFNGLWRITEMASKEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+typedef void (APIENTRYP PFNGLINSERTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
+typedef void (APIENTRYP PFNGLEXTRACTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
+typedef GLuint (APIENTRYP PFNGLGENSYMBOLSEXTPROC) (GLenum datatype, GLenum storagetype, GLenum range, GLuint components);
+typedef void (APIENTRYP PFNGLSETINVARIANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr);
+typedef void (APIENTRYP PFNGLSETLOCALCONSTANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr);
+typedef void (APIENTRYP PFNGLVARIANTBVEXTPROC) (GLuint id, const GLbyte *addr);
+typedef void (APIENTRYP PFNGLVARIANTSVEXTPROC) (GLuint id, const GLshort *addr);
+typedef void (APIENTRYP PFNGLVARIANTIVEXTPROC) (GLuint id, const GLint *addr);
+typedef void (APIENTRYP PFNGLVARIANTFVEXTPROC) (GLuint id, const GLfloat *addr);
+typedef void (APIENTRYP PFNGLVARIANTDVEXTPROC) (GLuint id, const GLdouble *addr);
+typedef void (APIENTRYP PFNGLVARIANTUBVEXTPROC) (GLuint id, const GLubyte *addr);
+typedef void (APIENTRYP PFNGLVARIANTUSVEXTPROC) (GLuint id, const GLushort *addr);
+typedef void (APIENTRYP PFNGLVARIANTUIVEXTPROC) (GLuint id, const GLuint *addr);
+typedef void (APIENTRYP PFNGLVARIANTPOINTEREXTPROC) (GLuint id, GLenum type, GLuint stride, const GLvoid *addr);
+typedef void (APIENTRYP PFNGLENABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
+typedef GLuint (APIENTRYP PFNGLBINDLIGHTPARAMETEREXTPROC) (GLenum light, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDMATERIALPARAMETEREXTPROC) (GLenum face, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDTEXGENPARAMETEREXTPROC) (GLenum unit, GLenum coord, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDTEXTUREUNITPARAMETEREXTPROC) (GLenum unit, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDPARAMETEREXTPROC) (GLenum value);
+typedef GLboolean (APIENTRYP PFNGLISVARIANTENABLEDEXTPROC) (GLuint id, GLenum cap);
+typedef void (APIENTRYP PFNGLGETVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRYP PFNGLGETVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETVARIANTPOINTERVEXTPROC) (GLuint id, GLenum value, GLvoid* *data);
+typedef void (APIENTRYP PFNGLGETINVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETINVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRYP PFNGLGETINVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETLOCALCONSTANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRYP PFNGLGETLOCALCONSTANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+#endif
+
+#ifndef GL_ATI_vertex_streams
+#define GL_ATI_vertex_streams 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexStream1sATI (GLenum, GLshort);
+GLAPI void APIENTRY glVertexStream1svATI (GLenum, const GLshort *);
+GLAPI void APIENTRY glVertexStream1iATI (GLenum, GLint);
+GLAPI void APIENTRY glVertexStream1ivATI (GLenum, const GLint *);
+GLAPI void APIENTRY glVertexStream1fATI (GLenum, GLfloat);
+GLAPI void APIENTRY glVertexStream1fvATI (GLenum, const GLfloat *);
+GLAPI void APIENTRY glVertexStream1dATI (GLenum, GLdouble);
+GLAPI void APIENTRY glVertexStream1dvATI (GLenum, const GLdouble *);
+GLAPI void APIENTRY glVertexStream2sATI (GLenum, GLshort, GLshort);
+GLAPI void APIENTRY glVertexStream2svATI (GLenum, const GLshort *);
+GLAPI void APIENTRY glVertexStream2iATI (GLenum, GLint, GLint);
+GLAPI void APIENTRY glVertexStream2ivATI (GLenum, const GLint *);
+GLAPI void APIENTRY glVertexStream2fATI (GLenum, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexStream2fvATI (GLenum, const GLfloat *);
+GLAPI void APIENTRY glVertexStream2dATI (GLenum, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexStream2dvATI (GLenum, const GLdouble *);
+GLAPI void APIENTRY glVertexStream3sATI (GLenum, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glVertexStream3svATI (GLenum, const GLshort *);
+GLAPI void APIENTRY glVertexStream3iATI (GLenum, GLint, GLint, GLint);
+GLAPI void APIENTRY glVertexStream3ivATI (GLenum, const GLint *);
+GLAPI void APIENTRY glVertexStream3fATI (GLenum, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexStream3fvATI (GLenum, const GLfloat *);
+GLAPI void APIENTRY glVertexStream3dATI (GLenum, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexStream3dvATI (GLenum, const GLdouble *);
+GLAPI void APIENTRY glVertexStream4sATI (GLenum, GLshort, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glVertexStream4svATI (GLenum, const GLshort *);
+GLAPI void APIENTRY glVertexStream4iATI (GLenum, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glVertexStream4ivATI (GLenum, const GLint *);
+GLAPI void APIENTRY glVertexStream4fATI (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexStream4fvATI (GLenum, const GLfloat *);
+GLAPI void APIENTRY glVertexStream4dATI (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexStream4dvATI (GLenum, const GLdouble *);
+GLAPI void APIENTRY glNormalStream3bATI (GLenum, GLbyte, GLbyte, GLbyte);
+GLAPI void APIENTRY glNormalStream3bvATI (GLenum, const GLbyte *);
+GLAPI void APIENTRY glNormalStream3sATI (GLenum, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glNormalStream3svATI (GLenum, const GLshort *);
+GLAPI void APIENTRY glNormalStream3iATI (GLenum, GLint, GLint, GLint);
+GLAPI void APIENTRY glNormalStream3ivATI (GLenum, const GLint *);
+GLAPI void APIENTRY glNormalStream3fATI (GLenum, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glNormalStream3fvATI (GLenum, const GLfloat *);
+GLAPI void APIENTRY glNormalStream3dATI (GLenum, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glNormalStream3dvATI (GLenum, const GLdouble *);
+GLAPI void APIENTRY glClientActiveVertexStreamATI (GLenum);
+GLAPI void APIENTRY glVertexBlendEnviATI (GLenum, GLint);
+GLAPI void APIENTRY glVertexBlendEnvfATI (GLenum, GLfloat);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1SATIPROC) (GLenum stream, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1IATIPROC) (GLenum stream, GLint x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1FATIPROC) (GLenum stream, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1DATIPROC) (GLenum stream, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2SATIPROC) (GLenum stream, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2IATIPROC) (GLenum stream, GLint x, GLint y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2FATIPROC) (GLenum stream, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2DATIPROC) (GLenum stream, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4IATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3BATIPROC) (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3BVATIPROC) (GLenum stream, const GLbyte *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3SATIPROC) (GLenum stream, GLshort nx, GLshort ny, GLshort nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3IATIPROC) (GLenum stream, GLint nx, GLint ny, GLint nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3FATIPROC) (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3DATIPROC) (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC) (GLenum stream);
+typedef void (APIENTRYP PFNGLVERTEXBLENDENVIATIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLVERTEXBLENDENVFATIPROC) (GLenum pname, GLfloat param);
+#endif
+
+#ifndef GL_ATI_element_array
+#define GL_ATI_element_array 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glElementPointerATI (GLenum, const GLvoid *);
+GLAPI void APIENTRY glDrawElementArrayATI (GLenum, GLsizei);
+GLAPI void APIENTRY glDrawRangeElementArrayATI (GLenum, GLuint, GLuint, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLELEMENTPOINTERATIPROC) (GLenum type, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYATIPROC) (GLenum mode, GLsizei count);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count);
+#endif
+
+#ifndef GL_SUN_mesh_array
+#define GL_SUN_mesh_array 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawMeshArraysSUN (GLenum, GLint, GLsizei, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWMESHARRAYSSUNPROC) (GLenum mode, GLint first, GLsizei count, GLsizei width);
+#endif
+
+#ifndef GL_SUN_slice_accum
+#define GL_SUN_slice_accum 1
+#endif
+
+#ifndef GL_NV_multisample_filter_hint
+#define GL_NV_multisample_filter_hint 1
+#endif
+
+#ifndef GL_NV_depth_clamp
+#define GL_NV_depth_clamp 1
+#endif
+
+#ifndef GL_NV_occlusion_query
+#define GL_NV_occlusion_query 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenOcclusionQueriesNV (GLsizei, GLuint *);
+GLAPI void APIENTRY glDeleteOcclusionQueriesNV (GLsizei, const GLuint *);
+GLAPI GLboolean APIENTRY glIsOcclusionQueryNV (GLuint);
+GLAPI void APIENTRY glBeginOcclusionQueryNV (GLuint);
+GLAPI void APIENTRY glEndOcclusionQueryNV (void);
+GLAPI void APIENTRY glGetOcclusionQueryivNV (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetOcclusionQueryuivNV (GLuint, GLenum, GLuint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGENOCCLUSIONQUERIESNVPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLENDOCCLUSIONQUERYNVPROC) (void);
+typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params);
+#endif
+
+#ifndef GL_NV_point_sprite
+#define GL_NV_point_sprite 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameteriNV (GLenum, GLint);
+GLAPI void APIENTRY glPointParameterivNV (GLenum, const GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPOINTPARAMETERINVPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
+#endif
+
+#ifndef GL_NV_texture_shader3
+#define GL_NV_texture_shader3 1
+#endif
+
+#ifndef GL_NV_vertex_program1_1
+#define GL_NV_vertex_program1_1 1
+#endif
+
+#ifndef GL_EXT_shadow_funcs
+#define GL_EXT_shadow_funcs 1
+#endif
+
+#ifndef GL_EXT_stencil_two_side
+#define GL_EXT_stencil_two_side 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glActiveStencilFaceEXT (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face);
+#endif
+
+#ifndef GL_ATI_text_fragment_shader
+#define GL_ATI_text_fragment_shader 1
+#endif
+
+#ifndef GL_APPLE_client_storage
+#define GL_APPLE_client_storage 1
+#endif
+
+#ifndef GL_APPLE_element_array
+#define GL_APPLE_element_array 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glElementPointerAPPLE (GLenum, const GLvoid *);
+GLAPI void APIENTRY glDrawElementArrayAPPLE (GLenum, GLint, GLsizei);
+GLAPI void APIENTRY glDrawRangeElementArrayAPPLE (GLenum, GLuint, GLuint, GLint, GLsizei);
+GLAPI void APIENTRY glMultiDrawElementArrayAPPLE (GLenum, const GLint *, const GLsizei *, GLsizei);
+GLAPI void APIENTRY glMultiDrawRangeElementArrayAPPLE (GLenum, GLuint, GLuint, const GLint *, const GLsizei *, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLELEMENTPOINTERAPPLEPROC) (GLenum type, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount);
+#endif
+
+#ifndef GL_APPLE_fence
+#define GL_APPLE_fence 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenFencesAPPLE (GLsizei, GLuint *);
+GLAPI void APIENTRY glDeleteFencesAPPLE (GLsizei, const GLuint *);
+GLAPI void APIENTRY glSetFenceAPPLE (GLuint);
+GLAPI GLboolean APIENTRY glIsFenceAPPLE (GLuint);
+GLAPI GLboolean APIENTRY glTestFenceAPPLE (GLuint);
+GLAPI void APIENTRY glFinishFenceAPPLE (GLuint);
+GLAPI GLboolean APIENTRY glTestObjectAPPLE (GLenum, GLuint);
+GLAPI void APIENTRY glFinishObjectAPPLE (GLenum, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGENFENCESAPPLEPROC) (GLsizei n, GLuint *fences);
+typedef void (APIENTRYP PFNGLDELETEFENCESAPPLEPROC) (GLsizei n, const GLuint *fences);
+typedef void (APIENTRYP PFNGLSETFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLISFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLTESTFENCEAPPLEPROC) (GLuint fence);
+typedef void (APIENTRYP PFNGLFINISHFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLTESTOBJECTAPPLEPROC) (GLenum object, GLuint name);
+typedef void (APIENTRYP PFNGLFINISHOBJECTAPPLEPROC) (GLenum object, GLint name);
+#endif
+
+#ifndef GL_APPLE_vertex_array_object
+#define GL_APPLE_vertex_array_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindVertexArrayAPPLE (GLuint);
+GLAPI void APIENTRY glDeleteVertexArraysAPPLE (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenVertexArraysAPPLE (GLsizei, const GLuint *);
+GLAPI GLboolean APIENTRY glIsVertexArrayAPPLE (GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDVERTEXARRAYAPPLEPROC) (GLuint array);
+typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays);
+typedef void (APIENTRYP PFNGLGENVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays);
+typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYAPPLEPROC) (GLuint array);
+#endif
+
+#ifndef GL_APPLE_vertex_array_range
+#define GL_APPLE_vertex_array_range 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexArrayRangeAPPLE (GLsizei, GLvoid *);
+GLAPI void APIENTRY glFlushVertexArrayRangeAPPLE (GLsizei, GLvoid *);
+GLAPI void APIENTRY glVertexArrayParameteriAPPLE (GLenum, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer);
+typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer);
+typedef void (APIENTRYP PFNGLVERTEXARRAYPARAMETERIAPPLEPROC) (GLenum pname, GLint param);
+#endif
+
+#ifndef GL_APPLE_ycbcr_422
+#define GL_APPLE_ycbcr_422 1
+#endif
+
+#ifndef GL_S3_s3tc
+#define GL_S3_s3tc 1
+#endif
+
+#ifndef GL_ATI_draw_buffers
+#define GL_ATI_draw_buffers 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawBuffersATI (GLsizei, const GLenum *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWBUFFERSATIPROC) (GLsizei n, const GLenum *bufs);
+#endif
+
+#ifndef GL_ATI_texture_env_combine3
+#define GL_ATI_texture_env_combine3 1
+#endif
+
+#ifndef GL_ATI_texture_float
+#define GL_ATI_texture_float 1
+#endif
+
+#ifndef GL_NV_float_buffer
+#define GL_NV_float_buffer 1
+#endif
+
+#ifndef GL_NV_fragment_program
+#define GL_NV_fragment_program 1
+/* Some NV_fragment_program entry points are shared with ARB_vertex_program. */
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramNamedParameter4fNV (GLuint, GLsizei, const GLubyte *, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glProgramNamedParameter4dNV (GLuint, GLsizei, const GLubyte *, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glProgramNamedParameter4fvNV (GLuint, GLsizei, const GLubyte *, const GLfloat *);
+GLAPI void APIENTRY glProgramNamedParameter4dvNV (GLuint, GLsizei, const GLubyte *, const GLdouble *);
+GLAPI void APIENTRY glGetProgramNamedParameterfvNV (GLuint, GLsizei, const GLubyte *, GLfloat *);
+GLAPI void APIENTRY glGetProgramNamedParameterdvNV (GLuint, GLsizei, const GLubyte *, GLdouble *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v);
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v);
+typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
+#endif
+
+#ifndef GL_NV_half_float
+#define GL_NV_half_float 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertex2hNV (GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glVertex2hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glVertex3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glVertex3hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glVertex4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glVertex4hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glNormal3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glNormal3hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glColor3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glColor3hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glColor4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glColor4hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glTexCoord1hNV (GLhalfNV);
+GLAPI void APIENTRY glTexCoord1hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glTexCoord2hNV (GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glTexCoord2hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glTexCoord3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glTexCoord3hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glTexCoord4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glTexCoord4hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glMultiTexCoord1hNV (GLenum, GLhalfNV);
+GLAPI void APIENTRY glMultiTexCoord1hvNV (GLenum, const GLhalfNV *);
+GLAPI void APIENTRY glMultiTexCoord2hNV (GLenum, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glMultiTexCoord2hvNV (GLenum, const GLhalfNV *);
+GLAPI void APIENTRY glMultiTexCoord3hNV (GLenum, GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glMultiTexCoord3hvNV (GLenum, const GLhalfNV *);
+GLAPI void APIENTRY glMultiTexCoord4hNV (GLenum, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glMultiTexCoord4hvNV (GLenum, const GLhalfNV *);
+GLAPI void APIENTRY glFogCoordhNV (GLhalfNV);
+GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *);
+GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV);
+GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *);
+GLAPI void APIENTRY glVertexAttrib1hNV (GLuint, GLhalfNV);
+GLAPI void APIENTRY glVertexAttrib1hvNV (GLuint, const GLhalfNV *);
+GLAPI void APIENTRY glVertexAttrib2hNV (GLuint, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glVertexAttrib2hvNV (GLuint, const GLhalfNV *);
+GLAPI void APIENTRY glVertexAttrib3hNV (GLuint, GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glVertexAttrib3hvNV (GLuint, const GLhalfNV *);
+GLAPI void APIENTRY glVertexAttrib4hNV (GLuint, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glVertexAttrib4hvNV (GLuint, const GLhalfNV *);
+GLAPI void APIENTRY glVertexAttribs1hvNV (GLuint, GLsizei, const GLhalfNV *);
+GLAPI void APIENTRY glVertexAttribs2hvNV (GLuint, GLsizei, const GLhalfNV *);
+GLAPI void APIENTRY glVertexAttribs3hvNV (GLuint, GLsizei, const GLhalfNV *);
+GLAPI void APIENTRY glVertexAttribs4hvNV (GLuint, GLsizei, const GLhalfNV *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEX2HNVPROC) (GLhalfNV x, GLhalfNV y);
+typedef void (APIENTRYP PFNGLVERTEX2HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEX3HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z);
+typedef void (APIENTRYP PFNGLVERTEX3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEX4HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
+typedef void (APIENTRYP PFNGLVERTEX4HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLNORMAL3HNVPROC) (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz);
+typedef void (APIENTRYP PFNGLNORMAL3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+typedef void (APIENTRYP PFNGLCOLOR3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLCOLOR4HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha);
+typedef void (APIENTRYP PFNGLCOLOR4HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD1HNVPROC) (GLhalfNV s);
+typedef void (APIENTRYP PFNGLTEXCOORD1HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2HNVPROC) (GLhalfNV s, GLhalfNV t);
+typedef void (APIENTRYP PFNGLTEXCOORD2HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD3HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r);
+typedef void (APIENTRYP PFNGLTEXCOORD3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD4HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
+typedef void (APIENTRYP PFNGLTEXCOORD4HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1HNVPROC) (GLenum target, GLhalfNV s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog);
+typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalfNV x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+#endif
+
+#ifndef GL_NV_pixel_data_range
+#define GL_NV_pixel_data_range 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelDataRangeNV (GLenum, GLsizei, GLvoid *);
+GLAPI void APIENTRY glFlushPixelDataRangeNV (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, GLvoid *pointer);
+typedef void (APIENTRYP PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target);
+#endif
+
+#ifndef GL_NV_primitive_restart
+#define GL_NV_primitive_restart 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPrimitiveRestartNV (void);
+GLAPI void APIENTRY glPrimitiveRestartIndexNV (GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPRIMITIVERESTARTNVPROC) (void);
+typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXNVPROC) (GLuint index);
+#endif
+
+#ifndef GL_NV_texture_expand_normal
+#define GL_NV_texture_expand_normal 1
+#endif
+
+#ifndef GL_NV_vertex_program2
+#define GL_NV_vertex_program2 1
+#endif
+
+#ifndef GL_ATI_map_object_buffer
+#define GL_ATI_map_object_buffer 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLvoid* APIENTRY glMapObjectBufferATI (GLuint);
+GLAPI void APIENTRY glUnmapObjectBufferATI (GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLvoid* (APIENTRYP PFNGLMAPOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLUNMAPOBJECTBUFFERATIPROC) (GLuint buffer);
+#endif
+
+#ifndef GL_ATI_separate_stencil
+#define GL_ATI_separate_stencil 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStencilOpSeparateATI (GLenum, GLenum, GLenum, GLenum);
+GLAPI void APIENTRY glStencilFuncSeparateATI (GLenum, GLenum, GLint, GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+#endif
+
+#ifndef GL_ATI_vertex_attrib_array_object
+#define GL_ATI_vertex_attrib_array_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribArrayObjectATI (GLuint, GLint, GLenum, GLboolean, GLsizei, GLuint, GLuint);
+GLAPI void APIENTRY glGetVertexAttribArrayObjectfvATI (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetVertexAttribArrayObjectivATI (GLuint, GLenum, GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXATTRIBARRAYOBJECTATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint *params);
+#endif
+
+#ifndef GL_EXT_depth_bounds_test
+#define GL_EXT_depth_bounds_test 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDepthBoundsEXT (GLclampd, GLclampd);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax);
+#endif
+
+#ifndef GL_EXT_texture_mirror_clamp
+#define GL_EXT_texture_mirror_clamp 1
+#endif
+
+#ifndef GL_EXT_blend_equation_separate
+#define GL_EXT_blend_equation_separate 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationSeparateEXT (GLenum, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, GLenum modeAlpha);
+#endif
+
+#ifndef GL_MESA_pack_invert
+#define GL_MESA_pack_invert 1
+#endif
+
+#ifndef GL_MESA_ycbcr_texture
+#define GL_MESA_ycbcr_texture 1
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/reactos/lib/mesa32/include/GL/glu.h b/reactos/lib/mesa32/include/GL/glu.h
new file mode 100644
index 00000000000..c0bac75a8cc
--- /dev/null
+++ b/reactos/lib/mesa32/include/GL/glu.h
@@ -0,0 +1,340 @@
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: This software was created using the
+** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
+** not been independently verified as being compliant with the OpenGL(R)
+** version 1.2.1 Specification.
+*/
+
+#ifndef __glu_h__
+#define __glu_h__
+
+#if defined(USE_MGL_NAMESPACE)
+#include "glu_mangle.h"
+#endif
+
+#include <GL/gl.h>
+
+#ifndef GLAPIENTRY
+#define GLAPIENTRY
+#endif
+
+#ifndef GLAPIENTRYP
+#define GLAPIENTRYP GLAPIENTRY *
+#endif
+
+#ifndef GLAPI
+#define GLAPI
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*************************************************************/
+
+/* Extensions */
+#define GLU_EXT_object_space_tess          1
+#define GLU_EXT_nurbs_tessellator          1
+
+/* Boolean */
+#define GLU_FALSE                          0
+#define GLU_TRUE                           1
+
+/* Version */
+#define GLU_VERSION_1_1                    1
+#define GLU_VERSION_1_2                    1
+#define GLU_VERSION_1_3                    1
+
+/* StringName */
+#define GLU_VERSION                        100800
+#define GLU_EXTENSIONS                     100801
+
+/* ErrorCode */
+#define GLU_INVALID_ENUM                   100900
+#define GLU_INVALID_VALUE                  100901
+#define GLU_OUT_OF_MEMORY                  100902
+#define GLU_INCOMPATIBLE_GL_VERSION        100903
+#define GLU_INVALID_OPERATION              100904
+
+/* NurbsDisplay */
+/*      GLU_FILL */
+#define GLU_OUTLINE_POLYGON                100240
+#define GLU_OUTLINE_PATCH                  100241
+
+/* NurbsCallback */
+#define GLU_NURBS_ERROR                    100103
+#define GLU_ERROR                          100103
+#define GLU_NURBS_BEGIN                    100164
+#define GLU_NURBS_BEGIN_EXT                100164
+#define GLU_NURBS_VERTEX                   100165
+#define GLU_NURBS_VERTEX_EXT               100165
+#define GLU_NURBS_NORMAL                   100166
+#define GLU_NURBS_NORMAL_EXT               100166
+#define GLU_NURBS_COLOR                    100167
+#define GLU_NURBS_COLOR_EXT                100167
+#define GLU_NURBS_TEXTURE_COORD            100168
+#define GLU_NURBS_TEX_COORD_EXT            100168
+#define GLU_NURBS_END                      100169
+#define GLU_NURBS_END_EXT                  100169
+#define GLU_NURBS_BEGIN_DATA               100170
+#define GLU_NURBS_BEGIN_DATA_EXT           100170
+#define GLU_NURBS_VERTEX_DATA              100171
+#define GLU_NURBS_VERTEX_DATA_EXT          100171
+#define GLU_NURBS_NORMAL_DATA              100172
+#define GLU_NURBS_NORMAL_DATA_EXT          100172
+#define GLU_NURBS_COLOR_DATA               100173
+#define GLU_NURBS_COLOR_DATA_EXT           100173
+#define GLU_NURBS_TEXTURE_COORD_DATA       100174
+#define GLU_NURBS_TEX_COORD_DATA_EXT       100174
+#define GLU_NURBS_END_DATA                 100175
+#define GLU_NURBS_END_DATA_EXT             100175
+
+/* NurbsError */
+#define GLU_NURBS_ERROR1                   100251
+#define GLU_NURBS_ERROR2                   100252
+#define GLU_NURBS_ERROR3                   100253
+#define GLU_NURBS_ERROR4                   100254
+#define GLU_NURBS_ERROR5                   100255
+#define GLU_NURBS_ERROR6                   100256
+#define GLU_NURBS_ERROR7                   100257
+#define GLU_NURBS_ERROR8                   100258
+#define GLU_NURBS_ERROR9                   100259
+#define GLU_NURBS_ERROR10                  100260
+#define GLU_NURBS_ERROR11                  100261
+#define GLU_NURBS_ERROR12                  100262
+#define GLU_NURBS_ERROR13                  100263
+#define GLU_NURBS_ERROR14                  100264
+#define GLU_NURBS_ERROR15                  100265
+#define GLU_NURBS_ERROR16                  100266
+#define GLU_NURBS_ERROR17                  100267
+#define GLU_NURBS_ERROR18                  100268
+#define GLU_NURBS_ERROR19                  100269
+#define GLU_NURBS_ERROR20                  100270
+#define GLU_NURBS_ERROR21                  100271
+#define GLU_NURBS_ERROR22                  100272
+#define GLU_NURBS_ERROR23                  100273
+#define GLU_NURBS_ERROR24                  100274
+#define GLU_NURBS_ERROR25                  100275
+#define GLU_NURBS_ERROR26                  100276
+#define GLU_NURBS_ERROR27                  100277
+#define GLU_NURBS_ERROR28                  100278
+#define GLU_NURBS_ERROR29                  100279
+#define GLU_NURBS_ERROR30                  100280
+#define GLU_NURBS_ERROR31                  100281
+#define GLU_NURBS_ERROR32                  100282
+#define GLU_NURBS_ERROR33                  100283
+#define GLU_NURBS_ERROR34                  100284
+#define GLU_NURBS_ERROR35                  100285
+#define GLU_NURBS_ERROR36                  100286
+#define GLU_NURBS_ERROR37                  100287
+
+/* NurbsProperty */
+#define GLU_AUTO_LOAD_MATRIX               100200
+#define GLU_CULLING                        100201
+#define GLU_SAMPLING_TOLERANCE             100203
+#define GLU_DISPLAY_MODE                   100204
+#define GLU_PARAMETRIC_TOLERANCE           100202
+#define GLU_SAMPLING_METHOD                100205
+#define GLU_U_STEP                         100206
+#define GLU_V_STEP                         100207
+#define GLU_NURBS_MODE                     100160
+#define GLU_NURBS_MODE_EXT                 100160
+#define GLU_NURBS_TESSELLATOR              100161
+#define GLU_NURBS_TESSELLATOR_EXT          100161
+#define GLU_NURBS_RENDERER                 100162
+#define GLU_NURBS_RENDERER_EXT             100162
+
+/* NurbsSampling */
+#define GLU_OBJECT_PARAMETRIC_ERROR        100208
+#define GLU_OBJECT_PARAMETRIC_ERROR_EXT    100208
+#define GLU_OBJECT_PATH_LENGTH             100209
+#define GLU_OBJECT_PATH_LENGTH_EXT         100209
+#define GLU_PATH_LENGTH                    100215
+#define GLU_PARAMETRIC_ERROR               100216
+#define GLU_DOMAIN_DISTANCE                100217
+
+/* NurbsTrim */
+#define GLU_MAP1_TRIM_2                    100210
+#define GLU_MAP1_TRIM_3                    100211
+
+/* QuadricDrawStyle */
+#define GLU_POINT                          100010
+#define GLU_LINE                           100011
+#define GLU_FILL                           100012
+#define GLU_SILHOUETTE                     100013
+
+/* QuadricCallback */
+/*      GLU_ERROR */
+
+/* QuadricNormal */
+#define GLU_SMOOTH                         100000
+#define GLU_FLAT                           100001
+#define GLU_NONE                           100002
+
+/* QuadricOrientation */
+#define GLU_OUTSIDE                        100020
+#define GLU_INSIDE                         100021
+
+/* TessCallback */
+#define GLU_TESS_BEGIN                     100100
+#define GLU_BEGIN                          100100
+#define GLU_TESS_VERTEX                    100101
+#define GLU_VERTEX                         100101
+#define GLU_TESS_END                       100102
+#define GLU_END                            100102
+#define GLU_TESS_ERROR                     100103
+#define GLU_TESS_EDGE_FLAG                 100104
+#define GLU_EDGE_FLAG                      100104
+#define GLU_TESS_COMBINE                   100105
+#define GLU_TESS_BEGIN_DATA                100106
+#define GLU_TESS_VERTEX_DATA               100107
+#define GLU_TESS_END_DATA                  100108
+#define GLU_TESS_ERROR_DATA                100109
+#define GLU_TESS_EDGE_FLAG_DATA            100110
+#define GLU_TESS_COMBINE_DATA              100111
+
+/* TessContour */
+#define GLU_CW                             100120
+#define GLU_CCW                            100121
+#define GLU_INTERIOR                       100122
+#define GLU_EXTERIOR                       100123
+#define GLU_UNKNOWN                        100124
+
+/* TessProperty */
+#define GLU_TESS_WINDING_RULE              100140
+#define GLU_TESS_BOUNDARY_ONLY             100141
+#define GLU_TESS_TOLERANCE                 100142
+
+/* TessError */
+#define GLU_TESS_ERROR1                    100151
+#define GLU_TESS_ERROR2                    100152
+#define GLU_TESS_ERROR3                    100153
+#define GLU_TESS_ERROR4                    100154
+#define GLU_TESS_ERROR5                    100155
+#define GLU_TESS_ERROR6                    100156
+#define GLU_TESS_ERROR7                    100157
+#define GLU_TESS_ERROR8                    100158
+#define GLU_TESS_MISSING_BEGIN_POLYGON     100151
+#define GLU_TESS_MISSING_BEGIN_CONTOUR     100152
+#define GLU_TESS_MISSING_END_POLYGON       100153
+#define GLU_TESS_MISSING_END_CONTOUR       100154
+#define GLU_TESS_COORD_TOO_LARGE           100155
+#define GLU_TESS_NEED_COMBINE_CALLBACK     100156
+
+/* TessWinding */
+#define GLU_TESS_WINDING_ODD               100130
+#define GLU_TESS_WINDING_NONZERO           100131
+#define GLU_TESS_WINDING_POSITIVE          100132
+#define GLU_TESS_WINDING_NEGATIVE          100133
+#define GLU_TESS_WINDING_ABS_GEQ_TWO       100134
+
+/*************************************************************/
+
+
+#ifdef __cplusplus
+class GLUnurbs;
+class GLUquadric;
+class GLUtesselator;
+#else
+typedef struct GLUnurbs GLUnurbs;
+typedef struct GLUquadric GLUquadric;
+typedef struct GLUtesselator GLUtesselator;
+#endif
+
+typedef GLUnurbs GLUnurbsObj;
+typedef GLUquadric GLUquadricObj;
+typedef GLUtesselator GLUtesselatorObj;
+typedef GLUtesselator GLUtriangulatorObj;
+
+#define GLU_TESS_MAX_COORD 1.0e150
+
+/* Internal convenience typedefs */
+typedef void (GLAPIENTRYP _GLUfuncptr)();
+
+GLAPI void GLAPIENTRY gluBeginCurve (GLUnurbs* nurb);
+GLAPI void GLAPIENTRY gluBeginPolygon (GLUtesselator* tess);
+GLAPI void GLAPIENTRY gluBeginSurface (GLUnurbs* nurb);
+GLAPI void GLAPIENTRY gluBeginTrim (GLUnurbs* nurb);
+GLAPI GLint GLAPIENTRY gluBuild1DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data);
+GLAPI GLint GLAPIENTRY gluBuild1DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, const void *data);
+GLAPI GLint GLAPIENTRY gluBuild2DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data);
+GLAPI GLint GLAPIENTRY gluBuild2DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *data);
+GLAPI GLint GLAPIENTRY gluBuild3DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data);
+GLAPI GLint GLAPIENTRY gluBuild3DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data);
+GLAPI GLboolean GLAPIENTRY gluCheckExtension (const GLubyte *extName, const GLubyte *extString);
+GLAPI void GLAPIENTRY gluCylinder (GLUquadric* quad, GLdouble base, GLdouble top, GLdouble height, GLint slices, GLint stacks);
+GLAPI void GLAPIENTRY gluDeleteNurbsRenderer (GLUnurbs* nurb);
+GLAPI void GLAPIENTRY gluDeleteQuadric (GLUquadric* quad);
+GLAPI void GLAPIENTRY gluDeleteTess (GLUtesselator* tess);
+GLAPI void GLAPIENTRY gluDisk (GLUquadric* quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops);
+GLAPI void GLAPIENTRY gluEndCurve (GLUnurbs* nurb);
+GLAPI void GLAPIENTRY gluEndPolygon (GLUtesselator* tess);
+GLAPI void GLAPIENTRY gluEndSurface (GLUnurbs* nurb);
+GLAPI void GLAPIENTRY gluEndTrim (GLUnurbs* nurb);
+GLAPI const GLubyte * GLAPIENTRY gluErrorString (GLenum error);
+GLAPI void GLAPIENTRY gluGetNurbsProperty (GLUnurbs* nurb, GLenum property, GLfloat* data);
+GLAPI const GLubyte * GLAPIENTRY gluGetString (GLenum name);
+GLAPI void GLAPIENTRY gluGetTessProperty (GLUtesselator* tess, GLenum which, GLdouble* data);
+GLAPI void GLAPIENTRY gluLoadSamplingMatrices (GLUnurbs* nurb, const GLfloat *model, const GLfloat *perspective, const GLint *view);
+GLAPI void GLAPIENTRY gluLookAt (GLdouble eyeX, GLdouble eyeY, GLdouble eyeZ, GLdouble centerX, GLdouble centerY, GLdouble centerZ, GLdouble upX, GLdouble upY, GLdouble upZ);
+GLAPI GLUnurbs* GLAPIENTRY gluNewNurbsRenderer (void);
+GLAPI GLUquadric* GLAPIENTRY gluNewQuadric (void);
+GLAPI GLUtesselator* GLAPIENTRY gluNewTess (void);
+GLAPI void GLAPIENTRY gluNextContour (GLUtesselator* tess, GLenum type);
+GLAPI void GLAPIENTRY gluNurbsCallback (GLUnurbs* nurb, GLenum which, _GLUfuncptr CallBackFunc);
+GLAPI void GLAPIENTRY gluNurbsCallbackData (GLUnurbs* nurb, GLvoid* userData);
+GLAPI void GLAPIENTRY gluNurbsCallbackDataEXT (GLUnurbs* nurb, GLvoid* userData);
+GLAPI void GLAPIENTRY gluNurbsCurve (GLUnurbs* nurb, GLint knotCount, GLfloat *knots, GLint stride, GLfloat *control, GLint order, GLenum type);
+GLAPI void GLAPIENTRY gluNurbsProperty (GLUnurbs* nurb, GLenum property, GLfloat value);
+GLAPI void GLAPIENTRY gluNurbsSurface (GLUnurbs* nurb, GLint sKnotCount, GLfloat* sKnots, GLint tKnotCount, GLfloat* tKnots, GLint sStride, GLint tStride, GLfloat* control, GLint sOrder, GLint tOrder, GLenum type);
+GLAPI void GLAPIENTRY gluOrtho2D (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top);
+GLAPI void GLAPIENTRY gluPartialDisk (GLUquadric* quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops, GLdouble start, GLdouble sweep);
+GLAPI void GLAPIENTRY gluPerspective (GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdouble zFar);
+GLAPI void GLAPIENTRY gluPickMatrix (GLdouble x, GLdouble y, GLdouble delX, GLdouble delY, GLint *viewport);
+GLAPI GLint GLAPIENTRY gluProject (GLdouble objX, GLdouble objY, GLdouble objZ, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble* winX, GLdouble* winY, GLdouble* winZ);
+GLAPI void GLAPIENTRY gluPwlCurve (GLUnurbs* nurb, GLint count, GLfloat* data, GLint stride, GLenum type);
+GLAPI void GLAPIENTRY gluQuadricCallback (GLUquadric* quad, GLenum which, _GLUfuncptr CallBackFunc);
+GLAPI void GLAPIENTRY gluQuadricDrawStyle (GLUquadric* quad, GLenum draw);
+GLAPI void GLAPIENTRY gluQuadricNormals (GLUquadric* quad, GLenum normal);
+GLAPI void GLAPIENTRY gluQuadricOrientation (GLUquadric* quad, GLenum orientation);
+GLAPI void GLAPIENTRY gluQuadricTexture (GLUquadric* quad, GLboolean texture);
+GLAPI GLint GLAPIENTRY gluScaleImage (GLenum format, GLsizei wIn, GLsizei hIn, GLenum typeIn, const void *dataIn, GLsizei wOut, GLsizei hOut, GLenum typeOut, GLvoid* dataOut);
+GLAPI void GLAPIENTRY gluSphere (GLUquadric* quad, GLdouble radius, GLint slices, GLint stacks);
+GLAPI void GLAPIENTRY gluTessBeginContour (GLUtesselator* tess);
+GLAPI void GLAPIENTRY gluTessBeginPolygon (GLUtesselator* tess, GLvoid* data);
+GLAPI void GLAPIENTRY gluTessCallback (GLUtesselator* tess, GLenum which, _GLUfuncptr CallBackFunc);
+GLAPI void GLAPIENTRY gluTessEndContour (GLUtesselator* tess);
+GLAPI void GLAPIENTRY gluTessEndPolygon (GLUtesselator* tess);
+GLAPI void GLAPIENTRY gluTessNormal (GLUtesselator* tess, GLdouble valueX, GLdouble valueY, GLdouble valueZ);
+GLAPI void GLAPIENTRY gluTessProperty (GLUtesselator* tess, GLenum which, GLdouble data);
+GLAPI void GLAPIENTRY gluTessVertex (GLUtesselator* tess, GLdouble *location, GLvoid* data);
+GLAPI GLint GLAPIENTRY gluUnProject (GLdouble winX, GLdouble winY, GLdouble winZ, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble* objX, GLdouble* objY, GLdouble* objZ);
+GLAPI GLint GLAPIENTRY gluUnProject4 (GLdouble winX, GLdouble winY, GLdouble winZ, GLdouble clipW, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble nearVal, GLdouble farVal, GLdouble* objX, GLdouble* objY, GLdouble* objZ, GLdouble* objW);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __glu_h__ */
diff --git a/reactos/lib/mesa32/include/GL/glu_mangle.h b/reactos/lib/mesa32/include/GL/glu_mangle.h
new file mode 100644
index 00000000000..9c25aa864c1
--- /dev/null
+++ b/reactos/lib/mesa32/include/GL/glu_mangle.h
@@ -0,0 +1,86 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.0
+ * Copyright (C) 1995-1998  Brian Paul
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
+#ifndef GLU_MANGLE_H
+#define GLU_MANGLE_H
+
+
+#define gluLookAt mgluLookAt
+#define gluOrtho2D mgluOrtho2D
+#define gluPerspective mgluPerspective
+#define gluPickMatrix mgluPickMatrix
+#define gluProject mgluProject
+#define gluUnProject mgluUnProject
+#define gluErrorString mgluErrorString
+#define gluScaleImage mgluScaleImage
+#define gluBuild1DMipmaps mgluBuild1DMipmaps
+#define gluBuild2DMipmaps mgluBuild2DMipmaps
+#define gluNewQuadric mgluNewQuadric
+#define gluDeleteQuadric mgluDeleteQuadric
+#define gluQuadricDrawStyle mgluQuadricDrawStyle
+#define gluQuadricOrientation mgluQuadricOrientation
+#define gluQuadricNormals mgluQuadricNormals
+#define gluQuadricTexture mgluQuadricTexture
+#define gluQuadricCallback mgluQuadricCallback
+#define gluCylinder mgluCylinder
+#define gluSphere mgluSphere
+#define gluDisk mgluDisk
+#define gluPartialDisk mgluPartialDisk
+#define gluNewNurbsRenderer mgluNewNurbsRenderer
+#define gluDeleteNurbsRenderer mgluDeleteNurbsRenderer
+#define gluLoadSamplingMatrices mgluLoadSamplingMatrices
+#define gluNurbsProperty mgluNurbsProperty
+#define gluGetNurbsProperty mgluGetNurbsProperty
+#define gluBeginCurve mgluBeginCurve
+#define gluEndCurve mgluEndCurve
+#define gluNurbsCurve mgluNurbsCurve
+#define gluBeginSurface mgluBeginSurface
+#define gluEndSurface mgluEndSurface
+#define gluNurbsSurface mgluNurbsSurface
+#define gluBeginTrim mgluBeginTrim
+#define gluEndTrim mgluEndTrim
+#define gluPwlCurve mgluPwlCurve
+#define gluNurbsCallback mgluNurbsCallback
+#define gluNewTess mgluNewTess
+#define gluDeleteTess mgluDeleteTess
+#define gluTessBeginPolygon mgluTessBeginPolygon
+#define gluTessBeginContour mgluTessBeginContour
+#define gluTessVertex mgluTessVertex
+#define gluTessEndPolygon mgluTessEndPolygon
+#define gluTessEndContour mgluTessEndContour
+#define gluTessProperty mgluTessProperty
+#define gluTessNormal mgluTessNormal
+#define gluTessCallback mgluTessCallback
+#define gluGetTessProperty mgluGetTessProperty
+#define gluBeginPolygon mgluBeginPolygon
+#define gluNextContour mgluNextContour
+#define gluEndPolygon mgluEndPolygon
+#define gluGetString mgluGetString
+#define gluBuild1DMipmapLevels mgluBuild1DMipmapLevels
+#define gluBuild2DMipmapLevels mgluBuild2DMipmapLevels
+#define gluBuild3DMipmapLevels mgluBuild3DMipmapLevels
+#define gluBuild3DMipmaps mgluBuild3DMipmaps
+#define gluCheckExtension mgluCheckExtension
+#define gluUnProject4 mgluUnProject4
+#define gluNurbsCallbackData mgluNurbsCallbackData
+#define gluNurbsCallbackDataEXT mgluNurbsCallbackDataEXT
+
+#endif
diff --git a/reactos/lib/mesa32/include/GL/glx.h b/reactos/lib/mesa32/include/GL/glx.h
new file mode 100644
index 00000000000..b34b2ceaec8
--- /dev/null
+++ b/reactos/lib/mesa32/include/GL/glx.h
@@ -0,0 +1,504 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ * 
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef GLX_H
+#define GLX_H
+
+
+#ifdef __VMS
+#include <GL/vms_x_fix.h>
+# ifdef __cplusplus
+/* VMS Xlib.h gives problems with C++.
+ * this avoids a bunch of trivial warnings */
+#pragma message disable nosimpint
+#endif
+#endif
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#ifdef __VMS
+# ifdef __cplusplus
+#pragma message enable nosimpint
+#endif
+#endif
+#include <GL/gl.h>
+
+
+#if defined(USE_MGL_NAMESPACE)
+#include <GL/glx_mangle.h>
+#endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#define GLX_VERSION_1_1		1
+#define GLX_VERSION_1_2		1
+#define GLX_VERSION_1_3		1
+#define GLX_VERSION_1_4		1
+
+#define GLX_EXTENSION_NAME   "GLX"
+
+
+
+/*
+ * Tokens for glXChooseVisual and glXGetConfig:
+ */
+#define GLX_USE_GL		1
+#define GLX_BUFFER_SIZE		2
+#define GLX_LEVEL		3
+#define GLX_RGBA		4
+#define GLX_DOUBLEBUFFER	5
+#define GLX_STEREO		6
+#define GLX_AUX_BUFFERS		7
+#define GLX_RED_SIZE		8
+#define GLX_GREEN_SIZE		9
+#define GLX_BLUE_SIZE		10
+#define GLX_ALPHA_SIZE		11
+#define GLX_DEPTH_SIZE		12
+#define GLX_STENCIL_SIZE	13
+#define GLX_ACCUM_RED_SIZE	14
+#define GLX_ACCUM_GREEN_SIZE	15
+#define GLX_ACCUM_BLUE_SIZE	16
+#define GLX_ACCUM_ALPHA_SIZE	17
+
+
+/*
+ * Error codes returned by glXGetConfig:
+ */
+#define GLX_BAD_SCREEN		1
+#define GLX_BAD_ATTRIBUTE	2
+#define GLX_NO_EXTENSION	3
+#define GLX_BAD_VISUAL		4
+#define GLX_BAD_CONTEXT		5
+#define GLX_BAD_VALUE       	6
+#define GLX_BAD_ENUM		7
+
+
+/*
+ * GLX 1.1 and later:
+ */
+#define GLX_VENDOR		1
+#define GLX_VERSION		2
+#define GLX_EXTENSIONS 		3
+
+
+/*
+ * GLX 1.3 and later:
+ */
+#define GLX_CONFIG_CAVEAT		0x20
+#define GLX_DONT_CARE			0xFFFFFFFF
+#define GLX_SLOW_CONFIG			0x8001
+#define GLX_NON_CONFORMANT_CONFIG	0x800D
+#define GLX_X_VISUAL_TYPE		0x22
+#define GLX_TRANSPARENT_TYPE		0x23
+#define GLX_TRANSPARENT_INDEX_VALUE	0x24
+#define GLX_TRANSPARENT_RED_VALUE	0x25
+#define GLX_TRANSPARENT_GREEN_VALUE	0x26
+#define GLX_TRANSPARENT_BLUE_VALUE	0x27
+#define GLX_TRANSPARENT_ALPHA_VALUE	0x28
+#define GLX_MAX_PBUFFER_WIDTH		0x8016
+#define GLX_MAX_PBUFFER_HEIGHT		0x8017
+#define GLX_MAX_PBUFFER_PIXELS		0x8018
+#define GLX_PRESERVED_CONTENTS		0x801B
+#define GLX_LARGEST_PBUFFER		0x801C
+#define GLX_WIDTH			0x801D
+#define GLX_HEIGHT			0x801E
+#define GLX_EVENT_MASK			0x801F
+#define GLX_DRAWABLE_TYPE		0x8010
+#define GLX_FBCONFIG_ID			0x8013
+#define GLX_VISUAL_ID			0x800B
+#define GLX_WINDOW_BIT			0x00000001
+#define GLX_PIXMAP_BIT			0x00000002
+#define GLX_PBUFFER_BIT			0x00000004
+#define GLX_AUX_BUFFERS_BIT		0x00000010
+#define GLX_FRONT_LEFT_BUFFER_BIT	0x00000001
+#define GLX_FRONT_RIGHT_BUFFER_BIT	0x00000002
+#define GLX_BACK_LEFT_BUFFER_BIT	0x00000004
+#define GLX_BACK_RIGHT_BUFFER_BIT	0x00000008
+#define GLX_DEPTH_BUFFER_BIT		0x00000020
+#define GLX_STENCIL_BUFFER_BIT		0x00000040
+#define GLX_ACCUM_BUFFER_BIT		0x00000080
+#define GLX_DRAWABLE_TYPE		0x8010
+#define GLX_RENDER_TYPE			0x8011
+#define GLX_X_RENDERABLE		0x8012
+#define GLX_NONE			0x8000
+#define GLX_TRUE_COLOR			0x8002
+#define GLX_DIRECT_COLOR		0x8003
+#define GLX_PSEUDO_COLOR		0x8004
+#define GLX_STATIC_COLOR		0x8005
+#define GLX_GRAY_SCALE			0x8006
+#define GLX_STATIC_GRAY			0x8007
+#define GLX_TRANSPARENT_RGB		0x8008
+#define GLX_TRANSPARENT_INDEX		0x8009
+#define GLX_RGBA_TYPE			0x8014
+#define GLX_COLOR_INDEX_TYPE		0x8015
+#define GLX_COLOR_INDEX_BIT		0x00000002
+#define GLX_RGBA_BIT			0x00000001
+#define GLX_SCREEN			0x800C
+#define GLX_PBUFFER_CLOBBER_MASK	0x08000000
+#define GLX_DAMAGED			0x8020
+#define GLX_SAVED			0x8021
+#define GLX_WINDOW			0x8022
+#define GLX_PBUFFER			0x8023
+#define GLX_PBUFFER_HEIGHT              0x8040
+#define GLX_PBUFFER_WIDTH               0x8041
+
+
+/*
+ * GLX 1.4 and later:
+ */
+#define GLX_SAMPLE_BUFFERS              0x186a0 /*100000*/
+#define GLX_SAMPLES                     0x186a1 /*100001*/
+
+
+
+typedef struct __GLXcontextRec *GLXContext;
+typedef XID GLXPixmap;
+typedef XID GLXDrawable;
+/* GLX 1.3 and later */
+typedef struct __GLXFBConfigRec *GLXFBConfig;
+typedef XID GLXFBConfigID;
+typedef XID GLXContextID;
+typedef XID GLXWindow;
+typedef XID GLXPbuffer;
+
+
+
+extern XVisualInfo* glXChooseVisual( Display *dpy, int screen,
+				     int *attribList );
+
+extern GLXContext glXCreateContext( Display *dpy, XVisualInfo *vis,
+				    GLXContext shareList, Bool direct );
+
+extern void glXDestroyContext( Display *dpy, GLXContext ctx );
+
+extern Bool glXMakeCurrent( Display *dpy, GLXDrawable drawable,
+			    GLXContext ctx);
+
+extern void glXCopyContext( Display *dpy, GLXContext src, GLXContext dst,
+			    unsigned long mask );
+
+extern void glXSwapBuffers( Display *dpy, GLXDrawable drawable );
+
+extern GLXPixmap glXCreateGLXPixmap( Display *dpy, XVisualInfo *visual,
+				     Pixmap pixmap );
+
+extern void glXDestroyGLXPixmap( Display *dpy, GLXPixmap pixmap );
+
+extern Bool glXQueryExtension( Display *dpy, int *errorb, int *event );
+
+extern Bool glXQueryVersion( Display *dpy, int *maj, int *min );
+
+extern Bool glXIsDirect( Display *dpy, GLXContext ctx );
+
+extern int glXGetConfig( Display *dpy, XVisualInfo *visual,
+			 int attrib, int *value );
+
+extern GLXContext glXGetCurrentContext( void );
+
+extern GLXDrawable glXGetCurrentDrawable( void );
+
+extern void glXWaitGL( void );
+
+extern void glXWaitX( void );
+
+extern void glXUseXFont( Font font, int first, int count, int list );
+
+
+
+/* GLX 1.1 and later */
+extern const char *glXQueryExtensionsString( Display *dpy, int screen );
+
+extern const char *glXQueryServerString( Display *dpy, int screen, int name );
+
+extern const char *glXGetClientString( Display *dpy, int name );
+
+
+/* GLX 1.2 and later */
+extern Display *glXGetCurrentDisplay( void );
+
+
+/* GLX 1.3 and later */
+extern GLXFBConfig *glXChooseFBConfig( Display *dpy, int screen,
+                                       const int *attribList, int *nitems );
+
+extern int glXGetFBConfigAttrib( Display *dpy, GLXFBConfig config,
+                                 int attribute, int *value );
+
+extern GLXFBConfig *glXGetFBConfigs( Display *dpy, int screen,
+                                     int *nelements );
+
+extern XVisualInfo *glXGetVisualFromFBConfig( Display *dpy,
+                                              GLXFBConfig config );
+
+extern GLXWindow glXCreateWindow( Display *dpy, GLXFBConfig config,
+                                  Window win, const int *attribList );
+
+extern void glXDestroyWindow( Display *dpy, GLXWindow window );
+
+extern GLXPixmap glXCreatePixmap( Display *dpy, GLXFBConfig config,
+                                  Pixmap pixmap, const int *attribList );
+
+extern void glXDestroyPixmap( Display *dpy, GLXPixmap pixmap );
+
+extern GLXPbuffer glXCreatePbuffer( Display *dpy, GLXFBConfig config,
+                                    const int *attribList );
+
+extern void glXDestroyPbuffer( Display *dpy, GLXPbuffer pbuf );
+
+extern void glXQueryDrawable( Display *dpy, GLXDrawable draw, int attribute,
+                              unsigned int *value );
+
+extern GLXContext glXCreateNewContext( Display *dpy, GLXFBConfig config,
+                                       int renderType, GLXContext shareList,
+                                       Bool direct );
+
+extern Bool glXMakeContextCurrent( Display *dpy, GLXDrawable draw,
+                                   GLXDrawable read, GLXContext ctx );
+
+extern GLXDrawable glXGetCurrentReadDrawable( void );
+
+extern int glXQueryContext( Display *dpy, GLXContext ctx, int attribute,
+                            int *value );
+
+extern void glXSelectEvent( Display *dpy, GLXDrawable drawable,
+                            unsigned long mask );
+
+extern void glXGetSelectedEvent( Display *dpy, GLXDrawable drawable,
+                                 unsigned long *mask );
+
+
+/* GLX 1.4 and later */
+extern void (*glXGetProcAddress(const GLubyte *procname))( void );
+
+
+#ifndef GLX_GLXEXT_LEGACY
+
+#include <GL/glxext.h>
+
+#else
+
+
+/*
+ * 28. GLX_EXT_visual_info extension
+ */
+#ifndef GLX_EXT_visual_info
+#define GLX_EXT_visual_info		1
+
+#define GLX_X_VISUAL_TYPE_EXT		0x22
+#define GLX_TRANSPARENT_TYPE_EXT	0x23
+#define GLX_TRANSPARENT_INDEX_VALUE_EXT	0x24
+#define GLX_TRANSPARENT_RED_VALUE_EXT	0x25
+#define GLX_TRANSPARENT_GREEN_VALUE_EXT	0x26
+#define GLX_TRANSPARENT_BLUE_VALUE_EXT	0x27
+#define GLX_TRANSPARENT_ALPHA_VALUE_EXT	0x28
+#define GLX_TRUE_COLOR_EXT		0x8002
+#define GLX_DIRECT_COLOR_EXT		0x8003
+#define GLX_PSEUDO_COLOR_EXT		0x8004
+#define GLX_STATIC_COLOR_EXT		0x8005
+#define GLX_GRAY_SCALE_EXT		0x8006
+#define GLX_STATIC_GRAY_EXT		0x8007
+#define GLX_NONE_EXT			0x8000
+#define GLX_TRANSPARENT_RGB_EXT		0x8008
+#define GLX_TRANSPARENT_INDEX_EXT	0x8009
+
+#endif /* 28. GLX_EXT_visual_info extension */
+
+
+
+/*
+ * 41. GLX_SGI_video_sync
+ */
+#ifndef GLX_SGI_video_sync
+#define GLX_SGI_video_sync 1
+
+extern int glXGetVideoSyncSGI(unsigned int *count);
+extern int glXWaitVideoSyncSGI(int divisor, int remainder, unsigned int *count);
+
+#endif /* GLX_SGI_video_sync */
+
+
+
+/*
+ * 42. GLX_EXT_visual_rating
+ */
+#ifndef GLX_EXT_visual_rating
+#define GLX_EXT_visual_rating		1
+
+#define GLX_VISUAL_CAVEAT_EXT		0x20
+/*#define GLX_NONE_EXT			0x8000*/
+#define GLX_SLOW_VISUAL_EXT		0x8001
+#define GLX_NON_CONFORMANT_VISUAL_EXT	0x800D
+
+#endif /* GLX_EXT_visual_rating	*/
+
+
+
+/*
+ * 47. GLX_EXT_import_context
+ */
+#ifndef GLX_EXT_import_context
+#define GLX_EXT_import_context 1
+
+#define GLX_SHARE_CONTEXT_EXT		0x800A
+#define GLX_VISUAL_ID_EXT		0x800B
+#define GLX_SCREEN_EXT			0x800C
+
+extern void glXFreeContextEXT(Display *dpy, GLXContext context);
+
+extern GLXContextID glXGetContextIDEXT(const GLXContext context);
+
+extern Display *glXGetCurrentDisplayEXT(void);
+
+extern GLXContext glXImportContextEXT(Display *dpy, GLXContextID contextID);
+
+extern int glXQueryContextInfoEXT(Display *dpy, GLXContext context,
+                                  int attribute,int *value);
+
+#endif /* GLX_EXT_import_context */
+
+
+
+/*
+ * 215. GLX_MESA_copy_sub_buffer
+ */
+#ifndef GLX_MESA_copy_sub_buffer
+#define GLX_MESA_copy_sub_buffer 1
+
+extern void glXCopySubBufferMESA( Display *dpy, GLXDrawable drawable,
+                                  int x, int y, int width, int height );
+
+#endif
+
+
+
+/*
+ * 216. GLX_MESA_pixmap_colormap
+ */
+#ifndef GLX_MESA_pixmap_colormap
+#define GLX_MESA_pixmap_colormap 1
+
+extern GLXPixmap glXCreateGLXPixmapMESA( Display *dpy, XVisualInfo *visual,
+                                         Pixmap pixmap, Colormap cmap );
+
+#endif /* GLX_MESA_pixmap_colormap */
+
+
+
+/*
+ * 217. GLX_MESA_release_buffers
+ */
+#ifndef GLX_MESA_release_buffers
+#define GLX_MESA_release_buffers 1
+
+extern Bool glXReleaseBuffersMESA( Display *dpy, GLXDrawable d );
+
+#endif /* GLX_MESA_release_buffers */
+
+
+
+/*
+ * 218. GLX_MESA_set_3dfx_mode
+ */
+#ifndef GLX_MESA_set_3dfx_mode
+#define GLX_MESA_set_3dfx_mode 1
+
+#define GLX_3DFX_WINDOW_MODE_MESA       0x1
+#define GLX_3DFX_FULLSCREEN_MODE_MESA   0x2
+
+extern Bool glXSet3DfxModeMESA( int mode );
+
+#endif /* GLX_MESA_set_3dfx_mode */
+
+
+
+/*
+ * ARB 2. GLX_ARB_get_proc_address
+ */
+#ifndef GLX_ARB_get_proc_address
+#define GLX_ARB_get_proc_address 1
+
+extern void (*glXGetProcAddressARB(const GLubyte *procName))();
+
+#endif /* GLX_ARB_get_proc_address */
+
+
+
+#endif /* GLX_GLXEXT_LEGACY */
+
+
+/**
+ ** The following aren't in glxext.h yet.
+ **/
+
+
+/*
+ * ???. GLX_NV_vertex_array_range
+ */
+#ifndef GLX_NV_vertex_array_range
+#define GLX_NV_vertex_array_range
+
+extern void *glXAllocateMemoryNV(GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
+extern void glXFreeMemoryNV(GLvoid *pointer);
+typedef void * ( * PFNGLXALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
+typedef void ( * PFNGLXFREEMEMORYNVPROC) (GLvoid *pointer);
+
+#endif /* GLX_NV_vertex_array_range */
+
+
+
+/*
+ * ???. GLX_MESA_agp_offset
+ */ 
+#ifndef GLX_MESA_agp_offset
+#define GLX_MESA_agp_offset 1
+
+extern GLuint glXGetAGPOffsetMESA(const GLvoid *pointer);
+typedef GLuint (* PFNGLXGETAGPOFFSETMESAPROC) (const GLvoid *pointer);
+
+#endif /* GLX_MESA_agp_offset */
+
+
+/*
+ * ARB ?. GLX_ARB_render_texture
+ */
+#ifndef GLX_ARB_render_texture
+#define GLX_ARB_render_texture 1
+
+extern Bool glXBindTexImageARB(Display *dpy, GLXPbuffer pbuffer, int buffer);
+extern Bool glXReleaseTexImageARB(Display *dpy, GLXPbuffer pbuffer, int buffer);
+extern Bool glXDrawableAttribARB(Display *dpy, GLXDrawable draw, const int *attribList);
+
+#endif /* GLX_ARB_render_texture */
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/reactos/lib/mesa32/include/GL/glx_mangle.h b/reactos/lib/mesa32/include/GL/glx_mangle.h
new file mode 100644
index 00000000000..d0b47d94e73
--- /dev/null
+++ b/reactos/lib/mesa32/include/GL/glx_mangle.h
@@ -0,0 +1,55 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ * Copyright (C) 1995-1998  Brian Paul
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
+#ifndef GLX_MANGLE_H
+#define GLX_MANGLE_H
+
+#define glXChooseVisual mglXChooseVisual
+#define glXCreateContext mglXCreateContext
+#define glXDestroyContext mglXDestroyContext
+#define glXMakeCurrent mglXMakeCurrent
+#define glXCopyContext mglXCopyContext
+#define glXSwapBuffers mglXSwapBuffers
+#define glXCreateGLXPixmap mglXCreateGLXPixmap
+#define glXDestroyGLXPixmap mglXDestroyGLXPixmap
+#define glXQueryExtension mglXQueryExtension
+#define glXQueryVersion mglXQueryVersion
+#define glXIsDirect mglXIsDirect
+#define glXGetConfig mglXGetConfig
+#define glXGetCurrentContext mglXGetCurrentContext
+#define glXGetCurrentDrawable mglXGetCurrentDrawable
+#define glXWaitGL mglXWaitGL
+#define glXWaitX mglXWaitX
+#define glXUseXFont mglXUseXFont
+#define glXQueryExtensionsString mglXQueryExtensionsString
+#define glXQueryServerString mglXQueryServerString
+#define glXGetClientString mglXGetClientString
+#define glXCreateGLXPixmapMESA mglXCreateGLXPixmapMESA
+#define glXReleaseBuffersMESA mglXReleaseBuffersMESA
+#define glXCopySubBufferMESA mglXCopySubBufferMESA
+#define glXGetVideoSyncSGI mglXGetVideoSyncSGI
+#define glXWaitVideoSyncSGI mglXWaitVideoSyncSGI
+
+/* GLX 1.4 */
+#define glXGetProcAddress mglXGetProcAddress
+
+
+#endif
diff --git a/reactos/lib/mesa32/include/GL/glxext.h b/reactos/lib/mesa32/include/GL/glxext.h
new file mode 100644
index 00000000000..54620bd4e17
--- /dev/null
+++ b/reactos/lib/mesa32/include/GL/glxext.h
@@ -0,0 +1,607 @@
+#ifndef __glxext_h_
+#define __glxext_h_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: This software was created using the
+** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
+** not been independently verified as being compliant with the OpenGL(R)
+** version 1.2.1 Specification.
+*/
+
+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__)
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#endif
+
+#ifndef APIENTRY
+#define APIENTRY
+#endif
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+
+/*************************************************************/
+
+/* Header file version number, required by OpenGL ABI for Linux */
+/* glxext.h last updated 2002/03/22 */
+/* Current version at http://oss.sgi.com/projects/ogl-sample/registry/ */
+#define GLX_GLXEXT_VERSION 5
+
+#ifndef GLX_VERSION_1_3
+#define GLX_WINDOW_BIT                     0x00000001
+#define GLX_PIXMAP_BIT                     0x00000002
+#define GLX_PBUFFER_BIT                    0x00000004
+#define GLX_RGBA_BIT                       0x00000001
+#define GLX_COLOR_INDEX_BIT                0x00000002
+#define GLX_PBUFFER_CLOBBER_MASK           0x08000000
+#define GLX_FRONT_LEFT_BUFFER_BIT          0x00000001
+#define GLX_FRONT_RIGHT_BUFFER_BIT         0x00000002
+#define GLX_BACK_LEFT_BUFFER_BIT           0x00000004
+#define GLX_BACK_RIGHT_BUFFER_BIT          0x00000008
+#define GLX_AUX_BUFFERS_BIT                0x00000010
+#define GLX_DEPTH_BUFFER_BIT               0x00000020
+#define GLX_STENCIL_BUFFER_BIT             0x00000040
+#define GLX_ACCUM_BUFFER_BIT               0x00000080
+#define GLX_CONFIG_CAVEAT                  0x20
+#define GLX_X_VISUAL_TYPE                  0x22
+#define GLX_TRANSPARENT_TYPE               0x23
+#define GLX_TRANSPARENT_INDEX_VALUE        0x24
+#define GLX_TRANSPARENT_RED_VALUE          0x25
+#define GLX_TRANSPARENT_GREEN_VALUE        0x26
+#define GLX_TRANSPARENT_BLUE_VALUE         0x27
+#define GLX_TRANSPARENT_ALPHA_VALUE        0x28
+#define GLX_DONT_CARE                      0xFFFFFFFF
+#define GLX_NONE                           0x8000
+#define GLX_SLOW_CONFIG                    0x8001
+#define GLX_TRUE_COLOR                     0x8002
+#define GLX_DIRECT_COLOR                   0x8003
+#define GLX_PSEUDO_COLOR                   0x8004
+#define GLX_STATIC_COLOR                   0x8005
+#define GLX_GRAY_SCALE                     0x8006
+#define GLX_STATIC_GRAY                    0x8007
+#define GLX_TRANSPARENT_RGB                0x8008
+#define GLX_TRANSPARENT_INDEX              0x8009
+#define GLX_VISUAL_ID                      0x800B
+#define GLX_SCREEN                         0x800C
+#define GLX_NON_CONFORMANT_CONFIG          0x800D
+#define GLX_DRAWABLE_TYPE                  0x8010
+#define GLX_RENDER_TYPE                    0x8011
+#define GLX_X_RENDERABLE                   0x8012
+#define GLX_FBCONFIG_ID                    0x8013
+#define GLX_RGBA_TYPE                      0x8014
+#define GLX_COLOR_INDEX_TYPE               0x8015
+#define GLX_MAX_PBUFFER_WIDTH              0x8016
+#define GLX_MAX_PBUFFER_HEIGHT             0x8017
+#define GLX_MAX_PBUFFER_PIXELS             0x8018
+#define GLX_PRESERVED_CONTENTS             0x801B
+#define GLX_LARGEST_PBUFFER                0x801C
+#define GLX_WIDTH                          0x801D
+#define GLX_HEIGHT                         0x801E
+#define GLX_EVENT_MASK                     0x801F
+#define GLX_DAMAGED                        0x8020
+#define GLX_SAVED                          0x8021
+#define GLX_WINDOW                         0x8022
+#define GLX_PBUFFER                        0x8023
+#define GLX_PBUFFER_HEIGHT                 0x8040
+#define GLX_PBUFFER_WIDTH                  0x8041
+#endif
+
+#ifndef GLX_VERSION_1_4
+#define GLX_SAMPLE_BUFFERS                 100000
+#define GLX_SAMPLES                        100001
+#endif
+
+#ifndef GLX_ARB_get_proc_address
+#endif
+
+#ifndef GLX_ARB_multisample
+#define GLX_SAMPLE_BUFFERS_ARB             100000
+#define GLX_SAMPLES_ARB                    100001
+#endif
+
+#ifndef GLX_SGIS_multisample
+#define GLX_SAMPLE_BUFFERS_SGIS            100000
+#define GLX_SAMPLES_SGIS                   100001
+#endif
+
+#ifndef GLX_EXT_visual_info
+#define GLX_X_VISUAL_TYPE_EXT              0x22
+#define GLX_TRANSPARENT_TYPE_EXT           0x23
+#define GLX_TRANSPARENT_INDEX_VALUE_EXT    0x24
+#define GLX_TRANSPARENT_RED_VALUE_EXT      0x25
+#define GLX_TRANSPARENT_GREEN_VALUE_EXT    0x26
+#define GLX_TRANSPARENT_BLUE_VALUE_EXT     0x27
+#define GLX_TRANSPARENT_ALPHA_VALUE_EXT    0x28
+#define GLX_NONE_EXT                       0x8000
+#define GLX_TRUE_COLOR_EXT                 0x8002
+#define GLX_DIRECT_COLOR_EXT               0x8003
+#define GLX_PSEUDO_COLOR_EXT               0x8004
+#define GLX_STATIC_COLOR_EXT               0x8005
+#define GLX_GRAY_SCALE_EXT                 0x8006
+#define GLX_STATIC_GRAY_EXT                0x8007
+#define GLX_TRANSPARENT_RGB_EXT            0x8008
+#define GLX_TRANSPARENT_INDEX_EXT          0x8009
+#endif
+
+#ifndef GLX_SGI_swap_control
+#endif
+
+#ifndef GLX_SGI_video_sync
+#endif
+
+#ifndef GLX_SGI_make_current_read
+#endif
+
+#ifndef GLX_SGIX_video_source
+#endif
+
+#ifndef GLX_EXT_visual_rating
+#define GLX_VISUAL_CAVEAT_EXT              0x20
+#define GLX_SLOW_VISUAL_EXT                0x8001
+#define GLX_NON_CONFORMANT_VISUAL_EXT      0x800D
+/* reuse GLX_NONE_EXT */
+#endif
+
+#ifndef GLX_EXT_import_context
+#define GLX_SHARE_CONTEXT_EXT              0x800A
+#define GLX_VISUAL_ID_EXT                  0x800B
+#define GLX_SCREEN_EXT                     0x800C
+#endif
+
+#ifndef GLX_SGIX_fbconfig
+#define GLX_WINDOW_BIT_SGIX                0x00000001
+#define GLX_PIXMAP_BIT_SGIX                0x00000002
+#define GLX_RGBA_BIT_SGIX                  0x00000001
+#define GLX_COLOR_INDEX_BIT_SGIX           0x00000002
+#define GLX_DRAWABLE_TYPE_SGIX             0x8010
+#define GLX_RENDER_TYPE_SGIX               0x8011
+#define GLX_X_RENDERABLE_SGIX              0x8012
+#define GLX_FBCONFIG_ID_SGIX               0x8013
+#define GLX_RGBA_TYPE_SGIX                 0x8014
+#define GLX_COLOR_INDEX_TYPE_SGIX          0x8015
+/* reuse GLX_SCREEN_EXT */
+#endif
+
+#ifndef GLX_SGIX_pbuffer
+#define GLX_PBUFFER_BIT_SGIX               0x00000004
+#define GLX_BUFFER_CLOBBER_MASK_SGIX       0x08000000
+#define GLX_FRONT_LEFT_BUFFER_BIT_SGIX     0x00000001
+#define GLX_FRONT_RIGHT_BUFFER_BIT_SGIX    0x00000002
+#define GLX_BACK_LEFT_BUFFER_BIT_SGIX      0x00000004
+#define GLX_BACK_RIGHT_BUFFER_BIT_SGIX     0x00000008
+#define GLX_AUX_BUFFERS_BIT_SGIX           0x00000010
+#define GLX_DEPTH_BUFFER_BIT_SGIX          0x00000020
+#define GLX_STENCIL_BUFFER_BIT_SGIX        0x00000040
+#define GLX_ACCUM_BUFFER_BIT_SGIX          0x00000080
+#define GLX_SAMPLE_BUFFERS_BIT_SGIX        0x00000100
+#define GLX_MAX_PBUFFER_WIDTH_SGIX         0x8016
+#define GLX_MAX_PBUFFER_HEIGHT_SGIX        0x8017
+#define GLX_MAX_PBUFFER_PIXELS_SGIX        0x8018
+#define GLX_OPTIMAL_PBUFFER_WIDTH_SGIX     0x8019
+#define GLX_OPTIMAL_PBUFFER_HEIGHT_SGIX    0x801A
+#define GLX_PRESERVED_CONTENTS_SGIX        0x801B
+#define GLX_LARGEST_PBUFFER_SGIX           0x801C
+#define GLX_WIDTH_SGIX                     0x801D
+#define GLX_HEIGHT_SGIX                    0x801E
+#define GLX_EVENT_MASK_SGIX                0x801F
+#define GLX_DAMAGED_SGIX                   0x8020
+#define GLX_SAVED_SGIX                     0x8021
+#define GLX_WINDOW_SGIX                    0x8022
+#define GLX_PBUFFER_SGIX                   0x8023
+#endif
+
+#ifndef GLX_SGI_cushion
+#endif
+
+#ifndef GLX_SGIX_video_resize
+#define GLX_SYNC_FRAME_SGIX                0x00000000
+#define GLX_SYNC_SWAP_SGIX                 0x00000001
+#endif
+
+#ifndef GLX_SGIX_dmbuffer
+#define GLX_DIGITAL_MEDIA_PBUFFER_SGIX     0x8024
+#endif
+
+#ifndef GLX_SGIX_swap_group
+#endif
+
+#ifndef GLX_SGIX_swap_barrier
+#endif
+
+#ifndef GLX_SGIS_blended_overlay
+#define GLX_BLENDED_RGBA_SGIS              0x8025
+#endif
+
+#ifndef GLX_SGIS_shared_multisample
+#define GLX_MULTISAMPLE_SUB_RECT_WIDTH_SGIS 0x8026
+#define GLX_MULTISAMPLE_SUB_RECT_HEIGHT_SGIS 0x8027
+#endif
+
+#ifndef GLX_SUN_get_transparent_index
+#endif
+
+#ifndef GLX_3DFX_multisample
+#define GLX_SAMPLE_BUFFERS_3DFX            0x8050
+#define GLX_SAMPLES_3DFX                   0x8051
+#endif
+
+#ifndef GLX_MESA_copy_sub_buffer
+#endif
+
+#ifndef GLX_MESA_pixmap_colormap
+#endif
+
+#ifndef GLX_MESA_release_buffers
+#endif
+
+#ifndef GLX_MESA_set_3dfx_mode
+#define GLX_3DFX_WINDOW_MODE_MESA          0x1
+#define GLX_3DFX_FULLSCREEN_MODE_MESA      0x2
+#endif
+
+#ifndef GLX_SGIX_visual_select_group
+#define GLX_VISUAL_SELECT_GROUP_SGIX       0x8028
+#endif
+
+#ifndef GLX_OML_swap_method
+#define GLX_SWAP_METHOD_OML                0x8060
+#define GLX_SWAP_EXCHANGE_OML              0x8061
+#define GLX_SWAP_COPY_OML                  0x8062
+#define GLX_SWAP_UNDEFINED_OML             0x8063
+#endif
+
+#ifndef GLX_OML_sync_control
+#endif
+
+
+/*************************************************************/
+
+#ifndef GLX_ARB_get_proc_address
+typedef void (*__GLXextFuncPtr)(void);
+#endif
+
+#ifndef GLX_SGIX_video_source
+typedef XID GLXVideoSourceSGIX;
+#endif
+
+#ifndef GLX_SGIX_fbconfig
+typedef XID GLXFBConfigIDSGIX;
+typedef struct __GLXFBConfigRec *GLXFBConfigSGIX;
+#endif
+
+#ifndef GLX_SGIX_pbuffer
+typedef XID GLXPbufferSGIX;
+typedef struct {
+    int type;
+    unsigned long serial;	  /* # of last request processed by server */
+    Bool send_event;		  /* true if this came for SendEvent request */
+    Display *display;		  /* display the event was read from */
+    GLXDrawable drawable;	  /* i.d. of Drawable */
+    int event_type;		  /* GLX_DAMAGED_SGIX or GLX_SAVED_SGIX */
+    int draw_type;		  /* GLX_WINDOW_SGIX or GLX_PBUFFER_SGIX */
+    unsigned int mask;	  /* mask indicating which buffers are affected*/
+    int x, y;
+    int width, height;
+    int count;		  /* if nonzero, at least this many more */
+} GLXBufferClobberEventSGIX;
+#endif
+
+#ifndef GLX_VERSION_1_3
+#define GLX_VERSION_1_3 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern GLXFBConfig * glXGetFBConfigs (Display *, int, int *);
+extern GLXFBConfig * glXChooseFBConfig (Display *, int, const int *, int *);
+extern int glXGetFBConfigAttrib (Display *, GLXFBConfig, int, int *);
+extern XVisualInfo * glXGetVisualFromFBConfig (Display *, GLXFBConfig);
+extern GLXWindow glXCreateWindow (Display *, GLXFBConfig, Window, const int *);
+extern void glXDestroyWindow (Display *, GLXWindow);
+extern GLXPixmap glXCreatePixmap (Display *, GLXFBConfig, Pixmap, const int *);
+extern void glXDestroyPixmap (Display *, GLXPixmap);
+extern GLXPbuffer glXCreatePbuffer (Display *, GLXFBConfig, const int *);
+extern void glXDestroyPbuffer (Display *, GLXPbuffer);
+extern void glXQueryDrawable (Display *, GLXDrawable, int, unsigned int *);
+extern GLXContext glXCreateNewContext (Display *, GLXFBConfig, int, GLXContext, Bool);
+extern Bool glXMakeContextCurrent (Display *, GLXDrawable, GLXDrawable, GLXContext);
+extern GLXDrawable glXGetCurrentReadDrawable (void);
+extern Display * glXGetCurrentDisplay (void);
+extern int glXQueryContext (Display *, GLXContext, int, int *);
+extern void glXSelectEvent (Display *, GLXDrawable, unsigned long);
+extern void glXGetSelectedEvent (Display *, GLXDrawable, unsigned long *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef GLXFBConfig * ( * PFNGLXGETFBCONFIGSPROC) (Display *dpy, int screen, int *nelements);
+typedef GLXFBConfig * ( * PFNGLXCHOOSEFBCONFIGPROC) (Display *dpy, int screen, const int *attrib_list, int *nelements);
+typedef int ( * PFNGLXGETFBCONFIGATTRIBPROC) (Display *dpy, GLXFBConfig config, int attribute, int *value);
+typedef XVisualInfo * ( * PFNGLXGETVISUALFROMFBCONFIGPROC) (Display *dpy, GLXFBConfig config);
+typedef GLXWindow ( * PFNGLXCREATEWINDOWPROC) (Display *dpy, GLXFBConfig config, Window win, const int *attrib_list);
+typedef void ( * PFNGLXDESTROYWINDOWPROC) (Display *dpy, GLXWindow win);
+typedef GLXPixmap ( * PFNGLXCREATEPIXMAPPROC) (Display *dpy, GLXFBConfig config, Pixmap pixmap, const int *attrib_list);
+typedef void ( * PFNGLXDESTROYPIXMAPPROC) (Display *dpy, GLXPixmap pixmap);
+typedef GLXPbuffer ( * PFNGLXCREATEPBUFFERPROC) (Display *dpy, GLXFBConfig config, const int *attrib_list);
+typedef void ( * PFNGLXDESTROYPBUFFERPROC) (Display *dpy, GLXPbuffer pbuf);
+typedef void ( * PFNGLXQUERYDRAWABLEPROC) (Display *dpy, GLXDrawable draw, int attribute, unsigned int *value);
+typedef GLXContext ( * PFNGLXCREATENEWCONTEXTPROC) (Display *dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct);
+typedef Bool ( * PFNGLXMAKECONTEXTCURRENTPROC) (Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx);
+typedef GLXDrawable ( * PFNGLXGETCURRENTREADDRAWABLEPROC) (void);
+typedef Display * ( * PFNGLXGETCURRENTDISPLAYPROC) (void);
+typedef int ( * PFNGLXQUERYCONTEXTPROC) (Display *dpy, GLXContext ctx, int attribute, int *value);
+typedef void ( * PFNGLXSELECTEVENTPROC) (Display *dpy, GLXDrawable draw, unsigned long event_mask);
+typedef void ( * PFNGLXGETSELECTEDEVENTPROC) (Display *dpy, GLXDrawable draw, unsigned long *event_mask);
+#endif
+
+#ifndef GLX_VERSION_1_4
+#define GLX_VERSION_1_4 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern __GLXextFuncPtr glXGetProcAddress (const GLubyte *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef __GLXextFuncPtr ( * PFNGLXGETPROCADDRESSPROC) (const GLubyte *procName);
+#endif
+
+#ifndef GLX_ARB_get_proc_address
+#define GLX_ARB_get_proc_address 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern __GLXextFuncPtr glXGetProcAddressARB (const GLubyte *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef __GLXextFuncPtr ( * PFNGLXGETPROCADDRESSARBPROC) (const GLubyte *procName);
+#endif
+
+#ifndef GLX_ARB_multisample
+#define GLX_ARB_multisample 1
+#endif
+
+#ifndef GLX_SGIS_multisample
+#define GLX_SGIS_multisample 1
+#endif
+
+#ifndef GLX_EXT_visual_info
+#define GLX_EXT_visual_info 1
+#endif
+
+#ifndef GLX_SGI_swap_control
+#define GLX_SGI_swap_control 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern int glXSwapIntervalSGI (int);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef int ( * PFNGLXSWAPINTERVALSGIPROC) (int interval);
+#endif
+
+#ifndef GLX_SGI_video_sync
+#define GLX_SGI_video_sync 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern int glXGetVideoSyncSGI (unsigned int *);
+extern int glXWaitVideoSyncSGI (int, int, unsigned int *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef int ( * PFNGLXGETVIDEOSYNCSGIPROC) (unsigned int *count);
+typedef int ( * PFNGLXWAITVIDEOSYNCSGIPROC) (int divisor, int remainder, unsigned int *count);
+#endif
+
+#ifndef GLX_SGI_make_current_read
+#define GLX_SGI_make_current_read 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern Bool glXMakeCurrentReadSGI (Display *, GLXDrawable, GLXDrawable, GLXContext);
+extern GLXDrawable glXGetCurrentReadDrawableSGI (void);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef Bool ( * PFNGLXMAKECURRENTREADSGIPROC) (Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx);
+typedef GLXDrawable ( * PFNGLXGETCURRENTREADDRAWABLESGIPROC) (void);
+#endif
+
+#ifdef _VL_H
+#ifndef GLX_SGIX_video_source
+#define GLX_SGIX_video_source 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern GLXVideoSourceSGIX glXCreateGLXVideoSourceSGIX (Display *, int, VLServer, VLPath, int, VLNode);
+extern void glXDestroyGLXVideoSourceSGIX (Display *, GLXVideoSourceSGIX);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef GLXVideoSourceSGIX ( * PFNGLXCREATEGLXVIDEOSOURCESGIXPROC) (Display *display, int screen, VLServer server, VLPath path, int nodeClass, VLNode drainNode);
+typedef void ( * PFNGLXDESTROYGLXVIDEOSOURCESGIXPROC) (Display *dpy, GLXVideoSourceSGIX glxvideosource);
+#endif
+
+#endif /* _VL_H */
+#ifndef GLX_EXT_visual_rating
+#define GLX_EXT_visual_rating 1
+#endif
+
+#ifndef GLX_EXT_import_context
+#define GLX_EXT_import_context 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern Display * glXGetCurrentDisplayEXT (void);
+extern int glXQueryContextInfoEXT (Display *, GLXContext, int, int *);
+extern GLXContextID glXGetContextIDEXT (const GLXContext);
+extern GLXContext glXImportContextEXT (Display *, GLXContextID);
+extern void glXFreeContextEXT (Display *, GLXContext);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef Display * ( * PFNGLXGETCURRENTDISPLAYEXTPROC) (void);
+typedef int ( * PFNGLXQUERYCONTEXTINFOEXTPROC) (Display *dpy, GLXContext context, int attribute, int *value);
+typedef GLXContextID ( * PFNGLXGETCONTEXTIDEXTPROC) (const GLXContext context);
+typedef GLXContext ( * PFNGLXIMPORTCONTEXTEXTPROC) (Display *dpy, GLXContextID contextID);
+typedef void ( * PFNGLXFREECONTEXTEXTPROC) (Display *dpy, GLXContext context);
+#endif
+
+#ifndef GLX_SGIX_fbconfig
+#define GLX_SGIX_fbconfig 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern int glXGetFBConfigAttribSGIX (Display *, GLXFBConfigSGIX, int, int *);
+extern GLXFBConfigSGIX * glXChooseFBConfigSGIX (Display *, int, int *, int *);
+extern GLXPixmap glXCreateGLXPixmapWithConfigSGIX (Display *, GLXFBConfigSGIX, Pixmap);
+extern GLXContext glXCreateContextWithConfigSGIX (Display *, GLXFBConfigSGIX, int, GLXContext, Bool);
+extern XVisualInfo * glXGetVisualFromFBConfigSGIX (Display *, GLXFBConfigSGIX);
+extern GLXFBConfigSGIX glXGetFBConfigFromVisualSGIX (Display *, XVisualInfo *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef int ( * PFNGLXGETFBCONFIGATTRIBSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, int attribute, int *value);
+typedef GLXFBConfigSGIX * ( * PFNGLXCHOOSEFBCONFIGSGIXPROC) (Display *dpy, int screen, int *attrib_list, int *nelements);
+typedef GLXPixmap ( * PFNGLXCREATEGLXPIXMAPWITHCONFIGSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, Pixmap pixmap);
+typedef GLXContext ( * PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, int render_type, GLXContext share_list, Bool direct);
+typedef XVisualInfo * ( * PFNGLXGETVISUALFROMFBCONFIGSGIXPROC) (Display *dpy, GLXFBConfigSGIX config);
+typedef GLXFBConfigSGIX ( * PFNGLXGETFBCONFIGFROMVISUALSGIXPROC) (Display *dpy, XVisualInfo *vis);
+#endif
+
+#ifndef GLX_SGIX_pbuffer
+#define GLX_SGIX_pbuffer 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern GLXPbufferSGIX glXCreateGLXPbufferSGIX (Display *, GLXFBConfigSGIX, unsigned int, unsigned int, int *);
+extern void glXDestroyGLXPbufferSGIX (Display *, GLXPbufferSGIX);
+extern int glXQueryGLXPbufferSGIX (Display *, GLXPbufferSGIX, int, unsigned int *);
+extern void glXSelectEventSGIX (Display *, GLXDrawable, unsigned long);
+extern void glXGetSelectedEventSGIX (Display *, GLXDrawable, unsigned long *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef GLXPbufferSGIX ( * PFNGLXCREATEGLXPBUFFERSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, unsigned int width, unsigned int height, int *attrib_list);
+typedef void ( * PFNGLXDESTROYGLXPBUFFERSGIXPROC) (Display *dpy, GLXPbufferSGIX pbuf);
+typedef int ( * PFNGLXQUERYGLXPBUFFERSGIXPROC) (Display *dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int *value);
+typedef void ( * PFNGLXSELECTEVENTSGIXPROC) (Display *dpy, GLXDrawable drawable, unsigned long mask);
+typedef void ( * PFNGLXGETSELECTEDEVENTSGIXPROC) (Display *dpy, GLXDrawable drawable, unsigned long *mask);
+#endif
+
+#ifndef GLX_SGI_cushion
+#define GLX_SGI_cushion 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern void glXCushionSGI (Display *, Window, float);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef void ( * PFNGLXCUSHIONSGIPROC) (Display *dpy, Window window, float cushion);
+#endif
+
+#ifndef GLX_SGIX_video_resize
+#define GLX_SGIX_video_resize 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern int glXBindChannelToWindowSGIX (Display *, int, int, Window);
+extern int glXChannelRectSGIX (Display *, int, int, int, int, int, int);
+extern int glXQueryChannelRectSGIX (Display *, int, int, int *, int *, int *, int *);
+extern int glXQueryChannelDeltasSGIX (Display *, int, int, int *, int *, int *, int *);
+extern int glXChannelRectSyncSGIX (Display *, int, int, GLenum);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef int ( * PFNGLXBINDCHANNELTOWINDOWSGIXPROC) (Display *display, int screen, int channel, Window window);
+typedef int ( * PFNGLXCHANNELRECTSGIXPROC) (Display *display, int screen, int channel, int x, int y, int w, int h);
+typedef int ( * PFNGLXQUERYCHANNELRECTSGIXPROC) (Display *display, int screen, int channel, int *dx, int *dy, int *dw, int *dh);
+typedef int ( * PFNGLXQUERYCHANNELDELTASSGIXPROC) (Display *display, int screen, int channel, int *x, int *y, int *w, int *h);
+typedef int ( * PFNGLXCHANNELRECTSYNCSGIXPROC) (Display *display, int screen, int channel, GLenum synctype);
+#endif
+
+#ifdef _DM_BUFFER_H_
+#ifndef GLX_SGIX_dmbuffer
+#define GLX_SGIX_dmbuffer 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern Bool glXAssociateDMPbufferSGIX (Display *, GLXPbufferSGIX, DMparams *, DMbuffer);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef Bool ( * PFNGLXASSOCIATEDMPBUFFERSGIXPROC) (Display *dpy, GLXPbufferSGIX pbuffer, DMparams *params, DMbuffer dmbuffer);
+#endif
+
+#endif /* _DM_BUFFER_H_ */
+#ifndef GLX_SGIX_swap_group
+#define GLX_SGIX_swap_group 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern void glXJoinSwapGroupSGIX (Display *, GLXDrawable, GLXDrawable);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef void ( * PFNGLXJOINSWAPGROUPSGIXPROC) (Display *dpy, GLXDrawable drawable, GLXDrawable member);
+#endif
+
+#ifndef GLX_SGIX_swap_barrier
+#define GLX_SGIX_swap_barrier 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern void glXBindSwapBarrierSGIX (Display *, GLXDrawable, int);
+extern Bool glXQueryMaxSwapBarriersSGIX (Display *, int, int *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef void ( * PFNGLXBINDSWAPBARRIERSGIXPROC) (Display *dpy, GLXDrawable drawable, int barrier);
+typedef Bool ( * PFNGLXQUERYMAXSWAPBARRIERSSGIXPROC) (Display *dpy, int screen, int *max);
+#endif
+
+#ifndef GLX_SUN_get_transparent_index
+#define GLX_SUN_get_transparent_index 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern Status glXGetTransparentIndexSUN (Display *, Window, Window, long *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef Status ( * PFNGLXGETTRANSPARENTINDEXSUNPROC) (Display *dpy, Window overlay, Window underlay, long *pTransparentIndex);
+#endif
+
+#ifndef GLX_MESA_copy_sub_buffer
+#define GLX_MESA_copy_sub_buffer 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern void glXCopySubBufferMESA (Display *, GLXDrawable, int, int, int, int);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef void ( * PFNGLXCOPYSUBBUFFERMESAPROC) (Display *dpy, GLXDrawable drawable, int x, int y, int width, int height);
+#endif
+
+#ifndef GLX_MESA_pixmap_colormap
+#define GLX_MESA_pixmap_colormap 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern GLXPixmap glXCreateGLXPixmapMESA (Display *, XVisualInfo *, Pixmap, Colormap);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef GLXPixmap ( * PFNGLXCREATEGLXPIXMAPMESAPROC) (Display *dpy, XVisualInfo *visual, Pixmap pixmap, Colormap cmap);
+#endif
+
+#ifndef GLX_MESA_release_buffers
+#define GLX_MESA_release_buffers 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern Bool glXReleaseBuffersMESA (Display *, GLXDrawable);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef Bool ( * PFNGLXRELEASEBUFFERSMESAPROC) (Display *dpy, GLXDrawable drawable);
+#endif
+
+#ifndef GLX_MESA_set_3dfx_mode
+#define GLX_MESA_set_3dfx_mode 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern Bool glXSet3DfxModeMESA (int);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef Bool ( * PFNGLXSET3DFXMODEMESAPROC) (int mode);
+#endif
+
+#ifndef GLX_SGIX_visual_select_group
+#define GLX_SGIX_visual_select_group 1
+#endif
+
+#ifndef GLX_OML_swap_method
+#define GLX_OML_swap_method 1
+#endif
+
+#if defined(__STDC_VERSION__)
+#if __STDC_VERSION__ >= 199901L
+/* Include ISO C99 integer types for OML_sync_control; need a better test */
+#include <inttypes.h>
+
+#ifndef GLX_OML_sync_control
+#define GLX_OML_sync_control 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern Bool glXGetSyncValuesOML (Display *, GLXDrawable, int64_t *, int64_t *, int64_t *);
+extern Bool glXGetMscRateOML (Display *, GLXDrawable, int32_t *, int32_t *);
+extern int64_t glXSwapBuffersMscOML (Display *, GLXDrawable, int64_t, int64_t, int64_t);
+extern Bool glXWaitForMscOML (Display *, GLXDrawable, int64_t, int64_t, int64_t, int64_t *, int64_t *, int64_t *);
+extern Bool glXWaitForSbcOML (Display *, GLXDrawable, int64_t, int64_t *, int64_t *, int64_t *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef Bool ( * PFNGLXGETSYNCVALUESOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t *ust, int64_t *msc, int64_t *sbc);
+typedef Bool ( * PFNGLXGETMSCRATEOMLPROC) (Display *dpy, GLXDrawable drawable, int32_t *numerator, int32_t *denominator);
+typedef int64_t ( * PFNGLXSWAPBUFFERSMSCOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t target_msc, int64_t divisor, int64_t remainder);
+typedef Bool ( * PFNGLXWAITFORMSCOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t target_msc, int64_t divisor, int64_t remainder, int64_t *ust, int64_t *msc, int64_t *sbc);
+typedef Bool ( * PFNGLXWAITFORSBCOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t target_sbc, int64_t *ust, int64_t *msc, int64_t *sbc);
+#endif
+
+#endif /* C99 version test */
+#endif /* STDC test */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/reactos/lib/mesa32/include/GL/internal/glcore.h b/reactos/lib/mesa32/include/GL/internal/glcore.h
new file mode 100644
index 00000000000..7080b7ce74e
--- /dev/null
+++ b/reactos/lib/mesa32/include/GL/internal/glcore.h
@@ -0,0 +1,471 @@
+/* $XFree86: xc/lib/GL/include/GL/internal/glcore.h,v 1.7 2001/03/25 05:32:00 tsi Exp $ */
+#ifndef __gl_core_h_
+#define __gl_core_h_
+
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
+**
+*/
+
+#ifndef XFree86LOADER
+#include <sys/types.h>
+#endif
+
+#ifdef CAPI
+#undef CAPI
+#endif
+#define CAPI
+
+#define GL_CORE_SGI  1
+#define GL_CORE_MESA 2
+#define GL_CORE_APPLE 4
+
+typedef struct __GLcontextRec __GLcontext;
+typedef struct __GLinterfaceRec __GLinterface;
+
+/*
+** This file defines the interface between the GL core and the surrounding
+** "operating system" that supports it (currently the GLX or WGL extensions).
+**
+** Members (data and function pointers) are documented as imported or
+** exported according to how they are used by the core rendering functions.
+** Imported members are initialized by the "operating system" and used by
+** the core functions.  Exported members are initialized by the core functions
+** and used by the "operating system".
+*/
+
+/*
+** Mode and limit information for a context.  This information is
+** kept around in the context so that values can be used during
+** command execution, and for returning information about the
+** context to the application.
+*/
+typedef struct __GLcontextModesRec {
+    struct __GLcontextModesRec * next;
+
+    GLboolean rgbMode;
+    GLboolean floatMode;
+    GLboolean colorIndexMode;
+    GLuint doubleBufferMode;
+    GLuint stereoMode;
+
+    GLboolean haveAccumBuffer;
+    GLboolean haveDepthBuffer;
+    GLboolean haveStencilBuffer;
+
+    GLint redBits, greenBits, blueBits, alphaBits;	/* bits per comp */
+    GLuint redMask, greenMask, blueMask, alphaMask;
+    GLint rgbBits;		/* total bits for rgb */
+    GLint indexBits;		/* total bits for colorindex */
+
+    GLint accumRedBits, accumGreenBits, accumBlueBits, accumAlphaBits;
+    GLint depthBits;
+    GLint stencilBits;
+
+    GLint numAuxBuffers;
+
+    GLint level;
+
+    GLint pixmapMode;
+
+    /* GLX */
+    GLint visualID;
+    GLint visualType;     /**< One of the GLX X visual types. (i.e., 
+			   * \c GLX_TRUE_COLOR, etc.)
+			   */
+
+    /* EXT_visual_rating / GLX 1.2 */
+    GLint visualRating;
+
+    /* EXT_visual_info / GLX 1.2 */
+    GLint transparentPixel;
+				/*    colors are floats scaled to ints */
+    GLint transparentRed, transparentGreen, transparentBlue, transparentAlpha;
+    GLint transparentIndex;
+
+    /* ARB_multisample / SGIS_multisample */
+    GLint sampleBuffers;
+    GLint samples;
+
+    /* SGIX_fbconfig / GLX 1.3 */
+    GLint drawableType;
+    GLint renderType;
+    GLint xRenderable;
+    GLint fbconfigID;
+
+    /* SGIX_pbuffer / GLX 1.3 */
+    GLint maxPbufferWidth;
+    GLint maxPbufferHeight;
+    GLint maxPbufferPixels;
+    GLint optimalPbufferWidth;   /* Only for SGIX_pbuffer. */
+    GLint optimalPbufferHeight;  /* Only for SGIX_pbuffer. */
+
+    /* SGIX_visual_select_group */
+    GLint visualSelectGroup;
+
+    /* OML_swap_method */
+    GLint swapMethod;
+
+    GLint screen;
+} __GLcontextModes;
+
+/************************************************************************/
+
+/*
+** Structure used for allocating and freeing drawable private memory.
+** (like software buffers, for example).
+**
+** The memory allocation routines are provided by the surrounding
+** "operating system" code, and they are to be used for allocating
+** software buffers and things which are associated with the drawable,
+** and used by any context which draws to that drawable.  There are
+** separate memory allocation functions for drawables and contexts
+** since drawables and contexts can be created and destroyed independently
+** of one another, and the "operating system" may want to use separate
+** allocation arenas for each.
+**
+** The freePrivate function is filled in by the core routines when they
+** allocates software buffers, and stick them in "private".  The freePrivate
+** function will destroy anything allocated to this drawable (to be called
+** when the drawable is destroyed).
+*/
+typedef struct __GLdrawableRegionRec __GLdrawableRegion;
+typedef struct __GLdrawableBufferRec __GLdrawableBuffer;
+typedef struct __GLdrawablePrivateRec __GLdrawablePrivate;
+
+typedef struct __GLregionRectRec {
+    /* lower left (inside the rectangle) */
+    GLint x0, y0;
+    /* upper right (outside the rectangle) */
+    GLint x1, y1;
+} __GLregionRect;
+
+struct __GLdrawableRegionRec {
+    GLint numRects;
+    __GLregionRect *rects;
+    __GLregionRect boundingRect;
+};
+
+/************************************************************************/
+
+/* masks for the buffers */
+#define __GL_FRONT_BUFFER_MASK		0x00000001
+#define	__GL_FRONT_LEFT_BUFFER_MASK	0x00000001
+#define	__GL_FRONT_RIGHT_BUFFER_MASK	0x00000002
+#define	__GL_BACK_BUFFER_MASK		0x00000004
+#define __GL_BACK_LEFT_BUFFER_MASK	0x00000004
+#define __GL_BACK_RIGHT_BUFFER_MASK	0x00000008
+#define	__GL_ACCUM_BUFFER_MASK		0x00000010
+#define	__GL_DEPTH_BUFFER_MASK		0x00000020
+#define	__GL_STENCIL_BUFFER_MASK	0x00000040
+#define	__GL_AUX_BUFFER_MASK(i)		(0x0000080 << (i))
+
+#define __GL_ALL_BUFFER_MASK		0xffffffff
+
+/* what Resize routines return if resize resorted to fallback case */
+#define __GL_BUFFER_FALLBACK	0x10
+
+typedef void (*__GLbufFallbackInitFn)(__GLdrawableBuffer *buf, 
+				      __GLdrawablePrivate *glPriv, GLint bits);
+typedef void (*__GLbufMainInitFn)(__GLdrawableBuffer *buf, 
+				  __GLdrawablePrivate *glPriv, GLint bits,
+				  __GLbufFallbackInitFn back);
+
+/*
+** A drawable buffer
+**
+** This data structure describes the context side of a drawable.  
+**
+** According to the spec there could be multiple contexts bound to the same
+** drawable at the same time (from different threads).  In order to avoid
+** multiple-access conflicts, locks are used to serialize access.  When a
+** thread needs to access (read or write) a member of the drawable, it takes
+** a lock first.  Some of the entries in the drawable are treated "mostly
+** constant", so we take the freedom of allowing access to them without
+** taking a lock (for optimization reasons).
+**
+** For more details regarding locking, see buffers.h in the GL core
+*/
+struct __GLdrawableBufferRec {
+    /*
+    ** Buffer dimensions
+    */
+    GLint width, height, depth;
+
+    /*
+    ** Framebuffer base address
+    */
+    void *base;
+
+    /*
+    ** Framebuffer size (in bytes)
+    */
+    GLuint size;
+
+    /*
+    ** Size (in bytes) of each element in the framebuffer
+    */
+    GLuint elementSize;
+    GLuint elementSizeLog2;
+
+    /*
+    ** Element skip from one scanline to the next.
+    ** If the buffer is part of another buffer (for example, fullscreen
+    ** front buffer), outerWidth is the width of that buffer.
+    */
+    GLint outerWidth;
+
+    /*
+    ** outerWidth * elementSize
+    */
+    GLint byteWidth;
+
+    /*
+    ** Allocation/deallocation is done based on this handle.  A handle
+    ** is conceptually different from the framebuffer 'base'.
+    */
+    void *handle;
+
+    /* imported */
+    GLboolean (*resize)(__GLdrawableBuffer *buf,
+			GLint x, GLint y, GLuint width, GLuint height, 
+			__GLdrawablePrivate *glPriv, GLuint bufferMask);
+    void (*lock)(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv);
+    void (*unlock)(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv);
+    void (*fill)(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv,
+    		GLuint val, GLint x, GLint y, GLint w, GLint h);
+    void (*free)(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv);
+
+    /* exported */
+    void (*freePrivate)(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv);
+#ifdef __cplusplus
+    void *privatePtr;
+#else
+    void *private;
+#endif
+
+    /* private */
+    void *other;	/* implementation private data */
+    __GLbufMainInitFn mainInit;
+    __GLbufFallbackInitFn fallbackInit;
+};
+
+/*
+** The context side of the drawable private
+*/
+struct __GLdrawablePrivateRec {
+    /*
+    ** Drawable Modes
+    */
+    __GLcontextModes *modes;
+
+    /*
+    ** Drawable size
+    */
+    GLuint width, height;
+
+    /*
+    ** Origin in screen coordinates of the drawable
+    */
+    GLint xOrigin, yOrigin;
+#ifdef __GL_ALIGNED_BUFFERS
+    /*
+    ** Drawable offset from screen origin
+    */
+    GLint xOffset, yOffset;
+
+    /*
+    ** Alignment restriction
+    */
+    GLint xAlignment, yAlignment;
+#endif
+    /*
+    ** Should we invert the y axis?
+    */
+    GLint yInverted;
+
+    /*
+    ** Mask specifying which buffers are renderable by the hw
+    */
+    GLuint accelBufferMask;
+
+    /*
+    ** the buffers themselves
+    */
+    __GLdrawableBuffer frontBuffer;
+    __GLdrawableBuffer backBuffer;
+    __GLdrawableBuffer accumBuffer;
+    __GLdrawableBuffer depthBuffer;
+    __GLdrawableBuffer stencilBuffer;
+#if defined(__GL_NUMBER_OF_AUX_BUFFERS) && (__GL_NUMBER_OF_AUX_BUFFERS > 0)
+    __GLdrawableBuffer *auxBuffer;
+#endif
+
+    __GLdrawableRegion ownershipRegion;
+
+    /*
+    ** Lock for the drawable private structure
+    */
+    void *lock;
+#ifdef DEBUG
+    /* lock debugging info */
+    int lockRefCount;
+    int lockLine[10];
+    char *lockFile[10];
+#endif
+
+    /* imported */
+    void *(*malloc)(size_t size);
+    void *(*calloc)(size_t numElem, size_t elemSize);
+    void *(*realloc)(void *oldAddr, size_t newSize);
+    void (*free)(void *addr);
+
+    GLboolean (*addSwapRect)(__GLdrawablePrivate *glPriv, 
+			     GLint x, GLint y, GLsizei width, GLsizei height);
+    void (*setClipRect)(__GLdrawablePrivate *glPriv, 
+			GLint x, GLint y, GLsizei width, GLsizei height);
+    void (*updateClipRegion)(__GLdrawablePrivate *glPriv);
+    GLboolean (*resize)(__GLdrawablePrivate *glPriv);
+    void (*getDrawableSize)(__GLdrawablePrivate *glPriv, 
+			    GLint *x, GLint *y, GLuint *width, GLuint *height);
+
+    void (*lockDP)(__GLdrawablePrivate *glPriv, __GLcontext *gc);
+    void (*unlockDP)(__GLdrawablePrivate *glPriv);
+
+    /* exported */
+#ifdef __cplusplus
+    void *privatePtr;
+#else
+    void *private;
+#endif
+    void (*freePrivate)(__GLdrawablePrivate *);
+
+    /* client data */
+    void *other;
+};
+
+/*
+** Macros to lock/unlock the drawable private
+*/
+#if defined(DEBUG)
+#define __GL_LOCK_DP(glPriv,gc) \
+    (*(glPriv)->lockDP)(glPriv,gc); \
+    (glPriv)->lockLine[(glPriv)->lockRefCount] = __LINE__; \
+    (glPriv)->lockFile[(glPriv)->lockRefCount] = __FILE__; \
+    (glPriv)->lockRefCount++
+#define __GL_UNLOCK_DP(glPriv) \
+    (glPriv)->lockRefCount--; \
+    (glPriv)->lockLine[(glPriv)->lockRefCount] = 0; \
+    (glPriv)->lockFile[(glPriv)->lockRefCount] = NULL; \
+    (*(glPriv)->unlockDP)(glPriv)
+#else /* DEBUG */
+#define __GL_LOCK_DP(glPriv,gc)		(*(glPriv)->lockDP)(glPriv,gc)
+#define	__GL_UNLOCK_DP(glPriv)		(*(glPriv)->unlockDP)(glPriv)
+#endif /* DEBUG */
+
+
+/*
+** Procedures which are imported by the GL from the surrounding
+** "operating system".  Math functions are not considered part of the
+** "operating system".
+*/
+typedef struct __GLimportsRec {
+    /* Memory management */
+    void * (*malloc)(__GLcontext *gc, size_t size);
+    void *(*calloc)(__GLcontext *gc, size_t numElem, size_t elemSize);
+    void *(*realloc)(__GLcontext *gc, void *oldAddr, size_t newSize);
+    void (*free)(__GLcontext *gc, void *addr);
+
+    /* Error handling */
+    void (*warning)(__GLcontext *gc, char *fmt);
+    void (*fatal)(__GLcontext *gc, char *fmt);
+
+    /* other system calls */
+    char *(CAPI *getenv)(__GLcontext *gc, const char *var);
+    int (CAPI *atoi)(__GLcontext *gc, const char *str);
+    int (CAPI *sprintf)(__GLcontext *gc, char *str, const char *fmt, ...);
+    void *(CAPI *fopen)(__GLcontext *gc, const char *path, const char *mode);
+    int (CAPI *fclose)(__GLcontext *gc, void *stream);
+    int (CAPI *fprintf)(__GLcontext *gc, void *stream, const char *fmt, ...);
+
+    /* Drawing surface management */
+    __GLdrawablePrivate *(*getDrawablePrivate)(__GLcontext *gc);
+    __GLdrawablePrivate *(*getReadablePrivate)(__GLcontext *gc);
+
+    /* Operating system dependent data goes here */
+    void *other;
+} __GLimports;
+
+/************************************************************************/
+
+/*
+** Procedures which are exported by the GL to the surrounding "operating
+** system" so that it can manage multiple GL context's.
+*/
+typedef struct __GLexportsRec {
+    /* Context management (return GL_FALSE on failure) */
+    GLboolean (*destroyContext)(__GLcontext *gc);
+    GLboolean (*loseCurrent)(__GLcontext *gc);
+    /* oldglPriv isn't used anymore, kept for backwards compatibility */
+    GLboolean (*makeCurrent)(__GLcontext *gc);
+    GLboolean (*shareContext)(__GLcontext *gc, __GLcontext *gcShare);
+    GLboolean (*copyContext)(__GLcontext *dst, const __GLcontext *src, GLuint mask);
+    GLboolean (*forceCurrent)(__GLcontext *gc);
+
+    /* Drawing surface notification callbacks */
+    GLboolean (*notifyResize)(__GLcontext *gc);
+    void (*notifyDestroy)(__GLcontext *gc);
+    void (*notifySwapBuffers)(__GLcontext *gc);
+
+    /* Dispatch table override control for external agents like libGLS */
+    struct __GLdispatchStateRec* (*dispatchExec)(__GLcontext *gc);
+    void (*beginDispatchOverride)(__GLcontext *gc);
+    void (*endDispatchOverride)(__GLcontext *gc);
+} __GLexports;
+
+/************************************************************************/
+
+/*
+** This must be the first member of a __GLcontext structure.  This is the
+** only part of a context that is exposed to the outside world; everything
+** else is opaque.
+*/
+struct __GLinterfaceRec {
+    __GLimports imports;
+    __GLexports exports;
+};
+
+extern __GLcontext *__glCoreCreateContext(__GLimports *, __GLcontextModes *);
+extern void __glCoreNopDispatch(void);
+
+#endif /* __gl_core_h_ */
diff --git a/reactos/lib/mesa32/include/GL/mesa_wgl.h b/reactos/lib/mesa32/include/GL/mesa_wgl.h
new file mode 100644
index 00000000000..a331bb3514b
--- /dev/null
+++ b/reactos/lib/mesa32/include/GL/mesa_wgl.h
@@ -0,0 +1,123 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.1
+ *
+ * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/* prototypes for the Mesa WGL functions */
+/* relocated here so that I could make GLUT get them properly */
+
+#define _mesa_wgl_h_
+
+#ifndef _mesa_wgl_h_
+#define _mesa_wgl_h_
+
+
+#include <gl/gl.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#if !defined(OPENSTEP) && (defined(__WIN32__) || defined(__CYGWIN32__))
+#  if defined(_MSC_VER) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
+#    define GLAPI __declspec(dllexport)
+#    define WGLAPI __declspec(dllexport)
+#  elif defined(_MSC_VER) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
+#    define GLAPI __declspec(dllimport)
+#    define WGLAPI __declspec(dllimport)
+#  else /* for use with static link lib build of Win32 edition only */
+#    define GLAPI extern
+#    define WGLAPI __declspec(dllimport)
+#  endif /* _STATIC_MESA support */
+#  define GLAPIENTRY __stdcall
+#else
+/* non-Windows compilation */
+#  define GLAPI extern
+#  define GLAPIENTRY
+#endif /* WIN32 / CYGWIN32 bracket */
+
+
+#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP)
+#ifndef _GNU_H_WINDOWS32_FUNCTIONS
+#	ifdef UNICODE
+#		define wglUseFontBitmaps  wglUseFontBitmapsW
+#		define wglUseFontOutlines  wglUseFontOutlinesW
+#	else
+#		define wglUseFontBitmaps  wglUseFontBitmapsA
+#		define wglUseFontOutlines  wglUseFontOutlinesA
+#	endif /* !UNICODE */
+#endif /* _GNU_H_WINDOWS32_FUNCTIONS */
+typedef struct tagLAYERPLANEDESCRIPTOR LAYERPLANEDESCRIPTOR, *PLAYERPLANEDESCRIPTOR, *LPLAYERPLANEDESCRIPTOR;
+typedef struct _GLYPHMETRICSFLOAT GLYPHMETRICSFLOAT, *PGLYPHMETRICSFLOAT, *LPGLYPHMETRICSFLOAT;
+typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESCRIPTOR, *LPPIXELFORMATDESCRIPTOR;
+#endif
+
+
+#ifdef _MSC_VER
+#  pragma warning( disable : 4615 ) /* pragma warning : unknown user warning type*/
+#  pragma warning( push )
+#  pragma warning( disable : 4273 ) /* 'function' : inconsistent DLL linkage. dllexport assumed. */
+#endif
+
+WGLAPI int   GLAPIENTRY wglDeleteContext(HGLRC);
+WGLAPI int   GLAPIENTRY wglMakeCurrent(HDC,HGLRC);
+WGLAPI int   GLAPIENTRY wglSetPixelFormat(HDC, int, const PIXELFORMATDESCRIPTOR *);
+WGLAPI int   GLAPIENTRY wglSwapBuffers(HDC hdc);
+WGLAPI HDC   GLAPIENTRY wglGetCurrentDC(void);
+WGLAPI HGLRC GLAPIENTRY wglCreateContext(HDC);
+WGLAPI HGLRC GLAPIENTRY wglCreateLayerContext(HDC,int);
+WGLAPI HGLRC GLAPIENTRY wglGetCurrentContext(void);
+WGLAPI PROC  GLAPIENTRY wglGetProcAddress(const char*);
+WGLAPI int   GLAPIENTRY wglChoosePixelFormat(HDC, const PIXELFORMATDESCRIPTOR *);
+WGLAPI int   GLAPIENTRY wglCopyContext(HGLRC, HGLRC, unsigned int);
+WGLAPI int   GLAPIENTRY wglDeleteContext(HGLRC);
+WGLAPI int   GLAPIENTRY wglDescribeLayerPlane(HDC, int, int, unsigned int,LPLAYERPLANEDESCRIPTOR);
+WGLAPI int   GLAPIENTRY wglDescribePixelFormat(HDC,int, unsigned int, LPPIXELFORMATDESCRIPTOR);
+WGLAPI int   GLAPIENTRY wglGetLayerPaletteEntries(HDC, int, int, int,COLORREF *);
+WGLAPI int   GLAPIENTRY wglGetPixelFormat(HDC hdc);
+WGLAPI int   GLAPIENTRY wglMakeCurrent(HDC, HGLRC);
+WGLAPI int   GLAPIENTRY wglRealizeLayerPalette(HDC, int, int);
+WGLAPI int   GLAPIENTRY wglSetLayerPaletteEntries(HDC, int, int, int,const COLORREF *);
+WGLAPI int   GLAPIENTRY wglShareLists(HGLRC, HGLRC);
+WGLAPI int   GLAPIENTRY wglSwapLayerBuffers(HDC, unsigned int);
+WGLAPI int   GLAPIENTRY wglUseFontBitmapsA(HDC, unsigned long, unsigned long, unsigned long);
+WGLAPI int   GLAPIENTRY wglUseFontBitmapsW(HDC, unsigned long, unsigned long, unsigned long);
+WGLAPI int   GLAPIENTRY wglUseFontOutlinesA(HDC, unsigned long, unsigned long, unsigned long, float,float, int, LPGLYPHMETRICSFLOAT);
+WGLAPI int   GLAPIENTRY wglUseFontOutlinesW(HDC, unsigned long, unsigned long, unsigned long, float,float, int, LPGLYPHMETRICSFLOAT);
+WGLAPI int   GLAPIENTRY SwapBuffers(HDC);
+WGLAPI int   GLAPIENTRY ChoosePixelFormat(HDC,const PIXELFORMATDESCRIPTOR *);
+WGLAPI int   GLAPIENTRY DescribePixelFormat(HDC,int,unsigned int,LPPIXELFORMATDESCRIPTOR);
+WGLAPI int   GLAPIENTRY GetPixelFormat(HDC);
+WGLAPI int   GLAPIENTRY SetPixelFormat(HDC,int,const PIXELFORMATDESCRIPTOR *);
+
+#ifdef _MSC_VER
+#  pragma warning( pop )
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* _mesa_wgl_h_ */
diff --git a/reactos/lib/mesa32/include/GL/mglmesa.h b/reactos/lib/mesa32/include/GL/mglmesa.h
new file mode 100644
index 00000000000..0f9f7895714
--- /dev/null
+++ b/reactos/lib/mesa32/include/GL/mglmesa.h
@@ -0,0 +1,79 @@
+/****************************************************************************
+*
+*                      Mesa bindings for SciTech MGL
+*
+*                   Copyright (C) 1996 SciTech Software.
+*                           All rights reserved.
+*
+* Filename:     mglmesa.h
+* Version:      Revision: 1.1.1.1
+*
+* Language:     ANSI C
+* Environment:  Any
+*
+* Description:  Header file for the Mesa/OpenGL interface bindings for the
+*               SciTech MGL graphics library. Uses the MGL internal
+*               device context structures to get direct access to the
+*               high performance MGL rasterization functions for maximum
+*               performance. Utilizes the VESA VBE/AF Accelerator Functions
+*               via the MGL's accelerated device driver functions, as well
+*               as basic DirectDraw accelerated functions provided by the
+*               MGL.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Library General Public
+* License as published by the Free Software Foundation; either
+* version 2 of the License, or (at your option) any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Library General Public License for more details.
+*
+* You should have received a copy of the GNU Library General Public
+* License along with this library; if not, write to the Free
+* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*
+*
+****************************************************************************/
+
+#ifndef __MGLMESA_H
+#define __MGLMESA_H
+
+#include "mgraph.h"
+
+/*------------------------- Function Prototypes ---------------------------*/
+
+#ifdef  __cplusplus
+extern "C" {            /* Use "C" linkage when in C++ mode */
+#endif
+
+#ifndef __WINDOWS__
+#define GLAPIENTRY
+#endif
+
+#ifdef  __WINDOWS__
+bool    GLAPIENTRY MGLMesaInitDLL(MGLCallbacks *cb,char *version);
+#endif
+void    GLAPIENTRY MGLMesaChooseVisual(MGLDC *dc,MGLVisual *visual);
+bool    GLAPIENTRY MGLMesaSetVisual(MGLDC *dc,MGLVisual *visual);
+bool    GLAPIENTRY MGLMesaCreateContext(MGLDC *dc,bool forceMemDC);
+void    GLAPIENTRY MGLMesaDestroyContext(MGLDC *dc);
+void    GLAPIENTRY MGLMesaMakeCurrent(MGLDC *dc);
+void    GLAPIENTRY MGLMesaSwapBuffers(MGLDC *dc,bool waitVRT);
+
+/* Palette manipulation support. The reason we provide palette manipulation
+ * routines is so that when rendering in double buffered modes with a
+ * software backbuffer, the palette for the backbuffer is kept consistent
+ * with the hardware front buffer.
+ */
+
+void    GLAPIENTRY MGLMesaSetPaletteEntry(MGLDC *dc,int entry,uchar red,uchar green,uchar blue);
+void    GLAPIENTRY MGLMesaSetPalette(MGLDC *dc,palette_t *pal,int numColors,int startIndex);
+void    GLAPIENTRY MGLMesaRealizePalette(MGLDC *dc,int numColors,int startIndex,int waitVRT);
+
+#ifdef  __cplusplus
+}                       /* End of "C" linkage for C++   */
+#endif  /* __cplusplus */
+
+#endif  /* __MGLMESA_H */
diff --git a/reactos/lib/mesa32/include/GL/osmesa.h b/reactos/lib/mesa32/include/GL/osmesa.h
new file mode 100644
index 00000000000..cf892b91c93
--- /dev/null
+++ b/reactos/lib/mesa32/include/GL/osmesa.h
@@ -0,0 +1,274 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ * 
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * Mesa Off-Screen rendering interface.
+ *
+ * This is an operating system and window system independent interface to
+ * Mesa which allows one to render images into a client-supplied buffer in
+ * main memory.  Such images may manipulated or saved in whatever way the
+ * client wants.
+ *
+ * These are the API functions:
+ *   OSMesaCreateContext - create a new Off-Screen Mesa rendering context
+ *   OSMesaMakeCurrent - bind an OSMesaContext to a client's image buffer
+ *                       and make the specified context the current one.
+ *   OSMesaDestroyContext - destroy an OSMesaContext
+ *   OSMesaGetCurrentContext - return thread's current context ID
+ *   OSMesaPixelStore - controls how pixels are stored in image buffer
+ *   OSMesaGetIntegerv - return OSMesa state parameters
+ *
+ *
+ * The limits on the width and height of an image buffer are MAX_WIDTH and
+ * MAX_HEIGHT as defined in Mesa/src/config.h.  Defaults are 1280 and 1024.
+ * You can increase them as needed but beware that many temporary arrays in
+ * Mesa are dimensioned by MAX_WIDTH or MAX_HEIGHT.
+ */
+
+
+#ifndef OSMESA_H
+#define OSMESA_H
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#include <GL/gl.h>
+
+
+#define OSMESA_MAJOR_VERSION 4
+#define OSMESA_MINOR_VERSION 1
+#define OSMESA_PATCH_VERSION 0
+
+
+
+/*
+ * Values for the format parameter of OSMesaCreateContext()
+ * New in version 2.0.
+ */
+#define OSMESA_COLOR_INDEX	GL_COLOR_INDEX
+#define OSMESA_RGBA		GL_RGBA
+#define OSMESA_BGRA		0x1
+#define OSMESA_ARGB		0x2
+#define OSMESA_RGB		GL_RGB
+#define OSMESA_BGR		0x4
+#define OSMESA_RGB_565		0x5
+
+
+/*
+ * OSMesaPixelStore() parameters:
+ * New in version 2.0.
+ */
+#define OSMESA_ROW_LENGTH	0x10
+#define OSMESA_Y_UP		0x11
+
+
+/*
+ * Accepted by OSMesaGetIntegerv:
+ */
+#define OSMESA_WIDTH		0x20
+#define OSMESA_HEIGHT		0x21
+#define OSMESA_FORMAT		0x22
+#define OSMESA_TYPE		0x23
+#define OSMESA_MAX_WIDTH	0x24  /* new in 4.0 */
+#define OSMESA_MAX_HEIGHT	0x25  /* new in 4.0 */
+
+
+typedef struct osmesa_context *OSMesaContext;
+
+
+#if defined(__BEOS__) || defined(__QUICKDRAW__)
+#pragma export on
+#endif
+
+
+/*
+ * Create an Off-Screen Mesa rendering context.  The only attribute needed is
+ * an RGBA vs Color-Index mode flag.
+ *
+ * Input:  format - one of OSMESA_COLOR_INDEX, OSMESA_RGBA, OSMESA_BGRA,
+ *                  OSMESA_ARGB, OSMESA_RGB, or OSMESA_BGR.
+ *         sharelist - specifies another OSMesaContext with which to share
+ *                     display lists.  NULL indicates no sharing.
+ * Return:  an OSMesaContext or 0 if error
+ */
+GLAPI OSMesaContext GLAPIENTRY
+OSMesaCreateContext( GLenum format, OSMesaContext sharelist );
+
+
+
+/*
+ * Create an Off-Screen Mesa rendering context and specify desired
+ * size of depth buffer, stencil buffer and accumulation buffer.
+ * If you specify zero for depthBits, stencilBits, accumBits you
+ * can save some memory.
+ *
+ * New in Mesa 3.5
+ */
+GLAPI OSMesaContext GLAPIENTRY
+OSMesaCreateContextExt( GLenum format, GLint depthBits, GLint stencilBits,
+                        GLint accumBits, OSMesaContext sharelist);
+
+
+/*
+ * Destroy an Off-Screen Mesa rendering context.
+ *
+ * Input:  ctx - the context to destroy
+ */
+GLAPI void GLAPIENTRY
+OSMesaDestroyContext( OSMesaContext ctx );
+
+
+
+/*
+ * Bind an OSMesaContext to an image buffer.  The image buffer is just a
+ * block of memory which the client provides.  Its size must be at least
+ * as large as width*height*sizeof(type).  Its address should be a multiple
+ * of 4 if using RGBA mode.
+ *
+ * Image data is stored in the order of glDrawPixels:  row-major order
+ * with the lower-left image pixel stored in the first array position
+ * (ie. bottom-to-top).
+ *
+ * Since the only type initially supported is GL_UNSIGNED_BYTE, if the
+ * context is in RGBA mode, each pixel will be stored as a 4-byte RGBA
+ * value.  If the context is in color indexed mode, each pixel will be
+ * stored as a 1-byte value.
+ *
+ * If the context's viewport hasn't been initialized yet, it will now be
+ * initialized to (0,0,width,height).
+ *
+ * Input:  ctx - the rendering context
+ *         buffer - the image buffer memory
+ *         type - data type for pixel components, only GL_UNSIGNED_BYTE
+ *                supported now
+ *         width, height - size of image buffer in pixels, at least 1
+ * Return:  GL_TRUE if success, GL_FALSE if error because of invalid ctx,
+ *          invalid buffer address, type!=GL_UNSIGNED_BYTE, width<1, height<1,
+ *          width>internal limit or height>internal limit.
+ */
+GLAPI GLboolean GLAPIENTRY
+OSMesaMakeCurrent( OSMesaContext ctx, void *buffer, GLenum type,
+                   GLsizei width, GLsizei height );
+
+
+
+
+/*
+ * Return the current Off-Screen Mesa rendering context handle.
+ */
+GLAPI OSMesaContext GLAPIENTRY
+OSMesaGetCurrentContext( void );
+
+
+
+/*
+ * Set pixel store/packing parameters for the current context.
+ * This is similar to glPixelStore.
+ * Input:  pname - OSMESA_ROW_LENGTH
+ *                    specify actual pixels per row in image buffer
+ *                    0 = same as image width (default)
+ *                 OSMESA_Y_UP
+ *                    zero = Y coordinates increase downward
+ *                    non-zero = Y coordinates increase upward (default)
+ *         value - the value for the parameter pname
+ *
+ * New in version 2.0.
+ */
+GLAPI void GLAPIENTRY
+OSMesaPixelStore( GLint pname, GLint value );
+
+
+
+/*
+ * Return an integer value like glGetIntegerv.
+ * Input:  pname -
+ *                 OSMESA_WIDTH  return current image width
+ *                 OSMESA_HEIGHT  return current image height
+ *                 OSMESA_FORMAT  return image format
+ *                 OSMESA_TYPE  return color component data type
+ *                 OSMESA_ROW_LENGTH return row length in pixels
+ *                 OSMESA_Y_UP returns 1 or 0 to indicate Y axis direction
+ *         value - pointer to integer in which to return result.
+ */
+GLAPI void GLAPIENTRY
+OSMesaGetIntegerv( GLint pname, GLint *value );
+
+
+
+/*
+ * Return the depth buffer associated with an OSMesa context.
+ * Input:  c - the OSMesa context
+ * Output:  width, height - size of buffer in pixels
+ *          bytesPerValue - bytes per depth value (2 or 4)
+ *          buffer - pointer to depth buffer values
+ * Return:  GL_TRUE or GL_FALSE to indicate success or failure.
+ *
+ * New in Mesa 2.4.
+ */
+GLAPI GLboolean GLAPIENTRY
+OSMesaGetDepthBuffer( OSMesaContext c, GLint *width, GLint *height,
+                      GLint *bytesPerValue, void **buffer );
+
+
+
+/*
+ * Return the color buffer associated with an OSMesa context.
+ * Input:  c - the OSMesa context
+ * Output:  width, height - size of buffer in pixels
+ *          format - buffer format (OSMESA_FORMAT)
+ *          buffer - pointer to depth buffer values
+ * Return:  GL_TRUE or GL_FALSE to indicate success or failure.
+ *
+ * New in Mesa 3.3.
+ */
+GLAPI GLboolean GLAPIENTRY
+OSMesaGetColorBuffer( OSMesaContext c, GLint *width, GLint *height,
+                      GLint *format, void **buffer );
+
+
+
+/*
+ * Return pointer to the named function.
+ *
+ * New in Mesa 4.1
+ */
+GLAPI void * GLAPIENTRY
+OSMesaGetProcAddress( const char *funcName );
+
+
+#if defined(__BEOS__) || defined(__QUICKDRAW__)
+#pragma export off
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif
diff --git a/reactos/lib/mesa32/include/GL/svgamesa.h b/reactos/lib/mesa32/include/GL/svgamesa.h
new file mode 100644
index 00000000000..67c0e4c5c65
--- /dev/null
+++ b/reactos/lib/mesa32/include/GL/svgamesa.h
@@ -0,0 +1,97 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.0
+ * Copyright (C) 1995-2001  Brian Paul
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
+/*
+ * SVGA/Mesa interface for Linux.
+ */
+
+
+/*
+ * Intro to using the VGA/Mesa interface
+ *
+ * 1. #include the <vga.h> file
+ * 2. Call vga_init() to initialize the SVGA library.
+ * 3. Call vga_setmode() to specify the screen size and color depth.
+ * 4. Call SVGAMesaCreateContext() to setup a Mesa context.  If using 8-bit
+ *    color Mesa assumes color index mode, if using 16-bit or deeper color
+ *    Mesa assumes RGB mode.
+ * 5. Call SVGAMesaMakeCurrent() to activate the Mesa context.
+ * 6. You can now use the Mesa API functions.
+ * 7. Before exiting, call SVGAMesaDestroyContext() then vga_setmode(TEXT)
+ *    to restore the original text screen.
+ *
+ * Notes
+ * 1. You must run your executable as root (or use the set UID-bit) because
+ *    the SVGA library requires it.
+ * 2. The SVGA driver is not fully implemented yet.  See svgamesa.c for what
+ *    has to be done yet.
+ */
+
+
+#ifndef SVGAMESA_H
+#define SVGAMESA_H
+
+
+#define SVGAMESA_MAJOR_VERSION 4
+#define SVGAMESA_MINOR_VERSION 0
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#include "GL/gl.h"
+
+
+
+/*
+ * This is the SVGAMesa context 'handle':
+ */
+typedef struct svgamesa_context *SVGAMesaContext;
+
+
+
+/*
+ * doubleBuffer flag new in version 2.4
+ */
+extern int SVGAMesaInit( int GraphMode );
+
+extern int SVGAMesaClose( void );
+
+extern SVGAMesaContext SVGAMesaCreateContext( GLboolean doubleBuffer );
+
+extern void SVGAMesaDestroyContext( SVGAMesaContext ctx );
+
+extern void SVGAMesaMakeCurrent( SVGAMesaContext ctx );
+
+extern void SVGAMesaSwapBuffers( void );
+
+extern void SVGAMesaSetCI(int ndx, GLubyte red, GLubyte green, GLubyte blue);
+
+extern SVGAMesaContext SVGAMesaGetCurrentContext( void );
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif
diff --git a/reactos/lib/mesa32/include/GL/uglglutshapes.h b/reactos/lib/mesa32/include/GL/uglglutshapes.h
new file mode 100644
index 00000000000..28192de2d52
--- /dev/null
+++ b/reactos/lib/mesa32/include/GL/uglglutshapes.h
@@ -0,0 +1,45 @@
+/* uglglutshapes.h - Public header GLUT Shapes */
+
+/* Copyright (c) Mark J. Kilgard, 1994, 1995, 1996, 1998. */
+
+/* This program is freely distributable without licensing fees  and is
+   provided without guarantee or warrantee expressed or  implied. This
+   program is -not- in the public domain. */
+
+#ifndef GLUTSHAPES_H
+#define GLUTSHAPES_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <GL/gl.h>  
+
+void glutWireSphere (GLdouble radius, GLint slices, GLint stacks);
+void glutSolidSphere (GLdouble radius, GLint slices, GLint stacks);
+void glutWireCone (GLdouble base, GLdouble height,
+		   GLint slices, GLint stacks);
+void glutSolidCone (GLdouble base, GLdouble height,
+		    GLint slices, GLint stacks);
+void glutWireCube (GLdouble size);
+void glutSolidCube (GLdouble size);
+void glutWireTorus (GLdouble innerRadius, GLdouble outerRadius,
+		    GLint sides, GLint rings);
+void glutSolidTorus (GLdouble innerRadius, GLdouble outerRadius,
+		     GLint sides, GLint rings);
+void glutWireDodecahedron (void);
+void glutSolidDodecahedron (void);
+void glutWireOctahedron (void);
+void glutSolidOctahedron (void);
+void glutWireTetrahedron (void);
+void glutSolidTetrahedron (void);
+void glutWireIcosahedron (void);
+void glutSolidIcosahedron (void);
+void glutWireTeapot (GLdouble size);
+void glutSolidTeapot (GLdouble size);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/reactos/lib/mesa32/include/GL/uglmesa.h b/reactos/lib/mesa32/include/GL/uglmesa.h
new file mode 100644
index 00000000000..7ef5843504e
--- /dev/null
+++ b/reactos/lib/mesa32/include/GL/uglmesa.h
@@ -0,0 +1,155 @@
+/* uglmesa.h - Public header UGL/Mesa */
+
+/* Copyright (C) 2001 by Wind River Systems, Inc */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.0
+ *
+ * The MIT License
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * Author:
+ * Stephane Raimbault <stephane.raimbault@windriver.com> 
+ */
+
+#ifndef UGLMESA_H
+#define UGLMESA_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define UGL_MESA_MAJOR_VERSION 4
+#define UGL_MESA_MINOR_VERSION 0
+
+#include <GL/gl.h>
+#include <ugl/ugl.h>
+
+/*
+ * Values for display mode of uglMesaCreateContext ()
+ */
+
+/*
+ * With these mask values, it's possible to test double buffer mode
+ * with UGL_MESA_DOUBLE mask
+ *
+ * SINGLE  0000 0001
+ * DOUBLE  0000 0110
+ * -  SOFT 0000 0010
+ * -  HARD 0000 0100
+ * WINDML  0001 0000
+ *
+ * 
+ */
+#define UGL_MESA_SINGLE            0x01
+#define UGL_MESA_DOUBLE            0x06
+#define UGL_MESA_DOUBLE_SOFTWARE   0x02
+#define UGL_MESA_DOUBLE_HARDWARE   0x04
+    
+#define UGL_MESA_WINDML_EXCLUSIVE  0x10
+
+#define UGL_MESA_FULLSCREEN_WIDTH  0x0
+#define UGL_MESA_FULLSCREEN_HEIGHT 0x0
+
+/*
+ * uglMesaPixelStore() parameters:
+ */
+    
+#define UGL_MESA_ROW_LENGTH	   0x20
+#define UGL_MESA_Y_UP              0x21
+
+/* 
+ * Accepted by uglMesaGetIntegerv:
+ */
+
+#define UGL_MESA_LEFT_X		        0x01
+#define UGL_MESA_TOP_Y		        0x02    
+#define UGL_MESA_WIDTH		        0x03
+#define UGL_MESA_HEIGHT		        0x04
+#define UGL_MESA_DISPLAY_WIDTH          0x05
+#define UGL_MESA_DISPLAY_HEIGHT         0x06
+#define UGL_MESA_COLOR_FORMAT	        0x07
+#define UGL_MESA_COLOR_MODEL            0x08
+#define UGL_MESA_PIXEL_FORMAT           0x09
+#define UGL_MESA_TYPE		        0x0A
+#define UGL_MESA_RGB		        0x0B
+#define UGL_MESA_COLOR_INDEXED          0x0C
+#define UGL_MESA_SINGLE_BUFFER          0x0D
+#define UGL_MESA_DOUBLE_BUFFER          0x0E
+#define UGL_MESA_DOUBLE_BUFFER_SOFTWARE 0x0F
+#define UGL_MESA_DOUBLE_BUFFER_HARDWARE 0x10
+    
+/*
+ * typedefs
+ */
+
+typedef struct uglMesaContext * UGL_MESA_CONTEXT;
+    
+UGL_MESA_CONTEXT uglMesaCreateNewContext (GLenum mode,
+					  UGL_MESA_CONTEXT share_list);
+
+UGL_MESA_CONTEXT  uglMesaCreateNewContextExt (GLenum mode,
+					      GLint depth_bits,
+					      GLint stencil_bits,
+					      GLint accum_red_bits,
+					      GLint accum_green_bits,
+					      GLint accum_blue_bits,
+					      GLint accum_alpha_bits,
+					      UGL_MESA_CONTEXT share_list);
+
+GLboolean uglMesaMakeCurrentContext (UGL_MESA_CONTEXT umc,
+				     GLsizei left, GLsizei top,
+				     GLsizei width, GLsizei height);
+
+GLboolean uglMesaMoveWindow (GLsizei dx, GLsizei dy);
+
+GLboolean uglMesaMoveToWindow (GLsizei left, GLsizei top);
+
+GLboolean uglMesaResizeWindow (GLsizei dw, GLsizei dh);
+
+GLboolean uglMesaResizeToWindow (GLsizei width, GLsizei height);
+
+void uglMesaDestroyContext (void);
+
+UGL_MESA_CONTEXT uglMesaGetCurrentContext (void);
+
+void uglMesaSwapBuffers (void);
+
+void uglMesaPixelStore (GLint pname, GLint value);
+
+void uglMesaGetIntegerv (GLint pname, GLint *value);
+
+GLboolean uglMesaGetDepthBuffer (GLint *width, GLint *height,
+				 GLint *bytesPerValue, void **buffer);
+
+GLboolean uglMesaGetColorBuffer (GLint *width, GLint *height,
+				 GLint *format, void **buffer);
+
+GLboolean uglMesaSetColor (GLubyte index, GLfloat red,
+			   GLfloat green, GLfloat blue);
+  
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif
diff --git a/reactos/lib/mesa32/include/GL/vms_x_fix.h b/reactos/lib/mesa32/include/GL/vms_x_fix.h
new file mode 100644
index 00000000000..db754f65563
--- /dev/null
+++ b/reactos/lib/mesa32/include/GL/vms_x_fix.h
@@ -0,0 +1,880 @@
+/***************************************************************************
+ *                                                                         *
+ * Repair definitions of Xlib when compileing with /name=(as_is) on VMS    *
+ *                                                                         *
+ * Author : Jouk Jansen (joukj@hrem.stm.tudelft.nl)                        *
+ *                                                                         *
+ * Last revision : 22 August 2000                                          *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef VMS_X_FIX
+#define VMS_X_FIX
+
+#define _XRegisterFilterByType _XREGISTERFILTERBYTYPE 
+#define XAllocClassHint XALLOCCLASSHINT
+#define XAllocColor XALLOCCOLOR
+#define XAllocColorCells XALLOCCOLORCELLS
+#define XAllocSizeHints XALLOCSIZEHINTS
+#define XAllocWMHints XALLOCWMHINTS
+#define XAutoRepeatOff XAUTOREPEATOFF
+#define XAutoRepeatOn XAUTOREPEATON
+#define XBaseFontNameListOfFontSet XBASEFONTNAMELISTOFFONTSET
+#define XBell XBELL
+#define XBitmapPad XBITMAPPAD
+#define XChangeActivePointerGrab XCHANGEACTIVEPOINTERGRAB
+#define XChangeGC XCHANGEGC
+#define XChangeProperty XCHANGEPROPERTY
+#define XChangeWindowAttributes XCHANGEWINDOWATTRIBUTES
+#define XCheckIfEvent XCHECKIFEVENT
+#define XCheckMaskEvent XCHECKMASKEVENT
+#define XCheckTypedWindowEvent XCHECKTYPEDWINDOWEVENT
+#define XCheckWindowEvent XCHECKWINDOWEVENT
+#define XClearArea XCLEARAREA
+#define XClearWindow XCLEARWINDOW
+#define XClipBox XCLIPBOX
+#define XCloseDisplay XCLOSEDISPLAY
+#define XCloseIM XCLOSEIM
+#define XConfigureWindow XCONFIGUREWINDOW
+#define XConvertSelection XCONVERTSELECTION
+#define XCopyArea XCOPYAREA
+#define XCopyGC XCOPYGC
+#define XCopyPlane XCOPYPLANE
+#define XCreateBitmapFromData XCREATEBITMAPFROMDATA
+#define XCreateColormap XCREATECOLORMAP
+#define XCreateFontCursor XCREATEFONTCURSOR
+#define XCreateFontSet XCREATEFONTSET
+#define XCreateGC XCREATEGC
+#define XCreateIC XCREATEIC
+#define XCreateImage XCREATEIMAGE
+#define XCreatePixmap XCREATEPIXMAP
+#define XCreatePixmapCursor XCREATEPIXMAPCURSOR
+#define XCreatePixmapFromBitmapData XCREATEPIXMAPFROMBITMAPDATA
+#define XCreateRegion XCREATEREGION
+#define XCreateSimpleWindow XCREATESIMPLEWINDOW
+#define XCreateWindow XCREATEWINDOW
+#define XDefaultScreenOfDisplay XDEFAULTSCREENOFDISPLAY
+#define XDefineCursor XDEFINECURSOR
+#define XDeleteProperty XDELETEPROPERTY
+#define XDestroyIC XDESTROYIC
+#define XDestroyRegion XDESTROYREGION
+#define XDestroyWindow XDESTROYWINDOW
+#define XDisplayName XDISPLAYNAME
+#define XDisplayOfScreen XDISPLAYOFSCREEN
+#define XDrawArc XDRAWARC
+#define XDrawImageString XDRAWIMAGESTRING
+#define XDrawImageString16 XDRAWIMAGESTRING16
+#define XDrawLine XDRAWLINE
+#define XDrawLines XDRAWLINES
+#define XDrawPoint XDRAWPOINT
+#define XDrawPoints XDRAWPOINTS
+#define XDrawRectangle XDRAWRECTANGLE
+#define XDrawSegments XDRAWSEGMENTS
+#define XDrawString XDRAWSTRING
+#define XDrawString16 XDRAWSTRING16
+#define XEmptyRegion XEMPTYREGION
+#define XEqualRegion XEQUALREGION
+#define XEventsQueued XEVENTSQUEUED
+#define XExtentsOfFontSet XEXTENTSOFFONTSET
+#define XFillArc XFILLARC
+#define XFillPolygon XFILLPOLYGON
+#define XFillRectangle XFILLRECTANGLE
+#define XFillRectangles XFILLRECTANGLES
+#define XFilterEvent XFILTEREVENT
+#define XFlush XFLUSH
+#define XFontsOfFontSet XFONTSOFFONTSET
+#define XFree XFREE
+#define XFreeColormap XFREECOLORMAP
+#define XFreeColors XFREECOLORS
+#define XFreeCursor XFREECURSOR
+#define XFreeFont XFREEFONT
+#define XFreeFontInfo XFREEFONTINFO
+#define XFreeFontNames XFREEFONTNAMES
+#define XFreeFontSet XFREEFONTSET
+#define XFreeGC XFREEGC
+#define XFreeModifiermap XFREEMODIFIERMAP
+#define XFreePixmap XFREEPIXMAP
+#define XFreeStringList XFREESTRINGLIST
+#define XGetAtomName XGETATOMNAME
+#define XGetDefault XGETDEFAULT
+#define XGetErrorDatabaseText XGETERRORDATABASETEXT
+#define XGetErrorText XGETERRORTEXT
+#define XGetFontProperty XGETFONTPROPERTY
+#define XGetGCValues XGETGCVALUES
+#define XGetGeometry XGETGEOMETRY
+#define XGetICValues XGETICVALUES
+#define XGetIMValues XGETIMVALUES
+#define XGetImage XGETIMAGE
+#define XGetKeyboardControl XGETKEYBOARDCONTROL
+#define XGetModifierMapping XGETMODIFIERMAPPING
+#define XGetMotionEvents XGETMOTIONEVENTS
+#define XGetNormalHints XGETNORMALHINTS
+#define XGetSelectionOwner XGETSELECTIONOWNER
+#define XGetSubImage XGETSUBIMAGE
+#define XGetVisualInfo XGETVISUALINFO
+#define XGetWMColormapWindows XGETWMCOLORMAPWINDOWS
+#define XGetWMHints XGETWMHINTS
+#define XGetWMName XGETWMNAME
+#define XGetWMNormalHints XGETWMNORMALHINTS
+#define XGetWindowAttributes XGETWINDOWATTRIBUTES
+#define XGetWindowProperty XGETWINDOWPROPERTY
+#define XGrabKeyboard XGRABKEYBOARD
+#define XGrabPointer XGRABPOINTER
+#define XGrabServer XGRABSERVER
+#define XHeightOfScreen XHEIGHTOFSCREEN
+#define XIfEvent XIFEVENT
+#define XInternAtom XINTERNATOM
+#define XIntersectRegion XINTERSECTREGION
+#define XKeycodeToKeysym XKEYCODETOKEYSYM
+#define XKeysymToKeycode XKEYSYMTOKEYCODE
+#define XKeysymToString XKEYSYMTOSTRING
+#define XListFonts XLISTFONTS
+#define XListFontsWithInfo XLISTFONTSWITHINFO
+#define XListPixmapFormats XLISTPIXMAPFORMATS
+#define XListProperties XLISTPROPERTIES
+#define XLoadQueryFont XLOADQUERYFONT
+#define XLookupString XLOOKUPSTRING
+#define XLowerWindow XLOWERWINDOW
+#define XMapRaised XMAPRAISED
+#define XMapWindow XMAPWINDOW
+#define XMatchVisualInfo XMATCHVISUALINFO
+#define XMoveResizeWindow XMOVERESIZEWINDOW
+#define XMoveWindow XMOVEWINDOW
+#define XNextEvent XNEXTEVENT
+#define XOffsetRegion XOFFSETREGION
+#define XOpenDisplay XOPENDISPLAY
+#define XOpenIM XOPENIM
+#define XParseColor XPARSECOLOR
+#define XParseGeometry XPARSEGEOMETRY
+#define XPeekEvent XPEEKEVENT
+#define XPending XPENDING
+#define XPointInRegion XPOINTINREGION
+#define XPolygonRegion XPOLYGONREGION
+#define XPutBackEvent XPUTBACKEVENT
+#define XPutImage XPUTIMAGE
+#define XQueryColor XQUERYCOLOR
+#define XQueryColors XQUERYCOLORS
+#define XQueryExtension XQUERYEXTENSION
+#define XQueryPointer XQUERYPOINTER
+#define XQueryTree XQUERYTREE
+#define XRaiseWindow XRAISEWINDOW
+#define XReconfigureWMWindow XRECONFIGUREWMWINDOW
+#define XRectInRegion XRECTINREGION
+#define XRefreshKeyboardMapping XREFRESHKEYBOARDMAPPING
+#define XReparentWindow XREPARENTWINDOW
+#define XResizeWindow XRESIZEWINDOW
+#define XRestackWindows XRESTACKWINDOWS
+#define XRootWindowOfScreen XROOTWINDOWOFSCREEN
+#define XScreenNumberOfScreen XSCREENNUMBEROFSCREEN
+#define XSelectAsyncEvent XSELECTASYNCEVENT
+#define XSelectAsyncInput XSELECTASYNCINPUT
+#define XSelectInput XSELECTINPUT
+#define XSendEvent XSENDEVENT
+#define XServerVendor XSERVERVENDOR
+#define XSetBackground XSETBACKGROUND
+#define XSetClassHint XSETCLASSHINT
+#define XSetClipMask XSETCLIPMASK
+#define XSetClipOrigin XSETCLIPORIGIN
+#define XSetClipRectangles XSETCLIPRECTANGLES
+#define XSetCloseDownMode XSETCLOSEDOWNMODE
+#define XSetCommand XSETCOMMAND
+#define XSetDashes XSETDASHES
+#define XSetErrorHandler XSETERRORHANDLER
+#define XSetFillStyle XSETFILLSTYLE
+#define XSetFont XSETFONT
+#define XSetForeground XSETFOREGROUND
+#define XSetFunction XSETFUNCTION
+#define XSetGraphicsExposures XSETGRAPHICSEXPOSURES
+#define XSetICFocus XSETICFOCUS
+#define XSetICValues XSETICVALUES
+#define XSetIOErrorHandler XSETIOERRORHANDLER
+#define XSetInputFocus XSETINPUTFOCUS
+#define XSetLineAttributes XSETLINEATTRIBUTES
+#define XSetLocaleModifiers XSETLOCALEMODIFIERS
+#define XSetNormalHints XSETNORMALHINTS
+#define XSetRegion XSETREGION
+#define XSetSelectionOwner XSETSELECTIONOWNER
+#define XSetStipple XSETSTIPPLE
+#define XSetSubwindowMode XSETSUBWINDOWMODE
+#define XSetTSOrigin XSETTSORIGIN
+#define XSetTile XSETTILE
+#define XSetTransientForHint XSETTRANSIENTFORHINT
+#define XSetWMColormapWindows XSETWMCOLORMAPWINDOWS
+#define XSetWMHints XSETWMHINTS
+#define XSetWMIconName XSETWMICONNAME
+#define XSetWMName XSETWMNAME
+#define XSetWMNormalHints XSETWMNORMALHINTS
+#define XSetWMProperties XSETWMPROPERTIES
+#define XSetWMProtocols XSETWMPROTOCOLS
+#define XSetWindowBackground XSETWINDOWBACKGROUND
+#define XSetWindowBackgroundPixmap XSETWINDOWBACKGROUNDPIXMAP
+#define XSetWindowColormap XSETWINDOWCOLORMAP
+#define XShapeCombineMask XSHAPECOMBINEMASK
+#define XShapeCombineRectangles XSHAPECOMBINERECTANGLES
+#define XShapeGetRectangles XSHAPEGETRECTANGLES
+#define XShrinkRegion XSHRINKREGION
+#define XStoreColor XSTORECOLOR
+#define XStoreColors XSTORECOLORS
+#define XStoreName XSTORENAME
+#define XStringToKeysym XSTRINGTOKEYSYM
+#define XSubtractRegion XSUBTRACTREGION
+#define XSupportsLocale XSUPPORTSLOCALE
+#define XSync XSYNC
+#define XSynchronize XSYNCHRONIZE
+#define XTextExtents XTEXTEXTENTS
+#define XTextExtents16 XTEXTEXTENTS16
+#define XTextWidth XTEXTWIDTH
+#define XTextWidth16 XTEXTWIDTH16
+#define XTranslateCoordinates XTRANSLATECOORDINATES
+#define XUndefineCursor XUNDEFINECURSOR
+#define XUngrabKeyboard XUNGRABKEYBOARD
+#define XUngrabPointer XUNGRABPOINTER
+#define XUngrabServer XUNGRABSERVER
+#define XUnionRectWithRegion XUNIONRECTWITHREGION
+#define XUnionRegion XUNIONREGION
+#define XUnmapWindow XUNMAPWINDOW
+#define _XUnregisterFilter _XUNREGISTERFILTER
+#define XUnsetICFocus XUNSETICFOCUS
+#define XVaCreateNestedList XVACREATENESTEDLIST
+#define XVisualIDFromVisual XVISUALIDFROMVISUAL
+#define XWidthOfScreen XWIDTHOFSCREEN
+#define XWindowEvent XWINDOWEVENT
+#define XWithdrawWindow XWITHDRAWWINDOW
+#define XXorRegion XXORREGION
+#define XmAddProtocolCallback XMADDPROTOCOLCALLBACK
+#define XmAddProtocols XMADDPROTOCOLS
+#define XmChangeColor XMCHANGECOLOR
+#define XmClipboardCopy XMCLIPBOARDCOPY
+#define XmClipboardEndCopy XMCLIPBOARDENDCOPY
+#define XmClipboardInquireLength XMCLIPBOARDINQUIRELENGTH
+#define XmClipboardLock XMCLIPBOARDLOCK
+#define XmClipboardRetrieve XMCLIPBOARDRETRIEVE
+#define XmClipboardStartCopy XMCLIPBOARDSTARTCOPY
+#define XmClipboardUnlock XMCLIPBOARDUNLOCK
+#define XmCreateArrowButton XMCREATEARROWBUTTON
+#define XmCreateArrowButtonGadget XMCREATEARROWBUTTONGADGET
+#define XmCreateCascadeButton XMCREATECASCADEBUTTON
+#define XmCreateDialogShell XMCREATEDIALOGSHELL
+#define XmCreateDragIcon XMCREATEDRAGICON
+#define XmCreateDrawingArea XMCREATEDRAWINGAREA
+#define XmCreateDrawnButton XMCREATEDRAWNBUTTON
+#define XmCreateFileSelectionBox XMCREATEFILESELECTIONBOX
+#define XmCreateFileSelectionDialog XMCREATEFILESELECTIONDIALOG
+#define XmCreateForm XMCREATEFORM
+#define XmCreateFormDialog XMCREATEFORMDIALOG
+#define XmCreateFrame XMCREATEFRAME
+#define XmCreateInformationDialog XMCREATEINFORMATIONDIALOG
+#define XmCreateLabelGadget XMCREATELABELGADGET
+#define XmCreateMainWindow XMCREATEMAINWINDOW
+#define XmCreateMenuBar XMCREATEMENUBAR
+#define XmCreateMessageBox XMCREATEMESSAGEBOX
+#define XmCreateMessageDialog XMCREATEMESSAGEDIALOG
+#define XmCreateOptionMenu XMCREATEOPTIONMENU
+#define XmCreatePanedWindow XMCREATEPANEDWINDOW
+#define XmCreatePopupMenu XMCREATEPOPUPMENU
+#define XmCreatePromptDialog XMCREATEPROMPTDIALOG
+#define XmCreatePulldownMenu XMCREATEPULLDOWNMENU
+#define XmCreatePushButton XMCREATEPUSHBUTTON
+#define XmCreatePushButtonGadget XMCREATEPUSHBUTTONGADGET
+#define XmCreateQuestionDialog XMCREATEQUESTIONDIALOG
+#define XmCreateRadioBox XMCREATERADIOBOX
+#define XmCreateRowColumn XMCREATEROWCOLUMN
+#define XmCreateScale XMCREATESCALE
+#define XmCreateScrollBar XMCREATESCROLLBAR
+#define XmCreateScrolledList XMCREATESCROLLEDLIST
+#define XmCreateScrolledText XMCREATESCROLLEDTEXT
+#define XmCreateScrolledWindow XMCREATESCROLLEDWINDOW
+#define XmCreateSelectionDialog XMCREATESELECTIONDIALOG
+#define XmCreateSeparator XMCREATESEPARATOR
+#define XmCreateSeparatorGadget XMCREATESEPARATORGADGET
+#define XmCreateTemplateDialog XMCREATETEMPLATEDIALOG
+#define XmCreateText XMCREATETEXT
+#define XmCreateTextField XMCREATETEXTFIELD
+#define XmCreateToggleButton XMCREATETOGGLEBUTTON
+#define XmCreateToggleButtonGadget XMCREATETOGGLEBUTTONGADGET
+#define XmDragStart XMDRAGSTART
+#define XmDropSiteRegister XMDROPSITEREGISTER
+#define XmDropSiteUnregister XMDROPSITEUNREGISTER
+#define XmDropSiteUpdate XMDROPSITEUPDATE
+#define XmDropTransferStart XMDROPTRANSFERSTART
+#define XmFileSelectionBoxGetChild XMFILESELECTIONBOXGETCHILD
+#define XmFileSelectionDoSearch XMFILESELECTIONDOSEARCH
+#define XmFontListAppendEntry XMFONTLISTAPPENDENTRY
+#define XmFontListCopy XMFONTLISTCOPY
+#define XmFontListCreate XMFONTLISTCREATE
+#define XmFontListEntryCreate XMFONTLISTENTRYCREATE
+#define XmFontListEntryFree XMFONTLISTENTRYFREE
+#define XmFontListEntryGetFont XMFONTLISTENTRYGETFONT
+#define XmFontListEntryGetTag XMFONTLISTENTRYGETTAG
+#define XmFontListEntryLoad XMFONTLISTENTRYLOAD
+#define XmFontListFree XMFONTLISTFREE
+#define XmFontListFreeFontContext XMFONTLISTFREEFONTCONTEXT
+#define XmFontListGetNextFont XMFONTLISTGETNEXTFONT
+#define XmFontListInitFontContext XMFONTLISTINITFONTCONTEXT
+#define XmFontListNextEntry XMFONTLISTNEXTENTRY
+#define XmGetColors XMGETCOLORS
+#define XmGetFocusWidget XMGETFOCUSWIDGET
+#define XmGetMenuCursor XMGETMENUCURSOR
+#define XmGetPixmapByDepth XMGETPIXMAPBYDEPTH
+#define XmGetTearOffControl XMGETTEAROFFCONTROL
+#define XmGetXmDisplay XMGETXMDISPLAY
+#define XmImMbLookupString XMIMMBLOOKUPSTRING
+#define XmImRegister XMIMREGISTER
+#define XmImSetFocusValues XMIMSETFOCUSVALUES
+#define XmImSetValues XMIMSETVALUES
+#define XmImUnregister XMIMUNREGISTER
+#define XmImUnsetFocus XMIMUNSETFOCUS
+#define XmInternAtom XMINTERNATOM
+#define XmIsMotifWMRunning XMISMOTIFWMRUNNING
+#define XmListAddItem XMLISTADDITEM
+#define XmListAddItemUnselected XMLISTADDITEMUNSELECTED
+#define XmListAddItemsUnselected XMLISTADDITEMSUNSELECTED
+#define XmListDeleteAllItems XMLISTDELETEALLITEMS
+#define XmListDeleteItemsPos XMLISTDELETEITEMSPOS
+#define XmListDeletePos XMLISTDELETEPOS
+#define XmListDeselectAllItems XMLISTDESELECTALLITEMS
+#define XmListDeselectPos XMLISTDESELECTPOS
+#define XmListGetKbdItemPos XMLISTGETKBDITEMPOS
+#define XmListGetMatchPos XMLISTGETMATCHPOS
+#define XmListGetSelectedPos XMLISTGETSELECTEDPOS
+#define XmListPosSelected XMLISTPOSSELECTED
+#define XmListSelectItem XMLISTSELECTITEM
+#define XmListSelectPos XMLISTSELECTPOS
+#define XmListSetBottomPos XMLISTSETBOTTOMPOS
+#define XmListSetItem XMLISTSETITEM
+#define XmListSetKbdItemPos XMLISTSETKBDITEMPOS
+#define XmListSetPos XMLISTSETPOS
+#define XmMainWindowSetAreas XMMAINWINDOWSETAREAS
+#define XmMenuPosition XMMENUPOSITION
+#define XmMessageBoxGetChild XMMESSAGEBOXGETCHILD
+#define XmOptionButtonGadget XMOPTIONBUTTONGADGET
+#define XmOptionLabelGadget XMOPTIONLABELGADGET
+#define XmProcessTraversal XMPROCESSTRAVERSAL
+#define XmQmotif XMQMOTIF
+#define XmRemoveProtocolCallback XMREMOVEPROTOCOLCALLBACK
+#define XmRepTypeGetId XMREPTYPEGETID
+#define XmRepTypeGetRecord XMREPTYPEGETRECORD
+#define XmRepTypeRegister XMREPTYPEREGISTER
+#define XmRepTypeValidValue XMREPTYPEVALIDVALUE
+#define XmScrollBarSetValues XMSCROLLBARSETVALUES
+#define XmScrolledWindowSetAreas XMSCROLLEDWINDOWSETAREAS
+#define XmSelectionBoxGetChild XMSELECTIONBOXGETCHILD
+#define XmStringByteCompare XMSTRINGBYTECOMPARE
+#define XmStringCompare XMSTRINGCOMPARE
+#define XmStringConcat XMSTRINGCONCAT
+#define XmStringCopy XMSTRINGCOPY
+#define XmStringCreate XMSTRINGCREATE
+#define XmStringCreateLocalized XMSTRINGCREATELOCALIZED
+#define XmStringCreateLtoR XMSTRINGCREATELTOR
+#define XmStringCreateSimple XMSTRINGCREATESIMPLE
+#define XmStringDraw XMSTRINGDRAW
+#define XmStringDrawUnderline XMSTRINGDRAWUNDERLINE
+#define XmStringExtent XMSTRINGEXTENT
+#define XmStringFree XMSTRINGFREE
+#define XmStringFreeContext XMSTRINGFREECONTEXT
+#define XmStringGetLtoR XMSTRINGGETLTOR
+#define XmStringGetNextComponent XMSTRINGGETNEXTCOMPONENT
+#define XmStringGetNextSegment XMSTRINGGETNEXTSEGMENT
+#define XmStringInitContext XMSTRINGINITCONTEXT
+#define XmStringLength XMSTRINGLENGTH
+#define XmStringLtoRCreate XMSTRINGLTORCREATE
+#define XmStringNConcat XMSTRINGNCONCAT
+#define XmStringSegmentCreate XMSTRINGSEGMENTCREATE
+#define XmStringWidth XMSTRINGWIDTH
+#define XmTextClearSelection XMTEXTCLEARSELECTION
+#define XmTextFieldGetEditable XMTEXTFIELDGETEDITABLE
+#define XmTextFieldGetInsertionPosition XMTEXTFIELDGETINSERTIONPOSITION
+#define XmTextFieldGetLastPosition XMTEXTFIELDGETLASTPOSITION
+#define XmTextFieldGetSelection XMTEXTFIELDGETSELECTION
+#define XmTextFieldGetString XMTEXTFIELDGETSTRING
+#define XmTextFieldInsert XMTEXTFIELDINSERT
+#define XmTextFieldRemove XMTEXTFIELDREMOVE
+#define XmTextFieldSetSelection XMTEXTFIELDSETSELECTION
+#define XmTextFieldSetString XMTEXTFIELDSETSTRING
+#define XmTextGetCursorPosition XMTEXTGETCURSORPOSITION
+#define XmTextGetInsertionPosition XMTEXTGETINSERTIONPOSITION
+#define XmTextGetLastPosition XMTEXTGETLASTPOSITION
+#define XmTextGetMaxLength XMTEXTGETMAXLENGTH
+#define XmTextGetSelection XMTEXTGETSELECTION
+#define XmTextGetSelectionPosition XMTEXTGETSELECTIONPOSITION
+#define XmTextGetString XMTEXTGETSTRING
+#define XmTextInsert XMTEXTINSERT
+#define XmTextRemove XMTEXTREMOVE
+#define XmTextReplace XMTEXTREPLACE
+#define XmTextSetCursorPosition XMTEXTSETCURSORPOSITION
+#define XmTextSetHighlight XMTEXTSETHIGHLIGHT
+#define XmTextSetInsertionPosition XMTEXTSETINSERTIONPOSITION
+#define XmTextSetSelection XMTEXTSETSELECTION
+#define XmTextSetString XMTEXTSETSTRING
+#define XmToggleButtonGadgetGetState XMTOGGLEBUTTONGADGETGETSTATE
+#define XmToggleButtonGadgetSetState XMTOGGLEBUTTONGADGETSETSTATE
+#define XmToggleButtonGetState XMTOGGLEBUTTONGETSTATE
+#define XmToggleButtonSetState XMTOGGLEBUTTONSETSTATE
+#define XmUpdateDisplay XMUPDATEDISPLAY
+#define XmVaCreateSimpleRadioBox XMVACREATESIMPLERADIOBOX
+#define XmbDrawString XMBDRAWSTRING
+#define XmbLookupString XMBLOOKUPSTRING
+#define XmbResetIC XMBRESETIC
+#define XmbSetWMProperties XMBSETWMPROPERTIES
+#define XmbTextEscapement XMBTEXTESCAPEMENT
+#define XmbTextExtents XMBTEXTEXTENTS
+#define XmbTextListToTextProperty XMBTEXTLISTTOTEXTPROPERTY
+#define XmbTextPropertyToTextList XMBTEXTPROPERTYTOTEXTLIST
+#define XmuClientWindow XMUCLIENTWINDOW
+#define XmuPrintDefaultErrorMessage XMUPRINTDEFAULTERRORMESSAGE
+#define XrmGetDatabase XRMGETDATABASE
+#define XrmGetResource XRMGETRESOURCE
+#define XrmPutStringResource XRMPUTSTRINGRESOURCE
+#define XrmQuarkToString XRMQUARKTOSTRING
+#define XrmStringToQuark XRMSTRINGTOQUARK
+#define XtAddCallback XTADDCALLBACK
+#define XtAddCallbacks XTADDCALLBACKS
+#define XtAddEventHandler XTADDEVENTHANDLER
+#define XtAddGrab XTADDGRAB
+#define XtAllocateGC XTALLOCATEGC
+#define XtAppAddActions XTAPPADDACTIONS
+#define XtAppAddInput XTAPPADDINPUT
+#define XtAppAddTimeOut XTAPPADDTIMEOUT
+#define XtAppCreateShell XTAPPCREATESHELL
+#define XtAppInitialize XTAPPINITIALIZE
+#define XtAppNextEvent XTAPPNEXTEVENT
+#define XtAppPeekEvent XTAPPPEEKEVENT
+#define XtAppPending XTAPPPENDING
+#define XtAppProcessEvent XTAPPPROCESSEVENT
+#define XtAppSetErrorHandler XTAPPSETERRORHANDLER
+#define XtAppSetFallbackResources XTAPPSETFALLBACKRESOURCES
+#define XtAppSetWarningHandler XTAPPSETWARNINGHANDLER
+#define XtAppSetWarningMsgHandler XTAPPSETWARNINGMSGHANDLER
+#define XtAppWarning XTAPPWARNING
+#define XtCallActionProc XTCALLACTIONPROC
+#define XtCallCallbackList XTCALLCALLBACKLIST
+#define XtCallCallbacks XTCALLCALLBACKS
+#define XtConfigureWidget XTCONFIGUREWIDGET
+#define XtConvertAndStore XTCONVERTANDSTORE
+#define XtCreateApplicationContext XTCREATEAPPLICATIONCONTEXT
+#define XtCreateManagedWidget XTCREATEMANAGEDWIDGET
+#define XtCreatePopupShell XTCREATEPOPUPSHELL
+#define XtCreateWidget XTCREATEWIDGET
+#define XtDatabase XTDATABASE
+#define XtDestroyWidget XTDESTROYWIDGET
+#define XtDisownSelection XTDISOWNSELECTION
+#define XtDispatchEvent XTDISPATCHEVENT
+#define XtDisplayOfObject XTDISPLAYOFOBJECT
+#define XtDisplayStringConvWarning XTDISPLAYSTRINGCONVWARNING
+#define XtDisplayToApplicationContext XTDISPLAYTOAPPLICATIONCONTEXT
+#define XtAppAddWorkProc XTAPPADDWORKPROC
+#define XtRemoveWorkProc XTREMOVEWORKPROC
+#define XtFree XTFREE
+#define XtGetActionKeysym XTGETACTIONKEYSYM
+#define XtGetActionList XTGETACTIONLIST
+#define XtGetApplicationNameAndClass XTGETAPPLICATIONNAMEANDCLASS
+#define XtGetApplicationResources XTGETAPPLICATIONRESOURCES
+#define XtGetGC XTGETGC
+#define XtGetMultiClickTime XTGETMULTICLICKTIME
+#define XtGetSelectionValue XTGETSELECTIONVALUE
+#define XtGetSelectionValues XTGETSELECTIONVALUES
+#define XtGetSubresources XTGETSUBRESOURCES
+#define XtGetValues XTGETVALUES
+#define XtGrabKeyboard XTGRABKEYBOARD
+#define XtGrabPointer XTGRABPOINTER
+#define XtHasCallbacks XTHASCALLBACKS
+#define XtInitializeWidgetClass XTINITIALIZEWIDGETCLASS
+#define XtInsertEventHandler XTINSERTEVENTHANDLER
+#define XtIsManaged XTISMANAGED
+#define XtIsObject XTISOBJECT
+#define XtIsSensitive XTISSENSITIVE
+#define XtIsSubclass XTISSUBCLASS
+#define XtLastTimestampProcessed XTLASTTIMESTAMPPROCESSED
+#define XtMakeGeometryRequest XTMAKEGEOMETRYREQUEST
+#define XtMakeResizeRequest XTMAKERESIZEREQUEST
+#define XtMalloc XTMALLOC
+#define XtManageChild XTMANAGECHILD
+#define XtManageChildren XTMANAGECHILDREN
+#define XtMergeArgLists XTMERGEARGLISTS
+#define XtMoveWidget XTMOVEWIDGET
+#define XtName XTNAME
+#define XtNameToWidget XTNAMETOWIDGET
+#define XtOpenDisplay XTOPENDISPLAY
+#define XtOverrideTranslations XTOVERRIDETRANSLATIONS
+#define XtOwnSelection XTOWNSELECTION
+#define XtParseTranslationTable XTPARSETRANSLATIONTABLE
+#define XtPopdown XTPOPDOWN
+#define XtPopup XTPOPUP
+#define XtQueryGeometry XTQUERYGEOMETRY
+#define XtRealizeWidget XTREALIZEWIDGET
+#define XtRealloc XTREALLOC
+#define XtReleaseGC XTRELEASEGC
+#define XtRemoveAllCallbacks XTREMOVEALLCALLBACKS
+#define XtRemoveCallback XTREMOVECALLBACK
+#define XtRemoveEventHandler XTREMOVEEVENTHANDLER
+#define XtRemoveGrab XTREMOVEGRAB
+#define XtRemoveInput XTREMOVEINPUT
+#define XtRemoveTimeOut XTREMOVETIMEOUT
+#define XtResizeWidget XTRESIZEWIDGET
+#define XtResolvePathname XTRESOLVEPATHNAME
+#define XtSetKeyboardFocus XTSETKEYBOARDFOCUS
+#define XtSetMappedWhenManaged XTSETMAPPEDWHENMANAGED
+#define XtSetSensitive XTSETSENSITIVE
+#define XtSetTypeConverter XTSETTYPECONVERTER
+#define XtSetValues XTSETVALUES
+#define XtShellStrings XTSHELLSTRINGS
+#define XtStrings XTSTRINGS
+#define XtToolkitInitialize XTTOOLKITINITIALIZE
+#define XtTranslateCoords XTTRANSLATECOORDS
+#define XtTranslateKeycode XTTRANSLATEKEYCODE
+#define XtUngrabKeyboard XTUNGRABKEYBOARD
+#define XtUngrabPointer XTUNGRABPOINTER
+#define XtUnmanageChild XTUNMANAGECHILD
+#define XtUnmanageChildren XTUNMANAGECHILDREN
+#define XtUnrealizeWidget XTUNREALIZEWIDGET
+#define XtVaCreateManagedWidget XTVACREATEMANAGEDWIDGET
+#define XtVaCreateWidget XTVACREATEWIDGET
+#define XtVaGetValues XTVAGETVALUES
+#define XtVaSetValues XTVASETVALUES
+#define XtWarning XTWARNING
+#define XtWidgetToApplicationContext XTWIDGETTOAPPLICATIONCONTEXT
+#define XtWindowOfObject XTWINDOWOFOBJECT
+#define XtWindowToWidget XTWINDOWTOWIDGET
+#define XwcDrawString XWCDRAWSTRING
+#define XwcFreeStringList XWCFREESTRINGLIST
+#define XwcTextEscapement XWCTEXTESCAPEMENT
+#define XwcTextExtents XWCTEXTEXTENTS
+#define XwcTextListToTextProperty XWCTEXTLISTTOTEXTPROPERTY
+#define XwcTextPropertyToTextList XWCTEXTPROPERTYTOTEXTLIST
+#define _XmBottomShadowColorDefault _XMBOTTOMSHADOWCOLORDEFAULT
+#define _XmClearBorder _XMCLEARBORDER
+#define _XmConfigureObject _XMCONFIGUREOBJECT
+#define _XmDestroyParentCallback _XMDESTROYPARENTCALLBACK
+#define _XmDrawArrow _XMDRAWARROW
+#define _XmDrawShadows _XMDRAWSHADOWS
+#define _XmFontListGetDefaultFont _XMFONTLISTGETDEFAULTFONT
+#define _XmFromHorizontalPixels _XMFROMHORIZONTALPIXELS
+#define _XmFromVerticalPixels _XMFROMVERTICALPIXELS
+#define _XmGetClassExtensionPtr _XMGETCLASSEXTENSIONPTR
+#define _XmGetDefaultFontList _XMGETDEFAULTFONTLIST
+#define _XmGetTextualDragIcon _XMGETTEXTUALDRAGICON
+#define _XmGetWidgetExtData _XMGETWIDGETEXTDATA
+#define _XmGrabKeyboard _XMGRABKEYBOARD
+#define _XmGrabPointer _XMGRABPOINTER
+#define _XmInheritClass _XMINHERITCLASS
+#define _XmInputInGadget _XMINPUTINGADGET
+#define _XmMakeGeometryRequest _XMMAKEGEOMETRYREQUEST
+#define _XmMenuPopDown _XMMENUPOPDOWN
+#define _XmMoveObject _XMMOVEOBJECT
+#define _XmNavigChangeManaged _XMNAVIGCHANGEMANAGED
+#define _XmOSBuildFileList _XMOSBUILDFILELIST
+#define _XmOSFileCompare _XMOSFILECOMPARE
+#define _XmOSFindPatternPart _XMOSFINDPATTERNPART
+#define _XmOSQualifyFileSpec _XMOSQUALIFYFILESPEC
+#define _XmPostPopupMenu _XMPOSTPOPUPMENU
+#define _XmPrimitiveEnter _XMPRIMITIVEENTER
+#define _XmPrimitiveLeave _XMPRIMITIVELEAVE
+#define _XmRedisplayGadgets _XMREDISPLAYGADGETS
+#define _XmShellIsExclusive _XMSHELLISEXCLUSIVE
+#define _XmStringDraw _XMSTRINGDRAW
+#define _XmStringGetTextConcat _XMSTRINGGETTEXTCONCAT
+#define _XmStrings _XMSTRINGS
+#define _XmToHorizontalPixels _XMTOHORIZONTALPIXELS
+#define _XmToVerticalPixels _XMTOVERTICALPIXELS
+#define _XmTopShadowColorDefault _XMTOPSHADOWCOLORDEFAULT
+#define _Xm_fastPtr _XM_FASTPTR
+#define _XtCheckSubclassFlag _XTCHECKSUBCLASSFLAG
+#define _XtInherit _XTINHERIT
+#define _XtInheritTranslations _XTINHERITTRANSLATIONS
+#define applicationShellWidgetClass APPLICATIONSHELLWIDGETCLASS
+#define compositeWidgetClass COMPOSITEWIDGETCLASS
+#define overrideShellWidgetClass OVERRIDESHELLWIDGETCLASS
+#define shellWidgetClass SHELLWIDGETCLASS
+#define topLevelShellClassRec TOPLEVELSHELLCLASSREC
+#define topLevelShellWidgetClass TOPLEVELSHELLWIDGETCLASS
+#define transientShellWidgetClass TRANSIENTSHELLWIDGETCLASS
+#define vendorShellClassRec VENDORSHELLCLASSREC
+#define vendorShellWidgetClass VENDORSHELLWIDGETCLASS
+#define wmShellWidgetClass WMSHELLWIDGETCLASS
+#define xmArrowButtonWidgetClass XMARROWBUTTONWIDGETCLASS
+#define xmCascadeButtonClassRec XMCASCADEBUTTONCLASSREC
+#define xmCascadeButtonGadgetClass XMCASCADEBUTTONGADGETCLASS
+#define xmCascadeButtonWidgetClass XMCASCADEBUTTONWIDGETCLASS
+#define xmDialogShellWidgetClass XMDIALOGSHELLWIDGETCLASS
+#define xmDrawingAreaWidgetClass XMDRAWINGAREAWIDGETCLASS
+#define xmDrawnButtonWidgetClass XMDRAWNBUTTONWIDGETCLASS
+#define xmFileSelectionBoxWidgetClass XMFILESELECTIONBOXWIDGETCLASS
+#define xmFormWidgetClass XMFORMWIDGETCLASS
+#define xmFrameWidgetClass XMFRAMEWIDGETCLASS
+#define xmGadgetClass XMGADGETCLASS
+#define xmLabelGadgetClass XMLABELGADGETCLASS
+#define xmLabelWidgetClass XMLABELWIDGETCLASS
+#define xmListWidgetClass XMLISTWIDGETCLASS
+#define xmMainWindowWidgetClass XMMAINWINDOWWIDGETCLASS
+#define xmManagerClassRec XMMANAGERCLASSREC
+#define xmManagerWidgetClass XMMANAGERWIDGETCLASS
+#define xmMenuShellWidgetClass XMMENUSHELLWIDGETCLASS
+#define xmMessageBoxWidgetClass XMMESSAGEBOXWIDGETCLASS
+#define xmPrimitiveClassRec XMPRIMITIVECLASSREC
+#define xmPrimitiveWidgetClass XMPRIMITIVEWIDGETCLASS
+#define xmPushButtonClassRec XMPUSHBUTTONCLASSREC
+#define xmPushButtonGadgetClass XMPUSHBUTTONGADGETCLASS
+#define xmPushButtonWidgetClass XMPUSHBUTTONWIDGETCLASS
+#define xmRowColumnWidgetClass XMROWCOLUMNWIDGETCLASS
+#define xmSashWidgetClass XMSASHWIDGETCLASS
+#define xmScrollBarWidgetClass XMSCROLLBARWIDGETCLASS
+#define xmScrolledWindowClassRec XMSCROLLEDWINDOWCLASSREC
+#define xmScrolledWindowWidgetClass XMSCROLLEDWINDOWWIDGETCLASS
+#define xmSeparatorGadgetClass XMSEPARATORGADGETCLASS
+#define xmSeparatorWidgetClass XMSEPARATORWIDGETCLASS
+#define xmTextFieldWidgetClass XMTEXTFIELDWIDGETCLASS
+#define xmTextWidgetClass XMTEXTWIDGETCLASS
+#define xmToggleButtonGadgetClass XMTOGGLEBUTTONGADGETCLASS
+#define xmToggleButtonWidgetClass XMTOGGLEBUTTONWIDGETCLASS
+#define XtRegisterDrawable _XTREGISTERWINDOW
+#define XtUnregisterDrawable _XTUNREGISTERWINDOW
+#define XQueryFont XQUERYFONT
+#define XSetPlaneMask XSETPLANEMASK
+#define XChangeKeyboardControl XCHANGEKEYBOARDCONTROL
+#define XDestroySubwindows XDESTROYSUBWINDOWS
+#define XFreeDeviceList XFREEDEVICELIST
+#define XFreeDeviceState XFREEDEVICESTATE
+#define XGetExtensionVersion XGETEXTENSIONVERSION
+#define XGetRGBColormaps XGETRGBCOLORMAPS
+#define XIconifyWindow XICONIFYWINDOW
+#define XInstallColormap XINSTALLCOLORMAP
+#define XListInputDevices XLISTINPUTDEVICES
+#define XLookupKeysym XLOOKUPKEYSYM
+#define XOpenDevice XOPENDEVICE
+#define XQueryDeviceState XQUERYDEVICESTATE
+#define XSelectExtensionEvent XSELECTEXTENSIONEVENT
+#define XWarpPointer XWARPPOINTER
+#define XmuLookupStandardColormap XMULOOKUPSTANDARDCOLORMAP
+#define XAllocNamedColor XALLOCNAMEDCOLOR
+#define XBlackPixelOfScreen XBLACKPIXELOFSCREEN
+#define XDefaultColormap XDEFAULTCOLORMAP
+#define XDefaultColormapOfScreen XDEFAULTCOLORMAPOFSCREEN
+#define XDefaultDepth XDEFAULTDEPTH
+#define XDefaultScreen XDEFAULTSCREEN
+#define XDefaultVisual XDEFAULTVISUAL
+#define XSetIconName XSETICONNAME
+#define XtInitialize XTINITIALIZE
+#define XtMainLoop XTMAINLOOP
+#define DtSaverGetWindows DTSAVERGETWINDOWS
+#define XAddHosts XADDHOSTS
+#define XDisableAccessControl XDISABLEACCESSCONTROL
+#define XEnableAccessControl XENABLEACCESSCONTROL
+#define XFillArcs XFILLARCS
+#define XForceScreenSaver XFORCESCREENSAVER
+#define XGetScreenSaver XGETSCREENSAVER
+#define XListHosts XLISTHOSTS
+#define XReadBitmapFile XREADBITMAPFILE
+#define XRemoveHosts XREMOVEHOSTS
+#define XResetScreenSaver XRESETSCREENSAVER
+#define XResourceManagerString XRESOURCEMANAGERSTRING
+#define XSetScreenSaver XSETSCREENSAVER
+#define XStringListToTextProperty XSTRINGLISTTOTEXTPROPERTY
+#define XrmDestroyDatabase XRMDESTROYDATABASE
+#define XrmGetFileDatabase XRMGETFILEDATABASE
+#define XrmGetStringDatabase XRMGETSTRINGDATABASE
+#define XrmInitialize XRMINITIALIZE
+#define XrmMergeDatabases XRMMERGEDATABASES
+#define XrmParseCommand XRMPARSECOMMAND
+#define XrmPutLineResource XRMPUTLINERESOURCE
+#define XrmQPutStringResource XRMQPUTSTRINGRESOURCE
+#define XrmStringToBindingQuarkList XRMSTRINGTOBINDINGQUARKLIST
+#define XrmStringToQuark XRMSTRINGTOQUARK
+#define XmCreateLabel XMCREATELABEL
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern void XtFree(char*);
+#ifdef __cplusplus
+}
+#endif
+
+#define pthread_attr_create PTHREAD_ATTR_CREATE
+#define pthread_attr_delete PTHREAD_ATTR_DELETE
+#define pthread_attr_destroy PTHREAD_ATTR_DESTROY
+#define pthread_attr_getdetach_np PTHREAD_ATTR_GETDETACH_NP
+#define pthread_attr_getguardsize_np PTHREAD_ATTR_GETGUARDSIZE_NP
+#define pthread_attr_getinheritsched PTHREAD_ATTR_GETINHERITSCHED
+#define pthread_attr_getprio PTHREAD_ATTR_GETPRIO
+#define pthread_attr_getsched PTHREAD_ATTR_GETSCHED
+#define pthread_attr_getschedparam PTHREAD_ATTR_GETSCHEDPARAM
+#define pthread_attr_getstacksize PTHREAD_ATTR_GETSTACKSIZE
+#define pthread_attr_init PTHREAD_ATTR_INIT
+#define pthread_attr_setdetach_np PTHREAD_ATTR_SETDETACH_NP
+#define pthread_attr_setdetachstate PTHREAD_ATTR_SETDETACHSTATE
+#define pthread_attr_setguardsize_np PTHREAD_ATTR_SETGUARDSIZE_NP
+#define pthread_attr_setinheritsched PTHREAD_ATTR_SETINHERITSCHED
+#define pthread_attr_setprio PTHREAD_ATTR_SETPRIO
+#define pthread_attr_setsched PTHREAD_ATTR_SETSCHED
+#define pthread_attr_setschedparam PTHREAD_ATTR_SETSCHEDPARAM
+#define pthread_attr_setschedpolicy PTHREAD_ATTR_SETSCHEDPOLICY
+#define pthread_attr_setstacksize PTHREAD_ATTR_SETSTACKSIZE
+#define pthread_cancel PTHREAD_CANCEL
+#define pthread_cancel_e PTHREAD_CANCEL_E
+#define pthread_cond_broadcast PTHREAD_COND_BROADCAST
+#define pthread_cond_destroy PTHREAD_COND_DESTROY
+#define pthread_cond_init PTHREAD_COND_INIT
+#define pthread_cond_sig_preempt_int_np PTHREAD_COND_SIG_PREEMPT_INT_NP
+#define pthread_cond_signal PTHREAD_COND_SIGNAL
+#define pthread_cond_signal_int_np PTHREAD_COND_SIGNAL_INT_NP
+#define pthread_cond_timedwait PTHREAD_COND_TIMEDWAIT
+#define pthread_cond_wait PTHREAD_COND_WAIT
+#define pthread_condattr_create PTHREAD_CONDATTR_CREATE
+#define pthread_condattr_delete PTHREAD_CONDATTR_DELETE
+#define pthread_condattr_init PTHREAD_CONDATTR_INIT
+#define pthread_create PTHREAD_CREATE
+#define pthread_delay_np PTHREAD_DELAY_NP
+#define pthread_detach PTHREAD_DETACH
+#define pthread_equal PTHREAD_EQUAL
+#define pthread_exc_fetch_fp_np PTHREAD_EXC_FETCH_FP_NP
+#define pthread_exc_handler_np PTHREAD_EXC_HANDLER_NP
+#define pthread_exc_pop_ctx_np PTHREAD_EXC_POP_CTX_NP
+#define pthread_exc_push_ctx_np PTHREAD_EXC_PUSH_CTX_NP
+#define pthread_exc_savecontext_np PTHREAD_EXC_SAVECONTEXT_NP
+#define pthread_exit PTHREAD_EXIT
+#define pthread_get_expiration_np PTHREAD_GET_EXPIRATION_NP
+#define pthread_getprio PTHREAD_GETPRIO
+#define pthread_getschedparam PTHREAD_GETSCHEDPARAM
+#define pthread_getscheduler PTHREAD_GETSCHEDULER
+#define pthread_getspecific PTHREAD_GETSPECIFIC
+#define pthread_getunique_np PTHREAD_GETUNIQUE_NP
+#define pthread_join PTHREAD_JOIN
+#define pthread_join32 PTHREAD_JOIN32
+#define pthread_keycreate PTHREAD_KEYCREATE
+#define pthread_key_create PTHREAD_KEY_CREATE
+#define pthread_kill PTHREAD_KILL
+#define pthread_lock_global_np PTHREAD_LOCK_GLOBAL_NP
+#define pthread_mutex_destroy PTHREAD_MUTEX_DESTROY
+#define pthread_mutex_init PTHREAD_MUTEX_INIT
+#define pthread_mutex_lock PTHREAD_MUTEX_LOCK
+#define pthread_mutex_trylock PTHREAD_MUTEX_TRYLOCK
+#define pthread_mutex_unlock PTHREAD_MUTEX_UNLOCK
+#define pthread_mutexattr_create PTHREAD_MUTEXATTR_CREATE
+#define pthread_mutexattr_delete PTHREAD_MUTEXATTR_DELETE
+#define pthread_mutexattr_destroy PTHREAD_MUTEXATTR_DESTROY
+#define pthread_mutexattr_getkind_np PTHREAD_MUTEXATTR_GETKIND_NP
+#define pthread_mutexattr_init PTHREAD_MUTEXATTR_INIT
+#define pthread_mutexattr_setkind_np PTHREAD_MUTEXATTR_SETKIND_NP
+#define pthread_mutexattr_settype_np PTHREAD_MUTEXATTR_SETTYPE_NP
+#define pthread_once PTHREAD_ONCE
+#define pthread_resume_np PTHREAD_RESUME_NP
+#define pthread_self PTHREAD_SELF
+#define pthread_setasynccancel PTHREAD_SETASYNCCANCEL
+#define pthread_setcancel PTHREAD_SETCANCEL
+#define pthread_setcancelstate PTHREAD_SETCANCELSTATE
+#define pthread_setprio PTHREAD_SETPRIO
+#define pthread_setschedparam PTHREAD_SETSCHEDPARAM
+#define pthread_setscheduler PTHREAD_SETSCHEDULER
+#define pthread_setspecific PTHREAD_SETSPECIFIC
+#define pthread_suspend_np PTHREAD_SUSPEND_NP
+#define pthread_testcancel PTHREAD_TESTCANCEL
+#define pthread_unlock_global_np PTHREAD_UNLOCK_GLOBAL_NP
+#define pthread_yield PTHREAD_YIELD
+#define pthread_yield_np PTHREAD_YIELD_NP
+#define XDefaultRootWindow XDEFAULTROOTWINDOW
+#define XDisplayCells XDISPLAYCELLS
+#define XMaxRequestSize XMAXREQUESTSIZE
+#define XScreenOfDisplay XSCREENOFDISPLAY
+#define XSetFillRule XSETFILLRULE
+#define XmActivateProtocol XMACTIVATEPROTOCOL
+#define XmCreateBulletinBoardDialog XMCREATEBULLETINBOARDDIALOG
+#define XmCreateErrorDialog XMCREATEERRORDIALOG
+#define XmCreateWarningDialog XMCREATEWARNINGDIALOG
+#define XmCvtCTToXmString XMCVTCTTOXMSTRING
+#define XmDestroyPixmap XMDESTROYPIXMAP
+#define XmGetPixmap XMGETPIXMAP
+#define XmInstallImage XMINSTALLIMAGE
+#define XmListAddItems XMLISTADDITEMS
+#define XmListDeleteItem XMLISTDELETEITEM
+#define XmListItemExists XMLISTITEMEXISTS
+#define XmListItemPos XMLISTITEMPOS
+#define XmListReplaceItems XMLISTREPLACEITEMS
+#define XmListReplaceItemsPos XMLISTREPLACEITEMSPOS
+#define XmRemoveProtocols XMREMOVEPROTOCOLS
+#define XmRemoveTabGroup XMREMOVETABGROUP
+#define XmSetColorCalculation XMSETCOLORCALCULATION
+#define XmTextCopy XMTEXTCOPY
+#define XmTextCut XMTEXTCUT
+#define XmTextFieldClearSelection XMTEXTFIELDCLEARSELECTION
+#define XmTextFieldCopy XMTEXTFIELDCOPY
+#define XmTextFieldCut XMTEXTFIELDCUT
+#define XmTextFieldGetMaxLength XMTEXTFIELDGETMAXLENGTH
+#define XmTextFieldGetSelectionPosition XMTEXTFIELDGETSELECTIONPOSITION
+#define XmTextFieldPaste XMTEXTFIELDPASTE
+#define XmTextFieldReplace XMTEXTFIELDREPLACE
+#define XmTextFieldSetAddMode XMTEXTFIELDSETADDMODE
+#define XmTextFieldSetHighlight XMTEXTFIELDSETHIGHLIGHT
+#define XmTextFieldSetInsertionPosition XMTEXTFIELDSETINSERTIONPOSITION
+#define XmTextFieldSetMaxLength XMTEXTFIELDSETMAXLENGTH
+#define XmTextFieldShowPosition XMTEXTFIELDSHOWPOSITION
+#define XmTextGetEditable XMTEXTGETEDITABLE
+#define XmTextPaste XMTEXTPASTE
+#define XmTextPosToXY XMTEXTPOSTOXY
+#define XmTextSetEditable XMTEXTSETEDITABLE
+#define XmTextShowPosition XMTEXTSHOWPOSITION
+#define XmUninstallImage XMUNINSTALLIMAGE
+#define XmuCvtStringToBitmap XMUCVTSTRINGTOBITMAP
+#define XrmPutFileDatabase XRMPUTFILEDATABASE
+#define XtAddConverter XTADDCONVERTER
+#define XtError XTERROR
+#define XtVaCreatePopupShell XTVACREATEPOPUPSHELL
+#define pthread_attr_getschedpolicy PTHREAD_ATTR_GETSCHEDPOLICY
+#define pthread_key_delete PTHREAD_KEY_DELETE
+#define xmBulletinBoardWidgetClass XMBULLETINBOARDWIDGETCLASS
+#define xmScaleWidgetClass XMSCALEWIDGETCLASS
+#define XtDisplay XTDISPLAY
+#define XtScreen XTSCREEN
+#define XAllocIconSize XALLOCICONSIZE
+#define XAllocStandardColormap XALLOCSTANDARDCOLORMAP
+#define XAllowEvents XALLOWEVENTS
+#define XBlackPixel XBLACKPIXEL
+#define XCopyColormapAndFree XCOPYCOLORMAPANDFREE
+#define XDefaultGC XDEFAULTGC
+#define XDisplayHeight XDISPLAYHEIGHT
+#define XDisplayWidth XDISPLAYWIDTH
+#define XGetCommand XGETCOMMAND
+#define XGetIconSizes XGETICONSIZES
+#define XKillClient XKILLCLIENT
+#define XListInstalledColormaps XLISTINSTALLEDCOLORMAPS
+#define XRootWindow XROOTWINDOW
+#define XWMGeometry XWMGEOMETRY
+#define XWhitePixel XWHITEPIXEL
+#define XrmCombineDatabase XRMCOMBINEDATABASE
+#define XrmCombineFileDatabase XRMCOMBINEFILEDATABASE
+#define XSetStandardProperties XSETSTANDARDPROPERTIES
+#define XSetState XSETSTATE
+#define XDrawRectangles XDRAWRECTANGLES
+#define XGrabButton XGRABBUTTON
+#define XLookupColor XLOOKUPCOLOR
+#define XMapSubwindows XMAPSUBWINDOWS
+#define XRecolorCursor XRECOLORCURSOR
+#define XStoreBytes XSTOREBYTES
+#define XUngrabButton XUNGRABBUTTON
+#define XUninstallColormap XUNINSTALLCOLORMAP
+#define lib$wait LIB$WAIT
+#define lib$find_file LIB$FIND_FILE
+#define lib$find_file_end LIB$FIND_FILE_END
+#define lib$set_symbol LIB$SET_SYMBOL
+#define lib$sfree1_dd LIB$SFREE1_DD
+#define lib$spawn LIB$SPAWN
+#define sys$assign SYS$ASSIGN
+#define sys$crembx SYS$CREMBX
+#define sys$dassgn SYS$DASSGN
+#define sys$dclexh SYS$DCLEXH
+#define sys$getdviw SYS$GETDVIW
+#define sys$getsyiw SYS$GETSYIW
+#define sys$qio SYS$QIO
+#define sys$qiow SYS$QIOW
+#define sys$setef SYS$SETEF
+#define sys$synch SYS$SYNCH
+#define XDrawText XDRAWTEXT
+#define XtCloseDisplay XTCLOSEDISPLAY
+#define XtDestroyApplicationContext XTDESTROYAPPLICATIONCONTEXT
+#define lib$ediv LIB$EDIV
+#define lib$subx LIB$SUBX
+#define sys$bintim SYS$BINTIM
+#define sys$gettim SYS$GETTIM
+#define XFetchName XFETCHNAME
+#define XPeekIfEvent XPEEKIFEVENT
+#define XQueryKeymap XQUERYKEYMAP
+#endif
diff --git a/reactos/lib/mesa32/include/GL/wmesa.h b/reactos/lib/mesa32/include/GL/wmesa.h
new file mode 100644
index 00000000000..dc1ec89d2b1
--- /dev/null
+++ b/reactos/lib/mesa32/include/GL/wmesa.h
@@ -0,0 +1,140 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.0
+ * Copyright (C) 1995-1998  Brian Paul
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+
+/*
+ * Windows driver by: Mark E. Peterson (markp@ic.mankato.mn.us)
+ * Updated by Li Wei (liwei@aiar.xjtu.edu.cn)
+ *
+ *
+ ***************************************************************
+ *                     WMesa                                   *
+ *                     version 2.3                             *	
+ *                                                             *
+ *                        By                                   *
+ *                      Li Wei                                 *
+ *       Institute of Artificial Intelligence & Robotics       *
+ *       Xi'an Jiaotong University                             *
+ *       Email: liwei@aiar.xjtu.edu.cn                         * 
+ *       Web page: http://sun.aiar.xjtu.edu.cn                 *
+ *                                                             *
+ *	       July 7th, 1997				       *
+ ***************************************************************
+ */
+
+
+#ifndef WMESA_H
+#define WMESA_H
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#include "gl\gl.h"
+
+#pragma warning (disable:4273)
+#pragma warning( disable : 4244 ) /* '=' : conversion from 'const double ' to 'float ', possible loss of data */
+#pragma warning( disable : 4018 ) /* '<' : signed/unsigned mismatch */
+#pragma warning( disable : 4305 ) /* '=' : truncation from 'const double ' to 'float ' */
+#pragma warning( disable : 4013 ) /* 'function' undefined; assuming extern returning int */
+#pragma warning( disable : 4761 ) /* integral size mismatch in argument; conversion supplied */
+#pragma warning( disable : 4273 ) /* 'identifier' : inconsistent DLL linkage. dllexport assumed */
+#if (MESA_WARNQUIET>1)
+#	pragma warning( disable : 4146 ) /* unary minus operator applied to unsigned type, result still unsigned */
+#endif
+
+/*
+ * This is the WMesa context 'handle':
+ */
+typedef struct wmesa_context *WMesaContext;
+
+
+
+/*
+ * Create a new WMesaContext for rendering into a window.  You must
+ * have already created the window of correct visual type and with an
+ * appropriate colormap.
+ *
+ * Input:
+ *         hWnd - Window handle
+ *         Pal  - Palette to use
+ *         rgb_flag - GL_TRUE = RGB mode,
+ *                    GL_FALSE = color index mode
+ *         db_flag - GL_TRUE = double-buffered,
+ *                   GL_FALSE = single buffered
+ *         alpha_flag - GL_TRUE = create software alpha buffer,
+ *                      GL_FALSE = no software alpha buffer
+ *
+ * Note: Indexed mode requires double buffering under Windows.
+ *
+ * Return:  a WMesa_context or NULL if error.
+ */
+extern WMesaContext WMesaCreateContext(HWND hWnd,HPALETTE* pPal,
+                                       GLboolean rgb_flag,
+                                       GLboolean db_flag,
+                                       GLboolean alpha_flag);
+
+
+/*
+ * Destroy a rendering context as returned by WMesaCreateContext()
+ */
+/*extern void WMesaDestroyContext( WMesaContext ctx );*/
+extern void WMesaDestroyContext( void );
+
+
+
+/*
+ * Make the specified context the current one.
+ */
+extern void WMesaMakeCurrent( WMesaContext ctx );
+
+
+/*
+ * Return a handle to the current context.
+ */
+extern WMesaContext WMesaGetCurrentContext( void );
+
+
+/*
+ * Swap the front and back buffers for the current context.  No action
+ * taken if the context is not double buffered.
+ */
+extern void WMesaSwapBuffers(void);
+
+
+/*
+ * In indexed color mode we need to know when the palette changes.
+ */
+extern void WMesaPaletteChange(HPALETTE Pal);
+
+extern void WMesaMove(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif
+
diff --git a/reactos/lib/mesa32/include/GL/xmesa.h b/reactos/lib/mesa32/include/GL/xmesa.h
new file mode 100644
index 00000000000..2b7f3675431
--- /dev/null
+++ b/reactos/lib/mesa32/include/GL/xmesa.h
@@ -0,0 +1,390 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ * 
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * Mesa/X11 interface.  This header file serves as the documentation for
+ * the Mesa/X11 interface functions.
+ *
+ * Note: this interface isn't intended for user programs.  It's primarily
+ * just for implementing the pseudo-GLX interface.
+ */
+
+
+/* Sample Usage:
+
+In addition to the usual X calls to select a visual, create a colormap
+and create a window, you must do the following to use the X/Mesa interface:
+
+1. Call XMesaCreateVisual() to make an XMesaVisual from an XVisualInfo.
+
+2. Call XMesaCreateContext() to create an X/Mesa rendering context, given
+   the XMesaVisual.
+
+3. Call XMesaCreateWindowBuffer() to create an XMesaBuffer from an X window
+   and XMesaVisual.
+
+4. Call XMesaMakeCurrent() to bind the XMesaBuffer to an XMesaContext and
+   to make the context the current one.
+
+5. Make gl* calls to render your graphics.
+
+6. Use XMesaSwapBuffers() when double buffering to swap front/back buffers.
+
+7. Before the X window is destroyed, call XMesaDestroyBuffer().
+
+8. Before exiting, call XMesaDestroyVisual and XMesaDestroyContext.
+
+*/
+
+
+
+
+#ifndef XMESA_H
+#define XMESA_H
+
+#ifdef __VMS
+#include <GL/vms_x_fix.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef XFree86Server
+#include "xmesa_xf86.h"
+#else
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include "xmesa_x.h"
+#endif
+#include "GL/gl.h"
+
+#ifdef AMIWIN
+#include <pragmas/xlib_pragmas.h>
+extern struct Library *XLibBase;
+#endif
+
+
+#define XMESA_MAJOR_VERSION 4
+#define XMESA_MINOR_VERSION 1
+
+
+
+/*
+ * Values passed to XMesaGetString:
+ */
+#define XMESA_VERSION 1
+#define XMESA_EXTENSIONS 2
+
+
+/*
+ * Values passed to XMesaSetFXmode:
+ */
+#define XMESA_FX_WINDOW       1
+#define XMESA_FX_FULLSCREEN   2
+
+
+
+typedef struct xmesa_context *XMesaContext;
+
+typedef struct xmesa_visual *XMesaVisual;
+
+typedef struct xmesa_buffer *XMesaBuffer;
+
+
+
+/*
+ * Create a new X/Mesa visual.
+ * Input:  display - X11 display
+ *         visinfo - an XVisualInfo pointer
+ *         rgb_flag - GL_TRUE = RGB mode,
+ *                    GL_FALSE = color index mode
+ *         alpha_flag - alpha buffer requested?
+ *         db_flag - GL_TRUE = double-buffered,
+ *                   GL_FALSE = single buffered
+ *         stereo_flag - stereo visual?
+ *         ximage_flag - GL_TRUE = use an XImage for back buffer,
+ *                       GL_FALSE = use an off-screen pixmap for back buffer
+ *         depth_size - requested bits/depth values, or zero
+ *         stencil_size - requested bits/stencil values, or zero
+ *         accum_red_size - requested bits/red accum values, or zero
+ *         accum_green_size - requested bits/green accum values, or zero
+ *         accum_blue_size - requested bits/blue accum values, or zero
+ *         accum_alpha_size - requested bits/alpha accum values, or zero
+ *         num_samples - number of samples/pixel if multisampling, or zero
+ *         level - visual level, usually 0
+ *         visualCaveat - ala the GLX extension, usually GLX_NONE_EXT
+ * Return;  a new XMesaVisual or 0 if error.
+ */
+extern XMesaVisual XMesaCreateVisual( XMesaDisplay *display,
+                                      XMesaVisualInfo visinfo,
+                                      GLboolean rgb_flag,
+                                      GLboolean alpha_flag,
+                                      GLboolean db_flag,
+                                      GLboolean stereo_flag,
+                                      GLboolean ximage_flag,
+                                      GLint depth_size,
+                                      GLint stencil_size,
+                                      GLint accum_red_size,
+                                      GLint accum_green_size,
+                                      GLint accum_blue_size,
+                                      GLint accum_alpha_size,
+                                      GLint num_samples,
+                                      GLint level,
+                                      GLint visualCaveat );
+
+/*
+ * Destroy an XMesaVisual, but not the associated XVisualInfo.
+ */
+extern void XMesaDestroyVisual( XMesaVisual v );
+
+
+
+/*
+ * Create a new XMesaContext for rendering into an X11 window.
+ *
+ * Input:  visual - an XMesaVisual
+ *         share_list - another XMesaContext with which to share display
+ *                      lists or NULL if no sharing is wanted.
+ * Return:  an XMesaContext or NULL if error.
+ */
+extern XMesaContext XMesaCreateContext( XMesaVisual v,
+					XMesaContext share_list );
+
+
+/*
+ * Destroy a rendering context as returned by XMesaCreateContext()
+ */
+extern void XMesaDestroyContext( XMesaContext c );
+
+
+/*
+ * Create an XMesaBuffer from an X window.
+ */
+extern XMesaBuffer XMesaCreateWindowBuffer( XMesaVisual v, XMesaWindow w );
+
+
+/*
+ * Create an XMesaBuffer from an X pixmap.
+ */
+extern XMesaBuffer XMesaCreatePixmapBuffer( XMesaVisual v,
+					    XMesaPixmap p,
+					    XMesaColormap cmap );
+
+
+/*
+ * Destroy an XMesaBuffer, but not the corresponding window or pixmap.
+ */
+extern void XMesaDestroyBuffer( XMesaBuffer b );
+
+
+/*
+ * Return the XMesaBuffer handle which corresponds to an X drawable, if any.
+ *
+ * New in Mesa 2.3.
+ */
+extern XMesaBuffer XMesaFindBuffer( XMesaDisplay *dpy,
+				    XMesaDrawable d );
+
+
+
+/*
+ * Bind a buffer to a context and make the context the current one.
+ */
+extern GLboolean XMesaMakeCurrent( XMesaContext c,
+				   XMesaBuffer b );
+
+
+/*
+ * Bind two buffers (read and draw) to a context and make the
+ * context the current one.
+ * New in Mesa 3.3
+ */
+extern GLboolean XMesaMakeCurrent2( XMesaContext c,
+                                    XMesaBuffer drawBuffer,
+                                    XMesaBuffer readBuffer );
+
+
+/*
+ * Unbind the current context from its buffer.
+ */
+extern GLboolean XMesaUnbindContext( XMesaContext c );
+
+
+/*
+ * Return a handle to the current context.
+ */
+extern XMesaContext XMesaGetCurrentContext( void );
+
+
+/*
+ * Return handle to the current (draw) buffer.
+ */
+extern XMesaBuffer XMesaGetCurrentBuffer( void );
+
+
+/*
+ * Return handle to the current read buffer.
+ * New in Mesa 3.3
+ */
+extern XMesaBuffer XMesaGetCurrentReadBuffer( void );
+
+
+/*
+ * Swap the front and back buffers for the given buffer.  No action is
+ * taken if the buffer is not double buffered.
+ */
+extern void XMesaSwapBuffers( XMesaBuffer b );
+
+
+/*
+ * Copy a sub-region of the back buffer to the front buffer.
+ *
+ * New in Mesa 2.6
+ */
+extern void XMesaCopySubBuffer( XMesaBuffer b,
+				int x,
+				int y,
+				int width,
+				int height );
+
+
+/*
+ * Return a pointer to the the Pixmap or XImage being used as the back
+ * color buffer of an XMesaBuffer.  This function is a way to get "under
+ * the hood" of X/Mesa so one can manipulate the back buffer directly.
+ * Input:  b - the XMesaBuffer
+ * Output:  pixmap - pointer to back buffer's Pixmap, or 0
+ *          ximage - pointer to back buffer's XImage, or NULL
+ * Return:  GL_TRUE = context is double buffered
+ *          GL_FALSE = context is single buffered
+ */
+extern GLboolean XMesaGetBackBuffer( XMesaBuffer b,
+				     XMesaPixmap *pixmap,
+				     XMesaImage **ximage );
+
+
+
+/*
+ * Return the depth buffer associated with an XMesaBuffer.
+ * Input:  b - the XMesa buffer handle
+ * Output:  width, height - size of buffer in pixels
+ *          bytesPerValue - bytes per depth value (2 or 4)
+ *          buffer - pointer to depth buffer values
+ * Return:  GL_TRUE or GL_FALSE to indicate success or failure.
+ *
+ * New in Mesa 2.4.
+ */
+extern GLboolean XMesaGetDepthBuffer( XMesaBuffer b,
+				      GLint *width,
+				      GLint *height,
+				      GLint *bytesPerValue,
+				      void **buffer );
+
+
+
+/*
+ * Flush/sync a context
+ */
+extern void XMesaFlush( XMesaContext c );
+
+
+
+/*
+ * Get an X/Mesa-specific string.
+ * Input:  name - either XMESA_VERSION or XMESA_EXTENSIONS
+ */
+extern const char *XMesaGetString( XMesaContext c, int name );
+
+
+
+/*
+ * Scan for XMesaBuffers whose window/pixmap has been destroyed, then free
+ * any memory used by that buffer.
+ *
+ * New in Mesa 2.3.
+ */
+extern void XMesaGarbageCollect( void );
+
+
+
+/*
+ * Return a dithered pixel value.
+ * Input:  c - XMesaContext
+ *         x, y - window coordinate
+ *         red, green, blue, alpha - color components in [0,1]
+ * Return:  pixel value
+ *
+ * New in Mesa 2.3.
+ */
+extern unsigned long XMesaDitherColor( XMesaContext xmesa,
+				       GLint x,
+				       GLint y,
+				       GLfloat red,
+				       GLfloat green,
+				       GLfloat blue,
+				       GLfloat alpha );
+
+
+
+/*
+ * 3Dfx Glide driver only!
+ * Set 3Dfx/Glide full-screen or window rendering mode.
+ * Input:  mode - either XMESA_FX_WINDOW (window rendering mode) or
+ *                XMESA_FX_FULLSCREEN (full-screen rendering mode)
+ * Return:  GL_TRUE if success
+ *          GL_FALSE if invalid mode or if not using 3Dfx driver
+ *
+ * New in Mesa 2.6.
+ */
+extern GLboolean XMesaSetFXmode( GLint mode );
+
+
+
+/*
+ * Reallocate the back/depth/stencil/accum/etc/ buffers associated with
+ * buffer <b> if its size has changed.
+ *
+ * New in Mesa 4.0.2
+ */
+extern void XMesaResizeBuffers( XMesaBuffer b );
+
+
+
+/*
+ * Create a pbuffer.
+ * New in Mesa 4.1
+ */
+extern XMesaBuffer XMesaCreatePBuffer(XMesaVisual v, XMesaColormap cmap,
+                                      unsigned int width, unsigned int height);
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif
diff --git a/reactos/lib/mesa32/include/GL/xmesa_x.h b/reactos/lib/mesa32/include/GL/xmesa_x.h
new file mode 100644
index 00000000000..def0447195f
--- /dev/null
+++ b/reactos/lib/mesa32/include/GL/xmesa_x.h
@@ -0,0 +1,90 @@
+
+/**************************************************************************
+
+Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sub license, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ */
+
+#ifndef _XMESA_X_H_
+#define _XMESA_X_H_
+
+typedef Display      XMesaDisplay;
+typedef Pixmap       XMesaPixmap;
+typedef Colormap     XMesaColormap;
+typedef Drawable     XMesaDrawable;
+typedef Window       XMesaWindow;
+typedef GC           XMesaGC;
+typedef XVisualInfo *XMesaVisualInfo;
+typedef XImage       XMesaImage;
+typedef XPoint       XMesaPoint;
+typedef XColor       XMesaColor;
+
+#define XMesaDestroyImage      XDestroyImage
+
+#define XMesaPutPixel          XPutPixel
+#define XMesaGetPixel          XGetPixel
+
+#define XMesaSetForeground     XSetForeground
+#define XMesaSetBackground     XSetBackground
+#define XMesaSetPlaneMask      XSetPlaneMask
+#define XMesaSetFunction       XSetFunction
+#define XMesaSetDashes         XSetDashes
+#define XMesaSetLineAttributes XSetLineAttributes
+#define XMesaSetFillStyle      XSetFillStyle
+#define XMesaSetTile           XSetTile
+#define XMesaSetStipple        XSetStipple
+
+#define XMesaDrawPoint         XDrawPoint
+#define XMesaDrawPoints        XDrawPoints
+#define XMesaDrawLine          XDrawLine
+#define XMesaFillRectangle     XFillRectangle
+#define XMesaPutImage          XPutImage
+#define XMesaCopyArea          XCopyArea
+#define XMesaFillPolygon       XFillPolygon
+
+#define XMesaCreatePixmap      XCreatePixmap
+#define XMesaFreePixmap        XFreePixmap
+#define XMesaFreeGC            XFreeGC
+
+#define GET_COLORMAP_SIZE(__v)  __v->visinfo->colormap_size
+#define GET_REDMASK(__v)        __v->visinfo->red_mask
+#define GET_GREENMASK(__v)      __v->visinfo->green_mask
+#define GET_BLUEMASK(__v)       __v->visinfo->blue_mask
+#if defined(__cplusplus) || defined(c_plusplus)
+#define GET_VISUAL_CLASS(__v)   __v->visinfo->c_class
+#else
+#define GET_VISUAL_CLASS(__v)   __v->visinfo->class
+#endif
+#define GET_VISUAL_DEPTH(__v)   __v->visinfo->depth
+#define GET_BLACK_PIXEL(__v)    BlackPixel(__v->display, __v->visinfo->screen)
+#define CHECK_BYTE_ORDER(__v)   host_byte_order()==ImageByteOrder(__v->display)
+#define CHECK_FOR_HPCR(__v)     XInternAtom(__v->display, "_HP_RGB_SMOOTH_MAP_LIST", True)
+
+#endif
diff --git a/reactos/lib/mesa32/include/GL/xmesa_xf86.h b/reactos/lib/mesa32/include/GL/xmesa_xf86.h
new file mode 100644
index 00000000000..983f234ddd9
--- /dev/null
+++ b/reactos/lib/mesa32/include/GL/xmesa_xf86.h
@@ -0,0 +1,187 @@
+
+/**************************************************************************
+
+Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sub license, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kevin@precisioninsight.com>
+ *
+ */
+
+#ifndef _XMESA_XF86_H_
+#define _XMESA_XF86_H_
+
+#include "scrnintstr.h"
+#include "pixmapstr.h"
+
+typedef struct _XMesaImageRec XMesaImage;
+
+typedef ScreenRec   XMesaDisplay;
+typedef PixmapPtr   XMesaPixmap;
+typedef ColormapPtr XMesaColormap;
+typedef DrawablePtr XMesaDrawable;
+typedef WindowPtr   XMesaWindow;
+typedef GCPtr       XMesaGC;
+typedef VisualPtr   XMesaVisualInfo;
+typedef DDXPointRec XMesaPoint;
+typedef xColorItem  XMesaColor;
+
+#define XMesaSetGeneric(__d,__gc,__val,__mask) \
+do { \
+    CARD32 __v[1]; \
+    (void) __d; \
+    __v[0] = __val; \
+    dixChangeGC(NullClient, __gc, __mask, __v, NULL); \
+} while (0)
+
+#define XMesaSetGenericPtr(__d,__gc,__pval,__mask) \
+do { \
+    ChangeGCVal __v[1]; \
+    (void) __d; \
+    __v[0].ptr = __pval; \
+    dixChangeGC(NullClient, __gc, __mask, NULL, __v); \
+} while (0)
+
+#define XMesaSetDashes(__d,__gc,__do,__dl,__n) \
+do { \
+    (void) __d; \
+    SetDashes(__gc, __do, __n, (unsigned char *)__dl); \
+} while (0)
+
+#define XMesaSetLineAttributes(__d,__gc,__lw,__ls,__cs,__js) \
+do { \
+    CARD32 __v[4]; \
+    (void) __d; \
+    __v[0] = __lw; \
+    __v[1] = __ls; \
+    __v[2] = __cs; \
+    __v[3] = __js; \
+    dixChangeGC(NullClient, __gc, \
+		GCLineWidth|GCLineStyle|GCCapStyle|GCJoinStyle, \
+		__v, NULL); \
+} while (0)
+
+#define XMesaSetForeground(d,gc,v) XMesaSetGeneric(d,gc,v,GCForeground)
+#define XMesaSetBackground(d,gc,v) XMesaSetGeneric(d,gc,v,GCBackground)
+#define XMesaSetPlaneMask(d,gc,v)  XMesaSetGeneric(d,gc,v,GCPlaneMask)
+#define XMesaSetFunction(d,gc,v)   XMesaSetGeneric(d,gc,v,GCFunction)
+#define XMesaSetFillStyle(d,gc,v)  XMesaSetGeneric(d,gc,v,GCFillStyle)
+
+#define XMesaSetTile(d,gc,v)       XMesaSetGenericPtr(d,gc,v,GCTile)
+#define XMesaSetStipple(d,gc,v)    XMesaSetGenericPtr(d,gc,v,GCStipple)
+
+#define XMesaDrawPoint(__d,__b,__gc,__x,__y) \
+do { \
+    XMesaPoint __p[1]; \
+    (void) __d; \
+    __p[0].x = __x; \
+    __p[0].y = __y; \
+    ValidateGC(__b, __gc); \
+    (*gc->ops->PolyPoint)(__b, __gc, CoordModeOrigin, 1, __p); \
+} while (0)
+
+#define XMesaDrawPoints(__d,__b,__gc,__p,__n,__m) \
+do { \
+    (void) __d; \
+    ValidateGC(__b, __gc); \
+    (*gc->ops->PolyPoint)(__b, __gc, __m, __n, __p); \
+} while (0)
+
+#define XMesaDrawLine(__d,__b,__gc,__x0,__y0,__x1,__y1) \
+do { \
+    XMesaPoint __p[2]; \
+    (void) __d; \
+    ValidateGC(__b, __gc); \
+    __p[0].x = __x0; \
+    __p[0].y = __y0; \
+    __p[1].x = __x1; \
+    __p[1].y = __y1; \
+    (*__gc->ops->Polylines)(__b, __gc, CoordModeOrigin, 2, __p); \
+} while (0)
+
+#define XMesaFillRectangle(__d,__b,__gc,__x,__y,__w,__h) \
+do { \
+    xRectangle __r[1]; \
+    (void) __d; \
+    ValidateGC((DrawablePtr)__b, __gc); \
+    __r[0].x = __x; \
+    __r[0].y = __y; \
+    __r[0].width = __w; \
+    __r[0].height = __h; \
+    (*__gc->ops->PolyFillRect)((DrawablePtr)__b, __gc, 1, __r); \
+} while (0)
+
+#define XMesaPutImage(__d,__b,__gc,__i,__sx,__sy,__x,__y,__w,__h) \
+do { \
+    /* Assumes: Images are always in ZPixmap format */ \
+    (void) __d; \
+    if (__sx || __sy) /* The non-trivial case */ \
+	XMesaPutImageHelper(__d,__b,__gc,__i,__sx,__sy,__x,__y,__w,__h); \
+    ValidateGC(__b, __gc); \
+    (*__gc->ops->PutImage)(__b, __gc, ((XMesaDrawable)(__b))->depth, \
+			   __x, __y, __w, __h, 0, ZPixmap, \
+			   ((XMesaImage *)(__i))->data); \
+} while (0)
+
+#define XMesaCopyArea(__d,__sb,__db,__gc,__sx,__sy,__w,__h,__x,__y) \
+do { \
+    (void) __d; \
+    ValidateGC(__db, __gc); \
+    (*__gc->ops->CopyArea)((DrawablePtr)__sb, __db, __gc, \
+			   __sx, __sy, __w, __h, __x, __y); \
+} while (0)
+
+#define XMesaFillPolygon(__d,__b,__gc,__p,__n,__s,__m) \
+do { \
+    (void) __d; \
+    ValidateGC(__b, __gc); \
+    (*__gc->ops->FillPolygon)(__b, __gc, __s, __m, __n, __p); \
+} while (0)
+
+/* CreatePixmap returns a PixmapPtr; so, it cannot be inside braces */
+#define XMesaCreatePixmap(__d,__b,__w,__h,__depth) \
+    (*__d->CreatePixmap)(__d, __w, __h, __depth)
+#define XMesaFreePixmap(__d,__b) \
+    (*__d->DestroyPixmap)(__b)
+
+#define XMesaFreeGC(__d,__gc) \
+do { \
+    (void) __d; \
+    FreeScratchGC(__gc); \
+} while (0)
+
+#define GET_COLORMAP_SIZE(__v)  __v->visinfo->ColormapEntries
+#define GET_REDMASK(__v)        __v->visinfo->redMask
+#define GET_GREENMASK(__v)      __v->visinfo->greenMask
+#define GET_BLUEMASK(__v)       __v->visinfo->blueMask
+#define GET_VISUAL_CLASS(__v)   __v->visinfo->class
+#define GET_VISUAL_DEPTH(__v)   __v->visinfo->nplanes
+#define GET_BLACK_PIXEL(__v)    __v->display->blackPixel
+#define CHECK_BYTE_ORDER(__v)   GL_TRUE
+#define CHECK_FOR_HPCR(__v)     GL_FALSE
+
+#endif
diff --git a/reactos/lib/mesa32/mesa32.def b/reactos/lib/mesa32/mesa32.def
new file mode 100644
index 00000000000..130594c5311
--- /dev/null
+++ b/reactos/lib/mesa32/mesa32.def
@@ -0,0 +1,138 @@
+; DO NOT EDIT - This file generated automatically by mesadef.py script
+DESCRIPTION 'Mesa (OpenGL work-alike) for Win32'
+VERSION 6.0
+;
+; Module definition file for Mesa (OPENGL32.DLL)
+;
+; Note: The OpenGL functions use the STDCALL
+; function calling convention.  Microsoft's
+; OPENGL32 uses this convention and so must the
+; Mesa OPENGL32 so that the Mesa DLL can be used
+; as a drop-in replacement.
+;
+; The linker exports STDCALL entry points with
+; 'decorated' names; e.g., _glBegin@0, where the
+; trailing number is the number of bytes of 
+; parameter data pushed onto the stack.  The
+; callee is responsible for popping this data
+; off the stack, usually via a RETF n instruction.
+;
+; However, the Microsoft OPENGL32.DLL does not export
+; the decorated names, even though the calling convention
+; is STDCALL.  So, this module definition file is
+; needed to force the Mesa OPENGL32.DLL to export the
+; symbols in the same manner as the Microsoft DLL.
+; Were it not for this problem, this file would not
+; be needed (for the gl* functions) since the entry
+; points are compiled with dllexport declspec.
+;
+; However, this file is still needed to export "internal"
+; Mesa symbols for the benefit of the OSMESA32.DLL.
+;
+EXPORTS
+;
+; ICD API
+	DrvCopyContext
+	DrvCreateContext
+	DrvCreateLayerContext
+	DrvDeleteContext
+	DrvDescribeLayerPlane
+	DrvDescribePixelFormat
+	DrvGetLayerPaletteEntries
+	DrvGetProcAddress
+	DrvReleaseContext
+	DrvRealizeLayerPalette
+	DrvSetContext
+	DrvSetLayerPaletteEntries
+	DrvSetPixelFormat
+	DrvShareLists
+	DrvSwapBuffers
+	DrvSwapLayerBuffers
+	DrvValidateVersion
+
+;
+; Mesa internals - mostly for OSMESA
+	_ac_CreateContext
+	_ac_DestroyContext
+	_ac_InvalidateState
+	_glapi_get_context
+	_glapi_get_proc_address
+	_mesa_base_compressed_texformat
+	_mesa_buffer_data
+	_mesa_buffer_map
+	_mesa_buffer_subdata
+	_mesa_bzero
+	_mesa_calloc
+	_mesa_choose_tex_format
+	_mesa_compressed_texture_size
+	_mesa_create_framebuffer
+	_mesa_create_visual
+	_mesa_delete_buffer_object
+	_mesa_delete_texture_object
+	_mesa_destroy_framebuffer
+	_mesa_destroy_visual
+	_mesa_enable_1_3_extensions
+	_mesa_enable_1_4_extensions
+	_mesa_enable_1_5_extensions
+	_mesa_enable_sw_extensions
+	_mesa_error
+	_mesa_free
+	_mesa_free_context_data
+	_mesa_get_current_context
+	_mesa_init_default_imports
+	_mesa_initialize_context
+	_mesa_make_current
+	_mesa_memcpy
+	_mesa_memset
+	_mesa_new_buffer_object
+	_mesa_new_texture_object
+	_mesa_problem
+	_mesa_ResizeBuffersMESA
+	_mesa_store_compressed_teximage1d
+	_mesa_store_compressed_teximage2d
+	_mesa_store_compressed_teximage3d
+	_mesa_store_compressed_texsubimage1d
+	_mesa_store_compressed_texsubimage2d
+	_mesa_store_compressed_texsubimage3d
+	_mesa_store_teximage1d
+	_mesa_store_teximage2d
+	_mesa_store_teximage3d
+	_mesa_store_texsubimage1d
+	_mesa_store_texsubimage2d
+	_mesa_store_texsubimage3d
+	_mesa_strcmp
+	_mesa_test_proxy_teximage
+	_mesa_Viewport
+	_swrast_Accum
+	_swrast_alloc_buffers
+	_swrast_Bitmap
+	_swrast_CopyPixels
+	_swrast_DrawBuffer
+	_swrast_DrawPixels
+	_swrast_GetDeviceDriverReference
+	_swrast_Clear
+	_swrast_choose_line
+	_swrast_choose_triangle
+	_swrast_CopyColorSubTable
+	_swrast_CopyColorTable
+	_swrast_CopyConvolutionFilter1D
+	_swrast_CopyConvolutionFilter2D
+	_swrast_copy_teximage1d
+	_swrast_copy_teximage2d
+	_swrast_copy_texsubimage1d
+	_swrast_copy_texsubimage2d
+	_swrast_copy_texsubimage3d
+	_swrast_CreateContext
+	_swrast_DestroyContext
+	_swrast_InvalidateState
+	_swrast_ReadPixels
+	_swrast_zbuffer_address
+	_swsetup_Wakeup
+	_swsetup_CreateContext
+	_swsetup_DestroyContext
+	_swsetup_InvalidateState
+	_tnl_CreateContext
+	_tnl_DestroyContext
+	_tnl_InvalidateState
+	_tnl_MakeCurrent
+	_tnl_run_pipeline
diff --git a/reactos/lib/mesa32/mesa32.edf b/reactos/lib/mesa32/mesa32.edf
new file mode 100644
index 00000000000..4a70e0597a6
--- /dev/null
+++ b/reactos/lib/mesa32/mesa32.edf
@@ -0,0 +1,107 @@
+EXPORTS
+;
+; ICD API
+	DrvCopyContext=DrvCopyContext@12
+	DrvCreateContext=DrvCreateContext@4
+	DrvCreateLayerContext=DrvCreateLayerContext@8
+	DrvDeleteContext=DrvDeleteContext@4
+	DrvDescribeLayerPlane=DrvDescribeLayerPlane@20
+	DrvDescribePixelFormat=DrvDescribePixelFormat@16
+	DrvGetLayerPaletteEntries=DrvGetLayerPaletteEntries@20
+	DrvGetProcAddress=DrvGetProcAddress@4
+	DrvReleaseContext=DrvReleaseContext@4
+	DrvRealizeLayerPalette=DrvRealizeLayerPalette@12
+	DrvSetContext=DrvSetContext@12
+	DrvSetLayerPaletteEntries=DrvSetLayerPaletteEntries@20
+	DrvSetPixelFormat=DrvSetPixelFormat@8
+	DrvShareLists=DrvShareLists@8
+	DrvSwapBuffers=DrvSwapBuffers@4
+	DrvSwapLayerBuffers=DrvSwapLayerBuffers@8
+	DrvValidateVersion=DrvValidateVersion@4
+
+;
+; Mesa internals - mostly for OSMESA
+	_ac_CreateContext=_ac_CreateContext@4
+	_ac_DestroyContext=_ac_DestroyContext@4
+	_ac_InvalidateState=_ac_InvalidateState@8
+	_glapi_get_context=_glapi_get_context@0
+	_glapi_get_proc_address=_glapi_get_proc_address@4
+	_mesa_base_compressed_texformat=_mesa_base_compressed_texformat@8
+	_mesa_buffer_data=_mesa_buffer_data@24
+	_mesa_buffer_map=_mesa_buffer_map@16
+	_mesa_buffer_subdata=_mesa_buffer_subdata@24
+	_mesa_bzero=_mesa_bzero@8
+	_mesa_calloc=_mesa_calloc@4
+	_mesa_choose_tex_format=_mesa_choose_tex_format@16
+	_mesa_compressed_texture_size=_mesa_compressed_texture_size@20
+	_mesa_create_framebuffer=_mesa_create_framebuffer@20
+	_mesa_create_visual=_mesa_create_visual@60
+	_mesa_delete_buffer_object=_mesa_delete_buffer_object@8
+	_mesa_delete_texture_object=_mesa_delete_texture_object@8
+	_mesa_destroy_framebuffer=_mesa_destroy_framebuffer@4
+	_mesa_destroy_visual=_mesa_destroy_visual@4
+	_mesa_enable_1_3_extensions=_mesa_enable_1_3_extensions@4
+	_mesa_enable_1_4_extensions=_mesa_enable_1_4_extensions@4
+	_mesa_enable_1_5_extensions=_mesa_enable_1_5_extensions@4
+	_mesa_enable_sw_extensions=_mesa_enable_sw_extensions@4
+	_mesa_error=_mesa_error@12
+	_mesa_free=_mesa_free@4
+	_mesa_free_context_data=_mesa_free_context_data@4
+	_mesa_get_current_context=_mesa_get_current_context@0
+	_mesa_init_default_imports=_mesa_init_default_imports@8
+	_mesa_initialize_context=_mesa_initialize_context@20
+	_mesa_make_current=_mesa_make_current@8
+	_mesa_memcpy=_mesa_memcpy@12
+	_mesa_memset=_mesa_memset@12
+	_mesa_new_buffer_object=_mesa_new_buffer_object@12
+	_mesa_new_texture_object=_mesa_new_texture_object@12
+	_mesa_problem=_mesa_problem@8
+	_mesa_ResizeBuffersMESA=_mesa_ResizeBuffersMESA@0
+	_mesa_store_compressed_teximage1d=_mesa_store_compressed_teximage1d@40
+	_mesa_store_compressed_teximage2d=_mesa_store_compressed_teximage2d@44
+	_mesa_store_compressed_teximage3d=_mesa_store_compressed_teximage3d@48
+	_mesa_store_compressed_texsubimage1d=_mesa_store_compressed_texsubimage1d@40
+	_mesa_store_compressed_texsubimage2d=_mesa_store_compressed_texsubimage2d@44
+	_mesa_store_compressed_texsubimage3d=_mesa_store_compressed_texsubimage3d@48
+	_mesa_store_teximage1d=_mesa_store_teximage1d@48
+	_mesa_store_teximage2d=_mesa_store_teximage2d@52
+	_mesa_store_teximage3d=_mesa_store_teximage3d@56
+	_mesa_store_texsubimage1d=_mesa_store_texsubimage1d@48
+	_mesa_store_texsubimage2d=_mesa_store_texsubimage2d@52
+	_mesa_store_texsubimage3d=_mesa_store_texsubimage3d@56
+	_mesa_strcmp=_mesa_strcmp@8
+	_mesa_test_proxy_teximage=_mesa_test_proxy_teximage@40
+	_mesa_Viewport=_mesa_Viewport@16
+	_swrast_Accum=_swrast_Accum@28
+	_swrast_alloc_buffers=_swrast_alloc_buffers@4
+	_swrast_Bitmap=_swrast_Bitmap@28
+	_swrast_CopyPixels=_swrast_CopyPixels@32
+	_swrast_DrawBuffer=_swrast_DrawBuffer@8
+	_swrast_DrawPixels=_swrast_DrawPixels@36
+	_swrast_GetDeviceDriverReference=_swrast_GetDeviceDriverReference@4
+	_swrast_Clear=_swrast_Clear@28
+	_swrast_choose_line=_swrast_choose_line@4
+	_swrast_choose_triangle=_swrast_choose_triangle@4
+	_swrast_CopyColorSubTable=_swrast_CopyColorSubTable@24
+	_swrast_CopyColorTable=_swrast_CopyColorTable@24
+	_swrast_CopyConvolutionFilter1D=_swrast_CopyConvolutionFilter1D@24
+	_swrast_CopyConvolutionFilter2D=_swrast_CopyConvolutionFilter2D@28
+	_swrast_copy_teximage1d=_swrast_copy_teximage1d@32
+	_swrast_copy_teximage2d=_swrast_copy_teximage2d@36
+	_swrast_copy_texsubimage1d=_swrast_copy_texsubimage1d@28
+	_swrast_copy_texsubimage2d=_swrast_copy_texsubimage2d@36
+	_swrast_copy_texsubimage3d=_swrast_copy_texsubimage3d@40
+	_swrast_CreateContext=_swrast_CreateContext@4
+	_swrast_DestroyContext=_swrast_DestroyContext@4
+	_swrast_InvalidateState=_swrast_InvalidateState@8
+	_swrast_ReadPixels=_swrast_ReadPixels@36
+	_swrast_zbuffer_address=_swrast_zbuffer_address@12
+	_swsetup_Wakeup=_swsetup_Wakeup@4
+	_swsetup_CreateContext=_swsetup_CreateContext@4
+	_swsetup_DestroyContext=_swsetup_DestroyContext@4
+	_swsetup_InvalidateState=_swsetup_InvalidateState@8
+	_tnl_CreateContext=_tnl_CreateContext@4
+	_tnl_DestroyContext=_tnl_DestroyContext@4
+	_tnl_InvalidateState=_tnl_InvalidateState@8
+	_tnl_MakeCurrent=_tnl_MakeCurrent@12
+	_tnl_run_pipeline=_tnl_run_pipeline@4

From 6fc4d22bdeb499191580306191d561b3018f2aea Mon Sep 17 00:00:00 2001
From: Gregor Anich <blight@blight.eu.org>
Date: Fri, 16 Jul 2004 22:12:43 +0000
Subject: [PATCH 315/356] Import Mesa-6.0.1 for use as software OpenGL
 renderer.

svn path=/trunk/; revision=10149
---
 .../lib/mesa32/src/array_cache/ac_context.c   |   375 +
 .../lib/mesa32/src/array_cache/ac_context.h   |    99 +
 .../lib/mesa32/src/array_cache/ac_import.c    |   881 +
 reactos/lib/mesa32/src/array_cache/acache.h   |   132 +
 .../mesa32/src/array_cache/array_cache.dsp    |   108 +
 .../lib/mesa32/src/drivers/beos/GLView.cpp    |  1427 ++
 reactos/lib/mesa32/src/drivers/beos/GLView.h  |   196 +
 reactos/lib/mesa32/src/drivers/common/t_dd.c  |    58 +
 .../mesa32/src/drivers/common/t_dd_dmatmp.h   |  1093 +
 .../mesa32/src/drivers/common/t_dd_dmatmp2.h  |   935 +
 .../src/drivers/common/t_dd_rendertmp.h       |   434 +
 .../mesa32/src/drivers/common/t_dd_triemit.h  |   157 +
 .../mesa32/src/drivers/common/t_dd_tritmp.h   |   743 +
 .../mesa32/src/drivers/common/t_dd_unfilled.h |   212 +
 .../lib/mesa32/src/drivers/common/t_dd_vb.c   |   344 +
 .../mesa32/src/drivers/common/t_dd_vbtmp.h    |   679 +
 .../mesa32/src/drivers/common/t_dd_vertex.h   |    78 +
 reactos/lib/mesa32/src/drivers/dos/blit.S     |   210 +
 reactos/lib/mesa32/src/drivers/dos/dmesa.c    |  1418 ++
 reactos/lib/mesa32/src/drivers/dos/dpmi.c     |   148 +
 reactos/lib/mesa32/src/drivers/dos/internal.h |   130 +
 reactos/lib/mesa32/src/drivers/dos/vesa.c     |   534 +
 reactos/lib/mesa32/src/drivers/dos/vesa.h     |    47 +
 reactos/lib/mesa32/src/drivers/dos/vga.c      |   236 +
 reactos/lib/mesa32/src/drivers/dos/vga.h      |    42 +
 reactos/lib/mesa32/src/drivers/dos/video.c    |   651 +
 reactos/lib/mesa32/src/drivers/dos/video.h    |    65 +
 reactos/lib/mesa32/src/drivers/dos/virtual.S  |   495 +
 .../mesa32/src/drivers/dri/common/depthtmp.h  |   176 +
 .../lib/mesa32/src/drivers/dri/common/mm.c    |   196 +
 .../lib/mesa32/src/drivers/dri/common/mm.h    |    82 +
 .../lib/mesa32/src/drivers/dri/common/mmx.h   |   560 +
 .../mesa32/src/drivers/dri/common/spantmp.h   |   259 +
 .../src/drivers/dri/common/stenciltmp.h       |   147 +
 .../mesa32/src/drivers/dri/common/texmem.c    |  1230 +
 .../mesa32/src/drivers/dri/common/texmem.h    |   295 +
 .../lib/mesa32/src/drivers/dri/common/utils.c |   219 +
 .../lib/mesa32/src/drivers/dri/common/utils.h |    58 +
 .../mesa32/src/drivers/dri/common/vblank.c    |   363 +
 .../mesa32/src/drivers/dri/common/vblank.h    |    64 +
 .../mesa32/src/drivers/dri/common/xmlconfig.c |   993 +
 .../mesa32/src/drivers/dri/common/xmlconfig.h |   124 +
 .../mesa32/src/drivers/dri/common/xmlpool.h   |   270 +
 .../lib/mesa32/src/drivers/fbdev/glfbdev.c    |   828 +
 .../src/drivers/ggi/default/genkgi.conf.in    |     4 +
 .../src/drivers/ggi/default/genkgi_mode.c     |    97 +
 .../src/drivers/ggi/default/genkgi_visual.c   |   190 +
 .../mesa32/src/drivers/ggi/default/linear.c   |   409 +
 .../src/drivers/ggi/default/linear_15.c       |    36 +
 .../src/drivers/ggi/default/linear_16.c       |    36 +
 .../src/drivers/ggi/default/linear_24.c       |    36 +
 .../src/drivers/ggi/default/linear_32.c       |    36 +
 .../mesa32/src/drivers/ggi/default/linear_8.c |    36 +
 .../mesa32/src/drivers/ggi/default/stubs.c    |   512 +
 .../src/drivers/ggi/display/fbdev.conf.in     |     4 +
 .../src/drivers/ggi/display/fbdev_mode.c      |   134 +
 .../src/drivers/ggi/display/fbdev_visual.c    |   150 +
 .../src/drivers/ggi/include/ggi/mesa/debug.h  |   260 +
 .../ggi/include/ggi/mesa/display_fbdev.h      |    20 +
 .../drivers/ggi/include/ggi/mesa/ggimesa.h    |    84 +
 .../ggi/include/ggi/mesa/ggimesa_int.h        |    45 +
 reactos/lib/mesa32/src/drivers/glide/fxapi.c  |   932 +
 reactos/lib/mesa32/src/drivers/glide/fxdd.c   |  1759 ++
 .../lib/mesa32/src/drivers/glide/fxddspan.c   |   663 +
 .../lib/mesa32/src/drivers/glide/fxddtex.c    |  1684 ++
 reactos/lib/mesa32/src/drivers/glide/fxdrv.h  |   721 +
 reactos/lib/mesa32/src/drivers/glide/fxg.c    |  2294 ++
 reactos/lib/mesa32/src/drivers/glide/fxg.h    |   381 +
 .../lib/mesa32/src/drivers/glide/fxglidew.c   |   263 +
 .../lib/mesa32/src/drivers/glide/fxglidew.h   |   197 +
 .../lib/mesa32/src/drivers/glide/fxopengl.def |   938 +
 .../lib/mesa32/src/drivers/glide/fxsetup.c    |  2179 ++
 .../lib/mesa32/src/drivers/glide/fxsetup.h    |  1250 +
 .../lib/mesa32/src/drivers/glide/fxtexman.c   |   884 +
 reactos/lib/mesa32/src/drivers/glide/fxtris.c |  1466 ++
 reactos/lib/mesa32/src/drivers/glide/fxvb.c   |   593 +
 .../lib/mesa32/src/drivers/glide/fxvbtmp.h    |   317 +
 reactos/lib/mesa32/src/drivers/glide/fxwgl.c  |  1017 +
 .../mesa32/src/drivers/osmesa/Makefile.win    |    39 +
 .../lib/mesa32/src/drivers/osmesa/osmesa.c    |  1337 ++
 .../lib/mesa32/src/drivers/osmesa/osmesa.def  |    13 +
 .../lib/mesa32/src/drivers/osmesa/osmesa.dsp  |   119 +
 .../lib/mesa32/src/drivers/svga/svgamesa.c    |   513 +
 .../lib/mesa32/src/drivers/svga/svgamesa15.c  |   217 +
 .../lib/mesa32/src/drivers/svga/svgamesa15.h  |    43 +
 .../lib/mesa32/src/drivers/svga/svgamesa16.c  |   215 +
 .../lib/mesa32/src/drivers/svga/svgamesa16.h  |    44 +
 .../lib/mesa32/src/drivers/svga/svgamesa24.c  |   239 +
 .../lib/mesa32/src/drivers/svga/svgamesa24.h  |    44 +
 .../lib/mesa32/src/drivers/svga/svgamesa32.c  |   220 +
 .../lib/mesa32/src/drivers/svga/svgamesa32.h  |    44 +
 .../lib/mesa32/src/drivers/svga/svgamesa8.c   |   191 +
 .../lib/mesa32/src/drivers/svga/svgamesa8.h   |    44 +
 reactos/lib/mesa32/src/drivers/svga/svgapix.h |    71 +
 .../mesa32/src/drivers/windows/gdi/colors.h   |   539 +
 .../mesa32/src/drivers/windows/gdi/gdi.dsp    |   129 +
 .../mesa32/src/drivers/windows/gdi/mesa.def   |  1057 +
 .../lib/mesa32/src/drivers/windows/gdi/wgl.c  |   623 +
 .../mesa32/src/drivers/windows/gdi/wmesa.c    |  3328 +++
 .../mesa32/src/drivers/windows/gdi/wmesadef.h |   174 +
 .../mesa32/src/drivers/windows/icd/colors.h   |   539 +
 .../lib/mesa32/src/drivers/windows/icd/icd.c  |   332 +
 .../mesa32/src/drivers/windows/icd/icdlist.h  |   336 +
 .../mesa32/src/drivers/windows/icd/mesa.def   |   138 +
 .../mesa32/src/drivers/windows/icd/wmesadef.h |   173 +
 reactos/lib/mesa32/src/drivers/x11/fakeglx.c  |  2868 +++
 reactos/lib/mesa32/src/drivers/x11/glxapi.c   |  1343 ++
 reactos/lib/mesa32/src/drivers/x11/glxapi.h   |   236 +
 .../lib/mesa32/src/drivers/x11/glxheader.h    |    71 +
 reactos/lib/mesa32/src/drivers/x11/realglx.c  |   185 +
 reactos/lib/mesa32/src/drivers/x11/realglx.h  |   326 +
 reactos/lib/mesa32/src/drivers/x11/xfonts.c   |   377 +
 reactos/lib/mesa32/src/drivers/x11/xfonts.h   |    41 +
 reactos/lib/mesa32/src/drivers/x11/xm_api.c   |  2626 +++
 reactos/lib/mesa32/src/drivers/x11/xm_dd.c    |  1231 +
 reactos/lib/mesa32/src/drivers/x11/xm_line.c  |   574 +
 reactos/lib/mesa32/src/drivers/x11/xm_span.c  |  4485 ++++
 reactos/lib/mesa32/src/drivers/x11/xm_tri.c   |  1495 ++
 reactos/lib/mesa32/src/drivers/x11/xmesaP.h   |   551 +
 reactos/lib/mesa32/src/glapi/glapi.c          |   923 +
 reactos/lib/mesa32/src/glapi/glapi.dsp        |   124 +
 reactos/lib/mesa32/src/glapi/glapi.h          |   109 +
 reactos/lib/mesa32/src/glapi/glapioffsets.h   |   716 +
 reactos/lib/mesa32/src/glapi/glapitable.h     |   723 +
 reactos/lib/mesa32/src/glapi/glapitemp.h      |  5823 +++++
 reactos/lib/mesa32/src/glapi/glprocs.h        |   923 +
 reactos/lib/mesa32/src/glapi/glthread.c       |   367 +
 reactos/lib/mesa32/src/glapi/glthread.h       |   295 +
 reactos/lib/mesa32/src/main/accum.c           |    97 +
 reactos/lib/mesa32/src/main/accum.h           |    62 +
 reactos/lib/mesa32/src/main/api_arrayelt.c    |   830 +
 reactos/lib/mesa32/src/main/api_arrayelt.h    |    37 +
 reactos/lib/mesa32/src/main/api_eval.h        |    42 +
 reactos/lib/mesa32/src/main/api_loopback.c    |  1563 ++
 reactos/lib/mesa32/src/main/api_loopback.h    |    37 +
 reactos/lib/mesa32/src/main/api_noop.c        |   863 +
 reactos/lib/mesa32/src/main/api_noop.h        |   180 +
 reactos/lib/mesa32/src/main/api_validate.c    |   239 +
 reactos/lib/mesa32/src/main/api_validate.h    |    49 +
 reactos/lib/mesa32/src/main/arbfragparse.c    |   238 +
 reactos/lib/mesa32/src/main/arbfragparse.h    |    35 +
 reactos/lib/mesa32/src/main/arbparse.c        |  6058 +++++
 reactos/lib/mesa32/src/main/arbparse.h        |    83 +
 reactos/lib/mesa32/src/main/arbparse_syn.h    |  1267 +
 reactos/lib/mesa32/src/main/arbprogram.c      |   712 +
 reactos/lib/mesa32/src/main/arbprogram.h      |   128 +
 reactos/lib/mesa32/src/main/arbvertparse.c    |   223 +
 reactos/lib/mesa32/src/main/arbvertparse.h    |    33 +
 reactos/lib/mesa32/src/main/attrib.c          |  1244 +
 reactos/lib/mesa32/src/main/attrib.h          |    68 +
 reactos/lib/mesa32/src/main/blend.c           |   590 +
 reactos/lib/mesa32/src/main/blend.h           |    74 +
 reactos/lib/mesa32/src/main/bufferobj.c       |   804 +
 reactos/lib/mesa32/src/main/bufferobj.h       |   116 +
 reactos/lib/mesa32/src/main/buffers.c         |   620 +
 reactos/lib/mesa32/src/main/buffers.h         |    70 +
 reactos/lib/mesa32/src/main/clip.c            |   119 +
 reactos/lib/mesa32/src/main/clip.h            |    42 +
 reactos/lib/mesa32/src/main/colormac.h        |   239 +
 reactos/lib/mesa32/src/main/colortab.c        |  1381 ++
 reactos/lib/mesa32/src/main/colortab.h        |   110 +
 reactos/lib/mesa32/src/main/config.h          |   269 +
 reactos/lib/mesa32/src/main/context.c         |  1945 ++
 reactos/lib/mesa32/src/main/context.h         |   395 +
 reactos/lib/mesa32/src/main/convolve.c        |  1412 ++
 reactos/lib/mesa32/src/main/convolve.h        |   114 +
 reactos/lib/mesa32/src/main/dd.h              |  1011 +
 reactos/lib/mesa32/src/main/debug.c           |   251 +
 reactos/lib/mesa32/src/main/debug.h           |    64 +
 reactos/lib/mesa32/src/main/depth.c           |   186 +
 reactos/lib/mesa32/src/main/depth.h           |    62 +
 reactos/lib/mesa32/src/main/dispatch.c        |    90 +
 reactos/lib/mesa32/src/main/dlist.c           |  7815 +++++++
 reactos/lib/mesa32/src/main/dlist.h           |   104 +
 reactos/lib/mesa32/src/main/drawpix.c         |   308 +
 reactos/lib/mesa32/src/main/drawpix.h         |    55 +
 reactos/lib/mesa32/src/main/enable.c          |  1441 ++
 reactos/lib/mesa32/src/main/enable.h          |    57 +
 reactos/lib/mesa32/src/main/enums.c           |   973 +
 reactos/lib/mesa32/src/main/enums.h           |    55 +
 reactos/lib/mesa32/src/main/eval.c            |   962 +
 reactos/lib/mesa32/src/main/eval.h            |   128 +
 reactos/lib/mesa32/src/main/extensions.c      |   450 +
 reactos/lib/mesa32/src/main/extensions.h      |    82 +
 reactos/lib/mesa32/src/main/feedback.c        |   529 +
 reactos/lib/mesa32/src/main/feedback.h        |    82 +
 reactos/lib/mesa32/src/main/fog.c             |   177 +
 reactos/lib/mesa32/src/main/fog.h             |    66 +
 reactos/lib/mesa32/src/main/get.c             |  6488 ++++++
 reactos/lib/mesa32/src/main/get.h             |    59 +
 reactos/lib/mesa32/src/main/glheader.h        |   300 +
 reactos/lib/mesa32/src/main/hash.c            |   360 +
 reactos/lib/mesa32/src/main/hash.h            |    62 +
 reactos/lib/mesa32/src/main/hint.c            |   140 +
 reactos/lib/mesa32/src/main/hint.h            |    57 +
 reactos/lib/mesa32/src/main/histogram.c       |  1136 +
 reactos/lib/mesa32/src/main/histogram.h       |    89 +
 reactos/lib/mesa32/src/main/image.c           |  4136 ++++
 reactos/lib/mesa32/src/main/image.h           |   178 +
 reactos/lib/mesa32/src/main/imports.c         |  1190 +
 reactos/lib/mesa32/src/main/imports.h         |   776 +
 reactos/lib/mesa32/src/main/light.c           |  1323 ++
 reactos/lib/mesa32/src/main/light.h           |   141 +
 reactos/lib/mesa32/src/main/lines.c           |   134 +
 reactos/lib/mesa32/src/main/lines.h           |    48 +
 reactos/lib/mesa32/src/main/macros.h          |   658 +
 reactos/lib/mesa32/src/main/main.dsp          |   612 +
 reactos/lib/mesa32/src/main/matrix.c          |   938 +
 reactos/lib/mesa32/src/main/matrix.h          |   131 +
 reactos/lib/mesa32/src/main/mtypes.h          |  2320 ++
 reactos/lib/mesa32/src/main/nvfragparse.c     |  1767 ++
 reactos/lib/mesa32/src/main/nvfragparse.h     |    52 +
 reactos/lib/mesa32/src/main/nvfragprog.h      |   190 +
 reactos/lib/mesa32/src/main/nvprogram.c       |   871 +
 reactos/lib/mesa32/src/main/nvprogram.h       |   119 +
 reactos/lib/mesa32/src/main/nvvertexec.c      |   839 +
 reactos/lib/mesa32/src/main/nvvertexec.h      |    43 +
 reactos/lib/mesa32/src/main/nvvertparse.c     |  1496 ++
 reactos/lib/mesa32/src/main/nvvertparse.h     |    50 +
 reactos/lib/mesa32/src/main/nvvertprog.h      |   107 +
 reactos/lib/mesa32/src/main/occlude.c         |   329 +
 reactos/lib/mesa32/src/main/occlude.h         |    58 +
 reactos/lib/mesa32/src/main/pixel.c           |  1529 ++
 reactos/lib/mesa32/src/main/pixel.h           |   149 +
 reactos/lib/mesa32/src/main/points.c          |   272 +
 reactos/lib/mesa32/src/main/points.h          |    57 +
 reactos/lib/mesa32/src/main/polygon.c         |   304 +
 reactos/lib/mesa32/src/main/polygon.h         |    65 +
 reactos/lib/mesa32/src/main/program.c         |  1244 +
 reactos/lib/mesa32/src/main/program.h         |   236 +
 reactos/lib/mesa32/src/main/rastpos.c         |   905 +
 reactos/lib/mesa32/src/main/rastpos.h         |   193 +
 reactos/lib/mesa32/src/main/simple_list.h     |   197 +
 reactos/lib/mesa32/src/main/state.c           |   935 +
 reactos/lib/mesa32/src/main/state.h           |    46 +
 reactos/lib/mesa32/src/main/stencil.c         |   296 +
 reactos/lib/mesa32/src/main/stencil.h         |    61 +
 reactos/lib/mesa32/src/main/texcompress.c     |   274 +
 reactos/lib/mesa32/src/main/texcompress.h     |    64 +
 reactos/lib/mesa32/src/main/texformat.c       |   978 +
 reactos/lib/mesa32/src/main/texformat.h       |   180 +
 reactos/lib/mesa32/src/main/texformat_tmp.h   |   529 +
 reactos/lib/mesa32/src/main/teximage.c        |  3204 +++
 reactos/lib/mesa32/src/main/teximage.h        |   227 +
 reactos/lib/mesa32/src/main/texobj.c          |  1020 +
 reactos/lib/mesa32/src/main/texobj.h          |   101 +
 reactos/lib/mesa32/src/main/texstate.c        |  2996 +++
 reactos/lib/mesa32/src/main/texstate.h        |   192 +
 reactos/lib/mesa32/src/main/texstore.c        |  2083 ++
 reactos/lib/mesa32/src/main/texstore.h        |   173 +
 reactos/lib/mesa32/src/main/texutil.c         |  1035 +
 reactos/lib/mesa32/src/main/texutil.h         |    72 +
 reactos/lib/mesa32/src/main/texutil_tmp.h     |   526 +
 reactos/lib/mesa32/src/main/varray.c          |   989 +
 reactos/lib/mesa32/src/main/varray.h          |   160 +
 reactos/lib/mesa32/src/main/version.h         |    52 +
 reactos/lib/mesa32/src/main/vsnprintf.c       |   165 +
 reactos/lib/mesa32/src/main/vtxfmt.c          |   174 +
 reactos/lib/mesa32/src/main/vtxfmt.h          |    43 +
 reactos/lib/mesa32/src/main/vtxfmt_tmp.h      |   478 +
 reactos/lib/mesa32/src/math/m_clip_tmp.h      |   243 +
 reactos/lib/mesa32/src/math/m_copy_tmp.h      |    86 +
 reactos/lib/mesa32/src/math/m_debug.h         |    42 +
 reactos/lib/mesa32/src/math/m_debug_clip.c    |   366 +
 reactos/lib/mesa32/src/math/m_debug_norm.c    |   379 +
 reactos/lib/mesa32/src/math/m_debug_util.h    |   281 +
 reactos/lib/mesa32/src/math/m_debug_xform.c   |   334 +
 reactos/lib/mesa32/src/math/m_dotprod_tmp.h   |   102 +
 reactos/lib/mesa32/src/math/m_eval.c          |   461 +
 reactos/lib/mesa32/src/math/m_eval.h          |   103 +
 reactos/lib/mesa32/src/math/m_matrix.c        |  1486 ++
 reactos/lib/mesa32/src/math/m_matrix.h        |   248 +
 reactos/lib/mesa32/src/math/m_norm_tmp.h      |   390 +
 reactos/lib/mesa32/src/math/m_trans_tmp.h     |   287 +
 reactos/lib/mesa32/src/math/m_translate.c     |   718 +
 reactos/lib/mesa32/src/math/m_translate.h     |   106 +
 reactos/lib/mesa32/src/math/m_vector.c        |   190 +
 reactos/lib/mesa32/src/math/m_vector.h        |    95 +
 reactos/lib/mesa32/src/math/m_xform.c         |   219 +
 reactos/lib/mesa32/src/math/m_xform.h         |   216 +
 reactos/lib/mesa32/src/math/m_xform_tmp.h     |   806 +
 reactos/lib/mesa32/src/math/math.dsp          |   180 +
 reactos/lib/mesa32/src/math/mathmod.h         |    41 +
 reactos/lib/mesa32/src/sparc/clip.S           |   236 +
 reactos/lib/mesa32/src/sparc/glapi_sparc.S    | 19243 ++++++++++++++++
 reactos/lib/mesa32/src/sparc/norm.S           |   603 +
 reactos/lib/mesa32/src/sparc/sparc.c          |   187 +
 reactos/lib/mesa32/src/sparc/sparc.h          |    38 +
 reactos/lib/mesa32/src/sparc/sparc_matrix.h   |   170 +
 reactos/lib/mesa32/src/sparc/xform.S          |  1387 ++
 reactos/lib/mesa32/src/swrast/s_aaline.c      |   554 +
 reactos/lib/mesa32/src/swrast/s_aaline.h      |    39 +
 reactos/lib/mesa32/src/swrast/s_aalinetemp.h  |   317 +
 reactos/lib/mesa32/src/swrast/s_aatriangle.c  |   495 +
 reactos/lib/mesa32/src/swrast/s_aatriangle.h  |    39 +
 reactos/lib/mesa32/src/swrast/s_aatritemp.h   |   554 +
 reactos/lib/mesa32/src/swrast/s_accum.c       |   527 +
 reactos/lib/mesa32/src/swrast/s_accum.h       |    43 +
 reactos/lib/mesa32/src/swrast/s_alpha.c       |   224 +
 reactos/lib/mesa32/src/swrast/s_alpha.h       |    39 +
 reactos/lib/mesa32/src/swrast/s_alphabuf.c    |   337 +
 reactos/lib/mesa32/src/swrast/s_alphabuf.h    |    80 +
 reactos/lib/mesa32/src/swrast/s_bitmap.c      |   256 +
 reactos/lib/mesa32/src/swrast/s_blend.c       |   812 +
 reactos/lib/mesa32/src/swrast/s_blend.h       |    45 +
 reactos/lib/mesa32/src/swrast/s_buffers.c     |   287 +
 reactos/lib/mesa32/src/swrast/s_context.c     |   683 +
 reactos/lib/mesa32/src/swrast/s_context.h     |   383 +
 reactos/lib/mesa32/src/swrast/s_copypix.c     |   846 +
 reactos/lib/mesa32/src/swrast/s_depth.c       |  1777 ++
 reactos/lib/mesa32/src/swrast/s_depth.h       |    64 +
 reactos/lib/mesa32/src/swrast/s_drawpix.c     |   999 +
 reactos/lib/mesa32/src/swrast/s_drawpix.h     |    41 +
 reactos/lib/mesa32/src/swrast/s_feedback.c    |   165 +
 reactos/lib/mesa32/src/swrast/s_feedback.h    |    51 +
 reactos/lib/mesa32/src/swrast/s_fog.c         |   313 +
 reactos/lib/mesa32/src/swrast/s_fog.h         |    45 +
 reactos/lib/mesa32/src/swrast/s_imaging.c     |   155 +
 reactos/lib/mesa32/src/swrast/s_lines.c       |   342 +
 reactos/lib/mesa32/src/swrast/s_lines.h       |    41 +
 reactos/lib/mesa32/src/swrast/s_linetemp.h    |   447 +
 reactos/lib/mesa32/src/swrast/s_logic.c       |   497 +
 reactos/lib/mesa32/src/swrast/s_logic.h       |    45 +
 reactos/lib/mesa32/src/swrast/s_masking.c     |   191 +
 reactos/lib/mesa32/src/swrast/s_masking.h     |    61 +
 reactos/lib/mesa32/src/swrast/s_nvfragprog.c  |  1382 ++
 reactos/lib/mesa32/src/swrast/s_nvfragprog.h  |    38 +
 reactos/lib/mesa32/src/swrast/s_pixeltex.c    |   117 +
 reactos/lib/mesa32/src/swrast/s_pixeltex.h    |    38 +
 reactos/lib/mesa32/src/swrast/s_points.c      |   275 +
 reactos/lib/mesa32/src/swrast/s_points.h      |    39 +
 reactos/lib/mesa32/src/swrast/s_pointtemp.h   |   384 +
 reactos/lib/mesa32/src/swrast/s_readpix.c     |   535 +
 reactos/lib/mesa32/src/swrast/s_span.c        |  1520 ++
 reactos/lib/mesa32/src/swrast/s_span.h        |    75 +
 reactos/lib/mesa32/src/swrast/s_spantemp.h    |   376 +
 reactos/lib/mesa32/src/swrast/s_stencil.c     |  1326 ++
 reactos/lib/mesa32/src/swrast/s_stencil.h     |    59 +
 reactos/lib/mesa32/src/swrast/s_texstore.c    |   429 +
 reactos/lib/mesa32/src/swrast/s_texture.c     |  4292 ++++
 reactos/lib/mesa32/src/swrast/s_texture.h     |    47 +
 reactos/lib/mesa32/src/swrast/s_triangle.c    |  1155 +
 reactos/lib/mesa32/src/swrast/s_triangle.h    |    51 +
 reactos/lib/mesa32/src/swrast/s_trispan.h     |    31 +
 reactos/lib/mesa32/src/swrast/s_tritemp.h     |  1183 +
 reactos/lib/mesa32/src/swrast/s_zoom.c        |   428 +
 reactos/lib/mesa32/src/swrast/s_zoom.h        |    54 +
 reactos/lib/mesa32/src/swrast/swrast.dsp      |   324 +
 reactos/lib/mesa32/src/swrast/swrast.h        |   458 +
 .../lib/mesa32/src/swrast_setup/ss_context.c  |   250 +
 .../lib/mesa32/src/swrast_setup/ss_context.h  |    45 +
 .../lib/mesa32/src/swrast_setup/ss_triangle.c |   314 +
 .../lib/mesa32/src/swrast_setup/ss_triangle.h |    39 +
 .../lib/mesa32/src/swrast_setup/ss_tritmp.h   |   209 +
 reactos/lib/mesa32/src/swrast_setup/ss_vb.h   |    38 +
 .../mesa32/src/swrast_setup/swrast_setup.dsp  |   124 +
 .../mesa32/src/swrast_setup/swrast_setup.h    |    61 +
 reactos/lib/mesa32/src/tnl/t_array_api.c      |   441 +
 reactos/lib/mesa32/src/tnl/t_array_api.h      |    46 +
 reactos/lib/mesa32/src/tnl/t_array_import.c   |   360 +
 reactos/lib/mesa32/src/tnl/t_array_import.h   |    36 +
 reactos/lib/mesa32/src/tnl/t_context.c        |   261 +
 reactos/lib/mesa32/src/tnl/t_context.h        |   734 +
 reactos/lib/mesa32/src/tnl/t_pipeline.c       |   216 +
 reactos/lib/mesa32/src/tnl/t_pipeline.h       |    75 +
 reactos/lib/mesa32/src/tnl/t_save_api.c       |  1587 ++
 reactos/lib/mesa32/src/tnl/t_save_api.h       |    58 +
 reactos/lib/mesa32/src/tnl/t_save_loopback.c  |   305 +
 reactos/lib/mesa32/src/tnl/t_save_playback.c  |   217 +
 reactos/lib/mesa32/src/tnl/t_vb_cliptmp.h     |   270 +
 reactos/lib/mesa32/src/tnl/t_vb_fog.c         |   254 +
 reactos/lib/mesa32/src/tnl/t_vb_light.c       |   367 +
 reactos/lib/mesa32/src/tnl/t_vb_lighttmp.h    |   817 +
 reactos/lib/mesa32/src/tnl/t_vb_normals.c     |   201 +
 reactos/lib/mesa32/src/tnl/t_vb_points.c      |   124 +
 reactos/lib/mesa32/src/tnl/t_vb_program.c     |   365 +
 reactos/lib/mesa32/src/tnl/t_vb_render.c      |   377 +
 reactos/lib/mesa32/src/tnl/t_vb_rendertmp.h   |   440 +
 reactos/lib/mesa32/src/tnl/t_vb_texgen.c      |   691 +
 reactos/lib/mesa32/src/tnl/t_vb_texmat.c      |   150 +
 reactos/lib/mesa32/src/tnl/t_vb_vertex.c      |   303 +
 reactos/lib/mesa32/src/tnl/t_vertex.c         |  1066 +
 reactos/lib/mesa32/src/tnl/t_vertex.h         |   119 +
 reactos/lib/mesa32/src/tnl/t_vtx_api.c        |  1194 +
 reactos/lib/mesa32/src/tnl/t_vtx_api.h        |    58 +
 reactos/lib/mesa32/src/tnl/t_vtx_eval.c       |   253 +
 reactos/lib/mesa32/src/tnl/t_vtx_exec.c       |   289 +
 reactos/lib/mesa32/src/tnl/tnl.dsp            |   212 +
 reactos/lib/mesa32/src/tnl/tnl.h              |    78 +
 reactos/lib/mesa32/src/tnl_dd/imm/NOTES.imm   |   112 +
 .../lib/mesa32/src/tnl_dd/imm/t_dd_imm_capi.h |   419 +
 .../lib/mesa32/src/tnl_dd/imm/t_dd_imm_napi.h |   226 +
 .../mesa32/src/tnl_dd/imm/t_dd_imm_primtmp.h  |   570 +
 .../lib/mesa32/src/tnl_dd/imm/t_dd_imm_tapi.h |    75 +
 .../lib/mesa32/src/tnl_dd/imm/t_dd_imm_vapi.h |   159 +
 .../lib/mesa32/src/tnl_dd/imm/t_dd_imm_vb.c   |   204 +
 .../mesa32/src/tnl_dd/imm/t_dd_imm_vbtmp.h    |   268 +
 reactos/lib/mesa32/src/tnl_dd/t_dd.c          |    58 +
 reactos/lib/mesa32/src/tnl_dd/t_dd_dmatmp.h   |  1234 +
 reactos/lib/mesa32/src/tnl_dd/t_dd_dmatmp2.h  |   914 +
 .../lib/mesa32/src/tnl_dd/t_dd_rendertmp.h    |   434 +
 reactos/lib/mesa32/src/tnl_dd/t_dd_triemit.h  |   157 +
 reactos/lib/mesa32/src/tnl_dd/t_dd_tritmp.h   |   743 +
 reactos/lib/mesa32/src/tnl_dd/t_dd_unfilled.h |   212 +
 reactos/lib/mesa32/src/tnl_dd/t_dd_vb.c       |   344 +
 reactos/lib/mesa32/src/tnl_dd/t_dd_vbtmp.h    |   665 +
 reactos/lib/mesa32/src/tnl_dd/t_dd_vertex.h   |    78 +
 reactos/lib/mesa32/src/x86/3dnow.c            |    92 +
 reactos/lib/mesa32/src/x86/3dnow.h            |    39 +
 reactos/lib/mesa32/src/x86/3dnow_normal.S     |   836 +
 reactos/lib/mesa32/src/x86/3dnow_xform1.S     |   423 +
 reactos/lib/mesa32/src/x86/3dnow_xform2.S     |   464 +
 reactos/lib/mesa32/src/x86/3dnow_xform3.S     |   548 +
 reactos/lib/mesa32/src/x86/3dnow_xform4.S     |   557 +
 reactos/lib/mesa32/src/x86/assyntax.h         |  1715 ++
 reactos/lib/mesa32/src/x86/clip_args.h        |    60 +
 reactos/lib/mesa32/src/x86/common_x86.c       |   366 +
 reactos/lib/mesa32/src/x86/common_x86_asm.S   |   203 +
 reactos/lib/mesa32/src/x86/common_x86_asm.h   |    64 +
 .../lib/mesa32/src/x86/common_x86_features.h  |    68 +
 .../lib/mesa32/src/x86/common_x86_macros.h    |   107 +
 reactos/lib/mesa32/src/x86/gen_matypes.c      |   251 +
 reactos/lib/mesa32/src/x86/glapi_x86.S        |  5522 +++++
 reactos/lib/mesa32/src/x86/matypes.h          |   165 +
 reactos/lib/mesa32/src/x86/mmx.h              |    51 +
 reactos/lib/mesa32/src/x86/mmx_blend.S        |   363 +
 reactos/lib/mesa32/src/x86/mmx_blendtmp.h     |   114 +
 reactos/lib/mesa32/src/x86/norm_args.h        |    58 +
 reactos/lib/mesa32/src/x86/sse.c              |   123 +
 reactos/lib/mesa32/src/x86/sse.h              |    39 +
 reactos/lib/mesa32/src/x86/sse_normal.S       |   252 +
 reactos/lib/mesa32/src/x86/sse_xform1.S       |   433 +
 reactos/lib/mesa32/src/x86/sse_xform2.S       |   452 +
 reactos/lib/mesa32/src/x86/sse_xform3.S       |   498 +
 reactos/lib/mesa32/src/x86/sse_xform4.S       |   226 +
 reactos/lib/mesa32/src/x86/x86.c              |    96 +
 reactos/lib/mesa32/src/x86/x86.h              |    36 +
 reactos/lib/mesa32/src/x86/x86_cliptest.S     |   401 +
 reactos/lib/mesa32/src/x86/x86_xform2.S       |   563 +
 reactos/lib/mesa32/src/x86/x86_xform3.S       |   633 +
 reactos/lib/mesa32/src/x86/x86_xform4.S       |   666 +
 reactos/lib/mesa32/src/x86/xform_args.h       |    52 +
 442 files changed, 253433 insertions(+)
 create mode 100644 reactos/lib/mesa32/src/array_cache/ac_context.c
 create mode 100644 reactos/lib/mesa32/src/array_cache/ac_context.h
 create mode 100644 reactos/lib/mesa32/src/array_cache/ac_import.c
 create mode 100644 reactos/lib/mesa32/src/array_cache/acache.h
 create mode 100644 reactos/lib/mesa32/src/array_cache/array_cache.dsp
 create mode 100644 reactos/lib/mesa32/src/drivers/beos/GLView.cpp
 create mode 100644 reactos/lib/mesa32/src/drivers/beos/GLView.h
 create mode 100644 reactos/lib/mesa32/src/drivers/common/t_dd.c
 create mode 100644 reactos/lib/mesa32/src/drivers/common/t_dd_dmatmp.h
 create mode 100644 reactos/lib/mesa32/src/drivers/common/t_dd_dmatmp2.h
 create mode 100644 reactos/lib/mesa32/src/drivers/common/t_dd_rendertmp.h
 create mode 100644 reactos/lib/mesa32/src/drivers/common/t_dd_triemit.h
 create mode 100644 reactos/lib/mesa32/src/drivers/common/t_dd_tritmp.h
 create mode 100644 reactos/lib/mesa32/src/drivers/common/t_dd_unfilled.h
 create mode 100644 reactos/lib/mesa32/src/drivers/common/t_dd_vb.c
 create mode 100644 reactos/lib/mesa32/src/drivers/common/t_dd_vbtmp.h
 create mode 100644 reactos/lib/mesa32/src/drivers/common/t_dd_vertex.h
 create mode 100644 reactos/lib/mesa32/src/drivers/dos/blit.S
 create mode 100644 reactos/lib/mesa32/src/drivers/dos/dmesa.c
 create mode 100644 reactos/lib/mesa32/src/drivers/dos/dpmi.c
 create mode 100644 reactos/lib/mesa32/src/drivers/dos/internal.h
 create mode 100644 reactos/lib/mesa32/src/drivers/dos/vesa.c
 create mode 100644 reactos/lib/mesa32/src/drivers/dos/vesa.h
 create mode 100644 reactos/lib/mesa32/src/drivers/dos/vga.c
 create mode 100644 reactos/lib/mesa32/src/drivers/dos/vga.h
 create mode 100644 reactos/lib/mesa32/src/drivers/dos/video.c
 create mode 100644 reactos/lib/mesa32/src/drivers/dos/video.h
 create mode 100644 reactos/lib/mesa32/src/drivers/dos/virtual.S
 create mode 100644 reactos/lib/mesa32/src/drivers/dri/common/depthtmp.h
 create mode 100644 reactos/lib/mesa32/src/drivers/dri/common/mm.c
 create mode 100644 reactos/lib/mesa32/src/drivers/dri/common/mm.h
 create mode 100644 reactos/lib/mesa32/src/drivers/dri/common/mmx.h
 create mode 100644 reactos/lib/mesa32/src/drivers/dri/common/spantmp.h
 create mode 100644 reactos/lib/mesa32/src/drivers/dri/common/stenciltmp.h
 create mode 100644 reactos/lib/mesa32/src/drivers/dri/common/texmem.c
 create mode 100644 reactos/lib/mesa32/src/drivers/dri/common/texmem.h
 create mode 100644 reactos/lib/mesa32/src/drivers/dri/common/utils.c
 create mode 100644 reactos/lib/mesa32/src/drivers/dri/common/utils.h
 create mode 100644 reactos/lib/mesa32/src/drivers/dri/common/vblank.c
 create mode 100644 reactos/lib/mesa32/src/drivers/dri/common/vblank.h
 create mode 100644 reactos/lib/mesa32/src/drivers/dri/common/xmlconfig.c
 create mode 100644 reactos/lib/mesa32/src/drivers/dri/common/xmlconfig.h
 create mode 100644 reactos/lib/mesa32/src/drivers/dri/common/xmlpool.h
 create mode 100644 reactos/lib/mesa32/src/drivers/fbdev/glfbdev.c
 create mode 100644 reactos/lib/mesa32/src/drivers/ggi/default/genkgi.conf.in
 create mode 100644 reactos/lib/mesa32/src/drivers/ggi/default/genkgi_mode.c
 create mode 100644 reactos/lib/mesa32/src/drivers/ggi/default/genkgi_visual.c
 create mode 100644 reactos/lib/mesa32/src/drivers/ggi/default/linear.c
 create mode 100644 reactos/lib/mesa32/src/drivers/ggi/default/linear_15.c
 create mode 100644 reactos/lib/mesa32/src/drivers/ggi/default/linear_16.c
 create mode 100644 reactos/lib/mesa32/src/drivers/ggi/default/linear_24.c
 create mode 100644 reactos/lib/mesa32/src/drivers/ggi/default/linear_32.c
 create mode 100644 reactos/lib/mesa32/src/drivers/ggi/default/linear_8.c
 create mode 100644 reactos/lib/mesa32/src/drivers/ggi/default/stubs.c
 create mode 100644 reactos/lib/mesa32/src/drivers/ggi/display/fbdev.conf.in
 create mode 100644 reactos/lib/mesa32/src/drivers/ggi/display/fbdev_mode.c
 create mode 100644 reactos/lib/mesa32/src/drivers/ggi/display/fbdev_visual.c
 create mode 100644 reactos/lib/mesa32/src/drivers/ggi/include/ggi/mesa/debug.h
 create mode 100644 reactos/lib/mesa32/src/drivers/ggi/include/ggi/mesa/display_fbdev.h
 create mode 100644 reactos/lib/mesa32/src/drivers/ggi/include/ggi/mesa/ggimesa.h
 create mode 100644 reactos/lib/mesa32/src/drivers/ggi/include/ggi/mesa/ggimesa_int.h
 create mode 100644 reactos/lib/mesa32/src/drivers/glide/fxapi.c
 create mode 100644 reactos/lib/mesa32/src/drivers/glide/fxdd.c
 create mode 100644 reactos/lib/mesa32/src/drivers/glide/fxddspan.c
 create mode 100644 reactos/lib/mesa32/src/drivers/glide/fxddtex.c
 create mode 100644 reactos/lib/mesa32/src/drivers/glide/fxdrv.h
 create mode 100644 reactos/lib/mesa32/src/drivers/glide/fxg.c
 create mode 100644 reactos/lib/mesa32/src/drivers/glide/fxg.h
 create mode 100644 reactos/lib/mesa32/src/drivers/glide/fxglidew.c
 create mode 100644 reactos/lib/mesa32/src/drivers/glide/fxglidew.h
 create mode 100644 reactos/lib/mesa32/src/drivers/glide/fxopengl.def
 create mode 100644 reactos/lib/mesa32/src/drivers/glide/fxsetup.c
 create mode 100644 reactos/lib/mesa32/src/drivers/glide/fxsetup.h
 create mode 100644 reactos/lib/mesa32/src/drivers/glide/fxtexman.c
 create mode 100644 reactos/lib/mesa32/src/drivers/glide/fxtris.c
 create mode 100644 reactos/lib/mesa32/src/drivers/glide/fxvb.c
 create mode 100644 reactos/lib/mesa32/src/drivers/glide/fxvbtmp.h
 create mode 100644 reactos/lib/mesa32/src/drivers/glide/fxwgl.c
 create mode 100644 reactos/lib/mesa32/src/drivers/osmesa/Makefile.win
 create mode 100644 reactos/lib/mesa32/src/drivers/osmesa/osmesa.c
 create mode 100644 reactos/lib/mesa32/src/drivers/osmesa/osmesa.def
 create mode 100644 reactos/lib/mesa32/src/drivers/osmesa/osmesa.dsp
 create mode 100644 reactos/lib/mesa32/src/drivers/svga/svgamesa.c
 create mode 100644 reactos/lib/mesa32/src/drivers/svga/svgamesa15.c
 create mode 100644 reactos/lib/mesa32/src/drivers/svga/svgamesa15.h
 create mode 100644 reactos/lib/mesa32/src/drivers/svga/svgamesa16.c
 create mode 100644 reactos/lib/mesa32/src/drivers/svga/svgamesa16.h
 create mode 100644 reactos/lib/mesa32/src/drivers/svga/svgamesa24.c
 create mode 100644 reactos/lib/mesa32/src/drivers/svga/svgamesa24.h
 create mode 100644 reactos/lib/mesa32/src/drivers/svga/svgamesa32.c
 create mode 100644 reactos/lib/mesa32/src/drivers/svga/svgamesa32.h
 create mode 100644 reactos/lib/mesa32/src/drivers/svga/svgamesa8.c
 create mode 100644 reactos/lib/mesa32/src/drivers/svga/svgamesa8.h
 create mode 100644 reactos/lib/mesa32/src/drivers/svga/svgapix.h
 create mode 100644 reactos/lib/mesa32/src/drivers/windows/gdi/colors.h
 create mode 100644 reactos/lib/mesa32/src/drivers/windows/gdi/gdi.dsp
 create mode 100644 reactos/lib/mesa32/src/drivers/windows/gdi/mesa.def
 create mode 100644 reactos/lib/mesa32/src/drivers/windows/gdi/wgl.c
 create mode 100644 reactos/lib/mesa32/src/drivers/windows/gdi/wmesa.c
 create mode 100644 reactos/lib/mesa32/src/drivers/windows/gdi/wmesadef.h
 create mode 100644 reactos/lib/mesa32/src/drivers/windows/icd/colors.h
 create mode 100644 reactos/lib/mesa32/src/drivers/windows/icd/icd.c
 create mode 100644 reactos/lib/mesa32/src/drivers/windows/icd/icdlist.h
 create mode 100644 reactos/lib/mesa32/src/drivers/windows/icd/mesa.def
 create mode 100644 reactos/lib/mesa32/src/drivers/windows/icd/wmesadef.h
 create mode 100644 reactos/lib/mesa32/src/drivers/x11/fakeglx.c
 create mode 100644 reactos/lib/mesa32/src/drivers/x11/glxapi.c
 create mode 100644 reactos/lib/mesa32/src/drivers/x11/glxapi.h
 create mode 100644 reactos/lib/mesa32/src/drivers/x11/glxheader.h
 create mode 100644 reactos/lib/mesa32/src/drivers/x11/realglx.c
 create mode 100644 reactos/lib/mesa32/src/drivers/x11/realglx.h
 create mode 100644 reactos/lib/mesa32/src/drivers/x11/xfonts.c
 create mode 100644 reactos/lib/mesa32/src/drivers/x11/xfonts.h
 create mode 100644 reactos/lib/mesa32/src/drivers/x11/xm_api.c
 create mode 100644 reactos/lib/mesa32/src/drivers/x11/xm_dd.c
 create mode 100644 reactos/lib/mesa32/src/drivers/x11/xm_line.c
 create mode 100644 reactos/lib/mesa32/src/drivers/x11/xm_span.c
 create mode 100644 reactos/lib/mesa32/src/drivers/x11/xm_tri.c
 create mode 100644 reactos/lib/mesa32/src/drivers/x11/xmesaP.h
 create mode 100644 reactos/lib/mesa32/src/glapi/glapi.c
 create mode 100644 reactos/lib/mesa32/src/glapi/glapi.dsp
 create mode 100644 reactos/lib/mesa32/src/glapi/glapi.h
 create mode 100644 reactos/lib/mesa32/src/glapi/glapioffsets.h
 create mode 100644 reactos/lib/mesa32/src/glapi/glapitable.h
 create mode 100644 reactos/lib/mesa32/src/glapi/glapitemp.h
 create mode 100644 reactos/lib/mesa32/src/glapi/glprocs.h
 create mode 100644 reactos/lib/mesa32/src/glapi/glthread.c
 create mode 100644 reactos/lib/mesa32/src/glapi/glthread.h
 create mode 100644 reactos/lib/mesa32/src/main/accum.c
 create mode 100644 reactos/lib/mesa32/src/main/accum.h
 create mode 100644 reactos/lib/mesa32/src/main/api_arrayelt.c
 create mode 100644 reactos/lib/mesa32/src/main/api_arrayelt.h
 create mode 100644 reactos/lib/mesa32/src/main/api_eval.h
 create mode 100644 reactos/lib/mesa32/src/main/api_loopback.c
 create mode 100644 reactos/lib/mesa32/src/main/api_loopback.h
 create mode 100644 reactos/lib/mesa32/src/main/api_noop.c
 create mode 100644 reactos/lib/mesa32/src/main/api_noop.h
 create mode 100644 reactos/lib/mesa32/src/main/api_validate.c
 create mode 100644 reactos/lib/mesa32/src/main/api_validate.h
 create mode 100644 reactos/lib/mesa32/src/main/arbfragparse.c
 create mode 100644 reactos/lib/mesa32/src/main/arbfragparse.h
 create mode 100644 reactos/lib/mesa32/src/main/arbparse.c
 create mode 100644 reactos/lib/mesa32/src/main/arbparse.h
 create mode 100644 reactos/lib/mesa32/src/main/arbparse_syn.h
 create mode 100644 reactos/lib/mesa32/src/main/arbprogram.c
 create mode 100644 reactos/lib/mesa32/src/main/arbprogram.h
 create mode 100644 reactos/lib/mesa32/src/main/arbvertparse.c
 create mode 100644 reactos/lib/mesa32/src/main/arbvertparse.h
 create mode 100644 reactos/lib/mesa32/src/main/attrib.c
 create mode 100644 reactos/lib/mesa32/src/main/attrib.h
 create mode 100644 reactos/lib/mesa32/src/main/blend.c
 create mode 100644 reactos/lib/mesa32/src/main/blend.h
 create mode 100644 reactos/lib/mesa32/src/main/bufferobj.c
 create mode 100644 reactos/lib/mesa32/src/main/bufferobj.h
 create mode 100644 reactos/lib/mesa32/src/main/buffers.c
 create mode 100644 reactos/lib/mesa32/src/main/buffers.h
 create mode 100644 reactos/lib/mesa32/src/main/clip.c
 create mode 100644 reactos/lib/mesa32/src/main/clip.h
 create mode 100644 reactos/lib/mesa32/src/main/colormac.h
 create mode 100644 reactos/lib/mesa32/src/main/colortab.c
 create mode 100644 reactos/lib/mesa32/src/main/colortab.h
 create mode 100644 reactos/lib/mesa32/src/main/config.h
 create mode 100644 reactos/lib/mesa32/src/main/context.c
 create mode 100644 reactos/lib/mesa32/src/main/context.h
 create mode 100644 reactos/lib/mesa32/src/main/convolve.c
 create mode 100644 reactos/lib/mesa32/src/main/convolve.h
 create mode 100644 reactos/lib/mesa32/src/main/dd.h
 create mode 100644 reactos/lib/mesa32/src/main/debug.c
 create mode 100644 reactos/lib/mesa32/src/main/debug.h
 create mode 100644 reactos/lib/mesa32/src/main/depth.c
 create mode 100644 reactos/lib/mesa32/src/main/depth.h
 create mode 100644 reactos/lib/mesa32/src/main/dispatch.c
 create mode 100644 reactos/lib/mesa32/src/main/dlist.c
 create mode 100644 reactos/lib/mesa32/src/main/dlist.h
 create mode 100644 reactos/lib/mesa32/src/main/drawpix.c
 create mode 100644 reactos/lib/mesa32/src/main/drawpix.h
 create mode 100644 reactos/lib/mesa32/src/main/enable.c
 create mode 100644 reactos/lib/mesa32/src/main/enable.h
 create mode 100644 reactos/lib/mesa32/src/main/enums.c
 create mode 100644 reactos/lib/mesa32/src/main/enums.h
 create mode 100644 reactos/lib/mesa32/src/main/eval.c
 create mode 100644 reactos/lib/mesa32/src/main/eval.h
 create mode 100644 reactos/lib/mesa32/src/main/extensions.c
 create mode 100644 reactos/lib/mesa32/src/main/extensions.h
 create mode 100644 reactos/lib/mesa32/src/main/feedback.c
 create mode 100644 reactos/lib/mesa32/src/main/feedback.h
 create mode 100644 reactos/lib/mesa32/src/main/fog.c
 create mode 100644 reactos/lib/mesa32/src/main/fog.h
 create mode 100644 reactos/lib/mesa32/src/main/get.c
 create mode 100644 reactos/lib/mesa32/src/main/get.h
 create mode 100644 reactos/lib/mesa32/src/main/glheader.h
 create mode 100644 reactos/lib/mesa32/src/main/hash.c
 create mode 100644 reactos/lib/mesa32/src/main/hash.h
 create mode 100644 reactos/lib/mesa32/src/main/hint.c
 create mode 100644 reactos/lib/mesa32/src/main/hint.h
 create mode 100644 reactos/lib/mesa32/src/main/histogram.c
 create mode 100644 reactos/lib/mesa32/src/main/histogram.h
 create mode 100644 reactos/lib/mesa32/src/main/image.c
 create mode 100644 reactos/lib/mesa32/src/main/image.h
 create mode 100644 reactos/lib/mesa32/src/main/imports.c
 create mode 100644 reactos/lib/mesa32/src/main/imports.h
 create mode 100644 reactos/lib/mesa32/src/main/light.c
 create mode 100644 reactos/lib/mesa32/src/main/light.h
 create mode 100644 reactos/lib/mesa32/src/main/lines.c
 create mode 100644 reactos/lib/mesa32/src/main/lines.h
 create mode 100644 reactos/lib/mesa32/src/main/macros.h
 create mode 100644 reactos/lib/mesa32/src/main/main.dsp
 create mode 100644 reactos/lib/mesa32/src/main/matrix.c
 create mode 100644 reactos/lib/mesa32/src/main/matrix.h
 create mode 100644 reactos/lib/mesa32/src/main/mtypes.h
 create mode 100644 reactos/lib/mesa32/src/main/nvfragparse.c
 create mode 100644 reactos/lib/mesa32/src/main/nvfragparse.h
 create mode 100644 reactos/lib/mesa32/src/main/nvfragprog.h
 create mode 100644 reactos/lib/mesa32/src/main/nvprogram.c
 create mode 100644 reactos/lib/mesa32/src/main/nvprogram.h
 create mode 100644 reactos/lib/mesa32/src/main/nvvertexec.c
 create mode 100644 reactos/lib/mesa32/src/main/nvvertexec.h
 create mode 100644 reactos/lib/mesa32/src/main/nvvertparse.c
 create mode 100644 reactos/lib/mesa32/src/main/nvvertparse.h
 create mode 100644 reactos/lib/mesa32/src/main/nvvertprog.h
 create mode 100644 reactos/lib/mesa32/src/main/occlude.c
 create mode 100644 reactos/lib/mesa32/src/main/occlude.h
 create mode 100644 reactos/lib/mesa32/src/main/pixel.c
 create mode 100644 reactos/lib/mesa32/src/main/pixel.h
 create mode 100644 reactos/lib/mesa32/src/main/points.c
 create mode 100644 reactos/lib/mesa32/src/main/points.h
 create mode 100644 reactos/lib/mesa32/src/main/polygon.c
 create mode 100644 reactos/lib/mesa32/src/main/polygon.h
 create mode 100644 reactos/lib/mesa32/src/main/program.c
 create mode 100644 reactos/lib/mesa32/src/main/program.h
 create mode 100644 reactos/lib/mesa32/src/main/rastpos.c
 create mode 100644 reactos/lib/mesa32/src/main/rastpos.h
 create mode 100644 reactos/lib/mesa32/src/main/simple_list.h
 create mode 100644 reactos/lib/mesa32/src/main/state.c
 create mode 100644 reactos/lib/mesa32/src/main/state.h
 create mode 100644 reactos/lib/mesa32/src/main/stencil.c
 create mode 100644 reactos/lib/mesa32/src/main/stencil.h
 create mode 100644 reactos/lib/mesa32/src/main/texcompress.c
 create mode 100644 reactos/lib/mesa32/src/main/texcompress.h
 create mode 100644 reactos/lib/mesa32/src/main/texformat.c
 create mode 100644 reactos/lib/mesa32/src/main/texformat.h
 create mode 100644 reactos/lib/mesa32/src/main/texformat_tmp.h
 create mode 100644 reactos/lib/mesa32/src/main/teximage.c
 create mode 100644 reactos/lib/mesa32/src/main/teximage.h
 create mode 100644 reactos/lib/mesa32/src/main/texobj.c
 create mode 100644 reactos/lib/mesa32/src/main/texobj.h
 create mode 100644 reactos/lib/mesa32/src/main/texstate.c
 create mode 100644 reactos/lib/mesa32/src/main/texstate.h
 create mode 100644 reactos/lib/mesa32/src/main/texstore.c
 create mode 100644 reactos/lib/mesa32/src/main/texstore.h
 create mode 100644 reactos/lib/mesa32/src/main/texutil.c
 create mode 100644 reactos/lib/mesa32/src/main/texutil.h
 create mode 100644 reactos/lib/mesa32/src/main/texutil_tmp.h
 create mode 100644 reactos/lib/mesa32/src/main/varray.c
 create mode 100644 reactos/lib/mesa32/src/main/varray.h
 create mode 100644 reactos/lib/mesa32/src/main/version.h
 create mode 100644 reactos/lib/mesa32/src/main/vsnprintf.c
 create mode 100644 reactos/lib/mesa32/src/main/vtxfmt.c
 create mode 100644 reactos/lib/mesa32/src/main/vtxfmt.h
 create mode 100644 reactos/lib/mesa32/src/main/vtxfmt_tmp.h
 create mode 100644 reactos/lib/mesa32/src/math/m_clip_tmp.h
 create mode 100644 reactos/lib/mesa32/src/math/m_copy_tmp.h
 create mode 100644 reactos/lib/mesa32/src/math/m_debug.h
 create mode 100644 reactos/lib/mesa32/src/math/m_debug_clip.c
 create mode 100644 reactos/lib/mesa32/src/math/m_debug_norm.c
 create mode 100644 reactos/lib/mesa32/src/math/m_debug_util.h
 create mode 100644 reactos/lib/mesa32/src/math/m_debug_xform.c
 create mode 100644 reactos/lib/mesa32/src/math/m_dotprod_tmp.h
 create mode 100644 reactos/lib/mesa32/src/math/m_eval.c
 create mode 100644 reactos/lib/mesa32/src/math/m_eval.h
 create mode 100644 reactos/lib/mesa32/src/math/m_matrix.c
 create mode 100644 reactos/lib/mesa32/src/math/m_matrix.h
 create mode 100644 reactos/lib/mesa32/src/math/m_norm_tmp.h
 create mode 100644 reactos/lib/mesa32/src/math/m_trans_tmp.h
 create mode 100644 reactos/lib/mesa32/src/math/m_translate.c
 create mode 100644 reactos/lib/mesa32/src/math/m_translate.h
 create mode 100644 reactos/lib/mesa32/src/math/m_vector.c
 create mode 100644 reactos/lib/mesa32/src/math/m_vector.h
 create mode 100644 reactos/lib/mesa32/src/math/m_xform.c
 create mode 100644 reactos/lib/mesa32/src/math/m_xform.h
 create mode 100644 reactos/lib/mesa32/src/math/m_xform_tmp.h
 create mode 100644 reactos/lib/mesa32/src/math/math.dsp
 create mode 100644 reactos/lib/mesa32/src/math/mathmod.h
 create mode 100644 reactos/lib/mesa32/src/sparc/clip.S
 create mode 100644 reactos/lib/mesa32/src/sparc/glapi_sparc.S
 create mode 100644 reactos/lib/mesa32/src/sparc/norm.S
 create mode 100644 reactos/lib/mesa32/src/sparc/sparc.c
 create mode 100644 reactos/lib/mesa32/src/sparc/sparc.h
 create mode 100644 reactos/lib/mesa32/src/sparc/sparc_matrix.h
 create mode 100644 reactos/lib/mesa32/src/sparc/xform.S
 create mode 100644 reactos/lib/mesa32/src/swrast/s_aaline.c
 create mode 100644 reactos/lib/mesa32/src/swrast/s_aaline.h
 create mode 100644 reactos/lib/mesa32/src/swrast/s_aalinetemp.h
 create mode 100644 reactos/lib/mesa32/src/swrast/s_aatriangle.c
 create mode 100644 reactos/lib/mesa32/src/swrast/s_aatriangle.h
 create mode 100644 reactos/lib/mesa32/src/swrast/s_aatritemp.h
 create mode 100644 reactos/lib/mesa32/src/swrast/s_accum.c
 create mode 100644 reactos/lib/mesa32/src/swrast/s_accum.h
 create mode 100644 reactos/lib/mesa32/src/swrast/s_alpha.c
 create mode 100644 reactos/lib/mesa32/src/swrast/s_alpha.h
 create mode 100644 reactos/lib/mesa32/src/swrast/s_alphabuf.c
 create mode 100644 reactos/lib/mesa32/src/swrast/s_alphabuf.h
 create mode 100644 reactos/lib/mesa32/src/swrast/s_bitmap.c
 create mode 100644 reactos/lib/mesa32/src/swrast/s_blend.c
 create mode 100644 reactos/lib/mesa32/src/swrast/s_blend.h
 create mode 100644 reactos/lib/mesa32/src/swrast/s_buffers.c
 create mode 100644 reactos/lib/mesa32/src/swrast/s_context.c
 create mode 100644 reactos/lib/mesa32/src/swrast/s_context.h
 create mode 100644 reactos/lib/mesa32/src/swrast/s_copypix.c
 create mode 100644 reactos/lib/mesa32/src/swrast/s_depth.c
 create mode 100644 reactos/lib/mesa32/src/swrast/s_depth.h
 create mode 100644 reactos/lib/mesa32/src/swrast/s_drawpix.c
 create mode 100644 reactos/lib/mesa32/src/swrast/s_drawpix.h
 create mode 100644 reactos/lib/mesa32/src/swrast/s_feedback.c
 create mode 100644 reactos/lib/mesa32/src/swrast/s_feedback.h
 create mode 100644 reactos/lib/mesa32/src/swrast/s_fog.c
 create mode 100644 reactos/lib/mesa32/src/swrast/s_fog.h
 create mode 100644 reactos/lib/mesa32/src/swrast/s_imaging.c
 create mode 100644 reactos/lib/mesa32/src/swrast/s_lines.c
 create mode 100644 reactos/lib/mesa32/src/swrast/s_lines.h
 create mode 100644 reactos/lib/mesa32/src/swrast/s_linetemp.h
 create mode 100644 reactos/lib/mesa32/src/swrast/s_logic.c
 create mode 100644 reactos/lib/mesa32/src/swrast/s_logic.h
 create mode 100644 reactos/lib/mesa32/src/swrast/s_masking.c
 create mode 100644 reactos/lib/mesa32/src/swrast/s_masking.h
 create mode 100644 reactos/lib/mesa32/src/swrast/s_nvfragprog.c
 create mode 100644 reactos/lib/mesa32/src/swrast/s_nvfragprog.h
 create mode 100644 reactos/lib/mesa32/src/swrast/s_pixeltex.c
 create mode 100644 reactos/lib/mesa32/src/swrast/s_pixeltex.h
 create mode 100644 reactos/lib/mesa32/src/swrast/s_points.c
 create mode 100644 reactos/lib/mesa32/src/swrast/s_points.h
 create mode 100644 reactos/lib/mesa32/src/swrast/s_pointtemp.h
 create mode 100644 reactos/lib/mesa32/src/swrast/s_readpix.c
 create mode 100644 reactos/lib/mesa32/src/swrast/s_span.c
 create mode 100644 reactos/lib/mesa32/src/swrast/s_span.h
 create mode 100644 reactos/lib/mesa32/src/swrast/s_spantemp.h
 create mode 100644 reactos/lib/mesa32/src/swrast/s_stencil.c
 create mode 100644 reactos/lib/mesa32/src/swrast/s_stencil.h
 create mode 100644 reactos/lib/mesa32/src/swrast/s_texstore.c
 create mode 100644 reactos/lib/mesa32/src/swrast/s_texture.c
 create mode 100644 reactos/lib/mesa32/src/swrast/s_texture.h
 create mode 100644 reactos/lib/mesa32/src/swrast/s_triangle.c
 create mode 100644 reactos/lib/mesa32/src/swrast/s_triangle.h
 create mode 100644 reactos/lib/mesa32/src/swrast/s_trispan.h
 create mode 100644 reactos/lib/mesa32/src/swrast/s_tritemp.h
 create mode 100644 reactos/lib/mesa32/src/swrast/s_zoom.c
 create mode 100644 reactos/lib/mesa32/src/swrast/s_zoom.h
 create mode 100644 reactos/lib/mesa32/src/swrast/swrast.dsp
 create mode 100644 reactos/lib/mesa32/src/swrast/swrast.h
 create mode 100644 reactos/lib/mesa32/src/swrast_setup/ss_context.c
 create mode 100644 reactos/lib/mesa32/src/swrast_setup/ss_context.h
 create mode 100644 reactos/lib/mesa32/src/swrast_setup/ss_triangle.c
 create mode 100644 reactos/lib/mesa32/src/swrast_setup/ss_triangle.h
 create mode 100644 reactos/lib/mesa32/src/swrast_setup/ss_tritmp.h
 create mode 100644 reactos/lib/mesa32/src/swrast_setup/ss_vb.h
 create mode 100644 reactos/lib/mesa32/src/swrast_setup/swrast_setup.dsp
 create mode 100644 reactos/lib/mesa32/src/swrast_setup/swrast_setup.h
 create mode 100644 reactos/lib/mesa32/src/tnl/t_array_api.c
 create mode 100644 reactos/lib/mesa32/src/tnl/t_array_api.h
 create mode 100644 reactos/lib/mesa32/src/tnl/t_array_import.c
 create mode 100644 reactos/lib/mesa32/src/tnl/t_array_import.h
 create mode 100644 reactos/lib/mesa32/src/tnl/t_context.c
 create mode 100644 reactos/lib/mesa32/src/tnl/t_context.h
 create mode 100644 reactos/lib/mesa32/src/tnl/t_pipeline.c
 create mode 100644 reactos/lib/mesa32/src/tnl/t_pipeline.h
 create mode 100644 reactos/lib/mesa32/src/tnl/t_save_api.c
 create mode 100644 reactos/lib/mesa32/src/tnl/t_save_api.h
 create mode 100644 reactos/lib/mesa32/src/tnl/t_save_loopback.c
 create mode 100644 reactos/lib/mesa32/src/tnl/t_save_playback.c
 create mode 100644 reactos/lib/mesa32/src/tnl/t_vb_cliptmp.h
 create mode 100644 reactos/lib/mesa32/src/tnl/t_vb_fog.c
 create mode 100644 reactos/lib/mesa32/src/tnl/t_vb_light.c
 create mode 100644 reactos/lib/mesa32/src/tnl/t_vb_lighttmp.h
 create mode 100644 reactos/lib/mesa32/src/tnl/t_vb_normals.c
 create mode 100644 reactos/lib/mesa32/src/tnl/t_vb_points.c
 create mode 100644 reactos/lib/mesa32/src/tnl/t_vb_program.c
 create mode 100644 reactos/lib/mesa32/src/tnl/t_vb_render.c
 create mode 100644 reactos/lib/mesa32/src/tnl/t_vb_rendertmp.h
 create mode 100644 reactos/lib/mesa32/src/tnl/t_vb_texgen.c
 create mode 100644 reactos/lib/mesa32/src/tnl/t_vb_texmat.c
 create mode 100644 reactos/lib/mesa32/src/tnl/t_vb_vertex.c
 create mode 100644 reactos/lib/mesa32/src/tnl/t_vertex.c
 create mode 100644 reactos/lib/mesa32/src/tnl/t_vertex.h
 create mode 100644 reactos/lib/mesa32/src/tnl/t_vtx_api.c
 create mode 100644 reactos/lib/mesa32/src/tnl/t_vtx_api.h
 create mode 100644 reactos/lib/mesa32/src/tnl/t_vtx_eval.c
 create mode 100644 reactos/lib/mesa32/src/tnl/t_vtx_exec.c
 create mode 100644 reactos/lib/mesa32/src/tnl/tnl.dsp
 create mode 100644 reactos/lib/mesa32/src/tnl/tnl.h
 create mode 100644 reactos/lib/mesa32/src/tnl_dd/imm/NOTES.imm
 create mode 100644 reactos/lib/mesa32/src/tnl_dd/imm/t_dd_imm_capi.h
 create mode 100644 reactos/lib/mesa32/src/tnl_dd/imm/t_dd_imm_napi.h
 create mode 100644 reactos/lib/mesa32/src/tnl_dd/imm/t_dd_imm_primtmp.h
 create mode 100644 reactos/lib/mesa32/src/tnl_dd/imm/t_dd_imm_tapi.h
 create mode 100644 reactos/lib/mesa32/src/tnl_dd/imm/t_dd_imm_vapi.h
 create mode 100644 reactos/lib/mesa32/src/tnl_dd/imm/t_dd_imm_vb.c
 create mode 100644 reactos/lib/mesa32/src/tnl_dd/imm/t_dd_imm_vbtmp.h
 create mode 100644 reactos/lib/mesa32/src/tnl_dd/t_dd.c
 create mode 100644 reactos/lib/mesa32/src/tnl_dd/t_dd_dmatmp.h
 create mode 100644 reactos/lib/mesa32/src/tnl_dd/t_dd_dmatmp2.h
 create mode 100644 reactos/lib/mesa32/src/tnl_dd/t_dd_rendertmp.h
 create mode 100644 reactos/lib/mesa32/src/tnl_dd/t_dd_triemit.h
 create mode 100644 reactos/lib/mesa32/src/tnl_dd/t_dd_tritmp.h
 create mode 100644 reactos/lib/mesa32/src/tnl_dd/t_dd_unfilled.h
 create mode 100644 reactos/lib/mesa32/src/tnl_dd/t_dd_vb.c
 create mode 100644 reactos/lib/mesa32/src/tnl_dd/t_dd_vbtmp.h
 create mode 100644 reactos/lib/mesa32/src/tnl_dd/t_dd_vertex.h
 create mode 100644 reactos/lib/mesa32/src/x86/3dnow.c
 create mode 100644 reactos/lib/mesa32/src/x86/3dnow.h
 create mode 100644 reactos/lib/mesa32/src/x86/3dnow_normal.S
 create mode 100644 reactos/lib/mesa32/src/x86/3dnow_xform1.S
 create mode 100644 reactos/lib/mesa32/src/x86/3dnow_xform2.S
 create mode 100644 reactos/lib/mesa32/src/x86/3dnow_xform3.S
 create mode 100644 reactos/lib/mesa32/src/x86/3dnow_xform4.S
 create mode 100644 reactos/lib/mesa32/src/x86/assyntax.h
 create mode 100644 reactos/lib/mesa32/src/x86/clip_args.h
 create mode 100644 reactos/lib/mesa32/src/x86/common_x86.c
 create mode 100644 reactos/lib/mesa32/src/x86/common_x86_asm.S
 create mode 100644 reactos/lib/mesa32/src/x86/common_x86_asm.h
 create mode 100644 reactos/lib/mesa32/src/x86/common_x86_features.h
 create mode 100644 reactos/lib/mesa32/src/x86/common_x86_macros.h
 create mode 100644 reactos/lib/mesa32/src/x86/gen_matypes.c
 create mode 100644 reactos/lib/mesa32/src/x86/glapi_x86.S
 create mode 100644 reactos/lib/mesa32/src/x86/matypes.h
 create mode 100644 reactos/lib/mesa32/src/x86/mmx.h
 create mode 100644 reactos/lib/mesa32/src/x86/mmx_blend.S
 create mode 100644 reactos/lib/mesa32/src/x86/mmx_blendtmp.h
 create mode 100644 reactos/lib/mesa32/src/x86/norm_args.h
 create mode 100644 reactos/lib/mesa32/src/x86/sse.c
 create mode 100644 reactos/lib/mesa32/src/x86/sse.h
 create mode 100644 reactos/lib/mesa32/src/x86/sse_normal.S
 create mode 100644 reactos/lib/mesa32/src/x86/sse_xform1.S
 create mode 100644 reactos/lib/mesa32/src/x86/sse_xform2.S
 create mode 100644 reactos/lib/mesa32/src/x86/sse_xform3.S
 create mode 100644 reactos/lib/mesa32/src/x86/sse_xform4.S
 create mode 100644 reactos/lib/mesa32/src/x86/x86.c
 create mode 100644 reactos/lib/mesa32/src/x86/x86.h
 create mode 100644 reactos/lib/mesa32/src/x86/x86_cliptest.S
 create mode 100644 reactos/lib/mesa32/src/x86/x86_xform2.S
 create mode 100644 reactos/lib/mesa32/src/x86/x86_xform3.S
 create mode 100644 reactos/lib/mesa32/src/x86/x86_xform4.S
 create mode 100644 reactos/lib/mesa32/src/x86/xform_args.h

diff --git a/reactos/lib/mesa32/src/array_cache/ac_context.c b/reactos/lib/mesa32/src/array_cache/ac_context.c
new file mode 100644
index 00000000000..ebf3a3dc47b
--- /dev/null
+++ b/reactos/lib/mesa32/src/array_cache/ac_context.c
@@ -0,0 +1,375 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+#include "glheader.h"
+#include "macros.h"
+#include "imports.h"
+#include "mtypes.h"
+
+#include "array_cache/ac_context.h"
+
+
+/*
+ * Initialize the array fallbacks.  That is, by default the fallback arrays
+ * point into the current vertex attribute values in ctx->Current.Attrib[]
+ */
+static void _ac_fallbacks_init( GLcontext *ctx )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+   struct gl_client_array *cl;
+   GLuint i;
+
+   cl = &ac->Fallback.Normal;
+   cl->Size = 3;
+   cl->Type = GL_FLOAT;
+   cl->Stride = 0;
+   cl->StrideB = 0;
+   cl->Ptr = (GLubyte *) ctx->Current.Attrib[VERT_ATTRIB_NORMAL];
+   cl->Enabled = 1;
+   cl->Flags = CA_CLIENT_DATA;	/* hack */
+#if FEATURE_ARB_vertex_buffer_object
+   cl->BufferObj = ctx->Array.NullBufferObj;
+#endif
+
+   cl = &ac->Fallback.Color;
+   cl->Size = 4;
+   cl->Type = GL_FLOAT;
+   cl->Stride = 0;
+   cl->StrideB = 0;
+   cl->Ptr = (GLubyte *) ctx->Current.Attrib[VERT_ATTRIB_COLOR0];
+   cl->Enabled = 1;
+   cl->Flags = CA_CLIENT_DATA;	/* hack */
+#if FEATURE_ARB_vertex_buffer_object
+   cl->BufferObj = ctx->Array.NullBufferObj;
+#endif
+
+   cl = &ac->Fallback.SecondaryColor;
+   cl->Size = 3;
+   cl->Type = GL_FLOAT;
+   cl->Stride = 0;
+   cl->StrideB = 0;
+   cl->Ptr = (GLubyte *) ctx->Current.Attrib[VERT_ATTRIB_COLOR1];
+   cl->Enabled = 1;
+   cl->Flags = CA_CLIENT_DATA;	/* hack */
+#if FEATURE_ARB_vertex_buffer_object
+   cl->BufferObj = ctx->Array.NullBufferObj;
+#endif
+
+   cl = &ac->Fallback.FogCoord;
+   cl->Size = 1;
+   cl->Type = GL_FLOAT;
+   cl->Stride = 0;
+   cl->StrideB = 0;
+   cl->Ptr = (GLubyte *) &ctx->Current.Attrib[VERT_ATTRIB_FOG];
+   cl->Enabled = 1;
+   cl->Flags = CA_CLIENT_DATA;	/* hack */
+#if FEATURE_ARB_vertex_buffer_object
+   cl->BufferObj = ctx->Array.NullBufferObj;
+#endif
+
+   cl = &ac->Fallback.Index;
+   cl->Size = 1;
+   cl->Type = GL_FLOAT;
+   cl->Stride = 0;
+   cl->StrideB = 0;
+   cl->Ptr = (GLubyte *) &ctx->Current.Index;
+   cl->Enabled = 1;
+   cl->Flags = CA_CLIENT_DATA;	/* hack */
+#if FEATURE_ARB_vertex_buffer_object
+   cl->BufferObj = ctx->Array.NullBufferObj;
+#endif
+
+   for (i = 0 ; i < MAX_TEXTURE_COORD_UNITS ; i++) {
+      cl = &ac->Fallback.TexCoord[i];
+      cl->Size = 4;
+      cl->Type = GL_FLOAT;
+      cl->Stride = 0;
+      cl->StrideB = 0;
+      cl->Ptr = (GLubyte *) ctx->Current.Attrib[VERT_ATTRIB_TEX0 + i];
+      cl->Enabled = 1;
+      cl->Flags = CA_CLIENT_DATA;	/* hack */
+#if FEATURE_ARB_vertex_buffer_object
+      cl->BufferObj = ctx->Array.NullBufferObj;
+#endif
+   }
+
+   cl = &ac->Fallback.EdgeFlag;
+   cl->Size = 1;
+   cl->Type = GL_UNSIGNED_BYTE;
+   cl->Stride = 0;
+   cl->StrideB = 0;
+   cl->Ptr = (GLubyte *) &ctx->Current.EdgeFlag;
+   cl->Enabled = 1;
+   cl->Flags = CA_CLIENT_DATA;	/* hack */
+#if FEATURE_ARB_vertex_buffer_object
+   cl->BufferObj = ctx->Array.NullBufferObj;
+#endif
+
+   for (i = 0; i < VERT_ATTRIB_MAX; i++) {
+      cl = &ac->Fallback.Attrib[i];
+      cl->Size = 4;
+      cl->Type = GL_FLOAT;
+      cl->Stride = 0;
+      cl->StrideB = 0;
+      cl->Ptr = (GLubyte *) ctx->Current.Attrib[i];
+      cl->Enabled = 1;
+      cl->Flags = CA_CLIENT_DATA; /* hack */
+#if FEATURE_ARB_vertex_buffer_object
+      cl->BufferObj = ctx->Array.NullBufferObj;
+#endif
+   }
+}
+
+
+/*
+ * Initialize the array cache pointers, types, strides, etc.
+ */
+static void _ac_cache_init( GLcontext *ctx )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+   struct gl_client_array *cl;
+   GLuint size = ctx->Const.MaxArrayLockSize + MAX_CLIPPED_VERTICES;
+   GLuint i;
+
+   cl = &ac->Cache.Vertex;
+   cl->Size = 4;
+   cl->Type = GL_FLOAT;
+   cl->Stride = 0;
+   cl->StrideB = 4 * sizeof(GLfloat);
+   cl->Ptr = (GLubyte *) MALLOC( cl->StrideB * size );
+   cl->Enabled = 1;
+   cl->Flags = 0;
+#if FEATURE_ARB_vertex_buffer_object
+   cl->BufferObj = ctx->Array.NullBufferObj;
+#endif
+
+   cl = &ac->Cache.Normal;
+   cl->Size = 3;
+   cl->Type = GL_FLOAT;
+   cl->Stride = 0;
+   cl->StrideB = 3 * sizeof(GLfloat);
+   cl->Ptr = (GLubyte *) MALLOC( cl->StrideB * size );
+   cl->Enabled = 1;
+   cl->Flags = 0;
+#if FEATURE_ARB_vertex_buffer_object
+   cl->BufferObj = ctx->Array.NullBufferObj;
+#endif
+
+   cl = &ac->Cache.Color;
+   cl->Size = 4;
+   cl->Type = GL_FLOAT;
+   cl->Stride = 0;
+   cl->StrideB = 4 * sizeof(GLfloat);
+   cl->Ptr = (GLubyte *) MALLOC( cl->StrideB * size );
+   cl->Enabled = 1;
+   cl->Flags = 0;
+#if FEATURE_ARB_vertex_buffer_object
+   cl->BufferObj = ctx->Array.NullBufferObj;
+#endif
+
+   cl = &ac->Cache.SecondaryColor;
+   cl->Size = 3;
+   cl->Type = GL_FLOAT;
+   cl->Stride = 0;
+   cl->StrideB = 4 * sizeof(GLfloat);
+   cl->Ptr = (GLubyte *) MALLOC( cl->StrideB * size );
+   cl->Enabled = 1;
+   cl->Flags = 0;
+#if FEATURE_ARB_vertex_buffer_object
+   cl->BufferObj = ctx->Array.NullBufferObj;
+#endif
+
+   cl = &ac->Cache.FogCoord;
+   cl->Size = 1;
+   cl->Type = GL_FLOAT;
+   cl->Stride = 0;
+   cl->StrideB = sizeof(GLfloat);
+   cl->Ptr = (GLubyte *) MALLOC( cl->StrideB * size );
+   cl->Enabled = 1;
+   cl->Flags = 0;
+#if FEATURE_ARB_vertex_buffer_object
+   cl->BufferObj = ctx->Array.NullBufferObj;
+#endif
+
+   cl = &ac->Cache.Index;
+   cl->Size = 1;
+   cl->Type = GL_FLOAT;
+   cl->Stride = 0;
+   cl->StrideB = sizeof(GLfloat);
+   cl->Ptr = (GLubyte *) MALLOC( cl->StrideB * size );
+   cl->Enabled = 1;
+   cl->Flags = 0;
+#if FEATURE_ARB_vertex_buffer_object
+   cl->BufferObj = ctx->Array.NullBufferObj;
+#endif
+
+   for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++) {
+      cl = &ac->Cache.TexCoord[i];
+      cl->Size = 4;
+      cl->Type = GL_FLOAT;
+      cl->Stride = 0;
+      cl->StrideB = 4 * sizeof(GLfloat);
+      cl->Ptr = (GLubyte *) MALLOC( cl->StrideB * size );
+      cl->Enabled = 1;
+      cl->Flags = 0;
+#if FEATURE_ARB_vertex_buffer_object
+      cl->BufferObj = ctx->Array.NullBufferObj;
+#endif
+   }
+
+   cl = &ac->Cache.EdgeFlag;
+   cl->Size = 1;
+   cl->Type = GL_UNSIGNED_BYTE;
+   cl->Stride = 0;
+   cl->StrideB = sizeof(GLubyte);
+   cl->Ptr = (GLubyte *) MALLOC( cl->StrideB * size );
+   cl->Enabled = 1;
+   cl->Flags = 0;
+#if FEATURE_ARB_vertex_buffer_object
+   cl->BufferObj = ctx->Array.NullBufferObj;
+#endif
+
+   for (i = 0 ; i < VERT_ATTRIB_MAX; i++) {
+      cl = &ac->Cache.Attrib[i];
+      cl->Size = 4;
+      cl->Type = GL_FLOAT;
+      cl->Stride = 0;
+      cl->StrideB = 4 * sizeof(GLfloat);
+      cl->Ptr = (GLubyte *) MALLOC( cl->StrideB * size );
+      cl->Enabled = 1;
+      cl->Flags = 0;
+#if FEATURE_ARB_vertex_buffer_object
+      cl->BufferObj = ctx->Array.NullBufferObj;
+#endif
+   }
+}
+
+
+/* This storage used to hold translated client data if type or stride
+ * need to be fixed.
+ */
+static void _ac_elts_init( GLcontext *ctx )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+   GLuint size = 1000;
+
+   ac->Elts = (GLuint *)MALLOC( sizeof(GLuint) * size );
+   ac->elt_size = size;
+}
+
+static void _ac_raw_init( GLcontext *ctx )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+   GLuint i;
+
+   ac->Raw.Color = ac->Fallback.Color;
+   ac->Raw.EdgeFlag = ac->Fallback.EdgeFlag;
+   ac->Raw.FogCoord = ac->Fallback.FogCoord;
+   ac->Raw.Index = ac->Fallback.Index;
+   ac->Raw.Normal = ac->Fallback.Normal;
+   ac->Raw.SecondaryColor = ac->Fallback.SecondaryColor;
+   ac->Raw.Vertex = ctx->Array.Vertex;
+
+   ac->IsCached.Color = GL_FALSE;
+   ac->IsCached.EdgeFlag = GL_FALSE;
+   ac->IsCached.FogCoord = GL_FALSE;
+   ac->IsCached.Index = GL_FALSE;
+   ac->IsCached.Normal = GL_FALSE;
+   ac->IsCached.SecondaryColor = GL_FALSE;
+   ac->IsCached.Vertex = GL_FALSE;
+
+   for (i = 0 ; i < MAX_TEXTURE_COORD_UNITS ; i++) {
+      ac->Raw.TexCoord[i] = ac->Fallback.TexCoord[i];
+      ac->IsCached.TexCoord[i] = GL_FALSE;
+   }
+
+   for (i = 0 ; i < VERT_ATTRIB_MAX ; i++) {
+      ac->Raw.Attrib[i] = ac->Fallback.Attrib[i];
+      ac->IsCached.Attrib[i] = GL_FALSE;
+   }
+}
+
+GLboolean _ac_CreateContext( GLcontext *ctx )
+{
+   ctx->acache_context = CALLOC(sizeof(ACcontext));
+   if (ctx->acache_context) {
+      _ac_cache_init( ctx );
+      _ac_fallbacks_init( ctx );
+      _ac_raw_init( ctx );
+      _ac_elts_init( ctx );
+      return GL_TRUE;
+   }
+   return GL_FALSE;
+}
+
+void _ac_DestroyContext( GLcontext *ctx )
+{
+   struct gl_buffer_object *nullObj = ctx->Array.NullBufferObj;
+   ACcontext *ac = AC_CONTEXT(ctx);
+   GLint i;
+
+   /* only free vertex data if it's really a pointer to vertex data and
+    * not an offset into a buffer object.
+    */
+   if (ac->Cache.Vertex.Ptr && ac->Cache.Vertex.BufferObj == nullObj)
+      FREE( (void *) ac->Cache.Vertex.Ptr );
+   if (ac->Cache.Normal.Ptr && ac->Cache.Normal.BufferObj == nullObj)
+      FREE( (void *) ac->Cache.Normal.Ptr );
+   if (ac->Cache.Color.Ptr && ac->Cache.Color.BufferObj == nullObj)
+      FREE( (void *) ac->Cache.Color.Ptr );
+   if (ac->Cache.SecondaryColor.Ptr && ac->Cache.SecondaryColor.BufferObj == nullObj)
+      FREE( (void *) ac->Cache.SecondaryColor.Ptr );
+   if (ac->Cache.EdgeFlag.Ptr && ac->Cache.EdgeFlag.BufferObj == nullObj)
+      FREE( (void *) ac->Cache.EdgeFlag.Ptr );
+   if (ac->Cache.Index.Ptr && ac->Cache.Index.BufferObj == nullObj)
+      FREE( (void *) ac->Cache.Index.Ptr );
+   if (ac->Cache.FogCoord.Ptr && ac->Cache.FogCoord.BufferObj == nullObj)
+      FREE( (void *) ac->Cache.FogCoord.Ptr );
+
+   for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++) {
+      if (ac->Cache.TexCoord[i].Ptr && ac->Cache.TexCoord[i].BufferObj == nullObj)
+	 FREE( (void *) ac->Cache.TexCoord[i].Ptr );
+   }
+
+   for (i = 0; i < VERT_ATTRIB_MAX; i++) {
+      if (ac->Cache.Attrib[i].Ptr && ac->Cache.Attrib[i].BufferObj == nullObj)
+	 FREE( (void *) ac->Cache.Attrib[i].Ptr );
+   }
+
+   if (ac->Elts)
+      FREE( ac->Elts );
+
+   /* Free the context structure itself */
+   FREE(ac);
+   ctx->acache_context = NULL;
+}
+
+void _ac_InvalidateState( GLcontext *ctx, GLuint new_state )
+{
+   AC_CONTEXT(ctx)->NewState |= new_state;
+   AC_CONTEXT(ctx)->NewArrayState |= ctx->Array.NewState;
+}
diff --git a/reactos/lib/mesa32/src/array_cache/ac_context.h b/reactos/lib/mesa32/src/array_cache/ac_context.h
new file mode 100644
index 00000000000..36aded3152c
--- /dev/null
+++ b/reactos/lib/mesa32/src/array_cache/ac_context.h
@@ -0,0 +1,99 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+#ifndef _AC_CONTEXT_H
+#define _AC_CONTEXT_H
+
+#include "glheader.h"
+#include "mtypes.h"
+
+#include "array_cache/acache.h"
+
+/* These are used to make the ctx->Current values look like
+ * arrays (with zero StrideB).
+ */
+struct ac_arrays {
+   struct gl_client_array Vertex;
+   struct gl_client_array Normal;
+   struct gl_client_array Color;
+   struct gl_client_array SecondaryColor;
+   struct gl_client_array FogCoord;
+   struct gl_client_array Index;
+   struct gl_client_array TexCoord[MAX_TEXTURE_COORD_UNITS];
+   struct gl_client_array EdgeFlag;
+   struct gl_client_array Attrib[VERT_ATTRIB_MAX];  /* GL_NV_vertex_program */
+};
+
+struct ac_array_pointers {
+   struct gl_client_array *Vertex;
+   struct gl_client_array *Normal;
+   struct gl_client_array *Color;
+   struct gl_client_array *SecondaryColor;
+   struct gl_client_array *FogCoord;
+   struct gl_client_array *Index;
+   struct gl_client_array *TexCoord[MAX_TEXTURE_COORD_UNITS];
+   struct gl_client_array *EdgeFlag;
+   struct gl_client_array *Attrib[VERT_ATTRIB_MAX];  /* GL_NV_vertex_program */
+};
+
+struct ac_array_flags {
+   GLboolean Vertex;
+   GLboolean Normal;
+   GLboolean Color;
+   GLboolean SecondaryColor;
+   GLboolean FogCoord;
+   GLboolean Index;
+   GLboolean TexCoord[MAX_TEXTURE_COORD_UNITS];
+   GLboolean EdgeFlag;
+   GLboolean Attrib[VERT_ATTRIB_MAX];  /* GL_NV_vertex_program */
+};
+
+
+typedef struct {
+   GLuint NewState;		/* not needed? */
+   GLuint NewArrayState;
+
+   /* Facility for importing and caching array data:
+    */
+   struct ac_arrays Fallback;
+   struct ac_arrays Cache;
+   struct ac_arrays Raw;
+   struct ac_array_flags IsCached;
+   GLuint start;
+   GLuint count;
+
+   /* Facility for importing element lists:
+    */
+   GLuint *Elts;
+   GLuint elt_size;
+
+} ACcontext;
+
+#define AC_CONTEXT(ctx) ((ACcontext *)ctx->acache_context)
+
+#endif
diff --git a/reactos/lib/mesa32/src/array_cache/ac_import.c b/reactos/lib/mesa32/src/array_cache/ac_import.c
new file mode 100644
index 00000000000..7ec1d00ee58
--- /dev/null
+++ b/reactos/lib/mesa32/src/array_cache/ac_import.c
@@ -0,0 +1,881 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+#include "glheader.h"
+#include "macros.h"
+#include "imports.h"
+#include "mtypes.h"
+
+#include "math/m_translate.h"
+#include "array_cache/ac_context.h"
+#include "math/m_translate.h"
+
+#define STRIDE_ARRAY( array, offset ) 					\
+do {									\
+   GLubyte *tmp = ADD_POINTERS( (array).BufferObj->Data, (array).Ptr )	\
+                + (offset) * (array).StrideB;				\
+   (array).Ptr = tmp;							\
+} while (0)
+
+
+/* Set the array pointer back to its source when the cached data is
+ * invalidated:
+ */
+static void reset_texcoord( GLcontext *ctx, GLuint unit )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+
+   if (ctx->Array.TexCoord[unit].Enabled) {
+      ac->Raw.TexCoord[unit] = ctx->Array.TexCoord[unit];
+      STRIDE_ARRAY(ac->Raw.TexCoord[unit], ac->start);
+   }
+   else {
+      ac->Raw.TexCoord[unit] = ac->Fallback.TexCoord[unit];
+
+      if (ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit][3] != 1.0)
+	 ac->Raw.TexCoord[unit].Size = 4;
+      else if (ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit][2] != 0.0)
+	 ac->Raw.TexCoord[unit].Size = 3;
+      else
+	 ac->Raw.TexCoord[unit].Size = 2;
+   }
+
+   ac->IsCached.TexCoord[unit] = GL_FALSE;
+   ac->NewArrayState &= ~_NEW_ARRAY_TEXCOORD(unit);
+}
+
+static void reset_vertex( GLcontext *ctx )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+   ASSERT(ctx->Array.Vertex.Enabled
+          || (ctx->VertexProgram.Enabled && ctx->Array.VertexAttrib[0].Enabled));
+   ac->Raw.Vertex = ctx->Array.Vertex;
+   STRIDE_ARRAY(ac->Raw.Vertex, ac->start);
+   ac->IsCached.Vertex = GL_FALSE;
+   ac->NewArrayState &= ~_NEW_ARRAY_VERTEX;
+}
+
+
+static void reset_normal( GLcontext *ctx )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+
+   if (ctx->Array.Normal.Enabled) {
+      ac->Raw.Normal = ctx->Array.Normal;
+      STRIDE_ARRAY(ac->Raw.Normal, ac->start);
+   }
+   else {
+      ac->Raw.Normal = ac->Fallback.Normal;
+   }
+
+   ac->IsCached.Normal = GL_FALSE;
+   ac->NewArrayState &= ~_NEW_ARRAY_NORMAL;
+}
+
+
+static void reset_color( GLcontext *ctx )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+
+
+   if (ctx->Array.Color.Enabled) {
+      ac->Raw.Color = ctx->Array.Color;
+      STRIDE_ARRAY(ac->Raw.Color, ac->start);
+   }
+   else
+      ac->Raw.Color = ac->Fallback.Color;
+
+   ac->IsCached.Color = GL_FALSE;
+   ac->NewArrayState &= ~_NEW_ARRAY_COLOR0;
+}
+
+
+static void reset_secondarycolor( GLcontext *ctx )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+
+   if (ctx->Array.SecondaryColor.Enabled & _NEW_ARRAY_COLOR1) {
+      ac->Raw.SecondaryColor = ctx->Array.SecondaryColor;
+      STRIDE_ARRAY(ac->Raw.SecondaryColor, ac->start);
+   }
+   else
+      ac->Raw.SecondaryColor = ac->Fallback.SecondaryColor;
+
+   ac->IsCached.SecondaryColor = GL_FALSE;
+   ac->NewArrayState &= ~_NEW_ARRAY_COLOR1;
+}
+
+
+static void reset_index( GLcontext *ctx )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+
+   if (ctx->Array.Index.Enabled & _NEW_ARRAY_INDEX) {
+      ac->Raw.Index = ctx->Array.Index;
+      STRIDE_ARRAY(ac->Raw.Index, ac->start);
+   }
+   else
+      ac->Raw.Index = ac->Fallback.Index;
+
+   ac->IsCached.Index = GL_FALSE;
+   ac->NewArrayState &= ~_NEW_ARRAY_INDEX;
+}
+
+
+static void reset_fogcoord( GLcontext *ctx )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+
+   if (ctx->Array.FogCoord.Enabled & _NEW_ARRAY_FOGCOORD) {
+      ac->Raw.FogCoord = ctx->Array.FogCoord;
+      STRIDE_ARRAY(ac->Raw.FogCoord, ac->start);
+   }
+   else
+      ac->Raw.FogCoord = ac->Fallback.FogCoord;
+
+   ac->IsCached.FogCoord = GL_FALSE;
+   ac->NewArrayState &= ~_NEW_ARRAY_FOGCOORD;
+}
+
+
+static void reset_edgeflag( GLcontext *ctx )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+
+   if (ctx->Array.EdgeFlag.Enabled & _NEW_ARRAY_EDGEFLAG) {
+      ac->Raw.EdgeFlag = ctx->Array.EdgeFlag;
+      STRIDE_ARRAY(ac->Raw.EdgeFlag, ac->start);
+   }
+   else
+      ac->Raw.EdgeFlag = ac->Fallback.EdgeFlag;
+
+   ac->IsCached.EdgeFlag = GL_FALSE;
+   ac->NewArrayState &= ~_NEW_ARRAY_EDGEFLAG;
+}
+
+
+static void reset_attrib( GLcontext *ctx, GLuint index )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+
+   if (ctx->Array.VertexAttrib[index].Enabled) {
+      ac->Raw.Attrib[index] = ctx->Array.VertexAttrib[index];
+      STRIDE_ARRAY(ac->Raw.Attrib[index], ac->start);
+   }
+   else
+      ac->Raw.Attrib[index] = ac->Fallback.Attrib[index];
+
+   ac->IsCached.Attrib[index] = GL_FALSE;
+   ac->NewArrayState &= ~_NEW_ARRAY_ATTRIB(index);
+}
+
+
+/*
+ * Generic import function for color data
+ */
+static void import( GLcontext *ctx,
+		    GLenum type,
+		    struct gl_client_array *to,
+		    struct gl_client_array *from )
+{
+   GLubyte *dest;
+   const GLubyte *src;
+   ACcontext *ac = AC_CONTEXT(ctx);
+
+   if (type == 0) 
+      type = from->Type;
+
+   /* The dest and source data addresses are the sum of the buffer
+    * object's start plus the vertex array pointer/offset.
+    */
+   dest = ADD_POINTERS(to->BufferObj->Data, to->Ptr);
+   src = ADD_POINTERS(from->BufferObj->Data, from->Ptr);
+
+   switch (type) {
+   case GL_FLOAT:
+      _math_trans_4fc( (GLfloat (*)[4]) dest,
+                       src,
+		       from->StrideB,
+		       from->Type,
+		       from->Size,
+		       0,
+		       ac->count - ac->start);
+
+      to->StrideB = 4 * sizeof(GLfloat);
+      to->Type = GL_FLOAT;
+      break;
+      
+   case GL_UNSIGNED_BYTE:
+      _math_trans_4ub( (GLubyte (*)[4]) dest,
+                       src,
+		       from->StrideB,
+		       from->Type,
+		       from->Size,
+		       0,
+		       ac->count - ac->start);
+
+      to->StrideB = 4 * sizeof(GLubyte);
+      to->Type = GL_UNSIGNED_BYTE;
+      break;
+
+   case GL_UNSIGNED_SHORT:
+      _math_trans_4us( (GLushort (*)[4]) dest,
+                       src,
+		       from->StrideB,
+		       from->Type,
+		       from->Size,
+		       0,
+		       ac->count - ac->start);
+
+      to->StrideB = 4 * sizeof(GLushort);
+      to->Type = GL_UNSIGNED_SHORT;
+      break;
+      
+   default:
+      ASSERT(0);
+      break;
+   }
+}
+
+
+
+/*
+ * Functions to import array ranges with specified types and strides.
+ * For example, if the vertex data is GLshort[2] and we want GLfloat[3]
+ * we'll use an import function to do the data conversion.
+ */
+
+static void import_texcoord( GLcontext *ctx, GLuint unit,
+			     GLenum type, GLuint stride )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+   struct gl_client_array *from = &ac->Raw.TexCoord[unit];
+   struct gl_client_array *to = &ac->Cache.TexCoord[unit];
+
+   ASSERT(unit < ctx->Const.MaxTextureCoordUnits);
+
+   /* Limited choices at this stage:
+    */
+   ASSERT(type == GL_FLOAT);
+   ASSERT(stride == 4*sizeof(GLfloat) || stride == 0);
+   ASSERT(ac->count - ac->start < ctx->Const.MaxArrayLockSize);
+
+   _math_trans_4f( (GLfloat (*)[4]) to->Ptr,
+		   from->Ptr,
+		   from->StrideB,
+		   from->Type,
+		   from->Size,
+		   0,
+		   ac->count - ac->start);
+
+   to->Size = from->Size;
+   to->StrideB = 4 * sizeof(GLfloat);
+   to->Type = GL_FLOAT;
+   ac->IsCached.TexCoord[unit] = GL_TRUE;
+}
+
+static void import_vertex( GLcontext *ctx,
+			   GLenum type, GLuint stride )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+   struct gl_client_array *from = &ac->Raw.Vertex;
+   struct gl_client_array *to = &ac->Cache.Vertex;
+
+   /* Limited choices at this stage:
+    */
+   ASSERT(type == GL_FLOAT);
+   ASSERT(stride == 4*sizeof(GLfloat) || stride == 0);
+
+   _math_trans_4f( (GLfloat (*)[4]) to->Ptr,
+		   from->Ptr,
+		   from->StrideB,
+		   from->Type,
+		   from->Size,
+		   0,
+		   ac->count - ac->start);
+
+   to->Size = from->Size;
+   to->StrideB = 4 * sizeof(GLfloat);
+   to->Type = GL_FLOAT;
+   ac->IsCached.Vertex = GL_TRUE;
+}
+
+static void import_normal( GLcontext *ctx,
+			   GLenum type, GLuint stride )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+   struct gl_client_array *from = &ac->Raw.Normal;
+   struct gl_client_array *to = &ac->Cache.Normal;
+
+   /* Limited choices at this stage:
+    */
+   ASSERT(type == GL_FLOAT);
+   ASSERT(stride == 3*sizeof(GLfloat) || stride == 0);
+
+   _math_trans_3f( (GLfloat (*)[3]) to->Ptr,
+		   from->Ptr,
+		   from->StrideB,
+		   from->Type,
+		   0,
+		   ac->count - ac->start);
+
+   to->StrideB = 3 * sizeof(GLfloat);
+   to->Type = GL_FLOAT;
+   ac->IsCached.Normal = GL_TRUE;
+}
+
+static void import_color( GLcontext *ctx,
+			  GLenum type, GLuint stride )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+   struct gl_client_array *from = &ac->Raw.Color;
+   struct gl_client_array *to = &ac->Cache.Color;
+
+   import( ctx, type, to, from );
+   
+   ac->IsCached.Color = GL_TRUE;
+}
+
+static void import_index( GLcontext *ctx,
+			  GLenum type, GLuint stride )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+   struct gl_client_array *from = &ac->Raw.Index;
+   struct gl_client_array *to = &ac->Cache.Index;
+
+   /* Limited choices at this stage:
+    */
+   ASSERT(type == GL_UNSIGNED_INT);
+   ASSERT(stride == sizeof(GLuint) || stride == 0);
+
+   _math_trans_1ui( (GLuint *) to->Ptr,
+		    from->Ptr,
+		    from->StrideB,
+		    from->Type,
+		    0,
+		    ac->count - ac->start);
+
+   to->StrideB = sizeof(GLuint);
+   to->Type = GL_UNSIGNED_INT;
+   ac->IsCached.Index = GL_TRUE;
+}
+
+static void import_secondarycolor( GLcontext *ctx,
+				   GLenum type, GLuint stride )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+   struct gl_client_array *from = &ac->Raw.SecondaryColor;
+   struct gl_client_array *to = &ac->Cache.SecondaryColor;
+
+   import( ctx, type, to, from );
+
+   ac->IsCached.SecondaryColor = GL_TRUE;
+}
+
+static void import_fogcoord( GLcontext *ctx,
+			     GLenum type, GLuint stride )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+   struct gl_client_array *from = &ac->Raw.FogCoord;
+   struct gl_client_array *to = &ac->Cache.FogCoord;
+
+   /* Limited choices at this stage:
+    */
+   ASSERT(type == GL_FLOAT);
+   ASSERT(stride == sizeof(GLfloat) || stride == 0);
+
+   _math_trans_1f( (GLfloat *) to->Ptr,
+		   from->Ptr,
+		   from->StrideB,
+		   from->Type,
+		   0,
+		   ac->count - ac->start);
+
+   to->StrideB = sizeof(GLfloat);
+   to->Type = GL_FLOAT;
+   ac->IsCached.FogCoord = GL_TRUE;
+}
+
+static void import_edgeflag( GLcontext *ctx,
+			     GLenum type, GLuint stride )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+   struct gl_client_array *from = &ac->Raw.EdgeFlag;
+   struct gl_client_array *to = &ac->Cache.EdgeFlag;
+
+   /* Limited choices at this stage:
+    */
+   ASSERT(type == GL_UNSIGNED_BYTE);
+   ASSERT(stride == sizeof(GLubyte) || stride == 0);
+
+   _math_trans_1ub( (GLubyte *) to->Ptr,
+		    from->Ptr,
+		    from->StrideB,
+		    from->Type,
+		    0,
+		    ac->count - ac->start);
+
+   to->StrideB = sizeof(GLubyte);
+   to->Type = GL_UNSIGNED_BYTE;
+   ac->IsCached.EdgeFlag = GL_TRUE;
+}
+
+static void import_attrib( GLcontext *ctx, GLuint index,
+                           GLenum type, GLuint stride )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+   struct gl_client_array *from = &ac->Raw.Attrib[index];
+   struct gl_client_array *to = &ac->Cache.Attrib[index];
+
+   ASSERT(index < VERT_ATTRIB_MAX);
+
+   /* Limited choices at this stage:
+    */
+   ASSERT(type == GL_FLOAT);
+   ASSERT(stride == 4*sizeof(GLfloat) || stride == 0);
+   ASSERT(ac->count - ac->start < ctx->Const.MaxArrayLockSize);
+
+   _math_trans_4f( (GLfloat (*)[4]) to->Ptr,
+		   from->Ptr,
+		   from->StrideB,
+		   from->Type,
+		   from->Size,
+		   0,
+		   ac->count - ac->start);
+
+   to->Size = from->Size;
+   to->StrideB = 4 * sizeof(GLfloat);
+   to->Type = GL_FLOAT;
+   ac->IsCached.Attrib[index] = GL_TRUE;
+}
+
+
+
+/*
+ * Externals to request arrays with specific properties:
+ */
+
+
+struct gl_client_array *_ac_import_texcoord( GLcontext *ctx,
+					     GLuint unit,
+					     GLenum type,
+					     GLuint reqstride,
+					     GLuint reqsize,
+					     GLboolean reqwriteable,
+					     GLboolean *writeable )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+
+   ASSERT(unit < ctx->Const.MaxTextureCoordUnits);
+
+   /* Can we keep the existing version?
+    */
+   if (ac->NewArrayState & _NEW_ARRAY_TEXCOORD(unit))
+      reset_texcoord( ctx, unit );
+
+   /* Is the request impossible?
+    */
+   if (reqsize != 0 && ac->Raw.TexCoord[unit].Size > (GLint) reqsize)
+      return 0;
+
+   /* Do we need to pull in a copy of the client data:
+    */
+   if (ac->Raw.TexCoord[unit].Type != type ||
+       (reqstride != 0 && ac->Raw.TexCoord[unit].StrideB != (GLint)reqstride) ||
+       reqwriteable)
+   {
+      if (!ac->IsCached.TexCoord[unit])
+	 import_texcoord(ctx, unit, type, reqstride );
+      *writeable = GL_TRUE;
+      return &ac->Cache.TexCoord[unit];
+   }
+   else {
+      *writeable = GL_FALSE;
+      return &ac->Raw.TexCoord[unit];
+   }
+}
+
+struct gl_client_array *_ac_import_vertex( GLcontext *ctx,
+					   GLenum type,
+					   GLuint reqstride,
+					   GLuint reqsize,
+					   GLboolean reqwriteable,
+					   GLboolean *writeable )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+
+   /* Can we keep the existing version?
+    */
+   if (ac->NewArrayState & _NEW_ARRAY_VERTEX)
+      reset_vertex( ctx );
+
+   /* Is the request impossible?
+    */
+   if (reqsize != 0 && ac->Raw.Vertex.Size > (GLint) reqsize)
+      return 0;
+
+   /* Do we need to pull in a copy of the client data:
+    */
+   if (ac->Raw.Vertex.Type != type ||
+       (reqstride != 0 && ac->Raw.Vertex.StrideB != (GLint) reqstride) ||
+       reqwriteable)
+   {
+      if (!ac->IsCached.Vertex)
+	 import_vertex(ctx, type, reqstride );
+      *writeable = GL_TRUE;
+      return &ac->Cache.Vertex;
+   }
+   else {
+      *writeable = GL_FALSE;
+      return &ac->Raw.Vertex;
+   }
+}
+
+struct gl_client_array *_ac_import_normal( GLcontext *ctx,
+					   GLenum type,
+					   GLuint reqstride,
+					   GLboolean reqwriteable,
+					   GLboolean *writeable )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+
+   /* Can we keep the existing version?
+    */
+   if (ac->NewArrayState & _NEW_ARRAY_NORMAL)
+      reset_normal( ctx );
+
+   /* Do we need to pull in a copy of the client data:
+    */
+   if (ac->Raw.Normal.Type != type ||
+       (reqstride != 0 && ac->Raw.Normal.StrideB != (GLint) reqstride) ||
+       reqwriteable)
+   {
+      if (!ac->IsCached.Normal)
+	 import_normal(ctx, type, reqstride );
+      *writeable = GL_TRUE;
+      return &ac->Cache.Normal;
+   }
+   else {
+      *writeable = GL_FALSE;
+      return &ac->Raw.Normal;
+   }
+}
+
+struct gl_client_array *_ac_import_color( GLcontext *ctx,
+					  GLenum type,
+					  GLuint reqstride,
+					  GLuint reqsize,
+					  GLboolean reqwriteable,
+					  GLboolean *writeable )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+
+   /* Can we keep the existing version?
+    */
+   if (ac->NewArrayState & _NEW_ARRAY_COLOR0)
+      reset_color( ctx );
+
+   /* Is the request impossible?
+    */
+   if (reqsize != 0 && ac->Raw.Color.Size > (GLint) reqsize) {
+      return 0;
+   }
+
+   /* Do we need to pull in a copy of the client data:
+    */
+   if ((type != 0 && ac->Raw.Color.Type != type) ||
+       (reqstride != 0 && ac->Raw.Color.StrideB != (GLint) reqstride) ||
+       reqwriteable)
+   {
+      if (!ac->IsCached.Color)
+	 import_color(ctx, type, reqstride );
+      *writeable = GL_TRUE;
+      return &ac->Cache.Color;
+   }
+   else {
+      *writeable = GL_FALSE;
+      return &ac->Raw.Color;
+   }
+}
+
+struct gl_client_array *_ac_import_index( GLcontext *ctx,
+					  GLenum type,
+					  GLuint reqstride,
+					  GLboolean reqwriteable,
+					  GLboolean *writeable )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+
+   /* Can we keep the existing version?
+    */
+   if (ac->NewArrayState & _NEW_ARRAY_INDEX)
+      reset_index( ctx );
+
+
+   /* Do we need to pull in a copy of the client data:
+    */
+   if (ac->Raw.Index.Type != type ||
+       (reqstride != 0 && ac->Raw.Index.StrideB != (GLint) reqstride) ||
+       reqwriteable)
+   {
+      if (!ac->IsCached.Index)
+	 import_index(ctx, type, reqstride );
+      *writeable = GL_TRUE;
+      return &ac->Cache.Index;
+   }
+   else {
+      *writeable = GL_FALSE;
+      return &ac->Raw.Index;
+   }
+}
+
+struct gl_client_array *_ac_import_secondarycolor( GLcontext *ctx,
+						   GLenum type,
+						   GLuint reqstride,
+						   GLuint reqsize,
+						   GLboolean reqwriteable,
+						   GLboolean *writeable )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+
+   /* Can we keep the existing version?
+    */
+   if (ac->NewArrayState & _NEW_ARRAY_COLOR1)
+      reset_secondarycolor( ctx );
+
+   /* Is the request impossible?
+    */
+   if (reqsize != 0 && ac->Raw.SecondaryColor.Size > (GLint) reqsize)
+      return 0;
+
+   /* Do we need to pull in a copy of the client data:
+    */
+   if ((type != 0 && ac->Raw.SecondaryColor.Type != type) ||
+       (reqstride != 0 && ac->Raw.SecondaryColor.StrideB != (GLint)reqstride) ||
+       reqwriteable)
+   {
+      if (!ac->IsCached.SecondaryColor)
+	 import_secondarycolor(ctx, type, reqstride );
+      *writeable = GL_TRUE;
+      return &ac->Cache.SecondaryColor;
+   }
+   else {
+      *writeable = GL_FALSE;
+      return &ac->Raw.SecondaryColor;
+   }
+}
+
+struct gl_client_array *_ac_import_fogcoord( GLcontext *ctx,
+					     GLenum type,
+					     GLuint reqstride,
+					     GLboolean reqwriteable,
+					     GLboolean *writeable )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+
+   /* Can we keep the existing version?
+    */
+   if (ac->NewArrayState & _NEW_ARRAY_FOGCOORD)
+      reset_fogcoord( ctx );
+
+   /* Do we need to pull in a copy of the client data:
+    */
+   if (ac->Raw.FogCoord.Type != type ||
+       (reqstride != 0 && ac->Raw.FogCoord.StrideB != (GLint) reqstride) ||
+       reqwriteable)
+   {
+      if (!ac->IsCached.FogCoord)
+	 import_fogcoord(ctx, type, reqstride );
+      *writeable = GL_TRUE;
+      return &ac->Cache.FogCoord;
+   }
+   else {
+      *writeable = GL_FALSE;
+      return &ac->Raw.FogCoord;
+   }
+}
+
+struct gl_client_array *_ac_import_edgeflag( GLcontext *ctx,
+					     GLenum type,
+					     GLuint reqstride,
+					     GLboolean reqwriteable,
+					     GLboolean *writeable )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+
+   /* Can we keep the existing version?
+    */
+   if (ac->NewArrayState & _NEW_ARRAY_EDGEFLAG)
+      reset_edgeflag( ctx );
+
+   /* Do we need to pull in a copy of the client data:
+    */
+   if (ac->Raw.EdgeFlag.Type != type ||
+       (reqstride != 0 && ac->Raw.EdgeFlag.StrideB != (GLint) reqstride) ||
+       reqwriteable)
+   {
+      if (!ac->IsCached.EdgeFlag)
+	 import_edgeflag(ctx, type, reqstride );
+      *writeable = GL_TRUE;
+      return &ac->Cache.EdgeFlag;
+   }
+   else {
+      *writeable = GL_FALSE;
+      return &ac->Raw.EdgeFlag;
+   }
+}
+
+/* GL_NV_vertex_program */
+struct gl_client_array *_ac_import_attrib( GLcontext *ctx,
+                                           GLuint index,
+                                           GLenum type,
+                                           GLuint reqstride,
+                                           GLuint reqsize,
+                                           GLboolean reqwriteable,
+                                           GLboolean *writeable )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+
+   ASSERT(index < VERT_ATTRIB_MAX);
+
+   /* Can we keep the existing version?
+    */
+   if (ac->NewArrayState & _NEW_ARRAY_ATTRIB(index))
+      reset_attrib( ctx, index );
+
+   /* Is the request impossible?
+    */
+   if (reqsize != 0 && ac->Raw.Attrib[index].Size > (GLint) reqsize)
+      return NULL;
+
+   /* Do we need to pull in a copy of the client data:
+    */
+   if (ac->Raw.Attrib[index].Type != type ||
+       (reqstride != 0 && ac->Raw.Attrib[index].StrideB != (GLint)reqstride) ||
+       reqwriteable)
+   {
+      if (!ac->IsCached.Attrib[index])
+	 import_attrib(ctx, index, type, reqstride );
+      *writeable = GL_TRUE;
+      return &ac->Cache.Attrib[index];
+   }
+   else {
+      *writeable = GL_FALSE;
+      return &ac->Raw.Attrib[index];
+   }
+}
+
+
+/* Clients must call this function to validate state and set bounds
+ * before importing any data:
+ */
+void _ac_import_range( GLcontext *ctx, GLuint start, GLuint count )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+
+   if (!ctx->Array.LockCount) {
+      /* Not locked, discard cached data.  Changes to lock
+       * status are caught via. _ac_invalidate_state().
+       */
+      ac->NewArrayState = _NEW_ARRAY_ALL;
+      ac->start = start;
+      ac->count = count;
+   }
+   else {
+      /* Locked, discard data for any disabled arrays.  Require that
+       * the whole locked range always be dealt with, otherwise hard to
+       * maintain cached data in the face of clipping.
+       */
+      ac->NewArrayState |= ~ctx->Array._Enabled;
+      ac->start = ctx->Array.LockFirst;
+      ac->count = ctx->Array.LockCount;
+      ASSERT(ac->start == start); /* hmm? */
+      ASSERT(ac->count == count);
+   }
+}
+
+
+
+/* Additional convienence function for importing the element list
+ * for glDrawElements() and glDrawRangeElements().
+ */
+CONST void *
+_ac_import_elements( GLcontext *ctx,
+		     GLenum new_type,
+		     GLuint count,
+		     GLenum old_type,
+		     CONST void *indices )
+{
+   ACcontext *ac = AC_CONTEXT(ctx);
+
+   if (old_type == new_type)
+      return indices;
+
+   if (ac->elt_size < count * sizeof(GLuint)) {
+      if (ac->Elts) FREE(ac->Elts);
+      while (ac->elt_size < count * sizeof(GLuint))
+	 ac->elt_size *= 2;
+      ac->Elts = (GLuint *) MALLOC(ac->elt_size);
+   }
+
+   switch (new_type) {
+   case GL_UNSIGNED_BYTE:
+      ASSERT(0);
+      return 0;
+   case GL_UNSIGNED_SHORT:
+      ASSERT(0);
+      return 0;
+   case GL_UNSIGNED_INT: {
+      GLuint *out = (GLuint *)ac->Elts;
+      GLuint i;
+
+      switch (old_type) {
+      case GL_UNSIGNED_BYTE: {
+	 CONST GLubyte *in = (CONST GLubyte *)indices;
+	 for (i = 0 ; i < count ; i++)
+	    out[i] = in[i];
+	 break;
+      }
+      case GL_UNSIGNED_SHORT: {
+	 CONST GLushort *in = (CONST GLushort *)indices;
+	 for (i = 0 ; i < count ; i++)
+	       out[i] = in[i];
+	 break;
+      }
+      default:
+	 ASSERT(0);
+      }
+
+      return (CONST void *)out;
+   }
+   default:
+      ASSERT(0);
+      break;
+   }
+
+   return 0;
+}
diff --git a/reactos/lib/mesa32/src/array_cache/acache.h b/reactos/lib/mesa32/src/array_cache/acache.h
new file mode 100644
index 00000000000..2bb64f3656c
--- /dev/null
+++ b/reactos/lib/mesa32/src/array_cache/acache.h
@@ -0,0 +1,132 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+#ifndef _ARRAYCACHE_H
+#define _ARRAYCACHE_H
+
+#include "mtypes.h"
+
+
+extern GLboolean
+_ac_CreateContext( GLcontext *ctx );
+
+extern void
+_ac_DestroyContext( GLcontext *ctx );
+
+extern void
+_ac_InvalidateState( GLcontext *ctx, GLuint new_state );
+
+extern struct gl_client_array *
+_ac_import_vertex( GLcontext *ctx,
+		   GLenum type,
+		   GLuint reqstride,
+		   GLuint reqsize,
+		   GLboolean reqwritable,
+		   GLboolean *writable );
+
+extern struct gl_client_array *
+_ac_import_normal( GLcontext *ctx,
+		   GLenum type,
+		   GLuint reqstride,
+		   GLboolean reqwritable,
+		   GLboolean *writable );
+
+extern struct gl_client_array *
+_ac_import_color( GLcontext *ctx,
+		  GLenum type,
+		  GLuint reqstride,
+		  GLuint reqsize,
+		  GLboolean reqwritable,
+		  GLboolean *writable );
+
+extern struct gl_client_array *
+_ac_import_index( GLcontext *ctx,
+		  GLenum type,
+		  GLuint reqstride,
+		  GLboolean reqwritable,
+		  GLboolean *writable );
+
+extern struct gl_client_array *
+_ac_import_secondarycolor( GLcontext *ctx,
+			   GLenum type,
+			   GLuint reqstride,
+			   GLuint reqsize,
+			   GLboolean reqwritable,
+			   GLboolean *writable );
+
+extern struct gl_client_array *
+_ac_import_fogcoord( GLcontext *ctx,
+		     GLenum type,
+		     GLuint reqstride,
+		     GLboolean reqwritable,
+		     GLboolean *writable );
+
+extern struct gl_client_array *
+_ac_import_edgeflag( GLcontext *ctx,
+		     GLenum type,
+		     GLuint reqstride,
+		     GLboolean reqwritable,
+		     GLboolean *writable );
+
+extern struct gl_client_array *
+_ac_import_texcoord( GLcontext *ctx,
+		     GLuint unit,
+		     GLenum type,
+		     GLuint reqstride,
+		     GLuint reqsize,
+		     GLboolean reqwritable,
+		     GLboolean *writable );
+
+extern struct gl_client_array *
+_ac_import_attrib( GLcontext *ctx,
+                   GLuint index,
+                   GLenum type,
+                   GLuint reqstride,
+                   GLuint reqsize,
+                   GLboolean reqwritable,
+                   GLboolean *writable );
+
+
+/* Clients must call this function to validate state and set bounds
+ * before importing any data:
+ */
+extern void
+_ac_import_range( GLcontext *ctx, GLuint start, GLuint count );
+
+
+/* Additional convenience function:
+ */
+extern CONST void *
+_ac_import_elements( GLcontext *ctx,
+		     GLenum new_type,
+		     GLuint count,
+		     GLenum old_type,
+		     CONST void *indices );
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/array_cache/array_cache.dsp b/reactos/lib/mesa32/src/array_cache/array_cache.dsp
new file mode 100644
index 00000000000..5f1138dab5c
--- /dev/null
+++ b/reactos/lib/mesa32/src/array_cache/array_cache.dsp
@@ -0,0 +1,108 @@
+# Microsoft Developer Studio Project File - Name="array_cache" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=array_cache - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "array_cache.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "array_cache.mak" CFG="array_cache - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "array_cache - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "array_cache - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "array_cache - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "../../../include" /I "../" /I "../main" /I "../glapi" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "array_cache - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../" /I "../main" /I "../glapi" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "array_cache - Win32 Release"
+# Name "array_cache - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\ac_context.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ac_import.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\ac_context.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\acache.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/reactos/lib/mesa32/src/drivers/beos/GLView.cpp b/reactos/lib/mesa32/src/drivers/beos/GLView.cpp
new file mode 100644
index 00000000000..38da3161b30
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/beos/GLView.cpp
@@ -0,0 +1,1427 @@
+/* $Id: GLView.cpp,v 1.1 2004/07/16 22:12:29 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.0
+ * 
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include <assert.h>
+#include <stdio.h>
+
+extern "C" {
+
+#include "glheader.h"
+#include "buffers.h"
+#include "bufferobj.h"
+#include "context.h"
+#include "colormac.h"
+#include "depth.h"
+#include "extensions.h"
+#include "macros.h"
+#include "matrix.h"
+#include "mtypes.h"
+#include "texformat.h"
+#include "texobj.h"
+#include "teximage.h"
+#include "texstore.h"
+#include "array_cache/acache.h"
+#include "swrast/swrast.h"
+#include "swrast_setup/swrast_setup.h"
+#include "swrast/s_context.h"
+#include "swrast/s_depth.h"
+#include "swrast/s_lines.h"
+#include "swrast/s_triangle.h"
+#include "swrast/s_trispan.h"
+#include "tnl/tnl.h"
+#include "tnl/t_context.h"
+#include "tnl/t_pipeline.h"
+
+}	// extern "C"
+
+#include "GLView.h"
+
+// BeOS component ordering for B_RGBA32 bitmap format
+#define BE_RCOMP 2
+#define BE_GCOMP 1
+#define BE_BCOMP 0
+#define BE_ACOMP 3
+
+#define PACK_B_RGBA32(color) (color[BCOMP] | (color[GCOMP] << 8) | \
+							(color[RCOMP] << 16) | (color[ACOMP] << 24))
+
+#define PACK_B_RGB32(color) (color[BCOMP] | (color[GCOMP] << 8) | \
+							(color[RCOMP] << 16) | 0xFF000000)
+
+#define FLIP(coord) (LIBGGI_MODE(ggi_ctx->ggi_visual)->visible.y-(coord) - 1) 
+
+//
+// This object hangs off of the BGLView object.  We have to use
+// Be's BGLView class as-is to maintain binary compatibility (we
+// can't add new members to it).  Instead we just put all our data
+// in this class and use BGLVIew::m_gc to point to it.
+//
+class MesaDriver
+{
+public:
+	MesaDriver();
+	~MesaDriver();
+	void Init(BGLView * bglview, GLcontext * c, GLvisual * v, GLframebuffer * b);
+
+	void LockGL();
+	void UnlockGL();
+	void SwapBuffers() const;
+	void CopySubBuffer(GLint x, GLint y, GLuint width, GLuint height) const;
+	void Draw(BRect updateRect) const;
+
+private:
+	MesaDriver(const MesaDriver &rhs);  // copy constructor illegal
+	MesaDriver &operator=(const MesaDriver &rhs);  // assignment oper. illegal
+
+	GLcontext * 	m_glcontext;
+	GLvisual * 		m_glvisual;
+	GLframebuffer *	m_glframebuffer;
+
+	BGLView *		m_bglview;
+	BBitmap *		m_bitmap;
+
+	GLchan 			m_clear_color[4];  // buffer clear color
+	GLuint 			m_clear_index;      // buffer clear color index
+	GLint 			m_bottom;           // used for flipping Y coords
+	GLuint 			m_width;
+	GLuint			m_height;
+	
+   // Mesa Device Driver functions
+   static void 		UpdateState(GLcontext *ctx, GLuint new_state);
+   static void 		ClearIndex(GLcontext *ctx, GLuint index);
+   static void 		ClearColor(GLcontext *ctx, const GLfloat color[4]);
+   static void 		Clear(GLcontext *ctx, GLbitfield mask,
+                                GLboolean all, GLint x, GLint y,
+                                GLint width, GLint height);
+   static void 		ClearFront(GLcontext *ctx, GLboolean all, GLint x, GLint y,
+                          GLint width, GLint height);
+   static void 		ClearBack(GLcontext *ctx, GLboolean all, GLint x, GLint y,
+                         GLint width, GLint height);
+   static void 		Index(GLcontext *ctx, GLuint index);
+   static void 		Color(GLcontext *ctx, GLubyte r, GLubyte g,
+                     GLubyte b, GLubyte a);
+   static void 		SetBuffer(GLcontext *ctx, GLframebuffer *colorBuffer,
+                             GLenum mode);
+   static void 		GetBufferSize(GLframebuffer * framebuffer, GLuint *width,
+                             GLuint *height);
+   static const GLubyte *	GetString(GLcontext *ctx, GLenum name);
+
+   // Front-buffer functions
+   static void 		WriteRGBASpanFront(const GLcontext *ctx, GLuint n,
+                                  GLint x, GLint y,
+                                  CONST GLubyte rgba[][4],
+                                  const GLubyte mask[]);
+   static void 		WriteRGBSpanFront(const GLcontext *ctx, GLuint n,
+                                 GLint x, GLint y,
+                                 CONST GLubyte rgba[][3],
+                                 const GLubyte mask[]);
+   static void 		WriteMonoRGBASpanFront(const GLcontext *ctx, GLuint n,
+                                      GLint x, GLint y,
+                                      const GLchan color[4],
+                                      const GLubyte mask[]);
+   static void 		WriteRGBAPixelsFront(const GLcontext *ctx, GLuint n,
+                                    const GLint x[], const GLint y[],
+                                    CONST GLubyte rgba[][4],
+                                    const GLubyte mask[]);
+   static void 		WriteMonoRGBAPixelsFront(const GLcontext *ctx, GLuint n,
+                                        const GLint x[], const GLint y[],
+                                        const GLchan color[4],
+                                        const GLubyte mask[]);
+   static void 		WriteCI32SpanFront(const GLcontext *ctx, GLuint n,
+                                  GLint x, GLint y,
+                                  const GLuint index[], const GLubyte mask[]);
+   static void 		WriteCI8SpanFront(const GLcontext *ctx, GLuint n,
+                                 GLint x, GLint y,
+                                 const GLubyte index[], const GLubyte mask[]);
+   static void 		WriteMonoCISpanFront(const GLcontext *ctx, GLuint n,
+                                    GLint x, GLint y,
+                                    GLuint colorIndex, const GLubyte mask[]);
+   static void 		WriteCI32PixelsFront(const GLcontext *ctx,
+                                    GLuint n, const GLint x[], const GLint y[],
+                                    const GLuint index[], const GLubyte mask[]);
+   static void 		WriteMonoCIPixelsFront(const GLcontext *ctx, GLuint n,
+                                      const GLint x[], const GLint y[],
+                                      GLuint colorIndex, const GLubyte mask[]);
+   static void 		ReadCI32SpanFront(const GLcontext *ctx,
+                                 GLuint n, GLint x, GLint y, GLuint index[]);
+   static void 		ReadRGBASpanFront(const GLcontext *ctx, GLuint n,
+                                 GLint x, GLint y,
+                                 GLubyte rgba[][4]);
+   static void 		ReadCI32PixelsFront(const GLcontext *ctx,
+                                   GLuint n, const GLint x[], const GLint y[],
+                                   GLuint indx[], const GLubyte mask[]);
+   static void 		ReadRGBAPixelsFront(const GLcontext *ctx,
+                                   GLuint n, const GLint x[], const GLint y[],
+                                   GLubyte rgba[][4], const GLubyte mask[]);
+
+   // Back buffer functions
+   static void 		WriteRGBASpanBack(const GLcontext *ctx, GLuint n,
+                                  GLint x, GLint y,
+                                  CONST GLubyte rgba[][4],
+                                  const GLubyte mask[]);
+   static void 		WriteRGBSpanBack(const GLcontext *ctx, GLuint n,
+                                 GLint x, GLint y,
+                                 CONST GLubyte rgba[][3],
+                                 const GLubyte mask[]);
+   static void 		WriteMonoRGBASpanBack(const GLcontext *ctx, GLuint n,
+                                     GLint x, GLint y,
+                                     const GLchan color[4],
+                                     const GLubyte mask[]);
+   static void 		WriteRGBAPixelsBack(const GLcontext *ctx, GLuint n,
+                                   const GLint x[], const GLint y[],
+                                   CONST GLubyte rgba[][4],
+                                   const GLubyte mask[]);
+   static void 		WriteMonoRGBAPixelsBack(const GLcontext *ctx, GLuint n,
+                                       const GLint x[], const GLint y[],
+                                       const GLchan color[4],
+                                       const GLubyte mask[]);
+   static void 		WriteCI32SpanBack(const GLcontext *ctx, GLuint n,
+                                 GLint x, GLint y,
+                                 const GLuint index[], const GLubyte mask[]);
+   static void 		WriteCI8SpanBack(const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                                const GLubyte index[], const GLubyte mask[]);
+   static void 		WriteMonoCISpanBack(const GLcontext *ctx, GLuint n,
+                                   GLint x, GLint y, GLuint colorIndex,
+                                   const GLubyte mask[]);
+   static void 		WriteCI32PixelsBack(const GLcontext *ctx,
+                                   GLuint n, const GLint x[], const GLint y[],
+                                   const GLuint index[], const GLubyte mask[]);
+   static void 		WriteMonoCIPixelsBack(const GLcontext *ctx,
+                                     GLuint n, const GLint x[], const GLint y[],
+                                     GLuint colorIndex, const GLubyte mask[]);
+   static void 		ReadCI32SpanBack(const GLcontext *ctx,
+                                GLuint n, GLint x, GLint y, GLuint index[]);
+   static void 		ReadRGBASpanBack(const GLcontext *ctx, GLuint n,
+                                GLint x, GLint y,
+                                GLubyte rgba[][4]);
+   static void 		ReadCI32PixelsBack(const GLcontext *ctx,
+                                  GLuint n, const GLint x[], const GLint y[],
+                                  GLuint indx[], const GLubyte mask[]);
+   static void 		ReadRGBAPixelsBack(const GLcontext *ctx,
+                                  GLuint n, const GLint x[], const GLint y[],
+                                  GLubyte rgba[][4], const GLubyte mask[]);
+
+};
+
+//------------------------------------------------------------------
+// Public interface methods
+//------------------------------------------------------------------
+
+
+//
+// Input:  rect - initial rectangle
+//         name - window name
+//         resizingMode - example: B_FOLLOW_NONE
+//         mode - usually 0 ?
+//         options - Bitwise-OR of BGL_* tokens
+//
+BGLView::BGLView(BRect rect, char *name,
+                 ulong resizingMode, ulong mode,
+                 ulong options)
+   :BView(rect, name, resizingMode, mode | B_WILL_DRAW | B_FRAME_EVENTS) //  | B_FULL_UPDATE_ON_RESIZE)
+{
+   const GLboolean rgbFlag = (options & BGL_RGB) == BGL_RGB;
+   const GLboolean alphaFlag = (options & BGL_ALPHA) == BGL_ALPHA;
+   const GLboolean dblFlag = (options & BGL_DOUBLE) == BGL_DOUBLE;
+   const GLboolean stereoFlag = false;
+   const GLint depth = (options & BGL_DEPTH) ? 16 : 0;
+   const GLint stencil = (options & BGL_STENCIL) ? 8 : 0;
+   const GLint accum = (options & BGL_ACCUM) ? 16 : 0;
+   const GLint index = (options & BGL_INDEX) ? 32 : 0;
+   const GLint red = (options & BGL_RGB) ? 8 : 0;
+   const GLint green = (options & BGL_RGB) ? 8 : 0;
+   const GLint blue = (options & BGL_RGB) ? 8 : 0;
+   const GLint alpha = (options & BGL_RGB) ? 8 : 0;
+
+   if (!rgbFlag) {
+      fprintf(stderr, "Mesa Warning: color index mode not supported\n");
+   }
+
+   // Allocate auxiliary data object
+   MesaDriver * md = new MesaDriver;
+
+   // examine option flags and create gl_context struct
+   GLvisual * visual = _mesa_create_visual( rgbFlag,
+                                            dblFlag,
+                                            stereoFlag,
+                                            red, green, blue, alpha,
+                                            index,
+                                            depth,
+                                            stencil,
+                                            accum, accum, accum, accum,
+                                            1
+                                            );
+
+   // create core context
+   GLcontext * ctx = _mesa_create_context(visual, NULL, md, GL_FALSE);
+
+   ctx->Driver.NewTextureObject = _mesa_new_texture_object;
+   ctx->Driver.DeleteTexture = _mesa_delete_texture_object;
+
+   _mesa_initialize_context(ctx, visual, NULL, md, GL_FALSE);
+
+   _mesa_enable_sw_extensions(ctx);
+   _mesa_enable_1_3_extensions(ctx);
+   _mesa_enable_1_4_extensions(ctx);
+   _mesa_enable_1_5_extensions(ctx);
+
+
+
+   // create core framebuffer
+   GLframebuffer * buffer = _mesa_create_framebuffer(visual,
+                                              depth > 0 ? GL_TRUE : GL_FALSE,
+                                              stencil > 0 ? GL_TRUE: GL_FALSE,
+                                              accum > 0 ? GL_TRUE : GL_FALSE,
+                                              alphaFlag
+                                              );
+
+   /* Initialize the software rasterizer and helper modules.
+    */
+   _swrast_CreateContext(ctx);
+   _ac_CreateContext(ctx);
+   _tnl_CreateContext(ctx);
+   _swsetup_CreateContext(ctx);
+   _swsetup_Wakeup(ctx);
+
+   md->Init(this, ctx, visual, buffer );
+
+   // Hook aux data into BGLView object
+   m_gc = md;
+}
+
+
+BGLView::~BGLView()
+{
+   printf("BGLView destructor\n");
+   MesaDriver * md = (MesaDriver *) m_gc;
+   assert(md);
+   delete md;
+}
+
+void BGLView::LockGL()
+{
+   MesaDriver * md = (MesaDriver *) m_gc;
+   assert(md);
+   md->LockGL();
+}
+
+void BGLView::UnlockGL()
+{
+   MesaDriver * md = (MesaDriver *) m_gc;
+   assert(md);
+   md->UnlockGL();
+}
+
+void BGLView::SwapBuffers()
+{
+   MesaDriver * md = (MesaDriver *) m_gc;
+   assert(md);
+   md->SwapBuffers();
+}
+
+
+void BGLView::CopySubBufferMESA(GLint x, GLint y, GLuint width, GLuint height)
+{
+   MesaDriver * md = (MesaDriver *) m_gc;
+   assert(md);
+   md->CopySubBuffer(x, y, width, height);
+}
+
+
+BView *	BGLView::EmbeddedView()
+{
+   // XXX to do
+	return NULL;
+}
+
+status_t BGLView::CopyPixelsOut(BPoint source, BBitmap *dest)
+{
+   // XXX to do
+	printf("BGLView::CopyPixelsOut() not implemented yet!\n");
+	return B_UNSUPPORTED;
+}
+
+
+status_t BGLView::CopyPixelsIn(BBitmap *source, BPoint dest)
+{
+   // XXX to do
+	printf("BGLView::CopyPixelsIn() not implemented yet!\n");
+	return B_UNSUPPORTED;
+}
+
+void BGLView::ErrorCallback(unsigned long errorCode) // GLenum errorCode)
+{
+   // XXX to do
+	printf("BGLView::ErrorCallback() not implemented yet!\n");
+	return;
+}
+
+void BGLView::Draw(BRect updateRect)
+{
+   // printf("BGLView::Draw()\n");
+   MesaDriver * md = (MesaDriver *) m_gc;
+   assert(md);
+   md->Draw(updateRect);
+}
+
+void BGLView::AttachedToWindow()
+{
+   BView::AttachedToWindow();
+
+   // don't paint window background white when resized
+   SetViewColor(B_TRANSPARENT_32_BIT);
+}
+
+void BGLView::AllAttached()
+{
+   BView::AllAttached();
+//   printf("BGLView AllAttached\n");
+}
+
+void BGLView::DetachedFromWindow()
+{
+   BView::DetachedFromWindow();
+}
+
+void BGLView::AllDetached()
+{
+   BView::AllDetached();
+//   printf("BGLView AllDetached");
+}
+
+void BGLView::FrameResized(float width, float height)
+{
+   return BView::FrameResized(width, height);
+}
+
+status_t BGLView::Perform(perform_code d, void *arg)
+{
+   return BView::Perform(d, arg);
+}
+
+
+status_t BGLView::Archive(BMessage *data, bool deep) const
+{
+   return BView::Archive(data, deep);
+}
+
+void BGLView::MessageReceived(BMessage *msg)
+{
+   BView::MessageReceived(msg);
+}
+
+void BGLView::SetResizingMode(uint32 mode)
+{
+   BView::SetResizingMode(mode);
+}
+
+void BGLView::Show()
+{
+//   printf("BGLView Show\n");
+   BView::Show();
+}
+
+void BGLView::Hide()
+{
+//   printf("BGLView Hide\n");
+   BView::Hide();
+}
+
+BHandler *BGLView::ResolveSpecifier(BMessage *msg, int32 index,
+                                    BMessage *specifier, int32 form,
+                                    const char *property)
+{
+   return BView::ResolveSpecifier(msg, index, specifier, form, property);
+}
+
+status_t BGLView::GetSupportedSuites(BMessage *data)
+{
+   return BView::GetSupportedSuites(data);
+}
+
+void BGLView::DirectConnected( direct_buffer_info *info )
+{
+   // XXX to do
+}
+
+void BGLView::EnableDirectMode( bool enabled )
+{
+   // XXX to do
+}
+
+
+
+//---- private methods ----------
+
+void BGLView::_ReservedGLView1() {}
+void BGLView::_ReservedGLView2() {}
+void BGLView::_ReservedGLView3() {}
+void BGLView::_ReservedGLView4() {}
+void BGLView::_ReservedGLView5() {}
+void BGLView::_ReservedGLView6() {}
+void BGLView::_ReservedGLView7() {}
+void BGLView::_ReservedGLView8() {}
+
+#if 0
+BGLView::BGLView(const BGLView &v)
+	: BView(v)
+{
+   // XXX not sure how this should work
+   printf("Warning BGLView::copy constructor not implemented\n");
+}
+#endif
+
+
+BGLView &BGLView::operator=(const BGLView &v)
+{
+   printf("Warning BGLView::operator= not implemented\n");
+	return *this;
+}
+
+void BGLView::dither_front()
+{
+   // no-op
+}
+
+bool BGLView::confirm_dither()
+{
+   // no-op
+   return false;
+}
+
+void BGLView::draw(BRect r)
+{
+   // XXX no-op ???
+}
+
+/* Direct Window stuff */
+void BGLView::drawScanline( int x1, int x2, int y, void *data )
+{
+   // no-op
+}
+
+void BGLView::scanlineHandler(struct rasStateRec *state,
+                              GLint x1, GLint x2)
+{
+   // no-op
+}
+
+void BGLView::lock_draw()
+{
+   // no-op
+}
+
+void BGLView::unlock_draw()
+{
+   // no-op
+}
+
+bool BGLView::validateView()
+{
+   // no-op
+   return true;
+}
+
+// #pragma mark -
+
+MesaDriver::MesaDriver()
+{
+   m_glcontext 		= NULL;
+   m_glvisual		= NULL;
+   m_glframebuffer 	= NULL;
+   m_bglview 		= NULL;
+   m_bitmap 		= NULL;
+
+   m_clear_color[BE_RCOMP] = 0;
+   m_clear_color[BE_GCOMP] = 0;
+   m_clear_color[BE_BCOMP] = 0;
+   m_clear_color[BE_ACOMP] = 0;
+
+   m_clear_index = 0;
+}
+
+
+MesaDriver::~MesaDriver()
+{
+   _mesa_destroy_visual(m_glvisual);
+   _mesa_destroy_framebuffer(m_glframebuffer);
+   _mesa_destroy_context(m_glcontext);
+
+}
+
+
+void MesaDriver::Init(BGLView * bglview, GLcontext * ctx, GLvisual * visual, GLframebuffer * framebuffer)
+{
+	m_bglview 		= bglview;
+	m_glcontext 	= ctx;
+	m_glvisual 		= visual;
+	m_glframebuffer = framebuffer;
+
+	MesaDriver * md = (MesaDriver *) ctx->DriverCtx;
+	struct swrast_device_driver * swdd = _swrast_GetDeviceDriverReference( ctx );
+	TNLcontext * tnl = TNL_CONTEXT(ctx);
+
+	assert(md->m_glcontext == ctx );
+
+	// Use default TCL pipeline
+	tnl->Driver.RunPipeline = _tnl_run_pipeline;
+
+	ctx->Driver.GetString = MesaDriver::GetString;
+	ctx->Driver.UpdateState = MesaDriver::UpdateState;
+	ctx->Driver.ResizeBuffers = _swrast_alloc_buffers;
+	ctx->Driver.GetBufferSize = MesaDriver::GetBufferSize;
+
+	ctx->Driver.Accum = _swrast_Accum;
+	ctx->Driver.Bitmap = _swrast_Bitmap;
+	ctx->Driver.Clear = MesaDriver::Clear;
+	// ctx->Driver.ClearIndex = MesaDriver::ClearIndex;
+	// ctx->Driver.ClearColor = MesaDriver::ClearColor;
+	ctx->Driver.CopyPixels = _swrast_CopyPixels;
+   	ctx->Driver.DrawPixels = _swrast_DrawPixels;
+   	ctx->Driver.ReadPixels = _swrast_ReadPixels;
+   	ctx->Driver.DrawBuffer = _swrast_DrawBuffer;
+
+   	ctx->Driver.ChooseTextureFormat = _mesa_choose_tex_format;
+   	ctx->Driver.TexImage1D = _mesa_store_teximage1d;
+   	ctx->Driver.TexImage2D = _mesa_store_teximage2d;
+   	ctx->Driver.TexImage3D = _mesa_store_teximage3d;
+   	ctx->Driver.TexSubImage1D = _mesa_store_texsubimage1d;
+   	ctx->Driver.TexSubImage2D = _mesa_store_texsubimage2d;
+   	ctx->Driver.TexSubImage3D = _mesa_store_texsubimage3d;
+   	ctx->Driver.TestProxyTexImage = _mesa_test_proxy_teximage;
+
+    ctx->Driver.CompressedTexImage1D = _mesa_store_compressed_teximage1d;
+    ctx->Driver.CompressedTexImage2D = _mesa_store_compressed_teximage2d;
+	ctx->Driver.CompressedTexImage3D = _mesa_store_compressed_teximage3d;
+	ctx->Driver.CompressedTexSubImage1D = _mesa_store_compressed_texsubimage1d;
+	ctx->Driver.CompressedTexSubImage2D = _mesa_store_compressed_texsubimage2d;
+	ctx->Driver.CompressedTexSubImage3D = _mesa_store_compressed_texsubimage3d;
+
+  	ctx->Driver.CopyTexImage1D = _swrast_copy_teximage1d;
+   	ctx->Driver.CopyTexImage2D = _swrast_copy_teximage2d;
+   	ctx->Driver.CopyTexSubImage1D = _swrast_copy_texsubimage1d;
+   	ctx->Driver.CopyTexSubImage2D = _swrast_copy_texsubimage2d;
+   	ctx->Driver.CopyTexSubImage3D = _swrast_copy_texsubimage3d;
+   	ctx->Driver.CopyColorTable = _swrast_CopyColorTable;
+   	ctx->Driver.CopyColorSubTable = _swrast_CopyColorSubTable;
+   	ctx->Driver.CopyConvolutionFilter1D = _swrast_CopyConvolutionFilter1D;
+   	ctx->Driver.CopyConvolutionFilter2D = _swrast_CopyConvolutionFilter2D;
+ 
+	swdd->SetBuffer = MesaDriver::SetBuffer;
+}
+
+
+void MesaDriver::LockGL()
+{
+	m_bglview->LockLooper();
+
+   UpdateState(m_glcontext, 0);
+   _mesa_make_current(m_glcontext, m_glframebuffer);
+}
+
+
+void MesaDriver::UnlockGL()
+{
+	m_bglview->UnlockLooper();
+   // Could call _mesa_make_current(NULL, NULL) but it would just
+   // hinder performance
+}
+
+
+void MesaDriver::SwapBuffers() const
+{
+        // _mesa_notifySwapBuffers(m_glcontext);
+
+	if (m_bitmap) {
+		m_bglview->LockLooper();
+		m_bglview->DrawBitmap(m_bitmap, BPoint(0, 0));
+		m_bglview->UnlockLooper();
+	};
+}
+
+
+void MesaDriver::CopySubBuffer(GLint x, GLint y, GLuint width, GLuint height) const
+{
+   if (m_bitmap) {
+      // Source bitmap and view's bitmap are same size.
+      // Source and dest rectangle are the same.
+      // Note (x,y) = (0,0) is the lower-left corner, have to flip Y
+      BRect srcAndDest;
+      srcAndDest.left = x;
+      srcAndDest.right = x + width - 1;
+      srcAndDest.bottom = m_bottom - y;
+      srcAndDest.top = srcAndDest.bottom - height + 1;
+      m_bglview->DrawBitmap(m_bitmap, srcAndDest, srcAndDest);
+   }
+}
+
+
+void MesaDriver::Draw(BRect updateRect) const
+{
+   if (m_bitmap)
+      m_bglview->DrawBitmap(m_bitmap, updateRect, updateRect);
+}
+
+
+void MesaDriver::UpdateState( GLcontext *ctx, GLuint new_state )
+{
+	struct swrast_device_driver *	swdd = _swrast_GetDeviceDriverReference( ctx );
+
+	_swrast_InvalidateState( ctx, new_state );
+	_swsetup_InvalidateState( ctx, new_state );
+	_ac_InvalidateState( ctx, new_state );
+	_tnl_InvalidateState( ctx, new_state );
+
+	if (ctx->Color.DrawBuffer == GL_FRONT) {
+      /* read/write front buffer */
+      swdd->WriteRGBASpan = MesaDriver::WriteRGBASpanFront;
+      swdd->WriteRGBSpan = MesaDriver::WriteRGBSpanFront;
+      swdd->WriteRGBAPixels = MesaDriver::WriteRGBAPixelsFront;
+      swdd->WriteMonoRGBASpan = MesaDriver::WriteMonoRGBASpanFront;
+      swdd->WriteMonoRGBAPixels = MesaDriver::WriteMonoRGBAPixelsFront;
+      swdd->WriteCI32Span = MesaDriver::WriteCI32SpanFront;
+      swdd->WriteCI8Span = MesaDriver::WriteCI8SpanFront;
+      swdd->WriteMonoCISpan = MesaDriver::WriteMonoCISpanFront;
+      swdd->WriteCI32Pixels = MesaDriver::WriteCI32PixelsFront;
+      swdd->WriteMonoCIPixels = MesaDriver::WriteMonoCIPixelsFront;
+      swdd->ReadRGBASpan = MesaDriver::ReadRGBASpanFront;
+      swdd->ReadRGBAPixels = MesaDriver::ReadRGBAPixelsFront;
+      swdd->ReadCI32Span = MesaDriver::ReadCI32SpanFront;
+      swdd->ReadCI32Pixels = MesaDriver::ReadCI32PixelsFront;
+   }
+   else {
+      /* read/write back buffer */
+      swdd->WriteRGBASpan = MesaDriver::WriteRGBASpanBack;
+      swdd->WriteRGBSpan = MesaDriver::WriteRGBSpanBack;
+      swdd->WriteRGBAPixels = MesaDriver::WriteRGBAPixelsBack;
+      swdd->WriteMonoRGBASpan = MesaDriver::WriteMonoRGBASpanBack;
+      swdd->WriteMonoRGBAPixels = MesaDriver::WriteMonoRGBAPixelsBack;
+      swdd->WriteCI32Span = MesaDriver::WriteCI32SpanBack;
+      swdd->WriteCI8Span = MesaDriver::WriteCI8SpanBack;
+      swdd->WriteMonoCISpan = MesaDriver::WriteMonoCISpanBack;
+      swdd->WriteCI32Pixels = MesaDriver::WriteCI32PixelsBack;
+      swdd->WriteMonoCIPixels = MesaDriver::WriteMonoCIPixelsBack;
+      swdd->ReadRGBASpan = MesaDriver::ReadRGBASpanBack;
+      swdd->ReadRGBAPixels = MesaDriver::ReadRGBAPixelsBack;
+      swdd->ReadCI32Span = MesaDriver::ReadCI32SpanBack;
+      swdd->ReadCI32Pixels = MesaDriver::ReadCI32PixelsBack;
+    }
+}
+
+
+void MesaDriver::ClearIndex(GLcontext *ctx, GLuint index)
+{
+   MesaDriver *md = (MesaDriver *) ctx->DriverCtx;
+   md->m_clear_index = index;
+}
+
+
+void MesaDriver::ClearColor(GLcontext *ctx, const GLfloat color[4])
+{
+   MesaDriver *md = (MesaDriver *) ctx->DriverCtx;
+   CLAMPED_FLOAT_TO_CHAN(md->m_clear_color[BE_RCOMP], color[0]);
+   CLAMPED_FLOAT_TO_CHAN(md->m_clear_color[BE_GCOMP], color[1]);
+   CLAMPED_FLOAT_TO_CHAN(md->m_clear_color[BE_BCOMP], color[2]);
+   CLAMPED_FLOAT_TO_CHAN(md->m_clear_color[BE_ACOMP], color[3]); 
+   assert(md->m_bglview);
+}
+
+
+void MesaDriver::Clear(GLcontext *ctx, GLbitfield mask,
+                               GLboolean all, GLint x, GLint y,
+                               GLint width, GLint height)
+{
+   if (mask & DD_FRONT_LEFT_BIT)
+		ClearFront(ctx, all, x, y, width, height);
+   if (mask & DD_BACK_LEFT_BIT)
+		ClearBack(ctx, all, x, y, width, height);
+
+	mask &= ~(DD_FRONT_LEFT_BIT | DD_BACK_LEFT_BIT);
+	if (mask)
+		_swrast_Clear( ctx, mask, all, x, y, width, height );
+
+   return;
+}
+
+
+void MesaDriver::ClearFront(GLcontext *ctx,
+                         GLboolean all, GLint x, GLint y,
+                         GLint width, GLint height)
+{
+   MesaDriver *md = (MesaDriver *) ctx->DriverCtx;
+   BGLView *bglview = md->m_bglview;
+   assert(bglview);
+
+   bglview->SetHighColor(md->m_clear_color[BE_RCOMP],
+                         md->m_clear_color[BE_GCOMP],
+                         md->m_clear_color[BE_BCOMP],
+                         md->m_clear_color[BE_ACOMP]);
+   bglview->SetLowColor(md->m_clear_color[BE_RCOMP],
+                        md->m_clear_color[BE_GCOMP],
+                        md->m_clear_color[BE_BCOMP],
+                        md->m_clear_color[BE_ACOMP]);
+   if (all) {
+      BRect b = bglview->Bounds();
+      bglview->FillRect(b);
+   }
+   else {
+      // XXX untested
+      BRect b;
+      b.left = x;
+      b.right = x + width;
+      b.bottom = md->m_height - y - 1;
+      b.top = b.bottom - height;
+      bglview->FillRect(b);
+   }
+
+   // restore drawing color
+#if 0
+   bglview->SetHighColor(md->mColor[BE_RCOMP],
+                         md->mColor[BE_GCOMP],
+                         md->mColor[BE_BCOMP],
+                         md->mColor[BE_ACOMP]);
+   bglview->SetLowColor(md->mColor[BE_RCOMP],
+                        md->mColor[BE_GCOMP],
+                        md->mColor[BE_BCOMP],
+                        md->mColor[BE_ACOMP]);
+#endif
+}
+
+
+void MesaDriver::ClearBack(GLcontext *ctx,
+                        GLboolean all, GLint x, GLint y,
+                        GLint width, GLint height)
+{
+   MesaDriver *md = (MesaDriver *) ctx->DriverCtx;
+   BGLView *bglview = md->m_bglview;
+   assert(bglview);
+   BBitmap *bitmap = md->m_bitmap;
+   assert(bitmap);
+   GLuint *start = (GLuint *) bitmap->Bits();
+   const GLuint *clearPixelPtr = (const GLuint *) md->m_clear_color;
+   const GLuint clearPixel = *clearPixelPtr;
+
+   if (all) {
+      const int numPixels = md->m_width * md->m_height;
+      if (clearPixel == 0) {
+         memset(start, 0, numPixels * 4);
+      }
+      else {
+         for (int i = 0; i < numPixels; i++) {
+             start[i] = clearPixel;
+         }
+      }
+   }
+   else {
+      // XXX untested
+      start += y * md->m_width + x;
+      for (int i = 0; i < height; i++) {
+         for (int j = 0; j < width; j++) {
+            start[j] = clearPixel;
+         }
+         start += md->m_width;
+      }
+   }
+}
+
+
+void MesaDriver::SetBuffer(GLcontext *ctx, GLframebuffer *buffer,
+                            GLenum mode)
+{
+   /* TODO */
+	(void) ctx;
+	(void) buffer;
+	(void) mode;
+}
+
+void MesaDriver::GetBufferSize(GLframebuffer * framebuffer, GLuint *width,
+                            GLuint *height)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (!ctx)
+		return;
+
+   MesaDriver * md = (MesaDriver *) ctx->DriverCtx;
+   BGLView *bglview = md->m_bglview;
+   assert(bglview);
+
+   BRect b = bglview->Bounds();
+   *width = (GLuint) b.IntegerWidth() + 1; // (b.right - b.left + 1);
+   *height = (GLuint) b.IntegerHeight() + 1; // (b.bottom - b.top + 1);
+   md->m_bottom = (GLint) b.bottom;
+
+   if (ctx->Visual.doubleBufferMode) {
+      if (*width != md->m_width || *height != md->m_height) {
+         // allocate new size of back buffer bitmap
+         if (md->m_bitmap)
+            delete md->m_bitmap;
+         BRect rect(0.0, 0.0, *width - 1, *height - 1);
+         md->m_bitmap = new BBitmap(rect, B_RGBA32);
+      }
+   }
+   else
+   {
+      md->m_bitmap = NULL;
+   }
+
+   md->m_width = *width;
+   md->m_height = *height;
+}
+
+
+const GLubyte *MesaDriver::GetString(GLcontext *ctx, GLenum name)
+{
+   switch (name) {
+      case GL_RENDERER:
+         return (const GLubyte *) "Mesa BGLView (software)";
+      default:
+         // Let core library handle all other cases
+         return NULL;
+   }
+}
+
+
+// Plot a pixel.  (0,0) is upper-left corner
+// This is only used when drawing to the front buffer.
+inline void Plot(BGLView *bglview, int x, int y)
+{
+   // XXX There's got to be a better way!
+   BPoint p(x, y), q(x+1, y);
+   bglview->StrokeLine(p, q);
+}
+
+
+void MesaDriver::WriteRGBASpanFront(const GLcontext *ctx, GLuint n,
+                                 GLint x, GLint y,
+                                 CONST GLubyte rgba[][4],
+                                 const GLubyte mask[])
+{
+   MesaDriver *md = (MesaDriver *) ctx->DriverCtx;
+   BGLView *bglview = md->m_bglview;
+   assert(bglview);
+   int flippedY = md->m_bottom - y;
+   if (mask) {
+      for (GLuint i = 0; i < n; i++) {
+         if (mask[i]) {
+            bglview->SetHighColor(rgba[i][0], rgba[i][1], rgba[i][2], rgba[i][3]);
+            Plot(bglview, x++, flippedY);
+         }
+      }
+   }
+   else {
+      for (GLuint i = 0; i < n; i++) {
+         bglview->SetHighColor(rgba[i][0], rgba[i][1], rgba[i][2], rgba[i][3]);
+         Plot(bglview, x++, flippedY);
+      }
+   }
+}
+
+void MesaDriver::WriteRGBSpanFront(const GLcontext *ctx, GLuint n,
+                                GLint x, GLint y,
+                                CONST GLubyte rgba[][3],
+                                const GLubyte mask[])
+{
+   MesaDriver *md = (MesaDriver *) ctx->DriverCtx;
+   BGLView *bglview = md->m_bglview;
+   assert(bglview);
+   int flippedY = md->m_bottom - y;
+   if (mask) {
+      for (GLuint i = 0; i < n; i++) {
+         if (mask[i]) {
+            bglview->SetHighColor(rgba[i][0], rgba[i][1], rgba[i][2]);
+            Plot(bglview, x++, flippedY);
+         }
+      }
+   }
+   else {
+      for (GLuint i = 0; i < n; i++) {
+         bglview->SetHighColor(rgba[i][0], rgba[i][1], rgba[i][2]);
+         Plot(bglview, x++, flippedY);
+      }
+   }
+}
+
+void MesaDriver::WriteMonoRGBASpanFront(const GLcontext *ctx, GLuint n,
+                                     GLint x, GLint y,
+                                     const GLchan color[4],
+                                     const GLubyte mask[])
+{
+   MesaDriver *md = (MesaDriver *) ctx->DriverCtx;
+   BGLView *bglview = md->m_bglview;
+   assert(bglview);
+   int flippedY = md->m_bottom - y;
+   bglview->SetHighColor(color[RCOMP], color[GCOMP], color[BCOMP]);
+   if (mask) {
+      for (GLuint i = 0; i < n; i++) {
+         if (mask[i]) {
+            Plot(bglview, x++, flippedY);
+         }
+      }
+   }
+   else {
+      for (GLuint i = 0; i < n; i++) {
+         Plot(bglview, x++, flippedY);
+      }
+   }
+}
+
+void MesaDriver::WriteRGBAPixelsFront(const GLcontext *ctx,
+                                   GLuint n, const GLint x[], const GLint y[],
+                                   CONST GLubyte rgba[][4],
+                                   const GLubyte mask[] )
+{
+   MesaDriver *md = (MesaDriver *) ctx->DriverCtx;
+   BGLView *bglview = md->m_bglview;
+   assert(bglview);
+   if (mask) {
+      for (GLuint i = 0; i < n; i++) {
+         if (mask[i]) {
+            bglview->SetHighColor(rgba[i][0], rgba[i][1], rgba[i][2]);
+            Plot(bglview, x[i], md->m_bottom - y[i]);
+         }
+      }
+   }
+   else {
+      for (GLuint i = 0; i < n; i++) {
+         bglview->SetHighColor(rgba[i][0], rgba[i][1], rgba[i][2]);
+         Plot(bglview, x[i], md->m_bottom - y[i]);
+      }
+   }
+}
+
+
+void MesaDriver::WriteMonoRGBAPixelsFront(const GLcontext *ctx, GLuint n,
+                                       const GLint x[], const GLint y[],
+                                       const GLchan color[4],
+                                       const GLubyte mask[])
+{
+   MesaDriver *md = (MesaDriver *) ctx->DriverCtx;
+   BGLView *bglview = md->m_bglview;
+   assert(bglview);
+   // plot points using current color
+   bglview->SetHighColor(color[RCOMP], color[GCOMP], color[BCOMP]);
+   if (mask) {
+      for (GLuint i = 0; i < n; i++) {
+         if (mask[i]) {
+            Plot(bglview, x[i], md->m_bottom - y[i]);
+         }
+      }
+   }
+   else {
+      for (GLuint i = 0; i < n; i++) {
+         Plot(bglview, x[i], md->m_bottom - y[i]);
+      }
+   }
+}
+
+
+void MesaDriver::WriteCI32SpanFront( const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                             const GLuint index[], const GLubyte mask[] )
+{
+   // XXX to do
+}
+
+void MesaDriver::WriteCI8SpanFront( const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                            const GLubyte index[], const GLubyte mask[] )
+{
+   // XXX to do
+}
+
+void MesaDriver::WriteMonoCISpanFront( const GLcontext *ctx, GLuint n,
+                                    GLint x, GLint y,
+                                    GLuint colorIndex, const GLubyte mask[] )
+{
+   // XXX to do
+}
+
+
+void MesaDriver::WriteCI32PixelsFront( const GLcontext *ctx, GLuint n,
+                                    const GLint x[], const GLint y[],
+                                    const GLuint index[], const GLubyte mask[] )
+{
+   // XXX to do
+}
+
+void MesaDriver::WriteMonoCIPixelsFront( const GLcontext *ctx, GLuint n,
+                                      const GLint x[], const GLint y[],
+                                      GLuint colorIndex, const GLubyte mask[] )
+{
+   // XXX to do
+}
+
+
+void MesaDriver::ReadCI32SpanFront( const GLcontext *ctx,
+                                 GLuint n, GLint x, GLint y, GLuint index[] )
+{
+ 	printf("ReadCI32SpanFront() not implemented yet!\n");
+  // XXX to do
+}
+
+
+void MesaDriver::ReadRGBASpanFront( const GLcontext *ctx, GLuint n,
+                                 GLint x, GLint y, GLubyte rgba[][4] )
+{
+ 	printf("ReadRGBASpanFront() not implemented yet!\n");
+   // XXX to do
+}
+
+
+void MesaDriver::ReadCI32PixelsFront( const GLcontext *ctx,
+                                   GLuint n, const GLint x[], const GLint y[],
+                                   GLuint indx[], const GLubyte mask[] )
+{
+ 	printf("ReadCI32PixelsFront() not implemented yet!\n");
+   // XXX to do
+}
+
+
+void MesaDriver::ReadRGBAPixelsFront( const GLcontext *ctx,
+                                   GLuint n, const GLint x[], const GLint y[],
+                                   GLubyte rgba[][4], const GLubyte mask[] )
+{
+ 	printf("ReadRGBAPixelsFront() not implemented yet!\n");
+   // XXX to do
+}
+
+
+
+
+void MesaDriver::WriteRGBASpanBack(const GLcontext *ctx, GLuint n,
+                                 GLint x, GLint y,
+                                 CONST GLubyte rgba[][4],
+                                 const GLubyte mask[])
+{
+	MesaDriver *md = (MesaDriver *) ctx->DriverCtx;
+	BBitmap *bitmap = md->m_bitmap;
+
+	static bool already_called = false;
+	if (! already_called) {
+		printf("WriteRGBASpanBack() called.\n");
+		already_called = true;
+	}
+
+	assert(bitmap);
+
+	int row = md->m_bottom - y;
+	uint8 * ptr = (uint8 *) bitmap->Bits() + (row * bitmap->BytesPerRow()) + x * 4;
+ 	uint32 * pixel = (uint32 *) ptr;
+	
+	if (mask) {
+		while(n--) {
+			if (*mask++)
+				*pixel = PACK_B_RGBA32(rgba[0]);
+			pixel++;
+			rgba++;
+		};
+	} else {
+		while(n--) {
+			*pixel++ = PACK_B_RGBA32(rgba[0]);
+			rgba++;
+		};
+	};
+ }
+
+
+void MesaDriver::WriteRGBSpanBack(const GLcontext *ctx, GLuint n,
+                                GLint x, GLint y,
+                                CONST GLubyte rgb[][3],
+                                const GLubyte mask[])
+{
+	MesaDriver *md = (MesaDriver *) ctx->DriverCtx;
+	BBitmap *bitmap = md->m_bitmap;
+
+	static bool already_called = false;
+	if (! already_called) {
+		printf("WriteRGBSpanBack() called.\n");
+		already_called = true;
+	}
+
+	assert(bitmap);
+
+	int row = md->m_bottom - y;
+	uint8 * ptr = (uint8 *) bitmap->Bits() + (row * bitmap->BytesPerRow()) + x * 4;
+ 	uint32 * pixel = (uint32 *) ptr;
+	
+	if (mask) {
+		while(n--) {
+			if (*mask++)
+				*pixel = PACK_B_RGB32(rgb[0]);
+			pixel++;
+			rgb++;
+		};
+	} else {
+		while(n--) {
+			*pixel++ = PACK_B_RGB32(rgb[0]);
+			rgb++;
+		};
+	};
+}
+
+
+
+
+void MesaDriver::WriteMonoRGBASpanBack(const GLcontext *ctx, GLuint n,
+                                    GLint x, GLint y,
+                                    const GLchan color[4], const GLubyte mask[])
+{
+	MesaDriver *md = (MesaDriver *) ctx->DriverCtx;
+	BBitmap *bitmap = md->m_bitmap;
+
+	static bool already_called = false;
+	if (! already_called) {
+		printf("WriteMonoRGBASpanBack() called.\n");
+		already_called = true;
+	}
+
+	assert(bitmap);
+
+	int row = md->m_bottom - y;
+	uint8 * ptr = (uint8 *) bitmap->Bits() + (row * bitmap->BytesPerRow()) + x * 4;
+ 	uint32 * pixel = (uint32 *) ptr;
+	uint32 pixel_color = PACK_B_RGBA32(color);
+	
+	if (mask) {
+		while(n--) {
+			if (*mask++)
+				*pixel = pixel_color;
+			pixel++;
+		};
+	} else {
+		while(n--) {
+			*pixel++ = pixel_color;
+		};
+	};
+}
+
+
+void MesaDriver::WriteRGBAPixelsBack(const GLcontext *ctx,
+                                   GLuint n, const GLint x[], const GLint y[],
+                                   CONST GLubyte rgba[][4],
+                                   const GLubyte mask[] )
+{
+   MesaDriver *md = (MesaDriver *) ctx->DriverCtx;
+   BBitmap *bitmap = md->m_bitmap;
+
+	static bool already_called = false;
+	if (! already_called) {
+		printf("WriteRGBAPixelsBack() called.\n");
+		already_called = true;
+	}
+
+	assert(bitmap);
+#if 0
+	while(n--) {
+		if (*mask++) {
+			int row = md->m_bottom - *y;
+			uint8 * pixel = (uint8 *) bitmap->Bits() + (row * bitmap->BytesPerRow()) + *x * 4;
+			*((uint32 *) pixel) = PACK_B_RGBA32(rgba[0]);
+		};
+		x++;
+		y++;
+		rgba++;
+	};
+#else
+   if (mask) {
+      for (GLuint i = 0; i < n; i++) {
+         if (mask[i]) {
+            GLubyte *pixel = (GLubyte *) bitmap->Bits()
+            + ((md->m_bottom - y[i]) * bitmap->BytesPerRow()) + x[i] * 4;
+            pixel[BE_RCOMP] = rgba[i][RCOMP];
+            pixel[BE_GCOMP] = rgba[i][GCOMP];
+            pixel[BE_BCOMP] = rgba[i][BCOMP];
+            pixel[BE_ACOMP] = rgba[i][ACOMP];
+         }
+      }
+   }
+   else {
+      for (GLuint i = 0; i < n; i++) {
+         GLubyte *pixel = (GLubyte *) bitmap->Bits()
+            + ((md->m_bottom - y[i]) * bitmap->BytesPerRow()) + x[i] * 4;
+         pixel[BE_RCOMP] = rgba[i][RCOMP];
+         pixel[BE_GCOMP] = rgba[i][GCOMP];
+         pixel[BE_BCOMP] = rgba[i][BCOMP];
+         pixel[BE_ACOMP] = rgba[i][ACOMP];
+      }
+   }
+#endif
+}
+
+
+void MesaDriver::WriteMonoRGBAPixelsBack(const GLcontext *ctx, GLuint n,
+                                      const GLint x[], const GLint y[],
+                                      const GLchan color[4],
+                                      const GLubyte mask[])
+{
+	MesaDriver *md = (MesaDriver *) ctx->DriverCtx;
+	BBitmap *bitmap = md->m_bitmap;
+
+	static bool already_called = false;
+	if (! already_called) {
+		printf("WriteMonoRGBAPixelsBack() called.\n");
+		already_called = true;
+	}
+
+	assert(bitmap);
+
+	uint32 pixel_color = PACK_B_RGBA32(color);
+#if 0	
+	while(n--) {
+		if (*mask++) {
+			int row = md->m_bottom - *y;
+			uint8 * pixel = (uint8 *) bitmap->Bits() + (row * bitmap->BytesPerRow()) + *x * 4;
+
+			*((uint32 *) pixel) = pixel_color;
+		};
+		x++;
+		y++;
+	};
+#else
+   if (mask) {
+      for (GLuint i = 0; i < n; i++) {
+         if (mask[i]) {
+         	GLubyte * ptr = (GLubyte *) bitmap->Bits()
+            	+ ((md->m_bottom - y[i]) * bitmap->BytesPerRow()) + x[i] * 4;
+            *((uint32 *) ptr) = pixel_color;
+         }
+      }
+   }
+   else {
+	  for (GLuint i = 0; i < n; i++) {
+       	GLubyte * ptr = (GLubyte *) bitmap->Bits()
+	           	+ ((md->m_bottom - y[i]) * bitmap->BytesPerRow()) + x[i] * 4;
+       *((uint32 *) ptr) = pixel_color;
+      }
+   }
+#endif
+}
+
+
+void MesaDriver::WriteCI32SpanBack( const GLcontext *ctx, GLuint n,
+                                 GLint x, GLint y,
+                                 const GLuint index[], const GLubyte mask[] )
+{
+   // XXX to do
+}
+
+void MesaDriver::WriteCI8SpanBack( const GLcontext *ctx, GLuint n,
+                                GLint x, GLint y,
+                                const GLubyte index[], const GLubyte mask[] )
+{
+   // XXX to do
+}
+
+void MesaDriver::WriteMonoCISpanBack( const GLcontext *ctx, GLuint n,
+                                   GLint x, GLint y,
+                                   GLuint colorIndex, const GLubyte mask[] )
+{
+   // XXX to do
+}
+
+
+void MesaDriver::WriteCI32PixelsBack( const GLcontext *ctx, GLuint n,
+                                   const GLint x[], const GLint y[],
+                                   const GLuint index[], const GLubyte mask[] )
+{
+   // XXX to do
+}
+
+void MesaDriver::WriteMonoCIPixelsBack( const GLcontext *ctx, GLuint n,
+                                     const GLint x[], const GLint y[],
+                                     GLuint colorIndex, const GLubyte mask[] )
+{
+   // XXX to do
+}
+
+
+void MesaDriver::ReadCI32SpanBack( const GLcontext *ctx,
+                                GLuint n, GLint x, GLint y, GLuint index[] )
+{
+   // XXX to do
+}
+
+
+void MesaDriver::ReadRGBASpanBack( const GLcontext *ctx, GLuint n,
+                                GLint x, GLint y, GLubyte rgba[][4] )
+{
+   MesaDriver *md = (MesaDriver *) ctx->DriverCtx;
+   const BBitmap *bitmap = md->m_bitmap;
+   assert(bitmap);
+   int row = md->m_bottom - y;
+   const GLubyte *pixel = (GLubyte *) bitmap->Bits()
+                        + (row * bitmap->BytesPerRow()) + x * 4;
+
+   for (GLuint i = 0; i < n; i++) {
+      rgba[i][RCOMP] = pixel[BE_RCOMP];
+      rgba[i][GCOMP] = pixel[BE_GCOMP];
+      rgba[i][BCOMP] = pixel[BE_BCOMP];
+      rgba[i][ACOMP] = pixel[BE_ACOMP];
+      pixel += 4;
+   }
+}
+
+
+void MesaDriver::ReadCI32PixelsBack( const GLcontext *ctx,
+                                   GLuint n, const GLint x[], const GLint y[],
+                                   GLuint indx[], const GLubyte mask[] )
+{
+   // XXX to do
+}
+
+
+void MesaDriver::ReadRGBAPixelsBack( const GLcontext *ctx,
+                                  GLuint n, const GLint x[], const GLint y[],
+                                  GLubyte rgba[][4], const GLubyte mask[] )
+{
+   MesaDriver *md = (MesaDriver *) ctx->DriverCtx;
+   const BBitmap *bitmap = md->m_bitmap;
+   assert(bitmap);
+
+   if (mask) {
+      for (GLuint i = 0; i < n; i++) {
+         if (mask[i]) {
+            GLubyte *pixel = (GLubyte *) bitmap->Bits()
+            + ((md->m_bottom - y[i]) * bitmap->BytesPerRow()) + x[i] * 4;
+	         rgba[i][RCOMP] = pixel[BE_RCOMP];
+    	     rgba[i][GCOMP] = pixel[BE_GCOMP];
+        	 rgba[i][BCOMP] = pixel[BE_BCOMP];
+        	 rgba[i][ACOMP] = pixel[BE_ACOMP];
+         };
+      };
+   } else {
+      for (GLuint i = 0; i < n; i++) {
+         GLubyte *pixel = (GLubyte *) bitmap->Bits()
+            + ((md->m_bottom - y[i]) * bitmap->BytesPerRow()) + x[i] * 4;
+         rgba[i][RCOMP] = pixel[BE_RCOMP];
+         rgba[i][GCOMP] = pixel[BE_GCOMP];
+         rgba[i][BCOMP] = pixel[BE_BCOMP];
+         rgba[i][ACOMP] = pixel[BE_ACOMP];
+      };
+   };
+}
+
+
+
diff --git a/reactos/lib/mesa32/src/drivers/beos/GLView.h b/reactos/lib/mesa32/src/drivers/beos/GLView.h
new file mode 100644
index 00000000000..595000bb56c
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/beos/GLView.h
@@ -0,0 +1,196 @@
+/*******************************************************************************
+/
+/	File:		GLView.h
+/
+/	Copyright 1993-98, Be Incorporated, All Rights Reserved.
+/
+*******************************************************************************/
+
+#ifndef BGLVIEW_H
+#define BGLVIEW_H
+
+// added by Brian Paul:
+#ifndef BGL_RGB
+#define BGL_RGB			0
+#define BGL_INDEX		1 
+#define BGL_SINGLE		0
+#define BGL_DOUBLE		2
+#define BGL_DIRECT		0
+#define BGL_INDIRECT		4
+#define BGL_ACCUM		8
+#define BGL_ALPHA		16
+#define BGL_DEPTH		32
+#define BGL_OVERLAY		64
+#define BGL_UNDERLAY		128
+#define BGL_STENCIL		512
+#endif
+
+
+#include <GL/gl.h>
+#include <AppKit.h>
+#include <interface/Window.h>
+#include <interface/View.h>
+#include <interface/Bitmap.h>
+#include <game/WindowScreen.h>
+#include <game/DirectWindow.h>
+
+class BGLView : public BView {
+public:
+
+	BGLView(BRect rect, char *name,
+			ulong resizingMode, ulong mode,
+			ulong options);
+	virtual ~BGLView();
+
+	void		LockGL();
+	void		UnlockGL();
+	void		SwapBuffers();
+
+        // Added for Mesa (can't be virtual!)
+        void CopySubBufferMESA(GLint x, GLint y, GLuint width, GLuint height);
+
+	BView *     EmbeddedView();
+	status_t    CopyPixelsOut(BPoint source, BBitmap *dest);
+	status_t    CopyPixelsIn(BBitmap *source, BPoint dest);
+
+	virtual void        ErrorCallback(unsigned long errorCode); // GLenum errorCode);
+		
+	virtual	void		Draw(BRect updateRect);
+
+	virtual void		AttachedToWindow();
+	virtual void        AllAttached();
+	virtual void        DetachedFromWindow();
+	virtual void        AllDetached();
+ 
+	virtual void		FrameResized(float width, float height);
+	virtual status_t    Perform(perform_code d, void *arg);
+
+	/* The public methods below, for the moment,
+	   are just pass-throughs to BView */
+
+	virtual status_t    Archive(BMessage *data, bool deep = true) const;
+
+	virtual void        MessageReceived(BMessage *msg);
+	virtual void        SetResizingMode(uint32 mode);
+
+	virtual void        Show();
+	virtual void        Hide();
+
+	virtual BHandler   *ResolveSpecifier(BMessage *msg, int32 index,
+							BMessage *specifier, int32 form,
+							const char *property);
+	virtual status_t    GetSupportedSuites(BMessage *data);
+
+	/* New public functions */
+	void		DirectConnected( direct_buffer_info *info );
+	void		EnableDirectMode( bool enabled );
+
+private:
+
+	virtual void        _ReservedGLView1();
+	virtual void        _ReservedGLView2(); 
+	virtual void        _ReservedGLView3(); 
+	virtual void        _ReservedGLView4(); 
+	virtual void        _ReservedGLView5(); 
+	virtual void        _ReservedGLView6(); 
+	virtual void        _ReservedGLView7(); 
+	virtual void        _ReservedGLView8(); 
+
+    BGLView(const BGLView &);
+    BGLView     &operator=(const BGLView &);
+
+	void        dither_front();
+	bool        confirm_dither();
+	void        draw(BRect r);
+		
+	void *		m_gc;
+	uint32		m_options;
+	uint32      m_ditherCount;
+	BLocker		m_drawLock;
+	BLocker     m_displayLock;
+#if OLD_GLVIEW
+	BView *		m_embeddedFront;
+	BView *     m_embeddedBack;
+#else
+	void *		m_clip_info;
+	void *     	_reserved1;
+#endif
+	BBitmap *   m_ditherMap;
+	BRect       m_bounds;
+	int16 *     m_errorBuffer[2];
+	uint64      _reserved[8];
+
+	/* Direct Window stuff */
+private:	
+	void drawScanline( int x1, int x2, int y, void *data );
+	static void scanlineHandler(struct rasStateRec *state, GLint x1, GLint x2);
+	void		lock_draw();
+	void		unlock_draw();
+	bool		validateView();
+};
+
+
+
+class BGLScreen : public BWindowScreen {
+public:
+	BGLScreen(char *name,
+			ulong screenMode, ulong options,
+			status_t *error, bool debug=false);
+	~BGLScreen();
+
+	void		LockGL();
+	void		UnlockGL();
+	void		SwapBuffers();
+	virtual void        ErrorCallback(GLenum errorCode);
+
+	virtual void		ScreenConnected(bool connected);
+	virtual void		FrameResized(float width, float height);
+	virtual status_t    Perform(perform_code d, void *arg);
+
+	/* The public methods below, for the moment,
+	   are just pass-throughs to BWindowScreen */
+
+	virtual status_t    Archive(BMessage *data, bool deep = true) const;
+	virtual void        MessageReceived(BMessage *msg);
+
+	virtual void        Show();
+	virtual void        Hide();
+
+	virtual BHandler   *ResolveSpecifier(BMessage *msg,
+                        int32 index,
+						BMessage *specifier,
+						int32 form,
+						const char *property);
+	virtual status_t    GetSupportedSuites(BMessage *data);
+
+private:
+
+	virtual void        _ReservedGLScreen1();
+	virtual void        _ReservedGLScreen2();
+	virtual void        _ReservedGLScreen3();
+	virtual void        _ReservedGLScreen4();
+	virtual void        _ReservedGLScreen5();
+	virtual void        _ReservedGLScreen6();
+	virtual void        _ReservedGLScreen7();
+	virtual void        _ReservedGLScreen8(); 
+
+	BGLScreen(const BGLScreen &);
+	BGLScreen   &operator=(const BGLScreen &);
+
+	void *		m_gc;
+	long		m_options;
+	BLocker		m_drawLock;
+		
+	int32		m_colorSpace;
+	uint32		m_screen_mode;
+		
+	uint64      _reserved[7];
+};
+
+
+#endif
+
+
+
+
+
diff --git a/reactos/lib/mesa32/src/drivers/common/t_dd.c b/reactos/lib/mesa32/src/drivers/common/t_dd.c
new file mode 100644
index 00000000000..731da5c320d
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/common/t_dd.c
@@ -0,0 +1,58 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+static void copy_pv_rgba4_spec5( GLcontext *ctx, GLuint edst, GLuint esrc )
+{
+   i810ContextPtr imesa = I810_CONTEXT( ctx );
+   GLubyte *i810verts = (GLubyte *)imesa->verts;
+   GLuint shift = imesa->vertex_stride_shift;
+   i810Vertex *dst = (i810Vertex *)(i810verts + (edst << shift));
+   i810Vertex *src = (i810Vertex *)(i810verts + (esrc << shift));
+   dst->ui[4] = src->ui[4];
+   dst->ui[5] = src->ui[5];
+}
+
+static void copy_pv_rgba4( GLcontext *ctx, GLuint edst, GLuint esrc )
+{
+   i810ContextPtr imesa = I810_CONTEXT( ctx );
+   GLubyte *i810verts = (GLubyte *)imesa->verts;
+   GLuint shift = imesa->vertex_stride_shift;
+   i810Vertex *dst = (i810Vertex *)(i810verts + (edst << shift));
+   i810Vertex *src = (i810Vertex *)(i810verts + (esrc << shift));
+   dst->ui[4] = src->ui[4];
+}
+
+static void copy_pv_rgba3( GLcontext *ctx, GLuint edst, GLuint esrc )
+{
+   i810ContextPtr imesa = I810_CONTEXT( ctx );
+   GLubyte *i810verts = (GLubyte *)imesa->verts;
+   GLuint shift = imesa->vertex_stride_shift;
+   i810Vertex *dst = (i810Vertex *)(i810verts + (edst << shift));
+   i810Vertex *src = (i810Vertex *)(i810verts + (esrc << shift));
+   dst->ui[3] = src->ui[3];
+}
diff --git a/reactos/lib/mesa32/src/drivers/common/t_dd_dmatmp.h b/reactos/lib/mesa32/src/drivers/common/t_dd_dmatmp.h
new file mode 100644
index 00000000000..10ff1df5f0b
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/common/t_dd_dmatmp.h
@@ -0,0 +1,1093 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+
+/* Template for render stages which build and emit vertices directly
+ * to fixed-size dma buffers.  Useful for rendering strips and other
+ * native primitives where clipping and per-vertex tweaks such as
+ * those in t_dd_tritmp.h are not required.
+ *
+ * Produces code for both inline triangles and indexed triangles.
+ * Where various primitive types are unaccelerated by hardware, the
+ * code attempts to fallback to other primitive types (quadstrips to
+ * tristrips, lineloops to linestrips), or to indexed vertices.
+ * Ultimately, a FALLBACK() macro is invoked if there is no way to
+ * render the primitive natively.
+ */
+
+#if !defined(HAVE_TRIANGLES)
+#error "must have at least triangles to use render template"
+#endif
+
+#if !HAVE_ELTS
+#define ELTS_VARS
+#define ALLOC_ELTS( nr )
+#define EMIT_ELT( offset, elt )
+#define EMIT_TWO_ELTS( offset, elt0, elt1 )
+#define INCR_ELTS( nr )
+#define ELT_INIT(prim)
+#define GET_CURRENT_VB_MAX_ELTS() 0
+#define GET_SUBSEQUENT_VB_MAX_ELTS() 0
+#define ALLOC_ELTS_NEW_PRIMITIVE(nr)
+#define RELEASE_ELT_VERTS()
+#define EMIT_INDEXED_VERTS( ctx, start, count )
+#endif
+
+#ifndef EMIT_TWO_ELTS
+#define EMIT_TWO_ELTS( offset, elt0, elt1 )	\
+do { 						\
+   EMIT_ELT( offset, elt0 ); 			\
+   EMIT_ELT( offset+1, elt1 ); 			\
+} while (0)
+#endif
+
+#ifndef FINISH
+#define FINISH
+#endif
+
+/**********************************************************************/
+/*                  Render whole begin/end objects                    */
+/**********************************************************************/
+
+
+
+static GLboolean TAG(emit_elt_verts)( GLcontext *ctx,
+				      GLuint start, GLuint count )
+{
+   if (HAVE_ELTS) {
+      LOCAL_VARS;
+      GLuint nr = count - start;
+
+      if ( nr >= GET_SUBSEQUENT_VB_MAX_VERTS() ) /* assumes same packing for
+						  * indexed and regualar verts
+						  */
+	 return GL_FALSE;
+
+      NEW_PRIMITIVE(); /* finish last prim */
+      EMIT_INDEXED_VERTS( ctx, start, count );
+      return GL_TRUE;
+   } else {
+      return GL_FALSE;
+   }
+}
+
+#if (HAVE_ELTS)
+static void TAG(emit_elts)( GLcontext *ctx, GLuint *elts, GLuint nr )
+{
+   GLint i;
+   LOCAL_VARS;
+   ELTS_VARS;
+
+   ALLOC_ELTS( nr );
+
+   for ( i = 0 ; i < nr ; i+=2, elts += 2 ) {
+      EMIT_TWO_ELTS( 0, elts[0], elts[1] );
+      INCR_ELTS( 2 );
+   }
+}
+#endif
+
+
+/***********************************************************************
+ *                    Render non-indexed primitives.
+ ***********************************************************************/
+
+
+
+static void TAG(render_points_verts)( GLcontext *ctx,
+				      GLuint start,
+				      GLuint count,
+				      GLuint flags )
+{
+   if (HAVE_POINTS) {
+      LOCAL_VARS;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_VERTS();
+      int currentsz = GET_CURRENT_VB_MAX_VERTS();
+      GLuint j, nr;
+
+      INIT( GL_POINTS );
+
+      if (currentsz < 8)
+	 currentsz = dmasz;
+
+      for (j = start; j < count; j += nr ) {
+	 nr = MIN2( currentsz, count - j );
+	 EMIT_VERTS( ctx, j, nr );
+	 currentsz = dmasz;
+      }
+
+      FINISH;
+
+   } else {
+      VERT_FALLBACK( ctx, start, count, flags );
+   }
+}
+
+static void TAG(render_lines_verts)( GLcontext *ctx,
+				     GLuint start,
+				     GLuint count,
+				     GLuint flags )
+{
+   if (HAVE_LINES) {
+      LOCAL_VARS;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_VERTS();
+      int currentsz = GET_CURRENT_VB_MAX_VERTS();
+      GLuint j, nr;
+
+      INIT( GL_LINES );
+
+      /* Emit whole number of lines in total and in each buffer:
+       */
+      count -= (count-start) & 1;
+      currentsz -= currentsz & 1;
+      dmasz -= dmasz & 1;
+
+      if (currentsz < 8)
+	 currentsz = dmasz;
+
+      for (j = start; j < count; j += nr ) {
+	 nr = MIN2( currentsz, count - j );
+	 EMIT_VERTS( ctx, j, nr );
+	 currentsz = dmasz;
+      }
+
+      FINISH;
+
+   } else {
+      VERT_FALLBACK( ctx, start, count, flags );
+   }
+}
+
+
+static void TAG(render_line_strip_verts)( GLcontext *ctx,
+					  GLuint start,
+					  GLuint count,
+					  GLuint flags )
+{
+   if (HAVE_LINE_STRIPS) {
+      LOCAL_VARS;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_VERTS();
+      int currentsz = GET_CURRENT_VB_MAX_VERTS();
+      GLuint j, nr;
+
+      NEW_PRIMITIVE(); /* always a new primitive */
+      INIT( GL_LINE_STRIP );
+
+      if (currentsz < 8)
+	 currentsz = dmasz;
+
+      for (j = start; j + 1 < count; j += nr - 1 ) {
+	 nr = MIN2( currentsz, count - j );
+	 EMIT_VERTS( ctx, j, nr );
+	 currentsz = dmasz;
+      }
+ 
+      FINISH;
+
+   } else {
+      VERT_FALLBACK( ctx, start, count, flags );
+   }
+}
+
+
+static void TAG(render_line_loop_verts)( GLcontext *ctx,
+					 GLuint start,
+					 GLuint count,
+					 GLuint flags )
+{
+   if (HAVE_LINE_STRIPS) {
+      LOCAL_VARS;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_VERTS();
+      int currentsz = GET_CURRENT_VB_MAX_VERTS();
+      GLuint j, nr;
+
+      NEW_PRIMITIVE();
+      INIT( GL_LINE_STRIP );
+
+      if (flags & PRIM_BEGIN)
+	 j = start;
+      else
+	 j = start + 1;
+
+      /* Ensure last vertex won't wrap buffers:
+       */
+      currentsz--;
+      dmasz--;
+
+      if (currentsz < 8) {
+	 NEW_BUFFER();
+	 currentsz = dmasz;
+      }
+
+      if (j + 1 < count) {
+	 for ( ; j + 1 < count; j += nr - 1 ) {
+	    nr = MIN2( currentsz, count - j );
+	    EMIT_VERTS( ctx, j, nr );
+	    currentsz = dmasz;
+	 }
+
+	 if (start < count - 1 && (flags & PRIM_END))
+	    EMIT_VERTS( ctx, start, 1 );
+      }
+      else if (start + 1 < count && (flags & PRIM_END)) {
+	 EMIT_VERTS( ctx, start+1, 1 );
+	 EMIT_VERTS( ctx, start, 1 );
+      }
+
+      FINISH;
+
+   } else {
+      VERT_FALLBACK( ctx, start, count, flags );
+   }
+}
+
+
+static void TAG(render_triangles_verts)( GLcontext *ctx,
+					 GLuint start,
+					 GLuint count,
+					 GLuint flags )
+{
+   LOCAL_VARS;
+   int dmasz = (GET_SUBSEQUENT_VB_MAX_VERTS()/3) * 3;
+   int currentsz = (GET_CURRENT_VB_MAX_VERTS()/3) * 3;
+   GLuint j, nr;
+
+   INIT(GL_TRIANGLES);
+
+   /* Emit whole number of tris in total.  dmasz is already a multiple
+    * of 3.
+    */
+   count -= (count-start)%3;
+
+   if (currentsz < 8)
+      currentsz = dmasz;
+
+   for (j = start; j < count; j += nr) {
+      nr = MIN2( currentsz, count - j );
+      EMIT_VERTS( ctx, j, nr );
+      currentsz = dmasz;
+   }
+   FINISH;
+}
+
+
+
+static void TAG(render_tri_strip_verts)( GLcontext *ctx,
+					 GLuint start,
+					 GLuint count,
+					 GLuint flags )
+{
+   if (HAVE_TRI_STRIPS) {
+      LOCAL_VARS;
+      GLuint j, nr;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_VERTS();
+      int currentsz;
+
+      INIT(GL_TRIANGLE_STRIP);
+      NEW_PRIMITIVE();
+
+      currentsz = GET_CURRENT_VB_MAX_VERTS();
+
+      if (currentsz < 8) {
+	 NEW_BUFFER();
+	 currentsz = dmasz;
+      }
+
+      /* From here on emit even numbers of tris when wrapping over buffers:
+       */
+      dmasz -= (dmasz & 1);
+      currentsz -= (currentsz & 1);
+
+      for (j = start ; j + 2 < count; j += nr - 2 ) {
+	 nr = MIN2( currentsz, count - j );
+	 EMIT_VERTS( ctx, j, nr );
+	 currentsz = dmasz;
+      }
+
+      FINISH;
+
+   } else {
+      VERT_FALLBACK( ctx, start, count, flags );
+   }
+}
+
+static void TAG(render_tri_fan_verts)( GLcontext *ctx,
+				       GLuint start,
+				       GLuint count,
+				       GLuint flags )
+{
+   if (HAVE_TRI_FANS) {
+      LOCAL_VARS;
+      GLuint j, nr;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_VERTS();
+      int currentsz = GET_CURRENT_VB_MAX_VERTS();
+
+      NEW_PRIMITIVE();
+      INIT(GL_TRIANGLE_FAN);
+
+      if (currentsz < 8) {
+	 NEW_BUFFER();
+	 currentsz = dmasz;
+      }
+
+      for (j = start + 1 ; j + 1 < count; j += nr - 1 ) {
+	 nr = MIN2( currentsz, count - j + 1 );
+	 EMIT_VERTS( ctx, start, 1 );
+	 EMIT_VERTS( ctx, j, nr - 1 );
+	 currentsz = dmasz;
+      }
+
+      FINISH;
+
+   }
+   else {
+      /* Could write code to emit these as indexed vertices (for the
+       * g400, for instance).
+       */
+      VERT_FALLBACK( ctx, start, count, flags );
+   }
+}
+
+
+static void TAG(render_poly_verts)( GLcontext *ctx,
+				    GLuint start,
+				    GLuint count,
+				    GLuint flags )
+{
+   if (HAVE_POLYGONS) {
+      LOCAL_VARS;
+      GLuint j, nr;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_VERTS();
+      int currentsz = GET_CURRENT_VB_MAX_VERTS();
+
+      NEW_PRIMITIVE();
+      INIT(GL_POLYGON);
+
+      if (currentsz < 8) {
+	 NEW_BUFFER();
+	 currentsz = dmasz;
+      }
+
+      for (j = start + 1 ; j + 1 < count ; j += nr - 1 ) {
+	 nr = MIN2( currentsz, count - j + 1 );
+	 EMIT_VERTS( ctx, start, 1 );
+	 EMIT_VERTS( ctx, j, nr - 1 );
+	 currentsz = dmasz;
+      }
+
+      FINISH;
+
+   }
+   else if (HAVE_TRI_FANS && !(ctx->_TriangleCaps & DD_FLATSHADE)) {
+      TAG(render_tri_fan_verts)( ctx, start, count, flags );
+   } else {
+      VERT_FALLBACK( ctx, start, count, flags );
+   }
+}
+
+static void TAG(render_quad_strip_verts)( GLcontext *ctx,
+					  GLuint start,
+					  GLuint count,
+					  GLuint flags )
+{
+   GLuint j, nr;
+
+   if (HAVE_QUAD_STRIPS) {
+      LOCAL_VARS;
+      GLuint j, nr;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_VERTS();
+      int currentsz;
+
+      INIT(GL_QUAD_STRIP);
+      NEW_PRIMITIVE();
+
+      currentsz = GET_CURRENT_VB_MAX_VERTS();
+
+      if (currentsz < 8) {
+	 NEW_BUFFER();
+	 currentsz = dmasz;
+      }
+
+      dmasz -= (dmasz & 2);
+      currentsz -= (currentsz & 2);
+
+      for (j = start ; j + 3 < count; j += nr - 2 ) {
+	 nr = MIN2( currentsz, count - j );
+	 EMIT_VERTS( ctx, j, nr );
+	 currentsz = dmasz;
+      }
+
+      FINISH;
+
+   } else if (HAVE_TRI_STRIPS && (ctx->_TriangleCaps & DD_FLATSHADE)) {
+      if (TAG(emit_elt_verts)( ctx, start, count )) {
+	 LOCAL_VARS;
+	 int dmasz = GET_SUBSEQUENT_VB_MAX_ELTS();
+	 int currentsz;
+	 GLuint j, nr;
+
+	 /* Simulate flat-shaded quadstrips using indexed vertices:
+	  */
+	 NEW_PRIMITIVE();
+	 ELT_INIT( GL_TRIANGLES );
+
+	 currentsz = GET_CURRENT_VB_MAX_ELTS();
+
+	 /* Emit whole number of quads in total, and in each buffer.
+	  */
+	 dmasz -= dmasz & 1;
+	 count -= (count-start) & 1;
+	 currentsz -= currentsz & 1;
+
+	 if (currentsz < 12)
+	    currentsz = dmasz;
+
+	 currentsz = currentsz/6*2;
+	 dmasz = dmasz/6*2;
+
+	 for (j = start; j + 3 < count; j += nr - 2 ) {
+	    nr = MIN2( currentsz, count - j );
+	    if (nr >= 4) {
+	       GLint quads = (nr/2)-1;
+	       GLint i;
+	       ELTS_VARS;
+
+	       NEW_PRIMITIVE();
+	       ALLOC_ELTS_NEW_PRIMITIVE( quads*6 );
+
+	       for ( i = j-start ; i < j-start+quads*2 ; i+=2 ) {
+		  EMIT_TWO_ELTS( 0, (i+0), (i+1) );
+		  EMIT_TWO_ELTS( 2, (i+2), (i+1) );
+		  EMIT_TWO_ELTS( 4, (i+3), (i+2) );
+		  INCR_ELTS( 6 );
+	       }
+
+	       NEW_PRIMITIVE();
+	    }
+	    currentsz = dmasz;
+	 }
+
+	 RELEASE_ELT_VERTS();
+      }
+      else {
+	 /* Vertices won't fit in a single buffer or elts not available,
+	  * VERT_FALLBACK.
+	  */
+	 VERT_FALLBACK( ctx, start, count, flags );
+      }
+   }
+   else if (HAVE_TRI_STRIPS) {
+      LOCAL_VARS;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_VERTS();
+      int currentsz = GET_CURRENT_VB_MAX_VERTS();
+
+      /* Emit smooth-shaded quadstrips as tristrips:
+       */
+      NEW_PRIMITIVE();
+      INIT( GL_TRIANGLE_STRIP );
+
+      /* Emit whole number of quads in total, and in each buffer.
+       */
+      dmasz -= dmasz & 1;
+      currentsz -= currentsz & 1;
+      count -= (count-start) & 1;
+
+      if (currentsz < 8) {
+	 NEW_BUFFER();
+	 currentsz = dmasz;
+      }
+
+      for (j = start; j + 3 < count; j += nr - 2 ) {
+	 nr = MIN2( currentsz, count - j );
+	 EMIT_VERTS( ctx, j, nr );
+	 currentsz = dmasz;
+      }
+
+      FINISH;
+
+   } else {
+      VERT_FALLBACK( ctx, start, count, flags );
+   }
+}
+
+
+static void TAG(render_quads_verts)( GLcontext *ctx,
+				     GLuint start,
+				     GLuint count,
+				     GLuint flags )
+{
+   if (HAVE_QUADS) {
+      LOCAL_VARS;
+      int dmasz = (GET_SUBSEQUENT_VB_MAX_VERTS()/4) * 4;
+      int currentsz = (GET_CURRENT_VB_MAX_VERTS()/4) * 4;
+      GLuint j, nr;
+
+      INIT(GL_QUADS);
+
+      /* Emit whole number of quads in total.  dmasz is already a multiple
+       * of 4.
+       */
+      count -= (count-start)%4;
+
+      if (currentsz < 8)
+         currentsz = dmasz;
+
+      for (j = start; j < count; j += nr) {
+         nr = MIN2( currentsz, count - j );
+         EMIT_VERTS( ctx, j, nr );
+         currentsz = dmasz;
+      }
+      FINISH;
+   } else if (TAG(emit_elt_verts)( ctx, start, count )) {
+      /* Hardware doesn't have a quad primitive type -- try to
+       * simulate it using indexed vertices and the triangle
+       * primitive:
+       */
+      LOCAL_VARS;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_ELTS();
+      int currentsz;
+      GLuint j, nr;
+
+      NEW_PRIMITIVE();
+      ELT_INIT( GL_TRIANGLES );
+      currentsz = GET_CURRENT_VB_MAX_ELTS();
+
+      /* Emit whole number of quads in total, and in each buffer.
+       */
+      dmasz -= dmasz & 3;
+      count -= (count-start) & 3;
+      currentsz -= currentsz & 3;
+
+      /* Adjust for rendering as triangles:
+       */
+      currentsz = currentsz/6*4;
+      dmasz = dmasz/6*4;
+
+      if (currentsz < 8)
+	 currentsz = dmasz;
+
+      for (j = start; j < count; j += nr ) {
+	 nr = MIN2( currentsz, count - j );
+	 if (nr >= 4) {
+	    GLint quads = nr/4;
+	    GLint i;
+	    ELTS_VARS;
+
+	    NEW_PRIMITIVE();
+	    ALLOC_ELTS_NEW_PRIMITIVE( quads*6 );
+
+	    for ( i = j-start ; i < j-start+quads*4 ; i+=4 ) {
+	       EMIT_TWO_ELTS( 0, (i+0), (i+1) );
+	       EMIT_TWO_ELTS( 2, (i+3), (i+1) );
+	       EMIT_TWO_ELTS( 4, (i+2), (i+3) );
+	       INCR_ELTS( 6 );
+	    }
+
+	    NEW_PRIMITIVE();
+	 }
+	 currentsz = dmasz;
+      }
+
+      RELEASE_ELT_VERTS();
+   }
+   else {
+      /* Vertices won't fit in a single buffer, fallback.
+       */
+      VERT_FALLBACK( ctx, start, count, flags );
+   }
+}
+
+static void TAG(render_noop)( GLcontext *ctx,
+			      GLuint start,
+			      GLuint count,
+			      GLuint flags )
+{
+}
+
+
+
+
+static render_func TAG(render_tab_verts)[GL_POLYGON+2] =
+{
+   TAG(render_points_verts),
+   TAG(render_lines_verts),
+   TAG(render_line_loop_verts),
+   TAG(render_line_strip_verts),
+   TAG(render_triangles_verts),
+   TAG(render_tri_strip_verts),
+   TAG(render_tri_fan_verts),
+   TAG(render_quads_verts),
+   TAG(render_quad_strip_verts),
+   TAG(render_poly_verts),
+   TAG(render_noop),
+};
+
+
+/****************************************************************************
+ *                 Render elts using hardware indexed verts                 *
+ ****************************************************************************/
+
+#if (HAVE_ELTS)
+static void TAG(render_points_elts)( GLcontext *ctx,
+				     GLuint start,
+				     GLuint count,
+				     GLuint flags )
+{
+   if (HAVE_POINTS) {
+      LOCAL_VARS;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_ELTS();
+      int currentsz;
+      GLuint *elts = TNL_CONTEXT(ctx)->vb.Elts;
+      GLuint j, nr;
+
+      ELT_INIT( GL_POINTS );
+
+      currentsz = GET_CURRENT_VB_MAX_ELTS();
+      if (currentsz < 8)
+	 currentsz = dmasz;
+
+      for (j = start; j < count; j += nr ) {
+	 nr = MIN2( currentsz, count - j );
+	 TAG(emit_elts)( ctx, elts+j, nr );
+	 NEW_PRIMITIVE();
+	 currentsz = dmasz;
+      }
+   } else {
+      ELT_FALLBACK( ctx, start, count, flags );
+   }
+}
+
+
+
+static void TAG(render_lines_elts)( GLcontext *ctx,
+				    GLuint start,
+				    GLuint count,
+				    GLuint flags )
+{
+   if (HAVE_LINES) {
+      LOCAL_VARS;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_ELTS();
+      int currentsz;
+      GLuint *elts = TNL_CONTEXT(ctx)->vb.Elts;
+      GLuint j, nr;
+
+      ELT_INIT( GL_LINES );
+
+      /* Emit whole number of lines in total and in each buffer:
+       */
+      count -= (count-start) & 1;
+      currentsz -= currentsz & 1;
+      dmasz -= dmasz & 1;
+
+      currentsz = GET_CURRENT_VB_MAX_ELTS();
+      if (currentsz < 8)
+	 currentsz = dmasz;
+
+      for (j = start; j < count; j += nr ) {
+	 nr = MIN2( currentsz, count - j );
+	 TAG(emit_elts)( ctx, elts+j, nr );
+	 NEW_PRIMITIVE();
+	 currentsz = dmasz;
+      }
+   } else {
+      ELT_FALLBACK( ctx, start, count, flags );
+   }
+}
+
+
+static void TAG(render_line_strip_elts)( GLcontext *ctx,
+					 GLuint start,
+					 GLuint count,
+					 GLuint flags )
+{
+   if (HAVE_LINE_STRIPS) {
+      LOCAL_VARS;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_ELTS();
+      int currentsz;
+      GLuint *elts = TNL_CONTEXT(ctx)->vb.Elts;
+      GLuint j, nr;
+
+      NEW_PRIMITIVE(); /* always a new primitive */
+      ELT_INIT( GL_LINE_STRIP );
+
+      currentsz = GET_CURRENT_VB_MAX_ELTS();
+      if (currentsz < 8)
+	 currentsz = dmasz;
+
+      for (j = start; j + 1 < count; j += nr - 1 ) {
+	 nr = MIN2( currentsz, count - j );
+	 TAG(emit_elts)( ctx, elts+j, nr );
+	 NEW_PRIMITIVE();
+	 currentsz = dmasz;
+      }
+   } else {
+      /* TODO: Try to emit as indexed lines.
+       */
+      ELT_FALLBACK( ctx, start, count, flags );
+   }
+}
+
+
+static void TAG(render_line_loop_elts)( GLcontext *ctx,
+					GLuint start,
+					GLuint count,
+					GLuint flags )
+{
+   if (HAVE_LINE_STRIPS) {
+      LOCAL_VARS;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_ELTS();
+      int currentsz;
+      GLuint *elts = TNL_CONTEXT(ctx)->vb.Elts;
+      GLuint j, nr;
+
+      NEW_PRIMITIVE();
+      ELT_INIT( GL_LINE_STRIP );
+
+      if (flags & PRIM_BEGIN)
+	 j = start;
+      else
+	 j = start + 1;
+
+      currentsz = GET_CURRENT_VB_MAX_ELTS();
+      if (currentsz < 8) {
+	 NEW_BUFFER();
+	 currentsz = dmasz;
+      }
+
+      /* Ensure last vertex doesn't wrap:
+       */
+      currentsz--;
+      dmasz--;
+
+      for ( ; j + 1 < count; j += nr - 1 ) {
+	 nr = MIN2( currentsz, count - j );
+/*  	 NEW_PRIMITIVE(); */
+	 TAG(emit_elts)( ctx, elts+j, nr );
+	 currentsz = dmasz;
+      }
+
+      if (flags & PRIM_END)
+	 TAG(emit_elts)( ctx, elts+start, 1 );
+
+      NEW_PRIMITIVE();
+   } else {
+      /* TODO: Try to emit as indexed lines */
+      ELT_FALLBACK( ctx, start, count, flags );
+   }
+}
+
+
+/* For verts, we still eliminate the copy from main memory to dma
+ * buffers.  For elts, this is probably no better (worse?) than the
+ * standard path.
+ */
+static void TAG(render_triangles_elts)( GLcontext *ctx,
+					GLuint start,
+					GLuint count,
+					GLuint flags )
+{
+   LOCAL_VARS;
+   GLuint *elts = TNL_CONTEXT(ctx)->vb.Elts;
+   int dmasz = GET_SUBSEQUENT_VB_MAX_ELTS()/3*3;
+   int currentsz;
+   GLuint j, nr;
+
+   NEW_PRIMITIVE();
+   ELT_INIT( GL_TRIANGLES );
+
+   currentsz = GET_CURRENT_VB_MAX_ELTS();
+
+   /* Emit whole number of tris in total.  dmasz is already a multiple
+    * of 3.
+    */
+   count -= (count-start)%3;
+   currentsz -= currentsz%3;
+   if (currentsz < 8)
+      currentsz = dmasz;
+
+   for (j = start; j < count; j += nr) {
+      nr = MIN2( currentsz, count - j );
+      TAG(emit_elts)( ctx, elts+j, nr );
+      NEW_PRIMITIVE();
+      currentsz = dmasz;
+   }
+}
+
+
+
+static void TAG(render_tri_strip_elts)( GLcontext *ctx,
+					GLuint start,
+					GLuint count,
+					GLuint flags )
+{
+   if (HAVE_TRI_STRIPS) {
+      LOCAL_VARS;
+      GLuint j, nr;
+      GLuint *elts = TNL_CONTEXT(ctx)->vb.Elts;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_ELTS();
+      int currentsz;
+
+      NEW_PRIMITIVE();
+      ELT_INIT( GL_TRIANGLE_STRIP );
+
+      currentsz = GET_CURRENT_VB_MAX_ELTS();
+      if (currentsz < 8) {
+	 NEW_BUFFER();
+	 currentsz = dmasz;
+      }
+
+      /* Keep the same winding over multiple buffers:
+       */
+      dmasz -= (dmasz & 1);
+      currentsz -= (currentsz & 1);
+
+      for (j = start ; j + 2 < count; j += nr - 2 ) {
+	 nr = MIN2( currentsz, count - j );
+	 TAG(emit_elts)( ctx, elts+j, nr );
+	 NEW_PRIMITIVE();
+	 currentsz = dmasz;
+      }
+   } else {
+      /* TODO: try to emit as indexed triangles */
+      ELT_FALLBACK( ctx, start, count, flags );
+   }
+}
+
+static void TAG(render_tri_fan_elts)( GLcontext *ctx,
+				      GLuint start,
+				      GLuint count,
+				      GLuint flags )
+{
+   if (HAVE_TRI_FANS) {
+      LOCAL_VARS;
+      GLuint *elts = TNL_CONTEXT(ctx)->vb.Elts;
+      GLuint j, nr;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_ELTS();
+      int currentsz;
+
+      NEW_PRIMITIVE();
+      ELT_INIT( GL_TRIANGLE_FAN );
+
+      currentsz = GET_CURRENT_VB_MAX_ELTS();
+      if (currentsz < 8) {
+	 NEW_BUFFER();
+	 currentsz = dmasz;
+      }
+
+      for (j = start + 1 ; j + 1 < count; j += nr - 1 ) {
+	 nr = MIN2( currentsz, count - j + 1 );
+	 TAG(emit_elts)( ctx, elts+start, 1 );
+	 TAG(emit_elts)( ctx, elts+j, nr - 1 );
+	 NEW_PRIMITIVE();
+	 currentsz = dmasz;
+      }
+   } else {
+      /* TODO: try to emit as indexed triangles */
+      ELT_FALLBACK( ctx, start, count, flags );
+   }
+}
+
+
+static void TAG(render_poly_elts)( GLcontext *ctx,
+				   GLuint start,
+				   GLuint count,
+				   GLuint flags )
+{
+   if (HAVE_POLYGONS && 0) {
+   } else if (HAVE_TRI_FANS && !(ctx->_TriangleCaps & DD_FLATSHADE)) {
+      LOCAL_VARS;
+      GLuint *elts = TNL_CONTEXT(ctx)->vb.Elts;
+      GLuint j, nr;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_ELTS();
+      int currentsz;
+
+      NEW_PRIMITIVE();
+      ELT_INIT( GL_TRIANGLE_FAN );
+
+      currentsz = GET_CURRENT_VB_MAX_ELTS();
+      if (currentsz < 8) {
+	 NEW_BUFFER();
+	 currentsz = dmasz;
+      }
+
+      for (j = start + 1 ; j + 1 < count ; j += nr - 1 ) {
+	 nr = MIN2( currentsz, count - j + 1 );
+	 TAG(emit_elts)( ctx, elts+start, 1 );
+	 TAG(emit_elts)( ctx, elts+j, nr - 1 );
+	 NEW_PRIMITIVE();
+	 currentsz = dmasz;
+      }
+   } else {
+      ELT_FALLBACK( ctx, start, count, flags );
+   }
+}
+
+static void TAG(render_quad_strip_elts)( GLcontext *ctx,
+					 GLuint start,
+					 GLuint count,
+					 GLuint flags )
+{
+   if (HAVE_QUAD_STRIPS && 0) {
+   }
+   else if (HAVE_TRI_STRIPS) {
+      LOCAL_VARS;
+      GLuint *elts = TNL_CONTEXT(ctx)->vb.Elts;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_ELTS();
+      int currentsz;
+      GLuint j, nr;
+
+      NEW_PRIMITIVE();
+      currentsz = GET_CURRENT_VB_MAX_ELTS();
+
+      /* Emit whole number of quads in total, and in each buffer.
+       */
+      dmasz -= dmasz & 1;
+      count -= (count-start) & 1;
+      currentsz -= currentsz & 1;
+
+      if (currentsz < 12)
+	 currentsz = dmasz;
+
+      if (ctx->_TriangleCaps & DD_FLATSHADE) {
+	 ELT_INIT( GL_TRIANGLES );
+
+	 currentsz = currentsz/6*2;
+	 dmasz = dmasz/6*2;
+
+	 for (j = start; j + 3 < count; j += nr - 2 ) {
+	    nr = MIN2( currentsz, count - j );
+
+	    if (nr >= 4)
+	    {
+	       GLint i;
+	       GLint quads = (nr/2)-1;
+	       ELTS_VARS;
+
+
+	       NEW_PRIMITIVE();
+	       ALLOC_ELTS_NEW_PRIMITIVE( quads*6 );
+
+	       for ( i = j-start ; i < j-start+quads ; i++, elts += 2 ) {
+		  EMIT_TWO_ELTS( 0, elts[0], elts[1] );
+		  EMIT_TWO_ELTS( 2, elts[2], elts[1] );
+		  EMIT_TWO_ELTS( 4, elts[3], elts[2] );
+		  INCR_ELTS( 6 );
+	       }
+
+	       NEW_PRIMITIVE();
+	    }
+
+	    currentsz = dmasz;
+	 }
+      }
+      else {
+	 ELT_INIT( GL_TRIANGLE_STRIP );
+
+	 for (j = start; j + 3 < count; j += nr - 2 ) {
+	    nr = MIN2( currentsz, count - j );
+	    TAG(emit_elts)( ctx, elts+j, nr );
+	    NEW_PRIMITIVE();
+	    currentsz = dmasz;
+	 }
+      }
+   }
+}
+
+
+static void TAG(render_quads_elts)( GLcontext *ctx,
+				    GLuint start,
+				    GLuint count,
+				    GLuint flags )
+{
+   if (HAVE_QUADS && 0) {
+   } else {
+      LOCAL_VARS;
+      GLuint *elts = TNL_CONTEXT(ctx)->vb.Elts;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_ELTS();
+      int currentsz;
+      GLuint j, nr;
+
+      ELT_INIT( GL_TRIANGLES );
+      currentsz = GET_CURRENT_VB_MAX_ELTS();
+
+      /* Emit whole number of quads in total, and in each buffer.
+       */
+      dmasz -= dmasz & 3;
+      count -= (count-start) & 3;
+      currentsz -= currentsz & 3;
+
+      /* Adjust for rendering as triangles:
+       */
+      currentsz = currentsz/6*4;
+      dmasz = dmasz/6*4;
+
+      if (currentsz < 8)
+	 currentsz = dmasz;
+
+      for (j = start; j + 3 < count; j += nr - 2 ) {
+	 nr = MIN2( currentsz, count - j );
+
+	 if (nr >= 4)
+	 {
+	    GLint quads = nr/4;
+	    GLint i;
+	    ELTS_VARS;
+	    NEW_PRIMITIVE();
+	    ALLOC_ELTS_NEW_PRIMITIVE( quads * 6 );
+
+	    for ( i = j-start ; i < j-start+quads ; i++, elts += 4 ) {
+	       EMIT_TWO_ELTS( 0, elts[0], elts[1] );
+	       EMIT_TWO_ELTS( 2, elts[3], elts[1] );
+	       EMIT_TWO_ELTS( 4, elts[2], elts[3] );
+	       INCR_ELTS( 6 );
+	    }
+	 }
+
+	 NEW_PRIMITIVE();
+	 currentsz = dmasz;
+      }
+   }
+}
+
+
+
+static render_func TAG(render_tab_elts)[GL_POLYGON+2] =
+{
+   TAG(render_points_elts),
+   TAG(render_lines_elts),
+   TAG(render_line_loop_elts),
+   TAG(render_line_strip_elts),
+   TAG(render_triangles_elts),
+   TAG(render_tri_strip_elts),
+   TAG(render_tri_fan_elts),
+   TAG(render_quads_elts),
+   TAG(render_quad_strip_elts),
+   TAG(render_poly_elts),
+   TAG(render_noop),
+};
+#endif
diff --git a/reactos/lib/mesa32/src/drivers/common/t_dd_dmatmp2.h b/reactos/lib/mesa32/src/drivers/common/t_dd_dmatmp2.h
new file mode 100644
index 00000000000..dd0286b453b
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/common/t_dd_dmatmp2.h
@@ -0,0 +1,935 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.0.3
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+
+/* Template for render stages which build and emit vertices directly
+ * to fixed-size dma buffers.  Useful for rendering strips and other
+ * native primitives where clipping and per-vertex tweaks such as
+ * those in t_dd_tritmp.h are not required.
+ *
+ */
+
+#if !HAVE_TRIANGLES || !HAVE_POINTS || !HAVE_LINES
+#error "must have points, lines & triangles to use render template"
+#endif
+
+#if !HAVE_TRI_STRIPS || !HAVE_TRI_FANS
+#error "must have tri strip and fans to use render template"
+#endif
+
+#if !HAVE_LINE_STRIPS
+#error "must have line strips to use render template"
+#endif
+
+#if !HAVE_POLYGONS
+#error "must have polygons to use render template"
+#endif
+
+#if !HAVE_ELTS
+#error "must have elts to use render template"
+#endif
+
+
+#ifndef EMIT_TWO_ELTS
+#define EMIT_TWO_ELTS( dest, offset, elt0, elt1 )	\
+do { 						\
+   (dest)[offset] = (elt0); 			\
+   (dest)[offset+1] = (elt1); 			\
+} while (0)
+#endif
+
+
+/**********************************************************************/
+/*                  Render whole begin/end objects                    */
+/**********************************************************************/
+
+
+static ELT_TYPE *TAG(emit_elts)( GLcontext *ctx, 
+			    ELT_TYPE *dest,
+			    GLuint *elts, GLuint nr )
+{
+   GLint i;
+   LOCAL_VARS;
+
+   for ( i = 0 ; i+1 < nr ; i+=2, elts += 2 ) {
+      EMIT_TWO_ELTS( dest, 0, elts[0], elts[1] );
+      dest += 2;
+   }
+   if (i < nr) {
+      EMIT_ELT( dest, 0, elts[0] );
+      dest += 1;
+   }
+   
+   return dest;
+}
+
+static ELT_TYPE *TAG(emit_consecutive_elts)( GLcontext *ctx, 
+					ELT_TYPE *dest,
+					GLuint start, GLuint nr )
+{
+   GLint i;
+   LOCAL_VARS;
+
+   for ( i = 0 ; i+1 < nr ; i+=2, start += 2 ) {
+      EMIT_TWO_ELTS( dest, 0, start, start+1 );
+      dest += 2;
+   }
+   if (i < nr) {
+      EMIT_ELT( dest, 0, start );
+      dest += 1;
+   }
+
+   return dest;
+}
+
+/***********************************************************************
+ *                    Render non-indexed primitives.
+ ***********************************************************************/
+
+
+
+static void TAG(render_points_verts)( GLcontext *ctx,
+				      GLuint start,
+				      GLuint count,
+				      GLuint flags )
+{
+   if (start < count) {
+      LOCAL_VARS;
+      if (0) fprintf(stderr, "%s\n", __FUNCTION__);
+      EMIT_PRIM( ctx, GL_POINTS, HW_POINTS, start, count );
+   }
+}
+
+static void TAG(render_lines_verts)( GLcontext *ctx,
+				     GLuint start,
+				     GLuint count,
+				     GLuint flags )
+{
+   LOCAL_VARS;
+   if (0) fprintf(stderr, "%s\n", __FUNCTION__);
+   count -= (count-start) & 1;
+
+   if (start+1 >= count)
+      return;
+
+   if ((flags & PRIM_BEGIN) && ctx->Line.StippleFlag) {
+      RESET_STIPPLE();
+      AUTO_STIPPLE( GL_TRUE );
+   }
+      
+   EMIT_PRIM( ctx, GL_LINES, HW_LINES, start, count );
+
+   if ((flags & PRIM_END) && ctx->Line.StippleFlag)
+      AUTO_STIPPLE( GL_FALSE );
+}
+
+
+static void TAG(render_line_strip_verts)( GLcontext *ctx,
+					  GLuint start,
+					  GLuint count,
+					  GLuint flags )
+{
+   LOCAL_VARS;
+   if (0) fprintf(stderr, "%s\n", __FUNCTION__);
+
+   if (start+1 >= count)
+      return;
+
+   if ((flags & PRIM_BEGIN) && ctx->Line.StippleFlag)
+      RESET_STIPPLE();
+
+
+   if (PREFER_DISCRETE_ELT_PRIM( count-start, HW_LINES ))
+   {   
+      int dmasz = GET_MAX_HW_ELTS();
+      GLuint j, nr;
+
+      ELT_INIT( GL_LINES, HW_LINES );
+
+      /* Emit whole number of lines in each full buffer.
+       */
+      dmasz = dmasz/2;
+
+
+      for (j = start; j + 1 < count; j += nr - 1 ) {
+	 ELT_TYPE *dest;
+	 GLint i;
+
+	 nr = MIN2( dmasz, count - j );
+	 dest = ALLOC_ELTS( (nr-1)*2 );
+	    
+	 for ( i = j ; i+1 < j+nr ; i+=1 ) {
+	    EMIT_TWO_ELTS( dest, 0, (i+0), (i+1) );
+	    dest += 2;
+	 }
+
+	 CLOSE_ELTS();
+      }
+   }
+   else
+      EMIT_PRIM( ctx, GL_LINE_STRIP, HW_LINE_STRIP, start, count );
+}
+
+
+static void TAG(render_line_loop_verts)( GLcontext *ctx,
+					 GLuint start,
+					 GLuint count,
+					 GLuint flags )
+{
+   LOCAL_VARS;
+   GLuint j, nr;
+   if (0) fprintf(stderr, "%s\n", __FUNCTION__);
+
+   if (flags & PRIM_BEGIN) {
+      j = start;
+      if (ctx->Line.StippleFlag)
+	 RESET_STIPPLE( );
+   }
+   else
+      j = start + 1;
+
+   if (flags & PRIM_END) {
+
+      if (start+1 >= count)
+	 return;
+
+      if (PREFER_DISCRETE_ELT_PRIM( count-start, HW_LINES )) {
+	 int dmasz = GET_MAX_HW_ELTS();
+
+	 ELT_INIT( GL_LINES, HW_LINES );
+
+	 /* Emit whole number of lines in each full buffer.
+	  */
+	 dmasz = dmasz/2;
+
+	 /* Ensure last vertex doesn't wrap:
+	  */
+	 dmasz--;
+
+	 for (; j + 1 < count;  ) {
+	    GLint i;
+	    ELT_TYPE *dest;
+
+	    nr = MIN2( dmasz, count - j );
+	    dest = ALLOC_ELTS( nr*2 );	/* allocs room for 1 more line */
+
+	    for ( i = 0 ; i < nr - 1 ; i+=1 ) {
+	       EMIT_TWO_ELTS( dest, 0, (j+i), (j+i+1) );
+	       dest += 2;
+	    }
+
+	    j += nr - 1;
+
+	    /* Emit 1 more line into space alloced above */
+	    if (j + 1 >= count) {
+ 	       EMIT_TWO_ELTS( dest, 0, (j), (start) ); 
+ 	       dest += 2; 
+ 	    }
+ 
+	    CLOSE_ELTS();
+	 }
+      }
+      else
+      {
+	 int dmasz = GET_MAX_HW_ELTS() - 1;
+
+	 ELT_INIT( GL_LINE_STRIP, HW_LINE_STRIP );
+
+	 for ( ; j + 1 < count;  ) {
+	    nr = MIN2( dmasz, count - j );
+	    if (j + nr < count) {
+	       ELT_TYPE *dest = ALLOC_ELTS( nr );
+	       dest = TAG(emit_consecutive_elts)( ctx, dest, j, nr );
+	       j += nr - 1;
+	       CLOSE_ELTS();
+	    }
+	    else if (nr) {
+	       ELT_TYPE *dest = ALLOC_ELTS( nr + 1 );
+	       dest = TAG(emit_consecutive_elts)( ctx, dest, j, nr );
+	       dest = TAG(emit_consecutive_elts)( ctx, dest, start, 1 );
+	       j += nr;
+	       CLOSE_ELTS();
+	    }
+	 }   
+      }
+   } else {
+      TAG(render_line_strip_verts)( ctx, j, count, flags );
+   }
+}
+
+
+static void TAG(render_triangles_verts)( GLcontext *ctx,
+					 GLuint start,
+					 GLuint count,
+					 GLuint flags )
+{
+   LOCAL_VARS;
+   if (0) fprintf(stderr, "%s\n", __FUNCTION__);
+
+   count -= (count-start)%3;
+
+   if (start+2 >= count) {
+      return;
+   }
+
+   /* need a PREFER_DISCRETE_ELT_PRIM here too..
+    */
+   EMIT_PRIM( ctx, GL_TRIANGLES, HW_TRIANGLES, start, count );
+}
+
+
+
+static void TAG(render_tri_strip_verts)( GLcontext *ctx,
+					 GLuint start,
+					 GLuint count,
+					 GLuint flags )
+{
+   LOCAL_VARS;
+   if (0) fprintf(stderr, "%s\n", __FUNCTION__);
+
+   if (start + 2 >= count)
+      return;
+
+   if (PREFER_DISCRETE_ELT_PRIM( count-start, HW_TRIANGLES ))
+   {   
+      int dmasz = GET_MAX_HW_ELTS();
+      int parity = 0;
+      GLuint j, nr;
+
+      ELT_INIT( GL_TRIANGLES, HW_TRIANGLES );
+
+      /* Emit even number of tris in each full buffer.
+       */
+      dmasz = dmasz/3;
+      dmasz -= dmasz & 1;
+
+      for (j = start; j + 2 < count; j += nr - 2 ) {
+	 ELT_TYPE *dest;
+	 GLint i;
+
+	 nr = MIN2( dmasz, count - j );
+	 dest = ALLOC_ELTS( (nr-2)*3 );
+	    
+	 for ( i = j ; i+2 < j+nr ; i++, parity^=1 ) {
+	    EMIT_ELT( dest, 0, (i+0+parity) );
+	    EMIT_ELT( dest, 1, (i+1-parity) );
+	    EMIT_ELT( dest, 2, (i+2) );
+	    dest += 3;
+	 }
+
+	 CLOSE_ELTS();
+      }
+   }
+   else if (HAVE_TRI_STRIP_1)
+      EMIT_PRIM( ctx, GL_TRIANGLE_STRIP, HW_TRIANGLE_STRIP_1, start, count );
+   else {
+      /* Emit the first triangle with elts, then the rest as a regular strip.
+       * TODO:  Make this unlikely in t_imm_api.c
+       */
+      ELT_TYPE *dest;
+
+      ELT_INIT( GL_TRIANGLES, HW_TRIANGLES );
+      dest = ALLOC_ELTS( 3 );
+      EMIT_ELT( dest, 0, (start+1) );
+      EMIT_ELT( dest, 1, (start+0) );
+      EMIT_ELT( dest, 2, (start+2) );
+      dest += 3;
+      CLOSE_ELTS();
+
+      start++;
+      if (start + 2 >= count)
+	 return;
+
+      EMIT_PRIM( ctx, GL_TRIANGLE_STRIP, HW_TRIANGLE_STRIP_0, start, 
+		 count );
+   }
+}
+
+static void TAG(render_tri_fan_verts)( GLcontext *ctx,
+				       GLuint start,
+				       GLuint count,
+				       GLuint flags )
+{
+   LOCAL_VARS;
+   if (0) fprintf(stderr, "%s\n", __FUNCTION__);
+
+   if (start+2 >= count) 
+      return;
+
+   if (PREFER_DISCRETE_ELT_PRIM( count-start, HW_TRIANGLES ))
+   {   
+      int dmasz = GET_MAX_HW_ELTS();
+      GLuint j, nr;
+
+      ELT_INIT( GL_TRIANGLES, HW_TRIANGLES );
+
+      dmasz = dmasz/3;
+
+      for (j = start + 1; j + 1 < count; j += nr - 1 ) {
+	 ELT_TYPE *dest;
+	 GLint i;
+
+	 nr = MIN2( dmasz, count - j );
+	 dest = ALLOC_ELTS( (nr-1)*3 );
+	    
+	 for ( i = j ; i+1 < j+nr ; i++ ) {
+	    EMIT_ELT( dest, 0, (start) );
+	    EMIT_ELT( dest, 1, (i) );
+	    EMIT_ELT( dest, 2, (i+1) );
+	    dest += 3;
+	 }
+	 
+	 CLOSE_ELTS();
+      }
+   }
+   else {
+      EMIT_PRIM( ctx, GL_TRIANGLE_FAN, HW_TRIANGLE_FAN, start, count );
+   }
+}
+
+
+static void TAG(render_poly_verts)( GLcontext *ctx,
+				    GLuint start,
+				    GLuint count,
+				    GLuint flags )
+{
+   LOCAL_VARS;
+   if (0) fprintf(stderr, "%s\n", __FUNCTION__);
+
+   if (start+2 >= count) 
+      return;
+
+   EMIT_PRIM( ctx, GL_POLYGON, HW_POLYGON, start, count );
+}
+
+static void TAG(render_quad_strip_verts)( GLcontext *ctx,
+					  GLuint start,
+					  GLuint count,
+					  GLuint flags )
+{
+   LOCAL_VARS;
+   if (0) fprintf(stderr, "%s\n", __FUNCTION__);
+
+   count -= (count-start) & 1;
+
+   if (start+3 >= count) 
+      return;
+
+   if (HAVE_QUAD_STRIPS) {
+      EMIT_PRIM( ctx, GL_QUAD_STRIP, HW_QUAD_STRIP, start, count );
+   } 
+   else if (ctx->_TriangleCaps & DD_FLATSHADE) {
+      LOCAL_VARS;
+      int dmasz = GET_MAX_HW_ELTS();
+      GLuint j, nr;
+
+      ELT_INIT( GL_TRIANGLES, HW_TRIANGLES );
+
+      /* Emit whole number of quads in total, and in each buffer.
+       */
+      dmasz = (dmasz/6)*2;
+
+      for (j = start; j + 3 < count; j += nr - 2 ) {
+	 ELT_TYPE *dest;
+	 GLint quads, i;
+
+	 nr = MIN2( dmasz, count - j );
+	 quads = (nr/2)-1;
+	 dest = ALLOC_ELTS( quads*6 );
+	    
+	 for ( i = j ; i < j+quads*2 ; i+=2 ) {
+	    EMIT_TWO_ELTS( dest, 0, (i+0), (i+1) );
+	    EMIT_TWO_ELTS( dest, 2, (i+2), (i+1) );
+	    EMIT_TWO_ELTS( dest, 4, (i+3), (i+2) );
+	    dest += 6;
+	 }
+
+	 CLOSE_ELTS();
+      }
+   }
+   else {
+      EMIT_PRIM( ctx, GL_TRIANGLE_STRIP, HW_TRIANGLE_STRIP_0, start, count );
+   }
+}
+
+
+static void TAG(render_quads_verts)( GLcontext *ctx,
+				     GLuint start,
+				     GLuint count,
+				     GLuint flags )
+{
+   LOCAL_VARS;
+   if (0) fprintf(stderr, "%s\n", __FUNCTION__);
+   count -= (count-start)%4;
+
+   if (start+3 >= count) 
+      return;
+
+   if (HAVE_QUADS) {
+      EMIT_PRIM( ctx, HW_QUADS, GL_QUADS, start, count );
+   } 
+   else {
+      /* Hardware doesn't have a quad primitive type -- simulate it
+       * using indexed vertices and the triangle primitive: 
+       */
+      LOCAL_VARS;
+      int dmasz = GET_MAX_HW_ELTS();
+      GLuint j, nr;
+
+      ELT_INIT( GL_TRIANGLES, HW_TRIANGLES );
+
+      /* Adjust for rendering as triangles:
+       */
+      dmasz = (dmasz/6)*4;
+
+      for (j = start; j < count; j += nr ) {
+	 ELT_TYPE *dest;
+	 GLint quads, i;
+
+	 nr = MIN2( dmasz, count - j );
+	 quads = nr/4;
+	 dest = ALLOC_ELTS( quads*6 );
+
+	 for ( i = j ; i < j+quads*4 ; i+=4 ) {
+	    EMIT_TWO_ELTS( dest, 0, (i+0), (i+1) );
+	    EMIT_TWO_ELTS( dest, 2, (i+3), (i+1) );
+	    EMIT_TWO_ELTS( dest, 4, (i+2), (i+3) );
+	    dest += 6;
+	 }
+
+	 CLOSE_ELTS();
+      }
+   }
+}
+
+static void TAG(render_noop)( GLcontext *ctx,
+			      GLuint start,
+			      GLuint count,
+			      GLuint flags )
+{
+}
+
+
+
+
+static render_func TAG(render_tab_verts)[GL_POLYGON+2] =
+{
+   TAG(render_points_verts),
+   TAG(render_lines_verts),
+   TAG(render_line_loop_verts),
+   TAG(render_line_strip_verts),
+   TAG(render_triangles_verts),
+   TAG(render_tri_strip_verts),
+   TAG(render_tri_fan_verts),
+   TAG(render_quads_verts),
+   TAG(render_quad_strip_verts),
+   TAG(render_poly_verts),
+   TAG(render_noop),
+};
+
+
+/****************************************************************************
+ *                 Render elts using hardware indexed verts                 *
+ ****************************************************************************/
+
+static void TAG(render_points_elts)( GLcontext *ctx,
+				     GLuint start,
+				     GLuint count,
+				     GLuint flags )
+{
+   LOCAL_VARS;
+   int dmasz = GET_MAX_HW_ELTS();
+   GLuint *elts = GET_MESA_ELTS();
+   GLuint j, nr;
+   ELT_TYPE *dest;
+
+   ELT_INIT( GL_POINTS, HW_POINTS );
+
+   for (j = start; j < count; j += nr ) {
+      nr = MIN2( dmasz, count - j );
+      dest = ALLOC_ELTS( nr );
+      dest = TAG(emit_elts)( ctx, dest, elts+j, nr );
+      CLOSE_ELTS();
+   }
+}
+
+
+
+static void TAG(render_lines_elts)( GLcontext *ctx,
+				    GLuint start,
+				    GLuint count,
+				    GLuint flags )
+{
+   LOCAL_VARS;
+   int dmasz = GET_MAX_HW_ELTS();
+   GLuint *elts = GET_MESA_ELTS();
+   GLuint j, nr;
+   ELT_TYPE *dest;
+
+   if (start+1 >= count)
+      return;
+
+   if ((flags & PRIM_BEGIN) && ctx->Line.StippleFlag) {
+      RESET_STIPPLE();
+      AUTO_STIPPLE( GL_TRUE );
+   }
+
+   ELT_INIT( GL_LINES, HW_LINES );
+
+   /* Emit whole number of lines in total and in each buffer:
+    */
+   count -= (count-start) & 1;
+   dmasz -= dmasz & 1;
+
+   for (j = start; j < count; j += nr ) {
+      nr = MIN2( dmasz, count - j );
+      dest = ALLOC_ELTS( nr );
+      dest = TAG(emit_elts)( ctx, dest, elts+j, nr );
+      CLOSE_ELTS();
+   }
+
+   if ((flags & PRIM_END) && ctx->Line.StippleFlag)
+      AUTO_STIPPLE( GL_FALSE );
+}
+
+
+static void TAG(render_line_strip_elts)( GLcontext *ctx,
+					 GLuint start,
+					 GLuint count,
+					 GLuint flags )
+{
+   LOCAL_VARS;
+   int dmasz = GET_MAX_HW_ELTS();
+   GLuint *elts = GET_MESA_ELTS();
+   GLuint j, nr;
+   ELT_TYPE *dest;
+
+   if (start+1 >= count)
+      return;
+
+   ELT_INIT( GL_LINE_STRIP, HW_LINE_STRIP );
+
+   if ((flags & PRIM_BEGIN) && ctx->Line.StippleFlag)
+      RESET_STIPPLE();
+
+   for (j = start; j + 1 < count; j += nr - 1 ) {
+      nr = MIN2( dmasz, count - j );
+      dest = ALLOC_ELTS( nr );
+      dest = TAG(emit_elts)( ctx, dest, elts+j, nr );
+      CLOSE_ELTS();
+   }
+}
+
+
+static void TAG(render_line_loop_elts)( GLcontext *ctx,
+					GLuint start,
+					GLuint count,
+					GLuint flags )
+{
+   LOCAL_VARS;
+   int dmasz = GET_MAX_HW_ELTS();
+   GLuint *elts = GET_MESA_ELTS();
+   GLuint j, nr;
+   ELT_TYPE *dest;
+
+   if (0) fprintf(stderr, "%s\n", __FUNCTION__);
+
+   if (flags & PRIM_BEGIN)
+      j = start;
+   else
+      j = start + 1;
+
+   
+   if (flags & PRIM_END) {
+      if (start+1 >= count)
+	 return;
+   } 
+   else {
+      if (j+1 >= count)
+	 return;
+   }
+
+   ELT_INIT( GL_LINE_STRIP, HW_LINE_STRIP );
+
+   if ((flags & PRIM_BEGIN) && ctx->Line.StippleFlag)
+      RESET_STIPPLE();
+
+   
+   /* Ensure last vertex doesn't wrap:
+    */
+   dmasz--;
+
+   for ( ; j + 1 < count; ) {
+      nr = MIN2( dmasz, count - j );
+      dest = ALLOC_ELTS( nr+1 );	/* Reserve possible space for last elt */
+      dest = TAG(emit_elts)( ctx, dest, elts+j, nr );
+      j += nr - 1;
+      if (j + 1 >= count && (flags & PRIM_END)) {
+	 dest = TAG(emit_elts)( ctx, dest, elts+start, 1 );
+      }
+      CLOSE_ELTS();
+   }
+}
+
+
+static void TAG(render_triangles_elts)( GLcontext *ctx,
+					GLuint start,
+					GLuint count,
+					GLuint flags )
+{
+   LOCAL_VARS;
+   GLuint *elts = GET_MESA_ELTS();
+   int dmasz = GET_MAX_HW_ELTS()/3*3;
+   GLuint j, nr;
+   ELT_TYPE *dest;
+
+   if (start+2 >= count)
+      return;
+
+   ELT_INIT( GL_TRIANGLES, HW_TRIANGLES );
+
+
+   /* Emit whole number of tris in total.  dmasz is already a multiple
+    * of 3.
+    */
+   count -= (count-start)%3;
+
+   for (j = start; j < count; j += nr) {
+      nr = MIN2( dmasz, count - j );
+      dest = ALLOC_ELTS( nr );
+      dest = TAG(emit_elts)( ctx, dest, elts+j, nr );
+      CLOSE_ELTS();
+   }
+}
+
+
+
+static void TAG(render_tri_strip_elts)( GLcontext *ctx,
+					GLuint start,
+					GLuint count,
+					GLuint flags )
+{
+   LOCAL_VARS;
+   GLuint j, nr;
+   GLuint *elts = GET_MESA_ELTS();
+   int dmasz = GET_MAX_HW_ELTS();
+   ELT_TYPE *dest;
+
+   if (start+2 >= count)
+      return;
+
+   ELT_INIT( GL_TRIANGLE_STRIP, HW_TRIANGLE_STRIP_0 );
+
+   /* Keep the same winding over multiple buffers:
+    */
+   dmasz -= (dmasz & 1);
+
+   for (j = start ; j + 2 < count; j += nr - 2 ) {
+      nr = MIN2( dmasz, count - j );
+
+      dest = ALLOC_ELTS( nr );
+      dest = TAG(emit_elts)( ctx, dest, elts+j, nr );
+      CLOSE_ELTS();
+   }
+}
+
+static void TAG(render_tri_fan_elts)( GLcontext *ctx,
+				      GLuint start,
+				      GLuint count,
+				      GLuint flags )
+{
+   LOCAL_VARS;
+   GLuint *elts = GET_MESA_ELTS();
+   GLuint j, nr;
+   int dmasz = GET_MAX_HW_ELTS();
+   ELT_TYPE *dest;
+
+   if (start+2 >= count)
+      return;
+
+   ELT_INIT( GL_TRIANGLE_FAN, HW_TRIANGLE_FAN );
+
+   for (j = start + 1 ; j + 1 < count; j += nr - 1 ) {
+      nr = MIN2( dmasz, count - j + 1 );
+      dest = ALLOC_ELTS( nr );
+      dest = TAG(emit_elts)( ctx, dest, elts+start, 1 );
+      dest = TAG(emit_elts)( ctx, dest, elts+j, nr - 1 );
+      CLOSE_ELTS();
+   }
+}
+
+
+static void TAG(render_poly_elts)( GLcontext *ctx,
+				   GLuint start,
+				   GLuint count,
+				   GLuint flags )
+{
+   LOCAL_VARS;
+   GLuint *elts = GET_MESA_ELTS();
+   GLuint j, nr;
+   int dmasz = GET_MAX_HW_ELTS();
+   ELT_TYPE *dest;
+
+   if (start+2 >= count)
+      return;
+
+   ELT_INIT( GL_POLYGON, HW_POLYGON );
+
+   for (j = start + 1 ; j + 1 < count ; j += nr - 1 ) {
+      nr = MIN2( dmasz, count - j + 1 );
+      dest = ALLOC_ELTS( nr );
+      dest = TAG(emit_elts)( ctx, dest, elts+start, 1 );
+      dest = TAG(emit_elts)( ctx, dest, elts+j, nr - 1 );
+      CLOSE_ELTS();
+   }
+}
+
+static void TAG(render_quad_strip_elts)( GLcontext *ctx,
+					 GLuint start,
+					 GLuint count,
+					 GLuint flags )
+{
+   if (start+3 >= count)
+      return;
+
+   if (HAVE_QUAD_STRIPS && 0) {
+   }
+   else {
+      LOCAL_VARS;
+      GLuint *elts = GET_MESA_ELTS();
+      int dmasz = GET_MAX_HW_ELTS();
+      GLuint j, nr;
+      ELT_TYPE *dest;
+
+      /* Emit whole number of quads in total, and in each buffer.
+       */
+      dmasz -= dmasz & 1;
+      count -= (count-start) & 1;
+
+      if (ctx->_TriangleCaps & DD_FLATSHADE) {
+	 ELT_INIT( GL_TRIANGLES, HW_TRIANGLES );
+
+	 dmasz = dmasz/6*2;
+
+	 for (j = start; j + 3 < count; j += nr - 2 ) {
+	    nr = MIN2( dmasz, count - j );
+
+	    if (nr >= 4)
+	    {
+	       GLint quads = (nr/2)-1;
+	       ELT_TYPE *dest = ALLOC_ELTS( quads*6 );
+	       GLint i;
+
+	       for ( i = j-start ; i < j-start+quads ; i++, elts += 2 ) {
+		  EMIT_TWO_ELTS( dest, 0, elts[0], elts[1] );
+		  EMIT_TWO_ELTS( dest, 2, elts[2], elts[1] );
+		  EMIT_TWO_ELTS( dest, 4, elts[3], elts[2] );
+		  dest += 6;
+	       }
+
+	       CLOSE_ELTS();
+	    }
+	 }
+      }
+      else {
+	 ELT_INIT( GL_TRIANGLE_STRIP, HW_TRIANGLE_STRIP_0 );
+
+	 for (j = start; j + 3 < count; j += nr - 2 ) {
+	    nr = MIN2( dmasz, count - j );
+	    dest = ALLOC_ELTS( nr );
+	    dest = TAG(emit_elts)( ctx, dest, elts+j, nr );
+	    CLOSE_ELTS();
+	 }
+      }
+   }
+}
+
+
+static void TAG(render_quads_elts)( GLcontext *ctx,
+				    GLuint start,
+				    GLuint count,
+				    GLuint flags )
+{
+   if (start+3 >= count)
+      return;
+
+   if (HAVE_QUADS && 0) {
+   } else {
+      LOCAL_VARS;
+      GLuint *elts = GET_MESA_ELTS();
+      int dmasz = GET_MAX_HW_ELTS();
+      GLuint j, nr;
+
+      ELT_INIT( GL_TRIANGLES, HW_TRIANGLES );
+
+      /* Emit whole number of quads in total, and in each buffer.
+       */
+      dmasz -= dmasz & 3;
+      count -= (count-start) & 3;
+
+      /* Adjust for rendering as triangles:
+       */
+      dmasz = dmasz/6*4;
+
+      for (j = start; j + 3 < count; j += nr ) {
+	 nr = MIN2( dmasz, count - j );
+
+	 {
+	    GLint quads = nr/4;
+	    ELT_TYPE *dest = ALLOC_ELTS( quads * 6 );
+	    GLint i;
+
+	    for ( i = j-start ; i < j-start+quads ; i++, elts += 4 ) {
+	       EMIT_TWO_ELTS( dest, 0, elts[0], elts[1] );
+	       EMIT_TWO_ELTS( dest, 2, elts[3], elts[1] );
+	       EMIT_TWO_ELTS( dest, 4, elts[2], elts[3] );
+	       dest += 6;
+	    }
+
+	    CLOSE_ELTS();
+	 }
+      }
+   }
+}
+
+
+
+static render_func TAG(render_tab_elts)[GL_POLYGON+2] =
+{
+   TAG(render_points_elts),
+   TAG(render_lines_elts),
+   TAG(render_line_loop_elts),
+   TAG(render_line_strip_elts),
+   TAG(render_triangles_elts),
+   TAG(render_tri_strip_elts),
+   TAG(render_tri_fan_elts),
+   TAG(render_quads_elts),
+   TAG(render_quad_strip_elts),
+   TAG(render_poly_elts),
+   TAG(render_noop),
+};
diff --git a/reactos/lib/mesa32/src/drivers/common/t_dd_rendertmp.h b/reactos/lib/mesa32/src/drivers/common/t_dd_rendertmp.h
new file mode 100644
index 00000000000..b9f030195d5
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/common/t_dd_rendertmp.h
@@ -0,0 +1,434 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+
+#ifndef POSTFIX
+#define POSTFIX
+#endif
+
+#ifndef INIT
+#define INIT(x)
+#endif
+
+#ifndef NEED_EDGEFLAG_SETUP
+#define NEED_EDGEFLAG_SETUP 0
+#define EDGEFLAG_GET(a) 0
+#define EDGEFLAG_SET(a,b) (void)b
+#endif
+
+#ifndef RESET_STIPPLE
+#define RESET_STIPPLE
+#endif
+
+#ifndef RESET_OCCLUSION
+#define RESET_OCCLUSION
+#endif
+
+#ifndef TEST_PRIM_END
+#define TEST_PRIM_END(flags) (flags & PRIM_END)
+#define TEST_PRIM_BEGIN(flags) (flags & PRIM_BEGIN)
+#define TEST_PRIM_PARITY(flags) (flags & PRIM_PARITY)
+#endif
+
+#ifndef ELT
+#define ELT(x) x
+#endif
+
+#ifndef RENDER_TAB_QUALIFIER
+#define RENDER_TAB_QUALIFIER static
+#endif
+
+static void TAG(render_points)( GLcontext *ctx,
+				GLuint start,
+				GLuint count,
+				GLuint flags )
+{
+   LOCAL_VARS;
+   (void) flags;
+
+   RESET_OCCLUSION;
+   INIT(GL_POINTS);
+   RENDER_POINTS( start, count );
+   POSTFIX;
+}
+
+static void TAG(render_lines)( GLcontext *ctx,
+			       GLuint start,
+			       GLuint count,
+			       GLuint flags )
+{
+   GLuint j;
+   LOCAL_VARS;
+   (void) flags;
+
+   RESET_OCCLUSION;
+   INIT(GL_LINES);
+   for (j=start+1; j<count; j+=2 ) {
+      RENDER_LINE( ELT(j-1), ELT(j) );
+      RESET_STIPPLE;
+   }
+   POSTFIX;
+}
+
+
+static void TAG(render_line_strip)( GLcontext *ctx,
+				    GLuint start,
+				    GLuint count,
+				    GLuint flags )
+{
+   GLuint j;
+   LOCAL_VARS;
+   (void) flags;
+
+   RESET_OCCLUSION;
+   INIT(GL_LINE_STRIP);
+
+   for (j=start+1; j<count; j++ )
+      RENDER_LINE( ELT(j-1), ELT(j) );
+
+   if (TEST_PRIM_END(flags))
+      RESET_STIPPLE;
+
+   POSTFIX;
+}
+
+
+static void TAG(render_line_loop)( GLcontext *ctx,
+				   GLuint start,
+				   GLuint count,
+				   GLuint flags )
+{
+   GLuint i;
+   LOCAL_VARS;
+
+   (void) flags;
+
+   RESET_OCCLUSION;
+   INIT(GL_LINE_LOOP);
+
+   if (start+1 < count) {
+      if (TEST_PRIM_BEGIN(flags)) {
+	 RENDER_LINE( ELT(start), ELT(start+1) );
+      }
+
+      for ( i = start+2 ; i < count ; i++) {
+	 RENDER_LINE( ELT(i-1), ELT(i) );
+      }
+
+      if ( TEST_PRIM_END(flags)) {
+	 RENDER_LINE( ELT(count-1), ELT(start) );
+	 RESET_STIPPLE;
+      }
+   }
+
+   POSTFIX;
+}
+
+
+static void TAG(render_triangles)( GLcontext *ctx,
+				   GLuint start,
+				   GLuint count,
+				   GLuint flags )
+{
+   GLuint j;
+   LOCAL_VARS;
+   (void) flags;
+
+   INIT(GL_TRIANGLES);
+   if (NEED_EDGEFLAG_SETUP) {
+      for (j=start+2; j<count; j+=3) {
+	 /* Leave the edgeflags as supplied by the user.
+	  */
+	 RENDER_TRI( ELT(j-2), ELT(j-1), ELT(j) );
+	 RESET_STIPPLE;
+      }
+   } else {
+      for (j=start+2; j<count; j+=3) {
+	 RENDER_TRI( ELT(j-2), ELT(j-1), ELT(j) );
+      }
+   }
+   POSTFIX;
+}
+
+
+
+static void TAG(render_tri_strip)( GLcontext *ctx,
+				   GLuint start,
+				   GLuint count,
+				   GLuint flags )
+{
+   GLuint j;
+   GLuint parity = 0;
+   LOCAL_VARS;
+
+   INIT(GL_TRIANGLE_STRIP);
+   if (NEED_EDGEFLAG_SETUP) {
+      for (j=start+2;j<count;j++,parity^=1) {
+	 GLuint ej2 = ELT(j-2+parity);
+	 GLuint ej1 = ELT(j-1-parity);
+	 GLuint ej = ELT(j);
+	 GLboolean ef2 = EDGEFLAG_GET( ej2 );
+	 GLboolean ef1 = EDGEFLAG_GET( ej1 );
+	 GLboolean ef = EDGEFLAG_GET( ej );
+	 EDGEFLAG_SET( ej2, GL_TRUE );
+	 EDGEFLAG_SET( ej1, GL_TRUE );
+	 EDGEFLAG_SET( ej, GL_TRUE );
+	 RENDER_TRI( ej2, ej1, ej );
+	 EDGEFLAG_SET( ej2, ef2 );
+	 EDGEFLAG_SET( ej1, ef1 );
+	 EDGEFLAG_SET( ej, ef );
+	 RESET_STIPPLE;
+      }
+   } else {
+      for (j=start+2; j<count ; j++, parity^=1) {
+	 RENDER_TRI( ELT(j-2+parity), ELT(j-1-parity), ELT(j) );
+      }
+   }
+   POSTFIX;
+}
+
+
+static void TAG(render_tri_fan)( GLcontext *ctx,
+				 GLuint start,
+				 GLuint count,
+				 GLuint flags )
+{
+   GLuint j;
+   LOCAL_VARS;
+   (void) flags;
+
+   INIT(GL_TRIANGLE_FAN);
+   if (NEED_EDGEFLAG_SETUP) {
+      for (j=start+2;j<count;j++) {
+	 /* For trifans, all edges are boundary.
+	  */
+	 GLuint ejs = ELT(start);
+	 GLuint ej1 = ELT(j-1);
+	 GLuint ej = ELT(j);
+	 GLboolean efs = EDGEFLAG_GET( ejs );
+	 GLboolean ef1 = EDGEFLAG_GET( ej1 );
+	 GLboolean ef = EDGEFLAG_GET( ej );
+	 EDGEFLAG_SET( ejs, GL_TRUE );
+	 EDGEFLAG_SET( ej1, GL_TRUE );
+	 EDGEFLAG_SET( ej, GL_TRUE );
+	 RENDER_TRI( ejs, ej1, ej);
+	 EDGEFLAG_SET( ejs, efs );
+	 EDGEFLAG_SET( ej1, ef1 );
+	 EDGEFLAG_SET( ej, ef );
+	 RESET_STIPPLE;
+      }
+   } else {
+      for (j=start+2;j<count;j++) {
+	 RENDER_TRI( ELT(start), ELT(j-1), ELT(j) );
+      }
+   }
+
+   POSTFIX;
+}
+
+
+static void TAG(render_poly)( GLcontext *ctx,
+			      GLuint start,
+			      GLuint count,
+			      GLuint flags )
+{
+   GLuint j = start+2;
+   LOCAL_VARS;
+   (void) flags;
+
+   INIT(GL_POLYGON);
+   if (NEED_EDGEFLAG_SETUP) {
+      GLboolean efstart = EDGEFLAG_GET( ELT(start) );
+      GLboolean efcount = EDGEFLAG_GET( ELT(count-1) );
+
+      /* If the primitive does not begin here, the first edge
+       * is non-boundary.
+       */
+      if (!TEST_PRIM_BEGIN(flags))
+	 EDGEFLAG_SET( ELT(start), GL_FALSE );
+
+      /* If the primitive does not end here, the final edge is
+       * non-boundary.
+       */
+      if (!TEST_PRIM_END(flags))
+	 EDGEFLAG_SET( ELT(count-1), GL_FALSE );
+
+      /* Draw the first triangles (possibly zero)
+       */
+      if (j<count-1) {
+	 GLboolean ef = EDGEFLAG_GET( ELT(j) );
+	 EDGEFLAG_SET( ELT(j), GL_FALSE );
+	 RENDER_TRI( ELT(j-1), ELT(j), ELT(start) );
+	 EDGEFLAG_SET( ELT(j), ef );
+	 j++;
+
+	 /* Don't render the first edge again:
+	  */
+	 EDGEFLAG_SET( ELT(start), GL_FALSE );
+
+	 for (;j<count-1;j++) {
+	    GLboolean efj = EDGEFLAG_GET( ELT(j) );
+	    EDGEFLAG_SET( ELT(j), GL_FALSE );
+	    RENDER_TRI( ELT(j-1), ELT(j), ELT(start) );
+	    EDGEFLAG_SET( ELT(j), efj );
+	 }
+      }
+
+      /* Draw the last or only triangle
+       */
+      if (j < count)
+	 RENDER_TRI( ELT(j-1), ELT(j), ELT(start) );
+
+      /* Restore the first and last edgeflags:
+       */
+      EDGEFLAG_SET( ELT(count-1), efcount );
+      EDGEFLAG_SET( ELT(start), efstart );
+
+      if (TEST_PRIM_END(flags)) {
+	 RESET_STIPPLE;
+      }
+   }
+   else {
+      for (j=start+2;j<count;j++) {
+	 RENDER_TRI( ELT(j-1), ELT(j), ELT(start) );
+      }
+   }
+   POSTFIX;
+}
+
+static void TAG(render_quads)( GLcontext *ctx,
+			       GLuint start,
+			       GLuint count,
+			       GLuint flags )
+{
+   GLuint j;
+   LOCAL_VARS;
+   (void) flags;
+
+   INIT(GL_QUADS);
+   if (NEED_EDGEFLAG_SETUP) {
+      for (j=start+3; j<count; j+=4) {
+	 /* Use user-specified edgeflags for quads.
+	  */
+	 RENDER_QUAD( ELT(j-3), ELT(j-2), ELT(j-1), ELT(j) );
+	 RESET_STIPPLE;
+      }
+   } else {
+      for (j=start+3; j<count; j+=4) {
+	 RENDER_QUAD( ELT(j-3), ELT(j-2), ELT(j-1), ELT(j) );
+      }
+   }
+   POSTFIX;
+}
+
+static void TAG(render_quad_strip)( GLcontext *ctx,
+				    GLuint start,
+				    GLuint count,
+				    GLuint flags )
+{
+   GLuint j;
+   LOCAL_VARS;
+   (void) flags;
+
+   INIT(GL_QUAD_STRIP);
+   if (NEED_EDGEFLAG_SETUP) {
+      for (j=start+3;j<count;j+=2) {
+	 /* All edges are boundary.  Set edgeflags to 1, draw the
+	  * quad, and restore them to the original values.
+	  */
+	 GLboolean ef3 = EDGEFLAG_GET( ELT(j-3) );
+	 GLboolean ef2 = EDGEFLAG_GET( ELT(j-2) );
+	 GLboolean ef1 = EDGEFLAG_GET( ELT(j-1) );
+	 GLboolean ef = EDGEFLAG_GET( ELT(j) );
+	 EDGEFLAG_SET( ELT(j-3), GL_TRUE );
+	 EDGEFLAG_SET( ELT(j-2), GL_TRUE );
+	 EDGEFLAG_SET( ELT(j-1), GL_TRUE );
+	 EDGEFLAG_SET( ELT(j), GL_TRUE );
+	 RENDER_QUAD( ELT(j-1), ELT(j-3), ELT(j-2), ELT(j) );
+	 EDGEFLAG_SET( ELT(j-3), ef3 );
+	 EDGEFLAG_SET( ELT(j-2), ef2 );
+	 EDGEFLAG_SET( ELT(j-1), ef1 );
+	 EDGEFLAG_SET( ELT(j), ef );
+	 RESET_STIPPLE;
+      }
+   } else {
+      for (j=start+3;j<count;j+=2) {
+	 RENDER_QUAD( ELT(j-1), ELT(j-3), ELT(j-2), ELT(j) );
+      }
+   }
+   POSTFIX;
+}
+
+static void TAG(render_noop)( GLcontext *ctx,
+			      GLuint start,
+			      GLuint count,
+			      GLuint flags )
+{
+   (void)(ctx && start && count && flags);
+}
+
+RENDER_TAB_QUALIFIER void (*TAG(render_tab)[GL_POLYGON+2])(GLcontext *,
+							   GLuint,
+							   GLuint,
+							   GLuint) =
+{
+   TAG(render_points),
+   TAG(render_lines),
+   TAG(render_line_loop),
+   TAG(render_line_strip),
+   TAG(render_triangles),
+   TAG(render_tri_strip),
+   TAG(render_tri_fan),
+   TAG(render_quads),
+   TAG(render_quad_strip),
+   TAG(render_poly),
+   TAG(render_noop),
+};
+
+
+
+#ifndef PRESERVE_VB_DEFS
+#undef RENDER_TRI
+#undef RENDER_QUAD
+#undef RENDER_LINE
+#undef RENDER_POINTS
+#undef LOCAL_VARS
+#undef INIT
+#undef POSTFIX
+#undef RESET_STIPPLE
+#undef DBG
+#undef ELT
+#undef RENDER_TAB_QUALIFIER
+#endif
+
+#ifndef PRESERVE_TAG
+#undef TAG
+#endif
+
+#undef PRESERVE_VB_DEFS
+#undef PRESERVE_TAG
diff --git a/reactos/lib/mesa32/src/drivers/common/t_dd_triemit.h b/reactos/lib/mesa32/src/drivers/common/t_dd_triemit.h
new file mode 100644
index 00000000000..2f5bcee7ec4
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/common/t_dd_triemit.h
@@ -0,0 +1,157 @@
+#ifndef DO_DEBUG_VERTS
+#define DO_DEBUG_VERTS 0
+#endif 
+
+#ifndef PRINT_VERTEX
+#define PRINT_VERTEX(x) 
+#endif
+
+#if defined(USE_X86_ASM)
+#define COPY_DWORDS( j, vb, vertsize, v )				\
+do {									\
+	int __tmp;							\
+	__asm__ __volatile__( "rep ; movsl"				\
+			      : "=%c" (j), "=D" (vb), "=S" (__tmp)	\
+			      : "0" (vertsize),				\
+			        "D" ((long)vb),				\
+			        "S" ((long)v) );			\
+} while (0)
+#else
+#define COPY_DWORDS( j, vb, vertsize, v )				\
+do {									\
+   for ( j = 0 ; j < vertsize ; j++ )					\
+      vb[j] = ((GLuint *)v)[j];						\
+   vb += vertsize;							\
+} while (0)
+#endif
+
+
+
+#if HAVE_QUADS
+static __inline void TAG(quad)( CTX_ARG,
+				VERTEX *v0,
+				VERTEX *v1,
+				VERTEX *v2,
+				VERTEX *v3 )
+{
+   GLuint vertsize = GET_VERTEX_DWORDS();
+   GLuint *vb = (GLuint *)ALLOC_VERTS( 4, vertsize);
+   GLuint j;
+
+   if (DO_DEBUG_VERTS) {
+      fprintf(stderr, "%s\n", __FUNCTION__);
+      PRINT_VERTEX(v0);
+      PRINT_VERTEX(v1);
+      PRINT_VERTEX(v2);
+      PRINT_VERTEX(v3);
+   }
+      
+   COPY_DWORDS( j, vb, vertsize, v0 );
+   COPY_DWORDS( j, vb, vertsize, v1 );
+   COPY_DWORDS( j, vb, vertsize, v2 );
+   COPY_DWORDS( j, vb, vertsize, v3 );
+}
+#else
+static __inline void TAG(quad)( CTX_ARG,
+				VERTEX *v0,
+				VERTEX *v1,
+				VERTEX *v2,
+				VERTEX *v3 )
+{
+   GLuint vertsize = GET_VERTEX_DWORDS();
+   GLuint *vb = (GLuint *)ALLOC_VERTS(  6, vertsize);
+   GLuint j;
+
+   if (DO_DEBUG_VERTS) {
+      fprintf(stderr, "%s\n", __FUNCTION__);
+      PRINT_VERTEX(v0);
+      PRINT_VERTEX(v1);
+      PRINT_VERTEX(v2);
+      PRINT_VERTEX(v3);
+   }
+ 
+   COPY_DWORDS( j, vb, vertsize, v0 );
+   COPY_DWORDS( j, vb, vertsize, v1 );
+   COPY_DWORDS( j, vb, vertsize, v3 );
+   COPY_DWORDS( j, vb, vertsize, v1 );
+   COPY_DWORDS( j, vb, vertsize, v2 );
+   COPY_DWORDS( j, vb, vertsize, v3 );
+}
+#endif
+
+
+static __inline void TAG(triangle)( CTX_ARG,
+				    VERTEX *v0,
+				    VERTEX *v1,
+				    VERTEX *v2 )
+{
+   GLuint vertsize = GET_VERTEX_DWORDS();
+   GLuint *vb = (GLuint *)ALLOC_VERTS( 3, vertsize);
+   GLuint j;
+
+   if (DO_DEBUG_VERTS) {
+      fprintf(stderr, "%s\n", __FUNCTION__);
+      PRINT_VERTEX(v0);
+      PRINT_VERTEX(v1);
+      PRINT_VERTEX(v2);
+   }
+
+   COPY_DWORDS( j, vb, vertsize, v0 );
+   COPY_DWORDS( j, vb, vertsize, v1 );
+   COPY_DWORDS( j, vb, vertsize, v2 );
+}
+
+
+#if HAVE_LINES
+static __inline void TAG(line)( CTX_ARG,
+				VERTEX *v0,
+				VERTEX *v1 )
+{
+   GLuint vertsize = GET_VERTEX_DWORDS();
+   GLuint *vb = (GLuint *)ALLOC_VERTS( 2, vertsize);
+   GLuint j;
+
+   COPY_DWORDS( j, vb, vertsize, v0 );
+   COPY_DWORDS( j, vb, vertsize, v1 );
+}
+#endif
+
+#if HAVE_POINTS
+static __inline void TAG(point)( CTX_ARG,
+				 VERTEX *v0 )
+{
+   GLuint vertsize = GET_VERTEX_DWORDS();
+   GLuint *vb = (GLuint *)ALLOC_VERTS( 1, vertsize);
+   int j;
+
+   COPY_DWORDS( j, vb, vertsize, v0 );
+}
+#endif
+
+
+static void TAG(fast_clipped_poly)( GLcontext *ctx, const GLuint *elts,
+				    GLuint n )
+{
+   LOCAL_VARS
+   GLuint vertsize = GET_VERTEX_DWORDS();
+   GLuint *vb = (GLuint *)ALLOC_VERTS( (n-2) * 3, vertsize );
+   const GLuint *start = (const GLuint *)VERT(elts[0]);
+   int i,j;
+
+   if (DO_DEBUG_VERTS) {
+      fprintf(stderr, "%s\n", __FUNCTION__);
+      PRINT_VERTEX(VERT(elts[0]));
+      PRINT_VERTEX(VERT(elts[1]));
+   }
+
+   for (i = 2 ; i < n ; i++) {
+      if (DO_DEBUG_VERTS) {
+	 PRINT_VERTEX(VERT(elts[i]));
+      }
+
+      COPY_DWORDS( j, vb, vertsize, VERT(elts[i-1]) );
+      COPY_DWORDS( j, vb, vertsize, VERT(elts[i]) );
+      COPY_DWORDS( j, vb, vertsize, start );
+   }
+}
+
diff --git a/reactos/lib/mesa32/src/drivers/common/t_dd_tritmp.h b/reactos/lib/mesa32/src/drivers/common/t_dd_tritmp.h
new file mode 100644
index 00000000000..b26347b77eb
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/common/t_dd_tritmp.h
@@ -0,0 +1,743 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+
+/* Template for building functions to plug into the driver interface
+ * of t_vb_render.c:
+ *     ctx->Driver.QuadFunc
+ *     ctx->Driver.TriangleFunc
+ *     ctx->Driver.LineFunc
+ *     ctx->Driver.PointsFunc
+ *
+ * DO_TWOSIDE:   Plug back-color values from the VB into backfacing triangles,
+ *               and restore vertices afterwards.
+ * DO_OFFSET:    Calculate offset for triangles and adjust vertices.  Restore
+ *               vertices after rendering.
+ * DO_FLAT:      For hardware without native flatshading, copy provoking colors
+ *               into the other vertices.  Restore after rendering.
+ * DO_UNFILLED:  Decompose triangles to lines and points where appropriate.
+ *
+ * HAVE_RGBA: Vertices have rgba values (otherwise index values).
+ * HAVE_SPEC: Vertices have secondary rgba values.
+ *
+ * VERT_X(v): Alias for vertex x value.
+ * VERT_Y(v): Alias for vertex y value.
+ * VERT_Z(v): Alias for vertex z value.
+ * DEPTH_SCALE: Scale for offset.
+ *
+ * VERTEX: Hardware vertex type.
+ * GET_VERTEX(n): Retreive vertex with index n.
+ * AREA_IS_CCW(a): Return true if triangle with signed area a is ccw.
+ *
+ * VERT_SET_RGBA: Assign vertex rgba from VB color.
+ * VERT_COPY_RGBA: Copy vertex rgba another vertex.
+ * VERT_SAVE_RGBA: Save vertex rgba to a local variable.
+ * VERT_RESTORE_RGBA: Restore vertex rgba from a local variable.
+ *   --> Similar for IND and SPEC.
+ *
+ * LOCAL_VARS(n): (At least) define local vars for save/restore rgba.
+ *
+ */
+
+#if HAVE_RGBA
+#define VERT_SET_IND( v, c ) (void) c
+#define VERT_COPY_IND( v0, v1 )
+#define VERT_SAVE_IND( idx )
+#define VERT_RESTORE_IND( idx )
+#if HAVE_BACK_COLORS
+#define VERT_SET_RGBA( v, c )
+#endif
+#else
+#define VERT_SET_RGBA( v, c ) (void) c
+#define VERT_COPY_RGBA( v0, v1 )
+#define VERT_SAVE_RGBA( idx )
+#define VERT_RESTORE_RGBA( idx )
+#if HAVE_BACK_COLORS
+#define VERT_SET_IND( v, c )
+#endif
+#endif
+
+#if !HAVE_SPEC
+#define VERT_SET_SPEC( v, c ) (void) c
+#define VERT_COPY_SPEC( v0, v1 )
+#define VERT_SAVE_SPEC( idx )
+#define VERT_RESTORE_SPEC( idx )
+#if HAVE_BACK_COLORS
+#define VERT_COPY_SPEC1( v )
+#endif
+#else
+#if HAVE_BACK_COLORS
+#define VERT_SET_SPEC( v, c )
+#endif
+#endif
+
+#if !HAVE_BACK_COLORS
+#define VERT_COPY_SPEC1( v )
+#define VERT_COPY_IND1( v )
+#define VERT_COPY_RGBA1( v )
+#endif
+
+#ifndef INSANE_VERTICES
+#define VERT_SET_Z(v,val) VERT_Z(v) = val
+#define VERT_Z_ADD(v,val) VERT_Z(v) += val
+#endif
+
+#if DO_TRI
+static void TAG(triangle)( GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 )
+{
+   struct vertex_buffer *VB = &TNL_CONTEXT( ctx )->vb;
+   VERTEX *v[3];
+   GLfloat offset;
+   GLfloat z[3];
+   GLenum mode = GL_FILL;
+   GLuint facing;
+   LOCAL_VARS(3);
+
+/*     fprintf(stderr, "%s\n", __FUNCTION__); */
+
+   v[0] = (VERTEX *)GET_VERTEX(e0);
+   v[1] = (VERTEX *)GET_VERTEX(e1);
+   v[2] = (VERTEX *)GET_VERTEX(e2);
+
+   if (DO_TWOSIDE || DO_OFFSET || DO_UNFILLED)
+   {
+      GLfloat ex = VERT_X(v[0]) - VERT_X(v[2]);
+      GLfloat ey = VERT_Y(v[0]) - VERT_Y(v[2]);
+      GLfloat fx = VERT_X(v[1]) - VERT_X(v[2]);
+      GLfloat fy = VERT_Y(v[1]) - VERT_Y(v[2]);
+      GLfloat cc = ex*fy - ey*fx;
+
+      if (DO_TWOSIDE || DO_UNFILLED)
+      {
+	 facing = AREA_IS_CCW( cc ) ^ ctx->Polygon._FrontBit;
+
+	 if (DO_UNFILLED) {
+	    if (facing) {
+	       mode = ctx->Polygon.BackMode;
+	       if (ctx->Polygon.CullFlag &&
+		   ctx->Polygon.CullFaceMode != GL_FRONT) {
+		  return;
+	       }
+	    } else {
+	       mode = ctx->Polygon.FrontMode;
+	       if (ctx->Polygon.CullFlag &&
+		   ctx->Polygon.CullFaceMode != GL_BACK) {
+		  return;
+	       }
+	    }
+	 }
+
+	 if (DO_TWOSIDE && facing == 1)
+	 {
+	    if (HAVE_RGBA) {
+	       if (HAVE_BACK_COLORS) {
+		  if (!DO_FLAT) {
+		     VERT_SAVE_RGBA( 0 );
+		     VERT_SAVE_RGBA( 1 );
+		     VERT_COPY_RGBA1( v[0] );
+		     VERT_COPY_RGBA1( v[1] );
+		  }
+		  VERT_SAVE_RGBA( 2 );
+		  VERT_COPY_RGBA1( v[2] );
+		  if (HAVE_SPEC) {
+		     if (!DO_FLAT) {
+			VERT_SAVE_SPEC( 0 );
+			VERT_SAVE_SPEC( 1 );
+			VERT_COPY_SPEC1( v[0] );
+			VERT_COPY_SPEC1( v[1] );
+		     }
+		     VERT_SAVE_SPEC( 2 );
+		     VERT_COPY_SPEC1( v[2] );
+		  }
+	       }
+	       else {
+		  GLfloat (*vbcolor)[4] = VB->ColorPtr[1]->data;
+		  ASSERT(VB->ColorPtr[1]->stride == 4*sizeof(GLfloat));
+		  (void) vbcolor;
+
+		  if (!DO_FLAT) {
+		     VERT_SAVE_RGBA( 0 );
+		     VERT_SAVE_RGBA( 1 );
+		     VERT_SET_RGBA( v[0], vbcolor[e0] );
+		     VERT_SET_RGBA( v[1], vbcolor[e1] );
+		  }
+		  VERT_SAVE_RGBA( 2 );
+		  VERT_SET_RGBA( v[2], vbcolor[e2] );
+
+		  if (HAVE_SPEC && VB->SecondaryColorPtr[1]) {
+		     GLfloat (*vbspec)[4] = VB->SecondaryColorPtr[1]->data;
+
+		     if (!DO_FLAT) {
+			VERT_SAVE_SPEC( 0 );
+			VERT_SAVE_SPEC( 1 );
+			VERT_SET_SPEC( v[0], vbspec[e0] );
+			VERT_SET_SPEC( v[1], vbspec[e1] );
+		     }
+		     VERT_SAVE_SPEC( 2 );
+		     VERT_SET_SPEC( v[2], vbspec[e2] );
+		  }
+	       }
+	    }
+	    else {
+	       GLfloat (*vbindex) = (GLfloat *)VB->IndexPtr[1]->data;
+	       if (!DO_FLAT) {
+		  VERT_SAVE_IND( 0 );
+		  VERT_SAVE_IND( 1 );
+		  VERT_SET_IND( v[0], vbindex[e0] );
+		  VERT_SET_IND( v[1], vbindex[e1] );
+	       }
+	       VERT_SAVE_IND( 2 );
+	       VERT_SET_IND( v[2], vbindex[e2] );
+	    }
+	 }
+      }
+
+
+      if (DO_OFFSET)
+      {
+	 offset = ctx->Polygon.OffsetUnits * DEPTH_SCALE;
+	 z[0] = VERT_Z(v[0]);
+	 z[1] = VERT_Z(v[1]);
+	 z[2] = VERT_Z(v[2]);
+	 if (cc * cc > 1e-16) {
+	    GLfloat ic	= 1.0 / cc;
+	    GLfloat ez	= z[0] - z[2];
+	    GLfloat fz	= z[1] - z[2];
+	    GLfloat a	= ey*fz - ez*fy;
+	    GLfloat b	= ez*fx - ex*fz;
+	    GLfloat ac	= a * ic;
+	    GLfloat bc	= b * ic;
+	    if ( ac < 0.0f ) ac = -ac;
+	    if ( bc < 0.0f ) bc = -bc;
+	    offset += MAX2( ac, bc ) * ctx->Polygon.OffsetFactor;
+	 }
+	 offset *= ctx->MRD;
+      }
+   }
+
+   if (DO_FLAT) {
+      if (HAVE_RGBA) {
+	 VERT_SAVE_RGBA( 0 );
+	 VERT_SAVE_RGBA( 1 );
+	 VERT_COPY_RGBA( v[0], v[2] );
+	 VERT_COPY_RGBA( v[1], v[2] );
+	 if (HAVE_SPEC && VB->SecondaryColorPtr[0]) {
+	    VERT_SAVE_SPEC( 0 );
+	    VERT_SAVE_SPEC( 1 );
+	    VERT_COPY_SPEC( v[0], v[2] );
+	    VERT_COPY_SPEC( v[1], v[2] );
+	 }
+      }
+      else {
+	 VERT_SAVE_IND( 0 );
+	 VERT_SAVE_IND( 1 );
+	 VERT_COPY_IND( v[0], v[2] );
+	 VERT_COPY_IND( v[1], v[2] );
+      }
+   }
+
+   if (mode == GL_POINT) {
+      if (DO_OFFSET && ctx->Polygon.OffsetPoint) {
+	 VERT_Z_ADD(v[0], offset);
+	 VERT_Z_ADD(v[1], offset);
+	 VERT_Z_ADD(v[2], offset);
+      }
+      UNFILLED_TRI( ctx, GL_POINT, e0, e1, e2 );
+   } else if (mode == GL_LINE) {
+      if (DO_OFFSET && ctx->Polygon.OffsetLine) {
+	 VERT_Z_ADD(v[0], offset);
+	 VERT_Z_ADD(v[1], offset);
+	 VERT_Z_ADD(v[2], offset);
+      }
+      UNFILLED_TRI( ctx, GL_LINE, e0, e1, e2 );
+   } else {
+      if (DO_OFFSET && ctx->Polygon.OffsetFill) {
+	 VERT_Z_ADD(v[0], offset);
+	 VERT_Z_ADD(v[1], offset);
+	 VERT_Z_ADD(v[2], offset);
+      }
+      if (DO_UNFILLED)
+	 RASTERIZE( GL_TRIANGLES );
+      TRI( v[0], v[1], v[2] );
+   }
+
+   if (DO_OFFSET)
+   {
+      VERT_SET_Z(v[0], z[0]);
+      VERT_SET_Z(v[1], z[1]);
+      VERT_SET_Z(v[2], z[2]);
+   }
+
+   if (DO_TWOSIDE && facing == 1)
+   {
+      if (HAVE_RGBA) {
+	 if (!DO_FLAT) {
+	    VERT_RESTORE_RGBA( 0 );
+	    VERT_RESTORE_RGBA( 1 );
+	 }
+	 VERT_RESTORE_RGBA( 2 );
+	 if (HAVE_SPEC) {
+	    if (!DO_FLAT) {
+	       VERT_RESTORE_SPEC( 0 );
+	       VERT_RESTORE_SPEC( 1 );
+	    }
+	    VERT_RESTORE_SPEC( 2 );
+	 }
+      }
+      else {
+	 if (!DO_FLAT) {
+	    VERT_RESTORE_IND( 0 );
+	    VERT_RESTORE_IND( 1 );
+	 }
+	 VERT_RESTORE_IND( 2 );
+      }
+   }
+
+
+   if (DO_FLAT) {
+      if (HAVE_RGBA) {
+	 VERT_RESTORE_RGBA( 0 );
+	 VERT_RESTORE_RGBA( 1 );
+	 if (HAVE_SPEC && VB->SecondaryColorPtr[0]) {
+	    VERT_RESTORE_SPEC( 0 );
+	    VERT_RESTORE_SPEC( 1 );
+	 }
+      }
+      else {
+	 VERT_RESTORE_IND( 0 );
+	 VERT_RESTORE_IND( 1 );
+      }
+   }
+}
+#endif
+
+#if DO_QUAD
+#if DO_FULL_QUAD
+static void TAG(quad)( GLcontext *ctx,
+		       GLuint e0, GLuint e1, GLuint e2, GLuint e3 )
+{
+   struct vertex_buffer *VB = &TNL_CONTEXT( ctx )->vb;
+   VERTEX *v[4];
+   GLfloat offset;
+   GLfloat z[4];
+   GLenum mode = GL_FILL;
+   GLuint facing;
+   LOCAL_VARS(4);
+
+   v[0] = (VERTEX *)GET_VERTEX(e0);
+   v[1] = (VERTEX *)GET_VERTEX(e1);
+   v[2] = (VERTEX *)GET_VERTEX(e2);
+   v[3] = (VERTEX *)GET_VERTEX(e3);
+
+   if (DO_TWOSIDE || DO_OFFSET || DO_UNFILLED)
+   {
+      GLfloat ex = VERT_X(v[2]) - VERT_X(v[0]);
+      GLfloat ey = VERT_Y(v[2]) - VERT_Y(v[0]);
+      GLfloat fx = VERT_X(v[3]) - VERT_X(v[1]);
+      GLfloat fy = VERT_Y(v[3]) - VERT_Y(v[1]);
+      GLfloat cc = ex*fy - ey*fx;
+
+      if (DO_TWOSIDE || DO_UNFILLED)
+      {
+	 facing = AREA_IS_CCW( cc ) ^ ctx->Polygon._FrontBit;
+
+	 if (DO_UNFILLED) {
+	    if (facing) {
+	       mode = ctx->Polygon.BackMode;
+	       if (ctx->Polygon.CullFlag &&
+		   ctx->Polygon.CullFaceMode != GL_FRONT) {
+		  return;
+	       }
+	    } else {
+	       mode = ctx->Polygon.FrontMode;
+	       if (ctx->Polygon.CullFlag &&
+		   ctx->Polygon.CullFaceMode != GL_BACK) {
+		  return;
+	       }
+	    }
+	 }
+
+	 if (DO_TWOSIDE && facing == 1)
+	 {
+	    if (HAVE_RGBA) {
+	       GLfloat (*vbcolor)[4] = VB->ColorPtr[1]->data;
+	       (void)vbcolor;
+
+	       if (HAVE_BACK_COLORS) {
+                  if (!DO_FLAT) {
+                     VERT_SAVE_RGBA( 0 );
+                     VERT_SAVE_RGBA( 1 );
+                     VERT_SAVE_RGBA( 2 );
+		     VERT_COPY_RGBA1( v[0] );
+		     VERT_COPY_RGBA1( v[1] );
+		     VERT_COPY_RGBA1( v[2] );
+		  }
+		  VERT_SAVE_RGBA( 3 );
+		  VERT_COPY_RGBA1( v[3] );
+		  if (HAVE_SPEC) {
+                     if (!DO_FLAT) {
+                        VERT_SAVE_SPEC( 0 );
+                        VERT_SAVE_SPEC( 1 );
+                        VERT_SAVE_SPEC( 2 );
+			VERT_COPY_SPEC1( v[0] );
+			VERT_COPY_SPEC1( v[1] );
+			VERT_COPY_SPEC1( v[2] );
+		     }
+		     VERT_SAVE_SPEC( 3 );
+		     VERT_COPY_SPEC1( v[3] );
+		  }
+	       }
+	       else {
+	          if (!DO_FLAT) {
+		     VERT_SAVE_RGBA( 0 );
+		     VERT_SAVE_RGBA( 1 );
+		     VERT_SAVE_RGBA( 2 );
+		     VERT_SET_RGBA( v[0], vbcolor[e0] );
+		     VERT_SET_RGBA( v[1], vbcolor[e1] );
+		     VERT_SET_RGBA( v[2], vbcolor[e2] );
+	          }
+	          VERT_SAVE_RGBA( 3 );
+	          VERT_SET_RGBA( v[3], vbcolor[e3] );
+
+	          if (HAVE_SPEC && VB->SecondaryColorPtr[1]) {
+		     GLfloat (*vbspec)[4] = VB->SecondaryColorPtr[1]->data;
+		     ASSERT(VB->SecondaryColorPtr[1]->stride==4*sizeof(GLfloat));
+
+		     if (!DO_FLAT) {
+		        VERT_SAVE_SPEC( 0 );
+		        VERT_SAVE_SPEC( 1 );
+		        VERT_SAVE_SPEC( 2 );
+		        VERT_SET_SPEC( v[0], vbspec[e0] );
+		        VERT_SET_SPEC( v[1], vbspec[e1] );
+		        VERT_SET_SPEC( v[2], vbspec[e2] );
+		     }
+		     VERT_SAVE_SPEC( 3 );
+		     VERT_SET_SPEC( v[3], vbspec[e3] );
+	          }
+	       }
+	    }
+	    else {
+	       GLfloat *vbindex = (GLfloat *)VB->IndexPtr[1]->data;
+	       if (!DO_FLAT) {
+		  VERT_SAVE_IND( 0 );
+		  VERT_SAVE_IND( 1 );
+		  VERT_SAVE_IND( 2 );
+		  VERT_SET_IND( v[0], vbindex[e0] );
+		  VERT_SET_IND( v[1], vbindex[e1] );
+		  VERT_SET_IND( v[2], vbindex[e2] );
+	       }
+	       VERT_SAVE_IND( 3 );
+	       VERT_SET_IND( v[3], vbindex[e3] );
+	    }
+	 }
+      }
+
+
+      if (DO_OFFSET)
+      {
+	 offset = ctx->Polygon.OffsetUnits * DEPTH_SCALE;
+	 z[0] = VERT_Z(v[0]);
+	 z[1] = VERT_Z(v[1]);
+	 z[2] = VERT_Z(v[2]);
+	 z[3] = VERT_Z(v[3]);
+	 if (cc * cc > 1e-16) {
+	    GLfloat ez = z[2] - z[0];
+	    GLfloat fz = z[3] - z[1];
+	    GLfloat a	= ey*fz - ez*fy;
+	    GLfloat b	= ez*fx - ex*fz;
+	    GLfloat ic	= 1.0 / cc;
+	    GLfloat ac	= a * ic;
+	    GLfloat bc	= b * ic;
+	    if ( ac < 0.0f ) ac = -ac;
+	    if ( bc < 0.0f ) bc = -bc;
+	    offset += MAX2( ac, bc ) * ctx->Polygon.OffsetFactor;
+	 }
+	 offset *= ctx->MRD;
+      }
+   }
+
+   if (DO_FLAT) {
+      if (HAVE_RGBA) {
+	 VERT_SAVE_RGBA( 0 );
+	 VERT_SAVE_RGBA( 1 );
+	 VERT_SAVE_RGBA( 2 );
+	 VERT_COPY_RGBA( v[0], v[3] );
+	 VERT_COPY_RGBA( v[1], v[3] );
+	 VERT_COPY_RGBA( v[2], v[3] );
+	 if (HAVE_SPEC && VB->SecondaryColorPtr[0]) {
+	    VERT_SAVE_SPEC( 0 );
+	    VERT_SAVE_SPEC( 1 );
+	    VERT_SAVE_SPEC( 2 );
+	    VERT_COPY_SPEC( v[0], v[3] );
+	    VERT_COPY_SPEC( v[1], v[3] );
+	    VERT_COPY_SPEC( v[2], v[3] );
+	 }
+      }
+      else {
+	 VERT_SAVE_IND( 0 );
+	 VERT_SAVE_IND( 1 );
+	 VERT_SAVE_IND( 2 );
+	 VERT_COPY_IND( v[0], v[3] );
+	 VERT_COPY_IND( v[1], v[3] );
+	 VERT_COPY_IND( v[2], v[3] );
+      }
+   }
+
+   if (mode == GL_POINT) {
+      if (( DO_OFFSET) && ctx->Polygon.OffsetPoint) {
+	 VERT_Z_ADD(v[0], offset);
+	 VERT_Z_ADD(v[1], offset);
+	 VERT_Z_ADD(v[2], offset);
+	 VERT_Z_ADD(v[3], offset);
+      }
+      UNFILLED_QUAD( ctx, GL_POINT, e0, e1, e2, e3 );
+   } else if (mode == GL_LINE) {
+      if (DO_OFFSET && ctx->Polygon.OffsetLine) {
+	 VERT_Z_ADD(v[0], offset);
+	 VERT_Z_ADD(v[1], offset);
+	 VERT_Z_ADD(v[2], offset);
+	 VERT_Z_ADD(v[3], offset);
+      }
+      UNFILLED_QUAD( ctx, GL_LINE, e0, e1, e2, e3 );
+   } else {
+      if (DO_OFFSET && ctx->Polygon.OffsetFill) {
+	 VERT_Z_ADD(v[0], offset);
+	 VERT_Z_ADD(v[1], offset);
+	 VERT_Z_ADD(v[2], offset);
+	 VERT_Z_ADD(v[3], offset);
+      }
+      RASTERIZE( GL_TRIANGLES );
+      QUAD( (v[0]), (v[1]), (v[2]), (v[3]) );
+   }
+
+   if (DO_OFFSET)
+   {
+      VERT_SET_Z(v[0], z[0]);
+      VERT_SET_Z(v[1], z[1]);
+      VERT_SET_Z(v[2], z[2]);
+      VERT_SET_Z(v[3], z[3]);
+   }
+
+   if (DO_TWOSIDE && facing == 1)
+   {
+      if (HAVE_RGBA) {
+	 if (!DO_FLAT) {
+	    VERT_RESTORE_RGBA( 0 );
+	    VERT_RESTORE_RGBA( 1 );
+	    VERT_RESTORE_RGBA( 2 );
+	 }
+	 VERT_RESTORE_RGBA( 3 );
+	 if (HAVE_SPEC) {
+	    if (!DO_FLAT) {
+	       VERT_RESTORE_SPEC( 0 );
+	       VERT_RESTORE_SPEC( 1 );
+	       VERT_RESTORE_SPEC( 2 );
+	    }
+	    VERT_RESTORE_SPEC( 3 );
+	 }
+      }
+      else {
+	 if (!DO_FLAT) {
+	    VERT_RESTORE_IND( 0 );
+	    VERT_RESTORE_IND( 1 );
+	    VERT_RESTORE_IND( 2 );
+	 }
+	 VERT_RESTORE_IND( 3 );
+      }
+   }
+
+
+   if (DO_FLAT) {
+      if (HAVE_RGBA) {
+	 VERT_RESTORE_RGBA( 0 );
+	 VERT_RESTORE_RGBA( 1 );
+	 VERT_RESTORE_RGBA( 2 );
+	 if (HAVE_SPEC && VB->SecondaryColorPtr[0]) {
+	    VERT_RESTORE_SPEC( 0 );
+	    VERT_RESTORE_SPEC( 1 );
+	    VERT_RESTORE_SPEC( 2 );
+	 }
+      }
+      else {
+	 VERT_RESTORE_IND( 0 );
+	 VERT_RESTORE_IND( 1 );
+	 VERT_RESTORE_IND( 2 );
+      }
+   }
+}
+#else
+static void TAG(quad)( GLcontext *ctx, GLuint e0,
+		       GLuint e1, GLuint e2, GLuint e3 )
+{
+   if (DO_UNFILLED) {
+      struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+      GLubyte ef1 = VB->EdgeFlag[e1];
+      GLubyte ef3 = VB->EdgeFlag[e3];
+      VB->EdgeFlag[e1] = 0;
+      TAG(triangle)( ctx, e0, e1, e3 );
+      VB->EdgeFlag[e1] = ef1;
+      VB->EdgeFlag[e3] = 0;
+      TAG(triangle)( ctx, e1, e2, e3 );
+      VB->EdgeFlag[e3] = ef3;
+   } else {
+      TAG(triangle)( ctx, e0, e1, e3 );
+      TAG(triangle)( ctx, e1, e2, e3 );
+   }
+}
+#endif
+#endif
+
+#if DO_LINE
+static void TAG(line)( GLcontext *ctx, GLuint e0, GLuint e1 )
+{
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+   VERTEX *v[2];
+   LOCAL_VARS(2);
+
+   v[0] = (VERTEX *)GET_VERTEX(e0);
+   v[1] = (VERTEX *)GET_VERTEX(e1);
+
+   if (DO_FLAT) {
+      if (HAVE_RGBA) {
+	 VERT_SAVE_RGBA( 0 );
+	 VERT_COPY_RGBA( v[0], v[1] );
+	 if (HAVE_SPEC && VB->SecondaryColorPtr[0]) {
+	    VERT_SAVE_SPEC( 0 );
+	    VERT_COPY_SPEC( v[0], v[1] );
+	 }
+      }
+      else {
+	 VERT_SAVE_IND( 0 );
+	 VERT_COPY_IND( v[0], v[1] );
+      }
+   }
+
+   LINE( v[0], v[1] );
+
+   if (DO_FLAT) {
+      if (HAVE_RGBA) {
+	 VERT_RESTORE_RGBA( 0 );
+
+	 if (HAVE_SPEC && VB->SecondaryColorPtr[0]) {
+	    VERT_RESTORE_SPEC( 0 );
+	 }
+      }
+      else {
+	 VERT_RESTORE_IND( 0 );
+      }
+   }
+}
+#endif
+
+#if DO_POINTS
+static void TAG(points)( GLcontext *ctx, GLuint first, GLuint last )
+{
+   struct vertex_buffer *VB = &TNL_CONTEXT( ctx )->vb;
+   int i;
+   LOCAL_VARS(1);
+
+   if (VB->Elts == 0) {
+      for ( i = first ; i < last ; i++ ) {
+	 if ( VB->ClipMask[i] == 0 ) {
+	    VERTEX *v = (VERTEX *)GET_VERTEX(i);
+	    POINT( v );
+	 }
+      }
+   } else {
+      for ( i = first ; i < last ; i++ ) {
+	 GLuint e = VB->Elts[i];
+	 if ( VB->ClipMask[e] == 0 ) {
+	    VERTEX *v = (VERTEX *)GET_VERTEX(e);
+	    POINT( v );
+	 }
+      }
+   }
+}
+#endif
+
+static void TAG(init)( void )
+{
+#if DO_QUAD
+   TAB[IND].quad = TAG(quad);
+#endif
+#if DO_TRI
+   TAB[IND].triangle = TAG(triangle);
+#endif
+#if DO_LINE
+   TAB[IND].line = TAG(line);
+#endif
+#if DO_POINTS
+   TAB[IND].points = TAG(points);
+#endif
+}
+
+#undef IND
+#undef TAG
+
+#if HAVE_RGBA
+#undef VERT_SET_IND
+#undef VERT_COPY_IND
+#undef VERT_SAVE_IND
+#undef VERT_RESTORE_IND
+#if HAVE_BACK_COLORS
+#undef VERT_SET_RGBA
+#endif
+#else
+#undef VERT_SET_RGBA
+#undef VERT_COPY_RGBA
+#undef VERT_SAVE_RGBA
+#undef VERT_RESTORE_RGBA
+#if HAVE_BACK_COLORS
+#undef VERT_SET_IND
+#endif
+#endif
+
+#if !HAVE_SPEC
+#undef VERT_SET_SPEC
+#undef VERT_COPY_SPEC
+#undef VERT_SAVE_SPEC
+#undef VERT_RESTORE_SPEC
+#if HAVE_BACK_COLORS
+#undef VERT_COPY_SPEC1
+#endif
+#else
+#if HAVE_BACK_COLORS
+#undef VERT_SET_SPEC
+#endif
+#endif
+
+#if !HAVE_BACK_COLORS
+#undef VERT_COPY_SPEC1
+#undef VERT_COPY_IND1
+#undef VERT_COPY_RGBA1
+#endif
+
+#ifndef INSANE_VERTICES
+#undef VERT_SET_Z
+#undef VERT_Z_ADD
+#endif
diff --git a/reactos/lib/mesa32/src/drivers/common/t_dd_unfilled.h b/reactos/lib/mesa32/src/drivers/common/t_dd_unfilled.h
new file mode 100644
index 00000000000..46415ea5f68
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/common/t_dd_unfilled.h
@@ -0,0 +1,212 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+#if HAVE_RGBA
+#define VERT_SET_IND( v, c )
+#define VERT_COPY_IND( v0, v1 )
+#define VERT_SAVE_IND( idx )
+#define VERT_RESTORE_IND( idx )
+#endif
+
+#if !HAVE_SPEC
+#define VERT_SET_SPEC( v, c )
+#define VERT_COPY_SPEC( v0, v1 )
+#define VERT_SAVE_SPEC( idx )
+#define VERT_RESTORE_SPEC( idx )
+#endif
+
+static void TAG(unfilled_tri)( GLcontext *ctx,
+			       GLenum mode,
+			       GLuint e0, GLuint e1, GLuint e2 )
+{
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+   GLubyte *ef = VB->EdgeFlag;
+   VERTEX *v[3];
+   LOCAL_VARS(3);
+
+   v[0] = (VERTEX *)GET_VERTEX(e0);
+   v[1] = (VERTEX *)GET_VERTEX(e1);
+   v[2] = (VERTEX *)GET_VERTEX(e2);
+
+   if ((ctx->_TriangleCaps & DD_FLATSHADE) && HAVE_HW_FLATSHADE) {
+      if (HAVE_RGBA) {
+	 VERT_SAVE_RGBA(0);
+	 VERT_SAVE_RGBA(1);
+	 VERT_COPY_RGBA(v[0], v[2]);
+	 VERT_COPY_RGBA(v[1], v[2]);
+
+	 if (HAVE_SPEC) {
+	    VERT_SAVE_SPEC(0);
+	    VERT_SAVE_SPEC(1);
+	    VERT_COPY_SPEC(v[0], v[2]);
+	    VERT_COPY_SPEC(v[1], v[2]);
+	 }
+      } else {
+	 VERT_SAVE_IND(0);
+	 VERT_SAVE_IND(1);
+	 VERT_COPY_IND(v[0], v[2]);
+	 VERT_COPY_IND(v[1], v[2]);
+      }
+   }
+
+/*     fprintf(stderr, "%s %s %d %d %d\n", __FUNCTION__, */
+/*  	   _mesa_lookup_enum_by_nr( mode ), */
+/*  	   ef[e0], ef[e1], ef[e2]); */
+
+   if (mode == GL_POINT) {
+      RASTERIZE(GL_POINTS);
+      if (ef[e0]) POINT( v[0] );
+      if (ef[e1]) POINT( v[1] );
+      if (ef[e2]) POINT( v[2] );
+   }
+   else {
+      RASTERIZE(GL_LINES);
+      if (RENDER_PRIMITIVE == GL_POLYGON) {
+	 if (ef[e2]) LINE( v[2], v[0] );
+	 if (ef[e0]) LINE( v[0], v[1] );
+	 if (ef[e1]) LINE( v[1], v[2] );
+      }
+      else {
+	 if (ef[e0]) LINE( v[0], v[1] );
+	 if (ef[e1]) LINE( v[1], v[2] );
+	 if (ef[e2]) LINE( v[2], v[0] );
+      }
+   }
+
+   if ((ctx->_TriangleCaps & DD_FLATSHADE) && HAVE_HW_FLATSHADE) {
+      if (HAVE_RGBA) {
+	 VERT_RESTORE_RGBA(0);
+	 VERT_RESTORE_RGBA(1);
+
+	 if (HAVE_SPEC) {
+	    VERT_RESTORE_SPEC(0);
+	    VERT_RESTORE_SPEC(1);
+	 }
+      } else {
+	 VERT_RESTORE_IND(0);
+	 VERT_RESTORE_IND(1);
+      }
+   }
+}
+
+
+static void TAG(unfilled_quad)( GLcontext *ctx,
+				GLenum mode,
+				GLuint e0, GLuint e1,
+				GLuint e2, GLuint e3 )
+{
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+   GLubyte *ef = VB->EdgeFlag;
+   VERTEX *v[4];
+   LOCAL_VARS(4);
+
+   v[0] = (VERTEX *)GET_VERTEX(e0);
+   v[1] = (VERTEX *)GET_VERTEX(e1);
+   v[2] = (VERTEX *)GET_VERTEX(e2);
+   v[3] = (VERTEX *)GET_VERTEX(e3);
+
+   /* Hardware flatshading breaks down here.  If the hardware doesn't
+    * support flatshading, this will already have been done:
+    */
+   if ((ctx->_TriangleCaps & DD_FLATSHADE) && HAVE_HW_FLATSHADE) {
+      if (HAVE_RGBA) {
+	 VERT_SAVE_RGBA(0);
+	 VERT_SAVE_RGBA(1);
+	 VERT_SAVE_RGBA(2);
+	 VERT_COPY_RGBA(v[0], v[3]);
+	 VERT_COPY_RGBA(v[1], v[3]);
+	 VERT_COPY_RGBA(v[2], v[3]);
+
+	 if (HAVE_SPEC) {
+	    VERT_SAVE_SPEC(0);
+	    VERT_SAVE_SPEC(1);
+	    VERT_SAVE_SPEC(2);
+	    VERT_COPY_SPEC(v[0], v[3]);
+	    VERT_COPY_SPEC(v[1], v[3]);
+	    VERT_COPY_SPEC(v[2], v[3]);
+	 }
+      } else {
+	 VERT_SAVE_IND(0);
+	 VERT_SAVE_IND(1);
+	 VERT_SAVE_IND(2);
+	 VERT_COPY_IND(v[0], v[3]);
+	 VERT_COPY_IND(v[1], v[3]);
+	 VERT_COPY_IND(v[2], v[3]);
+      }
+   }
+
+   if (mode == GL_POINT) {
+      RASTERIZE(GL_POINTS);
+      if (ef[e0]) POINT( v[0] );
+      if (ef[e1]) POINT( v[1] );
+      if (ef[e2]) POINT( v[2] );
+      if (ef[e3]) POINT( v[3] );
+   }
+   else {
+      RASTERIZE(GL_LINES);
+      if (ef[e0]) LINE( v[0], v[1] );
+      if (ef[e1]) LINE( v[1], v[2] );
+      if (ef[e2]) LINE( v[2], v[3] );
+      if (ef[e3]) LINE( v[3], v[0] );
+   }
+
+   if ((ctx->_TriangleCaps & DD_FLATSHADE) && HAVE_HW_FLATSHADE) {
+      if (HAVE_RGBA) {
+	 VERT_RESTORE_RGBA(0);
+	 VERT_RESTORE_RGBA(1);
+	 VERT_RESTORE_RGBA(2);
+
+	 if (HAVE_SPEC) {
+	    VERT_RESTORE_SPEC(0);
+	    VERT_RESTORE_SPEC(1);
+	    VERT_RESTORE_SPEC(2);
+	 }
+      } else {
+	 VERT_RESTORE_IND(0);
+	 VERT_RESTORE_IND(1);
+	 VERT_RESTORE_IND(2);
+      }
+   }
+}
+
+
+#if HAVE_RGBA
+#undef VERT_SET_IND
+#undef VERT_COPY_IND
+#undef VERT_SAVE_IND
+#undef VERT_RESTORE_IND
+#endif
+
+#if !HAVE_SPEC
+#undef VERT_SET_SPEC
+#undef VERT_COPY_SPEC
+#undef VERT_SAVE_SPEC
+#undef VERT_RESTORE_SPEC
+#endif
+
+#undef TAG
diff --git a/reactos/lib/mesa32/src/drivers/common/t_dd_vb.c b/reactos/lib/mesa32/src/drivers/common/t_dd_vb.c
new file mode 100644
index 00000000000..380b0424b4f
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/common/t_dd_vb.c
@@ -0,0 +1,344 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+#include "math/m_translate.h"
+
+#if (HAVE_HW_VIEWPORT)
+#define UNVIEWPORT_VARS
+#define UNVIEWPORT_X(x) x
+#define UNVIEWPORT_Y(x) x
+#define UNVIEWPORT_Z(x) x
+#endif
+
+#ifndef LOCALVARS
+#define LOCALVARS
+#endif
+
+#ifndef CHECK_HW_DIVIDE
+#define CHECK_HW_DIVIDE 1
+#endif
+
+/* These don't need to be duplicated, but there's currently nowhere
+ * really convenient to put them.  Need to build some actual .o files in
+ * this directory?
+ */
+static void copy_pv_rgba4_spec5( GLcontext *ctx, GLuint edst, GLuint esrc )
+{
+   LOCALVARS   
+   GLubyte *verts = GET_VERTEX_STORE();
+   GLuint shift = GET_VERTEX_STRIDE_SHIFT();
+   GLuint *dst = (GLuint *)(verts + (edst << shift));
+   GLuint *src = (GLuint *)(verts + (esrc << shift));
+   dst[4] = src[4];
+   dst[5] = src[5];
+}
+
+static void copy_pv_rgba4( GLcontext *ctx, GLuint edst, GLuint esrc )
+{
+   LOCALVARS
+   GLubyte *verts = GET_VERTEX_STORE();
+   GLuint shift = GET_VERTEX_STRIDE_SHIFT();
+   GLuint *dst = (GLuint *)(verts + (edst << shift));
+   GLuint *src = (GLuint *)(verts + (esrc << shift));
+   dst[4] = src[4];
+}
+
+static void copy_pv_rgba3( GLcontext *ctx, GLuint edst, GLuint esrc )
+{
+   LOCALVARS
+   GLubyte *verts = GET_VERTEX_STORE();
+   GLuint shift = GET_VERTEX_STRIDE_SHIFT();
+   GLuint *dst = (GLuint *)(verts + (edst << shift));
+   GLuint *src = (GLuint *)(verts + (esrc << shift));
+   dst[3] = src[3];
+}
+
+
+void TAG(translate_vertex)(GLcontext *ctx,
+			   const VERTEX *src,
+			   SWvertex *dst)
+{
+   LOCALVARS
+   GLuint format = GET_VERTEX_FORMAT();
+   GLfloat *s = ctx->Viewport._WindowMap.m;
+   UNVIEWPORT_VARS;
+
+   if (format == TINY_VERTEX_FORMAT) {
+      if (HAVE_HW_VIEWPORT) {
+	 dst->win[0] = s[0]  * src->v.x + s[12];
+	 dst->win[1] = s[5]  * src->v.y + s[13];
+	 dst->win[2] = s[10] * src->v.z + s[14];
+	 dst->win[3] = 1.0;
+      } else {
+	 dst->win[0] = UNVIEWPORT_X( src->v.x );
+	 dst->win[1] = UNVIEWPORT_Y( src->v.y );
+	 dst->win[2] = UNVIEWPORT_Z( src->v.z );
+	 dst->win[3] = 1.0;
+      }
+
+      dst->color[0] = src->tv.color.red;
+      dst->color[1] = src->tv.color.green;
+      dst->color[2] = src->tv.color.blue;
+      dst->color[3] = src->tv.color.alpha;
+   }
+   else {
+      if (HAVE_HW_VIEWPORT) {
+	 if (HAVE_HW_DIVIDE && CHECK_HW_DIVIDE) {
+	    GLfloat oow = 1.0 / src->v.w;
+	    dst->win[0] = s[0]  * src->v.x * oow + s[12];
+	    dst->win[1] = s[5]  * src->v.y * oow + s[13];
+	    dst->win[2] = s[10] * src->v.z * oow + s[14];
+	    dst->win[3] = oow;
+	 } else {
+	    dst->win[0] = s[0]  * src->v.x + s[12];
+	    dst->win[1] = s[5]  * src->v.y + s[13];
+	    dst->win[2] = s[10] * src->v.z + s[14];
+	    dst->win[3] = src->v.w;
+	 }
+      } else {
+	 dst->win[0] = UNVIEWPORT_X( src->v.x );
+	 dst->win[1] = UNVIEWPORT_Y( src->v.y );
+	 dst->win[2] = UNVIEWPORT_Z( src->v.z );
+	 dst->win[3] = src->v.w;
+      }
+
+      dst->color[0] = src->v.color.red;
+      dst->color[1] = src->v.color.green;
+      dst->color[2] = src->v.color.blue;
+      dst->color[3] = src->v.color.alpha;
+
+      dst->specular[0] = src->v.specular.red;
+      dst->specular[1] = src->v.specular.green;
+      dst->specular[2] = src->v.specular.blue;
+
+      dst->fog = src->v.specular.alpha/255.0;
+
+      if (HAVE_PTEX_VERTICES &&
+	  ((HAVE_TEX2_VERTICES && format == PROJ_TEX3_VERTEX_FORMAT) ||
+	   (format == PROJ_TEX1_VERTEX_FORMAT))) {
+
+	 dst->texcoord[0][0] = src->pv.u0;
+	 dst->texcoord[0][1] = src->pv.v0;
+	 dst->texcoord[0][3] = src->pv.q0;
+
+	 dst->texcoord[1][0] = src->pv.u1;
+	 dst->texcoord[1][1] = src->pv.v1;
+	 dst->texcoord[1][3] = src->pv.q1;
+
+	 if (HAVE_TEX2_VERTICES) {
+	    dst->texcoord[2][0] = src->pv.u2;
+	    dst->texcoord[2][1] = src->pv.v2;
+	    dst->texcoord[2][3] = src->pv.q2;
+	 }
+
+	 if (HAVE_TEX3_VERTICES) {
+	    dst->texcoord[3][0] = src->pv.u3;
+	    dst->texcoord[3][1] = src->pv.v3;
+	    dst->texcoord[3][3] = src->pv.q3;
+	 }
+      }
+      else {
+	 dst->texcoord[0][0] = src->v.u0;
+	 dst->texcoord[0][1] = src->v.v0;
+	 dst->texcoord[0][3] = 1.0;
+
+	 dst->texcoord[1][0] = src->v.u1;
+	 dst->texcoord[1][1] = src->v.v1;
+	 dst->texcoord[1][3] = 1.0;
+
+	 if (HAVE_TEX2_VERTICES) {
+	    dst->texcoord[2][0] = src->v.u2;
+	    dst->texcoord[2][1] = src->v.v2;
+	    dst->texcoord[2][3] = 1.0;
+	 }
+
+	 if (HAVE_TEX3_VERTICES) {
+	    dst->texcoord[3][0] = src->v.u3;
+	    dst->texcoord[3][1] = src->v.v3;
+	    dst->texcoord[3][3] = 1.0;
+	 }
+      }
+   }
+
+   dst->pointSize = ctx->Point._Size;
+}
+
+
+
+void TAG(print_vertex)( GLcontext *ctx, const VERTEX *v )
+{
+   LOCALVARS
+   GLuint format = GET_VERTEX_FORMAT();
+
+   fprintf(stderr, "(%x) ", format);
+
+   switch (format) {
+#if HAVE_TINY_VERTICES
+   case TINY_VERTEX_FORMAT:
+      fprintf(stderr, "xyz %.4f,%.4f,%.4f rgba %x:%x:%x:%x\n",
+	      v->v.x, v->v.y, v->v.z,
+	      v->tv.color.red,
+	      v->tv.color.green,
+	      v->tv.color.blue,
+	      v->tv.color.alpha);
+      break;
+#endif
+#if HAVE_NOTEX_VERTICES
+   case NOTEX_VERTEX_FORMAT:
+      fprintf(stderr, "xyzw %.4f,%.4f,%.4f,%.4f rgba %x:%x:%x:%x spec %x:%x:%x:%x\n",
+	      v->v.x, v->v.y, v->v.z, v->v.w,
+	      v->v.color.red,
+	      v->v.color.green,
+	      v->v.color.blue,
+	      v->v.color.alpha,
+	      v->v.specular.red,
+	      v->v.specular.green,
+	      v->v.specular.blue,
+	      v->v.specular.alpha);
+      break;
+#endif
+#if HAVE_TEX0_VERTICES
+   case TEX0_VERTEX_FORMAT:
+      fprintf(stderr, "xyzw %.4f,%.4f,%.4f,%.4f rgba %x:%x:%x:%x st %.4f,%.4f\n",
+	      v->v.x, v->v.y, v->v.z, v->v.w,
+	      v->v.color.red,
+	      v->v.color.green,
+	      v->v.color.blue,
+	      v->v.color.alpha,
+	      v->v.u0,
+	      v->v.v0);
+      break;
+#endif
+#if HAVE_TEX1_VERTICES
+   case TEX1_VERTEX_FORMAT:
+      fprintf(stderr, "xyzw %.4f,%.4f,%.4f,%.4f rgba %x:%x:%x:%x st %.4f,%.4f st %.4f,%.4f\n",
+	      v->v.x, v->v.y, v->v.z, v->v.w,
+	      v->v.color.red,
+	      v->v.color.green,
+	      v->v.color.blue,
+	      v->v.color.alpha,
+	      v->v.u0,
+	      v->v.v0,
+	      v->v.u1,
+	      v->v.u2);
+      break;
+#endif
+#if HAVE_PTEX_VERTICES
+   case PROJ_TEX1_VERTEX_FORMAT:
+      fprintf(stderr, "xyzw %.4f,%.4f,%.4f,%.4f rgba %x:%x:%x:%x stq %.4f,%.4f,%.4f stq %.4f,%.4f,%.4f\n",
+	      v->v.x, v->v.y, v->v.z, v->v.w,
+	      v->v.color.red,
+	      v->v.color.green,
+	      v->v.color.blue,
+	      v->v.color.alpha,
+	      v->pv.u0,
+	      v->pv.v0,
+	      v->pv.q0,
+	      v->pv.u1,
+	      v->pv.v1,
+	      v->pv.q1);
+      break;
+#endif      
+   default:
+      fprintf(stderr, "???\n");
+      break;
+   }
+
+   fprintf(stderr, "\n");
+}
+
+
+
+/* Interpolate the elements of the VB not included in typical hardware
+ * vertices.  
+ *
+ * NOTE: All these arrays are guarenteed by tnl to be writeable and
+ * have good stride.
+ */
+#ifndef INTERP_QUALIFIER 
+#define INTERP_QUALIFIER static
+#endif
+
+#define GET_COLOR(ptr, idx) ((ptr)->data[idx])
+
+
+INTERP_QUALIFIER void TAG(interp_extras)( GLcontext *ctx,
+					  GLfloat t,
+					  GLuint dst, GLuint out, GLuint in,
+					  GLboolean force_boundary )
+{
+   LOCALVARS
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+
+   if (VB->ColorPtr[1]) {
+      assert(VB->ColorPtr[1]->stride == 4 * sizeof(GLfloat));
+
+      INTERP_4F( t,
+		    GET_COLOR(VB->ColorPtr[1], dst),
+		    GET_COLOR(VB->ColorPtr[1], out),
+		    GET_COLOR(VB->ColorPtr[1], in) );
+
+      if (VB->SecondaryColorPtr[1]) {
+	 INTERP_3F( t,
+		       GET_COLOR(VB->SecondaryColorPtr[1], dst),
+		       GET_COLOR(VB->SecondaryColorPtr[1], out),
+		       GET_COLOR(VB->SecondaryColorPtr[1], in) );
+      }
+   }
+
+   if (VB->EdgeFlag) {
+      VB->EdgeFlag[dst] = VB->EdgeFlag[out] || force_boundary;
+   }
+
+   INTERP_VERTEX(ctx, t, dst, out, in, force_boundary);
+}
+
+INTERP_QUALIFIER void TAG(copy_pv_extras)( GLcontext *ctx, 
+					   GLuint dst, GLuint src )
+{
+   LOCALVARS
+      struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+
+   if (VB->ColorPtr[1]) {
+      COPY_4FV( GET_COLOR(VB->ColorPtr[1], dst), 
+		GET_COLOR(VB->ColorPtr[1], src) );
+
+      if (VB->SecondaryColorPtr[1]) {
+	 COPY_4FV( GET_COLOR(VB->SecondaryColorPtr[1], dst), 
+		   GET_COLOR(VB->SecondaryColorPtr[1], src) );
+      }
+   }
+
+   COPY_PV_VERTEX(ctx, dst, src);
+}
+
+
+#undef INTERP_QUALIFIER
+#undef GET_COLOR
+
+#undef IND
+#undef TAG
diff --git a/reactos/lib/mesa32/src/drivers/common/t_dd_vbtmp.h b/reactos/lib/mesa32/src/drivers/common/t_dd_vbtmp.h
new file mode 100644
index 00000000000..14b4a28651a
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/common/t_dd_vbtmp.h
@@ -0,0 +1,679 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.0.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+
+/* Unlike the other templates here, this assumes quite a bit about the
+ * underlying hardware.  Specifically it assumes a d3d-like vertex
+ * format, with a layout more or less constrained to look like the
+ * following:
+ *
+ * union {
+ *    struct {
+ *        float x, y, z, w;
+ *        struct { char r, g, b, a; } color;
+ *        struct { char r, g, b, fog; } spec;
+ *        float u0, v0;
+ *        float u1, v1;
+ *        float u2, v2;
+ *        float u3, v3;
+ *    } v;
+ *    struct {
+ *        float x, y, z, w;
+ *        struct { char r, g, b, a; } color;
+ *        struct { char r, g, b, fog; } spec;
+ *        float u0, v0, q0;
+ *        float u1, v1, q1;
+ *        float u2, v2, q2;
+ *        float u3, v3, q3;
+ *    } pv;
+ *    struct {
+ *        float x, y, z;
+ *        struct { char r, g, b, a; } color;
+ *    } tv;
+ *    float f[16];
+ *    unsigned int ui[16];
+ *    unsigned char ub4[4][16];
+ * }
+ *
+ 
+ * VERTEX:   hw vertex type as above
+ * VERTEX_COLOR: hw color struct type in VERTEX
+ *
+ * DO_XYZW:  Emit xyz and maybe w coordinates.
+ * DO_RGBA:  Emit color.
+ * DO_SPEC:  Emit specular color.
+ * DO_FOG:   Emit fog coordinate in specular alpha.
+ * DO_TEX0:  Emit tex0 u,v coordinates.
+ * DO_TEX1:  Emit tex1 u,v coordinates.
+ * DO_TEX2:  Emit tex2 u,v coordinates.
+ * DO_TEX3:  Emit tex3 u,v coordinates.
+ * DO_PTEX:  Emit tex0,1,2,3 q coordinates where possible.
+ *
+ * HAVE_RGBA_COLOR: Hardware takes color in rgba order (else bgra).
+ *
+ * HAVE_HW_VIEWPORT:  Hardware performs viewport transform.
+ * HAVE_HW_DIVIDE:  Hardware performs perspective divide.
+ *
+ * HAVE_TINY_VERTICES:  Hardware understands v.tv format.
+ * HAVE_PTEX_VERTICES:  Hardware understands v.pv format.
+ * HAVE_NOTEX_VERTICES:  Hardware understands v.v format with texcount 0.
+ *
+ * Additionally, this template assumes it is emitting *transformed*
+ * vertices; the modifications to emit untransformed vertices (ie. to
+ * t&l hardware) are probably too great to cooexist with the code
+ * already in this file.
+ *
+ * NOTE: The PTEX vertex format always includes TEX0 and TEX1, even if
+ * only TEX0 is enabled, in order to maintain a vertex size which is
+ * an exact number of quadwords.
+ */
+
+#if (HAVE_HW_VIEWPORT)
+#define VIEWPORT_X(dst,x) dst = x
+#define VIEWPORT_Y(dst,y) dst = y
+#define VIEWPORT_Z(dst,z) dst = z
+#else
+#define VIEWPORT_X(dst,x) dst = s[0]  * x + s[12]
+#define VIEWPORT_Y(dst,y) dst = s[5]  * y + s[13]
+#define VIEWPORT_Z(dst,z) dst = s[10] * z + s[14]
+#endif
+
+#if (HAVE_HW_DIVIDE && !HAVE_PTEX_VERTICES)
+#error "can't cope with this combination" 
+#endif 
+
+#ifndef LOCALVARS
+#define LOCALVARS
+#endif
+
+#ifndef CHECK_HW_DIVIDE
+#define CHECK_HW_DIVIDE 1
+#endif
+
+#if (HAVE_HW_DIVIDE || DO_SPEC || DO_TEX0 || DO_FOG || !HAVE_TINY_VERTICES)
+
+static void TAG(emit)( GLcontext *ctx,
+		       GLuint start, GLuint end,
+		       void *dest,
+		       GLuint stride )
+{
+   LOCALVARS
+      struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+   GLfloat (*tc0)[4], (*tc1)[4], (*fog)[4];
+   GLfloat (*tc2)[4], (*tc3)[4];
+   GLfloat (*col)[4], (*spec)[4];
+   GLuint tc0_stride, tc1_stride, col_stride, spec_stride, fog_stride;
+   GLuint tc2_stride, tc3_stride;
+   GLuint tc0_size, tc1_size;
+   GLuint tc2_size, tc3_size;
+   GLfloat (*coord)[4];
+   GLuint coord_stride;
+   VERTEX *v = (VERTEX *)dest;
+   const GLfloat *s = GET_VIEWPORT_MAT();
+   const GLubyte *mask = VB->ClipMask;
+   int i;
+
+/*     fprintf(stderr, "%s(big) importable %d %d..%d\n",  */
+/*  	   __FUNCTION__, VB->importable_data, start, end); */
+
+   if (HAVE_HW_VIEWPORT && HAVE_HW_DIVIDE && CHECK_HW_DIVIDE) {
+      (void) s;
+      coord = VB->ClipPtr->data;
+      coord_stride = VB->ClipPtr->stride;
+   }
+   else {
+      coord = VB->NdcPtr->data;
+      coord_stride = VB->NdcPtr->stride;
+   }
+
+   if (DO_TEX3) {
+      const GLuint t3 = GET_TEXSOURCE(3);
+      tc3 = VB->TexCoordPtr[t3]->data;
+      tc3_stride = VB->TexCoordPtr[t3]->stride;
+      if (DO_PTEX)
+	 tc3_size = VB->TexCoordPtr[t3]->size;
+   }
+
+   if (DO_TEX2) {
+      const GLuint t2 = GET_TEXSOURCE(2);
+      tc2 = VB->TexCoordPtr[t2]->data;
+      tc2_stride = VB->TexCoordPtr[t2]->stride;
+      if (DO_PTEX)
+	 tc2_size = VB->TexCoordPtr[t2]->size;
+   }
+
+   if (DO_TEX1) {
+      const GLuint t1 = GET_TEXSOURCE(1);
+      tc1 = VB->TexCoordPtr[t1]->data;
+      tc1_stride = VB->TexCoordPtr[t1]->stride;
+      if (DO_PTEX)
+	 tc1_size = VB->TexCoordPtr[t1]->size;
+   }
+
+   if (DO_TEX0) {
+      const GLuint t0 = GET_TEXSOURCE(0);
+      tc0_stride = VB->TexCoordPtr[t0]->stride;
+      tc0 = VB->TexCoordPtr[t0]->data;
+      if (DO_PTEX) 
+	 tc0_size = VB->TexCoordPtr[t0]->size;
+   }
+
+   if (DO_RGBA) {
+      col_stride = VB->ColorPtr[0]->stride;
+      col = VB->ColorPtr[0]->data;
+   }
+
+   if (DO_SPEC) {
+      if (VB->SecondaryColorPtr[0]) {
+	 spec_stride = VB->SecondaryColorPtr[0]->stride;
+	 spec = VB->SecondaryColorPtr[0]->data;
+      } else {
+	 spec = (GLfloat (*)[4])ctx->Current.Attrib[VERT_ATTRIB_COLOR1];
+	 spec_stride = 0;
+      }
+   }
+
+   if (DO_FOG) {
+      if (VB->FogCoordPtr) {
+	 fog = VB->FogCoordPtr->data;
+	 fog_stride = VB->FogCoordPtr->stride;
+      }
+      else {
+	 static GLfloat tmp[4] = {0, 0, 0, 0};
+	 fog = &tmp;
+	 fog_stride = 0;
+      }
+   }
+
+   /* May have nonstandard strides:
+    */
+   if (start) {
+      STRIDE_4F(coord, start * coord_stride);
+      if (DO_TEX0)
+	 STRIDE_4F(tc0, start * tc0_stride);
+      if (DO_TEX1) 
+	 STRIDE_4F(tc1, start * tc1_stride);
+      if (DO_TEX2) 
+	 STRIDE_4F(tc2, start * tc2_stride);
+      if (DO_TEX3) 
+	 STRIDE_4F(tc3, start * tc3_stride);
+      if (DO_RGBA) 
+	 STRIDE_4F(col, start * col_stride);
+      if (DO_SPEC)
+	 STRIDE_4F(spec, start * spec_stride);
+      if (DO_FOG)
+	 STRIDE_4F(fog, start * fog_stride);
+   }
+
+   for (i=start; i < end; i++, v = (VERTEX *)((GLubyte *)v + stride)) {
+      if (DO_XYZW) {
+	 if (HAVE_HW_VIEWPORT || mask[i] == 0) {
+	    VIEWPORT_X(v->v.x, coord[0][0]);
+	    VIEWPORT_Y(v->v.y, coord[0][1]);
+	    VIEWPORT_Z(v->v.z, coord[0][2]);
+	    v->v.w = coord[0][3];
+	 }
+	 STRIDE_4F(coord, coord_stride);
+      }
+      if (DO_RGBA) {
+	 UNCLAMPED_FLOAT_TO_UBYTE(v->v.color.red, col[0][0]);
+	 UNCLAMPED_FLOAT_TO_UBYTE(v->v.color.green, col[0][1]);
+	 UNCLAMPED_FLOAT_TO_UBYTE(v->v.color.blue, col[0][2]);
+	 UNCLAMPED_FLOAT_TO_UBYTE(v->v.color.alpha, col[0][3]);
+	 STRIDE_4F(col, col_stride);
+      }
+      if (DO_SPEC) {
+	 UNCLAMPED_FLOAT_TO_UBYTE(v->v.specular.red, spec[0][0]);
+	 UNCLAMPED_FLOAT_TO_UBYTE(v->v.specular.green, spec[0][1]);
+	 UNCLAMPED_FLOAT_TO_UBYTE(v->v.specular.blue, spec[0][2]);
+	 STRIDE_4F(spec, spec_stride);
+      }
+      if (DO_FOG) {
+	 UNCLAMPED_FLOAT_TO_UBYTE(v->v.specular.alpha, fog[0][0]);
+	 STRIDE_4F(fog, fog_stride);
+      }
+      if (DO_TEX0) {
+	 v->v.u0 = tc0[0][0];
+	 v->v.v0 = tc0[0][1];
+	 if (DO_PTEX) {
+	    if (HAVE_PTEX_VERTICES) {
+	       if (tc0_size == 4) 
+		  v->pv.q0 = tc0[0][3];
+	       else
+		  v->pv.q0 = 1.0;
+	    } 
+	    else if (tc0_size == 4) {
+	       float rhw = 1.0 / tc0[0][3];
+	       v->v.w *= tc0[0][3];
+	       v->v.u0 *= rhw;
+	       v->v.v0 *= rhw;
+	    } 
+	 } 
+	 STRIDE_4F(tc0, tc0_stride);
+      }
+      if (DO_TEX1) {
+	 if (DO_PTEX) {
+	    v->pv.u1 = tc1[0][0];
+	    v->pv.v1 = tc1[0][1];
+	    if (tc1_size == 4) 
+	       v->pv.q1 = tc1[0][3];
+	    else
+	       v->pv.q1 = 1.0;
+	 } 
+	 else {
+	    v->v.u1 = tc1[0][0];
+	    v->v.v1 = tc1[0][1];
+	 }
+	 STRIDE_4F(tc1, tc1_stride);
+      } 
+      else if (DO_PTEX) {
+	 *(GLuint *)&v->pv.q1 = 0;	/* avoid culling on radeon */
+      }
+      if (DO_TEX2) {
+	 if (DO_PTEX) {
+	    v->pv.u2 = tc2[0][0];
+	    v->pv.v2 = tc2[0][1];
+	    if (tc2_size == 4) 
+	       v->pv.q2 = tc2[0][3];
+	    else
+	       v->pv.q2 = 1.0;
+	 } 
+	 else {
+	    v->v.u2 = tc2[0][0];
+	    v->v.v2 = tc2[0][1];
+	 }
+	 STRIDE_4F(tc2, tc2_stride);
+      } 
+      if (DO_TEX3) {
+	 if (DO_PTEX) {
+	    v->pv.u3 = tc3[0][0];
+	    v->pv.v3 = tc3[0][1];
+	    if (tc3_size == 4) 
+	       v->pv.q3 = tc3[0][3];
+	    else
+	       v->pv.q3 = 1.0;
+	 } 
+	 else {
+	    v->v.u3 = tc3[0][0];
+	    v->v.v3 = tc3[0][1];
+	 }
+	 STRIDE_4F(tc3, tc3_stride);
+      } 
+   }
+
+}
+#else
+
+#if HAVE_HW_DIVIDE
+#error "cannot use tiny vertices with hw perspective divide"
+#endif
+
+static void TAG(emit)( GLcontext *ctx, GLuint start, GLuint end,
+		       void *dest, GLuint stride )
+{
+   LOCALVARS
+      struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+   GLfloat (*col)[4];
+   GLuint col_stride;
+   GLfloat (*coord)[4] = VB->NdcPtr->data;
+   GLuint coord_stride = VB->NdcPtr->stride;
+   GLfloat *v = (GLfloat *)dest;
+   const GLubyte *mask = VB->ClipMask;
+   const GLfloat *s = GET_VIEWPORT_MAT();
+   int i;
+
+   (void) s;
+
+   ASSERT(stride == 4);
+
+   col = VB->ColorPtr[0]->data;
+   col_stride = VB->ColorPtr[0]->stride;
+
+/*     fprintf(stderr, "%s(small) importable %x\n",  */
+/*  	   __FUNCTION__, VB->importable_data); */
+
+   /* Pack what's left into a 4-dword vertex.  Color is in a different
+    * place, and there is no 'w' coordinate.
+    */
+   if (start) {
+      STRIDE_4F(coord, start * coord_stride);
+      STRIDE_4F(col, start * col_stride);
+   }
+
+   for (i=start; i < end; i++, v+=4) {
+      if (DO_XYZW) {
+	 if (HAVE_HW_VIEWPORT || mask[i] == 0) {
+	    VIEWPORT_X(v[0], coord[0][0]);
+	    VIEWPORT_Y(v[1], coord[0][1]);
+	    VIEWPORT_Z(v[2], coord[0][2]);
+	 }
+	 STRIDE_4F( coord, coord_stride );
+      }
+      if (DO_RGBA) {
+	 VERTEX_COLOR *c = (VERTEX_COLOR *)&v[3];
+	 UNCLAMPED_FLOAT_TO_UBYTE(c->red, col[0][0]);
+	 UNCLAMPED_FLOAT_TO_UBYTE(c->green, col[0][1]);
+	 UNCLAMPED_FLOAT_TO_UBYTE(c->blue, col[0][2]);
+	 UNCLAMPED_FLOAT_TO_UBYTE(c->alpha, col[0][3]);
+	 STRIDE_4F( col, col_stride );
+      }
+/*  	 fprintf(stderr, "vert %d: %.2f %.2f %.2f %x\n",  */
+/*  		 i, v[0], v[1], v[2], *(int *)&v[3]); */
+   }
+}
+
+#endif /* emit */
+
+#if (DO_XYZW) && (DO_RGBA)
+
+
+#if (HAVE_PTEX_VERTICES)
+static GLboolean TAG(check_tex_sizes)( GLcontext *ctx )
+{
+   LOCALVARS
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+
+   /* Force 'missing' texcoords to something valid.
+    */
+   if (DO_TEX3 && VB->TexCoordPtr[2] == 0)
+      VB->TexCoordPtr[2] = VB->TexCoordPtr[3];
+
+   if (DO_TEX2 && VB->TexCoordPtr[1] == 0)
+      VB->TexCoordPtr[1] = VB->TexCoordPtr[2];
+
+   if (DO_TEX1 && VB->TexCoordPtr[0] == 0)
+      VB->TexCoordPtr[0] = VB->TexCoordPtr[1];
+
+   if (DO_PTEX)
+      return GL_TRUE;
+   
+   if ((DO_TEX3 && VB->TexCoordPtr[GET_TEXSOURCE(3)]->size == 4) ||
+       (DO_TEX2 && VB->TexCoordPtr[GET_TEXSOURCE(2)]->size == 4) ||
+       (DO_TEX1 && VB->TexCoordPtr[GET_TEXSOURCE(1)]->size == 4) ||
+       (DO_TEX0 && VB->TexCoordPtr[GET_TEXSOURCE(0)]->size == 4))
+      return GL_FALSE;
+
+   return GL_TRUE;
+}
+#else
+static GLboolean TAG(check_tex_sizes)( GLcontext *ctx )
+{
+   LOCALVARS
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+
+   /* Force 'missing' texcoords to something valid.
+    */
+   if (DO_TEX3 && VB->TexCoordPtr[2] == 0)
+      VB->TexCoordPtr[2] = VB->TexCoordPtr[3];
+
+   if (DO_TEX2 && VB->TexCoordPtr[1] == 0)
+      VB->TexCoordPtr[1] = VB->TexCoordPtr[2];
+
+   if (DO_TEX1 && VB->TexCoordPtr[0] == 0)
+      VB->TexCoordPtr[0] = VB->TexCoordPtr[1];
+
+   if (DO_PTEX)
+      return GL_TRUE;
+
+   /* No hardware support for projective texture.  Can fake it for
+    * TEX0 only.
+    */
+   if ((DO_TEX3 && VB->TexCoordPtr[GET_TEXSOURCE(3)]->size == 4) ||
+       (DO_TEX2 && VB->TexCoordPtr[GET_TEXSOURCE(2)]->size == 4) ||
+       (DO_TEX1 && VB->TexCoordPtr[GET_TEXSOURCE(1)]->size == 4)) {
+      PTEX_FALLBACK();
+      return GL_FALSE;
+   }
+
+   if (DO_TEX0 && VB->TexCoordPtr[GET_TEXSOURCE(0)]->size == 4) {
+      if (DO_TEX1 || DO_TEX2 || DO_TEX3) {
+	 PTEX_FALLBACK();
+      }
+      return GL_FALSE;
+   }
+
+   return GL_TRUE;
+}
+#endif /* ptex */
+
+
+static void TAG(interp)( GLcontext *ctx,
+			 GLfloat t,
+			 GLuint edst, GLuint eout, GLuint ein,
+			 GLboolean force_boundary )
+{
+   LOCALVARS
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+   GLubyte *ddverts = GET_VERTEX_STORE();
+   GLuint shift = GET_VERTEX_STRIDE_SHIFT();
+   const GLfloat *dstclip = VB->ClipPtr->data[edst];
+   GLfloat w;
+   const GLfloat *s = GET_VIEWPORT_MAT();
+
+   VERTEX *dst = (VERTEX *)(ddverts + (edst << shift));
+   VERTEX *in  = (VERTEX *)(ddverts + (ein << shift));
+   VERTEX *out = (VERTEX *)(ddverts + (eout << shift));
+
+   (void)s;
+
+   if (HAVE_HW_DIVIDE && CHECK_HW_DIVIDE) {
+      VIEWPORT_X( dst->v.x, dstclip[0] );
+      VIEWPORT_Y( dst->v.y, dstclip[1] );
+      VIEWPORT_Z( dst->v.z, dstclip[2] );
+      w = dstclip[3];
+   }
+   else {
+      w = 1.0 / dstclip[3];
+      VIEWPORT_X( dst->v.x, dstclip[0] * w );
+      VIEWPORT_Y( dst->v.y, dstclip[1] * w );
+      VIEWPORT_Z( dst->v.z, dstclip[2] * w );
+   }
+
+   if ((HAVE_HW_DIVIDE && CHECK_HW_DIVIDE) || 
+       DO_FOG || DO_SPEC || DO_TEX0 || DO_TEX1 ||
+       DO_TEX2 || DO_TEX3 || !HAVE_TINY_VERTICES) {
+
+      dst->v.w = w;
+
+      INTERP_UB( t, dst->ub4[4][0], out->ub4[4][0], in->ub4[4][0] );
+      INTERP_UB( t, dst->ub4[4][1], out->ub4[4][1], in->ub4[4][1] );
+      INTERP_UB( t, dst->ub4[4][2], out->ub4[4][2], in->ub4[4][2] );
+      INTERP_UB( t, dst->ub4[4][3], out->ub4[4][3], in->ub4[4][3] );
+
+      if (DO_SPEC) {
+	 INTERP_UB( t, dst->v.specular.red,   out->v.specular.red,   in->v.specular.red );
+	 INTERP_UB( t, dst->v.specular.green, out->v.specular.green, in->v.specular.green );
+	 INTERP_UB( t, dst->v.specular.blue,  out->v.specular.blue,  in->v.specular.blue );
+      }
+      if (DO_FOG) {
+	 INTERP_UB( t, dst->v.specular.alpha, out->v.specular.alpha, in->v.specular.alpha );
+      }
+      if (DO_TEX0) {
+	 if (DO_PTEX) {
+	    if (HAVE_PTEX_VERTICES) {
+	       INTERP_F( t, dst->pv.u0, out->pv.u0, in->pv.u0 );
+	       INTERP_F( t, dst->pv.v0, out->pv.v0, in->pv.v0 );
+	       INTERP_F( t, dst->pv.q0, out->pv.q0, in->pv.q0 );
+	    } else {
+	       GLfloat wout = VB->NdcPtr->data[eout][3];
+	       GLfloat win = VB->NdcPtr->data[ein][3];
+	       GLfloat qout = out->pv.w / wout;
+	       GLfloat qin = in->pv.w / win;
+	       GLfloat qdst, rqdst;
+
+	       ASSERT( !HAVE_HW_DIVIDE );
+
+	       INTERP_F( t, dst->v.u0, out->v.u0 * qout, in->v.u0 * qin );
+	       INTERP_F( t, dst->v.v0, out->v.v0 * qout, in->v.v0 * qin );
+	       INTERP_F( t, qdst, qout, qin );
+
+	       rqdst = 1.0 / qdst;
+	       dst->v.u0 *= rqdst;
+	       dst->v.v0 *= rqdst;
+	       dst->v.w *= rqdst;
+	    }
+	 }
+	 else {
+	    INTERP_F( t, dst->v.u0, out->v.u0, in->v.u0 );
+	    INTERP_F( t, dst->v.v0, out->v.v0, in->v.v0 );
+	 }
+      }
+      if (DO_TEX1) {
+	 if (DO_PTEX) {
+	    INTERP_F( t, dst->pv.u1, out->pv.u1, in->pv.u1 );
+	    INTERP_F( t, dst->pv.v1, out->pv.v1, in->pv.v1 );
+	    INTERP_F( t, dst->pv.q1, out->pv.q1, in->pv.q1 );
+	 } else {
+	    INTERP_F( t, dst->v.u1, out->v.u1, in->v.u1 );
+	    INTERP_F( t, dst->v.v1, out->v.v1, in->v.v1 );
+	 }
+      }
+      else if (DO_PTEX) {
+	 dst->pv.q1 = 0.0;	/* must be a valid float on radeon */
+      }
+      if (DO_TEX2) {
+	 if (DO_PTEX) {
+	    INTERP_F( t, dst->pv.u2, out->pv.u2, in->pv.u2 );
+	    INTERP_F( t, dst->pv.v2, out->pv.v2, in->pv.v2 );
+	    INTERP_F( t, dst->pv.q2, out->pv.q2, in->pv.q2 );
+	 } else {
+	    INTERP_F( t, dst->v.u2, out->v.u2, in->v.u2 );
+	    INTERP_F( t, dst->v.v2, out->v.v2, in->v.v2 );
+	 }
+      }
+      if (DO_TEX3) {
+	 if (DO_PTEX) {
+	    INTERP_F( t, dst->pv.u3, out->pv.u3, in->pv.u3 );
+	    INTERP_F( t, dst->pv.v3, out->pv.v3, in->pv.v3 );
+	    INTERP_F( t, dst->pv.q3, out->pv.q3, in->pv.q3 );
+	 } else {
+	    INTERP_F( t, dst->v.u3, out->v.u3, in->v.u3 );
+	    INTERP_F( t, dst->v.v3, out->v.v3, in->v.v3 );
+	 }
+      }
+   } else {
+      /* 4-dword vertex.  Color is in v[3] and there is no oow coordinate.
+       */
+      INTERP_UB( t, dst->ub4[3][0], out->ub4[3][0], in->ub4[3][0] );
+      INTERP_UB( t, dst->ub4[3][1], out->ub4[3][1], in->ub4[3][1] );
+      INTERP_UB( t, dst->ub4[3][2], out->ub4[3][2], in->ub4[3][2] );
+      INTERP_UB( t, dst->ub4[3][3], out->ub4[3][3], in->ub4[3][3] );
+   }
+}
+
+#endif /* rgba && xyzw */
+
+
+static void TAG(init)( void )
+{
+   setup_tab[IND].emit = TAG(emit);
+
+#if (DO_XYZW && DO_RGBA)
+   setup_tab[IND].check_tex_sizes = TAG(check_tex_sizes);
+   setup_tab[IND].interp = TAG(interp);
+#endif
+
+   if (DO_SPEC)
+      setup_tab[IND].copy_pv = copy_pv_rgba4_spec5;
+   else if (HAVE_HW_DIVIDE || DO_SPEC || DO_FOG || DO_TEX0 || DO_TEX1 ||
+	    DO_TEX2 || DO_TEX3 || !HAVE_TINY_VERTICES)
+      setup_tab[IND].copy_pv = copy_pv_rgba4;
+   else
+      setup_tab[IND].copy_pv = copy_pv_rgba3;
+
+   if (DO_TEX3) {
+      if (DO_PTEX) {
+	 ASSERT(HAVE_PTEX_VERTICES);
+	 setup_tab[IND].vertex_format = PROJ_TEX3_VERTEX_FORMAT;
+	 setup_tab[IND].vertex_size = 18;
+	 setup_tab[IND].vertex_stride_shift = 7;
+      }
+      else {
+	 setup_tab[IND].vertex_format = TEX3_VERTEX_FORMAT;
+	 setup_tab[IND].vertex_size = 14;
+	 setup_tab[IND].vertex_stride_shift = 6;
+      }
+   }
+   else if (DO_TEX2) {
+      if (DO_PTEX) {
+	 ASSERT(HAVE_PTEX_VERTICES);
+	 setup_tab[IND].vertex_format = PROJ_TEX3_VERTEX_FORMAT;
+	 setup_tab[IND].vertex_size = 18;
+	 setup_tab[IND].vertex_stride_shift = 7;
+      }
+      else {
+	 setup_tab[IND].vertex_format = TEX2_VERTEX_FORMAT;
+	 setup_tab[IND].vertex_size = 12;
+	 setup_tab[IND].vertex_stride_shift = 6;
+      }
+   }
+   else if (DO_TEX1) {
+      if (DO_PTEX) {
+	 ASSERT(HAVE_PTEX_VERTICES);
+	 setup_tab[IND].vertex_format = PROJ_TEX1_VERTEX_FORMAT;
+	 setup_tab[IND].vertex_size = 12;
+	 setup_tab[IND].vertex_stride_shift = 6;
+      }
+      else {
+	 setup_tab[IND].vertex_format = TEX1_VERTEX_FORMAT;
+	 setup_tab[IND].vertex_size = 10;
+	 setup_tab[IND].vertex_stride_shift = 6;
+      }
+   }
+   else if (DO_TEX0) {
+      if (DO_PTEX && HAVE_PTEX_VERTICES) {
+	 setup_tab[IND].vertex_format = PROJ_TEX1_VERTEX_FORMAT;
+	 setup_tab[IND].vertex_size = 12;
+	 setup_tab[IND].vertex_stride_shift = 6;
+      } else {
+	 setup_tab[IND].vertex_format = TEX0_VERTEX_FORMAT;
+	 setup_tab[IND].vertex_size = 8;
+	 setup_tab[IND].vertex_stride_shift = 5;
+      }
+   }
+   else if (!HAVE_HW_DIVIDE && !DO_SPEC && !DO_FOG && HAVE_TINY_VERTICES) {
+      setup_tab[IND].vertex_format = TINY_VERTEX_FORMAT;
+      setup_tab[IND].vertex_size = 4;
+      setup_tab[IND].vertex_stride_shift = 4;
+   } else if (HAVE_NOTEX_VERTICES) {
+      setup_tab[IND].vertex_format = NOTEX_VERTEX_FORMAT;
+      setup_tab[IND].vertex_size = 6;
+      setup_tab[IND].vertex_stride_shift = 5;
+   } else {
+      setup_tab[IND].vertex_format = TEX0_VERTEX_FORMAT;
+      setup_tab[IND].vertex_size = 8;
+      setup_tab[IND].vertex_stride_shift = 5;
+   }
+
+   assert(setup_tab[IND].vertex_size * 4 <=
+          1 << setup_tab[IND].vertex_stride_shift);
+}
+
+
+#undef IND
+#undef TAG
diff --git a/reactos/lib/mesa32/src/drivers/common/t_dd_vertex.h b/reactos/lib/mesa32/src/drivers/common/t_dd_vertex.h
new file mode 100644
index 00000000000..d45dd09fbd7
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/common/t_dd_vertex.h
@@ -0,0 +1,78 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.0.3
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+typedef struct {
+   GLfloat x, y, z, w;
+} TAG(_coord_t);
+
+#ifdef COLOR_IS_RGBA
+typedef struct {
+#if defined(BYTE_ORDER) && defined(BIG_ENDIAN) && BYTE_ORDER == BIG_ENDIAN
+   GLubyte alpha, blue, green, red;
+#else
+   GLubyte red, green, blue, alpha;
+#endif
+} TAG(_color_t);
+#else
+typedef struct {
+#if defined(BYTE_ORDER) && defined(BIG_ENDIAN) && BYTE_ORDER == BIG_ENDIAN
+   GLubyte alpha, red, green, blue;
+#else
+   GLubyte blue, green, red, alpha;
+#endif
+} TAG(_color_t);
+#endif
+
+typedef union {
+   struct {
+      GLfloat x, y, z, w;
+      TAG(_color_t) color;
+      TAG(_color_t) specular;
+      GLfloat u0, v0;
+      GLfloat u1, v1;
+      GLfloat u2, v2;
+      GLfloat u3, v3;
+   } v;
+   struct {
+      GLfloat x, y, z, w;
+      TAG(_color_t) color;
+      TAG(_color_t) specular;
+      GLfloat u0, v0, q0;
+      GLfloat u1, v1, q1;
+      GLfloat u2, v2, q2;
+      GLfloat u3, v3, q3;
+   } pv;
+   struct {
+      GLfloat x, y, z;
+      TAG(_color_t) color;
+   } tv;
+   GLfloat f[24];
+   GLuint  ui[24];
+   GLubyte ub4[24][4];
+} TAG(Vertex), *TAG(VertexPtr);
+
diff --git a/reactos/lib/mesa32/src/drivers/dos/blit.S b/reactos/lib/mesa32/src/drivers/dos/blit.S
new file mode 100644
index 00000000000..1f1c77bd563
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/dos/blit.S
@@ -0,0 +1,210 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.0
+ * 
+ * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * DOS/DJGPP device driver v1.4 for Mesa
+ *
+ *  Copyright (C) 2002 - Borca Daniel
+ *  Email : dborca@yahoo.com
+ *  Web   : http://www.geocities.com/dborca
+ */
+
+
+#include "x86/assyntax.h"
+
+
+		FILE("blit.S")
+
+/*
+ * extern unsigned int vesa_gran_mask, vesa_gran_shift;
+ * extern int vl_video_selector;
+
+ * extern void *vl_current_draw_buffer;
+ * extern int vl_current_stride, vl_current_height;
+ * extern int vl_current_offset, vl_current_delta;
+ */
+EXTERN _vesa_gran_mask, _vesa_gran_shift
+EXTERN _vl_video_selector
+
+EXTERN _vl_current_draw_buffer
+EXTERN _vl_current_stride, _vl_current_height
+EXTERN _vl_current_offset, _vl_current_delta
+
+		SEG_TEXT
+		USE32
+
+/* Desc: VESA bank switching routine (BIOS)
+ *
+ * In  : EBX=0, EDX = bank number
+ * Out : -
+ *
+ * Note: thrashes EAX
+ */
+		ALIGNTEXT32
+_vesa_swbankBIOS:
+		MOV_W	(CONST(0x4f05), AX)
+		INT	(CONST(0x10))
+		RET
+
+		ALIGNTEXT8
+		GLOBL	_vesa_swbank
+_vesa_swbank:	D_LONG	_vesa_swbankBIOS
+
+/* Desc: void vesa_b_dump_virtual (void);
+ *
+ * In  : -
+ * Out : -
+ *
+ * Note: uses current draw buffer
+ */
+		ALIGNTEXT32
+		GLOBL	_vesa_b_dump_virtual
+_vesa_b_dump_virtual:
+		CLD
+		PUSH_SR	(ES)
+		PUSH_L	(EBX)
+		PUSH_L	(ESI)
+		PUSH_L	(EDI)
+		PUSH_L	(EBP)
+		MOV_SR	(CONTENT(_vl_video_selector), ES)
+		MOV_L	(CONTENT(_vl_current_draw_buffer), ESI)
+		MOV_L	(CONTENT(_vl_current_offset), EDI)
+		MOV_L	(CONTENT(_vesa_gran_shift), ECX)
+		MOV_L	(CONTENT(_vesa_gran_mask), EBP)
+		MOV_L	(EDI, EDX)
+		XOR_L	(EBX, EBX)
+		AND_L	(EBP, EDI)
+		SHR_L	(CL, EDX)
+		INC_L	(EBP)
+		CALL	(VARINDIRECT(_vesa_swbank))
+		MOV_L	(CONTENT(_vl_current_stride), ECX)
+		MOV_L	(CONTENT(_vl_current_height), EAX)
+		MOV_L	(CONTENT(_vl_current_delta), EBX)
+		SHR_L	(CONST(2), ECX)
+		ALIGNTEXT4
+	TLBL(0):
+		PUSH_L	(ECX)
+		ALIGNTEXT4
+	TLBL(1):
+		CMP_L	(EBP, EDI)
+		jb	TLBL(2)
+		PUSH_L	(EAX)
+		PUSH_L	(EBX)
+		INC_L	(EDX)
+		XOR_L	(EBX, EBX)
+		CALL	(VARINDIRECT(_vesa_swbank))
+		POP_L	(EBX)
+		POP_L	(EAX)
+		SUB_L	(EBP, EDI)
+		ALIGNTEXT4
+	TLBL(2):
+		MOVS_L
+		DEC_L	(ECX)
+		jnz	TLBL(1)
+		POP_L	(ECX)
+		ADD_L	(EBX, EDI)
+		DEC_L	(EAX)
+		jnz	TLBL(0)
+		POP_L	(EBP)
+		POP_L	(EDI)
+		POP_L	(ESI)
+		POP_L	(EBX)
+		POP_SR	(ES)
+		RET
+
+/* Desc: void vesa_l_dump_virtual (void);
+ *
+ * In  : -
+ * Out : -
+ *
+ * Note: uses current draw buffer
+ */
+		ALIGNTEXT32
+		GLOBL	_vesa_l_dump_virtual
+_vesa_l_dump_virtual:
+		CLD
+		PUSH_SR	(ES)
+		PUSH_L	(ESI)
+		PUSH_L	(EDI)
+		MOV_SR	(CONTENT(_vl_video_selector), ES)
+		MOV_L	(CONTENT(_vl_current_draw_buffer), ESI)
+		MOV_L	(CONTENT(_vl_current_offset), EDI)
+		MOV_L	(CONTENT(_vl_current_stride), ECX)
+		MOV_L	(CONTENT(_vl_current_height), EDX)
+		MOV_L	(CONTENT(_vl_current_delta), EAX)
+		SHR_L	(CONST(2), ECX)
+		ALIGNTEXT4
+	TLBL(0):
+		PUSH_L	(ECX)
+		REP	MOVS_L
+		POP_L	(ECX)
+		ADD_L	(EAX, EDI)
+		DEC_L	(EDX)
+		jnz	TLBL(0)
+		POP_L	(EDI)
+		POP_L	(ESI)
+		POP_SR	(ES)
+		RET
+
+/* Desc: void vesa_l_dump_virtual_mmx (void);
+ *
+ * In  : -
+ * Out : -
+ *
+ * Note: uses current draw buffer
+ */
+		ALIGNTEXT32
+		GLOBL	_vesa_l_dump_virtual_mmx
+_vesa_l_dump_virtual_mmx:
+#ifdef USE_MMX_ASM
+		PUSH_L	(ESI)
+		PUSH_L	(EDI)
+		MOV_SR	(CONTENT(_vl_video_selector), FS)
+		MOV_L	(CONTENT(_vl_current_draw_buffer), ESI)
+		MOV_L	(CONTENT(_vl_current_offset), EDI)
+		MOV_L	(CONTENT(_vl_current_stride), ECX)
+		MOV_L	(CONTENT(_vl_current_height), EDX)
+		MOV_L	(CONTENT(_vl_current_delta), EAX)
+		SHR_L	(CONST(3), ECX)
+		ALIGNTEXT4
+	TLBL(0):
+		PUSH_L	(ECX)
+		ALIGNTEXT4
+	TLBL(1):
+		MOVQ	(REGIND(ESI), MM0)
+		ADD_L	(CONST(8), ESI)
+		SEGFS
+		MOVQ	(MM0, REGIND(EDI))
+		ADD_L	(CONST(8), EDI)
+		DEC_L	(ECX)
+		jnz	TLBL(1)
+		POP_L	(ECX)
+		ADD_L	(EAX, EDI)
+		DEC_L	(EDX)
+		jnz	TLBL(0)
+		POP_L	(EDI)
+		POP_L	(ESI)
+		EMMS
+#endif
+		RET
diff --git a/reactos/lib/mesa32/src/drivers/dos/dmesa.c b/reactos/lib/mesa32/src/drivers/dos/dmesa.c
new file mode 100644
index 00000000000..54323713864
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/dos/dmesa.c
@@ -0,0 +1,1418 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ * 
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * DOS/DJGPP device driver v1.5 for Mesa
+ *
+ *  Copyright (c) 2003 - Borca Daniel
+ *  Email : dborca@users.sourceforge.net
+ *  Web   : http://www.geocities.com/dborca
+ */
+
+
+#include "glheader.h"
+#include "context.h"
+#ifndef FX
+#include "bufferobj.h"
+#include "extensions.h"
+#include "macros.h"
+#include "matrix.h"
+#include "mtypes.h"
+#include "texformat.h"
+#include "teximage.h"
+#include "texstore.h"
+#include "imports.h"
+#include "array_cache/acache.h"
+#include "swrast/s_context.h"
+#include "swrast/s_depth.h"
+#include "swrast/s_lines.h"
+#include "swrast/s_triangle.h"
+#include "swrast/swrast.h"
+#include "swrast_setup/swrast_setup.h"
+#include "tnl/tnl.h"
+#include "tnl/t_context.h"
+#include "tnl/t_pipeline.h"
+#include "video.h"
+#else  /* FX */
+#include "GL/fxmesa.h"
+#endif /* FX */
+
+#include "GL/dmesa.h"
+
+
+
+/*
+ * In C++ terms, this class derives from the GLvisual class.
+ * Add system-specific fields to it.
+ */
+struct dmesa_visual {
+   GLvisual gl_visual;
+   GLboolean db_flag;           /* double buffered? */
+   GLboolean rgb_flag;          /* RGB mode? */
+   GLboolean sw_alpha;          /* use Mesa's alpha buffer? */
+   GLuint depth;                /* bits per pixel (1, 8, 24, etc) */
+   int zbuffer;                 /* Z=buffer: 0=no, 1=SW, -1=HW */
+};
+
+/*
+ * In C++ terms, this class derives from the GLframebuffer class.
+ * Add system-specific fields to it.
+ */
+struct dmesa_buffer {
+   GLframebuffer gl_buffer;     /* The depth, stencil, accum, etc buffers */
+   void *the_window;            /* your window handle, etc */
+
+   int xpos, ypos;              /* position */
+   int width, height;           /* size in pixels */
+};
+
+/*
+ * In C++ terms, this class derives from the GLcontext class.
+ * Add system-specific fields to it.
+ */
+struct dmesa_context {
+   GLcontext gl_ctx;            /* the core library context */
+   DMesaVisual visual;
+   DMesaBuffer Buffer;
+   GLuint ClearColor;
+   GLuint ClearIndex;
+   /* etc... */
+};
+
+
+
+#ifndef FX
+/****************************************************************************
+ * Read/Write pixels
+ ***************************************************************************/
+#define FLIP(y)  (dmesa->Buffer->height - (y) - 1)
+#define FLIP2(y) (_b_ - (y))
+
+#define DSTRIDE dmesa->Buffer->width
+
+/****************************************************************************
+ * RGB[A]
+ ***************************************************************************/
+static void write_rgba_span (const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                             const GLubyte rgba[][4], const GLubyte mask[])
+{
+ const DMesaContext dmesa = (DMesaContext)ctx;
+ GLuint i, offset;
+
+ offset = DSTRIDE * FLIP(y) + x;
+ if (mask) {
+    /* draw some pixels */
+    for (i=0; i<n; i++, offset++) {
+        if (mask[i]) {
+           vl_putpixel(offset, vl_mixrgba(rgba[i]));
+        }
+    }
+ } else {
+    /* draw all pixels */
+    for (i=0; i<n; i++, offset++) {
+        vl_putpixel(offset, vl_mixrgba(rgba[i]));
+    }
+ }
+}
+
+
+
+static void write_rgb_span (const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                            const GLubyte rgb[][3], const GLubyte mask[])
+{
+ const DMesaContext dmesa = (DMesaContext)ctx;
+ GLuint i, offset;
+
+ offset = DSTRIDE * FLIP(y) + x;
+ if (mask) {
+    /* draw some pixels */
+    for (i=0; i<n; i++, offset++) {
+        if (mask[i]) {
+           vl_putpixel(offset, vl_mixrgb(rgb[i]));
+        }
+    }
+ } else {
+    /* draw all pixels */
+    for (i=0; i<n; i++, offset++) {
+        vl_putpixel(offset, vl_mixrgb(rgb[i]));
+    }
+ }
+}
+
+
+
+static void write_mono_rgba_span (const GLcontext *ctx,
+                                  GLuint n, GLint x, GLint y,
+                                  const GLchan color[4], const GLubyte mask[])
+{
+ const DMesaContext dmesa = (DMesaContext)ctx;
+ GLuint i, offset, rgba = vl_mixrgba(color);
+
+ offset = DSTRIDE * FLIP(y) + x;
+ if (mask) {
+    /* draw some pixels */
+    for (i=0; i<n; i++, offset++) {
+        if (mask[i]) {
+           vl_putpixel(offset, rgba);
+        }
+    }
+ } else {
+    /* draw all pixels */
+    for (i=0; i<n; i++, offset++) {
+        vl_putpixel(offset, rgba);
+    }
+ }
+}
+
+
+
+static void read_rgba_span (const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                            GLubyte rgba[][4])
+{
+ const DMesaContext dmesa = (DMesaContext)ctx;
+ GLuint i, offset;
+
+ offset = DSTRIDE * FLIP(y) + x;
+ /* read all pixels */
+ for (i=0; i<n; i++, offset++) {
+     vl_getrgba(offset, rgba[i]);
+ }
+}
+
+
+
+static void write_rgba_pixels (const GLcontext *ctx,
+                               GLuint n, const GLint x[], const GLint y[],
+                               const GLubyte rgba[][4], const GLubyte mask[])
+{
+ const DMesaContext dmesa = (DMesaContext)ctx;
+ GLuint i, _w_ = DSTRIDE, _b_ = dmesa->Buffer->height - 1;
+
+ if (mask) {
+    /* draw some pixels */
+    for (i=0; i<n; i++) {
+        if (mask[i]) {
+           vl_putpixel(FLIP2(y[i])*_w_ + x[i], vl_mixrgba(rgba[i]));
+        }
+    }
+ } else {
+    /* draw all pixels */
+    for (i=0; i<n; i++) {
+        vl_putpixel(FLIP2(y[i])*_w_ + x[i], vl_mixrgba(rgba[i]));
+    }
+ }
+}
+
+
+
+static void write_mono_rgba_pixels (const GLcontext *ctx,
+                                    GLuint n, const GLint x[], const GLint y[],
+                                    const GLchan color[4], const GLubyte mask[])
+{
+ const DMesaContext dmesa = (DMesaContext)ctx;
+ GLuint i, _w_ = DSTRIDE, _b_ = dmesa->Buffer->height - 1, rgba = vl_mixrgba(color);
+
+ if (mask) {
+    /* draw some pixels */
+    for (i=0; i<n; i++) {
+        if (mask[i]) {
+           vl_putpixel(FLIP2(y[i])*_w_ + x[i], rgba);
+        }
+    }
+ } else {
+    /* draw all pixels */
+    for (i=0; i<n; i++) {
+        vl_putpixel(FLIP2(y[i])*_w_ + x[i], rgba);
+    }
+ }
+}
+
+
+
+static void read_rgba_pixels (const GLcontext *ctx,
+                              GLuint n, const GLint x[], const GLint y[],
+                              GLubyte rgba[][4], const GLubyte mask[])
+{
+ const DMesaContext dmesa = (DMesaContext)ctx;
+ GLuint i, _w_ = DSTRIDE, _b_ = dmesa->Buffer->height - 1;
+
+ if (mask) {
+    /* read some pixels */
+    for (i=0; i<n; i++) {
+        if (mask[i]) {
+           vl_getrgba(FLIP2(y[i])*_w_ + x[i], rgba[i]);
+        }
+    }
+ } else {
+    /* read all pixels */
+    for (i=0; i<n; i++) {
+        vl_getrgba(FLIP2(y[i])*_w_ + x[i], rgba[i]);
+    }
+ }
+}
+
+
+
+/****************************************************************************
+ * Index
+ ***************************************************************************/
+static void write_index_span (const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                              const GLuint index[], const GLubyte mask[])
+{
+ const DMesaContext dmesa = (DMesaContext)ctx;
+ GLuint i, offset;
+
+ offset = DSTRIDE * FLIP(y) + x;
+ if (mask) {
+    /* draw some pixels */
+    for (i=0; i<n; i++, offset++) {
+        if (mask[i]) {
+           vl_putpixel(offset, index[i]);
+        }
+    }
+ } else {
+    /* draw all pixels */
+    for (i=0; i<n; i++, offset++) {
+        vl_putpixel(offset, index[i]);
+    }
+ }
+}
+
+
+
+static void write_index8_span (const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                               const GLubyte index[], const GLubyte mask[])
+{
+ const DMesaContext dmesa = (DMesaContext)ctx;
+ GLuint i, offset;
+
+ offset = DSTRIDE * FLIP(y) + x;
+ if (mask) {
+    /* draw some pixels */
+    for (i=0; i<n; i++, offset++) {
+        if (mask[i]) {
+           vl_putpixel(offset, index[i]);
+        }
+    }
+ } else {
+    /* draw all pixels */
+    for (i=0; i<n; i++, offset++) {
+        vl_putpixel(offset, index[i]);
+    }
+ }
+}
+
+
+
+static void write_mono_index_span (const GLcontext *ctx,
+                                   GLuint n, GLint x, GLint y,
+                                   GLuint colorIndex, const GLubyte mask[])
+{
+ const DMesaContext dmesa = (DMesaContext)ctx;
+ GLuint i, offset;
+
+ offset = DSTRIDE * FLIP(y) + x;
+ if (mask) {
+    /* draw some pixels */
+    for (i=0; i<n; i++, offset++) {
+        if (mask[i]) {
+           vl_putpixel(offset, colorIndex);
+        }
+    }
+ } else {
+    /* draw all pixels */
+    for (i=0; i<n; i++, offset++) {
+        vl_putpixel(offset, colorIndex);
+    }
+ }
+}
+
+
+
+static void read_index_span (const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                             GLuint index[])
+{
+ const DMesaContext dmesa = (DMesaContext)ctx;
+ GLuint i, offset;
+
+ offset = DSTRIDE * FLIP(y) + x;
+ /* read all pixels */
+ for (i=0; i<n; i++, offset++) {
+     index[i] = vl_getpixel(offset);
+ }
+}
+
+
+
+static void write_index_pixels (const GLcontext *ctx,
+                                GLuint n, const GLint x[], const GLint y[],
+                                const GLuint index[], const GLubyte mask[])
+{
+ const DMesaContext dmesa = (DMesaContext)ctx;
+ GLuint i, _w_ = DSTRIDE, _b_ = dmesa->Buffer->height - 1;
+
+ if (mask) {
+    /* draw some pixels */
+    for (i=0; i<n; i++) {
+        if (mask[i]) {
+           vl_putpixel(FLIP2(y[i])*_w_ + x[i], index[i]);
+        }
+    }
+ } else {
+    /* draw all pixels */
+    for (i=0; i<n; i++) {
+        vl_putpixel(FLIP2(y[i])*_w_ + x[i], index[i]);
+    }
+ }
+}
+
+
+
+static void write_mono_index_pixels (const GLcontext *ctx,
+                                     GLuint n, const GLint x[], const GLint y[],
+                                     GLuint colorIndex, const GLubyte mask[])
+{
+ const DMesaContext dmesa = (DMesaContext)ctx;
+ GLuint i, _w_ = DSTRIDE, _b_ = dmesa->Buffer->height - 1;
+
+ if (mask) {
+    /* draw some pixels */
+    for (i=0; i<n; i++) {
+        if (mask[i]) {
+           vl_putpixel(FLIP2(y[i])*_w_ + x[i], colorIndex);
+        }
+    }
+ } else {
+    /* draw all pixels */
+    for (i=0; i<n; i++) {
+        vl_putpixel(FLIP2(y[i])*_w_ + x[i], colorIndex);
+    }
+ }
+}
+
+
+
+static void read_index_pixels (const GLcontext *ctx,
+                               GLuint n, const GLint x[], const GLint y[],
+                               GLuint index[], const GLubyte mask[])
+{
+ const DMesaContext dmesa = (DMesaContext)ctx;
+ GLuint i, _w_ = DSTRIDE, _b_ = dmesa->Buffer->height - 1;
+
+ if (mask) {
+    /* read some pixels */
+    for (i=0; i<n; i++) {
+        if (mask[i]) {
+           index[i] = vl_getpixel(FLIP2(y[i])*_w_ + x[i]);
+        }
+    }
+ } else {
+    /* read all pixels */
+    for (i=0; i<n; i++) {
+        index[i] = vl_getpixel(FLIP2(y[i])*_w_ + x[i]);
+    }
+ }
+}
+
+
+
+/****************************************************************************
+ * Z-buffer
+ ***************************************************************************/
+
+
+
+/****************************************************************************
+ * Optimized triangle rendering
+ ***************************************************************************/
+
+/*
+ * NON-depth-buffered flat triangle.
+ */
+#define NAME tri_rgb_flat
+
+#define SETUP_CODE \
+ const DMesaContext dmesa = (DMesaContext)ctx; \
+ GLuint _b_ = dmesa->Buffer->height - 1; \
+ GLuint _w_ = dmesa->Buffer->width; \
+ GLuint rgb = vl_mixrgb(v2->color);
+
+#define RENDER_SPAN(span) \
+ GLuint i, offset = FLIP2(span.y)*_w_ + span.x;	\
+ for (i = 0; i < span.end; i++, offset++) {	\
+     vl_putpixel(offset, rgb);			\
+ }
+
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * Z-less flat triangle.
+ */
+#define NAME tri_rgb_flat_zless
+
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+
+#define SETUP_CODE \
+ const DMesaContext dmesa = (DMesaContext)ctx; \
+ GLuint _b_ = dmesa->Buffer->height - 1; \
+ GLuint _w_ = dmesa->Buffer->width; \
+ GLuint rgb = vl_mixrgb(v2->color);
+
+#define RENDER_SPAN(span) \
+ GLuint i, offset = FLIP2(span.y)*_w_ + span.x;	\
+ for (i = 0; i < span.end; i++, offset++) {	\
+     const DEPTH_TYPE z = FixedToDepth(span.z);	\
+     if (z < zRow[i]) {				\
+        vl_putpixel(offset, rgb);		\
+        zRow[i] = z;				\
+     }						\
+     span.z += span.zStep;			\
+ }
+
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * NON-depth-buffered iterated triangle.
+ */
+#define NAME tri_rgb_iter
+
+#define INTERP_RGB 1
+
+#define SETUP_CODE \
+ const DMesaContext dmesa = (DMesaContext)ctx; \
+ GLuint _b_ = dmesa->Buffer->height - 1; \
+ GLuint _w_ = dmesa->Buffer->width;
+
+#define RENDER_SPAN(span) \
+ GLuint i, offset = FLIP2(span.y)*_w_ + span.x;				\
+ for (i = 0; i < span.end; i++, offset++) {				\
+     vl_putpixel(offset, vl_mixfix(span.red, span.green, span.blue));	\
+     span.red += span.redStep;						\
+     span.green += span.greenStep;					\
+     span.blue += span.blueStep;					\
+ }
+
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * Z-less iterated triangle.
+ */
+#define NAME tri_rgb_iter_zless
+
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define INTERP_RGB 1
+
+#define SETUP_CODE \
+ const DMesaContext dmesa = (DMesaContext)ctx; \
+ GLuint _b_ = dmesa->Buffer->height - 1; \
+ GLuint _w_ = dmesa->Buffer->width;
+
+#define RENDER_SPAN(span) \
+ GLuint i, offset = FLIP2(span.y)*_w_ + span.x;				\
+ for (i = 0; i < span.end; i++, offset++) {				\
+     const DEPTH_TYPE z = FixedToDepth(span.z);				\
+     if (z < zRow[i]) {							\
+        vl_putpixel(offset, vl_mixfix(span.red, span.green, span.blue));\
+        zRow[i] = z;							\
+     }									\
+     span.red += span.redStep;						\
+     span.green += span.greenStep;					\
+     span.blue += span.blueStep;					\
+     span.z += span.zStep;						\
+ }
+
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * Analyze context state to see if we can provide a fast triangle function
+ * Otherwise, return NULL.
+ */
+static swrast_tri_func dmesa_choose_tri_function (GLcontext *ctx)
+{
+ const SWcontext *swrast = SWRAST_CONTEXT(ctx);
+
+ if ((ctx->RenderMode != GL_RENDER)
+     || (ctx->Polygon.SmoothFlag)
+     || (ctx->Polygon.StippleFlag)
+     || (ctx->Texture._EnabledUnits)
+     || (swrast->_RasterMask & MULTI_DRAW_BIT)
+     || (ctx->Polygon.CullFlag && ctx->Polygon.CullFaceMode == GL_FRONT_AND_BACK)) {
+    return (swrast_tri_func)NULL;
+ }
+
+ if (swrast->_RasterMask==DEPTH_BIT
+     && ctx->Depth.Func==GL_LESS
+     && ctx->Depth.Mask==GL_TRUE
+     && ctx->Visual.depthBits == DEFAULT_SOFTWARE_DEPTH_BITS) {
+    return (ctx->Light.ShadeModel==GL_SMOOTH) ? tri_rgb_iter_zless : tri_rgb_flat_zless;
+ }
+
+ if (swrast->_RasterMask==0) { /* no depth test */
+    return (ctx->Light.ShadeModel==GL_SMOOTH) ? tri_rgb_iter : tri_rgb_flat;
+ }
+
+ return (swrast_tri_func)NULL;
+}
+
+
+
+/* Override for the swrast triangle-selection function.  Try to use one
+ * of our internal triangle functions, otherwise fall back to the
+ * standard swrast functions.
+ */
+static void dmesa_choose_tri (GLcontext *ctx)
+{
+ SWcontext *swrast = SWRAST_CONTEXT(ctx);
+
+ if (!(swrast->Triangle=dmesa_choose_tri_function(ctx)))
+    _swrast_choose_triangle(ctx);
+}
+
+
+
+/****************************************************************************
+ * Optimized line rendering
+ ***************************************************************************/
+
+/*
+ * NON-depth-buffered flat line.
+ */
+#define NAME line_rgb_flat
+
+#define INTERP_XY 1
+#define CLIP_HACK 1
+
+#define SETUP_CODE \
+ const DMesaContext dmesa = (DMesaContext)ctx; \
+ GLuint _b_ = dmesa->Buffer->height - 1; \
+ GLuint _w_ = dmesa->Buffer->width; \
+ GLuint rgb = vl_mixrgb(vert1->color);
+
+#define PLOT(X,Y) vl_putpixel(FLIP2(Y) * _w_ + X, rgb);
+
+#include "swrast/s_linetemp.h"
+
+
+
+/*
+ * Z-less flat line.
+ */
+#define NAME line_rgb_flat_zless
+
+#define INTERP_XY 1
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define CLIP_HACK 1
+
+#define SETUP_CODE \
+ const DMesaContext dmesa = (DMesaContext)ctx; \
+ GLuint _b_ = dmesa->Buffer->height - 1; \
+ GLuint _w_ = dmesa->Buffer->width; \
+ GLuint rgb = vl_mixrgb(vert1->color);
+
+#define PLOT(X,Y) \
+ if (Z < *zPtr) {				\
+    *zPtr = Z;					\
+    vl_putpixel(FLIP2(Y) * _w_ + X, rgb);	\
+ }
+
+#include "swrast/s_linetemp.h"
+
+
+
+/*
+ * NON-depth-buffered iterated line.
+ */
+#define line_rgb_iter NULL
+
+
+
+/*
+ * Z-less iterated line.
+ */
+#define line_rgb_iter_zless NULL
+
+
+
+/*
+ * Analyze context state to see if we can provide a fast line function
+ * Otherwise, return NULL.
+ */
+static swrast_line_func dmesa_choose_line_function (GLcontext *ctx)
+{
+ const SWcontext *swrast = SWRAST_CONTEXT(ctx);
+
+ if ((ctx->RenderMode != GL_RENDER)
+     || (ctx->Line.SmoothFlag)
+     || (ctx->Texture._EnabledUnits)
+     || (ctx->Line.StippleFlag)
+     || (swrast->_RasterMask & MULTI_DRAW_BIT)
+     || (ctx->Line.Width!=1.0F)) {
+    return (swrast_line_func)NULL;
+ }
+
+ if (swrast->_RasterMask==DEPTH_BIT
+     && ctx->Depth.Func==GL_LESS
+     && ctx->Depth.Mask==GL_TRUE
+     && ctx->Visual.depthBits == DEFAULT_SOFTWARE_DEPTH_BITS) {
+    return (ctx->Light.ShadeModel==GL_SMOOTH) ? line_rgb_iter_zless : line_rgb_flat_zless;
+ }
+
+ if (swrast->_RasterMask==0) { /* no depth test */
+    return (ctx->Light.ShadeModel==GL_SMOOTH) ? line_rgb_iter : line_rgb_flat;
+ }
+
+ return (swrast_line_func)NULL;
+}
+
+
+
+/* Override for the swrast line-selection function.  Try to use one
+ * of our internal line functions, otherwise fall back to the
+ * standard swrast functions.
+ */
+static void dmesa_choose_line (GLcontext *ctx)
+{
+ SWcontext *swrast = SWRAST_CONTEXT(ctx);
+
+ if (!(swrast->Line=dmesa_choose_line_function(ctx)))
+    _swrast_choose_line(ctx);
+}
+
+
+
+/****************************************************************************
+ * Miscellaneous device driver funcs
+ ***************************************************************************/
+
+static void clear_index (GLcontext *ctx, GLuint index)
+{
+ ((DMesaContext)ctx)->ClearIndex = index;
+}
+
+static void clear_color (GLcontext *ctx, const GLfloat color[4])
+{
+ GLubyte col[4];
+ CLAMPED_FLOAT_TO_UBYTE(col[0], color[0]);
+ CLAMPED_FLOAT_TO_UBYTE(col[1], color[1]);
+ CLAMPED_FLOAT_TO_UBYTE(col[2], color[2]);
+ CLAMPED_FLOAT_TO_UBYTE(col[3], color[3]);
+ ((DMesaContext)ctx)->ClearColor = vl_mixrgba(col);
+}
+
+
+
+static void clear (GLcontext *ctx, GLbitfield mask, GLboolean all,
+                   GLint x, GLint y, GLint width, GLint height)
+{
+ const DMesaContext c = (DMesaContext)ctx;
+ const GLuint *colorMask = (GLuint *)&ctx->Color.ColorMask;
+
+/*
+ * Clear the specified region of the buffers indicated by 'mask'
+ * using the clear color or index as specified by one of the two
+ * functions above.
+ * If all==GL_TRUE, clear whole buffer, else just clear region defined
+ * by x,y,width,height
+ */
+
+ /* we can't handle color or index masking */
+ if ((*colorMask == 0xffffffff) && (ctx->Color.IndexMask == 0xffffffff)) {
+    if (mask & DD_BACK_LEFT_BIT) {
+       int color = c->visual->rgb_flag ? c->ClearColor : c->ClearIndex;
+
+       if (all) {
+          vl_clear(color);
+       } else {
+          vl_rect(x, y, width, height, color);
+       }
+
+       mask &= ~DD_BACK_LEFT_BIT;
+    }
+ }
+
+ if (mask) {
+    _swrast_Clear(ctx, mask, all, x, y, width, height);
+ }
+}
+
+
+
+/*
+ * This function is called to specify which buffer to read and write
+ * for software rasterization (swrast) fallbacks.  This doesn't necessarily
+ * correspond to glDrawBuffer() or glReadBuffer() calls.
+ */
+static void set_buffer (GLcontext *ctx, GLframebuffer *colorBuffer, GLuint bufferBit)
+{
+ /*
+  * XXX todo - examine bufferBit and set read/write pointers
+  */
+ /* Normally, we would have
+  *    ctx->Driver.ReadBuffer == set_read_buffer
+  *    ctx->Driver.DrawBuffer == set_draw_buffer
+  * and make sure set_draw_buffer calls _swrast_DrawBuffer,
+  * which in turn will call this routine via dd->SetBuffer.
+  */
+}
+
+
+
+/*
+ * Return the width and height of the current buffer.
+ * If anything special has to been done when the buffer/window is
+ * resized, do it now.
+ */
+static void get_buffer_size (GLframebuffer *buffer, GLuint *width, GLuint *height)
+{
+ DMesaBuffer b = (DMesaBuffer)buffer;
+
+ *width  = b->width;
+ *height = b->height;
+}
+
+
+
+static const GLubyte* get_string (GLcontext *ctx, GLenum name)
+{
+ switch (name) {
+        case GL_RENDERER:
+             return (const GLubyte *)"Mesa DJGPP"
+                                     "\0port (c) Borca Daniel dec-2003";
+        default:
+             return NULL;
+ }
+}
+
+
+
+static void finish (GLcontext *ctx)
+{
+ /*
+  * XXX todo - OPTIONAL FUNCTION: implements glFinish if possible
+  */
+}
+
+
+
+static void flush (GLcontext *ctx)
+{
+ /*
+  * XXX todo - OPTIONAL FUNCTION: implements glFlush if possible
+  */
+}
+
+
+
+/****************************************************************************
+ * State
+ ***************************************************************************/
+#define DMESA_NEW_LINE   (_NEW_LINE | \
+                          _NEW_TEXTURE | \
+                          _NEW_LIGHT | \
+                          _NEW_DEPTH | \
+                          _NEW_RENDERMODE | \
+                          _SWRAST_NEW_RASTERMASK)
+
+#define DMESA_NEW_TRIANGLE (_NEW_POLYGON | \
+                            _NEW_TEXTURE | \
+                            _NEW_LIGHT | \
+                            _NEW_DEPTH | \
+                            _NEW_RENDERMODE | \
+                            _SWRAST_NEW_RASTERMASK)
+
+/* Extend the software rasterizer with our line and triangle
+ * functions.
+ */
+static void dmesa_register_swrast_functions (GLcontext *ctx)
+{
+ SWcontext *swrast = SWRAST_CONTEXT(ctx);
+
+ swrast->choose_line = dmesa_choose_line;
+ swrast->choose_triangle = dmesa_choose_tri;
+
+ swrast->invalidate_line |= DMESA_NEW_LINE;
+ swrast->invalidate_triangle |= DMESA_NEW_TRIANGLE;
+}
+
+
+
+/* Setup pointers and other driver state that is constant for the life
+ * of a context.
+ */
+static void dmesa_init_pointers (GLcontext *ctx)
+{
+ TNLcontext *tnl;
+ struct swrast_device_driver *dd = _swrast_GetDeviceDriverReference(ctx);
+
+ ctx->Driver.GetString = get_string;
+ ctx->Driver.GetBufferSize = get_buffer_size;
+ ctx->Driver.Flush = flush;
+ ctx->Driver.Finish = finish;
+    
+ /* Software rasterizer pixel paths:
+  */
+ ctx->Driver.Accum = _swrast_Accum;
+ ctx->Driver.Bitmap = _swrast_Bitmap;
+ ctx->Driver.Clear = clear;
+ ctx->Driver.ResizeBuffers = _swrast_alloc_buffers;
+ ctx->Driver.CopyPixels = _swrast_CopyPixels;
+ ctx->Driver.DrawPixels = _swrast_DrawPixels;
+ ctx->Driver.ReadPixels = _swrast_ReadPixels;
+ ctx->Driver.DrawBuffer = _swrast_DrawBuffer;
+
+ /* Software texture functions:
+  */
+ ctx->Driver.ChooseTextureFormat = _mesa_choose_tex_format;
+ ctx->Driver.TexImage1D = _mesa_store_teximage1d;
+ ctx->Driver.TexImage2D = _mesa_store_teximage2d;
+ ctx->Driver.TexImage3D = _mesa_store_teximage3d;
+ ctx->Driver.TexSubImage1D = _mesa_store_texsubimage1d;
+ ctx->Driver.TexSubImage2D = _mesa_store_texsubimage2d;
+ ctx->Driver.TexSubImage3D = _mesa_store_texsubimage3d;
+ ctx->Driver.TestProxyTexImage = _mesa_test_proxy_teximage;
+
+ ctx->Driver.CopyTexImage1D = _swrast_copy_teximage1d;
+ ctx->Driver.CopyTexImage2D = _swrast_copy_teximage2d;
+ ctx->Driver.CopyTexSubImage1D = _swrast_copy_texsubimage1d;
+ ctx->Driver.CopyTexSubImage2D = _swrast_copy_texsubimage2d;
+ ctx->Driver.CopyTexSubImage3D = _swrast_copy_texsubimage3d;
+
+ ctx->Driver.CompressedTexImage1D = _mesa_store_compressed_teximage1d;
+ ctx->Driver.CompressedTexImage2D = _mesa_store_compressed_teximage2d;
+ ctx->Driver.CompressedTexImage3D = _mesa_store_compressed_teximage3d;
+ ctx->Driver.CompressedTexSubImage1D = _mesa_store_compressed_texsubimage1d;
+ ctx->Driver.CompressedTexSubImage2D = _mesa_store_compressed_texsubimage2d;
+ ctx->Driver.CompressedTexSubImage3D = _mesa_store_compressed_texsubimage3d;
+
+ /* Swrast hooks for imaging extensions:
+  */
+ ctx->Driver.CopyColorTable = _swrast_CopyColorTable;
+ ctx->Driver.CopyColorSubTable = _swrast_CopyColorSubTable;
+ ctx->Driver.CopyConvolutionFilter1D = _swrast_CopyConvolutionFilter1D;
+ ctx->Driver.CopyConvolutionFilter2D = _swrast_CopyConvolutionFilter2D;
+
+ /* Statechange callbacks:
+  */
+ ctx->Driver.ClearColor = clear_color;
+ ctx->Driver.ClearIndex = clear_index;
+
+ /* Initialize the TNL driver interface:
+  */
+ tnl = TNL_CONTEXT(ctx);
+ tnl->Driver.RunPipeline = _tnl_run_pipeline;
+
+ dd->SetBuffer = set_buffer;
+   
+ /* Install swsetup for tnl->Driver.Render.*:
+  */
+ _swsetup_Wakeup(ctx);
+
+ /* The span functions should be in `dmesa_update_state', but I'm
+  * pretty sure they will never change during the life of the Visual
+  */
+
+ /* Index span/pixel functions */
+ dd->WriteCI32Span = write_index_span;
+ dd->WriteCI8Span = write_index8_span;
+ dd->WriteMonoCISpan = write_mono_index_span;
+ dd->WriteCI32Pixels = write_index_pixels;
+ dd->WriteMonoCIPixels = write_mono_index_pixels;
+ dd->ReadCI32Span = read_index_span;
+ dd->ReadCI32Pixels = read_index_pixels;
+
+ /* RGB(A) span/pixel functions */
+ dd->WriteRGBASpan = write_rgba_span;
+ dd->WriteRGBSpan = write_rgb_span;
+ dd->WriteMonoRGBASpan = write_mono_rgba_span;
+ dd->WriteRGBAPixels = write_rgba_pixels;
+ dd->WriteMonoRGBAPixels = write_mono_rgba_pixels;
+ dd->ReadRGBASpan = read_rgba_span;
+ dd->ReadRGBAPixels = read_rgba_pixels;
+}
+
+
+
+static void dmesa_update_state (GLcontext *ctx, GLuint new_state)
+{
+ /* Propagate statechange information to swrast and swrast_setup
+  * modules. The DMesa driver has no internal GL-dependent state.
+  */
+ _swrast_InvalidateState( ctx, new_state );
+ _ac_InvalidateState( ctx, new_state );
+ _tnl_InvalidateState( ctx, new_state );
+ _swsetup_InvalidateState( ctx, new_state );
+}
+#endif /* FX */
+
+
+
+/****************************************************************************
+ * DMesa Public API Functions
+ ***************************************************************************/
+
+/*
+ * The exact arguments to this function will depend on your window system
+ */
+DMesaVisual DMesaCreateVisual (GLint width,
+                               GLint height,
+                               GLint colDepth,
+                               GLint refresh,
+                               GLboolean dbFlag,
+                               GLboolean rgbFlag,
+                               GLint alphaSize,
+                               GLint depthSize,
+                               GLint stencilSize,
+                               GLint accumSize)
+{
+#ifndef FX
+ DMesaVisual v;
+ GLint redBits, greenBits, blueBits, alphaBits, indexBits;
+ GLboolean sw_alpha;
+
+ if (!dbFlag) {
+    return NULL;
+ }
+
+ alphaBits = 0;
+
+ if (!rgbFlag) {
+    indexBits = 8;
+    redBits = 0;
+    greenBits = 0;
+    blueBits = 0;
+ } else {
+    indexBits = 0;
+    switch (colDepth) {
+           case 8:
+                redBits = 8;
+                greenBits = 8;
+                blueBits = 8;
+                break;
+           case 15:
+                alphaBits = 1;
+                redBits = 5;
+                greenBits = 5;
+                blueBits = 5;
+                break;
+           case 16:
+                redBits = 5;
+                greenBits = 6;
+                blueBits = 5;
+                break;
+           case 32:
+                alphaBits = 8;
+           case 24:
+                redBits = 8;
+                greenBits = 8;
+                blueBits = 8;
+                break;
+           default:
+                return NULL;
+    }
+ }
+
+ /* Okay,
+  * `alphaBits' is what we can provide
+  * `alphaSize' is what app requests
+  *
+  * Note that alpha buffering is required only if destination alpha is used
+  * in alpha blending; alpha blending modes that do not use destination alpha
+  * can be used w/o alpha buffer.
+  *
+  * We will use whatever ALPHA app requests. Later, in `CreateBuffer' we'll
+  * instruct Mesa to use its own ALPHA buffer, by passing a non-FALSE value
+  * for ALPHA to `_mesa_initialize_framebuffer'.
+  *
+  * Basically, 32bit modes provide ALPHA storage, but can we rely on this?
+  */
+ alphaBits = alphaSize;
+ sw_alpha = (alphaBits > 0);
+
+ if ((colDepth=vl_video_init(width, height, colDepth, rgbFlag, refresh)) <= 0) {
+    return NULL;
+ }
+
+ if ((v=(DMesaVisual)CALLOC_STRUCT(dmesa_visual)) != NULL) {
+    /* Create core visual */
+    _mesa_initialize_visual((GLvisual *)v,
+                            rgbFlag,		/* rgb */
+                            dbFlag,
+                            GL_FALSE,		/* stereo */
+                            redBits,
+                            greenBits,
+                            blueBits,
+                            alphaBits,
+                            indexBits,		/* indexBits */
+                            depthSize,
+                            stencilSize,
+                            accumSize,		/* accumRed */
+                            accumSize,		/* accumGreen */
+                            accumSize,		/* accumBlue */
+                            alphaBits?accumSize:0,	/* accumAlpha */
+                            1);			/* numSamples */
+
+    v->depth = colDepth;
+    v->db_flag = dbFlag;
+    v->rgb_flag = rgbFlag;
+    v->sw_alpha = sw_alpha;
+
+    v->zbuffer = (depthSize > 0) ? 1 : 0;
+ }
+
+ return v;
+
+#else  /* FX */
+
+ char *env;
+ int i = 0, fx_attrib[32];
+
+ if (!rgbFlag) {
+    return NULL;
+ }
+
+ if (dbFlag) fx_attrib[i++] = FXMESA_DOUBLEBUFFER;
+ if (depthSize > 0) { fx_attrib[i++] = FXMESA_DEPTH_SIZE; fx_attrib[i++] = depthSize; }
+ if (stencilSize > 0) { fx_attrib[i++] = FXMESA_STENCIL_SIZE; fx_attrib[i++] = stencilSize; }
+ if (accumSize > 0) { fx_attrib[i++] = FXMESA_ACCUM_SIZE; fx_attrib[i++] = accumSize; }
+ if (alphaSize) { fx_attrib[i++] = FXMESA_ALPHA_SIZE; fx_attrib[i++] = alphaSize; }
+ fx_attrib[i++] = FXMESA_COLORDEPTH;
+ fx_attrib[i++] = colDepth;
+ fx_attrib[i] = FXMESA_NONE;
+
+ if ((env = getenv("MESA_FX_INFO")) && (env[0] == 'r')) {
+    freopen("MESA.LOG", "w", stderr);
+ }
+
+ if (refresh && (((env = getenv("FX_GLIDE_REFRESH")) == NULL) || !atoi(env))) {
+    /* if we are passed non-zero value for refresh, we need to override
+     * default refresh rate. However, if FX_GLIDE_REFRESH is already set
+     * to 0, we won't override it, because it has a special meaning for
+     * DJGPP Glide3x (switch via VESA, using BIOS default refresh).
+     */
+    char tmp[256];
+    sprintf(tmp, "FX_GLIDE_REFRESH=%u", refresh);
+    putenv(tmp);
+ }
+
+ return (DMesaVisual)fxMesaCreateBestContext(-1, width, height, fx_attrib);
+#endif /* FX */
+}
+
+
+
+void DMesaDestroyVisual (DMesaVisual v)
+{
+#ifndef FX
+ _mesa_destroy_visual((GLvisual *)v);
+
+ vl_video_exit();
+
+#else
+ fxMesaDestroyContext((fxMesaContext)v);
+#endif
+}
+
+
+
+DMesaBuffer DMesaCreateBuffer (DMesaVisual visual,
+                               GLint xpos, GLint ypos,
+                               GLint width, GLint height)
+{
+#ifndef FX
+ DMesaBuffer b;
+
+ if ((b=(DMesaBuffer)CALLOC_STRUCT(dmesa_buffer)) != NULL) {
+    _mesa_initialize_framebuffer((GLframebuffer *)b,
+                                 (GLvisual *)visual,
+                                 visual->zbuffer == 1,
+                                 ((GLvisual *)visual)->stencilBits > 0,
+                                 ((GLvisual *)visual)->accumRedBits > 0,
+                                 visual->sw_alpha);
+    b->xpos = xpos;
+    b->ypos = ypos;
+    b->width = width;
+    b->height = height;
+ }
+
+ return b;
+#else
+ return (DMesaBuffer)visual;
+#endif
+}
+
+
+
+void DMesaDestroyBuffer (DMesaBuffer b)
+{
+#ifndef FX
+ free(b->the_window);
+ _mesa_destroy_framebuffer((GLframebuffer *)b);
+#endif
+}
+
+
+
+DMesaContext DMesaCreateContext (DMesaVisual visual,
+                                 DMesaContext share)
+{
+#ifndef FX
+ DMesaContext c;
+ GLboolean direct = GL_FALSE;
+
+ if ((c=(DMesaContext)CALLOC_STRUCT(dmesa_context)) != NULL) {
+    _mesa_initialize_context((GLcontext *)c,
+                             (GLvisual *)visual,
+                             (GLcontext *)share,
+                             (void *)c, direct);
+
+    _mesa_enable_sw_extensions((GLcontext *)c);
+    _mesa_enable_1_3_extensions((GLcontext *)c);
+    _mesa_enable_1_4_extensions((GLcontext *)c);
+    _mesa_enable_1_5_extensions((GLcontext *)c);
+
+    /* you probably have to do a bunch of other initializations here. */
+    c->visual = visual;
+
+    ((GLcontext *)c)->Driver.UpdateState = dmesa_update_state;
+
+    /* Initialize the software rasterizer and helper modules.
+     */
+    _swrast_CreateContext((GLcontext *)c);
+    _ac_CreateContext((GLcontext *)c);
+    _tnl_CreateContext((GLcontext *)c);
+    _swsetup_CreateContext((GLcontext *)c);
+    if (visual->rgb_flag) dmesa_register_swrast_functions((GLcontext *)c);
+    dmesa_init_pointers((GLcontext *)c);
+ }
+
+ return c;
+
+#else  /* FX */
+ return (DMesaContext)visual;
+#endif /* FX */
+}
+
+
+
+void DMesaDestroyContext (DMesaContext c)
+{
+#ifndef FX
+ if (c) {
+    _swsetup_DestroyContext((GLcontext *)c);
+    _swrast_DestroyContext((GLcontext *)c);
+    _tnl_DestroyContext((GLcontext *)c);
+    _ac_DestroyContext((GLcontext *)c);
+    _mesa_destroy_context((GLcontext *)c);
+ }
+#endif
+}
+
+
+
+GLboolean DMesaMoveBuffer (GLint xpos, GLint ypos)
+{
+#ifndef FX
+ GET_CURRENT_CONTEXT(ctx);
+ DMesaBuffer b = ((DMesaContext)ctx)->Buffer;
+
+ if (vl_sync_buffer(&b->the_window, xpos, ypos, b->width, b->height) != 0) {
+    return GL_FALSE;
+ } else {
+    b->xpos = xpos;
+    b->ypos = ypos;
+    return GL_TRUE;
+ }
+
+#else
+ return GL_FALSE;
+#endif
+}
+
+
+
+GLboolean DMesaResizeBuffer (GLint width, GLint height)
+{
+#ifndef FX
+ GET_CURRENT_CONTEXT(ctx);
+ DMesaBuffer b = ((DMesaContext)ctx)->Buffer;
+
+ if (vl_sync_buffer(&b->the_window, b->xpos, b->ypos, width, height) != 0) {
+    return GL_FALSE;
+ } else {
+    b->width = width;
+    b->height = height;
+    return GL_TRUE;
+ }
+
+#else
+ return GL_FALSE;
+#endif
+}
+
+
+
+/*
+ * Make the specified context and buffer the current one.
+ */
+GLboolean DMesaMakeCurrent (DMesaContext c, DMesaBuffer b)
+{
+#ifndef FX
+ if ((c != NULL) && (b != NULL)) {
+    if (vl_sync_buffer(&b->the_window, b->xpos, b->ypos, b->width, b->height) != 0) {
+       return GL_FALSE;
+    }
+
+    c->Buffer = b;
+
+    _mesa_make_current((GLcontext *)c, (GLframebuffer *)b);
+    if (((GLcontext *)c)->Viewport.Width == 0) {
+       /* initialize viewport to window size */
+       _mesa_Viewport(0, 0, b->width, b->height);
+    }
+ } else {
+    /* Detach */
+    _mesa_make_current(NULL, NULL);
+ }
+
+#else
+ fxMesaMakeCurrent((fxMesaContext)c);
+#endif
+
+ return GL_TRUE;
+}
+
+
+
+void DMesaSwapBuffers (DMesaBuffer b)
+{
+ /* copy/swap back buffer to front if applicable */
+#ifndef FX
+ GET_CURRENT_CONTEXT(ctx);
+ _mesa_notifySwapBuffers(ctx);
+ vl_flip();
+#else
+ fxMesaSwapBuffers();
+#endif
+}
+
+
+
+void DMesaSetCI (int ndx, GLfloat red, GLfloat green, GLfloat blue)
+{
+#ifndef FX
+ vl_setCI(ndx, red, green, blue);
+#endif
+}
+
+
+
+void *DMesaGetCurrentContext (void)
+{
+#ifndef FX
+ GET_CURRENT_CONTEXT(ctx);
+ return ctx;
+#else
+ return fxMesaGetCurrentContext();
+#endif
+}
+
+
+
+int DMesaGetIntegerv (GLenum pname, GLint *params)
+{
+ switch (pname) {
+        case DMESA_GET_SCREEN_SIZE:
+             #ifndef FX
+             vl_get(VL_GET_SCREEN_SIZE, params);
+             #else
+             fxGetScreenGeometry(&params[0], &params[1]);
+             #endif
+             break;
+        case DMESA_GET_DRIVER_CAPS:
+             #ifndef FX
+             params[0] = DMESA_DRIVER_SWDB_BIT;
+             #else
+             params[0] = DMESA_DRIVER_LLWO_BIT;
+             #endif
+             break;
+        case DMESA_GET_VIDEO_MODES:
+             #ifndef FX
+             return vl_get(VL_GET_VIDEO_MODES, params);
+             #else
+             {
+              /* `vmode' struct must be sync'ed with `internal.h' (vl_mode)
+               * `vmode' list must be sync'ed with `fxapi.c'
+               * `hw >= 6' means Napalm and can do 32bit rendering
+               * TODO: we should take an envvar for `fxMesaSelectCurrentBoard'
+               */
+              static struct {
+                     int width, height;
+                     int bpp;
+              } vmode[] = {
+                     { 320,  200, 16 },
+                     { 320,  240, 16 },
+                     { 512,  384, 16 },
+                     { 640,  400, 16 },
+                     { 640,  480, 16 },
+                     { 800,  600, 16 },
+                     {1024,  768, 16 },
+
+                     { 320,  200, 32 },
+                     { 320,  240, 32 },
+                     { 512,  384, 32 },
+                     { 640,  400, 32 },
+                     { 640,  480, 32 },
+                     { 800,  600, 32 },
+                     {1024,  768, 32 }
+              };
+              int hw = fxMesaSelectCurrentBoard(0);
+              int i, n = sizeof(vmode) / sizeof(vmode[0]);
+              if (hw < 6) {
+                 n /= 2;
+              }
+              if (params) {
+                 for (i = 0; i < n; i++) {
+                     params[i] = (GLint)(&vmode[i]);
+                 }
+              }
+              return n;
+             }
+             #endif
+        default:
+             return -1;
+ }
+
+ return 0;
+}
diff --git a/reactos/lib/mesa32/src/drivers/dos/dpmi.c b/reactos/lib/mesa32/src/drivers/dos/dpmi.c
new file mode 100644
index 00000000000..f9943ea60bf
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/dos/dpmi.c
@@ -0,0 +1,148 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.0
+ * 
+ * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * DOS/DJGPP device driver v1.4 for Mesa
+ *
+ *  Copyright (C) 2002 - Borca Daniel
+ *  Email : dborca@yahoo.com
+ *  Web   : http://www.geocities.com/dborca
+ */
+
+
+#include <dpmi.h>
+
+#include "internal.h"
+
+
+
+#ifndef MAX
+#define MAX(x, y) (((x)<(y))?(y):(x))
+#endif
+
+
+
+/* _create_linear_mapping:
+ *  Maps a physical address range into linear memory.
+ */
+int _create_linear_mapping (unsigned long *linear, unsigned long physaddr, int size)
+{
+ __dpmi_meminfo meminfo;
+
+ if (physaddr >= 0x100000) {
+    /* map into linear memory */
+    meminfo.address = physaddr;
+    meminfo.size = size;
+    if (__dpmi_physical_address_mapping(&meminfo) != 0)
+       return -1;
+
+    *linear = meminfo.address;
+ } else {
+    /* exploit 1 -> 1 physical to linear mapping in low megabyte */
+    *linear = physaddr;
+ }
+
+ return 0;
+}
+
+
+
+/* _remove_linear_mapping:
+ *  Frees the DPMI resources being used to map a linear address range.
+ */
+void _remove_linear_mapping (unsigned long *linear)
+{
+ __dpmi_meminfo meminfo;
+
+ if (*linear) {
+    if (*linear >= 0x100000) {
+       meminfo.address = *linear;
+       __dpmi_free_physical_address_mapping(&meminfo);
+    }
+
+    *linear = 0;
+ }
+}
+
+
+
+/* _create_selector:
+ *  Allocates a selector to access a region of linear memory.
+ */
+int _create_selector (int *segment, unsigned long base, int size)
+{
+ /* allocate an ldt descriptor */
+ if ((*segment=__dpmi_allocate_ldt_descriptors(1)) < 0) {
+    *segment = 0;
+    return -1;
+ }
+
+ /* create the linear mapping */
+ if (_create_linear_mapping(&base, base, size)) {
+    __dpmi_free_ldt_descriptor(*segment);
+    *segment = 0;
+    return -1;
+ }
+
+ /* set the descriptor base and limit */
+ __dpmi_set_segment_base_address(*segment, base);
+ __dpmi_set_segment_limit(*segment, MAX(size-1, 0xFFFF));
+
+ return 0;
+}
+
+
+
+/* _remove_selector:
+ *  Frees a DPMI segment selector.
+ */
+void _remove_selector (int *segment)
+{
+ if (*segment) {
+    unsigned long base;
+    __dpmi_get_segment_base_address(*segment, &base);
+    _remove_linear_mapping(&base);
+    __dpmi_free_ldt_descriptor(*segment);
+    *segment = 0;
+ }
+}
+
+
+
+/* Desc: retrieve CPU MMX capability
+ *
+ * In  : -
+ * Out : FALSE if CPU cannot do MMX
+ *
+ * Note: -
+ */
+int _can_mmx (void)
+{
+#ifdef USE_MMX_ASM
+ extern int _mesa_x86_cpu_features;
+ return (_mesa_x86_cpu_features & 0x00800000);
+#else
+ return 0;
+#endif
+}
diff --git a/reactos/lib/mesa32/src/drivers/dos/internal.h b/reactos/lib/mesa32/src/drivers/dos/internal.h
new file mode 100644
index 00000000000..fd47dbb7b82
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/dos/internal.h
@@ -0,0 +1,130 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.0
+ * 
+ * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * DOS/DJGPP device driver v1.5 for Mesa
+ *
+ *  Copyright (C) 2002 - Borca Daniel
+ *  Email : dborca@users.sourceforge.net
+ *  Web   : http://www.geocities.com/dborca
+ */
+
+
+#ifndef INTERNAL_H_included
+#define INTERNAL_H_included
+
+#include "../main/mtypes.h"
+
+/*
+ * general purpose defines, etc.
+ */
+#ifndef FALSE
+#define FALSE 0
+#define TRUE !FALSE
+#endif
+
+#define __PACKED__ __attribute__((packed))
+
+typedef unsigned char word8;
+typedef unsigned short word16;
+typedef unsigned long word32;
+
+#define _16_ *(word16 *)&
+#define _32_ *(word32 *)&
+
+
+
+/*
+ * video mode structure
+ */
+typedef struct vl_mode {
+        int xres, yres;
+        int bpp;
+
+        int mode;
+        int scanlen;
+
+        int sel;
+        int gran;
+} vl_mode;
+
+
+
+/*
+ * video driver structure
+ */
+typedef struct {
+        vl_mode *(*init) (void);
+        int (*entermode) (vl_mode *p, int refresh);
+        void (*blit) (void);
+        void (*setCI_f) (int index, float red, float green, float blue);
+        void (*setCI_i) (int index, int red, int green, int blue);
+        int (*get) (int pname, int *params);
+        void (*restore) (void);
+        void (*fini) (void);
+} vl_driver;
+
+
+
+/*
+ * memory mapping
+ */
+int _create_linear_mapping (unsigned long *linear, unsigned long physaddr, int size);
+void _remove_linear_mapping (unsigned long *linear);
+int _create_selector (int *segment, unsigned long base, int size);
+void _remove_selector (int *segment);
+
+/*
+ * system routines
+ */
+int _can_mmx (void);
+
+/*
+ * asm routines to deal with virtual buffering
+ */
+extern void v_clear8 (int color);
+#define v_clear15 v_clear16
+extern void v_clear16 (int color);
+extern void v_clear24 (int color);
+extern void v_clear32 (int color);
+
+extern void v_clear8_mmx (int color);
+#define v_clear15_mmx v_clear16_mmx
+extern void v_clear16_mmx (int color);
+extern void v_clear24_mmx (int color);
+extern void v_clear32_mmx (int color);
+
+extern void v_rect8 (int x, int y, int width, int height, int color);
+#define v_rect15 v_rect16
+extern void v_rect16 (int x, int y, int width, int height, int color);
+extern void v_rect24 (int x, int y, int width, int height, int color);
+extern void v_rect32 (int x, int y, int width, int height, int color);
+
+extern void v_putpixel8 (unsigned int offset, int color);
+#define v_putpixel15 v_putpixel16
+extern void v_putpixel16 (unsigned int offset, int color);
+extern void v_putpixel24 (unsigned int offset, int color);
+extern void v_putpixel32 (unsigned int offset, int color);
+
+#endif
diff --git a/reactos/lib/mesa32/src/drivers/dos/vesa.c b/reactos/lib/mesa32/src/drivers/dos/vesa.c
new file mode 100644
index 00000000000..e87651e4fd2
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/dos/vesa.c
@@ -0,0 +1,534 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ * 
+ * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * DOS/DJGPP device driver v1.5 for Mesa
+ *
+ *  Copyright (C) 2002 - Borca Daniel
+ *  Email : dborca@users.sourceforge.net
+ *  Web   : http://www.geocities.com/dborca
+ */
+
+
+#include <dpmi.h>
+#include <pc.h>
+#include <stdlib.h>
+#include <stubinfo.h>
+#include <sys/exceptn.h>
+#include <sys/segments.h>
+#include <sys/farptr.h>
+#include <sys/movedata.h>
+
+#include "video.h"
+#include "vesa.h"
+
+
+
+static vl_mode modes[128];
+
+static word16 vesa_ver;
+static int banked_selector, linear_selector;
+static int oldmode = -1;
+
+static int vesa_color_precision = 6;
+
+static word16 *vesa_pmcode;
+unsigned int vesa_gran_mask, vesa_gran_shift;
+
+
+
+/*
+ * VESA info
+ */
+#define V_SIGN     0
+#define V_MINOR    4
+#define V_MAJOR    5
+#define V_OEM_OFS  6
+#define V_OEM_SEG  8
+#define V_MODE_OFS 14
+#define V_MODE_SEG 16
+#define V_MEMORY   18
+
+/*
+ * mode info
+ */
+#define M_ATTR     0
+#define M_GRAN     4
+#define M_SCANLEN  16
+#define M_XRES     18
+#define M_YRES     20
+#define M_BPP      25
+#define M_RED      31
+#define M_GREEN    33
+#define M_BLUE     35
+#define M_PHYS_PTR 40
+
+/*
+ * VESA 3.0 CRTC timings structure
+ */
+typedef struct CRTCInfoBlock {
+        unsigned short HorizontalTotal;
+        unsigned short HorizontalSyncStart;
+        unsigned short HorizontalSyncEnd;
+        unsigned short VerticalTotal;
+        unsigned short VerticalSyncStart;
+        unsigned short VerticalSyncEnd;
+        unsigned char  Flags;
+        unsigned long  PixelClock;         /* units of Hz */
+        unsigned short RefreshRate;        /* units of 0.01 Hz */
+        unsigned char  reserved[40];
+} __PACKED__ CRTCInfoBlock;
+
+#define HNEG         (1 << 2)
+#define VNEG         (1 << 3)
+#define DOUBLESCAN   (1 << 0)
+
+
+
+/* Desc: Attempts to detect VESA, check video modes and create selectors.
+ *
+ * In  : -
+ * Out : mode array
+ *
+ * Note: -
+ */
+static vl_mode *vesa_init (void)
+{
+ __dpmi_regs r;
+ word16 *p;
+ vl_mode *q;
+ char vesa_info[512], tmp[512];
+ int maxsize = 0;
+ word32 linearfb = 0;
+
+ if (vesa_ver) {
+    return modes;
+ }
+
+ _farpokel(_stubinfo->ds_selector, 0, 0x32454256);
+ r.x.ax = 0x4f00;
+ r.x.di = 0;
+ r.x.es = _stubinfo->ds_segment;
+ __dpmi_int(0x10, &r);
+ movedata(_stubinfo->ds_selector, 0, _my_ds(), (unsigned)vesa_info, 512);
+ if ((r.x.ax!=0x004f) || ((_32_ vesa_info[V_SIGN])!=0x41534556)) {
+    return NULL;
+ }
+
+ p = (word16 *)(((_16_ vesa_info[V_MODE_SEG])<<4) + (_16_ vesa_info[V_MODE_OFS]));
+ q = modes;
+ do {
+     if ((q->mode=_farpeekw(__djgpp_dos_sel, (unsigned long)(p++)))==0xffff) {
+        break;
+     }
+
+     r.x.ax = 0x4f01;
+     r.x.cx = q->mode;
+     r.x.di = 512;
+     r.x.es = _stubinfo->ds_segment;
+     __dpmi_int(0x10, &r);
+     movedata(_stubinfo->ds_selector, 512, _my_ds(), (unsigned)tmp, 256);
+     switch (tmp[M_BPP]) {
+            case 16:
+                 q->bpp = tmp[M_RED] + tmp[M_GREEN] + tmp[M_BLUE];
+                 break;
+            case 8:
+            case 15:
+            case 24:
+            case 32:
+                 q->bpp = tmp[M_BPP];
+                 break;
+            default:
+                 q->bpp = 0;
+     }
+     if ((r.x.ax==0x004f) && ((tmp[M_ATTR]&0x11)==0x11) && q->bpp) {
+        q->xres = _16_ tmp[M_XRES];
+        q->yres = _16_ tmp[M_YRES];
+        q->scanlen = _16_ tmp[M_SCANLEN];
+        q->gran = (_16_ tmp[M_GRAN])<<10;
+        if (tmp[M_ATTR]&0x80) {
+#if 0
+           *(q+1) = *q++;
+#else
+           vl_mode *q1 = q + 1;
+           *q1 = *q++;
+#endif
+           linearfb = _32_ tmp[M_PHYS_PTR];
+           q->mode |= 0x4000;
+        }
+        if (maxsize<(q->scanlen*q->yres)) {
+           maxsize = q->scanlen*q->yres;
+        }
+        q++;
+     }
+ } while (TRUE);
+
+ if (q==modes) {
+    return NULL;
+ }
+ if (linearfb) {
+    maxsize = ((maxsize+0xfffUL)&~0xfffUL);
+    if (_create_selector(&linear_selector, linearfb, maxsize)) {
+       return NULL;
+    }
+ }
+ if (_create_selector(&banked_selector, 0xa0000, modes[0].gran)) {
+    _remove_selector(&linear_selector);
+    return NULL;
+ }
+
+ for (q=modes; q->mode!=0xffff; q++) {
+     q->sel = (q->mode&0x4000) ? linear_selector : banked_selector;
+ }
+
+ if (vesa_info[V_MAJOR] >= 2) {
+    r.x.ax = 0x4f0a;
+    r.x.bx = 0;
+    __dpmi_int(0x10, &r);
+    if (r.x.ax == 0x004f) {
+       vesa_pmcode = (word16 *)malloc(r.x.cx);
+       movedata(__djgpp_dos_sel, (r.x.es << 4) + r.x.di, _my_ds(), (unsigned)vesa_pmcode, r.x.cx);
+       if (vesa_pmcode[3]) {
+          p = (word16 *)((long)vesa_pmcode + vesa_pmcode[3]);
+          while (*p++ != 0xffff) ;
+       } else {
+          p = NULL;
+       }
+       if (p && (*p != 0xffff)) {
+          free(vesa_pmcode);
+          vesa_pmcode = NULL;
+       } else {
+          vesa_swbank = (void *)((long)vesa_pmcode + vesa_pmcode[0]);
+       }
+    }
+ }
+
+ vesa_ver = _16_ vesa_info[V_MINOR];
+ return modes;
+}
+
+
+
+/* Desc: Frees all resources allocated by VESA init code.
+ *
+ * In  : -
+ * Out : -
+ *
+ * Note: -
+ */
+static void vesa_fini (void)
+{
+ if (vesa_ver) {
+    _remove_selector(&linear_selector);
+    _remove_selector(&banked_selector);
+    if (vesa_pmcode != NULL) {
+       free(vesa_pmcode);
+       vesa_pmcode = NULL;
+    }
+ }
+}
+
+
+
+/* Desc: Uses VESA 3.0 function 0x4F0B to find the closest pixel clock to the requested value.
+ *
+ * In  : mode, clock
+ * Out : desired clock
+ *
+ * Note: -
+ */
+static unsigned long _closest_pixclk (int mode_no, unsigned long vclk)
+{
+ __dpmi_regs r;
+
+ r.x.ax = 0x4F0B;
+ r.h.bl = 0;
+ r.d.ecx = vclk;
+ r.x.dx = mode_no;
+ __dpmi_int(0x10, &r);
+
+ return (r.x.ax==0x004f) ? r.d.ecx : 0;
+}
+
+
+
+/* Desc: Calculates CRTC mode timings.
+ *
+ * In  : crtc block, geometry, adjust
+ * Out :
+ *
+ * Note:
+ */
+static void _crtc_timing (CRTCInfoBlock *crtc, int xres, int yres, int xadjust, int yadjust)
+{
+ int HTotal, VTotal;
+ int HDisp, VDisp;
+ int HSS, VSS;
+ int HSE, VSE;
+ int HSWidth, VSWidth;
+ int SS, SE;
+ int doublescan = FALSE;
+
+ if (yres < 400) {
+    doublescan = TRUE;
+    yres *= 2;
+ }
+
+ HDisp = xres;
+ HTotal = (int)(HDisp * 1.27) & ~0x7;
+ HSWidth = (int)((HTotal - HDisp) / 5) & ~0x7;
+ HSS = HDisp + 16;
+ HSE = HSS + HSWidth;
+ VDisp = yres;
+ VTotal = VDisp * 1.07;
+ VSWidth = (VTotal / 100) + 1;
+ VSS = VDisp + ((int)(VTotal - VDisp) / 5) + 1;
+ VSE = VSS + VSWidth;
+
+ SS = HSS + xadjust;
+ SE = HSE + xadjust;
+
+ if (xadjust < 0) {
+    if (SS < (HDisp + 8)) {
+       SS = HDisp + 8;
+       SE = SS + HSWidth;
+    }
+ } else {
+    if ((HTotal - 24) < SE) {
+       SE = HTotal - 24;
+       SS = SE - HSWidth;
+    }
+ }
+
+ HSS = SS;
+ HSE = SE;
+
+ SS = VSS + yadjust;
+ SE = VSE + yadjust;
+
+ if (yadjust < 0) {
+    if (SS < (VDisp + 3)) {
+       SS = VDisp + 3;
+       SE = SS + VSWidth;
+    }
+ } else {
+    if ((VTotal - 4) < SE) {
+       SE = VTotal - 4;
+       SS = SE - VSWidth;
+    }
+ }
+
+ VSS = SS;
+ VSE = SE;
+
+ crtc->HorizontalTotal     = HTotal;
+ crtc->HorizontalSyncStart = HSS;
+ crtc->HorizontalSyncEnd   = HSE;
+ crtc->VerticalTotal       = VTotal;
+ crtc->VerticalSyncStart   = VSS;
+ crtc->VerticalSyncEnd     = VSE;
+ crtc->Flags               = HNEG | VNEG;
+
+ if (doublescan)
+    crtc->Flags |= DOUBLESCAN;
+}
+
+
+
+/* Desc: Attempts to enter specified video mode.
+ *
+ * In  : ptr to mode structure, refresh rate
+ * Out : 0 if success
+ *
+ * Note: -
+ */
+static int vesa_entermode (vl_mode *p, int refresh)
+{
+ __dpmi_regs r;
+
+ if (p->mode & 0x4000) {
+    VESA.blit = _can_mmx() ? vesa_l_dump_virtual_mmx : vesa_l_dump_virtual;
+ } else {
+    VESA.blit = vesa_b_dump_virtual;
+    { int n; for (vesa_gran_shift=0, n=p->gran; n; vesa_gran_shift++, n>>=1) ; }
+    vesa_gran_mask = (1<<(--vesa_gran_shift)) - 1;
+    if ((unsigned)p->gran != (vesa_gran_mask+1)) {
+       return !0;
+    }
+ }
+
+ if (oldmode == -1) {
+    r.x.ax = 0x4f03;
+    __dpmi_int(0x10, &r);
+    oldmode = r.x.bx;
+ }
+
+ r.x.ax = 0x4f02;
+ r.x.bx = p->mode;
+
+ if (refresh && ((vesa_ver>>8) >= 3)) {
+    /* VESA 3.0 stuff for controlling the refresh rate */
+    CRTCInfoBlock crtc;
+    unsigned long vclk;
+    double f0;
+
+    _crtc_timing(&crtc, p->xres, p->yres, 0, 0);
+
+    vclk = (double)crtc.HorizontalTotal * crtc.VerticalTotal * refresh;
+    vclk = _closest_pixclk(p->mode, vclk);
+
+    if (vclk != 0) {
+       f0 = (double)vclk / (crtc.HorizontalTotal * crtc.VerticalTotal);
+       /*_current_refresh_rate = (int)(f0 + 0.5);*/
+
+       crtc.PixelClock  = vclk;
+       crtc.RefreshRate = refresh * 100;
+
+       movedata(_my_ds(), (unsigned)&crtc, _stubinfo->ds_selector, 0, sizeof(crtc));
+
+       r.x.di = 0;
+       r.x.es = _stubinfo->ds_segment;
+       r.x.bx |= 0x0800;
+    }
+ }
+
+ __dpmi_int(0x10, &r);
+ if (r.x.ax != 0x004f) {
+    return !0;
+ }
+
+ if (p->bpp == 8) {
+    r.x.ax = 0x4f08;
+    r.x.bx = 0x0800;
+    __dpmi_int(0x10, &r);
+    if (r.x.ax == 0x004f) {
+       r.x.ax = 0x4f08;
+       r.h.bl = 0x01;
+       __dpmi_int(0x10, &r);
+       vesa_color_precision = r.h.bh;
+    }
+ }
+
+ return 0;
+}
+
+
+
+/* Desc: Restores to the mode prior to first call to vesa_entermode.
+ *
+ * In  : -
+ * Out : -
+ *
+ * Note: -
+ */
+static void vesa_restore (void)
+{
+ __dpmi_regs r;
+
+ if (oldmode != -1) {
+    r.x.ax = 0x4f02;
+    r.x.bx = oldmode;
+    __dpmi_int(0x10, &r);
+    oldmode = -1;
+ }
+}
+
+
+
+/* Desc: set one palette entry
+ *
+ * In  : color index, R, G, B
+ * Out : -
+ *
+ * Note: uses integer values
+ */
+static void vesa_setCI_i (int index, int red, int green, int blue)
+{
+#if 0
+ __asm("\n\
+		movw $0x1010, %%ax	\n\
+		movb %1, %%dh		\n\
+		movb %2, %%ch		\n\
+		int  $0x10		\n\
+ "::"b"(index), "m"(red), "m"(green), "c"(blue):"%eax", "%edx");
+#else
+ outportb(0x03C8, index);
+ outportb(0x03C9, red);
+ outportb(0x03C9, green);
+ outportb(0x03C9, blue);
+#endif
+}
+
+
+
+/* Desc: set one palette entry
+ *
+ * In  : color index, R, G, B
+ * Out : -
+ *
+ * Note: uses normalized values
+ */
+static void vesa_setCI_f (int index, float red, float green, float blue)
+{
+ float max = (1 << vesa_color_precision) - 1;
+
+ vesa_setCI_i(index, (int)(red * max), (int)(green * max), (int)(blue * max));
+}
+
+
+
+/* Desc: state retrieval
+ *
+ * In  : parameter name, ptr to storage
+ * Out : 0 if request successfully processed
+ *
+ * Note: -
+ */
+static int vesa_get (int pname, int *params)
+{
+ switch (pname) {
+        case VL_GET_CI_PREC:
+             params[0] = vesa_color_precision;
+             break;
+        default:
+             return -1;
+ }
+ return 0;
+}
+
+
+
+/*
+ * the driver
+ */
+vl_driver VESA = {
+          vesa_init,
+          vesa_entermode,
+          NULL,
+          vesa_setCI_f,
+          vesa_setCI_i,
+          vesa_get,
+          vesa_restore,
+          vesa_fini
+};
diff --git a/reactos/lib/mesa32/src/drivers/dos/vesa.h b/reactos/lib/mesa32/src/drivers/dos/vesa.h
new file mode 100644
index 00000000000..9287697c370
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/dos/vesa.h
@@ -0,0 +1,47 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.0
+ * 
+ * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * DOS/DJGPP device driver v1.3 for Mesa
+ *
+ *  Copyright (C) 2002 - Borca Daniel
+ *  Email : dborca@yahoo.com
+ *  Web   : http://www.geocities.com/dborca
+ */
+
+
+#ifndef VESA_H_included
+#define VESA_H_included
+
+#include "internal.h"
+
+extern void *vesa_swbank;
+
+extern void vesa_b_dump_virtual (void);
+extern void vesa_l_dump_virtual (void);
+extern void vesa_l_dump_virtual_mmx (void);
+
+extern vl_driver VESA;
+
+#endif
diff --git a/reactos/lib/mesa32/src/drivers/dos/vga.c b/reactos/lib/mesa32/src/drivers/dos/vga.c
new file mode 100644
index 00000000000..3a4bd9b6876
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/dos/vga.c
@@ -0,0 +1,236 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ * 
+ * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * DOS/DJGPP device driver v1.5 for Mesa
+ *
+ *  Copyright (C) 2002 - Borca Daniel
+ *  Email : dborca@users.sourceforge.net
+ *  Web   : http://www.geocities.com/dborca
+ */
+
+
+#include <pc.h>
+#include <stdlib.h>
+
+#include "video.h"
+#include "vga.h"
+
+
+
+static vl_mode modes[] = {
+       {0x13 | 0x4000, 320, 200, 320, 8, -1, 320*200},
+       {0xffff, -1, -1, -1, -1, -1, -1}
+};
+
+static word16 vga_ver;
+static int linear_selector;
+static int oldmode = -1;
+
+#define vga_color_precision 6
+
+
+
+/* Desc: Attempts to detect VGA, check video modes and create selectors.
+ *
+ * In  : -
+ * Out : mode array
+ *
+ * Note: -
+ */
+static vl_mode *vga_init (void)
+{
+ int rv = 0;
+
+ if (vga_ver) {
+    return modes;
+ }
+
+ __asm("\n\
+		movw	$0x1a00, %%ax	\n\
+		int	$0x10		\n\
+		cmpb	$0x1a, %%al	\n\
+		jne	0f		\n\
+		cmpb	$0x07, %%bl	\n\
+		jb	0f		\n\
+		andl	$0xff, %%ebx	\n\
+		movl	%%ebx, %0	\n\
+ 0:":"=g"(rv)::"%eax", "%ebx");
+ if (rv == 0) {
+    return NULL;
+ }
+
+ if (_create_selector(&linear_selector, 0xa0000, 0x10000)) {
+    return NULL;
+ }
+
+ modes[0].sel = linear_selector;
+
+ vga_ver = rv;
+ return modes;
+}
+
+
+
+/* Desc: Frees all resources allocated by VGA init code.
+ *
+ * In  : -
+ * Out : -
+ *
+ * Note: -
+ */
+static void vga_fini (void)
+{
+ if (vga_ver) {
+    _remove_selector(&linear_selector);
+ }
+}
+
+
+
+/* Desc: Attempts to enter specified video mode.
+ *
+ * In  : ptr to mode structure, refresh rate
+ * Out : 0 if success
+ *
+ * Note: -
+ */
+static int vga_entermode (vl_mode *p, int refresh)
+{
+ if (!(p->mode & 0x4000)) {
+    return -1;
+ }
+ VGA.blit = _can_mmx() ? vesa_l_dump_virtual_mmx : vesa_l_dump_virtual;
+
+ if (oldmode == -1) {
+    __asm("\n\
+		movb	$0x0f, %%ah	\n\
+		int	$0x10		\n\
+		andl	$0xff, %%eax	\n\
+		movl	%%eax, %0	\n\
+    ":"=g"(oldmode)::"%eax", "%ebx");
+ }
+
+ __asm("int $0x10"::"a"(p->mode&0xff));
+
+ return 0;
+
+ (void)refresh; /* silence compiler warning */
+}
+
+
+
+/* Desc: Restores to the mode prior to first call to vga_entermode.
+ *
+ * In  : -
+ * Out : -
+ *
+ * Note: -
+ */
+static void vga_restore (void)
+{
+ if (oldmode != -1) {
+    __asm("int $0x10"::"a"(oldmode));
+    oldmode = -1;
+ }
+}
+
+
+
+/* Desc: set one palette entry
+ *
+ * In  : color index, R, G, B
+ * Out : -
+ *
+ * Note: uses integer values
+ */
+static void vga_setCI_i (int index, int red, int green, int blue)
+{
+#if 0
+ __asm("\n\
+		movw $0x1010, %%ax	\n\
+		movb %1, %%dh		\n\
+		movb %2, %%ch		\n\
+		int  $0x10		\n\
+ "::"b"(index), "m"(red), "m"(green), "c"(blue):"%eax", "%edx");
+#else
+ outportb(0x03C8, index);
+ outportb(0x03C9, red);
+ outportb(0x03C9, green);
+ outportb(0x03C9, blue);
+#endif
+}
+
+
+
+/* Desc: set one palette entry
+ *
+ * In  : color index, R, G, B
+ * Out : -
+ *
+ * Note: uses normalized values
+ */
+static void vga_setCI_f (int index, float red, float green, float blue)
+{
+ float max = (1 << vga_color_precision) - 1;
+
+ vga_setCI_i(index, (int)(red * max), (int)(green * max), (int)(blue * max));
+}
+
+
+
+/* Desc: state retrieval
+ *
+ * In  : parameter name, ptr to storage
+ * Out : 0 if request successfully processed
+ *
+ * Note: -
+ */
+static int vga_get (int pname, int *params)
+{
+ switch (pname) {
+        case VL_GET_CI_PREC:
+             params[0] = vga_color_precision;
+             break;
+        default:
+             return -1;
+ }
+ return 0;
+}
+
+
+
+/*
+ * the driver
+ */
+vl_driver VGA = {
+          vga_init,
+          vga_entermode,
+          NULL,
+          vga_setCI_f,
+          vga_setCI_i,
+          vga_get,
+          vga_restore,
+          vga_fini
+};
diff --git a/reactos/lib/mesa32/src/drivers/dos/vga.h b/reactos/lib/mesa32/src/drivers/dos/vga.h
new file mode 100644
index 00000000000..aeb8faddaed
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/dos/vga.h
@@ -0,0 +1,42 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.0
+ * 
+ * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * DOS/DJGPP device driver v1.3 for Mesa
+ *
+ *  Copyright (C) 2002 - Borca Daniel
+ *  Email : dborca@yahoo.com
+ *  Web   : http://www.geocities.com/dborca
+ */
+
+
+#ifndef VGA_H_included
+#define VGA_H_included
+
+#include "internal.h"
+#include "vesa.h"
+
+extern vl_driver VGA;
+
+#endif
diff --git a/reactos/lib/mesa32/src/drivers/dos/video.c b/reactos/lib/mesa32/src/drivers/dos/video.c
new file mode 100644
index 00000000000..41903ebe799
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/dos/video.c
@@ -0,0 +1,651 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.0
+ * 
+ * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * DOS/DJGPP device driver v1.5 for Mesa
+ *
+ *  Copyright (C) 2002 - Borca Daniel
+ *  Email : dborca@users.sourceforge.net
+ *  Web   : http://www.geocities.com/dborca
+ *
+ * Thanks to CrazyPyro (Neil Funk) for FakeColor
+ */
+
+
+#include <stdlib.h>
+
+#include "internal.h"
+#include "vesa.h"
+#include "vga.h"
+#include "video.h"
+
+
+
+static vl_driver *drv;
+/* based upon mode specific data: valid entire session */
+int vl_video_selector;
+static vl_mode *video_mode;
+static int video_scanlen, video_bypp;
+/* valid until next buffer */
+void *vl_current_draw_buffer, *vl_current_read_buffer;
+int vl_current_stride, vl_current_width, vl_current_height, vl_current_bytes;
+int vl_current_offset, vl_current_delta;
+
+
+
+#if HUGE_LOOKUP
+/* These lookup tables are used to extract RGB values in [0,255]
+ * from 15/16-bit pixel values.
+ */
+static unsigned char pix15r[0x8000];
+static unsigned char pix15g[0x8000];
+static unsigned char pix15b[0x8000];
+static unsigned char pix16r[0x10000];
+static unsigned char pix16g[0x10000];
+static unsigned char pix16b[0x10000];
+#else
+/* lookup table for scaling 5 bit colors up to 8 bits */
+static int _rgb_scale_5[32] = {
+   0,   8,   16,  25,  33,  41,  49,  58,
+   66,  74,  82,  90,  99,  107, 115, 123,
+   132, 140, 148, 156, 165, 173, 181, 189,
+   197, 206, 214, 222, 230, 239, 247, 255
+};
+#endif
+
+/* lookup table for scaling 6 bit colors up to 8 bits */
+static int _rgb_scale_6[64] = {
+   0,   4,   8,   12,  16,  20,  24,  28,
+   32,  36,  40,  45,  49,  53,  57,  61,
+   65,  69,  73,  77,  81,  85,  89,  93,
+   97,  101, 105, 109, 113, 117, 121, 125,
+   130, 134, 138, 142, 146, 150, 154, 158,
+   162, 166, 170, 174, 178, 182, 186, 190,
+   194, 198, 202, 206, 210, 215, 219, 223,
+   227, 231, 235, 239, 243, 247, 251, 255
+};
+
+/* FakeColor data */
+#define R_CNT 6
+#define G_CNT 6
+#define B_CNT 6
+
+#define R_BIAS 7
+#define G_BIAS 7
+#define B_BIAS 7
+
+static word32 VGAPalette[256];
+static word8 array_r[256];
+static word8 array_g[256];
+static word8 array_b[256];
+
+
+
+int (*vl_mixfix) (fixed r, fixed g, fixed b);
+int (*vl_mixrgb) (const unsigned char rgb[]);
+int (*vl_mixrgba) (const unsigned char rgba[]);
+void (*vl_getrgba) (unsigned int offset, unsigned char rgba[4]);
+int (*vl_getpixel) (unsigned int offset);
+void (*vl_clear) (int color);
+void (*vl_rect) (int x, int y, int width, int height, int color);
+void (*vl_flip) (void);
+void (*vl_putpixel) (unsigned int offset, int color);
+
+
+
+/* Desc: color composition (w/o ALPHA)
+ *
+ * In  : R, G, B
+ * Out : color
+ *
+ * Note: -
+ */
+static int vl_mixfix8fake (fixed r, fixed g, fixed b)
+{
+ return array_b[b>>FIXED_SHIFT]*G_CNT*R_CNT
+      + array_g[g>>FIXED_SHIFT]*R_CNT
+      + array_r[r>>FIXED_SHIFT];
+}
+#define vl_mixfix8 vl_mixfix8fake
+static int vl_mixfix15 (fixed r, fixed g, fixed b)
+{
+ return ((r>>(3+FIXED_SHIFT))<<10)
+       |((g>>(3+FIXED_SHIFT))<<5)
+       |(b>>(3+FIXED_SHIFT));
+}
+static int vl_mixfix16 (fixed r, fixed g, fixed b)
+{
+ return ((r>>(3+FIXED_SHIFT))<<11)
+       |((g>>(2+FIXED_SHIFT))<<5)
+       |(b>>(3+FIXED_SHIFT));
+}
+#define vl_mixfix24 vl_mixfix32
+static int vl_mixfix32 (fixed r, fixed g, fixed b)
+{
+ return ((r>>FIXED_SHIFT)<<16)
+       |((g>>FIXED_SHIFT)<<8)
+       |(b>>FIXED_SHIFT);
+}
+
+
+
+/* Desc: color composition (w/ ALPHA)
+ *
+ * In  : array of integers (R, G, B, A)
+ * Out : color
+ *
+ * Note: -
+ */
+#define vl_mixrgba8 vl_mixrgb8fake
+#define vl_mixrgba15 vl_mixrgb15
+#define vl_mixrgba16 vl_mixrgb16
+#define vl_mixrgba24 vl_mixrgb24
+static int vl_mixrgba32 (const unsigned char rgba[])
+{
+ /* Hack alert:
+  * currently, DMesa uses Mesa's alpha buffer;
+  * so we don't really care about alpha value here...
+  */
+ return /*(rgba[3]<<24)|*/(rgba[0]<<16)|(rgba[1]<<8)|(rgba[2]);
+}
+
+
+
+/* Desc: color composition (w/o ALPHA)
+ *
+ * In  : array of integers (R, G, B)
+ * Out : color
+ *
+ * Note: -
+ */
+static int vl_mixrgb8fake (const unsigned char rgb[])
+{
+ return array_b[rgb[2]]*G_CNT*R_CNT
+      + array_g[rgb[1]]*R_CNT
+      + array_r[rgb[0]];
+}
+#define vl_mixrgb8 vl_mixrgb8fake
+static int vl_mixrgb15 (const unsigned char rgb[])
+{
+ return ((rgb[0]>>3)<<10)|((rgb[1]>>3)<<5)|(rgb[2]>>3);
+}
+static int vl_mixrgb16 (const unsigned char rgb[])
+{
+ return ((rgb[0]>>3)<<11)|((rgb[1]>>2)<<5)|(rgb[2]>>3);
+}
+#define vl_mixrgb24 vl_mixrgb32
+static int vl_mixrgb32 (const unsigned char rgb[])
+{
+ return (rgb[0]<<16)|(rgb[1]<<8)|(rgb[2]);
+}
+
+
+
+/* Desc: color decomposition
+ *
+ * In  : pixel offset, array of integers to hold color components (R, G, B, A)
+ * Out : -
+ *
+ * Note: uses current read buffer
+ */
+static void v_getrgba8fake6 (unsigned int offset, unsigned char rgba[4])
+{
+ word32 c = VGAPalette[((word8 *)vl_current_read_buffer)[offset]];
+ rgba[0] = _rgb_scale_6[(c >> 16) & 0x3F];
+ rgba[1] = _rgb_scale_6[(c >> 8) & 0x3F];
+ rgba[2] = _rgb_scale_6[c & 0x3F];
+ /*rgba[3] = c >> 24;*/ /* dummy alpha; we have separate SW alpha, so ignore */
+}
+static void v_getrgba8fake8 (unsigned int offset, unsigned char rgba[4])
+{
+ word32 c = VGAPalette[((word8 *)vl_current_read_buffer)[offset]];
+ rgba[0] = c >> 16;
+ rgba[1] = c >> 8;
+ rgba[2] = c;
+ /*rgba[3] = c >> 24;*/ /* dummy alpha; we have separate SW alpha, so ignore */
+}
+#define v_getrgba8 v_getrgba8fake6
+static void v_getrgba15 (unsigned int offset, unsigned char rgba[4])
+{
+ word32 c = ((word16 *)vl_current_read_buffer)[offset];
+#if HUGE_LOOKUP
+ c &= 0x7fff;
+ rgba[0] = pix15r[c];
+ rgba[1] = pix15g[c];
+ rgba[2] = pix15b[c];
+#else
+ rgba[0] = _rgb_scale_5[(c >> 10) & 0x1F];
+ rgba[1] = _rgb_scale_5[(c >> 5) & 0x1F];
+ rgba[2] = _rgb_scale_5[c & 0x1F];
+#endif
+ /*rgba[3] = 255;*/ /* dummy alpha; we have separate SW alpha, so ignore */
+}
+static void v_getrgba16 (unsigned int offset, unsigned char rgba[4])
+{
+ word32 c = ((word16 *)vl_current_read_buffer)[offset];
+#if HUGE_LOOKUP
+ rgba[0] = pix16r[c];
+ rgba[1] = pix16g[c];
+ rgba[2] = pix16b[c];
+#else
+ rgba[0] = _rgb_scale_5[(c >> 11) & 0x1F];
+ rgba[1] = _rgb_scale_6[(c >> 5) & 0x3F];
+ rgba[2] = _rgb_scale_5[c & 0x1F];
+#endif
+ /*rgba[3] = 255;*/ /* dummy alpha; we have separate SW alpha, so ignore */
+}
+static void v_getrgba24 (unsigned int offset, unsigned char rgba[4])
+{
+ word32 c = *(word32 *)((long)vl_current_read_buffer+offset*3);
+ rgba[0] = c >> 16;
+ rgba[1] = c >> 8;
+ rgba[2] = c;
+ /*rgba[3] = 255;*/ /* dummy alpha; we have separate SW alpha, so ignore */
+}
+static void v_getrgba32 (unsigned int offset, unsigned char rgba[4])
+{
+ word32 c = ((word32 *)vl_current_read_buffer)[offset];
+ rgba[0] = c >> 16;
+ rgba[1] = c >> 8;
+ rgba[2] = c; 
+ /*rgba[3] = c >> 24;*/ /* dummy alpha; we have separate SW alpha, so ignore */
+}
+
+
+
+/* Desc: pixel retrieval
+ *
+ * In  : pixel offset
+ * Out : pixel value
+ *
+ * Note: uses current read buffer
+ */
+static int v_getpixel8 (unsigned int offset)
+{
+ return ((word8 *)vl_current_read_buffer)[offset];
+}
+#define v_getpixel15 v_getpixel16
+static int v_getpixel16 (unsigned int offset)
+{
+ return ((word16 *)vl_current_read_buffer)[offset];
+}
+static int v_getpixel24 (unsigned int offset)
+{
+ return *(word32 *)((long)vl_current_read_buffer+offset*3);
+}
+static int v_getpixel32 (unsigned int offset)
+{
+ return ((word32 *)vl_current_read_buffer)[offset];
+}
+
+
+
+/* Desc: set one palette entry
+ *
+ * In  : index, R, G, B
+ * Out : -
+ *
+ * Note: color components are in range [0.0 .. 1.0]
+ */
+void vl_setCI (int index, float red, float green, float blue)
+{
+ drv->setCI_f(index, red, green, blue);
+}
+
+
+
+/* Desc: set one palette entry
+ *
+ * In  : color, R, G, B
+ * Out : -
+ *
+ * Note: -
+ */
+static void fake_setcolor (int c, int r, int g, int b)
+{
+ VGAPalette[c] = 0xff000000 | (r<<16) | (g<<8) | b;
+
+ drv->setCI_i(c, r, g, b);
+}
+
+
+
+/* Desc: build FakeColor palette
+ *
+ * In  : CI precision in bits
+ * Out : -
+ *
+ * Note: -
+ */
+static void fake_buildpalette (int bits)
+{
+ double c_r, c_g, c_b;
+ int r, g, b, color = 0;
+
+ double max = (1 << bits) - 1;
+
+ for (b=0; b<B_CNT; ++b) {
+     for (g=0; g<G_CNT; ++g) {
+         for (r=0; r<R_CNT; ++r) {
+             c_r = 0.5 + (double)r*(max-R_BIAS)/(R_CNT-1.) + R_BIAS;
+             c_g = 0.5 + (double)g*(max-G_BIAS)/(G_CNT-1.) + G_BIAS;
+             c_b = 0.5 + (double)b*(max-B_BIAS)/(B_CNT-1.) + B_BIAS;
+             fake_setcolor(color++, (int)c_r, (int)c_g, (int)c_b);
+         }
+     }
+ }
+
+ for (color=0; color<256; color++) {
+     c_r = (double)color*R_CNT/256.;
+     c_g = (double)color*G_CNT/256.;
+     c_b = (double)color*B_CNT/256.;
+     array_r[color] = (int)c_r;
+     array_g[color] = (int)c_g;
+     array_b[color] = (int)c_b;
+ }
+}
+
+
+
+#if HUGE_LOOKUP
+/* Desc: initialize lookup arrays
+ *
+ * In  : -
+ * Out : -
+ *
+ * Note: -
+ */
+void v_init_pixeltables (void)
+{
+ unsigned int pixel;
+
+ for (pixel = 0; pixel <= 0xffff; pixel++) {
+     unsigned int r, g, b;
+
+     if (pixel <= 0x7fff) {
+        /* 15bit */
+        r = (pixel & 0x7c00) >> 8;
+        g = (pixel & 0x03E0) >> 3;
+        b = (pixel & 0x001F) << 2;
+
+        r = (unsigned int)(((double)r * 255. / 0x7c) + 0.5);
+        g = (unsigned int)(((double)g * 255. / 0x7c) + 0.5);
+        b = (unsigned int)(((double)b * 255. / 0x7c) + 0.5);
+
+        pix15r[pixel] = r;
+        pix15g[pixel] = g;
+        pix15b[pixel] = b;
+     }
+
+     /* 16bit */
+     r = (pixel & 0xF800) >> 8;
+     g = (pixel & 0x07E0) >> 3;
+     b = (pixel & 0x001F) << 3;
+
+     r = (unsigned int)(((double)r * 255. / 0xF8) + 0.5);
+     g = (unsigned int)(((double)g * 255. / 0xFC) + 0.5);
+     b = (unsigned int)(((double)b * 255. / 0xF8) + 0.5);
+
+     pix16r[pixel] = r;
+     pix16g[pixel] = g;
+     pix16b[pixel] = b;
+ }
+}
+#endif
+
+
+
+/* Desc: initialize hardware
+ *
+ * In  : -
+ * Out : list of available modes
+ *
+ * Note: when returning non-NULL, global variable `drv' is guaranteed to be ok
+ */
+static vl_mode *v_init_hw (void)
+{
+ static vl_mode *q = NULL;
+
+ if (q == NULL) {
+    /* initialize hardware */
+    if ((q = VESA.init()) != NULL) {
+       drv = &VESA;
+    } else if ((q = VGA.init()) != NULL) {
+       drv = &VGA;
+    } else {
+       drv = NULL;
+    }
+ }
+
+ return q;
+}
+
+
+
+/* Desc: sync buffer with video hardware
+ *
+ * In  : ptr to old buffer, position, size
+ * Out : 0 if success
+ *
+ * Note: -
+ */
+int vl_sync_buffer (void **buffer, int x, int y, int width, int height)
+{
+ if ((width & 7) || (x < 0) || (y < 0) || (x+width > video_mode->xres) || (y+height > video_mode->yres)) {
+    return -1;
+ } else {
+    void *newbuf = *buffer;
+
+    if ((newbuf == NULL) || (vl_current_width != width) || (vl_current_height != height)) {
+       newbuf = realloc(newbuf, width * height * video_bypp);
+    }
+
+    if (newbuf == NULL) {
+       return -2;
+    }
+
+    vl_current_width = width;
+    vl_current_height = height;
+    vl_current_stride = vl_current_width * video_bypp;
+    vl_current_bytes = vl_current_stride * height;
+
+    vl_current_offset = video_scanlen * y + video_bypp * x;
+    vl_current_delta = video_scanlen - vl_current_stride;
+
+    vl_current_draw_buffer = vl_current_read_buffer = *buffer = newbuf;
+    return 0;
+ }
+}
+
+
+
+/* Desc: state retrieval
+ *
+ * In  : name, storage
+ * Out : -1 for an error
+ *
+ * Note: -
+ */
+int vl_get (int pname, int *params)
+{
+ switch (pname) {
+        case VL_GET_SCREEN_SIZE:
+             params[0] = video_mode->xres;
+             params[1] = video_mode->yres;
+             break;
+        case VL_GET_VIDEO_MODES:
+             {
+              int n;
+              vl_mode *q;
+              if ((q = v_init_hw()) == NULL) {
+                 return -1;
+              }
+              /* count available visuals */
+              for (n = 0; q->mode != 0xffff; q++) {
+                  if ((q + 1)->mode == (q->mode | 0x4000)) {
+                     /* same mode, but linear */
+                     q++;
+                  }
+                  if (params) {
+                     params[n] = (int)q;
+                  }
+                  n++;
+              }
+              return n;
+             }
+        default:
+             return (drv != NULL) ? drv->get(pname, params) : -1;
+ }
+ return 0;
+}
+
+
+
+/* Desc: setup mode
+ *
+ * In  : ptr to mode definition
+ * Out : 0 if success
+ *
+ * Note: -
+ */
+static int vl_setup_mode (vl_mode *p)
+{
+ if (p == NULL) {
+    return -1;
+ }
+
+#define INITPTR(bpp) \
+        vl_putpixel = v_putpixel##bpp; \
+        vl_getrgba = v_getrgba##bpp;   \
+        vl_getpixel = v_getpixel##bpp; \
+        vl_rect = v_rect##bpp;         \
+        vl_mixfix = vl_mixfix##bpp;    \
+        vl_mixrgb = vl_mixrgb##bpp;    \
+        vl_mixrgba = vl_mixrgba##bpp;  \
+        vl_clear = _can_mmx() ? v_clear##bpp##_mmx : v_clear##bpp
+        
+ switch (p->bpp) {
+        case 8:
+             INITPTR(8);
+             break;
+        case 15:
+             INITPTR(15);
+             break;
+        case 16:
+             INITPTR(16);
+             break;
+        case 24:
+             INITPTR(24);
+             break;
+        case 32:
+             INITPTR(32);
+             break;
+        default:
+             return -1;
+ }
+
+#undef INITPTR
+
+ video_mode = p;
+ video_bypp = (p->bpp+7)/8;
+ video_scanlen = p->scanlen;
+ vl_video_selector = p->sel;
+
+ return 0;
+}
+
+
+
+/* Desc: restore to the mode prior to first call to `vl_video_init'.
+ *
+ * In  : -
+ * Out : -
+ *
+ * Note: -
+ */
+void vl_video_exit (void)
+{
+ drv->restore();
+ drv->fini();
+ video_mode = NULL;
+}
+
+
+
+/* Desc: enter mode
+ *
+ * In  : xres, yres, bits/pixel, RGB, refresh rate
+ * Out : pixel width in bits if success
+ *
+ * Note: -
+ */
+int vl_video_init (int width, int height, int bpp, int rgb, int refresh)
+{
+ int fake;
+ vl_mode *p, *q;
+ unsigned int min;
+
+ fake = 0;
+ if (!rgb) {
+    bpp = 8;
+ } else if (bpp == 8) {
+    fake = 1;
+ }
+#if HUGE_LOOKUP
+ else if (bpp < 24) {
+    v_init_pixeltables();
+ }
+#endif
+
+ /* initialize hardware */
+ if ((q = v_init_hw()) == NULL) {
+    return 0;
+ }
+
+ /* search for a mode that fits our request */
+ for (min=-1, p=NULL; q->mode!=0xffff; q++) {
+     if ((q->xres>=width) && (q->yres>=height) && (q->bpp==bpp)) {
+        if (min>=(unsigned)(q->xres*q->yres)) {
+           min = q->xres*q->yres;
+           p = q;
+        }
+     }
+ }
+
+ /* setup and enter mode */
+ if ((vl_setup_mode(p) == 0) && (drv->entermode(p, refresh) == 0)) {
+    vl_flip = drv->blit;
+    if (fake) {
+       drv->get(VL_GET_CI_PREC, (int *)(&min));
+       fake_buildpalette(min);
+       if (min == 8) {
+          vl_getrgba = v_getrgba8fake8;
+       }
+    }
+    return bpp;
+ }
+
+ /* abort */
+ return 0;
+}
diff --git a/reactos/lib/mesa32/src/drivers/dos/video.h b/reactos/lib/mesa32/src/drivers/dos/video.h
new file mode 100644
index 00000000000..e928f19c373
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/dos/video.h
@@ -0,0 +1,65 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.0
+ * 
+ * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * DOS/DJGPP device driver v1.5 for Mesa
+ *
+ *  Copyright (C) 2002 - Borca Daniel
+ *  Email : dborca@users.sourceforge.net
+ *  Web   : http://www.geocities.com/dborca
+ */
+
+
+#ifndef VIDEO_H_included
+#define VIDEO_H_included
+
+typedef int fixed;
+
+#define VL_GET_CARD_NAME   0x0100
+#define VL_GET_VRAM        0x0101
+#define VL_GET_CI_PREC     0x0200
+#define VL_GET_HPIXELS     0x0201
+#define VL_GET_SCREEN_SIZE 0x0202
+#define VL_GET_VIDEO_MODES 0x0300
+
+extern int (*vl_mixfix) (fixed r, fixed g, fixed b);
+extern int (*vl_mixrgb) (const unsigned char rgb[]);
+extern int (*vl_mixrgba) (const unsigned char rgba[]);
+extern void (*vl_getrgba) (unsigned int offset, unsigned char rgba[4]);
+
+extern void (*vl_clear) (int color);
+extern void (*vl_rect) (int x, int y, int width, int height, int color);
+extern void (*vl_flip) (void);
+extern void (*vl_putpixel) (unsigned int offset, int color);
+extern int (*vl_getpixel) (unsigned int offset);
+
+void vl_setCI (int index, float red, float green, float blue);
+
+int vl_sync_buffer (void **buffer, int x, int y, int width, int height);
+int vl_get (int pname, int *params);
+
+void vl_video_exit (void);
+int vl_video_init (int width, int height, int bpp, int rgb, int refresh);
+
+#endif
diff --git a/reactos/lib/mesa32/src/drivers/dos/virtual.S b/reactos/lib/mesa32/src/drivers/dos/virtual.S
new file mode 100644
index 00000000000..677f07a6263
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/dos/virtual.S
@@ -0,0 +1,495 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.0
+ * 
+ * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * DOS/DJGPP device driver v1.4 for Mesa
+ *
+ *  Copyright (C) 2002 - Borca Daniel
+ *  Email : dborca@yahoo.com
+ *  Web   : http://www.geocities.com/dborca
+ */
+
+
+#include "x86/assyntax.h"
+
+
+		FILE("virtual.S")
+
+/*
+ * extern void *vl_current_draw_buffer;
+ * extern int vl_current_width, vl_current_bytes;
+ */
+EXTERN _vl_current_draw_buffer
+EXTERN _vl_current_width, _vl_current_bytes
+
+		SEG_TEXT
+		USE32
+
+/* Desc: void v_clear8 (int color);
+ *
+ * In  : color
+ * Out : -
+ *
+ * Note: uses current draw buffer
+ */
+		ALIGNTEXT32
+		GLOBL	_v_clear8
+_v_clear8:
+		MOV_L	(REGOFF(4, ESP), EAX)
+		MOV_B	(AL, AH)
+		PUSH_W	(AX)
+		PUSH_W	(AX)
+		POP_L	(EAX)
+		jmp	_v_clear_common
+
+/* Desc: void v_clear16 (int color);
+ *
+ * In  : color
+ * Out : -
+ *
+ * Note: uses current draw buffer
+ */
+		ALIGNTEXT32
+		GLOBL	_v_clear16
+_v_clear16:
+		MOV_L	(REGOFF(4, ESP), EAX)
+		PUSH_W	(AX)
+		PUSH_W	(AX)
+		POP_L	(EAX)
+		jmp	_v_clear_common
+
+/* Desc: void v_clear32 (int color);
+ *
+ * In  : color
+ * Out : -
+ *
+ * Note: uses current draw buffer
+ */
+		ALIGNTEXT32
+		GLOBL	_v_clear32
+_v_clear32:
+		MOV_L	(REGOFF(4, ESP), EAX)
+		ALIGNTEXT4
+_v_clear_common:
+		MOV_L	(CONTENT(_vl_current_bytes), ECX)
+		MOV_L	(CONTENT(_vl_current_draw_buffer), EDX)
+		SHR_L	(CONST(2), ECX)
+		ALIGNTEXT4
+	TLBL(0):
+		MOV_L	(EAX, REGIND(EDX))
+		ADD_L	(CONST(4), EDX)
+		DEC_L	(ECX)
+		jnz	TLBL(0)
+		RET
+
+/* Desc: void v_clear8_mmx (int color);
+ *
+ * In  : color
+ * Out : -
+ *
+ * Note: uses current draw buffer
+ */
+		ALIGNTEXT32
+		GLOBL	_v_clear8_mmx
+_v_clear8_mmx:
+#ifdef USE_MMX_ASM
+		MOVD	(REGOFF(4, ESP), MM0)
+		PUNPCKLBW (MM0, MM0)
+		PUNPCKLWD (MM0, MM0)
+		jmp	_v_clear_common_mmx
+#endif
+
+/* Desc: void v_clear16_mmx (int color);
+ *
+ * In  : color
+ * Out : -
+ *
+ * Note: uses current draw buffer
+ */
+		ALIGNTEXT32
+		GLOBL	_v_clear16_mmx
+_v_clear16_mmx:
+#ifdef USE_MMX_ASM
+		MOVD	(REGOFF(4, ESP), MM0)
+		PUNPCKLWD (MM0, MM0)
+		jmp	_v_clear_common_mmx
+#endif
+
+/* Desc: void v_clear32_mmx (int color);
+ *
+ * In  : color
+ * Out : -
+ *
+ * Note: uses current draw buffer
+ */
+		ALIGNTEXT32
+		GLOBL	_v_clear32_mmx
+_v_clear32_mmx:
+#ifdef USE_MMX_ASM
+		MOVD	(REGOFF(4, ESP), MM0)
+		ALIGNTEXT4
+_v_clear_common_mmx:
+		PUNPCKLDQ (MM0, MM0)
+		MOV_L	(CONTENT(_vl_current_bytes), ECX)
+		MOV_L	(CONTENT(_vl_current_draw_buffer), EDX)
+		SHR_L	(CONST(3), ECX)
+		ALIGNTEXT4
+	TLBL(0):
+		MOVQ	(MM0, REGIND(EDX))
+		ADD_L	(CONST(8), EDX)
+		DEC_L	(ECX)
+		jnz	TLBL(0)
+		EMMS
+#endif
+		RET
+
+/* Desc: void v_clear24 (int color);
+ *
+ * In  : color
+ * Out : -
+ *
+ * Note: uses current draw buffer
+ */
+		ALIGNTEXT32
+		GLOBL	_v_clear24
+_v_clear24:
+		MOV_L	(CONST(0xaaaaaaab), EAX)
+		MUL_L	(CONTENT(_vl_current_bytes))
+		MOV_L	(REGOFF(4, ESP), EAX)
+		MOV_L	(EDX, ECX)
+		PUSH_L	(EBX)
+		MOV_L	(CONTENT(_vl_current_draw_buffer), EDX)
+		SHR_L	(CONST(1), ECX)
+		MOV_B	(REGOFF(10,ESP), BL)
+		ALIGNTEXT4
+	TLBL(0):
+		MOV_W	(AX, REGIND(EDX))
+		MOV_B	(BL, REGOFF(2,EDX))
+		ADD_L	(CONST(3), EDX)
+		DEC_L	(ECX)
+		jnz	TLBL(0)
+		POP_L	(EBX)
+		RET
+
+/* Desc: void v_clear24_mmx (int color);
+ *
+ * In  : color
+ * Out : -
+ *
+ * Note: uses current draw buffer
+ */
+		ALIGNTEXT32
+		GLOBL	_v_clear24_mmx
+_v_clear24_mmx:
+#ifdef USE_MMX_ASM
+		MOV_L	(REGOFF(4, ESP), EAX)
+		MOV_L	(EAX, EDX)
+		MOV_L	(EAX, ECX)
+		SHL_L	(CONST(16), EDX)
+		ROR_L	(CONST(8), ECX)
+		MOV_W	(CX, DX)
+		ROR_L	(CONST(16), ECX)
+		MOV_B	(DH, CL)
+		SHL_L	(CONST(8), EAX)
+		MOV_B	(CH, AL)
+		ROR_L	(CONST(8), EAX)
+
+		PUSH_L	(EDX)
+		PUSH_L	(EAX)
+		MOVQ	(REGIND(ESP), MM0)
+		PUSH_L	(ECX)
+		MOVQ	(REGIND(ESP), MM1)
+		PUSH_L	(EDX)
+		MOVQ	(REGIND(ESP), MM2)
+
+		MOV_L	(CONST(0xaaaaaaab), EAX)
+		MUL_L	(CONTENT(_vl_current_bytes))
+		MOV_L	(EDX, ECX)
+		MOV_L	(CONTENT(_vl_current_draw_buffer), EDX)
+		SHR_L	(CONST(4), ECX)
+		ALIGNTEXT4
+	TLBL(0):
+		MOVQ	(MM0, REGIND(EDX))
+		MOVQ	(MM1, REGOFF(8,EDX))
+		MOVQ	(MM2, REGOFF(16,EDX))
+		ADD_L	(CONST(24), EDX)
+		DEC_L	(ECX)
+		jnz	TLBL(0)
+		EMMS
+		ADD_L	(CONST(16), ESP)
+#endif
+		RET
+
+/* Desc: void v_rect8 (int color);
+ *
+ * In  : color
+ * Out : -
+ *
+ * Note: uses current draw buffer
+ */
+		ALIGNTEXT32
+		GLOBL	_v_rect8
+_v_rect8:
+		CLD
+		PUSH_L	(ESI)
+		PUSH_L	(EDI)
+		MOV_L	(REGOFF(28, ESP), EAX)
+		MOV_L	(CONTENT(_vl_current_width), ESI)
+		MOV_L	(REGOFF(16, ESP), EDI)
+		MOV_B	(AL, AH)
+		MOV_L	(REGOFF(20, ESP), ECX)
+		IMUL_L	(ESI, EDI)
+		MOV_L	(REGOFF(24, ESP), EDX)
+		SUB_L	(ECX, ESI)
+		ADD_L	(REGOFF(12, ESP), EDI)
+		PUSH_W	(AX)
+		PUSH_W	(AX)
+		PUSH_SR	(DS)
+		POP_SR	(ES)
+		ADD_L	(CONTENT(_vl_current_draw_buffer), EDI)
+		POP_L	(EAX)
+		PUSH_L	(EBX)
+		MOV_L	(ECX, EBX)
+		AND_L	(CONST(3), EBX)
+		ALIGNTEXT4
+	TLBL(0):
+		PUSH_L	(ECX)
+		ALIGNTEXT4
+	TLBL(1):
+		SHR_L	(CONST(2), ECX)
+		REP	STOS_L
+		TEST_L	(EBX, EBX)
+		jz	TLBL(2)
+		MOV_L	(EBX, ECX)
+		REP	STOS_B
+		ALIGNTEXT4
+	TLBL(2):
+		POP_L	(ECX)
+		ADD_L	(ESI, EDI)
+		DEC_L	(EDX)
+		jnz	TLBL(0)
+		POP_L	(EBX)
+		POP_L	(EDI)
+		POP_L	(ESI)
+		RET
+
+/* Desc: void v_rect16 (int color);
+ *
+ * In  : color
+ * Out : -
+ *
+ * Note: uses current draw buffer
+ */
+		ALIGNTEXT32
+		GLOBL	_v_rect16
+_v_rect16:
+		CLD
+		PUSH_L	(ESI)
+		PUSH_L	(EDI)
+		MOV_L	(REGOFF(28, ESP), EAX)
+		MOV_L	(CONTENT(_vl_current_width), ESI)
+		MOV_L	(REGOFF(16, ESP), EDI)
+		MOV_L	(REGOFF(20, ESP), ECX)
+		IMUL_L	(ESI, EDI)
+		MOV_L	(REGOFF(24, ESP), EDX)
+		SUB_L	(ECX, ESI)
+		ADD_L	(REGOFF(12, ESP), EDI)
+		PUSH_W	(AX)
+		SHL_L	(CONST(1), ESI)
+		PUSH_W	(AX)
+		SHL_L	(CONST(1), EDI)
+		PUSH_SR	(DS)
+		POP_SR	(ES)
+		ADD_L	(CONTENT(_vl_current_draw_buffer), EDI)
+		POP_L	(EAX)
+		ALIGNTEXT4
+	TLBL(0):
+		PUSH_L	(ECX)
+		ALIGNTEXT4
+	TLBL(1):
+		SHR_L	(CONST(1), ECX)
+		REP	STOS_L
+		jnc	TLBL(2)
+		STOS_W
+		ALIGNTEXT4
+	TLBL(2):
+		POP_L	(ECX)
+		ADD_L	(ESI, EDI)
+		DEC_L	(EDX)
+		jnz	TLBL(0)
+		POP_L	(EDI)
+		POP_L	(ESI)
+		RET
+
+/* Desc: void v_rect24 (int color);
+ *
+ * In  : color
+ * Out : -
+ *
+ * Note: uses current draw buffer
+ */
+		ALIGNTEXT32
+		GLOBL	_v_rect24
+_v_rect24:
+		PUSH_L	(ESI)
+		PUSH_L	(EDI)
+		MOV_L	(REGOFF(28, ESP), EAX)
+		MOV_L	(CONTENT(_vl_current_width), ESI)
+		MOV_L	(REGOFF(16, ESP), EDI)
+		MOV_L	(REGOFF(20, ESP), ECX)
+		IMUL_L	(ESI, EDI)
+		MOV_L	(REGOFF(24, ESP), EDX)
+		SUB_L	(ECX, ESI)
+		ADD_L	(REGOFF(12, ESP), EDI)
+		LEA_L	(REGBIS(ESI, ESI, 2), ESI)
+		PUSH_L	(EBX)
+		LEA_L	(REGBIS(EDI, EDI, 2), EDI)
+		MOV_L	(EAX, EBX)
+		ADD_L	(CONTENT(_vl_current_draw_buffer), EDI)
+		SHR_L	(CONST(16), EBX)
+		ALIGNTEXT4
+	TLBL(0):
+		PUSH_L	(ECX)
+		ALIGNTEXT4
+	TLBL(1):
+		MOV_W	(AX, REGIND(EDI))
+		MOV_B	(BL, REGOFF(2,EDI))
+		ADD_L	(CONST(3), EDI)
+		DEC_L	(ECX)
+		jnz	TLBL(1)
+		POP_L	(ECX)
+		ADD_L	(ESI, EDI)
+		DEC_L	(EDX)
+		jnz	TLBL(0)
+		POP_L	(EBX)
+		POP_L	(EDI)
+		POP_L	(ESI)
+		RET
+
+/* Desc: void v_rect32 (int color);
+ *
+ * In  : color
+ * Out : -
+ *
+ * Note: uses current draw buffer
+ */
+		ALIGNTEXT32
+		GLOBL	_v_rect32
+_v_rect32:
+		PUSH_L	(ESI)
+		PUSH_L	(EDI)
+		MOV_L	(CONTENT(_vl_current_width), ESI)
+		MOV_L	(REGOFF(16, ESP), EDI)
+		MOV_L	(REGOFF(20, ESP), ECX)
+		IMUL_L	(ESI, EDI)
+		MOV_L	(REGOFF(24, ESP), EDX)
+		SUB_L	(ECX, ESI)
+		ADD_L	(REGOFF(12, ESP), EDI)
+		SHL_L	(CONST(2), ESI)
+		SHL_L	(CONST(2), EDI)
+		MOV_L	(REGOFF(28, ESP), EAX)
+		ADD_L	(CONTENT(_vl_current_draw_buffer), EDI)
+		ALIGNTEXT4
+	TLBL(0):
+		PUSH_L	(ECX)
+		ALIGNTEXT4
+	TLBL(1):
+		MOV_L	(EAX, REGIND(EDI))
+		ADD_L	(CONST(4), EDI)
+		DEC_L	(ECX)
+		jnz	TLBL(1)
+		POP_L	(ECX)
+		ADD_L	(ESI, EDI)
+		DEC_L	(EDX)
+		jnz	TLBL(0)
+		POP_L	(EDI)
+		POP_L	(ESI)
+		RET
+
+/* Desc: void v_putpixel8 (unsigned int offset, int color);
+ *
+ * In  : offset within buffer, color
+ * Out : -
+ *
+ * Note: uses current draw buffer
+ */
+		ALIGNTEXT32
+		GLOBL	_v_putpixel8
+_v_putpixel8:
+		MOV_L	(REGOFF(8, ESP), ECX)
+		MOV_L	(REGOFF(4, ESP), EDX)
+		MOV_L	(CONTENT(_vl_current_draw_buffer), EAX)
+		MOV_B	(CL, REGBI(EAX,EDX))
+		RET
+
+/* Desc: void v_putpixel16 (unsigned int offset, int color);
+ *
+ * In  : offset within buffer, color
+ * Out : -
+ *
+ * Note: uses current draw buffer
+ */
+		ALIGNTEXT32
+		GLOBL	_v_putpixel16
+_v_putpixel16:
+		MOV_L	(REGOFF(8, ESP), ECX)
+		MOV_L	(REGOFF(4, ESP), EDX)
+		MOV_L	(CONTENT(_vl_current_draw_buffer), EAX)
+		MOV_W	(CX, REGBIS(EAX,EDX,2))
+		RET
+
+/* Desc: void v_putpixel24 (unsigned int offset, int color);
+ *
+ * In  : offset within buffer, color
+ * Out : -
+ *
+ * Note: uses current draw buffer
+ */
+		ALIGNTEXT32
+		GLOBL	_v_putpixel24
+_v_putpixel24:
+		MOV_L	(REGOFF(4, ESP), EAX)
+		MOV_L	(REGOFF(8, ESP), EDX)
+		MOV_L	(CONTENT(_vl_current_draw_buffer), ECX)
+		LEA_L	(REGBIS(EAX,EAX,2), EAX)
+		MOV_W	(DX, REGBI(ECX,EAX))
+		SHR_L	(CONST(16), EDX)
+		MOV_B	(DL, REGBID(ECX,EAX,2))
+		RET
+
+/* Desc: void v_putpixel32 (unsigned int offset, int color);
+ *
+ * In  : offset within buffer, color
+ * Out : -
+ *
+ * Note: uses current draw buffer
+ */
+		ALIGNTEXT32
+		GLOBL	_v_putpixel32
+_v_putpixel32:
+		MOV_L	(REGOFF(8, ESP), ECX)
+		MOV_L	(REGOFF(4, ESP), EDX)
+		MOV_L	(CONTENT(_vl_current_draw_buffer), EAX)
+		MOV_L	(ECX, REGBIS(EAX,EDX,4))
+		RET
diff --git a/reactos/lib/mesa32/src/drivers/dri/common/depthtmp.h b/reactos/lib/mesa32/src/drivers/dri/common/depthtmp.h
new file mode 100644
index 00000000000..f3da61e5199
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/dri/common/depthtmp.h
@@ -0,0 +1,176 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/common/depthtmp.h,v 1.5 2001/03/21 16:14:20 dawes Exp $ */
+
+#ifndef DBG
+#define DBG 0
+#endif
+
+
+#ifndef HAVE_HW_DEPTH_SPANS
+#define HAVE_HW_DEPTH_SPANS 0
+#endif
+#ifndef HAVE_HW_DEPTH_PIXELS
+#define HAVE_HW_DEPTH_PIXELS 0
+#endif
+
+#ifndef HW_READ_LOCK
+#define HW_READ_LOCK()		HW_LOCK()
+#endif
+#ifndef HW_READ_UNLOCK
+#define HW_READ_UNLOCK()	HW_UNLOCK()
+#endif
+
+static void TAG(WriteDepthSpan)( GLcontext *ctx,
+                             GLuint n, GLint x, GLint y,
+				 const GLdepth *depth,
+				 const GLubyte mask[] )
+{
+   HW_WRITE_LOCK()
+      {
+	 GLint x1;
+	 GLint n1;
+	 LOCAL_DEPTH_VARS;
+
+	 y = Y_FLIP( y );
+
+#if HAVE_HW_DEPTH_SPANS
+	 (void) x1; (void) n1;
+
+	 if ( DBG ) fprintf( stderr, "WriteDepthSpan 0..%d (x1 %d)\n",
+			     (int)n, (int)x );
+
+	 WRITE_DEPTH_SPAN();
+#else
+	 HW_CLIPLOOP()
+	    {
+	       GLint i = 0;
+	       CLIPSPAN( x, y, n, x1, n1, i );
+
+	       if ( DBG ) fprintf( stderr, "WriteDepthSpan %d..%d (x1 %d)\n",
+				   (int)i, (int)n1, (int)x1 );
+
+	       if ( mask ) {
+		  for ( ; i < n1 ; i++, x1++ ) {
+		     if ( mask[i] ) WRITE_DEPTH( x1, y, depth[i] );
+		  }
+	       } else {
+		  for ( ; i < n1 ; i++, x1++ ) {
+		     WRITE_DEPTH( x1, y, depth[i] );
+		  }
+	       }
+	    }
+	 HW_ENDCLIPLOOP();
+#endif
+      }
+   HW_WRITE_UNLOCK();
+}
+
+static void TAG(WriteDepthPixels)( GLcontext *ctx,
+				   GLuint n,
+				   const GLint x[],
+				   const GLint y[],
+				   const GLdepth depth[],
+				   const GLubyte mask[] )
+{
+   HW_WRITE_LOCK()
+      {
+	 GLint i;
+	 LOCAL_DEPTH_VARS;
+
+	 if ( DBG ) fprintf( stderr, "WriteDepthPixels\n" );
+
+#if HAVE_HW_DEPTH_PIXELS
+	 (void) i;
+
+	 WRITE_DEPTH_PIXELS();
+#else
+	 HW_CLIPLOOP()
+	    {
+	       for ( i = 0 ; i < n ; i++ ) {
+		  if ( mask[i] ) {
+		     const int fy = Y_FLIP( y[i] );
+		     if ( CLIPPIXEL( x[i], fy ) )
+			WRITE_DEPTH( x[i], fy, depth[i] );
+		  }
+	       }
+	    }
+	 HW_ENDCLIPLOOP();
+#endif
+      }
+   HW_WRITE_UNLOCK();
+}
+
+
+/* Read depth spans and pixels
+ */
+static void TAG(ReadDepthSpan)( GLcontext *ctx,
+				GLuint n, GLint x, GLint y,
+				GLdepth depth[] )
+{
+   HW_READ_LOCK()
+      {
+	 GLint x1, n1;
+	 LOCAL_DEPTH_VARS;
+
+	 y = Y_FLIP( y );
+
+	 if ( DBG ) fprintf( stderr, "ReadDepthSpan\n" );
+
+#if HAVE_HW_DEPTH_SPANS
+	 (void) x1; (void) n1;
+
+	 READ_DEPTH_SPAN();
+#else
+	 HW_CLIPLOOP()
+	    {
+	       GLint i = 0;
+	       CLIPSPAN( x, y, n, x1, n1, i );
+	       for ( ; i < n1 ; i++ )
+		  READ_DEPTH( depth[i], (x1+i), y );
+	    }
+	 HW_ENDCLIPLOOP();
+#endif
+      }
+   HW_READ_UNLOCK();
+}
+
+static void TAG(ReadDepthPixels)( GLcontext *ctx, GLuint n,
+				  const GLint x[], const GLint y[],
+				  GLdepth depth[] )
+{
+   HW_READ_LOCK()
+      {
+	 GLint i;
+	 LOCAL_DEPTH_VARS;
+
+	 if ( DBG ) fprintf( stderr, "ReadDepthPixels\n" );
+
+#if HAVE_HW_DEPTH_PIXELS
+	 (void) i;
+
+	 READ_DEPTH_PIXELS();
+#else
+	 HW_CLIPLOOP()
+	    {
+	       for ( i = 0 ; i < n ;i++ ) {
+		  int fy = Y_FLIP( y[i] );
+		  if ( CLIPPIXEL( x[i], fy ) )
+		     READ_DEPTH( depth[i], x[i], fy );
+	       }
+	    }
+	 HW_ENDCLIPLOOP();
+#endif
+      }
+   HW_READ_UNLOCK();
+}
+
+
+#if HAVE_HW_DEPTH_SPANS
+#undef WRITE_DEPTH_SPAN
+#undef WRITE_DEPTH_PIXELS
+#undef READ_DEPTH_SPAN
+#undef READ_DEPTH_PIXELS
+#else
+#undef WRITE_DEPTH
+#undef READ_DEPTH
+#endif
+#undef TAG
diff --git a/reactos/lib/mesa32/src/drivers/dri/common/mm.c b/reactos/lib/mesa32/src/drivers/dri/common/mm.c
new file mode 100644
index 00000000000..6572ccd9914
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/dri/common/mm.c
@@ -0,0 +1,196 @@
+/*
+ * GLX Hardware Device Driver common code
+ * Copyright (C) 1999 Wittawat Yamwong
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * WITTAWAT YAMWONG, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/common/mm.c,v 1.4 2002/10/30 12:51:27 alanh Exp $ */
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "mm.h"
+
+
+void mmDumpMemInfo( memHeap_t *heap )
+{
+   TMemBlock *p;
+
+   fprintf(stderr, "Memory heap %p:\n", (void *)heap);
+   if (heap == 0) {
+      fprintf(stderr, "  heap == 0\n");
+   } else {
+      p = (TMemBlock *)heap;
+      while (p) {
+	 fprintf(stderr, "  Offset:%08x, Size:%08x, %c%c\n",p->ofs,p->size,
+		 p->free ? '.':'U',
+		 p->reserved ? 'R':'.');
+	 p = p->next;
+      }
+   }
+   fprintf(stderr, "End of memory blocks\n");
+}
+
+memHeap_t *mmInit(int ofs,
+		  int size)
+{
+   PMemBlock blocks;
+  
+   if (size <= 0) {
+      return 0;
+   }
+   blocks = (TMemBlock *) calloc(1,sizeof(TMemBlock));
+   if (blocks) {
+      blocks->ofs = ofs;
+      blocks->size = size;
+      blocks->free = 1;
+      return (memHeap_t *)blocks;
+   } else
+      return 0;
+}
+
+
+static TMemBlock* SliceBlock(TMemBlock *p, 
+			     int startofs, int size, 
+			     int reserved, int alignment)
+{
+   TMemBlock *newblock;
+
+   /* break left */
+   if (startofs > p->ofs) {
+      newblock = (TMemBlock*) calloc(1,sizeof(TMemBlock));
+      if (!newblock)
+	 return NULL;
+      newblock->ofs = startofs;
+      newblock->size = p->size - (startofs - p->ofs);
+      newblock->free = 1;
+      newblock->next = p->next;
+      p->size -= newblock->size;
+      p->next = newblock;
+      p = newblock;
+   }
+
+   /* break right */
+   if (size < p->size) {
+      newblock = (TMemBlock*) calloc(1,sizeof(TMemBlock));
+      if (!newblock)
+	 return NULL;
+      newblock->ofs = startofs + size;
+      newblock->size = p->size - size;
+      newblock->free = 1;
+      newblock->next = p->next;
+      p->size = size;
+      p->next = newblock;
+   }
+
+   /* p = middle block */
+   p->align = alignment;
+   p->free = 0;
+   p->reserved = reserved;
+   return p;
+}
+
+PMemBlock mmAllocMem( memHeap_t *heap, int size, int align2, int startSearch)
+{
+   int mask,startofs,endofs;
+   TMemBlock *p;
+
+   if (!heap || align2 < 0 || size <= 0)
+      return NULL;
+   mask = (1 << align2)-1;
+   startofs = 0;
+   p = (TMemBlock *)heap;
+   while (p) {
+      if ((p)->free) {
+	 startofs = (p->ofs + mask) & ~mask;
+	 if ( startofs < startSearch ) {
+	    startofs = startSearch;
+	 }
+	 endofs = startofs+size;
+	 if (endofs <= (p->ofs+p->size))
+	    break;
+      }
+      p = p->next;
+   }
+   if (!p)
+      return NULL;
+   p = SliceBlock(p,startofs,size,0,mask+1);
+   p->heap = heap;
+   return p;
+}
+
+static __inline__ int Join2Blocks(TMemBlock *p)
+{
+   if (p->free && p->next && p->next->free) {
+      TMemBlock *q = p->next;
+      p->size += q->size;
+      p->next = q->next;
+      free(q);
+      return 1;
+   }
+   return 0;
+}
+
+int mmFreeMem(PMemBlock b)
+{
+   TMemBlock *p,*prev;
+
+   if (!b)
+      return 0;
+   if (!b->heap) {
+      fprintf(stderr, "no heap\n");
+      return -1;
+   }
+   p = b->heap;
+   prev = NULL;
+   while (p && p != b) {
+      prev = p;
+      p = p->next;
+   }
+   if (!p || p->free || p->reserved) {
+      if (!p)
+	 fprintf(stderr, "block not found in heap\n");
+      else if (p->free)
+	 fprintf(stderr, "block already free\n");
+      else
+	 fprintf(stderr, "block is reserved\n");
+      return -1;
+   }
+   p->free = 1;
+   Join2Blocks(p);
+   if (prev)
+      Join2Blocks(prev);
+   return 0;
+}
+
+
+void mmDestroy(memHeap_t *heap)
+{
+   TMemBlock *p,*q;
+
+   if (!heap)
+      return;
+   p = (TMemBlock *)heap;
+   while (p) {
+      q = p->next;
+      free(p);
+      p = q;
+   }
+}
diff --git a/reactos/lib/mesa32/src/drivers/dri/common/mm.h b/reactos/lib/mesa32/src/drivers/dri/common/mm.h
new file mode 100644
index 00000000000..d52871d39f3
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/dri/common/mm.h
@@ -0,0 +1,82 @@
+/*
+ * GLX Hardware Device Driver common code
+ * Copyright (C) 1999 Keith Whitwell
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * KEITH WHITWELL, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#ifndef MM_INC
+#define MM_INC
+
+struct mem_block_t {
+  struct mem_block_t *next;
+  struct mem_block_t *heap;
+  int ofs,size;
+  int align;
+  int free:1;
+  int reserved:1;
+};
+typedef struct mem_block_t TMemBlock;
+typedef struct mem_block_t *PMemBlock;
+
+/* a heap is just the first block in a chain */
+typedef struct mem_block_t memHeap_t;
+
+static __inline__ int mmBlockSize(PMemBlock b)
+{ return b->size; }
+
+static __inline__ int mmOffset(PMemBlock b)
+{ return b->ofs; }
+
+/* 
+ * input: total size in bytes
+ * return: a heap pointer if OK, NULL if error
+ */
+memHeap_t *mmInit( int ofs, int size );
+
+/*
+ * Allocate 'size' bytes with 2^align2 bytes alignment,
+ * restrict the search to free memory after 'startSearch'
+ * depth and back buffers should be in different 4mb banks
+ * to get better page hits if possible
+ * input:	size = size of block
+ *       	align2 = 2^align2 bytes alignment
+ *		startSearch = linear offset from start of heap to begin search
+ * return: pointer to the allocated block, 0 if error
+ */
+PMemBlock  mmAllocMem( memHeap_t *heap, int size, int align2, 
+		       int startSearch );
+
+/*
+ * Free block starts at offset
+ * input: pointer to a block
+ * return: 0 if OK, -1 if error
+ */
+int  mmFreeMem( PMemBlock b );
+
+/*
+ * destroy MM
+ */
+void mmDestroy( memHeap_t *mmInit );
+
+/* For debuging purpose. */
+void mmDumpMemInfo( memHeap_t *mmInit );
+
+#endif
diff --git a/reactos/lib/mesa32/src/drivers/dri/common/mmx.h b/reactos/lib/mesa32/src/drivers/dri/common/mmx.h
new file mode 100644
index 00000000000..49ce7e3e342
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/dri/common/mmx.h
@@ -0,0 +1,560 @@
+/*	mmx.h
+
+	MultiMedia eXtensions GCC interface library for IA32.
+
+	To use this library, simply include this header file
+	and compile with GCC.  You MUST have inlining enabled
+	in order for mmx_ok() to work; this can be done by
+	simply using -O on the GCC command line.
+
+	Compiling with -DMMX_TRACE will cause detailed trace
+	output to be sent to stderr for each mmx operation.
+	This adds lots of code, and obviously slows execution to
+	a crawl, but can be very useful for debugging.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY
+	EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT
+	LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR ANY PARTICULAR PURPOSE.
+
+	1997-98 by H. Dietz and R. Fisher
+
+ History:
+	97-98*	R.Fisher	Early versions
+	980501	R.Fisher	Original Release
+	980611*	H.Dietz		Rewrite, correctly implementing inlines, and
+		R.Fisher	 including direct register accesses.
+	980616	R.Fisher	Release of 980611 as 980616.
+	980714	R.Fisher	Minor corrections to Makefile, etc.
+	980715	R.Fisher	mmx_ok() now prevents optimizer from using
+				 clobbered values.
+				mmx_ok() now checks if cpuid instruction is
+				 available before trying to use it.
+	980726*	R.Fisher	mm_support() searches for AMD 3DNow, Cyrix
+				 Extended MMX, and standard MMX.  It returns a
+				 value which is positive if any of these are
+				 supported, and can be masked with constants to
+				 see which.  mmx_ok() is now a call to this
+	980726*	R.Fisher	Added i2r support for shift functions
+	980919	R.Fisher	Fixed AMD extended feature recognition bug.
+	980921	R.Fisher	Added definition/check for _MMX_H.
+				Added "float s[2]" to mmx_t for use with
+				  3DNow and EMMX.  So same mmx_t can be used.
+	981013	R.Fisher	Fixed cpuid function 1 bug (looked at wrong reg)
+				Fixed psllq_i2r error in mmxtest.c
+
+	* Unreleased (internal or interim) versions
+
+ Notes:
+	It appears that the latest gas has the pand problem fixed, therefore
+	  I'll undefine BROKEN_PAND by default.
+	String compares may be quicker than the multiple test/jumps in vendor
+	  test sequence in mmx_ok(), but I'm not concerned with that right now.
+
+ Acknowledgments:
+	Jussi Laako for pointing out the errors ultimately found to be
+	  connected to the failure to notify the optimizer of clobbered values.
+	Roger Hardiman for reminding us that CPUID isn't everywhere, and that
+	  someone may actually try to use this on a machine without CPUID.
+	  Also for suggesting code for checking this.
+	Robert Dale for pointing out the AMD recognition bug.
+	Jimmy Mayfield and Carl Witty for pointing out the Intel recognition
+	  bug.
+	Carl Witty for pointing out the psllq_i2r test bug.
+*/
+
+#ifndef _MMX_H
+#define _MMX_H
+
+//#define MMX_TRACE
+
+/*	Warning:  at this writing, the version of GAS packaged
+	with most Linux distributions does not handle the
+	parallel AND operation mnemonic correctly.  If the
+	symbol BROKEN_PAND is defined, a slower alternative
+	coding will be used.  If execution of mmxtest results
+	in an illegal instruction fault, define this symbol.
+*/
+#undef	BROKEN_PAND
+
+
+/*	The type of an value that fits in an MMX register
+	(note that long long constant values MUST be suffixed
+	 by LL and unsigned long long values by ULL, lest
+	 they be truncated by the compiler)
+*/
+typedef	union {
+	long long		q;	/* Quadword (64-bit) value */
+	unsigned long long	uq;	/* Unsigned Quadword */
+	int			d[2];	/* 2 Doubleword (32-bit) values */
+	unsigned int		ud[2];	/* 2 Unsigned Doubleword */
+	short			w[4];	/* 4 Word (16-bit) values */
+	unsigned short		uw[4];	/* 4 Unsigned Word */
+	char			b[8];	/* 8 Byte (8-bit) values */
+	unsigned char		ub[8];	/* 8 Unsigned Byte */
+	float			s[2];	/* Single-precision (32-bit) value */
+} mmx_t;
+
+/*	Helper functions for the instruction macros that follow...
+	(note that memory-to-register, m2r, instructions are nearly
+	 as efficient as register-to-register, r2r, instructions;
+	 however, memory-to-memory instructions are really simulated
+	 as a convenience, and are only 1/3 as efficient)
+*/
+#ifdef	MMX_TRACE
+
+/*	Include the stuff for printing a trace to stderr...
+*/
+
+#include <stdio.h>
+
+#define	mmx_i2r(op, imm, reg) \
+	{ \
+		mmx_t mmx_trace; \
+		mmx_trace = (imm); \
+		fprintf(stderr, #op "_i2r(" #imm "=0x%016llx, ", mmx_trace.q); \
+		__asm__ __volatile__ ("movq %%" #reg ", %0" \
+				      : "=X" (mmx_trace) \
+				      : /* nothing */ ); \
+		fprintf(stderr, #reg "=0x%016llx) => ", mmx_trace.q); \
+		__asm__ __volatile__ (#op " %0, %%" #reg \
+				      : /* nothing */ \
+				      : "X" (imm)); \
+		__asm__ __volatile__ ("movq %%" #reg ", %0" \
+				      : "=X" (mmx_trace) \
+				      : /* nothing */ ); \
+		fprintf(stderr, #reg "=0x%016llx\n", mmx_trace.q); \
+	}
+
+#define	mmx_m2r(op, mem, reg) \
+	{ \
+		mmx_t mmx_trace; \
+		mmx_trace = (mem); \
+		fprintf(stderr, #op "_m2r(" #mem "=0x%016llx, ", mmx_trace.q); \
+		__asm__ __volatile__ ("movq %%" #reg ", %0" \
+				      : "=X" (mmx_trace) \
+				      : /* nothing */ ); \
+		fprintf(stderr, #reg "=0x%016llx) => ", mmx_trace.q); \
+		__asm__ __volatile__ (#op " %0, %%" #reg \
+				      : /* nothing */ \
+				      : "X" (mem)); \
+		__asm__ __volatile__ ("movq %%" #reg ", %0" \
+				      : "=X" (mmx_trace) \
+				      : /* nothing */ ); \
+		fprintf(stderr, #reg "=0x%016llx\n", mmx_trace.q); \
+	}
+
+#define	mmx_r2m(op, reg, mem) \
+	{ \
+		mmx_t mmx_trace; \
+		__asm__ __volatile__ ("movq %%" #reg ", %0" \
+				      : "=X" (mmx_trace) \
+				      : /* nothing */ ); \
+		fprintf(stderr, #op "_r2m(" #reg "=0x%016llx, ", mmx_trace.q); \
+		mmx_trace = (mem); \
+		fprintf(stderr, #mem "=0x%016llx) => ", mmx_trace.q); \
+		__asm__ __volatile__ (#op " %%" #reg ", %0" \
+				      : "=X" (mem) \
+				      : /* nothing */ ); \
+		mmx_trace = (mem); \
+		fprintf(stderr, #mem "=0x%016llx\n", mmx_trace.q); \
+	}
+
+#define	mmx_r2r(op, regs, regd) \
+	{ \
+		mmx_t mmx_trace; \
+		__asm__ __volatile__ ("movq %%" #regs ", %0" \
+				      : "=X" (mmx_trace) \
+				      : /* nothing */ ); \
+		fprintf(stderr, #op "_r2r(" #regs "=0x%016llx, ", mmx_trace.q); \
+		__asm__ __volatile__ ("movq %%" #regd ", %0" \
+				      : "=X" (mmx_trace) \
+				      : /* nothing */ ); \
+		fprintf(stderr, #regd "=0x%016llx) => ", mmx_trace.q); \
+		__asm__ __volatile__ (#op " %" #regs ", %" #regd); \
+		__asm__ __volatile__ ("movq %%" #regd ", %0" \
+				      : "=X" (mmx_trace) \
+				      : /* nothing */ ); \
+		fprintf(stderr, #regd "=0x%016llx\n", mmx_trace.q); \
+	}
+
+#define	mmx_m2m(op, mems, memd) \
+	{ \
+		mmx_t mmx_trace; \
+		mmx_trace = (mems); \
+		fprintf(stderr, #op "_m2m(" #mems "=0x%016llx, ", mmx_trace.q); \
+		mmx_trace = (memd); \
+		fprintf(stderr, #memd "=0x%016llx) => ", mmx_trace.q); \
+		__asm__ __volatile__ ("movq %0, %%mm0\n\t" \
+				      #op " %1, %%mm0\n\t" \
+				      "movq %%mm0, %0" \
+				      : "=X" (memd) \
+				      : "X" (mems)); \
+		mmx_trace = (memd); \
+		fprintf(stderr, #memd "=0x%016llx\n", mmx_trace.q); \
+	}
+
+#else
+
+/*	These macros are a lot simpler without the tracing...
+*/
+
+#define	mmx_i2r(op, imm, reg) \
+	__asm__ __volatile__ (#op " $" #imm ", %%" #reg \
+			      : /* nothing */ \
+			      : /* nothing */);
+
+#define	mmx_m2r(op, mem, reg) \
+	__asm__ __volatile__ (#op " %0, %%" #reg \
+			      : /* nothing */ \
+			      : "X" (mem))
+
+#define	mmx_r2m(op, reg, mem) \
+	__asm__ __volatile__ (#op " %%" #reg ", %0" \
+			      : "=X" (mem) \
+			      : /* nothing */ )
+
+#define	mmx_r2r(op, regs, regd) \
+	__asm__ __volatile__ (#op " %" #regs ", %" #regd)
+
+#define	mmx_m2m(op, mems, memd) \
+	__asm__ __volatile__ ("movq %0, %%mm0\n\t" \
+			      #op " %1, %%mm0\n\t" \
+			      "movq %%mm0, %0" \
+			      : "=X" (memd) \
+			      : "X" (mems))
+
+#endif
+
+
+/*	1x64 MOVe Quadword
+	(this is both a load and a store...
+	 in fact, it is the only way to store)
+*/
+#define	movq_m2r(var, reg)	mmx_m2r(movq, var, reg)
+#define	movq_r2m(reg, var)	mmx_r2m(movq, reg, var)
+#define	movq_r2r(regs, regd)	mmx_r2r(movq, regs, regd)
+#define	movq(vars, vard) \
+	__asm__ __volatile__ ("movq %1, %%mm0\n\t" \
+			      "movq %%mm0, %0" \
+			      : "=X" (vard) \
+			      : "X" (vars))
+
+
+/*	1x32 MOVe Doubleword
+	(like movq, this is both load and store...
+	 but is most useful for moving things between
+	 mmx registers and ordinary registers)
+*/
+#define	movd_m2r(var, reg)	mmx_m2r(movd, var, reg)
+#define	movd_r2m(reg, var)	mmx_r2m(movd, reg, var)
+#define	movd_r2r(regs, regd)	mmx_r2r(movd, regs, regd)
+#define	movd(vars, vard) \
+	__asm__ __volatile__ ("movd %1, %%mm0\n\t" \
+			      "movd %%mm0, %0" \
+			      : "=X" (vard) \
+			      : "X" (vars))
+
+
+/*	2x32, 4x16, and 8x8 Parallel ADDs
+*/
+#define	paddd_m2r(var, reg)	mmx_m2r(paddd, var, reg)
+#define	paddd_r2r(regs, regd)	mmx_r2r(paddd, regs, regd)
+#define	paddd(vars, vard)	mmx_m2m(paddd, vars, vard)
+
+#define	paddw_m2r(var, reg)	mmx_m2r(paddw, var, reg)
+#define	paddw_r2r(regs, regd)	mmx_r2r(paddw, regs, regd)
+#define	paddw(vars, vard)	mmx_m2m(paddw, vars, vard)
+
+#define	paddb_m2r(var, reg)	mmx_m2r(paddb, var, reg)
+#define	paddb_r2r(regs, regd)	mmx_r2r(paddb, regs, regd)
+#define	paddb(vars, vard)	mmx_m2m(paddb, vars, vard)
+
+
+/*	4x16 and 8x8 Parallel ADDs using Saturation arithmetic
+*/
+#define	paddsw_m2r(var, reg)	mmx_m2r(paddsw, var, reg)
+#define	paddsw_r2r(regs, regd)	mmx_r2r(paddsw, regs, regd)
+#define	paddsw(vars, vard)	mmx_m2m(paddsw, vars, vard)
+
+#define	paddsb_m2r(var, reg)	mmx_m2r(paddsb, var, reg)
+#define	paddsb_r2r(regs, regd)	mmx_r2r(paddsb, regs, regd)
+#define	paddsb(vars, vard)	mmx_m2m(paddsb, vars, vard)
+
+
+/*	4x16 and 8x8 Parallel ADDs using Unsigned Saturation arithmetic
+*/
+#define	paddusw_m2r(var, reg)	mmx_m2r(paddusw, var, reg)
+#define	paddusw_r2r(regs, regd)	mmx_r2r(paddusw, regs, regd)
+#define	paddusw(vars, vard)	mmx_m2m(paddusw, vars, vard)
+
+#define	paddusb_m2r(var, reg)	mmx_m2r(paddusb, var, reg)
+#define	paddusb_r2r(regs, regd)	mmx_r2r(paddusb, regs, regd)
+#define	paddusb(vars, vard)	mmx_m2m(paddusb, vars, vard)
+
+
+/*	2x32, 4x16, and 8x8 Parallel SUBs
+*/
+#define	psubd_m2r(var, reg)	mmx_m2r(psubd, var, reg)
+#define	psubd_r2r(regs, regd)	mmx_r2r(psubd, regs, regd)
+#define	psubd(vars, vard)	mmx_m2m(psubd, vars, vard)
+
+#define	psubw_m2r(var, reg)	mmx_m2r(psubw, var, reg)
+#define	psubw_r2r(regs, regd)	mmx_r2r(psubw, regs, regd)
+#define	psubw(vars, vard)	mmx_m2m(psubw, vars, vard)
+
+#define	psubb_m2r(var, reg)	mmx_m2r(psubb, var, reg)
+#define	psubb_r2r(regs, regd)	mmx_r2r(psubb, regs, regd)
+#define	psubb(vars, vard)	mmx_m2m(psubb, vars, vard)
+
+
+/*	4x16 and 8x8 Parallel SUBs using Saturation arithmetic
+*/
+#define	psubsw_m2r(var, reg)	mmx_m2r(psubsw, var, reg)
+#define	psubsw_r2r(regs, regd)	mmx_r2r(psubsw, regs, regd)
+#define	psubsw(vars, vard)	mmx_m2m(psubsw, vars, vard)
+
+#define	psubsb_m2r(var, reg)	mmx_m2r(psubsb, var, reg)
+#define	psubsb_r2r(regs, regd)	mmx_r2r(psubsb, regs, regd)
+#define	psubsb(vars, vard)	mmx_m2m(psubsb, vars, vard)
+
+
+/*	4x16 and 8x8 Parallel SUBs using Unsigned Saturation arithmetic
+*/
+#define	psubusw_m2r(var, reg)	mmx_m2r(psubusw, var, reg)
+#define	psubusw_r2r(regs, regd)	mmx_r2r(psubusw, regs, regd)
+#define	psubusw(vars, vard)	mmx_m2m(psubusw, vars, vard)
+
+#define	psubusb_m2r(var, reg)	mmx_m2r(psubusb, var, reg)
+#define	psubusb_r2r(regs, regd)	mmx_r2r(psubusb, regs, regd)
+#define	psubusb(vars, vard)	mmx_m2m(psubusb, vars, vard)
+
+
+/*	4x16 Parallel MULs giving Low 4x16 portions of results
+*/
+#define	pmullw_m2r(var, reg)	mmx_m2r(pmullw, var, reg)
+#define	pmullw_r2r(regs, regd)	mmx_r2r(pmullw, regs, regd)
+#define	pmullw(vars, vard)	mmx_m2m(pmullw, vars, vard)
+
+
+/*	4x16 Parallel MULs giving High 4x16 portions of results
+*/
+#define	pmulhw_m2r(var, reg)	mmx_m2r(pmulhw, var, reg)
+#define	pmulhw_r2r(regs, regd)	mmx_r2r(pmulhw, regs, regd)
+#define	pmulhw(vars, vard)	mmx_m2m(pmulhw, vars, vard)
+
+
+/*	4x16->2x32 Parallel Mul-ADD
+	(muls like pmullw, then adds adjacent 16-bit fields
+	 in the multiply result to make the final 2x32 result)
+*/
+#define	pmaddwd_m2r(var, reg)	mmx_m2r(pmaddwd, var, reg)
+#define	pmaddwd_r2r(regs, regd)	mmx_r2r(pmaddwd, regs, regd)
+#define	pmaddwd(vars, vard)	mmx_m2m(pmaddwd, vars, vard)
+
+
+/*	1x64 bitwise AND
+*/
+#ifdef	BROKEN_PAND
+#define	pand_m2r(var, reg) \
+	{ \
+		mmx_m2r(pandn, (mmx_t) -1LL, reg); \
+		mmx_m2r(pandn, var, reg); \
+	}
+#define	pand_r2r(regs, regd) \
+	{ \
+		mmx_m2r(pandn, (mmx_t) -1LL, regd); \
+		mmx_r2r(pandn, regs, regd) \
+	}
+#define	pand(vars, vard) \
+	{ \
+		movq_m2r(vard, mm0); \
+		mmx_m2r(pandn, (mmx_t) -1LL, mm0); \
+		mmx_m2r(pandn, vars, mm0); \
+		movq_r2m(mm0, vard); \
+	}
+#else
+#define	pand_m2r(var, reg)	mmx_m2r(pand, var, reg)
+#define	pand_r2r(regs, regd)	mmx_r2r(pand, regs, regd)
+#define	pand(vars, vard)	mmx_m2m(pand, vars, vard)
+#endif
+
+
+/*	1x64 bitwise AND with Not the destination
+*/
+#define	pandn_m2r(var, reg)	mmx_m2r(pandn, var, reg)
+#define	pandn_r2r(regs, regd)	mmx_r2r(pandn, regs, regd)
+#define	pandn(vars, vard)	mmx_m2m(pandn, vars, vard)
+
+
+/*	1x64 bitwise OR
+*/
+#define	por_m2r(var, reg)	mmx_m2r(por, var, reg)
+#define	por_r2r(regs, regd)	mmx_r2r(por, regs, regd)
+#define	por(vars, vard)	mmx_m2m(por, vars, vard)
+
+
+/*	1x64 bitwise eXclusive OR
+*/
+#define	pxor_m2r(var, reg)	mmx_m2r(pxor, var, reg)
+#define	pxor_r2r(regs, regd)	mmx_r2r(pxor, regs, regd)
+#define	pxor(vars, vard)	mmx_m2m(pxor, vars, vard)
+
+
+/*	2x32, 4x16, and 8x8 Parallel CoMPare for EQuality
+	(resulting fields are either 0 or -1)
+*/
+#define	pcmpeqd_m2r(var, reg)	mmx_m2r(pcmpeqd, var, reg)
+#define	pcmpeqd_r2r(regs, regd)	mmx_r2r(pcmpeqd, regs, regd)
+#define	pcmpeqd(vars, vard)	mmx_m2m(pcmpeqd, vars, vard)
+
+#define	pcmpeqw_m2r(var, reg)	mmx_m2r(pcmpeqw, var, reg)
+#define	pcmpeqw_r2r(regs, regd)	mmx_r2r(pcmpeqw, regs, regd)
+#define	pcmpeqw(vars, vard)	mmx_m2m(pcmpeqw, vars, vard)
+
+#define	pcmpeqb_m2r(var, reg)	mmx_m2r(pcmpeqb, var, reg)
+#define	pcmpeqb_r2r(regs, regd)	mmx_r2r(pcmpeqb, regs, regd)
+#define	pcmpeqb(vars, vard)	mmx_m2m(pcmpeqb, vars, vard)
+
+
+/*	2x32, 4x16, and 8x8 Parallel CoMPare for Greater Than
+	(resulting fields are either 0 or -1)
+*/
+#define	pcmpgtd_m2r(var, reg)	mmx_m2r(pcmpgtd, var, reg)
+#define	pcmpgtd_r2r(regs, regd)	mmx_r2r(pcmpgtd, regs, regd)
+#define	pcmpgtd(vars, vard)	mmx_m2m(pcmpgtd, vars, vard)
+
+#define	pcmpgtw_m2r(var, reg)	mmx_m2r(pcmpgtw, var, reg)
+#define	pcmpgtw_r2r(regs, regd)	mmx_r2r(pcmpgtw, regs, regd)
+#define	pcmpgtw(vars, vard)	mmx_m2m(pcmpgtw, vars, vard)
+
+#define	pcmpgtb_m2r(var, reg)	mmx_m2r(pcmpgtb, var, reg)
+#define	pcmpgtb_r2r(regs, regd)	mmx_r2r(pcmpgtb, regs, regd)
+#define	pcmpgtb(vars, vard)	mmx_m2m(pcmpgtb, vars, vard)
+
+
+/*	1x64, 2x32, and 4x16 Parallel Shift Left Logical
+*/
+#define	psllq_i2r(imm, reg)	mmx_i2r(psllq, imm, reg)
+#define	psllq_m2r(var, reg)	mmx_m2r(psllq, var, reg)
+#define	psllq_r2r(regs, regd)	mmx_r2r(psllq, regs, regd)
+#define	psllq(vars, vard)	mmx_m2m(psllq, vars, vard)
+
+#define	pslld_i2r(imm, reg)	mmx_i2r(pslld, imm, reg)
+#define	pslld_m2r(var, reg)	mmx_m2r(pslld, var, reg)
+#define	pslld_r2r(regs, regd)	mmx_r2r(pslld, regs, regd)
+#define	pslld(vars, vard)	mmx_m2m(pslld, vars, vard)
+
+#define	psllw_i2r(imm, reg)	mmx_i2r(psllw, imm, reg)
+#define	psllw_m2r(var, reg)	mmx_m2r(psllw, var, reg)
+#define	psllw_r2r(regs, regd)	mmx_r2r(psllw, regs, regd)
+#define	psllw(vars, vard)	mmx_m2m(psllw, vars, vard)
+
+
+/*	1x64, 2x32, and 4x16 Parallel Shift Right Logical
+*/
+#define	psrlq_i2r(imm, reg)	mmx_i2r(psrlq, imm, reg)
+#define	psrlq_m2r(var, reg)	mmx_m2r(psrlq, var, reg)
+#define	psrlq_r2r(regs, regd)	mmx_r2r(psrlq, regs, regd)
+#define	psrlq(vars, vard)	mmx_m2m(psrlq, vars, vard)
+
+#define	psrld_i2r(imm, reg)	mmx_i2r(psrld, imm, reg)
+#define	psrld_m2r(var, reg)	mmx_m2r(psrld, var, reg)
+#define	psrld_r2r(regs, regd)	mmx_r2r(psrld, regs, regd)
+#define	psrld(vars, vard)	mmx_m2m(psrld, vars, vard)
+
+#define	psrlw_i2r(imm, reg)	mmx_i2r(psrlw, imm, reg)
+#define	psrlw_m2r(var, reg)	mmx_m2r(psrlw, var, reg)
+#define	psrlw_r2r(regs, regd)	mmx_r2r(psrlw, regs, regd)
+#define	psrlw(vars, vard)	mmx_m2m(psrlw, vars, vard)
+
+
+/*	2x32 and 4x16 Parallel Shift Right Arithmetic
+*/
+#define	psrad_i2r(imm, reg)	mmx_i2r(psrad, imm, reg)
+#define	psrad_m2r(var, reg)	mmx_m2r(psrad, var, reg)
+#define	psrad_r2r(regs, regd)	mmx_r2r(psrad, regs, regd)
+#define	psrad(vars, vard)	mmx_m2m(psrad, vars, vard)
+
+#define	psraw_i2r(imm, reg)	mmx_i2r(psraw, imm, reg)
+#define	psraw_m2r(var, reg)	mmx_m2r(psraw, var, reg)
+#define	psraw_r2r(regs, regd)	mmx_r2r(psraw, regs, regd)
+#define	psraw(vars, vard)	mmx_m2m(psraw, vars, vard)
+
+
+/*	2x32->4x16 and 4x16->8x8 PACK and Signed Saturate
+	(packs source and dest fields into dest in that order)
+*/
+#define	packssdw_m2r(var, reg)	mmx_m2r(packssdw, var, reg)
+#define	packssdw_r2r(regs, regd) mmx_r2r(packssdw, regs, regd)
+#define	packssdw(vars, vard)	mmx_m2m(packssdw, vars, vard)
+
+#define	packsswb_m2r(var, reg)	mmx_m2r(packsswb, var, reg)
+#define	packsswb_r2r(regs, regd) mmx_r2r(packsswb, regs, regd)
+#define	packsswb(vars, vard)	mmx_m2m(packsswb, vars, vard)
+
+
+/*	4x16->8x8 PACK and Unsigned Saturate
+	(packs source and dest fields into dest in that order)
+*/
+#define	packuswb_m2r(var, reg)	mmx_m2r(packuswb, var, reg)
+#define	packuswb_r2r(regs, regd) mmx_r2r(packuswb, regs, regd)
+#define	packuswb(vars, vard)	mmx_m2m(packuswb, vars, vard)
+
+
+/*	2x32->1x64, 4x16->2x32, and 8x8->4x16 UNPaCK Low
+	(interleaves low half of dest with low half of source
+	 as padding in each result field)
+*/
+#define	punpckldq_m2r(var, reg)	mmx_m2r(punpckldq, var, reg)
+#define	punpckldq_r2r(regs, regd) mmx_r2r(punpckldq, regs, regd)
+#define	punpckldq(vars, vard)	mmx_m2m(punpckldq, vars, vard)
+
+#define	punpcklwd_m2r(var, reg)	mmx_m2r(punpcklwd, var, reg)
+#define	punpcklwd_r2r(regs, regd) mmx_r2r(punpcklwd, regs, regd)
+#define	punpcklwd(vars, vard)	mmx_m2m(punpcklwd, vars, vard)
+
+#define	punpcklbw_m2r(var, reg)	mmx_m2r(punpcklbw, var, reg)
+#define	punpcklbw_r2r(regs, regd) mmx_r2r(punpcklbw, regs, regd)
+#define	punpcklbw(vars, vard)	mmx_m2m(punpcklbw, vars, vard)
+
+
+/*	2x32->1x64, 4x16->2x32, and 8x8->4x16 UNPaCK High
+	(interleaves high half of dest with high half of source
+	 as padding in each result field)
+*/
+#define	punpckhdq_m2r(var, reg)	mmx_m2r(punpckhdq, var, reg)
+#define	punpckhdq_r2r(regs, regd) mmx_r2r(punpckhdq, regs, regd)
+#define	punpckhdq(vars, vard)	mmx_m2m(punpckhdq, vars, vard)
+
+#define	punpckhwd_m2r(var, reg)	mmx_m2r(punpckhwd, var, reg)
+#define	punpckhwd_r2r(regs, regd) mmx_r2r(punpckhwd, regs, regd)
+#define	punpckhwd(vars, vard)	mmx_m2m(punpckhwd, vars, vard)
+
+#define	punpckhbw_m2r(var, reg)	mmx_m2r(punpckhbw, var, reg)
+#define	punpckhbw_r2r(regs, regd) mmx_r2r(punpckhbw, regs, regd)
+#define	punpckhbw(vars, vard)	mmx_m2m(punpckhbw, vars, vard)
+
+
+/*	Empty MMx State
+	(used to clean-up when going from mmx to float use
+	 of the registers that are shared by both; note that
+	 there is no float-to-mmx operation needed, because
+	 only the float tag word info is corruptible)
+*/
+#ifdef	MMX_TRACE
+
+#define	emms() \
+	{ \
+		fprintf(stderr, "emms()\n"); \
+		__asm__ __volatile__ ("emms"); \
+	}
+
+#else
+
+#define	emms()			__asm__ __volatile__ ("emms")
+
+#endif
+
+#endif
+
diff --git a/reactos/lib/mesa32/src/drivers/dri/common/spantmp.h b/reactos/lib/mesa32/src/drivers/dri/common/spantmp.h
new file mode 100644
index 00000000000..888be0465e5
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/dri/common/spantmp.h
@@ -0,0 +1,259 @@
+#ifndef DBG
+#define DBG 0
+#endif
+
+#ifndef HW_WRITE_LOCK
+#define HW_WRITE_LOCK()		HW_LOCK()
+#endif
+
+#ifndef HW_WRITE_UNLOCK
+#define HW_WRITE_UNLOCK()	HW_UNLOCK()
+#endif
+
+#ifndef HW_READ_LOCK
+#define HW_READ_LOCK()		HW_LOCK()
+#endif
+
+#ifndef HW_READ_UNLOCK
+#define HW_READ_UNLOCK()	HW_UNLOCK()
+#endif
+
+#ifndef HW_READ_CLIPLOOP
+#define HW_READ_CLIPLOOP()	HW_CLIPLOOP()
+#endif
+
+#ifndef HW_WRITE_CLIPLOOP
+#define HW_WRITE_CLIPLOOP()	HW_CLIPLOOP()
+#endif
+
+
+static void TAG(WriteRGBASpan)( const GLcontext *ctx,
+				GLuint n, GLint x, GLint y,
+				const GLubyte rgba[][4],
+				const GLubyte mask[] )
+{
+   HW_WRITE_LOCK()
+      {
+	 GLint x1;
+	 GLint n1;
+	 LOCAL_VARS;
+
+	 y = Y_FLIP(y);
+
+	 HW_WRITE_CLIPLOOP()
+	    {
+	       GLint i = 0;
+	       CLIPSPAN(x,y,n,x1,n1,i);
+
+	       if (DBG) fprintf(stderr, "WriteRGBASpan %d..%d (x1 %d)\n",
+				(int)i, (int)n1, (int)x1);
+
+	       if (mask)
+	       {
+		  for (;n1>0;i++,x1++,n1--)
+		     if (mask[i])
+			WRITE_RGBA( x1, y,
+				    rgba[i][0], rgba[i][1],
+				    rgba[i][2], rgba[i][3] );
+	       }
+	       else
+	       {
+		  for (;n1>0;i++,x1++,n1--)
+		     WRITE_RGBA( x1, y,
+				 rgba[i][0], rgba[i][1],
+				 rgba[i][2], rgba[i][3] );
+	       }
+	    }
+	 HW_ENDCLIPLOOP();
+      }
+   HW_WRITE_UNLOCK();
+}
+
+static void TAG(WriteRGBSpan)( const GLcontext *ctx,
+			       GLuint n, GLint x, GLint y,
+			       const GLubyte rgb[][3],
+			       const GLubyte mask[] )
+{
+   HW_WRITE_LOCK()
+      {
+	 GLint x1;
+	 GLint n1;
+	 LOCAL_VARS;
+
+	 y = Y_FLIP(y);
+
+	 HW_WRITE_CLIPLOOP()
+	    {
+	       GLint i = 0;
+	       CLIPSPAN(x,y,n,x1,n1,i);
+
+	       if (DBG) fprintf(stderr, "WriteRGBSpan %d..%d (x1 %d)\n",
+				(int)i, (int)n1, (int)x1);
+
+	       if (mask)
+	       {
+		  for (;n1>0;i++,x1++,n1--)
+		     if (mask[i])
+			WRITE_RGBA( x1, y, rgb[i][0], rgb[i][1], rgb[i][2], 255 );
+	       }
+	       else
+	       {
+		  for (;n1>0;i++,x1++,n1--)
+		     WRITE_RGBA( x1, y, rgb[i][0], rgb[i][1], rgb[i][2], 255 );
+	       }
+	    }
+	 HW_ENDCLIPLOOP();
+      }
+   HW_WRITE_UNLOCK();
+}
+
+static void TAG(WriteRGBAPixels)( const GLcontext *ctx,
+			       GLuint n,
+			       const GLint x[],
+			       const GLint y[],
+			       const GLubyte rgba[][4],
+			       const GLubyte mask[] )
+{
+   HW_WRITE_LOCK()
+      {
+	 GLint i;
+	 LOCAL_VARS;
+
+	 if (DBG) fprintf(stderr, "WriteRGBAPixels\n");
+
+	 HW_WRITE_CLIPLOOP()
+	    {
+	       for (i=0;i<n;i++)
+	       {
+		  if (mask[i]) {
+		     const int fy = Y_FLIP(y[i]);
+		     if (CLIPPIXEL(x[i],fy))
+			WRITE_RGBA( x[i], fy,
+				    rgba[i][0], rgba[i][1],
+				    rgba[i][2], rgba[i][3] );
+		  }
+	       }
+	    }
+	 HW_ENDCLIPLOOP();
+      }
+   HW_WRITE_UNLOCK();
+}
+
+
+static void TAG(WriteMonoRGBASpan)( const GLcontext *ctx,	
+				    GLuint n, GLint x, GLint y, 
+				    const GLchan color[4],
+				    const GLubyte mask[] )
+{
+   HW_WRITE_LOCK()
+      {
+	 GLint x1;
+	 GLint n1;
+	 LOCAL_VARS;
+	 INIT_MONO_PIXEL(p, color);
+
+	 y = Y_FLIP( y );
+
+	 if (DBG) fprintf(stderr, "WriteMonoRGBASpan\n");
+
+	 HW_WRITE_CLIPLOOP()
+	    {
+	       GLint i = 0;
+	       CLIPSPAN(x,y,n,x1,n1,i);
+	       for (;n1>0;i++,x1++,n1--)
+		  if (mask[i])
+		     WRITE_PIXEL( x1, y, p );
+	    }
+	 HW_ENDCLIPLOOP();
+      }
+   HW_WRITE_UNLOCK();
+}
+
+
+static void TAG(WriteMonoRGBAPixels)( const GLcontext *ctx,
+				      GLuint n,
+				      const GLint x[], const GLint y[],
+				      const GLchan color[],
+				      const GLubyte mask[] ) 
+{
+   HW_WRITE_LOCK()
+      {
+	 GLint i;
+	 LOCAL_VARS;
+	 INIT_MONO_PIXEL(p, color);
+
+	 if (DBG) fprintf(stderr, "WriteMonoRGBAPixels\n");
+
+	 HW_WRITE_CLIPLOOP()
+	    {
+	       for (i=0;i<n;i++)
+		  if (mask[i]) {
+		     int fy = Y_FLIP(y[i]);
+		     if (CLIPPIXEL( x[i], fy ))
+			WRITE_PIXEL( x[i], fy, p );
+		  }
+	    }
+	 HW_ENDCLIPLOOP();
+      }
+   HW_WRITE_UNLOCK();
+}
+
+
+static void TAG(ReadRGBASpan)( const GLcontext *ctx,
+			       GLuint n, GLint x, GLint y,
+			       GLubyte rgba[][4])
+{
+   HW_READ_LOCK()
+      {
+	 GLint x1,n1;
+	 LOCAL_VARS;
+
+	 y = Y_FLIP(y);
+
+	 if (DBG) fprintf(stderr, "ReadRGBASpan\n");
+
+	 HW_READ_CLIPLOOP()
+	    {
+	       GLint i = 0;
+	       CLIPSPAN(x,y,n,x1,n1,i);
+	       for (;n1>0;i++,x1++,n1--)
+		  READ_RGBA( rgba[i], x1, y );
+	    }
+         HW_ENDCLIPLOOP();
+      }
+   HW_READ_UNLOCK();
+}
+
+
+static void TAG(ReadRGBAPixels)( const GLcontext *ctx,
+				 GLuint n, const GLint x[], const GLint y[],
+				 GLubyte rgba[][4], const GLubyte mask[] )
+{
+   HW_READ_LOCK()
+      {
+	 GLint i;
+	 LOCAL_VARS;
+
+	 if (DBG) fprintf(stderr, "ReadRGBAPixels\n");
+
+	 HW_READ_CLIPLOOP()
+	    {
+	       for (i=0;i<n;i++)
+		  if (mask[i]) {
+		     int fy = Y_FLIP( y[i] );
+		     if (CLIPPIXEL( x[i], fy ))
+			READ_RGBA( rgba[i], x[i], fy );
+		  }
+	    }
+	 HW_ENDCLIPLOOP();
+      }
+   HW_READ_UNLOCK();
+}
+
+
+
+
+#undef WRITE_PIXEL
+#undef WRITE_RGBA
+#undef READ_RGBA
+#undef TAG
diff --git a/reactos/lib/mesa32/src/drivers/dri/common/stenciltmp.h b/reactos/lib/mesa32/src/drivers/dri/common/stenciltmp.h
new file mode 100644
index 00000000000..365e9811ac3
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/dri/common/stenciltmp.h
@@ -0,0 +1,147 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/common/stenciltmp.h,v 1.3 2001/03/21 16:14:20 dawes Exp $ */
+
+#ifndef DBG
+#define DBG 0
+#endif
+
+#ifndef HW_WRITE_LOCK
+#define HW_WRITE_LOCK()		HW_LOCK()
+#endif
+#ifndef HW_WRITE_UNLOCK
+#define HW_WRITE_UNLOCK()	HW_UNLOCK()
+#endif
+
+#ifndef HW_READ_LOCK
+#define HW_READ_LOCK()		HW_LOCK()
+#endif
+#ifndef HW_READ_UNLOCK
+#define HW_READ_UNLOCK()	HW_UNLOCK()
+#endif
+
+static void TAG(WriteStencilSpan)( GLcontext *ctx,
+				   GLuint n, GLint x, GLint y,
+				   const GLstencil *stencil, 
+				   const GLubyte mask[] )
+{
+   HW_WRITE_LOCK()
+      {
+	 GLint x1;
+	 GLint n1;
+	 LOCAL_STENCIL_VARS;
+
+	 y = Y_FLIP(y);
+
+	 HW_CLIPLOOP() 
+	    {
+	       GLint i = 0;
+	       CLIPSPAN(x,y,n,x1,n1,i);
+
+	       if (DBG) fprintf(stderr, "WriteStencilSpan %d..%d (x1 %d)\n",
+				(int)i, (int)n1, (int)x1);
+
+	       if (mask)
+	       {
+		  for (;i<n1;i++,x1++)
+		     if (mask[i])
+			WRITE_STENCIL( x1, y, stencil[i] );
+	       }
+	       else
+	       {
+		  for (;i<n1;i++,x1++)
+		     WRITE_STENCIL( x1, y, stencil[i] );
+	       }
+	    }
+	 HW_ENDCLIPLOOP();
+      }
+   HW_WRITE_UNLOCK();
+}
+
+
+static void TAG(WriteStencilPixels)( GLcontext *ctx,
+				     GLuint n, 
+				     const GLint x[], 
+				     const GLint y[],
+				     const GLstencil stencil[], 
+				     const GLubyte mask[] )
+{
+   HW_WRITE_LOCK()
+      {
+	 GLint i;
+	 LOCAL_STENCIL_VARS;
+
+	 if (DBG) fprintf(stderr, "WriteStencilPixels\n");
+
+	 HW_CLIPLOOP()
+	    {
+	       for (i=0;i<n;i++)
+	       {
+		  if (mask[i]) {
+		     const int fy = Y_FLIP(y[i]);
+		     if (CLIPPIXEL(x[i],fy))
+			WRITE_STENCIL( x[i], fy, stencil[i] );
+		  }
+	       }
+	    }
+	 HW_ENDCLIPLOOP();
+      }
+   HW_WRITE_UNLOCK();
+}
+
+
+/* Read stencil spans and pixels
+ */
+static void TAG(ReadStencilSpan)( GLcontext *ctx,
+				  GLuint n, GLint x, GLint y,
+				  GLstencil stencil[])
+{
+   HW_READ_LOCK()
+      {
+	 GLint x1,n1;
+	 LOCAL_STENCIL_VARS;
+
+	 y = Y_FLIP(y);
+
+	 if (DBG) fprintf(stderr, "ReadStencilSpan\n");
+
+	 HW_CLIPLOOP() 
+	    {
+	       GLint i = 0;
+	       CLIPSPAN(x,y,n,x1,n1,i);
+	       for (;i<n1;i++)
+		  READ_STENCIL( stencil[i], (x1+i), y );
+	    }
+	 HW_ENDCLIPLOOP();
+      }
+   HW_READ_UNLOCK();
+}
+
+static void TAG(ReadStencilPixels)( GLcontext *ctx, GLuint n, 
+				    const GLint x[], const GLint y[],
+				    GLstencil stencil[] )
+{
+   HW_READ_LOCK()
+      {
+	 GLint i;
+	 LOCAL_STENCIL_VARS;
+
+	 if (DBG) fprintf(stderr, "ReadStencilPixels\n");
+ 
+	 HW_CLIPLOOP()
+	    {
+	       for (i=0;i<n;i++) {
+		  int fy = Y_FLIP( y[i] );
+		  if (CLIPPIXEL( x[i], fy ))
+		     READ_STENCIL( stencil[i], x[i], fy );
+	       }
+	    }
+	 HW_ENDCLIPLOOP();
+      }
+   HW_READ_UNLOCK();
+}
+
+
+
+
+#undef WRITE_STENCIL
+#undef READ_STENCIL
+#undef TAG
diff --git a/reactos/lib/mesa32/src/drivers/dri/common/texmem.c b/reactos/lib/mesa32/src/drivers/dri/common/texmem.c
new file mode 100644
index 00000000000..53e87b95930
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/dri/common/texmem.c
@@ -0,0 +1,1230 @@
+/*
+ * Copyright 2000-2001 VA Linux Systems, Inc.
+ * (C) Copyright IBM Corporation 2002, 2003
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * on the rights to use, copy, modify, merge, publish, distribute, sub
+ * license, and/or sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Ian Romanick <idr@us.ibm.com>
+ *    Keith Whitwell <keithw@tungstengraphics.com>
+ *    Kevin E. Martin <kem@users.sourceforge.net>
+ *    Gareth Hughes <gareth@nvidia.com>
+ */
+/* $XFree86:$ */
+
+/** \file texmem.c
+ * Implements all of the device-independent texture memory management.
+ * 
+ * Currently, only a simple LRU texture memory management policy is
+ * implemented.  In the (hopefully very near) future, better policies will be
+ * implemented.  The idea is that the DRI should be able to run in one of two
+ * modes.  In the default mode the DRI will dynamically attempt to discover
+ * the best texture management policy for the running application.  In the
+ * other mode, the user (via some sort of as yet TBD mechanism) will select
+ * a texture management policy that is known to work well with the
+ * application.
+ */
+
+#include "texmem.h"
+#include "simple_list.h"
+#include "imports.h"
+#include "macros.h"
+
+#include <assert.h>
+
+
+
+static unsigned dummy_swap_counter;
+
+
+/**
+ * Calculate \f$\log_2\f$ of a value.  This is a particularly poor
+ * implementation of this function.  However, since system performance is in
+ * no way dependent on this function, the slowness of the implementation is
+ * irrelevent.
+ * 
+ * \param n Value whose \f$\log_2\f$ is to be calculated
+ */
+
+static unsigned
+driLog2( unsigned n )
+{
+   unsigned   log2;
+
+
+   for ( log2 = 1 ; n > 1 ; log2++ ) {
+      n >>= 1;
+   }
+
+   return log2;
+}
+
+
+
+
+/**
+ * Determine if a texture is resident in textureable memory.  Depending on
+ * the driver, this may or may not be on-card memory.  It could be AGP memory
+ * or anyother type of memory from which the hardware can directly read
+ * texels.
+ * 
+ * This function is intended to be used as the \c IsTextureResident function
+ * in the device's \c dd_function_table.
+ * 
+ * \param ctx GL context pointer (currently unused)
+ * \param texObj Texture object to be tested
+ */
+
+GLboolean
+driIsTextureResident( GLcontext * ctx, 
+		      struct gl_texture_object * texObj )
+{
+   driTextureObject * t;
+
+
+   t = (driTextureObject *) texObj->DriverData;
+   return( (t != NULL) && (t->memBlock != NULL) );
+}
+
+
+
+
+/**
+ * (Re)initialize the global circular LRU list.  The last element
+ * in the array (\a heap->nrRegions) is the sentinal.  Keeping it
+ * at the end of the array allows the other elements of the array
+ * to be addressed rationally when looking up objects at a particular
+ * location in texture memory.
+ * 
+ * \param heap Texture heap to be reset
+ */
+
+static void resetGlobalLRU( driTexHeap * heap )
+{
+   drmTextureRegionPtr list = heap->global_regions;
+   unsigned       sz = 1U << heap->logGranularity;
+   unsigned       i;
+
+   for (i = 0 ; (i+1) * sz <= heap->size ; i++) {
+      list[i].prev = i-1;
+      list[i].next = i+1;
+      list[i].age = 0;
+   }
+
+   i--;
+   list[0].prev = heap->nrRegions;
+   list[i].prev = i-1;
+   list[i].next = heap->nrRegions;
+   list[heap->nrRegions].prev = i;
+   list[heap->nrRegions].next = 0;
+   heap->global_age[0] = 0;
+}
+
+/**
+ * Print out debugging information about the local texture LRU.
+ *
+ * \param heap Texture heap to be printed
+ * \param callername Name of calling function
+ */
+static void printLocalLRU( driTexHeap * heap, const char *callername  )
+{
+   driTextureObject *t;
+   unsigned sz = 1U << heap->logGranularity;
+
+   fprintf( stderr, "%s in %s:\nLocal LRU, heap %d:\n", 
+	    __FUNCTION__, callername, heap->heapId );
+
+   foreach ( t, &heap->texture_objects ) {
+      if (!t->memBlock)
+	 continue;
+      if (!t->tObj) {
+	 fprintf( stderr, "Placeholder (%p) %d at 0x%x sz 0x%x\n",
+		  (void *)t,
+		  t->memBlock->ofs / sz,
+		  t->memBlock->ofs,
+		  t->memBlock->size );
+      } else {
+	 fprintf( stderr, "Texture (%p) at 0x%x sz 0x%x\n",
+		  (void *)t,
+		  t->memBlock->ofs,
+		  t->memBlock->size );
+      }
+   }
+   foreach ( t, heap->swapped_objects ) {
+      if (!t->tObj) {
+	 fprintf( stderr, "Swapped Placeholder (%p)\n", (void *)t );
+      } else {
+	 fprintf( stderr, "Swapped Texture (%p)\n", (void *)t );
+      }
+   }
+
+   fprintf( stderr, "\n" );
+}
+
+/**
+ * Print out debugging information about the global texture LRU.
+ *
+ * \param heap Texture heap to be printed
+ * \param callername Name of calling function
+ */
+static void printGlobalLRU( driTexHeap * heap, const char *callername )
+{
+   drmTextureRegionPtr list = heap->global_regions;
+   int i, j;
+
+   fprintf( stderr, "%s in %s:\nGlobal LRU, heap %d list %p:\n", 
+	    __FUNCTION__, callername, heap->heapId, (void *)list );
+
+   for ( i = 0, j = heap->nrRegions ; i < heap->nrRegions ; i++ ) {
+      fprintf( stderr, "list[%d] age %d next %d prev %d in_use %d\n",
+	       j, list[j].age, list[j].next, list[j].prev, list[j].in_use );
+      j = list[j].next;
+      if ( j == heap->nrRegions ) break;
+   }
+
+   if ( j != heap->nrRegions ) {
+      fprintf( stderr, "Loop detected in global LRU\n" );
+      for ( i = 0 ; i < heap->nrRegions ; i++ ) {
+	 fprintf( stderr, "list[%d] age %d next %d prev %d in_use %d\n",
+		  i, list[i].age, list[i].next, list[i].prev, list[i].in_use );
+      }
+   }
+
+   fprintf( stderr, "\n" );
+}
+
+
+/**
+ * Called by the client whenever it touches a local texture.
+ * 
+ * \param t Texture object that the client has accessed
+ */
+
+void driUpdateTextureLRU( driTextureObject * t )
+{
+   driTexHeap   * heap;
+   drmTextureRegionPtr list;
+   unsigned   shift;
+   unsigned   start;
+   unsigned   end;
+   unsigned   i;
+
+
+   heap = t->heap;
+   if ( heap != NULL ) {
+      shift = heap->logGranularity;
+      start = t->memBlock->ofs >> shift;
+      end = (t->memBlock->ofs + t->memBlock->size - 1) >> shift;
+
+
+      heap->local_age = ++heap->global_age[0];
+      list = heap->global_regions;
+
+
+      /* Update the context's local LRU 
+       */
+
+      move_to_head( & heap->texture_objects, t );
+
+
+      for (i = start ; i <= end ; i++) {
+	 list[i].age = heap->local_age;
+
+	 /* remove_from_list(i)
+	  */
+	 list[(unsigned)list[i].next].prev = list[i].prev;
+	 list[(unsigned)list[i].prev].next = list[i].next;
+
+	 /* insert_at_head(list, i)
+	  */
+	 list[i].prev = heap->nrRegions;
+	 list[i].next = list[heap->nrRegions].next;
+	 list[(unsigned)list[heap->nrRegions].next].prev = i;
+	 list[heap->nrRegions].next = i;
+      }
+
+      if ( 0 ) {
+	 printGlobalLRU( heap, __FUNCTION__ );
+	 printLocalLRU( heap, __FUNCTION__ );
+      }
+   }
+}
+
+
+
+
+/**
+ * Keep track of swapped out texture objects.
+ * 
+ * \param t Texture object to be "swapped" out of its texture heap
+ */
+
+void driSwapOutTextureObject( driTextureObject * t )
+{
+   unsigned   face;
+
+
+   if ( t->memBlock != NULL ) {
+      assert( t->heap != NULL );
+      mmFreeMem( t->memBlock );
+      t->memBlock = NULL;
+
+      if (t->timestamp > t->heap->timestamp)
+	 t->heap->timestamp = t->timestamp;
+
+      t->heap->texture_swaps[0]++;
+      move_to_tail( t->heap->swapped_objects, t );
+      t->heap = NULL;
+   }
+   else {
+      assert( t->heap == NULL );
+   }
+
+
+   for ( face = 0 ; face < 6 ; face++ ) {
+      t->dirty_images[face] = ~0;
+   }
+}
+
+
+
+
+/**
+ * Destroy hardware state associated with texture \a t.  Calls the
+ * \a destroy_texture_object method associated with the heap from which
+ * \a t was allocated.
+ * 
+ * \param t Texture object to be destroyed
+ */
+
+void driDestroyTextureObject( driTextureObject * t )
+{
+   driTexHeap * heap;
+
+
+   if ( 0 ) {
+      fprintf( stderr, "[%s:%d] freeing %p (tObj = %p, DriverData = %p)\n",
+	       __FILE__, __LINE__,
+	       (void *)t,
+	       (void *)((t != NULL) ? t->tObj : NULL),
+	       (void *)((t != NULL && t->tObj != NULL) ? t->tObj->DriverData : NULL ));
+   }
+
+   if ( t != NULL ) {
+      if ( t->memBlock ) {
+	 heap = t->heap;
+	 assert( heap != NULL );
+
+	 heap->texture_swaps[0]++;
+
+	 mmFreeMem( t->memBlock );
+	 t->memBlock = NULL;
+
+	 if (t->timestamp > t->heap->timestamp)
+	    t->heap->timestamp = t->timestamp;
+
+	 heap->destroy_texture_object( heap->driverContext, t );
+	 t->heap = NULL;
+      }
+
+      if ( t->tObj != NULL ) {
+	 assert( t->tObj->DriverData == t );
+	 t->tObj->DriverData = NULL;
+      }
+
+      remove_from_list( t );
+      FREE( t );
+   }
+
+   if ( 0 ) {
+      fprintf( stderr, "[%s:%d] done freeing %p\n", __FILE__, __LINE__, (void *)t );
+   }
+}
+
+
+
+
+/**
+ * Update the local heap's representation of texture memory based on
+ * data in the SAREA.  This is done each time it is detected that some other
+ * direct rendering client has held the lock.  This pertains to both our local
+ * textures and the textures belonging to other clients.  Keep track of other
+ * client's textures by pushing a placeholder texture onto the LRU list --
+ * these are denoted by \a tObj being \a NULL.
+ * 
+ * \param heap Heap whose state is to be updated
+ * \param offset Byte offset in the heap that has been stolen
+ * \param size Size, in bytes, of the stolen block
+ * \param in_use Non-zero if the block is pinned/reserved by the kernel
+ */
+
+static void driTexturesGone( driTexHeap * heap, int offset, int size, 
+			     int in_use )
+{
+   driTextureObject * t;
+   driTextureObject * tmp;
+
+
+   foreach_s ( t, tmp, & heap->texture_objects ) {
+      if ( (t->memBlock->ofs < (offset + size))
+	   && ((t->memBlock->ofs + t->memBlock->size) > offset) ) {
+	 /* It overlaps - kick it out.  If the texture object is just a
+	  * place holder, then destroy it all together.  Otherwise, mark
+	  * it as being swapped out.
+	  */
+
+	 if ( t->tObj != NULL ) {
+	    driSwapOutTextureObject( t );
+	 }
+	 else {
+	    driDestroyTextureObject( t );
+	 }
+      }
+   }
+
+
+   {
+      t = (driTextureObject *) CALLOC( heap->texture_object_size );
+      if ( t == NULL ) return;
+
+      t->memBlock = mmAllocMem( heap->memory_heap, size, 0, offset );
+      if ( t->memBlock == NULL ) {
+	 fprintf( stderr, "Couldn't alloc placeholder: heap %u sz %x ofs %x\n", heap->heapId,
+		  (int)size, (int)offset );
+	 mmDumpMemInfo( heap->memory_heap );
+	 return;
+      }
+      t->heap = heap;
+      if (in_use) 
+	 t->bound = 99;
+      insert_at_head( & heap->texture_objects, t );
+   }
+}
+
+
+
+
+/**
+ * Called by the client on lock contention to determine whether textures have
+ * been stolen.  If another client has modified a region in which we have
+ * textures, then we need to figure out which of our textures have been
+ * removed and update our global LRU.
+ * 
+ * \param heap Texture heap to be updated
+ */
+
+void driAgeTextures( driTexHeap * heap )
+{
+   drmTextureRegionPtr list = heap->global_regions;
+   unsigned       sz = 1U << (heap->logGranularity);
+   unsigned       i, nr = 0;
+
+
+   /* Have to go right round from the back to ensure stuff ends up
+    * LRU in the local list...  Fix with a cursor pointer.
+    */
+
+   for (i = list[heap->nrRegions].prev ; 
+	i != heap->nrRegions && nr < heap->nrRegions ; 
+	i = list[i].prev, nr++) {
+      /* If switching texturing schemes, then the SAREA might not have been
+       * properly cleared, so we need to reset the global texture LRU.
+       */
+
+      if ( (i * sz) > heap->size ) {
+	 nr = heap->nrRegions;
+	 break;
+      }
+
+      if (list[i].age > heap->local_age) 
+	  driTexturesGone( heap, i * sz, sz, list[i].in_use); 
+   }
+
+   /* Loop or uninitialized heap detected.  Reset.
+    */
+
+   if (nr == heap->nrRegions) {
+      driTexturesGone( heap, 0, heap->size, 0);
+      resetGlobalLRU( heap );
+   }
+
+   if ( 0 ) {
+      printGlobalLRU( heap, __FUNCTION__ );
+      printLocalLRU( heap, __FUNCTION__ );
+   }
+
+   heap->local_age = heap->global_age[0];
+}
+
+
+
+
+/**
+ * Allocate memory from a texture heap to hold a texture object.  This
+ * routine will attempt to allocate memory for the texture from the heaps
+ * specified by \c heap_array in order.  That is, first it will try to
+ * allocate from \c heap_array[0], then \c heap_array[1], and so on.
+ *
+ * \param heap_array Array of pointers to texture heaps to use
+ * \param nr_heaps Number of heap pointer in \a heap_array
+ * \param t Texture object for which space is needed
+ * \return The ID of the heap from which memory was allocated, or -1 if
+ *         memory could not be allocated.
+ *
+ * \bug The replacement policy implemented by this function is horrible.
+ */
+
+
+int
+driAllocateTexture( driTexHeap * const * heap_array, unsigned nr_heaps,
+		    driTextureObject * t )
+{
+   driTexHeap       * heap;
+   driTextureObject * temp;
+   driTextureObject * cursor;
+   unsigned           id;
+
+
+   /* In case it already has texture space, initialize heap.  This also
+    * prevents GCC from issuing a warning that heap might be used
+    * uninitialized.
+    */
+
+   heap = t->heap;
+
+
+   /* Run through each of the existing heaps and try to allocate a buffer
+    * to hold the texture.
+    */
+
+   for ( id = 0 ; (t->memBlock == NULL) && (id < nr_heaps) ; id++ ) {
+      heap = heap_array[ id ];
+      if ( heap != NULL ) {
+	 t->memBlock = mmAllocMem( heap->memory_heap, t->totalSize, 
+				   heap->alignmentShift, 0 );
+      }
+   }
+
+
+   /* Kick textures out until the requested texture fits.
+    */
+
+   if ( t->memBlock == NULL ) {
+      for ( id = 0 ; (t->memBlock == NULL) && (id < nr_heaps) ; id++ ) {
+	 heap = heap_array[ id ];
+	 if ( t->totalSize <= heap->size ) { 
+
+	    for ( cursor = heap->texture_objects.prev, temp = cursor->prev;
+		  cursor != &heap->texture_objects ; 
+		  cursor = temp, temp = cursor->prev ) {
+	       
+	       /* The the LRU element.  If the texture is bound to one of
+		* the texture units, then we cannot kick it out.
+		*/
+	       if ( cursor->bound /* || cursor->reserved */ ) {
+		  continue;
+	       }
+
+	       /* If this is a placeholder, there's no need to keep it */
+	       if (cursor->tObj)
+		   driSwapOutTextureObject( cursor );
+	       else
+		   driDestroyTextureObject( cursor );
+
+	       t->memBlock = mmAllocMem( heap->memory_heap, t->totalSize, 
+					 heap->alignmentShift, 0 );
+
+	       if (t->memBlock)
+		  break;
+	    }
+	 }     /* if ( t->totalSize <= heap->size ) ... */
+      }
+   }
+
+
+   if ( t->memBlock != NULL ) {
+      /* id and heap->heapId may or may not be the same value here.
+       */
+
+      assert( heap != NULL );
+      assert( (t->heap == NULL) || (t->heap == heap) );
+
+      t->heap = heap;
+      return heap->heapId;
+   }
+   else {
+      assert( t->heap == NULL );
+
+      fprintf( stderr, "[%s:%d] unable to allocate texture\n",
+	       __FUNCTION__, __LINE__ );
+      return -1;
+   }
+}
+
+
+
+
+
+
+/**
+ * Set the location where the texture-swap counter is stored.
+ */
+
+void
+driSetTextureSwapCounterLocation( driTexHeap * heap, unsigned * counter )
+{
+   heap->texture_swaps = (counter == NULL) ? & dummy_swap_counter : counter;
+}
+
+
+
+
+/**
+ * Create a new heap for texture data.
+ * 
+ * \param heap_id             Device-dependent heap identifier.  This value
+ *                            will returned by driAllocateTexture when memory
+ *                            is allocated from this heap.
+ * \param context             Device-dependent driver context.  This is
+ *                            supplied as the first parameter to the
+ *                            \c destroy_tex_obj function.
+ * \param size                Size, in bytes, of the texture region
+ * \param alignmentShift      Alignment requirement for textures.  If textures 
+ *                            must be allocated on a 4096 byte boundry, this
+ *                            would be 12.
+ * \param nr_regions          Number of regions into which this texture space
+ *                            should be partitioned
+ * \param global_regions      Array of \c drmTextureRegion structures in the SAREA
+ * \param global_age          Pointer to the global texture age in the SAREA
+ * \param swapped_objects     Pointer to the list of texture objects that are
+ *                            not in texture memory (i.e., have been swapped
+ *                            out).
+ * \param texture_object_size Size, in bytes, of a device-dependent texture
+ *                            object
+ * \param destroy_tex_obj     Function used to destroy a device-dependent
+ *                            texture object
+ *
+ * \sa driDestroyTextureHeap
+ */
+
+driTexHeap *
+driCreateTextureHeap( unsigned heap_id, void * context, unsigned size,
+		      unsigned alignmentShift, unsigned nr_regions,
+		      drmTextureRegionPtr global_regions, unsigned * global_age,
+		      driTextureObject * swapped_objects, 
+		      unsigned texture_object_size,
+		      destroy_texture_object_t * destroy_tex_obj
+		    )
+{
+   driTexHeap * heap;
+   unsigned     l;
+    
+    
+   if ( 0 )
+       fprintf( stderr, "%s( %u, %p, %u, %u, %u )\n",
+		__FUNCTION__,
+		heap_id, (void *)context, size, alignmentShift, nr_regions );
+
+   heap = (driTexHeap *) CALLOC( sizeof( driTexHeap ) );
+   if ( heap != NULL ) {
+      l = driLog2( (size - 1) / nr_regions );
+      if ( l < alignmentShift )
+      {
+	 l = alignmentShift;
+      }
+
+      heap->logGranularity = l;
+      heap->size = size & ~((1L << l) - 1);
+
+      heap->memory_heap = mmInit( 0, heap->size );
+      if ( heap->memory_heap != NULL ) {
+	 heap->heapId = heap_id;
+	 heap->driverContext = context;
+
+	 heap->alignmentShift = alignmentShift;
+	 heap->nrRegions = nr_regions;
+	 heap->global_regions = global_regions;
+	 heap->global_age = global_age;
+	 heap->swapped_objects = swapped_objects;
+	 heap->texture_object_size = texture_object_size;
+	 heap->destroy_texture_object = destroy_tex_obj;
+
+	 /* Force global heap init */
+	 if (heap->global_age[0] == 0)
+	     heap->local_age = ~0;
+	 else
+	     heap->local_age = 0;
+
+	 make_empty_list( & heap->texture_objects );
+	 driSetTextureSwapCounterLocation( heap, NULL );
+      }
+      else {
+	 FREE( heap );
+	 heap = NULL;
+      }
+   }
+
+
+   if ( 0 )
+       fprintf( stderr, "%s returning %p\n", __FUNCTION__, (void *)heap );
+
+   return heap;
+}
+
+
+
+
+/** Destroys a texture heap
+ * 
+ * \param heap Texture heap to be destroyed
+ */
+
+void
+driDestroyTextureHeap( driTexHeap * heap )
+{
+   driTextureObject * t;
+   driTextureObject * temp;
+
+
+   if ( heap != NULL ) {
+      foreach_s( t, temp, & heap->texture_objects ) {
+	 driDestroyTextureObject( t );
+      }
+      foreach_s( t, temp, heap->swapped_objects ) {
+	 driDestroyTextureObject( t );
+      }
+
+      mmDestroy( heap->memory_heap );
+      FREE( heap );
+   }
+}
+
+
+
+
+/****************************************************************************/
+/**
+ * Determine how many texels (including all mipmap levels) would be required
+ * for a texture map of size \f$2^^\c base_size_log2\f$ would require.
+ *
+ * \param base_size_log2 \f$log_2\f$ of the size of a side of the texture
+ * \param dimensions Number of dimensions of the texture.  Either 2 or 3.
+ * \param faces Number of faces of the texture.  Either 1 or 6 (for cube maps).
+ * \return Number of texels
+ */
+
+static unsigned
+texels_this_map_size( int base_size_log2, unsigned dimensions, unsigned faces )
+{
+   unsigned  texels;
+
+
+   assert( (faces == 1) || (faces == 6) );
+   assert( (dimensions == 2) || (dimensions == 3) );
+
+   texels = 0;
+   if ( base_size_log2 >= 0 ) {
+      texels = (1U << (dimensions * base_size_log2));
+
+      /* See http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg03636.html
+       * for the complete explaination of why this formulation is used.
+       * Basically, the smaller mipmap levels sum to 0.333 the size of the
+       * level 0 map.  The total size is therefore the size of the map
+       * multipled by 1.333.  The +2 is there to round up.
+       */
+
+      texels = (texels * 4 * faces + 2) / 3;
+   }
+
+   return texels;
+}
+
+
+
+
+struct maps_per_heap {
+   unsigned  c[32];
+};
+
+static void
+fill_in_maximums( driTexHeap * const * heaps, unsigned nr_heaps,
+		  unsigned max_bytes_per_texel, unsigned max_size,
+		  unsigned mipmaps_at_once, unsigned dimensions,
+		  unsigned faces, struct maps_per_heap * max_textures )
+{
+   unsigned   heap;
+   unsigned   log2_size;
+   unsigned   mask;
+
+
+   /* Determine how many textures of each size can be stored in each
+    * texture heap.
+    */
+
+   for ( heap = 0 ; heap < nr_heaps ; heap++ ) {
+      if ( heaps[ heap ] == NULL ) {
+	 (void) memset( max_textures[ heap ].c, 0, 
+			sizeof( max_textures[ heap ].c ) );
+	 continue;
+      }
+
+      mask = (1U << heaps[ heap ]->logGranularity) - 1;
+
+      if ( 0 ) {
+	 fprintf( stderr, "[%s:%d] heap[%u] = %u bytes, mask = 0x%08x\n",
+		  __FILE__, __LINE__,
+		  heap, heaps[ heap ]->size, mask );
+      }
+
+      for ( log2_size = max_size ; log2_size > 0 ; log2_size-- ) {
+	 unsigned   total;
+
+
+	 /* Determine the total number of bytes required by a texture of
+	  * size log2_size.
+	  */
+
+	 total = texels_this_map_size( log2_size, dimensions, faces )
+	     - texels_this_map_size( log2_size - mipmaps_at_once,
+				     dimensions, faces );
+	 total *= max_bytes_per_texel;
+	 total = (total + mask) & ~mask;
+
+	 /* The number of textures of a given size that will fit in a heap
+	  * is equal to the size of the heap divided by the size of the
+	  * texture.
+	  */
+
+	 max_textures[ heap ].c[ log2_size ] = heaps[ heap ]->size / total;
+
+	 if ( 0 ) {
+	    fprintf( stderr, "[%s:%d] max_textures[%u].c[%02u] "
+		     "= 0x%08x / 0x%08x "
+		     "= %u (%u)\n",
+		     __FILE__, __LINE__,
+		     heap, log2_size,
+		     heaps[ heap ]->size, total,
+		     heaps[ heap ]->size / total,
+		     max_textures[ heap ].c[ log2_size ] );
+	 }
+      }
+   }
+}
+
+
+static unsigned
+get_max_size( unsigned nr_heaps,
+	      unsigned texture_units,
+	      unsigned max_size,
+	      int all_textures_one_heap,
+	      struct maps_per_heap * max_textures )
+{
+   unsigned   heap;
+   unsigned   log2_size;
+
+
+   /* Determine the largest texture size such that a texture of that size
+    * can be bound to each texture unit at the same time.  Some hardware
+    * may require that all textures be in the same texture heap for
+    * multitexturing.
+    */
+
+   for ( log2_size = max_size ; log2_size > 0 ; log2_size-- ) {
+      unsigned   total = 0;
+
+      for ( heap = 0 ; heap < nr_heaps ; heap++ )
+      {
+	 total += max_textures[ heap ].c[ log2_size ];
+
+	 if ( 0 ) {
+	    fprintf( stderr, "[%s:%d] max_textures[%u].c[%02u] = %u, "
+		     "total = %u\n", __FILE__, __LINE__, heap, log2_size,
+		     max_textures[ heap ].c[ log2_size ], total );
+	 }
+
+	 if ( (max_textures[ heap ].c[ log2_size ] >= texture_units)
+	      || (!all_textures_one_heap && (total >= texture_units)) ) {
+	    /* The number of mipmap levels is the log-base-2 of the
+	     * maximum texture size plus 1.  If the maximum texture size
+	     * is 1x1, the log-base-2 is 0 and 1 mipmap level (the base
+	     * level) is available.
+	     */
+
+	    return log2_size + 1;
+	 }
+      }
+   }
+
+   /* This should NEVER happen.  It should always be possible to have at
+    * *least* a 1x1 texture in memory!
+    */
+   assert( log2_size != 0 );
+   return 0;
+}
+
+#define SET_MAX(f,v) \
+    do { if ( max_sizes[v] != 0 ) { limits-> f = max_sizes[v]; } } while( 0 )
+
+#define SET_MAX_RECT(f,v) \
+    do { if ( max_sizes[v] != 0 ) { limits-> f = 1 << max_sizes[v]; } } while( 0 )
+
+
+/**
+ * Given the amount of texture memory, the number of texture units, and the
+ * maximum size of a texel, calculate the maximum texture size the driver can
+ * advertise.
+ * 
+ * \param heaps Texture heaps for this card
+ * \param nr_heap Number of texture heaps
+ * \param limits OpenGL contants.  MaxTextureUnits must be set.
+ * \param max_bytes_per_texel Maximum size of a single texel, in bytes
+ * \param max_2D_size \f$\log_2\f$ of the maximum 2D texture size (i.e.,
+ *     1024x1024 textures, this would be 10)
+ * \param max_3D_size \f$\log_2\f$ of the maximum 3D texture size (i.e.,
+ *     1024x1024x1024 textures, this would be 10)
+ * \param max_cube_size \f$\log_2\f$ of the maximum cube texture size (i.e.,
+ *     1024x1024 textures, this would be 10)
+ * \param max_rect_size \f$\log_2\f$ of the maximum texture rectangle size
+ *     (i.e., 1024x1024 textures, this would be 10).  This is a power-of-2
+ *     even though texture rectangles need not be a power-of-2.
+ * \param mipmaps_at_once Total number of mipmaps that can be used
+ *     at one time.  For most hardware this will be \f$\c max_size + 1\f$.
+ *     For hardware that does not support mipmapping, this will be 1.
+ * \param all_textures_one_heap True if the hardware requires that all
+ *     textures be in a single texture heap for multitexturing.
+ */
+
+void
+driCalculateMaxTextureLevels( driTexHeap * const * heaps,
+			      unsigned nr_heaps,
+			      struct gl_constants * limits,
+			      unsigned max_bytes_per_texel, 
+			      unsigned max_2D_size,
+			      unsigned max_3D_size,
+			      unsigned max_cube_size,
+			      unsigned max_rect_size,
+			      unsigned mipmaps_at_once,
+			      int all_textures_one_heap )
+{
+   struct maps_per_heap  max_textures[8];
+   unsigned         i;
+   const unsigned   dimensions[4] = { 2, 3, 2, 2 };
+   const unsigned   faces[4]      = { 1, 1, 6, 1 };
+   unsigned         max_sizes[4];
+   unsigned         mipmaps[4];
+
+
+   max_sizes[0] = max_2D_size;
+   max_sizes[1] = max_3D_size;
+   max_sizes[2] = max_cube_size;
+   max_sizes[3] = max_rect_size;
+
+   mipmaps[0] = mipmaps_at_once;
+   mipmaps[1] = mipmaps_at_once;
+   mipmaps[2] = 1;
+   mipmaps[3] = mipmaps_at_once;
+
+
+   /* Calculate the maximum number of texture levels in two passes.  The
+    * first pass determines how many textures of each power-of-two size
+    * (including all mipmap levels for that size) can fit in each texture
+    * heap.  The second pass finds the largest texture size that allows
+    * a texture of that size to be bound to every texture unit.
+    */
+
+   for ( i = 0 ; i < 4 ; i++ ) {
+      if ( max_sizes[ i ] != 0 ) {
+	 fill_in_maximums( heaps, nr_heaps, max_bytes_per_texel, 
+			   max_sizes[ i ], mipmaps[ i ],
+			   dimensions[ i ], faces[ i ],
+			   max_textures );
+
+	 max_sizes[ i ] = get_max_size( nr_heaps, 
+					limits->MaxTextureUnits,
+					max_sizes[ i ],
+					all_textures_one_heap,
+					max_textures );
+      }
+   }
+
+   SET_MAX( MaxTextureLevels,        0 );
+   SET_MAX( Max3DTextureLevels,      1 );
+   SET_MAX( MaxCubeTextureLevels,    2 );
+   SET_MAX_RECT( MaxTextureRectSize, 3 );
+}
+
+
+
+
+/**
+ * Perform initial binding of default textures objects on a per unit, per
+ * texture target basis.
+ *
+ * \param ctx Current OpenGL context
+ * \param swapped List of swapped-out textures
+ * \param targets Bit-mask of value texture targets
+ */
+
+void driInitTextureObjects( GLcontext *ctx, driTextureObject * swapped,
+			    GLuint targets )
+{
+   struct gl_texture_object *texObj;
+   GLuint tmp = ctx->Texture.CurrentUnit;
+   unsigned   i;
+
+
+   for ( i = 0 ; i < ctx->Const.MaxTextureUnits ; i++ ) {
+      ctx->Texture.CurrentUnit = i;
+
+      if ( (targets & DRI_TEXMGR_DO_TEXTURE_1D) != 0 ) {
+	 texObj = ctx->Texture.Unit[i].Current1D;
+	 ctx->Driver.BindTexture( ctx, GL_TEXTURE_1D, texObj );
+	 move_to_tail( swapped, (driTextureObject *) texObj->DriverData );
+      }
+
+      if ( (targets & DRI_TEXMGR_DO_TEXTURE_2D) != 0 ) {
+	 texObj = ctx->Texture.Unit[i].Current2D;
+	 ctx->Driver.BindTexture( ctx, GL_TEXTURE_2D, texObj );
+	 move_to_tail( swapped, (driTextureObject *) texObj->DriverData );
+      }
+
+      if ( (targets & DRI_TEXMGR_DO_TEXTURE_3D) != 0 ) {
+	 texObj = ctx->Texture.Unit[i].Current3D;
+	 ctx->Driver.BindTexture( ctx, GL_TEXTURE_3D, texObj );
+	 move_to_tail( swapped, (driTextureObject *) texObj->DriverData );
+      }
+
+      if ( (targets & DRI_TEXMGR_DO_TEXTURE_CUBE) != 0 ) {
+	 texObj = ctx->Texture.Unit[i].CurrentCubeMap;
+	 ctx->Driver.BindTexture( ctx, GL_TEXTURE_CUBE_MAP_ARB, texObj );
+	 move_to_tail( swapped, (driTextureObject *) texObj->DriverData );
+      }
+
+      if ( (targets & DRI_TEXMGR_DO_TEXTURE_RECT) != 0 ) {
+	 texObj = ctx->Texture.Unit[i].CurrentRect;
+	 ctx->Driver.BindTexture( ctx, GL_TEXTURE_RECTANGLE_NV, texObj );
+	 move_to_tail( swapped, (driTextureObject *) texObj->DriverData );
+      }
+   }
+
+   ctx->Texture.CurrentUnit = tmp;
+}
+
+
+
+
+/**
+ * Verify that the specified texture is in the specificed heap.
+ * 
+ * \param tex   Texture to be tested.
+ * \param heap  Texture memory heap to be tested.
+ * \return True if the texture is in the heap, false otherwise.
+ */
+
+static GLboolean
+check_in_heap( const driTextureObject * tex, const driTexHeap * heap )
+{
+#if 1
+   return tex->heap == heap;
+#else
+   driTextureObject * curr;
+
+   foreach( curr, & heap->texture_objects ) {
+      if ( curr == tex ) {
+	 break;
+      }
+   }
+
+   return curr == tex;
+#endif
+}
+
+
+
+/****************************************************************************/
+/**
+ * Validate the consistency of a set of texture heaps.
+ * Original version by Keith Whitwell in r200/r200_sanity.c.
+ */
+
+GLboolean
+driValidateTextureHeaps( driTexHeap * const * texture_heaps,
+			 unsigned nr_heaps, const driTextureObject * swapped )
+{
+   driTextureObject *t;
+   unsigned  i;
+
+   for ( i = 0 ; i < nr_heaps ; i++ ) {
+      int last_end = 0;
+      unsigned textures_in_heap = 0;
+      unsigned blocks_in_mempool = 0;
+      const driTexHeap * heap = texture_heaps[i];
+      const memHeap_t * p = heap->memory_heap;
+
+      /* Check each texture object has a MemBlock, and is linked into
+       * the correct heap.  
+       *
+       * Check the texobj base address corresponds to the MemBlock
+       * range.  Check the texobj size (recalculate???) fits within
+       * the MemBlock.
+       *
+       * Count the number of texobj's using this heap.
+       */
+
+      foreach ( t, &heap->texture_objects ) {
+	 if ( !check_in_heap( t, heap ) ) {
+	    fprintf( stderr, "%s memory block for texture object @ %p not "
+		     "found in heap #%d\n",
+		     __FUNCTION__, (void *)t, i );
+	    return GL_FALSE;
+	 }
+
+
+	 if ( t->totalSize > t->memBlock->size ) {
+	    fprintf( stderr, "%s: Memory block for texture object @ %p is "
+		     "only %u bytes, but %u are required\n",
+		     __FUNCTION__, (void *)t, t->totalSize, t->memBlock->size );
+	    return GL_FALSE;
+	 }
+
+	 textures_in_heap++;
+      }
+
+      /* Validate the contents of the heap:
+       *   - Ordering
+       *   - Overlaps
+       *   - Bounds
+       */
+
+      while ( p != NULL ) {
+	 if (p->reserved) {
+	    fprintf( stderr, "%s: Block (%08x,%x), is reserved?!\n",
+		     __FUNCTION__, p->ofs, p->size );
+	    return GL_FALSE;
+	 }
+
+	 if (p->ofs != last_end) {
+	    fprintf( stderr, "%s: blocks_in_mempool = %d, last_end = %d, p->ofs = %d\n",
+		     __FUNCTION__, blocks_in_mempool, last_end, p->ofs );
+	    return GL_FALSE;
+	 }
+
+	 if (!p->reserved && !p->free) {
+	    blocks_in_mempool++;
+	 }
+
+	 last_end = p->ofs + p->size;
+	 p = p->next;
+      }
+
+      if (textures_in_heap != blocks_in_mempool) {
+	 fprintf( stderr, "%s: Different number of textures objects (%u) and "
+		  "inuse memory blocks (%u)\n", 
+		  __FUNCTION__, textures_in_heap, blocks_in_mempool );
+	 return GL_FALSE;
+      }
+
+#if 0
+      fprintf( stderr, "%s: textures_in_heap = %u\n", 
+	       __FUNCTION__, textures_in_heap );
+#endif
+   }
+
+
+   /* Check swapped texobj's have zero memblocks
+    */
+   i = 0;
+   foreach ( t, swapped ) {
+      if ( t->memBlock != NULL ) {
+	 fprintf( stderr, "%s: Swapped texobj %p has non-NULL memblock %p\n",
+		  __FUNCTION__, (void *)t, (void *)t->memBlock );
+	 return GL_FALSE;
+      }
+      i++;
+   }
+
+#if 0
+   fprintf( stderr, "%s: swapped texture count = %u\n", __FUNCTION__, i );
+#endif
+
+   return GL_TRUE;
+}
+
+
+
+
+/****************************************************************************/
+/**
+ * Compute which mipmap levels that really need to be sent to the hardware.
+ * This depends on the base image size, GL_TEXTURE_MIN_LOD,
+ * GL_TEXTURE_MAX_LOD, GL_TEXTURE_BASE_LEVEL, and GL_TEXTURE_MAX_LEVEL.
+ */
+
+void
+driCalculateTextureFirstLastLevel( driTextureObject * t )
+{
+   struct gl_texture_object * const tObj = t->tObj;
+   const struct gl_texture_image * const baseImage =
+       tObj->Image[tObj->BaseLevel];
+
+   /* These must be signed values.  MinLod and MaxLod can be negative numbers,
+    * and having firstLevel and lastLevel as signed prevents the need for
+    * extra sign checks.
+    */
+   int   firstLevel;
+   int   lastLevel;
+
+   /* Yes, this looks overly complicated, but it's all needed.
+    */
+
+   switch (tObj->Target) {
+   case GL_TEXTURE_1D:
+   case GL_TEXTURE_2D:
+   case GL_TEXTURE_3D:
+   case GL_TEXTURE_CUBE_MAP:
+      if (tObj->MinFilter == GL_NEAREST || tObj->MinFilter == GL_LINEAR) {
+         /* GL_NEAREST and GL_LINEAR only care about GL_TEXTURE_BASE_LEVEL.
+          */
+
+         firstLevel = lastLevel = tObj->BaseLevel;
+      }
+      else {
+	 firstLevel = tObj->BaseLevel + (GLint)(tObj->MinLod + 0.5);
+	 firstLevel = MAX2(firstLevel, tObj->BaseLevel);
+	 lastLevel = tObj->BaseLevel + (GLint)(tObj->MaxLod + 0.5);
+	 lastLevel = MAX2(lastLevel, t->tObj->BaseLevel);
+	 lastLevel = MIN2(lastLevel, t->tObj->BaseLevel + baseImage->MaxLog2);
+	 lastLevel = MIN2(lastLevel, t->tObj->MaxLevel);
+	 lastLevel = MAX2(firstLevel, lastLevel); /* need at least one level */
+      }
+      break;
+   case GL_TEXTURE_RECTANGLE_NV:
+   case GL_TEXTURE_4D_SGIS:
+      firstLevel = lastLevel = 0;
+      break;
+   default:
+      return;
+   }
+
+   /* save these values */
+   t->firstLevel = firstLevel;
+   t->lastLevel = lastLevel;
+}
diff --git a/reactos/lib/mesa32/src/drivers/dri/common/texmem.h b/reactos/lib/mesa32/src/drivers/dri/common/texmem.h
new file mode 100644
index 00000000000..9afbb0c865b
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/dri/common/texmem.h
@@ -0,0 +1,295 @@
+/*
+ * Copyright 2000-2001 VA Linux Systems, Inc.
+ * (c) Copyright IBM Corporation 2002
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * on the rights to use, copy, modify, merge, publish, distribute, sub
+ * license, and/or sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Ian Romanick <idr@us.ibm.com>
+ *    Keith Whitwell <keithw@tungstengraphics.com>
+ *    Kevin E. Martin <kem@users.sourceforge.net>
+ *    Gareth Hughes <gareth@nvidia.com>
+ */
+/* $XFree86:$ */
+
+/** \file texmem.h
+ * Public interface to the DRI texture memory management routines.
+ * 
+ * \sa texmem.c
+ */
+
+#ifndef DRI_TEXMEM_H
+#define DRI_TEXMEM_H
+
+#include "mtypes.h"
+#include "mm.h"
+#include "xf86drm.h"
+
+struct dri_tex_heap;
+typedef struct dri_tex_heap driTexHeap;
+
+struct dri_texture_object;
+typedef struct dri_texture_object driTextureObject;
+
+
+/**
+ * Base texture object type.  Each driver will extend this type with its own
+ * private data members.
+ */
+
+struct dri_texture_object {
+	struct dri_texture_object * next;
+	struct dri_texture_object * prev;
+
+	driTexHeap * heap;		/**< Texture heap currently stored in */
+	struct gl_texture_object * tObj;/**< Pointer to Mesa texture object
+					 * If NULL, this texture object is a
+					 * "placeholder" object representing
+					 * texture memory in use by another context.
+					 * A placeholder should have a heap and a memBlock.
+					 */
+	PMemBlock   memBlock;		/**< Memory block containing texture */
+	unsigned    bound;		/**< Texture unit currently bound to */
+
+	unsigned    totalSize;		/**< Total size of the texture,
+					 * including all mipmap levels 
+					 */
+
+	unsigned    dirty_images[6];	/**< Flags for whether or not images
+					 * need to be uploaded to local or
+					 * AGP texture space.  One flag set
+					 * for each cube face for cubic
+					 * textures.  Bit zero corresponds to
+					 * the base-level, which may or may
+					 * not be the level zero mipmap.
+					 */
+
+        unsigned    timestamp;	        /**< Timestamp used to
+					 * synchronize with 3d engine
+					 * in hardware where textures
+					 * are uploaded directly to
+					 * the framebuffer.  
+					 */
+
+        unsigned    firstLevel;         /**< Image in \c tObj->Image that
+					 * corresponds to the base-level of
+					 * this texture object.
+					 */
+
+        unsigned    lastLevel;          /**< Last image in \c tObj->Image used
+					 * by the current LOD settings of this
+					 * texture object.  This value must be
+					 * greater than or equal to
+					 * \c firstLevel.
+					 */
+};
+
+
+typedef void (destroy_texture_object_t)( void * driverContext,
+				        driTextureObject * t );
+
+/**
+ * Client-private representation of texture memory state.
+ *
+ * Clients will place one or more of these structs in their driver
+ * context struct to manage one or more global texture heaps.
+ */
+
+struct dri_tex_heap {
+
+	/** Client-supplied heap identifier 
+	 */
+	unsigned heapId;	
+
+	/** Pointer to the client's private context 
+	 */
+	void *driverContext;
+
+	/** Total size of the heap, in bytes
+	 */
+	unsigned size;
+
+	/** \brief \f$log_2\f$ of size of single heap region
+	 *
+	 * Each context takes memory from the global texture heap in
+	 * \f$2^{logGranularity}\f$ byte blocks.  The value of
+	 * \a logGranularity is based on the amount of memory represented
+	 * by the heap and the maximum number of regions in the SAREA.  Given
+	 * \a b bytes of texture memory an \a n regions in the SAREA,
+	 * \a logGranularity will be \f$\lfloor\log_2( b / n )\rfloor\f$.
+	 */
+	unsigned logGranularity;
+
+	/** \brief Required alignment of allocations in this heap
+	 * 
+	 * The alignment shift is supplied to \a mmAllocMem when memory is
+	 * allocated from this heap.  The value of \a alignmentShift will
+	 * typically reflect some require of the hardware.  This value has
+	 * \b no \b relation to \a logGranularity.  \a alignmentShift is a
+	 * per-context value.
+	 *
+	 * \sa mmAllocMem
+	 */
+	unsigned alignmentShift;
+
+	/** Number of elements in global list (the SAREA).
+	 */
+	unsigned nrRegions;	 
+
+	/** Pointer to SAREA \a driTexRegion array
+	 */
+	drmTextureRegionPtr global_regions;
+
+	/** Pointer to the texture state age (generation number) in the SAREA
+	 */
+	unsigned     * global_age;
+
+	/** Local age (generation number) of texture state
+	 */
+	unsigned local_age;
+
+	/** Memory heap used to manage texture memory represented by
+	 * this texture heap.
+	 */
+	memHeap_t    * memory_heap;
+
+	/** List of objects that we currently believe to be in texture
+	 * memory.
+	 */
+	driTextureObject     texture_objects;
+    
+	/** Pointer to the list of texture objects that are not in
+	 * texture memory.
+	 */
+	driTextureObject   * swapped_objects;
+
+	/** Size of the driver-speicific texture object.
+	 */
+	unsigned       texture_object_size;
+
+
+	/**
+	 * \brief Function to destroy driver-specific texture object data.
+	 * 
+	 * This function is supplied by the driver so that the texture manager
+	 * can release all resources associated with a texture object.  This
+	 * function should only release driver-specific data.  That is,
+	 * \a driDestroyTextureObject will release the texture memory
+	 * associated with the texture object, it will release the memory
+	 * for the texture object itself, and it will unlink the texture
+	 * object from the texture object lists.
+	 *
+	 * \param driverContext Pointer to the driver supplied context
+	 * \param t Texture object that is to be destroyed
+	 * \sa driDestroyTextureObject
+	 */
+
+	destroy_texture_object_t * destroy_texture_object;
+
+
+	/**
+	 */
+	unsigned * texture_swaps;
+
+        /**
+	 * Timestamp used to synchronize with 3d engine in hardware
+	 * where textures are uploaded directly to the
+	 * framebuffer.  
+	 */
+        unsigned timestamp;
+};
+
+
+
+
+/**
+ * Called by the client on lock contention to determine whether textures have
+ * been stolen.  If another client has modified a region in which we have
+ * textures, then we need to figure out which of our textures have been
+ * removed and update our global LRU.
+ * 
+ * \param heap Texture heap to be updated
+ * \hideinitializer
+ */
+
+#define DRI_AGE_TEXTURES( heap )				\
+   do {								\
+       if ( ((heap) != NULL)					\
+	    && ((heap)->local_age != (heap)->global_age[0]) )	\
+	   driAgeTextures( heap );				\
+   } while( 0 )
+
+
+
+
+/* This should be called whenever there has been contention on the hardware
+ * lock.  driAgeTextures should not be called directly.  Instead, clients
+ * should use DRI_AGE_TEXTURES, above.
+ */
+
+void driAgeTextures( driTexHeap * heap );
+
+void driUpdateTextureLRU( driTextureObject * t );
+void driSwapOutTextureObject( driTextureObject * t );
+void driDestroyTextureObject( driTextureObject * t );
+int driAllocateTexture( driTexHeap * const * heap_array, unsigned nr_heaps,
+    driTextureObject * t );
+
+GLboolean driIsTextureResident( GLcontext * ctx, 
+    struct gl_texture_object * texObj );
+
+driTexHeap * driCreateTextureHeap( unsigned heap_id, void * context,
+    unsigned size, unsigned alignmentShift, unsigned nr_regions,
+    drmTextureRegionPtr global_regions, unsigned * global_age,
+    driTextureObject * swapped_objects, unsigned texture_object_size,
+    destroy_texture_object_t * destroy_tex_obj );
+void driDestroyTextureHeap( driTexHeap * heap );
+
+void
+driCalculateMaxTextureLevels( driTexHeap * const * heaps,
+			      unsigned nr_heaps,
+			      struct gl_constants * limits,
+			      unsigned max_bytes_per_texel, 
+			      unsigned max_2D_size,
+			      unsigned max_3D_size,
+			      unsigned max_cube_size,
+			      unsigned max_rect_size,
+			      unsigned mipmaps_at_once,
+			      int all_textures_one_heap );
+
+void
+driSetTextureSwapCounterLocation( driTexHeap * heap, unsigned * counter );
+
+#define DRI_TEXMGR_DO_TEXTURE_1D    0x0001
+#define DRI_TEXMGR_DO_TEXTURE_2D    0x0002
+#define DRI_TEXMGR_DO_TEXTURE_3D    0x0004
+#define DRI_TEXMGR_DO_TEXTURE_CUBE  0x0008
+#define DRI_TEXMGR_DO_TEXTURE_RECT  0x0010
+
+void driInitTextureObjects( GLcontext *ctx, driTextureObject * swapped,
+			    GLuint targets );
+
+GLboolean driValidateTextureHeaps( driTexHeap * const * texture_heaps,
+    unsigned nr_heaps, const driTextureObject * swapped );
+
+extern void driCalculateTextureFirstLastLevel( driTextureObject * t );
+
+#endif /* DRI_TEXMEM_H */
diff --git a/reactos/lib/mesa32/src/drivers/dri/common/utils.c b/reactos/lib/mesa32/src/drivers/dri/common/utils.c
new file mode 100644
index 00000000000..4276854224d
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/dri/common/utils.c
@@ -0,0 +1,219 @@
+/*
+ * (c) Copyright IBM Corporation 2002
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * on the rights to use, copy, modify, merge, publish, distribute, sub
+ * license, and/or sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Ian Romanick <idr@us.ibm.com>
+ */
+/* $XFree86:$ */
+
+#include <string.h>
+#include <stdlib.h>
+#include "mtypes.h"
+#include "extensions.h"
+#include "utils.h"
+
+#if defined(USE_X86_ASM)
+#include "x86/common_x86_asm.h"
+#endif
+
+unsigned
+driParseDebugString( const char * debug, 
+		     const struct dri_debug_control * control  )
+{
+   unsigned   flag;
+
+
+   flag = 0;
+   if ( debug != NULL ) {
+      while( control->string != NULL ) {
+	 if ( strstr( debug, control->string ) != NULL ) {
+	    flag |= control->flag;
+	 }
+
+	 control++;
+      }
+   }
+
+   return flag;
+}
+
+
+
+
+unsigned
+driGetRendererString( char * buffer, const char * hardware_name,
+		      const char * driver_date, GLuint agp_mode )
+{
+#ifdef USE_X86_ASM
+   char * x86_str = "";
+   char * mmx_str = "";
+   char * tdnow_str = "";
+   char * sse_str = "";
+#endif
+   unsigned   offset;
+
+
+   offset = sprintf( buffer, "Mesa DRI %s %s", hardware_name, driver_date );
+
+   /* Append any AGP-specific information.
+    */
+   switch ( agp_mode ) {
+   case 1:
+   case 2:
+   case 4:
+   case 8:
+      offset += sprintf( & buffer[ offset ], " AGP %ux", agp_mode );
+      break;
+	
+   default:
+      break;
+   }
+
+   /* Append any CPU-specific information.
+    */
+#ifdef USE_X86_ASM
+   if ( _mesa_x86_cpu_features ) {
+      x86_str = " x86";
+   }
+# ifdef USE_MMX_ASM
+   if ( cpu_has_mmx ) {
+      mmx_str = (cpu_has_mmxext) ? "/MMX+" : "/MMX";
+   }
+# endif
+# ifdef USE_3DNOW_ASM
+   if ( cpu_has_3dnow ) {
+      tdnow_str = (cpu_has_3dnowext) ? "/3DNow!+" : "/3DNow!";
+   }
+# endif
+# ifdef USE_SSE_ASM
+   if ( cpu_has_xmm ) {
+      sse_str = (cpu_has_xmm2) ? "/SSE2" : "/SSE";
+   }
+# endif
+
+   offset += sprintf( & buffer[ offset ], "%s%s%s%s", 
+		      x86_str, mmx_str, tdnow_str, sse_str );
+
+#elif defined(USE_SPARC_ASM)
+
+   offset += sprintf( & buffer[ offset ], " Sparc" );
+
+#endif
+
+   return offset;
+}
+
+
+
+
+void driInitExtensions( GLcontext * ctx,
+			const char * const extensions_to_enable[],
+			GLboolean  enable_imaging )
+{
+   unsigned   i;
+
+   if ( enable_imaging ) {
+      _mesa_enable_imaging_extensions( ctx );
+   }
+
+   for ( i = 0 ; extensions_to_enable[i] != NULL ; i++ ) {
+      _mesa_enable_extension( ctx, extensions_to_enable[i] );
+   }
+}
+
+
+
+
+GLboolean
+driCheckDriDdxDrmVersions(__DRIscreenPrivate *sPriv,
+			  const char * driver_name,
+			  int dri_major, int dri_minor,
+			  int ddx_major, int ddx_minor,
+			  int drm_major, int drm_minor)
+{
+   static const char format[] = "%s DRI driver expected %s version %d.%d.x "
+       "but got version %d.%d.%d";
+   int major, minor, patch;
+
+#ifndef _SOLO
+   /* Check the DRI version */
+   if (XF86DRIQueryVersion(sPriv->display, &major, &minor, &patch)) {
+      if (major != dri_major || minor < dri_minor) {
+	 __driUtilMessage(format, "DRI", driver_name, dri_major, dri_minor,
+			  major, minor, patch);
+	 return GL_FALSE;
+      }
+   }
+#else
+   (void)major;(void)minor;(void)patch;
+#endif
+   
+   /* Check that the DDX driver version is compatible */
+   if (sPriv->ddxMajor != ddx_major || sPriv->ddxMinor < ddx_minor) {
+      __driUtilMessage(format, "DDX", driver_name, ddx_major, ddx_minor,
+		       sPriv->ddxMajor, sPriv->ddxMinor, sPriv->ddxPatch);
+      return GL_FALSE;
+   }
+
+   /* Check that the DRM driver version is compatible */
+   if (sPriv->drmMajor != drm_major || sPriv->drmMinor < drm_minor) {
+      __driUtilMessage(format, "DRM", driver_name, drm_major, drm_minor,
+		       sPriv->drmMajor, sPriv->drmMinor, sPriv->drmPatch);
+      return GL_FALSE;
+   }
+
+   return GL_TRUE;
+}
+
+GLboolean driClipRectToFramebuffer( const GLframebuffer *buffer,
+				    GLint *x, GLint *y,
+				    GLsizei *width, GLsizei *height )
+{
+   /* left clipping */
+   if (*x < buffer->_Xmin) {
+      *width -= (buffer->_Xmin - *x);
+      *x = buffer->_Xmin;
+   }
+
+   /* right clipping */
+   if (*x + *width > buffer->_Xmax)
+      *width -= (*x + *width - buffer->_Xmax - 1);
+
+   if (*width <= 0)
+      return GL_FALSE;
+
+   /* bottom clipping */
+   if (*y < buffer->_Ymin) {
+      *height -= (buffer->_Ymin - *y);
+      *y = buffer->_Ymin;
+   }
+
+   /* top clipping */
+   if (*y + *height > buffer->_Ymax)
+      *height -= (*y + *height - buffer->_Ymax - 1);
+
+   if (*height <= 0)
+      return GL_FALSE;
+
+   return GL_TRUE;
+}
diff --git a/reactos/lib/mesa32/src/drivers/dri/common/utils.h b/reactos/lib/mesa32/src/drivers/dri/common/utils.h
new file mode 100644
index 00000000000..401a1b882f5
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/dri/common/utils.h
@@ -0,0 +1,58 @@
+/*
+ * (c) Copyright IBM Corporation 2002
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * on the rights to use, copy, modify, merge, publish, distribute, sub
+ * license, and/or sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Ian Romanick <idr@us.ibm.com>
+ */
+/* $XFree86:$ */
+
+#ifndef DRI_DEBUG_H
+#define DRI_DEBUG_H
+
+#include "context.h"
+#include "dri_util.h"
+
+struct dri_debug_control
+{
+    const char * string;
+    unsigned     flag;
+};
+
+extern unsigned driParseDebugString( const char * debug,
+    const struct dri_debug_control * control );
+
+extern unsigned driGetRendererString( char * buffer,
+    const char * hardware_name, const char * driver_date, GLuint agp_mode );
+
+extern void driInitExtensions( GLcontext * ctx, 
+    const char * const card_extensions[], GLboolean enable_imaging );
+
+extern GLboolean driCheckDriDdxDrmVersions( __DRIscreenPrivate *sPriv,
+    const char * driver_name, int dri_major, int dri_minor,
+    int ddx_major, int ddx_minor, int drm_major, int drm_minor );
+
+extern GLboolean driClipRectToFramebuffer( const GLframebuffer *buffer,
+					   GLint *x, GLint *y,
+					   GLsizei *width, GLsizei *height );
+
+#endif /* DRI_DEBUG_H */
diff --git a/reactos/lib/mesa32/src/drivers/dri/common/vblank.c b/reactos/lib/mesa32/src/drivers/dri/common/vblank.c
new file mode 100644
index 00000000000..d20f743bc9a
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/dri/common/vblank.c
@@ -0,0 +1,363 @@
+/* -*- mode: c; c-basic-offset: 3 -*- */
+/*
+ * (c) Copyright IBM Corporation 2002
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * on the rights to use, copy, modify, merge, publish, distribute, sub
+ * license, and/or sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Ian Romanick <idr@us.ibm.com>
+ */
+/* $XFree86:$ */
+
+#include "glheader.h"
+#include "xf86drm.h"
+#include "mtypes.h"
+#include "macros.h"
+#include "dd.h"
+#include "vblank.h"
+#include "xmlpool.h"
+
+
+/****************************************************************************/
+/**
+ * Get the current MSC refresh counter.
+ *
+ * Stores the 64-bit count of vertical refreshes since some (arbitrary)
+ * point in time in \c count.  Unless the value wraps around, which it
+ * may, it will never decrease.
+ *
+ * \warning This function is called from \c glXGetVideoSyncSGI, which expects
+ * a \c count of type \c unsigned (32-bit), and \c glXGetSyncValuesOML, which 
+ * expects a \c count of type \c int64_t (signed 64-bit).  The kernel ioctl 
+ * currently always returns a \c sequence of type \c unsigned.
+ *
+ * \param priv   Pointer to the DRI screen private struct.
+ * \param count  Storage to hold MSC counter.
+ * \return       Zero is returned on success.  A negative errno value
+ *               is returned on failure.
+ */
+int driGetMSC32( __DRIscreenPrivate * priv, int64_t * count )
+{
+   drmVBlank vbl;
+   int ret;
+
+   /* Don't wait for anything.  Just get the current refresh count. */
+
+   vbl.request.type = DRM_VBLANK_RELATIVE;
+   vbl.request.sequence = 0;
+
+   ret = drmWaitVBlank( priv->fd, &vbl );
+   *count = (int64_t)vbl.reply.sequence;
+
+   return ret;
+}
+
+
+/****************************************************************************/
+/**
+ * Wait for a specified refresh count.  This implements most of the
+ * functionality of \c glXWaitForMscOML from the GLX_OML_sync_control spec.
+ * Waits for the \c target_msc refresh.  If that has already passed, it
+ * waits until \f$(MSC \bmod divisor)\f$ is equal to \c remainder.  If 
+ * \c target_msc is 0, use the behavior of glXWaitVideoSyncSGI(), which
+ * omits the initial check against a target MSC value.
+ * 
+ * This function is actually something of a hack.  The problem is that, at
+ * the time of this writing, none of the existing DRM modules support an
+ * ioctl that returns a 64-bit count (at least not on 32-bit platforms).
+ * However, this function exists to support a GLX function that requires
+ * the use of 64-bit counts.  As such, there is a little bit of ugly
+ * hackery at the end of this function to make the 32-bit count act like
+ * a 64-bit count.  There are still some cases where this will break, but
+ * I believe it catches the most common cases.
+ *
+ * The real solution is to provide an ioctl that uses a 64-bit count.
+ *
+ * \param dpy         Pointer to the \c Display.
+ * \param priv        Pointer to the DRI drawable private.
+ * \param target_msc  Desired refresh count to wait for.  A value of 0
+ *                    means to use the glXWaitVideoSyncSGI() behavior.
+ * \param divisor     MSC divisor if \c target_msc is already reached.
+ * \param remainder   Desired MSC remainder if \c target_msc is already
+ *                    reached.
+ * \param msc         Buffer to hold MSC when done waiting.
+ *
+ * \return            Zero on success or \c GLX_BAD_CONTEXT on failure.
+ */
+
+int driWaitForMSC32( __DRIdrawablePrivate *priv,
+		     int64_t target_msc, int64_t divisor, int64_t remainder,
+		     int64_t * msc )
+{
+   drmVBlank vbl;
+
+
+   if ( divisor != 0 ) {
+      unsigned int target = (unsigned int)target_msc;
+      unsigned int next = target;
+      unsigned int r;
+      int dont_wait = (target_msc == 0);
+
+      do {
+         /* dont_wait means we're using the glXWaitVideoSyncSGI() behavior.
+          * The first time around, just get the current count and proceed 
+          * to the test for (MSC % divisor) == remainder.
+          */
+         vbl.request.type = dont_wait ? DRM_VBLANK_RELATIVE :
+                                        DRM_VBLANK_ABSOLUTE;
+         vbl.request.sequence = next;
+
+	 if ( drmWaitVBlank( priv->driScreenPriv->fd, &vbl ) != 0 ) {
+	    /* FIXME: This doesn't seem like the right thing to return here.
+	     */
+#ifndef _SOLO	     
+	    return GLX_BAD_CONTEXT;
+#else
+	    return -1;
+#endif
+	 }
+
+         dont_wait = 0;
+         if (target_msc != 0 && vbl.reply.sequence == target)
+            break;
+
+         /* Assuming the wait-done test fails, the next refresh to wait for
+          * will be one that satisfies (MSC % divisor) == remainder.  The
+          * value (MSC - (MSC % divisor) + remainder) is the refresh value 
+          * closest to the current value that would satisfy the equation.  
+          * If this refresh has already happened, we add divisor to obtain 
+          * the next refresh after the current one that will satisfy it.
+          */
+         r = (vbl.reply.sequence % (unsigned int)divisor);
+         next = (vbl.reply.sequence - r + (unsigned int)remainder);
+         if (next <= vbl.reply.sequence) next += (unsigned int)divisor;
+
+      } while ( r != (unsigned int)remainder );
+   }
+   else {
+      /* If the \c divisor is zero, just wait until the MSC is greater
+       * than or equal to \c target_msc.
+       */
+
+      vbl.request.type = DRM_VBLANK_ABSOLUTE;
+      vbl.request.sequence = target_msc;
+
+      if ( drmWaitVBlank( priv->driScreenPriv->fd, &vbl ) != 0 ) {
+	 /* FIXME: This doesn't seem like the right thing to return here.
+	  */
+#ifndef _SOLO
+	 return GLX_BAD_CONTEXT;
+#else
+	 return -1;
+#endif
+      }
+   }
+
+   *msc  = (target_msc & 0xffffffff00000000LL);
+   *msc |= vbl.reply.sequence;
+   if ( *msc < target_msc ) {
+      *msc += 0x0000000100000000LL;
+   }
+
+   return 0;
+}
+
+
+/****************************************************************************/
+/**
+ * Gets a set of default vertical-blank-wait flags based on the internal GLX
+ * API version and several configuration options.
+ */
+
+GLuint driGetDefaultVBlankFlags( const driOptionCache *optionCache )
+{
+   GLuint  flags = 0;
+   int vblank_mode;
+
+   flags |= (driCompareGLXAPIVersion( 20030317 ) >= 0) 
+       ? VBLANK_FLAG_INTERVAL : 0;
+
+   if ( driCheckOption( optionCache, "vblank_mode", DRI_ENUM ) )
+      vblank_mode = driQueryOptioni( optionCache, "vblank_mode" );
+   else
+      vblank_mode = DRI_CONF_VBLANK_DEF_INTERVAL_1;
+
+   switch (vblank_mode) {
+   case DRI_CONF_VBLANK_NEVER:
+      flags = 0;
+      break;
+   case DRI_CONF_VBLANK_DEF_INTERVAL_0:
+      break;
+   case DRI_CONF_VBLANK_DEF_INTERVAL_1:
+      flags |= VBLANK_FLAG_THROTTLE;
+      break;
+   case DRI_CONF_VBLANK_ALWAYS_SYNC:
+      flags |= VBLANK_FLAG_SYNC;
+      break;
+   }
+
+   return flags;
+}
+
+
+/****************************************************************************/
+/**
+ * Sets the default swap interval when the drawable is first bound to a
+ * direct rendering context.
+ */
+
+void driDrawableInitVBlank( __DRIdrawablePrivate *priv, GLuint flags )
+{
+#ifndef _SOLO
+   if ( priv->pdraw->swap_interval == (unsigned)-1 ) {
+      priv->pdraw->swap_interval = (flags & VBLANK_FLAG_THROTTLE) != 0 ? 1 : 0;
+   }
+#endif   
+}
+
+
+/****************************************************************************/
+/**
+ * Wrapper to call \c drmWaitVBlank.  The main purpose of this function is to
+ * wrap the error message logging.  The error message should only be logged
+ * the first time the \c drmWaitVBlank fails.  If \c drmWaitVBlank is
+ * successful, \c vbl_seq will be set the sequence value in the reply.
+ *
+ * \param vbl      Pointer to drmVBlank packet desribing how to wait.
+ * \param vbl_seq  Location to store the current refresh counter.
+ * \param fd       File descriptor use to call into the DRM.
+ * \return         Zero on success or -1 on failure.
+ */
+
+static int do_wait( drmVBlank * vbl, GLuint * vbl_seq, int fd )
+{
+   int   ret;
+
+
+   ret = drmWaitVBlank( fd, vbl );
+   if ( ret != 0 ) {
+      static GLboolean first_time = GL_TRUE;
+
+      if ( first_time ) {
+	 fprintf(stderr, 
+		 "%s: drmWaitVBlank returned %d, IRQs don't seem to be"
+		 " working correctly.\nTry running with LIBGL_THROTTLE_REFRESH"
+		 " and LIBL_SYNC_REFRESH unset.\n", __FUNCTION__, ret);
+	 first_time = GL_FALSE;
+      }
+
+      return -1;
+   }
+
+   *vbl_seq = vbl->reply.sequence;
+   return 0;
+}
+
+
+/****************************************************************************/
+/**
+ * Waits for the vertical blank for use with glXSwapBuffers.
+ * 
+ * \param vbl_seq  Vertical blank sequence number (MSC) after the last buffer
+ *                 swap.  Updated after this wait.
+ * \param flags    \c VBLANK_FLAG bits that control how long to wait.
+ * \param missed_deadline  Set to \c GL_TRUE if the MSC after waiting is later
+ *                 than the "target" based on \c flags.  The idea is that if
+ *                 \c missed_deadline is set, then the application is not 
+ *                 achieving its desired framerate.
+ * \return         Zero on success, -1 on error.
+ */
+
+int
+driWaitForVBlank( const  __DRIdrawablePrivate *priv, GLuint * vbl_seq,
+		  GLuint flags, GLboolean * missed_deadline )
+{
+   drmVBlank vbl;
+   unsigned   original_seq;
+   unsigned   deadline;
+   unsigned   interval;
+
+
+   *missed_deadline = GL_FALSE;
+   if ( (flags & (VBLANK_FLAG_INTERVAL |
+		  VBLANK_FLAG_THROTTLE |
+		  VBLANK_FLAG_SYNC)) == 0 ||
+	(flags & VBLANK_FLAG_NO_IRQ) != 0 ) {
+      return 0;
+   }
+
+
+   /* VBLANK_FLAG_SYNC means to wait for at least one vertical blank.  If
+    * that flag is not set, do a fake wait for zero vertical blanking
+    * periods so that we can get the current MSC.
+    *
+    * VBLANK_FLAG_INTERVAL and VBLANK_FLAG_THROTTLE mean to wait for at
+    * least one vertical blank since the last wait.  Since do_wait modifies
+    * vbl_seq, we have to save the original value of vbl_seq for the
+    * VBLANK_FLAG_INTERVAL / VBLANK_FLAG_THROTTLE calculation later.
+    */
+
+   original_seq = *vbl_seq;
+
+   vbl.request.sequence = ((flags & VBLANK_FLAG_SYNC) != 0) ? 1 : 0;
+   vbl.request.type = DRM_VBLANK_RELATIVE;
+      
+   if ( do_wait( & vbl, vbl_seq, priv->driScreenPriv->fd ) != 0 ) {
+      return -1;
+   }
+
+	
+   vbl.request.type = DRM_VBLANK_ABSOLUTE;
+
+   if ( (flags & VBLANK_FLAG_INTERVAL) != 0 ) {
+#ifndef _SOLO   
+      interval = priv->pdraw->swap_interval;
+#else
+      interval = 0;
+#endif      
+      /* this must have been initialized when the drawable was first bound
+       * to a direct rendering context. */
+      assert ( interval != (unsigned)-1 );
+   }
+   else if ( (flags & VBLANK_FLAG_THROTTLE) != 0 ) {
+      interval = 1;
+   }
+   else {
+      interval = 0;
+   }
+
+
+   /* Wait until the next vertical blank.  If the interval is zero, then
+    * the deadline is one vertical blank after the previous wait.
+    */
+
+   vbl.request.sequence = original_seq + interval;
+   if ( *vbl_seq < vbl.request.sequence ) {
+      if ( do_wait( & vbl, vbl_seq, priv->driScreenPriv->fd ) != 0 ) {
+	 return -1;
+      }
+   }
+
+   deadline = original_seq + ((interval == 0) ? 1 : interval);
+   *missed_deadline = ( *vbl_seq > deadline );
+
+   return 0;
+}
diff --git a/reactos/lib/mesa32/src/drivers/dri/common/vblank.h b/reactos/lib/mesa32/src/drivers/dri/common/vblank.h
new file mode 100644
index 00000000000..d460d7a84ad
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/dri/common/vblank.h
@@ -0,0 +1,64 @@
+/* -*- mode: c; c-basic-offset: 3 -*- */
+/*
+ * (c) Copyright IBM Corporation 2002
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * on the rights to use, copy, modify, merge, publish, distribute, sub
+ * license, and/or sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Ian Romanick <idr@us.ibm.com>
+ */
+/* $XFree86:$ */
+
+#ifndef DRI_VBLANK_H
+#define DRI_VBLANK_H
+
+#include "context.h"
+#include "dri_util.h"
+#include "xmlconfig.h"
+
+#define VBLANK_FLAG_INTERVAL  (1U << 0)  /* Respect the swap_interval setting
+					  */
+#define VBLANK_FLAG_THROTTLE  (1U << 1)  /* Wait 1 refresh since last call.
+					  */
+#define VBLANK_FLAG_SYNC      (1U << 2)  /* Sync to the next refresh.
+					  */
+#define VBLANK_FLAG_NO_IRQ    (1U << 7)  /* DRM has no IRQ to wait on.
+					  */
+
+extern int driGetMSC32( __DRIscreenPrivate * priv, int64_t * count );
+extern int driWaitForMSC32( __DRIdrawablePrivate *priv,
+    int64_t target_msc, int64_t divisor, int64_t remainder, int64_t * msc );
+extern GLuint driGetDefaultVBlankFlags( const driOptionCache *optionCache );
+extern void driDrawableInitVBlank ( __DRIdrawablePrivate *priv, GLuint flags );
+extern int driWaitForVBlank( const __DRIdrawablePrivate *priv,
+    GLuint * vbl_seq, GLuint flags, GLboolean * missed_deadline );
+
+#undef usleep
+#include <unistd.h>  /* for usleep() */
+
+#define DO_USLEEP(nr)							\
+   do {								 	\
+      if (0) fprintf(stderr, "%s: usleep for %u\n", __FUNCTION__, nr );	\
+      if (1) usleep( nr );						\
+      sched_yield();							\
+   } while( 0 )
+
+#endif /* DRI_VBLANK_H */
diff --git a/reactos/lib/mesa32/src/drivers/dri/common/xmlconfig.c b/reactos/lib/mesa32/src/drivers/dri/common/xmlconfig.c
new file mode 100644
index 00000000000..f45ab06ac41
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/dri/common/xmlconfig.c
@@ -0,0 +1,993 @@
+/*
+ * XML DRI client-side driver configuration
+ * Copyright (C) 2003 Felix Kuehling
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * FELIX KUEHLING, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ */
+/**
+ * \file xmlconfig.c
+ * \brief Driver-independent client-side part of the XML configuration
+ * \author Felix Kuehling
+ */
+
+#include "glheader.h"
+
+#include <string.h>
+#include <assert.h>
+#include <expat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+#include "imports.h"
+#include "dri_util.h"
+#include "xmlconfig.h"
+
+/*
+ * OS dependent ways of getting the name of the running program
+ */
+#if (defined(__unix__) || defined(unix)) && !defined(USG)
+#include <sys/param.h>
+#endif
+
+#undef GET_PROGRAM_NAME
+
+#if defined(__GNU_LIBRARY__) || defined(__GLIBC__)
+#    define GET_PROGRAM_NAME() program_invocation_short_name
+#elif defined(__FreeBSD__) && (__FreeBSD__ >= 2)
+#    include <osreldate.h>
+#    if (__FreeBSD_version >= 440000)
+#        include <stdlib.h>
+#        define GET_PROGRAM_NAME() getprogname()
+#    endif
+#elif defined(__NetBSD__) && defined(__NetBSD_Version) && (__NetBSD_Version >= 106000100)
+#    include <stdlib.h>
+#    define GET_PROGRAM_NAME() getprogname()
+#endif
+
+#if !defined(GET_PROGRAM_NAME)
+#    if defined(OpenBSD) || defined(NetBSD)
+/* This is a hack. It's said to work on OpenBSD, NetBSD and GNU. It's
+ * used as a last resort, if there is no documented facility available. */
+static const char *__getProgramName () {
+    extern const char *__progname;
+    return progname;
+}
+#        define GET_PROGRAM_NAME() __getProgramName()
+#    else
+#        define GET_PROGRAM_NAME() ""
+#        warning "Per application configuration won't with your OS version work."
+#    endif
+#endif
+
+/** \brief Find an option in an option cache with the name as key */
+static GLuint findOption (const driOptionCache *cache, const char *name) {
+    GLuint len = strlen (name);
+    GLuint size = 1 << cache->tableSize, mask = size - 1;
+    GLuint hash = 0;
+    GLuint i, shift;
+
+  /* compute a hash from the variable length name */
+    for (i = 0, shift = 0; i < len; ++i, shift = (shift+8) & 31)
+	hash += (GLuint)name[i] << shift;
+    hash *= hash;
+    hash = (hash >> (16-cache->tableSize/2)) & mask;
+
+  /* this is just the starting point of the linear search for the option */
+    for (i = 0; i < size; ++i, hash = (hash+1) & mask) {
+      /* if we hit an empty entry then the option is not defined (yet) */
+	if (cache->info[hash].name == 0)
+	    break;
+	else if (!strcmp (name, cache->info[hash].name))
+	    break;
+    }
+  /* this assertion fails if the hash table is full */
+    assert (i < size);
+
+    return hash;
+}
+
+/** \brief Count the real number of options in an option cache */
+static GLuint countOptions (const driOptionCache *cache) {
+    GLuint size = 1 << cache->tableSize;
+    GLuint i, count = 0;
+    for (i = 0; i < size; ++i)
+	if (cache->info[i].name)
+	    count++;
+    return count;
+}
+
+/** \brief Like strdup but using MALLOC and with error checking. */
+#define XSTRDUP(dest,source) do { \
+    GLuint len = strlen (source); \
+    if (!(dest = MALLOC (len+1))) { \
+	fprintf (stderr, "%s: %d: out of memory.\n", __FILE__, __LINE__); \
+	abort(); \
+    } \
+    memcpy (dest, source, len+1); \
+} while (0)
+
+static int compare (const void *a, const void *b) {
+    return strcmp (*(char *const*)a, *(char *const*)b);
+}
+/** \brief Binary search in a string array. */
+static GLuint bsearchStr (const XML_Char *name,
+			  const XML_Char *elems[], GLuint count) {
+    const XML_Char **found;
+    found = bsearch (&name, elems, count, sizeof (XML_Char *), compare);
+    if (found)
+	return found - elems;
+    else
+	return count;
+}
+
+/** \brief Locale-independent integer parser.
+ *
+ * Works similar to strtol. Leading space is NOT skipped. The input
+ * number may have an optional sign. Radix is specified by base. If
+ * base is 0 then decimal is assumed unless the input number is
+ * prefixed by 0x or 0X for hexadecimal or 0 for octal. After
+ * returning tail points to the first character that is not part of
+ * the integer number. If no number was found then tail points to the
+ * start of the input string. */
+static GLint strToI (const XML_Char *string, const XML_Char **tail, int base) {
+    GLint radix = base == 0 ? 10 : base;
+    GLint result = 0;
+    GLint sign = 1;
+    GLboolean numberFound = GL_FALSE;
+    const XML_Char *start = string;
+
+    assert (radix >= 2 && radix <= 36);
+
+    if (*string == '-') {
+	sign = -1;
+	string++;
+    } else if (*string == '+')
+	string++;
+    if (base == 0 && *string == '0') {
+	numberFound = GL_TRUE; 
+	if (*(string+1) == 'x' || *(string+1) == 'X') {
+	    radix = 16;
+	    string += 2;
+	} else {
+	    radix = 8;
+	    string++;
+	}
+    }
+    do {
+	GLint digit = -1;
+	if (radix <= 10) {
+	    if (*string >= '0' && *string < '0' + radix)
+		digit = *string - '0';
+	} else {
+	    if (*string >= '0' && *string <= '9')
+		digit = *string - '0';
+	    else if (*string >= 'a' && *string < 'a' + radix - 10)
+		digit = *string - 'a' + 10;
+	    else if (*string >= 'A' && *string < 'A' + radix - 10)
+		digit = *string - 'A' + 10;
+	}
+	if (digit != -1) {
+	    numberFound = GL_TRUE;
+	    result = radix*result + digit;
+	    string++;
+	} else
+	    break;
+    } while (GL_TRUE);
+    *tail = numberFound ? string : start;
+    return sign * result;
+}
+
+/** \brief Locale-independent floating-point parser.
+ *
+ * Works similar to strtod. Leading space is NOT skipped. The input
+ * number may have an optional sign. '.' is interpreted as decimal
+ * point and may occor at most once. Optionally the number may end in
+ * [eE]<exponent>, where <exponent> is an integer as recognized by
+ * strToI. In that case the result is number * 10^exponent. After
+ * returning tail points to the first character that is not part of
+ * the floating point number. If no number was found then tail points
+ * to the start of the input string.
+ *
+ * Uses two passes for maximum accuracy. */
+static GLfloat strToF (const XML_Char *string, const XML_Char **tail) {
+    GLint nDigits = 0, pointPos, exponent;
+    GLfloat sign = 1.0f, result = 0.0f, scale;
+    const XML_Char *start = string, *numStart;
+
+    /* sign */
+    if (*string == '-') {
+	sign = -1.0f;
+	string++;
+    } else if (*string == '+')
+	string++;
+
+    /* first pass: determine position of decimal point, number of
+     * digits, exponent and the end of the number. */
+    numStart = string;
+    while (*string >= '0' && *string <= '9') {
+	string++;
+	nDigits++;
+    }
+    pointPos = nDigits;
+    if (*string == '.') {
+	string++;
+	while (*string >= '0' && *string <= '9') {
+	    string++;
+	    nDigits++;
+	}
+    }
+    if (nDigits == 0) {
+	/* no digits, no number */
+	*tail = start;
+	return 0.0f;
+    }
+    *tail = string;
+    if (*string == 'e' || *string == 'E') {
+	const XML_Char *expTail;
+	exponent = strToI (string+1, &expTail, 10);
+	if (expTail == string+1)
+	    exponent = 0;
+	else
+	    *tail = expTail;
+    } else
+	exponent = 0;
+    string = numStart;
+
+    /* scale of the first digit */
+    scale = sign * powf (10.0f, (GLfloat)(pointPos-1 + exponent));
+
+    /* second pass: parse digits */
+    do {
+	if (*string != '.') {
+	    assert (*string >= '0' && *string <= '9');
+	    result += scale * (GLfloat)(*string - '0');
+	    scale *= 0.1f;
+	    nDigits--;
+	}
+	string++;
+    } while (nDigits > 0);
+
+    return result;
+}
+
+/** \brief Parse a value of a given type. */
+static GLboolean parseValue (driOptionValue *v, driOptionType type,
+			     const XML_Char *string) {
+    const XML_Char *tail;
+  /* skip leading white-space */
+    string += strspn (string, " \f\n\r\t\v");
+    switch (type) {
+      case DRI_BOOL:
+	if (!strcmp (string, "false")) {
+	    v->_bool = GL_FALSE;
+	    tail = string + 5;
+	} else if (!strcmp (string, "true")) {
+	    v->_bool = GL_TRUE;
+	    tail = string + 4;
+	}
+	else
+	    return GL_FALSE;
+	break;
+      case DRI_ENUM: /* enum is just a special integer */
+      case DRI_INT:
+	v->_int = strToI (string, &tail, 0);
+	break;
+      case DRI_FLOAT:
+	v->_float = strToF (string, &tail);
+	break;
+    }
+
+    if (tail == string)
+	return GL_FALSE; /* empty string (or containing only white-space) */
+  /* skip trailing white space */
+    if (*tail)
+	tail += strspn (tail, " \f\n\r\t\v");
+    if (*tail)
+	return GL_FALSE; /* something left over that is not part of value */
+
+    return GL_TRUE;
+}
+
+/** \brief Parse a list of ranges of type info->type. */
+static GLboolean parseRanges (driOptionInfo *info, const XML_Char *string) {
+    XML_Char *cp, *range;
+    GLuint nRanges, i;
+    driOptionRange *ranges;
+
+    XSTRDUP (cp, string);
+  /* pass 1: determine the number of ranges (number of commas + 1) */
+    range = cp;
+    for (nRanges = 1; *range; ++range)
+	if (*range == ',')
+	    ++nRanges;
+
+    if ((ranges = MALLOC (nRanges*sizeof(driOptionRange))) == NULL) {
+	fprintf (stderr, "%s: %d: out of memory.\n", __FILE__, __LINE__);
+	abort();
+    }
+
+  /* pass 2: parse all ranges into preallocated array */
+    range = cp;
+    for (i = 0; i < nRanges; ++i) {
+	XML_Char *end, *sep;
+	assert (range);
+	end = strchr (range, ',');
+	if (end)
+	    *end = '\0';
+	sep = strchr (range, ':');
+	if (sep) { /* non-empty interval */
+	    *sep = '\0';
+	    if (!parseValue (&ranges[i].start, info->type, range) ||
+		!parseValue (&ranges[i].end, info->type, sep+1))
+	        break;
+	    if (info->type == DRI_INT &&
+		ranges[i].start._int > ranges[i].end._int)
+		break;
+	    if (info->type == DRI_FLOAT &&
+		ranges[i].start._float > ranges[i].end._float)
+		break;
+	} else { /* empty interval */
+	    if (!parseValue (&ranges[i].start, info->type, range))
+		break;
+	    ranges[i].end = ranges[i].start;
+	}
+	if (end)
+	    range = end+1;
+	else
+	    range = NULL;
+    }
+    FREE (cp);
+    if (i < nRanges) {
+	FREE (ranges);
+	return GL_FALSE;
+    } else
+	assert (range == NULL);
+
+    info->nRanges = nRanges;
+    info->ranges = ranges;
+    return GL_TRUE;
+}
+
+/** \brief Check if a value is in one of info->ranges. */
+static GLboolean checkValue (const driOptionValue *v, const driOptionInfo *info) {
+    GLuint i;
+    assert (info->type != DRI_BOOL); /* should be caught by the parser */
+    if (info->nRanges == 0)
+	return GL_TRUE;
+    switch (info->type) {
+      case DRI_ENUM: /* enum is just a special integer */
+      case DRI_INT:
+	for (i = 0; i < info->nRanges; ++i)
+	    if (v->_int >= info->ranges[i].start._int &&
+		v->_int <= info->ranges[i].end._int)
+		return GL_TRUE;
+	break;
+      case DRI_FLOAT:
+	for (i = 0; i < info->nRanges; ++i)
+	    if (v->_float >= info->ranges[i].start._float &&
+		v->_float <= info->ranges[i].end._float)
+		return GL_TRUE;
+	break;
+      default:
+	assert (0); /* should never happen */
+    }
+    return GL_FALSE;
+}
+
+/** \brief Output a warning message. */
+#define XML_WARNING1(msg) do {\
+    __driUtilMessage ("Warning in %s line %d, column %d: "msg, data->name, \
+                      XML_GetCurrentLineNumber(data->parser), \
+                      XML_GetCurrentColumnNumber(data->parser)); \
+} while (0)
+#define XML_WARNING(msg,args...) do { \
+    __driUtilMessage ("Warning in %s line %d, column %d: "msg, data->name, \
+                      XML_GetCurrentLineNumber(data->parser), \
+                      XML_GetCurrentColumnNumber(data->parser), \
+                      args); \
+} while (0)
+/** \brief Output an error message. */
+#define XML_ERROR1(msg) do { \
+    __driUtilMessage ("Error in %s line %d, column %d: "msg, data->name, \
+                      XML_GetCurrentLineNumber(data->parser), \
+                      XML_GetCurrentColumnNumber(data->parser)); \
+} while (0)
+#define XML_ERROR(msg,args...) do { \
+    __driUtilMessage ("Error in %s line %d, column %d: "msg, data->name, \
+                      XML_GetCurrentLineNumber(data->parser), \
+                      XML_GetCurrentColumnNumber(data->parser), \
+                      args); \
+} while (0)
+/** \brief Output a fatal error message and abort. */
+#define XML_FATAL1(msg) do { \
+    fprintf (stderr, "Fatal error in %s line %d, column %d: "msg"\n", \
+             data->name, \
+             XML_GetCurrentLineNumber(data->parser), \
+             XML_GetCurrentColumnNumber(data->parser)); \
+    abort();\
+} while (0)
+#define XML_FATAL(msg,args...) do { \
+    fprintf (stderr, "Fatal error in %s line %d, column %d: "msg"\n", \
+             data->name, \
+             XML_GetCurrentLineNumber(data->parser), \
+             XML_GetCurrentColumnNumber(data->parser), \
+             args); \
+    abort();\
+} while (0)
+
+/** \brief Parser context for __driConfigOptions. */
+struct OptInfoData {
+    const char *name;
+    XML_Parser parser;
+    driOptionCache *cache;
+    GLboolean inDriInfo;
+    GLboolean inSection;
+    GLboolean inDesc;
+    GLboolean inOption;
+    GLboolean inEnum;
+    int curOption;
+};
+
+/** \brief Elements in __driConfigOptions. */
+enum OptInfoElem {
+    OI_DESCRIPTION = 0, OI_DRIINFO, OI_ENUM, OI_OPTION, OI_SECTION, OI_COUNT
+};
+static const XML_Char *OptInfoElems[] = {
+    "description", "driinfo", "enum", "option", "section"
+};
+
+/** \brief Parse attributes of an enum element.
+ *
+ * We're not actually interested in the data. Just make sure this is ok
+ * for external configuration tools.
+ */
+static void parseEnumAttr (struct OptInfoData *data, const XML_Char **attr) {
+    GLuint i;
+    const XML_Char *value = NULL, *text = NULL;
+    driOptionValue v;
+    GLuint opt = data->curOption;
+    for (i = 0; attr[i]; i += 2) {
+	if (!strcmp (attr[i], "value")) value = attr[i+1];
+	else if (!strcmp (attr[i], "text")) text = attr[i+1];
+	else XML_FATAL("illegal enum attribute: %s.", attr[i]);
+    }
+    if (!value) XML_FATAL1 ("value attribute missing in enum.");
+    if (!text) XML_FATAL1 ("text attribute missing in enum.");
+     if (!parseValue (&v, data->cache->info[opt].type, value))
+	XML_FATAL ("illegal enum value: %s.", value);
+    if (!checkValue (&v, &data->cache->info[opt]))
+	XML_FATAL ("enum value out of valid range: %s.", value);
+}
+
+/** \brief Parse attributes of a description element.
+ *
+ * We're not actually interested in the data. Just make sure this is ok
+ * for external configuration tools.
+ */
+static void parseDescAttr (struct OptInfoData *data, const XML_Char **attr) {
+    GLuint i;
+    const XML_Char *lang = NULL, *text = NULL;
+    for (i = 0; attr[i]; i += 2) {
+	if (!strcmp (attr[i], "lang")) lang = attr[i+1];
+	else if (!strcmp (attr[i], "text")) text = attr[i+1];
+	else XML_FATAL("illegal description attribute: %s.", attr[i]);
+    }
+    if (!lang) XML_FATAL1 ("lang attribute missing in description.");
+    if (!text) XML_FATAL1 ("text attribute missing in description.");
+}
+
+/** \brief Parse attributes of an option element. */
+static void parseOptInfoAttr (struct OptInfoData *data, const XML_Char **attr) {
+    enum OptAttr {OA_DEFAULT = 0, OA_NAME, OA_TYPE, OA_VALID, OA_COUNT};
+    static const XML_Char *optAttr[] = {"default", "name", "type", "valid"};
+    const XML_Char *attrVal[OA_COUNT] = {NULL, NULL, NULL, NULL};
+    const char *defaultVal;
+    driOptionCache *cache = data->cache;
+    GLuint opt, i;
+    for (i = 0; attr[i]; i += 2) {
+	GLuint attrName = bsearchStr (attr[i], optAttr, OA_COUNT);
+	if (attrName >= OA_COUNT)
+	    XML_FATAL ("illegal option attribute: %s", attr[i]);
+	attrVal[attrName] = attr[i+1];
+    }
+    if (!attrVal[OA_NAME]) XML_FATAL1 ("name attribute missing in option.");
+    if (!attrVal[OA_TYPE]) XML_FATAL1 ("type attribute missing in option.");
+    if (!attrVal[OA_DEFAULT]) XML_FATAL1 ("default attribute missing in option.");
+
+    opt = findOption (cache, attrVal[OA_NAME]);
+    if (cache->info[opt].name)
+	XML_FATAL ("option %s redefined.", attrVal[OA_NAME]);
+    data->curOption = opt;
+
+    XSTRDUP (cache->info[opt].name, attrVal[OA_NAME]);
+
+    if (!strcmp (attrVal[OA_TYPE], "bool"))
+	cache->info[opt].type = DRI_BOOL;
+    else if (!strcmp (attrVal[OA_TYPE], "enum"))
+	cache->info[opt].type = DRI_ENUM;
+    else if (!strcmp (attrVal[OA_TYPE], "int"))
+	cache->info[opt].type = DRI_INT;
+    else if (!strcmp (attrVal[OA_TYPE], "float"))
+	cache->info[opt].type = DRI_FLOAT;
+    else
+	XML_FATAL ("illegal type in option: %s.", attrVal[OA_TYPE]);
+
+    defaultVal = getenv (cache->info[opt].name);
+    if (defaultVal != NULL) {
+      /* don't use XML_WARNING, we want the user to see this! */
+	fprintf (stderr,
+		 "ATTENTION: default value of option %s overridden by environment.\n",
+		 cache->info[opt].name);
+    } else
+	defaultVal = attrVal[OA_DEFAULT];
+    if (!parseValue (&cache->values[opt], cache->info[opt].type, defaultVal))
+	XML_FATAL ("illegal default value: %s.", defaultVal);
+
+    if (attrVal[OA_VALID]) {
+	if (cache->info[opt].type == DRI_BOOL)
+	    XML_FATAL1 ("boolean option with valid attribute.");
+	if (!parseRanges (&cache->info[opt], attrVal[OA_VALID]))
+	    XML_FATAL ("illegal valid attribute: %s.", attrVal[OA_VALID]);
+	if (!checkValue (&cache->values[opt], &cache->info[opt]))
+	    XML_FATAL ("default value out of valid range '%s': %s.",
+		       attrVal[OA_VALID], defaultVal);
+    } else if (cache->info[opt].type == DRI_ENUM) {
+	XML_FATAL1 ("valid attribute missing in option (mandatory for enums).");
+    } else {
+	cache->info[opt].nRanges = 0;
+	cache->info[opt].ranges = NULL;
+    }
+}
+
+/** \brief Handler for start element events. */
+static void optInfoStartElem (void *userData, const XML_Char *name,
+			      const XML_Char **attr) {
+    struct OptInfoData *data = (struct OptInfoData *)userData;
+    enum OptInfoElem elem = bsearchStr (name, OptInfoElems, OI_COUNT);
+    switch (elem) {
+      case OI_DRIINFO:
+	if (data->inDriInfo)
+	    XML_FATAL1 ("nested <driinfo> elements.");
+	if (attr[0])
+	    XML_FATAL1 ("attributes specified on <driinfo> element.");
+	data->inDriInfo = GL_TRUE;
+	break;
+      case OI_SECTION:
+	if (!data->inDriInfo)
+	    XML_FATAL1 ("<section> must be inside <driinfo>.");
+	if (data->inSection)
+	    XML_FATAL1 ("nested <section> elements.");
+	if (attr[0])
+	    XML_FATAL1 ("attributes specified on <section> element.");
+	data->inSection = GL_TRUE;
+	break;
+      case OI_DESCRIPTION:
+	if (!data->inSection && !data->inOption)
+	    XML_FATAL1 ("<description> must be inside <description> or <option.");
+	if (data->inDesc)
+	    XML_FATAL1 ("nested <description> elements.");
+	data->inDesc = GL_TRUE;
+	parseDescAttr (data, attr);
+	break;
+      case OI_OPTION:
+	if (!data->inSection)
+	    XML_FATAL1 ("<option> must be inside <section>.");
+	if (data->inDesc)
+	    XML_FATAL1 ("<option> nested in <description> element.");
+	if (data->inOption)
+	    XML_FATAL1 ("nested <option> elements.");
+	data->inOption = GL_TRUE;
+	parseOptInfoAttr (data, attr);
+	break;
+      case OI_ENUM:
+	if (!(data->inOption && data->inDesc))
+	    XML_FATAL1 ("<enum> must be inside <option> and <description>.");
+	if (data->inEnum)
+	    XML_FATAL1 ("nested <enum> elements.");
+	data->inEnum = GL_TRUE;
+	parseEnumAttr (data, attr);
+	break;
+      default:
+	XML_FATAL ("unknown element: %s.", name);
+    }
+}
+
+/** \brief Handler for end element events. */
+static void optInfoEndElem (void *userData, const XML_Char *name) {
+    struct OptInfoData *data = (struct OptInfoData *)userData;
+    enum OptInfoElem elem = bsearchStr (name, OptInfoElems, OI_COUNT);
+    switch (elem) {
+      case OI_DRIINFO:
+	data->inDriInfo = GL_FALSE;
+	break;
+      case OI_SECTION:
+	data->inSection = GL_FALSE;
+	break;
+      case OI_DESCRIPTION:
+	data->inDesc = GL_FALSE;
+	break;
+      case OI_OPTION:
+	data->inOption = GL_FALSE;
+	break;
+      case OI_ENUM:
+	data->inEnum = GL_FALSE;
+	break;
+      default:
+	assert (0); /* should have been caught by StartElem */
+    }
+}
+
+void driParseOptionInfo (driOptionCache *info,
+			 const char *configOptions, GLuint nConfigOptions) {
+    XML_Parser p;
+    int status;
+    struct OptInfoData userData;
+    struct OptInfoData *data = &userData;
+    GLuint realNoptions;
+
+  /* determine hash table size and allocate memory */
+    GLuint size, log2size;
+    for (size = 1, log2size = 0; size < nConfigOptions*3/2;
+	 size <<= 1, ++log2size);
+    info->tableSize = log2size;
+    info->info = CALLOC (size * sizeof (driOptionInfo));
+    info->values = CALLOC (size * sizeof (driOptionInfo));
+    if (info->info == NULL || info->values == NULL) {
+	fprintf (stderr, "%s: %d: out of memory.\n", __FILE__, __LINE__);
+	abort();
+    }
+
+    p = XML_ParserCreate ("UTF-8"); /* always UTF-8 */
+    XML_SetElementHandler (p, optInfoStartElem, optInfoEndElem);
+    XML_SetUserData (p, data);
+
+    userData.name = "__driConfigOptions";
+    userData.parser = p;
+    userData.cache = info;
+    userData.inDriInfo = GL_FALSE;
+    userData.inSection = GL_FALSE;
+    userData.inDesc = GL_FALSE;
+    userData.inOption = GL_FALSE;
+    userData.inEnum = GL_FALSE;
+    userData.curOption = -1;
+
+    status = XML_Parse (p, configOptions, strlen (configOptions), 1);
+    if (!status)
+	XML_FATAL ("%s.", XML_ErrorString(XML_GetErrorCode(p)));
+
+    XML_ParserFree (p);
+
+  /* Check if the actual number of options matches nConfigOptions.
+   * A mismatch is not fatal (a hash table overflow would be) but we
+   * want the driver developer's attention anyway. */
+    realNoptions = countOptions (info);
+    if (realNoptions != nConfigOptions) {
+	fprintf (stderr,
+		 "Error: nConfigOptions (%u) does not match the actual number of options in\n"
+		 "       __driConfigOptions (%u).\n",
+		 nConfigOptions, realNoptions);
+    }
+}
+
+/** \brief Parser context for configuration files. */
+struct OptConfData {
+    const char *name;
+    XML_Parser parser;
+    driOptionCache *cache;
+    GLint screenNum;
+    const char *driverName, *execName;
+    GLuint ignoringDevice;
+    GLuint ignoringApp;
+    GLuint inDriConf;
+    GLuint inDevice;
+    GLuint inApp;
+    GLuint inOption;
+};
+
+/** \brief Elements in configuration files. */
+enum OptConfElem {
+    OC_APPLICATION = 0, OC_DEVICE, OC_DRICONF, OC_OPTION, OC_COUNT
+};
+static const XML_Char *OptConfElems[] = {
+    "application", "device", "driconf", "option"
+};
+
+/** \brief Parse attributes of a device element. */
+static void parseDeviceAttr (struct OptConfData *data, const XML_Char **attr) {
+    GLuint i;
+    const XML_Char *driver = NULL, *screen = NULL;
+    for (i = 0; attr[i]; i += 2) {
+	if (!strcmp (attr[i], "driver")) driver = attr[i+1];
+	else if (!strcmp (attr[i], "screen")) screen = attr[i+1];
+	else XML_WARNING("unkown device attribute: %s.", attr[i]);
+    }
+    if (driver && strcmp (driver, data->driverName))
+	data->ignoringDevice = data->inDevice;
+    else if (screen) {
+	driOptionValue screenNum;
+	if (!parseValue (&screenNum, DRI_INT, screen))
+	    XML_WARNING("illegal screen number: %s.", screen);
+	else if (screenNum._int != data->screenNum)
+	    data->ignoringDevice = data->inDevice;
+    }
+}
+
+/** \brief Parse attributes of an application element. */
+static void parseAppAttr (struct OptConfData *data, const XML_Char **attr) {
+    GLuint i;
+    const XML_Char *name = NULL, *exec = NULL;
+    for (i = 0; attr[i]; i += 2) {
+	if (!strcmp (attr[i], "name")) name = attr[i+1];
+	else if (!strcmp (attr[i], "executable")) exec = attr[i+1];
+	else XML_WARNING("unkown application attribute: %s.", attr[i]);
+    }
+    if (exec && strcmp (exec, data->execName))
+	data->ignoringApp = data->inApp;
+}
+
+/** \brief Parse attributes of an option element. */
+static void parseOptConfAttr (struct OptConfData *data, const XML_Char **attr) {
+    GLuint i;
+    const XML_Char *name = NULL, *value = NULL;
+    for (i = 0; attr[i]; i += 2) {
+	if (!strcmp (attr[i], "name")) name = attr[i+1];
+	else if (!strcmp (attr[i], "value")) value = attr[i+1];
+	else XML_WARNING("unkown option attribute: %s.", attr[i]);
+    }
+    if (!name) XML_WARNING1 ("name attribute missing in option.");
+    if (!value) XML_WARNING1 ("value attribute missing in option.");
+    if (name && value) {
+	driOptionCache *cache = data->cache;
+	GLuint opt = findOption (cache, name);
+	if (cache->info[opt].name == NULL)
+	    XML_WARNING ("undefined option: %s.", name);
+	else if (getenv (cache->info[opt].name))
+	  /* don't use XML_WARNING, we want the user to see this! */
+	    fprintf (stderr, "ATTENTION: option value of option %s ignored.\n",
+		     cache->info[opt].name);
+	else if (!parseValue (&cache->values[opt], cache->info[opt].type, value))
+	    XML_WARNING ("illegal option value: %s.", value);
+    }
+}
+
+/** \brief Handler for start element events. */
+static void optConfStartElem (void *userData, const XML_Char *name,
+			      const XML_Char **attr) {
+    struct OptConfData *data = (struct OptConfData *)userData;
+    enum OptConfElem elem = bsearchStr (name, OptConfElems, OC_COUNT);
+    switch (elem) {
+      case OC_DRICONF:
+	if (data->inDriConf)
+	    XML_WARNING1 ("nested <driconf> elements.");
+	if (attr[0])
+	    XML_WARNING1 ("attributes specified on <driconf> element.");
+	data->inDriConf++;
+	break;
+      case OC_DEVICE:
+	if (!data->inDriConf)
+	    XML_WARNING1 ("<device> should be inside <driconf>.");
+	if (data->inDevice)
+	    XML_WARNING1 ("nested <device> elements.");
+	data->inDevice++;
+	if (!data->ignoringDevice && !data->ignoringApp)
+	    parseDeviceAttr (data, attr);
+	break;
+      case OC_APPLICATION:
+	if (!data->inDevice)
+	    XML_WARNING1 ("<application> should be inside <device>.");
+	if (data->inApp)
+	    XML_WARNING1 ("nested <application> elements.");
+	data->inApp++;
+	if (!data->ignoringDevice && !data->ignoringApp)
+	    parseAppAttr (data, attr);
+	break;
+      case OC_OPTION:
+	if (!data->inApp)
+	    XML_WARNING1 ("<option> should be inside <application>.");
+	if (data->inOption)
+	    XML_WARNING1 ("nested <option> elements.");
+	data->inOption++;
+	if (!data->ignoringDevice && !data->ignoringApp)
+	    parseOptConfAttr (data, attr);
+	break;
+      default:
+	XML_WARNING ("unknown element: %s.", name);
+    }
+}
+
+/** \brief Handler for end element events. */
+static void optConfEndElem (void *userData, const XML_Char *name) {
+    struct OptConfData *data = (struct OptConfData *)userData;
+    enum OptConfElem elem = bsearchStr (name, OptConfElems, OC_COUNT);
+    switch (elem) {
+      case OC_DRICONF:
+	data->inDriConf--;
+	break;
+      case OC_DEVICE:
+	if (data->inDevice-- == data->ignoringDevice)
+	    data->ignoringDevice = 0;
+	break;
+      case OC_APPLICATION:
+	if (data->inApp-- == data->ignoringApp)
+	    data->ignoringApp = 0;
+	break;
+      case OC_OPTION:
+	data->inOption--;
+	break;
+      default:
+	/* unknown element, warning was produced on start tag */;
+    }
+}
+
+/** \brief Initialize an option cache based on info */
+static void initOptionCache (driOptionCache *cache, driOptionCache *info) {
+    cache->info = info->info;
+    cache->tableSize = info->tableSize;
+    cache->values = MALLOC ((1<<info->tableSize) * sizeof (driOptionValue));
+    if (cache->values == NULL) {
+	fprintf (stderr, "%s: %d: out of memory.\n", __FILE__, __LINE__);
+	abort();
+    }
+    memcpy (cache->values, info->values,
+	    (1<<info->tableSize) * sizeof (driOptionValue));
+}
+
+/** \brief Parse the named configuration file */
+static void parseOneConfigFile (XML_Parser p) {
+#define BUF_SIZE 0x1000
+    struct OptConfData *data = (struct OptConfData *)XML_GetUserData (p);
+    int status;
+    int fd;
+
+    if ((fd = open (data->name, O_RDONLY)) == -1) {
+	__driUtilMessage ("Can't open configuration file %s: %s.",
+			  data->name, strerror (errno));
+	return;
+    }
+
+    while (1) {
+	int bytesRead;
+	void *buffer = XML_GetBuffer (p, BUF_SIZE);
+	if (!buffer) {
+	    __driUtilMessage ("Can't allocate parser buffer.");
+	    break;
+	}
+	bytesRead = read (fd, buffer, BUF_SIZE);
+	if (bytesRead == -1) {
+	    __driUtilMessage ("Error reading from configuration file %s: %s.",
+			      data->name, strerror (errno));
+	    break;
+	}
+	status = XML_ParseBuffer (p, bytesRead, bytesRead == 0);
+	if (!status) {
+	    XML_ERROR ("%s.", XML_ErrorString(XML_GetErrorCode(p)));
+	    break;
+	}
+	if (bytesRead == 0)
+	    break;
+    }
+
+    close (fd);
+#undef BUF_SIZE
+}
+
+void driParseConfigFiles (driOptionCache *cache, driOptionCache *info,
+			  GLint screenNum, const char *driverName) {
+    char *filenames[2] = {"/etc/drirc", NULL};
+    char *home;
+    GLuint i;
+    struct OptConfData userData;
+
+    initOptionCache (cache, info);
+
+    userData.cache = cache;
+    userData.screenNum = screenNum;
+    userData.driverName = driverName;
+#ifndef _SOLO    
+    userData.execName = GET_PROGRAM_NAME();
+#else
+    userData.execName = "Solo";
+#endif    
+
+    if ((home = getenv ("HOME"))) {
+	GLuint len = strlen (home);
+	filenames[1] = MALLOC (len + 7+1);
+	if (filenames[1] == NULL)
+	    __driUtilMessage ("Can't allocate memory for %s/.drirc.", home);
+	else {
+	    memcpy (filenames[1], home, len);
+	    memcpy (filenames[1] + len, "/.drirc", 7+1);
+	}
+    }
+
+    for (i = 0; i < 2; ++i) {
+	XML_Parser p;
+	if (filenames[i] == NULL)
+	    continue;
+
+	p = XML_ParserCreate (NULL); /* use encoding specified by file */
+	XML_SetElementHandler (p, optConfStartElem, optConfEndElem);
+	XML_SetUserData (p, &userData);
+	userData.parser = p;
+	userData.name = filenames[i];
+	userData.ignoringDevice = 0;
+	userData.ignoringApp = 0;
+	userData.inDriConf = 0;
+	userData.inDevice = 0;
+	userData.inApp = 0;
+	userData.inOption = 0;
+
+	parseOneConfigFile (p);
+	XML_ParserFree (p);
+    }
+
+    if (filenames[1])
+	FREE (filenames[1]);
+}
+
+void driDestroyOptionInfo (driOptionCache *info) {
+    driDestroyOptionCache (info);
+    if (info->info) {
+	GLuint i, size = 1 << info->tableSize;
+	for (i = 0; i < size; ++i) {
+	    if (info->info[i].name) {
+		FREE (info->info[i].name);
+		if (info->info[i].ranges)
+		    FREE (info->info[i].ranges);
+	    }
+	}
+	FREE (info->info);
+    }
+}
+
+void driDestroyOptionCache (driOptionCache *cache) {
+    if (cache->values)
+	FREE (cache->values);
+}
+
+GLboolean driCheckOption (const driOptionCache *cache, const char *name,
+			  driOptionType type) {
+    GLuint i = findOption (cache, name);
+    return cache->info[i].name != NULL && cache->info[i].type == type;
+}
+
+GLboolean driQueryOptionb (const driOptionCache *cache, const char *name) {
+    GLuint i = findOption (cache, name);
+  /* make sure the option is defined and has the correct type */
+    assert (cache->info[i].name != NULL);
+    assert (cache->info[i].type == DRI_BOOL);
+    return cache->values[i]._bool;
+}
+
+GLint driQueryOptioni (const driOptionCache *cache, const char *name) {
+    GLuint i = findOption (cache, name);
+  /* make sure the option is defined and has the correct type */
+    assert (cache->info[i].name != NULL);
+    assert (cache->info[i].type == DRI_INT || cache->info[i].type == DRI_ENUM);
+    return cache->values[i]._int;
+}
+
+GLfloat driQueryOptionf (const driOptionCache *cache, const char *name) {
+    GLuint i = findOption (cache, name);
+  /* make sure the option is defined and has the correct type */
+    assert (cache->info[i].name != NULL);
+    assert (cache->info[i].type == DRI_FLOAT);
+    return cache->values[i]._float;
+}
diff --git a/reactos/lib/mesa32/src/drivers/dri/common/xmlconfig.h b/reactos/lib/mesa32/src/drivers/dri/common/xmlconfig.h
new file mode 100644
index 00000000000..b636349b1f4
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/dri/common/xmlconfig.h
@@ -0,0 +1,124 @@
+/*
+ * XML DRI client-side driver configuration
+ * Copyright (C) 2003 Felix Kuehling
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * FELIX KUEHLING, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ */
+/**
+ * \file xmlconfig.h
+ * \brief Driver-independent client-side part of the XML configuration
+ * \author Felix Kuehling
+ */
+
+#ifndef __XMLCONFIG_H
+#define __XMLCONFIG_H
+
+/** \brief Option data types */
+typedef enum driOptionType {
+    DRI_BOOL, DRI_ENUM, DRI_INT, DRI_FLOAT
+} driOptionType;
+
+/** \brief Option value */
+typedef union driOptionValue {
+    GLboolean _bool; /**< \brief Boolean */
+    GLint _int;      /**< \brief Integer or Enum */
+    GLfloat _float;  /**< \brief Floating-point */
+} driOptionValue;
+
+/** \brief Single range of valid values
+ *
+ * For empty ranges (a single value) start == end */
+typedef struct driOptionRange {
+    driOptionValue start; /**< \brief Start */
+    driOptionValue end;   /**< \brief End */
+} driOptionRange;
+
+/** \brief Information about an option */
+typedef struct driOptionInfo {
+    char *name;             /**< \brief Name */
+    driOptionType type;     /**< \brief Type */
+    driOptionRange *ranges; /**< \brief Array of ranges */
+    GLuint nRanges;         /**< \brief Number of ranges */
+} driOptionInfo;
+
+/** \brief Option cache
+ *
+ * \li One in <driver>Screen caching option info and the default values
+ * \li One in each <driver>Context with the actual values for that context */
+typedef struct driOptionCache {
+    driOptionInfo *info;
+  /**< \brief Array of option infos
+   *
+   * Points to the same array in the screen and all contexts */
+    driOptionValue *values;	
+  /**< \brief Array of option values
+   *
+   * \li Default values in screen
+   * \li Actual values in contexts 
+   */
+    GLuint tableSize;
+  /**< \brief Size of the arrays
+   *
+   * Depending on the hash function this may differ from __driNConfigOptions.
+   * In the current implementation it's not actually a size but log2(size).
+   * The value is the same in the screen and all contexts. */
+} driOptionCache;
+
+/** \brief Parse XML option info from configOptions
+ *
+ * To be called in <driver>CreateScreen 
+ *
+ * \param info    pointer to a driOptionCache that will store the option info
+ * \param configOptions   XML document describing available configuration opts
+ * \param nConfigOptions  number of options, used to choose a hash table size
+ *
+ * For the option information to be available to external configuration tools
+ * it must be a public symbol __driConfigOptions. It is also passed as a
+ * parameter to driParseOptionInfo in order to avoid driver-independent code
+ * depending on symbols in driver-specific code. */
+void driParseOptionInfo (driOptionCache *info,
+			 const char *configOptions, GLuint nConfigOptions);
+/** \brief Initialize option cache from info and parse configuration files
+ *
+ * To be called in <driver>CreateContext. screenNum and driverName select
+ * device sections. */
+void driParseConfigFiles (driOptionCache *cache, driOptionCache *info,
+			  GLint screenNum, const char *driverName);
+/** \brief Destroy option info
+ *
+ * To be called in <driver>DestroyScreen */
+void driDestroyOptionInfo (driOptionCache *info);
+/** \brief Destroy option cache
+ *
+ * To be called in <driver>DestroyContext */
+void driDestroyOptionCache (driOptionCache *cache);
+
+/** \brief Check if there exists a certain option */
+GLboolean driCheckOption (const driOptionCache *cache, const char *name,
+			  driOptionType type);
+
+/** \brief Query a boolean option value */
+GLboolean driQueryOptionb (const driOptionCache *cache, const char *name);
+/** \brief Query an integer option value */
+GLint driQueryOptioni (const driOptionCache *cache, const char *name);
+/** \brief Query a floating-point option value */
+GLfloat driQueryOptionf (const driOptionCache *cache, const char *name);
+
+#endif
diff --git a/reactos/lib/mesa32/src/drivers/dri/common/xmlpool.h b/reactos/lib/mesa32/src/drivers/dri/common/xmlpool.h
new file mode 100644
index 00000000000..45dfb33a5b9
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/dri/common/xmlpool.h
@@ -0,0 +1,270 @@
+/* -*- mode:C; coding: mult-utf-8-unix -*-
+ *
+ * !!! Important: This file is encoded in UTF-8 !!!
+ *
+ * Note (Emacs): You need Mule. In Debian the package is called
+ * mule-ucs.
+ *
+ * Note (Emacs): You may have to enable multibyte characters in the
+ * Mule customization group or by setting
+ * default-enable-multibyte-characters to t in your .emacs:
+ */
+/*
+ * XML DRI client-side driver configuration
+ * Copyright (C) 2003 Felix Kuehling
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * FELIX KUEHLING, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ */
+/**
+ * \file xmlpool.h
+ * \brief Pool of common options
+ * \author Felix Kuehling
+ *
+ * This file defines macros that can be used to construct driConfigOptions
+ * in the drivers.
+ */
+
+#ifndef __XMLPOOL_H
+#define __XMLPOOL_H
+
+/*
+ * generic macros
+ */
+
+/** \brief Begin __driConfigOptions */
+#define DRI_CONF_BEGIN \
+"<driinfo>\n"
+
+/** \brief End __driConfigOptions */
+#define DRI_CONF_END \
+"</driinfo>\n"
+
+/** \brief Begin a section of related options */
+#define DRI_CONF_SECTION_BEGIN \
+"<section>\n"
+
+/** \brief End a section of related options */
+#define DRI_CONF_SECTION_END \
+"</section>\n"
+
+/** \brief Begin an option definition */
+#define DRI_CONF_OPT_BEGIN(name,type,def) \
+"<option name=\""#name"\" type=\""#type"\" default=\""#def"\">\n"
+
+/** \brief Begin an option definition with restrictions on valid values */
+#define DRI_CONF_OPT_BEGIN_V(name,type,def,valid) \
+"<option name=\""#name"\" type=\""#type"\" default=\""#def"\" valid=\""valid"\">\n"
+
+/** \brief End an option description */
+#define DRI_CONF_OPT_END \
+"</option>\n"
+
+/** \brief A verbal description in a specified language (empty version) */
+#define DRI_CONF_DESC(lang,text) \
+"<description lang=\""#lang"\" text=\""text"\"/>\n"
+
+/** \brief A verbal description in a specified language */
+#define DRI_CONF_DESC_BEGIN(lang,text) \
+"<description lang=\""#lang"\" text=\""text"\">\n"
+
+/** \brief End a description */
+#define DRI_CONF_DESC_END \
+"</description>\n"
+
+/** \brief A verbal description of an enum value */
+#define DRI_CONF_ENUM(value,text) \
+"<enum value=\""#value"\" text=\""text"\"/>\n"
+
+/*
+ * predefined option sections and options with multi-lingual descriptions
+ */
+
+/** \brief Debugging options */
+#define DRI_CONF_SECTION_DEBUG \
+DRI_CONF_SECTION_BEGIN \
+	DRI_CONF_DESC(en,"Debugging") \
+	DRI_CONF_DESC(de,"Fehlersuche")
+
+#define DRI_CONF_NO_RAST(def) \
+DRI_CONF_OPT_BEGIN(no_rast,bool,def) \
+        DRI_CONF_DESC(en,"Disable 3D acceleration") \
+        DRI_CONF_DESC(de,"3D-Beschleunigung abschalten") \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_PERFORMANCE_BOXES(def) \
+DRI_CONF_OPT_BEGIN(performance_boxes,bool,def) \
+        DRI_CONF_DESC(en,"Show performance boxes") \
+        DRI_CONF_DESC(de,"Zeige Performanceboxen") \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_DEBUG_DMA(def) \
+DRI_CONF_OPT_BEGIN(debug_dma,bool,def) \
+	DRI_CONF_DESC(en,"Debug DMA buffers") \
+	DRI_CONF_DESC(de,"DMA Puffer debuggen") \
+DRI_CONF_OPT_END
+
+
+/** \brief Texture-related options */
+#define DRI_CONF_SECTION_QUALITY \
+DRI_CONF_SECTION_BEGIN \
+	DRI_CONF_DESC(en,"Image Quality") \
+	DRI_CONF_DESC(de,"Bildqualität")
+
+#define DRI_CONF_TEXTURE_DEPTH_FB       0
+#define DRI_CONF_TEXTURE_DEPTH_32       1
+#define DRI_CONF_TEXTURE_DEPTH_16       2
+#define DRI_CONF_TEXTURE_DEPTH_FORCE_16 3
+#define DRI_CONF_TEXTURE_DEPTH(def) \
+DRI_CONF_OPT_BEGIN_V(texture_depth,enum,def,"0:3") \
+	DRI_CONF_DESC_BEGIN(en,"Texture color depth") \
+                DRI_CONF_ENUM(0,"Prefer frame buffer color depth") \
+                DRI_CONF_ENUM(1,"Prefer 32 bits") \
+                DRI_CONF_ENUM(2,"Prefer 16 bits") \
+                DRI_CONF_ENUM(3,"Force 16 bits") \
+        DRI_CONF_DESC_END \
+	DRI_CONF_DESC_BEGIN(de,"Texturfarbtiefe") \
+                DRI_CONF_ENUM(0,"Bevorzugt so wie Framebuffer") \
+                DRI_CONF_ENUM(1,"Bevorzugt 32 Bits") \
+                DRI_CONF_ENUM(2,"Bevorzugt 16 Bits") \
+                DRI_CONF_ENUM(3,"Höchstens 16 Bits") \
+        DRI_CONF_DESC_END \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_DEF_MAX_ANISOTROPY(def,range) \
+DRI_CONF_OPT_BEGIN_V(def_max_anisotropy,float,def,range) \
+        DRI_CONF_DESC(en,"Default maximum value for anisotropic texture filtering") \
+        DRI_CONF_DESC(de,"Standard Maximalwert für anisotropische Texturfilterung") \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_NO_NEG_LOD_BIAS(def) \
+DRI_CONF_OPT_BEGIN(no_neg_lod_bias,bool,def) \
+        DRI_CONF_DESC(en,"Forbid negative texture LOD bias") \
+        DRI_CONF_DESC(de,"Verbiete negativen Textur-LOD-Bias") \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_COLOR_REDUCTION_ROUND 0
+#define DRI_CONF_COLOR_REDUCTION_DITHER 1
+#define DRI_CONF_COLOR_REDUCTION(def) \
+DRI_CONF_OPT_BEGIN_V(color_reduction,enum,def,"0:1") \
+        DRI_CONF_DESC_BEGIN(en,"Default color reduction method") \
+                DRI_CONF_ENUM(0,"Round or truncate") \
+                DRI_CONF_ENUM(1,"Dither") \
+        DRI_CONF_DESC_END \
+        DRI_CONF_DESC_BEGIN(de,"Standardmethode zur Farbreduktion") \
+                DRI_CONF_ENUM(0,"Runden oder Abschneiden") \
+                DRI_CONF_ENUM(1,"Rastern") \
+        DRI_CONF_DESC_END \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_ROUND_TRUNC 0
+#define DRI_CONF_ROUND_ROUND 1
+#define DRI_CONF_ROUND_MODE(def) \
+DRI_CONF_OPT_BEGIN_V(round_mode,enum,def,"0:1") \
+	DRI_CONF_DESC_BEGIN(en,"Round or truncate colors") \
+                DRI_CONF_ENUM(0,"Truncate") \
+                DRI_CONF_ENUM(1,"Round") \
+        DRI_CONF_DESC_END \
+	DRI_CONF_DESC_BEGIN(de,"Farben runden oder abschneiden") \
+                DRI_CONF_ENUM(0,"Abschneiden") \
+                DRI_CONF_ENUM(1,"Runden") \
+        DRI_CONF_DESC_END \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_DITHER_XERRORDIFF 0
+#define DRI_CONF_DITHER_XERRORDIFFRESET 1
+#define DRI_CONF_DITHER_ORDERED 2
+#define DRI_CONF_DITHER_MODE(def) \
+DRI_CONF_OPT_BEGIN_V(dither_mode,enum,def,"0:2") \
+	DRI_CONF_DESC_BEGIN(en,"Color dithering") \
+                DRI_CONF_ENUM(0,"Horizontal error diffusion") \
+                DRI_CONF_ENUM(1,"Horizontal error diffusion, reset error at line start") \
+                DRI_CONF_ENUM(2,"Ordered 2D dithering") \
+        DRI_CONF_DESC_END \
+	DRI_CONF_DESC_BEGIN(de,"Farben rastern") \
+                DRI_CONF_ENUM(0,"Horizontale Fehlerstreuung") \
+                DRI_CONF_ENUM(1,"Horizontale Fehlerstreuung, Fehler am Zeilenanfang zurücksetzen") \
+                DRI_CONF_ENUM(2,"Geordnete 2D Farbrasterung") \
+        DRI_CONF_DESC_END \
+DRI_CONF_OPT_END
+
+/** \brief Performance-related options */
+#define DRI_CONF_SECTION_PERFORMANCE \
+DRI_CONF_SECTION_BEGIN \
+        DRI_CONF_DESC(en,"Performance") \
+        DRI_CONF_DESC(de,"Leistung")
+
+#define DRI_CONF_TCL_SW 0
+#define DRI_CONF_TCL_PIPELINED 1
+#define DRI_CONF_TCL_VTXFMT 2
+#define DRI_CONF_TCL_CODEGEN 3
+#define DRI_CONF_TCL_MODE(def) \
+DRI_CONF_OPT_BEGIN_V(tcl_mode,enum,def,"0:3") \
+        DRI_CONF_DESC_BEGIN(en,"TCL mode (Transformation, Clipping, Lighting)") \
+                DRI_CONF_ENUM(0,"Software") \
+                DRI_CONF_ENUM(1,"TCL stage in MESA pipeline") \
+                DRI_CONF_ENUM(2,"Bypass MESA's pipeline") \
+                DRI_CONF_ENUM(3,"Bypass MESA's pipeline with state-based code generation") \
+        DRI_CONF_DESC_END \
+        DRI_CONF_DESC_BEGIN(de,"TCL Modus (Transformation, Clipping, Licht)") \
+                DRI_CONF_ENUM(0,"Software") \
+                DRI_CONF_ENUM(1,"TCL Stufe in MESA Pipeline") \
+                DRI_CONF_ENUM(2,"Umgehe MESAs Pipeline") \
+                DRI_CONF_ENUM(3,"Umgehe MESAs Pipeline mit zustandsbasierter Codegenerierung") \
+        DRI_CONF_DESC_END \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_FTHROTTLE_BUSY 0
+#define DRI_CONF_FTHROTTLE_USLEEPS 1
+#define DRI_CONF_FTHROTTLE_IRQS 2
+#define DRI_CONF_FTHROTTLE_MODE(def) \
+DRI_CONF_OPT_BEGIN_V(fthrottle_mode,enum,def,"0:2") \
+        DRI_CONF_DESC_BEGIN(en,"Frame throttling") \
+                DRI_CONF_ENUM(0,"Busy waiting") \
+                DRI_CONF_ENUM(1,"Usleeps") \
+                DRI_CONF_ENUM(2,"Software interrupts") \
+        DRI_CONF_DESC_END \
+        DRI_CONF_DESC_BEGIN(de,"Framethrottling") \
+                DRI_CONF_ENUM(0,"Aktives Warten") \
+                DRI_CONF_ENUM(1,"Usleeps") \
+                DRI_CONF_ENUM(2,"Software Interrutps") \
+        DRI_CONF_DESC_END \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_VBLANK_NEVER 0
+#define DRI_CONF_VBLANK_DEF_INTERVAL_0 1
+#define DRI_CONF_VBLANK_DEF_INTERVAL_1 2
+#define DRI_CONF_VBLANK_ALWAYS_SYNC 3
+#define DRI_CONF_VBLANK_MODE(def) \
+DRI_CONF_OPT_BEGIN_V(vblank_mode,enum,def,"0:3") \
+        DRI_CONF_DESC_BEGIN(en,"Synchronization with vertical refresh (swap intervals)") \
+                DRI_CONF_ENUM(0,"Never, FPS rulez!") \
+                DRI_CONF_ENUM(1,"Application preference, default interval 0") \
+                DRI_CONF_ENUM(2,"Application preference, default interval 1") \
+                DRI_CONF_ENUM(3,"Application preference, always synchronize with refresh") \
+        DRI_CONF_DESC_END \
+        DRI_CONF_DESC_BEGIN(de,"Synchronisation mit dem vertikalen Bildaufbau (swap intervals)") \
+                DRI_CONF_ENUM(0,"Niemals, immer die maximale Framerate") \
+                DRI_CONF_ENUM(1,"Anwendung entscheidet, Standardinterval 0") \
+                DRI_CONF_ENUM(2,"Anwendung entscheidet, Standardinterval 1") \
+                DRI_CONF_ENUM(3,"Anwendung entscheidet, immer mit Bildaufbau synchronisieren") \
+        DRI_CONF_DESC_END \
+DRI_CONF_OPT_END
+
+#endif
diff --git a/reactos/lib/mesa32/src/drivers/fbdev/glfbdev.c b/reactos/lib/mesa32/src/drivers/fbdev/glfbdev.c
new file mode 100644
index 00000000000..6d3ed01d7b4
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/fbdev/glfbdev.c
@@ -0,0 +1,828 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * OpenGL (Mesa) interface for fbdev.
+ * For info about fbdev:
+ * http://www.tldp.org/HOWTO/Framebuffer-HOWTO.html
+ *
+ * known VGA modes
+ * Colours   640x400 640x480 800x600 1024x768 1152x864 1280x1024 1600x1200
+ * --------+--------------------------------------------------------------
+ *  4 bits |    ?       ?     0x302      ?        ?        ?         ?
+ *  8 bits |  0x300   0x301   0x303    0x305    0x161    0x307     0x31C
+ * 15 bits |    ?     0x310   0x313    0x316    0x162    0x319     0x31D
+ * 16 bits |    ?     0x311   0x314    0x317    0x163    0x31A     0x31E
+ * 24 bits |    ?     0x312   0x315    0x318      ?      0x31B     0x31F
+ * 32 bits |    ?       ?       ?        ?      0x164      ?
+ */
+
+
+#ifdef USE_GLFBDEV_DRIVER
+
+#include "glheader.h"
+#include <linux/fb.h>
+#include "GL/glfbdev.h"
+#include "context.h"
+#include "extensions.h"
+#include "imports.h"
+#include "texformat.h"
+#include "teximage.h"
+#include "texstore.h"
+#include "array_cache/acache.h"
+#include "swrast/swrast.h"
+#include "swrast_setup/swrast_setup.h"
+#include "tnl/tnl.h"
+#include "tnl/t_context.h"
+#include "tnl/t_pipeline.h"
+
+
+#define PF_B8G8R8     1
+#define PF_B8G8R8A8   2
+#define PF_B5G6R5     3
+#define PF_B5G5R5     4
+#define PF_CI8        5
+
+
+/*
+ * Derived from Mesa's GLvisual class.
+ */
+struct GLFBDevVisualRec {
+   GLvisual glvisual;              /* base class */
+   struct fb_fix_screeninfo fix;
+   struct fb_var_screeninfo var;
+   int pixelFormat;
+};
+
+/*
+ * Derived from Mesa's GLframebuffer class.
+ */
+struct GLFBDevBufferRec {
+   GLframebuffer glframebuffer;    /* base class */
+   GLFBDevVisualPtr visual;
+   struct fb_fix_screeninfo fix;
+   struct fb_var_screeninfo var;
+   void *frontStart;
+   void *backStart;
+   size_t size;
+   GLuint bytesPerPixel;
+   GLuint rowStride;               /* in bytes */
+   GLubyte *frontBottom;           /* pointer to last row */
+   GLubyte *backBottom;            /* pointer to last row */
+   GLubyte *curBottom;             /* = frontBottom or backBottom */
+   GLboolean mallocBackBuffer;
+};
+
+/*
+ * Derived from Mesa's GLcontext class.
+ */
+struct GLFBDevContextRec {
+   GLcontext glcontext;            /* base class */
+   GLFBDevVisualPtr visual;
+   GLFBDevBufferPtr drawBuffer;
+   GLFBDevBufferPtr readBuffer;
+   GLFBDevBufferPtr curBuffer;
+};
+
+
+
+#define GLFBDEV_CONTEXT(CTX)  ((GLFBDevContextPtr) (CTX))
+#define GLFBDEV_BUFFER(BUF)  ((GLFBDevBufferPtr) (BUF))
+
+
+/**********************************************************************/
+/* Internal device driver functions                                   */
+/**********************************************************************/
+
+
+static const GLubyte *
+get_string(GLcontext *ctx, GLenum pname)
+{
+   (void) ctx;
+   switch (pname) {
+      case GL_RENDERER:
+         return (const GLubyte *) "Mesa glfbdev";
+      default:
+         return NULL;
+   }
+}
+
+
+static void
+update_state( GLcontext *ctx, GLuint new_state )
+{
+   /* not much to do here - pass it on */
+   _swrast_InvalidateState( ctx, new_state );
+   _swsetup_InvalidateState( ctx, new_state );
+   _ac_InvalidateState( ctx, new_state );
+   _tnl_InvalidateState( ctx, new_state );
+}
+
+
+static void
+get_buffer_size( GLframebuffer *buffer, GLuint *width, GLuint *height )
+{
+   const GLFBDevBufferPtr fbdevbuffer = (GLFBDevBufferPtr) buffer;
+   *width = fbdevbuffer->var.xres_virtual;
+   *height = fbdevbuffer->var.yres_virtual;
+}
+
+
+/* specifies the buffer for swrast span rendering/reading */
+static void
+set_buffer( GLcontext *ctx, GLframebuffer *buffer, GLuint bufferBit )
+{
+   GLFBDevContextPtr fbdevctx = GLFBDEV_CONTEXT(ctx);
+   GLFBDevBufferPtr fbdevbuf = GLFBDEV_BUFFER(buffer);
+   fbdevctx->curBuffer = fbdevbuf;
+   switch (bufferBit) {
+   case FRONT_LEFT_BIT:
+      fbdevbuf->curBottom = fbdevbuf->frontBottom;
+      break;
+   case BACK_LEFT_BIT:
+      fbdevbuf->curBottom = fbdevbuf->backBottom;
+      break;
+   default:
+      _mesa_problem(ctx, "bad bufferBit in set_buffer()");
+   }
+}
+
+
+static void
+init_core_functions( GLcontext *ctx )
+{
+   ctx->Driver.GetString = get_string;
+   ctx->Driver.UpdateState = update_state;
+   ctx->Driver.ResizeBuffers = _swrast_alloc_buffers;
+   ctx->Driver.GetBufferSize = get_buffer_size;
+
+   ctx->Driver.Accum = _swrast_Accum;
+   ctx->Driver.Bitmap = _swrast_Bitmap;
+   ctx->Driver.Clear = _swrast_Clear;  /* would be good to optimize */
+   ctx->Driver.CopyPixels = _swrast_CopyPixels;
+   ctx->Driver.DrawPixels = _swrast_DrawPixels;
+   ctx->Driver.ReadPixels = _swrast_ReadPixels;
+   ctx->Driver.DrawBuffer = _swrast_DrawBuffer;
+
+   ctx->Driver.ChooseTextureFormat = _mesa_choose_tex_format;
+   ctx->Driver.TexImage1D = _mesa_store_teximage1d;
+   ctx->Driver.TexImage2D = _mesa_store_teximage2d;
+   ctx->Driver.TexImage3D = _mesa_store_teximage3d;
+   ctx->Driver.TexSubImage1D = _mesa_store_texsubimage1d;
+   ctx->Driver.TexSubImage2D = _mesa_store_texsubimage2d;
+   ctx->Driver.TexSubImage3D = _mesa_store_texsubimage3d;
+   ctx->Driver.TestProxyTexImage = _mesa_test_proxy_teximage;
+
+   ctx->Driver.CompressedTexImage1D = _mesa_store_compressed_teximage1d;
+   ctx->Driver.CompressedTexImage2D = _mesa_store_compressed_teximage2d;
+   ctx->Driver.CompressedTexImage3D = _mesa_store_compressed_teximage3d;
+   ctx->Driver.CompressedTexSubImage1D = _mesa_store_compressed_texsubimage1d;
+   ctx->Driver.CompressedTexSubImage2D = _mesa_store_compressed_texsubimage2d;
+   ctx->Driver.CompressedTexSubImage3D = _mesa_store_compressed_texsubimage3d;
+
+   ctx->Driver.CopyTexImage1D = _swrast_copy_teximage1d;
+   ctx->Driver.CopyTexImage2D = _swrast_copy_teximage2d;
+   ctx->Driver.CopyTexSubImage1D = _swrast_copy_texsubimage1d;
+   ctx->Driver.CopyTexSubImage2D = _swrast_copy_texsubimage2d;
+   ctx->Driver.CopyTexSubImage3D = _swrast_copy_texsubimage3d;
+   ctx->Driver.CopyColorTable = _swrast_CopyColorTable;
+   ctx->Driver.CopyColorSubTable = _swrast_CopyColorSubTable;
+   ctx->Driver.CopyConvolutionFilter1D = _swrast_CopyConvolutionFilter1D;
+   ctx->Driver.CopyConvolutionFilter2D = _swrast_CopyConvolutionFilter2D;
+}
+
+
+/*
+ * Generate code for span functions.
+ */
+
+/* 24-bit BGR */
+#define NAME(PREFIX) PREFIX##_B8G8R8
+#define SPAN_VARS \
+   const GLFBDevContextPtr fbdevctx = GLFBDEV_CONTEXT(ctx); \
+   const GLFBDevBufferPtr fbdevbuf = fbdevctx->curBuffer;
+#define INIT_PIXEL_PTR(P, X, Y) \
+   GLubyte *P = fbdevbuf->curBottom - (Y) * fbdevbuf->rowStride + (X) * 3
+#define INC_PIXEL_PTR(P) P += 3
+#define STORE_RGB_PIXEL(P, X, Y, R, G, B) \
+   P[0] = B;  P[1] = G;  P[2] = R
+#define STORE_RGBA_PIXEL(P, X, Y, R, G, B, A) \
+   P[0] = B;  P[1] = G;  P[2] = R
+#define FETCH_RGBA_PIXEL(R, G, B, A, P) \
+   R = P[2];  G = P[1];  B = P[0];  A = CHAN_MAX
+
+#include "swrast/s_spantemp.h"
+
+
+/* 32-bit BGRA */
+#define NAME(PREFIX) PREFIX##_B8G8R8A8
+#define SPAN_VARS \
+   const GLFBDevContextPtr fbdevctx = GLFBDEV_CONTEXT(ctx); \
+   const GLFBDevBufferPtr fbdevbuf = fbdevctx->curBuffer;
+#define INIT_PIXEL_PTR(P, X, Y) \
+   GLubyte *P = fbdevbuf->curBottom - (Y) * fbdevbuf->rowStride + (X) * 4
+#define INC_PIXEL_PTR(P) P += 4
+#define STORE_RGB_PIXEL(P, X, Y, R, G, B) \
+   P[0] = B;  P[1] = G;  P[2] = R;  P[3] = 255
+#define STORE_RGBA_PIXEL(P, X, Y, R, G, B, A) \
+   P[0] = B;  P[1] = G;  P[2] = R;  P[3] = A
+#define FETCH_RGBA_PIXEL(R, G, B, A, P) \
+   R = P[2];  G = P[1];  B = P[0];  A = P[3]
+
+#include "swrast/s_spantemp.h"
+
+
+/* 16-bit BGR (XXX implement dithering someday) */
+#define NAME(PREFIX) PREFIX##_B5G6R5
+#define SPAN_VARS \
+   const GLFBDevContextPtr fbdevctx = GLFBDEV_CONTEXT(ctx); \
+   const GLFBDevBufferPtr fbdevbuf = fbdevctx->curBuffer;
+#define INIT_PIXEL_PTR(P, X, Y) \
+   GLushort *P = (GLushort *) (fbdevbuf->curBottom - (Y) * fbdevbuf->rowStride + (X) * 2)
+#define INC_PIXEL_PTR(P) P += 1
+#define STORE_RGB_PIXEL(P, X, Y, R, G, B) \
+   *P = ( (((R) & 0xf8) << 8) | (((G) & 0xfc) << 3) | ((B) >> 3) )
+#define STORE_RGBA_PIXEL(P, X, Y, R, G, B, A) \
+   *P = ( (((R) & 0xf8) << 8) | (((G) & 0xfc) << 3) | ((B) >> 3) )
+#define FETCH_RGBA_PIXEL(R, G, B, A, P) \
+   R = ( (((*P) >> 8) & 0xf8) | (((*P) >> 11) & 0x7) ); \
+   G = ( (((*P) >> 3) & 0xfc) | (((*P) >>  5) & 0x3) ); \
+   B = ( (((*P) << 3) & 0xf8) | (((*P)      ) & 0x7) ); \
+   A = CHAN_MAX
+
+#include "swrast/s_spantemp.h"
+
+
+/* 15-bit BGR (XXX implement dithering someday) */
+#define NAME(PREFIX) PREFIX##_B5G5R5
+#define SPAN_VARS \
+   const GLFBDevContextPtr fbdevctx = GLFBDEV_CONTEXT(ctx); \
+   const GLFBDevBufferPtr fbdevbuf = fbdevctx->curBuffer;
+#define INIT_PIXEL_PTR(P, X, Y) \
+   GLushort *P = (GLushort *) (fbdevbuf->curBottom - (Y) * fbdevbuf->rowStride + (X) * 2)
+#define INC_PIXEL_PTR(P) P += 1
+#define STORE_RGB_PIXEL(P, X, Y, R, G, B) \
+   *P = ( (((R) & 0xf8) << 7) | (((G) & 0xf8) << 2) | ((B) >> 3) )
+#define STORE_RGBA_PIXEL(P, X, Y, R, G, B, A) \
+   *P = ( (((R) & 0xf8) << 7) | (((G) & 0xf8) << 2) | ((B) >> 3) )
+#define FETCH_RGBA_PIXEL(R, G, B, A, P) \
+   R = ( (((*P) >> 7) & 0xf8) | (((*P) >> 10) & 0x7) ); \
+   G = ( (((*P) >> 2) & 0xf8) | (((*P) >>  5) & 0x7) ); \
+   B = ( (((*P) << 3) & 0xf8) | (((*P)      ) & 0x7) ); \
+   A = CHAN_MAX
+
+#include "swrast/s_spantemp.h"
+
+
+/* 8-bit color index */
+#define NAME(PREFIX) PREFIX##_CI8
+#define SPAN_VARS \
+   const GLFBDevContextPtr fbdevctx = GLFBDEV_CONTEXT(ctx); \
+   const GLFBDevBufferPtr fbdevbuf = fbdevctx->curBuffer;
+#define INIT_PIXEL_PTR(P, X, Y) \
+   GLubyte *P = fbdevbuf->curBottom - (Y) * fbdevbuf->rowStride + (X)
+#define INC_PIXEL_PTR(P) P += 1
+#define STORE_CI_PIXEL(P, CI) \
+   P[0] = CI
+#define FETCH_CI_PIXEL(CI, P) \
+   CI = P[0]
+
+#include "swrast/s_spantemp.h"
+
+/**********************************************************************/
+/* Public API functions                                               */
+/**********************************************************************/
+
+
+const char *
+glFBDevGetString( int str )
+{
+   switch (str) {
+   case GLFBDEV_VENDOR:
+      return "Mesa Project";
+   case GLFBDEV_VERSION:
+      return "1.0.0";
+   default:
+      return NULL;
+   }
+}
+
+
+const void *
+glFBDevGetProcAddress( const char *procName )
+{
+   struct name_address {
+      const char *name;
+      const void *func;
+   };
+   static const struct name_address functions[] = {
+      { "glFBDevGetString", (void *) glFBDevGetString },
+      { "glFBDevGetProcAddress", (void *) glFBDevGetProcAddress },
+      { "glFBDevCreateVisual", (void *) glFBDevCreateVisual },
+      { "glFBDevDestroyVisual", (void *) glFBDevDestroyVisual },
+      { "glFBDevGetVisualAttrib", (void *) glFBDevGetVisualAttrib },
+      { "glFBDevCreateBuffer", (void *) glFBDevCreateBuffer },
+      { "glFBDevDestroyBuffer", (void *) glFBDevDestroyBuffer },
+      { "glFBDevGetBufferAttrib", (void *) glFBDevGetBufferAttrib },
+      { "glFBDevGetCurrentDrawBuffer", (void *) glFBDevGetCurrentDrawBuffer },
+      { "glFBDevGetCurrentReadBuffer", (void *) glFBDevGetCurrentReadBuffer },
+      { "glFBDevSwapBuffers", (void *) glFBDevSwapBuffers },
+      { "glFBDevCreateContext", (void *) glFBDevCreateContext },
+      { "glFBDevDestroyContext", (void *) glFBDevDestroyContext },
+      { "glFBDevGetContextAttrib", (void *) glFBDevGetContextAttrib },
+      { "glFBDevGetCurrentContext", (void *) glFBDevGetCurrentContext },
+      { "glFBDevMakeCurrent", (void *) glFBDevMakeCurrent },
+      { NULL, NULL }
+   };
+   const struct name_address *entry;
+   for (entry = functions; entry->name; entry++) {
+      if (_mesa_strcmp(entry->name, procName) == 0) {
+         return entry->func;
+      }
+   }
+   return _glapi_get_proc_address(procName);
+}
+
+
+GLFBDevVisualPtr
+glFBDevCreateVisual( const struct fb_fix_screeninfo *fixInfo,
+                     const struct fb_var_screeninfo *varInfo,
+                     const int *attribs )
+{
+   GLFBDevVisualPtr vis;
+   const int *attrib;
+   GLboolean rgbFlag = GL_TRUE, dbFlag = GL_FALSE, stereoFlag = GL_FALSE;
+   GLint redBits = 0, greenBits = 0, blueBits = 0, alphaBits = 0;
+   GLint indexBits = 0, depthBits = 0, stencilBits = 0;
+   GLint accumRedBits = 0, accumGreenBits = 0;
+   GLint accumBlueBits = 0, accumAlphaBits = 0;
+   GLint numSamples = 0;
+
+   ASSERT(fixInfo);
+   ASSERT(varInfo);
+
+   vis = CALLOC_STRUCT(GLFBDevVisualRec);
+   if (!vis)
+      return NULL;
+
+   vis->fix = *fixInfo;  /* struct assignment */
+   vis->var = *varInfo;  /* struct assignment */
+
+   for (attrib = attribs; attrib && *attrib != GLFBDEV_NONE; attrib++) {
+      switch (*attrib) {
+      case GLFBDEV_DOUBLE_BUFFER:
+         dbFlag = GL_TRUE;
+         break;
+      case GLFBDEV_COLOR_INDEX:
+         rgbFlag = GL_FALSE;
+         break;
+      case GLFBDEV_DEPTH_SIZE:
+         depthBits = attrib[1];
+         attrib++;
+         break;
+      case GLFBDEV_STENCIL_SIZE:
+         stencilBits = attrib[1];
+         attrib++;
+         break;
+      case GLFBDEV_ACCUM_SIZE:
+         accumRedBits = accumGreenBits = accumBlueBits = accumAlphaBits
+            = attrib[1];
+         attrib++;
+         break;
+      case GLFBDEV_LEVEL:
+         /* ignored for now */
+         break;
+      default:
+         /* unexpected token */
+         _mesa_free(vis);
+         return NULL;
+      }
+   }
+
+   if (rgbFlag) {
+      redBits   = varInfo->red.length;
+      greenBits = varInfo->green.length;
+      blueBits  = varInfo->blue.length;
+      alphaBits = varInfo->transp.length;
+
+      if ((fixInfo->visual == FB_VISUAL_TRUECOLOR ||
+           fixInfo->visual == FB_VISUAL_DIRECTCOLOR)
+          && varInfo->bits_per_pixel == 24
+          && varInfo->red.offset == 16
+          && varInfo->green.offset == 8
+          && varInfo->blue.offset == 0) {
+         vis->pixelFormat = PF_B8G8R8;
+      }
+      else if ((fixInfo->visual == FB_VISUAL_TRUECOLOR ||
+                fixInfo->visual == FB_VISUAL_DIRECTCOLOR)
+               && varInfo->bits_per_pixel == 32
+               && varInfo->red.offset == 16
+               && varInfo->green.offset == 8
+               && varInfo->blue.offset == 0
+               && varInfo->transp.offset == 24) {
+         vis->pixelFormat = PF_B8G8R8A8;
+      }
+      else if ((fixInfo->visual == FB_VISUAL_TRUECOLOR ||
+                fixInfo->visual == FB_VISUAL_DIRECTCOLOR)
+               && varInfo->bits_per_pixel == 16
+               && varInfo->red.offset == 11
+               && varInfo->green.offset == 5
+               && varInfo->blue.offset == 0) {
+         vis->pixelFormat = PF_B5G6R5;
+      }
+      else if ((fixInfo->visual == FB_VISUAL_TRUECOLOR ||
+                fixInfo->visual == FB_VISUAL_DIRECTCOLOR)
+               && varInfo->bits_per_pixel == 16
+               && varInfo->red.offset == 10
+               && varInfo->green.offset == 5
+               && varInfo->blue.offset == 0) {
+         vis->pixelFormat = PF_B5G5R5;
+      }
+      else {
+         _mesa_problem(NULL, "Unsupported fbdev RGB visual/bitdepth!\n");
+         /*
+         printf("fixInfo->visual = 0x%x\n", fixInfo->visual);
+         printf("varInfo->bits_per_pixel = %d\n", varInfo->bits_per_pixel);
+         printf("varInfo->red.offset = %d\n", varInfo->red.offset);
+         printf("varInfo->green.offset = %d\n", varInfo->green.offset);
+         printf("varInfo->blue.offset = %d\n", varInfo->blue.offset);
+         */
+         _mesa_free(vis);
+         return NULL;
+      }
+   }
+   else {
+      indexBits = varInfo->bits_per_pixel;
+      if ((fixInfo->visual == FB_VISUAL_PSEUDOCOLOR ||
+           fixInfo->visual == FB_VISUAL_STATIC_PSEUDOCOLOR)
+          && varInfo->bits_per_pixel == 8) {
+         vis->pixelFormat = PF_CI8;
+      }
+      else {
+         _mesa_problem(NULL, "Unsupported fbdev CI visual/bitdepth!\n");
+         _mesa_free(vis);
+         return NULL;
+      }
+   }
+
+   if (!_mesa_initialize_visual(&vis->glvisual, rgbFlag, dbFlag, stereoFlag,
+                                redBits, greenBits, blueBits, alphaBits,
+                                indexBits, depthBits, stencilBits,
+                                accumRedBits, accumGreenBits,
+                                accumBlueBits, accumAlphaBits,
+                                numSamples)) {
+      /* something was invalid */
+      _mesa_free(vis);
+      return NULL;
+   }
+
+   return vis;
+}
+
+
+void
+glFBDevDestroyVisual( GLFBDevVisualPtr visual )
+{
+   if (visual)
+      _mesa_free(visual);
+}
+
+
+int
+glFBDevGetVisualAttrib( const GLFBDevVisualPtr visual, int attrib)
+{
+   (void) visual;
+   (void) attrib;
+   return -1;
+}
+
+
+
+GLFBDevBufferPtr
+glFBDevCreateBuffer( const struct fb_fix_screeninfo *fixInfo,
+                     const struct fb_var_screeninfo *varInfo,
+                     const GLFBDevVisualPtr visual,
+                     void *frontBuffer, void *backBuffer, size_t size )
+{
+   GLFBDevBufferPtr buf;
+
+   ASSERT(visual);
+   ASSERT(frontBuffer);
+   ASSERT(size > 0);
+
+   if (visual->fix.visual != fixInfo->visual ||
+       visual->fix.type != fixInfo->type ||
+       visual->var.bits_per_pixel != varInfo->bits_per_pixel ||
+       visual->var.grayscale != varInfo->grayscale ||
+       visual->var.red.offset != varInfo->red.offset ||
+       visual->var.green.offset != varInfo->green.offset ||
+       visual->var.blue.offset != varInfo->blue.offset ||
+       visual->var.transp.offset != varInfo->transp.offset) {
+      /* visual mismatch! */
+      return NULL;
+   }
+
+   buf = CALLOC_STRUCT(GLFBDevBufferRec);
+   if (!buf)
+      return NULL;
+
+   _mesa_initialize_framebuffer(&buf->glframebuffer, &visual->glvisual,
+                                visual->glvisual.haveDepthBuffer,
+                                visual->glvisual.haveStencilBuffer,
+                                visual->glvisual.haveAccumBuffer,
+                                GL_FALSE);
+
+   buf->fix = *fixInfo;   /* struct assignment */
+   buf->var = *varInfo;   /* struct assignment */
+   buf->visual = visual;  /* ptr assignment */
+   buf->frontStart = frontBuffer;
+   buf->size = size;
+   buf->bytesPerPixel = visual->var.bits_per_pixel / 8;
+   buf->rowStride = visual->var.xres_virtual * buf->bytesPerPixel;
+   buf->frontBottom = (GLubyte *) buf->frontStart
+                    + (visual->var.yres_virtual - 1) * buf->rowStride;
+
+   if (visual->glvisual.doubleBufferMode) {
+      if (backBuffer) {
+         buf->backStart = backBuffer;
+         buf->mallocBackBuffer = GL_FALSE;
+      }
+      else {
+         buf->backStart = _mesa_malloc(size);
+         if (!buf->backStart) {
+            _mesa_free_framebuffer_data(&buf->glframebuffer);
+            _mesa_free(buf);
+            return NULL;
+         }
+         buf->mallocBackBuffer = GL_TRUE;
+      }
+      buf->backBottom = (GLubyte *) buf->backStart
+                      + (visual->var.yres_virtual - 1) * buf->rowStride;
+      buf->curBottom = buf->backBottom;
+   }
+   else {
+      buf->backStart = NULL;
+      buf->mallocBackBuffer = GL_FALSE;
+      buf->backBottom = NULL;
+      buf->curBottom = buf->frontBottom;
+   }
+
+   return buf;
+}
+
+
+void
+glFBDevDestroyBuffer( GLFBDevBufferPtr buffer )
+{
+   if (buffer) {
+      /* check if destroying the current buffer */
+      GLFBDevBufferPtr curDraw = glFBDevGetCurrentDrawBuffer();
+      GLFBDevBufferPtr curRead = glFBDevGetCurrentReadBuffer();
+      if (buffer == curDraw || buffer == curRead) {
+         glFBDevMakeCurrent( NULL, NULL, NULL);
+      }
+      if (buffer->mallocBackBuffer) {
+         _mesa_free(buffer->backStart);
+      }
+      /* free the software depth, stencil, accum buffers */
+      _mesa_free_framebuffer_data(&buffer->glframebuffer);
+      _mesa_free(buffer);
+   }
+}
+
+
+int
+glFBDevGetBufferAttrib( const GLFBDevBufferPtr buffer, int attrib)
+{
+   (void) buffer;
+   (void) attrib;
+   return -1;
+}
+
+
+GLFBDevBufferPtr
+glFBDevGetCurrentDrawBuffer( void )
+{
+   GLFBDevContextPtr fbdevctx = glFBDevGetCurrentContext();
+   if (fbdevctx)
+      return fbdevctx->drawBuffer;
+   else
+      return NULL;
+}
+
+
+GLFBDevBufferPtr
+glFBDevGetCurrentReadBuffer( void )
+{
+   GLFBDevContextPtr fbdevctx = glFBDevGetCurrentContext();
+   if (fbdevctx)
+      return fbdevctx->readBuffer;
+   else
+      return NULL;
+}
+
+
+void
+glFBDevSwapBuffers( GLFBDevBufferPtr buffer )
+{
+   GLFBDevContextPtr fbdevctx = glFBDevGetCurrentContext();
+
+   if (!buffer || !buffer->visual->glvisual.doubleBufferMode)
+      return;
+
+   /* check if swapping currently bound buffer */
+   if (fbdevctx->drawBuffer == buffer) {
+      /* flush pending rendering */
+      _mesa_notifySwapBuffers(&fbdevctx->glcontext);
+   }
+
+   ASSERT(buffer->frontStart);
+   ASSERT(buffer->backStart);
+   _mesa_memcpy(buffer->frontStart, buffer->backStart, buffer->size);
+}
+
+
+GLFBDevContextPtr
+glFBDevCreateContext( const GLFBDevVisualPtr visual, GLFBDevContextPtr share )
+{
+   GLFBDevContextPtr ctx;
+   GLcontext *glctx;
+
+   ASSERT(visual);
+
+   ctx = CALLOC_STRUCT(GLFBDevContextRec);
+   if (!ctx)
+      return NULL;
+
+   if (!_mesa_initialize_context(&ctx->glcontext, &visual->glvisual,
+                                 share ? &share->glcontext : NULL,
+                                 (void *) ctx, GL_FALSE)) {
+      _mesa_free(ctx);
+      return NULL;
+   }
+
+   ctx->visual = visual;
+
+   /* Create module contexts */
+   glctx = (GLcontext *) &ctx->glcontext;
+   init_core_functions( glctx );
+   _swrast_CreateContext( glctx );
+   _ac_CreateContext( glctx );
+   _tnl_CreateContext( glctx );
+   _swsetup_CreateContext( glctx );
+   _swsetup_Wakeup( glctx );
+
+   /* swrast init */
+   {
+      struct swrast_device_driver *swdd;
+      swdd = _swrast_GetDeviceDriverReference( glctx );
+      swdd->SetBuffer = set_buffer;
+      if (visual->pixelFormat == PF_B8G8R8) {
+         swdd->WriteRGBASpan = write_rgba_span_B8G8R8;
+         swdd->WriteRGBSpan = write_rgb_span_B8G8R8;
+         swdd->WriteMonoRGBASpan = write_monorgba_span_B8G8R8;
+         swdd->WriteRGBAPixels = write_rgba_pixels_B8G8R8;
+         swdd->WriteMonoRGBAPixels = write_monorgba_pixels_B8G8R8;
+         swdd->ReadRGBASpan = read_rgba_span_B8G8R8;
+         swdd->ReadRGBAPixels = read_rgba_pixels_B8G8R8;
+      }
+      else if (visual->pixelFormat == PF_B8G8R8A8) {
+         swdd->WriteRGBASpan = write_rgba_span_B8G8R8A8;
+         swdd->WriteRGBSpan = write_rgb_span_B8G8R8A8;
+         swdd->WriteMonoRGBASpan = write_monorgba_span_B8G8R8A8;
+         swdd->WriteRGBAPixels = write_rgba_pixels_B8G8R8A8;
+         swdd->WriteMonoRGBAPixels = write_monorgba_pixels_B8G8R8A8;
+         swdd->ReadRGBASpan = read_rgba_span_B8G8R8A8;
+         swdd->ReadRGBAPixels = read_rgba_pixels_B8G8R8A8;
+      }
+      else if (visual->pixelFormat == PF_B5G6R5) {
+         swdd->WriteRGBASpan = write_rgba_span_B5G6R5;
+         swdd->WriteRGBSpan = write_rgb_span_B5G6R5;
+         swdd->WriteMonoRGBASpan = write_monorgba_span_B5G6R5;
+         swdd->WriteRGBAPixels = write_rgba_pixels_B5G6R5;
+         swdd->WriteMonoRGBAPixels = write_monorgba_pixels_B5G6R5;
+         swdd->ReadRGBASpan = read_rgba_span_B5G6R5;
+         swdd->ReadRGBAPixels = read_rgba_pixels_B5G6R5;
+      }
+      else if (visual->pixelFormat == PF_B5G5R5) {
+         swdd->WriteRGBASpan = write_rgba_span_B5G5R5;
+         swdd->WriteRGBSpan = write_rgb_span_B5G5R5;
+         swdd->WriteMonoRGBASpan = write_monorgba_span_B5G5R5;
+         swdd->WriteRGBAPixels = write_rgba_pixels_B5G5R5;
+         swdd->WriteMonoRGBAPixels = write_monorgba_pixels_B5G5R5;
+         swdd->ReadRGBASpan = read_rgba_span_B5G5R5;
+         swdd->ReadRGBAPixels = read_rgba_pixels_B5G5R5;
+      }
+      else if (visual->pixelFormat == PF_CI8) {
+         swdd->WriteCI32Span = write_index32_span_CI8;
+         swdd->WriteCI8Span = write_index8_span_CI8;
+         swdd->WriteMonoCISpan = write_monoindex_span_CI8;
+         swdd->WriteCI32Pixels = write_index_pixels_CI8;
+         swdd->WriteMonoCIPixels = write_monoindex_pixels_CI8;
+         swdd->ReadCI32Span = read_index_span_CI8;
+         swdd->ReadCI32Pixels = read_index_pixels_CI8;
+      }
+      else {
+         _mesa_printf("bad pixelformat: %d\n", visual->pixelFormat);
+      }
+   }
+
+   /* use default TCL pipeline */
+   {
+      TNLcontext *tnl = TNL_CONTEXT(glctx);
+      tnl->Driver.RunPipeline = _tnl_run_pipeline;
+   }
+
+   _mesa_enable_sw_extensions(glctx);
+
+   return ctx;
+}
+
+
+void
+glFBDevDestroyContext( GLFBDevContextPtr context )
+{
+   GLFBDevContextPtr fbdevctx = glFBDevGetCurrentContext();
+
+   if (context) {
+      if (fbdevctx == context) {
+         /* destroying current context */
+         _mesa_make_current2(NULL, NULL, NULL);
+         _mesa_notifyDestroy(&context->glcontext);
+      }
+      _mesa_free_context_data(&context->glcontext);
+      _mesa_free(context);
+   }
+}
+
+
+int
+glFBDevGetContextAttrib( const GLFBDevContextPtr context, int attrib)
+{
+   (void) context;
+   (void) attrib;
+   return -1;
+}
+
+
+GLFBDevContextPtr
+glFBDevGetCurrentContext( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   return (GLFBDevContextPtr) ctx;
+}
+
+
+int
+glFBDevMakeCurrent( GLFBDevContextPtr context,
+                    GLFBDevBufferPtr drawBuffer,
+                    GLFBDevBufferPtr readBuffer )
+{
+   if (context && drawBuffer && readBuffer) {
+      /* Make sure the context's visual and the buffers' visuals match.
+       * XXX we might do this by comparing specific fields like bits_per_pixel,
+       * visual, etc. in the future.
+       */
+      if (context->visual != drawBuffer->visual ||
+          context->visual != readBuffer->visual) {
+         return 0;
+      }
+      _mesa_make_current2( &context->glcontext,
+                           &drawBuffer->glframebuffer,
+                           &readBuffer->glframebuffer );
+      context->drawBuffer = drawBuffer;
+      context->readBuffer = readBuffer;
+      context->curBuffer = drawBuffer;
+   }
+   else {
+      /* unbind */
+      _mesa_make_current2( NULL, NULL, NULL );
+   }
+
+   return 1;
+}
+
+#endif /* USE_GLFBDEV_DRIVER */
+
diff --git a/reactos/lib/mesa32/src/drivers/ggi/default/genkgi.conf.in b/reactos/lib/mesa32/src/drivers/ggi/default/genkgi.conf.in
new file mode 100644
index 00000000000..02acad2a191
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/ggi/default/genkgi.conf.in
@@ -0,0 +1,4 @@
+# GGIMesa genkgi helper configuration
+.root: @ggi_libdir@/ggi/mesa/default
+
+tgt-fbdev-kgicon-d3dim-mesa	d3dim.so
diff --git a/reactos/lib/mesa32/src/drivers/ggi/default/genkgi_mode.c b/reactos/lib/mesa32/src/drivers/ggi/default/genkgi_mode.c
new file mode 100644
index 00000000000..a96849f2409
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/ggi/default/genkgi_mode.c
@@ -0,0 +1,97 @@
+/* $Id: genkgi_mode.c,v 1.1 2004/07/16 22:12:31 blight Exp $
+******************************************************************************
+
+   display-fbdev-kgicon-generic-mesa
+
+   Copyright (C) 1999 Jon Taylor [taylorj@ggi-project.org]
+
+   Permission is hereby granted, free of charge, to any person obtaining a
+   copy of this software and associated documentation files (the "Software"),
+   to deal in the Software without restriction, including without limitation
+   the rights to use, copy, modify, merge, publish, distribute, sublicense,
+   and/or sell copies of the Software, and to permit persons to whom the
+   Software is furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+   THE AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+   IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+******************************************************************************
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+
+#include <ggi/internal/ggi-dl.h>
+#include <ggi/mesa/ggimesa_int.h>
+#include <ggi/mesa/debug.h>
+#include "genkgi.h"
+
+int GGIMesa_genkgi_getapi(ggi_visual *vis, int num, char *apiname, char *arguments)
+{
+	struct genkgi_priv_mesa *priv = GENKGI_PRIV_MESA(vis);
+	
+	GGIMESADPRINT_CORE("Entered mesa_genkgi_getapi, num=%d\n", num);
+	
+	strcpy(arguments, "");
+
+	switch(num) 
+	{
+		case 0:
+		if (priv->have_accel)
+		{
+			strcpy(apiname, priv->accel);
+			return 0;
+		}
+		break;
+	}
+	return -1;
+}
+
+int GGIMesa_genkgi_flush(ggi_visual *vis, int x, int y, int w, int h, int tryflag)
+{
+	struct genkgi_priv_mesa *priv = GENKGI_PRIV_MESA(vis);
+	int junkval; 
+
+	priv->oldpriv->kgicommand_ptr += getpagesize(); 
+	(kgiu32)(priv->oldpriv->kgicommand_ptr) &= 0xfffff000;
+	junkval = *((int *)(priv->oldpriv->kgicommand_ptr));
+	
+	/* Check if we are now in the last page, and reset the
+	 * FIFO if so.  We can't use the last page to send
+	 * more commands, since there's no page after it that
+	 * we can touch to fault in the last page's commands.
+	 * 
+	 * FIXME: This will be replaced with a flush-and-reset handler
+	 * on the end-of-buffer pagefault at some point....
+	 * 
+	 */
+	if ((priv->oldpriv->kgicommand_ptr - priv->oldpriv->mapped_kgicommand)
+	    >= (priv->oldpriv->kgicommand_buffersize - getpagesize()))
+	{
+		munmap(priv->oldpriv->mapped_kgicommand, priv->oldpriv->kgicommand_buffersize);
+		if ((priv->oldpriv->mapped_kgicommand = 
+		     mmap(NULL, 
+			  priv->oldpriv->kgicommand_buffersize, 
+			  PROT_READ | PROT_WRITE,
+			  MAP_SHARED,
+			  priv->oldpriv->fd_kgicommand, 
+			  0)) == MAP_FAILED)
+		{
+			ggiPanic("Failed to remap kgicommand!");
+		}
+		priv->oldpriv->kgicommand_ptr = priv->oldpriv->mapped_kgicommand;
+	}
+	return 0;
+}
diff --git a/reactos/lib/mesa32/src/drivers/ggi/default/genkgi_visual.c b/reactos/lib/mesa32/src/drivers/ggi/default/genkgi_visual.c
new file mode 100644
index 00000000000..2bf4a9c8bff
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/ggi/default/genkgi_visual.c
@@ -0,0 +1,190 @@
+/* $Id: genkgi_visual.c,v 1.1 2004/07/16 22:12:31 blight Exp $
+******************************************************************************
+
+   genkgi_visual.c: visual handling for the generic KGI helper
+   
+   Copyright (C) 1999 Jon Taylor [taylorj@ggi-project.org]
+
+   Permission is hereby granted, free of charge, to any person obtaining a
+   copy of this software and associated documentation files (the "Software"),
+   to deal in the Software without restriction, including without limitation
+   the rights to use, copy, modify, merge, publish, distribute, sublicense,
+   and/or sell copies of the Software, and to permit persons to whom the
+   Software is furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+   THE AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+   IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+******************************************************************************
+*/
+
+#include <ggi/internal/ggi-dl.h>
+#include <ggi/mesa/ggimesa_int.h>
+#include <ggi/mesa/display_fbdev.h>
+#include <ggi/mesa/debug.h>
+#include "genkgi.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#ifdef HAVE_SYS_VT_H
+#include <sys/vt.h>
+#else
+#include <linux/vt.h>
+#endif
+#ifdef HAVE_LINUX_KDEV_T_H
+#include <linux/kdev_t.h>
+#endif
+#include <linux/tty.h>
+
+#define DEFAULT_FBNUM	0
+
+static char accel_prefix[] = "tgt-fbdev-kgicon-";
+#define PREFIX_LEN	(sizeof(accel_prefix))
+
+typedef struct {
+	int   async;
+	char *str;
+} accel_info;
+
+static accel_info accel_strings[] = 
+{
+	{ 0, "d3dim" },		/* Direct3D Immediate Mode     		*/
+};
+
+#define NUM_ACCELS	(sizeof(accel_strings)/sizeof(accel_info))
+
+/* FIXME: These should be defined in the makefile system */
+#define CONF_FILE "/usr/local/etc/ggi/mesa/targets/genkgi.conf"
+void *_configHandle;
+char confstub[512] = CONF_FILE;
+char *conffile = confstub;
+
+static int changed(ggi_visual_t vis, int whatchanged)
+{
+	GGIMESADPRINT_CORE("Entered ggimesa_genkgi_changed\n");
+	
+	switch (whatchanged)
+	{
+		case GGI_CHG_APILIST:
+		{
+			char api[256];
+			char args[256];
+			int i;
+			const char *fname;
+			ggi_dlhandle *lib;
+			
+			for (i = 0; ggiGetAPI(vis, i, api, args) == 0; i++)
+			{
+				strcat(api, "-mesa");
+				GGIMESADPRINT_CORE("ggimesa_genkgi_changed: api=%s, i=%d\n", api, i);
+				fname = ggMatchConfig(_configHandle, api, NULL);
+				if (fname == NULL)
+				{
+					/* No special implementation for this sublib */
+					continue;
+				}
+				
+				lib = ggiExtensionLoadDL(vis, fname, args, NULL);
+			}
+		} 
+		break;
+	}
+	return 0;
+}
+
+static int GGIdlinit(ggi_visual *vis, struct ggi_dlhandle *dlh,
+			const char *args, void *argptr, uint32 *dlret)
+{
+	struct genkgi_priv_mesa *priv;
+	char libname[256], libargs[256];
+	int id, err;
+	struct stat junk;
+	ggifunc_getapi *oldgetapi;
+
+	GGIMESADPRINT_CORE("display-fbdev-kgicon-mesa: GGIdlinit start\n");
+	
+	GENKGI_PRIV_MESA(vis) = priv = malloc(sizeof(struct genkgi_priv_mesa));
+	if (priv == NULL) 
+	{
+		fprintf(stderr, "Failed to allocate genkgi private data\n");
+		return GGI_DL_ERROR;
+	}
+	
+	priv->oldpriv = GENKGI_PRIV(vis);
+#if 0
+	err = ggLoadConfig(conffile, &_configHandle);
+	if (err != GGI_OK)
+	{
+		gl_ggiPrint("display-fbdev-kgicon-mesa: Couldn't open %s\n", conffile);
+		return err;
+	}
+
+	/* Hack city here.  We need to probe the KGI driver properly for
+	 * suggest-strings to discover the acceleration type(s).
+	 */
+	priv->have_accel = 0;
+
+	if (stat("/proc/gfx0", &junk) == 0)
+	{
+		sprintf(priv->accel, "%s%s", accel_prefix, "d3dim");
+		priv->have_accel = 1;
+		GGIMESADPRINT_CORE("display-fbdev-kgicon-mesa: Using accel: \"%s\"\n", priv->accel);
+	}
+
+	/* Mode management */
+	vis->opdisplay->getapi = GGIMesa_genkgi_getapi;	
+	ggiIndicateChange(vis, GGI_CHG_APILIST);
+	
+	/* Give the accel sublibs a chance to set up a driver */
+	if (priv->have_accel == 1)
+	{
+		oldgetapi = vis->opdisplay->getapi;
+		vis->opdisplay->getapi = GGIMesa_genkgi_getapi;
+		changed(vis, GGI_CHG_APILIST);
+		/* If the accel sublibs didn't produce, back up
+		 * and keep looking */
+		if ((LIBGGI_MESAEXT(vis)->update_state == NULL) ||
+		    (LIBGGI_MESAEXT(vis)->setup_driver == NULL))
+		  vis->opdisplay->getapi = oldgetapi;
+	}
+	
+	LIBGGI_MESAEXT(vis)->update_state = genkgi_update_state;
+	LIBGGI_MESAEXT(vis)->setup_driver = genkgi_setup_driver;
+#endif	
+	GGIMESADPRINT_CORE("display-fbdev-kgicon-mesa: GGIdlinit finished\n");
+
+	*dlret = GGI_DL_OPDRAW;
+	return 0;
+}
+
+int MesaGGIdl_fbdev(int func, void **funcptr)
+{
+	switch (func) {
+		case GGIFUNC_open:
+			*funcptr = GGIopen;
+			return 0;
+		case GGIFUNC_exit:
+		case GGIFUNC_close:
+			*funcptr = NULL;
+			return 0;
+		default:
+			*funcptr = NULL;
+	}
+	return GGI_ENOTFOUND;
+}
+
+#include <ggi/internal/ggidlinit.h>
diff --git a/reactos/lib/mesa32/src/drivers/ggi/default/linear.c b/reactos/lib/mesa32/src/drivers/ggi/default/linear.c
new file mode 100644
index 00000000000..ffd0acc3d3b
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/ggi/default/linear.c
@@ -0,0 +1,409 @@
+/* GGI-Driver for MESA
+ * 
+ * Copyright (C) 1997  Uwe Maurer
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * ---------------------------------------------------------------------
+ * This code was derived from the following source of information:
+ *
+ * svgamesa.c and ddsample.c by Brian Paul
+ * 
+ */
+
+#include <ggi/mesa/ggimesa.h>
+#include <ggi/mesa/ggimesa_int.h>
+#include <ggi/mesa/debug.h>
+#include "swrast/swrast.h"
+
+#define RMASK ((1<<R)-1)
+#define GMASK ((1<<G)-1)
+#define BMASK ((1<<B)-1)
+
+#define RS (8-R)
+#define GS (8-G)
+#define BS (8-B)
+
+#define PACK(color) (((color[RCOMP]>>RS) << (G+B)) |  \
+                     ((color[GCOMP]>>GS) << B)     |  \
+                     ((color[BCOMP]>>BS)))
+
+#define FLIP(coord) (LIBGGI_MODE(ggi_ctx->ggi_visual)->visible.y-(coord) - 1)
+
+
+/**********************************************************************/
+/*****            Write spans of pixels                           *****/
+/**********************************************************************/
+
+void GGIwrite_ci32_span(const GLcontext *ctx, GLuint n, GLint x, GLint y,
+			const GLuint ci[], const GLubyte mask[])
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	FB_TYPE *fb;
+	fb = (FB_TYPE *)((char *)LIBGGI_CURWRITE(ggi_ctx->ggi_visual) +
+			 FLIP(y)*LIBGGI_FB_W_STRIDE(ggi_ctx->ggi_visual)) + x;
+
+	if (mask) {
+		while (n--) {
+			if (*mask++)
+				*fb = *ci;
+			fb++;
+			ci++;
+		}
+	} else {
+		while (n--) *fb++ = *ci++;
+	}
+}
+
+void GGIwrite_ci8_span(const GLcontext *ctx, GLuint n, GLint x, GLint y,
+		       const GLubyte ci[], const GLubyte mask[])
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	FB_TYPE *fb;
+	fb = (FB_TYPE *)((char *)LIBGGI_CURWRITE(ggi_ctx->ggi_visual) +
+			 FLIP(y)*LIBGGI_FB_W_STRIDE(ggi_ctx->ggi_visual)) + x;
+
+	if (mask) {
+		while (n--) {
+			if (*mask++)
+				*fb = *ci;
+			fb++;
+			ci++;
+		}	
+	} else {
+		while (n--) *fb++ = *ci++;
+	}
+}
+
+
+void GGIwrite_rgba_span(const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                        const GLchan rgba[][4], const GLubyte mask[])
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	FB_TYPE *fb;
+	fb = (FB_TYPE *)((char *)LIBGGI_CURWRITE(ggi_ctx->ggi_visual) +
+			 FLIP(y)*LIBGGI_FB_W_STRIDE(ggi_ctx->ggi_visual)) + x;
+
+	if (mask) {
+		while (n--) {
+			if (*mask++)
+				*fb = PACK(rgba[0]);
+			fb++;
+			rgba++;
+		}
+	} else {
+		while (n--) {
+			*fb++ = PACK(rgba[0]);
+			rgba++;
+		}
+	}
+}
+
+void GGIwrite_rgb_span(const GLcontext *ctx, GLuint n, GLint x, GLint y,
+		       const GLchan rgba[][3], const GLubyte mask[])
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	FB_TYPE *fb;
+	fb = (FB_TYPE *)((char *)LIBGGI_CURWRITE(ggi_ctx->ggi_visual) +
+			 FLIP(y)*LIBGGI_FB_W_STRIDE(ggi_ctx->ggi_visual)) + x;
+
+	if (mask) {
+		while (n--) {
+			if (*mask++)
+				*fb = PACK(rgba[0]);
+			fb++;
+			rgba++;
+		}
+	} else {
+		while (n--) {
+			*fb++ = PACK(rgba[0]);
+			rgba++;
+		}
+	}
+}
+
+
+void GGIwrite_mono_rgba_span(const GLcontext *ctx, GLuint n, GLint x, GLint y,
+			     const GLchan color[4], const GLubyte mask[])
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	FB_TYPE *fb;
+	fb = (FB_TYPE *)((char *)LIBGGI_CURWRITE(ggi_ctx->ggi_visual) +
+			 FLIP(y)*LIBGGI_FB_W_STRIDE(ggi_ctx->ggi_visual)) + x;
+
+	if (mask) {
+		while (n--){
+			if (*mask++)
+				*fb = PACK(color);
+			++fb;
+		}
+	} else {
+		while (n--) 
+			*fb++ = PACK(color);
+
+	        /* Alternatively we could write a potentialy faster HLine
+		ggiSetGCForeground(ggi_ctx->ggi_visual, color);
+		ggiDrawHLine(ggi_ctx->ggi_visual,x,FLIP(y),n);
+		*/
+	}
+}
+
+void GGIwrite_mono_ci_span(const GLcontext *ctx, GLuint n, GLint x, GLint y,
+			   const GLuint ci, const GLubyte mask[])
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	FB_TYPE *fb;
+	fb = (FB_TYPE *)((char *)LIBGGI_CURWRITE(ggi_ctx->ggi_visual) +
+			 FLIP(y)*LIBGGI_FB_W_STRIDE(ggi_ctx->ggi_visual)) + x;
+
+	if (mask){
+		while (n--){
+			if (*mask++)
+				*fb = ci;
+			++fb;
+		}
+	} else {
+		while (n--) 
+		        *fb++ = ci;
+
+	        /* Alternatively we could write a potentialy faster HLine
+		ggiSetGCForeground(ggi_ctx->ggi_visual, ci);
+		ggiDrawHLine(ggi_ctx->ggi_visual, x, FLIP(y), n);
+		*/
+	}
+}
+
+
+/**********************************************************************/
+/*****                 Read spans of pixels                       *****/
+/**********************************************************************/
+
+
+void GGIread_ci32_span(const GLcontext *ctx,
+		       GLuint n, GLint x, GLint y, GLuint ci[])
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	FB_TYPE *fb;
+	fb = (FB_TYPE *)((char *)LIBGGI_CURWRITE(ggi_ctx->ggi_visual) +
+			 FLIP(y)*LIBGGI_FB_W_STRIDE(ggi_ctx->ggi_visual)) + x;
+
+	while (n--)
+		*ci++ = (GLuint)*fb++;
+}
+
+void GGIread_rgba_span(const GLcontext *ctx,
+		       GLuint n, GLint x, GLint y, GLchan rgba[][4])
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	FB_TYPE color;
+	FB_TYPE *fb;
+	fb = (FB_TYPE *)((char *)LIBGGI_CURWRITE(ggi_ctx->ggi_visual) +
+			 FLIP(y)*LIBGGI_FB_W_STRIDE(ggi_ctx->ggi_visual)) + x;
+	
+	while (n--) {
+		color = *fb++;
+		rgba[0][RCOMP] = (GLubyte) (color>>(G+B))<<RS;  
+		rgba[0][GCOMP] = (GLubyte) ((color>>B)& ((1<<G)-1))<<GS;  
+		rgba[0][BCOMP] = (GLubyte) (color & ((1<<B)-1))<<BS;  
+		rgba[0][ACOMP] = 0;
+		rgba++;
+	}
+}
+
+/**********************************************************************/
+/*****                  Write arrays of pixels                    *****/
+/**********************************************************************/
+
+void GGIwrite_ci32_pixels(const GLcontext *ctx,
+			  GLuint n, const GLint x[], const GLint y[],
+			  const GLuint ci[], const GLubyte mask[])
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	int stride = LIBGGI_FB_W_STRIDE(ggi_ctx->ggi_visual);
+	char *fb = (char *)LIBGGI_CURWRITE(ggi_ctx->ggi_visual);
+
+	while (n--) {
+		if (*mask++){
+			FB_TYPE *dst = (FB_TYPE*)(fb + FLIP(*y)*stride) + *x;
+			*dst = *ci;
+		}
+		ci++;
+		x++;
+		y++;
+	}
+}
+
+void GGIwrite_mono_ci_pixels(const GLcontext *ctx,
+			     GLuint n, const GLint x[], const GLint y[],
+			     GLuint ci, const GLubyte mask[])
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	int stride = LIBGGI_FB_W_STRIDE(ggi_ctx->ggi_visual);
+	char *fb = (char *)LIBGGI_CURWRITE(ggi_ctx->ggi_visual);
+
+	while (n--) {
+		if (*mask++){
+			FB_TYPE *dst = (FB_TYPE*)(fb + FLIP(*y)*stride) + *x;
+			*dst = ci;
+		}
+		x++;
+		y++;
+	}
+}
+
+void GGIwrite_rgba_pixels(const GLcontext *ctx,
+			  GLuint n, const GLint x[], const GLint y[],
+			  const GLchan rgba[][4], const GLubyte mask[])
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	int stride = LIBGGI_FB_W_STRIDE(ggi_ctx->ggi_visual);
+	char *fb = (char *)LIBGGI_CURWRITE(ggi_ctx->ggi_visual);
+
+	while (n--) {
+		if (*mask++){
+			FB_TYPE *dst = (FB_TYPE*)(fb + FLIP(*y)*stride) + *x;
+			*dst = PACK(rgba[0]);
+		}
+		x++;
+		y++;
+		rgba++;
+	}
+}
+
+void GGIwrite_mono_rgba_pixels(const GLcontext *ctx,
+			       GLuint n, const GLint x[], const GLint y[],
+			       const GLchan rgba[4], const GLubyte mask[])
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	int stride = LIBGGI_FB_W_STRIDE(ggi_ctx->ggi_visual);
+	char *fb = (char *)LIBGGI_CURWRITE(ggi_ctx->ggi_visual);
+
+	while (n--) {
+		if (*mask++){
+			FB_TYPE *dst = (FB_TYPE*)(fb + FLIP(*y)*stride) + *x;
+			*dst = PACK(rgba);
+		}
+		
+		x++;
+		y++;
+	}
+}
+
+/**********************************************************************/
+/*****                   Read arrays of pixels                    *****/
+/**********************************************************************/
+
+void GGIread_ci32_pixels(const GLcontext *ctx,
+			 GLuint n, const GLint x[], const GLint y[],
+			 GLuint ci[], const GLubyte mask[])
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	int stride = LIBGGI_FB_W_STRIDE(ggi_ctx->ggi_visual);
+	char *fb = (char *)LIBGGI_CURWRITE(ggi_ctx->ggi_visual);
+
+	while (n--) {
+		if (*mask++){
+			FB_TYPE *src = (FB_TYPE*)(fb + FLIP(*y)*stride) + *x;
+			*ci = *src;
+		}
+		ci++;
+		x++;
+		y++;
+	}
+}
+
+void GGIread_rgba_pixels(const GLcontext *ctx,
+			 GLuint n, const GLint x[], const GLint y[],
+			 GLubyte rgba[][4], const GLubyte mask[])
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	int stride = LIBGGI_FB_W_STRIDE(ggi_ctx->ggi_visual);
+	char *fb = (char *)LIBGGI_CURWRITE(ggi_ctx->ggi_visual);
+	FB_TYPE color;
+
+	while (n--) {
+		if (*mask++) {	
+			FB_TYPE *src = (FB_TYPE*)(fb + FLIP(*y)*stride) + *x;
+			color = *src;
+
+			rgba[0][RCOMP] = (GLubyte)(color>>(G+B))<<RS;  
+			rgba[0][GCOMP] = (GLubyte)((color>>B)& ((1<<G)-1))<<GS;
+			rgba[0][BCOMP] = (GLubyte) (color & ((1<<B)-1))<<BS;  
+			rgba[0][ACOMP] = 0;
+		}	
+		x++;
+		y++;
+		rgba++;
+	}
+}
+
+void GGIset_buffer(GLcontext *ctx, GLframebuffer *buffer, GLenum mode)
+{
+}
+
+int GGIsetup_driver(ggi_mesa_context_t ggi_ctx)
+{
+	struct swrast_device_driver *swdd =
+		_swrast_GetDeviceDriverReference(ggi_ctx->gl_ctx);
+
+	GGIMESADPRINT_LIBS("linear_%d: GGIsetup_driver\n", sizeof(FB_TYPE)*8);
+	
+	swdd->WriteRGBASpan	= GGIwrite_rgba_span;
+	swdd->WriteRGBSpan	= GGIwrite_rgb_span;
+	swdd->WriteMonoRGBASpan	= GGIwrite_mono_rgba_span;
+	swdd->WriteRGBAPixels	= GGIwrite_rgba_pixels;
+	swdd->WriteMonoRGBAPixels = GGIwrite_mono_rgba_pixels;
+
+	swdd->WriteCI32Span       = GGIwrite_ci32_span;
+	swdd->WriteCI8Span       = GGIwrite_ci8_span;
+	swdd->WriteMonoCISpan   = GGIwrite_mono_ci_span;
+	swdd->WriteCI32Pixels     = GGIwrite_ci32_pixels;
+	swdd->WriteMonoCIPixels = GGIwrite_mono_ci_pixels;
+
+	swdd->ReadCI32Span = GGIread_ci32_span;
+	swdd->ReadRGBASpan = GGIread_rgba_span;
+	swdd->ReadCI32Pixels = GGIread_ci32_pixels;
+	swdd->ReadRGBAPixels = GGIread_rgba_pixels;
+
+	swdd->SetBuffer = GGIset_buffer;	
+
+	return 0;
+}
+
+static int GGIopen(ggi_visual_t vis,struct ggi_dlhandle *dlh,
+		   const char *args,void *argptr, uint32 *dlret)
+{
+	GGIMESADPRINT_CORE("linear_%d: GGIOpen\n", sizeof(FB_TYPE)*8);
+	LIBGGI_MESAEXT(vis)->setup_driver = GGIsetup_driver;
+
+	*dlret = GGI_DL_OPDRAW;
+	return 0;
+}
+
+int DLOPENFUNC(int func, void **funcptr)
+{
+	switch (func) {
+	case GGIFUNC_open:
+		*funcptr = GGIopen;
+		return 0;
+	case GGIFUNC_exit:
+	case GGIFUNC_close:
+		*funcptr = NULL;
+		return 0;
+	default:
+		*funcptr = NULL;
+	}
+	return GGI_ENOTFOUND;
+}
+
diff --git a/reactos/lib/mesa32/src/drivers/ggi/default/linear_15.c b/reactos/lib/mesa32/src/drivers/ggi/default/linear_15.c
new file mode 100644
index 00000000000..ead7cc58475
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/ggi/default/linear_15.c
@@ -0,0 +1,36 @@
+/* GGI-Driver for MESA
+ * 
+ * Copyright (C) 1997  Uwe Maurer
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * ---------------------------------------------------------------------
+ * This code was derived from the following source of information:
+ *
+ * svgamesa.c and ddsample.c by Brian Paul
+ * 
+ */
+
+#include <ggi/mesa/ggimesa.h>
+
+#define R 5
+#define G 5
+#define B 5
+
+#define FB_TYPE uint16
+#define FB_BITS 15
+#define DLOPENFUNC MesaGGIdl_linear_15
+
+#include "linear.c"
+
diff --git a/reactos/lib/mesa32/src/drivers/ggi/default/linear_16.c b/reactos/lib/mesa32/src/drivers/ggi/default/linear_16.c
new file mode 100644
index 00000000000..6028699bbc9
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/ggi/default/linear_16.c
@@ -0,0 +1,36 @@
+/* GGI-Driver for MESA
+ * 
+ * Copyright (C) 1997  Uwe Maurer
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * ---------------------------------------------------------------------
+ * This code was derived from the following source of information:
+ *
+ * svgamesa.c and ddsample.c by Brian Paul
+ * 
+ */
+
+#include <ggi/mesa/ggimesa.h>
+
+#define R 5
+#define G 6
+#define B 5
+
+#define FB_TYPE uint16
+#define FB_BITS 16
+#define DLOPENFUNC MesaGGIdl_linear_16
+
+#include "linear.c"
+
diff --git a/reactos/lib/mesa32/src/drivers/ggi/default/linear_24.c b/reactos/lib/mesa32/src/drivers/ggi/default/linear_24.c
new file mode 100644
index 00000000000..7a2236f1241
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/ggi/default/linear_24.c
@@ -0,0 +1,36 @@
+/* GGI-Driver for MESA
+ * 
+ * Copyright (C) 1997  Uwe Maurer
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * ---------------------------------------------------------------------
+ * This code was derived from the following source of information:
+ *
+ * svgamesa.c and ddsample.c by Brian Paul
+ * 
+ */
+
+#include <ggi/mesa/ggimesa.h>
+
+#define R 8
+#define G 8
+#define B 8
+
+#define FB_TYPE uint32
+#define FB_BITS 24
+#define DLOPENFUNC MesaGGIdl_linear_24
+
+#include "linear.c"
+
diff --git a/reactos/lib/mesa32/src/drivers/ggi/default/linear_32.c b/reactos/lib/mesa32/src/drivers/ggi/default/linear_32.c
new file mode 100644
index 00000000000..7cbf945f359
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/ggi/default/linear_32.c
@@ -0,0 +1,36 @@
+/* GGI-Driver for MESA
+ * 
+ * Copyright (C) 1997  Uwe Maurer
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * ---------------------------------------------------------------------
+ * This code was derived from the following source of information:
+ *
+ * svgamesa.c and ddsample.c by Brian Paul
+ * 
+ */
+
+#include <ggi/mesa/ggimesa.h>
+
+#define R 8
+#define G 8
+#define B 8
+
+#define FB_TYPE uint32
+#define FB_BITS 32
+#define DLOPENFUNC MesaGGIdl_linear_32
+
+#include "linear.c"
+
diff --git a/reactos/lib/mesa32/src/drivers/ggi/default/linear_8.c b/reactos/lib/mesa32/src/drivers/ggi/default/linear_8.c
new file mode 100644
index 00000000000..9c7b5d712f0
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/ggi/default/linear_8.c
@@ -0,0 +1,36 @@
+/* GGI-Driver for MESA
+ * 
+ * Copyright (C) 1997  Uwe Maurer
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * ---------------------------------------------------------------------
+ * This code was derived from the following source of information:
+ *
+ * svgamesa.c and ddsample.c by Brian Paul
+ * 
+ */
+
+#include <ggi/mesa/ggimesa.h>
+
+#define R 3
+#define G 3
+#define B 2
+
+#define FB_TYPE uint8
+#define FB_BITS 8
+#define DLOPENFUNC MesaGGIdl_linear_8
+
+#include "linear.c"
+
diff --git a/reactos/lib/mesa32/src/drivers/ggi/default/stubs.c b/reactos/lib/mesa32/src/drivers/ggi/default/stubs.c
new file mode 100644
index 00000000000..7b442b6d20b
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/ggi/default/stubs.c
@@ -0,0 +1,512 @@
+/* GGI-Driver for MESA
+ * 
+ * Copyright (C) 1997  Uwe Maurer
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * ---------------------------------------------------------------------
+ * This code was derived from the following source of information:
+ *
+ * svgamesa.c and ddsample.c by Brian Paul
+ * 
+ */
+
+#include <stdio.h>
+
+#include <ggi/internal/ggi-dl.h>
+#include <ggi/mesa/ggimesa_int.h>
+#include <ggi/mesa/debug.h>
+
+#include "swrast/swrast.h"
+//#include "swrast_setup/swrast_setup.h"
+//#include "swrast/s_context.h"
+//#include "swrast/s_depth.h"
+//#include "swrast/s_triangle.h"
+
+#define FLIP(coord) (LIBGGI_MODE(ggi_ctx->ggi_visual)->visible.y-(coord)-1)
+
+/**********************************************************************/
+/*****            Write spans of pixels                           *****/
+/**********************************************************************/
+
+void GGIwrite_ci32_span(const GLcontext *ctx,
+                         GLuint n, GLint x, GLint y,
+                         const GLuint ci[],
+                         const GLubyte mask[] )
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	y = FLIP(y);
+	if (mask)
+	{
+		while (n--) {
+			if (*mask++)
+				ggiPutPixel(ggi_ctx->ggi_visual, x, y, *ci);
+			x++;
+			ci++;
+		}
+	}
+	else
+	{
+		while (n--)
+			ggiPutPixel(ggi_ctx->ggi_visual, x++, y, *ci++);
+	}
+}
+
+void GGIwrite_ci8_span(const GLcontext *ctx,
+                         GLuint n, GLint x, GLint y,
+                         const GLubyte ci[],
+                         const GLubyte mask[] )
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	y = FLIP(y);
+	if (mask)
+	{
+		while (n--) {
+			if (*mask++)
+				ggiPutPixel(ggi_ctx->ggi_visual, x, y, *ci);
+			x++;
+			ci++;
+		}
+	}
+	else
+	{
+		while (n--)
+			ggiPutPixel(ggi_ctx->ggi_visual, x++, y, *ci++);
+	}
+}
+
+void GGIwrite_mono_ci_span(const GLcontext *ctx, GLuint n, GLint x, GLint y,
+			   const GLuint ci, const GLubyte mask[])
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	y = FLIP(y);
+	if (mask)
+	{
+		while (n--) {
+			if (*mask++)
+				ggiPutPixel(ggi_ctx->ggi_visual, x, y, ci);
+			x++;
+		}
+	}
+	else
+	{
+		while (n--)
+			ggiPutPixel(ggi_ctx->ggi_visual, x++, y, ci);
+	}
+}
+
+void GGIwrite_mono_rgba_span(const GLcontext *ctx, GLuint n, GLint x, GLint y,
+			     const GLchan rgba[4], const GLubyte mask[])
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	ggi_color rgb;
+	ggi_pixel col;	
+
+	y = FLIP(y);
+
+	rgb.r = (uint16)(rgba[RCOMP]) << SHIFT;
+	rgb.g = (uint16)(rgba[GCOMP]) << SHIFT;
+	rgb.b = (uint16)(rgba[BCOMP]) << SHIFT;
+	col = ggiMapColor(ggi_ctx->ggi_visual, &rgb);
+
+	if (mask)
+	{
+		while (n--) {
+			if (*mask++)
+				ggiPutPixel(ggi_ctx->ggi_visual, x, y, col);
+			x++;
+		}
+	}
+	else
+	{
+		ggiDrawHLine(ggi_ctx->ggi_visual, x, y, n);
+	}
+}
+
+void GGIwrite_rgba_span( const GLcontext *ctx,
+                          GLuint n, GLint x, GLint y,
+                          const GLubyte rgba[][4],
+                          const GLubyte mask[])
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	ggi_color rgb;
+	ggi_pixel col;	
+	y = FLIP(y);
+
+	if (mask)
+	{
+		while (n--) {
+			if (*mask++) 
+			{
+				rgb.r = (uint16)(rgba[0][RCOMP]) << SHIFT;
+				rgb.g = (uint16)(rgba[0][GCOMP]) << SHIFT;
+				rgb.b = (uint16)(rgba[0][BCOMP]) << SHIFT;
+				col = ggiMapColor(ggi_ctx->ggi_visual, &rgb);
+				ggiPutPixel(ggi_ctx->ggi_visual, x, y, col);
+			}
+			x++;
+			rgba++;
+		}
+	}
+	else
+	{
+		while (n--)
+		{
+			rgb.r = (uint16)(rgba[0][RCOMP]) << SHIFT;
+			rgb.g = (uint16)(rgba[0][GCOMP]) << SHIFT;
+			rgb.b = (uint16)(rgba[0][BCOMP]) << SHIFT;
+			col = ggiMapColor(ggi_ctx->ggi_visual, &rgb);
+			ggiPutPixel(ggi_ctx->ggi_visual, x++, y, col);
+			rgba++;
+		}
+	}
+}
+
+void GGIwrite_rgb_span( const GLcontext *ctx,
+                          GLuint n, GLint x, GLint y,
+                          const GLubyte rgba[][3],
+                          const GLubyte mask[] )
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	ggi_color rgb;
+	ggi_pixel col;	
+	y = FLIP(y);
+
+	if (mask)
+	{
+		while (n--) {
+			if (*mask++) 
+			{
+				rgb.r = (uint16)(rgba[0][RCOMP]) << SHIFT;
+				rgb.g = (uint16)(rgba[0][GCOMP]) << SHIFT;
+				rgb.b = (uint16)(rgba[0][BCOMP]) << SHIFT;
+				col = ggiMapColor(ggi_ctx->ggi_visual, &rgb);
+				ggiPutPixel(ggi_ctx->ggi_visual, x, y, col);
+			}
+			x++;
+			rgba++;
+		}
+	}
+	else
+	{
+		while (n--)
+		{
+			rgb.r = (uint16)(rgba[0][RCOMP]) << SHIFT;
+			rgb.g = (uint16)(rgba[0][GCOMP]) << SHIFT;
+			rgb.b = (uint16)(rgba[0][BCOMP]) << SHIFT;
+			col = ggiMapColor(ggi_ctx->ggi_visual, &rgb);
+			ggiPutPixel(ggi_ctx->ggi_visual, x++, y, col);
+			rgba++;
+		}
+	}
+}
+
+
+
+/**********************************************************************/
+/*****                 Read spans of pixels                       *****/
+/**********************************************************************/
+
+
+void GGIread_ci32_span( const GLcontext *ctx,
+                         GLuint n, GLint x, GLint y, GLuint ci[])
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	y = FLIP(y);
+	while (n--)
+		ggiGetPixel(ggi_ctx->ggi_visual, x++, y, ci++);
+}
+
+void GGIread_rgba_span( const GLcontext *ctx,
+                         GLuint n, GLint x, GLint y,
+                         GLubyte rgba[][4])
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	ggi_color rgb;
+	ggi_pixel col;
+
+	y = FLIP(y);
+
+	while (n--)
+	{
+		ggiGetPixel(ggi_ctx->ggi_visual, x++, y, &col);
+		ggiUnmapPixel(ggi_ctx->ggi_visual, col, &rgb);
+		rgba[0][RCOMP] = (GLubyte) (rgb.r >> SHIFT);
+		rgba[0][GCOMP] = (GLubyte) (rgb.g >> SHIFT);
+		rgba[0][BCOMP] = (GLubyte) (rgb.b >> SHIFT);
+		rgba[0][ACOMP] = 0;
+		rgba++;
+	}
+}
+
+/**********************************************************************/
+/*****                  Write arrays of pixels                    *****/
+/**********************************************************************/
+
+void GGIwrite_ci32_pixels( const GLcontext *ctx,
+                            GLuint n, const GLint x[], const GLint y[],
+                            const GLuint ci[], const GLubyte mask[] )
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	while (n--) {
+		if (*mask++)
+			ggiPutPixel(ggi_ctx->ggi_visual, *x, FLIP(*y), *ci);
+		ci++;
+		x++;
+		y++;
+	}
+}
+
+void GGIwrite_mono_ci_pixels(const GLcontext *ctx,
+			     GLuint n, const GLint x[], const GLint y[],
+			     GLuint ci, const GLubyte mask[])
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	while (n--) {
+		if (*mask++)
+			ggiPutPixel(ggi_ctx->ggi_visual, *x, FLIP(*y), ci);
+		x++;
+		y++;
+	}
+}
+
+void GGIwrite_rgba_pixels( const GLcontext *ctx,
+                            GLuint n, const GLint x[], const GLint y[],
+                            const GLubyte rgba[][4],
+                            const GLubyte mask[] )
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	ggi_pixel col;
+	ggi_color rgb;
+	while (n--) {
+		if (*mask++) {
+			rgb.r = (uint16)(rgba[0][RCOMP]) << SHIFT;
+			rgb.g = (uint16)(rgba[0][GCOMP]) << SHIFT;
+			rgb.b = (uint16)(rgba[0][BCOMP]) << SHIFT;
+			col = ggiMapColor(ggi_ctx->ggi_visual, &rgb);
+			ggiPutPixel(ggi_ctx->ggi_visual, *x, FLIP(*y), col);
+		}
+		x++;
+		y++;
+		rgba++;
+	}
+}
+
+void GGIwrite_mono_rgba_pixels(const GLcontext *ctx,
+			       GLuint n, const GLint x[], const GLint y[],
+			       const GLchan rgba[4], const GLubyte mask[])
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	ggi_color rgb;
+	ggi_pixel col;	
+
+	rgb.r = (uint16)(rgba[RCOMP]) << SHIFT;
+	rgb.g = (uint16)(rgba[GCOMP]) << SHIFT;
+	rgb.b = (uint16)(rgba[BCOMP]) << SHIFT;
+	col = ggiMapColor(ggi_ctx->ggi_visual, &rgb);
+	
+	while (n--) {
+		if (*mask++)
+			ggiPutPixel(ggi_ctx->ggi_visual, *x, FLIP(*y), col);
+		x++;
+		y++;
+	}
+}
+
+/**********************************************************************/
+/*****                   Read arrays of pixels                    *****/
+/**********************************************************************/
+
+void GGIread_ci32_pixels( const GLcontext *ctx,
+                           GLuint n, const GLint x[], const GLint y[],
+                           GLuint ci[], const GLubyte mask[])
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	while (n--) {
+		if (*mask++) 
+			ggiGetPixel(ggi_ctx->ggi_visual, *x, FLIP(*y), ci);
+		ci++;
+		x++;
+		y++;
+	}
+}
+
+void GGIread_rgba_pixels( const GLcontext *ctx,
+                           GLuint n, const GLint x[], const GLint y[],
+                           GLubyte rgba[][4],
+                           const GLubyte mask[] )
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	ggi_color rgb;
+	ggi_pixel col;
+
+	while (n--)
+	{
+		if (*mask++)
+		{
+			ggiGetPixel(ggi_ctx->ggi_visual, *x, FLIP(*y), &col);
+			ggiUnmapPixel(ggi_ctx->ggi_visual, col, &rgb);
+			rgba[0][RCOMP] = rgb.r >> SHIFT; 
+			rgba[0][GCOMP] = rgb.g >> SHIFT;
+			rgba[0][BCOMP] = rgb.b >> SHIFT;
+			rgba[0][ACOMP] = 0;
+		}	
+		x++;
+		y++;
+		rgba++;
+	}
+}
+
+int GGIextend_visual(ggi_visual_t vis)
+{
+	return 0;
+}
+
+//static swrast_tri_func ggimesa_stubs_get_triangle_func(GLcontext *ctx);
+
+int GGIsetup_driver(ggi_mesa_context_t ggi_ctx)
+{
+	struct swrast_device_driver *swdd =
+		_swrast_GetDeviceDriverReference(ggi_ctx->gl_ctx);
+
+	GGIMESADPRINT_CORE("stubs: setup_driver\n");
+	
+	swdd->WriteRGBASpan	= GGIwrite_rgba_span;
+	swdd->WriteRGBSpan	= GGIwrite_rgb_span;
+	swdd->WriteMonoRGBASpan = GGIwrite_mono_rgba_span;
+	swdd->WriteRGBAPixels   = GGIwrite_rgba_pixels;
+	swdd->WriteMonoRGBAPixels = GGIwrite_mono_rgba_pixels;
+
+	swdd->WriteCI32Span     = GGIwrite_ci32_span;
+	swdd->WriteCI8Span      = GGIwrite_ci8_span;
+	swdd->WriteMonoCISpan	= GGIwrite_mono_ci_span;
+	swdd->WriteCI32Pixels   = GGIwrite_ci32_pixels;
+	swdd->WriteMonoCIPixels = GGIwrite_mono_ci_pixels;
+
+	swdd->ReadCI32Span 	= GGIread_ci32_span;
+	swdd->ReadRGBASpan	= GGIread_rgba_span;
+	swdd->ReadCI32Pixels	= GGIread_ci32_pixels;
+	swdd->ReadRGBAPixels	= GGIread_rgba_pixels;
+	
+	return 0;
+}
+
+void GGIupdate_state(ggi_mesa_context_t *ctx)
+{
+	//ctx->Driver.TriangleFunc = _swsetup_Triangle;
+}
+
+/*
+void GGItriangle_flat(GLcontext *ctx, const SWvertex *v0, const SWvertex *v1, const SWvertex *v2)
+{
+//#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE	  
+	
+#define SETUP_CODE	       	\
+	ggi_color color;	\
+	color.r = v0->color[0];	\
+	color.g = v0->color[1];	\
+	color.b = v0->color[2];	\
+	color.a = v0->color[3];	\
+	ggiSetGCForeground(VIS, ggiMapColor(VIS, &color));
+
+#define INNER_LOOP(LEFT,RIGHT,Y)				\
+		ggiDrawHLine(VIS,LEFT,FLIP(Y),RIGHT-LEFT);	
+		
+#include "swrast/s_tritemp.h"
+}
+
+
+static void GGItriangle_flat_depth(GLcontext *ctx, const SWvertex *v0, const SWvertex *v1, const SWvertex *v2)
+{
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+
+#define SETUP_CODE	       	\
+	ggi_color color;	\
+	color.r = v0->color[0];	\
+	color.g = v0->color[1];	\
+	color.b = v0->color[2];	\
+	color.a = v0->color[3];	\
+	ggiSetGCForeground(VIS, ggiMapColor(VIS, &color));
+	
+#define INNER_LOOP(LEFT,RIGHT,Y)					\
+	{								\
+	GLint i,xx=LEFT,yy=FLIP(Y),n=RIGHT-LEFT,length=0;		\
+	GLint startx=xx;						\
+	for (i=0;i<n;i++){						\
+		GLdepth z=FixedToDepth(ffz);				\
+		if (z<zRow[i])						\
+		{							\
+			zRow[i]=z;					\
+			length++;					\
+		}							\
+		else							\
+		{							\
+			if (length)					\
+			{ 						\
+				ggiDrawHLine(VIS,startx,yy,length);	\
+				length=0;				\
+			}						\
+			startx=xx+i+1;					\
+		}							\
+		ffz+=fdzdx;						\
+	}								\
+	if (length) ggiDrawHLine(VIS,startx,yy,length);			\
+	}
+
+#include "swrast/s_tritemp.h"
+}
+
+
+static swrast_tri_func ggimesa_stubs_get_triangle_func(GLcontext *ctx)
+{
+	if (ctx->Stencil.Enabled) return NULL;
+	if (ctx->Polygon.SmoothFlag) return NULL;
+	if (ctx->Polygon.StippleFlag) return NULL;
+	if (ctx->Texture._ReallyEnabled) return NULL;  
+	if (ctx->Light.ShadeModel==GL_SMOOTH) return NULL;
+	if (ctx->Depth.Test && ctx->Depth.Func != GL_LESS) return NULL;
+
+	if (ctx->Depth.Test) 
+	  return GGItriangle_flat_depth;
+
+	return GGItriangle_flat;	
+}
+*/
+static int GGIopen(ggi_visual_t vis, struct ggi_dlhandle *dlh,
+			const char *args, void *argptr, uint32 *dlret)
+{
+       	LIBGGI_MESAEXT(vis)->update_state = GGIupdate_state;
+	LIBGGI_MESAEXT(vis)->setup_driver = GGIsetup_driver;
+
+	*dlret = GGI_DL_OPDRAW;
+	return 0;
+}
+
+int MesaGGIdl_stubs(int func, void **funcptr)
+{
+	switch (func) {
+	case GGIFUNC_open:
+		*funcptr = GGIopen;
+		return 0;
+	case GGIFUNC_exit:
+	case GGIFUNC_close:
+		*funcptr = NULL;
+		return 0;
+	default:
+		*funcptr = NULL;
+	}
+	return GGI_ENOTFOUND;
+}
diff --git a/reactos/lib/mesa32/src/drivers/ggi/display/fbdev.conf.in b/reactos/lib/mesa32/src/drivers/ggi/display/fbdev.conf.in
new file mode 100644
index 00000000000..2acb89426f6
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/ggi/display/fbdev.conf.in
@@ -0,0 +1,4 @@
+# GGIMesa fbdev target configuration
+.root: @ggi_libdir@/ggi/mesa/default
+
+tgt-fbdev-kgicon-generic-mesa	genkgi.so
diff --git a/reactos/lib/mesa32/src/drivers/ggi/display/fbdev_mode.c b/reactos/lib/mesa32/src/drivers/ggi/display/fbdev_mode.c
new file mode 100644
index 00000000000..6fb952d55c6
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/ggi/display/fbdev_mode.c
@@ -0,0 +1,134 @@
+/******************************************************************************
+
+   display-fbdev-mesa
+
+   Copyright (C) 1999 Jon Taylor [taylorj@ggi-project.org]
+
+   Permission is hereby granted, free of charge, to any person obtaining a
+   copy of this software and associated documentation files (the "Software"),
+   to deal in the Software without restriction, including without limitation
+   the rights to use, copy, modify, merge, publish, distribute, sublicense,
+   and/or sell copies of the Software, and to permit persons to whom the
+   Software is furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+   THE AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+   IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+******************************************************************************
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+
+#include <linux/fb.h>
+
+#include <ggi/internal/ggi-dl.h>
+#include <ggi/mesa/ggimesa_int.h>
+#include <ggi/mesa/display_fbdev.h>
+#include <ggi/mesa/debug.h>
+
+#ifndef MAP_FAILED
+#define MAP_FAILED ((void*)-1)
+#endif
+
+#define FB_KLUDGE_FONTX  8
+#define FB_KLUDGE_FONTY  16
+#define FB_KLUDGE_TEXTMODE  13
+#define TIMINGFILE "/etc/fb.modes"
+
+int GGIMesa_fbdev_getapi(ggi_visual *vis, int num, char *apiname, char *arguments)
+{
+	struct fbdev_priv_mesa *priv = GGIMESA_PRIVATE(vis);
+	
+	strcpy(arguments, "");
+
+	switch(num) 
+	{
+		case 0:
+		if (priv->oldpriv->have_accel) 
+		{
+			strcpy(apiname, priv->oldpriv->accel);
+			return 0;
+		}
+		break;
+	}
+
+	return -1;
+}
+
+static int do_setmode(ggi_visual *vis)
+{
+	struct fbdev_priv_mesa *priv = GGIMESA_PRIVATE(vis);
+	int err, id;
+	char libname[256], libargs[256];
+	ggi_graphtype gt;
+
+	_ggiZapMode(vis, ~GGI_DL_OPDISPLAY);
+	priv->have_accel = 0;
+	for (id = 1; GGIMesa_fbdev_getapi(vis, id, libname, libargs) == 0; id++) 
+	{
+		if (_ggiOpenDL(vis, libname, libargs, NULL) == 0) 
+		{
+			fprintf(stderr, "display-fbdev-mesa: Error opening the "
+				"%s (%s) library.\n", libname, libargs);
+			return GGI_EFATAL;
+		}
+
+		GGIMESADPRINT_CORE("Success in loading %s (%s)\n", libname, libargs);
+	}
+
+	if (priv->oldpriv->accel &&
+	    _ggiOpenDL(vis, priv->accel, NULL, NULL) != 0) {
+		priv->have_accel = 1;
+	} 
+	else 
+	{
+		priv->have_accel = 0;
+	}
+	vis->accelactive = 0;
+	
+	ggiIndicateChange(vis, GGI_CHG_APILIST);
+
+	GGIMESADPRINT_CORE("display-fbdev-mesa: do_setmode SUCCESS\n");
+
+	return 0;
+}
+
+
+int GGIMesa_fbdev_setmode(ggi_visual *vis, ggi_mode *mode)
+{ 
+	int err;
+
+        if ((err = ggiCheckMode(vis, mode)) != 0) {
+		return err;
+	}
+
+	GGIMESADPRINT_CORE("display-fbdev-mesa: setmode %dx%d#%dx%dF%d[0x%02x]\n",
+		    mode->visible.x, mode->visible.y,
+		    mode->virt.x, mode->virt.y, 
+		    mode->frames, mode->graphtype);
+
+	memcpy(LIBGGI_MODE(vis), mode, sizeof(ggi_mode));
+
+	/* Now actually set the mode */
+	err = do_setmode(vis);
+	if (err != 0) {
+		return err;
+	}
+
+	GGIMESADPRINT_CORE("display-fbdev-mesa: setmode success.\n");
+
+	return 0;
+}
diff --git a/reactos/lib/mesa32/src/drivers/ggi/display/fbdev_visual.c b/reactos/lib/mesa32/src/drivers/ggi/display/fbdev_visual.c
new file mode 100644
index 00000000000..0176614ffba
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/ggi/display/fbdev_visual.c
@@ -0,0 +1,150 @@
+/******************************************************************************
+
+   display-fbdev-mesa: visual handling
+
+   Copyright (C) 1999 Jon Taylor [taylorj@ggi-project.org]
+
+   Permission is hereby granted, free of charge, to any person obtaining a
+   copy of this software and associated documentation files (the "Software"),
+   to deal in the Software without restriction, including without limitation
+   the rights to use, copy, modify, merge, publish, distribute, sublicense,
+   and/or sell copies of the Software, and to permit persons to whom the
+   Software is furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+   THE AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+   IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+******************************************************************************
+*/
+
+#include <ggi/internal/ggi-dl.h>
+#include <ggi/mesa/ggimesa_int.h>
+#include <ggi/mesa/display_fbdev.h>
+#include <ggi/mesa/debug.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#define GGI_SYMNAME_PREFIX  "MesaGGIdl_"
+
+#ifdef HAVE_SYS_VT_H
+#include <sys/vt.h>
+#else
+#include <linux/vt.h>
+#endif
+#ifdef HAVE_LINUX_KDEV_T_H
+#include <linux/kdev_t.h>
+#endif
+#include <linux/tty.h>
+
+#define MAX_DEV_LEN	63
+#define DEFAULT_FBNUM	0
+
+static char accel_prefix[] = "tgt-fbdev-";
+#define PREFIX_LEN	(sizeof(accel_prefix))
+
+typedef struct {
+	int   async;
+	char *str;
+} accel_info;
+
+static accel_info accel_strings[] = {
+	{ 0, "kgicon-generic",},	/* no accel - check for KGIcon	*/
+	{ 0, NULL },			/* Atari Blitter		*/
+};
+
+#define NUM_ACCELS	(sizeof(accel_strings)/sizeof(accel_info))
+
+/* FIXME: These should really be defined in the make system */
+#define CONF_FILE "/usr/local/etc/ggi/mesa/targets/fbdev.conf"
+void *_configHandle;
+char confstub[512] = CONF_FILE;
+char *conffile = confstub;
+
+static int changed(ggi_visual_t vis, int whatchanged)
+{
+	switch (whatchanged)
+	{
+		case GGI_CHG_APILIST:
+		{
+			char api[256];
+			char args[256];
+			int i;
+			const char *fname;
+			ggi_dlhandle *lib;
+			
+			for (i = 0; ggiGetAPI(vis, i, api, args) == 0; i++)
+			{
+				strcat(api, "-mesa");
+				fname = ggMatchConfig(_configHandle, api, NULL);
+				if (fname == NULL)
+				{
+					/* No special implementation for this sublib */
+					continue;
+				}
+				
+				lib = ggiExtensionLoadDL(vis, fname, args, NULL, GGI_SYMNAME_PREFIX);
+			}
+		}
+		break;
+	}
+	return 0;
+}
+
+int GGIdlinit(ggi_visual *vis, const char *args, void *argptr)
+{
+	struct fbdev_priv_mesa *priv;
+	int err;
+	ggifunc_getapi *oldgetapi;
+
+	GGIMESA_PRIVATE(vis) = priv = malloc(sizeof(struct fbdev_priv_mesa));
+	if (priv == NULL) {
+		fprintf(stderr, "Failed to allocate fbdev private data\n");
+		return GGI_DL_ERROR;
+	}
+	
+	priv->oldpriv = LIBGGI_PRIVATE(vis);  /* Hook back */
+	
+	err = ggLoadConfig(conffile, &_configHandle);
+	if (err != GGI_OK)
+	{
+		GGIMESADPRINT_CORE("display-fbdev: Couldn't open %s\n", conffile);
+		return err;
+	}
+	
+	LIBGGI_MESAEXT(vis)->update_state = NULL;
+	LIBGGI_MESAEXT(vis)->setup_driver = NULL;
+	
+	oldgetapi = vis->opdisplay->getapi;
+	vis->opdisplay->getapi = GGIMesa_fbdev_getapi;
+	changed(vis, GGI_CHG_APILIST);	
+	/* If the accel sublibs didn't sucessfuly hook a driver,
+	 * back up and keep looking */
+	if ((LIBGGI_MESAEXT(vis)->update_state == NULL) ||
+	    (LIBGGI_MESAEXT(vis)->setup_driver == NULL))
+	{
+		vis->opdisplay->getapi = oldgetapi;
+	}
+
+	return 0;
+}
+
+int GGIdlcleanup(ggi_visual *vis)
+{
+	return 0;
+}
+
+#include <ggi/internal/ggidlinit.h>
diff --git a/reactos/lib/mesa32/src/drivers/ggi/include/ggi/mesa/debug.h b/reactos/lib/mesa32/src/drivers/ggi/include/ggi/mesa/debug.h
new file mode 100644
index 00000000000..e7d3d2e1deb
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/ggi/include/ggi/mesa/debug.h
@@ -0,0 +1,260 @@
+/* $Id: debug.h,v 1.1 2004/07/16 22:12:31 blight Exp $
+******************************************************************************
+
+   GGIMesa debugging macros
+
+   Copyright (C) 1998-1999 Marcus Sundberg	[marcus@ggi-project.org]
+   Copyright (C) 1999-2000 Jon Taylor		[taylorj@ggi-project.org]
+  
+   Permission is hereby granted, free of charge, to any person obtaining a
+   copy of this software and associated documentation files (the "Software"),
+   to deal in the Software without restriction, including without limitation
+   the rights to use, copy, modify, merge, publish, distribute, sublicense,
+   and/or sell copies of the Software, and to permit persons to whom the
+   Software is furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+   THE AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+   IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+******************************************************************************
+*/
+
+#ifndef _GGI_MESA_INTERNAL_DEBUG_H
+#define _GGI_MESA_INTERNAL_DEBUG_H
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <ggi/types.h>
+#include <ggi/gg.h>
+
+#ifndef DEBUG
+#define DEBUG
+#endif
+
+__BEGIN_DECLS
+
+/* Exported variables */
+#ifdef BUILDING_GGIMESA
+extern uint32     _ggimesaDebugState;
+extern int        _ggimesaDebugSync;
+#else
+IMPORTVAR uint32  _ggimesaDebugState;
+IMPORTVAR int     _ggimesaDebugSync;
+#endif
+
+__END_DECLS
+
+
+/* Debugging types
+ * bit 0 is reserved! */
+
+#define GGIMESADEBUG_CORE		(1<<1)	/*   2 */
+#define GGIMESADEBUG_MODE		(1<<2)	/*   4 */
+#define GGIMESADEBUG_COLOR		(1<<3)	/*   8 */
+#define GGIMESADEBUG_DRAW		(1<<4)	/*  16 */
+#define GGIMESADEBUG_MISC		(1<<5)	/*  32 */
+#define GGIMESADEBUG_LIBS		(1<<6)	/*  64 */
+#define GGIMESADEBUG_EVENTS		(1<<7)	/* 128 */
+
+#define GGIMESADEBUG_ALL	0xffffffff
+
+#ifdef __GNUC__
+
+#ifdef DEBUG
+#define GGIMESADPRINT(args...)		if (_ggimesaDebugState) { ggDPrintf(_ggimesaDebugSync, "GGIMesa",args); }
+#define GGIMESADPRINT_CORE(args...)	if (_ggimesaDebugState & GGIMESADEBUG_CORE) { ggDPrintf(_ggimesaDebugSync,"GGIMesa",args); }
+#define GGIMESADPRINT_MODE(args...)	if (_ggimesaDebugState & GGIMESADEBUG_MODE) { ggDPrintf(_ggimesaDebugSync,"GGIMesa",args); }
+#define GGIMESADPRINT_COLOR(args...)	if (_ggimesaDebugState & GGIMESADEBUG_COLOR) { ggDPrintf(_ggimesaDebugSync,"GGIMesa",args); }
+#define GGIMESADPRINT_DRAW(args...)	if (_ggimesaDebugState & GGIMESADEBUG_DRAW) { ggDPrintf(_ggimesaDebugSync,"GGIMesa",args); }
+#define GGIMESADPRINT_MISC(args...)	if (_ggimesaDebugState & GGIMESADEBUG_MISC) { ggDPrintf(_ggimesaDebugSync,"GGIMesa",args); }
+#define GGIMESADPRINT_LIBS(args...)	if (_ggimesaDebugState & GGIMESADEBUG_LIBS) { ggDPrintf(_ggimesaDebugSync,"GGIMesa",args); }
+#define GGIMESADPRINT_EVENTS(args...)	if (_ggimesaDebugState & GGIMESADEBUG_EVENTS) { ggDPrintf(_ggimesaDebugSync,"GGIMesa",args); }
+#else /* DEBUG */
+#define GGIMESADPRINT(args...)		do{}while(0)
+#define GGIMESADPRINT_CORE(args...)	do{}while(0)
+#define GGIMESADPRINT_MODE(args...)	do{}while(0)
+#define GGIMESADPRINT_COLOR(args...)	do{}while(0)
+#define GGIMESADPRINT_DRAW(args...)	do{}while(0)
+#define GGIMESADPRINT_MISC(args...)	do{}while(0)
+#define GGIMESADPRINT_LIBS(args...)	do{}while(0)
+#define GGIMESADPRINT_EVENTS(args...)	do{}while(0)
+#endif /* DEBUG */
+
+#else /* __GNUC__ */
+
+__BEGIN_DECLS
+
+static inline void GGIMESADPRINT(const char *form,...)
+{
+#ifdef DEBUG
+	if (_ggiDebugState) {
+		va_list args;
+
+		fprintf(stderr, "GGIMesa: ");
+		va_start(args, form);
+		vfprintf(stderr, form, args);
+		va_end(args);
+		if (_ggimesaDebugSync) fflush(stderr);
+	}
+#endif
+}
+
+static inline void GGIMESADPRINT_CORE(const char *form,...)
+{
+#ifdef DEBUG
+	if (_ggiDebugState & GGIDEBUG_CORE) {
+		va_list args;
+
+		fprintf(stderr, "GGIMesa: ");
+		va_start(args, form);
+		vfprintf(stderr, form, args);
+		va_end(args);
+		if (_ggimesaDebugSync) fflush(stderr);
+	}
+#endif
+}
+
+static inline void GGIMESADPRINT_MODE(const char *form,...)
+{
+#ifdef DEBUG
+	if (_ggiDebugState & GGIDEBUG_MODE) {
+		va_list args;
+
+		fprintf(stderr, "GGIMesa: ");
+		va_start(args, form);
+		vfprintf(stderr, form, args);
+		va_end(args);
+		if (_ggimesaDebugSync) fflush(stderr);
+	}
+#endif
+}
+
+static inline void GGIMESADPRINT_COLOR(const char *form,...)
+{
+#ifdef DEBUG
+	if (_ggiDebugState & GGIDEBUG_COLOR) {
+		va_list args;
+
+		fprintf(stderr, "GGIMesa: ");
+		va_start(args, form);
+		vfprintf(stderr, form, args);
+		va_end(args);
+		if (_ggimesaDebugSync) fflush(stderr);
+	}
+#endif
+}
+
+static inline void GGIMESADPRINT_DRAW(const char *form,...)
+{
+#ifdef DEBUG
+	if (_ggiDebugState & GGIDEBUG_DRAW) {
+		va_list args;
+
+		fprintf(stderr, "GGIMesa: ");
+		va_start(args, form);
+		vfprintf(stderr, form, args);
+		va_end(args);
+		if (_ggimesaDebugSync) fflush(stderr);
+	}
+#endif
+}
+
+static inline void GGIMESADPRINT_MISC(const char *form,...)
+{
+#ifdef DEBUG
+	if (_ggiDebugState & GGIDEBUG_MISC) {
+		va_list args;
+
+		fprintf(stderr, "GGIMesa: ");
+		va_start(args, form);
+		vfprintf(stderr, form, args);
+		va_end(args);
+		if (_ggimesaDebugSync) fflush(stderr);
+	}
+#endif
+}
+
+static inline void GGIMESADPRINT_LIBS(const char *form,...)
+{
+#ifdef DEBUG
+	if (_ggiDebugState & GGIDEBUG_LIBS) {
+		va_list args;
+
+		fprintf(stderr, "GGIMesa: ");
+		va_start(args, form);
+		vfprintf(stderr, form, args);
+		va_end(args);
+		if (_ggimesaDebugSync) fflush(stderr);
+	}
+#endif
+}
+
+static inline void GGIMESADPRINT_EVENTS(const char *form,...)
+{
+#ifdef DEBUG
+	if (_ggiDebugState & GGIDEBUG_EVENTS) {
+		va_list args;
+
+		fprintf(stderr, "GGIMesa: ");
+		va_start(args, form);
+		vfprintf(stderr, form, args);
+		va_end(args);
+		if (_ggimesaDebugSync) fflush(stderr);
+	}
+#endif
+}
+
+__END_DECLS
+
+#endif /* __GNUC__ */
+
+#ifdef DEBUG
+#define GGIMESA_ASSERT(x,str) \
+{ if (!(x)) { \
+	fprintf(stderr,"GGIMESA:%s:%d: INTERNAL ERROR: %s\n",__FILE__,__LINE__,str); \
+	exit(1); \
+} }
+#define GGIMESA_APPASSERT(x,str) \
+{ if (!(x)) { \
+	fprintf(stderr,"GGIMESA:%s:%d: APPLICATION ERROR: %s\n",__FILE__,__LINE__,str); \
+	exit(1); \
+} }
+#else /* DEBUG */
+#define GGIMESA_ASSERT(x,str)	do{}while(0)
+#define GGIMESA_APPASSERT(x,str)	do{}while(0)
+#endif /* DEBUG */
+
+#ifdef DEBUG
+# define GGIMESAD0(x)	x
+#else
+# define GGIMESAD0(x)	/* empty */
+#endif
+
+#ifdef GGIMESADLEV
+# if GGIMESADLEV == 1
+#  define GGIMESAD1(x)	x
+#  define GGIMESAD2(x)	/* empty */
+#  define GGIMESAD3(x)	/* empty */
+# elif GGIMESADLEV == 2
+#  define GGIMESAD1(x)	x
+#  define GGIMESAD2(x)	x
+#  define GGIMESAD3(x)	/* empty */
+# elif GGIMESADLEV > 2
+#  define GGIMESAD1(x)	x
+#  define GGIMESAD2(x)	x
+#  define GGIMESAD3(x)	x
+# endif
+#else
+# define GGIMESAD1(x)	/* empty */
+# define GGIMESAD2(x)	/* empty */
+# define GGIMESAD3(x)	/* empty */
+#endif
+
+#endif /* _GGI_MESA_INTERNAL_DEBUG_H */
diff --git a/reactos/lib/mesa32/src/drivers/ggi/include/ggi/mesa/display_fbdev.h b/reactos/lib/mesa32/src/drivers/ggi/include/ggi/mesa/display_fbdev.h
new file mode 100644
index 00000000000..5c3c1e290c9
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/ggi/include/ggi/mesa/display_fbdev.h
@@ -0,0 +1,20 @@
+#ifndef _GGIMESA_DISPLAY_FBDEV_H
+#define _GGIMESA_DISPLAY_FBDEV_H
+
+#include <ggi/internal/ggi-dl.h>
+#include <ggi/display/fbdev.h>
+
+ggifunc_setmode GGIMesa_fbdev_setmode;
+ggifunc_getapi GGIMesa_fbdev_getapi;
+
+#define FBDEV_PRIV_MESA(vis) ((struct fbdev_priv_mesa *)(FBDEV_PRIV(vis)->accelpriv))
+
+struct fbdev_priv_mesa
+{
+	char *accel;
+	int have_accel;
+	void *accelpriv;
+	ggi_fbdev_priv *oldpriv;	/* Hooks back to the LibGGI fbdev target's private data */
+};
+
+#endif /* _GGIMESA_DISPLAY_FBDEV_H */
diff --git a/reactos/lib/mesa32/src/drivers/ggi/include/ggi/mesa/ggimesa.h b/reactos/lib/mesa32/src/drivers/ggi/include/ggi/mesa/ggimesa.h
new file mode 100644
index 00000000000..22e863117be
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/ggi/include/ggi/mesa/ggimesa.h
@@ -0,0 +1,84 @@
+/* GGI-Driver for MESA
+ *
+ * Copyright (C) 1997  Uwe Maurer
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * ---------------------------------------------------------------------
+ * This code was derived from the following source of information:
+ *
+ * svgamesa.c and ddsample.c by Brian Paul
+ *
+ */
+
+#ifndef _GGIMESA_H
+#define _GGIMESA_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include "config.h"
+#include "context.h"
+#include "drawpix.h"
+#include "imports.h"
+#include "matrix.h"
+#include "state.h"
+#include "mtypes.h"
+#include "macros.h"
+#include "depth.h"
+
+#undef ASSERT		/* ASSERT is redefined */
+
+#include <ggi/internal/internal.h>
+#include <ggi/ggi_ext.h>
+#include <ggi/ggi.h>
+#include "GL/ggimesa.h"
+
+/*
+ * GGIMesa visual configuration.
+ * 
+ * This structure "derives" from Mesa's GLvisual and extends it by
+ * GGI's visual. Combination of these two structures is enough to fully
+ * describe the mode the application is currently running in.  GGI
+ * visual provides information about color configuration and buffering
+ * method, GLvisual fills the rest.
+ */
+struct ggi_mesa_visual {
+	GLvisual gl_visual;
+	ggi_visual_t ggi_visual;
+};
+
+/*
+ * GGIMesa context.
+ *
+ * GGIMesa context expands the Mesa's context (it doesn't actualy derive
+ * from it, but this ability isn't needed, and it is best if GL context
+ * creation is left up to Mesa). It also contains a reference to the GGI
+ * visual it is attached to, which is very useful for all Mesa callbacks.
+ */
+struct ggi_mesa_context
+{
+	GLcontext *gl_ctx;
+	ggi_visual_t ggi_visual;
+	
+	ggi_pixel color;		/* Current color or index*/
+	ggi_pixel clearcolor;
+	
+	void *private;
+};
+
+#define SHIFT (GGI_COLOR_PRECISION - 8)
+
+#endif
+
diff --git a/reactos/lib/mesa32/src/drivers/ggi/include/ggi/mesa/ggimesa_int.h b/reactos/lib/mesa32/src/drivers/ggi/include/ggi/mesa/ggimesa_int.h
new file mode 100644
index 00000000000..da8b10f2ff9
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/ggi/include/ggi/mesa/ggimesa_int.h
@@ -0,0 +1,45 @@
+#ifndef _GGI_MESA_INT_H
+#define _GGI_MESA_INT_H
+
+#include <ggi/internal/internal.h>
+#include "ggimesa.h"
+
+#define GGI_SYMNAME_PREFIX  "MesaGGIdl_"
+
+extern ggi_extid ggiMesaID;
+
+ggifunc_setmode GGIMesa_setmode;
+ggifunc_getapi GGIMesa_getapi;
+
+typedef struct ggi_mesa_ext
+{
+	/*
+	 * How mesa extends this visual; i.e., size of the depth buffer etc.
+	 *
+	 * By default (upon attaching) this structure is initialized to what
+	 * libggi is guaranteed to handle without any help: single buffered
+	 * visual without any ancilary buffers.
+	 */
+	struct ggi_mesa_visual mesa_visual;
+
+	/*
+	 * Mesa framebuffer is a collection of all ancilary buffers required.
+	 *
+	 * This structure contains the ancilary buffers provided in in
+	 * software. On each mode change it is loaded with the list of
+	 * required buffers and the target is expected to clear the ones
+	 * it can provide in hw. The remaining ones are then provided in sw.
+	 *
+	 */
+	GLframebuffer mesa_buffer;
+
+	void (*update_state)(ggi_mesa_context_t ctx);
+	int (*setup_driver)(ggi_mesa_context_t ctx);
+	
+	void *private;
+} ggi_mesa_ext_t;
+
+#define LIBGGI_MESAEXT(vis) ((ggi_mesa_ext_t *)LIBGGI_EXT(vis,ggiMesaID))
+#define GGIMESA_PRIVATE(vis) ((LIBGGI_MESAEXT(vis)->private))
+
+#endif /* _GGI_MISC_INT_H */
diff --git a/reactos/lib/mesa32/src/drivers/glide/fxapi.c b/reactos/lib/mesa32/src/drivers/glide/fxapi.c
new file mode 100644
index 00000000000..6ed9453c9b7
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/glide/fxapi.c
@@ -0,0 +1,932 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.0
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/* Authors:
+ *    David Bucciarelli
+ *    Brian Paul
+ *    Daryll Strauss
+ *    Keith Whitwell
+ *    Daniel Borca
+ *    Hiroshi Morii
+ */
+
+
+/* fxapi.c - public interface to FX/Mesa functions (fxmesa.h) */
+
+
+#ifdef HAVE_CONFIG_H
+#include "conf.h"
+#endif
+
+#if defined(FX)
+#include "fxdrv.h"
+
+#ifndef TDFX_DEBUG
+int TDFX_DEBUG = (0 
+/*		  | VERBOSE_VARRAY */
+/*		  | VERBOSE_TEXTURE */
+/*		  | VERBOSE_IMMEDIATE */
+/*		  | VERBOSE_PIPELINE */
+/*		  | VERBOSE_DRIVER */
+/*		  | VERBOSE_STATE */
+/*		  | VERBOSE_API */
+/*		  | VERBOSE_DISPLAY_LIST */
+/*		  | VERBOSE_LIGHTING */
+/*		  | VERBOSE_PRIMS */
+/*		  | VERBOSE_VERTS */
+   );
+#endif
+
+static fxMesaContext fxMesaCurrentCtx = NULL;
+
+/*
+ * Status of 3Dfx hardware initialization
+ */
+
+static int glbGlideInitialized = 0;
+static int glb3DfxPresent = 0;
+static int glbTotNumCtx = 0;
+
+static GrHwConfiguration glbHWConfig;
+static int glbCurrentBoard = 0;
+
+
+#if defined(__WIN32__)
+static int
+cleangraphics(void)
+{
+   glbTotNumCtx = 1;
+   fxMesaDestroyContext(fxMesaCurrentCtx);
+
+   return 0;
+}
+#elif defined(__linux__)
+static void
+cleangraphics(void)
+{
+   glbTotNumCtx = 1;
+   fxMesaDestroyContext(fxMesaCurrentCtx);
+}
+
+static void
+cleangraphics_handler(int s)
+{
+   fprintf(stderr, "fxmesa: ERROR: received a not handled signal %d\n", s);
+
+   cleangraphics();
+/*    abort(); */
+   exit(1);
+}
+#endif
+
+
+/*
+ * Query 3Dfx hardware presence/kind
+ */
+static GLboolean GLAPIENTRY fxQueryHardware (void)
+{
+ if (TDFX_DEBUG & VERBOSE_DRIVER) {
+    fprintf(stderr, "fxQueryHardware()\n");
+ }
+
+ if (!glbGlideInitialized) {
+    grGlideInit();
+    glb3DfxPresent = FX_grSstQueryHardware(&glbHWConfig);
+
+    glbGlideInitialized = 1;
+
+#if defined(__WIN32__)
+    _onexit((_onexit_t) cleangraphics);
+#elif defined(__linux__)
+    /* Only register handler if environment variable is not defined. */
+    if (!getenv("MESA_FX_NO_SIGNALS")) {
+       atexit(cleangraphics);
+    }
+#endif
+ }
+
+ return glb3DfxPresent;
+}
+
+
+/*
+ * Select the Voodoo board to use when creating
+ * a new context.
+ */
+GLint GLAPIENTRY fxMesaSelectCurrentBoard (int n)
+{
+   fxQueryHardware();
+
+   if ((n < 0) || (n >= glbHWConfig.num_sst))
+      return -1;
+
+   return glbHWConfig.SSTs[glbCurrentBoard = n].type;
+}
+
+
+void * GLAPIENTRY fxMesaGetCurrentContext (void)
+{
+ GET_CURRENT_CONTEXT(ctx);
+ return ctx;
+}
+
+
+void GLAPIENTRY fxGetScreenGeometry (GLint *w, GLint *h)
+{
+ GLint width = 0;
+ GLint height = 0;
+ 
+ if (fxMesaCurrentCtx != NULL) {
+    width = fxMesaCurrentCtx->screen_width;
+    height = fxMesaCurrentCtx->screen_height;
+ }
+
+ if (w != NULL) {
+    *w = width;
+ }
+ if (h != NULL) {
+    *h = height;
+ }
+}
+
+
+/*
+ * The 3Dfx Global Palette extension for GLQuake.
+ * More a trick than a real extesion, use the shared global
+ * palette extension. 
+ */
+extern void GLAPIENTRY gl3DfxSetPaletteEXT(GLuint * pal);	/* silence warning */
+void GLAPIENTRY
+gl3DfxSetPaletteEXT(GLuint * pal)
+{
+   fxMesaContext fxMesa = fxMesaCurrentCtx;
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      int i;
+
+      fprintf(stderr, "gl3DfxSetPaletteEXT(...)\n");
+
+      for (i = 0; i < 256; i++) {
+	 fprintf(stderr, "\t%x\n", pal[i]);
+      }
+   }
+
+   if (fxMesa) {
+      fxMesa->haveGlobalPaletteTexture = 1;
+
+      grTexDownloadTable(GR_TEXTABLE_PALETTE, (GuTexPalette *) pal);
+   }
+}
+
+
+static GrScreenResolution_t fxBestResolution (int width, int height)
+{
+ static int resolutions[][5] = {
+#if 1 /* Voodoo^2 can't fullscreen these, because of Glide */
+        { 320,  200, GR_RESOLUTION_320x200  },
+        { 320,  240, GR_RESOLUTION_320x240  },
+#endif
+        { 512,  384, GR_RESOLUTION_512x384  },
+        { 640,  400, GR_RESOLUTION_640x400  },
+        { 640,  480, GR_RESOLUTION_640x480  },
+        { 800,  600, GR_RESOLUTION_800x600  },
+        {1024,  768, GR_RESOLUTION_1024x768 },
+        {1280, 1024, GR_RESOLUTION_1280x1024},
+        {1600, 1200, GR_RESOLUTION_1600x1200},
+ };
+
+ int i, NUM_RESOLUTIONS = sizeof(resolutions) / sizeof(resolutions[0]);
+ int lastvalidres = 4;  /* set default to GR_RESOLUTION_640x480 */
+ int min = 2048 * 2048; /* max is GR_RESOLUTION_2048x2048 */
+
+ for (i = 0; i < NUM_RESOLUTIONS; i++) {
+     if ((width <= resolutions[i][0]) && (height <= resolutions[i][1])) {
+        if (min > (resolutions[i][0] * resolutions[i][1])) {
+           min = resolutions[i][0] * resolutions[i][1];
+           lastvalidres = i;
+        }
+     }
+ }
+
+ return resolutions[lastvalidres][2];
+}
+
+
+fxMesaContext GLAPIENTRY
+fxMesaCreateBestContext(GLuint win, GLint width, GLint height,
+			const GLint attribList[])
+{
+ int res = fxBestResolution(width, height);
+
+ if (res == -1) {
+    return NULL;
+ }
+
+ return fxMesaCreateContext(win, res, GR_REFRESH_60Hz, attribList);
+}
+
+
+/*
+ * Create a new FX/Mesa context and return a handle to it.
+ */
+fxMesaContext GLAPIENTRY
+fxMesaCreateContext(GLuint win,
+		    GrScreenResolution_t res,
+		    GrScreenRefresh_t ref, const GLint attribList[])
+{
+ fxMesaContext fxMesa = NULL;
+ GLcontext *ctx = NULL, *shareCtx = NULL;
+
+ int i;
+ const char *str;
+ int sliaa, numSLI, samplesPerChip, tmuRam, fbRam;
+ struct SstCard_St *voodoo;
+ struct tdfx_glide *Glide;
+
+ GLboolean aux;
+ GLboolean doubleBuffer;
+ GLuint colDepth;
+ GLuint depthSize, alphaSize, stencilSize, accumSize;
+ GLuint redBits, greenBits, blueBits, alphaBits;
+ GrPixelFormat_t pixFmt;
+   
+ GLboolean useBGR;
+
+ if (TDFX_DEBUG & VERBOSE_DRIVER) {
+    fprintf(stderr, "fxMesaCreateContext(...)\n");
+ }
+
+ /* Okay, first process the user flags */
+ aux = GL_FALSE;
+ doubleBuffer = GL_FALSE;
+ colDepth = 16;
+ depthSize = alphaSize = stencilSize = accumSize = 0;
+
+ i = 0;
+ while (attribList[i] != FXMESA_NONE) {
+       switch (attribList[i]) {
+              case FXMESA_COLORDEPTH:
+	           colDepth = attribList[++i];
+	           break;
+              case FXMESA_DOUBLEBUFFER:
+	           doubleBuffer = GL_TRUE;
+	           break;
+              case FXMESA_ALPHA_SIZE:
+	           if ((alphaSize = attribList[++i])) {
+	              aux = GL_TRUE;
+                   }
+	           break;
+              case FXMESA_DEPTH_SIZE:
+	           if ((depthSize = attribList[++i])) {
+	              aux = GL_TRUE;
+                   }
+	           break;
+              case FXMESA_STENCIL_SIZE:
+	           stencilSize = attribList[++i];
+	           break;
+              case FXMESA_ACCUM_SIZE:
+	           accumSize = attribList[++i];
+	           break;
+              /* XXX ugly hack here for sharing display lists */
+              case FXMESA_SHARE_CONTEXT:
+	           {
+	            const void *vPtr = &attribList[++i];
+	            GLcontext **ctx = (GLcontext **)vPtr;
+	            shareCtx = *ctx;
+                   }
+	           break;
+              default:
+                   fprintf(stderr, "fxMesaCreateContext: ERROR: wrong parameter (%d) passed\n", attribList[i]);
+	           return NULL;
+       }
+       i++;
+ }
+
+ if (!fxQueryHardware()) {
+    str = "no Voodoo hardware!";
+    goto errorhandler;
+ }
+
+ grSstSelect(glbCurrentBoard);
+ /*grEnable(GR_OPENGL_MODE_EXT);*/ /* ZZZ: trick to make GL happy.
+                                  Glide3 will unmap memory for card when grSstWinClose is called.
+                                  This also forces the SLI band height to be 32 (above 1024x768) or 16
+                                  and disables the splash screen due to y-origin swapping.
+                                  Note: We only want the former. */
+ voodoo = &glbHWConfig.SSTs[glbCurrentBoard];
+
+ fxMesa = (fxMesaContext)CALLOC_STRUCT(tfxMesaContext);
+ if (!fxMesa) {
+    str = "private context";
+    goto errorhandler;
+ }
+
+ if (getenv("MESA_FX_INFO")) {
+    fxMesa->verbose = GL_TRUE;
+ }
+
+ fxMesa->type = voodoo->type;
+ fxMesa->HavePalExt = voodoo->HavePalExt && !getenv("MESA_FX_IGNORE_PALEXT");
+ fxMesa->HavePixExt = voodoo->HavePixExt && !getenv("MESA_FX_IGNORE_PIXEXT");
+ fxMesa->HaveTexFmt = voodoo->HaveTexFmt && !getenv("MESA_FX_IGNORE_TEXFMT");
+ fxMesa->HaveCmbExt = voodoo->HaveCmbExt && !getenv("MESA_FX_IGNORE_CMBEXT");
+ fxMesa->HaveMirExt = voodoo->HaveMirExt && !getenv("MESA_FX_IGNORE_MIREXT");
+ fxMesa->HaveTexUma = voodoo->HaveTexUma && !getenv("MESA_FX_IGNORE_TEXUMA");
+ fxMesa->Glide = glbHWConfig.Glide;
+ Glide = &fxMesa->Glide;
+ fxMesa->HaveTexus2 = Glide->txImgQuantize &&
+                      Glide->txMipQuantize &&
+                      Glide->txPalToNcc && !getenv("MESA_FX_IGNORE_TEXUS2");
+
+ /*
+  * Pixel tables are used during pixel read-back
+  * Either initialize them for RGB or BGR order;
+  * However, 32bit capable cards have the right order.
+  * As a consequence, 32bit read-back is not swizzled!
+  * Also determine if we need vertex snapping.
+  */
+ /* number of SLI units and AA Samples per chip */
+ sliaa = 0;
+ switch (voodoo->type) {
+        case GR_SSTTYPE_VOODOO:
+        case GR_SSTTYPE_Banshee:
+             useBGR = GL_TRUE;
+             fxMesa->snapVertices = GL_TRUE;
+             break;
+        case GR_SSTTYPE_Voodoo2:
+             useBGR = GL_TRUE;
+             fxMesa->snapVertices = GL_FALSE;
+             break;
+        case GR_SSTTYPE_Voodoo4:
+        case GR_SSTTYPE_Voodoo5:
+             if ((str = Glide->grGetRegistryOrEnvironmentStringExt("SSTH3_SLI_AA_CONFIGURATION")) != NULL) {
+                sliaa = atoi(str);
+             }
+        case GR_SSTTYPE_Voodoo3:
+        default:
+             useBGR = GL_FALSE;
+             fxMesa->snapVertices = GL_FALSE;
+             break;
+ }
+ /* ZZZ TO DO: Add the old SLI/AA settings for Napalm. */
+ switch(voodoo->numChips) {
+ case 4: /* 4 chips */
+   switch(sliaa) {
+   case 8: /* 8 Sample AA */
+     numSLI         = 1;
+     samplesPerChip = 2;
+     break;
+   case 7: /* 4 Sample AA */
+     numSLI         = 1;
+     samplesPerChip = 1;
+     break;
+   case 6: /* 2 Sample AA */
+     numSLI         = 2;
+     samplesPerChip = 1;
+     break;
+   default:
+     numSLI         = 4;
+     samplesPerChip = 1;
+   }
+   break;
+ case 2: /* 2 chips */
+   switch(sliaa) {
+   case 4: /* 4 Sample AA */
+     numSLI         = 1;
+     samplesPerChip = 2;
+     break;
+   case 3: /* 2 Sample AA */
+     numSLI         = 1;
+     samplesPerChip = 1;
+     break;
+   default:
+     numSLI         = 2;
+     samplesPerChip = 1;
+   }
+   break;
+ default: /* 1 chip */
+   switch(sliaa) {
+   case 1: /* 2 Sample AA */
+     numSLI         = 1;
+     samplesPerChip = 2;
+     break;
+   default:
+     numSLI         = 1;
+     samplesPerChip = 1;
+   }
+ }
+
+ fxMesa->fsaa = samplesPerChip * voodoo->numChips / numSLI; /* 1:noFSAA, 2:2xFSAA, 4:4xFSAA, 8:8xFSAA */
+
+ switch (fxMesa->colDepth = colDepth) {
+   case 15:
+     redBits   = 5;
+     greenBits = 5;
+     blueBits  = 5;
+     alphaBits = depthSize ? 1 : 8;
+     switch(fxMesa->fsaa) {
+       case 8:
+         pixFmt = GR_PIXFMT_AA_8_ARGB_1555;
+         break;
+       case 4:
+         pixFmt = GR_PIXFMT_AA_4_ARGB_1555;
+         break;
+       case 2:
+         pixFmt = GR_PIXFMT_AA_2_ARGB_1555;
+         break;
+       default:
+         pixFmt = GR_PIXFMT_ARGB_1555;
+     }
+     break;
+   case 16:
+     redBits   = 5;
+     greenBits = 6;
+     blueBits  = 5;
+     alphaBits = depthSize ? 0 : 8;
+     switch(fxMesa->fsaa) {
+       case 8:
+         pixFmt = GR_PIXFMT_AA_8_RGB_565;
+         break;
+       case 4:
+         pixFmt = GR_PIXFMT_AA_4_RGB_565;
+         break;
+       case 2:
+         pixFmt = GR_PIXFMT_AA_2_RGB_565;
+         break;
+       default:
+         pixFmt = GR_PIXFMT_RGB_565;
+     }
+     break;
+   case 32:
+     redBits   = 8;
+     greenBits = 8;
+     blueBits  = 8;
+     alphaBits = 8;
+     switch(fxMesa->fsaa) {
+       case 8:
+         pixFmt = GR_PIXFMT_AA_8_ARGB_8888;
+         break;
+       case 4:
+         pixFmt = GR_PIXFMT_AA_4_ARGB_8888;
+         break;
+       case 2:
+         pixFmt = GR_PIXFMT_AA_2_ARGB_8888;
+         break;
+       default:
+         pixFmt = GR_PIXFMT_ARGB_8888;
+     }
+     break;
+   default:
+     str = "pixelFormat";
+     goto errorhandler;
+ }
+
+ /* ZZZ TODO: check if there is enough fbRam */
+
+ /* Tips:
+  * 1. we don't bother setting/checking AUX for stencil, because we'll decide
+  *    later whether we have HW stencil, based on depth buffer (thus AUX is
+  *    properly set)
+  * 2. when both DEPTH and ALPHA are enabled, depth should win. However, it is
+  *    not clear whether 15bpp and 32bpp require AUX alpha buffer. Furthermore,
+  *    alpha buffering is required only if destination alpha is used in alpha
+  *    blending; alpha blending modes that do not use destination alpha can be
+  *    used w/o alpha buffer.
+  * 3. `alphaBits' is what we can provide
+  *    `alphaSize' is what app requests
+  *    if we cannot provide enough bits for alpha buffer, we should fallback to
+  *    SW alpha. However, setting `alphaBits' to `alphaSize' might confuse some
+  *    of the span functions...
+  */
+
+ fxMesa->haveHwAlpha = GL_FALSE;
+ if (alphaSize && (alphaSize <= alphaBits)) {
+    alphaSize = alphaBits;
+    fxMesa->haveHwAlpha = GL_TRUE;
+ }
+
+ fxMesa->haveHwStencil = (fxMesa->HavePixExt && stencilSize && depthSize == 24);
+
+ fxMesa->haveZBuffer = depthSize > 0;
+ fxMesa->haveDoubleBuffer = doubleBuffer;
+ fxMesa->haveGlobalPaletteTexture = GL_FALSE;
+ fxMesa->board = glbCurrentBoard;
+
+ fxMesa->haveTwoTMUs = (voodoo->nTexelfx > 1);
+
+ if ((str = Glide->grGetRegistryOrEnvironmentStringExt("FX_GLIDE_NUM_TMU"))) {
+    if (atoi(str) <= 1) {
+       fxMesa->haveTwoTMUs = GL_FALSE;
+    }
+ }
+
+ if ((str = Glide->grGetRegistryOrEnvironmentStringExt("FX_GLIDE_SWAPPENDINGCOUNT"))) {
+    fxMesa->maxPendingSwapBuffers = atoi(str);
+    if (fxMesa->maxPendingSwapBuffers > 3) {
+       fxMesa->maxPendingSwapBuffers = 3;
+    } else if (fxMesa->maxPendingSwapBuffers < 0) {
+       fxMesa->maxPendingSwapBuffers = 0;
+    }
+ } else {
+    fxMesa->maxPendingSwapBuffers = 2;
+ }
+
+ if ((str = Glide->grGetRegistryOrEnvironmentStringExt("FX_GLIDE_SWAPINTERVAL"))) {
+    fxMesa->swapInterval = atoi(str);
+ } else {
+    fxMesa->swapInterval = 0;
+ }
+
+ BEGIN_BOARD_LOCK();
+ if (fxMesa->HavePixExt) {
+    fxMesa->glideContext = Glide->grSstWinOpenExt((FxU32)win, res, ref,
+                                                  GR_COLORFORMAT_ABGR, GR_ORIGIN_LOWER_LEFT,
+                                                  pixFmt,
+                                                  2, aux);
+ } else if (pixFmt == GR_PIXFMT_RGB_565) {
+    fxMesa->glideContext = grSstWinOpen((FxU32)win, res, ref,
+                                        GR_COLORFORMAT_ABGR, GR_ORIGIN_LOWER_LEFT,
+                                        2, aux);
+ } else {
+    fxMesa->glideContext = 0;
+ }
+ END_BOARD_LOCK();
+ if (!fxMesa->glideContext) {
+    str = "grSstWinOpen";
+    goto errorhandler;
+ }
+
+  /* Not that it matters, but tmuRam and fbRam change after grSstWinOpen. */
+  tmuRam = voodoo->tmuConfig[GR_TMU0].tmuRam;
+  fbRam  = voodoo->fbRam;
+  BEGIN_BOARD_LOCK();
+  {
+    FxI32 result;
+    grGet(GR_MEMORY_TMU, 4, &result);
+    tmuRam = result / (1024 * 1024);
+    grGet(GR_MEMORY_FB, 4, &result);
+    fbRam = result / (1024 * 1024);
+  }
+  END_BOARD_LOCK();
+
+  sprintf(fxMesa->rendererString, "Mesa %s v0.60 %s %dMB FB, %dMB TM, %d TMU, %s",
+                           grGetString(GR_RENDERER),
+                           grGetString(GR_HARDWARE),
+                           fbRam,
+                           tmuRam * voodoo->nTexelfx,
+                           voodoo->nTexelfx,
+                           (voodoo->numChips > 1) ? "SLI" : "NOSLI");
+
+  fxMesa->bgrOrder = useBGR;
+
+   /* screen */
+   fxMesa->screen_width = FX_grSstScreenWidth();
+   fxMesa->screen_height = FX_grSstScreenHeight();
+
+   /* window inside screen */
+   fxMesa->width = fxMesa->screen_width;
+   fxMesa->height = fxMesa->screen_height;
+
+   /* scissor inside window */
+   fxMesa->clipMinX = 0;
+   fxMesa->clipMaxX = fxMesa->width;
+   fxMesa->clipMinY = 0;
+   fxMesa->clipMaxY = fxMesa->height;
+
+   if (fxMesa->verbose) {
+      char buf[80];
+
+      strcpy(buf, grGetString(GR_VERSION));
+      fprintf(stderr, "Voodoo Using Glide %s\n", buf);
+      fprintf(stderr, "Voodoo Number of boards: %d\n", glbHWConfig.num_sst);
+      fprintf(stderr, "Voodoo Number of TMUs: %d\n", voodoo->nTexelfx);
+      fprintf(stderr, "Voodoo fbRam: %d\n", voodoo->fbRam);
+      fprintf(stderr, "Voodoo fbiRev: %d\n", voodoo->fbiRev);
+      fprintf(stderr, "Voodoo chips detected: %d\n", voodoo->numChips);
+      fprintf(stderr, "Voodoo pixel order = %s, vertex snapping = %d\n",
+                      useBGR ? "BGR" : "RGB",
+                      fxMesa->snapVertices);
+      fprintf(stderr, "Voodoo screen: %dx%d:%d\n",
+	              fxMesa->screen_width, fxMesa->screen_height, colDepth);
+   }
+
+   fxMesa->glVis = _mesa_create_visual(GL_TRUE,		/* RGB mode */
+				       doubleBuffer,
+				       GL_FALSE,	/* stereo */
+				       redBits,		/* RGBA.R bits */
+				       greenBits,	/* RGBA.G bits */
+				       blueBits,	/* RGBA.B bits */
+				       alphaSize,	/* RGBA.A bits */
+				       0,		/* index bits */
+				       depthSize,	/* depth_size */
+				       stencilSize,	/* stencil_size */
+				       accumSize,
+				       accumSize,
+				       accumSize,
+				       alphaSize ? accumSize : 0,
+                                       1);
+   if (!fxMesa->glVis) {
+      str = "_mesa_create_visual";
+      goto errorhandler;
+   }
+
+   ctx = fxMesa->glCtx = _mesa_create_context(fxMesa->glVis,
+                                              shareCtx,
+					      (void *) fxMesa, GL_TRUE);
+   if (!ctx) {
+      str = "_mesa_create_context";
+      goto errorhandler;
+   }
+
+
+   if (!fxDDInitFxMesaContext(fxMesa)) {
+      str = "fxDDInitFxMesaContext";
+      goto errorhandler;
+   }
+
+
+   fxMesa->glBuffer = _mesa_create_framebuffer(fxMesa->glVis,
+					       GL_FALSE,	/* no software depth */
+					       stencilSize && !fxMesa->haveHwStencil,
+					       fxMesa->glVis->accumRedBits > 0,
+					       alphaSize && !fxMesa->haveHwAlpha);
+   if (!fxMesa->glBuffer) {
+      str = "_mesa_create_framebuffer";
+      goto errorhandler;
+   }
+
+   glbTotNumCtx++;
+
+   /* install signal handlers */
+#if defined(__linux__)
+   /* Only install if environment var. is not set. */
+   if (fxMesa->glCtx->CatchSignals && !getenv("MESA_FX_NO_SIGNALS")) {
+      signal(SIGINT, cleangraphics_handler);
+      signal(SIGHUP, cleangraphics_handler);
+      signal(SIGPIPE, cleangraphics_handler);
+      signal(SIGFPE, cleangraphics_handler);
+      signal(SIGBUS, cleangraphics_handler);
+      signal(SIGILL, cleangraphics_handler);
+      signal(SIGSEGV, cleangraphics_handler);
+      signal(SIGTERM, cleangraphics_handler);
+   }
+#endif
+
+   return fxMesa;
+
+errorhandler:
+ if (fxMesa) {
+    if (fxMesa->glideContext) {
+       grSstWinClose(fxMesa->glideContext);
+       fxMesa->glideContext = 0;
+    }
+
+    if (fxMesa->state) {
+       FREE(fxMesa->state);
+    }
+    if (fxMesa->fogTable) {
+       FREE(fxMesa->fogTable);
+    }
+    if (fxMesa->glBuffer) {
+       _mesa_destroy_framebuffer(fxMesa->glBuffer);
+    }
+    if (fxMesa->glVis) {
+       _mesa_destroy_visual(fxMesa->glVis);
+    }
+    if (fxMesa->glCtx) {
+       _mesa_destroy_context(fxMesa->glCtx);
+    }
+    FREE(fxMesa);
+ }
+
+ fprintf(stderr, "fxMesaCreateContext: ERROR: %s\n", str);
+ return NULL;
+}
+
+
+/*
+ * Function to set the new window size in the context (mainly for the Voodoo Rush)
+ */
+void GLAPIENTRY
+fxMesaUpdateScreenSize(fxMesaContext fxMesa)
+{
+   fxMesa->width = FX_grSstScreenWidth();
+   fxMesa->height = FX_grSstScreenHeight();
+}
+
+
+/*
+ * Destroy the given FX/Mesa context.
+ */
+void GLAPIENTRY
+fxMesaDestroyContext(fxMesaContext fxMesa)
+{
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "fxMesaDestroyContext(...)\n");
+   }
+
+   if (!fxMesa)
+      return;
+
+   if (fxMesa->verbose) {
+      fprintf(stderr, "Misc Stats:\n");
+      fprintf(stderr, "  # swap buffer: %u\n", fxMesa->stats.swapBuffer);
+
+      if (!fxMesa->stats.swapBuffer)
+	 fxMesa->stats.swapBuffer = 1;
+
+      fprintf(stderr, "Textures Stats:\n");
+      fprintf(stderr, "  Free texture memory on TMU0: %d:\n",
+	      fxMesa->freeTexMem[FX_TMU0]);
+      if (fxMesa->haveTwoTMUs)
+	 fprintf(stderr, "  Free texture memory on TMU1: %d:\n",
+		 fxMesa->freeTexMem[FX_TMU1]);
+      fprintf(stderr, "  # request to TMM to upload a texture objects: %u\n",
+	      fxMesa->stats.reqTexUpload);
+      fprintf(stderr,
+	      "  # request to TMM to upload a texture objects per swapbuffer: %.2f\n",
+	      fxMesa->stats.reqTexUpload / (float) fxMesa->stats.swapBuffer);
+      fprintf(stderr, "  # texture objects uploaded: %u\n",
+	      fxMesa->stats.texUpload);
+      fprintf(stderr, "  # texture objects uploaded per swapbuffer: %.2f\n",
+	      fxMesa->stats.texUpload / (float) fxMesa->stats.swapBuffer);
+      fprintf(stderr, "  # MBs uploaded to texture memory: %.2f\n",
+	      fxMesa->stats.memTexUpload / (float) (1 << 20));
+      fprintf(stderr,
+	      "  # MBs uploaded to texture memory per swapbuffer: %.2f\n",
+	      (fxMesa->stats.memTexUpload /
+	       (float) fxMesa->stats.swapBuffer) / (float) (1 << 20));
+   }
+
+   glbTotNumCtx--;
+
+   fxDDDestroyFxMesaContext(fxMesa);
+   _mesa_destroy_visual(fxMesa->glVis);
+   _mesa_destroy_context(fxMesa->glCtx);
+   _mesa_destroy_framebuffer(fxMesa->glBuffer);
+
+   grSstWinClose(fxMesa->glideContext);
+   fxCloseHardware();
+
+   FREE(fxMesa);
+
+   if (fxMesa == fxMesaCurrentCtx)
+      fxMesaCurrentCtx = NULL;
+}
+
+
+/*
+ * Make the specified FX/Mesa context the current one.
+ */
+void GLAPIENTRY
+fxMesaMakeCurrent(fxMesaContext fxMesa)
+{
+   if (!fxMesa) {
+      _mesa_make_current(NULL, NULL);
+      fxMesaCurrentCtx = NULL;
+
+      if (TDFX_DEBUG & VERBOSE_DRIVER) {
+	 fprintf(stderr, "fxMesaMakeCurrent(NULL)\n");
+      }
+
+      return;
+   }
+
+   /* if this context is already the current one, we can return early */
+   if (fxMesaCurrentCtx == fxMesa
+       && fxMesaCurrentCtx->glCtx == _mesa_get_current_context()) {
+      if (TDFX_DEBUG & VERBOSE_DRIVER) {
+	 fprintf(stderr, "fxMesaMakeCurrent(NOP)\n");
+      }
+
+      return;
+   }
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "fxMesaMakeCurrent(...)\n");
+   }
+
+   if (fxMesaCurrentCtx)
+      grGlideGetState((GrState *) fxMesaCurrentCtx->state);
+
+   fxMesaCurrentCtx = fxMesa;
+
+   grSstSelect(fxMesa->board);
+   grGlideSetState((GrState *) fxMesa->state);
+
+   _mesa_make_current(fxMesa->glCtx, fxMesa->glBuffer);
+
+   fxSetupDDPointers(fxMesa->glCtx);
+
+   /* The first time we call MakeCurrent we set the initial viewport size */
+   if (fxMesa->glCtx->Viewport.Width == 0)
+      _mesa_set_viewport(fxMesa->glCtx, 0, 0, fxMesa->width, fxMesa->height);
+}
+
+
+/*
+ * Swap front/back buffers for current context if double buffered.
+ */
+void GLAPIENTRY
+fxMesaSwapBuffers(void)
+{
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "fxMesaSwapBuffers()\n");
+   }
+
+   if (fxMesaCurrentCtx) {
+      _mesa_notifySwapBuffers(fxMesaCurrentCtx->glCtx);
+
+      if (fxMesaCurrentCtx->haveDoubleBuffer) {
+
+	 grBufferSwap(fxMesaCurrentCtx->swapInterval);
+
+	 /*
+	  * Don't allow swap buffer commands to build up!
+	  */
+	 while (FX_grGetInteger(GR_PENDING_BUFFERSWAPS) >
+		fxMesaCurrentCtx->maxPendingSwapBuffers)
+	    /* The driver is able to sleep when waiting for the completation
+	       of multiple swapbuffer operations instead of wasting
+	       CPU time (NOTE: you must uncomment the following line in the
+	       in order to enable this option) */
+	    /* usleep(10000); */
+	    ;
+
+	 fxMesaCurrentCtx->stats.swapBuffer++;
+      }
+   }
+}
+
+
+/*
+ * Shutdown Glide library
+ */
+void GLAPIENTRY
+fxCloseHardware(void)
+{
+   if (glbGlideInitialized) {
+      if (fxMesaCurrentCtx && fxMesaCurrentCtx->verbose) {
+	 GrSstPerfStats_t st;
+
+	 FX_grSstPerfStats(&st);
+	 fprintf(stderr, "Pixels Stats:\n");
+	 fprintf(stderr, "  # pixels processed (minus buffer clears): %u\n",
+		 (unsigned) st.pixelsIn);
+	 fprintf(stderr,
+		 "  # pixels not drawn due to chroma key test failure: %u\n",
+		 (unsigned) st.chromaFail);
+	 fprintf(stderr,
+		 "  # pixels not drawn due to depth test failure: %u\n",
+		 (unsigned) st.zFuncFail);
+	 fprintf(stderr,
+		 "  # pixels not drawn due to alpha test failure: %u\n",
+		 (unsigned) st.aFuncFail);
+	 fprintf(stderr,
+		 "  # pixels drawn (including buffer clears and LFB writes): %u\n",
+		 (unsigned) st.pixelsOut);
+      }
+
+      if (glbTotNumCtx == 0) {
+	 grGlideShutdown();
+	 glbGlideInitialized = 0;
+      }
+   }
+}
+
+
+#else
+
+
+/*
+ * Need this to provide at least one external definition.
+ */
+extern int gl_fx_dummy_function_api(void);
+int
+gl_fx_dummy_function_api(void)
+{
+   return 0;
+}
+
+#endif /* FX */
diff --git a/reactos/lib/mesa32/src/drivers/glide/fxdd.c b/reactos/lib/mesa32/src/drivers/glide/fxdd.c
new file mode 100644
index 00000000000..0ee4216cb1f
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/glide/fxdd.c
@@ -0,0 +1,1759 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/* Authors:
+ *    David Bucciarelli
+ *    Brian Paul
+ *    Daryll Strauss
+ *    Keith Whitwell
+ *    Daniel Borca
+ *    Hiroshi Morii
+ */
+
+/* fxdd.c - 3Dfx VooDoo Mesa device driver functions */
+
+
+#ifdef HAVE_CONFIG_H
+#include "conf.h"
+#endif
+
+#if defined(FX)
+
+#include "image.h"
+#include "mtypes.h"
+#include "fxdrv.h"
+#include "enums.h"
+#include "extensions.h"
+#include "macros.h"
+#include "texstore.h"
+#include "teximage.h"
+#include "swrast/swrast.h"
+#include "swrast/s_context.h"
+#include "swrast_setup/swrast_setup.h"
+#include "tnl/tnl.h"
+#include "tnl/t_context.h"
+#include "tnl/t_pipeline.h"
+#include "array_cache/acache.h"
+
+
+
+/* lookup table for scaling 4 bit colors up to 8 bits */
+GLuint FX_rgb_scale_4[16] = {
+   0,   17,  34,  51,  68,  85,  102, 119,
+   136, 153, 170, 187, 204, 221, 238, 255
+};
+
+/* lookup table for scaling 5 bit colors up to 8 bits */
+GLuint FX_rgb_scale_5[32] = {
+   0,   8,   16,  25,  33,  41,  49,  58,
+   66,  74,  82,  90,  99,  107, 115, 123,
+   132, 140, 148, 156, 165, 173, 181, 189,
+   197, 206, 214, 222, 230, 239, 247, 255
+};
+
+/* lookup table for scaling 6 bit colors up to 8 bits */
+GLuint FX_rgb_scale_6[64] = {
+   0,   4,   8,   12,  16,  20,  24,  28,
+   32,  36,  40,  45,  49,  53,  57,  61,
+   65,  69,  73,  77,  81,  85,  89,  93,
+   97,  101, 105, 109, 113, 117, 121, 125,
+   130, 134, 138, 142, 146, 150, 154, 158,
+   162, 166, 170, 174, 178, 182, 186, 190,
+   194, 198, 202, 206, 210, 215, 219, 223,
+   227, 231, 235, 239, 243, 247, 251, 255
+};
+
+
+/*
+ * Disable color by masking out R, G, B, A
+ */
+static void fxDisableColor (fxMesaContext fxMesa)
+{
+ if (fxMesa->colDepth != 16) {
+    /* 32bpp mode or 15bpp mode */
+    fxMesa->Glide.grColorMaskExt(FXFALSE, FXFALSE, FXFALSE, FXFALSE);
+ } else {
+    /* 16 bpp mode */
+    grColorMask(FXFALSE, FXFALSE);
+ }
+}
+
+
+/**********************************************************************/
+/*****                 Miscellaneous functions                    *****/
+/**********************************************************************/
+
+/* Return buffer size information */
+static void
+fxDDBufferSize(GLframebuffer *buffer, GLuint *width, GLuint *height)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (ctx && FX_CONTEXT(ctx)) {
+      fxMesaContext fxMesa = FX_CONTEXT(ctx);
+
+      if (TDFX_DEBUG & VERBOSE_DRIVER) {
+         fprintf(stderr, "fxDDBufferSize(...)\n");
+      }
+
+      *width = fxMesa->width;
+      *height = fxMesa->height;
+   }
+}
+
+
+/* Implements glClearColor() */
+static void
+fxDDClearColor(GLcontext * ctx, const GLfloat color[4])
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   GLubyte col[4];
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "fxDDClearColor(%f, %f, %f, %f)\n",
+	              color[0], color[1], color[2], color[3]);
+   }
+
+   CLAMPED_FLOAT_TO_UBYTE(col[0], color[0]);
+   CLAMPED_FLOAT_TO_UBYTE(col[1], color[1]);
+   CLAMPED_FLOAT_TO_UBYTE(col[2], color[2]);
+   CLAMPED_FLOAT_TO_UBYTE(col[3], color[3]);
+
+   fxMesa->clearC = FXCOLOR4(col);
+   fxMesa->clearA = col[3];
+}
+
+
+/* Clear the color and/or depth buffers */
+static void fxDDClear( GLcontext *ctx,
+			GLbitfield mask, GLboolean all,
+			GLint x, GLint y, GLint width, GLint height )
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   GLbitfield softwareMask = mask & (DD_ACCUM_BIT);
+   const GLuint stencil_size = fxMesa->haveHwStencil ? ctx->Visual.stencilBits : 0;
+   const FxU32 clearD = (FxU32) (((1 << ctx->Visual.depthBits) - 1) * ctx->Depth.Clear);
+   const FxU8 clearS = (FxU8) (ctx->Stencil.Clear & 0xff);
+
+   /* [dBorca] Hack alert:
+    * if we set Mesa for 32bit depth, we'll get
+    * clearD == 0
+    * due to 32bit integer overflow!
+    */
+
+   if ( TDFX_DEBUG & MESA_VERBOSE ) {
+      fprintf( stderr, "fxDDClear( %d, %d, %d, %d )\n",
+	               (int) x, (int) y, (int) width, (int) height );
+   }
+
+   /* Need this check to respond to glScissor and clipping updates */
+   /* should also take care of FX_NEW_COLOR_MASK, FX_NEW_STENCIL, depth? */
+   if (fxMesa->new_state & FX_NEW_SCISSOR) {
+      fxSetupScissor(ctx);
+      fxMesa->new_state &= ~FX_NEW_SCISSOR;
+   }
+
+   /* we can't clear accum buffers */
+   mask &= ~(DD_ACCUM_BIT);
+
+   /*
+    * As per GL spec, stencil masking should be obeyed when clearing
+    */
+   if (mask & DD_STENCIL_BIT) {
+      if (!fxMesa->haveHwStencil || fxMesa->unitsState.stencilWriteMask != 0xff) {
+         /* Napalm seems to have trouble with stencil write masks != 0xff */
+         /* do stencil clear in software */
+         softwareMask |= DD_STENCIL_BIT;
+         mask &= ~(DD_STENCIL_BIT);
+      }
+   }
+
+   /*
+    * As per GL spec, color masking should be obeyed when clearing
+    */
+   if (ctx->Visual.greenBits != 8 && ctx->Visual.greenBits != 5) {
+      /* can only do color masking if running in 24/32bpp on Napalm */
+      if (ctx->Color.ColorMask[RCOMP] != ctx->Color.ColorMask[GCOMP] ||
+          ctx->Color.ColorMask[GCOMP] != ctx->Color.ColorMask[BCOMP]) {
+         softwareMask |= (mask & (DD_FRONT_LEFT_BIT | DD_BACK_LEFT_BIT));
+         mask &= ~(DD_FRONT_LEFT_BIT | DD_BACK_LEFT_BIT);
+      }
+   }
+
+   if (fxMesa->haveHwStencil) {
+      /*
+       * If we want to clear stencil, it must be enabled
+       * in the HW, even if the stencil test is not enabled
+       * in the OGL state.
+       */
+      BEGIN_BOARD_LOCK();
+      if (mask & DD_STENCIL_BIT) {
+	 fxMesa->Glide.grStencilMaskExt(0xff /*fxMesa->unitsState.stencilWriteMask*/);
+	 /* set stencil ref value = desired clear value */
+	 fxMesa->Glide.grStencilFuncExt(GR_CMP_ALWAYS, clearS, 0xff);
+	 fxMesa->Glide.grStencilOpExt(GR_STENCILOP_REPLACE,
+                                   GR_STENCILOP_REPLACE, GR_STENCILOP_REPLACE);
+	 grEnable(GR_STENCIL_MODE_EXT);
+      }
+      else {
+	 grDisable(GR_STENCIL_MODE_EXT);
+      }
+      END_BOARD_LOCK();
+   }
+
+   /*
+    * This may be ugly, but it's needed in order to work around a number
+    * of Glide bugs.
+    */
+   BEGIN_CLIP_LOOP();
+   {
+      /*
+       * This could probably be done fancier but doing each possible case
+       * explicitly is less error prone.
+       */
+      switch (mask & ~DD_STENCIL_BIT) {
+      case DD_BACK_LEFT_BIT | DD_DEPTH_BIT:
+	 /* back buffer & depth */
+	 /* FX_grColorMaskv_NoLock(ctx, true4); */ /* work around Voodoo3 bug */
+	 grDepthMask(FXTRUE);
+	 grRenderBuffer(GR_BUFFER_BACKBUFFER);
+	 if (stencil_size > 0) {
+            fxMesa->Glide.grBufferClearExt(fxMesa->clearC,
+                                           fxMesa->clearA,
+                                           clearD, clearS);
+         }
+	 else
+            grBufferClear(fxMesa->clearC,
+                          fxMesa->clearA,
+                          clearD);
+	 if (!fxMesa->unitsState.depthTestEnabled) {
+            grDepthMask(FXFALSE);
+	 }
+	 break;
+      case DD_FRONT_LEFT_BIT | DD_DEPTH_BIT:
+	 /* XXX it appears that the depth buffer isn't cleared when
+	  * glRenderBuffer(GR_BUFFER_FRONTBUFFER) is set.
+	  * This is a work-around/
+	  */
+	 /* clear depth */
+	 grDepthMask(FXTRUE);
+	 grRenderBuffer(GR_BUFFER_BACKBUFFER);
+         fxDisableColor(fxMesa);
+	 if (stencil_size > 0)
+            fxMesa->Glide.grBufferClearExt(fxMesa->clearC,
+                                           fxMesa->clearA,
+                                           clearD, clearS);
+	 else
+            grBufferClear(fxMesa->clearC,
+                          fxMesa->clearA,
+                          clearD);
+	 /* clear front */
+	 fxSetupColorMask(ctx);
+	 grRenderBuffer(GR_BUFFER_FRONTBUFFER);
+	 if (stencil_size > 0)
+            fxMesa->Glide.grBufferClearExt(fxMesa->clearC,
+                                           fxMesa->clearA,
+                                           clearD, clearS);
+	 else
+            grBufferClear(fxMesa->clearC,
+                          fxMesa->clearA,
+                          clearD);
+	 if (!fxMesa->unitsState.depthTestEnabled) {
+            grDepthMask(FXFALSE);
+	 }
+	 break;
+      case DD_BACK_LEFT_BIT:
+	 /* back buffer only */
+	 grDepthMask(FXFALSE);
+	 grRenderBuffer(GR_BUFFER_BACKBUFFER);
+	 if (stencil_size > 0)
+            fxMesa->Glide.grBufferClearExt(fxMesa->clearC,
+                                           fxMesa->clearA,
+                                           clearD, clearS);
+	 else
+            grBufferClear(fxMesa->clearC,
+                          fxMesa->clearA,
+                          clearD);
+	 if (fxMesa->unitsState.depthTestEnabled) {
+            grDepthMask(FXTRUE);
+	 }
+	 break;
+      case DD_FRONT_LEFT_BIT:
+	 /* front buffer only */
+	 grDepthMask(FXFALSE);
+	 grRenderBuffer(GR_BUFFER_FRONTBUFFER);
+	 if (stencil_size > 0)
+            fxMesa->Glide.grBufferClearExt(fxMesa->clearC,
+                                           fxMesa->clearA,
+                                           clearD, clearS);
+	 else
+            grBufferClear(fxMesa->clearC,
+                          fxMesa->clearA,
+                          clearD);
+	 if (fxMesa->unitsState.depthTestEnabled) {
+            grDepthMask(FXTRUE);
+	 }
+	 break;
+      case DD_FRONT_LEFT_BIT | DD_BACK_LEFT_BIT:
+	 /* front and back */
+	 grDepthMask(FXFALSE);
+	 grRenderBuffer(GR_BUFFER_BACKBUFFER);
+	 if (stencil_size > 0)
+            fxMesa->Glide.grBufferClearExt(fxMesa->clearC,
+                                           fxMesa->clearA,
+                                           clearD, clearS);
+	 else
+            grBufferClear(fxMesa->clearC,
+                          fxMesa->clearA,
+                          clearD);
+	 grRenderBuffer(GR_BUFFER_FRONTBUFFER);
+	 if (stencil_size > 0)
+            fxMesa->Glide.grBufferClearExt(fxMesa->clearC,
+                                           fxMesa->clearA,
+                                           clearD, clearS);
+	 else
+            grBufferClear(fxMesa->clearC,
+                          fxMesa->clearA,
+                          clearD);
+	 if (fxMesa->unitsState.depthTestEnabled) {
+            grDepthMask(FXTRUE);
+	 }
+	 break;
+      case DD_FRONT_LEFT_BIT | DD_BACK_LEFT_BIT | DD_DEPTH_BIT:
+	 /* clear front */
+	 grDepthMask(FXFALSE);
+	 grRenderBuffer(GR_BUFFER_FRONTBUFFER);
+	 if (stencil_size > 0)
+            fxMesa->Glide.grBufferClearExt(fxMesa->clearC,
+                                           fxMesa->clearA,
+                                           clearD, clearS);
+	 else
+            grBufferClear(fxMesa->clearC,
+                          fxMesa->clearA,
+                          clearD);
+	 /* clear back and depth */
+	 grDepthMask(FXTRUE);
+	 grRenderBuffer(GR_BUFFER_BACKBUFFER);
+         if (stencil_size > 0)
+            fxMesa->Glide.grBufferClearExt(fxMesa->clearC,
+                                           fxMesa->clearA,
+                                           clearD, clearS);
+	 else
+            grBufferClear(fxMesa->clearC,
+                          fxMesa->clearA,
+                          clearD);
+	 if (!fxMesa->unitsState.depthTestEnabled) {
+            grDepthMask(FXFALSE);
+	 }
+	 break;
+      case DD_DEPTH_BIT:
+	 /* just the depth buffer */
+	 grRenderBuffer(GR_BUFFER_BACKBUFFER);
+         fxDisableColor(fxMesa);
+	 grDepthMask(FXTRUE);
+	 if (stencil_size > 0)
+            fxMesa->Glide.grBufferClearExt(fxMesa->clearC,
+                                           fxMesa->clearA,
+                                           clearD, clearS);
+	 else
+            grBufferClear(fxMesa->clearC,
+                          fxMesa->clearA,
+                          clearD);
+	 fxSetupColorMask(ctx);
+	 if (ctx->Color._DrawDestMask & FRONT_LEFT_BIT) {
+            grRenderBuffer(GR_BUFFER_FRONTBUFFER);
+         }
+	 if (!fxMesa->unitsState.depthTestEnabled) {
+	    grDepthMask(FXFALSE);
+         }
+	 break;
+      default:
+         /* clear no color buffers or depth buffer but might clear stencil */
+	 if (stencil_size > 0 && (mask & DD_STENCIL_BIT)) {
+            /* XXX need this RenderBuffer call to work around Glide bug */
+            grRenderBuffer(GR_BUFFER_BACKBUFFER);
+            grDepthMask(FXFALSE);
+            fxDisableColor(fxMesa);
+            fxMesa->Glide.grBufferClearExt(fxMesa->clearC,
+                                           fxMesa->clearA,
+                                           clearD, clearS);
+            if (fxMesa->unitsState.depthTestEnabled) {
+               grDepthMask(FXTRUE);
+            }
+            fxSetupColorMask(ctx);
+            if (ctx->Color._DrawDestMask & FRONT_LEFT_BIT) {
+               grRenderBuffer(GR_BUFFER_FRONTBUFFER);
+            }
+         }
+      }
+   }
+   END_CLIP_LOOP();
+
+   if (fxMesa->haveHwStencil && (mask & DD_STENCIL_BIT)) {
+      /* We changed the stencil state above.  Signal that we need to
+       * upload it again.
+       */
+      fxMesa->new_state |= FX_NEW_STENCIL;
+   }
+
+   if (softwareMask)
+      _swrast_Clear( ctx, softwareMask, all, x, y, width, height );
+}
+
+
+/* Set the buffer used for drawing */
+/* XXX support for separate read/draw buffers hasn't been tested */
+static void
+fxDDSetDrawBuffer(GLcontext * ctx, GLenum mode)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "fxDDSetDrawBuffer(%x)\n", (int)mode);
+   }
+
+   if (mode == GL_FRONT_LEFT) {
+      fxMesa->currentFB = GR_BUFFER_FRONTBUFFER;
+      grRenderBuffer(fxMesa->currentFB);
+   }
+   else if (mode == GL_BACK_LEFT) {
+      fxMesa->currentFB = GR_BUFFER_BACKBUFFER;
+      grRenderBuffer(fxMesa->currentFB);
+   }
+   else if (mode == GL_NONE) {
+      fxDisableColor(fxMesa);
+   }
+   else {
+      /* we'll need a software fallback */
+      /* XXX not implemented */
+   }
+
+   /* update s/w fallback state */
+   _swrast_DrawBuffer(ctx, mode);
+}
+
+
+static void
+fxDDDrawBitmap2 (GLcontext *ctx, GLint px, GLint py,
+		 GLsizei width, GLsizei height,
+		 const struct gl_pixelstore_attrib *unpack,
+		 const GLubyte *bitmap)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   GrLfbInfo_t info;
+   GrLfbWriteMode_t mode;
+   FxU16 color;
+   const struct gl_pixelstore_attrib *finalUnpack;
+   struct gl_pixelstore_attrib scissoredUnpack;
+
+   /* check if there's any raster operations enabled which we can't handle */
+   if ((swrast->_RasterMask & (ALPHATEST_BIT |
+			      /*BLEND_BIT |*/   /* blending ok, through pixpipe */
+			      DEPTH_BIT |       /* could be done with RGB:DEPTH */
+			      FOG_BIT |         /* could be done with RGB:DEPTH */
+			      LOGIC_OP_BIT |
+			      /*CLIP_BIT |*/    /* clipping ok, below */
+			      STENCIL_BIT |
+			      /*MASKING_BIT |*/ /* masking ok, test follows */
+			      ALPHABUF_BIT |    /* nope! see 565 span kludge */
+			      MULTI_DRAW_BIT |
+			      OCCLUSION_BIT |   /* nope! at least not yet */
+			      TEXTURE_BIT |
+			      FRAGPROG_BIT))
+       ||
+       ((swrast->_RasterMask & MASKING_BIT) /*&& (ctx->Visual.greenBits != 8)*/ && (ctx->Visual.greenBits != 5))
+      ) {
+      _swrast_Bitmap(ctx, px, py, width, height, unpack, bitmap);
+      return;
+   }
+
+   /* make sure the pixelpipe is configured correctly */
+   fxSetupFXUnits(ctx);
+
+   if (ctx->Scissor.Enabled) {
+      /* This is a bit tricky, but by carefully adjusting the px, py,
+       * width, height, skipPixels and skipRows values we can do
+       * scissoring without special code in the rendering loop.
+       */
+
+      /* we'll construct a new pixelstore struct */
+      finalUnpack = &scissoredUnpack;
+      scissoredUnpack = *unpack;
+      if (scissoredUnpack.RowLength == 0)
+	 scissoredUnpack.RowLength = width;
+
+      /* clip left */
+      if (px < ctx->Scissor.X) {
+	 scissoredUnpack.SkipPixels += (ctx->Scissor.X - px);
+	 width -= (ctx->Scissor.X - px);
+	 px = ctx->Scissor.X;
+      }
+      /* clip right */
+      if (px + width >= ctx->Scissor.X + ctx->Scissor.Width) {
+	 width -= (px + width - (ctx->Scissor.X + ctx->Scissor.Width));
+      }
+      /* clip bottom */
+      if (py < ctx->Scissor.Y) {
+	 scissoredUnpack.SkipRows += (ctx->Scissor.Y - py);
+	 height -= (ctx->Scissor.Y - py);
+	 py = ctx->Scissor.Y;
+      }
+      /* clip top */
+      if (py + height >= ctx->Scissor.Y + ctx->Scissor.Height) {
+	 height -= (py + height - (ctx->Scissor.Y + ctx->Scissor.Height));
+      }
+
+      if (width <= 0 || height <= 0)
+	 return;
+   }
+   else {
+      finalUnpack = unpack;
+   }
+
+   /* compute pixel value */
+   {
+      GLint r = (GLint) (ctx->Current.RasterColor[RCOMP] * 255.0f);
+      GLint g = (GLint) (ctx->Current.RasterColor[GCOMP] * 255.0f);
+      GLint b = (GLint) (ctx->Current.RasterColor[BCOMP] * 255.0f);
+      GLint a = (GLint) (ctx->Current.RasterColor[ACOMP] * 255.0f);
+      if (fxMesa->colDepth == 15) {
+         color = TDFXPACKCOLOR1555(b, g, r, a);
+         mode = GR_LFBWRITEMODE_1555;
+      } else {
+         color = fxMesa->bgrOrder ? TDFXPACKCOLOR565(r, g, b) : TDFXPACKCOLOR565(b, g, r);
+         mode = GR_LFBWRITEMODE_565;
+      }
+   }
+
+   info.size = sizeof(info);
+   if (!grLfbLock(GR_LFB_WRITE_ONLY,
+		  fxMesa->currentFB,
+		  mode,
+		  GR_ORIGIN_UPPER_LEFT, FXTRUE, &info)) {
+      _swrast_Bitmap(ctx, px, py, width, height, unpack, bitmap);
+      return;
+   }
+
+   {
+      const GLint winX = 0;
+      const GLint winY = fxMesa->height - 1;
+      /* The dest stride depends on the hardware and whether we're drawing
+       * to the front or back buffer.  This compile-time test seems to do
+       * the job for now.
+       */
+      const GLint dstStride = info.strideInBytes / 2;	/* stride in GLushorts */
+
+      GLint row;
+      /* compute dest address of bottom-left pixel in bitmap */
+      GLushort *dst = (GLushort *) info.lfbPtr
+	 + (winY - py) * dstStride + (winX + px);
+
+      for (row = 0; row < height; row++) {
+	 const GLubyte *src =
+	    (const GLubyte *) _mesa_image_address(finalUnpack,
+						  bitmap, width, height,
+						  GL_COLOR_INDEX, GL_BITMAP,
+						  0, row, 0);
+	 if (finalUnpack->LsbFirst) {
+	    /* least significan bit first */
+	    GLubyte mask = 1U << (finalUnpack->SkipPixels & 0x7);
+	    GLint col;
+	    for (col = 0; col < width; col++) {
+	       if (*src & mask) {
+		  dst[col] = color;
+	       }
+	       if (mask == 128U) {
+		  src++;
+		  mask = 1U;
+	       }
+	       else {
+		  mask = mask << 1;
+	       }
+	    }
+	    if (mask != 1)
+	       src++;
+	 }
+	 else {
+	    /* most significan bit first */
+	    GLubyte mask = 128U >> (finalUnpack->SkipPixels & 0x7);
+	    GLint col;
+	    for (col = 0; col < width; col++) {
+	       if (*src & mask) {
+		  dst[col] = color;
+	       }
+	       if (mask == 1U) {
+		  src++;
+		  mask = 128U;
+	       }
+	       else {
+		  mask = mask >> 1;
+	       }
+	    }
+	    if (mask != 128)
+	       src++;
+	 }
+	 dst -= dstStride;
+      }
+   }
+
+   grLfbUnlock(GR_LFB_WRITE_ONLY, fxMesa->currentFB);
+}
+
+static void
+fxDDDrawBitmap4 (GLcontext *ctx, GLint px, GLint py,
+		 GLsizei width, GLsizei height,
+		 const struct gl_pixelstore_attrib *unpack,
+		 const GLubyte *bitmap)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   GrLfbInfo_t info;
+   FxU32 color;
+   const struct gl_pixelstore_attrib *finalUnpack;
+   struct gl_pixelstore_attrib scissoredUnpack;
+
+   /* check if there's any raster operations enabled which we can't handle */
+   if ((swrast->_RasterMask & (ALPHATEST_BIT |
+			      /*BLEND_BIT |*/   /* blending ok, through pixpipe */
+			      DEPTH_BIT |       /* could be done with RGB:DEPTH */
+			      FOG_BIT |         /* could be done with RGB:DEPTH */
+			      LOGIC_OP_BIT |
+			      /*CLIP_BIT |*/    /* clipping ok, below */
+			      STENCIL_BIT |
+			      /*MASKING_BIT |*/ /* masking ok, we're in 32bpp */
+			      /*ALPHABUF_BIT |*//* alpha ok, we're in 32bpp */
+			      MULTI_DRAW_BIT |
+			      OCCLUSION_BIT |   /* nope! at least not yet */
+			      TEXTURE_BIT |
+			      FRAGPROG_BIT))
+      ) {
+      _swrast_Bitmap(ctx, px, py, width, height, unpack, bitmap);
+      return;
+   }
+
+   /* make sure the pixelpipe is configured correctly */
+   fxSetupFXUnits(ctx);
+
+   if (ctx->Scissor.Enabled) {
+      /* This is a bit tricky, but by carefully adjusting the px, py,
+       * width, height, skipPixels and skipRows values we can do
+       * scissoring without special code in the rendering loop.
+       */
+
+      /* we'll construct a new pixelstore struct */
+      finalUnpack = &scissoredUnpack;
+      scissoredUnpack = *unpack;
+      if (scissoredUnpack.RowLength == 0)
+	 scissoredUnpack.RowLength = width;
+
+      /* clip left */
+      if (px < ctx->Scissor.X) {
+	 scissoredUnpack.SkipPixels += (ctx->Scissor.X - px);
+	 width -= (ctx->Scissor.X - px);
+	 px = ctx->Scissor.X;
+      }
+      /* clip right */
+      if (px + width >= ctx->Scissor.X + ctx->Scissor.Width) {
+	 width -= (px + width - (ctx->Scissor.X + ctx->Scissor.Width));
+      }
+      /* clip bottom */
+      if (py < ctx->Scissor.Y) {
+	 scissoredUnpack.SkipRows += (ctx->Scissor.Y - py);
+	 height -= (ctx->Scissor.Y - py);
+	 py = ctx->Scissor.Y;
+      }
+      /* clip top */
+      if (py + height >= ctx->Scissor.Y + ctx->Scissor.Height) {
+	 height -= (py + height - (ctx->Scissor.Y + ctx->Scissor.Height));
+      }
+
+      if (width <= 0 || height <= 0)
+	 return;
+   }
+   else {
+      finalUnpack = unpack;
+   }
+
+   /* compute pixel value */
+   {
+      GLint r = (GLint) (ctx->Current.RasterColor[RCOMP] * 255.0f);
+      GLint g = (GLint) (ctx->Current.RasterColor[GCOMP] * 255.0f);
+      GLint b = (GLint) (ctx->Current.RasterColor[BCOMP] * 255.0f);
+      GLint a = (GLint) (ctx->Current.RasterColor[ACOMP] * 255.0f);
+      color = TDFXPACKCOLOR8888(b, g, r, a);
+   }
+
+   info.size = sizeof(info);
+   if (!grLfbLock(GR_LFB_WRITE_ONLY,
+		  fxMesa->currentFB,
+		  GR_LFBWRITEMODE_8888,
+		  GR_ORIGIN_UPPER_LEFT, FXTRUE, &info)) {
+      _swrast_Bitmap(ctx, px, py, width, height, unpack, bitmap);
+      return;
+   }
+
+   {
+      const GLint winX = 0;
+      const GLint winY = fxMesa->height - 1;
+      /* The dest stride depends on the hardware and whether we're drawing
+       * to the front or back buffer.  This compile-time test seems to do
+       * the job for now.
+       */
+      const GLint dstStride = info.strideInBytes / 4;	/* stride in GLuints */
+
+      GLint row;
+      /* compute dest address of bottom-left pixel in bitmap */
+      GLuint *dst = (GLuint *) info.lfbPtr
+	 + (winY - py) * dstStride + (winX + px);
+
+      for (row = 0; row < height; row++) {
+	 const GLubyte *src =
+	    (const GLubyte *) _mesa_image_address(finalUnpack,
+						  bitmap, width, height,
+						  GL_COLOR_INDEX, GL_BITMAP,
+						  0, row, 0);
+	 if (finalUnpack->LsbFirst) {
+	    /* least significan bit first */
+	    GLubyte mask = 1U << (finalUnpack->SkipPixels & 0x7);
+	    GLint col;
+	    for (col = 0; col < width; col++) {
+	       if (*src & mask) {
+		  dst[col] = color;
+	       }
+	       if (mask == 128U) {
+		  src++;
+		  mask = 1U;
+	       }
+	       else {
+		  mask = mask << 1;
+	       }
+	    }
+	    if (mask != 1)
+	       src++;
+	 }
+	 else {
+	    /* most significan bit first */
+	    GLubyte mask = 128U >> (finalUnpack->SkipPixels & 0x7);
+	    GLint col;
+	    for (col = 0; col < width; col++) {
+	       if (*src & mask) {
+		  dst[col] = color;
+	       }
+	       if (mask == 1U) {
+		  src++;
+		  mask = 128U;
+	       }
+	       else {
+		  mask = mask >> 1;
+	       }
+	    }
+	    if (mask != 128)
+	       src++;
+	 }
+	 dst -= dstStride;
+      }
+   }
+
+   grLfbUnlock(GR_LFB_WRITE_ONLY, fxMesa->currentFB);
+}
+
+
+static void
+fxDDReadPixels565 (GLcontext * ctx,
+		   GLint x, GLint y,
+		   GLsizei width, GLsizei height,
+		   GLenum format, GLenum type,
+		   const struct gl_pixelstore_attrib *packing,
+		   GLvoid *dstImage)
+{
+   if (ctx->_ImageTransferState/* & (IMAGE_SCALE_BIAS_BIT|IMAGE_MAP_COLOR_BIT)*/) {
+      _swrast_ReadPixels(ctx, x, y, width, height, format, type,
+			 packing, dstImage);
+      return;
+   }
+   else {
+      fxMesaContext fxMesa = FX_CONTEXT(ctx);
+      GrLfbInfo_t info;
+
+      BEGIN_BOARD_LOCK();
+      info.size = sizeof(info);
+      if (grLfbLock(GR_LFB_READ_ONLY,
+		    fxMesa->currentFB,
+		    GR_LFBWRITEMODE_ANY,
+		    GR_ORIGIN_UPPER_LEFT, FXFALSE, &info)) {
+	 const GLint winX = 0;
+	 const GLint winY = fxMesa->height - 1;
+	 const GLint srcStride = info.strideInBytes / 2;	/* stride in GLushorts */
+	 const GLushort *src = (const GLushort *) info.lfbPtr
+	    + (winY - y) * srcStride + (winX + x);
+	 GLubyte *dst = (GLubyte *) _mesa_image_address(packing, dstImage,
+							width, height, format,
+							type, 0, 0, 0);
+	 GLint dstStride =
+	    _mesa_image_row_stride(packing, width, format, type);
+
+	 if (format == GL_RGB && type == GL_UNSIGNED_BYTE) {
+	    /* convert 5R6G5B into 8R8G8B */
+	    GLint row, col;
+	    const GLint halfWidth = width >> 1;
+	    const GLint extraPixel = (width & 1);
+	    for (row = 0; row < height; row++) {
+	       GLubyte *d = dst;
+	       for (col = 0; col < halfWidth; col++) {
+		  const GLuint pixel = ((const GLuint *) src)[col];
+                  *d++ = FX_rgb_scale_5[(pixel >> 11) & 0x1f];
+                  *d++ = FX_rgb_scale_6[(pixel >> 5)  & 0x3f];
+                  *d++ = FX_rgb_scale_5[ pixel        & 0x1f];
+                  *d++ = FX_rgb_scale_5[(pixel >> 27) & 0x1f];
+                  *d++ = FX_rgb_scale_6[(pixel >> 21) & 0x3f];
+                  *d++ = FX_rgb_scale_5[(pixel >> 16) & 0x1f];
+	       }
+	       if (extraPixel) {
+		  GLushort pixel = src[width - 1];
+                  *d++ = FX_rgb_scale_5[(pixel >> 11) & 0x1f];
+                  *d++ = FX_rgb_scale_6[(pixel >> 5)  & 0x3f];
+                  *d++ = FX_rgb_scale_5[ pixel        & 0x1f];
+	       }
+	       dst += dstStride;
+	       src -= srcStride;
+	    }
+	 }
+	 else if (format == GL_RGBA && type == GL_UNSIGNED_BYTE) {
+	    /* convert 5R6G5B into 8R8G8B8A */
+	    GLint row, col;
+	    const GLint halfWidth = width >> 1;
+	    const GLint extraPixel = (width & 1);
+	    for (row = 0; row < height; row++) {
+	       GLubyte *d = dst;
+	       for (col = 0; col < halfWidth; col++) {
+		  const GLuint pixel = ((const GLuint *) src)[col];
+                  *d++ = FX_rgb_scale_5[(pixel >> 11) & 0x1f];
+                  *d++ = FX_rgb_scale_6[(pixel >> 5)  & 0x3f];
+                  *d++ = FX_rgb_scale_5[ pixel        & 0x1f];
+		  *d++ = 255;
+                  *d++ = FX_rgb_scale_5[(pixel >> 27) & 0x1f];
+                  *d++ = FX_rgb_scale_6[(pixel >> 21) & 0x3f];
+                  *d++ = FX_rgb_scale_5[(pixel >> 16) & 0x1f];
+		  *d++ = 255;
+	       }
+	       if (extraPixel) {
+		  const GLushort pixel = src[width - 1];
+                  *d++ = FX_rgb_scale_5[(pixel >> 11) & 0x1f];
+                  *d++ = FX_rgb_scale_6[(pixel >> 5)  & 0x3f];
+                  *d++ = FX_rgb_scale_5[ pixel        & 0x1f];
+		  *d++ = 255;
+	       }
+	       dst += dstStride;
+	       src -= srcStride;
+	    }
+	 }
+	 else if (format == GL_RGB && type == GL_UNSIGNED_SHORT_5_6_5) {
+	    /* directly memcpy 5R6G5B pixels into client's buffer */
+	    const GLint widthInBytes = width * 2;
+	    GLint row;
+	    for (row = 0; row < height; row++) {
+	       MEMCPY(dst, src, widthInBytes);
+	       dst += dstStride;
+	       src -= srcStride;
+	    }
+	 }
+	 else {
+	    grLfbUnlock(GR_LFB_READ_ONLY, fxMesa->currentFB);
+	    END_BOARD_LOCK();
+	    _swrast_ReadPixels(ctx, x, y, width, height, format, type,
+			       packing, dstImage);
+	    return;
+	 }
+
+	 grLfbUnlock(GR_LFB_READ_ONLY, fxMesa->currentFB);
+      }
+      END_BOARD_LOCK();
+   }
+}
+
+static void
+fxDDReadPixels555 (GLcontext * ctx,
+		   GLint x, GLint y,
+		   GLsizei width, GLsizei height,
+		   GLenum format, GLenum type,
+		   const struct gl_pixelstore_attrib *packing,
+		   GLvoid *dstImage)
+{
+   if (ctx->_ImageTransferState/* & (IMAGE_SCALE_BIAS_BIT|IMAGE_MAP_COLOR_BIT)*/) {
+      _swrast_ReadPixels(ctx, x, y, width, height, format, type,
+			 packing, dstImage);
+      return;
+   }
+   else {
+      fxMesaContext fxMesa = FX_CONTEXT(ctx);
+      GrLfbInfo_t info;
+
+      BEGIN_BOARD_LOCK();
+      info.size = sizeof(info);
+      if (grLfbLock(GR_LFB_READ_ONLY,
+		    fxMesa->currentFB,
+		    GR_LFBWRITEMODE_ANY,
+		    GR_ORIGIN_UPPER_LEFT, FXFALSE, &info)) {
+	 const GLint winX = 0;
+	 const GLint winY = fxMesa->height - 1;
+	 const GLint srcStride = info.strideInBytes / 2;	/* stride in GLushorts */
+	 const GLushort *src = (const GLushort *) info.lfbPtr
+	    + (winY - y) * srcStride + (winX + x);
+	 GLubyte *dst = (GLubyte *) _mesa_image_address(packing, dstImage,
+							width, height, format,
+							type, 0, 0, 0);
+	 GLint dstStride =
+	    _mesa_image_row_stride(packing, width, format, type);
+
+	 if (format == GL_RGB && type == GL_UNSIGNED_BYTE) {
+	    /* convert 5R5G5B into 8R8G8B */
+	    GLint row, col;
+	    const GLint halfWidth = width >> 1;
+	    const GLint extraPixel = (width & 1);
+	    for (row = 0; row < height; row++) {
+	       GLubyte *d = dst;
+	       for (col = 0; col < halfWidth; col++) {
+		  const GLuint pixel = ((const GLuint *) src)[col];
+                  *d++ = FX_rgb_scale_5[(pixel >> 10) & 0x1f];
+                  *d++ = FX_rgb_scale_5[(pixel >> 5)  & 0x1f];
+                  *d++ = FX_rgb_scale_5[ pixel        & 0x1f];
+                  *d++ = FX_rgb_scale_5[(pixel >> 26) & 0x1f];
+                  *d++ = FX_rgb_scale_5[(pixel >> 21) & 0x1f];
+                  *d++ = FX_rgb_scale_5[(pixel >> 16) & 0x1f];
+	       }
+	       if (extraPixel) {
+		  GLushort pixel = src[width - 1];
+                  *d++ = FX_rgb_scale_5[(pixel >> 10) & 0x1f];
+                  *d++ = FX_rgb_scale_5[(pixel >> 5)  & 0x1f];
+                  *d++ = FX_rgb_scale_5[ pixel        & 0x1f];
+	       }
+	       dst += dstStride;
+	       src -= srcStride;
+	    }
+	 }
+	 else if (format == GL_RGBA && type == GL_UNSIGNED_BYTE) {
+	    /* convert 5R6G5B into 8R8G8B8A */
+	    GLint row, col;
+	    const GLint halfWidth = width >> 1;
+	    const GLint extraPixel = (width & 1);
+	    for (row = 0; row < height; row++) {
+	       GLubyte *d = dst;
+	       for (col = 0; col < halfWidth; col++) {
+		  const GLuint pixel = ((const GLuint *) src)[col];
+                  *d++ = FX_rgb_scale_5[(pixel >> 10) & 0x1f];
+                  *d++ = FX_rgb_scale_5[(pixel >>  5) & 0x1f];
+                  *d++ = FX_rgb_scale_5[ pixel        & 0x1f];
+		  *d++ =  (pixel & 0x8000) ? 255 : 0;
+                  *d++ = FX_rgb_scale_5[(pixel >> 26) & 0x1f];
+                  *d++ = FX_rgb_scale_5[(pixel >> 21) & 0x1f];
+                  *d++ = FX_rgb_scale_5[(pixel >> 16) & 0x1f];
+		  *d++ =  (pixel & 0x80000000) ? 255 : 0;
+	       }
+	       if (extraPixel) {
+		  const GLushort pixel = src[width - 1];
+                  *d++ = FX_rgb_scale_5[(pixel >> 10) & 0x1f];
+                  *d++ = FX_rgb_scale_5[(pixel >>  5) & 0x1f];
+                  *d++ = FX_rgb_scale_5[ pixel        & 0x1f];
+		  *d++ =  (pixel & 0x8000) ? 255 : 0;
+	       }
+	       dst += dstStride;
+	       src -= srcStride;
+	    }
+	 }
+	 else if (format == GL_RGB && type == GL_UNSIGNED_SHORT_5_6_5) {
+	    /* directly memcpy 5R5G5B pixels into client's buffer */
+	    const GLint widthInBytes = width * 2;
+	    GLint row;
+	    for (row = 0; row < height; row++) {
+	       MEMCPY(dst, src, widthInBytes);
+	       dst += dstStride;
+	       src -= srcStride;
+	    }
+	 }
+	 else {
+	    grLfbUnlock(GR_LFB_READ_ONLY, fxMesa->currentFB);
+	    END_BOARD_LOCK();
+	    _swrast_ReadPixels(ctx, x, y, width, height, format, type,
+			       packing, dstImage);
+	    return;
+	 }
+
+	 grLfbUnlock(GR_LFB_READ_ONLY, fxMesa->currentFB);
+      }
+      END_BOARD_LOCK();
+   }
+}
+
+static void
+fxDDReadPixels8888 (GLcontext * ctx,
+		    GLint x, GLint y,
+		    GLsizei width, GLsizei height,
+		    GLenum format, GLenum type,
+		    const struct gl_pixelstore_attrib *packing,
+		    GLvoid *dstImage)
+{
+   if (ctx->_ImageTransferState/* & (IMAGE_SCALE_BIAS_BIT|IMAGE_MAP_COLOR_BIT)*/) {
+      _swrast_ReadPixels(ctx, x, y, width, height, format, type,
+			 packing, dstImage);
+      return;
+   }
+   else {
+      fxMesaContext fxMesa = FX_CONTEXT(ctx);
+      GrLfbInfo_t info;
+
+      BEGIN_BOARD_LOCK();
+      info.size = sizeof(info);
+      if (grLfbLock(GR_LFB_READ_ONLY,
+		    fxMesa->currentFB,
+		    GR_LFBWRITEMODE_ANY,
+		    GR_ORIGIN_UPPER_LEFT, FXFALSE, &info)) {
+	 const GLint winX = 0;
+	 const GLint winY = fxMesa->height - 1;
+	 const GLint srcStride = info.strideInBytes / 4;	/* stride in GLuints */
+	 const GLuint *src = (const GLuint *) info.lfbPtr
+	    + (winY - y) * srcStride + (winX + x);
+	 GLubyte *dst = (GLubyte *) _mesa_image_address(packing, dstImage,
+							width, height, format,
+							type, 0, 0, 0);
+	 GLint dstStride =
+	    _mesa_image_row_stride(packing, width, format, type);
+
+	 if (format == GL_RGB && type == GL_UNSIGNED_BYTE) {
+	    /* convert 8A8R8G8B into 8R8G8B */
+	    GLint row, col;
+	    for (row = 0; row < height; row++) {
+	       GLubyte *d = dst;
+	       for (col = 0; col < width; col++) {
+		  const GLuint pixel = ((const GLuint *) src)[col];
+                  *d++ = pixel >> 16;
+                  *d++ = pixel >> 8;
+                  *d++ = pixel;
+	       }
+	       dst += dstStride;
+	       src -= srcStride;
+	    }
+	 }
+	 else if (format == GL_RGBA && type == GL_UNSIGNED_BYTE) {
+	    /* 8A8R8G8B pixels into client's buffer */
+	    GLint row, col;
+	    for (row = 0; row < height; row++) {
+	       GLubyte *d = dst;
+	       for (col = 0; col < width; col++) {
+		  const GLuint pixel = ((const GLuint *) src)[col];
+                  *d++ = pixel >> 16;
+                  *d++ = pixel >> 8;
+                  *d++ = pixel;
+                  *d++ = pixel >> 24;
+	       }
+	       dst += dstStride;
+	       src -= srcStride;
+	    }
+	 }
+	 else if (format == GL_RGB && type == GL_UNSIGNED_SHORT_5_6_5) {
+	    /* convert 8A8R8G8B into 5R6G5B */
+	    GLint row, col;
+	    for (row = 0; row < height; row++) {
+	       GLushort *d = (GLushort *)dst;
+	       for (col = 0; col < width; col++) {
+		  const GLuint pixel = ((const GLuint *) src)[col];
+                  *d++ = (((pixel >> 16) & 0xf8) << 8) |
+                         (((pixel >>  8) & 0xfc) << 3) |
+                          ((pixel        & 0xf8) >> 3);
+	       }
+	       dst += dstStride;
+	       src -= srcStride;
+	    }
+	 }
+	 else {
+	    grLfbUnlock(GR_LFB_READ_ONLY, fxMesa->currentFB);
+	    END_BOARD_LOCK();
+	    _swrast_ReadPixels(ctx, x, y, width, height, format, type,
+			       packing, dstImage);
+	    return;
+	 }
+
+	 grLfbUnlock(GR_LFB_READ_ONLY, fxMesa->currentFB);
+      }
+      END_BOARD_LOCK();
+   }
+}
+
+
+/* [dBorca] Hack alert:
+ * not finished!!!
+ * revise fallback tests and fix scissor; implement new formats
+ * also write its siblings: 565 and 1555
+ */
+void
+fxDDDrawPixels8888 (GLcontext * ctx, GLint x, GLint y,
+                    GLsizei width, GLsizei height,
+                    GLenum format, GLenum type,
+                    const struct gl_pixelstore_attrib *unpack,
+                    const GLvoid * pixels)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   GrLfbInfo_t info;
+
+   if (ctx->Pixel.ZoomX != 1.0F ||
+       ctx->Pixel.ZoomY != 1.0F ||
+       (ctx->_ImageTransferState & (IMAGE_SCALE_BIAS_BIT|
+				    IMAGE_MAP_COLOR_BIT)) ||
+       ctx->Color.AlphaEnabled ||
+       ctx->Depth.Test ||
+       ctx->Fog.Enabled ||
+       ctx->Scissor.Enabled ||
+       ctx->Stencil.Enabled ||
+       !ctx->Color.ColorMask[0] ||
+       !ctx->Color.ColorMask[1] ||
+       !ctx->Color.ColorMask[2] ||
+       !ctx->Color.ColorMask[3] ||
+       ctx->Color.ColorLogicOpEnabled ||
+       ctx->Texture._EnabledUnits ||
+       ctx->Depth.OcclusionTest ||
+       fxMesa->fallback)
+   {
+      _swrast_DrawPixels( ctx, x, y, width, height, format, type, 
+			  unpack, pixels );
+      return; 
+   }
+
+   /* lock early to make sure cliprects are right */
+   BEGIN_BOARD_LOCK();
+
+   /* make sure the pixelpipe is configured correctly */
+   fxSetupFXUnits(ctx);
+
+   /* look for clipmasks, giveup if region obscured */
+#if 0
+   if (ctx->Color.DrawBuffer == GL_FRONT) {
+      if (!inClipRects_Region(fxMesa, scrX, scrY, width, height)) {
+         END_BOARD_LOCK(fxMesa);
+         _swrast_DrawPixels(ctx, x, y, width, height, format, type, unpack, pixels);
+         return;
+      }
+   }
+#endif
+
+   info.size = sizeof(info);
+   if (!grLfbLock(GR_LFB_WRITE_ONLY,
+                  fxMesa->currentFB,
+                  GR_LFBWRITEMODE_8888,
+                  GR_ORIGIN_UPPER_LEFT, FXTRUE, &info)) {
+      _swrast_DrawPixels(ctx, x, y, width, height, format, type, unpack, pixels);
+      return;
+   }
+
+   {
+      const GLint winX = 0;
+      const GLint winY = fxMesa->height - 1;
+
+      const GLint dstStride = info.strideInBytes / 4;	/* stride in GLuints */
+      GLuint *dst = (GLuint *) info.lfbPtr + (winY - y) * dstStride + (winX + x);
+      const GLubyte *src = (GLubyte *)_mesa_image_address(unpack, pixels,
+							width, height, format,
+							type, 0, 0, 0);
+      const GLint srcStride = _mesa_image_row_stride(unpack, width, format, type);
+
+      if (format == GL_RGBA && type == GL_UNSIGNED_BYTE) {
+         /* directly memcpy 8A8R8G8B pixels to screen */
+         const GLint widthInBytes = width * 4;
+         GLint row;
+         for (row = 0; row < height; row++) {
+             MEMCPY(dst, src, widthInBytes);
+             dst -= dstStride;
+             src += srcStride;
+         }
+      }
+      else {
+         grLfbUnlock(GR_LFB_WRITE_ONLY, fxMesa->currentFB);
+         END_BOARD_LOCK();
+         _swrast_DrawPixels(ctx, x, y, width, height, format, type, unpack, pixels);
+         return;
+      }
+
+   }
+
+   grLfbUnlock(GR_LFB_WRITE_ONLY, fxMesa->currentFB);
+   END_BOARD_LOCK();
+}
+
+
+static void
+fxDDFinish(GLcontext * ctx)
+{
+   grFlush();
+}
+
+
+
+
+
+/* KW: Put the word Mesa in the render string because quakeworld
+ * checks for this rather than doing a glGet(GL_MAX_TEXTURE_SIZE).
+ * Why?
+ */
+static const GLubyte *
+fxDDGetString(GLcontext * ctx, GLenum name)
+{
+ fxMesaContext fxMesa = FX_CONTEXT(ctx);
+
+ switch (name) {
+        case GL_RENDERER:
+             return (GLubyte *)fxMesa->rendererString;
+#if __WIN32__ /* hack to advertise vanilla extension names */
+        case GL_EXTENSIONS:
+             if (ctx->Extensions.String == NULL) {
+                GLubyte *ext = _mesa_make_extension_string(ctx);
+                if (ext != NULL) {
+                   ctx->Extensions.String = _mesa_malloc(strlen((char *)ext) + 256);
+                   if (ctx->Extensions.String != NULL) {
+                      strcpy((char *)ctx->Extensions.String, (char *)ext);
+                      /* put any additional extension names here */
+#if 0
+                      strcat((char *)ctx->Extensions.String, " 3DFX_set_global_palette");
+#endif
+#if __WIN32__
+                      strcat((char *)ctx->Extensions.String, " WGL_3DFX_gamma_control");
+                      strcat((char *)ctx->Extensions.String, " WGL_EXT_swap_control");
+                      strcat((char *)ctx->Extensions.String, " WGL_EXT_extensions_string WGL_ARB_extensions_string");
+#endif
+                      /* put any additional extension names here */
+                      _mesa_free(ext);
+                   } else {
+                      ctx->Extensions.String = ext;
+                   }
+                }
+             }
+             return ctx->Extensions.String;
+#endif
+        default:
+             return NULL;
+ }
+}
+
+static const struct tnl_pipeline_stage *fx_pipeline[] = {
+   &_tnl_vertex_transform_stage,	/* TODO: Add the fastpath here */
+   &_tnl_normal_transform_stage,
+   &_tnl_lighting_stage,
+   /*&_tnl_fog_coordinate_stage,*/	/* TODO: Omit fog stage ZZZ ZZZ ZZZ */
+   &_tnl_texgen_stage,
+   &_tnl_texture_transform_stage,
+   &_tnl_point_attenuation_stage,
+   &_tnl_render_stage,
+   0,
+};
+
+
+
+
+int
+fxDDInitFxMesaContext(fxMesaContext fxMesa)
+{
+   int i;
+   GLcontext *ctx = fxMesa->glCtx;
+
+   FX_setupGrVertexLayout();
+
+   fxMesa->color = 0xffffffff;
+   fxMesa->clearC = 0;
+   fxMesa->clearA = 0;
+
+   fxMesa->stats.swapBuffer = 0;
+   fxMesa->stats.reqTexUpload = 0;
+   fxMesa->stats.texUpload = 0;
+   fxMesa->stats.memTexUpload = 0;
+
+   fxMesa->tmuSrc = FX_TMU_NONE;
+   fxMesa->lastUnitsMode = FX_UM_NONE;
+   fxTMInit(fxMesa);
+
+   /* FX units setup */
+
+   fxMesa->unitsState.alphaTestEnabled = GL_FALSE;
+   fxMesa->unitsState.alphaTestFunc = GL_ALWAYS;
+   fxMesa->unitsState.alphaTestRefValue = 0.0;
+
+   fxMesa->unitsState.blendEnabled = GL_FALSE;
+   fxMesa->unitsState.blendSrcFuncRGB = GR_BLEND_ONE;
+   fxMesa->unitsState.blendDstFuncRGB = GR_BLEND_ZERO;
+   fxMesa->unitsState.blendSrcFuncAlpha = GR_BLEND_ONE;
+   fxMesa->unitsState.blendDstFuncAlpha = GR_BLEND_ZERO;
+   fxMesa->unitsState.blendEq = GR_BLEND_OP_ADD;
+
+   fxMesa->unitsState.depthTestEnabled = GL_FALSE;
+   fxMesa->unitsState.depthMask = GL_TRUE;
+   fxMesa->unitsState.depthTestFunc = GL_LESS;
+   fxMesa->unitsState.depthBias = 0;
+
+   fxMesa->unitsState.stencilWriteMask = 0xff;
+
+   if (fxMesa->colDepth != 16) {
+      /* 32bpp mode or 15bpp mode */
+      fxMesa->Glide.grColorMaskExt(FXTRUE, FXTRUE, FXTRUE, fxMesa->haveHwAlpha);
+   } else {
+      /* 16 bpp mode */
+      grColorMask(FXTRUE, fxMesa->haveHwAlpha);
+   }
+
+   fxMesa->currentFB = fxMesa->haveDoubleBuffer ? GR_BUFFER_BACKBUFFER : GR_BUFFER_FRONTBUFFER;
+   grRenderBuffer(fxMesa->currentFB);
+
+   fxMesa->state = MALLOC(FX_grGetInteger(GR_GLIDE_STATE_SIZE));
+   fxMesa->fogTable = (GrFog_t *) MALLOC(FX_grGetInteger(GR_FOG_TABLE_ENTRIES) *
+			     sizeof(GrFog_t));
+
+   if (!fxMesa->state || !fxMesa->fogTable) {
+      if (fxMesa->state)
+	 FREE(fxMesa->state);
+      if (fxMesa->fogTable)
+	 FREE(fxMesa->fogTable);
+      return 0;
+   }
+
+   if (fxMesa->haveZBuffer)
+      grDepthBufferMode(GR_DEPTHBUFFER_ZBUFFER);
+
+   if (!fxMesa->bgrOrder) {
+      grLfbWriteColorFormat(GR_COLORFORMAT_ABGR);
+   }
+
+   fxMesa->textureAlign = FX_grGetInteger(GR_TEXTURE_ALIGN);
+   /* [koolsmoky] */
+   {
+    char *env;
+    int textureLevels = 0;
+    int textureSize = FX_grGetInteger(GR_MAX_TEXTURE_SIZE);
+    do {
+        textureLevels++;
+    } while ((textureSize >>= 0x1) & 0x7ff);
+    ctx->Const.MaxTextureLevels = textureLevels;
+#if 1||FX_RESCALE_BIG_TEXURES
+    fxMesa->textureMaxLod = textureLevels - 1;
+    if ((env = getenv("MESA_FX_MAXLOD")) != NULL) {
+       int maxLevels = atoi(env) + 1;
+       if ((maxLevels <= MAX_TEXTURE_LEVELS) && (maxLevels > textureLevels)) {
+          ctx->Const.MaxTextureLevels = maxLevels;
+       }
+    }
+#endif
+   }
+   ctx->Const.MaxTextureCoordUnits =
+   ctx->Const.MaxTextureImageUnits = fxMesa->haveTwoTMUs ? 2 : 1;
+   ctx->Const.MaxTextureUnits = MAX2(ctx->Const.MaxTextureImageUnits, ctx->Const.MaxTextureCoordUnits);
+   
+   fxMesa->new_state = _NEW_ALL;
+   if (!fxMesa->haveHwStencil) {
+      /* don't touch stencil if there is none */
+      fxMesa->new_state &= ~FX_NEW_STENCIL;
+   }
+
+   /* Initialize the software rasterizer and helper modules.
+    */
+   _swrast_CreateContext(ctx);
+   _ac_CreateContext(ctx);
+   _tnl_CreateContext(ctx);
+   _swsetup_CreateContext(ctx);
+
+   /* Install customized pipeline */
+   _tnl_destroy_pipeline(ctx);
+   _tnl_install_pipeline(ctx, fx_pipeline);
+
+   fxAllocVB(ctx);
+
+   fxSetupDDPointers(ctx);
+   fxDDInitTriFuncs(ctx);
+
+   /* Tell the software rasterizer to use pixel fog always.
+    */
+   _swrast_allow_vertex_fog(ctx, GL_FALSE);
+   _swrast_allow_pixel_fog(ctx, GL_TRUE);
+
+   /* Tell tnl not to calculate or use vertex fog factors.  (Needed to
+    * tell render stage not to clip fog coords).
+    */
+/*     _tnl_calculate_vertex_fog( ctx, GL_FALSE ); */
+
+   fxDDInitExtensions(ctx);
+
+#if 0
+   /* [dBorca] Hack alert:
+    * do we want dither? It just looks bad...
+    */
+   grEnable(GR_ALLOW_MIPMAP_DITHER);
+   grTexNccTable(GR_NCCTABLE_NCC0); /* set this once... no multipass */
+#endif
+   grGlideGetState((GrState *) fxMesa->state);
+
+   return 1;
+}
+
+/* Undo the above.
+ */
+void
+fxDDDestroyFxMesaContext(fxMesaContext fxMesa)
+{
+   _swsetup_DestroyContext(fxMesa->glCtx);
+   _tnl_DestroyContext(fxMesa->glCtx);
+   _ac_DestroyContext(fxMesa->glCtx);
+   _swrast_DestroyContext(fxMesa->glCtx);
+
+   if (fxMesa->state)
+      FREE(fxMesa->state);
+   if (fxMesa->fogTable)
+      FREE(fxMesa->fogTable);
+   fxTMClose(fxMesa);
+   fxFreeVB(fxMesa->glCtx);
+}
+
+
+
+
+void
+fxDDInitExtensions(GLcontext * ctx)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+
+#if 1 /* multipass ColorSum stage */
+   _mesa_enable_extension(ctx, "GL_EXT_secondary_color");
+#endif
+
+   _mesa_enable_extension(ctx, "GL_EXT_point_parameters");
+   _mesa_enable_extension(ctx, "GL_EXT_paletted_texture");
+   _mesa_enable_extension(ctx, "GL_EXT_texture_lod_bias");
+   _mesa_enable_extension(ctx, "GL_EXT_shared_texture_palette");
+   _mesa_enable_extension(ctx, "GL_EXT_blend_func_separate");
+
+   if (fxMesa->haveTwoTMUs) {
+      _mesa_enable_extension(ctx, "GL_EXT_texture_env_add");
+      _mesa_enable_extension(ctx, "GL_ARB_multitexture");
+   }
+
+   if (fxMesa->haveHwStencil) {
+      _mesa_enable_extension( ctx, "GL_EXT_stencil_wrap" );
+   }
+
+   /* [dBorca] Hack alert:
+    * True texture compression can be done only on Napalm.
+    * We will advertise, however, generic texture compression
+    * on all Voodoo cards; the Mesa logic allows us to eventually
+    * fallback to uncompressed. This will fix those dumb applications
+    * which refuse to run w/o texture compression! We actually _can_
+    * do texture compression for pre-Napalm cores, through NCC. But
+    * NCC poses many issues:
+    * 1) NCC w/o DITHER_ERR has poor quality and NCC w/ DITHER_ERR is
+    *    damn slow!
+    * 2) NCC compression cannot be used with multitexturing, because
+    *    the decompression tables are not per TMU anymore (bear in mind
+    *    that earlier Voodoos could handle 2 NCC tables for each TMU --
+    *    just look for POINTCAST_PALETTE). As a last resort, we could
+    *    fake NCC multitexturing through multipass rendering, but...
+    *    ohwell, it's not worth the effort...
+    *    This stand true for multitexturing palletized textures.
+    * 3) since NCC is not an OpenGL standard (as opposed to FXT1), we
+    *    would need to plug deeper into the core... First, we would need to
+    *    bind NCC to GL_COMPRESSED_RGB[A]. Then, we would need to trick
+    *    Mesa into reporting our texture as compressed. Last, we would need
+    *    to stash the NCC decompression table into the mipmap data and adjust
+    *    CompressedSize accordingly!
+    */
+   if (fxMesa->HaveTexus2) {
+      _mesa_enable_extension(ctx, "GL_ARB_texture_compression");
+
+      if (fxMesa->type >= GR_SSTTYPE_Voodoo4) {
+         _mesa_enable_extension(ctx, "GL_3DFX_texture_compression_FXT1");
+         _mesa_enable_extension(ctx, "GL_EXT_texture_compression_s3tc");
+         _mesa_enable_extension(ctx, "GL_S3_s3tc");
+      }
+   }
+
+   if (fxMesa->HaveCmbExt) {
+      _mesa_enable_extension(ctx, "GL_EXT_texture_env_combine");
+   }
+
+   if (fxMesa->HavePixExt) {
+      _mesa_enable_extension(ctx, "GL_EXT_blend_subtract");
+   }
+
+   if (fxMesa->HaveMirExt) {
+      _mesa_enable_extension(ctx, "GL_ARB_texture_mirrored_repeat");
+   }
+}
+
+
+/************************************************************************/
+/************************************************************************/
+/************************************************************************/
+
+/* Check if the hardware supports the current context
+ *
+ * Performs similar work to fxDDChooseRenderState() - should be merged.
+ */
+GLuint
+fx_check_IsInHardware(GLcontext * ctx)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+
+   if (ctx->RenderMode != GL_RENDER) {
+      return FX_FALLBACK_RENDER_MODE;
+   }
+
+   if (ctx->Stencil.Enabled && !fxMesa->haveHwStencil) {
+      return FX_FALLBACK_STENCIL;
+   }
+
+   if (ctx->Color._DrawDestMask != FRONT_LEFT_BIT && ctx->Color._DrawDestMask != BACK_LEFT_BIT) {
+      return FX_FALLBACK_DRAW_BUFFER;
+   }
+
+   if (ctx->Color.BlendEnabled) {
+      if (ctx->Color.BlendEquation != GL_FUNC_ADD_EXT) {
+         if (!fxMesa->HavePixExt ||
+             ((ctx->Color.BlendEquation != GL_FUNC_SUBTRACT_EXT) &&
+              (ctx->Color.BlendEquation != GL_FUNC_REVERSE_SUBTRACT_EXT))) {
+            return FX_FALLBACK_BLEND;
+         }
+      }
+   }
+
+   if (ctx->Color.ColorLogicOpEnabled && (ctx->Color.LogicOp != GL_COPY)) {
+      return FX_FALLBACK_LOGICOP;
+   }
+
+#if 0 /* multipass ColorSum stage */
+   if (ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR) {
+      return FX_FALLBACK_SPECULAR;
+   }
+#endif
+
+   if ((fxMesa->colDepth == 16) &&
+       ((ctx->Color.ColorMask[RCOMP] != ctx->Color.ColorMask[GCOMP]) ||
+        (ctx->Color.ColorMask[GCOMP] != ctx->Color.ColorMask[BCOMP]))) {
+      return FX_FALLBACK_COLORMASK;
+   }
+
+   /* Unsupported texture/multitexture cases */
+
+   if (fxMesa->haveTwoTMUs) {
+      /* we can only do 2D textures */
+      if (ctx->Texture.Unit[0]._ReallyEnabled & ~TEXTURE_2D_BIT)
+	 return FX_FALLBACK_TEXTURE_1D_3D;
+      if (ctx->Texture.Unit[1]._ReallyEnabled & ~TEXTURE_2D_BIT)
+	 return FX_FALLBACK_TEXTURE_1D_3D;
+
+      if (ctx->Texture.Unit[0]._ReallyEnabled & TEXTURE_2D_BIT) {
+         if (fxMesa->type < GR_SSTTYPE_Voodoo2)
+	 if (ctx->Texture.Unit[0].EnvMode == GL_BLEND &&
+	     (ctx->Texture.Unit[1]._ReallyEnabled & TEXTURE_2D_BIT ||
+	      ctx->Texture.Unit[0].EnvColor[0] != 0 ||
+	      ctx->Texture.Unit[0].EnvColor[1] != 0 ||
+	      ctx->Texture.Unit[0].EnvColor[2] != 0 ||
+	      ctx->Texture.Unit[0].EnvColor[3] != 1)) {
+	    return FX_FALLBACK_TEXTURE_ENV;
+	 }
+	 if (ctx->Texture.Unit[0]._Current->Image[0]->Border > 0)
+	    return FX_FALLBACK_TEXTURE_BORDER;
+      }
+
+      if (ctx->Texture.Unit[1]._ReallyEnabled & TEXTURE_2D_BIT) {
+         if (fxMesa->type < GR_SSTTYPE_Voodoo2)
+	 if (ctx->Texture.Unit[1].EnvMode == GL_BLEND)
+	    return FX_FALLBACK_TEXTURE_ENV;
+	 if (ctx->Texture.Unit[1]._Current->Image[0]->Border > 0)
+	    return FX_FALLBACK_TEXTURE_BORDER;
+      }
+
+      if (TDFX_DEBUG & (VERBOSE_DRIVER | VERBOSE_TEXTURE))
+	 fprintf(stderr, "fx_check_IsInHardware: envmode is %s/%s\n",
+		 _mesa_lookup_enum_by_nr(ctx->Texture.Unit[0].EnvMode),
+		 _mesa_lookup_enum_by_nr(ctx->Texture.Unit[1].EnvMode));
+
+      /* KW: This was wrong (I think) and I changed it... which doesn't mean
+       * it is now correct...
+       * BP: The old condition just seemed to test if both texture units
+       * were enabled.  That's easy!
+       */
+      if (ctx->Texture._EnabledUnits == 0x3) {
+	 /* Can't use multipass to blend a multitextured triangle - fall
+	  * back to software.
+	  */
+	 if (!fxMesa->haveTwoTMUs && ctx->Color.BlendEnabled) {
+	    return FX_FALLBACK_TEXTURE_MULTI;
+	 }
+
+	 if ((ctx->Texture.Unit[0].EnvMode != ctx->Texture.Unit[1].EnvMode) &&
+	     (ctx->Texture.Unit[0].EnvMode != GL_MODULATE) &&
+	     (ctx->Texture.Unit[0].EnvMode != GL_REPLACE)) {	/* q2, seems ok... */
+	    if (TDFX_DEBUG & VERBOSE_DRIVER)
+	       fprintf(stderr, "fx_check_IsInHardware: unsupported multitex env mode\n");
+	    return FX_FALLBACK_TEXTURE_MULTI;
+	 }
+      }
+   }
+   else {
+      /* we have just one texture unit */
+      if (ctx->Texture._EnabledUnits > 0x1) {
+	 return FX_FALLBACK_TEXTURE_MULTI;
+      }
+
+      if (fxMesa->type < GR_SSTTYPE_Voodoo2)
+      if ((ctx->Texture.Unit[0]._ReallyEnabled & TEXTURE_2D_BIT) &&
+	  (ctx->Texture.Unit[0].EnvMode == GL_BLEND)) {
+	 return FX_FALLBACK_TEXTURE_ENV;
+      }
+   }
+
+   return 0;
+}
+
+
+
+static void
+fxDDUpdateDDPointers(GLcontext * ctx, GLuint new_state)
+{
+   /*   TNLcontext *tnl = TNL_CONTEXT(ctx);*/
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "fxDDUpdateDDPointers(%08x)\n", new_state);
+   }
+
+   _swrast_InvalidateState(ctx, new_state);
+   _ac_InvalidateState(ctx, new_state);
+   _tnl_InvalidateState(ctx, new_state);
+   _swsetup_InvalidateState(ctx, new_state);
+
+   fxMesa->new_gl_state |= new_state;
+}
+
+
+
+
+void
+fxSetupDDPointers(GLcontext * ctx)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "fxSetupDDPointers()\n");
+   }
+
+   ctx->Driver.UpdateState = fxDDUpdateDDPointers;
+   ctx->Driver.GetString = fxDDGetString;
+   ctx->Driver.ClearIndex = NULL;
+   ctx->Driver.ClearColor = fxDDClearColor;
+   ctx->Driver.Clear = fxDDClear;
+   ctx->Driver.DrawBuffer = fxDDSetDrawBuffer;
+   ctx->Driver.GetBufferSize = fxDDBufferSize;
+   ctx->Driver.Accum = _swrast_Accum;
+   ctx->Driver.CopyPixels = _swrast_CopyPixels;
+   ctx->Driver.DrawPixels = _swrast_DrawPixels;
+   switch (fxMesa->colDepth) {
+          case 15:
+               ctx->Driver.ReadPixels = fxDDReadPixels555;
+               ctx->Driver.Bitmap = fxDDDrawBitmap2;
+               break;
+          case 16:
+               ctx->Driver.ReadPixels = fxDDReadPixels565;
+               ctx->Driver.Bitmap = fxDDDrawBitmap2;
+               break;
+          case 32:
+               ctx->Driver.DrawPixels = fxDDDrawPixels8888;
+               ctx->Driver.ReadPixels = fxDDReadPixels8888;
+               ctx->Driver.Bitmap = fxDDDrawBitmap4;
+               break;
+   }
+   ctx->Driver.ResizeBuffers = _swrast_alloc_buffers;
+   ctx->Driver.Finish = fxDDFinish;
+   ctx->Driver.Flush = NULL;
+   ctx->Driver.ChooseTextureFormat = fxDDChooseTextureFormat;
+   ctx->Driver.TexImage1D = _mesa_store_teximage1d;
+   ctx->Driver.TexImage2D = fxDDTexImage2D;
+   ctx->Driver.TexImage3D = _mesa_store_teximage3d;
+   ctx->Driver.TexSubImage1D = _mesa_store_texsubimage1d;
+   ctx->Driver.TexSubImage2D = fxDDTexSubImage2D;
+   ctx->Driver.TexSubImage3D = _mesa_store_texsubimage3d;
+   ctx->Driver.CompressedTexImage1D = _mesa_store_compressed_teximage1d;
+   ctx->Driver.CompressedTexImage2D = fxDDCompressedTexImage2D;
+   ctx->Driver.CompressedTexImage3D = _mesa_store_compressed_teximage3d;
+   ctx->Driver.CompressedTexSubImage1D = _mesa_store_compressed_texsubimage1d;
+   ctx->Driver.CompressedTexSubImage2D = fxDDCompressedTexSubImage2D;
+   ctx->Driver.CompressedTexSubImage3D = _mesa_store_compressed_texsubimage3d;
+   ctx->Driver.IsCompressedFormat = fxDDIsCompressedFormat;
+   ctx->Driver.CompressedTextureSize = fxDDCompressedTextureSize;
+   ctx->Driver.CopyTexImage1D = _swrast_copy_teximage1d;
+   ctx->Driver.CopyTexImage2D = _swrast_copy_teximage2d;
+   ctx->Driver.CopyTexSubImage1D = _swrast_copy_texsubimage1d;
+   ctx->Driver.CopyTexSubImage2D = _swrast_copy_texsubimage2d;
+   ctx->Driver.CopyTexSubImage3D = _swrast_copy_texsubimage3d;
+   ctx->Driver.TestProxyTexImage = _mesa_test_proxy_teximage;
+   ctx->Driver.CopyColorTable = _swrast_CopyColorTable;
+   ctx->Driver.CopyColorSubTable = _swrast_CopyColorSubTable;
+   ctx->Driver.CopyConvolutionFilter1D = _swrast_CopyConvolutionFilter1D;
+   ctx->Driver.CopyConvolutionFilter2D = _swrast_CopyConvolutionFilter2D;
+   ctx->Driver.TexEnv = fxDDTexEnv;
+   ctx->Driver.TexParameter = fxDDTexParam;
+   ctx->Driver.BindTexture = fxDDTexBind;
+   ctx->Driver.DeleteTexture = fxDDTexDel;
+   ctx->Driver.IsTextureResident = fxDDIsTextureResident;
+   ctx->Driver.UpdateTexturePalette = fxDDTexPalette;
+   ctx->Driver.AlphaFunc = fxDDAlphaFunc;
+   ctx->Driver.BlendFunc = fxDDBlendFunc;
+   ctx->Driver.BlendFuncSeparate = fxDDBlendFuncSeparate;
+   ctx->Driver.BlendEquation = fxDDBlendEquation;
+   ctx->Driver.DepthFunc = fxDDDepthFunc;
+   ctx->Driver.DepthMask = fxDDDepthMask;
+   ctx->Driver.ColorMask = fxDDColorMask;
+   ctx->Driver.Fogfv = fxDDFogfv;
+   ctx->Driver.Scissor = fxDDScissor;
+   ctx->Driver.FrontFace = fxDDFrontFace;
+   ctx->Driver.CullFace = fxDDCullFace;
+   ctx->Driver.ShadeModel = fxDDShadeModel;
+   ctx->Driver.Enable = fxDDEnable;
+   if (fxMesa->haveHwStencil) {
+      ctx->Driver.StencilFunc	= fxDDStencilFunc;
+      ctx->Driver.StencilMask	= fxDDStencilMask;
+      ctx->Driver.StencilOp	= fxDDStencilOp;
+   }
+
+   fxSetupDDSpanPointers(ctx);
+   fxDDUpdateDDPointers(ctx, ~0);
+}
+
+
+#else
+
+
+/*
+ * Need this to provide at least one external definition.
+ */
+
+extern int gl_fx_dummy_function_dd(void);
+int
+gl_fx_dummy_function_dd(void)
+{
+   return 0;
+}
+
+#endif /* FX */
diff --git a/reactos/lib/mesa32/src/drivers/glide/fxddspan.c b/reactos/lib/mesa32/src/drivers/glide/fxddspan.c
new file mode 100644
index 00000000000..4b9b2123b4d
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/glide/fxddspan.c
@@ -0,0 +1,663 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.0
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/* Authors:
+ *    David Bucciarelli
+ *    Brian Paul
+ *    Daryll Strauss
+ *    Keith Whitwell
+ *    Daniel Borca
+ *    Hiroshi Morii
+ */
+
+
+/* fxdd.c - 3Dfx VooDoo Mesa span and pixel functions */
+
+
+#ifdef HAVE_CONFIG_H
+#include "conf.h"
+#endif
+
+#if defined(FX)
+
+#include "fxdrv.h"
+#include "fxglidew.h"
+#include "swrast/swrast.h"
+
+
+/************************************************************************/
+/*****                    Span functions                            *****/
+/************************************************************************/
+
+#define DBG 0
+
+
+#define LOCAL_VARS							\
+    GLuint pitch = info.strideInBytes;					\
+    GLuint height = fxMesa->height;					\
+    char *buf = (char *)((char *)info.lfbPtr + 0 /* x, y offset */);	\
+    GLuint p;								\
+    (void) buf; (void) p;
+
+#define CLIPPIXEL( _x, _y )	( _x >= minx && _x < maxx &&		\
+				  _y >= miny && _y < maxy )
+
+#define CLIPSPAN( _x, _y, _n, _x1, _n1, _i )				\
+    if ( _y < miny || _y >= maxy ) {					\
+	_n1 = 0, _x1 = x;						\
+    } else {								\
+	_n1 = _n;							\
+	_x1 = _x;							\
+	if ( _x1 < minx ) _i += (minx-_x1), n1 -= (minx-_x1), _x1 = minx;\
+	if ( _x1 + _n1 >= maxx ) n1 -= (_x1 + n1 - maxx);		\
+    }
+
+#define Y_FLIP(_y)		(height - _y - 1)
+
+#define HW_WRITE_LOCK()							\
+    fxMesaContext fxMesa = FX_CONTEXT(ctx);				\
+    GrLfbInfo_t info;							\
+    info.size = sizeof(GrLfbInfo_t);					\
+    if ( grLfbLock( GR_LFB_WRITE_ONLY,					\
+                   fxMesa->currentFB, LFB_MODE,				\
+		   GR_ORIGIN_UPPER_LEFT, FXFALSE, &info ) ) {
+
+#define HW_WRITE_UNLOCK()						\
+	grLfbUnlock( GR_LFB_WRITE_ONLY, fxMesa->currentFB );		\
+    }
+
+#define HW_READ_LOCK()							\
+    fxMesaContext fxMesa = FX_CONTEXT(ctx);				\
+    GrLfbInfo_t info;							\
+    info.size = sizeof(GrLfbInfo_t);					\
+    if ( grLfbLock( GR_LFB_READ_ONLY, fxMesa->currentFB,		\
+                    LFB_MODE, GR_ORIGIN_UPPER_LEFT, FXFALSE, &info ) ) {
+
+#define HW_READ_UNLOCK()						\
+	grLfbUnlock( GR_LFB_READ_ONLY, fxMesa->currentFB );		\
+    }
+
+#define HW_WRITE_CLIPLOOP()						\
+    do {								\
+	int _nc = 1; /* numcliprects */					\
+	/* [dBorca] Hack alert: */					\
+	/* remember, we need to flip the scissor, too */		\
+	/* is it better to do it inside fxDDScissor? */			\
+	while (_nc--) {							\
+	    const int minx = fxMesa->clipMinX;				\
+	    const int maxy = Y_FLIP(fxMesa->clipMinY);			\
+	    const int maxx = fxMesa->clipMaxX;				\
+	    const int miny = Y_FLIP(fxMesa->clipMaxY);
+
+#define HW_READ_CLIPLOOP()						\
+    do {								\
+	int _nc = 1; /* numcliprects */					\
+	/* [dBorca] Hack alert: */					\
+	/* remember, we need to flip the scissor, too */		\
+	/* is it better to do it inside fxDDScissor? */			\
+	while (_nc--) {							\
+	    const int minx = fxMesa->clipMinX;				\
+	    const int maxy = Y_FLIP(fxMesa->clipMinY);			\
+	    const int maxx = fxMesa->clipMaxX;				\
+	    const int miny = Y_FLIP(fxMesa->clipMaxY);
+
+#define HW_ENDCLIPLOOP()						\
+	}								\
+    } while (0)
+
+
+/* 16 bit, ARGB1555 color spanline and pixel functions */
+
+#undef LFB_MODE
+#define LFB_MODE	GR_LFBWRITEMODE_1555
+
+#undef BYTESPERPIXEL
+#define BYTESPERPIXEL 2
+
+#undef INIT_MONO_PIXEL
+#define INIT_MONO_PIXEL(p, color) \
+    p = TDFXPACKCOLOR1555( color[RCOMP], color[GCOMP], color[BCOMP], color[ACOMP] )
+
+#define WRITE_RGBA( _x, _y, r, g, b, a )				\
+    *(GLushort *)(buf + _x*BYTESPERPIXEL + _y*pitch) =			\
+					TDFXPACKCOLOR1555( r, g, b, a )
+
+#define WRITE_PIXEL( _x, _y, p )					\
+    *(GLushort *)(buf + _x*BYTESPERPIXEL + _y*pitch) = p
+
+#define READ_RGBA( rgba, _x, _y )					\
+    do {								\
+	GLushort p = *(GLushort *)(buf + _x*BYTESPERPIXEL + _y*pitch);	\
+	rgba[0] = FX_rgb_scale_5[(p >> 10) & 0x1F];			\
+	rgba[1] = FX_rgb_scale_5[(p >> 5)  & 0x1F];			\
+	rgba[2] = FX_rgb_scale_5[ p        & 0x1F];			\
+	rgba[3] = (p & 0x8000) ? 255 : 0;				\
+    } while (0)
+
+#define TAG(x) tdfx##x##_ARGB1555
+#include "../dri/common/spantmp.h"
+
+
+/* 16 bit, RGB565 color spanline and pixel functions */
+/* [dBorca] Hack alert:
+ * This is wrong. The alpha value is lost, even when we provide
+ * HW alpha (565 w/o depth buffering). To really update alpha buffer,
+ * we would need to do the 565 writings via 8888 colorformat and rely
+ * on the Voodoo to perform color scaling. In which case our 565 span
+ * would look nicer! But this violates FSAA rules...
+ */
+
+#undef LFB_MODE
+#define LFB_MODE	GR_LFBWRITEMODE_565
+
+#undef BYTESPERPIXEL
+#define BYTESPERPIXEL 2
+
+#undef INIT_MONO_PIXEL
+#define INIT_MONO_PIXEL(p, color) \
+    p = TDFXPACKCOLOR565( color[RCOMP], color[GCOMP], color[BCOMP] )
+
+#define WRITE_RGBA( _x, _y, r, g, b, a )				\
+    *(GLushort *)(buf + _x*BYTESPERPIXEL + _y*pitch) =			\
+					TDFXPACKCOLOR565( r, g, b )
+
+#define WRITE_PIXEL( _x, _y, p )					\
+    *(GLushort *)(buf + _x*BYTESPERPIXEL + _y*pitch) = p
+
+#define READ_RGBA( rgba, _x, _y )					\
+    do {								\
+	GLushort p = *(GLushort *)(buf + _x*BYTESPERPIXEL + _y*pitch);	\
+	rgba[0] = FX_rgb_scale_5[(p >> 11) & 0x1F];			\
+	rgba[1] = FX_rgb_scale_6[(p >> 5)  & 0x3F];			\
+	rgba[2] = FX_rgb_scale_5[ p        & 0x1F];			\
+	rgba[3] = 0xff;							\
+    } while (0)
+
+#define TAG(x) tdfx##x##_RGB565
+#include "../dri/common/spantmp.h"
+
+
+/* 32 bit, ARGB8888 color spanline and pixel functions */
+
+#undef LFB_MODE
+#define LFB_MODE	GR_LFBWRITEMODE_8888
+
+#undef BYTESPERPIXEL
+#define BYTESPERPIXEL 4
+
+#undef INIT_MONO_PIXEL
+#define INIT_MONO_PIXEL(p, color) \
+    p = TDFXPACKCOLOR8888( color[RCOMP], color[GCOMP], color[BCOMP], color[ACOMP] )
+
+#define WRITE_RGBA( _x, _y, r, g, b, a )				\
+    *(GLuint *)(buf + _x*BYTESPERPIXEL + _y*pitch) =			\
+					TDFXPACKCOLOR8888( r, g, b, a )
+
+#define WRITE_PIXEL( _x, _y, p )					\
+    *(GLuint *)(buf + _x*BYTESPERPIXEL + _y*pitch) = p
+
+#define READ_RGBA( rgba, _x, _y )					\
+    do {								\
+	GLuint p = *(GLuint *)(buf + _x*BYTESPERPIXEL + _y*pitch);	\
+        rgba[0] = (p >> 16) & 0xff;					\
+        rgba[1] = (p >>  8) & 0xff;					\
+        rgba[2] = (p >>  0) & 0xff;					\
+        rgba[3] = (p >> 24) & 0xff;					\
+    } while (0)
+
+#define TAG(x) tdfx##x##_ARGB8888
+#include "../dri/common/spantmp.h"
+
+
+/************************************************************************/
+/*****                    Depth functions                           *****/
+/************************************************************************/
+
+#define DBG 0
+
+#undef HW_WRITE_LOCK
+#undef HW_WRITE_UNLOCK
+#undef HW_READ_LOCK
+#undef HW_READ_UNLOCK
+
+#define HW_CLIPLOOP HW_WRITE_CLIPLOOP
+
+#define LOCAL_DEPTH_VARS						\
+    GLuint pitch = info.strideInBytes;					\
+    GLuint height = fxMesa->height;					\
+    char *buf = (char *)((char *)info.lfbPtr + 0 /* x, y offset */);	\
+    (void) buf;
+
+#define HW_WRITE_LOCK()							\
+    fxMesaContext fxMesa = FX_CONTEXT(ctx);				\
+    GrLfbInfo_t info;							\
+    info.size = sizeof(GrLfbInfo_t);					\
+    if ( grLfbLock( GR_LFB_WRITE_ONLY,					\
+                   GR_BUFFER_AUXBUFFER, LFB_MODE,			\
+		   GR_ORIGIN_UPPER_LEFT, FXFALSE, &info ) ) {
+
+#define HW_WRITE_UNLOCK()						\
+	grLfbUnlock( GR_LFB_WRITE_ONLY, GR_BUFFER_AUXBUFFER);		\
+    }
+
+#define HW_READ_LOCK()							\
+    fxMesaContext fxMesa = FX_CONTEXT(ctx);				\
+    GrLfbInfo_t info;							\
+    info.size = sizeof(GrLfbInfo_t);					\
+    if ( grLfbLock( GR_LFB_READ_ONLY, GR_BUFFER_AUXBUFFER,		\
+                    LFB_MODE, GR_ORIGIN_UPPER_LEFT, FXFALSE, &info ) ) {
+
+#define HW_READ_UNLOCK()						\
+	grLfbUnlock( GR_LFB_READ_ONLY, GR_BUFFER_AUXBUFFER);		\
+    }
+
+
+/* 16 bit, depth spanline and pixel functions */
+
+#undef LFB_MODE
+#define LFB_MODE	GR_LFBWRITEMODE_ZA16
+
+#undef BYTESPERPIXEL
+#define BYTESPERPIXEL 2
+
+#define WRITE_DEPTH( _x, _y, d )					\
+    *(GLushort *)(buf + _x*BYTESPERPIXEL + _y*pitch) = d
+
+#define READ_DEPTH( d, _x, _y )						\
+    d = *(GLushort *)(buf + _x*BYTESPERPIXEL + _y*pitch)
+
+#define TAG(x) tdfx##x##_Z16
+#include "../dri/common/depthtmp.h"
+
+
+/* 24 bit, depth spanline and pixel functions (for use w/ stencil) */
+/* [dBorca] Hack alert:
+ * This is evil. The incoming Mesa's 24bit depth value
+ * is shifted left 8 bits, to obtain a full 32bit value,
+ * which will be thrown into the framebuffer. We rely on
+ * the fact that Voodoo hardware transforms a 32bit value
+ * into 24bit value automatically and, MOST IMPORTANT, won't
+ * alter the upper 8bits of the value already existing in the
+ * framebuffer (where stencil resides).
+ */
+
+#undef LFB_MODE
+#define LFB_MODE	GR_LFBWRITEMODE_Z32
+
+#undef BYTESPERPIXEL
+#define BYTESPERPIXEL 4
+
+#define WRITE_DEPTH( _x, _y, d )					\
+    *(GLuint *)(buf + _x*BYTESPERPIXEL + _y*pitch) = d << 8
+
+#define READ_DEPTH( d, _x, _y )						\
+    d = (*(GLuint *)(buf + _x*BYTESPERPIXEL + _y*pitch)) & 0xffffff
+
+#define TAG(x) tdfx##x##_Z24
+#include "../dri/common/depthtmp.h"
+
+
+/* 32 bit, depth spanline and pixel functions (for use w/o stencil) */
+/* [dBorca] Hack alert:
+ * This is more evil. We make Mesa run in 32bit depth, but
+ * tha Voodoo HW can only handle 24bit depth. Well, exploiting
+ * the pixel pipeline, we can achieve 24:8 format for greater
+ * precision...
+ * If anyone tells me how to really store 32bit values into the
+ * depth buffer, I'll write the *_Z32 routines. Howver, bear in
+ * mind that means running without stencil!
+ */
+
+/************************************************************************/
+/*****                    Span functions (optimized)                *****/
+/************************************************************************/
+
+/*
+ * Read a span of 15-bit RGB pixels.  Note, we don't worry about cliprects
+ * since OpenGL says obscured pixels have undefined values.
+ */
+static void fxReadRGBASpan_ARGB1555 (const GLcontext * ctx,
+                                     GLuint n,
+                                     GLint x, GLint y,
+                                     GLubyte rgba[][4])
+{
+ fxMesaContext fxMesa = FX_CONTEXT(ctx);
+ GrLfbInfo_t info;
+ info.size = sizeof(GrLfbInfo_t);
+ if (grLfbLock(GR_LFB_READ_ONLY, fxMesa->currentFB,
+               GR_LFBWRITEMODE_ANY, GR_ORIGIN_UPPER_LEFT, FXFALSE, &info)) {
+    const GLint winX = 0;
+    const GLint winY = fxMesa->height - 1;
+    const GLushort *data16 = (const GLushort *)((const GLubyte *)info.lfbPtr +
+	                                        (winY - y) * info.strideInBytes +
+                                                (winX + x) * 2);
+    const GLuint *data32 = (const GLuint *) data16;
+    GLuint i, j;
+    GLuint extraPixel = (n & 1);
+    n -= extraPixel;
+
+    for (i = j = 0; i < n; i += 2, j++) {
+	GLuint pixel = data32[j];
+	rgba[i][0] = FX_rgb_scale_5[(pixel >> 10) & 0x1F];
+	rgba[i][1] = FX_rgb_scale_5[(pixel >> 5)  & 0x1F];
+	rgba[i][2] = FX_rgb_scale_5[ pixel        & 0x1F];
+	rgba[i][3] = (pixel & 0x8000) ? 255 : 0;
+	rgba[i+1][0] = FX_rgb_scale_5[(pixel >> 26) & 0x1F];
+	rgba[i+1][1] = FX_rgb_scale_5[(pixel >> 21) & 0x1F];
+	rgba[i+1][2] = FX_rgb_scale_5[(pixel >> 16) & 0x1F];
+	rgba[i+1][3] = (pixel & 0x80000000) ? 255 : 0;
+    }
+    if (extraPixel) {
+       GLushort pixel = data16[n];
+       rgba[n][0] = FX_rgb_scale_5[(pixel >> 10) & 0x1F];
+       rgba[n][1] = FX_rgb_scale_5[(pixel >> 5)  & 0x1F];
+       rgba[n][2] = FX_rgb_scale_5[ pixel        & 0x1F];
+       rgba[n][3] = (pixel & 0x8000) ? 255 : 0;
+    }
+
+    grLfbUnlock(GR_LFB_READ_ONLY, fxMesa->currentFB);
+ }
+}
+
+/*
+ * Read a span of 16-bit RGB pixels.  Note, we don't worry about cliprects
+ * since OpenGL says obscured pixels have undefined values.
+ */
+static void fxReadRGBASpan_RGB565 (const GLcontext * ctx,
+                                   GLuint n,
+                                   GLint x, GLint y,
+                                   GLubyte rgba[][4])
+{
+ fxMesaContext fxMesa = FX_CONTEXT(ctx);
+ GrLfbInfo_t info;
+ info.size = sizeof(GrLfbInfo_t);
+ if (grLfbLock(GR_LFB_READ_ONLY, fxMesa->currentFB,
+               GR_LFBWRITEMODE_ANY, GR_ORIGIN_UPPER_LEFT, FXFALSE, &info)) {
+    const GLint winX = 0;
+    const GLint winY = fxMesa->height - 1;
+    const GLushort *data16 = (const GLushort *)((const GLubyte *)info.lfbPtr +
+	                                        (winY - y) * info.strideInBytes +
+                                                (winX + x) * 2);
+    const GLuint *data32 = (const GLuint *) data16;
+    GLuint i, j;
+    GLuint extraPixel = (n & 1);
+    n -= extraPixel;
+
+    for (i = j = 0; i < n; i += 2, j++) {
+        GLuint pixel = data32[j];
+	rgba[i][0] = FX_rgb_scale_5[(pixel >> 11) & 0x1F];
+	rgba[i][1] = FX_rgb_scale_6[(pixel >> 5)  & 0x3F];
+	rgba[i][2] = FX_rgb_scale_5[ pixel        & 0x1F];
+	rgba[i][3] = 255;
+	rgba[i+1][0] = FX_rgb_scale_5[(pixel >> 27) & 0x1F];
+	rgba[i+1][1] = FX_rgb_scale_6[(pixel >> 21) & 0x3F];
+	rgba[i+1][2] = FX_rgb_scale_5[(pixel >> 16) & 0x1F];
+	rgba[i+1][3] = 255;
+    }
+    if (extraPixel) {
+       GLushort pixel = data16[n];
+       rgba[n][0] = FX_rgb_scale_5[(pixel >> 11) & 0x1F];
+       rgba[n][1] = FX_rgb_scale_6[(pixel >> 5)  & 0x3F];
+       rgba[n][2] = FX_rgb_scale_5[ pixel        & 0x1F];
+       rgba[n][3] = 255;
+    }
+
+    grLfbUnlock(GR_LFB_READ_ONLY, fxMesa->currentFB);
+ }
+}
+
+/*
+ * Read a span of 32-bit RGB pixels.  Note, we don't worry about cliprects
+ * since OpenGL says obscured pixels have undefined values.
+ */
+static void fxReadRGBASpan_ARGB8888 (const GLcontext * ctx,
+                                     GLuint n,
+                                     GLint x, GLint y,
+                                     GLubyte rgba[][4])
+{
+ fxMesaContext fxMesa = FX_CONTEXT(ctx);
+ GLuint i;
+ grLfbReadRegion(fxMesa->currentFB, x, fxMesa->height - 1 - y, n, 1, n * 4, rgba);
+ for (i = 0; i < n; i++) {
+     GLubyte c = rgba[i][0];
+     rgba[i][0] = rgba[i][2];
+     rgba[i][2] = c;
+ }
+}
+
+
+/************************************************************************/
+/*****                    Depth functions (optimized)               *****/
+/************************************************************************/
+
+void
+fxReadDepthSpan_Z16(GLcontext * ctx,
+		    GLuint n, GLint x, GLint y, GLdepth depth[])
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   GLint bottom = fxMesa->height - 1;
+   GLushort depth16[MAX_WIDTH];
+   GLuint i;
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "fxReadDepthSpan_Z16(...)\n");
+   }
+
+   grLfbReadRegion(GR_BUFFER_AUXBUFFER, x, bottom - y, n, 1, 0, depth16);
+   for (i = 0; i < n; i++) {
+      depth[i] = depth16[i];
+   }
+}
+
+
+void
+fxReadDepthSpan_Z24(GLcontext * ctx,
+		    GLuint n, GLint x, GLint y, GLdepth depth[])
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   GLint bottom = fxMesa->height - 1;
+   GLuint i;
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "fxReadDepthSpan_Z24(...)\n");
+   }
+
+   grLfbReadRegion(GR_BUFFER_AUXBUFFER, x, bottom - y, n, 1, 0, depth);
+   for (i = 0; i < n; i++) {
+      depth[i] &= 0xffffff;
+   }
+}
+
+
+/************************************************************************/
+/*****                    Stencil functions (optimized)             *****/
+/************************************************************************/
+
+void fxWriteStencilSpan (GLcontext *ctx, GLuint n, GLint x, GLint y,
+                         const GLstencil stencil[], const GLubyte mask[])
+{
+ /*
+  * XXX todo
+  */
+}
+
+void
+fxReadStencilSpan(GLcontext * ctx,
+		  GLuint n, GLint x, GLint y, GLstencil stencil[])
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   GLint bottom = fxMesa->height - 1;
+   GLuint zs32[MAX_WIDTH];
+   GLuint i;
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "fxReadStencilSpan(...)\n");
+   }
+
+   grLfbReadRegion(GR_BUFFER_AUXBUFFER, x, bottom - y, n, 1, 0, zs32);
+   for (i = 0; i < n; i++) {
+      stencil[i] = zs32[i] >> 24;
+   }
+}
+
+void fxWriteStencilPixels (GLcontext *ctx, GLuint n,
+                           const GLint x[], const GLint y[],
+                           const GLstencil stencil[],
+                           const GLubyte mask[])
+{
+ /*
+  * XXX todo
+  */
+}
+
+void fxReadStencilPixels (GLcontext *ctx, GLuint n,
+                          const GLint x[], const GLint y[],
+                          GLstencil stencil[])
+{
+ /*
+  * XXX todo
+  */
+}
+
+
+
+/*
+ * This function is called to specify which buffer to read and write
+ * for software rasterization (swrast) fallbacks.  This doesn't necessarily
+ * correspond to glDrawBuffer() or glReadBuffer() calls.
+ */
+static void
+fxDDSetBuffer(GLcontext * ctx, GLframebuffer * buffer, GLuint bufferBit)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   (void) buffer;
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "fxDDSetBuffer(%x)\n", (int)bufferBit);
+   }
+
+   if (bufferBit == FRONT_LEFT_BIT) {
+      fxMesa->currentFB = GR_BUFFER_FRONTBUFFER;
+      grRenderBuffer(fxMesa->currentFB);
+   }
+   else if (bufferBit == BACK_LEFT_BIT) {
+      fxMesa->currentFB = GR_BUFFER_BACKBUFFER;
+      grRenderBuffer(fxMesa->currentFB);
+   }
+}
+
+
+/************************************************************************/
+
+
+
+void
+fxSetupDDSpanPointers(GLcontext * ctx)
+{
+   struct swrast_device_driver *swdd = _swrast_GetDeviceDriverReference( ctx );
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+
+   swdd->SetBuffer = fxDDSetBuffer;
+
+   switch (fxMesa->colDepth) {
+          case 15:
+               swdd->WriteRGBASpan = tdfxWriteRGBASpan_ARGB1555;
+               swdd->WriteRGBSpan = tdfxWriteRGBSpan_ARGB1555;
+               swdd->WriteRGBAPixels = tdfxWriteRGBAPixels_ARGB1555;
+               swdd->WriteMonoRGBASpan = tdfxWriteMonoRGBASpan_ARGB1555;
+               swdd->WriteMonoRGBAPixels = tdfxWriteMonoRGBAPixels_ARGB1555;
+               swdd->ReadRGBASpan = /*td*/fxReadRGBASpan_ARGB1555;
+               swdd->ReadRGBAPixels = tdfxReadRGBAPixels_ARGB1555;
+
+               swdd->WriteDepthSpan = tdfxWriteDepthSpan_Z16;
+               swdd->WriteDepthPixels = tdfxWriteDepthPixels_Z16;
+               swdd->ReadDepthSpan = /*td*/fxReadDepthSpan_Z16;
+               swdd->ReadDepthPixels = tdfxReadDepthPixels_Z16;
+               break;
+          case 16:
+               swdd->WriteRGBASpan = tdfxWriteRGBASpan_RGB565;
+               swdd->WriteRGBSpan = tdfxWriteRGBSpan_RGB565;
+               swdd->WriteRGBAPixels = tdfxWriteRGBAPixels_RGB565;
+               swdd->WriteMonoRGBASpan = tdfxWriteMonoRGBASpan_RGB565;
+               swdd->WriteMonoRGBAPixels = tdfxWriteMonoRGBAPixels_RGB565;
+               swdd->ReadRGBASpan = /*td*/fxReadRGBASpan_RGB565;
+               swdd->ReadRGBAPixels = tdfxReadRGBAPixels_RGB565;
+
+               swdd->WriteDepthSpan = tdfxWriteDepthSpan_Z16;
+               swdd->WriteDepthPixels = tdfxWriteDepthPixels_Z16;
+               swdd->ReadDepthSpan = /*td*/fxReadDepthSpan_Z16;
+               swdd->ReadDepthPixels = tdfxReadDepthPixels_Z16;
+               break;
+          case 32:
+               swdd->WriteRGBASpan = tdfxWriteRGBASpan_ARGB8888;
+               swdd->WriteRGBSpan = tdfxWriteRGBSpan_ARGB8888;
+               swdd->WriteRGBAPixels = tdfxWriteRGBAPixels_ARGB8888;
+               swdd->WriteMonoRGBASpan = tdfxWriteMonoRGBASpan_ARGB8888;
+               swdd->WriteMonoRGBAPixels = tdfxWriteMonoRGBAPixels_ARGB8888;
+               swdd->ReadRGBASpan = /*td*/fxReadRGBASpan_ARGB8888;
+               swdd->ReadRGBAPixels = tdfxReadRGBAPixels_ARGB8888;
+
+               swdd->WriteDepthSpan = tdfxWriteDepthSpan_Z24;
+               swdd->WriteDepthPixels = tdfxWriteDepthPixels_Z24;
+               swdd->ReadDepthSpan = /*td*/fxReadDepthSpan_Z24;
+               swdd->ReadDepthPixels = tdfxReadDepthPixels_Z24;
+               break;
+   }
+
+   if (fxMesa->haveHwStencil) {
+      swdd->WriteStencilSpan = fxWriteStencilSpan;
+      swdd->ReadStencilSpan = fxReadStencilSpan;
+      swdd->WriteStencilPixels = fxWriteStencilPixels;
+      swdd->ReadStencilPixels = fxReadStencilPixels;
+   }
+#if 0
+   swdd->WriteCI8Span		= NULL;
+   swdd->WriteCI32Span		= NULL;
+   swdd->WriteMonoCISpan	= NULL;
+   swdd->WriteCI32Pixels	= NULL;
+   swdd->WriteMonoCIPixels	= NULL;
+   swdd->ReadCI32Span		= NULL;
+   swdd->ReadCI32Pixels		= NULL;
+
+   swdd->SpanRenderStart        = tdfxSpanRenderStart; /* BEGIN_BOARD_LOCK */
+   swdd->SpanRenderFinish       = tdfxSpanRenderFinish; /* END_BOARD_LOCK */
+#endif
+}
+
+
+#else
+
+
+/*
+ * Need this to provide at least one external definition.
+ */
+
+extern int gl_fx_dummy_function_span(void);
+int
+gl_fx_dummy_function_span(void)
+{
+   return 0;
+}
+
+#endif /* FX */
diff --git a/reactos/lib/mesa32/src/drivers/glide/fxddtex.c b/reactos/lib/mesa32/src/drivers/glide/fxddtex.c
new file mode 100644
index 00000000000..eaca8401b8b
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/glide/fxddtex.c
@@ -0,0 +1,1684 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.0
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/* Authors:
+ *    David Bucciarelli
+ *    Brian Paul
+ *    Daryll Strauss
+ *    Keith Whitwell
+ *    Daniel Borca
+ *    Hiroshi Morii
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include "conf.h"
+#endif
+
+#if defined(FX)
+
+#include "fxdrv.h"
+#include "enums.h"
+#include "image.h"
+#include "teximage.h"
+#include "texformat.h"
+#include "texobj.h"
+#include "texstore.h"
+#include "texutil.h"
+
+
+void
+fxPrintTextureData(tfxTexInfo * ti)
+{
+   fprintf(stderr, "Texture Data:\n");
+   if (ti->tObj) {
+      fprintf(stderr, "\tName: %d\n", ti->tObj->Name);
+      fprintf(stderr, "\tBaseLevel: %d\n", ti->tObj->BaseLevel);
+      fprintf(stderr, "\tSize: %d x %d\n",
+	      ti->tObj->Image[ti->tObj->BaseLevel]->Width,
+	      ti->tObj->Image[ti->tObj->BaseLevel]->Height);
+   }
+   else
+      fprintf(stderr, "\tName: UNNAMED\n");
+   fprintf(stderr, "\tLast used: %d\n", ti->lastTimeUsed);
+   fprintf(stderr, "\tTMU: %ld\n", ti->whichTMU);
+   fprintf(stderr, "\t%s\n", (ti->isInTM) ? "In TMU" : "Not in TMU");
+   if (ti->tm[0])
+      fprintf(stderr, "\tMem0: %x-%x\n", (unsigned) ti->tm[0]->startAddr,
+	      (unsigned) ti->tm[0]->endAddr);
+   if (ti->tm[1])
+      fprintf(stderr, "\tMem1: %x-%x\n", (unsigned) ti->tm[1]->startAddr,
+	      (unsigned) ti->tm[1]->endAddr);
+   fprintf(stderr, "\tMipmaps: %d-%d\n", ti->minLevel, ti->maxLevel);
+   fprintf(stderr, "\tFilters: min %d max %d\n",
+	   (int) ti->minFilt, (int) ti->maxFilt);
+   fprintf(stderr, "\tClamps: s %d t %d\n", (int) ti->sClamp,
+	   (int) ti->tClamp);
+   fprintf(stderr, "\tScales: s %f t %f\n", ti->sScale, ti->tScale);
+   fprintf(stderr, "\t%s\n",
+	   (ti->fixedPalette) ? "Fixed palette" : "Non fixed palette");
+   fprintf(stderr, "\t%s\n", (ti->validated) ? "Validated" : "Not validated");
+}
+
+
+/************************************************************************/
+/*************************** Texture Mapping ****************************/
+/************************************************************************/
+
+static void
+fxTexInvalidate(GLcontext * ctx, struct gl_texture_object *tObj)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   tfxTexInfo *ti;
+
+   ti = fxTMGetTexInfo(tObj);
+   if (ti->isInTM)
+      fxTMMoveOutTM(fxMesa, tObj);	/* TO DO: SLOW but easy to write */
+
+   ti->validated = GL_FALSE;
+   fxMesa->new_state |= FX_NEW_TEXTURING;
+}
+
+static tfxTexInfo *
+fxAllocTexObjData(fxMesaContext fxMesa)
+{
+   tfxTexInfo *ti;
+
+   if (!(ti = CALLOC(sizeof(tfxTexInfo)))) {
+      fprintf(stderr, "fxAllocTexObjData: ERROR: out of memory !\n");
+      fxCloseHardware();
+      exit(-1);
+   }
+
+   ti->validated = GL_FALSE;
+   ti->isInTM = GL_FALSE;
+
+   ti->whichTMU = FX_TMU_NONE;
+
+   ti->tm[FX_TMU0] = NULL;
+   ti->tm[FX_TMU1] = NULL;
+
+   ti->minFilt = GR_TEXTUREFILTER_POINT_SAMPLED;
+   ti->maxFilt = GR_TEXTUREFILTER_BILINEAR;
+
+   ti->sClamp = GR_TEXTURECLAMP_WRAP;
+   ti->tClamp = GR_TEXTURECLAMP_WRAP;
+
+   ti->mmMode = GR_MIPMAP_NEAREST;
+   ti->LODblend = FXFALSE;
+
+   return ti;
+}
+
+void
+fxDDTexBind(GLcontext * ctx, GLenum target, struct gl_texture_object *tObj)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   tfxTexInfo *ti;
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "fxDDTexBind(%d, %x)\n", tObj->Name, (GLuint)tObj->DriverData);
+   }
+
+   if (target != GL_TEXTURE_2D)
+      return;
+
+   if (!tObj->DriverData) {
+      tObj->DriverData = fxAllocTexObjData(fxMesa);
+   }
+
+   ti = fxTMGetTexInfo(tObj);
+
+   fxMesa->texBindNumber++;
+   ti->lastTimeUsed = fxMesa->texBindNumber;
+
+   fxMesa->new_state |= FX_NEW_TEXTURING;
+}
+
+void
+fxDDTexEnv(GLcontext * ctx, GLenum target, GLenum pname,
+	   const GLfloat * param)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      if (param)
+	 fprintf(stderr, "fxDDTexEnv(%x, %x)\n", pname, (GLint) (*param));
+      else
+	 fprintf(stderr, "fxDDTexEnv(%x)\n", pname);
+   }
+
+   /* apply any lod biasing right now */
+   if (pname == GL_TEXTURE_LOD_BIAS_EXT) {
+      grTexLodBiasValue(GR_TMU0, *param);
+
+      if (fxMesa->haveTwoTMUs) {
+	 grTexLodBiasValue(GR_TMU1, *param);
+      }
+
+   }
+
+   fxMesa->new_state |= FX_NEW_TEXTURING;
+}
+
+void
+fxDDTexParam(GLcontext * ctx, GLenum target, struct gl_texture_object *tObj,
+	     GLenum pname, const GLfloat * params)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   GLenum param = (GLenum) (GLint) params[0];
+   tfxTexInfo *ti;
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "fxDDTexParam(%d, %x, %s, %s)\n",
+                      tObj->Name, (GLuint) tObj->DriverData,
+                      _mesa_lookup_enum_by_nr(pname),
+                      _mesa_lookup_enum_by_nr(param));
+   }
+
+   if (target != GL_TEXTURE_2D)
+      return;
+
+   if (!tObj->DriverData)
+      tObj->DriverData = fxAllocTexObjData(fxMesa);
+
+   ti = fxTMGetTexInfo(tObj);
+
+   switch (pname) {
+
+   case GL_TEXTURE_MIN_FILTER:
+      switch (param) {
+      case GL_NEAREST:
+	 ti->mmMode = GR_MIPMAP_DISABLE;
+	 ti->minFilt = GR_TEXTUREFILTER_POINT_SAMPLED;
+	 ti->LODblend = FXFALSE;
+	 break;
+      case GL_LINEAR:
+	 ti->mmMode = GR_MIPMAP_DISABLE;
+	 ti->minFilt = GR_TEXTUREFILTER_BILINEAR;
+	 ti->LODblend = FXFALSE;
+	 break;
+      case GL_NEAREST_MIPMAP_LINEAR:
+         /* [koolsmoky]
+          * trilinear is bugged! mipmap blending produce
+          * incorrect filtered colors for the smallest mipmap levels.
+          * [dBorca]
+          * currently Napalm can't do single-pass trilinear,
+          * because the way its combiners are set. So we fall back
+          * to GL_NEAREST_MIPMAP_NEAREST. We'll let true trilinear
+          * enabled for V2, V3. If user shoots foot, not our problem!
+          */
+         if (!fxMesa->HaveCmbExt) {
+	    if (fxMesa->haveTwoTMUs) {
+	       ti->mmMode = GR_MIPMAP_NEAREST;
+	       ti->LODblend = FXTRUE;
+            } else {
+	       ti->mmMode = GR_MIPMAP_NEAREST_DITHER;
+	       ti->LODblend = FXFALSE;
+            }
+	    ti->minFilt = GR_TEXTUREFILTER_POINT_SAMPLED;
+	    break;
+         }
+      case GL_NEAREST_MIPMAP_NEAREST:
+	 ti->mmMode = GR_MIPMAP_NEAREST;
+	 ti->minFilt = GR_TEXTUREFILTER_POINT_SAMPLED;
+	 ti->LODblend = FXFALSE;
+	 break;
+      case GL_LINEAR_MIPMAP_LINEAR:
+         /* [koolsmoky]
+          * trilinear is bugged! mipmap blending produce
+          * incorrect filtered colors for the smallest mipmap levels.
+          * [dBorca]
+          * currently Napalm can't do single-pass trilinear,
+          * because the way its combiners are set. So we fall back
+          * to GL_LINEAR_MIPMAP_NEAREST. We'll let true trilinear
+          * enabled for V2, V3. If user shoots foot, not our problem!
+          */
+         if (!fxMesa->HaveCmbExt) {
+            if (fxMesa->haveTwoTMUs) {
+               ti->mmMode = GR_MIPMAP_NEAREST;
+               ti->LODblend = FXTRUE;
+            } else {
+               ti->mmMode = GR_MIPMAP_NEAREST_DITHER;
+               ti->LODblend = FXFALSE;
+            }
+            ti->minFilt = GR_TEXTUREFILTER_BILINEAR;
+            break;
+         }
+      case GL_LINEAR_MIPMAP_NEAREST:
+	 ti->mmMode = GR_MIPMAP_NEAREST;
+	 ti->minFilt = GR_TEXTUREFILTER_BILINEAR;
+	 ti->LODblend = FXFALSE;
+	 break;
+      default:
+	 break;
+      }
+      fxTexInvalidate(ctx, tObj);
+      break;
+
+   case GL_TEXTURE_MAG_FILTER:
+      switch (param) {
+      case GL_NEAREST:
+	 ti->maxFilt = GR_TEXTUREFILTER_POINT_SAMPLED;
+	 break;
+      case GL_LINEAR:
+	 ti->maxFilt = GR_TEXTUREFILTER_BILINEAR;
+	 break;
+      default:
+	 break;
+      }
+      fxTexInvalidate(ctx, tObj);
+      break;
+
+   case GL_TEXTURE_WRAP_S:
+      switch (param) {
+      case GL_MIRRORED_REPEAT:
+         ti->sClamp = GR_TEXTURECLAMP_MIRROR_EXT;
+         break;
+      case GL_CLAMP_TO_EDGE: /* CLAMP discarding border */
+      case GL_CLAMP:
+	 ti->sClamp = GR_TEXTURECLAMP_CLAMP;
+	 break;
+      case GL_REPEAT:
+	 ti->sClamp = GR_TEXTURECLAMP_WRAP;
+	 break;
+      default:
+	 break;
+      }
+      fxMesa->new_state |= FX_NEW_TEXTURING;
+      break;
+
+   case GL_TEXTURE_WRAP_T:
+      switch (param) {
+      case GL_MIRRORED_REPEAT:
+         ti->tClamp = GR_TEXTURECLAMP_MIRROR_EXT;
+         break;
+      case GL_CLAMP_TO_EDGE: /* CLAMP discarding border */
+      case GL_CLAMP:
+	 ti->tClamp = GR_TEXTURECLAMP_CLAMP;
+	 break;
+      case GL_REPEAT:
+	 ti->tClamp = GR_TEXTURECLAMP_WRAP;
+	 break;
+      default:
+	 break;
+      }
+      fxMesa->new_state |= FX_NEW_TEXTURING;
+      break;
+
+   case GL_TEXTURE_BORDER_COLOR:
+      /* TO DO */
+      break;
+
+   case GL_TEXTURE_MIN_LOD:
+      /* TO DO */
+      break;
+   case GL_TEXTURE_MAX_LOD:
+      /* TO DO */
+      break;
+   case GL_TEXTURE_BASE_LEVEL:
+      fxTexInvalidate(ctx, tObj);
+      break;
+   case GL_TEXTURE_MAX_LEVEL:
+      fxTexInvalidate(ctx, tObj);
+      break;
+
+   default:
+      break;
+   }
+}
+
+void
+fxDDTexDel(GLcontext * ctx, struct gl_texture_object *tObj)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   tfxTexInfo *ti = fxTMGetTexInfo(tObj);
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "fxDDTexDel(%d, %p)\n", tObj->Name, (void *) ti);
+   }
+
+   if (!ti)
+      return;
+
+   fxTMFreeTexture(fxMesa, tObj);
+
+   FREE(ti);
+   tObj->DriverData = NULL;
+
+   /* Free mipmap images and the texture object itself */
+   _mesa_delete_texture_object(ctx, tObj);
+}
+
+/*
+ * Return true if texture is resident, false otherwise.
+ */
+GLboolean
+fxDDIsTextureResident(GLcontext *ctx, struct gl_texture_object *tObj)
+{
+ tfxTexInfo *ti = fxTMGetTexInfo(tObj);
+ return (ti && ti->isInTM);
+}
+
+
+
+/*
+ * Convert a gl_color_table texture palette to Glide's format.
+ */
+static GrTexTable_t
+convertPalette(const fxMesaContext fxMesa, FxU32 data[256], const struct gl_color_table *table)
+{
+   const GLubyte *tableUB = (const GLubyte *) table->Table;
+   GLint width = table->Size;
+   FxU32 r, g, b, a;
+   GLint i;
+
+   ASSERT(!table->FloatTable);
+
+   switch (table->Format) {
+   case GL_INTENSITY:
+      for (i = 0; i < width; i++) {
+	 r = tableUB[i];
+	 g = tableUB[i];
+	 b = tableUB[i];
+	 a = tableUB[i];
+	 data[i] = (a << 24) | (r << 16) | (g << 8) | b;
+      }
+      return fxMesa->HavePalExt ? GR_TEXTABLE_PALETTE_6666_EXT : GR_TEXTABLE_PALETTE;
+   case GL_LUMINANCE:
+      for (i = 0; i < width; i++) {
+	 r = tableUB[i];
+	 g = tableUB[i];
+	 b = tableUB[i];
+	 a = 255;
+	 data[i] = (a << 24) | (r << 16) | (g << 8) | b;
+      }
+      return GR_TEXTABLE_PALETTE;
+   case GL_ALPHA:
+      for (i = 0; i < width; i++) {
+	 r = g = b = 255;
+	 a = tableUB[i];
+	 data[i] = (a << 24) | (r << 16) | (g << 8) | b;
+      }
+      return fxMesa->HavePalExt ? GR_TEXTABLE_PALETTE_6666_EXT : GR_TEXTABLE_PALETTE;
+   case GL_LUMINANCE_ALPHA:
+      for (i = 0; i < width; i++) {
+	 r = g = b = tableUB[i * 2 + 0];
+	 a = tableUB[i * 2 + 1];
+	 data[i] = (a << 24) | (r << 16) | (g << 8) | b;
+      }
+      return fxMesa->HavePalExt ? GR_TEXTABLE_PALETTE_6666_EXT : GR_TEXTABLE_PALETTE;
+   default:
+   case GL_RGB:
+      for (i = 0; i < width; i++) {
+	 r = tableUB[i * 3 + 0];
+	 g = tableUB[i * 3 + 1];
+	 b = tableUB[i * 3 + 2];
+	 a = 255;
+	 data[i] = (a << 24) | (r << 16) | (g << 8) | b;
+      }
+      return GR_TEXTABLE_PALETTE;
+   case GL_RGBA:
+      for (i = 0; i < width; i++) {
+	 r = tableUB[i * 4 + 0];
+	 g = tableUB[i * 4 + 1];
+	 b = tableUB[i * 4 + 2];
+	 a = tableUB[i * 4 + 3];
+	 data[i] = (a << 24) | (r << 16) | (g << 8) | b;
+      }
+      return fxMesa->HavePalExt ? GR_TEXTABLE_PALETTE_6666_EXT : GR_TEXTABLE_PALETTE;
+   }
+}
+
+
+void
+fxDDTexPalette(GLcontext * ctx, struct gl_texture_object *tObj)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+
+   if (tObj) {
+      /* per-texture palette */
+      tfxTexInfo *ti;
+      if (TDFX_DEBUG & VERBOSE_DRIVER) {
+	 fprintf(stderr, "fxDDTexPalette(%d, %x)\n",
+		 tObj->Name, (GLuint) tObj->DriverData);
+      }
+      if (!tObj->DriverData)
+	 tObj->DriverData = fxAllocTexObjData(fxMesa);
+      ti = fxTMGetTexInfo(tObj);
+      ti->paltype = convertPalette(fxMesa, ti->palette.data, &tObj->Palette);
+      fxTexInvalidate(ctx, tObj);
+   }
+   else {
+      /* global texture palette */
+      if (TDFX_DEBUG & VERBOSE_DRIVER) {
+	 fprintf(stderr, "fxDDTexPalette(global)\n");
+      }
+      fxMesa->glbPalType = convertPalette(fxMesa, fxMesa->glbPalette.data, &ctx->Texture.Palette);
+      fxMesa->new_state |= FX_NEW_TEXTURING;
+
+      grTexDownloadTable(fxMesa->glbPalType, &(fxMesa->glbPalette));
+   }
+}
+
+
+void
+fxDDTexUseGlbPalette(GLcontext * ctx, GLboolean state)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "fxDDTexUseGlbPalette(%d)\n", state);
+   }
+
+   if (state) {
+      fxMesa->haveGlobalPaletteTexture = 1;
+   }
+   else {
+      fxMesa->haveGlobalPaletteTexture = 0;
+
+      if ((ctx->Texture.Unit[0]._Current == ctx->Texture.Unit[0].Current2D) &&
+	  (ctx->Texture.Unit[0]._Current != NULL)) {
+	 struct gl_texture_object *tObj = ctx->Texture.Unit[0]._Current;
+
+	 if (!tObj->DriverData)
+	    tObj->DriverData = fxAllocTexObjData(fxMesa);
+
+	 fxTexInvalidate(ctx, tObj);
+      }
+   }
+}
+
+
+static int
+logbase2(int n)
+{
+   GLint i = 1;
+   GLint log2 = 0;
+
+   if (n < 0) {
+      return -1;
+   }
+
+   while (n > i) {
+      i *= 2;
+      log2++;
+   }
+   if (i != n) {
+      return -1;
+   }
+   else {
+      return log2;
+   }
+}
+
+
+/* fxTexGetInfo
+ * w, h     - source texture width and height
+ * lodlevel - Glide lod level token for the larger texture dimension
+ * ar       - Glide aspect ratio token
+ * sscale   - S scale factor used during triangle setup
+ * tscale   - T scale factor used during triangle setup
+ * wscale   - OpenGL -> Glide image width scale factor
+ * hscale   - OpenGL -> Glide image height scale factor
+ */
+int
+fxTexGetInfo(int w, int h, GrLOD_t * lodlevel, GrAspectRatio_t * ar,
+	     float *sscale, float *tscale,
+	     int *wscale, int *hscale)
+{
+   int logw, logh, ws, hs;
+   GrLOD_t l;
+   GrAspectRatio_t aspectratio;
+   float s, t;
+
+   logw = logbase2(w);
+   logh = logbase2(h);
+
+   l = MAX2(logw, logh);
+   aspectratio = logw - logh;
+   ws = hs = 1;
+   s = t = 256.0f;
+
+   /* hardware only allows a maximum aspect ratio of 8x1, so handle
+    * |aspectratio| > 3 by scaling the image and using an 8x1 aspect
+    * ratio
+    */
+   switch (aspectratio) {
+   case 0:
+      break;
+   case 1:
+      t = 128.0f;
+      break;
+   case 2:
+      t = 64.0f;
+      break;
+   case 3:
+      t = 32.0f;
+      break;
+   case -1:
+      s = 128.0f;
+      break;
+   case -2:
+      s = 64.0f;
+      break;
+   case -3:
+      s = 32.0f;
+      break;
+   default:
+      if (aspectratio > 3) {
+         t = 32.0f;
+         hs = 1 << (aspectratio - 3);
+         aspectratio = GR_ASPECT_LOG2_8x1;
+      } else /*if (aspectratio < -3)*/ {
+         s = 32.0f;
+         ws = 1 << (-aspectratio - 3);
+         aspectratio = GR_ASPECT_LOG2_1x8;
+      }
+   }
+
+   if (lodlevel)
+      (*lodlevel) = l;
+
+   if (ar)
+      (*ar) = aspectratio;
+
+   if (sscale)
+      (*sscale) = s;
+
+   if (tscale)
+      (*tscale) = t;
+
+   if (wscale)
+      (*wscale) = ws;
+
+   if (hscale)
+      (*hscale) = hs;
+
+
+   return 1;
+}
+
+static GLboolean
+fxIsTexSupported(GLenum target, GLint internalFormat,
+		 const struct gl_texture_image *image)
+{
+   if (target != GL_TEXTURE_2D)
+      return GL_FALSE;
+
+#if 0
+   if (!fxTexGetInfo(image->Width, image->Height, NULL, NULL, NULL, NULL, NULL, NULL))
+       return GL_FALSE;
+#endif
+
+   if (image->Border > 0)
+      return GL_FALSE;
+
+   return GL_TRUE;
+}
+
+
+/**********************************************************************/
+/**** NEW TEXTURE IMAGE FUNCTIONS                                  ****/
+/**********************************************************************/
+
+/* Texel-fetch functions for software texturing and glGetTexImage().
+ * We should have been able to use some "standard" fetch functions (which
+ * may get defined in texutil.c) but we have to account for scaled texture
+ * images on tdfx hardware (the 8:1 aspect ratio limit).
+ * Hence, we need special functions here.
+ *
+ * [dBorca]
+ * this better be right, if we will advertise GL_SGIS_generate_mipmap!
+ */
+
+static void
+fetch_intensity8(const struct gl_texture_image *texImage,
+		 GLint i, GLint j, GLint k, GLvoid * texelOut)
+{
+   GLchan *rgba = (GLchan *) texelOut;
+   const tfxMipMapLevel *mml = FX_MIPMAP_DATA(texImage);
+   const GLubyte *texel;
+
+   i = i * mml->wScale;
+   j = j * mml->hScale;
+
+   texel = ((GLubyte *) texImage->Data) + j * mml->width + i;
+   rgba[RCOMP] = *texel;
+   rgba[GCOMP] = *texel;
+   rgba[BCOMP] = *texel;
+   rgba[ACOMP] = *texel;
+}
+
+
+static void
+fetch_luminance8(const struct gl_texture_image *texImage,
+		 GLint i, GLint j, GLint k, GLvoid * texelOut)
+{
+   GLchan *rgba = (GLchan *) texelOut;
+   const tfxMipMapLevel *mml = FX_MIPMAP_DATA(texImage);
+   const GLubyte *texel;
+
+   i = i * mml->wScale;
+   j = j * mml->hScale;
+
+   texel = ((GLubyte *) texImage->Data) + j * mml->width + i;
+   rgba[RCOMP] = *texel;
+   rgba[GCOMP] = *texel;
+   rgba[BCOMP] = *texel;
+   rgba[ACOMP] = 255;
+}
+
+
+static void
+fetch_alpha8(const struct gl_texture_image *texImage,
+	     GLint i, GLint j, GLint k, GLvoid * texelOut)
+{
+   GLchan *rgba = (GLchan *) texelOut;
+   const tfxMipMapLevel *mml = FX_MIPMAP_DATA(texImage);
+   const GLubyte *texel;
+
+   i = i * mml->wScale;
+   j = j * mml->hScale;
+
+   texel = ((GLubyte *) texImage->Data) + j * mml->width + i;
+   rgba[RCOMP] = 255;
+   rgba[GCOMP] = 255;
+   rgba[BCOMP] = 255;
+   rgba[ACOMP] = *texel;
+}
+
+
+static void
+fetch_index8(const struct gl_texture_image *texImage,
+	     GLint i, GLint j, GLint k, GLvoid * texelOut)
+{
+   GLchan *indexOut = (GLchan *) texelOut;
+   const tfxMipMapLevel *mml = FX_MIPMAP_DATA(texImage);
+   const GLubyte *texel;
+
+   i = i * mml->wScale;
+   j = j * mml->hScale;
+
+   texel = ((GLubyte *) texImage->Data) + j * mml->width + i;
+   *indexOut = *texel;
+}
+
+
+static void
+fetch_luminance8_alpha8(const struct gl_texture_image *texImage,
+			GLint i, GLint j, GLint k, GLvoid * texelOut)
+{
+   GLchan *rgba = (GLchan *) texelOut;
+   const tfxMipMapLevel *mml = FX_MIPMAP_DATA(texImage);
+   const GLubyte *texel;
+
+   i = i * mml->wScale;
+   j = j * mml->hScale;
+
+   texel = ((GLubyte *) texImage->Data) + (j * mml->width + i) * 2;
+   rgba[RCOMP] = texel[0];
+   rgba[GCOMP] = texel[0];
+   rgba[BCOMP] = texel[0];
+   rgba[ACOMP] = texel[1];
+}
+
+
+static void
+fetch_r5g6b5(const struct gl_texture_image *texImage,
+	     GLint i, GLint j, GLint k, GLvoid * texelOut)
+{
+   GLchan *rgba = (GLchan *) texelOut;
+   const tfxMipMapLevel *mml = FX_MIPMAP_DATA(texImage);
+   const GLushort *texel;
+
+   i = i * mml->wScale;
+   j = j * mml->hScale;
+
+   texel = ((GLushort *) texImage->Data) + j * mml->width + i;
+   rgba[RCOMP] = FX_rgb_scale_5[(*texel >> 11) & 0x1F];
+   rgba[GCOMP] = FX_rgb_scale_6[(*texel >>  5) & 0x3F];
+   rgba[BCOMP] = FX_rgb_scale_5[ *texel        & 0x1F];
+   rgba[ACOMP] = 255;
+}
+
+
+static void
+fetch_r4g4b4a4(const struct gl_texture_image *texImage,
+	       GLint i, GLint j, GLint k, GLvoid * texelOut)
+{
+   GLchan *rgba = (GLchan *) texelOut;
+   const tfxMipMapLevel *mml = FX_MIPMAP_DATA(texImage);
+   const GLushort *texel;
+
+   i = i * mml->wScale;
+   j = j * mml->hScale;
+
+   texel = ((GLushort *) texImage->Data) + j * mml->width + i;
+   rgba[RCOMP] = FX_rgb_scale_4[(*texel >> 12) & 0xF];
+   rgba[GCOMP] = FX_rgb_scale_4[(*texel >>  8) & 0xF];
+   rgba[BCOMP] = FX_rgb_scale_4[(*texel >>  4) & 0xF];
+   rgba[ACOMP] = FX_rgb_scale_4[ *texel        & 0xF];
+}
+
+
+static void
+fetch_r5g5b5a1(const struct gl_texture_image *texImage,
+	       GLint i, GLint j, GLint k, GLvoid * texelOut)
+{
+   GLchan *rgba = (GLchan *) texelOut;
+   const tfxMipMapLevel *mml = FX_MIPMAP_DATA(texImage);
+   const GLushort *texel;
+
+   i = i * mml->wScale;
+   j = j * mml->hScale;
+
+   texel = ((GLushort *) texImage->Data) + j * mml->width + i;
+   rgba[RCOMP] = FX_rgb_scale_5[(*texel >> 11) & 0x1F];
+   rgba[GCOMP] = FX_rgb_scale_5[(*texel >>  6) & 0x1F];
+   rgba[BCOMP] = FX_rgb_scale_5[(*texel >>  1) & 0x1F];
+   rgba[ACOMP] = ((*texel) & 0x01) * 255;
+}
+
+
+static void
+fetch_a8r8g8b8(const struct gl_texture_image *texImage,
+	       GLint i, GLint j, GLint k, GLvoid * texelOut)
+{
+    GLchan *rgba = (GLchan *) texelOut;
+    const tfxMipMapLevel *mml = FX_MIPMAP_DATA(texImage);
+    const GLuint *texel;
+
+    i = i * mml->wScale;
+    j = j * mml->hScale;
+
+    texel = ((GLuint *) texImage->Data) + j * mml->width + i;
+    rgba[RCOMP] = (((*texel) >> 16) & 0xff);
+    rgba[GCOMP] = (((*texel) >>  8) & 0xff);
+    rgba[BCOMP] = (((*texel)      ) & 0xff);
+    rgba[ACOMP] = (((*texel) >> 24) & 0xff);
+}
+
+
+static void
+PrintTexture(int w, int h, int c, const GLubyte * data)
+{
+   int i, j;
+   for (i = 0; i < h; i++) {
+      for (j = 0; j < w; j++) {
+	 if (c == 2)
+	    fprintf(stderr, "%02x %02x  ", data[0], data[1]);
+	 else if (c == 3)
+	    fprintf(stderr, "%02x %02x %02x  ", data[0], data[1], data[2]);
+	 data += c;
+      }
+      fprintf(stderr, "\n");
+   }
+}
+
+
+GLboolean fxDDIsCompressedFormat ( GLcontext *ctx, GLenum internalFormat )
+{
+ if ((internalFormat == GL_COMPRESSED_RGB_FXT1_3DFX) ||
+     (internalFormat == GL_COMPRESSED_RGBA_FXT1_3DFX) ||
+     (internalFormat == GL_COMPRESSED_RGB_S3TC_DXT1_EXT) ||
+     (internalFormat == GL_COMPRESSED_RGBA_S3TC_DXT1_EXT) ||
+     (internalFormat == GL_COMPRESSED_RGBA_S3TC_DXT3_EXT) ||
+     (internalFormat == GL_COMPRESSED_RGBA_S3TC_DXT5_EXT) ||
+     (internalFormat == GL_RGB_S3TC) ||
+     (internalFormat == GL_RGB4_S3TC) ||
+     (internalFormat == GL_RGBA_S3TC) ||
+     (internalFormat == GL_RGBA4_S3TC)) {
+    return GL_TRUE;
+ }
+
+/* [dBorca]
+ * we are handling differently the above formats from the generic
+ * GL_COMPRESSED_RGB[A]. For this, we will always have to separately
+ * check for the ones below!
+ */
+
+#if FX_TC_NCC || FX_TC_NAPALM
+ if ((internalFormat == GL_COMPRESSED_RGB) || (internalFormat == GL_COMPRESSED_RGBA)) {
+    return GL_TRUE;
+ }
+#endif
+
+ return GL_FALSE;
+}
+
+
+GLuint fxDDCompressedTextureSize (GLcontext *ctx,
+                                  GLsizei width, GLsizei height, GLsizei depth,
+                                  GLenum format)
+{
+ GLuint size;
+ int wScale, hScale;
+
+ ASSERT(depth == 1);
+
+ /* Determine width and height scale factors for texture.
+  * Remember, Glide is limited to 8:1 aspect ratios.
+  */
+ fxTexGetInfo(width, height,
+              NULL,       /* lod level          */
+              NULL,       /* aspect ratio       */
+              NULL, NULL, /* sscale, tscale     */
+              &wScale, &hScale);
+
+ width *= wScale;
+ height *= hScale;
+
+ switch (format) {
+ case GL_COMPRESSED_RGB_FXT1_3DFX:
+ case GL_COMPRESSED_RGBA_FXT1_3DFX:
+    /* round up width to next multiple of 8, height to next multiple of 4 */
+    width = (width + 7) & ~7;
+    height = (height + 3) & ~3;
+    /* 16 bytes per 8x4 tile of RGB[A] texels */
+    size = width * height / 2;
+    /* Textures smaller than 8x4 will effectively be made into 8x4 and
+     * take 16 bytes.
+     */
+    if (size < 16)
+       size = 16;
+    return size;
+ case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
+ case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
+ case GL_RGB_S3TC:
+ case GL_RGB4_S3TC:
+    /* round up width, height to next multiple of 4 */
+    width = (width + 3) & ~3;
+    height = (height + 3) & ~3;
+    /* 8 bytes per 4x4 tile of RGB[A] texels */
+    size = width * height / 2;
+    /* Textures smaller than 4x4 will effectively be made into 4x4 and
+     * take 8 bytes.
+     */
+    if (size < 8)
+       size = 8;
+    return size;
+ case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
+ case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
+ case GL_RGBA_S3TC:
+ case GL_RGBA4_S3TC:
+    /* round up width, height to next multiple of 4 */
+    width = (width + 3) & ~3;
+    height = (height + 3) & ~3;
+    /* 16 bytes per 4x4 tile of RGBA texels */
+    size = width * height; /* simple! */
+    /* Textures smaller than 4x4 will effectively be made into 4x4 and
+     * take 16 bytes.
+     */
+    if (size < 16)
+       size = 16;
+    return size;
+ case GL_COMPRESSED_RGB:
+#if FX_TC_NAPALM
+    {
+     fxMesaContext fxMesa = FX_CONTEXT(ctx);
+     if (fxMesa->type >= GR_SSTTYPE_Voodoo4) {
+        return fxDDCompressedTextureSize(ctx, width, height, 1, GL_COMPRESSED_RGB_FXT1_3DFX);
+     }
+    }
+#endif
+#if FX_TC_NCC
+    return (width * height * 8 >> 3) + 12 * 4;
+#endif
+ case GL_COMPRESSED_RGBA:
+#if FX_TC_NAPALM
+    {
+     fxMesaContext fxMesa = FX_CONTEXT(ctx);
+     if (fxMesa->type >= GR_SSTTYPE_Voodoo4) {
+        return fxDDCompressedTextureSize(ctx, width, height, 1, GL_COMPRESSED_RGBA_FXT1_3DFX);
+     }
+    }
+#endif
+#if FX_TC_NCC
+    return (width * height * 16 >> 3) + 12 * 4;
+#endif
+ default:
+    _mesa_problem(ctx, "bad texformat in fxDDCompressedTextureSize");
+    return 0;
+ }
+}
+
+
+const struct gl_texture_format *
+fxDDChooseTextureFormat( GLcontext *ctx, GLint internalFormat,
+                         GLenum srcFormat, GLenum srcType )
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   GLboolean allow32bpt = fxMesa->HaveTexFmt;
+
+   /* [dBorca] Hack alert:
+    * There is something wrong with this!!! Take an example:
+    * 1) start HW rendering
+    * 2) create a texture like this:
+    *    glTexImage2D(GL_TEXTURE_2D, 0, 3, 16, 16, 0,
+    *                 GL_RGB, GL_UNSIGNED_BYTE, floorTexture);
+    *    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    * 3) we get here with internalFormat==3 and return either
+    *    _mesa_texformat_rgb565 or _mesa_texformat_argb8888
+    * 4) at some point, we encounter total rasterization fallback
+    * 5) displaying a polygon with the above textures yield garbage on areas
+    *    where pixel is larger than a texel, because our already set texel
+    *    function doesn't match the real _mesa_texformat_argb888
+    */
+
+   if (TDFX_DEBUG & VERBOSE_TEXTURE) {
+      fprintf(stderr, "fxDDChooseTextureFormat(...)\n");
+   }
+
+   switch (internalFormat) {
+   case GL_COMPRESSED_RGB:
+#if 0 && FX_TC_NAPALM /* [koolsmoky] */
+     if (ctx->Extensions.TDFX_texture_compression_FXT1) {
+       return &_mesa_texformat_rgb_fxt1;
+     } else if (ctx->Extensions.EXT_texture_compression_s3tc) {
+       return &_mesa_texformat_rgb_dxt1;
+     }
+#endif
+     /* intentional fall through */
+   case 3:
+   case GL_RGB:
+     if ( srcFormat == GL_RGB && srcType == GL_UNSIGNED_SHORT_5_6_5 ) {
+       return &_mesa_texformat_rgb565;
+     }
+     /* intentional fall through */
+   case GL_RGB8:
+   case GL_RGB10:
+   case GL_RGB12:
+   case GL_RGB16:
+      return (allow32bpt) ? &_mesa_texformat_argb8888
+                          : &_mesa_texformat_rgb565;
+   case GL_RGBA2:
+   case GL_RGBA4:
+      return &_mesa_texformat_argb4444;
+   case GL_COMPRESSED_RGBA:
+#if 0 && FX_TC_NAPALM /* [koolsmoky] */
+     if (ctx->Extensions.TDFX_texture_compression_FXT1) {
+       return &_mesa_texformat_rgba_fxt1;
+     } else if (ctx->Extensions.EXT_texture_compression_s3tc) {
+       return &_mesa_texformat_rgba_dxt3;
+     }
+#endif
+     /* intentional fall through */
+   case 4:
+   case GL_RGBA:
+     if ( srcFormat == GL_BGRA ) {
+       if ( srcType == GL_UNSIGNED_INT_8_8_8_8_REV ) {
+         return &_mesa_texformat_argb8888;
+       }
+       else if ( srcType == GL_UNSIGNED_SHORT_4_4_4_4_REV ) {
+         return &_mesa_texformat_argb4444;
+       }
+       else if ( srcType == GL_UNSIGNED_SHORT_1_5_5_5_REV ) {
+         return &_mesa_texformat_argb1555;
+       }
+     }
+     /* intentional fall through */
+   case GL_RGBA8:
+   case GL_RGB10_A2:
+   case GL_RGBA12:
+   case GL_RGBA16:
+      return (allow32bpt) ? &_mesa_texformat_argb8888
+                          : &_mesa_texformat_argb4444;
+   case GL_INTENSITY:
+   case GL_INTENSITY4:
+   case GL_INTENSITY8:
+   case GL_INTENSITY12:
+   case GL_INTENSITY16:
+   case GL_COMPRESSED_INTENSITY:
+      return &_mesa_texformat_i8;
+   case 1:
+   case GL_LUMINANCE:
+   case GL_LUMINANCE4:
+   case GL_LUMINANCE8:
+   case GL_LUMINANCE12:
+   case GL_LUMINANCE16:
+   case GL_COMPRESSED_LUMINANCE:
+      return &_mesa_texformat_l8;
+   case GL_ALPHA:
+   case GL_ALPHA4:
+   case GL_ALPHA8:
+   case GL_ALPHA12:
+   case GL_ALPHA16:
+   case GL_COMPRESSED_ALPHA:
+      return &_mesa_texformat_a8;
+   case GL_COLOR_INDEX:
+   case GL_COLOR_INDEX1_EXT:
+   case GL_COLOR_INDEX2_EXT:
+   case GL_COLOR_INDEX4_EXT:
+   case GL_COLOR_INDEX8_EXT:
+   case GL_COLOR_INDEX12_EXT:
+   case GL_COLOR_INDEX16_EXT:
+      return &_mesa_texformat_ci8;
+   case 2:
+   case GL_LUMINANCE_ALPHA:
+   case GL_LUMINANCE4_ALPHA4:
+   case GL_LUMINANCE6_ALPHA2:
+   case GL_LUMINANCE8_ALPHA8:
+   case GL_LUMINANCE12_ALPHA4:
+   case GL_LUMINANCE12_ALPHA12:
+   case GL_LUMINANCE16_ALPHA16:
+   case GL_COMPRESSED_LUMINANCE_ALPHA:
+      return &_mesa_texformat_al88;
+   case GL_R3_G3_B2:
+   case GL_RGB4:
+   case GL_RGB5:
+      return &_mesa_texformat_rgb565;
+   case GL_RGB5_A1:
+      return &_mesa_texformat_argb1555;
+   /* GL_EXT_texture_compression_s3tc */
+   /* GL_S3_s3tc */
+   case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
+   case GL_RGB_S3TC:
+   case GL_RGB4_S3TC:
+      return &_mesa_texformat_rgb_dxt1;
+   case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
+      return &_mesa_texformat_rgba_dxt1;
+   case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
+   case GL_RGBA_S3TC:
+   case GL_RGBA4_S3TC:
+      return &_mesa_texformat_rgba_dxt3;
+   case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
+      return &_mesa_texformat_rgba_dxt5;
+   /* GL_3DFX_texture_compression_FXT1 */
+   case GL_COMPRESSED_RGB_FXT1_3DFX:
+      return &_mesa_texformat_rgb_fxt1;
+   case GL_COMPRESSED_RGBA_FXT1_3DFX:
+      return &_mesa_texformat_rgba_fxt1;
+   default:
+      _mesa_problem(NULL, "unexpected format in fxDDChooseTextureFormat");
+      return NULL;
+   }
+}
+
+
+static GrTextureFormat_t
+fxGlideFormat(GLint mesaFormat)
+{
+   switch (mesaFormat) {
+   case MESA_FORMAT_I8:
+      return GR_TEXFMT_ALPHA_8;
+   case MESA_FORMAT_A8:
+      return GR_TEXFMT_ALPHA_8;
+   case MESA_FORMAT_L8:
+      return GR_TEXFMT_INTENSITY_8;
+   case MESA_FORMAT_CI8:
+      return GR_TEXFMT_P_8;
+   case MESA_FORMAT_AL88:
+      return GR_TEXFMT_ALPHA_INTENSITY_88;
+   case MESA_FORMAT_RGB565:
+      return GR_TEXFMT_RGB_565;
+   case MESA_FORMAT_ARGB4444:
+      return GR_TEXFMT_ARGB_4444;
+   case MESA_FORMAT_ARGB1555:
+      return GR_TEXFMT_ARGB_1555;
+   case MESA_FORMAT_ARGB8888:
+      return GR_TEXFMT_ARGB_8888;
+   case MESA_FORMAT_RGB_FXT1:
+   case MESA_FORMAT_RGBA_FXT1:
+     return GR_TEXFMT_ARGB_CMP_FXT1;
+   case MESA_FORMAT_RGB_DXT1:
+   case MESA_FORMAT_RGBA_DXT1:
+     return GR_TEXFMT_ARGB_CMP_DXT1;
+   case MESA_FORMAT_RGBA_DXT3:
+     return GR_TEXFMT_ARGB_CMP_DXT3;
+   case MESA_FORMAT_RGBA_DXT5:
+     return GR_TEXFMT_ARGB_CMP_DXT5;
+   default:
+      _mesa_problem(NULL, "Unexpected format in fxGlideFormat");
+      return 0;
+   }
+}
+
+
+static FetchTexelFunc
+fxFetchFunction(GLint mesaFormat)
+{
+   switch (mesaFormat) {
+   case MESA_FORMAT_I8:
+      return &fetch_intensity8;
+   case MESA_FORMAT_A8:
+      return &fetch_alpha8;
+   case MESA_FORMAT_L8:
+      return &fetch_luminance8;
+   case MESA_FORMAT_CI8:
+      return &fetch_index8;
+   case MESA_FORMAT_AL88:
+      return &fetch_luminance8_alpha8;
+   case MESA_FORMAT_RGB565:
+      return &fetch_r5g6b5;
+   case MESA_FORMAT_ARGB4444:
+      return &fetch_r4g4b4a4;
+   case MESA_FORMAT_ARGB1555:
+      return &fetch_r5g5b5a1;
+   case MESA_FORMAT_ARGB8888:
+      return &fetch_a8r8g8b8;
+   case MESA_FORMAT_RGB_FXT1:
+   case MESA_FORMAT_RGBA_FXT1:
+   case MESA_FORMAT_RGB_DXT1:
+   case MESA_FORMAT_RGBA_DXT1:
+   case MESA_FORMAT_RGBA_DXT3:
+   case MESA_FORMAT_RGBA_DXT5:
+     return &fetch_r4g4b4a4;
+   default:
+      _mesa_problem(NULL, "Unexpected format in fxFetchFunction");
+      return NULL;
+   }
+}
+
+void
+fxDDTexImage2D(GLcontext * ctx, GLenum target, GLint level,
+	       GLint internalFormat, GLint width, GLint height, GLint border,
+	       GLenum format, GLenum type, const GLvoid * pixels,
+	       const struct gl_pixelstore_attrib *packing,
+	       struct gl_texture_object *texObj,
+	       struct gl_texture_image *texImage)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   tfxTexInfo *ti;
+   tfxMipMapLevel *mml;
+   GLint texelBytes;
+
+   GLvoid *_final_texImage_Data;
+   const struct gl_texture_format *_final_texImage_TexFormat;
+
+   if (TDFX_DEBUG & VERBOSE_TEXTURE) {
+       fprintf(stderr, "fxDDTexImage2D: id=%d int 0x%x  format 0x%x  type 0x%x  %dx%d\n",
+                       texObj->Name, texImage->IntFormat, format, type,
+                       texImage->Width, texImage->Height);
+   }
+
+   if (!fxIsTexSupported(target, internalFormat, texImage)) {
+      _mesa_problem(NULL, "fx Driver: unsupported texture in fxDDTexImg()\n");
+      return;
+   }
+
+   if (!texObj->DriverData) {
+      texObj->DriverData = fxAllocTexObjData(fxMesa);
+      if (!texObj->DriverData) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage2D");
+         return;
+      }
+   }
+   ti = fxTMGetTexInfo(texObj);
+
+   if (!texImage->DriverData) {
+      texImage->DriverData = CALLOC(sizeof(tfxMipMapLevel));
+      if (!texImage->DriverData) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage2D");
+         return;
+      }
+   }
+   mml = FX_MIPMAP_DATA(texImage);
+
+   fxTexGetInfo(width, height, NULL, NULL, NULL, NULL,
+		&mml->wScale, &mml->hScale);
+
+   mml->width = width * mml->wScale;
+   mml->height = height * mml->hScale;
+
+#if 0 && FX_COMPRESS_S3TC_AS_FXT1_HACK
+   /* [koolsmoky] substitute FXT1 for DXTn and Legacy S3TC */
+   /* [dBorca] we should update texture's attribute, then,
+    * because if the application asks us to decompress, we
+    * have to know the REAL format! Also, DXT3/5 might not
+    * be correct, since it would mess with "compressedSize".
+    * Ditto for GL_RGBA[4]_S3TC, which is always mapped to DXT3.
+    */
+   if (texImage->IsCompressed) {
+     switch (internalFormat) {
+     case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
+     case GL_RGB_S3TC:
+     case GL_RGB4_S3TC:
+       internalFormat = GL_COMPRESSED_RGB_FXT1_3DFX;
+       break;
+     case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
+     case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
+     case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
+     case GL_RGBA_S3TC:
+     case GL_RGBA4_S3TC:
+       internalFormat = GL_COMPRESSED_RGBA_FXT1_3DFX;
+     }
+   }
+#endif
+#if 1 || FX_COMPRESS_DXT5_AS_DXT3_HACK
+   /* [dBorca] either VSA is stupid at DXT5, 
+    * or our compression tool is broken. See
+    * above for caveats.
+    */
+   if ((texImage->IsCompressed) &&
+       (internalFormat == GL_COMPRESSED_RGBA_S3TC_DXT5_EXT)) {
+       internalFormat = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
+   }
+#endif
+
+   /* choose the texture format */
+   assert(ctx->Driver.ChooseTextureFormat);
+   texImage->TexFormat = (*ctx->Driver.ChooseTextureFormat)(ctx,
+                                          internalFormat, format, type);
+   assert(texImage->TexFormat);
+   texelBytes = texImage->TexFormat->TexelBytes;
+   /*if (!fxMesa->HaveTexFmt) assert(texelBytes == 1 || texelBytes == 2);*/
+
+   mml->glideFormat = fxGlideFormat(texImage->TexFormat->MesaFormat);
+   /* dirty trick: will thrash CopyTex[Sub]Image */
+#if FX_TC_NCC || FX_TC_NAPALM
+   if (internalFormat == GL_COMPRESSED_RGB) {
+#if FX_TC_NCC
+      mml->glideFormat = GR_TEXFMT_YIQ_422;
+#endif
+#if FX_TC_NAPALM
+      if (fxMesa->type >= GR_SSTTYPE_Voodoo4) {
+         mml->glideFormat = GR_TEXFMT_ARGB_CMP_FXT1;
+      }
+#endif
+   } else if (internalFormat == GL_COMPRESSED_RGBA) {
+#if FX_TC_NCC
+      mml->glideFormat = GR_TEXFMT_AYIQ_8422;
+#endif
+#if FX_TC_NAPALM
+      if (fxMesa->type >= GR_SSTTYPE_Voodoo4) {
+         mml->glideFormat = GR_TEXFMT_ARGB_CMP_FXT1;
+      }
+#endif
+   }
+#endif
+
+   /* allocate mipmap buffer */
+   assert(!texImage->Data);
+   if (texImage->IsCompressed) {
+      texImage->Data = MESA_PBUFFER_ALLOC(texImage->CompressedSize);
+      texelBytes = 4;
+      _final_texImage_TexFormat = &_mesa_texformat_argb8888;
+      _final_texImage_Data = MALLOC(mml->width * mml->height * 4);
+      if (!_final_texImage_Data) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage2D");
+         return;
+      }
+   } else {
+      texImage->Data = MESA_PBUFFER_ALLOC(mml->width * mml->height * texelBytes);
+      _final_texImage_TexFormat = texImage->TexFormat;
+      _final_texImage_Data = texImage->Data;
+   }
+   if (!texImage->Data) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage2D");
+      return;
+   }
+
+   if (mml->wScale != 1 || mml->hScale != 1) {
+      /* rescale image to overcome 1:8 aspect limitation */
+      GLvoid *tempImage;
+      tempImage = MALLOC(width * height * texelBytes);
+      if (!tempImage) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage2D");
+         return;
+      }
+      /* unpack image, apply transfer ops and store in tempImage */
+      _mesa_transfer_teximage(ctx, 2, texImage->Format,
+                              _final_texImage_TexFormat,
+                              tempImage,
+                              width, height, 1, 0, 0, 0, /* src */
+                              width * texelBytes, /* dstRowStride */
+                              0, /* dstImageStride */
+                              format, type, pixels, packing);
+      _mesa_rescale_teximage2d(texelBytes,
+                               mml->width * texelBytes, /* dst stride */
+                               width, height, /* src */
+                               mml->width, mml->height, /* dst */
+                               tempImage /*src*/, _final_texImage_Data /*dst*/ );
+      FREE(tempImage);
+   }
+   else {
+      /* no rescaling needed */
+      /* unpack image, apply transfer ops and store in texImage->Data */
+      _mesa_transfer_teximage(ctx, 2, texImage->Format,
+                              _final_texImage_TexFormat, _final_texImage_Data,
+                              width, height, 1, 0, 0, 0,
+                              mml->width * texelBytes,
+                              0, /* dstImageStride */
+                              format, type, pixels, packing);
+   }
+
+   /* now compress */
+   if (texImage->IsCompressed) {
+#if FX_TC_NCC
+      if ((mml->glideFormat == GR_TEXFMT_AYIQ_8422) ||
+          (mml->glideFormat == GR_TEXFMT_YIQ_422)) {
+         TxMip txMip, pxMip;
+         txMip.width = mml->width;
+         txMip.height = mml->height;
+         txMip.depth = 1;
+         txMip.data[0] = _final_texImage_Data;
+         pxMip.data[0] = texImage->Data;
+         fxMesa->Glide.txMipQuantize(&pxMip, &txMip, mml->glideFormat, TX_DITHER_ERR, TX_COMPRESSION_STATISTICAL);
+         fxMesa->Glide.txPalToNcc((GuNccTable *)(&(ti->palette)), pxMip.pal);
+         MEMCPY((char *)texImage->Data + texImage->CompressedSize - 12 * 4, &(ti->palette.data[16]), 12 * 4);
+      } else
+#endif
+      fxMesa->Glide.txImgQuantize(texImage->Data, _final_texImage_Data, mml->width, mml->height, mml->glideFormat, TX_DITHER_NONE);
+      FREE(_final_texImage_Data);
+   }
+
+   ti->info.format = mml->glideFormat;
+   texImage->FetchTexel = fxFetchFunction(texImage->TexFormat->MesaFormat);
+
+   /* [dBorca]
+    * Hack alert: unsure...
+    */
+   if (0 && ti->validated && ti->isInTM) {
+      /*fprintf(stderr, "reloadmipmaplevels\n"); */
+      fxTMReloadMipMapLevel(fxMesa, texObj, level);
+   }
+   else {
+      /*fprintf(stderr, "invalidate2\n"); */
+      fxTexInvalidate(ctx, texObj);
+   }
+}
+
+
+void
+fxDDTexSubImage2D(GLcontext * ctx, GLenum target, GLint level,
+		  GLint xoffset, GLint yoffset,
+		  GLsizei width, GLsizei height,
+		  GLenum format, GLenum type, const GLvoid * pixels,
+		  const struct gl_pixelstore_attrib *packing,
+		  struct gl_texture_object *texObj,
+		  struct gl_texture_image *texImage)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   tfxTexInfo *ti;
+   tfxMipMapLevel *mml;
+   GLint texelBytes;
+
+   /* [dBorca] Hack alert:
+    * fix the goddamn texture compression here
+    */
+
+   if (TDFX_DEBUG & VERBOSE_TEXTURE) {
+       fprintf(stderr, "fxDDTexSubImage2D: id=%d\n", texObj->Name);
+   }
+
+   if (!texObj->DriverData) {
+      _mesa_problem(ctx, "problem in fxDDTexSubImage2D");
+      return;
+   }
+
+   ti = fxTMGetTexInfo(texObj);
+   assert(ti);
+   mml = FX_MIPMAP_DATA(texImage);
+   assert(mml);
+
+   assert(texImage->Data);	/* must have an existing texture image! */
+   assert(texImage->Format);
+
+   texelBytes = texImage->TexFormat->TexelBytes;
+
+   if (mml->wScale != 1 || mml->hScale != 1) {
+      /* need to rescale subimage to match mipmap level's rescale factors */
+      const GLint newWidth = width * mml->wScale;
+      const GLint newHeight = height * mml->hScale;
+      GLvoid *tempImage;
+      GLubyte *destAddr;
+      tempImage = MALLOC(width * height * texelBytes);
+      if (!tempImage) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexSubImage2D");
+         return;
+      }
+
+      _mesa_transfer_teximage(ctx, 2, texImage->Format,/* Tex int format */
+                              texImage->TexFormat,     /* dest format */
+                              (GLubyte *) tempImage,   /* dest */
+                              width, height, 1,        /* subimage size */
+                              0, 0, 0,                 /* subimage pos */
+                              width * texelBytes,      /* dest row stride */
+                              0,                       /* dst image stride */
+                              format, type, pixels, packing);
+
+      /* now rescale */
+      /* compute address of dest subimage within the overal tex image */
+      destAddr = (GLubyte *) texImage->Data
+         + (yoffset * mml->hScale * mml->width
+            + xoffset * mml->wScale) * texelBytes;
+
+      _mesa_rescale_teximage2d(texelBytes,
+                               mml->width * texelBytes, /* dst stride */
+                               width, height,
+                               newWidth, newHeight,
+                               tempImage, destAddr);
+
+      FREE(tempImage);
+   }
+   else {
+      /* no rescaling needed */
+      _mesa_transfer_teximage(ctx, 2, texImage->Format,  /* Tex int format */
+                              texImage->TexFormat,       /* dest format */
+                              (GLubyte *) texImage->Data,/* dest */
+                              width, height, 1,          /* subimage size */
+                              xoffset, yoffset, 0,       /* subimage pos */
+                              mml->width * texelBytes,   /* dest row stride */
+                              0,                         /* dst image stride */
+                              format, type, pixels, packing);
+   }
+
+   /* [dBorca]
+    * Hack alert: unsure...
+    */
+   if (0 && ti->validated && ti->isInTM)
+      fxTMReloadMipMapLevel(fxMesa, texObj, level);
+   else
+      fxTexInvalidate(ctx, texObj);
+}
+
+
+void
+fxDDCompressedTexImage2D (GLcontext *ctx, GLenum target,
+                          GLint level, GLint internalFormat,
+                          GLsizei width, GLsizei height, GLint border,
+                          GLsizei imageSize, const GLvoid *data,
+                          struct gl_texture_object *texObj,
+                          struct gl_texture_image *texImage)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   tfxTexInfo *ti;
+   tfxMipMapLevel *mml;
+
+   if (TDFX_DEBUG & VERBOSE_TEXTURE) {
+       fprintf(stderr, "fxDDCompressedTexImage2D: id=%d int 0x%x  %dx%d\n",
+                       texObj->Name, internalFormat,
+                       width, height);
+   }
+
+   assert(texImage->IsCompressed);
+
+   if (!fxIsTexSupported(target, internalFormat, texImage)) {
+      _mesa_problem(NULL, "fx Driver: unsupported texture in fxDDCompressedTexImg()\n");
+      return;
+   }
+
+   if (!texObj->DriverData) {
+      texObj->DriverData = fxAllocTexObjData(fxMesa);
+      if (!texObj->DriverData) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage2D");
+         return;
+      }
+   }
+   ti = fxTMGetTexInfo(texObj);
+
+   if (!texImage->DriverData) {
+      texImage->DriverData = CALLOC(sizeof(tfxMipMapLevel));
+      if (!texImage->DriverData) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage2D");
+         return;
+      }
+   }
+   mml = FX_MIPMAP_DATA(texImage);
+
+   fxTexGetInfo(width, height, NULL, NULL, NULL, NULL,
+		&mml->wScale, &mml->hScale);
+
+   mml->width = width * mml->wScale;
+   mml->height = height * mml->hScale;
+
+
+   /* choose the texture format */
+   assert(ctx->Driver.ChooseTextureFormat);
+   texImage->TexFormat = (*ctx->Driver.ChooseTextureFormat)(ctx,
+                                          internalFormat, -1/*format*/, -1/*type*/);
+   assert(texImage->TexFormat);
+
+   /* Determine the appropriate Glide texel format,
+    * given the user's internal texture format hint.
+    */
+   mml->glideFormat = fxGlideFormat(texImage->TexFormat->MesaFormat);
+#if FX_TC_NCC || FX_TC_NAPALM
+   if (internalFormat == GL_COMPRESSED_RGB) {
+#if FX_TC_NCC
+      mml->glideFormat = GR_TEXFMT_YIQ_422;
+#endif
+#if FX_TC_NAPALM
+      if (fxMesa->type >= GR_SSTTYPE_Voodoo4) {
+         mml->glideFormat = GR_TEXFMT_ARGB_CMP_FXT1;
+      }
+#endif
+   } else if (internalFormat == GL_COMPRESSED_RGBA) {
+#if FX_TC_NCC
+      mml->glideFormat = GR_TEXFMT_AYIQ_8422;
+#endif
+#if FX_TC_NAPALM
+      if (fxMesa->type >= GR_SSTTYPE_Voodoo4) {
+         mml->glideFormat = GR_TEXFMT_ARGB_CMP_FXT1;
+      }
+#endif
+   }
+#endif
+
+   /* allocate new storage for texture image, if needed */
+   if (!texImage->Data) {
+      texImage->Data = MESA_PBUFFER_ALLOC(imageSize);
+      if (!texImage->Data) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage2D");
+         return;
+      }
+   }
+
+   /* save the texture data */
+   MEMCPY(texImage->Data, data, imageSize);
+#if FX_TC_NCC
+   if ((mml->glideFormat == GR_TEXFMT_AYIQ_8422) ||
+       (mml->glideFormat == GR_TEXFMT_YIQ_422)) {
+      MEMCPY(&(ti->palette.data[16]), (char *)data + imageSize - 12 * 4, 12 * 4);
+   }
+#endif
+
+   ti->info.format = mml->glideFormat;
+   texImage->FetchTexel = fxFetchFunction(texImage->TexFormat->MesaFormat);
+
+   /* [dBorca] Hack alert:
+    * what about different size/texel? other anomalies? SW rescaling?
+    */
+
+   /* [dBorca]
+    * Hack alert: unsure...
+    */
+   if (0 && ti->validated && ti->isInTM) {
+      /*fprintf(stderr, "reloadmipmaplevels\n"); */
+      fxTMReloadMipMapLevel(fxMesa, texObj, level);
+   }
+   else {
+      /*fprintf(stderr, "invalidate2\n"); */
+      fxTexInvalidate(ctx, texObj);
+   }
+}
+
+
+void
+fxDDCompressedTexSubImage2D( GLcontext *ctx, GLenum target,
+                             GLint level, GLint xoffset,
+                             GLint yoffset, GLsizei width,
+                             GLint height, GLenum format,
+                             GLsizei imageSize, const GLvoid *data,
+                             struct gl_texture_object *texObj,
+                             struct gl_texture_image *texImage )
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   tfxTexInfo *ti;
+   tfxMipMapLevel *mml;
+
+   if (TDFX_DEBUG & VERBOSE_TEXTURE) {
+       fprintf(stderr, "fxDDCompressedTexSubImage2D: id=%d\n", texObj->Name);
+   }
+
+   ti = fxTMGetTexInfo(texObj);
+   assert(ti);
+   mml = FX_MIPMAP_DATA(texImage);
+   assert(mml);
+
+   /*
+    * We punt if we are not replacing the entire image.  This
+    * is allowed by the spec.
+    *
+    * [dBorca] Hack alert:
+    * ohwell, we should NOT! Look into _mesa_store_compressed_texsubimage2d
+    * on how to calculate the sub-image.
+    */
+   if ((xoffset != 0) && (yoffset != 0)
+       && (width != texImage->Width)
+       && (height != texImage->Height)) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glCompressedTexSubImage2D(CHICKEN)");
+      return;
+   }
+
+   /* [dBorca] Hack alert:
+    * what about different size/texel? other anomalies? SW rescaling?
+    */
+   MEMCPY(texImage->Data, data, imageSize);
+
+   /* [dBorca]
+    * Hack alert: unsure...
+    */
+   if (0 && ti->validated && ti->isInTM)
+      fxTMReloadMipMapLevel(fxMesa, texObj, level);
+   else
+      fxTexInvalidate(ctx, texObj);
+}
+
+
+#else /* FX */
+
+/*
+ * Need this to provide at least one external definition.
+ */
+
+extern int gl_fx_dummy_function_ddtex(void);
+int
+gl_fx_dummy_function_ddtex(void)
+{
+   return 0;
+}
+
+#endif /* FX */
diff --git a/reactos/lib/mesa32/src/drivers/glide/fxdrv.h b/reactos/lib/mesa32/src/drivers/glide/fxdrv.h
new file mode 100644
index 00000000000..e6320441d0c
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/glide/fxdrv.h
@@ -0,0 +1,721 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.0
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/* Authors:
+ *    David Bucciarelli
+ *    Brian Paul
+ *    Daryll Strauss
+ *    Keith Whitwell
+ *    Daniel Borca
+ *    Hiroshi Morii
+ */
+
+/* fxsetup.c - 3Dfx VooDoo rendering mode setup functions */
+
+
+#ifndef FXDRV_H
+#define FXDRV_H
+
+/* If you comment out this define, a variable takes its place, letting
+ * you turn debugging on/off from the debugger.
+ */
+
+#include "glheader.h"
+
+
+#if defined(__linux__)
+#include <signal.h>
+#endif
+
+#include "context.h"
+#include "imports.h"
+#include "macros.h"
+#include "matrix.h"
+#include "mtypes.h"
+
+#include "GL/fxmesa.h"
+#include "fxglidew.h"
+
+#include "math/m_vector.h"
+
+
+/* Define some shorter names for these things.
+ */
+#define XCOORD   GR_VERTEX_X_OFFSET
+#define YCOORD   GR_VERTEX_Y_OFFSET
+#define ZCOORD   GR_VERTEX_OOZ_OFFSET
+#define OOWCOORD GR_VERTEX_OOW_OFFSET
+
+#define S0COORD  GR_VERTEX_SOW_TMU0_OFFSET
+#define T0COORD  GR_VERTEX_TOW_TMU0_OFFSET
+#define S1COORD  GR_VERTEX_SOW_TMU1_OFFSET
+#define T1COORD  GR_VERTEX_TOW_TMU1_OFFSET
+
+
+
+#ifdef __i386__
+#define FXCOLOR4( c )  (* (int *)c)
+#else
+#define FXCOLOR4( c ) (      \
+  ( ((unsigned int)(c[3]))<<24 ) | \
+  ( ((unsigned int)(c[2]))<<16 ) | \
+  ( ((unsigned int)(c[1]))<<8 )  | \
+  (  (unsigned int)(c[0])) )
+#endif
+
+#define TDFXPACKCOLOR1555( r, g, b, a )					   \
+   ((((r) & 0xf8) << 7) | (((g) & 0xf8) << 2) | (((b) & 0xf8) >> 3) |	   \
+    ((a) ? 0x8000 : 0))
+#define TDFXPACKCOLOR565( r, g, b )					   \
+   ((((r) & 0xf8) << 8) | (((g) & 0xfc) << 3) | (((b) & 0xf8) >> 3))
+#define TDFXPACKCOLOR8888( r, g, b, a )					   \
+   (((a) << 24) | ((r) << 16) | ((g) << 8) | (b))
+
+
+
+/* fastpath flags first
+ */
+#define SETUP_TMU0 0x1
+#define SETUP_TMU1 0x2
+#define SETUP_RGBA 0x4
+#define SETUP_SNAP 0x8
+#define SETUP_XYZW 0x10
+#define SETUP_PTEX 0x20
+#define SETUP_PSIZ 0x40
+#define SETUP_SPEC 0x80
+#define MAX_SETUP  0x100
+
+
+#define FX_NUM_TMU 2
+
+#define FX_TMU0      GR_TMU0
+#define FX_TMU1      GR_TMU1
+#define FX_TMU_SPLIT 98
+#define FX_TMU_BOTH  99
+#define FX_TMU_NONE  100
+
+/* Used for fxMesa->lastUnitsMode */
+
+#define FX_UM_NONE                  0x00000000
+
+#define FX_UM_E0_REPLACE            0x00000001
+#define FX_UM_E0_MODULATE           0x00000002
+#define FX_UM_E0_DECAL              0x00000004
+#define FX_UM_E0_BLEND              0x00000008
+#define FX_UM_E0_ADD		    0x00000010
+
+#define FX_UM_E1_REPLACE            0x00000020
+#define FX_UM_E1_MODULATE           0x00000040
+#define FX_UM_E1_DECAL              0x00000080
+#define FX_UM_E1_BLEND              0x00000100
+#define FX_UM_E1_ADD		    0x00000200
+
+#define FX_UM_E_ENVMODE             0x000003ff
+
+#define FX_UM_E0_ALPHA              0x00001000
+#define FX_UM_E0_LUMINANCE          0x00002000
+#define FX_UM_E0_LUMINANCE_ALPHA    0x00004000
+#define FX_UM_E0_INTENSITY          0x00008000
+#define FX_UM_E0_RGB                0x00010000
+#define FX_UM_E0_RGBA               0x00020000
+
+#define FX_UM_E1_ALPHA              0x00040000
+#define FX_UM_E1_LUMINANCE          0x00080000
+#define FX_UM_E1_LUMINANCE_ALPHA    0x00100000
+#define FX_UM_E1_INTENSITY          0x00200000
+#define FX_UM_E1_RGB                0x00400000
+#define FX_UM_E1_RGBA               0x00800000
+
+#define FX_UM_E_IFMT                0x00fff000
+
+#define FX_UM_COLOR_ITERATED        0x01000000
+#define FX_UM_COLOR_CONSTANT        0x02000000
+#define FX_UM_ALPHA_ITERATED        0x04000000
+#define FX_UM_ALPHA_CONSTANT        0x08000000
+
+
+/* for Voodoo3/Banshee's grColorCombine() and grAlphaCombine() */
+struct tdfx_combine {
+   GrCombineFunction_t Function;	/* Combine function */
+   GrCombineFactor_t Factor;		/* Combine scale factor */
+   GrCombineLocal_t Local;		/* Local combine source */
+   GrCombineOther_t Other;		/* Other combine source */
+   FxBool Invert;			/* Combine result inversion flag */
+};
+
+/* for Voodoo3's grTexCombine() */
+struct tdfx_texcombine {
+   GrCombineFunction_t FunctionRGB;
+   GrCombineFactor_t FactorRGB;
+   GrCombineFunction_t FunctionAlpha;
+   GrCombineFactor_t FactorAlpha;
+   FxBool InvertRGB;
+   FxBool InvertAlpha;
+};
+
+
+/* for Voodoo5's grColorCombineExt() */
+struct tdfx_combine_color_ext {
+   GrCCUColor_t SourceA;
+   GrCombineMode_t ModeA;
+   GrCCUColor_t SourceB;
+   GrCombineMode_t ModeB;
+   GrCCUColor_t SourceC;
+   FxBool InvertC;
+   GrCCUColor_t SourceD;
+   FxBool InvertD;
+   FxU32 Shift;
+   FxBool Invert;
+};
+
+/* for Voodoo5's grAlphaCombineExt() */
+struct tdfx_combine_alpha_ext {
+   GrACUColor_t SourceA;
+   GrCombineMode_t ModeA;
+   GrACUColor_t SourceB;
+   GrCombineMode_t ModeB;
+   GrACUColor_t SourceC;
+   FxBool InvertC;
+   GrACUColor_t SourceD;
+   FxBool InvertD;
+   FxU32 Shift;
+   FxBool Invert;
+};
+
+/* for Voodoo5's grTexColorCombineExt() */
+struct tdfx_color_texenv {
+   GrTCCUColor_t SourceA;
+   GrCombineMode_t ModeA;
+   GrTCCUColor_t SourceB;
+   GrCombineMode_t ModeB;
+   GrTCCUColor_t SourceC;
+   FxBool InvertC;
+   GrTCCUColor_t SourceD;
+   FxBool InvertD;
+   FxU32 Shift;
+   FxBool Invert;
+};
+
+/* for Voodoo5's grTexAlphaCombineExt() */
+struct tdfx_alpha_texenv {
+   GrTACUColor_t SourceA;
+   GrCombineMode_t ModeA;
+   GrTACUColor_t SourceB;
+   GrCombineMode_t ModeB;
+   GrTACUColor_t SourceC;
+   FxBool InvertC;
+   GrTCCUColor_t SourceD;
+   FxBool InvertD;
+   FxU32 Shift;
+   FxBool Invert;
+};
+
+/* Voodoo5's texture combine environment */
+struct tdfx_texcombine_ext {
+   struct tdfx_alpha_texenv Alpha;
+   struct tdfx_color_texenv Color;
+   GrColor_t EnvColor;
+};
+
+
+/*
+  Memory range from startAddr to endAddr-1
+*/
+typedef struct MemRange_t
+{
+   struct MemRange_t *next;
+   FxU32 startAddr, endAddr;
+}
+MemRange;
+
+typedef struct
+{
+   GLsizei width, height;	/* image size */
+   GLint wScale, hScale;	/* image scale factor */
+   GrTextureFormat_t glideFormat;	/* Glide image format */
+}
+tfxMipMapLevel;
+
+/*
+ * TDFX-specific texture object data.  This hangs off of the
+ * struct gl_texture_object DriverData pointer.
+ */
+typedef struct tfxTexInfo_t
+{
+   struct tfxTexInfo_t *next;
+   struct gl_texture_object *tObj;
+
+   GLuint lastTimeUsed;
+   FxU32 whichTMU;
+   GLboolean isInTM;
+
+   MemRange *tm[FX_NUM_TMU];
+
+   GLint minLevel, maxLevel;
+   GLint baseLevelInternalFormat;
+
+   GrTexInfo info;
+
+   GrTextureFilterMode_t minFilt;
+   GrTextureFilterMode_t maxFilt;
+   FxBool LODblend;
+
+   GrTextureClampMode_t sClamp;
+   GrTextureClampMode_t tClamp;
+
+   GrMipMapMode_t mmMode;
+
+   GLfloat sScale, tScale;
+
+   GrTexTable_t paltype;
+   GuTexPalette palette;
+
+   GLboolean fixedPalette;
+   GLboolean validated;
+}
+tfxTexInfo;
+
+typedef struct
+{
+   GLuint swapBuffer;
+   GLuint reqTexUpload;
+   GLuint texUpload;
+   GLuint memTexUpload;
+}
+tfxStats;
+
+
+
+typedef struct
+{
+   /* Alpha test */
+
+   GLboolean alphaTestEnabled;
+   GrCmpFnc_t alphaTestFunc;
+   GLfloat alphaTestRefValue;
+
+   /* Blend function */
+
+   GLboolean blendEnabled;
+   GrAlphaBlendFnc_t blendSrcFuncRGB;
+   GrAlphaBlendFnc_t blendDstFuncRGB;
+   GrAlphaBlendFnc_t blendSrcFuncAlpha;
+   GrAlphaBlendFnc_t blendDstFuncAlpha;
+   GrAlphaBlendOp_t blendEq;
+
+   /* Depth test */
+
+   GLboolean depthTestEnabled;
+   GLboolean depthMask;
+   GrCmpFnc_t depthTestFunc;
+   FxI32 depthBias;
+
+   /* Stencil */
+
+   GLboolean stencilEnabled;
+   GrCmpFnc_t stencilFunction;		/* Stencil function */
+   GrStencil_t stencilRefValue;		/* Stencil reference value */
+   GrStencil_t stencilValueMask;	/* Value mask */
+   GrStencil_t stencilWriteMask;	/* Write mask */
+   GrCmpFnc_t stencilFailFunc;		/* Stencil fail function */
+   GrCmpFnc_t stencilZFailFunc;		/* Stencil pass, depth fail function */
+   GrCmpFnc_t stencilZPassFunc;		/* Stencil pass, depth pass function */
+   GrStencil_t stencilClear;		/* Buffer clear value */
+}
+tfxUnitsState;
+
+
+
+
+/* Flags for fxMesa->new_state
+ */
+#define FX_NEW_TEXTURING      0x1
+#define FX_NEW_BLEND          0x2
+#define FX_NEW_ALPHA          0x4
+#define FX_NEW_DEPTH          0x8
+#define FX_NEW_FOG            0x10
+#define FX_NEW_SCISSOR        0x20
+#define FX_NEW_COLOR_MASK     0x40
+#define FX_NEW_CULL           0x80
+#define FX_NEW_STENCIL        0x100
+
+
+#define FX_CONTEXT(ctx) ((fxMesaContext)((ctx)->DriverCtx))
+
+#define FX_TEXTURE_DATA(texUnit) fxTMGetTexInfo((texUnit)->_Current)
+
+#define fxTMGetTexInfo(o) ((tfxTexInfo*)((o)->DriverData))
+
+#define FX_MIPMAP_DATA(img)  ((tfxMipMapLevel *) (img)->DriverData)
+
+#define BEGIN_BOARD_LOCK()
+#define END_BOARD_LOCK()
+#define BEGIN_CLIP_LOOP()
+#define END_CLIP_LOOP()
+
+
+
+
+/* Covers the state referenced by IsInHardware:
+ */
+#define _FX_NEW_IS_IN_HARDWARE (_NEW_TEXTURE|		\
+			        _NEW_HINT|		\
+			        _NEW_STENCIL|		\
+			        _NEW_BUFFERS|		\
+			        _NEW_COLOR|		\
+			        _NEW_LIGHT)
+
+/* Covers the state referenced by fxDDChooseRenderState
+ */
+#define _FX_NEW_RENDERSTATE (_FX_NEW_IS_IN_HARDWARE |   \
+			     _DD_NEW_FLATSHADE |	\
+			     _DD_NEW_TRI_LIGHT_TWOSIDE| \
+			     _DD_NEW_TRI_OFFSET |	\
+			     _DD_NEW_TRI_UNFILLED |	\
+			     _DD_NEW_TRI_SMOOTH |	\
+			     _DD_NEW_TRI_STIPPLE |	\
+			     _DD_NEW_LINE_SMOOTH |	\
+			     _DD_NEW_LINE_STIPPLE |	\
+			     _DD_NEW_LINE_WIDTH |	\
+			     _DD_NEW_POINT_SMOOTH |	\
+			     _DD_NEW_POINT_SIZE |	\
+			     _NEW_LINE)
+
+
+/* Covers the state referenced by fxDDChooseSetupFunction.
+ */
+#define _FX_NEW_SETUP_FUNCTION (_NEW_LIGHT|	\
+			        _NEW_FOG|	\
+			        _NEW_TEXTURE|	\
+			        _NEW_COLOR)	\
+
+
+/* lookup table for scaling y bit colors up to 8 bits */
+extern GLuint FX_rgb_scale_4[16];
+extern GLuint FX_rgb_scale_5[32];
+extern GLuint FX_rgb_scale_6[64];
+
+typedef void (*fx_tri_func) (fxMesaContext, GrVertex *, GrVertex *, GrVertex *);
+typedef void (*fx_line_func) (fxMesaContext, GrVertex *, GrVertex *);
+typedef void (*fx_point_func) (fxMesaContext, GrVertex *);
+
+struct tfxMesaContext
+{
+   GrTexTable_t glbPalType;
+   GuTexPalette glbPalette;
+
+   GLcontext *glCtx;		/* the core Mesa context */
+   GLvisual *glVis;		/* describes the color buffer */
+   GLframebuffer *glBuffer;	/* the ancillary buffers */
+
+   GLint board;			/* the board used for this context */
+   GLint width, height;		/* size of color buffer */
+
+   GrBuffer_t currentFB;
+
+   GLboolean bgrOrder;
+   GrColor_t color;
+   GrColor_t clearC;
+   GrAlpha_t clearA;
+   GLuint constColor;
+   GrCullMode_t cullMode;
+
+   tfxUnitsState unitsState;
+   tfxUnitsState restoreUnitsState;	/* saved during multipass */
+
+
+   GLuint new_state;
+   GLuint new_gl_state;
+
+   /* Texture Memory Manager Data 
+    */
+   GLuint texBindNumber;
+   GLint tmuSrc;
+   GLuint lastUnitsMode;
+   GLuint freeTexMem[FX_NUM_TMU];
+   MemRange *tmPool;
+   MemRange *tmFree[FX_NUM_TMU];
+
+   GLenum fogTableMode;
+   GLfloat fogDensity;
+   GLfloat fogStart, fogEnd;
+   GrFog_t *fogTable;
+   GLint textureAlign;
+   GLint textureMaxLod;
+
+   /* Vertex building and storage:
+    */
+   GLuint tmu_source[FX_NUM_TMU];
+   GLuint SetupIndex;
+   GLuint stw_hint_state;	/* for grHints */
+   GrVertex *verts;
+   GLboolean snapVertices;      /* needed for older Voodoo hardware */
+
+   /* Rasterization:
+    */
+   GLuint render_index;
+   GLuint fallback;
+   GLenum render_primitive;
+   GLenum raster_primitive;
+
+   /* Current rasterization functions 
+    */
+   fx_point_func draw_point;
+   fx_line_func draw_line;
+   fx_tri_func draw_tri;
+
+
+   /* Keep texture scales somewhere handy:
+    */
+   GLfloat s0scale;
+   GLfloat s1scale;
+   GLfloat t0scale;
+   GLfloat t1scale;
+
+   GLfloat inv_s0scale;
+   GLfloat inv_s1scale;
+   GLfloat inv_t0scale;
+   GLfloat inv_t1scale;
+
+   /* Glide stuff
+    */
+   tfxStats stats;
+   void *state;
+
+   /* Options */
+
+   GLboolean verbose;
+   GLboolean haveTwoTMUs;	/* True if we really have 2 tmu's  */
+   GLboolean haveHwAlpha;
+   GLboolean haveHwStencil;
+   GLboolean haveZBuffer;
+   GLboolean haveDoubleBuffer;
+   GLboolean haveGlobalPaletteTexture;
+   GLint swapInterval;
+   GLint maxPendingSwapBuffers;
+
+   GrContext_t glideContext;
+
+   int screen_width;
+   int screen_height;
+   int clipMinX;
+   int clipMaxX;
+   int clipMinY;
+   int clipMaxY;
+
+   int colDepth;
+   GLboolean fsaa;
+
+   /* Glide (per card) capabilities. These get mirrored
+    * from `glbHWConfig' when creating a new context...
+    */
+   GrSstType type;
+   FxBool HavePalExt;	/* PALETTE6666 */
+   FxBool HavePixExt;	/* PIXEXT */
+   FxBool HaveTexFmt;	/* TEXFMT */
+   FxBool HaveCmbExt;	/* COMBINE */
+   FxBool HaveMirExt;	/* TEXMIRROR */
+   FxBool HaveTexUma;	/* TEXUMA */
+   FxBool HaveTexus2;	/* Texus 2 - FXT1 */
+   struct tdfx_glide Glide;
+   char rendererString[100];
+};
+
+
+extern void fxSetupFXUnits(GLcontext *);
+extern void fxSetupDDPointers(GLcontext *);
+
+/* fxvb.c:
+ */
+extern void fxAllocVB(GLcontext * ctx);
+extern void fxFreeVB(GLcontext * ctx);
+extern void fxPrintSetupFlags(char *msg, GLuint flags );
+extern void fxCheckTexSizes( GLcontext *ctx );
+extern void fxBuildVertices( GLcontext *ctx, GLuint start, GLuint count,
+			     GLuint newinputs );
+extern void fxChooseVertexState( GLcontext *ctx );
+
+
+
+
+
+
+/* fxtrifuncs:
+ */
+extern void fxDDInitTriFuncs(GLcontext *);
+extern void fxDDChooseRenderState(GLcontext * ctx);
+
+
+extern void fxUpdateDDSpanPointers(GLcontext *);
+extern void fxSetupDDSpanPointers(GLcontext *);
+
+extern void fxPrintTextureData(tfxTexInfo * ti);
+
+extern const struct gl_texture_format *
+fxDDChooseTextureFormat( GLcontext *ctx, GLint internalFormat,
+                         GLenum srcFormat, GLenum srcType );
+extern GLboolean fxDDIsCompressedFormat (GLcontext *ctx, GLenum internalFormat);
+extern GLuint fxDDCompressedTextureSize (GLcontext *ctx,
+                                         GLsizei width, GLsizei height, GLsizei depth,
+                                         GLenum format);
+extern void fxDDTexImage2D(GLcontext * ctx, GLenum target, GLint level,
+			   GLint internalFormat, GLint width, GLint height,
+			   GLint border, GLenum format, GLenum type,
+			   const GLvoid * pixels,
+			   const struct gl_pixelstore_attrib *packing,
+			   struct gl_texture_object *texObj,
+			   struct gl_texture_image *texImage);
+extern void fxDDTexSubImage2D(GLcontext * ctx, GLenum target, GLint level,
+			      GLint xoffset, GLint yoffset,
+			      GLsizei width, GLsizei height,
+			      GLenum format, GLenum type,
+			      const GLvoid * pixels,
+			      const struct gl_pixelstore_attrib *packing,
+			      struct gl_texture_object *texObj,
+			      struct gl_texture_image *texImage);
+extern void fxDDCompressedTexImage2D(GLcontext *ctx, GLenum target,
+                                     GLint level, GLint internalFormat,
+                                     GLsizei width, GLsizei height, GLint border,
+                                     GLsizei imageSize, const GLvoid *data,
+                                     struct gl_texture_object *texObj,
+                                     struct gl_texture_image *texImage);
+extern void fxDDCompressedTexSubImage2D(GLcontext *ctx, GLenum target,
+                                        GLint level, GLint xoffset,
+                                        GLint yoffset, GLsizei width,
+                                        GLint height, GLenum format,
+                                        GLsizei imageSize, const GLvoid *data,
+                                        struct gl_texture_object *texObj,
+                                        struct gl_texture_image *texImage);
+extern void fxDDTexEnv(GLcontext *, GLenum, GLenum, const GLfloat *);
+extern void fxDDTexParam(GLcontext *, GLenum, struct gl_texture_object *,
+			 GLenum, const GLfloat *);
+extern void fxDDTexBind(GLcontext *, GLenum, struct gl_texture_object *);
+extern void fxDDTexDel(GLcontext *, struct gl_texture_object *);
+extern GLboolean fxDDIsTextureResident(GLcontext *, struct gl_texture_object *);
+extern void fxDDTexPalette(GLcontext *, struct gl_texture_object *);
+extern void fxDDTexUseGlbPalette(GLcontext *, GLboolean);
+
+extern void fxDDEnable(GLcontext *, GLenum, GLboolean);
+extern void fxDDAlphaFunc(GLcontext *, GLenum, GLfloat);
+extern void fxDDBlendFunc(GLcontext *, GLenum, GLenum);
+extern void fxDDBlendFuncSeparate(GLcontext *, GLenum, GLenum, GLenum, GLenum);
+extern void fxDDBlendEquation(GLcontext *, GLenum);
+extern void fxDDDepthMask(GLcontext *, GLboolean);
+extern void fxDDDepthFunc(GLcontext *, GLenum);
+extern void fxDDStencilFunc (GLcontext *ctx, GLenum func, GLint ref, GLuint mask);
+extern void fxDDStencilMask (GLcontext *ctx, GLuint mask);
+extern void fxDDStencilOp (GLcontext *ctx, GLenum sfail, GLenum zfail, GLenum zpass);
+
+extern void fxDDInitExtensions(GLcontext * ctx);
+
+extern void fxTMInit(fxMesaContext ctx);
+extern void fxTMClose(fxMesaContext ctx);
+extern void fxTMRestoreTextures_NoLock(fxMesaContext ctx);
+extern void fxTMMoveInTM(fxMesaContext, struct gl_texture_object *, GLint);
+extern void fxTMMoveOutTM(fxMesaContext, struct gl_texture_object *);
+#define fxTMMoveOutTM_NoLock fxTMMoveOutTM
+extern void fxTMFreeTexture(fxMesaContext, struct gl_texture_object *);
+extern void fxTMReloadMipMapLevel(fxMesaContext, struct gl_texture_object *,
+				  GLint);
+extern void fxTMReloadSubMipMapLevel(fxMesaContext,
+				     struct gl_texture_object *, GLint, GLint,
+				     GLint);
+extern int fxTMCheckStartAddr (fxMesaContext fxMesa, GLint tmu, tfxTexInfo *ti);
+
+extern void fxTexGetFormat(GLcontext *, GLenum, GrTextureFormat_t *, GLint *); /* [koolsmoky] */
+
+extern int fxTexGetInfo(int, int, GrLOD_t *, GrAspectRatio_t *,
+			float *, float *, int *, int *);
+
+extern void fxDDScissor(GLcontext * ctx,
+			GLint x, GLint y, GLsizei w, GLsizei h);
+extern void fxDDFogfv(GLcontext * ctx, GLenum pname, const GLfloat * params);
+extern void fxDDColorMask(GLcontext * ctx,
+			  GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+
+extern void fxDDWriteDepthSpan(GLcontext * ctx, GLuint n, GLint x, GLint y,
+			       const GLdepth depth[], const GLubyte mask[]);
+
+extern void fxDDReadDepthSpan(GLcontext * ctx, GLuint n, GLint x, GLint y,
+			      GLdepth depth[]);
+
+extern void fxDDWriteDepthPixels(GLcontext * ctx, GLuint n,
+				 const GLint x[], const GLint y[],
+				 const GLdepth depth[], const GLubyte mask[]);
+
+extern void fxDDReadDepthPixels(GLcontext * ctx, GLuint n,
+				const GLint x[], const GLint y[],
+				GLdepth depth[]);
+
+extern void fxDDShadeModel(GLcontext * ctx, GLenum mode);
+
+extern void fxDDCullFace(GLcontext * ctx, GLenum mode);
+extern void fxDDFrontFace(GLcontext * ctx, GLenum mode);
+
+extern void fxPrintRenderState(const char *msg, GLuint state);
+extern void fxPrintHintState(const char *msg, GLuint state);
+
+extern int fxDDInitFxMesaContext(fxMesaContext fxMesa);
+extern void fxDDDestroyFxMesaContext(fxMesaContext fxMesa);
+
+
+extern void fxSetScissorValues(GLcontext * ctx);
+extern void fxTMMoveInTM_NoLock(fxMesaContext fxMesa,
+				struct gl_texture_object *tObj, GLint where);
+
+extern void fxCheckIsInHardware(GLcontext *ctx);
+
+/* fxsetup:
+ * semi-private functions
+ */
+void fxSetupCull (GLcontext * ctx);
+void fxSetupScissor (GLcontext * ctx);
+void fxSetupColorMask (GLcontext * ctx);
+void fxSetupBlend (GLcontext *ctx);
+void fxSetupDepthTest (GLcontext *ctx);
+void fxSetupTexture (GLcontext *ctx);
+
+/* Flags for software fallback cases */
+#define FX_FALLBACK_TEXTURE_1D_3D	0x0001
+#define FX_FALLBACK_DRAW_BUFFER		0x0002
+#define FX_FALLBACK_SPECULAR		0x0004
+#define FX_FALLBACK_STENCIL		0x0008
+#define FX_FALLBACK_RENDER_MODE		0x0010
+#define FX_FALLBACK_LOGICOP		0x0020
+#define FX_FALLBACK_TEXTURE_ENV		0x0040
+#define FX_FALLBACK_TEXTURE_BORDER	0x0080
+#define FX_FALLBACK_COLORMASK		0x0100
+#define FX_FALLBACK_BLEND		0x0200
+#define FX_FALLBACK_TEXTURE_MULTI	0x0400
+
+extern GLuint fx_check_IsInHardware(GLcontext *ctx);
+
+/* run-time debugging */
+#if FX_DEBUG
+extern int TDFX_DEBUG;
+#else
+#define TDFX_DEBUG		0
+#endif
+
+#endif
diff --git a/reactos/lib/mesa32/src/drivers/glide/fxg.c b/reactos/lib/mesa32/src/drivers/glide/fxg.c
new file mode 100644
index 00000000000..7f75f1292c2
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/glide/fxg.c
@@ -0,0 +1,2294 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.0.1
+ * 
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * Mesa/FX device driver. Interface to Glide3.
+ *
+ *  Copyright (c) 2003 - Daniel Borca
+ *  Email : dborca@users.sourceforge.net
+ *  Web   : http://www.geocities.com/dborca
+ */
+
+
+#ifdef FX
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <assert.h>
+
+#define DEBUG_TRAP_internal
+#include "fxg.h"
+
+
+
+/****************************************************************************\
+* logging                                                                    *
+\****************************************************************************/
+#if DEBUG_TRAP
+#define TRAP_LOG trp_printf
+#ifdef __GNUC__
+__attribute__ ((format(printf, 1, 2)))
+#endif /* __GNUC__ */
+int trp_printf (const char *format, ...)
+{
+ va_list arg;
+ int n;
+ FILE *trap_file;
+ va_start(arg, format);
+ trap_file = fopen("trap.log", "a");
+ if (trap_file == NULL) {
+    trap_file = stderr;
+ }
+ n = vfprintf(trap_file, format, arg);
+ fclose(trap_file);
+ va_end(arg);
+ return n;
+}
+#else  /* DEBUG_TRAP */
+#ifdef __GNUC__
+#define TRAP_LOG(format, ...) do {} while (0)
+#else  /* __GNUC__ */
+#define TRAP_LOG              0 && (unsigned long)
+#endif /* __GNUC__ */
+#endif /* DEBUG_TRAP */
+
+
+
+#if DEBUG_TRAP
+/****************************************************************************\
+* helpers                                                                    *
+\****************************************************************************/
+
+#define GOT "\t"
+
+const char *TRP_BOOL (FxBool b)
+{
+ return b ? "FXTRUE" : "FXFALSE";
+}
+
+#define TRAP_CASE_STRING(name) case name: return #name
+#define TRAP_NODEFAULT default: assert(0)
+
+const char *TRP_PARAM (FxU32 mode)
+{
+ switch (mode) {
+        TRAP_CASE_STRING(GR_PARAM_DISABLE);
+        TRAP_CASE_STRING(GR_PARAM_ENABLE);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_VTX (FxU32 param)
+{
+ switch (param) {
+        TRAP_CASE_STRING(GR_PARAM_XY);
+        TRAP_CASE_STRING(GR_PARAM_Z);
+        TRAP_CASE_STRING(GR_PARAM_W);
+        TRAP_CASE_STRING(GR_PARAM_Q);
+        TRAP_CASE_STRING(GR_PARAM_FOG_EXT);
+        TRAP_CASE_STRING(GR_PARAM_A);
+        TRAP_CASE_STRING(GR_PARAM_RGB);
+        TRAP_CASE_STRING(GR_PARAM_PARGB);
+        TRAP_CASE_STRING(GR_PARAM_ST0);
+        TRAP_CASE_STRING(GR_PARAM_ST1);
+        TRAP_CASE_STRING(GR_PARAM_ST2);
+        TRAP_CASE_STRING(GR_PARAM_Q0);
+        TRAP_CASE_STRING(GR_PARAM_Q1);
+        TRAP_CASE_STRING(GR_PARAM_Q2);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_ARRAY (FxU32 mode)
+{
+ switch (mode) {
+        TRAP_CASE_STRING(GR_POINTS);
+        TRAP_CASE_STRING(GR_LINE_STRIP);
+        TRAP_CASE_STRING(GR_LINES);
+        TRAP_CASE_STRING(GR_POLYGON);
+        TRAP_CASE_STRING(GR_TRIANGLE_STRIP);
+        TRAP_CASE_STRING(GR_TRIANGLE_FAN);
+        TRAP_CASE_STRING(GR_TRIANGLES);
+        TRAP_CASE_STRING(GR_TRIANGLE_STRIP_CONTINUE);
+        TRAP_CASE_STRING(GR_TRIANGLE_FAN_CONTINUE);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_BUFFER (GrBuffer_t buffer)
+{
+ switch (buffer) {
+        TRAP_CASE_STRING(GR_BUFFER_FRONTBUFFER);
+        TRAP_CASE_STRING(GR_BUFFER_BACKBUFFER);
+        TRAP_CASE_STRING(GR_BUFFER_AUXBUFFER);
+        TRAP_CASE_STRING(GR_BUFFER_DEPTHBUFFER);
+        TRAP_CASE_STRING(GR_BUFFER_ALPHABUFFER);
+        TRAP_CASE_STRING(GR_BUFFER_TRIPLEBUFFER);
+        TRAP_CASE_STRING(GR_BUFFER_TEXTUREBUFFER_EXT);
+        TRAP_CASE_STRING(GR_BUFFER_TEXTUREAUXBUFFER_EXT);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_ORIGIN (GrOriginLocation_t origin_location)
+{
+ switch (origin_location) {
+        TRAP_CASE_STRING(GR_ORIGIN_UPPER_LEFT);
+        TRAP_CASE_STRING(GR_ORIGIN_LOWER_LEFT);
+        TRAP_CASE_STRING(GR_ORIGIN_ANY);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_REFRESH (GrScreenRefresh_t refresh_rate)
+{
+ switch (refresh_rate) {
+        TRAP_CASE_STRING(GR_REFRESH_60Hz);
+        TRAP_CASE_STRING(GR_REFRESH_70Hz);
+        TRAP_CASE_STRING(GR_REFRESH_72Hz);
+        TRAP_CASE_STRING(GR_REFRESH_75Hz);
+        TRAP_CASE_STRING(GR_REFRESH_80Hz);
+        TRAP_CASE_STRING(GR_REFRESH_90Hz);
+        TRAP_CASE_STRING(GR_REFRESH_100Hz);
+        TRAP_CASE_STRING(GR_REFRESH_85Hz);
+        TRAP_CASE_STRING(GR_REFRESH_120Hz);
+        TRAP_CASE_STRING(GR_REFRESH_NONE);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_COLFMT (GrColorFormat_t color_format)
+{
+ switch (color_format) {
+        TRAP_CASE_STRING(GR_COLORFORMAT_ARGB);
+        TRAP_CASE_STRING(GR_COLORFORMAT_ABGR);
+        TRAP_CASE_STRING(GR_COLORFORMAT_RGBA);
+        TRAP_CASE_STRING(GR_COLORFORMAT_BGRA);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_RESOLUTION (GrScreenResolution_t screen_resolution)
+{
+ switch (screen_resolution) {
+        TRAP_CASE_STRING(GR_RESOLUTION_320x200);
+        TRAP_CASE_STRING(GR_RESOLUTION_320x240);
+        TRAP_CASE_STRING(GR_RESOLUTION_400x256);
+        TRAP_CASE_STRING(GR_RESOLUTION_512x384);
+        TRAP_CASE_STRING(GR_RESOLUTION_640x200);
+        TRAP_CASE_STRING(GR_RESOLUTION_640x350);
+        TRAP_CASE_STRING(GR_RESOLUTION_640x400);
+        TRAP_CASE_STRING(GR_RESOLUTION_640x480);
+        TRAP_CASE_STRING(GR_RESOLUTION_800x600);
+        TRAP_CASE_STRING(GR_RESOLUTION_960x720);
+        TRAP_CASE_STRING(GR_RESOLUTION_856x480);
+        TRAP_CASE_STRING(GR_RESOLUTION_512x256);
+        TRAP_CASE_STRING(GR_RESOLUTION_1024x768);
+        TRAP_CASE_STRING(GR_RESOLUTION_1280x1024);
+        TRAP_CASE_STRING(GR_RESOLUTION_1600x1200);
+        TRAP_CASE_STRING(GR_RESOLUTION_400x300);
+        TRAP_CASE_STRING(GR_RESOLUTION_1152x864);
+        TRAP_CASE_STRING(GR_RESOLUTION_1280x960);
+        TRAP_CASE_STRING(GR_RESOLUTION_1600x1024);
+        TRAP_CASE_STRING(GR_RESOLUTION_1792x1344);
+        TRAP_CASE_STRING(GR_RESOLUTION_1856x1392);
+        TRAP_CASE_STRING(GR_RESOLUTION_1920x1440);
+        TRAP_CASE_STRING(GR_RESOLUTION_2048x1536);
+        TRAP_CASE_STRING(GR_RESOLUTION_2048x2048);
+        TRAP_CASE_STRING(GR_RESOLUTION_NONE);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_BLEND (GrAlphaBlendFnc_t func)
+{
+ switch (func) {
+        TRAP_CASE_STRING(GR_BLEND_ZERO);
+        TRAP_CASE_STRING(GR_BLEND_SRC_ALPHA);
+        TRAP_CASE_STRING(GR_BLEND_SRC_COLOR);
+        /*TRAP_CASE_STRING(GR_BLEND_DST_COLOR); ==GR_BLEND_SRC_COLOR*/
+        TRAP_CASE_STRING(GR_BLEND_DST_ALPHA);
+        TRAP_CASE_STRING(GR_BLEND_ONE);
+        TRAP_CASE_STRING(GR_BLEND_ONE_MINUS_SRC_ALPHA);
+        TRAP_CASE_STRING(GR_BLEND_ONE_MINUS_SRC_COLOR);
+        /*TRAP_CASE_STRING(GR_BLEND_ONE_MINUS_DST_COLOR); ==GR_BLEND_ONE_MINUS_SRC_COLOR*/
+        TRAP_CASE_STRING(GR_BLEND_ONE_MINUS_DST_ALPHA);
+        TRAP_CASE_STRING(GR_BLEND_SAME_COLOR_EXT);
+        /*TRAP_CASE_STRING(GR_BLEND_RESERVED_8); ==GR_BLEND_SAME_COLOR_EXT*/
+        TRAP_CASE_STRING(GR_BLEND_ONE_MINUS_SAME_COLOR_EXT);
+        /*TRAP_CASE_STRING(GR_BLEND_RESERVED_9); ==GR_BLEND_ONE_MINUS_SAME_COLOR_EXT*/
+        TRAP_CASE_STRING(GR_BLEND_RESERVED_A);
+        TRAP_CASE_STRING(GR_BLEND_RESERVED_B);
+        TRAP_CASE_STRING(GR_BLEND_RESERVED_C);
+        TRAP_CASE_STRING(GR_BLEND_RESERVED_D);
+        TRAP_CASE_STRING(GR_BLEND_RESERVED_E);
+        TRAP_CASE_STRING(GR_BLEND_ALPHA_SATURATE);
+        /*TRAP_CASE_STRING(GR_BLEND_PREFOG_COLOR); ==GR_BLEND_ALPHA_SATURATE*/
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_CMBFUNC (GrCombineFunction_t cfunc)
+{
+ switch (cfunc) {
+        TRAP_CASE_STRING(GR_COMBINE_FUNCTION_ZERO);
+        /*TRAP_CASE_STRING(GR_COMBINE_FUNCTION_NONE); ==GR_COMBINE_FUNCTION_ZERO*/
+        TRAP_CASE_STRING(GR_COMBINE_FUNCTION_LOCAL);
+        TRAP_CASE_STRING(GR_COMBINE_FUNCTION_LOCAL_ALPHA);
+        TRAP_CASE_STRING(GR_COMBINE_FUNCTION_SCALE_OTHER);
+        /*TRAP_CASE_STRING(GR_COMBINE_FUNCTION_BLEND_OTHER); ==GR_COMBINE_FUNCTION_SCALE_OTHER*/
+        TRAP_CASE_STRING(GR_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL);
+        TRAP_CASE_STRING(GR_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL_ALPHA);
+        TRAP_CASE_STRING(GR_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL);
+        TRAP_CASE_STRING(GR_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL);
+        /*TRAP_CASE_STRING(GR_COMBINE_FUNCTION_BLEND); ==GR_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL*/
+        TRAP_CASE_STRING(GR_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL_ALPHA);
+        TRAP_CASE_STRING(GR_COMBINE_FUNCTION_SCALE_MINUS_LOCAL_ADD_LOCAL);
+        /*TRAP_CASE_STRING(GR_COMBINE_FUNCTION_BLEND_LOCAL); ==GR_COMBINE_FUNCTION_SCALE_MINUS_LOCAL_ADD_LOCAL*/
+        TRAP_CASE_STRING(GR_COMBINE_FUNCTION_SCALE_MINUS_LOCAL_ADD_LOCAL_ALPHA);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_CMBFACT (GrCombineFactor_t cfactor)
+{
+ switch (cfactor) {
+        TRAP_CASE_STRING(GR_COMBINE_FACTOR_ZERO);
+        /*TRAP_CASE_STRING(GR_COMBINE_FACTOR_NONE); ==GR_COMBINE_FACTOR_ZERO*/
+        TRAP_CASE_STRING(GR_COMBINE_FACTOR_LOCAL);
+        TRAP_CASE_STRING(GR_COMBINE_FACTOR_OTHER_ALPHA);
+        TRAP_CASE_STRING(GR_COMBINE_FACTOR_LOCAL_ALPHA);
+        TRAP_CASE_STRING(GR_COMBINE_FACTOR_TEXTURE_ALPHA);
+        TRAP_CASE_STRING(GR_COMBINE_FACTOR_TEXTURE_RGB);
+        /*TRAP_CASE_STRING(GR_COMBINE_FACTOR_DETAIL_FACTOR); ==GR_COMBINE_FACTOR_TEXTURE_ALPHA*/
+        /*TRAP_CASE_STRING(GR_COMBINE_FACTOR_LOD_FRACTION); ==GR_COMBINE_FACTOR_TEXTURE_RGB ???*/
+        TRAP_CASE_STRING(GR_COMBINE_FACTOR_ONE);
+        TRAP_CASE_STRING(GR_COMBINE_FACTOR_ONE_MINUS_LOCAL);
+        TRAP_CASE_STRING(GR_COMBINE_FACTOR_ONE_MINUS_OTHER_ALPHA);
+        TRAP_CASE_STRING(GR_COMBINE_FACTOR_ONE_MINUS_LOCAL_ALPHA);
+        TRAP_CASE_STRING(GR_COMBINE_FACTOR_ONE_MINUS_TEXTURE_ALPHA);
+        /*TRAP_CASE_STRING(GR_COMBINE_FACTOR_ONE_MINUS_DETAIL_FACTOR); ==GR_COMBINE_FACTOR_ONE_MINUS_TEXTURE_ALPHA*/
+        TRAP_CASE_STRING(GR_COMBINE_FACTOR_ONE_MINUS_LOD_FRACTION);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_CMBLOCAL (GrCombineLocal_t clocal)
+{
+ switch (clocal) {
+        TRAP_CASE_STRING(GR_COMBINE_LOCAL_ITERATED);
+        TRAP_CASE_STRING(GR_COMBINE_LOCAL_CONSTANT);
+        /*TRAP_CASE_STRING(GR_COMBINE_LOCAL_NONE); ==GR_COMBINE_LOCAL_CONSTANT*/
+        TRAP_CASE_STRING(GR_COMBINE_LOCAL_DEPTH);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_CMBOTHER (GrCombineOther_t cother)
+{
+ switch (cother) {
+        TRAP_CASE_STRING(GR_COMBINE_OTHER_ITERATED);
+        TRAP_CASE_STRING(GR_COMBINE_OTHER_TEXTURE);
+        TRAP_CASE_STRING(GR_COMBINE_OTHER_CONSTANT);
+        /*TRAP_CASE_STRING(GR_COMBINE_OTHER_NONE); ==GR_COMBINE_OTHER_CONSTANT*/
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_CMPFUNC (GrCmpFnc_t function)
+{
+ switch (function) {
+        TRAP_CASE_STRING(GR_CMP_NEVER);
+        TRAP_CASE_STRING(GR_CMP_LESS);
+        TRAP_CASE_STRING(GR_CMP_EQUAL);
+        TRAP_CASE_STRING(GR_CMP_LEQUAL);
+        TRAP_CASE_STRING(GR_CMP_GREATER);
+        TRAP_CASE_STRING(GR_CMP_NOTEQUAL);
+        TRAP_CASE_STRING(GR_CMP_GEQUAL);
+        TRAP_CASE_STRING(GR_CMP_ALWAYS);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_CKMODE (GrChromakeyMode_t mode)
+{
+ switch (mode) {
+        TRAP_CASE_STRING(GR_CHROMAKEY_DISABLE);
+        TRAP_CASE_STRING(GR_CHROMAKEY_ENABLE);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_CULLMODE (GrCullMode_t mode)
+{
+ switch (mode) {
+        TRAP_CASE_STRING(GR_CULL_DISABLE);
+        TRAP_CASE_STRING(GR_CULL_NEGATIVE);
+        TRAP_CASE_STRING(GR_CULL_POSITIVE);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_DEPTHMODE (GrDepthBufferMode_t mode)
+{
+ switch (mode) {
+        TRAP_CASE_STRING(GR_DEPTHBUFFER_DISABLE);
+        TRAP_CASE_STRING(GR_DEPTHBUFFER_ZBUFFER);
+        TRAP_CASE_STRING(GR_DEPTHBUFFER_WBUFFER);
+        TRAP_CASE_STRING(GR_DEPTHBUFFER_ZBUFFER_COMPARE_TO_BIAS);
+        TRAP_CASE_STRING(GR_DEPTHBUFFER_WBUFFER_COMPARE_TO_BIAS);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_DITHERMODE (GrDitherMode_t mode)
+{
+ switch (mode) {
+        TRAP_CASE_STRING(GR_DITHER_DISABLE);
+        TRAP_CASE_STRING(GR_DITHER_2x2);
+        TRAP_CASE_STRING(GR_DITHER_4x4);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_FOGMODE (GrFogMode_t mode)
+{
+ switch (mode) {
+        TRAP_CASE_STRING(GR_FOG_DISABLE);
+        TRAP_CASE_STRING(GR_FOG_WITH_TABLE_ON_FOGCOORD_EXT);
+        TRAP_CASE_STRING(GR_FOG_WITH_TABLE_ON_Q);
+        /*TRAP_CASE_STRING(GR_FOG_WITH_TABLE_ON_W); ==GR_FOG_WITH_TABLE_ON_Q*/
+        TRAP_CASE_STRING(GR_FOG_WITH_ITERATED_Z);
+        TRAP_CASE_STRING(GR_FOG_WITH_ITERATED_ALPHA_EXT);
+        TRAP_CASE_STRING(GR_FOG_MULT2);
+        TRAP_CASE_STRING(GR_FOG_ADD2);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_GETNAME (FxU32 pname)
+{
+ switch (pname) {
+        TRAP_CASE_STRING(GR_BITS_DEPTH);
+        TRAP_CASE_STRING(GR_BITS_RGBA);
+        TRAP_CASE_STRING(GR_FIFO_FULLNESS);
+        TRAP_CASE_STRING(GR_FOG_TABLE_ENTRIES);
+        TRAP_CASE_STRING(GR_GAMMA_TABLE_ENTRIES);
+        TRAP_CASE_STRING(GR_GLIDE_STATE_SIZE);
+        TRAP_CASE_STRING(GR_GLIDE_VERTEXLAYOUT_SIZE);
+        TRAP_CASE_STRING(GR_IS_BUSY);
+        TRAP_CASE_STRING(GR_LFB_PIXEL_PIPE);
+        TRAP_CASE_STRING(GR_MAX_TEXTURE_SIZE);
+        TRAP_CASE_STRING(GR_MAX_TEXTURE_ASPECT_RATIO);
+        TRAP_CASE_STRING(GR_MEMORY_FB);
+        TRAP_CASE_STRING(GR_MEMORY_TMU);
+        TRAP_CASE_STRING(GR_MEMORY_UMA);
+        TRAP_CASE_STRING(GR_NUM_BOARDS);
+        TRAP_CASE_STRING(GR_NON_POWER_OF_TWO_TEXTURES);
+        TRAP_CASE_STRING(GR_NUM_FB);
+        TRAP_CASE_STRING(GR_NUM_SWAP_HISTORY_BUFFER);
+        TRAP_CASE_STRING(GR_NUM_TMU);
+        TRAP_CASE_STRING(GR_PENDING_BUFFERSWAPS);
+        TRAP_CASE_STRING(GR_REVISION_FB);
+        TRAP_CASE_STRING(GR_REVISION_TMU);
+        TRAP_CASE_STRING(GR_STATS_LINES);
+        TRAP_CASE_STRING(GR_STATS_PIXELS_AFUNC_FAIL);
+        TRAP_CASE_STRING(GR_STATS_PIXELS_CHROMA_FAIL);
+        TRAP_CASE_STRING(GR_STATS_PIXELS_DEPTHFUNC_FAIL);
+        TRAP_CASE_STRING(GR_STATS_PIXELS_IN);
+        TRAP_CASE_STRING(GR_STATS_PIXELS_OUT);
+        TRAP_CASE_STRING(GR_STATS_PIXELS);
+        TRAP_CASE_STRING(GR_STATS_POINTS);
+        TRAP_CASE_STRING(GR_STATS_TRIANGLES_IN);
+        TRAP_CASE_STRING(GR_STATS_TRIANGLES_OUT);
+        TRAP_CASE_STRING(GR_STATS_TRIANGLES);
+        TRAP_CASE_STRING(GR_SWAP_HISTORY);
+        TRAP_CASE_STRING(GR_SUPPORTS_PASSTHRU);
+        TRAP_CASE_STRING(GR_TEXTURE_ALIGN);
+        TRAP_CASE_STRING(GR_VIDEO_POSITION);
+        TRAP_CASE_STRING(GR_VIEWPORT);
+        TRAP_CASE_STRING(GR_WDEPTH_MIN_MAX);
+        TRAP_CASE_STRING(GR_ZDEPTH_MIN_MAX);
+        TRAP_CASE_STRING(GR_VERTEX_PARAMETER);
+        TRAP_CASE_STRING(GR_BITS_GAMMA);
+        TRAP_CASE_STRING(GR_GET_RESERVED_1);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_GETSTRING (FxU32 pname)
+{
+ switch (pname) {
+        TRAP_CASE_STRING(GR_EXTENSION);
+        TRAP_CASE_STRING(GR_HARDWARE);
+        TRAP_CASE_STRING(GR_RENDERER);
+        TRAP_CASE_STRING(GR_VENDOR);
+        TRAP_CASE_STRING(GR_VERSION);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_ENABLE (GrEnableMode_t mode)
+{
+ switch (mode) {
+        TRAP_CASE_STRING(GR_AA_ORDERED);
+        TRAP_CASE_STRING(GR_ALLOW_MIPMAP_DITHER);
+        TRAP_CASE_STRING(GR_PASSTHRU);
+        TRAP_CASE_STRING(GR_SHAMELESS_PLUG);
+        TRAP_CASE_STRING(GR_VIDEO_SMOOTHING);
+        TRAP_CASE_STRING(GR_TEXTURE_UMA_EXT);
+        TRAP_CASE_STRING(GR_STENCIL_MODE_EXT);
+        TRAP_CASE_STRING(GR_OPENGL_MODE_EXT);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_COORD (GrCoordinateSpaceMode_t mode)
+{
+ switch (mode) {
+        TRAP_CASE_STRING(GR_WINDOW_COORDS);
+        TRAP_CASE_STRING(GR_CLIP_COORDS);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_STIPPLEMODE (GrStippleMode_t mode)
+{
+ switch (mode) {
+        TRAP_CASE_STRING(GR_STIPPLE_DISABLE);
+        TRAP_CASE_STRING(GR_STIPPLE_PATTERN);
+        TRAP_CASE_STRING(GR_STIPPLE_ROTATE);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_LODLEVEL (GrLOD_t lod)
+{
+ switch (lod) {
+        TRAP_CASE_STRING(GR_LOD_LOG2_2048);
+        TRAP_CASE_STRING(GR_LOD_LOG2_1024);
+        TRAP_CASE_STRING(GR_LOD_LOG2_512);
+        TRAP_CASE_STRING(GR_LOD_LOG2_256);
+        TRAP_CASE_STRING(GR_LOD_LOG2_128);
+        TRAP_CASE_STRING(GR_LOD_LOG2_64);
+        TRAP_CASE_STRING(GR_LOD_LOG2_32);
+        TRAP_CASE_STRING(GR_LOD_LOG2_16);
+        TRAP_CASE_STRING(GR_LOD_LOG2_8);
+        TRAP_CASE_STRING(GR_LOD_LOG2_4);
+        TRAP_CASE_STRING(GR_LOD_LOG2_2);
+        TRAP_CASE_STRING(GR_LOD_LOG2_1);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_ASPECTRATIO (GrAspectRatio_t aspect)
+{
+ switch (aspect) {
+        TRAP_CASE_STRING(GR_ASPECT_LOG2_8x1);
+        TRAP_CASE_STRING(GR_ASPECT_LOG2_4x1);
+        TRAP_CASE_STRING(GR_ASPECT_LOG2_2x1);
+        TRAP_CASE_STRING(GR_ASPECT_LOG2_1x1);
+        TRAP_CASE_STRING(GR_ASPECT_LOG2_1x2);
+        TRAP_CASE_STRING(GR_ASPECT_LOG2_1x4);
+        TRAP_CASE_STRING(GR_ASPECT_LOG2_1x8);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_TEXFMT (GrTextureFormat_t fmt)
+{
+ switch (fmt) {
+        TRAP_CASE_STRING(GR_TEXFMT_8BIT);
+        /*TRAP_CASE_STRING(GR_TEXFMT_RGB_332); ==GR_TEXFMT_8BIT*/
+        TRAP_CASE_STRING(GR_TEXFMT_YIQ_422);
+        TRAP_CASE_STRING(GR_TEXFMT_ALPHA_8);
+        TRAP_CASE_STRING(GR_TEXFMT_INTENSITY_8);
+        TRAP_CASE_STRING(GR_TEXFMT_ALPHA_INTENSITY_44);
+        TRAP_CASE_STRING(GR_TEXFMT_P_8);
+        TRAP_CASE_STRING(GR_TEXFMT_RSVD0);
+        /*TRAP_CASE_STRING(GR_TEXFMT_P_8_6666); ==GR_TEXFMT_RSVD0*/
+        /*TRAP_CASE_STRING(GR_TEXFMT_P_8_6666_EXT); ==GR_TEXFMT_RSVD0*/
+        TRAP_CASE_STRING(GR_TEXFMT_RSVD1);
+        TRAP_CASE_STRING(GR_TEXFMT_16BIT);
+        /*TRAP_CASE_STRING(GR_TEXFMT_ARGB_8332); ==GR_TEXFMT_16BIT*/
+        TRAP_CASE_STRING(GR_TEXFMT_AYIQ_8422);
+        TRAP_CASE_STRING(GR_TEXFMT_RGB_565);
+        TRAP_CASE_STRING(GR_TEXFMT_ARGB_1555);
+        TRAP_CASE_STRING(GR_TEXFMT_ARGB_4444);
+        TRAP_CASE_STRING(GR_TEXFMT_ALPHA_INTENSITY_88);
+        TRAP_CASE_STRING(GR_TEXFMT_AP_88);
+        TRAP_CASE_STRING(GR_TEXFMT_RSVD2);
+        /*TRAP_CASE_STRING(GR_TEXFMT_RSVD4); ==GR_TEXFMT_RSVD2*/
+        TRAP_CASE_STRING(GR_TEXFMT_ARGB_CMP_FXT1);
+        TRAP_CASE_STRING(GR_TEXFMT_ARGB_8888);
+        TRAP_CASE_STRING(GR_TEXFMT_YUYV_422);
+        TRAP_CASE_STRING(GR_TEXFMT_UYVY_422);
+        TRAP_CASE_STRING(GR_TEXFMT_AYUV_444);
+        TRAP_CASE_STRING(GR_TEXFMT_ARGB_CMP_DXT1);
+        TRAP_CASE_STRING(GR_TEXFMT_ARGB_CMP_DXT2);
+        TRAP_CASE_STRING(GR_TEXFMT_ARGB_CMP_DXT3);
+        TRAP_CASE_STRING(GR_TEXFMT_ARGB_CMP_DXT4);
+        TRAP_CASE_STRING(GR_TEXFMT_ARGB_CMP_DXT5);
+        TRAP_CASE_STRING(GR_TEXTFMT_RGB_888);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_EVENODD (FxU32 evenOdd)
+{
+ switch (evenOdd) {
+        TRAP_CASE_STRING(GR_MIPMAPLEVELMASK_EVEN);
+        TRAP_CASE_STRING(GR_MIPMAPLEVELMASK_ODD);
+        TRAP_CASE_STRING(GR_MIPMAPLEVELMASK_BOTH);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_NCC (GrNCCTable_t table)
+{
+ switch (table) {
+        TRAP_CASE_STRING(GR_NCCTABLE_NCC0);
+        TRAP_CASE_STRING(GR_NCCTABLE_NCC1);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_CLAMPMODE (GrTextureClampMode_t clampmode)
+{
+ switch (clampmode) {
+        TRAP_CASE_STRING(GR_TEXTURECLAMP_WRAP);
+        TRAP_CASE_STRING(GR_TEXTURECLAMP_CLAMP);
+        TRAP_CASE_STRING(GR_TEXTURECLAMP_MIRROR_EXT);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_TEXFILTER (GrTextureFilterMode_t filter_mode)
+{
+ switch (filter_mode) {
+        TRAP_CASE_STRING(GR_TEXTUREFILTER_POINT_SAMPLED);
+        TRAP_CASE_STRING(GR_TEXTUREFILTER_BILINEAR);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_TABLE (GrTexTable_t type)
+{
+ switch (type) {
+        TRAP_CASE_STRING(GR_TEXTABLE_NCC0);
+        TRAP_CASE_STRING(GR_TEXTABLE_NCC1);
+        TRAP_CASE_STRING(GR_TEXTABLE_PALETTE);
+        TRAP_CASE_STRING(GR_TEXTABLE_PALETTE_6666_EXT);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_MIPMODE (GrMipMapMode_t mode)
+{
+ switch (mode) {
+        TRAP_CASE_STRING(GR_MIPMAP_DISABLE);
+        TRAP_CASE_STRING(GR_MIPMAP_NEAREST);
+        TRAP_CASE_STRING(GR_MIPMAP_NEAREST_DITHER);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_TEXBASERANGE (GrTexBaseRange_t range)
+{
+ switch (range) {
+        TRAP_CASE_STRING(GR_TEXBASE_2048);
+        TRAP_CASE_STRING(GR_TEXBASE_1024);
+        TRAP_CASE_STRING(GR_TEXBASE_512);
+        TRAP_CASE_STRING(GR_TEXBASE_256_TO_1);
+        TRAP_CASE_STRING(GR_TEXBASE_256);
+        TRAP_CASE_STRING(GR_TEXBASE_128);
+        TRAP_CASE_STRING(GR_TEXBASE_64);
+        TRAP_CASE_STRING(GR_TEXBASE_32_TO_1);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_LOCKTYPE (GrLock_t type)
+{
+ switch (type) {
+        TRAP_CASE_STRING(GR_LFB_READ_ONLY);
+        TRAP_CASE_STRING(GR_LFB_WRITE_ONLY);
+        /*TRAP_CASE_STRING(GR_LFB_IDLE); ==GR_LFB_READ_ONLY*/
+        TRAP_CASE_STRING(GR_LFB_NOIDLE);
+        TRAP_CASE_STRING(GR_LFB_WRITE_ONLY_EXPLICIT_EXT);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_WRITEMODE (GrLfbWriteMode_t writeMode)
+{
+ switch (writeMode) {
+        TRAP_CASE_STRING(GR_LFBWRITEMODE_565);
+        TRAP_CASE_STRING(GR_LFBWRITEMODE_555);
+        TRAP_CASE_STRING(GR_LFBWRITEMODE_1555);
+        TRAP_CASE_STRING(GR_LFBWRITEMODE_RESERVED1);
+        TRAP_CASE_STRING(GR_LFBWRITEMODE_888);
+        TRAP_CASE_STRING(GR_LFBWRITEMODE_8888);
+        TRAP_CASE_STRING(GR_LFBWRITEMODE_RESERVED2);
+        TRAP_CASE_STRING(GR_LFBWRITEMODE_RESERVED3);
+        TRAP_CASE_STRING(GR_LFBWRITEMODE_Z32);
+        TRAP_CASE_STRING(GR_LFBWRITEMODE_RESERVED5);
+        TRAP_CASE_STRING(GR_LFBWRITEMODE_RESERVED6);
+        TRAP_CASE_STRING(GR_LFBWRITEMODE_RESERVED7);
+        TRAP_CASE_STRING(GR_LFBWRITEMODE_565_DEPTH);
+        TRAP_CASE_STRING(GR_LFBWRITEMODE_555_DEPTH);
+        TRAP_CASE_STRING(GR_LFBWRITEMODE_1555_DEPTH);
+        TRAP_CASE_STRING(GR_LFBWRITEMODE_ZA16);
+        TRAP_CASE_STRING(GR_LFBWRITEMODE_ANY);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_SRCFMT (GrLfbSrcFmt_t src_format)
+{
+ switch (src_format) {
+        TRAP_CASE_STRING(GR_LFB_SRC_FMT_565);
+        TRAP_CASE_STRING(GR_LFB_SRC_FMT_555);
+        TRAP_CASE_STRING(GR_LFB_SRC_FMT_1555);
+        TRAP_CASE_STRING(GR_LFB_SRC_FMT_888);
+        TRAP_CASE_STRING(GR_LFB_SRC_FMT_8888);
+        TRAP_CASE_STRING(GR_LFB_SRC_FMT_565_DEPTH);
+        TRAP_CASE_STRING(GR_LFB_SRC_FMT_555_DEPTH);
+        TRAP_CASE_STRING(GR_LFB_SRC_FMT_1555_DEPTH);
+        TRAP_CASE_STRING(GR_LFB_SRC_FMT_ZA16);
+        TRAP_CASE_STRING(GR_LFB_SRC_FMT_RLE16);
+        TRAP_CASE_STRING(GR_LFBWRITEMODE_Z32); /*???*/
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_CRMODE (GrChromaRangeMode_t mode)
+{
+ switch (mode) {
+        TRAP_CASE_STRING(GR_CHROMARANGE_DISABLE_EXT);
+        /*TRAP_CASE_STRING(GR_CHROMARANGE_RGB_ALL_EXT); ==GR_CHROMARANGE_DISABLE_EXT*/
+        TRAP_CASE_STRING(GR_CHROMARANGE_ENABLE_EXT);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_PIXFMT (GrPixelFormat_t pixelformat)
+{
+ switch (pixelformat) {
+        TRAP_CASE_STRING(GR_PIXFMT_I_8);
+        TRAP_CASE_STRING(GR_PIXFMT_AI_88);
+        TRAP_CASE_STRING(GR_PIXFMT_RGB_565);
+        TRAP_CASE_STRING(GR_PIXFMT_ARGB_1555);
+        TRAP_CASE_STRING(GR_PIXFMT_ARGB_8888);
+        TRAP_CASE_STRING(GR_PIXFMT_AA_2_RGB_565);
+        TRAP_CASE_STRING(GR_PIXFMT_AA_2_ARGB_1555);
+        TRAP_CASE_STRING(GR_PIXFMT_AA_2_ARGB_8888);
+        TRAP_CASE_STRING(GR_PIXFMT_AA_4_RGB_565);
+        TRAP_CASE_STRING(GR_PIXFMT_AA_4_ARGB_1555);
+        TRAP_CASE_STRING(GR_PIXFMT_AA_4_ARGB_8888);
+        TRAP_CASE_STRING(GR_PIXFMT_AA_8_RGB_565);
+        TRAP_CASE_STRING(GR_PIXFMT_AA_8_ARGB_1555);
+        TRAP_CASE_STRING(GR_PIXFMT_AA_8_ARGB_8888);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_STENCILOP (GrStencilOp_t op)
+{
+ switch (op) {
+        TRAP_CASE_STRING(GR_STENCILOP_KEEP);
+        TRAP_CASE_STRING(GR_STENCILOP_ZERO);
+        TRAP_CASE_STRING(GR_STENCILOP_REPLACE);
+        TRAP_CASE_STRING(GR_STENCILOP_INCR_CLAMP);
+        TRAP_CASE_STRING(GR_STENCILOP_DECR_CLAMP);
+        TRAP_CASE_STRING(GR_STENCILOP_INVERT);
+        TRAP_CASE_STRING(GR_STENCILOP_INCR_WRAP);
+        TRAP_CASE_STRING(GR_STENCILOP_DECR_WRAP);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_BLENDOP (GrAlphaBlendOp_t op)
+{
+ switch (op) {
+        TRAP_CASE_STRING(GR_BLEND_OP_ADD);
+        TRAP_CASE_STRING(GR_BLEND_OP_SUB);
+        TRAP_CASE_STRING(GR_BLEND_OP_REVSUB);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_CU (GrCCUColor_t a)
+{
+ switch (a) {
+        TRAP_CASE_STRING(GR_CMBX_ZERO);
+        TRAP_CASE_STRING(GR_CMBX_TEXTURE_ALPHA);
+        TRAP_CASE_STRING(GR_CMBX_ALOCAL);
+        TRAP_CASE_STRING(GR_CMBX_AOTHER);
+        TRAP_CASE_STRING(GR_CMBX_B);
+        TRAP_CASE_STRING(GR_CMBX_CONSTANT_ALPHA);
+        TRAP_CASE_STRING(GR_CMBX_CONSTANT_COLOR);
+        TRAP_CASE_STRING(GR_CMBX_DETAIL_FACTOR);
+        TRAP_CASE_STRING(GR_CMBX_ITALPHA);
+        TRAP_CASE_STRING(GR_CMBX_ITRGB);
+        TRAP_CASE_STRING(GR_CMBX_LOCAL_TEXTURE_ALPHA);
+        TRAP_CASE_STRING(GR_CMBX_LOCAL_TEXTURE_RGB);
+        TRAP_CASE_STRING(GR_CMBX_LOD_FRAC);
+        TRAP_CASE_STRING(GR_CMBX_OTHER_TEXTURE_ALPHA);
+        TRAP_CASE_STRING(GR_CMBX_OTHER_TEXTURE_RGB);
+        TRAP_CASE_STRING(GR_CMBX_TEXTURE_RGB);
+        TRAP_CASE_STRING(GR_CMBX_TMU_CALPHA);
+        TRAP_CASE_STRING(GR_CMBX_TMU_CCOLOR);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_CMBMODE (GrCombineMode_t a_mode)
+{
+ switch (a_mode) {
+        TRAP_CASE_STRING(GR_FUNC_MODE_ZERO);
+        TRAP_CASE_STRING(GR_FUNC_MODE_X);
+        TRAP_CASE_STRING(GR_FUNC_MODE_ONE_MINUS_X);
+        TRAP_CASE_STRING(GR_FUNC_MODE_NEGATIVE_X);
+        TRAP_CASE_STRING(GR_FUNC_MODE_X_MINUS_HALF);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_TMU (GrChipID_t tmu)
+{
+ switch (tmu) {
+        TRAP_CASE_STRING(GR_TMU0);
+        TRAP_CASE_STRING(GR_TMU1);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_TXDITHER (FxU32 dither)
+{
+ switch (dither) {
+        TRAP_CASE_STRING(TX_DITHER_NONE);
+        TRAP_CASE_STRING(TX_DITHER_4x4);
+        TRAP_CASE_STRING(TX_DITHER_ERR);
+        TRAP_NODEFAULT;
+ }
+}
+
+const char *TRP_TXCOMPRESS (FxU32 compress)
+{
+ switch (compress) {
+        TRAP_CASE_STRING(TX_COMPRESSION_STATISTICAL);
+        TRAP_CASE_STRING(TX_COMPRESSION_HEURISTIC);
+        TRAP_NODEFAULT;
+ }
+}
+
+
+
+/****************************************************************************\
+* REAL POINTERS                                                              *
+\****************************************************************************/
+
+/*
+** glide extensions
+*/
+char * (FX_CALL *real_grGetRegistryOrEnvironmentStringExt) (char *theEntry);
+void (FX_CALL *real_grGetGammaTableExt) (FxU32 nentries, FxU32 *red, FxU32 *green, FxU32 *blue);
+void (FX_CALL *real_grChromaRangeModeExt) (GrChromakeyMode_t mode);
+void (FX_CALL *real_grChromaRangeExt) (GrColor_t color, GrColor_t range, GrChromaRangeMode_t match_mode);
+void (FX_CALL *real_grTexChromaModeExt) (GrChipID_t tmu, GrChromakeyMode_t mode);
+void (FX_CALL *real_grTexChromaRangeExt) (GrChipID_t tmu, GrColor_t min, GrColor_t max, GrTexChromakeyMode_t mode);
+
+/* pointcast */
+void (FX_CALL *real_grTexDownloadTableExt) (GrChipID_t tmu, GrTexTable_t type, void *data);
+void (FX_CALL *real_grTexDownloadTablePartialExt) (GrChipID_t tmu, GrTexTable_t type, void *data, int start, int end);
+void (FX_CALL *real_grTexNCCTableExt) (GrChipID_t tmu, GrNCCTable_t table);
+
+/* tbext */
+void (FX_CALL *real_grTextureBufferExt) (GrChipID_t tmu, FxU32 startAddress, GrLOD_t thisLOD, GrLOD_t largeLOD, GrAspectRatio_t aspectRatio, GrTextureFormat_t format, FxU32 odd_even_mask);
+void (FX_CALL *real_grTextureAuxBufferExt) (GrChipID_t tmu, FxU32 startAddress, GrLOD_t thisLOD, GrLOD_t largeLOD, GrAspectRatio_t aspectRatio, GrTextureFormat_t format, FxU32 odd_even_mask);
+void (FX_CALL *real_grAuxBufferExt) (GrBuffer_t buffer);
+
+/* napalm */
+GrContext_t (FX_CALL *real_grSstWinOpenExt) (FxU32 hWnd, GrScreenResolution_t resolution, GrScreenRefresh_t refresh, GrColorFormat_t format, GrOriginLocation_t origin, GrPixelFormat_t pixelformat, int nColBuffers, int nAuxBuffers);
+void (FX_CALL *real_grStencilFuncExt) (GrCmpFnc_t fnc, GrStencil_t ref, GrStencil_t mask);
+void (FX_CALL *real_grStencilMaskExt) (GrStencil_t value);
+void (FX_CALL *real_grStencilOpExt) (GrStencilOp_t stencil_fail, GrStencilOp_t depth_fail, GrStencilOp_t depth_pass);
+void (FX_CALL *real_grLfbConstantStencilExt) (GrStencil_t value);
+void (FX_CALL *real_grBufferClearExt) (GrColor_t color, GrAlpha_t alpha, FxU32 depth, GrStencil_t stencil);
+void (FX_CALL *real_grColorCombineExt) (GrCCUColor_t a, GrCombineMode_t a_mode, GrCCUColor_t b, GrCombineMode_t b_mode, GrCCUColor_t c, FxBool c_invert, GrCCUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert);
+void (FX_CALL *real_grAlphaCombineExt) (GrACUColor_t a, GrCombineMode_t a_mode, GrACUColor_t b, GrCombineMode_t b_mode, GrACUColor_t c, FxBool c_invert, GrACUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert);
+void (FX_CALL *real_grTexColorCombineExt) (GrChipID_t tmu, GrTCCUColor_t a, GrCombineMode_t a_mode, GrTCCUColor_t b, GrCombineMode_t b_mode, GrTCCUColor_t c, FxBool c_invert, GrTCCUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert);
+void (FX_CALL *real_grTexAlphaCombineExt) (GrChipID_t tmu, GrTACUColor_t a, GrCombineMode_t a_mode, GrTACUColor_t b, GrCombineMode_t b_mode, GrTACUColor_t c, FxBool c_invert, GrTACUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert);
+void (FX_CALL *real_grConstantColorValueExt) (GrChipID_t tmu, GrColor_t value);
+void (FX_CALL *real_grColorMaskExt) (FxBool r, FxBool g, FxBool b, FxBool a);
+void (FX_CALL *real_grAlphaBlendFunctionExt) (GrAlphaBlendFnc_t rgb_sf, GrAlphaBlendFnc_t rgb_df, GrAlphaBlendOp_t rgb_op, GrAlphaBlendFnc_t alpha_sf, GrAlphaBlendFnc_t alpha_df, GrAlphaBlendOp_t alpha_op);
+void (FX_CALL *real_grTBufferWriteMaskExt) (FxU32 tmask);
+
+/*
+** texus
+*/
+void (FX_CALL *real_txImgQuantize) (char *dst, char *src, int w, int h, FxU32 format, FxU32 dither);
+void (FX_CALL *real_txMipQuantize) (TxMip *pxMip, TxMip *txMip, int fmt, FxU32 d, FxU32 comp);
+void (FX_CALL *real_txPalToNcc) (GuNccTable *ncc_table, const FxU32 *pal);
+
+
+
+/****************************************************************************\
+* DEBUG HOOKS                                                                *
+\****************************************************************************/
+
+/*
+** rendering functions
+*/
+void FX_CALL trap_grDrawPoint (const void *pt)
+{
+#define FN_NAME "grDrawPoint"
+ TRAP_LOG("%s(%p)\n", FN_NAME, pt);
+ grDrawPoint(pt);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grDrawLine (const void *v1,
+                              const void *v2)
+{
+#define FN_NAME "grDrawLine"
+ TRAP_LOG("%s(%p, %p)\n", FN_NAME, v1, v2);
+ grDrawLine(v1, v2);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grDrawTriangle (const void *a,
+                                  const void *b,
+                                  const void *c)
+{
+#define FN_NAME "grDrawTriangle"
+ TRAP_LOG("%s(%p, %p, %p)\n", FN_NAME, a, b, c);
+ grDrawTriangle(a, b, c);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grVertexLayout (FxU32 param,
+                                  FxI32 offset,
+                                  FxU32 mode)
+{
+#define FN_NAME "grVertexLayout"
+ TRAP_LOG("%s(%s, %ld, %s)\n", FN_NAME, TRP_VTX(param), offset, TRP_PARAM(mode));
+ grVertexLayout(param, offset, mode);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grDrawVertexArray (FxU32 mode,
+                                     FxU32 Count,
+                                     void  *pointers)
+{
+#define FN_NAME "grDrawVertexArray"
+ TRAP_LOG("%s(%s, %lu, %p)\n", FN_NAME, TRP_ARRAY(mode), Count, pointers);
+ grDrawVertexArray(mode, Count, pointers);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grDrawVertexArrayContiguous (FxU32 mode,
+                                               FxU32 Count,
+                                               void  *pointers,
+                                               FxU32 stride)
+{
+#define FN_NAME "grDrawVertexArrayContiguous"
+ TRAP_LOG("%s(%s, %lu, %p, %lu)\n", FN_NAME, TRP_ARRAY(mode), Count, pointers, stride);
+ grDrawVertexArrayContiguous(mode, Count, pointers, stride);
+#undef FN_NAME
+}
+
+/*
+**  Antialiasing Functions
+*/
+void FX_CALL trap_grAADrawTriangle (const void *a,
+                                    const void *b,
+                                    const void *c,
+                                    FxBool     ab_antialias,
+                                    FxBool     bc_antialias,
+                                    FxBool     ca_antialias)
+{
+#define FN_NAME "grAADrawTriangle"
+ TRAP_LOG("%s(%p, %p, %p, %s, %s, %s)\n", FN_NAME, a, b, c, TRP_BOOL(ab_antialias), TRP_BOOL(bc_antialias), TRP_BOOL(ca_antialias));
+ grAADrawTriangle(a, b, c, ab_antialias, bc_antialias, ca_antialias);
+#undef FN_NAME
+}
+
+/*
+** buffer management
+*/
+void FX_CALL trap_grBufferClear (GrColor_t color,
+                                 GrAlpha_t alpha,
+                                 FxU32     depth)
+{
+#define FN_NAME "grBufferClear"
+ TRAP_LOG("%s(%08lx, %02x, %08lx)\n", FN_NAME, color, alpha, depth);
+ grBufferClear(color, alpha, depth);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grBufferSwap (FxU32 swap_interval)
+{
+#define FN_NAME "grBufferSwap"
+ TRAP_LOG("%s(%lu)\n", FN_NAME, swap_interval);
+ grBufferSwap(swap_interval);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grRenderBuffer (GrBuffer_t buffer)
+{
+#define FN_NAME "grRenderBuffer"
+ TRAP_LOG("%s(%s)\n", FN_NAME, TRP_BUFFER(buffer));
+ grRenderBuffer(buffer);
+#undef FN_NAME
+}
+
+/*
+** error management
+*/
+void FX_CALL trap_grErrorSetCallback (GrErrorCallbackFnc_t fnc)
+{
+#define FN_NAME "grErrorSetCallback"
+ TRAP_LOG("%s(%p)\n", FN_NAME, (void *)fnc);
+ grErrorSetCallback(fnc);
+#undef FN_NAME
+}
+
+/*
+** SST routines
+*/
+void FX_CALL trap_grFinish (void)
+{
+#define FN_NAME "grFinish"
+ TRAP_LOG("%s()\n", FN_NAME);
+ grFinish();
+#undef FN_NAME
+}
+
+void FX_CALL trap_grFlush (void)
+{
+#define FN_NAME "grFlush"
+ TRAP_LOG("%s()\n", FN_NAME);
+ grFlush();
+#undef FN_NAME
+}
+
+GrContext_t FX_CALL trap_grSstWinOpen (FxU32                hWnd,
+                                       GrScreenResolution_t screen_resolution,
+                                       GrScreenRefresh_t    refresh_rate,
+                                       GrColorFormat_t      color_format,
+                                       GrOriginLocation_t   origin_location,
+                                       int                  nColBuffers,
+                                       int                  nAuxBuffers)
+{
+#define FN_NAME "grSstWinOpen"
+ GrContext_t rv;
+ TRAP_LOG("%s(%08lx, %s, %s, %s, %s, %d, %d)\n", FN_NAME, hWnd, TRP_RESOLUTION(screen_resolution), TRP_REFRESH(refresh_rate), TRP_COLFMT(color_format), TRP_ORIGIN(origin_location), nColBuffers, nAuxBuffers);
+ rv = grSstWinOpen(hWnd, screen_resolution, refresh_rate, color_format, origin_location, nColBuffers, nAuxBuffers);
+ TRAP_LOG(GOT "%p\n", (void *)rv);
+ return rv;
+#undef FN_NAME
+}
+
+FxBool FX_CALL trap_grSstWinClose (GrContext_t context)
+{
+#define FN_NAME "grSstWinClose"
+ FxBool rv;
+ TRAP_LOG("%s(%p)\n", FN_NAME, (void *)context);
+ rv = grSstWinClose(context);
+ TRAP_LOG(GOT "%s\n", TRP_BOOL(rv));
+ return rv;
+#undef FN_NAME
+}
+
+void FX_CALL trap_grSetNumPendingBuffers (FxI32 NumPendingBuffers)
+{
+#define FN_NAME "grSetNumPendingBuffers"
+ TRAP_LOG("%s(%ld)\n", FN_NAME, NumPendingBuffers);
+ grSetNumPendingBuffers(NumPendingBuffers);
+#undef FN_NAME
+}
+
+FxBool FX_CALL trap_grSelectContext (GrContext_t context)
+{
+#define FN_NAME "grSelectContext"
+ FxBool rv;
+ TRAP_LOG("%s(%p)\n", FN_NAME, (void *)context);
+ rv = grSelectContext(context);
+ TRAP_LOG(GOT "%s\n", TRP_BOOL(rv));
+ return rv;
+#undef FN_NAME
+}
+
+void FX_CALL trap_grSstOrigin (GrOriginLocation_t origin)
+{
+#define FN_NAME "grSstOrigin"
+ TRAP_LOG("%s(%s)\n", FN_NAME, TRP_ORIGIN(origin));
+ grSstOrigin(origin);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grSstSelect (int which_sst)
+{
+#define FN_NAME "grSstSelect"
+ TRAP_LOG("%s(%d)\n", FN_NAME, which_sst);
+ grSstSelect(which_sst);
+#undef FN_NAME
+}
+
+/*
+** Glide configuration and special effect maintenance functions
+*/
+void FX_CALL trap_grAlphaBlendFunction (GrAlphaBlendFnc_t rgb_sf,
+                                        GrAlphaBlendFnc_t rgb_df,
+                                        GrAlphaBlendFnc_t alpha_sf,
+                                        GrAlphaBlendFnc_t alpha_df)
+{
+#define FN_NAME "grAlphaBlendFunction"
+ TRAP_LOG("%s(%s, %s, %s, %s)\n", FN_NAME, TRP_BLEND(rgb_sf), TRP_BLEND(rgb_df), TRP_BLEND(alpha_sf), TRP_BLEND(alpha_df));
+ grAlphaBlendFunction(rgb_sf, rgb_df, alpha_sf, alpha_df);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grAlphaCombine (GrCombineFunction_t function,
+                                  GrCombineFactor_t   factor,
+                                  GrCombineLocal_t    local,
+                                  GrCombineOther_t    other,
+                                  FxBool              invert)
+{
+#define FN_NAME "grAlphaCombine"
+ TRAP_LOG("%s(%s, %s, %s, %s, %s)\n", FN_NAME, TRP_CMBFUNC(function), TRP_CMBFACT(factor), TRP_CMBLOCAL(local), TRP_CMBOTHER(other), TRP_BOOL(invert));
+ grAlphaCombine(function, factor, local, other, invert);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grAlphaControlsITRGBLighting (FxBool enable)
+{
+#define FN_NAME "grAlphaControlsITRGBLighting"
+ TRAP_LOG("%s(%s)\n", FN_NAME, TRP_BOOL(enable));
+ grAlphaControlsITRGBLighting(enable);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grAlphaTestFunction (GrCmpFnc_t function)
+{
+#define FN_NAME "grAlphaTestFunction"
+ TRAP_LOG("%s(%s)\n", FN_NAME, TRP_CMPFUNC(function));
+ grAlphaTestFunction(function);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grAlphaTestReferenceValue (GrAlpha_t value)
+{
+#define FN_NAME "grAlphaTestReferenceValue"
+ TRAP_LOG("%s(%02x)\n", FN_NAME, value);
+ grAlphaTestReferenceValue(value);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grChromakeyMode (GrChromakeyMode_t mode)
+{
+#define FN_NAME "grChromakeyMode"
+ TRAP_LOG("%s(%s)\n", FN_NAME, TRP_CKMODE(mode));
+ grChromakeyMode(mode);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grChromakeyValue (GrColor_t value)
+{
+#define FN_NAME "grChromakeyValue"
+ TRAP_LOG("%s(%08lx)\n", FN_NAME, value);
+ grChromakeyValue(value);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grClipWindow (FxU32 minx,
+                                FxU32 miny,
+                                FxU32 maxx,
+                                FxU32 maxy)
+{
+#define FN_NAME "grClipWindow"
+ TRAP_LOG("%s(%lu, %lu, %lu, %lu)\n", FN_NAME, minx, miny, maxx, maxy);
+ grClipWindow(minx, miny, maxx, maxy);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grColorCombine (GrCombineFunction_t function,
+                                  GrCombineFactor_t   factor,
+                                  GrCombineLocal_t    local,
+                                  GrCombineOther_t    other,
+                                  FxBool              invert)
+{
+#define FN_NAME "grColorCombine"
+ TRAP_LOG("%s(%s, %s, %s, %s, %s)\n", FN_NAME, TRP_CMBFUNC(function), TRP_CMBFACT(factor), TRP_CMBLOCAL(local), TRP_CMBOTHER(other), TRP_BOOL(invert));
+ grColorCombine(function, factor, local, other, invert);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grColorMask (FxBool rgb,
+                               FxBool a)
+{
+#define FN_NAME "grColorMask"
+ TRAP_LOG("%s(%s, %s)\n", FN_NAME, TRP_BOOL(rgb), TRP_BOOL(a));
+ grColorMask(rgb, a);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grCullMode (GrCullMode_t mode)
+{
+#define FN_NAME "grCullMode"
+ TRAP_LOG("%s(%s)\n", FN_NAME, TRP_CULLMODE(mode));
+ grCullMode(mode);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grConstantColorValue (GrColor_t value)
+{
+#define FN_NAME "grConstantColorValue"
+ TRAP_LOG("%s(%08lx)\n", FN_NAME, value);
+ grConstantColorValue(value);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grDepthBiasLevel (FxI32 level)
+{
+#define FN_NAME "grDepthBiasLevel"
+ TRAP_LOG("%s(%ld)\n", FN_NAME, level);
+ grDepthBiasLevel(level);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grDepthBufferFunction (GrCmpFnc_t function)
+{
+#define FN_NAME "grDepthBufferFunction"
+ TRAP_LOG("%s(%s)\n", FN_NAME, TRP_CMPFUNC(function));
+ grDepthBufferFunction(function);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grDepthBufferMode (GrDepthBufferMode_t mode)
+{
+#define FN_NAME "grDepthBufferMode"
+ TRAP_LOG("%s(%s)\n", FN_NAME, TRP_DEPTHMODE(mode));
+ grDepthBufferMode(mode);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grDepthMask (FxBool mask)
+{
+#define FN_NAME "grDepthMask"
+ TRAP_LOG("%s(%s)\n", FN_NAME, TRP_BOOL(mask));
+ grDepthMask(mask);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grDisableAllEffects (void)
+{
+#define FN_NAME "grDisableAllEffects"
+ TRAP_LOG("%s()\n", FN_NAME);
+ grDisableAllEffects();
+#undef FN_NAME
+}
+
+void FX_CALL trap_grDitherMode (GrDitherMode_t mode)
+{
+#define FN_NAME "grDitherMode"
+ TRAP_LOG("%s(%s)\n", FN_NAME, TRP_DITHERMODE(mode));
+ grDitherMode(mode);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grFogColorValue (GrColor_t fogcolor)
+{
+#define FN_NAME "grFogColorValue"
+ TRAP_LOG("%s(%08lx)\n", FN_NAME, fogcolor);
+ grFogColorValue(fogcolor);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grFogMode (GrFogMode_t mode)
+{
+#define FN_NAME "grFogMode"
+ TRAP_LOG("%s(%s)\n", FN_NAME, TRP_FOGMODE(mode));
+ grFogMode(mode);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grFogTable (const GrFog_t ft[])
+{
+#define FN_NAME "grFogTable"
+ TRAP_LOG("%s(%p)\n", FN_NAME, ft);
+ grFogTable(ft);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grLoadGammaTable (FxU32 nentries,
+                                    FxU32 *red,
+                                    FxU32 *green,
+                                    FxU32 *blue)
+{
+#define FN_NAME "grLoadGammaTable"
+ TRAP_LOG("%s(%lu, %p, %p, %p)\n", FN_NAME, nentries, (void *)red, (void *)green, (void *)blue);
+ grLoadGammaTable(nentries, red, green, blue);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grSplash (float x,
+                            float y,
+                            float width,
+                            float height,
+                            FxU32 frame)
+{
+#define FN_NAME "grSplash"
+ TRAP_LOG("%s(%f, %f, %f, %f, %lu)\n", FN_NAME, x, y, width, height, frame);
+ grSplash(x, y, width, height, frame);
+#undef FN_NAME
+}
+
+FxU32 FX_CALL trap_grGet (FxU32 pname,
+                          FxU32 plength,
+                          FxI32 *params)
+{
+#define FN_NAME "grGet"
+ FxU32 rv, i;
+ TRAP_LOG("%s(%s, %lu, %p)\n", FN_NAME, TRP_GETNAME(pname), plength, (void *)params);
+ rv = grGet(pname, plength, params);
+ TRAP_LOG(GOT "[");
+ for (i = 0; i < (rv/sizeof(FxI32)); i++) {
+     TRAP_LOG("%s%ld", i ? ", " : "", params[i]);
+ }
+ TRAP_LOG("]\n");
+ return rv;
+#undef FN_NAME
+}
+
+const char *FX_CALL trap_grGetString (FxU32 pname)
+{
+#define FN_NAME "grGetString"
+ const char *rv;
+ TRAP_LOG("%s(%s)\n", FN_NAME, TRP_GETSTRING(pname));
+ rv = grGetString(pname);
+ if (rv) {
+    TRAP_LOG(GOT "\"%s\"\n", rv);
+ } else {
+    TRAP_LOG(GOT "NULL\n");
+ }
+ return rv;
+#undef FN_NAME
+}
+
+FxI32 FX_CALL trap_grQueryResolutions (const GrResolution *resTemplate,
+                                       GrResolution       *output)
+{
+#define FN_NAME "grQueryResolutions"
+ FxI32 rv;
+ TRAP_LOG("%s(%p, %p)\n", FN_NAME, (void *)resTemplate, (void *)output);
+ rv = grQueryResolutions(resTemplate, output);
+ TRAP_LOG(GOT "%ld\n", rv);
+ return rv;
+#undef FN_NAME
+}
+
+FxBool FX_CALL trap_grReset (FxU32 what)
+{
+#define FN_NAME "grReset"
+ FxBool rv;
+ TRAP_LOG("%s(%s)\n", FN_NAME, TRP_GETNAME(what));
+ rv = grReset(what);
+ TRAP_LOG(GOT "%s\n", TRP_BOOL(rv));
+ return rv;
+#undef FN_NAME
+}
+
+GrProc FX_CALL trap_grGetProcAddress (char *procName)
+{
+#define FN_NAME "grGetProcAddress"
+ GrProc rv;
+ TRAP_LOG("%s(%s)\n", FN_NAME, procName);
+ rv = grGetProcAddress(procName);
+ TRAP_LOG(GOT "%p\n", (void *)rv);
+ return rv;
+#undef FN_NAME
+}
+
+void FX_CALL trap_grEnable (GrEnableMode_t mode)
+{
+#define FN_NAME "grEnable"
+ TRAP_LOG("%s(%s)\n", FN_NAME, TRP_ENABLE(mode));
+ grEnable(mode);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grDisable (GrEnableMode_t mode)
+{
+#define FN_NAME "grDisable"
+ TRAP_LOG("%s(%s)\n", FN_NAME, TRP_ENABLE(mode));
+ grDisable(mode);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grCoordinateSpace (GrCoordinateSpaceMode_t mode)
+{
+#define FN_NAME "grCoordinateSpace"
+ TRAP_LOG("%s(%s)\n", FN_NAME, TRP_COORD(mode));
+ grCoordinateSpace(mode);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grDepthRange (FxFloat n,
+                                FxFloat f)
+{
+#define FN_NAME "grDepthRange"
+ TRAP_LOG("%s(%f, %f)\n", FN_NAME, n, f);
+ grDepthRange(n, f);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grStippleMode (GrStippleMode_t mode)
+{
+#define FN_NAME "grStippleMode"
+ TRAP_LOG("%s(%s)\n", FN_NAME, TRP_STIPPLEMODE(mode));
+ grStippleMode(mode);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grStipplePattern (GrStipplePattern_t mode)
+{
+#define FN_NAME "grStipplePattern"
+ TRAP_LOG("%s(%08lx)\n", FN_NAME, mode);
+ grStipplePattern(mode);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grViewport (FxI32 x,
+                              FxI32 y,
+                              FxI32 width,
+                              FxI32 height)
+{
+#define FN_NAME "grViewport"
+ TRAP_LOG("%s(%ld, %ld, %ld, %ld)\n", FN_NAME, x, y, width, height);
+ grViewport(x, y, width, height);
+#undef FN_NAME
+}
+
+/*
+** texture mapping control functions
+*/
+FxU32 FX_CALL trap_grTexCalcMemRequired (GrLOD_t           lodmin,
+                                         GrLOD_t           lodmax,
+                                         GrAspectRatio_t   aspect,
+                                         GrTextureFormat_t fmt)
+{
+#define FN_NAME "grTexCalcMemRequired"
+ FxU32 rv;
+ TRAP_LOG("%s(%s, %s, %s, %s)\n", FN_NAME, TRP_LODLEVEL(lodmin), TRP_LODLEVEL(lodmax), TRP_ASPECTRATIO(aspect), TRP_TEXFMT(fmt));
+ rv = grTexCalcMemRequired(lodmin, lodmax, aspect, fmt);
+ TRAP_LOG(GOT "%lu\n", rv);
+ return rv;
+#undef FN_NAME
+}
+
+FxU32 FX_CALL trap_grTexTextureMemRequired (FxU32     evenOdd,
+                                            GrTexInfo *info)
+{
+#define FN_NAME "grTexTextureMemRequired"
+ FxU32 rv;
+ TRAP_LOG("%s(%s, %p)\n", FN_NAME, TRP_EVENODD(evenOdd), (void *)info);
+ rv = grTexTextureMemRequired(evenOdd, info);
+ TRAP_LOG(GOT "%lu\n", rv);
+ return rv;
+#undef FN_NAME
+}
+
+FxU32 FX_CALL trap_grTexMinAddress (GrChipID_t tmu)
+{
+#define FN_NAME "grTexMinAddress"
+ FxU32 rv;
+ TRAP_LOG("%s(%s)\n", FN_NAME, TRP_TMU(tmu));
+ rv = grTexMinAddress(tmu);
+ TRAP_LOG(GOT "%lu\n", rv);
+ return rv;
+#undef FN_NAME
+}
+
+FxU32 FX_CALL trap_grTexMaxAddress (GrChipID_t tmu)
+{
+#define FN_NAME "grTexMaxAddress"
+ FxU32 rv;
+ TRAP_LOG("%s(%s)\n", FN_NAME, TRP_TMU(tmu));
+ rv = grTexMaxAddress(tmu);
+ TRAP_LOG(GOT "%lu\n", rv);
+ return rv;
+#undef FN_NAME
+}
+
+void FX_CALL trap_grTexNCCTable (GrNCCTable_t table)
+{
+#define FN_NAME "grTexNCCTable"
+ TRAP_LOG("%s(%s)\n", FN_NAME, TRP_NCC(table));
+ grTexNCCTable(table);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grTexSource (GrChipID_t tmu,
+                               FxU32      startAddress,
+                               FxU32      evenOdd,
+                               GrTexInfo  *info)
+{
+#define FN_NAME "grTexSource"
+ TRAP_LOG("%s(%s, %08lx, %s, %p)\n", FN_NAME, TRP_TMU(tmu), startAddress, TRP_EVENODD(evenOdd), (void *)info);
+ grTexSource(tmu, startAddress, evenOdd, info);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grTexClampMode (GrChipID_t           tmu,
+                                  GrTextureClampMode_t s_clampmode,
+                                  GrTextureClampMode_t t_clampmode)
+{
+#define FN_NAME "grTexClampMode"
+ TRAP_LOG("%s(%s, %s, %s)\n", FN_NAME, TRP_TMU(tmu), TRP_CLAMPMODE(s_clampmode), TRP_CLAMPMODE(t_clampmode));
+ grTexClampMode(tmu, s_clampmode, t_clampmode);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grTexCombine (GrChipID_t          tmu,
+                                GrCombineFunction_t rgb_function,
+                                GrCombineFactor_t   rgb_factor,
+                                GrCombineFunction_t alpha_function,
+                                GrCombineFactor_t   alpha_factor,
+                                FxBool              rgb_invert,
+                                FxBool              alpha_invert)
+{
+#define FN_NAME "grTexCombine"
+ TRAP_LOG("%s(%s, %s, %s, %s, %s, %s, %s)\n", FN_NAME, TRP_TMU(tmu), TRP_CMBFUNC(rgb_function), TRP_CMBFACT(rgb_factor), TRP_CMBFUNC(alpha_function), TRP_CMBFACT(alpha_factor), TRP_BOOL(rgb_invert), TRP_BOOL(alpha_invert));
+ grTexCombine(tmu, rgb_function, rgb_factor, alpha_function, alpha_factor, rgb_invert, alpha_invert);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grTexDetailControl (GrChipID_t tmu,
+                                      int        lod_bias,
+                                      FxU8       detail_scale,
+                                      float      detail_max)
+{
+#define FN_NAME "grTexDetailControl"
+ TRAP_LOG("%s(%s, %u, %d, %f)\n", FN_NAME, TRP_TMU(tmu), lod_bias, detail_scale, detail_max);
+ grTexDetailControl(tmu, lod_bias, detail_scale, detail_max);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grTexFilterMode (GrChipID_t            tmu,
+                                   GrTextureFilterMode_t minfilter_mode,
+                                   GrTextureFilterMode_t magfilter_mode)
+{
+#define FN_NAME "grTexFilterMode"
+ TRAP_LOG("%s(%s, %s, %s)\n", FN_NAME, TRP_TMU(tmu), TRP_TEXFILTER(minfilter_mode), TRP_TEXFILTER(magfilter_mode));
+ grTexFilterMode(tmu, minfilter_mode, magfilter_mode);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grTexLodBiasValue (GrChipID_t tmu,
+                                     float      bias)
+{
+#define FN_NAME "grTexLodBiasValue"
+ TRAP_LOG("%s(%s, %f)\n", FN_NAME, TRP_TMU(tmu), bias);
+ grTexLodBiasValue(tmu, bias);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grTexDownloadMipMap (GrChipID_t tmu,
+                                       FxU32      startAddress,
+                                       FxU32      evenOdd,
+                                       GrTexInfo  *info)
+{
+#define FN_NAME "grTexDownloadMipMap"
+ TRAP_LOG("%s(%s, %08lx, %s, %p)\n", FN_NAME, TRP_TMU(tmu), startAddress, TRP_EVENODD(evenOdd), (void *)info);
+ grTexDownloadMipMap(tmu, startAddress, evenOdd, info);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grTexDownloadMipMapLevel (GrChipID_t        tmu,
+                                            FxU32             startAddress,
+                                            GrLOD_t           thisLod,
+                                            GrLOD_t           largeLod,
+                                            GrAspectRatio_t   aspectRatio,
+                                            GrTextureFormat_t format,
+                                            FxU32             evenOdd,
+                                            void              *data)
+{
+#define FN_NAME "grTexDownloadMipMapLevel"
+ TRAP_LOG("%s(%s, %08lx, %s, %s, %s, %s, %s, %p)\n", FN_NAME, TRP_TMU(tmu), startAddress, TRP_LODLEVEL(thisLod), TRP_LODLEVEL(largeLod), TRP_ASPECTRATIO(aspectRatio), TRP_TEXFMT(format), TRP_EVENODD(evenOdd), data);
+ grTexDownloadMipMapLevel(tmu, startAddress, thisLod, largeLod, aspectRatio, format, evenOdd, data);
+#undef FN_NAME
+}
+
+FxBool FX_CALL trap_grTexDownloadMipMapLevelPartial (GrChipID_t        tmu,
+                                                     FxU32             startAddress,
+                                                     GrLOD_t           thisLod,
+                                                     GrLOD_t           largeLod,
+                                                     GrAspectRatio_t   aspectRatio,
+                                                     GrTextureFormat_t format,
+                                                     FxU32             evenOdd,
+                                                     void              *data,
+                                                     int               start,
+                                                     int               end)
+{
+#define FN_NAME "grTexDownloadMipMapLevelPartial"
+ FxBool rv;
+ TRAP_LOG("%s(%s, %08lx, %s, %s, %s, %s, %s, %p, %d, %d)\n", FN_NAME, TRP_TMU(tmu), startAddress, TRP_LODLEVEL(thisLod), TRP_LODLEVEL(largeLod), TRP_ASPECTRATIO(aspectRatio), TRP_TEXFMT(format), TRP_EVENODD(evenOdd), data, start, end);
+ rv = grTexDownloadMipMapLevelPartial(tmu, startAddress, thisLod, largeLod, aspectRatio, format, evenOdd, data, start, end);
+ TRAP_LOG(GOT "%s\n", TRP_BOOL(rv));
+ return rv;
+#undef FN_NAME
+}
+
+void FX_CALL trap_grTexDownloadTable (GrTexTable_t type,
+                                      void         *data)
+{
+#define FN_NAME "grTexDownloadTable"
+ TRAP_LOG("%s(%s, %p)\n", FN_NAME, TRP_TABLE(type), data);
+ grTexDownloadTable(type, data);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grTexDownloadTablePartial (GrTexTable_t type,
+                                             void         *data,
+                                             int          start,
+                                             int          end)
+{
+#define FN_NAME "grTexDownloadTablePartial"
+ TRAP_LOG("%s(%s, %p, %d, %d)\n", FN_NAME, TRP_TABLE(type), data, start, end);
+ grTexDownloadTablePartial(type, data, start, end);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grTexMipMapMode (GrChipID_t     tmu,
+                                   GrMipMapMode_t mode,
+                                   FxBool         lodBlend)
+{
+#define FN_NAME "grTexMipMapMode"
+ TRAP_LOG("%s(%s, %s, %s)\n", FN_NAME, TRP_TMU(tmu), TRP_MIPMODE(mode), TRP_BOOL(lodBlend));
+ grTexMipMapMode(tmu, mode, lodBlend);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grTexMultibase (GrChipID_t tmu,
+                                  FxBool     enable)
+{
+#define FN_NAME "grTexMultibase"
+ TRAP_LOG("%s(%s, %s)\n", FN_NAME, TRP_TMU(tmu), TRP_BOOL(enable));
+ grTexMultibase(tmu, enable);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grTexMultibaseAddress (GrChipID_t       tmu,
+                                         GrTexBaseRange_t range,
+                                         FxU32            startAddress,
+                                         FxU32            evenOdd,
+                                         GrTexInfo        *info)
+{
+#define FN_NAME "grTexMultibaseAddress"
+ TRAP_LOG("%s(%s, %s, %08lx, %s, %p)\n", FN_NAME, TRP_TMU(tmu), TRP_TEXBASERANGE(range), startAddress, TRP_EVENODD(evenOdd), (void *)info);
+ grTexMultibaseAddress(tmu, range, startAddress, evenOdd, info);
+#undef FN_NAME
+}
+
+/*
+** linear frame buffer functions
+*/
+FxBool FX_CALL trap_grLfbLock (GrLock_t           type,
+                               GrBuffer_t         buffer,
+                               GrLfbWriteMode_t   writeMode,
+                               GrOriginLocation_t origin,
+                               FxBool             pixelPipeline,
+                               GrLfbInfo_t        *info)
+{
+#define FN_NAME "grLfbLock"
+ FxBool rv;
+ TRAP_LOG("%s(%s, %s, %s, %s, %s, %p)\n", FN_NAME, TRP_LOCKTYPE(type), TRP_BUFFER(buffer), TRP_WRITEMODE(writeMode), TRP_ORIGIN(origin), TRP_BOOL(pixelPipeline), (void *)info);
+ rv = grLfbLock(type, buffer, writeMode, origin, pixelPipeline, info);
+ TRAP_LOG(GOT "%s\n", TRP_BOOL(rv));
+ return rv;
+#undef FN_NAME
+}
+
+FxBool FX_CALL trap_grLfbUnlock (GrLock_t   type,
+                                 GrBuffer_t buffer)
+{
+#define FN_NAME "grLfbUnlock"
+ FxBool rv;
+ TRAP_LOG("%s(%s, %s)\n", FN_NAME, TRP_LOCKTYPE(type), TRP_BUFFER(buffer));
+ rv = grLfbUnlock(type, buffer);
+ TRAP_LOG(GOT "%s\n", TRP_BOOL(rv));
+ return rv;
+#undef FN_NAME
+}
+
+void FX_CALL trap_grLfbConstantAlpha (GrAlpha_t alpha)
+{
+#define FN_NAME "grLfbConstantAlpha"
+ TRAP_LOG("%s(%02x)\n", FN_NAME, alpha);
+ grLfbConstantAlpha(alpha);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grLfbConstantDepth (FxU32 depth)
+{
+#define FN_NAME "grLfbConstantDepth"
+ TRAP_LOG("%s(%08lx)\n", FN_NAME, depth);
+ grLfbConstantDepth(depth);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grLfbWriteColorSwizzle (FxBool swizzleBytes,
+                                          FxBool swapWords)
+{
+#define FN_NAME "grLfbWriteColorSwizzle"
+ TRAP_LOG("%s(%s, %s)\n", FN_NAME, TRP_BOOL(swizzleBytes), TRP_BOOL(swapWords));
+ grLfbWriteColorSwizzle(swizzleBytes, swapWords);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grLfbWriteColorFormat (GrColorFormat_t colorFormat)
+{
+#define FN_NAME "grLfbWriteColorFormat"
+ TRAP_LOG("%s(%s)\n", FN_NAME, TRP_COLFMT(colorFormat));
+ grLfbWriteColorFormat(colorFormat);
+#undef FN_NAME
+}
+
+FxBool FX_CALL trap_grLfbWriteRegion (GrBuffer_t    dst_buffer,
+                                      FxU32         dst_x,
+                                      FxU32         dst_y,
+                                      GrLfbSrcFmt_t src_format,
+                                      FxU32         src_width,
+                                      FxU32         src_height,
+                                      FxBool        pixelPipeline,
+                                      FxI32         src_stride,
+                                      void          *src_data)
+{
+#define FN_NAME "grLfbWriteRegion"
+ FxBool rv;
+ TRAP_LOG("%s(%s, %lu, %lu, %s, %lu, %lu, %s, %ld, %p)\n", FN_NAME, TRP_BUFFER(dst_buffer), dst_x, dst_y, TRP_SRCFMT(src_format), src_width, src_height, TRP_BOOL(pixelPipeline), src_stride, src_data);
+ rv = grLfbWriteRegion(dst_buffer, dst_x, dst_y, src_format, src_width, src_height, pixelPipeline, src_stride, src_data);
+ TRAP_LOG(GOT "%s\n", TRP_BOOL(rv));
+ return rv;
+#undef FN_NAME
+}
+
+FxBool FX_CALL trap_grLfbReadRegion (GrBuffer_t src_buffer,
+                                     FxU32      src_x,
+                                     FxU32      src_y,
+                                     FxU32      src_width,
+                                     FxU32      src_height,
+                                     FxU32      dst_stride,
+                                     void       *dst_data)
+{
+#define FN_NAME "grLfbReadRegion"
+ FxBool rv;
+ TRAP_LOG("%s(%s, %lu, %lu, %lu, %lu, %ld, %p)\n", FN_NAME, TRP_BUFFER(src_buffer), src_x, src_y, src_width, src_height, dst_stride, dst_data);
+ rv = grLfbReadRegion(src_buffer, src_x, src_y, src_width, src_height, dst_stride, dst_data);
+ TRAP_LOG(GOT "%s\n", TRP_BOOL(rv));
+ return rv;
+#undef FN_NAME
+}
+
+/*
+** glide management functions
+*/
+void FX_CALL trap_grGlideInit (void)
+{
+#define FN_NAME "grGlideInit"
+ TRAP_LOG("%s()\n", FN_NAME);
+ grGlideInit();
+#undef FN_NAME
+}
+
+void FX_CALL trap_grGlideShutdown (void)
+{
+#define FN_NAME "grGlideShutdown"
+ TRAP_LOG("%s()\n", FN_NAME);
+ grGlideShutdown();
+#undef FN_NAME
+}
+
+void FX_CALL trap_grGlideGetState (void *state)
+{
+#define FN_NAME "grGlideGetState"
+ TRAP_LOG("%s(%p)\n", FN_NAME, state);
+ grGlideGetState(state);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grGlideSetState (const void *state)
+{
+#define FN_NAME "grGlideSetState"
+ TRAP_LOG("%s(%p)\n", FN_NAME, state);
+ grGlideSetState(state);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grGlideGetVertexLayout (void *layout)
+{
+#define FN_NAME "grGlideGetVertexLayout"
+ TRAP_LOG("%s(%p)\n", FN_NAME, layout);
+ grGlideGetVertexLayout(layout);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grGlideSetVertexLayout (const void *layout)
+{
+#define FN_NAME "grGlideSetVertexLayout"
+ TRAP_LOG("%s(%p)\n", FN_NAME, layout);
+ grGlideSetVertexLayout(layout);
+#undef FN_NAME
+}
+
+/*
+** glide utility functions
+*/
+void FX_CALL trap_guGammaCorrectionRGB (FxFloat red,
+                                        FxFloat green,
+                                        FxFloat blue)
+{
+#define FN_NAME "guGammaCorrectionRGB"
+ TRAP_LOG("%s(%f, %f, %f)\n", FN_NAME, red, green, blue);
+ guGammaCorrectionRGB(red, green, blue);
+#undef FN_NAME
+}
+
+float FX_CALL trap_guFogTableIndexToW (int i)
+{
+#define FN_NAME "guFogTableIndexToW"
+ float rv;
+ TRAP_LOG("%s(%d)\n", FN_NAME, i);
+ rv = guFogTableIndexToW(i);
+ TRAP_LOG(GOT "%f\n", rv);
+ return rv;
+#undef FN_NAME
+}
+
+void FX_CALL trap_guFogGenerateExp (GrFog_t *fogtable,
+                                    float   density)
+{
+#define FN_NAME "guFogGenerateExp"
+ TRAP_LOG("%s(%p, %f)\n", FN_NAME, fogtable, density);
+ guFogGenerateExp(fogtable, density);
+#undef FN_NAME
+}
+
+void FX_CALL trap_guFogGenerateExp2 (GrFog_t *fogtable,
+                                     float   density)
+{
+#define FN_NAME "guFogGenerateExp2"
+ TRAP_LOG("%s(%p, %f)\n", FN_NAME, fogtable, density);
+ guFogGenerateExp2(fogtable, density);
+#undef FN_NAME
+}
+
+void FX_CALL trap_guFogGenerateLinear (GrFog_t *fogtable,
+                                       float   nearZ,
+                                       float   farZ)
+{
+#define FN_NAME "guFogGenerateLinear"
+ TRAP_LOG("%s(%p, %f, %f)\n", FN_NAME, fogtable, nearZ, farZ);
+ guFogGenerateLinear(fogtable, nearZ, farZ);
+#undef FN_NAME
+}
+
+/*
+** glide extensions
+*/
+char *FX_CALL trap_grGetRegistryOrEnvironmentStringExt (char *theEntry)
+{
+#define FN_NAME "grGetRegistryOrEnvironmentStringExt"
+ char *rv;
+ TRAP_LOG("%s(\"%s\")\n", FN_NAME, theEntry);
+ assert(real_grGetRegistryOrEnvironmentStringExt);
+ rv = (*real_grGetRegistryOrEnvironmentStringExt)(theEntry);
+ if (rv) {
+    TRAP_LOG(GOT "\"%s\"\n", rv);
+ } else {
+    TRAP_LOG(GOT "NULL\n");
+ }
+ return rv;
+#undef FN_NAME
+}
+
+void FX_CALL trap_grGetGammaTableExt (FxU32 nentries,
+                                      FxU32 *red,
+                                      FxU32 *green,
+                                      FxU32 *blue)
+{
+#define FN_NAME "grGetGammaTableExt"
+ TRAP_LOG("%s(%lu, %p, %p, %p)\n", FN_NAME, nentries, (void *)red, (void *)green, (void *)blue);
+ assert(real_grGetGammaTableExt);
+ (*real_grGetGammaTableExt)(nentries, red, green, blue);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grChromaRangeModeExt (GrChromakeyMode_t mode)
+{
+#define FN_NAME "grChromaRangeModeExt"
+ TRAP_LOG("%s(%s)\n", FN_NAME, TRP_CKMODE(mode));
+ assert(real_grChromaRangeModeExt);
+ (*real_grChromaRangeModeExt)(mode);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grChromaRangeExt (GrColor_t           color,
+                                    GrColor_t           range,
+                                    GrChromaRangeMode_t match_mode)
+{
+#define FN_NAME "grChromaRangeExt"
+ TRAP_LOG("%s(%08lx, %08lx, %s)\n", FN_NAME, color, range, TRP_CRMODE(match_mode));
+ assert(real_grChromaRangeExt);
+ (*real_grChromaRangeExt)(color, range, match_mode);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grTexChromaModeExt (GrChipID_t        tmu,
+                                      GrChromakeyMode_t mode)
+{
+#define FN_NAME "grTexChromaModeExt"
+ TRAP_LOG("%s(%s, %s)\n", FN_NAME, TRP_TMU(tmu), TRP_CKMODE(mode));
+ assert(real_grTexChromaModeExt);
+ (*real_grTexChromaModeExt)(tmu, mode);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grTexChromaRangeExt (GrChipID_t           tmu,
+                                       GrColor_t            min,
+                                       GrColor_t            max,
+                                       GrTexChromakeyMode_t mode)
+{
+#define FN_NAME "grTexChromaRangeExt"
+ TRAP_LOG("%s(%s, %08lx, %08lx, %s)\n", FN_NAME, TRP_TMU(tmu), min, max, TRP_CRMODE(mode));
+ assert(real_grTexChromaRangeExt);
+ (*real_grTexChromaRangeExt)(tmu, min, max, mode);
+#undef FN_NAME
+}
+
+        /* pointcast */
+void FX_CALL trap_grTexDownloadTableExt (GrChipID_t   tmu,
+                                         GrTexTable_t type,
+                                         void         *data)
+{
+#define FN_NAME "grTexDownloadTableExt"
+ TRAP_LOG("%s(%s, %s, %p)\n", FN_NAME, TRP_TMU(tmu), TRP_TABLE(type), data);
+ assert(real_grTexDownloadTableExt);
+ (*real_grTexDownloadTableExt)(tmu, type, data);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grTexDownloadTablePartialExt (GrChipID_t   tmu,
+                                                GrTexTable_t type,
+                                                void         *data,
+                                                int          start,
+                                                int          end)
+{
+#define FN_NAME "grTexDownloadTablePartialExt"
+ TRAP_LOG("%s(%s, %s, %p, %d, %d)\n", FN_NAME, TRP_TMU(tmu), TRP_TABLE(type), data, start, end);
+ assert(real_grTexDownloadTablePartialExt);
+ (*real_grTexDownloadTablePartialExt)(tmu, type, data, start, end);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grTexNCCTableExt (GrChipID_t   tmu,
+                                    GrNCCTable_t table)
+{
+#define FN_NAME "grTexNCCTableExt"
+ TRAP_LOG("%s(%s, %s)\n", FN_NAME, TRP_TMU(tmu), TRP_NCC(table));
+ assert(real_grTexNCCTableExt);
+ (*real_grTexNCCTableExt)(tmu, table);
+#undef FN_NAME
+}
+
+        /* tbext */
+void FX_CALL trap_grTextureBufferExt (GrChipID_t        tmu,
+                                      FxU32             startAddress,
+                                      GrLOD_t           thisLOD,
+                                      GrLOD_t           largeLOD,
+                                      GrAspectRatio_t   aspectRatio,
+                                      GrTextureFormat_t format,
+                                      FxU32             odd_even_mask)
+{
+#define FN_NAME "grTextureBufferExt"
+ TRAP_LOG("%s(%s, %08lx, %s, %s, %s, %s, %s)\n", FN_NAME, TRP_TMU(tmu), startAddress, TRP_LODLEVEL(thisLOD), TRP_LODLEVEL(largeLOD), TRP_ASPECTRATIO(aspectRatio), TRP_TEXFMT(format), TRP_EVENODD(odd_even_mask));
+ assert(real_grTextureBufferExt);
+ (*real_grTextureBufferExt)(tmu, startAddress, thisLOD, largeLOD, aspectRatio, format, odd_even_mask);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grTextureAuxBufferExt (GrChipID_t        tmu,
+                                         FxU32             startAddress,
+                                         GrLOD_t           thisLOD,
+                                         GrLOD_t           largeLOD,
+                                         GrAspectRatio_t   aspectRatio,
+                                         GrTextureFormat_t format,
+                                         FxU32             odd_even_mask)
+{
+#define FN_NAME "grTextureAuxBufferExt"
+ TRAP_LOG("%s(%s, %08lx, %s, %s, %s, %s, %s)\n", FN_NAME, TRP_TMU(tmu), startAddress, TRP_LODLEVEL(thisLOD), TRP_LODLEVEL(largeLOD), TRP_ASPECTRATIO(aspectRatio), TRP_TEXFMT(format), TRP_EVENODD(odd_even_mask));
+ assert(real_grTextureAuxBufferExt);
+ (*real_grTextureAuxBufferExt)(tmu, startAddress, thisLOD, largeLOD, aspectRatio, format, odd_even_mask);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grAuxBufferExt (GrBuffer_t buffer)
+{
+#define FN_NAME "grAuxBufferExt"
+ TRAP_LOG("%s(%s)\n", FN_NAME, TRP_BUFFER(buffer));
+ assert(real_grAuxBufferExt);
+ (*real_grAuxBufferExt)(buffer);
+#undef FN_NAME
+}
+
+        /* napalm */
+GrContext_t FX_CALL trap_grSstWinOpenExt (FxU32                hWnd,
+                                          GrScreenResolution_t resolution,
+                                          GrScreenRefresh_t    refresh,
+                                          GrColorFormat_t      format,
+                                          GrOriginLocation_t   origin,
+                                          GrPixelFormat_t      pixelformat,
+                                          int                  nColBuffers,
+                                          int                  nAuxBuffers)
+{
+#define FN_NAME "grSstWinOpenExt"
+ GrContext_t rv;
+ TRAP_LOG("%s(%08lx, %s, %s, %s, %s, %s, %d, %d)\n", FN_NAME, hWnd, TRP_RESOLUTION(resolution), TRP_REFRESH(refresh), TRP_COLFMT(format), TRP_ORIGIN(origin), TRP_PIXFMT(pixelformat), nColBuffers, nAuxBuffers);
+ assert(real_grSstWinOpenExt);
+ rv = (*real_grSstWinOpenExt)(hWnd, resolution, refresh, format, origin, pixelformat, nColBuffers, nAuxBuffers);
+ TRAP_LOG(GOT "%p\n", (void *)rv);
+ return rv;
+#undef FN_NAME
+}
+
+void FX_CALL trap_grStencilFuncExt (GrCmpFnc_t  fnc,
+                                    GrStencil_t ref,
+                                    GrStencil_t mask)
+{
+#define FN_NAME "grStencilFuncExt"
+ TRAP_LOG("%s(%s, %02x, %02x)\n", FN_NAME, TRP_CMPFUNC(fnc), ref, mask);
+ assert(real_grStencilFuncExt);
+ (*real_grStencilFuncExt)(fnc, ref, mask);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grStencilMaskExt (GrStencil_t value)
+{
+#define FN_NAME "grStencilMaskExt"
+ TRAP_LOG("%s(%02x)\n", FN_NAME, value);
+ assert(real_grStencilMaskExt);
+ (*real_grStencilMaskExt)(value);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grStencilOpExt (GrStencilOp_t stencil_fail,
+                                  GrStencilOp_t depth_fail,
+                                  GrStencilOp_t depth_pass)
+{
+#define FN_NAME "grStencilOpExt"
+ TRAP_LOG("%s(%s, %s, %s)\n", FN_NAME, TRP_STENCILOP(stencil_fail), TRP_STENCILOP(depth_fail), TRP_STENCILOP(depth_pass));
+ assert(real_grStencilOpExt);
+ (*real_grStencilOpExt)(stencil_fail, depth_fail, depth_pass);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grLfbConstantStencilExt (GrStencil_t value)
+{
+#define FN_NAME "grLfbConstantStencilExt"
+ TRAP_LOG("%s(%02x)\n", FN_NAME, value);
+ assert(real_grLfbConstantStencilExt);
+ (*real_grLfbConstantStencilExt)(value);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grBufferClearExt (GrColor_t   color,
+                                    GrAlpha_t   alpha,
+                                    FxU32       depth,
+                                    GrStencil_t stencil)
+{
+#define FN_NAME "grBufferClearExt"
+ TRAP_LOG("%s(%08lx, %02x, %08lx, %02x)\n", FN_NAME, color, alpha, depth, stencil);
+ assert(real_grBufferClearExt);
+ (*real_grBufferClearExt)(color, alpha, depth, stencil);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grColorCombineExt (GrCCUColor_t    a,
+                                     GrCombineMode_t a_mode,
+                                     GrCCUColor_t    b,
+                                     GrCombineMode_t b_mode,
+                                     GrCCUColor_t    c,
+                                     FxBool          c_invert,
+                                     GrCCUColor_t    d,
+                                     FxBool          d_invert,
+                                     FxU32           shift,
+                                     FxBool          invert)
+{
+#define FN_NAME "grColorCombineExt"
+ TRAP_LOG("%s(%s, %s, %s, %s, %s, %s, %s, %s, %lu, %s)\n", FN_NAME, TRP_CU(a), TRP_CMBMODE(a_mode), TRP_CU(b), TRP_CMBMODE(b_mode), TRP_CU(c), TRP_BOOL(c_invert), TRP_CU(d), TRP_BOOL(d_invert), shift, TRP_BOOL(invert));
+ assert(real_grColorCombineExt);
+ (*real_grColorCombineExt)(a, a_mode, b, b_mode, c, c_invert, d, d_invert, shift, invert);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grAlphaCombineExt (GrACUColor_t    a,
+                                     GrCombineMode_t a_mode,
+                                     GrACUColor_t    b,
+                                     GrCombineMode_t b_mode,
+                                     GrACUColor_t    c,
+                                     FxBool          c_invert,
+                                     GrACUColor_t    d,
+                                     FxBool          d_invert,
+                                     FxU32           shift,
+                                     FxBool          invert)
+{
+#define FN_NAME "grAlphaCombineExt"
+ TRAP_LOG("%s(%s, %s, %s, %s, %s, %s, %s, %s, %lu, %s)\n", FN_NAME, TRP_CU(a), TRP_CMBMODE(a_mode), TRP_CU(b), TRP_CMBMODE(b_mode), TRP_CU(c), TRP_BOOL(c_invert), TRP_CU(d), TRP_BOOL(d_invert), shift, TRP_BOOL(invert));
+ assert(real_grAlphaCombineExt);
+ (*real_grAlphaCombineExt)(a, a_mode, b, b_mode, c, c_invert, d, d_invert, shift, invert);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grTexColorCombineExt (GrChipID_t      tmu,
+                                        GrTCCUColor_t   a,
+                                        GrCombineMode_t a_mode,
+                                        GrTCCUColor_t   b,
+                                        GrCombineMode_t b_mode,
+                                        GrTCCUColor_t   c,
+                                        FxBool          c_invert,
+                                        GrTCCUColor_t   d,
+                                        FxBool          d_invert,
+                                        FxU32           shift,
+                                        FxBool          invert)
+{
+#define FN_NAME "grTexColorCombineExt"
+ TRAP_LOG("%s(%s, %s, %s, %s, %s, %s, %s, %s, %s, %lu, %s)\n", FN_NAME, TRP_TMU(tmu), TRP_CU(a), TRP_CMBMODE(a_mode), TRP_CU(b), TRP_CMBMODE(b_mode), TRP_CU(c), TRP_BOOL(c_invert), TRP_CU(d), TRP_BOOL(d_invert), shift, TRP_BOOL(invert));
+ assert(real_grTexColorCombineExt);
+ (*real_grTexColorCombineExt)(tmu, a, a_mode, b, b_mode, c, c_invert, d, d_invert, shift, invert);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grTexAlphaCombineExt (GrChipID_t      tmu,
+                                        GrTACUColor_t   a,
+                                        GrCombineMode_t a_mode,
+                                        GrTACUColor_t   b,
+                                        GrCombineMode_t b_mode,
+                                        GrTACUColor_t   c,
+                                        FxBool          c_invert,
+                                        GrTACUColor_t   d,
+                                        FxBool          d_invert,
+                                        FxU32           shift,
+                                        FxBool          invert)
+{
+#define FN_NAME "grTexAlphaCombineExt"
+ TRAP_LOG("%s(%s, %s, %s, %s, %s, %s, %s, %s, %s, %lu, %s)\n", FN_NAME, TRP_TMU(tmu), TRP_CU(a), TRP_CMBMODE(a_mode), TRP_CU(b), TRP_CMBMODE(b_mode), TRP_CU(c), TRP_BOOL(c_invert), TRP_CU(d), TRP_BOOL(d_invert), shift, TRP_BOOL(invert));
+ assert(real_grTexAlphaCombineExt);
+ (*real_grTexAlphaCombineExt)(tmu, a, a_mode, b, b_mode, c, c_invert, d, d_invert, shift, invert);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grConstantColorValueExt (GrChipID_t tmu,
+                                           GrColor_t  value)
+{
+#define FN_NAME "grConstantColorValueExt"
+ TRAP_LOG("%s(%s, %08lx)\n", FN_NAME, TRP_TMU(tmu), value);
+ assert(real_grConstantColorValueExt);
+ (*real_grConstantColorValueExt)(tmu, value);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grColorMaskExt (FxBool r,
+                                  FxBool g,
+                                  FxBool b,
+                                  FxBool a)
+{
+#define FN_NAME "grColorMaskExt"
+ TRAP_LOG("%s(%s, %s, %s, %s)\n", FN_NAME, TRP_BOOL(r), TRP_BOOL(g), TRP_BOOL(b), TRP_BOOL(a));
+ assert(real_grColorMaskExt);
+ (*real_grColorMaskExt)(r, g, b, a);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grAlphaBlendFunctionExt (GrAlphaBlendFnc_t rgb_sf,
+                                           GrAlphaBlendFnc_t rgb_df,
+                                           GrAlphaBlendOp_t  rgb_op,
+                                           GrAlphaBlendFnc_t alpha_sf,
+                                           GrAlphaBlendFnc_t alpha_df,
+                                           GrAlphaBlendOp_t  alpha_op)
+{
+#define FN_NAME "grAlphaBlendFunctionExt"
+ TRAP_LOG("%s(%s, %s, %s, %s, %s, %s)\n", FN_NAME, TRP_BLEND(rgb_sf), TRP_BLEND(rgb_df), TRP_BLENDOP(rgb_op), TRP_BLEND(alpha_sf), TRP_BLEND(alpha_df), TRP_BLENDOP(alpha_op));
+ assert(real_grAlphaBlendFunctionExt);
+ (*real_grAlphaBlendFunctionExt)(rgb_sf, rgb_df, rgb_op, alpha_sf, alpha_df, alpha_op);
+#undef FN_NAME
+}
+
+void FX_CALL trap_grTBufferWriteMaskExt (FxU32 tmask)
+{
+#define FN_NAME "grTBufferWriteMaskExt"
+ TRAP_LOG("%s(%08lx)\n", FN_NAME, tmask);
+ assert(real_grTBufferWriteMaskExt);
+ (*real_grTBufferWriteMaskExt)(tmask);
+#undef FN_NAME
+}
+
+/*
+** texus functions
+*/
+void FX_CALL trap_txImgQuantize (char  *dst,
+                                 char  *src,
+                                 int   w,
+                                 int   h,
+                                 FxU32 format,
+                                 FxU32 dither)
+{
+#define FN_NAME "txImgQuantize"
+ TRAP_LOG("%s(%p, %p, %d, %d, %s, %s)\n", FN_NAME, dst, src, w, h, TRP_TEXFMT(format), TRP_TXDITHER(dither));
+ assert(real_txImgQuantize);
+ (*real_txImgQuantize)(dst, src, w, h, format, dither);
+#undef FN_NAME
+}
+
+void FX_CALL trap_txMipQuantize (TxMip *pxMip,
+                                 TxMip *txMip,
+                                 int   fmt,
+                                 FxU32 d,
+                                 FxU32 comp)
+{
+#define FN_NAME "txMipQuantize"
+ TRAP_LOG("%s(%p, %p, %s, %s, %s)\n", FN_NAME, (void *)pxMip, (void *)txMip, TRP_TEXFMT(fmt), TRP_TXDITHER(d), TRP_TXCOMPRESS(comp));
+ assert(real_txMipQuantize);
+ (*real_txMipQuantize)(pxMip, txMip, fmt, d, comp);
+#undef FN_NAME
+}
+
+void FX_CALL trap_txPalToNcc (GuNccTable *ncc_table,
+                              const FxU32 *pal)
+{
+#define FN_NAME "txPalToNcc"
+ TRAP_LOG("%s(%p, %p)\n", FN_NAME, (void *)ncc_table, (void *)pal);
+ assert(real_txPalToNcc);
+ (*real_txPalToNcc)(ncc_table, pal);
+#undef FN_NAME
+}
+#endif
+
+
+
+/****************************************************************************\
+* housekeeping (fake pointers)                                               *
+\****************************************************************************/
+char *FX_CALL fake_grGetRegistryOrEnvironmentStringExt (char *theEntry)
+{
+ return getenv(theEntry);
+}
+
+void FX_CALL fake_grTexDownloadTableExt (GrChipID_t   tmu,
+                                         GrTexTable_t type,
+                                         void         *data)
+{
+ (void)tmu;
+ grTexDownloadTable(type, data);
+}
+
+void FX_CALL fake_grTexDownloadTablePartialExt (GrChipID_t   tmu,
+                                                GrTexTable_t type,
+                                                void         *data,
+                                                int          start,
+                                                int          end)
+{
+ (void)tmu;
+ grTexDownloadTablePartial(type, data, start, end);
+}
+
+void FX_CALL fake_grTexNCCTableExt (GrChipID_t   tmu,
+                                    GrNCCTable_t table)
+{
+ (void)tmu;
+ grTexNCCTable(table);
+}
+
+
+
+/****************************************************************************\
+* interface                                                                  *
+\****************************************************************************/
+void tdfx_hook_glide (struct tdfx_glide *Glide)
+{
+#if DEBUG_TRAP
+#define GET_EXT_ADDR(name) *(GrProc *)&real_##name = grGetProcAddress(#name), Glide->name = trap_##name
+#define GET_EXT_FAKE(name) GET_EXT_ADDR(name); if (real_##name == NULL) real_##name = fake_##name
+#else  /* DEBUG_TRAP */
+#define GET_EXT_ADDR(name) *(GrProc *)&Glide->name = grGetProcAddress(#name)
+#define GET_EXT_FAKE(name) GET_EXT_ADDR(name); if (Glide->name == NULL) Glide->name = fake_##name
+#endif /* DEBUG_TRAP */
+
+ /*
+ ** glide extensions
+ */
+ GET_EXT_FAKE(grGetRegistryOrEnvironmentStringExt);
+ GET_EXT_ADDR(grGetGammaTableExt);
+ GET_EXT_ADDR(grChromaRangeModeExt);
+ GET_EXT_ADDR(grChromaRangeExt);
+ GET_EXT_ADDR(grTexChromaModeExt);
+ GET_EXT_ADDR(grTexChromaRangeExt);
+ /* pointcast */
+ GET_EXT_FAKE(grTexDownloadTableExt);
+ GET_EXT_FAKE(grTexDownloadTablePartialExt);
+ GET_EXT_FAKE(grTexNCCTableExt);
+ /* tbext */
+ GET_EXT_ADDR(grTextureBufferExt);
+ GET_EXT_ADDR(grTextureAuxBufferExt);
+ GET_EXT_ADDR(grAuxBufferExt);
+ /* napalm */
+ GET_EXT_ADDR(grSstWinOpenExt);
+ GET_EXT_ADDR(grStencilFuncExt);
+ GET_EXT_ADDR(grStencilMaskExt);
+ GET_EXT_ADDR(grStencilOpExt);
+ GET_EXT_ADDR(grLfbConstantStencilExt);
+ GET_EXT_ADDR(grBufferClearExt);
+ GET_EXT_ADDR(grColorCombineExt);
+ GET_EXT_ADDR(grAlphaCombineExt);
+ GET_EXT_ADDR(grTexColorCombineExt);
+ GET_EXT_ADDR(grTexAlphaCombineExt);
+ GET_EXT_ADDR(grConstantColorValueExt);
+ GET_EXT_ADDR(grColorMaskExt);
+ GET_EXT_ADDR(grAlphaBlendFunctionExt);
+ GET_EXT_ADDR(grTBufferWriteMaskExt);
+
+ /*
+ ** texus
+ */
+ GET_EXT_ADDR(txImgQuantize);
+ GET_EXT_ADDR(txMipQuantize);
+ GET_EXT_ADDR(txPalToNcc);
+
+#undef GET_EXT_ADDR
+}
+
+#endif /* FX */
diff --git a/reactos/lib/mesa32/src/drivers/glide/fxg.h b/reactos/lib/mesa32/src/drivers/glide/fxg.h
new file mode 100644
index 00000000000..cc8c059cd23
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/glide/fxg.h
@@ -0,0 +1,381 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.0.1
+ * 
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * Mesa/FX device driver. Interface to Glide3.
+ *
+ *  Copyright (c) 2003 - Daniel Borca
+ *  Email : dborca@users.sourceforge.net
+ *  Web   : http://www.geocities.com/dborca
+ */
+
+
+#ifndef TDFX_GLIDE_H_included
+#define TDFX_GLIDE_H_included
+
+#include <glide.h>
+#include <g3ext.h>
+
+#define DEBUG_TRAP 0
+
+#if DEBUG_TRAP
+/*
+** rendering functions
+*/
+void FX_CALL trap_grDrawPoint (const void *pt);
+void FX_CALL trap_grDrawLine (const void *v1, const void *v2);
+void FX_CALL trap_grDrawTriangle (const void *a, const void *b, const void *c);
+void FX_CALL trap_grVertexLayout (FxU32 param, FxI32 offset, FxU32 mode);
+void FX_CALL trap_grDrawVertexArray (FxU32 mode, FxU32 Count, void *pointers);
+void FX_CALL trap_grDrawVertexArrayContiguous (FxU32 mode, FxU32 Count, void *pointers, FxU32 stride);
+
+/*
+**  Antialiasing Functions
+*/
+void FX_CALL trap_grAADrawTriangle (const void *a, const void *b, const void *c, FxBool ab_antialias, FxBool bc_antialias, FxBool ca_antialias);
+
+/*
+** buffer management
+*/
+void FX_CALL trap_grBufferClear (GrColor_t color, GrAlpha_t alpha, FxU32 depth);
+void FX_CALL trap_grBufferSwap (FxU32 swap_interval);
+void FX_CALL trap_grRenderBuffer (GrBuffer_t buffer);
+
+/*
+** error management
+*/
+void FX_CALL trap_grErrorSetCallback (GrErrorCallbackFnc_t fnc);
+
+/*
+** SST routines
+*/
+void FX_CALL trap_grFinish (void);
+void FX_CALL trap_grFlush (void);
+GrContext_t FX_CALL trap_grSstWinOpen (FxU32 hWnd, GrScreenResolution_t screen_resolution, GrScreenRefresh_t refresh_rate, GrColorFormat_t color_format, GrOriginLocation_t origin_location, int nColBuffers, int nAuxBuffers);
+FxBool FX_CALL trap_grSstWinClose (GrContext_t context);
+void FX_CALL trap_grSetNumPendingBuffers (FxI32 NumPendingBuffers);
+FxBool FX_CALL trap_grSelectContext (GrContext_t context);
+void FX_CALL trap_grSstOrigin (GrOriginLocation_t origin);
+void FX_CALL trap_grSstSelect (int which_sst);
+
+/*
+** Glide configuration and special effect maintenance functions
+*/
+void FX_CALL trap_grAlphaBlendFunction (GrAlphaBlendFnc_t rgb_sf, GrAlphaBlendFnc_t rgb_df, GrAlphaBlendFnc_t alpha_sf, GrAlphaBlendFnc_t alpha_df);
+void FX_CALL trap_grAlphaCombine (GrCombineFunction_t function, GrCombineFactor_t factor, GrCombineLocal_t local, GrCombineOther_t other, FxBool invert);
+void FX_CALL trap_grAlphaControlsITRGBLighting (FxBool enable);
+void FX_CALL trap_grAlphaTestFunction (GrCmpFnc_t function);
+void FX_CALL trap_grAlphaTestReferenceValue (GrAlpha_t value);
+void FX_CALL trap_grChromakeyMode (GrChromakeyMode_t mode);
+void FX_CALL trap_grChromakeyValue (GrColor_t value);
+void FX_CALL trap_grClipWindow (FxU32 minx, FxU32 miny, FxU32 maxx, FxU32 maxy);
+void FX_CALL trap_grColorCombine (GrCombineFunction_t function, GrCombineFactor_t factor, GrCombineLocal_t local, GrCombineOther_t other, FxBool invert);
+void FX_CALL trap_grColorMask (FxBool rgb, FxBool a);
+void FX_CALL trap_grCullMode (GrCullMode_t mode);
+void FX_CALL trap_grConstantColorValue (GrColor_t value);
+void FX_CALL trap_grDepthBiasLevel (FxI32 level);
+void FX_CALL trap_grDepthBufferFunction (GrCmpFnc_t function);
+void FX_CALL trap_grDepthBufferMode (GrDepthBufferMode_t mode);
+void FX_CALL trap_grDepthMask (FxBool mask);
+void FX_CALL trap_grDisableAllEffects (void);
+void FX_CALL trap_grDitherMode (GrDitherMode_t mode);
+void FX_CALL trap_grFogColorValue (GrColor_t fogcolor);
+void FX_CALL trap_grFogMode (GrFogMode_t mode);
+void FX_CALL trap_grFogTable (const GrFog_t ft[]);
+void FX_CALL trap_grLoadGammaTable (FxU32 nentries, FxU32 *red, FxU32 *green, FxU32 *blue);
+void FX_CALL trap_grSplash (float x, float y, float width, float height, FxU32 frame);
+FxU32 FX_CALL trap_grGet (FxU32 pname, FxU32 plength, FxI32 *params);
+const char * FX_CALL trap_grGetString (FxU32 pname);
+FxI32 FX_CALL trap_grQueryResolutions (const GrResolution *resTemplate, GrResolution *output);
+FxBool FX_CALL trap_grReset (FxU32 what);
+GrProc FX_CALL trap_grGetProcAddress (char *procName);
+void FX_CALL trap_grEnable (GrEnableMode_t mode);
+void FX_CALL trap_grDisable (GrEnableMode_t mode);
+void FX_CALL trap_grCoordinateSpace (GrCoordinateSpaceMode_t mode);
+void FX_CALL trap_grDepthRange (FxFloat n, FxFloat f);
+void FX_CALL trap_grStippleMode (GrStippleMode_t mode);
+void FX_CALL trap_grStipplePattern (GrStipplePattern_t mode);
+void FX_CALL trap_grViewport (FxI32 x, FxI32 y, FxI32 width, FxI32 height);
+
+/*
+** texture mapping control functions
+*/
+FxU32 FX_CALL trap_grTexCalcMemRequired (GrLOD_t lodmin, GrLOD_t lodmax, GrAspectRatio_t aspect, GrTextureFormat_t fmt);
+FxU32 FX_CALL trap_grTexTextureMemRequired (FxU32 evenOdd, GrTexInfo *info);
+FxU32 FX_CALL trap_grTexMinAddress (GrChipID_t tmu);
+FxU32 FX_CALL trap_grTexMaxAddress (GrChipID_t tmu);
+void FX_CALL trap_grTexNCCTable (GrNCCTable_t table);
+void FX_CALL trap_grTexSource (GrChipID_t tmu, FxU32 startAddress, FxU32 evenOdd, GrTexInfo *info);
+void FX_CALL trap_grTexClampMode (GrChipID_t tmu, GrTextureClampMode_t s_clampmode, GrTextureClampMode_t t_clampmode);
+void FX_CALL trap_grTexCombine (GrChipID_t tmu, GrCombineFunction_t rgb_function, GrCombineFactor_t rgb_factor, GrCombineFunction_t alpha_function, GrCombineFactor_t alpha_factor, FxBool rgb_invert, FxBool alpha_invert);
+void FX_CALL trap_grTexDetailControl (GrChipID_t tmu, int lod_bias, FxU8 detail_scale, float detail_max);
+void FX_CALL trap_grTexFilterMode (GrChipID_t tmu, GrTextureFilterMode_t minfilter_mode, GrTextureFilterMode_t magfilter_mode);
+void FX_CALL trap_grTexLodBiasValue (GrChipID_t tmu, float bias);
+void FX_CALL trap_grTexDownloadMipMap (GrChipID_t tmu, FxU32 startAddress, FxU32 evenOdd, GrTexInfo *info);
+void FX_CALL trap_grTexDownloadMipMapLevel (GrChipID_t tmu, FxU32 startAddress, GrLOD_t thisLod, GrLOD_t largeLod, GrAspectRatio_t aspectRatio, GrTextureFormat_t format, FxU32 evenOdd, void *data);
+FxBool FX_CALL trap_grTexDownloadMipMapLevelPartial (GrChipID_t tmu, FxU32 startAddress, GrLOD_t thisLod, GrLOD_t largeLod, GrAspectRatio_t aspectRatio, GrTextureFormat_t format, FxU32 evenOdd, void *data, int start, int end);
+void FX_CALL trap_grTexDownloadTable (GrTexTable_t type, void *data);
+void FX_CALL trap_grTexDownloadTablePartial (GrTexTable_t type, void *data, int start, int end);
+void FX_CALL trap_grTexMipMapMode (GrChipID_t tmu, GrMipMapMode_t mode, FxBool lodBlend);
+void FX_CALL trap_grTexMultibase (GrChipID_t tmu, FxBool enable);
+void FX_CALL trap_grTexMultibaseAddress (GrChipID_t tmu, GrTexBaseRange_t range, FxU32 startAddress, FxU32 evenOdd, GrTexInfo *info);
+
+/*
+** linear frame buffer functions
+*/
+FxBool FX_CALL trap_grLfbLock (GrLock_t type, GrBuffer_t buffer, GrLfbWriteMode_t writeMode, GrOriginLocation_t origin, FxBool pixelPipeline, GrLfbInfo_t *info);
+FxBool FX_CALL trap_grLfbUnlock (GrLock_t type, GrBuffer_t buffer);
+void FX_CALL trap_grLfbConstantAlpha (GrAlpha_t alpha);
+void FX_CALL trap_grLfbConstantDepth (FxU32 depth);
+void FX_CALL trap_grLfbWriteColorSwizzle (FxBool swizzleBytes, FxBool swapWords);
+void FX_CALL trap_grLfbWriteColorFormat (GrColorFormat_t colorFormat);
+FxBool FX_CALL trap_grLfbWriteRegion (GrBuffer_t dst_buffer, FxU32 dst_x, FxU32 dst_y, GrLfbSrcFmt_t src_format, FxU32 src_width, FxU32 src_height, FxBool pixelPipeline, FxI32 src_stride, void *src_data);
+FxBool FX_CALL trap_grLfbReadRegion (GrBuffer_t src_buffer, FxU32 src_x, FxU32 src_y, FxU32 src_width, FxU32 src_height, FxU32 dst_stride, void *dst_data);
+
+/*
+** glide management functions
+*/
+void FX_CALL trap_grGlideInit (void);
+void FX_CALL trap_grGlideShutdown (void);
+void FX_CALL trap_grGlideGetState (void *state);
+void FX_CALL trap_grGlideSetState (const void *state);
+void FX_CALL trap_grGlideGetVertexLayout (void *layout);
+void FX_CALL trap_grGlideSetVertexLayout (const void *layout);
+
+/*
+** glide utility functions
+*/
+void FX_CALL trap_guGammaCorrectionRGB (FxFloat red, FxFloat green, FxFloat blue);
+float FX_CALL trap_guFogTableIndexToW (int i);
+void FX_CALL trap_guFogGenerateExp (GrFog_t *fogtable, float density);
+void FX_CALL trap_guFogGenerateExp2 (GrFog_t *fogtable, float density);
+void FX_CALL trap_guFogGenerateLinear (GrFog_t *fogtable, float nearZ, float farZ);
+
+#ifndef DEBUG_TRAP_internal
+/*
+** rendering functions
+*/
+#define grDrawPoint                     trap_grDrawPoint
+#define grDrawLine                      trap_grDrawLine
+#define grDrawTriangle                  trap_grDrawTriangle
+#define grVertexLayout                  trap_grVertexLayout
+#define grDrawVertexArray               trap_grDrawVertexArray
+#define grDrawVertexArrayContiguous     trap_grDrawVertexArrayContiguous
+
+/*
+**  Antialiasing Functions
+*/
+#define grAADrawTriangle                trap_grAADrawTriangle
+
+/*
+** buffer management
+*/
+#define grBufferClear                   trap_grBufferClear
+#define grBufferSwap                    trap_grBufferSwap
+#define grRenderBuffer                  trap_grRenderBuffer
+
+/*
+** error management
+*/
+#define grErrorSetCallback              trap_grErrorSetCallback
+
+/*
+** SST routines
+*/
+#define grFinish                        trap_grFinish
+#define grFlush                         trap_grFlush
+#define grSstWinOpen                    trap_grSstWinOpen
+#define grSstWinClose                   trap_grSstWinClose
+#define grSetNumPendingBuffers          trap_grSetNumPendingBuffers
+#define grSelectContext                 trap_grSelectContext
+#define grSstOrigin                     trap_grSstOrigin
+#define grSstSelect                     trap_grSstSelect
+
+/*
+** Glide configuration and special effect maintenance functions
+*/
+#define grAlphaBlendFunction            trap_grAlphaBlendFunction
+#define grAlphaCombine                  trap_grAlphaCombine
+#define grAlphaControlsITRGBLighting    trap_grAlphaControlsITRGBLighting
+#define grAlphaTestFunction             trap_grAlphaTestFunction
+#define grAlphaTestReferenceValue       trap_grAlphaTestReferenceValue
+#define grChromakeyMode                 trap_grChromakeyMode
+#define grChromakeyValue                trap_grChromakeyValue
+#define grClipWindow                    trap_grClipWindow
+#define grColorCombine                  trap_grColorCombine
+#define grColorMask                     trap_grColorMask
+#define grCullMode                      trap_grCullMode
+#define grConstantColorValue            trap_grConstantColorValue
+#define grDepthBiasLevel                trap_grDepthBiasLevel
+#define grDepthBufferFunction           trap_grDepthBufferFunction
+#define grDepthBufferMode               trap_grDepthBufferMode
+#define grDepthMask                     trap_grDepthMask
+#define grDisableAllEffects             trap_grDisableAllEffects
+#define grDitherMode                    trap_grDitherMode
+#define grFogColorValue                 trap_grFogColorValue
+#define grFogMode                       trap_grFogMode
+#define grFogTable                      trap_grFogTable
+#define grLoadGammaTable                trap_grLoadGammaTable
+#define grSplash                        trap_grSplash
+#define grGet                           trap_grGet
+#define grGetString                     trap_grGetString
+#define grQueryResolutions              trap_grQueryResolutions
+#define grReset                         trap_grReset
+#define grGetProcAddress                trap_grGetProcAddress
+#define grEnable                        trap_grEnable
+#define grDisable                       trap_grDisable
+#define grCoordinateSpace               trap_grCoordinateSpace
+#define grDepthRange                    trap_grDepthRange
+#define grStippleMode                   trap_grStippleMode
+#define grStipplePattern                trap_grStipplePattern
+#define grViewport                      trap_grViewport
+
+/*
+** texture mapping control functions
+*/
+#define grTexCalcMemRequired            trap_grTexCalcMemRequired
+#define grTexTextureMemRequired         trap_grTexTextureMemRequired
+#define grTexMinAddress                 trap_grTexMinAddress
+#define grTexMaxAddress                 trap_grTexMaxAddress
+#define grTexNCCTable                   trap_grTexNCCTable
+#define grTexSource                     trap_grTexSource
+#define grTexClampMode                  trap_grTexClampMode
+#define grTexCombine                    trap_grTexCombine
+#define grTexDetailControl              trap_grTexDetailControl
+#define grTexFilterMode                 trap_grTexFilterMode
+#define grTexLodBiasValue               trap_grTexLodBiasValue
+#define grTexDownloadMipMap             trap_grTexDownloadMipMap
+#define grTexDownloadMipMapLevel        trap_grTexDownloadMipMapLevel
+#define grTexDownloadMipMapLevelPartial trap_grTexDownloadMipMapLevelPartial
+#define grTexDownloadTable              trap_grTexDownloadTable
+#define grTexDownloadTablePartial       trap_grTexDownloadTablePartial
+#define grTexMipMapMode                 trap_grTexMipMapMode
+#define grTexMultibase                  trap_grTexMultibase
+#define grTexMultibaseAddress           trap_grTexMultibaseAddress
+
+/*
+** linear frame buffer functions
+*/
+#define grLfbLock                       trap_grLfbLock
+#define grLfbUnlock                     trap_grLfbUnlock
+#define grLfbConstantAlpha              trap_grLfbConstantAlpha
+#define grLfbConstantDepth              trap_grLfbConstantDepth
+#define grLfbWriteColorSwizzle          trap_grLfbWriteColorSwizzle
+#define grLfbWriteColorFormat           trap_grLfbWriteColorFormat
+#define grLfbWriteRegion                trap_grLfbWriteRegion
+#define grLfbReadRegion                 trap_grLfbReadRegion
+
+/*
+** glide management functions
+*/
+#define grGlideInit                     trap_grGlideInit
+#define grGlideShutdown                 trap_grGlideShutdown
+#define grGlideGetState                 trap_grGlideGetState
+#define grGlideSetState                 trap_grGlideSetState
+#define grGlideGetVertexLayout          trap_grGlideGetVertexLayout
+#define grGlideSetVertexLayout          trap_grGlideSetVertexLayout
+
+/*
+** glide utility functions
+*/
+#define guGammaCorrectionRGB            trap_guGammaCorrectionRGB
+#define guFogTableIndexToW              trap_guFogTableIndexToW
+#define guFogGenerateExp                trap_guFogGenerateExp
+#define guFogGenerateExp2               trap_guFogGenerateExp2
+#define guFogGenerateLinear             trap_guFogGenerateLinear
+#endif /* DEBUG_TRAP_internal */
+#endif /* DEBUG_TRAP */
+
+
+
+/* <texus.h> */
+#define TX_MAX_LEVEL 16
+typedef struct _TxMip {
+        int format;
+        int width;
+        int height;
+        int depth;
+        int size;
+        void *data[TX_MAX_LEVEL];
+        FxU32 pal[256];
+} TxMip;
+
+#define TX_DITHER_NONE                                  0x00000000
+#define TX_DITHER_4x4                                   0x00000001
+#define TX_DITHER_ERR                                   0x00000002
+
+#define TX_COMPRESSION_STATISTICAL                      0x00000000
+#define TX_COMPRESSION_HEURISTIC                        0x00000010
+/* <texus.h> */
+
+
+
+struct tdfx_glide {
+   /*
+   ** glide extensions
+   */
+   char * (FX_CALL *grGetRegistryOrEnvironmentStringExt) (char *theEntry);
+   void (FX_CALL *grGetGammaTableExt) (FxU32 nentries, FxU32 *red, FxU32 *green, FxU32 *blue);
+   void (FX_CALL *grChromaRangeModeExt) (GrChromakeyMode_t mode);
+   void (FX_CALL *grChromaRangeExt) (GrColor_t color, GrColor_t range, GrChromaRangeMode_t match_mode);
+   void (FX_CALL *grTexChromaModeExt) (GrChipID_t tmu, GrChromakeyMode_t mode);
+   void (FX_CALL *grTexChromaRangeExt) (GrChipID_t tmu, GrColor_t min, GrColor_t max, GrTexChromakeyMode_t mode);
+
+   /* pointcast */
+   void (FX_CALL *grTexDownloadTableExt) (GrChipID_t tmu, GrTexTable_t type, void *data);
+   void (FX_CALL *grTexDownloadTablePartialExt) (GrChipID_t tmu, GrTexTable_t type, void *data, int start, int end);
+   void (FX_CALL *grTexNCCTableExt) (GrChipID_t tmu, GrNCCTable_t table);
+
+   /* tbext */
+   void (FX_CALL *grTextureBufferExt) (GrChipID_t tmu, FxU32 startAddress, GrLOD_t thisLOD, GrLOD_t largeLOD, GrAspectRatio_t aspectRatio, GrTextureFormat_t format, FxU32 odd_even_mask);
+   void (FX_CALL *grTextureAuxBufferExt) (GrChipID_t tmu, FxU32 startAddress, GrLOD_t thisLOD, GrLOD_t largeLOD, GrAspectRatio_t aspectRatio, GrTextureFormat_t format, FxU32 odd_even_mask);
+   void (FX_CALL *grAuxBufferExt) (GrBuffer_t buffer);
+
+   /* napalm */
+   GrContext_t (FX_CALL *grSstWinOpenExt) (FxU32 hWnd, GrScreenResolution_t resolution, GrScreenRefresh_t refresh, GrColorFormat_t format, GrOriginLocation_t origin, GrPixelFormat_t pixelformat, int nColBuffers, int nAuxBuffers);
+   void (FX_CALL *grStencilFuncExt) (GrCmpFnc_t fnc, GrStencil_t ref, GrStencil_t mask);
+   void (FX_CALL *grStencilMaskExt) (GrStencil_t value);
+   void (FX_CALL *grStencilOpExt) (GrStencilOp_t stencil_fail, GrStencilOp_t depth_fail, GrStencilOp_t depth_pass);
+   void (FX_CALL *grLfbConstantStencilExt) (GrStencil_t value);
+   void (FX_CALL *grBufferClearExt) (GrColor_t color, GrAlpha_t alpha, FxU32 depth, GrStencil_t stencil);
+   void (FX_CALL *grColorCombineExt) (GrCCUColor_t a, GrCombineMode_t a_mode, GrCCUColor_t b, GrCombineMode_t b_mode, GrCCUColor_t c, FxBool c_invert, GrCCUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert);
+   void (FX_CALL *grAlphaCombineExt) (GrACUColor_t a, GrCombineMode_t a_mode, GrACUColor_t b, GrCombineMode_t b_mode, GrACUColor_t c, FxBool c_invert, GrACUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert);
+   void (FX_CALL *grTexColorCombineExt) (GrChipID_t tmu, GrTCCUColor_t a, GrCombineMode_t a_mode, GrTCCUColor_t b, GrCombineMode_t b_mode, GrTCCUColor_t c, FxBool c_invert, GrTCCUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert);
+   void (FX_CALL *grTexAlphaCombineExt) (GrChipID_t tmu, GrTACUColor_t a, GrCombineMode_t a_mode, GrTACUColor_t b, GrCombineMode_t b_mode, GrTACUColor_t c, FxBool c_invert, GrTACUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert);
+   void (FX_CALL *grConstantColorValueExt) (GrChipID_t tmu, GrColor_t value);
+   void (FX_CALL *grColorMaskExt) (FxBool r, FxBool g, FxBool b, FxBool a);
+   void (FX_CALL *grAlphaBlendFunctionExt) (GrAlphaBlendFnc_t rgb_sf, GrAlphaBlendFnc_t rgb_df, GrAlphaBlendOp_t rgb_op, GrAlphaBlendFnc_t alpha_sf, GrAlphaBlendFnc_t alpha_df, GrAlphaBlendOp_t alpha_op);
+   void (FX_CALL *grTBufferWriteMaskExt) (FxU32 tmask);
+
+   /*
+   ** Texus2 functions
+   */
+   void (FX_CALL *txImgQuantize) (char *dst, char *src, int w, int h, FxU32 format, FxU32 dither);
+   void (FX_CALL *txMipQuantize) (TxMip *pxMip, TxMip *txMip, int fmt, FxU32 d, FxU32 comp);
+   void (FX_CALL *txPalToNcc) (GuNccTable *ncc_table, const FxU32 *pal);
+};
+
+void tdfx_hook_glide (struct tdfx_glide *Glide);
+
+#endif
diff --git a/reactos/lib/mesa32/src/drivers/glide/fxglidew.c b/reactos/lib/mesa32/src/drivers/glide/fxglidew.c
new file mode 100644
index 00000000000..e386b0d8250
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/glide/fxglidew.c
@@ -0,0 +1,263 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.0
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/* Authors:
+ *    David Bucciarelli
+ *    Brian Paul
+ *    Daryll Strauss
+ *    Keith Whitwell
+ *    Daniel Borca
+ *    Hiroshi Morii
+ */
+
+/* fxsetup.c - 3Dfx VooDoo rendering mode setup functions */
+
+
+#ifdef HAVE_CONFIG_H
+#include "conf.h"
+#endif
+
+#if defined(FX)
+#include "fxglidew.h"
+#include "fxdrv.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+FxI32
+FX_grGetInteger_NoLock(FxU32 pname)
+{
+ FxI32 result;
+
+ if (grGet(pname, 4, &result)) {
+    return result;
+ }
+
+ if (TDFX_DEBUG & VERBOSE_DRIVER) {
+    fprintf(stderr, "FX_grGetInteger_NoLock: wrong parameter (%lx)\n", pname);
+ }
+ return -1;
+}
+
+FxBool
+FX_grSstControl(FxU32 code)
+{
+   /* The glide 3 sources call for grEnable/grDisable to be called in exchange
+    * for grSstControl. */
+   switch (code) {
+   case GR_CONTROL_ACTIVATE:
+      grEnable(GR_PASSTHRU);
+      break;
+   case GR_CONTROL_DEACTIVATE:
+      grDisable(GR_PASSTHRU);
+      break;
+   }
+   /* Appearently GR_CONTROL_RESIZE can be ignored. */
+   return 1;			/* OK? */
+}
+
+
+int
+FX_grSstScreenWidth()
+{
+   FxI32 result[4];
+
+   BEGIN_BOARD_LOCK();
+   grGet(GR_VIEWPORT, sizeof(FxI32) * 4, result);
+   END_BOARD_LOCK();
+
+   return result[2];
+}
+
+int
+FX_grSstScreenHeight()
+{
+   FxI32 result[4];
+
+   BEGIN_BOARD_LOCK();
+   grGet(GR_VIEWPORT, sizeof(FxI32) * 4, result);
+   END_BOARD_LOCK();
+
+   return result[3];
+}
+
+void
+FX_grSstPerfStats(GrSstPerfStats_t * st)
+{
+   FxI32 n;
+   grGet(GR_STATS_PIXELS_IN, 4, &n);
+   st->pixelsIn = n;
+   grGet(GR_STATS_PIXELS_CHROMA_FAIL, 4, &n);
+   st->chromaFail = n;
+   grGet(GR_STATS_PIXELS_DEPTHFUNC_FAIL, 4, &n);
+   st->zFuncFail = n;
+   grGet(GR_STATS_PIXELS_AFUNC_FAIL, 4, &n);
+   st->aFuncFail = n;
+   grGet(GR_STATS_PIXELS_OUT, 4, &n);
+   st->pixelsOut = n;
+}
+
+void
+FX_setupGrVertexLayout(void)
+{
+   BEGIN_BOARD_LOCK();
+   grReset(GR_VERTEX_PARAMETER);
+
+   grCoordinateSpace(GR_WINDOW_COORDS);
+   grVertexLayout(GR_PARAM_XY, GR_VERTEX_X_OFFSET << 2, GR_PARAM_ENABLE);
+   grVertexLayout(GR_PARAM_PARGB, GR_VERTEX_PARGB_OFFSET << 2, GR_PARAM_ENABLE);
+   grVertexLayout(GR_PARAM_Q, GR_VERTEX_OOW_OFFSET << 2, GR_PARAM_ENABLE);
+   grVertexLayout(GR_PARAM_Z, GR_VERTEX_OOZ_OFFSET << 2, GR_PARAM_ENABLE);
+   grVertexLayout(GR_PARAM_ST0, GR_VERTEX_SOW_TMU0_OFFSET << 2,
+		  GR_PARAM_ENABLE);
+   grVertexLayout(GR_PARAM_Q0, GR_VERTEX_OOW_TMU0_OFFSET << 2,
+		  GR_PARAM_DISABLE);
+   grVertexLayout(GR_PARAM_ST1, GR_VERTEX_SOW_TMU1_OFFSET << 2,
+		  GR_PARAM_DISABLE);
+   grVertexLayout(GR_PARAM_Q1, GR_VERTEX_OOW_TMU1_OFFSET << 2,
+		  GR_PARAM_DISABLE);
+   END_BOARD_LOCK();
+}
+
+void
+FX_grHints_NoLock(GrHint_t hintType, FxU32 hintMask)
+{
+   switch (hintType) {
+   case GR_HINT_STWHINT:
+      {
+	 if (hintMask & GR_STWHINT_W_DIFF_TMU0)
+	    grVertexLayout(GR_PARAM_Q0, GR_VERTEX_OOW_TMU0_OFFSET << 2,
+			   GR_PARAM_ENABLE);
+	 else
+	    grVertexLayout(GR_PARAM_Q0, GR_VERTEX_OOW_TMU0_OFFSET << 2,
+			   GR_PARAM_DISABLE);
+
+	 if (hintMask & GR_STWHINT_ST_DIFF_TMU1)
+	    grVertexLayout(GR_PARAM_ST1, GR_VERTEX_SOW_TMU1_OFFSET << 2,
+			   GR_PARAM_ENABLE);
+	 else
+	    grVertexLayout(GR_PARAM_ST1, GR_VERTEX_SOW_TMU1_OFFSET << 2,
+			   GR_PARAM_DISABLE);
+
+	 if (hintMask & GR_STWHINT_W_DIFF_TMU1)
+	    grVertexLayout(GR_PARAM_Q1, GR_VERTEX_OOW_TMU1_OFFSET << 2,
+			   GR_PARAM_ENABLE);
+	 else
+	    grVertexLayout(GR_PARAM_Q1, GR_VERTEX_OOW_TMU1_OFFSET << 2,
+			   GR_PARAM_DISABLE);
+
+      }
+   }
+}
+
+/*
+ * Glide3 doesn't have the grSstQueryHardware function anymore.
+ * Instead, we call grGet() and fill in the data structures ourselves.
+ */
+int
+FX_grSstQueryHardware(GrHwConfiguration * config)
+{
+   int i, j;
+   int numFB;
+
+   BEGIN_BOARD_LOCK();
+
+   grGet(GR_NUM_BOARDS, 4, (void *) &(config->num_sst));
+   if (config->num_sst == 0)
+      return 0;
+
+   for (i = 0; i < config->num_sst; i++) {
+      FxI32 result;
+      const char *extension;
+
+      grSstSelect(i);
+
+      extension = grGetString(GR_HARDWARE);
+      if (strstr(extension, "Voodoo2")) {
+         config->SSTs[i].type = GR_SSTTYPE_Voodoo2;
+      } else if (strstr(extension, "Voodoo Banshee")) {
+         config->SSTs[i].type = GR_SSTTYPE_Banshee;
+      } else if (strstr(extension, "Voodoo3")) {
+         config->SSTs[i].type = GR_SSTTYPE_Voodoo3;
+      } else if (strstr(extension, "Voodoo4")) {
+         config->SSTs[i].type = GR_SSTTYPE_Voodoo4;
+      } else if (strstr(extension, "Voodoo5")) {
+         config->SSTs[i].type = GR_SSTTYPE_Voodoo5;
+      } else { /* Voodoo1,rush */
+         /* ZZZ TO DO: Need to distinguish whether we have V1 or Rush. */
+         config->SSTs[i].type = GR_SSTTYPE_VOODOO;
+      }
+
+      grGet(GR_MEMORY_FB, 4, &result); /* ZZZ: differs after grSstWinOpen */
+      config->SSTs[i].fbRam = result / (1024 * 1024);
+
+      grGet(GR_NUM_TMU, 4, &result);
+      config->SSTs[i].nTexelfx = result;
+
+      grGet(GR_REVISION_FB, 4, &result);
+      config->SSTs[i].fbiRev = result;
+
+      for (j = 0; j < config->SSTs[i].nTexelfx; j++) {
+	 grGet(GR_MEMORY_TMU, 4, &result); /* ZZZ: differs after grSstWinOpen */
+	 config->SSTs[i].tmuConfig[j].tmuRam = result / (1024 * 1024);
+	 grGet(GR_REVISION_TMU, 4, &result);
+	 config->SSTs[i].tmuConfig[j].tmuRev = result;
+      }
+
+      extension = grGetString(GR_EXTENSION);
+      config->SSTs[i].HavePalExt = (strstr(extension, " PALETTE6666 ") != NULL);
+      config->SSTs[i].HavePixExt = (strstr(extension, " PIXEXT ") != NULL);
+      config->SSTs[i].HaveTexFmt = (strstr(extension, " TEXFMT ") != NULL);
+      config->SSTs[i].HaveCmbExt = (strstr(extension, " COMBINE ") != NULL);
+      config->SSTs[i].HaveMirExt = (strstr(extension, " TEXMIRROR ") != NULL);
+      config->SSTs[i].HaveTexUma = (strstr(extension, " TEXUMA ") != NULL);
+
+      /* number of Voodoo chips */
+      grGet(GR_NUM_FB, 4, (void *) &numFB);
+      config->SSTs[i].numChips = numFB;
+
+   }
+
+   tdfx_hook_glide(&config->Glide);
+
+   END_BOARD_LOCK();
+   return 1;
+}
+
+
+
+#else
+
+/*
+ * Need this to provide at least one external definition.
+ */
+
+extern int gl_fx_dummy_function_glidew(void);
+int
+gl_fx_dummy_function_glidew(void)
+{
+   return 0;
+}
+
+#endif /* FX */
diff --git a/reactos/lib/mesa32/src/drivers/glide/fxglidew.h b/reactos/lib/mesa32/src/drivers/glide/fxglidew.h
new file mode 100644
index 00000000000..472cf9473cc
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/glide/fxglidew.h
@@ -0,0 +1,197 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.0
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/* Authors:
+ *    David Bucciarelli
+ *    Brian Paul
+ *    Daryll Strauss
+ *    Keith Whitwell
+ *    Daniel Borca
+ *    Hiroshi Morii
+ */
+
+
+#ifndef __FX_GLIDE_WARPER__
+#define __FX_GLIDE_WARPER__
+
+
+#include "fxg.h"
+
+
+
+#define MAX_NUM_SST             4
+
+enum {
+      GR_SSTTYPE_VOODOO  = 0,
+      GR_SSTTYPE_SST96   = 1,
+      GR_SSTTYPE_AT3D    = 2,
+      GR_SSTTYPE_Voodoo2 = 3,
+      GR_SSTTYPE_Banshee = 4,
+      GR_SSTTYPE_Voodoo3 = 5,
+      GR_SSTTYPE_Voodoo4 = 6,
+      GR_SSTTYPE_Voodoo5 = 7
+};
+
+#define GrState                 void
+
+typedef int GrSstType;
+
+typedef struct GrTMUConfig_St {
+        int tmuRev;		/* Rev of Texelfx chip */
+        int tmuRam;		/* 1, 2, or 4 MB */
+} GrTMUConfig_t;
+
+typedef struct {
+        int num_sst;		/* # of HW units in the system */
+        struct SstCard_St {
+               GrSstType type;	/* Which hardware is it? */
+               int fbRam;	/* 1, 2, or 4 MB */
+               int fbiRev;	/* Rev of Pixelfx chip */
+               int nTexelfx;	/* How many texelFX chips are there? */
+               int numChips;	/* Number of Voodoo chips */
+               GrTMUConfig_t tmuConfig[GLIDE_NUM_TMU];	/* Configuration of the Texelfx chips */
+               /* Glide3 extensions */
+               FxBool HavePalExt;	/* PALETTE6666 */
+               FxBool HavePixExt;	/* PIXEXT */
+               FxBool HaveTexFmt;	/* TEXFMT */
+               FxBool HaveCmbExt;	/* COMBINE */
+               FxBool HaveMirExt;	/* TEXMIRROR */
+               FxBool HaveTexUma;	/* TEXUMA */
+        }
+        SSTs[MAX_NUM_SST];	/* configuration for each board */
+        struct tdfx_glide Glide;
+} GrHwConfiguration;
+
+
+
+typedef FxU32 GrHint_t;
+#define GR_HINTTYPE_MIN         0
+#define GR_HINT_STWHINT         0
+
+typedef FxU32 GrSTWHint_t;
+#define GR_STWHINT_W_DIFF_FBI   FXBIT(0)
+#define GR_STWHINT_W_DIFF_TMU0  FXBIT(1)
+#define GR_STWHINT_ST_DIFF_TMU0 FXBIT(2)
+#define GR_STWHINT_W_DIFF_TMU1  FXBIT(3)
+#define GR_STWHINT_ST_DIFF_TMU1 FXBIT(4)
+#define GR_STWHINT_W_DIFF_TMU2  FXBIT(5)
+#define GR_STWHINT_ST_DIFF_TMU2 FXBIT(6)
+
+#define GR_CONTROL_ACTIVATE     1
+#define GR_CONTROL_DEACTIVATE   0
+
+
+
+/*
+** move the vertex layout defintion to application
+*/
+typedef struct {
+        float sow;		/* s texture ordinate (s over w) */
+        float tow;		/* t texture ordinate (t over w) */
+        float oow;		/* 1/w (used mipmapping - really 0xfff/w) */
+} GrTmuVertex;
+
+typedef struct {
+        float x, y;		/* X and Y in screen space */
+        float ooz;		/* 65535/Z (used for Z-buffering) */
+        float oow;		/* 1/W (used for W-buffering, texturing) */
+        unsigned char pargb[4];	/* B, G, R, A [0..255] */
+        GrTmuVertex tmuvtx[GLIDE_NUM_TMU];
+        float fog;		/* fog coordinate */
+        unsigned char pspec[4];	/* B, G, R, A [0..255] */
+        float psize;		/* point size */
+        long pad[16 - 14];	/* ensure 64b structure */
+} GrVertex;
+
+#define GR_VERTEX_X_OFFSET              0
+#define GR_VERTEX_Y_OFFSET              1
+#define GR_VERTEX_OOZ_OFFSET            2
+#define GR_VERTEX_OOW_OFFSET            3
+#define GR_VERTEX_PARGB_OFFSET          4
+#define GR_VERTEX_SOW_TMU0_OFFSET       5
+#define GR_VERTEX_TOW_TMU0_OFFSET       6
+#define GR_VERTEX_OOW_TMU0_OFFSET       7
+#define GR_VERTEX_SOW_TMU1_OFFSET       8
+#define GR_VERTEX_TOW_TMU1_OFFSET       9
+#define GR_VERTEX_OOW_TMU1_OFFSET       10
+#define GR_VERTEX_FOG_OFFSET            11
+#define GR_VERTEX_PSPEC_OFFSET          12
+
+
+
+/*
+ * For Lod/LodLog2 conversion.
+ */
+#define FX_largeLodLog2(info)		(info).largeLodLog2
+#define FX_aspectRatioLog2(info)	(info).aspectRatioLog2
+#define FX_smallLodLog2(info)		(info).smallLodLog2
+#define FX_lodToValue(val)		((int)(GR_LOD_LOG2_256-val))
+#define FX_largeLodValue(info)		((int)(GR_LOD_LOG2_256-(info).largeLodLog2))
+#define FX_smallLodValue(info)		((int)(GR_LOD_LOG2_256-(info).smallLodLog2))
+#define FX_valueToLod(val)		((GrLOD_t)(GR_LOD_LOG2_256-val))
+
+
+
+/*
+ * Query
+ */
+extern int FX_grSstScreenWidth(void);
+extern int FX_grSstScreenHeight(void);
+extern void FX_grSstPerfStats(GrSstPerfStats_t *st);
+extern int FX_grSstQueryHardware(GrHwConfiguration *config);
+#define FX_grGetInteger FX_grGetInteger_NoLock
+extern FxI32 FX_grGetInteger_NoLock(FxU32 pname);
+
+
+
+/*
+ * GrHints
+ */
+#define FX_grHints FX_grHints_NoLock
+extern void FX_grHints_NoLock(GrHint_t hintType, FxU32 hintMask);
+
+
+
+/*
+ * Needed for Glide3 only, to set up Glide2 compatible vertex layout.
+ */
+extern void FX_setupGrVertexLayout(void);
+
+
+
+/*
+ * grSstControl stuff
+ */
+extern FxBool FX_grSstControl(FxU32 code);
+
+#define FX_grBufferClear(c, a, d)	\
+  do {					\
+    BEGIN_CLIP_LOOP();			\
+    grBufferClear(c, a, d);		\
+    END_CLIP_LOOP();			\
+  } while (0)
+
+
+
+#endif /* __FX_GLIDE_WARPER__ */
diff --git a/reactos/lib/mesa32/src/drivers/glide/fxopengl.def b/reactos/lib/mesa32/src/drivers/glide/fxopengl.def
new file mode 100644
index 00000000000..86ff1001166
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/glide/fxopengl.def
@@ -0,0 +1,938 @@
+LIBRARY OpenGL32
+DESCRIPTION "Mesa 5.1"
+EXPORTS
+ glAccum
+ glActiveStencilFaceEXT
+ glActiveTexture
+ glActiveTextureARB
+ glAlphaFunc
+ glAreProgramsResidentNV
+ glAreTexturesResident
+ glAreTexturesResidentEXT
+ glArrayElement
+ glArrayElementEXT
+ glBegin
+ glBeginQueryARB
+ glBindBufferARB
+ glBindProgramARB
+ glBindProgramNV
+ glBindTexture
+ glBindTextureEXT
+ glBitmap
+ glBlendColor
+ glBlendColorEXT
+ glBlendEquation
+ glBlendEquationEXT
+ glBlendFunc
+ glBlendFuncSeparate
+ glBlendFuncSeparateEXT
+ glBlendFuncSeparateINGR
+ glBufferDataARB
+ glBufferSubDataARB
+ glCallList
+ glCallLists
+ glClear
+ glClearAccum
+ glClearColor
+ glClearDepth
+ glClearIndex
+ glClearStencil
+ glClientActiveTexture
+ glClientActiveTextureARB
+ glClipPlane
+ glColorMask
+ glColorMaterial
+ glColorPointer
+ glColorPointerEXT
+ glColorSubTable
+ glColorSubTableEXT
+ glColorTable
+ glColorTableEXT
+ glColorTableParameterfv
+ glColorTableParameterfvSGI
+ glColorTableParameteriv
+ glColorTableParameterivSGI
+ glColorTableSGI
+ glColor3b
+ glColor3bv
+ glColor3d
+ glColor3dv
+ glColor3f
+ glColor3fv
+ glColor3i
+ glColor3iv
+ glColor3s
+ glColor3sv
+ glColor3ub
+ glColor3ubv
+ glColor3ui
+ glColor3uiv
+ glColor3us
+ glColor3usv
+ glColor4b
+ glColor4bv
+ glColor4d
+ glColor4dv
+ glColor4f
+ glColor4fv
+ glColor4i
+ glColor4iv
+ glColor4s
+ glColor4sv
+ glColor4ub
+ glColor4ubv
+ glColor4ui
+ glColor4uiv
+ glColor4us
+ glColor4usv
+ glCombinerInputNV
+ glCombinerOutputNV
+ glCombinerParameterfNV
+ glCombinerParameterfvNV
+ glCombinerParameteriNV
+ glCombinerParameterivNV
+ glCompressedTexImage1D
+ glCompressedTexImage1DARB
+ glCompressedTexImage2D
+ glCompressedTexImage2DARB
+ glCompressedTexImage3D
+ glCompressedTexImage3DARB
+ glCompressedTexSubImage1D
+ glCompressedTexSubImage1DARB
+ glCompressedTexSubImage2D
+ glCompressedTexSubImage2DARB
+ glCompressedTexSubImage3D
+ glCompressedTexSubImage3DARB
+ glConvolutionFilter1D
+ glConvolutionFilter1DEXT
+ glConvolutionFilter2D
+ glConvolutionFilter2DEXT
+ glConvolutionParameterf
+ glConvolutionParameterfEXT
+ glConvolutionParameterfv
+ glConvolutionParameterfvEXT
+ glConvolutionParameteri
+ glConvolutionParameteriEXT
+ glConvolutionParameteriv
+ glConvolutionParameterivEXT
+ glCopyColorSubTable
+ glCopyColorSubTableEXT
+ glCopyColorTable
+ glCopyColorTableSGI
+ glCopyConvolutionFilter1D
+ glCopyConvolutionFilter1DEXT
+ glCopyConvolutionFilter2D
+ glCopyConvolutionFilter2DEXT
+ glCopyPixels
+ glCopyTexImage1D
+ glCopyTexImage1DEXT
+ glCopyTexImage2D
+ glCopyTexImage2DEXT
+ glCopyTexSubImage1D
+ glCopyTexSubImage1DEXT
+ glCopyTexSubImage2D
+ glCopyTexSubImage2DEXT
+ glCopyTexSubImage3D
+ glCopyTexSubImage3DEXT
+ glCullFace
+ glCullParameterdvEXT
+ glCullParameterfvEXT
+ glDeleteBuffersARB
+ glDeleteFencesNV
+ glDeleteLists
+ glDeleteProgramsARB
+ glDeleteProgramsNV
+ glDeleteQueriesARB
+ glDeleteTextures
+ glDeleteTexturesEXT
+ glDepthBoundsEXT
+ glDepthFunc
+ glDepthMask
+ glDepthRange
+ glDetailTexFuncSGIS
+ glDisable
+ glDisableClientState
+ glDisableVertexAttribArrayARB
+ glDrawArrays
+ glDrawArraysEXT
+ glDrawBuffer
+ glDrawElements
+ glDrawPixels
+ glDrawRangeElements
+ glDrawRangeElementsEXT
+ glEdgeFlag
+ glEdgeFlagPointer
+ glEdgeFlagPointerEXT
+ glEdgeFlagv
+ glEnable
+ glEnableClientState
+ glEnableVertexAttribArrayARB
+ glEnd
+ glEndList
+ glEndQueryARB
+ glEvalCoord1d
+ glEvalCoord1dv
+ glEvalCoord1f
+ glEvalCoord1fv
+ glEvalCoord2d
+ glEvalCoord2dv
+ glEvalCoord2f
+ glEvalCoord2fv
+ glEvalMesh1
+ glEvalMesh2
+ glEvalPoint1
+ glEvalPoint2
+ glExecuteProgramNV
+ glFeedbackBuffer
+ glFinalCombinerInputNV
+ glFinish
+ glFinishFenceNV
+ glFlush
+ glFlushRasterSGIX
+ glFlushVertexArrayRangeNV
+ glFogCoordd
+ glFogCoorddEXT
+ glFogCoorddv
+ glFogCoorddvEXT
+ glFogCoordf
+ glFogCoordfEXT
+ glFogCoordfv
+ glFogCoordfvEXT
+ glFogCoordPointer
+ glFogCoordPointerEXT
+ glFogf
+ glFogfv
+ glFogi
+ glFogiv
+ glFragmentColorMaterialSGIX
+ glFragmentLightfSGIX
+ glFragmentLightfvSGIX
+ glFragmentLightiSGIX
+ glFragmentLightivSGIX
+ glFragmentLightModelfSGIX
+ glFragmentLightModelfvSGIX
+ glFragmentLightModeliSGIX
+ glFragmentLightModelivSGIX
+ glFragmentMaterialfSGIX
+ glFragmentMaterialfvSGIX
+ glFragmentMaterialiSGIX
+ glFragmentMaterialivSGIX
+ glFrameZoomSGIX
+ glFrontFace
+ glFrustum
+ glGenBuffersARB
+ glGenFencesNV
+ glGenLists
+ glGenProgramsARB
+ glGenProgramsNV
+ glGenQueriesARB
+ glGenTextures
+ glGenTexturesEXT
+ glGetBooleanv
+ glGetBufferParameterivARB
+ glGetBufferPointervARB
+ glGetBufferSubDataARB
+ glGetClipPlane
+ glGetColorTable
+ glGetColorTableEXT
+ glGetColorTableParameterfv
+ glGetColorTableParameterfvEXT
+ glGetColorTableParameterfvSGI
+ glGetColorTableParameteriv
+ glGetColorTableParameterivEXT
+ glGetColorTableParameterivSGI
+ glGetColorTableSGI
+ glGetCombinerInputParameterfvNV
+ glGetCombinerInputParameterivNV
+ glGetCombinerOutputParameterfvNV
+ glGetCombinerOutputParameterivNV
+ glGetCompressedTexImage
+ glGetCompressedTexImageARB
+ glGetConvolutionFilter
+ glGetConvolutionFilterEXT
+ glGetConvolutionParameterfv
+ glGetConvolutionParameterfvEXT
+ glGetConvolutionParameteriv
+ glGetConvolutionParameterivEXT
+ glGetDetailTexFuncSGIS
+ glGetDoublev
+ glGetError
+ glGetFenceivNV
+ glGetFinalCombinerInputParameterfvNV
+ glGetFinalCombinerInputParameterivNV
+ glGetFloatv
+ glGetFragmentLightfvSGIX
+ glGetFragmentLightivSGIX
+ glGetFragmentMaterialfvSGIX
+ glGetFragmentMaterialivSGIX
+ glGetHistogram
+ glGetHistogramEXT
+ glGetHistogramParameterfv
+ glGetHistogramParameterfvEXT
+ glGetHistogramParameteriv
+ glGetHistogramParameterivEXT
+ glGetInstrumentsSGIX
+ glGetIntegerv
+ glGetLightfv
+ glGetLightiv
+ glGetListParameterfvSGIX
+ glGetListParameterivSGIX
+ glGetMapdv
+ glGetMapfv
+ glGetMapiv
+ glGetMaterialfv
+ glGetMaterialiv
+ glGetMinmax
+ glGetMinmaxEXT
+ glGetMinmaxParameterfv
+ glGetMinmaxParameterfvEXT
+ glGetMinmaxParameteriv
+ glGetMinmaxParameterivEXT
+ glGetPixelMapfv
+ glGetPixelMapuiv
+ glGetPixelMapusv
+ glGetPixelTexGenParameterfvSGIS
+ glGetPixelTexGenParameterivSGIS
+ glGetPointerv
+ glGetPointervEXT
+ glGetPolygonStipple
+ glGetProgramEnvParameterdvARB
+ glGetProgramEnvParameterfvARB
+ glGetProgramivARB
+ glGetProgramivNV
+ glGetProgramLocalParameterdvARB
+ glGetProgramLocalParameterfvARB
+ glGetProgramNamedParameterdvNV
+ glGetProgramNamedParameterfvNV
+ glGetProgramParameterdvNV
+ glGetProgramParameterfvNV
+ glGetProgramStringARB
+ glGetProgramStringNV
+ glGetQueryivARB
+ glGetQueryObjectivARB
+ glGetQueryObjectuivARB
+ glGetSeparableFilter
+ glGetSeparableFilterEXT
+ glGetSharpenTexFuncSGIS
+ glGetString
+ glGetTexEnvfv
+ glGetTexEnviv
+ glGetTexFilterFuncSGIS
+ glGetTexGendv
+ glGetTexGenfv
+ glGetTexGeniv
+ glGetTexImage
+ glGetTexLevelParameterfv
+ glGetTexLevelParameteriv
+ glGetTexParameterfv
+ glGetTexParameteriv
+ glGetTrackMatrixivNV
+ glGetVertexAttribdvARB
+ glGetVertexAttribdvNV
+ glGetVertexAttribfvARB
+ glGetVertexAttribfvNV
+ glGetVertexAttribivARB
+ glGetVertexAttribivNV
+ glGetVertexAttribPointervARB
+ glGetVertexAttribPointervNV
+ glHint
+ glHintPGI
+ glHistogram
+ glHistogramEXT
+ glIndexd
+ glIndexdv
+ glIndexf
+ glIndexFuncEXT
+ glIndexfv
+ glIndexi
+ glIndexiv
+ glIndexMask
+ glIndexMaterialEXT
+ glIndexPointer
+ glIndexPointerEXT
+ glIndexs
+ glIndexsv
+ glIndexub
+ glIndexubv
+ glInitNames
+ glInstrumentsBufferSGIX
+ glInterleavedArrays
+ glIsBufferARB
+ glIsEnabled
+ glIsFenceNV
+ glIsList
+ glIsProgramARB
+ glIsProgramNV
+ glIsQueryARB
+ glIsTexture
+ glIsTextureEXT
+ glLightEnviSGIX
+ glLightf
+ glLightfv
+ glLighti
+ glLightiv
+ glLightModelf
+ glLightModelfv
+ glLightModeli
+ glLightModeliv
+ glLineStipple
+ glLineWidth
+ glListBase
+ glListParameterfSGIX
+ glListParameterfvSGIX
+ glListParameteriSGIX
+ glListParameterivSGIX
+ glLoadIdentity
+ glLoadMatrixd
+ glLoadMatrixf
+ glLoadName
+ glLoadProgramNV
+ glLoadTransposeMatrixd
+ glLoadTransposeMatrixdARB
+ glLoadTransposeMatrixf
+ glLoadTransposeMatrixfARB
+ glLockArraysEXT
+ glLogicOp
+ glMapBufferARB
+ glMapGrid1d
+ glMapGrid1f
+ glMapGrid2d
+ glMapGrid2f
+ glMap1d
+ glMap1f
+ glMap2d
+ glMap2f
+ glMaterialf
+ glMaterialfv
+ glMateriali
+ glMaterialiv
+ glMatrixMode
+ glMinmax
+ glMinmaxEXT
+ glMultiDrawArrays
+ glMultiDrawArraysEXT
+ glMultiDrawElements
+ glMultiDrawElementsEXT
+ glMultiModeDrawArraysIBM
+ glMultiModeDrawElementsIBM
+ glMultiTexCoord1d
+ glMultiTexCoord1dARB
+ glMultiTexCoord1dv
+ glMultiTexCoord1dvARB
+ glMultiTexCoord1f
+ glMultiTexCoord1fARB
+ glMultiTexCoord1fv
+ glMultiTexCoord1fvARB
+ glMultiTexCoord1i
+ glMultiTexCoord1iARB
+ glMultiTexCoord1iv
+ glMultiTexCoord1ivARB
+ glMultiTexCoord1s
+ glMultiTexCoord1sARB
+ glMultiTexCoord1sv
+ glMultiTexCoord1svARB
+ glMultiTexCoord2d
+ glMultiTexCoord2dARB
+ glMultiTexCoord2dv
+ glMultiTexCoord2dvARB
+ glMultiTexCoord2f
+ glMultiTexCoord2fARB
+ glMultiTexCoord2fv
+ glMultiTexCoord2fvARB
+ glMultiTexCoord2i
+ glMultiTexCoord2iARB
+ glMultiTexCoord2iv
+ glMultiTexCoord2ivARB
+ glMultiTexCoord2s
+ glMultiTexCoord2sARB
+ glMultiTexCoord2sv
+ glMultiTexCoord2svARB
+ glMultiTexCoord3d
+ glMultiTexCoord3dARB
+ glMultiTexCoord3dv
+ glMultiTexCoord3dvARB
+ glMultiTexCoord3f
+ glMultiTexCoord3fARB
+ glMultiTexCoord3fv
+ glMultiTexCoord3fvARB
+ glMultiTexCoord3i
+ glMultiTexCoord3iARB
+ glMultiTexCoord3iv
+ glMultiTexCoord3ivARB
+ glMultiTexCoord3s
+ glMultiTexCoord3sARB
+ glMultiTexCoord3sv
+ glMultiTexCoord3svARB
+ glMultiTexCoord4d
+ glMultiTexCoord4dARB
+ glMultiTexCoord4dv
+ glMultiTexCoord4dvARB
+ glMultiTexCoord4f
+ glMultiTexCoord4fARB
+ glMultiTexCoord4fv
+ glMultiTexCoord4fvARB
+ glMultiTexCoord4i
+ glMultiTexCoord4iARB
+ glMultiTexCoord4iv
+ glMultiTexCoord4ivARB
+ glMultiTexCoord4s
+ glMultiTexCoord4sARB
+ glMultiTexCoord4sv
+ glMultiTexCoord4svARB
+ glMultMatrixd
+ glMultMatrixf
+ glMultTransposeMatrixd
+ glMultTransposeMatrixdARB
+ glMultTransposeMatrixf
+ glMultTransposeMatrixfARB
+ glNewList
+ glNormalPointer
+ glNormalPointerEXT
+ glNormal3b
+ glNormal3bv
+ glNormal3d
+ glNormal3dv
+ glNormal3f
+ glNormal3fv
+ glNormal3i
+ glNormal3iv
+ glNormal3s
+ glNormal3sv
+ glOrtho
+ glPassThrough
+ glPixelMapfv
+ glPixelMapuiv
+ glPixelMapusv
+ glPixelStoref
+ glPixelStorei
+ glPixelTexGenParameterfSGIS
+ glPixelTexGenParameterfvSGIS
+ glPixelTexGenParameteriSGIS
+ glPixelTexGenParameterivSGIS
+ glPixelTexGenSGIX
+ glPixelTransferf
+ glPixelTransferi
+ glPixelZoom
+ glPointParameterf
+ glPointParameterfARB
+ glPointParameterfEXT
+ glPointParameterfSGIS
+ glPointParameterfv
+ glPointParameterfvARB
+ glPointParameterfvEXT
+ glPointParameterfvSGIS
+ glPointParameteri
+ glPointParameteriNV
+ glPointParameteriv
+ glPointParameterivNV
+ glPointSize
+ glPollInstrumentsSGIX
+ glPolygonMode
+ glPolygonOffset
+ glPolygonOffsetEXT
+ glPolygonStipple
+ glPopAttrib
+ glPopClientAttrib
+ glPopMatrix
+ glPopName
+ glPrioritizeTextures
+ glPrioritizeTexturesEXT
+ glProgramEnvParameter4dARB
+ glProgramEnvParameter4dvARB
+ glProgramEnvParameter4fARB
+ glProgramEnvParameter4fvARB
+ glProgramLocalParameter4dARB
+ glProgramLocalParameter4dvARB
+ glProgramLocalParameter4fARB
+ glProgramLocalParameter4fvARB
+ glProgramNamedParameter4dNV
+ glProgramNamedParameter4dvNV
+ glProgramNamedParameter4fNV
+ glProgramNamedParameter4fvNV
+ glProgramParameters4dvNV
+ glProgramParameters4fvNV
+ glProgramParameter4dNV
+ glProgramParameter4dvNV
+ glProgramParameter4fNV
+ glProgramParameter4fvNV
+ glProgramStringARB
+ glPushAttrib
+ glPushClientAttrib
+ glPushMatrix
+ glPushName
+ glRasterPos2d
+ glRasterPos2dv
+ glRasterPos2f
+ glRasterPos2fv
+ glRasterPos2i
+ glRasterPos2iv
+ glRasterPos2s
+ glRasterPos2sv
+ glRasterPos3d
+ glRasterPos3dv
+ glRasterPos3f
+ glRasterPos3fv
+ glRasterPos3i
+ glRasterPos3iv
+ glRasterPos3s
+ glRasterPos3sv
+ glRasterPos4d
+ glRasterPos4dv
+ glRasterPos4f
+ glRasterPos4fv
+ glRasterPos4i
+ glRasterPos4iv
+ glRasterPos4s
+ glRasterPos4sv
+ glReadBuffer
+ glReadInstrumentsSGIX
+ glReadPixels
+ glRectd
+ glRectdv
+ glRectf
+ glRectfv
+ glRecti
+ glRectiv
+ glRects
+ glRectsv
+ glReferencePlaneSGIX
+ glRenderMode
+ glRequestResidentProgramsNV
+ glResetHistogram
+ glResetHistogramEXT
+ glResetMinmax
+ glResetMinmaxEXT
+ glResizeBuffersMESA
+ glRotated
+ glRotatef
+ glSampleCoverage
+ glSampleCoverageARB
+ glSampleMaskEXT
+ glSampleMaskSGIS
+ glSamplePatternEXT
+ glSamplePatternSGIS
+ glScaled
+ glScalef
+ glScissor
+ glSecondaryColorPointer
+ glSecondaryColorPointerEXT
+ glSecondaryColor3b
+ glSecondaryColor3bEXT
+ glSecondaryColor3bv
+ glSecondaryColor3bvEXT
+ glSecondaryColor3d
+ glSecondaryColor3dEXT
+ glSecondaryColor3dv
+ glSecondaryColor3dvEXT
+ glSecondaryColor3f
+ glSecondaryColor3fEXT
+ glSecondaryColor3fv
+ glSecondaryColor3fvEXT
+ glSecondaryColor3i
+ glSecondaryColor3iEXT
+ glSecondaryColor3iv
+ glSecondaryColor3ivEXT
+ glSecondaryColor3s
+ glSecondaryColor3sEXT
+ glSecondaryColor3sv
+ glSecondaryColor3svEXT
+ glSecondaryColor3ub
+ glSecondaryColor3ubEXT
+ glSecondaryColor3ubv
+ glSecondaryColor3ubvEXT
+ glSecondaryColor3ui
+ glSecondaryColor3uiEXT
+ glSecondaryColor3uiv
+ glSecondaryColor3uivEXT
+ glSecondaryColor3us
+ glSecondaryColor3usEXT
+ glSecondaryColor3usv
+ glSecondaryColor3usvEXT
+ glSelectBuffer
+ glSeparableFilter2D
+ glSeparableFilter2DEXT
+ glSetFenceNV
+ glShadeModel
+ glSharpenTexFuncSGIS
+ glSpriteParameterfSGIX
+ glSpriteParameterfvSGIX
+ glSpriteParameteriSGIX
+ glSpriteParameterivSGIX
+ glStartInstrumentsSGIX
+ glStencilFunc
+ glStencilMask
+ glStencilOp
+ glStopInstrumentsSGIX
+ glTagSampleBufferSGIX
+ glTbufferMask3DFX
+ glTestFenceNV
+ glTexCoordPointer
+ glTexCoordPointerEXT
+ glTexCoord1d
+ glTexCoord1dv
+ glTexCoord1f
+ glTexCoord1fv
+ glTexCoord1i
+ glTexCoord1iv
+ glTexCoord1s
+ glTexCoord1sv
+ glTexCoord2d
+ glTexCoord2dv
+ glTexCoord2f
+ glTexCoord2fv
+ glTexCoord2i
+ glTexCoord2iv
+ glTexCoord2s
+ glTexCoord2sv
+ glTexCoord3d
+ glTexCoord3dv
+ glTexCoord3f
+ glTexCoord3fv
+ glTexCoord3i
+ glTexCoord3iv
+ glTexCoord3s
+ glTexCoord3sv
+ glTexCoord4d
+ glTexCoord4dv
+ glTexCoord4f
+ glTexCoord4fv
+ glTexCoord4i
+ glTexCoord4iv
+ glTexCoord4s
+ glTexCoord4sv
+ glTexEnvf
+ glTexEnvfv
+ glTexEnvi
+ glTexEnviv
+ glTexFilterFuncSGIS
+ glTexGend
+ glTexGendv
+ glTexGenf
+ glTexGenfv
+ glTexGeni
+ glTexGeniv
+ glTexImage1D
+ glTexImage2D
+ glTexImage3D
+ glTexImage3DEXT
+ glTexImage4DSGIS
+ glTexParameterf
+ glTexParameterfv
+ glTexParameteri
+ glTexParameteriv
+ glTexSubImage1D
+ glTexSubImage1DEXT
+ glTexSubImage2D
+ glTexSubImage2DEXT
+ glTexSubImage3D
+ glTexSubImage3DEXT
+ glTexSubImage4DSGIS
+ glTrackMatrixNV
+ glTranslated
+ glTranslatef
+ glUnlockArraysEXT
+ glUnmapBufferARB
+ glVertexArrayRangeNV
+ glVertexAttribPointerARB
+ glVertexAttribPointerNV
+ glVertexAttribs1dvNV
+ glVertexAttribs1fvNV
+ glVertexAttribs1svNV
+ glVertexAttribs2dvNV
+ glVertexAttribs2fvNV
+ glVertexAttribs2svNV
+ glVertexAttribs3dvNV
+ glVertexAttribs3fvNV
+ glVertexAttribs3svNV
+ glVertexAttribs4dvNV
+ glVertexAttribs4fvNV
+ glVertexAttribs4svNV
+ glVertexAttribs4ubvNV
+ glVertexAttrib1dARB
+ glVertexAttrib1dNV
+ glVertexAttrib1dvARB
+ glVertexAttrib1dvNV
+ glVertexAttrib1fARB
+ glVertexAttrib1fNV
+ glVertexAttrib1fvARB
+ glVertexAttrib1fvNV
+ glVertexAttrib1sARB
+ glVertexAttrib1sNV
+ glVertexAttrib1svARB
+ glVertexAttrib1svNV
+ glVertexAttrib2dARB
+ glVertexAttrib2dNV
+ glVertexAttrib2dvARB
+ glVertexAttrib2dvNV
+ glVertexAttrib2fARB
+ glVertexAttrib2fNV
+ glVertexAttrib2fvARB
+ glVertexAttrib2fvNV
+ glVertexAttrib2sARB
+ glVertexAttrib2sNV
+ glVertexAttrib2svARB
+ glVertexAttrib2svNV
+ glVertexAttrib3dARB
+ glVertexAttrib3dNV
+ glVertexAttrib3dvARB
+ glVertexAttrib3dvNV
+ glVertexAttrib3fARB
+ glVertexAttrib3fNV
+ glVertexAttrib3fvARB
+ glVertexAttrib3fvNV
+ glVertexAttrib3sARB
+ glVertexAttrib3sNV
+ glVertexAttrib3svARB
+ glVertexAttrib3svNV
+ glVertexAttrib4bvARB
+ glVertexAttrib4dARB
+ glVertexAttrib4dNV
+ glVertexAttrib4dvARB
+ glVertexAttrib4dvNV
+ glVertexAttrib4fARB
+ glVertexAttrib4fNV
+ glVertexAttrib4fvARB
+ glVertexAttrib4fvNV
+ glVertexAttrib4ivARB
+ glVertexAttrib4NbvARB
+ glVertexAttrib4NivARB
+ glVertexAttrib4NsvARB
+ glVertexAttrib4NubARB
+ glVertexAttrib4NubvARB
+ glVertexAttrib4NuivARB
+ glVertexAttrib4NusvARB
+ glVertexAttrib4sARB
+ glVertexAttrib4sNV
+ glVertexAttrib4svARB
+ glVertexAttrib4svNV
+ glVertexAttrib4ubNV
+ glVertexAttrib4ubvARB
+ glVertexAttrib4ubvNV
+ glVertexAttrib4uivARB
+ glVertexAttrib4usvARB
+ glVertexPointer
+ glVertexPointerEXT
+ glVertexWeightfEXT
+ glVertexWeightfvEXT
+ glVertexWeightPointerEXT
+ glVertex2d
+ glVertex2dv
+ glVertex2f
+ glVertex2fv
+ glVertex2i
+ glVertex2iv
+ glVertex2s
+ glVertex2sv
+ glVertex3d
+ glVertex3dv
+ glVertex3f
+ glVertex3fv
+ glVertex3i
+ glVertex3iv
+ glVertex3s
+ glVertex3sv
+ glVertex4d
+ glVertex4dv
+ glVertex4f
+ glVertex4fv
+ glVertex4i
+ glVertex4iv
+ glVertex4s
+ glVertex4sv
+ glViewport
+ glWindowPos2d
+ glWindowPos2dARB
+ glWindowPos2dMESA
+ glWindowPos2dv
+ glWindowPos2dvARB
+ glWindowPos2dvMESA
+ glWindowPos2f
+ glWindowPos2fARB
+ glWindowPos2fMESA
+ glWindowPos2fv
+ glWindowPos2fvARB
+ glWindowPos2fvMESA
+ glWindowPos2i
+ glWindowPos2iARB
+ glWindowPos2iMESA
+ glWindowPos2iv
+ glWindowPos2ivARB
+ glWindowPos2ivMESA
+ glWindowPos2s
+ glWindowPos2sARB
+ glWindowPos2sMESA
+ glWindowPos2sv
+ glWindowPos2svARB
+ glWindowPos2svMESA
+ glWindowPos3d
+ glWindowPos3dARB
+ glWindowPos3dMESA
+ glWindowPos3dv
+ glWindowPos3dvARB
+ glWindowPos3dvMESA
+ glWindowPos3f
+ glWindowPos3fARB
+ glWindowPos3fMESA
+ glWindowPos3fv
+ glWindowPos3fvARB
+ glWindowPos3fvMESA
+ glWindowPos3i
+ glWindowPos3iARB
+ glWindowPos3iMESA
+ glWindowPos3iv
+ glWindowPos3ivARB
+ glWindowPos3ivMESA
+ glWindowPos3s
+ glWindowPos3sARB
+ glWindowPos3sMESA
+ glWindowPos3sv
+ glWindowPos3svARB
+ glWindowPos3svMESA
+ glWindowPos4dMESA
+ glWindowPos4dvMESA
+ glWindowPos4fMESA
+ glWindowPos4fvMESA
+ glWindowPos4iMESA
+ glWindowPos4ivMESA
+ glWindowPos4sMESA
+ glWindowPos4svMESA
+ fxCloseHardware
+;fxGetScreenGeometry
+ fxMesaCreateBestContext
+ fxMesaCreateContext
+ fxMesaDestroyContext
+ fxMesaGetCurrentContext
+ fxMesaMakeCurrent
+ fxMesaSelectCurrentBoard
+;fxMesaSetNearFar
+ fxMesaSwapBuffers
+ fxMesaUpdateScreenSize
+ wglChoosePixelFormat
+ wglCopyContext
+ wglCreateContext
+ wglCreateLayerContext
+ wglDeleteContext
+ wglDescribeLayerPlane
+ wglDescribePixelFormat
+ wglGetCurrentContext
+ wglGetCurrentDC
+ wglGetDefaultProcAddress
+ wglGetLayerPaletteEntries
+ wglGetPixelFormat
+ wglGetProcAddress
+ wglMakeCurrent
+ wglRealizeLayerPalette
+ wglSetLayerPaletteEntries
+ wglSetPixelFormat
+ wglShareLists
+ wglSwapBuffers
+ wglSwapLayerBuffers
+ wglUseFontBitmapsA
+ wglUseFontBitmapsW
+ wglUseFontOutlinesA
+ wglUseFontOutlinesW
+ ChoosePixelFormat
+ DescribePixelFormat
+ GetPixelFormat
+ SetPixelFormat
+ SwapBuffers
diff --git a/reactos/lib/mesa32/src/drivers/glide/fxsetup.c b/reactos/lib/mesa32/src/drivers/glide/fxsetup.c
new file mode 100644
index 00000000000..17a4129eb6f
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/glide/fxsetup.c
@@ -0,0 +1,2179 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.0
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/* Authors:
+ *    David Bucciarelli
+ *    Brian Paul
+ *    Daryll Strauss
+ *    Keith Whitwell
+ *    Daniel Borca
+ *    Hiroshi Morii
+ */
+
+/* fxsetup.c - 3Dfx VooDoo rendering mode setup functions */
+
+
+#ifdef HAVE_CONFIG_H
+#include "conf.h"
+#endif
+
+#if defined(FX)
+
+#include "fxdrv.h"
+#include "enums.h"
+#include "tnl/t_context.h"
+
+static void
+fxTexValidate(GLcontext * ctx, struct gl_texture_object *tObj)
+{
+   tfxTexInfo *ti = fxTMGetTexInfo(tObj);
+   GLint minl, maxl;
+
+   if (ti->validated) {
+      if (TDFX_DEBUG & VERBOSE_DRIVER) {
+	 fprintf(stderr, "fxTexValidate(NOP)\n");
+      }
+      return;
+   }
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "fxTexValidate(%p (%d))\n", (void *)tObj, tObj->Name);
+   }
+
+   ti->tObj = tObj;
+   minl = ti->minLevel = tObj->BaseLevel;
+   maxl = ti->maxLevel = MIN2(tObj->MaxLevel, tObj->Image[0]->MaxLog2);
+
+#if 1||FX_RESCALE_BIG_TEXURES
+{
+   extern void _mesa_rescale_teximage2d( GLuint bytesPerPixel,
+                                         GLuint dstRowStride,
+                                         GLint srcWidth, GLint srcHeight,
+                                         GLint dstWidth, GLint dstHeight,
+                                         const GLvoid *srcImage, GLvoid *dstImage );
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   if (maxl - minl > fxMesa->textureMaxLod) {
+      /* [dBorca]
+       * Ooooooook! Here's a(nother) long story.
+       * We get here because we need to handle a texture larger
+       * than hardware can support. Two cases:
+       * 1) we have mipmaps. Then we just push up to the first supported
+       *    LOD. A possible drawback is that Mesa will ignore the skipped
+       *    LODs on further texture handling.
+       *    Will this interfere with GL_TEXTURE_[MIN|BASE]_LEVEL? How?
+       * 2) we don't have mipmaps. We need to rescale texture; two ways:
+       *    a) create a new LOD and push up ti->minLevel and tObj->BaseLevel
+       *       but this means we need to rescale on both axes, which
+       *       yield unnecessary ugly texture. Also, same issues as 1)
+       *    b) rescale the biggest LOD in place and go two ways:
+       *       - update texImage->Width and texImage->Height, then
+       *         decrease maxLevel, so we won't rescale again on the
+       *         next validation. Changing texImage-> parameters is
+       *         not quite legal here (see convolution), but...
+       *       - leaving texImage-> parameters alone, while rescaling
+       *         texture and decreasing maxLevel makes Mesa puke. Also
+       *         this approach requires that mml->[wh]Scale go below 1,
+       *         otherwise bad ju-ju will be in our future (see fetch_texel)
+       *       Will this interfere with GL_TEXTURE_MAX_LEVEL? How?
+       *       The above approach is somehow dumb! we might have rescaled
+       *       once in TexImage2D to accomodate aspect ratio, and now we
+       *       are rescaling again. The thing is, in TexImage2D we don't
+       *       know whether we'll hit 1) or 2) by the time of validation.
+       * NB: we could handle mml->[wh]Scale nicely, using (biased) shifts.
+       *
+       * Which brings me to another issue. How can we handle NPOT textures?
+       * - rescaling NPOT to the next bigger POT (mml->[wh]Scale can't shift)
+       * - upping the max LOD to the next power-of-two, in fxTexGetInfo; then
+       *   choosing non-power-of-two values for ti->[st]Scale... Anyhow, we
+       *   still need to align mipmaps correctly in texture memory!
+       */
+      if ((tObj->MinFilter == GL_NEAREST) || (tObj->MinFilter == GL_LINEAR)) {
+         /* no mipmaps! need to rescale */
+         struct gl_texture_image *texImage = tObj->Image[minl];
+         tfxMipMapLevel *mml = FX_MIPMAP_DATA(texImage);
+         GLint texelBytes = texImage->TexFormat->TexelBytes;
+         GLvoid *texImage_Data = texImage->Data;
+         GLint _w = MIN2(mml->width, 1 << fxMesa->textureMaxLod);
+         GLint _h = MIN2(mml->height, 1 << fxMesa->textureMaxLod);
+         if (TDFX_DEBUG & VERBOSE_TEXTURE) {
+            fprintf(stderr, "fxTexValidate: rescaling %d x %d -> %d x %d\n",
+                            mml->width, mml->height,
+                            _w, _h);
+         }
+         fxTexGetInfo(_w, _h, NULL, NULL, NULL, NULL,
+                      &(mml->wScale), &(mml->hScale));
+         texImage->Width = _w / mml->wScale;
+         texImage->Height = _h / mml->hScale;
+         texImage->Data = MESA_PBUFFER_ALLOC(_w * _h * texelBytes);
+         _mesa_rescale_teximage2d(texelBytes,
+                                  _w * texelBytes, /* dst stride */
+                                  mml->width, mml->height, /* src */
+                                  _w, _h, /* dst */
+                                  texImage_Data /*src*/, texImage->Data /*dst*/ );
+         MESA_PBUFFER_FREE(texImage_Data);
+         mml->width = _w;
+         mml->height = _h;
+         maxl = ti->maxLevel = tObj->Image[0]->MaxLog2 = minl + fxMesa->textureMaxLod;
+      } else {
+         /* skip a certain number of LODs */
+         minl += maxl - fxMesa->textureMaxLod;
+         if (TDFX_DEBUG & VERBOSE_TEXTURE) {
+            fprintf(stderr, "fxTexValidate: skipping %d LODs\n", minl - ti->minLevel);
+         }
+         ti->minLevel = tObj->BaseLevel = minl;
+      }
+   }
+}
+#endif
+
+   fxTexGetInfo(tObj->Image[minl]->Width, tObj->Image[minl]->Height,
+		&(FX_largeLodLog2(ti->info)), &(FX_aspectRatioLog2(ti->info)),
+		&(ti->sScale), &(ti->tScale),
+		NULL, NULL);
+
+   if ((tObj->MinFilter != GL_NEAREST) && (tObj->MinFilter != GL_LINEAR))
+      fxTexGetInfo(tObj->Image[maxl]->Width, tObj->Image[maxl]->Height,
+		   &(FX_smallLodLog2(ti->info)), NULL,
+		   NULL, NULL, NULL, NULL);
+   else
+      FX_smallLodLog2(ti->info) = FX_largeLodLog2(ti->info);
+
+   ti->baseLevelInternalFormat = tObj->Image[minl]->Format;
+
+   switch (tObj->WrapS) {
+   case GL_MIRRORED_REPEAT:
+      ti->sClamp = GR_TEXTURECLAMP_MIRROR_EXT;
+      break;
+   case GL_CLAMP_TO_EDGE: /* CLAMP discarding border */
+   case GL_CLAMP:
+      ti->sClamp = GR_TEXTURECLAMP_CLAMP;
+      break;
+   case GL_REPEAT:
+      ti->sClamp = GR_TEXTURECLAMP_WRAP;
+      break;
+   default:
+      ;				/* silence compiler warning */
+   }
+   switch (tObj->WrapT) {
+   case GL_MIRRORED_REPEAT:
+      ti->tClamp = GR_TEXTURECLAMP_MIRROR_EXT;
+      break;
+   case GL_CLAMP_TO_EDGE: /* CLAMP discarding border */
+   case GL_CLAMP:
+      ti->tClamp = GR_TEXTURECLAMP_CLAMP;
+      break;
+   case GL_REPEAT:
+      ti->tClamp = GR_TEXTURECLAMP_WRAP;
+      break;
+   default:
+      ;				/* silence compiler warning */
+   }
+
+   ti->validated = GL_TRUE;
+
+   ti->info.data = NULL;
+}
+
+static void
+fxPrintUnitsMode(const char *msg, GLuint mode)
+{
+   fprintf(stderr,
+	   "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
+	   msg,
+	   mode,
+	   (mode & FX_UM_E0_REPLACE) ? "E0_REPLACE, " : "",
+	   (mode & FX_UM_E0_MODULATE) ? "E0_MODULATE, " : "",
+	   (mode & FX_UM_E0_DECAL) ? "E0_DECAL, " : "",
+	   (mode & FX_UM_E0_BLEND) ? "E0_BLEND, " : "",
+	   (mode & FX_UM_E1_REPLACE) ? "E1_REPLACE, " : "",
+	   (mode & FX_UM_E1_MODULATE) ? "E1_MODULATE, " : "",
+	   (mode & FX_UM_E1_DECAL) ? "E1_DECAL, " : "",
+	   (mode & FX_UM_E1_BLEND) ? "E1_BLEND, " : "",
+	   (mode & FX_UM_E0_ALPHA) ? "E0_ALPHA, " : "",
+	   (mode & FX_UM_E0_LUMINANCE) ? "E0_LUMINANCE, " : "",
+	   (mode & FX_UM_E0_LUMINANCE_ALPHA) ? "E0_LUMINANCE_ALPHA, " : "",
+	   (mode & FX_UM_E0_INTENSITY) ? "E0_INTENSITY, " : "",
+	   (mode & FX_UM_E0_RGB) ? "E0_RGB, " : "",
+	   (mode & FX_UM_E0_RGBA) ? "E0_RGBA, " : "",
+	   (mode & FX_UM_E1_ALPHA) ? "E1_ALPHA, " : "",
+	   (mode & FX_UM_E1_LUMINANCE) ? "E1_LUMINANCE, " : "",
+	   (mode & FX_UM_E1_LUMINANCE_ALPHA) ? "E1_LUMINANCE_ALPHA, " : "",
+	   (mode & FX_UM_E1_INTENSITY) ? "E1_INTENSITY, " : "",
+	   (mode & FX_UM_E1_RGB) ? "E1_RGB, " : "",
+	   (mode & FX_UM_E1_RGBA) ? "E1_RGBA, " : "",
+	   (mode & FX_UM_COLOR_ITERATED) ? "COLOR_ITERATED, " : "",
+	   (mode & FX_UM_COLOR_CONSTANT) ? "COLOR_CONSTANT, " : "",
+	   (mode & FX_UM_ALPHA_ITERATED) ? "ALPHA_ITERATED, " : "",
+	   (mode & FX_UM_ALPHA_CONSTANT) ? "ALPHA_CONSTANT, " : "");
+}
+
+static GLuint
+fxGetTexSetConfiguration(GLcontext * ctx,
+			 struct gl_texture_object *tObj0,
+			 struct gl_texture_object *tObj1)
+{
+   GLuint unitsmode = 0;
+   GLuint envmode = 0;
+   GLuint ifmt = 0;
+
+   if ((ctx->Light.ShadeModel == GL_SMOOTH) || 1 ||
+       (ctx->Point.SmoothFlag) ||
+       (ctx->Line.SmoothFlag) ||
+       (ctx->Polygon.SmoothFlag)) unitsmode |= FX_UM_ALPHA_ITERATED;
+   else
+      unitsmode |= FX_UM_ALPHA_CONSTANT;
+
+   if (ctx->Light.ShadeModel == GL_SMOOTH || 1)
+      unitsmode |= FX_UM_COLOR_ITERATED;
+   else
+      unitsmode |= FX_UM_COLOR_CONSTANT;
+
+
+
+   /* 
+      OpenGL Feeds Texture 0 into Texture 1
+      Glide Feeds Texture 1 into Texture 0
+    */
+   if (tObj0) {
+      tfxTexInfo *ti0 = fxTMGetTexInfo(tObj0);
+
+      switch (ti0->baseLevelInternalFormat) {
+      case GL_ALPHA:
+	 ifmt |= FX_UM_E0_ALPHA;
+	 break;
+      case GL_LUMINANCE:
+	 ifmt |= FX_UM_E0_LUMINANCE;
+	 break;
+      case GL_LUMINANCE_ALPHA:
+	 ifmt |= FX_UM_E0_LUMINANCE_ALPHA;
+	 break;
+      case GL_INTENSITY:
+	 ifmt |= FX_UM_E0_INTENSITY;
+	 break;
+      case GL_RGB:
+	 ifmt |= FX_UM_E0_RGB;
+	 break;
+      case GL_RGBA:
+	 ifmt |= FX_UM_E0_RGBA;
+	 break;
+      }
+
+      switch (ctx->Texture.Unit[0].EnvMode) {
+      case GL_DECAL:
+	 envmode |= FX_UM_E0_DECAL;
+	 break;
+      case GL_MODULATE:
+	 envmode |= FX_UM_E0_MODULATE;
+	 break;
+      case GL_REPLACE:
+	 envmode |= FX_UM_E0_REPLACE;
+	 break;
+      case GL_BLEND:
+	 envmode |= FX_UM_E0_BLEND;
+	 break;
+      case GL_ADD:
+	 envmode |= FX_UM_E0_ADD;
+	 break;
+      default:
+	 /* do nothing */
+	 break;
+      }
+   }
+
+   if (tObj1) {
+      tfxTexInfo *ti1 = fxTMGetTexInfo(tObj1);
+
+      switch (ti1->baseLevelInternalFormat) {
+      case GL_ALPHA:
+	 ifmt |= FX_UM_E1_ALPHA;
+	 break;
+      case GL_LUMINANCE:
+	 ifmt |= FX_UM_E1_LUMINANCE;
+	 break;
+      case GL_LUMINANCE_ALPHA:
+	 ifmt |= FX_UM_E1_LUMINANCE_ALPHA;
+	 break;
+      case GL_INTENSITY:
+	 ifmt |= FX_UM_E1_INTENSITY;
+	 break;
+      case GL_RGB:
+	 ifmt |= FX_UM_E1_RGB;
+	 break;
+      case GL_RGBA:
+	 ifmt |= FX_UM_E1_RGBA;
+	 break;
+      default:
+	 /* do nothing */
+	 break;
+      }
+
+      switch (ctx->Texture.Unit[1].EnvMode) {
+      case GL_DECAL:
+	 envmode |= FX_UM_E1_DECAL;
+	 break;
+      case GL_MODULATE:
+	 envmode |= FX_UM_E1_MODULATE;
+	 break;
+      case GL_REPLACE:
+	 envmode |= FX_UM_E1_REPLACE;
+	 break;
+      case GL_BLEND:
+	 envmode |= FX_UM_E1_BLEND;
+	 break;
+      case GL_ADD:
+	 envmode |= FX_UM_E1_ADD;
+	 break;
+      default:
+	 /* do nothing */
+	 break;
+      }
+   }
+
+   unitsmode |= (ifmt | envmode);
+
+   if (TDFX_DEBUG & (VERBOSE_DRIVER | VERBOSE_TEXTURE))
+      fxPrintUnitsMode("fxGetTexSetConfiguration", unitsmode);
+
+   return unitsmode;
+}
+
+/************************************************************************/
+/************************* Rendering Mode SetUp *************************/
+/************************************************************************/
+
+/************************* Single Texture Set ***************************/
+
+static void
+fxSetupSingleTMU_NoLock(fxMesaContext fxMesa, struct gl_texture_object *tObj)
+{
+   tfxTexInfo *ti = fxTMGetTexInfo(tObj);
+   int tmu;
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "fxSetupSingleTMU_NoLock(%p (%d))\n", (void *)tObj, tObj->Name);
+   }
+
+#if 1 /* [dBorca] Good... bad... I'm the guy with the gun! */
+   ti->lastTimeUsed = fxMesa->texBindNumber;
+#endif
+
+   /* Make sure we're not loaded incorrectly */
+   if (ti->isInTM) {
+      if (ti->LODblend) {
+	 if (ti->whichTMU != FX_TMU_SPLIT)
+	    fxTMMoveOutTM(fxMesa, tObj);
+      }
+      else {
+	 if (ti->whichTMU == FX_TMU_SPLIT)
+	    fxTMMoveOutTM(fxMesa, tObj);
+      }
+   }
+
+   /* Make sure we're loaded correctly */
+   if (!ti->isInTM) {
+      if (ti->LODblend)
+	 fxTMMoveInTM_NoLock(fxMesa, tObj, FX_TMU_SPLIT);
+      else {
+	 if (fxMesa->haveTwoTMUs) {
+            if (fxTMCheckStartAddr(fxMesa, FX_TMU0, ti)) {
+	       fxTMMoveInTM_NoLock(fxMesa, tObj, FX_TMU0);
+	    }
+	    else {
+	       fxTMMoveInTM_NoLock(fxMesa, tObj, FX_TMU1);
+	    }
+	 }
+	 else
+	    fxTMMoveInTM_NoLock(fxMesa, tObj, FX_TMU0);
+      }
+   }
+
+   if (ti->LODblend && ti->whichTMU == FX_TMU_SPLIT) {
+      /* broadcast */
+      if ((ti->info.format == GR_TEXFMT_P_8)
+	  && (!fxMesa->haveGlobalPaletteTexture)) {
+	 if (TDFX_DEBUG & VERBOSE_DRIVER) {
+	    fprintf(stderr, "fxSetupSingleTMU_NoLock: uploading texture palette\n");
+	 }
+	 grTexDownloadTable(ti->paltype, &(ti->palette));
+      }
+#if FX_TC_NCC
+      if ((ti->info.format == GR_TEXFMT_AYIQ_8422) ||
+          (ti->info.format == GR_TEXFMT_YIQ_422)) {
+	 if (TDFX_DEBUG & VERBOSE_DRIVER) {
+	    fprintf(stderr, "fxSetupSingleTMU_NoLock: uploading NCC table\n");
+	 }
+	 grTexDownloadTable(GR_TEXTABLE_NCC0, &(ti->palette));
+      }
+#endif
+
+      grTexClampMode(GR_TMU0, ti->sClamp, ti->tClamp);
+      grTexClampMode(GR_TMU1, ti->sClamp, ti->tClamp);
+      grTexFilterMode(GR_TMU0, ti->minFilt, ti->maxFilt);
+      grTexFilterMode(GR_TMU1, ti->minFilt, ti->maxFilt);
+      grTexMipMapMode(GR_TMU0, ti->mmMode, ti->LODblend);
+      grTexMipMapMode(GR_TMU1, ti->mmMode, ti->LODblend);
+
+      grTexSource(GR_TMU0, ti->tm[FX_TMU0]->startAddr,
+			    GR_MIPMAPLEVELMASK_ODD, &(ti->info));
+      grTexSource(GR_TMU1, ti->tm[FX_TMU1]->startAddr,
+			    GR_MIPMAPLEVELMASK_EVEN, &(ti->info));
+   }
+   else {
+      if (ti->whichTMU == FX_TMU_BOTH)
+	 tmu = FX_TMU0;
+      else
+	 tmu = ti->whichTMU;
+
+      /* pointcast */
+      if ((ti->info.format == GR_TEXFMT_P_8)
+	  && (!fxMesa->haveGlobalPaletteTexture)) {
+	 if (TDFX_DEBUG & VERBOSE_DRIVER) {
+	    fprintf(stderr, "fxSetupSingleTMU_NoLock: uploading texture palette\n");
+	 }
+	 fxMesa->Glide.grTexDownloadTableExt(tmu, ti->paltype, &(ti->palette));
+      }
+#if FX_TC_NCC
+      if ((ti->info.format == GR_TEXFMT_AYIQ_8422) ||
+          (ti->info.format == GR_TEXFMT_YIQ_422)) {
+	 if (TDFX_DEBUG & VERBOSE_DRIVER) {
+	    fprintf(stderr, "fxSetupSingleTMU_NoLock: uploading NCC table\n");
+	 }
+	 fxMesa->Glide.grTexDownloadTableExt(tmu, GR_TEXTABLE_NCC0, &(ti->palette));
+      }
+#endif
+
+      /* KW: The alternative is to do the download to the other tmu.  If
+       * we get to this point, I think it means we are thrashing the
+       * texture memory, so perhaps it's not a good idea.  
+       */
+      if (ti->LODblend && (TDFX_DEBUG & VERBOSE_DRIVER)) {
+	 fprintf(stderr, "fxSetupSingleTMU_NoLock: not blending texture - only one tmu\n");
+      }
+
+      grTexClampMode(tmu, ti->sClamp, ti->tClamp);
+      grTexFilterMode(tmu, ti->minFilt, ti->maxFilt);
+      grTexMipMapMode(tmu, ti->mmMode, FXFALSE);
+
+      grTexSource(tmu, ti->tm[tmu]->startAddr, GR_MIPMAPLEVELMASK_BOTH, &(ti->info));
+   }
+}
+
+static void
+fxSelectSingleTMUSrc_NoLock(fxMesaContext fxMesa, GLint tmu, FxBool LODblend)
+{
+   struct tdfx_texcombine tex0, tex1;
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "fxSelectSingleTMUSrc_NoLock(%d, %d)\n", tmu, LODblend);
+   }
+
+   tex0.InvertRGB     = FXFALSE;
+   tex0.InvertAlpha   = FXFALSE;
+   tex1.InvertRGB     = FXFALSE;
+   tex1.InvertAlpha   = FXFALSE;
+
+   if (LODblend) {
+      tex0.FunctionRGB   = GR_COMBINE_FUNCTION_BLEND;
+      tex0.FactorRGB     = GR_COMBINE_FACTOR_ONE_MINUS_LOD_FRACTION;
+      tex0.FunctionAlpha = GR_COMBINE_FUNCTION_BLEND;
+      tex0.FactorAlpha   = GR_COMBINE_FACTOR_ONE_MINUS_LOD_FRACTION;
+
+      tex1.FunctionRGB   = GR_COMBINE_FUNCTION_LOCAL;
+      tex1.FactorRGB     = GR_COMBINE_FACTOR_NONE;
+      tex1.FunctionAlpha = GR_COMBINE_FUNCTION_LOCAL;
+      tex1.FactorAlpha   = GR_COMBINE_FACTOR_NONE;
+
+      fxMesa->tmuSrc = FX_TMU_SPLIT;
+   }
+   else {
+      if (tmu != FX_TMU1) {
+         tex0.FunctionRGB   = GR_COMBINE_FUNCTION_LOCAL;
+         tex0.FactorRGB     = GR_COMBINE_FACTOR_NONE;
+         tex0.FunctionAlpha = GR_COMBINE_FUNCTION_LOCAL;
+         tex0.FactorAlpha   = GR_COMBINE_FACTOR_NONE;
+
+         tex1.FunctionRGB   = GR_COMBINE_FUNCTION_ZERO;
+         tex1.FactorRGB     = GR_COMBINE_FACTOR_NONE;
+         tex1.FunctionAlpha = GR_COMBINE_FUNCTION_ZERO;
+         tex1.FactorAlpha   = GR_COMBINE_FACTOR_NONE;
+
+	 fxMesa->tmuSrc = FX_TMU0;
+      }
+      else {
+         tex1.FunctionRGB   = GR_COMBINE_FUNCTION_LOCAL;
+         tex1.FactorRGB     = GR_COMBINE_FACTOR_NONE;
+         tex1.FunctionAlpha = GR_COMBINE_FUNCTION_LOCAL;
+         tex1.FactorAlpha   = GR_COMBINE_FACTOR_NONE;
+
+	 /* [dBorca] Hack alert:
+          * don't use GR_COMBINE_FUNCTION_SCALE_OTHER
+          * such that Glide recognizes TMU0 in passthrough mode
+          */
+         tex0.FunctionRGB   = GR_COMBINE_FUNCTION_BLEND;
+         tex0.FactorRGB     = GR_COMBINE_FACTOR_ONE;
+         tex0.FunctionAlpha = GR_COMBINE_FUNCTION_BLEND;
+         tex0.FactorAlpha   = GR_COMBINE_FACTOR_ONE;
+
+	 fxMesa->tmuSrc = FX_TMU1;
+      }
+   }
+
+   grTexCombine(GR_TMU0,
+                tex0.FunctionRGB,
+                tex0.FactorRGB,
+                tex0.FunctionAlpha,
+                tex0.FactorAlpha,
+                tex0.InvertRGB,
+                tex0.InvertAlpha);
+   if (fxMesa->haveTwoTMUs) {
+      grTexCombine(GR_TMU1,
+                   tex1.FunctionRGB,
+                   tex1.FactorRGB,
+                   tex1.FunctionAlpha,
+                   tex1.FactorAlpha,
+                   tex1.InvertRGB,
+                   tex1.InvertAlpha);
+   }
+}
+
+static void
+fxSetupTextureSingleTMU_NoLock(GLcontext * ctx, GLuint textureset)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   struct tdfx_combine alphaComb, colorComb;
+   GrCombineLocal_t localc, locala;
+   GLuint unitsmode;
+   GLint ifmt;
+   tfxTexInfo *ti;
+   struct gl_texture_object *tObj = ctx->Texture.Unit[textureset].Current2D;
+   int tmu;
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "fxSetupTextureSingleTMU_NoLock(%d)\n", textureset);
+   }
+
+   ti = fxTMGetTexInfo(tObj);
+
+   fxTexValidate(ctx, tObj);
+
+   fxSetupSingleTMU_NoLock(fxMesa, tObj);
+
+   if (ti->whichTMU == FX_TMU_BOTH)
+      tmu = FX_TMU0;
+   else
+      tmu = ti->whichTMU;
+   if (fxMesa->tmuSrc != tmu)
+      fxSelectSingleTMUSrc_NoLock(fxMesa, tmu, ti->LODblend);
+
+   if (textureset == 0 || !fxMesa->haveTwoTMUs)
+      unitsmode = fxGetTexSetConfiguration(ctx, tObj, NULL);
+   else
+      unitsmode = fxGetTexSetConfiguration(ctx, NULL, tObj);
+
+/*    if(fxMesa->lastUnitsMode==unitsmode) */
+/*      return; */
+
+   fxMesa->lastUnitsMode = unitsmode;
+
+   fxMesa->stw_hint_state = 0;
+   FX_grHints_NoLock(GR_HINT_STWHINT, 0);
+
+   ifmt = ti->baseLevelInternalFormat;
+
+   if (unitsmode & FX_UM_ALPHA_ITERATED)
+      locala = GR_COMBINE_LOCAL_ITERATED;
+   else
+      locala = GR_COMBINE_LOCAL_CONSTANT;
+
+   if (unitsmode & FX_UM_COLOR_ITERATED)
+      localc = GR_COMBINE_LOCAL_ITERATED;
+   else
+      localc = GR_COMBINE_LOCAL_CONSTANT;
+
+   if (TDFX_DEBUG & (VERBOSE_DRIVER | VERBOSE_TEXTURE))
+      fprintf(stderr, "fxSetupTextureSingleTMU_NoLock: envmode is %s\n",
+	      _mesa_lookup_enum_by_nr(ctx->Texture.Unit[textureset].EnvMode));
+
+   alphaComb.Local    = locala;
+   alphaComb.Invert   = FXFALSE;
+   colorComb.Local    = localc;
+   colorComb.Invert   = FXFALSE;
+
+   switch (ctx->Texture.Unit[textureset].EnvMode) {
+   case GL_DECAL:
+      alphaComb.Function = GR_COMBINE_FUNCTION_LOCAL;
+      alphaComb.Factor   = GR_COMBINE_FACTOR_NONE;
+      alphaComb.Other    = GR_COMBINE_OTHER_NONE;
+
+      colorComb.Function = GR_COMBINE_FUNCTION_BLEND;
+      colorComb.Factor   = GR_COMBINE_FACTOR_TEXTURE_ALPHA;
+      colorComb.Other    = GR_COMBINE_OTHER_TEXTURE;
+      break;
+   case GL_MODULATE:
+      alphaComb.Function = GR_COMBINE_FUNCTION_SCALE_OTHER;
+      alphaComb.Factor   = GR_COMBINE_FACTOR_LOCAL;
+      alphaComb.Other    = GR_COMBINE_OTHER_TEXTURE;
+
+      if (ifmt == GL_ALPHA) {
+         colorComb.Function = GR_COMBINE_FUNCTION_LOCAL;
+         colorComb.Factor   = GR_COMBINE_FACTOR_NONE;
+         colorComb.Other    = GR_COMBINE_OTHER_NONE;
+      } else {
+         colorComb.Function = GR_COMBINE_FUNCTION_SCALE_OTHER;
+         colorComb.Factor   = GR_COMBINE_FACTOR_LOCAL;
+         colorComb.Other    = GR_COMBINE_OTHER_TEXTURE;
+      }
+      break;
+   case GL_BLEND:
+      if (ifmt == GL_LUMINANCE || ifmt == GL_RGB) {
+         /* Av = Af */
+         alphaComb.Function = GR_COMBINE_FUNCTION_LOCAL;
+         alphaComb.Factor   = GR_COMBINE_FACTOR_NONE;
+         alphaComb.Other    = GR_COMBINE_OTHER_NONE;
+      }
+      else if (ifmt == GL_INTENSITY) {
+         /* Av = Af * (1 - It) + Ac * It */
+         alphaComb.Function = GR_COMBINE_FUNCTION_BLEND;
+         alphaComb.Factor   = GR_COMBINE_FACTOR_TEXTURE_ALPHA;
+         alphaComb.Other    = GR_COMBINE_OTHER_CONSTANT;
+      }
+      else {
+         /* Av = Af * At */
+         alphaComb.Function = GR_COMBINE_FUNCTION_SCALE_OTHER;
+         alphaComb.Factor   = GR_COMBINE_FACTOR_LOCAL;
+         alphaComb.Other    = GR_COMBINE_OTHER_TEXTURE;
+      }
+
+      if (ifmt == GL_ALPHA) {
+         colorComb.Function = GR_COMBINE_FUNCTION_LOCAL;
+         colorComb.Factor   = GR_COMBINE_FACTOR_NONE;
+         colorComb.Other    = GR_COMBINE_OTHER_NONE;
+      } else {
+         /* [dBorca] Hack alert:
+          * only Voodoo^2 can GL_BLEND (GR_COMBINE_FACTOR_TEXTURE_RGB)
+          */
+         if (fxMesa->type >= GR_SSTTYPE_Voodoo2) {
+            colorComb.Function = GR_COMBINE_FUNCTION_BLEND;
+            colorComb.Factor   = GR_COMBINE_FACTOR_TEXTURE_RGB;
+            colorComb.Other    = GR_COMBINE_OTHER_CONSTANT;
+         } else {
+            _mesa_problem(NULL, "can't GL_BLEND with SST1");
+            return;
+         }
+      }
+
+      grConstantColorValue(
+         (((GLuint)(ctx->Texture.Unit[textureset].EnvColor[0] * 255.0f))      ) |
+         (((GLuint)(ctx->Texture.Unit[textureset].EnvColor[1] * 255.0f)) <<  8) |
+         (((GLuint)(ctx->Texture.Unit[textureset].EnvColor[2] * 255.0f)) << 16) |
+         (((GLuint)(ctx->Texture.Unit[textureset].EnvColor[3] * 255.0f)) << 24));
+      break;
+   case GL_REPLACE:
+      if ((ifmt == GL_RGB) || (ifmt == GL_LUMINANCE)) {
+         alphaComb.Function = GR_COMBINE_FUNCTION_LOCAL;
+         alphaComb.Factor   = GR_COMBINE_FACTOR_NONE;
+         alphaComb.Other    = GR_COMBINE_OTHER_NONE;
+      } else {
+         alphaComb.Function = GR_COMBINE_FUNCTION_SCALE_OTHER;
+         alphaComb.Factor   = GR_COMBINE_FACTOR_ONE;
+         alphaComb.Other    = GR_COMBINE_OTHER_TEXTURE;
+      }
+
+      if (ifmt == GL_ALPHA) {
+         colorComb.Function = GR_COMBINE_FUNCTION_LOCAL;
+         colorComb.Factor   = GR_COMBINE_FACTOR_NONE;
+         colorComb.Other    = GR_COMBINE_OTHER_NONE;
+      } else {
+         colorComb.Function = GR_COMBINE_FUNCTION_SCALE_OTHER;
+         colorComb.Factor   = GR_COMBINE_FACTOR_ONE;
+         colorComb.Other    = GR_COMBINE_OTHER_TEXTURE;
+      }
+      break;
+   case GL_ADD:
+      if (ifmt == GL_ALPHA ||
+          ifmt == GL_LUMINANCE_ALPHA ||
+          ifmt == GL_RGBA) {
+         /* product of texel and fragment alpha */
+         alphaComb.Function = GR_COMBINE_FUNCTION_SCALE_OTHER;
+         alphaComb.Factor   = GR_COMBINE_FACTOR_LOCAL;
+         alphaComb.Other    = GR_COMBINE_OTHER_TEXTURE;
+      }
+      else if (ifmt == GL_LUMINANCE || ifmt == GL_RGB) {
+         /* fragment alpha is unchanged */
+         alphaComb.Function = GR_COMBINE_FUNCTION_LOCAL;
+         alphaComb.Factor   = GR_COMBINE_FACTOR_NONE;
+         alphaComb.Other    = GR_COMBINE_OTHER_NONE;
+      }
+      else {
+         /* sum of texel and fragment alpha */
+         alphaComb.Function = GR_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL,
+         alphaComb.Factor   = GR_COMBINE_FACTOR_ONE;
+         alphaComb.Other    = GR_COMBINE_OTHER_TEXTURE;
+      }
+
+      if (ifmt == GL_ALPHA) {
+         /* rgb unchanged */
+         colorComb.Function = GR_COMBINE_FUNCTION_LOCAL;
+         colorComb.Factor   = GR_COMBINE_FACTOR_NONE;
+         colorComb.Other    = GR_COMBINE_OTHER_NONE;
+      }
+      else {
+         /* sum of texel and fragment rgb */
+         colorComb.Function = GR_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL,
+         colorComb.Factor   = GR_COMBINE_FACTOR_ONE;
+         colorComb.Other    = GR_COMBINE_OTHER_TEXTURE;
+      }
+      break;
+   default:
+      if (TDFX_DEBUG & VERBOSE_DRIVER) {
+	 fprintf(stderr, "fxSetupTextureSingleTMU_NoLock: %x Texture.EnvMode not yet supported\n",
+		 ctx->Texture.Unit[textureset].EnvMode);
+      }
+      return;
+   }
+
+   grAlphaCombine(alphaComb.Function,
+                  alphaComb.Factor,
+                  alphaComb.Local,
+                  alphaComb.Other,
+                  alphaComb.Invert);
+   grColorCombine(colorComb.Function,
+                  colorComb.Factor,
+                  colorComb.Local,
+                  colorComb.Other,
+                  colorComb.Invert);
+}
+
+#if 00
+static void
+fxSetupTextureSingleTMU(GLcontext * ctx, GLuint textureset)
+{
+   BEGIN_BOARD_LOCK();
+   fxSetupTextureSingleTMU_NoLock(ctx, textureset);
+   END_BOARD_LOCK();
+}
+#endif
+
+
+/************************* Double Texture Set ***************************/
+
+static void
+fxSetupDoubleTMU_NoLock(fxMesaContext fxMesa,
+			struct gl_texture_object *tObj0,
+			struct gl_texture_object *tObj1)
+{
+#define T0_NOT_IN_TMU  0x01
+#define T1_NOT_IN_TMU  0x02
+#define T0_IN_TMU0     0x04
+#define T1_IN_TMU0     0x08
+#define T0_IN_TMU1     0x10
+#define T1_IN_TMU1     0x20
+
+   tfxTexInfo *ti0 = fxTMGetTexInfo(tObj0);
+   tfxTexInfo *ti1 = fxTMGetTexInfo(tObj1);
+   GLuint tstate = 0;
+   int tmu0 = 0, tmu1 = 1;
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "fxSetupDoubleTMU_NoLock(...)\n");
+   }
+
+   /* We shouldn't need to do this. There is something wrong with
+      mutlitexturing when the TMUs are swapped. So, we're forcing
+      them to always be loaded correctly. !!! */
+   if (ti0->whichTMU == FX_TMU1)
+      fxTMMoveOutTM_NoLock(fxMesa, tObj0);
+   if (ti1->whichTMU == FX_TMU0)
+      fxTMMoveOutTM_NoLock(fxMesa, tObj1);
+
+   if (ti0->isInTM) {
+      switch (ti0->whichTMU) {
+      case FX_TMU0:
+	 tstate |= T0_IN_TMU0;
+	 break;
+      case FX_TMU1:
+	 tstate |= T0_IN_TMU1;
+	 break;
+      case FX_TMU_BOTH:
+	 tstate |= T0_IN_TMU0 | T0_IN_TMU1;
+	 break;
+      case FX_TMU_SPLIT:
+	 tstate |= T0_NOT_IN_TMU;
+	 break;
+      }
+   }
+   else
+      tstate |= T0_NOT_IN_TMU;
+
+   if (ti1->isInTM) {
+      switch (ti1->whichTMU) {
+      case FX_TMU0:
+	 tstate |= T1_IN_TMU0;
+	 break;
+      case FX_TMU1:
+	 tstate |= T1_IN_TMU1;
+	 break;
+      case FX_TMU_BOTH:
+	 tstate |= T1_IN_TMU0 | T1_IN_TMU1;
+	 break;
+      case FX_TMU_SPLIT:
+	 tstate |= T1_NOT_IN_TMU;
+	 break;
+      }
+   }
+   else
+      tstate |= T1_NOT_IN_TMU;
+
+   ti0->lastTimeUsed = fxMesa->texBindNumber;
+   ti1->lastTimeUsed = fxMesa->texBindNumber;
+
+   /* Move texture maps into TMUs */
+
+   if (!(((tstate & T0_IN_TMU0) && (tstate & T1_IN_TMU1)) ||
+	 ((tstate & T0_IN_TMU1) && (tstate & T1_IN_TMU0)))) {
+      if (tObj0 == tObj1)
+	 fxTMMoveInTM_NoLock(fxMesa, tObj1, FX_TMU_BOTH);
+      else {
+	 /* Find the minimal way to correct the situation */
+	 if ((tstate & T0_IN_TMU0) || (tstate & T1_IN_TMU1)) {
+	    /* We have one in the standard order, setup the other */
+	    if (tstate & T0_IN_TMU0) {	/* T0 is in TMU0, put T1 in TMU1 */
+	       fxTMMoveInTM_NoLock(fxMesa, tObj1, FX_TMU1);
+	    }
+	    else {
+	       fxTMMoveInTM_NoLock(fxMesa, tObj0, FX_TMU0);
+	    }
+	    /* tmu0 and tmu1 are setup */
+	 }
+	 else if ((tstate & T0_IN_TMU1) || (tstate & T1_IN_TMU0)) {
+	    /* we have one in the reverse order, setup the other */
+	    if (tstate & T1_IN_TMU0) {	/* T1 is in TMU0, put T0 in TMU1 */
+	       fxTMMoveInTM_NoLock(fxMesa, tObj0, FX_TMU1);
+	    }
+	    else {
+	       fxTMMoveInTM_NoLock(fxMesa, tObj1, FX_TMU0);
+	    }
+	    tmu0 = 1;
+	    tmu1 = 0;
+	 }
+	 else {			/* Nothing is loaded */
+	    fxTMMoveInTM_NoLock(fxMesa, tObj0, FX_TMU0);
+	    fxTMMoveInTM_NoLock(fxMesa, tObj1, FX_TMU1);
+	    /* tmu0 and tmu1 are setup */
+	 }
+      }
+   }
+
+   /* [dBorca] Hack alert:
+    * we put these in reverse order, so that if we can't
+    * do _REAL_ pointcast, the TMU0 table gets broadcasted
+    */
+   if (!fxMesa->haveGlobalPaletteTexture) {
+      /* pointcast */
+      if (ti1->info.format == GR_TEXFMT_P_8) {
+	 if (TDFX_DEBUG & VERBOSE_DRIVER) {
+	    fprintf(stderr, "fxSetupDoubleTMU_NoLock: uploading texture palette for TMU1\n");
+	 }
+	 fxMesa->Glide.grTexDownloadTableExt(ti1->whichTMU, ti1->paltype, &(ti1->palette));
+      }
+      if (ti0->info.format == GR_TEXFMT_P_8) {
+	 if (TDFX_DEBUG & VERBOSE_DRIVER) {
+	    fprintf(stderr, "fxSetupDoubleTMU_NoLock: uploading texture palette for TMU0\n");
+	 }
+	 fxMesa->Glide.grTexDownloadTableExt(ti0->whichTMU, ti0->paltype, &(ti0->palette));
+      }
+   }
+#if FX_TC_NCC
+   /* pointcast */
+   if ((ti1->info.format == GR_TEXFMT_AYIQ_8422) ||
+       (ti1->info.format == GR_TEXFMT_YIQ_422)) {
+      if (TDFX_DEBUG & VERBOSE_DRIVER) {
+         fprintf(stderr, "fxSetupDoubleTMU_NoLock: uploading NCC0 table for TMU1\n");
+      }
+      fxMesa->Glide.grTexDownloadTableExt(ti1->whichTMU, GR_TEXTABLE_NCC0, &(ti1->palette));
+   }
+   if ((ti0->info.format == GR_TEXFMT_AYIQ_8422) ||
+       (ti0->info.format == GR_TEXFMT_YIQ_422)) {
+      if (TDFX_DEBUG & VERBOSE_DRIVER) {
+         fprintf(stderr, "fxSetupDoubleTMU_NoLock: uploading NCC0 table for TMU0\n");
+      }
+      fxMesa->Glide.grTexDownloadTableExt(ti0->whichTMU, GR_TEXTABLE_NCC0, &(ti0->palette));
+   }
+#endif
+
+   grTexSource(tmu0, ti0->tm[tmu0]->startAddr,
+			 GR_MIPMAPLEVELMASK_BOTH, &(ti0->info));
+   grTexClampMode(tmu0, ti0->sClamp, ti0->tClamp);
+   grTexFilterMode(tmu0, ti0->minFilt, ti0->maxFilt);
+   grTexMipMapMode(tmu0, ti0->mmMode, FXFALSE);
+
+   grTexSource(tmu1, ti1->tm[tmu1]->startAddr,
+			 GR_MIPMAPLEVELMASK_BOTH, &(ti1->info));
+   grTexClampMode(tmu1, ti1->sClamp, ti1->tClamp);
+   grTexFilterMode(tmu1, ti1->minFilt, ti1->maxFilt);
+   grTexMipMapMode(tmu1, ti1->mmMode, FXFALSE);
+
+#undef T0_NOT_IN_TMU
+#undef T1_NOT_IN_TMU
+#undef T0_IN_TMU0
+#undef T1_IN_TMU0
+#undef T0_IN_TMU1
+#undef T1_IN_TMU1
+}
+
+static void
+fxSetupTextureDoubleTMU_NoLock(GLcontext * ctx)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   struct tdfx_combine alphaComb, colorComb;
+   struct tdfx_texcombine tex0, tex1;
+   GrCombineLocal_t localc, locala;
+   tfxTexInfo *ti0, *ti1;
+   struct gl_texture_object *tObj0 = ctx->Texture.Unit[1].Current2D;
+   struct gl_texture_object *tObj1 = ctx->Texture.Unit[0].Current2D;
+   GLuint envmode, ifmt, unitsmode;
+   int tmu0 = 0, tmu1 = 1;
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "fxSetupTextureDoubleTMU_NoLock(...)\n");
+   }
+
+   ti0 = fxTMGetTexInfo(tObj0);
+   fxTexValidate(ctx, tObj0);
+
+   ti1 = fxTMGetTexInfo(tObj1);
+   fxTexValidate(ctx, tObj1);
+
+   fxSetupDoubleTMU_NoLock(fxMesa, tObj0, tObj1);
+
+   unitsmode = fxGetTexSetConfiguration(ctx, tObj0, tObj1);
+
+/*    if(fxMesa->lastUnitsMode==unitsmode) */
+/*      return; */
+
+   fxMesa->lastUnitsMode = unitsmode;
+
+   fxMesa->stw_hint_state |= GR_STWHINT_ST_DIFF_TMU1;
+   FX_grHints_NoLock(GR_HINT_STWHINT, fxMesa->stw_hint_state);
+
+   envmode = unitsmode & FX_UM_E_ENVMODE;
+   ifmt = unitsmode & FX_UM_E_IFMT;
+
+   if (unitsmode & FX_UM_ALPHA_ITERATED)
+      locala = GR_COMBINE_LOCAL_ITERATED;
+   else
+      locala = GR_COMBINE_LOCAL_CONSTANT;
+
+   if (unitsmode & FX_UM_COLOR_ITERATED)
+      localc = GR_COMBINE_LOCAL_ITERATED;
+   else
+      localc = GR_COMBINE_LOCAL_CONSTANT;
+
+
+   if (TDFX_DEBUG & (VERBOSE_DRIVER | VERBOSE_TEXTURE))
+      fprintf(stderr, "fxSetupTextureDoubleTMU_NoLock: envmode is %s/%s\n",
+	      _mesa_lookup_enum_by_nr(ctx->Texture.Unit[0].EnvMode),
+	      _mesa_lookup_enum_by_nr(ctx->Texture.Unit[1].EnvMode));
+
+
+   if ((ti0->whichTMU == FX_TMU1) || (ti1->whichTMU == FX_TMU0)) {
+      tmu0 = 1;
+      tmu1 = 0;
+   }
+   fxMesa->tmuSrc = FX_TMU_BOTH;
+
+   tex0.InvertRGB     = FXFALSE;
+   tex0.InvertAlpha   = FXFALSE;
+   tex1.InvertRGB     = FXFALSE;
+   tex1.InvertAlpha   = FXFALSE;
+   alphaComb.Local    = locala;
+   alphaComb.Invert   = FXFALSE;
+   colorComb.Local    = localc;
+   colorComb.Invert   = FXFALSE;
+
+   switch (envmode) {
+   case (FX_UM_E0_MODULATE | FX_UM_E1_MODULATE):
+      {
+	 GLboolean isalpha[FX_NUM_TMU];
+
+	 isalpha[tmu0] = (ti0->baseLevelInternalFormat == GL_ALPHA);
+	 isalpha[tmu1] = (ti1->baseLevelInternalFormat == GL_ALPHA);
+
+	 if (isalpha[FX_TMU1]) {
+            tex1.FunctionRGB   = GR_COMBINE_FUNCTION_ZERO;
+            tex1.FactorRGB     = GR_COMBINE_FACTOR_NONE;
+            tex1.FunctionAlpha = GR_COMBINE_FUNCTION_LOCAL;
+            tex1.FactorAlpha   = GR_COMBINE_FACTOR_NONE;
+            tex1.InvertRGB     = FXTRUE;
+	 } else {
+            tex1.FunctionRGB   = GR_COMBINE_FUNCTION_LOCAL;
+            tex1.FactorRGB     = GR_COMBINE_FACTOR_NONE;
+            tex1.FunctionAlpha = GR_COMBINE_FUNCTION_LOCAL;
+            tex1.FactorAlpha   = GR_COMBINE_FACTOR_NONE;
+         }
+
+	 if (isalpha[FX_TMU0]) {
+            tex0.FunctionRGB   = GR_COMBINE_FUNCTION_BLEND_OTHER;
+            tex0.FactorRGB     = GR_COMBINE_FACTOR_ONE;
+            tex0.FunctionAlpha = GR_COMBINE_FUNCTION_BLEND_OTHER;
+            tex0.FactorAlpha   = GR_COMBINE_FACTOR_LOCAL;
+	 } else {
+            tex0.FunctionRGB   = GR_COMBINE_FUNCTION_BLEND_OTHER;
+            tex0.FactorRGB     = GR_COMBINE_FACTOR_LOCAL;
+            tex0.FunctionAlpha = GR_COMBINE_FUNCTION_BLEND_OTHER;
+            tex0.FactorAlpha   = GR_COMBINE_FACTOR_LOCAL;
+         }
+
+         colorComb.Function = GR_COMBINE_FUNCTION_SCALE_OTHER;
+         colorComb.Factor   = GR_COMBINE_FACTOR_LOCAL;
+         colorComb.Other    = GR_COMBINE_OTHER_TEXTURE;
+
+         alphaComb.Function = GR_COMBINE_FUNCTION_SCALE_OTHER;
+         alphaComb.Factor   = GR_COMBINE_FACTOR_LOCAL;
+         alphaComb.Other    = GR_COMBINE_OTHER_TEXTURE;
+	 break;
+      }
+   case (FX_UM_E0_REPLACE | FX_UM_E1_BLEND):	/* Only for GLQuake */
+      if (tmu0 == FX_TMU1) {
+         tex1.FunctionRGB   = GR_COMBINE_FUNCTION_LOCAL;
+         tex1.FactorRGB     = GR_COMBINE_FACTOR_NONE;
+         tex1.FunctionAlpha = GR_COMBINE_FUNCTION_LOCAL;
+         tex1.FactorAlpha   = GR_COMBINE_FACTOR_NONE;
+         tex1.InvertRGB     = FXTRUE;
+
+         tex0.FunctionRGB   = GR_COMBINE_FUNCTION_BLEND_OTHER;
+         tex0.FactorRGB     = GR_COMBINE_FACTOR_LOCAL;
+         tex0.FunctionAlpha = GR_COMBINE_FUNCTION_BLEND_OTHER;
+         tex0.FactorAlpha   = GR_COMBINE_FACTOR_LOCAL;
+      }
+      else {
+         tex1.FunctionRGB   = GR_COMBINE_FUNCTION_LOCAL;
+         tex1.FactorRGB     = GR_COMBINE_FACTOR_NONE;
+         tex1.FunctionAlpha = GR_COMBINE_FUNCTION_LOCAL;
+         tex1.FactorAlpha   = GR_COMBINE_FACTOR_NONE;
+
+         tex0.FunctionRGB   = GR_COMBINE_FUNCTION_BLEND_OTHER;
+         tex0.FactorRGB     = GR_COMBINE_FACTOR_ONE_MINUS_LOCAL;
+         tex0.FunctionAlpha = GR_COMBINE_FUNCTION_BLEND_OTHER;
+         tex0.FactorAlpha   = GR_COMBINE_FACTOR_ONE_MINUS_LOCAL;
+      }
+
+      alphaComb.Function = GR_COMBINE_FUNCTION_LOCAL;
+      alphaComb.Factor   = GR_COMBINE_FACTOR_NONE;
+      alphaComb.Other    = GR_COMBINE_OTHER_NONE;
+
+      colorComb.Function = GR_COMBINE_FUNCTION_SCALE_OTHER;
+      colorComb.Factor   = GR_COMBINE_FACTOR_ONE;
+      colorComb.Other    = GR_COMBINE_OTHER_TEXTURE;
+      break;
+   case (FX_UM_E0_REPLACE | FX_UM_E1_MODULATE):	/* Quake 2 and 3 */
+      if (tmu1 == FX_TMU1) {
+         tex1.FunctionRGB   = GR_COMBINE_FUNCTION_LOCAL;
+         tex1.FactorRGB     = GR_COMBINE_FACTOR_NONE;
+         tex1.FunctionAlpha = GR_COMBINE_FUNCTION_ZERO;
+         tex1.FactorAlpha   = GR_COMBINE_FACTOR_NONE;
+         tex1.InvertAlpha   = FXTRUE;
+
+         tex0.FunctionRGB   = GR_COMBINE_FUNCTION_BLEND_OTHER;
+         tex0.FactorRGB     = GR_COMBINE_FACTOR_LOCAL;
+         tex0.FunctionAlpha = GR_COMBINE_FUNCTION_BLEND_OTHER;
+         tex0.FactorAlpha   = GR_COMBINE_FACTOR_LOCAL;
+      }
+      else {
+         tex1.FunctionRGB   = GR_COMBINE_FUNCTION_LOCAL;
+         tex1.FactorRGB     = GR_COMBINE_FACTOR_NONE;
+         tex1.FunctionAlpha = GR_COMBINE_FUNCTION_LOCAL;
+         tex1.FactorAlpha   = GR_COMBINE_FACTOR_NONE;
+
+         tex0.FunctionRGB   = GR_COMBINE_FUNCTION_BLEND_OTHER;
+         tex0.FactorRGB     = GR_COMBINE_FACTOR_LOCAL;
+         tex0.FunctionAlpha = GR_COMBINE_FUNCTION_BLEND_OTHER;
+         tex0.FactorAlpha   = GR_COMBINE_FACTOR_ONE;
+      }
+
+      if (ti0->baseLevelInternalFormat == GL_RGB) {
+         alphaComb.Function = GR_COMBINE_FUNCTION_LOCAL;
+         alphaComb.Factor   = GR_COMBINE_FACTOR_NONE;
+         alphaComb.Other    = GR_COMBINE_OTHER_NONE;
+      } else {
+         alphaComb.Function = GR_COMBINE_FUNCTION_SCALE_OTHER;
+         alphaComb.Factor   = GR_COMBINE_FACTOR_ONE;
+         alphaComb.Other    = GR_COMBINE_OTHER_NONE;
+      }
+
+      colorComb.Function = GR_COMBINE_FUNCTION_SCALE_OTHER;
+      colorComb.Factor   = GR_COMBINE_FACTOR_ONE;
+      colorComb.Other    = GR_COMBINE_OTHER_TEXTURE;
+      break;
+
+
+   case (FX_UM_E0_MODULATE | FX_UM_E1_ADD):	/* Quake 3 Sky */
+      {
+	 GLboolean isalpha[FX_NUM_TMU];
+
+	 isalpha[tmu0] = (ti0->baseLevelInternalFormat == GL_ALPHA);
+	 isalpha[tmu1] = (ti1->baseLevelInternalFormat == GL_ALPHA);
+
+	 if (isalpha[FX_TMU1]) {
+            tex1.FunctionRGB   = GR_COMBINE_FUNCTION_ZERO;
+            tex1.FactorRGB     = GR_COMBINE_FACTOR_NONE;
+            tex1.FunctionAlpha = GR_COMBINE_FUNCTION_LOCAL;
+            tex1.FactorAlpha   = GR_COMBINE_FACTOR_NONE;
+            tex1.InvertRGB     = FXTRUE;
+	 } else {
+            tex1.FunctionRGB   = GR_COMBINE_FUNCTION_LOCAL;
+            tex1.FactorRGB     = GR_COMBINE_FACTOR_NONE;
+            tex1.FunctionAlpha = GR_COMBINE_FUNCTION_LOCAL;
+            tex1.FactorAlpha   = GR_COMBINE_FACTOR_NONE;
+         }
+
+	 if (isalpha[FX_TMU0]) {
+            tex0.FunctionRGB   = GR_COMBINE_FUNCTION_SCALE_OTHER;
+            tex0.FactorRGB     = GR_COMBINE_FACTOR_ONE;
+            tex0.FunctionAlpha = GR_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL;
+            tex0.FactorAlpha   = GR_COMBINE_FACTOR_ONE;
+	 } else {
+            tex0.FunctionRGB   = GR_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL;
+            tex0.FactorRGB     = GR_COMBINE_FACTOR_ONE;
+            tex0.FunctionAlpha = GR_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL;
+            tex0.FactorAlpha   = GR_COMBINE_FACTOR_ONE;
+         }
+
+         colorComb.Function = GR_COMBINE_FUNCTION_SCALE_OTHER;
+         colorComb.Factor   = GR_COMBINE_FACTOR_LOCAL;
+         colorComb.Other    = GR_COMBINE_OTHER_TEXTURE;
+
+         alphaComb.Function = GR_COMBINE_FUNCTION_SCALE_OTHER;
+         alphaComb.Factor   = GR_COMBINE_FACTOR_LOCAL;
+         alphaComb.Other    = GR_COMBINE_OTHER_TEXTURE;
+	 break;
+      }
+
+   case (FX_UM_E0_REPLACE | FX_UM_E1_ADD):	/* Vulpine Sky */
+      {
+	 GLboolean isalpha[FX_NUM_TMU];
+
+	 isalpha[tmu0] = (ti0->baseLevelInternalFormat == GL_ALPHA);
+	 isalpha[tmu1] = (ti1->baseLevelInternalFormat == GL_ALPHA);
+
+	 if (isalpha[FX_TMU1]) {
+            tex1.FunctionRGB   = GR_COMBINE_FUNCTION_ZERO;
+            tex1.FactorRGB     = GR_COMBINE_FACTOR_NONE;
+            tex1.FunctionAlpha = GR_COMBINE_FUNCTION_LOCAL;
+            tex1.FactorAlpha   = GR_COMBINE_FACTOR_NONE;
+            tex1.InvertRGB     = FXTRUE;
+	 } else {
+            tex1.FunctionRGB   = GR_COMBINE_FUNCTION_LOCAL;
+            tex1.FactorRGB     = GR_COMBINE_FACTOR_NONE;
+            tex1.FunctionAlpha = GR_COMBINE_FUNCTION_LOCAL;
+            tex1.FactorAlpha   = GR_COMBINE_FACTOR_NONE;
+         }
+
+	 if (isalpha[FX_TMU0]) {
+            tex0.FunctionRGB   = GR_COMBINE_FUNCTION_SCALE_OTHER;
+            tex0.FactorRGB     = GR_COMBINE_FACTOR_ONE;
+            tex0.FunctionAlpha = GR_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL;
+            tex0.FactorAlpha   = GR_COMBINE_FACTOR_ONE;
+	 } else {
+            tex0.FunctionRGB   = GR_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL;
+            tex0.FactorRGB     = GR_COMBINE_FACTOR_ONE;
+            tex0.FunctionAlpha = GR_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL;
+            tex0.FactorAlpha   = GR_COMBINE_FACTOR_ONE;
+         }
+
+         colorComb.Function = GR_COMBINE_FUNCTION_SCALE_OTHER;
+         colorComb.Factor   = GR_COMBINE_FACTOR_ONE;
+         colorComb.Other    = GR_COMBINE_OTHER_TEXTURE;
+
+         alphaComb.Function = GR_COMBINE_FUNCTION_SCALE_OTHER;
+         alphaComb.Factor   = GR_COMBINE_FACTOR_ONE;
+         alphaComb.Other    = GR_COMBINE_OTHER_TEXTURE;
+	 break;
+      }
+   default:
+      fprintf(stderr, "fxSetupTextureDoubleTMU_NoLock: Unexpected dual texture mode encountered\n");
+      return;
+   }
+
+   grAlphaCombine(alphaComb.Function,
+                  alphaComb.Factor,
+                  alphaComb.Local,
+                  alphaComb.Other,
+                  alphaComb.Invert);
+   grColorCombine(colorComb.Function,
+                  colorComb.Factor,
+                  colorComb.Local,
+                  colorComb.Other,
+                  colorComb.Invert);
+   grTexCombine(GR_TMU0,
+                tex0.FunctionRGB,
+                tex0.FactorRGB,
+                tex0.FunctionAlpha,
+                tex0.FactorAlpha,
+                tex0.InvertRGB,
+                tex0.InvertAlpha);
+   grTexCombine(GR_TMU1,
+                tex1.FunctionRGB,
+                tex1.FactorRGB,
+                tex1.FunctionAlpha,
+                tex1.FactorAlpha,
+                tex1.InvertRGB,
+                tex1.InvertAlpha);
+}
+
+/************************* No Texture ***************************/
+
+static void
+fxSetupTextureNone_NoLock(GLcontext * ctx)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   GrCombineLocal_t localc, locala;
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "fxSetupTextureNone_NoLock(...)\n");
+   }
+
+   if ((ctx->Light.ShadeModel == GL_SMOOTH) || 1 ||
+       (ctx->Point.SmoothFlag) ||
+       (ctx->Line.SmoothFlag) ||
+       (ctx->Polygon.SmoothFlag)) locala = GR_COMBINE_LOCAL_ITERATED;
+   else
+      locala = GR_COMBINE_LOCAL_CONSTANT;
+
+   if (ctx->Light.ShadeModel == GL_SMOOTH || 1)
+      localc = GR_COMBINE_LOCAL_ITERATED;
+   else
+      localc = GR_COMBINE_LOCAL_CONSTANT;
+
+   grAlphaCombine(GR_COMBINE_FUNCTION_LOCAL,
+                  GR_COMBINE_FACTOR_NONE,
+                  locala,
+                  GR_COMBINE_OTHER_NONE,
+                  FXFALSE);
+
+   grColorCombine(GR_COMBINE_FUNCTION_LOCAL,
+                  GR_COMBINE_FACTOR_NONE,
+                  localc,
+                  GR_COMBINE_OTHER_NONE,
+                  FXFALSE);
+
+   fxMesa->lastUnitsMode = FX_UM_NONE;
+}
+
+#include "fxsetup.h"
+
+/************************************************************************/
+/************************** Texture Mode SetUp **************************/
+/************************************************************************/
+
+static void
+fxSetupTexture_NoLock(GLcontext * ctx)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "fxSetupTexture_NoLock(...)\n");
+   }
+
+   if (fxMesa->HaveCmbExt) {
+      /* Texture Combine, Color Combine and Alpha Combine. */
+      if (ctx->Texture.Unit[0]._ReallyEnabled == TEXTURE_2D_BIT &&
+          ctx->Texture.Unit[1]._ReallyEnabled == TEXTURE_2D_BIT &&
+          fxMesa->haveTwoTMUs) {
+         fxSetupTextureDoubleTMUNapalm_NoLock(ctx);
+      }
+      else if (ctx->Texture.Unit[0]._ReallyEnabled == TEXTURE_2D_BIT) {
+         fxSetupTextureSingleTMUNapalm_NoLock(ctx, 0);
+      }
+      else if (ctx->Texture.Unit[1]._ReallyEnabled == TEXTURE_2D_BIT) {
+         fxSetupTextureSingleTMUNapalm_NoLock(ctx, 1);
+      }
+      else {
+         fxSetupTextureNoneNapalm_NoLock(ctx);
+      }
+   } else {
+      /* Texture Combine, Color Combine and Alpha Combine. */
+      if (ctx->Texture.Unit[0]._ReallyEnabled == TEXTURE_2D_BIT &&
+          ctx->Texture.Unit[1]._ReallyEnabled == TEXTURE_2D_BIT &&
+          fxMesa->haveTwoTMUs) {
+         fxSetupTextureDoubleTMU_NoLock(ctx);
+      }
+      else if (ctx->Texture.Unit[0]._ReallyEnabled == TEXTURE_2D_BIT) {
+         fxSetupTextureSingleTMU_NoLock(ctx, 0);
+      }
+      else if (ctx->Texture.Unit[1]._ReallyEnabled == TEXTURE_2D_BIT) {
+         fxSetupTextureSingleTMU_NoLock(ctx, 1);
+      }
+      else {
+         fxSetupTextureNone_NoLock(ctx);
+      }
+   }
+}
+
+void
+fxSetupTexture(GLcontext * ctx)
+{
+   BEGIN_BOARD_LOCK();
+   fxSetupTexture_NoLock(ctx);
+   END_BOARD_LOCK();
+}
+
+/************************************************************************/
+/**************************** Blend SetUp *******************************/
+/************************************************************************/
+
+void
+fxDDBlendFuncSeparate(GLcontext * ctx, GLenum sfactor, GLenum dfactor, GLenum asfactor, GLenum adfactor)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   tfxUnitsState *us = &fxMesa->unitsState;
+   GLboolean have32bpp = (fxMesa->colDepth == 32);
+   GLboolean haveAlpha = fxMesa->haveHwAlpha;
+   GrAlphaBlendFnc_t sfact, dfact, asfact, adfact;
+
+   /* [dBorca] Hack alert:
+    * We should condition *DST_ALPHA* modes
+    * by the boolean `haveAlpha' above!
+    * It indicates whether we really have HW alpha buffer...
+    */
+
+/*
+When the value A_COLOR is selected as the destination alpha blending factor,
+the source pixel color is used as the destination blending factor.  When the
+value A_COLOR is selected as the source alpha blending factor, the destination
+pixel color is used as the source blending factor.  When the value A_SAMECOLOR
+is selected as the destination alpha blending factor, the destination pixel
+color is used as the destination blending factor.  When the value A_SAMECOLOR
+is selected as the source alpha blending factor, the source pixel color is
+used as the source blending factor.  Note also that the alpha blending
+function 0xf (A_COLORBEFOREFOG/ASATURATE) is different depending upon whether
+it is being used as a source or destination alpha blending function.  When the
+value 0xf is selected as the destination alpha blending factor, the source
+color before the fog unit ("unfogged" color) is used as the destination
+blending factor -- this alpha blending function is useful for multi-pass
+rendering with atmospheric effects.  When the value 0xf is selected as the
+source alpha blending factor, the alpha-saturate anti-aliasing algorithm is
+selected -- this MIN function performs polygonal anti-aliasing for polygons
+which are drawn front-to-back.
+
+15/16 BPP alpha channel alpha blending modes
+	0x0	AZERO		Zero
+	0x4	AONE		One
+
+32 BPP alpha channel alpha blending modes
+	0x0	AZERO		Zero
+	0x1	ASRC_ALPHA	Source alpha
+	0x3	ADST_ALPHA	Destination alpha
+	0x4	AONE		One
+	0x5	AOMSRC_ALPHA	1 - Source alpha
+	0x7	AOMDST_ALPHA	1 - Destination alpha
+*/
+
+   switch (sfactor) {
+   case GL_ZERO:
+      sfact = GR_BLEND_ZERO;
+      break;
+   case GL_ONE:
+      sfact = GR_BLEND_ONE;
+      break;
+   case GL_DST_COLOR:
+      sfact = GR_BLEND_DST_COLOR;
+      break;
+   case GL_ONE_MINUS_DST_COLOR:
+      sfact = GR_BLEND_ONE_MINUS_DST_COLOR;
+      break;
+   case GL_SRC_ALPHA:
+      sfact = GR_BLEND_SRC_ALPHA;
+      break;
+   case GL_ONE_MINUS_SRC_ALPHA:
+      sfact = GR_BLEND_ONE_MINUS_SRC_ALPHA;
+      break;
+   case GL_DST_ALPHA:
+      sfact = GR_BLEND_DST_ALPHA;
+      break;
+   case GL_ONE_MINUS_DST_ALPHA:
+      sfact = GR_BLEND_ONE_MINUS_DST_ALPHA;
+      break;
+   case GL_SRC_ALPHA_SATURATE:
+      sfact = GR_BLEND_ALPHA_SATURATE;
+      break;
+   case GL_SRC_COLOR:
+   case GL_ONE_MINUS_SRC_COLOR:
+      /* USELESS */
+      sfact = GR_BLEND_ONE;
+      break;
+   default:
+      sfact = GR_BLEND_ONE;
+      break;
+   }
+
+   switch (asfactor) {
+   case GL_ZERO:
+      asfact = GR_BLEND_ZERO;
+      break;
+   case GL_ONE:
+      asfact = GR_BLEND_ONE;
+      break;
+   case GL_DST_COLOR:
+      asfact = GR_BLEND_ONE/*bad*/;
+      break;
+   case GL_ONE_MINUS_DST_COLOR:
+      asfact = GR_BLEND_ONE/*bad*/;
+      break;
+   case GL_SRC_ALPHA:
+      asfact = have32bpp ? GR_BLEND_SRC_ALPHA : GR_BLEND_ONE/*bad*/;
+      break;
+   case GL_ONE_MINUS_SRC_ALPHA:
+      asfact = have32bpp ? GR_BLEND_ONE_MINUS_SRC_ALPHA : GR_BLEND_ONE/*bad*/;
+      break;
+   case GL_DST_ALPHA:
+      asfact = have32bpp ? GR_BLEND_DST_ALPHA : GR_BLEND_ONE/*bad*/;
+      break;
+   case GL_ONE_MINUS_DST_ALPHA:
+      asfact = have32bpp ? GR_BLEND_ONE_MINUS_DST_ALPHA : GR_BLEND_ONE/*bad*/;
+      break;
+   case GL_SRC_ALPHA_SATURATE:
+      asfact = GR_BLEND_ONE/*bad*/;
+      break;
+   case GL_SRC_COLOR:
+   case GL_ONE_MINUS_SRC_COLOR:
+      /* USELESS */
+      asfact = GR_BLEND_ONE/*bad*/;
+      break;
+   default:
+      asfact = GR_BLEND_ONE/*bad*/;
+      break;
+   }
+
+   switch (dfactor) {
+   case GL_ZERO:
+      dfact = GR_BLEND_ZERO;
+      break;
+   case GL_ONE:
+      dfact = GR_BLEND_ONE;
+      break;
+   case GL_SRC_COLOR:
+      dfact = GR_BLEND_SRC_COLOR;
+      break;
+   case GL_ONE_MINUS_SRC_COLOR:
+      dfact = GR_BLEND_ONE_MINUS_SRC_COLOR;
+      break;
+   case GL_SRC_ALPHA:
+      dfact = GR_BLEND_SRC_ALPHA;
+      break;
+   case GL_ONE_MINUS_SRC_ALPHA:
+      dfact = GR_BLEND_ONE_MINUS_SRC_ALPHA;
+      break;
+   case GL_DST_ALPHA:
+      /* dfact=GR_BLEND_DST_ALPHA; */
+      /* We can't do DST_ALPHA */
+      dfact = GR_BLEND_ONE;
+      break;
+   case GL_ONE_MINUS_DST_ALPHA:
+      /* dfact=GR_BLEND_ONE_MINUS_DST_ALPHA; */
+      /* We can't do DST_ALPHA */
+      dfact = GR_BLEND_ZERO;
+      break;
+   case GL_SRC_ALPHA_SATURATE:
+   case GL_DST_COLOR:
+   case GL_ONE_MINUS_DST_COLOR:
+      /* USELESS */
+      dfact = GR_BLEND_ZERO;
+      break;
+   default:
+      dfact = GR_BLEND_ZERO;
+      break;
+   }
+
+   switch (adfactor) {
+   case GL_ZERO:
+      adfact = GR_BLEND_ZERO;
+      break;
+   case GL_ONE:
+      adfact = GR_BLEND_ONE;
+      break;
+   case GL_SRC_COLOR:
+      adfact = GR_BLEND_ZERO/*bad*/;
+      break;
+   case GL_ONE_MINUS_SRC_COLOR:
+      adfact = GR_BLEND_ZERO/*bad*/;
+      break;
+   case GL_SRC_ALPHA:
+      adfact = have32bpp ? GR_BLEND_SRC_ALPHA : GR_BLEND_ZERO/*bad*/;
+      break;
+   case GL_ONE_MINUS_SRC_ALPHA:
+      adfact = have32bpp ? GR_BLEND_ONE_MINUS_SRC_ALPHA : GR_BLEND_ZERO/*bad*/;
+      break;
+   case GL_DST_ALPHA:
+      adfact = have32bpp ? GR_BLEND_DST_ALPHA : GR_BLEND_ZERO/*bad*/;
+      break;
+   case GL_ONE_MINUS_DST_ALPHA:
+      adfact = have32bpp ? GR_BLEND_ONE_MINUS_DST_ALPHA : GR_BLEND_ZERO/*bad*/;
+      break;
+   case GL_SRC_ALPHA_SATURATE:
+   case GL_DST_COLOR:
+   case GL_ONE_MINUS_DST_COLOR:
+      /* USELESS */
+      adfact = GR_BLEND_ZERO/*bad*/;
+      break;
+   default:
+      adfact = GR_BLEND_ZERO/*bad*/;
+      break;
+   }
+
+   if ((sfact != us->blendSrcFuncRGB) || (asfact != us->blendSrcFuncAlpha)) {
+      us->blendSrcFuncRGB = sfact;
+      us->blendSrcFuncAlpha = asfact;
+      fxMesa->new_state |= FX_NEW_BLEND;
+   }
+
+   if ((dfact != us->blendDstFuncRGB) || (adfact != us->blendDstFuncAlpha)) {
+      us->blendDstFuncRGB = dfact;
+      us->blendDstFuncAlpha = adfact;
+      fxMesa->new_state |= FX_NEW_BLEND;
+   }
+}
+
+void
+fxDDBlendFunc(GLcontext * ctx, GLenum sfactor, GLenum dfactor)
+{
+   fxDDBlendFuncSeparate(ctx, sfactor, dfactor, sfactor, dfactor);
+}
+
+void
+fxDDBlendEquation(GLcontext * ctx, GLenum mode)
+{
+ fxMesaContext fxMesa = FX_CONTEXT(ctx);
+ tfxUnitsState *us = &fxMesa->unitsState;
+ GrAlphaBlendOp_t q;
+
+ switch (mode) {
+        case GL_FUNC_ADD_EXT:
+             q = GR_BLEND_OP_ADD;
+             break;
+        case GL_FUNC_SUBTRACT_EXT:
+             q = GR_BLEND_OP_SUB;
+             break;
+        case GL_FUNC_REVERSE_SUBTRACT_EXT:
+             q = GR_BLEND_OP_REVSUB;
+             break;
+        default:
+             return;
+ }
+
+ if ((q != us->blendEq) && fxMesa->HavePixExt) {
+    us->blendEq = q;
+    fxMesa->new_state |= FX_NEW_BLEND;
+ }
+}
+
+void
+fxSetupBlend(GLcontext * ctx)
+{
+ fxMesaContext fxMesa = FX_CONTEXT(ctx);
+ tfxUnitsState *us = &fxMesa->unitsState;
+
+ if (fxMesa->HavePixExt) {
+    if (us->blendEnabled) {
+       fxMesa->Glide.grAlphaBlendFunctionExt(us->blendSrcFuncRGB, us->blendDstFuncRGB,
+                                             us->blendEq,
+                                             us->blendSrcFuncAlpha, us->blendDstFuncAlpha,
+                                             us->blendEq);
+    } else {
+       fxMesa->Glide.grAlphaBlendFunctionExt(GR_BLEND_ONE, GR_BLEND_ZERO,
+                                             GR_BLEND_OP_ADD,
+                                             GR_BLEND_ONE, GR_BLEND_ZERO,
+                                             GR_BLEND_OP_ADD);
+    }
+ } else {
+    if (us->blendEnabled) {
+       grAlphaBlendFunction(us->blendSrcFuncRGB, us->blendDstFuncRGB,
+                            us->blendSrcFuncAlpha, us->blendDstFuncAlpha);
+    } else {
+       grAlphaBlendFunction(GR_BLEND_ONE, GR_BLEND_ZERO,
+                            GR_BLEND_ONE, GR_BLEND_ZERO);
+    }
+ }
+}
+
+/************************************************************************/
+/************************** Alpha Test SetUp ****************************/
+/************************************************************************/
+
+void
+fxDDAlphaFunc(GLcontext * ctx, GLenum func, GLfloat ref)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   tfxUnitsState *us = &fxMesa->unitsState;
+
+   if (
+       (us->alphaTestFunc != func)
+       ||
+       (us->alphaTestRefValue != ref)
+      ) {
+      us->alphaTestFunc = func;
+      us->alphaTestRefValue = ref;
+      fxMesa->new_state |= FX_NEW_ALPHA;
+   }
+}
+
+static void
+fxSetupAlphaTest(GLcontext * ctx)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   tfxUnitsState *us = &fxMesa->unitsState;
+
+   if (us->alphaTestEnabled) {
+      GrAlpha_t ref = (GLint) (us->alphaTestRefValue * 255.0);
+      grAlphaTestFunction(us->alphaTestFunc - GL_NEVER + GR_CMP_NEVER);
+      grAlphaTestReferenceValue(ref);
+   }
+   else
+      grAlphaTestFunction(GR_CMP_ALWAYS);
+}
+
+/************************************************************************/
+/************************** Depth Test SetUp ****************************/
+/************************************************************************/
+
+void
+fxDDDepthFunc(GLcontext * ctx, GLenum func)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   tfxUnitsState *us = &fxMesa->unitsState;
+
+   if (us->depthTestFunc != func) {
+      us->depthTestFunc = func;
+      fxMesa->new_state |= FX_NEW_DEPTH;
+   }
+}
+
+void
+fxDDDepthMask(GLcontext * ctx, GLboolean flag)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   tfxUnitsState *us = &fxMesa->unitsState;
+
+   if (flag != us->depthMask) {
+      us->depthMask = flag;
+      fxMesa->new_state |= FX_NEW_DEPTH;
+   }
+}
+
+void
+fxSetupDepthTest(GLcontext * ctx)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   tfxUnitsState *us = &fxMesa->unitsState;
+
+   if (us->depthTestEnabled) {
+      grDepthBufferFunction(us->depthTestFunc - GL_NEVER + GR_CMP_NEVER);
+      grDepthMask(us->depthMask);
+   }
+   else {
+      grDepthBufferFunction(GR_CMP_ALWAYS);
+      grDepthMask(FXFALSE);
+   }
+}
+
+/************************************************************************/
+/************************** Stencil SetUp *******************************/
+/************************************************************************/
+
+static GrStencil_t convertGLStencilOp( GLenum op )
+{
+   switch ( op ) {
+   case GL_KEEP:
+      return GR_STENCILOP_KEEP;
+   case GL_ZERO:
+      return GR_STENCILOP_ZERO;
+   case GL_REPLACE:
+      return GR_STENCILOP_REPLACE;
+   case GL_INCR:
+      return GR_STENCILOP_INCR_CLAMP;
+   case GL_DECR:
+      return GR_STENCILOP_DECR_CLAMP;
+   case GL_INVERT:
+      return GR_STENCILOP_INVERT;
+   case GL_INCR_WRAP_EXT:
+      return GR_STENCILOP_INCR_WRAP;
+   case GL_DECR_WRAP_EXT:
+      return GR_STENCILOP_DECR_WRAP;
+   default:
+      _mesa_problem( NULL, "bad stencil op in convertGLStencilOp" );
+   }
+   return GR_STENCILOP_KEEP;   /* never get, silence compiler warning */
+}
+
+void
+fxDDStencilFunc (GLcontext *ctx, GLenum func, GLint ref, GLuint mask)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   tfxUnitsState *us = &fxMesa->unitsState;
+
+   if (
+       (us->stencilFunction != func)
+       ||
+       (us->stencilRefValue != ref)
+       ||
+       (us->stencilValueMask != mask)
+      ) {
+      us->stencilFunction = func;
+      us->stencilRefValue = ref;
+      us->stencilValueMask = mask;
+      fxMesa->new_state |= FX_NEW_STENCIL;
+   }
+}
+
+void
+fxDDStencilMask (GLcontext *ctx, GLuint mask)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   tfxUnitsState *us = &fxMesa->unitsState;
+
+   if (us->stencilWriteMask != mask) {
+      us->stencilWriteMask = mask;
+      fxMesa->new_state |= FX_NEW_STENCIL;
+   }
+}
+
+void
+fxDDStencilOp (GLcontext *ctx, GLenum sfail, GLenum zfail, GLenum zpass)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   tfxUnitsState *us = &fxMesa->unitsState;
+
+   if (
+       (us->stencilFailFunc != sfail)
+       ||
+       (us->stencilZFailFunc != zfail)
+       ||
+       (us->stencilZPassFunc != zpass)
+      ) {
+      us->stencilFailFunc = sfail;
+      us->stencilZFailFunc = zfail;
+      us->stencilZPassFunc = zpass;
+      fxMesa->new_state |= FX_NEW_STENCIL;
+   }
+}
+
+static void
+fxSetupStencil (GLcontext * ctx)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   tfxUnitsState *us = &fxMesa->unitsState;
+
+   if (us->stencilEnabled) {
+      grEnable(GR_STENCIL_MODE_EXT);
+      fxMesa->Glide.grStencilOpExt(convertGLStencilOp(us->stencilFailFunc),
+                                   convertGLStencilOp(us->stencilZFailFunc),
+                                   convertGLStencilOp(us->stencilZPassFunc));
+      fxMesa->Glide.grStencilFuncExt(us->stencilFunction - GL_NEVER + GR_CMP_NEVER,
+                                     us->stencilRefValue,
+                                     us->stencilValueMask);
+      fxMesa->Glide.grStencilMaskExt(us->stencilWriteMask);
+   } else {
+      grDisable(GR_STENCIL_MODE_EXT);
+   }
+}
+
+/************************************************************************/
+/**************************** Color Mask SetUp **************************/
+/************************************************************************/
+
+void
+fxDDColorMask(GLcontext * ctx,
+	      GLboolean r, GLboolean g, GLboolean b, GLboolean a)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   fxMesa->new_state |= FX_NEW_COLOR_MASK;
+   (void) r;
+   (void) g;
+   (void) b;
+   (void) a;
+}
+
+void
+fxSetupColorMask(GLcontext * ctx)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+
+   if (fxMesa->colDepth != 16) {
+      /* 32bpp mode or 15bpp mode */
+      fxMesa->Glide.grColorMaskExt(ctx->Color.ColorMask[RCOMP],
+                                   ctx->Color.ColorMask[GCOMP],
+                                   ctx->Color.ColorMask[BCOMP],
+                                   ctx->Color.ColorMask[ACOMP] && fxMesa->haveHwAlpha);
+   }
+   else {
+      /* 16 bpp mode */
+      grColorMask(ctx->Color.ColorMask[RCOMP] |
+                  ctx->Color.ColorMask[GCOMP] |
+                  ctx->Color.ColorMask[BCOMP],
+                  ctx->Color.ColorMask[ACOMP] && fxMesa->haveHwAlpha);
+   }
+}
+
+
+
+
+/************************************************************************/
+/**************************** Fog Mode SetUp ****************************/
+/************************************************************************/
+
+/*
+ * This is called during state update in order to update the Glide fog state.
+ */
+static void
+fxSetupFog(GLcontext * ctx)
+{
+   if (ctx->Fog.Enabled /*&& ctx->FogMode==FOG_FRAGMENT */ ) {
+      fxMesaContext fxMesa = FX_CONTEXT(ctx);
+
+      /* update fog color */
+      GLubyte col[4];
+      col[0] = (unsigned int) (255 * ctx->Fog.Color[0]);
+      col[1] = (unsigned int) (255 * ctx->Fog.Color[1]);
+      col[2] = (unsigned int) (255 * ctx->Fog.Color[2]);
+      col[3] = (unsigned int) (255 * ctx->Fog.Color[3]);
+      grFogColorValue(FXCOLOR4(col));
+
+      if (fxMesa->fogTableMode != ctx->Fog.Mode ||
+	  fxMesa->fogDensity != ctx->Fog.Density ||
+	  fxMesa->fogStart != ctx->Fog.Start ||
+	  fxMesa->fogEnd != ctx->Fog.End) {
+	 /* reload the fog table */
+	 switch (ctx->Fog.Mode) {
+	 case GL_LINEAR:
+	    guFogGenerateLinear(fxMesa->fogTable, ctx->Fog.Start,
+				ctx->Fog.End);
+	    break;
+	 case GL_EXP:
+	    guFogGenerateExp(fxMesa->fogTable, ctx->Fog.Density);
+	    break;
+	 case GL_EXP2:
+	    guFogGenerateExp2(fxMesa->fogTable, ctx->Fog.Density);
+	    break;
+	 default:
+	    ;
+	 }
+	 fxMesa->fogTableMode = ctx->Fog.Mode;
+	 fxMesa->fogDensity = ctx->Fog.Density;
+	 fxMesa->fogStart = ctx->Fog.Start;
+	 fxMesa->fogEnd = ctx->Fog.End;
+      }
+
+      grFogTable(fxMesa->fogTable);
+      grFogMode(GR_FOG_WITH_TABLE_ON_Q);
+   }
+   else {
+      grFogMode(GR_FOG_DISABLE);
+   }
+}
+
+void
+fxDDFogfv(GLcontext * ctx, GLenum pname, const GLfloat * params)
+{
+   FX_CONTEXT(ctx)->new_state |= FX_NEW_FOG;
+}
+
+/************************************************************************/
+/************************** Scissor Test SetUp **************************/
+/************************************************************************/
+
+/* This routine is used in managing the lock state, and therefore can't lock */
+void
+fxSetScissorValues(GLcontext * ctx)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   int xmin, xmax;
+   int ymin, ymax;
+
+   if (ctx->Scissor.Enabled) {
+      xmin = ctx->Scissor.X;
+      xmax = ctx->Scissor.X + ctx->Scissor.Width;
+      ymin = ctx->Scissor.Y;
+      ymax = ctx->Scissor.Y + ctx->Scissor.Height;
+
+      if (xmin < 0)
+         xmin = 0;
+      if (xmax > fxMesa->width)
+         xmax = fxMesa->width;
+      if (ymin < fxMesa->screen_height - fxMesa->height)
+         ymin = fxMesa->screen_height - fxMesa->height;
+      if (ymax > fxMesa->screen_height - 0)
+         ymax = fxMesa->screen_height - 0;
+   }
+   else {
+      xmin = 0;
+      ymin = 0;
+      xmax = fxMesa->width;
+      ymax = fxMesa->height;
+   }
+
+   fxMesa->clipMinX = xmin;
+   fxMesa->clipMinY = ymin;
+   fxMesa->clipMaxX = xmax;
+   fxMesa->clipMaxY = ymax;
+   grClipWindow(xmin, ymin, xmax, ymax);
+}
+
+void
+fxSetupScissor(GLcontext * ctx)
+{
+   BEGIN_BOARD_LOCK();
+   fxSetScissorValues(ctx);
+   END_BOARD_LOCK();
+}
+
+void
+fxDDScissor(GLcontext * ctx, GLint x, GLint y, GLsizei w, GLsizei h)
+{
+   FX_CONTEXT(ctx)->new_state |= FX_NEW_SCISSOR;
+}
+
+/************************************************************************/
+/*************************** Cull mode setup ****************************/
+/************************************************************************/
+
+
+void
+fxDDCullFace(GLcontext * ctx, GLenum mode)
+{
+   (void) mode;
+   FX_CONTEXT(ctx)->new_state |= FX_NEW_CULL;
+}
+
+void
+fxDDFrontFace(GLcontext * ctx, GLenum mode)
+{
+   (void) mode;
+   FX_CONTEXT(ctx)->new_state |= FX_NEW_CULL;
+}
+
+
+void
+fxSetupCull(GLcontext * ctx)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   GrCullMode_t mode = GR_CULL_DISABLE;
+
+   if (ctx->Polygon.CullFlag && (fxMesa->raster_primitive == GL_TRIANGLES)) {
+      switch (ctx->Polygon.CullFaceMode) {
+      case GL_BACK:
+	 if (ctx->Polygon.FrontFace == GL_CCW)
+	    mode = GR_CULL_NEGATIVE;
+	 else
+	    mode = GR_CULL_POSITIVE;
+	 break;
+      case GL_FRONT:
+	 if (ctx->Polygon.FrontFace == GL_CCW)
+	    mode = GR_CULL_POSITIVE;
+	 else
+	    mode = GR_CULL_NEGATIVE;
+	 break;
+      case GL_FRONT_AND_BACK:
+	 /* Handled as a fallback on triangles in tdfx_tris.c */
+	 return;
+      default:
+	 ASSERT(0);
+	 break;
+      }
+   }
+
+   if (fxMesa->cullMode != mode) {
+      fxMesa->cullMode = mode;
+      grCullMode(mode);
+   }
+}
+
+
+/************************************************************************/
+/****************************** DD Enable ******************************/
+/************************************************************************/
+
+void
+fxDDEnable(GLcontext * ctx, GLenum cap, GLboolean state)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   tfxUnitsState *us = &fxMesa->unitsState;
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "%s(%s)\n", state ? "fxDDEnable" : "fxDDDisable",
+	      _mesa_lookup_enum_by_nr(cap));
+   }
+
+   switch (cap) {
+   case GL_ALPHA_TEST:
+      if (state != us->alphaTestEnabled) {
+	 us->alphaTestEnabled = state;
+	 fxMesa->new_state |= FX_NEW_ALPHA;
+      }
+      break;
+   case GL_BLEND:
+      if (state != us->blendEnabled) {
+	 us->blendEnabled = state;
+	 fxMesa->new_state |= FX_NEW_BLEND;
+      }
+      break;
+   case GL_DEPTH_TEST:
+      if (state != us->depthTestEnabled) {
+	 us->depthTestEnabled = state;
+	 fxMesa->new_state |= FX_NEW_DEPTH;
+      }
+      break;
+   case GL_STENCIL_TEST:
+      if (fxMesa->haveHwStencil && state != us->stencilEnabled) {
+	 us->stencilEnabled = state;
+	 fxMesa->new_state |= FX_NEW_STENCIL;
+      }
+      break;
+   case GL_DITHER:
+      if (state) {
+	 grDitherMode(GR_DITHER_4x4);
+      }
+      else {
+	 grDitherMode(GR_DITHER_DISABLE);
+      }
+      break;
+   case GL_SCISSOR_TEST:
+      fxMesa->new_state |= FX_NEW_SCISSOR;
+      break;
+   case GL_SHARED_TEXTURE_PALETTE_EXT:
+      fxDDTexUseGlbPalette(ctx, state);
+      break;
+   case GL_FOG:
+      fxMesa->new_state |= FX_NEW_FOG;
+      break;
+   case GL_CULL_FACE:
+      fxMesa->new_state |= FX_NEW_CULL;
+      break;
+   case GL_LINE_SMOOTH:
+   case GL_LINE_STIPPLE:
+   case GL_POINT_SMOOTH:
+   case GL_POLYGON_SMOOTH:
+   case GL_TEXTURE_2D:
+      fxMesa->new_state |= FX_NEW_TEXTURING;
+      break;
+   default:
+      ;				/* XXX no-op? */
+   }
+}
+
+
+
+
+/************************************************************************/
+/************************** Changes to units state **********************/
+/************************************************************************/
+
+
+/* All units setup is handled under texture setup.
+ */
+void
+fxDDShadeModel(GLcontext * ctx, GLenum mode)
+{
+   FX_CONTEXT(ctx)->new_state |= FX_NEW_TEXTURING;
+}
+
+
+
+/************************************************************************/
+/****************************** Units SetUp *****************************/
+/************************************************************************/
+static void
+fx_print_state_flags(const char *msg, GLuint flags)
+{
+   fprintf(stderr,
+	   "%s: (0x%x) %s%s%s%s%s%s%s%s\n",
+	   msg,
+	   flags,
+	   (flags & FX_NEW_TEXTURING) ? "texture, " : "",
+	   (flags & FX_NEW_BLEND) ? "blend, " : "",
+	   (flags & FX_NEW_ALPHA) ? "alpha, " : "",
+	   (flags & FX_NEW_FOG) ? "fog, " : "",
+	   (flags & FX_NEW_SCISSOR) ? "scissor, " : "",
+	   (flags & FX_NEW_COLOR_MASK) ? "colormask, " : "",
+	   (flags & FX_NEW_CULL) ? "cull, " : "",
+	   (flags & FX_NEW_STENCIL) ? "stencil, " : "");
+}
+
+void
+fxSetupFXUnits(GLcontext * ctx)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   GLuint newstate = fxMesa->new_state;
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER)
+      fx_print_state_flags("fxSetupFXUnits", newstate);
+
+   if (newstate) {
+      if (newstate & FX_NEW_TEXTURING)
+	 fxSetupTexture(ctx);
+
+      if (newstate & FX_NEW_BLEND)
+	 fxSetupBlend(ctx);
+
+      if (newstate & FX_NEW_ALPHA)
+	 fxSetupAlphaTest(ctx);
+
+      if (newstate & FX_NEW_DEPTH)
+	 fxSetupDepthTest(ctx);
+
+      if (newstate & FX_NEW_STENCIL)
+	 fxSetupStencil(ctx);
+
+      if (newstate & FX_NEW_FOG)
+	 fxSetupFog(ctx);
+
+      if (newstate & FX_NEW_SCISSOR)
+	 fxSetupScissor(ctx);
+
+      if (newstate & FX_NEW_COLOR_MASK)
+	 fxSetupColorMask(ctx);
+
+      if (newstate & FX_NEW_CULL)
+	 fxSetupCull(ctx);
+
+      fxMesa->new_state = 0;
+   }
+}
+
+
+
+#else
+
+
+/*
+ * Need this to provide at least one external definition.
+ */
+
+extern int gl_fx_dummy_function_setup(void);
+int
+gl_fx_dummy_function_setup(void)
+{
+   return 0;
+}
+
+#endif /* FX */
diff --git a/reactos/lib/mesa32/src/drivers/glide/fxsetup.h b/reactos/lib/mesa32/src/drivers/glide/fxsetup.h
new file mode 100644
index 00000000000..7d765924986
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/glide/fxsetup.h
@@ -0,0 +1,1250 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.0
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/* Authors:
+ *    David Bucciarelli
+ *    Brian Paul
+ *    Daryll Strauss
+ *    Keith Whitwell
+ *    Daniel Borca
+ *    Hiroshi Morii
+ */
+
+/* fxsetup.c - 3Dfx VooDoo rendering mode setup functions */
+/* [dBorca] Hack alert:
+ * this code belongs to fxsetup.c, but I didn't want to clutter
+ * the original code with Napalm specifics, in order to keep things
+ * clear -- especially for backward compatibility. I should have
+ * put it into another .c file, but I didn't want to export so many
+ * things...
+ * The point is, Napalm uses a different technique for texture env.
+ * SST1 Single texturing:
+ *      setup standard grTexCombine
+ *      fiddle with grColorCombine/grAlphaCombine
+ * SST1 Multi texturing:
+ *      fiddle with grTexCombine/grColorCombine/grAlphaCombine
+ * Napalm Single texturing:
+ *      setup standard grColorCombineExt/grAlphaCombineExt
+ *      fiddle with grTexColorCombine/grTexAlphaCombine
+ * Napalm Multi texturing:
+ *      setup standard grColorCombineExt/grAlphaCombineExt
+ *      fiddle with grTexColorCombine/grTexAlphaCombine
+ */
+
+/*
+ * These macros are used below when handling COMBINE_EXT.
+ */
+#define TEXENV_OPERAND_INVERTED(operand)                            \
+  (((operand) == GL_ONE_MINUS_SRC_ALPHA)                            \
+   || ((operand) == GL_ONE_MINUS_SRC_COLOR))
+#define TEXENV_OPERAND_ALPHA(operand)                               \
+  (((operand) == GL_SRC_ALPHA) || ((operand) == GL_ONE_MINUS_SRC_ALPHA))
+#define TEXENV_SETUP_ARG_A(param, source, operand, iteratedAlpha)   \
+    switch (source) {                                               \
+    case GL_TEXTURE:                                                \
+        param = GR_CMBX_LOCAL_TEXTURE_ALPHA;                        \
+        break;                                                      \
+    case GL_CONSTANT_EXT:                                           \
+        param = GR_CMBX_TMU_CALPHA;                                 \
+        break;                                                      \
+    case GL_PRIMARY_COLOR_EXT:                                      \
+        param = GR_CMBX_ITALPHA;                                    \
+        break;                                                      \
+    case GL_PREVIOUS_EXT:                                           \
+        param = iteratedAlpha;                                      \
+        break;                                                      \
+    default:                                                        \
+       /*                                                           \
+        * This is here just to keep from getting                    \
+        * compiler warnings.                                        \
+        */                                                          \
+        param = GR_CMBX_ZERO;                                       \
+        break;                                                      \
+    }
+
+#define TEXENV_SETUP_ARG_RGB(param, source, operand, iteratedColor, iteratedAlpha) \
+    if (!TEXENV_OPERAND_ALPHA(operand)) {                           \
+        switch (source) {                                           \
+        case GL_TEXTURE:                                            \
+            param = GR_CMBX_LOCAL_TEXTURE_RGB;                      \
+            break;                                                  \
+        case GL_CONSTANT_EXT:                                       \
+            param = GR_CMBX_TMU_CCOLOR;                             \
+            break;                                                  \
+        case GL_PRIMARY_COLOR_EXT:                                  \
+            param = GR_CMBX_ITRGB;                                  \
+            break;                                                  \
+        case GL_PREVIOUS_EXT:                                       \
+            param = iteratedColor;                                  \
+            break;                                                  \
+        default:                                                    \
+           /*                                                       \
+            * This is here just to keep from getting                \
+            * compiler warnings.                                    \
+            */                                                      \
+            param = GR_CMBX_ZERO;                                   \
+            break;                                                  \
+        }                                                           \
+    } else {                                                        \
+        switch (source) {                                           \
+        case GL_TEXTURE:                                            \
+            param = GR_CMBX_LOCAL_TEXTURE_ALPHA;                    \
+            break;                                                  \
+        case GL_CONSTANT_EXT:                                       \
+            param = GR_CMBX_TMU_CALPHA;                             \
+            break;                                                  \
+        case GL_PRIMARY_COLOR_EXT:                                  \
+            param = GR_CMBX_ITALPHA;                                \
+            break;                                                  \
+        case GL_PREVIOUS_EXT:                                       \
+            param = iteratedAlpha;                                  \
+            break;                                                  \
+        default:                                                    \
+           /*                                                       \
+            * This is here just to keep from getting                \
+            * compiler warnings.                                    \
+            */                                                      \
+            param = GR_CMBX_ZERO;                                   \
+            break;                                                  \
+        }                                                           \
+    }
+
+#define TEXENV_SETUP_MODE_RGB(param, operand)                       \
+    switch (operand) {                                              \
+    case GL_SRC_COLOR:                                              \
+    case GL_SRC_ALPHA:                                              \
+        param = GR_FUNC_MODE_X;                                     \
+        break;                                                      \
+    case GL_ONE_MINUS_SRC_ALPHA:                                    \
+    case GL_ONE_MINUS_SRC_COLOR:                                    \
+        param = GR_FUNC_MODE_ONE_MINUS_X;                           \
+        break;                                                      \
+    default:                                                        \
+        param = GR_FUNC_MODE_ZERO;                                  \
+        break;                                                      \
+    }
+
+#define TEXENV_SETUP_MODE_A(param, operand)                         \
+    switch (operand) {                                              \
+    case GL_SRC_ALPHA:                                              \
+        param = GR_FUNC_MODE_X;                                     \
+        break;                                                      \
+    case GL_ONE_MINUS_SRC_ALPHA:                                    \
+        param = GR_FUNC_MODE_ONE_MINUS_X;                           \
+        break;                                                      \
+    default:                                                        \
+        param = GR_FUNC_MODE_ZERO;                                  \
+        break;                                                      \
+    }
+
+static void
+fxSetupTextureEnvNapalm_NoLock(GLcontext * ctx, GLuint textureset, GLuint tmu, GLboolean iterated)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[textureset];
+   struct tdfx_combine_alpha_ext alphaComb;
+   struct tdfx_combine_color_ext colorComb;
+   const GLfloat *envColor = texUnit->EnvColor;
+   GrCombineLocal_t localc, locala; /* fragmentColor/Alpha */
+   GLint ifmt;
+   tfxTexInfo *ti;
+   struct gl_texture_object *tObj = texUnit->Current2D;
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "fxSetupTextureEnvNapalm_NoLock(unit %u, TMU %u, iterated %d)\n",
+                      textureset, tmu, iterated);
+   }
+
+   ti = fxTMGetTexInfo(tObj);
+
+   ifmt = ti->baseLevelInternalFormat;
+
+   if (iterated) {
+      /* we don't have upstream TMU */
+      locala = GR_CMBX_ITALPHA;
+      localc = GR_CMBX_ITRGB;
+   } else {
+      /* we have upstream TMU */
+      locala = GR_CMBX_OTHER_TEXTURE_ALPHA;
+      localc = GR_CMBX_OTHER_TEXTURE_RGB;
+   }
+
+   alphaComb.InvertD = FXFALSE;
+   alphaComb.Shift   = 0;
+   alphaComb.Invert  = FXFALSE;
+   colorComb.InvertD = FXFALSE;
+   colorComb.Shift   = 0;
+   colorComb.Invert  = FXFALSE;
+
+   switch (texUnit->EnvMode) {
+   case GL_DECAL:
+      alphaComb.SourceA = locala;
+      alphaComb.ModeA   = GR_FUNC_MODE_X;
+      alphaComb.SourceB = GR_CMBX_ZERO;
+      alphaComb.ModeB   = GR_FUNC_MODE_X;
+      alphaComb.SourceC = GR_CMBX_ZERO;
+      alphaComb.InvertC = FXTRUE;
+      alphaComb.SourceD = GR_CMBX_ZERO;
+
+      colorComb.SourceA = GR_CMBX_LOCAL_TEXTURE_RGB;
+      colorComb.ModeA   = GR_FUNC_MODE_X;
+      colorComb.SourceB = localc;
+      colorComb.ModeB   = GR_FUNC_MODE_NEGATIVE_X;
+      colorComb.SourceC = GR_CMBX_LOCAL_TEXTURE_ALPHA;
+      colorComb.InvertC = FXFALSE;
+      colorComb.SourceD = GR_CMBX_B;
+      break;
+   case GL_MODULATE:
+      if (ifmt == GL_LUMINANCE || ifmt == GL_RGB) {
+         alphaComb.SourceA = locala;
+         alphaComb.ModeA   = GR_FUNC_MODE_X;
+         alphaComb.SourceB = GR_CMBX_ZERO;
+         alphaComb.ModeB   = GR_FUNC_MODE_X;
+         alphaComb.SourceC = GR_CMBX_ZERO;
+         alphaComb.InvertC = FXTRUE;
+         alphaComb.SourceD = GR_CMBX_ZERO;
+      } else {
+         alphaComb.SourceA = locala;
+         alphaComb.ModeA   = GR_FUNC_MODE_X;
+         alphaComb.SourceB = GR_CMBX_ZERO;
+         alphaComb.ModeB   = GR_FUNC_MODE_X;
+         alphaComb.SourceC = GR_CMBX_LOCAL_TEXTURE_ALPHA;
+         alphaComb.InvertC = FXFALSE;
+         alphaComb.SourceD = GR_CMBX_ZERO;
+      }
+
+      if (ifmt == GL_ALPHA) {
+         colorComb.SourceA = localc;
+         colorComb.ModeA   = GR_FUNC_MODE_X;
+         colorComb.SourceB = GR_CMBX_ZERO;
+         colorComb.ModeB   = GR_FUNC_MODE_X;
+         colorComb.SourceC = GR_CMBX_ZERO;
+         colorComb.InvertC = FXTRUE;
+         colorComb.SourceD = GR_CMBX_ZERO;
+      } else {
+         colorComb.SourceA = localc;
+         colorComb.ModeA   = GR_FUNC_MODE_X;
+         colorComb.SourceB = GR_CMBX_ZERO;
+         colorComb.ModeB   = GR_FUNC_MODE_X;
+         colorComb.SourceC = GR_CMBX_LOCAL_TEXTURE_RGB;
+         colorComb.InvertC = FXFALSE;
+         colorComb.SourceD = GR_CMBX_ZERO;
+      }
+      break;
+   case GL_BLEND:
+      if (ifmt == GL_INTENSITY) {
+         alphaComb.SourceA = GR_CMBX_TMU_CALPHA;
+         alphaComb.ModeA   = GR_FUNC_MODE_X;
+         alphaComb.SourceB = locala;
+         alphaComb.ModeB   = GR_FUNC_MODE_X;
+         alphaComb.SourceC = GR_CMBX_LOCAL_TEXTURE_ALPHA;
+         alphaComb.InvertC = FXFALSE;
+         alphaComb.SourceD = GR_CMBX_ZERO;
+      } else {
+         alphaComb.SourceA = locala;
+         alphaComb.ModeA   = GR_FUNC_MODE_X;
+         alphaComb.SourceB = GR_CMBX_ZERO;
+         alphaComb.ModeB   = GR_FUNC_MODE_X;
+         alphaComb.SourceC = GR_CMBX_LOCAL_TEXTURE_ALPHA;
+         alphaComb.InvertC = FXFALSE;
+         alphaComb.SourceD = GR_CMBX_ZERO;
+      }
+
+      if (ifmt == GL_ALPHA) {
+         colorComb.SourceA = localc;
+         colorComb.ModeA   = GR_FUNC_MODE_X;
+         colorComb.SourceB = GR_CMBX_ZERO;
+         colorComb.ModeB   = GR_FUNC_MODE_X;
+         colorComb.SourceC = GR_CMBX_ZERO;
+         colorComb.InvertC = FXTRUE;
+         colorComb.SourceD = GR_CMBX_ZERO;
+      } else {
+         colorComb.SourceA = GR_CMBX_TMU_CCOLOR;
+         colorComb.ModeA   = GR_FUNC_MODE_X;
+         colorComb.SourceB = localc;
+         colorComb.ModeB   = GR_FUNC_MODE_NEGATIVE_X;
+         colorComb.SourceC = GR_CMBX_LOCAL_TEXTURE_RGB;
+         colorComb.InvertC = FXFALSE;
+         colorComb.SourceD = GR_CMBX_B;
+      }
+
+      fxMesa->Glide.grConstantColorValueExt(tmu,
+         (((GLuint)(envColor[0] * 255.0f))      ) |
+         (((GLuint)(envColor[1] * 255.0f)) <<  8) |
+         (((GLuint)(envColor[2] * 255.0f)) << 16) |
+         (((GLuint)(envColor[3] * 255.0f)) << 24));
+      break;
+   case GL_REPLACE:
+      if (ifmt == GL_LUMINANCE || ifmt == GL_RGB) {
+         alphaComb.SourceA = locala;
+         alphaComb.ModeA   = GR_FUNC_MODE_X;
+         alphaComb.SourceB = GR_CMBX_ZERO;
+         alphaComb.ModeB   = GR_FUNC_MODE_X;
+         alphaComb.SourceC = GR_CMBX_ZERO;
+         alphaComb.InvertC = FXTRUE;
+         alphaComb.SourceD = GR_CMBX_ZERO;
+      } else {
+         alphaComb.SourceA = GR_CMBX_LOCAL_TEXTURE_ALPHA;
+         alphaComb.ModeA   = GR_FUNC_MODE_X;
+         alphaComb.SourceB = GR_CMBX_ZERO;
+         alphaComb.ModeB   = GR_FUNC_MODE_X;
+         alphaComb.SourceC = GR_CMBX_ZERO;
+         alphaComb.InvertC = FXTRUE;
+         alphaComb.SourceD = GR_CMBX_ZERO;
+      }
+
+      if (ifmt == GL_ALPHA) {
+         colorComb.SourceA = localc;
+         colorComb.ModeA   = GR_FUNC_MODE_X;
+         colorComb.SourceB = GR_CMBX_ZERO;
+         colorComb.ModeB   = GR_FUNC_MODE_X;
+         colorComb.SourceC = GR_CMBX_ZERO;
+         colorComb.InvertC = FXTRUE;
+         colorComb.SourceD = GR_CMBX_ZERO;
+      } else {
+         colorComb.SourceA = GR_CMBX_LOCAL_TEXTURE_RGB;
+         colorComb.ModeA   = GR_FUNC_MODE_X;
+         colorComb.SourceB = GR_CMBX_ZERO;
+         colorComb.ModeB   = GR_FUNC_MODE_X;
+         colorComb.SourceC = GR_CMBX_ZERO;
+         colorComb.InvertC = FXTRUE;
+         colorComb.SourceD = GR_CMBX_ZERO;
+      }
+      break;
+   case GL_ADD:
+      if (ifmt == GL_LUMINANCE || ifmt == GL_RGB) {
+         alphaComb.SourceA = locala;
+         alphaComb.ModeA   = GR_FUNC_MODE_X;
+         alphaComb.SourceB = GR_CMBX_ZERO;
+         alphaComb.ModeB   = GR_FUNC_MODE_X;
+         alphaComb.SourceC = GR_CMBX_ZERO;
+         alphaComb.InvertC = FXTRUE;
+         alphaComb.SourceD = GR_CMBX_ZERO;
+      } else if (ifmt == GL_INTENSITY) {
+         alphaComb.SourceA = locala;
+         alphaComb.ModeA   = GR_FUNC_MODE_X;
+         alphaComb.SourceB = GR_CMBX_LOCAL_TEXTURE_ALPHA;
+         alphaComb.ModeB   = GR_FUNC_MODE_X;
+         alphaComb.SourceC = GR_CMBX_ZERO;
+         alphaComb.InvertC = FXTRUE;
+         alphaComb.SourceD = GR_CMBX_ZERO;
+      } else {
+         alphaComb.SourceA = locala;
+         alphaComb.ModeA   = GR_FUNC_MODE_X;
+         alphaComb.SourceB = GR_CMBX_ZERO;
+         alphaComb.ModeB   = GR_FUNC_MODE_X;
+         alphaComb.SourceC = GR_CMBX_LOCAL_TEXTURE_ALPHA;
+         alphaComb.InvertC = FXFALSE;
+         alphaComb.SourceD = GR_CMBX_ZERO;
+      }
+
+      if (ifmt == GL_ALPHA) {
+         colorComb.SourceA = localc;
+         colorComb.ModeA   = GR_FUNC_MODE_X;
+         colorComb.SourceB = GR_CMBX_ZERO;
+         colorComb.ModeB   = GR_FUNC_MODE_X;
+         colorComb.SourceC = GR_CMBX_ZERO;
+         colorComb.InvertC = FXTRUE;
+         colorComb.SourceD = GR_CMBX_ZERO;
+      } else {
+         colorComb.SourceA = localc;
+         colorComb.ModeA   = GR_FUNC_MODE_X;
+         colorComb.SourceB = GR_CMBX_LOCAL_TEXTURE_RGB;
+         colorComb.ModeB   = GR_FUNC_MODE_X;
+         colorComb.SourceC = GR_CMBX_ZERO;
+         colorComb.InvertC = FXTRUE;
+         colorComb.SourceD = GR_CMBX_ZERO;
+      }
+      break;
+    /* COMBINE_EXT */
+    case GL_COMBINE_EXT:
+      /* [dBorca] Hack alert:
+       * INCOMPLETE!!!
+       */
+      if (TDFX_DEBUG & (VERBOSE_DRIVER | VERBOSE_TEXTURE)) {
+#if 1
+         fprintf(stderr, "COMBINE_EXT: %s + %s\n",
+	      _mesa_lookup_enum_by_nr(texUnit->CombineModeRGB),
+	      _mesa_lookup_enum_by_nr(texUnit->CombineModeA));
+#else
+         fprintf(stderr, "Texture Unit %d\n", textureset);
+         fprintf(stderr, "  GL_TEXTURE_ENV_MODE = %s\n", _mesa_lookup_enum_by_nr(texUnit->EnvMode));
+         fprintf(stderr, "  GL_COMBINE_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->CombineModeRGB));
+         fprintf(stderr, "  GL_COMBINE_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->CombineModeA));
+         fprintf(stderr, "  GL_SOURCE0_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->CombineSourceRGB[0]));
+         fprintf(stderr, "  GL_SOURCE1_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->CombineSourceRGB[1]));
+         fprintf(stderr, "  GL_SOURCE2_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->CombineSourceRGB[2]));
+         fprintf(stderr, "  GL_SOURCE0_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->CombineSourceA[0]));
+         fprintf(stderr, "  GL_SOURCE1_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->CombineSourceA[1]));
+         fprintf(stderr, "  GL_SOURCE2_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->CombineSourceA[2]));
+         fprintf(stderr, "  GL_OPERAND0_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->CombineOperandRGB[0]));
+         fprintf(stderr, "  GL_OPERAND1_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->CombineOperandRGB[1]));
+         fprintf(stderr, "  GL_OPERAND2_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->CombineOperandRGB[2]));
+         fprintf(stderr, "  GL_OPERAND0_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->CombineOperandA[0]));
+         fprintf(stderr, "  GL_OPERAND1_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->CombineOperandA[1]));
+         fprintf(stderr, "  GL_OPERAND2_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->CombineOperandA[2]));
+         fprintf(stderr, "  GL_RGB_SCALE = %d\n", 1 << texUnit->CombineScaleShiftRGB);
+         fprintf(stderr, "  GL_ALPHA_SCALE = %d\n", 1 << texUnit->CombineScaleShiftA);
+         fprintf(stderr, "  GL_TEXTURE_ENV_COLOR = (%f, %f, %f, %f)\n", envColor[0], envColor[1], envColor[2], envColor[3]);
+#endif
+      }
+
+      alphaComb.Shift   = texUnit->CombineScaleShiftA;
+      colorComb.Shift   = texUnit->CombineScaleShiftRGB;
+
+      switch (texUnit->CombineModeRGB) {
+             case GL_MODULATE:
+                  /* Arg0 * Arg1 == (A + 0) * C + 0 */
+                  TEXENV_SETUP_ARG_RGB(colorComb.SourceA,
+                                       texUnit->CombineSourceRGB[0],
+                                       texUnit->CombineOperandRGB[0],
+                                       localc, locala);
+                  TEXENV_SETUP_MODE_RGB(colorComb.ModeA,
+                                        texUnit->CombineOperandRGB[0]);
+                  colorComb.SourceB = GR_CMBX_ZERO;
+                  colorComb.ModeB   = GR_FUNC_MODE_ZERO;
+                  TEXENV_SETUP_ARG_RGB(colorComb.SourceC,
+                                       texUnit->CombineSourceRGB[1],
+                                       texUnit->CombineOperandRGB[1],
+                                       localc, locala);
+                  colorComb.InvertC = TEXENV_OPERAND_INVERTED(
+                                       texUnit->CombineOperandRGB[1]);
+                  colorComb.SourceD = GR_CMBX_ZERO;
+                  break;
+             case GL_REPLACE:
+                  /* Arg0 == (A + 0) * 1 + 0 */
+                  TEXENV_SETUP_ARG_RGB(colorComb.SourceA,
+                                       texUnit->CombineSourceRGB[0],
+                                       texUnit->CombineOperandRGB[0],
+                                       localc, locala);
+                  TEXENV_SETUP_MODE_RGB(colorComb.ModeA,
+                                        texUnit->CombineOperandRGB[0]);
+                  colorComb.SourceB = GR_CMBX_ZERO;
+                  colorComb.ModeB   = GR_FUNC_MODE_ZERO;
+                  colorComb.SourceC = GR_CMBX_ZERO;
+                  colorComb.InvertC = FXTRUE;
+                  colorComb.SourceD = GR_CMBX_ZERO;
+                  break;
+             case GL_ADD:
+                  /* Arg0 + Arg1 = (A + B) * 1 + 0 */
+                  TEXENV_SETUP_ARG_RGB(colorComb.SourceA,
+                                       texUnit->CombineSourceRGB[0],
+                                       texUnit->CombineOperandRGB[0],
+                                       localc, locala);
+                  TEXENV_SETUP_MODE_RGB(colorComb.ModeA,
+                                        texUnit->CombineOperandRGB[0]);
+                  TEXENV_SETUP_ARG_RGB(colorComb.SourceB,
+                                       texUnit->CombineSourceRGB[1],
+                                       texUnit->CombineOperandRGB[1],
+                                       localc, locala);
+                  TEXENV_SETUP_MODE_RGB(colorComb.ModeB,
+                                        texUnit->CombineOperandRGB[1]);
+                  colorComb.SourceC = GR_CMBX_ZERO;
+                  colorComb.InvertC = FXTRUE;
+                  colorComb.SourceD = GR_CMBX_ZERO;
+                  break;
+             case GL_INTERPOLATE_EXT:
+                  /* Arg0 * Arg2 + Arg1 * (1 - Arg2) ==
+                   * (Arg0 - Arg1) * Arg2 + Arg1 == (A - B) * C + D
+                   */
+                  TEXENV_SETUP_ARG_RGB(colorComb.SourceA,
+                                       texUnit->CombineSourceRGB[0],
+                                       texUnit->CombineOperandRGB[0],
+                                       localc, locala);
+                  TEXENV_SETUP_MODE_RGB(colorComb.ModeA,
+                                        texUnit->CombineOperandRGB[0]);
+                  TEXENV_SETUP_ARG_RGB(colorComb.SourceB,
+                                       texUnit->CombineSourceRGB[1],
+                                       texUnit->CombineOperandRGB[1],
+                                       localc, locala);
+                  if (TEXENV_OPERAND_INVERTED(texUnit->CombineOperandRGB[1])) {
+                     /* Hack alert!!! This case is wrong!!! */
+                     fprintf(stderr, "COMBINE_EXT_color: WRONG!!!\n");
+                     colorComb.ModeB = GR_FUNC_MODE_NEGATIVE_X;
+                  } else {
+                     colorComb.ModeB = GR_FUNC_MODE_NEGATIVE_X;
+                  }
+                  /*
+                   * The Source/Operand for the C value must
+                   * specify some kind of alpha value.
+                   */
+                  TEXENV_SETUP_ARG_A(colorComb.SourceC,
+                                     texUnit->CombineSourceRGB[2],
+                                     texUnit->CombineOperandRGB[2],
+                                     locala);
+                  colorComb.InvertC = FXFALSE;
+                  colorComb.SourceD = GR_CMBX_B;
+                  break;
+             default:
+                  fprintf(stderr, "COMBINE_EXT_color: %s\n",
+                                  _mesa_lookup_enum_by_nr(texUnit->CombineModeRGB));
+      }
+
+      switch (texUnit->CombineModeA) {
+             case GL_MODULATE:
+                  /* Arg0 * Arg1 == (A + 0) * C + 0 */
+                  TEXENV_SETUP_ARG_A(alphaComb.SourceA,
+                                     texUnit->CombineSourceA[0],
+                                     texUnit->CombineOperandA[0],
+                                     locala);
+                  TEXENV_SETUP_MODE_A(alphaComb.ModeA,
+                                      texUnit->CombineOperandA[0]);
+                  alphaComb.SourceB = GR_CMBX_ZERO;
+                  alphaComb.ModeB   = GR_FUNC_MODE_ZERO;
+                  TEXENV_SETUP_ARG_A(alphaComb.SourceC,
+                                     texUnit->CombineSourceA[1],
+                                     texUnit->CombineOperandA[1],
+                                     locala);
+                  alphaComb.InvertC = TEXENV_OPERAND_INVERTED(
+                                       texUnit->CombineOperandA[1]);
+                  alphaComb.SourceD = GR_CMBX_ZERO;
+                  break;
+             case GL_REPLACE:
+                 /* Arg0 == (A + 0) * 1 + 0 */
+                  TEXENV_SETUP_ARG_A(alphaComb.SourceA,
+                                     texUnit->CombineSourceA[0],
+                                     texUnit->CombineOperandA[0],
+                                     locala);
+                  TEXENV_SETUP_MODE_A(alphaComb.ModeA,
+                                      texUnit->CombineOperandA[0]);
+                  alphaComb.SourceB = GR_CMBX_ZERO;
+                  alphaComb.ModeB   = GR_FUNC_MODE_ZERO;
+                  alphaComb.SourceC = GR_CMBX_ZERO;
+                  alphaComb.InvertC = FXTRUE;
+                  alphaComb.SourceD = GR_CMBX_ZERO;
+                  break;
+             case GL_ADD:
+                  /* Arg0 + Arg1 = (A + B) * 1 + 0 */
+                  TEXENV_SETUP_ARG_A(alphaComb.SourceA,
+                                     texUnit->CombineSourceA[0],
+                                     texUnit->CombineOperandA[0],
+                                     locala);
+                  TEXENV_SETUP_MODE_A(alphaComb.ModeA,
+                                      texUnit->CombineOperandA[0]);
+                  TEXENV_SETUP_ARG_A(alphaComb.SourceB,
+                                     texUnit->CombineSourceA[1],
+                                     texUnit->CombineOperandA[1],
+                                     locala);
+                  TEXENV_SETUP_MODE_A(alphaComb.ModeB,
+                                      texUnit->CombineOperandA[1]);
+                  alphaComb.SourceC = GR_CMBX_ZERO;
+                  alphaComb.InvertC = FXTRUE;
+                  alphaComb.SourceD = GR_CMBX_ZERO;
+                  break;
+             default:
+                  fprintf(stderr, "COMBINE_EXT_alpha: %s\n",
+                                  _mesa_lookup_enum_by_nr(texUnit->CombineModeA));
+      }
+
+      fxMesa->Glide.grConstantColorValueExt(tmu,
+         (((GLuint)(envColor[0] * 255.0f))      ) |
+         (((GLuint)(envColor[1] * 255.0f)) <<  8) |
+         (((GLuint)(envColor[2] * 255.0f)) << 16) |
+         (((GLuint)(envColor[3] * 255.0f)) << 24));
+      break;
+#if 0
+        {
+            FxU32 A_RGB, B_RGB, C_RGB, D_RGB;
+            FxU32 Amode_RGB, Bmode_RGB;
+            FxBool Cinv_RGB, Dinv_RGB, Ginv_RGB;
+            FxU32 Shift_RGB;
+            FxU32 A_A, B_A, C_A, D_A;
+            FxU32 Amode_A, Bmode_A;
+            FxBool Cinv_A, Dinv_A, Ginv_A;
+            FxU32 Shift_A;
+
+           /*
+            *
+            * In the formulas below, we write:
+            *  o "1(x)" for the identity function applied to x,
+            *    so 1(x) = x.
+            *  o "0(x)" for the constant function 0, so
+            *    0(x) = 0 for all values of x.
+            *
+            * Calculate the color combination.
+            */
+            Shift_RGB = texUnit->CombineScaleShiftRGB;
+            Shift_A = texUnit->CombineScaleShiftA;
+            switch (texUnit->CombineModeRGB) {
+            case GL_REPLACE:
+               /*
+                * The formula is: Arg0
+                * We implement this by the formula:
+                *   (Arg0 + 0(0))*(1-0) + 0
+                */
+                TEXENV_SETUP_ARG_RGB(A_RGB,
+                                     texUnit->CombineSourceRGB[0],
+                                     texUnit->CombineOperandRGB[0],
+                                     incomingRGB, incomingAlpha);
+                TEXENV_SETUP_MODE_RGB(Amode_RGB,
+                                      texUnit->CombineOperandRGB[0]);
+                B_RGB = C_RGB = D_RGB = GR_CMBX_ZERO;
+                Bmode_RGB = GR_FUNC_MODE_ZERO;
+                Cinv_RGB = FXTRUE;
+                Dinv_RGB = Ginv_RGB = FXFALSE;
+                break;
+            case GL_MODULATE:
+               /*
+                * The formula is: Arg0 * Arg1
+                *
+                * We implement this by the formula
+                *   (Arg0 + 0(0)) * Arg1 + 0(0)
+                */
+                TEXENV_SETUP_ARG_RGB(A_RGB,
+                                     texUnit->CombineSourceRGB[0],
+                                     texUnit->CombineOperandRGB[0],
+                                     incomingRGB, incomingAlpha);
+                TEXENV_SETUP_MODE_RGB(Amode_RGB,
+                                      texUnit->CombineOperandRGB[0]);
+                B_RGB = GR_CMBX_ZERO;
+                Bmode_RGB = GR_CMBX_ZERO;
+                TEXENV_SETUP_ARG_RGB(C_RGB,
+                                     texUnit->CombineSourceRGB[1],
+                                     texUnit->CombineOperandRGB[1],
+                                     incomingRGB, incomingAlpha);
+                Cinv_RGB = TEXENV_OPERAND_INVERTED
+                               (texUnit->CombineOperandRGB[1]);
+                D_RGB = GR_CMBX_ZERO;
+                Dinv_RGB = Ginv_RGB = FXFALSE;
+                break;
+            case GL_ADD:
+               /*
+                * The formula is Arg0 + Arg1
+                */
+                TEXENV_SETUP_ARG_RGB(A_RGB,
+                                     texUnit->CombineSourceRGB[0],
+                                     texUnit->CombineOperandRGB[0],
+                                     incomingRGB, incomingAlpha);
+                TEXENV_SETUP_MODE_RGB(Amode_RGB,
+                                      texUnit->CombineOperandRGB[0]);
+                TEXENV_SETUP_ARG_RGB(B_RGB,
+                                     texUnit->CombineSourceRGB[1],
+                                     texUnit->CombineOperandRGB[1],
+                                     incomingRGB, incomingAlpha);
+                TEXENV_SETUP_MODE_RGB(Bmode_RGB,
+                                      texUnit->CombineOperandRGB[1]);
+                C_RGB = D_RGB = GR_CMBX_ZERO;
+                Cinv_RGB = FXTRUE;
+                Dinv_RGB = Ginv_RGB = FXFALSE;
+                break;
+            case GL_ADD_SIGNED_EXT:
+               /*
+                * The formula is: Arg0 + Arg1 - 0.5.
+                * We compute this by calculating:
+                *      (Arg0 - 1/2) + Arg1         if op0 is SRC_{COLOR,ALPHA}
+                *      Arg0 + (Arg1 - 1/2)         if op1 is SRC_{COLOR,ALPHA}
+                * If both op0 and op1 are ONE_MINUS_SRC_{COLOR,ALPHA}
+                * we cannot implement the formula properly.
+                */
+                TEXENV_SETUP_ARG_RGB(A_RGB,
+                                     texUnit->CombineSourceRGB[0],
+                                     texUnit->CombineOperandRGB[0],
+                                     incomingRGB, incomingAlpha);
+                TEXENV_SETUP_ARG_RGB(B_RGB,
+                                     texUnit->CombineSourceRGB[1],
+                                     texUnit->CombineOperandRGB[1],
+                                     incomingRGB, incomingAlpha);
+                if (!TEXENV_OPERAND_INVERTED(texUnit->CombineOperandRGB[0])) {
+                   /*
+                    * A is not inverted.  So, choose it.
+                    */
+                    Amode_RGB = GR_FUNC_MODE_X_MINUS_HALF;
+                    if (!TEXENV_OPERAND_INVERTED
+                            (texUnit->CombineOperandRGB[1])) {
+                        Bmode_RGB = GR_FUNC_MODE_X;
+                    }
+                    else {
+                        Bmode_RGB = GR_FUNC_MODE_ONE_MINUS_X;
+                    }
+                }
+                else {
+                   /*
+                    * A is inverted, so try to subtract 1/2
+                    * from B.
+                    */
+                    Amode_RGB = GR_FUNC_MODE_ONE_MINUS_X;
+                    if (!TEXENV_OPERAND_INVERTED
+                            (texUnit->CombineOperandRGB[1])) {
+                        Bmode_RGB = GR_FUNC_MODE_X_MINUS_HALF;
+                    }
+                    else {
+                       /*
+                        * Both are inverted.  This is the case
+                        * we cannot handle properly.  We just
+                        * choose to not add the - 1/2.
+                        */
+                        Bmode_RGB = GR_FUNC_MODE_ONE_MINUS_X;
+                        return GL_FALSE;
+                    }
+                }
+                C_RGB = D_RGB = GR_CMBX_ZERO;
+                Cinv_RGB = FXTRUE;
+                Dinv_RGB = Ginv_RGB = FXFALSE;
+                break;
+            case GL_INTERPOLATE_EXT:
+               /*
+                * The formula is: Arg0 * Arg2 + Arg1 * (1 - Arg2).
+                * We compute this by the formula:
+                *            (Arg0 - Arg1) * Arg2 + Arg1
+                *               == Arg0 * Arg2 - Arg1 * Arg2 + Arg1
+                *               == Arg0 * Arg2 + Arg1 * (1 - Arg2)
+                * However, if both Arg1 is ONE_MINUS_X, the HW does
+                * not support it properly.
+                */
+                TEXENV_SETUP_ARG_RGB(A_RGB,
+                                     texUnit->CombineSourceRGB[0],
+                                     texUnit->CombineOperandRGB[0],
+                                     incomingRGB, incomingAlpha);
+                TEXENV_SETUP_MODE_RGB(Amode_RGB,
+                                      texUnit->CombineOperandRGB[0]);
+                TEXENV_SETUP_ARG_RGB(B_RGB,
+                                     texUnit->CombineSourceRGB[1],
+                                     texUnit->CombineOperandRGB[1],
+                                     incomingRGB, incomingAlpha);
+                if (TEXENV_OPERAND_INVERTED(texUnit->CombineOperandRGB[1])) {
+                   /*
+                    * This case is wrong.
+                    */
+                   Bmode_RGB = GR_FUNC_MODE_NEGATIVE_X;
+                   return GL_FALSE;
+                }
+                else {
+                    Bmode_RGB = GR_FUNC_MODE_NEGATIVE_X;
+                }
+               /*
+                * The Source/Operand for the C value must
+                * specify some kind of alpha value.
+                */
+                TEXENV_SETUP_ARG_A(C_RGB,
+                                   texUnit->CombineSourceRGB[2],
+                                   texUnit->CombineOperandRGB[2],
+                                   incomingAlpha);
+                Cinv_RGB = FXFALSE;
+                D_RGB = GR_CMBX_B;
+                Dinv_RGB = Ginv_RGB = FXFALSE;
+                break;
+            default:
+               /*
+                * This is here mostly to keep from getting
+                * a compiler warning about these not being set.
+                * However, this should set all the texture values
+                * to zero.
+                */
+                A_RGB = B_RGB = C_RGB = D_RGB = GR_CMBX_ZERO;
+                Amode_RGB = Bmode_RGB = GR_FUNC_MODE_X;
+                Cinv_RGB = Dinv_RGB = Ginv_RGB = FXFALSE;
+                break;
+            }
+           /*
+            * Calculate the alpha combination.
+            */
+            switch (texUnit->CombineModeA) {
+            case GL_REPLACE:
+               /*
+                * The formula is: Arg0
+                * We implement this by the formula:
+                *   (Arg0 + 0(0))*(1-0) + 0
+                */
+                TEXENV_SETUP_ARG_A(A_A,
+                                   texUnit->CombineSourceA[0],
+                                   texUnit->CombineOperandA[0],
+                                   incomingAlpha);
+                TEXENV_SETUP_MODE_A(Amode_A,
+                                    texUnit->CombineOperandA[0]);
+                B_A = GR_CMBX_ITALPHA;
+                Bmode_A = GR_FUNC_MODE_ZERO;
+                C_A = D_A = GR_CMBX_ZERO;
+                Cinv_A = FXTRUE;
+                Dinv_A = Ginv_A = FXFALSE;
+                break;
+            case GL_MODULATE:
+               /*
+                * The formula is: Arg0 * Arg1
+                *
+                * We implement this by the formula
+                *   (Arg0 + 0(0)) * Arg1 + 0(0)
+                */
+                TEXENV_SETUP_ARG_A(A_A,
+                                   texUnit->CombineSourceA[0],
+                                   texUnit->CombineOperandA[0],
+                                   incomingAlpha);
+                TEXENV_SETUP_MODE_A(Amode_A,
+                                    texUnit->CombineOperandA[0]);
+                B_A = GR_CMBX_ZERO;
+                Bmode_A = GR_CMBX_ZERO;
+                TEXENV_SETUP_ARG_A(C_A,
+                                   texUnit->CombineSourceA[1],
+                                   texUnit->CombineOperandA[1],
+                                   incomingAlpha);
+                Cinv_A = TEXENV_OPERAND_INVERTED
+                               (texUnit->CombineOperandA[1]);
+                D_A = GR_CMBX_ZERO;
+                Dinv_A = Ginv_A = FXFALSE;
+                break;
+            case GL_ADD:
+               /*
+                * The formula is Arg0 + Arg1
+                */
+                TEXENV_SETUP_ARG_A(A_A,
+                                   texUnit->CombineSourceA[0],
+                                   texUnit->CombineOperandA[0],
+                                   incomingAlpha);
+                TEXENV_SETUP_MODE_A(Amode_A,
+                                    texUnit->CombineOperandA[0]);
+                TEXENV_SETUP_ARG_A(B_A,
+                                   texUnit->CombineSourceA[1],
+                                   texUnit->CombineOperandA[1],
+                                   incomingAlpha);
+                TEXENV_SETUP_MODE_A(Bmode_A,
+                                    texUnit->CombineOperandA[1]);
+                C_A = D_A = GR_CMBX_ZERO;
+                Cinv_A = FXTRUE;
+                Dinv_A = Ginv_A = FXFALSE;
+                break;
+            case GL_ADD_SIGNED_EXT:
+               /*
+                * The formula is: Arg0 + Arg1 - 0.5.
+                * We compute this by calculating:
+                *      (Arg0 - 1/2) + Arg1         if op0 is SRC_{COLOR,ALPHA}
+                *      Arg0 + (Arg1 - 1/2)         if op1 is SRC_{COLOR,ALPHA}
+                * If both op0 and op1 are ONE_MINUS_SRC_{COLOR,ALPHA}
+                * we cannot implement the formula properly.
+                */
+                TEXENV_SETUP_ARG_A(A_A,
+                                   texUnit->CombineSourceA[0],
+                                   texUnit->CombineOperandA[0],
+                                   incomingAlpha);
+                TEXENV_SETUP_ARG_A(B_A,
+                                   texUnit->CombineSourceA[1],
+                                   texUnit->CombineOperandA[1],
+                                   incomingAlpha);
+                if (!TEXENV_OPERAND_INVERTED(texUnit->CombineOperandA[0])) {
+                   /*
+                    * A is not inverted.  So, choose it.
+                    */
+                    Amode_A = GR_FUNC_MODE_X_MINUS_HALF;
+                    if (!TEXENV_OPERAND_INVERTED
+                            (texUnit->CombineOperandA[1])) {
+                        Bmode_A = GR_FUNC_MODE_X;
+                    } else {
+                        Bmode_A = GR_FUNC_MODE_ONE_MINUS_X;
+                    }
+                } else {
+                   /*
+                    * A is inverted, so try to subtract 1/2
+                    * from B.
+                    */
+                    Amode_A = GR_FUNC_MODE_ONE_MINUS_X;
+                    if (!TEXENV_OPERAND_INVERTED
+                            (texUnit->CombineOperandA[1])) {
+                        Bmode_A = GR_FUNC_MODE_X_MINUS_HALF;
+                    } else {
+                       /*
+                        * Both are inverted.  This is the case
+                        * we cannot handle properly.  We just
+                        * choose to not add the - 1/2.
+                        */
+                        Bmode_A = GR_FUNC_MODE_ONE_MINUS_X;
+                        return GL_FALSE;
+                    }
+                }
+                C_A = D_A = GR_CMBX_ZERO;
+                Cinv_A = FXTRUE;
+                Dinv_A = Ginv_A = FXFALSE;
+                break;
+            case GL_INTERPOLATE_EXT:
+               /*
+                * The formula is: Arg0 * Arg2 + Arg1 * (1 - Arg2).
+                * We compute this by the formula:
+                *            (Arg0 - Arg1) * Arg2 + Arg1
+                *               == Arg0 * Arg2 - Arg1 * Arg2 + Arg1
+                *               == Arg0 * Arg2 + Arg1 * (1 - Arg2)
+                * However, if both Arg1 is ONE_MINUS_X, the HW does
+                * not support it properly.
+                */
+                TEXENV_SETUP_ARG_A(A_A,
+                                   texUnit->CombineSourceA[0],
+                                   texUnit->CombineOperandA[0],
+                                   incomingAlpha);
+                TEXENV_SETUP_MODE_A(Amode_A,
+                                    texUnit->CombineOperandA[0]);
+                TEXENV_SETUP_ARG_A(B_A,
+                                   texUnit->CombineSourceA[1],
+                                   texUnit->CombineOperandA[1],
+                                   incomingAlpha);
+                if (!TEXENV_OPERAND_INVERTED(texUnit->CombineOperandA[1])) {
+                    Bmode_A = GR_FUNC_MODE_NEGATIVE_X;
+                }
+                else {
+                   /*
+                    * This case is wrong.
+                    */
+                    Bmode_A = GR_FUNC_MODE_NEGATIVE_X;
+                    return GL_FALSE;
+                }
+               /*
+                * The Source/Operand for the C value must
+                * specify some kind of alpha value.
+                */
+                TEXENV_SETUP_ARG_A(C_A,
+                                   texUnit->CombineSourceA[2],
+                                   texUnit->CombineOperandA[2],
+                                   incomingAlpha);
+                Cinv_A = FXFALSE;
+                D_A = GR_CMBX_B;
+                Dinv_A = Ginv_A = FXFALSE;
+                break;
+            default:
+               /*
+                * This is here mostly to keep from getting
+                * a compiler warning about these not being set.
+                * However, this should set all the alpha values
+                * to one.
+                */
+                A_A = B_A = C_A = D_A = GR_CMBX_ZERO;
+                Amode_A = Bmode_A = GR_FUNC_MODE_X;
+                Cinv_A = Dinv_A = FXFALSE;
+                Ginv_A = FXTRUE;
+                break;
+            }
+           /*
+            * Save the parameters.
+            */
+            env->Color.SourceA = A_RGB;
+            env->Color.ModeA = Amode_RGB;
+            env->Color.SourceB = B_RGB;
+            env->Color.ModeB = Bmode_RGB;
+            env->Color.SourceC = C_RGB;
+            env->Color.InvertC = Cinv_RGB;
+            env->Color.SourceD = D_RGB;
+            env->Color.InvertD = Dinv_RGB;
+            env->Color.Shift = Shift_RGB;
+            env->Color.Invert = Ginv_RGB;
+            env->Alpha.SourceA = A_A;
+            env->Alpha.ModeA = Amode_A;
+            env->Alpha.SourceB = B_A;
+            env->Alpha.ModeB = Bmode_A;
+            env->Alpha.SourceC = C_A;
+            env->Alpha.InvertC = Cinv_A;
+            env->Alpha.SourceD = D_A;
+            env->Alpha.InvertD = Dinv_A;
+            env->Alpha.Shift = Shift_A;
+            env->Alpha.Invert = Ginv_A;
+            env->EnvColor = PACK_RGBA32(texUnit->EnvColor[0] * 255.0F,
+                                        texUnit->EnvColor[1] * 255.0F,
+                                        texUnit->EnvColor[2] * 255.0F,
+                                        texUnit->EnvColor[3] * 255.0F);
+        }
+        break;
+#endif
+   default:
+      if (TDFX_DEBUG & VERBOSE_DRIVER) {
+	 fprintf(stderr, "fxSetupTextureEnvNapalm_NoLock: %x Texture.EnvMode not yet supported\n",
+		 texUnit->EnvMode);
+      }
+      return;
+   }
+
+   /* On Napalm we simply put the color combine unit into passthrough mode
+    * and do everything we need with the texture combine units. */
+   fxMesa->Glide.grColorCombineExt(GR_CMBX_TEXTURE_RGB,
+                                   GR_FUNC_MODE_X,
+                                   GR_CMBX_ZERO,
+                                   GR_FUNC_MODE_X,
+                                   GR_CMBX_ZERO,
+                                   FXTRUE,
+                                   GR_CMBX_ZERO,
+                                   FXFALSE,
+                                   0,
+                                   FXFALSE);
+   fxMesa->Glide.grAlphaCombineExt(GR_CMBX_TEXTURE_ALPHA,
+                                   GR_FUNC_MODE_X,
+                                   GR_CMBX_ZERO,
+                                   GR_FUNC_MODE_X,
+                                   GR_CMBX_ZERO,
+                                   FXTRUE,
+                                   GR_CMBX_ZERO,
+                                   FXFALSE,
+                                   0,
+                                   FXFALSE);
+
+   fxMesa->Glide.grTexAlphaCombineExt(tmu,
+                                      alphaComb.SourceA,
+                                      alphaComb.ModeA,
+                                      alphaComb.SourceB,
+                                      alphaComb.ModeB,
+                                      alphaComb.SourceC,
+                                      alphaComb.InvertC,
+                                      alphaComb.SourceD,
+                                      alphaComb.InvertD,
+                                      alphaComb.Shift,
+                                      alphaComb.Invert);
+   fxMesa->Glide.grTexColorCombineExt(tmu,
+                                      colorComb.SourceA,
+                                      colorComb.ModeA,
+                                      colorComb.SourceB,
+                                      colorComb.ModeB,
+                                      colorComb.SourceC,
+                                      colorComb.InvertC,
+                                      colorComb.SourceD,
+                                      colorComb.InvertD,
+                                      colorComb.Shift,
+                                      colorComb.Invert);
+}
+
+
+/************************* Single Texture Set ***************************/
+
+static void
+fxSelectSingleTMUSrcNapalm_NoLock(fxMesaContext fxMesa, GLint tmu, FxBool LODblend)
+{
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "fxSelectSingleTMUSrcNapalm_NoLock(%d, %d)\n", tmu, LODblend);
+   }
+
+   if (LODblend) {
+      /* [dBorca] Hack alert:
+       * TODO: GR_CMBX_LOD_FRAC
+       */
+
+      fxMesa->tmuSrc = FX_TMU_SPLIT;
+   }
+   else {
+      if (tmu != FX_TMU1) {
+         /* disable tex1 */
+         if (fxMesa->haveTwoTMUs) {
+            fxMesa->Glide.grTexAlphaCombineExt(FX_TMU1,
+                                               GR_CMBX_ZERO,
+                                               GR_FUNC_MODE_ZERO,
+                                               GR_CMBX_ZERO,
+                                               GR_FUNC_MODE_ZERO,
+                                               GR_CMBX_ZERO,
+                                               FXTRUE,
+                                               GR_CMBX_ZERO,
+                                               FXFALSE,
+                                               0,
+                                               FXFALSE);
+            fxMesa->Glide.grTexColorCombineExt(FX_TMU1,
+                                               GR_CMBX_ZERO,
+                                               GR_FUNC_MODE_ZERO,
+                                               GR_CMBX_ZERO,
+                                               GR_FUNC_MODE_ZERO,
+                                               GR_CMBX_ZERO,
+                                               FXTRUE,
+                                               GR_CMBX_ZERO,
+                                               FXFALSE,
+                                               0,
+                                               FXFALSE);
+         }
+
+	 fxMesa->tmuSrc = FX_TMU0;
+      }
+      else {
+#if 1
+         grTexCombine(GR_TMU0,
+                      GR_COMBINE_FUNCTION_BLEND,
+                      GR_COMBINE_FACTOR_ONE,
+                      GR_COMBINE_FUNCTION_BLEND,
+                      GR_COMBINE_FACTOR_ONE,
+                      FXFALSE,
+                      FXFALSE);
+#else
+         /* [dBorca] why, oh why? doesn't work! stupid Glide? */
+         fxMesa->Glide.grTexAlphaCombineExt(FX_TMU0,
+                                            GR_CMBX_OTHER_TEXTURE_ALPHA,
+                                            GR_FUNC_MODE_X,
+                                            GR_CMBX_ZERO,
+                                            GR_FUNC_MODE_X,
+                                            GR_CMBX_ZERO,
+                                            FXTRUE,
+                                            GR_CMBX_ZERO,
+                                            FXFALSE,
+                                            0,
+                                            FXFALSE);
+         fxMesa->Glide.grTexColorCombineExt(FX_TMU0,
+                                            GR_CMBX_OTHER_TEXTURE_RGB,
+                                            GR_FUNC_MODE_X,
+                                            GR_CMBX_ZERO,
+                                            GR_FUNC_MODE_X,
+                                            GR_CMBX_ZERO,
+                                            FXTRUE,
+                                            GR_CMBX_ZERO,
+                                            FXFALSE,
+                                            0,
+                                            FXFALSE);
+#endif
+
+	 fxMesa->tmuSrc = FX_TMU1;
+      }
+   }
+}
+
+static void
+fxSetupTextureSingleTMUNapalm_NoLock(GLcontext * ctx, GLuint textureset)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   GLuint unitsmode;
+   tfxTexInfo *ti;
+   struct gl_texture_object *tObj = ctx->Texture.Unit[textureset].Current2D;
+   int tmu;
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "fxSetupTextureSingleTMUNapalm_NoLock(%d)\n", textureset);
+   }
+
+   ti = fxTMGetTexInfo(tObj);
+
+   fxTexValidate(ctx, tObj);
+
+   fxSetupSingleTMU_NoLock(fxMesa, tObj);
+
+   if (ti->whichTMU == FX_TMU_BOTH)
+      tmu = FX_TMU0;
+   else
+      tmu = ti->whichTMU;
+   if (fxMesa->tmuSrc != tmu)
+      fxSelectSingleTMUSrcNapalm_NoLock(fxMesa, tmu, ti->LODblend);
+
+   if (textureset == 0 || !fxMesa->haveTwoTMUs)
+      unitsmode = fxGetTexSetConfiguration(ctx, tObj, NULL);
+   else
+      unitsmode = fxGetTexSetConfiguration(ctx, NULL, tObj);
+
+/*    if(fxMesa->lastUnitsMode==unitsmode) */
+/*      return; */
+
+   fxMesa->lastUnitsMode = unitsmode;
+
+   fxMesa->stw_hint_state = 0;
+   FX_grHints_NoLock(GR_HINT_STWHINT, 0);
+
+   if (TDFX_DEBUG & (VERBOSE_DRIVER | VERBOSE_TEXTURE))
+      fprintf(stderr, "fxSetupTextureSingleTMUNapalm_NoLock: envmode is %s\n",
+	      _mesa_lookup_enum_by_nr(ctx->Texture.Unit[textureset].EnvMode));
+
+   /* [dBorca] Hack alert:
+    * what if we're in split mode? (LODBlend)
+    * also should we update BOTH TMUs in FX_TMU_BOTH mode?
+    */
+   fxSetupTextureEnvNapalm_NoLock(ctx, textureset, tmu, GL_TRUE);
+}
+
+
+/************************* Double Texture Set ***************************/
+
+static void
+fxSetupTextureDoubleTMUNapalm_NoLock(GLcontext * ctx)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   tfxTexInfo *ti0, *ti1;
+   struct gl_texture_object *tObj0 = ctx->Texture.Unit[1].Current2D;
+   struct gl_texture_object *tObj1 = ctx->Texture.Unit[0].Current2D;
+   GLuint unitsmode;
+   int tmu0 = 0, tmu1 = 1;
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "fxSetupTextureDoubleTMUNapalm_NoLock(...)\n");
+   }
+
+   ti0 = fxTMGetTexInfo(tObj0);
+   fxTexValidate(ctx, tObj0);
+
+   ti1 = fxTMGetTexInfo(tObj1);
+   fxTexValidate(ctx, tObj1);
+
+   fxSetupDoubleTMU_NoLock(fxMesa, tObj0, tObj1);
+
+   unitsmode = fxGetTexSetConfiguration(ctx, tObj0, tObj1);
+
+/*    if(fxMesa->lastUnitsMode==unitsmode) */
+/*      return; */
+
+   fxMesa->lastUnitsMode = unitsmode;
+
+   fxMesa->stw_hint_state |= GR_STWHINT_ST_DIFF_TMU1;
+   FX_grHints_NoLock(GR_HINT_STWHINT, fxMesa->stw_hint_state);
+
+   if (TDFX_DEBUG & (VERBOSE_DRIVER | VERBOSE_TEXTURE))
+      fprintf(stderr, "fxSetupTextureDoubleTMUNapalm_NoLock: envmode is %s/%s\n",
+	      _mesa_lookup_enum_by_nr(ctx->Texture.Unit[0].EnvMode),
+	      _mesa_lookup_enum_by_nr(ctx->Texture.Unit[1].EnvMode));
+
+
+   if ((ti0->whichTMU == FX_TMU1) || (ti1->whichTMU == FX_TMU0)) {
+      tmu0 = 1;
+      tmu1 = 0;
+   }
+   fxMesa->tmuSrc = FX_TMU_BOTH;
+
+   /* OpenGL vs Glide texture pipeline */
+   fxSetupTextureEnvNapalm_NoLock(ctx, 0, 1, GL_TRUE);
+   fxSetupTextureEnvNapalm_NoLock(ctx, 1, 0, GL_FALSE);
+}
+
+/************************* No Texture ***************************/
+
+static void
+fxSetupTextureNoneNapalm_NoLock(GLcontext * ctx)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "fxSetupTextureNoneNapalm_NoLock(...)\n");
+   }
+
+   /* the combiner formula is: (A + B) * C + D
+   **
+   ** a = tc_otherselect
+   ** a_mode = tc_invert_other
+   ** b = tc_localselect
+   ** b_mode = tc_invert_local
+   ** c = (tc_mselect, tc_mselect_7)
+   ** d = (tc_add_clocal, tc_add_alocal)
+   ** shift = tc_outshift
+   ** invert = tc_invert_output
+   */
+
+   fxMesa->Glide.grColorCombineExt(GR_CMBX_ITRGB,
+                                   GR_FUNC_MODE_X,
+                                   GR_CMBX_ZERO,
+                                   GR_FUNC_MODE_ZERO,
+                                   GR_CMBX_ZERO,
+                                   FXTRUE,
+                                   GR_CMBX_ZERO,
+                                   FXFALSE,
+                                   0,
+                                   FXFALSE);
+   fxMesa->Glide.grAlphaCombineExt(GR_CMBX_ITALPHA,
+                                   GR_FUNC_MODE_X,
+                                   GR_CMBX_ZERO,
+                                   GR_FUNC_MODE_ZERO,
+                                   GR_CMBX_ZERO,
+                                   FXTRUE,
+                                   GR_CMBX_ZERO,
+                                   FXFALSE,
+                                   0,
+                                   FXFALSE);
+
+   fxMesa->lastUnitsMode = FX_UM_NONE;
+}
diff --git a/reactos/lib/mesa32/src/drivers/glide/fxtexman.c b/reactos/lib/mesa32/src/drivers/glide/fxtexman.c
new file mode 100644
index 00000000000..560a0f4d1be
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/glide/fxtexman.c
@@ -0,0 +1,884 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.0
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/* Authors:
+ *    David Bucciarelli
+ *    Brian Paul
+ *    Daryll Strauss
+ *    Keith Whitwell
+ *    Daniel Borca
+ *    Hiroshi Morii
+ */
+
+/* fxtexman.c - 3Dfx VooDoo texture memory functions */
+
+
+#ifdef HAVE_CONFIG_H
+#include "conf.h"
+#endif
+
+#if defined(FX)
+
+#include "fxdrv.h"
+
+int texSwaps = 0;
+static FxU32 texBoundMask;
+
+#define FX_2MB_SPLIT 0x200000
+
+static struct gl_texture_object *fxTMFindOldestObject(fxMesaContext fxMesa,
+						      int tmu);
+
+
+#ifdef TEXSANITY
+static void
+fubar()
+{
+}
+
+  /* Sanity Check */
+static void
+sanity(fxMesaContext fxMesa)
+{
+   MemRange *tmp, *prev, *pos;
+
+   prev = 0;
+   tmp = fxMesa->tmFree[0];
+   while (tmp) {
+      if (!tmp->startAddr && !tmp->endAddr) {
+	 fprintf(stderr, "Textures fubar\n");
+	 fubar();
+      }
+      if (tmp->startAddr >= tmp->endAddr) {
+	 fprintf(stderr, "Node fubar\n");
+	 fubar();
+      }
+      if (prev && (prev->startAddr >= tmp->startAddr ||
+		   prev->endAddr > tmp->startAddr)) {
+	 fprintf(stderr, "Sorting fubar\n");
+	 fubar();
+      }
+      prev = tmp;
+      tmp = tmp->next;
+   }
+   prev = 0;
+   tmp = fxMesa->tmFree[1];
+   while (tmp) {
+      if (!tmp->startAddr && !tmp->endAddr) {
+	 fprintf(stderr, "Textures fubar\n");
+	 fubar();
+      }
+      if (tmp->startAddr >= tmp->endAddr) {
+	 fprintf(stderr, "Node fubar\n");
+	 fubar();
+      }
+      if (prev && (prev->startAddr >= tmp->startAddr ||
+		   prev->endAddr > tmp->startAddr)) {
+	 fprintf(stderr, "Sorting fubar\n");
+	 fubar();
+      }
+      prev = tmp;
+      tmp = tmp->next;
+   }
+}
+#endif
+
+static MemRange *
+fxTMNewRangeNode(fxMesaContext fxMesa, FxU32 start, FxU32 end)
+{
+   MemRange *result = 0;
+
+   if (fxMesa->tmPool) {
+      result = fxMesa->tmPool;
+      fxMesa->tmPool = fxMesa->tmPool->next;
+   }
+   else {
+      if (!(result = MALLOC(sizeof(MemRange)))) {
+	 fprintf(stderr, "fxTMNewRangeNode: ERROR: out of memory!\n");
+	 fxCloseHardware();
+	 exit(-1);
+      }
+   }
+   result->startAddr = start;
+   result->endAddr = end;
+   return result;
+}
+
+#if 1
+#define fxTMDeleteRangeNode(fxMesa, range) \
+   do {                                    \
+       range->next = fxMesa->tmPool;       \
+       fxMesa->tmPool = range;             \
+   } while (0);
+#else
+static void
+fxTMDeleteRangeNode(fxMesaContext fxMesa, MemRange * range)
+{
+   range->next = fxMesa->tmPool;
+   fxMesa->tmPool = range;
+}
+#endif
+
+static void
+fxTMUInit(fxMesaContext fxMesa, int tmu)
+{
+   MemRange *tmn, *last;
+   FxU32 start, end, blockstart, blockend, chunk;
+
+   start = grTexMinAddress(tmu);
+   end = grTexMaxAddress(tmu);
+
+   chunk = (fxMesa->type >= GR_SSTTYPE_Banshee) ? (end - start) : FX_2MB_SPLIT;
+	
+   if (fxMesa->verbose) {
+      fprintf(stderr, "Voodoo %s configuration:\n",
+	      (tmu == FX_TMU0) ? "TMU0" : "TMU1");
+      fprintf(stderr, "Voodoo  Lower texture memory address (%u)\n",
+	      (unsigned int) start);
+      fprintf(stderr, "Voodoo  Higher texture memory address (%u)\n",
+	      (unsigned int) end);
+      fprintf(stderr, "Voodoo  Splitting Texture memory in %luMB blocks:\n", chunk >> 20);
+   }
+
+   fxMesa->freeTexMem[tmu] = end - start;
+   fxMesa->tmFree[tmu] = NULL;
+
+   last = 0;
+   blockstart = start;
+   while (blockstart < end) {
+      if (blockstart + chunk > end)
+	 blockend = end;
+      else
+	 blockend = blockstart + chunk;
+
+      if (fxMesa->verbose)
+	 fprintf(stderr, "Voodoo    %07u-%07u\n",
+		 (unsigned int) blockstart, (unsigned int) blockend);
+
+      tmn = fxTMNewRangeNode(fxMesa, blockstart, blockend);
+      tmn->next = NULL;
+
+
+      if (last)
+	 last->next = tmn;
+      else
+	 fxMesa->tmFree[tmu] = tmn;
+      last = tmn;
+
+      blockstart += chunk;
+   }
+}
+
+static int
+fxTMFindStartAddr(fxMesaContext fxMesa, GLint tmu, int size)
+{
+   MemRange *prev, *tmp;
+   int result;
+   struct gl_texture_object *obj;
+
+   if (fxMesa->HaveTexUma) {
+      tmu = FX_TMU0;
+   }
+
+   while (1) {
+      prev = 0;
+      tmp = fxMesa->tmFree[tmu];
+      while (tmp) {
+	 if (tmp->endAddr - tmp->startAddr >= size) {	/* Fits here */
+	    result = tmp->startAddr;
+	    tmp->startAddr += size;
+	    if (tmp->startAddr == tmp->endAddr) {	/* Empty */
+	       if (prev) {
+		  prev->next = tmp->next;
+	       }
+	       else {
+		  fxMesa->tmFree[tmu] = tmp->next;
+	       }
+	       fxTMDeleteRangeNode(fxMesa, tmp);
+	    }
+	    fxMesa->freeTexMem[tmu] -= size;
+	    return result;
+	 }
+	 prev = tmp;
+	 tmp = tmp->next;
+      }
+      /* No free space. Discard oldest */
+      if (TDFX_DEBUG & VERBOSE_TEXTURE) {
+	 fprintf(stderr, "fxTMFindStartAddr: No free space. Discard oldest\n");
+      }
+      obj = fxTMFindOldestObject(fxMesa, tmu);
+      if (!obj) {
+	 fprintf(stderr, "fxTMFindStartAddr: ERROR: No space for texture\n");
+	 return -1;
+      }
+      fxTMMoveOutTM(fxMesa, obj);
+      texSwaps++;
+   }
+}
+
+int fxTMCheckStartAddr (fxMesaContext fxMesa, GLint tmu, tfxTexInfo *ti)
+{
+ MemRange *prev, *tmp;
+ int size;
+ struct gl_texture_object *obj;
+
+ if (fxMesa->HaveTexUma) {
+    return FXTRUE;
+ }
+
+ size = grTexTextureMemRequired(GR_MIPMAPLEVELMASK_BOTH, &(ti->info));
+
+ tmp = fxMesa->tmFree[tmu];
+ while (tmp) {
+       if (tmp->endAddr - tmp->startAddr >= size) { /* Fits here */
+          return FXTRUE;
+       }
+       tmp = tmp->next;
+ }
+
+ return FXFALSE;
+}
+
+static void
+fxTMRemoveRange(fxMesaContext fxMesa, GLint tmu, MemRange * range)
+{
+   MemRange *tmp, *prev;
+
+   if (fxMesa->HaveTexUma) {
+      tmu = FX_TMU0;
+   }
+
+   if (range->startAddr == range->endAddr) {
+      fxTMDeleteRangeNode(fxMesa, range);
+      return;
+   }
+   fxMesa->freeTexMem[tmu] += range->endAddr - range->startAddr;
+   prev = 0;
+   tmp = fxMesa->tmFree[tmu];
+   while (tmp) {
+      if (range->startAddr > tmp->startAddr) {
+	 prev = tmp;
+	 tmp = tmp->next;
+      }
+      else
+	 break;
+   }
+   /* When we create the regions, we make a split at the 2MB boundary.
+      Now we have to make sure we don't join those 2MB boundary regions
+      back together again. */
+   range->next = tmp;
+   if (tmp) {
+      if (range->endAddr == tmp->startAddr
+	  && tmp->startAddr & texBoundMask) {
+	 /* Combine */
+	 tmp->startAddr = range->startAddr;
+	 fxTMDeleteRangeNode(fxMesa, range);
+	 range = tmp;
+      }
+   }
+   if (prev) {
+      if (prev->endAddr == range->startAddr
+	  && range->startAddr & texBoundMask) {
+	 /* Combine */
+	 prev->endAddr = range->endAddr;
+	 prev->next = range->next;
+	 fxTMDeleteRangeNode(fxMesa, range);
+      }
+      else
+	 prev->next = range;
+   }
+   else {
+      fxMesa->tmFree[tmu] = range;
+   }
+}
+
+static struct gl_texture_object *
+fxTMFindOldestObject(fxMesaContext fxMesa, int tmu)
+{
+   GLuint age, old, lasttime, bindnumber;
+   GLfloat lowestPriority;
+   tfxTexInfo *info;
+   struct gl_texture_object *obj, *tmp, *lowestPriorityObj;
+
+   tmp = fxMesa->glCtx->Shared->TexObjectList;
+   if (!tmp)
+      return 0;
+   obj = NULL;
+   old = 0;
+
+   lowestPriorityObj = NULL;
+   lowestPriority = 1.0F;
+
+   bindnumber = fxMesa->texBindNumber;
+   while (tmp) {
+      info = fxTMGetTexInfo(tmp);
+
+      if (info && info->isInTM &&
+	  ((info->whichTMU == tmu) ||
+	   (info->whichTMU == FX_TMU_BOTH) ||
+	   (info->whichTMU == FX_TMU_SPLIT) ||
+	   fxMesa->HaveTexUma
+	  )
+	 ) {
+	 lasttime = info->lastTimeUsed;
+
+	 if (lasttime > bindnumber)
+	    age = bindnumber + (UINT_MAX - lasttime + 1);	/* TO DO: check wrap around */
+	 else
+	    age = bindnumber - lasttime;
+
+	 if (age >= old) {
+	    old = age;
+	    obj = tmp;
+	 }
+
+         /* examine priority */
+         if (tmp->Priority < lowestPriority) {
+            lowestPriority = tmp->Priority;
+            lowestPriorityObj = tmp;
+         }
+      }
+      tmp = tmp->Next;
+   }
+
+   if (lowestPriorityObj != NULL) {
+       if (TDFX_DEBUG & VERBOSE_TEXTURE) {
+          fprintf(stderr, "fxTMFindOldestObject: %d pri=%f\n", lowestPriorityObj->Name, lowestPriority);
+       }
+       return lowestPriorityObj;
+   }
+   else {
+       if (TDFX_DEBUG & VERBOSE_TEXTURE) {
+          if (obj != NULL) {
+             fprintf(stderr, "fxTMFindOldestObject: %d age=%d\n", obj->Name, old);
+          }
+       }
+       return obj;
+   }
+}
+
+static MemRange *
+fxTMAddObj(fxMesaContext fxMesa,
+	   struct gl_texture_object *tObj, GLint tmu, int texmemsize)
+{
+   FxI32 startAddr;
+   MemRange *range;
+
+   startAddr = fxTMFindStartAddr(fxMesa, tmu, texmemsize);
+   if (startAddr < 0)
+      return 0;
+   range = fxTMNewRangeNode(fxMesa, startAddr, startAddr + texmemsize);
+   return range;
+}
+
+/* External Functions */
+
+void
+fxTMMoveInTM_NoLock(fxMesaContext fxMesa, struct gl_texture_object *tObj,
+		    GLint where)
+{
+   tfxTexInfo *ti = fxTMGetTexInfo(tObj);
+   int i, l;
+   int texmemsize;
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "fxTMMoveInTM_NoLock(%d)\n", tObj->Name);
+   }
+
+   fxMesa->stats.reqTexUpload++;
+
+   if (!ti->validated) {
+      fprintf(stderr, "fxTMMoveInTM_NoLock: INTERNAL ERROR: not validated\n");
+      fxCloseHardware();
+      exit(-1);
+   }
+
+   if (ti->isInTM) {
+      if (ti->whichTMU == where)
+	 return;
+      if (where == FX_TMU_SPLIT || ti->whichTMU == FX_TMU_SPLIT)
+	 fxTMMoveOutTM_NoLock(fxMesa, tObj);
+      else {
+	 if (ti->whichTMU == FX_TMU_BOTH)
+	    return;
+	 where = FX_TMU_BOTH;
+      }
+   }
+
+   if (TDFX_DEBUG & (VERBOSE_DRIVER | VERBOSE_TEXTURE)) {
+      fprintf(stderr, "fxTMMoveInTM_NoLock: downloading %p (%d) in texture memory in %d\n",
+	              (void *)tObj, tObj->Name, where);
+   }
+
+   ti->whichTMU = (FxU32) where;
+
+   switch (where) {
+   case FX_TMU0:
+   case FX_TMU1:
+      texmemsize = (int)grTexTextureMemRequired(GR_MIPMAPLEVELMASK_BOTH, &(ti->info));
+      ti->tm[where] = fxTMAddObj(fxMesa, tObj, where, texmemsize);
+      fxMesa->stats.memTexUpload += texmemsize;
+
+      for (i = FX_largeLodValue(ti->info), l = ti->minLevel;
+	   i <= FX_smallLodValue(ti->info); i++, l++) {
+	 struct gl_texture_image *texImage = tObj->Image[l];
+	 grTexDownloadMipMapLevel(where,
+					    ti->tm[where]->startAddr,
+					    FX_valueToLod(i),
+					    FX_largeLodLog2(ti->info),
+					    FX_aspectRatioLog2(ti->info),
+					    ti->info.format,
+					    GR_MIPMAPLEVELMASK_BOTH,
+					    texImage->Data);
+      }
+      break;
+   case FX_TMU_SPLIT:
+      texmemsize = (int)grTexTextureMemRequired(GR_MIPMAPLEVELMASK_ODD, &(ti->info));
+      ti->tm[FX_TMU0] = fxTMAddObj(fxMesa, tObj, FX_TMU0, texmemsize);
+      fxMesa->stats.memTexUpload += texmemsize;
+
+      texmemsize = (int)grTexTextureMemRequired(GR_MIPMAPLEVELMASK_EVEN, &(ti->info));
+      ti->tm[FX_TMU1] = fxTMAddObj(fxMesa, tObj, FX_TMU1, texmemsize);
+      fxMesa->stats.memTexUpload += texmemsize;
+
+      for (i = FX_largeLodValue(ti->info), l = ti->minLevel;
+	   i <= FX_smallLodValue(ti->info); i++, l++) {
+	 struct gl_texture_image *texImage = tObj->Image[l];
+
+	 grTexDownloadMipMapLevel(GR_TMU0,
+					    ti->tm[FX_TMU0]->startAddr,
+					    FX_valueToLod(i),
+					    FX_largeLodLog2(ti->info),
+					    FX_aspectRatioLog2(ti->info),
+					    ti->info.format,
+					    GR_MIPMAPLEVELMASK_ODD,
+					    texImage->Data);
+
+	 grTexDownloadMipMapLevel(GR_TMU1,
+					    ti->tm[FX_TMU1]->startAddr,
+					    FX_valueToLod(i),
+					    FX_largeLodLog2(ti->info),
+					    FX_aspectRatioLog2(ti->info),
+					    ti->info.format,
+					    GR_MIPMAPLEVELMASK_EVEN,
+					    texImage->Data);
+      }
+      break;
+   case FX_TMU_BOTH:
+      texmemsize = (int)grTexTextureMemRequired(GR_MIPMAPLEVELMASK_BOTH, &(ti->info));
+      ti->tm[FX_TMU0] = fxTMAddObj(fxMesa, tObj, FX_TMU0, texmemsize);
+      fxMesa->stats.memTexUpload += texmemsize;
+
+      /*texmemsize = (int)grTexTextureMemRequired(GR_MIPMAPLEVELMASK_BOTH, &(ti->info));*/
+      ti->tm[FX_TMU1] = fxTMAddObj(fxMesa, tObj, FX_TMU1, texmemsize);
+      fxMesa->stats.memTexUpload += texmemsize; /* ZZZ: required? */
+
+      for (i = FX_largeLodValue(ti->info), l = ti->minLevel;
+	   i <= FX_smallLodValue(ti->info); i++, l++) {
+	 struct gl_texture_image *texImage = tObj->Image[l];
+	 grTexDownloadMipMapLevel(GR_TMU0,
+					    ti->tm[FX_TMU0]->startAddr,
+					    FX_valueToLod(i),
+					    FX_largeLodLog2(ti->info),
+					    FX_aspectRatioLog2(ti->info),
+					    ti->info.format,
+					    GR_MIPMAPLEVELMASK_BOTH,
+					    texImage->Data);
+
+	 grTexDownloadMipMapLevel(GR_TMU1,
+					    ti->tm[FX_TMU1]->startAddr,
+					    FX_valueToLod(i),
+					    FX_largeLodLog2(ti->info),
+					    FX_aspectRatioLog2(ti->info),
+					    ti->info.format,
+					    GR_MIPMAPLEVELMASK_BOTH,
+					    texImage->Data);
+      }
+      break;
+   default:
+      fprintf(stderr, "fxTMMoveInTM_NoLock: INTERNAL ERROR: wrong tmu (%d)\n", where);
+      fxCloseHardware();
+      exit(-1);
+   }
+
+   fxMesa->stats.texUpload++;
+
+   ti->isInTM = GL_TRUE;
+}
+
+
+void
+fxTMMoveInTM(fxMesaContext fxMesa, struct gl_texture_object *tObj,
+	     GLint where)
+{
+   BEGIN_BOARD_LOCK();
+   fxTMMoveInTM_NoLock(fxMesa, tObj, where);
+   END_BOARD_LOCK();
+}
+
+
+void
+fxTMReloadMipMapLevel(fxMesaContext fxMesa, struct gl_texture_object *tObj,
+		      GLint level)
+{
+   tfxTexInfo *ti = fxTMGetTexInfo(tObj);
+   GrLOD_t lodlevel;
+   GLint tmu;
+   struct gl_texture_image *texImage = tObj->Image[level];
+   tfxMipMapLevel *mml = FX_MIPMAP_DATA(texImage);
+
+   if (TDFX_DEBUG & VERBOSE_TEXTURE) {
+      fprintf(stderr, "fxTMReloadMipMapLevel(%p (%d), %d)\n", (void *)tObj, tObj->Name, level);
+   }
+
+   assert(mml);
+   assert(mml->width > 0);
+   assert(mml->height > 0);
+   assert(mml->glideFormat > 0);
+
+   if (!ti->validated) {
+      fprintf(stderr, "fxTMReloadMipMapLevel: INTERNAL ERROR: not validated\n");
+      fxCloseHardware();
+      exit(-1);
+   }
+
+   tmu = (int) ti->whichTMU;
+#if 0
+   /* [dBorca]
+    * We get here by (see Tex[Sub]Image2D), thus we are in TMU.
+    * Also, we just set the correct TMU above. fxTMMoveInTM will
+    * bail early, so don't bother...
+    */
+   fxTMMoveInTM(fxMesa, tObj, tmu);
+#else
+   fxMesa->stats.reqTexUpload++;
+   fxMesa->stats.texUpload++;
+#endif
+
+   lodlevel =  ti->info.largeLodLog2 - (level - ti->minLevel);
+
+   switch (tmu) {
+   case FX_TMU0:
+   case FX_TMU1:
+      grTexDownloadMipMapLevel(tmu,
+				  ti->tm[tmu]->startAddr,
+				  lodlevel,
+				  FX_largeLodLog2(ti->info),
+				  FX_aspectRatioLog2(ti->info),
+				  ti->info.format,
+				  GR_MIPMAPLEVELMASK_BOTH, texImage->Data);
+      break;
+   case FX_TMU_SPLIT:
+      grTexDownloadMipMapLevel(GR_TMU0,
+				  ti->tm[GR_TMU0]->startAddr,
+				  lodlevel,
+				  FX_largeLodLog2(ti->info),
+				  FX_aspectRatioLog2(ti->info),
+				  ti->info.format,
+				  GR_MIPMAPLEVELMASK_ODD, texImage->Data);
+
+      grTexDownloadMipMapLevel(GR_TMU1,
+				  ti->tm[GR_TMU1]->startAddr,
+				  lodlevel,
+				  FX_largeLodLog2(ti->info),
+				  FX_aspectRatioLog2(ti->info),
+				  ti->info.format,
+				  GR_MIPMAPLEVELMASK_EVEN, texImage->Data);
+      break;
+   case FX_TMU_BOTH:
+      grTexDownloadMipMapLevel(GR_TMU0,
+				  ti->tm[GR_TMU0]->startAddr,
+				  lodlevel,
+				  FX_largeLodLog2(ti->info),
+				  FX_aspectRatioLog2(ti->info),
+				  ti->info.format,
+				  GR_MIPMAPLEVELMASK_BOTH, texImage->Data);
+
+      grTexDownloadMipMapLevel(GR_TMU1,
+				  ti->tm[GR_TMU1]->startAddr,
+				  lodlevel,
+				  FX_largeLodLog2(ti->info),
+				  FX_aspectRatioLog2(ti->info),
+				  ti->info.format,
+				  GR_MIPMAPLEVELMASK_BOTH, texImage->Data);
+      break;
+
+   default:
+      fprintf(stderr, "fxTMReloadMipMapLevel: INTERNAL ERROR: wrong tmu (%d)\n", tmu);
+      fxCloseHardware();
+      exit(-1);
+   }
+}
+
+void
+fxTMReloadSubMipMapLevel(fxMesaContext fxMesa,
+			 struct gl_texture_object *tObj,
+			 GLint level, GLint yoffset, GLint height)
+{
+   tfxTexInfo *ti = fxTMGetTexInfo(tObj);
+   GrLOD_t lodlevel;
+   unsigned short *data;
+   GLint tmu;
+   struct gl_texture_image *texImage = tObj->Image[level];
+   tfxMipMapLevel *mml = FX_MIPMAP_DATA(texImage);
+
+   assert(mml);
+
+   if (!ti->validated) {
+      fprintf(stderr, "fxTMReloadSubMipMapLevel: INTERNAL ERROR: not validated\n");
+      fxCloseHardware();
+      exit(-1);
+   }
+
+   tmu = (int) ti->whichTMU;
+   fxTMMoveInTM(fxMesa, tObj, tmu);
+
+   fxTexGetInfo(mml->width, mml->height,
+		&lodlevel, NULL, NULL, NULL, NULL, NULL);
+
+   if ((ti->info.format == GR_TEXFMT_INTENSITY_8) ||
+       (ti->info.format == GR_TEXFMT_P_8) ||
+       (ti->info.format == GR_TEXFMT_ALPHA_8))
+	 data = (GLushort *) texImage->Data + ((yoffset * mml->width) >> 1);
+   else
+      data = (GLushort *) texImage->Data + yoffset * mml->width;
+
+   switch (tmu) {
+   case FX_TMU0:
+   case FX_TMU1:
+      grTexDownloadMipMapLevelPartial(tmu,
+					 ti->tm[tmu]->startAddr,
+					 FX_valueToLod(FX_lodToValue(lodlevel)
+						       + level),
+					 FX_largeLodLog2(ti->info),
+					 FX_aspectRatioLog2(ti->info),
+					 ti->info.format,
+					 GR_MIPMAPLEVELMASK_BOTH, data,
+					 yoffset, yoffset + height - 1);
+      break;
+   case FX_TMU_SPLIT:
+      grTexDownloadMipMapLevelPartial(GR_TMU0,
+					 ti->tm[FX_TMU0]->startAddr,
+					 FX_valueToLod(FX_lodToValue(lodlevel)
+						       + level),
+					 FX_largeLodLog2(ti->info),
+					 FX_aspectRatioLog2(ti->info),
+					 ti->info.format,
+					 GR_MIPMAPLEVELMASK_ODD, data,
+					 yoffset, yoffset + height - 1);
+
+      grTexDownloadMipMapLevelPartial(GR_TMU1,
+					 ti->tm[FX_TMU1]->startAddr,
+					 FX_valueToLod(FX_lodToValue(lodlevel)
+						       + level),
+					 FX_largeLodLog2(ti->info),
+					 FX_aspectRatioLog2(ti->info),
+					 ti->info.format,
+					 GR_MIPMAPLEVELMASK_EVEN, data,
+					 yoffset, yoffset + height - 1);
+      break;
+   case FX_TMU_BOTH:
+      grTexDownloadMipMapLevelPartial(GR_TMU0,
+					 ti->tm[FX_TMU0]->startAddr,
+					 FX_valueToLod(FX_lodToValue(lodlevel)
+						       + level),
+					 FX_largeLodLog2(ti->info),
+					 FX_aspectRatioLog2(ti->info),
+					 ti->info.format,
+					 GR_MIPMAPLEVELMASK_BOTH, data,
+					 yoffset, yoffset + height - 1);
+
+      grTexDownloadMipMapLevelPartial(GR_TMU1,
+					 ti->tm[FX_TMU1]->startAddr,
+					 FX_valueToLod(FX_lodToValue(lodlevel)
+						       + level),
+					 FX_largeLodLog2(ti->info),
+					 FX_aspectRatioLog2(ti->info),
+					 ti->info.format,
+					 GR_MIPMAPLEVELMASK_BOTH, data,
+					 yoffset, yoffset + height - 1);
+      break;
+   default:
+      fprintf(stderr, "fxTMReloadSubMipMapLevel: INTERNAL ERROR: wrong tmu (%d)\n", tmu);
+      fxCloseHardware();
+      exit(-1);
+   }
+}
+
+void
+fxTMMoveOutTM(fxMesaContext fxMesa, struct gl_texture_object *tObj)
+{
+   tfxTexInfo *ti = fxTMGetTexInfo(tObj);
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "fxTMMoveOutTM(%p (%d))\n", (void *)tObj, tObj->Name);
+   }
+
+   if (!ti->isInTM)
+      return;
+
+   switch (ti->whichTMU) {
+   case FX_TMU0:
+   case FX_TMU1:
+      fxTMRemoveRange(fxMesa, (int) ti->whichTMU, ti->tm[ti->whichTMU]);
+      break;
+   case FX_TMU_SPLIT:
+   case FX_TMU_BOTH:
+      fxTMRemoveRange(fxMesa, FX_TMU0, ti->tm[FX_TMU0]);
+      fxTMRemoveRange(fxMesa, FX_TMU1, ti->tm[FX_TMU1]);
+      break;
+   default:
+      fprintf(stderr, "fxTMMoveOutTM: INTERNAL ERROR: bad TMU (%ld)\n", ti->whichTMU);
+      fxCloseHardware();
+      exit(-1);
+   }
+
+   ti->isInTM = GL_FALSE;
+   ti->whichTMU = FX_TMU_NONE;
+}
+
+void
+fxTMFreeTexture(fxMesaContext fxMesa, struct gl_texture_object *tObj)
+{
+   tfxTexInfo *ti = fxTMGetTexInfo(tObj);
+   int i;
+
+   if (TDFX_DEBUG & VERBOSE_TEXTURE) {
+      fprintf(stderr, "fxTMFreeTexture(%p (%d))\n", (void *)tObj, tObj->Name);
+   }
+
+   fxTMMoveOutTM(fxMesa, tObj);
+
+   for (i = 0; i < MAX_TEXTURE_LEVELS; i++) {
+      struct gl_texture_image *texImage = tObj->Image[i];
+      if (texImage) {
+         if (texImage->Data) {
+            MESA_PBUFFER_FREE(texImage->Data);
+            texImage->Data = NULL;
+         }
+         if (texImage->DriverData) {
+            FREE(texImage->DriverData);
+            texImage->DriverData = NULL;
+         }
+      }
+   }
+   switch (ti->whichTMU) {
+   case FX_TMU0:
+   case FX_TMU1:
+      fxTMDeleteRangeNode(fxMesa, ti->tm[ti->whichTMU]);
+      break;
+   case FX_TMU_SPLIT:
+   case FX_TMU_BOTH:
+      fxTMDeleteRangeNode(fxMesa, ti->tm[FX_TMU0]);
+      fxTMDeleteRangeNode(fxMesa, ti->tm[FX_TMU1]);
+      break;
+   }
+}
+
+void
+fxTMInit(fxMesaContext fxMesa)
+{
+   fxMesa->texBindNumber = 0;
+   fxMesa->tmPool = 0;
+
+   if (fxMesa->HaveTexUma) {
+      grEnable(GR_TEXTURE_UMA_EXT);
+   }
+
+   fxTMUInit(fxMesa, FX_TMU0);
+
+   if (!fxMesa->HaveTexUma && fxMesa->haveTwoTMUs)
+      fxTMUInit(fxMesa, FX_TMU1);
+
+   texBoundMask = (fxMesa->type >= GR_SSTTYPE_Banshee) ? -1 : (FX_2MB_SPLIT - 1);
+}
+
+void
+fxTMClose(fxMesaContext fxMesa)
+{
+   MemRange *tmp, *next;
+
+   tmp = fxMesa->tmPool;
+   while (tmp) {
+      next = tmp->next;
+      FREE(tmp);
+      tmp = next;
+   }
+   tmp = fxMesa->tmFree[FX_TMU0];
+   while (tmp) {
+      next = tmp->next;
+      FREE(tmp);
+      tmp = next;
+   }
+   if (fxMesa->haveTwoTMUs) {
+      tmp = fxMesa->tmFree[FX_TMU1];
+      while (tmp) {
+	 next = tmp->next;
+	 FREE(tmp);
+	 tmp = next;
+      }
+   }
+}
+
+void
+fxTMRestoreTextures_NoLock(fxMesaContext ctx)
+{
+   tfxTexInfo *ti;
+   struct gl_texture_object *tObj;
+   int i, where;
+
+   tObj = ctx->glCtx->Shared->TexObjectList;
+   while (tObj) {
+      ti = fxTMGetTexInfo(tObj);
+      if (ti && ti->isInTM) {
+	 for (i = 0; i < MAX_TEXTURE_UNITS; i++)
+	    if (ctx->glCtx->Texture.Unit[i]._Current == tObj) {
+	       /* Force the texture onto the board, as it could be in use */
+	       where = ti->whichTMU;
+	       fxTMMoveOutTM_NoLock(ctx, tObj);
+	       fxTMMoveInTM_NoLock(ctx, tObj, where);
+	       break;
+	    }
+	 if (i == MAX_TEXTURE_UNITS)	/* Mark the texture as off the board */
+	    fxTMMoveOutTM_NoLock(ctx, tObj);
+      }
+      tObj = tObj->Next;
+   }
+}
+
+#else
+
+
+/*
+ * Need this to provide at least one external definition.
+ */
+
+extern int gl_fx_dummy_function_texman(void);
+int
+gl_fx_dummy_function_texman(void)
+{
+   return 0;
+}
+
+#endif /* FX */
diff --git a/reactos/lib/mesa32/src/drivers/glide/fxtris.c b/reactos/lib/mesa32/src/drivers/glide/fxtris.c
new file mode 100644
index 00000000000..a5165684a37
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/glide/fxtris.c
@@ -0,0 +1,1466 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.0
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/* Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ *    Daniel Borca <dborca@users.sourceforge.net>
+ */
+
+#include "glheader.h"
+
+#ifdef FX
+
+#include "imports.h"
+#include "mtypes.h"
+#include "macros.h"
+#include "colormac.h"
+#include "nvfragprog.h"
+
+#include "swrast/swrast.h"
+#include "swrast_setup/swrast_setup.h"
+#include "tnl/t_context.h"
+#include "tnl/t_pipeline.h"
+
+#include "fxdrv.h"
+
+
+GLboolean fxMultipass_ColorSum (GLcontext *ctx, GLuint pass);
+
+
+/*
+ * Subpixel offsets to adjust Mesa's (true) window coordinates to
+ * Glide coordinates.  We need these to ensure precise rasterization.
+ * Otherwise, we'll fail a bunch of conformance tests.
+ */
+#define TRI_X_OFFSET    ( 0.0F)
+#define TRI_Y_OFFSET    ( 0.0F)
+#define LINE_X_OFFSET   ( 0.0F)
+#define LINE_Y_OFFSET   ( 0.125F)
+#define PNT_X_OFFSET    ( 0.375F)
+#define PNT_Y_OFFSET    ( 0.375F)
+
+static void fxRasterPrimitive( GLcontext *ctx, GLenum prim );
+static void fxRenderPrimitive( GLcontext *ctx, GLenum prim );
+
+/***********************************************************************
+ *          Macros for t_dd_tritmp.h to draw basic primitives          *
+ ***********************************************************************/
+
+#define TRI( a, b, c )				\
+do {						\
+   if (DO_FALLBACK)				\
+      fxMesa->draw_tri( fxMesa, a, b, c );	\
+   else						\
+      grDrawTriangle( a, b, c );	\
+} while (0)					\
+
+#define QUAD( a, b, c, d )			\
+do {						\
+   if (DO_FALLBACK) {				\
+      fxMesa->draw_tri( fxMesa, a, b, d );	\
+      fxMesa->draw_tri( fxMesa, b, c, d );	\
+   } else {					\
+      GrVertex *_v_[4];				\
+      _v_[0] = d;				\
+      _v_[1] = a;				\
+      _v_[2] = b;				\
+      _v_[3] = c;				\
+      grDrawVertexArray(GR_TRIANGLE_FAN, 4, _v_);\
+      /*grDrawTriangle( a, b, d );*/		\
+      /*grDrawTriangle( b, c, d );*/		\
+   }						\
+} while (0)
+
+#define LINE( v0, v1 )				\
+do {						\
+   if (DO_FALLBACK)				\
+      fxMesa->draw_line( fxMesa, v0, v1 );	\
+   else {					\
+      v0->x += LINE_X_OFFSET - TRI_X_OFFSET;	\
+      v0->y += LINE_Y_OFFSET - TRI_Y_OFFSET;	\
+      v1->x += LINE_X_OFFSET - TRI_X_OFFSET;	\
+      v1->y += LINE_Y_OFFSET - TRI_Y_OFFSET;	\
+      grDrawLine( v0, v1 );	\
+      v0->x -= LINE_X_OFFSET - TRI_X_OFFSET;	\
+      v0->y -= LINE_Y_OFFSET - TRI_Y_OFFSET;	\
+      v1->x -= LINE_X_OFFSET - TRI_X_OFFSET;	\
+      v1->y -= LINE_Y_OFFSET - TRI_Y_OFFSET;	\
+   }						\
+} while (0)
+
+#define POINT( v0 )				\
+do {						\
+   if (DO_FALLBACK)				\
+      fxMesa->draw_point( fxMesa, v0 );		\
+   else {					\
+      v0->x += PNT_X_OFFSET - TRI_X_OFFSET;	\
+      v0->y += PNT_Y_OFFSET - TRI_Y_OFFSET;	\
+      grDrawPoint( v0 );		\
+      v0->x -= PNT_X_OFFSET - TRI_X_OFFSET;	\
+      v0->y -= PNT_Y_OFFSET - TRI_Y_OFFSET;	\
+   }						\
+} while (0)
+
+
+/***********************************************************************
+ *              Fallback to swrast for basic primitives                *
+ ***********************************************************************/
+
+/* Build an SWvertex from a hardware vertex. 
+ *
+ * This code is hit only when a mix of accelerated and unaccelerated
+ * primitives are being drawn, and only for the unaccelerated
+ * primitives.  
+ */
+static void 
+fx_translate_vertex( GLcontext *ctx, const GrVertex *src, SWvertex *dst)
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   GLuint ts0 = fxMesa->tmu_source[0];
+   GLuint ts1 = fxMesa->tmu_source[1];
+   GLfloat w = 1.0 / src->oow;
+
+   dst->win[0] = src->x;
+   dst->win[1] = src->y;
+   dst->win[2] = src->ooz;
+   dst->win[3] = src->oow;
+
+   dst->color[0] = src->pargb[2];
+   dst->color[1] = src->pargb[1];
+   dst->color[2] = src->pargb[0];
+   dst->color[3] = src->pargb[3];
+
+   dst->specular[0] = src->pspec[2];
+   dst->specular[1] = src->pspec[1];
+   dst->specular[2] = src->pspec[0];
+
+   dst->texcoord[ts0][0] = fxMesa->inv_s0scale * src->tmuvtx[0].sow * w;
+   dst->texcoord[ts0][1] = fxMesa->inv_t0scale * src->tmuvtx[0].tow * w;
+
+   if (fxMesa->stw_hint_state & GR_STWHINT_W_DIFF_TMU0)
+      dst->texcoord[ts0][3] = src->tmuvtx[0].oow * w;
+   else
+      dst->texcoord[ts0][3] = 1.0;
+
+   if (fxMesa->SetupIndex & SETUP_TMU1) {
+      dst->texcoord[ts1][0] = fxMesa->inv_s1scale * src->tmuvtx[1].sow * w;
+      dst->texcoord[ts1][1] = fxMesa->inv_t1scale * src->tmuvtx[1].tow * w;
+
+      if (fxMesa->stw_hint_state & GR_STWHINT_W_DIFF_TMU1)
+	 dst->texcoord[ts1][3] = src->tmuvtx[1].oow * w;
+      else
+	 dst->texcoord[ts1][3] = 1.0;
+   }
+
+   dst->pointSize = src->psize;
+}
+
+
+static void 
+fx_fallback_tri( fxMesaContext fxMesa, 
+		   GrVertex *v0, 
+		   GrVertex *v1, 
+		   GrVertex *v2 )
+{
+   GLcontext *ctx = fxMesa->glCtx;
+   SWvertex v[3];
+
+   fx_translate_vertex( ctx, v0, &v[0] );
+   fx_translate_vertex( ctx, v1, &v[1] );
+   fx_translate_vertex( ctx, v2, &v[2] );
+   _swrast_Triangle( ctx, &v[0], &v[1], &v[2] );
+}
+
+
+static void 
+fx_fallback_line( fxMesaContext fxMesa,
+		    GrVertex *v0,
+		    GrVertex *v1 )
+{
+   GLcontext *ctx = fxMesa->glCtx;
+   SWvertex v[2];
+   fx_translate_vertex( ctx, v0, &v[0] );
+   fx_translate_vertex( ctx, v1, &v[1] );
+   _swrast_Line( ctx, &v[0], &v[1] );
+}
+
+
+static void 
+fx_fallback_point( fxMesaContext fxMesa, 
+		     GrVertex *v0 )
+{
+   GLcontext *ctx = fxMesa->glCtx;
+   SWvertex v[1];
+   fx_translate_vertex( ctx, v0, &v[0] );
+   _swrast_Point( ctx, &v[0] );
+}
+
+/***********************************************************************
+ *                 Functions to draw basic primitives                  *
+ ***********************************************************************/
+
+static void fx_print_vertex( GLcontext *ctx, const GrVertex *v )
+{
+ fprintf(stderr, "fx_print_vertex:\n");
+
+ fprintf(stderr, "\tvertex at %p\n", (void *) v);
+
+ fprintf(stderr, "\tx %f y %f z %f oow %f\n", v->x, v->y, v->ooz, v->oow);
+ fprintf(stderr, "\tr %d g %d b %d a %d\n", v->pargb[2], v->pargb[1], v->pargb[0], v->pargb[3]);
+   
+ fprintf(stderr, "\n");
+}
+
+#define DO_FALLBACK 0
+
+/* Need to do clip loop at each triangle when mixing swrast and hw
+ * rendering.  These functions are only used when mixed-mode rendering
+ * is occurring.
+ */
+static void fx_draw_quad( fxMesaContext fxMesa,
+			  GrVertex *v0,
+			  GrVertex *v1,
+			  GrVertex *v2,
+			  GrVertex *v3 )
+{
+   BEGIN_CLIP_LOOP();
+   QUAD( v0, v1, v2, v3 );
+   END_CLIP_LOOP();
+}
+
+static void fx_draw_triangle( fxMesaContext fxMesa,
+				GrVertex *v0,
+				GrVertex *v1,
+				GrVertex *v2 )
+{
+   BEGIN_CLIP_LOOP();
+   TRI( v0, v1, v2 );
+   END_CLIP_LOOP();
+}
+
+static void fx_draw_line( fxMesaContext fxMesa,
+			    GrVertex *v0,
+			    GrVertex *v1 )
+{
+   /* No support for wide lines (avoid wide/aa line fallback).
+    */
+   BEGIN_CLIP_LOOP();
+   LINE(v0, v1);
+   END_CLIP_LOOP();
+}
+
+static void fx_draw_point( fxMesaContext fxMesa,
+			     GrVertex *v0 )
+{
+   /* No support for wide points.
+    */
+   BEGIN_CLIP_LOOP();
+   POINT( v0 );
+   END_CLIP_LOOP();
+}
+
+#ifndef M_2PI
+#define M_2PI 6.28318530717958647692528676655901
+#endif
+#define __GL_COSF cos
+#define __GL_SINF sin
+static void fx_draw_point_wide ( fxMesaContext fxMesa,
+			         GrVertex *v0 )
+{
+ GLint i, n;
+ GLfloat ang, radius, oon;
+ GrVertex vtxB, vtxC;
+ GrVertex *_v_[3];
+
+ _v_[0] = v0;
+ _v_[1] = &vtxB;
+ _v_[2] = &vtxC;
+
+ radius = v0->psize / 2.;
+ n = IROUND(v0->psize * 2); /* radius x 4 */
+ if (n < 4) n = 4;
+ oon = 1.0 / (GLfloat)n;
+
+ /* CLIP_LOOP ?!? */
+ /* point coverage? */
+ /* we don't care about culling here (see fxSetupCull) */
+
+ vtxB = *v0;
+ vtxC = *v0;
+
+ vtxB.x += radius;
+ ang = M_2PI * oon;
+ vtxC.x += radius * __GL_COSF(ang);
+ vtxC.y += radius * __GL_SINF(ang);
+ grDrawVertexArray(GR_TRIANGLE_FAN, 3, _v_);
+ for (i = 2; i <= n; i++) {
+     ang = M_2PI * i * oon;
+     vtxC.x = v0->x + radius * __GL_COSF(ang);
+     vtxC.y = v0->y + radius * __GL_SINF(ang);
+     grDrawVertexArray(GR_TRIANGLE_FAN_CONTINUE, 1, &_v_[2]);
+ }
+}
+
+static void fx_draw_point_wide_aa ( fxMesaContext fxMesa,
+			            GrVertex *v0 )
+{
+ GLint i, n;
+ GLfloat ang, radius, oon;
+ GrVertex vtxB, vtxC;
+
+ radius = v0->psize / 2.;
+ n = IROUND(v0->psize * 2); /* radius x 4 */
+ if (n < 4) n = 4;
+ oon = 1.0 / (GLfloat)n;
+
+ /* CLIP_LOOP ?!? */
+ /* point coverage? */
+ /* we don't care about culling here (see fxSetupCull) */
+
+ vtxB = *v0;
+ vtxC = *v0;
+
+ vtxB.x += radius;
+ for (i = 1; i <= n; i++) {
+     ang = M_2PI * i * oon;
+     vtxC.x = v0->x + radius * __GL_COSF(ang);
+     vtxC.y = v0->y + radius * __GL_SINF(ang);
+     grAADrawTriangle( v0, &vtxB, &vtxC, FXFALSE, FXTRUE, FXFALSE);
+     /*grDrawTriangle( v0, &vtxB, &vtxC);*/
+     vtxB.x = vtxC.x;
+     vtxB.y = vtxC.y;
+ }
+}
+#undef __GLCOSF
+#undef __GLSINF
+#undef M_2PI
+
+#undef DO_FALLBACK
+
+
+#define FX_UNFILLED_BIT    0x1
+#define FX_OFFSET_BIT	   0x2
+#define FX_TWOSIDE_BIT     0x4
+#define FX_FLAT_BIT        0x8
+#define FX_FALLBACK_BIT    0x10
+#define FX_MAX_TRIFUNC     0x20
+
+static struct {
+   points_func	        points;
+   line_func		line;
+   triangle_func	triangle;
+   quad_func		quad;
+} rast_tab[FX_MAX_TRIFUNC];
+
+#define DO_FALLBACK (IND & FX_FALLBACK_BIT)
+#define DO_OFFSET   (IND & FX_OFFSET_BIT)
+#define DO_UNFILLED (IND & FX_UNFILLED_BIT)
+#define DO_TWOSIDE  (IND & FX_TWOSIDE_BIT)
+#define DO_FLAT     (IND & FX_FLAT_BIT)
+#define DO_TRI       1
+#define DO_QUAD      1
+#define DO_LINE      1
+#define DO_POINTS    1
+#define DO_FULL_QUAD 1
+
+#define HAVE_RGBA   1
+#define HAVE_SPEC   1 /* [dBorca] investigate overhead !!! */
+#define HAVE_HW_FLATSHADE 0
+#define HAVE_BACK_COLORS  0
+#define VERTEX GrVertex
+#define TAB rast_tab
+
+#define DEPTH_SCALE 1.0
+#define UNFILLED_TRI unfilled_tri
+#define UNFILLED_QUAD unfilled_quad
+#define VERT_X(_v) _v->x
+#define VERT_Y(_v) _v->y
+#define VERT_Z(_v) _v->ooz
+#define GET_VERTEX(e) (fxMesa->verts + e)
+
+#ifdef USE_IEEE
+#define AREA_IS_CCW( a ) (((fi_type *)&(a))->i < 0)
+#else
+#define AREA_IS_CCW( a ) (a < 0)
+#endif
+
+
+#define VERT_SET_RGBA( dst, f )			\
+do {						\
+   UNCLAMPED_FLOAT_TO_UBYTE(dst->pargb[2], f[0]);\
+   UNCLAMPED_FLOAT_TO_UBYTE(dst->pargb[1], f[1]);\
+   UNCLAMPED_FLOAT_TO_UBYTE(dst->pargb[0], f[2]);\
+   UNCLAMPED_FLOAT_TO_UBYTE(dst->pargb[3], f[3]);\
+} while (0)
+
+#define VERT_COPY_RGBA( v0, v1 ) 		\
+   *(GLuint *)&v0->pargb = *(GLuint *)&v1->pargb
+
+#define VERT_SAVE_RGBA( idx )  			\
+   *(GLuint *)&color[idx] = *(GLuint *)&v[idx]->pargb
+
+#define VERT_RESTORE_RGBA( idx )		\
+   *(GLuint *)&v[idx]->pargb = *(GLuint *)&color[idx]
+
+
+#define VERT_SET_SPEC( dst, f )			\
+do {						\
+   UNCLAMPED_FLOAT_TO_UBYTE(dst->pspec[2], f[0]);\
+   UNCLAMPED_FLOAT_TO_UBYTE(dst->pspec[1], f[1]);\
+   UNCLAMPED_FLOAT_TO_UBYTE(dst->pspec[0], f[2]);\
+} while (0)
+
+#define VERT_COPY_SPEC( v0, v1 ) 		\
+   *(GLuint *)&v0->pspec = *(GLuint *)&v1->pspec
+
+#define VERT_SAVE_SPEC( idx )  			\
+   *(GLuint *)&spec[idx] = *(GLuint *)&v[idx]->pspec
+
+#define VERT_RESTORE_SPEC( idx )		\
+   *(GLuint *)&v[idx]->pspec = *(GLuint *)&spec[idx]
+
+
+#define LOCAL_VARS(n)				\
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);	\
+   GLubyte color[n][4], spec[n][4];		\
+   (void) color; (void) spec;
+
+
+
+/***********************************************************************
+ *            Functions to draw basic unfilled primitives              *
+ ***********************************************************************/
+
+#define RASTERIZE(x) if (fxMesa->raster_primitive != x) \
+                        fxRasterPrimitive( ctx, x )
+#define RENDER_PRIMITIVE fxMesa->render_primitive
+#define IND FX_FALLBACK_BIT
+#define TAG(x) x
+#include "tnl_dd/t_dd_unfilled.h"
+#undef IND
+
+/***********************************************************************
+ *                 Functions to draw GL primitives                     *
+ ***********************************************************************/
+
+#define IND (0)
+#define TAG(x) x
+#include "tnl_dd/t_dd_tritmp.h"
+
+#define IND (FX_OFFSET_BIT)
+#define TAG(x) x##_offset
+#include "tnl_dd/t_dd_tritmp.h"
+
+#define IND (FX_TWOSIDE_BIT)
+#define TAG(x) x##_twoside
+#include "tnl_dd/t_dd_tritmp.h"
+
+#define IND (FX_TWOSIDE_BIT|FX_OFFSET_BIT)
+#define TAG(x) x##_twoside_offset
+#include "tnl_dd/t_dd_tritmp.h"
+
+#define IND (FX_UNFILLED_BIT)
+#define TAG(x) x##_unfilled
+#include "tnl_dd/t_dd_tritmp.h"
+
+#define IND (FX_OFFSET_BIT|FX_UNFILLED_BIT)
+#define TAG(x) x##_offset_unfilled
+#include "tnl_dd/t_dd_tritmp.h"
+
+#define IND (FX_TWOSIDE_BIT|FX_UNFILLED_BIT)
+#define TAG(x) x##_twoside_unfilled
+#include "tnl_dd/t_dd_tritmp.h"
+
+#define IND (FX_TWOSIDE_BIT|FX_OFFSET_BIT|FX_UNFILLED_BIT)
+#define TAG(x) x##_twoside_offset_unfilled
+#include "tnl_dd/t_dd_tritmp.h"
+
+#define IND (FX_FALLBACK_BIT)
+#define TAG(x) x##_fallback
+#include "tnl_dd/t_dd_tritmp.h"
+
+#define IND (FX_OFFSET_BIT|FX_FALLBACK_BIT)
+#define TAG(x) x##_offset_fallback
+#include "tnl_dd/t_dd_tritmp.h"
+
+#define IND (FX_TWOSIDE_BIT|FX_FALLBACK_BIT)
+#define TAG(x) x##_twoside_fallback
+#include "tnl_dd/t_dd_tritmp.h"
+
+#define IND (FX_TWOSIDE_BIT|FX_OFFSET_BIT|FX_FALLBACK_BIT)
+#define TAG(x) x##_twoside_offset_fallback
+#include "tnl_dd/t_dd_tritmp.h"
+
+#define IND (FX_UNFILLED_BIT|FX_FALLBACK_BIT)
+#define TAG(x) x##_unfilled_fallback
+#include "tnl_dd/t_dd_tritmp.h"
+
+#define IND (FX_OFFSET_BIT|FX_UNFILLED_BIT|FX_FALLBACK_BIT)
+#define TAG(x) x##_offset_unfilled_fallback
+#include "tnl_dd/t_dd_tritmp.h"
+
+#define IND (FX_TWOSIDE_BIT|FX_UNFILLED_BIT|FX_FALLBACK_BIT)
+#define TAG(x) x##_twoside_unfilled_fallback
+#include "tnl_dd/t_dd_tritmp.h"
+
+#define IND (FX_TWOSIDE_BIT|FX_OFFSET_BIT|FX_UNFILLED_BIT| \
+	     FX_FALLBACK_BIT)
+#define TAG(x) x##_twoside_offset_unfilled_fallback
+#include "tnl_dd/t_dd_tritmp.h"
+
+
+/* Fx doesn't support provoking-vertex flat-shading?
+ */
+#define IND (FX_FLAT_BIT)
+#define TAG(x) x##_flat
+#include "tnl_dd/t_dd_tritmp.h"
+
+#define IND (FX_OFFSET_BIT|FX_FLAT_BIT)
+#define TAG(x) x##_offset_flat
+#include "tnl_dd/t_dd_tritmp.h"
+
+#define IND (FX_TWOSIDE_BIT|FX_FLAT_BIT)
+#define TAG(x) x##_twoside_flat
+#include "tnl_dd/t_dd_tritmp.h"
+
+#define IND (FX_TWOSIDE_BIT|FX_OFFSET_BIT|FX_FLAT_BIT)
+#define TAG(x) x##_twoside_offset_flat
+#include "tnl_dd/t_dd_tritmp.h"
+
+#define IND (FX_UNFILLED_BIT|FX_FLAT_BIT)
+#define TAG(x) x##_unfilled_flat
+#include "tnl_dd/t_dd_tritmp.h"
+
+#define IND (FX_OFFSET_BIT|FX_UNFILLED_BIT|FX_FLAT_BIT)
+#define TAG(x) x##_offset_unfilled_flat
+#include "tnl_dd/t_dd_tritmp.h"
+
+#define IND (FX_TWOSIDE_BIT|FX_UNFILLED_BIT|FX_FLAT_BIT)
+#define TAG(x) x##_twoside_unfilled_flat
+#include "tnl_dd/t_dd_tritmp.h"
+
+#define IND (FX_TWOSIDE_BIT|FX_OFFSET_BIT|FX_UNFILLED_BIT|FX_FLAT_BIT)
+#define TAG(x) x##_twoside_offset_unfilled_flat
+#include "tnl_dd/t_dd_tritmp.h"
+
+#define IND (FX_FALLBACK_BIT|FX_FLAT_BIT)
+#define TAG(x) x##_fallback_flat
+#include "tnl_dd/t_dd_tritmp.h"
+
+#define IND (FX_OFFSET_BIT|FX_FALLBACK_BIT|FX_FLAT_BIT)
+#define TAG(x) x##_offset_fallback_flat
+#include "tnl_dd/t_dd_tritmp.h"
+
+#define IND (FX_TWOSIDE_BIT|FX_FALLBACK_BIT|FX_FLAT_BIT)
+#define TAG(x) x##_twoside_fallback_flat
+#include "tnl_dd/t_dd_tritmp.h"
+
+#define IND (FX_TWOSIDE_BIT|FX_OFFSET_BIT|FX_FALLBACK_BIT|FX_FLAT_BIT)
+#define TAG(x) x##_twoside_offset_fallback_flat
+#include "tnl_dd/t_dd_tritmp.h"
+
+#define IND (FX_UNFILLED_BIT|FX_FALLBACK_BIT|FX_FLAT_BIT)
+#define TAG(x) x##_unfilled_fallback_flat
+#include "tnl_dd/t_dd_tritmp.h"
+
+#define IND (FX_OFFSET_BIT|FX_UNFILLED_BIT|FX_FALLBACK_BIT|FX_FLAT_BIT)
+#define TAG(x) x##_offset_unfilled_fallback_flat
+#include "tnl_dd/t_dd_tritmp.h"
+
+#define IND (FX_TWOSIDE_BIT|FX_UNFILLED_BIT|FX_FALLBACK_BIT|FX_FLAT_BIT)
+#define TAG(x) x##_twoside_unfilled_fallback_flat
+#include "tnl_dd/t_dd_tritmp.h"
+
+#define IND (FX_TWOSIDE_BIT|FX_OFFSET_BIT|FX_UNFILLED_BIT| \
+	     FX_FALLBACK_BIT|FX_FLAT_BIT)
+#define TAG(x) x##_twoside_offset_unfilled_fallback_flat
+#include "tnl_dd/t_dd_tritmp.h"
+
+
+static void init_rast_tab( void )
+{
+   init();
+   init_offset();
+   init_twoside();
+   init_twoside_offset();
+   init_unfilled();
+   init_offset_unfilled();
+   init_twoside_unfilled();
+   init_twoside_offset_unfilled();
+   init_fallback();
+   init_offset_fallback();
+   init_twoside_fallback();
+   init_twoside_offset_fallback();
+   init_unfilled_fallback();
+   init_offset_unfilled_fallback();
+   init_twoside_unfilled_fallback();
+   init_twoside_offset_unfilled_fallback();
+
+   init_flat();
+   init_offset_flat();
+   init_twoside_flat();
+   init_twoside_offset_flat();
+   init_unfilled_flat();
+   init_offset_unfilled_flat();
+   init_twoside_unfilled_flat();
+   init_twoside_offset_unfilled_flat();
+   init_fallback_flat();
+   init_offset_fallback_flat();
+   init_twoside_fallback_flat();
+   init_twoside_offset_fallback_flat();
+   init_unfilled_fallback_flat();
+   init_offset_unfilled_fallback_flat();
+   init_twoside_unfilled_fallback_flat();
+   init_twoside_offset_unfilled_fallback_flat();
+}
+
+
+/**********************************************************************/
+/*                 Render whole begin/end objects                     */
+/**********************************************************************/
+
+
+/* Accelerate vertex buffer rendering when renderindex == 0 and
+ * there is no clipping.
+ */
+#define INIT(x) fxRenderPrimitive( ctx, x )
+
+static void fx_render_vb_points( GLcontext *ctx,
+				 GLuint start,
+				 GLuint count,
+				 GLuint flags )
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   GrVertex *fxVB = fxMesa->verts;
+   GLint i;
+   (void) flags;
+
+   if (TDFX_DEBUG & VERBOSE_VARRAY) {
+      fprintf(stderr, "fx_render_vb_points\n");
+   }
+
+   INIT(GL_POINTS);
+
+   /* Adjust point coords */
+   for (i = start; i < count; i++) {
+      fxVB[i].x += PNT_X_OFFSET - TRI_X_OFFSET;
+      fxVB[i].y += PNT_Y_OFFSET - TRI_Y_OFFSET;
+   }
+
+   grDrawVertexArrayContiguous( GR_POINTS, count-start,
+                                fxVB + start, sizeof(GrVertex));
+   /* restore point coords */
+   for (i = start; i < count; i++) {
+      fxVB[i].x -= PNT_X_OFFSET - TRI_X_OFFSET;
+      fxVB[i].y -= PNT_Y_OFFSET - TRI_Y_OFFSET;
+   }
+}
+
+static void fx_render_vb_line_strip( GLcontext *ctx,
+				     GLuint start,
+				     GLuint count,
+				     GLuint flags )
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   GrVertex *fxVB = fxMesa->verts;
+   GLint i;
+   (void) flags;
+
+   if (TDFX_DEBUG & VERBOSE_VARRAY) {
+      fprintf(stderr, "fx_render_vb_line_strip\n");
+   }
+
+   INIT(GL_LINE_STRIP);
+
+   /* adjust line coords */
+   for (i = start; i < count; i++) {
+      fxVB[i].x += LINE_X_OFFSET - TRI_X_OFFSET;
+      fxVB[i].y += LINE_Y_OFFSET - TRI_Y_OFFSET;
+   }
+
+   grDrawVertexArrayContiguous( GR_LINE_STRIP, count-start,
+                                fxVB + start, sizeof(GrVertex));
+
+   /* restore line coords */
+   for (i = start; i < count; i++) {
+      fxVB[i].x -= LINE_X_OFFSET - TRI_X_OFFSET;
+      fxVB[i].y -= LINE_Y_OFFSET - TRI_Y_OFFSET;
+   }
+}
+
+static void fx_render_vb_line_loop( GLcontext *ctx,
+				    GLuint start,
+				    GLuint count,
+				    GLuint flags )
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   GrVertex *fxVB = fxMesa->verts;
+   GLint i;
+   GLint j = start;
+   (void) flags;
+
+   if (TDFX_DEBUG & VERBOSE_VARRAY) {
+      fprintf(stderr, "fx_render_vb_line_loop\n");
+   }
+
+   INIT(GL_LINE_LOOP);
+
+   if (!(flags & PRIM_BEGIN)) {
+      j++;
+   }
+
+   /* adjust line coords */
+   for (i = start; i < count; i++) {
+      fxVB[i].x += LINE_X_OFFSET - TRI_X_OFFSET;
+      fxVB[i].y += LINE_Y_OFFSET - TRI_Y_OFFSET;
+   }
+
+   grDrawVertexArrayContiguous( GR_LINE_STRIP, count-j,
+                                fxVB + j, sizeof(GrVertex));
+
+   if (flags & PRIM_END) 
+      grDrawLine( fxVB + (count - 1),
+                  fxVB + start );
+
+   /* restore line coords */
+   for (i = start; i < count; i++) {
+      fxVB[i].x -= LINE_X_OFFSET - TRI_X_OFFSET;
+      fxVB[i].y -= LINE_Y_OFFSET - TRI_Y_OFFSET;
+   }
+}
+
+static void fx_render_vb_lines( GLcontext *ctx,
+				GLuint start,
+				GLuint count,
+				GLuint flags )
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   GrVertex *fxVB = fxMesa->verts;
+   GLint i;
+   (void) flags;
+
+   if (TDFX_DEBUG & VERBOSE_VARRAY) {
+      fprintf(stderr, "fx_render_vb_lines\n");
+   }
+
+   INIT(GL_LINES);
+
+   /* adjust line coords */
+   for (i = start; i < count; i++) {
+      fxVB[i].x += LINE_X_OFFSET - TRI_X_OFFSET;
+      fxVB[i].y += LINE_Y_OFFSET - TRI_Y_OFFSET;
+   }
+
+   grDrawVertexArrayContiguous( GR_LINES, count-start,
+                                fxVB + start, sizeof(GrVertex));
+
+   /* restore line coords */
+   for (i = start; i < count; i++) {
+      fxVB[i].x -= LINE_X_OFFSET - TRI_X_OFFSET;
+      fxVB[i].y -= LINE_Y_OFFSET - TRI_Y_OFFSET;
+   }
+}
+
+static void fx_render_vb_triangles( GLcontext *ctx,
+				    GLuint start,
+				    GLuint count,
+				    GLuint flags )
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   GrVertex *fxVB = fxMesa->verts;
+   (void) flags;
+
+   if (TDFX_DEBUG & VERBOSE_VARRAY) {
+      fprintf(stderr, "fx_render_vb_triangles\n");
+   }
+
+   INIT(GL_TRIANGLES);
+
+#if 0
+   /* [dBorca]
+    * apparently, this causes troubles with some programs (GLExcess);
+    * might be a bug in Glide... However, "grDrawVertexArrayContiguous"
+    * eventually calls "grDrawTriangle" for GR_TRIANGLES, so we're better
+    * off doing it by hand...
+    */
+   grDrawVertexArrayContiguous( GR_TRIANGLES, count-start,
+                                fxVB + start, sizeof(GrVertex));
+#else
+   {
+    GLuint j;
+    for (j=start+2; j<count; j+=3) {
+        grDrawTriangle(fxVB + (j-2), fxVB + (j-1), fxVB + j);
+    }
+   }
+#endif
+}
+
+
+static void fx_render_vb_tri_strip( GLcontext *ctx,
+				    GLuint start,
+				    GLuint count,
+				    GLuint flags )
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   GrVertex *fxVB = fxMesa->verts;
+   int mode;
+   (void) flags;
+
+   if (TDFX_DEBUG & VERBOSE_VARRAY) {
+      fprintf(stderr, "fx_render_vb_tri_strip\n");
+   }
+
+   INIT(GL_TRIANGLE_STRIP);
+
+   /* [dBorca] WTF?!?
+   if (flags & PRIM_PARITY) 
+      mode = GR_TRIANGLE_STRIP_CONTINUE;
+   else*/
+      mode = GR_TRIANGLE_STRIP;
+
+   grDrawVertexArrayContiguous( mode, count-start,
+                                fxVB + start, sizeof(GrVertex));
+}
+
+
+static void fx_render_vb_tri_fan( GLcontext *ctx,
+				  GLuint start,
+				  GLuint count,
+				  GLuint flags )
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   GrVertex *fxVB = fxMesa->verts;
+   (void) flags;
+
+   if (TDFX_DEBUG & VERBOSE_VARRAY) {
+      fprintf(stderr, "fx_render_vb_tri_fan\n");
+   }
+
+   INIT(GL_TRIANGLE_FAN);
+
+   grDrawVertexArrayContiguous( GR_TRIANGLE_FAN, count-start,
+                                fxVB + start, sizeof(GrVertex) );
+}
+
+static void fx_render_vb_quads( GLcontext *ctx,
+				GLuint start,
+				GLuint count,
+				GLuint flags )
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   GrVertex *fxVB = fxMesa->verts;
+   GLuint i;
+   (void) flags;
+
+   if (TDFX_DEBUG & VERBOSE_VARRAY) {
+      fprintf(stderr, "fx_render_vb_quads\n");
+   }
+
+   INIT(GL_QUADS);
+
+#if 1
+   /* [dBorca] Hack alert:
+    * since VTX-0-2 we get here with start = 0, count = 2,
+    * causing around 4 billion triangles. Revise this after
+    * a while
+    */
+   if (count < 3) {
+      return;
+   }
+#endif
+
+   for (i = start ; i < count-3 ; i += 4 ) {
+#define VERT(x) (fxVB + (x))
+      GrVertex *_v_[4];
+      _v_[0] = VERT(i+3);
+      _v_[1] = VERT(i+0);
+      _v_[2] = VERT(i+1);
+      _v_[3] = VERT(i+2);
+      grDrawVertexArray(GR_TRIANGLE_FAN, 4, _v_);
+      /*grDrawTriangle( VERT(i),   VERT(i+1), VERT(i+3) );*/
+      /*grDrawTriangle( VERT(i+1), VERT(i+2), VERT(i+3) );*/
+#undef VERT
+   }
+}
+
+static void fx_render_vb_quad_strip( GLcontext *ctx,
+				     GLuint start,
+				     GLuint count,
+				     GLuint flags )
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   GrVertex *fxVB = fxMesa->verts;
+   (void) flags;
+
+   if (TDFX_DEBUG & VERBOSE_VARRAY) {
+      fprintf(stderr, "fx_render_vb_quad_strip\n");
+   }
+
+   INIT(GL_QUAD_STRIP);
+
+   count -= (count-start)&1;
+
+   grDrawVertexArrayContiguous( GR_TRIANGLE_STRIP,
+                                count-start, fxVB + start, sizeof(GrVertex));
+}
+
+static void fx_render_vb_poly( GLcontext *ctx,
+				GLuint start,
+				GLuint count,
+				GLuint flags )
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   GrVertex *fxVB = fxMesa->verts;
+   (void) flags;
+
+   if (TDFX_DEBUG & VERBOSE_VARRAY) {
+      fprintf(stderr, "fx_render_vb_poly\n");
+   }
+
+   INIT(GL_POLYGON);
+
+   grDrawVertexArrayContiguous( GR_POLYGON, count-start,
+                                fxVB + start, sizeof(GrVertex));
+}
+
+static void fx_render_vb_noop( GLcontext *ctx,
+				 GLuint start,
+				 GLuint count,
+				 GLuint flags )
+{
+   (void) (ctx && start && count && flags);
+}
+
+static void (*fx_render_tab_verts[GL_POLYGON+2])(GLcontext *,
+						   GLuint,
+						   GLuint,
+						   GLuint) = 
+{
+   fx_render_vb_points,
+   fx_render_vb_lines,
+   fx_render_vb_line_loop,
+   fx_render_vb_line_strip,
+   fx_render_vb_triangles,
+   fx_render_vb_tri_strip,
+   fx_render_vb_tri_fan,
+   fx_render_vb_quads,
+   fx_render_vb_quad_strip,
+   fx_render_vb_poly,
+   fx_render_vb_noop,
+};
+#undef INIT
+
+
+/**********************************************************************/
+/*            Render whole (indexed) begin/end objects                */
+/**********************************************************************/
+
+
+#define VERT(x) (vertptr + x)
+
+#define RENDER_POINTS( start, count )		\
+   for ( ; start < count ; start++)		\
+      grDrawPoint( VERT(ELT(start)) );
+
+#define RENDER_LINE( v0, v1 ) \
+   grDrawLine( VERT(v0), VERT(v1) )
+
+#define RENDER_TRI( v0, v1, v2 )  \
+   grDrawTriangle( VERT(v0), VERT(v1), VERT(v2) )
+
+#define RENDER_QUAD( v0, v1, v2, v3 ) \
+   fx_draw_quad( fxMesa, VERT(v0), VERT(v1), VERT(v2), VERT(v3) )
+
+#define INIT(x) fxRenderPrimitive( ctx, x )
+
+#undef LOCAL_VARS
+#define LOCAL_VARS						\
+    fxMesaContext fxMesa = FX_CONTEXT(ctx);			\
+    GrVertex *vertptr = fxMesa->verts;		\
+    const GLuint * const elt = TNL_CONTEXT(ctx)->vb.Elts;	\
+    (void) elt;
+
+#define RESET_STIPPLE 
+#define RESET_OCCLUSION 
+#define PRESERVE_VB_DEFS
+
+/* Elts, no clipping.
+ */
+#undef ELT
+#undef TAG
+#define TAG(x) fx_##x##_elts
+#define ELT(x) elt[x]
+#include "tnl_dd/t_dd_rendertmp.h"
+
+/* Verts, no clipping.
+ */
+#undef ELT
+#undef TAG
+#define TAG(x) fx_##x##_verts
+#define ELT(x) x
+/*#include "tnl_dd/t_dd_rendertmp.h"*/ /* we have fx_render_vb_* now */
+
+
+
+/**********************************************************************/
+/*                   Render clipped primitives                        */
+/**********************************************************************/
+
+
+
+static void fxRenderClippedPoly( GLcontext *ctx, const GLuint *elts, 
+				   GLuint n )
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct vertex_buffer *VB = &tnl->vb;
+   GLuint prim = fxMesa->render_primitive;
+
+   /* Render the new vertices as an unclipped polygon. 
+    */
+   {
+      GLuint *tmp = VB->Elts;
+      VB->Elts = (GLuint *)elts;
+      tnl->Driver.Render.PrimTabElts[GL_POLYGON]( ctx, 0, n, 
+						  PRIM_BEGIN|PRIM_END );
+      VB->Elts = tmp;
+   }
+
+   /* Restore the render primitive
+    */
+   if (prim != GL_POLYGON)
+      tnl->Driver.Render.PrimitiveNotify( ctx, prim );
+}
+
+
+static void fxFastRenderClippedPoly( GLcontext *ctx, const GLuint *elts, 
+				       GLuint n )
+{
+   fxMesaContext fxMesa = FX_CONTEXT( ctx );
+   GrVertex *vertptr = fxMesa->verts;
+   const GrVertex *start = VERT(elts[0]);
+   int i;
+   for (i = 2 ; i < n ; i++) {
+      grDrawTriangle( start, VERT(elts[i-1]), VERT(elts[i]) );
+   }
+}
+
+/**********************************************************************/
+/*                    Choose render functions                         */
+/**********************************************************************/
+
+
+#define POINT_FALLBACK (DD_POINT_SMOOTH)
+#define LINE_FALLBACK (DD_LINE_STIPPLE)
+#define TRI_FALLBACK (DD_TRI_SMOOTH | DD_TRI_STIPPLE)
+#define ANY_FALLBACK_FLAGS (POINT_FALLBACK | LINE_FALLBACK | TRI_FALLBACK)
+#define ANY_RASTER_FLAGS (DD_FLATSHADE | DD_TRI_LIGHT_TWOSIDE | DD_TRI_OFFSET \
+			  | DD_TRI_UNFILLED)
+
+
+
+void fxDDChooseRenderState(GLcontext *ctx)
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   GLuint flags = ctx->_TriangleCaps;
+   GLuint index = 0;
+
+   if (flags & (ANY_FALLBACK_FLAGS|ANY_RASTER_FLAGS)) {
+      if (flags & ANY_RASTER_FLAGS) {
+	 if (flags & DD_TRI_LIGHT_TWOSIDE)    index |= FX_TWOSIDE_BIT;
+	 if (flags & DD_TRI_OFFSET)	      index |= FX_OFFSET_BIT;
+	 if (flags & DD_TRI_UNFILLED)	      index |= FX_UNFILLED_BIT;
+	 if (flags & DD_FLATSHADE)	      index |= FX_FLAT_BIT;
+      }
+
+      fxMesa->draw_point = fx_draw_point;
+      fxMesa->draw_line = fx_draw_line;
+      fxMesa->draw_tri = fx_draw_triangle;
+
+      /* Hook in fallbacks for specific primitives.
+       * [dBorca] Hack alert:
+       * If we're in FSAA mode, we always do anti-aliased primitives.
+       */
+      if (flags & (POINT_FALLBACK|
+		   LINE_FALLBACK|
+		   TRI_FALLBACK))
+      {
+         if (fxMesa->verbose) {
+            fprintf(stderr, "Voodoo ! fallback (%x), raster (%x)\n",
+                            flags & ANY_FALLBACK_FLAGS, flags & ANY_RASTER_FLAGS);
+         }
+
+	 if (flags & POINT_FALLBACK)
+	    fxMesa->draw_point = fx_fallback_point;
+
+	 if (flags & LINE_FALLBACK)
+	    fxMesa->draw_line = fx_fallback_line;
+
+	 if (flags & TRI_FALLBACK)
+	    fxMesa->draw_tri = fx_fallback_tri;
+
+	 index |= FX_FALLBACK_BIT;
+      }
+   }
+
+   tnl->Driver.Render.Points = rast_tab[index].points;
+   tnl->Driver.Render.Line = rast_tab[index].line;
+   tnl->Driver.Render.ClippedLine = rast_tab[index].line;
+   tnl->Driver.Render.Triangle = rast_tab[index].triangle;
+   tnl->Driver.Render.Quad = rast_tab[index].quad;
+
+   if (index == 0) {
+      tnl->Driver.Render.PrimTabVerts = fx_render_tab_verts;
+      tnl->Driver.Render.PrimTabElts = fx_render_tab_elts;
+      tnl->Driver.Render.ClippedPolygon = fxFastRenderClippedPoly;
+   } else {
+      tnl->Driver.Render.PrimTabVerts = _tnl_render_tab_verts;
+      tnl->Driver.Render.PrimTabElts = _tnl_render_tab_elts;
+      tnl->Driver.Render.ClippedPolygon = fxRenderClippedPoly;
+   }
+
+   fxMesa->render_index = index;
+
+   /* [dBorca] Hack alert: more a trick than a real plug-in!!!
+    * FX_FALLBACK_BIT is for total rasterization fallbacks; since
+    * this is not the case, we don't alter "fxMesa->render_index".
+    * But we still need to go through "rast_tab", to make sure
+    * "POINT" calls "fxMesa->draw_point" instead of "grDrawPoint"
+    */
+   if (flags & (DD_POINT_SIZE | DD_POINT_ATTEN)) {
+      if (flags & DD_POINT_SMOOTH) {
+         fxMesa->draw_point = fx_draw_point_wide_aa;
+      } else {
+         fxMesa->draw_point = fx_draw_point_wide;
+      }
+      tnl->Driver.Render.Points = rast_tab[FX_FALLBACK_BIT].points;
+   }
+}
+
+
+/**********************************************************************/
+/*                Runtime render state and callbacks                  */
+/**********************************************************************/
+
+static void fxRunPipeline( GLcontext *ctx )
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   GLuint new_gl_state = fxMesa->new_gl_state;
+
+   if (TDFX_DEBUG & VERBOSE_PIPELINE) {
+      fprintf(stderr, "fxRunPipeline()\n");
+   }
+
+#if 0
+   /* Recalculate fog table on projection matrix changes.  This used to
+    * be triggered by the NearFar callback.
+    */
+   if (new_gl_state & _NEW_PROJECTION)
+      fxMesa->new_state |= FX_NEW_FOG;
+   /* [dBorca] Hack alert:
+    * the above _NEW_PROJECTION is not included in the test below,
+    * so we may end up with fxMesa->new_state still dirty by the end
+    * of the routine. The fact is, we don't have NearFar callback
+    * anymore. We could use fxDDDepthRange instead, but it seems
+    * fog needs to be updated only by a fog-basis.
+    * Implementing fxDDDepthRange correctly is another story:
+    * that, together with a presumable fxDDViewport function would set
+    *   fxMesa->SetupNewInputs |= VERT_BIT_CLIP;
+    * which might be useful in fxBuildVertices...
+    */
+#endif
+
+   if (new_gl_state & (_FX_NEW_IS_IN_HARDWARE |
+		       _FX_NEW_RENDERSTATE |
+		       _FX_NEW_SETUP_FUNCTION |
+		       _NEW_TEXTURE)) {
+
+      if (new_gl_state & _FX_NEW_IS_IN_HARDWARE)
+	 fxCheckIsInHardware(ctx);
+
+      if (fxMesa->new_state)
+	 fxSetupFXUnits(ctx);
+
+      if (!fxMesa->fallback) {
+	 if (new_gl_state & _FX_NEW_RENDERSTATE)
+	    fxDDChooseRenderState(ctx);
+
+	 if (new_gl_state & _FX_NEW_SETUP_FUNCTION)
+	    fxChooseVertexState(ctx);
+      }
+
+      if (new_gl_state & _NEW_TEXTURE) {
+         struct gl_texture_unit *t0 = &ctx->Texture.Unit[fxMesa->tmu_source[0]];
+         struct gl_texture_unit *t1 = &ctx->Texture.Unit[fxMesa->tmu_source[1]];
+      
+         if (t0 && t0->_Current && FX_TEXTURE_DATA(t0)) {
+            fxMesa->s0scale = FX_TEXTURE_DATA(t0)->sScale;
+            fxMesa->t0scale = FX_TEXTURE_DATA(t0)->tScale;
+            fxMesa->inv_s0scale = 1.0 / fxMesa->s0scale;
+            fxMesa->inv_t0scale = 1.0 / fxMesa->t0scale;
+         }
+      
+         if (t1 && t1->_Current && FX_TEXTURE_DATA(t1)) {
+            fxMesa->s1scale = FX_TEXTURE_DATA(t1)->sScale;
+            fxMesa->t1scale = FX_TEXTURE_DATA(t1)->tScale;
+            fxMesa->inv_s1scale = 1.0 / fxMesa->s1scale;
+            fxMesa->inv_t1scale = 1.0 / fxMesa->t1scale;
+         }
+      }
+   }
+      
+   fxMesa->new_gl_state = 0;
+
+   _tnl_run_pipeline( ctx );
+}
+
+
+static GLenum reduced_prim[GL_POLYGON+1] = {
+   GL_POINTS,
+   GL_LINES,
+   GL_LINES,
+   GL_LINES,
+   GL_TRIANGLES,
+   GL_TRIANGLES,
+   GL_TRIANGLES,
+   GL_TRIANGLES,
+   GL_TRIANGLES,
+   GL_TRIANGLES
+};
+
+
+
+/* Always called between RenderStart and RenderFinish --> We already
+ * hold the lock.
+ */
+static void fxRasterPrimitive( GLcontext *ctx, GLenum prim )
+{
+   fxMesaContext fxMesa = FX_CONTEXT( ctx );
+
+   fxMesa->raster_primitive = prim;
+
+   fxSetupCull(ctx);
+}
+
+
+
+/* Determine the rasterized primitive when not drawing unfilled 
+ * polygons.
+ */
+static void fxRenderPrimitive( GLcontext *ctx, GLenum prim )
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   GLuint rprim = reduced_prim[prim];
+
+   fxMesa->render_primitive = prim;
+
+   if (rprim == GL_TRIANGLES && (ctx->_TriangleCaps & DD_TRI_UNFILLED))
+      return;
+       
+   if (fxMesa->raster_primitive != rprim) {
+      fxRasterPrimitive( ctx, rprim );
+   }
+}
+
+static void fxRenderFinish( GLcontext *ctx )
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+
+   if (fxMesa->render_index & FX_FALLBACK_BIT)
+      _swrast_flush( ctx );
+}
+
+
+
+/**********************************************************************/
+/*               Manage total rasterization fallbacks                 */
+/**********************************************************************/
+
+static char *fallbackStrings[] = {
+   "1D/3D Texture map",
+   "glDrawBuffer(GL_FRONT_AND_BACK)",
+   "Separate specular color",
+   "glEnable/Disable(GL_STENCIL_TEST)",
+   "glRenderMode(selection or feedback)",
+   "glLogicOp()",
+   "Texture env mode",
+   "Texture border",
+   "glColorMask",
+   "blend mode",
+   "line stipple"
+};
+
+
+static char *getFallbackString(GLuint bit)
+{
+   int i = 0;
+   while (bit > 1) {
+      i++;
+      bit >>= 1;
+   }
+   return fallbackStrings[i];
+}
+
+
+void fxCheckIsInHardware( GLcontext *ctx )
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   GLuint oldfallback = fxMesa->fallback;
+   GLuint newfallback = fxMesa->fallback = fx_check_IsInHardware( ctx );
+
+   if (newfallback) {
+      if (oldfallback == 0) {
+         if (fxMesa->verbose) {
+            fprintf(stderr, "Voodoo ! enter SW 0x%08x %s\n", newfallback, getFallbackString(newfallback));
+         }
+	 _swsetup_Wakeup( ctx );
+      }
+   }
+   else {
+      if (oldfallback) {
+	 _swrast_flush( ctx );
+	 tnl->Driver.Render.Start = fxCheckTexSizes;
+	 tnl->Driver.Render.Finish = fxRenderFinish;
+	 tnl->Driver.Render.PrimitiveNotify = fxRenderPrimitive;
+	 tnl->Driver.Render.ClippedPolygon = _tnl_RenderClippedPolygon; 
+	 tnl->Driver.Render.ClippedLine = _tnl_RenderClippedLine;
+	 tnl->Driver.Render.PrimTabVerts = _tnl_render_tab_verts;
+	 tnl->Driver.Render.PrimTabElts = _tnl_render_tab_elts;
+	 tnl->Driver.Render.ResetLineStipple = _swrast_ResetLineStipple;
+	 tnl->Driver.Render.BuildVertices = fxBuildVertices;
+	 fxChooseVertexState(ctx);
+	 fxDDChooseRenderState(ctx);
+         if (fxMesa->verbose) {
+            fprintf(stderr, "Voodoo ! leave SW 0x%08x %s\n", oldfallback, getFallbackString(oldfallback));
+         }
+      }
+      tnl->Driver.Render.Multipass = (HAVE_SPEC && NEED_SECONDARY_COLOR(ctx)) ? fxMultipass_ColorSum : NULL;
+   }
+}
+
+void fxDDInitTriFuncs( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   static int firsttime = 1;
+
+   if (firsttime) {
+      init_rast_tab();
+      firsttime = 0;
+   }
+
+   tnl->Driver.RunPipeline = fxRunPipeline;
+   tnl->Driver.Render.Start = fxCheckTexSizes;
+   tnl->Driver.Render.Finish = fxRenderFinish;
+   tnl->Driver.Render.PrimitiveNotify = fxRenderPrimitive;
+   tnl->Driver.Render.ClippedPolygon = _tnl_RenderClippedPolygon; 
+   tnl->Driver.Render.ClippedLine = _tnl_RenderClippedLine;
+   tnl->Driver.Render.PrimTabVerts = _tnl_render_tab_verts;
+   tnl->Driver.Render.PrimTabElts = _tnl_render_tab_elts;
+   tnl->Driver.Render.ResetLineStipple = _swrast_ResetLineStipple;
+   tnl->Driver.Render.BuildVertices = fxBuildVertices;
+   tnl->Driver.Render.Multipass = NULL;
+   
+   (void) fx_print_vertex;
+}
+
+
+/* [dBorca] Hack alert:
+ * does this approach work with multitex?
+ */
+GLboolean fxMultipass_ColorSum (GLcontext *ctx, GLuint pass)
+{
+ fxMesaContext fxMesa = FX_CONTEXT(ctx);
+
+ static int t0 = 0;
+ static int t1 = 0;
+
+ switch (pass) {
+        case 1: /* first pass: the TEXTURED triangles are drawn */
+             /* save per-pass data */
+             fxMesa->restoreUnitsState = fxMesa->unitsState;
+             /* turn off texturing */
+             t0 = ctx->Texture.Unit[0]._ReallyEnabled;
+             t1 = ctx->Texture.Unit[1]._ReallyEnabled;
+             ctx->Texture.Unit[0]._ReallyEnabled = 0;
+             ctx->Texture.Unit[1]._ReallyEnabled = 0;
+             /* SUM the colors */
+             fxDDBlendEquation(ctx, GL_FUNC_ADD_EXT);
+             fxDDBlendFuncSeparate(ctx, GL_ONE, GL_ONE, GL_ZERO, GL_ONE);
+             fxDDEnable(ctx, GL_BLEND, GL_TRUE);
+             /* make sure we draw only where we want to */
+             if (ctx->Depth.Mask) {
+                switch (ctx->Depth.Func) {
+                       case GL_NEVER:
+                       case GL_ALWAYS:
+                       break;
+                default:
+                       fxDDDepthFunc( ctx, GL_EQUAL );
+                       break;
+                }
+                fxDDDepthMask( ctx, GL_FALSE );
+             }
+             /* switch to secondary colors */
+             grVertexLayout(GR_PARAM_PARGB, GR_VERTEX_PSPEC_OFFSET << 2, GR_PARAM_ENABLE);
+             /* don't advertise new state */
+             fxMesa->new_state = 0;
+             break;
+        case 2: /* 2nd pass (last): the secondary color is summed over texture */
+             /* restore original state */
+             fxMesa->unitsState = fxMesa->restoreUnitsState;
+             /* restore texturing */
+             ctx->Texture.Unit[0]._ReallyEnabled = t0;
+             ctx->Texture.Unit[1]._ReallyEnabled = t1;
+             /* revert to primary colors */
+             grVertexLayout(GR_PARAM_PARGB, GR_VERTEX_PARGB_OFFSET << 2, GR_PARAM_ENABLE);
+             break;
+        default:
+             assert(0); /* NOTREACHED */
+ }
+
+ /* update HW state */
+ fxSetupBlend(ctx);
+ fxSetupDepthTest(ctx);
+ fxSetupTexture(ctx);
+
+ return (pass == 1);
+}
+
+
+#else
+
+
+/*
+ * Need this to provide at least one external definition.
+ */
+
+extern int gl_fx_dummy_function_tris(void);
+int
+gl_fx_dummy_function_tris(void)
+{
+   return 0;
+}
+
+#endif /* FX */
diff --git a/reactos/lib/mesa32/src/drivers/glide/fxvb.c b/reactos/lib/mesa32/src/drivers/glide/fxvb.c
new file mode 100644
index 00000000000..7a275ad1c9f
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/glide/fxvb.c
@@ -0,0 +1,593 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * KEITH WHITWELL, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/* Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ *    Daniel Borca <dborca@users.sourceforge.net>
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "conf.h"
+#endif
+
+#ifdef FX
+
+#include "glheader.h"
+#include "mtypes.h"
+#include "imports.h"
+#include "macros.h"
+#include "colormac.h"
+
+#include "math/m_translate.h"
+#include "swrast_setup/swrast_setup.h"
+
+#include "tnl/tnl.h"
+#include "tnl/t_context.h"
+
+#include "fxdrv.h"
+
+
+static void copy_pv( GLcontext *ctx, GLuint edst, GLuint esrc )
+{
+   fxMesaContext fxMesa = FX_CONTEXT( ctx );
+   GrVertex *dst = fxMesa->verts + edst;
+   GrVertex *src = fxMesa->verts + esrc;
+
+   *(GLuint *)&dst->pargb = *(GLuint *)&src->pargb;
+}
+
+static void copy_pv2( GLcontext *ctx, GLuint edst, GLuint esrc )
+{
+   fxMesaContext fxMesa = FX_CONTEXT( ctx );
+   GrVertex *dst = fxMesa->verts + edst;
+   GrVertex *src = fxMesa->verts + esrc;
+
+   *(GLuint *)&dst->pargb = *(GLuint *)&src->pargb;
+   *(GLuint *)&dst->pspec = *(GLuint *)&src->pspec;
+}
+
+typedef void (*emit_func)( GLcontext *, GLuint, GLuint, void * );
+
+static struct {
+   emit_func	        emit;
+   copy_pv_func		copy_pv;
+   interp_func		interp;
+   GLboolean           (*check_tex_sizes)( GLcontext *ctx );
+   GLuint               vertex_format;
+} setup_tab[MAX_SETUP];
+
+
+#define GET_COLOR(ptr, idx) ((ptr)->data[idx])
+
+
+static void interp_extras( GLcontext *ctx,
+			   GLfloat t,
+			   GLuint dst, GLuint out, GLuint in,
+			   GLboolean force_boundary )
+{
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+
+   if (VB->ColorPtr[1]) {
+      assert(VB->ColorPtr[1]->stride == 4 * sizeof(GLfloat));
+
+      INTERP_4F( t,
+		 GET_COLOR(VB->ColorPtr[1], dst),
+		 GET_COLOR(VB->ColorPtr[1], out),
+		 GET_COLOR(VB->ColorPtr[1], in) );
+
+      if (VB->SecondaryColorPtr[1]) {
+	 INTERP_3F( t,
+		    GET_COLOR(VB->SecondaryColorPtr[1], dst),
+		    GET_COLOR(VB->SecondaryColorPtr[1], out),
+		    GET_COLOR(VB->SecondaryColorPtr[1], in) );
+      }
+   }
+
+   if (VB->EdgeFlag) {
+      VB->EdgeFlag[dst] = VB->EdgeFlag[out] || force_boundary;
+   }
+
+   setup_tab[FX_CONTEXT(ctx)->SetupIndex].interp(ctx, t, dst, out, in,
+						   force_boundary);
+}
+
+static void copy_pv_extras( GLcontext *ctx, GLuint dst, GLuint src )
+{
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+
+   if (VB->ColorPtr[1]) {
+	 COPY_4FV( GET_COLOR(VB->ColorPtr[1], dst),
+		   GET_COLOR(VB->ColorPtr[1], src) );
+
+	 if (VB->SecondaryColorPtr[1]) {
+	    COPY_3FV( GET_COLOR(VB->SecondaryColorPtr[1], dst),
+		      GET_COLOR(VB->SecondaryColorPtr[1], src) );
+	 }
+   }
+
+   setup_tab[FX_CONTEXT(ctx)->SetupIndex].copy_pv(ctx, dst, src);
+}
+
+
+#define IND (SETUP_XYZW|SETUP_RGBA)
+#define TAG(x) x##_wg
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_RGBA|SETUP_TMU0)
+#define TAG(x) x##_wgt0
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_RGBA|SETUP_TMU0|SETUP_TMU1)
+#define TAG(x) x##_wgt0t1
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_RGBA|SETUP_TMU0|SETUP_PTEX)
+#define TAG(x) x##_wgpt0
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_RGBA|SETUP_TMU0|SETUP_TMU1|\
+             SETUP_PTEX)
+#define TAG(x) x##_wgpt0t1
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_RGBA|SETUP_PSIZ)
+#define TAG(x) x##_wga
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_RGBA|SETUP_TMU0|SETUP_PSIZ)
+#define TAG(x) x##_wgt0a
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_RGBA|SETUP_TMU0|SETUP_TMU1|SETUP_PSIZ)
+#define TAG(x) x##_wgt0t1a
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_RGBA|SETUP_TMU0|SETUP_PTEX|SETUP_PSIZ)
+#define TAG(x) x##_wgpt0a
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_RGBA|SETUP_TMU0|SETUP_TMU1|\
+             SETUP_PTEX|SETUP_PSIZ)
+#define TAG(x) x##_wgpt0t1a
+#include "fxvbtmp.h"
+
+
+#define IND (SETUP_XYZW|SETUP_RGBA|SETUP_SPEC)
+#define TAG(x) x##_2wg
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_RGBA|SETUP_SPEC|SETUP_TMU0)
+#define TAG(x) x##_2wgt0
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_RGBA|SETUP_SPEC|SETUP_TMU0|SETUP_TMU1)
+#define TAG(x) x##_2wgt0t1
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_RGBA|SETUP_SPEC|SETUP_TMU0|SETUP_PTEX)
+#define TAG(x) x##_2wgpt0
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_RGBA|SETUP_SPEC|SETUP_TMU0|SETUP_TMU1|\
+             SETUP_PTEX)
+#define TAG(x) x##_2wgpt0t1
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_RGBA|SETUP_SPEC|SETUP_PSIZ)
+#define TAG(x) x##_2wga
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_RGBA|SETUP_SPEC|SETUP_TMU0|SETUP_PSIZ)
+#define TAG(x) x##_2wgt0a
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_RGBA|SETUP_SPEC|SETUP_TMU0|SETUP_TMU1|SETUP_PSIZ)
+#define TAG(x) x##_2wgt0t1a
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_RGBA|SETUP_SPEC|SETUP_TMU0|SETUP_PTEX|SETUP_PSIZ)
+#define TAG(x) x##_2wgpt0a
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_RGBA|SETUP_SPEC|SETUP_TMU0|SETUP_TMU1|\
+             SETUP_PTEX|SETUP_PSIZ)
+#define TAG(x) x##_2wgpt0t1a
+#include "fxvbtmp.h"
+
+
+/* Snapping for voodoo-1
+ */
+#define IND (SETUP_XYZW|SETUP_SNAP|SETUP_RGBA)
+#define TAG(x) x##_wsg
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_SNAP|SETUP_RGBA|SETUP_TMU0)
+#define TAG(x) x##_wsgt0
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_SNAP|SETUP_RGBA|SETUP_TMU0|\
+             SETUP_TMU1)
+#define TAG(x) x##_wsgt0t1
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_SNAP|SETUP_RGBA|SETUP_TMU0|\
+             SETUP_PTEX)
+#define TAG(x) x##_wsgpt0
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_SNAP|SETUP_RGBA|SETUP_TMU0|\
+	     SETUP_TMU1|SETUP_PTEX)
+#define TAG(x) x##_wsgpt0t1
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_SNAP|SETUP_RGBA|SETUP_PSIZ)
+#define TAG(x) x##_wsga
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_SNAP|SETUP_RGBA|SETUP_TMU0|SETUP_PSIZ)
+#define TAG(x) x##_wsgt0a
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_SNAP|SETUP_RGBA|SETUP_TMU0|\
+             SETUP_TMU1|SETUP_PSIZ)
+#define TAG(x) x##_wsgt0t1a
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_SNAP|SETUP_RGBA|SETUP_TMU0|\
+             SETUP_PTEX|SETUP_PSIZ)
+#define TAG(x) x##_wsgpt0a
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_SNAP|SETUP_RGBA|SETUP_TMU0|\
+	     SETUP_TMU1|SETUP_PTEX|SETUP_PSIZ)
+#define TAG(x) x##_wsgpt0t1a
+#include "fxvbtmp.h"
+
+
+#define IND (SETUP_XYZW|SETUP_SNAP|SETUP_RGBA|SETUP_SPEC)
+#define TAG(x) x##_2wsg
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_SNAP|SETUP_RGBA|SETUP_SPEC|SETUP_TMU0)
+#define TAG(x) x##_2wsgt0
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_SNAP|SETUP_RGBA|SETUP_SPEC|SETUP_TMU0|\
+             SETUP_TMU1)
+#define TAG(x) x##_2wsgt0t1
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_SNAP|SETUP_RGBA|SETUP_SPEC|SETUP_TMU0|\
+             SETUP_PTEX)
+#define TAG(x) x##_2wsgpt0
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_SNAP|SETUP_RGBA|SETUP_SPEC|SETUP_TMU0|\
+	     SETUP_TMU1|SETUP_PTEX)
+#define TAG(x) x##_2wsgpt0t1
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_SNAP|SETUP_RGBA|SETUP_SPEC|SETUP_PSIZ)
+#define TAG(x) x##_2wsga
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_SNAP|SETUP_RGBA|SETUP_SPEC|SETUP_TMU0|SETUP_PSIZ)
+#define TAG(x) x##_2wsgt0a
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_SNAP|SETUP_RGBA|SETUP_SPEC|SETUP_TMU0|\
+             SETUP_TMU1|SETUP_PSIZ)
+#define TAG(x) x##_2wsgt0t1a
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_SNAP|SETUP_RGBA|SETUP_SPEC|SETUP_TMU0|\
+             SETUP_PTEX|SETUP_PSIZ)
+#define TAG(x) x##_2wsgpt0a
+#include "fxvbtmp.h"
+
+#define IND (SETUP_XYZW|SETUP_SNAP|SETUP_RGBA|SETUP_SPEC|SETUP_TMU0|\
+	     SETUP_TMU1|SETUP_PTEX|SETUP_PSIZ)
+#define TAG(x) x##_2wsgpt0t1a
+#include "fxvbtmp.h"
+
+
+/* Vertex repair (multipass rendering)
+ */
+#define IND (SETUP_RGBA)
+#define TAG(x) x##_g
+#include "fxvbtmp.h"
+
+#define IND (SETUP_TMU0)
+#define TAG(x) x##_t0
+#include "fxvbtmp.h"
+
+#define IND (SETUP_TMU0|SETUP_TMU1)
+#define TAG(x) x##_t0t1
+#include "fxvbtmp.h"
+
+#define IND (SETUP_RGBA|SETUP_TMU0)
+#define TAG(x) x##_gt0
+#include "fxvbtmp.h"
+
+#define IND (SETUP_RGBA|SETUP_TMU0|SETUP_TMU1)
+#define TAG(x) x##_gt0t1
+#include "fxvbtmp.h"
+
+
+#define IND (SETUP_RGBA|SETUP_SPEC)
+#define TAG(x) x##_2g
+#include "fxvbtmp.h"
+
+#define IND (SETUP_TMU0|SETUP_SPEC)
+#define TAG(x) x##_2t0
+#include "fxvbtmp.h"
+
+#define IND (SETUP_TMU0|SETUP_SPEC|SETUP_TMU1)
+#define TAG(x) x##_2t0t1
+#include "fxvbtmp.h"
+
+#define IND (SETUP_RGBA|SETUP_SPEC|SETUP_TMU0)
+#define TAG(x) x##_2gt0
+#include "fxvbtmp.h"
+
+#define IND (SETUP_RGBA|SETUP_SPEC|SETUP_TMU0|SETUP_TMU1)
+#define TAG(x) x##_2gt0t1
+#include "fxvbtmp.h"
+
+
+
+static void init_setup_tab( void )
+{
+   init_wg();
+   init_wgt0();
+   init_wgt0t1();
+   init_wgpt0();
+   init_wgpt0t1();
+   init_wga();
+   init_wgt0a();
+   init_wgt0t1a();
+   init_wgpt0a();
+   init_wgpt0t1a();
+    init_2wg();
+    init_2wgt0();
+    init_2wgt0t1();
+    init_2wgpt0();
+    init_2wgpt0t1();
+    init_2wga();
+    init_2wgt0a();
+    init_2wgt0t1a();
+    init_2wgpt0a();
+    init_2wgpt0t1a();
+
+   init_wsg();
+   init_wsgt0();
+   init_wsgt0t1();
+   init_wsgpt0();
+   init_wsgpt0t1();
+   init_wsga();
+   init_wsgt0a();
+   init_wsgt0t1a();
+   init_wsgpt0a();
+   init_wsgpt0t1a();
+    init_2wsg();
+    init_2wsgt0();
+    init_2wsgt0t1();
+    init_2wsgpt0();
+    init_2wsgpt0t1();
+    init_2wsga();
+    init_2wsgt0a();
+    init_2wsgt0t1a();
+    init_2wsgpt0a();
+    init_2wsgpt0t1a();
+
+   init_g();
+   init_t0();
+   init_t0t1();
+   init_gt0();
+   init_gt0t1();
+    init_2g();
+    init_2t0();
+    init_2t0t1();
+    init_2gt0();
+    init_2gt0t1();
+}
+
+
+void fxPrintSetupFlags(char *msg, GLuint flags )
+{
+   fprintf(stderr, "%s(%x): %s%s%s%s%s%s%s\n",
+	   msg,
+	   (int)flags,
+	   (flags & SETUP_XYZW)     ? " xyzw," : "", 
+	   (flags & SETUP_SNAP)     ? " snap," : "", 
+	   (flags & SETUP_RGBA)     ? " rgba," : "",
+	   (flags & SETUP_TMU0)     ? " tex-0," : "",
+	   (flags & SETUP_TMU1)     ? " tex-1," : "",
+	   (flags & SETUP_PSIZ)     ? " psiz," : "",
+	   (flags & SETUP_SPEC)     ? " spec," : "");
+}
+
+
+
+void fxCheckTexSizes( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   fxMesaContext fxMesa = FX_CONTEXT( ctx );
+
+   if (!setup_tab[fxMesa->SetupIndex].check_tex_sizes(ctx)) {
+      GLuint ind = fxMesa->SetupIndex |= (SETUP_PTEX|SETUP_RGBA);
+
+      /* Tdfx handles projective textures nicely; just have to change
+       * up to the new vertex format.
+       */
+      if (setup_tab[ind].vertex_format != fxMesa->stw_hint_state) {
+
+	 fxMesa->stw_hint_state = setup_tab[ind].vertex_format;
+	 FX_grHints(GR_HINT_STWHINT, fxMesa->stw_hint_state);
+
+	 /* This is required as we have just changed the vertex
+	  * format, so the interp routines must also change.
+	  * In the unfilled and twosided cases we are using the
+	  * Extras ones anyway, so leave them in place.
+	  */
+	 if (!(ctx->_TriangleCaps & (DD_TRI_LIGHT_TWOSIDE|DD_TRI_UNFILLED))) {
+	    tnl->Driver.Render.Interp = setup_tab[fxMesa->SetupIndex].interp;
+	 }
+      }
+   }
+}
+
+
+void fxBuildVertices( GLcontext *ctx, GLuint start, GLuint count,
+			GLuint newinputs )
+{
+   fxMesaContext fxMesa = FX_CONTEXT( ctx );
+   GrVertex *v = (fxMesa->verts + start);
+
+   if (!newinputs)
+      return;
+
+   if (newinputs & VERT_BIT_POS) {
+      setup_tab[fxMesa->SetupIndex].emit( ctx, start, count, v );   
+   } else {
+      GLuint ind = 0;
+
+      /* [dBorca] masked by VERT_BIT_POS ?!?
+      if (newinputs & VERT_BIT_POINT_SIZE)
+	 ind |= SETUP_PSIZ;*/
+
+      if (newinputs & VERT_BIT_COLOR0)
+	 ind |= SETUP_RGBA;
+      
+      if (newinputs & VERT_BIT_COLOR1) {
+	 ind |= SETUP_SPEC;
+      }
+
+      if (newinputs & VERT_BIT_TEX0) 
+	 ind |= SETUP_TMU0;
+
+      if (newinputs & VERT_BIT_TEX1)
+	 ind |= SETUP_TMU0|SETUP_TMU1;
+
+      if (fxMesa->SetupIndex & SETUP_PTEX)
+	 ind = ~0;
+
+      ind &= fxMesa->SetupIndex;
+
+      if (ind) {
+	 setup_tab[ind].emit( ctx, start, count, v );   
+      }
+   }
+}
+
+
+void fxChooseVertexState( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   fxMesaContext fxMesa = FX_CONTEXT( ctx );
+   GLuint ind = SETUP_XYZW|SETUP_RGBA;
+
+   if (fxMesa->snapVertices)
+      ind |= SETUP_SNAP;
+
+   fxMesa->tmu_source[0] = 0;
+   fxMesa->tmu_source[1] = 1;
+
+   if (ctx->Texture._EnabledUnits & 0x2) {
+      if (ctx->Texture._EnabledUnits & 0x1) {
+	 ind |= SETUP_TMU1;
+      }
+      ind |= SETUP_TMU0;
+      fxMesa->tmu_source[0] = 1;
+      fxMesa->tmu_source[1] = 0;
+   }
+   else if (ctx->Texture._EnabledUnits & 0x1) {
+      ind |= SETUP_TMU0;
+   }
+
+   if (ctx->_TriangleCaps & (DD_POINT_SIZE|DD_POINT_ATTEN)) {
+      ind |= SETUP_PSIZ;
+   }
+
+   if (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR) {
+      ind |= SETUP_SPEC;
+   }
+
+   fxMesa->SetupIndex = ind;
+
+   if (ctx->_TriangleCaps & (DD_TRI_LIGHT_TWOSIDE|DD_TRI_UNFILLED)) {
+      tnl->Driver.Render.Interp = interp_extras;
+      tnl->Driver.Render.CopyPV = copy_pv_extras;
+   } else {
+      tnl->Driver.Render.Interp = setup_tab[ind].interp;
+      tnl->Driver.Render.CopyPV = setup_tab[ind].copy_pv;
+   }
+
+   if (setup_tab[ind].vertex_format != fxMesa->stw_hint_state) {
+      fxMesa->stw_hint_state = setup_tab[ind].vertex_format;
+      FX_grHints(GR_HINT_STWHINT, fxMesa->stw_hint_state);
+   }
+}
+
+
+
+void fxAllocVB( GLcontext *ctx )
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   GLuint size = TNL_CONTEXT(ctx)->vb.Size;
+   static int firsttime = 1;
+   if (firsttime) {
+      init_setup_tab();
+      firsttime = 0;
+   }
+
+   fxMesa->verts = (GrVertex *)ALIGN_MALLOC(size * sizeof(GrVertex), 32);
+   fxMesa->SetupIndex = SETUP_XYZW|SETUP_RGBA;
+}
+
+
+void fxFreeVB( GLcontext *ctx )
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   if (fxMesa->verts) {
+      ALIGN_FREE(fxMesa->verts);
+      fxMesa->verts = 0;
+   }
+}
+#else
+
+
+/*
+ * Need this to provide at least one external definition.
+ */
+
+extern int gl_fx_dummy_function_vb(void);
+int
+gl_fx_dummy_function_vb(void)
+{
+   return 0;
+}
+
+#endif /* FX */
diff --git a/reactos/lib/mesa32/src/drivers/glide/fxvbtmp.h b/reactos/lib/mesa32/src/drivers/glide/fxvbtmp.h
new file mode 100644
index 00000000000..ba6dd15acf7
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/glide/fxvbtmp.h
@@ -0,0 +1,317 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/* Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ *    Daniel Borca <dborca@users.sourceforge.net>
+ */
+
+
+#define VIEWPORT_X(dst,x) dst = s[0]  * x + s[12]
+#define VIEWPORT_Y(dst,y) dst = s[5]  * y + s[13]
+#define VIEWPORT_Z(dst,z) dst = s[10] * z + s[14]
+
+static void TAG(emit)( GLcontext *ctx,
+		       GLuint start, GLuint end,
+		       void *dest )
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+   GLuint tmu0_source = fxMesa->tmu_source[0];
+   GLuint tmu1_source = fxMesa->tmu_source[1];
+   GLfloat (*tc0)[4], (*tc1)[4];
+   GLfloat (*col)[4], (*spec)[4];
+   GLuint tc0_stride, tc1_stride, col_stride, spec_stride;
+   GLuint tc0_size, tc1_size;
+   GLfloat (*proj)[4] = VB->NdcPtr->data; 
+   GLuint proj_stride = VB->NdcPtr->stride;
+   GLfloat (*psize)[4];
+   GLuint psize_stride;
+   GrVertex *v = (GrVertex *)dest;
+   GLfloat u0scale,v0scale,u1scale,v1scale;
+   const GLubyte *mask = VB->ClipMask;
+   const GLfloat *const s = ctx->Viewport._WindowMap.m;
+   int i;
+
+   if (IND & SETUP_PSIZ) {
+      psize = VB->PointSizePtr->data;
+      psize_stride = VB->PointSizePtr->stride;
+   }
+
+   if (IND & SETUP_TMU0) {
+      tc0 = VB->TexCoordPtr[tmu0_source]->data;
+      tc0_stride = VB->TexCoordPtr[tmu0_source]->stride;
+      u0scale = fxMesa->s0scale;
+      v0scale = fxMesa->t0scale;
+      if (IND & SETUP_PTEX)
+	 tc0_size = VB->TexCoordPtr[tmu0_source]->size;
+   }
+
+   if (IND & SETUP_TMU1) {
+      tc1 = VB->TexCoordPtr[tmu1_source]->data;
+      tc1_stride = VB->TexCoordPtr[tmu1_source]->stride;
+      u1scale = fxMesa->s1scale; /* wrong if tmu1_source == 0, possible? */
+      v1scale = fxMesa->t1scale;
+      if (IND & SETUP_PTEX)
+	 tc1_size = VB->TexCoordPtr[tmu1_source]->size;
+   }
+   
+   if (IND & SETUP_RGBA) {
+      col = VB->ColorPtr[0]->data;
+      col_stride = VB->ColorPtr[0]->stride;
+   }
+
+   if (IND & SETUP_SPEC) {
+      spec = VB->SecondaryColorPtr[0]->data;
+      spec_stride = VB->SecondaryColorPtr[0]->stride;
+   }
+
+   if (start) {
+      proj =  (GLfloat (*)[4])((GLubyte *)proj + start * proj_stride);
+      if (IND & SETUP_PSIZ)
+         psize =  (GLfloat (*)[4])((GLubyte *)psize + start * psize_stride);
+      if (IND & SETUP_TMU0)
+	 tc0 =  (GLfloat (*)[4])((GLubyte *)tc0 + start * tc0_stride);
+      if (IND & SETUP_TMU1) 
+	 tc1 =  (GLfloat (*)[4])((GLubyte *)tc1 + start * tc1_stride);
+      if (IND & SETUP_RGBA) 
+	 STRIDE_4F(col, start * col_stride);
+      if (IND & SETUP_SPEC)
+	 STRIDE_4F(spec, start * spec_stride);
+   }
+
+   for (i=start; i < end; i++, v++) {
+      if (IND & SETUP_PSIZ) {
+         v->psize = psize[0][0];
+         psize =  (GLfloat (*)[4])((GLubyte *)psize +  psize_stride);
+      }
+   
+      if (IND & SETUP_XYZW) {
+         if (mask[i] == 0) {
+	    /* unclipped */
+	    VIEWPORT_X(v->x,   proj[0][0]);
+	    VIEWPORT_Y(v->y,   proj[0][1]);
+	    VIEWPORT_Z(v->ooz, proj[0][2]);
+	    v->oow = proj[0][3];
+         } else {
+            /* clipped */
+            v->oow = 1.0;
+         }
+
+	 if (IND & SETUP_SNAP) {
+#if defined(USE_IEEE)
+	    const float snapper = (3L << 18);
+	    v->x += snapper;
+	    v->x -= snapper;
+	    v->y += snapper;
+	    v->y -= snapper;
+#else
+	    v->x = ((int) (v->x * 16.0f)) * (1.0f / 16.0f);
+	    v->y = ((int) (v->y * 16.0f)) * (1.0f / 16.0f);
+#endif
+	 }
+
+	 proj =  (GLfloat (*)[4])((GLubyte *)proj +  proj_stride);
+      }
+      if (IND & SETUP_RGBA) {
+         UNCLAMPED_FLOAT_TO_UBYTE(v->pargb[2], col[0][0]);
+         UNCLAMPED_FLOAT_TO_UBYTE(v->pargb[1], col[0][1]);
+         UNCLAMPED_FLOAT_TO_UBYTE(v->pargb[0], col[0][2]);
+         UNCLAMPED_FLOAT_TO_UBYTE(v->pargb[3], col[0][3]);
+	 STRIDE_4F(col, col_stride);
+      }
+      if (IND & SETUP_SPEC) {
+	 UNCLAMPED_FLOAT_TO_UBYTE(v->pspec[2], spec[0][0]);
+	 UNCLAMPED_FLOAT_TO_UBYTE(v->pspec[1], spec[0][1]);
+	 UNCLAMPED_FLOAT_TO_UBYTE(v->pspec[0], spec[0][2]);
+	 STRIDE_4F(spec, spec_stride);
+      }
+      if (IND & SETUP_TMU0) {
+	 GLfloat w = v->oow;
+         v->tmuvtx[0].sow = tc0[0][0] * u0scale * w;
+         v->tmuvtx[0].tow = tc0[0][1] * v0scale * w;
+	 if (IND & SETUP_PTEX) {
+	    v->tmuvtx[0].oow = w;
+	    if (tc0_size == 4) 
+	       v->tmuvtx[0].oow *= tc0[0][3];
+	 } 
+	 tc0 =  (GLfloat (*)[4])((GLubyte *)tc0 +  tc0_stride);
+      }
+      if (IND & SETUP_TMU1) {
+	 GLfloat w = v->oow;
+         v->tmuvtx[1].sow = tc1[0][0] * u1scale * w;
+         v->tmuvtx[1].tow = tc1[0][1] * v1scale * w;
+	 if (IND & SETUP_PTEX) {
+	    v->tmuvtx[1].oow = w;
+	    if (tc1_size == 4) 
+	       v->tmuvtx[1].oow *= tc1[0][3];
+	 } 
+	 tc1 =  (GLfloat (*)[4])((GLubyte *)tc1 +  tc1_stride);
+      } 
+   }
+}
+
+#if (IND & SETUP_XYZW) && (IND & SETUP_RGBA)
+
+static GLboolean TAG(check_tex_sizes)( GLcontext *ctx )
+{
+/*     fprintf(stderr, "%s\n", __FUNCTION__); */
+
+   if (IND & SETUP_PTEX)
+      return GL_TRUE;
+   
+   if (IND & SETUP_TMU0) {
+      struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+
+      if (IND & SETUP_TMU1) {
+	 if (VB->TexCoordPtr[0] == 0)
+	    VB->TexCoordPtr[0] = VB->TexCoordPtr[1];
+	 
+	 if (VB->TexCoordPtr[1]->size == 4)
+	    return GL_FALSE;
+      }
+
+      if (VB->TexCoordPtr[0] && VB->TexCoordPtr[0]->size == 4)
+	 return GL_FALSE;
+   }
+
+   return GL_TRUE;
+}
+
+static void TAG(interp)( GLcontext *ctx,
+			 GLfloat t, 
+			 GLuint edst, GLuint eout, GLuint ein,
+			 GLboolean force_boundary )
+{
+   fxMesaContext fxMesa = FX_CONTEXT( ctx );
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+   const GLfloat *dstclip = VB->ClipPtr->data[edst];
+   const GLfloat oow = (dstclip[3] == 0.0F) ? 1.0F : (1.0F / dstclip[3]);
+   const GLfloat *const s = ctx->Viewport._WindowMap.m;
+   GrVertex *fxverts = fxMesa->verts;
+   GrVertex *dst = (GrVertex *) (fxverts + edst);
+   const GrVertex *out = (const GrVertex *) (fxverts + eout);
+   const GrVertex *in = (const GrVertex *) (fxverts + ein);
+   const GLfloat wout = oow / out->oow;
+   const GLfloat win = oow / in->oow;
+
+   VIEWPORT_X(dst->x,   dstclip[0] * oow);
+   VIEWPORT_Y(dst->y,   dstclip[1] * oow);
+   VIEWPORT_Z(dst->ooz, dstclip[2] * oow);
+   dst->oow = oow;	
+   
+   if (IND & SETUP_SNAP) {
+#if defined(USE_IEEE)
+      const float snapper = (3L << 18);
+      dst->x += snapper;
+      dst->x -= snapper;
+      dst->y += snapper;
+      dst->y -= snapper;
+#else
+      dst->x = ((int) (dst->x * 16.0f)) * (1.0f / 16.0f);
+      dst->y = ((int) (dst->y * 16.0f)) * (1.0f / 16.0f);
+#endif
+   }
+
+   
+   INTERP_UB( t, dst->pargb[0], out->pargb[0], in->pargb[0] );
+   INTERP_UB( t, dst->pargb[1], out->pargb[1], in->pargb[1] );
+   INTERP_UB( t, dst->pargb[2], out->pargb[2], in->pargb[2] );
+   INTERP_UB( t, dst->pargb[3], out->pargb[3], in->pargb[3] );
+
+   if (IND & SETUP_SPEC) {
+      INTERP_UB( t, dst->pspec[0], out->pspec[0], in->pspec[0] );
+      INTERP_UB( t, dst->pspec[1], out->pspec[1], in->pspec[1] );
+      INTERP_UB( t, dst->pspec[2], out->pspec[2], in->pspec[2] );
+   }
+
+   if (IND & SETUP_TMU0) {
+      INTERP_F( t,
+		dst->tmuvtx[0].sow,
+		out->tmuvtx[0].sow * wout,
+		in->tmuvtx[0].sow * win );
+      INTERP_F( t,
+		dst->tmuvtx[0].tow,
+		out->tmuvtx[0].tow * wout,
+		in->tmuvtx[0].tow * win );
+      if (IND & SETUP_PTEX) {
+	 INTERP_F( t,
+		   dst->tmuvtx[0].oow, 
+		   out->tmuvtx[0].oow * wout, 
+		   in->tmuvtx[0].oow * win );
+      }
+   }
+
+   if (IND & SETUP_TMU1) {
+      INTERP_F( t,
+		dst->tmuvtx[1].sow,
+		out->tmuvtx[1].sow * wout,
+		in->tmuvtx[1].sow * win );
+      INTERP_F( t,
+		dst->tmuvtx[1].tow,
+		out->tmuvtx[1].tow * wout,
+		in->tmuvtx[1].tow * win );
+      if (IND & SETUP_PTEX) {
+	 INTERP_F( t,
+		   dst->tmuvtx[1].oow, 
+		   out->tmuvtx[1].oow * wout, 
+		   in->tmuvtx[1].oow * win );
+      }
+   }
+}
+#endif
+
+
+static void TAG(init)( void )
+{
+   setup_tab[IND].emit = TAG(emit);
+   
+   if (IND & SETUP_SPEC) {
+      setup_tab[IND].copy_pv = copy_pv2;
+   } else {
+      setup_tab[IND].copy_pv = copy_pv;
+   }
+
+#if ((IND & SETUP_XYZW) && (IND & SETUP_RGBA))
+   setup_tab[IND].check_tex_sizes = TAG(check_tex_sizes);
+   setup_tab[IND].interp = TAG(interp);
+
+   if (IND & SETUP_PTEX) {
+      setup_tab[IND].vertex_format = (GR_STWHINT_W_DIFF_TMU0 |
+				      GR_STWHINT_W_DIFF_TMU1);
+   }
+   else {
+      setup_tab[IND].vertex_format = 0;
+   }
+
+#if (IND & SETUP_TMU1)
+     setup_tab[IND].vertex_format |= GR_STWHINT_ST_DIFF_TMU1;
+#endif
+
+#endif
+}
+
+
+#undef IND
+#undef TAG
diff --git a/reactos/lib/mesa32/src/drivers/glide/fxwgl.c b/reactos/lib/mesa32/src/drivers/glide/fxwgl.c
new file mode 100644
index 00000000000..adf88a485c6
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/glide/fxwgl.c
@@ -0,0 +1,1017 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.0
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/* Authors:
+ *    David Bucciarelli
+ *    Brian Paul
+ *    Keith Whitwell
+ *    Hiroshi Morii
+ *    Daniel Borca
+ */
+
+/* fxwgl.c - Microsoft wgl functions emulation for
+ *           3Dfx VooDoo/Mesa interface
+ */
+
+
+#ifdef _WIN32
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#include <windows.h>
+#define GL_GLEXT_PROTOTYPES
+#include "GL/gl.h"
+#include "GL/glext.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+#include "GL/fxmesa.h"
+#include "glheader.h"
+#include "glapi.h"
+#include "imports.h"
+#include "fxdrv.h"
+
+#define MAX_MESA_ATTRS  20
+
+#if (_MSC_VER >= 1200)
+#pragma warning( push )
+#pragma warning( disable : 4273 )
+#endif
+
+struct __extensions__
+{
+   PROC proc;
+   char *name;
+};
+
+struct __pixelformat__
+{
+   PIXELFORMATDESCRIPTOR pfd;
+   GLint mesaAttr[MAX_MESA_ATTRS];
+};
+
+WINGDIAPI void GLAPIENTRY gl3DfxSetPaletteEXT(GLuint *);
+static GLushort gammaTable[3*256];
+
+struct __pixelformat__ pix[] = {
+   /* 16bit RGB565 single buffer with depth */
+   {
+    {sizeof(PIXELFORMATDESCRIPTOR), 1,
+     PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL,
+     PFD_TYPE_RGBA,
+     16,
+     5, 0, 6, 5, 5, 11, 0, 0,
+     0, 0, 0, 0, 0,
+     16,
+     0,
+     0,
+     PFD_MAIN_PLANE,
+     0, 0, 0, 0}
+    ,
+    {FXMESA_COLORDEPTH, 16,
+     FXMESA_ALPHA_SIZE, 0,
+     FXMESA_DEPTH_SIZE, 16,
+     FXMESA_STENCIL_SIZE, 0,
+     FXMESA_ACCUM_SIZE, 0,
+     FXMESA_NONE}
+   }
+   ,
+   /* 16bit RGB565 double buffer with depth */
+   {
+    {sizeof(PIXELFORMATDESCRIPTOR), 1,
+     PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL |
+     PFD_DOUBLEBUFFER | PFD_SWAP_COPY,
+     PFD_TYPE_RGBA,
+     16,
+     5, 0, 6, 5, 5, 11, 0, 0,
+     0, 0, 0, 0, 0,
+     16,
+     0,
+     0,
+     PFD_MAIN_PLANE,
+     0, 0, 0, 0}
+    ,
+    {FXMESA_COLORDEPTH, 16,
+     FXMESA_DOUBLEBUFFER,
+     FXMESA_ALPHA_SIZE, 0,
+     FXMESA_DEPTH_SIZE, 16,
+     FXMESA_STENCIL_SIZE, 0,
+     FXMESA_ACCUM_SIZE, 0,
+     FXMESA_NONE}
+   }
+   ,
+   /* 16bit ARGB1555 single buffer with depth */
+   {
+    {sizeof(PIXELFORMATDESCRIPTOR), 1,
+     PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL,
+     PFD_TYPE_RGBA,
+     16,
+     5, 0, 5, 5, 5, 10, 1, 15,
+     0, 0, 0, 0, 0,
+     16,
+     0,
+     0,
+     PFD_MAIN_PLANE,
+     0, 0, 0, 0}
+    ,
+    {FXMESA_COLORDEPTH, 15,
+     FXMESA_ALPHA_SIZE, 1,
+     FXMESA_DEPTH_SIZE, 16,
+     FXMESA_STENCIL_SIZE, 0,
+     FXMESA_ACCUM_SIZE, 0,
+     FXMESA_NONE}
+   }
+   ,
+   /* 16bit ARGB1555 double buffer with depth */
+   {
+    {sizeof(PIXELFORMATDESCRIPTOR), 1,
+     PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL |
+     PFD_DOUBLEBUFFER | PFD_SWAP_COPY,
+     PFD_TYPE_RGBA,
+     16,
+     5, 0, 5, 5, 5, 10, 1, 15,
+     0, 0, 0, 0, 0,
+     16,
+     0,
+     0,
+     PFD_MAIN_PLANE,
+     0, 0, 0, 0}
+    ,
+    {FXMESA_COLORDEPTH, 15,
+     FXMESA_DOUBLEBUFFER,
+     FXMESA_ALPHA_SIZE, 1,
+     FXMESA_DEPTH_SIZE, 16,
+     FXMESA_STENCIL_SIZE, 0,
+     FXMESA_ACCUM_SIZE, 0,
+     FXMESA_NONE}
+   }
+   ,
+   /* 32bit ARGB8888 single buffer with depth */
+   {
+    {sizeof(PIXELFORMATDESCRIPTOR), 1,
+     PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL,
+     PFD_TYPE_RGBA,
+     32,
+     8, 0, 8, 8, 8, 16, 8, 24,
+     0, 0, 0, 0, 0,
+     24,
+     8,
+     0,
+     PFD_MAIN_PLANE,
+     0, 0, 0, 0}
+    ,
+    {FXMESA_COLORDEPTH, 32,
+     FXMESA_ALPHA_SIZE, 8,
+     FXMESA_DEPTH_SIZE, 24,
+     FXMESA_STENCIL_SIZE, 8,
+     FXMESA_ACCUM_SIZE, 0,
+     FXMESA_NONE}
+   }
+   ,
+   /* 32bit ARGB8888 double buffer with depth */
+   {
+    {sizeof(PIXELFORMATDESCRIPTOR), 1,
+     PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL |
+     PFD_DOUBLEBUFFER | PFD_SWAP_COPY,
+     PFD_TYPE_RGBA,
+     32,
+     8, 0, 8, 8, 8, 16, 8, 24,
+     0, 0, 0, 0, 0,
+     24,
+     8,
+     0,
+     PFD_MAIN_PLANE,
+     0, 0, 0, 0}
+    ,
+    {FXMESA_COLORDEPTH, 32,
+     FXMESA_DOUBLEBUFFER,
+     FXMESA_ALPHA_SIZE, 8,
+     FXMESA_DEPTH_SIZE, 24,
+     FXMESA_STENCIL_SIZE, 8,
+     FXMESA_ACCUM_SIZE, 0,
+     FXMESA_NONE}
+   }
+};
+static int qt_pix = sizeof(pix) / sizeof(pix[0]);
+
+static fxMesaContext ctx = NULL;
+static WNDPROC hWNDOldProc;
+static int curPFD = 0;
+static HDC hDC;
+static HWND hWND;
+
+static GLboolean haveDualHead;
+
+/* For the in-window-rendering hack */
+
+#ifndef GR_CONTROL_RESIZE
+/* Apparently GR_CONTROL_RESIZE can be ignored. OK? */
+#define GR_CONTROL_RESIZE -1
+#endif
+
+static GLboolean gdiWindowHack;
+static void *dibSurfacePtr;
+static BITMAPINFO *dibBMI;
+static HBITMAP dibHBM;
+static HWND dibWnd;
+
+static LRESULT APIENTRY 
+__wglMonitor(HWND hwnd, UINT message, UINT wParam, LONG lParam)
+ {
+   long ret;			/* Now gives the resized window at the end to hWNDOldProc */
+
+   if (ctx && hwnd == hWND) {
+     switch (message) {
+       case WM_PAINT:
+       case WM_MOVE:
+	   break;
+       case WM_DISPLAYCHANGE:
+       case WM_SIZE:
+#if 0
+       if (wParam != SIZE_MINIMIZED) {
+         static int moving = 0;
+         if (!moving) {
+           if (!FX_grSstControl(GR_CONTROL_RESIZE)) {
+             moving = 1;
+             SetWindowPos(hwnd, 0, 0, 0, 300, 300, SWP_NOMOVE | SWP_NOZORDER);
+             moving = 0;
+             if (!FX_grSstControl(GR_CONTROL_RESIZE)) {
+               /*MessageBox(0,_T("Error changing windowsize"),_T("fxMESA"),MB_OK); */
+               PostMessage(hWND, WM_CLOSE, 0, 0);
+		     }
+		   }
+	       /* Do the clipping in the glide library */
+	       grClipWindow(0, 0, FX_grSstScreenWidth(), FX_grSstScreenHeight());
+           /* And let the new size set in the context */
+           fxMesaUpdateScreenSize(ctx);
+	     }
+	   }
+#endif
+       break;
+       case WM_ACTIVATE:
+       break;
+       case WM_SHOWWINDOW:
+	   break;
+       case WM_SYSKEYDOWN:
+       case WM_SYSCHAR:
+	   break;
+     }
+   }
+
+   /* Finaly call the hWNDOldProc, which handles the resize witch the
+      now changed window sizes */
+   ret = CallWindowProc(hWNDOldProc, hwnd, message, wParam, lParam);
+
+   return (ret);
+}
+
+GLAPI BOOL GLAPIENTRY
+wglCopyContext(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask)
+{
+   return (FALSE);
+}
+
+GLAPI HGLRC GLAPIENTRY
+wglCreateContext(HDC hdc)
+{
+   HWND hWnd;
+   WNDPROC oldProc;
+   int error;
+
+   if (ctx) {
+      SetLastError(0);
+      return (NULL);
+   }
+
+   if (!(hWnd = WindowFromDC(hdc))) {
+      SetLastError(0);
+      return (NULL);
+   }
+
+   if (curPFD == 0) {
+      SetLastError(0);
+      return (NULL);
+   }
+
+   if ((oldProc = (WNDPROC) GetWindowLong(hWnd, GWL_WNDPROC)) != __wglMonitor) {
+      hWNDOldProc = oldProc;
+      SetWindowLong(hWnd, GWL_WNDPROC, (LONG) __wglMonitor);
+   }
+
+   {
+    char *env;
+    /* always log when debugging, or if user demands */
+#if !FX_DEBUG
+    if ((env = getenv("MESA_FX_INFO")) && env[0] == 'r')
+#endif
+      freopen("MESA.LOG", "w", stderr);
+   }
+
+   {
+     RECT cliRect;
+     ShowWindow(hWnd, SW_SHOWNORMAL);
+     SetForegroundWindow(hWnd);
+     Sleep(100); /* a hack for win95 */
+     GetClientRect(hWnd, &cliRect);
+     error = !(ctx = fxMesaCreateBestContext((GLuint) hWnd, cliRect.right, cliRect.bottom, pix[curPFD - 1].mesaAttr));
+   }
+
+   /*if (getenv("SST_DUALHEAD"))
+      haveDualHead =
+	 ((atoi(getenv("SST_DUALHEAD")) == 1) ? GL_TRUE : GL_FALSE);
+   else
+      haveDualHead = GL_FALSE;*/
+
+   if (error) {
+      SetLastError(0);
+      return (NULL);
+   }
+
+   hDC = hdc;
+   hWND = hWnd;
+
+   /* Required by the OpenGL Optimizer 1.1 (is it a Optimizer bug ?) */
+   wglMakeCurrent(hdc, (HGLRC) 1);
+
+   return ((HGLRC) 1);
+}
+
+GLAPI HGLRC GLAPIENTRY
+wglCreateLayerContext(HDC hdc, int iLayerPlane)
+{
+   SetLastError(0);
+   return (NULL);
+}
+
+GLAPI BOOL GLAPIENTRY
+wglDeleteContext(HGLRC hglrc)
+{
+   if (ctx && hglrc == (HGLRC) 1) {
+
+      fxMesaDestroyContext(ctx);
+
+      SetWindowLong(WindowFromDC(hDC), GWL_WNDPROC, (LONG) hWNDOldProc);
+
+      ctx = NULL;
+      hDC = 0;
+      return (TRUE);
+   }
+
+   SetLastError(0);
+
+   return (FALSE);
+}
+
+GLAPI HGLRC GLAPIENTRY
+wglGetCurrentContext(VOID)
+{
+   if (ctx)
+      return ((HGLRC) 1);
+
+   SetLastError(0);
+   return (NULL);
+}
+
+GLAPI HDC GLAPIENTRY
+wglGetCurrentDC(VOID)
+{
+   if (ctx)
+      return (hDC);
+
+   SetLastError(0);
+   return (NULL);
+}
+
+GLAPI BOOL GLAPIENTRY
+wglSwapIntervalEXT (int interval)
+{
+ if (ctx == NULL) {
+    return FALSE;
+ }
+ if (interval < 0) {
+    interval = 0;
+ } else if (interval > 3) {
+    interval = 3;
+ }
+ ctx->swapInterval = interval;
+ return TRUE;
+}
+
+GLAPI int GLAPIENTRY
+wglGetSwapIntervalEXT (void)
+{
+ return (ctx == NULL) ? -1 : ctx->swapInterval;
+}
+
+GLAPI BOOL GLAPIENTRY
+wglGetDeviceGammaRamp3DFX (HDC hdc, LPVOID arrays)
+{
+ /* gammaTable should be per-context */
+ memcpy(arrays, gammaTable, 3*256*sizeof(GLushort));
+ return TRUE;
+}
+
+GLAPI BOOL GLAPIENTRY
+wglSetDeviceGammaRamp3DFX (HDC hdc, LPVOID arrays)
+{
+ GLint i, tableSize, inc, index;
+ GLushort *red, *green, *blue;
+ FxU32 gammaTableR[256], gammaTableG[256], gammaTableB[256];
+
+ /* gammaTable should be per-context */
+ memcpy(gammaTable, arrays, 3*256*sizeof(GLushort));
+
+ tableSize = FX_grGetInteger(GR_GAMMA_TABLE_ENTRIES);
+ inc = 256 / tableSize;
+ red = (GLushort *)arrays;
+ green = (GLushort *)arrays + 256;
+ blue = (GLushort *)arrays + 512;
+ for (i = 0, index = 0; i < tableSize; i++, index += inc) {
+     gammaTableR[i] = red[index] >> 8;
+     gammaTableG[i] = green[index] >> 8;
+     gammaTableB[i] = blue[index] >> 8;
+ }
+
+ grLoadGammaTable(tableSize, gammaTableR, gammaTableG, gammaTableB);
+
+ return TRUE;
+}
+
+GLAPI const char * GLAPIENTRY
+wglGetExtensionsStringEXT (void)
+{
+ return "WGL_3DFX_gamma_control "
+        "WGL_EXT_swap_control "
+        "WGL_EXT_extensions_string WGL_ARB_extensions_string";
+}
+
+GLAPI const char * GLAPIENTRY
+wglGetExtensionsStringARB (HDC hdc)
+{
+ return wglGetExtensionsStringEXT();
+}
+
+static struct {
+       const char *name;
+       PROC func;
+} wgl_ext[] = {
+       {"wglGetExtensionsStringARB", wglGetExtensionsStringARB},
+       {"wglGetExtensionsStringEXT", wglGetExtensionsStringEXT},
+       {"wglSwapIntervalEXT",        wglSwapIntervalEXT},
+       {"wglGetSwapIntervalEXT",     wglGetSwapIntervalEXT},
+       {"wglGetDeviceGammaRamp3DFX", wglGetDeviceGammaRamp3DFX},
+       {"wglSetDeviceGammaRamp3DFX", wglSetDeviceGammaRamp3DFX},
+       {NULL, NULL}
+};
+
+GLAPI PROC GLAPIENTRY
+wglGetProcAddress(LPCSTR lpszProc)
+{ 
+   int i;
+   PROC p = (PROC) _glapi_get_proc_address((const char *) lpszProc);
+
+   if (p)
+      return p;
+
+   for (i = 0; wgl_ext[i].name; i++) {
+       if (!strcmp(lpszProc, wgl_ext[i].name)) {
+          return wgl_ext[i].func;
+       }
+   }
+
+   SetLastError(0);
+   return (NULL);
+}
+
+GLAPI PROC GLAPIENTRY
+wglGetDefaultProcAddress(LPCSTR lpszProc)
+{ 
+   SetLastError(0);
+   return (NULL);
+}
+
+GLAPI BOOL GLAPIENTRY
+wglMakeCurrent(HDC hdc, HGLRC hglrc)
+{
+   if ((hdc == NULL) && (hglrc == NULL))
+      return (TRUE);
+
+   if (!ctx || hglrc != (HGLRC) 1 || WindowFromDC(hdc) != hWND) {
+      SetLastError(0);
+      return (FALSE);
+   }
+
+   hDC = hdc;
+
+   fxMesaMakeCurrent(ctx);
+
+   return (TRUE);
+}
+
+GLAPI BOOL GLAPIENTRY
+wglShareLists(HGLRC hglrc1, HGLRC hglrc2)
+{
+   if (!ctx || hglrc1 != (HGLRC) 1 || hglrc1 != hglrc2) {
+      SetLastError(0);
+      return (FALSE);
+   }
+
+   return (TRUE);
+}
+
+static BOOL
+wglUseFontBitmaps_FX(HDC fontDevice, DWORD firstChar, DWORD numChars,
+		     DWORD listBase)
+{
+   TEXTMETRIC metric;
+   BITMAPINFO *dibInfo;
+   HDC bitDevice;
+   COLORREF tempColor;
+   int i;
+
+   GetTextMetrics(fontDevice, &metric);
+
+   dibInfo = (BITMAPINFO *) calloc(sizeof(BITMAPINFO) + sizeof(RGBQUAD), 1);
+   dibInfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
+   dibInfo->bmiHeader.biPlanes = 1;
+   dibInfo->bmiHeader.biBitCount = 1;
+   dibInfo->bmiHeader.biCompression = BI_RGB;
+
+   bitDevice = CreateCompatibleDC(fontDevice);
+
+   // Swap fore and back colors so the bitmap has the right polarity
+   tempColor = GetBkColor(bitDevice);
+   SetBkColor(bitDevice, GetTextColor(bitDevice));
+   SetTextColor(bitDevice, tempColor);
+
+   // Place chars based on base line
+   SetTextAlign(bitDevice, TA_BASELINE);
+
+   for (i = 0; i < (int)numChars; i++) {
+      SIZE size;
+      char curChar;
+      int charWidth, charHeight, bmapWidth, bmapHeight, numBytes, res;
+      HBITMAP bitObject;
+      HGDIOBJ origBmap;
+      unsigned char *bmap;
+
+      curChar = (char)(i + firstChar); // [koolsmoky] explicit cast
+
+      // Find how high/wide this character is
+      GetTextExtentPoint32(bitDevice, &curChar, 1, &size);
+ 
+      // Create the output bitmap
+      charWidth = size.cx;
+      charHeight = size.cy;
+      bmapWidth = ((charWidth + 31) / 32) * 32;	// Round up to the next multiple of 32 bits
+      bmapHeight = charHeight;
+      bitObject = CreateCompatibleBitmap(bitDevice, bmapWidth, bmapHeight);
+      //VERIFY(bitObject);
+
+      // Assign the output bitmap to the device
+      origBmap = SelectObject(bitDevice, bitObject);
+
+      PatBlt(bitDevice, 0, 0, bmapWidth, bmapHeight, BLACKNESS);
+
+      // Use our source font on the device
+      SelectObject(bitDevice, GetCurrentObject(fontDevice, OBJ_FONT));
+
+      // Draw the character
+      TextOut(bitDevice, 0, metric.tmAscent, &curChar, 1);
+
+      // Unselect our bmap object
+      SelectObject(bitDevice, origBmap);
+
+      // Convert the display dependant representation to a 1 bit deep DIB
+      numBytes = (bmapWidth * bmapHeight) / 8;
+      bmap = MALLOC(numBytes);
+      dibInfo->bmiHeader.biWidth = bmapWidth;
+      dibInfo->bmiHeader.biHeight = bmapHeight;
+      res = GetDIBits(bitDevice, bitObject, 0, bmapHeight, bmap,
+		      dibInfo, DIB_RGB_COLORS);
+
+      // Create the GL object
+      glNewList(i + listBase, GL_COMPILE);
+      glBitmap(bmapWidth, bmapHeight, 0.0, metric.tmDescent,
+	       charWidth, 0.0, bmap);
+      glEndList();
+      // CheckGL();
+
+      // Destroy the bmap object
+      DeleteObject(bitObject);
+
+      // Deallocate the bitmap data
+      FREE(bmap);
+   }
+
+   // Destroy the DC
+   DeleteDC(bitDevice);
+
+   FREE(dibInfo);
+
+   return TRUE;
+}
+
+GLAPI BOOL GLAPIENTRY
+wglUseFontBitmapsW(HDC hdc, DWORD first, DWORD count, DWORD listBase)
+{
+   return (FALSE);
+}
+
+GLAPI BOOL GLAPIENTRY
+wglUseFontOutlinesA(HDC hdc, DWORD first, DWORD count,
+		    DWORD listBase, FLOAT deviation,
+		    FLOAT extrusion, int format, LPGLYPHMETRICSFLOAT lpgmf)
+{
+   SetLastError(0);
+   return (FALSE);
+}
+
+GLAPI BOOL GLAPIENTRY
+wglUseFontOutlinesW(HDC hdc, DWORD first, DWORD count,
+		    DWORD listBase, FLOAT deviation,
+		    FLOAT extrusion, int format, LPGLYPHMETRICSFLOAT lpgmf)
+{
+   SetLastError(0);
+   return (FALSE);
+}
+
+
+GLAPI BOOL GLAPIENTRY
+wglSwapLayerBuffers(HDC hdc, UINT fuPlanes)
+{
+   if (ctx && WindowFromDC(hdc) == hWND) {
+      fxMesaSwapBuffers();
+
+      return (TRUE);
+   }
+
+   SetLastError(0);
+   return (FALSE);
+}
+
+GLAPI int GLAPIENTRY
+wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR * ppfd)
+{
+   int i, best = -1, qt_valid_pix;
+
+#if 0
+  FILE *pix_file;
+  pix_file = fopen("pix_log.txt", "a");
+  if (pix_file) {
+  fprintf(pix_file, "wglChoosePixelFormat\n");
+  fprintf(pix_file, "nSize           = %d\n",ppfd->nSize);
+  fprintf(pix_file, "nVersion        = %d\n",ppfd->nVersion);
+  fprintf(pix_file, "dwFlags         = %d\n",ppfd->dwFlags);
+  fprintf(pix_file, "iPixelType      = %d\n",ppfd->iPixelType);
+  fprintf(pix_file, "cColorBits      = %d\n",ppfd->cColorBits);
+  fprintf(pix_file, "cRedBits        = %d\n",ppfd->cRedBits);
+  fprintf(pix_file, "cRedShift       = %d\n",ppfd->cRedShift);
+  fprintf(pix_file, "cGreenBits      = %d\n",ppfd->cGreenBits);
+  fprintf(pix_file, "cGreenShift     = %d\n",ppfd->cGreenShift);
+  fprintf(pix_file, "cBlueBits       = %d\n",ppfd->cBlueBits);
+  fprintf(pix_file, "cBlueShift      = %d\n",ppfd->cBlueShift);
+  fprintf(pix_file, "cAlphaBits      = %d\n",ppfd->cAlphaBits);
+  fprintf(pix_file, "cAlphaShift     = %d\n",ppfd->cAlphaShift);
+  fprintf(pix_file, "cAccumBits      = %d\n",ppfd->cAccumBits);
+  fprintf(pix_file, "cAccumRedBits   = %d\n",ppfd->cAccumRedBits);
+  fprintf(pix_file, "cAccumGreenBits = %d\n",ppfd->cAccumGreenBits);
+  fprintf(pix_file, "cAccumBlueBits  = %d\n",ppfd->cAccumBlueBits);
+  fprintf(pix_file, "cAccumAlphaBits = %d\n",ppfd->cAccumAlphaBits);
+  fprintf(pix_file, "cDepthBits      = %d\n",ppfd->cDepthBits);
+  fprintf(pix_file, "cStencilBits    = %d\n",ppfd->cStencilBits);
+  fprintf(pix_file, "cAuxBuffers     = %d\n",ppfd->cAuxBuffers);
+  fprintf(pix_file, "iLayerType      = %d\n",ppfd->iLayerType);
+  fprintf(pix_file, "bReserved       = %d\n",ppfd->bReserved);
+  fprintf(pix_file, "dwLayerMask     = %d\n",ppfd->dwLayerMask);
+  fprintf(pix_file, "dwVisibleMask   = %d\n",ppfd->dwVisibleMask);
+  fprintf(pix_file, "dwDamageMask    = %d\n",ppfd->dwDamageMask);
+  fclose(pix_file);
+  }
+#endif
+
+#if 1 || QUAKE2
+  if (ppfd->cColorBits == 24 && ppfd->cDepthBits == 32) {
+     ppfd->cColorBits = 16;
+     ppfd->cDepthBits = 16;
+  }
+#endif
+
+   qt_valid_pix = qt_pix;
+
+   if (ppfd->nSize != sizeof(PIXELFORMATDESCRIPTOR) || ppfd->nVersion != 1) {
+      SetLastError(0);
+      return (0);
+   }
+
+   for (i = 0; i < qt_valid_pix; i++) {
+      if (ppfd->cColorBits > 0 && pix[i].pfd.cColorBits != ppfd->cColorBits) 
+		  continue;
+
+      if ((ppfd->dwFlags & PFD_DRAW_TO_WINDOW)
+	  && !(pix[i].pfd.dwFlags & PFD_DRAW_TO_WINDOW)) continue;
+      if ((ppfd->dwFlags & PFD_DRAW_TO_BITMAP)
+	  && !(pix[i].pfd.dwFlags & PFD_DRAW_TO_BITMAP)) continue;
+      if ((ppfd->dwFlags & PFD_SUPPORT_GDI)
+	  && !(pix[i].pfd.dwFlags & PFD_SUPPORT_GDI)) continue;
+      if ((ppfd->dwFlags & PFD_SUPPORT_OPENGL)
+	  && !(pix[i].pfd.dwFlags & PFD_SUPPORT_OPENGL)) continue;
+      if (!(ppfd->dwFlags & PFD_DOUBLEBUFFER_DONTCARE)
+	  && ((ppfd->dwFlags & PFD_DOUBLEBUFFER) !=
+	      (pix[i].pfd.dwFlags & PFD_DOUBLEBUFFER))) continue;
+      if (!(ppfd->dwFlags & PFD_STEREO_DONTCARE)
+	  && ((ppfd->dwFlags & PFD_STEREO) !=
+	      (pix[i].pfd.dwFlags & PFD_STEREO))) continue;
+
+      if (ppfd->cDepthBits > 0 && pix[i].pfd.cDepthBits == 0)
+	 continue;		/* need depth buffer */
+
+      if (ppfd->cAlphaBits > 0 && pix[i].pfd.cAlphaBits == 0)
+	 continue;		/* need alpha buffer */
+
+#if 0
+      if ((ppfd->cColorBits == 32) && (ppfd->cStencilBits > 0 && pix[i].pfd.cStencilBits == 0))
+	 continue;		/* need stencil */
+#endif
+
+      if (ppfd->iPixelType == pix[i].pfd.iPixelType) {
+	 best = i + 1;
+	 break;
+      }
+   }
+
+   if (best == -1) {
+      SetLastError(0);
+      return (0);
+   }
+
+   return (best);
+}
+
+GLAPI int GLAPIENTRY
+ChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR * ppfd)
+{
+  
+   return wglChoosePixelFormat(hdc, ppfd);
+}
+
+GLAPI int GLAPIENTRY
+wglDescribePixelFormat(HDC hdc, int iPixelFormat, UINT nBytes,
+		       LPPIXELFORMATDESCRIPTOR ppfd)
+{
+   int qt_valid_pix;
+
+   qt_valid_pix = qt_pix;
+
+   if (iPixelFormat < 1 || iPixelFormat > qt_valid_pix ||
+       ((nBytes != sizeof(PIXELFORMATDESCRIPTOR)) && (nBytes != 0))) {
+      SetLastError(0);
+      return (0);
+   }
+
+   if (nBytes != 0)
+      *ppfd = pix[iPixelFormat - 1].pfd;
+
+   return (qt_valid_pix);
+}
+
+GLAPI int GLAPIENTRY
+DescribePixelFormat(HDC hdc, int iPixelFormat, UINT nBytes,
+		    LPPIXELFORMATDESCRIPTOR ppfd)
+{
+   return wglDescribePixelFormat(hdc, iPixelFormat, nBytes, ppfd);
+}
+
+GLAPI int GLAPIENTRY
+wglGetPixelFormat(HDC hdc)
+{
+   if (curPFD == 0) {
+      SetLastError(0);
+      return (0);
+   }
+
+   return (curPFD);
+}
+
+GLAPI int GLAPIENTRY
+GetPixelFormat(HDC hdc)
+{
+   return wglGetPixelFormat(hdc);
+}
+
+GLAPI BOOL GLAPIENTRY
+wglSetPixelFormat(HDC hdc, int iPixelFormat, const PIXELFORMATDESCRIPTOR * ppfd)
+{
+   int qt_valid_pix;
+
+   qt_valid_pix = qt_pix;
+
+   if (iPixelFormat < 1 || iPixelFormat > qt_valid_pix) {
+      if (ppfd == NULL) {
+         PIXELFORMATDESCRIPTOR my_pfd;
+         if (!wglDescribePixelFormat(hdc, iPixelFormat, sizeof(PIXELFORMATDESCRIPTOR), &my_pfd)) {
+            SetLastError(0);
+            return (FALSE);
+         }
+      } else if (ppfd->nSize != sizeof(PIXELFORMATDESCRIPTOR)) {
+         SetLastError(0);
+         return (FALSE);
+      }
+   }
+   curPFD = iPixelFormat;
+
+   return (TRUE);
+}
+
+GLAPI BOOL GLAPIENTRY
+wglSwapBuffers(HDC hdc)
+{
+   if (!ctx) {
+      SetLastError(0);
+      return (FALSE);
+   }
+
+   fxMesaSwapBuffers();
+
+   return (TRUE);
+}
+
+GLAPI BOOL GLAPIENTRY
+SetPixelFormat(HDC hdc, int iPixelFormat, const PIXELFORMATDESCRIPTOR * ppfd)
+{
+   return wglSetPixelFormat(hdc, iPixelFormat, ppfd);
+}
+
+GLAPI BOOL GLAPIENTRY
+SwapBuffers(HDC hdc)
+{
+   return wglSwapBuffers(hdc);
+}
+
+static FIXED FixedFromDouble(double d)
+{
+  long l = (long) (d * 65536L);
+  return *(FIXED *)&l;
+}
+
+/*
+** This was yanked from windows/gdi/wgl.c
+*/
+GLAPI BOOL GLAPIENTRY
+wglUseFontBitmapsA(HDC hdc, DWORD first, DWORD count, DWORD listBase)
+{
+  int i;
+  GLuint font_list;
+  DWORD size;
+  GLYPHMETRICS gm;
+  HANDLE hBits;
+  LPSTR lpBits;
+  MAT2 mat;
+  int  success = TRUE;
+
+  if (first<0)
+     return FALSE;
+  if (count<0)
+     return FALSE;
+  if (listBase<0)
+     return FALSE;
+
+  font_list = listBase;
+
+  mat.eM11 = FixedFromDouble(1);
+  mat.eM12 = FixedFromDouble(0);
+  mat.eM21 = FixedFromDouble(0);
+  mat.eM22 = FixedFromDouble(-1);
+
+  memset(&gm,0,sizeof(gm));
+
+  /*
+  ** If we can't get the glyph outline, it may be because this is a fixed
+  ** font.  Try processing it that way.
+  */
+  if( GetGlyphOutline(hdc, first, GGO_BITMAP, &gm, 0, NULL, &mat)
+      == GDI_ERROR )
+  {
+    return wglUseFontBitmaps_FX( hdc, first, count, listBase );
+  }
+
+  /*
+  ** Otherwise process all desired characters.
+  */
+  for (i = 0; i < count; i++)
+  {
+    DWORD err;
+
+    glNewList( font_list+i, GL_COMPILE );
+
+    /* allocate space for the bitmap/outline */
+    size = GetGlyphOutline(hdc, first + i, GGO_BITMAP, &gm, 0, NULL, &mat);
+    if (size == GDI_ERROR)
+    {
+      glEndList( );
+      err = GetLastError();
+      success = FALSE;
+      continue;
+    }
+
+    hBits  = GlobalAlloc(GHND, size+1);
+    lpBits = GlobalLock(hBits);
+
+    err = GetGlyphOutline(hdc,                /* handle to device context */
+                          first + i,          /* character to query */
+                          GGO_BITMAP,         /* format of data to return */
+                          &gm,                /* pointer to structure for metrics*/
+                          size,               /* size of buffer for data */
+                          lpBits,             /* pointer to buffer for data */
+                          &mat                /* pointer to transformation */
+                                              /* matrix structure */
+                          );
+
+    if (err == GDI_ERROR)
+    {
+      GlobalUnlock(hBits);
+      GlobalFree(hBits);
+      
+      glEndList( );
+      err = GetLastError();
+      success = FALSE;
+      continue;
+    }
+
+    glBitmap(gm.gmBlackBoxX,gm.gmBlackBoxY,
+             -gm.gmptGlyphOrigin.x,
+             gm.gmptGlyphOrigin.y,
+             gm.gmCellIncX,gm.gmCellIncY,
+             (const GLubyte * )lpBits);
+
+    GlobalUnlock(hBits);
+    GlobalFree(hBits);
+
+    glEndList( );
+  }
+
+  return success;
+}
+
+GLAPI BOOL GLAPIENTRY
+wglDescribeLayerPlane(HDC hdc, int iPixelFormat, int iLayerPlane,
+                      UINT nBytes, LPLAYERPLANEDESCRIPTOR ppfd)
+{
+  SetLastError(0);
+  return (FALSE);
+}
+
+GLAPI int GLAPIENTRY
+wglGetLayerPaletteEntries(HDC hdc, int iLayerPlane, int iStart,
+                          int cEntries, COLORREF *pcr)
+{
+  SetLastError(0);
+  return (FALSE);
+}
+
+GLAPI BOOL GLAPIENTRY
+wglRealizeLayerPalette(HDC hdc,int iLayerPlane,BOOL bRealize)
+{
+  SetLastError(0);
+  return(FALSE);
+}
+
+GLAPI int GLAPIENTRY
+wglSetLayerPaletteEntries(HDC hdc,int iLayerPlane, int iStart,
+                          int cEntries, CONST COLORREF *pcr)
+{
+  SetLastError(0);
+  return(FALSE);
+}
+
+#if (_MSC_VER >= 1200)
+#pragma warning( pop )
+#endif
+
+#endif /* FX */
diff --git a/reactos/lib/mesa32/src/drivers/osmesa/Makefile.win b/reactos/lib/mesa32/src/drivers/osmesa/Makefile.win
new file mode 100644
index 00000000000..36d520e65df
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/osmesa/Makefile.win
@@ -0,0 +1,39 @@
+# Makefile for Win32
+
+!include <win32.mak>
+
+TOP = ..\..
+
+OSMESA_SRCS = osmesa.c
+OSMESA_OBJS = osmesa.obj
+
+ASM_SRCS =
+CORE_SRCS =
+DRIVER_SRCS = $(OSMESA_SRCS)
+
+SRCS	= $(OSMESA_SRCS)
+
+all	: osmesadll
+
+!include "$(TOP)/mesawin32.mak"
+
+osmesadll: $(OSMESADLL)
+
+CFLAGS	= $(cvarsdll) $(CFLAGS) -D_OPENGL32_ -DBUILD_GL32 -I$(TOP)/src
+LFLAGS	= $(dlllflags) $(lcommon) $(LFLAGS)
+
+OBJS	= $(ASM_SRCS:.S=.obj) $(CORE_SRCS:.c=.obj) $(DRIVER_SRCS:.c=.obj)
+LIBS	= $(guilibsdll) $(TOP)/lib/$(MESALIB)
+
+$(OSMESADLL)	: $(OBJS) osmesa.def
+	$(link) $(LFLAGS) -def:osmesa.def -out:$(OSMESADLL) $(OBJS) $(LIBS)
+	@echo "copying OSMesa library to library directory..."
+	-copy $(OSMESALIB) $(TOP)\lib
+	@echo "copying OSMesa dll to library directory..."
+	-copy $(OSMESADLL) $(TOP)\lib
+
+install	: $(OSMESADLL)
+	@echo "copying OSMesa library to system library directory..."
+	-copy $(OSMESALIB) $(LIBINSTALL)
+	@echo "copying OSMesa dll to system library directory..."
+	-copy $(OSMESADLL) $(DLLINSTALL)
diff --git a/reactos/lib/mesa32/src/drivers/osmesa/osmesa.c b/reactos/lib/mesa32/src/drivers/osmesa/osmesa.c
new file mode 100644
index 00000000000..713e883ca07
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/osmesa/osmesa.c
@@ -0,0 +1,1337 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0.1
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * Off-Screen Mesa rendering / Rendering into client memory space
+ *
+ * Note on thread safety:  this driver is thread safe.  All
+ * functions are reentrant.  The notion of current context is
+ * managed by the core _mesa_make_current() and _mesa_get_current_context()
+ * functions.  Those functions are thread-safe.
+ */
+
+
+#include "glheader.h"
+#include "GL/osmesa.h"
+#include "buffers.h"
+#include "bufferobj.h"
+#include "context.h"
+#include "colormac.h"
+#include "depth.h"
+#include "extensions.h"
+#include "imports.h"
+#include "macros.h"
+#include "matrix.h"
+#include "mtypes.h"
+#include "texformat.h"
+#include "texobj.h"
+#include "teximage.h"
+#include "texstore.h"
+#include "array_cache/acache.h"
+#include "swrast/swrast.h"
+#include "swrast_setup/swrast_setup.h"
+#include "swrast/s_context.h"
+#include "swrast/s_depth.h"
+#include "swrast/s_lines.h"
+#include "swrast/s_triangle.h"
+#include "tnl/tnl.h"
+#include "tnl/t_context.h"
+#include "tnl/t_pipeline.h"
+
+
+
+/*
+ * This is the OS/Mesa context struct.
+ * Notice how it includes a GLcontext.  By doing this we're mimicking
+ * C++ inheritance/derivation.
+ * Later, we can cast a GLcontext pointer into an OSMesaContext pointer
+ * or vice versa.
+ */
+struct osmesa_context {
+   GLcontext mesa;		/* The core GL/Mesa context */
+   GLvisual *gl_visual;		/* Describes the buffers */
+   GLframebuffer *gl_buffer;	/* Depth, stencil, accum, etc buffers */
+   GLenum format;		/* either GL_RGBA or GL_COLOR_INDEX */
+   void *buffer;		/* the image buffer */
+   GLint width, height;		/* size of image buffer */
+   GLint rowlength;		/* number of pixels per row */
+   GLint userRowLength;		/* user-specified number of pixels per row */
+   GLint rshift, gshift;	/* bit shifts for RGBA formats */
+   GLint bshift, ashift;
+   GLint rInd, gInd, bInd, aInd;/* index offsets for RGBA formats */
+   GLchan *rowaddr[MAX_HEIGHT];	/* address of first pixel in each image row */
+   GLboolean yup;		/* TRUE  -> Y increases upward */
+				/* FALSE -> Y increases downward */
+};
+
+
+/* Just cast, since we're using structure containment */
+#define OSMESA_CONTEXT(ctx)  ((OSMesaContext) (ctx->DriverCtx))
+
+
+
+/**********************************************************************/
+/*** Private Device Driver Functions                                ***/
+/**********************************************************************/
+
+
+static const GLubyte *
+get_string( GLcontext *ctx, GLenum name )
+{
+   (void) ctx;
+   switch (name) {
+      case GL_RENDERER:
+#if CHAN_BITS == 32
+         return (const GLubyte *) "Mesa OffScreen32";
+#elif CHAN_BITS == 16
+         return (const GLubyte *) "Mesa OffScreen16";
+#else
+         return (const GLubyte *) "Mesa OffScreen";
+#endif
+      default:
+         return NULL;
+   }
+}
+
+
+static void
+osmesa_update_state( GLcontext *ctx, GLuint new_state )
+{
+   /* easy - just propogate */
+   _swrast_InvalidateState( ctx, new_state );
+   _swsetup_InvalidateState( ctx, new_state );
+   _ac_InvalidateState( ctx, new_state );
+   _tnl_InvalidateState( ctx, new_state );
+}
+
+
+static void
+set_buffer( GLcontext *ctx, GLframebuffer *buffer, GLuint bufferBit )
+{
+   /* separate read buffer not supported */
+   ASSERT(buffer == ctx->DrawBuffer);
+   ASSERT(bufferBit == FRONT_LEFT_BIT);
+}
+
+
+static void
+get_buffer_size( GLframebuffer *buffer, GLuint *width, GLuint *height )
+{
+   /* don't use GET_CURRENT_CONTEXT(ctx) here - it's a problem on Windows */
+   GLcontext *ctx = (GLcontext *) _glapi_get_context();
+   (void) buffer;
+   if (ctx) {
+      OSMesaContext osmesa = OSMESA_CONTEXT(ctx);
+      *width = osmesa->width;
+      *height = osmesa->height;
+   }
+}
+
+
+static void
+clear( GLcontext *ctx, GLbitfield mask, GLboolean all,
+       GLint x, GLint y, GLint width, GLint height )
+{
+   OSMesaContext osmesa = OSMESA_CONTEXT(ctx);
+   const GLuint *colorMask = (GLuint *) &ctx->Color.ColorMask;
+
+   /* sanity check - we only have a front-left buffer */
+   ASSERT((mask & (DD_FRONT_RIGHT_BIT |
+                   DD_BACK_LEFT_BIT |
+                   DD_BACK_RIGHT_BIT)) == 0);
+
+   /* use optimized clear for common cases (clear whole buffer to black) */
+   if (mask & DD_FRONT_LEFT_BIT) {
+      if (osmesa->format == OSMESA_COLOR_INDEX) {
+         if (ctx->Color.ClearIndex == 0 &&
+             ctx->Color.IndexMask == (GLuint) ~0 &&
+             osmesa->rowlength == osmesa->width &&
+             all) {
+            /* clear whole buffer to zeros */
+            _mesa_bzero(osmesa->buffer,
+                        osmesa->width * osmesa->height * sizeof(GLchan));
+            mask &= ~DD_FRONT_LEFT_BIT;
+         }
+      }
+      else {
+         /* RGB[A] format */
+         if (*colorMask == 0xffffffff &&
+             ctx->Color.ClearColor[0] == 0.0F &&
+             ctx->Color.ClearColor[1] == 0.0F &&
+             ctx->Color.ClearColor[2] == 0.0F &&
+             ctx->Color.ClearColor[3] == 0.0F &&
+             osmesa->rowlength == osmesa->width &&
+             all) {
+            GLint bytesPerPixel;
+            /* clear whole buffer to black */
+            if (osmesa->format == OSMESA_RGBA ||
+                osmesa->format == OSMESA_BGRA ||
+                osmesa->format == OSMESA_ARGB)
+               bytesPerPixel = 4 * sizeof(GLchan);
+            else if (osmesa->format == OSMESA_RGB ||
+                     osmesa->format == OSMESA_BGR)
+               bytesPerPixel = 3 * sizeof(GLchan);
+            else if (osmesa->format == OSMESA_RGB_565)
+               bytesPerPixel = sizeof(GLushort);
+            else {
+               _mesa_problem(ctx, "bad pixel format in osmesa_clear()");
+               return;
+            }
+            _mesa_bzero(osmesa->buffer,
+                        bytesPerPixel * osmesa->width * osmesa->height);
+            mask &= ~DD_FRONT_LEFT_BIT;
+         }
+      }
+   }
+
+   if (mask) {
+      /* software fallback (spans) for everything else. */
+      _swrast_Clear(ctx, mask, all, x, y, width, height);
+   }
+}
+
+
+/**********************************************************************/
+/*****        Read/write spans/arrays of pixels                   *****/
+/**********************************************************************/
+
+
+/* RGBA */
+#define NAME(PREFIX) PREFIX##_RGBA
+#define SPAN_VARS \
+   const OSMesaContext osmesa = OSMESA_CONTEXT(ctx);
+#define INIT_PIXEL_PTR(P, X, Y) \
+   GLchan *P = osmesa->rowaddr[Y] + 4 * (X)
+#define INC_PIXEL_PTR(P) P += 4
+#if CHAN_TYPE == GL_FLOAT
+#define STORE_RGB_PIXEL(P, X, Y, R, G, B) \
+   P[0] = MAX2((R), 0.0F); \
+   P[1] = MAX2((G), 0.0F); \
+   P[2] = MAX2((B), 0.0F); \
+   P[3] = CHAN_MAXF
+#define STORE_RGBA_PIXEL(P, X, Y, R, G, B, A) \
+   P[0] = MAX2((R), 0.0F); \
+   P[1] = MAX2((G), 0.0F); \
+   P[2] = MAX2((B), 0.0F); \
+   P[3] = CLAMP((A), 0.0F, CHAN_MAXF)
+#else
+#define STORE_RGB_PIXEL(P, X, Y, R, G, B) \
+   P[0] = R;  P[1] = G;  P[2] = B;  P[3] = CHAN_MAX
+#define STORE_RGBA_PIXEL(P, X, Y, R, G, B, A) \
+   P[0] = R;  P[1] = G;  P[2] = B;  P[3] = A
+#endif
+#define FETCH_RGBA_PIXEL(R, G, B, A, P) \
+   R = P[0];  G = P[1];  B = P[2];  A = P[3]
+#include "swrast/s_spantemp.h"
+
+/* BGRA */
+#define NAME(PREFIX) PREFIX##_BGRA
+#define SPAN_VARS \
+   const OSMesaContext osmesa = OSMESA_CONTEXT(ctx);
+#define INIT_PIXEL_PTR(P, X, Y) \
+   GLchan *P = osmesa->rowaddr[Y] + 4 * (X)
+#define INC_PIXEL_PTR(P) P += 4
+#define STORE_RGB_PIXEL(P, X, Y, R, G, B) \
+   P[2] = R;  P[1] = G;  P[0] = B;  P[3] = CHAN_MAX
+#define STORE_RGBA_PIXEL(P, X, Y, R, G, B, A) \
+   P[2] = R;  P[1] = G;  P[0] = B;  P[3] = A
+#define FETCH_RGBA_PIXEL(R, G, B, A, P) \
+   R = P[2];  G = P[1];  B = P[0];  A = P[3]
+#include "swrast/s_spantemp.h"
+
+/* ARGB */
+#define NAME(PREFIX) PREFIX##_ARGB
+#define SPAN_VARS \
+   const OSMesaContext osmesa = OSMESA_CONTEXT(ctx);
+#define INIT_PIXEL_PTR(P, X, Y) \
+   GLchan *P = osmesa->rowaddr[Y] + 4 * (X)
+#define INC_PIXEL_PTR(P) P += 4
+#define STORE_RGB_PIXEL(P, X, Y, R, G, B) \
+   P[1] = R;  P[2] = G;  P[3] = B;  P[0] = CHAN_MAX
+#define STORE_RGBA_PIXEL(P, X, Y, R, G, B, A) \
+   P[1] = R;  P[2] = G;  P[3] = B;  P[0] = A
+#define FETCH_RGBA_PIXEL(R, G, B, A, P) \
+   R = P[1];  G = P[2];  B = P[3];  A = P[0]
+#include "swrast/s_spantemp.h"
+
+/* RGB */
+#define NAME(PREFIX) PREFIX##_RGB
+#define SPAN_VARS \
+   const OSMesaContext osmesa = OSMESA_CONTEXT(ctx);
+#define INIT_PIXEL_PTR(P, X, Y) \
+   GLchan *P = osmesa->rowaddr[Y] + 3 * (X)
+#define INC_PIXEL_PTR(P) P += 3
+#define STORE_RGB_PIXEL(P, X, Y, R, G, B) \
+   P[0] = R;  P[1] = G;  P[2] = B
+#define STORE_RGBA_PIXEL(P, X, Y, R, G, B, A) \
+   P[0] = R;  P[1] = G;  P[2] = B
+#define FETCH_RGBA_PIXEL(R, G, B, A, P) \
+   R = P[0];  G = P[1];  B = P[2];  A = CHAN_MAX
+#include "swrast/s_spantemp.h"
+
+/* BGR */
+#define NAME(PREFIX) PREFIX##_BGR
+#define SPAN_VARS \
+   const OSMesaContext osmesa = OSMESA_CONTEXT(ctx);
+#define INIT_PIXEL_PTR(P, X, Y) \
+   GLchan *P = osmesa->rowaddr[Y] + 3 * (X)
+#define INC_PIXEL_PTR(P) P += 3
+#define STORE_RGB_PIXEL(P, X, Y, R, G, B) \
+   P[0] = B;  P[1] = G;  P[2] = R
+#define STORE_RGBA_PIXEL(P, X, Y, R, G, B, A) \
+   P[0] = B;  P[1] = G;  P[2] = R
+#define FETCH_RGBA_PIXEL(R, G, B, A, P) \
+   B = P[0];  G = P[1];  R = P[2];  A = CHAN_MAX
+#include "swrast/s_spantemp.h"
+
+/* 16-bit BGR */
+#if CHAN_TYPE == GL_UNSIGNED_BYTE
+#define NAME(PREFIX) PREFIX##_RGB_565
+#define SPAN_VARS \
+   const OSMesaContext osmesa = OSMESA_CONTEXT(ctx);
+#define INIT_PIXEL_PTR(P, X, Y) \
+   GLushort *P = (GLushort *) osmesa->rowaddr[Y] + (X)
+#define INC_PIXEL_PTR(P) P += 1
+#define STORE_RGB_PIXEL(P, X, Y, R, G, B) \
+   *P = ( (((R) & 0xf8) << 8) | (((G) & 0xfc) << 3) | ((B) >> 3) )
+#define STORE_RGBA_PIXEL(P, X, Y, R, G, B, A) \
+   *P = ( (((R) & 0xf8) << 8) | (((G) & 0xfc) << 3) | ((B) >> 3) )
+#define FETCH_RGBA_PIXEL(R, G, B, A, P) \
+   R = ( (((*P) >> 8) & 0xf8) | (((*P) >> 11) & 0x7) ); \
+   G = ( (((*P) >> 3) & 0xfc) | (((*P) >>  5) & 0x3) ); \
+   B = ( (((*P) << 3) & 0xf8) | (((*P)      ) & 0x7) ); \
+   A = CHAN_MAX
+#include "swrast/s_spantemp.h"
+#endif
+
+/* color index */
+#define NAME(PREFIX) PREFIX##_CI
+#define SPAN_VARS \
+   const OSMesaContext osmesa = OSMESA_CONTEXT(ctx);
+#define INIT_PIXEL_PTR(P, X, Y) \
+   GLchan *P = osmesa->rowaddr[Y] + (X)
+#define INC_PIXEL_PTR(P) P += 1
+#define STORE_CI_PIXEL(P, CI) \
+   P[0] = CI
+#define FETCH_CI_PIXEL(CI, P) \
+   CI = P[0]
+#include "swrast/s_spantemp.h"
+
+
+/**********************************************************************/
+/*****                   Optimized line rendering                 *****/
+/**********************************************************************/
+
+
+#if CHAN_TYPE == GL_FLOAT
+#define PACK_RGBA(DST, R, G, B, A)	\
+do {					\
+   (DST)[0] = MAX2( R, 0.0F );		\
+   (DST)[1] = MAX2( G, 0.0F );		\
+   (DST)[2] = MAX2( B, 0.0F );		\
+   (DST)[3] = CLAMP(A, 0.0F, CHAN_MAXF);\
+} while (0)
+#else
+#define PACK_RGBA(DST, R, G, B, A)	\
+do {					\
+   (DST)[osmesa->rInd] = R;		\
+   (DST)[osmesa->gInd] = G;		\
+   (DST)[osmesa->bInd] = B;		\
+   (DST)[osmesa->aInd] = A;		\
+} while (0)
+#endif
+
+#define PACK_RGB(DST, R, G, B)  \
+do {				\
+   (DST)[0] = R;		\
+   (DST)[1] = G;		\
+   (DST)[2] = B;		\
+} while (0)
+
+#define PACK_BGR(DST, R, G, B)  \
+do {				\
+   (DST)[0] = B;		\
+   (DST)[1] = G;		\
+   (DST)[2] = R;		\
+} while (0)
+
+#define PACK_RGB_565(DST, R, G, B)					\
+do {									\
+   (DST) = (((int) (R) << 8) & 0xf800) | (((int) (G) << 3) & 0x7e0) | ((int) (B) >> 3);\
+} while (0)
+
+#define UNPACK_RED(P)      ( (P)[osmesa->rInd] )
+#define UNPACK_GREEN(P)    ( (P)[osmesa->gInd] )
+#define UNPACK_BLUE(P)     ( (P)[osmesa->bInd] )
+#define UNPACK_ALPHA(P)    ( (P)[osmesa->aInd] )
+
+#define PIXELADDR1(X,Y)  (osmesa->rowaddr[Y] + (X))
+#define PIXELADDR2(X,Y)  (osmesa->rowaddr[Y] + 2 * (X))
+#define PIXELADDR3(X,Y)  (osmesa->rowaddr[Y] + 3 * (X))
+#define PIXELADDR4(X,Y)  (osmesa->rowaddr[Y] + 4 * (X))
+
+
+/*
+ * Draw a flat-shaded, RGB line into an osmesa buffer.
+ */
+#define NAME flat_rgba_line
+#define CLIP_HACK 1
+#define SETUP_CODE						\
+   const OSMesaContext osmesa = OSMESA_CONTEXT(ctx);		\
+   const GLchan *color = vert1->color;
+
+#define PLOT(X, Y)						\
+do {								\
+   GLchan *p = PIXELADDR4(X, Y);				\
+   PACK_RGBA(p, color[0], color[1], color[2], color[3]);	\
+} while (0)
+
+#ifdef WIN32
+#include "..\swrast\s_linetemp.h"
+#else
+#include "swrast/s_linetemp.h"
+#endif
+
+
+
+/*
+ * Draw a flat-shaded, Z-less, RGB line into an osmesa buffer.
+ */
+#define NAME flat_rgba_z_line
+#define CLIP_HACK 1
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define SETUP_CODE					\
+   const OSMesaContext osmesa = OSMESA_CONTEXT(ctx);	\
+   const GLchan *color = vert1->color;
+
+#define PLOT(X, Y)					\
+do {							\
+   if (Z < *zPtr) {					\
+      GLchan *p = PIXELADDR4(X, Y);			\
+      PACK_RGBA(p, color[RCOMP], color[GCOMP],		\
+                   color[BCOMP], color[ACOMP]);		\
+      *zPtr = Z;					\
+   }							\
+} while (0)
+
+#ifdef WIN32
+#include "..\swrast\s_linetemp.h"
+#else
+#include "swrast/s_linetemp.h"
+#endif
+
+
+
+/*
+ * Analyze context state to see if we can provide a fast line drawing
+ * function, like those in lines.c.  Otherwise, return NULL.
+ */
+static swrast_line_func
+osmesa_choose_line_function( GLcontext *ctx )
+{
+   const OSMesaContext osmesa = OSMESA_CONTEXT(ctx);
+   const SWcontext *swrast = SWRAST_CONTEXT(ctx);
+
+   if (CHAN_BITS != 8)                    return NULL;
+   if (ctx->RenderMode != GL_RENDER)      return NULL;
+   if (ctx->Line.SmoothFlag)              return NULL;
+   if (ctx->Texture._EnabledUnits)        return NULL;
+   if (ctx->Light.ShadeModel != GL_FLAT)  return NULL;
+   if (ctx->Line.Width != 1.0F)           return NULL;
+   if (ctx->Line.StippleFlag)             return NULL;
+   if (ctx->Line.SmoothFlag)              return NULL;
+   if (osmesa->format != OSMESA_RGBA &&
+       osmesa->format != OSMESA_BGRA &&
+       osmesa->format != OSMESA_ARGB)     return NULL;
+
+   if (swrast->_RasterMask==DEPTH_BIT
+       && ctx->Depth.Func==GL_LESS
+       && ctx->Depth.Mask==GL_TRUE
+       && ctx->Visual.depthBits == DEFAULT_SOFTWARE_DEPTH_BITS) {
+      return (swrast_line_func) flat_rgba_z_line;
+   }
+
+   if (swrast->_RasterMask == 0) {
+      return (swrast_line_func) flat_rgba_line;
+   }
+
+   return (swrast_line_func) NULL;
+}
+
+
+/**********************************************************************/
+/*****                 Optimized triangle rendering               *****/
+/**********************************************************************/
+
+
+/*
+ * Smooth-shaded, z-less triangle, RGBA color.
+ */
+#define NAME smooth_rgba_z_triangle
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define INTERP_RGB 1
+#define INTERP_ALPHA 1
+#define SETUP_CODE \
+   const OSMesaContext osmesa = OSMESA_CONTEXT(ctx);
+#define RENDER_SPAN( span )					\
+   GLuint i;							\
+   GLchan *img = PIXELADDR4(span.x, span.y); 			\
+   for (i = 0; i < span.end; i++, img += 4) {			\
+      const GLdepth z = FixedToDepth(span.z);			\
+      if (z < zRow[i]) {					\
+         PACK_RGBA(img, FixedToChan(span.red),			\
+            FixedToChan(span.green), FixedToChan(span.blue),	\
+            FixedToChan(span.alpha));				\
+         zRow[i] = z;						\
+      }								\
+      span.red += span.redStep;					\
+      span.green += span.greenStep;				\
+      span.blue += span.blueStep;				\
+      span.alpha += span.alphaStep;				\
+      span.z += span.zStep;					\
+   }
+#ifdef WIN32
+#include "..\swrast\s_tritemp.h"
+#else
+#include "swrast/s_tritemp.h"
+#endif
+
+
+
+/*
+ * Flat-shaded, z-less triangle, RGBA color.
+ */
+#define NAME flat_rgba_z_triangle
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define SETUP_CODE						\
+   const OSMesaContext osmesa = OSMESA_CONTEXT(ctx);		\
+   GLuint pixel;						\
+   PACK_RGBA((GLchan *) &pixel, v2->color[0], v2->color[1],	\
+                                v2->color[2], v2->color[3]);
+
+#define RENDER_SPAN( span )				\
+   GLuint i;						\
+   GLuint *img = (GLuint *) PIXELADDR4(span.x, span.y);	\
+   for (i = 0; i < span.end; i++) {			\
+      const GLdepth z = FixedToDepth(span.z);		\
+      if (z < zRow[i]) {				\
+         img[i] = pixel;				\
+         zRow[i] = z;					\
+      }							\
+      span.z += span.zStep;				\
+   }
+#ifdef WIN32
+#include "..\swrast\s_tritemp.h"
+#else
+#include "swrast/s_tritemp.h"
+#endif
+
+
+
+/*
+ * Return pointer to an accelerated triangle function if possible.
+ */
+static swrast_tri_func
+osmesa_choose_triangle_function( GLcontext *ctx )
+{
+   const OSMesaContext osmesa = OSMESA_CONTEXT(ctx);
+   const SWcontext *swrast = SWRAST_CONTEXT(ctx);
+
+   if (CHAN_BITS != 8)                  return (swrast_tri_func) NULL;
+   if (ctx->RenderMode != GL_RENDER)    return (swrast_tri_func) NULL;
+   if (ctx->Polygon.SmoothFlag)         return (swrast_tri_func) NULL;
+   if (ctx->Polygon.StippleFlag)        return (swrast_tri_func) NULL;
+   if (ctx->Texture._EnabledUnits)      return (swrast_tri_func) NULL;
+   if (osmesa->format != OSMESA_RGBA &&
+       osmesa->format != OSMESA_BGRA &&
+       osmesa->format != OSMESA_ARGB)   return (swrast_tri_func) NULL;
+   if (ctx->Polygon.CullFlag && 
+       ctx->Polygon.CullFaceMode == GL_FRONT_AND_BACK)
+                                        return (swrast_tri_func) NULL;
+
+   if (swrast->_RasterMask == DEPTH_BIT &&
+       ctx->Depth.Func == GL_LESS &&
+       ctx->Depth.Mask == GL_TRUE &&
+       ctx->Visual.depthBits == DEFAULT_SOFTWARE_DEPTH_BITS) {
+      if (ctx->Light.ShadeModel == GL_SMOOTH) {
+         return (swrast_tri_func) smooth_rgba_z_triangle;
+      }
+      else {
+         return (swrast_tri_func) flat_rgba_z_triangle;
+      }
+   }
+   return (swrast_tri_func) NULL;
+}
+
+
+
+/* Override for the swrast triangle-selection function.  Try to use one
+ * of our internal triangle functions, otherwise fall back to the
+ * standard swrast functions.
+ */
+static void
+osmesa_choose_triangle( GLcontext *ctx )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+
+   swrast->Triangle = osmesa_choose_triangle_function( ctx );
+   if (!swrast->Triangle)
+      _swrast_choose_triangle( ctx );
+}
+
+static void
+osmesa_choose_line( GLcontext *ctx )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+
+   swrast->Line = osmesa_choose_line_function( ctx );
+   if (!swrast->Line)
+      _swrast_choose_line( ctx );
+}
+
+
+#define OSMESA_NEW_LINE   (_NEW_LINE | \
+                           _NEW_TEXTURE | \
+                           _NEW_LIGHT | \
+                           _NEW_DEPTH | \
+                           _NEW_RENDERMODE | \
+                           _SWRAST_NEW_RASTERMASK)
+
+#define OSMESA_NEW_TRIANGLE (_NEW_POLYGON | \
+                             _NEW_TEXTURE | \
+                             _NEW_LIGHT | \
+                             _NEW_DEPTH | \
+                             _NEW_RENDERMODE | \
+                             _SWRAST_NEW_RASTERMASK)
+
+/* one-time, per-context initialization */
+static void
+hook_in_driver_functions( GLcontext *ctx )
+{
+   OSMesaContext osmesa = OSMESA_CONTEXT(ctx);
+   SWcontext *swrast = SWRAST_CONTEXT( ctx );
+   struct swrast_device_driver *swdd = _swrast_GetDeviceDriverReference( ctx );
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+
+   ASSERT((void *) osmesa == (void *) ctx->DriverCtx);
+
+   /* use default TCL pipeline */
+   tnl->Driver.RunPipeline = _tnl_run_pipeline;
+
+   ctx->Driver.GetString = get_string;
+   ctx->Driver.UpdateState = osmesa_update_state;
+   ctx->Driver.ResizeBuffers = _swrast_alloc_buffers;
+   ctx->Driver.GetBufferSize = get_buffer_size;
+
+   ctx->Driver.Accum = _swrast_Accum;
+   ctx->Driver.Bitmap = _swrast_Bitmap;
+   ctx->Driver.Clear = clear;  /* uses _swrast_Clear */
+   ctx->Driver.CopyPixels = _swrast_CopyPixels;
+   ctx->Driver.DrawPixels = _swrast_DrawPixels;
+   ctx->Driver.ReadPixels = _swrast_ReadPixels;
+   ctx->Driver.DrawBuffer = _swrast_DrawBuffer;
+
+   ctx->Driver.ChooseTextureFormat = _mesa_choose_tex_format;
+   ctx->Driver.TexImage1D = _mesa_store_teximage1d;
+   ctx->Driver.TexImage2D = _mesa_store_teximage2d;
+   ctx->Driver.TexImage3D = _mesa_store_teximage3d;
+   ctx->Driver.TexSubImage1D = _mesa_store_texsubimage1d;
+   ctx->Driver.TexSubImage2D = _mesa_store_texsubimage2d;
+   ctx->Driver.TexSubImage3D = _mesa_store_texsubimage3d;
+   ctx->Driver.TestProxyTexImage = _mesa_test_proxy_teximage;
+
+   ctx->Driver.CompressedTexImage1D = _mesa_store_compressed_teximage1d;
+   ctx->Driver.CompressedTexImage2D = _mesa_store_compressed_teximage2d;
+   ctx->Driver.CompressedTexImage3D = _mesa_store_compressed_teximage3d;
+   ctx->Driver.CompressedTexSubImage1D = _mesa_store_compressed_texsubimage1d;
+   ctx->Driver.CompressedTexSubImage2D = _mesa_store_compressed_texsubimage2d;
+   ctx->Driver.CompressedTexSubImage3D = _mesa_store_compressed_texsubimage3d;
+
+   ctx->Driver.CopyTexImage1D = _swrast_copy_teximage1d;
+   ctx->Driver.CopyTexImage2D = _swrast_copy_teximage2d;
+   ctx->Driver.CopyTexSubImage1D = _swrast_copy_texsubimage1d;
+   ctx->Driver.CopyTexSubImage2D = _swrast_copy_texsubimage2d;
+   ctx->Driver.CopyTexSubImage3D = _swrast_copy_texsubimage3d;
+   ctx->Driver.CopyColorTable = _swrast_CopyColorTable;
+   ctx->Driver.CopyColorSubTable = _swrast_CopyColorSubTable;
+   ctx->Driver.CopyConvolutionFilter1D = _swrast_CopyConvolutionFilter1D;
+   ctx->Driver.CopyConvolutionFilter2D = _swrast_CopyConvolutionFilter2D;
+
+   swdd->SetBuffer = set_buffer;
+
+   /* RGB(A) span/pixel functions */
+   if (osmesa->format == OSMESA_RGB) {
+      swdd->WriteRGBASpan = write_rgba_span_RGB;
+      swdd->WriteRGBSpan = write_rgb_span_RGB;
+      swdd->WriteMonoRGBASpan = write_monorgba_span_RGB;
+      swdd->WriteRGBAPixels = write_rgba_pixels_RGB;
+      swdd->WriteMonoRGBAPixels = write_monorgba_pixels_RGB;
+      swdd->ReadRGBASpan = read_rgba_span_RGB;
+      swdd->ReadRGBAPixels = read_rgba_pixels_RGB;
+   }
+   else if (osmesa->format == OSMESA_BGR) {
+      swdd->WriteRGBASpan = write_rgba_span_BGR;
+      swdd->WriteRGBSpan = write_rgb_span_BGR;
+      swdd->WriteMonoRGBASpan = write_monorgba_span_BGR;
+      swdd->WriteRGBAPixels = write_rgba_pixels_BGR;
+      swdd->WriteMonoRGBAPixels = write_monorgba_pixels_BGR;
+      swdd->ReadRGBASpan = read_rgba_span_BGR;
+      swdd->ReadRGBAPixels = read_rgba_pixels_BGR;
+   }
+#if CHAN_TYPE == GL_UNSIGNED_BYTE
+   else if (osmesa->format == OSMESA_RGB_565) {
+      swdd->WriteRGBASpan = write_rgba_span_RGB_565;
+      swdd->WriteRGBSpan = write_rgb_span_RGB_565;
+      swdd->WriteMonoRGBASpan = write_monorgba_span_RGB_565;
+      swdd->WriteRGBAPixels = write_rgba_pixels_RGB_565;
+      swdd->WriteMonoRGBAPixels = write_monorgba_pixels_RGB_565;
+      swdd->ReadRGBASpan = read_rgba_span_RGB_565;
+      swdd->ReadRGBAPixels = read_rgba_pixels_RGB_565;
+   }
+#endif
+   else if (osmesa->format == OSMESA_RGBA) {
+      swdd->WriteRGBASpan = write_rgba_span_RGBA;
+      swdd->WriteRGBSpan = write_rgb_span_RGBA;
+      swdd->WriteMonoRGBASpan = write_monorgba_span_RGBA;
+      swdd->WriteRGBAPixels = write_rgba_pixels_RGBA;
+      swdd->WriteMonoRGBAPixels = write_monorgba_pixels_RGBA;
+      swdd->ReadRGBASpan = read_rgba_span_RGBA;
+      swdd->ReadRGBAPixels = read_rgba_pixels_RGBA;
+   }
+   else if (osmesa->format == OSMESA_BGRA) {
+      swdd->WriteRGBASpan = write_rgba_span_BGRA;
+      swdd->WriteRGBSpan = write_rgb_span_BGRA;
+      swdd->WriteMonoRGBASpan = write_monorgba_span_BGRA;
+      swdd->WriteRGBAPixels = write_rgba_pixels_BGRA;
+      swdd->WriteMonoRGBAPixels = write_monorgba_pixels_BGRA;
+      swdd->ReadRGBASpan = read_rgba_span_BGRA;
+      swdd->ReadRGBAPixels = read_rgba_pixels_BGRA;
+   }
+   else if (osmesa->format == OSMESA_ARGB) {
+      swdd->WriteRGBASpan = write_rgba_span_ARGB;
+      swdd->WriteRGBSpan = write_rgb_span_ARGB;
+      swdd->WriteMonoRGBASpan = write_monorgba_span_ARGB;
+      swdd->WriteRGBAPixels = write_rgba_pixels_ARGB;
+      swdd->WriteMonoRGBAPixels = write_monorgba_pixels_ARGB;
+      swdd->ReadRGBASpan = read_rgba_span_ARGB;
+      swdd->ReadRGBAPixels = read_rgba_pixels_ARGB;
+   }
+   else if (osmesa->format == OSMESA_COLOR_INDEX) {
+      swdd->WriteCI32Span = write_index32_span_CI;
+      swdd->WriteCI8Span = write_index8_span_CI;
+      swdd->WriteMonoCISpan = write_monoindex_span_CI;
+      swdd->WriteCI32Pixels = write_index_pixels_CI;
+      swdd->WriteMonoCIPixels = write_monoindex_pixels_CI;
+      swdd->ReadCI32Span = read_index_span_CI;
+      swdd->ReadCI32Pixels = read_index_pixels_CI;
+   }
+   else {
+      _mesa_problem(ctx, "bad pixel format in osmesa_update_state!\n");
+   }
+
+   /* Extend the software rasterizer with our optimized line and triangle
+    * drawin functions.
+    */
+   swrast->choose_line = osmesa_choose_line;
+   swrast->choose_triangle = osmesa_choose_triangle;
+   swrast->invalidate_line |= OSMESA_NEW_LINE;
+   swrast->invalidate_triangle |= OSMESA_NEW_TRIANGLE;
+}
+
+
+
+
+/**********************************************************************/
+/*****                    Public Functions                        *****/
+/**********************************************************************/
+
+
+/*
+ * Create an Off-Screen Mesa rendering context.  The only attribute needed is
+ * an RGBA vs Color-Index mode flag.
+ *
+ * Input:  format - either GL_RGBA or GL_COLOR_INDEX
+ *         sharelist - specifies another OSMesaContext with which to share
+ *                     display lists.  NULL indicates no sharing.
+ * Return:  an OSMesaContext or 0 if error
+ */
+GLAPI OSMesaContext GLAPIENTRY
+OSMesaCreateContext( GLenum format, OSMesaContext sharelist )
+{
+   const GLint accumBits = (format == OSMESA_COLOR_INDEX) ? 0 : 16;
+   return OSMesaCreateContextExt(format, DEFAULT_SOFTWARE_DEPTH_BITS,
+                                 8, accumBits, sharelist);
+}
+
+
+
+/*
+ * New in Mesa 3.5
+ *
+ * Create context and specify size of ancillary buffers.
+ */
+GLAPI OSMesaContext GLAPIENTRY
+OSMesaCreateContextExt( GLenum format, GLint depthBits, GLint stencilBits,
+                        GLint accumBits, OSMesaContext sharelist )
+{
+   OSMesaContext osmesa;
+   GLint rshift, gshift, bshift, ashift;
+   GLint rind, gind, bind, aind;
+   GLint indexBits = 0, redBits = 0, greenBits = 0, blueBits = 0, alphaBits =0;
+   GLboolean rgbmode;
+   const GLuint i4 = 1;
+   const GLubyte *i1 = (GLubyte *) &i4;
+   const GLint little_endian = *i1;
+
+   rind = gind = bind = aind = 0;
+   if (format==OSMESA_COLOR_INDEX) {
+      indexBits = 8;
+      rshift = gshift = bshift = ashift = 0;
+      rgbmode = GL_FALSE;
+   }
+   else if (format==OSMESA_RGBA) {
+      indexBits = 0;
+      redBits = CHAN_BITS;
+      greenBits = CHAN_BITS;
+      blueBits = CHAN_BITS;
+      alphaBits = CHAN_BITS;
+      rind = 0;
+      gind = 1;
+      bind = 2;
+      aind = 3;
+      if (little_endian) {
+         rshift = 0;
+         gshift = 8;
+         bshift = 16;
+         ashift = 24;
+      }
+      else {
+         rshift = 24;
+         gshift = 16;
+         bshift = 8;
+         ashift = 0;
+      }
+      rgbmode = GL_TRUE;
+   }
+   else if (format==OSMESA_BGRA) {
+      indexBits = 0;
+      redBits = CHAN_BITS;
+      greenBits = CHAN_BITS;
+      blueBits = CHAN_BITS;
+      alphaBits = CHAN_BITS;
+      bind = 0;
+      gind = 1;
+      rind = 2;
+      aind = 3;
+      if (little_endian) {
+         bshift = 0;
+         gshift = 8;
+         rshift = 16;
+         ashift = 24;
+      }
+      else {
+         bshift = 24;
+         gshift = 16;
+         rshift = 8;
+         ashift = 0;
+      }
+      rgbmode = GL_TRUE;
+   }
+   else if (format==OSMESA_ARGB) {
+      indexBits = 0;
+      redBits = CHAN_BITS;
+      greenBits = CHAN_BITS;
+      blueBits = CHAN_BITS;
+      alphaBits = CHAN_BITS;
+      aind = 0;
+      rind = 1;
+      gind = 2;
+      bind = 3;
+      if (little_endian) {
+         ashift = 0;
+         rshift = 8;
+         gshift = 16;
+         bshift = 24;
+      }
+      else {
+         ashift = 24;
+         rshift = 16;
+         gshift = 8;
+         bshift = 0;
+      }
+      rgbmode = GL_TRUE;
+   }
+   else if (format==OSMESA_RGB) {
+      indexBits = 0;
+      redBits = CHAN_BITS;
+      greenBits = CHAN_BITS;
+      blueBits = CHAN_BITS;
+      alphaBits = 0;
+      bshift = 0;
+      gshift = 8;
+      rshift = 16;
+      ashift = 24;
+      rind = 0;
+      gind = 1;
+      bind = 2;
+      rgbmode = GL_TRUE;
+   }
+   else if (format==OSMESA_BGR) {
+      indexBits = 0;
+      redBits = CHAN_BITS;
+      greenBits = CHAN_BITS;
+      blueBits = CHAN_BITS;
+      alphaBits = 0;
+      bshift = 0;
+      gshift = 8;
+      rshift = 16;
+      ashift = 24;
+      rind = 2;
+      gind = 1;
+      bind = 0;
+      rgbmode = GL_TRUE;
+   }
+#if CHAN_TYPE == GL_UNSIGNED_BYTE
+   else if (format==OSMESA_RGB_565) {
+      indexBits = 0;
+      redBits = 5;
+      greenBits = 6;
+      blueBits = 5;
+      alphaBits = 0;
+      rshift = 11;
+      gshift = 5;
+      bshift = 0;
+      ashift = 0;
+      rind = 0; /* not used */
+      gind = 0;
+      bind = 0;
+      rgbmode = GL_TRUE;
+   }
+#endif
+   else {
+      return NULL;
+   }
+
+
+   osmesa = (OSMesaContext) CALLOC_STRUCT(osmesa_context);
+   if (osmesa) {
+      osmesa->gl_visual = _mesa_create_visual( rgbmode,
+                                               GL_FALSE,    /* double buffer */
+                                               GL_FALSE,    /* stereo */
+                                               redBits,
+                                               greenBits,
+                                               blueBits,
+                                               alphaBits,
+                                               indexBits,
+                                               depthBits,
+                                               stencilBits,
+                                               accumBits,
+                                               accumBits,
+                                               accumBits,
+                                               alphaBits ? accumBits : 0,
+                                               1            /* num samples */
+                                               );
+      if (!osmesa->gl_visual) {
+         FREE(osmesa);
+         return NULL;
+      }
+
+      /* Setup these pointers here since they're using for making the default
+       * and proxy texture objects.  Actually, we don't really need to do
+       * this since we're using the default fallback functions which
+       * _mesa_initialize_context() would plug in if needed.
+       */
+      osmesa->mesa.Driver.NewTextureObject = _mesa_new_texture_object;
+      osmesa->mesa.Driver.DeleteTexture = _mesa_delete_texture_object;
+
+      if (!_mesa_initialize_context(&osmesa->mesa,
+                                    osmesa->gl_visual,
+                                    sharelist ? &sharelist->mesa
+                                              : (GLcontext *) NULL,
+                                    (void *) osmesa,
+                                    GL_FALSE)) {
+         _mesa_destroy_visual( osmesa->gl_visual );
+         FREE(osmesa);
+         return NULL;
+      }
+
+      _mesa_enable_sw_extensions(&(osmesa->mesa));
+      _mesa_enable_1_3_extensions(&(osmesa->mesa));
+      _mesa_enable_1_4_extensions(&(osmesa->mesa));
+      _mesa_enable_1_5_extensions(&(osmesa->mesa));
+
+      osmesa->gl_buffer = _mesa_create_framebuffer( osmesa->gl_visual,
+                           (GLboolean) ( osmesa->gl_visual->depthBits > 0 ),
+                           (GLboolean) ( osmesa->gl_visual->stencilBits > 0 ),
+                           (GLboolean) ( osmesa->gl_visual->accumRedBits > 0 ),
+                           GL_FALSE /* s/w alpha */ );
+
+      if (!osmesa->gl_buffer) {
+         _mesa_destroy_visual( osmesa->gl_visual );
+         _mesa_free_context_data( &osmesa->mesa );
+         FREE(osmesa);
+         return NULL;
+      }
+      osmesa->format = format;
+      osmesa->buffer = NULL;
+      osmesa->width = 0;
+      osmesa->height = 0;
+      osmesa->userRowLength = 0;
+      osmesa->rowlength = 0;
+      osmesa->yup = GL_TRUE;
+      osmesa->rshift = rshift;
+      osmesa->gshift = gshift;
+      osmesa->bshift = bshift;
+      osmesa->ashift = ashift;
+      osmesa->rInd = rind;
+      osmesa->gInd = gind;
+      osmesa->bInd = bind;
+      osmesa->aInd = aind;
+
+      /* Initialize the software rasterizer and helper modules. */
+      {
+	 GLcontext *ctx = &osmesa->mesa;
+
+	 _swrast_CreateContext( ctx );
+	 _ac_CreateContext( ctx );
+	 _tnl_CreateContext( ctx );
+	 _swsetup_CreateContext( ctx );
+	
+	 _swsetup_Wakeup( ctx );
+         hook_in_driver_functions( ctx );
+      }
+   }
+   return osmesa;
+}
+
+
+/*
+ * Destroy an Off-Screen Mesa rendering context.
+ *
+ * Input:  ctx - the context to destroy
+ */
+GLAPI void GLAPIENTRY
+OSMesaDestroyContext( OSMesaContext ctx )
+{
+   if (ctx) {
+      _swsetup_DestroyContext( &ctx->mesa );
+      _tnl_DestroyContext( &ctx->mesa );
+      _ac_DestroyContext( &ctx->mesa );
+      _swrast_DestroyContext( &ctx->mesa );
+
+      _mesa_destroy_visual( ctx->gl_visual );
+      _mesa_destroy_framebuffer( ctx->gl_buffer );
+      _mesa_free_context_data( &ctx->mesa );
+      FREE( ctx );
+   }
+}
+
+
+/*
+ * Recompute the values of the context's rowaddr array.
+ */
+static void
+compute_row_addresses( OSMesaContext ctx )
+{
+   GLint bytesPerPixel, bytesPerRow, i;
+   GLubyte *origin = (GLubyte *) ctx->buffer;
+
+   if (ctx->format == OSMESA_COLOR_INDEX) {
+      /* CI mode */
+      bytesPerPixel = 1 * sizeof(GLchan);
+   }
+   else if ((ctx->format == OSMESA_RGB) || (ctx->format == OSMESA_BGR)) {
+      /* RGB mode */
+      bytesPerPixel = 3 * sizeof(GLchan);
+   }
+   else if (ctx->format == OSMESA_RGB_565) {
+      /* 5/6/5 RGB pixel in 16 bits */
+      bytesPerPixel = 2;
+   }
+   else {
+      /* RGBA mode */
+      bytesPerPixel = 4 * sizeof(GLchan);
+   }
+
+   bytesPerRow = ctx->rowlength * bytesPerPixel;
+
+   if (ctx->yup) {
+      /* Y=0 is bottom line of window */
+      for (i = 0; i < MAX_HEIGHT; i++) {
+         ctx->rowaddr[i] = (GLchan *) ((GLubyte *) origin + i * bytesPerRow);
+      }
+   }
+   else {
+      /* Y=0 is top line of window */
+      for (i = 0; i < MAX_HEIGHT; i++) {
+         GLint j = ctx->height - i - 1;
+         ctx->rowaddr[i] = (GLchan *) ((GLubyte *) origin + j * bytesPerRow);
+      }
+   }
+}
+
+
+/*
+ * Bind an OSMesaContext to an image buffer.  The image buffer is just a
+ * block of memory which the client provides.  Its size must be at least
+ * as large as width*height*sizeof(type).  Its address should be a multiple
+ * of 4 if using RGBA mode.
+ *
+ * Image data is stored in the order of glDrawPixels:  row-major order
+ * with the lower-left image pixel stored in the first array position
+ * (ie. bottom-to-top).
+ *
+ * If the context's viewport hasn't been initialized yet, it will now be
+ * initialized to (0,0,width,height).
+ *
+ * Input:  ctx - the rendering context
+ *         buffer - the image buffer memory
+ *         type - data type for pixel components
+ *            Normally, only GL_UNSIGNED_BYTE and GL_UNSIGNED_SHORT_5_6_5
+ *            are supported.  But if Mesa's been compiled with CHAN_BITS==16
+ *            then type must be GL_UNSIGNED_SHORT.  And if Mesa's been build
+ *            with CHAN_BITS==32 then type must be GL_FLOAT.
+ *         width, height - size of image buffer in pixels, at least 1
+ * Return:  GL_TRUE if success, GL_FALSE if error because of invalid ctx,
+ *          invalid buffer address, invalid type, width<1, height<1,
+ *          width>internal limit or height>internal limit.
+ */
+GLAPI GLboolean GLAPIENTRY
+OSMesaMakeCurrent( OSMesaContext ctx, void *buffer, GLenum type,
+                   GLsizei width, GLsizei height )
+{
+   if (!ctx || !buffer ||
+       width < 1 || height < 1 ||
+       width > MAX_WIDTH || height > MAX_HEIGHT) {
+      return GL_FALSE;
+   }
+
+   if (ctx->format == OSMESA_RGB_565) {
+      if (type != GL_UNSIGNED_SHORT_5_6_5)
+         return GL_FALSE;
+   }
+   else if (type != CHAN_TYPE) {
+      return GL_FALSE;
+   }
+
+   osmesa_update_state( &ctx->mesa, 0 );
+   _mesa_make_current( &ctx->mesa, ctx->gl_buffer );
+
+   ctx->buffer = buffer;
+   ctx->width = width;
+   ctx->height = height;
+   if (ctx->userRowLength)
+      ctx->rowlength = ctx->userRowLength;
+   else
+      ctx->rowlength = width;
+
+   compute_row_addresses( ctx );
+
+   /* init viewport */
+   if (ctx->mesa.Viewport.Width == 0) {
+      /* initialize viewport and scissor box to buffer size */
+      _mesa_Viewport( 0, 0, width, height );
+      ctx->mesa.Scissor.Width = width;
+      ctx->mesa.Scissor.Height = height;
+   }
+   else {
+      /* this will make ensure we recognize the new buffer size */
+      _mesa_ResizeBuffersMESA();
+   }
+
+   /* Added by Gerk Huisma: */
+   _tnl_MakeCurrent( &ctx->mesa, ctx->mesa.DrawBuffer,
+                     ctx->mesa.ReadBuffer );
+
+   return GL_TRUE;
+}
+
+
+
+GLAPI OSMesaContext GLAPIENTRY OSMesaGetCurrentContext( void )
+{
+   GLcontext *ctx = _mesa_get_current_context();
+   if (ctx)
+      return (OSMesaContext) ctx;
+   else
+      return NULL;
+}
+
+
+
+GLAPI void GLAPIENTRY OSMesaPixelStore( GLint pname, GLint value )
+{
+   OSMesaContext osmesa = OSMesaGetCurrentContext();
+
+   switch (pname) {
+      case OSMESA_ROW_LENGTH:
+         if (value<0) {
+            _mesa_error( &osmesa->mesa, GL_INVALID_VALUE,
+                      "OSMesaPixelStore(value)" );
+            return;
+         }
+         osmesa->userRowLength = value;
+         osmesa->rowlength = value ? value : osmesa->width;
+         break;
+      case OSMESA_Y_UP:
+         osmesa->yup = value ? GL_TRUE : GL_FALSE;
+         break;
+      default:
+         _mesa_error( &osmesa->mesa, GL_INVALID_ENUM, "OSMesaPixelStore(pname)" );
+         return;
+   }
+
+   compute_row_addresses( osmesa );
+}
+
+
+GLAPI void GLAPIENTRY OSMesaGetIntegerv( GLint pname, GLint *value )
+{
+   OSMesaContext osmesa = OSMesaGetCurrentContext();
+
+   switch (pname) {
+      case OSMESA_WIDTH:
+         *value = osmesa->width;
+         return;
+      case OSMESA_HEIGHT:
+         *value = osmesa->height;
+         return;
+      case OSMESA_FORMAT:
+         *value = osmesa->format;
+         return;
+      case OSMESA_TYPE:
+         *value = CHAN_TYPE;
+         return;
+      case OSMESA_ROW_LENGTH:
+         *value = osmesa->userRowLength;
+         return;
+      case OSMESA_Y_UP:
+         *value = osmesa->yup;
+         return;
+      case OSMESA_MAX_WIDTH:
+         *value = MAX_WIDTH;
+         return;
+      case OSMESA_MAX_HEIGHT:
+         *value = MAX_HEIGHT;
+         return;
+      default:
+         _mesa_error(&osmesa->mesa, GL_INVALID_ENUM, "OSMesaGetIntergerv(pname)");
+         return;
+   }
+}
+
+/*
+ * Return the depth buffer associated with an OSMesa context.
+ * Input:  c - the OSMesa context
+ * Output:  width, height - size of buffer in pixels
+ *          bytesPerValue - bytes per depth value (2 or 4)
+ *          buffer - pointer to depth buffer values
+ * Return:  GL_TRUE or GL_FALSE to indicate success or failure.
+ */
+GLAPI GLboolean GLAPIENTRY
+OSMesaGetDepthBuffer( OSMesaContext c, GLint *width, GLint *height,
+                      GLint *bytesPerValue, void **buffer )
+{
+   if ((!c->gl_buffer) || (!c->gl_buffer->DepthBuffer)) {
+      *width = 0;
+      *height = 0;
+      *bytesPerValue = 0;
+      *buffer = 0;
+      return GL_FALSE;
+   }
+   else {
+      *width = c->gl_buffer->Width;
+      *height = c->gl_buffer->Height;
+      if (c->gl_visual->depthBits <= 16)
+         *bytesPerValue = sizeof(GLushort);
+      else
+         *bytesPerValue = sizeof(GLuint);
+      *buffer = c->gl_buffer->DepthBuffer;
+      return GL_TRUE;
+   }
+}
+
+/*
+ * Return the color buffer associated with an OSMesa context.
+ * Input:  c - the OSMesa context
+ * Output:  width, height - size of buffer in pixels
+ *          format - the pixel format (OSMESA_FORMAT)
+ *          buffer - pointer to color buffer values
+ * Return:  GL_TRUE or GL_FALSE to indicate success or failure.
+ */
+GLAPI GLboolean GLAPIENTRY
+OSMesaGetColorBuffer( OSMesaContext c, GLint *width,
+                      GLint *height, GLint *format, void **buffer )
+{
+   if (!c->buffer) {
+      *width = 0;
+      *height = 0;
+      *format = 0;
+      *buffer = 0;
+      return GL_FALSE;
+   }
+   else {
+      *width = c->width;
+      *height = c->height;
+      *format = c->format;
+      *buffer = c->buffer;
+      return GL_TRUE;
+   }
+}
+
+
+
+struct name_address {
+   const char *Name;
+   GLvoid *Address;
+};
+
+static struct name_address functions[] = {
+   { "OSMesaCreateContext", (void *) OSMesaCreateContext },
+   { "OSMesaCreateContextExt", (void *) OSMesaCreateContextExt },
+   { "OSMesaDestroyContext", (void *) OSMesaDestroyContext },
+   { "OSMesaMakeCurrent", (void *) OSMesaMakeCurrent },
+   { "OSMesaGetCurrentContext", (void *) OSMesaGetCurrentContext },
+   { "OSMesaPixelsStore", (void *) OSMesaPixelStore },
+   { "OSMesaGetIntegerv", (void *) OSMesaGetIntegerv },
+   { "OSMesaGetDepthBuffer", (void *) OSMesaGetDepthBuffer },
+   { "OSMesaGetColorBuffer", (void *) OSMesaGetColorBuffer },
+   { "OSMesaGetProcAddress", (void *) OSMesaGetProcAddress },
+   { NULL, NULL }
+};
+
+GLAPI void * GLAPIENTRY
+OSMesaGetProcAddress( const char *funcName )
+{
+   int i;
+   for (i = 0; functions[i].Name; i++) {
+      if (_mesa_strcmp(functions[i].Name, funcName) == 0)
+         return (void *) functions[i].Address;
+   }
+   return (void *) _glapi_get_proc_address(funcName);
+}
diff --git a/reactos/lib/mesa32/src/drivers/osmesa/osmesa.def b/reactos/lib/mesa32/src/drivers/osmesa/osmesa.def
new file mode 100644
index 00000000000..a92a30f351d
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/osmesa/osmesa.def
@@ -0,0 +1,13 @@
+DESCRIPTION 'Mesa OSMesa lib for Win32'
+VERSION 4.1
+
+EXPORTS
+	OSMesaCreateContext
+	OSMesaCreateContextExt
+	OSMesaDestroyContext
+	OSMesaMakeCurrent
+	OSMesaGetCurrentContext
+	OSMesaPixelStore
+	OSMesaGetIntegerv
+	OSMesaGetDepthBuffer
+	OSMesaGetColorBuffer
diff --git a/reactos/lib/mesa32/src/drivers/osmesa/osmesa.dsp b/reactos/lib/mesa32/src/drivers/osmesa/osmesa.dsp
new file mode 100644
index 00000000000..59d9daaedad
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/osmesa/osmesa.dsp
@@ -0,0 +1,119 @@
+# Microsoft Developer Studio Project File - Name="osmesa" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=osmesa - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "osmesa.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "osmesa.mak" CFG="osmesa - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "osmesa - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "osmesa - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "osmesa - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSMESA_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../../include" /I "../../" /I "../../main" /I "../../glapi" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSMESA_EXPORTS" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 msvcrt.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /nodefaultlib /out:"Release/OSMESA32.DLL"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy Release\OSMESA32.LIB ..\..\..\..\lib	copy Release\OSMESA32.DLL ..\..\..\..\lib
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "osmesa - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSMESA_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../" /I "../../../../include" /I "../../main" /I "../../glapi" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSMESA_EXPORTS" /FR /YX /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 msvcrtd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /nodefaultlib /out:"Debug/OSMESA32.DLL" /pdbtype:sept
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy Debug\OSMESA32.LIB ..\..\..\..\lib	copy Debug\OSMESA32.DLL ..\..\..\..\lib
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "osmesa - Win32 Release"
+# Name "osmesa - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\osmesa.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\osmesa.def
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/reactos/lib/mesa32/src/drivers/svga/svgamesa.c b/reactos/lib/mesa32/src/drivers/svga/svgamesa.c
new file mode 100644
index 00000000000..45a707c01c7
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/svga/svgamesa.c
@@ -0,0 +1,513 @@
+/* $Id: svgamesa.c,v 1.1 2004/07/16 22:12:32 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.0
+ * Copyright (C) 1995-2002  Brian Paul
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
+/*
+ * SVGA driver for Mesa.
+ * Original author:  Brian Paul
+ * Additional authors:  Slawomir Szczyrba <steev@hot.pl>  (Mesa 3.2)
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include "conf.h"
+#endif
+
+#ifdef SVGA
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <vga.h>
+#include "GL/svgamesa.h"
+#include "context.h"
+#include "extensions.h"
+#include "imports.h"
+#include "matrix.h"
+#include "mtypes.h"
+#include "swrast/swrast.h"
+#include "svgapix.h"
+#include "svgamesa8.h"
+#include "svgamesa15.h"
+#include "svgamesa16.h"
+#include "svgamesa24.h"
+#include "svgamesa32.h"
+
+struct svga_buffer SVGABuffer;
+vga_modeinfo * SVGAInfo;
+SVGAMesaContext SVGAMesa;    /* the current context */
+
+#ifdef SVGA_DEBUG
+
+#include <sys/types.h>
+#include <signal.h>
+
+FILE * logfile;
+char cbuf[1024]={0};
+
+void SVGAlog(char * what)
+{
+ logfile=fopen("svgamesa.log","a");
+ if (!logfile) return;
+ fprintf(logfile,"%s\n",what);
+ fclose(logfile);
+}
+#endif
+
+/**********************************************************************/
+/*****                       Init stuff...                        *****/
+/**********************************************************************/
+
+int SVGAMesaInit( int GraphMode )
+{
+   vga_init();
+   if (!vga_hasmode(GraphMode))
+   {
+    fprintf(stderr,"GraphMode %d unavailable...",GraphMode);
+#ifdef SVGA_DEBUG
+    SVGAlog("SVGAMesaInit: invalid GraphMode (doesn't exist)");
+#endif
+    return(1);
+   }
+   SVGAInfo=vga_getmodeinfo(GraphMode);
+   if (SVGAInfo->flags & IS_MODEX)
+   {
+    fprintf(stderr,"ModeX not implemented...");
+#ifdef SVGA_DEBUG
+    SVGAlog("SVGAMesaInit: invalid GraphMode (ModeX)");
+#endif
+    return(2);
+   }
+   if (!SVGAInfo->bytesperpixel)
+   {
+    fprintf(stderr,"1 / 4 bit color not implemented...");
+#ifdef SVGA_DEBUG
+    SVGAlog("SVGAMesaInit: invalid GraphMode (1 or 4 bit)");
+#endif
+    return(3);
+   }
+   switch (SVGAInfo->colors) {
+    case   256: SVGABuffer.Depth = 8;  break;
+    case 32768: SVGABuffer.Depth = 15; break;
+    case 65536: SVGABuffer.Depth = 16; break;
+    default: SVGABuffer.Depth = SVGAInfo->bytesperpixel<<3; break;
+   }
+   SVGABuffer.BufferSize=SVGAInfo->linewidth*SVGAInfo->height;
+#ifdef SVGA_DEBUG
+   sprintf(cbuf,"SVGAMesaInit: double buffer info.\n" \
+                 "              depth  : %d\n" \
+                 "              mode   : %d\n" \
+		 "              width  : %d\n" \
+		 "              height : %d\n" \
+		 "              bufsize: %d\n", \
+		 SVGABuffer.Depth,GraphMode,SVGAInfo->linewidth, \
+		 SVGAInfo->height,SVGABuffer.BufferSize);
+   SVGAlog(cbuf);
+#endif
+   SVGABuffer.FrontBuffer=(void*)malloc(SVGABuffer.BufferSize + 4);
+   if (!SVGABuffer.FrontBuffer) {
+    {
+     fprintf(stderr,"Not enough RAM for FRONT_LEFT_BUFFER...");
+#ifdef SVGA_DEBUG
+     SVGAlog("SVGAMesaInit: Not enough RAM (front buffer)");
+#endif
+     return(4);
+    }
+   }
+#ifdef SVGA_DEBUG
+   sprintf(cbuf,"SVGAMesaInit: FrontBuffer - %p",SVGABuffer.FrontBuffer);
+   SVGAlog(cbuf);
+#endif
+   SVGABuffer.BackBuffer=(void*)malloc(SVGABuffer.BufferSize + 4);
+   if (!SVGABuffer.BackBuffer) {
+    {
+     free(SVGABuffer.FrontBuffer);
+     fprintf(stderr,"Not enough RAM for BACK_LEFT_BUFFER...");
+#ifdef SVGA_DEBUG
+     SVGAlog("SVGAMesaInit: Not enough RAM (back buffer)");
+#endif
+     return(5);
+    }
+   }
+#ifdef SVGA_DEBUG
+   sprintf(cbuf,"SVGAMesaInit: BackBuffer - %p",SVGABuffer.BackBuffer);
+   SVGAlog(cbuf);
+#endif
+
+   vga_setmode(GraphMode);
+   SVGABuffer.VideoRam=vga_getgraphmem();
+#ifdef SVGA_DEBUG
+   sprintf(cbuf,"SVGAMesaInit: VRAM - %p",SVGABuffer.VideoRam);
+   SVGAlog(cbuf);
+   sprintf(cbuf,"SVGAMesaInit: done. (Mode %d)",GraphMode);
+   SVGAlog(cbuf);
+#endif
+
+   SVGABuffer.DrawBuffer = SVGABuffer.BackBuffer;
+   SVGABuffer.ReadBuffer = SVGABuffer.BackBuffer;
+
+   return 0;
+}
+
+int SVGAMesaClose( void )
+{
+   vga_setmode(TEXT);
+   free(SVGABuffer.FrontBuffer);
+   free(SVGABuffer.BackBuffer);
+   return 0;
+}
+
+void SVGAMesaSetCI(int ndx, GLubyte red, GLubyte green, GLubyte blue)
+{
+   if (ndx<256)
+      vga_setpalette(ndx, red>>2, green>>2, blue>>2);
+}
+
+/**********************************************************************/
+/*****                 Miscellaneous functions                    *****/
+/**********************************************************************/
+
+static void copy_buffer( const GLubyte * buffer) {
+ int size = SVGABuffer.BufferSize, page = 0;
+
+#ifdef SVGA_DEBUG
+   sprintf(cbuf,"copy_buffer: copy %p to %p",buffer,SVGABuffer.VideoRam);
+   SVGAlog(cbuf);
+#endif
+
+ while(size>0) {
+ vga_setpage(page++);
+  if (size>>16) {
+   memcpy(SVGABuffer.VideoRam,buffer,0x10000);
+   buffer+=0x10000;
+  }else{
+   memcpy(SVGABuffer.VideoRam,buffer,size & 0xffff);
+  }
+  size-=0xffff;
+ }
+}
+
+static void get_buffer_size( GLframebuffer *buffer, GLuint *width, GLuint *height )
+{
+   *width = SVGAMesa->width = vga_getxdim();
+   *height = SVGAMesa->height = vga_getydim();
+}
+
+
+static void set_buffer( GLcontext *ctx, GLframebuffer *colorBuffer,
+                        GLenum buffer )
+{
+   /* We can ignore colorBuffer since we don't support a MakeCurrentRead()
+    * function.
+    */
+   (void) colorBuffer;
+
+   if (buffer == GL_FRONT_LEFT) {
+      SVGABuffer.ReadBuffer = SVGABuffer.FrontBuffer;
+      SVGABuffer.DrawBuffer = SVGABuffer.FrontBuffer;
+#if 0
+      void * tmpptr;
+      /*    vga_waitretrace(); */
+      copy_buffer(SVGABuffer.FrontBuffer);
+      tmpptr=SVGABuffer.BackBuffer;
+      SVGABuffer.BackBuffer=SVGABuffer.FrontBuffer;
+      SVGABuffer.FrontBuffer=tmpptr;
+#endif
+   }
+   else if (buffer == GL_BACK_LEFT) {
+      SVGABuffer.ReadBuffer = SVGABuffer.BackBuffer;
+      SVGABuffer.DrawBuffer = SVGABuffer.BackBuffer;
+#if 0
+      /*    vga_waitretrace(); */
+      copy_buffer(SVGABuffer.BackBuffer);
+#endif
+   }
+}
+
+/**********************************************************************/
+/*****                                                            *****/
+/**********************************************************************/
+
+static void svgamesa_update_state( GLcontext *ctx, GLuint new_state )
+{
+   struct swrast_device_driver *swdd = _swrast_GetDeviceDriverReference( ctx );
+
+   /* Initialize all the pointers in the DD struct.  Do this whenever */
+   /* a new context is made current or we change buffers via set_buffer! */
+
+   ctx->Driver.UpdateState = svgamesa_update_state;
+
+   ctx->Driver.GetBufferSize = get_buffer_size;
+   ctx->Driver.ResizeBuffers = _swrast_alloc_buffers;
+
+   /* Software rasterizer pixel paths:
+    */
+   ctx->Driver.Accum = _swrast_Accum;
+   ctx->Driver.Bitmap = _swrast_Bitmap;
+   ctx->Driver.CopyPixels = _swrast_CopyPixels;
+   ctx->Driver.DrawPixels = _swrast_DrawPixels;
+   ctx->Driver.ReadPixels = _swrast_ReadPixels;
+   ctx->Driver.DrawBuffer = _swrast_DrawBuffer;
+
+   /* Fill in the swrast driver interface:
+    */
+   swdd->SetBuffer = set_buffer;
+
+   switch (SVGABuffer.Depth) {
+    case  8: ctx->Driver.ClearIndex = __clear_index8;
+             ctx->Driver.Clear 	    = __clear8;
+
+             swdd->ReadCI32Span         = __read_ci32_span8;
+             swdd->ReadCI32Pixels       = __read_ci32_pixels8;
+             swdd->WriteCI8Span         = __write_ci8_span8;
+             swdd->WriteCI32Span        = __write_ci32_span8;
+             swdd->WriteCI32Pixels      = __write_ci32_pixels8;
+             swdd->WriteMonoCISpan      = __write_mono_ci_span8;
+             swdd->WriteMonoCIPixels    = __write_mono_ci_pixels8;
+#ifdef SVGA_DEBUG
+    SVGAlog("SVGAUpdateState: 8 bit mode.");
+#endif
+
+	     break;
+    case 15: ctx->Driver.ClearColor = __clear_color15;
+             ctx->Driver.Clear 	    = __clear15;
+
+             swdd->ReadRGBASpan         = __read_rgba_span15;
+             swdd->ReadRGBAPixels       = __read_rgba_pixels15;
+             swdd->WriteRGBASpan        = __write_rgba_span15;
+             swdd->WriteRGBAPixels      = __write_rgba_pixels15;
+             swdd->WriteMonoRGBASpan    = __write_mono_rgba_span15;
+             swdd->WriteMonoRGBAPixels  = __write_mono_rgba_pixels15;
+#ifdef SVGA_DEBUG
+    SVGAlog("SVGAUpdateState: 15 bit mode.");
+#endif
+	     break;
+    case 16: ctx->Driver.ClearColor = __clear_color16;
+             ctx->Driver.Clear 	    = __clear16;
+
+             swdd->ReadRGBASpan         = __read_rgba_span16;
+             swdd->ReadRGBAPixels       = __read_rgba_pixels16;
+             swdd->WriteRGBASpan        = __write_rgba_span16;
+             swdd->WriteRGBAPixels      = __write_rgba_pixels16;
+             swdd->WriteMonoRGBASpan    = __write_mono_rgba_span16;
+             swdd->WriteMonoRGBAPixels  = __write_mono_rgba_pixels16;
+	     break;
+#ifdef SVGA_DEBUG
+    SVGAlog("SVGAUpdateState: 16 bit mode.");
+#endif
+    case 24: ctx->Driver.ClearColor = __clear_color24;
+             ctx->Driver.Clear 	    = __clear24;
+
+             swdd->ReadRGBASpan         = __read_rgba_span24;
+             swdd->ReadRGBAPixels       = __read_rgba_pixels24;
+             swdd->WriteRGBASpan        = __write_rgba_span24;
+             swdd->WriteRGBAPixels      = __write_rgba_pixels24;
+             swdd->WriteMonoRGBASpan    = __write_mono_rgba_span24;
+             swdd->WriteMonoRGBAPixels  = __write_mono_rgba_pixels24;
+	     break;
+#ifdef SVGA_DEBUG
+    SVGAlog("SVGAUpdateState: 32 bit mode.");
+#endif
+    case 32: ctx->Driver.ClearColor = __clear_color32;
+             ctx->Driver.Clear 	    = __clear32;
+
+             swdd->ReadRGBASpan         = __read_rgba_span32;
+             swdd->ReadRGBAPixels       = __read_rgba_pixels32;
+             swdd->WriteRGBASpan        = __write_rgba_span32;
+             swdd->WriteRGBAPixels      = __write_rgba_pixels32;
+             swdd->WriteMonoRGBASpan    = __write_mono_rgba_span32;
+             swdd->WriteMonoRGBAPixels  = __write_mono_rgba_pixels32;
+   }	
+}
+
+/*
+ * Create a new VGA/Mesa context and return a handle to it.
+ */
+SVGAMesaContext SVGAMesaCreateContext( GLboolean doubleBuffer )
+{
+   SVGAMesaContext ctx;
+#ifndef DEV
+   GLboolean rgb_flag;
+   GLfloat redscale, greenscale, bluescale, alphascale;
+   GLint index_bits;
+   GLint redbits, greenbits, bluebits, alphabits;
+
+   /* determine if we're in RGB or color index mode */
+   if ((SVGABuffer.Depth==32) || (SVGABuffer.Depth==24)) {
+      rgb_flag = GL_TRUE;
+      redscale = greenscale = bluescale = alphascale = 255.0;
+      redbits = greenbits = bluebits = 8;
+      alphabits = 0;
+      index_bits = 0;
+   }
+   else if (SVGABuffer.Depth==8) {
+      rgb_flag = GL_FALSE;
+      redscale = greenscale = bluescale = alphascale = 0.0;
+      redbits = greenbits = bluebits = alphabits = 0;
+      index_bits = 8;
+   }
+   else if (SVGABuffer.Depth==15) {
+      rgb_flag = GL_TRUE;
+      redscale = greenscale = bluescale = alphascale = 31.0;
+      redbits = greenbits = bluebits = 5;
+      alphabits = 0;
+      index_bits = 0;
+   }
+   else if (SVGABuffer.Depth==16) {
+      rgb_flag = GL_TRUE;
+      redscale = bluescale = alphascale = 31.0;
+      greenscale = 63.0;
+      redbits = bluebits = 5;
+      greenbits = 6;
+      alphabits = 0;
+      index_bits = 0;
+   }
+
+   ctx = (SVGAMesaContext) calloc( 1, sizeof(struct svgamesa_context) );
+   if (!ctx) {
+      return NULL;
+   }
+
+   ctx->gl_vis = _mesa_create_visual( rgb_flag,
+                                      doubleBuffer,
+                                      GL_FALSE,  /* stereo */
+                                      redbits, greenbits,
+                                      bluebits, alphabits,
+                                      index_bits,
+                                      16,   /* depth_size */
+                                      8,    /* stencil_size */
+                                      16, 16, 16, 16,   /* accum_size */
+                                      1     /* samples */
+                                      );
+
+   ctx->gl_ctx = _mesa_create_context( ctx->gl_vis,
+                                       NULL,  /* share list context */
+                                       (void *) ctx, GL_FALSE );
+
+   _mesa_enable_sw_extensions(ctx->gl_ctx);
+   _mesa_enable_1_3_extensions(ctx->gl_ctx);
+
+   ctx->gl_buffer = _mesa_create_framebuffer( ctx->gl_vis,
+                                              ctx->gl_vis->depthBits > 0,
+                                              ctx->gl_vis->stencilBits > 0,
+                                              ctx->gl_vis->accumRedBits > 0,
+                                              ctx->gl_vis->alphaBits > 0 );
+
+   ctx->width = ctx->height = 0;  /* temporary until first "make-current" */
+#endif
+   return ctx;
+}
+
+/*
+ * Destroy the given VGA/Mesa context.
+ */
+void SVGAMesaDestroyContext( SVGAMesaContext ctx )
+{
+#ifndef DEV
+   if (ctx) {
+      _mesa_destroy_visual( ctx->gl_vis );
+      _mesa_destroy_context( ctx->gl_ctx );
+      _mesa_destroy_framebuffer( ctx->gl_buffer );
+      free( ctx );
+      if (ctx==SVGAMesa) {
+         SVGAMesa = NULL;
+      }
+   }
+#endif
+}
+
+/*
+ * Make the specified VGA/Mesa context the current one.
+ */
+void SVGAMesaMakeCurrent( SVGAMesaContext ctx )
+{
+#ifndef DEV
+   SVGAMesa = ctx;
+   svgamesa_update_state( ctx->gl_ctx, ~0 );
+   _mesa_make_current( ctx->gl_ctx, ctx->gl_buffer );
+
+   if (ctx->width==0 || ctx->height==0) {
+      /* setup initial viewport */
+      ctx->width = vga_getxdim();
+      ctx->height = vga_getydim();
+      _mesa_set_viewport( ctx->gl_ctx, 0, 0, ctx->width, ctx->height );
+   }
+#endif
+}
+
+/*
+ * Return a handle to the current VGA/Mesa context.
+ */
+SVGAMesaContext SVGAMesaGetCurrentContext( void )
+{
+   return SVGAMesa;
+}
+
+/*
+ * Swap front/back buffers for current context if double buffered.
+ */
+void SVGAMesaSwapBuffers( void )
+{
+#if 000
+   void * tmpptr;
+#endif
+
+   /* vga_waitretrace(); */
+   copy_buffer(SVGABuffer.BackBuffer);
+
+#ifndef DEV
+   _mesa_notifySwapBuffers( SVGAMesa->gl_ctx );
+   if (SVGAMesa->gl_vis->doubleBufferMode)
+#endif /* DEV */
+   {
+#ifdef SVGA_DEBUG
+      sprintf(cbuf,"SVGAMesaSwapBuffers : Swapping...");
+      SVGAlog(cbuf);
+#endif /* SVGA_DEBUG */
+#if 000
+      tmpptr=SVGABuffer.BackBuffer;
+      SVGABuffer.BackBuffer=SVGABuffer.FrontBuffer;
+      SVGABuffer.FrontBuffer=tmpptr;
+#endif
+#ifdef SVGA_DEBUG
+      sprintf(cbuf,"SVGAMesaSwapBuffers : WriteBuffer : %p\n"
+              "                      Readbuffer  : %p", \
+              SVGABuffer.BackBuffer, SVGABuffer.FrontBuffer );
+      SVGAlog(cbuf);
+#endif /* SVGA_DEBUG */
+   }
+}
+
+#else /*SVGA*/
+
+/*
+ * Need this to provide at least one external definition when SVGA is
+ * not defined on the compiler command line.
+ */
+
+int gl_svga_dummy_function(void)
+{
+   return 0;
+}
+
+#endif  /*SVGA*/
+
diff --git a/reactos/lib/mesa32/src/drivers/svga/svgamesa15.c b/reactos/lib/mesa32/src/drivers/svga/svgamesa15.c
new file mode 100644
index 00000000000..a7d13fe19d2
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/svga/svgamesa15.c
@@ -0,0 +1,217 @@
+/* $Id: svgamesa15.c,v 1.1 2004/07/16 22:12:32 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.0
+ * Copyright (C) 1995-2002  Brian Paul
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
+/*
+ * SVGA driver for Mesa.
+ * Original author:  Brian Paul
+ * Additional authors:  Slawomir Szczyrba <steev@hot.pl>  (Mesa 3.2)
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "conf.h"
+#endif
+
+#ifdef SVGA
+
+#include "svgapix.h"
+#include "svgamesa15.h"
+#include "swrast/swrast.h"
+
+
+static void __svga_drawpixel15(int x, int y, unsigned long c)
+{
+    unsigned long offset;
+    GLshort *shortBuffer=(void *)SVGABuffer.DrawBuffer;
+    y = SVGAInfo->height-y-1;
+    offset = y * SVGAInfo->width + x;
+    shortBuffer[offset]=c;
+}
+
+static unsigned long __svga_getpixel15(int x, int y)
+{
+    unsigned long offset;
+    GLshort *shortBuffer=(void *)SVGABuffer.ReadBuffer;
+    y = SVGAInfo->height-y-1;
+    offset = y * SVGAInfo->width + x;
+    return shortBuffer[offset];
+}
+
+void __clear_color15( GLcontext *ctx, const GLfloat color[4] )
+{
+   GLubyte col[3];
+   CLAMPED_FLOAT_TO_UBYTE(col[0], color[0]);
+   CLAMPED_FLOAT_TO_UBYTE(col[1], color[1]);
+   CLAMPED_FLOAT_TO_UBYTE(col[2], color[2]);
+   SVGAMesa->clear_hicolor=(col[0]>>3)<<10 | (col[1]>>3)<<5 | (col[2]>>3);  
+/*   SVGAMesa->clear_hicolor=(red)<<10 | (green)<<5 | (blue);*/
+}   
+
+void __clear15( GLcontext *ctx, GLbitfield mask, GLboolean all,
+                GLint x, GLint y, GLint width, GLint height )
+{
+   int i, j;
+
+   if (mask & DD_FRONT_LEFT_BIT) {
+      GLshort *shortBuffer=(void *)SVGABuffer.FrontBuffer;
+      if (all) {
+         for (i=0;i<SVGABuffer.BufferSize / 2;i++)
+            shortBuffer[i]=SVGAMesa->clear_hicolor;
+      }
+      else {
+         GLubyte *tmp = SVGABuffer.DrawBuffer;
+         SVGABuffer.DrawBuffer = SVGABuffer.FrontBuffer;
+         for (i=x;i<width;i++)
+            for (j=y;j<height;j++)
+               __svga_drawpixel15(i,j,SVGAMesa->clear_hicolor);
+         SVGABuffer.DrawBuffer = tmp;
+      }
+      mask &= ~DD_FRONT_LEFT_BIT;
+   }
+   if (mask & DD_BACK_LEFT_BIT) {
+      GLshort *shortBuffer=(void *)SVGABuffer.BackBuffer;
+      if (all) {
+         for (i=0;i<SVGABuffer.BufferSize / 2;i++)
+            shortBuffer[i]=SVGAMesa->clear_hicolor;
+      }
+      else {
+         GLubyte *tmp = SVGABuffer.DrawBuffer;
+         SVGABuffer.DrawBuffer = SVGABuffer.BackBuffer;
+         for (i=x;i<width;i++)
+            for (j=y;j<height;j++)
+               __svga_drawpixel15(i,j,SVGAMesa->clear_hicolor);
+         SVGABuffer.DrawBuffer = tmp;
+      }
+      mask &= ~DD_BACK_LEFT_BIT;
+   }
+
+   if (mask)
+      _swrast_Clear( ctx, mask, all, x, y, width, height );
+}
+
+void __write_rgba_span15( const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                          const GLubyte rgba[][4], const GLubyte mask[] )
+{
+   int i;
+   if (mask) {
+      /* draw some pixels */
+      for (i=0; i<n; i++, x++) {
+         if (mask[i]) {
+         __svga_drawpixel15( x, y, (rgba[i][RCOMP]>>3)<<10 | \
+			           (rgba[i][GCOMP]>>3)<<5 |  \
+			           (rgba[i][BCOMP]>>3));
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      for (i=0; i<n; i++, x++) {
+         __svga_drawpixel15( x, y, (rgba[i][RCOMP]>>3)<<10 | \
+			           (rgba[i][GCOMP]>>3)<<5  | \
+			           (rgba[i][BCOMP]>>3));
+      }
+   }
+}
+
+void __write_mono_rgba_span15( const GLcontext *ctx,
+                               GLuint n, GLint x, GLint y,
+                               const GLchan color[4], const GLubyte mask[])
+{
+   GLushort hicolor = (color[RCOMP] >> 3) << 10 |
+                      (color[GCOMP] >> 3) << 5 |
+                      (color[BCOMP] >> 3); 
+   int i;
+   for (i=0; i<n; i++, x++) {
+      if (mask[i]) {
+         __svga_drawpixel15( x, y, hicolor);
+      }
+   }
+}
+
+void __read_rgba_span15( const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                         GLubyte rgba[][4] )
+{
+   int i,pix;
+   for (i=0; i<n; i++, x++) {
+    pix = __svga_getpixel15( x, y);
+    rgba[i][RCOMP] = ((pix>>10)<<3) & 0xff;
+    rgba[i][GCOMP] = ((pix>> 5)<<3) & 0xff;
+    rgba[i][BCOMP] = ((pix    )<<3) & 0xff;
+   }
+}
+
+void __write_rgba_pixels15( const GLcontext *ctx,
+                            GLuint n, const GLint x[], const GLint y[],
+                            const GLubyte rgba[][4], const GLubyte mask[] )
+{
+   int i;
+   for (i=0; i<n; i++) {
+      if (mask[i]) {
+         __svga_drawpixel15( x[i], y[i], (rgba[i][RCOMP]>>3)<<10 | \
+			                 (rgba[i][GCOMP]>>3)<<5  | \
+			                 (rgba[i][BCOMP]>>3));
+      }
+   }
+}
+
+
+void __write_mono_rgba_pixels15( const GLcontext *ctx,
+                                 GLuint n,
+                                 const GLint x[], const GLint y[],
+                                 const GLchan color[4], const GLubyte mask[] )
+{
+   GLushort hicolor = (color[RCOMP] >> 3) << 10 |
+                      (color[GCOMP] >> 3) << 5 |
+                      (color[BCOMP] >> 3); 
+   int i;
+   /* use current rgb color */
+   for (i=0; i<n; i++) {
+      if (mask[i]) {
+         __svga_drawpixel15( x[i], y[i], hicolor );
+      }
+   }
+}
+
+void __read_rgba_pixels15( const GLcontext *ctx,
+                           GLuint n, const GLint x[], const GLint y[],
+                           GLubyte rgba[][4], const GLubyte mask[] )
+{
+   int i,pix;
+   for (i=0; i<n; i++,x++) {
+    pix = __svga_getpixel15( x[i], y[i] );
+    rgba[i][RCOMP] = ((pix>>10)<<3) & 0xff;
+    rgba[i][GCOMP] = ((pix>> 5)<<3) & 0xff;
+    rgba[i][BCOMP] = ((pix    )<<3) & 0xff;
+   }
+}
+
+#else
+
+
+/* silence compiler warning */
+extern void _mesa_svga15_dummy_function(void);
+void _mesa_svga15_dummy_function(void)
+{
+}
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/drivers/svga/svgamesa15.h b/reactos/lib/mesa32/src/drivers/svga/svgamesa15.h
new file mode 100644
index 00000000000..8bfb7015ad4
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/svga/svgamesa15.h
@@ -0,0 +1,43 @@
+/* $Id: svgamesa15.h,v 1.1 2004/07/16 22:12:32 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.0
+ * Copyright (C) 1995-2002  Brian Paul
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
+/*
+ * SVGA driver for Mesa.
+ * Original author:  Brian Paul
+ * Additional authors:  Slawomir Szczyrba <steev@hot.pl>  (Mesa 3.2)
+ */
+
+
+#ifndef SVGA_MESA_15_H
+#define SVGA_MESA_15_H
+
+extern void __clear_color15( GLcontext *ctx, const GLfloat color[4] );
+extern void __clear15( GLcontext *ctx, GLbitfield mask, GLboolean all, GLint x, GLint y, GLint width, GLint height );
+extern void __write_rgba_span15( const GLcontext *ctx, GLuint n, GLint x, GLint y, const GLubyte rgba[][4], const GLubyte mask[] );
+extern void __write_mono_rgba_span15( const GLcontext *ctx, GLuint n, GLint x, GLint y, const GLchan color[4], const GLubyte mask[]);
+extern void __read_rgba_span15( const GLcontext *ctx, GLuint n, GLint x, GLint y, GLubyte rgba[][4] );
+extern void __write_rgba_pixels15( const GLcontext *ctx, GLuint n, const GLint x[], const GLint y[], const GLubyte rgba[][4], const GLubyte mask[] );
+extern void __write_mono_rgba_pixels15( const GLcontext *ctx, GLuint n, const GLint x[], const GLint y[], const GLchan color[4], const GLubyte mask[] );
+extern void __read_rgba_pixels15( const GLcontext *ctx, GLuint n, const GLint x[], const GLint y[], GLubyte rgba[][4], const GLubyte mask[] );
+
+#endif /* SVGA_MESA_15_H */
diff --git a/reactos/lib/mesa32/src/drivers/svga/svgamesa16.c b/reactos/lib/mesa32/src/drivers/svga/svgamesa16.c
new file mode 100644
index 00000000000..df1efeaf2f9
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/svga/svgamesa16.c
@@ -0,0 +1,215 @@
+/* $Id: svgamesa16.c,v 1.1 2004/07/16 22:12:32 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.0
+ * Copyright (C) 1995-2002  Brian Paul
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
+/*
+ * SVGA driver for Mesa.
+ * Original author:  Brian Paul
+ * Additional authors:  Slawomir Szczyrba <steev@hot.pl>  (Mesa 3.2)
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "conf.h"
+#endif
+
+#ifdef SVGA
+
+#include "svgapix.h"
+#include "svgamesa16.h"
+#include "swrast/swrast.h"
+
+
+static void __svga_drawpixel16(int x, int y, unsigned long c)
+{
+    unsigned long offset;
+    GLshort *shortBuffer=(void *)SVGABuffer.DrawBuffer;
+    y = SVGAInfo->height-y-1;
+    offset = y * SVGAInfo->width + x;
+    shortBuffer[offset]=c;
+}
+
+static unsigned long __svga_getpixel16(int x, int y)
+{
+    unsigned long offset;
+
+    GLshort *shortBuffer=(void *)SVGABuffer.ReadBuffer;
+    y = SVGAInfo->height-y-1;
+    offset = y * SVGAInfo->width + x;
+    return shortBuffer[offset];
+}
+
+void __clear_color16( GLcontext *ctx, const GLfloat color[4] )
+{
+   GLubyte col[3];
+   CLAMPED_FLOAT_TO_UBYTE(col[0], color[0]);
+   CLAMPED_FLOAT_TO_UBYTE(col[1], color[1]);
+   CLAMPED_FLOAT_TO_UBYTE(col[2], color[2]);
+   SVGAMesa->clear_hicolor = (col[0] >> 3) << 11 |
+                              (col[1] >> 2) << 5 |
+                              (col[2] >> 3); 
+/*    SVGAMesa->clear_hicolor=(red)<<11 | (green)<<5 | (blue); */
+}   
+
+void __clear16( GLcontext *ctx, GLbitfield mask, GLboolean all,
+                GLint x, GLint y, GLint width, GLint height )
+{
+   int i,j;
+
+   if (mask & DD_FRONT_LEFT_BIT) {
+      if (all) {
+         GLshort *shortBuffer=(void *)SVGABuffer.FrontBuffer;
+         for (i=0;i<SVGABuffer.BufferSize / 2;i++)
+            shortBuffer[i]=SVGAMesa->clear_hicolor;
+      }
+      else {
+         GLubyte *tmp = SVGABuffer.DrawBuffer;
+         SVGABuffer.DrawBuffer = SVGABuffer.FrontBuffer;
+         for (i=x;i<width;i++)    
+            for (j=y;j<height;j++)    
+               __svga_drawpixel16(i,j,SVGAMesa->clear_hicolor);
+         SVGABuffer.DrawBuffer = tmp;
+      }
+      mask &= ~DD_FRONT_LEFT_BIT;
+   }
+   if (mask & DD_BACK_LEFT_BIT) {
+      if (all) {
+         GLshort *shortBuffer=(void *)SVGABuffer.BackBuffer;
+         for (i=0;i<SVGABuffer.BufferSize / 2;i++)
+            shortBuffer[i]=SVGAMesa->clear_hicolor;
+      }
+      else {
+         GLubyte *tmp = SVGABuffer.DrawBuffer;
+         SVGABuffer.DrawBuffer = SVGABuffer.BackBuffer;
+         for (i=x;i<width;i++)    
+            for (j=y;j<height;j++)    
+               __svga_drawpixel16(i,j,SVGAMesa->clear_hicolor);
+         SVGABuffer.DrawBuffer = tmp;
+      }
+      mask &= ~DD_BACK_LEFT_BIT;
+   }
+
+   if (mask)
+      _swrast_Clear( ctx, mask, all, x, y, width, height );
+}
+
+void __write_rgba_span16( const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                          const GLubyte rgba[][4], const GLubyte mask[] )
+{
+   int i;
+   if (mask) {
+      /* draw some pixels */
+      for (i=0; i<n; i++, x++) {
+         if (mask[i]) {
+         __svga_drawpixel16( x, y, (rgba[i][RCOMP]>>3)<<11 | \
+			           (rgba[i][GCOMP]>>2)<<5  | \
+			           (rgba[i][BCOMP]>>3));
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      for (i=0; i<n; i++, x++) {
+         __svga_drawpixel16( x, y, (rgba[i][RCOMP]>>3)<<11 | \
+			           (rgba[i][GCOMP]>>2)<<5  | \
+			           (rgba[i][BCOMP]>>3));
+      }
+   }
+}
+
+void __write_mono_rgba_span16( const GLcontext *ctx,
+                               GLuint n, GLint x, GLint y,
+                               const GLchan color[4], const GLubyte mask[])
+{
+   GLushort hicolor=(color[RCOMP]>>3)<<11 | (color[GCOMP]>>2)<<5 | (color[BCOMP]>>3); 
+   int i;
+   for (i=0; i<n; i++, x++) {
+      if (mask[i]) {
+         __svga_drawpixel16( x, y, hicolor);
+      }
+   }
+}
+
+void __read_rgba_span16( const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                         GLubyte rgba[][4] )
+{
+   int i,pix;
+   for (i=0; i<n; i++, x++) {
+    pix = __svga_getpixel16( x, y );
+    rgba[i][RCOMP] = ((pix>>11)<<3) & 0xff;
+    rgba[i][GCOMP] = ((pix>> 5)<<2) & 0xff;
+    rgba[i][BCOMP] = ((pix    )<<3) & 0xff;
+   }
+}
+
+void __write_rgba_pixels16( const GLcontext *ctx,
+                            GLuint n, const GLint x[], const GLint y[],
+                            const GLubyte rgba[][4], const GLubyte mask[] )
+{
+   int i;
+   for (i=0; i<n; i++) {
+      if (mask[i]) {
+         __svga_drawpixel16( x[i], y[i], (rgba[i][RCOMP]>>3)<<11 | \
+			                 (rgba[i][GCOMP]>>2)<<5  | \
+			                 (rgba[i][BCOMP]>>3));
+      }
+   }
+}
+
+
+void __write_mono_rgba_pixels16( const GLcontext *ctx,
+                                 GLuint n,
+                                 const GLint x[], const GLint y[],
+                                 const GLchan color[4], const GLubyte mask[] )
+{
+   GLushort hicolor=(color[RCOMP]>>3)<<11 | (color[GCOMP]>>2)<<5 | (color[BCOMP]>>3); 
+   int i;
+   for (i=0; i<n; i++) {
+      if (mask[i]) {
+         __svga_drawpixel16( x[i], y[i], hicolor );
+      }
+   }
+}
+
+void __read_rgba_pixels16( const GLcontext *ctx,
+                           GLuint n, const GLint x[], const GLint y[],
+                           GLubyte rgba[][4], const GLubyte mask[] )
+{
+   int i,pix;
+   for (i=0; i<n; i++,x++) {
+    pix = __svga_getpixel16( x[i], y[i] );
+    rgba[i][RCOMP] = ((pix>>11)<<3) & 0xff;
+    rgba[i][GCOMP] = ((pix>> 5)<<2) & 0xff;
+    rgba[i][BCOMP] = ((pix    )<<3) & 0xff;
+   }
+}
+
+#else
+
+
+/* silence compiler warning */
+extern void _mesa_svga16_dummy_function(void);
+void _mesa_svga16_dummy_function(void)
+{
+}
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/drivers/svga/svgamesa16.h b/reactos/lib/mesa32/src/drivers/svga/svgamesa16.h
new file mode 100644
index 00000000000..3fb7e88513b
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/svga/svgamesa16.h
@@ -0,0 +1,44 @@
+/* $Id: svgamesa16.h,v 1.1 2004/07/16 22:12:32 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.0
+ * Copyright (C) 1995-2002  Brian Paul
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
+/*
+ * SVGA driver for Mesa.
+ * Original author:  Brian Paul
+ * Additional authors:  Slawomir Szczyrba <steev@hot.pl>  (Mesa 3.2)
+ */
+
+
+#ifndef SVGA_MESA_16_H
+#define SVGA_MESA_16_H
+
+extern void __clear_color16( GLcontext *ctx, const GLfloat color[4] );
+extern void __clear16( GLcontext *ctx, GLbitfield mask, GLboolean all, GLint x, GLint y, GLint width, GLint height );
+extern void __write_rgba_span16( const GLcontext *ctx, GLuint n, GLint x, GLint y, const GLubyte rgba[][4], const GLubyte mask[] );
+extern void __write_mono_rgba_span16( const GLcontext *ctx, GLuint n, GLint x, GLint y, const GLchan color[4], const GLubyte mask[]);
+extern void __read_rgba_span16( const GLcontext *ctx, GLuint n, GLint x, GLint y, GLubyte rgba[][4] );
+extern void __write_rgba_pixels16( const GLcontext *ctx, GLuint n, const GLint x[], const GLint y[], const GLubyte rgba[][4], const GLubyte mask[] );
+extern void __write_mono_rgba_pixels16( const GLcontext *ctx, GLuint n, const GLint x[], const GLint y[], const GLchan color[4], const GLubyte mask[] );
+extern void __read_rgba_pixels16( const GLcontext *ctx, GLuint n, const GLint x[], const GLint y[], GLubyte rgba[][4], const GLubyte mask[] );
+
+#endif /* SVGA_MESA_16_H */
+
diff --git a/reactos/lib/mesa32/src/drivers/svga/svgamesa24.c b/reactos/lib/mesa32/src/drivers/svga/svgamesa24.c
new file mode 100644
index 00000000000..b1910cab0f5
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/svga/svgamesa24.c
@@ -0,0 +1,239 @@
+/* $Id: svgamesa24.c,v 1.1 2004/07/16 22:12:32 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.0
+ * Copyright (C) 1995-2002  Brian Paul
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
+/*
+ * SVGA driver for Mesa.
+ * Original author:  Brian Paul
+ * Additional authors:  Slawomir Szczyrba <steev@hot.pl>  (Mesa 3.2)
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "conf.h"
+#endif
+
+#ifdef SVGA
+
+#include "svgapix.h"
+#include "svgamesa24.h"
+#include "swrast/swrast.h"
+
+
+#if 0
+/* this doesn't compile with GCC on RedHat 6.1 */
+static inline int RGB2BGR24(int c)
+{
+	asm("rorw  $8, %0\n"	 
+	    "rorl $16, %0\n"	 
+	    "rorw  $8, %0\n"	 
+	    "shrl  $8, %0\n"	 
+      : "=q"(c):"0"(c));
+    return c;
+}
+#else
+static unsigned long RGB2BGR24(unsigned long color)
+{
+   return (color & 0xff00)|(color>>16)|((color & 0xff)<<16);
+}
+#endif
+
+static void __svga_drawpixel24(int x, int y, GLubyte r, GLubyte g, GLubyte b)
+{
+    unsigned long offset;
+
+    _RGB *rgbBuffer=(void *)SVGABuffer.DrawBuffer;
+    y = SVGAInfo->height-y-1;
+    offset = y * SVGAInfo->width + x;
+
+    rgbBuffer[offset].r=r;
+    rgbBuffer[offset].g=g;
+    rgbBuffer[offset].b=b;
+}
+
+static unsigned long __svga_getpixel24(int x, int y)
+{
+    unsigned long offset;
+
+    _RGB *rgbBuffer=(void *)SVGABuffer.ReadBuffer;
+    y = SVGAInfo->height-y-1;
+    offset = y * SVGAInfo->width + x;
+    return rgbBuffer[offset].r<<16 | rgbBuffer[offset].g<<8 | rgbBuffer[offset].b;
+}
+
+void __clear_color24( GLcontext *ctx, const GLfloat color[4] )
+{
+   GLubyte col[3];
+   CLAMPED_FLOAT_TO_UBYTE(col[0], color[0]);
+   CLAMPED_FLOAT_TO_UBYTE(col[1], color[1]);
+   CLAMPED_FLOAT_TO_UBYTE(col[2], color[2]);
+   SVGAMesa->clear_red = col[0];
+   SVGAMesa->clear_green = col[1];
+   SVGAMesa->clear_blue = col[2];
+/*   SVGAMesa->clear_truecolor = red<<16 | green<<8 | blue; */
+}
+
+void __clear24( GLcontext *ctx, GLbitfield mask, GLboolean all,
+                GLint x, GLint y, GLint width, GLint height )
+{
+   int i,j;
+   
+   if (mask & DD_FRONT_LEFT_BIT) {
+      if (all) {
+         _RGB *rgbBuffer=(void *)SVGABuffer.FrontBuffer;
+         for (i=0;i<SVGABuffer.BufferSize / 3;i++) {
+            rgbBuffer[i].r=SVGAMesa->clear_red;
+            rgbBuffer[i].g=SVGAMesa->clear_green;
+            rgbBuffer[i].b=SVGAMesa->clear_blue;
+         } 
+      }
+      else {
+         GLubyte *tmp = SVGABuffer.DrawBuffer;
+         SVGABuffer.DrawBuffer = SVGABuffer.FrontBuffer;
+         for (i=x;i<width;i++)    
+            for (j=y;j<height;j++)    
+               __svga_drawpixel24( i, j, SVGAMesa->clear_red,
+                                   SVGAMesa->clear_green,
+                                   SVGAMesa->clear_blue);
+         SVGABuffer.DrawBuffer = tmp;
+      }	
+      mask &= ~DD_FRONT_LEFT_BIT;
+   }
+   if (mask & DD_BACK_LEFT_BIT) {
+      if (all) {
+         _RGB *rgbBuffer=(void *)SVGABuffer.BackBuffer;
+         for (i=0;i<SVGABuffer.BufferSize / 3;i++) {
+            rgbBuffer[i].r=SVGAMesa->clear_red;
+            rgbBuffer[i].g=SVGAMesa->clear_green;
+            rgbBuffer[i].b=SVGAMesa->clear_blue;
+         } 
+      }
+      else {
+         GLubyte *tmp = SVGABuffer.DrawBuffer;
+         SVGABuffer.DrawBuffer = SVGABuffer.BackBuffer;
+         for (i=x;i<width;i++)    
+            for (j=y;j<height;j++)    
+               __svga_drawpixel24( i, j, SVGAMesa->clear_red,
+                                   SVGAMesa->clear_green,
+                                   SVGAMesa->clear_blue);
+         SVGABuffer.DrawBuffer = tmp;
+      }	
+      mask &= ~DD_BACK_LEFT_BIT;
+   }
+
+   if (mask)
+      _swrast_Clear( ctx, mask, all, x, y, width, height );
+}
+
+void __write_rgba_span24( const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                          const GLubyte rgba[][4], const GLubyte mask[] )
+{
+   int i;
+   if (mask) {
+      /* draw some pixels */
+      for (i=0; i<n; i++, x++) {
+         if (mask[i]) {
+         __svga_drawpixel24( x, y, rgba[i][RCOMP],
+	                           rgba[i][GCOMP],
+				   rgba[i][BCOMP]);
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      for (i=0; i<n; i++, x++) {
+         __svga_drawpixel24( x, y, rgba[i][RCOMP],
+	                           rgba[i][GCOMP],
+				   rgba[i][BCOMP]);
+      }
+   }
+}
+
+void __write_mono_rgba_span24( const GLcontext *ctx,
+                               GLuint n, GLint x, GLint y,
+                               const GLchan color[4], const GLubyte mask[])
+{
+   int i;
+   for (i=0; i<n; i++, x++) {
+      if (mask[i]) {
+         __svga_drawpixel24( x, y, color[RCOMP], color[GCOMP], color[BCOMP]);
+      }
+   }
+}
+
+void __read_rgba_span24( const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                         GLubyte rgba[][4] )
+{
+   int i;
+   for (i=0; i<n; i++, x++) {
+    *((GLint*)rgba[i]) = RGB2BGR24(__svga_getpixel24( x, y));
+   }
+}
+
+void __write_rgba_pixels24( const GLcontext *ctx,
+                            GLuint n, const GLint x[], const GLint y[],
+                            const GLubyte rgba[][4], const GLubyte mask[] )
+{
+   int i;
+   for (i=0; i<n; i++) {
+      if (mask[i]) {
+         __svga_drawpixel24( x[i], y[i], rgba[i][RCOMP],
+	                                 rgba[i][GCOMP],
+				         rgba[i][BCOMP]);
+      }
+   }
+}
+
+void __write_mono_rgba_pixels24( const GLcontext *ctx,
+                                 GLuint n,
+                                 const GLint x[], const GLint y[],
+                                 const GLchan color[4], const GLubyte mask[] )
+{
+   int i;
+   for (i=0; i<n; i++) {
+      if (mask[i]) {
+         __svga_drawpixel24( x[i], y[i],
+                             color[RCOMP], color[GCOMP], color[BCOMP] );
+      }
+   }
+}
+
+void __read_rgba_pixels24( const GLcontext *ctx,
+                           GLuint n, const GLint x[], const GLint y[],
+                           GLubyte rgba[][4], const GLubyte mask[] )
+{
+   int i;
+   for (i=0; i<n; i++,x++) {
+    *((GLint*)rgba[i]) = RGB2BGR24(__svga_getpixel24( x[i], y[i]));    
+   }
+}
+
+#else
+
+
+/* silence compiler warning */
+extern void _mesa_svga24_dummy_function(void);
+void _mesa_svga24_dummy_function(void)
+{
+}
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/drivers/svga/svgamesa24.h b/reactos/lib/mesa32/src/drivers/svga/svgamesa24.h
new file mode 100644
index 00000000000..98224af86c7
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/svga/svgamesa24.h
@@ -0,0 +1,44 @@
+/* $Id: svgamesa24.h,v 1.1 2004/07/16 22:12:32 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.0
+ * Copyright (C) 1995-2002  Brian Paul
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
+/*
+ * SVGA driver for Mesa.
+ * Original author:  Brian Paul
+ * Additional authors:  Slawomir Szczyrba <steev@hot.pl>  (Mesa 3.2)
+ */
+
+
+#ifndef SVGA_MESA_24_H
+#define SVGA_MESA_24_H
+
+extern void __clear_color24( GLcontext *ctx, const GLfloat color[4] );
+extern void __clear24( GLcontext *ctx, GLbitfield mask, GLboolean all, GLint x, GLint y, GLint width, GLint height );
+extern void __write_rgba_span24( const GLcontext *ctx, GLuint n, GLint x, GLint y, const GLubyte rgba[][4], const GLubyte mask[] );
+extern void __write_mono_rgba_span24( const GLcontext *ctx, GLuint n, GLint x, GLint y, const GLchan color[4], const GLubyte mask[]);
+extern void __read_rgba_span24( const GLcontext *ctx, GLuint n, GLint x, GLint y, GLubyte rgba[][4] );
+extern void __write_rgba_pixels24( const GLcontext *ctx, GLuint n, const GLint x[], const GLint y[], const GLubyte rgba[][4], const GLubyte mask[] );
+extern void __write_mono_rgba_pixels24( const GLcontext *ctx, GLuint n, const GLint x[], const GLint y[], const GLchan color[4], const GLubyte mask[] );
+extern void __read_rgba_pixels24( const GLcontext *ctx, GLuint n, const GLint x[], const GLint y[], GLubyte rgba[][4], const GLubyte mask[] );
+
+#endif /* SVGA_MESA_24_H */
+
diff --git a/reactos/lib/mesa32/src/drivers/svga/svgamesa32.c b/reactos/lib/mesa32/src/drivers/svga/svgamesa32.c
new file mode 100644
index 00000000000..386c9f27d43
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/svga/svgamesa32.c
@@ -0,0 +1,220 @@
+/* $Id: svgamesa32.c,v 1.1 2004/07/16 22:12:32 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.0
+ * Copyright (C) 1995-2002  Brian Paul
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
+/*
+ * SVGA driver for Mesa.
+ * Original author:  Brian Paul
+ * Additional authors:  Slawomir Szczyrba <steev@hot.pl>  (Mesa 3.2)
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "conf.h"
+#endif
+
+#ifdef SVGA
+
+#include "svgapix.h"
+#include "svgamesa32.h"
+#include "swrast/swrast.h"
+
+
+#if 0
+/* this doesn't compile with GCC on RedHat 6.1 */
+static inline int RGB2BGR32(int c)
+{
+	asm("rorw  $8, %0\n"	 
+	    "rorl $16, %0\n"	 
+	    "rorw  $8, %0\n"	 
+	    "shrl  $8, %0\n"	 
+      : "=q"(c):"0"(c));
+    return c;
+}
+#else
+static unsigned long RGB2BGR32(unsigned long color)
+{
+   return (color & 0xff00)|(color>>16)|((color & 0xff)<<16);
+}
+#endif
+
+static void __svga_drawpixel32(int x, int y, unsigned long c)
+{
+    unsigned long offset;
+
+    GLint *intBuffer=(void *)SVGABuffer.DrawBuffer;
+    y = SVGAInfo->height-y-1;
+    offset = y * SVGAInfo->width + x;
+    intBuffer[offset]=c;
+}
+
+static unsigned long __svga_getpixel32(int x, int y)
+{
+    unsigned long offset;
+
+    const GLint *intBuffer=(void *)SVGABuffer.ReadBuffer;
+    y = SVGAInfo->height-y-1;
+    offset = y * SVGAInfo->width + x;
+    return intBuffer[offset];
+}
+
+void __clear_color32( GLcontext *ctx, const GLfloat color[4] )
+{
+   GLubyte col[3];
+   CLAMPED_FLOAT_TO_UBYTE(col[0], color[0]);
+   CLAMPED_FLOAT_TO_UBYTE(col[1], color[1]);
+   CLAMPED_FLOAT_TO_UBYTE(col[2], color[2]);
+   SVGAMesa->clear_truecolor = (col[0] << 16) | (col[1] << 8) | col[2];
+}
+
+void __clear32( GLcontext *ctx, GLbitfield mask, GLboolean all,
+                GLint x, GLint y, GLint width, GLint height )
+{
+   int i,j;
+   
+   if (mask & DD_FRONT_LEFT_BIT) {
+      if (all) {
+         GLint *intBuffer=(void *)SVGABuffer.FrontBuffer;
+         for (i=0;i<SVGABuffer.BufferSize / 4;i++)
+            intBuffer[i]=SVGAMesa->clear_truecolor;
+      }
+      else {
+         GLubyte *tmp = SVGABuffer.DrawBuffer;
+         SVGABuffer.DrawBuffer = SVGABuffer.FrontBuffer;
+         for (i=x;i<width;i++)    
+            for (j=y;j<height;j++)    
+               __svga_drawpixel32(i,j,SVGAMesa->clear_truecolor);
+         SVGABuffer.DrawBuffer = tmp;
+      }
+      mask &= ~DD_FRONT_LEFT_BIT;
+   }
+   if (mask & DD_BACK_LEFT_BIT) {
+      if (all) {
+         GLint *intBuffer=(void *)SVGABuffer.BackBuffer;
+         for (i=0;i<SVGABuffer.BufferSize / 4;i++)
+            intBuffer[i]=SVGAMesa->clear_truecolor;
+      }
+      else {
+         GLubyte *tmp = SVGABuffer.DrawBuffer;
+         SVGABuffer.DrawBuffer = SVGABuffer.BackBuffer;
+         for (i=x;i<width;i++)    
+            for (j=y;j<height;j++)    
+               __svga_drawpixel32(i,j,SVGAMesa->clear_truecolor);
+         SVGABuffer.DrawBuffer = tmp;
+      }
+      mask &= ~DD_BACK_LEFT_BIT;
+   }
+
+   if (mask)
+      _swrast_Clear( ctx, mask, all, x, y, width, height );
+}
+
+void __write_rgba_span32( const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                          const GLubyte rgba[][4], const GLubyte mask[] )
+{
+   int i;
+   if (mask) {
+      /* draw some pixels */
+      for (i=0; i<n; i++, x++) {
+         if (mask[i]) {
+         __svga_drawpixel32( x, y, RGB2BGR32(*((GLint*)rgba[i])));
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      for (i=0; i<n; i++, x++) {
+         __svga_drawpixel32( x, y, RGB2BGR32(*((GLint*)rgba[i])));
+      }
+   }
+}
+
+void __write_mono_rgba_span32( const GLcontext *ctx,
+                               GLuint n, GLint x, GLint y,
+                               const GLchan color[4], const GLubyte mask[])
+{
+   int i;
+   GLuint truecolor = color[RCOMP]<<16 | color[GCOMP]<<8 | color[BCOMP];
+   for (i=0; i<n; i++, x++) {
+      if (mask[i]) {
+         __svga_drawpixel32( x, y, truecolor);
+      }
+   }
+}
+
+void __read_rgba_span32( const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                         GLubyte rgba[][4] )
+{
+   int i;
+   for (i=0; i<n; i++, x++) {
+     *((GLint*)rgba[i]) = RGB2BGR32(__svga_getpixel32( x, y ));
+   }
+}
+
+void __write_rgba_pixels32( const GLcontext *ctx,
+                            GLuint n, const GLint x[], const GLint y[],
+                            const GLubyte rgba[][4], const GLubyte mask[] )
+{
+   int i;
+   for (i=0; i<n; i++) {
+      if (mask[i]) {
+         __svga_drawpixel32( x[i], y[i], RGB2BGR32(*((GLint*)rgba[i])));
+      }
+   }
+}
+
+void __write_mono_rgba_pixels32( const GLcontext *ctx,
+                                 GLuint n,
+                                 const GLint x[], const GLint y[],
+                                 const GLchan color[4], const GLubyte mask[] )
+{
+   GLuint truecolor = color[RCOMP]<<16 | color[GCOMP]<<8 | color[BCOMP];
+   int i;
+   for (i=0; i<n; i++) {
+      if (mask[i]) {
+         __svga_drawpixel32( x[i], y[i], truecolor );
+      }
+   }
+}
+
+void __read_rgba_pixels32( const GLcontext *ctx,
+                           GLuint n, const GLint x[], const GLint y[],
+                           GLubyte rgba[][4], const GLubyte mask[] )
+{
+   int i;
+   for (i=0; i<n; i++,x++) {
+    *((GLint*)rgba[i]) = RGB2BGR32(__svga_getpixel32( x[i], y[i] ));
+   }
+}
+
+
+#else
+
+
+/* silence compiler warning */
+extern void _mesa_svga32_dummy_function(void);
+void _mesa_svga32_dummy_function(void)
+{
+}
+
+
+#endif
+
diff --git a/reactos/lib/mesa32/src/drivers/svga/svgamesa32.h b/reactos/lib/mesa32/src/drivers/svga/svgamesa32.h
new file mode 100644
index 00000000000..27fa8a86a74
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/svga/svgamesa32.h
@@ -0,0 +1,44 @@
+/* $Id: svgamesa32.h,v 1.1 2004/07/16 22:12:32 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.0
+ * Copyright (C) 1995-2002  Brian Paul
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
+/*
+ * SVGA driver for Mesa.
+ * Original author:  Brian Paul
+ * Additional authors:  Slawomir Szczyrba <steev@hot.pl>  (Mesa 3.2)
+ */
+
+
+#ifndef SVGA_MESA_32_H
+#define SVGA_MESA_32_H
+
+extern void __clear_color32( GLcontext *ctx, const GLfloat color[4] );
+extern void __clear32( GLcontext *ctx, GLbitfield mask, GLboolean all, GLint x, GLint y, GLint width, GLint height );
+extern void __write_rgba_span32( const GLcontext *ctx, GLuint n, GLint x, GLint y, const GLubyte rgba[][4], const GLubyte mask[] );
+extern void __write_mono_rgba_span32( const GLcontext *ctx, GLuint n, GLint x, GLint y, const GLchan color[4], const GLubyte mask[]);
+extern void __read_rgba_span32( const GLcontext *ctx, GLuint n, GLint x, GLint y, GLubyte rgba[][4] );
+extern void __write_rgba_pixels32( const GLcontext *ctx, GLuint n, const GLint x[], const GLint y[], const GLubyte rgba[][4], const GLubyte mask[] );
+extern void __write_mono_rgba_pixels32( const GLcontext *ctx, GLuint n, const GLint x[], const GLint y[], const GLchan color[4], const GLubyte mask[] );
+extern void __read_rgba_pixels32( const GLcontext *ctx, GLuint n, const GLint x[], const GLint y[], GLubyte rgba[][4], const GLubyte mask[] );
+
+#endif /* SVGA_MESA_32_H */
+
diff --git a/reactos/lib/mesa32/src/drivers/svga/svgamesa8.c b/reactos/lib/mesa32/src/drivers/svga/svgamesa8.c
new file mode 100644
index 00000000000..c1d2202f0e5
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/svga/svgamesa8.c
@@ -0,0 +1,191 @@
+/* $Id: svgamesa8.c,v 1.1 2004/07/16 22:12:32 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.3
+ * Copyright (C) 1995-2000  Brian Paul
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
+/*
+ * SVGA driver for Mesa.
+ * Original author:  Brian Paul
+ * Additional authors:  Slawomir Szczyrba <steev@hot.pl>  (Mesa 3.2)
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "conf.h"
+#endif
+
+#ifdef SVGA
+
+
+#include "svgapix.h"
+#include "svgamesa8.h"
+#include "swrast/swrast.h"
+
+
+static void __svga_drawpixel8(int x, int y, unsigned long c)
+{
+    unsigned long offset;
+    y = SVGAInfo->height-y-1;
+    offset = y * SVGAInfo->linewidth + x;
+    SVGABuffer.DrawBuffer[offset]=c;
+}
+
+static unsigned long __svga_getpixel8(int x, int y)
+{
+    unsigned long offset;
+    y = SVGAInfo->height-y-1;
+    offset = y * SVGAInfo->linewidth + x;
+    return SVGABuffer.ReadBuffer[offset];
+}
+
+void __clear_index8( GLcontext *ctx, GLuint index )
+{
+   SVGAMesa->clear_index = index;
+}
+
+void __clear8( GLcontext *ctx, GLbitfield mask, GLboolean all,
+               GLint x, GLint y, GLint width, GLint height )
+{
+   int i,j;
+   
+   if (mask & DD_FRONT_LEFT_BIT) {
+      if (all) { 
+         memset(SVGABuffer.FrontBuffer, SVGAMesa->clear_index, SVGABuffer.BufferSize);
+      }
+      else {
+         GLubyte *tmp = SVGABuffer.DrawBuffer;
+         SVGABuffer.DrawBuffer = SVGABuffer.FrontBuffer;
+         for (i=x;i<width;i++)
+            for (j=y;j<height;j++)
+               __svga_drawpixel8(i,j,SVGAMesa->clear_index);
+         SVGABuffer.DrawBuffer = tmp;
+      }
+      mask &= ~DD_FRONT_LEFT_BIT;
+   }
+   if (mask & DD_BACK_LEFT_BIT) {
+      if (all) { 
+         memset(SVGABuffer.BackBuffer, SVGAMesa->clear_index, SVGABuffer.BufferSize);
+      }
+      else {
+         GLubyte *tmp = SVGABuffer.DrawBuffer;
+         SVGABuffer.DrawBuffer = SVGABuffer.BackBuffer;
+         for (i=x;i<width;i++)
+            for (j=y;j<height;j++)
+               __svga_drawpixel8(i,j,SVGAMesa->clear_index);
+         SVGABuffer.DrawBuffer = tmp;
+      }
+      mask &= ~DD_BACK_LEFT_BIT;
+   }
+
+   if (mask)
+      _swrast_Clear( ctx, mask, all, x, y, width, height );
+}
+
+void __write_ci32_span8( const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                         const GLuint index[], const GLubyte mask[] )
+{
+   int i;
+   for (i=0;i<n;i++,x++) {
+      if (mask[i]) {
+         __svga_drawpixel8( x, y, index[i]);
+      }
+   }
+}
+
+void __write_ci8_span8( const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                        const GLubyte index[], const GLubyte mask[] )
+{
+   int i;
+
+   for (i=0;i<n;i++,x++) {
+      if (mask[i]) {
+         __svga_drawpixel8( x, y, index[i]);
+      }
+   }
+}
+
+void __write_mono_ci_span8( const GLcontext *ctx, GLuint n,
+                            GLint x, GLint y,
+                            GLuint colorIndex, const GLubyte mask[] )
+{
+   int i;
+   for (i=0;i<n;i++,x++) {
+      if (mask[i]) {
+         __svga_drawpixel8( x, y, colorIndex);
+      }
+   }
+}
+
+void __read_ci32_span8( const GLcontext *ctx,
+                        GLuint n, GLint x, GLint y, GLuint index[])
+{
+   int i;
+   for (i=0; i<n; i++,x++) {
+      index[i] = __svga_getpixel8( x, y);
+   }
+}
+
+void __write_ci32_pixels8( const GLcontext *ctx,
+                           GLuint n, const GLint x[], const GLint y[],
+                           const GLuint index[], const GLubyte mask[] )
+{
+   int i;
+   for (i=0; i<n; i++) {
+      if (mask[i]) {
+         __svga_drawpixel8( x[i], y[i], index[i]);
+      }
+   }
+}
+
+
+void __write_mono_ci_pixels8( const GLcontext *ctx, GLuint n,
+                              const GLint x[], const GLint y[],
+                              GLuint colorIndex, const GLubyte mask[] )
+{
+   int i;
+   for (i=0; i<n; i++) {
+      if (mask[i]) {
+         __svga_drawpixel8( x[i], y[i], colorIndex);
+      }
+   }
+}
+
+void __read_ci32_pixels8( const GLcontext *ctx,
+                          GLuint n, const GLint x[], const GLint y[],
+                          GLuint index[], const GLubyte mask[] )
+{
+   int i;
+   for (i=0; i<n; i++,x++) {
+      index[i] = __svga_getpixel8( x[i], y[i]);
+   }
+}
+
+
+#else
+
+
+/* silence compiler warning */
+extern void _mesa_svga8_dummy_function(void);
+void _mesa_svga8_dummy_function(void)
+{
+}
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/drivers/svga/svgamesa8.h b/reactos/lib/mesa32/src/drivers/svga/svgamesa8.h
new file mode 100644
index 00000000000..8d54bc4973f
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/svga/svgamesa8.h
@@ -0,0 +1,44 @@
+/* $Id: svgamesa8.h,v 1.1 2004/07/16 22:12:32 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.2
+ * Copyright (C) 1995-2000  Brian Paul
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
+/*
+ * SVGA driver for Mesa.
+ * Original author:  Brian Paul
+ * Additional authors:  Slawomir Szczyrba <steev@hot.pl>  (Mesa 3.2)
+ */
+
+
+#ifndef SVGA_MESA_8_H
+#define SVGA_MESA_8_H
+
+extern void __clear_index8( GLcontext *ctx, GLuint index );
+extern void __clear8( GLcontext *ctx, GLbitfield mask, GLboolean all, GLint x, GLint y, GLint width, GLint height );
+extern void __write_ci32_span8( const GLcontext *ctx, GLuint n, GLint x, GLint y, const GLuint index[], const GLubyte mask[] );
+extern void __write_ci8_span8( const GLcontext *ctx, GLuint n, GLint x, GLint y, const GLubyte index[], const GLubyte mask[] );
+extern void __write_mono_ci_span8( const GLcontext *ctx, GLuint n, GLint x, GLint y, GLuint colorIndex, const GLubyte mask[] );
+extern void __read_ci32_span8( const GLcontext *ctx, GLuint n, GLint x, GLint y, GLuint index[]);
+extern void __write_ci32_pixels8( const GLcontext *ctx, GLuint n, const GLint x[], const GLint y[], const GLuint index[], const GLubyte mask[] );
+extern void __write_mono_ci_pixels8( const GLcontext *ctx, GLuint n, const GLint x[], const GLint y[], GLuint colorIndex, const GLubyte mask[] );
+extern void __read_ci32_pixels8( const GLcontext *ctx, GLuint n, const GLint x[], const GLint y[], GLuint index[], const GLubyte mask[] );
+
+#endif /* SVGA_MESA_15_H */
diff --git a/reactos/lib/mesa32/src/drivers/svga/svgapix.h b/reactos/lib/mesa32/src/drivers/svga/svgapix.h
new file mode 100644
index 00000000000..3ed885b4086
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/svga/svgapix.h
@@ -0,0 +1,71 @@
+/* $Id: svgapix.h,v 1.1 2004/07/16 22:12:32 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.0
+ * Copyright (C) 1995-2002  Brian Paul
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
+/*
+ * SVGA driver for Mesa.
+ * Original author:  Brian Paul
+ * Additional authors:  Slawomir Szczyrba <steev@hot.pl>  (Mesa 3.2)
+ */
+
+
+#ifndef SVGAPIX_H
+#define SVGAPIX_H
+
+#include "GL/gl.h"
+#include "GL/svgamesa.h"
+#include "context.h"
+#include "colormac.h"
+#include "vga.h"
+
+struct svgamesa_context {
+   GLcontext *gl_ctx;		/* the core Mesa context */
+   GLvisual *gl_vis;		/* describes the color buffer */
+   GLframebuffer *gl_buffer;	/* the ancillary buffers */
+   GLuint clear_index;		/* current clear index */
+   GLint clear_red, 
+         clear_green, 
+	 clear_blue;		/* current clear rgb color */
+   GLuint clear_truecolor;	/* current clear rgb color */
+   GLushort hicolor;		/* current hicolor */
+   GLushort clear_hicolor;	/* current clear hicolor */
+   GLint width, height;		/* size of color buffer */
+   GLint depth;			/* bits per pixel (8,16,24 or 32) */
+};
+
+typedef struct { GLubyte b,g,r; } _RGB;
+
+struct svga_buffer {   
+   GLint     Depth;
+   GLint     BufferSize;
+   GLubyte   * FrontBuffer;
+   GLubyte   * BackBuffer;
+   GLubyte   * VideoRam;
+   GLubyte   * DrawBuffer;  /* == FrontBuffer or BackBuffer */
+   GLubyte   * ReadBuffer;  /* == FrontBuffer or BackBuffer */
+};
+
+extern struct svga_buffer SVGABuffer;
+extern vga_modeinfo * SVGAInfo;
+extern SVGAMesaContext SVGAMesa;    /* the current context */
+
+#endif /* SVGAPIX_H */
diff --git a/reactos/lib/mesa32/src/drivers/windows/gdi/colors.h b/reactos/lib/mesa32/src/drivers/windows/gdi/colors.h
new file mode 100644
index 00000000000..19f11eacc0f
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/windows/gdi/colors.h
@@ -0,0 +1,539 @@
+/*	File name	:	colors.h
+ *  Version		:	2.3
+ *
+ *  Header file for display driver for Mesa 2.3  under 
+ *	Windows95 and WindowsNT 
+ *	This file defines macros and global variables  needed
+ *	for converting color format
+ *
+ *	Copyright (C) 1996-  Li Wei
+ *  Address		:		Institute of Artificial Intelligence
+ *				:			& Robotics
+ *				:		Xi'an Jiaotong University
+ *  Email		:		liwei@aiar.xjtu.edu.cn
+ *  Web page	:		http://sun.aiar.xjtu.edu.cn
+ *
+ *  This file and its associations are partially based on the 
+ *  Windows NT driver for Mesa, written by Mark Leaming
+ *  (mark@rsinc.com).
+ */
+
+/* $Log: ddcolors.h 1997/6/14 by Li Wei(liwei@aiar.xjtu.edu.cn)
+ * Macros for pixel format defined
+ */
+
+/*
+ * $Log: colors.h,v $
+ * Revision 1.1  2004/07/16 22:12:32  blight
+ * Import Mesa-6.0.1 for use as software OpenGL renderer.
+ *
+ * Revision 1.1  2003/07/24 03:47:46  kschultz
+ * Source code for GDI driver.
+ *
+ * Revision 1.3  2002/01/15 18:14:34  kschultz
+ * Fixed pixel color component problem and clear code for 24-bit Windows
+ *   devices.  (Jeff Lewis)
+ *
+ * Revision 1.2  2002/01/15 18:11:36  kschultz
+ * Remove trailing CR's.   No logical changes.
+ *
+ * Revision 1.1.1.1  1999/08/19 00:55:42  jtg
+ * Imported sources
+ *
+ * Revision 1.2  1999/01/03 03:08:57  brianp
+ * Ted Jump's changes
+ *
+ * Revision 1.1  1999/01/03 03:08:12  brianp
+ * Initial revision
+ *
+ * Revision 2.0.2  1997/4/30 15:58:00  CST by Li Wei(liwei@aiar.xjtu.edu.cn)
+ * Add LUTs need for dithering
+ */
+
+/*
+ * $Log: colors.h,v $
+ * Revision 1.1  2004/07/16 22:12:32  blight
+ * Import Mesa-6.0.1 for use as software OpenGL renderer.
+ *
+ * Revision 1.1  2003/07/24 03:47:46  kschultz
+ * Source code for GDI driver.
+ *
+ * Revision 1.3  2002/01/15 18:14:34  kschultz
+ * Fixed pixel color component problem and clear code for 24-bit Windows
+ *   devices.  (Jeff Lewis)
+ *
+ * Revision 1.2  2002/01/15 18:11:36  kschultz
+ * Remove trailing CR's.   No logical changes.
+ *
+ * Revision 1.1.1.1  1999/08/19 00:55:42  jtg
+ * Imported sources
+ *
+ * Revision 1.2  1999/01/03 03:08:57  brianp
+ * Ted Jump's changes
+ *
+ * Revision 1.1  1999/01/03 03:08:12  brianp
+ * Initial revision
+ *
+ * Revision 2.0.1  1997/4/29 15:52:00  CST by Li Wei(liwei@aiar.xjtu.edu.cn)
+ * Add BGR8 Macro
+ */
+ 
+/*
+ * $Log: colors.h,v $
+ * Revision 1.1  2004/07/16 22:12:32  blight
+ * Import Mesa-6.0.1 for use as software OpenGL renderer.
+ *
+ * Revision 1.1  2003/07/24 03:47:46  kschultz
+ * Source code for GDI driver.
+ *
+ * Revision 1.3  2002/01/15 18:14:34  kschultz
+ * Fixed pixel color component problem and clear code for 24-bit Windows
+ *   devices.  (Jeff Lewis)
+ *
+ * Revision 1.2  2002/01/15 18:11:36  kschultz
+ * Remove trailing CR's.   No logical changes.
+ *
+ * Revision 1.1.1.1  1999/08/19 00:55:42  jtg
+ * Imported sources
+ *
+ * Revision 1.2  1999/01/03 03:08:57  brianp
+ * Ted Jump's changes
+ *
+ * Revision 1.1  1999/01/03 03:08:12  brianp
+ * Initial revision
+ *
+ * Revision 2.0  1996/11/15 10:55:00  CST by Li Wei(liwei@aiar.xjtu.edu.cn)
+ * Initial revision
+ */
+/* Values for wmesa->pixelformat: */
+
+#define PF_8A8B8G8R	3	/* 32-bit TrueColor:  8-A, 8-B, 8-G, 8-R */
+#define PF_8R8G8B	4	/* 32-bit TrueColor:  8-R, 8-G, 8-B */
+#define PF_5R6G5B	5	/* 16-bit TrueColor:  5-R, 6-G, 5-B bits */
+#define PF_DITHER8	6	/* Dithered RGB using a lookup table */
+#define PF_LOOKUP	7	/* Undithered RGB using a lookup table */
+#define PF_GRAYSCALE	10	/* Grayscale or StaticGray */
+#define PF_BADFORMAT	11
+#define PF_INDEX8		12
+
+char ColorMap16[] = {
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,
+0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,
+0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,
+0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,
+0x05,0x05,0x05,0x05,0x05,0x05,0x05,0x05,
+0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x06,
+0x07,0x07,0x07,0x07,0x07,0x07,0x07,0x07,
+0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,
+0x09,0x09,0x09,0x09,0x09,0x09,0x09,0x09,
+0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,
+0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,
+0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,
+0x0D,0x0D,0x0D,0x0D,0x0D,0x0D,0x0D,0x0D,
+0x0E,0x0E,0x0E,0x0E,0x0E,0x0E,0x0E,0x0E,
+0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,
+0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,
+0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
+0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12,
+0x13,0x13,0x13,0x13,0x13,0x13,0x13,0x13,
+0x14,0x14,0x14,0x14,0x14,0x14,0x14,0x14,
+0x15,0x15,0x15,0x15,0x15,0x15,0x15,0x15,
+0x16,0x16,0x16,0x16,0x16,0x16,0x16,0x16,
+0x17,0x17,0x17,0x17,0x17,0x17,0x17,0x17,
+0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,
+0x19,0x19,0x19,0x19,0x19,0x19,0x19,0x19,
+0x1A,0x1A,0x1A,0x1A,0x1A,0x1A,0x1A,0x1A,
+0x1B,0x1B,0x1B,0x1B,0x1B,0x1B,0x1B,0x1B,
+0x1C,0x1C,0x1C,0x1C,0x1C,0x1C,0x1C,0x1C,
+0x1D,0x1D,0x1D,0x1D,0x1D,0x1D,0x1D,0x1D,
+0x1E,0x1E,0x1E,0x1E,0x1E,0x1E,0x1E,0x1E,
+0x1F,0x1F,0x1F,0x1F,0x1F,0x1F,0x1F,0x1F};
+
+#define BGR8(r,g,b)		(unsigned)(((BYTE)(b & 0xc0 | (g & 0xe0)>>2 | (r & 0xe0)>>5)))
+#ifdef DDRAW
+#define BGR16(r,g,b)	((WORD)(((BYTE)(ColorMap16[b]) | ((BYTE)(g&0xfc) << 3)) | (((WORD)(BYTE)(ColorMap16[r])) << 11)))
+#else
+#define BGR16(r,g,b)	((WORD)(((BYTE)(ColorMap16[b]) | ((BYTE)(ColorMap16[g]) << 5)) | (((WORD)(BYTE)(ColorMap16[r])) << 10)))
+#endif
+#define BGR24(r,g,b) (unsigned long)((DWORD)(((BYTE)(b)|((WORD)((BYTE)(g))<<8))|(((DWORD)(BYTE)(r))<<16)))
+
+#define BGR32(r,g,b)	(unsigned long)((DWORD)(((BYTE)(b)|((WORD)((BYTE)(g))<<8))|(((DWORD)(BYTE)(r))<<16)))
+
+
+
+/*
+ * If pixelformat==PF_8A8B8G8R:
+ */
+#define PACK_8A8B8G8R( R, G, B, A )	\
+	( ((A) << 24) | ((B) << 16) | ((G) << 8) | (R) )
+
+
+/*
+ * If pixelformat==PF_8R8G8B:
+ */
+#define PACK_8R8G8B( R, G, B)	 ( ((R) << 16) | ((G) << 8) | (B) )
+
+
+/*
+ * If pixelformat==PF_5R6G5B:
+ */
+
+
+#ifdef DDRAW
+#define PACK_5R6G5B( R, G, B) ((WORD)(((BYTE)(ColorMap16[B]) | ((BYTE)(G&0xfc) << 3)) | (((WORD)(BYTE)(ColorMap16[R])) << 11)))
+#else
+#define PACK_5R6G5B( R, G, B)	((WORD)(((BYTE)(ColorMap16[B]) | ((BYTE)(ColorMap16[G]) << 5)) | (((WORD)(BYTE)(ColorMap16[R])) << 10)))
+#endif
+/*----------------------------------------------------------------------------
+
+Division lookup tables.  These tables compute 0-255 divided by 51 and
+modulo 51.  These tables could approximate gamma correction.
+
+*/
+
+char unsigned const aDividedBy51Rounded[256] =
+{
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+};
+
+char unsigned const aDividedBy51[256] =
+{
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 
+};
+
+char unsigned const aModulo51[256] =
+{
+  0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+  20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+  38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 0, 1, 2, 3, 4, 5, 6,
+  7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+  26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
+  44, 45, 46, 47, 48, 49, 50, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12,
+  13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+  31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
+  49, 50, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+  18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+  36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 0, 1, 2, 3,
+  4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+  23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+  41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 0, 
+};
+
+/*----------------------------------------------------------------------------
+
+Multiplication LUTs.  These compute 0-5 times 6 and 36.
+
+*/
+
+char unsigned const aTimes6[6] =
+{
+  0, 6, 12, 18, 24, 30
+};
+
+char unsigned const aTimes36[6] =
+{
+  0, 36, 72, 108, 144, 180
+};
+
+
+/*----------------------------------------------------------------------------
+
+Dither matrices for 8 bit to 2.6 bit halftones.
+
+*/
+
+char unsigned const aHalftone16x16[256] =
+{
+  0, 44, 9, 41, 3, 46, 12, 43, 1, 44, 10, 41, 3, 46, 12, 43,
+  34, 16, 25, 19, 37, 18, 28, 21, 35, 16, 26, 19, 37, 18, 28, 21,
+  38, 6, 47, 3, 40, 9, 50, 6, 38, 7, 47, 4, 40, 9, 49, 6,
+  22, 28, 13, 31, 25, 31, 15, 34, 22, 29, 13, 32, 24, 31, 15, 34,
+  2, 46, 12, 43, 1, 45, 10, 42, 2, 45, 11, 42, 1, 45, 11, 42,
+  37, 18, 27, 21, 35, 17, 26, 20, 36, 17, 27, 20, 36, 17, 26, 20,
+  40, 8, 49, 5, 38, 7, 48, 4, 39, 8, 48, 5, 39, 7, 48, 4,
+  24, 30, 15, 33, 23, 29, 13, 32, 23, 30, 14, 33, 23, 29, 14, 32,
+  2, 46, 12, 43, 0, 44, 10, 41, 3, 47, 12, 44, 0, 44, 10, 41,
+  37, 18, 27, 21, 35, 16, 25, 19, 37, 19, 28, 22, 35, 16, 25, 19,
+  40, 9, 49, 5, 38, 7, 47, 4, 40, 9, 50, 6, 38, 6, 47, 3,
+  24, 30, 15, 34, 22, 29, 13, 32, 25, 31, 15, 34, 22, 28, 13, 31,
+  1, 45, 11, 42, 2, 46, 11, 42, 1, 45, 10, 41, 2, 46, 11, 43,
+  36, 17, 26, 20, 36, 17, 27, 21, 35, 16, 26, 20, 36, 18, 27, 21,
+  39, 8, 48, 4, 39, 8, 49, 5, 38, 7, 48, 4, 39, 8, 49, 5,
+  23, 29, 14, 33, 24, 30, 14, 33, 23, 29, 13, 32, 24, 30, 14, 33,
+};
+
+char unsigned const aHalftone8x8[64] =
+{
+   0, 38,  9, 47,  2, 40, 11, 50,
+  25, 12, 35, 22, 27, 15, 37, 24,
+   6, 44,  3, 41,  8, 47,  5, 43,
+  31, 19, 28, 15, 34, 21, 31, 18,
+   1, 39, 11, 49,  0, 39, 10, 48,
+  27, 14, 36, 23, 26, 13, 35, 23,
+   7, 46,  4, 43,  7, 45,  3, 42,
+  33, 20, 30, 17, 32, 19, 29, 16,
+};
+
+char unsigned const aHalftone4x4_1[16] =
+{
+  0, 25, 6, 31,
+  38, 12, 44, 19,
+  9, 35, 3, 28,
+  47, 22, 41, 15
+};
+
+char unsigned const aHalftone4x4_2[16] =
+{
+  41, 3, 9, 28,
+  35, 15, 22, 47,
+  6, 25, 38, 0,
+  19, 44, 31, 12
+};
+
+/***************************************************************************
+  aWinGHalftoneTranslation
+
+  Translates a 2.6 bit-per-pixel halftoned representation into the
+  slightly rearranged WinG Halftone Palette.
+*/
+
+char unsigned const aWinGHalftoneTranslation[216] =
+{
+  0,
+  29,
+  30,
+  31,
+  32,
+  249,
+  33,
+  34,
+  35,
+  36,
+  37,
+  38,
+  39,
+  40,
+  41,
+  42,
+  43,
+  44,
+  45,
+  46,
+  47,
+  48,
+  49,
+  50,
+  51,
+  52,
+  53,
+  54,
+  55,
+  56,
+  250,
+  250,
+  57,
+  58,
+  59,
+  251,
+  60,
+  61,
+  62,
+  63,
+  64,
+  65,
+  66,
+  67,
+  68,
+  69,
+  70,
+  71,
+  72,
+  73,
+  74,
+  75,
+  76,
+  77,
+  78,
+  79,
+  80,
+  81,
+  82,
+  83,
+  84,
+  85,
+  86,
+  87,
+  88,
+  89,
+  250,
+  90,
+  91,
+  92,
+  93,
+  94,
+  95,
+  96,
+  97,
+  98,
+  99,
+  100,
+  101,
+  102,
+  103,
+  104,
+  105,
+  106,
+  107,
+  108,
+  109,
+  110,
+  111,
+  227,
+  112,
+  113,
+  114,
+  115,
+  116,
+  117,
+  118,
+  119,
+  151,
+  120,
+  121,
+  122,
+  123,
+  124,
+  228,
+  125,
+  126,
+  229,
+  133,
+  162,
+  135,
+  131,
+  132,
+  137,
+  166,
+  134,
+  140,
+  130,
+  136,
+  143,
+  138,
+  139,
+  174,
+  141,
+  142,
+  177,
+  129,
+  144,
+  145,
+  146,
+  147,
+  148,
+  149,
+  150,
+  157,
+  152,
+  153,
+  154,
+  155,
+  156,
+  192,
+  158,
+  159,
+  160,
+  161,
+  196,
+  163,
+  164,
+  165,
+  127,
+  199,
+  167,
+  168,
+  169,
+  170,
+  171,
+  172,
+  173,
+  207,
+  175,
+  176,
+  210,
+  178,
+  179,
+  180,
+  181,
+  182,
+  183,
+  184,
+  185,
+  186,
+  187,
+  188,
+  189,
+  190,
+  191,
+  224,
+  193,
+  194,
+  195,
+  252,
+  252,
+  197,
+  198,
+  128,
+  253,
+  252,
+  200,
+  201,
+  202,
+  203,
+  204,
+  205,
+  206,
+  230,
+  208,
+  209,
+  231,
+  211,
+  212,
+  213,
+  214,
+  215,
+  216,
+  217,
+  218,
+  219,
+  220,
+  221,
+  222,
+  254,
+  223,
+  232,
+  225,
+  226,
+  255,
+};
diff --git a/reactos/lib/mesa32/src/drivers/windows/gdi/gdi.dsp b/reactos/lib/mesa32/src/drivers/windows/gdi/gdi.dsp
new file mode 100644
index 00000000000..a7802bb3009
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/windows/gdi/gdi.dsp
@@ -0,0 +1,129 @@
+# Microsoft Developer Studio Project File - Name="gdi" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=gdi - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "gdi.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "gdi.mak" CFG="gdi - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "gdi - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "gdi - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "gdi - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDI_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../../../src/mesa/main" /I "../../../../../src/mesa/glapi" /I "../../../../../src/mesa/math" /I "../../../../../src/mesa/transform" /I "../../../../../src/mesa/swrast" /I "../../../../../src/mesa/swrast_setup" /I "../../../../../include" /I "../../../../../src/mesa" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDI_EXPORTS" /D "BUILD_GL32" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 winmm.lib msvcrt.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /nodefaultlib /out:"Release/OPENGL32.DLL"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Desc=Copy import lib and dll
+PostBuild_Cmds=if not exist ..\..\..\..\..\lib md ..\..\..\..\..\lib	copy Release\OPENGL32.LIB ..\..\..\..\..\lib	copy Release\OPENGL32.DLL ..\..\..\..\..\lib
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "gdi - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDI_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../../../src/mesa/main" /I "../../../../../src/mesa/glapi" /I "../../../../../src/mesa/math" /I "../../../../../src/mesa/transform" /I "../../../../../src/mesa/swrast" /I "../../../../../src/mesa/swrast_setup" /I "../../../../../include" /I "../../../../../src/mesa" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDI_EXPORTS" /D "BUILD_GL32" /FR /YX /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 winmm.lib msvcrtd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /nodefaultlib /out:"Debug/OPENGL32.DLL" /pdbtype:sept
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Desc=Copy import lib and dll
+PostBuild_Cmds=if not exist ..\..\..\..\..\lib md ..\..\..\..\..\lib	copy Debug\OPENGL32.LIB ..\..\..\..\..\lib	copy Debug\OPENGL32.DLL ..\..\..\..\..\lib
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "gdi - Win32 Release"
+# Name "gdi - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\mesa.def
+# End Source File
+# Begin Source File
+
+SOURCE=.\wgl.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\wmesa.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\wmesadef.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/reactos/lib/mesa32/src/drivers/windows/gdi/mesa.def b/reactos/lib/mesa32/src/drivers/windows/gdi/mesa.def
new file mode 100644
index 00000000000..1b249fb014c
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/windows/gdi/mesa.def
@@ -0,0 +1,1057 @@
+; DO NOT EDIT - This file generated automatically by mesadef.py script
+DESCRIPTION 'Mesa (OpenGL work-alike) for Win32'
+VERSION 6.0
+;
+; Module definition file for Mesa (OPENGL32.DLL)
+;
+; Note: The OpenGL functions use the STDCALL
+; function calling convention.  Microsoft's
+; OPENGL32 uses this convention and so must the
+; Mesa OPENGL32 so that the Mesa DLL can be used
+; as a drop-in replacement.
+;
+; The linker exports STDCALL entry points with
+; 'decorated' names; e.g., _glBegin@0, where the
+; trailing number is the number of bytes of 
+; parameter data pushed onto the stack.  The
+; callee is responsible for popping this data
+; off the stack, usually via a RETF n instruction.
+;
+; However, the Microsoft OPENGL32.DLL does not export
+; the decorated names, even though the calling convention
+; is STDCALL.  So, this module definition file is
+; needed to force the Mesa OPENGL32.DLL to export the
+; symbols in the same manner as the Microsoft DLL.
+; Were it not for this problem, this file would not
+; be needed (for the gl* functions) since the entry
+; points are compiled with dllexport declspec.
+;
+; However, this file is still needed to export "internal"
+; Mesa symbols for the benefit of the OSMESA32.DLL.
+;
+EXPORTS
+	glNewList
+	glEndList
+	glCallList
+	glCallLists
+	glDeleteLists
+	glGenLists
+	glListBase
+	glBegin
+	glBitmap
+	glColor3b
+	glColor3bv
+	glColor3d
+	glColor3dv
+	glColor3f
+	glColor3fv
+	glColor3i
+	glColor3iv
+	glColor3s
+	glColor3sv
+	glColor3ub
+	glColor3ubv
+	glColor3ui
+	glColor3uiv
+	glColor3us
+	glColor3usv
+	glColor4b
+	glColor4bv
+	glColor4d
+	glColor4dv
+	glColor4f
+	glColor4fv
+	glColor4i
+	glColor4iv
+	glColor4s
+	glColor4sv
+	glColor4ub
+	glColor4ubv
+	glColor4ui
+	glColor4uiv
+	glColor4us
+	glColor4usv
+	glEdgeFlag
+	glEdgeFlagv
+	glEnd
+	glIndexd
+	glIndexdv
+	glIndexf
+	glIndexfv
+	glIndexi
+	glIndexiv
+	glIndexs
+	glIndexsv
+	glNormal3b
+	glNormal3bv
+	glNormal3d
+	glNormal3dv
+	glNormal3f
+	glNormal3fv
+	glNormal3i
+	glNormal3iv
+	glNormal3s
+	glNormal3sv
+	glRasterPos2d
+	glRasterPos2dv
+	glRasterPos2f
+	glRasterPos2fv
+	glRasterPos2i
+	glRasterPos2iv
+	glRasterPos2s
+	glRasterPos2sv
+	glRasterPos3d
+	glRasterPos3dv
+	glRasterPos3f
+	glRasterPos3fv
+	glRasterPos3i
+	glRasterPos3iv
+	glRasterPos3s
+	glRasterPos3sv
+	glRasterPos4d
+	glRasterPos4dv
+	glRasterPos4f
+	glRasterPos4fv
+	glRasterPos4i
+	glRasterPos4iv
+	glRasterPos4s
+	glRasterPos4sv
+	glRectd
+	glRectdv
+	glRectf
+	glRectfv
+	glRecti
+	glRectiv
+	glRects
+	glRectsv
+	glTexCoord1d
+	glTexCoord1dv
+	glTexCoord1f
+	glTexCoord1fv
+	glTexCoord1i
+	glTexCoord1iv
+	glTexCoord1s
+	glTexCoord1sv
+	glTexCoord2d
+	glTexCoord2dv
+	glTexCoord2f
+	glTexCoord2fv
+	glTexCoord2i
+	glTexCoord2iv
+	glTexCoord2s
+	glTexCoord2sv
+	glTexCoord3d
+	glTexCoord3dv
+	glTexCoord3f
+	glTexCoord3fv
+	glTexCoord3i
+	glTexCoord3iv
+	glTexCoord3s
+	glTexCoord3sv
+	glTexCoord4d
+	glTexCoord4dv
+	glTexCoord4f
+	glTexCoord4fv
+	glTexCoord4i
+	glTexCoord4iv
+	glTexCoord4s
+	glTexCoord4sv
+	glVertex2d
+	glVertex2dv
+	glVertex2f
+	glVertex2fv
+	glVertex2i
+	glVertex2iv
+	glVertex2s
+	glVertex2sv
+	glVertex3d
+	glVertex3dv
+	glVertex3f
+	glVertex3fv
+	glVertex3i
+	glVertex3iv
+	glVertex3s
+	glVertex3sv
+	glVertex4d
+	glVertex4dv
+	glVertex4f
+	glVertex4fv
+	glVertex4i
+	glVertex4iv
+	glVertex4s
+	glVertex4sv
+	glClipPlane
+	glColorMaterial
+	glCullFace
+	glFogf
+	glFogfv
+	glFogi
+	glFogiv
+	glFrontFace
+	glHint
+	glLightf
+	glLightfv
+	glLighti
+	glLightiv
+	glLightModelf
+	glLightModelfv
+	glLightModeli
+	glLightModeliv
+	glLineStipple
+	glLineWidth
+	glMaterialf
+	glMaterialfv
+	glMateriali
+	glMaterialiv
+	glPointSize
+	glPolygonMode
+	glPolygonStipple
+	glScissor
+	glShadeModel
+	glTexParameterf
+	glTexParameterfv
+	glTexParameteri
+	glTexParameteriv
+	glTexImage1D
+	glTexImage2D
+	glTexEnvf
+	glTexEnvfv
+	glTexEnvi
+	glTexEnviv
+	glTexGend
+	glTexGendv
+	glTexGenf
+	glTexGenfv
+	glTexGeni
+	glTexGeniv
+	glFeedbackBuffer
+	glSelectBuffer
+	glRenderMode
+	glInitNames
+	glLoadName
+	glPassThrough
+	glPopName
+	glPushName
+	glDrawBuffer
+	glClear
+	glClearAccum
+	glClearIndex
+	glClearColor
+	glClearStencil
+	glClearDepth
+	glStencilMask
+	glColorMask
+	glDepthMask
+	glIndexMask
+	glAccum
+	glDisable
+	glEnable
+	glFinish
+	glFlush
+	glPopAttrib
+	glPushAttrib
+	glMap1d
+	glMap1f
+	glMap2d
+	glMap2f
+	glMapGrid1d
+	glMapGrid1f
+	glMapGrid2d
+	glMapGrid2f
+	glEvalCoord1d
+	glEvalCoord1dv
+	glEvalCoord1f
+	glEvalCoord1fv
+	glEvalCoord2d
+	glEvalCoord2dv
+	glEvalCoord2f
+	glEvalCoord2fv
+	glEvalMesh1
+	glEvalPoint1
+	glEvalMesh2
+	glEvalPoint2
+	glAlphaFunc
+	glBlendFunc
+	glLogicOp
+	glStencilFunc
+	glStencilOp
+	glDepthFunc
+	glPixelZoom
+	glPixelTransferf
+	glPixelTransferi
+	glPixelStoref
+	glPixelStorei
+	glPixelMapfv
+	glPixelMapuiv
+	glPixelMapusv
+	glReadBuffer
+	glCopyPixels
+	glReadPixels
+	glDrawPixels
+	glGetBooleanv
+	glGetClipPlane
+	glGetDoublev
+	glGetError
+	glGetFloatv
+	glGetIntegerv
+	glGetLightfv
+	glGetLightiv
+	glGetMapdv
+	glGetMapfv
+	glGetMapiv
+	glGetMaterialfv
+	glGetMaterialiv
+	glGetPixelMapfv
+	glGetPixelMapuiv
+	glGetPixelMapusv
+	glGetPolygonStipple
+	glGetString
+	glGetTexEnvfv
+	glGetTexEnviv
+	glGetTexGendv
+	glGetTexGenfv
+	glGetTexGeniv
+	glGetTexImage
+	glGetTexParameterfv
+	glGetTexParameteriv
+	glGetTexLevelParameterfv
+	glGetTexLevelParameteriv
+	glIsEnabled
+	glIsList
+	glDepthRange
+	glFrustum
+	glLoadIdentity
+	glLoadMatrixf
+	glLoadMatrixd
+	glMatrixMode
+	glMultMatrixf
+	glMultMatrixd
+	glOrtho
+	glPopMatrix
+	glPushMatrix
+	glRotated
+	glRotatef
+	glScaled
+	glScalef
+	glTranslated
+	glTranslatef
+	glViewport
+	glArrayElement
+	glColorPointer
+	glDisableClientState
+	glDrawArrays
+	glDrawElements
+	glEdgeFlagPointer
+	glEnableClientState
+	glGetPointerv
+	glIndexPointer
+	glInterleavedArrays
+	glNormalPointer
+	glTexCoordPointer
+	glVertexPointer
+	glPolygonOffset
+	glCopyTexImage1D
+	glCopyTexImage2D
+	glCopyTexSubImage1D
+	glCopyTexSubImage2D
+	glTexSubImage1D
+	glTexSubImage2D
+	glAreTexturesResident
+	glBindTexture
+	glDeleteTextures
+	glGenTextures
+	glIsTexture
+	glPrioritizeTextures
+	glIndexub
+	glIndexubv
+	glPopClientAttrib
+	glPushClientAttrib
+	glBlendColor
+	glBlendEquation
+	glDrawRangeElements
+	glColorTable
+	glColorTableParameterfv
+	glColorTableParameteriv
+	glCopyColorTable
+	glGetColorTable
+	glGetColorTableParameterfv
+	glGetColorTableParameteriv
+	glColorSubTable
+	glCopyColorSubTable
+	glConvolutionFilter1D
+	glConvolutionFilter2D
+	glConvolutionParameterf
+	glConvolutionParameterfv
+	glConvolutionParameteri
+	glConvolutionParameteriv
+	glCopyConvolutionFilter1D
+	glCopyConvolutionFilter2D
+	glGetConvolutionFilter
+	glGetConvolutionParameterfv
+	glGetConvolutionParameteriv
+	glGetSeparableFilter
+	glSeparableFilter2D
+	glGetHistogram
+	glGetHistogramParameterfv
+	glGetHistogramParameteriv
+	glGetMinmax
+	glGetMinmaxParameterfv
+	glGetMinmaxParameteriv
+	glHistogram
+	glMinmax
+	glResetHistogram
+	glResetMinmax
+	glTexImage3D
+	glTexSubImage3D
+	glCopyTexSubImage3D
+	glActiveTextureARB
+	glClientActiveTextureARB
+	glMultiTexCoord1dARB
+	glMultiTexCoord1dvARB
+	glMultiTexCoord1fARB
+	glMultiTexCoord1fvARB
+	glMultiTexCoord1iARB
+	glMultiTexCoord1ivARB
+	glMultiTexCoord1sARB
+	glMultiTexCoord1svARB
+	glMultiTexCoord2dARB
+	glMultiTexCoord2dvARB
+	glMultiTexCoord2fARB
+	glMultiTexCoord2fvARB
+	glMultiTexCoord2iARB
+	glMultiTexCoord2ivARB
+	glMultiTexCoord2sARB
+	glMultiTexCoord2svARB
+	glMultiTexCoord3dARB
+	glMultiTexCoord3dvARB
+	glMultiTexCoord3fARB
+	glMultiTexCoord3fvARB
+	glMultiTexCoord3iARB
+	glMultiTexCoord3ivARB
+	glMultiTexCoord3sARB
+	glMultiTexCoord3svARB
+	glMultiTexCoord4dARB
+	glMultiTexCoord4dvARB
+	glMultiTexCoord4fARB
+	glMultiTexCoord4fvARB
+	glMultiTexCoord4iARB
+	glMultiTexCoord4ivARB
+	glMultiTexCoord4sARB
+	glMultiTexCoord4svARB
+	glLoadTransposeMatrixfARB
+	glLoadTransposeMatrixdARB
+	glMultTransposeMatrixfARB
+	glMultTransposeMatrixdARB
+	glSampleCoverageARB
+	glCompressedTexImage3DARB
+	glCompressedTexImage2DARB
+	glCompressedTexImage1DARB
+	glCompressedTexSubImage3DARB
+	glCompressedTexSubImage2DARB
+	glCompressedTexSubImage1DARB
+	glGetCompressedTexImageARB
+	glActiveTexture
+	glClientActiveTexture
+	glMultiTexCoord1d
+	glMultiTexCoord1dv
+	glMultiTexCoord1f
+	glMultiTexCoord1fv
+	glMultiTexCoord1i
+	glMultiTexCoord1iv
+	glMultiTexCoord1s
+	glMultiTexCoord1sv
+	glMultiTexCoord2d
+	glMultiTexCoord2dv
+	glMultiTexCoord2f
+	glMultiTexCoord2fv
+	glMultiTexCoord2i
+	glMultiTexCoord2iv
+	glMultiTexCoord2s
+	glMultiTexCoord2sv
+	glMultiTexCoord3d
+	glMultiTexCoord3dv
+	glMultiTexCoord3f
+	glMultiTexCoord3fv
+	glMultiTexCoord3i
+	glMultiTexCoord3iv
+	glMultiTexCoord3s
+	glMultiTexCoord3sv
+	glMultiTexCoord4d
+	glMultiTexCoord4dv
+	glMultiTexCoord4f
+	glMultiTexCoord4fv
+	glMultiTexCoord4i
+	glMultiTexCoord4iv
+	glMultiTexCoord4s
+	glMultiTexCoord4sv
+	glLoadTransposeMatrixf
+	glLoadTransposeMatrixd
+	glMultTransposeMatrixf
+	glMultTransposeMatrixd
+	glSampleCoverage
+	glCompressedTexImage3D
+	glCompressedTexImage2D
+	glCompressedTexImage1D
+	glCompressedTexSubImage3D
+	glCompressedTexSubImage2D
+	glCompressedTexSubImage1D
+	glGetCompressedTexImage
+	glBlendColorEXT
+	glPolygonOffsetEXT
+	glTexImage3DEXT
+	glTexSubImage3DEXT
+	glGetTexFilterFuncSGIS
+	glTexFilterFuncSGIS
+	glTexSubImage1DEXT
+	glTexSubImage2DEXT
+	glCopyTexImage1DEXT
+	glCopyTexImage2DEXT
+	glCopyTexSubImage1DEXT
+	glCopyTexSubImage2DEXT
+	glCopyTexSubImage3DEXT
+	glGetHistogramEXT
+	glGetHistogramParameterfvEXT
+	glGetHistogramParameterivEXT
+	glGetMinmaxEXT
+	glGetMinmaxParameterfvEXT
+	glGetMinmaxParameterivEXT
+	glHistogramEXT
+	glMinmaxEXT
+	glResetHistogramEXT
+	glResetMinmaxEXT
+	glConvolutionFilter1DEXT
+	glConvolutionFilter2DEXT
+	glConvolutionParameterfEXT
+	glConvolutionParameterfvEXT
+	glConvolutionParameteriEXT
+	glConvolutionParameterivEXT
+	glCopyConvolutionFilter1DEXT
+	glCopyConvolutionFilter2DEXT
+	glGetConvolutionFilterEXT
+	glGetConvolutionParameterfvEXT
+	glGetConvolutionParameterivEXT
+	glGetSeparableFilterEXT
+	glSeparableFilter2DEXT
+	glColorTableSGI
+	glColorTableParameterfvSGI
+	glColorTableParameterivSGI
+	glCopyColorTableSGI
+	glGetColorTableSGI
+	glGetColorTableParameterfvSGI
+	glGetColorTableParameterivSGI
+	glPixelTexGenSGIX
+	glPixelTexGenParameteriSGIS
+	glPixelTexGenParameterivSGIS
+	glPixelTexGenParameterfSGIS
+	glPixelTexGenParameterfvSGIS
+	glGetPixelTexGenParameterivSGIS
+	glGetPixelTexGenParameterfvSGIS
+	glTexImage4DSGIS
+	glTexSubImage4DSGIS
+	glAreTexturesResidentEXT
+	glBindTextureEXT
+	glDeleteTexturesEXT
+	glGenTexturesEXT
+	glIsTextureEXT
+	glPrioritizeTexturesEXT
+	glDetailTexFuncSGIS
+	glGetDetailTexFuncSGIS
+	glSharpenTexFuncSGIS
+	glGetSharpenTexFuncSGIS
+	glSampleMaskSGIS
+	glSamplePatternSGIS
+	glArrayElementEXT
+	glColorPointerEXT
+	glDrawArraysEXT
+	glEdgeFlagPointerEXT
+	glGetPointervEXT
+	glIndexPointerEXT
+	glNormalPointerEXT
+	glTexCoordPointerEXT
+	glVertexPointerEXT
+	glBlendEquationEXT
+	glSpriteParameterfSGIX
+	glSpriteParameterfvSGIX
+	glSpriteParameteriSGIX
+	glSpriteParameterivSGIX
+	glPointParameterfEXT
+	glPointParameterfvEXT
+	glPointParameterfARB
+	glPointParameterfvARB
+	glPointParameterfSGIS
+	glPointParameterfvSGIS
+	glGetInstrumentsSGIX
+	glInstrumentsBufferSGIX
+	glPollInstrumentsSGIX
+	glReadInstrumentsSGIX
+	glStartInstrumentsSGIX
+	glStopInstrumentsSGIX
+	glFrameZoomSGIX
+	glTagSampleBufferSGIX
+	glReferencePlaneSGIX
+	glFlushRasterSGIX
+	glColorSubTableEXT
+	glCopyColorSubTableEXT
+	glHintPGI
+	glColorTableEXT
+	glGetColorTableEXT
+	glGetColorTableParameterivEXT
+	glGetColorTableParameterfvEXT
+	glGetListParameterfvSGIX
+	glGetListParameterivSGIX
+	glListParameterfSGIX
+	glListParameterfvSGIX
+	glListParameteriSGIX
+	glListParameterivSGIX
+	glIndexMaterialEXT
+	glIndexFuncEXT
+	glLockArraysEXT
+	glUnlockArraysEXT
+	glCullParameterdvEXT
+	glCullParameterfvEXT
+	glFragmentColorMaterialSGIX
+	glFragmentLightfSGIX
+	glFragmentLightfvSGIX
+	glFragmentLightiSGIX
+	glFragmentLightivSGIX
+	glFragmentLightModelfSGIX
+	glFragmentLightModelfvSGIX
+	glFragmentLightModeliSGIX
+	glFragmentLightModelivSGIX
+	glFragmentMaterialfSGIX
+	glFragmentMaterialfvSGIX
+	glFragmentMaterialiSGIX
+	glFragmentMaterialivSGIX
+	glGetFragmentLightfvSGIX
+	glGetFragmentLightivSGIX
+	glGetFragmentMaterialfvSGIX
+	glGetFragmentMaterialivSGIX
+	glLightEnviSGIX
+	glDrawRangeElementsEXT
+	glSecondaryColor3bEXT
+	glSecondaryColor3bvEXT
+	glSecondaryColor3dEXT
+	glSecondaryColor3dvEXT
+	glSecondaryColor3fEXT
+	glSecondaryColor3fvEXT
+	glSecondaryColor3iEXT
+	glSecondaryColor3ivEXT
+	glSecondaryColor3sEXT
+	glSecondaryColor3svEXT
+	glSecondaryColor3ubEXT
+	glSecondaryColor3ubvEXT
+	glSecondaryColor3uiEXT
+	glSecondaryColor3uivEXT
+	glSecondaryColor3usEXT
+	glSecondaryColor3usvEXT
+	glSecondaryColorPointerEXT
+	glMultiDrawArraysEXT
+	glMultiDrawElementsEXT
+	glFogCoordfEXT
+	glFogCoordfvEXT
+	glFogCoorddEXT
+	glFogCoorddvEXT
+	glFogCoordPointerEXT
+	glBlendFuncSeparateEXT
+	glBlendFuncSeparateINGR
+	glVertexWeightfEXT
+	glVertexWeightfvEXT
+	glVertexWeightPointerEXT
+	glFlushVertexArrayRangeNV
+	glVertexArrayRangeNV
+	glCombinerParameterfvNV
+	glCombinerParameterfNV
+	glCombinerParameterivNV
+	glCombinerParameteriNV
+	glCombinerInputNV
+	glCombinerOutputNV
+	glFinalCombinerInputNV
+	glGetCombinerInputParameterfvNV
+	glGetCombinerInputParameterivNV
+	glGetCombinerOutputParameterfvNV
+	glGetCombinerOutputParameterivNV
+	glGetFinalCombinerInputParameterfvNV
+	glGetFinalCombinerInputParameterivNV
+	glResizeBuffersMESA
+	glWindowPos2dMESA
+	glWindowPos2dvMESA
+	glWindowPos2fMESA
+	glWindowPos2fvMESA
+	glWindowPos2iMESA
+	glWindowPos2ivMESA
+	glWindowPos2sMESA
+	glWindowPos2svMESA
+	glWindowPos3dMESA
+	glWindowPos3dvMESA
+	glWindowPos3fMESA
+	glWindowPos3fvMESA
+	glWindowPos3iMESA
+	glWindowPos3ivMESA
+	glWindowPos3sMESA
+	glWindowPos3svMESA
+	glWindowPos4dMESA
+	glWindowPos4dvMESA
+	glWindowPos4fMESA
+	glWindowPos4fvMESA
+	glWindowPos4iMESA
+	glWindowPos4ivMESA
+	glWindowPos4sMESA
+	glWindowPos4svMESA
+	glMultiModeDrawArraysIBM
+	glMultiModeDrawElementsIBM
+	glTbufferMask3DFX
+	glSampleMaskEXT
+	glSamplePatternEXT
+	glWindowPos2dARB
+	glWindowPos2fARB
+	glWindowPos2iARB
+	glWindowPos2sARB
+	glWindowPos2dvARB
+	glWindowPos2fvARB
+	glWindowPos2ivARB
+	glWindowPos2svARB
+	glWindowPos3dARB
+	glWindowPos3fARB
+	glWindowPos3iARB
+	glWindowPos3sARB
+	glWindowPos3dvARB
+	glWindowPos3fvARB
+	glWindowPos3ivARB
+	glWindowPos3svARB
+	glAreProgramsResidentNV
+	glBindProgramNV
+	glDeleteProgramsNV
+	glExecuteProgramNV
+	glGenProgramsNV
+	glGetProgramParameterdvNV
+	glGetProgramParameterfvNV
+	glGetProgramivNV
+	glGetProgramStringNV
+	glGetTrackMatrixivNV
+	glGetVertexAttribdvNV
+	glGetVertexAttribfvNV
+	glGetVertexAttribivNV
+	glGetVertexAttribPointervNV
+	glIsProgramNV
+	glLoadProgramNV
+	glProgramParameter4dNV
+	glProgramParameter4dvNV
+	glProgramParameter4fNV
+	glProgramParameter4fvNV
+	glProgramParameters4dvNV
+	glProgramParameters4fvNV
+	glRequestResidentProgramsNV
+	glTrackMatrixNV
+	glVertexAttribPointerNV
+	glVertexAttrib1dNV
+	glVertexAttrib1dvNV
+	glVertexAttrib1fNV
+	glVertexAttrib1fvNV
+	glVertexAttrib1sNV
+	glVertexAttrib1svNV
+	glVertexAttrib2dNV
+	glVertexAttrib2dvNV
+	glVertexAttrib2fNV
+	glVertexAttrib2fvNV
+	glVertexAttrib2sNV
+	glVertexAttrib2svNV
+	glVertexAttrib3dNV
+	glVertexAttrib3dvNV
+	glVertexAttrib3fNV
+	glVertexAttrib3fvNV
+	glVertexAttrib3sNV
+	glVertexAttrib3svNV
+	glVertexAttrib4dNV
+	glVertexAttrib4dvNV
+	glVertexAttrib4fNV
+	glVertexAttrib4fvNV
+	glVertexAttrib4sNV
+	glVertexAttrib4svNV
+	glVertexAttrib4ubNV
+	glVertexAttrib4ubvNV
+	glVertexAttribs1dvNV
+	glVertexAttribs1fvNV
+	glVertexAttribs1svNV
+	glVertexAttribs2dvNV
+	glVertexAttribs2fvNV
+	glVertexAttribs2svNV
+	glVertexAttribs3dvNV
+	glVertexAttribs3fvNV
+	glVertexAttribs3svNV
+	glVertexAttribs4dvNV
+	glVertexAttribs4fvNV
+	glVertexAttribs4svNV
+	glVertexAttribs4ubvNV
+	glPointParameteriNV
+	glPointParameterivNV
+	glBlendFuncSeparate
+	glFogCoordf
+	glFogCoordfv
+	glFogCoordd
+	glFogCoorddv
+	glFogCoordPointer
+	glMultiDrawArrays
+	glMultiDrawElements
+	glPointParameterf
+	glPointParameterfv
+	glPointParameteri
+	glPointParameteriv
+	glSecondaryColor3b
+	glSecondaryColor3bv
+	glSecondaryColor3d
+	glSecondaryColor3dv
+	glSecondaryColor3f
+	glSecondaryColor3fv
+	glSecondaryColor3i
+	glSecondaryColor3iv
+	glSecondaryColor3s
+	glSecondaryColor3sv
+	glSecondaryColor3ub
+	glSecondaryColor3ubv
+	glSecondaryColor3ui
+	glSecondaryColor3uiv
+	glSecondaryColor3us
+	glSecondaryColor3usv
+	glSecondaryColorPointer
+	glWindowPos2d
+	glWindowPos2dv
+	glWindowPos2f
+	glWindowPos2fv
+	glWindowPos2i
+	glWindowPos2iv
+	glWindowPos2s
+	glWindowPos2sv
+	glWindowPos3d
+	glWindowPos3dv
+	glWindowPos3f
+	glWindowPos3fv
+	glWindowPos3i
+	glWindowPos3iv
+	glWindowPos3s
+	glWindowPos3sv
+	glActiveStencilFaceEXT
+	glDeleteFencesNV
+	glGenFencesNV
+	glIsFenceNV
+	glTestFenceNV
+	glGetFenceivNV
+	glFinishFenceNV
+	glSetFenceNV
+	glVertexAttrib1sARB
+	glVertexAttrib1fARB
+	glVertexAttrib1dARB
+	glVertexAttrib2sARB
+	glVertexAttrib2fARB
+	glVertexAttrib2dARB
+	glVertexAttrib3sARB
+	glVertexAttrib3fARB
+	glVertexAttrib3dARB
+	glVertexAttrib4sARB
+	glVertexAttrib4fARB
+	glVertexAttrib4dARB
+	glVertexAttrib4NubARB
+	glVertexAttrib1svARB
+	glVertexAttrib1fvARB
+	glVertexAttrib1dvARB
+	glVertexAttrib2svARB
+	glVertexAttrib2fvARB
+	glVertexAttrib2dvARB
+	glVertexAttrib3svARB
+	glVertexAttrib3fvARB
+	glVertexAttrib3dvARB
+	glVertexAttrib4bvARB
+	glVertexAttrib4svARB
+	glVertexAttrib4ivARB
+	glVertexAttrib4ubvARB
+	glVertexAttrib4usvARB
+	glVertexAttrib4uivARB
+	glVertexAttrib4fvARB
+	glVertexAttrib4dvARB
+	glVertexAttrib4NbvARB
+	glVertexAttrib4NsvARB
+	glVertexAttrib4NivARB
+	glVertexAttrib4NubvARB
+	glVertexAttrib4NusvARB
+	glVertexAttrib4NuivARB
+	glVertexAttribPointerARB
+	glEnableVertexAttribArrayARB
+	glDisableVertexAttribArrayARB
+	glProgramStringARB
+	glBindProgramARB
+	glDeleteProgramsARB
+	glGenProgramsARB
+	glIsProgramARB
+	glProgramEnvParameter4dARB
+	glProgramEnvParameter4dvARB
+	glProgramEnvParameter4fARB
+	glProgramEnvParameter4fvARB
+	glProgramLocalParameter4dARB
+	glProgramLocalParameter4dvARB
+	glProgramLocalParameter4fARB
+	glProgramLocalParameter4fvARB
+	glGetProgramEnvParameterdvARB
+	glGetProgramEnvParameterfvARB
+	glGetProgramLocalParameterdvARB
+	glGetProgramLocalParameterfvARB
+	glGetProgramivARB
+	glGetProgramStringARB
+	glGetVertexAttribdvARB
+	glGetVertexAttribfvARB
+	glGetVertexAttribivARB
+	glGetVertexAttribPointervARB
+	glProgramNamedParameter4fNV
+	glProgramNamedParameter4dNV
+	glProgramNamedParameter4fvNV
+	glProgramNamedParameter4dvNV
+	glGetProgramNamedParameterfvNV
+	glGetProgramNamedParameterdvNV
+	glBindBufferARB
+	glBufferDataARB
+	glBufferSubDataARB
+	glDeleteBuffersARB
+	glGenBuffersARB
+	glGetBufferParameterivARB
+	glGetBufferPointervARB
+	glGetBufferSubDataARB
+	glIsBufferARB
+	glMapBufferARB
+	glUnmapBufferARB
+	glDepthBoundsEXT
+	glGenQueriesARB
+	glDeleteQueriesARB
+	glIsQueryARB
+	glBeginQueryARB
+	glEndQueryARB
+	glGetQueryivARB
+	glGetQueryObjectivARB
+	glGetQueryObjectuivARB
+	glBindBuffer
+	glBufferData
+	glBufferSubData
+	glDeleteBuffers
+	glGenBuffers
+	glGetBufferParameteriv
+	glGetBufferPointerv
+	glGetBufferSubData
+	glIsBuffer
+	glMapBuffer
+	glUnmapBuffer
+	glGenQueries
+	glDeleteQueries
+	glIsQuery
+	glBeginQuery
+	glEndQuery
+	glGetQueryiv
+	glGetQueryObjectiv
+	glGetQueryObjectuiv
+;
+; WGL API
+	wglChoosePixelFormat
+	wglCopyContext
+	wglCreateContext
+	wglCreateLayerContext
+	wglDeleteContext
+	wglDescribeLayerPlane
+	wglDescribePixelFormat
+	wglGetCurrentContext
+	wglGetCurrentDC
+	wglGetLayerPaletteEntries
+	wglGetPixelFormat
+	wglGetProcAddress
+	wglMakeCurrent
+	wglRealizeLayerPalette
+	wglSetLayerPaletteEntries
+	wglSetPixelFormat
+	wglShareLists
+	wglSwapBuffers
+	wglSwapLayerBuffers
+	wglUseFontBitmapsA
+	wglUseFontBitmapsW
+	wglUseFontOutlinesA
+	wglUseFontOutlinesW
+;
+; Mesa internals - mostly for OSMESA
+	_ac_CreateContext
+	_ac_DestroyContext
+	_ac_InvalidateState
+	_glapi_get_context
+	_glapi_get_proc_address
+	_mesa_base_compressed_texformat
+	_mesa_buffer_data
+	_mesa_buffer_map
+	_mesa_buffer_subdata
+	_mesa_bzero
+	_mesa_calloc
+	_mesa_choose_tex_format
+	_mesa_compressed_texture_size
+	_mesa_create_framebuffer
+	_mesa_create_visual
+	_mesa_delete_buffer_object
+	_mesa_delete_texture_object
+	_mesa_destroy_framebuffer
+	_mesa_destroy_visual
+	_mesa_enable_1_3_extensions
+	_mesa_enable_1_4_extensions
+	_mesa_enable_1_5_extensions
+	_mesa_enable_sw_extensions
+	_mesa_error
+	_mesa_free
+	_mesa_free_context_data
+	_mesa_get_current_context
+	_mesa_init_default_imports
+	_mesa_initialize_context
+	_mesa_make_current
+	_mesa_memcpy
+	_mesa_memset
+	_mesa_new_buffer_object
+	_mesa_new_texture_object
+	_mesa_problem
+	_mesa_ResizeBuffersMESA
+	_mesa_store_compressed_teximage1d
+	_mesa_store_compressed_teximage2d
+	_mesa_store_compressed_teximage3d
+	_mesa_store_compressed_texsubimage1d
+	_mesa_store_compressed_texsubimage2d
+	_mesa_store_compressed_texsubimage3d
+	_mesa_store_teximage1d
+	_mesa_store_teximage2d
+	_mesa_store_teximage3d
+	_mesa_store_texsubimage1d
+	_mesa_store_texsubimage2d
+	_mesa_store_texsubimage3d
+	_mesa_strcmp
+	_mesa_test_proxy_teximage
+	_mesa_Viewport
+	_swrast_Accum
+	_swrast_alloc_buffers
+	_swrast_Bitmap
+	_swrast_CopyPixels
+	_swrast_DrawBuffer
+	_swrast_DrawPixels
+	_swrast_GetDeviceDriverReference
+	_swrast_Clear
+	_swrast_choose_line
+	_swrast_choose_triangle
+	_swrast_CopyColorSubTable
+	_swrast_CopyColorTable
+	_swrast_CopyConvolutionFilter1D
+	_swrast_CopyConvolutionFilter2D
+	_swrast_copy_teximage1d
+	_swrast_copy_teximage2d
+	_swrast_copy_texsubimage1d
+	_swrast_copy_texsubimage2d
+	_swrast_copy_texsubimage3d
+	_swrast_CreateContext
+	_swrast_DestroyContext
+	_swrast_InvalidateState
+	_swrast_ReadPixels
+	_swrast_zbuffer_address
+	_swsetup_Wakeup
+	_swsetup_CreateContext
+	_swsetup_DestroyContext
+	_swsetup_InvalidateState
+	_tnl_CreateContext
+	_tnl_DestroyContext
+	_tnl_InvalidateState
+	_tnl_MakeCurrent
+	_tnl_run_pipeline
diff --git a/reactos/lib/mesa32/src/drivers/windows/gdi/wgl.c b/reactos/lib/mesa32/src/drivers/windows/gdi/wgl.c
new file mode 100644
index 00000000000..f313a88c247
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/windows/gdi/wgl.c
@@ -0,0 +1,623 @@
+/* $Id: wgl.c,v 1.1 2004/07/16 22:12:32 blight Exp $ */
+
+/*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Library General Public
+* License as published by the Free Software Foundation; either
+* version 2 of the License, or (at your option) any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Library General Public License for more details.
+*
+* You should have received a copy of the GNU Library General Public
+* License along with this library; if not, write to the Free
+* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*
+*/
+
+/*
+* File name 	: wgl.c
+* WGL stuff. Added by Oleg Letsinsky, ajl@ultersys.ru
+* Some things originated from the 3Dfx WGL functions
+*/
+
+#ifdef WIN32
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <windows.h>
+#define GL_GLEXT_PROTOTYPES
+#include <GL/gl.h>
+#include <GL/glext.h>
+//#include <GL/glu.h>
+
+#ifdef __cplusplus
+}
+#endif
+
+#include <stdio.h>
+#include <tchar.h>
+#include "wmesadef.h"
+#include "GL/wmesa.h"
+#include "mtypes.h"
+#include "glapi.h"
+
+#define MAX_MESA_ATTRS	20
+
+struct __pixelformat__
+{
+    PIXELFORMATDESCRIPTOR	pfd;
+    GLboolean doubleBuffered;
+};
+
+struct __pixelformat__	pix[] =
+{
+    /* Double Buffer, alpha */
+    {	{	sizeof(PIXELFORMATDESCRIPTOR),	1,
+        PFD_DRAW_TO_WINDOW|PFD_SUPPORT_OPENGL|PFD_GENERIC_FORMAT|PFD_DOUBLEBUFFER|PFD_SWAP_COPY,
+        PFD_TYPE_RGBA,
+        24,	8,	0,	8,	8,	8,	16,	8,	24,
+        0,	0,	0,	0,	0,	16,	8,	0,	0,	0,	0,	0,	0 },
+        GL_TRUE
+    },
+    /* Single Buffer, alpha */
+    {	{	sizeof(PIXELFORMATDESCRIPTOR),	1,
+        PFD_DRAW_TO_WINDOW|PFD_SUPPORT_OPENGL|PFD_GENERIC_FORMAT,
+        PFD_TYPE_RGBA,
+        24,	8,	0,	8,	8,	8,	16,	8,	24,
+        0,	0,	0,	0,	0,	16,	8,	0,	0,	0,	0,	0,	0 },
+        GL_FALSE
+    },
+    /* Double Buffer, no alpha */
+    {	{	sizeof(PIXELFORMATDESCRIPTOR),	1,
+        PFD_DRAW_TO_WINDOW|PFD_SUPPORT_OPENGL|PFD_GENERIC_FORMAT|PFD_DOUBLEBUFFER|PFD_SWAP_COPY,
+        PFD_TYPE_RGBA,
+        24,	8,	0,	8,	8,	8,	16,	0,	0,
+        0,	0,	0,	0,	0,	16,	8,	0,	0,	0,	0,	0,	0 },
+        GL_TRUE
+    },
+    /* Single Buffer, no alpha */
+    {	{	sizeof(PIXELFORMATDESCRIPTOR),	1,
+        PFD_DRAW_TO_WINDOW|PFD_SUPPORT_OPENGL|PFD_GENERIC_FORMAT,
+        PFD_TYPE_RGBA,
+        24,	8,	0,	8,	8,	8,	16,	0,	0,
+        0,	0,	0,	0,	0,	16,	8,	0,	0,	0,	0,	0,	0 },
+        GL_FALSE
+    },
+};
+
+int qt_pix = sizeof(pix) / sizeof(pix[0]);
+
+typedef struct {
+    WMesaContext ctx;
+    HDC hdc;
+} MesaWglCtx;
+
+#define MESAWGL_CTX_MAX_COUNT 20
+
+static MesaWglCtx wgl_ctx[MESAWGL_CTX_MAX_COUNT];
+
+static unsigned ctx_count = 0;
+static unsigned ctx_current = -1;
+static unsigned curPFD = 0;
+
+WGLAPI BOOL GLAPIENTRY wglCopyContext(HGLRC hglrcSrc,HGLRC hglrcDst,UINT mask)
+{
+    return(FALSE);
+}
+
+WGLAPI HGLRC GLAPIENTRY wglCreateContext(HDC hdc)
+{
+    HWND		hWnd;
+    int i = 0;
+    if(!(hWnd = WindowFromDC(hdc)))
+    {
+        SetLastError(0);
+        return(NULL);
+    }
+    if (!ctx_count)
+    {
+    	for(i=0;i<MESAWGL_CTX_MAX_COUNT;i++)
+    	{
+    		wgl_ctx[i].ctx = NULL;
+    		wgl_ctx[i].hdc = NULL;
+    	}
+    }
+    for( i = 0; i < MESAWGL_CTX_MAX_COUNT; i++ )
+    {
+        if ( wgl_ctx[i].ctx == NULL )
+        {
+            wgl_ctx[i].ctx = WMesaCreateContext( hWnd, NULL, GL_TRUE,
+                pix[curPFD-1].doubleBuffered, 
+                pix[curPFD-1].pfd.cAlphaBits ? GL_TRUE : GL_FALSE);
+            if (wgl_ctx[i].ctx == NULL)
+                break;
+            wgl_ctx[i].hdc = hdc;
+            ctx_count++;
+            return ((HGLRC)wgl_ctx[i].ctx);
+        }
+    }
+    SetLastError(0);
+    return(NULL);
+}
+
+WGLAPI BOOL GLAPIENTRY wglDeleteContext(HGLRC hglrc)
+{
+    int i;
+    for ( i = 0; i < MESAWGL_CTX_MAX_COUNT; i++ )
+    {
+    	if ( wgl_ctx[i].ctx == (PWMC) hglrc )
+    	{
+            WMesaMakeCurrent((PWMC) hglrc);
+            WMesaDestroyContext();
+            wgl_ctx[i].ctx = NULL;
+            wgl_ctx[i].hdc = NULL;
+            ctx_count--;
+            return(TRUE);
+    	}
+    }
+    SetLastError(0);
+    return(FALSE);
+}
+
+WGLAPI HGLRC GLAPIENTRY wglCreateLayerContext(HDC hdc,int iLayerPlane)
+{
+    SetLastError(0);
+    return(NULL);
+}
+
+WGLAPI HGLRC GLAPIENTRY wglGetCurrentContext(VOID)
+{
+   if (ctx_current < 0)
+      return 0;
+   else
+      return (HGLRC) wgl_ctx[ctx_current].ctx;
+}
+
+WGLAPI HDC GLAPIENTRY wglGetCurrentDC(VOID)
+{
+   if (ctx_current < 0)
+      return 0;
+   else
+      return wgl_ctx[ctx_current].hdc;
+}
+
+WGLAPI BOOL GLAPIENTRY wglMakeCurrent(HDC hdc,HGLRC hglrc)
+{
+    int i;
+
+    /* new code suggested by Andy Sy */
+    if (!hdc || !hglrc) {
+       WMesaMakeCurrent(NULL);
+       ctx_current = -1;
+       return TRUE;
+    }
+
+    for ( i = 0; i < MESAWGL_CTX_MAX_COUNT; i++ )
+    {
+        if ( wgl_ctx[i].ctx == (PWMC) hglrc )
+        {
+            wgl_ctx[i].hdc = hdc;
+            WMesaMakeCurrent( (WMesaContext) hglrc );
+            ctx_current = i;
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+WGLAPI BOOL GLAPIENTRY wglShareLists(HGLRC hglrc1,HGLRC hglrc2)
+{
+    return(TRUE);
+}
+
+
+static FIXED FixedFromDouble(double d)
+{
+   long l = (long) (d * 65536L);
+   return *(FIXED *)&l;
+}
+
+
+/*
+** This is cribbed from FX/fxwgl.c, and seems to implement support
+** for bitmap fonts where the wglUseFontBitmapsA() code implements
+** support for outline fonts.  In combination they hopefully give
+** fairly generic support for fonts.
+*/
+static BOOL wglUseFontBitmaps_FX(HDC fontDevice, DWORD firstChar,
+                                 DWORD numChars, DWORD listBase)
+{
+#define VERIFY(a) a
+
+  TEXTMETRIC metric;
+  BITMAPINFO *dibInfo;
+  HDC bitDevice;
+  COLORREF tempColor;
+  int i;
+
+  VERIFY(GetTextMetrics(fontDevice, &metric));
+
+  dibInfo = (BITMAPINFO *) calloc(sizeof(BITMAPINFO) + sizeof(RGBQUAD), 1);
+  dibInfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
+  dibInfo->bmiHeader.biPlanes = 1;
+  dibInfo->bmiHeader.biBitCount = 1;
+  dibInfo->bmiHeader.biCompression = BI_RGB;
+
+  bitDevice = CreateCompatibleDC(fontDevice);
+  // HDC bitDevice = CreateDC("DISPLAY", NULL, NULL, NULL);
+  // VERIFY(bitDevice);
+
+  // Swap fore and back colors so the bitmap has the right polarity
+  tempColor = GetBkColor(bitDevice);
+  SetBkColor(bitDevice, GetTextColor(bitDevice));
+  SetTextColor(bitDevice, tempColor);
+
+  // Place chars based on base line
+  VERIFY(SetTextAlign(bitDevice, TA_BASELINE) >= 0 ? 1 : 0);
+
+  for(i = 0; i < numChars; i++) {
+    SIZE size;
+    char curChar;
+    int charWidth,charHeight,bmapWidth,bmapHeight,numBytes,res;
+    HBITMAP bitObject;
+    HGDIOBJ origBmap;
+    unsigned char *bmap;
+
+    curChar = i + firstChar;
+
+    // Find how high/wide this character is
+    VERIFY(GetTextExtentPoint32(bitDevice, &curChar, 1, &size));
+
+    // Create the output bitmap
+    charWidth = size.cx;
+    charHeight = size.cy;
+    bmapWidth = ((charWidth + 31) / 32) * 32;   // Round up to the next multiple of 32 bits
+    bmapHeight = charHeight;
+    bitObject = CreateCompatibleBitmap(bitDevice,
+                                       bmapWidth,
+                                       bmapHeight);
+    //VERIFY(bitObject);
+
+    // Assign the output bitmap to the device
+    origBmap = SelectObject(bitDevice, bitObject);
+    VERIFY(origBmap);
+
+    VERIFY( PatBlt( bitDevice, 0, 0, bmapWidth, bmapHeight,BLACKNESS ) );
+
+    // Use our source font on the device
+    VERIFY(SelectObject(bitDevice, GetCurrentObject(fontDevice,OBJ_FONT)));
+
+    // Draw the character
+    VERIFY(TextOut(bitDevice, 0, metric.tmAscent, &curChar, 1));
+
+    // Unselect our bmap object
+    VERIFY(SelectObject(bitDevice, origBmap));
+
+    // Convert the display dependant representation to a 1 bit deep DIB
+    numBytes = (bmapWidth * bmapHeight) / 8;
+    bmap = malloc(numBytes);
+    dibInfo->bmiHeader.biWidth = bmapWidth;
+    dibInfo->bmiHeader.biHeight = bmapHeight;
+    res = GetDIBits(bitDevice, bitObject, 0, bmapHeight, bmap,
+                    dibInfo,
+                    DIB_RGB_COLORS);
+    //VERIFY(res);
+
+    // Create the GL object
+    glNewList(i + listBase, GL_COMPILE);
+    glBitmap(bmapWidth, bmapHeight, 0.0, metric.tmDescent,
+             charWidth, 0.0,
+             bmap);
+    glEndList();
+    // CheckGL();
+
+    // Destroy the bmap object
+    DeleteObject(bitObject);
+
+    // Deallocate the bitmap data
+    free(bmap);
+  }
+
+  // Destroy the DC
+  VERIFY(DeleteDC(bitDevice));
+
+  free(dibInfo);
+
+  return TRUE;
+#undef VERIFY
+}
+
+WGLAPI BOOL GLAPIENTRY wglUseFontBitmapsA(HDC hdc, DWORD first,
+                                       DWORD count, DWORD listBase)
+{
+   int i;
+   GLuint font_list;
+   DWORD size;
+   GLYPHMETRICS gm;
+   HANDLE hBits;
+   LPSTR lpBits;
+   MAT2 mat;
+   int  success = TRUE;
+
+   if (first<0)
+      return FALSE;
+   if (count<0)
+      return FALSE;
+   if (listBase<0)
+      return FALSE;
+
+   font_list = listBase;
+
+   mat.eM11 = FixedFromDouble(1);
+   mat.eM12 = FixedFromDouble(0);
+   mat.eM21 = FixedFromDouble(0);
+   mat.eM22 = FixedFromDouble(-1);
+
+   memset(&gm,0,sizeof(gm));
+
+   /*
+   ** If we can't get the glyph outline, it may be because this is a fixed
+   ** font.  Try processing it that way.
+   */
+   if( GetGlyphOutline(hdc, first, GGO_BITMAP, &gm, 0, NULL, &mat)
+       == GDI_ERROR )
+   {
+       return wglUseFontBitmaps_FX( hdc, first, count, listBase );
+   }
+
+   /*
+   ** Otherwise process all desired characters.
+   */
+   for (i = 0; i < count; i++)
+   {
+       DWORD err;
+       
+      glNewList( font_list+i, GL_COMPILE );
+
+      /* allocate space for the bitmap/outline */
+      size = GetGlyphOutline(hdc, first + i, GGO_BITMAP, &gm, 0, NULL, &mat);
+      if (size == GDI_ERROR)
+      {
+         glEndList( );
+         err = GetLastError();
+         success = FALSE;
+         continue;
+      }
+
+      hBits  = GlobalAlloc(GHND, size+1);
+      lpBits = GlobalLock(hBits);
+
+      err = 
+      GetGlyphOutline(hdc,    /* handle to device context */
+                      first + i,          /* character to query */
+                      GGO_BITMAP,         /* format of data to return */
+                      &gm,                /* pointer to structure for metrics*/
+                      size,               /* size of buffer for data */
+                      lpBits,             /* pointer to buffer for data */
+                      &mat                /* pointer to transformation */
+                                          /* matrix structure */
+                  );
+
+      if (err == GDI_ERROR)
+      {
+         GlobalUnlock(hBits);
+         GlobalFree(hBits);
+         
+         glEndList( );
+         err = GetLastError();
+         success = FALSE;
+         continue;
+      }
+
+      glBitmap(gm.gmBlackBoxX,gm.gmBlackBoxY,
+               -gm.gmptGlyphOrigin.x,
+               gm.gmptGlyphOrigin.y,
+               gm.gmCellIncX,gm.gmCellIncY,
+               (const GLubyte * )lpBits);
+
+      GlobalUnlock(hBits);
+      GlobalFree(hBits);
+
+      glEndList( );
+   }
+
+   return success;
+}
+
+
+WGLAPI BOOL GLAPIENTRY wglUseFontBitmapsW(HDC hdc,DWORD first,DWORD count,DWORD listBase)
+{
+    return FALSE;
+}
+
+WGLAPI BOOL GLAPIENTRY wglUseFontOutlinesA(HDC hdc,DWORD first,DWORD count,
+                                  DWORD listBase,FLOAT deviation,
+                                  FLOAT extrusion,int format,
+                                  LPGLYPHMETRICSFLOAT lpgmf)
+{
+    SetLastError(0);
+    return(FALSE);
+}
+
+WGLAPI BOOL GLAPIENTRY wglUseFontOutlinesW(HDC hdc,DWORD first,DWORD count,
+                                  DWORD listBase,FLOAT deviation,
+                                  FLOAT extrusion,int format,
+                                  LPGLYPHMETRICSFLOAT lpgmf)
+{
+    SetLastError(0);
+    return(FALSE);
+}
+
+WGLAPI BOOL GLAPIENTRY wglDescribeLayerPlane(HDC hdc,int iPixelFormat,
+                                    int iLayerPlane,UINT nBytes,
+                                    LPLAYERPLANEDESCRIPTOR plpd)
+{
+    SetLastError(0);
+    return(FALSE);
+}
+
+WGLAPI int GLAPIENTRY wglSetLayerPaletteEntries(HDC hdc,int iLayerPlane,
+                                       int iStart,int cEntries,
+                                       CONST COLORREF *pcr)
+{
+    SetLastError(0);
+    return(0);
+}
+
+WGLAPI int GLAPIENTRY wglGetLayerPaletteEntries(HDC hdc,int iLayerPlane,
+                                       int iStart,int cEntries,
+                                       COLORREF *pcr)
+{
+    SetLastError(0);
+    return(0);
+}
+
+WGLAPI BOOL GLAPIENTRY wglRealizeLayerPalette(HDC hdc,int iLayerPlane,BOOL bRealize)
+{
+    SetLastError(0);
+    return(FALSE);
+}
+
+WGLAPI BOOL GLAPIENTRY wglSwapLayerBuffers(HDC hdc,UINT fuPlanes)
+{
+    if( !hdc )
+    {
+        WMesaSwapBuffers();
+        return(TRUE);
+    }
+    SetLastError(0);
+    return(FALSE);
+}
+
+WGLAPI int GLAPIENTRY wglChoosePixelFormat(HDC hdc,
+                                  CONST PIXELFORMATDESCRIPTOR *ppfd)
+{
+    int		i,best = -1,bestdelta = 0x7FFFFFFF,delta,qt_valid_pix;
+
+    qt_valid_pix = qt_pix;
+    if(ppfd->nSize != sizeof(PIXELFORMATDESCRIPTOR) || ppfd->nVersion != 1)
+    {
+        SetLastError(0);
+        return(0);
+    }
+    for(i = 0;i < qt_valid_pix;i++)
+    {
+        delta = 0;
+        if(
+            (ppfd->dwFlags & PFD_DRAW_TO_WINDOW) &&
+            !(pix[i].pfd.dwFlags & PFD_DRAW_TO_WINDOW))
+            continue;
+        if(
+            (ppfd->dwFlags & PFD_DRAW_TO_BITMAP) &&
+            !(pix[i].pfd.dwFlags & PFD_DRAW_TO_BITMAP))
+            continue;
+        if(
+            (ppfd->dwFlags & PFD_SUPPORT_GDI) &&
+            !(pix[i].pfd.dwFlags & PFD_SUPPORT_GDI))
+            continue;
+        if(
+            (ppfd->dwFlags & PFD_SUPPORT_OPENGL) &&
+            !(pix[i].pfd.dwFlags & PFD_SUPPORT_OPENGL))
+            continue;
+        if(
+            !(ppfd->dwFlags & PFD_DOUBLEBUFFER_DONTCARE) &&
+            ((ppfd->dwFlags & PFD_DOUBLEBUFFER) != (pix[i].pfd.dwFlags & PFD_DOUBLEBUFFER)))
+            continue;
+        if(
+            !(ppfd->dwFlags & PFD_STEREO_DONTCARE) &&
+            ((ppfd->dwFlags & PFD_STEREO) != (pix[i].pfd.dwFlags & PFD_STEREO)))
+            continue;
+        if(ppfd->iPixelType != pix[i].pfd.iPixelType)
+            delta++;
+        if(ppfd->cAlphaBits != pix[i].pfd.cAlphaBits)
+            delta++;
+        if(delta < bestdelta)
+        {
+            best = i + 1;
+            bestdelta = delta;
+            if(bestdelta == 0)
+                break;
+        }
+    }
+    if(best == -1)
+    {
+        SetLastError(0);
+        return(0);
+    }
+    return(best);
+}
+
+WGLAPI int GLAPIENTRY wglDescribePixelFormat(HDC hdc,int iPixelFormat,UINT nBytes,
+                                    LPPIXELFORMATDESCRIPTOR ppfd)
+{
+    int		qt_valid_pix;
+
+    qt_valid_pix = qt_pix;
+    if(ppfd == NULL)
+	return(qt_valid_pix);
+    if(iPixelFormat < 1 || iPixelFormat > qt_valid_pix || nBytes != sizeof(PIXELFORMATDESCRIPTOR))
+    {
+        SetLastError(0);
+        return(0);
+    }
+    *ppfd = pix[iPixelFormat - 1].pfd;
+    return(qt_valid_pix);
+}
+
+/*
+* GetProcAddress - return the address of an appropriate extension
+*/
+WGLAPI PROC GLAPIENTRY wglGetProcAddress(LPCSTR lpszProc)
+{
+   PROC p = (PROC) _glapi_get_proc_address((const char *) lpszProc);
+   if (p)
+      return p;
+
+   SetLastError(0);
+   return(NULL);
+}
+
+WGLAPI int GLAPIENTRY wglGetPixelFormat(HDC hdc)
+{
+    if(curPFD == 0)
+    {
+        SetLastError(0);
+        return(0);
+    }
+    return(curPFD);
+}
+
+WGLAPI BOOL GLAPIENTRY wglSetPixelFormat(HDC hdc,int iPixelFormat,
+                                PIXELFORMATDESCRIPTOR *ppfd)
+{
+    int		qt_valid_pix;
+
+    qt_valid_pix = qt_pix;
+    if(iPixelFormat < 1 || iPixelFormat > qt_valid_pix || ppfd->nSize != sizeof(PIXELFORMATDESCRIPTOR))
+    {
+        SetLastError(0);
+        return(FALSE);
+    }
+    curPFD = iPixelFormat;
+    return(TRUE);
+}
+
+WGLAPI BOOL GLAPIENTRY wglSwapBuffers(HDC hdc)
+{
+   if (ctx_current < 0)
+      return FALSE;
+
+   if(wgl_ctx[ctx_current].ctx == NULL) {
+      SetLastError(0);
+      return(FALSE);
+   }
+   WMesaSwapBuffers();
+   return(TRUE);
+}
+
+#endif /* WIN32 */
diff --git a/reactos/lib/mesa32/src/drivers/windows/gdi/wmesa.c b/reactos/lib/mesa32/src/drivers/windows/gdi/wmesa.c
new file mode 100644
index 00000000000..74c6caab697
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/windows/gdi/wmesa.c
@@ -0,0 +1,3328 @@
+
+/*
+ * Windows (Win32) device driver for Mesa 3.4
+ *
+ * Original author:
+ *
+ *  Copyright (C) 1996-  Li Wei
+ *  Address      :       Institute of Artificial Intelligence
+ *               :           & Robotics
+ *               :       Xi'an Jiaotong University
+ *  Email        :       liwei@aiar.xjtu.edu.cn
+ *  Web page :       http://sun.aiar.xjtu.edu.cn
+ *
+ *  This file and its associations are partially borrowed from the
+ *  Windows NT driver for Mesa 1.8 , written by Mark Leaming
+ *  (mark@rsinc.com).
+ *
+ * Updated for Mesa 4.0 by Karl Schultz (kschultz@sourceforge.net)
+ */
+
+#ifdef NDEBUG
+#pragma auto_inline(on)
+#pragma inline_depth(255)
+#pragma inline_recursion(on)
+#endif
+
+#include "wmesadef.h"
+#include <GL/wmesa.h>
+//#include "mesa_extend.h"
+
+#include "glheader.h"
+#include "colors.h"
+#include "context.h"
+#include "colormac.h"
+#include "dd.h"
+#include "depth.h"
+#include "extensions.h"
+#include "imports.h"
+#include "macros.h"
+#include "matrix.h"
+#include "mtypes.h"
+#include "texformat.h"
+#include "teximage.h"
+#include "texstore.h"
+#include "array_cache/acache.h"
+#include "swrast/swrast.h"
+#include "swrast_setup/swrast_setup.h"
+#include "swrast/s_context.h"
+#include "swrast/s_depth.h"
+#include "swrast/s_lines.h"
+#include "swrast/s_triangle.h"
+#include "swrast/s_trispan.h"
+#include "tnl/tnl.h"
+#include "tnl/t_context.h"
+#include "tnl/t_pipeline.h"
+
+/* Dither not tested for Mesa 4.0 */ 
+#ifdef DITHER
+#ifdef USE_WING
+#include <wing.h>
+#endif // USE_WING
+#endif
+
+#ifdef __CYGWIN32__
+#include "macros.h"
+#include <string.h>
+#define CopyMemory memcpy
+#endif
+
+/* Stereo and parallel not tested for Mesa 4.0. */
+#define NO_STEREO
+#if !defined(NO_STEREO)
+#include "gl\glu.h"
+#include "stereo.h"
+#endif
+
+#define NO_PARALLEL
+#if !defined(NO_PARALLEL)
+#include "parallel.h"
+#endif
+
+
+/* File global varaibles */
+struct DISPLAY_OPTIONS {
+	int  stereo;
+	int  fullScreen;
+	int	 mode;
+	int	 bpp;
+};
+
+struct DISPLAY_OPTIONS displayOptions = 
+{
+	0,		// stereo
+	0,		// fullScreen
+	0,		// full screen mode (1,2,3,4)
+	0		// bpp (8,16,24,32)
+};
+GLenum stereoCompile = GL_FALSE ;
+GLenum stereoShowing  = GL_FALSE ;
+GLenum stereoBuffer = GL_FALSE;
+#if !defined(NO_STEREO)
+GLint displayList = MAXIMUM_DISPLAY_LIST ;
+#endif
+GLint stereo_flag = 0 ;
+
+static PWMC Current = NULL;
+WMesaContext WC = NULL;
+
+#ifdef COMPILE_SETPIXEL
+
+#if defined(_MSC_VER) && _MSC_VER >= 1200
+#define FORCEINLINE __forceinline
+#else
+#define FORCEINLINE __inline
+#endif
+
+FORCEINLINE void wmSetPixel(PWMC pwc, int iScanLine, int iPixel, BYTE r, BYTE g, BYTE b)
+{
+	pwc->wmSetPixel(pwc,iScanLine,iPixel,r,g,b);
+}
+
+void ChooseSetPixel(PWMC pwc);
+
+#endif // COMPILE_SETPIXEL
+
+/* If we are double-buffering, we want to get the DC for the
+ * off-screen DIB, otherwise the DC for the window.
+ */
+#define DD_GETDC ((Current->db_flag) ? Current->dib.hDC : Current->hDC )
+#define DD_RELEASEDC
+
+#define FLIP(Y)  (Current->height-(Y)-1)
+
+#define DITHER_RGB_TO_8BIT_SETUP            \
+GLubyte pixelDithered;
+
+#define DITHER_RGB_TO_8BIT(red, green, blue, pixel, scanline)        \
+{                                                                    \
+    char unsigned redtemp, greentemp, bluetemp, paletteindex;        \
+    redtemp = aDividedBy51[red]                                      \
+    + (aModulo51[red] > aHalftone8x8[(pixel%8)*8                     \
+    + scanline%8]);                                                  \
+    greentemp = aDividedBy51[(char unsigned)green]                   \
+    + (aModulo51[green] > aHalftone8x8[                              \
+    (pixel%8)*8 + scanline%8]);                                      \
+    bluetemp = aDividedBy51[(char unsigned)blue]                     \
+    + (aModulo51[blue] > aHalftone8x8[                               \
+    (pixel%8)*8 +scanline%8]);                                       \
+    paletteindex = redtemp + aTimes6[greentemp] + aTimes36[bluetemp];\
+    pixelDithered = aWinGHalftoneTranslation[paletteindex];          \
+}
+
+#ifdef DDRAW
+static BOOL DDInit( WMesaContext wc, HWND hwnd);
+static void DDFree( WMesaContext wc);
+static HRESULT DDRestoreAll( WMesaContext wc );
+static void DDDeleteOffScreen(WMesaContext wc);
+static BOOL DDCreateOffScreen(WMesaContext wc);
+
+// define this to use the GDI Rectangle call to
+// clear the back buffer. Otherwise will manually
+// set the pixels. On an NVidia GEForce 2MX under Windows XP
+// and DirectX 8 , defining this makes apps run much much faster
+#define USE_GDI_TO_CLEAR 1
+#endif
+
+static void FlushToFile(PWMC pwc, PSTR  szFile);
+BOOL wmCreateBackingStore(PWMC pwc, long lxSize, long lySize);
+BOOL wmDeleteBackingStore(PWMC pwc);
+void wmCreatePalette( PWMC pwdc );
+BOOL wmSetDibColors(PWMC pwc);
+void wmSetPixel(PWMC pwc, int iScanLine, int iPixel, BYTE r, BYTE g, BYTE b);
+BOOL wmFlush(PWMC pwc);
+void wmCreateDIBSection(
+    HDC  hDC,
+    PWMC pwc,   // handle of device context
+    CONST BITMAPINFO *pbmi, // bitmap size, format, and color data
+    UINT iUsage // color data type indicator: RGB values or palette indices
+    );
+void WMesaViewport( GLcontext *ctx,
+                    GLint x, GLint y, GLsizei width, GLsizei height );
+
+
+static void wmSetPixelFormat( PWMC wc, HDC hDC)
+{
+  if(wc->rgb_flag)
+    wc->cColorBits = GetDeviceCaps(hDC, BITSPIXEL);
+  else
+    wc->cColorBits = 8;
+  switch(wc->cColorBits){
+  case 8:
+    if(wc->dither_flag != GL_TRUE)
+      wc->pixelformat = PF_INDEX8;
+    else
+      wc->pixelformat = PF_DITHER8;
+    break;
+  case 16:
+    wc->pixelformat = PF_5R6G5B;
+    break;
+  case 32:
+    wc->pixelformat = PF_8R8G8B;
+    break;
+  default:
+    wc->pixelformat = PF_BADFORMAT;
+  }
+}
+
+
+/* This function sets the color table of a DIB section
+ * to match that of the destination DC
+ */
+BOOL wmSetDibColors(PWMC pwc)
+{
+  RGBQUAD         *pColTab, *pRGB;
+  PALETTEENTRY    *pPal, *pPE;
+  int             i, nColors;
+  BOOL            bRet=TRUE;
+  DWORD           dwErr=0;
+  
+  /* Build a color table in the DIB that maps to the
+   *  selected palette in the DC.
+   */
+  nColors = 1 << pwc->cColorBits;
+  pPal = (PALETTEENTRY *)malloc( nColors * sizeof(PALETTEENTRY));
+  memset( pPal, 0, nColors * sizeof(PALETTEENTRY) );
+  GetPaletteEntries( pwc->hGLPalette, 0, nColors, pPal );
+  pColTab = (RGBQUAD *)malloc( nColors * sizeof(RGBQUAD));
+  for (i = 0, pRGB = pColTab, pPE = pPal; i < nColors; i++, pRGB++, pPE++) {
+    pRGB->rgbRed = pPE->peRed;
+    pRGB->rgbGreen = pPE->peGreen;
+    pRGB->rgbBlue = pPE->peBlue;
+  }
+  if(pwc->db_flag)
+    bRet = SetDIBColorTable(pwc->dib.hDC, 0, nColors, pColTab );
+  
+  if(!bRet)
+    dwErr = GetLastError();
+  
+  free( pColTab );
+  free( pPal );
+  
+  return bRet;
+}
+
+
+/*
+ * Free up the dib section that was created
+ */
+BOOL wmDeleteBackingStore(PWMC pwc)
+{
+  SelectObject(pwc->dib.hDC, pwc->hOldBitmap);
+  DeleteDC(pwc->dib.hDC);
+  DeleteObject(pwc->hbmDIB);
+#ifdef USE_MAPPED_FILE
+  UnmapViewOfFile(pwc->dib.base);
+  CloseHandle(pwc->dib.hFileMap);
+#endif
+  return TRUE;
+}
+
+
+/*
+ * This function creates the DIB section that is used for combined
+ * GL and GDI calls
+ */
+BOOL wmCreateBackingStore(PWMC pwc, long lxSize, long lySize)
+{
+  HDC hdc = pwc->hDC;
+  LPBITMAPINFO pbmi = &(pwc->bmi);
+  int     iUsage;
+  
+  pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
+  pbmi->bmiHeader.biWidth = lxSize;
+  pbmi->bmiHeader.biHeight= -lySize;
+  pbmi->bmiHeader.biPlanes = 1;
+  if(pwc->rgb_flag)
+    pbmi->bmiHeader.biBitCount = GetDeviceCaps(pwc->hDC, BITSPIXEL);
+  else
+    pbmi->bmiHeader.biBitCount = 8;
+  pbmi->bmiHeader.biCompression = BI_RGB;
+  pbmi->bmiHeader.biSizeImage = 0;
+  pbmi->bmiHeader.biXPelsPerMeter = 0;
+  pbmi->bmiHeader.biYPelsPerMeter = 0;
+  pbmi->bmiHeader.biClrUsed = 0;
+  pbmi->bmiHeader.biClrImportant = 0;
+  
+  iUsage = (pbmi->bmiHeader.biBitCount <= 8) ? DIB_PAL_COLORS : DIB_RGB_COLORS;
+
+  pwc->cColorBits = pbmi->bmiHeader.biBitCount;
+  pwc->ScanWidth = pwc->pitch = lxSize;
+  
+  wmCreateDIBSection(hdc, pwc, pbmi, iUsage);
+  
+  if ((iUsage == DIB_PAL_COLORS) && !(pwc->hGLPalette)) {
+    wmCreatePalette( pwc );
+    wmSetDibColors( pwc );
+  }
+  wmSetPixelFormat(pwc, pwc->hDC);
+  return TRUE;
+}
+
+#if 0
+// D.R.S. 10/30/01 - this function is never referenced
+/*
+ * This function copies one scan line in a DIB section to another
+ */
+BOOL wmSetDIBits(PWMC pwc, UINT uiScanWidth, UINT uiNumScans, 
+			UINT nBypp, UINT uiNewWidth, LPBYTE pBits)
+{
+  UINT    uiScans = 0;
+  LPBYTE  pDest = pwc->pbPixels;
+  DWORD   dwNextScan = uiScanWidth;
+  DWORD   dwNewScan = uiNewWidth;
+  DWORD   dwScanWidth = (uiScanWidth * nBypp);
+  
+  /*
+   * We need to round up to the nearest DWORD
+   * and multiply by the number of bytes per
+   * pixel
+   */
+  dwNextScan = (((dwNextScan * nBypp)+ 3) & ~3);
+  dwNewScan = (((dwNewScan * nBypp)+ 3) & ~3);
+  
+  for(uiScans = 0; uiScans < uiNumScans; uiScans++){
+    CopyMemory(pDest, pBits, dwScanWidth);
+    pBits += dwNextScan;
+    pDest += dwNewScan;
+  }
+  return TRUE;
+}
+#endif // 0
+
+#if defined(FAST_RASTERIZERS)
+
+#define PIXELADDR(X,Y)  \
+  ((GLubyte *)Current->pbPixels + (Current->height-Y-1)* \
+  Current->ScanWidth + (X)*nBypp)
+#define PIXELADDR1( X, Y )  \
+((GLubyte *)wmesa->pbPixels + (wmesa->height-Y-1)* wmesa->ScanWidth + (X))
+#define PIXELADDR2( X, Y )  \
+((GLubyte *)wmesa->pbPixels + (wmesa->height-Y-1)* wmesa->ScanWidth + (X)*2)
+#define PIXELADDR4( X, Y )  \
+((GLubyte *)wmesa->pbPixels + (wmesa->height-Y-1)* wmesa->ScanWidth + (X)*4)
+
+#endif // 0
+
+BYTE DITHER_RGB_2_8BIT( int r, int g, int b, int x, int y);
+
+/* Finish all pending operations and synchronize. */
+static void finish(GLcontext* ctx)
+{
+  /* No op */
+}
+
+
+static void flush(GLcontext* ctx)
+{
+  if((Current->rgb_flag &&!(Current->db_flag))
+     ||(!Current->rgb_flag))
+    {
+      wmFlush(Current);
+    }
+  
+}
+
+
+
+/*
+ * Set the color index used to clear the color buffer.
+ */
+static void clear_index(GLcontext* ctx, GLuint index)
+{
+  Current->clearpixel = index;
+}
+
+
+
+/*
+ * Set the color used to clear the color buffer.
+ */
+static void clear_color( GLcontext* ctx, const GLfloat color[4] )
+{
+  GLubyte col[4];
+  CLAMPED_FLOAT_TO_UBYTE(col[0], color[0]);
+  CLAMPED_FLOAT_TO_UBYTE(col[1], color[1]);
+  CLAMPED_FLOAT_TO_UBYTE(col[2], color[2]);
+  Current->clearpixel = RGB(col[0], col[1], col[2]);
+}
+
+
+/* 
+ * Clear the specified region of the color buffer using the clear color 
+ * or index as specified by one of the two functions above. 
+ * 
+ * This procedure clears either the front and/or the back COLOR buffers. 
+ * Only the "left" buffer is cleared since we are not stereo. 
+ * Clearing of the other non-color buffers is left to the swrast. 
+ * We also only clear the color buffers if the color masks are all 1's. 
+ * Otherwise, we let swrast do it. 
+ */ 
+
+static clear(GLcontext* ctx, GLbitfield mask, 
+      GLboolean all, GLint x, GLint y, GLint width, GLint height) 
+{ 
+  const   GLuint *colorMask = (GLuint *) &ctx->Color.ColorMask; 
+  
+  if (all){ 
+    x=y=0; 
+    width=Current->width; 
+    height=Current->height; 
+  } 
+  
+  
+  /* sanity check - can't have right(stereo) buffers */ 
+  assert((mask & (DD_FRONT_RIGHT_BIT | DD_BACK_RIGHT_BIT)) == 0); 
+  
+  /* clear alpha */
+  if ((mask & (DD_FRONT_LEFT_BIT | DD_BACK_LEFT_BIT)) &&
+      ctx->DrawBuffer->UseSoftwareAlphaBuffers &&
+      ctx->Color.ColorMask[ACOMP]) {
+      _swrast_clear_alpha_buffers( ctx );
+  }
+
+  if (*colorMask == 0xffffffff && ctx->Color.IndexMask == 0xffffffff) { 
+      if (mask & DD_BACK_LEFT_BIT) { 
+#if defined(USE_GDI_TO_CLEAR) 
+#if defined(DDRAW) 
+ // D.R.S. 10/29/01 on my system (Pentium 4 with nvidia GeForce2 MX card, 
+ // this is almose 100 times faster that the code below 
+ HDC DC=NULL; 
+ HPEN Pen=CreatePen(PS_SOLID,1,Current->clearpixel); 
+ HBRUSH Brush=CreateSolidBrush(Current->clearpixel); 
+ HPEN Old_Pen=NULL; 
+ HBRUSH Old_Brush=NULL; 
+ Current->lpDDSOffScreen->lpVtbl->Unlock(Current->lpDDSOffScreen,NULL); 
+ Current->lpDDSOffScreen->lpVtbl->GetDC(Current->lpDDSOffScreen,&DC); 
+ Old_Pen=SelectObject(DC,Pen); 
+ Old_Brush=SelectObject(DC,Brush); 
+ Rectangle(DC,x,y,x+width,y+height); 
+ SelectObject(DC,Old_Pen); 
+ SelectObject(DC,Old_Brush); 
+ DeleteObject(Pen); 
+ DeleteObject(Brush); 
+ Current->lpDDSOffScreen->lpVtbl->ReleaseDC(Current->lpDDSOffScreen,DC); 
+ while (Current->lpDDSOffScreen->lpVtbl->Lock(Current->lpDDSOffScreen,NULL, &(Current->ddsd), 0, NULL) == DDERR_WASSTILLDRAWING);
+
+   mask &= ~DD_BACK_LEFT_BIT; 
+#else 
+   /* single-buffer */ 
+   HDC DC=DD_GETDC; 
+   HPEN Pen=CreatePen(PS_SOLID,1,Current->clearpixel); 
+   HBRUSH Brush=CreateSolidBrush(Current->clearpixel); 
+   HPEN Old_Pen=SelectObject(DC,Pen); 
+   HBRUSH Old_Brush=SelectObject(DC,Brush); 
+   Rectangle(DC,x+Current->rectSurface.left,Current->rectSurface.top+y,x+width+Current->rectSurface.left,y+height+Current->rectSurface.top);
+
+   SelectObject(DC,Old_Pen); 
+   SelectObject(DC,Old_Brush); 
+   DeleteObject(Pen); 
+   DeleteObject(Brush); 
+   DD_RELEASEDC; 
+   mask &= ~DD_BACK_LEFT_BIT; 
+#endif // DDRAW 
+#else 
+   DWORD   dwColor; 
+   WORD    wColor; 
+   BYTE    bColor; 
+   LPDWORD lpdw = (LPDWORD)Current->pbPixels; 
+   LPWORD  lpw = (LPWORD)Current->pbPixels; 
+   LPBYTE  lpb = Current->pbPixels; 
+   int     lines; 
+   /* Double-buffering - clear back buffer */ 
+   UINT    nBypp = Current->cColorBits / 8; 
+   int     i = 0; 
+   int     iSize = 0; 
+   int   mult = 4; 
+
+   
+   assert(Current->db_flag==GL_TRUE); /* we'd better be double buffer */ 
+   if(nBypp ==1 ){ 
+       iSize = Current->width/4; 
+       bColor  = BGR8(GetRValue(Current->clearpixel), 
+        GetGValue(Current->clearpixel), 
+        GetBValue(Current->clearpixel)); 
+       wColor  = MAKEWORD(bColor,bColor); 
+       dwColor = MAKELONG(wColor, wColor); 
+   } 
+   else if(nBypp == 2){ 
+       iSize = Current->width / 2; 
+       wColor = BGR16(GetRValue(Current->clearpixel), 
+        GetGValue(Current->clearpixel), 
+        GetBValue(Current->clearpixel)); 
+       dwColor = MAKELONG(wColor, wColor); 
+   } 
+   else if(nBypp == 3){ 
+      BYTE r, g, b; 
+      r = GetRValue(Current->clearpixel); 
+      g = GetGValue(Current->clearpixel); 
+      b = GetBValue(Current->clearpixel); 
+      iSize = Current->width; 
+      while (i < iSize) { 
+        *lpb++ = b; 
+        *lpb++ = g; 
+        *lpb++ = r; 
+        i++; 
+      } 
+      lpb = Current->pbPixels + Current->ScanWidth; 
+      mult = 3; 
+   }   
+   else if(nBypp == 4){ 
+       iSize = Current->width; 
+       dwColor = BGR32(GetRValue(Current->clearpixel), 
+         GetGValue(Current->clearpixel), 
+         GetBValue(Current->clearpixel)); 
+   } 
+
+   if (nBypp != 3) 
+   { 
+      /* clear a line */ 
+    while(i < iSize){ 
+        *lpdw = dwColor; 
+     lpdw++; 
+        i++; 
+    } 
+   } 
+   
+   i = 0; 
+   if (stereo_flag) 
+       lines = height /2; 
+   else 
+       lines = height; 
+   /* copy cleared line to other lines in buffer */ 
+   do { 
+       memcpy(lpb, Current->pbPixels, iSize*mult); 
+       lpb += Current->ScanWidth; 
+       i++; 
+   } 
+   while (i<lines-1); 
+   mask &= ~DD_BACK_LEFT_BIT; 
+#endif // defined(USE_GDI_TO_CLEAR) 
+      } /* double-buffer */ 
+      
+      if (mask & DD_FRONT_LEFT_BIT) { 
+   /* single-buffer */ 
+   HDC DC=DD_GETDC; 
+   HPEN Pen=CreatePen(PS_SOLID,1,Current->clearpixel); 
+   HBRUSH Brush=CreateSolidBrush(Current->clearpixel); 
+   HPEN Old_Pen=SelectObject(DC,Pen); 
+   HBRUSH Old_Brush=SelectObject(DC,Brush); 
+   Rectangle(DC,x+Current->rectSurface.left,Current->rectSurface.top+y,x+width+Current->rectSurface.left,y+height+Current->rectSurface.top);
+
+   SelectObject(DC,Old_Pen); 
+   SelectObject(DC,Old_Brush); 
+   DeleteObject(Pen); 
+   DeleteObject(Brush); 
+   DD_RELEASEDC; 
+   mask &= ~DD_FRONT_LEFT_BIT; 
+      } /* single-buffer */ 
+  } /* if masks are all 1's */ 
+    
+  /* Call swrast if there is anything left to clear (like DEPTH) */ 
+  if (mask) 
+      _swrast_Clear( ctx, mask, all, x, y, width, height ); 
+} 
+
+
+static void enable( GLcontext* ctx, GLenum pname, GLboolean enable )
+{
+  if (!Current)
+    return;
+  
+  if (pname == GL_DITHER) {
+    if(enable == GL_FALSE){
+      Current->dither_flag = GL_FALSE;
+      if(Current->cColorBits == 8)
+	Current->pixelformat = PF_INDEX8;
+    }
+    else{
+      if (Current->rgb_flag && Current->cColorBits == 8){
+	Current->pixelformat = PF_DITHER8;
+	Current->dither_flag = GL_TRUE;
+      }
+      else
+	Current->dither_flag = GL_FALSE;
+    }
+  }
+}
+
+
+
+static void set_buffer(GLcontext *ctx, GLframebuffer *colorBuffer,
+                       GLuint bufferBit )
+{
+  /* XXX todo - examine bufferBit and set read/write pointers */
+  return;
+}
+
+
+
+/* Return characteristics of the output buffer. */
+static void buffer_size( GLframebuffer *buffer, GLuint *width, GLuint *height )
+{
+  GET_CURRENT_CONTEXT(ctx);
+  int New_Size;
+  RECT CR;
+  
+  GetClientRect(Current->Window,&CR);
+  
+   *width=CR.right;
+   *height=CR.bottom;
+   
+   New_Size=((*width)!=Current->width) || ((*height)!=Current->height);
+   
+   if (New_Size){
+     Current->width=*width;
+     Current->height=*height;
+     Current->ScanWidth=Current->width;
+     if ((Current->ScanWidth%sizeof(long))!=0)
+       Current->ScanWidth+=(sizeof(long)-(Current->ScanWidth%sizeof(long)));
+     
+     if (Current->db_flag){
+#ifdef DDRAW
+       DDDeleteOffScreen(Current);
+       DDCreateOffScreen(Current);
+#else
+       if (Current->rgb_flag==GL_TRUE && Current->dither_flag!=GL_TRUE){
+	 wmDeleteBackingStore(Current);
+	 wmCreateBackingStore(Current, Current->width, Current->height);
+       }
+#endif
+     }
+     
+     /*  Resize OsmesaBuffer if in Parallel mode */
+#if !defined(NO_PARALLEL)
+     if(parallelFlag)
+       PRSizeRenderBuffer(Current->width, Current->height,Current->ScanWidth,
+			  Current->rgb_flag == GL_TRUE ? Current->pbPixels: 
+			  Current->ScreenMem);
+#endif
+   }
+}
+
+
+
+/**********************************************************************/
+/*****           Accelerated point, line, polygon rendering       *****/
+/**********************************************************************/
+
+/* Accelerated routines are not implemented in 4.0. See OSMesa for ideas. */
+
+static void fast_rgb_points( GLcontext* ctx, GLuint first, GLuint last )
+{
+}
+
+/* Return pointer to accelerated points function */
+extern points_func choose_points_function( GLcontext* ctx )
+{
+  return NULL;
+}
+
+static void fast_flat_rgb_line( GLcontext* ctx, GLuint v0, 
+				GLuint v1, GLuint pv )
+{
+}
+
+static line_func choose_line_function( GLcontext* ctx )
+{
+}
+
+
+/**********************************************************************/
+/*****                 Span-based pixel drawing                   *****/
+/**********************************************************************/
+
+
+/* Write a horizontal span of 32-bit color-index pixels with a boolean mask. */
+static void write_ci32_span( const GLcontext* ctx,
+                             GLuint n, GLint x, GLint y,
+                             const GLuint index[],
+                             const GLubyte mask[] )
+{
+  GLuint i;
+  PBYTE Mem=Current->ScreenMem+FLIP(y)*Current->ScanWidth+x;
+  assert(Current->rgb_flag==GL_FALSE);
+  for (i=0; i<n; i++)
+    if (mask[i])
+      Mem[i]=index[i];
+}
+
+
+/* Write a horizontal span of 8-bit color-index pixels with a boolean mask. */
+static void write_ci8_span( const GLcontext* ctx,
+                            GLuint n, GLint x, GLint y,
+                            const GLubyte index[],
+                            const GLubyte mask[] )
+{
+  GLuint i;
+  PBYTE Mem=Current->ScreenMem+FLIP(y)*Current->ScanWidth+x;
+  assert(Current->rgb_flag==GL_FALSE);
+  for (i=0; i<n; i++)
+    if (mask[i])
+      Mem[i]=index[i];
+}
+
+
+
+/*
+ * Write a horizontal span of pixels with a boolean mask.  The current
+ * color index is used for all pixels.
+ */
+static void write_mono_ci_span(const GLcontext* ctx,
+                               GLuint n,GLint x,GLint y,
+                               GLuint colorIndex, const GLubyte mask[])
+{
+  GLuint i;
+  BYTE *Mem=Current->ScreenMem+FLIP(y)*Current->ScanWidth+x;
+  assert(Current->rgb_flag==GL_FALSE);
+  for (i=0; i<n; i++)
+    if (mask[i])
+      Mem[i]=colorIndex;
+}
+
+/*
+ * To improve the performance of this routine, frob the data into an actual
+ * scanline and call bitblt on the complete scan line instead of SetPixel.
+ */
+
+/* Write a horizontal span of RGBA color pixels with a boolean mask. */
+static void write_rgba_span( const GLcontext* ctx, GLuint n, GLint x, GLint y,
+                             const GLubyte rgba[][4], const GLubyte mask[] )
+{
+  PWMC    pwc = Current;
+  
+  if (pwc->rgb_flag==GL_TRUE)
+    {
+      GLuint i;
+      HDC DC=DD_GETDC;
+      y=FLIP(y);
+      if (mask) {
+	for (i=0; i<n; i++)
+	  if (mask[i])
+	    wmSetPixel(pwc, y, x + i, 
+		       rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]);
+      }
+      else {
+	for (i=0; i<n; i++)
+	  wmSetPixel(pwc, y, x + i, 
+		     rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+      }
+      DD_RELEASEDC;
+    }
+  else
+    {
+      GLuint i;
+      BYTE *Mem=Current->ScreenMem+y*Current->ScanWidth+x;
+      y = FLIP(y);
+      if (mask) {
+	for (i=0; i<n; i++)
+	  if (mask[i])
+	    Mem[i] = GetNearestPaletteIndex(Current->hPal, 
+					    RGB(rgba[i][RCOMP], 
+						rgba[i][GCOMP], 
+						rgba[i][BCOMP]));
+      }
+      else {
+	for (i=0; i<n; i++)
+	  Mem[i] = GetNearestPaletteIndex(Current->hPal,
+					  RGB(rgba[i][RCOMP], 
+					      rgba[i][GCOMP], 
+					      rgba[i][BCOMP]));
+      }
+    }
+}
+
+/* Write a horizontal span of RGB color pixels with a boolean mask. */
+static void write_rgb_span( const GLcontext* ctx,
+                            GLuint n, GLint x, GLint y,
+                            const GLubyte rgb[][3], const GLubyte mask[] )
+{
+  PWMC    pwc = Current;
+  
+  if (pwc->rgb_flag==GL_TRUE)
+    {
+      GLuint i;
+      HDC DC=DD_GETDC;
+      y=FLIP(y);
+      if (mask) {
+	for (i=0; i<n; i++)
+	  if (mask[i])
+	    wmSetPixel(pwc, y, x + i, 
+		       rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP]);
+      }
+      else {
+	for (i=0; i<n; i++)
+	  wmSetPixel(pwc, y, x + i, 
+		     rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] );
+      }
+      DD_RELEASEDC;
+    }
+  else
+    {
+      GLuint i;
+      BYTE *Mem=Current->ScreenMem+y*Current->ScanWidth+x;
+      y = FLIP(y);
+      if (mask) {
+	for (i=0; i<n; i++)
+	  if (mask[i])
+	    Mem[i] = GetNearestPaletteIndex(Current->hPal,
+					    RGB(rgb[i][RCOMP], 
+						rgb[i][GCOMP], 
+						rgb[i][BCOMP]));
+      }
+      else {
+	for (i=0; i<n; i++)
+	  Mem[i] = GetNearestPaletteIndex(Current->hPal,
+					  RGB(rgb[i][RCOMP], 
+					      rgb[i][GCOMP], 
+					      rgb[i][BCOMP]));
+      }
+    }
+}
+
+/*
+ * Write a horizontal span of pixels with a boolean mask.  The current color
+ * is used for all pixels.
+ */
+static void write_mono_rgba_span( const GLcontext* ctx,
+                                  GLuint n, GLint x, GLint y,
+                                  const GLchan color[4], const GLubyte mask[])
+{
+  GLuint i;
+  PWMC pwc = Current;
+  assert(Current->rgb_flag==GL_TRUE);
+  y=FLIP(y);
+  if(Current->rgb_flag==GL_TRUE)
+  {
+	for (i=0; i<n; i++)
+		if (mask[i])
+			wmSetPixel(pwc,y,x+i,color[RCOMP], color[GCOMP], color[BCOMP]);
+  }
+  else
+  {
+	HDC DC=DD_GETDC;
+    ULONG pixel =  RGB( color[RCOMP], color[GCOMP], color[BCOMP] );
+    for (i=0; i<n; i++)
+      if (mask[i])
+		SetPixel(DC, y, x+i, pixel);
+	  DD_RELEASEDC;
+  }
+}
+
+
+
+/**********************************************************************/
+/*****                   Array-based pixel drawing                *****/
+/**********************************************************************/
+
+
+/* Write an array of 32-bit index pixels with a boolean mask. */
+static void write_ci32_pixels( const GLcontext* ctx,
+                               GLuint n, const GLint x[], const GLint y[],
+                               const GLuint index[], const GLubyte mask[] )
+{
+  GLuint i;
+  assert(Current->rgb_flag==GL_FALSE);
+  for (i=0; i<n; i++) {
+    if (mask[i]) {
+      BYTE *Mem=Current->ScreenMem+FLIP(y[i])*Current->ScanWidth+x[i];
+      *Mem = index[i];
+    }
+  }
+}
+
+
+
+/*
+ * Write an array of pixels with a boolean mask.  The current color
+ * index is used for all pixels.
+ */
+static void write_mono_ci_pixels( const GLcontext* ctx,
+                                  GLuint n,
+                                  const GLint x[], const GLint y[],
+                                  GLuint colorIndex, const GLubyte mask[] )
+{
+  GLuint i;
+  assert(Current->rgb_flag==GL_FALSE);
+  for (i=0; i<n; i++) {
+    if (mask[i]) {
+      BYTE *Mem=Current->ScreenMem+FLIP(y[i])*Current->ScanWidth+x[i];
+      *Mem = colorIndex;
+    }
+  }
+}
+
+
+
+/* Write an array of RGBA pixels with a boolean mask. */
+static void write_rgba_pixels( const GLcontext* ctx,
+                               GLuint n, const GLint x[], const GLint y[],
+                               const GLubyte rgba[][4], const GLubyte mask[] )
+{
+  GLuint i;
+  PWMC    pwc = Current;
+  HDC DC=DD_GETDC;
+  assert(Current->rgb_flag==GL_TRUE);
+  for (i=0; i<n; i++)
+    if (mask[i])
+      wmSetPixel(pwc, FLIP(y[i]), x[i],
+		 rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]);
+  DD_RELEASEDC;
+}
+
+
+
+/*
+ * Write an array of pixels with a boolean mask.  The current color
+ * is used for all pixels.
+ */
+static void write_mono_rgba_pixels( const GLcontext* ctx,
+                                    GLuint n,
+                                    const GLint x[], const GLint y[],
+                                    const GLchan color[4],
+                                    const GLubyte mask[] )
+{
+  GLuint i;
+  PWMC    pwc = Current;
+  HDC DC=DD_GETDC;
+  assert(Current->rgb_flag==GL_TRUE);
+  for (i=0; i<n; i++)
+    if (mask[i])
+      wmSetPixel(pwc, FLIP(y[i]),x[i],color[RCOMP],
+		 color[GCOMP], color[BCOMP]);
+  DD_RELEASEDC;
+}
+
+
+
+/**********************************************************************/
+/*****            Read spans/arrays of pixels                     *****/
+/**********************************************************************/
+
+
+/* Read a horizontal span of color-index pixels. */
+static void read_ci32_span( const GLcontext* ctx, GLuint n, GLint x, GLint y,
+                            GLuint index[])
+{
+  GLuint i;
+  BYTE *Mem=Current->ScreenMem+FLIP(y)*Current->ScanWidth+x;
+  assert(Current->rgb_flag==GL_FALSE);
+  for (i=0; i<n; i++)
+    index[i]=Mem[i];
+}
+
+
+
+
+/* Read an array of color index pixels. */
+static void read_ci32_pixels( const GLcontext* ctx,
+                              GLuint n, const GLint x[], const GLint y[],
+                              GLuint indx[], const GLubyte mask[] )
+{
+  GLuint i;
+  assert(Current->rgb_flag==GL_FALSE);
+  for (i=0; i<n; i++) {
+    if (mask[i]) {
+      indx[i]=*(Current->ScreenMem+FLIP(y[i])*Current->ScanWidth+x[i]);
+    }
+  }
+}
+
+
+
+/* Read a horizontal span of color pixels. */
+static void read_rgba_span( const GLcontext* ctx,
+                            GLuint n, GLint x, GLint y,
+                            GLubyte rgba[][4] )
+{
+  UINT i;
+  COLORREF Color;
+  HDC DC=DD_GETDC;
+  assert(Current->rgb_flag==GL_TRUE);
+  y = Current->height - y - 1;
+  for (i=0; i<n; i++) {
+    Color=GetPixel(DC,x+i,y);
+    rgba[i][RCOMP] = GetRValue(Color);
+    rgba[i][GCOMP] = GetGValue(Color);
+    rgba[i][BCOMP] = GetBValue(Color);
+    rgba[i][ACOMP] = 255;
+  }
+  DD_RELEASEDC;
+}
+
+
+/* Read an array of color pixels. */
+static void read_rgba_pixels( const GLcontext* ctx,
+                              GLuint n, const GLint x[], const GLint y[],
+                              GLubyte rgba[][4], const GLubyte mask[] )
+{
+  GLuint i;
+  COLORREF Color;
+  HDC DC=DD_GETDC;
+  assert(Current->rgb_flag==GL_TRUE);
+  for (i=0; i<n; i++) {
+    if (mask[i]) {
+      GLint y2 = Current->height - y[i] - 1;
+      Color=GetPixel(DC,x[i],y2);
+      rgba[i][RCOMP] = GetRValue(Color);
+      rgba[i][GCOMP] = GetGValue(Color);
+      rgba[i][BCOMP] = GetBValue(Color);
+      rgba[i][ACOMP] = 255;
+    }
+  }
+  DD_RELEASEDC;
+}
+
+
+
+/**********************************************************************/
+/**********************************************************************/
+
+
+static const GLubyte *get_string(GLcontext *ctx, GLenum name)
+{
+  if (name == GL_RENDERER) {
+    return (GLubyte *) "Mesa Windows";
+  }
+  else {
+    return NULL;
+  }
+}
+
+static void wmesa_update_state( GLcontext *ctx, GLuint new_state );
+
+static void SetFunctionPointers(GLcontext *ctx)
+{
+  struct swrast_device_driver *swdd = _swrast_GetDeviceDriverReference( ctx );
+  ctx->Driver.GetString = get_string;
+  ctx->Driver.UpdateState = wmesa_update_state;
+  ctx->Driver.ResizeBuffers = _swrast_alloc_buffers;
+  ctx->Driver.GetBufferSize = buffer_size;
+  
+  ctx->Driver.Accum = _swrast_Accum;
+  ctx->Driver.Bitmap = _swrast_Bitmap;
+  ctx->Driver.Clear = clear;
+  
+  ctx->Driver.Flush = flush;
+  ctx->Driver.ClearIndex = clear_index;
+  ctx->Driver.ClearColor = clear_color;
+  ctx->Driver.Enable = enable;
+  
+  ctx->Driver.CopyPixels = _swrast_CopyPixels;
+  ctx->Driver.DrawPixels = _swrast_DrawPixels;
+  ctx->Driver.ReadPixels = _swrast_ReadPixels;
+  ctx->Driver.DrawBuffer = _swrast_DrawBuffer;
+  
+  ctx->Driver.ChooseTextureFormat = _mesa_choose_tex_format;
+  ctx->Driver.TexImage1D = _mesa_store_teximage1d;
+  ctx->Driver.TexImage2D = _mesa_store_teximage2d;
+  ctx->Driver.TexImage3D = _mesa_store_teximage3d;
+  ctx->Driver.TexSubImage1D = _mesa_store_texsubimage1d;
+  ctx->Driver.TexSubImage2D = _mesa_store_texsubimage2d;
+  ctx->Driver.TexSubImage3D = _mesa_store_texsubimage3d;
+  ctx->Driver.TestProxyTexImage = _mesa_test_proxy_teximage;
+  
+  ctx->Driver.CompressedTexImage1D = _mesa_store_compressed_teximage1d;
+  ctx->Driver.CompressedTexImage2D = _mesa_store_compressed_teximage2d;
+  ctx->Driver.CompressedTexImage3D = _mesa_store_compressed_teximage3d;
+  ctx->Driver.CompressedTexSubImage1D = _mesa_store_compressed_texsubimage1d;
+  ctx->Driver.CompressedTexSubImage2D = _mesa_store_compressed_texsubimage2d;
+  ctx->Driver.CompressedTexSubImage3D = _mesa_store_compressed_texsubimage3d;
+
+  ctx->Driver.CopyTexImage1D = _swrast_copy_teximage1d;
+  ctx->Driver.CopyTexImage2D = _swrast_copy_teximage2d;
+  ctx->Driver.CopyTexSubImage1D = _swrast_copy_texsubimage1d;
+  ctx->Driver.CopyTexSubImage2D = _swrast_copy_texsubimage2d;
+  ctx->Driver.CopyTexSubImage3D = _swrast_copy_texsubimage3d;
+  ctx->Driver.CopyColorTable = _swrast_CopyColorTable;
+  ctx->Driver.CopyColorSubTable = _swrast_CopyColorSubTable;
+  ctx->Driver.CopyConvolutionFilter1D = _swrast_CopyConvolutionFilter1D;
+  ctx->Driver.CopyConvolutionFilter2D = _swrast_CopyConvolutionFilter2D;
+
+  swdd->SetBuffer = set_buffer;
+
+  /* Pixel/span writing functions: */
+  swdd->WriteRGBASpan        = write_rgba_span;
+  swdd->WriteRGBSpan         = write_rgb_span;
+  swdd->WriteMonoRGBASpan    = write_mono_rgba_span;
+  swdd->WriteRGBAPixels      = write_rgba_pixels;
+  swdd->WriteMonoRGBAPixels  = write_mono_rgba_pixels;
+  swdd->WriteCI32Span        = write_ci32_span;
+  swdd->WriteCI8Span         = write_ci8_span;
+  swdd->WriteMonoCISpan      = write_mono_ci_span;
+  swdd->WriteCI32Pixels      = write_ci32_pixels;
+  swdd->WriteMonoCIPixels    = write_mono_ci_pixels;
+  
+  swdd->ReadCI32Span        = read_ci32_span;
+  swdd->ReadRGBASpan        = read_rgba_span;
+  swdd->ReadCI32Pixels      = read_ci32_pixels;
+  swdd->ReadRGBAPixels      = read_rgba_pixels;
+ 
+}
+
+static void wmesa_update_state( GLcontext *ctx, GLuint new_state )
+{
+  struct swrast_device_driver *swdd = _swrast_GetDeviceDriverReference( ctx );
+  TNLcontext *tnl = TNL_CONTEXT(ctx);
+  
+  /*
+   * XXX these function pointers could be initialized just once during
+   * context creation since they don't depend on any state changes.
+   * kws - This is true - this function gets called a lot and it
+   * would be good to minimize setting all this when not needed.
+   */
+#ifndef SET_FPOINTERS_ONCE  
+  SetFunctionPointers(ctx);
+#if 0
+  ctx->Driver.GetString = get_string;
+  ctx->Driver.UpdateState = wmesa_update_state;
+  ctx->Driver.ResizeBuffers = _swrast_alloc_buffers;
+  ctx->Driver.GetBufferSize = buffer_size;
+  
+  ctx->Driver.Accum = _swrast_Accum;
+  ctx->Driver.Bitmap = _swrast_Bitmap;
+  ctx->Driver.Clear = clear;
+  
+  ctx->Driver.Flush = flush;
+  ctx->Driver.ClearIndex = clear_index;
+  ctx->Driver.ClearColor = clear_color;
+  ctx->Driver.Enable = enable;
+  
+  ctx->Driver.CopyPixels = _swrast_CopyPixels;
+  ctx->Driver.DrawPixels = _swrast_DrawPixels;
+  ctx->Driver.ReadPixels = _swrast_ReadPixels;
+  
+  ctx->Driver.ChooseTextureFormat = _mesa_choose_tex_format;
+  ctx->Driver.TexImage1D = _mesa_store_teximage1d;
+  ctx->Driver.TexImage2D = _mesa_store_teximage2d;
+  ctx->Driver.TexImage3D = _mesa_store_teximage3d;
+  ctx->Driver.TexSubImage1D = _mesa_store_texsubimage1d;
+  ctx->Driver.TexSubImage2D = _mesa_store_texsubimage2d;
+  ctx->Driver.TexSubImage3D = _mesa_store_texsubimage3d;
+  ctx->Driver.TestProxyTexImage = _mesa_test_proxy_teximage;
+  
+  ctx->Driver.CompressedTexImage1D = _mesa_store_compressed_teximage1d;
+  ctx->Driver.CompressedTexImage2D = _mesa_store_compressed_teximage2d;
+  ctx->Driver.CompressedTexImage3D = _mesa_store_compressed_teximage3d;
+  ctx->Driver.CompressedTexSubImage1D = _mesa_store_compressed_texsubimage1d;
+  ctx->Driver.CompressedTexSubImage2D = _mesa_store_compressed_texsubimage2d;
+  ctx->Driver.CompressedTexSubImage3D = _mesa_store_compressed_texsubimage3d;
+
+  ctx->Driver.CopyTexImage1D = _swrast_copy_teximage1d;
+  ctx->Driver.CopyTexImage2D = _swrast_copy_teximage2d;
+  ctx->Driver.CopyTexSubImage1D = _swrast_copy_texsubimage1d;
+  ctx->Driver.CopyTexSubImage2D = _swrast_copy_texsubimage2d;
+  ctx->Driver.CopyTexSubImage3D = _swrast_copy_texsubimage3d;
+  ctx->Driver.CopyColorTable = _swrast_CopyColorTable;
+  ctx->Driver.CopyColorSubTable = _swrast_CopyColorSubTable;
+  ctx->Driver.CopyConvolutionFilter1D = _swrast_CopyConvolutionFilter1D;
+  ctx->Driver.CopyConvolutionFilter2D = _swrast_CopyConvolutionFilter2D;
+  
+  swdd->SetBuffer = set_buffer;
+  
+  /* Pixel/span writing functions: */
+  swdd->WriteRGBASpan        = write_rgba_span;
+  swdd->WriteRGBSpan         = write_rgb_span;
+  swdd->WriteMonoRGBASpan    = write_mono_rgba_span;
+  swdd->WriteRGBAPixels      = write_rgba_pixels;
+  swdd->WriteMonoRGBAPixels  = write_mono_rgba_pixels;
+  swdd->WriteCI32Span        = write_ci32_span;
+  swdd->WriteCI8Span         = write_ci8_span;
+  swdd->WriteMonoCISpan      = write_mono_ci_span;
+  swdd->WriteCI32Pixels      = write_ci32_pixels;
+  swdd->WriteMonoCIPixels    = write_mono_ci_pixels;
+  
+  swdd->ReadCI32Span        = read_ci32_span;
+  swdd->ReadRGBASpan        = read_rgba_span;
+  swdd->ReadCI32Pixels      = read_ci32_pixels;
+  swdd->ReadRGBAPixels      = read_rgba_pixels;
+#endif // 0  
+#endif //  !SET_FPOINTERS_ONCE  
+  tnl->Driver.RunPipeline = _tnl_run_pipeline;
+  
+  _swrast_InvalidateState( ctx, new_state );
+  _swsetup_InvalidateState( ctx, new_state );
+  _ac_InvalidateState( ctx, new_state );
+  _tnl_InvalidateState( ctx, new_state );
+}
+
+
+
+
+/**********************************************************************/
+/*****                  WMesa API Functions                       *****/
+/**********************************************************************/
+
+
+
+#define PAL_SIZE 256
+static void GetPalette(HPALETTE Pal,RGBQUAD *aRGB)
+{
+  int i;
+  HDC hdc;
+  struct
+  {
+    WORD Version;
+    WORD NumberOfEntries;
+    PALETTEENTRY aEntries[PAL_SIZE];
+  } Palette =
+    {
+      0x300,
+      PAL_SIZE
+    };
+  hdc=GetDC(NULL);
+  if (Pal!=NULL)
+    GetPaletteEntries(Pal,0,PAL_SIZE,Palette.aEntries);
+  else
+    GetSystemPaletteEntries(hdc,0,PAL_SIZE,Palette.aEntries);
+  if (GetSystemPaletteUse(hdc) == SYSPAL_NOSTATIC)
+    {
+      for(i = 0; i <PAL_SIZE; i++)
+	Palette.aEntries[i].peFlags = PC_RESERVED;
+      Palette.aEntries[255].peRed = 255;
+      Palette.aEntries[255].peGreen = 255;
+      Palette.aEntries[255].peBlue = 255;
+      Palette.aEntries[255].peFlags = 0;
+      Palette.aEntries[0].peRed = 0;
+      Palette.aEntries[0].peGreen = 0;
+      Palette.aEntries[0].peBlue = 0;
+      Palette.aEntries[0].peFlags = 0;
+    }
+  else
+    {
+      int nStaticColors;
+      int nUsableColors;
+      nStaticColors = GetDeviceCaps(hdc, NUMCOLORS)/2;
+      for (i=0; i<nStaticColors; i++)
+	Palette.aEntries[i].peFlags = 0;
+      nUsableColors = PAL_SIZE-nStaticColors;
+      for (; i<nUsableColors; i++)
+	Palette.aEntries[i].peFlags = PC_RESERVED;
+      for (; i<PAL_SIZE-nStaticColors; i++)
+	Palette.aEntries[i].peFlags = PC_RESERVED;
+      for (i=PAL_SIZE-nStaticColors; i<PAL_SIZE; i++)
+	Palette.aEntries[i].peFlags = 0;
+    }
+  ReleaseDC(NULL,hdc);
+  for (i=0; i<PAL_SIZE; i++)
+    {
+      aRGB[i].rgbRed=Palette.aEntries[i].peRed;
+      aRGB[i].rgbGreen=Palette.aEntries[i].peGreen;
+      aRGB[i].rgbBlue=Palette.aEntries[i].peBlue;
+      aRGB[i].rgbReserved=Palette.aEntries[i].peFlags;
+    }
+}
+
+
+WMesaContext WMesaCreateContext( HWND hWnd, HPALETTE* Pal,
+				 GLboolean rgb_flag,
+				 GLboolean db_flag,
+                                 GLboolean alpha_flag )
+{
+  RECT CR;
+  WMesaContext c;
+  GLboolean true_color_flag;
+
+  c = (struct wmesa_context * ) calloc(1,sizeof(struct wmesa_context));
+  if (!c)
+    return NULL;
+  
+  c->Window=hWnd;
+  c->hDC = GetDC(hWnd);
+  true_color_flag = GetDeviceCaps(c->hDC, BITSPIXEL) > 8;
+#ifdef DDRAW
+  if(true_color_flag) c->rgb_flag = rgb_flag = GL_TRUE;
+#endif
+  
+  
+#ifdef DITHER
+  if ((true_color_flag==GL_FALSE) && (rgb_flag == GL_TRUE)){
+    c->dither_flag = GL_TRUE;
+#ifdef USE_WING
+    c->hPalHalfTone = WinGCreateHalftonePalette();
+#else
+	c->hPalHalfTone = CreateHalftonePalette(c->hDC);
+#endif
+  }
+  else
+    c->dither_flag = GL_FALSE;
+#else
+  c->dither_flag = GL_FALSE;
+#endif
+  
+  
+  if (rgb_flag==GL_FALSE)
+    {
+      c->rgb_flag = GL_FALSE;
+#if 0
+      /* Old WinG stuff???? */
+      c->db_flag = db_flag =GL_TRUE; /* WinG requires double buffering */
+      printf("Single buffer is not supported in color index mode, ",
+	     "setting to double buffer.\n");
+#endif
+    }
+  else
+    {
+      c->rgb_flag = GL_TRUE;
+    }
+  GetClientRect(c->Window,&CR);
+  c->width=CR.right;
+  c->height=CR.bottom;
+  if (db_flag)
+    {
+      c->db_flag = 1;
+      /* Double buffered */
+#ifndef DDRAW
+      {
+	wmCreateBackingStore(c, c->width, c->height);
+	
+      }
+#endif
+    }
+  else
+    {
+      /* Single Buffered */
+      if (c->rgb_flag)
+	c->db_flag = 0;
+    }
+#ifdef DDRAW
+  if (DDInit(c,hWnd) == GL_FALSE) {
+    free( (void *) c );
+    exit(1);
+  }
+#endif
+  
+  
+  c->gl_visual = _mesa_create_visual(rgb_flag,
+				     db_flag,    /* db_flag */
+				     GL_FALSE,   /* stereo */
+				     8,8,8,      /* r, g, b bits */
+                                     alpha_flag ? 8 : 0, /* alpha bits */
+				     0,          /* index bits */
+				     16,         /* depth_bits */
+				     8,          /* stencil_bits */
+				     16,16,16,/* accum_bits */
+                                     alpha_flag ? 16 : 0, /* alpha accum */
+				     1);
+  
+  if (!c->gl_visual) {
+    return NULL;
+  }
+  
+  /* allocate a new Mesa context */
+  c->gl_ctx = _mesa_create_context( c->gl_visual, NULL, (void *) c, GL_FALSE );
+  
+  if (!c->gl_ctx) {
+    _mesa_destroy_visual( c->gl_visual );
+    free(c);
+    return NULL;
+  }
+  
+  _mesa_enable_sw_extensions(c->gl_ctx);
+  _mesa_enable_1_3_extensions(c->gl_ctx);
+  _mesa_enable_1_4_extensions(c->gl_ctx);
+
+  c->gl_buffer = _mesa_create_framebuffer( c->gl_visual,
+					   c->gl_visual->depthBits > 0,
+					   c->gl_visual->stencilBits > 0,
+					   c->gl_visual->accumRedBits > 0,
+					   alpha_flag /* s/w alpha */ );
+  if (!c->gl_buffer) {
+    _mesa_destroy_visual( c->gl_visual );
+    _mesa_free_context_data( c->gl_ctx );
+    free(c);
+    return NULL;
+  }
+  
+  /* Initialize the software rasterizer and helper modules.
+   */
+  {
+    GLcontext *ctx = c->gl_ctx;
+    _swrast_CreateContext( ctx );
+    _ac_CreateContext( ctx );
+    _tnl_CreateContext( ctx );
+    _swsetup_CreateContext( ctx );
+    
+#ifdef SET_FPOINTERS_ONCE
+    SetFunctionPointers(ctx);
+#endif // SET_FPOINTERS_ONCE
+    _swsetup_Wakeup( ctx );
+  }
+#ifdef COMPILE_SETPIXEL
+  ChooseSetPixel(c);
+#endif
+  return c;
+}
+
+void WMesaDestroyContext( void )
+{
+  WMesaContext c = Current;
+  ReleaseDC(c->Window,c->hDC);
+  WC = c;
+  if(c->hPalHalfTone != NULL)
+    DeleteObject(c->hPalHalfTone);
+
+  _swsetup_DestroyContext( c->gl_ctx );
+  _tnl_DestroyContext( c->gl_ctx );
+  _ac_DestroyContext( c->gl_ctx );
+  _swrast_DestroyContext( c->gl_ctx );
+  
+  _mesa_destroy_visual( c->gl_visual );
+  _mesa_destroy_framebuffer( c->gl_buffer );
+  _mesa_free_context_data( c->gl_ctx );
+  free( (void *) c->gl_ctx);
+    
+  if (c->db_flag)
+#ifdef DDRAW
+    DDFree(c);
+#else
+  wmDeleteBackingStore(c);
+#endif
+  free( (void *) c );
+#if !defined(NO_PARALLEL)
+  if(parallelMachine)
+    PRDestroyRenderBuffer();
+#endif
+
+  // Destroyed context no longer valid
+  WMesaMakeCurrent( NULL );
+}
+
+
+void WMesaMakeCurrent( WMesaContext c )
+{
+  if(!c){
+    Current = c;
+    return;
+  }
+  
+  if(Current == c)
+    return;
+  
+  Current = c;
+  wmesa_update_state(c->gl_ctx, 0);
+  _mesa_make_current(c->gl_ctx, c->gl_buffer);
+  if (Current->gl_ctx->Viewport.Width==0) {
+    /* initialize viewport to window size */
+    _mesa_Viewport( 0, 0, Current->width, Current->height );
+    Current->gl_ctx->Scissor.Width = Current->width;
+    Current->gl_ctx->Scissor.Height = Current->height;
+  }
+  if ((c->cColorBits <= 8 ) && (c->rgb_flag == GL_TRUE)){
+    WMesaPaletteChange(c->hPalHalfTone);
+  }
+}
+
+
+
+void WMesaSwapBuffers( void )
+{
+  HDC DC = Current->hDC;
+  GET_CURRENT_CONTEXT(ctx);
+  
+  /* If we're swapping the buffer associated with the current context
+   * we have to flush any pending rendering commands first.
+   */
+  if (Current && Current->gl_ctx == ctx)
+    _mesa_notifySwapBuffers(ctx);
+  
+  if (Current->db_flag)
+    wmFlush(Current);
+}
+
+
+
+void WMesaPaletteChange(HPALETTE Pal)
+{
+#ifndef DDRAW
+  int vRet;
+#endif
+  LPPALETTEENTRY pPal;
+  if (Current && (Current->rgb_flag==GL_FALSE || 
+		  Current->dither_flag == GL_TRUE))
+    {
+      pPal = (PALETTEENTRY *)malloc( 256 * sizeof(PALETTEENTRY));
+      Current->hPal=Pal;
+      GetPaletteEntries( Pal, 0, 256, pPal );
+#ifdef DDRAW
+      Current->lpDD->lpVtbl->CreatePalette(Current->lpDD,DDPCAPS_8BIT,
+					   pPal, &(Current->lpDDPal), NULL);
+      if (Current->lpDDPal)
+	Current->lpDDSPrimary->lpVtbl->SetPalette(Current->lpDDSPrimary,
+						  Current->lpDDPal);
+#else
+      vRet = SetDIBColorTable(Current->dib.hDC, 0, 256, (RGBQUAD*)pPal);
+#endif
+      free( pPal );
+    }
+}
+
+
+
+
+static unsigned char threeto8[8] = {
+  0, 0111>>1, 0222>>1, 0333>>1, 0444>>1, 0555>>1, 0666>>1, 0377
+};
+
+static unsigned char twoto8[4] = {
+  0, 0x55, 0xaa, 0xff
+};
+
+static unsigned char oneto8[2] = {
+  0, 255
+};
+
+static unsigned char componentFromIndex(UCHAR i, UINT nbits, UINT shift)
+{
+  unsigned char val;
+  
+  val = i >> shift;
+  switch (nbits) {
+    
+  case 1:
+    val &= 0x1;
+    return oneto8[val];
+    
+  case 2:
+    val &= 0x3;
+    return twoto8[val];
+    
+  case 3:
+    val &= 0x7;
+    return threeto8[val];
+    
+  default:
+    return 0;
+  }
+}
+
+void wmCreatePalette( PWMC pwdc )
+{
+  /* Create a compressed and re-expanded 3:3:2 palette */
+  int            i;
+  LOGPALETTE     *pPal;
+  BYTE           rb, rs, gb, gs, bb, bs;
+  
+  pwdc->nColors = 0x100;
+  
+  pPal = (PLOGPALETTE)malloc(sizeof(LOGPALETTE) + 
+			     pwdc->nColors * sizeof(PALETTEENTRY));
+  memset( pPal, 0, sizeof(LOGPALETTE) + pwdc->nColors * sizeof(PALETTEENTRY) );
+  
+  pPal->palVersion = 0x300;
+  
+  rb = REDBITS;
+  rs = REDSHIFT;
+  gb = GREENBITS;
+  gs = GREENSHIFT;
+  bb = BLUEBITS;
+  bs = BLUESHIFT;
+  
+  if (pwdc->db_flag) {
+    
+    /* Need to make two palettes: one for the screen DC and one for the DIB. */
+    pPal->palNumEntries = pwdc->nColors;
+    for (i = 0; i < pwdc->nColors; i++) {
+      pPal->palPalEntry[i].peRed = componentFromIndex( i, rb, rs );
+      pPal->palPalEntry[i].peGreen = componentFromIndex( i, gb, gs );
+      pPal->palPalEntry[i].peBlue = componentFromIndex( i, bb, bs );
+      pPal->palPalEntry[i].peFlags = 0;
+    }
+    pwdc->hGLPalette = CreatePalette( pPal );
+    pwdc->hPalette = CreatePalette( pPal );
+  }
+  
+  else {
+    pPal->palNumEntries = pwdc->nColors;
+    for (i = 0; i < pwdc->nColors; i++) {
+      pPal->palPalEntry[i].peRed = componentFromIndex( i, rb, rs );
+      pPal->palPalEntry[i].peGreen = componentFromIndex( i, gb, gs );
+      pPal->palPalEntry[i].peBlue = componentFromIndex( i, bb, bs );
+      pPal->palPalEntry[i].peFlags = 0;
+    }
+    pwdc->hGLPalette = CreatePalette( pPal );
+  }
+  
+  free(pPal);
+  
+}
+
+
+void 
+#ifdef COMPILE_SETPIXEL
+
+wmSetPixelDefault(PWMC pwc, int iScanLine, int iPixel, BYTE r, BYTE g, BYTE b)
+{
+	if (Current->db_flag)
+	{
+#ifdef DDRAW
+		HDC hdc = NULL;
+		Current->lpDDSOffScreen->lpVtbl->Unlock(Current->lpDDSOffScreen,NULL);
+		Current->lpDDSOffScreen->lpVtbl->GetDC(Current->lpDDSOffScreen,&hdc);
+		SetPixelV(hdc,iPixel, iScanLine, RGB(r,g,b));
+		Current->lpDDSOffScreen->lpVtbl->ReleaseDC(Current->lpDDSOffScreen,hdc);
+		while (Current->lpDDSOffScreen->lpVtbl->Lock(Current->lpDDSOffScreen,NULL, &(Current->ddsd), 0, NULL) == DDERR_WASSTILLDRAWING);
+#else
+		SetPixelV(Current->hDC, iPixel, iScanLine, RGB(r,g,b));
+#endif
+	}
+	else
+	{
+		SetPixelV(Current->hDC, iPixel+pwc->rectSurface.left, pwc->rectSurface.top+iScanLine, RGB(r,g,b));
+	}
+}
+#else
+wmSetPixel(PWMC pwc, int iScanLine, int iPixel, BYTE r, BYTE g, BYTE b)
+{
+	if (Current->db_flag)
+	{
+		LPBYTE  lpb = pwc->pbPixels;
+		UINT    nBypp = pwc->cColorBits >> 3;
+    
+		lpb += pwc->ScanWidth * iScanLine;
+		lpb += iPixel * nBypp;
+    
+		if(nBypp == 1)
+		{
+			if(pwc->dither_flag)
+				*lpb = DITHER_RGB_2_8BIT(r,g,b,iScanLine,iPixel);
+			else
+				*lpb = BGR8(r,g,b);
+		}
+		else if(nBypp == 2)
+			*((LPWORD)lpb) = BGR16(r,g,b);
+		else if (nBypp == 3)
+			{
+			*lpb++ = b;
+			*lpb++ = g;
+			*lpb   = r;
+			}
+		else if (nBypp == 4)
+			*((LPDWORD)lpb) = BGR32(r,g,b);
+	}
+	else
+	{
+		SetPixel(Current->hDC, iPixel, iScanLine, RGB(r,g,b));
+	}
+}
+#endif
+#ifdef COMPILE_SETPIXEL
+void wmSetPixel4(PWMC pwc, int iScanLine, int iPixel, BYTE r, BYTE g, BYTE b)
+{
+	LPDWORD lpdw = ((LPDWORD)(pwc->pbPixels + pwc->ScanWidth * iScanLine)) + iPixel;
+	*lpdw = BGR32(r,g,b);
+//	LPBYTE  lpb = pwc->pbPixels + pwc->ScanWidth * iScanLine + iPixel + iPixel + iPixel + iPixel;
+//	*((LPDWORD)lpb) = BGR32(r,g,b);
+}
+
+void wmSetPixel3(PWMC pwc, int iScanLine, int iPixel, BYTE r, BYTE g, BYTE b)
+{
+	LPBYTE  lpb = pwc->pbPixels + pwc->ScanWidth * iScanLine + iPixel + iPixel + iPixel;
+	*lpb++ = b;
+	*lpb++ = g;
+	*lpb   = r;
+}
+
+void wmSetPixel2(PWMC pwc, int iScanLine, int iPixel, BYTE r, BYTE g, BYTE b)
+{
+	LPWORD lpw = ((LPWORD)(pwc->pbPixels + pwc->ScanWidth * iScanLine)) + iPixel;
+	*lpw = BGR16(r,g,b);
+//	LPBYTE  lpb = pwc->pbPixels + pwc->ScanWidth * iScanLine + iPixel + iPixel;
+//	*((LPWORD)lpb) = BGR16(r,g,b);
+}
+
+void wmSetPixel1(PWMC pwc, int iScanLine, int iPixel, BYTE r, BYTE g, BYTE b)
+{
+	LPBYTE  lpb = pwc->pbPixels + pwc->ScanWidth * iScanLine + iPixel;
+	*lpb = BGR8(r,g,b);
+}
+
+void wmSetPixel1Dither(PWMC pwc, int iScanLine, int iPixel, BYTE r, BYTE g, BYTE b)
+{
+	LPBYTE  lpb = pwc->pbPixels + pwc->ScanWidth * iScanLine + iPixel;
+	*lpb = DITHER_RGB_2_8BIT(r,g,b,iScanLine,iPixel);
+}
+
+
+void ChooseSetPixel(PWMC pwc)
+{
+	UINT nBypp = (pwc ) ? pwc->cColorBits >> 3 : 0;
+	switch(nBypp)
+	{
+		case 1:
+			pwc->wmSetPixel = pwc->dither_flag ? &wmSetPixel1Dither : &wmSetPixel1;
+			break;
+		case 2:
+			pwc->wmSetPixel = &wmSetPixel2;
+			break;
+		case 3:
+			pwc->wmSetPixel = &wmSetPixel3;
+			break;
+		case 4:
+			pwc->wmSetPixel = &wmSetPixel4;
+			break;
+		default:
+			pwc->wmSetPixel = &wmSetPixelDefault;
+			break;
+	}
+}
+
+#endif
+
+void  wmCreateDIBSection(
+  HDC   hDC,
+  PWMC pwc,    // handle of device context
+  CONST BITMAPINFO *pbmi,  // bitmap size, format, and color data
+  UINT iUsage  // color data type indicator: RGB values or palette indices
+  )
+{
+  DWORD   dwSize = 0;
+  DWORD   dwScanWidth;
+  UINT    nBypp = pwc->cColorBits / 8;
+  HDC     hic;
+  
+  dwScanWidth = (((pwc->ScanWidth * nBypp)+ 3) & ~3);
+  
+  pwc->ScanWidth =pwc->pitch = dwScanWidth;
+  
+  if (stereo_flag)
+    pwc->ScanWidth = 2* pwc->pitch;
+  
+  dwSize = sizeof(BITMAPINFO) + (dwScanWidth * pwc->height);
+#ifdef USE_MAPPED_FILE  
+  pwc->dib.hFileMap = CreateFileMapping((HANDLE)PAGE_FILE,
+					NULL,
+					PAGE_READWRITE | SEC_COMMIT,
+					0,
+					dwSize,
+					NULL);
+  
+  if (!pwc->dib.hFileMap)
+    return;
+  
+  pwc->dib.base = MapViewOfFile(pwc->dib.hFileMap,
+				FILE_MAP_ALL_ACCESS,
+				0,
+				0,
+				0);
+  
+  if(!pwc->dib.base){
+    CloseHandle(pwc->dib.hFileMap);
+    return;
+  }
+
+
+  CopyMemory(pwc->dib.base, pbmi, sizeof(BITMAPINFO));
+#endif // USE_MAPPED_FILE
+  
+  hic = CreateIC("display", NULL, NULL, NULL);
+  pwc->dib.hDC = CreateCompatibleDC(hic);
+  
+#ifdef USE_MAPPED_FILE  
+
+  pwc->hbmDIB = CreateDIBSection(hic,
+				 &(pwc->bmi),
+				 (iUsage ? DIB_PAL_COLORS : DIB_RGB_COLORS),
+				 &(pwc->pbPixels),
+				 pwc->dib.hFileMap,
+				 0);
+#else
+  pwc->hbmDIB = CreateDIBSection(hic,
+				 &(pwc->bmi),
+				 (iUsage ? DIB_PAL_COLORS : DIB_RGB_COLORS),
+				 &(pwc->pbPixels),
+				 0,
+				 0);
+#endif // USE_MAPPED_FILE
+  pwc->ScreenMem = pwc->addrOffScreen = pwc->pbPixels;
+  pwc->hOldBitmap = SelectObject(pwc->dib.hDC, pwc->hbmDIB);
+  
+  DeleteDC(hic);
+  
+  return;
+  
+}
+
+/*
+ * Blit memory DC to screen DC
+ */
+BOOL wmFlush(PWMC pwc)
+{
+  BOOL    bRet = 0;
+  DWORD   dwErr = 0;
+#ifdef DDRAW
+  HRESULT             ddrval;
+#endif
+  
+  if(pwc->db_flag){
+#ifdef DDRAW
+    if (pwc->lpDDSOffScreen == NULL)
+      if(DDCreateOffScreen(pwc) == GL_FALSE)
+	return FALSE;
+    
+    pwc->lpDDSOffScreen->lpVtbl->Unlock(pwc->lpDDSOffScreen, NULL);
+    
+    while( 1 )
+      {
+	ddrval = pwc->lpDDSPrimary->lpVtbl->Blt( pwc->lpDDSPrimary,
+						 &(pwc->rectSurface), 
+						 pwc->lpDDSOffScreen, 
+						 &(pwc->rectOffScreen), 
+						 0, NULL );
+	
+	if( ddrval == DD_OK )
+	  {
+	    break;
+	  }
+	if( ddrval == DDERR_SURFACELOST )
+	  {
+	    if(!DDRestoreAll(pwc))
+	      {
+		break;
+	      }
+	  }
+	if( ddrval != DDERR_WASSTILLDRAWING )
+	  {
+	    break;
+	  }
+      }
+    
+    while (pwc->lpDDSOffScreen->lpVtbl->Lock(pwc->lpDDSOffScreen,
+					     NULL, &(pwc->ddsd), 0, NULL) == 
+	   DDERR_WASSTILLDRAWING)
+      ;
+    
+    if(ddrval != DD_OK)
+      dwErr = GetLastError();
+#else
+    bRet = BitBlt(pwc->hDC, 0, 0, pwc->width, pwc->height,
+		  pwc->dib.hDC, 0, 0, SRCCOPY);
+#endif
+  }
+  
+  return(TRUE);
+  
+}
+
+
+/* The following code is added by Li Wei to enable stereo display */
+
+#if !defined(NO_STEREO)
+
+static void __gluMakeIdentityf(GLfloat m[16])
+{
+    m[0+4*0] = 1; m[0+4*1] = 0; m[0+4*2] = 0; m[0+4*3] = 0;
+    m[1+4*0] = 0; m[1+4*1] = 1; m[1+4*2] = 0; m[1+4*3] = 0;
+    m[2+4*0] = 0; m[2+4*1] = 0; m[2+4*2] = 1; m[2+4*3] = 0;
+    m[3+4*0] = 0; m[3+4*1] = 0; m[3+4*2] = 0; m[3+4*3] = 1;
+}
+
+static void normalize(float v[3])
+{
+    float r;
+
+    r = sqrt( v[0]*v[0] + v[1]*v[1] + v[2]*v[2] );
+    if (r == 0.0) return;
+
+    v[0] /= r;
+    v[1] /= r;
+    v[2] /= r;
+}
+
+static void cross(float v1[3], float v2[3], float result[3])
+{
+    result[0] = v1[1]*v2[2] - v1[2]*v2[1];
+    result[1] = v1[2]*v2[0] - v1[0]*v2[2];
+    result[2] = v1[0]*v2[1] - v1[1]*v2[0];
+}
+
+
+static void 
+__gluLookAt(GLdouble eyex, GLdouble eyey, GLdouble eyez, GLdouble centerx,
+	  GLdouble centery, GLdouble centerz, GLdouble upx, GLdouble upy,
+	  GLdouble upz)
+{
+    int i;
+    float forward[3], side[3], up[3];
+    GLfloat m[4][4];
+
+    forward[0] = centerx - eyex;
+    forward[1] = centery - eyey;
+    forward[2] = centerz - eyez;
+
+    up[0] = upx;
+    up[1] = upy;
+    up[2] = upz;
+
+    normalize(forward);
+
+    /* Side = forward x up */
+    cross(forward, up, side);
+    normalize(side);
+
+    /* Recompute up as: up = side x forward */
+    cross(side, forward, up);
+
+    __gluMakeIdentityf(&m[0][0]);
+    m[0][0] = side[0];
+    m[1][0] = side[1];
+    m[2][0] = side[2];
+
+    m[0][1] = up[0];
+    m[1][1] = up[1];
+    m[2][1] = up[2];
+
+    m[0][2] = -forward[0];
+    m[1][2] = -forward[1];
+    m[2][2] = -forward[2];
+
+    glMultMatrixf(&m[0][0]);
+    glTranslated(-eyex, -eyey, -eyez);
+}
+
+GLfloat viewDistance = 1.0;
+
+void WMesaShowStereo(GLuint list)
+{
+  
+  GLbitfield mask = GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT;
+  GLfloat cm[16];
+  GLint matrix_mode;
+  /* Must use double Buffer */
+  if( ! Current-> db_flag )
+    return;
+  
+  
+  glGetIntegerv(GL_MATRIX_MODE,&matrix_mode);
+  
+  WMesaViewport(Current->gl_ctx,0,Current->height/2,
+		Current->width,Current->height/2);
+  if(matrix_mode!=GL_MODELVIEW)
+    glMatrixMode(GL_MODELVIEW);
+  
+  glGetFloatv(GL_MODELVIEW_MATRIX,cm);
+  glLoadIdentity();
+  __gluLookAt(viewDistance/2,0.0,0.0 ,
+	    viewDistance/2,0.0,-1.0,
+	    0.0,1.0,0.0 );
+  glMultMatrixf( cm );
+  
+  Current->ScreenMem = Current->pbPixels = Current->addrOffScreen;
+  glCallList( list );
+  
+  glGetFloatv(GL_MODELVIEW_MATRIX,cm);
+  glLoadIdentity();
+  __gluLookAt(-viewDistance/2,0.0,0.0 ,
+	    -viewDistance/2,0.0,-1.0,
+	    0.0,1.0,0.0 );
+  glMultMatrixf(cm);
+  
+  Current->ScreenMem = Current->pbPixels = Current->addrOffScreen + Current->pitch;
+  glCallList(list);
+  if(matrix_mode!=GL_MODELVIEW)
+    glMatrixMode(matrix_mode);
+  
+  glFlush();
+  
+  WMesaViewport(Current->gl_ctx,0,0,Current->width,Current->height);
+  WMesaSwapBuffers();
+}
+
+void toggleStereoMode()
+{
+  if(!Current->db_flag)
+    return;
+  if(!stereo_flag){
+    stereo_flag = 1;
+    if(stereoBuffer==GL_FALSE)
+#if !defined(NO_PARALLEL)
+      if(!parallelFlag)
+#endif
+	{
+	  Current->ScanWidth = Current->pitch*2;
+	}
+  }
+  else {
+    stereo_flag = 0;
+#if !defined(NO_PARALLEL)
+    if(!parallelFlag)
+#endif
+      Current->ScanWidth = Current->pitch;
+    Current->pbPixels = Current->addrOffScreen;
+  }
+}
+
+/* if in stereo mode, the following function is called */
+void glShowStereo(GLuint list)
+{
+  WMesaShowStereo(list);
+}
+
+#endif /* NO_STEREO */
+
+#if !defined(NO_PARALLEL)
+
+void toggleParallelMode(void)
+{
+  if(!parallelFlag){
+    parallelFlag = GL_TRUE;
+    if(parallelMachine==GL_FALSE){
+      PRCreateRenderBuffer( Current->rgb_flag? GL_RGBA :GL_COLOR_INDEX,
+			    Current->cColorBits/8,
+			    Current->width ,Current->height,
+			    Current->ScanWidth,
+			    Current->rgb_flag? Current->pbPixels: 
+			    Current->ScreenMem);
+      parallelMachine = GL_TRUE;
+    }
+  }
+  else {
+    parallelFlag = GL_FALSE;
+    if(parallelMachine==GL_TRUE){
+      PRDestroyRenderBuffer();
+      parallelMachine=GL_FALSE;
+      ReadyForNextFrame = GL_TRUE;
+    }
+    
+    /***********************************************
+     * Seems something wrong!!!!
+     ************************************************/
+    
+    WMesaMakeCurrent(Current);
+#if !defined(NO_STEREO)
+    stereo_flag = GL_FALSE ;
+#endif
+  }
+}
+
+void PRShowRenderResult(void)
+{
+  int flag = 0;
+  if(!glImageRendered())
+    return;
+  
+  if (parallelFlag)
+    {
+      WMesaSwapBuffers();
+    }
+  
+}
+#endif /* NO_PARALLEL */
+
+BYTE DITHER_RGB_2_8BIT( int red, int green, int blue, int pixel, int scanline)
+{
+  char unsigned redtemp, greentemp, bluetemp, paletteindex;
+  
+  //*** now, look up each value in the halftone matrix
+  //*** using an 8x8 ordered dither.
+  redtemp = aDividedBy51[red]
+    + (aModulo51[red] > aHalftone8x8[(pixel%8)*8
+				    + scanline%8]);
+  greentemp = aDividedBy51[(char unsigned)green]
+    + (aModulo51[green] > aHalftone8x8[
+      (pixel%8)*8 + scanline%8]);
+  bluetemp = aDividedBy51[(char unsigned)blue]
+    + (aModulo51[blue] > aHalftone8x8[
+      (pixel%8)*8 +scanline%8]);
+  
+  //*** recombine the halftoned rgb values into a palette index
+  paletteindex =
+    redtemp + aTimes6[greentemp] + aTimes36[bluetemp];
+  
+  //*** and translate through the wing halftone palette
+  //*** translation vector to give the correct value.
+  return aWinGHalftoneTranslation[paletteindex];
+}
+
+#ifdef DDRAW
+/*
+ * restoreAll
+ *
+ * restore all lost objects
+ */
+HRESULT DDRestoreAll( WMesaContext wc )
+{
+  HRESULT     ddrval;
+  
+  ddrval = wc->lpDDSPrimary->lpVtbl->Restore(wc->lpDDSPrimary);
+  if( ddrval == DD_OK )
+    {
+      ddrval = wc->lpDDSOffScreen->lpVtbl->Restore(wc->lpDDSOffScreen);
+    }
+  return ddrval;
+  
+} /* restoreAll */
+
+
+/*
+ * This function is called if the initialization function fails
+ */
+BOOL initFail( HWND hwnd, WMesaContext wc )
+{
+  DDFree(wc);
+  MessageBox( hwnd, "DirectDraw Init FAILED", "", MB_OK );
+  return FALSE;
+  
+} /* initFail */
+
+
+static void DDDeleteOffScreen(WMesaContext wc)
+{
+  if( wc->lpDDSOffScreen != NULL )
+    {
+      wc->lpDDSOffScreen->lpVtbl->Unlock(wc->lpDDSOffScreen,NULL);
+      wc->lpDDSOffScreen->lpVtbl->Release(wc->lpDDSOffScreen);
+      wc->lpDDSOffScreen = NULL;
+    }
+  
+}
+
+static void DDFreePrimarySurface(WMesaContext wc)
+{
+  if( wc->lpDDSPrimary != NULL )
+    {
+      if(wc->db_flag == GL_FALSE)
+	wc->lpDDSPrimary->lpVtbl->ReleaseDC(wc->lpDDSPrimary, wc->hDC);
+      wc->lpDDSPrimary->lpVtbl->Release(wc->lpDDSPrimary);
+      wc->lpDDSPrimary = NULL;
+    }
+}
+
+static BOOL DDCreatePrimarySurface(WMesaContext wc)
+{
+  HRESULT ddrval;
+//  DDSCAPS             ddscaps;
+  wc->ddsd.dwSize = sizeof( wc->ddsd );
+  wc->ddsd.dwFlags = DDSD_CAPS;
+  wc->ddsd.ddsCaps.dwCaps =   DDSCAPS_PRIMARYSURFACE;
+  
+  ddrval = wc->lpDD->lpVtbl->CreateSurface( wc->lpDD,&(wc->ddsd), 
+					    &(wc->lpDDSPrimary), NULL );
+  if( ddrval != DD_OK )
+    {
+      return initFail(wc->hwnd , wc);
+    }
+  if(wc->db_flag == GL_FALSE)
+    wc->lpDDSPrimary->lpVtbl->GetDC(wc->lpDDSPrimary, &(wc->hDC));
+  return TRUE;
+}
+
+static BOOL DDCreateOffScreen(WMesaContext wc)
+{
+  POINT   pt;
+  HRESULT     ddrval;
+  if(wc->lpDD == NULL)
+    return FALSE;
+  GetClientRect( wc->hwnd, &(wc->rectOffScreen) );
+  wc->ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH;
+  wc->ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN;
+  wc->ddsd.dwHeight = wc->rectOffScreen.bottom - wc->rectOffScreen.top;
+  wc->ddsd.dwWidth = wc->rectOffScreen.right - wc->rectOffScreen.left;
+  
+  ddrval = wc->lpDD->lpVtbl->CreateSurface( wc->lpDD, &(wc->ddsd), 
+					    &(wc->lpDDSOffScreen), NULL );
+  if( ddrval != DD_OK )
+    {
+      return FALSE;
+    }
+  
+  while (wc->lpDDSOffScreen->lpVtbl->Lock(wc->lpDDSOffScreen,NULL, 
+					  &(wc->ddsd), 0, NULL) == 
+	 DDERR_WASSTILLDRAWING)
+    ;
+  
+  if(wc->ddsd.lpSurface==NULL)
+    return initFail(wc->hwnd, wc);
+  
+  wc->ScreenMem = wc->pbPixels = wc->addrOffScreen = 
+    (PBYTE)(wc->ddsd.lpSurface);
+  wc->ScanWidth = wc->pitch = wc->ddsd.lPitch;
+  if (stereo_flag)
+    wc->ScanWidth = wc->ddsd.lPitch*2;
+  
+  GetClientRect( wc->hwnd, &(wc->rectSurface) );
+  pt.x = pt.y = 0;
+  ClientToScreen( wc->hwnd, &pt );
+  OffsetRect(&(wc->rectSurface), pt.x, pt.y);
+  wmSetPixelFormat(wc, wc->hDC);
+  return TRUE;
+}
+
+typedef
+struct tagWMesaContextList
+{
+	WMesaContext wc;
+	struct tagWMesaContextList *next;
+}WMesaContextList;
+
+WMesaContextList *head = 0;
+
+void AddContext(WMesaContext wc)
+{
+	WMesaContextList *lst = (WMesaContextList *)malloc(sizeof(WMesaContextList));
+	lst->wc = wc;
+	if( head )
+		lst->next = head;
+	head = lst;
+}
+
+WMesaContext FindContext(HWND hWnd)
+{
+	WMesaContextList *tmp = head;
+	while(tmp)
+	{
+		if( tmp->wc->hwnd == hWnd )
+			return tmp->wc;
+		tmp = tmp->next;
+	}
+	return NULL;
+}
+
+void RemoveContext(HWND hWnd)
+{
+	WMesaContextList *tmp = head;
+	if(tmp )
+	{
+		if( tmp->wc->hwnd == hWnd )
+		{
+			WMesaContextList *lst = tmp;
+
+			head = tmp->next;
+			free((void *)lst);
+		}
+		else
+			while(tmp->next)
+			{
+				if( tmp->next->wc->hwnd == hWnd )
+				{
+					WMesaContextList *lst = tmp->next;
+					tmp->next = tmp->next->next;
+					free((void *)lst);
+				}
+				tmp = tmp->next;
+			}
+	}
+}
+
+static LRESULT CALLBACK MyWndProc(HWND hwnd,UINT message,WPARAM wParam, LPARAM lParam)
+{
+	WMesaContext wc;
+
+	if (Current==0 || Current->hwnd != hwnd)
+		wc=FindContext(hwnd);
+	else
+		wc=Current;
+
+
+	 if( wc )
+	 {
+		LRESULT lret = CallWindowProc((WNDPROC)(wc->oldWndProc),hwnd,message,wParam,lParam);
+		if( message = WM_MOVE )
+		{
+			 POINT pt = {0};
+			GetClientRect( wc->hwnd, &(wc->rectSurface) );
+			ClientToScreen( hwnd, &pt );
+			OffsetRect(&(wc->rectSurface), pt.x, pt.y);
+		 }
+		return lret;
+	}
+	 return 0L;
+}
+
+/*
+ * doInit - do work required for every instance of the application:
+ *                create the window, initialize data
+ */
+static BOOL DDInit( WMesaContext wc, HWND hwnd)
+{
+  HRESULT             ddrval;
+//  DWORD dwFrequency;
+  
+//  LPDIRECTDRAW            lpDD;           // DirectDraw object
+//  LPDIRECTDRAW2            lpDD2;
+  LPDIRECTDRAWCLIPPER pcClipper = NULL;
+  
+  wc->fullScreen = displayOptions.fullScreen;
+  wc->gMode = displayOptions.mode;
+  wc->hwnd = hwnd;
+  stereo_flag = displayOptions.stereo;
+  if(wc->db_flag!= GL_TRUE)
+    stereo_flag = GL_FALSE;
+  /*
+   * create the main DirectDraw object
+   */
+  ddrval = DirectDrawCreate( NULL, &(wc->lpDD), NULL );
+  if( ddrval != DD_OK )
+    {
+      return initFail(hwnd,wc);
+    }
+  
+  // Get exclusive mode if requested
+  if(wc->fullScreen)
+    {
+      ddrval = wc->lpDD->lpVtbl->SetCooperativeLevel( wc->lpDD, hwnd, 
+						      DDSCL_EXCLUSIVE | 
+						      DDSCL_FULLSCREEN );
+    }
+  else
+    {
+      ddrval = wc->lpDD->lpVtbl->SetCooperativeLevel( wc->lpDD, hwnd, 
+						      DDSCL_NORMAL );
+    }
+  if( ddrval != DD_OK )
+    {
+      return initFail(hwnd , wc);
+    }
+  
+  
+  if(ddrval != DD_OK)
+    return initFail(hwnd , wc);
+  
+  
+  switch( wc->gMode )
+    {
+    case 1:  
+      ddrval = wc->lpDD->lpVtbl->SetDisplayMode( wc->lpDD, 640, 480, 
+						 displayOptions.bpp); 
+      break;
+    case 2:  
+      ddrval = wc->lpDD->lpVtbl->SetDisplayMode( wc->lpDD, 800, 600, 
+						 displayOptions.bpp); 
+      break;
+    case 3:  
+      ddrval = wc->lpDD->lpVtbl->SetDisplayMode( wc->lpDD, 1024, 768, 
+						 displayOptions.bpp); 
+      break;
+    case 4:  
+      ddrval = wc->lpDD->lpVtbl->SetDisplayMode( wc->lpDD, 1152, 864, 
+						 displayOptions.bpp); 
+      break;
+    case 5:  
+      ddrval = wc->lpDD->lpVtbl->SetDisplayMode( wc->lpDD, 1280, 1024, 
+						 displayOptions.bpp); 
+      break;
+    }
+
+  if( ddrval != DD_OK )
+    {
+      printf("Can't modify display mode, current mode used\n");
+    }
+  switch(ddrval){
+  case DDERR_INVALIDOBJECT:
+    break;
+  case DDERR_INVALIDPARAMS:
+    break;
+  case DDERR_UNSUPPORTEDMODE:
+    ;
+  }
+  
+  if(DDCreatePrimarySurface(wc) == GL_FALSE)
+    return initFail(hwnd, wc);
+  
+  if(wc->db_flag)
+    DDCreateOffScreen(wc);
+
+    if( FAILED( ddrval = wc->lpDD->lpVtbl->CreateClipper(wc->lpDD, 0, &pcClipper, NULL ) ) )
+        return E_FAIL;
+
+    if( FAILED( ddrval = pcClipper->lpVtbl->SetHWnd(pcClipper,  0, wc->hwnd ) ) )
+    {
+        pcClipper->lpVtbl->Release(pcClipper);
+        return E_FAIL;
+    }
+
+    if( FAILED( ddrval = wc->lpDDSPrimary->lpVtbl->SetClipper(wc->lpDDSPrimary,  pcClipper ) ) )
+    {
+        pcClipper->lpVtbl->Release(pcClipper);
+        return E_FAIL;
+    }
+
+    // Done with clipper
+    pcClipper->lpVtbl->Release(pcClipper);
+	AddContext(wc);
+	// Hook the window so we can update the drawing rectangle when the window moves
+	wc->oldWndProc = SetWindowLong(wc->hwnd,GWL_WNDPROC,(LONG)MyWndProc);
+
+	return TRUE;
+
+} /* DDInit */
+
+static void DDFree( WMesaContext wc)
+{
+  RemoveContext(wc->hwnd);
+  SetWindowLong(wc->hwnd,GWL_WNDPROC,(LONG)(wc->oldWndProc));
+  wc->oldWndProc = 0;
+  if( wc->lpDD != NULL )
+    {
+      DDFreePrimarySurface(wc);
+      DDDeleteOffScreen(wc);
+      wc->lpDD->lpVtbl->Release(wc->lpDD);
+      wc->lpDD = NULL;
+    }
+  // Clean up the screen on exit
+  RedrawWindow( NULL, NULL, NULL, RDW_INVALIDATE | RDW_ERASE |
+		RDW_ALLCHILDREN );
+  
+}
+#endif
+
+void WMesaMove(void)
+{
+  WMesaContext wc = Current;
+  POINT   pt;
+  if (Current != NULL){
+    GetClientRect( wc->hwnd, &(wc->rectSurface) );
+    pt.x = pt.y = 0;
+    ClientToScreen( wc->hwnd, &pt );
+    OffsetRect(&(wc->rectSurface), pt.x, pt.y);
+  }
+}
+
+
+/************************************************
+ * Mesa 4.0 - These triangle rasterizers are not
+ * implemented in this version of the Windows
+ * driver.  They could be implemented for a
+ * potential performance improvement.
+ * See OSMesa for an example of the approach
+ * to use.
+ * This old code is left in this file in case
+ * it is useful.  However, it may end up looking
+ * a lot more like the OSMesa code.
+ ************************************************/
+
+
+#if defined(FAST_RASTERIZERS)
+
+
+/*
+ * Like PACK_8A8B8G8R() but don't use alpha.  This is usually an acceptable
+ * shortcut.
+ */
+#define PACK_8B8G8R( R, G, B )   ( ((B) << 16) | ((G) << 8) | (R) )
+
+/**********************************************************************/
+/***                   Triangle rendering                            ***/
+/**********************************************************************/
+
+/*
+ * XImage, smooth, depth-buffered, PF_8A8B8G8R triangle.
+ */
+static void smooth_8A8B8G8R_z_triangle( GLcontext *ctx,
+                                       GLuint v0, GLuint v1, GLuint v2,
+                                       GLuint pv )
+{
+    WMesaContext wmesa = (WMesaContext) ctx->DriverCtx;
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define INTERP_RGB 1
+#define PIXEL_ADDRESS(X,Y) PIXELADDR4(X,Y)
+#define PIXEL_TYPE GLuint
+    //#define BYTES_PER_ROW (wmesa->xm_buffer->backimage->bytes_per_line)
+#define BYTES_PER_ROW (wmesa->ScanWidth)
+#define INNER_LOOP( LEFT, RIGHT, Y )                    \
+    {                                   \
+    GLint i, len = RIGHT-LEFT;                      \
+    for (i=0;i<len;i++) {                       \
+    GLdepth z = FixedToDepth(ffz);                  \
+    if (z < zRow[i]) {                      \
+    pRow[i] = PACK_8B8G8R( FixedToInt(ffr), FixedToInt(ffg),    \
+    FixedToInt(ffb) );          \
+    zRow[i] = z;                            \
+    }                                   \
+    ffr += fdrdx;  ffg += fdgdx;  ffb += fdbdx;         \
+    ffz += fdzdx;                           \
+    }                                   \
+    }
+
+#ifdef __MINGW32__
+	#include "tritemp.h"
+#else
+
+	#ifdef WIN32
+//		#include "..\tritemp.h"
+	#else
+		#include "tritemp.h"
+	#endif
+#endif
+}
+
+
+/*
+* XImage, smooth, depth-buffered, PF_8R8G8B triangle.
+*/
+static void smooth_8R8G8B_z_triangle( GLcontext *ctx,
+                                     GLuint v0, GLuint v1, GLuint v2,
+                                     GLuint pv )
+{
+    WMesaContext wmesa = (WMesaContext) ctx->DriverCtx;
+#define INTERP_Z 1
+#define INTERP_RGB 1
+#define PIXEL_ADDRESS(X,Y) PIXELADDR4(X,Y)
+#define PIXEL_TYPE GLuint
+    //#define BYTES_PER_ROW (wmesa->xm_buffer->backimage->bytes_per_line)
+#define BYTES_PER_ROW (wmesa->ScanWidth)
+#define INNER_LOOP( LEFT, RIGHT, Y )                    \
+    {                                   \
+    GLint i, len = RIGHT-LEFT;                      \
+    for (i=0;i<len;i++) {                       \
+    GLdepth z = FixedToDepth(ffz);                  \
+    if (z < zRow[i]) {                      \
+    pRow[i] = PACK_8R8G8B( FixedToInt(ffr), FixedToInt(ffg),    \
+    FixedToInt(ffb) );          \
+    zRow[i] = z;                            \
+    }                                   \
+    ffr += fdrdx;  ffg += fdgdx;  ffb += fdbdx;         \
+    ffz += fdzdx;                           \
+    }                                   \
+    }
+#ifdef __MINGW32__
+	#include "tritemp.h"
+#else
+
+	#ifdef WIN32
+//		#include "..\tritemp.h"
+	#else
+		#include "tritemp.h"
+	#endif
+#endif
+}
+
+
+
+/*
+* XImage, smooth, depth-buffered, PF_5R6G5B triangle.
+*/
+static void smooth_5R6G5B_z_triangle( GLcontext *ctx,
+                                     GLuint v0, GLuint v1, GLuint v2,
+                                     GLuint pv )
+{
+    WMesaContext wmesa = (WMesaContext) ctx->DriverCtx;
+#define INTERP_Z 1
+#define INTERP_RGB 1
+#define PIXEL_ADDRESS(X,Y) PIXELADDR2(X,Y)
+#define PIXEL_TYPE GLushort
+    //#define BYTES_PER_ROW (wmesa->xm_buffer->backimage->bytes_per_line)
+#define BYTES_PER_ROW (wmesa->ScanWidth)
+#define INNER_LOOP( LEFT, RIGHT, Y )                    \
+    {                                   \
+    GLint i, len = RIGHT-LEFT;                      \
+    for (i=0;i<len;i++) {                       \
+    GLdepth z = FixedToDepth(ffz);                  \
+    if (z < zRow[i]) {                      \
+    pRow[i] = PACK_5R6G5B( FixedToInt(ffr), FixedToInt(ffg),    \
+    FixedToInt(ffb) );          \
+    zRow[i] = z;                            \
+    }                                   \
+    ffr += fdrdx;  ffg += fdgdx;  ffb += fdbdx;         \
+    ffz += fdzdx;                           \
+    }                                   \
+    }
+#ifdef __MINGW32__
+	#include "tritemp.h"
+#else
+
+	#ifdef WIN32
+//		#include "..\tritemp.h"
+	#else
+		#include "tritemp.h"
+	#endif
+#endif
+}
+
+/*
+* XImage, flat, depth-buffered, PF_8A8B8G8R triangle.
+*/
+static void flat_8A8B8G8R_z_triangle( GLcontext *ctx, GLuint v0,
+                                     GLuint v1, GLuint v2, GLuint pv )
+{
+    WMesaContext wmesa = (WMesaContext) ctx->DriverCtx;
+#define INTERP_Z 1
+#define PIXEL_ADDRESS(X,Y) PIXELADDR4(X,Y)
+#define PIXEL_TYPE GLuint
+    //#define BYTES_PER_ROW (wmesa->xm_buffer->backimage->bytes_per_line)
+#define BYTES_PER_ROW (wmesa->ScanWidth)
+#define SETUP_CODE                  \
+    unsigned long p = PACK_8B8G8R( VB->ColorPtr->data[pv][0],    \
+    VB->ColorPtr->data[pv][1], VB->ColorPtr->data[pv][2] );
+#define INNER_LOOP( LEFT, RIGHT, Y )                    \
+    {                                   \
+    GLint i, len = RIGHT-LEFT;                      \
+    for (i=0;i<len;i++) {                       \
+    GLdepth z = FixedToDepth(ffz);                  \
+    if (z < zRow[i]) {                      \
+    pRow[i] = p;                            \
+    zRow[i] = z;                            \
+    }                                   \
+    ffz += fdzdx;                           \
+    }                                   \
+    }
+#ifdef __MINGW32__
+	#include "tritemp.h"
+#else
+
+	#ifdef WIN32
+//		#include "..\tritemp.h"
+	#else
+		#include "tritemp.h"
+	#endif
+#endif
+}
+
+
+/*
+* XImage, flat, depth-buffered, PF_8R8G8B triangle.
+*/
+static void flat_8R8G8B_z_triangle( GLcontext *ctx, GLuint v0, GLuint v1,
+                                   GLuint v2, GLuint pv )
+{
+    WMesaContext wmesa = (WMesaContext) ctx->DriverCtx;
+#define INTERP_Z 1
+#define PIXEL_ADDRESS(X,Y) PIXELADDR4(X,Y)
+#define PIXEL_TYPE GLuint
+    //#define BYTES_PER_ROW (wmesa->xm_buffer->backimage->bytes_per_line)
+#define BYTES_PER_ROW (wmesa->ScanWidth)
+#define SETUP_CODE                  \
+    unsigned long p = PACK_8R8G8B( VB->ColorPtr->data[pv][0],    \
+    VB->ColorPtr->data[pv][1], VB->ColorPtr->data[pv][2] );
+#define INNER_LOOP( LEFT, RIGHT, Y )            \
+    {                           \
+    GLint i, len = RIGHT-LEFT;              \
+    for (i=0;i<len;i++) {               \
+    GLdepth z = FixedToDepth(ffz);          \
+    if (z < zRow[i]) {              \
+    pRow[i] = p;                    \
+    zRow[i] = z;                    \
+    }                           \
+    ffz += fdzdx;                   \
+    }                           \
+    }
+#ifdef __MINGW32__
+	#include "tritemp.h"
+#else
+
+	#ifdef WIN32
+//		#include "..\tritemp.h"
+	#else
+		#include "tritemp.h"
+	#endif
+#endif
+}
+
+
+/*
+* XImage, flat, depth-buffered, PF_5R6G5B triangle.
+*/
+static void flat_5R6G5B_z_triangle( GLcontext *ctx, GLuint v0, GLuint v1,
+                                   GLuint v2, GLuint pv )
+{
+    WMesaContext wmesa = (WMesaContext) ctx->DriverCtx;
+#define INTERP_Z 1
+#define PIXEL_ADDRESS(X,Y) PIXELADDR2(X,Y)
+#define PIXEL_TYPE GLushort
+    //#define BYTES_PER_ROW (wmesa->xm_buffer->backimage->bytes_per_line)
+#define BYTES_PER_ROW (wmesa->ScanWidth)
+#define SETUP_CODE                  \
+    unsigned long p = PACK_5R6G5B( VB->ColorPtr->data[pv][0],    \
+    VB->ColorPtr->data[pv][1], VB->ColorPtr->data[pv][2] );
+#define INNER_LOOP( LEFT, RIGHT, Y )            \
+    {                           \
+    GLint i, len = RIGHT-LEFT;              \
+    for (i=0;i<len;i++) {               \
+    GLdepth z = FixedToDepth(ffz);          \
+    if (z < zRow[i]) {              \
+    pRow[i] = p;                    \
+    zRow[i] = z;                    \
+    }                           \
+    ffz += fdzdx;                   \
+    }                           \
+    }
+#ifdef __MINGW32__
+	#include "tritemp.h"
+#else
+
+	#ifdef WIN32
+//		#include "..\tritemp.h"
+	#else
+		#include "tritemp.h"
+	#endif
+#endif
+}
+
+
+/*
+* XImage, smooth, NON-depth-buffered, PF_8A8B8G8R triangle.
+*/
+static void smooth_8A8B8G8R_triangle( GLcontext *ctx, GLuint v0, GLuint v1,
+                                     GLuint v2, GLuint pv )
+{
+    WMesaContext wmesa = (WMesaContext) ctx->DriverCtx;
+#define INTERP_RGB 1
+#define PIXEL_ADDRESS(X,Y) PIXELADDR4(X,Y)
+#define PIXEL_TYPE GLuint
+    //#define BYTES_PER_ROW (wmesa->xm_buffer->backimage->bytes_per_line)
+#define BYTES_PER_ROW (wmesa->ScanWidth)
+#define INNER_LOOP( LEFT, RIGHT, Y )                    \
+    {                                   \
+    GLint xx;                               \
+    PIXEL_TYPE *pixel = pRow;                       \
+    for (xx=LEFT;xx<RIGHT;xx++,pixel++) {               \
+    *pixel = PACK_8B8G8R( FixedToInt(ffr), FixedToInt(ffg),     \
+                FixedToInt(ffb) );          \
+                ffr += fdrdx;  ffg += fdgdx;  ffb += fdbdx;         \
+    }                                   \
+    }
+#ifdef __MINGW32__
+	#include "tritemp.h"
+#else
+
+	#ifdef WIN32
+//		#include "..\tritemp.h"
+	#else
+		#include "tritemp.h"
+	#endif
+#endif
+}
+
+
+/*
+* XImage, smooth, NON-depth-buffered, PF_8R8G8B triangle.
+*/
+static void smooth_8R8G8B_triangle( GLcontext *ctx, GLuint v0, GLuint v1,
+                                   GLuint v2, GLuint pv )
+{
+    WMesaContext wmesa = (WMesaContext) ctx->DriverCtx;
+#define INTERP_RGB 1
+#define PIXEL_ADDRESS(X,Y) PIXELADDR4(X,Y)
+#define PIXEL_TYPE GLuint
+    //#define BYTES_PER_ROW (wmesa->xm_buffer->backimage->bytes_per_line)
+#define BYTES_PER_ROW (wmesa->ScanWidth)
+#define INNER_LOOP( LEFT, RIGHT, Y )                    \
+    {                                   \
+    GLint xx;                               \
+    PIXEL_TYPE *pixel = pRow;                       \
+    for (xx=LEFT;xx<RIGHT;xx++,pixel++) {               \
+    *pixel = PACK_8R8G8B( FixedToInt(ffr), FixedToInt(ffg),     \
+                FixedToInt(ffb) );          \
+                ffr += fdrdx;  ffg += fdgdx;  ffb += fdbdx;         \
+    }                                   \
+    }
+#ifdef __MINGW32__
+	#include "tritemp.h"
+#else
+
+	#ifdef WIN32
+//		#include "..\tritemp.h"
+	#else
+		#include "tritemp.h"
+	#endif
+#endif
+}
+
+
+/*
+* XImage, smooth, NON-depth-buffered, PF_5R6G5B triangle.
+*/
+static void smooth_5R6G5B_triangle( GLcontext *ctx, GLuint v0, GLuint v1,
+                                   GLuint v2, GLuint pv )
+{
+    WMesaContext wmesa = (WMesaContext) ctx->DriverCtx;
+#define INTERP_RGB 1
+#define PIXEL_ADDRESS(X,Y) PIXELADDR2(X,Y)
+#define PIXEL_TYPE GLushort
+    //#define BYTES_PER_ROW (wmesa->xm_buffer->backimage->bytes_per_line)
+#define BYTES_PER_ROW (wmesa->ScanWidth)
+#define INNER_LOOP( LEFT, RIGHT, Y )                    \
+    {                                   \
+    GLint xx;                               \
+    PIXEL_TYPE *pixel = pRow;                       \
+    for (xx=LEFT;xx<RIGHT;xx++,pixel++) {               \
+    *pixel = PACK_5R6G5B( FixedToInt(ffr), FixedToInt(ffg),     \
+                FixedToInt(ffb) );          \
+                ffr += fdrdx;  ffg += fdgdx;  ffb += fdbdx;         \
+    }                                   \
+    }
+#ifdef __MINGW32__
+	#include "tritemp.h"
+#else
+
+	#ifdef WIN32
+//		#include "..\tritemp.h"
+	#else
+		#include "tritemp.h"
+	#endif
+#endif
+}
+
+
+
+/*
+* XImage, flat, NON-depth-buffered, PF_8A8B8G8R triangle.
+*/
+static void flat_8A8B8G8R_triangle( GLcontext *ctx, GLuint v0,
+                                   GLuint v1, GLuint v2, GLuint pv )
+{
+    WMesaContext wmesa = (WMesaContext) ctx->DriverCtx;
+#define PIXEL_ADDRESS(X,Y) PIXELADDR4(X,Y)
+#define PIXEL_TYPE GLuint
+    //#define BYTES_PER_ROW (wmesa->xm_buffer->backimage->bytes_per_line)
+#define BYTES_PER_ROW (wmesa->ScanWidth)
+#define SETUP_CODE                  \
+    unsigned long p = PACK_8B8G8R( VB->ColorPtr->data[pv][0],    \
+    VB->ColorPtr->data[pv][1], VB->ColorPtr->data[pv][2] );
+#define INNER_LOOP( LEFT, RIGHT, Y )            \
+    {                           \
+    GLint xx;                       \
+    PIXEL_TYPE *pixel = pRow;               \
+    for (xx=LEFT;xx<RIGHT;xx++,pixel++) {       \
+    *pixel = p;                 \
+    }                           \
+    }
+
+#ifdef __MINGW32__
+	#include "tritemp.h"
+#else
+
+	#ifdef WIN32
+//		#include "..\tritemp.h"
+	#else
+		#include "tritemp.h"
+	#endif
+#endif
+}
+
+
+/*
+* XImage, flat, NON-depth-buffered, PF_8R8G8B triangle.
+*/
+static void flat_8R8G8B_triangle( GLcontext *ctx, GLuint v0, GLuint v1,
+                                 GLuint v2, GLuint pv )
+{
+    WMesaContext wmesa = (WMesaContext) ctx->DriverCtx;
+#define PIXEL_ADDRESS(X,Y) PIXELADDR4(X,Y)
+#define PIXEL_TYPE GLuint
+    //#define BYTES_PER_ROW (wmesa->xm_buffer->backimage->bytes_per_line)
+#define BYTES_PER_ROW (wmesa->ScanWidth)
+#define SETUP_CODE                  \
+    unsigned long p = PACK_8R8G8B( VB->ColorPtr->data[pv][0],    \
+    VB->ColorPtr->data[pv][1], VB->ColorPtr->data[pv][2] );
+#define INNER_LOOP( LEFT, RIGHT, Y )            \
+    {                           \
+    GLint xx;                       \
+    PIXEL_TYPE *pixel = pRow;               \
+    for (xx=LEFT;xx<RIGHT;xx++,pixel++) {       \
+    *pixel = p;                 \
+    }                           \
+    }
+#ifdef __MINGW32__
+	#include "tritemp.h"
+#else
+
+	#ifdef WIN32
+//		#include "..\tritemp.h"
+	#else
+		#include "tritemp.h"
+	#endif
+#endif
+}
+
+
+/*
+* XImage, flat, NON-depth-buffered, PF_5R6G5B triangle.
+*/
+static void flat_5R6G5B_triangle( GLcontext *ctx, GLuint v0, GLuint v1,
+                                 GLuint v2, GLuint pv )
+{
+    WMesaContext wmesa = (WMesaContext) ctx->DriverCtx;
+#define PIXEL_ADDRESS(X,Y) PIXELADDR2(X,Y)
+#define PIXEL_TYPE GLushort
+    //#define BYTES_PER_ROW (wmesa->xm_buffer->backimage->bytes_per_line)
+#define BYTES_PER_ROW (wmesa->ScanWidth)
+#define SETUP_CODE                  \
+    unsigned long p = PACK_5R6G5B( VB->ColorPtr->data[pv][0],    \
+    VB->ColorPtr->data[pv][1], VB->ColorPtr->data[pv][2] );
+#define INNER_LOOP( LEFT, RIGHT, Y )            \
+    {                           \
+    GLint xx;                       \
+    PIXEL_TYPE *pixel = pRow;               \
+    for (xx=LEFT;xx<RIGHT;xx++,pixel++) {       \
+    *pixel = p;                 \
+    }                           \
+    }
+#ifdef __MINGW32__
+	#include "tritemp.h"
+#else
+
+	#ifdef WIN32
+//		#include "..\tritemp.h"
+	#else
+		#include "tritemp.h"
+	#endif
+#endif
+}
+
+
+/*
+* XImage, smooth, depth-buffered, 8-bit PF_LOOKUP triangle.
+*/
+
+static void smooth_ci_z_triangle( GLcontext *ctx, GLuint v0, GLuint v1,
+                                 GLuint v2, GLuint pv )
+{
+    WMesaContext wmesa = (WMesaContext) ctx->DriverCtx;
+#define INTERP_Z 1
+#define INTERP_INDEX 1
+#define PIXEL_ADDRESS(X,Y) PIXELADDR1(X,Y)
+#define PIXEL_TYPE GLubyte
+#define BYTES_PER_ROW (wmesa->ScanWidth)
+#define INNER_LOOP( LEFT, RIGHT, Y )                                \
+    {                                                                   \
+    GLint i, len = RIGHT-LEFT;                                      \
+    for (i=0;i<len;i++) {                                           \
+    GLdepth z = FixedToDepth(ffz);                              \
+    if (z < zRow[i]) {                                          \
+    pRow[i] = FixedToInt(ffi);                                  \
+    zRow[i] = z;                                                \
+    }                                                               \
+    ffi += fdidx;                                                   \
+    ffz += fdzdx;                                                   \
+    }                                                               \
+    }
+#ifdef __MINGW32__
+	#include "tritemp.h"
+#else
+
+	#ifdef WIN32
+//		#include "..\tritemp.h"
+	#else
+		#include "tritemp.h"
+	#endif
+#endif
+}
+
+
+/*
+* XImage, flat, depth-buffered, 8-bit PF_LOOKUP triangle.
+*/
+
+static void flat_ci_z_triangle( GLcontext *ctx, GLuint v0, GLuint v1,
+                               GLuint v2, GLuint pv )
+{
+    WMesaContext wmesa = (WMesaContext) ctx->DriverCtx;
+#define INTERP_Z 1
+#define PIXEL_ADDRESS(X,Y) PIXELADDR1(X,Y)
+#define PIXEL_TYPE GLubyte
+#define BYTES_PER_ROW (wmesa->ScanWidth)
+#define SETUP_CODE			\
+   GLuint index = VB->IndexPtr->data[pv];	\
+   (*ctx->Driver.Index)( ctx, index );
+#define INNER_LOOP( LEFT, RIGHT, Y )	\
+   {					\
+      GLint i, len = RIGHT-LEFT;	\
+      for (i=0;i<len;i++) {		\
+         GLdepth z = FixedToDepth(ffz);	\
+         if (z < zRow[i]) {		\
+            pRow[i] = index;		\
+            zRow[i] = z;		\
+         }				\
+         ffz += fdzdx;			\
+      }					\
+   }
+#ifdef __MINGW32__
+	#include "tritemp.h"
+#else
+
+	#ifdef WIN32
+//		#include "..\tritemp.h"
+	#else
+		#include "tritemp.h"
+	#endif
+#endif
+}
+
+
+
+/*
+* XImage, smooth, NON-depth-buffered, 8-bit PF_LOOKUP triangle.
+*/
+
+static void smooth_ci_triangle( GLcontext *ctx, GLuint v0, GLuint v1,
+                               GLuint v2, GLuint pv )
+{
+    WMesaContext wmesa = (WMesaContext) ctx->DriverCtx;
+#define INTERP_Z 1
+#define INTERP_INDEX 1
+#define PIXEL_ADDRESS(X,Y) PIXELADDR1(X,Y)
+#define PIXEL_TYPE GLubyte
+#define BYTES_PER_ROW (wmesa->ScanWidth)
+#define INNER_LOOP( LEFT, RIGHT, Y )                    \
+    {                                   \
+    GLint xx;                               \
+    PIXEL_TYPE *pixel = pRow;                       \
+    for (xx=LEFT;xx<RIGHT;xx++,pixel++) {               \
+    *pixel = FixedToInt(ffi);           \
+    ffi += fdidx;           \
+    }                                   \
+    }
+#ifdef __MINGW32__
+	#include "tritemp.h"
+#else
+
+	#ifdef WIN32
+//		#include "..\tritemp.h"
+	#else
+		#include "tritemp.h"
+	#endif
+#endif
+}
+
+
+/*
+* XImage, flat, NON-depth-buffered, 8-bit PF_LOOKUP triangle.
+*/
+static void flat_ci_triangle( GLcontext *ctx, GLuint v0, GLuint v1,
+                             GLuint v2, GLuint pv )
+{
+    WMesaContext wmesa = (WMesaContext) ctx->DriverCtx;
+#define INTERP_Z 1
+#define PIXEL_ADDRESS(X,Y) PIXELADDR1(X,Y)
+#define PIXEL_TYPE GLubyte
+#define BYTES_PER_ROW (wmesa->ScanWidth)
+#define SETUP_CODE			\
+   GLuint index = VB->IndexPtr->data[pv];	\
+   (*ctx->Driver.Index)( ctx, index );
+#define INNER_LOOP( LEFT, RIGHT, Y )		\
+   {						\
+      GLint xx;					\
+      PIXEL_TYPE *pixel = pRow;			\
+      for (xx=LEFT;xx<RIGHT;xx++,pixel++) {	\
+         *pixel = index;			\
+      }						\
+   }
+#ifdef __MINGW32__
+	#include "tritemp.h"
+#else
+
+	#ifdef WIN32
+//		#include "..\tritemp.h"
+	#else
+		#include "tritemp.h"
+	#endif
+#endif
+}
+
+/*
+* XImage, smooth, depth-buffered, 8-bit, PF_DITHER8 triangle.
+*/
+static void smooth_DITHER8_z_triangle( GLcontext *ctx,
+                                      GLuint v0, GLuint v1, GLuint v2,
+                                      GLuint pv )
+{
+    WMesaContext wmesa = (WMesaContext) ctx->DriverCtx;
+    DITHER_RGB_TO_8BIT_SETUP
+#define INTERP_Z 1
+#define INTERP_RGB 1
+#define PIXEL_ADDRESS(X,Y) PIXELADDR1(X,Y)
+#define PIXEL_TYPE GLubyte
+#define BYTES_PER_ROW (wmesa->ScanWidth)
+#define INNER_LOOP( LEFT, RIGHT, Y )                                    \
+    {                                                                       \
+    GLint i, xx = LEFT, yy = FLIP(Y), len = RIGHT-LEFT;                 \
+    for (i=0;i<len;i++,xx++) {                                          \
+    GLdepth z = FixedToDepth(ffz);                                  \
+    if (z < zRow[i]) {                                              \
+    DITHER_RGB_TO_8BIT( FixedToInt(ffr), FixedToInt(ffg),           \
+    FixedToInt(ffb), xx, yy);               \
+    pRow[i] = pixelDithered;                                        \
+    zRow[i] = z;                                                    \
+    }                                                                   \
+    ffr += fdrdx;  ffg += fdgdx;  ffb += fdbdx;                     \
+    ffz += fdzdx;                                                       \
+    }                                                                   \
+    }
+#ifdef __MINGW32__
+	#include "tritemp.h"
+#else
+
+	#ifdef WIN32
+//		#include "..\tritemp.h"
+	#else
+		#include "tritemp.h"
+	#endif
+#endif
+}
+
+/*
+* XImage, flat, depth-buffered, 8-bit PF_DITHER triangle.
+*/
+static void flat_DITHER8_z_triangle( GLcontext *ctx, GLuint v0, GLuint v1,
+                                    GLuint v2, GLuint pv )
+{
+    WMesaContext wmesa = (WMesaContext) ctx->DriverCtx;
+    DITHER_RGB_TO_8BIT_SETUP
+#define INTERP_Z 1
+#define PIXEL_ADDRESS(X,Y) PIXELADDR1(X,Y)
+#define PIXEL_TYPE GLubyte
+#define BYTES_PER_ROW (wmesa->ScanWidth)
+
+#define INNER_LOOP( LEFT, RIGHT, Y )                                    \
+    {                                                                       \
+    GLint i, xx = LEFT, yy = FLIP(Y), len = RIGHT-LEFT;                 \
+    for (i=0;i<len;i++,xx++) {                                          \
+    GLdepth z = FixedToDepth(ffz);                                  \
+    if (z < zRow[i]) {                                              \
+    DITHER_RGB_TO_8BIT( VB->ColorPtr->data[pv][0],                           \
+             VB->ColorPtr->data[pv][1], VB->ColorPtr->data[pv][2], xx, yy);               \
+             pRow[i] = pixelDithered;                                       \
+             zRow[i] = z;                                                   \
+    }                                                                   \
+    ffz += fdzdx;                                                       \
+    }                                                                   \
+    }
+#ifdef __MINGW32__
+	#include "tritemp.h"
+#else
+
+	#ifdef WIN32
+//		#include "..\tritemp.h"
+	#else
+		#include "tritemp.h"
+	#endif
+#endif
+}
+
+/*
+* XImage, smooth, NON-depth-buffered, 8-bit PF_DITHER triangle.
+*/
+static void smooth_DITHER8_triangle( GLcontext *ctx, GLuint v0, GLuint v1,
+                                    GLuint v2, GLuint pv )
+{
+    WMesaContext wmesa = (WMesaContext) ctx->DriverCtx;
+    DITHER_RGB_TO_8BIT_SETUP
+#define INTERP_RGB 1
+#define PIXEL_ADDRESS(X,Y) PIXELADDR1(X,Y)
+#define PIXEL_TYPE GLubyte
+#define BYTES_PER_ROW (wmesa->ScanWidth)
+#define INNER_LOOP( LEFT, RIGHT, Y )                                    \
+    {                                                                       \
+    GLint xx, yy = FLIP(Y);                                             \
+    PIXEL_TYPE *pixel = pRow;                                           \
+    for (xx=LEFT;xx<RIGHT;xx++,pixel++) {                               \
+    DITHER_RGB_TO_8BIT( VB->ColorPtr->data[pv][0],   VB->ColorPtr->data[pv][1], VB->ColorPtr->data[pv][2], xx, yy);\
+    *pixel = pixelDithered;                                         \
+    ffr += fdrdx;  ffg += fdgdx;  ffb += fdbdx;                     \
+    }                                                                   \
+    }
+#ifdef __MINGW32__
+	#include "tritemp.h"
+#else
+
+	#ifdef WIN32
+//		#include "..\tritemp.h"
+	#else
+		#include "tritemp.h"
+	#endif
+#endif
+}
+
+/*
+* XImage, flat, NON-depth-buffered, 8-bit PF_DITHER triangle.
+*/
+
+static void flat_DITHER8_triangle( GLcontext *ctx, GLuint v0, GLuint v1,
+                                  GLuint v2, GLuint pv )
+{
+    WMesaContext wmesa = (WMesaContext) ctx->DriverCtx;
+    DITHER_RGB_TO_8BIT_SETUP
+#define PIXEL_ADDRESS(X,Y) PIXELADDR1(X,Y)
+#define PIXEL_TYPE GLubyte
+#define BYTES_PER_ROW (wmesa->ScanWidth)
+
+#define INNER_LOOP( LEFT, RIGHT, Y )                                    \
+    {                                                                       \
+    GLint xx, yy = FLIP(Y);                                             \
+    PIXEL_TYPE *pixel = pRow;                                           \
+    for (xx=LEFT;xx<RIGHT;xx++,pixel++) {                               \
+    DITHER_RGB_TO_8BIT( VB->ColorPtr->data[pv][0],                               \
+             VB->ColorPtr->data[pv][1], VB->ColorPtr->data[pv][2], xx, yy);               \
+             *pixel = pixelDithered;                                            \
+    }                                                                   \
+    }
+#ifdef __MINGW32__
+	#include "tritemp.h"
+#else
+
+	#ifdef WIN32
+//		#include "..\tritemp.h"
+	#else
+		#include "tritemp.h"
+	#endif
+#endif
+}
+
+#endif
+/************** END DEAD TRIANGLE CODE ***********************/
+
+static triangle_func choose_triangle_function( GLcontext *ctx )
+{
+#if 0
+    WMesaContext wmesa = (WMesaContext) ctx->DriverCtx;
+    int depth = wmesa->cColorBits;
+
+    if (ctx->Polygon.SmoothFlag)     return NULL;
+    if (ctx->Texture._EnabledUnits)  return NULL;
+    if (!wmesa->db_flag) return NULL;
+    if (ctx->swrast->_RasterMask & MULTI_DRAW_BIT) return NULL;
+
+    /*if (wmesa->xm_buffer->buffer==XIMAGE)*/ {
+    if (   ctx->Light.ShadeModel==GL_SMOOTH
+        && ctx->_RasterMask==DEPTH_BIT
+        && ctx->Depth.Func==GL_LESS
+        && ctx->Depth.Mask==GL_TRUE
+        && ctx->Polygon.StippleFlag==GL_FALSE) {
+        switch (wmesa->pixelformat) {
+        case PF_8A8B8G8R:
+            return smooth_8A8B8G8R_z_triangle;
+        case PF_8R8G8B:
+            return smooth_8R8G8B_z_triangle;
+        case PF_5R6G5B:
+            return smooth_5R6G5B_z_triangle;
+        case PF_DITHER8:
+            return  smooth_DITHER8_z_triangle;
+        case PF_INDEX8:
+            return smooth_ci_z_triangle;
+        default:
+            return NULL;
+        }
+    }
+    if (   ctx->Light.ShadeModel==GL_FLAT
+        && ctx->_RasterMask==DEPTH_BIT
+        && ctx->Depth.Func==GL_LESS
+        && ctx->Depth.Mask==GL_TRUE
+        && ctx->Polygon.StippleFlag==GL_FALSE) {
+        switch (wmesa->pixelformat) {
+        case PF_8A8B8G8R:
+            return flat_8A8B8G8R_z_triangle;
+        case PF_8R8G8B:
+            return flat_8R8G8B_z_triangle;
+        case PF_5R6G5B:
+            return flat_5R6G5B_z_triangle;
+        case PF_DITHER8:
+            return flat_DITHER8_z_triangle;
+        case PF_INDEX8:
+            return flat_ci_z_triangle;
+        default:
+            return NULL;
+        }
+    }
+    if (   ctx->_RasterMask==0   /* no depth test */
+        && ctx->Light.ShadeModel==GL_SMOOTH
+        && ctx->Polygon.StippleFlag==GL_FALSE) {
+        switch (wmesa->pixelformat) {
+        case PF_8A8B8G8R:
+            return smooth_8A8B8G8R_triangle;
+        case PF_8R8G8B:
+            return smooth_8R8G8B_triangle;
+        case PF_5R6G5B:
+            return smooth_5R6G5B_triangle;
+        case PF_DITHER8:
+            return smooth_DITHER8_triangle;
+        case PF_INDEX8:
+            return smooth_ci_triangle;
+        default:
+            return NULL;
+        }
+    }
+
+    if (   ctx->_RasterMask==0   /* no depth test */
+        && ctx->Light.ShadeModel==GL_FLAT
+        && ctx->Polygon.StippleFlag==GL_FALSE) {
+        switch (wmesa->pixelformat) {
+        case PF_8A8B8G8R:
+            return flat_8A8B8G8R_triangle;
+        case PF_8R8G8B:
+            return flat_8R8G8B_triangle;
+        case PF_5R6G5B:
+            return flat_5R6G5B_triangle;
+        case PF_DITHER8:
+            return flat_DITHER8_triangle;
+        case PF_INDEX8:
+            return flat_ci_triangle;
+        default:
+            return NULL;
+        }
+    }
+
+    return NULL;
+    }
+#endif
+}
+
+/*
+ * Define a new viewport and reallocate auxillary buffers if the size of
+ * the window (color buffer) has changed.
+ */
+void WMesaViewport( GLcontext *ctx,
+		    GLint x, GLint y, GLsizei width, GLsizei height )
+{
+  assert(0);  /* I don't think that this is being used. */
+#if 0
+  /* Save viewport */
+  ctx->Viewport.X = x;
+  ctx->Viewport.Width = width;
+  ctx->Viewport.Y = y;
+  ctx->Viewport.Height = height;
+  
+  /* compute scale and bias values */
+/* Pre-Keith 3.1 changes
+   ctx->Viewport.Map.m[Sx] = (GLfloat) width / 2.0F;
+   ctx->Viewport.Map.m[Tx] = ctx->Viewport.Sx + x;
+   ctx->Viewport.Map.m[Sy] = (GLfloat) height / 2.0F;
+   ctx->Viewport.Map.m[Ty] = ctx->Viewport.Sy + y;
+*/
+  ctx->Viewport.WindowMap.m[MAT_SX] = (GLfloat) width / 2.0F;
+  ctx->Viewport.WindowMap.m[MAT_TX] = ctx->Viewport.WindowMap.m[MAT_SX] + x;
+  ctx->Viewport.WindowMap.m[MAT_SY] = (GLfloat) height / 2.0F;
+  ctx->Viewport.WindowMap.m[MAT_TY] = ctx->Viewport.WindowMap.m[MAT_SY] + y;
+#endif
+}
diff --git a/reactos/lib/mesa32/src/drivers/windows/gdi/wmesadef.h b/reactos/lib/mesa32/src/drivers/windows/gdi/wmesadef.h
new file mode 100644
index 00000000000..29fff9f4f5e
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/windows/gdi/wmesadef.h
@@ -0,0 +1,174 @@
+/*	File name	:	wmesadef.h
+ *  Version		:	2.3
+ *
+ *  Header file for display driver for Mesa 2.3  under
+ *	Windows95, WindowsNT and Win32
+ *
+ *	Copyright (C) 1996-  Li Wei
+ *  Address		:		Institute of Artificial Intelligence
+ *				:			& Robotics
+ *				:		Xi'an Jiaotong University
+ *  Email		:		liwei@aiar.xjtu.edu.cn
+ *  Web page	:		http://sun.aiar.xjtu.edu.cn
+ *
+ *  This file and its associations are partially based on the
+ *  Windows NT driver for Mesa, written by Mark Leaming
+ *  (mark@rsinc.com).
+ */
+
+/*
+ * $Log: wmesadef.h,v 
+ * Revision 1.1.1.1  1999/08/19 00:55:42  jt
+ * Imported source
+ 
+ * Revision 1.3  1999/01/03 03:08:57  brian
+ * Ted Jump's change
+ *
+ * Initial version 1997/6/14 CST by Li Wei(liwei@aiar.xjtu.edu.cn)
+ */
+
+/*
+ * $Log: wmesadef.h,v 
+ * Revision 1.1.1.1  1999/08/19 00:55:42  jt
+ * Imported source
+ 
+ * Revision 1.3  1999/01/03 03:08:57  brian
+ * Ted Jump's change
+ *
+ * Revision 2.1  1996/11/15 10:54:00  CST by Li Wei(liwei@aiar.xjtu.edu.cn)
+ * a new element added to wmesa_context :
+ * dither_flag
+ */
+
+/*
+ * $Log: wmesadef.h,v 
+ * Revision 1.1.1.1  1999/08/19 00:55:42  jt
+ * Imported source
+ 
+ * Revision 1.3  1999/01/03 03:08:57  brian
+ * Ted Jump's change
+ *
+ * Revision 2.0  1996/11/15 10:54:00  CST by Li Wei(liwei@aiar.xjtu.edu.cn)
+ * Initial revision
+ */
+
+
+
+#ifndef DDMESADEF_H
+#define DDMESADEF_H
+
+// uncomment this to use DirectDraw driver
+//#define DDRAW 1
+// uncomment this to use a pointer to a function for setting the pixels
+// in the buffer
+#define COMPILE_SETPIXEL 1
+// uncomment this to enable the fast win32 rasterizers ( commented out for MesaGL 4.0 )
+// #define FAST_RASTERIZERS 1
+// uncomment this to enable setting function pointers once inside of
+// WMesaCreateContext instead of on every call to wmesa_update_state()
+#define SET_FPOINTERS_ONCE 1
+
+
+#include <windows.h>
+#include <GL\gl.h>
+#include "context.h"
+#ifdef DDRAW
+#define DIRECTDRAW_VERSION 0x0100
+	#include <ddraw.h>
+#endif
+//#include "profile.h"
+
+#define REDBITS		0x03
+#define REDSHIFT	0x00
+#define GREENBITS	0x03
+#define GREENSHIFT	0x03
+#define BLUEBITS	0x02
+#define BLUESHIFT	0x06
+
+typedef struct _dibSection{
+	HDC		hDC;
+	HANDLE	hFileMap;
+	BOOL	fFlushed;
+	LPVOID	base;
+}WMDIBSECTION, *PWMDIBSECTION;
+
+#ifdef COMPILE_SETPIXEL
+typedef void (*SETPIXELTYPE)(struct wmesa_context *pwc, int iScanLine, int iPixel, BYTE r, BYTE g, BYTE b);
+#endif
+
+typedef struct wmesa_context{
+    GLcontext *gl_ctx;		/* The core GL/Mesa context */
+	GLvisual *gl_visual;		/* Describes the buffers */
+    GLframebuffer *gl_buffer;	/* Depth, stencil, accum, etc buffers */
+
+
+	HWND				Window;
+    HDC                 hDC;
+    HPALETTE            hPalette;
+    HPALETTE            hOldPalette;
+    HPEN                hPen;
+    HPEN                hOldPen;
+    HCURSOR             hOldCursor;
+    COLORREF            crColor;
+    // 3D projection stuff
+    RECT                drawRect;
+    UINT                uiDIBoffset;
+    // OpenGL stuff
+    HPALETTE            hGLPalette;
+	GLuint				width;
+	GLuint				height;
+	GLuint				ScanWidth;
+	GLboolean			db_flag;	//* double buffered?
+	GLboolean			rgb_flag;	//* RGB mode?
+	GLboolean			dither_flag;	//* use dither when 256 color mode for RGB?
+	GLuint				depth;		//* bits per pixel (1, 8, 24, etc)
+	ULONG				pixel;	// current color index or RGBA pixel value
+	ULONG				clearpixel; //* pixel for clearing the color buffers
+	PBYTE				ScreenMem; // WinG memory
+	BITMAPINFO			*IndexFormat;
+	HPALETTE			hPal; // Current Palette
+	HPALETTE			hPalHalfTone;
+
+
+	WMDIBSECTION		dib;
+    BITMAPINFO          bmi;
+    HBITMAP             hbmDIB;
+    HBITMAP             hOldBitmap;
+	HBITMAP				Old_Compat_BM;
+	HBITMAP				Compat_BM;            // Bitmap for double buffering
+    PBYTE               pbPixels;
+    int                 nColors;
+	BYTE				cColorBits;
+	int					pixelformat;
+
+#ifdef DDRAW
+	LPDIRECTDRAW            lpDD;           // DirectDraw object
+//	LPDIRECTDRAW2            lpDD2;           // DirectDraw object
+	LPDIRECTDRAWSURFACE     lpDDSPrimary;   // DirectDraw primary surface
+	LPDIRECTDRAWSURFACE     lpDDSOffScreen;	// DirectDraw off screen surface
+	LPDIRECTDRAWPALETTE     lpDDPal;        // DirectDraw palette
+	BOOL                    bActive;        // is application active?
+	DDSURFACEDESC	        ddsd;			// surface description
+	int 					fullScreen;		// fullscreen ?
+	int			            gMode ;			// fullscreen mode
+	LONG					oldWndProc;		// old Window proc. we need to hook WM_MOVE message to update the drawing rectangle
+#endif
+	RECT					rectOffScreen;
+	RECT					rectSurface;
+	HWND					hwnd;
+	DWORD					pitch;
+	PBYTE					addrOffScreen;
+#ifdef COMPILE_SETPIXEL
+      SETPIXELTYPE                    wmSetPixel;
+#endif // COMPILE_SETPIXEL
+//#ifdef PROFILE
+//	MESAPROF	profile;
+//#endif
+}  *PWMC;
+
+
+#define PAGE_FILE		0xffffffff
+
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/drivers/windows/icd/colors.h b/reactos/lib/mesa32/src/drivers/windows/icd/colors.h
new file mode 100644
index 00000000000..19f11eacc0f
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/windows/icd/colors.h
@@ -0,0 +1,539 @@
+/*	File name	:	colors.h
+ *  Version		:	2.3
+ *
+ *  Header file for display driver for Mesa 2.3  under 
+ *	Windows95 and WindowsNT 
+ *	This file defines macros and global variables  needed
+ *	for converting color format
+ *
+ *	Copyright (C) 1996-  Li Wei
+ *  Address		:		Institute of Artificial Intelligence
+ *				:			& Robotics
+ *				:		Xi'an Jiaotong University
+ *  Email		:		liwei@aiar.xjtu.edu.cn
+ *  Web page	:		http://sun.aiar.xjtu.edu.cn
+ *
+ *  This file and its associations are partially based on the 
+ *  Windows NT driver for Mesa, written by Mark Leaming
+ *  (mark@rsinc.com).
+ */
+
+/* $Log: ddcolors.h 1997/6/14 by Li Wei(liwei@aiar.xjtu.edu.cn)
+ * Macros for pixel format defined
+ */
+
+/*
+ * $Log: colors.h,v $
+ * Revision 1.1  2004/07/16 22:12:32  blight
+ * Import Mesa-6.0.1 for use as software OpenGL renderer.
+ *
+ * Revision 1.1  2003/07/24 03:47:46  kschultz
+ * Source code for GDI driver.
+ *
+ * Revision 1.3  2002/01/15 18:14:34  kschultz
+ * Fixed pixel color component problem and clear code for 24-bit Windows
+ *   devices.  (Jeff Lewis)
+ *
+ * Revision 1.2  2002/01/15 18:11:36  kschultz
+ * Remove trailing CR's.   No logical changes.
+ *
+ * Revision 1.1.1.1  1999/08/19 00:55:42  jtg
+ * Imported sources
+ *
+ * Revision 1.2  1999/01/03 03:08:57  brianp
+ * Ted Jump's changes
+ *
+ * Revision 1.1  1999/01/03 03:08:12  brianp
+ * Initial revision
+ *
+ * Revision 2.0.2  1997/4/30 15:58:00  CST by Li Wei(liwei@aiar.xjtu.edu.cn)
+ * Add LUTs need for dithering
+ */
+
+/*
+ * $Log: colors.h,v $
+ * Revision 1.1  2004/07/16 22:12:32  blight
+ * Import Mesa-6.0.1 for use as software OpenGL renderer.
+ *
+ * Revision 1.1  2003/07/24 03:47:46  kschultz
+ * Source code for GDI driver.
+ *
+ * Revision 1.3  2002/01/15 18:14:34  kschultz
+ * Fixed pixel color component problem and clear code for 24-bit Windows
+ *   devices.  (Jeff Lewis)
+ *
+ * Revision 1.2  2002/01/15 18:11:36  kschultz
+ * Remove trailing CR's.   No logical changes.
+ *
+ * Revision 1.1.1.1  1999/08/19 00:55:42  jtg
+ * Imported sources
+ *
+ * Revision 1.2  1999/01/03 03:08:57  brianp
+ * Ted Jump's changes
+ *
+ * Revision 1.1  1999/01/03 03:08:12  brianp
+ * Initial revision
+ *
+ * Revision 2.0.1  1997/4/29 15:52:00  CST by Li Wei(liwei@aiar.xjtu.edu.cn)
+ * Add BGR8 Macro
+ */
+ 
+/*
+ * $Log: colors.h,v $
+ * Revision 1.1  2004/07/16 22:12:32  blight
+ * Import Mesa-6.0.1 for use as software OpenGL renderer.
+ *
+ * Revision 1.1  2003/07/24 03:47:46  kschultz
+ * Source code for GDI driver.
+ *
+ * Revision 1.3  2002/01/15 18:14:34  kschultz
+ * Fixed pixel color component problem and clear code for 24-bit Windows
+ *   devices.  (Jeff Lewis)
+ *
+ * Revision 1.2  2002/01/15 18:11:36  kschultz
+ * Remove trailing CR's.   No logical changes.
+ *
+ * Revision 1.1.1.1  1999/08/19 00:55:42  jtg
+ * Imported sources
+ *
+ * Revision 1.2  1999/01/03 03:08:57  brianp
+ * Ted Jump's changes
+ *
+ * Revision 1.1  1999/01/03 03:08:12  brianp
+ * Initial revision
+ *
+ * Revision 2.0  1996/11/15 10:55:00  CST by Li Wei(liwei@aiar.xjtu.edu.cn)
+ * Initial revision
+ */
+/* Values for wmesa->pixelformat: */
+
+#define PF_8A8B8G8R	3	/* 32-bit TrueColor:  8-A, 8-B, 8-G, 8-R */
+#define PF_8R8G8B	4	/* 32-bit TrueColor:  8-R, 8-G, 8-B */
+#define PF_5R6G5B	5	/* 16-bit TrueColor:  5-R, 6-G, 5-B bits */
+#define PF_DITHER8	6	/* Dithered RGB using a lookup table */
+#define PF_LOOKUP	7	/* Undithered RGB using a lookup table */
+#define PF_GRAYSCALE	10	/* Grayscale or StaticGray */
+#define PF_BADFORMAT	11
+#define PF_INDEX8		12
+
+char ColorMap16[] = {
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,
+0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,
+0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,
+0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,
+0x05,0x05,0x05,0x05,0x05,0x05,0x05,0x05,
+0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x06,
+0x07,0x07,0x07,0x07,0x07,0x07,0x07,0x07,
+0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,
+0x09,0x09,0x09,0x09,0x09,0x09,0x09,0x09,
+0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,
+0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,
+0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,
+0x0D,0x0D,0x0D,0x0D,0x0D,0x0D,0x0D,0x0D,
+0x0E,0x0E,0x0E,0x0E,0x0E,0x0E,0x0E,0x0E,
+0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,
+0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,
+0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
+0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12,
+0x13,0x13,0x13,0x13,0x13,0x13,0x13,0x13,
+0x14,0x14,0x14,0x14,0x14,0x14,0x14,0x14,
+0x15,0x15,0x15,0x15,0x15,0x15,0x15,0x15,
+0x16,0x16,0x16,0x16,0x16,0x16,0x16,0x16,
+0x17,0x17,0x17,0x17,0x17,0x17,0x17,0x17,
+0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,
+0x19,0x19,0x19,0x19,0x19,0x19,0x19,0x19,
+0x1A,0x1A,0x1A,0x1A,0x1A,0x1A,0x1A,0x1A,
+0x1B,0x1B,0x1B,0x1B,0x1B,0x1B,0x1B,0x1B,
+0x1C,0x1C,0x1C,0x1C,0x1C,0x1C,0x1C,0x1C,
+0x1D,0x1D,0x1D,0x1D,0x1D,0x1D,0x1D,0x1D,
+0x1E,0x1E,0x1E,0x1E,0x1E,0x1E,0x1E,0x1E,
+0x1F,0x1F,0x1F,0x1F,0x1F,0x1F,0x1F,0x1F};
+
+#define BGR8(r,g,b)		(unsigned)(((BYTE)(b & 0xc0 | (g & 0xe0)>>2 | (r & 0xe0)>>5)))
+#ifdef DDRAW
+#define BGR16(r,g,b)	((WORD)(((BYTE)(ColorMap16[b]) | ((BYTE)(g&0xfc) << 3)) | (((WORD)(BYTE)(ColorMap16[r])) << 11)))
+#else
+#define BGR16(r,g,b)	((WORD)(((BYTE)(ColorMap16[b]) | ((BYTE)(ColorMap16[g]) << 5)) | (((WORD)(BYTE)(ColorMap16[r])) << 10)))
+#endif
+#define BGR24(r,g,b) (unsigned long)((DWORD)(((BYTE)(b)|((WORD)((BYTE)(g))<<8))|(((DWORD)(BYTE)(r))<<16)))
+
+#define BGR32(r,g,b)	(unsigned long)((DWORD)(((BYTE)(b)|((WORD)((BYTE)(g))<<8))|(((DWORD)(BYTE)(r))<<16)))
+
+
+
+/*
+ * If pixelformat==PF_8A8B8G8R:
+ */
+#define PACK_8A8B8G8R( R, G, B, A )	\
+	( ((A) << 24) | ((B) << 16) | ((G) << 8) | (R) )
+
+
+/*
+ * If pixelformat==PF_8R8G8B:
+ */
+#define PACK_8R8G8B( R, G, B)	 ( ((R) << 16) | ((G) << 8) | (B) )
+
+
+/*
+ * If pixelformat==PF_5R6G5B:
+ */
+
+
+#ifdef DDRAW
+#define PACK_5R6G5B( R, G, B) ((WORD)(((BYTE)(ColorMap16[B]) | ((BYTE)(G&0xfc) << 3)) | (((WORD)(BYTE)(ColorMap16[R])) << 11)))
+#else
+#define PACK_5R6G5B( R, G, B)	((WORD)(((BYTE)(ColorMap16[B]) | ((BYTE)(ColorMap16[G]) << 5)) | (((WORD)(BYTE)(ColorMap16[R])) << 10)))
+#endif
+/*----------------------------------------------------------------------------
+
+Division lookup tables.  These tables compute 0-255 divided by 51 and
+modulo 51.  These tables could approximate gamma correction.
+
+*/
+
+char unsigned const aDividedBy51Rounded[256] =
+{
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+};
+
+char unsigned const aDividedBy51[256] =
+{
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 
+};
+
+char unsigned const aModulo51[256] =
+{
+  0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+  20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+  38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 0, 1, 2, 3, 4, 5, 6,
+  7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+  26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
+  44, 45, 46, 47, 48, 49, 50, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12,
+  13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+  31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
+  49, 50, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+  18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+  36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 0, 1, 2, 3,
+  4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+  23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+  41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 0, 
+};
+
+/*----------------------------------------------------------------------------
+
+Multiplication LUTs.  These compute 0-5 times 6 and 36.
+
+*/
+
+char unsigned const aTimes6[6] =
+{
+  0, 6, 12, 18, 24, 30
+};
+
+char unsigned const aTimes36[6] =
+{
+  0, 36, 72, 108, 144, 180
+};
+
+
+/*----------------------------------------------------------------------------
+
+Dither matrices for 8 bit to 2.6 bit halftones.
+
+*/
+
+char unsigned const aHalftone16x16[256] =
+{
+  0, 44, 9, 41, 3, 46, 12, 43, 1, 44, 10, 41, 3, 46, 12, 43,
+  34, 16, 25, 19, 37, 18, 28, 21, 35, 16, 26, 19, 37, 18, 28, 21,
+  38, 6, 47, 3, 40, 9, 50, 6, 38, 7, 47, 4, 40, 9, 49, 6,
+  22, 28, 13, 31, 25, 31, 15, 34, 22, 29, 13, 32, 24, 31, 15, 34,
+  2, 46, 12, 43, 1, 45, 10, 42, 2, 45, 11, 42, 1, 45, 11, 42,
+  37, 18, 27, 21, 35, 17, 26, 20, 36, 17, 27, 20, 36, 17, 26, 20,
+  40, 8, 49, 5, 38, 7, 48, 4, 39, 8, 48, 5, 39, 7, 48, 4,
+  24, 30, 15, 33, 23, 29, 13, 32, 23, 30, 14, 33, 23, 29, 14, 32,
+  2, 46, 12, 43, 0, 44, 10, 41, 3, 47, 12, 44, 0, 44, 10, 41,
+  37, 18, 27, 21, 35, 16, 25, 19, 37, 19, 28, 22, 35, 16, 25, 19,
+  40, 9, 49, 5, 38, 7, 47, 4, 40, 9, 50, 6, 38, 6, 47, 3,
+  24, 30, 15, 34, 22, 29, 13, 32, 25, 31, 15, 34, 22, 28, 13, 31,
+  1, 45, 11, 42, 2, 46, 11, 42, 1, 45, 10, 41, 2, 46, 11, 43,
+  36, 17, 26, 20, 36, 17, 27, 21, 35, 16, 26, 20, 36, 18, 27, 21,
+  39, 8, 48, 4, 39, 8, 49, 5, 38, 7, 48, 4, 39, 8, 49, 5,
+  23, 29, 14, 33, 24, 30, 14, 33, 23, 29, 13, 32, 24, 30, 14, 33,
+};
+
+char unsigned const aHalftone8x8[64] =
+{
+   0, 38,  9, 47,  2, 40, 11, 50,
+  25, 12, 35, 22, 27, 15, 37, 24,
+   6, 44,  3, 41,  8, 47,  5, 43,
+  31, 19, 28, 15, 34, 21, 31, 18,
+   1, 39, 11, 49,  0, 39, 10, 48,
+  27, 14, 36, 23, 26, 13, 35, 23,
+   7, 46,  4, 43,  7, 45,  3, 42,
+  33, 20, 30, 17, 32, 19, 29, 16,
+};
+
+char unsigned const aHalftone4x4_1[16] =
+{
+  0, 25, 6, 31,
+  38, 12, 44, 19,
+  9, 35, 3, 28,
+  47, 22, 41, 15
+};
+
+char unsigned const aHalftone4x4_2[16] =
+{
+  41, 3, 9, 28,
+  35, 15, 22, 47,
+  6, 25, 38, 0,
+  19, 44, 31, 12
+};
+
+/***************************************************************************
+  aWinGHalftoneTranslation
+
+  Translates a 2.6 bit-per-pixel halftoned representation into the
+  slightly rearranged WinG Halftone Palette.
+*/
+
+char unsigned const aWinGHalftoneTranslation[216] =
+{
+  0,
+  29,
+  30,
+  31,
+  32,
+  249,
+  33,
+  34,
+  35,
+  36,
+  37,
+  38,
+  39,
+  40,
+  41,
+  42,
+  43,
+  44,
+  45,
+  46,
+  47,
+  48,
+  49,
+  50,
+  51,
+  52,
+  53,
+  54,
+  55,
+  56,
+  250,
+  250,
+  57,
+  58,
+  59,
+  251,
+  60,
+  61,
+  62,
+  63,
+  64,
+  65,
+  66,
+  67,
+  68,
+  69,
+  70,
+  71,
+  72,
+  73,
+  74,
+  75,
+  76,
+  77,
+  78,
+  79,
+  80,
+  81,
+  82,
+  83,
+  84,
+  85,
+  86,
+  87,
+  88,
+  89,
+  250,
+  90,
+  91,
+  92,
+  93,
+  94,
+  95,
+  96,
+  97,
+  98,
+  99,
+  100,
+  101,
+  102,
+  103,
+  104,
+  105,
+  106,
+  107,
+  108,
+  109,
+  110,
+  111,
+  227,
+  112,
+  113,
+  114,
+  115,
+  116,
+  117,
+  118,
+  119,
+  151,
+  120,
+  121,
+  122,
+  123,
+  124,
+  228,
+  125,
+  126,
+  229,
+  133,
+  162,
+  135,
+  131,
+  132,
+  137,
+  166,
+  134,
+  140,
+  130,
+  136,
+  143,
+  138,
+  139,
+  174,
+  141,
+  142,
+  177,
+  129,
+  144,
+  145,
+  146,
+  147,
+  148,
+  149,
+  150,
+  157,
+  152,
+  153,
+  154,
+  155,
+  156,
+  192,
+  158,
+  159,
+  160,
+  161,
+  196,
+  163,
+  164,
+  165,
+  127,
+  199,
+  167,
+  168,
+  169,
+  170,
+  171,
+  172,
+  173,
+  207,
+  175,
+  176,
+  210,
+  178,
+  179,
+  180,
+  181,
+  182,
+  183,
+  184,
+  185,
+  186,
+  187,
+  188,
+  189,
+  190,
+  191,
+  224,
+  193,
+  194,
+  195,
+  252,
+  252,
+  197,
+  198,
+  128,
+  253,
+  252,
+  200,
+  201,
+  202,
+  203,
+  204,
+  205,
+  206,
+  230,
+  208,
+  209,
+  231,
+  211,
+  212,
+  213,
+  214,
+  215,
+  216,
+  217,
+  218,
+  219,
+  220,
+  221,
+  222,
+  254,
+  223,
+  232,
+  225,
+  226,
+  255,
+};
diff --git a/reactos/lib/mesa32/src/drivers/windows/icd/icd.c b/reactos/lib/mesa32/src/drivers/windows/icd/icd.c
new file mode 100644
index 00000000000..0be278102c5
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/windows/icd/icd.c
@@ -0,0 +1,332 @@
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+/*
+ * File name 	: wgl.c
+ * WGL stuff. Added by Oleg Letsinsky, ajl@ultersys.ru
+ * Some things originated from the 3Dfx WGL functions
+ */
+
+#ifdef WIN32
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <windows.h>
+#define GL_GLEXT_PROTOTYPES
+#include <GL/gl.h>
+#include <GL/glext.h>
+//#include <GL/glu.h>
+
+#ifdef __cplusplus
+}
+#endif
+
+#include <stdio.h>
+#include <tchar.h>
+#include "wmesadef.h"
+#include "GL/wmesa.h"
+#include "mtypes.h"
+#include "glapi.h"
+
+#define MAX_MESA_ATTRS	20
+
+
+typedef struct _icdTable {
+    DWORD size;
+    PROC  table[336];
+} ICDTABLE, *PICDTABLE;
+
+static ICDTABLE icdTable = { 336, {
+#define ICD_ENTRY(func) mgl##func,
+#include "icdlist.h"
+#undef ICD_ENTRY
+} };
+
+struct __pixelformat__
+{
+    PIXELFORMATDESCRIPTOR	pfd;
+    GLboolean doubleBuffered;
+};
+
+struct __pixelformat__	pix[] =
+{
+    /* Double Buffer, alpha */
+    {	{	sizeof(PIXELFORMATDESCRIPTOR),	1,
+        PFD_DRAW_TO_WINDOW|PFD_SUPPORT_OPENGL|PFD_DOUBLEBUFFER|PFD_SWAP_COPY,
+        PFD_TYPE_RGBA,
+        24,	8,	0,	8,	8,	8,	16,	8,	24,
+        0,	0,	0,	0,	0,	16,	8,	0,	0,	0,	0,	0,	0 },
+        GL_TRUE
+    },
+    /* Single Buffer, alpha */
+    {	{	sizeof(PIXELFORMATDESCRIPTOR),	1,
+        PFD_DRAW_TO_WINDOW|PFD_SUPPORT_OPENGL, /* | PFD_SUPPORT_GDI ? */
+        PFD_TYPE_RGBA,
+        24,	8,	0,	8,	8,	8,	16,	8,	24,
+        0,	0,	0,	0,	0,	16,	8,	0,	0,	0,	0,	0,	0 },
+        GL_FALSE
+    },
+    /* Double Buffer, no alpha */
+    {	{	sizeof(PIXELFORMATDESCRIPTOR),	1,
+        PFD_DRAW_TO_WINDOW|PFD_SUPPORT_OPENGL|PFD_DOUBLEBUFFER|PFD_SWAP_COPY,
+        PFD_TYPE_RGBA,
+        24,	8,	0,	8,	8,	8,	16,	0,	0,
+        0,	0,	0,	0,	0,	16,	8,	0,	0,	0,	0,	0,	0 },
+        GL_TRUE
+    },
+    /* Single Buffer, no alpha */
+    {	{	sizeof(PIXELFORMATDESCRIPTOR),	1,
+        PFD_DRAW_TO_WINDOW|PFD_SUPPORT_OPENGL, /* | PFD_SUPPORT_GDI ? */
+        PFD_TYPE_RGBA,
+        24,	8,	0,	8,	8,	8,	16,	0,	0,
+        0,	0,	0,	0,	0,	16,	8,	0,	0,	0,	0,	0,	0 },
+        GL_FALSE
+    },
+};
+
+int qt_pix = sizeof(pix) / sizeof(pix[0]);
+
+typedef struct {
+    WMesaContext ctx;
+    HDC hdc;
+} MesaWglCtx;
+
+#define MESAWGL_CTX_MAX_COUNT 20
+
+static MesaWglCtx wgl_ctx[MESAWGL_CTX_MAX_COUNT];
+
+static unsigned ctx_count = 0;
+static unsigned ctx_current = -1;
+static unsigned curPFD = 0;
+
+WGLAPI BOOL GLAPIENTRY DrvCopyContext(HGLRC hglrcSrc,HGLRC hglrcDst,UINT mask)
+{
+    return(FALSE);
+}
+
+WGLAPI HGLRC GLAPIENTRY DrvCreateContext(HDC hdc)
+{
+    HWND		hWnd;
+    int i = 0;
+
+    if(!(hWnd = WindowFromDC(hdc)))
+    {
+        SetLastError(0);
+        return(NULL);
+    }
+    if (!ctx_count)
+    {
+    	for(i=0;i<MESAWGL_CTX_MAX_COUNT;i++)
+    	{
+    		wgl_ctx[i].ctx = NULL;
+    		wgl_ctx[i].hdc = NULL;
+    	}
+    }
+    for( i = 0; i < MESAWGL_CTX_MAX_COUNT; i++ )
+    {
+        if ( wgl_ctx[i].ctx == NULL )
+        {
+            wgl_ctx[i].ctx = WMesaCreateContext( hWnd, NULL, GL_TRUE,
+                pix[curPFD-1].doubleBuffered, 
+                pix[curPFD-1].pfd.cAlphaBits ? GL_TRUE : GL_FALSE);
+            if (wgl_ctx[i].ctx == NULL)
+                break;
+            wgl_ctx[i].hdc = hdc;
+            ctx_count++;
+            return ((HGLRC)wgl_ctx[i].ctx);
+        }
+    }
+    SetLastError(0);
+    return(NULL);
+}
+
+WGLAPI BOOL GLAPIENTRY DrvDeleteContext(HGLRC hglrc)
+{
+    int i;
+    for ( i = 0; i < MESAWGL_CTX_MAX_COUNT; i++ )
+    {
+    	if ( wgl_ctx[i].ctx == (PWMC) hglrc )
+    	{
+            WMesaMakeCurrent((PWMC) hglrc);
+            WMesaDestroyContext();
+            wgl_ctx[i].ctx = NULL;
+            wgl_ctx[i].hdc = NULL;
+            ctx_count--;
+            return(TRUE);
+    	}
+    }
+    SetLastError(0);
+    return(FALSE);
+}
+
+WGLAPI HGLRC GLAPIENTRY DrvCreateLayerContext(HDC hdc,int iLayerPlane)
+{
+    if (iLayerPlane == 0)
+      return DrvCreateContext(hdc);
+    SetLastError(0);
+    return(NULL);
+}
+
+WGLAPI PICDTABLE GLAPIENTRY DrvSetContext(HDC hdc,HGLRC hglrc,void *callback)
+{
+    int i;
+
+    /* new code suggested by Andy Sy */
+    if (!hdc || !hglrc) {
+       WMesaMakeCurrent(NULL);
+       ctx_current = -1;
+       return NULL;
+    }
+
+    for ( i = 0; i < MESAWGL_CTX_MAX_COUNT; i++ )
+    {
+        if ( wgl_ctx[i].ctx == (PWMC) hglrc )
+        {
+            wgl_ctx[i].hdc = hdc;
+            WMesaMakeCurrent( (PWMC) hglrc );
+            ctx_current = i;
+            return &icdTable;
+        }
+    }
+    return NULL;
+}
+
+WGLAPI void GLAPIENTRY DrvReleaseContext(HGLRC hglrc)
+{
+    WMesaMakeCurrent(NULL);
+    ctx_current = -1;
+}
+
+WGLAPI BOOL GLAPIENTRY DrvShareLists(HGLRC hglrc1,HGLRC hglrc2)
+{
+    return(TRUE);
+}
+
+
+static FIXED FixedFromDouble(double d)
+{
+   long l = (long) (d * 65536L);
+   return *(FIXED *)&l;
+}
+
+
+WGLAPI BOOL GLAPIENTRY DrvDescribeLayerPlane(HDC hdc,int iPixelFormat,
+                                    int iLayerPlane,UINT nBytes,
+                                    LPLAYERPLANEDESCRIPTOR plpd)
+{
+    SetLastError(0);
+    return(FALSE);
+}
+
+WGLAPI int GLAPIENTRY DrvSetLayerPaletteEntries(HDC hdc,int iLayerPlane,
+                                       int iStart,int cEntries,
+                                       CONST COLORREF *pcr)
+{
+    SetLastError(0);
+    return(0);
+}
+
+WGLAPI int GLAPIENTRY DrvGetLayerPaletteEntries(HDC hdc,int iLayerPlane,
+                                       int iStart,int cEntries,
+                                       COLORREF *pcr)
+{
+    SetLastError(0);
+    return(0);
+}
+
+WGLAPI BOOL GLAPIENTRY DrvRealizeLayerPalette(HDC hdc,int iLayerPlane,BOOL bRealize)
+{
+    SetLastError(0);
+    return(FALSE);
+}
+
+WGLAPI BOOL GLAPIENTRY DrvSwapLayerBuffers(HDC hdc,UINT fuPlanes)
+{
+    if( !hdc )
+    {
+        WMesaSwapBuffers();
+        return(TRUE);
+    }
+    SetLastError(0);
+    return(FALSE);
+}
+
+WGLAPI int GLAPIENTRY DrvDescribePixelFormat(HDC hdc,int iPixelFormat,UINT nBytes,
+                                    LPPIXELFORMATDESCRIPTOR ppfd)
+{
+    int		qt_valid_pix;
+
+    qt_valid_pix = qt_pix;
+    if(ppfd == NULL)
+	return(qt_valid_pix);
+    if(iPixelFormat < 1 || iPixelFormat > qt_valid_pix || nBytes != sizeof(PIXELFORMATDESCRIPTOR))
+    {
+        SetLastError(0);
+        return(0);
+    }
+    *ppfd = pix[iPixelFormat - 1].pfd;
+    return(qt_valid_pix);
+}
+
+/*
+* GetProcAddress - return the address of an appropriate extension
+*/
+WGLAPI PROC GLAPIENTRY DrvGetProcAddress(LPCSTR lpszProc)
+{
+   PROC p = (PROC) _glapi_get_proc_address((const char *) lpszProc);
+   if (p)
+      return p;
+
+   SetLastError(0);
+   return(NULL);
+}
+
+WGLAPI BOOL GLAPIENTRY DrvSetPixelFormat(HDC hdc,int iPixelFormat)
+{
+    int		qt_valid_pix;
+
+    qt_valid_pix = qt_pix;
+    if(iPixelFormat < 1 || iPixelFormat > qt_valid_pix)
+    {
+        SetLastError(0);
+        return(FALSE);
+    }
+    curPFD = iPixelFormat;
+    return(TRUE);
+}
+
+WGLAPI BOOL GLAPIENTRY DrvSwapBuffers(HDC hdc)
+{
+   if (ctx_current < 0)
+      return FALSE;
+
+   if(wgl_ctx[ctx_current].ctx == NULL) {
+      SetLastError(0);
+      return(FALSE);
+   }
+   WMesaSwapBuffers();
+   return(TRUE);
+}
+
+WGLAPI BOOL GLAPIENTRY DrvValidateVersion(DWORD version)
+{
+    return TRUE;
+}
+
+#endif /* WIN32 */
diff --git a/reactos/lib/mesa32/src/drivers/windows/icd/icdlist.h b/reactos/lib/mesa32/src/drivers/windows/icd/icdlist.h
new file mode 100644
index 00000000000..1fa3de33bf0
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/windows/icd/icdlist.h
@@ -0,0 +1,336 @@
+ICD_ENTRY(NewList)				//0
+ICD_ENTRY(EndList)				//1
+ICD_ENTRY(CallList)				//2
+ICD_ENTRY(CallLists)				//3
+ICD_ENTRY(DeleteLists)			//4
+ICD_ENTRY(GenLists)				//5
+ICD_ENTRY(ListBase)				//6
+ICD_ENTRY(Begin)					//7
+ICD_ENTRY(Bitmap)					//8
+ICD_ENTRY(Color3b)				//9
+ICD_ENTRY(Color3bv)				//10
+ICD_ENTRY(Color3d)				//11
+ICD_ENTRY(Color3dv)				//12
+ICD_ENTRY(Color3f)				//13
+ICD_ENTRY(Color3fv)				//14
+ICD_ENTRY(Color3i)				//15
+ICD_ENTRY(Color3iv)				//16
+ICD_ENTRY(Color3s)				//17
+ICD_ENTRY(Color3sv)				//18
+ICD_ENTRY(Color3ub)				//19
+ICD_ENTRY(Color3ubv)				//20
+ICD_ENTRY(Color3ui)				//21
+ICD_ENTRY(Color3uiv)				//22
+ICD_ENTRY(Color3us)				//23
+ICD_ENTRY(Color3usv)				//24
+ICD_ENTRY(Color4b)				//25
+ICD_ENTRY(Color4bv)				//26
+ICD_ENTRY(Color4d)				//27
+ICD_ENTRY(Color4dv)				//28
+ICD_ENTRY(Color4f)				//29
+ICD_ENTRY(Color4fv)				//30
+ICD_ENTRY(Color4i)				//31
+ICD_ENTRY(Color4iv)				//32
+ICD_ENTRY(Color4s)				//33
+ICD_ENTRY(Color4sv)				//34
+ICD_ENTRY(Color4ub)				//35
+ICD_ENTRY(Color4ubv)				//36
+ICD_ENTRY(Color4ui)				//37
+ICD_ENTRY(Color4uiv)				//38
+ICD_ENTRY(Color4us)				//39
+ICD_ENTRY(Color4usv)				//40
+ICD_ENTRY(EdgeFlag)				//41
+ICD_ENTRY(EdgeFlagv)				//42
+ICD_ENTRY(End)					//43
+ICD_ENTRY(Indexd)					//44
+ICD_ENTRY(Indexdv)				//45
+ICD_ENTRY(Indexf)					//46
+ICD_ENTRY(Indexfv)				//47
+ICD_ENTRY(Indexi)					//48
+ICD_ENTRY(Indexiv)				//49
+ICD_ENTRY(Indexs)					//50
+ICD_ENTRY(Indexsv)				//51
+ICD_ENTRY(Normal3b)				//52
+ICD_ENTRY(Normal3bv)				//53
+ICD_ENTRY(Normal3d)				//54
+ICD_ENTRY(Normal3dv)				//55
+ICD_ENTRY(Normal3f)				//56
+ICD_ENTRY(Normal3fv)				//57
+ICD_ENTRY(Normal3i)				//58
+ICD_ENTRY(Normal3iv)				//59
+ICD_ENTRY(Normal3s)				//60
+ICD_ENTRY(Normal3sv)				//61
+ICD_ENTRY(RasterPos2d)			//62
+ICD_ENTRY(RasterPos2dv)			//63
+ICD_ENTRY(RasterPos2f)			//64
+ICD_ENTRY(RasterPos2fv)			//65
+ICD_ENTRY(RasterPos2i)			//66
+ICD_ENTRY(RasterPos2iv)			//67
+ICD_ENTRY(RasterPos2s)			//68
+ICD_ENTRY(RasterPos2sv)			//69
+ICD_ENTRY(RasterPos3d)			//70
+ICD_ENTRY(RasterPos3dv)			//71
+ICD_ENTRY(RasterPos3f)			//72
+ICD_ENTRY(RasterPos3fv)			//73
+ICD_ENTRY(RasterPos3i)			//74
+ICD_ENTRY(RasterPos3iv)			//75
+ICD_ENTRY(RasterPos3s)			//76
+ICD_ENTRY(RasterPos3sv)			//77
+ICD_ENTRY(RasterPos4d)			//78
+ICD_ENTRY(RasterPos4dv)			//79
+ICD_ENTRY(RasterPos4f)			//80
+ICD_ENTRY(RasterPos4fv)			//81
+ICD_ENTRY(RasterPos4i)			//82
+ICD_ENTRY(RasterPos4iv)			//83
+ICD_ENTRY(RasterPos4s)			//84
+ICD_ENTRY(RasterPos4sv)			//85
+ICD_ENTRY(Rectd)					//86
+ICD_ENTRY(Rectdv)					//87
+ICD_ENTRY(Rectf)					//88
+ICD_ENTRY(Rectfv)					//89
+ICD_ENTRY(Recti)					//90
+ICD_ENTRY(Rectiv)					//91
+ICD_ENTRY(Rects)					//92
+ICD_ENTRY(Rectsv)					//93
+ICD_ENTRY(TexCoord1d)				//94
+ICD_ENTRY(TexCoord1dv)			//95
+ICD_ENTRY(TexCoord1f)				//96
+ICD_ENTRY(TexCoord1fv)			//97
+ICD_ENTRY(TexCoord1i)				//98
+ICD_ENTRY(TexCoord1iv)			//99
+ICD_ENTRY(TexCoord1s)				//100
+ICD_ENTRY(TexCoord1sv)			//101
+ICD_ENTRY(TexCoord2d)				//102
+ICD_ENTRY(TexCoord2dv)			//103
+ICD_ENTRY(TexCoord2f)				//104
+ICD_ENTRY(TexCoord2fv)			//105
+ICD_ENTRY(TexCoord2i)				//106
+ICD_ENTRY(TexCoord2iv)			//107
+ICD_ENTRY(TexCoord2s)				//108
+ICD_ENTRY(TexCoord2sv)			//109
+ICD_ENTRY(TexCoord3d)				//110
+ICD_ENTRY(TexCoord3dv)			//111
+ICD_ENTRY(TexCoord3f)				//112
+ICD_ENTRY(TexCoord3fv)			//113
+ICD_ENTRY(TexCoord3i)				//114
+ICD_ENTRY(TexCoord3iv)			//115
+ICD_ENTRY(TexCoord3s)				//116
+ICD_ENTRY(TexCoord3sv)			//117
+ICD_ENTRY(TexCoord4d)				//118
+ICD_ENTRY(TexCoord4dv)			//119
+ICD_ENTRY(TexCoord4f)				//120
+ICD_ENTRY(TexCoord4fv)			//121
+ICD_ENTRY(TexCoord4i)				//122
+ICD_ENTRY(TexCoord4iv)			//123
+ICD_ENTRY(TexCoord4s)				//124
+ICD_ENTRY(TexCoord4sv)			//125
+ICD_ENTRY(Vertex2d)				//126
+ICD_ENTRY(Vertex2dv)				//127
+ICD_ENTRY(Vertex2f)				//128
+ICD_ENTRY(Vertex2fv)				//129
+ICD_ENTRY(Vertex2i)				//130
+ICD_ENTRY(Vertex2iv)				//131
+ICD_ENTRY(Vertex2s)				//132
+ICD_ENTRY(Vertex2sv)				//133
+ICD_ENTRY(Vertex3d)				//134
+ICD_ENTRY(Vertex3dv)				//135
+ICD_ENTRY(Vertex3f)				//136
+ICD_ENTRY(Vertex3fv)				//137
+ICD_ENTRY(Vertex3i)				//138
+ICD_ENTRY(Vertex3iv)				//139
+ICD_ENTRY(Vertex3s)				//140
+ICD_ENTRY(Vertex3sv)				//141
+ICD_ENTRY(Vertex4d)				//142
+ICD_ENTRY(Vertex4dv)				//143
+ICD_ENTRY(Vertex4f)				//144
+ICD_ENTRY(Vertex4fv)				//145
+ICD_ENTRY(Vertex4i)				//146
+ICD_ENTRY(Vertex4iv)				//147
+ICD_ENTRY(Vertex4s)				//148
+ICD_ENTRY(Vertex4sv)				//149
+ICD_ENTRY(ClipPlane)				//150
+ICD_ENTRY(ColorMaterial)			//151
+ICD_ENTRY(CullFace)				//152
+ICD_ENTRY(Fogf)					//153
+ICD_ENTRY(Fogfv)					//154
+ICD_ENTRY(Fogi)					//155
+ICD_ENTRY(Fogiv)					//156
+ICD_ENTRY(FrontFace)				//157
+ICD_ENTRY(Hint)					//158
+ICD_ENTRY(Lightf)					//159
+ICD_ENTRY(Lightfv)				//160
+ICD_ENTRY(Lighti)					//161
+ICD_ENTRY(Lightiv)				//162
+ICD_ENTRY(LightModelf)			//163
+ICD_ENTRY(LightModelfv)			//164
+ICD_ENTRY(LightModeli)			//165
+ICD_ENTRY(LightModeliv)			//166
+ICD_ENTRY(LineStipple)			//167
+ICD_ENTRY(LineWidth)				//168
+ICD_ENTRY(Materialf)				//169
+ICD_ENTRY(Materialfv)				//170
+ICD_ENTRY(Materiali)				//171
+ICD_ENTRY(Materialiv)				//172
+ICD_ENTRY(PointSize)				//173
+ICD_ENTRY(PolygonMode)			//174
+ICD_ENTRY(PolygonStipple)			//175
+ICD_ENTRY(Scissor)				//176
+ICD_ENTRY(ShadeModel)				//177
+ICD_ENTRY(TexParameterf)			//178
+ICD_ENTRY(TexParameterfv)			//179
+ICD_ENTRY(TexParameteri)			//180
+ICD_ENTRY(TexParameteriv)			//181
+ICD_ENTRY(TexImage1D)				//182
+ICD_ENTRY(TexImage2D)				//183
+ICD_ENTRY(TexEnvf)				//184
+ICD_ENTRY(TexEnvfv)				//185
+ICD_ENTRY(TexEnvi)				//186
+ICD_ENTRY(TexEnviv)				//187
+ICD_ENTRY(TexGend)				//188
+ICD_ENTRY(TexGendv)				//189
+ICD_ENTRY(TexGenf)				//190
+ICD_ENTRY(TexGenfv)				//191
+ICD_ENTRY(TexGeni)				//192
+ICD_ENTRY(TexGeniv)				//193
+ICD_ENTRY(FeedbackBuffer)			//194
+ICD_ENTRY(SelectBuffer)			//195
+ICD_ENTRY(RenderMode)				//196
+ICD_ENTRY(InitNames)				//197
+ICD_ENTRY(LoadName)				//198
+ICD_ENTRY(PassThrough)			//199
+ICD_ENTRY(PopName)				//200
+ICD_ENTRY(PushName)				//201
+ICD_ENTRY(DrawBuffer)				//202
+ICD_ENTRY(Clear)					//203
+ICD_ENTRY(ClearAccum)				//204
+ICD_ENTRY(ClearIndex)				//205
+ICD_ENTRY(ClearColor)				//206
+ICD_ENTRY(ClearStencil)			//207
+ICD_ENTRY(ClearDepth)				//208
+ICD_ENTRY(StencilMask)			//209
+ICD_ENTRY(ColorMask)				//210
+ICD_ENTRY(DepthMask)				//211
+ICD_ENTRY(IndexMask)				//212
+ICD_ENTRY(Accum)					//213
+ICD_ENTRY(Disable)				//214
+ICD_ENTRY(Enable)					//215
+ICD_ENTRY(Finish)					//216
+ICD_ENTRY(Flush)					//217
+ICD_ENTRY(PopAttrib)				//218
+ICD_ENTRY(PushAttrib)				//219
+ICD_ENTRY(Map1d)					//220
+ICD_ENTRY(Map1f)					//221
+ICD_ENTRY(Map2d)					//222
+ICD_ENTRY(Map2f)					//223
+ICD_ENTRY(MapGrid1d)				//224
+ICD_ENTRY(MapGrid1f)				//225
+ICD_ENTRY(MapGrid2d)				//226
+ICD_ENTRY(MapGrid2f)				//227
+ICD_ENTRY(EvalCoord1d)			//228
+ICD_ENTRY(EvalCoord1dv)			//229
+ICD_ENTRY(EvalCoord1f)			//230
+ICD_ENTRY(EvalCoord1fv)			//231
+ICD_ENTRY(EvalCoord2d)			//232
+ICD_ENTRY(EvalCoord2dv)			//233
+ICD_ENTRY(EvalCoord2f)			//234
+ICD_ENTRY(EvalCoord2fv)			//235
+ICD_ENTRY(EvalMesh1)				//236
+ICD_ENTRY(EvalPoint1)				//237
+ICD_ENTRY(EvalMesh2)				//238
+ICD_ENTRY(EvalPoint2)				//239
+ICD_ENTRY(AlphaFunc)				//240
+ICD_ENTRY(BlendFunc)				//241
+ICD_ENTRY(LogicOp)				//242
+ICD_ENTRY(StencilFunc)			//243
+ICD_ENTRY(StencilOp)				//244
+ICD_ENTRY(DepthFunc)				//245
+ICD_ENTRY(PixelZoom)				//246
+ICD_ENTRY(PixelTransferf)			//247
+ICD_ENTRY(PixelTransferi)			//248
+ICD_ENTRY(PixelStoref)			//249
+ICD_ENTRY(PixelStorei)			//250
+ICD_ENTRY(PixelMapfv)				//251
+ICD_ENTRY(PixelMapuiv)			//252
+ICD_ENTRY(PixelMapusv)			//253
+ICD_ENTRY(ReadBuffer)				//254
+ICD_ENTRY(CopyPixels)				//255
+ICD_ENTRY(ReadPixels)				//256
+ICD_ENTRY(DrawPixels)				//257
+ICD_ENTRY(GetBooleanv)			//258
+ICD_ENTRY(GetClipPlane)			//259
+ICD_ENTRY(GetDoublev)				//260
+ICD_ENTRY(GetError)				//261
+ICD_ENTRY(GetFloatv)				//262
+ICD_ENTRY(GetIntegerv)			//263
+ICD_ENTRY(GetLightfv)				//264
+ICD_ENTRY(GetLightiv)				//265
+ICD_ENTRY(GetMapdv)				//266
+ICD_ENTRY(GetMapfv)				//267
+ICD_ENTRY(GetMapiv)				//268
+ICD_ENTRY(GetMaterialfv)			//269
+ICD_ENTRY(GetMaterialiv)			//270
+ICD_ENTRY(GetPixelMapfv)			//271
+ICD_ENTRY(GetPixelMapuiv)			//272
+ICD_ENTRY(GetPixelMapusv)			//273
+ICD_ENTRY(GetPolygonStipple)		//274
+ICD_ENTRY(GetString)				//275
+ICD_ENTRY(GetTexEnvfv)			//276
+ICD_ENTRY(GetTexEnviv)			//277
+ICD_ENTRY(GetTexGendv)			//278
+ICD_ENTRY(GetTexGenfv)			//279
+ICD_ENTRY(GetTexGeniv)			//280
+ICD_ENTRY(GetTexImage)			//281
+ICD_ENTRY(GetTexParameterfv)		//282
+ICD_ENTRY(GetTexParameteriv)		//283
+ICD_ENTRY(GetTexLevelParameterfv)	//284
+ICD_ENTRY(GetTexLevelParameteriv)	//285
+ICD_ENTRY(IsEnabled)				//286
+ICD_ENTRY(IsList)					//287
+ICD_ENTRY(DepthRange)				//288
+ICD_ENTRY(Frustum)				//289
+ICD_ENTRY(LoadIdentity)			//290
+ICD_ENTRY(LoadMatrixf)			//291
+ICD_ENTRY(LoadMatrixd)			//292
+ICD_ENTRY(MatrixMode)				//293
+ICD_ENTRY(MultMatrixf)			//294
+ICD_ENTRY(MultMatrixd)			//295
+ICD_ENTRY(Ortho)					//296
+ICD_ENTRY(PopMatrix)				//297
+ICD_ENTRY(PushMatrix)				//298
+ICD_ENTRY(Rotated)				//299
+ICD_ENTRY(Rotatef)				//300
+ICD_ENTRY(Scaled)					//301
+ICD_ENTRY(Scalef)					//302
+ICD_ENTRY(Translated)				//303
+ICD_ENTRY(Translatef)				//304
+ICD_ENTRY(Viewport)				//305
+ICD_ENTRY(ArrayElement)			//306
+ICD_ENTRY(BindTexture)			//307
+ICD_ENTRY(ColorPointer)			//308
+ICD_ENTRY(DisableClientState)		//309
+ICD_ENTRY(DrawArrays)				//310
+ICD_ENTRY(DrawElements)			//311
+ICD_ENTRY(EdgeFlagPointer)		//312
+ICD_ENTRY(EnableClientState)		//313
+ICD_ENTRY(IndexPointer)			//314
+ICD_ENTRY(Indexub)				//315
+ICD_ENTRY(Indexubv)				//316
+ICD_ENTRY(InterleavedArrays)		//317
+ICD_ENTRY(NormalPointer)			//318
+ICD_ENTRY(PolygonOffset)			//319
+ICD_ENTRY(TexCoordPointer)		//320
+ICD_ENTRY(VertexPointer)			//321
+ICD_ENTRY(AreTexturesResident)	//322
+ICD_ENTRY(CopyTexImage1D)			//323
+ICD_ENTRY(CopyTexImage2D)			//324
+ICD_ENTRY(CopyTexSubImage1D)		//325
+ICD_ENTRY(CopyTexSubImage2D)		//326
+ICD_ENTRY(DeleteTextures)			//327
+ICD_ENTRY(GenTextures)			//328
+ICD_ENTRY(GetPointerv)			//329
+ICD_ENTRY(IsTexture)				//330
+ICD_ENTRY(PrioritizeTextures)		//331
+ICD_ENTRY(TexSubImage1D)			//332
+ICD_ENTRY(TexSubImage2D)			//333
+ICD_ENTRY(PopClientAttrib)		//334
+ICD_ENTRY(PushClientAttrib)		//335
diff --git a/reactos/lib/mesa32/src/drivers/windows/icd/mesa.def b/reactos/lib/mesa32/src/drivers/windows/icd/mesa.def
new file mode 100644
index 00000000000..130594c5311
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/windows/icd/mesa.def
@@ -0,0 +1,138 @@
+; DO NOT EDIT - This file generated automatically by mesadef.py script
+DESCRIPTION 'Mesa (OpenGL work-alike) for Win32'
+VERSION 6.0
+;
+; Module definition file for Mesa (OPENGL32.DLL)
+;
+; Note: The OpenGL functions use the STDCALL
+; function calling convention.  Microsoft's
+; OPENGL32 uses this convention and so must the
+; Mesa OPENGL32 so that the Mesa DLL can be used
+; as a drop-in replacement.
+;
+; The linker exports STDCALL entry points with
+; 'decorated' names; e.g., _glBegin@0, where the
+; trailing number is the number of bytes of 
+; parameter data pushed onto the stack.  The
+; callee is responsible for popping this data
+; off the stack, usually via a RETF n instruction.
+;
+; However, the Microsoft OPENGL32.DLL does not export
+; the decorated names, even though the calling convention
+; is STDCALL.  So, this module definition file is
+; needed to force the Mesa OPENGL32.DLL to export the
+; symbols in the same manner as the Microsoft DLL.
+; Were it not for this problem, this file would not
+; be needed (for the gl* functions) since the entry
+; points are compiled with dllexport declspec.
+;
+; However, this file is still needed to export "internal"
+; Mesa symbols for the benefit of the OSMESA32.DLL.
+;
+EXPORTS
+;
+; ICD API
+	DrvCopyContext
+	DrvCreateContext
+	DrvCreateLayerContext
+	DrvDeleteContext
+	DrvDescribeLayerPlane
+	DrvDescribePixelFormat
+	DrvGetLayerPaletteEntries
+	DrvGetProcAddress
+	DrvReleaseContext
+	DrvRealizeLayerPalette
+	DrvSetContext
+	DrvSetLayerPaletteEntries
+	DrvSetPixelFormat
+	DrvShareLists
+	DrvSwapBuffers
+	DrvSwapLayerBuffers
+	DrvValidateVersion
+
+;
+; Mesa internals - mostly for OSMESA
+	_ac_CreateContext
+	_ac_DestroyContext
+	_ac_InvalidateState
+	_glapi_get_context
+	_glapi_get_proc_address
+	_mesa_base_compressed_texformat
+	_mesa_buffer_data
+	_mesa_buffer_map
+	_mesa_buffer_subdata
+	_mesa_bzero
+	_mesa_calloc
+	_mesa_choose_tex_format
+	_mesa_compressed_texture_size
+	_mesa_create_framebuffer
+	_mesa_create_visual
+	_mesa_delete_buffer_object
+	_mesa_delete_texture_object
+	_mesa_destroy_framebuffer
+	_mesa_destroy_visual
+	_mesa_enable_1_3_extensions
+	_mesa_enable_1_4_extensions
+	_mesa_enable_1_5_extensions
+	_mesa_enable_sw_extensions
+	_mesa_error
+	_mesa_free
+	_mesa_free_context_data
+	_mesa_get_current_context
+	_mesa_init_default_imports
+	_mesa_initialize_context
+	_mesa_make_current
+	_mesa_memcpy
+	_mesa_memset
+	_mesa_new_buffer_object
+	_mesa_new_texture_object
+	_mesa_problem
+	_mesa_ResizeBuffersMESA
+	_mesa_store_compressed_teximage1d
+	_mesa_store_compressed_teximage2d
+	_mesa_store_compressed_teximage3d
+	_mesa_store_compressed_texsubimage1d
+	_mesa_store_compressed_texsubimage2d
+	_mesa_store_compressed_texsubimage3d
+	_mesa_store_teximage1d
+	_mesa_store_teximage2d
+	_mesa_store_teximage3d
+	_mesa_store_texsubimage1d
+	_mesa_store_texsubimage2d
+	_mesa_store_texsubimage3d
+	_mesa_strcmp
+	_mesa_test_proxy_teximage
+	_mesa_Viewport
+	_swrast_Accum
+	_swrast_alloc_buffers
+	_swrast_Bitmap
+	_swrast_CopyPixels
+	_swrast_DrawBuffer
+	_swrast_DrawPixels
+	_swrast_GetDeviceDriverReference
+	_swrast_Clear
+	_swrast_choose_line
+	_swrast_choose_triangle
+	_swrast_CopyColorSubTable
+	_swrast_CopyColorTable
+	_swrast_CopyConvolutionFilter1D
+	_swrast_CopyConvolutionFilter2D
+	_swrast_copy_teximage1d
+	_swrast_copy_teximage2d
+	_swrast_copy_texsubimage1d
+	_swrast_copy_texsubimage2d
+	_swrast_copy_texsubimage3d
+	_swrast_CreateContext
+	_swrast_DestroyContext
+	_swrast_InvalidateState
+	_swrast_ReadPixels
+	_swrast_zbuffer_address
+	_swsetup_Wakeup
+	_swsetup_CreateContext
+	_swsetup_DestroyContext
+	_swsetup_InvalidateState
+	_tnl_CreateContext
+	_tnl_DestroyContext
+	_tnl_InvalidateState
+	_tnl_MakeCurrent
+	_tnl_run_pipeline
diff --git a/reactos/lib/mesa32/src/drivers/windows/icd/wmesadef.h b/reactos/lib/mesa32/src/drivers/windows/icd/wmesadef.h
new file mode 100644
index 00000000000..430da91fe14
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/windows/icd/wmesadef.h
@@ -0,0 +1,173 @@
+/*	File name	:	wmesadef.h
+ *  Version		:	2.3
+ *
+ *  Header file for display driver for Mesa 2.3  under
+ *	Windows95, WindowsNT and Win32
+ *
+ *	Copyright (C) 1996-  Li Wei
+ *  Address		:		Institute of Artificial Intelligence
+ *				:			& Robotics
+ *				:		Xi'an Jiaotong University
+ *  Email		:		liwei@aiar.xjtu.edu.cn
+ *  Web page	:		http://sun.aiar.xjtu.edu.cn
+ *
+ *  This file and its associations are partially based on the
+ *  Windows NT driver for Mesa, written by Mark Leaming
+ *  (mark@rsinc.com).
+ */
+
+/*
+ * $Log: wmesadef.h,v 
+ * Revision 1.1.1.1  1999/08/19 00:55:42  jt
+ * Imported source
+ 
+ * Revision 1.3  1999/01/03 03:08:57  brian
+ * Ted Jump's change
+ *
+ * Initial version 1997/6/14 CST by Li Wei(liwei@aiar.xjtu.edu.cn)
+ */
+
+/*
+ * $Log: wmesadef.h,v 
+ * Revision 1.1.1.1  1999/08/19 00:55:42  jt
+ * Imported source
+ 
+ * Revision 1.3  1999/01/03 03:08:57  brian
+ * Ted Jump's change
+ *
+ * Revision 2.1  1996/11/15 10:54:00  CST by Li Wei(liwei@aiar.xjtu.edu.cn)
+ * a new element added to wmesa_context :
+ * dither_flag
+ */
+
+/*
+ * $Log: wmesadef.h,v 
+ * Revision 1.1.1.1  1999/08/19 00:55:42  jt
+ * Imported source
+ 
+ * Revision 1.3  1999/01/03 03:08:57  brian
+ * Ted Jump's change
+ *
+ * Revision 2.0  1996/11/15 10:54:00  CST by Li Wei(liwei@aiar.xjtu.edu.cn)
+ * Initial revision
+ */
+
+
+
+#ifndef DDMESADEF_H
+#define DDMESADEF_H
+
+// uncomment this to use DirectDraw driver
+//#define DDRAW 1
+// uncomment this to use a pointer to a function for setting the pixels
+// in the buffer
+#define COMPILE_SETPIXEL 1
+// uncomment this to enable the fast win32 rasterizers ( commented out for MesaGL 4.0 )
+// #define FAST_RASTERIZERS 1
+// uncomment this to enable setting function pointers once inside of
+// WMesaCreateContext instead of on every call to wmesa_update_state()
+#define SET_FPOINTERS_ONCE 1
+
+
+#include <windows.h>
+#include <GL\gl.h>
+#include "context.h"
+#ifdef DDRAW
+#define DIRECTDRAW_VERSION 0x0100
+	#include <ddraw.h>
+#endif
+//#include "profile.h"
+
+#define REDBITS		0x03
+#define REDSHIFT	0x00
+#define GREENBITS	0x03
+#define GREENSHIFT	0x03
+#define BLUEBITS	0x02
+#define BLUESHIFT	0x06
+
+typedef struct _dibSection{
+	HDC		hDC;
+	HANDLE	hFileMap;
+	BOOL	fFlushed;
+	LPVOID	base;
+}WMDIBSECTION, *PWMDIBSECTION;
+
+#ifdef COMPILE_SETPIXEL
+typedef void (*SETPIXELTYPE)(struct wmesa_context *pwc, int iScanLine, int iPixel, BYTE r, BYTE g, BYTE b);
+#endif
+
+typedef struct wmesa_context{
+    GLcontext *gl_ctx;		/* The core GL/Mesa context */
+	GLvisual *gl_visual;		/* Describes the buffers */
+    GLframebuffer *gl_buffer;	/* Depth, stencil, accum, etc buffers */
+
+	HWND				Window;
+    HDC                 hDC;
+    HPALETTE            hPalette;
+    HPALETTE            hOldPalette;
+    HPEN                hPen;
+    HPEN                hOldPen;
+    HCURSOR             hOldCursor;
+    COLORREF            crColor;
+    // 3D projection stuff
+    RECT                drawRect;
+    UINT                uiDIBoffset;
+    // OpenGL stuff
+    HPALETTE            hGLPalette;
+	GLuint				width;
+	GLuint				height;
+	GLuint				ScanWidth;
+	GLboolean			db_flag;	//* double buffered?
+	GLboolean			rgb_flag;	//* RGB mode?
+	GLboolean			dither_flag;	//* use dither when 256 color mode for RGB?
+	GLuint				depth;		//* bits per pixel (1, 8, 24, etc)
+	ULONG				pixel;	// current color index or RGBA pixel value
+	ULONG				clearpixel; //* pixel for clearing the color buffers
+	PBYTE				ScreenMem; // WinG memory
+	BITMAPINFO			*IndexFormat;
+	HPALETTE			hPal; // Current Palette
+	HPALETTE			hPalHalfTone;
+
+
+	WMDIBSECTION		dib;
+    BITMAPINFO          bmi;
+    HBITMAP             hbmDIB;
+    HBITMAP             hOldBitmap;
+	HBITMAP				Old_Compat_BM;
+	HBITMAP				Compat_BM;            // Bitmap for double buffering
+    PBYTE               pbPixels;
+    int                 nColors;
+	BYTE				cColorBits;
+	int					pixelformat;
+
+#ifdef DDRAW
+	LPDIRECTDRAW            lpDD;           // DirectDraw object
+//	LPDIRECTDRAW2            lpDD2;           // DirectDraw object
+	LPDIRECTDRAWSURFACE     lpDDSPrimary;   // DirectDraw primary surface
+	LPDIRECTDRAWSURFACE     lpDDSOffScreen;	// DirectDraw off screen surface
+	LPDIRECTDRAWPALETTE     lpDDPal;        // DirectDraw palette
+	BOOL                    bActive;        // is application active?
+	DDSURFACEDESC	        ddsd;			// surface description
+	int 					fullScreen;		// fullscreen ?
+	int			            gMode ;			// fullscreen mode
+	LONG					oldWndProc;		// old Window proc. we need to hook WM_MOVE message to update the drawing rectangle
+#endif
+	RECT					rectOffScreen;
+	RECT					rectSurface;
+	HWND					hwnd;
+	DWORD					pitch;
+	PBYTE					addrOffScreen;
+#ifdef COMPILE_SETPIXEL
+      SETPIXELTYPE                    wmSetPixel;
+#endif // COMPILE_SETPIXEL
+//#ifdef PROFILE
+//	MESAPROF	profile;
+//#endif
+}  *PWMC;
+
+
+#define PAGE_FILE		0xffffffff
+
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/drivers/x11/fakeglx.c b/reactos/lib/mesa32/src/drivers/x11/fakeglx.c
new file mode 100644
index 00000000000..a616915f1d9
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/x11/fakeglx.c
@@ -0,0 +1,2868 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0.1
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * This is an emulation of the GLX API which allows Mesa/GLX-based programs
+ * to run on X servers which do not have the real GLX extension.
+ *
+ * Thanks to the contributors:
+ *
+ * Initial version:  Philip Brown (phil@bolthole.com)
+ * Better glXGetConfig() support: Armin Liebchen (liebchen@asylum.cs.utah.edu)
+ * Further visual-handling refinements: Wolfram Gloger
+ *    (wmglo@Dent.MED.Uni-Muenchen.DE).
+ *
+ * Notes:
+ *   Don't be fooled, stereo isn't supported yet.
+ */
+
+
+
+#include "glxheader.h"
+#include "glxapi.h"
+#include "GL/xmesa.h"
+#include "context.h"
+#include "config.h"
+#include "macros.h"
+#include "imports.h"
+#include "mtypes.h"
+#include "version.h"
+#include "xfonts.h"
+#include "xmesaP.h"
+
+
+/* This indicates the client-side GLX API and GLX encoder version. */
+#define CLIENT_MAJOR_VERSION 1
+#define CLIENT_MINOR_VERSION 4  /* but don't have 1.3's pbuffers, etc yet */
+
+/* This indicates the server-side GLX decoder version.
+ * GLX 1.4 indicates OpenGL 1.3 support
+ */
+#define SERVER_MAJOR_VERSION 1
+#define SERVER_MINOR_VERSION 4
+
+/* This is appended onto the glXGetClient/ServerString version strings. */
+#define MESA_GLX_VERSION "Mesa " MESA_VERSION_STRING
+
+/* Who implemented this GLX? */
+#define VENDOR "Brian Paul"
+
+#define EXTENSIONS \
+   "GLX_MESA_set_3dfx_mode " \
+   "GLX_MESA_copy_sub_buffer " \
+   "GLX_MESA_pixmap_colormap " \
+   "GLX_MESA_release_buffers " \
+   "GLX_ARB_get_proc_address " \
+   "GLX_EXT_visual_info " \
+   "GLX_EXT_visual_rating " \
+   "GLX_SGI_video_sync " \
+   "GLX_SGIX_fbconfig " \
+   "GLX_SGIX_pbuffer "
+/*
+   "GLX_ARB_render_texture"
+*/
+
+/* Silence compiler warnings */
+extern void Fake_glXDummyFunc( void );
+void Fake_glXDummyFunc( void )
+{
+   (void) kernel8;
+   (void) DitherValues;
+   (void) HPCR_DRGB;
+   (void) kernel1;
+}
+
+
+/*
+ * Our fake GLX context will contain a "real" GLX context and an XMesa context.
+ *
+ * Note that a pointer to a __GLXcontext is a pointer to a fake_glx_context,
+ * and vice versa.
+ *
+ * We really just need this structure in order to make the libGL functions
+ * glXGetCurrentContext(), glXGetCurrentDrawable() and glXGetCurrentDisplay()
+ * work correctly.
+ */
+struct fake_glx_context {
+   __GLXcontext glxContext;   /* this MUST be first! */
+   XMesaContext xmesaContext;
+};
+
+
+
+/**********************************************************************/
+/***                       GLX Visual Code                          ***/
+/**********************************************************************/
+
+#define DONT_CARE -1
+
+
+#define MAX_VISUALS 100
+static XMesaVisual VisualTable[MAX_VISUALS];
+static int NumVisuals = 0;
+
+
+/*
+ * This struct and some code fragments borrowed
+ * from Mark Kilgard's GLUT library.
+ */
+typedef struct _OverlayInfo {
+  /* Avoid 64-bit portability problems by being careful to use
+     longs due to the way XGetWindowProperty is specified. Note
+     that these parameters are passed as CARD32s over X
+     protocol. */
+  unsigned long overlay_visual;
+  long transparent_type;
+  long value;
+  long layer;
+} OverlayInfo;
+
+
+
+/* Macro to handle c_class vs class field name in XVisualInfo struct */
+#if defined(__cplusplus) || defined(c_plusplus)
+#define CLASS c_class
+#else
+#define CLASS class
+#endif
+
+
+
+
+/*
+ * Test if the given XVisualInfo is usable for Mesa rendering.
+ */
+static GLboolean is_usable_visual( XVisualInfo *vinfo )
+{
+   switch (vinfo->CLASS) {
+      case StaticGray:
+      case GrayScale:
+         /* Any StaticGray/GrayScale visual works in RGB or CI mode */
+         return GL_TRUE;
+      case StaticColor:
+      case PseudoColor:
+	 /* Any StaticColor/PseudoColor visual of at least 4 bits */
+	 if (vinfo->depth>=4) {
+	    return GL_TRUE;
+	 }
+	 else {
+	    return GL_FALSE;
+	 }
+      case TrueColor:
+      case DirectColor:
+	 /* Any depth of TrueColor or DirectColor works in RGB mode */
+	 return GL_TRUE;
+      default:
+	 /* This should never happen */
+	 return GL_FALSE;
+   }
+}
+
+
+
+/*
+ * Return the level (overlay, normal, underlay) of a given XVisualInfo.
+ * Input:  dpy - the X display
+ *         vinfo - the XVisualInfo to test
+ * Return:  level of the visual:
+ *             0 = normal planes
+ *            >0 = overlay planes
+ *            <0 = underlay planes
+ */
+static int level_of_visual( Display *dpy, XVisualInfo *vinfo )
+{
+   Atom overlayVisualsAtom;
+   OverlayInfo *overlay_info = NULL;
+   int numOverlaysPerScreen;
+   Status status;
+   Atom actualType;
+   int actualFormat;
+   unsigned long sizeData, bytesLeft;
+   int i;
+
+   /*
+    * The SERVER_OVERLAY_VISUALS property on the root window contains
+    * a list of overlay visuals.  Get that list now.
+    */
+   overlayVisualsAtom = XInternAtom(dpy,"SERVER_OVERLAY_VISUALS", True);
+   if (overlayVisualsAtom == None) {
+      return 0;
+   }
+
+   status = XGetWindowProperty(dpy, RootWindow( dpy, vinfo->screen ),
+                               overlayVisualsAtom, 0L, (long) 10000, False,
+                               overlayVisualsAtom, &actualType, &actualFormat,
+                               &sizeData, &bytesLeft,
+                               (unsigned char **) &overlay_info );
+
+   if (status != Success || actualType != overlayVisualsAtom ||
+       actualFormat != 32 || sizeData < 4) {
+      /* something went wrong */
+      XFree((void *) overlay_info);
+      return 0;
+   }
+
+   /* search the overlay visual list for the visual ID of interest */
+   numOverlaysPerScreen = (int) (sizeData / 4);
+   for (i=0;i<numOverlaysPerScreen;i++) {
+      OverlayInfo *ov;
+      ov = overlay_info + i;
+      if (ov->overlay_visual==vinfo->visualid) {
+         /* found the visual */
+         if (/*ov->transparent_type==1 &&*/ ov->layer!=0) {
+            int level = ov->layer;
+            XFree((void *) overlay_info);
+            return level;
+         }
+         else {
+            XFree((void *) overlay_info);
+            return 0;
+         }
+      }
+   }
+
+   /* The visual ID was not found in the overlay list. */
+   XFree((void *) overlay_info);
+   return 0;
+}
+
+
+
+
+/*
+ * Given an XVisualInfo and RGB, Double, and Depth buffer flags, save the
+ * configuration in our list of GLX visuals.
+ */
+static XMesaVisual
+save_glx_visual( Display *dpy, XVisualInfo *vinfo,
+                 GLboolean rgbFlag, GLboolean alphaFlag, GLboolean dbFlag,
+                 GLboolean stereoFlag,
+                 GLint depth_size, GLint stencil_size,
+                 GLint accumRedSize, GLint accumGreenSize,
+                 GLint accumBlueSize, GLint accumAlphaSize,
+                 GLint level )
+{
+   GLboolean ximageFlag = GL_TRUE;
+   XMesaVisual xmvis;
+   GLint i;
+   GLboolean comparePointers;
+
+   if (dbFlag) {
+      /* Check if the MESA_BACK_BUFFER env var is set */
+      char *backbuffer = _mesa_getenv("MESA_BACK_BUFFER");
+      if (backbuffer) {
+         if (backbuffer[0]=='p' || backbuffer[0]=='P') {
+            ximageFlag = GL_FALSE;
+         }
+         else if (backbuffer[0]=='x' || backbuffer[0]=='X') {
+            ximageFlag = GL_TRUE;
+         }
+         else {
+            _mesa_warning(NULL, "Mesa: invalid value for MESA_BACK_BUFFER environment variable, using an XImage.");
+         }
+      }
+   }
+
+   /* Comparing IDs uses less memory but sometimes fails. */
+   /* XXX revisit this after 3.0 is finished. */
+   if (_mesa_getenv("MESA_GLX_VISUAL_HACK"))
+      comparePointers = GL_TRUE;
+   else
+      comparePointers = GL_FALSE;
+
+   /* First check if a matching visual is already in the list */
+   for (i=0; i<NumVisuals; i++) {
+      XMesaVisual v = VisualTable[i];
+      if (v->display == dpy
+          && v->level == level
+          && v->ximage_flag == ximageFlag
+          && v->mesa_visual.rgbMode == rgbFlag
+          && v->mesa_visual.doubleBufferMode == dbFlag
+          && v->mesa_visual.stereoMode == stereoFlag
+          && (v->mesa_visual.alphaBits > 0) == alphaFlag
+          && (v->mesa_visual.depthBits >= depth_size || depth_size == 0)
+          && (v->mesa_visual.stencilBits >= stencil_size || stencil_size == 0)
+          && (v->mesa_visual.accumRedBits >= accumRedSize || accumRedSize == 0)
+          && (v->mesa_visual.accumGreenBits >= accumGreenSize || accumGreenSize == 0)
+          && (v->mesa_visual.accumBlueBits >= accumBlueSize || accumBlueSize == 0)
+          && (v->mesa_visual.accumAlphaBits >= accumAlphaSize || accumAlphaSize == 0)) {
+         /* now either compare XVisualInfo pointers or visual IDs */
+         if ((!comparePointers && v->visinfo->visualid == vinfo->visualid)
+             || (comparePointers && v->vishandle == vinfo)) {
+            return v;
+         }
+      }
+   }
+
+   /* Create a new visual and add it to the list. */
+
+   if (NumVisuals >= MAX_VISUALS) {
+      _mesa_problem(NULL, "GLX Error: maximum number of visuals exceeded");
+      return NULL;
+   }
+
+   xmvis = XMesaCreateVisual( dpy, vinfo, rgbFlag, alphaFlag, dbFlag,
+                              stereoFlag, ximageFlag,
+                              depth_size, stencil_size,
+                              accumRedSize, accumBlueSize,
+                              accumBlueSize, accumAlphaSize, 0, level,
+                              GLX_NONE_EXT );
+   if (xmvis) {
+      /* Save a copy of the pointer now so we can find this visual again
+       * if we need to search for it in find_glx_visual().
+       */
+      xmvis->vishandle = vinfo;
+      /* add xmvis to the list */
+      VisualTable[NumVisuals] = xmvis;
+      NumVisuals++;
+   }
+   return xmvis;
+}
+
+
+
+/*
+ * Create a GLX visual from a regular XVisualInfo.
+ * This is called when Fake GLX is given an XVisualInfo which wasn't
+ * returned by glXChooseVisual.  Since this is the first time we're
+ * considering this visual we'll take a guess at reasonable values
+ * for depth buffer size, stencil size, accum size, etc.
+ * This is the best we can do with a client-side emulation of GLX.
+ */
+static XMesaVisual
+create_glx_visual( Display *dpy, XVisualInfo *visinfo )
+{
+   int vislevel;
+
+   vislevel = level_of_visual( dpy, visinfo );
+   if (vislevel) {
+      /* Configure this visual as a CI, single-buffered overlay */
+      return save_glx_visual( dpy, visinfo,
+                              GL_FALSE,  /* rgb */
+                              GL_FALSE,  /* alpha */
+                              GL_FALSE,  /* double */
+                              GL_FALSE,  /* stereo */
+                              0,         /* depth bits */
+                              0,         /* stencil bits */
+                              0,0,0,0,   /* accum bits */
+                              vislevel   /* level */
+                            );
+   }
+   else if (is_usable_visual( visinfo )) {
+      if (_mesa_getenv("MESA_GLX_FORCE_CI")) {
+         /* Configure this visual as a COLOR INDEX visual. */
+         return save_glx_visual( dpy, visinfo,
+                                 GL_FALSE,   /* rgb */
+                                 GL_FALSE,  /* alpha */
+                                 GL_TRUE,   /* double */
+                                 GL_FALSE,  /* stereo */
+                                 DEFAULT_SOFTWARE_DEPTH_BITS,
+                                 8 * sizeof(GLstencil),
+                                 0 * sizeof(GLaccum), /* r */
+                                 0 * sizeof(GLaccum), /* g */
+                                 0 * sizeof(GLaccum), /* b */
+                                 0 * sizeof(GLaccum), /* a */
+                                 0          /* level */
+                               );
+      }
+      else {
+         /* Configure this visual as RGB, double-buffered, depth-buffered. */
+         /* This is surely wrong for some people's needs but what else */
+         /* can be done?  They should use glXChooseVisual(). */
+         return save_glx_visual( dpy, visinfo,
+                                 GL_TRUE,   /* rgb */
+                                 GL_FALSE,  /* alpha */
+                                 GL_TRUE,   /* double */
+                                 GL_FALSE,  /* stereo */
+                                 DEFAULT_SOFTWARE_DEPTH_BITS,
+                                 8 * sizeof(GLstencil),
+                                 8 * sizeof(GLaccum), /* r */
+                                 8 * sizeof(GLaccum), /* g */
+                                 8 * sizeof(GLaccum), /* b */
+                                 8 * sizeof(GLaccum), /* a */
+                                 0          /* level */
+                               );
+      }
+   }
+   else {
+      _mesa_warning(NULL, "Mesa: error in glXCreateContext: bad visual\n");
+      return NULL;
+   }
+}
+
+
+
+/*
+ * Find the GLX visual associated with an XVisualInfo.
+ */
+static XMesaVisual
+find_glx_visual( Display *dpy, XVisualInfo *vinfo )
+{
+   int i;
+
+   /* try to match visual id */
+   for (i=0;i<NumVisuals;i++) {
+      if (VisualTable[i]->display==dpy
+          && VisualTable[i]->visinfo->visualid == vinfo->visualid) {
+         return VisualTable[i];
+      }
+   }
+
+   /* if that fails, try to match pointers */
+   for (i=0;i<NumVisuals;i++) {
+      if (VisualTable[i]->display==dpy && VisualTable[i]->vishandle==vinfo) {
+         return VisualTable[i];
+      }
+   }
+
+   return NULL;
+}
+
+
+
+/*
+ * Return the transparent pixel value for a GLX visual.
+ * Input:  glxvis - the glx_visual
+ * Return:  a pixel value or -1 if no transparent pixel
+ */
+static int transparent_pixel( XMesaVisual glxvis )
+{
+   Display *dpy = glxvis->display;
+   XVisualInfo *vinfo = glxvis->visinfo;
+   Atom overlayVisualsAtom;
+   OverlayInfo *overlay_info = NULL;
+   int numOverlaysPerScreen;
+   Status status;
+   Atom actualType;
+   int actualFormat;
+   unsigned long sizeData, bytesLeft;
+   int i;
+
+   /*
+    * The SERVER_OVERLAY_VISUALS property on the root window contains
+    * a list of overlay visuals.  Get that list now.
+    */
+   overlayVisualsAtom = XInternAtom(dpy,"SERVER_OVERLAY_VISUALS", True);
+   if (overlayVisualsAtom == None) {
+      return -1;
+   }
+
+   status = XGetWindowProperty(dpy, RootWindow( dpy, vinfo->screen ),
+                               overlayVisualsAtom, 0L, (long) 10000, False,
+                               overlayVisualsAtom, &actualType, &actualFormat,
+                               &sizeData, &bytesLeft,
+                               (unsigned char **) &overlay_info );
+
+   if (status != Success || actualType != overlayVisualsAtom ||
+       actualFormat != 32 || sizeData < 4) {
+      /* something went wrong */
+      XFree((void *) overlay_info);
+      return -1;
+   }
+
+   /* search the overlay visual list for the visual ID of interest */
+   numOverlaysPerScreen = (int) (sizeData / 4);
+   for (i=0;i<numOverlaysPerScreen;i++) {
+      OverlayInfo *ov;
+      ov = overlay_info + i;
+      if (ov->overlay_visual==vinfo->visualid) {
+         /* found it! */
+         if (ov->transparent_type==0) {
+            /* type 0 indicates no transparency */
+            XFree((void *) overlay_info);
+            return -1;
+         }
+         else {
+            /* ov->value is the transparent pixel */
+            XFree((void *) overlay_info);
+            return ov->value;
+         }
+      }
+   }
+
+   /* The visual ID was not found in the overlay list. */
+   XFree((void *) overlay_info);
+   return -1;
+}
+
+
+
+/*
+ * Try to get an X visual which matches the given arguments.
+ */
+static XVisualInfo *get_visual( Display *dpy, int scr,
+			        unsigned int depth, int xclass )
+{
+   XVisualInfo temp, *vis;
+   long mask;
+   int n;
+   unsigned int default_depth;
+   int default_class;
+
+   mask = VisualScreenMask | VisualDepthMask | VisualClassMask;
+   temp.screen = scr;
+   temp.depth = depth;
+   temp.CLASS = xclass;
+
+   default_depth = DefaultDepth(dpy,scr);
+   default_class = DefaultVisual(dpy,scr)->CLASS;
+
+   if (depth==default_depth && xclass==default_class) {
+      /* try to get root window's visual */
+      temp.visualid = DefaultVisual(dpy,scr)->visualid;
+      mask |= VisualIDMask;
+   }
+
+   vis = XGetVisualInfo( dpy, mask, &temp, &n );
+
+   /* In case bits/pixel > 24, make sure color channels are still <=8 bits.
+    * An SGI Infinite Reality system, for example, can have 30bpp pixels:
+    * 10 bits per color channel.  Mesa's limited to a max of 8 bits/channel.
+    */
+   if (vis && depth > 24 && (xclass==TrueColor || xclass==DirectColor)) {
+      if (_mesa_bitcount((GLuint) vis->red_mask  ) <= 8 &&
+          _mesa_bitcount((GLuint) vis->green_mask) <= 8 &&
+          _mesa_bitcount((GLuint) vis->blue_mask ) <= 8) {
+         return vis;
+      }
+      else {
+         XFree((void *) vis);
+         return NULL;
+      }
+   }
+
+   return vis;
+}
+
+
+
+/*
+ * Retrieve the value of the given environment variable and find
+ * the X visual which matches it.
+ * Input:  dpy - the display
+ *         screen - the screen number
+ *         varname - the name of the environment variable
+ * Return:  an XVisualInfo pointer to NULL if error.
+ */
+static XVisualInfo *get_env_visual(Display *dpy, int scr, const char *varname)
+{
+   char value[100], type[100];
+   int depth, xclass = -1;
+   XVisualInfo *vis;
+
+   if (!_mesa_getenv( varname )) {
+      return NULL;
+   }
+
+   _mesa_strncpy( value, _mesa_getenv(varname), 100 );
+   value[99] = 0;
+
+   sscanf( value, "%s %d", type, &depth );
+
+   if (_mesa_strcmp(type,"TrueColor")==0)          xclass = TrueColor;
+   else if (_mesa_strcmp(type,"DirectColor")==0)   xclass = DirectColor;
+   else if (_mesa_strcmp(type,"PseudoColor")==0)   xclass = PseudoColor;
+   else if (_mesa_strcmp(type,"StaticColor")==0)   xclass = StaticColor;
+   else if (_mesa_strcmp(type,"GrayScale")==0)     xclass = GrayScale;
+   else if (_mesa_strcmp(type,"StaticGray")==0)    xclass = StaticGray;
+
+   if (xclass>-1 && depth>0) {
+      vis = get_visual( dpy, scr, depth, xclass );
+      if (vis) {
+	 return vis;
+      }
+   }
+
+   _mesa_warning(NULL, "GLX unable to find visual class=%s, depth=%d.",
+                 type, depth);
+
+   return NULL;
+}
+
+
+
+/*
+ * Select an X visual which satisfies the RGBA/CI flag and minimum depth.
+ * Input:  dpy, screen - X display and screen number
+ *         rgba - GL_TRUE = RGBA mode, GL_FALSE = CI mode
+ *         min_depth - minimum visual depth
+ *         preferred_class - preferred GLX visual class or DONT_CARE
+ * Return:  pointer to an XVisualInfo or NULL.
+ */
+static XVisualInfo *choose_x_visual( Display *dpy, int screen,
+				     GLboolean rgba, int min_depth,
+                                     int preferred_class )
+{
+   XVisualInfo *vis;
+   int xclass, visclass = 0;
+   int depth;
+
+   if (rgba) {
+      Atom hp_cr_maps = XInternAtom(dpy, "_HP_RGB_SMOOTH_MAP_LIST", True);
+      /* First see if the MESA_RGB_VISUAL env var is defined */
+      vis = get_env_visual( dpy, screen, "MESA_RGB_VISUAL" );
+      if (vis) {
+	 return vis;
+      }
+      /* Otherwise, search for a suitable visual */
+      if (preferred_class==DONT_CARE) {
+         for (xclass=0;xclass<6;xclass++) {
+            switch (xclass) {
+               case 0:  visclass = TrueColor;    break;
+               case 1:  visclass = DirectColor;  break;
+               case 2:  visclass = PseudoColor;  break;
+               case 3:  visclass = StaticColor;  break;
+               case 4:  visclass = GrayScale;    break;
+               case 5:  visclass = StaticGray;   break;
+            }
+            if (min_depth==0) {
+               /* start with shallowest */
+               for (depth=0;depth<=32;depth++) {
+                  if (visclass==TrueColor && depth==8 && !hp_cr_maps) {
+                     /* Special case:  try to get 8-bit PseudoColor before */
+                     /* 8-bit TrueColor */
+                     vis = get_visual( dpy, screen, 8, PseudoColor );
+                     if (vis) {
+                        return vis;
+                     }
+                  }
+                  vis = get_visual( dpy, screen, depth, visclass );
+                  if (vis) {
+                     return vis;
+                  }
+               }
+            }
+            else {
+               /* start with deepest */
+               for (depth=32;depth>=min_depth;depth--) {
+                  if (visclass==TrueColor && depth==8 && !hp_cr_maps) {
+                     /* Special case:  try to get 8-bit PseudoColor before */
+                     /* 8-bit TrueColor */
+                     vis = get_visual( dpy, screen, 8, PseudoColor );
+                     if (vis) {
+                        return vis;
+                     }
+                  }
+                  vis = get_visual( dpy, screen, depth, visclass );
+                  if (vis) {
+                     return vis;
+                  }
+               }
+            }
+         }
+      }
+      else {
+         /* search for a specific visual class */
+         switch (preferred_class) {
+            case GLX_TRUE_COLOR_EXT:    visclass = TrueColor;    break;
+            case GLX_DIRECT_COLOR_EXT:  visclass = DirectColor;  break;
+            case GLX_PSEUDO_COLOR_EXT:  visclass = PseudoColor;  break;
+            case GLX_STATIC_COLOR_EXT:  visclass = StaticColor;  break;
+            case GLX_GRAY_SCALE_EXT:    visclass = GrayScale;    break;
+            case GLX_STATIC_GRAY_EXT:   visclass = StaticGray;   break;
+            default:   return NULL;
+         }
+         if (min_depth==0) {
+            /* start with shallowest */
+            for (depth=0;depth<=32;depth++) {
+               vis = get_visual( dpy, screen, depth, visclass );
+               if (vis) {
+                  return vis;
+               }
+            }
+         }
+         else {
+            /* start with deepest */
+            for (depth=32;depth>=min_depth;depth--) {
+               vis = get_visual( dpy, screen, depth, visclass );
+               if (vis) {
+                  return vis;
+               }
+            }
+         }
+      }
+   }
+   else {
+      /* First see if the MESA_CI_VISUAL env var is defined */
+      vis = get_env_visual( dpy, screen, "MESA_CI_VISUAL" );
+      if (vis) {
+	 return vis;
+      }
+      /* Otherwise, search for a suitable visual, starting with shallowest */
+      if (preferred_class==DONT_CARE) {
+         for (xclass=0;xclass<4;xclass++) {
+            switch (xclass) {
+               case 0:  visclass = PseudoColor;  break;
+               case 1:  visclass = StaticColor;  break;
+               case 2:  visclass = GrayScale;    break;
+               case 3:  visclass = StaticGray;   break;
+            }
+            /* try 8-bit up through 16-bit */
+            for (depth=8;depth<=16;depth++) {
+               vis = get_visual( dpy, screen, depth, visclass );
+               if (vis) {
+                  return vis;
+               }
+            }
+            /* try min_depth up to 8-bit */
+            for (depth=min_depth;depth<8;depth++) {
+               vis = get_visual( dpy, screen, depth, visclass );
+               if (vis) {
+                  return vis;
+               }
+            }
+         }
+      }
+      else {
+         /* search for a specific visual class */
+         switch (preferred_class) {
+            case GLX_TRUE_COLOR_EXT:    visclass = TrueColor;    break;
+            case GLX_DIRECT_COLOR_EXT:  visclass = DirectColor;  break;
+            case GLX_PSEUDO_COLOR_EXT:  visclass = PseudoColor;  break;
+            case GLX_STATIC_COLOR_EXT:  visclass = StaticColor;  break;
+            case GLX_GRAY_SCALE_EXT:    visclass = GrayScale;    break;
+            case GLX_STATIC_GRAY_EXT:   visclass = StaticGray;   break;
+            default:   return NULL;
+         }
+         /* try 8-bit up through 16-bit */
+         for (depth=8;depth<=16;depth++) {
+            vis = get_visual( dpy, screen, depth, visclass );
+            if (vis) {
+               return vis;
+            }
+         }
+         /* try min_depth up to 8-bit */
+         for (depth=min_depth;depth<8;depth++) {
+            vis = get_visual( dpy, screen, depth, visclass );
+            if (vis) {
+               return vis;
+            }
+         }
+      }
+   }
+
+   /* didn't find a visual */
+   return NULL;
+}
+
+
+
+/*
+ * Find the deepest X over/underlay visual of at least min_depth.
+ * Input:  dpy, screen - X display and screen number
+ *         level - the over/underlay level
+ *         trans_type - transparent pixel type: GLX_NONE_EXT,
+ *                      GLX_TRANSPARENT_RGB_EXT, GLX_TRANSPARENT_INDEX_EXT,
+ *                      or DONT_CARE
+ *         trans_value - transparent pixel value or DONT_CARE
+ *         min_depth - minimum visual depth
+ *         preferred_class - preferred GLX visual class or DONT_CARE
+ * Return:  pointer to an XVisualInfo or NULL.
+ */
+static XVisualInfo *choose_x_overlay_visual( Display *dpy, int scr,
+                                             GLboolean rgbFlag,
+                                             int level, int trans_type,
+                                             int trans_value,
+                                             int min_depth,
+                                             int preferred_class )
+{
+   Atom overlayVisualsAtom;
+   OverlayInfo *overlay_info;
+   int numOverlaysPerScreen;
+   Status status;
+   Atom actualType;
+   int actualFormat;
+   unsigned long sizeData, bytesLeft;
+   int i;
+   XVisualInfo *deepvis;
+   int deepest;
+
+   /*DEBUG int tt, tv; */
+
+   switch (preferred_class) {
+      case GLX_TRUE_COLOR_EXT:    preferred_class = TrueColor;    break;
+      case GLX_DIRECT_COLOR_EXT:  preferred_class = DirectColor;  break;
+      case GLX_PSEUDO_COLOR_EXT:  preferred_class = PseudoColor;  break;
+      case GLX_STATIC_COLOR_EXT:  preferred_class = StaticColor;  break;
+      case GLX_GRAY_SCALE_EXT:    preferred_class = GrayScale;    break;
+      case GLX_STATIC_GRAY_EXT:   preferred_class = StaticGray;   break;
+      default:                    preferred_class = DONT_CARE;
+   }
+
+   /*
+    * The SERVER_OVERLAY_VISUALS property on the root window contains
+    * a list of overlay visuals.  Get that list now.
+    */
+   overlayVisualsAtom = XInternAtom(dpy,"SERVER_OVERLAY_VISUALS", True);
+   if (overlayVisualsAtom == (Atom) None) {
+      return NULL;
+   }
+
+   status = XGetWindowProperty(dpy, RootWindow( dpy, scr ),
+                               overlayVisualsAtom, 0L, (long) 10000, False,
+                               overlayVisualsAtom, &actualType, &actualFormat,
+                               &sizeData, &bytesLeft,
+                               (unsigned char **) &overlay_info );
+
+   if (status != Success || actualType != overlayVisualsAtom ||
+       actualFormat != 32 || sizeData < 4) {
+      /* something went wrong */
+      return NULL;
+   }
+
+   /* Search for the deepest overlay which satisifies all criteria. */
+   deepest = min_depth;
+   deepvis = NULL;
+
+   numOverlaysPerScreen = (int) (sizeData / 4);
+   for (i=0;i<numOverlaysPerScreen;i++) {
+      XVisualInfo *vislist, vistemplate;
+      int count;
+      OverlayInfo *ov;
+      ov = overlay_info + i;
+
+      if (ov->layer!=level) {
+         /* failed overlay level criteria */
+         continue;
+      }
+      if (!(trans_type==DONT_CARE
+            || (trans_type==GLX_TRANSPARENT_INDEX_EXT
+                && ov->transparent_type>0)
+            || (trans_type==GLX_NONE_EXT && ov->transparent_type==0))) {
+         /* failed transparent pixel type criteria */
+         continue;
+      }
+      if (trans_value!=DONT_CARE && trans_value!=ov->value) {
+         /* failed transparent pixel value criteria */
+         continue;
+      }
+
+      /* get XVisualInfo and check the depth */
+      vistemplate.visualid = ov->overlay_visual;
+      vistemplate.screen = scr;
+      vislist = XGetVisualInfo( dpy, VisualIDMask | VisualScreenMask,
+                                &vistemplate, &count );
+
+      if (count!=1) {
+         /* something went wrong */
+         continue;
+      }
+      if (preferred_class!=DONT_CARE && preferred_class!=vislist->CLASS) {
+         /* wrong visual class */
+         continue;
+      }
+
+      /* if RGB was requested, make sure we have True/DirectColor */
+      if (rgbFlag && vislist->CLASS != TrueColor
+          && vislist->CLASS != DirectColor)
+         continue;
+
+      /* if CI was requested, make sure we have a color indexed visual */
+      if (!rgbFlag
+          && (vislist->CLASS == TrueColor || vislist->CLASS == DirectColor))
+         continue;
+
+      if (deepvis==NULL || vislist->depth > deepest) {
+         /* YES!  found a satisfactory visual */
+         if (deepvis) {
+            XFree( deepvis );
+         }
+         deepest = vislist->depth;
+         deepvis = vislist;
+         /* DEBUG  tt = ov->transparent_type;*/
+         /* DEBUG  tv = ov->value; */
+      }
+   }
+
+/*DEBUG
+   if (deepvis) {
+      printf("chose 0x%x:  layer=%d depth=%d trans_type=%d trans_value=%d\n",
+             deepvis->visualid, level, deepvis->depth, tt, tv );
+   }
+*/
+   return deepvis;
+}
+
+
+/**********************************************************************/
+/***                  Begin Fake GLX API Functions                  ***/
+/**********************************************************************/
+
+
+static XMesaVisual choose_visual( Display *dpy, int screen, const int *list,
+                                  GLboolean rgbModeDefault )
+{
+   const int *parselist;
+   XVisualInfo *vis;
+   int min_ci = 0;
+   int min_red=0, min_green=0, min_blue=0;
+   GLboolean rgb_flag = rgbModeDefault;
+   GLboolean alpha_flag = GL_FALSE;
+   GLboolean double_flag = GL_FALSE;
+   GLboolean stereo_flag = GL_FALSE;
+   GLint depth_size = 0;
+   GLint stencil_size = 0;
+   GLint accumRedSize = 0;
+   GLint accumGreenSize = 0;
+   GLint accumBlueSize = 0;
+   GLint accumAlphaSize = 0;
+   int level = 0;
+   int visual_type = DONT_CARE;
+   int trans_type = DONT_CARE;
+   int trans_value = DONT_CARE;
+   GLint caveat = DONT_CARE;
+   XMesaVisual xmvis = NULL;
+   int desiredVisualID = -1;
+
+   parselist = list;
+
+   while (*parselist) {
+
+      switch (*parselist) {
+	 case GLX_USE_GL:
+	    /* ignore */
+	    parselist++;
+	    break;
+	 case GLX_BUFFER_SIZE:
+	    parselist++;
+	    min_ci = *parselist++;
+	    break;
+	 case GLX_LEVEL:
+	    parselist++;
+            level = *parselist++;
+	    break;
+	 case GLX_RGBA:
+	    rgb_flag = GL_TRUE;
+	    parselist++;
+	    break;
+	 case GLX_DOUBLEBUFFER:
+	    double_flag = GL_TRUE;
+	    parselist++;
+	    break;
+	 case GLX_STEREO:
+            stereo_flag = GL_TRUE;
+            return NULL;
+	 case GLX_AUX_BUFFERS:
+	    /* ignore */
+	    parselist++;
+	    parselist++;
+	    break;
+	 case GLX_RED_SIZE:
+	    parselist++;
+	    min_red = *parselist++;
+	    break;
+	 case GLX_GREEN_SIZE:
+	    parselist++;
+	    min_green = *parselist++;
+	    break;
+	 case GLX_BLUE_SIZE:
+	    parselist++;
+	    min_blue = *parselist++;
+	    break;
+	 case GLX_ALPHA_SIZE:
+	    parselist++;
+            {
+               GLint size = *parselist++;
+               alpha_flag = size>0 ? 1 : 0;
+            }
+	    break;
+	 case GLX_DEPTH_SIZE:
+	    parselist++;
+	    depth_size = *parselist++;
+	    break;
+	 case GLX_STENCIL_SIZE:
+	    parselist++;
+	    stencil_size = *parselist++;
+	    break;
+	 case GLX_ACCUM_RED_SIZE:
+	    parselist++;
+            {
+               GLint size = *parselist++;
+               accumRedSize = MAX2( accumRedSize, size );
+            }
+            break;
+	 case GLX_ACCUM_GREEN_SIZE:
+	    parselist++;
+            {
+               GLint size = *parselist++;
+               accumGreenSize = MAX2( accumGreenSize, size );
+            }
+            break;
+	 case GLX_ACCUM_BLUE_SIZE:
+	    parselist++;
+            {
+               GLint size = *parselist++;
+               accumBlueSize = MAX2( accumBlueSize, size );
+            }
+            break;
+	 case GLX_ACCUM_ALPHA_SIZE:
+	    parselist++;
+            {
+               GLint size = *parselist++;
+               accumAlphaSize = MAX2( accumAlphaSize, size );
+            }
+	    break;
+
+         /*
+          * GLX_EXT_visual_info extension
+          */
+         case GLX_X_VISUAL_TYPE_EXT:
+            parselist++;
+            visual_type = *parselist++;
+            break;
+         case GLX_TRANSPARENT_TYPE_EXT:
+            parselist++;
+            trans_type = *parselist++;
+            break;
+         case GLX_TRANSPARENT_INDEX_VALUE_EXT:
+            parselist++;
+            trans_value = *parselist++;
+            break;
+         case GLX_TRANSPARENT_RED_VALUE_EXT:
+         case GLX_TRANSPARENT_GREEN_VALUE_EXT:
+         case GLX_TRANSPARENT_BLUE_VALUE_EXT:
+         case GLX_TRANSPARENT_ALPHA_VALUE_EXT:
+	    /* ignore */
+	    parselist++;
+	    parselist++;
+	    break;
+
+         /*
+          * GLX_EXT_visual_info extension
+          */
+         case GLX_VISUAL_CAVEAT_EXT:
+            parselist++;
+            caveat = *parselist++; /* ignored for now */
+            break;
+
+         /*
+          * GLX_ARB_multisample
+          */
+         case GLX_SAMPLE_BUFFERS_ARB:
+            /* ms not supported */
+            return NULL;
+         case GLX_SAMPLES_ARB:
+            /* ms not supported */
+            return NULL;
+
+         /*
+          * FBConfig attribs.
+          */
+         case GLX_RENDER_TYPE:
+            parselist++;
+            if (*parselist == GLX_RGBA_BIT) {
+               rgb_flag = GL_TRUE;
+            }
+            else if (*parselist == GLX_COLOR_INDEX_BIT) {
+               rgb_flag = GL_FALSE;
+            }
+            else if (*parselist == 0) {
+               rgb_flag = GL_TRUE;
+            }
+            parselist++;
+            break;
+         case GLX_DRAWABLE_TYPE:
+            parselist++;
+            if (*parselist & ~(GLX_WINDOW_BIT | GLX_PIXMAP_BIT | GLX_PBUFFER_BIT)) {
+               return NULL; /* bad bit */
+            }
+            parselist++;
+            break;
+         case GLX_FBCONFIG_ID:
+            parselist++;
+            desiredVisualID = *parselist;
+            break;
+
+	 case None:
+            /* end of list */
+	    break;
+
+	 default:
+	    /* undefined attribute */
+            _mesa_warning(NULL, "unexpected attrib 0x%x in choose_visual()",
+                          *parselist);
+	    return NULL;
+      }
+   }
+
+   (void) caveat;
+
+   /*
+    * Since we're only simulating the GLX extension this function will never
+    * find any real GL visuals.  Instead, all we can do is try to find an RGB
+    * or CI visual of appropriate depth.  Other requested attributes such as
+    * double buffering, depth buffer, etc. will be associated with the X
+    * visual and stored in the VisualTable[].
+    */
+   if (desiredVisualID != -1) {
+      /* try to get a specific visual, by visualID */
+      XVisualInfo temp;
+      int n;
+      temp.visualid = desiredVisualID;
+      temp.screen = screen;
+      vis = XGetVisualInfo(dpy, VisualIDMask | VisualScreenMask, &temp, &n);
+      if (vis) {
+         /* give the visual some useful GLX attributes */
+         double_flag = GL_TRUE;
+         if (vis->depth > 8)
+            rgb_flag = GL_TRUE;
+         depth_size = DEFAULT_SOFTWARE_DEPTH_BITS;
+         stencil_size = STENCIL_BITS;
+         /* XXX accum??? */
+      }
+   }
+   else if (level==0) {
+      /* normal color planes */
+      if (rgb_flag) {
+         /* Get an RGB visual */
+         int min_rgb = min_red + min_green + min_blue;
+         if (min_rgb>1 && min_rgb<8) {
+            /* a special case to be sure we can get a monochrome visual */
+            min_rgb = 1;
+         }
+         vis = choose_x_visual( dpy, screen, rgb_flag, min_rgb, visual_type );
+      }
+      else {
+         /* Get a color index visual */
+         vis = choose_x_visual( dpy, screen, rgb_flag, min_ci, visual_type );
+         accumRedSize = accumGreenSize = accumBlueSize = accumAlphaSize = 0;
+      }
+   }
+   else {
+      /* over/underlay planes */
+      if (rgb_flag) {
+         /* rgba overlay */
+         int min_rgb = min_red + min_green + min_blue;
+         if (min_rgb>1 && min_rgb<8) {
+            /* a special case to be sure we can get a monochrome visual */
+            min_rgb = 1;
+         }
+         vis = choose_x_overlay_visual( dpy, screen, rgb_flag, level,
+                              trans_type, trans_value, min_rgb, visual_type );
+      }
+      else {
+         /* color index overlay */
+         vis = choose_x_overlay_visual( dpy, screen, rgb_flag, level,
+                              trans_type, trans_value, min_ci, visual_type );
+      }
+   }
+
+   if (vis) {
+      /* Note: we're not exactly obeying the glXChooseVisual rules here.
+       * When GLX_DEPTH_SIZE = 1 is specified we're supposed to choose the
+       * largest depth buffer size, which is 32bits/value.  Instead, we
+       * return 16 to maintain performance with earlier versions of Mesa.
+       */
+      if (depth_size > 24)
+         depth_size = 31;   /* 32 causes int overflow problems */
+      else if (depth_size > 16)
+         depth_size = 24;
+      else if (depth_size > 0)
+         depth_size = DEFAULT_SOFTWARE_DEPTH_BITS; /*16*/
+
+      /* we only support one size of stencil and accum buffers. */
+      if (stencil_size > 0)
+         stencil_size = STENCIL_BITS;
+      if (accumRedSize > 0 || accumGreenSize > 0 || accumBlueSize > 0 ||
+          accumAlphaSize > 0) {
+         accumRedSize = ACCUM_BITS;
+         accumGreenSize = ACCUM_BITS;
+         accumBlueSize = ACCUM_BITS;
+         accumAlphaSize = alpha_flag ? ACCUM_BITS : 0;
+      }
+
+      xmvis = save_glx_visual( dpy, vis, rgb_flag, alpha_flag, double_flag,
+                               stereo_flag, depth_size, stencil_size,
+                               accumRedSize, accumGreenSize,
+                               accumBlueSize, accumAlphaSize, level );
+   }
+
+   return xmvis;
+}
+
+
+static XVisualInfo *
+Fake_glXChooseVisual( Display *dpy, int screen, int *list )
+{
+   XMesaVisual xmvis = choose_visual(dpy, screen, list, GL_FALSE);
+   if (xmvis) {
+#if 0
+      return xmvis->vishandle;
+#else
+      /* create a new vishandle - the cached one may be stale */
+      xmvis->vishandle = (XVisualInfo *) _mesa_malloc(sizeof(XVisualInfo));
+      if (xmvis->vishandle) {
+         _mesa_memcpy(xmvis->vishandle, xmvis->visinfo, sizeof(XVisualInfo));
+      }
+      return xmvis->vishandle;
+#endif
+   }
+   else
+      return NULL;
+}
+
+
+static GLXContext
+Fake_glXCreateContext( Display *dpy, XVisualInfo *visinfo,
+                       GLXContext share_list, Bool direct )
+{
+   XMesaVisual xmvis;
+   struct fake_glx_context *glxCtx;
+   struct fake_glx_context *shareCtx = (struct fake_glx_context *) share_list;
+
+   if (!dpy || !visinfo)
+      return 0;
+
+   glxCtx = CALLOC_STRUCT(fake_glx_context);
+   if (!glxCtx)
+      return 0;
+
+   /* deallocate unused windows/buffers */
+   XMesaGarbageCollect();
+
+   xmvis = find_glx_visual( dpy, visinfo );
+   if (!xmvis) {
+      /* This visual wasn't found with glXChooseVisual() */
+      xmvis = create_glx_visual( dpy, visinfo );
+      if (!xmvis) {
+         /* unusable visual */
+         FREE(glxCtx);
+         return NULL;
+      }
+   }
+
+   glxCtx->xmesaContext = XMesaCreateContext(xmvis,
+                                   shareCtx ? shareCtx->xmesaContext : NULL);
+   if (!glxCtx->xmesaContext) {
+      FREE(glxCtx);
+      return NULL;
+   }
+
+   glxCtx->xmesaContext->direct = GL_FALSE;
+   glxCtx->glxContext.isDirect = GL_FALSE;
+   glxCtx->glxContext.currentDpy = dpy;
+   glxCtx->glxContext.xid = (XID) glxCtx;  /* self pointer */
+
+   assert((void *) glxCtx == (void *) &(glxCtx->glxContext));
+
+   return (GLXContext) glxCtx;
+}
+
+
+/* XXX these may have to be removed due to thread-safety issues. */
+static GLXContext MakeCurrent_PrevContext = 0;
+static GLXDrawable MakeCurrent_PrevDrawable = 0;
+static GLXDrawable MakeCurrent_PrevReadable = 0;
+static XMesaBuffer MakeCurrent_PrevDrawBuffer = 0;
+static XMesaBuffer MakeCurrent_PrevReadBuffer = 0;
+
+
+/* GLX 1.3 and later */
+static Bool
+Fake_glXMakeContextCurrent( Display *dpy, GLXDrawable draw,
+                            GLXDrawable read, GLXContext ctx )
+{
+   struct fake_glx_context *glxCtx = (struct fake_glx_context *) ctx;
+
+   if (ctx && draw && read) {
+      XMesaBuffer drawBuffer, readBuffer;
+      XMesaContext xmctx = glxCtx->xmesaContext;
+
+      /* Find the XMesaBuffer which corresponds to the GLXDrawable 'draw' */
+      if (ctx == MakeCurrent_PrevContext
+          && draw == MakeCurrent_PrevDrawable) {
+         drawBuffer = MakeCurrent_PrevDrawBuffer;
+      }
+      else {
+         drawBuffer = XMesaFindBuffer( dpy, draw );
+      }
+      if (!drawBuffer) {
+         /* drawable must be a new window! */
+         drawBuffer = XMesaCreateWindowBuffer2( xmctx->xm_visual, draw, xmctx);
+         if (!drawBuffer) {
+            /* Out of memory, or context/drawable depth mismatch */
+            return False;
+         }
+      }
+
+      /* Find the XMesaBuffer which corresponds to the GLXDrawable 'read' */
+      if (ctx == MakeCurrent_PrevContext
+          && read == MakeCurrent_PrevReadable) {
+         readBuffer = MakeCurrent_PrevReadBuffer;
+      }
+      else {
+         readBuffer = XMesaFindBuffer( dpy, read );
+      }
+      if (!readBuffer) {
+         /* drawable must be a new window! */
+         readBuffer = XMesaCreateWindowBuffer2(glxCtx->xmesaContext->xm_visual,
+                                               read, xmctx);
+         if (!readBuffer) {
+            /* Out of memory, or context/drawable depth mismatch */
+            return False;
+         }
+      }
+
+      MakeCurrent_PrevContext = ctx;
+      MakeCurrent_PrevDrawable = draw;
+      MakeCurrent_PrevReadable = read;
+      MakeCurrent_PrevDrawBuffer = drawBuffer;
+      MakeCurrent_PrevReadBuffer = readBuffer;
+
+      /* Now make current! */
+      if (XMesaMakeCurrent2(xmctx, drawBuffer, readBuffer)) {
+         ((__GLXcontext *) ctx)->currentDpy = dpy;
+         ((__GLXcontext *) ctx)->currentDrawable = draw;
+#ifndef GLX_BUILT_IN_XMESA
+         ((__GLXcontext *) ctx)->currentReadable = read;
+#else
+         __glXSetCurrentContext(ctx);
+#endif
+         return True;
+      }
+      else {
+         return False;
+      }
+   }
+   else if (!ctx && !draw && !read) {
+      /* release current context w/out assigning new one. */
+      XMesaMakeCurrent( NULL, NULL );
+      MakeCurrent_PrevContext = 0;
+      MakeCurrent_PrevDrawable = 0;
+      MakeCurrent_PrevReadable = 0;
+      MakeCurrent_PrevDrawBuffer = 0;
+      MakeCurrent_PrevReadBuffer = 0;
+#ifdef GLX_BUILT_IN_XMESA
+      /* XXX bind dummy context with __glXSetCurrentContext(ctx); */
+#endif
+      return True;
+   }
+   else {
+      /* The args must either all be non-zero or all zero.
+       * This is an error.
+       */
+      return False;
+   }
+}
+
+
+
+static Bool
+Fake_glXMakeCurrent( Display *dpy, GLXDrawable drawable, GLXContext ctx )
+{
+   return Fake_glXMakeContextCurrent( dpy, drawable, drawable, ctx );
+}
+
+
+
+static GLXPixmap
+Fake_glXCreateGLXPixmap( Display *dpy, XVisualInfo *visinfo, Pixmap pixmap )
+{
+   XMesaVisual v;
+   XMesaBuffer b;
+
+   v = find_glx_visual( dpy, visinfo );
+   if (!v) {
+      v = create_glx_visual( dpy, visinfo );
+      if (!v) {
+         /* unusable visual */
+         return 0;
+      }
+   }
+
+   b = XMesaCreatePixmapBuffer( v, pixmap, 0 );
+   if (!b) {
+      return 0;
+   }
+   return b->frontbuffer;
+}
+
+
+/*** GLX_MESA_pixmap_colormap ***/
+
+static GLXPixmap
+Fake_glXCreateGLXPixmapMESA( Display *dpy, XVisualInfo *visinfo,
+                             Pixmap pixmap, Colormap cmap )
+{
+   XMesaVisual v;
+   XMesaBuffer b;
+
+   v = find_glx_visual( dpy, visinfo );
+   if (!v) {
+      v = create_glx_visual( dpy, visinfo );
+      if (!v) {
+         /* unusable visual */
+         return 0;
+      }
+   }
+
+   b = XMesaCreatePixmapBuffer( v, pixmap, cmap );
+   if (!b) {
+      return 0;
+   }
+   return b->frontbuffer;
+}
+
+
+static void
+Fake_glXDestroyGLXPixmap( Display *dpy, GLXPixmap pixmap )
+{
+   XMesaBuffer b = XMesaFindBuffer(dpy, pixmap);
+   if (b) {
+      XMesaDestroyBuffer(b);
+   }
+   else if (_mesa_getenv("MESA_DEBUG")) {
+      _mesa_warning(NULL, "Mesa: glXDestroyGLXPixmap: invalid pixmap\n");
+   }
+}
+
+
+
+static void
+Fake_glXCopyContext( Display *dpy, GLXContext src, GLXContext dst,
+                     unsigned long mask )
+{
+   struct fake_glx_context *fakeSrc = (struct fake_glx_context *) src;
+   struct fake_glx_context *fakeDst = (struct fake_glx_context *) dst;
+   XMesaContext xm_src = fakeSrc->xmesaContext;
+   XMesaContext xm_dst = fakeDst->xmesaContext;
+   (void) dpy;
+   _mesa_copy_context( &(xm_src->mesa), &(xm_dst->mesa), (GLuint) mask );
+}
+
+
+
+static Bool
+Fake_glXQueryExtension( Display *dpy, int *errorb, int *event )
+{
+   /* Mesa's GLX isn't really an X extension but we try to act like one. */
+   (void) dpy;
+   (void) errorb;
+   (void) event;
+   return True;
+}
+
+
+extern void _kw_ungrab_all( Display *dpy );
+void _kw_ungrab_all( Display *dpy )
+{
+   XUngrabPointer( dpy, CurrentTime );
+   XUngrabKeyboard( dpy, CurrentTime );
+}
+
+
+static void
+Fake_glXDestroyContext( Display *dpy, GLXContext ctx )
+{
+   struct fake_glx_context *glxCtx = (struct fake_glx_context *) ctx;
+   (void) dpy;
+   MakeCurrent_PrevContext = 0;
+   MakeCurrent_PrevDrawable = 0;
+   MakeCurrent_PrevReadable = 0;
+   MakeCurrent_PrevDrawBuffer = 0;
+   MakeCurrent_PrevReadBuffer = 0;
+   XMesaDestroyContext( glxCtx->xmesaContext );
+   XMesaGarbageCollect();
+}
+
+
+
+static Bool
+Fake_glXIsDirect( Display *dpy, GLXContext ctx )
+{
+   struct fake_glx_context *glxCtx = (struct fake_glx_context *) ctx;
+   (void) dpy;
+   return glxCtx->xmesaContext->direct;
+}
+
+
+
+static void
+Fake_glXSwapBuffers( Display *dpy, GLXDrawable drawable )
+{
+   XMesaBuffer buffer = XMesaFindBuffer( dpy, drawable );
+
+   if (buffer) {
+      XMesaSwapBuffers(buffer);
+   }
+   else if (_mesa_getenv("MESA_DEBUG")) {
+      _mesa_warning(NULL, "Mesa: glXSwapBuffers: invalid drawable\n");
+   }
+}
+
+
+
+/*** GLX_MESA_copy_sub_buffer ***/
+
+static void
+Fake_glXCopySubBufferMESA( Display *dpy, GLXDrawable drawable,
+                           int x, int y, int width, int height )
+{
+   XMesaBuffer buffer = XMesaFindBuffer( dpy, drawable );
+   if (buffer) {
+      XMesaCopySubBuffer(buffer, x, y, width, height);
+   }
+   else if (_mesa_getenv("MESA_DEBUG")) {
+      _mesa_warning(NULL, "Mesa: glXCopySubBufferMESA: invalid drawable\n");
+   }
+}
+
+
+
+static Bool
+Fake_glXQueryVersion( Display *dpy, int *maj, int *min )
+{
+   (void) dpy;
+   /* Return GLX version, not Mesa version */
+   assert(CLIENT_MAJOR_VERSION == SERVER_MAJOR_VERSION);
+   *maj = CLIENT_MAJOR_VERSION;
+   *min = MIN2( CLIENT_MINOR_VERSION, SERVER_MINOR_VERSION );
+   return True;
+}
+
+
+
+/*
+ * Query the GLX attributes of the given XVisualInfo.
+ */
+static int
+get_config( XMesaVisual xmvis, int attrib, int *value, GLboolean fbconfig )
+{
+   ASSERT(xmvis);
+   switch(attrib) {
+      case GLX_USE_GL:
+         *value = (int) True;
+	 return 0;
+      case GLX_BUFFER_SIZE:
+	 *value = xmvis->visinfo->depth;
+	 return 0;
+      case GLX_LEVEL:
+	 *value = xmvis->level;
+	 return 0;
+      case GLX_RGBA:
+	 if (xmvis->mesa_visual.rgbMode) {
+	    *value = True;
+	 }
+	 else {
+	    *value = False;
+	 }
+	 return 0;
+      case GLX_DOUBLEBUFFER:
+	 *value = (int) xmvis->mesa_visual.doubleBufferMode;
+	 return 0;
+      case GLX_STEREO:
+	 *value = (int) xmvis->mesa_visual.stereoMode;
+	 return 0;
+      case GLX_AUX_BUFFERS:
+	 *value = (int) False;
+	 return 0;
+      case GLX_RED_SIZE:
+         *value = xmvis->mesa_visual.redBits;
+	 return 0;
+      case GLX_GREEN_SIZE:
+         *value = xmvis->mesa_visual.greenBits;
+	 return 0;
+      case GLX_BLUE_SIZE:
+         *value = xmvis->mesa_visual.blueBits;
+	 return 0;
+      case GLX_ALPHA_SIZE:
+         *value = xmvis->mesa_visual.alphaBits;
+	 return 0;
+      case GLX_DEPTH_SIZE:
+         *value = xmvis->mesa_visual.depthBits;
+	 return 0;
+      case GLX_STENCIL_SIZE:
+	 *value = xmvis->mesa_visual.stencilBits;
+	 return 0;
+      case GLX_ACCUM_RED_SIZE:
+	 *value = xmvis->mesa_visual.accumRedBits;
+	 return 0;
+      case GLX_ACCUM_GREEN_SIZE:
+	 *value = xmvis->mesa_visual.accumGreenBits;
+	 return 0;
+      case GLX_ACCUM_BLUE_SIZE:
+	 *value = xmvis->mesa_visual.accumBlueBits;
+	 return 0;
+      case GLX_ACCUM_ALPHA_SIZE:
+         *value = xmvis->mesa_visual.accumAlphaBits;
+	 return 0;
+
+      /*
+       * GLX_EXT_visual_info extension
+       */
+      case GLX_X_VISUAL_TYPE_EXT:
+         switch (xmvis->visinfo->CLASS) {
+            case StaticGray:   *value = GLX_STATIC_GRAY_EXT;   return 0;
+            case GrayScale:    *value = GLX_GRAY_SCALE_EXT;    return 0;
+            case StaticColor:  *value = GLX_STATIC_GRAY_EXT;   return 0;
+            case PseudoColor:  *value = GLX_PSEUDO_COLOR_EXT;  return 0;
+            case TrueColor:    *value = GLX_TRUE_COLOR_EXT;    return 0;
+            case DirectColor:  *value = GLX_DIRECT_COLOR_EXT;  return 0;
+         }
+         return 0;
+      case GLX_TRANSPARENT_TYPE_EXT:
+         if (xmvis->level==0) {
+            /* normal planes */
+            *value = GLX_NONE_EXT;
+         }
+         else if (xmvis->level>0) {
+            /* overlay */
+            if (xmvis->mesa_visual.rgbMode) {
+               *value = GLX_TRANSPARENT_RGB_EXT;
+            }
+            else {
+               *value = GLX_TRANSPARENT_INDEX_EXT;
+            }
+         }
+         else if (xmvis->level<0) {
+            /* underlay */
+            *value = GLX_NONE_EXT;
+         }
+         return 0;
+      case GLX_TRANSPARENT_INDEX_VALUE_EXT:
+         {
+            int pixel = transparent_pixel( xmvis );
+            if (pixel>=0) {
+               *value = pixel;
+            }
+            /* else undefined */
+         }
+         return 0;
+      case GLX_TRANSPARENT_RED_VALUE_EXT:
+         /* undefined */
+         return 0;
+      case GLX_TRANSPARENT_GREEN_VALUE_EXT:
+         /* undefined */
+         return 0;
+      case GLX_TRANSPARENT_BLUE_VALUE_EXT:
+         /* undefined */
+         return 0;
+      case GLX_TRANSPARENT_ALPHA_VALUE_EXT:
+         /* undefined */
+         return 0;
+
+      /*
+       * GLX_EXT_visual_info extension
+       */
+      case GLX_VISUAL_CAVEAT_EXT:
+         /* test for zero, just in case */
+         if (xmvis->VisualCaveat > 0)
+            *value = xmvis->VisualCaveat;
+         else
+            *value = GLX_NONE_EXT;
+         return 0;
+
+      /*
+       * GLX_ARB_multisample
+       */
+      case GLX_SAMPLE_BUFFERS_ARB:
+         *value = 0;
+         return 0;
+      case GLX_SAMPLES_ARB:
+         *value = 0;
+         return 0;
+
+      /*
+       * For FBConfigs:
+       */
+      case GLX_SCREEN_EXT:
+         if (!fbconfig)
+            return GLX_BAD_ATTRIBUTE;
+         *value = xmvis->visinfo->screen;
+         break;
+      case GLX_DRAWABLE_TYPE: /*SGIX too */
+         if (!fbconfig)
+            return GLX_BAD_ATTRIBUTE;
+         *value = GLX_WINDOW_BIT | GLX_PIXMAP_BIT | GLX_PBUFFER_BIT;
+         break;
+      case GLX_RENDER_TYPE_SGIX:
+         if (!fbconfig)
+            return GLX_BAD_ATTRIBUTE;
+         if (xmvis->mesa_visual.rgbMode)
+            *value = GLX_RGBA_BIT;
+         else
+            *value = GLX_COLOR_INDEX_BIT;
+         break;
+      case GLX_X_RENDERABLE_SGIX:
+         if (!fbconfig)
+            return GLX_BAD_ATTRIBUTE;
+         *value = True; /* XXX really? */
+         break;
+      case GLX_FBCONFIG_ID_SGIX:
+         if (!fbconfig)
+            return GLX_BAD_ATTRIBUTE;
+         *value = xmvis->visinfo->visualid;
+         break;
+      case GLX_MAX_PBUFFER_WIDTH:
+         if (!fbconfig)
+            return GLX_BAD_ATTRIBUTE;
+         /* XXX or MAX_WIDTH? */
+         *value = DisplayWidth(xmvis->display, xmvis->visinfo->screen);
+         break;
+      case GLX_MAX_PBUFFER_HEIGHT:
+         if (!fbconfig)
+            return GLX_BAD_ATTRIBUTE;
+         *value = DisplayHeight(xmvis->display, xmvis->visinfo->screen);
+         break;
+      case GLX_MAX_PBUFFER_PIXELS:
+         if (!fbconfig)
+            return GLX_BAD_ATTRIBUTE;
+         *value = DisplayWidth(xmvis->display, xmvis->visinfo->screen) *
+                  DisplayHeight(xmvis->display, xmvis->visinfo->screen);
+         break;
+      case GLX_VISUAL_ID:
+         if (!fbconfig)
+            return GLX_BAD_ATTRIBUTE;
+         *value = xmvis->visinfo->visualid;
+         break;
+
+      default:
+	 return GLX_BAD_ATTRIBUTE;
+   }
+   return Success;
+}
+
+
+static int
+Fake_glXGetConfig( Display *dpy, XVisualInfo *visinfo,
+                   int attrib, int *value )
+{
+   XMesaVisual xmvis;
+
+   if (!dpy || !visinfo)
+      return GLX_BAD_ATTRIBUTE;
+
+   xmvis = find_glx_visual( dpy, visinfo );
+   if (!xmvis) {
+      /* this visual wasn't obtained with glXChooseVisual */
+      xmvis = create_glx_visual( dpy, visinfo );
+      if (!xmvis) {
+	 /* this visual can't be used for GL rendering */
+	 if (attrib==GLX_USE_GL) {
+	    *value = (int) False;
+	    return 0;
+	 }
+	 else {
+	    return GLX_BAD_VISUAL;
+	 }
+      }
+   }
+
+   return get_config(xmvis, attrib, value, GL_FALSE);
+}
+
+
+static void
+Fake_glXWaitGL( void )
+{
+   XMesaContext xmesa = XMesaGetCurrentContext();
+   XMesaFlush( xmesa );
+}
+
+
+
+static void
+Fake_glXWaitX( void )
+{
+   XMesaContext xmesa = XMesaGetCurrentContext();
+   XMesaFlush( xmesa );
+}
+
+
+static const char *
+get_extensions( void )
+{
+#ifdef FX
+   const char *fx = _mesa_getenv("MESA_GLX_FX");
+   if (fx && fx[0] != 'd') {
+      return EXTENSIONS;
+   }
+#endif
+   return EXTENSIONS + 23; /* skip "GLX_MESA_set_3dfx_mode" */
+}
+
+
+
+/* GLX 1.1 and later */
+static const char *
+Fake_glXQueryExtensionsString( Display *dpy, int screen )
+{
+   (void) dpy;
+   (void) screen;
+   return get_extensions();
+}
+
+
+
+/* GLX 1.1 and later */
+static const char *
+Fake_glXQueryServerString( Display *dpy, int screen, int name )
+{
+   static char version[1000];
+   _mesa_sprintf(version, "%d.%d %s",
+                 SERVER_MAJOR_VERSION, SERVER_MINOR_VERSION, MESA_GLX_VERSION);
+
+   (void) dpy;
+   (void) screen;
+
+   switch (name) {
+      case GLX_EXTENSIONS:
+         return get_extensions();
+      case GLX_VENDOR:
+	 return VENDOR;
+      case GLX_VERSION:
+	 return version;
+      default:
+         return NULL;
+   }
+}
+
+
+
+/* GLX 1.1 and later */
+static const char *
+Fake_glXGetClientString( Display *dpy, int name )
+{
+   static char version[1000];
+   _mesa_sprintf(version, "%d.%d %s", CLIENT_MAJOR_VERSION,
+                 CLIENT_MINOR_VERSION, MESA_GLX_VERSION);
+
+   (void) dpy;
+
+   switch (name) {
+      case GLX_EXTENSIONS:
+         return get_extensions();
+      case GLX_VENDOR:
+	 return VENDOR;
+      case GLX_VERSION:
+	 return version;
+      default:
+         return NULL;
+   }
+}
+
+
+
+/*
+ * GLX 1.3 and later
+ */
+
+
+static GLXFBConfig *
+Fake_glXChooseFBConfig( Display *dpy, int screen,
+                        const int *attribList, int *nitems )
+{
+   XMesaVisual xmvis = choose_visual(dpy, screen, attribList, GL_TRUE);
+   if (xmvis) {
+      GLXFBConfig *config = (GLXFBConfig *) _mesa_malloc(sizeof(XMesaVisual));
+      if (!config) {
+         *nitems = 0;
+         return NULL;
+      }
+      *nitems = 1;
+      config[0] = (GLXFBConfig) xmvis;
+      return (GLXFBConfig *) config;
+   }
+   else {
+      *nitems = 0;
+      return NULL;
+   }
+}
+
+
+static int
+Fake_glXGetFBConfigAttrib( Display *dpy, GLXFBConfig config,
+                           int attribute, int *value )
+{
+   XMesaVisual v = (XMesaVisual) config;
+   (void) dpy;
+   (void) config;
+
+   if (!dpy || !config || !value)
+      return -1;
+
+   return get_config(v, attribute, value, GL_TRUE);
+}
+
+
+static GLXFBConfig *
+Fake_glXGetFBConfigs( Display *dpy, int screen, int *nelements )
+{
+   XVisualInfo *visuals, visTemplate;
+   const long visMask = VisualScreenMask;
+   int i;
+
+   /* Get list of all X visuals */
+   visTemplate.screen = screen;
+   visuals = XGetVisualInfo(dpy, visMask, &visTemplate, nelements);
+   if (*nelements > 0) {
+      XMesaVisual *results;
+      results = (XMesaVisual *) _mesa_malloc(*nelements * sizeof(XMesaVisual));
+      if (!results) {
+         *nelements = 0;
+         return NULL;
+      }
+      for (i = 0; i < *nelements; i++) {
+         results[i] = create_glx_visual(dpy, visuals + i);
+      }
+      return (GLXFBConfig *) results;
+   }
+   return NULL;
+}
+
+
+static XVisualInfo *
+Fake_glXGetVisualFromFBConfig( Display *dpy, GLXFBConfig config )
+{
+   if (dpy && config) {
+      XMesaVisual xmvis = (XMesaVisual) config;
+#if 0      
+      return xmvis->vishandle;
+#else
+      /* create a new vishandle - the cached one may be stale */
+      xmvis->vishandle = (XVisualInfo *) _mesa_malloc(sizeof(XVisualInfo));
+      if (xmvis->vishandle) {
+         _mesa_memcpy(xmvis->vishandle, xmvis->visinfo, sizeof(XVisualInfo));
+      }
+      return xmvis->vishandle;
+#endif
+   }
+   else {
+      return NULL;
+   }
+}
+
+
+static GLXWindow
+Fake_glXCreateWindow( Display *dpy, GLXFBConfig config, Window win,
+                      const int *attribList )
+{
+   XMesaVisual xmvis = (XMesaVisual) config;
+   XMesaBuffer xmbuf;
+   if (!xmvis)
+      return 0;
+
+   xmbuf = XMesaCreateWindowBuffer2(xmvis, win, NULL);
+   if (!xmbuf)
+      return 0;
+
+   (void) dpy;
+   (void) attribList;  /* Ignored in GLX 1.3 */
+
+   return win;  /* A hack for now */
+}
+
+
+static void
+Fake_glXDestroyWindow( Display *dpy, GLXWindow window )
+{
+   XMesaBuffer b = XMesaFindBuffer(dpy, (XMesaDrawable) window);
+   if (b)
+      XMesaDestroyBuffer(b);
+   /* don't destroy X window */
+}
+
+
+/* XXX untested */
+static GLXPixmap
+Fake_glXCreatePixmap( Display *dpy, GLXFBConfig config, Pixmap pixmap,
+                      const int *attribList )
+{
+   XMesaVisual v = (XMesaVisual) config;
+   XMesaBuffer b;
+
+   (void) dpy;
+   (void) config;
+   (void) pixmap;
+   (void) attribList;  /* Ignored in GLX 1.3 */
+
+   if (!dpy || !config || !pixmap)
+      return 0;
+
+   b = XMesaCreatePixmapBuffer( v, pixmap, 0 );
+   if (!b) {
+      return 0;
+   }
+
+   return pixmap;
+}
+
+
+static void
+Fake_glXDestroyPixmap( Display *dpy, GLXPixmap pixmap )
+{
+   XMesaBuffer b = XMesaFindBuffer(dpy, (XMesaDrawable)pixmap);
+   if (b)
+      XMesaDestroyBuffer(b);
+   /* don't destroy X pixmap */
+}
+
+
+static GLXPbuffer
+Fake_glXCreatePbuffer( Display *dpy, GLXFBConfig config,
+                       const int *attribList )
+{
+   XMesaVisual xmvis = (XMesaVisual) config;
+   XMesaBuffer xmbuf;
+   const int *attrib;
+   int width = 0, height = 0;
+   GLboolean useLargest = GL_FALSE, preserveContents = GL_FALSE;
+
+   (void) dpy;
+
+   for (attrib = attribList; *attrib; attrib++) {
+      switch (*attrib) {
+         case GLX_PBUFFER_WIDTH:
+            attrib++;
+            width = *attrib;
+            break;
+         case GLX_PBUFFER_HEIGHT:
+            attrib++;
+            height = *attrib;
+            break;
+         case GLX_PRESERVED_CONTENTS:
+            attrib++;
+            preserveContents = *attrib; /* ignored */
+            break;
+         case GLX_LARGEST_PBUFFER:
+            attrib++;
+            useLargest = *attrib; /* ignored */
+            break;
+         default:
+            return 0;
+      }
+   }
+
+   /* not used at this time */
+   (void) useLargest;
+   (void) preserveContents;
+
+   if (width == 0 || height == 0)
+      return 0;
+
+   xmbuf = XMesaCreatePBuffer( xmvis, 0, width, height);
+   /* A GLXPbuffer handle must be an X Drawable because that's what
+    * glXMakeCurrent takes.
+    */
+   return (GLXPbuffer) xmbuf->frontbuffer;
+}
+
+
+static void
+Fake_glXDestroyPbuffer( Display *dpy, GLXPbuffer pbuf )
+{
+   XMesaBuffer b = XMesaFindBuffer(dpy, pbuf);
+   if (b) {
+      XMesaDestroyBuffer(b);
+   }
+}
+
+
+static void
+Fake_glXQueryDrawable( Display *dpy, GLXDrawable draw, int attribute,
+                       unsigned int *value )
+{
+   XMesaBuffer xmbuf = XMesaFindBuffer(dpy, draw);
+   if (!xmbuf)
+      return;
+
+   switch (attribute) {
+      case GLX_WIDTH:
+         *value = xmbuf->width;
+         break;
+      case GLX_HEIGHT:
+         *value = xmbuf->height;
+         break;
+      case GLX_PRESERVED_CONTENTS:
+         *value = True;
+         break;
+      case GLX_LARGEST_PBUFFER:
+         *value = xmbuf->width * xmbuf->height;
+         break;
+      case GLX_FBCONFIG_ID:
+         *value = xmbuf->xm_visual->visinfo->visualid;
+         return;
+      default:
+         return;  /* GLX_BAD_ATTRIBUTE? */
+   }
+}
+
+
+static GLXContext
+Fake_glXCreateNewContext( Display *dpy, GLXFBConfig config,
+                          int renderType, GLXContext shareList, Bool direct )
+{
+   struct fake_glx_context *glxCtx;
+   struct fake_glx_context *shareCtx = (struct fake_glx_context *) shareList;
+   XMesaVisual xmvis = (XMesaVisual) config;
+
+   if (!dpy || !config ||
+       (renderType != GLX_RGBA_TYPE && renderType != GLX_COLOR_INDEX_TYPE))
+      return 0;
+
+   glxCtx = CALLOC_STRUCT(fake_glx_context);
+   if (!glxCtx)
+      return 0;
+
+   /* deallocate unused windows/buffers */
+   XMesaGarbageCollect();
+
+   glxCtx->xmesaContext = XMesaCreateContext(xmvis,
+                                   shareCtx ? shareCtx->xmesaContext : NULL);
+   if (!glxCtx->xmesaContext) {
+      FREE(glxCtx);
+      return NULL;
+   }
+
+   glxCtx->xmesaContext->direct = GL_FALSE;
+   glxCtx->glxContext.isDirect = GL_FALSE;
+   glxCtx->glxContext.currentDpy = dpy;
+   glxCtx->glxContext.xid = (XID) glxCtx;  /* self pointer */
+
+   assert((void *) glxCtx == (void *) &(glxCtx->glxContext));
+
+   return (GLXContext) glxCtx;
+}
+
+
+static int
+Fake_glXQueryContext( Display *dpy, GLXContext ctx, int attribute, int *value )
+{
+   struct fake_glx_context *glxCtx = (struct fake_glx_context *) ctx;
+   XMesaContext xmctx = glxCtx->xmesaContext;
+
+   (void) dpy;
+   (void) ctx;
+
+   switch (attribute) {
+   case GLX_FBCONFIG_ID:
+      *value = xmctx->xm_visual->visinfo->visualid;
+      break;
+   case GLX_RENDER_TYPE:
+      if (xmctx->xm_visual->mesa_visual.rgbMode)
+         *value = GLX_RGBA_BIT;
+      else
+         *value = GLX_COLOR_INDEX_BIT;
+      break;
+   case GLX_SCREEN:
+      *value = 0;
+      return Success;
+   default:
+      return GLX_BAD_ATTRIBUTE;
+   }
+   return 0;
+}
+
+
+static void
+Fake_glXSelectEvent( Display *dpy, GLXDrawable drawable, unsigned long mask )
+{
+   XMesaBuffer xmbuf = XMesaFindBuffer(dpy, drawable);
+   if (xmbuf)
+      xmbuf->selectedEvents = mask;
+}
+
+
+static void
+Fake_glXGetSelectedEvent( Display *dpy, GLXDrawable drawable,
+                          unsigned long *mask )
+{
+   XMesaBuffer xmbuf = XMesaFindBuffer(dpy, drawable);
+   if (xmbuf)
+      *mask = xmbuf->selectedEvents;
+   else
+      *mask = 0;
+}
+
+
+
+/*** GLX_SGI_swap_control ***/
+
+static int
+Fake_glXSwapIntervalSGI(int interval)
+{
+   (void) interval;
+   return 0;
+}
+
+
+
+/*** GLX_SGI_video_sync ***/
+
+static int
+Fake_glXGetVideoSyncSGI(unsigned int *count)
+{
+   (void) count;
+   return 0;
+}
+
+static int
+Fake_glXWaitVideoSyncSGI(int divisor, int remainder, unsigned int *count)
+{
+   (void) divisor;
+   (void) remainder;
+   (void) count;
+   return 0;
+}
+
+
+
+/*** GLX_SGI_make_current_read ***/
+
+static Bool
+Fake_glXMakeCurrentReadSGI(Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx)
+{
+   return Fake_glXMakeContextCurrent( dpy, draw, read, ctx );
+}
+
+/* not used
+static GLXDrawable
+Fake_glXGetCurrentReadDrawableSGI(void)
+{
+   return 0;
+}
+*/
+
+
+/*** GLX_SGIX_video_source ***/
+#if defined(_VL_H)
+
+static GLXVideoSourceSGIX
+Fake_glXCreateGLXVideoSourceSGIX(Display *dpy, int screen, VLServer server, VLPath path, int nodeClass, VLNode drainNode)
+{
+   (void) dpy;
+   (void) screen;
+   (void) server;
+   (void) path;
+   (void) nodeClass;
+   (void) drainNode;
+   return 0;
+}
+
+static void
+Fake_glXDestroyGLXVideoSourceSGIX(Display *dpy, GLXVideoSourceSGIX src)
+{
+   (void) dpy;
+   (void) src;
+}
+
+#endif
+
+
+/*** GLX_EXT_import_context ***/
+
+static void
+Fake_glXFreeContextEXT(Display *dpy, GLXContext context)
+{
+   (void) dpy;
+   (void) context;
+}
+
+static GLXContextID
+Fake_glXGetContextIDEXT(const GLXContext context)
+{
+   (void) context;
+   return 0;
+}
+
+static GLXContext
+Fake_glXImportContextEXT(Display *dpy, GLXContextID contextID)
+{
+   (void) dpy;
+   (void) contextID;
+   return 0;
+}
+
+static int
+Fake_glXQueryContextInfoEXT(Display *dpy, GLXContext context, int attribute, int *value)
+{
+   (void) dpy;
+   (void) context;
+   (void) attribute;
+   (void) value;
+   return 0;
+}
+
+
+
+/*** GLX_SGIX_fbconfig ***/
+
+static int
+Fake_glXGetFBConfigAttribSGIX(Display *dpy, GLXFBConfigSGIX config, int attribute, int *value)
+{
+   return Fake_glXGetFBConfigAttrib(dpy, config, attribute, value);
+}
+
+static GLXFBConfigSGIX *
+Fake_glXChooseFBConfigSGIX(Display *dpy, int screen, int *attrib_list, int *nelements)
+{
+   return (GLXFBConfig *) Fake_glXChooseFBConfig(dpy, screen, attrib_list, nelements);
+}
+
+
+static GLXPixmap
+Fake_glXCreateGLXPixmapWithConfigSGIX(Display *dpy, GLXFBConfigSGIX config, Pixmap pixmap)
+{
+   XMesaVisual xmvis = (XMesaVisual) config;
+   XMesaBuffer xmbuf = XMesaCreatePixmapBuffer(xmvis, pixmap, 0);
+   return xmbuf->frontbuffer; /* need to return an X ID */
+}
+
+
+static GLXContext
+Fake_glXCreateContextWithConfigSGIX(Display *dpy, GLXFBConfigSGIX config, int render_type, GLXContext share_list, Bool direct)
+{
+   XMesaVisual xmvis = (XMesaVisual) config;
+   struct fake_glx_context *glxCtx;
+   struct fake_glx_context *shareCtx = (struct fake_glx_context *) share_list;
+
+   glxCtx = CALLOC_STRUCT(fake_glx_context);
+   if (!glxCtx)
+      return 0;
+
+   /* deallocate unused windows/buffers */
+   XMesaGarbageCollect();
+
+   glxCtx->xmesaContext = XMesaCreateContext(xmvis,
+                                   shareCtx ? shareCtx->xmesaContext : NULL);
+   if (!glxCtx->xmesaContext) {
+      FREE(glxCtx);
+      return NULL;
+   }
+
+   glxCtx->xmesaContext->direct = GL_FALSE;
+   glxCtx->glxContext.isDirect = GL_FALSE;
+   glxCtx->glxContext.currentDpy = dpy;
+   glxCtx->glxContext.xid = (XID) glxCtx;  /* self pointer */
+
+   assert((void *) glxCtx == (void *) &(glxCtx->glxContext));
+
+   return (GLXContext) glxCtx;
+}
+
+
+static XVisualInfo *
+Fake_glXGetVisualFromFBConfigSGIX(Display *dpy, GLXFBConfigSGIX config)
+{
+   return Fake_glXGetVisualFromFBConfig(dpy, config);
+}
+
+
+static GLXFBConfigSGIX
+Fake_glXGetFBConfigFromVisualSGIX(Display *dpy, XVisualInfo *vis)
+{
+   XMesaVisual xmvis = find_glx_visual(dpy, vis);
+   if (!xmvis) {
+      /* This visual wasn't found with glXChooseVisual() */
+      xmvis = create_glx_visual(dpy, vis);
+   }
+
+   return (GLXFBConfigSGIX) xmvis;
+}
+
+
+
+/*** GLX_SGIX_pbuffer ***/
+
+static GLXPbufferSGIX
+Fake_glXCreateGLXPbufferSGIX(Display *dpy, GLXFBConfigSGIX config,
+                             unsigned int width, unsigned int height,
+                             int *attribList)
+{
+   XMesaVisual xmvis = (XMesaVisual) config;
+   XMesaBuffer xmbuf;
+   const int *attrib;
+   GLboolean useLargest = GL_FALSE, preserveContents = GL_FALSE;
+
+   (void) dpy;
+
+   for (attrib = attribList; *attrib; attrib++) {
+      switch (*attrib) {
+         case GLX_PRESERVED_CONTENTS_SGIX:
+            attrib++;
+            preserveContents = *attrib; /* ignored */
+            break;
+         case GLX_LARGEST_PBUFFER_SGIX:
+            attrib++;
+            useLargest = *attrib; /* ignored */
+            break;
+         default:
+            return 0;
+      }
+   }
+
+   /* not used at this time */
+   (void) useLargest;
+   (void) preserveContents;
+
+   xmbuf = XMesaCreatePBuffer( xmvis, 0, width, height);
+   /* A GLXPbuffer handle must be an X Drawable because that's what
+    * glXMakeCurrent takes.
+    */
+   return (GLXPbuffer) xmbuf->frontbuffer;
+}
+
+
+static void
+Fake_glXDestroyGLXPbufferSGIX(Display *dpy, GLXPbufferSGIX pbuf)
+{
+   XMesaBuffer xmbuf = XMesaFindBuffer(dpy, pbuf);
+   if (xmbuf) {
+      XMesaDestroyBuffer(xmbuf);
+   }
+}
+
+
+static int
+Fake_glXQueryGLXPbufferSGIX(Display *dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int *value)
+{
+   const XMesaBuffer xmbuf = XMesaFindBuffer(dpy, pbuf);
+
+   if (!xmbuf) {
+      /* Generate GLXBadPbufferSGIX for bad pbuffer */
+      return 0;
+   }
+
+   switch (attribute) {
+      case GLX_PRESERVED_CONTENTS_SGIX:
+         *value = True;
+         break;
+      case GLX_LARGEST_PBUFFER_SGIX:
+         *value = xmbuf->width * xmbuf->height;
+         break;
+      case GLX_WIDTH_SGIX:
+         *value = xmbuf->width;
+         break;
+      case GLX_HEIGHT_SGIX:
+         *value = xmbuf->height;
+         break;
+      case GLX_EVENT_MASK_SGIX:
+         *value = 0;  /* XXX might be wrong */
+         break;
+      default:
+         *value = 0;
+   }
+   return 0;
+}
+
+
+static void
+Fake_glXSelectEventSGIX(Display *dpy, GLXDrawable drawable, unsigned long mask)
+{
+   XMesaBuffer xmbuf = XMesaFindBuffer(dpy, drawable);
+   if (xmbuf) {
+      /* Note: we'll never generate clobber events */
+      xmbuf->selectedEvents = mask;
+   }
+}
+
+
+static void
+Fake_glXGetSelectedEventSGIX(Display *dpy, GLXDrawable drawable, unsigned long *mask)
+{
+   XMesaBuffer xmbuf = XMesaFindBuffer(dpy, drawable);
+   if (xmbuf) {
+      *mask = xmbuf->selectedEvents;
+   }
+   else {
+      *mask = 0;
+   }
+}
+
+
+
+/*** GLX_SGI_cushion ***/
+
+static void
+Fake_glXCushionSGI(Display *dpy, Window win, float cushion)
+{
+   (void) dpy;
+   (void) win;
+   (void) cushion;
+}
+
+
+
+/*** GLX_SGIX_video_resize ***/
+
+static int
+Fake_glXBindChannelToWindowSGIX(Display *dpy, int screen, int channel , Window window)
+{
+   (void) dpy;
+   (void) screen;
+   (void) channel;
+   (void) window;
+   return 0;
+}
+
+static int
+Fake_glXChannelRectSGIX(Display *dpy, int screen, int channel, int x, int y, int w, int h)
+{
+   (void) dpy;
+   (void) screen;
+   (void) channel;
+   (void) x;
+   (void) y;
+   (void) w;
+   (void) h;
+   return 0;
+}
+
+static int
+Fake_glXQueryChannelRectSGIX(Display *dpy, int screen, int channel, int *x, int *y, int *w, int *h)
+{
+   (void) dpy;
+   (void) screen;
+   (void) channel;
+   (void) x;
+   (void) y;
+   (void) w;
+   (void) h;
+   return 0;
+}
+
+static int
+Fake_glXQueryChannelDeltasSGIX(Display *dpy, int screen, int channel, int *dx, int *dy, int *dw, int *dh)
+{
+   (void) dpy;
+   (void) screen;
+   (void) channel;
+   (void) dx;
+   (void) dy;
+   (void) dw;
+   (void) dh;
+   return 0;
+}
+
+static int
+Fake_glXChannelRectSyncSGIX(Display *dpy, int screen, int channel, GLenum synctype)
+{
+   (void) dpy;
+   (void) screen;
+   (void) channel;
+   (void) synctype;
+   return 0;
+}
+
+
+
+/*** GLX_SGIX_dmbuffer **/
+
+#if defined(_DM_BUFFER_H_)
+static Bool
+Fake_glXAssociateDMPbufferSGIX(Display *dpy, GLXPbufferSGIX pbuffer, DMparams *params, DMbuffer dmbuffer)
+{
+   (void) dpy;
+   (void) pbuffer;
+   (void) params;
+   (void) dmbuffer;
+   return False;
+}
+#endif
+
+
+/*** GLX_SGIX_swap_group ***/
+
+static void
+Fake_glXJoinSwapGroupSGIX(Display *dpy, GLXDrawable drawable, GLXDrawable member)
+{
+   (void) dpy;
+   (void) drawable;
+   (void) member;
+}
+
+
+
+/*** GLX_SGIX_swap_barrier ***/
+
+static void
+Fake_glXBindSwapBarrierSGIX(Display *dpy, GLXDrawable drawable, int barrier)
+{
+   (void) dpy;
+   (void) drawable;
+   (void) barrier;
+}
+
+static Bool
+Fake_glXQueryMaxSwapBarriersSGIX(Display *dpy, int screen, int *max)
+{
+   (void) dpy;
+   (void) screen;
+   (void) max;
+   return False;
+}
+
+
+
+/*** GLX_SUN_get_transparent_index ***/
+
+static Status
+Fake_glXGetTransparentIndexSUN(Display *dpy, Window overlay, Window underlay, long *pTransparent)
+{
+   (void) dpy;
+   (void) overlay;
+   (void) underlay;
+   (void) pTransparent;
+   return 0;
+}
+
+
+
+/*** GLX_MESA_release_buffers ***/
+
+/*
+ * Release the depth, stencil, accum buffers attached to a GLXDrawable
+ * (a window or pixmap) prior to destroying the GLXDrawable.
+ */
+static Bool
+Fake_glXReleaseBuffersMESA( Display *dpy, GLXDrawable d )
+{
+   XMesaBuffer b = XMesaFindBuffer(dpy, d);
+   if (b) {
+      XMesaDestroyBuffer(b);
+      return True;
+   }
+   return False;
+}
+
+
+
+/*** GLX_MESA_set_3dfx_mode ***/
+
+static Bool
+Fake_glXSet3DfxModeMESA( int mode )
+{
+   return XMesaSetFXmode( mode );
+}
+
+
+
+/*** GLX_NV_vertex_array range ***/
+static void *
+Fake_glXAllocateMemoryNV( GLsizei size,
+                          GLfloat readFrequency,
+                          GLfloat writeFrequency,
+                          GLfloat priority )
+{
+   (void) size;
+   (void) readFrequency;
+   (void) writeFrequency;
+   (void) priority;
+   return NULL;
+}
+
+
+static void 
+Fake_glXFreeMemoryNV( GLvoid *pointer )
+{
+   (void) pointer;
+}
+
+
+/*** GLX_MESA_agp_offset ***/
+
+static GLuint
+Fake_glXGetAGPOffsetMESA( const GLvoid *pointer )
+{
+   (void) pointer;
+   return ~0;
+}
+
+
+/*** GLX_ARB_render_texture ***/
+
+static Bool
+Fake_glXBindTexImageARB( Display *dpy, GLXPbuffer pbuffer, int buffer )
+{
+   return False;
+}
+
+
+static Bool
+Fake_glXReleaseTexImageARB(Display *dpy, GLXPbuffer pbuffer, int buffer )
+{
+   return False;
+}
+
+
+static Bool
+Fake_glXDrawableAttribARB( Display *dpy, GLXDrawable draw, const int *attribList )
+{
+   return False;
+}
+
+
+
+extern struct _glxapi_table *_mesa_GetGLXDispatchTable(void);
+struct _glxapi_table *_mesa_GetGLXDispatchTable(void)
+{
+   static struct _glxapi_table glx;
+
+   /* be sure our dispatch table size <= libGL's table */
+   {
+      GLuint size = sizeof(struct _glxapi_table) / sizeof(void *);
+      (void) size;
+      assert(_glxapi_get_dispatch_table_size() >= size);
+   }
+
+   /* initialize the whole table to no-ops */
+   _glxapi_set_no_op_table(&glx);
+
+   /* now initialize the table with the functions I implement */
+   glx.ChooseVisual = Fake_glXChooseVisual;
+   glx.CopyContext = Fake_glXCopyContext;
+   glx.CreateContext = Fake_glXCreateContext;
+   glx.CreateGLXPixmap = Fake_glXCreateGLXPixmap;
+   glx.DestroyContext = Fake_glXDestroyContext;
+   glx.DestroyGLXPixmap = Fake_glXDestroyGLXPixmap;
+   glx.GetConfig = Fake_glXGetConfig;
+   /*glx.GetCurrentContext = Fake_glXGetCurrentContext;*/
+   /*glx.GetCurrentDrawable = Fake_glXGetCurrentDrawable;*/
+   glx.IsDirect = Fake_glXIsDirect;
+   glx.MakeCurrent = Fake_glXMakeCurrent;
+   glx.QueryExtension = Fake_glXQueryExtension;
+   glx.QueryVersion = Fake_glXQueryVersion;
+   glx.SwapBuffers = Fake_glXSwapBuffers;
+   glx.UseXFont = Fake_glXUseXFont;
+   glx.WaitGL = Fake_glXWaitGL;
+   glx.WaitX = Fake_glXWaitX;
+
+   /*** GLX_VERSION_1_1 ***/
+   glx.GetClientString = Fake_glXGetClientString;
+   glx.QueryExtensionsString = Fake_glXQueryExtensionsString;
+   glx.QueryServerString = Fake_glXQueryServerString;
+
+   /*** GLX_VERSION_1_2 ***/
+   /*glx.GetCurrentDisplay = Fake_glXGetCurrentDisplay;*/
+
+   /*** GLX_VERSION_1_3 ***/
+   glx.ChooseFBConfig = Fake_glXChooseFBConfig;
+   glx.CreateNewContext = Fake_glXCreateNewContext;
+   glx.CreatePbuffer = Fake_glXCreatePbuffer;
+   glx.CreatePixmap = Fake_glXCreatePixmap;
+   glx.CreateWindow = Fake_glXCreateWindow;
+   glx.DestroyPbuffer = Fake_glXDestroyPbuffer;
+   glx.DestroyPixmap = Fake_glXDestroyPixmap;
+   glx.DestroyWindow = Fake_glXDestroyWindow;
+   /*glx.GetCurrentReadDrawable = Fake_glXGetCurrentReadDrawable;*/
+   glx.GetFBConfigAttrib = Fake_glXGetFBConfigAttrib;
+   glx.GetFBConfigs = Fake_glXGetFBConfigs;
+   glx.GetSelectedEvent = Fake_glXGetSelectedEvent;
+   glx.GetVisualFromFBConfig = Fake_glXGetVisualFromFBConfig;
+   glx.MakeContextCurrent = Fake_glXMakeContextCurrent;
+   glx.QueryContext = Fake_glXQueryContext;
+   glx.QueryDrawable = Fake_glXQueryDrawable;
+   glx.SelectEvent = Fake_glXSelectEvent;
+
+   /*** GLX_SGI_swap_control ***/
+   glx.SwapIntervalSGI = Fake_glXSwapIntervalSGI;
+
+   /*** GLX_SGI_video_sync ***/
+   glx.GetVideoSyncSGI = Fake_glXGetVideoSyncSGI;
+   glx.WaitVideoSyncSGI = Fake_glXWaitVideoSyncSGI;
+
+   /*** GLX_SGI_make_current_read ***/
+   glx.MakeCurrentReadSGI = Fake_glXMakeCurrentReadSGI;
+   /*glx.GetCurrentReadDrawableSGI = Fake_glXGetCurrentReadDrawableSGI;*/
+
+/*** GLX_SGIX_video_source ***/
+#if defined(_VL_H)
+   glx.CreateGLXVideoSourceSGIX = Fake_glXCreateGLXVideoSourceSGIX;
+   glx.DestroyGLXVideoSourceSGIX = Fake_glXDestroyGLXVideoSourceSGIX;
+#endif
+
+   /*** GLX_EXT_import_context ***/
+   glx.FreeContextEXT = Fake_glXFreeContextEXT;
+   glx.GetContextIDEXT = Fake_glXGetContextIDEXT;
+   /*glx.GetCurrentDisplayEXT = Fake_glXGetCurrentDisplayEXT;*/
+   glx.ImportContextEXT = Fake_glXImportContextEXT;
+   glx.QueryContextInfoEXT = Fake_glXQueryContextInfoEXT;
+
+   /*** GLX_SGIX_fbconfig ***/
+   glx.GetFBConfigAttribSGIX = Fake_glXGetFBConfigAttribSGIX;
+   glx.ChooseFBConfigSGIX = Fake_glXChooseFBConfigSGIX;
+   glx.CreateGLXPixmapWithConfigSGIX = Fake_glXCreateGLXPixmapWithConfigSGIX;
+   glx.CreateContextWithConfigSGIX = Fake_glXCreateContextWithConfigSGIX;
+   glx.GetVisualFromFBConfigSGIX = Fake_glXGetVisualFromFBConfigSGIX;
+   glx.GetFBConfigFromVisualSGIX = Fake_glXGetFBConfigFromVisualSGIX;
+
+   /*** GLX_SGIX_pbuffer ***/
+   glx.CreateGLXPbufferSGIX = Fake_glXCreateGLXPbufferSGIX;
+   glx.DestroyGLXPbufferSGIX = Fake_glXDestroyGLXPbufferSGIX;
+   glx.QueryGLXPbufferSGIX = Fake_glXQueryGLXPbufferSGIX;
+   glx.SelectEventSGIX = Fake_glXSelectEventSGIX;
+   glx.GetSelectedEventSGIX = Fake_glXGetSelectedEventSGIX;
+
+   /*** GLX_SGI_cushion ***/
+   glx.CushionSGI = Fake_glXCushionSGI;
+
+   /*** GLX_SGIX_video_resize ***/
+   glx.BindChannelToWindowSGIX = Fake_glXBindChannelToWindowSGIX;
+   glx.ChannelRectSGIX = Fake_glXChannelRectSGIX;
+   glx.QueryChannelRectSGIX = Fake_glXQueryChannelRectSGIX;
+   glx.QueryChannelDeltasSGIX = Fake_glXQueryChannelDeltasSGIX;
+   glx.ChannelRectSyncSGIX = Fake_glXChannelRectSyncSGIX;
+
+   /*** GLX_SGIX_dmbuffer **/
+#if defined(_DM_BUFFER_H_)
+   glx.AssociateDMPbufferSGIX = NULL;
+#endif
+
+   /*** GLX_SGIX_swap_group ***/
+   glx.JoinSwapGroupSGIX = Fake_glXJoinSwapGroupSGIX;
+
+   /*** GLX_SGIX_swap_barrier ***/
+   glx.BindSwapBarrierSGIX = Fake_glXBindSwapBarrierSGIX;
+   glx.QueryMaxSwapBarriersSGIX = Fake_glXQueryMaxSwapBarriersSGIX;
+
+   /*** GLX_SUN_get_transparent_index ***/
+   glx.GetTransparentIndexSUN = Fake_glXGetTransparentIndexSUN;
+
+   /*** GLX_MESA_copy_sub_buffer ***/
+   glx.CopySubBufferMESA = Fake_glXCopySubBufferMESA;
+
+   /*** GLX_MESA_release_buffers ***/
+   glx.ReleaseBuffersMESA = Fake_glXReleaseBuffersMESA;
+
+   /*** GLX_MESA_pixmap_colormap ***/
+   glx.CreateGLXPixmapMESA = Fake_glXCreateGLXPixmapMESA;
+
+   /*** GLX_MESA_set_3dfx_mode ***/
+   glx.Set3DfxModeMESA = Fake_glXSet3DfxModeMESA;
+
+   /*** GLX_NV_vertex_array_range ***/
+   glx.AllocateMemoryNV = Fake_glXAllocateMemoryNV;
+   glx.FreeMemoryNV = Fake_glXFreeMemoryNV;
+
+   /*** GLX_MESA_agp_offset ***/
+   glx.GetAGPOffsetMESA = Fake_glXGetAGPOffsetMESA;
+
+   /*** GLX_ARB_render_texture ***/
+   glx.BindTexImageARB = Fake_glXBindTexImageARB;
+   glx.ReleaseTexImageARB = Fake_glXReleaseTexImageARB;
+   glx.DrawableAttribARB = Fake_glXDrawableAttribARB;
+
+   return &glx;
+}
diff --git a/reactos/lib/mesa32/src/drivers/x11/glxapi.c b/reactos/lib/mesa32/src/drivers/x11/glxapi.c
new file mode 100644
index 00000000000..4680994310e
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/x11/glxapi.c
@@ -0,0 +1,1343 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ * 
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * This is the GLX API dispatcher.  Calls to the glX* functions are
+ * either routed to the real GLX encoders or to Mesa's pseudo-GLX functions.
+ * See the glxapi.h file for more details.
+ */
+
+
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include "glapi.h"
+#include "glxapi.h"
+
+
+extern struct _glxapi_table *_real_GetGLXDispatchTable(void);
+extern struct _glxapi_table *_mesa_GetGLXDispatchTable(void);
+
+
+struct display_dispatch {
+   Display *Dpy;
+   struct _glxapi_table *Table;
+   struct display_dispatch *Next;
+};
+
+static struct display_dispatch *DispatchList = NULL;
+
+
+/* Display -> Dispatch caching */
+static Display *prevDisplay = NULL;
+static struct _glxapi_table *prevTable = NULL;
+
+
+static struct _glxapi_table *
+get_dispatch(Display *dpy)
+{
+   if (!dpy)
+      return NULL;
+
+   /* search list of display/dispatch pairs for this display */
+   {
+      const struct display_dispatch *d = DispatchList;
+      while (d) {
+         if (d->Dpy == dpy) {
+            prevDisplay = dpy;
+            prevTable = d->Table;
+            return d->Table;  /* done! */
+         }
+         d = d->Next;
+      }
+   }
+
+   /* A new display, determine if we should use real GLX
+    * or Mesa's pseudo-GLX.
+    */
+   {
+      struct _glxapi_table *t = NULL;
+
+#ifdef GLX_BUILT_IN_XMESA
+      if (!getenv("LIBGL_FORCE_XMESA")) {
+         int ignore;
+         if (XQueryExtension( dpy, "GLX", &ignore, &ignore, &ignore )) {
+            /* the X server has the GLX extension */
+            t = _real_GetGLXDispatchTable();
+         }
+      }
+#endif
+
+      if (!t) {
+         /* Fallback to Mesa with Xlib driver */
+#ifdef GLX_BUILT_IN_XMESA
+         if (getenv("LIBGL_DEBUG")) {
+            fprintf(stderr,
+                    "libGL: server %s lacks the GLX extension.",
+                    dpy->display_name);
+            fprintf(stderr, " Using Mesa Xlib renderer.\n");
+         }
+#endif
+         t = _mesa_GetGLXDispatchTable();
+         assert(t);  /* this has to work */
+      }
+
+      if (t) {
+         struct display_dispatch *d;
+         d = (struct display_dispatch *) malloc(sizeof(struct display_dispatch));
+         if (d) {
+            d->Dpy = dpy;
+            d->Table = t;
+            /* insert at head of list */
+            d->Next = DispatchList;
+            DispatchList = d;
+            /* update cache */
+            prevDisplay = dpy;
+            prevTable = t;
+            return t;
+         }
+      }
+   }
+
+   /* If we get here that means we can't use real GLX on this display
+    * and the Mesa pseudo-GLX software renderer wasn't compiled in.
+    * Or, we ran out of memory!
+    */
+   return NULL;
+}
+
+
+#define GET_DISPATCH(DPY, TABLE)	\
+   if (DPY == prevDisplay) {		\
+      TABLE = prevTable;		\
+   }					\
+   else if (!DPY) {			\
+      TABLE = NULL;			\
+   }					\
+   else {				\
+      TABLE = get_dispatch(DPY);	\
+   }
+
+   
+
+
+/* Set by glXMakeCurrent() and glXMakeContextCurrent() only */
+#ifndef GLX_BUILT_IN_XMESA
+static GLXContext CurrentContext = 0;
+#define __glXGetCurrentContext() CurrentContext;
+#endif
+
+
+/*
+ * GLX API entrypoints
+ */
+
+/*** GLX_VERSION_1_0 ***/
+
+XVisualInfo *glXChooseVisual(Display *dpy, int screen, int *list)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return NULL;
+   return (t->ChooseVisual)(dpy, screen, list);
+}
+
+
+void glXCopyContext(Display *dpy, GLXContext src, GLXContext dst, unsigned long mask)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return;
+   (t->CopyContext)(dpy, src, dst, mask);
+}
+
+
+GLXContext glXCreateContext(Display *dpy, XVisualInfo *visinfo, GLXContext shareList, Bool direct)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return 0;
+   return (t->CreateContext)(dpy, visinfo, shareList, direct);
+}
+
+
+GLXPixmap glXCreateGLXPixmap(Display *dpy, XVisualInfo *visinfo, Pixmap pixmap)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return 0;
+   return (t->CreateGLXPixmap)(dpy, visinfo, pixmap);
+}
+
+
+void glXDestroyContext(Display *dpy, GLXContext ctx)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return;
+   (t->DestroyContext)(dpy, ctx);
+}
+
+
+void glXDestroyGLXPixmap(Display *dpy, GLXPixmap pixmap)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return;
+   (t->DestroyGLXPixmap)(dpy, pixmap);
+}
+
+
+int glXGetConfig(Display *dpy, XVisualInfo *visinfo, int attrib, int *value)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return GLX_NO_EXTENSION;
+   return (t->GetConfig)(dpy, visinfo, attrib, value);
+}
+
+
+#ifdef GLX_BUILT_IN_XMESA
+/* Use real libGL's glXGetCurrentContext() function */
+#else
+/* stand-alone Mesa */
+GLXContext glXGetCurrentContext(void)
+{
+   return CurrentContext;
+}
+#endif
+
+
+#ifdef GLX_BUILT_IN_XMESA
+/* Use real libGL's glXGetCurrentContext() function */
+#else
+/* stand-alone Mesa */
+GLXDrawable glXGetCurrentDrawable(void)
+{
+   __GLXcontext *gc = (__GLXcontext *) glXGetCurrentContext();
+   return gc ? gc->currentDrawable : 0;
+}
+#endif
+
+
+Bool glXIsDirect(Display *dpy, GLXContext ctx)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return False;
+   return (t->IsDirect)(dpy, ctx);
+}
+
+
+Bool glXMakeCurrent(Display *dpy, GLXDrawable drawable, GLXContext ctx)
+{
+   Bool b;
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t) {
+      return False;
+   }
+   b = (*t->MakeCurrent)(dpy, drawable, ctx);
+#ifndef  GLX_BUILT_IN_XMESA
+   if (b) {
+      CurrentContext = ctx;
+   }
+#endif
+   return b;
+}
+
+
+Bool glXQueryExtension(Display *dpy, int *errorb, int *event)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return False;
+   return (t->QueryExtension)(dpy, errorb, event);
+}
+
+
+Bool glXQueryVersion(Display *dpy, int *maj, int *min)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return False;
+   return (t->QueryVersion)(dpy, maj, min);
+}
+
+
+void glXSwapBuffers(Display *dpy, GLXDrawable drawable)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return;
+   (t->SwapBuffers)(dpy, drawable);
+}
+
+
+void glXUseXFont(Font font, int first, int count, int listBase)
+{
+   struct _glxapi_table *t;
+   Display *dpy = glXGetCurrentDisplay();
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return;
+   (t->UseXFont)(font, first, count, listBase);
+}
+
+
+void glXWaitGL(void)
+{
+   struct _glxapi_table *t;
+   Display *dpy = glXGetCurrentDisplay();
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return;
+   (t->WaitGL)();
+}
+
+
+void glXWaitX(void)
+{
+   struct _glxapi_table *t;
+   Display *dpy = glXGetCurrentDisplay();
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return;
+   (t->WaitX)();
+}
+
+
+
+/*** GLX_VERSION_1_1 ***/
+
+const char *glXGetClientString(Display *dpy, int name)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return NULL;
+   return (t->GetClientString)(dpy, name);
+}
+
+
+const char *glXQueryExtensionsString(Display *dpy, int screen)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return NULL;
+   return (t->QueryExtensionsString)(dpy, screen);
+}
+
+
+const char *glXQueryServerString(Display *dpy, int screen, int name)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return NULL;
+   return (t->QueryServerString)(dpy, screen, name);
+}
+
+
+/*** GLX_VERSION_1_2 ***/
+
+#if !defined(GLX_BUILT_IN_XMESA)
+Display *glXGetCurrentDisplay(void)
+{
+   /* Same code as in libGL's glxext.c */
+   __GLXcontext *gc = (__GLXcontext *) glXGetCurrentContext();
+   if (NULL == gc) return NULL;
+   return gc->currentDpy;
+}
+#endif
+
+
+
+/*** GLX_VERSION_1_3 ***/
+
+GLXFBConfig *glXChooseFBConfig(Display *dpy, int screen, const int *attribList, int *nitems)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return 0;
+   return (t->ChooseFBConfig)(dpy, screen, attribList, nitems);
+}
+
+
+GLXContext glXCreateNewContext(Display *dpy, GLXFBConfig config, int renderType, GLXContext shareList, Bool direct)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return 0;
+   return (t->CreateNewContext)(dpy, config, renderType, shareList, direct);
+}
+
+
+GLXPbuffer glXCreatePbuffer(Display *dpy, GLXFBConfig config, const int *attribList)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return 0;
+   return (t->CreatePbuffer)(dpy, config, attribList);
+}
+
+
+GLXPixmap glXCreatePixmap(Display *dpy, GLXFBConfig config, Pixmap pixmap, const int *attribList)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return 0;
+   return (t->CreatePixmap)(dpy, config, pixmap, attribList);
+}
+
+
+GLXWindow glXCreateWindow(Display *dpy, GLXFBConfig config, Window win, const int *attribList)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return 0;
+   return (t->CreateWindow)(dpy, config, win, attribList);
+}
+
+
+void glXDestroyPbuffer(Display *dpy, GLXPbuffer pbuf)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return;
+   (t->DestroyPbuffer)(dpy, pbuf);
+}
+
+
+void glXDestroyPixmap(Display *dpy, GLXPixmap pixmap)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return;
+   (t->DestroyPixmap)(dpy, pixmap);
+}
+
+
+void glXDestroyWindow(Display *dpy, GLXWindow window)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return;
+   (t->DestroyWindow)(dpy, window);
+}
+
+
+#ifdef GLX_BUILT_IN_XMESA
+/* Use the glXGetCurrentReadDrawable() function from libGL */
+#else
+GLXDrawable glXGetCurrentReadDrawable(void)
+{
+   __GLXcontext *gc = (__GLXcontext *) glXGetCurrentContext();
+   return gc ? gc->currentReadable : 0;
+}
+#endif
+
+
+int glXGetFBConfigAttrib(Display *dpy, GLXFBConfig config, int attribute, int *value)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return GLX_NO_EXTENSION;
+   return (t->GetFBConfigAttrib)(dpy, config, attribute, value);
+}
+
+
+GLXFBConfig *glXGetFBConfigs(Display *dpy, int screen, int *nelements)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return 0;
+   return (t->GetFBConfigs)(dpy, screen, nelements);
+}
+
+void glXGetSelectedEvent(Display *dpy, GLXDrawable drawable, unsigned long *mask)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return;
+   (t->GetSelectedEvent)(dpy, drawable, mask);
+}
+
+
+XVisualInfo *glXGetVisualFromFBConfig(Display *dpy, GLXFBConfig config)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return NULL;
+   return (t->GetVisualFromFBConfig)(dpy, config);
+}
+
+
+Bool glXMakeContextCurrent(Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx)
+{
+   Bool b;
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return False;
+   b = (t->MakeContextCurrent)(dpy, draw, read, ctx);
+#ifndef GLX_BUILT_IN_XMESA
+   if (b) {
+      CurrentContext = ctx;
+   }
+#endif
+   return b;
+}
+
+
+int glXQueryContext(Display *dpy, GLXContext ctx, int attribute, int *value)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   assert(t);
+   if (!t)
+      return 0; /* XXX correct? */
+   return (t->QueryContext)(dpy, ctx, attribute, value);
+}
+
+
+void glXQueryDrawable(Display *dpy, GLXDrawable draw, int attribute, unsigned int *value)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return;
+   (t->QueryDrawable)(dpy, draw, attribute, value);
+}
+
+
+void glXSelectEvent(Display *dpy, GLXDrawable drawable, unsigned long mask)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return;
+   (t->SelectEvent)(dpy, drawable, mask);
+}
+
+
+
+/*** GLX_SGI_swap_control ***/
+
+int glXSwapIntervalSGI(int interval)
+{
+   struct _glxapi_table *t;
+   Display *dpy = glXGetCurrentDisplay();
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return 0;
+   return (t->SwapIntervalSGI)(interval);
+}
+
+
+
+/*** GLX_SGI_video_sync ***/
+
+int glXGetVideoSyncSGI(unsigned int *count)
+{
+   struct _glxapi_table *t;
+   Display *dpy = glXGetCurrentDisplay();
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return 0;
+   return (t->GetVideoSyncSGI)(count);
+}
+
+int glXWaitVideoSyncSGI(int divisor, int remainder, unsigned int *count)
+{
+   struct _glxapi_table *t;
+   Display *dpy = glXGetCurrentDisplay();
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return 0;
+   return (t->WaitVideoSyncSGI)(divisor, remainder, count);
+}
+
+
+
+/*** GLX_SGI_make_current_read ***/
+
+Bool glXMakeCurrentReadSGI(Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return 0;
+   return (t->MakeCurrentReadSGI)(dpy, draw, read, ctx);
+}
+
+#ifdef GLX_BUILT_IN_XMESA
+/* Use glXGetCurrentReadDrawableSGI() from libGL */
+#else
+/* stand-alone Mesa */
+GLXDrawable glXGetCurrentReadDrawableSGI(void)
+{
+   return glXGetCurrentReadDrawable();
+}
+#endif
+
+
+#if defined(_VL_H)
+
+GLXVideoSourceSGIX glXCreateGLXVideoSourceSGIX(Display *dpy, int screen, VLServer server, VLPath path, int nodeClass, VLNode drainNode)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return 0;
+   return (t->CreateGLXVideoSourceSGIX)(dpy, screen, server, path, nodeClass, drainNode);
+}
+
+void glXDestroyGLXVideoSourceSGIX(Display *dpy, GLXVideoSourceSGIX src)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return 0;
+   return (t->DestroyGLXVideoSourceSGIX)(dpy, src);
+}
+
+#endif
+
+
+/*** GLX_EXT_import_context ***/
+
+void glXFreeContextEXT(Display *dpy, GLXContext context)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return;
+   (t->FreeContextEXT)(dpy, context);
+}
+
+#ifdef GLX_BUILT_IN_XMESA
+/* Use real libGL's glXGetContextIDEXT() function */
+#else
+/* stand-alone Mesa */
+GLXContextID glXGetContextIDEXT(const GLXContext context)
+{
+   return ((__GLXcontext *) context)->xid;
+}
+#endif
+
+#ifdef GLX_BUILT_IN_XMESA
+/* Use real libGL's glXGetCurrentDisplayEXT() function */
+#else
+/* stand-alone Mesa */
+Display *glXGetCurrentDisplayEXT(void)
+{
+   return glXGetCurrentDisplay();
+}
+#endif
+
+GLXContext glXImportContextEXT(Display *dpy, GLXContextID contextID)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return 0;
+   return (t->ImportContextEXT)(dpy, contextID);
+}
+
+int glXQueryContextInfoEXT(Display *dpy, GLXContext context, int attribute,int *value)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return 0;  /* XXX ok? */
+   return (t->QueryContextInfoEXT)(dpy, context, attribute, value);
+}
+
+
+
+/*** GLX_SGIX_fbconfig ***/
+
+int glXGetFBConfigAttribSGIX(Display *dpy, GLXFBConfigSGIX config, int attribute, int *value)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return 0;
+   return (t->GetFBConfigAttribSGIX)(dpy, config, attribute, value);
+}
+
+GLXFBConfigSGIX *glXChooseFBConfigSGIX(Display *dpy, int screen, int *attrib_list, int *nelements)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return 0;
+   return (t->ChooseFBConfigSGIX)(dpy, screen, attrib_list, nelements);
+}
+
+GLXPixmap glXCreateGLXPixmapWithConfigSGIX(Display *dpy, GLXFBConfigSGIX config, Pixmap pixmap)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return 0;
+   return (t->CreateGLXPixmapWithConfigSGIX)(dpy, config, pixmap);
+}
+
+GLXContext glXCreateContextWithConfigSGIX(Display *dpy, GLXFBConfigSGIX config, int render_type, GLXContext share_list, Bool direct)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return 0;
+   return (t->CreateContextWithConfigSGIX)(dpy, config, render_type, share_list, direct);
+}
+
+XVisualInfo * glXGetVisualFromFBConfigSGIX(Display *dpy, GLXFBConfigSGIX config)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return 0;
+   return (t->GetVisualFromFBConfigSGIX)(dpy, config);
+}
+
+GLXFBConfigSGIX glXGetFBConfigFromVisualSGIX(Display *dpy, XVisualInfo *vis)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return 0;
+   return (t->GetFBConfigFromVisualSGIX)(dpy, vis);
+}
+
+
+
+/*** GLX_SGIX_pbuffer ***/
+
+GLXPbufferSGIX glXCreateGLXPbufferSGIX(Display *dpy, GLXFBConfigSGIX config, unsigned int width, unsigned int height, int *attrib_list)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return 0;
+   return (t->CreateGLXPbufferSGIX)(dpy, config, width, height, attrib_list);
+}
+
+void glXDestroyGLXPbufferSGIX(Display *dpy, GLXPbufferSGIX pbuf)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return;
+   (t->DestroyGLXPbufferSGIX)(dpy, pbuf);
+}
+
+int glXQueryGLXPbufferSGIX(Display *dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int *value)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return 0;
+   return (t->QueryGLXPbufferSGIX)(dpy, pbuf, attribute, value);
+}
+
+void glXSelectEventSGIX(Display *dpy, GLXDrawable drawable, unsigned long mask)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return;
+   (t->SelectEventSGIX)(dpy, drawable, mask);
+}
+
+void glXGetSelectedEventSGIX(Display *dpy, GLXDrawable drawable, unsigned long *mask)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return;
+   (t->GetSelectedEventSGIX)(dpy, drawable, mask);
+}
+
+
+
+/*** GLX_SGI_cushion ***/
+
+void glXCushionSGI(Display *dpy, Window win, float cushion)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return;
+   (t->CushionSGI)(dpy, win, cushion);
+}
+
+
+
+/*** GLX_SGIX_video_resize ***/
+
+int glXBindChannelToWindowSGIX(Display *dpy, int screen, int channel , Window window)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return 0;
+   return (t->BindChannelToWindowSGIX)(dpy, screen, channel, window);
+}
+
+int glXChannelRectSGIX(Display *dpy, int screen, int channel, int x, int y, int w, int h)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return 0;
+   return (t->ChannelRectSGIX)(dpy, screen, channel, x, y, w, h);
+}
+
+int glXQueryChannelRectSGIX(Display *dpy, int screen, int channel, int *x, int *y, int *w, int *h)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return 0;
+   return (t->QueryChannelRectSGIX)(dpy, screen, channel, x, y, w, h);
+}
+
+int glXQueryChannelDeltasSGIX(Display *dpy, int screen, int channel, int *dx, int *dy, int *dw, int *dh)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return 0;
+   return (t->QueryChannelDeltasSGIX)(dpy, screen, channel, dx, dy, dw, dh);
+}
+
+int glXChannelRectSyncSGIX(Display *dpy, int screen, int channel, GLenum synctype)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return 0;
+   return (t->ChannelRectSyncSGIX)(dpy, screen, channel, synctype);
+}
+
+
+
+#if defined(_DM_BUFFER_H_)
+
+Bool glXAssociateDMPbufferSGIX(Display *dpy, GLXPbufferSGIX pbuffer, DMparams *params, DMbuffer dmbuffer)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return False;
+   return (t->AssociateDMPbufferSGIX)(dpy, pbuffer, params, dmbuffer);
+}
+
+#endif
+
+
+/*** GLX_SGIX_swap_group ***/
+
+void glXJoinSwapGroupSGIX(Display *dpy, GLXDrawable drawable, GLXDrawable member)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return;
+   (*t->JoinSwapGroupSGIX)(dpy, drawable, member);
+}
+
+
+/*** GLX_SGIX_swap_barrier ***/
+
+void glXBindSwapBarrierSGIX(Display *dpy, GLXDrawable drawable, int barrier)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return;
+   (*t->BindSwapBarrierSGIX)(dpy, drawable, barrier);
+}
+
+Bool glXQueryMaxSwapBarriersSGIX(Display *dpy, int screen, int *max)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return False;
+   return (*t->QueryMaxSwapBarriersSGIX)(dpy, screen, max);
+}
+
+
+
+/*** GLX_SUN_get_transparent_index ***/
+
+Status glXGetTransparentIndexSUN(Display *dpy, Window overlay, Window underlay, long *pTransparent)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return False;
+   return (*t->GetTransparentIndexSUN)(dpy, overlay, underlay, pTransparent);
+}
+
+
+
+/*** GLX_MESA_copy_sub_buffer ***/
+
+void glXCopySubBufferMESA(Display *dpy, GLXDrawable drawable, int x, int y, int width, int height)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return;
+   (t->CopySubBufferMESA)(dpy, drawable, x, y, width, height);
+}
+
+
+
+/*** GLX_MESA_release_buffers ***/
+
+Bool glXReleaseBuffersMESA(Display *dpy, Window w)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return False;
+   return (t->ReleaseBuffersMESA)(dpy, w);
+}
+
+
+
+/*** GLX_MESA_pixmap_colormap ***/
+
+GLXPixmap glXCreateGLXPixmapMESA(Display *dpy, XVisualInfo *visinfo, Pixmap pixmap, Colormap cmap)
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return 0;
+   return (t->CreateGLXPixmapMESA)(dpy, visinfo, pixmap, cmap);
+}
+
+
+
+/*** GLX_MESA_set_3dfx_mode ***/
+
+Bool glXSet3DfxModeMESA(int mode)
+{
+   struct _glxapi_table *t;
+   Display *dpy = glXGetCurrentDisplay();
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return False;
+   return (t->Set3DfxModeMESA)(mode);
+}
+
+
+
+/*** GLX_NV_vertex_array_range ***/
+
+void *
+glXAllocateMemoryNV( GLsizei size,
+                     GLfloat readFrequency,
+                     GLfloat writeFrequency,
+                     GLfloat priority )
+{
+   struct _glxapi_table *t;
+   Display *dpy = glXGetCurrentDisplay();
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return NULL;
+   return (t->AllocateMemoryNV)(size, readFrequency, writeFrequency, priority);
+}
+
+
+void 
+glXFreeMemoryNV( GLvoid *pointer )
+{
+   struct _glxapi_table *t;
+   Display *dpy = glXGetCurrentDisplay();
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return;
+   (t->FreeMemoryNV)(pointer);
+}
+
+
+/*** GLX_MESA_agp_offset */
+
+GLuint
+glXGetAGPOffsetMESA( const GLvoid *pointer )
+{
+   struct _glxapi_table *t;
+   Display *dpy = glXGetCurrentDisplay();
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return ~0;
+   return (t->GetAGPOffsetMESA)(pointer);
+}
+
+
+/*** GLX_ARB_render_Texture ***/
+
+Bool
+glXBindTexImageARB( Display *dpy, GLXPbuffer pbuffer, int buffer )
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return False;
+   return (t->BindTexImageARB)(dpy, pbuffer, buffer);
+}
+
+
+Bool
+glXReleaseTexImageARB(Display *dpy, GLXPbuffer pbuffer, int buffer )
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return False;
+   return (t->ReleaseTexImageARB)(dpy, pbuffer, buffer);
+}
+
+
+Bool
+glXDrawableAttribARB( Display *dpy, GLXDrawable draw, const int *attribList )
+{
+   struct _glxapi_table *t;
+   GET_DISPATCH(dpy, t);
+   if (!t)
+      return False;
+   return (t->DrawableAttribARB)(dpy, draw, attribList);
+}
+
+
+
+/**********************************************************************/
+/* GLX API management functions                                       */
+/**********************************************************************/
+
+
+const char *
+_glxapi_get_version(void)
+{
+   return "1.3";
+}
+
+
+/*
+ * Return array of extension strings.
+ */
+const char **
+_glxapi_get_extensions(void)
+{
+   static const char *extensions[] = {
+#ifdef GLX_EXT_import_context
+      "GLX_EXT_import_context",
+#endif
+#ifdef GLX_SGI_video_sync
+      "GLX_SGI_video_sync",
+#endif
+#ifdef GLX_MESA_copy_sub_buffer
+      "GLX_MESA_copy_sub_buffer",
+#endif
+#ifdef GLX_MESA_release_buffers
+      "GLX_MESA_release_buffers",
+#endif
+#ifdef GLX_MESA_pixmap_colormap
+      "GLX_MESA_pixmap_colormap",
+#endif
+#ifdef GLX_MESA_set_3dfx_mode
+      "GLX_MESA_set_3dfx_mode",
+#endif
+#ifdef GLX_SGIX_fbconfig
+      "GLX_SGIX_fbconfig",
+#endif
+#ifdef GLX_SGIX_pbuffer
+      "GLX_SGIX_pbuffer",
+#endif
+#ifdef GLX_ARB_render_texture
+      "GLX_ARB_render_texture",
+#endif
+      NULL
+   };
+   return extensions;
+}
+
+
+/*
+ * Return size of the GLX dispatch table, in entries, not bytes.
+ */
+GLuint
+_glxapi_get_dispatch_table_size(void)
+{
+   return sizeof(struct _glxapi_table) / sizeof(void *);
+}
+
+
+static int
+generic_no_op_func(void)
+{
+   return 0;
+}
+
+
+/*
+ * Initialize all functions in given dispatch table to be no-ops
+ */
+void
+_glxapi_set_no_op_table(struct _glxapi_table *t)
+{
+   GLuint n = _glxapi_get_dispatch_table_size();
+   GLuint i;
+   void **dispatch = (void **) t;
+   for (i = 0; i < n; i++) {
+      dispatch[i] = (void *) generic_no_op_func;
+   }
+}
+
+
+struct name_address_pair {
+   const char *Name;
+   GLvoid *Address;
+};
+
+static struct name_address_pair GLX_functions[] = {
+   /*** GLX_VERSION_1_0 ***/
+   { "glXChooseVisual", (GLvoid *) glXChooseVisual },
+   { "glXCopyContext", (GLvoid *) glXCopyContext },
+   { "glXCreateContext", (GLvoid *) glXCreateContext },
+   { "glXCreateGLXPixmap", (GLvoid *) glXCreateGLXPixmap },
+   { "glXDestroyContext", (GLvoid *) glXDestroyContext },
+   { "glXDestroyGLXPixmap", (GLvoid *) glXDestroyGLXPixmap },
+   { "glXGetConfig", (GLvoid *) glXGetConfig },
+   { "glXGetCurrentContext", (GLvoid *) glXGetCurrentContext },
+   { "glXGetCurrentDrawable", (GLvoid *) glXGetCurrentDrawable },
+   { "glXIsDirect", (GLvoid *) glXIsDirect },
+   { "glXMakeCurrent", (GLvoid *) glXMakeCurrent },
+   { "glXQueryExtension", (GLvoid *) glXQueryExtension },
+   { "glXQueryVersion", (GLvoid *) glXQueryVersion },
+   { "glXSwapBuffers", (GLvoid *) glXSwapBuffers },
+   { "glXUseXFont", (GLvoid *) glXUseXFont },
+   { "glXWaitGL", (GLvoid *) glXWaitGL },
+   { "glXWaitX", (GLvoid *) glXWaitX },
+
+   /*** GLX_VERSION_1_1 ***/
+   { "glXGetClientString", (GLvoid *) glXGetClientString },
+   { "glXQueryExtensionsString", (GLvoid *) glXQueryExtensionsString },
+   { "glXQueryServerString", (GLvoid *) glXQueryServerString },
+
+   /*** GLX_VERSION_1_2 ***/
+   { "glXGetCurrentDisplay", (GLvoid *) glXGetCurrentDisplay },
+
+   /*** GLX_VERSION_1_3 ***/
+   { "glXChooseFBConfig", (GLvoid *) glXChooseFBConfig },
+   { "glXCreateNewContext", (GLvoid *) glXCreateNewContext },
+   { "glXCreatePbuffer", (GLvoid *) glXCreatePbuffer },
+   { "glXCreatePixmap", (GLvoid *) glXCreatePixmap },
+   { "glXCreateWindow", (GLvoid *) glXCreateWindow },
+   { "glXDestroyPbuffer", (GLvoid *) glXDestroyPbuffer },
+   { "glXDestroyPixmap", (GLvoid *) glXDestroyPixmap },
+   { "glXDestroyWindow", (GLvoid *) glXDestroyWindow },
+   { "glXGetCurrentReadDrawable", (GLvoid *) glXGetCurrentReadDrawable },
+   { "glXGetFBConfigAttrib", (GLvoid *) glXGetFBConfigAttrib },
+   { "glXGetFBConfigs", (GLvoid *) glXGetFBConfigs },
+   { "glXGetSelectedEvent", (GLvoid *) glXGetSelectedEvent },
+   { "glXGetVisualFromFBConfig", (GLvoid *) glXGetVisualFromFBConfig },
+   { "glXMakeContextCurrent", (GLvoid *) glXMakeContextCurrent },
+   { "glXQueryContext", (GLvoid *) glXQueryContext },
+   { "glXQueryDrawable", (GLvoid *) glXQueryDrawable },
+   { "glXSelectEvent", (GLvoid *) glXSelectEvent },
+
+   /*** GLX_VERSION_1_4 ***/
+   { "glXGetProcAddress", (GLvoid *) glXGetProcAddress },
+
+   /*** GLX_SGI_swap_control ***/
+   { "glXSwapIntervalSGI", (GLvoid *) glXSwapIntervalSGI },
+
+   /*** GLX_SGI_video_sync ***/
+   { "glXGetVideoSyncSGI", (GLvoid *) glXGetVideoSyncSGI },
+   { "glXWaitVideoSyncSGI", (GLvoid *) glXWaitVideoSyncSGI },
+
+   /*** GLX_SGI_make_current_read ***/
+   { "glXMakeCurrentReadSGI", (GLvoid *) glXMakeCurrentReadSGI },
+   { "glXGetCurrentReadDrawableSGI", (GLvoid *) glXGetCurrentReadDrawableSGI },
+
+   /*** GLX_SGIX_video_source ***/
+#if defined(_VL_H)
+   { "glXCreateGLXVideoSourceSGIX", (GLvoid *) glXCreateGLXVideoSourceSGIX },
+   { "glXDestroyGLXVideoSourceSGIX", (GLvoid *) glXDestroyGLXVideoSourceSGIX },
+#endif
+
+   /*** GLX_EXT_import_context ***/
+   { "glXFreeContextEXT", (GLvoid *) glXFreeContextEXT },
+   { "glXGetContextIDEXT", (GLvoid *) glXGetContextIDEXT },
+   { "glXGetCurrentDisplayEXT", (GLvoid *) glXGetCurrentDisplayEXT },
+   { "glXImportContextEXT", (GLvoid *) glXImportContextEXT },
+   { "glXQueryContextInfoEXT", (GLvoid *) glXQueryContextInfoEXT },
+
+   /*** GLX_SGIX_fbconfig ***/
+   { "glXGetFBConfigAttribSGIX", (GLvoid *) glXGetFBConfigAttribSGIX },
+   { "glXChooseFBConfigSGIX", (GLvoid *) glXChooseFBConfigSGIX },
+   { "glXCreateGLXPixmapWithConfigSGIX", (GLvoid *) glXCreateGLXPixmapWithConfigSGIX },
+   { "glXCreateContextWithConfigSGIX", (GLvoid *) glXCreateContextWithConfigSGIX },
+   { "glXGetVisualFromFBConfigSGIX", (GLvoid *) glXGetVisualFromFBConfigSGIX },
+   { "glXGetFBConfigFromVisualSGIX", (GLvoid *) glXGetFBConfigFromVisualSGIX },
+
+   /*** GLX_SGIX_pbuffer ***/
+   { "glXCreateGLXPbufferSGIX", (GLvoid *) glXCreateGLXPbufferSGIX },
+   { "glXDestroyGLXPbufferSGIX", (GLvoid *) glXDestroyGLXPbufferSGIX },
+   { "glXQueryGLXPbufferSGIX", (GLvoid *) glXQueryGLXPbufferSGIX },
+   { "glXSelectEventSGIX", (GLvoid *) glXSelectEventSGIX },
+   { "glXGetSelectedEventSGIX", (GLvoid *) glXGetSelectedEventSGIX },
+
+   /*** GLX_SGI_cushion ***/
+   { "glXCushionSGI", (GLvoid *) glXCushionSGI },
+
+   /*** GLX_SGIX_video_resize ***/
+   { "glXBindChannelToWindowSGIX", (GLvoid *) glXBindChannelToWindowSGIX },
+   { "glXChannelRectSGIX", (GLvoid *) glXChannelRectSGIX },
+   { "glXQueryChannelRectSGIX", (GLvoid *) glXQueryChannelRectSGIX },
+   { "glXQueryChannelDeltasSGIX", (GLvoid *) glXQueryChannelDeltasSGIX },
+   { "glXChannelRectSyncSGIX", (GLvoid *) glXChannelRectSyncSGIX },
+
+   /*** GLX_SGIX_dmbuffer **/
+#if defined(_DM_BUFFER_H_)
+   { "glXAssociateDMPbufferSGIX", (GLvoid *) glXAssociateDMPbufferSGIX },
+#endif
+
+   /*** GLX_SGIX_swap_group ***/
+   { "glXJoinSwapGroupSGIX", (GLvoid *) glXJoinSwapGroupSGIX },
+
+   /*** GLX_SGIX_swap_barrier ***/
+   { "glXBindSwapBarrierSGIX", (GLvoid *) glXBindSwapBarrierSGIX },
+   { "glXQueryMaxSwapBarriersSGIX", (GLvoid *) glXQueryMaxSwapBarriersSGIX },
+
+   /*** GLX_SUN_get_transparent_index ***/
+   { "glXGetTransparentIndexSUN", (GLvoid *) glXGetTransparentIndexSUN },
+
+   /*** GLX_MESA_copy_sub_buffer ***/
+   { "glXCopySubBufferMESA", (GLvoid *) glXCopySubBufferMESA },
+
+   /*** GLX_MESA_pixmap_colormap ***/
+   { "glXCreateGLXPixmapMESA", (GLvoid *) glXCreateGLXPixmapMESA },
+
+   /*** GLX_MESA_release_buffers ***/
+   { "glXReleaseBuffersMESA", (GLvoid *) glXReleaseBuffersMESA },
+
+   /*** GLX_MESA_set_3dfx_mode ***/
+   { "glXSet3DfxModeMESA", (GLvoid *) glXSet3DfxModeMESA },
+
+   /*** GLX_ARB_get_proc_address ***/
+   { "glXGetProcAddressARB", (GLvoid *) glXGetProcAddressARB },
+
+   /*** GLX_NV_vertex_array_range ***/
+   { "glXAllocateMemoryNV", (GLvoid *) glXAllocateMemoryNV },
+   { "glXFreeMemoryNV", (GLvoid *) glXFreeMemoryNV },
+
+   /*** GLX_MESA_agp_offset ***/
+   { "glXGetAGPOffsetMESA", (GLvoid *) glXGetAGPOffsetMESA },
+
+   /*** GLX_ARB_render_texture ***/
+   { "glXBindTexImageARB", (GLvoid *) glXBindTexImageARB },
+   { "glXReleaseTexImageARB", (GLvoid *) glXReleaseTexImageARB },
+   { "glXDrawableAttribARB", (GLvoid *) glXDrawableAttribARB },
+
+   { NULL, NULL }   /* end of list */
+};
+
+
+
+/*
+ * Return address of named glX function, or NULL if not found.
+ */
+const GLvoid *
+_glxapi_get_proc_address(const char *funcName)
+{
+   GLuint i;
+   for (i = 0; GLX_functions[i].Name; i++) {
+      if (strcmp(GLX_functions[i].Name, funcName) == 0)
+         return GLX_functions[i].Address;
+   }
+   return NULL;
+}
+
+
+
+/*
+ * This function does not get dispatched through the dispatch table
+ * since it's really a "meta" function.
+ */
+void (*glXGetProcAddressARB(const GLubyte *procName))()
+{
+   typedef void (*gl_function)();
+   gl_function f;
+
+   f = (gl_function) _glxapi_get_proc_address((const char *) procName);
+   if (f) {
+      return f;
+   }
+
+   f = (gl_function) _glapi_get_proc_address((const char *) procName);
+   return f;
+}
+
+
+/* GLX 1.4 */
+void (*glXGetProcAddress(const GLubyte *procName))()
+{
+   return glXGetProcAddressARB(procName);
+}
diff --git a/reactos/lib/mesa32/src/drivers/x11/glxapi.h b/reactos/lib/mesa32/src/drivers/x11/glxapi.h
new file mode 100644
index 00000000000..6f09a68fe08
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/x11/glxapi.h
@@ -0,0 +1,236 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ * 
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef _glxapi_h_
+#define _glxapi_h_
+
+
+#define GLX_GLXEXT_PROTOTYPES
+#include "GL/glx.h"
+
+
+#ifdef GLX_BUILT_IN_XMESA
+/* The GLX API dispatcher (i.e. this code) is being built into XFree86's
+ * libGL so we'll use the __GLXContextRec defined in xc/lib/GL/glx/glxclient.h
+*/
+#include "glxclient.h"
+#else
+/* The GLX API dispatcher (i.e. this code) is being built into stand-alone
+ * Mesa.  We don't know anything about XFree86 or real GLX so we define a
+ * minimal __GLXContextRec here so some of the functions in this file can
+ * work properly.
+ */
+typedef struct __GLXcontextRec {
+   Display *currentDpy;
+   GLboolean isDirect;
+   GLXDrawable currentDrawable;
+   GLXDrawable currentReadable;
+   XID xid;
+} __GLXcontext;
+#endif
+
+
+/*
+ * Almost all the GLX API functions get routed through this dispatch table.
+ * The exceptions are the glXGetCurrentXXX() functions.
+ *
+ * This dispatch table allows multiple GLX client-side modules to coexist.
+ * Specifically, a real GLX library (like SGI's or the Utah GLX) and Mesa's
+ * pseudo-GLX can be present at the same time.  The former being used on
+ * GLX-enabled X servers and the later on non-GLX X servers.
+ *
+ * Red Hat has been using this since Red Hat Linux 7.0 (I think).
+ * This'll be a standard feature in XFree86 4.3.  It basically allows one
+ * libGL to do both DRI-rendering and "fake GLX" rendering to X displays
+ * that lack the GLX extension.
+ */
+struct _glxapi_table {
+   /*** GLX_VERSION_1_0 ***/
+   XVisualInfo *(*ChooseVisual)(Display *dpy, int screen, int *list);
+   void (*CopyContext)(Display *dpy, GLXContext src, GLXContext dst, unsigned long mask);
+   GLXContext (*CreateContext)(Display *dpy, XVisualInfo *visinfo, GLXContext shareList, Bool direct);
+   GLXPixmap (*CreateGLXPixmap)(Display *dpy, XVisualInfo *visinfo, Pixmap pixmap);
+   void (*DestroyContext)(Display *dpy, GLXContext ctx);
+   void (*DestroyGLXPixmap)(Display *dpy, GLXPixmap pixmap);
+   int (*GetConfig)(Display *dpy, XVisualInfo *visinfo, int attrib, int *value);
+   /*GLXContext (*GetCurrentContext)(void);*/
+   /*GLXDrawable (*GetCurrentDrawable)(void);*/
+   Bool (*IsDirect)(Display *dpy, GLXContext ctx);
+   Bool (*MakeCurrent)(Display *dpy, GLXDrawable drawable, GLXContext ctx);
+   Bool (*QueryExtension)(Display *dpy, int *errorb, int *event);
+   Bool (*QueryVersion)(Display *dpy, int *maj, int *min);
+   void (*SwapBuffers)(Display *dpy, GLXDrawable drawable);
+   void (*UseXFont)(Font font, int first, int count, int listBase);
+   void (*WaitGL)(void);
+   void (*WaitX)(void);
+
+   /*** GLX_VERSION_1_1 ***/
+   const char *(*GetClientString)(Display *dpy, int name);
+   const char *(*QueryExtensionsString)(Display *dpy, int screen);
+   const char *(*QueryServerString)(Display *dpy, int screen, int name);
+
+   /*** GLX_VERSION_1_2 ***/
+   /*Display *(*GetCurrentDisplay)(void);*/
+
+   /*** GLX_VERSION_1_3 ***/
+   GLXFBConfig *(*ChooseFBConfig)(Display *dpy, int screen, const int *attribList, int *nitems);
+   GLXContext (*CreateNewContext)(Display *dpy, GLXFBConfig config, int renderType, GLXContext shareList, Bool direct);
+   GLXPbuffer (*CreatePbuffer)(Display *dpy, GLXFBConfig config, const int *attribList);
+   GLXPixmap (*CreatePixmap)(Display *dpy, GLXFBConfig config, Pixmap pixmap, const int *attribList);
+   GLXWindow (*CreateWindow)(Display *dpy, GLXFBConfig config, Window win, const int *attribList);
+   void (*DestroyPbuffer)(Display *dpy, GLXPbuffer pbuf);
+   void (*DestroyPixmap)(Display *dpy, GLXPixmap pixmap);
+   void (*DestroyWindow)(Display *dpy, GLXWindow window);
+   /*GLXDrawable (*GetCurrentReadDrawable)(void);*/
+   int (*GetFBConfigAttrib)(Display *dpy, GLXFBConfig config, int attribute, int *value);
+   GLXFBConfig *(*GetFBConfigs)(Display *dpy, int screen, int *nelements);
+   void (*GetSelectedEvent)(Display *dpy, GLXDrawable drawable, unsigned long *mask);
+   XVisualInfo *(*GetVisualFromFBConfig)(Display *dpy, GLXFBConfig config);
+   Bool (*MakeContextCurrent)(Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx);
+   int (*QueryContext)(Display *dpy, GLXContext ctx, int attribute, int *value);
+   void (*QueryDrawable)(Display *dpy, GLXDrawable draw, int attribute, unsigned int *value);
+   void (*SelectEvent)(Display *dpy, GLXDrawable drawable, unsigned long mask);
+
+   /*** GLX_SGI_swap_control ***/
+   int (*SwapIntervalSGI)(int);
+
+   /*** GLX_SGI_video_sync ***/
+   int (*GetVideoSyncSGI)(unsigned int *count);
+   int (*WaitVideoSyncSGI)(int divisor, int remainder, unsigned int *count);
+
+   /*** GLX_SGI_make_current_read ***/
+   Bool (*MakeCurrentReadSGI)(Display *, GLXDrawable, GLXDrawable, GLXContext);
+   /*GLXDrawable (*GetCurrentReadDrawableSGI)(void);*/
+
+   /*** GLX_SGIX_video_source (needs video library) ***/
+#if defined(_VL_H_)
+   GLXVideoSourceSGIX (*CreateGLXVideoSourceSGIX)(Display *, int, VLServer, VLPath, int, VLNode);
+   void (*DestroyGLXVideoSourceSGIX)(Display *, GLXVideoSourceSGIX);
+#else
+   void *CreateGLXVideoSourceSGIX;
+   void *DestroyGLXVideoSourceSGIX;
+#endif
+
+   /*** GLX_EXT_import_context ***/
+   void (*FreeContextEXT)(Display *dpy, GLXContext context);
+   GLXContextID (*GetContextIDEXT)(const GLXContext context);
+   /*Display *(*GetCurrentDisplayEXT)(void);*/
+   GLXContext (*ImportContextEXT)(Display *dpy, GLXContextID contextID);
+   int (*QueryContextInfoEXT)(Display *dpy, GLXContext context, int attribute,int *value);
+
+   /*** GLX_SGIX_fbconfig ***/
+   int (*GetFBConfigAttribSGIX)(Display *, GLXFBConfigSGIX, int, int *);
+   GLXFBConfigSGIX * (*ChooseFBConfigSGIX)(Display *, int, int *, int *);
+   GLXPixmap (*CreateGLXPixmapWithConfigSGIX)(Display *, GLXFBConfigSGIX, Pixmap);
+   GLXContext (*CreateContextWithConfigSGIX)(Display *, GLXFBConfigSGIX, int, GLXContext, Bool);
+   XVisualInfo * (*GetVisualFromFBConfigSGIX)(Display *, GLXFBConfigSGIX);
+   GLXFBConfigSGIX (*GetFBConfigFromVisualSGIX)(Display *, XVisualInfo *);
+
+   /*** GLX_SGIX_pbuffer ***/
+   GLXPbufferSGIX (*CreateGLXPbufferSGIX)(Display *, GLXFBConfigSGIX, unsigned int, unsigned int, int *);
+   void (*DestroyGLXPbufferSGIX)(Display *, GLXPbufferSGIX);
+   int (*QueryGLXPbufferSGIX)(Display *, GLXPbufferSGIX, int, unsigned int *);
+   void (*SelectEventSGIX)(Display *, GLXDrawable, unsigned long);
+   void (*GetSelectedEventSGIX)(Display *, GLXDrawable, unsigned long *);
+
+   /*** GLX_SGI_cushion ***/
+   void (*CushionSGI)(Display *, Window, float);
+
+   /*** GLX_SGIX_video_resize ***/
+   int (*BindChannelToWindowSGIX)(Display *, int, int, Window);
+   int (*ChannelRectSGIX)(Display *, int, int, int, int, int, int);
+   int (*QueryChannelRectSGIX)(Display *, int, int, int *, int *, int *, int *);
+   int (*QueryChannelDeltasSGIX)(Display *, int, int, int *, int *, int *, int *);
+   int (*ChannelRectSyncSGIX)(Display *, int, int, GLenum);
+
+   /*** GLX_SGIX_dmbuffer (needs dmedia library) ***/
+#if defined (_DM_BUFFER_H_)
+   Bool (*AssociateDMPbufferSGIX)(Display *, GLXPbufferSGIX, DMparams *, DMbuffer);
+#else
+   void *AssociciateDMPbufferSGIX;
+#endif
+
+   /*** GLX_SGIX_swap_group ***/
+   void (*JoinSwapGroupSGIX)(Display *, GLXDrawable, GLXDrawable);
+
+   /*** GLX_SGIX_swap_barrier ***/
+   void (*BindSwapBarrierSGIX)(Display *, GLXDrawable, int);
+   Bool (*QueryMaxSwapBarriersSGIX)(Display *, int, int *);
+
+   /*** GLX_SUN_get_transparent_index ***/
+   Status (*GetTransparentIndexSUN)(Display *, Window, Window, long *);
+
+   /*** GLX_MESA_copy_sub_buffer ***/
+   void (*CopySubBufferMESA)(Display *dpy, GLXDrawable drawable, int x, int y, int width, int height);
+
+   /*** GLX_MESA_release_buffers ***/
+   Bool (*ReleaseBuffersMESA)(Display *dpy, Window w);
+
+   /*** GLX_MESA_pixmap_colormap ***/
+   GLXPixmap (*CreateGLXPixmapMESA)(Display *dpy, XVisualInfo *visinfo, Pixmap pixmap, Colormap cmap);
+
+   /*** GLX_MESA_set_3dfx_mode ***/
+   Bool (*Set3DfxModeMESA)(int mode);
+
+   /*** GLX_NV_vertex_array_range ***/
+   void * (*AllocateMemoryNV)( GLsizei size,
+                               GLfloat readFrequency,
+                               GLfloat writeFrequency,
+                               GLfloat priority );
+   void (*FreeMemoryNV)( GLvoid *pointer );
+
+   /*** GLX_MESA_agp_offset ***/
+   GLuint (*GetAGPOffsetMESA)( const GLvoid *pointer );
+
+   /*** GLX_ARB_render_texture ***/
+   Bool (*BindTexImageARB)(Display *dpy, GLXPbuffer pbuffer, int buffer);
+   Bool (*ReleaseTexImageARB)(Display *dpy, GLXPbuffer pbuffer, int buffer);
+   Bool (*DrawableAttribARB)(Display *dpy, GLXDrawable draw, const int *attribList);
+};
+
+
+
+extern const char *
+_glxapi_get_version(void);
+
+
+extern const char **
+_glxapi_get_extensions(void);
+
+
+extern GLuint
+_glxapi_get_dispatch_table_size(void);
+
+
+extern void
+_glxapi_set_no_op_table(struct _glxapi_table *t);
+
+
+extern const GLvoid *
+_glxapi_get_proc_address(const char *funcName);
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/drivers/x11/glxheader.h b/reactos/lib/mesa32/src/drivers/x11/glxheader.h
new file mode 100644
index 00000000000..b5834003890
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/x11/glxheader.h
@@ -0,0 +1,71 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ * 
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef GLX_HEADER_H
+#define GLX_HEADER_H
+
+#ifdef __VMS
+#include <GL/vms_x_fix.h>
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "conf.h"
+#endif
+
+
+#include "glheader.h"
+
+
+#ifdef XFree86Server
+
+# include "resource.h"
+# include "windowstr.h"
+# include "gcstruct.h"
+# include "GL/xf86glx.h"
+# include "xf86glx_util.h"
+
+#else
+
+# include <X11/Xlib.h>
+# include <X11/Xutil.h>
+# ifdef USE_XSHM  /* was SHM */
+#  include <sys/ipc.h>
+#  include <sys/shm.h>
+#  include <X11/extensions/XShm.h>
+# endif
+# include <GL/glx.h>
+
+#endif
+
+
+
+/* this silences a compiler warning on several systems */
+struct timespec;
+struct itimerspec;
+
+
+
+#endif /*GLX_HEADER*/
diff --git a/reactos/lib/mesa32/src/drivers/x11/realglx.c b/reactos/lib/mesa32/src/drivers/x11/realglx.c
new file mode 100644
index 00000000000..520f0f1e303
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/x11/realglx.c
@@ -0,0 +1,185 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ * 
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include <assert.h>
+#include <GL/glx.h>
+#include "realglx.h"
+#include "glxapi.h"
+
+
+struct _glxapi_table *
+_real_GetGLXDispatchTable(void)
+{
+   static struct _glxapi_table glx;
+
+   /* be sure our dispatch table size <= libGL's table */
+   {
+      GLuint size = sizeof(struct _glxapi_table) / sizeof(void *);
+      (void) size;
+      assert(_glxapi_get_dispatch_table_size() >= size);
+   }
+
+   /* initialize the whole table to no-ops */
+   _glxapi_set_no_op_table(&glx);
+
+   /* now initialize the table with the functions I implement */
+
+   /*** GLX_VERSION_1_0 ***/
+   glx.ChooseVisual = _real_glXChooseVisual;
+   glx.CopyContext = _real_glXCopyContext;
+   glx.CreateContext = _real_glXCreateContext;
+   glx.CreateGLXPixmap = _real_glXCreateGLXPixmap;
+   glx.DestroyContext = _real_glXDestroyContext;
+   glx.DestroyGLXPixmap = _real_glXDestroyGLXPixmap;
+   glx.GetConfig = _real_glXGetConfig;
+   /*glx.GetCurrentContext = _real_glXGetCurrentContext;*/
+   /*glx.GetCurrentDrawable = _real_glXGetCurrentDrawable;*/
+   glx.IsDirect = _real_glXIsDirect;
+   glx.MakeCurrent = _real_glXMakeCurrent;
+   glx.QueryExtension = _real_glXQueryExtension;
+   glx.QueryVersion = _real_glXQueryVersion;
+   glx.SwapBuffers = _real_glXSwapBuffers;
+   glx.UseXFont = _real_glXUseXFont;
+   glx.WaitGL = _real_glXWaitGL;
+   glx.WaitX = _real_glXWaitX;
+
+   /*** GLX_VERSION_1_1 ***/
+   glx.GetClientString = _real_glXGetClientString;
+   glx.QueryExtensionsString = _real_glXQueryExtensionsString;
+   glx.QueryServerString = _real_glXQueryServerString;
+
+   /*** GLX_VERSION_1_2 ***/
+   /*glx.GetCurrentDisplay = _real_glXGetCurrentDisplay;*/
+
+   /*** GLX_VERSION_1_3 ***/
+   glx.ChooseFBConfig = _real_glXChooseFBConfig;
+   glx.CreateNewContext = _real_glXCreateNewContext;
+   glx.CreatePbuffer = _real_glXCreatePbuffer;
+   glx.CreatePixmap = _real_glXCreatePixmap;
+   glx.CreateWindow = _real_glXCreateWindow;
+   glx.DestroyPbuffer = _real_glXDestroyPbuffer;
+   glx.DestroyPixmap = _real_glXDestroyPixmap;
+   glx.DestroyWindow = _real_glXDestroyWindow;
+   /*glx.GetCurrentReadDrawable = _real_glXGetCurrentReadDrawable;*/
+   glx.GetFBConfigAttrib = _real_glXGetFBConfigAttrib;
+   glx.GetFBConfigs = _real_glXGetFBConfigs;
+   glx.GetSelectedEvent = _real_glXGetSelectedEvent;
+   glx.GetVisualFromFBConfig = _real_glXGetVisualFromFBConfig;
+   glx.MakeContextCurrent = _real_glXMakeContextCurrent;
+   glx.QueryContext = _real_glXQueryContext;
+   glx.QueryDrawable = _real_glXQueryDrawable;
+   glx.SelectEvent = _real_glXSelectEvent;
+
+   /*** GLX_SGI_swap_control ***/
+   glx.SwapIntervalSGI = _real_glXSwapIntervalSGI;
+
+   /*** GLX_SGI_video_sync ***/
+   glx.GetVideoSyncSGI = _real_glXGetVideoSyncSGI;
+   glx.WaitVideoSyncSGI = _real_glXWaitVideoSyncSGI;
+
+   /*** GLX_SGI_make_current_read ***/
+   glx.MakeCurrentReadSGI = _real_glXMakeCurrentReadSGI;
+   /*glx.GetCurrentReadDrawableSGI = _real_glXGetCurrentReadDrawableSGI;*/
+
+#if defined(_VL_H)
+   /*** GLX_SGIX_video_source ***/
+   glx.CreateGLXVideoSourceSGIX = _real_glXCreateGLXVideoSourceSGIX;
+   glx.DestroyGLXVideoSourceSGIX = _real_glXDestroyGLXVideoSourceSGIX;
+#endif
+
+   /*** GLX_EXT_import_context ***/
+   glx.FreeContextEXT = _real_glXFreeContextEXT;
+   /*glx.GetContextIDEXT = _real_glXGetContextIDEXT;*/
+   /*glx.GetCurrentDisplayEXT = _real_glXGetCurrentDisplayEXT;*/
+   glx.ImportContextEXT = _real_glXImportContextEXT;
+   glx.QueryContextInfoEXT = _real_glXQueryContextInfoEXT;
+
+   /*** GLX_SGIX_fbconfig ***/
+   glx.GetFBConfigAttribSGIX = _real_glXGetFBConfigAttribSGIX;
+   glx.ChooseFBConfigSGIX = _real_glXChooseFBConfigSGIX;
+   glx.CreateGLXPixmapWithConfigSGIX = _real_glXCreateGLXPixmapWithConfigSGIX;
+   glx.CreateContextWithConfigSGIX = _real_glXCreateContextWithConfigSGIX;
+   glx.GetVisualFromFBConfigSGIX = _real_glXGetVisualFromFBConfigSGIX;
+   glx.GetFBConfigFromVisualSGIX = _real_glXGetFBConfigFromVisualSGIX;
+
+   /*** GLX_SGIX_pbuffer ***/
+   glx.CreateGLXPbufferSGIX = _real_glXCreateGLXPbufferSGIX;
+   glx.DestroyGLXPbufferSGIX = _real_glXDestroyGLXPbufferSGIX;
+   glx.QueryGLXPbufferSGIX = _real_glXQueryGLXPbufferSGIX;
+   glx.SelectEventSGIX = _real_glXSelectEventSGIX;
+   glx.GetSelectedEventSGIX = _real_glXGetSelectedEventSGIX;
+
+   /*** GLX_SGI_cushion ***/
+   glx.CushionSGI = _real_glXCushionSGI;
+
+   /*** GLX_SGIX_video_resize ***/
+   glx.BindChannelToWindowSGIX = _real_glXBindChannelToWindowSGIX;
+   glx.ChannelRectSGIX = _real_glXChannelRectSGIX;
+   glx.QueryChannelRectSGIX = _real_glXQueryChannelRectSGIX;
+   glx.QueryChannelDeltasSGIX = _real_glXQueryChannelDeltasSGIX;
+   glx.ChannelRectSyncSGIX = _real_glXChannelRectSyncSGIX;
+
+#if defined(_DM_BUFFER_H_)
+   /*** (GLX_SGIX_dmbuffer ***/
+   glx.AssociateDMPbufferSGIX = NULL;
+#endif
+
+   /*** GLX_SGIX_swap_group ***/
+   glx.JoinSwapGroupSGIX = _real_glXJoinSwapGroupSGIX;
+
+   /*** GLX_SGIX_swap_barrier ***/
+   glx.BindSwapBarrierSGIX = _real_glXBindSwapBarrierSGIX;
+   glx.QueryMaxSwapBarriersSGIX = _real_glXQueryMaxSwapBarriersSGIX;
+
+   /*** GLX_SUN_get_transparent_index ***/
+   glx.GetTransparentIndexSUN = _real_glXGetTransparentIndexSUN;
+
+   /*** GLX_MESA_copy_sub_buffer ***/
+   glx.CopySubBufferMESA = _real_glXCopySubBufferMESA;
+
+   /*** GLX_MESA_release_buffers ***/
+   glx.ReleaseBuffersMESA = _real_glXReleaseBuffersMESA;
+
+   /*** GLX_MESA_pixmap_colormap ***/
+   glx.CreateGLXPixmapMESA = _real_glXCreateGLXPixmapMESA;
+
+   /*** GLX_MESA_set_3dfx_mode ***/
+   glx.Set3DfxModeMESA = _real_glXSet3DfxModeMESA;
+
+   /*** GLX_NV_vertex_array_range ***/
+   glx.AllocateMemoryNV = _real_glXAllocateMemoryNV;
+   glx.FreeMemoryNV = _real_glXFreeMemoryNV;
+
+   /*** GLX_MESA_agp_offset ***/
+   glx.GetAGPOffsetMESA = _real_glXGetAGPOffsetMESA;
+
+   /*** GLX_ARB_render_texture ***/
+   glx.BindTexImageARB = _real_glXBindTexImageARB;
+   glx.ReleaseTexImageARB = _real_glXReleaseTexImageARB;
+   glx.DrawableAttribARB = _real_glXDrawableAttribARB;
+
+   return &glx;
+}
diff --git a/reactos/lib/mesa32/src/drivers/x11/realglx.h b/reactos/lib/mesa32/src/drivers/x11/realglx.h
new file mode 100644
index 00000000000..150129db681
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/x11/realglx.h
@@ -0,0 +1,326 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ * 
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef REALGLX_H
+#define REALGLX_H
+
+
+extern struct _glxapi_table *
+_real_GetGLXDispatchTable(void);
+
+
+/*
+ * Basically just need these to prevent compiler warnings.
+ */
+
+
+extern XVisualInfo *
+_real_glXChooseVisual( Display *dpy, int screen, int *list );
+
+extern GLXContext
+_real_glXCreateContext( Display *dpy, XVisualInfo *visinfo,
+                        GLXContext share_list, Bool direct );
+
+extern GLXPixmap
+_real_glXCreateGLXPixmap( Display *dpy, XVisualInfo *visinfo, Pixmap pixmap );
+
+extern GLXPixmap
+_real_glXCreateGLXPixmapMESA( Display *dpy, XVisualInfo *visinfo,
+                              Pixmap pixmap, Colormap cmap );
+
+extern void
+_real_glXDestroyGLXPixmap( Display *dpy, GLXPixmap pixmap );
+
+extern void
+_real_glXCopyContext( Display *dpy, GLXContext src, GLXContext dst,
+                      unsigned long mask );
+
+extern Bool
+_real_glXMakeCurrent( Display *dpy, GLXDrawable drawable, GLXContext ctx );
+
+extern Bool
+_real_glXQueryExtension( Display *dpy, int *errorb, int *event );
+
+extern void
+_real_glXDestroyContext( Display *dpy, GLXContext ctx );
+
+extern Bool
+_real_glXIsDirect( Display *dpy, GLXContext ctx );
+
+extern void
+_real_glXSwapBuffers( Display *dpy, GLXDrawable drawable );
+
+extern void
+_real_glXUseXFont( Font font, int first, int count, int listbase );
+
+extern Bool
+_real_glXQueryVersion( Display *dpy, int *maj, int *min );
+
+extern int
+_real_glXGetConfig( Display *dpy, XVisualInfo *visinfo,
+                    int attrib, int *value );
+
+extern void
+_real_glXWaitGL( void );
+
+
+extern void
+_real_glXWaitX( void );
+
+/* GLX 1.1 and later */
+extern const char *
+_real_glXQueryExtensionsString( Display *dpy, int screen );
+
+/* GLX 1.1 and later */
+extern const char *
+_real_glXQueryServerString( Display *dpy, int screen, int name );
+
+/* GLX 1.1 and later */
+extern const char *
+_real_glXGetClientString( Display *dpy, int name );
+
+
+/*
+ * GLX 1.3 and later
+ */
+
+extern GLXFBConfig *
+_real_glXChooseFBConfig( Display *dpy, int screen,
+                         const int *attribList, int *nitems );
+
+extern int
+_real_glXGetFBConfigAttrib( Display *dpy, GLXFBConfig config,
+                            int attribute, int *value );
+
+extern GLXFBConfig *
+_real_glXGetFBConfigs( Display *dpy, int screen, int *nelements );
+
+extern XVisualInfo *
+_real_glXGetVisualFromFBConfig( Display *dpy, GLXFBConfig config );
+
+extern GLXWindow
+_real_glXCreateWindow( Display *dpy, GLXFBConfig config, Window win,
+                       const int *attribList );
+
+extern void
+_real_glXDestroyWindow( Display *dpy, GLXWindow window );
+
+extern GLXPixmap
+_real_glXCreatePixmap( Display *dpy, GLXFBConfig config, Pixmap pixmap,
+                       const int *attribList );
+
+extern void
+_real_glXDestroyPixmap( Display *dpy, GLXPixmap pixmap );
+
+extern GLXPbuffer
+_real_glXCreatePbuffer( Display *dpy, GLXFBConfig config,
+                        const int *attribList );
+
+extern void
+_real_glXDestroyPbuffer( Display *dpy, GLXPbuffer pbuf );
+
+extern void
+_real_glXQueryDrawable( Display *dpy, GLXDrawable draw, int attribute,
+                        unsigned int *value );
+
+extern GLXContext
+_real_glXCreateNewContext( Display *dpy, GLXFBConfig config,
+                           int renderType, GLXContext shareList, Bool direct );
+
+
+extern Bool
+_real_glXMakeContextCurrent( Display *dpy, GLXDrawable draw,
+                             GLXDrawable read, GLXContext ctx );
+
+extern int
+_real_glXQueryContext( Display *dpy, GLXContext ctx, int attribute, int *value );
+
+extern void
+_real_glXSelectEvent( Display *dpy, GLXDrawable drawable, unsigned long mask );
+
+extern void
+_real_glXGetSelectedEvent( Display *dpy, GLXDrawable drawable,
+                           unsigned long *mask );
+
+#ifdef GLX_SGI_swap_control
+extern int
+_real_glXSwapIntervalSGI(int interval);
+#endif
+
+
+#ifdef GLX_SGI_video_sync
+extern int
+_real_glXGetVideoSyncSGI(unsigned int *count);
+
+extern int
+_real_glXWaitVideoSyncSGI(int divisor, int remainder, unsigned int *count);
+#endif
+
+
+#ifdef GLX_SGI_make_current_read
+extern Bool
+_real_glXMakeCurrentReadSGI(Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx);
+
+extern GLXDrawable
+_real_glXGetCurrentReadDrawableSGI(void);
+#endif
+
+#if defined(_VL_H) && defined(GLX_SGIX_video_source)
+extern GLXVideoSourceSGIX
+_real_glXCreateGLXVideoSourceSGIX(Display *dpy, int screen, VLServer server, VLPath path, int nodeClass, VLNode drainNode);
+
+extern void
+_real_glXDestroyGLXVideoSourceSGIX(Display *dpy, GLXVideoSourceSGIX src);
+#endif
+
+#ifdef GLX_EXT_import_context
+extern void
+_real_glXFreeContextEXT(Display *dpy, GLXContext context);
+
+extern GLXContextID
+_real_glXGetContextIDEXT(const GLXContext context);
+
+extern Display *
+_real_glXGetCurrentDisplayEXT(void);
+
+extern GLXContext
+_real_glXImportContextEXT(Display *dpy, GLXContextID contextID);
+
+extern int
+_real_glXQueryContextInfoEXT(Display *dpy, GLXContext context, int attribute, int *value);
+#endif
+
+#ifdef GLX_SGIX_fbconfig
+extern int
+_real_glXGetFBConfigAttribSGIX(Display *dpy, GLXFBConfigSGIX config, int attribute, int *value);
+
+extern GLXFBConfigSGIX *
+_real_glXChooseFBConfigSGIX(Display *dpy, int screen, int *attrib_list, int *nelements);
+
+extern GLXPixmap
+_real_glXCreateGLXPixmapWithConfigSGIX(Display *dpy, GLXFBConfigSGIX config, Pixmap pixmap);
+
+extern GLXContext
+_real_glXCreateContextWithConfigSGIX(Display *dpy, GLXFBConfigSGIX config, int render_type, GLXContext share_list, Bool direct);
+
+extern XVisualInfo *
+_real_glXGetVisualFromFBConfigSGIX(Display *dpy, GLXFBConfigSGIX config);
+
+extern GLXFBConfigSGIX
+_real_glXGetFBConfigFromVisualSGIX(Display *dpy, XVisualInfo *vis);
+#endif
+
+#ifdef GLX_SGIX_pbuffer
+extern GLXPbufferSGIX
+_real_glXCreateGLXPbufferSGIX(Display *dpy, GLXFBConfigSGIX config, unsigned int width, unsigned int height, int *attrib_list);
+
+extern void
+_real_glXDestroyGLXPbufferSGIX(Display *dpy, GLXPbufferSGIX pbuf);
+
+extern int
+_real_glXQueryGLXPbufferSGIX(Display *dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int *value);
+
+extern void
+_real_glXSelectEventSGIX(Display *dpy, GLXDrawable drawable, unsigned long mask);
+
+extern void
+_real_glXGetSelectedEventSGIX(Display *dpy, GLXDrawable drawable, unsigned long *mask);
+#endif
+
+#ifdef GLX_SGI_cushion
+extern void
+_real_glXCushionSGI(Display *dpy, Window win, float cushion);
+#endif
+
+#ifdef GLX_SGIX_video_resize
+extern int
+_real_glXBindChannelToWindowSGIX(Display *dpy, int screen, int channel , Window window);
+
+extern int
+_real_glXChannelRectSGIX(Display *dpy, int screen, int channel, int x, int y, int w, int h);
+
+extern int
+_real_glXQueryChannelRectSGIX(Display *dpy, int screen, int channel, int *x, int *y, int *w, int *h);
+
+extern int
+_real_glXQueryChannelDeltasSGIX(Display *dpy, int screen, int channel, int *dx, int *dy, int *dw, int *dh);
+
+extern int
+_real_glXChannelRectSyncSGIX(Display *dpy, int screen, int channel, GLenum synctype);
+#endif
+
+#if defined(_DM_BUFFER_H_) && defined(GLX_SGIX_dmbuffer)
+extern Bool
+_real_glXAssociateDMPbufferSGIX(Display *dpy, GLXPbufferSGIX pbuffer, DMparams *params, DMbuffer dmbuffer);
+#endif
+
+#ifdef GLX_SGIX_swap_group
+extern void
+_real_glXJoinSwapGroupSGIX(Display *dpy, GLXDrawable drawable, GLXDrawable member);
+#endif
+
+#ifdef GLX_SGIX_swap_barrier
+extern void
+_real_glXBindSwapBarrierSGIX(Display *dpy, GLXDrawable drawable, int barrier);
+
+extern Bool
+_real_glXQueryMaxSwapBarriersSGIX(Display *dpy, int screen, int *max);
+#endif
+
+#ifdef GLX_SUN_get_transparent_index
+extern Status
+_real_glXGetTransparentIndexSUN(Display *dpy, Window overlay, Window underlay, long *pTransparent);
+#endif
+
+#ifdef GLX_MESA_release_buffers
+extern Bool
+_real_glXReleaseBuffersMESA( Display *dpy, GLXDrawable d );
+#endif
+
+#ifdef GLX_MESA_set_3dfx_mode
+extern Bool
+_real_glXSet3DfxModeMESA( int mode );
+#endif
+
+#ifdef GLX_NV_vertex_array_range
+extern void *
+_real_glXAllocateMemoryNV(GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
+extern void
+_real_glXFreeMemoryNV(GLvoid *pointer);
+#endif
+
+#ifdef GLX_MESA_agp_offset
+extern GLuint
+_real_glXGetAGPOffsetMESA(const GLvoid *pointer);
+#endif
+
+#ifdef GLX_MESA_copy_sub_buffer
+extern void
+_real_glXCopySubBufferMESA( Display *dpy, GLXDrawable drawable,
+                            int x, int y, int width, int height );
+#endif
+
+#endif /* REALGLX_H */
diff --git a/reactos/lib/mesa32/src/drivers/x11/xfonts.c b/reactos/lib/mesa32/src/drivers/x11/xfonts.c
new file mode 100644
index 00000000000..d72c600bd1b
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/x11/xfonts.c
@@ -0,0 +1,377 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/* xfonts.c -- glXUseXFont() for Mesa written by
+ * Copyright (C) 1995 Thorsten.Ohl @ Physik.TH-Darmstadt.de
+ */
+
+#ifdef __VMS
+#include <GL/vms_x_fix.h>
+#endif
+
+#include "glxheader.h"
+#include "context.h"
+#include "imports.h"
+#include "xfonts.h"
+
+
+/* Some debugging info.  */
+
+#ifdef DEBUG
+#undef _R
+#undef _G
+#undef _B
+#include <ctype.h>
+
+int debug_xfonts = 0;
+
+static void
+dump_char_struct(XCharStruct * ch, char *prefix)
+{
+   printf("%slbearing = %d, rbearing = %d, width = %d\n",
+	  prefix, ch->lbearing, ch->rbearing, ch->width);
+   printf("%sascent = %d, descent = %d, attributes = %u\n",
+	  prefix, ch->ascent, ch->descent, (unsigned int) ch->attributes);
+}
+
+static void
+dump_font_struct(XFontStruct * font)
+{
+   printf("ascent = %d, descent = %d\n", font->ascent, font->descent);
+   printf("char_or_byte2 = (%u,%u)\n",
+	  font->min_char_or_byte2, font->max_char_or_byte2);
+   printf("byte1 = (%u,%u)\n", font->min_byte1, font->max_byte1);
+   printf("all_chars_exist = %s\n", font->all_chars_exist ? "True" : "False");
+   printf("default_char = %c (\\%03o)\n",
+	  (char) (isprint(font->default_char) ? font->default_char : ' '),
+	  font->default_char);
+   dump_char_struct(&font->min_bounds, "min> ");
+   dump_char_struct(&font->max_bounds, "max> ");
+#if 0
+   for (c = font->min_char_or_byte2; c <= font->max_char_or_byte2; c++) {
+      char prefix[8];
+      sprintf(prefix, "%d> ", c);
+      dump_char_struct(&font->per_char[c], prefix);
+   }
+#endif
+}
+
+static void
+dump_bitmap(unsigned int width, unsigned int height, GLubyte * bitmap)
+{
+   unsigned int x, y;
+
+   printf("    ");
+   for (x = 0; x < 8 * width; x++)
+      printf("%o", 7 - (x % 8));
+   putchar('\n');
+   for (y = 0; y < height; y++) {
+      printf("%3o:", y);
+      for (x = 0; x < 8 * width; x++)
+	 putchar((bitmap[width * (height - y - 1) + x / 8] & (1 << (7 - (x %
+									 8))))
+		 ? '*' : '.');
+      printf("   ");
+      for (x = 0; x < width; x++)
+	 printf("0x%02x, ", bitmap[width * (height - y - 1) + x]);
+      putchar('\n');
+   }
+}
+#endif /* DEBUG */
+
+
+/* Implementation.  */
+
+/* Fill a BITMAP with a character C from thew current font
+   in the graphics context GC.  WIDTH is the width in bytes
+   and HEIGHT is the height in bits.
+
+   Note that the generated bitmaps must be used with
+
+        glPixelStorei (GL_UNPACK_SWAP_BYTES, GL_FALSE);
+        glPixelStorei (GL_UNPACK_LSB_FIRST, GL_FALSE);
+        glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
+        glPixelStorei (GL_UNPACK_SKIP_ROWS, 0);
+        glPixelStorei (GL_UNPACK_SKIP_PIXELS, 0);
+        glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
+
+   Possible optimizations:
+
+     * use only one reusable pixmap with the maximum dimensions.
+     * draw the entire font into a single pixmap (careful with
+       proportional fonts!).
+*/
+
+
+/*
+ * Generate OpenGL-compatible bitmap.
+ */
+static void
+fill_bitmap(Display * dpy, Window win, GC gc,
+	    unsigned int width, unsigned int height,
+	    int x0, int y0, unsigned int c, GLubyte * bitmap)
+{
+   XImage *image;
+   unsigned int x, y;
+   Pixmap pixmap;
+   XChar2b char2b;
+
+   pixmap = XCreatePixmap(dpy, win, 8 * width, height, 1);
+   XSetForeground(dpy, gc, 0);
+   XFillRectangle(dpy, pixmap, gc, 0, 0, 8 * width, height);
+   XSetForeground(dpy, gc, 1);
+
+   char2b.byte1 = (c >> 8) & 0xff;
+   char2b.byte2 = (c & 0xff);
+
+   XDrawString16(dpy, pixmap, gc, x0, y0, &char2b, 1);
+
+   image = XGetImage(dpy, pixmap, 0, 0, 8 * width, height, 1, XYPixmap);
+   if (image) {
+      /* Fill the bitmap (X11 and OpenGL are upside down wrt each other).  */
+      for (y = 0; y < height; y++)
+	 for (x = 0; x < 8 * width; x++)
+	    if (XGetPixel(image, x, y))
+	       bitmap[width * (height - y - 1) + x / 8] |=
+		  (1 << (7 - (x % 8)));
+      XDestroyImage(image);
+   }
+
+   XFreePixmap(dpy, pixmap);
+}
+
+/*
+ * determine if a given glyph is valid and return the
+ * corresponding XCharStruct.
+ */
+static XCharStruct *
+isvalid(XFontStruct * fs, unsigned int which)
+{
+   unsigned int rows, pages;
+   unsigned int byte1 = 0, byte2 = 0;
+   int i, valid = 1;
+
+   rows = fs->max_byte1 - fs->min_byte1 + 1;
+   pages = fs->max_char_or_byte2 - fs->min_char_or_byte2 + 1;
+
+   if (rows == 1) {
+      /* "linear" fonts */
+      if ((fs->min_char_or_byte2 > which) || (fs->max_char_or_byte2 < which))
+	 valid = 0;
+   }
+   else {
+      /* "matrix" fonts */
+      byte2 = which & 0xff;
+      byte1 = which >> 8;
+      if ((fs->min_char_or_byte2 > byte2) ||
+	  (fs->max_char_or_byte2 < byte2) ||
+	  (fs->min_byte1 > byte1) || (fs->max_byte1 < byte1))
+	 valid = 0;
+   }
+
+   if (valid) {
+      if (fs->per_char) {
+	 if (rows == 1) {
+	    /* "linear" fonts */
+	    return (fs->per_char + (which - fs->min_char_or_byte2));
+	 }
+	 else {
+	    /* "matrix" fonts */
+	    i = ((byte1 - fs->min_byte1) * pages) +
+	       (byte2 - fs->min_char_or_byte2);
+	    return (fs->per_char + i);
+	 }
+      }
+      else {
+	 return (&fs->min_bounds);
+      }
+   }
+   return (NULL);
+}
+
+
+void
+Fake_glXUseXFont(Font font, int first, int count, int listbase)
+{
+   Display *dpy;
+   Window win;
+   Pixmap pixmap;
+   GC gc;
+   XGCValues values;
+   unsigned long valuemask;
+   XFontStruct *fs;
+   GLint swapbytes, lsbfirst, rowlength;
+   GLint skiprows, skippixels, alignment;
+   unsigned int max_width, max_height, max_bm_width, max_bm_height;
+   GLubyte *bm;
+   int i;
+
+   dpy = glXGetCurrentDisplay();
+   if (!dpy)
+      return;			/* I guess glXMakeCurrent wasn't called */
+   win = RootWindow(dpy, DefaultScreen(dpy));
+
+   fs = XQueryFont(dpy, font);
+   if (!fs) {
+      _mesa_error(NULL, GL_INVALID_VALUE,
+		  "Couldn't get font structure information");
+      return;
+   }
+
+   /* Allocate a bitmap that can fit all characters.  */
+   max_width = fs->max_bounds.rbearing - fs->min_bounds.lbearing;
+   max_height = fs->max_bounds.ascent + fs->max_bounds.descent;
+   max_bm_width = (max_width + 7) / 8;
+   max_bm_height = max_height;
+
+   bm = (GLubyte *) MALLOC((max_bm_width * max_bm_height) * sizeof(GLubyte));
+   if (!bm) {
+      XFreeFontInfo(NULL, fs, 1);
+      _mesa_error(NULL, GL_OUT_OF_MEMORY,
+		  "Couldn't allocate bitmap in glXUseXFont()");
+      return;
+   }
+
+#if 0
+   /* get the page info */
+   pages = fs->max_char_or_byte2 - fs->min_char_or_byte2 + 1;
+   firstchar = (fs->min_byte1 << 8) + fs->min_char_or_byte2;
+   lastchar = (fs->max_byte1 << 8) + fs->max_char_or_byte2;
+   rows = fs->max_byte1 - fs->min_byte1 + 1;
+   unsigned int first_char, last_char, pages, rows;
+#endif
+
+   /* Save the current packing mode for bitmaps.  */
+   glGetIntegerv(GL_UNPACK_SWAP_BYTES, &swapbytes);
+   glGetIntegerv(GL_UNPACK_LSB_FIRST, &lsbfirst);
+   glGetIntegerv(GL_UNPACK_ROW_LENGTH, &rowlength);
+   glGetIntegerv(GL_UNPACK_SKIP_ROWS, &skiprows);
+   glGetIntegerv(GL_UNPACK_SKIP_PIXELS, &skippixels);
+   glGetIntegerv(GL_UNPACK_ALIGNMENT, &alignment);
+
+   /* Enforce a standard packing mode which is compatible with
+      fill_bitmap() from above.  This is actually the default mode,
+      except for the (non)alignment.  */
+   glPixelStorei(GL_UNPACK_SWAP_BYTES, GL_FALSE);
+   glPixelStorei(GL_UNPACK_LSB_FIRST, GL_FALSE);
+   glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+   glPixelStorei(GL_UNPACK_SKIP_ROWS, 0);
+   glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
+   glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+
+   pixmap = XCreatePixmap(dpy, win, 10, 10, 1);
+   values.foreground = BlackPixel(dpy, DefaultScreen(dpy));
+   values.background = WhitePixel(dpy, DefaultScreen(dpy));
+   values.font = fs->fid;
+   valuemask = GCForeground | GCBackground | GCFont;
+   gc = XCreateGC(dpy, pixmap, valuemask, &values);
+   XFreePixmap(dpy, pixmap);
+
+#ifdef DEBUG
+   if (debug_xfonts)
+      dump_font_struct(fs);
+#endif
+
+   for (i = 0; i < count; i++) {
+      unsigned int width, height, bm_width, bm_height;
+      GLfloat x0, y0, dx, dy;
+      XCharStruct *ch;
+      int x, y;
+      unsigned int c = first + i;
+      int list = listbase + i;
+      int valid;
+
+      /* check on index validity and get the bounds */
+      ch = isvalid(fs, c);
+      if (!ch) {
+	 ch = &fs->max_bounds;
+	 valid = 0;
+      }
+      else {
+	 valid = 1;
+      }
+
+#ifdef DEBUG
+      if (debug_xfonts) {
+	 char s[7];
+	 sprintf(s, isprint(c) ? "%c> " : "\\%03o> ", c);
+	 dump_char_struct(ch, s);
+      }
+#endif
+
+      /* glBitmap()' parameters:
+         straight from the glXUseXFont(3) manpage.  */
+      width = ch->rbearing - ch->lbearing;
+      height = ch->ascent + ch->descent;
+      x0 = -ch->lbearing;
+      y0 = ch->descent - 0;	/* XXX used to subtract 1 here */
+      /* but that caused a conformace failure */
+      dx = ch->width;
+      dy = 0;
+
+      /* X11's starting point.  */
+      x = -ch->lbearing;
+      y = ch->ascent;
+
+      /* Round the width to a multiple of eight.  We will use this also
+         for the pixmap for capturing the X11 font.  This is slightly
+         inefficient, but it makes the OpenGL part real easy.  */
+      bm_width = (width + 7) / 8;
+      bm_height = height;
+
+      glNewList(list, GL_COMPILE);
+      if (valid && (bm_width > 0) && (bm_height > 0)) {
+
+	 MEMSET(bm, '\0', bm_width * bm_height);
+	 fill_bitmap(dpy, win, gc, bm_width, bm_height, x, y, c, bm);
+
+	 glBitmap(width, height, x0, y0, dx, dy, bm);
+#ifdef DEBUG
+	 if (debug_xfonts) {
+	    printf("width/height = %u/%u\n", width, height);
+	    printf("bm_width/bm_height = %u/%u\n", bm_width, bm_height);
+	    dump_bitmap(bm_width, bm_height, bm);
+	 }
+#endif
+      }
+      else {
+	 glBitmap(0, 0, 0.0, 0.0, dx, dy, NULL);
+      }
+      glEndList();
+   }
+
+   FREE(bm);
+   XFreeFontInfo(NULL, fs, 1);
+   XFreeGC(dpy, gc);
+
+   /* Restore saved packing modes.  */
+   glPixelStorei(GL_UNPACK_SWAP_BYTES, swapbytes);
+   glPixelStorei(GL_UNPACK_LSB_FIRST, lsbfirst);
+   glPixelStorei(GL_UNPACK_ROW_LENGTH, rowlength);
+   glPixelStorei(GL_UNPACK_SKIP_ROWS, skiprows);
+   glPixelStorei(GL_UNPACK_SKIP_PIXELS, skippixels);
+   glPixelStorei(GL_UNPACK_ALIGNMENT, alignment);
+}
diff --git a/reactos/lib/mesa32/src/drivers/x11/xfonts.h b/reactos/lib/mesa32/src/drivers/x11/xfonts.h
new file mode 100644
index 00000000000..e36f42f817a
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/x11/xfonts.h
@@ -0,0 +1,41 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef XFONTS_H
+#define XFONTS_H
+
+#ifdef __VMS
+#include <GL/vms_x_fix.h>
+#endif
+
+#include <X11/Xlib.h>
+
+
+extern void Fake_glXUseXFont( Font font, int first, int count, int listbase );
+
+
+#endif
+
diff --git a/reactos/lib/mesa32/src/drivers/x11/xm_api.c b/reactos/lib/mesa32/src/drivers/x11/xm_api.c
new file mode 100644
index 00000000000..f25c3e3bc61
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/x11/xm_api.c
@@ -0,0 +1,2626 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * This file contains the implementations of all the XMesa* functions.
+ *
+ *
+ * NOTES:
+ *
+ * The window coordinate system origin (0,0) is in the lower-left corner
+ * of the window.  X11's window coordinate origin is in the upper-left
+ * corner of the window.  Therefore, most drawing functions in this
+ * file have to flip Y coordinates.
+ *
+ * Define USE_XSHM in the Makefile with -DUSE_XSHM if you want to compile
+ * in support for the MIT Shared Memory extension.  If enabled, when you
+ * use an Ximage for the back buffer in double buffered mode, the "swap"
+ * operation will be faster.  You must also link with -lXext.
+ *
+ * Byte swapping:  If the Mesa host and the X display use a different
+ * byte order then there's some trickiness to be aware of when using
+ * XImages.  The byte ordering used for the XImage is that of the X
+ * display, not the Mesa host.
+ * The color-to-pixel encoding for True/DirectColor must be done
+ * according to the display's visual red_mask, green_mask, and blue_mask.
+ * If XPutPixel is used to put a pixel into an XImage then XPutPixel will
+ * do byte swapping if needed.  If one wants to directly "poke" the pixel
+ * into the XImage's buffer then the pixel must be byte swapped first.  In
+ * Mesa, when byte swapping is needed we use the PF_TRUECOLOR pixel format
+ * and use XPutPixel everywhere except in the implementation of
+ * glClear(GL_COLOR_BUFFER_BIT).  We want this function to be fast so
+ * instead of using XPutPixel we "poke" our values after byte-swapping
+ * the clear pixel value if needed.
+ *
+ */
+
+#ifdef __CYGWIN__
+#undef WIN32
+#undef __WIN32__
+#endif
+
+#include "glxheader.h"
+#include "GL/xmesa.h"
+#include "xmesaP.h"
+#include "context.h"
+#include "extensions.h"
+#include "glthread.h"
+#include "imports.h"
+#include "matrix.h"
+#include "mtypes.h"
+#include "macros.h"
+#include "texformat.h"
+#include "texobj.h"
+#include "texstore.h"
+#include "swrast/swrast.h"
+#include "swrast_setup/swrast_setup.h"
+#include "array_cache/acache.h"
+#include "tnl/tnl.h"
+
+#ifndef GLX_NONE_EXT
+#define GLX_NONE_EXT 0x8000
+#endif
+
+
+/*
+ * Global X driver lock
+ */
+_glthread_Mutex _xmesa_lock;
+
+
+
+/*
+ * Lookup tables for HPCR pixel format:
+ */
+static short hpcr_rgbTbl[3][256] = {
+{
+ 16,  16,  17,  17,  18,  18,  19,  19,  20,  20,  21,  21,  22,  22,  23,  23,
+ 24,  24,  25,  25,  26,  26,  27,  27,  28,  28,  29,  29,  30,  30,  31,  31,
+ 32,  32,  33,  33,  34,  34,  35,  35,  36,  36,  37,  37,  38,  38,  39,  39,
+ 32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,  45,  46,  47,
+ 48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,  60,  61,  62,  63,
+ 64,  65,  66,  67,  68,  69,  70,  71,  72,  73,  74,  75,  76,  77,  78,  79,
+ 80,  81,  82,  83,  84,  85,  86,  87,  88,  89,  90,  91,  92,  93,  94,  95,
+ 96,  97,  98,  99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
+224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239
+},
+{
+ 16,  16,  17,  17,  18,  18,  19,  19,  20,  20,  21,  21,  22,  22,  23,  23,
+ 24,  24,  25,  25,  26,  26,  27,  27,  28,  28,  29,  29,  30,  30,  31,  31,
+ 32,  32,  33,  33,  34,  34,  35,  35,  36,  36,  37,  37,  38,  38,  39,  39,
+ 32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,  45,  46,  47,
+ 48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,  60,  61,  62,  63,
+ 64,  65,  66,  67,  68,  69,  70,  71,  72,  73,  74,  75,  76,  77,  78,  79,
+ 80,  81,  82,  83,  84,  85,  86,  87,  88,  89,  90,  91,  92,  93,  94,  95,
+ 96,  97,  98,  99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
+224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239
+},
+{
+ 32,  32,  33,  33,  34,  34,  35,  35,  36,  36,  37,  37,  38,  38,  39,  39,
+ 40,  40,  41,  41,  42,  42,  43,  43,  44,  44,  45,  45,  46,  46,  47,  47,
+ 48,  48,  49,  49,  50,  50,  51,  51,  52,  52,  53,  53,  54,  54,  55,  55,
+ 56,  56,  57,  57,  58,  58,  59,  59,  60,  60,  61,  61,  62,  62,  63,  63,
+ 64,  64,  65,  65,  66,  66,  67,  67,  68,  68,  69,  69,  70,  70,  71,  71,
+ 72,  72,  73,  73,  74,  74,  75,  75,  76,  76,  77,  77,  78,  78,  79,  79,
+ 80,  80,  81,  81,  82,  82,  83,  83,  84,  84,  85,  85,  86,  86,  87,  87,
+ 80,  81,  82,  83,  84,  85,  86,  87,  88,  89,  90,  91,  92,  93,  94,  95,
+ 96,  97,  98,  99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223
+}
+};
+
+
+
+/**********************************************************************/
+/*****                     X Utility Functions                    *****/
+/**********************************************************************/
+
+
+/*
+ * Return the host's byte order as LSBFirst or MSBFirst ala X.
+ */
+#ifndef XFree86Server
+static int host_byte_order( void )
+{
+   int i = 1;
+   char *cptr = (char *) &i;
+   return (*cptr==1) ? LSBFirst : MSBFirst;
+}
+#endif
+
+
+/*
+ * Error handling.
+ */
+#ifndef XFree86Server
+static volatile int mesaXErrorFlag = 0;
+
+static int mesaHandleXError( XMesaDisplay *dpy, XErrorEvent *event )
+{
+   (void) dpy;
+   (void) event;
+   mesaXErrorFlag = 1;
+   return 0;
+}
+#endif
+
+
+/*
+ * Check if the X Shared Memory extension is available.
+ * Return:  0 = not available
+ *          1 = shared XImage support available
+ *          2 = shared Pixmap support available also
+ */
+#ifndef XFree86Server
+static int check_for_xshm( XMesaDisplay *display )
+{
+#ifdef USE_XSHM
+   int major, minor, ignore;
+   Bool pixmaps;
+
+   if (XQueryExtension( display, "MIT-SHM", &ignore, &ignore, &ignore )) {
+      if (XShmQueryVersion( display, &major, &minor, &pixmaps )==True) {
+	 return (pixmaps==True) ? 2 : 1;
+      }
+      else {
+	 return 0;
+      }
+   }
+   else {
+      return 0;
+   }
+#else
+   /* Can't compile XSHM support */
+   return 0;
+#endif
+}
+#endif
+
+
+/*
+ * Return the width and height of the given drawable.
+ */
+static void get_drawable_size( XMesaDisplay *dpy, XMesaDrawable d,
+                               unsigned int *width, unsigned int *height)
+{
+#ifdef XFree86Server
+    (void) dpy;
+    *width = d->width;
+    *height = d->height;
+#else
+   Window root;
+   int x, y;
+   unsigned int bw, depth;
+
+   _glthread_LOCK_MUTEX(_xmesa_lock);
+   XGetGeometry( dpy, d, &root, &x, &y, width, height, &bw, &depth );
+   _glthread_UNLOCK_MUTEX(_xmesa_lock);
+#endif
+}
+
+
+/*
+ * Apply gamma correction to an intensity value in [0..max].  Return the
+ * new intensity value.
+ */
+static GLint gamma_adjust( GLfloat gamma, GLint value, GLint max )
+{
+   if (gamma == 1.0) {
+      return value;
+   }
+   else {
+      double x = (double) value / (double) max;
+      return IROUND_POS((GLfloat) max * _mesa_pow(x, 1.0F/gamma));
+   }
+}
+
+
+
+/*
+ * Return the true number of bits per pixel for XImages.
+ * For example, if we request a 24-bit deep visual we may actually need/get
+ * 32bpp XImages.  This function returns the appropriate bpp.
+ * Input:  dpy - the X display
+ *         visinfo - desribes the visual to be used for XImages
+ * Return:  true number of bits per pixel for XImages
+ */
+#ifdef XFree86Server
+
+static int bits_per_pixel( XMesaVisual xmv )
+{
+   XMesaVisualInfo visinfo = xmv->visinfo;
+   const int depth = visinfo->nplanes;
+   int i;
+   for (i = 0; i < screenInfo.numPixmapFormats; i++) {
+      if (screenInfo.formats[i].depth == depth)
+         return screenInfo.formats[i].bitsPerPixel;
+   }
+   return depth;  /* should never get here, but this should be safe */
+}
+
+#else
+
+static int bits_per_pixel( XMesaVisual xmv )
+{
+   XMesaDisplay *dpy = xmv->display;
+   XMesaVisualInfo visinfo = xmv->visinfo;
+   XMesaImage *img;
+   int bitsPerPixel;
+   /* Create a temporary XImage */
+   img = XCreateImage( dpy, visinfo->visual, visinfo->depth,
+		       ZPixmap, 0,           /*format, offset*/
+		       (char*) MALLOC(8),    /*data*/
+		       1, 1,                 /*width, height*/
+		       32,                   /*bitmap_pad*/
+		       0                     /*bytes_per_line*/
+                     );
+   assert(img);
+   /* grab the bits/pixel value */
+   bitsPerPixel = img->bits_per_pixel;
+   /* free the XImage */
+   FREE( img->data );
+   img->data = NULL;
+   XMesaDestroyImage( img );
+   return bitsPerPixel;
+}
+#endif
+
+
+
+/*
+ * Determine if a given X window ID is valid (window exists).
+ * Do this by calling XGetWindowAttributes() for the window and
+ * checking if we catch an X error.
+ * Input:  dpy - the display
+ *         win - the window to check for existance
+ * Return:  GL_TRUE - window exists
+ *          GL_FALSE - window doesn't exist
+ */
+#ifndef XFree86Server
+static GLboolean WindowExistsFlag;
+
+static int window_exists_err_handler( XMesaDisplay* dpy, XErrorEvent* xerr )
+{
+   (void) dpy;
+   if (xerr->error_code == BadWindow) {
+      WindowExistsFlag = GL_FALSE;
+   }
+   return 0;
+}
+
+static GLboolean window_exists( XMesaDisplay *dpy, Window win )
+{
+   XWindowAttributes wa;
+   int (*old_handler)( XMesaDisplay*, XErrorEvent* );
+   WindowExistsFlag = GL_TRUE;
+   old_handler = XSetErrorHandler(window_exists_err_handler);
+   XGetWindowAttributes( dpy, win, &wa ); /* dummy request */
+   XSetErrorHandler(old_handler);
+   return WindowExistsFlag;
+}
+#endif
+
+
+
+/**********************************************************************/
+/*****                Linked list of XMesaBuffers                 *****/
+/**********************************************************************/
+
+static XMesaBuffer XMesaBufferList = NULL;
+
+
+/* Allocate a new XMesaBuffer, add to linked list */
+static XMesaBuffer alloc_xmesa_buffer(void)
+{
+   XMesaBuffer b = (XMesaBuffer) CALLOC_STRUCT(xmesa_buffer);
+   if (b) {
+      b->Next = XMesaBufferList;
+      XMesaBufferList = b;
+   }
+   return b;
+}
+
+
+/*
+ * Find an XMesaBuffer by matching X display and colormap but NOT matching
+ * the notThis buffer.
+ */
+static XMesaBuffer find_xmesa_buffer(XMesaDisplay *dpy,
+                                     XMesaColormap cmap,
+                                     XMesaBuffer notThis)
+{
+   XMesaBuffer b;
+   for (b=XMesaBufferList; b; b=b->Next) {
+      if (b->display==dpy && b->cmap==cmap && b!=notThis) {
+         return b;
+      }
+   }
+   return NULL;
+}
+
+
+/*
+ * Free an XMesaBuffer, remove from linked list, perhaps free X colormap
+ * entries.
+ */
+static void free_xmesa_buffer(int client, XMesaBuffer buffer)
+{
+   XMesaBuffer prev = NULL, b;
+   (void) client;
+   for (b=XMesaBufferList; b; b=b->Next) {
+      if (b==buffer) {
+         /* unlink bufer from list */
+         if (prev)
+            prev->Next = buffer->Next;
+         else
+            XMesaBufferList = buffer->Next;
+         /* Check to free X colors */
+         if (buffer->num_alloced>0) {
+            /* If no other buffer uses this X colormap then free the colors. */
+            if (!find_xmesa_buffer(buffer->display, buffer->cmap, buffer)) {
+#ifdef XFree86Server
+               (void)FreeColors(buffer->cmap, client,
+				buffer->num_alloced, buffer->alloced_colors,
+				0);
+#else
+               XFreeColors(buffer->display, buffer->cmap,
+                           buffer->alloced_colors, buffer->num_alloced, 0);
+#endif
+            }
+         }
+
+         _mesa_free_framebuffer_data(&buffer->mesa_buffer);
+         FREE(buffer);
+
+         return;
+      }
+      /* continue search */
+      prev = b;
+   }
+   /* buffer not found in XMesaBufferList */
+   _mesa_problem(NULL,"free_xmesa_buffer() - buffer not found\n");
+}
+
+
+/* Copy X color table stuff from one XMesaBuffer to another. */
+static void copy_colortable_info(XMesaBuffer dst, const XMesaBuffer src)
+{
+   MEMCPY(dst->color_table, src->color_table, sizeof(src->color_table));
+   MEMCPY(dst->pixel_to_r, src->pixel_to_r, sizeof(src->pixel_to_r));
+   MEMCPY(dst->pixel_to_g, src->pixel_to_g, sizeof(src->pixel_to_g));
+   MEMCPY(dst->pixel_to_b, src->pixel_to_b, sizeof(src->pixel_to_b));
+   dst->num_alloced = src->num_alloced;
+   MEMCPY(dst->alloced_colors, src->alloced_colors,
+          sizeof(src->alloced_colors));
+}
+
+
+
+/**********************************************************************/
+/*****                   Misc Private Functions                   *****/
+/**********************************************************************/
+
+
+/*
+ * Return number of bits set in n.
+ */
+static int bitcount( unsigned long n )
+{
+   int bits;
+   for (bits=0; n>0; n=n>>1) {
+      if (n&1) {
+         bits++;
+      }
+   }
+   return bits;
+}
+
+
+
+/*
+ * Allocate a shared memory XImage back buffer for the given XMesaBuffer.
+ * Return:  GL_TRUE if success, GL_FALSE if error
+ */
+#ifndef XFree86Server
+static GLboolean alloc_shm_back_buffer( XMesaBuffer b )
+{
+#ifdef USE_XSHM
+   /*
+    * We have to do a _lot_ of error checking here to be sure we can
+    * really use the XSHM extension.  It seems different servers trigger
+    * errors at different points if the extension won't work.  Therefore
+    * we have to be very careful...
+    */
+   GC gc;
+   int (*old_handler)( XMesaDisplay *, XErrorEvent * );
+
+   b->backimage = XShmCreateImage( b->xm_visual->display,
+                                   b->xm_visual->visinfo->visual,
+                                   b->xm_visual->visinfo->depth,
+				   ZPixmap, NULL, &b->shminfo,
+				   b->width, b->height );
+   if (b->backimage == NULL) {
+      _mesa_warning(NULL, "alloc_back_buffer: Shared memory error (XShmCreateImage), disabling.");
+      b->shm = 0;
+      return GL_FALSE;
+   }
+
+   b->shminfo.shmid = shmget( IPC_PRIVATE, b->backimage->bytes_per_line
+			     * b->backimage->height, IPC_CREAT|0777 );
+   if (b->shminfo.shmid < 0) {
+      _mesa_warning(NULL, "shmget failed while allocating back buffer");
+      XDestroyImage( b->backimage );
+      b->backimage = NULL;
+      _mesa_warning(NULL, "alloc_back_buffer: Shared memory error (shmget), disabling.");
+      b->shm = 0;
+      return GL_FALSE;
+   }
+
+   b->shminfo.shmaddr = b->backimage->data
+                      = (char*)shmat( b->shminfo.shmid, 0, 0 );
+   if (b->shminfo.shmaddr == (char *) -1) {
+      _mesa_warning(NULL, "shmat() failed while allocating back buffer");
+      XDestroyImage( b->backimage );
+      shmctl( b->shminfo.shmid, IPC_RMID, 0 );
+      b->backimage = NULL;
+      _mesa_warning(NULL, "alloc_back_buffer: Shared memory error (shmat), disabling.");
+      b->shm = 0;
+      return GL_FALSE;
+   }
+
+   b->shminfo.readOnly = False;
+   mesaXErrorFlag = 0;
+   old_handler = XSetErrorHandler( mesaHandleXError );
+   /* This may trigger the X protocol error we're ready to catch: */
+   XShmAttach( b->xm_visual->display, &b->shminfo );
+   XSync( b->xm_visual->display, False );
+
+   if (mesaXErrorFlag) {
+      /* we are on a remote display, this error is normal, don't print it */
+      XFlush( b->xm_visual->display );
+      mesaXErrorFlag = 0;
+      XDestroyImage( b->backimage );
+      shmdt( b->shminfo.shmaddr );
+      shmctl( b->shminfo.shmid, IPC_RMID, 0 );
+      b->backimage = NULL;
+      b->shm = 0;
+      (void) XSetErrorHandler( old_handler );
+      return GL_FALSE;
+   }
+
+   shmctl( b->shminfo.shmid, IPC_RMID, 0 ); /* nobody else needs it */
+
+   /* Finally, try an XShmPutImage to be really sure the extension works */
+   gc = XCreateGC( b->xm_visual->display, b->frontbuffer, 0, NULL );
+   XShmPutImage( b->xm_visual->display, b->frontbuffer, gc,
+		 b->backimage, 0, 0, 0, 0, 1, 1 /*one pixel*/, False );
+   XSync( b->xm_visual->display, False );
+   XFreeGC( b->xm_visual->display, gc );
+   (void) XSetErrorHandler( old_handler );
+   if (mesaXErrorFlag) {
+      XFlush( b->xm_visual->display );
+      mesaXErrorFlag = 0;
+      XDestroyImage( b->backimage );
+      shmdt( b->shminfo.shmaddr );
+      shmctl( b->shminfo.shmid, IPC_RMID, 0 );
+      b->backimage = NULL;
+      b->shm = 0;
+      return GL_FALSE;
+   }
+
+   if (b->backimage) {
+      int height = b->backimage->height;
+      /* Needed by PIXELADDR1 macro */
+      b->ximage_width1 = b->backimage->bytes_per_line;
+      b->ximage_origin1 = (GLubyte *) b->backimage->data
+                        + b->ximage_width1 * (height-1);
+      /* Needed by PIXELADDR2 macro */
+      b->ximage_width2 = b->backimage->bytes_per_line / 2;
+      b->ximage_origin2 = (GLushort *) b->backimage->data
+                        + b->ximage_width2 * (height-1);
+      /* Needed by PIXELADDR3 macro */
+      b->ximage_width3 = b->backimage->bytes_per_line;
+      b->ximage_origin3 = (GLubyte *) b->backimage->data
+                        + b->ximage_width3 * (height-1);
+      /* Needed by PIXELADDR4 macro */
+      b->ximage_width4 = b->backimage->width;
+      b->ximage_origin4 = (GLuint *) b->backimage->data
+                        + b->ximage_width4 * (height-1);
+   }
+
+   return GL_TRUE;
+#else
+   /* Can't compile XSHM support */
+   return GL_FALSE;
+#endif
+}
+#endif
+
+
+
+/*
+ * Setup an off-screen pixmap or Ximage to use as the back buffer.
+ * Input:  b - the X/Mesa buffer
+ */
+void xmesa_alloc_back_buffer( XMesaBuffer b )
+{
+   if (b->db_state==BACK_XIMAGE) {
+      /* Deallocate the old backimage, if any */
+      if (b->backimage) {
+#if defined(USE_XSHM) && !defined(XFree86Server)
+	 if (b->shm) {
+	    XShmDetach( b->xm_visual->display, &b->shminfo );
+	    XDestroyImage( b->backimage );
+	    shmdt( b->shminfo.shmaddr );
+	 }
+	 else
+#endif
+	   XMesaDestroyImage( b->backimage );
+	 b->backimage = NULL;
+      }
+
+      /* Allocate new back buffer */
+#ifdef XFree86Server
+      {
+	 /* Allocate a regular XImage for the back buffer. */
+	 b->backimage = XMesaCreateImage(b->xm_visual->BitsPerPixel,
+					 b->width, b->height, NULL);
+#else
+      if (b->shm==0 || alloc_shm_back_buffer(b)==GL_FALSE) {
+	 /* Allocate a regular XImage for the back buffer. */
+	 b->backimage = XCreateImage( b->xm_visual->display,
+                                      b->xm_visual->visinfo->visual,
+                                      GET_VISUAL_DEPTH(b->xm_visual),
+				      ZPixmap, 0,   /* format, offset */
+				      NULL, b->width, b->height,
+				      8, 0 );  /* pad, bytes_per_line */
+#endif
+	 if (!b->backimage) {
+	    _mesa_warning(NULL, "alloc_back_buffer: XCreateImage failed.");
+	 }
+         b->backimage->data = (char *) MALLOC( b->backimage->height
+                                             * b->backimage->bytes_per_line );
+         if (!b->backimage->data) {
+            _mesa_warning(NULL, "alloc_back_buffer: MALLOC failed.");
+            XMesaDestroyImage( b->backimage );
+            b->backimage = NULL;
+         }
+      }
+      b->backpixmap = None;
+   }
+   else if (b->db_state==BACK_PIXMAP) {
+      XMesaPixmap old_pixmap = b->backpixmap;
+      /* Free the old back pixmap */
+      if (b->backpixmap) {
+	 XMesaFreePixmap( b->xm_visual->display, b->backpixmap );
+      }
+      /* Allocate new back pixmap */
+      b->backpixmap = XMesaCreatePixmap( b->xm_visual->display, b->frontbuffer,
+					 b->width, b->height,
+					 GET_VISUAL_DEPTH(b->xm_visual) );
+      b->backimage = NULL;
+      /* update other references to backpixmap */
+      if (b->buffer==(XMesaDrawable)old_pixmap) {
+	 b->buffer = (XMesaDrawable)b->backpixmap;
+      }
+   }
+}
+
+
+
+/*
+ * A replacement for XAllocColor.  This function should never
+ * fail to allocate a color.  When XAllocColor fails, we return
+ * the nearest matching color.  If we have to allocate many colors
+ * this function isn't too efficient; the XQueryColors() could be
+ * done just once.
+ * Written by Michael Pichler, Brian Paul, Mark Kilgard
+ * Input:  dpy - X display
+ *         cmap - X colormap
+ *         cmapSize - size of colormap
+ * In/Out: color - the XColor struct
+ * Output:  exact - 1=exact color match, 0=closest match
+ *          alloced - 1=XAlloc worked, 0=XAlloc failed
+ */
+static void
+noFaultXAllocColor( int client,
+                    XMesaDisplay *dpy,
+                    XMesaColormap cmap,
+                    int cmapSize,
+                    XMesaColor *color,
+                    int *exact, int *alloced )
+{
+#ifdef XFree86Server
+   Pixel *ppixIn;
+   xrgb *ctable;
+#else
+   /* we'll try to cache ctable for better remote display performance */
+   static Display *prevDisplay = NULL;
+   static XMesaColormap prevCmap = 0;
+   static int prevCmapSize = 0;
+   static XMesaColor *ctable = NULL;
+#endif
+   XMesaColor subColor;
+   int i, bestmatch;
+   double mindist;       /* 3*2^16^2 exceeds long int precision. */
+
+   (void) client;
+
+   /* First try just using XAllocColor. */
+#ifdef XFree86Server
+   if (AllocColor(cmap,
+		  &color->red, &color->green, &color->blue,
+		  &color->pixel,
+		  client) == Success) {
+#else
+   if (XAllocColor(dpy, cmap, color)) {
+#endif
+      *exact = 1;
+      *alloced = 1;
+      return;
+   }
+
+   /* Alloc failed, search for closest match */
+
+   /* Retrieve color table entries. */
+   /* XXX alloca candidate. */
+#ifdef XFree86Server
+   ppixIn = (Pixel *) MALLOC(cmapSize * sizeof(Pixel));
+   ctable = (xrgb *) MALLOC(cmapSize * sizeof(xrgb));
+   for (i = 0; i < cmapSize; i++) {
+      ppixIn[i] = i;
+   }
+   QueryColors(cmap, cmapSize, ppixIn, ctable);
+#else
+   if (prevDisplay != dpy || prevCmap != cmap
+       || prevCmapSize != cmapSize || !ctable) {
+      /* free previously cached color table */
+      if (ctable)
+         FREE(ctable);
+      /* Get the color table from X */
+      ctable = (XMesaColor *) MALLOC(cmapSize * sizeof(XMesaColor));
+      assert(ctable);
+      for (i = 0; i < cmapSize; i++) {
+         ctable[i].pixel = i;
+      }
+      XQueryColors(dpy, cmap, ctable, cmapSize);
+      prevDisplay = dpy;
+      prevCmap = cmap;
+      prevCmapSize = cmapSize;
+   }
+#endif
+
+   /* Find best match. */
+   bestmatch = -1;
+   mindist = 0.0;
+   for (i = 0; i < cmapSize; i++) {
+      double dr = 0.30 * ((double) color->red - (double) ctable[i].red);
+      double dg = 0.59 * ((double) color->green - (double) ctable[i].green);
+      double db = 0.11 * ((double) color->blue - (double) ctable[i].blue);
+      double dist = dr * dr + dg * dg + db * db;
+      if (bestmatch < 0 || dist < mindist) {
+         bestmatch = i;
+         mindist = dist;
+      }
+   }
+
+   /* Return result. */
+   subColor.red   = ctable[bestmatch].red;
+   subColor.green = ctable[bestmatch].green;
+   subColor.blue  = ctable[bestmatch].blue;
+   /* Try to allocate the closest match color.  This should only
+    * fail if the cell is read/write.  Otherwise, we're incrementing
+    * the cell's reference count.
+    */
+#ifdef XFree86Server
+   if (AllocColor(cmap,
+		  &subColor.red, &subColor.green, &subColor.blue,
+		  &subColor.pixel,
+		  client) == Success) {
+#else
+   if (XAllocColor(dpy, cmap, &subColor)) {
+#endif
+      *alloced = 1;
+   }
+   else {
+      /* do this to work around a problem reported by Frank Ortega */
+      subColor.pixel = (unsigned long) bestmatch;
+      subColor.red   = ctable[bestmatch].red;
+      subColor.green = ctable[bestmatch].green;
+      subColor.blue  = ctable[bestmatch].blue;
+      subColor.flags = DoRed | DoGreen | DoBlue;
+      *alloced = 0;
+   }
+#ifdef XFree86Server
+   FREE(ppixIn);
+   FREE(ctable);
+#else
+   /* don't free table, save it for next time */
+#endif
+
+   *color = subColor;
+   *exact = 0;
+}
+
+
+
+
+/*
+ * Do setup for PF_GRAYSCALE pixel format.
+ * Note that buffer may be NULL.
+ */
+static GLboolean setup_grayscale( int client, XMesaVisual v,
+                                  XMesaBuffer buffer, XMesaColormap cmap )
+{
+   if (GET_VISUAL_DEPTH(v)<4 || GET_VISUAL_DEPTH(v)>16) {
+      return GL_FALSE;
+   }
+
+   if (buffer) {
+      XMesaBuffer prevBuffer;
+
+      if (!cmap) {
+         return GL_FALSE;
+      }
+
+      prevBuffer = find_xmesa_buffer(v->display, cmap, buffer);
+      if (prevBuffer &&
+          (buffer->xm_visual->mesa_visual.rgbMode ==
+           prevBuffer->xm_visual->mesa_visual.rgbMode)) {
+         /* Copy colormap stuff from previous XMesaBuffer which uses same
+          * X colormap.  Do this to avoid time spent in noFaultXAllocColor.
+          */
+         copy_colortable_info(buffer, prevBuffer);
+      }
+      else {
+         /* Allocate 256 shades of gray */
+         int gray;
+         int colorsfailed = 0;
+         for (gray=0;gray<256;gray++) {
+            GLint r = gamma_adjust( v->RedGamma,   gray, 255 );
+            GLint g = gamma_adjust( v->GreenGamma, gray, 255 );
+            GLint b = gamma_adjust( v->BlueGamma,  gray, 255 );
+            int exact, alloced;
+            XMesaColor xcol;
+            xcol.red   = (r << 8) | r;
+            xcol.green = (g << 8) | g;
+            xcol.blue  = (b << 8) | b;
+            noFaultXAllocColor( client, v->display,
+                                cmap, GET_COLORMAP_SIZE(v),
+                                &xcol, &exact, &alloced );
+            if (!exact) {
+               colorsfailed++;
+            }
+            if (alloced) {
+               assert(buffer->num_alloced<256);
+               buffer->alloced_colors[buffer->num_alloced] = xcol.pixel;
+               buffer->num_alloced++;
+            }
+
+            /*OLD
+            assert(gray < 576);
+            buffer->color_table[gray*3+0] = xcol.pixel;
+            buffer->color_table[gray*3+1] = xcol.pixel;
+            buffer->color_table[gray*3+2] = xcol.pixel;
+            assert(xcol.pixel < 65536);
+            buffer->pixel_to_r[xcol.pixel] = gray * 30 / 100;
+            buffer->pixel_to_g[xcol.pixel] = gray * 59 / 100;
+            buffer->pixel_to_b[xcol.pixel] = gray * 11 / 100;
+            */
+            buffer->color_table[gray] = xcol.pixel;
+            assert(xcol.pixel < 65536);
+            buffer->pixel_to_r[xcol.pixel] = gray;
+            buffer->pixel_to_g[xcol.pixel] = gray;
+            buffer->pixel_to_b[xcol.pixel] = gray;
+         }
+
+         if (colorsfailed && _mesa_getenv("MESA_DEBUG")) {
+            _mesa_warning(NULL,
+                  "Note: %d out of 256 needed colors do not match exactly.\n",
+                  colorsfailed );
+         }
+      }
+   }
+
+   v->dithered_pf = PF_Grayscale;
+   v->undithered_pf = PF_Grayscale;
+   return GL_TRUE;
+}
+
+
+
+/*
+ * Setup RGB rendering for a window with a PseudoColor, StaticColor,
+ * or 8-bit TrueColor visual visual.  We try to allocate a palette of 225
+ * colors (5 red, 9 green, 5 blue) and dither to approximate a 24-bit RGB
+ * color.  While this function was originally designed just for 8-bit
+ * visuals, it has also proven to work from 4-bit up to 16-bit visuals.
+ * Dithering code contributed by Bob Mercier.
+ */
+static GLboolean setup_dithered_color( int client, XMesaVisual v,
+                                       XMesaBuffer buffer, XMesaColormap cmap )
+{
+   (void) DitherValues;  /* silence warning */
+
+   if (GET_VISUAL_DEPTH(v)<4 || GET_VISUAL_DEPTH(v)>16) {
+      return GL_FALSE;
+   }
+
+   if (buffer) {
+      XMesaBuffer prevBuffer;
+
+      if (!cmap) {
+         return GL_FALSE;
+      }
+
+      prevBuffer = find_xmesa_buffer(v->display, cmap, buffer);
+      if (prevBuffer &&
+          (buffer->xm_visual->mesa_visual.rgbMode ==
+           prevBuffer->xm_visual->mesa_visual.rgbMode)) {
+         /* Copy colormap stuff from previous, matching XMesaBuffer.
+          * Do this to avoid time spent in noFaultXAllocColor.
+          */
+         copy_colortable_info(buffer, prevBuffer);
+      }
+      else {
+         /* Allocate X colors and initialize color_table[], red_table[], etc */
+         int r, g, b, i;
+         int colorsfailed = 0;
+         for (r = 0; r < DITH_R; r++) {
+            for (g = 0; g < DITH_G; g++) {
+               for (b = 0; b < DITH_B; b++) {
+                  XMesaColor xcol;
+                  int exact, alloced;
+                  xcol.red  =gamma_adjust(v->RedGamma,   r*65535/(DITH_R-1),65535);
+                  xcol.green=gamma_adjust(v->GreenGamma, g*65535/(DITH_G-1),65535);
+                  xcol.blue =gamma_adjust(v->BlueGamma,  b*65535/(DITH_B-1),65535);
+                  noFaultXAllocColor( client, v->display,
+                                      cmap, GET_COLORMAP_SIZE(v),
+                                      &xcol, &exact, &alloced );
+                  if (!exact) {
+                     colorsfailed++;
+                  }
+                  if (alloced) {
+                     assert(buffer->num_alloced<256);
+                     buffer->alloced_colors[buffer->num_alloced] = xcol.pixel;
+                     buffer->num_alloced++;
+                  }
+                  i = DITH_MIX( r, g, b );
+                  assert(i < 576);
+                  buffer->color_table[i] = xcol.pixel;
+                  assert(xcol.pixel < 65536);
+                  buffer->pixel_to_r[xcol.pixel] = r * 255 / (DITH_R-1);
+                  buffer->pixel_to_g[xcol.pixel] = g * 255 / (DITH_G-1);
+                  buffer->pixel_to_b[xcol.pixel] = b * 255 / (DITH_B-1);
+               }
+            }
+         }
+
+         if (colorsfailed && _mesa_getenv("MESA_DEBUG")) {
+            _mesa_warning(NULL,
+                  "Note: %d out of %d needed colors do not match exactly.\n",
+                  colorsfailed, DITH_R * DITH_G * DITH_B );
+         }
+      }
+   }
+
+   v->dithered_pf = PF_Dither;
+   v->undithered_pf = PF_Lookup;
+   return GL_TRUE;
+}
+
+
+/*
+ * Setup for Hewlett Packard Color Recovery 8-bit TrueColor mode.
+ * HPCR simulates 24-bit color fidelity with an 8-bit frame buffer.
+ * Special dithering tables have to be initialized.
+ */
+static void setup_8bit_hpcr( XMesaVisual v )
+{
+   /* HP Color Recovery contributed by:  Alex De Bruyn (ad@lms.be)
+    * To work properly, the atom _HP_RGB_SMOOTH_MAP_LIST must be defined
+    * on the root window AND the colormap obtainable by XGetRGBColormaps
+    * for that atom must be set on the window.  (see also tkInitWindow)
+    * If that colormap is not set, the output will look stripy.
+    */
+
+   /* Setup color tables with gamma correction */
+   int i;
+   double g;
+
+   g = 1.0 / v->RedGamma;
+   for (i=0; i<256; i++) {
+      GLint red = IROUND_POS(255.0 * _mesa_pow( hpcr_rgbTbl[0][i]/255.0, g ));
+      v->hpcr_rgbTbl[0][i] = CLAMP( red, 16, 239 );
+   }
+
+   g = 1.0 / v->GreenGamma;
+   for (i=0; i<256; i++) {
+      GLint green = IROUND_POS(255.0 * _mesa_pow( hpcr_rgbTbl[1][i]/255.0, g ));
+      v->hpcr_rgbTbl[1][i] = CLAMP( green, 16, 239 );
+   }
+
+   g = 1.0 / v->BlueGamma;
+   for (i=0; i<256; i++) {
+      GLint blue = IROUND_POS(255.0 * _mesa_pow( hpcr_rgbTbl[2][i]/255.0, g ));
+      v->hpcr_rgbTbl[2][i] = CLAMP( blue, 32, 223 );
+   }
+   v->undithered_pf = PF_HPCR;  /* can't really disable dithering for now */
+   v->dithered_pf = PF_HPCR;
+
+   /* which method should I use to clear */
+   /* GL_FALSE: keep the ordinary method  */
+   /* GL_TRUE : clear with dither pattern */
+   v->hpcr_clear_flag = _mesa_getenv("MESA_HPCR_CLEAR") ? GL_TRUE : GL_FALSE;
+
+   if (v->hpcr_clear_flag) {
+      v->hpcr_clear_pixmap = XMesaCreatePixmap(v->display,
+                                               DefaultRootWindow(v->display),
+                                               16, 2, 8);
+#ifndef XFree86Server
+      v->hpcr_clear_ximage = XGetImage(v->display, v->hpcr_clear_pixmap,
+                                       0, 0, 16, 2, AllPlanes, ZPixmap);
+#endif
+   }
+}
+
+
+/*
+ * Setup RGB rendering for a window with a True/DirectColor visual.
+ */
+static void setup_truecolor( XMesaVisual v, XMesaBuffer buffer,
+                             XMesaColormap cmap )
+{
+   unsigned long rmask, gmask, bmask;
+   (void) buffer;
+   (void) cmap;
+
+   /* Compute red multiplier (mask) and bit shift */
+   v->rshift = 0;
+   rmask = GET_REDMASK(v);
+   while ((rmask & 1)==0) {
+      v->rshift++;
+      rmask = rmask >> 1;
+   }
+
+   /* Compute green multiplier (mask) and bit shift */
+   v->gshift = 0;
+   gmask = GET_GREENMASK(v);
+   while ((gmask & 1)==0) {
+      v->gshift++;
+      gmask = gmask >> 1;
+   }
+
+   /* Compute blue multiplier (mask) and bit shift */
+   v->bshift = 0;
+   bmask = GET_BLUEMASK(v);
+   while ((bmask & 1)==0) {
+      v->bshift++;
+      bmask = bmask >> 1;
+   }
+
+   /*
+    * Compute component-to-pixel lookup tables and dithering kernel
+    */
+   {
+      static GLubyte kernel[16] = {
+          0*16,  8*16,  2*16, 10*16,
+         12*16,  4*16, 14*16,  6*16,
+          3*16, 11*16,  1*16,  9*16,
+         15*16,  7*16, 13*16,  5*16,
+      };
+      GLint rBits = bitcount(rmask);
+      GLint gBits = bitcount(gmask);
+      GLint bBits = bitcount(bmask);
+      GLint maxBits;
+      GLuint i;
+
+      /* convert pixel components in [0,_mask] to RGB values in [0,255] */
+      for (i=0; i<=rmask; i++)
+         v->PixelToR[i] = (unsigned char) ((i * 255) / rmask);
+      for (i=0; i<=gmask; i++)
+         v->PixelToG[i] = (unsigned char) ((i * 255) / gmask);
+      for (i=0; i<=bmask; i++)
+         v->PixelToB[i] = (unsigned char) ((i * 255) / bmask);
+
+      /* convert RGB values from [0,255] to pixel components */
+
+      for (i=0;i<256;i++) {
+         GLint r = gamma_adjust(v->RedGamma,   i, 255);
+         GLint g = gamma_adjust(v->GreenGamma, i, 255);
+         GLint b = gamma_adjust(v->BlueGamma,  i, 255);
+         v->RtoPixel[i] = (r >> (8-rBits)) << v->rshift;
+         v->GtoPixel[i] = (g >> (8-gBits)) << v->gshift;
+         v->BtoPixel[i] = (b >> (8-bBits)) << v->bshift;
+      }
+      /* overflow protection */
+      for (i=256;i<512;i++) {
+         v->RtoPixel[i] = v->RtoPixel[255];
+         v->GtoPixel[i] = v->GtoPixel[255];
+         v->BtoPixel[i] = v->BtoPixel[255];
+      }
+
+      /* setup dithering kernel */
+      maxBits = rBits;
+      if (gBits > maxBits)  maxBits = gBits;
+      if (bBits > maxBits)  maxBits = bBits;
+      for (i=0;i<16;i++) {
+         v->Kernel[i] = kernel[i] >> maxBits;
+      }
+
+      v->undithered_pf = PF_Truecolor;
+      v->dithered_pf = (GET_VISUAL_DEPTH(v)<24) ? PF_Dither_True : PF_Truecolor;
+   }
+
+   /*
+    * Now check for TrueColor visuals which we can optimize.
+    */
+   if (   GET_REDMASK(v)  ==0x0000ff
+       && GET_GREENMASK(v)==0x00ff00
+       && GET_BLUEMASK(v) ==0xff0000
+       && CHECK_BYTE_ORDER(v)
+       && v->BitsPerPixel==32
+       && sizeof(GLuint)==4
+       && v->RedGamma==1.0 && v->GreenGamma==1.0 && v->BlueGamma==1.0) {
+      /* common 32 bpp config used on SGI, Sun */
+      v->undithered_pf = v->dithered_pf = PF_8A8B8G8R;
+   }
+   else if (GET_REDMASK(v)  ==0xff0000
+       &&   GET_GREENMASK(v)==0x00ff00
+       &&   GET_BLUEMASK(v) ==0x0000ff
+       && CHECK_BYTE_ORDER(v)
+       && v->BitsPerPixel==32
+       && sizeof(GLuint)==4
+       && v->RedGamma==1.0 && v->GreenGamma==1.0 && v->BlueGamma==1.0) {
+      /* common 32 bpp config used on Linux, HP, IBM */
+      v->undithered_pf = v->dithered_pf = PF_8R8G8B;
+   }
+   else if (GET_REDMASK(v)  ==0xff0000
+       &&   GET_GREENMASK(v)==0x00ff00
+       &&   GET_BLUEMASK(v) ==0x0000ff
+       && CHECK_BYTE_ORDER(v)
+       && v->BitsPerPixel==24
+       && sizeof(GLuint)==4
+       && v->RedGamma==1.0 && v->GreenGamma==1.0 && v->BlueGamma==1.0) {
+      /* common packed 24 bpp config used on Linux */
+      v->undithered_pf = v->dithered_pf = PF_8R8G8B24;
+   }
+   else if (GET_REDMASK(v)  ==0xf800
+       &&   GET_GREENMASK(v)==0x07e0
+       &&   GET_BLUEMASK(v) ==0x001f
+       && CHECK_BYTE_ORDER(v)
+       && v->BitsPerPixel==16
+       && sizeof(GLushort)==2
+       && v->RedGamma==1.0 && v->GreenGamma==1.0 && v->BlueGamma==1.0) {
+      /* 5-6-5 color weight on common PC VGA boards */
+      v->undithered_pf = PF_5R6G5B;
+      v->dithered_pf = PF_Dither_5R6G5B;
+   }
+   else if (GET_REDMASK(v)  ==0xe0
+       &&   GET_GREENMASK(v)==0x1c
+       &&   GET_BLUEMASK(v) ==0x03
+       && CHECK_FOR_HPCR(v)) {
+      setup_8bit_hpcr( v );
+   }
+}
+
+
+
+/*
+ * Setup RGB rendering for a window with a monochrome visual.
+ */
+static void setup_monochrome( XMesaVisual v, XMesaBuffer b )
+{
+   (void) b;
+   v->dithered_pf = v->undithered_pf = PF_1Bit;
+   /* if black=1 then we must flip pixel values */
+   v->bitFlip = (GET_BLACK_PIXEL(v) != 0);
+}
+
+
+
+/*
+ * When a context is "made current" for the first time, we can finally
+ * finish initializing the context's visual and buffer information.
+ * Input:  v - the XMesaVisual to initialize
+ *         b - the XMesaBuffer to initialize (may be NULL)
+ *         rgb_flag - TRUE = RGBA mode, FALSE = color index mode
+ *         window - the window/pixmap we're rendering into
+ *         cmap - the colormap associated with the window/pixmap
+ * Return:  GL_TRUE=success, GL_FALSE=failure
+ */
+static GLboolean initialize_visual_and_buffer( int client,
+                                               XMesaVisual v,
+                                               XMesaBuffer b,
+                                               GLboolean rgb_flag,
+                                               XMesaDrawable window,
+                                               XMesaColormap cmap )
+{
+#ifndef XFree86Server
+   XGCValues gcvalues;
+#endif
+
+   if (b) {
+      assert(b->xm_visual == v);
+   }
+
+   /* Save true bits/pixel */
+   v->BitsPerPixel = bits_per_pixel(v);
+   assert(v->BitsPerPixel > 0);
+
+
+   if (rgb_flag==GL_FALSE) {
+      /* COLOR-INDEXED WINDOW:
+       * Even if the visual is TrueColor or DirectColor we treat it as
+       * being color indexed.  This is weird but might be useful to someone.
+       */
+      v->dithered_pf = v->undithered_pf = PF_Index;
+      v->index_bits = GET_VISUAL_DEPTH(v);
+   }
+   else {
+      /* RGB WINDOW:
+       * We support RGB rendering into almost any kind of visual.
+       */
+      int xclass;
+      xclass = GET_VISUAL_CLASS(v);
+      if (xclass==TrueColor || xclass==DirectColor) {
+	 setup_truecolor( v, b, cmap );
+      }
+      else if (xclass==StaticGray && GET_VISUAL_DEPTH(v)==1) {
+	 setup_monochrome( v, b );
+      }
+      else if (xclass==GrayScale || xclass==StaticGray) {
+         if (!setup_grayscale( client, v, b, cmap )) {
+            return GL_FALSE;
+         }
+      }
+      else if ((xclass==PseudoColor || xclass==StaticColor)
+               && GET_VISUAL_DEPTH(v)>=4 && GET_VISUAL_DEPTH(v)<=16) {
+	 if (!setup_dithered_color( client, v, b, cmap )) {
+            return GL_FALSE;
+         }
+      }
+      else {
+	 _mesa_warning(NULL, "XMesa: RGB mode rendering not supported in given visual.");
+	 return GL_FALSE;
+      }
+      v->index_bits = 0;
+
+      if (_mesa_getenv("MESA_NO_DITHER")) {
+	 v->dithered_pf = v->undithered_pf;
+      }
+   }
+
+
+   /*
+    * If MESA_INFO env var is set print out some debugging info
+    * which can help Brian figure out what's going on when a user
+    * reports bugs.
+    */
+   if (_mesa_getenv("MESA_INFO")) {
+      _mesa_printf("X/Mesa visual = %p\n", (void *) v);
+      _mesa_printf("X/Mesa dithered pf = %u\n", v->dithered_pf);
+      _mesa_printf("X/Mesa undithered pf = %u\n", v->undithered_pf);
+      _mesa_printf("X/Mesa level = %d\n", v->level);
+      _mesa_printf("X/Mesa depth = %d\n", GET_VISUAL_DEPTH(v));
+      _mesa_printf("X/Mesa bits per pixel = %d\n", v->BitsPerPixel);
+   }
+
+   if (b && window) {
+      /* Do window-specific initializations */
+
+      /* Window dimensions */
+      unsigned int w, h;
+      get_drawable_size( v->display, window, &w, &h );
+      b->width = w;
+      b->height = h;
+
+      b->frontbuffer = window;
+
+      /* Setup for single/double buffering */
+      if (v->mesa_visual.doubleBufferMode) {
+         /* Double buffered */
+#ifndef XFree86Server
+         b->shm = check_for_xshm( v->display );
+#endif
+         xmesa_alloc_back_buffer( b );
+         if (b->db_state==BACK_PIXMAP) {
+            b->buffer = (XMesaDrawable)b->backpixmap;
+         }
+         else {
+            b->buffer = XIMAGE;
+         }
+      }
+      else {
+         /* Single Buffered */
+         b->buffer = b->frontbuffer;
+      }
+
+      /* X11 graphics contexts */
+#ifdef XFree86Server
+      b->gc = CreateScratchGC(v->display, window->depth);
+#else
+      b->gc = XCreateGC( v->display, window, 0, NULL );
+#endif
+      XMesaSetFunction( v->display, b->gc, GXcopy );
+
+      /* cleargc - for glClear() */
+#ifdef XFree86Server
+      b->cleargc = CreateScratchGC(v->display, window->depth);
+#else
+      b->cleargc = XCreateGC( v->display, window, 0, NULL );
+#endif
+      XMesaSetFunction( v->display, b->cleargc, GXcopy );
+
+      /*
+       * Don't generate Graphics Expose/NoExpose events in swapbuffers().
+       * Patch contributed by Michael Pichler May 15, 1995.
+       */
+#ifdef XFree86Server
+      b->swapgc = CreateScratchGC(v->display, window->depth);
+      {
+	  CARD32 v[1];
+	  v[0] = FALSE;
+	  dixChangeGC(NullClient, b->swapgc, GCGraphicsExposures, v, NULL);
+      }
+#else
+      gcvalues.graphics_exposures = False;
+      b->swapgc = XCreateGC( v->display, window,
+                              GCGraphicsExposures, &gcvalues);
+#endif
+      XMesaSetFunction( v->display, b->swapgc, GXcopy );
+      /*
+       * Set fill style and tile pixmap once for all for HPCR stuff
+       * (instead of doing it each time in clear_color_HPCR_pixmap())
+       * Initialize whole stuff
+       * Patch contributed by Jacques Leroy March 8, 1998.
+       */
+      if (v->hpcr_clear_flag && b->buffer!=XIMAGE) {
+	int i;
+	for (i=0; i<16; i++)
+        {
+	   XMesaPutPixel(v->hpcr_clear_ximage, i, 0, 0);
+	   XMesaPutPixel(v->hpcr_clear_ximage, i, 1, 0);
+        }
+        XMesaPutImage(b->display, (XMesaDrawable)v->hpcr_clear_pixmap,
+		      b->cleargc, v->hpcr_clear_ximage, 0, 0, 0, 0, 16, 2);
+	XMesaSetFillStyle( v->display, b->cleargc, FillTiled);
+	XMesaSetTile( v->display, b->cleargc, v->hpcr_clear_pixmap );
+      }
+
+      /* Initialize the row buffer XImage for use in write_color_span() */
+#ifdef XFree86Server
+      b->rowimage = XMesaCreateImage(GET_VISUAL_DEPTH(v), MAX_WIDTH, 1,
+				     (char *)MALLOC(MAX_WIDTH*4));
+#else
+      b->rowimage = XCreateImage( v->display,
+                                  v->visinfo->visual,
+                                  v->visinfo->depth,
+                                  ZPixmap, 0,           /*format, offset*/
+                                  (char*) MALLOC(MAX_WIDTH*4),  /*data*/
+                                  MAX_WIDTH, 1,         /*width, height*/
+                                  32,                   /*bitmap_pad*/
+                                  0                     /*bytes_per_line*/ );
+#endif
+   }
+
+   return GL_TRUE;
+}
+
+
+
+/*
+ * Convert an RGBA color to a pixel value.
+ */
+unsigned long
+xmesa_color_to_pixel( XMesaContext xmesa, GLubyte r, GLubyte g, GLubyte b, GLubyte a,
+                      GLuint pixelFormat)
+{
+   switch (pixelFormat) {
+      case PF_Index:
+         return 0;
+      case PF_Truecolor:
+         {
+            unsigned long p;
+            PACK_TRUECOLOR( p, r, g, b );
+            return p;
+         }
+      case PF_8A8B8G8R:
+         return PACK_8A8B8G8R( r, g, b, a );
+      case PF_8R8G8B:
+         /* fall through */
+      case PF_8R8G8B24:
+         return PACK_8R8G8B( r, g, b );
+      case PF_5R6G5B:
+         return PACK_5R6G5B( r, g, b );
+      case PF_Dither:
+         {
+            DITHER_SETUP;
+            return DITHER( 1, 0, r, g, b );
+         }
+      case PF_1Bit:
+         /* 382 = (3*255)/2 */
+         return ((r+g+b) > 382) ^ xmesa->xm_visual->bitFlip;
+      case PF_HPCR:
+         return DITHER_HPCR(1, 1, r, g, b);
+      case PF_Lookup:
+         {
+            LOOKUP_SETUP;
+            return LOOKUP( r, g, b );
+         }
+      case PF_Grayscale:
+         return GRAY_RGB( r, g, b );
+      case PF_Dither_True:
+         /* fall through */
+      case PF_Dither_5R6G5B:
+         {
+            unsigned long p;
+            PACK_TRUEDITHER(p, 1, 0, r, g, b);
+            return p;
+         }
+      default:
+         _mesa_problem(NULL, "Bad pixel format in xmesa_color_to_pixel");
+   }
+   return 0;
+}
+
+
+/**********************************************************************/
+/*****                       Public Functions                     *****/
+/**********************************************************************/
+
+
+/*
+ * Create a new X/Mesa visual.
+ * Input:  display - X11 display
+ *         visinfo - an XVisualInfo pointer
+ *         rgb_flag - GL_TRUE = RGB mode,
+ *                    GL_FALSE = color index mode
+ *         alpha_flag - alpha buffer requested?
+ *         db_flag - GL_TRUE = double-buffered,
+ *                   GL_FALSE = single buffered
+ *         stereo_flag - stereo visual?
+ *         ximage_flag - GL_TRUE = use an XImage for back buffer,
+ *                       GL_FALSE = use an off-screen pixmap for back buffer
+ *         depth_size - requested bits/depth values, or zero
+ *         stencil_size - requested bits/stencil values, or zero
+ *         accum_red_size - requested bits/red accum values, or zero
+ *         accum_green_size - requested bits/green accum values, or zero
+ *         accum_blue_size - requested bits/blue accum values, or zero
+ *         accum_alpha_size - requested bits/alpha accum values, or zero
+ *         num_samples - number of samples/pixel if multisampling, or zero
+ *         level - visual level, usually 0
+ *         visualCaveat - ala the GLX extension, usually GLX_NONE_EXT
+ * Return;  a new XMesaVisual or 0 if error.
+ */
+XMesaVisual XMesaCreateVisual( XMesaDisplay *display,
+                               XMesaVisualInfo visinfo,
+                               GLboolean rgb_flag,
+                               GLboolean alpha_flag,
+                               GLboolean db_flag,
+                               GLboolean stereo_flag,
+                               GLboolean ximage_flag,
+                               GLint depth_size,
+                               GLint stencil_size,
+                               GLint accum_red_size,
+                               GLint accum_green_size,
+                               GLint accum_blue_size,
+                               GLint accum_alpha_size,
+                               GLint num_samples,
+                               GLint level,
+                               GLint visualCaveat )
+{
+   char *gamma;
+   XMesaVisual v;
+   GLint red_bits, green_bits, blue_bits, alpha_bits;
+
+   /* For debugging only */
+   if (_mesa_getenv("MESA_XSYNC")) {
+      /* This makes debugging X easier.
+       * In your debugger, set a breakpoint on _XError to stop when an
+       * X protocol error is generated.
+       */
+#ifdef XFree86Server
+      /* NOT_NEEDED */
+#else
+      XSynchronize( display, 1 );
+#endif
+   }
+
+   v = (XMesaVisual) CALLOC_STRUCT(xmesa_visual);
+   if (!v) {
+      return NULL;
+   }
+
+   /*
+    * In the X server, NULL is passed in for the display.  It will have
+    * to be set before using this visual.  See XMesaSetVisualDisplay()
+    * below.
+    */
+   v->display = display;
+
+   /* Save a copy of the XVisualInfo struct because the user may XFREE()
+    * the struct but we may need some of the information contained in it
+    * at a later time.
+    */
+#ifdef XFree86Server
+   v->visinfo = visinfo;
+#else
+   v->visinfo = (XVisualInfo *) MALLOC(sizeof(*visinfo));
+   if(!v->visinfo) {
+      FREE(v);
+      return NULL;
+   }
+   MEMCPY(v->visinfo, visinfo, sizeof(*visinfo));
+#endif
+
+#ifdef XFree86Server
+   /* Initialize the depth of the screen */
+   {
+       PixmapFormatRec *format;
+
+       for (format = screenInfo.formats;
+	    format->depth != display->rootDepth;
+	    format++)
+	   ;
+       v->screen_depth = format->bitsPerPixel;
+   }
+#endif
+
+   /* check for MESA_GAMMA environment variable */
+   gamma = _mesa_getenv("MESA_GAMMA");
+   if (gamma) {
+      v->RedGamma = v->GreenGamma = v->BlueGamma = 0.0;
+      sscanf( gamma, "%f %f %f", &v->RedGamma, &v->GreenGamma, &v->BlueGamma );
+      if (v->RedGamma<=0.0)    v->RedGamma = 1.0;
+      if (v->GreenGamma<=0.0)  v->GreenGamma = v->RedGamma;
+      if (v->BlueGamma<=0.0)   v->BlueGamma = v->RedGamma;
+   }
+   else {
+      v->RedGamma = v->GreenGamma = v->BlueGamma = 1.0;
+   }
+
+   v->ximage_flag = ximage_flag;
+   v->level = level;
+   v->VisualCaveat = visualCaveat;
+
+   (void) initialize_visual_and_buffer( 0, v, NULL, rgb_flag, 0, 0 );
+
+   {
+      int xclass;
+      xclass = GET_VISUAL_CLASS(v);
+      if (xclass==TrueColor || xclass==DirectColor) {
+         red_bits   = bitcount(GET_REDMASK(v));
+         green_bits = bitcount(GET_GREENMASK(v));
+         blue_bits  = bitcount(GET_BLUEMASK(v));
+         alpha_bits = 0;
+      }
+      else {
+         /* this is an approximation */
+         int depth;
+         depth = GET_VISUAL_DEPTH(v);
+         red_bits = depth / 3;
+         depth -= red_bits;
+         green_bits = depth / 2;
+         depth -= green_bits;
+         blue_bits = depth;
+         alpha_bits = 0;
+         assert( red_bits + green_bits + blue_bits == GET_VISUAL_DEPTH(v) );
+      }
+   }
+
+   if (alpha_flag && alpha_bits == 0)
+      alpha_bits = 8;
+
+   _mesa_initialize_visual( &v->mesa_visual,
+                            rgb_flag, db_flag, stereo_flag,
+                            red_bits, green_bits,
+                            blue_bits, alpha_bits,
+                            v->index_bits,
+                            depth_size,
+                            stencil_size,
+                            accum_red_size, accum_green_size,
+                            accum_blue_size, accum_alpha_size,
+                            0 );
+   return v;
+}
+
+
+void XMesaSetVisualDisplay( XMesaDisplay *dpy, XMesaVisual v )
+{
+    v->display = dpy;
+}
+
+
+void XMesaDestroyVisual( XMesaVisual v )
+{
+#ifndef XFree86Server
+   FREE(v->visinfo);
+#endif
+   FREE(v);
+}
+
+
+
+/*
+ * Create a new XMesaContext.
+ * Input:  v - XMesaVisual
+ *         share_list - another XMesaContext with which to share display
+ *                      lists or NULL if no sharing is wanted.
+ * Return:  an XMesaContext or NULL if error.
+ */
+XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list )
+{
+   static GLboolean firstTime = GL_TRUE;
+   XMesaContext c;
+   GLboolean direct = GL_TRUE; /* not really */
+   GLcontext *mesaCtx;
+
+   if (firstTime) {
+      _glthread_INIT_MUTEX(_xmesa_lock);
+      firstTime = GL_FALSE;
+   }
+
+   c = (XMesaContext) CALLOC_STRUCT(xmesa_context);
+   if (!c) {
+      return NULL;
+   }
+
+   mesaCtx = &(c->mesa);
+
+   /* Setup these pointers here since they're using for making the default
+    * and proxy texture objects.  Actually, we don't really need to do
+    * this since we're using the default fallback functions which
+    * _mesa_initialize_context() would plug in if needed.
+    */
+   mesaCtx->Driver.NewTextureObject = _mesa_new_texture_object;
+   mesaCtx->Driver.DeleteTexture = _mesa_delete_texture_object;
+
+   if (!_mesa_initialize_context(mesaCtx, &v->mesa_visual,
+                      share_list ? &(share_list->mesa) : (GLcontext *) NULL,
+                      (void *) c, direct)) {
+      FREE(c);
+      return NULL;
+   }
+
+   _mesa_enable_sw_extensions(mesaCtx);
+   _mesa_enable_1_3_extensions(mesaCtx);
+   _mesa_enable_1_4_extensions(mesaCtx);
+   _mesa_enable_1_5_extensions(mesaCtx);
+
+   if (CHECK_BYTE_ORDER(v)) {
+      c->swapbytes = GL_FALSE;
+   }
+   else {
+      c->swapbytes = GL_TRUE;
+   }
+
+   c->xm_visual = v;
+   c->xm_draw_buffer = NULL;   /* set later by XMesaMakeCurrent */
+   c->xm_read_buffer = NULL;   /* set later by XMesaMakeCurrent */
+   c->xm_buffer = NULL;   /* set later by XMesaMakeCurrent */
+   c->display = v->display;
+   c->pixelformat = v->dithered_pf;      /* Dithering is enabled by default */
+
+   mesaCtx->Driver.UpdateState = xmesa_update_state;
+
+   /* Initialize the software rasterizer and helper modules.
+    */
+   _swrast_CreateContext( mesaCtx );
+   _ac_CreateContext( mesaCtx );
+   _tnl_CreateContext( mesaCtx );
+   _swsetup_CreateContext( mesaCtx );
+
+   xmesa_register_swrast_functions( mesaCtx );
+
+   /* Set up some constant pointers:
+    */
+   xmesa_init_pointers( mesaCtx );
+
+   return c;
+}
+
+
+
+
+void XMesaDestroyContext( XMesaContext c )
+{
+   GLcontext *mesaCtx = &c->mesa;
+#ifdef FX
+   if (c->xm_draw_buffer && c->xm_buffer->FXctx)
+      fxMesaDestroyContext(c->xm_draw_buffer->FXctx);
+#endif
+   _swsetup_DestroyContext( mesaCtx );
+   _swrast_DestroyContext( mesaCtx );
+   _tnl_DestroyContext( mesaCtx );
+   _ac_DestroyContext( mesaCtx );
+   _mesa_free_context_data( mesaCtx );
+   _mesa_free( c );
+}
+
+
+
+/*
+ * XXX this isn't a public function!  It's a hack for the 3Dfx driver.
+ * Create a new XMesaBuffer from an X window.
+ * Input:  v - the XMesaVisual
+ *         w - the window
+ *         c - the context
+ * Return:  new XMesaBuffer or NULL if error
+ */
+XMesaBuffer XMesaCreateWindowBuffer2( XMesaVisual v, XMesaWindow w,
+                                      XMesaContext c )
+{
+#ifndef XFree86Server
+   XWindowAttributes attr;
+#endif
+#ifdef FX
+   char *fxEnvVar;
+#endif
+   int client = 0;
+
+   XMesaBuffer b = alloc_xmesa_buffer();
+   if (!b) {
+      return NULL;
+   }
+
+   (void) c;
+
+#ifdef XFree86Server
+   client = CLIENT_ID(((XMesaDrawable)w)->id);
+#endif
+
+   assert(v);
+
+#ifdef XFree86Server
+   if (GET_VISUAL_DEPTH(v) != ((XMesaDrawable)w)->depth) {
+#else
+   XGetWindowAttributes( v->display, w, &attr );
+
+   if (GET_VISUAL_DEPTH(v) != attr.depth) {
+#endif
+      _mesa_warning(NULL, "XMesaCreateWindowBuffer: depth mismatch between visual and window!\n");
+      return NULL;
+   }
+
+   b->xm_visual = v;
+   b->type = WINDOW;
+   b->display = v->display;
+#ifdef XFree86Server
+   b->cmap = (ColormapPtr)LookupIDByType(wColormap(w), RT_COLORMAP);
+#else
+   if (attr.colormap) {
+      b->cmap = attr.colormap;
+   }
+   else {
+      _mesa_warning(NULL, "Window %u has no colormap!\n", (unsigned int) w);
+      /* this is weird, a window w/out a colormap!? */
+      /* OK, let's just allocate a new one and hope for the best */
+      b->cmap = XCreateColormap(v->display, w, attr.visual, AllocNone);
+   }
+#endif
+
+   /* determine back buffer implementation */
+   if (v->mesa_visual.doubleBufferMode) {
+      if (v->ximage_flag) {
+	 b->db_state = BACK_XIMAGE;
+      }
+      else {
+	 b->db_state = BACK_PIXMAP;
+      }
+   }
+   else {
+      b->db_state = 0;
+   }
+
+   _mesa_initialize_framebuffer(&b->mesa_buffer,
+                                &v->mesa_visual,
+                                v->mesa_visual.depthBits > 0,
+                                v->mesa_visual.stencilBits > 0,
+                                v->mesa_visual.accumRedBits > 0,
+                                v->mesa_visual.alphaBits > 0 );
+
+   if (!initialize_visual_and_buffer( client, v, b, v->mesa_visual.rgbMode,
+                                      (XMesaDrawable)w, b->cmap )) {
+      free_xmesa_buffer(client, b);
+      return NULL;
+   }
+
+#ifdef FX
+   fxEnvVar = _mesa_getenv("MESA_GLX_FX");
+   if (fxEnvVar) {
+     if (fxEnvVar[0]!='d') {
+       int attribs[100];
+       int numAttribs = 0;
+       int hw;
+       if (v->mesa_visual.depthBits > 0) {
+	 attribs[numAttribs++] = FXMESA_DEPTH_SIZE;
+	 attribs[numAttribs++] = v->mesa_visual.depthBits;
+       }
+       if (v->mesa_visual.doubleBufferMode) {
+	 attribs[numAttribs++] = FXMESA_DOUBLEBUFFER;
+       }
+       if (v->mesa_visual.accumRedBits > 0) {
+	 attribs[numAttribs++] = FXMESA_ACCUM_SIZE;
+	 attribs[numAttribs++] = v->mesa_visual.accumRedBits;
+       }
+       if (v->mesa_visual.stencilBits > 0) {
+         attribs[numAttribs++] = FXMESA_STENCIL_SIZE;
+         attribs[numAttribs++] = v->mesa_visual.stencilBits;
+       }
+       if (v->mesa_visual.alphaBits > 0) {
+         attribs[numAttribs++] = FXMESA_ALPHA_SIZE;
+         attribs[numAttribs++] = v->mesa_visual.alphaBits;
+       }
+       if (1) {
+         attribs[numAttribs++] = FXMESA_SHARE_CONTEXT;
+         attribs[numAttribs++] = (int) &(c->mesa);
+       }
+       attribs[numAttribs++] = FXMESA_NONE;
+
+       /* [dBorca]  we should take an envvar for `fxMesaSelectCurrentBoard'!!! */
+       if ((hw = fxMesaSelectCurrentBoard(0))==GR_SSTTYPE_VOODOO) {
+         b->FXctx = fxMesaCreateBestContext(0, b->width, b->height, attribs);
+         if ((v->undithered_pf!=PF_Index) && (b->backimage)) {
+	   b->FXisHackUsable = b->FXctx ? GL_TRUE : GL_FALSE;
+	   if (fxEnvVar[0]=='w' || fxEnvVar[0]=='W')
+	     b->FXwindowHack = b->FXctx ? GL_TRUE : GL_FALSE;
+	   else
+	     b->FXwindowHack = GL_FALSE;
+         }
+       }
+       else {
+         if (fxEnvVar[0]=='w' || fxEnvVar[0]=='W')
+	   b->FXctx = fxMesaCreateContext(w, GR_RESOLUTION_NONE,
+					  GR_REFRESH_75Hz, attribs);
+         else
+	   b->FXctx = fxMesaCreateBestContext(0, b->width, b->height, attribs);
+         b->FXisHackUsable = GL_FALSE;
+         b->FXwindowHack = GL_FALSE;
+       }
+       /*
+       fprintf(stderr,
+               "voodoo %d, wid %d height %d hack: usable %d active %d\n",
+               hw, b->width, b->height, b->FXisHackUsable, b->FXwindowHack);
+       */
+     }
+   }
+   else {
+      _mesa_warning(NULL, "WARNING: This Mesa Library includes the Glide driver but\n");
+      _mesa_warning(NULL, "         you have not defined the MESA_GLX_FX env. var.\n");
+      _mesa_warning(NULL, "         (check the README.3DFX file for more information).\n\n");
+      _mesa_warning(NULL, "         you can disable this message with a 'export MESA_GLX_FX=disable'.\n");
+   }
+#endif
+
+   return b;
+}
+
+
+XMesaBuffer XMesaCreateWindowBuffer( XMesaVisual v, XMesaWindow w )
+{
+   return XMesaCreateWindowBuffer2( v, w, NULL );
+}
+
+
+/*
+ * Create a new XMesaBuffer from an X pixmap.
+ * Input:  v - the XMesaVisual
+ *         p - the pixmap
+ *         cmap - the colormap, may be 0 if using a TrueColor or DirectColor
+ *                visual for the pixmap
+ * Return:  new XMesaBuffer or NULL if error
+ */
+XMesaBuffer XMesaCreatePixmapBuffer( XMesaVisual v,
+				     XMesaPixmap p, XMesaColormap cmap )
+{
+   int client = 0;
+   XMesaBuffer b = alloc_xmesa_buffer();
+   if (!b) {
+      return NULL;
+   }
+
+
+#ifdef XFree86Server
+   client = CLIENT_ID(((XMesaDrawable)p)->id);
+#endif
+
+   assert(v);
+
+   b->xm_visual = v;
+   b->type = PIXMAP;
+   b->display = v->display;
+   b->cmap = cmap;
+
+   /* determine back buffer implementation */
+   if (v->mesa_visual.doubleBufferMode) {
+      if (v->ximage_flag) {
+	 b->db_state = BACK_XIMAGE;
+      }
+      else {
+	 b->db_state = BACK_PIXMAP;
+      }
+   }
+   else {
+      b->db_state = 0;
+   }
+
+   _mesa_initialize_framebuffer(&b->mesa_buffer,
+                                &v->mesa_visual,
+                                v->mesa_visual.depthBits > 0,
+                                v->mesa_visual.stencilBits > 0,
+                                v->mesa_visual.accumRedBits +
+                                v->mesa_visual.accumGreenBits +
+                                v->mesa_visual.accumBlueBits > 0,
+                                v->mesa_visual.alphaBits > 0 );
+
+   if (!initialize_visual_and_buffer(client, v, b, v->mesa_visual.rgbMode,
+				     (XMesaDrawable)p, cmap)) {
+      free_xmesa_buffer(client, b);
+      return NULL;
+   }
+
+   return b;
+}
+
+
+
+XMesaBuffer XMesaCreatePBuffer( XMesaVisual v, XMesaColormap cmap,
+                                unsigned int width, unsigned int height )
+{
+#ifdef XFree86Server
+   return 0;
+#else
+   int client = 0;
+   XMesaWindow root;
+   XMesaDrawable drawable;  /* X Pixmap Drawable */
+   XMesaBuffer b = alloc_xmesa_buffer();
+   if (!b) {
+      return NULL;
+   }
+
+   b->xm_visual = v;
+   b->type = PBUFFER;
+   b->display = v->display;
+   b->cmap = cmap;
+
+   /* allocate pixmap for front buffer */
+   root = RootWindow( v->display, v->visinfo->screen );
+   drawable = XCreatePixmap( v->display, root, width, height, v->visinfo->depth );
+
+   /* determine back buffer implementation */
+   if (v->mesa_visual.doubleBufferMode) {
+      if (v->ximage_flag) {
+	 b->db_state = BACK_XIMAGE;
+      }
+      else {
+	 b->db_state = BACK_PIXMAP;
+      }
+   }
+   else {
+      b->db_state = 0;
+   }
+
+   _mesa_initialize_framebuffer(&b->mesa_buffer,
+                                &v->mesa_visual,
+                                v->mesa_visual.depthBits > 0,
+                                v->mesa_visual.stencilBits > 0,
+                                v->mesa_visual.accumRedBits +
+                                v->mesa_visual.accumGreenBits +
+                                v->mesa_visual.accumBlueBits > 0,
+                                v->mesa_visual.alphaBits > 0 );
+
+   if (!initialize_visual_and_buffer(client, v, b, v->mesa_visual.rgbMode,
+				     drawable, cmap)) {
+      free_xmesa_buffer(client, b);
+      return NULL;
+   }
+
+   return b;
+#endif
+}
+
+
+
+/*
+ * Deallocate an XMesaBuffer structure and all related info.
+ */
+void XMesaDestroyBuffer( XMesaBuffer b )
+{
+   int client = 0;
+
+#ifdef XFree86Server
+   if (b->frontbuffer)
+       client = CLIENT_ID(b->frontbuffer->id);
+#endif
+
+   if (b->gc)  XMesaFreeGC( b->xm_visual->display, b->gc );
+   if (b->cleargc)  XMesaFreeGC( b->xm_visual->display, b->cleargc );
+   if (b->swapgc)  XMesaFreeGC( b->xm_visual->display, b->swapgc );
+
+   if (b->backimage) {
+#if defined(USE_XSHM) && !defined(XFree86Server)
+       if (b->shm) {
+	   XShmDetach( b->xm_visual->display, &b->shminfo );
+	   XDestroyImage( b->backimage );
+	   shmdt( b->shminfo.shmaddr );
+       }
+       else
+#endif
+	   XMesaDestroyImage( b->backimage );
+   }
+   if (b->backpixmap) {
+      XMesaFreePixmap( b->xm_visual->display, b->backpixmap );
+      if (b->xm_visual->hpcr_clear_flag) {
+	XMesaFreePixmap( b->xm_visual->display,
+			 b->xm_visual->hpcr_clear_pixmap );
+	XMesaDestroyImage( b->xm_visual->hpcr_clear_ximage );
+      }
+   }
+   if (b->rowimage) {
+      FREE( b->rowimage->data );
+      b->rowimage->data = NULL;
+      XMesaDestroyImage( b->rowimage );
+   }
+
+   free_xmesa_buffer(client, b);
+}
+
+
+
+/*
+ * Bind buffer b to context c and make c the current rendering context.
+ */
+GLboolean XMesaMakeCurrent( XMesaContext c, XMesaBuffer b )
+{
+   return XMesaMakeCurrent2( c, b, b );
+}
+
+
+/*
+ * Bind buffer b to context c and make c the current rendering context.
+ */
+GLboolean XMesaMakeCurrent2( XMesaContext c, XMesaBuffer drawBuffer,
+                             XMesaBuffer readBuffer )
+{
+   if (c) {
+      if (!drawBuffer || !readBuffer)
+         return GL_FALSE;  /* must specify buffers! */
+
+#ifdef FX
+      if (drawBuffer->FXctx) {
+         fxMesaMakeCurrent(drawBuffer->FXctx);
+
+         c->xm_draw_buffer = drawBuffer;
+         c->xm_read_buffer = readBuffer;
+         c->xm_buffer = drawBuffer;
+
+         return GL_TRUE;
+      }
+#endif
+      if (&(c->mesa) == _mesa_get_current_context()
+          && c->xm_draw_buffer == drawBuffer
+          && c->xm_read_buffer == readBuffer
+          && c->xm_draw_buffer->wasCurrent) {
+         /* same context and buffer, do nothing */
+         return GL_TRUE;
+      }
+
+      c->xm_draw_buffer = drawBuffer;
+      c->xm_read_buffer = readBuffer;
+      c->xm_buffer = drawBuffer;
+
+      _mesa_make_current2(&(c->mesa),
+                          &drawBuffer->mesa_buffer,
+                          &readBuffer->mesa_buffer);
+
+      if (c->mesa.Viewport.Width == 0) {
+	 /* initialize viewport to window size */
+	 _mesa_Viewport( 0, 0, drawBuffer->width, drawBuffer->height );
+	 c->mesa.Scissor.Width = drawBuffer->width;
+	 c->mesa.Scissor.Height = drawBuffer->height;
+      }
+
+      if (c->xm_visual->mesa_visual.rgbMode) {
+         /*
+          * Must recompute and set these pixel values because colormap
+          * can be different for different windows.
+          */
+         c->clearpixel = xmesa_color_to_pixel( c,
+                                               c->clearcolor[0],
+                                               c->clearcolor[1],
+                                               c->clearcolor[2],
+                                               c->clearcolor[3],
+                                               c->xm_visual->undithered_pf);
+         XMesaSetForeground(c->display, c->xm_draw_buffer->cleargc, c->clearpixel);
+      }
+
+      /* Solution to Stephane Rehel's problem with glXReleaseBuffersMESA(): */
+      c->xm_draw_buffer->wasCurrent = GL_TRUE;
+   }
+   else {
+      /* Detach */
+      _mesa_make_current2( NULL, NULL, NULL );
+   }
+   return GL_TRUE;
+}
+
+
+/*
+ * Unbind the context c from its buffer.
+ */
+GLboolean XMesaUnbindContext( XMesaContext c )
+{
+   /* A no-op for XFree86 integration purposes */
+   return GL_TRUE;
+}
+
+
+XMesaContext XMesaGetCurrentContext( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (ctx) {
+      XMesaContext xmesa = XMESA_CONTEXT(ctx);
+      return xmesa;
+   }
+   else {
+      return 0;
+   }
+}
+
+
+XMesaBuffer XMesaGetCurrentBuffer( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (ctx) {
+      XMesaContext xmesa = XMESA_CONTEXT(ctx);
+      return xmesa->xm_draw_buffer;
+   }
+   else {
+      return 0;
+   }
+}
+
+
+/* New in Mesa 3.1 */
+XMesaBuffer XMesaGetCurrentReadBuffer( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (ctx) {
+      XMesaContext xmesa = XMESA_CONTEXT(ctx);
+      return xmesa->xm_read_buffer;
+   }
+   else {
+      return 0;
+   }
+}
+
+
+GLboolean XMesaForceCurrent(XMesaContext c)
+{
+   if (c) {
+      if (&(c->mesa) != _mesa_get_current_context()) {
+	 _mesa_make_current(&(c->mesa), &c->xm_draw_buffer->mesa_buffer);
+      }
+   }
+   else {
+      _mesa_make_current(NULL, NULL);
+   }
+   return GL_TRUE;
+}
+
+
+GLboolean XMesaLoseCurrent(XMesaContext c)
+{
+   (void) c;
+   _mesa_make_current(NULL, NULL);
+   return GL_TRUE;
+}
+
+
+/*
+ * Switch 3Dfx support hack between window and full-screen mode.
+ */
+GLboolean XMesaSetFXmode( GLint mode )
+{
+#ifdef FX
+   const char *fx = _mesa_getenv("MESA_GLX_FX");
+   if (fx && fx[0] != 'd') {
+      GET_CURRENT_CONTEXT(ctx);
+      GrHwConfiguration hw;
+      if (!FX_grSstQueryHardware(&hw)) {
+         /*fprintf(stderr, "!grSstQueryHardware\n");*/
+         return GL_FALSE;
+      }
+      if (hw.num_sst < 1) {
+         /*fprintf(stderr, "hw.num_sst < 1\n");*/
+         return GL_FALSE;
+      }
+      if (ctx) {
+         XMesaContext xmesa = XMESA_CONTEXT(ctx);
+         if (mode == XMESA_FX_WINDOW) {
+	    if (xmesa->xm_draw_buffer->FXisHackUsable) {
+	       FX_grSstControl(GR_CONTROL_DEACTIVATE);
+	       xmesa->xm_draw_buffer->FXwindowHack = GL_TRUE;
+	       return GL_TRUE;
+	    }
+	 }
+	 else if (mode == XMESA_FX_FULLSCREEN) {
+	    FX_grSstControl(GR_CONTROL_ACTIVATE);
+	    xmesa->xm_draw_buffer->FXwindowHack = GL_FALSE;
+	    return GL_TRUE;
+	 }
+	 else {
+	    /* Error: Bad mode value */
+	 }
+      }
+   }
+   /*fprintf(stderr, "fallthrough\n");*/
+#else
+   (void) mode;
+#endif
+   return GL_FALSE;
+}
+
+
+
+#ifdef FX
+/*
+ * Read image from VooDoo frame buffer into X/Mesa's back XImage.
+ */
+static void FXgetImage( XMesaBuffer b )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   static unsigned short pixbuf[MAX_WIDTH];
+   GLuint x, y;
+   int xpos, ypos;
+   XMesaWindow root;
+   unsigned int bw, depth, width, height;
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);
+
+#ifdef XFree86Server
+   x = b->frontbuffer->x;
+   y = b->frontbuffer->y;
+   width = b->frontbuffer->width;
+   height = b->frontbuffer->height;
+   depth = b->frontbuffer->depth;
+#else
+   XGetGeometry( b->xm_visual->display, b->frontbuffer,
+                 &root, &xpos, &ypos, &width, &height, &bw, &depth);
+#endif
+   if (b->width != width || b->height != height) {
+      b->width = MIN2((int)width, b->FXctx->width);
+      b->height = MIN2((int)height, b->FXctx->height);
+      if (b->width & 1)
+         b->width--;  /* prevent odd width */
+      xmesa_alloc_back_buffer( b );
+   }
+
+   /* [dBorca]
+    * not needed for Voodoo2 anymore.
+    * should we test fxMesa->bgrOrder?
+    */
+   /* grLfbWriteColorFormat(GR_COLORFORMAT_ARGB); */
+   if (b->xm_visual->undithered_pf==PF_5R6G5B) {
+      /* Special case: 16bpp RGB */
+      grLfbReadRegion( GR_BUFFER_FRONTBUFFER,       /* src buffer */
+                       0, b->FXctx->height - b->height,  /*pos*/
+                       b->width, b->height,         /* size */
+                       b->width * sizeof(GLushort), /* stride */
+                       b->backimage->data);         /* dest buffer */
+   }
+   else if (b->xm_visual->dithered_pf==PF_Dither
+	    && GET_VISUAL_DEPTH(b->xm_visual)==8) {
+      /* Special case: 8bpp RGB */
+      for (y=0;y<b->height;y++) {
+         GLubyte *ptr = (GLubyte*) b->backimage->data
+                        + b->backimage->bytes_per_line * y;
+         XDITHER_SETUP(y);
+
+         /* read row from 3Dfx frame buffer */
+         grLfbReadRegion( GR_BUFFER_FRONTBUFFER,
+                          0, b->FXctx->height-(b->height-y),
+                          b->width, 1,
+                          0,
+                          pixbuf );
+
+         /* write to XImage back buffer */
+         for (x=0;x<b->width;x++) {
+            GLubyte r = (pixbuf[x] & 0xf800) >> 8;
+            GLubyte g = (pixbuf[x] & 0x07e0) >> 3;
+            GLubyte b = (pixbuf[x] & 0x001f) << 3;
+            *ptr++ = XDITHER( x, r, g, b);
+         }
+      }
+   }
+   else {
+      /* General case: slow! */
+      for (y=0;y<b->height;y++) {
+         /* read row from 3Dfx frame buffer */
+         grLfbReadRegion( GR_BUFFER_FRONTBUFFER,
+                          0, b->FXctx->height-(b->height-y),
+                          b->width, 1,
+                          0,
+                          pixbuf );
+
+         /* write to XImage back buffer */
+         for (x=0;x<b->width;x++) {
+            XMesaPutPixel(b->backimage,x,y,
+			  xmesa_color_to_pixel(xmesa,
+					       (pixbuf[x] & 0xf800) >> 8,
+					       (pixbuf[x] & 0x07e0) >> 3,
+					       (pixbuf[x] & 0x001f) << 3,
+					       0xff,
+                                               b->xm_visual->undithered_pf));
+         }
+      }
+   }
+   /* grLfbWriteColorFormat(GR_COLORFORMAT_ABGR); */
+}
+#endif
+
+
+/*
+ * Copy the back buffer to the front buffer.  If there's no back buffer
+ * this is a no-op.
+ */
+void XMesaSwapBuffers( XMesaBuffer b )
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   /* If we're swapping the buffer associated with the current context
+    * we have to flush any pending rendering commands first.
+    */
+   if (ctx && ctx->DrawBuffer == &(b->mesa_buffer))
+      _mesa_notifySwapBuffers(ctx);
+
+   if (b->db_state) {
+#ifdef FX
+      if (b->FXctx) {
+         fxMesaSwapBuffers();
+
+         if (b->FXwindowHack)
+            FXgetImage(b);
+         else
+            return;
+      }
+#endif
+     if (b->backimage) {
+	 /* Copy Ximage from host's memory to server's window */
+#if defined(USE_XSHM) && !defined(XFree86Server)
+	 if (b->shm) {
+            /*_glthread_LOCK_MUTEX(_xmesa_lock);*/
+	    XShmPutImage( b->xm_visual->display, b->frontbuffer,
+			  b->swapgc,
+			  b->backimage, 0, 0,
+			  0, 0, b->width, b->height, False );
+            /*_glthread_UNLOCK_MUTEX(_xmesa_lock);*/
+	 }
+	 else
+#endif
+         {
+            /*_glthread_LOCK_MUTEX(_xmesa_lock);*/
+            XMesaPutImage( b->xm_visual->display, b->frontbuffer,
+			   b->swapgc,
+			   b->backimage, 0, 0,
+			   0, 0, b->width, b->height );
+            /*_glthread_UNLOCK_MUTEX(_xmesa_lock);*/
+         }
+      }
+      else {
+	 /* Copy pixmap to window on server */
+         /*_glthread_LOCK_MUTEX(_xmesa_lock);*/
+	 XMesaCopyArea( b->xm_visual->display,
+			b->backpixmap,   /* source drawable */
+			b->frontbuffer,  /* dest. drawable */
+			b->swapgc,
+			0, 0, b->width, b->height,  /* source region */
+			0, 0                 /* dest region */
+		      );
+         /*_glthread_UNLOCK_MUTEX(_xmesa_lock);*/
+      }
+   }
+#if !defined(XFree86Server)
+   XSync( b->xm_visual->display, False );
+#endif
+}
+
+
+
+/*
+ * Copy sub-region of back buffer to front buffer
+ */
+void XMesaCopySubBuffer( XMesaBuffer b, int x, int y, int width, int height )
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   /* If we're swapping the buffer associated with the current context
+    * we have to flush any pending rendering commands first.
+    */
+   if (ctx && ctx->DrawBuffer == &(b->mesa_buffer))
+      _mesa_notifySwapBuffers(ctx);
+
+   if (b->db_state) {
+      int yTop = b->height - y - height;
+#ifdef FX
+      if (b->FXctx) {
+         fxMesaSwapBuffers();
+         if (b->FXwindowHack)
+            FXgetImage(b);
+         else
+            return;
+      }
+#endif
+      if (b->backimage) {
+         /* Copy Ximage from host's memory to server's window */
+#if defined(USE_XSHM) && !defined(XFree86Server)
+         if (b->shm) {
+            /* XXX assuming width and height aren't too large! */
+            XShmPutImage( b->xm_visual->display, b->frontbuffer,
+                          b->swapgc,
+                          b->backimage, x, yTop,
+                          x, yTop, width, height, False );
+            /* wait for finished event??? */
+         }
+         else
+#endif
+         {
+            /* XXX assuming width and height aren't too large! */
+            XMesaPutImage( b->xm_visual->display, b->frontbuffer,
+			   b->swapgc,
+			   b->backimage, x, yTop,
+			   x, yTop, width, height );
+         }
+      }
+      else {
+         /* Copy pixmap to window on server */
+         XMesaCopyArea( b->xm_visual->display,
+			b->backpixmap,           /* source drawable */
+			b->frontbuffer,          /* dest. drawable */
+			b->swapgc,
+			x, yTop, width, height,  /* source region */
+			x, yTop                  /* dest region */
+                      );
+      }
+   }
+}
+
+
+/*
+ * Return a pointer to the XMesa backbuffer Pixmap or XImage.  This function
+ * is a way to get "under the hood" of X/Mesa so one can manipulate the
+ * back buffer directly.
+ * Output:  pixmap - pointer to back buffer's Pixmap, or 0
+ *          ximage - pointer to back buffer's XImage, or NULL
+ * Return:  GL_TRUE = context is double buffered
+ *          GL_FALSE = context is single buffered
+ */
+GLboolean XMesaGetBackBuffer( XMesaBuffer b,
+                              XMesaPixmap *pixmap,
+                              XMesaImage **ximage )
+{
+   if (b->db_state) {
+      if (pixmap)  *pixmap = b->backpixmap;
+      if (ximage)  *ximage = b->backimage;
+      return GL_TRUE;
+   }
+   else {
+      *pixmap = 0;
+      *ximage = NULL;
+      return GL_FALSE;
+   }
+}
+
+
+/*
+ * Return the depth buffer associated with an XMesaBuffer.
+ * Input:  b - the XMesa buffer handle
+ * Output:  width, height - size of buffer in pixels
+ *          bytesPerValue - bytes per depth value (2 or 4)
+ *          buffer - pointer to depth buffer values
+ * Return:  GL_TRUE or GL_FALSE to indicate success or failure.
+ */
+GLboolean XMesaGetDepthBuffer( XMesaBuffer b, GLint *width, GLint *height,
+                               GLint *bytesPerValue, void **buffer )
+{
+   if (!b->mesa_buffer.DepthBuffer) {
+      *width = 0;
+      *height = 0;
+      *bytesPerValue = 0;
+      *buffer = 0;
+      return GL_FALSE;
+   }
+   else {
+      *width = b->mesa_buffer.Width;
+      *height = b->mesa_buffer.Height;
+      *bytesPerValue = sizeof(GLdepth);
+      *buffer = b->mesa_buffer.DepthBuffer;
+      return GL_TRUE;
+   }
+}
+
+
+void XMesaFlush( XMesaContext c )
+{
+   if (c && c->xm_visual) {
+#ifdef XFree86Server
+      /* NOT_NEEDED */
+#else
+      XSync( c->xm_visual->display, False );
+#endif
+   }
+}
+
+
+
+const char *XMesaGetString( XMesaContext c, int name )
+{
+   (void) c;
+   if (name==XMESA_VERSION) {
+      return "5.0";
+   }
+   else if (name==XMESA_EXTENSIONS) {
+      return "";
+   }
+   else {
+      return NULL;
+   }
+}
+
+
+
+XMesaBuffer XMesaFindBuffer( XMesaDisplay *dpy, XMesaDrawable d )
+{
+   XMesaBuffer b;
+   for (b=XMesaBufferList; b; b=b->Next) {
+      if (b->frontbuffer==d && b->display==dpy) {
+         return b;
+      }
+   }
+   return NULL;
+}
+
+
+
+/*
+ * Look for XMesaBuffers whose X window has been destroyed.
+ * Deallocate any such XMesaBuffers.
+ */
+void XMesaGarbageCollect( void )
+{
+   XMesaBuffer b, next;
+   for (b=XMesaBufferList; b; b=next) {
+      next = b->Next;
+      if (b->display && b->frontbuffer && b->type == WINDOW) {
+#ifdef XFree86Server
+	 /* NOT_NEEDED */
+#else
+         XSync(b->display, False);
+         if (!window_exists( b->display, b->frontbuffer )) {
+            /* found a dead window, free the ancillary info */
+            XMesaDestroyBuffer( b );
+         }
+#endif
+      }
+   }
+}
+
+
+void XMesaReset( void )
+{
+    while (XMesaBufferList)
+	XMesaDestroyBuffer(XMesaBufferList);
+
+    XMesaBufferList = NULL;
+}
+
+
+unsigned long XMesaDitherColor( XMesaContext xmesa, GLint x, GLint y,
+                                GLfloat red, GLfloat green,
+                                GLfloat blue, GLfloat alpha )
+{
+   GLint r = (GLint) (red   * 255.0F);
+   GLint g = (GLint) (green * 255.0F);
+   GLint b = (GLint) (blue  * 255.0F);
+   GLint a = (GLint) (alpha * 255.0F);
+
+   (void) DitherValues; /* silence warning */
+
+   switch (xmesa->pixelformat) {
+      case PF_Index:
+         return 0;
+      case PF_Truecolor:
+         {
+            unsigned long p;
+            PACK_TRUECOLOR( p, r, g, b );
+            return p;
+         }
+      case PF_8A8B8G8R:
+         return PACK_8A8B8G8R( r, g, b, a );
+      case PF_8R8G8B:
+         return PACK_8R8G8B( r, g, b );
+      case PF_5R6G5B:
+         return PACK_5R6G5B( r, g, b );
+      case PF_Dither:
+         {
+            DITHER_SETUP;
+            return DITHER( x, y, r, g, b );
+         }
+      case PF_1Bit:
+         /* 382 = (3*255)/2 */
+         return ((r+g+b) > 382) ^ xmesa->xm_visual->bitFlip;
+      case PF_HPCR:
+         return DITHER_HPCR(x, y, r, g, b);
+      case PF_Lookup:
+         {
+            LOOKUP_SETUP;
+            return LOOKUP( r, g, b );
+         }
+      case PF_Grayscale:
+         return GRAY_RGB( r, g, b );
+      case PF_Dither_5R6G5B:
+         /* fall through */
+      case PF_Dither_True:
+         {
+            unsigned long p;
+            PACK_TRUEDITHER(p, x, y, r, g, b);
+            return p;
+         }
+      default:
+         _mesa_problem(NULL, "Bad pixel format in XMesaDitherColor");
+   }
+   return 0;
+}
+
+
+/*
+ * This is typically called when the window size changes and we need
+ * to reallocate the buffer's back/depth/stencil/accum buffers.
+ */
+void XMesaResizeBuffers( XMesaBuffer b )
+{
+   xmesa_resize_buffers( &(b->mesa_buffer) );
+
+}
+
diff --git a/reactos/lib/mesa32/src/drivers/x11/xm_dd.c b/reactos/lib/mesa32/src/drivers/x11/xm_dd.c
new file mode 100644
index 00000000000..8dd7f9f90a2
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/x11/xm_dd.c
@@ -0,0 +1,1231 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glxheader.h"
+#include "bufferobj.h"
+#include "context.h"
+#include "colormac.h"
+#include "depth.h"
+#include "drawpix.h"
+#include "extensions.h"
+#include "macros.h"
+#include "imports.h"
+#include "mtypes.h"
+#include "state.h"
+#include "texobj.h"
+#include "teximage.h"
+#include "texstore.h"
+#include "texformat.h"
+#include "xmesaP.h"
+#include "array_cache/acache.h"
+#include "swrast/swrast.h"
+#include "swrast/s_context.h"
+#include "swrast/s_drawpix.h"
+#include "swrast/s_alphabuf.h"
+#include "swrast_setup/swrast_setup.h"
+#include "tnl/tnl.h"
+#include "tnl/t_context.h"
+#include "tnl/t_pipeline.h"
+
+
+/*
+ * Return the size (width, height) of the X window for the given GLframebuffer.
+ * Output:  width - width of buffer in pixels.
+ *          height - height of buffer in pixels.
+ */
+static void
+get_buffer_size( GLframebuffer *buffer, GLuint *width, GLuint *height )
+{
+   /* We can do this cast because the first field in the XMesaBuffer
+    * struct is a GLframebuffer struct.  If this weren't true, we'd
+    * need a pointer from the GLframebuffer to the XMesaBuffer.
+    */
+   const XMesaBuffer xmBuffer = (XMesaBuffer) buffer;
+   unsigned int winwidth, winheight;
+#ifdef XFree86Server
+   /* XFree86 GLX renderer */
+   if (xmBuffer->frontbuffer->width > MAX_WIDTH ||
+       xmBuffer->frontbuffer->height > MAX_HEIGHT) {
+     winwidth = buffer->Width;
+     winheight = buffer->Height;
+   } else {
+     winwidth = xmBuffer->frontbuffer->width;
+     winheight = xmBuffer->frontbuffer->height;
+   }
+#else
+   Window root;
+   int winx, winy;
+   unsigned int bw, d;
+
+   _glthread_LOCK_MUTEX(_xmesa_lock);
+   XSync(xmBuffer->xm_visual->display, 0); /* added for Chromium */
+   XGetGeometry( xmBuffer->xm_visual->display, xmBuffer->frontbuffer, &root,
+		 &winx, &winy, &winwidth, &winheight, &bw, &d );
+   _glthread_UNLOCK_MUTEX(_xmesa_lock);
+#endif
+
+   (void)kernel8;		/* Muffle compiler */
+
+   *width = winwidth;
+   *height = winheight;
+}
+
+
+static void
+finish_or_flush( GLcontext *ctx )
+{
+#ifdef XFree86Server
+      /* NOT_NEEDED */
+#else
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   if (xmesa) {
+      _glthread_LOCK_MUTEX(_xmesa_lock);
+      XSync( xmesa->display, False );
+      _glthread_UNLOCK_MUTEX(_xmesa_lock);
+   }
+#endif
+}
+
+
+
+/*
+ * This chooses the color buffer for reading and writing spans, points,
+ * lines, and triangles.
+ */
+static void
+set_buffer( GLcontext *ctx, GLframebuffer *buffer, GLuint bufferBit )
+{
+   /* We can make this cast since the XMesaBuffer wraps GLframebuffer.
+    * GLframebuffer is the first member in a XMesaBuffer struct.
+    */
+   XMesaBuffer target = (XMesaBuffer) buffer;
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+
+   /* This assignment tells the span/point/line/triangle functions
+    * which XMesaBuffer to use.
+    */
+   xmesa->xm_buffer = target;
+
+   /*
+    * Now determine front vs back color buffer.
+    */
+   if (bufferBit == FRONT_LEFT_BIT) {
+      target->buffer = target->frontbuffer;
+   }
+   else if (bufferBit == BACK_LEFT_BIT) {
+      ASSERT(target->db_state);
+      if (target->backpixmap) {
+         /* back buffer is a pixmap */
+         target->buffer = (XMesaDrawable) target->backpixmap;
+      }
+      else if (target->backimage) {
+         /* back buffer is an XImage */
+         target->buffer = None;
+      }
+      else {
+         /* No back buffer!!!!  Must be out of memory, use front buffer */
+         target->buffer = target->frontbuffer;
+      }
+   }
+   else {
+      _mesa_problem(ctx, "invalid buffer 0x%x in set_buffer() in xm_dd.c");
+      return;
+   }
+   xmesa_update_span_funcs(ctx);
+}
+
+
+
+static void
+clear_index( GLcontext *ctx, GLuint index )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   xmesa->clearpixel = (unsigned long) index;
+   XMesaSetForeground( xmesa->display, xmesa->xm_draw_buffer->cleargc,
+                       (unsigned long) index );
+}
+
+
+static void
+clear_color( GLcontext *ctx, const GLfloat color[4] )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   CLAMPED_FLOAT_TO_UBYTE(xmesa->clearcolor[0], color[0]);
+   CLAMPED_FLOAT_TO_UBYTE(xmesa->clearcolor[1], color[1]);
+   CLAMPED_FLOAT_TO_UBYTE(xmesa->clearcolor[2], color[2]);
+   CLAMPED_FLOAT_TO_UBYTE(xmesa->clearcolor[3], color[3]);
+   xmesa->clearpixel = xmesa_color_to_pixel( xmesa,
+                                             xmesa->clearcolor[0],
+                                             xmesa->clearcolor[1],
+                                             xmesa->clearcolor[2],
+                                             xmesa->clearcolor[3],
+                                             xmesa->xm_visual->undithered_pf );
+   _glthread_LOCK_MUTEX(_xmesa_lock);
+   XMesaSetForeground( xmesa->display, xmesa->xm_draw_buffer->cleargc,
+                       xmesa->clearpixel );
+   _glthread_UNLOCK_MUTEX(_xmesa_lock);
+}
+
+
+
+/* Set index mask ala glIndexMask */
+static void
+index_mask( GLcontext *ctx, GLuint mask )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   if (xmesa->xm_draw_buffer->buffer != XIMAGE) {
+      unsigned long m;
+      if (mask==0xffffffff) {
+	 m = ((unsigned long)~0L);
+      }
+      else {
+         m = (unsigned long) mask;
+      }
+      XMesaSetPlaneMask( xmesa->display, xmesa->xm_draw_buffer->cleargc, m );
+      XMesaSetPlaneMask( xmesa->display, xmesa->xm_draw_buffer->gc, m );
+   }
+}
+
+
+/* Implements glColorMask() */
+static void
+color_mask(GLcontext *ctx,
+           GLboolean rmask, GLboolean gmask, GLboolean bmask, GLboolean amask)
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   int xclass = GET_VISUAL_CLASS(xmesa->xm_visual);
+   (void) amask;
+
+   if (xclass == TrueColor || xclass == DirectColor) {
+      unsigned long m;
+      if (rmask && gmask && bmask) {
+         m = ((unsigned long)~0L);
+      }
+      else {
+         m = 0;
+         if (rmask)   m |= GET_REDMASK(xmesa->xm_visual);
+         if (gmask)   m |= GET_GREENMASK(xmesa->xm_visual);
+         if (bmask)   m |= GET_BLUEMASK(xmesa->xm_visual);
+      }
+      XMesaSetPlaneMask( xmesa->display, xmesa->xm_draw_buffer->cleargc, m );
+      XMesaSetPlaneMask( xmesa->display, xmesa->xm_draw_buffer->gc, m );
+   }
+}
+
+
+
+/**********************************************************************/
+/*** glClear implementations                                        ***/
+/**********************************************************************/
+
+
+static void
+clear_front_pixmap( GLcontext *ctx, GLboolean all,
+                    GLint x, GLint y, GLint width, GLint height )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   if (all) {
+      XMesaFillRectangle( xmesa->display, xmesa->xm_draw_buffer->frontbuffer,
+                          xmesa->xm_draw_buffer->cleargc,
+                          0, 0,
+                          xmesa->xm_draw_buffer->width+1,
+                          xmesa->xm_draw_buffer->height+1 );
+   }
+   else {
+      XMesaFillRectangle( xmesa->display, xmesa->xm_draw_buffer->frontbuffer,
+                          xmesa->xm_draw_buffer->cleargc,
+                          x, xmesa->xm_draw_buffer->height - y - height,
+                          width, height );
+   }
+}
+
+
+static void
+clear_back_pixmap( GLcontext *ctx, GLboolean all,
+                   GLint x, GLint y, GLint width, GLint height )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   if (all) {
+      XMesaFillRectangle( xmesa->display, xmesa->xm_draw_buffer->backpixmap,
+                          xmesa->xm_draw_buffer->cleargc,
+                          0, 0,
+                          xmesa->xm_draw_buffer->width+1,
+                          xmesa->xm_draw_buffer->height+1 );
+   }
+   else {
+      XMesaFillRectangle( xmesa->display, xmesa->xm_draw_buffer->backpixmap,
+                          xmesa->xm_draw_buffer->cleargc,
+                          x, xmesa->xm_draw_buffer->height - y - height,
+                          width, height );
+   }
+}
+
+
+static void
+clear_8bit_ximage( GLcontext *ctx, GLboolean all,
+                   GLint x, GLint y, GLint width, GLint height )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   if (all) {
+      size_t n = xmesa->xm_draw_buffer->backimage->bytes_per_line
+         * xmesa->xm_draw_buffer->backimage->height;
+      MEMSET( xmesa->xm_draw_buffer->backimage->data, xmesa->clearpixel, n );
+   }
+   else {
+      GLint i;
+      for (i=0;i<height;i++) {
+         GLubyte *ptr = PIXELADDR1( xmesa->xm_draw_buffer, x, y+i );
+         MEMSET( ptr, xmesa->clearpixel, width );
+      }
+   }
+}
+
+
+static void
+clear_HPCR_ximage( GLcontext *ctx, GLboolean all,
+                   GLint x, GLint y, GLint width, GLint height )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   if (all) {
+      GLint i, c16 = (xmesa->xm_draw_buffer->backimage->bytes_per_line>>4)<<4;
+      GLubyte *ptr  = (GLubyte *)xmesa->xm_draw_buffer->backimage->data;
+      for (i=0; i<xmesa->xm_draw_buffer->backimage->height; i++) {
+         GLint j;
+         GLubyte *sptr = xmesa->xm_visual->hpcr_clear_ximage_pattern[0];
+         if (i&1) {
+            sptr += 16;
+         }
+         for (j=0; j<c16; j+=16) {
+            ptr[0] = sptr[0];
+            ptr[1] = sptr[1];
+            ptr[2] = sptr[2];
+            ptr[3] = sptr[3];
+            ptr[4] = sptr[4];
+            ptr[5] = sptr[5];
+            ptr[6] = sptr[6];
+            ptr[7] = sptr[7];
+            ptr[8] = sptr[8];
+            ptr[9] = sptr[9];
+            ptr[10] = sptr[10];
+            ptr[11] = sptr[11];
+            ptr[12] = sptr[12];
+            ptr[13] = sptr[13];
+            ptr[14] = sptr[14];
+            ptr[15] = sptr[15];
+            ptr += 16;
+         }
+         for (; j<xmesa->xm_draw_buffer->backimage->bytes_per_line; j++) {
+            *ptr = sptr[j&15];
+            ptr++;
+         }
+      }
+   }
+   else {
+      GLint i;
+      for (i=y; i<y+height; i++) {
+         GLubyte *ptr = PIXELADDR1( xmesa->xm_draw_buffer, x, i );
+         int j;
+         GLubyte *sptr = xmesa->xm_visual->hpcr_clear_ximage_pattern[0];
+         if (i&1) {
+            sptr += 16;
+         }
+         for (j=x; j<x+width; j++) {
+            *ptr = sptr[j&15];
+            ptr++;
+         }
+      }
+   }
+}
+
+
+static void
+clear_16bit_ximage( GLcontext *ctx, GLboolean all,
+                    GLint x, GLint y, GLint width, GLint height )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint pixel = (GLuint) xmesa->clearpixel;
+   if (xmesa->swapbytes) {
+      pixel = ((pixel >> 8) & 0x00ff) | ((pixel << 8) & 0xff00);
+   }
+   if (all) {
+      register GLuint n;
+      register GLuint *ptr4 = (GLuint *) xmesa->xm_draw_buffer->backimage->data;
+      if ((pixel & 0xff) == ((pixel >> 8) & 0xff)) {
+         /* low and high bytes are equal so use memset() */
+         n = xmesa->xm_draw_buffer->backimage->bytes_per_line
+            * xmesa->xm_draw_buffer->height;
+         MEMSET( ptr4, pixel & 0xff, n );
+      }
+      else {
+         pixel = pixel | (pixel<<16);
+         n = xmesa->xm_draw_buffer->backimage->bytes_per_line
+            * xmesa->xm_draw_buffer->height / 4;
+         do {
+            *ptr4++ = pixel;
+               n--;
+         } while (n!=0);
+
+         if ((xmesa->xm_draw_buffer->backimage->bytes_per_line *
+              xmesa->xm_draw_buffer->height) & 0x2)
+            *(GLushort *)ptr4 = pixel & 0xffff;
+      }
+   }
+   else {
+      register int i, j;
+      for (j=0;j<height;j++) {
+         register GLushort *ptr2 = PIXELADDR2( xmesa->xm_draw_buffer, x, y+j );
+         for (i=0;i<width;i++) {
+            *ptr2++ = pixel;
+         }
+      }
+   }
+}
+
+
+/* Optimized code provided by Nozomi Ytow <noz@xfree86.org> */
+static void
+clear_24bit_ximage( GLcontext *ctx, GLboolean all,
+                    GLint x, GLint y, GLint width, GLint height )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   const GLubyte r = xmesa->clearcolor[0];
+   const GLubyte g = xmesa->clearcolor[1];
+   const GLubyte b = xmesa->clearcolor[2];
+#if 0	/* See below */
+   register GLuint clearPixel;
+   if (xmesa->swapbytes) {
+      clearPixel = (b << 16) | (g << 8) | r;
+   }
+   else {
+      clearPixel = (r << 16) | (g << 8) | b;
+   }
+#endif
+
+   if (all) {
+      if (r==g && g==b) {
+         /* same value for all three components (gray) */
+         const GLint w3 = xmesa->xm_draw_buffer->width * 3;
+         const GLint h = xmesa->xm_draw_buffer->height;
+         GLint i;
+         for (i = 0; i < h; i++) {
+            bgr_t *ptr3 = PIXELADDR3(xmesa->xm_draw_buffer, 0, i);
+            MEMSET(ptr3, r, w3);
+         }
+      }
+      else {
+         /* the usual case */
+         const GLint w = xmesa->xm_draw_buffer->width;
+         const GLint h = xmesa->xm_draw_buffer->height;
+         GLint i, j;
+         for (i = 0; i < h; i++) {
+            bgr_t *ptr3 = PIXELADDR3(xmesa->xm_draw_buffer, 0, i);
+            for (j = 0; j < w; j++) {
+               ptr3->r = r;
+               ptr3->g = g;
+               ptr3->b = b;
+               ptr3++;
+            }
+         }
+#if 0 /* this code doesn't work for all window widths */
+         register GLuint *ptr4 = (GLuint *) ptr3;
+         register GLuint px;
+         GLuint pixel4[3];
+         register GLuint *p = pixel4;
+         pixel4[0] = clearPixel | (clearPixel << 24);
+         pixel4[1] = (clearPixel << 16) | (clearPixel >> 8);
+         pixel4[2] = (clearPixel << 8) | (clearPixel >>  16);
+         switch (3 & (int)(ptr3 - (bgr_t*) ptr4)){
+            case 0:
+               break;
+            case 1:
+               px = *ptr4 & 0x00ffffff;
+               px |= pixel4[0] & 0xff000000;
+               *ptr4++ = px;
+               px = *ptr4 & 0xffff0000;
+               px |= pixel4[2] & 0x0000ffff;
+               *ptr4 = px;
+               if (0 == --n)
+                  break;
+            case 2:
+               px = *ptr4 & 0x0000fffff;
+               px |= pixel4[1] & 0xffff0000;
+               *ptr4++ = px;
+               px = *ptr4 & 0xffffff00;
+               px |= pixel4[2] & 0x000000ff;
+               *ptr4 = px;
+               if (0 == --n)
+                  break;
+            case 3:
+               px = *ptr4 & 0x000000ff;
+               px |= pixel4[2] & 0xffffff00;
+               *ptr4++ = px;
+               --n;
+               break;
+         }
+         while (n > 3) {
+            p = pixel4;
+            *ptr4++ = *p++;
+            *ptr4++ = *p++;
+            *ptr4++ = *p++;
+            n -= 4;
+         }
+         switch (n) {
+            case 3:
+               p = pixel4;
+               *ptr4++ = *p++;
+               *ptr4++ = *p++;
+               px = *ptr4 & 0xffffff00;
+               px |= clearPixel & 0xff;
+               *ptr4 = px;
+               break;
+            case 2:
+               p = pixel4;
+               *ptr4++ = *p++;
+               px = *ptr4 & 0xffff0000;
+               px |= *p & 0xffff;
+               *ptr4 = px;
+               break;
+            case 1:
+               px = *ptr4 & 0xff000000;
+               px |= *p & 0xffffff;
+               *ptr4 = px;
+               break;
+            case 0:
+               break;
+         }
+#endif
+      }
+   }
+   else {
+      /* only clear subrect of color buffer */
+      if (r==g && g==b) {
+         /* same value for all three components (gray) */
+         GLint j;
+         for (j=0;j<height;j++) {
+            bgr_t *ptr3 = PIXELADDR3( xmesa->xm_draw_buffer, x, y+j );
+            MEMSET(ptr3, r, 3 * width);
+         }
+      }
+      else {
+         /* non-gray clear color */
+         GLint i, j;
+         for (j = 0; j < height; j++) {
+            bgr_t *ptr3 = PIXELADDR3( xmesa->xm_draw_buffer, x, y+j );
+            for (i = 0; i < width; i++) {
+               ptr3->r = r;
+               ptr3->g = g;
+               ptr3->b = b;
+               ptr3++;
+            }
+         }
+#if 0 /* this code might not always (seems ptr3 always == ptr4) */
+         GLint j;
+         GLuint pixel4[3];
+         pixel4[0] = clearPixel | (clearPixel << 24);
+         pixel4[1] = (clearPixel << 16) | (clearPixel >> 8);
+         pixel4[2] = (clearPixel << 8) | (clearPixel >>  16);
+         for (j=0;j<height;j++) {
+            bgr_t *ptr3 = PIXELADDR3( xmesa->xm_draw_buffer, x, y+j );
+            register GLuint *ptr4 = (GLuint *)ptr3;
+            register GLuint *p, px;
+            GLuint w = width;
+            switch (3 & (int)(ptr3 - (bgr_t*) ptr4)){
+               case 0:
+                  break;
+               case 1:
+                  px = *ptr4 & 0x00ffffff;
+                  px |= pixel4[0] & 0xff000000;
+                  *ptr4++ = px;
+                  px = *ptr4 & 0xffff0000;
+                  px |= pixel4[2] & 0x0000ffff;
+                  *ptr4 = px;
+                  if (0 == --w)
+                     break;
+               case 2:
+                  px = *ptr4 & 0x0000fffff;
+                  px |= pixel4[1] & 0xffff0000;
+                  *ptr4++ = px;
+                  px = *ptr4 & 0xffffff00;
+                  px |= pixel4[2] & 0x000000ff;
+                  *ptr4 = px;
+                  if (0 == --w)
+                     break;
+               case 3:
+                  px = *ptr4 & 0x000000ff;
+                  px |= pixel4[2] & 0xffffff00;
+                  *ptr4++ = px;
+                  --w;
+                  break;
+            }
+            while (w > 3){
+               p = pixel4;
+               *ptr4++ = *p++;
+               *ptr4++ = *p++;
+               *ptr4++ = *p++;
+               w -= 4;
+            }
+            switch (w) {
+               case 3:
+                  p = pixel4;
+                  *ptr4++ = *p++;
+                  *ptr4++ = *p++;
+                  px = *ptr4 & 0xffffff00;
+                  px |= *p & 0xff;
+                  *ptr4 = px;
+                  break;
+               case 2:
+                  p = pixel4;
+                  *ptr4++ = *p++;
+                  px = *ptr4 & 0xffff0000;
+                  px |= *p & 0xffff;
+                  *ptr4 = px;
+                  break;
+               case 1:
+                  px = *ptr4 & 0xff000000;
+                  px |= pixel4[0] & 0xffffff;
+                  *ptr4 = px;
+                  break;
+               case 0:
+                  break;
+            }
+         }
+#endif
+      }
+   }
+}
+
+
+static void
+clear_32bit_ximage( GLcontext *ctx, GLboolean all,
+                    GLint x, GLint y, GLint width, GLint height )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint pixel = (GLuint) xmesa->clearpixel;
+   if (xmesa->swapbytes) {
+      pixel = ((pixel >> 24) & 0x000000ff)
+            | ((pixel >> 8)  & 0x0000ff00)
+            | ((pixel << 8)  & 0x00ff0000)
+            | ((pixel << 24) & 0xff000000);
+   }
+   if (all) {
+      register GLint n = xmesa->xm_draw_buffer->width * xmesa->xm_draw_buffer->height;
+      register GLuint *ptr4 = (GLuint *) xmesa->xm_draw_buffer->backimage->data;
+      if (pixel==0) {
+         MEMSET( ptr4, pixel, 4*n );
+      }
+      else {
+         do {
+            *ptr4++ = pixel;
+            n--;
+         } while (n!=0);
+      }
+   }
+   else {
+      register int i, j;
+      for (j=0;j<height;j++) {
+         register GLuint *ptr4 = PIXELADDR4( xmesa->xm_draw_buffer, x, y+j );
+         for (i=0;i<width;i++) {
+            *ptr4++ = pixel;
+         }
+      }
+   }
+}
+
+
+static void
+clear_nbit_ximage( GLcontext *ctx, GLboolean all,
+                   GLint x, GLint y, GLint width, GLint height )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaImage *img = xmesa->xm_draw_buffer->backimage;
+   if (all) {
+      register int i, j;
+      width = xmesa->xm_draw_buffer->width;
+      height = xmesa->xm_draw_buffer->height;
+      for (j=0;j<height;j++) {
+         for (i=0;i<width;i++) {
+            XMesaPutPixel( img, i, j, xmesa->clearpixel );
+         }
+      }
+   }
+   else {
+      /* TODO: optimize this */
+      register int i, j;
+      y = FLIP(xmesa->xm_draw_buffer, y);
+      for (j=0;j<height;j++) {
+         for (i=0;i<width;i++) {
+            XMesaPutPixel( img, x+i, y-j, xmesa->clearpixel );
+         }
+      }
+   }
+}
+
+
+
+static void
+clear_buffers( GLcontext *ctx, GLbitfield mask,
+               GLboolean all, GLint x, GLint y, GLint width, GLint height )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   const GLuint *colorMask = (GLuint *) &ctx->Color.ColorMask;
+
+   if ((mask & (DD_FRONT_LEFT_BIT | DD_BACK_LEFT_BIT)) &&
+       xmesa->xm_draw_buffer->mesa_buffer.UseSoftwareAlphaBuffers &&
+       ctx->Color.ColorMask[ACOMP]) {
+      _swrast_clear_alpha_buffers(ctx);
+   }
+
+   /* we can't handle color or index masking */
+   if (*colorMask == 0xffffffff && ctx->Color.IndexMask == 0xffffffff) {
+      if (mask & DD_FRONT_LEFT_BIT) {
+	 ASSERT(xmesa->xm_draw_buffer->front_clear_func);
+	 (*xmesa->xm_draw_buffer->front_clear_func)( ctx, all, x, y, width, height );
+	 mask &= ~DD_FRONT_LEFT_BIT;
+      }
+      if (mask & DD_BACK_LEFT_BIT) {
+	 ASSERT(xmesa->xm_draw_buffer->back_clear_func);
+	 (*xmesa->xm_draw_buffer->back_clear_func)( ctx, all, x, y, width, height );
+	 mask &= ~DD_BACK_LEFT_BIT;
+      }
+   }
+
+   if (mask)
+      _swrast_Clear( ctx, mask, all, x, y, width, height );
+}
+
+
+/*
+ * When we detect that the user has resized the window this function will
+ * get called.  Here we'll reallocate the back buffer, depth buffer,
+ * stencil buffer etc. to match the new window size.
+ */
+void
+xmesa_resize_buffers( GLframebuffer *buffer )
+{
+   int height = (int) buffer->Height;
+   /* We can do this cast because the first field in the XMesaBuffer
+    * struct is a GLframebuffer struct.  If this weren't true, we'd
+    * need a pointer from the GLframebuffer to the XMesaBuffer.
+    */
+   XMesaBuffer xmBuffer = (XMesaBuffer) buffer;
+
+   xmBuffer->width = buffer->Width;
+   xmBuffer->height = buffer->Height;
+   xmesa_alloc_back_buffer( xmBuffer );
+
+   /* Needed by FLIP macro */
+   xmBuffer->bottom = height - 1;
+
+   if (xmBuffer->backimage) {
+      /* Needed by PIXELADDR1 macro */
+      xmBuffer->ximage_width1 = xmBuffer->backimage->bytes_per_line;
+      xmBuffer->ximage_origin1 = (GLubyte *) xmBuffer->backimage->data
+         + xmBuffer->ximage_width1 * (height-1);
+
+      /* Needed by PIXELADDR2 macro */
+      xmBuffer->ximage_width2 = xmBuffer->backimage->bytes_per_line / 2;
+      xmBuffer->ximage_origin2 = (GLushort *) xmBuffer->backimage->data
+         + xmBuffer->ximage_width2 * (height-1);
+
+      /* Needed by PIXELADDR3 macro */
+      xmBuffer->ximage_width3 = xmBuffer->backimage->bytes_per_line;
+      xmBuffer->ximage_origin3 = (GLubyte *) xmBuffer->backimage->data
+         + xmBuffer->ximage_width3 * (height-1);
+
+      /* Needed by PIXELADDR4 macro */
+      xmBuffer->ximage_width4 = xmBuffer->backimage->width;
+      xmBuffer->ximage_origin4 = (GLuint *) xmBuffer->backimage->data
+         + xmBuffer->ximage_width4 * (height-1);
+   }
+
+   _swrast_alloc_buffers( buffer );
+}
+
+
+#ifndef XFree86Server
+/* XXX this was never tested in the Xserver environment */
+
+/**
+ * This function implements glDrawPixels() with an XPutImage call when
+ * drawing to the front buffer (X Window drawable).
+ * The image format must be GL_BGRA to match the PF_8R8G8B pixel format.
+ */
+static void
+xmesa_DrawPixels_8R8G8B( GLcontext *ctx,
+                         GLint x, GLint y, GLsizei width, GLsizei height,
+                         GLenum format, GLenum type,
+                         const struct gl_pixelstore_attrib *unpack,
+                         const GLvoid *pixels )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   const SWcontext *swrast = SWRAST_CONTEXT( ctx );
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   const XMesaDrawable buffer = xmesa->xm_draw_buffer->buffer;
+   const XMesaGC gc = xmesa->xm_draw_buffer->gc;
+
+   ASSERT(dpy);
+   ASSERT(gc);
+   ASSERT(xmesa->xm_visual->dithered_pf == PF_8R8G8B);
+   ASSERT(xmesa->xm_visual->undithered_pf == PF_8R8G8B);
+
+   if (swrast->NewState)
+      _swrast_validate_derived( ctx );
+
+   if (buffer &&   /* buffer != 0 means it's a Window or Pixmap */
+       format == GL_BGRA &&
+       type == GL_UNSIGNED_BYTE &&
+       (swrast->_RasterMask & ~CLIP_BIT) == 0 && /* no blend, z-test, etc */
+       ctx->_ImageTransferState == 0 &&  /* no color tables, scale/bias, etc */
+       ctx->Pixel.ZoomX == 1.0 &&        /* no zooming */
+       ctx->Pixel.ZoomY == 1.0) {
+      int dstX = x;
+      int dstY = y;
+      int w = width;
+      int h = height;
+      int srcX = unpack->SkipPixels;
+      int srcY = unpack->SkipRows;
+      int rowLength = unpack->RowLength ? unpack->RowLength : width;
+      if (_swrast_clip_pixelrect(ctx, &dstX, &dstY, &w, &h, &srcX, &srcY)) {
+         /* This is a little tricky since all coordinates up to now have
+          * been in the OpenGL bottom-to-top orientation.  X is top-to-bottom
+          * so we have to carefully compute the Y coordinates/addresses here.
+          */
+         XMesaImage ximage;
+         MEMSET(&ximage, 0, sizeof(XMesaImage));
+         ximage.width = width;
+         ximage.height = height;
+         ximage.format = ZPixmap;
+         ximage.data = (char *) pixels
+            + ((srcY + h - 1) * rowLength + srcX) * 4;
+         ximage.byte_order = LSBFirst;
+         ximage.bitmap_unit = 32;
+         ximage.bitmap_bit_order = LSBFirst;
+         ximage.bitmap_pad = 32;
+         ximage.depth = 24;
+         ximage.bytes_per_line = -rowLength * 4; /* negative to flip image */
+         ximage.bits_per_pixel = 32;
+         /* it seems we don't need to set the ximage.red/green/blue_mask fields */
+         /* flip Y axis for dest position */
+         dstY = FLIP(xmesa->xm_draw_buffer, dstY) - h + 1;
+         XPutImage(dpy, buffer, gc, &ximage, 0, 0, dstX, dstY, w, h);
+      }
+   }
+   else {
+      /* software fallback */
+      _swrast_DrawPixels(ctx, x, y, width, height,
+                         format, type, unpack, pixels);
+   }
+}
+
+
+
+/**
+ * This function implements glDrawPixels() with an XPutImage call when
+ * drawing to the front buffer (X Window drawable).  The image format
+ * must be GL_RGB and image type must be GL_UNSIGNED_SHORT_5_6_5 to
+ * match the PF_5R6G5B pixel format.
+ */
+static void
+xmesa_DrawPixels_5R6G5B( GLcontext *ctx,
+                         GLint x, GLint y, GLsizei width, GLsizei height,
+                         GLenum format, GLenum type,
+                         const struct gl_pixelstore_attrib *unpack,
+                         const GLvoid *pixels )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   const SWcontext *swrast = SWRAST_CONTEXT( ctx );
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   const XMesaDrawable buffer = xmesa->xm_draw_buffer->buffer;
+   const XMesaGC gc = xmesa->xm_draw_buffer->gc;
+
+   ASSERT(dpy);
+   ASSERT(gc);
+   ASSERT(xmesa->xm_visual->undithered_pf == PF_5R6G5B);
+
+   if (swrast->NewState)
+      _swrast_validate_derived( ctx );
+
+   if (buffer &&   /* buffer != 0 means it's a Window or Pixmap */
+       format == GL_RGB &&
+       type == GL_UNSIGNED_SHORT_5_6_5 &&
+       !ctx->Color.DitherFlag &&  /* no dithering */
+       (swrast->_RasterMask & ~CLIP_BIT) == 0 && /* no blend, z-test, etc */
+       ctx->_ImageTransferState == 0 &&  /* no color tables, scale/bias, etc */
+       ctx->Pixel.ZoomX == 1.0 &&        /* no zooming */
+       ctx->Pixel.ZoomY == 1.0) {
+      int dstX = x;
+      int dstY = y;
+      int w = width;
+      int h = height;
+      int srcX = unpack->SkipPixels;
+      int srcY = unpack->SkipRows;
+      int rowLength = unpack->RowLength ? unpack->RowLength : width;
+      if (_swrast_clip_pixelrect(ctx, &dstX, &dstY, &w, &h, &srcX, &srcY)) {
+         /* This is a little tricky since all coordinates up to now have
+          * been in the OpenGL bottom-to-top orientation.  X is top-to-bottom
+          * so we have to carefully compute the Y coordinates/addresses here.
+          */
+         XMesaImage ximage;
+         MEMSET(&ximage, 0, sizeof(XMesaImage));
+         ximage.width = width;
+         ximage.height = height;
+         ximage.format = ZPixmap;
+         ximage.data = (char *) pixels
+            + ((srcY + h - 1) * rowLength + srcX) * 2;
+         ximage.byte_order = LSBFirst;
+         ximage.bitmap_unit = 16;
+         ximage.bitmap_bit_order = LSBFirst;
+         ximage.bitmap_pad = 16;
+         ximage.depth = 16;
+         ximage.bytes_per_line = -rowLength * 2; /* negative to flip image */
+         ximage.bits_per_pixel = 16;
+         /* it seems we don't need to set the ximage.red/green/blue_mask fields */
+         /* flip Y axis for dest position */
+         dstY = FLIP(xmesa->xm_draw_buffer, dstY) - h + 1;
+         XPutImage(dpy, buffer, gc, &ximage, 0, 0, dstX, dstY, w, h);
+      }
+   }
+   else {
+      /* software fallback */
+      _swrast_DrawPixels(ctx, x, y, width, height,
+                         format, type, unpack, pixels);
+   }
+}
+
+
+
+/**
+ * Implement glCopyPixels for the front color buffer (or back buffer Pixmap)
+ * for the color buffer.  Don't support zooming, pixel transfer, etc.
+ * We do support copying from one window to another, ala glXMakeCurrentRead.
+ */
+static void
+xmesa_CopyPixels( GLcontext *ctx,
+                  GLint srcx, GLint srcy, GLsizei width, GLsizei height,
+                  GLint destx, GLint desty, GLenum type )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   const SWcontext *swrast = SWRAST_CONTEXT( ctx );
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   const XMesaDrawable drawBuffer = xmesa->xm_draw_buffer->buffer;
+   const XMesaDrawable readBuffer = xmesa->xm_read_buffer->buffer;
+   const XMesaGC gc = xmesa->xm_draw_buffer->gc;
+
+   ASSERT(dpy);
+   ASSERT(gc);
+
+   if (swrast->NewState)
+      _swrast_validate_derived( ctx );
+
+   if (ctx->Color.DrawBuffer == GL_FRONT &&
+       ctx->Pixel.ReadBuffer == GL_FRONT &&
+       drawBuffer &&  /* buffer != 0 means it's a Window or Pixmap */
+       readBuffer &&
+       type == GL_COLOR &&
+       (swrast->_RasterMask & ~CLIP_BIT) == 0 && /* no blend, z-test, etc */
+       ctx->_ImageTransferState == 0 &&  /* no color tables, scale/bias, etc */
+       ctx->Pixel.ZoomX == 1.0 &&        /* no zooming */
+       ctx->Pixel.ZoomY == 1.0) {
+      /* Note: we don't do any special clipping work here.  We could,
+       * but X will do it for us.
+       */
+      srcy = FLIP(xmesa->xm_read_buffer, srcy) - height + 1;
+      desty = FLIP(xmesa->xm_draw_buffer, desty) - height + 1;
+      XCopyArea(dpy, readBuffer, drawBuffer, gc,
+                srcx, srcy, width, height, destx, desty);
+   }
+   else {
+      _swrast_CopyPixels(ctx, srcx, srcy, width, height, destx, desty, type );
+   }
+}
+#endif /* XFree86Server */
+
+
+
+/*
+ * Every driver should implement a GetString function in order to
+ * return a meaningful GL_RENDERER string.
+ */
+static const GLubyte *
+get_string( GLcontext *ctx, GLenum name )
+{
+   (void) ctx;
+   switch (name) {
+      case GL_RENDERER:
+#ifdef XFree86Server
+         return (const GLubyte *) "Mesa GLX Indirect";
+#else
+         return (const GLubyte *) "Mesa X11";
+#endif
+      case GL_VENDOR:
+#ifdef XFree86Server
+         return (const GLubyte *) "Mesa project: www.mesa3d.org";
+#else
+         return NULL;
+#endif
+      default:
+         return NULL;
+   }
+}
+
+
+/*
+ * We implement the glEnable function only because we care about
+ * dither enable/disable.
+ */
+static void
+enable( GLcontext *ctx, GLenum pname, GLboolean state )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+
+   switch (pname) {
+      case GL_DITHER:
+         if (state)
+            xmesa->pixelformat = xmesa->xm_visual->dithered_pf;
+         else
+            xmesa->pixelformat = xmesa->xm_visual->undithered_pf;
+         break;
+      default:
+         ;  /* silence compiler warning */
+   }
+}
+
+
+void xmesa_update_state( GLcontext *ctx, GLuint new_state )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+
+   /* Propogate statechange information to swrast and swrast_setup
+    * modules.  The X11 driver has no internal GL-dependent state.
+    */
+   _swrast_InvalidateState( ctx, new_state );
+   _ac_InvalidateState( ctx, new_state );
+   _tnl_InvalidateState( ctx, new_state );
+   _swsetup_InvalidateState( ctx, new_state );
+
+
+   /* setup pointers to front and back buffer clear functions */
+   xmesa->xm_draw_buffer->front_clear_func = clear_front_pixmap;
+   if (xmesa->xm_draw_buffer->backpixmap != XIMAGE) {
+      xmesa->xm_draw_buffer->back_clear_func = clear_back_pixmap;
+   }
+   else if (sizeof(GLushort)!=2 || sizeof(GLuint)!=4) {
+      xmesa->xm_draw_buffer->back_clear_func = clear_nbit_ximage;
+   }
+   else switch (xmesa->xm_visual->BitsPerPixel) {
+   case 8:
+      if (xmesa->xm_visual->hpcr_clear_flag) {
+	 xmesa->xm_draw_buffer->back_clear_func = clear_HPCR_ximage;
+      }
+      else {
+	 xmesa->xm_draw_buffer->back_clear_func = clear_8bit_ximage;
+      }
+      break;
+   case 16:
+      xmesa->xm_draw_buffer->back_clear_func = clear_16bit_ximage;
+      break;
+   case 24:
+      xmesa->xm_draw_buffer->back_clear_func = clear_24bit_ximage;
+      break;
+   case 32:
+      xmesa->xm_draw_buffer->back_clear_func = clear_32bit_ximage;
+      break;
+   default:
+      xmesa->xm_draw_buffer->back_clear_func = clear_nbit_ximage;
+      break;
+   }
+
+   xmesa_update_span_funcs(ctx);
+}
+
+
+
+/**
+ * Called via ctx->Driver.TestProxyTeximage().  Normally, we'd just use
+ * the _mesa_test_proxy_teximage() fallback function, but we're going to
+ * special-case the 3D texture case to allow textures up to 512x512x32
+ * texels.
+ */
+static GLboolean
+test_proxy_teximage(GLcontext *ctx, GLenum target, GLint level,
+                    GLint internalFormat, GLenum format, GLenum type,
+                    GLint width, GLint height, GLint depth, GLint border)
+{
+   if (target == GL_PROXY_TEXTURE_3D) {
+      /* special case for 3D textures */
+      if (width * height * depth > 512 * 512 * 64 ||
+          width  < 2 * border ||
+          (!ctx->Extensions.ARB_texture_non_power_of_two &&
+           _mesa_bitcount(width  - 2 * border) != 1) ||
+          height < 2 * border ||
+          (!ctx->Extensions.ARB_texture_non_power_of_two &&
+           _mesa_bitcount(height - 2 * border) != 1) ||
+          depth  < 2 * border ||
+          (!ctx->Extensions.ARB_texture_non_power_of_two &&
+           _mesa_bitcount(depth  - 2 * border) != 1)) {
+         /* Bad size, or too many texels */
+         return GL_FALSE;
+      }
+      return GL_TRUE;
+   }
+   else {
+      /* use the fallback routine for 1D, 2D, cube and rect targets */
+      return _mesa_test_proxy_teximage(ctx, target, level, internalFormat,
+                                       format, type, width, height, depth,
+                                       border);
+   }
+}
+
+
+
+
+/* Setup pointers and other driver state that is constant for the life
+ * of a context.
+ */
+void xmesa_init_pointers( GLcontext *ctx )
+{
+   TNLcontext *tnl;
+   struct swrast_device_driver *dd = _swrast_GetDeviceDriverReference( ctx );
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+
+   /* Plug in our driver-specific functions here */
+   ctx->Driver.GetString = get_string;
+   ctx->Driver.GetBufferSize = get_buffer_size;
+   ctx->Driver.Flush = finish_or_flush;
+   ctx->Driver.Finish = finish_or_flush;
+   ctx->Driver.ClearIndex = clear_index;
+   ctx->Driver.ClearColor = clear_color;
+   ctx->Driver.IndexMask = index_mask;
+   ctx->Driver.ColorMask = color_mask;
+   ctx->Driver.Enable = enable;
+
+   /* Software rasterizer pixel paths:
+    */
+   ctx->Driver.Accum = _swrast_Accum;
+   ctx->Driver.Bitmap = _swrast_Bitmap;
+   ctx->Driver.Clear = clear_buffers;
+   ctx->Driver.ResizeBuffers = xmesa_resize_buffers;
+#ifdef XFree86Server
+   ctx->Driver.DrawPixels = _swrast_DrawPixels;
+   ctx->Driver.CopyPixels = _swrast_CopyPixels;
+#else
+   ctx->Driver.CopyPixels = /*_swrast_CopyPixels;*/xmesa_CopyPixels;
+   if (xmesa->xm_visual->undithered_pf == PF_8R8G8B &&
+       xmesa->xm_visual->dithered_pf == PF_8R8G8B) {
+      ctx->Driver.DrawPixels = xmesa_DrawPixels_8R8G8B;
+   }
+   else if (xmesa->xm_visual->undithered_pf == PF_5R6G5B) {
+      ctx->Driver.DrawPixels = xmesa_DrawPixels_5R6G5B;
+   }
+   else {
+      ctx->Driver.DrawPixels = _swrast_DrawPixels;
+   }
+#endif
+   ctx->Driver.ReadPixels = _swrast_ReadPixels;
+   ctx->Driver.DrawBuffer = _swrast_DrawBuffer;
+
+   /* Software texture functions:
+    */
+   ctx->Driver.ChooseTextureFormat = _mesa_choose_tex_format;
+   ctx->Driver.TexImage1D = _mesa_store_teximage1d;
+   ctx->Driver.TexImage2D = _mesa_store_teximage2d;
+   ctx->Driver.TexImage3D = _mesa_store_teximage3d;
+   ctx->Driver.TexSubImage1D = _mesa_store_texsubimage1d;
+   ctx->Driver.TexSubImage2D = _mesa_store_texsubimage2d;
+   ctx->Driver.TexSubImage3D = _mesa_store_texsubimage3d;
+   ctx->Driver.TestProxyTexImage = test_proxy_teximage;
+
+   ctx->Driver.CopyTexImage1D = _swrast_copy_teximage1d;
+   ctx->Driver.CopyTexImage2D = _swrast_copy_teximage2d;
+   ctx->Driver.CopyTexSubImage1D = _swrast_copy_texsubimage1d;
+   ctx->Driver.CopyTexSubImage2D = _swrast_copy_texsubimage2d;
+   ctx->Driver.CopyTexSubImage3D = _swrast_copy_texsubimage3d;
+
+   ctx->Driver.CompressedTexImage1D = _mesa_store_compressed_teximage1d;
+   ctx->Driver.CompressedTexImage2D = _mesa_store_compressed_teximage2d;
+   ctx->Driver.CompressedTexImage3D = _mesa_store_compressed_teximage3d;
+   ctx->Driver.CompressedTexSubImage1D = _mesa_store_compressed_texsubimage1d;
+   ctx->Driver.CompressedTexSubImage2D = _mesa_store_compressed_texsubimage2d;
+   ctx->Driver.CompressedTexSubImage3D = _mesa_store_compressed_texsubimage3d;
+
+   /* Swrast hooks for imaging extensions:
+    */
+   ctx->Driver.CopyColorTable = _swrast_CopyColorTable;
+   ctx->Driver.CopyColorSubTable = _swrast_CopyColorSubTable;
+   ctx->Driver.CopyConvolutionFilter1D = _swrast_CopyConvolutionFilter1D;
+   ctx->Driver.CopyConvolutionFilter2D = _swrast_CopyConvolutionFilter2D;
+
+   /* Initialize the TNL driver interface:
+    */
+   tnl = TNL_CONTEXT(ctx);
+   tnl->Driver.RunPipeline = _tnl_run_pipeline;
+   
+   dd->SetBuffer = set_buffer;
+
+   /* Install swsetup for tnl->Driver.Render.*:
+    */
+   _swsetup_Wakeup(ctx);
+
+   (void) DitherValues;  /* silenced unused var warning */
+}
+
+
+
+
+
+#define XMESA_NEW_POINT  (_NEW_POINT | \
+                          _NEW_RENDERMODE | \
+                          _SWRAST_NEW_RASTERMASK)
+
+#define XMESA_NEW_LINE   (_NEW_LINE | \
+                          _NEW_TEXTURE | \
+                          _NEW_LIGHT | \
+                          _NEW_DEPTH | \
+                          _NEW_RENDERMODE | \
+                          _SWRAST_NEW_RASTERMASK)
+
+#define XMESA_NEW_TRIANGLE (_NEW_POLYGON | \
+                            _NEW_TEXTURE | \
+                            _NEW_LIGHT | \
+                            _NEW_DEPTH | \
+                            _NEW_RENDERMODE | \
+                            _SWRAST_NEW_RASTERMASK)
+
+
+/* Extend the software rasterizer with our line/point/triangle
+ * functions.
+ */
+void xmesa_register_swrast_functions( GLcontext *ctx )
+{
+   SWcontext *swrast = SWRAST_CONTEXT( ctx );
+
+   swrast->choose_point = xmesa_choose_point;
+   swrast->choose_line = xmesa_choose_line;
+   swrast->choose_triangle = xmesa_choose_triangle;
+
+   swrast->invalidate_point |= XMESA_NEW_POINT;
+   swrast->invalidate_line |= XMESA_NEW_LINE;
+   swrast->invalidate_triangle |= XMESA_NEW_TRIANGLE;
+}
diff --git a/reactos/lib/mesa32/src/drivers/x11/xm_line.c b/reactos/lib/mesa32/src/drivers/x11/xm_line.c
new file mode 100644
index 00000000000..9b0e5653147
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/x11/xm_line.c
@@ -0,0 +1,574 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * This file contains "accelerated" point, line, and triangle functions.
+ * It should be fairly easy to write new special-purpose point, line or
+ * triangle functions and hook them into this module.
+ */
+
+
+#include "glxheader.h"
+#include "depth.h"
+#include "macros.h"
+#include "mtypes.h"
+#include "xmesaP.h"
+
+/* Internal swrast includes:
+ */
+#include "swrast/s_depth.h"
+#include "swrast/s_points.h"
+#include "swrast/s_lines.h"
+#include "swrast/s_context.h"
+
+
+/**********************************************************************/
+/***                    Point rendering                             ***/
+/**********************************************************************/
+
+
+/*
+ * Render an array of points into a pixmap, any pixel format.
+ */
+#if 000
+/* XXX don't use this, it doesn't dither correctly */
+static void draw_points_ANY_pixmap( GLcontext *ctx, const SWvertex *vert )
+{
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+
+   if (xmesa->xm_visual->mesa_visual.RGBAflag) {
+      register int x, y;
+      const GLubyte *color = vert->color;
+      unsigned long pixel = xmesa_color_to_pixel( xmesa,
+						  color[0], color[1],
+						  color[2], color[3],
+						  xmesa->pixelformat);
+      XMesaSetForeground( dpy, gc, pixel );
+      x =                         (GLint) vert->win[0];
+      y = FLIP( xmesa->xm_buffer, (GLint) vert->win[1] );
+      XMesaDrawPoint( dpy, buffer, gc, x, y);
+   }
+   else {
+      /* Color index mode */
+      register int x, y;
+      XMesaSetForeground( dpy, gc, vert->index );
+      x =                         (GLint) vert->win[0];
+      y = FLIP( xmesa->xm_buffer, (GLint) vert->win[1] );
+      XMesaDrawPoint( dpy, buffer, gc, x, y);
+   }
+}
+#endif
+
+
+/* Override the swrast point-selection function.  Try to use one of
+ * our internal point functions, otherwise fall back to the standard
+ * swrast functions.
+ */
+void xmesa_choose_point( GLcontext *ctx )
+{
+#if 0
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+
+   if (ctx->RenderMode == GL_RENDER
+       && ctx->Point.Size == 1.0F && !ctx->Point.SmoothFlag
+       && swrast->_RasterMask == 0
+       && !ctx->Texture._EnabledUnits
+       && xmesa->xm_buffer->buffer != XIMAGE) {
+      swrast->Point = draw_points_ANY_pixmap;
+   }
+   else {
+      _swrast_choose_point( ctx );
+   }
+#else
+   _swrast_choose_point( ctx );
+#endif
+}
+
+
+
+/**********************************************************************/
+/***                      Line rendering                            ***/
+/**********************************************************************/
+
+
+/*
+ * Draw a flat-shaded, PF_TRUECOLOR line into an XImage.
+ */
+#define NAME flat_TRUECOLOR_line
+#define SETUP_CODE					\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);		\
+   const GLubyte *color = vert1->color;			\
+   XMesaImage *img = xmesa->xm_buffer->backimage;	\
+   unsigned long pixel;					\
+   PACK_TRUECOLOR( pixel, color[0], color[1], color[2] );
+#define CLIP_HACK 1
+#define PLOT(X,Y) XMesaPutPixel( img, X, FLIP(xmesa->xm_buffer, Y), pixel );
+#include "swrast/s_linetemp.h"
+
+
+
+/*
+ * Draw a flat-shaded, PF_8A8B8G8R line into an XImage.
+ */
+#define NAME flat_8A8B8G8R_line
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   const GLubyte *color = vert1->color;				\
+   GLuint pixel = PACK_8B8G8R( color[0], color[1], color[2] );
+#define PIXEL_TYPE GLuint
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define PIXEL_ADDRESS(X,Y) PIXELADDR4(xmesa->xm_buffer,X,Y)
+#define CLIP_HACK 1
+#define PLOT(X,Y) *pixelPtr = pixel;
+#include "swrast/s_linetemp.h"
+
+
+
+/*
+ * Draw a flat-shaded, PF_8R8G8B line into an XImage.
+ */
+#define NAME flat_8R8G8B_line
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   const GLubyte *color = vert1->color;				\
+   GLuint pixel = PACK_8R8G8B( color[0], color[1], color[2] );
+#define PIXEL_TYPE GLuint
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define PIXEL_ADDRESS(X,Y) PIXELADDR4(xmesa->xm_buffer,X,Y)
+#define CLIP_HACK 1
+#define PLOT(X,Y) *pixelPtr = pixel;
+#include "swrast/s_linetemp.h"
+
+
+
+/*
+ * Draw a flat-shaded, PF_8R8G8B24 line into an XImage.
+ */
+#define NAME flat_8R8G8B24_line
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   const GLubyte *color = vert1->color;
+#define PIXEL_TYPE bgr_t
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define PIXEL_ADDRESS(X,Y) PIXELADDR3(xmesa->xm_buffer,X,Y)
+#define CLIP_HACK 1
+#define PLOT(X,Y) {			\
+      pixelPtr->r = color[RCOMP];	\
+      pixelPtr->g = color[GCOMP];	\
+      pixelPtr->b = color[BCOMP];	\
+}
+#include "swrast/s_linetemp.h"
+
+
+
+/*
+ * Draw a flat-shaded, PF_5R6G5B line into an XImage.
+ */
+#define NAME flat_5R6G5B_line
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   const GLubyte *color = vert1->color;				\
+   GLushort pixel = PACK_5R6G5B( color[0], color[1], color[2] );
+#define PIXEL_TYPE GLushort
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define PIXEL_ADDRESS(X,Y) PIXELADDR2(xmesa->xm_buffer,X,Y)
+#define CLIP_HACK 1
+#define PLOT(X,Y) *pixelPtr = pixel;
+#include "swrast/s_linetemp.h"
+
+
+
+/*
+ * Draw a flat-shaded, PF_DITHER_5R6G5B line into an XImage.
+ */
+#define NAME flat_DITHER_5R6G5B_line
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   const GLubyte *color = vert1->color;
+#define PIXEL_TYPE GLushort
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define PIXEL_ADDRESS(X,Y) PIXELADDR2(xmesa->xm_buffer,X,Y)
+#define CLIP_HACK 1
+#define PLOT(X,Y) PACK_TRUEDITHER( *pixelPtr, X, Y, color[0], color[1], color[2] );
+#include "swrast/s_linetemp.h"
+
+
+
+
+/*
+ * Draw a flat-shaded, PF_DITHER 8-bit line into an XImage.
+ */
+#define NAME flat_DITHER8_line
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   const GLubyte *color = vert1->color;				\
+   GLint r = color[0], g = color[1], b = color[2];		\
+   DITHER_SETUP;
+#define PIXEL_TYPE GLubyte
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define PIXEL_ADDRESS(X,Y) PIXELADDR1(xmesa->xm_buffer,X,Y)
+#define CLIP_HACK 1
+#define PLOT(X,Y) *pixelPtr = DITHER(X,Y,r,g,b);
+#include "swrast/s_linetemp.h"
+
+
+
+/*
+ * Draw a flat-shaded, PF_LOOKUP 8-bit line into an XImage.
+ */
+#define NAME flat_LOOKUP8_line
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   const GLubyte *color = vert1->color;				\
+   GLubyte pixel;						\
+   LOOKUP_SETUP;						\
+   pixel = (GLubyte) LOOKUP( color[0], color[1], color[2] );
+#define PIXEL_TYPE GLubyte
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define PIXEL_ADDRESS(X,Y) PIXELADDR1(xmesa->xm_buffer,X,Y)
+#define CLIP_HACK 1
+#define PLOT(X,Y) *pixelPtr = pixel;
+#include "swrast/s_linetemp.h"
+
+
+
+/*
+ * Draw a flat-shaded, PF_HPCR line into an XImage.
+ */
+#define NAME flat_HPCR_line
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   const GLubyte *color = vert1->color;				\
+   GLint r = color[0], g = color[1], b = color[2];
+#define PIXEL_TYPE GLubyte
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define PIXEL_ADDRESS(X,Y) PIXELADDR1(xmesa->xm_buffer,X,Y)
+#define CLIP_HACK 1
+#define PLOT(X,Y) *pixelPtr = (GLubyte) DITHER_HPCR(X,Y,r,g,b);
+#include "swrast/s_linetemp.h"
+
+
+
+
+/*
+ * Draw a flat-shaded, Z-less, PF_TRUECOLOR line into an XImage.
+ */
+#define NAME flat_TRUECOLOR_z_line
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   const GLubyte *color = vert1->color;				\
+   XMesaImage *img = xmesa->xm_buffer->backimage;		\
+   unsigned long pixel;						\
+   PACK_TRUECOLOR( pixel, color[0], color[1], color[2] );
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define CLIP_HACK 1
+#define PLOT(X,Y)							\
+	if (Z < *zPtr) {						\
+	   *zPtr = Z;							\
+           XMesaPutPixel( img, X, FLIP(xmesa->xm_buffer, Y), pixel );	\
+	}
+#include "swrast/s_linetemp.h"
+
+
+
+/*
+ * Draw a flat-shaded, Z-less, PF_8A8B8G8R line into an XImage.
+ */
+#define NAME flat_8A8B8G8R_z_line
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   const GLubyte *color = vert1->color;				\
+   GLuint pixel = PACK_8B8G8R( color[0], color[1], color[2] );
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define PIXEL_TYPE GLuint
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define PIXEL_ADDRESS(X,Y) PIXELADDR4(xmesa->xm_buffer,X,Y)
+#define CLIP_HACK 1
+#define PLOT(X,Y)		\
+	if (Z < *zPtr) {	\
+	   *zPtr = Z;		\
+	   *pixelPtr = pixel;	\
+	}
+#include "swrast/s_linetemp.h"
+
+
+
+/*
+ * Draw a flat-shaded, Z-less, PF_8R8G8B line into an XImage.
+ */
+#define NAME flat_8R8G8B_z_line
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   const GLubyte *color = vert1->color;				\
+   GLuint pixel = PACK_8R8G8B( color[0], color[1], color[2] );
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define PIXEL_TYPE GLuint
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define PIXEL_ADDRESS(X,Y) PIXELADDR4(xmesa->xm_buffer,X,Y)
+#define CLIP_HACK 1
+#define PLOT(X,Y)		\
+	if (Z < *zPtr) {	\
+	   *zPtr = Z;		\
+	   *pixelPtr = pixel;	\
+	}
+#include "swrast/s_linetemp.h"
+
+
+
+/*
+ * Draw a flat-shaded, Z-less, PF_8R8G8B24 line into an XImage.
+ */
+#define NAME flat_8R8G8B24_z_line
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   const GLubyte *color = vert1->color;
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define PIXEL_TYPE bgr_t
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define PIXEL_ADDRESS(X,Y) PIXELADDR3(xmesa->xm_buffer,X,Y)
+#define CLIP_HACK 1
+#define PLOT(X,Y)			\
+	if (Z < *zPtr) {		\
+	   *zPtr = Z;			\
+           pixelPtr->r = color[RCOMP];	\
+           pixelPtr->g = color[GCOMP];	\
+           pixelPtr->b = color[BCOMP];	\
+	}
+#include "swrast/s_linetemp.h"
+
+
+
+/*
+ * Draw a flat-shaded, Z-less, PF_5R6G5B line into an XImage.
+ */
+#define NAME flat_5R6G5B_z_line
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   const GLubyte *color = vert1->color;				\
+   GLushort pixel = PACK_5R6G5B( color[0], color[1], color[2] );
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define PIXEL_TYPE GLushort
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define PIXEL_ADDRESS(X,Y) PIXELADDR2(xmesa->xm_buffer,X,Y)
+#define CLIP_HACK 1
+#define PLOT(X,Y)		\
+	if (Z < *zPtr) {	\
+	   *zPtr = Z;		\
+	   *pixelPtr = pixel;	\
+	}
+#include "swrast/s_linetemp.h"
+
+
+
+/*
+ * Draw a flat-shaded, Z-less, PF_DITHER_5R6G5B line into an XImage.
+ */
+#define NAME flat_DITHER_5R6G5B_z_line
+#define SETUP_CODE					\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);		\
+   const GLubyte *color = vert1->color;
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define PIXEL_TYPE GLushort
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define PIXEL_ADDRESS(X,Y) PIXELADDR2(xmesa->xm_buffer,X,Y)
+#define CLIP_HACK 1
+#define PLOT(X,Y)		\
+	if (Z < *zPtr) {	\
+	   *zPtr = Z;		\
+	   PACK_TRUEDITHER(*pixelPtr, X, Y, color[0], color[1], color[2]); \
+	}
+#include "swrast/s_linetemp.h"
+
+
+
+/*
+ * Draw a flat-shaded, Z-less, PF_DITHER 8-bit line into an XImage.
+ */
+#define NAME flat_DITHER8_z_line
+#define SETUP_CODE					\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);		\
+   const GLubyte *color = vert1->color;			\
+   GLint r = color[0], g = color[1], b = color[2];	\
+   DITHER_SETUP;
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define PIXEL_TYPE GLubyte
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define PIXEL_ADDRESS(X,Y) PIXELADDR1(xmesa->xm_buffer,X,Y)
+#define CLIP_HACK 1
+#define PLOT(X,Y)						\
+	if (Z < *zPtr) {					\
+	   *zPtr = Z;						\
+	   *pixelPtr = (GLubyte) DITHER( X, Y, r, g, b);	\
+	}
+#include "swrast/s_linetemp.h"
+
+
+
+/*
+ * Draw a flat-shaded, Z-less, PF_LOOKUP 8-bit line into an XImage.
+ */
+#define NAME flat_LOOKUP8_z_line
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   const GLubyte *color = vert1->color;				\
+   GLubyte pixel;						\
+   LOOKUP_SETUP;						\
+   pixel = (GLubyte) LOOKUP( color[0], color[1], color[2] );
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define PIXEL_TYPE GLubyte
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define PIXEL_ADDRESS(X,Y) PIXELADDR1(xmesa->xm_buffer,X,Y)
+#define CLIP_HACK 1
+#define PLOT(X,Y)		\
+	if (Z < *zPtr) {	\
+	   *zPtr = Z;		\
+	   *pixelPtr = pixel;	\
+	}
+#include "swrast/s_linetemp.h"
+
+
+
+/*
+ * Draw a flat-shaded, Z-less, PF_HPCR line into an XImage.
+ */
+#define NAME flat_HPCR_z_line
+#define SETUP_CODE 						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   const GLubyte *color = vert1->color;				\
+   GLint r = color[0], g = color[1], b = color[2];
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define PIXEL_TYPE GLubyte
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define PIXEL_ADDRESS(X,Y) PIXELADDR1(xmesa->xm_buffer,X,Y)
+#define CLIP_HACK 1
+#define PLOT(X,Y)						\
+	if (Z < *zPtr) {					\
+	   *zPtr = Z;						\
+	   *pixelPtr = (GLubyte) DITHER_HPCR( X, Y, r, g, b);	\
+	}
+#include "swrast/s_linetemp.h"
+
+
+
+static swrast_line_func get_line_func( GLcontext *ctx )
+{
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   int depth = GET_VISUAL_DEPTH(xmesa->xm_visual);
+
+   (void) DitherValues;  /* silence unused var warning */
+   (void) kernel1;  /* silence unused var warning */
+
+   if (ctx->RenderMode != GL_RENDER)      return (swrast_line_func) NULL;
+   if (ctx->Line.SmoothFlag)              return (swrast_line_func) NULL;
+   if (ctx->Texture._EnabledUnits)        return (swrast_line_func) NULL;
+   if (ctx->Light.ShadeModel != GL_FLAT)  return (swrast_line_func) NULL;
+   if (ctx->Line.StippleFlag)             return (swrast_line_func) NULL;
+   if (swrast->_RasterMask & MULTI_DRAW_BIT) return (swrast_line_func) NULL;
+
+   if (xmesa->xm_buffer->buffer==XIMAGE
+       && swrast->_RasterMask==DEPTH_BIT
+       && ctx->Depth.Func==GL_LESS
+       && ctx->Depth.Mask==GL_TRUE
+       && ctx->Visual.depthBits == DEFAULT_SOFTWARE_DEPTH_BITS
+       && ctx->Line.Width==1.0F) {
+      switch (xmesa->pixelformat) {
+         case PF_Truecolor:
+            return flat_TRUECOLOR_z_line;
+         case PF_8A8B8G8R:
+            return flat_8A8B8G8R_z_line;
+         case PF_8R8G8B:
+            return flat_8R8G8B_z_line;
+         case PF_8R8G8B24:
+            return flat_8R8G8B24_z_line;
+         case PF_5R6G5B:
+            return flat_5R6G5B_z_line;
+         case PF_Dither_5R6G5B:
+            return flat_DITHER_5R6G5B_z_line;
+         case PF_Dither:
+            return (depth==8) ? flat_DITHER8_z_line : (swrast_line_func) NULL;
+         case PF_Lookup:
+            return (depth==8) ? flat_LOOKUP8_z_line : (swrast_line_func) NULL;
+         case PF_HPCR:
+            return flat_HPCR_z_line;
+         default:
+            return (swrast_line_func)NULL;
+      }
+   }
+   if (xmesa->xm_buffer->buffer==XIMAGE
+       && swrast->_RasterMask==0
+       && ctx->Line.Width==1.0F) {
+      switch (xmesa->pixelformat) {
+         case PF_Truecolor:
+            return flat_TRUECOLOR_line;
+         case PF_8A8B8G8R:
+            return flat_8A8B8G8R_line;
+         case PF_8R8G8B:
+            return flat_8R8G8B_line;
+         case PF_8R8G8B24:
+            return flat_8R8G8B24_line;
+         case PF_5R6G5B:
+            return flat_5R6G5B_line;
+         case PF_Dither_5R6G5B:
+            return flat_DITHER_5R6G5B_line;
+         case PF_Dither:
+            return (depth==8) ? flat_DITHER8_line : (swrast_line_func) NULL;
+         case PF_Lookup:
+            return (depth==8) ? flat_LOOKUP8_line : (swrast_line_func) NULL;
+         case PF_HPCR:
+            return flat_HPCR_line;
+	 default:
+	    return (swrast_line_func)NULL;
+      }
+   }
+
+   return (swrast_line_func) NULL;
+}
+
+/* Override for the swrast line-selection function.  Try to use one
+ * of our internal line functions, otherwise fall back to the
+ * standard swrast functions.
+ */
+void xmesa_choose_line( GLcontext *ctx )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+
+   if (!(swrast->Line = get_line_func( ctx )))
+      _swrast_choose_line( ctx );
+}
diff --git a/reactos/lib/mesa32/src/drivers/x11/xm_span.c b/reactos/lib/mesa32/src/drivers/x11/xm_span.c
new file mode 100644
index 00000000000..07fa5b6cec1
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/x11/xm_span.c
@@ -0,0 +1,4485 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* $XFree86: xc/extras/Mesa/src/X/xm_span.c,v 1.3 2002/02/27 21:07:54 tsi Exp $ */
+
+#include "glxheader.h"
+#include "colormac.h"
+#include "context.h"
+#include "depth.h"
+#include "drawpix.h"
+#include "extensions.h"
+#include "macros.h"
+#include "imports.h"
+#include "mtypes.h"
+#include "state.h"
+#include "xmesaP.h"
+
+#include "swrast/swrast.h"
+
+
+/*
+ * The following functions are used to trap XGetImage() calls which
+ * generate BadMatch errors if the drawable isn't mapped.
+ */
+
+#ifndef XFree86Server
+static int caught_xgetimage_error = 0;
+static int (*old_xerror_handler)( XMesaDisplay *dpy, XErrorEvent *ev );
+static unsigned long xgetimage_serial;
+
+/*
+ * This is the error handler which will be called if XGetImage fails.
+ */
+static int xgetimage_error_handler( XMesaDisplay *dpy, XErrorEvent *ev )
+{
+   if (ev->serial==xgetimage_serial && ev->error_code==BadMatch) {
+      /* caught the expected error */
+      caught_xgetimage_error = 0;
+   }
+   else {
+      /* call the original X error handler, if any.  otherwise ignore */
+      if (old_xerror_handler) {
+         (*old_xerror_handler)( dpy, ev );
+      }
+   }
+   return 0;
+}
+
+
+/*
+ * Call this right before XGetImage to setup error trap.
+ */
+static void catch_xgetimage_errors( XMesaDisplay *dpy )
+{
+   xgetimage_serial = NextRequest( dpy );
+   old_xerror_handler = XSetErrorHandler( xgetimage_error_handler );
+   caught_xgetimage_error = 0;
+}
+
+
+/*
+ * Call this right after XGetImage to check if an error occured.
+ */
+static int check_xgetimage_errors( void )
+{
+   /* restore old handler */
+   (void) XSetErrorHandler( old_xerror_handler );
+   /* return 0=no error, 1=error caught */
+   return caught_xgetimage_error;
+}
+#endif
+
+
+/*
+ * Read a pixel from an X drawable.
+ */
+static unsigned long read_pixel( XMesaDisplay *dpy,
+                                 XMesaDrawable d, int x, int y )
+{
+   unsigned long p;
+#ifndef XFree86Server
+   XMesaImage *pixel = NULL;
+   int error;
+
+   catch_xgetimage_errors( dpy );
+   pixel = XGetImage( dpy, d, x, y, 1, 1, AllPlanes, ZPixmap );
+   error = check_xgetimage_errors();
+   if (pixel && !error) {
+      p = XMesaGetPixel( pixel, 0, 0 );
+   }
+   else {
+      p = 0;
+   }
+   if (pixel) {
+      XMesaDestroyImage( pixel );
+   }
+#else
+   (*dpy->GetImage)(d, x, y, 1, 1, ZPixmap, ~0L, (pointer)&p);
+#endif
+   return p;
+}
+
+
+
+/*
+ * The Mesa library needs to be able to draw pixels in a number of ways:
+ *   1. RGB vs Color Index
+ *   2. as horizontal spans (polygons, images) vs random locations (points,
+ *      lines)
+ *   3. different color per-pixel or same color for all pixels
+ *
+ * Furthermore, the X driver needs to support rendering to 3 possible
+ * "buffers", usually one, but sometimes two at a time:
+ *   1. The front buffer as an X window
+ *   2. The back buffer as a Pixmap
+ *   3. The back buffer as an XImage
+ *
+ * Finally, if the back buffer is an XImage, we can avoid using XPutPixel and
+ * optimize common cases such as 24-bit and 8-bit modes.
+ *
+ * By multiplication, there's at least 48 possible combinations of the above.
+ *
+ * Below are implementations of the most commonly used combinations.  They are
+ * accessed through function pointers which get initialized here and are used
+ * directly from the Mesa library.  The 8 function pointers directly correspond
+ * to the first 3 cases listed above.
+ *
+ *
+ * The function naming convention is:
+ *
+ *   write_[span|pixels]_[mono]_[format]_[pixmap|ximage]
+ *
+ * New functions optimized for specific cases can be added without too much
+ * trouble.  An example might be the 24-bit TrueColor mode 8A8R8G8B which is
+ * found on IBM RS/6000 X servers.
+ */
+
+
+
+
+/**********************************************************************/
+/*** Write COLOR SPAN functions                                     ***/
+/**********************************************************************/
+
+
+#define RGBA_SPAN_ARGS	const GLcontext *ctx,				\
+			GLuint n, GLint x, GLint y,			\
+			CONST GLubyte rgba[][4], const GLubyte mask[]
+
+#define RGB_SPAN_ARGS	const GLcontext *ctx,				\
+			GLuint n, GLint x, GLint y,			\
+			CONST GLubyte rgb[][3], const GLubyte mask[]
+
+
+/* NOTE: if mask==NULL, draw all pixels */
+
+
+/*
+ * Write a span of PF_TRUECOLOR pixels to a pixmap.
+ */
+static void write_span_TRUECOLOR_pixmap( RGBA_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+
+   (void)DitherValues;		/* Muffle compiler */
+
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            unsigned long p;
+            PACK_TRUECOLOR( p, rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+            XMesaSetForeground( dpy, gc, p );
+            XMesaDrawPoint( dpy, buffer, gc, (int) x, (int) y );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      XMesaImage *rowimg = xmesa->xm_buffer->rowimage;
+      for (i=0;i<n;i++) {
+         unsigned long p;
+         PACK_TRUECOLOR( p, rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+         XMesaPutPixel( rowimg, i, 0, p );
+      }
+      XMesaPutImage( dpy, buffer, gc, rowimg, 0, 0, x, y, n, 1 );
+   }
+}
+
+
+/*
+ * Write a span of PF_TRUECOLOR pixels to a pixmap.
+ */
+static void write_span_rgb_TRUECOLOR_pixmap( RGB_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            unsigned long p;
+            PACK_TRUECOLOR( p, rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] );
+            XMesaSetForeground( dpy, gc, p );
+            XMesaDrawPoint( dpy, buffer, gc, (int) x, (int) y );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      XMesaImage *rowimg = xmesa->xm_buffer->rowimage;
+      for (i=0;i<n;i++) {
+         unsigned long p;
+         PACK_TRUECOLOR( p, rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] );
+         XMesaPutPixel( rowimg, i, 0, p );
+      }
+      XMesaPutImage( dpy, buffer, gc, rowimg, 0, 0, x, y, n, 1 );
+   }
+}
+
+
+/*
+ * Write a span of PF_TRUEDITHER pixels to a pixmap.
+ */
+static void write_span_TRUEDITHER_pixmap( RGBA_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            unsigned long p;
+            PACK_TRUEDITHER(p, x, y, rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]);
+            XMesaSetForeground( dpy, gc, p );
+            XMesaDrawPoint( dpy, buffer, gc, (int) x, (int) y );
+         }
+      }
+   }
+   else {
+      XMesaImage *rowimg = xmesa->xm_buffer->rowimage;
+      for (i=0;i<n;i++) {
+         unsigned long p;
+         PACK_TRUEDITHER(p, x+i, y, rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]);
+         XMesaPutPixel( rowimg, i, 0, p );
+      }
+      XMesaPutImage( dpy, buffer, gc, rowimg, 0, 0, x, y, n, 1 );
+   }
+}
+
+
+/*
+ * Write a span of PF_TRUEDITHER pixels to a pixmap (no alpha).
+ */
+static void write_span_rgb_TRUEDITHER_pixmap( RGB_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            unsigned long p;
+            PACK_TRUEDITHER(p, x, y, rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP]);
+            XMesaSetForeground( dpy, gc, p );
+            XMesaDrawPoint( dpy, buffer, gc, (int) x, (int) y );
+         }
+      }
+   }
+   else {
+      XMesaImage *rowimg = xmesa->xm_buffer->rowimage;
+      for (i=0;i<n;i++) {
+         unsigned long p;
+         PACK_TRUEDITHER(p, x+i, y, rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP]);
+         XMesaPutPixel( rowimg, i, 0, p );
+      }
+      XMesaPutImage( dpy, buffer, gc, rowimg, 0, 0, x, y, n, 1 );
+   }
+}
+
+
+
+/*
+ * Write a span of PF_8A8B8G8R pixels to a pixmap.
+ */
+static void write_span_8A8B8G8R_pixmap( RGBA_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            XMesaSetForeground( dpy, gc,
+                         PACK_8A8B8G8R(rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP], rgba[i][ACOMP]) );
+            XMesaDrawPoint( dpy, buffer, gc, (int) x, (int) y );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      XMesaImage *rowimg = xmesa->xm_buffer->rowimage;
+      register GLuint *ptr4 = (GLuint *) rowimg->data;
+      for (i=0;i<n;i++) {
+         *ptr4++ = PACK_8A8B8G8R( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP], rgba[i][ACOMP] );
+      }
+      XMesaPutImage( dpy, buffer, gc, rowimg, 0, 0, x, y, n, 1 );
+   }
+}
+
+
+/*
+ * Write a span of PF_8A8B8G8R pixels to a pixmap (no alpha).
+ */
+static void write_span_rgb_8A8B8G8R_pixmap( RGB_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            XMesaSetForeground( dpy, gc,
+                   PACK_8B8G8R(rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP]) );
+            XMesaDrawPoint( dpy, buffer, gc, (int) x, (int) y );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      XMesaImage *rowimg = xmesa->xm_buffer->rowimage;
+      register GLuint *ptr4 = (GLuint *) rowimg->data;
+      for (i=0;i<n;i++) {
+         *ptr4++ = PACK_8B8G8R(rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP]);
+      }
+      XMesaPutImage( dpy, buffer, gc, rowimg, 0, 0, x, y, n, 1 );
+   }
+}
+
+
+/*
+ * Write a span of PF_8R8G8B pixels to a pixmap.
+ */
+static void write_span_8R8G8B_pixmap( RGBA_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            XMesaSetForeground( dpy, gc, PACK_8R8G8B( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] ));
+            XMesaDrawPoint( dpy, buffer, gc, (int) x, (int) y );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      XMesaImage *rowimg = xmesa->xm_buffer->rowimage;
+      register GLuint *ptr4 = (GLuint *) rowimg->data;
+      for (i=0;i<n;i++) {
+         *ptr4++ = PACK_8R8G8B( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+      }
+      XMesaPutImage( dpy, buffer, gc, rowimg, 0, 0, x, y, n, 1 );
+   }
+}
+
+
+/*
+ * Write a span of PF_8R8G8B24 pixels to a pixmap.
+ */
+static void write_span_8R8G8B24_pixmap( RGBA_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      register GLuint i;
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            XMesaSetForeground( dpy, gc,
+               PACK_8R8G8B( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] ));
+            XMesaDrawPoint( dpy, buffer, gc, (int) x, (int) y );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      XMesaImage *rowimg = xmesa->xm_buffer->rowimage;
+      register GLuint *ptr4 = (GLuint *) rowimg->data;
+      register GLuint pixel;
+      static const GLuint shift[4] = {0, 8, 16, 24};
+      register GLuint i = 0;
+      int w = n;
+      while (w > 3) {
+         pixel  = rgba[i][BCOMP] /* << shift[0]*/;
+         pixel |= rgba[i][GCOMP]    << shift[1];
+         pixel |= rgba[i++][RCOMP]  << shift[2];
+         pixel |= rgba[i][BCOMP]    << shift[3];
+         *ptr4++ = pixel;
+
+         pixel  = rgba[i][GCOMP] /* << shift[0]*/;
+         pixel |= rgba[i++][RCOMP]  << shift[1];
+         pixel |= rgba[i][BCOMP]    << shift[2];
+         pixel |= rgba[i][GCOMP]    << shift[3];
+         *ptr4++ = pixel;
+
+         pixel  = rgba[i++][RCOMP]/* << shift[0]*/;
+         pixel |= rgba[i][BCOMP]     << shift[1];
+         pixel |= rgba[i][GCOMP]     << shift[2];
+         pixel |= rgba[i++][RCOMP]   << shift[3];
+         *ptr4++ = pixel;
+
+         w -= 4;
+      }
+      switch (w) {
+         case 3:
+            pixel = 0;
+            pixel |= rgba[i][BCOMP] /*<< shift[0]*/;
+            pixel |= rgba[i][GCOMP]   << shift[1];
+            pixel |= rgba[i++][RCOMP] << shift[2];
+            pixel |= rgba[i][BCOMP]   << shift[3];
+            *ptr4++ = pixel;
+            pixel = 0;
+            pixel |= rgba[i][GCOMP] /*<< shift[0]*/;
+            pixel |= rgba[i++][RCOMP] << shift[1];
+            pixel |= rgba[i][BCOMP]   << shift[2];
+            pixel |= rgba[i][GCOMP]   << shift[3];
+            *ptr4++ = pixel;
+            pixel = 0xffffff00 & *ptr4;
+            pixel |= rgba[i][RCOMP] /*<< shift[0]*/;
+            *ptr4 = pixel;
+            break;
+         case 2:
+            pixel = 0;
+            pixel |= rgba[i][BCOMP] /*<< shift[0]*/;
+            pixel |= rgba[i][GCOMP]   << shift[1];
+            pixel |= rgba[i++][RCOMP] << shift[2];
+            pixel |= rgba[i][BCOMP]   << shift[3];
+            *ptr4++ = pixel;
+            pixel = 0xffff0000 & *ptr4;
+            pixel |= rgba[i][GCOMP] /*<< shift[0]*/;
+            pixel |= rgba[i][RCOMP]   << shift[1];
+            *ptr4 = pixel;
+            break;
+         case 1:
+            pixel = 0xff000000 & *ptr4;
+            pixel |= rgba[i][BCOMP] /*<< shift[0]*/;
+            pixel |= rgba[i][GCOMP] << shift[1];
+            pixel |= rgba[i][RCOMP] << shift[2];
+            *ptr4 = pixel;
+            break;
+         case 0:
+            break;
+      }
+      XMesaPutImage( dpy, buffer, gc, rowimg, 0, 0, x, y, n, 1 );
+   }
+}
+
+
+/*
+ * Write a span of PF_8R8G8B pixels to a pixmap (no alpha).
+ */
+static void write_span_rgb_8R8G8B_pixmap( RGB_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            XMesaSetForeground( dpy, gc, PACK_8R8G8B( rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] ));
+            XMesaDrawPoint( dpy, buffer, gc, (int) x, (int) y );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      XMesaImage *rowimg = xmesa->xm_buffer->rowimage;
+      register GLuint *ptr4 = (GLuint *) rowimg->data;
+      for (i=0;i<n;i++) {
+         *ptr4++ = PACK_8R8G8B( rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] );
+      }
+      XMesaPutImage( dpy, buffer, gc, rowimg, 0, 0, x, y, n, 1 );
+   }
+}
+
+
+/*
+ * Write a span of PF_8R8G8B24 pixels to a pixmap (no alpha).
+ */
+static void write_span_rgb_8R8G8B24_pixmap( RGB_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      register GLuint i;
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            XMesaSetForeground( dpy, gc,
+                  PACK_8R8G8B( rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] ));
+            XMesaDrawPoint( dpy, buffer, gc, (int) x, (int) y );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      XMesaImage *rowimg = xmesa->xm_buffer->rowimage;
+      register GLuint *ptr4 = (GLuint *) rowimg->data;
+      register GLuint pixel;
+      static const GLuint shift[4] = {0, 8, 16, 24};
+      unsigned w = n;
+      register GLuint i = 0;
+      while (w > 3) {
+         pixel = 0;
+         pixel |= rgb[i][BCOMP]/* << shift[0]*/;
+         pixel |= rgb[i][GCOMP] << shift[1];
+         pixel |= rgb[i++][RCOMP] << shift[2];
+         pixel |= rgb[i][BCOMP] <<shift[3];
+         *ptr4++ = pixel;
+
+         pixel = 0;
+         pixel |= rgb[i][GCOMP]/* << shift[0]*/;
+         pixel |= rgb[i++][RCOMP] << shift[1];
+         pixel |= rgb[i][BCOMP] << shift[2];
+         pixel |= rgb[i][GCOMP] << shift[3];
+         *ptr4++ = pixel;
+
+         pixel = 0;
+         pixel |= rgb[i++][RCOMP]/* << shift[0]*/;
+         pixel |= rgb[i][BCOMP] << shift[1];
+         pixel |= rgb[i][GCOMP] << shift[2];
+         pixel |= rgb[i++][RCOMP] << shift[3];
+         *ptr4++ = pixel;
+         w -= 4;
+      }
+      switch (w) {
+         case 3:
+            pixel = 0;
+            pixel |= rgb[i][BCOMP]/* << shift[0]*/;
+            pixel |= rgb[i][GCOMP] << shift[1];
+            pixel |= rgb[i++][RCOMP] << shift[2];
+            pixel |= rgb[i][BCOMP] << shift[3];
+            *ptr4++ = pixel;
+            pixel = 0;
+            pixel |= rgb[i][GCOMP]/* << shift[0]*/;
+            pixel |= rgb[i++][RCOMP] << shift[1];
+            pixel |= rgb[i][BCOMP] << shift[2];
+            pixel |= rgb[i][GCOMP] << shift[3];
+            *ptr4++ = pixel;
+            pixel = *ptr4;
+            pixel &= 0xffffff00;
+            pixel |= rgb[i++][RCOMP]/* << shift[0]*/;
+            *ptr4++ = pixel;
+            break;
+         case 2:
+            pixel = 0;
+            pixel |= rgb[i][BCOMP]/* << shift[0]*/;
+            pixel |= rgb[i][GCOMP] << shift[1];
+            pixel |= rgb[i++][RCOMP] << shift[2];
+            pixel |= rgb[i][BCOMP]  << shift[3];
+            *ptr4++ = pixel;
+            pixel = *ptr4;
+            pixel &= 0xffff0000;
+            pixel |= rgb[i][GCOMP]/* << shift[0]*/;
+            pixel |= rgb[i++][RCOMP] << shift[1];
+            *ptr4++ = pixel;
+            break;
+         case 1:
+            pixel = *ptr4;
+            pixel &= 0xff000000;
+            pixel |= rgb[i][BCOMP]/* << shift[0]*/;
+            pixel |= rgb[i][GCOMP] << shift[1];
+            pixel |= rgb[i++][RCOMP] << shift[2];
+            *ptr4++ = pixel;
+            break;
+         case 0:
+            break;
+      }
+      XMesaPutImage( dpy, buffer, gc, rowimg, 0, 0, x, y, n, 1 );
+   }
+}
+
+
+/*
+ * Write a span of PF_5R6G5B pixels to a pixmap.
+ */
+static void write_span_5R6G5B_pixmap( RGBA_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            XMesaSetForeground( dpy, gc, PACK_5R6G5B( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] ));
+            XMesaDrawPoint( dpy, buffer, gc, (int) x, (int) y );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      XMesaImage *rowimg = xmesa->xm_buffer->rowimage;
+      register GLushort *ptr2 = (GLushort *) rowimg->data;
+      for (i=0;i<n;i++) {
+         ptr2[i] = PACK_5R6G5B( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+      }
+      XMesaPutImage( dpy, buffer, gc, rowimg, 0, 0, x, y, n, 1 );
+   }
+}
+
+
+/*
+ * Write a span of PF_DITHER_5R6G5B pixels to a pixmap.
+ */
+static void write_span_DITHER_5R6G5B_pixmap( RGBA_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            unsigned long p;
+            PACK_TRUEDITHER(p, x, y, rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]);
+            XMesaSetForeground( dpy, gc, p );
+            XMesaDrawPoint( dpy, buffer, gc, (int) x, (int) y );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      XMesaImage *rowimg = xmesa->xm_buffer->rowimage;
+      register GLushort *ptr2 = (GLushort *) rowimg->data;
+      for (i=0;i<n;i++) {
+         PACK_TRUEDITHER( ptr2[i], x+i, y, rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+      }
+      XMesaPutImage( dpy, buffer, gc, rowimg, 0, 0, x, y, n, 1 );
+   }
+}
+
+
+/*
+ * Write a span of PF_5R6G5B pixels to a pixmap (no alpha).
+ */
+static void write_span_rgb_5R6G5B_pixmap( RGB_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            XMesaSetForeground( dpy, gc, PACK_5R6G5B( rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] ));
+            XMesaDrawPoint( dpy, buffer, gc, (int) x, (int) y );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      XMesaImage *rowimg = xmesa->xm_buffer->rowimage;
+      register GLushort *ptr2 = (GLushort *) rowimg->data;
+      for (i=0;i<n;i++) {
+         ptr2[i] = PACK_5R6G5B( rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] );
+      }
+      XMesaPutImage( dpy, buffer, gc, rowimg, 0, 0, x, y, n, 1 );
+   }
+}
+
+
+/*
+ * Write a span of PF_DITHER_5R6G5B pixels to a pixmap (no alpha).
+ */
+static void write_span_rgb_DITHER_5R6G5B_pixmap( RGB_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            unsigned long p;
+            PACK_TRUEDITHER(p, x, y, rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP]);
+            XMesaSetForeground( dpy, gc, p );
+            XMesaDrawPoint( dpy, buffer, gc, (int) x, (int) y );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      XMesaImage *rowimg = xmesa->xm_buffer->rowimage;
+      register GLushort *ptr2 = (GLushort *) rowimg->data;
+      for (i=0;i<n;i++) {
+         PACK_TRUEDITHER( ptr2[i], x+i, y, rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] );
+      }
+      XMesaPutImage( dpy, buffer, gc, rowimg, 0, 0, x, y, n, 1 );
+   }
+}
+
+
+
+/*
+ * Write a span of PF_DITHER pixels to a pixmap.
+ */
+static void write_span_DITHER_pixmap( RGBA_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   XDITHER_SETUP(y);
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            XMesaSetForeground( dpy, gc, XDITHER(x, rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]) );
+            XMesaDrawPoint( dpy, buffer, gc, (int) x, (int) y );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      XMesaImage *rowimg = xmesa->xm_buffer->rowimage;
+      for (i=0;i<n;i++) {
+         XMesaPutPixel( rowimg, i, 0, XDITHER(x+i, rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]) );
+      }
+      XMesaPutImage( dpy, buffer, gc, rowimg, 0, 0, x, y, n, 1 );
+   }
+}
+
+
+/*
+ * Write a span of PF_DITHER pixels to a pixmap (no alpha).
+ */
+static void write_span_rgb_DITHER_pixmap( RGB_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   XDITHER_SETUP(y);
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            XMesaSetForeground( dpy, gc, XDITHER(x, rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP]) );
+            XMesaDrawPoint( dpy, buffer, gc, (int) x, (int) y );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      XMesaImage *rowimg = xmesa->xm_buffer->rowimage;
+      for (i=0;i<n;i++) {
+         XMesaPutPixel( rowimg, i, 0, XDITHER(x+i, rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP]) );
+      }
+      XMesaPutImage( dpy, buffer, gc, rowimg, 0, 0, x, y, n, 1 );
+   }
+}
+
+
+/*
+ * Write a span of PF_1BIT pixels to a pixmap.
+ */
+static void write_span_1BIT_pixmap( RGBA_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   SETUP_1BIT;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            XMesaSetForeground( dpy, gc,
+                            DITHER_1BIT( x, y, rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] ) );
+            XMesaDrawPoint( dpy, buffer, gc, (int) x, (int) y );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      XMesaImage *rowimg = xmesa->xm_buffer->rowimage;
+      for (i=0;i<n;i++) {
+         XMesaPutPixel( rowimg, i, 0,
+                    DITHER_1BIT( x+i, y, rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] ) );
+      }
+      XMesaPutImage( dpy, buffer, gc, rowimg, 0, 0, x, y, n, 1 );
+   }
+}
+
+
+/*
+ * Write a span of PF_1BIT pixels to a pixmap (no alpha).
+ */
+static void write_span_rgb_1BIT_pixmap( RGB_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   SETUP_1BIT;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            XMesaSetForeground( dpy, gc,
+              DITHER_1BIT(x, y, rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP]) );
+            XMesaDrawPoint( dpy, buffer, gc, (int) x, (int) y );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      XMesaImage *rowimg = xmesa->xm_buffer->rowimage;
+      for (i=0;i<n;i++) {
+         XMesaPutPixel( rowimg, i, 0,
+          DITHER_1BIT(x+i, y, rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP]) );
+      }
+      XMesaPutImage( dpy, buffer, gc, rowimg, 0, 0, x, y, n, 1 );
+   }
+}
+
+
+/*
+ * Write a span of PF_HPCR pixels to a pixmap.
+ */
+static void write_span_HPCR_pixmap( RGBA_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            XMesaSetForeground( dpy, gc,
+                            DITHER_HPCR( x, y, rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] ) );
+            XMesaDrawPoint( dpy, buffer, gc, (int) x, (int) y );
+         }
+      }
+   }
+   else {
+      XMesaImage *rowimg = xmesa->xm_buffer->rowimage;
+      register GLubyte *ptr = (GLubyte *) xmesa->xm_buffer->rowimage->data;
+      for (i=0;i<n;i++) {
+         ptr[i] = DITHER_HPCR( (x+i), y, rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+      }
+      XMesaPutImage( dpy, buffer, gc, rowimg, 0, 0, x, y, n, 1 );
+   }
+}
+
+
+/*
+ * Write a span of PF_HPCR pixels to a pixmap (no alpha).
+ */
+static void write_span_rgb_HPCR_pixmap( RGB_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            XMesaSetForeground( dpy, gc,
+              DITHER_HPCR(x, y, rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP]) );
+            XMesaDrawPoint( dpy, buffer, gc, (int) x, (int) y );
+         }
+      }
+   }
+   else {
+      XMesaImage *rowimg = xmesa->xm_buffer->rowimage;
+      register GLubyte *ptr = (GLubyte *) xmesa->xm_buffer->rowimage->data;
+      for (i=0;i<n;i++) {
+         ptr[i] = DITHER_HPCR( (x+i), y, rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] );
+      }
+      XMesaPutImage( dpy, buffer, gc, rowimg, 0, 0, x, y, n, 1 );
+   }
+}
+
+
+/*
+ * Write a span of PF_LOOKUP pixels to a pixmap.
+ */
+static void write_span_LOOKUP_pixmap( RGBA_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   LOOKUP_SETUP;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            XMesaSetForeground( dpy, gc, LOOKUP( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] ) );
+            XMesaDrawPoint( dpy, buffer, gc, (int) x, (int) y );
+         }
+      }
+   }
+   else {
+      XMesaImage *rowimg = xmesa->xm_buffer->rowimage;
+      for (i=0;i<n;i++) {
+         XMesaPutPixel( rowimg, i, 0, LOOKUP(rgba[i][RCOMP],rgba[i][GCOMP],rgba[i][BCOMP]) );
+      }
+      XMesaPutImage( dpy, buffer, gc, rowimg, 0, 0, x, y, n, 1 );
+   }
+}
+
+
+/*
+ * Write a span of PF_LOOKUP pixels to a pixmap (no alpha).
+ */
+static void write_span_rgb_LOOKUP_pixmap( RGB_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   LOOKUP_SETUP;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            XMesaSetForeground( dpy, gc, LOOKUP( rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] ) );
+            XMesaDrawPoint( dpy, buffer, gc, (int) x, (int) y );
+         }
+      }
+   }
+   else {
+      XMesaImage *rowimg = xmesa->xm_buffer->rowimage;
+      for (i=0;i<n;i++) {
+         XMesaPutPixel( rowimg, i, 0, LOOKUP(rgb[i][RCOMP],rgb[i][GCOMP],rgb[i][BCOMP]) );
+      }
+      XMesaPutImage( dpy, buffer, gc, rowimg, 0, 0, x, y, n, 1 );
+   }
+}
+
+
+
+/*
+ * Write a span of PF_GRAYSCALE pixels to a pixmap.
+ */
+static void write_span_GRAYSCALE_pixmap( RGBA_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            XMesaSetForeground( dpy, gc, GRAY_RGB( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] ) );
+            XMesaDrawPoint( dpy, buffer, gc, (int) x, (int) y );
+         }
+      }
+   }
+   else {
+      XMesaImage *rowimg = xmesa->xm_buffer->rowimage;
+      for (i=0;i<n;i++) {
+         XMesaPutPixel( rowimg, i, 0, GRAY_RGB(rgba[i][RCOMP],rgba[i][GCOMP],rgba[i][BCOMP]) );
+      }
+      XMesaPutImage( dpy, buffer, gc, rowimg, 0, 0, x, y, n, 1 );
+   }
+}
+
+
+/*
+ * Write a span of PF_GRAYSCALE pixels to a pixmap (no alpha).
+ */
+static void write_span_rgb_GRAYSCALE_pixmap( RGB_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            XMesaSetForeground( dpy, gc, GRAY_RGB( rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] ) );
+            XMesaDrawPoint( dpy, buffer, gc, (int) x, (int) y );
+         }
+      }
+   }
+   else {
+      XMesaImage *rowimg = xmesa->xm_buffer->rowimage;
+      for (i=0;i<n;i++) {
+         XMesaPutPixel( rowimg, i, 0, GRAY_RGB(rgb[i][RCOMP],rgb[i][GCOMP],rgb[i][BCOMP]) );
+      }
+      XMesaPutImage( dpy, buffer, gc, rowimg, 0, 0, x, y, n, 1 );
+   }
+}
+
+
+/*
+ * Write a span of PF_TRUECOLOR pixels to an XImage.
+ */
+static void write_span_TRUECOLOR_ximage( RGBA_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+   register GLuint i;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            unsigned long p;
+            PACK_TRUECOLOR( p, rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+            XMesaPutPixel( img, x, y, p );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      for (i=0;i<n;i++,x++) {
+         unsigned long p;
+         PACK_TRUECOLOR( p, rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+         XMesaPutPixel( img, x, y, p );
+      }
+   }
+}
+
+
+/*
+ * Write a span of PF_TRUECOLOR pixels to an XImage (no alpha).
+ */
+static void write_span_rgb_TRUECOLOR_ximage( RGB_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+   register GLuint i;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            unsigned long p;
+            PACK_TRUECOLOR( p, rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] );
+            XMesaPutPixel( img, x, y, p );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      for (i=0;i<n;i++,x++) {
+         unsigned long p;
+         PACK_TRUECOLOR( p, rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] );
+         XMesaPutPixel( img, x, y, p );
+      }
+   }
+}
+
+
+/*
+ * Write a span of PF_TRUEDITHER pixels to an XImage.
+ */
+static void write_span_TRUEDITHER_ximage( RGBA_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+   register GLuint i;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            unsigned long p;
+            PACK_TRUEDITHER(p, x, y, rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]);
+            XMesaPutPixel( img, x, y, p );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      for (i=0;i<n;i++,x++) {
+         unsigned long p;
+         PACK_TRUEDITHER(p, x, y, rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]);
+         XMesaPutPixel( img, x, y, p );
+      }
+   }
+}
+
+
+/*
+ * Write a span of PF_TRUEDITHER pixels to an XImage (no alpha).
+ */
+static void write_span_rgb_TRUEDITHER_ximage( RGB_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+   register GLuint i;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            unsigned long p;
+            PACK_TRUEDITHER(p, x, y, rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP]);
+            XMesaPutPixel( img, x, y, p );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      for (i=0;i<n;i++,x++) {
+         unsigned long p;
+         PACK_TRUEDITHER(p, x, y, rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP]);
+         XMesaPutPixel( img, x, y, p );
+      }
+   }
+}
+
+
+/*
+ * Write a span of PF_8A8B8G8R-format pixels to an ximage.
+ */
+static void write_span_8A8B8G8R_ximage( RGBA_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint i;
+   register GLuint *ptr = PIXELADDR4( xmesa->xm_buffer, x, y );
+   if (mask) {
+      for (i=0;i<n;i++) {
+         if (mask[i]) {
+            ptr[i] = PACK_8A8B8G8R( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP], rgba[i][ACOMP] );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      for (i=0;i<n;i++) {
+         ptr[i] = PACK_8A8B8G8R( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP], rgba[i][ACOMP] );
+      }
+   }
+}
+
+
+/*
+ * Write a span of PF_8A8B8G8R-format pixels to an ximage (no alpha).
+ */
+static void write_span_rgb_8A8B8G8R_ximage( RGB_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint i;
+   register GLuint *ptr = PIXELADDR4( xmesa->xm_buffer, x, y );
+   if (mask) {
+      for (i=0;i<n;i++) {
+         if (mask[i]) {
+            ptr[i] = PACK_8A8B8G8R( rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP], 255 );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      for (i=0;i<n;i++) {
+         ptr[i] = PACK_8A8B8G8R( rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP], 255 );
+      }
+   }
+}
+
+
+/*
+ * Write a span of PF_8R8G8B-format pixels to an ximage.
+ */
+static void write_span_8R8G8B_ximage( RGBA_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint i;
+   register GLuint *ptr = PIXELADDR4( xmesa->xm_buffer, x, y );
+   if (mask) {
+      for (i=0;i<n;i++) {
+         if (mask[i]) {
+            ptr[i] = PACK_8R8G8B(rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]);
+         }
+      }
+   }
+   else {
+      for (i=0;i<n;i++) {
+         ptr[i] = PACK_8R8G8B(rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]);
+      }
+   }
+}
+
+
+/*
+ * Write a span of PF_8R8G8B24-format pixels to an ximage.
+ */
+static void write_span_8R8G8B24_ximage( RGBA_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint i;
+   register GLubyte *ptr = (GLubyte *) PIXELADDR3( xmesa->xm_buffer, x, y );
+   if (mask) {
+      for (i=0;i<n;i++) {
+         if (mask[i]) {
+            GLuint *ptr4 = (GLuint *) ptr;
+            register GLuint pixel = *ptr4;
+            switch (3 & (int)(ptr - (GLubyte*)ptr4)) {
+               case 0:
+                  pixel &= 0xff000000;
+                  pixel |= rgba[i][BCOMP];
+                  pixel |= rgba[i][GCOMP] << 8;
+                  pixel |= rgba[i][RCOMP] << 16;
+                  *ptr4 = pixel;
+                  break;
+               case 3:
+                  pixel &= 0x00ffffff;
+                  pixel |= rgba[i][BCOMP] << 24;
+                  *ptr4++ = pixel;
+                  pixel = *ptr4 && 0xffff0000;
+                  pixel |= rgba[i][GCOMP];
+                  pixel |= rgba[i][RCOMP] << 8;
+                  *ptr4 = pixel;
+                  break;
+               case 2:
+                  pixel &= 0x0000ffff;
+                  pixel |= rgba[i][BCOMP] << 16;
+                  pixel |= rgba[i][GCOMP] << 24;
+                  *ptr4++ = pixel;
+                  pixel = *ptr4 && 0xffffff00;
+                  pixel |= rgba[i][RCOMP];
+                  *ptr4 = pixel;
+                  break;
+               case 1:
+                  pixel &= 0x000000ff;
+                  pixel |= rgba[i][BCOMP] << 8;
+                  pixel |= rgba[i][GCOMP] << 16;
+                  pixel |= rgba[i][RCOMP] << 24;
+                  *ptr4 = pixel;
+                  break;
+            }
+         }
+	 ptr += 3;
+      }
+   }
+   else {
+      /* write all pixels */
+      int w = n;
+      GLuint *ptr4 = (GLuint *) ptr;
+      register GLuint pixel = *ptr4;
+      int index = (int)(ptr - (GLubyte *)ptr4);
+      register GLuint i = 0;
+      switch (index) {
+         case 0:
+            break;
+         case 1:
+            pixel &= 0x00ffffff;
+            pixel |= rgba[i][BCOMP] << 24;
+            *ptr4++ = pixel;
+            pixel = *ptr4 && 0xffff0000;
+            pixel |= rgba[i][GCOMP];
+            pixel |= rgba[i++][RCOMP] << 8;
+            *ptr4 = pixel;
+            if (0 == --w)
+               break;
+         case 2:
+            pixel &= 0x0000ffff;
+            pixel |= rgba[i][BCOMP] << 16;
+            pixel |= rgba[i][GCOMP] << 24;
+            *ptr4++ = pixel;
+            pixel = *ptr4 && 0xffffff00;
+            pixel |= rgba[i++][RCOMP];
+            *ptr4 = pixel;
+            if (0 == --w)
+               break;
+         case 3:
+            pixel &= 0x000000ff;
+            pixel |= rgba[i][BCOMP] << 8;
+            pixel |= rgba[i][GCOMP] << 16;
+            pixel |= rgba[i++][RCOMP] << 24;
+            *ptr4++ = pixel;
+            if (0 == --w)
+               break;
+            break;
+      }
+      while (w > 3) {
+         pixel = rgba[i][BCOMP];
+         pixel |= rgba[i][GCOMP] << 8;
+         pixel |= rgba[i++][RCOMP] << 16;
+         pixel |= rgba[i][BCOMP] << 24;
+         *ptr4++ = pixel;
+         pixel = rgba[i][GCOMP];
+         pixel |= rgba[i++][RCOMP] << 8;
+         pixel |= rgba[i][BCOMP] << 16;
+         pixel |= rgba[i][GCOMP] << 24;
+         *ptr4++ = pixel;
+         pixel = rgba[i++][RCOMP];
+         pixel |= rgba[i][BCOMP] << 8;
+         pixel |= rgba[i][GCOMP] << 16;
+         pixel |= rgba[i++][RCOMP] << 24;
+         *ptr4++ = pixel;
+         w -= 4;
+      }
+      switch (w) {
+         case 0:
+            break;
+         case 1:
+            pixel = *ptr4 & 0xff000000;
+            pixel |= rgba[i][BCOMP];
+            pixel |= rgba[i][GCOMP] << 8;
+            pixel |= rgba[i][RCOMP] << 16;
+            *ptr4 = pixel;
+            break;
+         case 2:
+            pixel = rgba[i][BCOMP];
+            pixel |= rgba[i][GCOMP] << 8;
+            pixel |= rgba[i++][RCOMP] << 16;
+            pixel |= rgba[i][BCOMP] << 24;
+            *ptr4++ = pixel;
+            pixel = *ptr4 & 0xffff0000;
+            pixel |= rgba[i][GCOMP];
+            pixel |= rgba[i][RCOMP] << 8;
+            *ptr4 = pixel;
+            break;
+         case 3:
+            pixel = rgba[i][BCOMP];
+            pixel |= rgba[i][GCOMP] << 8;
+            pixel |= rgba[i++][RCOMP] << 16;
+            pixel |= rgba[i][BCOMP] << 24;
+            *ptr4++ = pixel;
+            pixel = rgba[i][GCOMP];
+            pixel |= rgba[i++][RCOMP] << 8;
+            pixel |= rgba[i][BCOMP] << 16;
+            pixel |= rgba[i][GCOMP] << 24;
+            *ptr4++ = pixel;
+            pixel = *ptr4 & 0xffffff00;
+            pixel |= rgba[i][RCOMP];
+            *ptr4 = pixel;
+            break;
+      }
+   }
+}
+
+
+/*
+ * Write a span of PF_8R8G8B-format pixels to an ximage (no alpha).
+ */
+static void write_span_rgb_8R8G8B_ximage( RGB_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint i;
+   register GLuint *ptr = PIXELADDR4( xmesa->xm_buffer, x, y );
+   if (mask) {
+      for (i=0;i<n;i++) {
+         if (mask[i]) {
+            ptr[i] = PACK_8R8G8B(rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP]);
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      for (i=0;i<n;i++) {
+         ptr[i] = PACK_8R8G8B(rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP]);
+      }
+   }
+}
+
+
+/*
+ * Write a span of PF_8R8G8B24-format pixels to an ximage (no alpha).
+ */
+static void write_span_rgb_8R8G8B24_ximage( RGB_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint i;
+   register GLubyte *ptr = (GLubyte *) PIXELADDR3( xmesa->xm_buffer, x, y );
+   if (mask) {
+      for (i=0;i<n;i++) {
+         if (mask[i]) {
+            *ptr++ = rgb[i][BCOMP];
+            *ptr++ = rgb[i][GCOMP];
+            *ptr++ = rgb[i][RCOMP];
+         }
+         else {
+            ptr += 3;
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      for (i=0;i<n;i++) {
+         *ptr++ = rgb[i][BCOMP];
+         *ptr++ = rgb[i][GCOMP];
+         *ptr++ = rgb[i][RCOMP];
+      }
+   }
+}
+
+
+/*
+ * Write a span of PF_5R6G5B-format pixels to an ximage.
+ */
+static void write_span_5R6G5B_ximage( RGBA_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint i;
+   register GLushort *ptr = PIXELADDR2( xmesa->xm_buffer, x, y );
+   if (mask) {
+      for (i=0;i<n;i++) {
+         if (mask[i]) {
+            ptr[i] = PACK_5R6G5B( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+#if defined(__i386__) /* word stores don't have to be on 4-byte boundaries */
+      GLuint *ptr32 = (GLuint *) ptr;
+      GLuint extraPixel = (n & 1);
+      n -= extraPixel;
+      for (i = 0; i < n; i += 2) {
+         GLuint p0, p1;
+         p0 = PACK_5R6G5B(rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]);
+         p1 = PACK_5R6G5B(rgba[i+1][RCOMP], rgba[i+1][GCOMP], rgba[i+1][BCOMP]);
+         *ptr32++ = (p1 << 16) | p0;
+      }
+      if (extraPixel) {
+         ptr[n] = PACK_5R6G5B(rgba[n][RCOMP], rgba[n][GCOMP], rgba[n][BCOMP]);
+      }
+#else
+      for (i = 0; i < n; i++) {
+         ptr[i] = PACK_5R6G5B(rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]);
+      }
+#endif
+   }
+}
+
+
+/*
+ * Write a span of PF_DITHER_5R6G5B-format pixels to an ximage.
+ */
+static void write_span_DITHER_5R6G5B_ximage( RGBA_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint i;
+   register GLushort *ptr = PIXELADDR2( xmesa->xm_buffer, x, y );
+   const GLint y2 = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            PACK_TRUEDITHER( ptr[i], x, y2, rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+#if defined(__i386__) /* word stores don't have to be on 4-byte boundaries */
+      GLuint *ptr32 = (GLuint *) ptr;
+      GLuint extraPixel = (n & 1);
+      n -= extraPixel;
+      for (i = 0; i < n; i += 2, x += 2) {
+         GLuint p0, p1;
+         PACK_TRUEDITHER( p0, x, y2, rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+         PACK_TRUEDITHER( p1, x+1, y2, rgba[i+1][RCOMP], rgba[i+1][GCOMP], rgba[i+1][BCOMP] );
+         *ptr32++ = (p1 << 16) | p0;
+      }
+      if (extraPixel) {
+         PACK_TRUEDITHER( ptr[n], x+n, y2, rgba[n][RCOMP], rgba[n][GCOMP], rgba[n][BCOMP]);
+      }
+#else
+      for (i = 0; i < n; i++, x++) {
+         PACK_TRUEDITHER( ptr[i], x, y2, rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]);
+      }
+#endif
+   }
+}
+
+
+/*
+ * Write a span of PF_5R6G5B-format pixels to an ximage (no alpha).
+ */
+static void write_span_rgb_5R6G5B_ximage( RGB_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint i;
+   register GLushort *ptr = PIXELADDR2( xmesa->xm_buffer, x, y );
+   if (mask) {
+      for (i=0;i<n;i++) {
+         if (mask[i]) {
+            ptr[i] = PACK_5R6G5B( rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+#if defined(__i386__) /* word stores don't have to be on 4-byte boundaries */
+      GLuint *ptr32 = (GLuint *) ptr;
+      GLuint extraPixel = (n & 1);
+      n -= extraPixel;
+      for (i = 0; i < n; i += 2) {
+         GLuint p0, p1;
+         p0 = PACK_5R6G5B(rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP]);
+         p1 = PACK_5R6G5B(rgb[i+1][RCOMP], rgb[i+1][GCOMP], rgb[i+1][BCOMP]);
+         *ptr32++ = (p1 << 16) | p0;
+      }
+      if (extraPixel) {
+         ptr[n] = PACK_5R6G5B(rgb[n][RCOMP], rgb[n][GCOMP], rgb[n][BCOMP]);
+      }
+#else
+      for (i=0;i<n;i++) {
+         ptr[i] = PACK_5R6G5B( rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] );
+      }
+#endif
+   }
+}
+
+
+/*
+ * Write a span of PF_DITHER_5R6G5B-format pixels to an ximage (no alpha).
+ */
+static void write_span_rgb_DITHER_5R6G5B_ximage( RGB_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint i;
+   register GLushort *ptr = PIXELADDR2( xmesa->xm_buffer, x, y );
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            PACK_TRUEDITHER( ptr[i], x, y, rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+#if defined(__i386__) /* word stores don't have to be on 4-byte boundaries */
+      GLuint *ptr32 = (GLuint *) ptr;
+      GLuint extraPixel = (n & 1);
+      n -= extraPixel;
+      for (i = 0; i < n; i += 2, x += 2) {
+         GLuint p0, p1;
+         PACK_TRUEDITHER( p0, x, y, rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] );
+         PACK_TRUEDITHER( p1, x+1, y, rgb[i+1][RCOMP], rgb[i+1][GCOMP], rgb[i+1][BCOMP] );
+         *ptr32++ = (p1 << 16) | p0;
+      }
+      if (extraPixel) {
+         PACK_TRUEDITHER( ptr[n], x+n, y, rgb[n][RCOMP], rgb[n][GCOMP], rgb[n][BCOMP]);
+      }
+#else
+      for (i=0;i<n;i++,x++) {
+         PACK_TRUEDITHER( ptr[i], x, y, rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] );
+      }
+#endif
+   }
+}
+
+
+/*
+ * Write a span of PF_DITHER pixels to an XImage.
+ */
+static void write_span_DITHER_ximage( RGBA_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+   register GLuint i;
+   int yy = FLIP(xmesa->xm_buffer, y);
+   XDITHER_SETUP(yy);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            XMesaPutPixel( img, x, yy, XDITHER( x, rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] ) );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      for (i=0;i<n;i++,x++) {
+         XMesaPutPixel( img, x, yy, XDITHER( x, rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] ) );
+      }
+   }
+}
+
+
+/*
+ * Write a span of PF_DITHER pixels to an XImage (no alpha).
+ */
+static void write_span_rgb_DITHER_ximage( RGB_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+   register GLuint i;
+   int yy = FLIP(xmesa->xm_buffer, y);
+   XDITHER_SETUP(yy);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            XMesaPutPixel( img, x, yy, XDITHER( x, rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] ) );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      for (i=0;i<n;i++,x++) {
+         XMesaPutPixel( img, x, yy, XDITHER( x, rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] ) );
+      }
+   }
+}
+
+
+
+/*
+ * Write a span of 8-bit PF_DITHER pixels to an XImage.
+ */
+static void write_span_DITHER8_ximage( RGBA_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint i;
+   register GLubyte *ptr = PIXELADDR1( xmesa->xm_buffer, x, y );
+   XDITHER_SETUP(y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            ptr[i] = (GLubyte) XDITHER( x, rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+         }
+      }
+   }
+   else {
+      for (i=0;i<n;i++,x++) {
+         ptr[i] = (GLubyte) XDITHER( x, rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+      }
+   }
+}
+
+
+static void write_span_rgb_DITHER8_ximage( RGB_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint i;
+   register GLubyte *ptr = PIXELADDR1( xmesa->xm_buffer, x, y );
+   XDITHER_SETUP(y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            ptr[i] = (GLubyte) XDITHER( x, rgb[i][0], rgb[i][1], rgb[i][2] );
+         }
+      }
+   }
+   else {
+      const GLubyte *data = (GLubyte *) rgb;
+      for (i=0;i<n;i++,x++) {
+         /*ptr[i] = XDITHER( x, rgb[i][0], rgb[i][1], rgb[i][2] );*/
+         ptr[i] = (GLubyte) XDITHER( x, data[i+i+i], data[i+i+i+1], data[i+i+i+2] );
+      }
+   }
+}
+
+
+
+/*
+ * Write a span of PF_1BIT pixels to an XImage.
+ */
+static void write_span_1BIT_ximage( RGBA_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+   register GLuint i;
+   SETUP_1BIT;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            XMesaPutPixel(img, x, y, DITHER_1BIT(x, y, rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]));
+         }
+      }
+   }
+   else {
+      for (i=0;i<n;i++,x++) {
+         XMesaPutPixel( img, x, y, DITHER_1BIT(x, y, rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]) );
+      }
+   }
+}
+
+
+/*
+ * Write a span of PF_1BIT pixels to an XImage (no alpha).
+ */
+static void write_span_rgb_1BIT_ximage( RGB_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+   register GLuint i;
+   SETUP_1BIT;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            XMesaPutPixel(img, x, y, DITHER_1BIT(x, y, rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP]));
+         }
+      }
+   }
+   else {
+      for (i=0;i<n;i++,x++) {
+         XMesaPutPixel( img, x, y, DITHER_1BIT(x, y, rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP]) );
+      }
+   }
+}
+
+
+/*
+ * Write a span of PF_HPCR pixels to an XImage.
+ */
+static void write_span_HPCR_ximage( RGBA_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint i;
+   register GLubyte *ptr = PIXELADDR1( xmesa->xm_buffer, x, y );
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            ptr[i] = DITHER_HPCR( x, y, rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      for (i=0;i<n;i++,x++) {
+         ptr[i] = DITHER_HPCR( x, y, rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+      }
+   }
+}
+
+
+/*
+ * Write a span of PF_HPCR pixels to an XImage (no alpha).
+ */
+static void write_span_rgb_HPCR_ximage( RGB_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint i;
+   register GLubyte *ptr = PIXELADDR1( xmesa->xm_buffer, x, y );
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            ptr[i] = DITHER_HPCR( x, y, rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      for (i=0;i<n;i++,x++) {
+         ptr[i] = DITHER_HPCR( x, y, rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] );
+      }
+   }
+}
+
+
+/*
+ * Write a span of PF_LOOKUP pixels to an XImage.
+ */
+static void write_span_LOOKUP_ximage( RGBA_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+   register GLuint i;
+   LOOKUP_SETUP;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            XMesaPutPixel( img, x, y, LOOKUP( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] ) );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      for (i=0;i<n;i++,x++) {
+         XMesaPutPixel( img, x, y, LOOKUP( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] ) );
+      }
+   }
+}
+
+
+/*
+ * Write a span of PF_LOOKUP pixels to an XImage (no alpha).
+ */
+static void write_span_rgb_LOOKUP_ximage( RGB_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+   register GLuint i;
+   LOOKUP_SETUP;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            XMesaPutPixel( img, x, y, LOOKUP( rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] ) );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      for (i=0;i<n;i++,x++) {
+         XMesaPutPixel( img, x, y, LOOKUP( rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] ) );
+      }
+   }
+}
+
+
+/*
+ * Write a span of 8-bit PF_LOOKUP pixels to an XImage.
+ */
+static void write_span_LOOKUP8_ximage( RGBA_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint i;
+   register GLubyte *ptr = PIXELADDR1( xmesa->xm_buffer, x, y );
+   LOOKUP_SETUP;
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            ptr[i] = (GLubyte) LOOKUP( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      for (i=0;i<n;i++,x++) {
+         ptr[i] = (GLubyte) LOOKUP( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+      }
+   }
+}
+
+
+static void write_rgb_LOOKUP8_ximage( const GLcontext *ctx,
+                                      GLuint n, GLint x, GLint y,
+                                      CONST GLubyte rgb[][3],
+                                      const GLubyte mask[] )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint i;
+   register GLubyte *ptr = PIXELADDR1( xmesa->xm_buffer, x, y );
+   LOOKUP_SETUP;
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            ptr[i] = (GLubyte) LOOKUP( rgb[i][0], rgb[i][1], rgb[i][2] );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      const GLubyte *data = (GLubyte *) rgb;
+      for (i=0;i<n;i++,x++) {
+         /*ptr[i] = LOOKUP( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );*/
+         ptr[i] = (GLubyte) LOOKUP( data[i+i+i], data[i+i+i+1], data[i+i+i+2] );
+      }
+   }
+}
+
+
+/*
+ * Write a span of PF_GRAYSCALE pixels to an XImage.
+ */
+static void write_span_GRAYSCALE_ximage( RGBA_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+   register GLuint i;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            XMesaPutPixel( img, x, y, GRAY_RGB( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] ) );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      for (i=0;i<n;i++,x++) {
+         XMesaPutPixel( img, x, y, GRAY_RGB( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] ) );
+      }
+   }
+}
+
+
+/*
+ * Write a span of PF_GRAYSCALE pixels to an XImage (no alpha).
+ */
+static void write_span_rgb_GRAYSCALE_ximage( RGB_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+   register GLuint i;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            XMesaPutPixel( img, x, y, GRAY_RGB( rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] ) );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      for (i=0;i<n;i++,x++) {
+         XMesaPutPixel( img, x, y, GRAY_RGB( rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] ) );
+      }
+   }
+}
+
+
+/*
+ * Write a span of 8-bit PF_GRAYSCALE pixels to an XImage.
+ */
+static void write_span_GRAYSCALE8_ximage( RGBA_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint i;
+   register GLubyte *ptr = PIXELADDR1( xmesa->xm_buffer, x, y );
+   if (mask) {
+      for (i=0;i<n;i++) {
+         if (mask[i]) {
+            ptr[i] = (GLubyte) GRAY_RGB( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      for (i=0;i<n;i++) {
+         ptr[i] = (GLubyte) GRAY_RGB( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+      }
+   }
+}
+
+
+/*
+ * Write a span of 8-bit PF_GRAYSCALE pixels to an XImage (no alpha).
+ */
+static void write_span_rgb_GRAYSCALE8_ximage( RGB_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint i;
+   register GLubyte *ptr = PIXELADDR1( xmesa->xm_buffer, x, y );
+   if (mask) {
+      for (i=0;i<n;i++) {
+         if (mask[i]) {
+            ptr[i] = (GLubyte) GRAY_RGB( rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] );
+         }
+      }
+   }
+   else {
+      /* draw all pixels */
+      for (i=0;i<n;i++) {
+         ptr[i] = (GLubyte) GRAY_RGB( rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] );
+      }
+   }
+}
+
+
+
+
+/**********************************************************************/
+/*** Write COLOR PIXEL functions                                    ***/
+/**********************************************************************/
+
+
+#define RGBA_PIXEL_ARGS   const GLcontext *ctx,				\
+			  GLuint n, const GLint x[], const GLint y[],	\
+			  CONST GLubyte rgba[][4], const GLubyte mask[]
+
+
+/*
+ * Write an array of PF_TRUECOLOR pixels to a pixmap.
+ */
+static void write_pixels_TRUECOLOR_pixmap( RGBA_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+         unsigned long p;
+         PACK_TRUECOLOR( p, rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+	 XMesaSetForeground( dpy, gc, p );
+	 XMesaDrawPoint( dpy, buffer, gc, (int) x[i], (int) FLIP(xmesa->xm_buffer, y[i]) );
+      }
+   }
+}
+
+
+/*
+ * Write an array of PF_TRUEDITHER pixels to a pixmap.
+ */
+static void write_pixels_TRUEDITHER_pixmap( RGBA_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+         unsigned long p;
+         PACK_TRUEDITHER(p, x[i], y[i], rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]);
+         XMesaSetForeground( dpy, gc, p );
+         XMesaDrawPoint( dpy, buffer, gc, (int) x[i], (int) FLIP(xmesa->xm_buffer, y[i]) );
+      }
+   }
+}
+
+
+/*
+ * Write an array of PF_8A8B8G8R pixels to a pixmap.
+ */
+static void write_pixels_8A8B8G8R_pixmap( RGBA_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 XMesaSetForeground( dpy, gc,
+                         PACK_8A8B8G8R( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP], rgba[i][ACOMP] ));
+	 XMesaDrawPoint( dpy, buffer, gc, (int) x[i], (int) FLIP(xmesa->xm_buffer, y[i]) );
+      }
+   }
+}
+
+
+/*
+ * Write an array of PF_8R8G8B pixels to a pixmap.
+ */
+static void write_pixels_8R8G8B_pixmap( RGBA_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 XMesaSetForeground( dpy, gc, PACK_8R8G8B( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] ) );
+	 XMesaDrawPoint( dpy, buffer, gc, (int) x[i], (int) FLIP(xmesa->xm_buffer, y[i]) );
+      }
+   }
+}
+
+
+/*
+ * Write an array of PF_8R8G8B24 pixels to a pixmap.
+ */
+static void write_pixels_8R8G8B24_pixmap( RGBA_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 XMesaSetForeground( dpy, gc, PACK_8R8G8B( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] ) );
+	 XMesaDrawPoint( dpy, buffer, gc, (int) x[i], (int) FLIP(xmesa->xm_buffer, y[i]) );
+      }
+   }
+}
+
+
+/*
+ * Write an array of PF_5R6G5B pixels to a pixmap.
+ */
+static void write_pixels_5R6G5B_pixmap( RGBA_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 XMesaSetForeground( dpy, gc, PACK_5R6G5B( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] ) );
+	 XMesaDrawPoint( dpy, buffer, gc, (int) x[i], (int) FLIP(xmesa->xm_buffer, y[i]) );
+      }
+   }
+}
+
+
+/*
+ * Write an array of PF_DITHER_5R6G5B pixels to a pixmap.
+ */
+static void write_pixels_DITHER_5R6G5B_pixmap( RGBA_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+         unsigned long p;
+         PACK_TRUEDITHER(p, x[i], y[i], rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+	 XMesaSetForeground( dpy, gc, p );
+	 XMesaDrawPoint( dpy, buffer, gc, (int) x[i], (int) FLIP(xmesa->xm_buffer, y[i]) );
+      }
+   }
+}
+
+
+/*
+ * Write an array of PF_DITHER pixels to a pixmap.
+ */
+static void write_pixels_DITHER_pixmap( RGBA_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   DITHER_SETUP;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 XMesaSetForeground( dpy, gc,
+                         DITHER(x[i], y[i], rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]) );
+	 XMesaDrawPoint( dpy, buffer, gc, (int) x[i], (int) FLIP(xmesa->xm_buffer, y[i]) );
+      }
+   }
+}
+
+
+/*
+ * Write an array of PF_1BIT pixels to a pixmap.
+ */
+static void write_pixels_1BIT_pixmap( RGBA_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   SETUP_1BIT;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 XMesaSetForeground( dpy, gc,
+                         DITHER_1BIT( x[i], y[i], rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] ));
+	 XMesaDrawPoint( dpy, buffer, gc, (int) x[i], (int) FLIP(xmesa->xm_buffer, y[i]) );
+      }
+   }
+}
+
+
+/*
+ * Write an array of PF_HPCR pixels to a pixmap.
+ */
+static void write_pixels_HPCR_pixmap( RGBA_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+         XMesaSetForeground( dpy, gc,
+                         DITHER_HPCR( x[i], y[i], rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] ));
+         XMesaDrawPoint( dpy, buffer, gc, (int) x[i], (int) FLIP(xmesa->xm_buffer, y[i]) );
+      }
+   }
+}
+
+
+/*
+ * Write an array of PF_LOOKUP pixels to a pixmap.
+ */
+static void write_pixels_LOOKUP_pixmap( RGBA_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   LOOKUP_SETUP;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+         XMesaSetForeground( dpy, gc, LOOKUP( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] ) );
+         XMesaDrawPoint( dpy, buffer, gc, (int) x[i], (int) FLIP(xmesa->xm_buffer, y[i]) );
+      }
+   }
+}
+
+
+/*
+ * Write an array of PF_GRAYSCALE pixels to a pixmap.
+ */
+static void write_pixels_GRAYSCALE_pixmap( RGBA_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+         XMesaSetForeground( dpy, gc, GRAY_RGB( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] ) );
+         XMesaDrawPoint( dpy, buffer, gc, (int) x[i], (int) FLIP(xmesa->xm_buffer, y[i]) );
+      }
+   }
+}
+
+
+/*
+ * Write an array of PF_TRUECOLOR pixels to an ximage.
+ */
+static void write_pixels_TRUECOLOR_ximage( RGBA_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+   register GLuint i;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+         unsigned long p;
+         PACK_TRUECOLOR( p, rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+	 XMesaPutPixel( img, x[i], FLIP(xmesa->xm_buffer, y[i]), p );
+      }
+   }
+}
+
+
+/*
+ * Write an array of PF_TRUEDITHER pixels to an XImage.
+ */
+static void write_pixels_TRUEDITHER_ximage( RGBA_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+   register GLuint i;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+         unsigned long p;
+         PACK_TRUEDITHER(p, x[i], y[i], rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]);
+	 XMesaPutPixel( img, x[i], FLIP(xmesa->xm_buffer, y[i]), p );
+      }
+   }
+}
+
+
+/*
+ * Write an array of PF_8A8B8G8R pixels to an ximage.
+ */
+static void write_pixels_8A8B8G8R_ximage( RGBA_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint i;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 GLuint *ptr = PIXELADDR4( xmesa->xm_buffer, x[i], y[i] );
+         *ptr = PACK_8A8B8G8R( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP], rgba[i][ACOMP] );
+      }
+   }
+}
+
+
+/*
+ * Write an array of PF_8R8G8B pixels to an ximage.
+ */
+static void write_pixels_8R8G8B_ximage( RGBA_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint i;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 GLuint *ptr = PIXELADDR4( xmesa->xm_buffer, x[i], y[i] );
+         *ptr = PACK_8R8G8B( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+      }
+   }
+}
+
+
+/*
+ * Write an array of PF_8R8G8B24 pixels to an ximage.
+ */
+static void write_pixels_8R8G8B24_ximage( RGBA_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint i;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 bgr_t *ptr = PIXELADDR3( xmesa->xm_buffer, x[i], y[i] );
+         ptr->r = rgba[i][RCOMP];
+         ptr->g = rgba[i][GCOMP];
+         ptr->b = rgba[i][BCOMP];
+      }
+   }
+}
+
+
+/*
+ * Write an array of PF_5R6G5B pixels to an ximage.
+ */
+static void write_pixels_5R6G5B_ximage( RGBA_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint i;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 GLushort *ptr = PIXELADDR2( xmesa->xm_buffer, x[i], y[i] );
+         *ptr = PACK_5R6G5B( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+      }
+   }
+}
+
+
+/*
+ * Write an array of PF_DITHER_5R6G5B pixels to an ximage.
+ */
+static void write_pixels_DITHER_5R6G5B_ximage( RGBA_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint i;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 GLushort *ptr = PIXELADDR2( xmesa->xm_buffer, x[i], y[i] );
+         PACK_TRUEDITHER( *ptr, x[i], y[i], rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+      }
+   }
+}
+
+
+/*
+ * Write an array of PF_DITHER pixels to an XImage.
+ */
+static void write_pixels_DITHER_ximage( RGBA_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+   register GLuint i;
+   DITHER_SETUP;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 XMesaPutPixel( img, x[i], FLIP(xmesa->xm_buffer, y[i]),
+                    DITHER( x[i], y[i], rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] ) );
+      }
+   }
+}
+
+
+/*
+ * Write an array of 8-bit PF_DITHER pixels to an XImage.
+ */
+static void write_pixels_DITHER8_ximage( RGBA_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint i;
+   DITHER_SETUP;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 GLubyte *ptr = PIXELADDR1( xmesa->xm_buffer,x[i],y[i]);
+	 *ptr = (GLubyte) DITHER( x[i], y[i], rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+      }
+   }
+}
+
+
+/*
+ * Write an array of PF_1BIT pixels to an XImage.
+ */
+static void write_pixels_1BIT_ximage( RGBA_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+   register GLuint i;
+   SETUP_1BIT;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 XMesaPutPixel( img, x[i], FLIP(xmesa->xm_buffer, y[i]),
+                    DITHER_1BIT( x[i], y[i], rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] ));
+      }
+   }
+}
+
+
+/*
+ * Write an array of PF_HPCR pixels to an XImage.
+ */
+static void write_pixels_HPCR_ximage( RGBA_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint i;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+         GLubyte *ptr = PIXELADDR1( xmesa->xm_buffer,x[i],y[i]);
+         *ptr = (GLubyte) DITHER_HPCR( x[i], y[i], rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+      }
+   }
+}
+
+
+/*
+ * Write an array of PF_LOOKUP pixels to an XImage.
+ */
+static void write_pixels_LOOKUP_ximage( RGBA_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+   register GLuint i;
+   LOOKUP_SETUP;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 XMesaPutPixel( img, x[i], FLIP(xmesa->xm_buffer, y[i]), LOOKUP(rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]) );
+      }
+   }
+}
+
+
+/*
+ * Write an array of 8-bit PF_LOOKUP pixels to an XImage.
+ */
+static void write_pixels_LOOKUP8_ximage( RGBA_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint i;
+   LOOKUP_SETUP;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 GLubyte *ptr = PIXELADDR1( xmesa->xm_buffer,x[i],y[i]);
+	 *ptr = (GLubyte) LOOKUP( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+      }
+   }
+}
+
+
+/*
+ * Write an array of PF_GRAYSCALE pixels to an XImage.
+ */
+static void write_pixels_GRAYSCALE_ximage( RGBA_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+   register GLuint i;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 XMesaPutPixel( img, x[i], FLIP(xmesa->xm_buffer, y[i]),
+                    GRAY_RGB( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] ) );
+      }
+   }
+}
+
+
+/*
+ * Write an array of 8-bit PF_GRAYSCALE pixels to an XImage.
+ */
+static void write_pixels_GRAYSCALE8_ximage( RGBA_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint i;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 GLubyte *ptr = PIXELADDR1( xmesa->xm_buffer, x[i], y[i] );
+	 *ptr = (GLubyte) GRAY_RGB( rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );
+      }
+   }
+}
+
+
+
+
+/**********************************************************************/
+/*** Write MONO COLOR SPAN functions                                ***/
+/**********************************************************************/
+
+#define MONO_SPAN_ARGS	const GLcontext *ctx,	\
+		 	GLuint n, GLint x, GLint y, const GLchan color[4], \
+                        const GLubyte mask[]
+
+
+/*
+ * Write a span of identical pixels to a pixmap.
+ */
+static void write_span_mono_pixmap( MONO_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   const unsigned long pixel = xmesa_color_to_pixel(xmesa, color[RCOMP],
+               color[GCOMP], color[BCOMP], color[ACOMP], xmesa->pixelformat);
+   register GLuint i;
+   XMesaSetForeground( xmesa->display, gc, pixel );
+   y = FLIP(xmesa->xm_buffer, y);
+
+   /* New code contributed by Jeff Epler and cleaned up by Keith
+    * Whitwell.  
+    */
+   for (i = 0; i < n; ) {
+      GLuint start = i;
+
+      /* Identify and emit contiguous rendered pixels
+       */
+      while (i < n && (!mask || mask[i]))
+	 i++;
+
+      if (start < i) 
+	 XMesaFillRectangle( dpy, buffer, gc,
+			     (int)(x+start), (int) y,
+			     (int)(i-start), 1);
+
+      /* Eat up non-rendered pixels
+       */
+      while (i < n && !mask[i])
+	 i++;
+   }
+}
+
+
+
+static void write_span_mono_index_pixmap( const GLcontext *ctx, GLuint n,
+                                          GLint x, GLint y, GLuint colorIndex,
+                                          const GLubyte mask[] )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   XMesaSetForeground( xmesa->display, gc, colorIndex );
+   y = FLIP(xmesa->xm_buffer, y);
+
+   for (i = 0 ; i < n ;) {
+      GLuint start = i;
+      
+      /* Identify and emit contiguous rendered pixels 
+       */
+      while (i < n && mask[i])
+	 i++;
+
+      if (start < i) 
+	 XMesaFillRectangle( dpy, buffer, gc, 
+			     (int)(x+start), (int) y, 
+			     (int)(i-start), 1);
+
+      /* Eat up non-rendered pixels
+       */
+      while (i < n && !mask[i])
+	 i++;
+   }
+}
+
+
+
+/*
+ * Write a span of PF_TRUEDITHER pixels to a pixmap.
+ */
+static void write_span_mono_TRUEDITHER_pixmap( MONO_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   const GLubyte r = color[RCOMP], g = color[GCOMP], b = color[BCOMP];
+   register GLuint i;
+   int yy = FLIP(xmesa->xm_buffer, y);
+   for (i=0;i<n;i++,x++) {
+      if (mask[i]) {
+         unsigned long p;
+         PACK_TRUEDITHER(p, x, yy, r, g, b);
+         XMesaSetForeground( dpy, gc, p );
+         XMesaDrawPoint( dpy, buffer, gc, (int) x, (int) yy );
+      }
+   }
+}
+
+
+/*
+ * Write a span of PF_DITHER pixels to a pixmap.
+ */
+static void write_span_mono_DITHER_pixmap( MONO_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   const GLubyte r = color[RCOMP], g = color[GCOMP], b = color[BCOMP];
+   register GLuint i;
+   int yy = FLIP(xmesa->xm_buffer, y);
+   XDITHER_SETUP(yy);
+   for (i=0;i<n;i++,x++) {
+      if (mask[i]) {
+         XMesaSetForeground( dpy, gc, XDITHER( x, r, g, b ) );
+         XMesaDrawPoint( dpy, buffer, gc, (int) x, (int) yy );
+      }
+   }
+}
+
+
+/*
+ * Write a span of PF_1BIT pixels to a pixmap.
+ */
+static void write_span_mono_1BIT_pixmap( MONO_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   const GLubyte r = color[RCOMP], g = color[GCOMP], b = color[BCOMP];
+   register GLuint i;
+   SETUP_1BIT;
+   y = FLIP(xmesa->xm_buffer, y);
+   for (i=0;i<n;i++,x++) {
+      if (mask[i]) {
+         XMesaSetForeground( dpy, gc, DITHER_1BIT( x, y, r, g, b ) );
+         XMesaDrawPoint( dpy, buffer, gc, (int) x, (int) y );
+      }
+   }
+}
+
+
+/*
+ * Write a span of identical pixels to an XImage.
+ */
+static void write_span_mono_ximage( MONO_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+   register GLuint i;
+   const unsigned long pixel = xmesa_color_to_pixel(xmesa, color[RCOMP],
+               color[GCOMP], color[BCOMP], color[ACOMP], xmesa->pixelformat);
+   y = FLIP(xmesa->xm_buffer, y);
+   for (i=0;i<n;i++,x++) {
+      if (mask[i]) {
+	 XMesaPutPixel( img, x, y, pixel );
+      }
+   }
+}
+
+
+static void write_span_mono_index_ximage( const GLcontext *ctx, GLuint n,
+                                          GLint x, GLint y,
+                                          GLuint colorIndex,
+                                          const GLubyte mask[] )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+   register GLuint i;
+   y = FLIP(xmesa->xm_buffer, y);
+   for (i=0;i<n;i++,x++) {
+      if (mask[i]) {
+	 XMesaPutPixel( img, x, y, colorIndex );
+      }
+   }
+}
+
+
+/*
+ * Write a span of identical PF_TRUEDITHER pixels to an XImage.
+ */
+static void write_span_mono_TRUEDITHER_ximage( MONO_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+   const GLint r = color[RCOMP], g = color[GCOMP], b = color[BCOMP];
+   GLuint i;
+   y = FLIP(xmesa->xm_buffer, y);
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+         unsigned long p;
+         PACK_TRUEDITHER( p, x+i, y, r, g, b);
+	 XMesaPutPixel( img, x+i, y, p );
+      }
+   }
+}
+
+
+/*
+ * Write a span of identical 8A8B8G8R pixels to an XImage.
+ */
+static void write_span_mono_8A8B8G8R_ximage( MONO_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   GLuint i, *ptr;
+   const unsigned long pixel = xmesa_color_to_pixel(xmesa, color[RCOMP],
+               color[GCOMP], color[BCOMP], color[ACOMP], xmesa->pixelformat);
+   ptr = PIXELADDR4( xmesa->xm_buffer, x, y );
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 ptr[i] = pixel;
+      }
+   }
+}
+
+
+/*
+ * Write a span of identical 8R8G8B pixels to an XImage.
+ */
+static void write_span_mono_8R8G8B_ximage( MONO_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   const GLuint pixel = PACK_8R8G8B(color[RCOMP], color[GCOMP], color[BCOMP]);
+   GLuint *ptr = PIXELADDR4( xmesa->xm_buffer, x, y );
+   GLuint i;
+   for (i=0;i<n;i++) {
+      if (!mask || mask[i]) {
+	 ptr[i] = pixel;
+      }
+   }
+}
+
+
+/*
+ * Write a span of identical 8R8G8B pixels to an XImage.
+ */
+static void write_span_mono_8R8G8B24_ximage( MONO_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   const GLubyte r = color[RCOMP];
+   const GLubyte g = color[GCOMP];
+   const GLubyte b = color[BCOMP];
+   GLuint i;
+   bgr_t *ptr = PIXELADDR3( xmesa->xm_buffer, x, y );
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+         ptr[i].r = r;
+         ptr[i].g = g;
+         ptr[i].b = b;
+      }
+   }
+}
+
+
+/*
+ * Write a span of identical DITHER pixels to an XImage.
+ */
+static void write_span_mono_DITHER_ximage( MONO_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   const GLubyte r = color[RCOMP], g = color[GCOMP], b = color[BCOMP];
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+   int yy = FLIP(xmesa->xm_buffer, y);
+   register GLuint i;
+   XDITHER_SETUP(yy);
+   for (i=0;i<n;i++,x++) {
+      if (mask[i]) {
+	 XMesaPutPixel( img, x, yy, XDITHER( x, r, g, b ) );
+      }
+   }
+}
+
+
+/*
+ * Write a span of identical 8-bit DITHER pixels to an XImage.
+ */
+static void write_span_mono_DITHER8_ximage( MONO_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   const GLubyte r = color[RCOMP], g = color[GCOMP], b = color[BCOMP];
+   register GLubyte *ptr = PIXELADDR1( xmesa->xm_buffer,x,y);
+   register GLuint i;
+   XDITHER_SETUP(y);
+   for (i=0;i<n;i++,x++) {
+      if (mask[i]) {
+	 ptr[i] = (GLubyte) XDITHER( x, r, g, b );
+      }
+   }
+}
+
+
+/*
+ * Write a span of identical 8-bit LOOKUP pixels to an XImage.
+ */
+static void write_span_mono_LOOKUP8_ximage( MONO_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint i;
+   register GLubyte *ptr = PIXELADDR1( xmesa->xm_buffer,x,y);
+   GLubyte pixel;
+   LOOKUP_SETUP;
+   pixel = LOOKUP(color[RCOMP], color[GCOMP], color[BCOMP]);
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 ptr[i] = pixel;
+      }
+   }
+}
+
+
+/*
+ * Write a span of identical PF_1BIT pixels to an XImage.
+ */
+static void write_span_mono_1BIT_ximage( MONO_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   const GLubyte r = color[RCOMP], g = color[GCOMP], b = color[BCOMP];
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+   register GLuint i;
+   SETUP_1BIT;
+   y = FLIP(xmesa->xm_buffer, y);
+   for (i=0;i<n;i++,x++) {
+      if (mask[i]) {
+	 XMesaPutPixel( img, x, y, DITHER_1BIT( x, y, r, g, b ) );
+      }
+   }
+}
+
+
+/*
+ * Write a span of identical HPCR pixels to an XImage.
+ */
+static void write_span_mono_HPCR_ximage( MONO_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   const GLubyte r = color[RCOMP], g = color[GCOMP], b = color[BCOMP];
+   register GLubyte *ptr = PIXELADDR1( xmesa->xm_buffer,x,y);
+   register GLuint i;
+   for (i=0;i<n;i++,x++) {
+      if (mask[i]) {
+         ptr[i] = DITHER_HPCR( x, y, r, g, b );
+      }
+   }
+}
+
+
+/*
+ * Write a span of identical 8-bit GRAYSCALE pixels to an XImage.
+ */
+static void write_span_mono_GRAYSCALE8_ximage( MONO_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   const GLubyte p = GRAY_RGB(color[RCOMP], color[GCOMP], color[BCOMP]);
+   GLubyte *ptr = (GLubyte *) PIXELADDR1( xmesa->xm_buffer,x,y);
+   GLuint i;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 ptr[i] = p;
+      }
+   }
+}
+
+
+
+/*
+ * Write a span of identical PF_DITHER_5R6G5B pixels to an XImage.
+ */
+static void write_span_mono_DITHER_5R6G5B_ximage( MONO_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLushort *ptr = PIXELADDR2( xmesa->xm_buffer, x, y );
+   const GLint r = color[RCOMP], g = color[GCOMP], b = color[BCOMP];
+   GLuint i;
+   y = FLIP(xmesa->xm_buffer, y);
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+         PACK_TRUEDITHER(ptr[i], x+i, y, r, g, b);
+      }
+   }
+}
+
+
+
+/**********************************************************************/
+/*** Write MONO COLOR PIXELS functions                              ***/
+/**********************************************************************/
+
+#define MONO_PIXEL_ARGS	const GLcontext *ctx,				\
+			GLuint n, const GLint x[], const GLint y[],	\
+			const GLchan color[4], const GLubyte mask[]
+
+/*
+ * Write an array of identical pixels to a pixmap.
+ */
+static void write_pixels_mono_pixmap( MONO_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   const unsigned long pixel = xmesa_color_to_pixel(xmesa, color[RCOMP],
+               color[GCOMP], color[BCOMP], color[ACOMP], xmesa->pixelformat);
+   XMesaSetForeground( xmesa->display, gc, pixel );
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 XMesaDrawPoint( dpy, buffer, gc,
+                         (int) x[i], (int) FLIP(xmesa->xm_buffer, y[i]) );
+      }
+   }
+}
+
+
+static void write_pixels_mono_index_pixmap(const GLcontext *ctx,
+                                           GLuint n,
+                                           const GLint x[], const GLint y[],
+                                           GLuint colorIndex,
+                                           const GLubyte mask[] )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   XMesaSetForeground( xmesa->display, gc, colorIndex );
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 XMesaDrawPoint( dpy, buffer, gc,
+                         (int) x[i], (int) FLIP(xmesa->xm_buffer, y[i]) );
+      }
+   }
+}
+
+
+/*
+ * Write an array of PF_TRUEDITHER pixels to a pixmap.
+ */
+static void write_pixels_mono_TRUEDITHER_pixmap( MONO_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   const GLubyte r = color[RCOMP], g = color[GCOMP], b = color[BCOMP];
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+         unsigned long p;
+         PACK_TRUEDITHER(p, x[i], y[i], r, g, b);
+         XMesaSetForeground( dpy, gc, p );
+	 XMesaDrawPoint( dpy, buffer, gc,
+                         (int) x[i], (int) FLIP(xmesa->xm_buffer, y[i]) );
+      }
+   }
+}
+
+
+/*
+ * Write an array of PF_DITHER pixels to a pixmap.
+ */
+static void write_pixels_mono_DITHER_pixmap( MONO_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   const GLubyte r = color[RCOMP], g = color[GCOMP], b = color[BCOMP];
+   DITHER_SETUP;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+         XMesaSetForeground( dpy, gc, DITHER( x[i], y[i], r, g, b ) );
+	 XMesaDrawPoint( dpy, buffer, gc, (int) x[i], (int) FLIP(xmesa->xm_buffer, y[i]) );
+      }
+   }
+}
+
+
+/*
+ * Write an array of PF_1BIT pixels to a pixmap.
+ */
+static void write_pixels_mono_1BIT_pixmap( MONO_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   const GLubyte r = color[RCOMP], g = color[GCOMP], b = color[BCOMP];
+   SETUP_1BIT;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+         XMesaSetForeground( dpy, gc, DITHER_1BIT( x[i], y[i], r, g, b ) );
+	 XMesaDrawPoint( dpy, buffer, gc, (int) x[i], (int) FLIP(xmesa->xm_buffer, y[i]) );
+      }
+   }
+}
+
+
+/*
+ * Write an array of identical pixels to an XImage.
+ */
+static void write_pixels_mono_ximage( MONO_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+   register GLuint i;
+   const unsigned long pixel = xmesa_color_to_pixel(xmesa, color[RCOMP],
+               color[GCOMP], color[BCOMP], color[ACOMP], xmesa->pixelformat);
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 XMesaPutPixel( img, x[i], FLIP(xmesa->xm_buffer, y[i]), pixel );
+      }
+   }
+}
+
+
+static void write_pixels_mono_index_ximage( const GLcontext *ctx, GLuint n,
+                                            const GLint x[], const GLint y[],
+                                            GLuint colorIndex,
+                                            const GLubyte mask[] )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+   register GLuint i;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 XMesaPutPixel( img, x[i], FLIP(xmesa->xm_buffer, y[i]), colorIndex );
+      }
+   }
+}
+
+
+/*
+ * Write an array of identical TRUEDITHER pixels to an XImage.
+ */
+static void write_pixels_mono_TRUEDITHER_ximage( MONO_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+   register GLuint i;
+   const int r = color[RCOMP], g = color[GCOMP], b = color[BCOMP];
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+         unsigned long p;
+         PACK_TRUEDITHER(p, x[i], FLIP(xmesa->xm_buffer, y[i]), r, g, b);
+	 XMesaPutPixel( img, x[i], FLIP(xmesa->xm_buffer, y[i]), p );
+      }
+   }
+}
+
+
+
+/*
+ * Write an array of identical 8A8B8G8R pixels to an XImage
+ */
+static void write_pixels_mono_8A8B8G8R_ximage( MONO_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   const GLuint p = PACK_8A8B8G8R(color[RCOMP], color[GCOMP],
+                                  color[BCOMP], color[ACOMP]);
+   register GLuint i;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 GLuint *ptr = PIXELADDR4( xmesa->xm_buffer, x[i], y[i] );
+	 *ptr = p;
+      }
+   }
+}
+
+
+/*
+ * Write an array of identical 8R8G8B pixels to an XImage.
+ */
+static void write_pixels_mono_8R8G8B_ximage( MONO_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint i;
+   const GLuint p = PACK_8R8G8B(color[RCOMP], color[GCOMP], color[BCOMP]);
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 GLuint *ptr = PIXELADDR4( xmesa->xm_buffer, x[i], y[i] );
+	 *ptr = p;
+      }
+   }
+}
+
+
+/*
+ * Write an array of identical 8R8G8B pixels to an XImage.
+ */
+static void write_pixels_mono_8R8G8B24_ximage( MONO_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   const GLubyte r = color[RCOMP], g = color[GCOMP], b = color[BCOMP];
+   register GLuint i;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 bgr_t *ptr = PIXELADDR3( xmesa->xm_buffer, x[i], y[i] );
+         ptr->r = r;
+         ptr->g = g;
+         ptr->b = b;
+      }
+   }
+}
+
+
+/*
+ * Write an array of identical PF_DITHER pixels to an XImage.
+ */
+static void write_pixels_mono_DITHER_ximage( MONO_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   const GLubyte r = color[RCOMP], g = color[GCOMP], b = color[BCOMP];
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+   register GLuint i;
+   DITHER_SETUP;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 XMesaPutPixel( img, x[i], FLIP(xmesa->xm_buffer, y[i]), DITHER( x[i], y[i], r, g, b ) );
+      }
+   }
+}
+
+
+/*
+ * Write an array of identical 8-bit PF_DITHER pixels to an XImage.
+ */
+static void write_pixels_mono_DITHER8_ximage( MONO_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   const GLubyte r = color[RCOMP], g = color[GCOMP], b = color[BCOMP];
+   register GLuint i;
+   DITHER_SETUP;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 GLubyte *ptr = PIXELADDR1( xmesa->xm_buffer,x[i],y[i]);
+	 *ptr = (GLubyte) DITHER( x[i], y[i], r, g, b );
+      }
+   }
+}
+
+
+/*
+ * Write an array of identical 8-bit PF_LOOKUP pixels to an XImage.
+ */
+static void write_pixels_mono_LOOKUP8_ximage( MONO_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint i;
+   GLubyte pixel;
+   LOOKUP_SETUP;
+   pixel = LOOKUP(color[RCOMP], color[GCOMP], color[BCOMP]);
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 GLubyte *ptr = PIXELADDR1( xmesa->xm_buffer,x[i],y[i]);
+	 *ptr = pixel;
+      }
+   }
+}
+
+
+
+/*
+ * Write an array of identical PF_1BIT pixels to an XImage.
+ */
+static void write_pixels_mono_1BIT_ximage( MONO_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   const GLubyte r = color[RCOMP], g = color[GCOMP], b = color[BCOMP];
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+   register GLuint i;
+   SETUP_1BIT;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 XMesaPutPixel( img, x[i], FLIP(xmesa->xm_buffer, y[i]),
+                        DITHER_1BIT( x[i], y[i], r, g, b ));
+      }
+   }
+}
+
+
+/*
+ * Write an array of identical PF_HPCR pixels to an XImage.
+ */
+static void write_pixels_mono_HPCR_ximage( MONO_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   const GLubyte r = color[RCOMP], g = color[GCOMP], b = color[BCOMP];
+   register GLuint i;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+         GLubyte *ptr = PIXELADDR1( xmesa->xm_buffer,x[i],y[i]);
+         *ptr = DITHER_HPCR( x[i], y[i], r, g, b );
+      }
+   }
+}
+
+
+/*
+ * Write an array of identical 8-bit PF_GRAYSCALE pixels to an XImage.
+ */
+static void write_pixels_mono_GRAYSCALE8_ximage( MONO_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint i;
+   register GLubyte p = GRAY_RGB(color[RCOMP], color[GCOMP], color[BCOMP]);
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 GLubyte *ptr = PIXELADDR1( xmesa->xm_buffer,x[i],y[i]);
+	 *ptr = p;
+      }
+   }
+}
+
+
+/*
+ * Write an array of identical PF_DITHER_5R6G5B pixels to an XImage.
+ */
+static void write_pixels_mono_DITHER_5R6G5B_ximage( MONO_PIXEL_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   const int r = color[RCOMP], g = color[GCOMP], b = color[BCOMP];
+   register GLuint i;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 GLushort *ptr = PIXELADDR2( xmesa->xm_buffer, x[i], y[i] );
+         PACK_TRUEDITHER(*ptr, x[i], y[i], r, g, b);
+      }
+   }
+}
+
+
+
+/**********************************************************************/
+/*** Write INDEX SPAN functions                                     ***/
+/**********************************************************************/
+
+#define INDEX_SPAN_ARGS	const GLcontext *ctx,				\
+			GLuint n, GLint x, GLint y, const GLuint index[], \
+			const GLubyte mask[]
+
+#define INDEX8_SPAN_ARGS const GLcontext *ctx,				\
+			 GLuint n, GLint x, GLint y, const GLubyte index[], \
+			 const GLubyte mask[]
+
+
+/*
+ * Write a span of CI pixels to a Pixmap.
+ */
+static void write_span_index_pixmap( INDEX_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            XMesaSetForeground( dpy, gc, (unsigned long) index[i] );
+            XMesaDrawPoint( dpy, buffer, gc, (int) x, (int) y );
+         }
+      }
+   }
+   else {
+      for (i=0;i<n;i++,x++) {
+         XMesaSetForeground( dpy, gc, (unsigned long) index[i] );
+         XMesaDrawPoint( dpy, buffer, gc, (int) x, (int) y );
+      }
+   }
+}
+
+
+/*
+ * Write a span of 8-bit CI pixels to a Pixmap.
+ */
+static void write_span_index8_pixmap( INDEX8_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            XMesaSetForeground( dpy, gc, (unsigned long) index[i] );
+            XMesaDrawPoint( dpy, buffer, gc, (int) x, (int) y );
+         }
+      }
+   }
+   else {
+      for (i=0;i<n;i++,x++) {
+         XMesaSetForeground( dpy, gc, (unsigned long) index[i] );
+         XMesaDrawPoint( dpy, buffer, gc, (int) x, (int) y );
+      }
+   }
+}
+
+
+/*
+ * Write a span of CI pixels to an XImage.
+ */
+static void write_span_index_ximage( INDEX_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+   register GLuint i;
+   y = FLIP(xmesa->xm_buffer, y);
+   if (mask) {
+      for (i=0;i<n;i++,x++) {
+         if (mask[i]) {
+            XMesaPutPixel( img, x, y, (unsigned long) index[i] );
+         }
+      }
+   }
+   else {
+      for (i=0;i<n;i++,x++) {
+         XMesaPutPixel( img, x, y, (unsigned long) index[i] );
+      }
+   }
+}
+
+
+/*
+ * Write a span of 8-bit CI pixels to a non 8-bit XImage.
+ */
+static void write_span_index8_ximage( INDEX8_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   if (mask) {
+      GLuint i;
+      for (i=0;i<n;i++) {
+         if (mask[i]) {
+            XMesaPutPixel(xmesa->xm_buffer->backimage, x+i, y, index[i]);
+         }
+      }
+   }
+   else {
+      GLuint i;
+      for (i=0;i<n;i++) {
+         XMesaPutPixel(xmesa->xm_buffer->backimage, x+i, y, index[i]);
+      }
+   }
+}
+
+/*
+ * Write a span of 8-bit CI pixels to an 8-bit XImage.
+ */
+static void write_span_index8_ximage8( INDEX8_SPAN_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   GLubyte *dst = PIXELADDR1( xmesa->xm_buffer,x,y);
+   if (mask) {
+      GLuint i;
+      for (i=0;i<n;i++) {
+         if (mask[i]) {
+            dst[i] = index[i];
+         }
+      }
+   }
+   else {
+      MEMCPY( dst, index, n );
+   }
+}
+
+
+
+/**********************************************************************/
+/*** Write INDEX PIXELS functions                                   ***/
+/**********************************************************************/
+
+#define INDEX_PIXELS_ARGS	const GLcontext *ctx,			\
+				GLuint n, const GLint x[], const GLint y[], \
+				const GLuint index[], const GLubyte mask[]
+
+
+/*
+ * Write an array of CI pixels to a Pixmap.
+ */
+static void write_pixels_index_pixmap( INDEX_PIXELS_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   XMesaDrawable buffer = xmesa->xm_buffer->buffer;
+   XMesaGC gc = xmesa->xm_buffer->gc;
+   register GLuint i;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 XMesaSetForeground( dpy, gc, (unsigned long) index[i] );
+	 XMesaDrawPoint( dpy, buffer, gc, (int) x[i], (int) FLIP(xmesa->xm_buffer, y[i]) );
+      }
+   }
+}
+
+
+/*
+ * Write an array of CI pixels to an XImage.
+ */
+static void write_pixels_index_ximage( INDEX_PIXELS_ARGS )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+   register GLuint i;
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+	 XMesaPutPixel( img, x[i], FLIP(xmesa->xm_buffer, y[i]), (unsigned long) index[i] );
+      }
+   }
+}
+
+
+
+
+/**********************************************************************/
+/*****                      Pixel reading                         *****/
+/**********************************************************************/
+
+
+
+/*
+ * Read a horizontal span of color-index pixels.
+ */
+static void read_index_span( const GLcontext *ctx,
+			     GLuint n, GLint x, GLint y, GLuint index[] )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaBuffer source = xmesa->xm_buffer;
+   GLuint i;
+
+   y = FLIP(source, y);
+
+   if (source->buffer) {
+#ifndef XFree86Server
+      XMesaImage *span = NULL;
+      int error;
+      catch_xgetimage_errors( xmesa->display );
+      span = XGetImage( xmesa->display, source->buffer,
+		        x, y, n, 1, AllPlanes, ZPixmap );
+      error = check_xgetimage_errors();
+      if (span && !error) {
+	 for (i=0;i<n;i++) {
+	    index[i] = (GLuint) XMesaGetPixel( span, i, 0 );
+	 }
+      }
+      else {
+	 /* return 0 pixels */
+	 for (i=0;i<n;i++) {
+	    index[i] = 0;
+	 }
+      }
+      if (span) {
+	 XMesaDestroyImage( span );
+      }
+#else
+      (*xmesa->display->GetImage)(source->buffer,
+				  x, y, n, 1, ZPixmap,
+				  ~0L, (pointer)index);
+#endif
+   }
+   else if (source->backimage) {
+      XMesaImage *img = source->backimage;
+      for (i=0;i<n;i++,x++) {
+	 index[i] = (GLuint) XMesaGetPixel( img, x, y );
+      }
+   }
+}
+
+
+
+/*
+ * Read a horizontal span of color pixels.
+ */
+static void read_color_span( const GLcontext *ctx,
+			     GLuint n, GLint x, GLint y,
+                             GLubyte rgba[][4] )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaBuffer source = xmesa->xm_buffer;
+
+   if (source->buffer) {
+      /* Read from Pixmap or Window */
+      XMesaImage *span = NULL;
+      int error;
+#ifdef XFree86Server
+      span = XMesaCreateImage(xmesa->xm_visual->BitsPerPixel, n, 1, NULL);
+      span->data = (char *)MALLOC(span->height * span->bytes_per_line);
+      error = (!span->data);
+      (*xmesa->display->GetImage)(source->buffer,
+				  x, FLIP(source, y), n, 1, ZPixmap,
+				  ~0L, (pointer)span->data);
+#else
+      catch_xgetimage_errors( xmesa->display );
+      span = XGetImage( xmesa->display, source->buffer,
+		        x, FLIP(source, y), n, 1, AllPlanes, ZPixmap );
+      error = check_xgetimage_errors();
+#endif
+      if (span && !error) {
+	 switch (xmesa->pixelformat) {
+	    case PF_Truecolor:
+	    case PF_Dither_True:
+               {
+                  const GLubyte *pixelToR = xmesa->xm_visual->PixelToR;
+                  const GLubyte *pixelToG = xmesa->xm_visual->PixelToG;
+                  const GLubyte *pixelToB = xmesa->xm_visual->PixelToB;
+                  unsigned long rMask = GET_REDMASK(xmesa->xm_visual);
+                  unsigned long gMask = GET_GREENMASK(xmesa->xm_visual);
+                  unsigned long bMask = GET_BLUEMASK(xmesa->xm_visual);
+                  GLint rShift = xmesa->xm_visual->rshift;
+                  GLint gShift = xmesa->xm_visual->gshift;
+                  GLint bShift = xmesa->xm_visual->bshift;
+                  GLuint i;
+                  for (i=0;i<n;i++) {
+                     unsigned long p;
+                     p = XMesaGetPixel( span, i, 0 );
+                     rgba[i][RCOMP] = pixelToR[(p & rMask) >> rShift];
+                     rgba[i][GCOMP] = pixelToG[(p & gMask) >> gShift];
+                     rgba[i][BCOMP] = pixelToB[(p & bMask) >> bShift];
+                     rgba[i][ACOMP] = 255;
+                  }
+               }
+	       break;
+            case PF_5R6G5B:
+            case PF_Dither_5R6G5B:
+               {
+                  const GLubyte *pixelToR = xmesa->xm_visual->PixelToR;
+                  const GLubyte *pixelToG = xmesa->xm_visual->PixelToG;
+                  const GLubyte *pixelToB = xmesa->xm_visual->PixelToB;
+                  GLuint i;
+                  for (i=0;i<n;i++) {
+                     unsigned long p = XMesaGetPixel( span, i, 0 );
+                     /* fast, but not quite accurate
+                     rgba[i][RCOMP] = ((p >> 8) & 0xf8);
+                     rgba[i][GCOMP] = ((p >> 3) & 0xfc);
+                     rgba[i][BCOMP] = ((p << 3) & 0xff);
+                     */
+                     rgba[i][RCOMP] = pixelToR[p >> 11];
+                     rgba[i][GCOMP] = pixelToG[(p >> 5) & 0x3f];
+                     rgba[i][BCOMP] = pixelToB[p & 0x1f];
+                     rgba[i][ACOMP] = 255;
+                  }
+               }
+	       break;
+	    case PF_8A8B8G8R:
+               {
+                  const GLuint *ptr4 = (GLuint *) span->data;
+                  GLuint i;
+                  for (i=0;i<n;i++) {
+                     GLuint p4 = *ptr4++;
+                     rgba[i][RCOMP] = (GLubyte) ( p4        & 0xff);
+                     rgba[i][GCOMP] = (GLubyte) ((p4 >> 8)  & 0xff);
+                     rgba[i][BCOMP] = (GLubyte) ((p4 >> 16) & 0xff);
+                     rgba[i][ACOMP] = (GLubyte) ((p4 >> 24) & 0xff);
+                  }
+	       }
+	       break;
+            case PF_8R8G8B:
+               {
+                  const GLuint *ptr4 = (GLuint *) span->data;
+                  GLuint i;
+                  for (i=0;i<n;i++) {
+                     GLuint p4 = *ptr4++;
+                     rgba[i][RCOMP] = (GLubyte) ((p4 >> 16) & 0xff);
+                     rgba[i][GCOMP] = (GLubyte) ((p4 >> 8)  & 0xff);
+                     rgba[i][BCOMP] = (GLubyte) ( p4        & 0xff);
+                     rgba[i][ACOMP] = 255;
+                  }
+	       }
+	       break;
+            case PF_8R8G8B24:
+               {
+                  const bgr_t *ptr3 = (bgr_t *) span->data;
+                  GLuint i;
+                  for (i=0;i<n;i++) {
+                     rgba[i][RCOMP] = ptr3[i].r;
+                     rgba[i][GCOMP] = ptr3[i].g;
+                     rgba[i][BCOMP] = ptr3[i].b;
+                     rgba[i][ACOMP] = 255;
+                  }
+	       }
+	       break;
+            case PF_HPCR:
+               {
+                  GLubyte *ptr1 = (GLubyte *) span->data;
+                  GLuint i;
+                  for (i=0;i<n;i++) {
+                     GLubyte p = *ptr1++;
+                     rgba[i][RCOMP] =  p & 0xE0;
+                     rgba[i][GCOMP] = (p & 0x1C) << 3;
+                     rgba[i][BCOMP] = (p & 0x03) << 6;
+                     rgba[i][ACOMP] = 255;
+                  }
+               }
+               break;
+	    case PF_Dither:
+	    case PF_Lookup:
+	    case PF_Grayscale:
+               {
+                  GLubyte *rTable = source->pixel_to_r;
+                  GLubyte *gTable = source->pixel_to_g;
+                  GLubyte *bTable = source->pixel_to_b;
+                  if (GET_VISUAL_DEPTH(xmesa->xm_visual)==8) {
+                     const GLubyte *ptr1 = (GLubyte *) span->data;
+                     GLuint i;
+                     for (i=0;i<n;i++) {
+                        unsigned long p = *ptr1++;
+                        rgba[i][RCOMP] = rTable[p];
+                        rgba[i][GCOMP] = gTable[p];
+                        rgba[i][BCOMP] = bTable[p];
+                        rgba[i][ACOMP] = 255;
+                     }
+                  }
+                  else {
+                     GLuint i;
+                     for (i=0;i<n;i++) {
+                        unsigned long p = XMesaGetPixel( span, i, 0 );
+                        rgba[i][RCOMP] = rTable[p];
+                        rgba[i][GCOMP] = gTable[p];
+                        rgba[i][BCOMP] = bTable[p];
+                        rgba[i][ACOMP] = 255;
+                     }
+                  }
+               }
+	       break;
+	    case PF_1Bit:
+               {
+                  int bitFlip = xmesa->xm_visual->bitFlip;
+                  GLuint i;
+                  for (i=0;i<n;i++) {
+                     unsigned long p;
+                     p = XMesaGetPixel( span, i, 0 ) ^ bitFlip;
+                     rgba[i][RCOMP] = (GLubyte) (p * 255);
+                     rgba[i][GCOMP] = (GLubyte) (p * 255);
+                     rgba[i][BCOMP] = (GLubyte) (p * 255);
+                     rgba[i][ACOMP] = 255;
+                  }
+               }
+	       break;
+	    default:
+	       _mesa_problem(NULL,"Problem in DD.read_color_span (1)");
+               return;
+	 }
+      }
+      else {
+	 /* return black pixels */
+         GLuint i;
+	 for (i=0;i<n;i++) {
+	    rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = rgba[i][ACOMP] = 0;
+	 }
+      }
+      if (span) {
+	 XMesaDestroyImage( span );
+      }
+   }
+   else if (source->backimage) {
+      /* Read from XImage back buffer */
+      switch (xmesa->pixelformat) {
+         case PF_Truecolor:
+         case PF_Dither_True:
+            {
+               const GLubyte *pixelToR = xmesa->xm_visual->PixelToR;
+               const GLubyte *pixelToG = xmesa->xm_visual->PixelToG;
+               const GLubyte *pixelToB = xmesa->xm_visual->PixelToB;
+               unsigned long rMask = GET_REDMASK(xmesa->xm_visual);
+               unsigned long gMask = GET_GREENMASK(xmesa->xm_visual);
+               unsigned long bMask = GET_BLUEMASK(xmesa->xm_visual);
+               GLint rShift = xmesa->xm_visual->rshift;
+               GLint gShift = xmesa->xm_visual->gshift;
+               GLint bShift = xmesa->xm_visual->bshift;
+               XMesaImage *img = source->backimage;
+               GLuint i;
+               y = FLIP(source, y);
+               for (i=0;i<n;i++) {
+                  unsigned long p;
+		  p = XMesaGetPixel( img, x+i, y );
+                  rgba[i][RCOMP] = pixelToR[(p & rMask) >> rShift];
+                  rgba[i][GCOMP] = pixelToG[(p & gMask) >> gShift];
+                  rgba[i][BCOMP] = pixelToB[(p & bMask) >> bShift];
+                  rgba[i][ACOMP] = 255;
+               }
+            }
+            break;
+         case PF_5R6G5B:
+         case PF_Dither_5R6G5B:
+            {
+               const GLubyte *pixelToR = xmesa->xm_visual->PixelToR;
+               const GLubyte *pixelToG = xmesa->xm_visual->PixelToG;
+               const GLubyte *pixelToB = xmesa->xm_visual->PixelToB;
+               const GLushort *ptr2 = PIXELADDR2( source, x, y );
+               GLuint i;
+#if defined(__i386__) /* word stores don't have to be on 4-byte boundaries */
+               const GLuint *ptr4 = (const GLuint *) ptr2;
+               GLuint extraPixel = (n & 1);
+               n -= extraPixel;
+               for (i = 0; i < n; i += 2) {
+                  const GLuint p = *ptr4++;
+                  const GLuint p0 = p & 0xffff;
+                  const GLuint p1 = p >> 16;
+                  /* fast, but not quite accurate
+                  rgba[i][RCOMP] = ((p >> 8) & 0xf8);
+                  rgba[i][GCOMP] = ((p >> 3) & 0xfc);
+                  rgba[i][BCOMP] = ((p << 3) & 0xff);
+                  */
+                  rgba[i][RCOMP] = pixelToR[p0 >> 11];
+                  rgba[i][GCOMP] = pixelToG[(p0 >> 5) & 0x3f];
+                  rgba[i][BCOMP] = pixelToB[p0 & 0x1f];
+                  rgba[i][ACOMP] = 255;
+                  rgba[i+1][RCOMP] = pixelToR[p1 >> 11];
+                  rgba[i+1][GCOMP] = pixelToG[(p1 >> 5) & 0x3f];
+                  rgba[i+1][BCOMP] = pixelToB[p1 & 0x1f];
+                  rgba[i+1][ACOMP] = 255;
+               }
+               if (extraPixel) {
+                  GLushort p = ptr2[n];
+                  rgba[n][RCOMP] = pixelToR[p >> 11];
+                  rgba[n][GCOMP] = pixelToG[(p >> 5) & 0x3f];
+                  rgba[n][BCOMP] = pixelToB[p & 0x1f];
+                  rgba[n][ACOMP] = 255;
+               }
+#else
+               for (i = 0; i < n; i++) {
+                  const GLushort p = ptr2[i];
+                  rgba[i][RCOMP] = pixelToR[p >> 11];
+                  rgba[i][GCOMP] = pixelToG[(p >> 5) & 0x3f];
+                  rgba[i][BCOMP] = pixelToB[p & 0x1f];
+                  rgba[i][ACOMP] = 255;
+               }
+#endif
+            }
+            break;
+	 case PF_8A8B8G8R:
+            {
+               const GLuint *ptr4 = PIXELADDR4( source, x, y );
+               GLuint i;
+               for (i=0;i<n;i++) {
+                  GLuint p4 = *ptr4++;
+                  rgba[i][RCOMP] = (GLubyte) ( p4        & 0xff);
+                  rgba[i][GCOMP] = (GLubyte) ((p4 >> 8)  & 0xff);
+                  rgba[i][BCOMP] = (GLubyte) ((p4 >> 16) & 0xff);
+                  rgba[i][ACOMP] = (GLint)   ((p4 >> 24) & 0xff);
+               }
+            }
+	    break;
+	 case PF_8R8G8B:
+            {
+               const GLuint *ptr4 = PIXELADDR4( source, x, y );
+               GLuint i;
+               for (i=0;i<n;i++) {
+                  GLuint p4 = *ptr4++;
+                  rgba[i][RCOMP] = (GLubyte) ((p4 >> 16) & 0xff);
+                  rgba[i][GCOMP] = (GLubyte) ((p4 >> 8)  & 0xff);
+                  rgba[i][BCOMP] = (GLubyte) ( p4        & 0xff);
+                  rgba[i][ACOMP] = 255;
+               }
+            }
+	    break;
+	 case PF_8R8G8B24:
+            {
+               const bgr_t *ptr3 = PIXELADDR3( source, x, y );
+               GLuint i;
+               for (i=0;i<n;i++) {
+                  rgba[i][RCOMP] = ptr3[i].r;
+                  rgba[i][GCOMP] = ptr3[i].g;
+                  rgba[i][BCOMP] = ptr3[i].b;
+                  rgba[i][ACOMP] = 255;
+               }
+            }
+	    break;
+         case PF_HPCR:
+            {
+               const GLubyte *ptr1 = PIXELADDR1( source, x, y );
+               GLuint i;
+               for (i=0;i<n;i++) {
+                  GLubyte p = *ptr1++;
+                  rgba[i][RCOMP] =  p & 0xE0;
+                  rgba[i][GCOMP] = (p & 0x1C) << 3;
+                  rgba[i][BCOMP] = (p & 0x03) << 6;
+                  rgba[i][ACOMP] = 255;
+               }
+            }
+            break;
+	 case PF_Dither:
+	 case PF_Lookup:
+	 case PF_Grayscale:
+            {
+               const GLubyte *rTable = source->pixel_to_r;
+               const GLubyte *gTable = source->pixel_to_g;
+               const GLubyte *bTable = source->pixel_to_b;
+               if (GET_VISUAL_DEPTH(xmesa->xm_visual)==8) {
+                  GLubyte *ptr1 = PIXELADDR1( source, x, y );
+                  GLuint i;
+                  for (i=0;i<n;i++) {
+                     unsigned long p = *ptr1++;
+                     rgba[i][RCOMP] = rTable[p];
+                     rgba[i][GCOMP] = gTable[p];
+                     rgba[i][BCOMP] = bTable[p];
+                     rgba[i][ACOMP] = 255;
+                  }
+               }
+               else {
+                  XMesaImage *img = source->backimage;
+                  GLuint i;
+                  y = FLIP(source, y);
+                  for (i=0;i<n;i++,x++) {
+                     unsigned long p = XMesaGetPixel( img, x, y );
+                     rgba[i][RCOMP] = rTable[p];
+                     rgba[i][GCOMP] = gTable[p];
+                     rgba[i][BCOMP] = bTable[p];
+                     rgba[i][ACOMP] = 255;
+                  }
+               }
+            }
+	    break;
+	 case PF_1Bit:
+            {
+               XMesaImage *img = source->backimage;
+               int bitFlip = xmesa->xm_visual->bitFlip;
+               GLuint i;
+               y = FLIP(source, y);
+               for (i=0;i<n;i++,x++) {
+                  unsigned long p;
+		  p = XMesaGetPixel( img, x, y ) ^ bitFlip;
+                  rgba[i][RCOMP] = (GLubyte) (p * 255);
+                  rgba[i][GCOMP] = (GLubyte) (p * 255);
+                  rgba[i][BCOMP] = (GLubyte) (p * 255);
+                  rgba[i][ACOMP] = 255;
+               }
+	    }
+	    break;
+	 default:
+	    _mesa_problem(NULL,"Problem in DD.read_color_span (2)");
+            return;
+      }
+   }
+}
+
+
+
+/*
+ * Read an array of color index pixels.
+ */
+static void read_index_pixels( const GLcontext *ctx,
+			       GLuint n, const GLint x[], const GLint y[],
+                               GLuint indx[], const GLubyte mask[] )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   register GLuint i;
+   XMesaBuffer source = xmesa->xm_buffer;
+
+   if (source->buffer) {
+      for (i=0;i<n;i++) {
+         if (mask[i]) {
+            indx[i] = (GLuint) read_pixel( xmesa->display,
+                                           source->buffer,
+                                           x[i], FLIP(source, y[i]) );
+         }
+      }
+   }
+   else if (source->backimage) {
+      XMesaImage *img = source->backimage;
+      for (i=0;i<n;i++) {
+         if (mask[i]) {
+            indx[i] = (GLuint) XMesaGetPixel( img, x[i], FLIP(source, y[i]) );
+         }
+      }
+   }
+}
+
+
+
+static void read_color_pixels( const GLcontext *ctx,
+			       GLuint n, const GLint x[], const GLint y[],
+                               GLubyte rgba[][4], const GLubyte mask[] )
+{
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   XMesaDisplay *dpy = xmesa->xm_visual->display;
+   register GLuint i;
+   XMesaBuffer source = xmesa->xm_buffer;
+   XMesaDrawable buffer = source->buffer;  /* the X drawable */
+
+   if (source->buffer) {
+      switch (xmesa->pixelformat) {
+	 case PF_Truecolor:
+         case PF_Dither_True:
+         case PF_5R6G5B:
+         case PF_Dither_5R6G5B:
+            {
+               unsigned long rMask = GET_REDMASK(xmesa->xm_visual);
+               unsigned long gMask = GET_GREENMASK(xmesa->xm_visual);
+               unsigned long bMask = GET_BLUEMASK(xmesa->xm_visual);
+               GLubyte *pixelToR = xmesa->xm_visual->PixelToR;
+               GLubyte *pixelToG = xmesa->xm_visual->PixelToG;
+               GLubyte *pixelToB = xmesa->xm_visual->PixelToB;
+               GLint rShift = xmesa->xm_visual->rshift;
+               GLint gShift = xmesa->xm_visual->gshift;
+               GLint bShift = xmesa->xm_visual->bshift;
+               for (i=0;i<n;i++) {
+                  if (mask[i]) {
+                     unsigned long p = read_pixel( dpy, buffer,
+                                                   x[i], FLIP(source, y[i]) );
+                     rgba[i][RCOMP] = pixelToR[(p & rMask) >> rShift];
+                     rgba[i][GCOMP] = pixelToG[(p & gMask) >> gShift];
+                     rgba[i][BCOMP] = pixelToB[(p & bMask) >> bShift];
+                     rgba[i][ACOMP] = 255;
+                  }
+               }
+            }
+            break;
+	 case PF_8A8B8G8R:
+	    for (i=0;i<n;i++) {
+               if (mask[i]) {
+                  unsigned long p = read_pixel( dpy, buffer,
+                                                x[i], FLIP(source, y[i]) );
+                  rgba[i][RCOMP] = (GLubyte) ( p        & 0xff);
+                  rgba[i][GCOMP] = (GLubyte) ((p >> 8)  & 0xff);
+                  rgba[i][BCOMP] = (GLubyte) ((p >> 16) & 0xff);
+                  rgba[i][ACOMP] = (GLubyte) ((p >> 24) & 0xff);
+               }
+	    }
+	    break;
+	 case PF_8R8G8B:
+	    for (i=0;i<n;i++) {
+               if (mask[i]) {
+                  unsigned long p = read_pixel( dpy, buffer,
+                                                x[i], FLIP(source, y[i]) );
+                  rgba[i][RCOMP] = (GLubyte) ((p >> 16) & 0xff);
+                  rgba[i][GCOMP] = (GLubyte) ((p >> 8)  & 0xff);
+                  rgba[i][BCOMP] = (GLubyte) ( p        & 0xff);
+                  rgba[i][ACOMP] = 255;
+               }
+	    }
+	    break;
+	 case PF_8R8G8B24:
+	    for (i=0;i<n;i++) {
+               if (mask[i]) {
+                  unsigned long p = read_pixel( dpy, buffer,
+                                                x[i], FLIP(source, y[i]) );
+                  rgba[i][RCOMP] = (GLubyte) ((p >> 16) & 0xff);
+                  rgba[i][GCOMP] = (GLubyte) ((p >> 8)  & 0xff);
+                  rgba[i][BCOMP] = (GLubyte) ( p        & 0xff);
+                  rgba[i][ACOMP] = 255;
+               }
+	    }
+	    break;
+         case PF_HPCR:
+            {
+               for (i=0;i<n;i++) {
+                  if (mask[i]) {
+                     unsigned long p = read_pixel( dpy, buffer,
+                                                   x[i], FLIP(source, y[i]) );
+                     rgba[i][RCOMP] = (GLubyte) ( p & 0xE0      );
+                     rgba[i][GCOMP] = (GLubyte) ((p & 0x1C) << 3);
+                     rgba[i][BCOMP] = (GLubyte) ((p & 0x03) << 6);
+                     rgba[i][ACOMP] = (GLubyte) 255;
+                  }
+               }
+            }
+            break;
+	 case PF_Dither:
+	 case PF_Lookup:
+	 case PF_Grayscale:
+            {
+               GLubyte *rTable = source->pixel_to_r;
+               GLubyte *gTable = source->pixel_to_g;
+               GLubyte *bTable = source->pixel_to_b;
+               for (i=0;i<n;i++) {
+                  if (mask[i]) {
+                     unsigned long p = read_pixel( dpy, buffer,
+                                                   x[i], FLIP(source, y[i]) );
+                     rgba[i][RCOMP] = rTable[p];
+                     rgba[i][GCOMP] = gTable[p];
+                     rgba[i][BCOMP] = bTable[p];
+                     rgba[i][ACOMP] = 255;
+                  }
+               }
+	    }
+	    break;
+	 case PF_1Bit:
+            {
+               int bitFlip = xmesa->xm_visual->bitFlip;
+               for (i=0;i<n;i++) {
+                  if (mask[i]) {
+                     unsigned long p = read_pixel( dpy, buffer,
+                                     x[i], FLIP(source, y[i])) ^ bitFlip;
+                     rgba[i][RCOMP] = (GLubyte) (p * 255);
+                     rgba[i][GCOMP] = (GLubyte) (p * 255);
+                     rgba[i][BCOMP] = (GLubyte) (p * 255);
+                     rgba[i][ACOMP] = 255;
+                  }
+               }
+	    }
+	    break;
+	 default:
+	    _mesa_problem(NULL,"Problem in DD.read_color_pixels (1)");
+            return;
+      }
+   }
+   else if (source->backimage) {
+      switch (xmesa->pixelformat) {
+	 case PF_Truecolor:
+         case PF_Dither_True:
+         case PF_5R6G5B:
+         case PF_Dither_5R6G5B:
+            {
+               unsigned long rMask = GET_REDMASK(xmesa->xm_visual);
+               unsigned long gMask = GET_GREENMASK(xmesa->xm_visual);
+               unsigned long bMask = GET_BLUEMASK(xmesa->xm_visual);
+               GLubyte *pixelToR = xmesa->xm_visual->PixelToR;
+               GLubyte *pixelToG = xmesa->xm_visual->PixelToG;
+               GLubyte *pixelToB = xmesa->xm_visual->PixelToB;
+               GLint rShift = xmesa->xm_visual->rshift;
+               GLint gShift = xmesa->xm_visual->gshift;
+               GLint bShift = xmesa->xm_visual->bshift;
+               XMesaImage *img = source->backimage;
+               for (i=0;i<n;i++) {
+                  if (mask[i]) {
+                     unsigned long p;
+                     p = XMesaGetPixel( img, x[i], FLIP(source, y[i]) );
+                     rgba[i][RCOMP] = pixelToR[(p & rMask) >> rShift];
+                     rgba[i][GCOMP] = pixelToG[(p & gMask) >> gShift];
+                     rgba[i][BCOMP] = pixelToB[(p & bMask) >> bShift];
+                     rgba[i][ACOMP] = 255;
+                  }
+               }
+            }
+            break;
+	 case PF_8A8B8G8R:
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+                  GLuint *ptr4 = PIXELADDR4( source, x[i], y[i] );
+                  GLuint p4 = *ptr4;
+                  rgba[i][RCOMP] = (GLubyte) ( p4        & 0xff);
+                  rgba[i][GCOMP] = (GLubyte) ((p4 >> 8)  & 0xff);
+                  rgba[i][BCOMP] = (GLubyte) ((p4 >> 16) & 0xff);
+                  rgba[i][ACOMP] = (GLubyte) ((p4 >> 24) & 0xff);
+               }
+	    }
+	    break;
+	 case PF_8R8G8B:
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+                  GLuint *ptr4 = PIXELADDR4( source, x[i], y[i] );
+                  GLuint p4 = *ptr4;
+                  rgba[i][RCOMP] = (GLubyte) ((p4 >> 16) & 0xff);
+                  rgba[i][GCOMP] = (GLubyte) ((p4 >> 8)  & 0xff);
+                  rgba[i][BCOMP] = (GLubyte) ( p4        & 0xff);
+                  rgba[i][ACOMP] = 255;
+               }
+	    }
+	    break;
+	 case PF_8R8G8B24:
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+                  bgr_t *ptr3 = PIXELADDR3( source, x[i], y[i] );
+                  rgba[i][RCOMP] = ptr3->r;
+                  rgba[i][GCOMP] = ptr3->g;
+                  rgba[i][BCOMP] = ptr3->b;
+                  rgba[i][ACOMP] = 255;
+               }
+	    }
+	    break;
+         case PF_HPCR:
+            for (i=0;i<n;i++) {
+               if (mask[i]) {
+                  GLubyte *ptr1 = PIXELADDR1( source, x[i], y[i] );
+                  GLubyte p = *ptr1;
+                  rgba[i][RCOMP] =  p & 0xE0;
+                  rgba[i][GCOMP] = (p & 0x1C) << 3;
+                  rgba[i][BCOMP] = (p & 0x03) << 6;
+                  rgba[i][ACOMP] = 255;
+               }
+            }
+            break;
+	 case PF_Dither:
+	 case PF_Lookup:
+	 case PF_Grayscale:
+            {
+               GLubyte *rTable = source->pixel_to_r;
+               GLubyte *gTable = source->pixel_to_g;
+               GLubyte *bTable = source->pixel_to_b;
+               XMesaImage *img = source->backimage;
+               for (i=0;i<n;i++) {
+                  if (mask[i]) {
+                     unsigned long p;
+                     p = XMesaGetPixel( img, x[i], FLIP(source, y[i]) );
+                     rgba[i][RCOMP] = rTable[p];
+                     rgba[i][GCOMP] = gTable[p];
+                     rgba[i][BCOMP] = bTable[p];
+                     rgba[i][ACOMP] = 255;
+                  }
+               }
+	    }
+	    break;
+	 case PF_1Bit:
+            {
+               XMesaImage *img = source->backimage;
+               int bitFlip = xmesa->xm_visual->bitFlip;
+               for (i=0;i<n;i++) {
+                  if (mask[i]) {
+                     unsigned long p;
+                     p = XMesaGetPixel( img, x[i], FLIP(source, y[i]) ) ^ bitFlip;
+                     rgba[i][RCOMP] = (GLubyte) (p * 255);
+                     rgba[i][GCOMP] = (GLubyte) (p * 255);
+                     rgba[i][BCOMP] = (GLubyte) (p * 255);
+                     rgba[i][ACOMP] = 255;
+                  }
+               }
+	    }
+	    break;
+	 default:
+	    _mesa_problem(NULL,"Problem in DD.read_color_pixels (1)");
+            return;
+      }
+   }
+}
+
+
+static void
+clear_color_HPCR_ximage( GLcontext *ctx, const GLfloat color[4] )
+{
+   int i;
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+
+   CLAMPED_FLOAT_TO_UBYTE(xmesa->clearcolor[0], color[0]);
+   CLAMPED_FLOAT_TO_UBYTE(xmesa->clearcolor[1], color[1]);
+   CLAMPED_FLOAT_TO_UBYTE(xmesa->clearcolor[2], color[2]);
+   CLAMPED_FLOAT_TO_UBYTE(xmesa->clearcolor[3], color[3]);
+
+   if (color[0] == 0.0 && color[1] == 0.0 && color[2] == 0.0) {
+      /* black is black */
+      MEMSET( xmesa->xm_visual->hpcr_clear_ximage_pattern, 0x0 ,
+              sizeof(xmesa->xm_visual->hpcr_clear_ximage_pattern));
+   }
+   else {
+      /* build clear pattern */
+      for (i=0; i<16; i++) {
+         xmesa->xm_visual->hpcr_clear_ximage_pattern[0][i] =
+            DITHER_HPCR(i, 0,
+                        xmesa->clearcolor[0],
+                        xmesa->clearcolor[1],
+                        xmesa->clearcolor[2]);
+         xmesa->xm_visual->hpcr_clear_ximage_pattern[1][i]    =
+            DITHER_HPCR(i, 1,
+                        xmesa->clearcolor[0],
+                        xmesa->clearcolor[1],
+                        xmesa->clearcolor[2]);
+      }
+   }
+}
+
+
+static void
+clear_color_HPCR_pixmap( GLcontext *ctx, const GLfloat color[4] )
+{
+   int i;
+   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
+
+   CLAMPED_FLOAT_TO_UBYTE(xmesa->clearcolor[0], color[0]);
+   CLAMPED_FLOAT_TO_UBYTE(xmesa->clearcolor[1], color[1]);
+   CLAMPED_FLOAT_TO_UBYTE(xmesa->clearcolor[2], color[2]);
+   CLAMPED_FLOAT_TO_UBYTE(xmesa->clearcolor[3], color[3]);
+
+   if (color[0] == 0.0 && color[1] == 0.0 && color[2] == 0.0) {
+      /* black is black */
+      for (i=0; i<16; i++) {
+         XMesaPutPixel(xmesa->xm_visual->hpcr_clear_ximage, i, 0, 0);
+         XMesaPutPixel(xmesa->xm_visual->hpcr_clear_ximage, i, 1, 0);
+      }
+   }
+   else {
+      for (i=0; i<16; i++) {
+         XMesaPutPixel(xmesa->xm_visual->hpcr_clear_ximage, i, 0,
+                       DITHER_HPCR(i, 0,
+                                   xmesa->clearcolor[0],
+                                   xmesa->clearcolor[1],
+                                   xmesa->clearcolor[2]));
+         XMesaPutPixel(xmesa->xm_visual->hpcr_clear_ximage, i, 1,
+                       DITHER_HPCR(i, 1,
+                                   xmesa->clearcolor[0],
+                                   xmesa->clearcolor[1],
+                                   xmesa->clearcolor[2]));
+      }
+   }
+   /* change tile pixmap content */
+   XMesaPutImage(xmesa->display,
+		 (XMesaDrawable)xmesa->xm_visual->hpcr_clear_pixmap,
+		 xmesa->xm_buffer->cleargc,
+		 xmesa->xm_visual->hpcr_clear_ximage, 0, 0, 0, 0, 16, 2);
+}
+
+
+
+void xmesa_update_span_funcs( GLcontext *ctx )
+{
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   int depth=GET_VISUAL_DEPTH(xmesa->xm_visual);
+   struct swrast_device_driver *dd = _swrast_GetDeviceDriverReference( ctx );
+
+   /*
+    * These drawing functions depend on color buffer config:
+    */
+   if (xmesa->xm_buffer->buffer!=XIMAGE) {
+      /* Writing to window or back pixmap */
+      switch (xmesa->pixelformat) {
+	 case PF_Index:
+	    dd->WriteCI32Span     = write_span_index_pixmap;
+	    dd->WriteCI8Span      = write_span_index8_pixmap;
+	    dd->WriteMonoCISpan   = write_span_mono_index_pixmap;
+	    dd->WriteCI32Pixels   = write_pixels_index_pixmap;
+	    dd->WriteMonoCIPixels = write_pixels_mono_index_pixmap;
+	    break;
+	 case PF_Truecolor:
+	    dd->WriteRGBASpan       = write_span_TRUECOLOR_pixmap;
+	    dd->WriteRGBSpan        = write_span_rgb_TRUECOLOR_pixmap;
+	    dd->WriteMonoRGBASpan   = write_span_mono_pixmap;
+	    dd->WriteRGBAPixels     = write_pixels_TRUECOLOR_pixmap;
+	    dd->WriteMonoRGBAPixels = write_pixels_mono_pixmap;
+	    break;
+	 case PF_Dither_True:
+	    dd->WriteRGBASpan       = write_span_TRUEDITHER_pixmap;
+	    dd->WriteRGBSpan        = write_span_rgb_TRUEDITHER_pixmap;
+	    dd->WriteMonoRGBASpan   = write_span_mono_TRUEDITHER_pixmap;
+	    dd->WriteRGBAPixels     = write_pixels_TRUEDITHER_pixmap;
+	    dd->WriteMonoRGBAPixels = write_pixels_mono_TRUEDITHER_pixmap;
+	    break;
+	 case PF_8A8B8G8R:
+	    dd->WriteRGBASpan       = write_span_8A8B8G8R_pixmap;
+	    dd->WriteRGBSpan        = write_span_rgb_8A8B8G8R_pixmap;
+	    dd->WriteMonoRGBASpan   = write_span_mono_pixmap;
+	    dd->WriteRGBAPixels     = write_pixels_8A8B8G8R_pixmap;
+	    dd->WriteMonoRGBAPixels = write_pixels_mono_pixmap;
+	    break;
+	 case PF_8R8G8B:
+	    dd->WriteRGBASpan       = write_span_8R8G8B_pixmap;
+	    dd->WriteRGBSpan        = write_span_rgb_8R8G8B_pixmap;
+	    dd->WriteMonoRGBASpan   = write_span_mono_pixmap;
+	    dd->WriteRGBAPixels     = write_pixels_8R8G8B_pixmap;
+	    dd->WriteMonoRGBAPixels = write_pixels_mono_pixmap;
+	    break;
+	 case PF_8R8G8B24:
+	    dd->WriteRGBASpan       = write_span_8R8G8B24_pixmap;
+	    dd->WriteRGBSpan        = write_span_rgb_8R8G8B24_pixmap;
+	    dd->WriteMonoRGBASpan   = write_span_mono_pixmap;
+	    dd->WriteRGBAPixels     = write_pixels_8R8G8B24_pixmap;
+	    dd->WriteMonoRGBAPixels = write_pixels_mono_pixmap;
+	    break;
+	 case PF_5R6G5B:
+	    dd->WriteRGBASpan       = write_span_5R6G5B_pixmap;
+	    dd->WriteRGBSpan        = write_span_rgb_5R6G5B_pixmap;
+	    dd->WriteMonoRGBASpan   = write_span_mono_pixmap;
+	    dd->WriteRGBAPixels     = write_pixels_5R6G5B_pixmap;
+	    dd->WriteMonoRGBAPixels = write_pixels_mono_pixmap;
+	    break;
+	 case PF_Dither_5R6G5B:
+	    dd->WriteRGBASpan       = write_span_DITHER_5R6G5B_pixmap;
+	    dd->WriteRGBSpan        = write_span_rgb_DITHER_5R6G5B_pixmap;
+	    dd->WriteMonoRGBASpan   = write_span_mono_TRUEDITHER_pixmap;
+	    dd->WriteRGBAPixels     = write_pixels_DITHER_5R6G5B_pixmap;
+	    dd->WriteMonoRGBAPixels = write_pixels_mono_TRUEDITHER_pixmap;
+	    break;
+	 case PF_Dither:
+	    dd->WriteRGBASpan       = write_span_DITHER_pixmap;
+	    dd->WriteRGBSpan        = write_span_rgb_DITHER_pixmap;
+	    dd->WriteMonoRGBASpan   = write_span_mono_DITHER_pixmap;
+	    dd->WriteRGBAPixels     = write_pixels_DITHER_pixmap;
+	    dd->WriteMonoRGBAPixels = write_pixels_mono_DITHER_pixmap;
+	    break;
+	 case PF_1Bit:
+	    dd->WriteRGBASpan       = write_span_1BIT_pixmap;
+	    dd->WriteRGBSpan        = write_span_rgb_1BIT_pixmap;
+	    dd->WriteMonoRGBASpan   = write_span_mono_1BIT_pixmap;
+	    dd->WriteRGBAPixels     = write_pixels_1BIT_pixmap;
+	    dd->WriteMonoRGBAPixels = write_pixels_mono_1BIT_pixmap;
+	    break;
+         case PF_HPCR:
+            dd->WriteRGBASpan       = write_span_HPCR_pixmap;
+            dd->WriteRGBSpan        = write_span_rgb_HPCR_pixmap;
+            dd->WriteMonoRGBASpan   = write_span_mono_pixmap;
+            dd->WriteRGBAPixels     = write_pixels_HPCR_pixmap;
+            dd->WriteMonoRGBAPixels = write_pixels_mono_pixmap;
+	    if (xmesa->xm_visual->hpcr_clear_flag) {
+	       ctx->Driver.ClearColor = clear_color_HPCR_pixmap;
+	    }
+            break;
+         case PF_Lookup:
+            dd->WriteRGBASpan       = write_span_LOOKUP_pixmap;
+            dd->WriteRGBSpan        = write_span_rgb_LOOKUP_pixmap;
+            dd->WriteMonoRGBASpan   = write_span_mono_pixmap;
+            dd->WriteRGBAPixels     = write_pixels_LOOKUP_pixmap;
+            dd->WriteMonoRGBAPixels = write_pixels_mono_pixmap;
+            break;
+         case PF_Grayscale:
+            dd->WriteRGBASpan       = write_span_GRAYSCALE_pixmap;
+            dd->WriteRGBSpan        = write_span_rgb_GRAYSCALE_pixmap;
+            dd->WriteMonoRGBASpan   = write_span_mono_pixmap;
+            dd->WriteRGBAPixels     = write_pixels_GRAYSCALE_pixmap;
+            dd->WriteMonoRGBAPixels = write_pixels_mono_pixmap;
+            break;
+	 default:
+	    _mesa_problem(NULL,"Bad pixel format in xmesa_update_state (1)");
+            return;
+      }
+   }
+   else if (xmesa->xm_buffer->buffer==XIMAGE) {
+      /* Writing to back XImage */
+      switch (xmesa->pixelformat) {
+	 case PF_Index:
+	    dd->WriteCI32Span     = write_span_index_ximage;
+	    if (depth==8)
+               dd->WriteCI8Span   = write_span_index8_ximage8;
+            else
+               dd->WriteCI8Span   = write_span_index8_ximage;
+	    dd->WriteMonoCISpan   = write_span_mono_index_ximage;
+	    dd->WriteCI32Pixels   = write_pixels_index_ximage;
+	    dd->WriteMonoCIPixels = write_pixels_mono_index_ximage;
+	    break;
+	 case PF_Truecolor:
+	    /* Generic RGB */
+	    dd->WriteRGBASpan       = write_span_TRUECOLOR_ximage;
+	    dd->WriteRGBSpan        = write_span_rgb_TRUECOLOR_ximage;
+	    dd->WriteMonoRGBASpan   = write_span_mono_ximage;
+	    dd->WriteRGBAPixels     = write_pixels_TRUECOLOR_ximage;
+	    dd->WriteMonoRGBAPixels = write_pixels_mono_ximage;
+	    break;
+	 case PF_Dither_True:
+	    dd->WriteRGBASpan       = write_span_TRUEDITHER_ximage;
+	    dd->WriteRGBSpan        = write_span_rgb_TRUEDITHER_ximage;
+	    dd->WriteMonoRGBASpan   = write_span_mono_TRUEDITHER_ximage;
+	    dd->WriteRGBAPixels     = write_pixels_TRUEDITHER_ximage;
+	    dd->WriteMonoRGBAPixels = write_pixels_mono_TRUEDITHER_ximage;
+	    break;
+	 case PF_8A8B8G8R:
+	    dd->WriteRGBASpan       = write_span_8A8B8G8R_ximage;
+	    dd->WriteRGBSpan        = write_span_rgb_8A8B8G8R_ximage;
+	    dd->WriteMonoRGBASpan   = write_span_mono_8A8B8G8R_ximage;
+	    dd->WriteRGBAPixels     = write_pixels_8A8B8G8R_ximage;
+	    dd->WriteMonoRGBAPixels = write_pixels_mono_8A8B8G8R_ximage;
+	    break;
+	 case PF_8R8G8B:
+	    dd->WriteRGBASpan       = write_span_8R8G8B_ximage;
+	    dd->WriteRGBSpan        = write_span_rgb_8R8G8B_ximage;
+	    dd->WriteMonoRGBASpan   = write_span_mono_8R8G8B_ximage;
+	    dd->WriteRGBAPixels     = write_pixels_8R8G8B_ximage;
+	    dd->WriteMonoRGBAPixels = write_pixels_mono_8R8G8B_ximage;
+	    break;
+	 case PF_8R8G8B24:
+	    dd->WriteRGBASpan       = write_span_8R8G8B24_ximage;
+	    dd->WriteRGBSpan        = write_span_rgb_8R8G8B24_ximage;
+	    dd->WriteMonoRGBASpan   = write_span_mono_8R8G8B24_ximage;
+	    dd->WriteRGBAPixels     = write_pixels_8R8G8B24_ximage;
+	    dd->WriteMonoRGBAPixels = write_pixels_mono_8R8G8B24_ximage;
+	    break;
+	 case PF_5R6G5B:
+	    dd->WriteRGBASpan       = write_span_5R6G5B_ximage;
+	    dd->WriteRGBSpan        = write_span_rgb_5R6G5B_ximage;
+	    dd->WriteMonoRGBASpan   = write_span_mono_ximage;
+	    dd->WriteRGBAPixels     = write_pixels_5R6G5B_ximage;
+	    dd->WriteMonoRGBAPixels = write_pixels_mono_ximage;
+	    break;
+	 case PF_Dither_5R6G5B:
+	    dd->WriteRGBASpan       = write_span_DITHER_5R6G5B_ximage;
+	    dd->WriteRGBSpan        = write_span_rgb_DITHER_5R6G5B_ximage;
+	    dd->WriteMonoRGBASpan   = write_span_mono_DITHER_5R6G5B_ximage;
+	    dd->WriteRGBAPixels     = write_pixels_DITHER_5R6G5B_ximage;
+	    dd->WriteMonoRGBAPixels = write_pixels_mono_DITHER_5R6G5B_ximage;
+	    break;
+	 case PF_Dither:
+	    if (depth==8) {
+	       dd->WriteRGBASpan      = write_span_DITHER8_ximage;
+	       dd->WriteRGBSpan       = write_span_rgb_DITHER8_ximage;
+	       dd->WriteMonoRGBASpan  = write_span_mono_DITHER8_ximage;
+	       dd->WriteRGBAPixels    = write_pixels_DITHER8_ximage;
+	       dd->WriteMonoRGBAPixels = write_pixels_mono_DITHER8_ximage;
+	    }
+	    else {
+	       dd->WriteRGBASpan       = write_span_DITHER_ximage;
+	       dd->WriteRGBSpan        = write_span_rgb_DITHER_ximage;
+	       dd->WriteMonoRGBASpan   = write_span_mono_DITHER_ximage;
+	       dd->WriteRGBAPixels     = write_pixels_DITHER_ximage;
+	       dd->WriteMonoRGBAPixels = write_pixels_mono_DITHER_ximage;
+	    }
+	    break;
+	 case PF_1Bit:
+	    dd->WriteRGBASpan       = write_span_1BIT_ximage;
+	    dd->WriteRGBSpan        = write_span_rgb_1BIT_ximage;
+	    dd->WriteMonoRGBASpan   = write_span_mono_1BIT_ximage;
+	    dd->WriteRGBAPixels     = write_pixels_1BIT_ximage;
+	    dd->WriteMonoRGBAPixels = write_pixels_mono_1BIT_ximage;
+	    break;
+         case PF_HPCR:
+            dd->WriteRGBASpan       = write_span_HPCR_ximage;
+            dd->WriteRGBSpan        = write_span_rgb_HPCR_ximage;
+            dd->WriteMonoRGBASpan   = write_span_mono_HPCR_ximage;
+            dd->WriteRGBAPixels     = write_pixels_HPCR_ximage;
+            dd->WriteMonoRGBAPixels = write_pixels_mono_HPCR_ximage;
+	    if (xmesa->xm_visual->hpcr_clear_flag) {
+               ctx->Driver.ClearColor = clear_color_HPCR_ximage;
+	    }
+            break;
+         case PF_Lookup:
+	    if (depth==8) {
+               dd->WriteRGBASpan       = write_span_LOOKUP8_ximage;
+               dd->WriteRGBSpan        = write_rgb_LOOKUP8_ximage;
+               dd->WriteMonoRGBASpan   = write_span_mono_LOOKUP8_ximage;
+               dd->WriteRGBAPixels     = write_pixels_LOOKUP8_ximage;
+               dd->WriteMonoRGBAPixels = write_pixels_mono_LOOKUP8_ximage;
+            }
+            else {
+               dd->WriteRGBASpan       = write_span_LOOKUP_ximage;
+               dd->WriteRGBSpan        = write_span_rgb_LOOKUP_ximage;
+               dd->WriteMonoRGBASpan   = write_span_mono_ximage;
+               dd->WriteRGBAPixels     = write_pixels_LOOKUP_ximage;
+               dd->WriteMonoRGBAPixels = write_pixels_mono_ximage;
+            }
+            break;
+         case PF_Grayscale:
+	    if (depth==8) {
+	       dd->WriteRGBASpan       = write_span_GRAYSCALE8_ximage;
+	       dd->WriteRGBSpan        = write_span_rgb_GRAYSCALE8_ximage;
+	       dd->WriteMonoRGBASpan   = write_span_mono_GRAYSCALE8_ximage;
+	       dd->WriteRGBAPixels     = write_pixels_GRAYSCALE8_ximage;
+	       dd->WriteMonoRGBAPixels = write_pixels_mono_GRAYSCALE8_ximage;
+	    }
+	    else {
+	       dd->WriteRGBASpan       = write_span_GRAYSCALE_ximage;
+	       dd->WriteRGBSpan        = write_span_rgb_GRAYSCALE_ximage;
+	       dd->WriteMonoRGBASpan   = write_span_mono_ximage;
+	       dd->WriteRGBAPixels     = write_pixels_GRAYSCALE_ximage;
+	       dd->WriteMonoRGBAPixels = write_pixels_mono_ximage;
+	    }
+	    break;
+	 default:
+	    _mesa_problem(NULL,"Bad pixel format in xmesa_update_state (2)");
+            return;
+      }
+   }
+
+   /* Pixel/span reading functions: */
+   dd->ReadCI32Span = read_index_span;
+   dd->ReadRGBASpan = read_color_span;
+   dd->ReadCI32Pixels = read_index_pixels;
+   dd->ReadRGBAPixels = read_color_pixels;
+}
diff --git a/reactos/lib/mesa32/src/drivers/x11/xm_tri.c b/reactos/lib/mesa32/src/drivers/x11/xm_tri.c
new file mode 100644
index 00000000000..8e8b8fc9388
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/x11/xm_tri.c
@@ -0,0 +1,1495 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * This file contains "accelerated" triangle functions.  It should be
+ * fairly easy to write new special-purpose triangle functions and hook
+ * them into this module.
+ */
+
+
+#include "glxheader.h"
+#include "depth.h"
+#include "macros.h"
+#include "imports.h"
+#include "mtypes.h"
+#include "xmesaP.h"
+
+/* Internal swrast includes:
+ */
+#include "swrast/s_context.h"
+#include "swrast/s_depth.h"
+#include "swrast/s_triangle.h"
+
+
+
+/**********************************************************************/
+/***                   Triangle rendering                           ***/
+/**********************************************************************/
+
+
+/*
+ * XImage, smooth, depth-buffered, PF_TRUECOLOR triangle.
+ */
+#define NAME smooth_TRUECOLOR_z_triangle
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define INTERP_RGB 1
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+
+#define RENDER_SPAN( span )					\
+   GLint x = span.x, y = FLIP(xmesa->xm_buffer, span.y);	\
+   GLuint i;							\
+   for (i = 0; i < span.end; i++, x++) {			\
+      const DEPTH_TYPE z = FixedToDepth(span.z);		\
+      if (z < zRow[i]) {					\
+         unsigned long p;					\
+         PACK_TRUECOLOR(p, FixedToInt(span.red),		\
+            FixedToInt(span.green), FixedToInt(span.blue));	\
+         XMesaPutPixel(img, x, y, p);				\
+         zRow[i] = z;						\
+      }								\
+      span.red += span.redStep;					\
+      span.green += span.greenStep;				\
+      span.blue += span.blueStep;				\
+      span.z += span.zStep;					\
+   }
+
+#include "swrast/s_tritemp.h"
+
+
+
+
+/*
+ * XImage, smooth, depth-buffered, PF_8A8B8G8R triangle.
+ */
+#define NAME smooth_8A8B8G8R_z_triangle
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define INTERP_RGB 1
+#define PIXEL_ADDRESS(X,Y) PIXELADDR4(xmesa->xm_buffer,X,Y)
+#define PIXEL_TYPE GLuint
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+
+#define RENDER_SPAN( span )					\
+   GLuint i;							\
+   for (i = 0; i < span.end; i++) {				\
+      const DEPTH_TYPE z = FixedToDepth(span.z);		\
+      if (z < zRow[i]) {					\
+         pRow[i] = PACK_8B8G8R(FixedToInt(span.red),		\
+            FixedToInt(span.green), FixedToInt(span.blue));	\
+         zRow[i] = z;						\
+      }								\
+      span.red += span.redStep;					\
+      span.green += span.greenStep;				\
+      span.blue += span.blueStep;				\
+      span.z += span.zStep;					\
+   }
+
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, smooth, depth-buffered, PF_8R8G8B triangle.
+ */
+#define NAME smooth_8R8G8B_z_triangle
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define INTERP_RGB 1
+#define PIXEL_ADDRESS(X,Y) PIXELADDR4(xmesa->xm_buffer,X,Y)
+#define PIXEL_TYPE GLuint
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+
+#define RENDER_SPAN( span )					\
+   GLuint i;							\
+   for (i = 0; i < span.end; i++) {				\
+      const DEPTH_TYPE z = FixedToDepth(span.z);		\
+      if (z < zRow[i]) {					\
+         pRow[i] = PACK_8R8G8B(FixedToInt(span.red),		\
+            FixedToInt(span.green), FixedToInt(span.blue));	\
+         zRow[i] = z;						\
+      }								\
+      span.red += span.redStep;					\
+      span.green += span.greenStep;				\
+      span.blue += span.blueStep;				\
+      span.z += span.zStep;					\
+   }
+
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, smooth, depth-buffered, PF_8R8G8B24 triangle.
+ */
+#define NAME smooth_8R8G8B24_z_triangle
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define INTERP_RGB 1
+#define PIXEL_ADDRESS(X,Y) PIXELADDR3(xmesa->xm_buffer,X,Y)
+#define PIXEL_TYPE bgr_t
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);
+#define RENDER_SPAN( span ) 					\
+   GLuint i;							\
+   for (i = 0; i < span.end; i++) {				\
+      const DEPTH_TYPE z = FixedToDepth(span.z);		\
+      if (z < zRow[i]) {					\
+	 PIXEL_TYPE *ptr = pRow + i;				\
+         ptr->r = FixedToInt(span.red);				\
+         ptr->g = FixedToInt(span.green);			\
+         ptr->b = FixedToInt(span.blue);			\
+         zRow[i] = z;						\
+      }								\
+      span.red += span.redStep;					\
+      span.green += span.greenStep;				\
+      span.blue += span.blueStep;				\
+      span.z += span.zStep;					\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, smooth, depth-buffered, PF_TRUEDITHER triangle.
+ */
+#define NAME smooth_TRUEDITHER_z_triangle
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define INTERP_RGB 1
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+#define RENDER_SPAN( span )					\
+   GLuint i;							\
+   GLint x = span.x, y = FLIP(xmesa->xm_buffer, span.y);	\
+   for (i = 0; i < span.end; i++, x++) {			\
+      const DEPTH_TYPE z = FixedToDepth(span.z);		\
+      if (z < zRow[i]) {					\
+         unsigned long p;					\
+         PACK_TRUEDITHER(p, x, y, FixedToInt(span.red),		\
+            FixedToInt(span.green), FixedToInt(span.blue));	\
+         XMesaPutPixel(img, x, y, p);				\
+         zRow[i] = z;						\
+      }								\
+      span.red += span.redStep;					\
+      span.green += span.greenStep;				\
+      span.blue += span.blueStep;				\
+      span.z += span.zStep;					\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, smooth, depth-buffered, PF_5R6G5B triangle.
+ */
+#define NAME smooth_5R6G5B_z_triangle
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define INTERP_RGB 1
+#define PIXEL_ADDRESS(X,Y) PIXELADDR2(xmesa->xm_buffer,X,Y)
+#define PIXEL_TYPE GLushort
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);
+#define RENDER_SPAN( span )					\
+   GLuint i;							\
+   for (i = 0; i < span.end; i++) {				\
+      const DEPTH_TYPE z = FixedToDepth(span.z);		\
+      if (z < zRow[i]) {					\
+         pRow[i] = PACK_5R6G5B(FixedToInt(span.red),		\
+            FixedToInt(span.green), FixedToInt(span.blue));	\
+         zRow[i] = z;						\
+      }								\
+      span.red += span.redStep;					\
+      span.green += span.greenStep;				\
+      span.blue += span.blueStep;				\
+      span.z += span.zStep;					\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, smooth, depth-buffered, PF_DITHER_5R6G5B triangle.
+ */
+#define NAME smooth_DITHER_5R6G5B_z_triangle
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define INTERP_RGB 1
+#define PIXEL_ADDRESS(X,Y) PIXELADDR2(xmesa->xm_buffer,X,Y)
+#define PIXEL_TYPE GLushort
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);
+#define RENDER_SPAN( span )					\
+   GLuint i;							\
+   GLint x = span.x, y = FLIP(xmesa->xm_buffer, span.y);	\
+   for (i = 0; i < span.end; i++, x++) {			\
+      const DEPTH_TYPE z = FixedToDepth(span.z);		\
+      if (z < zRow[i]) {					\
+         PACK_TRUEDITHER(pRow[i], x, y, FixedToInt(span.red),	\
+            FixedToInt(span.green), FixedToInt(span.blue));	\
+         zRow[i] = z;						\
+      }								\
+      span.red += span.redStep;					\
+      span.green += span.greenStep;				\
+      span.blue += span.blueStep;				\
+      span.z += span.zStep;					\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, smooth, depth-buffered, 8-bit, PF_DITHER8 triangle.
+ */
+#define NAME smooth_DITHER8_z_triangle
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define INTERP_RGB 1
+#define PIXEL_ADDRESS(X,Y) PIXELADDR1(xmesa->xm_buffer,X,Y)
+#define PIXEL_TYPE GLubyte
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);
+#define RENDER_SPAN( span )					\
+   GLuint i;							\
+   GLint x = span.x, y = FLIP(xmesa->xm_buffer, span.y);	\
+   XDITHER_SETUP(y);						\
+   for (i = 0; i < span.end; i++, x++) {			\
+      const DEPTH_TYPE z = FixedToDepth(span.z);		\
+      if (z < zRow[i]) {					\
+         pRow[i] = (PIXEL_TYPE) XDITHER(x, FixedToInt(span.red),\
+            FixedToInt(span.green), FixedToInt(span.blue) );	\
+         zRow[i] = z;						\
+      }								\
+      span.red += span.redStep;					\
+      span.green += span.greenStep;				\
+      span.blue += span.blueStep;				\
+      span.z += span.zStep;					\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, smooth, depth-buffered, PF_DITHER triangle.
+ */
+#define NAME smooth_DITHER_z_triangle
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define INTERP_RGB 1
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+#define RENDER_SPAN( span )					\
+   GLuint i;							\
+   GLint x = span.x, y = FLIP(xmesa->xm_buffer, span.y);	\
+   XDITHER_SETUP(y);						\
+   for (i = 0; i < span.end; i++, x++) {			\
+      const DEPTH_TYPE z = FixedToDepth(span.z);		\
+      if (z < zRow[i]) {					\
+         unsigned long p = XDITHER(x, FixedToInt(span.red),	\
+            FixedToInt(span.green), FixedToInt(span.blue));	\
+	 XMesaPutPixel(img, x, y, p);			       	\
+         zRow[i] = z;						\
+      }								\
+      span.red += span.redStep;					\
+      span.green += span.greenStep;				\
+      span.blue += span.blueStep;				\
+      span.z += span.zStep;					\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, smooth, depth-buffered, 8-bit PF_LOOKUP triangle.
+ */
+#define NAME smooth_LOOKUP8_z_triangle
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define INTERP_RGB 1
+#define PIXEL_ADDRESS(X,Y) PIXELADDR1(xmesa->xm_buffer,X,Y)
+#define PIXEL_TYPE GLubyte
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);
+#define RENDER_SPAN( span )					\
+   GLuint i;							\
+   LOOKUP_SETUP;						\
+   for (i = 0; i < span.end; i++) {				\
+      const DEPTH_TYPE z = FixedToDepth(span.z);		\
+      if (z < zRow[i]) {					\
+         pRow[i] = LOOKUP(FixedToInt(span.red),			\
+            FixedToInt(span.green), FixedToInt(span.blue));	\
+         zRow[i] = z;						\
+      }								\
+      span.red += span.redStep;					\
+      span.green += span.greenStep;				\
+      span.blue += span.blueStep;				\
+      span.z += span.zStep;					\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, smooth, depth-buffered, 8-bit PF_HPCR triangle.
+ */
+#define NAME smooth_HPCR_z_triangle
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define INTERP_RGB 1
+#define PIXEL_ADDRESS(X,Y) PIXELADDR1(xmesa->xm_buffer,X,Y)
+#define PIXEL_TYPE GLubyte
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);
+#define RENDER_SPAN( span )					\
+   GLuint i;							\
+   GLint x = span.x, y = FLIP(xmesa->xm_buffer, span.y);	\
+   for (i = 0; i < span.end; i++, x++) {			\
+      const DEPTH_TYPE z = FixedToDepth(span.z);		\
+      if (z < zRow[i]) {					\
+         pRow[i] = DITHER_HPCR(x, y, FixedToInt(span.red),	\
+            FixedToInt(span.green), FixedToInt(span.blue) );	\
+         zRow[i] = z;						\
+      }								\
+      span.red += span.redStep;					\
+      span.green += span.greenStep;				\
+      span.blue += span.blueStep;				\
+      span.z += span.zStep;					\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, flat, depth-buffered, PF_TRUECOLOR triangle.
+ */
+#define NAME flat_TRUECOLOR_z_triangle
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   XMesaImage *img = xmesa->xm_buffer->backimage;		\
+   unsigned long pixel;						\
+   PACK_TRUECOLOR(pixel, v2->color[0], v2->color[1], v2->color[2]);
+#define RENDER_SPAN( span )					\
+   GLuint i;							\
+   GLint x = span.x, y = FLIP(xmesa->xm_buffer, span.y);	\
+   for (i = 0; i < span.end; i++, x++) {			\
+      const DEPTH_TYPE z = FixedToDepth(span.z);		\
+      if (z < zRow[i]) {					\
+         XMesaPutPixel(img, x, y, pixel);			\
+         zRow[i] = z;						\
+      }								\
+      span.z += span.zStep;					\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, flat, depth-buffered, PF_8A8B8G8R triangle.
+ */
+#define NAME flat_8A8B8G8R_z_triangle
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define PIXEL_ADDRESS(X,Y) PIXELADDR4(xmesa->xm_buffer,X,Y)
+#define PIXEL_TYPE GLuint
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define SETUP_CODE					\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);		\
+   unsigned long p = PACK_8B8G8R( v2->color[0],		\
+		 v2->color[1], v2->color[2] );
+#define RENDER_SPAN( span )				\
+   GLuint i;						\
+   for (i = 0; i < span.end; i++) {			\
+      const DEPTH_TYPE z = FixedToDepth(span.z);	\
+      if (z < zRow[i]) {				\
+	 pRow[i] = (PIXEL_TYPE) p;			\
+         zRow[i] = z;					\
+      }							\
+      span.z += span.zStep;				\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, flat, depth-buffered, PF_8R8G8B triangle.
+ */
+#define NAME flat_8R8G8B_z_triangle
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define PIXEL_ADDRESS(X,Y) PIXELADDR4(xmesa->xm_buffer,X,Y)
+#define PIXEL_TYPE GLuint
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define SETUP_CODE					\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);		\
+   unsigned long p = PACK_8R8G8B( v2->color[0],		\
+		 v2->color[1], v2->color[2] );
+#define RENDER_SPAN( span )			\
+   GLuint i;					\
+   for (i = 0; i < span.end; i++) {		\
+      DEPTH_TYPE z = FixedToDepth(span.z);	\
+      if (z < zRow[i]) {			\
+	 pRow[i] = (PIXEL_TYPE) p;		\
+         zRow[i] = z;				\
+      }						\
+      span.z += span.zStep;			\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, flat, depth-buffered, PF_8R8G8B24 triangle.
+ */
+#define NAME flat_8R8G8B24_z_triangle
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define PIXEL_ADDRESS(X,Y) PIXELADDR3(xmesa->xm_buffer,X,Y)
+#define PIXEL_TYPE bgr_t
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define SETUP_CODE					\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);		\
+   const GLubyte *color = v2->color;
+#define RENDER_SPAN( span )				\
+   GLuint i;						\
+   for (i = 0; i < span.end; i++) {			\
+      const DEPTH_TYPE z = FixedToDepth(span.z);	\
+      if (z < zRow[i]) {				\
+	 PIXEL_TYPE *ptr = pRow + i;			\
+         ptr->r = color[RCOMP];				\
+         ptr->g = color[GCOMP];				\
+         ptr->b = color[BCOMP];				\
+         zRow[i] = z;					\
+      }							\
+      span.z += span.zStep;				\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, flat, depth-buffered, PF_TRUEDITHER triangle.
+ */
+#define NAME flat_TRUEDITHER_z_triangle
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+#define RENDER_SPAN( span )					\
+   GLuint i;							\
+   GLint x = span.x, y = FLIP(xmesa->xm_buffer, span.y);	\
+   for (i = 0; i < span.end; i++, x++) {			\
+      const DEPTH_TYPE z = FixedToDepth(span.z);		\
+      if (z < zRow[i]) {					\
+         unsigned long p;					\
+         PACK_TRUEDITHER(p, x, y, v2->color[0],			\
+            v2->color[1], v2->color[2]);			\
+         XMesaPutPixel(img, x, y, p);				\
+         zRow[i] = z;						\
+      }								\
+      span.z += span.zStep;					\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, flat, depth-buffered, PF_5R6G5B triangle.
+ */
+#define NAME flat_5R6G5B_z_triangle
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define PIXEL_ADDRESS(X,Y) PIXELADDR2(xmesa->xm_buffer,X,Y)
+#define PIXEL_TYPE GLushort
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define SETUP_CODE					\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);		\
+   unsigned long p = PACK_5R6G5B( v2->color[0],		\
+            v2->color[1], v2->color[2] );
+#define RENDER_SPAN( span )				\
+   GLuint i;						\
+   for (i = 0; i < span.end; i++) {			\
+      const DEPTH_TYPE z = FixedToDepth(span.z);	\
+      if (z < zRow[i]) {				\
+	 pRow[i] = (PIXEL_TYPE) p;			\
+         zRow[i] = z;					\
+      }							\
+      span.z += span.zStep;				\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, flat, depth-buffered, PF_DITHER_5R6G5B triangle.
+ */
+#define NAME flat_DITHER_5R6G5B_z_triangle
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define PIXEL_ADDRESS(X,Y) PIXELADDR2(xmesa->xm_buffer,X,Y)
+#define PIXEL_TYPE GLushort
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   const GLubyte *color = v2->color;
+#define RENDER_SPAN( span )					\
+   GLuint i;							\
+   GLint x = span.x, y = FLIP(xmesa->xm_buffer, span.y);	\
+   for (i = 0; i < span.end; i++, x++) {			\
+      const DEPTH_TYPE z = FixedToDepth(span.z);		\
+      if (z < zRow[i]) {					\
+	 PACK_TRUEDITHER(pRow[i], x, y, color[RCOMP],		\
+			 color[GCOMP], color[BCOMP]);		\
+         zRow[i] = z;						\
+      }								\
+      span.z += span.zStep;					\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, flat, depth-buffered, 8-bit PF_DITHER triangle.
+ */
+#define NAME flat_DITHER8_z_triangle
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define PIXEL_ADDRESS(X,Y) PIXELADDR1(xmesa->xm_buffer,X,Y)
+#define PIXEL_TYPE GLubyte
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   FLAT_DITHER_SETUP( v2->color[0], v2->color[1], v2->color[2] );
+#define RENDER_SPAN( span )					\
+   GLuint i;							\
+   GLint x = span.x, y = FLIP(xmesa->xm_buffer, span.y);	\
+   FLAT_DITHER_ROW_SETUP(FLIP(xmesa->xm_buffer, y));		\
+   for (i = 0; i < span.end; i++, x++) {			\
+      const DEPTH_TYPE z = FixedToDepth(span.z);		\
+      if (z < zRow[i]) {					\
+	 pRow[i] = (PIXEL_TYPE) FLAT_DITHER(x);			\
+         zRow[i] = z;						\
+      }								\
+      span.z += span.zStep;					\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, flat, depth-buffered, PF_DITHER triangle.
+ */
+#define NAME flat_DITHER_z_triangle
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   XMesaImage *img = xmesa->xm_buffer->backimage;		\
+   FLAT_DITHER_SETUP( v2->color[0], v2->color[1], v2->color[2] );
+#define RENDER_SPAN( span )					\
+   GLuint i;							\
+   GLint x = span.x, y = FLIP(xmesa->xm_buffer, span.y);	\
+   FLAT_DITHER_ROW_SETUP(y);					\
+   for (i = 0; i < span.end; i++, x++) {			\
+      const DEPTH_TYPE z = FixedToDepth(span.z);		\
+      if (z < zRow[i]) {					\
+         unsigned long p = FLAT_DITHER(x);			\
+	 XMesaPutPixel(img, x, y, p);				\
+         zRow[i] = z;						\
+      }								\
+      span.z += span.zStep;					\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, flat, depth-buffered, 8-bit PF_HPCR triangle.
+ */
+#define NAME flat_HPCR_z_triangle
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define PIXEL_ADDRESS(X,Y) PIXELADDR1(xmesa->xm_buffer,X,Y)
+#define PIXEL_TYPE GLubyte
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   GLubyte r = v2->color[0];					\
+   GLubyte g = v2->color[1];					\
+   GLubyte b = v2->color[2];
+#define RENDER_SPAN( span )					\
+   GLuint i;							\
+   GLint x = span.x, y = FLIP(xmesa->xm_buffer, span.y);	\
+   for (i = 0; i < span.end; i++, x++) {			\
+      const DEPTH_TYPE z = FixedToDepth(span.z);		\
+      if (z < zRow[i]) {					\
+	 pRow[i] = (PIXEL_TYPE) DITHER_HPCR(x, y, r, g, b);	\
+         zRow[i] = z;						\
+      }								\
+      span.z += span.zStep;					\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, flat, depth-buffered, 8-bit PF_LOOKUP triangle.
+ */
+#define NAME flat_LOOKUP8_z_triangle
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define PIXEL_ADDRESS(X,Y) PIXELADDR1(xmesa->xm_buffer,X,Y)
+#define PIXEL_TYPE GLubyte
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define SETUP_CODE					\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);		\
+   LOOKUP_SETUP;					\
+   GLubyte r = v2->color[0];				\
+   GLubyte g = v2->color[1];				\
+   GLubyte b = v2->color[2];				\
+   GLubyte p = LOOKUP(r,g,b);
+#define RENDER_SPAN( span )				\
+   GLuint i;						\
+   for (i = 0; i < span.end; i++) {			\
+      const DEPTH_TYPE z = FixedToDepth(span.z);	\
+      if (z < zRow[i]) {				\
+	 pRow[i] = p;					\
+         zRow[i] = z;					\
+      }							\
+      span.z += span.zStep;				\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, smooth, NON-depth-buffered, PF_TRUECOLOR triangle.
+ */
+#define NAME smooth_TRUECOLOR_triangle
+#define INTERP_RGB 1
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+#define RENDER_SPAN( span )					\
+   GLuint i;							\
+   GLint x = span.x, y = FLIP(xmesa->xm_buffer, span.y);	\
+   for (i = 0; i < span.end; i++, x++) {			\
+      unsigned long p;						\
+      PACK_TRUECOLOR(p, FixedToInt(span.red),			\
+         FixedToInt(span.green), FixedToInt(span.blue));	\
+      XMesaPutPixel(img, x, y, p);				\
+      span.red += span.redStep;					\
+      span.green += span.greenStep;				\
+      span.blue += span.blueStep;				\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, smooth, NON-depth-buffered, PF_8A8B8G8R triangle.
+ */
+#define NAME smooth_8A8B8G8R_triangle
+#define INTERP_RGB 1
+#define PIXEL_ADDRESS(X,Y) PIXELADDR4(xmesa->xm_buffer,X,Y)
+#define PIXEL_TYPE GLuint
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);
+#define RENDER_SPAN( span )					\
+   GLuint i;							\
+   for (i = 0; i < span.end; i++) {				\
+      pRow[i] = PACK_8B8G8R(FixedToInt(span.red),		\
+         FixedToInt(span.green), FixedToInt(span.blue) );	\
+      span.red += span.redStep;					\
+      span.green += span.greenStep;				\
+      span.blue += span.blueStep;				\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, smooth, NON-depth-buffered, PF_8R8G8B triangle.
+ */
+#define NAME smooth_8R8G8B_triangle
+#define INTERP_RGB 1
+#define PIXEL_ADDRESS(X,Y) PIXELADDR4(xmesa->xm_buffer,X,Y)
+#define PIXEL_TYPE GLuint
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);
+#define RENDER_SPAN( span )					\
+   GLuint i;							\
+   for (i = 0; i < span.end; i++) {				\
+      pRow[i] = PACK_8R8G8B(FixedToInt(span.red),		\
+         FixedToInt(span.green), FixedToInt(span.blue) );	\
+      span.red += span.redStep;					\
+      span.green += span.greenStep;				\
+      span.blue += span.blueStep;				\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, smooth, NON-depth-buffered, PF_8R8G8B triangle.
+ */
+#define NAME smooth_8R8G8B24_triangle
+#define INTERP_RGB 1
+#define PIXEL_ADDRESS(X,Y) PIXELADDR3(xmesa->xm_buffer,X,Y)
+#define PIXEL_TYPE bgr_t
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define SETUP_CODE					\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);
+#define RENDER_SPAN( span )				\
+   GLuint i;						\
+   PIXEL_TYPE *pixel = pRow;				\
+   for (i = 0; i < span.end; i++, pixel++) {		\
+      pixel->r = FixedToInt(span.red);			\
+      pixel->g = FixedToInt(span.green);		\
+      pixel->b = FixedToInt(span.blue);			\
+      span.red += span.redStep;				\
+      span.green += span.greenStep;			\
+      span.blue += span.blueStep;			\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, smooth, NON-depth-buffered, PF_TRUEDITHER triangle.
+ */
+#define NAME smooth_TRUEDITHER_triangle
+#define INTERP_RGB 1
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+#define RENDER_SPAN( span )					\
+   GLuint i;							\
+   GLint x = span.x, y = FLIP(xmesa->xm_buffer, span.y);	\
+   for (i = 0; i < span.end; i++, x++) {			\
+      unsigned long p;						\
+      PACK_TRUEDITHER(p, x, y, FixedToInt(span.red),		\
+         FixedToInt(span.green), FixedToInt(span.blue));	\
+      XMesaPutPixel(img, x, y, p );				\
+      span.red += span.redStep;					\
+      span.green += span.greenStep;				\
+      span.blue += span.blueStep;				\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, smooth, NON-depth-buffered, PF_5R6G5B triangle.
+ */
+#define NAME smooth_5R6G5B_triangle
+#define INTERP_RGB 1
+#define PIXEL_ADDRESS(X,Y) PIXELADDR2(xmesa->xm_buffer,X,Y)
+#define PIXEL_TYPE GLushort
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);
+#define RENDER_SPAN( span )					\
+   GLuint i;							\
+   for (i = 0; i < span.end; i++) {				\
+      pRow[i] = (PIXEL_TYPE) PACK_5R6G5B(FixedToInt(span.red),	\
+         FixedToInt(span.green), FixedToInt(span.blue));	\
+      span.red += span.redStep;					\
+      span.green += span.greenStep;				\
+      span.blue += span.blueStep;				\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, smooth, NON-depth-buffered, PF_DITHER_5R6G5B triangle.
+ */
+#define NAME smooth_DITHER_5R6G5B_triangle
+#define INTERP_RGB 1
+#define PIXEL_ADDRESS(X,Y) PIXELADDR2(xmesa->xm_buffer,X,Y)
+#define PIXEL_TYPE GLushort
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);
+#define RENDER_SPAN( span )					\
+   GLuint i;							\
+   GLint x = span.x, y = FLIP(xmesa->xm_buffer, span.y);	\
+   for (i = 0; i < span.end; i++, x++) {			\
+      PACK_TRUEDITHER(pRow[i], x, y, FixedToInt(span.red),	\
+         FixedToInt(span.green), FixedToInt(span.blue));	\
+      span.red += span.redStep;					\
+      span.green += span.greenStep;				\
+      span.blue += span.blueStep;				\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, smooth, NON-depth-buffered, 8-bit PF_DITHER triangle.
+ */
+#define NAME smooth_DITHER8_triangle
+#define INTERP_RGB 1
+#define PIXEL_ADDRESS(X,Y) PIXELADDR1(xmesa->xm_buffer,X,Y)
+#define PIXEL_TYPE GLubyte
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);
+#define RENDER_SPAN( span )					\
+   GLuint i;							\
+   GLint x = span.x, y = FLIP(xmesa->xm_buffer, span.y);	\
+   XDITHER_SETUP(y);						\
+   for (i = 0; i < span.end; i++, x++) {			\
+      pRow[i] = (PIXEL_TYPE) XDITHER(x, FixedToInt(span.red),	\
+         FixedToInt(span.green), FixedToInt(span.blue) );	\
+      span.red += span.redStep;					\
+      span.green += span.greenStep;				\
+      span.blue += span.blueStep;				\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, smooth, NON-depth-buffered, PF_DITHER triangle.
+ */
+#define NAME smooth_DITHER_triangle
+#define INTERP_RGB 1
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+#define RENDER_SPAN( span )					\
+   GLuint i;							\
+   GLint x = span.x, y = FLIP(xmesa->xm_buffer, span.y);	\
+   XDITHER_SETUP(y);						\
+   for (i = 0; i < span.end; i++, x++) {			\
+      unsigned long p = XDITHER(x, FixedToInt(span.red),	\
+         FixedToInt(span.green), FixedToInt(span.blue) );	\
+      XMesaPutPixel(img, x, y, p);				\
+      span.red += span.redStep;					\
+      span.green += span.greenStep;				\
+      span.blue += span.blueStep;				\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, smooth, NON-depth-buffered, 8-bit PF_LOOKUP triangle.
+ */
+#define NAME smooth_LOOKUP8_triangle
+#define INTERP_RGB 1
+#define PIXEL_ADDRESS(X,Y) PIXELADDR1(xmesa->xm_buffer,X,Y)
+#define PIXEL_TYPE GLubyte
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);
+#define RENDER_SPAN( span )					\
+   GLuint i;							\
+   LOOKUP_SETUP;						\
+   for (i = 0; i < span.end; i++) {				\
+      pRow[i] = LOOKUP(FixedToInt(span.red),			\
+         FixedToInt(span.green), FixedToInt(span.blue));	\
+      span.red += span.redStep;					\
+      span.green += span.greenStep;				\
+      span.blue += span.blueStep;				\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, smooth, NON-depth-buffered, 8-bit PF_HPCR triangle.
+ */
+#define NAME smooth_HPCR_triangle
+#define INTERP_RGB 1
+#define PIXEL_ADDRESS(X,Y) PIXELADDR1(xmesa->xm_buffer,X,Y)
+#define PIXEL_TYPE GLubyte
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);
+#define RENDER_SPAN( span )					\
+   GLuint i;							\
+   GLint x = span.x, y = FLIP(xmesa->xm_buffer, span.y);	\
+   for (i = 0; i < span.end; i++, x++) {			\
+      pRow[i] = DITHER_HPCR(x, y, FixedToInt(span.red),		\
+         FixedToInt(span.green), FixedToInt(span.blue));	\
+      span.red += span.redStep;					\
+      span.green += span.greenStep;				\
+      span.blue += span.blueStep;				\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, flat, NON-depth-buffered, PF_TRUECOLOR triangle.
+ */
+#define NAME flat_TRUECOLOR_triangle
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   XMesaImage *img = xmesa->xm_buffer->backimage;		\
+   unsigned long pixel;						\
+   PACK_TRUECOLOR(pixel, v2->color[0], v2->color[1], v2->color[2]);
+#define RENDER_SPAN( span )					\
+   GLuint i;							\
+   GLint x = span.x, y = FLIP(xmesa->xm_buffer, span.y);	\
+   for (i = 0; i < span.end; i++, x++) {			\
+      XMesaPutPixel(img, x, y, pixel);				\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, flat, NON-depth-buffered, PF_8A8B8G8R triangle.
+ */
+#define NAME flat_8A8B8G8R_triangle
+#define PIXEL_ADDRESS(X,Y) PIXELADDR4(xmesa->xm_buffer,X,Y)
+#define PIXEL_TYPE GLuint
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define SETUP_CODE					\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);		\
+   unsigned long p = PACK_8B8G8R( v2->color[0],		\
+		 v2->color[1], v2->color[2] );
+#define RENDER_SPAN( span )				\
+   GLuint i;						\
+   for (i = 0; i < span.end; i++) {			\
+      pRow[i] = (PIXEL_TYPE) p;				\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, flat, NON-depth-buffered, PF_8R8G8B triangle.
+ */
+#define NAME flat_8R8G8B_triangle
+#define PIXEL_ADDRESS(X,Y) PIXELADDR4(xmesa->xm_buffer,X,Y)
+#define PIXEL_TYPE GLuint
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define SETUP_CODE					\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);		\
+   unsigned long p = PACK_8R8G8B( v2->color[0],		\
+		 v2->color[1], v2->color[2] );
+#define RENDER_SPAN( span )				\
+   GLuint i;						\
+   for (i = 0; i < span.end; i++) {			\
+      pRow[i] = (PIXEL_TYPE) p;				\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, flat, NON-depth-buffered, PF_8R8G8B24 triangle.
+ */
+#define NAME flat_8R8G8B24_triangle
+#define PIXEL_ADDRESS(X,Y) PIXELADDR3(xmesa->xm_buffer,X,Y)
+#define PIXEL_TYPE bgr_t
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define SETUP_CODE					\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);		\
+   const GLubyte *color = v2->color;
+#define RENDER_SPAN( span )				\
+   GLuint i;						\
+   PIXEL_TYPE *pixel = pRow;				\
+   for (i = 0; i < span.end; i++, pixel++) {		\
+      pixel->r = color[RCOMP];				\
+      pixel->g = color[GCOMP];				\
+      pixel->b = color[BCOMP];				\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, flat, NON-depth-buffered, PF_TRUEDITHER triangle.
+ */
+#define NAME flat_TRUEDITHER_triangle
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   XMesaImage *img = xmesa->xm_buffer->backimage;
+#define RENDER_SPAN( span )					\
+   GLuint i;							\
+   GLint x = span.x, y = FLIP(xmesa->xm_buffer, span.y);	\
+   for (i = 0; i < span.end; i++, x++) {			\
+      unsigned long p;						\
+      PACK_TRUEDITHER(p, x, y, v2->color[0],			\
+               v2->color[1], v2->color[2] );			\
+      XMesaPutPixel(img, x, y, p);				\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, flat, NON-depth-buffered, PF_5R6G5B triangle.
+ */
+#define NAME flat_5R6G5B_triangle
+#define PIXEL_ADDRESS(X,Y) PIXELADDR2(xmesa->xm_buffer,X,Y)
+#define PIXEL_TYPE GLushort
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define SETUP_CODE					\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);		\
+   unsigned long p = PACK_5R6G5B( v2->color[0],		\
+		 v2->color[1], v2->color[2] );
+#define RENDER_SPAN( span )				\
+   GLuint i;						\
+   for (i = 0; i < span.end; i++) {			\
+      pRow[i] = (PIXEL_TYPE) p;				\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, flat, NON-depth-buffered, PF_DITHER_5R6G5B triangle.
+ */
+#define NAME flat_DITHER_5R6G5B_triangle
+#define PIXEL_ADDRESS(X,Y) PIXELADDR2(xmesa->xm_buffer,X,Y)
+#define PIXEL_TYPE GLushort
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   const GLubyte *color = v2->color;
+#define RENDER_SPAN( span )					\
+   GLuint i;							\
+   GLint x = span.x, y = FLIP(xmesa->xm_buffer, span.y);	\
+   for (i = 0; i < span.end; i++, x++) {			\
+      PACK_TRUEDITHER(pRow[i], x, y, color[RCOMP],		\
+         color[GCOMP], color[BCOMP]);				\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, flat, NON-depth-buffered, 8-bit PF_DITHER triangle.
+ */
+#define NAME flat_DITHER8_triangle
+#define PIXEL_ADDRESS(X,Y) PIXELADDR1(xmesa->xm_buffer,X,Y)
+#define PIXEL_TYPE GLubyte
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   FLAT_DITHER_SETUP( v2->color[0], v2->color[1], v2->color[2] );
+#define RENDER_SPAN( span )					\
+   GLuint i;							\
+   GLint x = span.x, y = FLIP(xmesa->xm_buffer, span.y);	\
+   FLAT_DITHER_ROW_SETUP(FLIP(xmesa->xm_buffer, y));		\
+   for (i = 0; i < span.end; i++, x++) {			\
+      pRow[i] = (PIXEL_TYPE) FLAT_DITHER(x);			\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, flat, NON-depth-buffered, PF_DITHER triangle.
+ */
+#define NAME flat_DITHER_triangle
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   XMesaImage *img = xmesa->xm_buffer->backimage;		\
+   FLAT_DITHER_SETUP( v2->color[0], v2->color[1], v2->color[2] );
+#define RENDER_SPAN( span )					\
+   GLuint i;							\
+   GLint x = span.x, y = FLIP(xmesa->xm_buffer, span.y);	\
+   FLAT_DITHER_ROW_SETUP(y);					\
+   for (i = 0; i < span.end; i++, x++) {			\
+      unsigned long p = FLAT_DITHER(x);				\
+      XMesaPutPixel(img, x, y, p );				\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, flat, NON-depth-buffered, 8-bit PF_HPCR triangle.
+ */
+#define NAME flat_HPCR_triangle
+#define PIXEL_ADDRESS(X,Y) PIXELADDR1(xmesa->xm_buffer,X,Y)
+#define PIXEL_TYPE GLubyte
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define SETUP_CODE						\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);			\
+   GLubyte r = v2->color[0];					\
+   GLubyte g = v2->color[1];					\
+   GLubyte b = v2->color[2];
+#define RENDER_SPAN( span )					\
+   GLuint i;							\
+   GLint x = span.x, y = FLIP(xmesa->xm_buffer, span.y);	\
+   for (i = 0; i < span.end; i++, x++) {			\
+      pRow[i] = (PIXEL_TYPE) DITHER_HPCR(x, y, r, g, b);	\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+/*
+ * XImage, flat, NON-depth-buffered, 8-bit PF_LOOKUP triangle.
+ */
+#define NAME flat_LOOKUP8_triangle
+#define PIXEL_ADDRESS(X,Y) PIXELADDR1(xmesa->xm_buffer,X,Y)
+#define PIXEL_TYPE GLubyte
+#define BYTES_PER_ROW (xmesa->xm_buffer->backimage->bytes_per_line)
+#define SETUP_CODE					\
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);		\
+   LOOKUP_SETUP;					\
+   GLubyte r = v2->color[0];				\
+   GLubyte g = v2->color[1];				\
+   GLubyte b = v2->color[2];				\
+   GLubyte p = LOOKUP(r,g,b);
+#define RENDER_SPAN( span )         	 		\
+   GLuint i;						\
+   for (i = 0; i < span.end; i++) {			\
+      pRow[i] = (PIXEL_TYPE) p;				\
+   }
+#include "swrast/s_tritemp.h"
+
+
+
+#ifdef DEBUG
+extern void _xmesa_print_triangle_func( swrast_tri_func triFunc );
+void _xmesa_print_triangle_func( swrast_tri_func triFunc )
+{
+   _mesa_printf("XMesa tri func = ");
+   if (triFunc ==smooth_TRUECOLOR_z_triangle)
+      _mesa_printf("smooth_TRUECOLOR_z_triangle\n");
+   else if (triFunc ==smooth_8A8B8G8R_z_triangle)
+      _mesa_printf("smooth_8A8B8G8R_z_triangle\n");
+   else if (triFunc ==smooth_8R8G8B_z_triangle)
+      _mesa_printf("smooth_8R8G8B_z_triangle\n");
+   else if (triFunc ==smooth_8R8G8B24_z_triangle)
+      _mesa_printf("smooth_8R8G8B24_z_triangle\n");
+   else if (triFunc ==smooth_TRUEDITHER_z_triangle)
+      _mesa_printf("smooth_TRUEDITHER_z_triangle\n");
+   else if (triFunc ==smooth_5R6G5B_z_triangle)
+      _mesa_printf("smooth_5R6G5B_z_triangle\n");
+   else if (triFunc ==smooth_DITHER_5R6G5B_z_triangle)
+      _mesa_printf("smooth_DITHER_5R6G5B_z_triangle\n");
+   else if (triFunc ==smooth_HPCR_z_triangle)
+      _mesa_printf("smooth_HPCR_z_triangle\n");
+   else if (triFunc ==smooth_DITHER8_z_triangle)
+      _mesa_printf("smooth_DITHER8_z_triangle\n");
+   else if (triFunc ==smooth_LOOKUP8_z_triangle)
+      _mesa_printf("smooth_LOOKUP8_z_triangle\n");
+   else if (triFunc ==flat_TRUECOLOR_z_triangle)
+      _mesa_printf("flat_TRUECOLOR_z_triangle\n");
+   else if (triFunc ==flat_8A8B8G8R_z_triangle)
+      _mesa_printf("flat_8A8B8G8R_z_triangle\n");
+   else if (triFunc ==flat_8R8G8B_z_triangle)
+      _mesa_printf("flat_8R8G8B_z_triangle\n");
+   else if (triFunc ==flat_8R8G8B24_z_triangle)
+      _mesa_printf("flat_8R8G8B24_z_triangle\n");
+   else if (triFunc ==flat_TRUEDITHER_z_triangle)
+      _mesa_printf("flat_TRUEDITHER_z_triangle\n");
+   else if (triFunc ==flat_5R6G5B_z_triangle)
+      _mesa_printf("flat_5R6G5B_z_triangle\n");
+   else if (triFunc ==flat_DITHER_5R6G5B_z_triangle)
+      _mesa_printf("flat_DITHER_5R6G5B_z_triangle\n");
+   else if (triFunc ==flat_HPCR_z_triangle)
+      _mesa_printf("flat_HPCR_z_triangle\n");
+   else if (triFunc ==flat_DITHER8_z_triangle)
+      _mesa_printf("flat_DITHER8_z_triangle\n");
+   else if (triFunc ==flat_LOOKUP8_z_triangle)
+      _mesa_printf("flat_LOOKUP8_z_triangle\n");
+   else if (triFunc ==smooth_TRUECOLOR_triangle)
+      _mesa_printf("smooth_TRUECOLOR_triangle\n");
+   else if (triFunc ==smooth_8A8B8G8R_triangle)
+      _mesa_printf("smooth_8A8B8G8R_triangle\n");
+   else if (triFunc ==smooth_8R8G8B_triangle)
+      _mesa_printf("smooth_8R8G8B_triangle\n");
+   else if (triFunc ==smooth_8R8G8B24_triangle)
+      _mesa_printf("smooth_8R8G8B24_triangle\n");
+   else if (triFunc ==smooth_TRUEDITHER_triangle)
+      _mesa_printf("smooth_TRUEDITHER_triangle\n");
+   else if (triFunc ==smooth_5R6G5B_triangle)
+      _mesa_printf("smooth_5R6G5B_triangle\n");
+   else if (triFunc ==smooth_DITHER_5R6G5B_triangle)
+      _mesa_printf("smooth_DITHER_5R6G5B_triangle\n");
+   else if (triFunc ==smooth_HPCR_triangle)
+      _mesa_printf("smooth_HPCR_triangle\n");
+   else if (triFunc ==smooth_DITHER8_triangle)
+      _mesa_printf("smooth_DITHER8_triangle\n");
+   else if (triFunc ==smooth_LOOKUP8_triangle)
+      _mesa_printf("smooth_LOOKUP8_triangle\n");
+   else if (triFunc ==flat_TRUECOLOR_triangle)
+      _mesa_printf("flat_TRUECOLOR_triangle\n");
+   else if (triFunc ==flat_TRUEDITHER_triangle)
+      _mesa_printf("flat_TRUEDITHER_triangle\n");
+   else if (triFunc ==flat_8A8B8G8R_triangle)
+      _mesa_printf("flat_8A8B8G8R_triangle\n");
+   else if (triFunc ==flat_8R8G8B_triangle)
+      _mesa_printf("flat_8R8G8B_triangle\n");
+   else if (triFunc ==flat_8R8G8B24_triangle)
+      _mesa_printf("flat_8R8G8B24_triangle\n");
+   else if (triFunc ==flat_5R6G5B_triangle)
+      _mesa_printf("flat_5R6G5B_triangle\n");
+   else if (triFunc ==flat_DITHER_5R6G5B_triangle)
+      _mesa_printf("flat_DITHER_5R6G5B_triangle\n");
+   else if (triFunc ==flat_HPCR_triangle)
+      _mesa_printf("flat_HPCR_triangle\n");
+   else if (triFunc ==flat_DITHER8_triangle)
+      _mesa_printf("flat_DITHER8_triangle\n");
+   else if (triFunc ==flat_LOOKUP8_triangle)
+      _mesa_printf("flat_LOOKUP8_triangle\n");
+   else
+      _mesa_printf("???\n");
+}
+#endif
+
+
+#ifdef DEBUG
+
+/* record the current triangle function name */
+static const char *triFuncName = NULL;
+
+#define USE(triFunc)                   \
+do {                                   \
+    triFuncName = #triFunc;            \
+    return triFunc;                    \
+} while (0)
+
+#else
+
+#define USE(triFunc)  return triFunc
+
+#endif
+
+
+static swrast_tri_func get_triangle_func( GLcontext *ctx )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   XMesaContext xmesa = XMESA_CONTEXT(ctx);
+   int depth = GET_VISUAL_DEPTH(xmesa->xm_visual);
+
+   (void) kernel1;
+
+#ifdef DEBUG
+   triFuncName = NULL;
+#endif
+
+   if (ctx->RenderMode != GL_RENDER)  return (swrast_tri_func) NULL;
+   if (ctx->Polygon.SmoothFlag)       return (swrast_tri_func) NULL;
+   if (ctx->Texture._EnabledUnits)    return (swrast_tri_func) NULL;
+   if (swrast->_RasterMask & MULTI_DRAW_BIT) return (swrast_tri_func) NULL;
+   if (ctx->Polygon.CullFlag && 
+       ctx->Polygon.CullFaceMode == GL_FRONT_AND_BACK)
+                                        return (swrast_tri_func) NULL;
+
+   if (xmesa->xm_buffer->buffer==XIMAGE) {
+      if (   ctx->Light.ShadeModel==GL_SMOOTH
+          && swrast->_RasterMask==DEPTH_BIT
+          && ctx->Depth.Func==GL_LESS
+          && ctx->Depth.Mask==GL_TRUE
+          && ctx->Visual.depthBits == DEFAULT_SOFTWARE_DEPTH_BITS
+          && ctx->Polygon.StippleFlag==GL_FALSE) {
+         switch (xmesa->pixelformat) {
+            case PF_Truecolor:
+	       USE(smooth_TRUECOLOR_z_triangle);
+            case PF_8A8B8G8R:
+               USE(smooth_8A8B8G8R_z_triangle);
+            case PF_8R8G8B:
+               USE(smooth_8R8G8B_z_triangle);
+            case PF_8R8G8B24:
+               USE(smooth_8R8G8B24_z_triangle);
+            case PF_Dither_True:
+               USE(smooth_TRUEDITHER_z_triangle);
+            case PF_5R6G5B:
+               USE(smooth_5R6G5B_z_triangle);
+            case PF_Dither_5R6G5B:
+               USE(smooth_DITHER_5R6G5B_z_triangle);
+            case PF_HPCR:
+	       USE(smooth_HPCR_z_triangle);
+            case PF_Dither:
+               if (depth == 8)
+                  USE(smooth_DITHER8_z_triangle);
+               else
+                  USE(smooth_DITHER_z_triangle);
+               break;
+            case PF_Lookup:
+               if (depth == 8)
+                  USE(smooth_LOOKUP8_z_triangle);
+               else
+                  return (swrast_tri_func) NULL;
+            default:
+               return (swrast_tri_func) NULL;
+         }
+      }
+      if (   ctx->Light.ShadeModel==GL_FLAT
+          && swrast->_RasterMask==DEPTH_BIT
+          && ctx->Depth.Func==GL_LESS
+          && ctx->Depth.Mask==GL_TRUE
+          && ctx->Visual.depthBits == DEFAULT_SOFTWARE_DEPTH_BITS
+          && ctx->Polygon.StippleFlag==GL_FALSE) {
+         switch (xmesa->pixelformat) {
+            case PF_Truecolor:
+	       USE(flat_TRUECOLOR_z_triangle);
+            case PF_8A8B8G8R:
+               USE(flat_8A8B8G8R_z_triangle);
+            case PF_8R8G8B:
+               USE(flat_8R8G8B_z_triangle);
+            case PF_8R8G8B24:
+               USE(flat_8R8G8B24_z_triangle);
+            case PF_Dither_True:
+               USE(flat_TRUEDITHER_z_triangle);
+            case PF_5R6G5B:
+               USE(flat_5R6G5B_z_triangle);
+            case PF_Dither_5R6G5B:
+               USE(flat_DITHER_5R6G5B_z_triangle);
+            case PF_HPCR:
+	       USE(flat_HPCR_z_triangle);
+            case PF_Dither:
+               if (depth == 8)
+                  USE(flat_DITHER8_z_triangle);
+               else
+                  USE(flat_DITHER_z_triangle);
+               break;
+            case PF_Lookup:
+               if (depth == 8)
+                  USE(flat_LOOKUP8_z_triangle);
+               else
+                  return (swrast_tri_func) NULL;
+            default:
+               return (swrast_tri_func) NULL;
+         }
+      }
+      if (   swrast->_RasterMask==0   /* no depth test */
+          && ctx->Light.ShadeModel==GL_SMOOTH
+          && ctx->Polygon.StippleFlag==GL_FALSE) {
+         switch (xmesa->pixelformat) {
+            case PF_Truecolor:
+	       USE(smooth_TRUECOLOR_triangle);
+            case PF_8A8B8G8R:
+               USE(smooth_8A8B8G8R_triangle);
+            case PF_8R8G8B:
+               USE(smooth_8R8G8B_triangle);
+            case PF_8R8G8B24:
+               USE(smooth_8R8G8B24_triangle);
+            case PF_Dither_True:
+               USE(smooth_TRUEDITHER_triangle);
+            case PF_5R6G5B:
+               USE(smooth_5R6G5B_triangle);
+            case PF_Dither_5R6G5B:
+               USE(smooth_DITHER_5R6G5B_triangle);
+            case PF_HPCR:
+	       USE(smooth_HPCR_triangle);
+            case PF_Dither:
+               if (depth == 8)
+                  USE(smooth_DITHER8_triangle);
+               else
+                  USE(smooth_DITHER_triangle);
+               break;
+            case PF_Lookup:
+               if (depth == 8)
+                  USE(smooth_LOOKUP8_triangle);
+               else
+                  return (swrast_tri_func) NULL;
+            default:
+               return (swrast_tri_func) NULL;
+         }
+      }
+
+      if (   swrast->_RasterMask==0   /* no depth test */
+          && ctx->Light.ShadeModel==GL_FLAT
+          && ctx->Polygon.StippleFlag==GL_FALSE) {
+         switch (xmesa->pixelformat) {
+            case PF_Truecolor:
+	       USE(flat_TRUECOLOR_triangle);
+            case PF_Dither_True:
+	       USE(flat_TRUEDITHER_triangle);
+            case PF_8A8B8G8R:
+               USE(flat_8A8B8G8R_triangle);
+            case PF_8R8G8B:
+               USE(flat_8R8G8B_triangle);
+            case PF_8R8G8B24:
+               USE(flat_8R8G8B24_triangle);
+            case PF_5R6G5B:
+               USE(flat_5R6G5B_triangle);
+            case PF_Dither_5R6G5B:
+               USE(flat_DITHER_5R6G5B_triangle);
+            case PF_HPCR:
+	       USE(flat_HPCR_triangle);
+            case PF_Dither:
+               if (depth == 8)
+                  USE(flat_DITHER8_triangle);
+               else
+                  USE(flat_DITHER_triangle);
+               break;
+            case PF_Lookup:
+               if (depth == 8)
+                  USE(flat_LOOKUP8_triangle);
+               else
+                  return (swrast_tri_func) NULL;
+            default:
+               return (swrast_tri_func) NULL;
+         }
+      }
+
+      return (swrast_tri_func) NULL;
+   }
+   else {
+      /* draw to pixmap */
+      return (swrast_tri_func) NULL;
+   }
+}
+
+
+/* Override for the swrast tri-selection function.  Try to use one
+ * of our internal tri functions, otherwise fall back to the
+ * standard swrast functions.
+ */
+void xmesa_choose_triangle( GLcontext *ctx )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+
+   if (!(swrast->Triangle = get_triangle_func( ctx )))
+      _swrast_choose_triangle( ctx );
+}
+
diff --git a/reactos/lib/mesa32/src/drivers/x11/xmesaP.h b/reactos/lib/mesa32/src/drivers/x11/xmesaP.h
new file mode 100644
index 00000000000..36a610a4f98
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/x11/xmesaP.h
@@ -0,0 +1,551 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.0.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef XMESAP_H
+#define XMESAP_H
+
+
+#ifdef XFree86Server
+# include "GL/xf86glx.h"
+# include "xf86glx_util.h"
+#else
+# ifdef USE_XSHM
+#  include <X11/extensions/XShm.h>
+# endif
+#endif
+#include "GL/xmesa.h"
+#include "mtypes.h"
+#if defined(FX)
+#include "GL/fxmesa.h"
+#include "../glide/fxdrv.h"
+#endif
+
+
+extern _glthread_Mutex _xmesa_lock;
+
+
+/* for PF_8R8G8B24 pixel format */
+typedef struct {
+   GLubyte b;
+   GLubyte g;
+   GLubyte r;
+} bgr_t;
+
+
+/* Function pointer for clearing color buffers */
+typedef void (*clear_func)( GLcontext *ctx,
+                            GLboolean all, GLint x, GLint y,
+                            GLint width, GLint height );
+
+
+
+
+/** Framebuffer pixel formats */
+enum pixel_format {
+   PF_Index,		/**< Color Index mode */
+   PF_Truecolor,	/**< TrueColor or DirectColor, any depth */
+   PF_Dither_True,	/**< TrueColor with dithering */
+   PF_8A8B8G8R,		/**< 32-bit TrueColor:  8-A, 8-B, 8-G, 8-R */
+   PF_8R8G8B,		/**< 32-bit TrueColor:  8-R, 8-G, 8-B bits */
+   PF_5R6G5B,		/**< 16-bit TrueColor:  5-R, 6-G, 5-B bits */
+   PF_Dither,		/**< Color-mapped RGB with dither */
+   PF_Lookup,		/**< Color-mapped RGB without dither */
+   PF_HPCR,		/**< HP Color Recovery (ad@lms.be 30/08/95) */
+   PF_1Bit,		/**< monochrome dithering of RGB */
+   PF_Grayscale,	/**< Grayscale or StaticGray */
+   PF_8R8G8B24,		/**< 24-bit TrueColor: 8-R, 8-G, 8-B bits */
+   PF_Dither_5R6G5B	/**< 16-bit dithered TrueColor: 5-R, 6-G, 5-B */
+};
+
+
+/*
+ * "Derived" from GLvisual.  Basically corresponds to an XVisualInfo.
+ */
+struct xmesa_visual {
+   GLvisual mesa_visual;	/* Device independent visual parameters */
+   XMesaDisplay *display;	/* The X11 display */
+#ifdef XFree86Server
+   GLint screen_depth;		/* The depth of the screen */
+#else
+   XVisualInfo *vishandle;	/* Only used in fakeglx.c */
+#endif
+   XMesaVisualInfo visinfo;	/* X's visual info (pointer to private copy) */
+   GLint BitsPerPixel;		/* True bits per pixel for XImages */
+
+   GLint level;			/* 0=normal, 1=overlay, etc */
+   GLint VisualCaveat;          /* for GLX_EXT_visual_rating extension */
+
+   GLboolean ximage_flag;	/* Use XImage for back buffer (not pixmap)? */
+
+   enum pixel_format dithered_pf;  /* Pixel format when dithering */
+   enum pixel_format undithered_pf;/* Pixel format when not dithering */
+
+   GLfloat RedGamma;		/* Gamma values, 1.0 is default */
+   GLfloat GreenGamma;
+   GLfloat BlueGamma;
+
+   GLint rmult, gmult, bmult;	/* Range of color values */
+   GLint index_bits;		/* Bits per pixel in CI mode */
+
+   /* For PF_TRUECOLOR */
+   GLint rshift, gshift, bshift;/* Pixel color component shifts */
+   GLubyte Kernel[16];		/* Dither kernel */
+   unsigned long RtoPixel[512];	/* RGB to pixel conversion */
+   unsigned long GtoPixel[512];
+   unsigned long BtoPixel[512];
+   GLubyte PixelToR[256];	/* Pixel to RGB conversion */
+   GLubyte PixelToG[256];
+   GLubyte PixelToB[256];
+
+   /* For PF_HPCR */
+   short       hpcr_rgbTbl[3][256];
+   GLboolean   hpcr_clear_flag;
+   GLubyte     hpcr_clear_ximage_pattern[2][16];
+   XMesaImage *hpcr_clear_ximage;
+   XMesaPixmap hpcr_clear_pixmap;
+
+   /* For PF_1BIT */
+   int bitFlip;
+};
+
+
+/*
+ * "Derived" from __GLcontextRec.  Basically corresponds to a GLXContext.
+ */
+struct xmesa_context {
+   GLcontext mesa;		/* the core library context (containment) */
+   XMesaVisual xm_visual;	/* Describes the buffers */
+   XMesaBuffer xm_draw_buffer;	/* current draw framebuffer */
+   XMesaBuffer xm_read_buffer;	/* current read framebuffer */
+   XMesaBuffer xm_buffer;	/* current span/point/line/triangle buffer */
+
+   XMesaDisplay *display;	/* == xm_visual->display */
+   GLboolean swapbytes;		/* Host byte order != display byte order? */
+   GLboolean direct;		/* Direct rendering context? */
+
+   enum pixel_format pixelformat;
+
+   GLubyte clearcolor[4];		/* current clearing color */
+   unsigned long clearpixel;		/* current clearing pixel value */
+};
+
+
+
+typedef enum {
+   WINDOW,          /* An X window */
+   GLXWINDOW,       /* GLX window */
+   PIXMAP,          /* GLX pixmap */
+   PBUFFER          /* GLX Pbuffer */
+} BufferType;
+
+
+/*
+ * "Derived" from GLframebuffer.  Basically corresponds to a GLXDrawable.
+ */
+struct xmesa_buffer {
+   GLframebuffer mesa_buffer;	/* depth, stencil, accum, etc buffers */
+				/* This MUST BE FIRST! */
+   GLboolean wasCurrent;	/* was ever the current buffer? */
+   XMesaVisual xm_visual;	/* the X/Mesa visual */
+
+   XMesaDisplay *display;
+   BufferType type;             /* window, pixmap, pbuffer or glxwindow */
+   XMesaDrawable frontbuffer;	/* either a window or pixmap */
+   XMesaPixmap backpixmap;	/* back buffer Pixmap */
+   XMesaImage *backimage;	/* back buffer simulated XImage */
+
+   XMesaDrawable buffer;	/* the current buffer, either equal to */
+				/* frontbuffer, backpixmap or XIMAGE (None) */
+
+   XMesaColormap cmap;		/* the X colormap */
+
+   unsigned long selectedEvents;/* for pbuffers only */
+
+   GLint db_state;		/* 0 = single buffered */
+				/* BACK_PIXMAP = use Pixmap for back buffer */
+				/* BACK_XIMAGE = use XImage for back buffer */
+
+#ifndef XFree86Server
+   GLuint shm;			/* X Shared Memory extension status:	*/
+				/*    0 = not available			*/
+				/*    1 = XImage support available	*/
+				/*    2 = Pixmap support available too	*/
+#ifdef USE_XSHM
+   XShmSegmentInfo shminfo;
+#endif
+#endif
+
+   XMesaImage *rowimage;	/* Used for optimized span writing */
+
+   GLuint width, height;	/* size of buffer */
+
+   GLint bottom;		/* used for FLIP macro below */
+   GLubyte *ximage_origin1;	/* used for PIXELADDR1 macro */
+   GLint ximage_width1;
+   GLushort *ximage_origin2;	/* used for PIXELADDR2 macro */
+   GLint ximage_width2;
+   GLubyte *ximage_origin3;	/* used for PIXELADDR3 macro */
+   GLint ximage_width3;
+   GLuint *ximage_origin4;	/* used for PIXELADDR4 macro */
+   GLint ximage_width4;
+
+   XMesaPixmap stipple_pixmap;	/* For polygon stippling */
+   XMesaGC stipple_gc;		/* For polygon stippling */
+
+   XMesaGC gc;			/* scratch GC for span, line, tri drawing */
+   XMesaGC cleargc;		/* GC for clearing the color buffer */
+   XMesaGC swapgc;		/* GC for swapping the color buffers */
+
+   /* The following are here instead of in the XMesaVisual
+    * because they depend on the window's colormap.
+    */
+
+   /* For PF_DITHER, PF_LOOKUP, PF_GRAYSCALE */
+   unsigned long color_table[576];	/* RGB -> pixel value */
+
+   /* For PF_DITHER, PF_LOOKUP, PF_GRAYSCALE */
+   GLubyte pixel_to_r[65536];		/* pixel value -> red */
+   GLubyte pixel_to_g[65536];		/* pixel value -> green */
+   GLubyte pixel_to_b[65536];		/* pixel value -> blue */
+
+   /* Used to do XAllocColor/XFreeColors accounting: */
+   int num_alloced;
+#if defined(XFree86Server)
+   Pixel alloced_colors[256];
+#else
+   unsigned long alloced_colors[256];
+#endif
+
+#if defined( FX )
+   /* For 3Dfx Glide only */
+   GLboolean FXisHackUsable;	/* Can we render into window? */
+   GLboolean FXwindowHack;	/* Are we rendering into a window? */
+   fxMesaContext FXctx;
+#endif
+
+   /* functions for clearing the front and back color buffers */
+   clear_func front_clear_func;
+   clear_func back_clear_func;
+
+   struct xmesa_buffer *Next;	/* Linked list pointer: */
+};
+
+
+
+/* Values for xmesa->dest: */
+#define FRONT_PIXMAP	1
+#define BACK_PIXMAP	2
+#define BACK_XIMAGE	4
+
+
+/*
+ * If pixelformat==PF_TRUECOLOR:
+ */
+#define PACK_TRUECOLOR( PIXEL, R, G, B )	\
+   PIXEL = xmesa->xm_visual->RtoPixel[R]	\
+         | xmesa->xm_visual->GtoPixel[G]	\
+         | xmesa->xm_visual->BtoPixel[B];	\
+
+
+/*
+ * If pixelformat==PF_TRUEDITHER:
+ */
+#define PACK_TRUEDITHER( PIXEL, X, Y, R, G, B )			\
+{								\
+   int d = xmesa->xm_visual->Kernel[((X)&3) | (((Y)&3)<<2)];	\
+   PIXEL = xmesa->xm_visual->RtoPixel[(R)+d]			\
+         | xmesa->xm_visual->GtoPixel[(G)+d]			\
+         | xmesa->xm_visual->BtoPixel[(B)+d];			\
+}
+
+
+
+/*
+ * If pixelformat==PF_8A8B8G8R:
+ */
+#define PACK_8A8B8G8R( R, G, B, A )	\
+	( ((A) << 24) | ((B) << 16) | ((G) << 8) | (R) )
+
+
+/*
+ * Like PACK_8A8B8G8R() but don't use alpha.  This is usually an acceptable
+ * shortcut.
+ */
+#define PACK_8B8G8R( R, G, B )   ( ((B) << 16) | ((G) << 8) | (R) )
+
+
+
+/*
+ * If pixelformat==PF_8R8G8B:
+ */
+#define PACK_8R8G8B( R, G, B)	 ( ((R) << 16) | ((G) << 8) | (B) )
+
+
+/*
+ * If pixelformat==PF_5R6G5B:
+ */
+#define PACK_5R6G5B( R, G, B)	 ( (((R) & 0xf8) << 8) | (((G) & 0xfc) << 3) | ((B) >> 3) )
+
+
+
+
+/*
+ * If pixelformat==PF_DITHER:
+ *
+ * Improved 8-bit RGB dithering code contributed by Bob Mercier
+ * (mercier@hollywood.cinenet.net).  Thanks Bob!
+ */
+#ifdef DITHER666
+# define DITH_R   6
+# define DITH_G   6
+# define DITH_B   6
+# define DITH_MIX(r,g,b)  (((r) * DITH_G + (g)) * DITH_B + (b))
+#else
+# define DITH_R	5
+# define DITH_G	9
+# define DITH_B	5
+# define DITH_MIX(r,g,b)  (((g) << 6) | ((b) << 3) | (r))
+#endif
+#define DITH_DX	4
+#define DITH_DY	4
+#define DITH_N	(DITH_DX * DITH_DY)
+
+/*#define _dither(C,c,d)	(((unsigned)((DITH_N*(C-1)+1)*c+d))/(DITH_N*256))*/
+#define _dither(C, c, d)   (((unsigned)((DITH_N * (C - 1) + 1) * c + d)) >> 12)
+
+#define MAXC	256
+static int kernel8[DITH_DY * DITH_DX] = {
+    0 * MAXC,  8 * MAXC,  2 * MAXC, 10 * MAXC,
+   12 * MAXC,  4 * MAXC, 14 * MAXC,  6 * MAXC,
+    3 * MAXC, 11 * MAXC,  1 * MAXC,  9 * MAXC,
+   15 * MAXC,  7 * MAXC, 13 * MAXC,  5 * MAXC,
+};
+
+/* Dither for random X,Y */
+#define DITHER_SETUP						\
+	int __d;						\
+	unsigned long *ctable = xmesa->xm_buffer->color_table;
+
+#define DITHER( X, Y, R, G, B )				\
+	(__d = kernel8[(((Y)&3)<<2) | ((X)&3)],		\
+	 ctable[DITH_MIX(_dither(DITH_R, (R), __d),	\
+		         _dither(DITH_G, (G), __d),	\
+		         _dither(DITH_B, (B), __d))])
+
+/* Dither for random X, fixed Y */
+#define XDITHER_SETUP(Y)					\
+	int __d;						\
+	unsigned long *ctable = xmesa->xm_buffer->color_table;	\
+	int *kernel = &kernel8[ ((Y)&3) << 2 ];
+
+#define XDITHER( X, R, G, B )				\
+	(__d = kernel[(X)&3],				\
+	ctable[DITH_MIX(_dither(DITH_R, (R), __d),	\
+		        _dither(DITH_G, (G), __d),	\
+		        _dither(DITH_B, (B), __d))])
+
+
+
+/*
+ * Dithering for flat-shaded triangles.  Precompute all 16 possible
+ * pixel values given the triangle's RGB color.  Contributed by Martin Shenk.
+ */
+static GLushort DitherValues[16];   /* array of (up to) 16-bit pixel values */
+
+#define FLAT_DITHER_SETUP( R, G, B )					\
+	{								\
+	   unsigned long *ctable = xmesa->xm_buffer->color_table;	\
+	   int msdr = (DITH_N*((DITH_R)-1)+1) * (R);			\
+	   int msdg = (DITH_N*((DITH_G)-1)+1) * (G);			\
+	   int msdb = (DITH_N*((DITH_B)-1)+1) * (B);			\
+	   int i;							\
+	   for (i=0;i<16;i++) {						\
+	      int k = kernel8[i];					\
+	      int j = DITH_MIX( (msdr+k)>>12, (msdg+k)>>12, (msdb+k)>>12 );	\
+	      DitherValues[i] = (GLushort) ctable[j];			\
+	   }								\
+        }
+
+#define FLAT_DITHER_ROW_SETUP(Y)					\
+	GLushort *ditherRow = DitherValues + ( ((Y)&3) << 2);
+
+#define FLAT_DITHER(X)  ditherRow[(X)&3]
+
+
+
+/*
+ * If pixelformat==PF_LOOKUP:
+ */
+#define _dither_lookup(C, c)   (((unsigned)((DITH_N * (C - 1) + 1) * c)) >> 12)
+
+#define LOOKUP_SETUP						\
+	unsigned long *ctable = xmesa->xm_buffer->color_table
+
+#define LOOKUP( R, G, B )				\
+	ctable[DITH_MIX(_dither_lookup(DITH_R, (R)),	\
+		        _dither_lookup(DITH_G, (G)),	\
+		        _dither_lookup(DITH_B, (B)))]
+
+
+
+/*
+ * If pixelformat==PF_HPCR:
+ *
+ *      HP Color Recovery dithering               (ad@lms.be 30/08/95)
+ *      HP has on it's 8-bit 700-series computers, a feature called
+ *      'Color Recovery'.  This allows near 24-bit output (so they say).
+ *      It is enabled by selecting the 8-bit  TrueColor  visual AND
+ *      corresponding  colormap (see tkInitWindow) AND doing some special
+ *      dither.
+ */
+static const short HPCR_DRGB[3][2][16] = {
+{
+    { 16, -4,  1,-11, 14, -6,  3, -9, 15, -5,  2,-10, 13, -7,  4, -8},
+    {-15,  5,  0, 12,-13,  7, -2, 10,-14,  6, -1, 11,-12,  8, -3,  9}
+},
+{
+    {-11, 15, -7,  3, -8, 14, -4,  2,-10, 16, -6,  4, -9, 13, -5,  1},
+    { 12,-14,  8, -2,  9,-13,  5, -1, 11,-15,  7, -3, 10,-12,  6,  0}
+},
+{
+    {  6,-18, 26,-14,  2,-22, 30,-10,  8,-16, 28,-12,  4,-20, 32, -8},
+    { -4, 20,-24, 16,  0, 24,-28, 12, -6, 18,-26, 14, -2, 22,-30, 10}
+}
+};
+
+#define DITHER_HPCR( X, Y, R, G, B )					   \
+  ( ((xmesa->xm_visual->hpcr_rgbTbl[0][R] + HPCR_DRGB[0][(Y)&1][(X)&15]) & 0xE0)     \
+  |(((xmesa->xm_visual->hpcr_rgbTbl[1][G] + HPCR_DRGB[1][(Y)&1][(X)&15]) & 0xE0)>>3) \
+  | ((xmesa->xm_visual->hpcr_rgbTbl[2][B] + HPCR_DRGB[2][(Y)&1][(X)&15])>>6)	   \
+  )
+
+
+
+/*
+ * If pixelformat==PF_1BIT:
+ */
+static int const kernel1[16] = {
+   0*47,  9*47,  4*47, 12*47,     /* 47 = (255*3)/16 */
+   6*47,  2*47, 14*47,  8*47,
+  10*47,  1*47,  5*47, 11*47,
+   7*47, 13*47,  3*47, 15*47 };
+
+#define SETUP_1BIT  int bitFlip = xmesa->xm_visual->bitFlip
+#define DITHER_1BIT( X, Y, R, G, B )	\
+	(( ((int)(R)+(int)(G)+(int)(B)) > kernel1[(((Y)&3) << 2) | ((X)&3)] ) ^ bitFlip)
+
+
+
+/*
+ * If pixelformat==PF_GRAYSCALE:
+ */
+#define GRAY_RGB( R, G, B )   xmesa->xm_buffer->color_table[((R) + (G) + (B))/3]
+
+
+
+#define XIMAGE None
+
+
+/*
+ * Converts a GL window Y coord to an X window Y coord:
+ */
+#define FLIP(BUFFER, Y)  ((BUFFER)->bottom-(Y))
+
+
+/*
+ * Return the address of a 1, 2 or 4-byte pixel in the back XImage:
+ * X==0 is left, Y==0 is bottom.
+ */
+#define PIXELADDR1( BUFFER, X, Y )  \
+   ( (BUFFER)->ximage_origin1 - (Y) * (BUFFER)->ximage_width1 + (X) )
+
+#define PIXELADDR2( BUFFER, X, Y )  \
+   ( (BUFFER)->ximage_origin2 - (Y) * (BUFFER)->ximage_width2 + (X) )
+
+#define PIXELADDR3( BUFFER, X, Y )  \
+   ( (bgr_t *) ( (BUFFER)->ximage_origin3 - (Y) * (BUFFER)->ximage_width3 + 3 * (X) ))
+
+#define PIXELADDR4( BUFFER, X, Y )  \
+   ( (BUFFER)->ximage_origin4 - (Y) * (BUFFER)->ximage_width4 + (X) )
+
+
+
+
+/*
+ * Return pointer to XMesaContext corresponding to a Mesa GLcontext.
+ * Since we're using structure containment, it's just a cast!.
+ */
+#define XMESA_CONTEXT(MESACTX)  (XMesaContext) (MESACTX)
+
+
+
+/*
+ * External functions:
+ */
+
+extern unsigned long
+xmesa_color_to_pixel( XMesaContext xmesa,
+                      GLubyte r, GLubyte g, GLubyte b, GLubyte a,
+                      GLuint pixelFormat );
+
+extern void xmesa_alloc_back_buffer( XMesaBuffer b );
+
+extern void xmesa_init_pointers( GLcontext *ctx );
+extern void xmesa_update_state( GLcontext *ctx, GLuint new_state );
+
+extern void xmesa_update_span_funcs( GLcontext *ctx );
+
+/* Plugged into the software rasterizer.  Try to use internal
+ * swrast-style point, line and triangle functions.
+ */
+extern void xmesa_choose_point( GLcontext *ctx );
+extern void xmesa_choose_line( GLcontext *ctx );
+extern void xmesa_choose_triangle( GLcontext *ctx );
+
+
+extern void xmesa_register_swrast_functions( GLcontext *ctx );
+
+
+
+/* XXX this is a hack to implement shared display lists with 3Dfx */
+extern XMesaBuffer XMesaCreateWindowBuffer2( XMesaVisual v,
+					     XMesaWindow w,
+					     XMesaContext c
+					   );
+
+/*
+ * These are the extra routines required for integration with XFree86.
+ * None of these routines should be user visible. -KEM
+ */
+extern void XMesaSetVisualDisplay( XMesaDisplay *dpy, XMesaVisual v );
+extern GLboolean XMesaForceCurrent(XMesaContext c);
+extern GLboolean XMesaLoseCurrent(XMesaContext c);
+extern void XMesaReset( void );
+
+extern void xmesa_resize_buffers( GLframebuffer *buffer );
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/glapi/glapi.c b/reactos/lib/mesa32/src/glapi/glapi.c
new file mode 100644
index 00000000000..eff86f42bef
--- /dev/null
+++ b/reactos/lib/mesa32/src/glapi/glapi.c
@@ -0,0 +1,923 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * This file manages the OpenGL API dispatch layer.
+ * The dispatch table (struct _glapi_table) is basically just a list
+ * of function pointers.
+ * There are functions to set/get the current dispatch table for the
+ * current thread and to manage registration/dispatch of dynamically
+ * added extension functions.
+ *
+ * It's intended that this file and the other glapi*.[ch] files are
+ * flexible enough to be reused in several places:  XFree86, DRI-
+ * based libGL.so, and perhaps the SGI SI.
+ *
+ * NOTE: There are no dependencies on Mesa in this code.
+ *
+ * Versions (API changes):
+ *   2000/02/23  - original version for Mesa 3.3 and XFree86 4.0
+ *   2001/01/16  - added dispatch override feature for Mesa 3.5
+ *   2002/06/28  - added _glapi_set_warning_func(), Mesa 4.1.
+ *   2002/10/01  - _glapi_get_proc_address() will now generate new entrypoints
+ *                 itself (using offset ~0).  _glapi_add_entrypoint() can be
+ *                 called afterward and it'll fill in the correct dispatch
+ *                 offset.  This allows DRI libGL to avoid probing for DRI
+ *                 drivers!  No changes to the public glapi interface.
+ */
+
+
+
+#include "glheader.h"
+#include "glapi.h"
+#include "glapioffsets.h"
+#include "glapitable.h"
+#include "glthread.h"
+
+/***** BEGIN NO-OP DISPATCH *****/
+
+static GLboolean WarnFlag = GL_FALSE;
+static _glapi_warning_func warning_func;
+
+
+/*
+ * Enable/disable printing of warning messages.
+ */
+void
+_glapi_noop_enable_warnings(GLboolean enable)
+{
+   WarnFlag = enable;
+}
+
+/*
+ * Register a callback function for reporting errors.
+ */
+void
+_glapi_set_warning_func( _glapi_warning_func func )
+{
+   warning_func = func;
+}
+
+static GLboolean
+warn(void)
+{
+   if ((WarnFlag || getenv("MESA_DEBUG") || getenv("LIBGL_DEBUG"))
+       && warning_func) {
+      return GL_TRUE;
+   }
+   else {
+      return GL_FALSE;
+   }
+}
+
+
+#define KEYWORD1 static
+#define KEYWORD2 GLAPIENTRY
+#define NAME(func)  NoOp##func
+
+#define F NULL
+
+#define DISPATCH(func, args, msg)					\
+   if (warn()) {							\
+      warning_func(NULL, "GL User Error: called without context:");	\
+      warning_func msg;							\
+   }
+
+#define RETURN_DISPATCH(func, args, msg)				\
+   if (warn()) {							\
+      warning_func(NULL, "GL User Error: called without context:");	\
+      warning_func msg;							\
+   }									\
+   return 0
+
+#define DISPATCH_TABLE_NAME __glapi_noop_table
+#define UNUSED_TABLE_NAME __usused_noop_functions
+
+#define TABLE_ENTRY(name) (void *) NoOp##name
+
+static int NoOpUnused(void)
+{
+   if (warn()) {
+      warning_func(NULL, "GL User Error: calling extension function without a current context\n");
+   }
+   return 0;
+}
+
+#include "glapitemp.h"
+
+/***** END NO-OP DISPATCH *****/
+
+
+
+/***** BEGIN THREAD-SAFE DISPATCH *****/
+/* if we support thread-safety, build a special dispatch table for use
+ * in thread-safety mode (ThreadSafe == GL_TRUE).  Each entry in the
+ * dispatch table will call _glthread_GetTSD() to get the actual dispatch
+ * table bound to the current thread, then jump through that table.
+ */
+
+#if defined(THREADS)
+
+static GLboolean ThreadSafe = GL_FALSE;  /* In thread-safe mode? */
+static _glthread_TSD DispatchTSD;        /* Per-thread dispatch pointer */
+static _glthread_TSD RealDispatchTSD;    /* only when using override */
+static _glthread_TSD ContextTSD;         /* Per-thread context pointer */
+
+
+#define KEYWORD1 static
+#define KEYWORD2 GLAPIENTRY
+#define NAME(func)  _ts_##func
+
+#define DISPATCH(FUNC, ARGS, MESSAGE)					\
+   struct _glapi_table *dispatch;					\
+   dispatch = (struct _glapi_table *) _glthread_GetTSD(&DispatchTSD);	\
+   if (!dispatch)							\
+      dispatch = (struct _glapi_table *) __glapi_noop_table;		\
+   (dispatch->FUNC) ARGS
+
+#define RETURN_DISPATCH(FUNC, ARGS, MESSAGE) 				\
+   struct _glapi_table *dispatch;					\
+   dispatch = (struct _glapi_table *) _glthread_GetTSD(&DispatchTSD);	\
+   if (!dispatch)							\
+      dispatch = (struct _glapi_table *) __glapi_noop_table;		\
+   return (dispatch->FUNC) ARGS
+
+#define DISPATCH_TABLE_NAME __glapi_threadsafe_table
+#define UNUSED_TABLE_NAME __usused_threadsafe_functions
+
+#define TABLE_ENTRY(name) (void *) _ts_##name
+
+static int _ts_Unused(void)
+{
+   return 0;
+}
+
+#include "glapitemp.h"
+
+#endif
+
+/***** END THREAD-SAFE DISPATCH *****/
+
+
+
+struct _glapi_table *_glapi_Dispatch = (struct _glapi_table *) __glapi_noop_table;
+struct _glapi_table *_glapi_RealDispatch = (struct _glapi_table *) __glapi_noop_table;
+
+/* Used when thread safety disabled */
+void *_glapi_Context = NULL;
+
+
+static GLboolean DispatchOverride = GL_FALSE;
+
+
+
+/* strdup() is actually not a standard ANSI C or POSIX routine.
+ * Irix will not define it if ANSI mode is in effect.
+ */
+static char *
+str_dup(const char *str)
+{
+   char *copy;
+   copy = (char*) malloc(strlen(str) + 1);
+   if (!copy)
+      return NULL;
+   strcpy(copy, str);
+   return copy;
+}
+
+
+
+/*
+ * We should call this periodically from a function such as glXMakeCurrent
+ * in order to test if multiple threads are being used.
+ */
+void
+_glapi_check_multithread(void)
+{
+#if defined(THREADS)
+   if (!ThreadSafe) {
+      static unsigned long knownID;
+      static GLboolean firstCall = GL_TRUE;
+      if (firstCall) {
+         knownID = _glthread_GetID();
+         firstCall = GL_FALSE;
+      }
+      else if (knownID != _glthread_GetID()) {
+         ThreadSafe = GL_TRUE;
+      }
+   }
+   if (ThreadSafe) {
+      /* make sure that this thread's dispatch pointer isn't null */
+      if (!_glapi_get_dispatch()) {
+         _glapi_set_dispatch(NULL);
+      }
+   }
+#endif
+}
+
+
+
+/*
+ * Set the current context pointer for this thread.
+ * The context pointer is an opaque type which should be cast to
+ * void from the real context pointer type.
+ */
+void
+_glapi_set_context(void *context)
+{
+#if defined(THREADS)
+   _glthread_SetTSD(&ContextTSD, context);
+   if (ThreadSafe)
+      _glapi_Context = NULL;
+   else
+      _glapi_Context = context;
+#else
+   _glapi_Context = context;
+#endif
+}
+
+
+
+/*
+ * Get the current context pointer for this thread.
+ * The context pointer is an opaque type which should be cast from
+ * void to the real context pointer type.
+ */
+void *
+_glapi_get_context(void)
+{
+#if defined(THREADS)
+   if (ThreadSafe) {
+      return _glthread_GetTSD(&ContextTSD);
+   }
+   else {
+      return _glapi_Context;
+   }
+#else
+   return _glapi_Context;
+#endif
+}
+
+
+
+/*
+ * Set the global or per-thread dispatch table pointer.
+ */
+void
+_glapi_set_dispatch(struct _glapi_table *dispatch)
+{
+   if (!dispatch) {
+      /* use the no-op functions */
+      dispatch = (struct _glapi_table *) __glapi_noop_table;
+   }
+#ifdef DEBUG
+   else {
+      _glapi_check_table(dispatch);
+   }
+#endif
+
+#if defined(THREADS)
+   if (DispatchOverride) {
+      _glthread_SetTSD(&RealDispatchTSD, (void *) dispatch);
+      if (ThreadSafe)
+         _glapi_RealDispatch = (struct _glapi_table*) __glapi_threadsafe_table;
+      else
+         _glapi_RealDispatch = dispatch;
+   }
+   else {
+      /* normal operation */
+      _glthread_SetTSD(&DispatchTSD, (void *) dispatch);
+      if (ThreadSafe)
+         _glapi_Dispatch = (struct _glapi_table *) __glapi_threadsafe_table;
+      else
+         _glapi_Dispatch = dispatch;
+   }
+#else /*THREADS*/
+   if (DispatchOverride) {
+      _glapi_RealDispatch = dispatch;
+   }
+   else {
+      _glapi_Dispatch = dispatch;
+   }
+#endif /*THREADS*/
+}
+
+
+
+/*
+ * Return pointer to current dispatch table for calling thread.
+ */
+struct _glapi_table *
+_glapi_get_dispatch(void)
+{
+#if defined(THREADS)
+   if (ThreadSafe) {
+      if (DispatchOverride) {
+         return (struct _glapi_table *) _glthread_GetTSD(&RealDispatchTSD);
+      }
+      else {
+         return (struct _glapi_table *) _glthread_GetTSD(&DispatchTSD);
+      }
+   }
+   else {
+      if (DispatchOverride) {
+         assert(_glapi_RealDispatch);
+         return _glapi_RealDispatch;
+      }
+      else {
+         assert(_glapi_Dispatch);
+         return _glapi_Dispatch;
+      }
+   }
+#else
+   return _glapi_Dispatch;
+#endif
+}
+
+
+/*
+ * Notes on dispatch overrride:
+ *
+ * Dispatch override allows an external agent to hook into the GL dispatch
+ * mechanism before execution goes into the core rendering library.  For
+ * example, a trace mechanism would insert itself as an overrider, print
+ * logging info for each GL function, then dispatch to the real GL function.
+ *
+ * libGLS (GL Stream library) is another agent that might use override.
+ *
+ * We don't allow more than one layer of overriding at this time.
+ * In the future we may allow nested/layered override.  In that case
+ * _glapi_begin_dispatch_override() will return an override layer,
+ * _glapi_end_dispatch_override(layer) will remove an override layer
+ * and _glapi_get_override_dispatch(layer) will return the dispatch
+ * table for a given override layer.  layer = 0 will be the "real"
+ * dispatch table.
+ */
+
+/*
+ * Return: dispatch override layer number.
+ */
+int
+_glapi_begin_dispatch_override(struct _glapi_table *override)
+{
+   struct _glapi_table *real = _glapi_get_dispatch();
+
+   assert(!DispatchOverride);  /* can't nest at this time */
+   DispatchOverride = GL_TRUE;
+
+   _glapi_set_dispatch(real);
+
+#if defined(THREADS)
+   _glthread_SetTSD(&DispatchTSD, (void *) override);
+   if (ThreadSafe)
+      _glapi_Dispatch = (struct _glapi_table *) __glapi_threadsafe_table;
+   else
+      _glapi_Dispatch = override;
+#else
+   _glapi_Dispatch = override;
+#endif
+   return 1;
+}
+
+
+void
+_glapi_end_dispatch_override(int layer)
+{
+   struct _glapi_table *real = _glapi_get_dispatch();
+   (void) layer;
+   DispatchOverride = GL_FALSE;
+   _glapi_set_dispatch(real);
+   /* the rest of this isn't needed, just play it safe */
+#if defined(THREADS)
+   _glthread_SetTSD(&RealDispatchTSD, NULL);
+#endif
+   _glapi_RealDispatch = NULL;
+}
+
+
+struct _glapi_table *
+_glapi_get_override_dispatch(int layer)
+{
+   if (layer == 0) {
+      return _glapi_get_dispatch();
+   }
+   else {
+      if (DispatchOverride) {
+#if defined(THREADS)
+         return (struct _glapi_table *) _glthread_GetTSD(&DispatchTSD);
+#else
+         return _glapi_Dispatch;
+#endif
+      }
+      else {
+         return NULL;
+      }
+   }
+}
+
+
+struct name_address_offset {
+   const char *Name;
+   GLvoid *Address;
+   GLuint Offset;
+};
+
+
+/* The code in this file is auto-generated with Python */
+#include "glprocs.h"
+
+
+
+/*
+ * Return dispatch table offset of the named static (built-in) function.
+ * Return -1 if function not found.
+ */
+static GLint
+get_static_proc_offset(const char *funcName)
+{
+   GLuint i;
+   for (i = 0; static_functions[i].Name; i++) {
+      if (strcmp(static_functions[i].Name, funcName) == 0) {
+	 return static_functions[i].Offset;
+      }
+   }
+   return -1;
+}
+
+
+/*
+ * Return dispatch function address the named static (built-in) function.
+ * Return NULL if function not found.
+ */
+static GLvoid *
+get_static_proc_address(const char *funcName)
+{
+   GLint i;
+   for (i = 0; static_functions[i].Name; i++) {
+      if (strcmp(static_functions[i].Name, funcName) == 0) {
+         return static_functions[i].Address;
+      }
+   }
+   return NULL;
+}
+
+
+
+/**********************************************************************
+ * Extension function management.
+ */
+
+/*
+ * Number of extension functions which we can dynamically add at runtime.
+ */
+#define MAX_EXTENSION_FUNCS 300
+
+
+/*
+ * The disptach table size (number of entries) is the sizeof the
+ * _glapi_table struct plus the number of dynamic entries we can add.
+ * The extra slots can be filled in by DRI drivers that register new extension
+ * functions.
+ */
+#define DISPATCH_TABLE_SIZE (sizeof(struct _glapi_table) / sizeof(void *) + MAX_EXTENSION_FUNCS)
+
+
+static struct name_address_offset ExtEntryTable[MAX_EXTENSION_FUNCS];
+static GLuint NumExtEntryPoints = 0;
+
+#ifdef USE_SPARC_ASM
+extern void __glapi_sparc_icache_flush(unsigned int *);
+#endif
+
+/*
+ * Generate a dispatch function (entrypoint) which jumps through
+ * the given slot number (offset) in the current dispatch table.
+ * We need assembly language in order to accomplish this.
+ */
+static void *
+generate_entrypoint(GLuint functionOffset)
+{
+#if defined(USE_X86_ASM)
+   /*
+    * This x86 code contributed by Josh Vanderhoof.
+    *
+    *  0:   a1 10 32 54 76          movl   __glapi_Dispatch,%eax
+    *       00 01 02 03 04
+    *  5:   85 c0                   testl  %eax,%eax
+    *       05 06
+    *  7:   74 06                   je     f <entrypoint+0xf>
+    *       07 08
+    *  9:   ff a0 10 32 54 76       jmp    *0x76543210(%eax)
+    *       09 0a 0b 0c 0d 0e
+    *  f:   e8 fc ff ff ff          call   __glapi_get_dispatch
+    *       0f 10 11 12 13
+    * 14:   ff a0 10 32 54 76       jmp    *0x76543210(%eax)
+    *       14 15 16 17 18 19
+    */
+   static const unsigned char insn_template[] = {
+      0xa1, 0x00, 0x00, 0x00, 0x00,
+      0x85, 0xc0,
+      0x74, 0x06,
+      0xff, 0xa0, 0x00, 0x00, 0x00, 0x00,
+      0xe8, 0x00, 0x00, 0x00, 0x00,
+      0xff, 0xa0, 0x00, 0x00, 0x00, 0x00
+   };
+   unsigned char *code = (unsigned char *) malloc(sizeof(insn_template));
+   unsigned int next_insn;
+   if (code) {
+      memcpy(code, insn_template, sizeof(insn_template));
+
+      *(unsigned int *)(code + 0x01) = (unsigned int)&_glapi_Dispatch;
+      *(unsigned int *)(code + 0x0b) = (unsigned int)functionOffset * 4;
+      next_insn = (unsigned int)(code + 0x14);
+      *(unsigned int *)(code + 0x10) = (unsigned int)_glapi_get_dispatch - next_insn;
+      *(unsigned int *)(code + 0x16) = (unsigned int)functionOffset * 4;
+   }
+   return code;
+#elif defined(USE_SPARC_ASM)
+
+#if defined(__sparc_v9__) && !defined(__linux__)
+   static const unsigned int insn_template[] = {
+	   0x05000000,	/* sethi	%uhi(_glapi_Dispatch), %g2	*/
+	   0x03000000,	/* sethi	%hi(_glapi_Dispatch), %g1	*/
+	   0x8410a000,	/* or		%g2, %ulo(_glapi_Dispatch), %g2	*/
+	   0x82106000,	/* or		%g1, %lo(_glapi_Dispatch), %g1	*/
+	   0x8528b020,	/* sllx		%g2, 32, %g2			*/
+	   0xc2584002,	/* ldx		[%g1 + %g2], %g1		*/
+	   0x05000000,	/* sethi	%hi(8 * glapioffset), %g2	*/
+	   0x8410a000,	/* or		%g2, %lo(8 * glapioffset), %g2	*/
+	   0xc6584002,	/* ldx		[%g1 + %g2], %g3		*/
+	   0x81c0c000,	/* jmpl		%g3, %g0			*/
+	   0x01000000	/*  nop						*/
+   };
+#else
+   static const unsigned int insn_template[] = {
+	   0x03000000,	/* sethi	%hi(_glapi_Dispatch), %g1	  */
+	   0xc2006000,	/* ld		[%g1 + %lo(_glapi_Dispatch)], %g1 */
+	   0xc6006000,	/* ld		[%g1 + %lo(4*glapioffset)], %g3	  */
+	   0x81c0c000,	/* jmpl		%g3, %g0			  */
+	   0x01000000	/*  nop						  */
+   };
+#endif
+   unsigned int *code = (unsigned int *) malloc(sizeof(insn_template));
+   unsigned long glapi_addr = (unsigned long) &_glapi_Dispatch;
+   if (code) {
+      memcpy(code, insn_template, sizeof(insn_template));
+
+#if defined(__sparc_v9__) && !defined(__linux__)
+      code[0] |= (glapi_addr >> (32 + 10));
+      code[1] |= ((glapi_addr & 0xffffffff) >> 10);
+      __glapi_sparc_icache_flush(&code[0]);
+      code[2] |= ((glapi_addr >> 32) & ((1 << 10) - 1));
+      code[3] |= (glapi_addr & ((1 << 10) - 1));
+      __glapi_sparc_icache_flush(&code[2]);
+      code[6] |= ((functionOffset * 8) >> 10);
+      code[7] |= ((functionOffset * 8) & ((1 << 10) - 1));
+      __glapi_sparc_icache_flush(&code[6]);
+#else
+      code[0] |= (glapi_addr >> 10);
+      code[1] |= (glapi_addr & ((1 << 10) - 1));
+      __glapi_sparc_icache_flush(&code[0]);
+      code[2] |= (functionOffset * 4);
+      __glapi_sparc_icache_flush(&code[2]);
+#endif
+   }
+   return code;
+#else
+   return NULL;
+#endif /* USE_*_ASM */
+}
+
+
+/*
+ * This function inserts a new dispatch offset into the assembly language
+ * stub that was generated with the preceeding function.
+ */
+static void
+fill_in_entrypoint_offset(void *entrypoint, GLuint offset)
+{
+#if defined(USE_X86_ASM)
+
+   unsigned char *code = (unsigned char *) entrypoint;
+   *(unsigned int *)(code + 0x0b) = offset * 4;
+   *(unsigned int *)(code + 0x16) = offset * 4;
+
+#elif defined(USE_SPARC_ASM)
+
+   /* XXX this hasn't been tested! */
+   unsigned int *code = (unsigned int *) entrypoint;
+#if defined(__sparc_v9__) && !defined(__linux__)
+   code[6] = 0x05000000;  /* sethi	%hi(8 * glapioffset), %g2	*/
+   code[7] = 0x8410a000;  /* or		%g2, %lo(8 * glapioffset), %g2	*/
+   code[6] |= ((offset * 8) >> 10);
+   code[7] |= ((offset * 8) & ((1 << 10) - 1));
+   __glapi_sparc_icache_flush(&code[6]);
+#else /* __sparc_v9__ && !linux */
+   code[2] = 0xc6006000;  /* ld		[%g1 + %lo(4*glapioffset)], %g3	  */
+   code[2] |= (offset * 4);
+   __glapi_sparc_icache_flush(&code[2]);
+#endif /* __sparc_v9__ && !linux */
+
+#endif /* USE_*_ASM */
+}
+
+
+/*
+ * Add a new extension function entrypoint.
+ * Return: GL_TRUE = success or GL_FALSE = failure
+ */
+GLboolean
+_glapi_add_entrypoint(const char *funcName, GLuint offset)
+{
+   /* trivial rejection test */
+   if (!funcName || funcName[0] != 'g' || funcName[1] != 'l')
+      return GL_FALSE;
+
+   /* first check if the named function is already statically present */
+   {
+      GLint index = get_static_proc_offset(funcName);
+      if (index >= 0) {
+         return (GLboolean) ((GLuint) index == offset);  /* bad offset! */
+      }
+   }
+
+   /* See if this function has already been dynamically added */
+   {
+      GLuint i;
+      for (i = 0; i < NumExtEntryPoints; i++) {
+         if (strcmp(ExtEntryTable[i].Name, funcName) == 0) {
+            /* function already registered */
+            if (ExtEntryTable[i].Offset == offset) {
+               return GL_TRUE;  /* offsets match */
+            }
+            else if (ExtEntryTable[i].Offset == (GLuint) ~0
+                     && offset < DISPATCH_TABLE_SIZE) {
+               /* need to patch-up the dispatch code */
+               if (offset != (GLuint) ~0) {
+                  fill_in_entrypoint_offset(ExtEntryTable[i].Address, offset);
+                  ExtEntryTable[i].Offset = offset;
+               }
+               return GL_TRUE;
+            }
+            else {
+               return GL_FALSE;  /* bad offset! */
+            }
+         }
+      }
+   }
+
+   /* This is a new function, try to add it.  */
+   if (NumExtEntryPoints >= MAX_EXTENSION_FUNCS ||
+       offset >= DISPATCH_TABLE_SIZE) {
+      /* No space left */
+      return GL_FALSE;
+   }
+   else {
+      void *entrypoint = generate_entrypoint(offset);
+      if (!entrypoint)
+         return GL_FALSE; /* couldn't generate assembly */
+
+      /* OK! */
+      ExtEntryTable[NumExtEntryPoints].Name = str_dup(funcName);
+      ExtEntryTable[NumExtEntryPoints].Offset = offset;
+      ExtEntryTable[NumExtEntryPoints].Address = entrypoint;
+      NumExtEntryPoints++;
+
+      return GL_TRUE;  /* success */
+   }
+
+   /* should never get here, silence compiler warnings */
+   return GL_FALSE;
+}
+
+
+/*
+ * Return offset of entrypoint for named function within dispatch table.
+ */
+GLint
+_glapi_get_proc_offset(const char *funcName)
+{
+   /* search extension functions first */
+   GLuint i;
+   for (i = 0; i < NumExtEntryPoints; i++) {
+      if (strcmp(ExtEntryTable[i].Name, funcName) == 0) {
+         return ExtEntryTable[i].Offset;
+      }
+   }
+
+   /* search static functions */
+   return get_static_proc_offset(funcName);
+}
+
+
+
+/*
+ * Return entrypoint for named function.
+ */
+const GLvoid *
+_glapi_get_proc_address(const char *funcName)
+{
+   GLuint i;
+
+   if (funcName[0] != 'g' || funcName[1] != 'l')
+      return NULL;
+
+   /* search extension functions first */
+   for (i = 0; i < NumExtEntryPoints; i++) {
+      if (strcmp(ExtEntryTable[i].Name, funcName) == 0) {
+         return ExtEntryTable[i].Address;
+      }
+   }
+
+   /* search static functions */
+   {
+      const GLvoid *func = get_static_proc_address(funcName);
+      if (func)
+         return func;
+   }
+
+   /* generate new entrypoint - use a temporary dispatch offset of
+    * ~0 (i.e. -1).  Later, when the driver calls _glapi_add_entrypoint()
+    * we'll put in the proper offset.  If that never happens, and the
+    * user calls this function, he'll segfault.  That's what you get
+    * when you try calling a GL function that doesn't really exist.
+    */
+   if (NumExtEntryPoints < MAX_EXTENSION_FUNCS) {
+      GLvoid *entrypoint = generate_entrypoint(~0);
+      if (!entrypoint)
+         return GL_FALSE;
+
+      ExtEntryTable[NumExtEntryPoints].Name = str_dup(funcName);
+      ExtEntryTable[NumExtEntryPoints].Offset = ~0;
+      ExtEntryTable[NumExtEntryPoints].Address = entrypoint;
+      NumExtEntryPoints++;
+
+      return entrypoint;
+   }
+   else {
+      /* no space for new functions! */
+      return NULL;
+   }
+}
+
+
+
+/*
+ * Return the name of the function at the given dispatch offset.
+ * This is only intended for debugging.
+ */
+const char *
+_glapi_get_proc_name(GLuint offset)
+{
+   const GLuint n = sizeof(static_functions) / sizeof(struct name_address_offset);
+   GLuint i;
+
+   /* search built-in functions */
+   for (i = 0; i < n; i++) {
+      if (static_functions[i].Offset == offset)
+         return static_functions[i].Name;
+   }
+
+   /* search added extension functions */
+   for (i = 0; i < NumExtEntryPoints; i++) {
+      if (ExtEntryTable[i].Offset == offset) {
+         return ExtEntryTable[i].Name;
+      }
+   }
+   return NULL;
+}
+
+
+
+/*
+ * Return size of dispatch table struct as number of functions (or
+ * slots).
+ */
+GLuint
+_glapi_get_dispatch_table_size(void)
+{
+   return DISPATCH_TABLE_SIZE;
+}
+
+
+
+/*
+ * Get API dispatcher version string.
+ */
+const char *
+_glapi_get_version(void)
+{
+   return "20021001";  /* YYYYMMDD */
+}
+
+
+
+/*
+ * Make sure there are no NULL pointers in the given dispatch table.
+ * Intended for debugging purposes.
+ */
+void
+_glapi_check_table(const struct _glapi_table *table)
+{
+#ifdef DEBUG
+   const GLuint entries = _glapi_get_dispatch_table_size();
+   const void **tab = (const void **) table;
+   GLuint i;
+   for (i = 1; i < entries; i++) {
+      assert(tab[i]);
+   }
+
+   /* Do some spot checks to be sure that the dispatch table
+    * slots are assigned correctly.
+    */
+   {
+      GLuint BeginOffset = _glapi_get_proc_offset("glBegin");
+      char *BeginFunc = (char*) &table->Begin;
+      GLuint offset = (BeginFunc - (char *) table) / sizeof(void *);
+      assert(BeginOffset == _gloffset_Begin);
+      assert(BeginOffset == offset);
+   }
+   {
+      GLuint viewportOffset = _glapi_get_proc_offset("glViewport");
+      char *viewportFunc = (char*) &table->Viewport;
+      GLuint offset = (viewportFunc - (char *) table) / sizeof(void *);
+      assert(viewportOffset == _gloffset_Viewport);
+      assert(viewportOffset == offset);
+   }
+   {
+      GLuint VertexPointerOffset = _glapi_get_proc_offset("glVertexPointer");
+      char *VertexPointerFunc = (char*) &table->VertexPointer;
+      GLuint offset = (VertexPointerFunc - (char *) table) / sizeof(void *);
+      assert(VertexPointerOffset == _gloffset_VertexPointer);
+      assert(VertexPointerOffset == offset);
+   }
+   {
+      GLuint ResetMinMaxOffset = _glapi_get_proc_offset("glResetMinmax");
+      char *ResetMinMaxFunc = (char*) &table->ResetMinmax;
+      GLuint offset = (ResetMinMaxFunc - (char *) table) / sizeof(void *);
+      assert(ResetMinMaxOffset == _gloffset_ResetMinmax);
+      assert(ResetMinMaxOffset == offset);
+   }
+   {
+      GLuint blendColorOffset = _glapi_get_proc_offset("glBlendColor");
+      char *blendColorFunc = (char*) &table->BlendColor;
+      GLuint offset = (blendColorFunc - (char *) table) / sizeof(void *);
+      assert(blendColorOffset == _gloffset_BlendColor);
+      assert(blendColorOffset == offset);
+   }
+   {
+      GLuint istextureOffset = _glapi_get_proc_offset("glIsTextureEXT");
+      char *istextureFunc = (char*) &table->IsTextureEXT;
+      GLuint offset = (istextureFunc - (char *) table) / sizeof(void *);
+      assert(istextureOffset == _gloffset_IsTextureEXT);
+      assert(istextureOffset == offset);
+   }
+   {
+      GLuint secondaryColor3fOffset = _glapi_get_proc_offset("glSecondaryColor3fEXT");
+      char *secondaryColor3fFunc = (char*) &table->SecondaryColor3fEXT;
+      GLuint offset = (secondaryColor3fFunc - (char *) table) / sizeof(void *);
+      assert(secondaryColor3fOffset == _gloffset_SecondaryColor3fEXT);
+      assert(secondaryColor3fOffset == offset);
+      assert(_glapi_get_proc_address("glSecondaryColor3fEXT") == (void *) &glSecondaryColor3fEXT);
+   }
+   {
+      GLuint pointParameterivOffset = _glapi_get_proc_offset("glPointParameterivNV");
+      char *pointParameterivFunc = (char*) &table->PointParameterivNV;
+      GLuint offset = (pointParameterivFunc - (char *) table) / sizeof(void *);
+      assert(pointParameterivOffset == _gloffset_PointParameterivNV);
+      assert(pointParameterivOffset == offset);
+      assert(_glapi_get_proc_address("glPointParameterivNV") == (void *) &glPointParameterivNV);
+   }
+   {
+      GLuint setFenceOffset = _glapi_get_proc_offset("glSetFenceNV");
+      char *setFenceFunc = (char*) &table->SetFenceNV;
+      GLuint offset = (setFenceFunc - (char *) table) / sizeof(void *);
+      assert(setFenceOffset == _gloffset_SetFenceNV);
+      assert(setFenceOffset == offset);
+      assert(_glapi_get_proc_address("glSetFenceNV") == (void *) &glSetFenceNV);
+   }
+#endif
+}
diff --git a/reactos/lib/mesa32/src/glapi/glapi.dsp b/reactos/lib/mesa32/src/glapi/glapi.dsp
new file mode 100644
index 00000000000..b7b1795df57
--- /dev/null
+++ b/reactos/lib/mesa32/src/glapi/glapi.dsp
@@ -0,0 +1,124 @@
+# Microsoft Developer Studio Project File - Name="glapi" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=glapi - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "glapi.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "glapi.mak" CFG="glapi - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "glapi - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "glapi - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "glapi - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "../../../include" /I "../" /I "../main" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "glapi - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../" /I "../main" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "glapi - Win32 Release"
+# Name "glapi - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\glapi.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\glthread.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\glapi.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\glapioffsets.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\glapitable.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\glapitemp.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\glprocs.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\glthread.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/reactos/lib/mesa32/src/glapi/glapi.h b/reactos/lib/mesa32/src/glapi/glapi.h
new file mode 100644
index 00000000000..41d7aaf0287
--- /dev/null
+++ b/reactos/lib/mesa32/src/glapi/glapi.h
@@ -0,0 +1,109 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef _GLAPI_H
+#define _GLAPI_H
+
+
+#include "GL/gl.h"
+
+struct _glapi_table;
+
+typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...);
+
+
+extern void *_glapi_Context;
+
+extern struct _glapi_table *_glapi_Dispatch;
+
+
+extern void
+_glapi_noop_enable_warnings(GLboolean enable);
+
+extern void
+_glapi_set_warning_func(_glapi_warning_func func);
+
+extern void
+_glapi_check_multithread(void);
+
+
+extern void
+_glapi_set_context(void *context);
+
+
+extern void *
+_glapi_get_context(void);
+
+
+extern void
+_glapi_set_dispatch(struct _glapi_table *dispatch);
+
+
+extern struct _glapi_table *
+_glapi_get_dispatch(void);
+
+
+extern int
+_glapi_begin_dispatch_override(struct _glapi_table *override);
+
+
+extern void
+_glapi_end_dispatch_override(int layer);
+
+
+struct _glapi_table *
+_glapi_get_override_dispatch(int layer);
+
+
+extern GLuint
+_glapi_get_dispatch_table_size(void);
+
+
+extern const char *
+_glapi_get_version(void);
+
+
+extern void
+_glapi_check_table(const struct _glapi_table *table);
+
+
+extern GLboolean
+_glapi_add_entrypoint(const char *funcName, GLuint offset);
+
+
+extern GLint
+_glapi_get_proc_offset(const char *funcName);
+
+
+extern const GLvoid *
+_glapi_get_proc_address(const char *funcName);
+
+
+extern const char *
+_glapi_get_proc_name(GLuint offset);
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/glapi/glapioffsets.h b/reactos/lib/mesa32/src/glapi/glapioffsets.h
new file mode 100644
index 00000000000..995e1241fcb
--- /dev/null
+++ b/reactos/lib/mesa32/src/glapi/glapioffsets.h
@@ -0,0 +1,716 @@
+/* DO NOT EDIT - This file generated automatically by gloffsets.py script */
+#ifndef _GLAPI_OFFSETS_H_
+#define _GLAPI_OFFSETS_H_
+
+#define _gloffset_NewList 0
+#define _gloffset_EndList 1
+#define _gloffset_CallList 2
+#define _gloffset_CallLists 3
+#define _gloffset_DeleteLists 4
+#define _gloffset_GenLists 5
+#define _gloffset_ListBase 6
+#define _gloffset_Begin 7
+#define _gloffset_Bitmap 8
+#define _gloffset_Color3b 9
+#define _gloffset_Color3bv 10
+#define _gloffset_Color3d 11
+#define _gloffset_Color3dv 12
+#define _gloffset_Color3f 13
+#define _gloffset_Color3fv 14
+#define _gloffset_Color3i 15
+#define _gloffset_Color3iv 16
+#define _gloffset_Color3s 17
+#define _gloffset_Color3sv 18
+#define _gloffset_Color3ub 19
+#define _gloffset_Color3ubv 20
+#define _gloffset_Color3ui 21
+#define _gloffset_Color3uiv 22
+#define _gloffset_Color3us 23
+#define _gloffset_Color3usv 24
+#define _gloffset_Color4b 25
+#define _gloffset_Color4bv 26
+#define _gloffset_Color4d 27
+#define _gloffset_Color4dv 28
+#define _gloffset_Color4f 29
+#define _gloffset_Color4fv 30
+#define _gloffset_Color4i 31
+#define _gloffset_Color4iv 32
+#define _gloffset_Color4s 33
+#define _gloffset_Color4sv 34
+#define _gloffset_Color4ub 35
+#define _gloffset_Color4ubv 36
+#define _gloffset_Color4ui 37
+#define _gloffset_Color4uiv 38
+#define _gloffset_Color4us 39
+#define _gloffset_Color4usv 40
+#define _gloffset_EdgeFlag 41
+#define _gloffset_EdgeFlagv 42
+#define _gloffset_End 43
+#define _gloffset_Indexd 44
+#define _gloffset_Indexdv 45
+#define _gloffset_Indexf 46
+#define _gloffset_Indexfv 47
+#define _gloffset_Indexi 48
+#define _gloffset_Indexiv 49
+#define _gloffset_Indexs 50
+#define _gloffset_Indexsv 51
+#define _gloffset_Normal3b 52
+#define _gloffset_Normal3bv 53
+#define _gloffset_Normal3d 54
+#define _gloffset_Normal3dv 55
+#define _gloffset_Normal3f 56
+#define _gloffset_Normal3fv 57
+#define _gloffset_Normal3i 58
+#define _gloffset_Normal3iv 59
+#define _gloffset_Normal3s 60
+#define _gloffset_Normal3sv 61
+#define _gloffset_RasterPos2d 62
+#define _gloffset_RasterPos2dv 63
+#define _gloffset_RasterPos2f 64
+#define _gloffset_RasterPos2fv 65
+#define _gloffset_RasterPos2i 66
+#define _gloffset_RasterPos2iv 67
+#define _gloffset_RasterPos2s 68
+#define _gloffset_RasterPos2sv 69
+#define _gloffset_RasterPos3d 70
+#define _gloffset_RasterPos3dv 71
+#define _gloffset_RasterPos3f 72
+#define _gloffset_RasterPos3fv 73
+#define _gloffset_RasterPos3i 74
+#define _gloffset_RasterPos3iv 75
+#define _gloffset_RasterPos3s 76
+#define _gloffset_RasterPos3sv 77
+#define _gloffset_RasterPos4d 78
+#define _gloffset_RasterPos4dv 79
+#define _gloffset_RasterPos4f 80
+#define _gloffset_RasterPos4fv 81
+#define _gloffset_RasterPos4i 82
+#define _gloffset_RasterPos4iv 83
+#define _gloffset_RasterPos4s 84
+#define _gloffset_RasterPos4sv 85
+#define _gloffset_Rectd 86
+#define _gloffset_Rectdv 87
+#define _gloffset_Rectf 88
+#define _gloffset_Rectfv 89
+#define _gloffset_Recti 90
+#define _gloffset_Rectiv 91
+#define _gloffset_Rects 92
+#define _gloffset_Rectsv 93
+#define _gloffset_TexCoord1d 94
+#define _gloffset_TexCoord1dv 95
+#define _gloffset_TexCoord1f 96
+#define _gloffset_TexCoord1fv 97
+#define _gloffset_TexCoord1i 98
+#define _gloffset_TexCoord1iv 99
+#define _gloffset_TexCoord1s 100
+#define _gloffset_TexCoord1sv 101
+#define _gloffset_TexCoord2d 102
+#define _gloffset_TexCoord2dv 103
+#define _gloffset_TexCoord2f 104
+#define _gloffset_TexCoord2fv 105
+#define _gloffset_TexCoord2i 106
+#define _gloffset_TexCoord2iv 107
+#define _gloffset_TexCoord2s 108
+#define _gloffset_TexCoord2sv 109
+#define _gloffset_TexCoord3d 110
+#define _gloffset_TexCoord3dv 111
+#define _gloffset_TexCoord3f 112
+#define _gloffset_TexCoord3fv 113
+#define _gloffset_TexCoord3i 114
+#define _gloffset_TexCoord3iv 115
+#define _gloffset_TexCoord3s 116
+#define _gloffset_TexCoord3sv 117
+#define _gloffset_TexCoord4d 118
+#define _gloffset_TexCoord4dv 119
+#define _gloffset_TexCoord4f 120
+#define _gloffset_TexCoord4fv 121
+#define _gloffset_TexCoord4i 122
+#define _gloffset_TexCoord4iv 123
+#define _gloffset_TexCoord4s 124
+#define _gloffset_TexCoord4sv 125
+#define _gloffset_Vertex2d 126
+#define _gloffset_Vertex2dv 127
+#define _gloffset_Vertex2f 128
+#define _gloffset_Vertex2fv 129
+#define _gloffset_Vertex2i 130
+#define _gloffset_Vertex2iv 131
+#define _gloffset_Vertex2s 132
+#define _gloffset_Vertex2sv 133
+#define _gloffset_Vertex3d 134
+#define _gloffset_Vertex3dv 135
+#define _gloffset_Vertex3f 136
+#define _gloffset_Vertex3fv 137
+#define _gloffset_Vertex3i 138
+#define _gloffset_Vertex3iv 139
+#define _gloffset_Vertex3s 140
+#define _gloffset_Vertex3sv 141
+#define _gloffset_Vertex4d 142
+#define _gloffset_Vertex4dv 143
+#define _gloffset_Vertex4f 144
+#define _gloffset_Vertex4fv 145
+#define _gloffset_Vertex4i 146
+#define _gloffset_Vertex4iv 147
+#define _gloffset_Vertex4s 148
+#define _gloffset_Vertex4sv 149
+#define _gloffset_ClipPlane 150
+#define _gloffset_ColorMaterial 151
+#define _gloffset_CullFace 152
+#define _gloffset_Fogf 153
+#define _gloffset_Fogfv 154
+#define _gloffset_Fogi 155
+#define _gloffset_Fogiv 156
+#define _gloffset_FrontFace 157
+#define _gloffset_Hint 158
+#define _gloffset_Lightf 159
+#define _gloffset_Lightfv 160
+#define _gloffset_Lighti 161
+#define _gloffset_Lightiv 162
+#define _gloffset_LightModelf 163
+#define _gloffset_LightModelfv 164
+#define _gloffset_LightModeli 165
+#define _gloffset_LightModeliv 166
+#define _gloffset_LineStipple 167
+#define _gloffset_LineWidth 168
+#define _gloffset_Materialf 169
+#define _gloffset_Materialfv 170
+#define _gloffset_Materiali 171
+#define _gloffset_Materialiv 172
+#define _gloffset_PointSize 173
+#define _gloffset_PolygonMode 174
+#define _gloffset_PolygonStipple 175
+#define _gloffset_Scissor 176
+#define _gloffset_ShadeModel 177
+#define _gloffset_TexParameterf 178
+#define _gloffset_TexParameterfv 179
+#define _gloffset_TexParameteri 180
+#define _gloffset_TexParameteriv 181
+#define _gloffset_TexImage1D 182
+#define _gloffset_TexImage2D 183
+#define _gloffset_TexEnvf 184
+#define _gloffset_TexEnvfv 185
+#define _gloffset_TexEnvi 186
+#define _gloffset_TexEnviv 187
+#define _gloffset_TexGend 188
+#define _gloffset_TexGendv 189
+#define _gloffset_TexGenf 190
+#define _gloffset_TexGenfv 191
+#define _gloffset_TexGeni 192
+#define _gloffset_TexGeniv 193
+#define _gloffset_FeedbackBuffer 194
+#define _gloffset_SelectBuffer 195
+#define _gloffset_RenderMode 196
+#define _gloffset_InitNames 197
+#define _gloffset_LoadName 198
+#define _gloffset_PassThrough 199
+#define _gloffset_PopName 200
+#define _gloffset_PushName 201
+#define _gloffset_DrawBuffer 202
+#define _gloffset_Clear 203
+#define _gloffset_ClearAccum 204
+#define _gloffset_ClearIndex 205
+#define _gloffset_ClearColor 206
+#define _gloffset_ClearStencil 207
+#define _gloffset_ClearDepth 208
+#define _gloffset_StencilMask 209
+#define _gloffset_ColorMask 210
+#define _gloffset_DepthMask 211
+#define _gloffset_IndexMask 212
+#define _gloffset_Accum 213
+#define _gloffset_Disable 214
+#define _gloffset_Enable 215
+#define _gloffset_Finish 216
+#define _gloffset_Flush 217
+#define _gloffset_PopAttrib 218
+#define _gloffset_PushAttrib 219
+#define _gloffset_Map1d 220
+#define _gloffset_Map1f 221
+#define _gloffset_Map2d 222
+#define _gloffset_Map2f 223
+#define _gloffset_MapGrid1d 224
+#define _gloffset_MapGrid1f 225
+#define _gloffset_MapGrid2d 226
+#define _gloffset_MapGrid2f 227
+#define _gloffset_EvalCoord1d 228
+#define _gloffset_EvalCoord1dv 229
+#define _gloffset_EvalCoord1f 230
+#define _gloffset_EvalCoord1fv 231
+#define _gloffset_EvalCoord2d 232
+#define _gloffset_EvalCoord2dv 233
+#define _gloffset_EvalCoord2f 234
+#define _gloffset_EvalCoord2fv 235
+#define _gloffset_EvalMesh1 236
+#define _gloffset_EvalPoint1 237
+#define _gloffset_EvalMesh2 238
+#define _gloffset_EvalPoint2 239
+#define _gloffset_AlphaFunc 240
+#define _gloffset_BlendFunc 241
+#define _gloffset_LogicOp 242
+#define _gloffset_StencilFunc 243
+#define _gloffset_StencilOp 244
+#define _gloffset_DepthFunc 245
+#define _gloffset_PixelZoom 246
+#define _gloffset_PixelTransferf 247
+#define _gloffset_PixelTransferi 248
+#define _gloffset_PixelStoref 249
+#define _gloffset_PixelStorei 250
+#define _gloffset_PixelMapfv 251
+#define _gloffset_PixelMapuiv 252
+#define _gloffset_PixelMapusv 253
+#define _gloffset_ReadBuffer 254
+#define _gloffset_CopyPixels 255
+#define _gloffset_ReadPixels 256
+#define _gloffset_DrawPixels 257
+#define _gloffset_GetBooleanv 258
+#define _gloffset_GetClipPlane 259
+#define _gloffset_GetDoublev 260
+#define _gloffset_GetError 261
+#define _gloffset_GetFloatv 262
+#define _gloffset_GetIntegerv 263
+#define _gloffset_GetLightfv 264
+#define _gloffset_GetLightiv 265
+#define _gloffset_GetMapdv 266
+#define _gloffset_GetMapfv 267
+#define _gloffset_GetMapiv 268
+#define _gloffset_GetMaterialfv 269
+#define _gloffset_GetMaterialiv 270
+#define _gloffset_GetPixelMapfv 271
+#define _gloffset_GetPixelMapuiv 272
+#define _gloffset_GetPixelMapusv 273
+#define _gloffset_GetPolygonStipple 274
+#define _gloffset_GetString 275
+#define _gloffset_GetTexEnvfv 276
+#define _gloffset_GetTexEnviv 277
+#define _gloffset_GetTexGendv 278
+#define _gloffset_GetTexGenfv 279
+#define _gloffset_GetTexGeniv 280
+#define _gloffset_GetTexImage 281
+#define _gloffset_GetTexParameterfv 282
+#define _gloffset_GetTexParameteriv 283
+#define _gloffset_GetTexLevelParameterfv 284
+#define _gloffset_GetTexLevelParameteriv 285
+#define _gloffset_IsEnabled 286
+#define _gloffset_IsList 287
+#define _gloffset_DepthRange 288
+#define _gloffset_Frustum 289
+#define _gloffset_LoadIdentity 290
+#define _gloffset_LoadMatrixf 291
+#define _gloffset_LoadMatrixd 292
+#define _gloffset_MatrixMode 293
+#define _gloffset_MultMatrixf 294
+#define _gloffset_MultMatrixd 295
+#define _gloffset_Ortho 296
+#define _gloffset_PopMatrix 297
+#define _gloffset_PushMatrix 298
+#define _gloffset_Rotated 299
+#define _gloffset_Rotatef 300
+#define _gloffset_Scaled 301
+#define _gloffset_Scalef 302
+#define _gloffset_Translated 303
+#define _gloffset_Translatef 304
+#define _gloffset_Viewport 305
+#define _gloffset_ArrayElement 306
+#define _gloffset_BindTexture 307
+#define _gloffset_ColorPointer 308
+#define _gloffset_DisableClientState 309
+#define _gloffset_DrawArrays 310
+#define _gloffset_DrawElements 311
+#define _gloffset_EdgeFlagPointer 312
+#define _gloffset_EnableClientState 313
+#define _gloffset_IndexPointer 314
+#define _gloffset_Indexub 315
+#define _gloffset_Indexubv 316
+#define _gloffset_InterleavedArrays 317
+#define _gloffset_NormalPointer 318
+#define _gloffset_PolygonOffset 319
+#define _gloffset_TexCoordPointer 320
+#define _gloffset_VertexPointer 321
+#define _gloffset_AreTexturesResident 322
+#define _gloffset_CopyTexImage1D 323
+#define _gloffset_CopyTexImage2D 324
+#define _gloffset_CopyTexSubImage1D 325
+#define _gloffset_CopyTexSubImage2D 326
+#define _gloffset_DeleteTextures 327
+#define _gloffset_GenTextures 328
+#define _gloffset_GetPointerv 329
+#define _gloffset_IsTexture 330
+#define _gloffset_PrioritizeTextures 331
+#define _gloffset_TexSubImage1D 332
+#define _gloffset_TexSubImage2D 333
+#define _gloffset_PopClientAttrib 334
+#define _gloffset_PushClientAttrib 335
+#define _gloffset_BlendColor 336
+#define _gloffset_BlendEquation 337
+#define _gloffset_DrawRangeElements 338
+#define _gloffset_ColorTable 339
+#define _gloffset_ColorTableParameterfv 340
+#define _gloffset_ColorTableParameteriv 341
+#define _gloffset_CopyColorTable 342
+#define _gloffset_GetColorTable 343
+#define _gloffset_GetColorTableParameterfv 344
+#define _gloffset_GetColorTableParameteriv 345
+#define _gloffset_ColorSubTable 346
+#define _gloffset_CopyColorSubTable 347
+#define _gloffset_ConvolutionFilter1D 348
+#define _gloffset_ConvolutionFilter2D 349
+#define _gloffset_ConvolutionParameterf 350
+#define _gloffset_ConvolutionParameterfv 351
+#define _gloffset_ConvolutionParameteri 352
+#define _gloffset_ConvolutionParameteriv 353
+#define _gloffset_CopyConvolutionFilter1D 354
+#define _gloffset_CopyConvolutionFilter2D 355
+#define _gloffset_GetConvolutionFilter 356
+#define _gloffset_GetConvolutionParameterfv 357
+#define _gloffset_GetConvolutionParameteriv 358
+#define _gloffset_GetSeparableFilter 359
+#define _gloffset_SeparableFilter2D 360
+#define _gloffset_GetHistogram 361
+#define _gloffset_GetHistogramParameterfv 362
+#define _gloffset_GetHistogramParameteriv 363
+#define _gloffset_GetMinmax 364
+#define _gloffset_GetMinmaxParameterfv 365
+#define _gloffset_GetMinmaxParameteriv 366
+#define _gloffset_Histogram 367
+#define _gloffset_Minmax 368
+#define _gloffset_ResetHistogram 369
+#define _gloffset_ResetMinmax 370
+#define _gloffset_TexImage3D 371
+#define _gloffset_TexSubImage3D 372
+#define _gloffset_CopyTexSubImage3D 373
+#define _gloffset_ActiveTextureARB 374
+#define _gloffset_ClientActiveTextureARB 375
+#define _gloffset_MultiTexCoord1dARB 376
+#define _gloffset_MultiTexCoord1dvARB 377
+#define _gloffset_MultiTexCoord1fARB 378
+#define _gloffset_MultiTexCoord1fvARB 379
+#define _gloffset_MultiTexCoord1iARB 380
+#define _gloffset_MultiTexCoord1ivARB 381
+#define _gloffset_MultiTexCoord1sARB 382
+#define _gloffset_MultiTexCoord1svARB 383
+#define _gloffset_MultiTexCoord2dARB 384
+#define _gloffset_MultiTexCoord2dvARB 385
+#define _gloffset_MultiTexCoord2fARB 386
+#define _gloffset_MultiTexCoord2fvARB 387
+#define _gloffset_MultiTexCoord2iARB 388
+#define _gloffset_MultiTexCoord2ivARB 389
+#define _gloffset_MultiTexCoord2sARB 390
+#define _gloffset_MultiTexCoord2svARB 391
+#define _gloffset_MultiTexCoord3dARB 392
+#define _gloffset_MultiTexCoord3dvARB 393
+#define _gloffset_MultiTexCoord3fARB 394
+#define _gloffset_MultiTexCoord3fvARB 395
+#define _gloffset_MultiTexCoord3iARB 396
+#define _gloffset_MultiTexCoord3ivARB 397
+#define _gloffset_MultiTexCoord3sARB 398
+#define _gloffset_MultiTexCoord3svARB 399
+#define _gloffset_MultiTexCoord4dARB 400
+#define _gloffset_MultiTexCoord4dvARB 401
+#define _gloffset_MultiTexCoord4fARB 402
+#define _gloffset_MultiTexCoord4fvARB 403
+#define _gloffset_MultiTexCoord4iARB 404
+#define _gloffset_MultiTexCoord4ivARB 405
+#define _gloffset_MultiTexCoord4sARB 406
+#define _gloffset_MultiTexCoord4svARB 407
+#define _gloffset_LoadTransposeMatrixfARB 408
+#define _gloffset_LoadTransposeMatrixdARB 409
+#define _gloffset_MultTransposeMatrixfARB 410
+#define _gloffset_MultTransposeMatrixdARB 411
+#define _gloffset_SampleCoverageARB 412
+#define _gloffset___unused413 413
+#define _gloffset_PolygonOffsetEXT 414
+#define _gloffset_GetTexFilterFuncSGIS 415
+#define _gloffset_TexFilterFuncSGIS 416
+#define _gloffset_GetHistogramEXT 417
+#define _gloffset_GetHistogramParameterfvEXT 418
+#define _gloffset_GetHistogramParameterivEXT 419
+#define _gloffset_GetMinmaxEXT 420
+#define _gloffset_GetMinmaxParameterfvEXT 421
+#define _gloffset_GetMinmaxParameterivEXT 422
+#define _gloffset_GetConvolutionFilterEXT 423
+#define _gloffset_GetConvolutionParameterfvEXT 424
+#define _gloffset_GetConvolutionParameterivEXT 425
+#define _gloffset_GetSeparableFilterEXT 426
+#define _gloffset_GetColorTableSGI 427
+#define _gloffset_GetColorTableParameterfvSGI 428
+#define _gloffset_GetColorTableParameterivSGI 429
+#define _gloffset_PixelTexGenSGIX 430
+#define _gloffset_PixelTexGenParameteriSGIS 431
+#define _gloffset_PixelTexGenParameterivSGIS 432
+#define _gloffset_PixelTexGenParameterfSGIS 433
+#define _gloffset_PixelTexGenParameterfvSGIS 434
+#define _gloffset_GetPixelTexGenParameterivSGIS 435
+#define _gloffset_GetPixelTexGenParameterfvSGIS 436
+#define _gloffset_TexImage4DSGIS 437
+#define _gloffset_TexSubImage4DSGIS 438
+#define _gloffset_AreTexturesResidentEXT 439
+#define _gloffset_GenTexturesEXT 440
+#define _gloffset_IsTextureEXT 441
+#define _gloffset_DetailTexFuncSGIS 442
+#define _gloffset_GetDetailTexFuncSGIS 443
+#define _gloffset_SharpenTexFuncSGIS 444
+#define _gloffset_GetSharpenTexFuncSGIS 445
+#define _gloffset_SampleMaskSGIS 446
+#define _gloffset_SamplePatternSGIS 447
+#define _gloffset_ColorPointerEXT 448
+#define _gloffset_EdgeFlagPointerEXT 449
+#define _gloffset_IndexPointerEXT 450
+#define _gloffset_NormalPointerEXT 451
+#define _gloffset_TexCoordPointerEXT 452
+#define _gloffset_VertexPointerEXT 453
+#define _gloffset_SpriteParameterfSGIX 454
+#define _gloffset_SpriteParameterfvSGIX 455
+#define _gloffset_SpriteParameteriSGIX 456
+#define _gloffset_SpriteParameterivSGIX 457
+#define _gloffset_PointParameterfEXT 458
+#define _gloffset_PointParameterfvEXT 459
+#define _gloffset_GetInstrumentsSGIX 460
+#define _gloffset_InstrumentsBufferSGIX 461
+#define _gloffset_PollInstrumentsSGIX 462
+#define _gloffset_ReadInstrumentsSGIX 463
+#define _gloffset_StartInstrumentsSGIX 464
+#define _gloffset_StopInstrumentsSGIX 465
+#define _gloffset_FrameZoomSGIX 466
+#define _gloffset_TagSampleBufferSGIX 467
+#define _gloffset_ReferencePlaneSGIX 468
+#define _gloffset_FlushRasterSGIX 469
+#define _gloffset_GetListParameterfvSGIX 470
+#define _gloffset_GetListParameterivSGIX 471
+#define _gloffset_ListParameterfSGIX 472
+#define _gloffset_ListParameterfvSGIX 473
+#define _gloffset_ListParameteriSGIX 474
+#define _gloffset_ListParameterivSGIX 475
+#define _gloffset_FragmentColorMaterialSGIX 476
+#define _gloffset_FragmentLightfSGIX 477
+#define _gloffset_FragmentLightfvSGIX 478
+#define _gloffset_FragmentLightiSGIX 479
+#define _gloffset_FragmentLightivSGIX 480
+#define _gloffset_FragmentLightModelfSGIX 481
+#define _gloffset_FragmentLightModelfvSGIX 482
+#define _gloffset_FragmentLightModeliSGIX 483
+#define _gloffset_FragmentLightModelivSGIX 484
+#define _gloffset_FragmentMaterialfSGIX 485
+#define _gloffset_FragmentMaterialfvSGIX 486
+#define _gloffset_FragmentMaterialiSGIX 487
+#define _gloffset_FragmentMaterialivSGIX 488
+#define _gloffset_GetFragmentLightfvSGIX 489
+#define _gloffset_GetFragmentLightivSGIX 490
+#define _gloffset_GetFragmentMaterialfvSGIX 491
+#define _gloffset_GetFragmentMaterialivSGIX 492
+#define _gloffset_LightEnviSGIX 493
+#define _gloffset_VertexWeightfEXT 494
+#define _gloffset_VertexWeightfvEXT 495
+#define _gloffset_VertexWeightPointerEXT 496
+#define _gloffset_FlushVertexArrayRangeNV 497
+#define _gloffset_VertexArrayRangeNV 498
+#define _gloffset_CombinerParameterfvNV 499
+#define _gloffset_CombinerParameterfNV 500
+#define _gloffset_CombinerParameterivNV 501
+#define _gloffset_CombinerParameteriNV 502
+#define _gloffset_CombinerInputNV 503
+#define _gloffset_CombinerOutputNV 504
+#define _gloffset_FinalCombinerInputNV 505
+#define _gloffset_GetCombinerInputParameterfvNV 506
+#define _gloffset_GetCombinerInputParameterivNV 507
+#define _gloffset_GetCombinerOutputParameterfvNV 508
+#define _gloffset_GetCombinerOutputParameterivNV 509
+#define _gloffset_GetFinalCombinerInputParameterfvNV 510
+#define _gloffset_GetFinalCombinerInputParameterivNV 511
+#define _gloffset_ResizeBuffersMESA 512
+#define _gloffset_WindowPos2dMESA 513
+#define _gloffset_WindowPos2dvMESA 514
+#define _gloffset_WindowPos2fMESA 515
+#define _gloffset_WindowPos2fvMESA 516
+#define _gloffset_WindowPos2iMESA 517
+#define _gloffset_WindowPos2ivMESA 518
+#define _gloffset_WindowPos2sMESA 519
+#define _gloffset_WindowPos2svMESA 520
+#define _gloffset_WindowPos3dMESA 521
+#define _gloffset_WindowPos3dvMESA 522
+#define _gloffset_WindowPos3fMESA 523
+#define _gloffset_WindowPos3fvMESA 524
+#define _gloffset_WindowPos3iMESA 525
+#define _gloffset_WindowPos3ivMESA 526
+#define _gloffset_WindowPos3sMESA 527
+#define _gloffset_WindowPos3svMESA 528
+#define _gloffset_WindowPos4dMESA 529
+#define _gloffset_WindowPos4dvMESA 530
+#define _gloffset_WindowPos4fMESA 531
+#define _gloffset_WindowPos4fvMESA 532
+#define _gloffset_WindowPos4iMESA 533
+#define _gloffset_WindowPos4ivMESA 534
+#define _gloffset_WindowPos4sMESA 535
+#define _gloffset_WindowPos4svMESA 536
+#define _gloffset_BlendFuncSeparateEXT 537
+#define _gloffset_IndexMaterialEXT 538
+#define _gloffset_IndexFuncEXT 539
+#define _gloffset_LockArraysEXT 540
+#define _gloffset_UnlockArraysEXT 541
+#define _gloffset_CullParameterdvEXT 542
+#define _gloffset_CullParameterfvEXT 543
+#define _gloffset_HintPGI 544
+#define _gloffset_FogCoordfEXT 545
+#define _gloffset_FogCoordfvEXT 546
+#define _gloffset_FogCoorddEXT 547
+#define _gloffset_FogCoorddvEXT 548
+#define _gloffset_FogCoordPointerEXT 549
+#define _gloffset_GetColorTableEXT 550
+#define _gloffset_GetColorTableParameterivEXT 551
+#define _gloffset_GetColorTableParameterfvEXT 552
+#define _gloffset_TbufferMask3DFX 553
+#define _gloffset_CompressedTexImage3DARB 554
+#define _gloffset_CompressedTexImage2DARB 555
+#define _gloffset_CompressedTexImage1DARB 556
+#define _gloffset_CompressedTexSubImage3DARB 557
+#define _gloffset_CompressedTexSubImage2DARB 558
+#define _gloffset_CompressedTexSubImage1DARB 559
+#define _gloffset_GetCompressedTexImageARB 560
+#define _gloffset_SecondaryColor3bEXT 561
+#define _gloffset_SecondaryColor3bvEXT 562
+#define _gloffset_SecondaryColor3dEXT 563
+#define _gloffset_SecondaryColor3dvEXT 564
+#define _gloffset_SecondaryColor3fEXT 565
+#define _gloffset_SecondaryColor3fvEXT 566
+#define _gloffset_SecondaryColor3iEXT 567
+#define _gloffset_SecondaryColor3ivEXT 568
+#define _gloffset_SecondaryColor3sEXT 569
+#define _gloffset_SecondaryColor3svEXT 570
+#define _gloffset_SecondaryColor3ubEXT 571
+#define _gloffset_SecondaryColor3ubvEXT 572
+#define _gloffset_SecondaryColor3uiEXT 573
+#define _gloffset_SecondaryColor3uivEXT 574
+#define _gloffset_SecondaryColor3usEXT 575
+#define _gloffset_SecondaryColor3usvEXT 576
+#define _gloffset_SecondaryColorPointerEXT 577
+#define _gloffset_AreProgramsResidentNV 578
+#define _gloffset_BindProgramNV 579
+#define _gloffset_DeleteProgramsNV 580
+#define _gloffset_ExecuteProgramNV 581
+#define _gloffset_GenProgramsNV 582
+#define _gloffset_GetProgramParameterdvNV 583
+#define _gloffset_GetProgramParameterfvNV 584
+#define _gloffset_GetProgramivNV 585
+#define _gloffset_GetProgramStringNV 586
+#define _gloffset_GetTrackMatrixivNV 587
+#define _gloffset_GetVertexAttribdvNV 588
+#define _gloffset_GetVertexAttribfvNV 589
+#define _gloffset_GetVertexAttribivNV 590
+#define _gloffset_GetVertexAttribPointervNV 591
+#define _gloffset_IsProgramNV 592
+#define _gloffset_LoadProgramNV 593
+#define _gloffset_ProgramParameter4dNV 594
+#define _gloffset_ProgramParameter4dvNV 595
+#define _gloffset_ProgramParameter4fNV 596
+#define _gloffset_ProgramParameter4fvNV 597
+#define _gloffset_ProgramParameters4dvNV 598
+#define _gloffset_ProgramParameters4fvNV 599
+#define _gloffset_RequestResidentProgramsNV 600
+#define _gloffset_TrackMatrixNV 601
+#define _gloffset_VertexAttribPointerNV 602
+#define _gloffset_VertexAttrib1dNV 603
+#define _gloffset_VertexAttrib1dvNV 604
+#define _gloffset_VertexAttrib1fNV 605
+#define _gloffset_VertexAttrib1fvNV 606
+#define _gloffset_VertexAttrib1sNV 607
+#define _gloffset_VertexAttrib1svNV 608
+#define _gloffset_VertexAttrib2dNV 609
+#define _gloffset_VertexAttrib2dvNV 610
+#define _gloffset_VertexAttrib2fNV 611
+#define _gloffset_VertexAttrib2fvNV 612
+#define _gloffset_VertexAttrib2sNV 613
+#define _gloffset_VertexAttrib2svNV 614
+#define _gloffset_VertexAttrib3dNV 615
+#define _gloffset_VertexAttrib3dvNV 616
+#define _gloffset_VertexAttrib3fNV 617
+#define _gloffset_VertexAttrib3fvNV 618
+#define _gloffset_VertexAttrib3sNV 619
+#define _gloffset_VertexAttrib3svNV 620
+#define _gloffset_VertexAttrib4dNV 621
+#define _gloffset_VertexAttrib4dvNV 622
+#define _gloffset_VertexAttrib4fNV 623
+#define _gloffset_VertexAttrib4fvNV 624
+#define _gloffset_VertexAttrib4sNV 625
+#define _gloffset_VertexAttrib4svNV 626
+#define _gloffset_VertexAttrib4ubNV 627
+#define _gloffset_VertexAttrib4ubvNV 628
+#define _gloffset_VertexAttribs1dvNV 629
+#define _gloffset_VertexAttribs1fvNV 630
+#define _gloffset_VertexAttribs1svNV 631
+#define _gloffset_VertexAttribs2dvNV 632
+#define _gloffset_VertexAttribs2fvNV 633
+#define _gloffset_VertexAttribs2svNV 634
+#define _gloffset_VertexAttribs3dvNV 635
+#define _gloffset_VertexAttribs3fvNV 636
+#define _gloffset_VertexAttribs3svNV 637
+#define _gloffset_VertexAttribs4dvNV 638
+#define _gloffset_VertexAttribs4fvNV 639
+#define _gloffset_VertexAttribs4svNV 640
+#define _gloffset_VertexAttribs4ubvNV 641
+#define _gloffset_PointParameteriNV 642
+#define _gloffset_PointParameterivNV 643
+#define _gloffset_MultiDrawArraysEXT 644
+#define _gloffset_MultiDrawElementsEXT 645
+#define _gloffset_ActiveStencilFaceEXT 646
+#define _gloffset_DeleteFencesNV 647
+#define _gloffset_GenFencesNV 648
+#define _gloffset_IsFenceNV 649
+#define _gloffset_TestFenceNV 650
+#define _gloffset_GetFenceivNV 651
+#define _gloffset_FinishFenceNV 652
+#define _gloffset_SetFenceNV 653
+#define _gloffset_VertexAttrib4bvARB 654
+#define _gloffset_VertexAttrib4ivARB 655
+#define _gloffset_VertexAttrib4ubvARB 656
+#define _gloffset_VertexAttrib4usvARB 657
+#define _gloffset_VertexAttrib4uivARB 658
+#define _gloffset_VertexAttrib4NbvARB 659
+#define _gloffset_VertexAttrib4NsvARB 660
+#define _gloffset_VertexAttrib4NivARB 661
+#define _gloffset_VertexAttrib4NusvARB 662
+#define _gloffset_VertexAttrib4NuivARB 663
+#define _gloffset_VertexAttribPointerARB 664
+#define _gloffset_EnableVertexAttribArrayARB 665
+#define _gloffset_DisableVertexAttribArrayARB 666
+#define _gloffset_ProgramStringARB 667
+#define _gloffset_ProgramEnvParameter4dARB 668
+#define _gloffset_ProgramEnvParameter4dvARB 669
+#define _gloffset_ProgramEnvParameter4fARB 670
+#define _gloffset_ProgramEnvParameter4fvARB 671
+#define _gloffset_ProgramLocalParameter4dARB 672
+#define _gloffset_ProgramLocalParameter4dvARB 673
+#define _gloffset_ProgramLocalParameter4fARB 674
+#define _gloffset_ProgramLocalParameter4fvARB 675
+#define _gloffset_GetProgramEnvParameterdvARB 676
+#define _gloffset_GetProgramEnvParameterfvARB 677
+#define _gloffset_GetProgramLocalParameterdvARB 678
+#define _gloffset_GetProgramLocalParameterfvARB 679
+#define _gloffset_GetProgramivARB 680
+#define _gloffset_GetProgramStringARB 681
+#define _gloffset_ProgramNamedParameter4fNV 682
+#define _gloffset_ProgramNamedParameter4dNV 683
+#define _gloffset_ProgramNamedParameter4fvNV 684
+#define _gloffset_ProgramNamedParameter4dvNV 685
+#define _gloffset_GetProgramNamedParameterfvNV 686
+#define _gloffset_GetProgramNamedParameterdvNV 687
+#define _gloffset_BindBufferARB 688
+#define _gloffset_BufferDataARB 689
+#define _gloffset_BufferSubDataARB 690
+#define _gloffset_DeleteBuffersARB 691
+#define _gloffset_GenBuffersARB 692
+#define _gloffset_GetBufferParameterivARB 693
+#define _gloffset_GetBufferPointervARB 694
+#define _gloffset_GetBufferSubDataARB 695
+#define _gloffset_IsBufferARB 696
+#define _gloffset_MapBufferARB 697
+#define _gloffset_UnmapBufferARB 698
+#define _gloffset_DepthBoundsEXT 699
+#define _gloffset_GenQueriesARB 700
+#define _gloffset_DeleteQueriesARB 701
+#define _gloffset_IsQueryARB 702
+#define _gloffset_BeginQueryARB 703
+#define _gloffset_EndQueryARB 704
+#define _gloffset_GetQueryivARB 705
+#define _gloffset_GetQueryObjectivARB 706
+#define _gloffset_GetQueryObjectuivARB 707
+#define _gloffset_MultiModeDrawArraysIBM 708
+#define _gloffset_MultiModeDrawElementsIBM 709
+
+#endif
diff --git a/reactos/lib/mesa32/src/glapi/glapitable.h b/reactos/lib/mesa32/src/glapi/glapitable.h
new file mode 100644
index 00000000000..044c62cffe7
--- /dev/null
+++ b/reactos/lib/mesa32/src/glapi/glapitable.h
@@ -0,0 +1,723 @@
+/* DO NOT EDIT - This file generated automatically with gltable.py script */
+#ifndef _GLAPI_TABLE_H_
+#define _GLAPI_TABLE_H_
+
+#ifndef GLAPIENTRYP
+#define GLAPIENTRYP
+#endif
+
+struct _glapi_table
+{
+   void (GLAPIENTRYP NewList)(GLuint list, GLenum mode); /* 0 */
+   void (GLAPIENTRYP EndList)(void); /* 1 */
+   void (GLAPIENTRYP CallList)(GLuint list); /* 2 */
+   void (GLAPIENTRYP CallLists)(GLsizei n, GLenum type, const GLvoid * lists); /* 3 */
+   void (GLAPIENTRYP DeleteLists)(GLuint list, GLsizei range); /* 4 */
+   GLuint (GLAPIENTRYP GenLists)(GLsizei range); /* 5 */
+   void (GLAPIENTRYP ListBase)(GLuint base); /* 6 */
+   void (GLAPIENTRYP Begin)(GLenum mode); /* 7 */
+   void (GLAPIENTRYP Bitmap)(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte * bitmap); /* 8 */
+   void (GLAPIENTRYP Color3b)(GLbyte red, GLbyte green, GLbyte blue); /* 9 */
+   void (GLAPIENTRYP Color3bv)(const GLbyte * v); /* 10 */
+   void (GLAPIENTRYP Color3d)(GLdouble red, GLdouble green, GLdouble blue); /* 11 */
+   void (GLAPIENTRYP Color3dv)(const GLdouble * v); /* 12 */
+   void (GLAPIENTRYP Color3f)(GLfloat red, GLfloat green, GLfloat blue); /* 13 */
+   void (GLAPIENTRYP Color3fv)(const GLfloat * v); /* 14 */
+   void (GLAPIENTRYP Color3i)(GLint red, GLint green, GLint blue); /* 15 */
+   void (GLAPIENTRYP Color3iv)(const GLint * v); /* 16 */
+   void (GLAPIENTRYP Color3s)(GLshort red, GLshort green, GLshort blue); /* 17 */
+   void (GLAPIENTRYP Color3sv)(const GLshort * v); /* 18 */
+   void (GLAPIENTRYP Color3ub)(GLubyte red, GLubyte green, GLubyte blue); /* 19 */
+   void (GLAPIENTRYP Color3ubv)(const GLubyte * v); /* 20 */
+   void (GLAPIENTRYP Color3ui)(GLuint red, GLuint green, GLuint blue); /* 21 */
+   void (GLAPIENTRYP Color3uiv)(const GLuint * v); /* 22 */
+   void (GLAPIENTRYP Color3us)(GLushort red, GLushort green, GLushort blue); /* 23 */
+   void (GLAPIENTRYP Color3usv)(const GLushort * v); /* 24 */
+   void (GLAPIENTRYP Color4b)(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha); /* 25 */
+   void (GLAPIENTRYP Color4bv)(const GLbyte * v); /* 26 */
+   void (GLAPIENTRYP Color4d)(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha); /* 27 */
+   void (GLAPIENTRYP Color4dv)(const GLdouble * v); /* 28 */
+   void (GLAPIENTRYP Color4f)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); /* 29 */
+   void (GLAPIENTRYP Color4fv)(const GLfloat * v); /* 30 */
+   void (GLAPIENTRYP Color4i)(GLint red, GLint green, GLint blue, GLint alpha); /* 31 */
+   void (GLAPIENTRYP Color4iv)(const GLint * v); /* 32 */
+   void (GLAPIENTRYP Color4s)(GLshort red, GLshort green, GLshort blue, GLshort alpha); /* 33 */
+   void (GLAPIENTRYP Color4sv)(const GLshort * v); /* 34 */
+   void (GLAPIENTRYP Color4ub)(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha); /* 35 */
+   void (GLAPIENTRYP Color4ubv)(const GLubyte * v); /* 36 */
+   void (GLAPIENTRYP Color4ui)(GLuint red, GLuint green, GLuint blue, GLuint alpha); /* 37 */
+   void (GLAPIENTRYP Color4uiv)(const GLuint * v); /* 38 */
+   void (GLAPIENTRYP Color4us)(GLushort red, GLushort green, GLushort blue, GLushort alpha); /* 39 */
+   void (GLAPIENTRYP Color4usv)(const GLushort * v); /* 40 */
+   void (GLAPIENTRYP EdgeFlag)(GLboolean flag); /* 41 */
+   void (GLAPIENTRYP EdgeFlagv)(const GLboolean * flag); /* 42 */
+   void (GLAPIENTRYP End)(void); /* 43 */
+   void (GLAPIENTRYP Indexd)(GLdouble c); /* 44 */
+   void (GLAPIENTRYP Indexdv)(const GLdouble * c); /* 45 */
+   void (GLAPIENTRYP Indexf)(GLfloat c); /* 46 */
+   void (GLAPIENTRYP Indexfv)(const GLfloat * c); /* 47 */
+   void (GLAPIENTRYP Indexi)(GLint c); /* 48 */
+   void (GLAPIENTRYP Indexiv)(const GLint * c); /* 49 */
+   void (GLAPIENTRYP Indexs)(GLshort c); /* 50 */
+   void (GLAPIENTRYP Indexsv)(const GLshort * c); /* 51 */
+   void (GLAPIENTRYP Normal3b)(GLbyte nx, GLbyte ny, GLbyte nz); /* 52 */
+   void (GLAPIENTRYP Normal3bv)(const GLbyte * v); /* 53 */
+   void (GLAPIENTRYP Normal3d)(GLdouble nx, GLdouble ny, GLdouble nz); /* 54 */
+   void (GLAPIENTRYP Normal3dv)(const GLdouble * v); /* 55 */
+   void (GLAPIENTRYP Normal3f)(GLfloat nx, GLfloat ny, GLfloat nz); /* 56 */
+   void (GLAPIENTRYP Normal3fv)(const GLfloat * v); /* 57 */
+   void (GLAPIENTRYP Normal3i)(GLint nx, GLint ny, GLint nz); /* 58 */
+   void (GLAPIENTRYP Normal3iv)(const GLint * v); /* 59 */
+   void (GLAPIENTRYP Normal3s)(GLshort nx, GLshort ny, GLshort nz); /* 60 */
+   void (GLAPIENTRYP Normal3sv)(const GLshort * v); /* 61 */
+   void (GLAPIENTRYP RasterPos2d)(GLdouble x, GLdouble y); /* 62 */
+   void (GLAPIENTRYP RasterPos2dv)(const GLdouble * v); /* 63 */
+   void (GLAPIENTRYP RasterPos2f)(GLfloat x, GLfloat y); /* 64 */
+   void (GLAPIENTRYP RasterPos2fv)(const GLfloat * v); /* 65 */
+   void (GLAPIENTRYP RasterPos2i)(GLint x, GLint y); /* 66 */
+   void (GLAPIENTRYP RasterPos2iv)(const GLint * v); /* 67 */
+   void (GLAPIENTRYP RasterPos2s)(GLshort x, GLshort y); /* 68 */
+   void (GLAPIENTRYP RasterPos2sv)(const GLshort * v); /* 69 */
+   void (GLAPIENTRYP RasterPos3d)(GLdouble x, GLdouble y, GLdouble z); /* 70 */
+   void (GLAPIENTRYP RasterPos3dv)(const GLdouble * v); /* 71 */
+   void (GLAPIENTRYP RasterPos3f)(GLfloat x, GLfloat y, GLfloat z); /* 72 */
+   void (GLAPIENTRYP RasterPos3fv)(const GLfloat * v); /* 73 */
+   void (GLAPIENTRYP RasterPos3i)(GLint x, GLint y, GLint z); /* 74 */
+   void (GLAPIENTRYP RasterPos3iv)(const GLint * v); /* 75 */
+   void (GLAPIENTRYP RasterPos3s)(GLshort x, GLshort y, GLshort z); /* 76 */
+   void (GLAPIENTRYP RasterPos3sv)(const GLshort * v); /* 77 */
+   void (GLAPIENTRYP RasterPos4d)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 78 */
+   void (GLAPIENTRYP RasterPos4dv)(const GLdouble * v); /* 79 */
+   void (GLAPIENTRYP RasterPos4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 80 */
+   void (GLAPIENTRYP RasterPos4fv)(const GLfloat * v); /* 81 */
+   void (GLAPIENTRYP RasterPos4i)(GLint x, GLint y, GLint z, GLint w); /* 82 */
+   void (GLAPIENTRYP RasterPos4iv)(const GLint * v); /* 83 */
+   void (GLAPIENTRYP RasterPos4s)(GLshort x, GLshort y, GLshort z, GLshort w); /* 84 */
+   void (GLAPIENTRYP RasterPos4sv)(const GLshort * v); /* 85 */
+   void (GLAPIENTRYP Rectd)(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2); /* 86 */
+   void (GLAPIENTRYP Rectdv)(const GLdouble * v1, const GLdouble * v2); /* 87 */
+   void (GLAPIENTRYP Rectf)(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2); /* 88 */
+   void (GLAPIENTRYP Rectfv)(const GLfloat * v1, const GLfloat * v2); /* 89 */
+   void (GLAPIENTRYP Recti)(GLint x1, GLint y1, GLint x2, GLint y2); /* 90 */
+   void (GLAPIENTRYP Rectiv)(const GLint * v1, const GLint * v2); /* 91 */
+   void (GLAPIENTRYP Rects)(GLshort x1, GLshort y1, GLshort x2, GLshort y2); /* 92 */
+   void (GLAPIENTRYP Rectsv)(const GLshort * v1, const GLshort * v2); /* 93 */
+   void (GLAPIENTRYP TexCoord1d)(GLdouble s); /* 94 */
+   void (GLAPIENTRYP TexCoord1dv)(const GLdouble * v); /* 95 */
+   void (GLAPIENTRYP TexCoord1f)(GLfloat s); /* 96 */
+   void (GLAPIENTRYP TexCoord1fv)(const GLfloat * v); /* 97 */
+   void (GLAPIENTRYP TexCoord1i)(GLint s); /* 98 */
+   void (GLAPIENTRYP TexCoord1iv)(const GLint * v); /* 99 */
+   void (GLAPIENTRYP TexCoord1s)(GLshort s); /* 100 */
+   void (GLAPIENTRYP TexCoord1sv)(const GLshort * v); /* 101 */
+   void (GLAPIENTRYP TexCoord2d)(GLdouble s, GLdouble t); /* 102 */
+   void (GLAPIENTRYP TexCoord2dv)(const GLdouble * v); /* 103 */
+   void (GLAPIENTRYP TexCoord2f)(GLfloat s, GLfloat t); /* 104 */
+   void (GLAPIENTRYP TexCoord2fv)(const GLfloat * v); /* 105 */
+   void (GLAPIENTRYP TexCoord2i)(GLint s, GLint t); /* 106 */
+   void (GLAPIENTRYP TexCoord2iv)(const GLint * v); /* 107 */
+   void (GLAPIENTRYP TexCoord2s)(GLshort s, GLshort t); /* 108 */
+   void (GLAPIENTRYP TexCoord2sv)(const GLshort * v); /* 109 */
+   void (GLAPIENTRYP TexCoord3d)(GLdouble s, GLdouble t, GLdouble r); /* 110 */
+   void (GLAPIENTRYP TexCoord3dv)(const GLdouble * v); /* 111 */
+   void (GLAPIENTRYP TexCoord3f)(GLfloat s, GLfloat t, GLfloat r); /* 112 */
+   void (GLAPIENTRYP TexCoord3fv)(const GLfloat * v); /* 113 */
+   void (GLAPIENTRYP TexCoord3i)(GLint s, GLint t, GLint r); /* 114 */
+   void (GLAPIENTRYP TexCoord3iv)(const GLint * v); /* 115 */
+   void (GLAPIENTRYP TexCoord3s)(GLshort s, GLshort t, GLshort r); /* 116 */
+   void (GLAPIENTRYP TexCoord3sv)(const GLshort * v); /* 117 */
+   void (GLAPIENTRYP TexCoord4d)(GLdouble s, GLdouble t, GLdouble r, GLdouble q); /* 118 */
+   void (GLAPIENTRYP TexCoord4dv)(const GLdouble * v); /* 119 */
+   void (GLAPIENTRYP TexCoord4f)(GLfloat s, GLfloat t, GLfloat r, GLfloat q); /* 120 */
+   void (GLAPIENTRYP TexCoord4fv)(const GLfloat * v); /* 121 */
+   void (GLAPIENTRYP TexCoord4i)(GLint s, GLint t, GLint r, GLint q); /* 122 */
+   void (GLAPIENTRYP TexCoord4iv)(const GLint * v); /* 123 */
+   void (GLAPIENTRYP TexCoord4s)(GLshort s, GLshort t, GLshort r, GLshort q); /* 124 */
+   void (GLAPIENTRYP TexCoord4sv)(const GLshort * v); /* 125 */
+   void (GLAPIENTRYP Vertex2d)(GLdouble x, GLdouble y); /* 126 */
+   void (GLAPIENTRYP Vertex2dv)(const GLdouble * v); /* 127 */
+   void (GLAPIENTRYP Vertex2f)(GLfloat x, GLfloat y); /* 128 */
+   void (GLAPIENTRYP Vertex2fv)(const GLfloat * v); /* 129 */
+   void (GLAPIENTRYP Vertex2i)(GLint x, GLint y); /* 130 */
+   void (GLAPIENTRYP Vertex2iv)(const GLint * v); /* 131 */
+   void (GLAPIENTRYP Vertex2s)(GLshort x, GLshort y); /* 132 */
+   void (GLAPIENTRYP Vertex2sv)(const GLshort * v); /* 133 */
+   void (GLAPIENTRYP Vertex3d)(GLdouble x, GLdouble y, GLdouble z); /* 134 */
+   void (GLAPIENTRYP Vertex3dv)(const GLdouble * v); /* 135 */
+   void (GLAPIENTRYP Vertex3f)(GLfloat x, GLfloat y, GLfloat z); /* 136 */
+   void (GLAPIENTRYP Vertex3fv)(const GLfloat * v); /* 137 */
+   void (GLAPIENTRYP Vertex3i)(GLint x, GLint y, GLint z); /* 138 */
+   void (GLAPIENTRYP Vertex3iv)(const GLint * v); /* 139 */
+   void (GLAPIENTRYP Vertex3s)(GLshort x, GLshort y, GLshort z); /* 140 */
+   void (GLAPIENTRYP Vertex3sv)(const GLshort * v); /* 141 */
+   void (GLAPIENTRYP Vertex4d)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 142 */
+   void (GLAPIENTRYP Vertex4dv)(const GLdouble * v); /* 143 */
+   void (GLAPIENTRYP Vertex4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 144 */
+   void (GLAPIENTRYP Vertex4fv)(const GLfloat * v); /* 145 */
+   void (GLAPIENTRYP Vertex4i)(GLint x, GLint y, GLint z, GLint w); /* 146 */
+   void (GLAPIENTRYP Vertex4iv)(const GLint * v); /* 147 */
+   void (GLAPIENTRYP Vertex4s)(GLshort x, GLshort y, GLshort z, GLshort w); /* 148 */
+   void (GLAPIENTRYP Vertex4sv)(const GLshort * v); /* 149 */
+   void (GLAPIENTRYP ClipPlane)(GLenum plane, const GLdouble * equation); /* 150 */
+   void (GLAPIENTRYP ColorMaterial)(GLenum face, GLenum mode); /* 151 */
+   void (GLAPIENTRYP CullFace)(GLenum mode); /* 152 */
+   void (GLAPIENTRYP Fogf)(GLenum pname, GLfloat param); /* 153 */
+   void (GLAPIENTRYP Fogfv)(GLenum pname, const GLfloat * params); /* 154 */
+   void (GLAPIENTRYP Fogi)(GLenum pname, GLint param); /* 155 */
+   void (GLAPIENTRYP Fogiv)(GLenum pname, const GLint * params); /* 156 */
+   void (GLAPIENTRYP FrontFace)(GLenum mode); /* 157 */
+   void (GLAPIENTRYP Hint)(GLenum target, GLenum mode); /* 158 */
+   void (GLAPIENTRYP Lightf)(GLenum light, GLenum pname, GLfloat param); /* 159 */
+   void (GLAPIENTRYP Lightfv)(GLenum light, GLenum pname, const GLfloat * params); /* 160 */
+   void (GLAPIENTRYP Lighti)(GLenum light, GLenum pname, GLint param); /* 161 */
+   void (GLAPIENTRYP Lightiv)(GLenum light, GLenum pname, const GLint * params); /* 162 */
+   void (GLAPIENTRYP LightModelf)(GLenum pname, GLfloat param); /* 163 */
+   void (GLAPIENTRYP LightModelfv)(GLenum pname, const GLfloat * params); /* 164 */
+   void (GLAPIENTRYP LightModeli)(GLenum pname, GLint param); /* 165 */
+   void (GLAPIENTRYP LightModeliv)(GLenum pname, const GLint * params); /* 166 */
+   void (GLAPIENTRYP LineStipple)(GLint factor, GLushort pattern); /* 167 */
+   void (GLAPIENTRYP LineWidth)(GLfloat width); /* 168 */
+   void (GLAPIENTRYP Materialf)(GLenum face, GLenum pname, GLfloat param); /* 169 */
+   void (GLAPIENTRYP Materialfv)(GLenum face, GLenum pname, const GLfloat * params); /* 170 */
+   void (GLAPIENTRYP Materiali)(GLenum face, GLenum pname, GLint param); /* 171 */
+   void (GLAPIENTRYP Materialiv)(GLenum face, GLenum pname, const GLint * params); /* 172 */
+   void (GLAPIENTRYP PointSize)(GLfloat size); /* 173 */
+   void (GLAPIENTRYP PolygonMode)(GLenum face, GLenum mode); /* 174 */
+   void (GLAPIENTRYP PolygonStipple)(const GLubyte * mask); /* 175 */
+   void (GLAPIENTRYP Scissor)(GLint x, GLint y, GLsizei width, GLsizei height); /* 176 */
+   void (GLAPIENTRYP ShadeModel)(GLenum mode); /* 177 */
+   void (GLAPIENTRYP TexParameterf)(GLenum target, GLenum pname, GLfloat param); /* 178 */
+   void (GLAPIENTRYP TexParameterfv)(GLenum target, GLenum pname, const GLfloat * params); /* 179 */
+   void (GLAPIENTRYP TexParameteri)(GLenum target, GLenum pname, GLint param); /* 180 */
+   void (GLAPIENTRYP TexParameteriv)(GLenum target, GLenum pname, const GLint * params); /* 181 */
+   void (GLAPIENTRYP TexImage1D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid * pixels); /* 182 */
+   void (GLAPIENTRYP TexImage2D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid * pixels); /* 183 */
+   void (GLAPIENTRYP TexEnvf)(GLenum target, GLenum pname, GLfloat param); /* 184 */
+   void (GLAPIENTRYP TexEnvfv)(GLenum target, GLenum pname, const GLfloat * params); /* 185 */
+   void (GLAPIENTRYP TexEnvi)(GLenum target, GLenum pname, GLint param); /* 186 */
+   void (GLAPIENTRYP TexEnviv)(GLenum target, GLenum pname, const GLint * params); /* 187 */
+   void (GLAPIENTRYP TexGend)(GLenum coord, GLenum pname, GLdouble param); /* 188 */
+   void (GLAPIENTRYP TexGendv)(GLenum coord, GLenum pname, const GLdouble * params); /* 189 */
+   void (GLAPIENTRYP TexGenf)(GLenum coord, GLenum pname, GLfloat param); /* 190 */
+   void (GLAPIENTRYP TexGenfv)(GLenum coord, GLenum pname, const GLfloat * params); /* 191 */
+   void (GLAPIENTRYP TexGeni)(GLenum coord, GLenum pname, GLint param); /* 192 */
+   void (GLAPIENTRYP TexGeniv)(GLenum coord, GLenum pname, const GLint * params); /* 193 */
+   void (GLAPIENTRYP FeedbackBuffer)(GLsizei size, GLenum type, GLfloat * buffer); /* 194 */
+   void (GLAPIENTRYP SelectBuffer)(GLsizei size, GLuint * buffer); /* 195 */
+   GLint (GLAPIENTRYP RenderMode)(GLenum mode); /* 196 */
+   void (GLAPIENTRYP InitNames)(void); /* 197 */
+   void (GLAPIENTRYP LoadName)(GLuint name); /* 198 */
+   void (GLAPIENTRYP PassThrough)(GLfloat token); /* 199 */
+   void (GLAPIENTRYP PopName)(void); /* 200 */
+   void (GLAPIENTRYP PushName)(GLuint name); /* 201 */
+   void (GLAPIENTRYP DrawBuffer)(GLenum mode); /* 202 */
+   void (GLAPIENTRYP Clear)(GLbitfield mask); /* 203 */
+   void (GLAPIENTRYP ClearAccum)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); /* 204 */
+   void (GLAPIENTRYP ClearIndex)(GLfloat c); /* 205 */
+   void (GLAPIENTRYP ClearColor)(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); /* 206 */
+   void (GLAPIENTRYP ClearStencil)(GLint s); /* 207 */
+   void (GLAPIENTRYP ClearDepth)(GLclampd depth); /* 208 */
+   void (GLAPIENTRYP StencilMask)(GLuint mask); /* 209 */
+   void (GLAPIENTRYP ColorMask)(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); /* 210 */
+   void (GLAPIENTRYP DepthMask)(GLboolean flag); /* 211 */
+   void (GLAPIENTRYP IndexMask)(GLuint mask); /* 212 */
+   void (GLAPIENTRYP Accum)(GLenum op, GLfloat value); /* 213 */
+   void (GLAPIENTRYP Disable)(GLenum cap); /* 214 */
+   void (GLAPIENTRYP Enable)(GLenum cap); /* 215 */
+   void (GLAPIENTRYP Finish)(void); /* 216 */
+   void (GLAPIENTRYP Flush)(void); /* 217 */
+   void (GLAPIENTRYP PopAttrib)(void); /* 218 */
+   void (GLAPIENTRYP PushAttrib)(GLbitfield mask); /* 219 */
+   void (GLAPIENTRYP Map1d)(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble * points); /* 220 */
+   void (GLAPIENTRYP Map1f)(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat * points); /* 221 */
+   void (GLAPIENTRYP Map2d)(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble * points); /* 222 */
+   void (GLAPIENTRYP Map2f)(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat * points); /* 223 */
+   void (GLAPIENTRYP MapGrid1d)(GLint un, GLdouble u1, GLdouble u2); /* 224 */
+   void (GLAPIENTRYP MapGrid1f)(GLint un, GLfloat u1, GLfloat u2); /* 225 */
+   void (GLAPIENTRYP MapGrid2d)(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2); /* 226 */
+   void (GLAPIENTRYP MapGrid2f)(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2); /* 227 */
+   void (GLAPIENTRYP EvalCoord1d)(GLdouble u); /* 228 */
+   void (GLAPIENTRYP EvalCoord1dv)(const GLdouble * u); /* 229 */
+   void (GLAPIENTRYP EvalCoord1f)(GLfloat u); /* 230 */
+   void (GLAPIENTRYP EvalCoord1fv)(const GLfloat * u); /* 231 */
+   void (GLAPIENTRYP EvalCoord2d)(GLdouble u, GLdouble v); /* 232 */
+   void (GLAPIENTRYP EvalCoord2dv)(const GLdouble * u); /* 233 */
+   void (GLAPIENTRYP EvalCoord2f)(GLfloat u, GLfloat v); /* 234 */
+   void (GLAPIENTRYP EvalCoord2fv)(const GLfloat * u); /* 235 */
+   void (GLAPIENTRYP EvalMesh1)(GLenum mode, GLint i1, GLint i2); /* 236 */
+   void (GLAPIENTRYP EvalPoint1)(GLint i); /* 237 */
+   void (GLAPIENTRYP EvalMesh2)(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2); /* 238 */
+   void (GLAPIENTRYP EvalPoint2)(GLint i, GLint j); /* 239 */
+   void (GLAPIENTRYP AlphaFunc)(GLenum func, GLclampf ref); /* 240 */
+   void (GLAPIENTRYP BlendFunc)(GLenum sfactor, GLenum dfactor); /* 241 */
+   void (GLAPIENTRYP LogicOp)(GLenum opcode); /* 242 */
+   void (GLAPIENTRYP StencilFunc)(GLenum func, GLint ref, GLuint mask); /* 243 */
+   void (GLAPIENTRYP StencilOp)(GLenum fail, GLenum zfail, GLenum zpass); /* 244 */
+   void (GLAPIENTRYP DepthFunc)(GLenum func); /* 245 */
+   void (GLAPIENTRYP PixelZoom)(GLfloat xfactor, GLfloat yfactor); /* 246 */
+   void (GLAPIENTRYP PixelTransferf)(GLenum pname, GLfloat param); /* 247 */
+   void (GLAPIENTRYP PixelTransferi)(GLenum pname, GLint param); /* 248 */
+   void (GLAPIENTRYP PixelStoref)(GLenum pname, GLfloat param); /* 249 */
+   void (GLAPIENTRYP PixelStorei)(GLenum pname, GLint param); /* 250 */
+   void (GLAPIENTRYP PixelMapfv)(GLenum map, GLsizei mapsize, const GLfloat * values); /* 251 */
+   void (GLAPIENTRYP PixelMapuiv)(GLenum map, GLsizei mapsize, const GLuint * values); /* 252 */
+   void (GLAPIENTRYP PixelMapusv)(GLenum map, GLsizei mapsize, const GLushort * values); /* 253 */
+   void (GLAPIENTRYP ReadBuffer)(GLenum mode); /* 254 */
+   void (GLAPIENTRYP CopyPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type); /* 255 */
+   void (GLAPIENTRYP ReadPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid * pixels); /* 256 */
+   void (GLAPIENTRYP DrawPixels)(GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * pixels); /* 257 */
+   void (GLAPIENTRYP GetBooleanv)(GLenum pname, GLboolean * params); /* 258 */
+   void (GLAPIENTRYP GetClipPlane)(GLenum plane, GLdouble * equation); /* 259 */
+   void (GLAPIENTRYP GetDoublev)(GLenum pname, GLdouble * params); /* 260 */
+   GLenum (GLAPIENTRYP GetError)(void); /* 261 */
+   void (GLAPIENTRYP GetFloatv)(GLenum pname, GLfloat * params); /* 262 */
+   void (GLAPIENTRYP GetIntegerv)(GLenum pname, GLint * params); /* 263 */
+   void (GLAPIENTRYP GetLightfv)(GLenum light, GLenum pname, GLfloat * params); /* 264 */
+   void (GLAPIENTRYP GetLightiv)(GLenum light, GLenum pname, GLint * params); /* 265 */
+   void (GLAPIENTRYP GetMapdv)(GLenum target, GLenum query, GLdouble * v); /* 266 */
+   void (GLAPIENTRYP GetMapfv)(GLenum target, GLenum query, GLfloat * v); /* 267 */
+   void (GLAPIENTRYP GetMapiv)(GLenum target, GLenum query, GLint * v); /* 268 */
+   void (GLAPIENTRYP GetMaterialfv)(GLenum face, GLenum pname, GLfloat * params); /* 269 */
+   void (GLAPIENTRYP GetMaterialiv)(GLenum face, GLenum pname, GLint * params); /* 270 */
+   void (GLAPIENTRYP GetPixelMapfv)(GLenum map, GLfloat * values); /* 271 */
+   void (GLAPIENTRYP GetPixelMapuiv)(GLenum map, GLuint * values); /* 272 */
+   void (GLAPIENTRYP GetPixelMapusv)(GLenum map, GLushort * values); /* 273 */
+   void (GLAPIENTRYP GetPolygonStipple)(GLubyte * mask); /* 274 */
+   const GLubyte * (GLAPIENTRYP GetString)(GLenum name); /* 275 */
+   void (GLAPIENTRYP GetTexEnvfv)(GLenum target, GLenum pname, GLfloat * params); /* 276 */
+   void (GLAPIENTRYP GetTexEnviv)(GLenum target, GLenum pname, GLint * params); /* 277 */
+   void (GLAPIENTRYP GetTexGendv)(GLenum coord, GLenum pname, GLdouble * params); /* 278 */
+   void (GLAPIENTRYP GetTexGenfv)(GLenum coord, GLenum pname, GLfloat * params); /* 279 */
+   void (GLAPIENTRYP GetTexGeniv)(GLenum coord, GLenum pname, GLint * params); /* 280 */
+   void (GLAPIENTRYP GetTexImage)(GLenum target, GLint level, GLenum format, GLenum type, GLvoid * pixels); /* 281 */
+   void (GLAPIENTRYP GetTexParameterfv)(GLenum target, GLenum pname, GLfloat * params); /* 282 */
+   void (GLAPIENTRYP GetTexParameteriv)(GLenum target, GLenum pname, GLint * params); /* 283 */
+   void (GLAPIENTRYP GetTexLevelParameterfv)(GLenum target, GLint level, GLenum pname, GLfloat * params); /* 284 */
+   void (GLAPIENTRYP GetTexLevelParameteriv)(GLenum target, GLint level, GLenum pname, GLint * params); /* 285 */
+   GLboolean (GLAPIENTRYP IsEnabled)(GLenum cap); /* 286 */
+   GLboolean (GLAPIENTRYP IsList)(GLuint list); /* 287 */
+   void (GLAPIENTRYP DepthRange)(GLclampd zNear, GLclampd zFar); /* 288 */
+   void (GLAPIENTRYP Frustum)(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); /* 289 */
+   void (GLAPIENTRYP LoadIdentity)(void); /* 290 */
+   void (GLAPIENTRYP LoadMatrixf)(const GLfloat * m); /* 291 */
+   void (GLAPIENTRYP LoadMatrixd)(const GLdouble * m); /* 292 */
+   void (GLAPIENTRYP MatrixMode)(GLenum mode); /* 293 */
+   void (GLAPIENTRYP MultMatrixf)(const GLfloat * m); /* 294 */
+   void (GLAPIENTRYP MultMatrixd)(const GLdouble * m); /* 295 */
+   void (GLAPIENTRYP Ortho)(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); /* 296 */
+   void (GLAPIENTRYP PopMatrix)(void); /* 297 */
+   void (GLAPIENTRYP PushMatrix)(void); /* 298 */
+   void (GLAPIENTRYP Rotated)(GLdouble angle, GLdouble x, GLdouble y, GLdouble z); /* 299 */
+   void (GLAPIENTRYP Rotatef)(GLfloat angle, GLfloat x, GLfloat y, GLfloat z); /* 300 */
+   void (GLAPIENTRYP Scaled)(GLdouble x, GLdouble y, GLdouble z); /* 301 */
+   void (GLAPIENTRYP Scalef)(GLfloat x, GLfloat y, GLfloat z); /* 302 */
+   void (GLAPIENTRYP Translated)(GLdouble x, GLdouble y, GLdouble z); /* 303 */
+   void (GLAPIENTRYP Translatef)(GLfloat x, GLfloat y, GLfloat z); /* 304 */
+   void (GLAPIENTRYP Viewport)(GLint x, GLint y, GLsizei width, GLsizei height); /* 305 */
+   void (GLAPIENTRYP ArrayElement)(GLint i); /* 306 */
+   void (GLAPIENTRYP BindTexture)(GLenum target, GLuint texture); /* 307 */
+   void (GLAPIENTRYP ColorPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 308 */
+   void (GLAPIENTRYP DisableClientState)(GLenum array); /* 309 */
+   void (GLAPIENTRYP DrawArrays)(GLenum mode, GLint first, GLsizei count); /* 310 */
+   void (GLAPIENTRYP DrawElements)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices); /* 311 */
+   void (GLAPIENTRYP EdgeFlagPointer)(GLsizei stride, const GLvoid * pointer); /* 312 */
+   void (GLAPIENTRYP EnableClientState)(GLenum array); /* 313 */
+   void (GLAPIENTRYP IndexPointer)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 314 */
+   void (GLAPIENTRYP Indexub)(GLubyte c); /* 315 */
+   void (GLAPIENTRYP Indexubv)(const GLubyte * c); /* 316 */
+   void (GLAPIENTRYP InterleavedArrays)(GLenum format, GLsizei stride, const GLvoid * pointer); /* 317 */
+   void (GLAPIENTRYP NormalPointer)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 318 */
+   void (GLAPIENTRYP PolygonOffset)(GLfloat factor, GLfloat units); /* 319 */
+   void (GLAPIENTRYP TexCoordPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 320 */
+   void (GLAPIENTRYP VertexPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 321 */
+   GLboolean (GLAPIENTRYP AreTexturesResident)(GLsizei n, const GLuint * textures, GLboolean * residences); /* 322 */
+   void (GLAPIENTRYP CopyTexImage1D)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); /* 323 */
+   void (GLAPIENTRYP CopyTexImage2D)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); /* 324 */
+   void (GLAPIENTRYP CopyTexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); /* 325 */
+   void (GLAPIENTRYP CopyTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); /* 326 */
+   void (GLAPIENTRYP DeleteTextures)(GLsizei n, const GLuint * textures); /* 327 */
+   void (GLAPIENTRYP GenTextures)(GLsizei n, GLuint * textures); /* 328 */
+   void (GLAPIENTRYP GetPointerv)(GLenum pname, GLvoid ** params); /* 329 */
+   GLboolean (GLAPIENTRYP IsTexture)(GLuint texture); /* 330 */
+   void (GLAPIENTRYP PrioritizeTextures)(GLsizei n, const GLuint * textures, const GLclampf * priorities); /* 331 */
+   void (GLAPIENTRYP TexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid * pixels); /* 332 */
+   void (GLAPIENTRYP TexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * pixels); /* 333 */
+   void (GLAPIENTRYP PopClientAttrib)(void); /* 334 */
+   void (GLAPIENTRYP PushClientAttrib)(GLbitfield mask); /* 335 */
+   void (GLAPIENTRYP BlendColor)(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); /* 336 */
+   void (GLAPIENTRYP BlendEquation)(GLenum mode); /* 337 */
+   void (GLAPIENTRYP DrawRangeElements)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid * indices); /* 338 */
+   void (GLAPIENTRYP ColorTable)(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid * table); /* 339 */
+   void (GLAPIENTRYP ColorTableParameterfv)(GLenum target, GLenum pname, const GLfloat * params); /* 340 */
+   void (GLAPIENTRYP ColorTableParameteriv)(GLenum target, GLenum pname, const GLint * params); /* 341 */
+   void (GLAPIENTRYP CopyColorTable)(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); /* 342 */
+   void (GLAPIENTRYP GetColorTable)(GLenum target, GLenum format, GLenum type, GLvoid * table); /* 343 */
+   void (GLAPIENTRYP GetColorTableParameterfv)(GLenum target, GLenum pname, GLfloat * params); /* 344 */
+   void (GLAPIENTRYP GetColorTableParameteriv)(GLenum target, GLenum pname, GLint * params); /* 345 */
+   void (GLAPIENTRYP ColorSubTable)(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid * data); /* 346 */
+   void (GLAPIENTRYP CopyColorSubTable)(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width); /* 347 */
+   void (GLAPIENTRYP ConvolutionFilter1D)(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid * image); /* 348 */
+   void (GLAPIENTRYP ConvolutionFilter2D)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * image); /* 349 */
+   void (GLAPIENTRYP ConvolutionParameterf)(GLenum target, GLenum pname, GLfloat params); /* 350 */
+   void (GLAPIENTRYP ConvolutionParameterfv)(GLenum target, GLenum pname, const GLfloat * params); /* 351 */
+   void (GLAPIENTRYP ConvolutionParameteri)(GLenum target, GLenum pname, GLint params); /* 352 */
+   void (GLAPIENTRYP ConvolutionParameteriv)(GLenum target, GLenum pname, const GLint * params); /* 353 */
+   void (GLAPIENTRYP CopyConvolutionFilter1D)(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); /* 354 */
+   void (GLAPIENTRYP CopyConvolutionFilter2D)(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height); /* 355 */
+   void (GLAPIENTRYP GetConvolutionFilter)(GLenum target, GLenum format, GLenum type, GLvoid * image); /* 356 */
+   void (GLAPIENTRYP GetConvolutionParameterfv)(GLenum target, GLenum pname, GLfloat * params); /* 357 */
+   void (GLAPIENTRYP GetConvolutionParameteriv)(GLenum target, GLenum pname, GLint * params); /* 358 */
+   void (GLAPIENTRYP GetSeparableFilter)(GLenum target, GLenum format, GLenum type, GLvoid * row, GLvoid * column, GLvoid * span); /* 359 */
+   void (GLAPIENTRYP SeparableFilter2D)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * row, const GLvoid * column); /* 360 */
+   void (GLAPIENTRYP GetHistogram)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values); /* 361 */
+   void (GLAPIENTRYP GetHistogramParameterfv)(GLenum target, GLenum pname, GLfloat * params); /* 362 */
+   void (GLAPIENTRYP GetHistogramParameteriv)(GLenum target, GLenum pname, GLint * params); /* 363 */
+   void (GLAPIENTRYP GetMinmax)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values); /* 364 */
+   void (GLAPIENTRYP GetMinmaxParameterfv)(GLenum target, GLenum pname, GLfloat * params); /* 365 */
+   void (GLAPIENTRYP GetMinmaxParameteriv)(GLenum target, GLenum pname, GLint * params); /* 366 */
+   void (GLAPIENTRYP Histogram)(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink); /* 367 */
+   void (GLAPIENTRYP Minmax)(GLenum target, GLenum internalformat, GLboolean sink); /* 368 */
+   void (GLAPIENTRYP ResetHistogram)(GLenum target); /* 369 */
+   void (GLAPIENTRYP ResetMinmax)(GLenum target); /* 370 */
+   void (GLAPIENTRYP TexImage3D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid * pixels); /* 371 */
+   void (GLAPIENTRYP TexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid * pixels); /* 372 */
+   void (GLAPIENTRYP CopyTexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); /* 373 */
+   void (GLAPIENTRYP ActiveTextureARB)(GLenum texture); /* 374 */
+   void (GLAPIENTRYP ClientActiveTextureARB)(GLenum texture); /* 375 */
+   void (GLAPIENTRYP MultiTexCoord1dARB)(GLenum target, GLdouble s); /* 376 */
+   void (GLAPIENTRYP MultiTexCoord1dvARB)(GLenum target, const GLdouble * v); /* 377 */
+   void (GLAPIENTRYP MultiTexCoord1fARB)(GLenum target, GLfloat s); /* 378 */
+   void (GLAPIENTRYP MultiTexCoord1fvARB)(GLenum target, const GLfloat * v); /* 379 */
+   void (GLAPIENTRYP MultiTexCoord1iARB)(GLenum target, GLint s); /* 380 */
+   void (GLAPIENTRYP MultiTexCoord1ivARB)(GLenum target, const GLint * v); /* 381 */
+   void (GLAPIENTRYP MultiTexCoord1sARB)(GLenum target, GLshort s); /* 382 */
+   void (GLAPIENTRYP MultiTexCoord1svARB)(GLenum target, const GLshort * v); /* 383 */
+   void (GLAPIENTRYP MultiTexCoord2dARB)(GLenum target, GLdouble s, GLdouble t); /* 384 */
+   void (GLAPIENTRYP MultiTexCoord2dvARB)(GLenum target, const GLdouble * v); /* 385 */
+   void (GLAPIENTRYP MultiTexCoord2fARB)(GLenum target, GLfloat s, GLfloat t); /* 386 */
+   void (GLAPIENTRYP MultiTexCoord2fvARB)(GLenum target, const GLfloat * v); /* 387 */
+   void (GLAPIENTRYP MultiTexCoord2iARB)(GLenum target, GLint s, GLint t); /* 388 */
+   void (GLAPIENTRYP MultiTexCoord2ivARB)(GLenum target, const GLint * v); /* 389 */
+   void (GLAPIENTRYP MultiTexCoord2sARB)(GLenum target, GLshort s, GLshort t); /* 390 */
+   void (GLAPIENTRYP MultiTexCoord2svARB)(GLenum target, const GLshort * v); /* 391 */
+   void (GLAPIENTRYP MultiTexCoord3dARB)(GLenum target, GLdouble s, GLdouble t, GLdouble r); /* 392 */
+   void (GLAPIENTRYP MultiTexCoord3dvARB)(GLenum target, const GLdouble * v); /* 393 */
+   void (GLAPIENTRYP MultiTexCoord3fARB)(GLenum target, GLfloat s, GLfloat t, GLfloat r); /* 394 */
+   void (GLAPIENTRYP MultiTexCoord3fvARB)(GLenum target, const GLfloat * v); /* 395 */
+   void (GLAPIENTRYP MultiTexCoord3iARB)(GLenum target, GLint s, GLint t, GLint r); /* 396 */
+   void (GLAPIENTRYP MultiTexCoord3ivARB)(GLenum target, const GLint * v); /* 397 */
+   void (GLAPIENTRYP MultiTexCoord3sARB)(GLenum target, GLshort s, GLshort t, GLshort r); /* 398 */
+   void (GLAPIENTRYP MultiTexCoord3svARB)(GLenum target, const GLshort * v); /* 399 */
+   void (GLAPIENTRYP MultiTexCoord4dARB)(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); /* 400 */
+   void (GLAPIENTRYP MultiTexCoord4dvARB)(GLenum target, const GLdouble * v); /* 401 */
+   void (GLAPIENTRYP MultiTexCoord4fARB)(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); /* 402 */
+   void (GLAPIENTRYP MultiTexCoord4fvARB)(GLenum target, const GLfloat * v); /* 403 */
+   void (GLAPIENTRYP MultiTexCoord4iARB)(GLenum target, GLint s, GLint t, GLint r, GLint q); /* 404 */
+   void (GLAPIENTRYP MultiTexCoord4ivARB)(GLenum target, const GLint * v); /* 405 */
+   void (GLAPIENTRYP MultiTexCoord4sARB)(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); /* 406 */
+   void (GLAPIENTRYP MultiTexCoord4svARB)(GLenum target, const GLshort * v); /* 407 */
+   void (GLAPIENTRYP LoadTransposeMatrixfARB)(const GLfloat * m); /* 408 */
+   void (GLAPIENTRYP LoadTransposeMatrixdARB)(const GLdouble * m); /* 409 */
+   void (GLAPIENTRYP MultTransposeMatrixfARB)(const GLfloat * m); /* 410 */
+   void (GLAPIENTRYP MultTransposeMatrixdARB)(const GLdouble * m); /* 411 */
+   void (GLAPIENTRYP SampleCoverageARB)(GLclampf value, GLboolean invert); /* 412 */
+   void (GLAPIENTRYP __unused413)(void); /* 413 */
+   void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 414 */
+   void (GLAPIENTRYP GetTexFilterFuncSGIS)(GLenum target, GLenum filter, GLfloat * weights); /* 415 */
+   void (GLAPIENTRYP TexFilterFuncSGIS)(GLenum target, GLenum filter, GLsizei n, const GLfloat * weights); /* 416 */
+   void (GLAPIENTRYP GetHistogramEXT)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values); /* 417 */
+   void (GLAPIENTRYP GetHistogramParameterfvEXT)(GLenum target, GLenum pname, GLfloat * params); /* 418 */
+   void (GLAPIENTRYP GetHistogramParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 419 */
+   void (GLAPIENTRYP GetMinmaxEXT)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values); /* 420 */
+   void (GLAPIENTRYP GetMinmaxParameterfvEXT)(GLenum target, GLenum pname, GLfloat * params); /* 421 */
+   void (GLAPIENTRYP GetMinmaxParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 422 */
+   void (GLAPIENTRYP GetConvolutionFilterEXT)(GLenum target, GLenum format, GLenum type, GLvoid * image); /* 423 */
+   void (GLAPIENTRYP GetConvolutionParameterfvEXT)(GLenum target, GLenum pname, GLfloat * params); /* 424 */
+   void (GLAPIENTRYP GetConvolutionParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 425 */
+   void (GLAPIENTRYP GetSeparableFilterEXT)(GLenum target, GLenum format, GLenum type, GLvoid * row, GLvoid * column, GLvoid * span); /* 426 */
+   void (GLAPIENTRYP GetColorTableSGI)(GLenum target, GLenum format, GLenum type, GLvoid * table); /* 427 */
+   void (GLAPIENTRYP GetColorTableParameterfvSGI)(GLenum target, GLenum pname, GLfloat * params); /* 428 */
+   void (GLAPIENTRYP GetColorTableParameterivSGI)(GLenum target, GLenum pname, GLint * params); /* 429 */
+   void (GLAPIENTRYP PixelTexGenSGIX)(GLenum mode); /* 430 */
+   void (GLAPIENTRYP PixelTexGenParameteriSGIS)(GLenum pname, GLint param); /* 431 */
+   void (GLAPIENTRYP PixelTexGenParameterivSGIS)(GLenum pname, const GLint * params); /* 432 */
+   void (GLAPIENTRYP PixelTexGenParameterfSGIS)(GLenum pname, GLfloat param); /* 433 */
+   void (GLAPIENTRYP PixelTexGenParameterfvSGIS)(GLenum pname, const GLfloat * params); /* 434 */
+   void (GLAPIENTRYP GetPixelTexGenParameterivSGIS)(GLenum pname, GLint * params); /* 435 */
+   void (GLAPIENTRYP GetPixelTexGenParameterfvSGIS)(GLenum pname, GLfloat * params); /* 436 */
+   void (GLAPIENTRYP TexImage4DSGIS)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid * pixels); /* 437 */
+   void (GLAPIENTRYP TexSubImage4DSGIS)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid * pixels); /* 438 */
+   GLboolean (GLAPIENTRYP AreTexturesResidentEXT)(GLsizei n, const GLuint * textures, GLboolean * residences); /* 439 */
+   void (GLAPIENTRYP GenTexturesEXT)(GLsizei n, GLuint * textures); /* 440 */
+   GLboolean (GLAPIENTRYP IsTextureEXT)(GLuint texture); /* 441 */
+   void (GLAPIENTRYP DetailTexFuncSGIS)(GLenum target, GLsizei n, const GLfloat * points); /* 442 */
+   void (GLAPIENTRYP GetDetailTexFuncSGIS)(GLenum target, GLfloat * points); /* 443 */
+   void (GLAPIENTRYP SharpenTexFuncSGIS)(GLenum target, GLsizei n, const GLfloat * points); /* 444 */
+   void (GLAPIENTRYP GetSharpenTexFuncSGIS)(GLenum target, GLfloat * points); /* 445 */
+   void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 446 */
+   void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 447 */
+   void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 448 */
+   void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 449 */
+   void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 450 */
+   void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 451 */
+   void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 452 */
+   void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 453 */
+   void (GLAPIENTRYP SpriteParameterfSGIX)(GLenum pname, GLfloat param); /* 454 */
+   void (GLAPIENTRYP SpriteParameterfvSGIX)(GLenum pname, const GLfloat * params); /* 455 */
+   void (GLAPIENTRYP SpriteParameteriSGIX)(GLenum pname, GLint param); /* 456 */
+   void (GLAPIENTRYP SpriteParameterivSGIX)(GLenum pname, const GLint * params); /* 457 */
+   void (GLAPIENTRYP PointParameterfEXT)(GLenum pname, GLfloat param); /* 458 */
+   void (GLAPIENTRYP PointParameterfvEXT)(GLenum pname, const GLfloat * params); /* 459 */
+   GLint (GLAPIENTRYP GetInstrumentsSGIX)(void); /* 460 */
+   void (GLAPIENTRYP InstrumentsBufferSGIX)(GLsizei size, GLint * buffer); /* 461 */
+   GLint (GLAPIENTRYP PollInstrumentsSGIX)(GLint * marker_p); /* 462 */
+   void (GLAPIENTRYP ReadInstrumentsSGIX)(GLint marker); /* 463 */
+   void (GLAPIENTRYP StartInstrumentsSGIX)(void); /* 464 */
+   void (GLAPIENTRYP StopInstrumentsSGIX)(GLint marker); /* 465 */
+   void (GLAPIENTRYP FrameZoomSGIX)(GLint factor); /* 466 */
+   void (GLAPIENTRYP TagSampleBufferSGIX)(void); /* 467 */
+   void (GLAPIENTRYP ReferencePlaneSGIX)(const GLdouble * equation); /* 468 */
+   void (GLAPIENTRYP FlushRasterSGIX)(void); /* 469 */
+   void (GLAPIENTRYP GetListParameterfvSGIX)(GLuint list, GLenum pname, GLfloat * params); /* 470 */
+   void (GLAPIENTRYP GetListParameterivSGIX)(GLuint list, GLenum pname, GLint * params); /* 471 */
+   void (GLAPIENTRYP ListParameterfSGIX)(GLuint list, GLenum pname, GLfloat param); /* 472 */
+   void (GLAPIENTRYP ListParameterfvSGIX)(GLuint list, GLenum pname, const GLfloat * params); /* 473 */
+   void (GLAPIENTRYP ListParameteriSGIX)(GLuint list, GLenum pname, GLint param); /* 474 */
+   void (GLAPIENTRYP ListParameterivSGIX)(GLuint list, GLenum pname, const GLint * params); /* 475 */
+   void (GLAPIENTRYP FragmentColorMaterialSGIX)(GLenum face, GLenum mode); /* 476 */
+   void (GLAPIENTRYP FragmentLightfSGIX)(GLenum light, GLenum pname, GLfloat param); /* 477 */
+   void (GLAPIENTRYP FragmentLightfvSGIX)(GLenum light, GLenum pname, const GLfloat * params); /* 478 */
+   void (GLAPIENTRYP FragmentLightiSGIX)(GLenum light, GLenum pname, GLint param); /* 479 */
+   void (GLAPIENTRYP FragmentLightivSGIX)(GLenum light, GLenum pname, const GLint * params); /* 480 */
+   void (GLAPIENTRYP FragmentLightModelfSGIX)(GLenum pname, GLfloat param); /* 481 */
+   void (GLAPIENTRYP FragmentLightModelfvSGIX)(GLenum pname, const GLfloat * params); /* 482 */
+   void (GLAPIENTRYP FragmentLightModeliSGIX)(GLenum pname, GLint param); /* 483 */
+   void (GLAPIENTRYP FragmentLightModelivSGIX)(GLenum pname, const GLint * params); /* 484 */
+   void (GLAPIENTRYP FragmentMaterialfSGIX)(GLenum face, GLenum pname, GLfloat param); /* 485 */
+   void (GLAPIENTRYP FragmentMaterialfvSGIX)(GLenum face, GLenum pname, const GLfloat * params); /* 486 */
+   void (GLAPIENTRYP FragmentMaterialiSGIX)(GLenum face, GLenum pname, GLint param); /* 487 */
+   void (GLAPIENTRYP FragmentMaterialivSGIX)(GLenum face, GLenum pname, const GLint * params); /* 488 */
+   void (GLAPIENTRYP GetFragmentLightfvSGIX)(GLenum light, GLenum pname, GLfloat * params); /* 489 */
+   void (GLAPIENTRYP GetFragmentLightivSGIX)(GLenum light, GLenum pname, GLint * params); /* 490 */
+   void (GLAPIENTRYP GetFragmentMaterialfvSGIX)(GLenum face, GLenum pname, GLfloat * params); /* 491 */
+   void (GLAPIENTRYP GetFragmentMaterialivSGIX)(GLenum face, GLenum pname, GLint * params); /* 492 */
+   void (GLAPIENTRYP LightEnviSGIX)(GLenum pname, GLint param); /* 493 */
+   void (GLAPIENTRYP VertexWeightfEXT)(GLfloat weight); /* 494 */
+   void (GLAPIENTRYP VertexWeightfvEXT)(const GLfloat * weight); /* 495 */
+   void (GLAPIENTRYP VertexWeightPointerEXT)(GLsizei size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 496 */
+   void (GLAPIENTRYP FlushVertexArrayRangeNV)(void); /* 497 */
+   void (GLAPIENTRYP VertexArrayRangeNV)(GLsizei length, const GLvoid * pointer); /* 498 */
+   void (GLAPIENTRYP CombinerParameterfvNV)(GLenum pname, const GLfloat * params); /* 499 */
+   void (GLAPIENTRYP CombinerParameterfNV)(GLenum pname, GLfloat param); /* 500 */
+   void (GLAPIENTRYP CombinerParameterivNV)(GLenum pname, const GLint * params); /* 501 */
+   void (GLAPIENTRYP CombinerParameteriNV)(GLenum pname, GLint param); /* 502 */
+   void (GLAPIENTRYP CombinerInputNV)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 503 */
+   void (GLAPIENTRYP CombinerOutputNV)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); /* 504 */
+   void (GLAPIENTRYP FinalCombinerInputNV)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 505 */
+   void (GLAPIENTRYP GetCombinerInputParameterfvNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat * params); /* 506 */
+   void (GLAPIENTRYP GetCombinerInputParameterivNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint * params); /* 507 */
+   void (GLAPIENTRYP GetCombinerOutputParameterfvNV)(GLenum stage, GLenum portion, GLenum pname, GLfloat * params); /* 508 */
+   void (GLAPIENTRYP GetCombinerOutputParameterivNV)(GLenum stage, GLenum portion, GLenum pname, GLint * params); /* 509 */
+   void (GLAPIENTRYP GetFinalCombinerInputParameterfvNV)(GLenum variable, GLenum pname, GLfloat * params); /* 510 */
+   void (GLAPIENTRYP GetFinalCombinerInputParameterivNV)(GLenum variable, GLenum pname, GLint * params); /* 511 */
+   void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 512 */
+   void (GLAPIENTRYP WindowPos2dMESA)(GLdouble x, GLdouble y); /* 513 */
+   void (GLAPIENTRYP WindowPos2dvMESA)(const GLdouble * v); /* 514 */
+   void (GLAPIENTRYP WindowPos2fMESA)(GLfloat x, GLfloat y); /* 515 */
+   void (GLAPIENTRYP WindowPos2fvMESA)(const GLfloat * v); /* 516 */
+   void (GLAPIENTRYP WindowPos2iMESA)(GLint x, GLint y); /* 517 */
+   void (GLAPIENTRYP WindowPos2ivMESA)(const GLint * v); /* 518 */
+   void (GLAPIENTRYP WindowPos2sMESA)(GLshort x, GLshort y); /* 519 */
+   void (GLAPIENTRYP WindowPos2svMESA)(const GLshort * v); /* 520 */
+   void (GLAPIENTRYP WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z); /* 521 */
+   void (GLAPIENTRYP WindowPos3dvMESA)(const GLdouble * v); /* 522 */
+   void (GLAPIENTRYP WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z); /* 523 */
+   void (GLAPIENTRYP WindowPos3fvMESA)(const GLfloat * v); /* 524 */
+   void (GLAPIENTRYP WindowPos3iMESA)(GLint x, GLint y, GLint z); /* 525 */
+   void (GLAPIENTRYP WindowPos3ivMESA)(const GLint * v); /* 526 */
+   void (GLAPIENTRYP WindowPos3sMESA)(GLshort x, GLshort y, GLshort z); /* 527 */
+   void (GLAPIENTRYP WindowPos3svMESA)(const GLshort * v); /* 528 */
+   void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 529 */
+   void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 530 */
+   void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 531 */
+   void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 532 */
+   void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 533 */
+   void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 534 */
+   void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 535 */
+   void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 536 */
+   void (GLAPIENTRYP BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); /* 537 */
+   void (GLAPIENTRYP IndexMaterialEXT)(GLenum face, GLenum mode); /* 538 */
+   void (GLAPIENTRYP IndexFuncEXT)(GLenum func, GLclampf ref); /* 539 */
+   void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 540 */
+   void (GLAPIENTRYP UnlockArraysEXT)(void); /* 541 */
+   void (GLAPIENTRYP CullParameterdvEXT)(GLenum pname, GLdouble * params); /* 542 */
+   void (GLAPIENTRYP CullParameterfvEXT)(GLenum pname, GLfloat * params); /* 543 */
+   void (GLAPIENTRYP HintPGI)(GLenum target, GLint mode); /* 544 */
+   void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 545 */
+   void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 546 */
+   void (GLAPIENTRYP FogCoorddEXT)(GLdouble coord); /* 547 */
+   void (GLAPIENTRYP FogCoorddvEXT)(const GLdouble * coord); /* 548 */
+   void (GLAPIENTRYP FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 549 */
+   void (GLAPIENTRYP GetColorTableEXT)(GLenum target, GLenum format, GLenum type, GLvoid * data); /* 550 */
+   void (GLAPIENTRYP GetColorTableParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 551 */
+   void (GLAPIENTRYP GetColorTableParameterfvEXT)(GLenum target, GLenum pname, GLfloat * params); /* 552 */
+   void (GLAPIENTRYP TbufferMask3DFX)(GLuint mask); /* 553 */
+   void (GLAPIENTRYP CompressedTexImage3DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid * data); /* 554 */
+   void (GLAPIENTRYP CompressedTexImage2DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid * data); /* 555 */
+   void (GLAPIENTRYP CompressedTexImage1DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid * data); /* 556 */
+   void (GLAPIENTRYP CompressedTexSubImage3DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid * data); /* 557 */
+   void (GLAPIENTRYP CompressedTexSubImage2DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid * data); /* 558 */
+   void (GLAPIENTRYP CompressedTexSubImage1DARB)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid * data); /* 559 */
+   void (GLAPIENTRYP GetCompressedTexImageARB)(GLenum target, GLint level, GLvoid * img); /* 560 */
+   void (GLAPIENTRYP SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue); /* 561 */
+   void (GLAPIENTRYP SecondaryColor3bvEXT)(const GLbyte * v); /* 562 */
+   void (GLAPIENTRYP SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue); /* 563 */
+   void (GLAPIENTRYP SecondaryColor3dvEXT)(const GLdouble * v); /* 564 */
+   void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 565 */
+   void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 566 */
+   void (GLAPIENTRYP SecondaryColor3iEXT)(GLint red, GLint green, GLint blue); /* 567 */
+   void (GLAPIENTRYP SecondaryColor3ivEXT)(const GLint * v); /* 568 */
+   void (GLAPIENTRYP SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue); /* 569 */
+   void (GLAPIENTRYP SecondaryColor3svEXT)(const GLshort * v); /* 570 */
+   void (GLAPIENTRYP SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue); /* 571 */
+   void (GLAPIENTRYP SecondaryColor3ubvEXT)(const GLubyte * v); /* 572 */
+   void (GLAPIENTRYP SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue); /* 573 */
+   void (GLAPIENTRYP SecondaryColor3uivEXT)(const GLuint * v); /* 574 */
+   void (GLAPIENTRYP SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue); /* 575 */
+   void (GLAPIENTRYP SecondaryColor3usvEXT)(const GLushort * v); /* 576 */
+   void (GLAPIENTRYP SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 577 */
+   GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 578 */
+   void (GLAPIENTRYP BindProgramNV)(GLenum target, GLuint id); /* 579 */
+   void (GLAPIENTRYP DeleteProgramsNV)(GLsizei n, const GLuint * ids); /* 580 */
+   void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 581 */
+   void (GLAPIENTRYP GenProgramsNV)(GLsizei n, GLuint * ids); /* 582 */
+   void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 583 */
+   void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 584 */
+   void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 585 */
+   void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 586 */
+   void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 587 */
+   void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 588 */
+   void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 589 */
+   void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 590 */
+   void (GLAPIENTRYP GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer); /* 591 */
+   GLboolean (GLAPIENTRYP IsProgramNV)(GLuint id); /* 592 */
+   void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 593 */
+   void (GLAPIENTRYP ProgramParameter4dNV)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 594 */
+   void (GLAPIENTRYP ProgramParameter4dvNV)(GLenum target, GLuint index, const GLdouble * params); /* 595 */
+   void (GLAPIENTRYP ProgramParameter4fNV)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 596 */
+   void (GLAPIENTRYP ProgramParameter4fvNV)(GLenum target, GLuint index, const GLfloat * params); /* 597 */
+   void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLuint num, const GLdouble * params); /* 598 */
+   void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLuint num, const GLfloat * params); /* 599 */
+   void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 600 */
+   void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 601 */
+   void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 602 */
+   void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 603 */
+   void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 604 */
+   void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 605 */
+   void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 606 */
+   void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 607 */
+   void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 608 */
+   void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 609 */
+   void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 610 */
+   void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 611 */
+   void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 612 */
+   void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 613 */
+   void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 614 */
+   void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 615 */
+   void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 616 */
+   void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 617 */
+   void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 618 */
+   void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 619 */
+   void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 620 */
+   void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 621 */
+   void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 622 */
+   void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 623 */
+   void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 624 */
+   void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 625 */
+   void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 626 */
+   void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 627 */
+   void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 628 */
+   void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 629 */
+   void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 630 */
+   void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 631 */
+   void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 632 */
+   void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 633 */
+   void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 634 */
+   void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 635 */
+   void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 636 */
+   void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 637 */
+   void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 638 */
+   void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 639 */
+   void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 640 */
+   void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 641 */
+   void (GLAPIENTRYP PointParameteriNV)(GLenum pname, GLint params); /* 642 */
+   void (GLAPIENTRYP PointParameterivNV)(GLenum pname, const GLint * params); /* 643 */
+   void (GLAPIENTRYP MultiDrawArraysEXT)(GLenum mode, GLint * first, GLsizei * count, GLsizei primcount); /* 644 */
+   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); /* 645 */
+   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 646 */
+   void (GLAPIENTRYP DeleteFencesNV)(GLsizei n, const GLuint * fences); /* 647 */
+   void (GLAPIENTRYP GenFencesNV)(GLsizei n, GLuint * fences); /* 648 */
+   GLboolean (GLAPIENTRYP IsFenceNV)(GLuint fence); /* 649 */
+   GLboolean (GLAPIENTRYP TestFenceNV)(GLuint fence); /* 650 */
+   void (GLAPIENTRYP GetFenceivNV)(GLuint fence, GLenum pname, GLint * params); /* 651 */
+   void (GLAPIENTRYP FinishFenceNV)(GLuint fence); /* 652 */
+   void (GLAPIENTRYP SetFenceNV)(GLuint fence, GLenum condition); /* 653 */
+   void (GLAPIENTRYP VertexAttrib4bvARB)(GLuint index, const GLbyte * v); /* 654 */
+   void (GLAPIENTRYP VertexAttrib4ivARB)(GLuint index, const GLint * v); /* 655 */
+   void (GLAPIENTRYP VertexAttrib4ubvARB)(GLuint index, const GLubyte * v); /* 656 */
+   void (GLAPIENTRYP VertexAttrib4usvARB)(GLuint index, const GLushort * v); /* 657 */
+   void (GLAPIENTRYP VertexAttrib4uivARB)(GLuint index, const GLuint * v); /* 658 */
+   void (GLAPIENTRYP VertexAttrib4NbvARB)(GLuint index, const GLbyte * v); /* 659 */
+   void (GLAPIENTRYP VertexAttrib4NsvARB)(GLuint index, const GLshort * v); /* 660 */
+   void (GLAPIENTRYP VertexAttrib4NivARB)(GLuint index, const GLint * v); /* 661 */
+   void (GLAPIENTRYP VertexAttrib4NusvARB)(GLuint index, const GLushort * v); /* 662 */
+   void (GLAPIENTRYP VertexAttrib4NuivARB)(GLuint index, const GLuint * v); /* 663 */
+   void (GLAPIENTRYP VertexAttribPointerARB)(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid * pointer); /* 664 */
+   void (GLAPIENTRYP EnableVertexAttribArrayARB)(GLuint index); /* 665 */
+   void (GLAPIENTRYP DisableVertexAttribArrayARB)(GLuint index); /* 666 */
+   void (GLAPIENTRYP ProgramStringARB)(GLenum target, GLenum format, GLsizei len, const GLvoid * string); /* 667 */
+   void (GLAPIENTRYP ProgramEnvParameter4dARB)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 668 */
+   void (GLAPIENTRYP ProgramEnvParameter4dvARB)(GLenum target, GLuint index, const GLdouble * params); /* 669 */
+   void (GLAPIENTRYP ProgramEnvParameter4fARB)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 670 */
+   void (GLAPIENTRYP ProgramEnvParameter4fvARB)(GLenum target, GLuint index, const GLfloat * params); /* 671 */
+   void (GLAPIENTRYP ProgramLocalParameter4dARB)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 672 */
+   void (GLAPIENTRYP ProgramLocalParameter4dvARB)(GLenum target, GLuint index, const GLdouble * params); /* 673 */
+   void (GLAPIENTRYP ProgramLocalParameter4fARB)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 674 */
+   void (GLAPIENTRYP ProgramLocalParameter4fvARB)(GLenum target, GLuint index, const GLfloat * params); /* 675 */
+   void (GLAPIENTRYP GetProgramEnvParameterdvARB)(GLenum target, GLuint index, GLdouble * params); /* 676 */
+   void (GLAPIENTRYP GetProgramEnvParameterfvARB)(GLenum target, GLuint index, GLfloat * params); /* 677 */
+   void (GLAPIENTRYP GetProgramLocalParameterdvARB)(GLenum target, GLuint index, GLdouble * params); /* 678 */
+   void (GLAPIENTRYP GetProgramLocalParameterfvARB)(GLenum target, GLuint index, GLfloat * params); /* 679 */
+   void (GLAPIENTRYP GetProgramivARB)(GLenum target, GLenum pname, GLint * params); /* 680 */
+   void (GLAPIENTRYP GetProgramStringARB)(GLenum target, GLenum pname, GLvoid * string); /* 681 */
+   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 682 */
+   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 683 */
+   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 684 */
+   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 685 */
+   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 686 */
+   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 687 */
+   void (GLAPIENTRYP BindBufferARB)(GLenum target, GLuint buffer); /* 688 */
+   void (GLAPIENTRYP BufferDataARB)(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage); /* 689 */
+   void (GLAPIENTRYP BufferSubDataARB)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data); /* 690 */
+   void (GLAPIENTRYP DeleteBuffersARB)(GLsizei n, const GLuint * buffer); /* 691 */
+   void (GLAPIENTRYP GenBuffersARB)(GLsizei n, GLuint * buffer); /* 692 */
+   void (GLAPIENTRYP GetBufferParameterivARB)(GLenum target, GLenum pname, GLint * params); /* 693 */
+   void (GLAPIENTRYP GetBufferPointervARB)(GLenum target, GLenum pname, GLvoid ** params); /* 694 */
+   void (GLAPIENTRYP GetBufferSubDataARB)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data); /* 695 */
+   GLboolean (GLAPIENTRYP IsBufferARB)(GLuint buffer); /* 696 */
+   void * (GLAPIENTRYP MapBufferARB)(GLenum target, GLenum access); /* 697 */
+   GLboolean (GLAPIENTRYP UnmapBufferARB)(GLenum target); /* 698 */
+   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 699 */
+   void (GLAPIENTRYP GenQueriesARB)(GLsizei n, GLuint * ids); /* 700 */
+   void (GLAPIENTRYP DeleteQueriesARB)(GLsizei n, const GLuint * ids); /* 701 */
+   GLboolean (GLAPIENTRYP IsQueryARB)(GLuint id); /* 702 */
+   void (GLAPIENTRYP BeginQueryARB)(GLenum target, GLuint id); /* 703 */
+   void (GLAPIENTRYP EndQueryARB)(GLenum target); /* 704 */
+   void (GLAPIENTRYP GetQueryivARB)(GLenum target, GLenum pname, GLint * params); /* 705 */
+   void (GLAPIENTRYP GetQueryObjectivARB)(GLuint id, GLenum pname, GLint * params); /* 706 */
+   void (GLAPIENTRYP GetQueryObjectuivARB)(GLuint id, GLenum pname, GLuint * params); /* 707 */
+   void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 708 */
+   void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 709 */
+};
+
+#endif
diff --git a/reactos/lib/mesa32/src/glapi/glapitemp.h b/reactos/lib/mesa32/src/glapi/glapitemp.h
new file mode 100644
index 00000000000..a0f2e8d0c64
--- /dev/null
+++ b/reactos/lib/mesa32/src/glapi/glapitemp.h
@@ -0,0 +1,5823 @@
+
+/* DO NOT EDIT!  This file is generated by the glapitemp.py script. */
+
+/*
+ * This file is a template which generates the OpenGL API entry point
+ * functions.  It should be included by a .c file which first defines
+ * the following macros:
+ *   KEYWORD1 - usually nothing, but might be __declspec(dllexport) on Win32
+ *   KEYWORD2 - usually nothing, but might be __stdcall on Win32
+ *   NAME(n)  - builds the final function name (usually add "gl" prefix)
+ *   DISPATCH(func, args, msg) - code to do dispatch of named function.
+ *                               msg is a printf-style debug message.
+ *   RETURN_DISPATCH(func, args, msg) - code to do dispatch with a return value
+ *
+ * Here's an example which generates the usual OpenGL functions:
+ *   #define KEYWORD1
+ *   #define KEYWORD2
+ *   #define NAME(func)  gl##func
+ *   #define DISPATCH(func, args, msg)                           \
+ *          struct _glapi_table *dispatch = CurrentDispatch;     \
+ *          (*dispatch->func) args
+ *   #define RETURN DISPATCH(func, args, msg)                    \
+ *          struct _glapi_table *dispatch = CurrentDispatch;     \
+ *          return (*dispatch->func) args
+ *
+ */
+
+
+#ifndef KEYWORD1
+#define KEYWORD1
+#endif
+
+#ifndef KEYWORD2
+#define KEYWORD2
+#endif
+
+#ifndef NAME
+#error NAME must be defined
+#endif
+
+#ifndef DISPATCH
+#error DISPATCH must be defined
+#endif
+
+#ifndef RETURN_DISPATCH
+#error RETURN_DISPATCH must be defined
+#endif
+
+GLAPI void GLAPIENTRY gl__unused413(void);  /* silence warning */
+
+KEYWORD1 void KEYWORD2 NAME(NewList)(GLuint list, GLenum mode)
+{
+   DISPATCH(NewList, (list, mode), (F, "glNewList(%d, 0x%x);\n", list, mode));
+}
+
+KEYWORD1 void KEYWORD2 NAME(EndList)(void)
+{
+   DISPATCH(EndList, (), (F, "glEndList();\n"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CallList)(GLuint list)
+{
+   DISPATCH(CallList, (list), (F, "glCallList(%d);\n", list));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CallLists)(GLsizei n, GLenum type, const GLvoid * lists)
+{
+   DISPATCH(CallLists, (n, type, lists), (F, "glCallLists(%d, 0x%x, %p);\n", n, type, (const void *) lists));
+}
+
+KEYWORD1 void KEYWORD2 NAME(DeleteLists)(GLuint list, GLsizei range)
+{
+   DISPATCH(DeleteLists, (list, range), (F, "glDeleteLists(%d, %d);\n", list, range));
+}
+
+KEYWORD1 GLuint KEYWORD2 NAME(GenLists)(GLsizei range)
+{
+   RETURN_DISPATCH(GenLists, (range), (F, "glGenLists(%d);\n", range));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ListBase)(GLuint base)
+{
+   DISPATCH(ListBase, (base), (F, "glListBase(%d);\n", base));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Begin)(GLenum mode)
+{
+   DISPATCH(Begin, (mode), (F, "glBegin(0x%x);\n", mode));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Bitmap)(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte * bitmap)
+{
+   DISPATCH(Bitmap, (width, height, xorig, yorig, xmove, ymove, bitmap), (F, "glBitmap(%d, %d, %f, %f, %f, %f, %p);\n", width, height, xorig, yorig, xmove, ymove, (const void *) bitmap));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Color3b)(GLbyte red, GLbyte green, GLbyte blue)
+{
+   DISPATCH(Color3b, (red, green, blue), (F, "glColor3b(%d, %d, %d);\n", red, green, blue));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Color3bv)(const GLbyte * v)
+{
+   DISPATCH(Color3bv, (v), (F, "glColor3bv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Color3d)(GLdouble red, GLdouble green, GLdouble blue)
+{
+   DISPATCH(Color3d, (red, green, blue), (F, "glColor3d(%f, %f, %f);\n", red, green, blue));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Color3dv)(const GLdouble * v)
+{
+   DISPATCH(Color3dv, (v), (F, "glColor3dv(%p /* %g, %g, %g */);\n", (const void *) v, v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Color3f)(GLfloat red, GLfloat green, GLfloat blue)
+{
+   DISPATCH(Color3f, (red, green, blue), (F, "glColor3f(%f, %f, %f);\n", red, green, blue));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Color3fv)(const GLfloat * v)
+{
+   DISPATCH(Color3fv, (v), (F, "glColor3fv(%p /* %g, %g, %g */);\n", (const void *) v, v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Color3i)(GLint red, GLint green, GLint blue)
+{
+   DISPATCH(Color3i, (red, green, blue), (F, "glColor3i(%d, %d, %d);\n", red, green, blue));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Color3iv)(const GLint * v)
+{
+   DISPATCH(Color3iv, (v), (F, "glColor3iv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Color3s)(GLshort red, GLshort green, GLshort blue)
+{
+   DISPATCH(Color3s, (red, green, blue), (F, "glColor3s(%d, %d, %d);\n", red, green, blue));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Color3sv)(const GLshort * v)
+{
+   DISPATCH(Color3sv, (v), (F, "glColor3sv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Color3ub)(GLubyte red, GLubyte green, GLubyte blue)
+{
+   DISPATCH(Color3ub, (red, green, blue), (F, "glColor3ub(%d, %d, %d);\n", red, green, blue));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Color3ubv)(const GLubyte * v)
+{
+   DISPATCH(Color3ubv, (v), (F, "glColor3ubv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Color3ui)(GLuint red, GLuint green, GLuint blue)
+{
+   DISPATCH(Color3ui, (red, green, blue), (F, "glColor3ui(%d, %d, %d);\n", red, green, blue));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Color3uiv)(const GLuint * v)
+{
+   DISPATCH(Color3uiv, (v), (F, "glColor3uiv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Color3us)(GLushort red, GLushort green, GLushort blue)
+{
+   DISPATCH(Color3us, (red, green, blue), (F, "glColor3us(%d, %d, %d);\n", red, green, blue));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Color3usv)(const GLushort * v)
+{
+   DISPATCH(Color3usv, (v), (F, "glColor3usv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Color4b)(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha)
+{
+   DISPATCH(Color4b, (red, green, blue, alpha), (F, "glColor4b(%d, %d, %d, %d);\n", red, green, blue, alpha));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Color4bv)(const GLbyte * v)
+{
+   DISPATCH(Color4bv, (v), (F, "glColor4bv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Color4d)(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha)
+{
+   DISPATCH(Color4d, (red, green, blue, alpha), (F, "glColor4d(%f, %f, %f, %f);\n", red, green, blue, alpha));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Color4dv)(const GLdouble * v)
+{
+   DISPATCH(Color4dv, (v), (F, "glColor4dv(%p /* %g, %g, %g, %g */);\n", (const void *) v, v[0], v[1], v[2], v[3]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Color4f)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
+{
+   DISPATCH(Color4f, (red, green, blue, alpha), (F, "glColor4f(%f, %f, %f, %f);\n", red, green, blue, alpha));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Color4fv)(const GLfloat * v)
+{
+   DISPATCH(Color4fv, (v), (F, "glColor4fv(%p /* %g, %g, %g, %g */);\n", (const void *) v, v[0], v[1], v[2], v[3]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Color4i)(GLint red, GLint green, GLint blue, GLint alpha)
+{
+   DISPATCH(Color4i, (red, green, blue, alpha), (F, "glColor4i(%d, %d, %d, %d);\n", red, green, blue, alpha));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Color4iv)(const GLint * v)
+{
+   DISPATCH(Color4iv, (v), (F, "glColor4iv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Color4s)(GLshort red, GLshort green, GLshort blue, GLshort alpha)
+{
+   DISPATCH(Color4s, (red, green, blue, alpha), (F, "glColor4s(%d, %d, %d, %d);\n", red, green, blue, alpha));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Color4sv)(const GLshort * v)
+{
+   DISPATCH(Color4sv, (v), (F, "glColor4sv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Color4ub)(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
+{
+   DISPATCH(Color4ub, (red, green, blue, alpha), (F, "glColor4ub(%d, %d, %d, %d);\n", red, green, blue, alpha));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Color4ubv)(const GLubyte * v)
+{
+   DISPATCH(Color4ubv, (v), (F, "glColor4ubv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Color4ui)(GLuint red, GLuint green, GLuint blue, GLuint alpha)
+{
+   DISPATCH(Color4ui, (red, green, blue, alpha), (F, "glColor4ui(%d, %d, %d, %d);\n", red, green, blue, alpha));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Color4uiv)(const GLuint * v)
+{
+   DISPATCH(Color4uiv, (v), (F, "glColor4uiv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Color4us)(GLushort red, GLushort green, GLushort blue, GLushort alpha)
+{
+   DISPATCH(Color4us, (red, green, blue, alpha), (F, "glColor4us(%d, %d, %d, %d);\n", red, green, blue, alpha));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Color4usv)(const GLushort * v)
+{
+   DISPATCH(Color4usv, (v), (F, "glColor4usv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(EdgeFlag)(GLboolean flag)
+{
+   DISPATCH(EdgeFlag, (flag), (F, "glEdgeFlag(%d);\n", flag));
+}
+
+KEYWORD1 void KEYWORD2 NAME(EdgeFlagv)(const GLboolean * flag)
+{
+   DISPATCH(EdgeFlagv, (flag), (F, "glEdgeFlagv(%p);\n", (const void *) flag));
+}
+
+KEYWORD1 void KEYWORD2 NAME(End)(void)
+{
+   DISPATCH(End, (), (F, "glEnd();\n"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Indexd)(GLdouble c)
+{
+   DISPATCH(Indexd, (c), (F, "glIndexd(%f);\n", c));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Indexdv)(const GLdouble * c)
+{
+   DISPATCH(Indexdv, (c), (F, "glIndexdv(%p);\n", (const void *) c));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Indexf)(GLfloat c)
+{
+   DISPATCH(Indexf, (c), (F, "glIndexf(%f);\n", c));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Indexfv)(const GLfloat * c)
+{
+   DISPATCH(Indexfv, (c), (F, "glIndexfv(%p);\n", (const void *) c));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Indexi)(GLint c)
+{
+   DISPATCH(Indexi, (c), (F, "glIndexi(%d);\n", c));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Indexiv)(const GLint * c)
+{
+   DISPATCH(Indexiv, (c), (F, "glIndexiv(%p);\n", (const void *) c));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Indexs)(GLshort c)
+{
+   DISPATCH(Indexs, (c), (F, "glIndexs(%d);\n", c));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Indexsv)(const GLshort * c)
+{
+   DISPATCH(Indexsv, (c), (F, "glIndexsv(%p);\n", (const void *) c));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Normal3b)(GLbyte nx, GLbyte ny, GLbyte nz)
+{
+   DISPATCH(Normal3b, (nx, ny, nz), (F, "glNormal3b(%d, %d, %d);\n", nx, ny, nz));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Normal3bv)(const GLbyte * v)
+{
+   DISPATCH(Normal3bv, (v), (F, "glNormal3bv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Normal3d)(GLdouble nx, GLdouble ny, GLdouble nz)
+{
+   DISPATCH(Normal3d, (nx, ny, nz), (F, "glNormal3d(%f, %f, %f);\n", nx, ny, nz));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Normal3dv)(const GLdouble * v)
+{
+   DISPATCH(Normal3dv, (v), (F, "glNormal3dv(%p /* %g, %g, %g */);\n", (const void *) v, v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Normal3f)(GLfloat nx, GLfloat ny, GLfloat nz)
+{
+   DISPATCH(Normal3f, (nx, ny, nz), (F, "glNormal3f(%f, %f, %f);\n", nx, ny, nz));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Normal3fv)(const GLfloat * v)
+{
+   DISPATCH(Normal3fv, (v), (F, "glNormal3fv(%p /* %g, %g, %g */);\n", (const void *) v, v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Normal3i)(GLint nx, GLint ny, GLint nz)
+{
+   DISPATCH(Normal3i, (nx, ny, nz), (F, "glNormal3i(%d, %d, %d);\n", nx, ny, nz));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Normal3iv)(const GLint * v)
+{
+   DISPATCH(Normal3iv, (v), (F, "glNormal3iv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Normal3s)(GLshort nx, GLshort ny, GLshort nz)
+{
+   DISPATCH(Normal3s, (nx, ny, nz), (F, "glNormal3s(%d, %d, %d);\n", nx, ny, nz));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Normal3sv)(const GLshort * v)
+{
+   DISPATCH(Normal3sv, (v), (F, "glNormal3sv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(RasterPos2d)(GLdouble x, GLdouble y)
+{
+   DISPATCH(RasterPos2d, (x, y), (F, "glRasterPos2d(%f, %f);\n", x, y));
+}
+
+KEYWORD1 void KEYWORD2 NAME(RasterPos2dv)(const GLdouble * v)
+{
+   DISPATCH(RasterPos2dv, (v), (F, "glRasterPos2dv(%p /* %g, %g */);\n", (const void *) v, v[0], v[1]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(RasterPos2f)(GLfloat x, GLfloat y)
+{
+   DISPATCH(RasterPos2f, (x, y), (F, "glRasterPos2f(%f, %f);\n", x, y));
+}
+
+KEYWORD1 void KEYWORD2 NAME(RasterPos2fv)(const GLfloat * v)
+{
+   DISPATCH(RasterPos2fv, (v), (F, "glRasterPos2fv(%p /* %g, %g */);\n", (const void *) v, v[0], v[1]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(RasterPos2i)(GLint x, GLint y)
+{
+   DISPATCH(RasterPos2i, (x, y), (F, "glRasterPos2i(%d, %d);\n", x, y));
+}
+
+KEYWORD1 void KEYWORD2 NAME(RasterPos2iv)(const GLint * v)
+{
+   DISPATCH(RasterPos2iv, (v), (F, "glRasterPos2iv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(RasterPos2s)(GLshort x, GLshort y)
+{
+   DISPATCH(RasterPos2s, (x, y), (F, "glRasterPos2s(%d, %d);\n", x, y));
+}
+
+KEYWORD1 void KEYWORD2 NAME(RasterPos2sv)(const GLshort * v)
+{
+   DISPATCH(RasterPos2sv, (v), (F, "glRasterPos2sv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(RasterPos3d)(GLdouble x, GLdouble y, GLdouble z)
+{
+   DISPATCH(RasterPos3d, (x, y, z), (F, "glRasterPos3d(%f, %f, %f);\n", x, y, z));
+}
+
+KEYWORD1 void KEYWORD2 NAME(RasterPos3dv)(const GLdouble * v)
+{
+   DISPATCH(RasterPos3dv, (v), (F, "glRasterPos3dv(%p /* %g, %g, %g */);\n", (const void *) v, v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(RasterPos3f)(GLfloat x, GLfloat y, GLfloat z)
+{
+   DISPATCH(RasterPos3f, (x, y, z), (F, "glRasterPos3f(%f, %f, %f);\n", x, y, z));
+}
+
+KEYWORD1 void KEYWORD2 NAME(RasterPos3fv)(const GLfloat * v)
+{
+   DISPATCH(RasterPos3fv, (v), (F, "glRasterPos3fv(%p /* %g, %g, %g */);\n", (const void *) v, v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(RasterPos3i)(GLint x, GLint y, GLint z)
+{
+   DISPATCH(RasterPos3i, (x, y, z), (F, "glRasterPos3i(%d, %d, %d);\n", x, y, z));
+}
+
+KEYWORD1 void KEYWORD2 NAME(RasterPos3iv)(const GLint * v)
+{
+   DISPATCH(RasterPos3iv, (v), (F, "glRasterPos3iv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(RasterPos3s)(GLshort x, GLshort y, GLshort z)
+{
+   DISPATCH(RasterPos3s, (x, y, z), (F, "glRasterPos3s(%d, %d, %d);\n", x, y, z));
+}
+
+KEYWORD1 void KEYWORD2 NAME(RasterPos3sv)(const GLshort * v)
+{
+   DISPATCH(RasterPos3sv, (v), (F, "glRasterPos3sv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(RasterPos4d)(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
+{
+   DISPATCH(RasterPos4d, (x, y, z, w), (F, "glRasterPos4d(%f, %f, %f, %f);\n", x, y, z, w));
+}
+
+KEYWORD1 void KEYWORD2 NAME(RasterPos4dv)(const GLdouble * v)
+{
+   DISPATCH(RasterPos4dv, (v), (F, "glRasterPos4dv(%p /* %g, %g, %g, %g */);\n", (const void *) v, v[0], v[1], v[2], v[3]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(RasterPos4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   DISPATCH(RasterPos4f, (x, y, z, w), (F, "glRasterPos4f(%f, %f, %f, %f);\n", x, y, z, w));
+}
+
+KEYWORD1 void KEYWORD2 NAME(RasterPos4fv)(const GLfloat * v)
+{
+   DISPATCH(RasterPos4fv, (v), (F, "glRasterPos4fv(%p /* %g, %g, %g, %g */);\n", (const void *) v, v[0], v[1], v[2], v[3]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(RasterPos4i)(GLint x, GLint y, GLint z, GLint w)
+{
+   DISPATCH(RasterPos4i, (x, y, z, w), (F, "glRasterPos4i(%d, %d, %d, %d);\n", x, y, z, w));
+}
+
+KEYWORD1 void KEYWORD2 NAME(RasterPos4iv)(const GLint * v)
+{
+   DISPATCH(RasterPos4iv, (v), (F, "glRasterPos4iv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(RasterPos4s)(GLshort x, GLshort y, GLshort z, GLshort w)
+{
+   DISPATCH(RasterPos4s, (x, y, z, w), (F, "glRasterPos4s(%d, %d, %d, %d);\n", x, y, z, w));
+}
+
+KEYWORD1 void KEYWORD2 NAME(RasterPos4sv)(const GLshort * v)
+{
+   DISPATCH(RasterPos4sv, (v), (F, "glRasterPos4sv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Rectd)(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
+{
+   DISPATCH(Rectd, (x1, y1, x2, y2), (F, "glRectd(%f, %f, %f, %f);\n", x1, y1, x2, y2));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Rectdv)(const GLdouble * v1, const GLdouble * v2)
+{
+   DISPATCH(Rectdv, (v1, v2), (F, "glRectdv(%p, %p);\n", (const void *) v1, (const void *) v2));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Rectf)(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)
+{
+   DISPATCH(Rectf, (x1, y1, x2, y2), (F, "glRectf(%f, %f, %f, %f);\n", x1, y1, x2, y2));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Rectfv)(const GLfloat * v1, const GLfloat * v2)
+{
+   DISPATCH(Rectfv, (v1, v2), (F, "glRectfv(%p, %p);\n", (const void *) v1, (const void *) v2));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Recti)(GLint x1, GLint y1, GLint x2, GLint y2)
+{
+   DISPATCH(Recti, (x1, y1, x2, y2), (F, "glRecti(%d, %d, %d, %d);\n", x1, y1, x2, y2));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Rectiv)(const GLint * v1, const GLint * v2)
+{
+   DISPATCH(Rectiv, (v1, v2), (F, "glRectiv(%p, %p);\n", (const void *) v1, (const void *) v2));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Rects)(GLshort x1, GLshort y1, GLshort x2, GLshort y2)
+{
+   DISPATCH(Rects, (x1, y1, x2, y2), (F, "glRects(%d, %d, %d, %d);\n", x1, y1, x2, y2));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Rectsv)(const GLshort * v1, const GLshort * v2)
+{
+   DISPATCH(Rectsv, (v1, v2), (F, "glRectsv(%p, %p);\n", (const void *) v1, (const void *) v2));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoord1d)(GLdouble s)
+{
+   DISPATCH(TexCoord1d, (s), (F, "glTexCoord1d(%f);\n", s));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoord1dv)(const GLdouble * v)
+{
+   DISPATCH(TexCoord1dv, (v), (F, "glTexCoord1dv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoord1f)(GLfloat s)
+{
+   DISPATCH(TexCoord1f, (s), (F, "glTexCoord1f(%f);\n", s));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoord1fv)(const GLfloat * v)
+{
+   DISPATCH(TexCoord1fv, (v), (F, "glTexCoord1fv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoord1i)(GLint s)
+{
+   DISPATCH(TexCoord1i, (s), (F, "glTexCoord1i(%d);\n", s));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoord1iv)(const GLint * v)
+{
+   DISPATCH(TexCoord1iv, (v), (F, "glTexCoord1iv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoord1s)(GLshort s)
+{
+   DISPATCH(TexCoord1s, (s), (F, "glTexCoord1s(%d);\n", s));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoord1sv)(const GLshort * v)
+{
+   DISPATCH(TexCoord1sv, (v), (F, "glTexCoord1sv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoord2d)(GLdouble s, GLdouble t)
+{
+   DISPATCH(TexCoord2d, (s, t), (F, "glTexCoord2d(%f, %f);\n", s, t));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoord2dv)(const GLdouble * v)
+{
+   DISPATCH(TexCoord2dv, (v), (F, "glTexCoord2dv(%p /* %g, %g */);\n", (const void *) v, v[0], v[1]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoord2f)(GLfloat s, GLfloat t)
+{
+   DISPATCH(TexCoord2f, (s, t), (F, "glTexCoord2f(%f, %f);\n", s, t));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoord2fv)(const GLfloat * v)
+{
+   DISPATCH(TexCoord2fv, (v), (F, "glTexCoord2fv(%p /* %g, %g */);\n", (const void *) v, v[0], v[1]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoord2i)(GLint s, GLint t)
+{
+   DISPATCH(TexCoord2i, (s, t), (F, "glTexCoord2i(%d, %d);\n", s, t));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoord2iv)(const GLint * v)
+{
+   DISPATCH(TexCoord2iv, (v), (F, "glTexCoord2iv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoord2s)(GLshort s, GLshort t)
+{
+   DISPATCH(TexCoord2s, (s, t), (F, "glTexCoord2s(%d, %d);\n", s, t));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoord2sv)(const GLshort * v)
+{
+   DISPATCH(TexCoord2sv, (v), (F, "glTexCoord2sv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoord3d)(GLdouble s, GLdouble t, GLdouble r)
+{
+   DISPATCH(TexCoord3d, (s, t, r), (F, "glTexCoord3d(%f, %f, %f);\n", s, t, r));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoord3dv)(const GLdouble * v)
+{
+   DISPATCH(TexCoord3dv, (v), (F, "glTexCoord3dv(%p /* %g, %g, %g */);\n", (const void *) v, v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoord3f)(GLfloat s, GLfloat t, GLfloat r)
+{
+   DISPATCH(TexCoord3f, (s, t, r), (F, "glTexCoord3f(%f, %f, %f);\n", s, t, r));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoord3fv)(const GLfloat * v)
+{
+   DISPATCH(TexCoord3fv, (v), (F, "glTexCoord3fv(%p /* %g, %g, %g */);\n", (const void *) v, v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoord3i)(GLint s, GLint t, GLint r)
+{
+   DISPATCH(TexCoord3i, (s, t, r), (F, "glTexCoord3i(%d, %d, %d);\n", s, t, r));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoord3iv)(const GLint * v)
+{
+   DISPATCH(TexCoord3iv, (v), (F, "glTexCoord3iv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoord3s)(GLshort s, GLshort t, GLshort r)
+{
+   DISPATCH(TexCoord3s, (s, t, r), (F, "glTexCoord3s(%d, %d, %d);\n", s, t, r));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoord3sv)(const GLshort * v)
+{
+   DISPATCH(TexCoord3sv, (v), (F, "glTexCoord3sv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoord4d)(GLdouble s, GLdouble t, GLdouble r, GLdouble q)
+{
+   DISPATCH(TexCoord4d, (s, t, r, q), (F, "glTexCoord4d(%f, %f, %f, %f);\n", s, t, r, q));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoord4dv)(const GLdouble * v)
+{
+   DISPATCH(TexCoord4dv, (v), (F, "glTexCoord4dv(%p /* %g, %g, %g, %g */);\n", (const void *) v, v[0], v[1], v[2], v[3]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoord4f)(GLfloat s, GLfloat t, GLfloat r, GLfloat q)
+{
+   DISPATCH(TexCoord4f, (s, t, r, q), (F, "glTexCoord4f(%f, %f, %f, %f);\n", s, t, r, q));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoord4fv)(const GLfloat * v)
+{
+   DISPATCH(TexCoord4fv, (v), (F, "glTexCoord4fv(%p /* %g, %g, %g, %g */);\n", (const void *) v, v[0], v[1], v[2], v[3]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoord4i)(GLint s, GLint t, GLint r, GLint q)
+{
+   DISPATCH(TexCoord4i, (s, t, r, q), (F, "glTexCoord4i(%d, %d, %d, %d);\n", s, t, r, q));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoord4iv)(const GLint * v)
+{
+   DISPATCH(TexCoord4iv, (v), (F, "glTexCoord4iv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoord4s)(GLshort s, GLshort t, GLshort r, GLshort q)
+{
+   DISPATCH(TexCoord4s, (s, t, r, q), (F, "glTexCoord4s(%d, %d, %d, %d);\n", s, t, r, q));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoord4sv)(const GLshort * v)
+{
+   DISPATCH(TexCoord4sv, (v), (F, "glTexCoord4sv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Vertex2d)(GLdouble x, GLdouble y)
+{
+   DISPATCH(Vertex2d, (x, y), (F, "glVertex2d(%f, %f);\n", x, y));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Vertex2dv)(const GLdouble * v)
+{
+   DISPATCH(Vertex2dv, (v), (F, "glVertex2dv(%p /* %g, %g */);\n", (const void *) v, v[0], v[1]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Vertex2f)(GLfloat x, GLfloat y)
+{
+   DISPATCH(Vertex2f, (x, y), (F, "glVertex2f(%f, %f);\n", x, y));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Vertex2fv)(const GLfloat * v)
+{
+   DISPATCH(Vertex2fv, (v), (F, "glVertex2fv(%p /* %g, %g */);\n", (const void *) v, v[0], v[1]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Vertex2i)(GLint x, GLint y)
+{
+   DISPATCH(Vertex2i, (x, y), (F, "glVertex2i(%d, %d);\n", x, y));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Vertex2iv)(const GLint * v)
+{
+   DISPATCH(Vertex2iv, (v), (F, "glVertex2iv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Vertex2s)(GLshort x, GLshort y)
+{
+   DISPATCH(Vertex2s, (x, y), (F, "glVertex2s(%d, %d);\n", x, y));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Vertex2sv)(const GLshort * v)
+{
+   DISPATCH(Vertex2sv, (v), (F, "glVertex2sv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Vertex3d)(GLdouble x, GLdouble y, GLdouble z)
+{
+   DISPATCH(Vertex3d, (x, y, z), (F, "glVertex3d(%f, %f, %f);\n", x, y, z));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Vertex3dv)(const GLdouble * v)
+{
+   DISPATCH(Vertex3dv, (v), (F, "glVertex3dv(%p /* %g, %g, %g */);\n", (const void *) v, v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Vertex3f)(GLfloat x, GLfloat y, GLfloat z)
+{
+   DISPATCH(Vertex3f, (x, y, z), (F, "glVertex3f(%f, %f, %f);\n", x, y, z));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Vertex3fv)(const GLfloat * v)
+{
+   DISPATCH(Vertex3fv, (v), (F, "glVertex3fv(%p /* %g, %g, %g */);\n", (const void *) v, v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Vertex3i)(GLint x, GLint y, GLint z)
+{
+   DISPATCH(Vertex3i, (x, y, z), (F, "glVertex3i(%d, %d, %d);\n", x, y, z));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Vertex3iv)(const GLint * v)
+{
+   DISPATCH(Vertex3iv, (v), (F, "glVertex3iv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Vertex3s)(GLshort x, GLshort y, GLshort z)
+{
+   DISPATCH(Vertex3s, (x, y, z), (F, "glVertex3s(%d, %d, %d);\n", x, y, z));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Vertex3sv)(const GLshort * v)
+{
+   DISPATCH(Vertex3sv, (v), (F, "glVertex3sv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Vertex4d)(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
+{
+   DISPATCH(Vertex4d, (x, y, z, w), (F, "glVertex4d(%f, %f, %f, %f);\n", x, y, z, w));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Vertex4dv)(const GLdouble * v)
+{
+   DISPATCH(Vertex4dv, (v), (F, "glVertex4dv(%p /* %g, %g, %g, %g */);\n", (const void *) v, v[0], v[1], v[2], v[3]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Vertex4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   DISPATCH(Vertex4f, (x, y, z, w), (F, "glVertex4f(%f, %f, %f, %f);\n", x, y, z, w));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Vertex4fv)(const GLfloat * v)
+{
+   DISPATCH(Vertex4fv, (v), (F, "glVertex4fv(%p /* %g, %g, %g, %g */);\n", (const void *) v, v[0], v[1], v[2], v[3]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Vertex4i)(GLint x, GLint y, GLint z, GLint w)
+{
+   DISPATCH(Vertex4i, (x, y, z, w), (F, "glVertex4i(%d, %d, %d, %d);\n", x, y, z, w));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Vertex4iv)(const GLint * v)
+{
+   DISPATCH(Vertex4iv, (v), (F, "glVertex4iv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Vertex4s)(GLshort x, GLshort y, GLshort z, GLshort w)
+{
+   DISPATCH(Vertex4s, (x, y, z, w), (F, "glVertex4s(%d, %d, %d, %d);\n", x, y, z, w));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Vertex4sv)(const GLshort * v)
+{
+   DISPATCH(Vertex4sv, (v), (F, "glVertex4sv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ClipPlane)(GLenum plane, const GLdouble * equation)
+{
+   DISPATCH(ClipPlane, (plane, equation), (F, "glClipPlane(0x%x, %p);\n", plane, (const void *) equation));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ColorMaterial)(GLenum face, GLenum mode)
+{
+   DISPATCH(ColorMaterial, (face, mode), (F, "glColorMaterial(0x%x, 0x%x);\n", face, mode));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CullFace)(GLenum mode)
+{
+   DISPATCH(CullFace, (mode), (F, "glCullFace(0x%x);\n", mode));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Fogf)(GLenum pname, GLfloat param)
+{
+   DISPATCH(Fogf, (pname, param), (F, "glFogf(0x%x, %f);\n", pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Fogfv)(GLenum pname, const GLfloat * params)
+{
+   DISPATCH(Fogfv, (pname, params), (F, "glFogfv(0x%x, %p);\n", pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Fogi)(GLenum pname, GLint param)
+{
+   DISPATCH(Fogi, (pname, param), (F, "glFogi(0x%x, %d);\n", pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Fogiv)(GLenum pname, const GLint * params)
+{
+   DISPATCH(Fogiv, (pname, params), (F, "glFogiv(0x%x, %p);\n", pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FrontFace)(GLenum mode)
+{
+   DISPATCH(FrontFace, (mode), (F, "glFrontFace(0x%x);\n", mode));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Hint)(GLenum target, GLenum mode)
+{
+   DISPATCH(Hint, (target, mode), (F, "glHint(0x%x, 0x%x);\n", target, mode));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Lightf)(GLenum light, GLenum pname, GLfloat param)
+{
+   DISPATCH(Lightf, (light, pname, param), (F, "glLightf(0x%x, 0x%x, %f);\n", light, pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Lightfv)(GLenum light, GLenum pname, const GLfloat * params)
+{
+   DISPATCH(Lightfv, (light, pname, params), (F, "glLightfv(0x%x, 0x%x, %p);\n", light, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Lighti)(GLenum light, GLenum pname, GLint param)
+{
+   DISPATCH(Lighti, (light, pname, param), (F, "glLighti(0x%x, 0x%x, %d);\n", light, pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Lightiv)(GLenum light, GLenum pname, const GLint * params)
+{
+   DISPATCH(Lightiv, (light, pname, params), (F, "glLightiv(0x%x, 0x%x, %p);\n", light, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(LightModelf)(GLenum pname, GLfloat param)
+{
+   DISPATCH(LightModelf, (pname, param), (F, "glLightModelf(0x%x, %f);\n", pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(LightModelfv)(GLenum pname, const GLfloat * params)
+{
+   DISPATCH(LightModelfv, (pname, params), (F, "glLightModelfv(0x%x, %p);\n", pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(LightModeli)(GLenum pname, GLint param)
+{
+   DISPATCH(LightModeli, (pname, param), (F, "glLightModeli(0x%x, %d);\n", pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(LightModeliv)(GLenum pname, const GLint * params)
+{
+   DISPATCH(LightModeliv, (pname, params), (F, "glLightModeliv(0x%x, %p);\n", pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(LineStipple)(GLint factor, GLushort pattern)
+{
+   DISPATCH(LineStipple, (factor, pattern), (F, "glLineStipple(%d, %d);\n", factor, pattern));
+}
+
+KEYWORD1 void KEYWORD2 NAME(LineWidth)(GLfloat width)
+{
+   DISPATCH(LineWidth, (width), (F, "glLineWidth(%f);\n", width));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Materialf)(GLenum face, GLenum pname, GLfloat param)
+{
+   DISPATCH(Materialf, (face, pname, param), (F, "glMaterialf(0x%x, 0x%x, %f);\n", face, pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Materialfv)(GLenum face, GLenum pname, const GLfloat * params)
+{
+   DISPATCH(Materialfv, (face, pname, params), (F, "glMaterialfv(0x%x, 0x%x, %p);\n", face, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Materiali)(GLenum face, GLenum pname, GLint param)
+{
+   DISPATCH(Materiali, (face, pname, param), (F, "glMateriali(0x%x, 0x%x, %d);\n", face, pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Materialiv)(GLenum face, GLenum pname, const GLint * params)
+{
+   DISPATCH(Materialiv, (face, pname, params), (F, "glMaterialiv(0x%x, 0x%x, %p);\n", face, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PointSize)(GLfloat size)
+{
+   DISPATCH(PointSize, (size), (F, "glPointSize(%f);\n", size));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PolygonMode)(GLenum face, GLenum mode)
+{
+   DISPATCH(PolygonMode, (face, mode), (F, "glPolygonMode(0x%x, 0x%x);\n", face, mode));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PolygonStipple)(const GLubyte * mask)
+{
+   DISPATCH(PolygonStipple, (mask), (F, "glPolygonStipple(%p);\n", (const void *) mask));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Scissor)(GLint x, GLint y, GLsizei width, GLsizei height)
+{
+   DISPATCH(Scissor, (x, y, width, height), (F, "glScissor(%d, %d, %d, %d);\n", x, y, width, height));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ShadeModel)(GLenum mode)
+{
+   DISPATCH(ShadeModel, (mode), (F, "glShadeModel(0x%x);\n", mode));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexParameterf)(GLenum target, GLenum pname, GLfloat param)
+{
+   DISPATCH(TexParameterf, (target, pname, param), (F, "glTexParameterf(0x%x, 0x%x, %f);\n", target, pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexParameterfv)(GLenum target, GLenum pname, const GLfloat * params)
+{
+   DISPATCH(TexParameterfv, (target, pname, params), (F, "glTexParameterfv(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexParameteri)(GLenum target, GLenum pname, GLint param)
+{
+   DISPATCH(TexParameteri, (target, pname, param), (F, "glTexParameteri(0x%x, 0x%x, %d);\n", target, pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexParameteriv)(GLenum target, GLenum pname, const GLint * params)
+{
+   DISPATCH(TexParameteriv, (target, pname, params), (F, "glTexParameteriv(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexImage1D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid * pixels)
+{
+   DISPATCH(TexImage1D, (target, level, internalformat, width, border, format, type, pixels), (F, "glTexImage1D(0x%x, %d, %d, %d, %d, 0x%x, 0x%x, %p);\n", target, level, internalformat, width, border, format, type, (const void *) pixels));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexImage2D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid * pixels)
+{
+   DISPATCH(TexImage2D, (target, level, internalformat, width, height, border, format, type, pixels), (F, "glTexImage2D(0x%x, %d, %d, %d, %d, %d, 0x%x, 0x%x, %p);\n", target, level, internalformat, width, height, border, format, type, (const void *) pixels));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexEnvf)(GLenum target, GLenum pname, GLfloat param)
+{
+   DISPATCH(TexEnvf, (target, pname, param), (F, "glTexEnvf(0x%x, 0x%x, %f);\n", target, pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexEnvfv)(GLenum target, GLenum pname, const GLfloat * params)
+{
+   DISPATCH(TexEnvfv, (target, pname, params), (F, "glTexEnvfv(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexEnvi)(GLenum target, GLenum pname, GLint param)
+{
+   DISPATCH(TexEnvi, (target, pname, param), (F, "glTexEnvi(0x%x, 0x%x, %d);\n", target, pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexEnviv)(GLenum target, GLenum pname, const GLint * params)
+{
+   DISPATCH(TexEnviv, (target, pname, params), (F, "glTexEnviv(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexGend)(GLenum coord, GLenum pname, GLdouble param)
+{
+   DISPATCH(TexGend, (coord, pname, param), (F, "glTexGend(0x%x, 0x%x, %f);\n", coord, pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexGendv)(GLenum coord, GLenum pname, const GLdouble * params)
+{
+   DISPATCH(TexGendv, (coord, pname, params), (F, "glTexGendv(0x%x, 0x%x, %p);\n", coord, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexGenf)(GLenum coord, GLenum pname, GLfloat param)
+{
+   DISPATCH(TexGenf, (coord, pname, param), (F, "glTexGenf(0x%x, 0x%x, %f);\n", coord, pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexGenfv)(GLenum coord, GLenum pname, const GLfloat * params)
+{
+   DISPATCH(TexGenfv, (coord, pname, params), (F, "glTexGenfv(0x%x, 0x%x, %p);\n", coord, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexGeni)(GLenum coord, GLenum pname, GLint param)
+{
+   DISPATCH(TexGeni, (coord, pname, param), (F, "glTexGeni(0x%x, 0x%x, %d);\n", coord, pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexGeniv)(GLenum coord, GLenum pname, const GLint * params)
+{
+   DISPATCH(TexGeniv, (coord, pname, params), (F, "glTexGeniv(0x%x, 0x%x, %p);\n", coord, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FeedbackBuffer)(GLsizei size, GLenum type, GLfloat * buffer)
+{
+   DISPATCH(FeedbackBuffer, (size, type, buffer), (F, "glFeedbackBuffer(%d, 0x%x, %p);\n", size, type, (const void *) buffer));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SelectBuffer)(GLsizei size, GLuint * buffer)
+{
+   DISPATCH(SelectBuffer, (size, buffer), (F, "glSelectBuffer(%d, %p);\n", size, (const void *) buffer));
+}
+
+KEYWORD1 GLint KEYWORD2 NAME(RenderMode)(GLenum mode)
+{
+   RETURN_DISPATCH(RenderMode, (mode), (F, "glRenderMode(0x%x);\n", mode));
+}
+
+KEYWORD1 void KEYWORD2 NAME(InitNames)(void)
+{
+   DISPATCH(InitNames, (), (F, "glInitNames();\n"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(LoadName)(GLuint name)
+{
+   DISPATCH(LoadName, (name), (F, "glLoadName(%d);\n", name));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PassThrough)(GLfloat token)
+{
+   DISPATCH(PassThrough, (token), (F, "glPassThrough(%f);\n", token));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PopName)(void)
+{
+   DISPATCH(PopName, (), (F, "glPopName();\n"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PushName)(GLuint name)
+{
+   DISPATCH(PushName, (name), (F, "glPushName(%d);\n", name));
+}
+
+KEYWORD1 void KEYWORD2 NAME(DrawBuffer)(GLenum mode)
+{
+   DISPATCH(DrawBuffer, (mode), (F, "glDrawBuffer(0x%x);\n", mode));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Clear)(GLbitfield mask)
+{
+   DISPATCH(Clear, (mask), (F, "glClear(%p);\n", (const void *) mask));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ClearAccum)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
+{
+   DISPATCH(ClearAccum, (red, green, blue, alpha), (F, "glClearAccum(%f, %f, %f, %f);\n", red, green, blue, alpha));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ClearIndex)(GLfloat c)
+{
+   DISPATCH(ClearIndex, (c), (F, "glClearIndex(%f);\n", c));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ClearColor)(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
+{
+   DISPATCH(ClearColor, (red, green, blue, alpha), (F, "glClearColor(%f, %f, %f, %f);\n", red, green, blue, alpha));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ClearStencil)(GLint s)
+{
+   DISPATCH(ClearStencil, (s), (F, "glClearStencil(%d);\n", s));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ClearDepth)(GLclampd depth)
+{
+   DISPATCH(ClearDepth, (depth), (F, "glClearDepth(%f);\n", depth));
+}
+
+KEYWORD1 void KEYWORD2 NAME(StencilMask)(GLuint mask)
+{
+   DISPATCH(StencilMask, (mask), (F, "glStencilMask(%d);\n", mask));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ColorMask)(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
+{
+   DISPATCH(ColorMask, (red, green, blue, alpha), (F, "glColorMask(%d, %d, %d, %d);\n", red, green, blue, alpha));
+}
+
+KEYWORD1 void KEYWORD2 NAME(DepthMask)(GLboolean flag)
+{
+   DISPATCH(DepthMask, (flag), (F, "glDepthMask(%d);\n", flag));
+}
+
+KEYWORD1 void KEYWORD2 NAME(IndexMask)(GLuint mask)
+{
+   DISPATCH(IndexMask, (mask), (F, "glIndexMask(%d);\n", mask));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Accum)(GLenum op, GLfloat value)
+{
+   DISPATCH(Accum, (op, value), (F, "glAccum(0x%x, %f);\n", op, value));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Disable)(GLenum cap)
+{
+   DISPATCH(Disable, (cap), (F, "glDisable(0x%x);\n", cap));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Enable)(GLenum cap)
+{
+   DISPATCH(Enable, (cap), (F, "glEnable(0x%x);\n", cap));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Finish)(void)
+{
+   DISPATCH(Finish, (), (F, "glFinish();\n"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Flush)(void)
+{
+   DISPATCH(Flush, (), (F, "glFlush();\n"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PopAttrib)(void)
+{
+   DISPATCH(PopAttrib, (), (F, "glPopAttrib();\n"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PushAttrib)(GLbitfield mask)
+{
+   DISPATCH(PushAttrib, (mask), (F, "glPushAttrib(%p);\n", (const void *) mask));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Map1d)(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble * points)
+{
+   DISPATCH(Map1d, (target, u1, u2, stride, order, points), (F, "glMap1d(0x%x, %f, %f, %d, %d, %p);\n", target, u1, u2, stride, order, (const void *) points));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Map1f)(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat * points)
+{
+   DISPATCH(Map1f, (target, u1, u2, stride, order, points), (F, "glMap1f(0x%x, %f, %f, %d, %d, %p);\n", target, u1, u2, stride, order, (const void *) points));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Map2d)(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble * points)
+{
+   DISPATCH(Map2d, (target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points), (F, "glMap2d(0x%x, %f, %f, %d, %d, %f, %f, %d, %d, %p);\n", target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, (const void *) points));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Map2f)(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat * points)
+{
+   DISPATCH(Map2f, (target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points), (F, "glMap2f(0x%x, %f, %f, %d, %d, %f, %f, %d, %d, %p);\n", target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, (const void *) points));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MapGrid1d)(GLint un, GLdouble u1, GLdouble u2)
+{
+   DISPATCH(MapGrid1d, (un, u1, u2), (F, "glMapGrid1d(%d, %f, %f);\n", un, u1, u2));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MapGrid1f)(GLint un, GLfloat u1, GLfloat u2)
+{
+   DISPATCH(MapGrid1f, (un, u1, u2), (F, "glMapGrid1f(%d, %f, %f);\n", un, u1, u2));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MapGrid2d)(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2)
+{
+   DISPATCH(MapGrid2d, (un, u1, u2, vn, v1, v2), (F, "glMapGrid2d(%d, %f, %f, %d, %f, %f);\n", un, u1, u2, vn, v1, v2));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MapGrid2f)(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2)
+{
+   DISPATCH(MapGrid2f, (un, u1, u2, vn, v1, v2), (F, "glMapGrid2f(%d, %f, %f, %d, %f, %f);\n", un, u1, u2, vn, v1, v2));
+}
+
+KEYWORD1 void KEYWORD2 NAME(EvalCoord1d)(GLdouble u)
+{
+   DISPATCH(EvalCoord1d, (u), (F, "glEvalCoord1d(%f);\n", u));
+}
+
+KEYWORD1 void KEYWORD2 NAME(EvalCoord1dv)(const GLdouble * u)
+{
+   DISPATCH(EvalCoord1dv, (u), (F, "glEvalCoord1dv(%p);\n", (const void *) u));
+}
+
+KEYWORD1 void KEYWORD2 NAME(EvalCoord1f)(GLfloat u)
+{
+   DISPATCH(EvalCoord1f, (u), (F, "glEvalCoord1f(%f);\n", u));
+}
+
+KEYWORD1 void KEYWORD2 NAME(EvalCoord1fv)(const GLfloat * u)
+{
+   DISPATCH(EvalCoord1fv, (u), (F, "glEvalCoord1fv(%p);\n", (const void *) u));
+}
+
+KEYWORD1 void KEYWORD2 NAME(EvalCoord2d)(GLdouble u, GLdouble v)
+{
+   DISPATCH(EvalCoord2d, (u, v), (F, "glEvalCoord2d(%f, %f);\n", u, v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(EvalCoord2dv)(const GLdouble * u)
+{
+   DISPATCH(EvalCoord2dv, (u), (F, "glEvalCoord2dv(%p /* %g, %g */);\n", (const void *) u, u[0], u[1]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(EvalCoord2f)(GLfloat u, GLfloat v)
+{
+   DISPATCH(EvalCoord2f, (u, v), (F, "glEvalCoord2f(%f, %f);\n", u, v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(EvalCoord2fv)(const GLfloat * u)
+{
+   DISPATCH(EvalCoord2fv, (u), (F, "glEvalCoord2fv(%p /* %g, %g */);\n", (const void *) u, u[0], u[1]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(EvalMesh1)(GLenum mode, GLint i1, GLint i2)
+{
+   DISPATCH(EvalMesh1, (mode, i1, i2), (F, "glEvalMesh1(0x%x, %d, %d);\n", mode, i1, i2));
+}
+
+KEYWORD1 void KEYWORD2 NAME(EvalPoint1)(GLint i)
+{
+   DISPATCH(EvalPoint1, (i), (F, "glEvalPoint1(%d);\n", i));
+}
+
+KEYWORD1 void KEYWORD2 NAME(EvalMesh2)(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2)
+{
+   DISPATCH(EvalMesh2, (mode, i1, i2, j1, j2), (F, "glEvalMesh2(0x%x, %d, %d, %d, %d);\n", mode, i1, i2, j1, j2));
+}
+
+KEYWORD1 void KEYWORD2 NAME(EvalPoint2)(GLint i, GLint j)
+{
+   DISPATCH(EvalPoint2, (i, j), (F, "glEvalPoint2(%d, %d);\n", i, j));
+}
+
+KEYWORD1 void KEYWORD2 NAME(AlphaFunc)(GLenum func, GLclampf ref)
+{
+   DISPATCH(AlphaFunc, (func, ref), (F, "glAlphaFunc(0x%x, %f);\n", func, ref));
+}
+
+KEYWORD1 void KEYWORD2 NAME(BlendFunc)(GLenum sfactor, GLenum dfactor)
+{
+   DISPATCH(BlendFunc, (sfactor, dfactor), (F, "glBlendFunc(0x%x, 0x%x);\n", sfactor, dfactor));
+}
+
+KEYWORD1 void KEYWORD2 NAME(LogicOp)(GLenum opcode)
+{
+   DISPATCH(LogicOp, (opcode), (F, "glLogicOp(0x%x);\n", opcode));
+}
+
+KEYWORD1 void KEYWORD2 NAME(StencilFunc)(GLenum func, GLint ref, GLuint mask)
+{
+   DISPATCH(StencilFunc, (func, ref, mask), (F, "glStencilFunc(0x%x, %d, %d);\n", func, ref, mask));
+}
+
+KEYWORD1 void KEYWORD2 NAME(StencilOp)(GLenum fail, GLenum zfail, GLenum zpass)
+{
+   DISPATCH(StencilOp, (fail, zfail, zpass), (F, "glStencilOp(0x%x, 0x%x, 0x%x);\n", fail, zfail, zpass));
+}
+
+KEYWORD1 void KEYWORD2 NAME(DepthFunc)(GLenum func)
+{
+   DISPATCH(DepthFunc, (func), (F, "glDepthFunc(0x%x);\n", func));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PixelZoom)(GLfloat xfactor, GLfloat yfactor)
+{
+   DISPATCH(PixelZoom, (xfactor, yfactor), (F, "glPixelZoom(%f, %f);\n", xfactor, yfactor));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PixelTransferf)(GLenum pname, GLfloat param)
+{
+   DISPATCH(PixelTransferf, (pname, param), (F, "glPixelTransferf(0x%x, %f);\n", pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PixelTransferi)(GLenum pname, GLint param)
+{
+   DISPATCH(PixelTransferi, (pname, param), (F, "glPixelTransferi(0x%x, %d);\n", pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PixelStoref)(GLenum pname, GLfloat param)
+{
+   DISPATCH(PixelStoref, (pname, param), (F, "glPixelStoref(0x%x, %f);\n", pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PixelStorei)(GLenum pname, GLint param)
+{
+   DISPATCH(PixelStorei, (pname, param), (F, "glPixelStorei(0x%x, %d);\n", pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PixelMapfv)(GLenum map, GLsizei mapsize, const GLfloat * values)
+{
+   DISPATCH(PixelMapfv, (map, mapsize, values), (F, "glPixelMapfv(0x%x, %d, %p);\n", map, mapsize, (const void *) values));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PixelMapuiv)(GLenum map, GLsizei mapsize, const GLuint * values)
+{
+   DISPATCH(PixelMapuiv, (map, mapsize, values), (F, "glPixelMapuiv(0x%x, %d, %p);\n", map, mapsize, (const void *) values));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PixelMapusv)(GLenum map, GLsizei mapsize, const GLushort * values)
+{
+   DISPATCH(PixelMapusv, (map, mapsize, values), (F, "glPixelMapusv(0x%x, %d, %p);\n", map, mapsize, (const void *) values));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ReadBuffer)(GLenum mode)
+{
+   DISPATCH(ReadBuffer, (mode), (F, "glReadBuffer(0x%x);\n", mode));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CopyPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type)
+{
+   DISPATCH(CopyPixels, (x, y, width, height, type), (F, "glCopyPixels(%d, %d, %d, %d, 0x%x);\n", x, y, width, height, type));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ReadPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid * pixels)
+{
+   DISPATCH(ReadPixels, (x, y, width, height, format, type, pixels), (F, "glReadPixels(%d, %d, %d, %d, 0x%x, 0x%x, %p);\n", x, y, width, height, format, type, (const void *) pixels));
+}
+
+KEYWORD1 void KEYWORD2 NAME(DrawPixels)(GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * pixels)
+{
+   DISPATCH(DrawPixels, (width, height, format, type, pixels), (F, "glDrawPixels(%d, %d, 0x%x, 0x%x, %p);\n", width, height, format, type, (const void *) pixels));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetBooleanv)(GLenum pname, GLboolean * params)
+{
+   DISPATCH(GetBooleanv, (pname, params), (F, "glGetBooleanv(0x%x, %p);\n", pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetClipPlane)(GLenum plane, GLdouble * equation)
+{
+   DISPATCH(GetClipPlane, (plane, equation), (F, "glGetClipPlane(0x%x, %p);\n", plane, (const void *) equation));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetDoublev)(GLenum pname, GLdouble * params)
+{
+   DISPATCH(GetDoublev, (pname, params), (F, "glGetDoublev(0x%x, %p);\n", pname, (const void *) params));
+}
+
+KEYWORD1 GLenum KEYWORD2 NAME(GetError)(void)
+{
+   RETURN_DISPATCH(GetError, (), (F, "glGetError();\n"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetFloatv)(GLenum pname, GLfloat * params)
+{
+   DISPATCH(GetFloatv, (pname, params), (F, "glGetFloatv(0x%x, %p);\n", pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetIntegerv)(GLenum pname, GLint * params)
+{
+   DISPATCH(GetIntegerv, (pname, params), (F, "glGetIntegerv(0x%x, %p);\n", pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetLightfv)(GLenum light, GLenum pname, GLfloat * params)
+{
+   DISPATCH(GetLightfv, (light, pname, params), (F, "glGetLightfv(0x%x, 0x%x, %p);\n", light, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetLightiv)(GLenum light, GLenum pname, GLint * params)
+{
+   DISPATCH(GetLightiv, (light, pname, params), (F, "glGetLightiv(0x%x, 0x%x, %p);\n", light, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetMapdv)(GLenum target, GLenum query, GLdouble * v)
+{
+   DISPATCH(GetMapdv, (target, query, v), (F, "glGetMapdv(0x%x, 0x%x, %p);\n", target, query, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetMapfv)(GLenum target, GLenum query, GLfloat * v)
+{
+   DISPATCH(GetMapfv, (target, query, v), (F, "glGetMapfv(0x%x, 0x%x, %p);\n", target, query, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetMapiv)(GLenum target, GLenum query, GLint * v)
+{
+   DISPATCH(GetMapiv, (target, query, v), (F, "glGetMapiv(0x%x, 0x%x, %p);\n", target, query, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetMaterialfv)(GLenum face, GLenum pname, GLfloat * params)
+{
+   DISPATCH(GetMaterialfv, (face, pname, params), (F, "glGetMaterialfv(0x%x, 0x%x, %p);\n", face, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetMaterialiv)(GLenum face, GLenum pname, GLint * params)
+{
+   DISPATCH(GetMaterialiv, (face, pname, params), (F, "glGetMaterialiv(0x%x, 0x%x, %p);\n", face, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetPixelMapfv)(GLenum map, GLfloat * values)
+{
+   DISPATCH(GetPixelMapfv, (map, values), (F, "glGetPixelMapfv(0x%x, %p);\n", map, (const void *) values));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetPixelMapuiv)(GLenum map, GLuint * values)
+{
+   DISPATCH(GetPixelMapuiv, (map, values), (F, "glGetPixelMapuiv(0x%x, %p);\n", map, (const void *) values));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetPixelMapusv)(GLenum map, GLushort * values)
+{
+   DISPATCH(GetPixelMapusv, (map, values), (F, "glGetPixelMapusv(0x%x, %p);\n", map, (const void *) values));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetPolygonStipple)(GLubyte * mask)
+{
+   DISPATCH(GetPolygonStipple, (mask), (F, "glGetPolygonStipple(%p);\n", (const void *) mask));
+}
+
+KEYWORD1 const GLubyte * KEYWORD2 NAME(GetString)(GLenum name)
+{
+   RETURN_DISPATCH(GetString, (name), (F, "glGetString(0x%x);\n", name));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetTexEnvfv)(GLenum target, GLenum pname, GLfloat * params)
+{
+   DISPATCH(GetTexEnvfv, (target, pname, params), (F, "glGetTexEnvfv(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetTexEnviv)(GLenum target, GLenum pname, GLint * params)
+{
+   DISPATCH(GetTexEnviv, (target, pname, params), (F, "glGetTexEnviv(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetTexGendv)(GLenum coord, GLenum pname, GLdouble * params)
+{
+   DISPATCH(GetTexGendv, (coord, pname, params), (F, "glGetTexGendv(0x%x, 0x%x, %p);\n", coord, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetTexGenfv)(GLenum coord, GLenum pname, GLfloat * params)
+{
+   DISPATCH(GetTexGenfv, (coord, pname, params), (F, "glGetTexGenfv(0x%x, 0x%x, %p);\n", coord, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetTexGeniv)(GLenum coord, GLenum pname, GLint * params)
+{
+   DISPATCH(GetTexGeniv, (coord, pname, params), (F, "glGetTexGeniv(0x%x, 0x%x, %p);\n", coord, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetTexImage)(GLenum target, GLint level, GLenum format, GLenum type, GLvoid * pixels)
+{
+   DISPATCH(GetTexImage, (target, level, format, type, pixels), (F, "glGetTexImage(0x%x, %d, 0x%x, 0x%x, %p);\n", target, level, format, type, (const void *) pixels));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetTexParameterfv)(GLenum target, GLenum pname, GLfloat * params)
+{
+   DISPATCH(GetTexParameterfv, (target, pname, params), (F, "glGetTexParameterfv(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetTexParameteriv)(GLenum target, GLenum pname, GLint * params)
+{
+   DISPATCH(GetTexParameteriv, (target, pname, params), (F, "glGetTexParameteriv(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetTexLevelParameterfv)(GLenum target, GLint level, GLenum pname, GLfloat * params)
+{
+   DISPATCH(GetTexLevelParameterfv, (target, level, pname, params), (F, "glGetTexLevelParameterfv(0x%x, %d, 0x%x, %p);\n", target, level, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetTexLevelParameteriv)(GLenum target, GLint level, GLenum pname, GLint * params)
+{
+   DISPATCH(GetTexLevelParameteriv, (target, level, pname, params), (F, "glGetTexLevelParameteriv(0x%x, %d, 0x%x, %p);\n", target, level, pname, (const void *) params));
+}
+
+KEYWORD1 GLboolean KEYWORD2 NAME(IsEnabled)(GLenum cap)
+{
+   RETURN_DISPATCH(IsEnabled, (cap), (F, "glIsEnabled(0x%x);\n", cap));
+}
+
+KEYWORD1 GLboolean KEYWORD2 NAME(IsList)(GLuint list)
+{
+   RETURN_DISPATCH(IsList, (list), (F, "glIsList(%d);\n", list));
+}
+
+KEYWORD1 void KEYWORD2 NAME(DepthRange)(GLclampd zNear, GLclampd zFar)
+{
+   DISPATCH(DepthRange, (zNear, zFar), (F, "glDepthRange(%f, %f);\n", zNear, zFar));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Frustum)(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
+{
+   DISPATCH(Frustum, (left, right, bottom, top, zNear, zFar), (F, "glFrustum(%f, %f, %f, %f, %f, %f);\n", left, right, bottom, top, zNear, zFar));
+}
+
+KEYWORD1 void KEYWORD2 NAME(LoadIdentity)(void)
+{
+   DISPATCH(LoadIdentity, (), (F, "glLoadIdentity();\n"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(LoadMatrixf)(const GLfloat * m)
+{
+   DISPATCH(LoadMatrixf, (m), (F, "glLoadMatrixf(%p);\n", (const void *) m));
+}
+
+KEYWORD1 void KEYWORD2 NAME(LoadMatrixd)(const GLdouble * m)
+{
+   DISPATCH(LoadMatrixd, (m), (F, "glLoadMatrixd(%p);\n", (const void *) m));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MatrixMode)(GLenum mode)
+{
+   DISPATCH(MatrixMode, (mode), (F, "glMatrixMode(0x%x);\n", mode));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultMatrixf)(const GLfloat * m)
+{
+   DISPATCH(MultMatrixf, (m), (F, "glMultMatrixf(%p);\n", (const void *) m));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultMatrixd)(const GLdouble * m)
+{
+   DISPATCH(MultMatrixd, (m), (F, "glMultMatrixd(%p);\n", (const void *) m));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Ortho)(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
+{
+   DISPATCH(Ortho, (left, right, bottom, top, zNear, zFar), (F, "glOrtho(%f, %f, %f, %f, %f, %f);\n", left, right, bottom, top, zNear, zFar));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PopMatrix)(void)
+{
+   DISPATCH(PopMatrix, (), (F, "glPopMatrix();\n"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PushMatrix)(void)
+{
+   DISPATCH(PushMatrix, (), (F, "glPushMatrix();\n"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Rotated)(GLdouble angle, GLdouble x, GLdouble y, GLdouble z)
+{
+   DISPATCH(Rotated, (angle, x, y, z), (F, "glRotated(%f, %f, %f, %f);\n", angle, x, y, z));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Rotatef)(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
+{
+   DISPATCH(Rotatef, (angle, x, y, z), (F, "glRotatef(%f, %f, %f, %f);\n", angle, x, y, z));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Scaled)(GLdouble x, GLdouble y, GLdouble z)
+{
+   DISPATCH(Scaled, (x, y, z), (F, "glScaled(%f, %f, %f);\n", x, y, z));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Scalef)(GLfloat x, GLfloat y, GLfloat z)
+{
+   DISPATCH(Scalef, (x, y, z), (F, "glScalef(%f, %f, %f);\n", x, y, z));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Translated)(GLdouble x, GLdouble y, GLdouble z)
+{
+   DISPATCH(Translated, (x, y, z), (F, "glTranslated(%f, %f, %f);\n", x, y, z));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Translatef)(GLfloat x, GLfloat y, GLfloat z)
+{
+   DISPATCH(Translatef, (x, y, z), (F, "glTranslatef(%f, %f, %f);\n", x, y, z));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Viewport)(GLint x, GLint y, GLsizei width, GLsizei height)
+{
+   DISPATCH(Viewport, (x, y, width, height), (F, "glViewport(%d, %d, %d, %d);\n", x, y, width, height));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ArrayElement)(GLint i)
+{
+   DISPATCH(ArrayElement, (i), (F, "glArrayElement(%d);\n", i));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ColorPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer)
+{
+   DISPATCH(ColorPointer, (size, type, stride, pointer), (F, "glColorPointer(%d, 0x%x, %d, %p);\n", size, type, stride, (const void *) pointer));
+}
+
+KEYWORD1 void KEYWORD2 NAME(DisableClientState)(GLenum array)
+{
+   DISPATCH(DisableClientState, (array), (F, "glDisableClientState(0x%x);\n", array));
+}
+
+KEYWORD1 void KEYWORD2 NAME(DrawArrays)(GLenum mode, GLint first, GLsizei count)
+{
+   DISPATCH(DrawArrays, (mode, first, count), (F, "glDrawArrays(0x%x, %d, %d);\n", mode, first, count));
+}
+
+KEYWORD1 void KEYWORD2 NAME(DrawElements)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices)
+{
+   DISPATCH(DrawElements, (mode, count, type, indices), (F, "glDrawElements(0x%x, %d, 0x%x, %p);\n", mode, count, type, (const void *) indices));
+}
+
+KEYWORD1 void KEYWORD2 NAME(EdgeFlagPointer)(GLsizei stride, const GLvoid * pointer)
+{
+   DISPATCH(EdgeFlagPointer, (stride, pointer), (F, "glEdgeFlagPointer(%d, %p);\n", stride, (const void *) pointer));
+}
+
+KEYWORD1 void KEYWORD2 NAME(EnableClientState)(GLenum array)
+{
+   DISPATCH(EnableClientState, (array), (F, "glEnableClientState(0x%x);\n", array));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetPointerv)(GLenum pname, GLvoid ** params)
+{
+   DISPATCH(GetPointerv, (pname, params), (F, "glGetPointerv(0x%x, %p);\n", pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(IndexPointer)(GLenum type, GLsizei stride, const GLvoid * pointer)
+{
+   DISPATCH(IndexPointer, (type, stride, pointer), (F, "glIndexPointer(0x%x, %d, %p);\n", type, stride, (const void *) pointer));
+}
+
+KEYWORD1 void KEYWORD2 NAME(InterleavedArrays)(GLenum format, GLsizei stride, const GLvoid * pointer)
+{
+   DISPATCH(InterleavedArrays, (format, stride, pointer), (F, "glInterleavedArrays(0x%x, %d, %p);\n", format, stride, (const void *) pointer));
+}
+
+KEYWORD1 void KEYWORD2 NAME(NormalPointer)(GLenum type, GLsizei stride, const GLvoid * pointer)
+{
+   DISPATCH(NormalPointer, (type, stride, pointer), (F, "glNormalPointer(0x%x, %d, %p);\n", type, stride, (const void *) pointer));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoordPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer)
+{
+   DISPATCH(TexCoordPointer, (size, type, stride, pointer), (F, "glTexCoordPointer(%d, 0x%x, %d, %p);\n", size, type, stride, (const void *) pointer));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer)
+{
+   DISPATCH(VertexPointer, (size, type, stride, pointer), (F, "glVertexPointer(%d, 0x%x, %d, %p);\n", size, type, stride, (const void *) pointer));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PolygonOffset)(GLfloat factor, GLfloat units)
+{
+   DISPATCH(PolygonOffset, (factor, units), (F, "glPolygonOffset(%f, %f);\n", factor, units));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CopyTexImage1D)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
+{
+   DISPATCH(CopyTexImage1D, (target, level, internalformat, x, y, width, border), (F, "glCopyTexImage1D(0x%x, %d, 0x%x, %d, %d, %d, %d);\n", target, level, internalformat, x, y, width, border));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CopyTexImage2D)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
+{
+   DISPATCH(CopyTexImage2D, (target, level, internalformat, x, y, width, height, border), (F, "glCopyTexImage2D(0x%x, %d, 0x%x, %d, %d, %d, %d, %d);\n", target, level, internalformat, x, y, width, height, border));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CopyTexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
+{
+   DISPATCH(CopyTexSubImage1D, (target, level, xoffset, x, y, width), (F, "glCopyTexSubImage1D(0x%x, %d, %d, %d, %d, %d);\n", target, level, xoffset, x, y, width));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CopyTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
+{
+   DISPATCH(CopyTexSubImage2D, (target, level, xoffset, yoffset, x, y, width, height), (F, "glCopyTexSubImage2D(0x%x, %d, %d, %d, %d, %d, %d, %d);\n", target, level, xoffset, yoffset, x, y, width, height));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid * pixels)
+{
+   DISPATCH(TexSubImage1D, (target, level, xoffset, width, format, type, pixels), (F, "glTexSubImage1D(0x%x, %d, %d, %d, 0x%x, 0x%x, %p);\n", target, level, xoffset, width, format, type, (const void *) pixels));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * pixels)
+{
+   DISPATCH(TexSubImage2D, (target, level, xoffset, yoffset, width, height, format, type, pixels), (F, "glTexSubImage2D(0x%x, %d, %d, %d, %d, %d, 0x%x, 0x%x, %p);\n", target, level, xoffset, yoffset, width, height, format, type, (const void *) pixels));
+}
+
+KEYWORD1 GLboolean KEYWORD2 NAME(AreTexturesResident)(GLsizei n, const GLuint * textures, GLboolean * residences)
+{
+   RETURN_DISPATCH(AreTexturesResident, (n, textures, residences), (F, "glAreTexturesResident(%d, %p, %p);\n", n, (const void *) textures, (const void *) residences));
+}
+
+KEYWORD1 void KEYWORD2 NAME(BindTexture)(GLenum target, GLuint texture)
+{
+   DISPATCH(BindTexture, (target, texture), (F, "glBindTexture(0x%x, %d);\n", target, texture));
+}
+
+KEYWORD1 void KEYWORD2 NAME(DeleteTextures)(GLsizei n, const GLuint * textures)
+{
+   DISPATCH(DeleteTextures, (n, textures), (F, "glDeleteTextures(%d, %p);\n", n, (const void *) textures));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GenTextures)(GLsizei n, GLuint * textures)
+{
+   DISPATCH(GenTextures, (n, textures), (F, "glGenTextures(%d, %p);\n", n, (const void *) textures));
+}
+
+KEYWORD1 GLboolean KEYWORD2 NAME(IsTexture)(GLuint texture)
+{
+   RETURN_DISPATCH(IsTexture, (texture), (F, "glIsTexture(%d);\n", texture));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PrioritizeTextures)(GLsizei n, const GLuint * textures, const GLclampf * priorities)
+{
+   DISPATCH(PrioritizeTextures, (n, textures, priorities), (F, "glPrioritizeTextures(%d, %p, %p);\n", n, (const void *) textures, (const void *) priorities));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Indexub)(GLubyte c)
+{
+   DISPATCH(Indexub, (c), (F, "glIndexub(%d);\n", c));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Indexubv)(const GLubyte * c)
+{
+   DISPATCH(Indexubv, (c), (F, "glIndexubv(%p);\n", (const void *) c));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PopClientAttrib)(void)
+{
+   DISPATCH(PopClientAttrib, (), (F, "glPopClientAttrib();\n"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PushClientAttrib)(GLbitfield mask)
+{
+   DISPATCH(PushClientAttrib, (mask), (F, "glPushClientAttrib(%p);\n", (const void *) mask));
+}
+
+KEYWORD1 void KEYWORD2 NAME(BlendColor)(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
+{
+   DISPATCH(BlendColor, (red, green, blue, alpha), (F, "glBlendColor(%f, %f, %f, %f);\n", red, green, blue, alpha));
+}
+
+KEYWORD1 void KEYWORD2 NAME(BlendEquation)(GLenum mode)
+{
+   DISPATCH(BlendEquation, (mode), (F, "glBlendEquation(0x%x);\n", mode));
+}
+
+KEYWORD1 void KEYWORD2 NAME(DrawRangeElements)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid * indices)
+{
+   DISPATCH(DrawRangeElements, (mode, start, end, count, type, indices), (F, "glDrawRangeElements(0x%x, %d, %d, %d, 0x%x, %p);\n", mode, start, end, count, type, (const void *) indices));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ColorTable)(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid * table)
+{
+   DISPATCH(ColorTable, (target, internalformat, width, format, type, table), (F, "glColorTable(0x%x, 0x%x, %d, 0x%x, 0x%x, %p);\n", target, internalformat, width, format, type, (const void *) table));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ColorTableParameterfv)(GLenum target, GLenum pname, const GLfloat * params)
+{
+   DISPATCH(ColorTableParameterfv, (target, pname, params), (F, "glColorTableParameterfv(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ColorTableParameteriv)(GLenum target, GLenum pname, const GLint * params)
+{
+   DISPATCH(ColorTableParameteriv, (target, pname, params), (F, "glColorTableParameteriv(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CopyColorTable)(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
+{
+   DISPATCH(CopyColorTable, (target, internalformat, x, y, width), (F, "glCopyColorTable(0x%x, 0x%x, %d, %d, %d);\n", target, internalformat, x, y, width));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetColorTable)(GLenum target, GLenum format, GLenum type, GLvoid * table)
+{
+   DISPATCH(GetColorTable, (target, format, type, table), (F, "glGetColorTable(0x%x, 0x%x, 0x%x, %p);\n", target, format, type, (const void *) table));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetColorTableParameterfv)(GLenum target, GLenum pname, GLfloat * params)
+{
+   DISPATCH(GetColorTableParameterfv, (target, pname, params), (F, "glGetColorTableParameterfv(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetColorTableParameteriv)(GLenum target, GLenum pname, GLint * params)
+{
+   DISPATCH(GetColorTableParameteriv, (target, pname, params), (F, "glGetColorTableParameteriv(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ColorSubTable)(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid * data)
+{
+   DISPATCH(ColorSubTable, (target, start, count, format, type, data), (F, "glColorSubTable(0x%x, %d, %d, 0x%x, 0x%x, %p);\n", target, start, count, format, type, (const void *) data));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CopyColorSubTable)(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width)
+{
+   DISPATCH(CopyColorSubTable, (target, start, x, y, width), (F, "glCopyColorSubTable(0x%x, %d, %d, %d, %d);\n", target, start, x, y, width));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ConvolutionFilter1D)(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid * image)
+{
+   DISPATCH(ConvolutionFilter1D, (target, internalformat, width, format, type, image), (F, "glConvolutionFilter1D(0x%x, 0x%x, %d, 0x%x, 0x%x, %p);\n", target, internalformat, width, format, type, (const void *) image));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ConvolutionFilter2D)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * image)
+{
+   DISPATCH(ConvolutionFilter2D, (target, internalformat, width, height, format, type, image), (F, "glConvolutionFilter2D(0x%x, 0x%x, %d, %d, 0x%x, 0x%x, %p);\n", target, internalformat, width, height, format, type, (const void *) image));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ConvolutionParameterf)(GLenum target, GLenum pname, GLfloat params)
+{
+   DISPATCH(ConvolutionParameterf, (target, pname, params), (F, "glConvolutionParameterf(0x%x, 0x%x, %f);\n", target, pname, params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ConvolutionParameterfv)(GLenum target, GLenum pname, const GLfloat * params)
+{
+   DISPATCH(ConvolutionParameterfv, (target, pname, params), (F, "glConvolutionParameterfv(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ConvolutionParameteri)(GLenum target, GLenum pname, GLint params)
+{
+   DISPATCH(ConvolutionParameteri, (target, pname, params), (F, "glConvolutionParameteri(0x%x, 0x%x, %d);\n", target, pname, params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ConvolutionParameteriv)(GLenum target, GLenum pname, const GLint * params)
+{
+   DISPATCH(ConvolutionParameteriv, (target, pname, params), (F, "glConvolutionParameteriv(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CopyConvolutionFilter1D)(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
+{
+   DISPATCH(CopyConvolutionFilter1D, (target, internalformat, x, y, width), (F, "glCopyConvolutionFilter1D(0x%x, 0x%x, %d, %d, %d);\n", target, internalformat, x, y, width));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CopyConvolutionFilter2D)(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height)
+{
+   DISPATCH(CopyConvolutionFilter2D, (target, internalformat, x, y, width, height), (F, "glCopyConvolutionFilter2D(0x%x, 0x%x, %d, %d, %d, %d);\n", target, internalformat, x, y, width, height));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetConvolutionFilter)(GLenum target, GLenum format, GLenum type, GLvoid * image)
+{
+   DISPATCH(GetConvolutionFilter, (target, format, type, image), (F, "glGetConvolutionFilter(0x%x, 0x%x, 0x%x, %p);\n", target, format, type, (const void *) image));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetConvolutionParameterfv)(GLenum target, GLenum pname, GLfloat * params)
+{
+   DISPATCH(GetConvolutionParameterfv, (target, pname, params), (F, "glGetConvolutionParameterfv(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetConvolutionParameteriv)(GLenum target, GLenum pname, GLint * params)
+{
+   DISPATCH(GetConvolutionParameteriv, (target, pname, params), (F, "glGetConvolutionParameteriv(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetSeparableFilter)(GLenum target, GLenum format, GLenum type, GLvoid * row, GLvoid * column, GLvoid * span)
+{
+   DISPATCH(GetSeparableFilter, (target, format, type, row, column, span), (F, "glGetSeparableFilter(0x%x, 0x%x, 0x%x, %p, %p, %p);\n", target, format, type, (const void *) row, (const void *) column, (const void *) span));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SeparableFilter2D)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * row, const GLvoid * column)
+{
+   DISPATCH(SeparableFilter2D, (target, internalformat, width, height, format, type, row, column), (F, "glSeparableFilter2D(0x%x, 0x%x, %d, %d, 0x%x, 0x%x, %p, %p);\n", target, internalformat, width, height, format, type, (const void *) row, (const void *) column));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetHistogram)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values)
+{
+   DISPATCH(GetHistogram, (target, reset, format, type, values), (F, "glGetHistogram(0x%x, %d, 0x%x, 0x%x, %p);\n", target, reset, format, type, (const void *) values));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetHistogramParameterfv)(GLenum target, GLenum pname, GLfloat * params)
+{
+   DISPATCH(GetHistogramParameterfv, (target, pname, params), (F, "glGetHistogramParameterfv(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetHistogramParameteriv)(GLenum target, GLenum pname, GLint * params)
+{
+   DISPATCH(GetHistogramParameteriv, (target, pname, params), (F, "glGetHistogramParameteriv(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetMinmax)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values)
+{
+   DISPATCH(GetMinmax, (target, reset, format, type, values), (F, "glGetMinmax(0x%x, %d, 0x%x, 0x%x, %p);\n", target, reset, format, type, (const void *) values));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetMinmaxParameterfv)(GLenum target, GLenum pname, GLfloat * params)
+{
+   DISPATCH(GetMinmaxParameterfv, (target, pname, params), (F, "glGetMinmaxParameterfv(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetMinmaxParameteriv)(GLenum target, GLenum pname, GLint * params)
+{
+   DISPATCH(GetMinmaxParameteriv, (target, pname, params), (F, "glGetMinmaxParameteriv(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Histogram)(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink)
+{
+   DISPATCH(Histogram, (target, width, internalformat, sink), (F, "glHistogram(0x%x, %d, 0x%x, %d);\n", target, width, internalformat, sink));
+}
+
+KEYWORD1 void KEYWORD2 NAME(Minmax)(GLenum target, GLenum internalformat, GLboolean sink)
+{
+   DISPATCH(Minmax, (target, internalformat, sink), (F, "glMinmax(0x%x, 0x%x, %d);\n", target, internalformat, sink));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ResetHistogram)(GLenum target)
+{
+   DISPATCH(ResetHistogram, (target), (F, "glResetHistogram(0x%x);\n", target));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ResetMinmax)(GLenum target)
+{
+   DISPATCH(ResetMinmax, (target), (F, "glResetMinmax(0x%x);\n", target));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexImage3D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid * pixels)
+{
+   DISPATCH(TexImage3D, (target, level, internalformat, width, height, depth, border, format, type, pixels), (F, "glTexImage3D(0x%x, %d, %d, %d, %d, %d, %d, 0x%x, 0x%x, %p);\n", target, level, internalformat, width, height, depth, border, format, type, (const void *) pixels));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid * pixels)
+{
+   DISPATCH(TexSubImage3D, (target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels), (F, "glTexSubImage3D(0x%x, %d, %d, %d, %d, %d, %d, %d, 0x%x, 0x%x, %p);\n", target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, (const void *) pixels));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CopyTexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
+{
+   DISPATCH(CopyTexSubImage3D, (target, level, xoffset, yoffset, zoffset, x, y, width, height), (F, "glCopyTexSubImage3D(0x%x, %d, %d, %d, %d, %d, %d, %d, %d);\n", target, level, xoffset, yoffset, zoffset, x, y, width, height));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ActiveTextureARB)(GLenum texture)
+{
+   DISPATCH(ActiveTextureARB, (texture), (F, "glActiveTextureARB(0x%x);\n", texture));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ClientActiveTextureARB)(GLenum texture)
+{
+   DISPATCH(ClientActiveTextureARB, (texture), (F, "glClientActiveTextureARB(0x%x);\n", texture));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1dARB)(GLenum target, GLdouble s)
+{
+   DISPATCH(MultiTexCoord1dARB, (target, s), (F, "glMultiTexCoord1dARB(0x%x, %f);\n", target, s));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1dvARB)(GLenum target, const GLdouble * v)
+{
+   DISPATCH(MultiTexCoord1dvARB, (target, v), (F, "glMultiTexCoord1dvARB(0x%x, %p);\n", target, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1fARB)(GLenum target, GLfloat s)
+{
+   DISPATCH(MultiTexCoord1fARB, (target, s), (F, "glMultiTexCoord1fARB(0x%x, %f);\n", target, s));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1fvARB)(GLenum target, const GLfloat * v)
+{
+   DISPATCH(MultiTexCoord1fvARB, (target, v), (F, "glMultiTexCoord1fvARB(0x%x, %p);\n", target, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1iARB)(GLenum target, GLint s)
+{
+   DISPATCH(MultiTexCoord1iARB, (target, s), (F, "glMultiTexCoord1iARB(0x%x, %d);\n", target, s));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1ivARB)(GLenum target, const GLint * v)
+{
+   DISPATCH(MultiTexCoord1ivARB, (target, v), (F, "glMultiTexCoord1ivARB(0x%x, %p);\n", target, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1sARB)(GLenum target, GLshort s)
+{
+   DISPATCH(MultiTexCoord1sARB, (target, s), (F, "glMultiTexCoord1sARB(0x%x, %d);\n", target, s));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1svARB)(GLenum target, const GLshort * v)
+{
+   DISPATCH(MultiTexCoord1svARB, (target, v), (F, "glMultiTexCoord1svARB(0x%x, %p);\n", target, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2dARB)(GLenum target, GLdouble s, GLdouble t)
+{
+   DISPATCH(MultiTexCoord2dARB, (target, s, t), (F, "glMultiTexCoord2dARB(0x%x, %f, %f);\n", target, s, t));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2dvARB)(GLenum target, const GLdouble * v)
+{
+   DISPATCH(MultiTexCoord2dvARB, (target, v), (F, "glMultiTexCoord2dvARB(0x%x, %p /* %g, %g */);\n", target, (const void *) v, v[0], v[1]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2fARB)(GLenum target, GLfloat s, GLfloat t)
+{
+   DISPATCH(MultiTexCoord2fARB, (target, s, t), (F, "glMultiTexCoord2fARB(0x%x, %f, %f);\n", target, s, t));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2fvARB)(GLenum target, const GLfloat * v)
+{
+   DISPATCH(MultiTexCoord2fvARB, (target, v), (F, "glMultiTexCoord2fvARB(0x%x, %p /* %g, %g */);\n", target, (const void *) v, v[0], v[1]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2iARB)(GLenum target, GLint s, GLint t)
+{
+   DISPATCH(MultiTexCoord2iARB, (target, s, t), (F, "glMultiTexCoord2iARB(0x%x, %d, %d);\n", target, s, t));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2ivARB)(GLenum target, const GLint * v)
+{
+   DISPATCH(MultiTexCoord2ivARB, (target, v), (F, "glMultiTexCoord2ivARB(0x%x, %p);\n", target, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2sARB)(GLenum target, GLshort s, GLshort t)
+{
+   DISPATCH(MultiTexCoord2sARB, (target, s, t), (F, "glMultiTexCoord2sARB(0x%x, %d, %d);\n", target, s, t));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2svARB)(GLenum target, const GLshort * v)
+{
+   DISPATCH(MultiTexCoord2svARB, (target, v), (F, "glMultiTexCoord2svARB(0x%x, %p);\n", target, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3dARB)(GLenum target, GLdouble s, GLdouble t, GLdouble r)
+{
+   DISPATCH(MultiTexCoord3dARB, (target, s, t, r), (F, "glMultiTexCoord3dARB(0x%x, %f, %f, %f);\n", target, s, t, r));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3dvARB)(GLenum target, const GLdouble * v)
+{
+   DISPATCH(MultiTexCoord3dvARB, (target, v), (F, "glMultiTexCoord3dvARB(0x%x, %p /* %g, %g, %g */);\n", target, (const void *) v, v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3fARB)(GLenum target, GLfloat s, GLfloat t, GLfloat r)
+{
+   DISPATCH(MultiTexCoord3fARB, (target, s, t, r), (F, "glMultiTexCoord3fARB(0x%x, %f, %f, %f);\n", target, s, t, r));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3fvARB)(GLenum target, const GLfloat * v)
+{
+   DISPATCH(MultiTexCoord3fvARB, (target, v), (F, "glMultiTexCoord3fvARB(0x%x, %p /* %g, %g, %g */);\n", target, (const void *) v, v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3iARB)(GLenum target, GLint s, GLint t, GLint r)
+{
+   DISPATCH(MultiTexCoord3iARB, (target, s, t, r), (F, "glMultiTexCoord3iARB(0x%x, %d, %d, %d);\n", target, s, t, r));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3ivARB)(GLenum target, const GLint * v)
+{
+   DISPATCH(MultiTexCoord3ivARB, (target, v), (F, "glMultiTexCoord3ivARB(0x%x, %p);\n", target, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3sARB)(GLenum target, GLshort s, GLshort t, GLshort r)
+{
+   DISPATCH(MultiTexCoord3sARB, (target, s, t, r), (F, "glMultiTexCoord3sARB(0x%x, %d, %d, %d);\n", target, s, t, r));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3svARB)(GLenum target, const GLshort * v)
+{
+   DISPATCH(MultiTexCoord3svARB, (target, v), (F, "glMultiTexCoord3svARB(0x%x, %p);\n", target, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4dARB)(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q)
+{
+   DISPATCH(MultiTexCoord4dARB, (target, s, t, r, q), (F, "glMultiTexCoord4dARB(0x%x, %f, %f, %f, %f);\n", target, s, t, r, q));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4dvARB)(GLenum target, const GLdouble * v)
+{
+   DISPATCH(MultiTexCoord4dvARB, (target, v), (F, "glMultiTexCoord4dvARB(0x%x, %p /* %g, %g, %g, %g */);\n", target, (const void *) v, v[0], v[1], v[2], v[3]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4fARB)(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)
+{
+   DISPATCH(MultiTexCoord4fARB, (target, s, t, r, q), (F, "glMultiTexCoord4fARB(0x%x, %f, %f, %f, %f);\n", target, s, t, r, q));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4fvARB)(GLenum target, const GLfloat * v)
+{
+   DISPATCH(MultiTexCoord4fvARB, (target, v), (F, "glMultiTexCoord4fvARB(0x%x, %p /* %g, %g, %g, %g */);\n", target, (const void *) v, v[0], v[1], v[2], v[3]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4iARB)(GLenum target, GLint s, GLint t, GLint r, GLint q)
+{
+   DISPATCH(MultiTexCoord4iARB, (target, s, t, r, q), (F, "glMultiTexCoord4iARB(0x%x, %d, %d, %d, %d);\n", target, s, t, r, q));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4ivARB)(GLenum target, const GLint * v)
+{
+   DISPATCH(MultiTexCoord4ivARB, (target, v), (F, "glMultiTexCoord4ivARB(0x%x, %p);\n", target, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4sARB)(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q)
+{
+   DISPATCH(MultiTexCoord4sARB, (target, s, t, r, q), (F, "glMultiTexCoord4sARB(0x%x, %d, %d, %d, %d);\n", target, s, t, r, q));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4svARB)(GLenum target, const GLshort * v)
+{
+   DISPATCH(MultiTexCoord4svARB, (target, v), (F, "glMultiTexCoord4svARB(0x%x, %p);\n", target, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(LoadTransposeMatrixfARB)(const GLfloat * m)
+{
+   DISPATCH(LoadTransposeMatrixfARB, (m), (F, "glLoadTransposeMatrixfARB(%p);\n", (const void *) m));
+}
+
+KEYWORD1 void KEYWORD2 NAME(LoadTransposeMatrixdARB)(const GLdouble * m)
+{
+   DISPATCH(LoadTransposeMatrixdARB, (m), (F, "glLoadTransposeMatrixdARB(%p);\n", (const void *) m));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultTransposeMatrixfARB)(const GLfloat * m)
+{
+   DISPATCH(MultTransposeMatrixfARB, (m), (F, "glMultTransposeMatrixfARB(%p);\n", (const void *) m));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultTransposeMatrixdARB)(const GLdouble * m)
+{
+   DISPATCH(MultTransposeMatrixdARB, (m), (F, "glMultTransposeMatrixdARB(%p);\n", (const void *) m));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SampleCoverageARB)(GLclampf value, GLboolean invert)
+{
+   DISPATCH(SampleCoverageARB, (value, invert), (F, "glSampleCoverageARB(%f, %d);\n", value, invert));
+}
+
+KEYWORD1 void KEYWORD2 NAME(__unused413)(void)
+{
+   DISPATCH(__unused413, (), (F, "gl__unused413();\n"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CompressedTexImage3DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid * data)
+{
+   DISPATCH(CompressedTexImage3DARB, (target, level, internalformat, width, height, depth, border, imageSize, data), (F, "glCompressedTexImage3DARB(0x%x, %d, 0x%x, %d, %d, %d, %d, %d, %p);\n", target, level, internalformat, width, height, depth, border, imageSize, (const void *) data));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CompressedTexImage2DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid * data)
+{
+   DISPATCH(CompressedTexImage2DARB, (target, level, internalformat, width, height, border, imageSize, data), (F, "glCompressedTexImage2DARB(0x%x, %d, 0x%x, %d, %d, %d, %d, %p);\n", target, level, internalformat, width, height, border, imageSize, (const void *) data));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CompressedTexImage1DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid * data)
+{
+   DISPATCH(CompressedTexImage1DARB, (target, level, internalformat, width, border, imageSize, data), (F, "glCompressedTexImage1DARB(0x%x, %d, 0x%x, %d, %d, %d, %p);\n", target, level, internalformat, width, border, imageSize, (const void *) data));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CompressedTexSubImage3DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid * data)
+{
+   DISPATCH(CompressedTexSubImage3DARB, (target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data), (F, "glCompressedTexSubImage3DARB(0x%x, %d, %d, %d, %d, %d, %d, %d, 0x%x, %d, %p);\n", target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, (const void *) data));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CompressedTexSubImage2DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid * data)
+{
+   DISPATCH(CompressedTexSubImage2DARB, (target, level, xoffset, yoffset, width, height, format, imageSize, data), (F, "glCompressedTexSubImage2DARB(0x%x, %d, %d, %d, %d, %d, 0x%x, %d, %p);\n", target, level, xoffset, yoffset, width, height, format, imageSize, (const void *) data));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CompressedTexSubImage1DARB)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid * data)
+{
+   DISPATCH(CompressedTexSubImage1DARB, (target, level, xoffset, width, format, imageSize, data), (F, "glCompressedTexSubImage1DARB(0x%x, %d, %d, %d, 0x%x, %d, %p);\n", target, level, xoffset, width, format, imageSize, (const void *) data));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetCompressedTexImageARB)(GLenum target, GLint level, GLvoid * img)
+{
+   DISPATCH(GetCompressedTexImageARB, (target, level, img), (F, "glGetCompressedTexImageARB(0x%x, %d, %p);\n", target, level, (const void *) img));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ActiveTexture)(GLenum texture)
+{
+   DISPATCH(ActiveTextureARB, (texture), (F, "glActiveTexture(0x%x);\n", texture));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ClientActiveTexture)(GLenum texture)
+{
+   DISPATCH(ClientActiveTextureARB, (texture), (F, "glClientActiveTexture(0x%x);\n", texture));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1d)(GLenum target, GLdouble s)
+{
+   DISPATCH(MultiTexCoord1dARB, (target, s), (F, "glMultiTexCoord1d(0x%x, %f);\n", target, s));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1dv)(GLenum target, const GLdouble * v)
+{
+   DISPATCH(MultiTexCoord1dvARB, (target, v), (F, "glMultiTexCoord1dv(0x%x, %p);\n", target, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1f)(GLenum target, GLfloat s)
+{
+   DISPATCH(MultiTexCoord1fARB, (target, s), (F, "glMultiTexCoord1f(0x%x, %f);\n", target, s));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1fv)(GLenum target, const GLfloat * v)
+{
+   DISPATCH(MultiTexCoord1fvARB, (target, v), (F, "glMultiTexCoord1fv(0x%x, %p);\n", target, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1i)(GLenum target, GLint s)
+{
+   DISPATCH(MultiTexCoord1iARB, (target, s), (F, "glMultiTexCoord1i(0x%x, %d);\n", target, s));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1iv)(GLenum target, const GLint * v)
+{
+   DISPATCH(MultiTexCoord1ivARB, (target, v), (F, "glMultiTexCoord1iv(0x%x, %p);\n", target, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1s)(GLenum target, GLshort s)
+{
+   DISPATCH(MultiTexCoord1sARB, (target, s), (F, "glMultiTexCoord1s(0x%x, %d);\n", target, s));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1sv)(GLenum target, const GLshort * v)
+{
+   DISPATCH(MultiTexCoord1svARB, (target, v), (F, "glMultiTexCoord1sv(0x%x, %p);\n", target, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2d)(GLenum target, GLdouble s, GLdouble t)
+{
+   DISPATCH(MultiTexCoord2dARB, (target, s, t), (F, "glMultiTexCoord2d(0x%x, %f, %f);\n", target, s, t));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2dv)(GLenum target, const GLdouble * v)
+{
+   DISPATCH(MultiTexCoord2dvARB, (target, v), (F, "glMultiTexCoord2dv(0x%x, %p /* %g, %g */);\n", target, (const void *) v, v[0], v[1]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2f)(GLenum target, GLfloat s, GLfloat t)
+{
+   DISPATCH(MultiTexCoord2fARB, (target, s, t), (F, "glMultiTexCoord2f(0x%x, %f, %f);\n", target, s, t));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2fv)(GLenum target, const GLfloat * v)
+{
+   DISPATCH(MultiTexCoord2fvARB, (target, v), (F, "glMultiTexCoord2fv(0x%x, %p /* %g, %g */);\n", target, (const void *) v, v[0], v[1]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2i)(GLenum target, GLint s, GLint t)
+{
+   DISPATCH(MultiTexCoord2iARB, (target, s, t), (F, "glMultiTexCoord2i(0x%x, %d, %d);\n", target, s, t));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2iv)(GLenum target, const GLint * v)
+{
+   DISPATCH(MultiTexCoord2ivARB, (target, v), (F, "glMultiTexCoord2iv(0x%x, %p);\n", target, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2s)(GLenum target, GLshort s, GLshort t)
+{
+   DISPATCH(MultiTexCoord2sARB, (target, s, t), (F, "glMultiTexCoord2s(0x%x, %d, %d);\n", target, s, t));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2sv)(GLenum target, const GLshort * v)
+{
+   DISPATCH(MultiTexCoord2svARB, (target, v), (F, "glMultiTexCoord2sv(0x%x, %p);\n", target, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3d)(GLenum target, GLdouble s, GLdouble t, GLdouble r)
+{
+   DISPATCH(MultiTexCoord3dARB, (target, s, t, r), (F, "glMultiTexCoord3d(0x%x, %f, %f, %f);\n", target, s, t, r));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3dv)(GLenum target, const GLdouble * v)
+{
+   DISPATCH(MultiTexCoord3dvARB, (target, v), (F, "glMultiTexCoord3dv(0x%x, %p /* %g, %g, %g */);\n", target, (const void *) v, v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3f)(GLenum target, GLfloat s, GLfloat t, GLfloat r)
+{
+   DISPATCH(MultiTexCoord3fARB, (target, s, t, r), (F, "glMultiTexCoord3f(0x%x, %f, %f, %f);\n", target, s, t, r));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3fv)(GLenum target, const GLfloat * v)
+{
+   DISPATCH(MultiTexCoord3fvARB, (target, v), (F, "glMultiTexCoord3fv(0x%x, %p /* %g, %g, %g */);\n", target, (const void *) v, v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3i)(GLenum target, GLint s, GLint t, GLint r)
+{
+   DISPATCH(MultiTexCoord3iARB, (target, s, t, r), (F, "glMultiTexCoord3i(0x%x, %d, %d, %d);\n", target, s, t, r));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3iv)(GLenum target, const GLint * v)
+{
+   DISPATCH(MultiTexCoord3ivARB, (target, v), (F, "glMultiTexCoord3iv(0x%x, %p);\n", target, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3s)(GLenum target, GLshort s, GLshort t, GLshort r)
+{
+   DISPATCH(MultiTexCoord3sARB, (target, s, t, r), (F, "glMultiTexCoord3s(0x%x, %d, %d, %d);\n", target, s, t, r));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3sv)(GLenum target, const GLshort * v)
+{
+   DISPATCH(MultiTexCoord3svARB, (target, v), (F, "glMultiTexCoord3sv(0x%x, %p);\n", target, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4d)(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q)
+{
+   DISPATCH(MultiTexCoord4dARB, (target, s, t, r, q), (F, "glMultiTexCoord4d(0x%x, %f, %f, %f, %f);\n", target, s, t, r, q));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4dv)(GLenum target, const GLdouble * v)
+{
+   DISPATCH(MultiTexCoord4dvARB, (target, v), (F, "glMultiTexCoord4dv(0x%x, %p /* %g, %g, %g, %g */);\n", target, (const void *) v, v[0], v[1], v[2], v[3]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4f)(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)
+{
+   DISPATCH(MultiTexCoord4fARB, (target, s, t, r, q), (F, "glMultiTexCoord4f(0x%x, %f, %f, %f, %f);\n", target, s, t, r, q));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4fv)(GLenum target, const GLfloat * v)
+{
+   DISPATCH(MultiTexCoord4fvARB, (target, v), (F, "glMultiTexCoord4fv(0x%x, %p /* %g, %g, %g, %g */);\n", target, (const void *) v, v[0], v[1], v[2], v[3]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4i)(GLenum target, GLint s, GLint t, GLint r, GLint q)
+{
+   DISPATCH(MultiTexCoord4iARB, (target, s, t, r, q), (F, "glMultiTexCoord4i(0x%x, %d, %d, %d, %d);\n", target, s, t, r, q));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4iv)(GLenum target, const GLint * v)
+{
+   DISPATCH(MultiTexCoord4ivARB, (target, v), (F, "glMultiTexCoord4iv(0x%x, %p);\n", target, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4s)(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q)
+{
+   DISPATCH(MultiTexCoord4sARB, (target, s, t, r, q), (F, "glMultiTexCoord4s(0x%x, %d, %d, %d, %d);\n", target, s, t, r, q));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4sv)(GLenum target, const GLshort * v)
+{
+   DISPATCH(MultiTexCoord4svARB, (target, v), (F, "glMultiTexCoord4sv(0x%x, %p);\n", target, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(LoadTransposeMatrixf)(const GLfloat * m)
+{
+   DISPATCH(LoadTransposeMatrixfARB, (m), (F, "glLoadTransposeMatrixf(%p);\n", (const void *) m));
+}
+
+KEYWORD1 void KEYWORD2 NAME(LoadTransposeMatrixd)(const GLdouble * m)
+{
+   DISPATCH(LoadTransposeMatrixdARB, (m), (F, "glLoadTransposeMatrixd(%p);\n", (const void *) m));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultTransposeMatrixf)(const GLfloat * m)
+{
+   DISPATCH(MultTransposeMatrixfARB, (m), (F, "glMultTransposeMatrixf(%p);\n", (const void *) m));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultTransposeMatrixd)(const GLdouble * m)
+{
+   DISPATCH(MultTransposeMatrixdARB, (m), (F, "glMultTransposeMatrixd(%p);\n", (const void *) m));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SampleCoverage)(GLclampf value, GLboolean invert)
+{
+   DISPATCH(SampleCoverageARB, (value, invert), (F, "glSampleCoverage(%f, %d);\n", value, invert));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CompressedTexImage3D)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid * data)
+{
+   DISPATCH(CompressedTexImage3DARB, (target, level, internalformat, width, height, depth, border, imageSize, data), (F, "glCompressedTexImage3D(0x%x, %d, 0x%x, %d, %d, %d, %d, %d, %p);\n", target, level, internalformat, width, height, depth, border, imageSize, (const void *) data));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CompressedTexImage2D)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid * data)
+{
+   DISPATCH(CompressedTexImage2DARB, (target, level, internalformat, width, height, border, imageSize, data), (F, "glCompressedTexImage2D(0x%x, %d, 0x%x, %d, %d, %d, %d, %p);\n", target, level, internalformat, width, height, border, imageSize, (const void *) data));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CompressedTexImage1D)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid * data)
+{
+   DISPATCH(CompressedTexImage1DARB, (target, level, internalformat, width, border, imageSize, data), (F, "glCompressedTexImage1D(0x%x, %d, 0x%x, %d, %d, %d, %p);\n", target, level, internalformat, width, border, imageSize, (const void *) data));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CompressedTexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid * data)
+{
+   DISPATCH(CompressedTexSubImage3DARB, (target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data), (F, "glCompressedTexSubImage3D(0x%x, %d, %d, %d, %d, %d, %d, %d, 0x%x, %d, %p);\n", target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, (const void *) data));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CompressedTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid * data)
+{
+   DISPATCH(CompressedTexSubImage2DARB, (target, level, xoffset, yoffset, width, height, format, imageSize, data), (F, "glCompressedTexSubImage2D(0x%x, %d, %d, %d, %d, %d, 0x%x, %d, %p);\n", target, level, xoffset, yoffset, width, height, format, imageSize, (const void *) data));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CompressedTexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid * data)
+{
+   DISPATCH(CompressedTexSubImage1DARB, (target, level, xoffset, width, format, imageSize, data), (F, "glCompressedTexSubImage1D(0x%x, %d, %d, %d, 0x%x, %d, %p);\n", target, level, xoffset, width, format, imageSize, (const void *) data));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetCompressedTexImage)(GLenum target, GLint level, GLvoid * img)
+{
+   DISPATCH(GetCompressedTexImageARB, (target, level, img), (F, "glGetCompressedTexImage(0x%x, %d, %p);\n", target, level, (const void *) img));
+}
+
+/* No dispatch for WeightbvARB() */
+/* No dispatch for WeightsvARB() */
+/* No dispatch for WeightivARB() */
+/* No dispatch for WeightfvARB() */
+/* No dispatch for WeightdvARB() */
+/* No dispatch for WeightubvARB() */
+/* No dispatch for WeightusvARB() */
+/* No dispatch for WeightuivARB() */
+/* No dispatch for WeightPointerARB() */
+/* No dispatch for VertexBlendARB() */
+/* No dispatch for CurrentPaletteMatrixARB() */
+/* No dispatch for MatrixIndexubvARB() */
+/* No dispatch for MatrixIndexusvARB() */
+/* No dispatch for MatrixIndexuivARB() */
+/* No dispatch for MatrixIndexPointerARB() */
+KEYWORD1 void KEYWORD2 NAME(BlendColorEXT)(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
+{
+   DISPATCH(BlendColor, (red, green, blue, alpha), (F, "glBlendColorEXT(%f, %f, %f, %f);\n", red, green, blue, alpha));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PolygonOffsetEXT)(GLfloat factor, GLfloat bias)
+{
+   DISPATCH(PolygonOffsetEXT, (factor, bias), (F, "glPolygonOffsetEXT(%f, %f);\n", factor, bias));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexImage3DEXT)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid * pixels)
+{
+   DISPATCH(TexImage3D, (target, level, internalformat, width, height, depth, border, format, type, pixels), (F, "glTexImage3DEXT(0x%x, %d, 0x%x, %d, %d, %d, %d, 0x%x, 0x%x, %p);\n", target, level, internalformat, width, height, depth, border, format, type, (const void *) pixels));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexSubImage3DEXT)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid * pixels)
+{
+   DISPATCH(TexSubImage3D, (target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels), (F, "glTexSubImage3DEXT(0x%x, %d, %d, %d, %d, %d, %d, %d, 0x%x, 0x%x, %p);\n", target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, (const void *) pixels));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetTexFilterFuncSGIS)(GLenum target, GLenum filter, GLfloat * weights)
+{
+   DISPATCH(GetTexFilterFuncSGIS, (target, filter, weights), (F, "glGetTexFilterFuncSGIS(0x%x, 0x%x, %p);\n", target, filter, (const void *) weights));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexFilterFuncSGIS)(GLenum target, GLenum filter, GLsizei n, const GLfloat * weights)
+{
+   DISPATCH(TexFilterFuncSGIS, (target, filter, n, weights), (F, "glTexFilterFuncSGIS(0x%x, 0x%x, %d, %p);\n", target, filter, n, (const void *) weights));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexSubImage1DEXT)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid * pixels)
+{
+   DISPATCH(TexSubImage1D, (target, level, xoffset, width, format, type, pixels), (F, "glTexSubImage1DEXT(0x%x, %d, %d, %d, 0x%x, 0x%x, %p);\n", target, level, xoffset, width, format, type, (const void *) pixels));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexSubImage2DEXT)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * pixels)
+{
+   DISPATCH(TexSubImage2D, (target, level, xoffset, yoffset, width, height, format, type, pixels), (F, "glTexSubImage2DEXT(0x%x, %d, %d, %d, %d, %d, 0x%x, 0x%x, %p);\n", target, level, xoffset, yoffset, width, height, format, type, (const void *) pixels));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CopyTexImage1DEXT)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
+{
+   DISPATCH(CopyTexImage1D, (target, level, internalformat, x, y, width, border), (F, "glCopyTexImage1DEXT(0x%x, %d, 0x%x, %d, %d, %d, %d);\n", target, level, internalformat, x, y, width, border));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CopyTexImage2DEXT)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
+{
+   DISPATCH(CopyTexImage2D, (target, level, internalformat, x, y, width, height, border), (F, "glCopyTexImage2DEXT(0x%x, %d, 0x%x, %d, %d, %d, %d, %d);\n", target, level, internalformat, x, y, width, height, border));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CopyTexSubImage1DEXT)(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
+{
+   DISPATCH(CopyTexSubImage1D, (target, level, xoffset, x, y, width), (F, "glCopyTexSubImage1DEXT(0x%x, %d, %d, %d, %d, %d);\n", target, level, xoffset, x, y, width));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CopyTexSubImage2DEXT)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
+{
+   DISPATCH(CopyTexSubImage2D, (target, level, xoffset, yoffset, x, y, width, height), (F, "glCopyTexSubImage2DEXT(0x%x, %d, %d, %d, %d, %d, %d, %d);\n", target, level, xoffset, yoffset, x, y, width, height));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CopyTexSubImage3DEXT)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
+{
+   DISPATCH(CopyTexSubImage3D, (target, level, xoffset, yoffset, zoffset, x, y, width, height), (F, "glCopyTexSubImage3DEXT(0x%x, %d, %d, %d, %d, %d, %d, %d, %d);\n", target, level, xoffset, yoffset, zoffset, x, y, width, height));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetHistogramEXT)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values)
+{
+   DISPATCH(GetHistogramEXT, (target, reset, format, type, values), (F, "glGetHistogramEXT(0x%x, %d, 0x%x, 0x%x, %p);\n", target, reset, format, type, (const void *) values));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetHistogramParameterfvEXT)(GLenum target, GLenum pname, GLfloat * params)
+{
+   DISPATCH(GetHistogramParameterfvEXT, (target, pname, params), (F, "glGetHistogramParameterfvEXT(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetHistogramParameterivEXT)(GLenum target, GLenum pname, GLint * params)
+{
+   DISPATCH(GetHistogramParameterivEXT, (target, pname, params), (F, "glGetHistogramParameterivEXT(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetMinmaxEXT)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values)
+{
+   DISPATCH(GetMinmaxEXT, (target, reset, format, type, values), (F, "glGetMinmaxEXT(0x%x, %d, 0x%x, 0x%x, %p);\n", target, reset, format, type, (const void *) values));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetMinmaxParameterfvEXT)(GLenum target, GLenum pname, GLfloat * params)
+{
+   DISPATCH(GetMinmaxParameterfvEXT, (target, pname, params), (F, "glGetMinmaxParameterfvEXT(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetMinmaxParameterivEXT)(GLenum target, GLenum pname, GLint * params)
+{
+   DISPATCH(GetMinmaxParameterivEXT, (target, pname, params), (F, "glGetMinmaxParameterivEXT(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(HistogramEXT)(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink)
+{
+   DISPATCH(Histogram, (target, width, internalformat, sink), (F, "glHistogramEXT(0x%x, %d, 0x%x, %d);\n", target, width, internalformat, sink));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MinmaxEXT)(GLenum target, GLenum internalformat, GLboolean sink)
+{
+   DISPATCH(Minmax, (target, internalformat, sink), (F, "glMinmaxEXT(0x%x, 0x%x, %d);\n", target, internalformat, sink));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ResetHistogramEXT)(GLenum target)
+{
+   DISPATCH(ResetHistogram, (target), (F, "glResetHistogramEXT(0x%x);\n", target));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ResetMinmaxEXT)(GLenum target)
+{
+   DISPATCH(ResetMinmax, (target), (F, "glResetMinmaxEXT(0x%x);\n", target));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ConvolutionFilter1DEXT)(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid * image)
+{
+   DISPATCH(ConvolutionFilter1D, (target, internalformat, width, format, type, image), (F, "glConvolutionFilter1DEXT(0x%x, 0x%x, %d, 0x%x, 0x%x, %p);\n", target, internalformat, width, format, type, (const void *) image));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ConvolutionFilter2DEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * image)
+{
+   DISPATCH(ConvolutionFilter2D, (target, internalformat, width, height, format, type, image), (F, "glConvolutionFilter2DEXT(0x%x, 0x%x, %d, %d, 0x%x, 0x%x, %p);\n", target, internalformat, width, height, format, type, (const void *) image));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ConvolutionParameterfEXT)(GLenum target, GLenum pname, GLfloat params)
+{
+   DISPATCH(ConvolutionParameterf, (target, pname, params), (F, "glConvolutionParameterfEXT(0x%x, 0x%x, %f);\n", target, pname, params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ConvolutionParameterfvEXT)(GLenum target, GLenum pname, const GLfloat * params)
+{
+   DISPATCH(ConvolutionParameterfv, (target, pname, params), (F, "glConvolutionParameterfvEXT(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ConvolutionParameteriEXT)(GLenum target, GLenum pname, GLint params)
+{
+   DISPATCH(ConvolutionParameteri, (target, pname, params), (F, "glConvolutionParameteriEXT(0x%x, 0x%x, %d);\n", target, pname, params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ConvolutionParameterivEXT)(GLenum target, GLenum pname, const GLint * params)
+{
+   DISPATCH(ConvolutionParameteriv, (target, pname, params), (F, "glConvolutionParameterivEXT(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CopyConvolutionFilter1DEXT)(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
+{
+   DISPATCH(CopyConvolutionFilter1D, (target, internalformat, x, y, width), (F, "glCopyConvolutionFilter1DEXT(0x%x, 0x%x, %d, %d, %d);\n", target, internalformat, x, y, width));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CopyConvolutionFilter2DEXT)(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height)
+{
+   DISPATCH(CopyConvolutionFilter2D, (target, internalformat, x, y, width, height), (F, "glCopyConvolutionFilter2DEXT(0x%x, 0x%x, %d, %d, %d, %d);\n", target, internalformat, x, y, width, height));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetConvolutionFilterEXT)(GLenum target, GLenum format, GLenum type, GLvoid * image)
+{
+   DISPATCH(GetConvolutionFilterEXT, (target, format, type, image), (F, "glGetConvolutionFilterEXT(0x%x, 0x%x, 0x%x, %p);\n", target, format, type, (const void *) image));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetConvolutionParameterfvEXT)(GLenum target, GLenum pname, GLfloat * params)
+{
+   DISPATCH(GetConvolutionParameterfvEXT, (target, pname, params), (F, "glGetConvolutionParameterfvEXT(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetConvolutionParameterivEXT)(GLenum target, GLenum pname, GLint * params)
+{
+   DISPATCH(GetConvolutionParameterivEXT, (target, pname, params), (F, "glGetConvolutionParameterivEXT(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetSeparableFilterEXT)(GLenum target, GLenum format, GLenum type, GLvoid * row, GLvoid * column, GLvoid * span)
+{
+   DISPATCH(GetSeparableFilterEXT, (target, format, type, row, column, span), (F, "glGetSeparableFilterEXT(0x%x, 0x%x, 0x%x, %p, %p, %p);\n", target, format, type, (const void *) row, (const void *) column, (const void *) span));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SeparableFilter2DEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * row, const GLvoid * column)
+{
+   DISPATCH(SeparableFilter2D, (target, internalformat, width, height, format, type, row, column), (F, "glSeparableFilter2DEXT(0x%x, 0x%x, %d, %d, 0x%x, 0x%x, %p, %p);\n", target, internalformat, width, height, format, type, (const void *) row, (const void *) column));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ColorTableSGI)(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid * table)
+{
+   DISPATCH(ColorTable, (target, internalformat, width, format, type, table), (F, "glColorTableSGI(0x%x, 0x%x, %d, 0x%x, 0x%x, %p);\n", target, internalformat, width, format, type, (const void *) table));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ColorTableParameterfvSGI)(GLenum target, GLenum pname, const GLfloat * params)
+{
+   DISPATCH(ColorTableParameterfv, (target, pname, params), (F, "glColorTableParameterfvSGI(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ColorTableParameterivSGI)(GLenum target, GLenum pname, const GLint * params)
+{
+   DISPATCH(ColorTableParameteriv, (target, pname, params), (F, "glColorTableParameterivSGI(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CopyColorTableSGI)(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
+{
+   DISPATCH(CopyColorTable, (target, internalformat, x, y, width), (F, "glCopyColorTableSGI(0x%x, 0x%x, %d, %d, %d);\n", target, internalformat, x, y, width));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetColorTableSGI)(GLenum target, GLenum format, GLenum type, GLvoid * table)
+{
+   DISPATCH(GetColorTableSGI, (target, format, type, table), (F, "glGetColorTableSGI(0x%x, 0x%x, 0x%x, %p);\n", target, format, type, (const void *) table));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetColorTableParameterfvSGI)(GLenum target, GLenum pname, GLfloat * params)
+{
+   DISPATCH(GetColorTableParameterfvSGI, (target, pname, params), (F, "glGetColorTableParameterfvSGI(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetColorTableParameterivSGI)(GLenum target, GLenum pname, GLint * params)
+{
+   DISPATCH(GetColorTableParameterivSGI, (target, pname, params), (F, "glGetColorTableParameterivSGI(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PixelTexGenSGIX)(GLenum mode)
+{
+   DISPATCH(PixelTexGenSGIX, (mode), (F, "glPixelTexGenSGIX(0x%x);\n", mode));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PixelTexGenParameteriSGIS)(GLenum pname, GLint param)
+{
+   DISPATCH(PixelTexGenParameteriSGIS, (pname, param), (F, "glPixelTexGenParameteriSGIS(0x%x, %d);\n", pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PixelTexGenParameterivSGIS)(GLenum pname, const GLint * params)
+{
+   DISPATCH(PixelTexGenParameterivSGIS, (pname, params), (F, "glPixelTexGenParameterivSGIS(0x%x, %p);\n", pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PixelTexGenParameterfSGIS)(GLenum pname, GLfloat param)
+{
+   DISPATCH(PixelTexGenParameterfSGIS, (pname, param), (F, "glPixelTexGenParameterfSGIS(0x%x, %f);\n", pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PixelTexGenParameterfvSGIS)(GLenum pname, const GLfloat * params)
+{
+   DISPATCH(PixelTexGenParameterfvSGIS, (pname, params), (F, "glPixelTexGenParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetPixelTexGenParameterivSGIS)(GLenum pname, GLint * params)
+{
+   DISPATCH(GetPixelTexGenParameterivSGIS, (pname, params), (F, "glGetPixelTexGenParameterivSGIS(0x%x, %p);\n", pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetPixelTexGenParameterfvSGIS)(GLenum pname, GLfloat * params)
+{
+   DISPATCH(GetPixelTexGenParameterfvSGIS, (pname, params), (F, "glGetPixelTexGenParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexImage4DSGIS)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid * pixels)
+{
+   DISPATCH(TexImage4DSGIS, (target, level, internalformat, width, height, depth, size4d, border, format, type, pixels), (F, "glTexImage4DSGIS(0x%x, %d, 0x%x, %d, %d, %d, %d, %d, 0x%x, 0x%x, %p);\n", target, level, internalformat, width, height, depth, size4d, border, format, type, (const void *) pixels));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexSubImage4DSGIS)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid * pixels)
+{
+   DISPATCH(TexSubImage4DSGIS, (target, level, xoffset, yoffset, zoffset, woffset, width, height, depth, size4d, format, type, pixels), (F, "glTexSubImage4DSGIS(0x%x, %d, %d, %d, %d, %d, %d, %d, %d, %d, 0x%x, 0x%x, %p);\n", target, level, xoffset, yoffset, zoffset, woffset, width, height, depth, size4d, format, type, (const void *) pixels));
+}
+
+KEYWORD1 GLboolean KEYWORD2 NAME(AreTexturesResidentEXT)(GLsizei n, const GLuint * textures, GLboolean * residences)
+{
+   RETURN_DISPATCH(AreTexturesResidentEXT, (n, textures, residences), (F, "glAreTexturesResidentEXT(%d, %p, %p);\n", n, (const void *) textures, (const void *) residences));
+}
+
+KEYWORD1 void KEYWORD2 NAME(BindTextureEXT)(GLenum target, GLuint texture)
+{
+   DISPATCH(BindTexture, (target, texture), (F, "glBindTextureEXT(0x%x, %d);\n", target, texture));
+}
+
+KEYWORD1 void KEYWORD2 NAME(DeleteTexturesEXT)(GLsizei n, const GLuint * textures)
+{
+   DISPATCH(DeleteTextures, (n, textures), (F, "glDeleteTexturesEXT(%d, %p);\n", n, (const void *) textures));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GenTexturesEXT)(GLsizei n, GLuint * textures)
+{
+   DISPATCH(GenTexturesEXT, (n, textures), (F, "glGenTexturesEXT(%d, %p);\n", n, (const void *) textures));
+}
+
+KEYWORD1 GLboolean KEYWORD2 NAME(IsTextureEXT)(GLuint texture)
+{
+   RETURN_DISPATCH(IsTextureEXT, (texture), (F, "glIsTextureEXT(%d);\n", texture));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PrioritizeTexturesEXT)(GLsizei n, const GLuint * textures, const GLclampf * priorities)
+{
+   DISPATCH(PrioritizeTextures, (n, textures, priorities), (F, "glPrioritizeTexturesEXT(%d, %p, %p);\n", n, (const void *) textures, (const void *) priorities));
+}
+
+KEYWORD1 void KEYWORD2 NAME(DetailTexFuncSGIS)(GLenum target, GLsizei n, const GLfloat * points)
+{
+   DISPATCH(DetailTexFuncSGIS, (target, n, points), (F, "glDetailTexFuncSGIS(0x%x, %d, %p);\n", target, n, (const void *) points));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetDetailTexFuncSGIS)(GLenum target, GLfloat * points)
+{
+   DISPATCH(GetDetailTexFuncSGIS, (target, points), (F, "glGetDetailTexFuncSGIS(0x%x, %p);\n", target, (const void *) points));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SharpenTexFuncSGIS)(GLenum target, GLsizei n, const GLfloat * points)
+{
+   DISPATCH(SharpenTexFuncSGIS, (target, n, points), (F, "glSharpenTexFuncSGIS(0x%x, %d, %p);\n", target, n, (const void *) points));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetSharpenTexFuncSGIS)(GLenum target, GLfloat * points)
+{
+   DISPATCH(GetSharpenTexFuncSGIS, (target, points), (F, "glGetSharpenTexFuncSGIS(0x%x, %p);\n", target, (const void *) points));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SampleMaskSGIS)(GLclampf value, GLboolean invert)
+{
+   DISPATCH(SampleMaskSGIS, (value, invert), (F, "glSampleMaskSGIS(%f, %d);\n", value, invert));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SamplePatternSGIS)(GLenum pattern)
+{
+   DISPATCH(SamplePatternSGIS, (pattern), (F, "glSamplePatternSGIS(0x%x);\n", pattern));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ArrayElementEXT)(GLint i)
+{
+   DISPATCH(ArrayElement, (i), (F, "glArrayElementEXT(%d);\n", i));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer)
+{
+   DISPATCH(ColorPointerEXT, (size, type, stride, count, pointer), (F, "glColorPointerEXT(%d, 0x%x, %d, %d, %p);\n", size, type, stride, count, (const void *) pointer));
+}
+
+KEYWORD1 void KEYWORD2 NAME(DrawArraysEXT)(GLenum mode, GLint first, GLsizei count)
+{
+   DISPATCH(DrawArrays, (mode, first, count), (F, "glDrawArraysEXT(0x%x, %d, %d);\n", mode, first, count));
+}
+
+KEYWORD1 void KEYWORD2 NAME(EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer)
+{
+   DISPATCH(EdgeFlagPointerEXT, (stride, count, pointer), (F, "glEdgeFlagPointerEXT(%d, %d, %p);\n", stride, count, (const void *) pointer));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetPointervEXT)(GLenum pname, GLvoid ** params)
+{
+   DISPATCH(GetPointerv, (pname, params), (F, "glGetPointervEXT(0x%x, %p);\n", pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer)
+{
+   DISPATCH(IndexPointerEXT, (type, stride, count, pointer), (F, "glIndexPointerEXT(0x%x, %d, %d, %p);\n", type, stride, count, (const void *) pointer));
+}
+
+KEYWORD1 void KEYWORD2 NAME(NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer)
+{
+   DISPATCH(NormalPointerEXT, (type, stride, count, pointer), (F, "glNormalPointerEXT(0x%x, %d, %d, %p);\n", type, stride, count, (const void *) pointer));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer)
+{
+   DISPATCH(TexCoordPointerEXT, (size, type, stride, count, pointer), (F, "glTexCoordPointerEXT(%d, 0x%x, %d, %d, %p);\n", size, type, stride, count, (const void *) pointer));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer)
+{
+   DISPATCH(VertexPointerEXT, (size, type, stride, count, pointer), (F, "glVertexPointerEXT(%d, 0x%x, %d, %d, %p);\n", size, type, stride, count, (const void *) pointer));
+}
+
+KEYWORD1 void KEYWORD2 NAME(BlendEquationEXT)(GLenum mode)
+{
+   DISPATCH(BlendEquation, (mode), (F, "glBlendEquationEXT(0x%x);\n", mode));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SpriteParameterfSGIX)(GLenum pname, GLfloat param)
+{
+   DISPATCH(SpriteParameterfSGIX, (pname, param), (F, "glSpriteParameterfSGIX(0x%x, %f);\n", pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SpriteParameterfvSGIX)(GLenum pname, const GLfloat * params)
+{
+   DISPATCH(SpriteParameterfvSGIX, (pname, params), (F, "glSpriteParameterfvSGIX(0x%x, %p);\n", pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SpriteParameteriSGIX)(GLenum pname, GLint param)
+{
+   DISPATCH(SpriteParameteriSGIX, (pname, param), (F, "glSpriteParameteriSGIX(0x%x, %d);\n", pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SpriteParameterivSGIX)(GLenum pname, const GLint * params)
+{
+   DISPATCH(SpriteParameterivSGIX, (pname, params), (F, "glSpriteParameterivSGIX(0x%x, %p);\n", pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PointParameterfEXT)(GLenum pname, GLfloat param)
+{
+   DISPATCH(PointParameterfEXT, (pname, param), (F, "glPointParameterfEXT(0x%x, %f);\n", pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PointParameterfvEXT)(GLenum pname, const GLfloat * params)
+{
+   DISPATCH(PointParameterfvEXT, (pname, params), (F, "glPointParameterfvEXT(0x%x, %p);\n", pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PointParameterfARB)(GLenum pname, GLfloat param)
+{
+   DISPATCH(PointParameterfEXT, (pname, param), (F, "glPointParameterfARB(0x%x, %f);\n", pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PointParameterfvARB)(GLenum pname, const GLfloat * params)
+{
+   DISPATCH(PointParameterfvEXT, (pname, params), (F, "glPointParameterfvARB(0x%x, %p);\n", pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PointParameterfSGIS)(GLenum pname, GLfloat param)
+{
+   DISPATCH(PointParameterfEXT, (pname, param), (F, "glPointParameterfSGIS(0x%x, %f);\n", pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PointParameterfvSGIS)(GLenum pname, const GLfloat * params)
+{
+   DISPATCH(PointParameterfvEXT, (pname, params), (F, "glPointParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
+}
+
+KEYWORD1 GLint KEYWORD2 NAME(GetInstrumentsSGIX)(void)
+{
+   RETURN_DISPATCH(GetInstrumentsSGIX, (), (F, "glGetInstrumentsSGIX();\n"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(InstrumentsBufferSGIX)(GLsizei size, GLint * buffer)
+{
+   DISPATCH(InstrumentsBufferSGIX, (size, buffer), (F, "glInstrumentsBufferSGIX(%d, %p);\n", size, (const void *) buffer));
+}
+
+KEYWORD1 GLint KEYWORD2 NAME(PollInstrumentsSGIX)(GLint * marker_p)
+{
+   RETURN_DISPATCH(PollInstrumentsSGIX, (marker_p), (F, "glPollInstrumentsSGIX(%p);\n", (const void *) marker_p));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ReadInstrumentsSGIX)(GLint marker)
+{
+   DISPATCH(ReadInstrumentsSGIX, (marker), (F, "glReadInstrumentsSGIX(%d);\n", marker));
+}
+
+KEYWORD1 void KEYWORD2 NAME(StartInstrumentsSGIX)(void)
+{
+   DISPATCH(StartInstrumentsSGIX, (), (F, "glStartInstrumentsSGIX();\n"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(StopInstrumentsSGIX)(GLint marker)
+{
+   DISPATCH(StopInstrumentsSGIX, (marker), (F, "glStopInstrumentsSGIX(%d);\n", marker));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FrameZoomSGIX)(GLint factor)
+{
+   DISPATCH(FrameZoomSGIX, (factor), (F, "glFrameZoomSGIX(%d);\n", factor));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TagSampleBufferSGIX)(void)
+{
+   DISPATCH(TagSampleBufferSGIX, (), (F, "glTagSampleBufferSGIX();\n"));
+}
+
+/* No dispatch for DeformationMap3dSGIX() */
+/* No dispatch for DeformationMap3fSGIX() */
+/* No dispatch for DeformSGIX() */
+/* No dispatch for LoadIdentityDeformationMapSGIX() */
+KEYWORD1 void KEYWORD2 NAME(ReferencePlaneSGIX)(const GLdouble * equation)
+{
+   DISPATCH(ReferencePlaneSGIX, (equation), (F, "glReferencePlaneSGIX(%p);\n", (const void *) equation));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FlushRasterSGIX)(void)
+{
+   DISPATCH(FlushRasterSGIX, (), (F, "glFlushRasterSGIX();\n"));
+}
+
+/* No dispatch for FogFuncSGIS() */
+/* No dispatch for GetFogFuncSGIS() */
+/* No dispatch for ImageTransformParameteriHP() */
+/* No dispatch for ImageTransformParameterfHP() */
+/* No dispatch for ImageTransformParameterivHP() */
+/* No dispatch for ImageTransformParameterfvHP() */
+/* No dispatch for GetImageTransformParameterivHP() */
+/* No dispatch for GetImageTransformParameterfvHP() */
+KEYWORD1 void KEYWORD2 NAME(ColorSubTableEXT)(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid * data)
+{
+   DISPATCH(ColorSubTable, (target, start, count, format, type, data), (F, "glColorSubTableEXT(0x%x, %d, %d, 0x%x, 0x%x, %p);\n", target, start, count, format, type, (const void *) data));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CopyColorSubTableEXT)(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width)
+{
+   DISPATCH(CopyColorSubTable, (target, start, x, y, width), (F, "glCopyColorSubTableEXT(0x%x, %d, %d, %d, %d);\n", target, start, x, y, width));
+}
+
+KEYWORD1 void KEYWORD2 NAME(HintPGI)(GLenum target, GLint mode)
+{
+   DISPATCH(HintPGI, (target, mode), (F, "glHintPGI(0x%x, %d);\n", target, mode));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ColorTableEXT)(GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid * table)
+{
+   DISPATCH(ColorTable, (target, internalFormat, width, format, type, table), (F, "glColorTableEXT(0x%x, 0x%x, %d, 0x%x, 0x%x, %p);\n", target, internalFormat, width, format, type, (const void *) table));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetColorTableEXT)(GLenum target, GLenum format, GLenum type, GLvoid * data)
+{
+   DISPATCH(GetColorTableEXT, (target, format, type, data), (F, "glGetColorTableEXT(0x%x, 0x%x, 0x%x, %p);\n", target, format, type, (const void *) data));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetColorTableParameterivEXT)(GLenum target, GLenum pname, GLint * params)
+{
+   DISPATCH(GetColorTableParameterivEXT, (target, pname, params), (F, "glGetColorTableParameterivEXT(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetColorTableParameterfvEXT)(GLenum target, GLenum pname, GLfloat * params)
+{
+   DISPATCH(GetColorTableParameterfvEXT, (target, pname, params), (F, "glGetColorTableParameterfvEXT(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetListParameterfvSGIX)(GLuint list, GLenum pname, GLfloat * params)
+{
+   DISPATCH(GetListParameterfvSGIX, (list, pname, params), (F, "glGetListParameterfvSGIX(%d, 0x%x, %p);\n", list, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetListParameterivSGIX)(GLuint list, GLenum pname, GLint * params)
+{
+   DISPATCH(GetListParameterivSGIX, (list, pname, params), (F, "glGetListParameterivSGIX(%d, 0x%x, %p);\n", list, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ListParameterfSGIX)(GLuint list, GLenum pname, GLfloat param)
+{
+   DISPATCH(ListParameterfSGIX, (list, pname, param), (F, "glListParameterfSGIX(%d, 0x%x, %f);\n", list, pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ListParameterfvSGIX)(GLuint list, GLenum pname, const GLfloat * params)
+{
+   DISPATCH(ListParameterfvSGIX, (list, pname, params), (F, "glListParameterfvSGIX(%d, 0x%x, %p);\n", list, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ListParameteriSGIX)(GLuint list, GLenum pname, GLint param)
+{
+   DISPATCH(ListParameteriSGIX, (list, pname, param), (F, "glListParameteriSGIX(%d, 0x%x, %d);\n", list, pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ListParameterivSGIX)(GLuint list, GLenum pname, const GLint * params)
+{
+   DISPATCH(ListParameterivSGIX, (list, pname, params), (F, "glListParameterivSGIX(%d, 0x%x, %p);\n", list, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(IndexMaterialEXT)(GLenum face, GLenum mode)
+{
+   DISPATCH(IndexMaterialEXT, (face, mode), (F, "glIndexMaterialEXT(0x%x, 0x%x);\n", face, mode));
+}
+
+KEYWORD1 void KEYWORD2 NAME(IndexFuncEXT)(GLenum func, GLclampf ref)
+{
+   DISPATCH(IndexFuncEXT, (func, ref), (F, "glIndexFuncEXT(0x%x, %f);\n", func, ref));
+}
+
+KEYWORD1 void KEYWORD2 NAME(LockArraysEXT)(GLint first, GLsizei count)
+{
+   DISPATCH(LockArraysEXT, (first, count), (F, "glLockArraysEXT(%d, %d);\n", first, count));
+}
+
+KEYWORD1 void KEYWORD2 NAME(UnlockArraysEXT)(void)
+{
+   DISPATCH(UnlockArraysEXT, (), (F, "glUnlockArraysEXT();\n"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CullParameterdvEXT)(GLenum pname, GLdouble * params)
+{
+   DISPATCH(CullParameterdvEXT, (pname, params), (F, "glCullParameterdvEXT(0x%x, %p);\n", pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CullParameterfvEXT)(GLenum pname, GLfloat * params)
+{
+   DISPATCH(CullParameterfvEXT, (pname, params), (F, "glCullParameterfvEXT(0x%x, %p);\n", pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FragmentColorMaterialSGIX)(GLenum face, GLenum mode)
+{
+   DISPATCH(FragmentColorMaterialSGIX, (face, mode), (F, "glFragmentColorMaterialSGIX(0x%x, 0x%x);\n", face, mode));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FragmentLightfSGIX)(GLenum light, GLenum pname, GLfloat param)
+{
+   DISPATCH(FragmentLightfSGIX, (light, pname, param), (F, "glFragmentLightfSGIX(0x%x, 0x%x, %f);\n", light, pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FragmentLightfvSGIX)(GLenum light, GLenum pname, const GLfloat * params)
+{
+   DISPATCH(FragmentLightfvSGIX, (light, pname, params), (F, "glFragmentLightfvSGIX(0x%x, 0x%x, %p);\n", light, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FragmentLightiSGIX)(GLenum light, GLenum pname, GLint param)
+{
+   DISPATCH(FragmentLightiSGIX, (light, pname, param), (F, "glFragmentLightiSGIX(0x%x, 0x%x, %d);\n", light, pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FragmentLightivSGIX)(GLenum light, GLenum pname, const GLint * params)
+{
+   DISPATCH(FragmentLightivSGIX, (light, pname, params), (F, "glFragmentLightivSGIX(0x%x, 0x%x, %p);\n", light, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FragmentLightModelfSGIX)(GLenum pname, GLfloat param)
+{
+   DISPATCH(FragmentLightModelfSGIX, (pname, param), (F, "glFragmentLightModelfSGIX(0x%x, %f);\n", pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FragmentLightModelfvSGIX)(GLenum pname, const GLfloat * params)
+{
+   DISPATCH(FragmentLightModelfvSGIX, (pname, params), (F, "glFragmentLightModelfvSGIX(0x%x, %p);\n", pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FragmentLightModeliSGIX)(GLenum pname, GLint param)
+{
+   DISPATCH(FragmentLightModeliSGIX, (pname, param), (F, "glFragmentLightModeliSGIX(0x%x, %d);\n", pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FragmentLightModelivSGIX)(GLenum pname, const GLint * params)
+{
+   DISPATCH(FragmentLightModelivSGIX, (pname, params), (F, "glFragmentLightModelivSGIX(0x%x, %p);\n", pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FragmentMaterialfSGIX)(GLenum face, GLenum pname, GLfloat param)
+{
+   DISPATCH(FragmentMaterialfSGIX, (face, pname, param), (F, "glFragmentMaterialfSGIX(0x%x, 0x%x, %f);\n", face, pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FragmentMaterialfvSGIX)(GLenum face, GLenum pname, const GLfloat * params)
+{
+   DISPATCH(FragmentMaterialfvSGIX, (face, pname, params), (F, "glFragmentMaterialfvSGIX(0x%x, 0x%x, %p);\n", face, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FragmentMaterialiSGIX)(GLenum face, GLenum pname, GLint param)
+{
+   DISPATCH(FragmentMaterialiSGIX, (face, pname, param), (F, "glFragmentMaterialiSGIX(0x%x, 0x%x, %d);\n", face, pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FragmentMaterialivSGIX)(GLenum face, GLenum pname, const GLint * params)
+{
+   DISPATCH(FragmentMaterialivSGIX, (face, pname, params), (F, "glFragmentMaterialivSGIX(0x%x, 0x%x, %p);\n", face, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetFragmentLightfvSGIX)(GLenum light, GLenum pname, GLfloat * params)
+{
+   DISPATCH(GetFragmentLightfvSGIX, (light, pname, params), (F, "glGetFragmentLightfvSGIX(0x%x, 0x%x, %p);\n", light, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetFragmentLightivSGIX)(GLenum light, GLenum pname, GLint * params)
+{
+   DISPATCH(GetFragmentLightivSGIX, (light, pname, params), (F, "glGetFragmentLightivSGIX(0x%x, 0x%x, %p);\n", light, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetFragmentMaterialfvSGIX)(GLenum face, GLenum pname, GLfloat * params)
+{
+   DISPATCH(GetFragmentMaterialfvSGIX, (face, pname, params), (F, "glGetFragmentMaterialfvSGIX(0x%x, 0x%x, %p);\n", face, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetFragmentMaterialivSGIX)(GLenum face, GLenum pname, GLint * params)
+{
+   DISPATCH(GetFragmentMaterialivSGIX, (face, pname, params), (F, "glGetFragmentMaterialivSGIX(0x%x, 0x%x, %p);\n", face, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(LightEnviSGIX)(GLenum pname, GLint param)
+{
+   DISPATCH(LightEnviSGIX, (pname, param), (F, "glLightEnviSGIX(0x%x, %d);\n", pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(DrawRangeElementsEXT)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid * indices)
+{
+   DISPATCH(DrawRangeElements, (mode, start, end, count, type, indices), (F, "glDrawRangeElementsEXT(0x%x, %d, %d, %d, 0x%x, %p);\n", mode, start, end, count, type, (const void *) indices));
+}
+
+/* No dispatch for ApplyTextureEXT() */
+/* No dispatch for TextureLightEXT() */
+/* No dispatch for TextureMaterialEXT() */
+/* No dispatch for AsyncMarkerSGIX() */
+/* No dispatch for FinishAsyncSGIX() */
+/* No dispatch for PollAsyncSGIX() */
+/* No dispatch for GenAsyncMarkersSGIX() */
+/* No dispatch for DeleteAsyncMarkersSGIX() */
+/* No dispatch for IsAsyncMarkerSGIX() */
+/* No dispatch for VertexPointervINTEL() */
+/* No dispatch for NormalPointervINTEL() */
+/* No dispatch for ColorPointervINTEL() */
+/* No dispatch for TexCoordPointervINTEL() */
+/* No dispatch for PixelTransformParameteriEXT() */
+/* No dispatch for PixelTransformParameterfEXT() */
+/* No dispatch for PixelTransformParameterivEXT() */
+/* No dispatch for PixelTransformParameterfvEXT() */
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue)
+{
+   DISPATCH(SecondaryColor3bEXT, (red, green, blue), (F, "glSecondaryColor3bEXT(%d, %d, %d);\n", red, green, blue));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3bvEXT)(const GLbyte * v)
+{
+   DISPATCH(SecondaryColor3bvEXT, (v), (F, "glSecondaryColor3bvEXT(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue)
+{
+   DISPATCH(SecondaryColor3dEXT, (red, green, blue), (F, "glSecondaryColor3dEXT(%f, %f, %f);\n", red, green, blue));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3dvEXT)(const GLdouble * v)
+{
+   DISPATCH(SecondaryColor3dvEXT, (v), (F, "glSecondaryColor3dvEXT(%p /* %g, %g, %g */);\n", (const void *) v, v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue)
+{
+   DISPATCH(SecondaryColor3fEXT, (red, green, blue), (F, "glSecondaryColor3fEXT(%f, %f, %f);\n", red, green, blue));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3fvEXT)(const GLfloat * v)
+{
+   DISPATCH(SecondaryColor3fvEXT, (v), (F, "glSecondaryColor3fvEXT(%p /* %g, %g, %g */);\n", (const void *) v, v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3iEXT)(GLint red, GLint green, GLint blue)
+{
+   DISPATCH(SecondaryColor3iEXT, (red, green, blue), (F, "glSecondaryColor3iEXT(%d, %d, %d);\n", red, green, blue));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3ivEXT)(const GLint * v)
+{
+   DISPATCH(SecondaryColor3ivEXT, (v), (F, "glSecondaryColor3ivEXT(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue)
+{
+   DISPATCH(SecondaryColor3sEXT, (red, green, blue), (F, "glSecondaryColor3sEXT(%d, %d, %d);\n", red, green, blue));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3svEXT)(const GLshort * v)
+{
+   DISPATCH(SecondaryColor3svEXT, (v), (F, "glSecondaryColor3svEXT(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue)
+{
+   DISPATCH(SecondaryColor3ubEXT, (red, green, blue), (F, "glSecondaryColor3ubEXT(%d, %d, %d);\n", red, green, blue));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3ubvEXT)(const GLubyte * v)
+{
+   DISPATCH(SecondaryColor3ubvEXT, (v), (F, "glSecondaryColor3ubvEXT(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue)
+{
+   DISPATCH(SecondaryColor3uiEXT, (red, green, blue), (F, "glSecondaryColor3uiEXT(%d, %d, %d);\n", red, green, blue));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3uivEXT)(const GLuint * v)
+{
+   DISPATCH(SecondaryColor3uivEXT, (v), (F, "glSecondaryColor3uivEXT(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue)
+{
+   DISPATCH(SecondaryColor3usEXT, (red, green, blue), (F, "glSecondaryColor3usEXT(%d, %d, %d);\n", red, green, blue));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3usvEXT)(const GLushort * v)
+{
+   DISPATCH(SecondaryColor3usvEXT, (v), (F, "glSecondaryColor3usvEXT(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer)
+{
+   DISPATCH(SecondaryColorPointerEXT, (size, type, stride, pointer), (F, "glSecondaryColorPointerEXT(%d, 0x%x, %d, %p);\n", size, type, stride, (const void *) pointer));
+}
+
+/* No dispatch for TextureNormalEXT() */
+KEYWORD1 void KEYWORD2 NAME(MultiDrawArraysEXT)(GLenum mode, GLint * first, GLsizei * count, GLsizei primcount)
+{
+   DISPATCH(MultiDrawArraysEXT, (mode, first, count, primcount), (F, "glMultiDrawArraysEXT(0x%x, %p, %p, %d);\n", mode, (const void *) first, (const void *) count, primcount));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount)
+{
+   DISPATCH(MultiDrawElementsEXT, (mode, count, type, indices, primcount), (F, "glMultiDrawElementsEXT(0x%x, %p, 0x%x, %p, %d);\n", mode, (const void *) count, type, (const void *) indices, primcount));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FogCoordfEXT)(GLfloat coord)
+{
+   DISPATCH(FogCoordfEXT, (coord), (F, "glFogCoordfEXT(%f);\n", coord));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FogCoordfvEXT)(const GLfloat * coord)
+{
+   DISPATCH(FogCoordfvEXT, (coord), (F, "glFogCoordfvEXT(%p);\n", (const void *) coord));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FogCoorddEXT)(GLdouble coord)
+{
+   DISPATCH(FogCoorddEXT, (coord), (F, "glFogCoorddEXT(%f);\n", coord));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FogCoorddvEXT)(const GLdouble * coord)
+{
+   DISPATCH(FogCoorddvEXT, (coord), (F, "glFogCoorddvEXT(%p);\n", (const void *) coord));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid * pointer)
+{
+   DISPATCH(FogCoordPointerEXT, (type, stride, pointer), (F, "glFogCoordPointerEXT(0x%x, %d, %p);\n", type, stride, (const void *) pointer));
+}
+
+/* No dispatch for Tangent3bEXT() */
+/* No dispatch for Tangent3bvEXT() */
+/* No dispatch for Tangent3dEXT() */
+/* No dispatch for Tangent3dvEXT() */
+/* No dispatch for Tangent3fEXT() */
+/* No dispatch for Tangent3fvEXT() */
+/* No dispatch for Tangent3iEXT() */
+/* No dispatch for Tangent3ivEXT() */
+/* No dispatch for Tangent3sEXT() */
+/* No dispatch for Tangent3svEXT() */
+/* No dispatch for Binormal3bEXT() */
+/* No dispatch for Binormal3bvEXT() */
+/* No dispatch for Binormal3dEXT() */
+/* No dispatch for Binormal3dvEXT() */
+/* No dispatch for Binormal3fEXT() */
+/* No dispatch for Binormal3fvEXT() */
+/* No dispatch for Binormal3iEXT() */
+/* No dispatch for Binormal3ivEXT() */
+/* No dispatch for Binormal3sEXT() */
+/* No dispatch for Binormal3svEXT() */
+/* No dispatch for TangentPointerEXT() */
+/* No dispatch for BinormalPointerEXT() */
+/* No dispatch for FinishTextureSUNX() */
+/* No dispatch for GlobalAlphaFactorbSUN() */
+/* No dispatch for GlobalAlphaFactorsSUN() */
+/* No dispatch for GlobalAlphaFactoriSUN() */
+/* No dispatch for GlobalAlphaFactorfSUN() */
+/* No dispatch for GlobalAlphaFactordSUN() */
+/* No dispatch for GlobalAlphaFactorubSUN() */
+/* No dispatch for GlobalAlphaFactorusSUN() */
+/* No dispatch for GlobalAlphaFactoruiSUN() */
+/* No dispatch for ReplacementCodeuiSUN() */
+/* No dispatch for ReplacementCodeusSUN() */
+/* No dispatch for ReplacementCodeubSUN() */
+/* No dispatch for ReplacementCodeuivSUN() */
+/* No dispatch for ReplacementCodeusvSUN() */
+/* No dispatch for ReplacementCodeubvSUN() */
+/* No dispatch for ReplacementCodePointerSUN() */
+/* No dispatch for Color4ubVertex2fSUN() */
+/* No dispatch for Color4ubVertex2fvSUN() */
+/* No dispatch for Color4ubVertex3fSUN() */
+/* No dispatch for Color4ubVertex3fvSUN() */
+/* No dispatch for Color3fVertex3fSUN() */
+/* No dispatch for Color3fVertex3fvSUN() */
+/* No dispatch for Normal3fVertex3fSUN() */
+/* No dispatch for Normal3fVertex3fvSUN() */
+/* No dispatch for Color4fNormal3fVertex3fSUN() */
+/* No dispatch for Color4fNormal3fVertex3fvSUN() */
+/* No dispatch for TexCoord2fVertex3fSUN() */
+/* No dispatch for TexCoord2fVertex3fvSUN() */
+/* No dispatch for TexCoord4fVertex4fSUN() */
+/* No dispatch for TexCoord4fVertex4fvSUN() */
+/* No dispatch for TexCoord2fColor4ubVertex3fSUN() */
+/* No dispatch for TexCoord2fColor4ubVertex3fvSUN() */
+/* No dispatch for TexCoord2fColor3fVertex3fSUN() */
+/* No dispatch for TexCoord2fColor3fVertex3fvSUN() */
+/* No dispatch for TexCoord2fNormal3fVertex3fSUN() */
+/* No dispatch for TexCoord2fNormal3fVertex3fvSUN() */
+/* No dispatch for TexCoord2fColor4fNormal3fVertex3fSUN() */
+/* No dispatch for TexCoord2fColor4fNormal3fVertex3fvSUN() */
+/* No dispatch for TexCoord4fColor4fNormal3fVertex4fSUN() */
+/* No dispatch for TexCoord4fColor4fNormal3fVertex4fvSUN() */
+/* No dispatch for ReplacementCodeuiVertex3fSUN() */
+/* No dispatch for ReplacementCodeuiVertex3fvSUN() */
+/* No dispatch for ReplacementCodeuiColor4ubVertex3fSUN() */
+/* No dispatch for ReplacementCodeuiColor4ubVertex3fvSUN() */
+/* No dispatch for ReplacementCodeuiColor3fVertex3fSUN() */
+/* No dispatch for ReplacementCodeuiColor3fVertex3fvSUN() */
+/* No dispatch for ReplacementCodeuiNormal3fVertex3fSUN() */
+/* No dispatch for ReplacementCodeuiNormal3fVertex3fvSUN() */
+/* No dispatch for ReplacementCodeuiColor4fNormal3fVertex3fSUN() */
+/* No dispatch for ReplacementCodeuiColor4fNormal3fVertex3fvSUN() */
+/* No dispatch for ReplacementCodeuiTexCoord2fVertex3fSUN() */
+/* No dispatch for ReplacementCodeuiTexCoord2fVertex3fvSUN() */
+/* No dispatch for ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN() */
+/* No dispatch for ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN() */
+/* No dispatch for ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN() */
+/* No dispatch for ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN() */
+KEYWORD1 void KEYWORD2 NAME(BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
+{
+   DISPATCH(BlendFuncSeparateEXT, (sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha), (F, "glBlendFuncSeparateEXT(0x%x, 0x%x, 0x%x, 0x%x);\n", sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha));
+}
+
+KEYWORD1 void KEYWORD2 NAME(BlendFuncSeparateINGR)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
+{
+   DISPATCH(BlendFuncSeparateEXT, (sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha), (F, "glBlendFuncSeparateINGR(0x%x, 0x%x, 0x%x, 0x%x);\n", sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexWeightfEXT)(GLfloat weight)
+{
+   DISPATCH(VertexWeightfEXT, (weight), (F, "glVertexWeightfEXT(%f);\n", weight));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexWeightfvEXT)(const GLfloat * weight)
+{
+   DISPATCH(VertexWeightfvEXT, (weight), (F, "glVertexWeightfvEXT(%p);\n", (const void *) weight));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexWeightPointerEXT)(GLsizei size, GLenum type, GLsizei stride, const GLvoid * pointer)
+{
+   DISPATCH(VertexWeightPointerEXT, (size, type, stride, pointer), (F, "glVertexWeightPointerEXT(%d, 0x%x, %d, %p);\n", size, type, stride, (const void *) pointer));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FlushVertexArrayRangeNV)(void)
+{
+   DISPATCH(FlushVertexArrayRangeNV, (), (F, "glFlushVertexArrayRangeNV();\n"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexArrayRangeNV)(GLsizei length, const GLvoid * pointer)
+{
+   DISPATCH(VertexArrayRangeNV, (length, pointer), (F, "glVertexArrayRangeNV(%d, %p);\n", length, (const void *) pointer));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CombinerParameterfvNV)(GLenum pname, const GLfloat * params)
+{
+   DISPATCH(CombinerParameterfvNV, (pname, params), (F, "glCombinerParameterfvNV(0x%x, %p);\n", pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CombinerParameterfNV)(GLenum pname, GLfloat param)
+{
+   DISPATCH(CombinerParameterfNV, (pname, param), (F, "glCombinerParameterfNV(0x%x, %f);\n", pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CombinerParameterivNV)(GLenum pname, const GLint * params)
+{
+   DISPATCH(CombinerParameterivNV, (pname, params), (F, "glCombinerParameterivNV(0x%x, %p);\n", pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CombinerParameteriNV)(GLenum pname, GLint param)
+{
+   DISPATCH(CombinerParameteriNV, (pname, param), (F, "glCombinerParameteriNV(0x%x, %d);\n", pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CombinerInputNV)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage)
+{
+   DISPATCH(CombinerInputNV, (stage, portion, variable, input, mapping, componentUsage), (F, "glCombinerInputNV(0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x);\n", stage, portion, variable, input, mapping, componentUsage));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CombinerOutputNV)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum)
+{
+   DISPATCH(CombinerOutputNV, (stage, portion, abOutput, cdOutput, sumOutput, scale, bias, abDotProduct, cdDotProduct, muxSum), (F, "glCombinerOutputNV(0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, %d, %d, %d);\n", stage, portion, abOutput, cdOutput, sumOutput, scale, bias, abDotProduct, cdDotProduct, muxSum));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FinalCombinerInputNV)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage)
+{
+   DISPATCH(FinalCombinerInputNV, (variable, input, mapping, componentUsage), (F, "glFinalCombinerInputNV(0x%x, 0x%x, 0x%x, 0x%x);\n", variable, input, mapping, componentUsage));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetCombinerInputParameterfvNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat * params)
+{
+   DISPATCH(GetCombinerInputParameterfvNV, (stage, portion, variable, pname, params), (F, "glGetCombinerInputParameterfvNV(0x%x, 0x%x, 0x%x, 0x%x, %p);\n", stage, portion, variable, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetCombinerInputParameterivNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint * params)
+{
+   DISPATCH(GetCombinerInputParameterivNV, (stage, portion, variable, pname, params), (F, "glGetCombinerInputParameterivNV(0x%x, 0x%x, 0x%x, 0x%x, %p);\n", stage, portion, variable, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetCombinerOutputParameterfvNV)(GLenum stage, GLenum portion, GLenum pname, GLfloat * params)
+{
+   DISPATCH(GetCombinerOutputParameterfvNV, (stage, portion, pname, params), (F, "glGetCombinerOutputParameterfvNV(0x%x, 0x%x, 0x%x, %p);\n", stage, portion, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetCombinerOutputParameterivNV)(GLenum stage, GLenum portion, GLenum pname, GLint * params)
+{
+   DISPATCH(GetCombinerOutputParameterivNV, (stage, portion, pname, params), (F, "glGetCombinerOutputParameterivNV(0x%x, 0x%x, 0x%x, %p);\n", stage, portion, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetFinalCombinerInputParameterfvNV)(GLenum variable, GLenum pname, GLfloat * params)
+{
+   DISPATCH(GetFinalCombinerInputParameterfvNV, (variable, pname, params), (F, "glGetFinalCombinerInputParameterfvNV(0x%x, 0x%x, %p);\n", variable, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetFinalCombinerInputParameterivNV)(GLenum variable, GLenum pname, GLint * params)
+{
+   DISPATCH(GetFinalCombinerInputParameterivNV, (variable, pname, params), (F, "glGetFinalCombinerInputParameterivNV(0x%x, 0x%x, %p);\n", variable, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ResizeBuffersMESA)(void)
+{
+   DISPATCH(ResizeBuffersMESA, (), (F, "glResizeBuffersMESA();\n"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos2dMESA)(GLdouble x, GLdouble y)
+{
+   DISPATCH(WindowPos2dMESA, (x, y), (F, "glWindowPos2dMESA(%f, %f);\n", x, y));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos2dvMESA)(const GLdouble * v)
+{
+   DISPATCH(WindowPos2dvMESA, (v), (F, "glWindowPos2dvMESA(%p /* %g, %g */);\n", (const void *) v, v[0], v[1]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos2fMESA)(GLfloat x, GLfloat y)
+{
+   DISPATCH(WindowPos2fMESA, (x, y), (F, "glWindowPos2fMESA(%f, %f);\n", x, y));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos2fvMESA)(const GLfloat * v)
+{
+   DISPATCH(WindowPos2fvMESA, (v), (F, "glWindowPos2fvMESA(%p /* %g, %g */);\n", (const void *) v, v[0], v[1]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos2iMESA)(GLint x, GLint y)
+{
+   DISPATCH(WindowPos2iMESA, (x, y), (F, "glWindowPos2iMESA(%d, %d);\n", x, y));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos2ivMESA)(const GLint * v)
+{
+   DISPATCH(WindowPos2ivMESA, (v), (F, "glWindowPos2ivMESA(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos2sMESA)(GLshort x, GLshort y)
+{
+   DISPATCH(WindowPos2sMESA, (x, y), (F, "glWindowPos2sMESA(%d, %d);\n", x, y));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos2svMESA)(const GLshort * v)
+{
+   DISPATCH(WindowPos2svMESA, (v), (F, "glWindowPos2svMESA(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z)
+{
+   DISPATCH(WindowPos3dMESA, (x, y, z), (F, "glWindowPos3dMESA(%f, %f, %f);\n", x, y, z));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos3dvMESA)(const GLdouble * v)
+{
+   DISPATCH(WindowPos3dvMESA, (v), (F, "glWindowPos3dvMESA(%p /* %g, %g, %g */);\n", (const void *) v, v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z)
+{
+   DISPATCH(WindowPos3fMESA, (x, y, z), (F, "glWindowPos3fMESA(%f, %f, %f);\n", x, y, z));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos3fvMESA)(const GLfloat * v)
+{
+   DISPATCH(WindowPos3fvMESA, (v), (F, "glWindowPos3fvMESA(%p /* %g, %g, %g */);\n", (const void *) v, v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos3iMESA)(GLint x, GLint y, GLint z)
+{
+   DISPATCH(WindowPos3iMESA, (x, y, z), (F, "glWindowPos3iMESA(%d, %d, %d);\n", x, y, z));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos3ivMESA)(const GLint * v)
+{
+   DISPATCH(WindowPos3ivMESA, (v), (F, "glWindowPos3ivMESA(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos3sMESA)(GLshort x, GLshort y, GLshort z)
+{
+   DISPATCH(WindowPos3sMESA, (x, y, z), (F, "glWindowPos3sMESA(%d, %d, %d);\n", x, y, z));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos3svMESA)(const GLshort * v)
+{
+   DISPATCH(WindowPos3svMESA, (v), (F, "glWindowPos3svMESA(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
+{
+   DISPATCH(WindowPos4dMESA, (x, y, z, w), (F, "glWindowPos4dMESA(%f, %f, %f, %f);\n", x, y, z, w));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos4dvMESA)(const GLdouble * v)
+{
+   DISPATCH(WindowPos4dvMESA, (v), (F, "glWindowPos4dvMESA(%p /* %g, %g, %g, %g */);\n", (const void *) v, v[0], v[1], v[2], v[3]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   DISPATCH(WindowPos4fMESA, (x, y, z, w), (F, "glWindowPos4fMESA(%f, %f, %f, %f);\n", x, y, z, w));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos4fvMESA)(const GLfloat * v)
+{
+   DISPATCH(WindowPos4fvMESA, (v), (F, "glWindowPos4fvMESA(%p /* %g, %g, %g, %g */);\n", (const void *) v, v[0], v[1], v[2], v[3]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w)
+{
+   DISPATCH(WindowPos4iMESA, (x, y, z, w), (F, "glWindowPos4iMESA(%d, %d, %d, %d);\n", x, y, z, w));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos4ivMESA)(const GLint * v)
+{
+   DISPATCH(WindowPos4ivMESA, (v), (F, "glWindowPos4ivMESA(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w)
+{
+   DISPATCH(WindowPos4sMESA, (x, y, z, w), (F, "glWindowPos4sMESA(%d, %d, %d, %d);\n", x, y, z, w));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos4svMESA)(const GLshort * v)
+{
+   DISPATCH(WindowPos4svMESA, (v), (F, "glWindowPos4svMESA(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride)
+{
+   DISPATCH(MultiModeDrawArraysIBM, (mode, first, count, primcount, modestride), (F, "glMultiModeDrawArraysIBM(%p, %p, %p, %d, %d);\n", (const void *) mode, (const void *) first, (const void *) count, primcount, modestride));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride)
+{
+   DISPATCH(MultiModeDrawElementsIBM, (mode, count, type, indices, primcount, modestride), (F, "glMultiModeDrawElementsIBM(%p, %p, 0x%x, %p, %d, %d);\n", (const void *) mode, (const void *) count, type, (const void *) indices, primcount, modestride));
+}
+
+/* No dispatch for ColorPointerListIBM() */
+/* No dispatch for SecondaryColorPointerListIBM() */
+/* No dispatch for EdgeFlagPointerListIBM() */
+/* No dispatch for FogCoordPointerListIBM() */
+/* No dispatch for IndexPointerListIBM() */
+/* No dispatch for NormalPointerListIBM() */
+/* No dispatch for TexCoordPointerListIBM() */
+/* No dispatch for VertexPointerListIBM() */
+KEYWORD1 void KEYWORD2 NAME(TbufferMask3DFX)(GLuint mask)
+{
+   DISPATCH(TbufferMask3DFX, (mask), (F, "glTbufferMask3DFX(%d);\n", mask));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SampleMaskEXT)(GLclampf value, GLboolean invert)
+{
+   DISPATCH(SampleMaskSGIS, (value, invert), (F, "glSampleMaskEXT(%f, %d);\n", value, invert));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SamplePatternEXT)(GLenum pattern)
+{
+   DISPATCH(SamplePatternSGIS, (pattern), (F, "glSamplePatternEXT(0x%x);\n", pattern));
+}
+
+/* No dispatch for TextureColorMaskSGIS() */
+/* No dispatch for IglooInterfaceSGIX() */
+/* No dispatch for MapControlPointsNV() */
+/* No dispatch for MapParameterivNV() */
+/* No dispatch for MapParameterfvNV() */
+/* No dispatch for GetMapControlPointsNV() */
+/* No dispatch for GetMapParameterivNV() */
+/* No dispatch for GetMapParameterfvNV() */
+/* No dispatch for GetMapAttribParameterivNV() */
+/* No dispatch for GetMapAttribParameterfvNV() */
+/* No dispatch for EvalMapsNV() */
+/* No dispatch for CombinerStageParameterfvNV() */
+/* No dispatch for GetCombinerStageParameterfvNV() */
+KEYWORD1 void KEYWORD2 NAME(WindowPos2dARB)(GLdouble x, GLdouble y)
+{
+   DISPATCH(WindowPos2dMESA, (x, y), (F, "glWindowPos2dARB(%f, %f);\n", x, y));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos2fARB)(GLfloat x, GLfloat y)
+{
+   DISPATCH(WindowPos2fMESA, (x, y), (F, "glWindowPos2fARB(%f, %f);\n", x, y));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos2iARB)(GLint x, GLint y)
+{
+   DISPATCH(WindowPos2iMESA, (x, y), (F, "glWindowPos2iARB(%d, %d);\n", x, y));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos2sARB)(GLshort x, GLshort y)
+{
+   DISPATCH(WindowPos2sMESA, (x, y), (F, "glWindowPos2sARB(%d, %d);\n", x, y));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos2dvARB)(const GLdouble * p)
+{
+   DISPATCH(WindowPos2dvMESA, (p), (F, "glWindowPos2dvARB(%p /* %g, %g */);\n", (const void *) p, p[0], p[1]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos2fvARB)(const GLfloat * p)
+{
+   DISPATCH(WindowPos2fvMESA, (p), (F, "glWindowPos2fvARB(%p /* %g, %g */);\n", (const void *) p, p[0], p[1]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos2ivARB)(const GLint * p)
+{
+   DISPATCH(WindowPos2ivMESA, (p), (F, "glWindowPos2ivARB(%p);\n", (const void *) p));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos2svARB)(const GLshort * p)
+{
+   DISPATCH(WindowPos2svMESA, (p), (F, "glWindowPos2svARB(%p);\n", (const void *) p));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos3dARB)(GLdouble x, GLdouble y, GLdouble z)
+{
+   DISPATCH(WindowPos3dMESA, (x, y, z), (F, "glWindowPos3dARB(%f, %f, %f);\n", x, y, z));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos3fARB)(GLfloat x, GLfloat y, GLfloat z)
+{
+   DISPATCH(WindowPos3fMESA, (x, y, z), (F, "glWindowPos3fARB(%f, %f, %f);\n", x, y, z));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos3iARB)(GLint x, GLint y, GLint z)
+{
+   DISPATCH(WindowPos3iMESA, (x, y, z), (F, "glWindowPos3iARB(%d, %d, %d);\n", x, y, z));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos3sARB)(GLshort x, GLshort y, GLshort z)
+{
+   DISPATCH(WindowPos3sMESA, (x, y, z), (F, "glWindowPos3sARB(%d, %d, %d);\n", x, y, z));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos3dvARB)(const GLdouble * p)
+{
+   DISPATCH(WindowPos3dvMESA, (p), (F, "glWindowPos3dvARB(%p /* %g, %g, %g */);\n", (const void *) p, p[0], p[1], p[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos3fvARB)(const GLfloat * p)
+{
+   DISPATCH(WindowPos3fvMESA, (p), (F, "glWindowPos3fvARB(%p /* %g, %g, %g */);\n", (const void *) p, p[0], p[1], p[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos3ivARB)(const GLint * p)
+{
+   DISPATCH(WindowPos3ivMESA, (p), (F, "glWindowPos3ivARB(%p);\n", (const void *) p));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos3svARB)(const GLshort * p)
+{
+   DISPATCH(WindowPos3svMESA, (p), (F, "glWindowPos3svARB(%p);\n", (const void *) p));
+}
+
+KEYWORD1 GLboolean KEYWORD2 NAME(AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences)
+{
+   RETURN_DISPATCH(AreProgramsResidentNV, (n, ids, residences), (F, "glAreProgramsResidentNV(%d, %p, %p);\n", n, (const void *) ids, (const void *) residences));
+}
+
+KEYWORD1 void KEYWORD2 NAME(BindProgramNV)(GLenum target, GLuint id)
+{
+   DISPATCH(BindProgramNV, (target, id), (F, "glBindProgramNV(0x%x, %d);\n", target, id));
+}
+
+KEYWORD1 void KEYWORD2 NAME(DeleteProgramsNV)(GLsizei n, const GLuint * ids)
+{
+   DISPATCH(DeleteProgramsNV, (n, ids), (F, "glDeleteProgramsNV(%d, %p);\n", n, (const void *) ids));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params)
+{
+   DISPATCH(ExecuteProgramNV, (target, id, params), (F, "glExecuteProgramNV(0x%x, %d, %p);\n", target, id, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GenProgramsNV)(GLsizei n, GLuint * ids)
+{
+   DISPATCH(GenProgramsNV, (n, ids), (F, "glGenProgramsNV(%d, %p);\n", n, (const void *) ids));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params)
+{
+   DISPATCH(GetProgramParameterdvNV, (target, index, pname, params), (F, "glGetProgramParameterdvNV(0x%x, %d, 0x%x, %p);\n", target, index, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params)
+{
+   DISPATCH(GetProgramParameterfvNV, (target, index, pname, params), (F, "glGetProgramParameterfvNV(0x%x, %d, 0x%x, %p);\n", target, index, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetProgramivNV)(GLuint id, GLenum pname, GLint * params)
+{
+   DISPATCH(GetProgramivNV, (id, pname, params), (F, "glGetProgramivNV(%d, 0x%x, %p);\n", id, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program)
+{
+   DISPATCH(GetProgramStringNV, (id, pname, program), (F, "glGetProgramStringNV(%d, 0x%x, %p);\n", id, pname, (const void *) program));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params)
+{
+   DISPATCH(GetTrackMatrixivNV, (target, address, pname, params), (F, "glGetTrackMatrixivNV(0x%x, %d, 0x%x, %p);\n", target, address, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params)
+{
+   DISPATCH(GetVertexAttribdvNV, (index, pname, params), (F, "glGetVertexAttribdvNV(%d, 0x%x, %p);\n", index, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params)
+{
+   DISPATCH(GetVertexAttribfvNV, (index, pname, params), (F, "glGetVertexAttribfvNV(%d, 0x%x, %p);\n", index, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params)
+{
+   DISPATCH(GetVertexAttribivNV, (index, pname, params), (F, "glGetVertexAttribivNV(%d, 0x%x, %p);\n", index, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer)
+{
+   DISPATCH(GetVertexAttribPointervNV, (index, pname, pointer), (F, "glGetVertexAttribPointervNV(%d, 0x%x, %p);\n", index, pname, (const void *) pointer));
+}
+
+KEYWORD1 GLboolean KEYWORD2 NAME(IsProgramNV)(GLuint id)
+{
+   RETURN_DISPATCH(IsProgramNV, (id), (F, "glIsProgramNV(%d);\n", id));
+}
+
+KEYWORD1 void KEYWORD2 NAME(LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program)
+{
+   DISPATCH(LoadProgramNV, (target, id, len, program), (F, "glLoadProgramNV(0x%x, %d, %d, %p);\n", target, id, len, (const void *) program));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ProgramParameter4dNV)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
+{
+   DISPATCH(ProgramParameter4dNV, (target, index, x, y, z, w), (F, "glProgramParameter4dNV(0x%x, %d, %f, %f, %f, %f);\n", target, index, x, y, z, w));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ProgramParameter4dvNV)(GLenum target, GLuint index, const GLdouble * params)
+{
+   DISPATCH(ProgramParameter4dvNV, (target, index, params), (F, "glProgramParameter4dvNV(0x%x, %d, %p /* %g, %g, %g, %g */);\n", target, index, (const void *) params, params[0], params[1], params[2], params[3]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ProgramParameter4fNV)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   DISPATCH(ProgramParameter4fNV, (target, index, x, y, z, w), (F, "glProgramParameter4fNV(0x%x, %d, %f, %f, %f, %f);\n", target, index, x, y, z, w));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ProgramParameter4fvNV)(GLenum target, GLuint index, const GLfloat * params)
+{
+   DISPATCH(ProgramParameter4fvNV, (target, index, params), (F, "glProgramParameter4fvNV(0x%x, %d, %p /* %g, %g, %g, %g */);\n", target, index, (const void *) params, params[0], params[1], params[2], params[3]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ProgramParameters4dvNV)(GLenum target, GLuint index, GLuint num, const GLdouble * params)
+{
+   DISPATCH(ProgramParameters4dvNV, (target, index, num, params), (F, "glProgramParameters4dvNV(0x%x, %d, %d, %p /* %g, %g, %g, %g */);\n", target, index, num, (const void *) params, params[0], params[1], params[2], params[3]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ProgramParameters4fvNV)(GLenum target, GLuint index, GLuint num, const GLfloat * params)
+{
+   DISPATCH(ProgramParameters4fvNV, (target, index, num, params), (F, "glProgramParameters4fvNV(0x%x, %d, %d, %p /* %g, %g, %g, %g */);\n", target, index, num, (const void *) params, params[0], params[1], params[2], params[3]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(RequestResidentProgramsNV)(GLsizei n, const GLuint * ids)
+{
+   DISPATCH(RequestResidentProgramsNV, (n, ids), (F, "glRequestResidentProgramsNV(%d, %p);\n", n, (const void *) ids));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform)
+{
+   DISPATCH(TrackMatrixNV, (target, address, matrix, transform), (F, "glTrackMatrixNV(0x%x, %d, 0x%x, 0x%x);\n", target, address, matrix, transform));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer)
+{
+   DISPATCH(VertexAttribPointerNV, (index, size, type, stride, pointer), (F, "glVertexAttribPointerNV(%d, %d, 0x%x, %d, %p);\n", index, size, type, stride, (const void *) pointer));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib1dNV)(GLuint index, GLdouble x)
+{
+   DISPATCH(VertexAttrib1dNV, (index, x), (F, "glVertexAttrib1dNV(%d, %f);\n", index, x));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib1dvNV)(GLuint index, const GLdouble * v)
+{
+   DISPATCH(VertexAttrib1dvNV, (index, v), (F, "glVertexAttrib1dvNV(%d, %p);\n", index, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib1fNV)(GLuint index, GLfloat x)
+{
+   DISPATCH(VertexAttrib1fNV, (index, x), (F, "glVertexAttrib1fNV(%d, %f);\n", index, x));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib1fvNV)(GLuint index, const GLfloat * v)
+{
+   DISPATCH(VertexAttrib1fvNV, (index, v), (F, "glVertexAttrib1fvNV(%d, %p);\n", index, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib1sNV)(GLuint index, GLshort x)
+{
+   DISPATCH(VertexAttrib1sNV, (index, x), (F, "glVertexAttrib1sNV(%d, %d);\n", index, x));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib1svNV)(GLuint index, const GLshort * v)
+{
+   DISPATCH(VertexAttrib1svNV, (index, v), (F, "glVertexAttrib1svNV(%d, %p);\n", index, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y)
+{
+   DISPATCH(VertexAttrib2dNV, (index, x, y), (F, "glVertexAttrib2dNV(%d, %f, %f);\n", index, x, y));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib2dvNV)(GLuint index, const GLdouble * v)
+{
+   DISPATCH(VertexAttrib2dvNV, (index, v), (F, "glVertexAttrib2dvNV(%d, %p /* %g, %g */);\n", index, (const void *) v, v[0], v[1]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y)
+{
+   DISPATCH(VertexAttrib2fNV, (index, x, y), (F, "glVertexAttrib2fNV(%d, %f, %f);\n", index, x, y));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib2fvNV)(GLuint index, const GLfloat * v)
+{
+   DISPATCH(VertexAttrib2fvNV, (index, v), (F, "glVertexAttrib2fvNV(%d, %p /* %g, %g */);\n", index, (const void *) v, v[0], v[1]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y)
+{
+   DISPATCH(VertexAttrib2sNV, (index, x, y), (F, "glVertexAttrib2sNV(%d, %d, %d);\n", index, x, y));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib2svNV)(GLuint index, const GLshort * v)
+{
+   DISPATCH(VertexAttrib2svNV, (index, v), (F, "glVertexAttrib2svNV(%d, %p);\n", index, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z)
+{
+   DISPATCH(VertexAttrib3dNV, (index, x, y, z), (F, "glVertexAttrib3dNV(%d, %f, %f, %f);\n", index, x, y, z));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib3dvNV)(GLuint index, const GLdouble * v)
+{
+   DISPATCH(VertexAttrib3dvNV, (index, v), (F, "glVertexAttrib3dvNV(%d, %p /* %g, %g, %g */);\n", index, (const void *) v, v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z)
+{
+   DISPATCH(VertexAttrib3fNV, (index, x, y, z), (F, "glVertexAttrib3fNV(%d, %f, %f, %f);\n", index, x, y, z));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib3fvNV)(GLuint index, const GLfloat * v)
+{
+   DISPATCH(VertexAttrib3fvNV, (index, v), (F, "glVertexAttrib3fvNV(%d, %p /* %g, %g, %g */);\n", index, (const void *) v, v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z)
+{
+   DISPATCH(VertexAttrib3sNV, (index, x, y, z), (F, "glVertexAttrib3sNV(%d, %d, %d, %d);\n", index, x, y, z));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib3svNV)(GLuint index, const GLshort * v)
+{
+   DISPATCH(VertexAttrib3svNV, (index, v), (F, "glVertexAttrib3svNV(%d, %p);\n", index, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
+{
+   DISPATCH(VertexAttrib4dNV, (index, x, y, z, w), (F, "glVertexAttrib4dNV(%d, %f, %f, %f, %f);\n", index, x, y, z, w));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4dvNV)(GLuint index, const GLdouble * v)
+{
+   DISPATCH(VertexAttrib4dvNV, (index, v), (F, "glVertexAttrib4dvNV(%d, %p /* %g, %g, %g, %g */);\n", index, (const void *) v, v[0], v[1], v[2], v[3]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   DISPATCH(VertexAttrib4fNV, (index, x, y, z, w), (F, "glVertexAttrib4fNV(%d, %f, %f, %f, %f);\n", index, x, y, z, w));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4fvNV)(GLuint index, const GLfloat * v)
+{
+   DISPATCH(VertexAttrib4fvNV, (index, v), (F, "glVertexAttrib4fvNV(%d, %p /* %g, %g, %g, %g */);\n", index, (const void *) v, v[0], v[1], v[2], v[3]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
+{
+   DISPATCH(VertexAttrib4sNV, (index, x, y, z, w), (F, "glVertexAttrib4sNV(%d, %d, %d, %d, %d);\n", index, x, y, z, w));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4svNV)(GLuint index, const GLshort * v)
+{
+   DISPATCH(VertexAttrib4svNV, (index, v), (F, "glVertexAttrib4svNV(%d, %p);\n", index, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
+{
+   DISPATCH(VertexAttrib4ubNV, (index, x, y, z, w), (F, "glVertexAttrib4ubNV(%d, %d, %d, %d, %d);\n", index, x, y, z, w));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4ubvNV)(GLuint index, const GLubyte * v)
+{
+   DISPATCH(VertexAttrib4ubvNV, (index, v), (F, "glVertexAttrib4ubvNV(%d, %p);\n", index, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v)
+{
+   DISPATCH(VertexAttribs1dvNV, (index, n, v), (F, "glVertexAttribs1dvNV(%d, %d, %p);\n", index, n, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v)
+{
+   DISPATCH(VertexAttribs1fvNV, (index, n, v), (F, "glVertexAttribs1fvNV(%d, %d, %p);\n", index, n, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v)
+{
+   DISPATCH(VertexAttribs1svNV, (index, n, v), (F, "glVertexAttribs1svNV(%d, %d, %p);\n", index, n, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v)
+{
+   DISPATCH(VertexAttribs2dvNV, (index, n, v), (F, "glVertexAttribs2dvNV(%d, %d, %p /* %g, %g */);\n", index, n, (const void *) v, v[0], v[1]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v)
+{
+   DISPATCH(VertexAttribs2fvNV, (index, n, v), (F, "glVertexAttribs2fvNV(%d, %d, %p /* %g, %g */);\n", index, n, (const void *) v, v[0], v[1]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v)
+{
+   DISPATCH(VertexAttribs2svNV, (index, n, v), (F, "glVertexAttribs2svNV(%d, %d, %p);\n", index, n, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v)
+{
+   DISPATCH(VertexAttribs3dvNV, (index, n, v), (F, "glVertexAttribs3dvNV(%d, %d, %p /* %g, %g, %g */);\n", index, n, (const void *) v, v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v)
+{
+   DISPATCH(VertexAttribs3fvNV, (index, n, v), (F, "glVertexAttribs3fvNV(%d, %d, %p /* %g, %g, %g */);\n", index, n, (const void *) v, v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v)
+{
+   DISPATCH(VertexAttribs3svNV, (index, n, v), (F, "glVertexAttribs3svNV(%d, %d, %p);\n", index, n, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v)
+{
+   DISPATCH(VertexAttribs4dvNV, (index, n, v), (F, "glVertexAttribs4dvNV(%d, %d, %p /* %g, %g, %g, %g */);\n", index, n, (const void *) v, v[0], v[1], v[2], v[3]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v)
+{
+   DISPATCH(VertexAttribs4fvNV, (index, n, v), (F, "glVertexAttribs4fvNV(%d, %d, %p /* %g, %g, %g, %g */);\n", index, n, (const void *) v, v[0], v[1], v[2], v[3]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v)
+{
+   DISPATCH(VertexAttribs4svNV, (index, n, v), (F, "glVertexAttribs4svNV(%d, %d, %p);\n", index, n, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v)
+{
+   DISPATCH(VertexAttribs4ubvNV, (index, n, v), (F, "glVertexAttribs4ubvNV(%d, %d, %p);\n", index, n, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PointParameteriNV)(GLenum pname, GLint params)
+{
+   DISPATCH(PointParameteriNV, (pname, params), (F, "glPointParameteriNV(0x%x, %d);\n", pname, params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PointParameterivNV)(GLenum pname, const GLint * params)
+{
+   DISPATCH(PointParameterivNV, (pname, params), (F, "glPointParameterivNV(0x%x, %p);\n", pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(BlendFuncSeparate)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
+{
+   DISPATCH(BlendFuncSeparateEXT, (sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha), (F, "glBlendFuncSeparate(0x%x, 0x%x, 0x%x, 0x%x);\n", sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FogCoordf)(GLfloat coord)
+{
+   DISPATCH(FogCoordfEXT, (coord), (F, "glFogCoordf(%f);\n", coord));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FogCoordfv)(const GLfloat * coord)
+{
+   DISPATCH(FogCoordfvEXT, (coord), (F, "glFogCoordfv(%p);\n", (const void *) coord));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FogCoordd)(GLdouble coord)
+{
+   DISPATCH(FogCoorddEXT, (coord), (F, "glFogCoordd(%f);\n", coord));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FogCoorddv)(const GLdouble * coord)
+{
+   DISPATCH(FogCoorddvEXT, (coord), (F, "glFogCoorddv(%p);\n", (const void *) coord));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FogCoordPointer)(GLenum type, GLsizei stride, const GLvoid * pointer)
+{
+   DISPATCH(FogCoordPointerEXT, (type, stride, pointer), (F, "glFogCoordPointer(0x%x, %d, %p);\n", type, stride, (const void *) pointer));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiDrawArrays)(GLenum mode, GLint * first, GLsizei * count, GLsizei primcount)
+{
+   DISPATCH(MultiDrawArraysEXT, (mode, first, count, primcount), (F, "glMultiDrawArrays(0x%x, %p, %p, %d);\n", mode, (const void *) first, (const void *) count, primcount));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiDrawElements)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount)
+{
+   DISPATCH(MultiDrawElementsEXT, (mode, count, type, indices, primcount), (F, "glMultiDrawElements(0x%x, %p, 0x%x, %p, %d);\n", mode, (const void *) count, type, (const void *) indices, primcount));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PointParameterf)(GLenum pname, GLfloat param)
+{
+   DISPATCH(PointParameterfEXT, (pname, param), (F, "glPointParameterf(0x%x, %f);\n", pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PointParameterfv)(GLenum pname, const GLfloat * params)
+{
+   DISPATCH(PointParameterfvEXT, (pname, params), (F, "glPointParameterfv(0x%x, %p);\n", pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PointParameteri)(GLenum pname, GLint param)
+{
+   DISPATCH(PointParameteriNV, (pname, param), (F, "glPointParameteri(0x%x, %d);\n", pname, param));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PointParameteriv)(GLenum pname, const GLint * params)
+{
+   DISPATCH(PointParameterivNV, (pname, params), (F, "glPointParameteriv(0x%x, %p);\n", pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3b)(GLbyte red, GLbyte green, GLbyte blue)
+{
+   DISPATCH(SecondaryColor3bEXT, (red, green, blue), (F, "glSecondaryColor3b(%d, %d, %d);\n", red, green, blue));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3bv)(const GLbyte * v)
+{
+   DISPATCH(SecondaryColor3bvEXT, (v), (F, "glSecondaryColor3bv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3d)(GLdouble red, GLdouble green, GLdouble blue)
+{
+   DISPATCH(SecondaryColor3dEXT, (red, green, blue), (F, "glSecondaryColor3d(%f, %f, %f);\n", red, green, blue));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3dv)(const GLdouble * v)
+{
+   DISPATCH(SecondaryColor3dvEXT, (v), (F, "glSecondaryColor3dv(%p /* %g, %g, %g */);\n", (const void *) v, v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3f)(GLfloat red, GLfloat green, GLfloat blue)
+{
+   DISPATCH(SecondaryColor3fEXT, (red, green, blue), (F, "glSecondaryColor3f(%f, %f, %f);\n", red, green, blue));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3fv)(const GLfloat * v)
+{
+   DISPATCH(SecondaryColor3fvEXT, (v), (F, "glSecondaryColor3fv(%p /* %g, %g, %g */);\n", (const void *) v, v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3i)(GLint red, GLint green, GLint blue)
+{
+   DISPATCH(SecondaryColor3iEXT, (red, green, blue), (F, "glSecondaryColor3i(%d, %d, %d);\n", red, green, blue));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3iv)(const GLint * v)
+{
+   DISPATCH(SecondaryColor3ivEXT, (v), (F, "glSecondaryColor3iv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3s)(GLshort red, GLshort green, GLshort blue)
+{
+   DISPATCH(SecondaryColor3sEXT, (red, green, blue), (F, "glSecondaryColor3s(%d, %d, %d);\n", red, green, blue));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3sv)(const GLshort * v)
+{
+   DISPATCH(SecondaryColor3svEXT, (v), (F, "glSecondaryColor3sv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3ub)(GLubyte red, GLubyte green, GLubyte blue)
+{
+   DISPATCH(SecondaryColor3ubEXT, (red, green, blue), (F, "glSecondaryColor3ub(%d, %d, %d);\n", red, green, blue));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3ubv)(const GLubyte * v)
+{
+   DISPATCH(SecondaryColor3ubvEXT, (v), (F, "glSecondaryColor3ubv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3ui)(GLuint red, GLuint green, GLuint blue)
+{
+   DISPATCH(SecondaryColor3uiEXT, (red, green, blue), (F, "glSecondaryColor3ui(%d, %d, %d);\n", red, green, blue));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3uiv)(const GLuint * v)
+{
+   DISPATCH(SecondaryColor3uivEXT, (v), (F, "glSecondaryColor3uiv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3us)(GLushort red, GLushort green, GLushort blue)
+{
+   DISPATCH(SecondaryColor3usEXT, (red, green, blue), (F, "glSecondaryColor3us(%d, %d, %d);\n", red, green, blue));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3usv)(const GLushort * v)
+{
+   DISPATCH(SecondaryColor3usvEXT, (v), (F, "glSecondaryColor3usv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColorPointer)(GLint size, GLenum type, GLsizei stride, const void * pointer)
+{
+   DISPATCH(SecondaryColorPointerEXT, (size, type, stride, pointer), (F, "glSecondaryColorPointer(%d, 0x%x, %d, %p);\n", size, type, stride, (const void *) pointer));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos2d)(GLdouble x, GLdouble y)
+{
+   DISPATCH(WindowPos2dMESA, (x, y), (F, "glWindowPos2d(%f, %f);\n", x, y));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos2dv)(const GLdouble * v)
+{
+   DISPATCH(WindowPos2dvMESA, (v), (F, "glWindowPos2dv(%p /* %g, %g */);\n", (const void *) v, v[0], v[1]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos2f)(GLfloat x, GLfloat y)
+{
+   DISPATCH(WindowPos2fMESA, (x, y), (F, "glWindowPos2f(%f, %f);\n", x, y));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos2fv)(const GLfloat * v)
+{
+   DISPATCH(WindowPos2fvMESA, (v), (F, "glWindowPos2fv(%p /* %g, %g */);\n", (const void *) v, v[0], v[1]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos2i)(GLint x, GLint y)
+{
+   DISPATCH(WindowPos2iMESA, (x, y), (F, "glWindowPos2i(%d, %d);\n", x, y));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos2iv)(const GLint * v)
+{
+   DISPATCH(WindowPos2ivMESA, (v), (F, "glWindowPos2iv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos2s)(GLshort x, GLshort y)
+{
+   DISPATCH(WindowPos2sMESA, (x, y), (F, "glWindowPos2s(%d, %d);\n", x, y));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos2sv)(const GLshort * v)
+{
+   DISPATCH(WindowPos2svMESA, (v), (F, "glWindowPos2sv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos3d)(GLdouble x, GLdouble y, GLdouble z)
+{
+   DISPATCH(WindowPos3dMESA, (x, y, z), (F, "glWindowPos3d(%f, %f, %f);\n", x, y, z));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos3dv)(const GLdouble * v)
+{
+   DISPATCH(WindowPos3dvMESA, (v), (F, "glWindowPos3dv(%p /* %g, %g, %g */);\n", (const void *) v, v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos3f)(GLfloat x, GLfloat y, GLfloat z)
+{
+   DISPATCH(WindowPos3fMESA, (x, y, z), (F, "glWindowPos3f(%f, %f, %f);\n", x, y, z));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos3fv)(const GLfloat * v)
+{
+   DISPATCH(WindowPos3fvMESA, (v), (F, "glWindowPos3fv(%p /* %g, %g, %g */);\n", (const void *) v, v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos3i)(GLint x, GLint y, GLint z)
+{
+   DISPATCH(WindowPos3iMESA, (x, y, z), (F, "glWindowPos3i(%d, %d, %d);\n", x, y, z));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos3iv)(const GLint * v)
+{
+   DISPATCH(WindowPos3ivMESA, (v), (F, "glWindowPos3iv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos3s)(GLshort x, GLshort y, GLshort z)
+{
+   DISPATCH(WindowPos3sMESA, (x, y, z), (F, "glWindowPos3s(%d, %d, %d);\n", x, y, z));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WindowPos3sv)(const GLshort * v)
+{
+   DISPATCH(WindowPos3svMESA, (v), (F, "glWindowPos3sv(%p);\n", (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ActiveStencilFaceEXT)(GLenum face)
+{
+   DISPATCH(ActiveStencilFaceEXT, (face), (F, "glActiveStencilFaceEXT(0x%x);\n", face));
+}
+
+KEYWORD1 void KEYWORD2 NAME(DeleteFencesNV)(GLsizei n, const GLuint * fences)
+{
+   DISPATCH(DeleteFencesNV, (n, fences), (F, "glDeleteFencesNV(%d, %p);\n", n, (const void *) fences));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GenFencesNV)(GLsizei n, GLuint * fences)
+{
+   DISPATCH(GenFencesNV, (n, fences), (F, "glGenFencesNV(%d, %p);\n", n, (const void *) fences));
+}
+
+KEYWORD1 GLboolean KEYWORD2 NAME(IsFenceNV)(GLuint fence)
+{
+   RETURN_DISPATCH(IsFenceNV, (fence), (F, "glIsFenceNV(%d);\n", fence));
+}
+
+KEYWORD1 GLboolean KEYWORD2 NAME(TestFenceNV)(GLuint fence)
+{
+   RETURN_DISPATCH(TestFenceNV, (fence), (F, "glTestFenceNV(%d);\n", fence));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetFenceivNV)(GLuint fence, GLenum pname, GLint * params)
+{
+   DISPATCH(GetFenceivNV, (fence, pname, params), (F, "glGetFenceivNV(%d, 0x%x, %p);\n", fence, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FinishFenceNV)(GLuint fence)
+{
+   DISPATCH(FinishFenceNV, (fence), (F, "glFinishFenceNV(%d);\n", fence));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SetFenceNV)(GLuint fence, GLenum condition)
+{
+   DISPATCH(SetFenceNV, (fence, condition), (F, "glSetFenceNV(%d, 0x%x);\n", fence, condition));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib1sARB)(GLuint index, GLshort x)
+{
+   DISPATCH(VertexAttrib1sNV, (index, x), (F, "glVertexAttrib1sARB(%d, %d);\n", index, x));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib1fARB)(GLuint index, GLfloat x)
+{
+   DISPATCH(VertexAttrib1fNV, (index, x), (F, "glVertexAttrib1fARB(%d, %f);\n", index, x));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib1dARB)(GLuint index, GLdouble x)
+{
+   DISPATCH(VertexAttrib1dNV, (index, x), (F, "glVertexAttrib1dARB(%d, %f);\n", index, x));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib2sARB)(GLuint index, GLshort x, GLshort y)
+{
+   DISPATCH(VertexAttrib2sNV, (index, x, y), (F, "glVertexAttrib2sARB(%d, %d, %d);\n", index, x, y));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib2fARB)(GLuint index, GLfloat x, GLfloat y)
+{
+   DISPATCH(VertexAttrib2fNV, (index, x, y), (F, "glVertexAttrib2fARB(%d, %f, %f);\n", index, x, y));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib2dARB)(GLuint index, GLdouble x, GLdouble y)
+{
+   DISPATCH(VertexAttrib2dNV, (index, x, y), (F, "glVertexAttrib2dARB(%d, %f, %f);\n", index, x, y));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib3sARB)(GLuint index, GLshort x, GLshort y, GLshort z)
+{
+   DISPATCH(VertexAttrib3sNV, (index, x, y, z), (F, "glVertexAttrib3sARB(%d, %d, %d, %d);\n", index, x, y, z));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib3fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z)
+{
+   DISPATCH(VertexAttrib3fNV, (index, x, y, z), (F, "glVertexAttrib3fARB(%d, %f, %f, %f);\n", index, x, y, z));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib3dARB)(GLuint index, GLdouble x, GLdouble y, GLdouble z)
+{
+   DISPATCH(VertexAttrib3dNV, (index, x, y, z), (F, "glVertexAttrib3dARB(%d, %f, %f, %f);\n", index, x, y, z));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4sARB)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
+{
+   DISPATCH(VertexAttrib4sNV, (index, x, y, z, w), (F, "glVertexAttrib4sARB(%d, %d, %d, %d, %d);\n", index, x, y, z, w));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   DISPATCH(VertexAttrib4fNV, (index, x, y, z, w), (F, "glVertexAttrib4fARB(%d, %f, %f, %f, %f);\n", index, x, y, z, w));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4dARB)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
+{
+   DISPATCH(VertexAttrib4dNV, (index, x, y, z, w), (F, "glVertexAttrib4dARB(%d, %f, %f, %f, %f);\n", index, x, y, z, w));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4NubARB)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
+{
+   DISPATCH(VertexAttrib4ubNV, (index, x, y, z, w), (F, "glVertexAttrib4NubARB(%d, %d, %d, %d, %d);\n", index, x, y, z, w));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib1svARB)(GLuint index, const GLshort * v)
+{
+   DISPATCH(VertexAttrib1svNV, (index, v), (F, "glVertexAttrib1svARB(%d, %p);\n", index, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib1fvARB)(GLuint index, const GLfloat * v)
+{
+   DISPATCH(VertexAttrib1fvNV, (index, v), (F, "glVertexAttrib1fvARB(%d, %p);\n", index, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib1dvARB)(GLuint index, const GLdouble * v)
+{
+   DISPATCH(VertexAttrib1dvNV, (index, v), (F, "glVertexAttrib1dvARB(%d, %p);\n", index, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib2svARB)(GLuint index, const GLshort * v)
+{
+   DISPATCH(VertexAttrib2svNV, (index, v), (F, "glVertexAttrib2svARB(%d, %p);\n", index, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib2fvARB)(GLuint index, const GLfloat * v)
+{
+   DISPATCH(VertexAttrib2fvNV, (index, v), (F, "glVertexAttrib2fvARB(%d, %p /* %g, %g */);\n", index, (const void *) v, v[0], v[1]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib2dvARB)(GLuint index, const GLdouble * v)
+{
+   DISPATCH(VertexAttrib2dvNV, (index, v), (F, "glVertexAttrib2dvARB(%d, %p /* %g, %g */);\n", index, (const void *) v, v[0], v[1]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib3svARB)(GLuint index, const GLshort * v)
+{
+   DISPATCH(VertexAttrib3svNV, (index, v), (F, "glVertexAttrib3svARB(%d, %p);\n", index, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib3fvARB)(GLuint index, const GLfloat * v)
+{
+   DISPATCH(VertexAttrib3fvNV, (index, v), (F, "glVertexAttrib3fvARB(%d, %p /* %g, %g, %g */);\n", index, (const void *) v, v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib3dvARB)(GLuint index, const GLdouble * v)
+{
+   DISPATCH(VertexAttrib3dvNV, (index, v), (F, "glVertexAttrib3dvARB(%d, %p /* %g, %g, %g */);\n", index, (const void *) v, v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4bvARB)(GLuint index, const GLbyte * v)
+{
+   DISPATCH(VertexAttrib4bvARB, (index, v), (F, "glVertexAttrib4bvARB(%d, %p);\n", index, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4svARB)(GLuint index, const GLshort * v)
+{
+   DISPATCH(VertexAttrib4svNV, (index, v), (F, "glVertexAttrib4svARB(%d, %p);\n", index, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4ivARB)(GLuint index, const GLint * v)
+{
+   DISPATCH(VertexAttrib4ivARB, (index, v), (F, "glVertexAttrib4ivARB(%d, %p);\n", index, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4ubvARB)(GLuint index, const GLubyte * v)
+{
+   DISPATCH(VertexAttrib4ubvARB, (index, v), (F, "glVertexAttrib4ubvARB(%d, %p);\n", index, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4usvARB)(GLuint index, const GLushort * v)
+{
+   DISPATCH(VertexAttrib4usvARB, (index, v), (F, "glVertexAttrib4usvARB(%d, %p);\n", index, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4uivARB)(GLuint index, const GLuint * v)
+{
+   DISPATCH(VertexAttrib4uivARB, (index, v), (F, "glVertexAttrib4uivARB(%d, %p);\n", index, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4fvARB)(GLuint index, const GLfloat * v)
+{
+   DISPATCH(VertexAttrib4fvNV, (index, v), (F, "glVertexAttrib4fvARB(%d, %p /* %g, %g, %g, %g */);\n", index, (const void *) v, v[0], v[1], v[2], v[3]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4dvARB)(GLuint index, const GLdouble * v)
+{
+   DISPATCH(VertexAttrib4dvNV, (index, v), (F, "glVertexAttrib4dvARB(%d, %p /* %g, %g, %g, %g */);\n", index, (const void *) v, v[0], v[1], v[2], v[3]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4NbvARB)(GLuint index, const GLbyte * v)
+{
+   DISPATCH(VertexAttrib4NbvARB, (index, v), (F, "glVertexAttrib4NbvARB(%d, %p);\n", index, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4NsvARB)(GLuint index, const GLshort * v)
+{
+   DISPATCH(VertexAttrib4NsvARB, (index, v), (F, "glVertexAttrib4NsvARB(%d, %p);\n", index, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4NivARB)(GLuint index, const GLint * v)
+{
+   DISPATCH(VertexAttrib4NivARB, (index, v), (F, "glVertexAttrib4NivARB(%d, %p);\n", index, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4NubvARB)(GLuint index, const GLubyte * v)
+{
+   DISPATCH(VertexAttrib4ubvNV, (index, v), (F, "glVertexAttrib4NubvARB(%d, %p);\n", index, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4NusvARB)(GLuint index, const GLushort * v)
+{
+   DISPATCH(VertexAttrib4NusvARB, (index, v), (F, "glVertexAttrib4NusvARB(%d, %p);\n", index, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4NuivARB)(GLuint index, const GLuint * v)
+{
+   DISPATCH(VertexAttrib4NuivARB, (index, v), (F, "glVertexAttrib4NuivARB(%d, %p);\n", index, (const void *) v));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttribPointerARB)(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid * pointer)
+{
+   DISPATCH(VertexAttribPointerARB, (index, size, type, normalized, stride, pointer), (F, "glVertexAttribPointerARB(%d, %d, 0x%x, %d, %d, %p);\n", index, size, type, normalized, stride, (const void *) pointer));
+}
+
+KEYWORD1 void KEYWORD2 NAME(EnableVertexAttribArrayARB)(GLuint index)
+{
+   DISPATCH(EnableVertexAttribArrayARB, (index), (F, "glEnableVertexAttribArrayARB(%d);\n", index));
+}
+
+KEYWORD1 void KEYWORD2 NAME(DisableVertexAttribArrayARB)(GLuint index)
+{
+   DISPATCH(DisableVertexAttribArrayARB, (index), (F, "glDisableVertexAttribArrayARB(%d);\n", index));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ProgramStringARB)(GLenum target, GLenum format, GLsizei len, const GLvoid * string)
+{
+   DISPATCH(ProgramStringARB, (target, format, len, string), (F, "glProgramStringARB(0x%x, 0x%x, %d, %p);\n", target, format, len, (const void *) string));
+}
+
+KEYWORD1 void KEYWORD2 NAME(BindProgramARB)(GLenum target, GLuint program)
+{
+   DISPATCH(BindProgramNV, (target, program), (F, "glBindProgramARB(0x%x, %d);\n", target, program));
+}
+
+KEYWORD1 void KEYWORD2 NAME(DeleteProgramsARB)(GLsizei n, const GLuint * programs)
+{
+   DISPATCH(DeleteProgramsNV, (n, programs), (F, "glDeleteProgramsARB(%d, %p);\n", n, (const void *) programs));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GenProgramsARB)(GLsizei n, GLuint * programs)
+{
+   DISPATCH(GenProgramsNV, (n, programs), (F, "glGenProgramsARB(%d, %p);\n", n, (const void *) programs));
+}
+
+KEYWORD1 GLboolean KEYWORD2 NAME(IsProgramARB)(GLuint program)
+{
+   RETURN_DISPATCH(IsProgramNV, (program), (F, "glIsProgramARB(%d);\n", program));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ProgramEnvParameter4dARB)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
+{
+   DISPATCH(ProgramEnvParameter4dARB, (target, index, x, y, z, w), (F, "glProgramEnvParameter4dARB(0x%x, %d, %f, %f, %f, %f);\n", target, index, x, y, z, w));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ProgramEnvParameter4dvARB)(GLenum target, GLuint index, const GLdouble * params)
+{
+   DISPATCH(ProgramEnvParameter4dvARB, (target, index, params), (F, "glProgramEnvParameter4dvARB(0x%x, %d, %p /* %g, %g, %g, %g */);\n", target, index, (const void *) params, params[0], params[1], params[2], params[3]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ProgramEnvParameter4fARB)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   DISPATCH(ProgramEnvParameter4fARB, (target, index, x, y, z, w), (F, "glProgramEnvParameter4fARB(0x%x, %d, %f, %f, %f, %f);\n", target, index, x, y, z, w));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ProgramEnvParameter4fvARB)(GLenum target, GLuint index, const GLfloat * params)
+{
+   DISPATCH(ProgramEnvParameter4fvARB, (target, index, params), (F, "glProgramEnvParameter4fvARB(0x%x, %d, %p /* %g, %g, %g, %g */);\n", target, index, (const void *) params, params[0], params[1], params[2], params[3]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ProgramLocalParameter4dARB)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
+{
+   DISPATCH(ProgramLocalParameter4dARB, (target, index, x, y, z, w), (F, "glProgramLocalParameter4dARB(0x%x, %d, %f, %f, %f, %f);\n", target, index, x, y, z, w));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ProgramLocalParameter4dvARB)(GLenum target, GLuint index, const GLdouble * params)
+{
+   DISPATCH(ProgramLocalParameter4dvARB, (target, index, params), (F, "glProgramLocalParameter4dvARB(0x%x, %d, %p /* %g, %g, %g, %g */);\n", target, index, (const void *) params, params[0], params[1], params[2], params[3]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ProgramLocalParameter4fARB)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   DISPATCH(ProgramLocalParameter4fARB, (target, index, x, y, z, w), (F, "glProgramLocalParameter4fARB(0x%x, %d, %f, %f, %f, %f);\n", target, index, x, y, z, w));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ProgramLocalParameter4fvARB)(GLenum target, GLuint index, const GLfloat * params)
+{
+   DISPATCH(ProgramLocalParameter4fvARB, (target, index, params), (F, "glProgramLocalParameter4fvARB(0x%x, %d, %p /* %g, %g, %g, %g */);\n", target, index, (const void *) params, params[0], params[1], params[2], params[3]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetProgramEnvParameterdvARB)(GLenum target, GLuint index, GLdouble * params)
+{
+   DISPATCH(GetProgramEnvParameterdvARB, (target, index, params), (F, "glGetProgramEnvParameterdvARB(0x%x, %d, %p);\n", target, index, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetProgramEnvParameterfvARB)(GLenum target, GLuint index, GLfloat * params)
+{
+   DISPATCH(GetProgramEnvParameterfvARB, (target, index, params), (F, "glGetProgramEnvParameterfvARB(0x%x, %d, %p);\n", target, index, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetProgramLocalParameterdvARB)(GLenum target, GLuint index, GLdouble * params)
+{
+   DISPATCH(GetProgramLocalParameterdvARB, (target, index, params), (F, "glGetProgramLocalParameterdvARB(0x%x, %d, %p);\n", target, index, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetProgramLocalParameterfvARB)(GLenum target, GLuint index, GLfloat * params)
+{
+   DISPATCH(GetProgramLocalParameterfvARB, (target, index, params), (F, "glGetProgramLocalParameterfvARB(0x%x, %d, %p);\n", target, index, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetProgramivARB)(GLenum target, GLenum pname, GLint * params)
+{
+   DISPATCH(GetProgramivARB, (target, pname, params), (F, "glGetProgramivARB(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetProgramStringARB)(GLenum target, GLenum pname, GLvoid * string)
+{
+   DISPATCH(GetProgramStringARB, (target, pname, string), (F, "glGetProgramStringARB(0x%x, 0x%x, %p);\n", target, pname, (const void *) string));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetVertexAttribdvARB)(GLuint index, GLenum pname, GLdouble * params)
+{
+   DISPATCH(GetVertexAttribdvNV, (index, pname, params), (F, "glGetVertexAttribdvARB(%d, 0x%x, %p);\n", index, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetVertexAttribfvARB)(GLuint index, GLenum pname, GLfloat * params)
+{
+   DISPATCH(GetVertexAttribfvNV, (index, pname, params), (F, "glGetVertexAttribfvARB(%d, 0x%x, %p);\n", index, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetVertexAttribivARB)(GLuint index, GLenum pname, GLint * params)
+{
+   DISPATCH(GetVertexAttribivNV, (index, pname, params), (F, "glGetVertexAttribivARB(%d, 0x%x, %p);\n", index, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetVertexAttribPointervARB)(GLuint index, GLenum pname, GLvoid ** params)
+{
+   DISPATCH(GetVertexAttribPointervNV, (index, pname, params), (F, "glGetVertexAttribPointervARB(%d, 0x%x, %p);\n", index, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   DISPATCH(ProgramNamedParameter4fNV, (id, len, name, x, y, z, w), (F, "glProgramNamedParameter4fNV(%d, %d, %p, %f, %f, %f, %f);\n", id, len, (const void *) name, x, y, z, w));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
+{
+   DISPATCH(ProgramNamedParameter4dNV, (id, len, name, x, y, z, w), (F, "glProgramNamedParameter4dNV(%d, %d, %p, %f, %f, %f, %f);\n", id, len, (const void *) name, x, y, z, w));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v)
+{
+   DISPATCH(ProgramNamedParameter4fvNV, (id, len, name, v), (F, "glProgramNamedParameter4fvNV(%d, %d, %p, %p /* %g, %g, %g, %g */);\n", id, len, (const void *) name, (const void *) v, v[0], v[1], v[2], v[3]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v)
+{
+   DISPATCH(ProgramNamedParameter4dvNV, (id, len, name, v), (F, "glProgramNamedParameter4dvNV(%d, %d, %p, %p /* %g, %g, %g, %g */);\n", id, len, (const void *) name, (const void *) v, v[0], v[1], v[2], v[3]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params)
+{
+   DISPATCH(GetProgramNamedParameterfvNV, (id, len, name, params), (F, "glGetProgramNamedParameterfvNV(%d, %d, %p, %p);\n", id, len, (const void *) name, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params)
+{
+   DISPATCH(GetProgramNamedParameterdvNV, (id, len, name, params), (F, "glGetProgramNamedParameterdvNV(%d, %d, %p, %p);\n", id, len, (const void *) name, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(BindBufferARB)(GLenum target, GLuint buffer)
+{
+   DISPATCH(BindBufferARB, (target, buffer), (F, "glBindBufferARB(0x%x, %d);\n", target, buffer));
+}
+
+KEYWORD1 void KEYWORD2 NAME(BufferDataARB)(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage)
+{
+   DISPATCH(BufferDataARB, (target, size, data, usage), (F, "glBufferDataARB(0x%x, %p, %p, 0x%x);\n", target, (const void *) size, (const void *) data, usage));
+}
+
+KEYWORD1 void KEYWORD2 NAME(BufferSubDataARB)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data)
+{
+   DISPATCH(BufferSubDataARB, (target, offset, size, data), (F, "glBufferSubDataARB(0x%x, %p, %p, %p);\n", target, (const void *) offset, (const void *) size, (const void *) data));
+}
+
+KEYWORD1 void KEYWORD2 NAME(DeleteBuffersARB)(GLsizei n, const GLuint * buffer)
+{
+   DISPATCH(DeleteBuffersARB, (n, buffer), (F, "glDeleteBuffersARB(%d, %p);\n", n, (const void *) buffer));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GenBuffersARB)(GLsizei n, GLuint * buffer)
+{
+   DISPATCH(GenBuffersARB, (n, buffer), (F, "glGenBuffersARB(%d, %p);\n", n, (const void *) buffer));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetBufferParameterivARB)(GLenum target, GLenum pname, GLint * params)
+{
+   DISPATCH(GetBufferParameterivARB, (target, pname, params), (F, "glGetBufferParameterivARB(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetBufferPointervARB)(GLenum target, GLenum pname, GLvoid ** params)
+{
+   DISPATCH(GetBufferPointervARB, (target, pname, params), (F, "glGetBufferPointervARB(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetBufferSubDataARB)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data)
+{
+   DISPATCH(GetBufferSubDataARB, (target, offset, size, data), (F, "glGetBufferSubDataARB(0x%x, %p, %p, %p);\n", target, (const void *) offset, (const void *) size, (const void *) data));
+}
+
+KEYWORD1 GLboolean KEYWORD2 NAME(IsBufferARB)(GLuint buffer)
+{
+   RETURN_DISPATCH(IsBufferARB, (buffer), (F, "glIsBufferARB(%d);\n", buffer));
+}
+
+KEYWORD1 void * KEYWORD2 NAME(MapBufferARB)(GLenum target, GLenum access)
+{
+   RETURN_DISPATCH(MapBufferARB, (target, access), (F, "glMapBufferARB(0x%x, 0x%x);\n", target, access));
+}
+
+KEYWORD1 GLboolean KEYWORD2 NAME(UnmapBufferARB)(GLenum target)
+{
+   RETURN_DISPATCH(UnmapBufferARB, (target), (F, "glUnmapBufferARB(0x%x);\n", target));
+}
+
+KEYWORD1 void KEYWORD2 NAME(DepthBoundsEXT)(GLclampd zmin, GLclampd zmax)
+{
+   DISPATCH(DepthBoundsEXT, (zmin, zmax), (F, "glDepthBoundsEXT(%f, %f);\n", zmin, zmax));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GenQueriesARB)(GLsizei n, GLuint * ids)
+{
+   DISPATCH(GenQueriesARB, (n, ids), (F, "glGenQueriesARB(%d, %p);\n", n, (const void *) ids));
+}
+
+KEYWORD1 void KEYWORD2 NAME(DeleteQueriesARB)(GLsizei n, const GLuint * ids)
+{
+   DISPATCH(DeleteQueriesARB, (n, ids), (F, "glDeleteQueriesARB(%d, %p);\n", n, (const void *) ids));
+}
+
+KEYWORD1 GLboolean KEYWORD2 NAME(IsQueryARB)(GLuint id)
+{
+   RETURN_DISPATCH(IsQueryARB, (id), (F, "glIsQueryARB(%d);\n", id));
+}
+
+KEYWORD1 void KEYWORD2 NAME(BeginQueryARB)(GLenum target, GLuint id)
+{
+   DISPATCH(BeginQueryARB, (target, id), (F, "glBeginQueryARB(0x%x, %d);\n", target, id));
+}
+
+KEYWORD1 void KEYWORD2 NAME(EndQueryARB)(GLenum target)
+{
+   DISPATCH(EndQueryARB, (target), (F, "glEndQueryARB(0x%x);\n", target));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetQueryivARB)(GLenum target, GLenum pname, GLint * params)
+{
+   DISPATCH(GetQueryivARB, (target, pname, params), (F, "glGetQueryivARB(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetQueryObjectivARB)(GLuint id, GLenum pname, GLint * params)
+{
+   DISPATCH(GetQueryObjectivARB, (id, pname, params), (F, "glGetQueryObjectivARB(%d, 0x%x, %p);\n", id, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetQueryObjectuivARB)(GLuint id, GLenum pname, GLuint * params)
+{
+   DISPATCH(GetQueryObjectuivARB, (id, pname, params), (F, "glGetQueryObjectuivARB(%d, 0x%x, %p);\n", id, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(BindBuffer)(GLenum target, GLuint buffer)
+{
+   DISPATCH(BindBufferARB, (target, buffer), (F, "glBindBuffer(0x%x, %d);\n", target, buffer));
+}
+
+KEYWORD1 void KEYWORD2 NAME(BufferData)(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage)
+{
+   DISPATCH(BufferDataARB, (target, size, data, usage), (F, "glBufferData(0x%x, %p, %p, 0x%x);\n", target, (const void *) size, (const void *) data, usage));
+}
+
+KEYWORD1 void KEYWORD2 NAME(BufferSubData)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data)
+{
+   DISPATCH(BufferSubDataARB, (target, offset, size, data), (F, "glBufferSubData(0x%x, %p, %p, %p);\n", target, (const void *) offset, (const void *) size, (const void *) data));
+}
+
+KEYWORD1 void KEYWORD2 NAME(DeleteBuffers)(GLsizei n, const GLuint * buffer)
+{
+   DISPATCH(DeleteBuffersARB, (n, buffer), (F, "glDeleteBuffers(%d, %p);\n", n, (const void *) buffer));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GenBuffers)(GLsizei n, GLuint * buffer)
+{
+   DISPATCH(GenBuffersARB, (n, buffer), (F, "glGenBuffers(%d, %p);\n", n, (const void *) buffer));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetBufferParameteriv)(GLenum target, GLenum pname, GLint * params)
+{
+   DISPATCH(GetBufferParameterivARB, (target, pname, params), (F, "glGetBufferParameteriv(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetBufferPointerv)(GLenum target, GLenum pname, GLvoid ** params)
+{
+   DISPATCH(GetBufferPointervARB, (target, pname, params), (F, "glGetBufferPointerv(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetBufferSubData)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data)
+{
+   DISPATCH(GetBufferSubDataARB, (target, offset, size, data), (F, "glGetBufferSubData(0x%x, %p, %p, %p);\n", target, (const void *) offset, (const void *) size, (const void *) data));
+}
+
+KEYWORD1 GLboolean KEYWORD2 NAME(IsBuffer)(GLuint buffer)
+{
+   RETURN_DISPATCH(IsBufferARB, (buffer), (F, "glIsBuffer(%d);\n", buffer));
+}
+
+KEYWORD1 void * KEYWORD2 NAME(MapBuffer)(GLenum target, GLenum access)
+{
+   RETURN_DISPATCH(MapBufferARB, (target, access), (F, "glMapBuffer(0x%x, 0x%x);\n", target, access));
+}
+
+KEYWORD1 GLboolean KEYWORD2 NAME(UnmapBuffer)(GLenum target)
+{
+   RETURN_DISPATCH(UnmapBufferARB, (target), (F, "glUnmapBuffer(0x%x);\n", target));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GenQueries)(GLsizei n, GLuint * ids)
+{
+   DISPATCH(GenQueriesARB, (n, ids), (F, "glGenQueries(%d, %p);\n", n, (const void *) ids));
+}
+
+KEYWORD1 void KEYWORD2 NAME(DeleteQueries)(GLsizei n, const GLuint * ids)
+{
+   DISPATCH(DeleteQueriesARB, (n, ids), (F, "glDeleteQueries(%d, %p);\n", n, (const void *) ids));
+}
+
+KEYWORD1 GLboolean KEYWORD2 NAME(IsQuery)(GLuint id)
+{
+   RETURN_DISPATCH(IsQueryARB, (id), (F, "glIsQuery(%d);\n", id));
+}
+
+KEYWORD1 void KEYWORD2 NAME(BeginQuery)(GLenum target, GLuint id)
+{
+   DISPATCH(BeginQueryARB, (target, id), (F, "glBeginQuery(0x%x, %d);\n", target, id));
+}
+
+KEYWORD1 void KEYWORD2 NAME(EndQuery)(GLenum target)
+{
+   DISPATCH(EndQueryARB, (target), (F, "glEndQuery(0x%x);\n", target));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetQueryiv)(GLenum target, GLenum pname, GLint * params)
+{
+   DISPATCH(GetQueryivARB, (target, pname, params), (F, "glGetQueryiv(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetQueryObjectiv)(GLuint id, GLenum pname, GLint * params)
+{
+   DISPATCH(GetQueryObjectivARB, (id, pname, params), (F, "glGetQueryObjectiv(%d, 0x%x, %p);\n", id, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetQueryObjectuiv)(GLuint id, GLenum pname, GLuint * params)
+{
+   DISPATCH(GetQueryObjectuivARB, (id, pname, params), (F, "glGetQueryObjectuiv(%d, 0x%x, %p);\n", id, pname, (const void *) params));
+}
+
+
+
+/*
+ * This is how a dispatch table can be initialized with all the functions
+ * we generated above.
+ */
+#ifdef DISPATCH_TABLE_NAME
+
+#ifndef TABLE_ENTRY
+#error TABLE_ENTRY must be defined
+#endif
+
+void *DISPATCH_TABLE_NAME[] = {
+   TABLE_ENTRY(NewList),
+   TABLE_ENTRY(EndList),
+   TABLE_ENTRY(CallList),
+   TABLE_ENTRY(CallLists),
+   TABLE_ENTRY(DeleteLists),
+   TABLE_ENTRY(GenLists),
+   TABLE_ENTRY(ListBase),
+   TABLE_ENTRY(Begin),
+   TABLE_ENTRY(Bitmap),
+   TABLE_ENTRY(Color3b),
+   TABLE_ENTRY(Color3bv),
+   TABLE_ENTRY(Color3d),
+   TABLE_ENTRY(Color3dv),
+   TABLE_ENTRY(Color3f),
+   TABLE_ENTRY(Color3fv),
+   TABLE_ENTRY(Color3i),
+   TABLE_ENTRY(Color3iv),
+   TABLE_ENTRY(Color3s),
+   TABLE_ENTRY(Color3sv),
+   TABLE_ENTRY(Color3ub),
+   TABLE_ENTRY(Color3ubv),
+   TABLE_ENTRY(Color3ui),
+   TABLE_ENTRY(Color3uiv),
+   TABLE_ENTRY(Color3us),
+   TABLE_ENTRY(Color3usv),
+   TABLE_ENTRY(Color4b),
+   TABLE_ENTRY(Color4bv),
+   TABLE_ENTRY(Color4d),
+   TABLE_ENTRY(Color4dv),
+   TABLE_ENTRY(Color4f),
+   TABLE_ENTRY(Color4fv),
+   TABLE_ENTRY(Color4i),
+   TABLE_ENTRY(Color4iv),
+   TABLE_ENTRY(Color4s),
+   TABLE_ENTRY(Color4sv),
+   TABLE_ENTRY(Color4ub),
+   TABLE_ENTRY(Color4ubv),
+   TABLE_ENTRY(Color4ui),
+   TABLE_ENTRY(Color4uiv),
+   TABLE_ENTRY(Color4us),
+   TABLE_ENTRY(Color4usv),
+   TABLE_ENTRY(EdgeFlag),
+   TABLE_ENTRY(EdgeFlagv),
+   TABLE_ENTRY(End),
+   TABLE_ENTRY(Indexd),
+   TABLE_ENTRY(Indexdv),
+   TABLE_ENTRY(Indexf),
+   TABLE_ENTRY(Indexfv),
+   TABLE_ENTRY(Indexi),
+   TABLE_ENTRY(Indexiv),
+   TABLE_ENTRY(Indexs),
+   TABLE_ENTRY(Indexsv),
+   TABLE_ENTRY(Normal3b),
+   TABLE_ENTRY(Normal3bv),
+   TABLE_ENTRY(Normal3d),
+   TABLE_ENTRY(Normal3dv),
+   TABLE_ENTRY(Normal3f),
+   TABLE_ENTRY(Normal3fv),
+   TABLE_ENTRY(Normal3i),
+   TABLE_ENTRY(Normal3iv),
+   TABLE_ENTRY(Normal3s),
+   TABLE_ENTRY(Normal3sv),
+   TABLE_ENTRY(RasterPos2d),
+   TABLE_ENTRY(RasterPos2dv),
+   TABLE_ENTRY(RasterPos2f),
+   TABLE_ENTRY(RasterPos2fv),
+   TABLE_ENTRY(RasterPos2i),
+   TABLE_ENTRY(RasterPos2iv),
+   TABLE_ENTRY(RasterPos2s),
+   TABLE_ENTRY(RasterPos2sv),
+   TABLE_ENTRY(RasterPos3d),
+   TABLE_ENTRY(RasterPos3dv),
+   TABLE_ENTRY(RasterPos3f),
+   TABLE_ENTRY(RasterPos3fv),
+   TABLE_ENTRY(RasterPos3i),
+   TABLE_ENTRY(RasterPos3iv),
+   TABLE_ENTRY(RasterPos3s),
+   TABLE_ENTRY(RasterPos3sv),
+   TABLE_ENTRY(RasterPos4d),
+   TABLE_ENTRY(RasterPos4dv),
+   TABLE_ENTRY(RasterPos4f),
+   TABLE_ENTRY(RasterPos4fv),
+   TABLE_ENTRY(RasterPos4i),
+   TABLE_ENTRY(RasterPos4iv),
+   TABLE_ENTRY(RasterPos4s),
+   TABLE_ENTRY(RasterPos4sv),
+   TABLE_ENTRY(Rectd),
+   TABLE_ENTRY(Rectdv),
+   TABLE_ENTRY(Rectf),
+   TABLE_ENTRY(Rectfv),
+   TABLE_ENTRY(Recti),
+   TABLE_ENTRY(Rectiv),
+   TABLE_ENTRY(Rects),
+   TABLE_ENTRY(Rectsv),
+   TABLE_ENTRY(TexCoord1d),
+   TABLE_ENTRY(TexCoord1dv),
+   TABLE_ENTRY(TexCoord1f),
+   TABLE_ENTRY(TexCoord1fv),
+   TABLE_ENTRY(TexCoord1i),
+   TABLE_ENTRY(TexCoord1iv),
+   TABLE_ENTRY(TexCoord1s),
+   TABLE_ENTRY(TexCoord1sv),
+   TABLE_ENTRY(TexCoord2d),
+   TABLE_ENTRY(TexCoord2dv),
+   TABLE_ENTRY(TexCoord2f),
+   TABLE_ENTRY(TexCoord2fv),
+   TABLE_ENTRY(TexCoord2i),
+   TABLE_ENTRY(TexCoord2iv),
+   TABLE_ENTRY(TexCoord2s),
+   TABLE_ENTRY(TexCoord2sv),
+   TABLE_ENTRY(TexCoord3d),
+   TABLE_ENTRY(TexCoord3dv),
+   TABLE_ENTRY(TexCoord3f),
+   TABLE_ENTRY(TexCoord3fv),
+   TABLE_ENTRY(TexCoord3i),
+   TABLE_ENTRY(TexCoord3iv),
+   TABLE_ENTRY(TexCoord3s),
+   TABLE_ENTRY(TexCoord3sv),
+   TABLE_ENTRY(TexCoord4d),
+   TABLE_ENTRY(TexCoord4dv),
+   TABLE_ENTRY(TexCoord4f),
+   TABLE_ENTRY(TexCoord4fv),
+   TABLE_ENTRY(TexCoord4i),
+   TABLE_ENTRY(TexCoord4iv),
+   TABLE_ENTRY(TexCoord4s),
+   TABLE_ENTRY(TexCoord4sv),
+   TABLE_ENTRY(Vertex2d),
+   TABLE_ENTRY(Vertex2dv),
+   TABLE_ENTRY(Vertex2f),
+   TABLE_ENTRY(Vertex2fv),
+   TABLE_ENTRY(Vertex2i),
+   TABLE_ENTRY(Vertex2iv),
+   TABLE_ENTRY(Vertex2s),
+   TABLE_ENTRY(Vertex2sv),
+   TABLE_ENTRY(Vertex3d),
+   TABLE_ENTRY(Vertex3dv),
+   TABLE_ENTRY(Vertex3f),
+   TABLE_ENTRY(Vertex3fv),
+   TABLE_ENTRY(Vertex3i),
+   TABLE_ENTRY(Vertex3iv),
+   TABLE_ENTRY(Vertex3s),
+   TABLE_ENTRY(Vertex3sv),
+   TABLE_ENTRY(Vertex4d),
+   TABLE_ENTRY(Vertex4dv),
+   TABLE_ENTRY(Vertex4f),
+   TABLE_ENTRY(Vertex4fv),
+   TABLE_ENTRY(Vertex4i),
+   TABLE_ENTRY(Vertex4iv),
+   TABLE_ENTRY(Vertex4s),
+   TABLE_ENTRY(Vertex4sv),
+   TABLE_ENTRY(ClipPlane),
+   TABLE_ENTRY(ColorMaterial),
+   TABLE_ENTRY(CullFace),
+   TABLE_ENTRY(Fogf),
+   TABLE_ENTRY(Fogfv),
+   TABLE_ENTRY(Fogi),
+   TABLE_ENTRY(Fogiv),
+   TABLE_ENTRY(FrontFace),
+   TABLE_ENTRY(Hint),
+   TABLE_ENTRY(Lightf),
+   TABLE_ENTRY(Lightfv),
+   TABLE_ENTRY(Lighti),
+   TABLE_ENTRY(Lightiv),
+   TABLE_ENTRY(LightModelf),
+   TABLE_ENTRY(LightModelfv),
+   TABLE_ENTRY(LightModeli),
+   TABLE_ENTRY(LightModeliv),
+   TABLE_ENTRY(LineStipple),
+   TABLE_ENTRY(LineWidth),
+   TABLE_ENTRY(Materialf),
+   TABLE_ENTRY(Materialfv),
+   TABLE_ENTRY(Materiali),
+   TABLE_ENTRY(Materialiv),
+   TABLE_ENTRY(PointSize),
+   TABLE_ENTRY(PolygonMode),
+   TABLE_ENTRY(PolygonStipple),
+   TABLE_ENTRY(Scissor),
+   TABLE_ENTRY(ShadeModel),
+   TABLE_ENTRY(TexParameterf),
+   TABLE_ENTRY(TexParameterfv),
+   TABLE_ENTRY(TexParameteri),
+   TABLE_ENTRY(TexParameteriv),
+   TABLE_ENTRY(TexImage1D),
+   TABLE_ENTRY(TexImage2D),
+   TABLE_ENTRY(TexEnvf),
+   TABLE_ENTRY(TexEnvfv),
+   TABLE_ENTRY(TexEnvi),
+   TABLE_ENTRY(TexEnviv),
+   TABLE_ENTRY(TexGend),
+   TABLE_ENTRY(TexGendv),
+   TABLE_ENTRY(TexGenf),
+   TABLE_ENTRY(TexGenfv),
+   TABLE_ENTRY(TexGeni),
+   TABLE_ENTRY(TexGeniv),
+   TABLE_ENTRY(FeedbackBuffer),
+   TABLE_ENTRY(SelectBuffer),
+   TABLE_ENTRY(RenderMode),
+   TABLE_ENTRY(InitNames),
+   TABLE_ENTRY(LoadName),
+   TABLE_ENTRY(PassThrough),
+   TABLE_ENTRY(PopName),
+   TABLE_ENTRY(PushName),
+   TABLE_ENTRY(DrawBuffer),
+   TABLE_ENTRY(Clear),
+   TABLE_ENTRY(ClearAccum),
+   TABLE_ENTRY(ClearIndex),
+   TABLE_ENTRY(ClearColor),
+   TABLE_ENTRY(ClearStencil),
+   TABLE_ENTRY(ClearDepth),
+   TABLE_ENTRY(StencilMask),
+   TABLE_ENTRY(ColorMask),
+   TABLE_ENTRY(DepthMask),
+   TABLE_ENTRY(IndexMask),
+   TABLE_ENTRY(Accum),
+   TABLE_ENTRY(Disable),
+   TABLE_ENTRY(Enable),
+   TABLE_ENTRY(Finish),
+   TABLE_ENTRY(Flush),
+   TABLE_ENTRY(PopAttrib),
+   TABLE_ENTRY(PushAttrib),
+   TABLE_ENTRY(Map1d),
+   TABLE_ENTRY(Map1f),
+   TABLE_ENTRY(Map2d),
+   TABLE_ENTRY(Map2f),
+   TABLE_ENTRY(MapGrid1d),
+   TABLE_ENTRY(MapGrid1f),
+   TABLE_ENTRY(MapGrid2d),
+   TABLE_ENTRY(MapGrid2f),
+   TABLE_ENTRY(EvalCoord1d),
+   TABLE_ENTRY(EvalCoord1dv),
+   TABLE_ENTRY(EvalCoord1f),
+   TABLE_ENTRY(EvalCoord1fv),
+   TABLE_ENTRY(EvalCoord2d),
+   TABLE_ENTRY(EvalCoord2dv),
+   TABLE_ENTRY(EvalCoord2f),
+   TABLE_ENTRY(EvalCoord2fv),
+   TABLE_ENTRY(EvalMesh1),
+   TABLE_ENTRY(EvalPoint1),
+   TABLE_ENTRY(EvalMesh2),
+   TABLE_ENTRY(EvalPoint2),
+   TABLE_ENTRY(AlphaFunc),
+   TABLE_ENTRY(BlendFunc),
+   TABLE_ENTRY(LogicOp),
+   TABLE_ENTRY(StencilFunc),
+   TABLE_ENTRY(StencilOp),
+   TABLE_ENTRY(DepthFunc),
+   TABLE_ENTRY(PixelZoom),
+   TABLE_ENTRY(PixelTransferf),
+   TABLE_ENTRY(PixelTransferi),
+   TABLE_ENTRY(PixelStoref),
+   TABLE_ENTRY(PixelStorei),
+   TABLE_ENTRY(PixelMapfv),
+   TABLE_ENTRY(PixelMapuiv),
+   TABLE_ENTRY(PixelMapusv),
+   TABLE_ENTRY(ReadBuffer),
+   TABLE_ENTRY(CopyPixels),
+   TABLE_ENTRY(ReadPixels),
+   TABLE_ENTRY(DrawPixels),
+   TABLE_ENTRY(GetBooleanv),
+   TABLE_ENTRY(GetClipPlane),
+   TABLE_ENTRY(GetDoublev),
+   TABLE_ENTRY(GetError),
+   TABLE_ENTRY(GetFloatv),
+   TABLE_ENTRY(GetIntegerv),
+   TABLE_ENTRY(GetLightfv),
+   TABLE_ENTRY(GetLightiv),
+   TABLE_ENTRY(GetMapdv),
+   TABLE_ENTRY(GetMapfv),
+   TABLE_ENTRY(GetMapiv),
+   TABLE_ENTRY(GetMaterialfv),
+   TABLE_ENTRY(GetMaterialiv),
+   TABLE_ENTRY(GetPixelMapfv),
+   TABLE_ENTRY(GetPixelMapuiv),
+   TABLE_ENTRY(GetPixelMapusv),
+   TABLE_ENTRY(GetPolygonStipple),
+   TABLE_ENTRY(GetString),
+   TABLE_ENTRY(GetTexEnvfv),
+   TABLE_ENTRY(GetTexEnviv),
+   TABLE_ENTRY(GetTexGendv),
+   TABLE_ENTRY(GetTexGenfv),
+   TABLE_ENTRY(GetTexGeniv),
+   TABLE_ENTRY(GetTexImage),
+   TABLE_ENTRY(GetTexParameterfv),
+   TABLE_ENTRY(GetTexParameteriv),
+   TABLE_ENTRY(GetTexLevelParameterfv),
+   TABLE_ENTRY(GetTexLevelParameteriv),
+   TABLE_ENTRY(IsEnabled),
+   TABLE_ENTRY(IsList),
+   TABLE_ENTRY(DepthRange),
+   TABLE_ENTRY(Frustum),
+   TABLE_ENTRY(LoadIdentity),
+   TABLE_ENTRY(LoadMatrixf),
+   TABLE_ENTRY(LoadMatrixd),
+   TABLE_ENTRY(MatrixMode),
+   TABLE_ENTRY(MultMatrixf),
+   TABLE_ENTRY(MultMatrixd),
+   TABLE_ENTRY(Ortho),
+   TABLE_ENTRY(PopMatrix),
+   TABLE_ENTRY(PushMatrix),
+   TABLE_ENTRY(Rotated),
+   TABLE_ENTRY(Rotatef),
+   TABLE_ENTRY(Scaled),
+   TABLE_ENTRY(Scalef),
+   TABLE_ENTRY(Translated),
+   TABLE_ENTRY(Translatef),
+   TABLE_ENTRY(Viewport),
+   TABLE_ENTRY(ArrayElement),
+   TABLE_ENTRY(BindTexture),
+   TABLE_ENTRY(ColorPointer),
+   TABLE_ENTRY(DisableClientState),
+   TABLE_ENTRY(DrawArrays),
+   TABLE_ENTRY(DrawElements),
+   TABLE_ENTRY(EdgeFlagPointer),
+   TABLE_ENTRY(EnableClientState),
+   TABLE_ENTRY(IndexPointer),
+   TABLE_ENTRY(Indexub),
+   TABLE_ENTRY(Indexubv),
+   TABLE_ENTRY(InterleavedArrays),
+   TABLE_ENTRY(NormalPointer),
+   TABLE_ENTRY(PolygonOffset),
+   TABLE_ENTRY(TexCoordPointer),
+   TABLE_ENTRY(VertexPointer),
+   TABLE_ENTRY(AreTexturesResident),
+   TABLE_ENTRY(CopyTexImage1D),
+   TABLE_ENTRY(CopyTexImage2D),
+   TABLE_ENTRY(CopyTexSubImage1D),
+   TABLE_ENTRY(CopyTexSubImage2D),
+   TABLE_ENTRY(DeleteTextures),
+   TABLE_ENTRY(GenTextures),
+   TABLE_ENTRY(GetPointerv),
+   TABLE_ENTRY(IsTexture),
+   TABLE_ENTRY(PrioritizeTextures),
+   TABLE_ENTRY(TexSubImage1D),
+   TABLE_ENTRY(TexSubImage2D),
+   TABLE_ENTRY(PopClientAttrib),
+   TABLE_ENTRY(PushClientAttrib),
+   TABLE_ENTRY(BlendColor),
+   TABLE_ENTRY(BlendEquation),
+   TABLE_ENTRY(DrawRangeElements),
+   TABLE_ENTRY(ColorTable),
+   TABLE_ENTRY(ColorTableParameterfv),
+   TABLE_ENTRY(ColorTableParameteriv),
+   TABLE_ENTRY(CopyColorTable),
+   TABLE_ENTRY(GetColorTable),
+   TABLE_ENTRY(GetColorTableParameterfv),
+   TABLE_ENTRY(GetColorTableParameteriv),
+   TABLE_ENTRY(ColorSubTable),
+   TABLE_ENTRY(CopyColorSubTable),
+   TABLE_ENTRY(ConvolutionFilter1D),
+   TABLE_ENTRY(ConvolutionFilter2D),
+   TABLE_ENTRY(ConvolutionParameterf),
+   TABLE_ENTRY(ConvolutionParameterfv),
+   TABLE_ENTRY(ConvolutionParameteri),
+   TABLE_ENTRY(ConvolutionParameteriv),
+   TABLE_ENTRY(CopyConvolutionFilter1D),
+   TABLE_ENTRY(CopyConvolutionFilter2D),
+   TABLE_ENTRY(GetConvolutionFilter),
+   TABLE_ENTRY(GetConvolutionParameterfv),
+   TABLE_ENTRY(GetConvolutionParameteriv),
+   TABLE_ENTRY(GetSeparableFilter),
+   TABLE_ENTRY(SeparableFilter2D),
+   TABLE_ENTRY(GetHistogram),
+   TABLE_ENTRY(GetHistogramParameterfv),
+   TABLE_ENTRY(GetHistogramParameteriv),
+   TABLE_ENTRY(GetMinmax),
+   TABLE_ENTRY(GetMinmaxParameterfv),
+   TABLE_ENTRY(GetMinmaxParameteriv),
+   TABLE_ENTRY(Histogram),
+   TABLE_ENTRY(Minmax),
+   TABLE_ENTRY(ResetHistogram),
+   TABLE_ENTRY(ResetMinmax),
+   TABLE_ENTRY(TexImage3D),
+   TABLE_ENTRY(TexSubImage3D),
+   TABLE_ENTRY(CopyTexSubImage3D),
+   TABLE_ENTRY(ActiveTextureARB),
+   TABLE_ENTRY(ClientActiveTextureARB),
+   TABLE_ENTRY(MultiTexCoord1dARB),
+   TABLE_ENTRY(MultiTexCoord1dvARB),
+   TABLE_ENTRY(MultiTexCoord1fARB),
+   TABLE_ENTRY(MultiTexCoord1fvARB),
+   TABLE_ENTRY(MultiTexCoord1iARB),
+   TABLE_ENTRY(MultiTexCoord1ivARB),
+   TABLE_ENTRY(MultiTexCoord1sARB),
+   TABLE_ENTRY(MultiTexCoord1svARB),
+   TABLE_ENTRY(MultiTexCoord2dARB),
+   TABLE_ENTRY(MultiTexCoord2dvARB),
+   TABLE_ENTRY(MultiTexCoord2fARB),
+   TABLE_ENTRY(MultiTexCoord2fvARB),
+   TABLE_ENTRY(MultiTexCoord2iARB),
+   TABLE_ENTRY(MultiTexCoord2ivARB),
+   TABLE_ENTRY(MultiTexCoord2sARB),
+   TABLE_ENTRY(MultiTexCoord2svARB),
+   TABLE_ENTRY(MultiTexCoord3dARB),
+   TABLE_ENTRY(MultiTexCoord3dvARB),
+   TABLE_ENTRY(MultiTexCoord3fARB),
+   TABLE_ENTRY(MultiTexCoord3fvARB),
+   TABLE_ENTRY(MultiTexCoord3iARB),
+   TABLE_ENTRY(MultiTexCoord3ivARB),
+   TABLE_ENTRY(MultiTexCoord3sARB),
+   TABLE_ENTRY(MultiTexCoord3svARB),
+   TABLE_ENTRY(MultiTexCoord4dARB),
+   TABLE_ENTRY(MultiTexCoord4dvARB),
+   TABLE_ENTRY(MultiTexCoord4fARB),
+   TABLE_ENTRY(MultiTexCoord4fvARB),
+   TABLE_ENTRY(MultiTexCoord4iARB),
+   TABLE_ENTRY(MultiTexCoord4ivARB),
+   TABLE_ENTRY(MultiTexCoord4sARB),
+   TABLE_ENTRY(MultiTexCoord4svARB),
+   TABLE_ENTRY(LoadTransposeMatrixfARB),
+   TABLE_ENTRY(LoadTransposeMatrixdARB),
+   TABLE_ENTRY(MultTransposeMatrixfARB),
+   TABLE_ENTRY(MultTransposeMatrixdARB),
+   TABLE_ENTRY(SampleCoverageARB),
+   TABLE_ENTRY(__unused413),
+   TABLE_ENTRY(PolygonOffsetEXT),
+   TABLE_ENTRY(GetTexFilterFuncSGIS),
+   TABLE_ENTRY(TexFilterFuncSGIS),
+   TABLE_ENTRY(GetHistogramEXT),
+   TABLE_ENTRY(GetHistogramParameterfvEXT),
+   TABLE_ENTRY(GetHistogramParameterivEXT),
+   TABLE_ENTRY(GetMinmaxEXT),
+   TABLE_ENTRY(GetMinmaxParameterfvEXT),
+   TABLE_ENTRY(GetMinmaxParameterivEXT),
+   TABLE_ENTRY(GetConvolutionFilterEXT),
+   TABLE_ENTRY(GetConvolutionParameterfvEXT),
+   TABLE_ENTRY(GetConvolutionParameterivEXT),
+   TABLE_ENTRY(GetSeparableFilterEXT),
+   TABLE_ENTRY(GetColorTableSGI),
+   TABLE_ENTRY(GetColorTableParameterfvSGI),
+   TABLE_ENTRY(GetColorTableParameterivSGI),
+   TABLE_ENTRY(PixelTexGenSGIX),
+   TABLE_ENTRY(PixelTexGenParameteriSGIS),
+   TABLE_ENTRY(PixelTexGenParameterivSGIS),
+   TABLE_ENTRY(PixelTexGenParameterfSGIS),
+   TABLE_ENTRY(PixelTexGenParameterfvSGIS),
+   TABLE_ENTRY(GetPixelTexGenParameterivSGIS),
+   TABLE_ENTRY(GetPixelTexGenParameterfvSGIS),
+   TABLE_ENTRY(TexImage4DSGIS),
+   TABLE_ENTRY(TexSubImage4DSGIS),
+   TABLE_ENTRY(AreTexturesResidentEXT),
+   TABLE_ENTRY(GenTexturesEXT),
+   TABLE_ENTRY(IsTextureEXT),
+   TABLE_ENTRY(DetailTexFuncSGIS),
+   TABLE_ENTRY(GetDetailTexFuncSGIS),
+   TABLE_ENTRY(SharpenTexFuncSGIS),
+   TABLE_ENTRY(GetSharpenTexFuncSGIS),
+   TABLE_ENTRY(SampleMaskSGIS),
+   TABLE_ENTRY(SamplePatternSGIS),
+   TABLE_ENTRY(ColorPointerEXT),
+   TABLE_ENTRY(EdgeFlagPointerEXT),
+   TABLE_ENTRY(IndexPointerEXT),
+   TABLE_ENTRY(NormalPointerEXT),
+   TABLE_ENTRY(TexCoordPointerEXT),
+   TABLE_ENTRY(VertexPointerEXT),
+   TABLE_ENTRY(SpriteParameterfSGIX),
+   TABLE_ENTRY(SpriteParameterfvSGIX),
+   TABLE_ENTRY(SpriteParameteriSGIX),
+   TABLE_ENTRY(SpriteParameterivSGIX),
+   TABLE_ENTRY(PointParameterfEXT),
+   TABLE_ENTRY(PointParameterfvEXT),
+   TABLE_ENTRY(GetInstrumentsSGIX),
+   TABLE_ENTRY(InstrumentsBufferSGIX),
+   TABLE_ENTRY(PollInstrumentsSGIX),
+   TABLE_ENTRY(ReadInstrumentsSGIX),
+   TABLE_ENTRY(StartInstrumentsSGIX),
+   TABLE_ENTRY(StopInstrumentsSGIX),
+   TABLE_ENTRY(FrameZoomSGIX),
+   TABLE_ENTRY(TagSampleBufferSGIX),
+   TABLE_ENTRY(ReferencePlaneSGIX),
+   TABLE_ENTRY(FlushRasterSGIX),
+   TABLE_ENTRY(GetListParameterfvSGIX),
+   TABLE_ENTRY(GetListParameterivSGIX),
+   TABLE_ENTRY(ListParameterfSGIX),
+   TABLE_ENTRY(ListParameterfvSGIX),
+   TABLE_ENTRY(ListParameteriSGIX),
+   TABLE_ENTRY(ListParameterivSGIX),
+   TABLE_ENTRY(FragmentColorMaterialSGIX),
+   TABLE_ENTRY(FragmentLightfSGIX),
+   TABLE_ENTRY(FragmentLightfvSGIX),
+   TABLE_ENTRY(FragmentLightiSGIX),
+   TABLE_ENTRY(FragmentLightivSGIX),
+   TABLE_ENTRY(FragmentLightModelfSGIX),
+   TABLE_ENTRY(FragmentLightModelfvSGIX),
+   TABLE_ENTRY(FragmentLightModeliSGIX),
+   TABLE_ENTRY(FragmentLightModelivSGIX),
+   TABLE_ENTRY(FragmentMaterialfSGIX),
+   TABLE_ENTRY(FragmentMaterialfvSGIX),
+   TABLE_ENTRY(FragmentMaterialiSGIX),
+   TABLE_ENTRY(FragmentMaterialivSGIX),
+   TABLE_ENTRY(GetFragmentLightfvSGIX),
+   TABLE_ENTRY(GetFragmentLightivSGIX),
+   TABLE_ENTRY(GetFragmentMaterialfvSGIX),
+   TABLE_ENTRY(GetFragmentMaterialivSGIX),
+   TABLE_ENTRY(LightEnviSGIX),
+   TABLE_ENTRY(VertexWeightfEXT),
+   TABLE_ENTRY(VertexWeightfvEXT),
+   TABLE_ENTRY(VertexWeightPointerEXT),
+   TABLE_ENTRY(FlushVertexArrayRangeNV),
+   TABLE_ENTRY(VertexArrayRangeNV),
+   TABLE_ENTRY(CombinerParameterfvNV),
+   TABLE_ENTRY(CombinerParameterfNV),
+   TABLE_ENTRY(CombinerParameterivNV),
+   TABLE_ENTRY(CombinerParameteriNV),
+   TABLE_ENTRY(CombinerInputNV),
+   TABLE_ENTRY(CombinerOutputNV),
+   TABLE_ENTRY(FinalCombinerInputNV),
+   TABLE_ENTRY(GetCombinerInputParameterfvNV),
+   TABLE_ENTRY(GetCombinerInputParameterivNV),
+   TABLE_ENTRY(GetCombinerOutputParameterfvNV),
+   TABLE_ENTRY(GetCombinerOutputParameterivNV),
+   TABLE_ENTRY(GetFinalCombinerInputParameterfvNV),
+   TABLE_ENTRY(GetFinalCombinerInputParameterivNV),
+   TABLE_ENTRY(ResizeBuffersMESA),
+   TABLE_ENTRY(WindowPos2dMESA),
+   TABLE_ENTRY(WindowPos2dvMESA),
+   TABLE_ENTRY(WindowPos2fMESA),
+   TABLE_ENTRY(WindowPos2fvMESA),
+   TABLE_ENTRY(WindowPos2iMESA),
+   TABLE_ENTRY(WindowPos2ivMESA),
+   TABLE_ENTRY(WindowPos2sMESA),
+   TABLE_ENTRY(WindowPos2svMESA),
+   TABLE_ENTRY(WindowPos3dMESA),
+   TABLE_ENTRY(WindowPos3dvMESA),
+   TABLE_ENTRY(WindowPos3fMESA),
+   TABLE_ENTRY(WindowPos3fvMESA),
+   TABLE_ENTRY(WindowPos3iMESA),
+   TABLE_ENTRY(WindowPos3ivMESA),
+   TABLE_ENTRY(WindowPos3sMESA),
+   TABLE_ENTRY(WindowPos3svMESA),
+   TABLE_ENTRY(WindowPos4dMESA),
+   TABLE_ENTRY(WindowPos4dvMESA),
+   TABLE_ENTRY(WindowPos4fMESA),
+   TABLE_ENTRY(WindowPos4fvMESA),
+   TABLE_ENTRY(WindowPos4iMESA),
+   TABLE_ENTRY(WindowPos4ivMESA),
+   TABLE_ENTRY(WindowPos4sMESA),
+   TABLE_ENTRY(WindowPos4svMESA),
+   TABLE_ENTRY(BlendFuncSeparateEXT),
+   TABLE_ENTRY(IndexMaterialEXT),
+   TABLE_ENTRY(IndexFuncEXT),
+   TABLE_ENTRY(LockArraysEXT),
+   TABLE_ENTRY(UnlockArraysEXT),
+   TABLE_ENTRY(CullParameterdvEXT),
+   TABLE_ENTRY(CullParameterfvEXT),
+   TABLE_ENTRY(HintPGI),
+   TABLE_ENTRY(FogCoordfEXT),
+   TABLE_ENTRY(FogCoordfvEXT),
+   TABLE_ENTRY(FogCoorddEXT),
+   TABLE_ENTRY(FogCoorddvEXT),
+   TABLE_ENTRY(FogCoordPointerEXT),
+   TABLE_ENTRY(GetColorTableEXT),
+   TABLE_ENTRY(GetColorTableParameterivEXT),
+   TABLE_ENTRY(GetColorTableParameterfvEXT),
+   TABLE_ENTRY(TbufferMask3DFX),
+   TABLE_ENTRY(CompressedTexImage3DARB),
+   TABLE_ENTRY(CompressedTexImage2DARB),
+   TABLE_ENTRY(CompressedTexImage1DARB),
+   TABLE_ENTRY(CompressedTexSubImage3DARB),
+   TABLE_ENTRY(CompressedTexSubImage2DARB),
+   TABLE_ENTRY(CompressedTexSubImage1DARB),
+   TABLE_ENTRY(GetCompressedTexImageARB),
+   TABLE_ENTRY(SecondaryColor3bEXT),
+   TABLE_ENTRY(SecondaryColor3bvEXT),
+   TABLE_ENTRY(SecondaryColor3dEXT),
+   TABLE_ENTRY(SecondaryColor3dvEXT),
+   TABLE_ENTRY(SecondaryColor3fEXT),
+   TABLE_ENTRY(SecondaryColor3fvEXT),
+   TABLE_ENTRY(SecondaryColor3iEXT),
+   TABLE_ENTRY(SecondaryColor3ivEXT),
+   TABLE_ENTRY(SecondaryColor3sEXT),
+   TABLE_ENTRY(SecondaryColor3svEXT),
+   TABLE_ENTRY(SecondaryColor3ubEXT),
+   TABLE_ENTRY(SecondaryColor3ubvEXT),
+   TABLE_ENTRY(SecondaryColor3uiEXT),
+   TABLE_ENTRY(SecondaryColor3uivEXT),
+   TABLE_ENTRY(SecondaryColor3usEXT),
+   TABLE_ENTRY(SecondaryColor3usvEXT),
+   TABLE_ENTRY(SecondaryColorPointerEXT),
+   TABLE_ENTRY(AreProgramsResidentNV),
+   TABLE_ENTRY(BindProgramNV),
+   TABLE_ENTRY(DeleteProgramsNV),
+   TABLE_ENTRY(ExecuteProgramNV),
+   TABLE_ENTRY(GenProgramsNV),
+   TABLE_ENTRY(GetProgramParameterdvNV),
+   TABLE_ENTRY(GetProgramParameterfvNV),
+   TABLE_ENTRY(GetProgramivNV),
+   TABLE_ENTRY(GetProgramStringNV),
+   TABLE_ENTRY(GetTrackMatrixivNV),
+   TABLE_ENTRY(GetVertexAttribdvNV),
+   TABLE_ENTRY(GetVertexAttribfvNV),
+   TABLE_ENTRY(GetVertexAttribivNV),
+   TABLE_ENTRY(GetVertexAttribPointervNV),
+   TABLE_ENTRY(IsProgramNV),
+   TABLE_ENTRY(LoadProgramNV),
+   TABLE_ENTRY(ProgramParameter4dNV),
+   TABLE_ENTRY(ProgramParameter4dvNV),
+   TABLE_ENTRY(ProgramParameter4fNV),
+   TABLE_ENTRY(ProgramParameter4fvNV),
+   TABLE_ENTRY(ProgramParameters4dvNV),
+   TABLE_ENTRY(ProgramParameters4fvNV),
+   TABLE_ENTRY(RequestResidentProgramsNV),
+   TABLE_ENTRY(TrackMatrixNV),
+   TABLE_ENTRY(VertexAttribPointerNV),
+   TABLE_ENTRY(VertexAttrib1dNV),
+   TABLE_ENTRY(VertexAttrib1dvNV),
+   TABLE_ENTRY(VertexAttrib1fNV),
+   TABLE_ENTRY(VertexAttrib1fvNV),
+   TABLE_ENTRY(VertexAttrib1sNV),
+   TABLE_ENTRY(VertexAttrib1svNV),
+   TABLE_ENTRY(VertexAttrib2dNV),
+   TABLE_ENTRY(VertexAttrib2dvNV),
+   TABLE_ENTRY(VertexAttrib2fNV),
+   TABLE_ENTRY(VertexAttrib2fvNV),
+   TABLE_ENTRY(VertexAttrib2sNV),
+   TABLE_ENTRY(VertexAttrib2svNV),
+   TABLE_ENTRY(VertexAttrib3dNV),
+   TABLE_ENTRY(VertexAttrib3dvNV),
+   TABLE_ENTRY(VertexAttrib3fNV),
+   TABLE_ENTRY(VertexAttrib3fvNV),
+   TABLE_ENTRY(VertexAttrib3sNV),
+   TABLE_ENTRY(VertexAttrib3svNV),
+   TABLE_ENTRY(VertexAttrib4dNV),
+   TABLE_ENTRY(VertexAttrib4dvNV),
+   TABLE_ENTRY(VertexAttrib4fNV),
+   TABLE_ENTRY(VertexAttrib4fvNV),
+   TABLE_ENTRY(VertexAttrib4sNV),
+   TABLE_ENTRY(VertexAttrib4svNV),
+   TABLE_ENTRY(VertexAttrib4ubNV),
+   TABLE_ENTRY(VertexAttrib4ubvNV),
+   TABLE_ENTRY(VertexAttribs1dvNV),
+   TABLE_ENTRY(VertexAttribs1fvNV),
+   TABLE_ENTRY(VertexAttribs1svNV),
+   TABLE_ENTRY(VertexAttribs2dvNV),
+   TABLE_ENTRY(VertexAttribs2fvNV),
+   TABLE_ENTRY(VertexAttribs2svNV),
+   TABLE_ENTRY(VertexAttribs3dvNV),
+   TABLE_ENTRY(VertexAttribs3fvNV),
+   TABLE_ENTRY(VertexAttribs3svNV),
+   TABLE_ENTRY(VertexAttribs4dvNV),
+   TABLE_ENTRY(VertexAttribs4fvNV),
+   TABLE_ENTRY(VertexAttribs4svNV),
+   TABLE_ENTRY(VertexAttribs4ubvNV),
+   TABLE_ENTRY(PointParameteriNV),
+   TABLE_ENTRY(PointParameterivNV),
+   TABLE_ENTRY(MultiDrawArraysEXT),
+   TABLE_ENTRY(MultiDrawElementsEXT),
+   TABLE_ENTRY(ActiveStencilFaceEXT),
+   TABLE_ENTRY(DeleteFencesNV),
+   TABLE_ENTRY(GenFencesNV),
+   TABLE_ENTRY(IsFenceNV),
+   TABLE_ENTRY(TestFenceNV),
+   TABLE_ENTRY(GetFenceivNV),
+   TABLE_ENTRY(FinishFenceNV),
+   TABLE_ENTRY(SetFenceNV),
+   TABLE_ENTRY(VertexAttrib4bvARB),
+   TABLE_ENTRY(VertexAttrib4ivARB),
+   TABLE_ENTRY(VertexAttrib4ubvARB),
+   TABLE_ENTRY(VertexAttrib4usvARB),
+   TABLE_ENTRY(VertexAttrib4uivARB),
+   TABLE_ENTRY(VertexAttrib4NbvARB),
+   TABLE_ENTRY(VertexAttrib4NsvARB),
+   TABLE_ENTRY(VertexAttrib4NivARB),
+   TABLE_ENTRY(VertexAttrib4NusvARB),
+   TABLE_ENTRY(VertexAttrib4NuivARB),
+   TABLE_ENTRY(VertexAttribPointerARB),
+   TABLE_ENTRY(EnableVertexAttribArrayARB),
+   TABLE_ENTRY(DisableVertexAttribArrayARB),
+   TABLE_ENTRY(ProgramStringARB),
+   TABLE_ENTRY(ProgramEnvParameter4dARB),
+   TABLE_ENTRY(ProgramEnvParameter4dvARB),
+   TABLE_ENTRY(ProgramEnvParameter4fARB),
+   TABLE_ENTRY(ProgramEnvParameter4fvARB),
+   TABLE_ENTRY(ProgramLocalParameter4dARB),
+   TABLE_ENTRY(ProgramLocalParameter4dvARB),
+   TABLE_ENTRY(ProgramLocalParameter4fARB),
+   TABLE_ENTRY(ProgramLocalParameter4fvARB),
+   TABLE_ENTRY(GetProgramEnvParameterdvARB),
+   TABLE_ENTRY(GetProgramEnvParameterfvARB),
+   TABLE_ENTRY(GetProgramLocalParameterdvARB),
+   TABLE_ENTRY(GetProgramLocalParameterfvARB),
+   TABLE_ENTRY(GetProgramivARB),
+   TABLE_ENTRY(GetProgramStringARB),
+   TABLE_ENTRY(ProgramNamedParameter4fNV),
+   TABLE_ENTRY(ProgramNamedParameter4dNV),
+   TABLE_ENTRY(ProgramNamedParameter4fvNV),
+   TABLE_ENTRY(ProgramNamedParameter4dvNV),
+   TABLE_ENTRY(GetProgramNamedParameterfvNV),
+   TABLE_ENTRY(GetProgramNamedParameterdvNV),
+   TABLE_ENTRY(BindBufferARB),
+   TABLE_ENTRY(BufferDataARB),
+   TABLE_ENTRY(BufferSubDataARB),
+   TABLE_ENTRY(DeleteBuffersARB),
+   TABLE_ENTRY(GenBuffersARB),
+   TABLE_ENTRY(GetBufferParameterivARB),
+   TABLE_ENTRY(GetBufferPointervARB),
+   TABLE_ENTRY(GetBufferSubDataARB),
+   TABLE_ENTRY(IsBufferARB),
+   TABLE_ENTRY(MapBufferARB),
+   TABLE_ENTRY(UnmapBufferARB),
+   TABLE_ENTRY(DepthBoundsEXT),
+   TABLE_ENTRY(GenQueriesARB),
+   TABLE_ENTRY(DeleteQueriesARB),
+   TABLE_ENTRY(IsQueryARB),
+   TABLE_ENTRY(BeginQueryARB),
+   TABLE_ENTRY(EndQueryARB),
+   TABLE_ENTRY(GetQueryivARB),
+   TABLE_ENTRY(GetQueryObjectivARB),
+   TABLE_ENTRY(GetQueryObjectuivARB),
+   TABLE_ENTRY(MultiModeDrawArraysIBM),
+   TABLE_ENTRY(MultiModeDrawElementsIBM),
+   /* A whole bunch of no-op functions.  These might be called
+    * when someone tries to call a dynamically-registered
+    * extension function without a current rendering context.
+    */
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+   TABLE_ENTRY(Unused),
+};
+#endif /* DISPATCH_TABLE_NAME */
+
+
+/*
+ * This is just used to silence compiler warnings.
+ * We list the functions which aren't otherwise used.
+ */
+#ifdef UNUSED_TABLE_NAME
+void *UNUSED_TABLE_NAME[] = {
+   TABLE_ENTRY(ActiveTexture),
+   TABLE_ENTRY(ClientActiveTexture),
+   TABLE_ENTRY(MultiTexCoord1d),
+   TABLE_ENTRY(MultiTexCoord1dv),
+   TABLE_ENTRY(MultiTexCoord1f),
+   TABLE_ENTRY(MultiTexCoord1fv),
+   TABLE_ENTRY(MultiTexCoord1i),
+   TABLE_ENTRY(MultiTexCoord1iv),
+   TABLE_ENTRY(MultiTexCoord1s),
+   TABLE_ENTRY(MultiTexCoord1sv),
+   TABLE_ENTRY(MultiTexCoord2d),
+   TABLE_ENTRY(MultiTexCoord2dv),
+   TABLE_ENTRY(MultiTexCoord2f),
+   TABLE_ENTRY(MultiTexCoord2fv),
+   TABLE_ENTRY(MultiTexCoord2i),
+   TABLE_ENTRY(MultiTexCoord2iv),
+   TABLE_ENTRY(MultiTexCoord2s),
+   TABLE_ENTRY(MultiTexCoord2sv),
+   TABLE_ENTRY(MultiTexCoord3d),
+   TABLE_ENTRY(MultiTexCoord3dv),
+   TABLE_ENTRY(MultiTexCoord3f),
+   TABLE_ENTRY(MultiTexCoord3fv),
+   TABLE_ENTRY(MultiTexCoord3i),
+   TABLE_ENTRY(MultiTexCoord3iv),
+   TABLE_ENTRY(MultiTexCoord3s),
+   TABLE_ENTRY(MultiTexCoord3sv),
+   TABLE_ENTRY(MultiTexCoord4d),
+   TABLE_ENTRY(MultiTexCoord4dv),
+   TABLE_ENTRY(MultiTexCoord4f),
+   TABLE_ENTRY(MultiTexCoord4fv),
+   TABLE_ENTRY(MultiTexCoord4i),
+   TABLE_ENTRY(MultiTexCoord4iv),
+   TABLE_ENTRY(MultiTexCoord4s),
+   TABLE_ENTRY(MultiTexCoord4sv),
+   TABLE_ENTRY(LoadTransposeMatrixf),
+   TABLE_ENTRY(LoadTransposeMatrixd),
+   TABLE_ENTRY(MultTransposeMatrixf),
+   TABLE_ENTRY(MultTransposeMatrixd),
+   TABLE_ENTRY(SampleCoverage),
+   TABLE_ENTRY(CompressedTexImage3D),
+   TABLE_ENTRY(CompressedTexImage2D),
+   TABLE_ENTRY(CompressedTexImage1D),
+   TABLE_ENTRY(CompressedTexSubImage3D),
+   TABLE_ENTRY(CompressedTexSubImage2D),
+   TABLE_ENTRY(CompressedTexSubImage1D),
+   TABLE_ENTRY(GetCompressedTexImage),
+   TABLE_ENTRY(BlendColorEXT),
+   TABLE_ENTRY(TexImage3DEXT),
+   TABLE_ENTRY(TexSubImage3DEXT),
+   TABLE_ENTRY(TexSubImage1DEXT),
+   TABLE_ENTRY(TexSubImage2DEXT),
+   TABLE_ENTRY(CopyTexImage1DEXT),
+   TABLE_ENTRY(CopyTexImage2DEXT),
+   TABLE_ENTRY(CopyTexSubImage1DEXT),
+   TABLE_ENTRY(CopyTexSubImage2DEXT),
+   TABLE_ENTRY(CopyTexSubImage3DEXT),
+   TABLE_ENTRY(HistogramEXT),
+   TABLE_ENTRY(MinmaxEXT),
+   TABLE_ENTRY(ResetHistogramEXT),
+   TABLE_ENTRY(ResetMinmaxEXT),
+   TABLE_ENTRY(ConvolutionFilter1DEXT),
+   TABLE_ENTRY(ConvolutionFilter2DEXT),
+   TABLE_ENTRY(ConvolutionParameterfEXT),
+   TABLE_ENTRY(ConvolutionParameterfvEXT),
+   TABLE_ENTRY(ConvolutionParameteriEXT),
+   TABLE_ENTRY(ConvolutionParameterivEXT),
+   TABLE_ENTRY(CopyConvolutionFilter1DEXT),
+   TABLE_ENTRY(CopyConvolutionFilter2DEXT),
+   TABLE_ENTRY(SeparableFilter2DEXT),
+   TABLE_ENTRY(ColorTableSGI),
+   TABLE_ENTRY(ColorTableParameterfvSGI),
+   TABLE_ENTRY(ColorTableParameterivSGI),
+   TABLE_ENTRY(CopyColorTableSGI),
+   TABLE_ENTRY(BindTextureEXT),
+   TABLE_ENTRY(DeleteTexturesEXT),
+   TABLE_ENTRY(PrioritizeTexturesEXT),
+   TABLE_ENTRY(ArrayElementEXT),
+   TABLE_ENTRY(DrawArraysEXT),
+   TABLE_ENTRY(GetPointervEXT),
+   TABLE_ENTRY(BlendEquationEXT),
+   TABLE_ENTRY(PointParameterfARB),
+   TABLE_ENTRY(PointParameterfvARB),
+   TABLE_ENTRY(PointParameterfSGIS),
+   TABLE_ENTRY(PointParameterfvSGIS),
+   TABLE_ENTRY(ColorSubTableEXT),
+   TABLE_ENTRY(CopyColorSubTableEXT),
+   TABLE_ENTRY(ColorTableEXT),
+   TABLE_ENTRY(DrawRangeElementsEXT),
+   TABLE_ENTRY(BlendFuncSeparateINGR),
+   TABLE_ENTRY(SampleMaskEXT),
+   TABLE_ENTRY(SamplePatternEXT),
+   TABLE_ENTRY(WindowPos2dARB),
+   TABLE_ENTRY(WindowPos2fARB),
+   TABLE_ENTRY(WindowPos2iARB),
+   TABLE_ENTRY(WindowPos2sARB),
+   TABLE_ENTRY(WindowPos2dvARB),
+   TABLE_ENTRY(WindowPos2fvARB),
+   TABLE_ENTRY(WindowPos2ivARB),
+   TABLE_ENTRY(WindowPos2svARB),
+   TABLE_ENTRY(WindowPos3dARB),
+   TABLE_ENTRY(WindowPos3fARB),
+   TABLE_ENTRY(WindowPos3iARB),
+   TABLE_ENTRY(WindowPos3sARB),
+   TABLE_ENTRY(WindowPos3dvARB),
+   TABLE_ENTRY(WindowPos3fvARB),
+   TABLE_ENTRY(WindowPos3ivARB),
+   TABLE_ENTRY(WindowPos3svARB),
+   TABLE_ENTRY(BlendFuncSeparate),
+   TABLE_ENTRY(FogCoordf),
+   TABLE_ENTRY(FogCoordfv),
+   TABLE_ENTRY(FogCoordd),
+   TABLE_ENTRY(FogCoorddv),
+   TABLE_ENTRY(FogCoordPointer),
+   TABLE_ENTRY(MultiDrawArrays),
+   TABLE_ENTRY(MultiDrawElements),
+   TABLE_ENTRY(PointParameterf),
+   TABLE_ENTRY(PointParameterfv),
+   TABLE_ENTRY(PointParameteri),
+   TABLE_ENTRY(PointParameteriv),
+   TABLE_ENTRY(SecondaryColor3b),
+   TABLE_ENTRY(SecondaryColor3bv),
+   TABLE_ENTRY(SecondaryColor3d),
+   TABLE_ENTRY(SecondaryColor3dv),
+   TABLE_ENTRY(SecondaryColor3f),
+   TABLE_ENTRY(SecondaryColor3fv),
+   TABLE_ENTRY(SecondaryColor3i),
+   TABLE_ENTRY(SecondaryColor3iv),
+   TABLE_ENTRY(SecondaryColor3s),
+   TABLE_ENTRY(SecondaryColor3sv),
+   TABLE_ENTRY(SecondaryColor3ub),
+   TABLE_ENTRY(SecondaryColor3ubv),
+   TABLE_ENTRY(SecondaryColor3ui),
+   TABLE_ENTRY(SecondaryColor3uiv),
+   TABLE_ENTRY(SecondaryColor3us),
+   TABLE_ENTRY(SecondaryColor3usv),
+   TABLE_ENTRY(SecondaryColorPointer),
+   TABLE_ENTRY(WindowPos2d),
+   TABLE_ENTRY(WindowPos2dv),
+   TABLE_ENTRY(WindowPos2f),
+   TABLE_ENTRY(WindowPos2fv),
+   TABLE_ENTRY(WindowPos2i),
+   TABLE_ENTRY(WindowPos2iv),
+   TABLE_ENTRY(WindowPos2s),
+   TABLE_ENTRY(WindowPos2sv),
+   TABLE_ENTRY(WindowPos3d),
+   TABLE_ENTRY(WindowPos3dv),
+   TABLE_ENTRY(WindowPos3f),
+   TABLE_ENTRY(WindowPos3fv),
+   TABLE_ENTRY(WindowPos3i),
+   TABLE_ENTRY(WindowPos3iv),
+   TABLE_ENTRY(WindowPos3s),
+   TABLE_ENTRY(WindowPos3sv),
+   TABLE_ENTRY(VertexAttrib1sARB),
+   TABLE_ENTRY(VertexAttrib1fARB),
+   TABLE_ENTRY(VertexAttrib1dARB),
+   TABLE_ENTRY(VertexAttrib2sARB),
+   TABLE_ENTRY(VertexAttrib2fARB),
+   TABLE_ENTRY(VertexAttrib2dARB),
+   TABLE_ENTRY(VertexAttrib3sARB),
+   TABLE_ENTRY(VertexAttrib3fARB),
+   TABLE_ENTRY(VertexAttrib3dARB),
+   TABLE_ENTRY(VertexAttrib4sARB),
+   TABLE_ENTRY(VertexAttrib4fARB),
+   TABLE_ENTRY(VertexAttrib4dARB),
+   TABLE_ENTRY(VertexAttrib4NubARB),
+   TABLE_ENTRY(VertexAttrib1svARB),
+   TABLE_ENTRY(VertexAttrib1fvARB),
+   TABLE_ENTRY(VertexAttrib1dvARB),
+   TABLE_ENTRY(VertexAttrib2svARB),
+   TABLE_ENTRY(VertexAttrib2fvARB),
+   TABLE_ENTRY(VertexAttrib2dvARB),
+   TABLE_ENTRY(VertexAttrib3svARB),
+   TABLE_ENTRY(VertexAttrib3fvARB),
+   TABLE_ENTRY(VertexAttrib3dvARB),
+   TABLE_ENTRY(VertexAttrib4svARB),
+   TABLE_ENTRY(VertexAttrib4fvARB),
+   TABLE_ENTRY(VertexAttrib4dvARB),
+   TABLE_ENTRY(VertexAttrib4NubvARB),
+   TABLE_ENTRY(BindProgramARB),
+   TABLE_ENTRY(DeleteProgramsARB),
+   TABLE_ENTRY(GenProgramsARB),
+   TABLE_ENTRY(IsProgramARB),
+   TABLE_ENTRY(GetVertexAttribdvARB),
+   TABLE_ENTRY(GetVertexAttribfvARB),
+   TABLE_ENTRY(GetVertexAttribivARB),
+   TABLE_ENTRY(GetVertexAttribPointervARB),
+   TABLE_ENTRY(BindBuffer),
+   TABLE_ENTRY(BufferData),
+   TABLE_ENTRY(BufferSubData),
+   TABLE_ENTRY(DeleteBuffers),
+   TABLE_ENTRY(GenBuffers),
+   TABLE_ENTRY(GetBufferParameteriv),
+   TABLE_ENTRY(GetBufferPointerv),
+   TABLE_ENTRY(GetBufferSubData),
+   TABLE_ENTRY(IsBuffer),
+   TABLE_ENTRY(MapBuffer),
+   TABLE_ENTRY(UnmapBuffer),
+   TABLE_ENTRY(GenQueries),
+   TABLE_ENTRY(DeleteQueries),
+   TABLE_ENTRY(IsQuery),
+   TABLE_ENTRY(BeginQuery),
+   TABLE_ENTRY(EndQuery),
+   TABLE_ENTRY(GetQueryiv),
+   TABLE_ENTRY(GetQueryObjectiv),
+   TABLE_ENTRY(GetQueryObjectuiv),
+};
+#endif /*UNUSED_TABLE_NAME*/
+
+
+#undef KEYWORD1
+#undef KEYWORD2
+#undef NAME
+#undef DISPATCH
+#undef RETURN_DISPATCH
+#undef DISPATCH_TABLE_NAME
+#undef UNUSED_TABLE_NAME
+#undef TABLE_ENTRY
+
diff --git a/reactos/lib/mesa32/src/glapi/glprocs.h b/reactos/lib/mesa32/src/glapi/glprocs.h
new file mode 100644
index 00000000000..1a48b4f29a4
--- /dev/null
+++ b/reactos/lib/mesa32/src/glapi/glprocs.h
@@ -0,0 +1,923 @@
+/* DO NOT EDIT - This file generated automatically by glprocs.py script */
+
+/* This file is only included by glapi.c and is used for
+ * the GetProcAddress() function
+ */
+
+static struct name_address_offset static_functions[] = {
+   { "glNewList", (GLvoid *) glNewList, _gloffset_NewList },
+   { "glEndList", (GLvoid *) glEndList, _gloffset_EndList },
+   { "glCallList", (GLvoid *) glCallList, _gloffset_CallList },
+   { "glCallLists", (GLvoid *) glCallLists, _gloffset_CallLists },
+   { "glDeleteLists", (GLvoid *) glDeleteLists, _gloffset_DeleteLists },
+   { "glGenLists", (GLvoid *) glGenLists, _gloffset_GenLists },
+   { "glListBase", (GLvoid *) glListBase, _gloffset_ListBase },
+   { "glBegin", (GLvoid *) glBegin, _gloffset_Begin },
+   { "glBitmap", (GLvoid *) glBitmap, _gloffset_Bitmap },
+   { "glColor3b", (GLvoid *) glColor3b, _gloffset_Color3b },
+   { "glColor3bv", (GLvoid *) glColor3bv, _gloffset_Color3bv },
+   { "glColor3d", (GLvoid *) glColor3d, _gloffset_Color3d },
+   { "glColor3dv", (GLvoid *) glColor3dv, _gloffset_Color3dv },
+   { "glColor3f", (GLvoid *) glColor3f, _gloffset_Color3f },
+   { "glColor3fv", (GLvoid *) glColor3fv, _gloffset_Color3fv },
+   { "glColor3i", (GLvoid *) glColor3i, _gloffset_Color3i },
+   { "glColor3iv", (GLvoid *) glColor3iv, _gloffset_Color3iv },
+   { "glColor3s", (GLvoid *) glColor3s, _gloffset_Color3s },
+   { "glColor3sv", (GLvoid *) glColor3sv, _gloffset_Color3sv },
+   { "glColor3ub", (GLvoid *) glColor3ub, _gloffset_Color3ub },
+   { "glColor3ubv", (GLvoid *) glColor3ubv, _gloffset_Color3ubv },
+   { "glColor3ui", (GLvoid *) glColor3ui, _gloffset_Color3ui },
+   { "glColor3uiv", (GLvoid *) glColor3uiv, _gloffset_Color3uiv },
+   { "glColor3us", (GLvoid *) glColor3us, _gloffset_Color3us },
+   { "glColor3usv", (GLvoid *) glColor3usv, _gloffset_Color3usv },
+   { "glColor4b", (GLvoid *) glColor4b, _gloffset_Color4b },
+   { "glColor4bv", (GLvoid *) glColor4bv, _gloffset_Color4bv },
+   { "glColor4d", (GLvoid *) glColor4d, _gloffset_Color4d },
+   { "glColor4dv", (GLvoid *) glColor4dv, _gloffset_Color4dv },
+   { "glColor4f", (GLvoid *) glColor4f, _gloffset_Color4f },
+   { "glColor4fv", (GLvoid *) glColor4fv, _gloffset_Color4fv },
+   { "glColor4i", (GLvoid *) glColor4i, _gloffset_Color4i },
+   { "glColor4iv", (GLvoid *) glColor4iv, _gloffset_Color4iv },
+   { "glColor4s", (GLvoid *) glColor4s, _gloffset_Color4s },
+   { "glColor4sv", (GLvoid *) glColor4sv, _gloffset_Color4sv },
+   { "glColor4ub", (GLvoid *) glColor4ub, _gloffset_Color4ub },
+   { "glColor4ubv", (GLvoid *) glColor4ubv, _gloffset_Color4ubv },
+   { "glColor4ui", (GLvoid *) glColor4ui, _gloffset_Color4ui },
+   { "glColor4uiv", (GLvoid *) glColor4uiv, _gloffset_Color4uiv },
+   { "glColor4us", (GLvoid *) glColor4us, _gloffset_Color4us },
+   { "glColor4usv", (GLvoid *) glColor4usv, _gloffset_Color4usv },
+   { "glEdgeFlag", (GLvoid *) glEdgeFlag, _gloffset_EdgeFlag },
+   { "glEdgeFlagv", (GLvoid *) glEdgeFlagv, _gloffset_EdgeFlagv },
+   { "glEnd", (GLvoid *) glEnd, _gloffset_End },
+   { "glIndexd", (GLvoid *) glIndexd, _gloffset_Indexd },
+   { "glIndexdv", (GLvoid *) glIndexdv, _gloffset_Indexdv },
+   { "glIndexf", (GLvoid *) glIndexf, _gloffset_Indexf },
+   { "glIndexfv", (GLvoid *) glIndexfv, _gloffset_Indexfv },
+   { "glIndexi", (GLvoid *) glIndexi, _gloffset_Indexi },
+   { "glIndexiv", (GLvoid *) glIndexiv, _gloffset_Indexiv },
+   { "glIndexs", (GLvoid *) glIndexs, _gloffset_Indexs },
+   { "glIndexsv", (GLvoid *) glIndexsv, _gloffset_Indexsv },
+   { "glNormal3b", (GLvoid *) glNormal3b, _gloffset_Normal3b },
+   { "glNormal3bv", (GLvoid *) glNormal3bv, _gloffset_Normal3bv },
+   { "glNormal3d", (GLvoid *) glNormal3d, _gloffset_Normal3d },
+   { "glNormal3dv", (GLvoid *) glNormal3dv, _gloffset_Normal3dv },
+   { "glNormal3f", (GLvoid *) glNormal3f, _gloffset_Normal3f },
+   { "glNormal3fv", (GLvoid *) glNormal3fv, _gloffset_Normal3fv },
+   { "glNormal3i", (GLvoid *) glNormal3i, _gloffset_Normal3i },
+   { "glNormal3iv", (GLvoid *) glNormal3iv, _gloffset_Normal3iv },
+   { "glNormal3s", (GLvoid *) glNormal3s, _gloffset_Normal3s },
+   { "glNormal3sv", (GLvoid *) glNormal3sv, _gloffset_Normal3sv },
+   { "glRasterPos2d", (GLvoid *) glRasterPos2d, _gloffset_RasterPos2d },
+   { "glRasterPos2dv", (GLvoid *) glRasterPos2dv, _gloffset_RasterPos2dv },
+   { "glRasterPos2f", (GLvoid *) glRasterPos2f, _gloffset_RasterPos2f },
+   { "glRasterPos2fv", (GLvoid *) glRasterPos2fv, _gloffset_RasterPos2fv },
+   { "glRasterPos2i", (GLvoid *) glRasterPos2i, _gloffset_RasterPos2i },
+   { "glRasterPos2iv", (GLvoid *) glRasterPos2iv, _gloffset_RasterPos2iv },
+   { "glRasterPos2s", (GLvoid *) glRasterPos2s, _gloffset_RasterPos2s },
+   { "glRasterPos2sv", (GLvoid *) glRasterPos2sv, _gloffset_RasterPos2sv },
+   { "glRasterPos3d", (GLvoid *) glRasterPos3d, _gloffset_RasterPos3d },
+   { "glRasterPos3dv", (GLvoid *) glRasterPos3dv, _gloffset_RasterPos3dv },
+   { "glRasterPos3f", (GLvoid *) glRasterPos3f, _gloffset_RasterPos3f },
+   { "glRasterPos3fv", (GLvoid *) glRasterPos3fv, _gloffset_RasterPos3fv },
+   { "glRasterPos3i", (GLvoid *) glRasterPos3i, _gloffset_RasterPos3i },
+   { "glRasterPos3iv", (GLvoid *) glRasterPos3iv, _gloffset_RasterPos3iv },
+   { "glRasterPos3s", (GLvoid *) glRasterPos3s, _gloffset_RasterPos3s },
+   { "glRasterPos3sv", (GLvoid *) glRasterPos3sv, _gloffset_RasterPos3sv },
+   { "glRasterPos4d", (GLvoid *) glRasterPos4d, _gloffset_RasterPos4d },
+   { "glRasterPos4dv", (GLvoid *) glRasterPos4dv, _gloffset_RasterPos4dv },
+   { "glRasterPos4f", (GLvoid *) glRasterPos4f, _gloffset_RasterPos4f },
+   { "glRasterPos4fv", (GLvoid *) glRasterPos4fv, _gloffset_RasterPos4fv },
+   { "glRasterPos4i", (GLvoid *) glRasterPos4i, _gloffset_RasterPos4i },
+   { "glRasterPos4iv", (GLvoid *) glRasterPos4iv, _gloffset_RasterPos4iv },
+   { "glRasterPos4s", (GLvoid *) glRasterPos4s, _gloffset_RasterPos4s },
+   { "glRasterPos4sv", (GLvoid *) glRasterPos4sv, _gloffset_RasterPos4sv },
+   { "glRectd", (GLvoid *) glRectd, _gloffset_Rectd },
+   { "glRectdv", (GLvoid *) glRectdv, _gloffset_Rectdv },
+   { "glRectf", (GLvoid *) glRectf, _gloffset_Rectf },
+   { "glRectfv", (GLvoid *) glRectfv, _gloffset_Rectfv },
+   { "glRecti", (GLvoid *) glRecti, _gloffset_Recti },
+   { "glRectiv", (GLvoid *) glRectiv, _gloffset_Rectiv },
+   { "glRects", (GLvoid *) glRects, _gloffset_Rects },
+   { "glRectsv", (GLvoid *) glRectsv, _gloffset_Rectsv },
+   { "glTexCoord1d", (GLvoid *) glTexCoord1d, _gloffset_TexCoord1d },
+   { "glTexCoord1dv", (GLvoid *) glTexCoord1dv, _gloffset_TexCoord1dv },
+   { "glTexCoord1f", (GLvoid *) glTexCoord1f, _gloffset_TexCoord1f },
+   { "glTexCoord1fv", (GLvoid *) glTexCoord1fv, _gloffset_TexCoord1fv },
+   { "glTexCoord1i", (GLvoid *) glTexCoord1i, _gloffset_TexCoord1i },
+   { "glTexCoord1iv", (GLvoid *) glTexCoord1iv, _gloffset_TexCoord1iv },
+   { "glTexCoord1s", (GLvoid *) glTexCoord1s, _gloffset_TexCoord1s },
+   { "glTexCoord1sv", (GLvoid *) glTexCoord1sv, _gloffset_TexCoord1sv },
+   { "glTexCoord2d", (GLvoid *) glTexCoord2d, _gloffset_TexCoord2d },
+   { "glTexCoord2dv", (GLvoid *) glTexCoord2dv, _gloffset_TexCoord2dv },
+   { "glTexCoord2f", (GLvoid *) glTexCoord2f, _gloffset_TexCoord2f },
+   { "glTexCoord2fv", (GLvoid *) glTexCoord2fv, _gloffset_TexCoord2fv },
+   { "glTexCoord2i", (GLvoid *) glTexCoord2i, _gloffset_TexCoord2i },
+   { "glTexCoord2iv", (GLvoid *) glTexCoord2iv, _gloffset_TexCoord2iv },
+   { "glTexCoord2s", (GLvoid *) glTexCoord2s, _gloffset_TexCoord2s },
+   { "glTexCoord2sv", (GLvoid *) glTexCoord2sv, _gloffset_TexCoord2sv },
+   { "glTexCoord3d", (GLvoid *) glTexCoord3d, _gloffset_TexCoord3d },
+   { "glTexCoord3dv", (GLvoid *) glTexCoord3dv, _gloffset_TexCoord3dv },
+   { "glTexCoord3f", (GLvoid *) glTexCoord3f, _gloffset_TexCoord3f },
+   { "glTexCoord3fv", (GLvoid *) glTexCoord3fv, _gloffset_TexCoord3fv },
+   { "glTexCoord3i", (GLvoid *) glTexCoord3i, _gloffset_TexCoord3i },
+   { "glTexCoord3iv", (GLvoid *) glTexCoord3iv, _gloffset_TexCoord3iv },
+   { "glTexCoord3s", (GLvoid *) glTexCoord3s, _gloffset_TexCoord3s },
+   { "glTexCoord3sv", (GLvoid *) glTexCoord3sv, _gloffset_TexCoord3sv },
+   { "glTexCoord4d", (GLvoid *) glTexCoord4d, _gloffset_TexCoord4d },
+   { "glTexCoord4dv", (GLvoid *) glTexCoord4dv, _gloffset_TexCoord4dv },
+   { "glTexCoord4f", (GLvoid *) glTexCoord4f, _gloffset_TexCoord4f },
+   { "glTexCoord4fv", (GLvoid *) glTexCoord4fv, _gloffset_TexCoord4fv },
+   { "glTexCoord4i", (GLvoid *) glTexCoord4i, _gloffset_TexCoord4i },
+   { "glTexCoord4iv", (GLvoid *) glTexCoord4iv, _gloffset_TexCoord4iv },
+   { "glTexCoord4s", (GLvoid *) glTexCoord4s, _gloffset_TexCoord4s },
+   { "glTexCoord4sv", (GLvoid *) glTexCoord4sv, _gloffset_TexCoord4sv },
+   { "glVertex2d", (GLvoid *) glVertex2d, _gloffset_Vertex2d },
+   { "glVertex2dv", (GLvoid *) glVertex2dv, _gloffset_Vertex2dv },
+   { "glVertex2f", (GLvoid *) glVertex2f, _gloffset_Vertex2f },
+   { "glVertex2fv", (GLvoid *) glVertex2fv, _gloffset_Vertex2fv },
+   { "glVertex2i", (GLvoid *) glVertex2i, _gloffset_Vertex2i },
+   { "glVertex2iv", (GLvoid *) glVertex2iv, _gloffset_Vertex2iv },
+   { "glVertex2s", (GLvoid *) glVertex2s, _gloffset_Vertex2s },
+   { "glVertex2sv", (GLvoid *) glVertex2sv, _gloffset_Vertex2sv },
+   { "glVertex3d", (GLvoid *) glVertex3d, _gloffset_Vertex3d },
+   { "glVertex3dv", (GLvoid *) glVertex3dv, _gloffset_Vertex3dv },
+   { "glVertex3f", (GLvoid *) glVertex3f, _gloffset_Vertex3f },
+   { "glVertex3fv", (GLvoid *) glVertex3fv, _gloffset_Vertex3fv },
+   { "glVertex3i", (GLvoid *) glVertex3i, _gloffset_Vertex3i },
+   { "glVertex3iv", (GLvoid *) glVertex3iv, _gloffset_Vertex3iv },
+   { "glVertex3s", (GLvoid *) glVertex3s, _gloffset_Vertex3s },
+   { "glVertex3sv", (GLvoid *) glVertex3sv, _gloffset_Vertex3sv },
+   { "glVertex4d", (GLvoid *) glVertex4d, _gloffset_Vertex4d },
+   { "glVertex4dv", (GLvoid *) glVertex4dv, _gloffset_Vertex4dv },
+   { "glVertex4f", (GLvoid *) glVertex4f, _gloffset_Vertex4f },
+   { "glVertex4fv", (GLvoid *) glVertex4fv, _gloffset_Vertex4fv },
+   { "glVertex4i", (GLvoid *) glVertex4i, _gloffset_Vertex4i },
+   { "glVertex4iv", (GLvoid *) glVertex4iv, _gloffset_Vertex4iv },
+   { "glVertex4s", (GLvoid *) glVertex4s, _gloffset_Vertex4s },
+   { "glVertex4sv", (GLvoid *) glVertex4sv, _gloffset_Vertex4sv },
+   { "glClipPlane", (GLvoid *) glClipPlane, _gloffset_ClipPlane },
+   { "glColorMaterial", (GLvoid *) glColorMaterial, _gloffset_ColorMaterial },
+   { "glCullFace", (GLvoid *) glCullFace, _gloffset_CullFace },
+   { "glFogf", (GLvoid *) glFogf, _gloffset_Fogf },
+   { "glFogfv", (GLvoid *) glFogfv, _gloffset_Fogfv },
+   { "glFogi", (GLvoid *) glFogi, _gloffset_Fogi },
+   { "glFogiv", (GLvoid *) glFogiv, _gloffset_Fogiv },
+   { "glFrontFace", (GLvoid *) glFrontFace, _gloffset_FrontFace },
+   { "glHint", (GLvoid *) glHint, _gloffset_Hint },
+   { "glLightf", (GLvoid *) glLightf, _gloffset_Lightf },
+   { "glLightfv", (GLvoid *) glLightfv, _gloffset_Lightfv },
+   { "glLighti", (GLvoid *) glLighti, _gloffset_Lighti },
+   { "glLightiv", (GLvoid *) glLightiv, _gloffset_Lightiv },
+   { "glLightModelf", (GLvoid *) glLightModelf, _gloffset_LightModelf },
+   { "glLightModelfv", (GLvoid *) glLightModelfv, _gloffset_LightModelfv },
+   { "glLightModeli", (GLvoid *) glLightModeli, _gloffset_LightModeli },
+   { "glLightModeliv", (GLvoid *) glLightModeliv, _gloffset_LightModeliv },
+   { "glLineStipple", (GLvoid *) glLineStipple, _gloffset_LineStipple },
+   { "glLineWidth", (GLvoid *) glLineWidth, _gloffset_LineWidth },
+   { "glMaterialf", (GLvoid *) glMaterialf, _gloffset_Materialf },
+   { "glMaterialfv", (GLvoid *) glMaterialfv, _gloffset_Materialfv },
+   { "glMateriali", (GLvoid *) glMateriali, _gloffset_Materiali },
+   { "glMaterialiv", (GLvoid *) glMaterialiv, _gloffset_Materialiv },
+   { "glPointSize", (GLvoid *) glPointSize, _gloffset_PointSize },
+   { "glPolygonMode", (GLvoid *) glPolygonMode, _gloffset_PolygonMode },
+   { "glPolygonStipple", (GLvoid *) glPolygonStipple, _gloffset_PolygonStipple },
+   { "glScissor", (GLvoid *) glScissor, _gloffset_Scissor },
+   { "glShadeModel", (GLvoid *) glShadeModel, _gloffset_ShadeModel },
+   { "glTexParameterf", (GLvoid *) glTexParameterf, _gloffset_TexParameterf },
+   { "glTexParameterfv", (GLvoid *) glTexParameterfv, _gloffset_TexParameterfv },
+   { "glTexParameteri", (GLvoid *) glTexParameteri, _gloffset_TexParameteri },
+   { "glTexParameteriv", (GLvoid *) glTexParameteriv, _gloffset_TexParameteriv },
+   { "glTexImage1D", (GLvoid *) glTexImage1D, _gloffset_TexImage1D },
+   { "glTexImage2D", (GLvoid *) glTexImage2D, _gloffset_TexImage2D },
+   { "glTexEnvf", (GLvoid *) glTexEnvf, _gloffset_TexEnvf },
+   { "glTexEnvfv", (GLvoid *) glTexEnvfv, _gloffset_TexEnvfv },
+   { "glTexEnvi", (GLvoid *) glTexEnvi, _gloffset_TexEnvi },
+   { "glTexEnviv", (GLvoid *) glTexEnviv, _gloffset_TexEnviv },
+   { "glTexGend", (GLvoid *) glTexGend, _gloffset_TexGend },
+   { "glTexGendv", (GLvoid *) glTexGendv, _gloffset_TexGendv },
+   { "glTexGenf", (GLvoid *) glTexGenf, _gloffset_TexGenf },
+   { "glTexGenfv", (GLvoid *) glTexGenfv, _gloffset_TexGenfv },
+   { "glTexGeni", (GLvoid *) glTexGeni, _gloffset_TexGeni },
+   { "glTexGeniv", (GLvoid *) glTexGeniv, _gloffset_TexGeniv },
+   { "glFeedbackBuffer", (GLvoid *) glFeedbackBuffer, _gloffset_FeedbackBuffer },
+   { "glSelectBuffer", (GLvoid *) glSelectBuffer, _gloffset_SelectBuffer },
+   { "glRenderMode", (GLvoid *) glRenderMode, _gloffset_RenderMode },
+   { "glInitNames", (GLvoid *) glInitNames, _gloffset_InitNames },
+   { "glLoadName", (GLvoid *) glLoadName, _gloffset_LoadName },
+   { "glPassThrough", (GLvoid *) glPassThrough, _gloffset_PassThrough },
+   { "glPopName", (GLvoid *) glPopName, _gloffset_PopName },
+   { "glPushName", (GLvoid *) glPushName, _gloffset_PushName },
+   { "glDrawBuffer", (GLvoid *) glDrawBuffer, _gloffset_DrawBuffer },
+   { "glClear", (GLvoid *) glClear, _gloffset_Clear },
+   { "glClearAccum", (GLvoid *) glClearAccum, _gloffset_ClearAccum },
+   { "glClearIndex", (GLvoid *) glClearIndex, _gloffset_ClearIndex },
+   { "glClearColor", (GLvoid *) glClearColor, _gloffset_ClearColor },
+   { "glClearStencil", (GLvoid *) glClearStencil, _gloffset_ClearStencil },
+   { "glClearDepth", (GLvoid *) glClearDepth, _gloffset_ClearDepth },
+   { "glStencilMask", (GLvoid *) glStencilMask, _gloffset_StencilMask },
+   { "glColorMask", (GLvoid *) glColorMask, _gloffset_ColorMask },
+   { "glDepthMask", (GLvoid *) glDepthMask, _gloffset_DepthMask },
+   { "glIndexMask", (GLvoid *) glIndexMask, _gloffset_IndexMask },
+   { "glAccum", (GLvoid *) glAccum, _gloffset_Accum },
+   { "glDisable", (GLvoid *) glDisable, _gloffset_Disable },
+   { "glEnable", (GLvoid *) glEnable, _gloffset_Enable },
+   { "glFinish", (GLvoid *) glFinish, _gloffset_Finish },
+   { "glFlush", (GLvoid *) glFlush, _gloffset_Flush },
+   { "glPopAttrib", (GLvoid *) glPopAttrib, _gloffset_PopAttrib },
+   { "glPushAttrib", (GLvoid *) glPushAttrib, _gloffset_PushAttrib },
+   { "glMap1d", (GLvoid *) glMap1d, _gloffset_Map1d },
+   { "glMap1f", (GLvoid *) glMap1f, _gloffset_Map1f },
+   { "glMap2d", (GLvoid *) glMap2d, _gloffset_Map2d },
+   { "glMap2f", (GLvoid *) glMap2f, _gloffset_Map2f },
+   { "glMapGrid1d", (GLvoid *) glMapGrid1d, _gloffset_MapGrid1d },
+   { "glMapGrid1f", (GLvoid *) glMapGrid1f, _gloffset_MapGrid1f },
+   { "glMapGrid2d", (GLvoid *) glMapGrid2d, _gloffset_MapGrid2d },
+   { "glMapGrid2f", (GLvoid *) glMapGrid2f, _gloffset_MapGrid2f },
+   { "glEvalCoord1d", (GLvoid *) glEvalCoord1d, _gloffset_EvalCoord1d },
+   { "glEvalCoord1dv", (GLvoid *) glEvalCoord1dv, _gloffset_EvalCoord1dv },
+   { "glEvalCoord1f", (GLvoid *) glEvalCoord1f, _gloffset_EvalCoord1f },
+   { "glEvalCoord1fv", (GLvoid *) glEvalCoord1fv, _gloffset_EvalCoord1fv },
+   { "glEvalCoord2d", (GLvoid *) glEvalCoord2d, _gloffset_EvalCoord2d },
+   { "glEvalCoord2dv", (GLvoid *) glEvalCoord2dv, _gloffset_EvalCoord2dv },
+   { "glEvalCoord2f", (GLvoid *) glEvalCoord2f, _gloffset_EvalCoord2f },
+   { "glEvalCoord2fv", (GLvoid *) glEvalCoord2fv, _gloffset_EvalCoord2fv },
+   { "glEvalMesh1", (GLvoid *) glEvalMesh1, _gloffset_EvalMesh1 },
+   { "glEvalPoint1", (GLvoid *) glEvalPoint1, _gloffset_EvalPoint1 },
+   { "glEvalMesh2", (GLvoid *) glEvalMesh2, _gloffset_EvalMesh2 },
+   { "glEvalPoint2", (GLvoid *) glEvalPoint2, _gloffset_EvalPoint2 },
+   { "glAlphaFunc", (GLvoid *) glAlphaFunc, _gloffset_AlphaFunc },
+   { "glBlendFunc", (GLvoid *) glBlendFunc, _gloffset_BlendFunc },
+   { "glLogicOp", (GLvoid *) glLogicOp, _gloffset_LogicOp },
+   { "glStencilFunc", (GLvoid *) glStencilFunc, _gloffset_StencilFunc },
+   { "glStencilOp", (GLvoid *) glStencilOp, _gloffset_StencilOp },
+   { "glDepthFunc", (GLvoid *) glDepthFunc, _gloffset_DepthFunc },
+   { "glPixelZoom", (GLvoid *) glPixelZoom, _gloffset_PixelZoom },
+   { "glPixelTransferf", (GLvoid *) glPixelTransferf, _gloffset_PixelTransferf },
+   { "glPixelTransferi", (GLvoid *) glPixelTransferi, _gloffset_PixelTransferi },
+   { "glPixelStoref", (GLvoid *) glPixelStoref, _gloffset_PixelStoref },
+   { "glPixelStorei", (GLvoid *) glPixelStorei, _gloffset_PixelStorei },
+   { "glPixelMapfv", (GLvoid *) glPixelMapfv, _gloffset_PixelMapfv },
+   { "glPixelMapuiv", (GLvoid *) glPixelMapuiv, _gloffset_PixelMapuiv },
+   { "glPixelMapusv", (GLvoid *) glPixelMapusv, _gloffset_PixelMapusv },
+   { "glReadBuffer", (GLvoid *) glReadBuffer, _gloffset_ReadBuffer },
+   { "glCopyPixels", (GLvoid *) glCopyPixels, _gloffset_CopyPixels },
+   { "glReadPixels", (GLvoid *) glReadPixels, _gloffset_ReadPixels },
+   { "glDrawPixels", (GLvoid *) glDrawPixels, _gloffset_DrawPixels },
+   { "glGetBooleanv", (GLvoid *) glGetBooleanv, _gloffset_GetBooleanv },
+   { "glGetClipPlane", (GLvoid *) glGetClipPlane, _gloffset_GetClipPlane },
+   { "glGetDoublev", (GLvoid *) glGetDoublev, _gloffset_GetDoublev },
+   { "glGetError", (GLvoid *) glGetError, _gloffset_GetError },
+   { "glGetFloatv", (GLvoid *) glGetFloatv, _gloffset_GetFloatv },
+   { "glGetIntegerv", (GLvoid *) glGetIntegerv, _gloffset_GetIntegerv },
+   { "glGetLightfv", (GLvoid *) glGetLightfv, _gloffset_GetLightfv },
+   { "glGetLightiv", (GLvoid *) glGetLightiv, _gloffset_GetLightiv },
+   { "glGetMapdv", (GLvoid *) glGetMapdv, _gloffset_GetMapdv },
+   { "glGetMapfv", (GLvoid *) glGetMapfv, _gloffset_GetMapfv },
+   { "glGetMapiv", (GLvoid *) glGetMapiv, _gloffset_GetMapiv },
+   { "glGetMaterialfv", (GLvoid *) glGetMaterialfv, _gloffset_GetMaterialfv },
+   { "glGetMaterialiv", (GLvoid *) glGetMaterialiv, _gloffset_GetMaterialiv },
+   { "glGetPixelMapfv", (GLvoid *) glGetPixelMapfv, _gloffset_GetPixelMapfv },
+   { "glGetPixelMapuiv", (GLvoid *) glGetPixelMapuiv, _gloffset_GetPixelMapuiv },
+   { "glGetPixelMapusv", (GLvoid *) glGetPixelMapusv, _gloffset_GetPixelMapusv },
+   { "glGetPolygonStipple", (GLvoid *) glGetPolygonStipple, _gloffset_GetPolygonStipple },
+   { "glGetString", (GLvoid *) glGetString, _gloffset_GetString },
+   { "glGetTexEnvfv", (GLvoid *) glGetTexEnvfv, _gloffset_GetTexEnvfv },
+   { "glGetTexEnviv", (GLvoid *) glGetTexEnviv, _gloffset_GetTexEnviv },
+   { "glGetTexGendv", (GLvoid *) glGetTexGendv, _gloffset_GetTexGendv },
+   { "glGetTexGenfv", (GLvoid *) glGetTexGenfv, _gloffset_GetTexGenfv },
+   { "glGetTexGeniv", (GLvoid *) glGetTexGeniv, _gloffset_GetTexGeniv },
+   { "glGetTexImage", (GLvoid *) glGetTexImage, _gloffset_GetTexImage },
+   { "glGetTexParameterfv", (GLvoid *) glGetTexParameterfv, _gloffset_GetTexParameterfv },
+   { "glGetTexParameteriv", (GLvoid *) glGetTexParameteriv, _gloffset_GetTexParameteriv },
+   { "glGetTexLevelParameterfv", (GLvoid *) glGetTexLevelParameterfv, _gloffset_GetTexLevelParameterfv },
+   { "glGetTexLevelParameteriv", (GLvoid *) glGetTexLevelParameteriv, _gloffset_GetTexLevelParameteriv },
+   { "glIsEnabled", (GLvoid *) glIsEnabled, _gloffset_IsEnabled },
+   { "glIsList", (GLvoid *) glIsList, _gloffset_IsList },
+   { "glDepthRange", (GLvoid *) glDepthRange, _gloffset_DepthRange },
+   { "glFrustum", (GLvoid *) glFrustum, _gloffset_Frustum },
+   { "glLoadIdentity", (GLvoid *) glLoadIdentity, _gloffset_LoadIdentity },
+   { "glLoadMatrixf", (GLvoid *) glLoadMatrixf, _gloffset_LoadMatrixf },
+   { "glLoadMatrixd", (GLvoid *) glLoadMatrixd, _gloffset_LoadMatrixd },
+   { "glMatrixMode", (GLvoid *) glMatrixMode, _gloffset_MatrixMode },
+   { "glMultMatrixf", (GLvoid *) glMultMatrixf, _gloffset_MultMatrixf },
+   { "glMultMatrixd", (GLvoid *) glMultMatrixd, _gloffset_MultMatrixd },
+   { "glOrtho", (GLvoid *) glOrtho, _gloffset_Ortho },
+   { "glPopMatrix", (GLvoid *) glPopMatrix, _gloffset_PopMatrix },
+   { "glPushMatrix", (GLvoid *) glPushMatrix, _gloffset_PushMatrix },
+   { "glRotated", (GLvoid *) glRotated, _gloffset_Rotated },
+   { "glRotatef", (GLvoid *) glRotatef, _gloffset_Rotatef },
+   { "glScaled", (GLvoid *) glScaled, _gloffset_Scaled },
+   { "glScalef", (GLvoid *) glScalef, _gloffset_Scalef },
+   { "glTranslated", (GLvoid *) glTranslated, _gloffset_Translated },
+   { "glTranslatef", (GLvoid *) glTranslatef, _gloffset_Translatef },
+   { "glViewport", (GLvoid *) glViewport, _gloffset_Viewport },
+   { "glArrayElement", (GLvoid *) glArrayElement, _gloffset_ArrayElement },
+   { "glColorPointer", (GLvoid *) glColorPointer, _gloffset_ColorPointer },
+   { "glDisableClientState", (GLvoid *) glDisableClientState, _gloffset_DisableClientState },
+   { "glDrawArrays", (GLvoid *) glDrawArrays, _gloffset_DrawArrays },
+   { "glDrawElements", (GLvoid *) glDrawElements, _gloffset_DrawElements },
+   { "glEdgeFlagPointer", (GLvoid *) glEdgeFlagPointer, _gloffset_EdgeFlagPointer },
+   { "glEnableClientState", (GLvoid *) glEnableClientState, _gloffset_EnableClientState },
+   { "glGetPointerv", (GLvoid *) glGetPointerv, _gloffset_GetPointerv },
+   { "glIndexPointer", (GLvoid *) glIndexPointer, _gloffset_IndexPointer },
+   { "glInterleavedArrays", (GLvoid *) glInterleavedArrays, _gloffset_InterleavedArrays },
+   { "glNormalPointer", (GLvoid *) glNormalPointer, _gloffset_NormalPointer },
+   { "glTexCoordPointer", (GLvoid *) glTexCoordPointer, _gloffset_TexCoordPointer },
+   { "glVertexPointer", (GLvoid *) glVertexPointer, _gloffset_VertexPointer },
+   { "glPolygonOffset", (GLvoid *) glPolygonOffset, _gloffset_PolygonOffset },
+   { "glCopyTexImage1D", (GLvoid *) glCopyTexImage1D, _gloffset_CopyTexImage1D },
+   { "glCopyTexImage2D", (GLvoid *) glCopyTexImage2D, _gloffset_CopyTexImage2D },
+   { "glCopyTexSubImage1D", (GLvoid *) glCopyTexSubImage1D, _gloffset_CopyTexSubImage1D },
+   { "glCopyTexSubImage2D", (GLvoid *) glCopyTexSubImage2D, _gloffset_CopyTexSubImage2D },
+   { "glTexSubImage1D", (GLvoid *) glTexSubImage1D, _gloffset_TexSubImage1D },
+   { "glTexSubImage2D", (GLvoid *) glTexSubImage2D, _gloffset_TexSubImage2D },
+   { "glAreTexturesResident", (GLvoid *) glAreTexturesResident, _gloffset_AreTexturesResident },
+   { "glBindTexture", (GLvoid *) glBindTexture, _gloffset_BindTexture },
+   { "glDeleteTextures", (GLvoid *) glDeleteTextures, _gloffset_DeleteTextures },
+   { "glGenTextures", (GLvoid *) glGenTextures, _gloffset_GenTextures },
+   { "glIsTexture", (GLvoid *) glIsTexture, _gloffset_IsTexture },
+   { "glPrioritizeTextures", (GLvoid *) glPrioritizeTextures, _gloffset_PrioritizeTextures },
+   { "glIndexub", (GLvoid *) glIndexub, _gloffset_Indexub },
+   { "glIndexubv", (GLvoid *) glIndexubv, _gloffset_Indexubv },
+   { "glPopClientAttrib", (GLvoid *) glPopClientAttrib, _gloffset_PopClientAttrib },
+   { "glPushClientAttrib", (GLvoid *) glPushClientAttrib, _gloffset_PushClientAttrib },
+   { "glBlendColor", (GLvoid *) glBlendColor, _gloffset_BlendColor },
+   { "glBlendEquation", (GLvoid *) glBlendEquation, _gloffset_BlendEquation },
+   { "glDrawRangeElements", (GLvoid *) glDrawRangeElements, _gloffset_DrawRangeElements },
+   { "glColorTable", (GLvoid *) glColorTable, _gloffset_ColorTable },
+   { "glColorTableParameterfv", (GLvoid *) glColorTableParameterfv, _gloffset_ColorTableParameterfv },
+   { "glColorTableParameteriv", (GLvoid *) glColorTableParameteriv, _gloffset_ColorTableParameteriv },
+   { "glCopyColorTable", (GLvoid *) glCopyColorTable, _gloffset_CopyColorTable },
+   { "glGetColorTable", (GLvoid *) glGetColorTable, _gloffset_GetColorTable },
+   { "glGetColorTableParameterfv", (GLvoid *) glGetColorTableParameterfv, _gloffset_GetColorTableParameterfv },
+   { "glGetColorTableParameteriv", (GLvoid *) glGetColorTableParameteriv, _gloffset_GetColorTableParameteriv },
+   { "glColorSubTable", (GLvoid *) glColorSubTable, _gloffset_ColorSubTable },
+   { "glCopyColorSubTable", (GLvoid *) glCopyColorSubTable, _gloffset_CopyColorSubTable },
+   { "glConvolutionFilter1D", (GLvoid *) glConvolutionFilter1D, _gloffset_ConvolutionFilter1D },
+   { "glConvolutionFilter2D", (GLvoid *) glConvolutionFilter2D, _gloffset_ConvolutionFilter2D },
+   { "glConvolutionParameterf", (GLvoid *) glConvolutionParameterf, _gloffset_ConvolutionParameterf },
+   { "glConvolutionParameterfv", (GLvoid *) glConvolutionParameterfv, _gloffset_ConvolutionParameterfv },
+   { "glConvolutionParameteri", (GLvoid *) glConvolutionParameteri, _gloffset_ConvolutionParameteri },
+   { "glConvolutionParameteriv", (GLvoid *) glConvolutionParameteriv, _gloffset_ConvolutionParameteriv },
+   { "glCopyConvolutionFilter1D", (GLvoid *) glCopyConvolutionFilter1D, _gloffset_CopyConvolutionFilter1D },
+   { "glCopyConvolutionFilter2D", (GLvoid *) glCopyConvolutionFilter2D, _gloffset_CopyConvolutionFilter2D },
+   { "glGetConvolutionFilter", (GLvoid *) glGetConvolutionFilter, _gloffset_GetConvolutionFilter },
+   { "glGetConvolutionParameterfv", (GLvoid *) glGetConvolutionParameterfv, _gloffset_GetConvolutionParameterfv },
+   { "glGetConvolutionParameteriv", (GLvoid *) glGetConvolutionParameteriv, _gloffset_GetConvolutionParameteriv },
+   { "glGetSeparableFilter", (GLvoid *) glGetSeparableFilter, _gloffset_GetSeparableFilter },
+   { "glSeparableFilter2D", (GLvoid *) glSeparableFilter2D, _gloffset_SeparableFilter2D },
+   { "glGetHistogram", (GLvoid *) glGetHistogram, _gloffset_GetHistogram },
+   { "glGetHistogramParameterfv", (GLvoid *) glGetHistogramParameterfv, _gloffset_GetHistogramParameterfv },
+   { "glGetHistogramParameteriv", (GLvoid *) glGetHistogramParameteriv, _gloffset_GetHistogramParameteriv },
+   { "glGetMinmax", (GLvoid *) glGetMinmax, _gloffset_GetMinmax },
+   { "glGetMinmaxParameterfv", (GLvoid *) glGetMinmaxParameterfv, _gloffset_GetMinmaxParameterfv },
+   { "glGetMinmaxParameteriv", (GLvoid *) glGetMinmaxParameteriv, _gloffset_GetMinmaxParameteriv },
+   { "glHistogram", (GLvoid *) glHistogram, _gloffset_Histogram },
+   { "glMinmax", (GLvoid *) glMinmax, _gloffset_Minmax },
+   { "glResetHistogram", (GLvoid *) glResetHistogram, _gloffset_ResetHistogram },
+   { "glResetMinmax", (GLvoid *) glResetMinmax, _gloffset_ResetMinmax },
+   { "glTexImage3D", (GLvoid *) glTexImage3D, _gloffset_TexImage3D },
+   { "glTexSubImage3D", (GLvoid *) glTexSubImage3D, _gloffset_TexSubImage3D },
+   { "glCopyTexSubImage3D", (GLvoid *) glCopyTexSubImage3D, _gloffset_CopyTexSubImage3D },
+   { "glActiveTextureARB", (GLvoid *) glActiveTextureARB, _gloffset_ActiveTextureARB },
+   { "glClientActiveTextureARB", (GLvoid *) glClientActiveTextureARB, _gloffset_ClientActiveTextureARB },
+   { "glMultiTexCoord1dARB", (GLvoid *) glMultiTexCoord1dARB, _gloffset_MultiTexCoord1dARB },
+   { "glMultiTexCoord1dvARB", (GLvoid *) glMultiTexCoord1dvARB, _gloffset_MultiTexCoord1dvARB },
+   { "glMultiTexCoord1fARB", (GLvoid *) glMultiTexCoord1fARB, _gloffset_MultiTexCoord1fARB },
+   { "glMultiTexCoord1fvARB", (GLvoid *) glMultiTexCoord1fvARB, _gloffset_MultiTexCoord1fvARB },
+   { "glMultiTexCoord1iARB", (GLvoid *) glMultiTexCoord1iARB, _gloffset_MultiTexCoord1iARB },
+   { "glMultiTexCoord1ivARB", (GLvoid *) glMultiTexCoord1ivARB, _gloffset_MultiTexCoord1ivARB },
+   { "glMultiTexCoord1sARB", (GLvoid *) glMultiTexCoord1sARB, _gloffset_MultiTexCoord1sARB },
+   { "glMultiTexCoord1svARB", (GLvoid *) glMultiTexCoord1svARB, _gloffset_MultiTexCoord1svARB },
+   { "glMultiTexCoord2dARB", (GLvoid *) glMultiTexCoord2dARB, _gloffset_MultiTexCoord2dARB },
+   { "glMultiTexCoord2dvARB", (GLvoid *) glMultiTexCoord2dvARB, _gloffset_MultiTexCoord2dvARB },
+   { "glMultiTexCoord2fARB", (GLvoid *) glMultiTexCoord2fARB, _gloffset_MultiTexCoord2fARB },
+   { "glMultiTexCoord2fvARB", (GLvoid *) glMultiTexCoord2fvARB, _gloffset_MultiTexCoord2fvARB },
+   { "glMultiTexCoord2iARB", (GLvoid *) glMultiTexCoord2iARB, _gloffset_MultiTexCoord2iARB },
+   { "glMultiTexCoord2ivARB", (GLvoid *) glMultiTexCoord2ivARB, _gloffset_MultiTexCoord2ivARB },
+   { "glMultiTexCoord2sARB", (GLvoid *) glMultiTexCoord2sARB, _gloffset_MultiTexCoord2sARB },
+   { "glMultiTexCoord2svARB", (GLvoid *) glMultiTexCoord2svARB, _gloffset_MultiTexCoord2svARB },
+   { "glMultiTexCoord3dARB", (GLvoid *) glMultiTexCoord3dARB, _gloffset_MultiTexCoord3dARB },
+   { "glMultiTexCoord3dvARB", (GLvoid *) glMultiTexCoord3dvARB, _gloffset_MultiTexCoord3dvARB },
+   { "glMultiTexCoord3fARB", (GLvoid *) glMultiTexCoord3fARB, _gloffset_MultiTexCoord3fARB },
+   { "glMultiTexCoord3fvARB", (GLvoid *) glMultiTexCoord3fvARB, _gloffset_MultiTexCoord3fvARB },
+   { "glMultiTexCoord3iARB", (GLvoid *) glMultiTexCoord3iARB, _gloffset_MultiTexCoord3iARB },
+   { "glMultiTexCoord3ivARB", (GLvoid *) glMultiTexCoord3ivARB, _gloffset_MultiTexCoord3ivARB },
+   { "glMultiTexCoord3sARB", (GLvoid *) glMultiTexCoord3sARB, _gloffset_MultiTexCoord3sARB },
+   { "glMultiTexCoord3svARB", (GLvoid *) glMultiTexCoord3svARB, _gloffset_MultiTexCoord3svARB },
+   { "glMultiTexCoord4dARB", (GLvoid *) glMultiTexCoord4dARB, _gloffset_MultiTexCoord4dARB },
+   { "glMultiTexCoord4dvARB", (GLvoid *) glMultiTexCoord4dvARB, _gloffset_MultiTexCoord4dvARB },
+   { "glMultiTexCoord4fARB", (GLvoid *) glMultiTexCoord4fARB, _gloffset_MultiTexCoord4fARB },
+   { "glMultiTexCoord4fvARB", (GLvoid *) glMultiTexCoord4fvARB, _gloffset_MultiTexCoord4fvARB },
+   { "glMultiTexCoord4iARB", (GLvoid *) glMultiTexCoord4iARB, _gloffset_MultiTexCoord4iARB },
+   { "glMultiTexCoord4ivARB", (GLvoid *) glMultiTexCoord4ivARB, _gloffset_MultiTexCoord4ivARB },
+   { "glMultiTexCoord4sARB", (GLvoid *) glMultiTexCoord4sARB, _gloffset_MultiTexCoord4sARB },
+   { "glMultiTexCoord4svARB", (GLvoid *) glMultiTexCoord4svARB, _gloffset_MultiTexCoord4svARB },
+   { "glLoadTransposeMatrixfARB", (GLvoid *) glLoadTransposeMatrixfARB, _gloffset_LoadTransposeMatrixfARB },
+   { "glLoadTransposeMatrixdARB", (GLvoid *) glLoadTransposeMatrixdARB, _gloffset_LoadTransposeMatrixdARB },
+   { "glMultTransposeMatrixfARB", (GLvoid *) glMultTransposeMatrixfARB, _gloffset_MultTransposeMatrixfARB },
+   { "glMultTransposeMatrixdARB", (GLvoid *) glMultTransposeMatrixdARB, _gloffset_MultTransposeMatrixdARB },
+   { "glSampleCoverageARB", (GLvoid *) glSampleCoverageARB, _gloffset_SampleCoverageARB },
+   { "glCompressedTexImage3DARB", (GLvoid *) glCompressedTexImage3DARB, _gloffset_CompressedTexImage3DARB },
+   { "glCompressedTexImage2DARB", (GLvoid *) glCompressedTexImage2DARB, _gloffset_CompressedTexImage2DARB },
+   { "glCompressedTexImage1DARB", (GLvoid *) glCompressedTexImage1DARB, _gloffset_CompressedTexImage1DARB },
+   { "glCompressedTexSubImage3DARB", (GLvoid *) glCompressedTexSubImage3DARB, _gloffset_CompressedTexSubImage3DARB },
+   { "glCompressedTexSubImage2DARB", (GLvoid *) glCompressedTexSubImage2DARB, _gloffset_CompressedTexSubImage2DARB },
+   { "glCompressedTexSubImage1DARB", (GLvoid *) glCompressedTexSubImage1DARB, _gloffset_CompressedTexSubImage1DARB },
+   { "glGetCompressedTexImageARB", (GLvoid *) glGetCompressedTexImageARB, _gloffset_GetCompressedTexImageARB },
+   { "glActiveTexture", (GLvoid *) glActiveTexture, _gloffset_ActiveTextureARB },
+   { "glClientActiveTexture", (GLvoid *) glClientActiveTexture, _gloffset_ClientActiveTextureARB },
+   { "glMultiTexCoord1d", (GLvoid *) glMultiTexCoord1d, _gloffset_MultiTexCoord1dARB },
+   { "glMultiTexCoord1dv", (GLvoid *) glMultiTexCoord1dv, _gloffset_MultiTexCoord1dvARB },
+   { "glMultiTexCoord1f", (GLvoid *) glMultiTexCoord1f, _gloffset_MultiTexCoord1fARB },
+   { "glMultiTexCoord1fv", (GLvoid *) glMultiTexCoord1fv, _gloffset_MultiTexCoord1fvARB },
+   { "glMultiTexCoord1i", (GLvoid *) glMultiTexCoord1i, _gloffset_MultiTexCoord1iARB },
+   { "glMultiTexCoord1iv", (GLvoid *) glMultiTexCoord1iv, _gloffset_MultiTexCoord1ivARB },
+   { "glMultiTexCoord1s", (GLvoid *) glMultiTexCoord1s, _gloffset_MultiTexCoord1sARB },
+   { "glMultiTexCoord1sv", (GLvoid *) glMultiTexCoord1sv, _gloffset_MultiTexCoord1svARB },
+   { "glMultiTexCoord2d", (GLvoid *) glMultiTexCoord2d, _gloffset_MultiTexCoord2dARB },
+   { "glMultiTexCoord2dv", (GLvoid *) glMultiTexCoord2dv, _gloffset_MultiTexCoord2dvARB },
+   { "glMultiTexCoord2f", (GLvoid *) glMultiTexCoord2f, _gloffset_MultiTexCoord2fARB },
+   { "glMultiTexCoord2fv", (GLvoid *) glMultiTexCoord2fv, _gloffset_MultiTexCoord2fvARB },
+   { "glMultiTexCoord2i", (GLvoid *) glMultiTexCoord2i, _gloffset_MultiTexCoord2iARB },
+   { "glMultiTexCoord2iv", (GLvoid *) glMultiTexCoord2iv, _gloffset_MultiTexCoord2ivARB },
+   { "glMultiTexCoord2s", (GLvoid *) glMultiTexCoord2s, _gloffset_MultiTexCoord2sARB },
+   { "glMultiTexCoord2sv", (GLvoid *) glMultiTexCoord2sv, _gloffset_MultiTexCoord2svARB },
+   { "glMultiTexCoord3d", (GLvoid *) glMultiTexCoord3d, _gloffset_MultiTexCoord3dARB },
+   { "glMultiTexCoord3dv", (GLvoid *) glMultiTexCoord3dv, _gloffset_MultiTexCoord3dvARB },
+   { "glMultiTexCoord3f", (GLvoid *) glMultiTexCoord3f, _gloffset_MultiTexCoord3fARB },
+   { "glMultiTexCoord3fv", (GLvoid *) glMultiTexCoord3fv, _gloffset_MultiTexCoord3fvARB },
+   { "glMultiTexCoord3i", (GLvoid *) glMultiTexCoord3i, _gloffset_MultiTexCoord3iARB },
+   { "glMultiTexCoord3iv", (GLvoid *) glMultiTexCoord3iv, _gloffset_MultiTexCoord3ivARB },
+   { "glMultiTexCoord3s", (GLvoid *) glMultiTexCoord3s, _gloffset_MultiTexCoord3sARB },
+   { "glMultiTexCoord3sv", (GLvoid *) glMultiTexCoord3sv, _gloffset_MultiTexCoord3svARB },
+   { "glMultiTexCoord4d", (GLvoid *) glMultiTexCoord4d, _gloffset_MultiTexCoord4dARB },
+   { "glMultiTexCoord4dv", (GLvoid *) glMultiTexCoord4dv, _gloffset_MultiTexCoord4dvARB },
+   { "glMultiTexCoord4f", (GLvoid *) glMultiTexCoord4f, _gloffset_MultiTexCoord4fARB },
+   { "glMultiTexCoord4fv", (GLvoid *) glMultiTexCoord4fv, _gloffset_MultiTexCoord4fvARB },
+   { "glMultiTexCoord4i", (GLvoid *) glMultiTexCoord4i, _gloffset_MultiTexCoord4iARB },
+   { "glMultiTexCoord4iv", (GLvoid *) glMultiTexCoord4iv, _gloffset_MultiTexCoord4ivARB },
+   { "glMultiTexCoord4s", (GLvoid *) glMultiTexCoord4s, _gloffset_MultiTexCoord4sARB },
+   { "glMultiTexCoord4sv", (GLvoid *) glMultiTexCoord4sv, _gloffset_MultiTexCoord4svARB },
+   { "glLoadTransposeMatrixf", (GLvoid *) glLoadTransposeMatrixf, _gloffset_LoadTransposeMatrixfARB },
+   { "glLoadTransposeMatrixd", (GLvoid *) glLoadTransposeMatrixd, _gloffset_LoadTransposeMatrixdARB },
+   { "glMultTransposeMatrixf", (GLvoid *) glMultTransposeMatrixf, _gloffset_MultTransposeMatrixfARB },
+   { "glMultTransposeMatrixd", (GLvoid *) glMultTransposeMatrixd, _gloffset_MultTransposeMatrixdARB },
+   { "glSampleCoverage", (GLvoid *) glSampleCoverage, _gloffset_SampleCoverageARB },
+   { "glCompressedTexImage3D", (GLvoid *) glCompressedTexImage3D, _gloffset_CompressedTexImage3DARB },
+   { "glCompressedTexImage2D", (GLvoid *) glCompressedTexImage2D, _gloffset_CompressedTexImage2DARB },
+   { "glCompressedTexImage1D", (GLvoid *) glCompressedTexImage1D, _gloffset_CompressedTexImage1DARB },
+   { "glCompressedTexSubImage3D", (GLvoid *) glCompressedTexSubImage3D, _gloffset_CompressedTexSubImage3DARB },
+   { "glCompressedTexSubImage2D", (GLvoid *) glCompressedTexSubImage2D, _gloffset_CompressedTexSubImage2DARB },
+   { "glCompressedTexSubImage1D", (GLvoid *) glCompressedTexSubImage1D, _gloffset_CompressedTexSubImage1DARB },
+   { "glGetCompressedTexImage", (GLvoid *) glGetCompressedTexImage, _gloffset_GetCompressedTexImageARB },
+   { "glBlendColorEXT", (GLvoid *) glBlendColorEXT, _gloffset_BlendColor },
+   { "glPolygonOffsetEXT", (GLvoid *) glPolygonOffsetEXT, _gloffset_PolygonOffsetEXT },
+   { "glTexImage3DEXT", (GLvoid *) glTexImage3DEXT, _gloffset_TexImage3D },
+   { "glTexSubImage3DEXT", (GLvoid *) glTexSubImage3DEXT, _gloffset_TexSubImage3D },
+   { "glGetTexFilterFuncSGIS", (GLvoid *) glGetTexFilterFuncSGIS, _gloffset_GetTexFilterFuncSGIS },
+   { "glTexFilterFuncSGIS", (GLvoid *) glTexFilterFuncSGIS, _gloffset_TexFilterFuncSGIS },
+   { "glTexSubImage1DEXT", (GLvoid *) glTexSubImage1DEXT, _gloffset_TexSubImage1D },
+   { "glTexSubImage2DEXT", (GLvoid *) glTexSubImage2DEXT, _gloffset_TexSubImage2D },
+   { "glCopyTexImage1DEXT", (GLvoid *) glCopyTexImage1DEXT, _gloffset_CopyTexImage1D },
+   { "glCopyTexImage2DEXT", (GLvoid *) glCopyTexImage2DEXT, _gloffset_CopyTexImage2D },
+   { "glCopyTexSubImage1DEXT", (GLvoid *) glCopyTexSubImage1DEXT, _gloffset_CopyTexSubImage1D },
+   { "glCopyTexSubImage2DEXT", (GLvoid *) glCopyTexSubImage2DEXT, _gloffset_CopyTexSubImage2D },
+   { "glCopyTexSubImage3DEXT", (GLvoid *) glCopyTexSubImage3DEXT, _gloffset_CopyTexSubImage3D },
+   { "glGetHistogramEXT", (GLvoid *) glGetHistogramEXT, _gloffset_GetHistogramEXT },
+   { "glGetHistogramParameterfvEXT", (GLvoid *) glGetHistogramParameterfvEXT, _gloffset_GetHistogramParameterfvEXT },
+   { "glGetHistogramParameterivEXT", (GLvoid *) glGetHistogramParameterivEXT, _gloffset_GetHistogramParameterivEXT },
+   { "glGetMinmaxEXT", (GLvoid *) glGetMinmaxEXT, _gloffset_GetMinmaxEXT },
+   { "glGetMinmaxParameterfvEXT", (GLvoid *) glGetMinmaxParameterfvEXT, _gloffset_GetMinmaxParameterfvEXT },
+   { "glGetMinmaxParameterivEXT", (GLvoid *) glGetMinmaxParameterivEXT, _gloffset_GetMinmaxParameterivEXT },
+   { "glHistogramEXT", (GLvoid *) glHistogramEXT, _gloffset_Histogram },
+   { "glMinmaxEXT", (GLvoid *) glMinmaxEXT, _gloffset_Minmax },
+   { "glResetHistogramEXT", (GLvoid *) glResetHistogramEXT, _gloffset_ResetHistogram },
+   { "glResetMinmaxEXT", (GLvoid *) glResetMinmaxEXT, _gloffset_ResetMinmax },
+   { "glConvolutionFilter1DEXT", (GLvoid *) glConvolutionFilter1DEXT, _gloffset_ConvolutionFilter1D },
+   { "glConvolutionFilter2DEXT", (GLvoid *) glConvolutionFilter2DEXT, _gloffset_ConvolutionFilter2D },
+   { "glConvolutionParameterfEXT", (GLvoid *) glConvolutionParameterfEXT, _gloffset_ConvolutionParameterf },
+   { "glConvolutionParameterfvEXT", (GLvoid *) glConvolutionParameterfvEXT, _gloffset_ConvolutionParameterfv },
+   { "glConvolutionParameteriEXT", (GLvoid *) glConvolutionParameteriEXT, _gloffset_ConvolutionParameteri },
+   { "glConvolutionParameterivEXT", (GLvoid *) glConvolutionParameterivEXT, _gloffset_ConvolutionParameteriv },
+   { "glCopyConvolutionFilter1DEXT", (GLvoid *) glCopyConvolutionFilter1DEXT, _gloffset_CopyConvolutionFilter1D },
+   { "glCopyConvolutionFilter2DEXT", (GLvoid *) glCopyConvolutionFilter2DEXT, _gloffset_CopyConvolutionFilter2D },
+   { "glGetConvolutionFilterEXT", (GLvoid *) glGetConvolutionFilterEXT, _gloffset_GetConvolutionFilterEXT },
+   { "glGetConvolutionParameterfvEXT", (GLvoid *) glGetConvolutionParameterfvEXT, _gloffset_GetConvolutionParameterfvEXT },
+   { "glGetConvolutionParameterivEXT", (GLvoid *) glGetConvolutionParameterivEXT, _gloffset_GetConvolutionParameterivEXT },
+   { "glGetSeparableFilterEXT", (GLvoid *) glGetSeparableFilterEXT, _gloffset_GetSeparableFilterEXT },
+   { "glSeparableFilter2DEXT", (GLvoid *) glSeparableFilter2DEXT, _gloffset_SeparableFilter2D },
+   { "glColorTableSGI", (GLvoid *) glColorTableSGI, _gloffset_ColorTable },
+   { "glColorTableParameterfvSGI", (GLvoid *) glColorTableParameterfvSGI, _gloffset_ColorTableParameterfv },
+   { "glColorTableParameterivSGI", (GLvoid *) glColorTableParameterivSGI, _gloffset_ColorTableParameteriv },
+   { "glCopyColorTableSGI", (GLvoid *) glCopyColorTableSGI, _gloffset_CopyColorTable },
+   { "glGetColorTableSGI", (GLvoid *) glGetColorTableSGI, _gloffset_GetColorTableSGI },
+   { "glGetColorTableParameterfvSGI", (GLvoid *) glGetColorTableParameterfvSGI, _gloffset_GetColorTableParameterfvSGI },
+   { "glGetColorTableParameterivSGI", (GLvoid *) glGetColorTableParameterivSGI, _gloffset_GetColorTableParameterivSGI },
+   { "glPixelTexGenSGIX", (GLvoid *) glPixelTexGenSGIX, _gloffset_PixelTexGenSGIX },
+   { "glPixelTexGenParameteriSGIS", (GLvoid *) glPixelTexGenParameteriSGIS, _gloffset_PixelTexGenParameteriSGIS },
+   { "glPixelTexGenParameterivSGIS", (GLvoid *) glPixelTexGenParameterivSGIS, _gloffset_PixelTexGenParameterivSGIS },
+   { "glPixelTexGenParameterfSGIS", (GLvoid *) glPixelTexGenParameterfSGIS, _gloffset_PixelTexGenParameterfSGIS },
+   { "glPixelTexGenParameterfvSGIS", (GLvoid *) glPixelTexGenParameterfvSGIS, _gloffset_PixelTexGenParameterfvSGIS },
+   { "glGetPixelTexGenParameterivSGIS", (GLvoid *) glGetPixelTexGenParameterivSGIS, _gloffset_GetPixelTexGenParameterivSGIS },
+   { "glGetPixelTexGenParameterfvSGIS", (GLvoid *) glGetPixelTexGenParameterfvSGIS, _gloffset_GetPixelTexGenParameterfvSGIS },
+   { "glTexImage4DSGIS", (GLvoid *) glTexImage4DSGIS, _gloffset_TexImage4DSGIS },
+   { "glTexSubImage4DSGIS", (GLvoid *) glTexSubImage4DSGIS, _gloffset_TexSubImage4DSGIS },
+   { "glAreTexturesResidentEXT", (GLvoid *) glAreTexturesResidentEXT, _gloffset_AreTexturesResidentEXT },
+   { "glBindTextureEXT", (GLvoid *) glBindTextureEXT, _gloffset_BindTexture },
+   { "glDeleteTexturesEXT", (GLvoid *) glDeleteTexturesEXT, _gloffset_DeleteTextures },
+   { "glGenTexturesEXT", (GLvoid *) glGenTexturesEXT, _gloffset_GenTexturesEXT },
+   { "glIsTextureEXT", (GLvoid *) glIsTextureEXT, _gloffset_IsTextureEXT },
+   { "glPrioritizeTexturesEXT", (GLvoid *) glPrioritizeTexturesEXT, _gloffset_PrioritizeTextures },
+   { "glDetailTexFuncSGIS", (GLvoid *) glDetailTexFuncSGIS, _gloffset_DetailTexFuncSGIS },
+   { "glGetDetailTexFuncSGIS", (GLvoid *) glGetDetailTexFuncSGIS, _gloffset_GetDetailTexFuncSGIS },
+   { "glSharpenTexFuncSGIS", (GLvoid *) glSharpenTexFuncSGIS, _gloffset_SharpenTexFuncSGIS },
+   { "glGetSharpenTexFuncSGIS", (GLvoid *) glGetSharpenTexFuncSGIS, _gloffset_GetSharpenTexFuncSGIS },
+   { "glSampleMaskSGIS", (GLvoid *) glSampleMaskSGIS, _gloffset_SampleMaskSGIS },
+   { "glSamplePatternSGIS", (GLvoid *) glSamplePatternSGIS, _gloffset_SamplePatternSGIS },
+   { "glArrayElementEXT", (GLvoid *) glArrayElementEXT, _gloffset_ArrayElement },
+   { "glColorPointerEXT", (GLvoid *) glColorPointerEXT, _gloffset_ColorPointerEXT },
+   { "glDrawArraysEXT", (GLvoid *) glDrawArraysEXT, _gloffset_DrawArrays },
+   { "glEdgeFlagPointerEXT", (GLvoid *) glEdgeFlagPointerEXT, _gloffset_EdgeFlagPointerEXT },
+   { "glGetPointervEXT", (GLvoid *) glGetPointervEXT, _gloffset_GetPointerv },
+   { "glIndexPointerEXT", (GLvoid *) glIndexPointerEXT, _gloffset_IndexPointerEXT },
+   { "glNormalPointerEXT", (GLvoid *) glNormalPointerEXT, _gloffset_NormalPointerEXT },
+   { "glTexCoordPointerEXT", (GLvoid *) glTexCoordPointerEXT, _gloffset_TexCoordPointerEXT },
+   { "glVertexPointerEXT", (GLvoid *) glVertexPointerEXT, _gloffset_VertexPointerEXT },
+   { "glBlendEquationEXT", (GLvoid *) glBlendEquationEXT, _gloffset_BlendEquation },
+   { "glSpriteParameterfSGIX", (GLvoid *) glSpriteParameterfSGIX, _gloffset_SpriteParameterfSGIX },
+   { "glSpriteParameterfvSGIX", (GLvoid *) glSpriteParameterfvSGIX, _gloffset_SpriteParameterfvSGIX },
+   { "glSpriteParameteriSGIX", (GLvoid *) glSpriteParameteriSGIX, _gloffset_SpriteParameteriSGIX },
+   { "glSpriteParameterivSGIX", (GLvoid *) glSpriteParameterivSGIX, _gloffset_SpriteParameterivSGIX },
+   { "glPointParameterfEXT", (GLvoid *) glPointParameterfEXT, _gloffset_PointParameterfEXT },
+   { "glPointParameterfvEXT", (GLvoid *) glPointParameterfvEXT, _gloffset_PointParameterfvEXT },
+   { "glPointParameterfARB", (GLvoid *) glPointParameterfARB, _gloffset_PointParameterfEXT },
+   { "glPointParameterfvARB", (GLvoid *) glPointParameterfvARB, _gloffset_PointParameterfvEXT },
+   { "glPointParameterfSGIS", (GLvoid *) glPointParameterfSGIS, _gloffset_PointParameterfEXT },
+   { "glPointParameterfvSGIS", (GLvoid *) glPointParameterfvSGIS, _gloffset_PointParameterfvEXT },
+   { "glGetInstrumentsSGIX", (GLvoid *) glGetInstrumentsSGIX, _gloffset_GetInstrumentsSGIX },
+   { "glInstrumentsBufferSGIX", (GLvoid *) glInstrumentsBufferSGIX, _gloffset_InstrumentsBufferSGIX },
+   { "glPollInstrumentsSGIX", (GLvoid *) glPollInstrumentsSGIX, _gloffset_PollInstrumentsSGIX },
+   { "glReadInstrumentsSGIX", (GLvoid *) glReadInstrumentsSGIX, _gloffset_ReadInstrumentsSGIX },
+   { "glStartInstrumentsSGIX", (GLvoid *) glStartInstrumentsSGIX, _gloffset_StartInstrumentsSGIX },
+   { "glStopInstrumentsSGIX", (GLvoid *) glStopInstrumentsSGIX, _gloffset_StopInstrumentsSGIX },
+   { "glFrameZoomSGIX", (GLvoid *) glFrameZoomSGIX, _gloffset_FrameZoomSGIX },
+   { "glTagSampleBufferSGIX", (GLvoid *) glTagSampleBufferSGIX, _gloffset_TagSampleBufferSGIX },
+   { "glReferencePlaneSGIX", (GLvoid *) glReferencePlaneSGIX, _gloffset_ReferencePlaneSGIX },
+   { "glFlushRasterSGIX", (GLvoid *) glFlushRasterSGIX, _gloffset_FlushRasterSGIX },
+   { "glColorSubTableEXT", (GLvoid *) glColorSubTableEXT, _gloffset_ColorSubTable },
+   { "glCopyColorSubTableEXT", (GLvoid *) glCopyColorSubTableEXT, _gloffset_CopyColorSubTable },
+   { "glHintPGI", (GLvoid *) glHintPGI, _gloffset_HintPGI },
+   { "glColorTableEXT", (GLvoid *) glColorTableEXT, _gloffset_ColorTable },
+   { "glGetColorTableEXT", (GLvoid *) glGetColorTableEXT, _gloffset_GetColorTableEXT },
+   { "glGetColorTableParameterivEXT", (GLvoid *) glGetColorTableParameterivEXT, _gloffset_GetColorTableParameterivEXT },
+   { "glGetColorTableParameterfvEXT", (GLvoid *) glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfvEXT },
+   { "glGetListParameterfvSGIX", (GLvoid *) glGetListParameterfvSGIX, _gloffset_GetListParameterfvSGIX },
+   { "glGetListParameterivSGIX", (GLvoid *) glGetListParameterivSGIX, _gloffset_GetListParameterivSGIX },
+   { "glListParameterfSGIX", (GLvoid *) glListParameterfSGIX, _gloffset_ListParameterfSGIX },
+   { "glListParameterfvSGIX", (GLvoid *) glListParameterfvSGIX, _gloffset_ListParameterfvSGIX },
+   { "glListParameteriSGIX", (GLvoid *) glListParameteriSGIX, _gloffset_ListParameteriSGIX },
+   { "glListParameterivSGIX", (GLvoid *) glListParameterivSGIX, _gloffset_ListParameterivSGIX },
+   { "glIndexMaterialEXT", (GLvoid *) glIndexMaterialEXT, _gloffset_IndexMaterialEXT },
+   { "glIndexFuncEXT", (GLvoid *) glIndexFuncEXT, _gloffset_IndexFuncEXT },
+   { "glLockArraysEXT", (GLvoid *) glLockArraysEXT, _gloffset_LockArraysEXT },
+   { "glUnlockArraysEXT", (GLvoid *) glUnlockArraysEXT, _gloffset_UnlockArraysEXT },
+   { "glCullParameterdvEXT", (GLvoid *) glCullParameterdvEXT, _gloffset_CullParameterdvEXT },
+   { "glCullParameterfvEXT", (GLvoid *) glCullParameterfvEXT, _gloffset_CullParameterfvEXT },
+   { "glFragmentColorMaterialSGIX", (GLvoid *) glFragmentColorMaterialSGIX, _gloffset_FragmentColorMaterialSGIX },
+   { "glFragmentLightfSGIX", (GLvoid *) glFragmentLightfSGIX, _gloffset_FragmentLightfSGIX },
+   { "glFragmentLightfvSGIX", (GLvoid *) glFragmentLightfvSGIX, _gloffset_FragmentLightfvSGIX },
+   { "glFragmentLightiSGIX", (GLvoid *) glFragmentLightiSGIX, _gloffset_FragmentLightiSGIX },
+   { "glFragmentLightivSGIX", (GLvoid *) glFragmentLightivSGIX, _gloffset_FragmentLightivSGIX },
+   { "glFragmentLightModelfSGIX", (GLvoid *) glFragmentLightModelfSGIX, _gloffset_FragmentLightModelfSGIX },
+   { "glFragmentLightModelfvSGIX", (GLvoid *) glFragmentLightModelfvSGIX, _gloffset_FragmentLightModelfvSGIX },
+   { "glFragmentLightModeliSGIX", (GLvoid *) glFragmentLightModeliSGIX, _gloffset_FragmentLightModeliSGIX },
+   { "glFragmentLightModelivSGIX", (GLvoid *) glFragmentLightModelivSGIX, _gloffset_FragmentLightModelivSGIX },
+   { "glFragmentMaterialfSGIX", (GLvoid *) glFragmentMaterialfSGIX, _gloffset_FragmentMaterialfSGIX },
+   { "glFragmentMaterialfvSGIX", (GLvoid *) glFragmentMaterialfvSGIX, _gloffset_FragmentMaterialfvSGIX },
+   { "glFragmentMaterialiSGIX", (GLvoid *) glFragmentMaterialiSGIX, _gloffset_FragmentMaterialiSGIX },
+   { "glFragmentMaterialivSGIX", (GLvoid *) glFragmentMaterialivSGIX, _gloffset_FragmentMaterialivSGIX },
+   { "glGetFragmentLightfvSGIX", (GLvoid *) glGetFragmentLightfvSGIX, _gloffset_GetFragmentLightfvSGIX },
+   { "glGetFragmentLightivSGIX", (GLvoid *) glGetFragmentLightivSGIX, _gloffset_GetFragmentLightivSGIX },
+   { "glGetFragmentMaterialfvSGIX", (GLvoid *) glGetFragmentMaterialfvSGIX, _gloffset_GetFragmentMaterialfvSGIX },
+   { "glGetFragmentMaterialivSGIX", (GLvoid *) glGetFragmentMaterialivSGIX, _gloffset_GetFragmentMaterialivSGIX },
+   { "glLightEnviSGIX", (GLvoid *) glLightEnviSGIX, _gloffset_LightEnviSGIX },
+   { "glDrawRangeElementsEXT", (GLvoid *) glDrawRangeElementsEXT, _gloffset_DrawRangeElements },
+   { "glSecondaryColor3bEXT", (GLvoid *) glSecondaryColor3bEXT, _gloffset_SecondaryColor3bEXT },
+   { "glSecondaryColor3bvEXT", (GLvoid *) glSecondaryColor3bvEXT, _gloffset_SecondaryColor3bvEXT },
+   { "glSecondaryColor3dEXT", (GLvoid *) glSecondaryColor3dEXT, _gloffset_SecondaryColor3dEXT },
+   { "glSecondaryColor3dvEXT", (GLvoid *) glSecondaryColor3dvEXT, _gloffset_SecondaryColor3dvEXT },
+   { "glSecondaryColor3fEXT", (GLvoid *) glSecondaryColor3fEXT, _gloffset_SecondaryColor3fEXT },
+   { "glSecondaryColor3fvEXT", (GLvoid *) glSecondaryColor3fvEXT, _gloffset_SecondaryColor3fvEXT },
+   { "glSecondaryColor3iEXT", (GLvoid *) glSecondaryColor3iEXT, _gloffset_SecondaryColor3iEXT },
+   { "glSecondaryColor3ivEXT", (GLvoid *) glSecondaryColor3ivEXT, _gloffset_SecondaryColor3ivEXT },
+   { "glSecondaryColor3sEXT", (GLvoid *) glSecondaryColor3sEXT, _gloffset_SecondaryColor3sEXT },
+   { "glSecondaryColor3svEXT", (GLvoid *) glSecondaryColor3svEXT, _gloffset_SecondaryColor3svEXT },
+   { "glSecondaryColor3ubEXT", (GLvoid *) glSecondaryColor3ubEXT, _gloffset_SecondaryColor3ubEXT },
+   { "glSecondaryColor3ubvEXT", (GLvoid *) glSecondaryColor3ubvEXT, _gloffset_SecondaryColor3ubvEXT },
+   { "glSecondaryColor3uiEXT", (GLvoid *) glSecondaryColor3uiEXT, _gloffset_SecondaryColor3uiEXT },
+   { "glSecondaryColor3uivEXT", (GLvoid *) glSecondaryColor3uivEXT, _gloffset_SecondaryColor3uivEXT },
+   { "glSecondaryColor3usEXT", (GLvoid *) glSecondaryColor3usEXT, _gloffset_SecondaryColor3usEXT },
+   { "glSecondaryColor3usvEXT", (GLvoid *) glSecondaryColor3usvEXT, _gloffset_SecondaryColor3usvEXT },
+   { "glSecondaryColorPointerEXT", (GLvoid *) glSecondaryColorPointerEXT, _gloffset_SecondaryColorPointerEXT },
+   { "glMultiDrawArraysEXT", (GLvoid *) glMultiDrawArraysEXT, _gloffset_MultiDrawArraysEXT },
+   { "glMultiDrawElementsEXT", (GLvoid *) glMultiDrawElementsEXT, _gloffset_MultiDrawElementsEXT },
+   { "glFogCoordfEXT", (GLvoid *) glFogCoordfEXT, _gloffset_FogCoordfEXT },
+   { "glFogCoordfvEXT", (GLvoid *) glFogCoordfvEXT, _gloffset_FogCoordfvEXT },
+   { "glFogCoorddEXT", (GLvoid *) glFogCoorddEXT, _gloffset_FogCoorddEXT },
+   { "glFogCoorddvEXT", (GLvoid *) glFogCoorddvEXT, _gloffset_FogCoorddvEXT },
+   { "glFogCoordPointerEXT", (GLvoid *) glFogCoordPointerEXT, _gloffset_FogCoordPointerEXT },
+   { "glBlendFuncSeparateEXT", (GLvoid *) glBlendFuncSeparateEXT, _gloffset_BlendFuncSeparateEXT },
+   { "glBlendFuncSeparateINGR", (GLvoid *) glBlendFuncSeparateINGR, _gloffset_BlendFuncSeparateEXT },
+   { "glVertexWeightfEXT", (GLvoid *) glVertexWeightfEXT, _gloffset_VertexWeightfEXT },
+   { "glVertexWeightfvEXT", (GLvoid *) glVertexWeightfvEXT, _gloffset_VertexWeightfvEXT },
+   { "glVertexWeightPointerEXT", (GLvoid *) glVertexWeightPointerEXT, _gloffset_VertexWeightPointerEXT },
+   { "glFlushVertexArrayRangeNV", (GLvoid *) glFlushVertexArrayRangeNV, _gloffset_FlushVertexArrayRangeNV },
+   { "glVertexArrayRangeNV", (GLvoid *) glVertexArrayRangeNV, _gloffset_VertexArrayRangeNV },
+   { "glCombinerParameterfvNV", (GLvoid *) glCombinerParameterfvNV, _gloffset_CombinerParameterfvNV },
+   { "glCombinerParameterfNV", (GLvoid *) glCombinerParameterfNV, _gloffset_CombinerParameterfNV },
+   { "glCombinerParameterivNV", (GLvoid *) glCombinerParameterivNV, _gloffset_CombinerParameterivNV },
+   { "glCombinerParameteriNV", (GLvoid *) glCombinerParameteriNV, _gloffset_CombinerParameteriNV },
+   { "glCombinerInputNV", (GLvoid *) glCombinerInputNV, _gloffset_CombinerInputNV },
+   { "glCombinerOutputNV", (GLvoid *) glCombinerOutputNV, _gloffset_CombinerOutputNV },
+   { "glFinalCombinerInputNV", (GLvoid *) glFinalCombinerInputNV, _gloffset_FinalCombinerInputNV },
+   { "glGetCombinerInputParameterfvNV", (GLvoid *) glGetCombinerInputParameterfvNV, _gloffset_GetCombinerInputParameterfvNV },
+   { "glGetCombinerInputParameterivNV", (GLvoid *) glGetCombinerInputParameterivNV, _gloffset_GetCombinerInputParameterivNV },
+   { "glGetCombinerOutputParameterfvNV", (GLvoid *) glGetCombinerOutputParameterfvNV, _gloffset_GetCombinerOutputParameterfvNV },
+   { "glGetCombinerOutputParameterivNV", (GLvoid *) glGetCombinerOutputParameterivNV, _gloffset_GetCombinerOutputParameterivNV },
+   { "glGetFinalCombinerInputParameterfvNV", (GLvoid *) glGetFinalCombinerInputParameterfvNV, _gloffset_GetFinalCombinerInputParameterfvNV },
+   { "glGetFinalCombinerInputParameterivNV", (GLvoid *) glGetFinalCombinerInputParameterivNV, _gloffset_GetFinalCombinerInputParameterivNV },
+   { "glResizeBuffersMESA", (GLvoid *) glResizeBuffersMESA, _gloffset_ResizeBuffersMESA },
+   { "glWindowPos2dMESA", (GLvoid *) glWindowPos2dMESA, _gloffset_WindowPos2dMESA },
+   { "glWindowPos2dvMESA", (GLvoid *) glWindowPos2dvMESA, _gloffset_WindowPos2dvMESA },
+   { "glWindowPos2fMESA", (GLvoid *) glWindowPos2fMESA, _gloffset_WindowPos2fMESA },
+   { "glWindowPos2fvMESA", (GLvoid *) glWindowPos2fvMESA, _gloffset_WindowPos2fvMESA },
+   { "glWindowPos2iMESA", (GLvoid *) glWindowPos2iMESA, _gloffset_WindowPos2iMESA },
+   { "glWindowPos2ivMESA", (GLvoid *) glWindowPos2ivMESA, _gloffset_WindowPos2ivMESA },
+   { "glWindowPos2sMESA", (GLvoid *) glWindowPos2sMESA, _gloffset_WindowPos2sMESA },
+   { "glWindowPos2svMESA", (GLvoid *) glWindowPos2svMESA, _gloffset_WindowPos2svMESA },
+   { "glWindowPos3dMESA", (GLvoid *) glWindowPos3dMESA, _gloffset_WindowPos3dMESA },
+   { "glWindowPos3dvMESA", (GLvoid *) glWindowPos3dvMESA, _gloffset_WindowPos3dvMESA },
+   { "glWindowPos3fMESA", (GLvoid *) glWindowPos3fMESA, _gloffset_WindowPos3fMESA },
+   { "glWindowPos3fvMESA", (GLvoid *) glWindowPos3fvMESA, _gloffset_WindowPos3fvMESA },
+   { "glWindowPos3iMESA", (GLvoid *) glWindowPos3iMESA, _gloffset_WindowPos3iMESA },
+   { "glWindowPos3ivMESA", (GLvoid *) glWindowPos3ivMESA, _gloffset_WindowPos3ivMESA },
+   { "glWindowPos3sMESA", (GLvoid *) glWindowPos3sMESA, _gloffset_WindowPos3sMESA },
+   { "glWindowPos3svMESA", (GLvoid *) glWindowPos3svMESA, _gloffset_WindowPos3svMESA },
+   { "glWindowPos4dMESA", (GLvoid *) glWindowPos4dMESA, _gloffset_WindowPos4dMESA },
+   { "glWindowPos4dvMESA", (GLvoid *) glWindowPos4dvMESA, _gloffset_WindowPos4dvMESA },
+   { "glWindowPos4fMESA", (GLvoid *) glWindowPos4fMESA, _gloffset_WindowPos4fMESA },
+   { "glWindowPos4fvMESA", (GLvoid *) glWindowPos4fvMESA, _gloffset_WindowPos4fvMESA },
+   { "glWindowPos4iMESA", (GLvoid *) glWindowPos4iMESA, _gloffset_WindowPos4iMESA },
+   { "glWindowPos4ivMESA", (GLvoid *) glWindowPos4ivMESA, _gloffset_WindowPos4ivMESA },
+   { "glWindowPos4sMESA", (GLvoid *) glWindowPos4sMESA, _gloffset_WindowPos4sMESA },
+   { "glWindowPos4svMESA", (GLvoid *) glWindowPos4svMESA, _gloffset_WindowPos4svMESA },
+   { "glMultiModeDrawArraysIBM", (GLvoid *) glMultiModeDrawArraysIBM, _gloffset_MultiModeDrawArraysIBM },
+   { "glMultiModeDrawElementsIBM", (GLvoid *) glMultiModeDrawElementsIBM, _gloffset_MultiModeDrawElementsIBM },
+   { "glTbufferMask3DFX", (GLvoid *) glTbufferMask3DFX, _gloffset_TbufferMask3DFX },
+   { "glSampleMaskEXT", (GLvoid *) glSampleMaskEXT, _gloffset_SampleMaskSGIS },
+   { "glSamplePatternEXT", (GLvoid *) glSamplePatternEXT, _gloffset_SamplePatternSGIS },
+   { "glWindowPos2dARB", (GLvoid *) glWindowPos2dARB, _gloffset_WindowPos2dMESA },
+   { "glWindowPos2fARB", (GLvoid *) glWindowPos2fARB, _gloffset_WindowPos2fMESA },
+   { "glWindowPos2iARB", (GLvoid *) glWindowPos2iARB, _gloffset_WindowPos2iMESA },
+   { "glWindowPos2sARB", (GLvoid *) glWindowPos2sARB, _gloffset_WindowPos2sMESA },
+   { "glWindowPos2dvARB", (GLvoid *) glWindowPos2dvARB, _gloffset_WindowPos2dvMESA },
+   { "glWindowPos2fvARB", (GLvoid *) glWindowPos2fvARB, _gloffset_WindowPos2fvMESA },
+   { "glWindowPos2ivARB", (GLvoid *) glWindowPos2ivARB, _gloffset_WindowPos2ivMESA },
+   { "glWindowPos2svARB", (GLvoid *) glWindowPos2svARB, _gloffset_WindowPos2svMESA },
+   { "glWindowPos3dARB", (GLvoid *) glWindowPos3dARB, _gloffset_WindowPos3dMESA },
+   { "glWindowPos3fARB", (GLvoid *) glWindowPos3fARB, _gloffset_WindowPos3fMESA },
+   { "glWindowPos3iARB", (GLvoid *) glWindowPos3iARB, _gloffset_WindowPos3iMESA },
+   { "glWindowPos3sARB", (GLvoid *) glWindowPos3sARB, _gloffset_WindowPos3sMESA },
+   { "glWindowPos3dvARB", (GLvoid *) glWindowPos3dvARB, _gloffset_WindowPos3dvMESA },
+   { "glWindowPos3fvARB", (GLvoid *) glWindowPos3fvARB, _gloffset_WindowPos3fvMESA },
+   { "glWindowPos3ivARB", (GLvoid *) glWindowPos3ivARB, _gloffset_WindowPos3ivMESA },
+   { "glWindowPos3svARB", (GLvoid *) glWindowPos3svARB, _gloffset_WindowPos3svMESA },
+   { "glAreProgramsResidentNV", (GLvoid *) glAreProgramsResidentNV, _gloffset_AreProgramsResidentNV },
+   { "glBindProgramNV", (GLvoid *) glBindProgramNV, _gloffset_BindProgramNV },
+   { "glDeleteProgramsNV", (GLvoid *) glDeleteProgramsNV, _gloffset_DeleteProgramsNV },
+   { "glExecuteProgramNV", (GLvoid *) glExecuteProgramNV, _gloffset_ExecuteProgramNV },
+   { "glGenProgramsNV", (GLvoid *) glGenProgramsNV, _gloffset_GenProgramsNV },
+   { "glGetProgramParameterdvNV", (GLvoid *) glGetProgramParameterdvNV, _gloffset_GetProgramParameterdvNV },
+   { "glGetProgramParameterfvNV", (GLvoid *) glGetProgramParameterfvNV, _gloffset_GetProgramParameterfvNV },
+   { "glGetProgramivNV", (GLvoid *) glGetProgramivNV, _gloffset_GetProgramivNV },
+   { "glGetProgramStringNV", (GLvoid *) glGetProgramStringNV, _gloffset_GetProgramStringNV },
+   { "glGetTrackMatrixivNV", (GLvoid *) glGetTrackMatrixivNV, _gloffset_GetTrackMatrixivNV },
+   { "glGetVertexAttribdvNV", (GLvoid *) glGetVertexAttribdvNV, _gloffset_GetVertexAttribdvNV },
+   { "glGetVertexAttribfvNV", (GLvoid *) glGetVertexAttribfvNV, _gloffset_GetVertexAttribfvNV },
+   { "glGetVertexAttribivNV", (GLvoid *) glGetVertexAttribivNV, _gloffset_GetVertexAttribivNV },
+   { "glGetVertexAttribPointervNV", (GLvoid *) glGetVertexAttribPointervNV, _gloffset_GetVertexAttribPointervNV },
+   { "glIsProgramNV", (GLvoid *) glIsProgramNV, _gloffset_IsProgramNV },
+   { "glLoadProgramNV", (GLvoid *) glLoadProgramNV, _gloffset_LoadProgramNV },
+   { "glProgramParameter4dNV", (GLvoid *) glProgramParameter4dNV, _gloffset_ProgramParameter4dNV },
+   { "glProgramParameter4dvNV", (GLvoid *) glProgramParameter4dvNV, _gloffset_ProgramParameter4dvNV },
+   { "glProgramParameter4fNV", (GLvoid *) glProgramParameter4fNV, _gloffset_ProgramParameter4fNV },
+   { "glProgramParameter4fvNV", (GLvoid *) glProgramParameter4fvNV, _gloffset_ProgramParameter4fvNV },
+   { "glProgramParameters4dvNV", (GLvoid *) glProgramParameters4dvNV, _gloffset_ProgramParameters4dvNV },
+   { "glProgramParameters4fvNV", (GLvoid *) glProgramParameters4fvNV, _gloffset_ProgramParameters4fvNV },
+   { "glRequestResidentProgramsNV", (GLvoid *) glRequestResidentProgramsNV, _gloffset_RequestResidentProgramsNV },
+   { "glTrackMatrixNV", (GLvoid *) glTrackMatrixNV, _gloffset_TrackMatrixNV },
+   { "glVertexAttribPointerNV", (GLvoid *) glVertexAttribPointerNV, _gloffset_VertexAttribPointerNV },
+   { "glVertexAttrib1dNV", (GLvoid *) glVertexAttrib1dNV, _gloffset_VertexAttrib1dNV },
+   { "glVertexAttrib1dvNV", (GLvoid *) glVertexAttrib1dvNV, _gloffset_VertexAttrib1dvNV },
+   { "glVertexAttrib1fNV", (GLvoid *) glVertexAttrib1fNV, _gloffset_VertexAttrib1fNV },
+   { "glVertexAttrib1fvNV", (GLvoid *) glVertexAttrib1fvNV, _gloffset_VertexAttrib1fvNV },
+   { "glVertexAttrib1sNV", (GLvoid *) glVertexAttrib1sNV, _gloffset_VertexAttrib1sNV },
+   { "glVertexAttrib1svNV", (GLvoid *) glVertexAttrib1svNV, _gloffset_VertexAttrib1svNV },
+   { "glVertexAttrib2dNV", (GLvoid *) glVertexAttrib2dNV, _gloffset_VertexAttrib2dNV },
+   { "glVertexAttrib2dvNV", (GLvoid *) glVertexAttrib2dvNV, _gloffset_VertexAttrib2dvNV },
+   { "glVertexAttrib2fNV", (GLvoid *) glVertexAttrib2fNV, _gloffset_VertexAttrib2fNV },
+   { "glVertexAttrib2fvNV", (GLvoid *) glVertexAttrib2fvNV, _gloffset_VertexAttrib2fvNV },
+   { "glVertexAttrib2sNV", (GLvoid *) glVertexAttrib2sNV, _gloffset_VertexAttrib2sNV },
+   { "glVertexAttrib2svNV", (GLvoid *) glVertexAttrib2svNV, _gloffset_VertexAttrib2svNV },
+   { "glVertexAttrib3dNV", (GLvoid *) glVertexAttrib3dNV, _gloffset_VertexAttrib3dNV },
+   { "glVertexAttrib3dvNV", (GLvoid *) glVertexAttrib3dvNV, _gloffset_VertexAttrib3dvNV },
+   { "glVertexAttrib3fNV", (GLvoid *) glVertexAttrib3fNV, _gloffset_VertexAttrib3fNV },
+   { "glVertexAttrib3fvNV", (GLvoid *) glVertexAttrib3fvNV, _gloffset_VertexAttrib3fvNV },
+   { "glVertexAttrib3sNV", (GLvoid *) glVertexAttrib3sNV, _gloffset_VertexAttrib3sNV },
+   { "glVertexAttrib3svNV", (GLvoid *) glVertexAttrib3svNV, _gloffset_VertexAttrib3svNV },
+   { "glVertexAttrib4dNV", (GLvoid *) glVertexAttrib4dNV, _gloffset_VertexAttrib4dNV },
+   { "glVertexAttrib4dvNV", (GLvoid *) glVertexAttrib4dvNV, _gloffset_VertexAttrib4dvNV },
+   { "glVertexAttrib4fNV", (GLvoid *) glVertexAttrib4fNV, _gloffset_VertexAttrib4fNV },
+   { "glVertexAttrib4fvNV", (GLvoid *) glVertexAttrib4fvNV, _gloffset_VertexAttrib4fvNV },
+   { "glVertexAttrib4sNV", (GLvoid *) glVertexAttrib4sNV, _gloffset_VertexAttrib4sNV },
+   { "glVertexAttrib4svNV", (GLvoid *) glVertexAttrib4svNV, _gloffset_VertexAttrib4svNV },
+   { "glVertexAttrib4ubNV", (GLvoid *) glVertexAttrib4ubNV, _gloffset_VertexAttrib4ubNV },
+   { "glVertexAttrib4ubvNV", (GLvoid *) glVertexAttrib4ubvNV, _gloffset_VertexAttrib4ubvNV },
+   { "glVertexAttribs1dvNV", (GLvoid *) glVertexAttribs1dvNV, _gloffset_VertexAttribs1dvNV },
+   { "glVertexAttribs1fvNV", (GLvoid *) glVertexAttribs1fvNV, _gloffset_VertexAttribs1fvNV },
+   { "glVertexAttribs1svNV", (GLvoid *) glVertexAttribs1svNV, _gloffset_VertexAttribs1svNV },
+   { "glVertexAttribs2dvNV", (GLvoid *) glVertexAttribs2dvNV, _gloffset_VertexAttribs2dvNV },
+   { "glVertexAttribs2fvNV", (GLvoid *) glVertexAttribs2fvNV, _gloffset_VertexAttribs2fvNV },
+   { "glVertexAttribs2svNV", (GLvoid *) glVertexAttribs2svNV, _gloffset_VertexAttribs2svNV },
+   { "glVertexAttribs3dvNV", (GLvoid *) glVertexAttribs3dvNV, _gloffset_VertexAttribs3dvNV },
+   { "glVertexAttribs3fvNV", (GLvoid *) glVertexAttribs3fvNV, _gloffset_VertexAttribs3fvNV },
+   { "glVertexAttribs3svNV", (GLvoid *) glVertexAttribs3svNV, _gloffset_VertexAttribs3svNV },
+   { "glVertexAttribs4dvNV", (GLvoid *) glVertexAttribs4dvNV, _gloffset_VertexAttribs4dvNV },
+   { "glVertexAttribs4fvNV", (GLvoid *) glVertexAttribs4fvNV, _gloffset_VertexAttribs4fvNV },
+   { "glVertexAttribs4svNV", (GLvoid *) glVertexAttribs4svNV, _gloffset_VertexAttribs4svNV },
+   { "glVertexAttribs4ubvNV", (GLvoid *) glVertexAttribs4ubvNV, _gloffset_VertexAttribs4ubvNV },
+   { "glPointParameteriNV", (GLvoid *) glPointParameteriNV, _gloffset_PointParameteriNV },
+   { "glPointParameterivNV", (GLvoid *) glPointParameterivNV, _gloffset_PointParameterivNV },
+   { "glBlendFuncSeparate", (GLvoid *) glBlendFuncSeparate, _gloffset_BlendFuncSeparateEXT },
+   { "glFogCoordf", (GLvoid *) glFogCoordf, _gloffset_FogCoordfEXT },
+   { "glFogCoordfv", (GLvoid *) glFogCoordfv, _gloffset_FogCoordfvEXT },
+   { "glFogCoordd", (GLvoid *) glFogCoordd, _gloffset_FogCoorddEXT },
+   { "glFogCoorddv", (GLvoid *) glFogCoorddv, _gloffset_FogCoorddvEXT },
+   { "glFogCoordPointer", (GLvoid *) glFogCoordPointer, _gloffset_FogCoordPointerEXT },
+   { "glMultiDrawArrays", (GLvoid *) glMultiDrawArrays, _gloffset_MultiDrawArraysEXT },
+   { "glMultiDrawElements", (GLvoid *) glMultiDrawElements, _gloffset_MultiDrawElementsEXT },
+   { "glPointParameterf", (GLvoid *) glPointParameterf, _gloffset_PointParameterfEXT },
+   { "glPointParameterfv", (GLvoid *) glPointParameterfv, _gloffset_PointParameterfvEXT },
+   { "glPointParameteri", (GLvoid *) glPointParameteri, _gloffset_PointParameteriNV },
+   { "glPointParameteriv", (GLvoid *) glPointParameteriv, _gloffset_PointParameterivNV },
+   { "glSecondaryColor3b", (GLvoid *) glSecondaryColor3b, _gloffset_SecondaryColor3bEXT },
+   { "glSecondaryColor3bv", (GLvoid *) glSecondaryColor3bv, _gloffset_SecondaryColor3bvEXT },
+   { "glSecondaryColor3d", (GLvoid *) glSecondaryColor3d, _gloffset_SecondaryColor3dEXT },
+   { "glSecondaryColor3dv", (GLvoid *) glSecondaryColor3dv, _gloffset_SecondaryColor3dvEXT },
+   { "glSecondaryColor3f", (GLvoid *) glSecondaryColor3f, _gloffset_SecondaryColor3fEXT },
+   { "glSecondaryColor3fv", (GLvoid *) glSecondaryColor3fv, _gloffset_SecondaryColor3fvEXT },
+   { "glSecondaryColor3i", (GLvoid *) glSecondaryColor3i, _gloffset_SecondaryColor3iEXT },
+   { "glSecondaryColor3iv", (GLvoid *) glSecondaryColor3iv, _gloffset_SecondaryColor3ivEXT },
+   { "glSecondaryColor3s", (GLvoid *) glSecondaryColor3s, _gloffset_SecondaryColor3sEXT },
+   { "glSecondaryColor3sv", (GLvoid *) glSecondaryColor3sv, _gloffset_SecondaryColor3svEXT },
+   { "glSecondaryColor3ub", (GLvoid *) glSecondaryColor3ub, _gloffset_SecondaryColor3ubEXT },
+   { "glSecondaryColor3ubv", (GLvoid *) glSecondaryColor3ubv, _gloffset_SecondaryColor3ubvEXT },
+   { "glSecondaryColor3ui", (GLvoid *) glSecondaryColor3ui, _gloffset_SecondaryColor3uiEXT },
+   { "glSecondaryColor3uiv", (GLvoid *) glSecondaryColor3uiv, _gloffset_SecondaryColor3uivEXT },
+   { "glSecondaryColor3us", (GLvoid *) glSecondaryColor3us, _gloffset_SecondaryColor3usEXT },
+   { "glSecondaryColor3usv", (GLvoid *) glSecondaryColor3usv, _gloffset_SecondaryColor3usvEXT },
+   { "glSecondaryColorPointer", (GLvoid *) glSecondaryColorPointer, _gloffset_SecondaryColorPointerEXT },
+   { "glWindowPos2d", (GLvoid *) glWindowPos2d, _gloffset_WindowPos2dMESA },
+   { "glWindowPos2dv", (GLvoid *) glWindowPos2dv, _gloffset_WindowPos2dvMESA },
+   { "glWindowPos2f", (GLvoid *) glWindowPos2f, _gloffset_WindowPos2fMESA },
+   { "glWindowPos2fv", (GLvoid *) glWindowPos2fv, _gloffset_WindowPos2fvMESA },
+   { "glWindowPos2i", (GLvoid *) glWindowPos2i, _gloffset_WindowPos2iMESA },
+   { "glWindowPos2iv", (GLvoid *) glWindowPos2iv, _gloffset_WindowPos2ivMESA },
+   { "glWindowPos2s", (GLvoid *) glWindowPos2s, _gloffset_WindowPos2sMESA },
+   { "glWindowPos2sv", (GLvoid *) glWindowPos2sv, _gloffset_WindowPos2svMESA },
+   { "glWindowPos3d", (GLvoid *) glWindowPos3d, _gloffset_WindowPos3dMESA },
+   { "glWindowPos3dv", (GLvoid *) glWindowPos3dv, _gloffset_WindowPos3dvMESA },
+   { "glWindowPos3f", (GLvoid *) glWindowPos3f, _gloffset_WindowPos3fMESA },
+   { "glWindowPos3fv", (GLvoid *) glWindowPos3fv, _gloffset_WindowPos3fvMESA },
+   { "glWindowPos3i", (GLvoid *) glWindowPos3i, _gloffset_WindowPos3iMESA },
+   { "glWindowPos3iv", (GLvoid *) glWindowPos3iv, _gloffset_WindowPos3ivMESA },
+   { "glWindowPos3s", (GLvoid *) glWindowPos3s, _gloffset_WindowPos3sMESA },
+   { "glWindowPos3sv", (GLvoid *) glWindowPos3sv, _gloffset_WindowPos3svMESA },
+   { "glActiveStencilFaceEXT", (GLvoid *) glActiveStencilFaceEXT, _gloffset_ActiveStencilFaceEXT },
+   { "glDeleteFencesNV", (GLvoid *) glDeleteFencesNV, _gloffset_DeleteFencesNV },
+   { "glGenFencesNV", (GLvoid *) glGenFencesNV, _gloffset_GenFencesNV },
+   { "glIsFenceNV", (GLvoid *) glIsFenceNV, _gloffset_IsFenceNV },
+   { "glTestFenceNV", (GLvoid *) glTestFenceNV, _gloffset_TestFenceNV },
+   { "glGetFenceivNV", (GLvoid *) glGetFenceivNV, _gloffset_GetFenceivNV },
+   { "glFinishFenceNV", (GLvoid *) glFinishFenceNV, _gloffset_FinishFenceNV },
+   { "glSetFenceNV", (GLvoid *) glSetFenceNV, _gloffset_SetFenceNV },
+   { "glVertexAttrib1sARB", (GLvoid *) glVertexAttrib1sARB, _gloffset_VertexAttrib1sNV },
+   { "glVertexAttrib1fARB", (GLvoid *) glVertexAttrib1fARB, _gloffset_VertexAttrib1fNV },
+   { "glVertexAttrib1dARB", (GLvoid *) glVertexAttrib1dARB, _gloffset_VertexAttrib1dNV },
+   { "glVertexAttrib2sARB", (GLvoid *) glVertexAttrib2sARB, _gloffset_VertexAttrib2sNV },
+   { "glVertexAttrib2fARB", (GLvoid *) glVertexAttrib2fARB, _gloffset_VertexAttrib2fNV },
+   { "glVertexAttrib2dARB", (GLvoid *) glVertexAttrib2dARB, _gloffset_VertexAttrib2dNV },
+   { "glVertexAttrib3sARB", (GLvoid *) glVertexAttrib3sARB, _gloffset_VertexAttrib3sNV },
+   { "glVertexAttrib3fARB", (GLvoid *) glVertexAttrib3fARB, _gloffset_VertexAttrib3fNV },
+   { "glVertexAttrib3dARB", (GLvoid *) glVertexAttrib3dARB, _gloffset_VertexAttrib3dNV },
+   { "glVertexAttrib4sARB", (GLvoid *) glVertexAttrib4sARB, _gloffset_VertexAttrib4sNV },
+   { "glVertexAttrib4fARB", (GLvoid *) glVertexAttrib4fARB, _gloffset_VertexAttrib4fNV },
+   { "glVertexAttrib4dARB", (GLvoid *) glVertexAttrib4dARB, _gloffset_VertexAttrib4dNV },
+   { "glVertexAttrib4NubARB", (GLvoid *) glVertexAttrib4NubARB, _gloffset_VertexAttrib4ubNV },
+   { "glVertexAttrib1svARB", (GLvoid *) glVertexAttrib1svARB, _gloffset_VertexAttrib1svNV },
+   { "glVertexAttrib1fvARB", (GLvoid *) glVertexAttrib1fvARB, _gloffset_VertexAttrib1fvNV },
+   { "glVertexAttrib1dvARB", (GLvoid *) glVertexAttrib1dvARB, _gloffset_VertexAttrib1dvNV },
+   { "glVertexAttrib2svARB", (GLvoid *) glVertexAttrib2svARB, _gloffset_VertexAttrib2svNV },
+   { "glVertexAttrib2fvARB", (GLvoid *) glVertexAttrib2fvARB, _gloffset_VertexAttrib2fvNV },
+   { "glVertexAttrib2dvARB", (GLvoid *) glVertexAttrib2dvARB, _gloffset_VertexAttrib2dvNV },
+   { "glVertexAttrib3svARB", (GLvoid *) glVertexAttrib3svARB, _gloffset_VertexAttrib3svNV },
+   { "glVertexAttrib3fvARB", (GLvoid *) glVertexAttrib3fvARB, _gloffset_VertexAttrib3fvNV },
+   { "glVertexAttrib3dvARB", (GLvoid *) glVertexAttrib3dvARB, _gloffset_VertexAttrib3dvNV },
+   { "glVertexAttrib4bvARB", (GLvoid *) glVertexAttrib4bvARB, _gloffset_VertexAttrib4bvARB },
+   { "glVertexAttrib4svARB", (GLvoid *) glVertexAttrib4svARB, _gloffset_VertexAttrib4svNV },
+   { "glVertexAttrib4ivARB", (GLvoid *) glVertexAttrib4ivARB, _gloffset_VertexAttrib4ivARB },
+   { "glVertexAttrib4ubvARB", (GLvoid *) glVertexAttrib4ubvARB, _gloffset_VertexAttrib4ubvARB },
+   { "glVertexAttrib4usvARB", (GLvoid *) glVertexAttrib4usvARB, _gloffset_VertexAttrib4usvARB },
+   { "glVertexAttrib4uivARB", (GLvoid *) glVertexAttrib4uivARB, _gloffset_VertexAttrib4uivARB },
+   { "glVertexAttrib4fvARB", (GLvoid *) glVertexAttrib4fvARB, _gloffset_VertexAttrib4fvNV },
+   { "glVertexAttrib4dvARB", (GLvoid *) glVertexAttrib4dvARB, _gloffset_VertexAttrib4dvNV },
+   { "glVertexAttrib4NbvARB", (GLvoid *) glVertexAttrib4NbvARB, _gloffset_VertexAttrib4NbvARB },
+   { "glVertexAttrib4NsvARB", (GLvoid *) glVertexAttrib4NsvARB, _gloffset_VertexAttrib4NsvARB },
+   { "glVertexAttrib4NivARB", (GLvoid *) glVertexAttrib4NivARB, _gloffset_VertexAttrib4NivARB },
+   { "glVertexAttrib4NubvARB", (GLvoid *) glVertexAttrib4NubvARB, _gloffset_VertexAttrib4ubvNV },
+   { "glVertexAttrib4NusvARB", (GLvoid *) glVertexAttrib4NusvARB, _gloffset_VertexAttrib4NusvARB },
+   { "glVertexAttrib4NuivARB", (GLvoid *) glVertexAttrib4NuivARB, _gloffset_VertexAttrib4NuivARB },
+   { "glVertexAttribPointerARB", (GLvoid *) glVertexAttribPointerARB, _gloffset_VertexAttribPointerARB },
+   { "glEnableVertexAttribArrayARB", (GLvoid *) glEnableVertexAttribArrayARB, _gloffset_EnableVertexAttribArrayARB },
+   { "glDisableVertexAttribArrayARB", (GLvoid *) glDisableVertexAttribArrayARB, _gloffset_DisableVertexAttribArrayARB },
+   { "glProgramStringARB", (GLvoid *) glProgramStringARB, _gloffset_ProgramStringARB },
+   { "glBindProgramARB", (GLvoid *) glBindProgramARB, _gloffset_BindProgramNV },
+   { "glDeleteProgramsARB", (GLvoid *) glDeleteProgramsARB, _gloffset_DeleteProgramsNV },
+   { "glGenProgramsARB", (GLvoid *) glGenProgramsARB, _gloffset_GenProgramsNV },
+   { "glIsProgramARB", (GLvoid *) glIsProgramARB, _gloffset_IsProgramNV },
+   { "glProgramEnvParameter4dARB", (GLvoid *) glProgramEnvParameter4dARB, _gloffset_ProgramEnvParameter4dARB },
+   { "glProgramEnvParameter4dvARB", (GLvoid *) glProgramEnvParameter4dvARB, _gloffset_ProgramEnvParameter4dvARB },
+   { "glProgramEnvParameter4fARB", (GLvoid *) glProgramEnvParameter4fARB, _gloffset_ProgramEnvParameter4fARB },
+   { "glProgramEnvParameter4fvARB", (GLvoid *) glProgramEnvParameter4fvARB, _gloffset_ProgramEnvParameter4fvARB },
+   { "glProgramLocalParameter4dARB", (GLvoid *) glProgramLocalParameter4dARB, _gloffset_ProgramLocalParameter4dARB },
+   { "glProgramLocalParameter4dvARB", (GLvoid *) glProgramLocalParameter4dvARB, _gloffset_ProgramLocalParameter4dvARB },
+   { "glProgramLocalParameter4fARB", (GLvoid *) glProgramLocalParameter4fARB, _gloffset_ProgramLocalParameter4fARB },
+   { "glProgramLocalParameter4fvARB", (GLvoid *) glProgramLocalParameter4fvARB, _gloffset_ProgramLocalParameter4fvARB },
+   { "glGetProgramEnvParameterdvARB", (GLvoid *) glGetProgramEnvParameterdvARB, _gloffset_GetProgramEnvParameterdvARB },
+   { "glGetProgramEnvParameterfvARB", (GLvoid *) glGetProgramEnvParameterfvARB, _gloffset_GetProgramEnvParameterfvARB },
+   { "glGetProgramLocalParameterdvARB", (GLvoid *) glGetProgramLocalParameterdvARB, _gloffset_GetProgramLocalParameterdvARB },
+   { "glGetProgramLocalParameterfvARB", (GLvoid *) glGetProgramLocalParameterfvARB, _gloffset_GetProgramLocalParameterfvARB },
+   { "glGetProgramivARB", (GLvoid *) glGetProgramivARB, _gloffset_GetProgramivARB },
+   { "glGetProgramStringARB", (GLvoid *) glGetProgramStringARB, _gloffset_GetProgramStringARB },
+   { "glGetVertexAttribdvARB", (GLvoid *) glGetVertexAttribdvARB, _gloffset_GetVertexAttribdvNV },
+   { "glGetVertexAttribfvARB", (GLvoid *) glGetVertexAttribfvARB, _gloffset_GetVertexAttribfvNV },
+   { "glGetVertexAttribivARB", (GLvoid *) glGetVertexAttribivARB, _gloffset_GetVertexAttribivNV },
+   { "glGetVertexAttribPointervARB", (GLvoid *) glGetVertexAttribPointervARB, _gloffset_GetVertexAttribPointervNV },
+   { "glProgramNamedParameter4fNV", (GLvoid *) glProgramNamedParameter4fNV, _gloffset_ProgramNamedParameter4fNV },
+   { "glProgramNamedParameter4dNV", (GLvoid *) glProgramNamedParameter4dNV, _gloffset_ProgramNamedParameter4dNV },
+   { "glProgramNamedParameter4fvNV", (GLvoid *) glProgramNamedParameter4fvNV, _gloffset_ProgramNamedParameter4fvNV },
+   { "glProgramNamedParameter4dvNV", (GLvoid *) glProgramNamedParameter4dvNV, _gloffset_ProgramNamedParameter4dvNV },
+   { "glGetProgramNamedParameterfvNV", (GLvoid *) glGetProgramNamedParameterfvNV, _gloffset_GetProgramNamedParameterfvNV },
+   { "glGetProgramNamedParameterdvNV", (GLvoid *) glGetProgramNamedParameterdvNV, _gloffset_GetProgramNamedParameterdvNV },
+   { "glBindBufferARB", (GLvoid *) glBindBufferARB, _gloffset_BindBufferARB },
+   { "glBufferDataARB", (GLvoid *) glBufferDataARB, _gloffset_BufferDataARB },
+   { "glBufferSubDataARB", (GLvoid *) glBufferSubDataARB, _gloffset_BufferSubDataARB },
+   { "glDeleteBuffersARB", (GLvoid *) glDeleteBuffersARB, _gloffset_DeleteBuffersARB },
+   { "glGenBuffersARB", (GLvoid *) glGenBuffersARB, _gloffset_GenBuffersARB },
+   { "glGetBufferParameterivARB", (GLvoid *) glGetBufferParameterivARB, _gloffset_GetBufferParameterivARB },
+   { "glGetBufferPointervARB", (GLvoid *) glGetBufferPointervARB, _gloffset_GetBufferPointervARB },
+   { "glGetBufferSubDataARB", (GLvoid *) glGetBufferSubDataARB, _gloffset_GetBufferSubDataARB },
+   { "glIsBufferARB", (GLvoid *) glIsBufferARB, _gloffset_IsBufferARB },
+   { "glMapBufferARB", (GLvoid *) glMapBufferARB, _gloffset_MapBufferARB },
+   { "glUnmapBufferARB", (GLvoid *) glUnmapBufferARB, _gloffset_UnmapBufferARB },
+   { "glDepthBoundsEXT", (GLvoid *) glDepthBoundsEXT, _gloffset_DepthBoundsEXT },
+   { "glGenQueriesARB", (GLvoid *) glGenQueriesARB, _gloffset_GenQueriesARB },
+   { "glDeleteQueriesARB", (GLvoid *) glDeleteQueriesARB, _gloffset_DeleteQueriesARB },
+   { "glIsQueryARB", (GLvoid *) glIsQueryARB, _gloffset_IsQueryARB },
+   { "glBeginQueryARB", (GLvoid *) glBeginQueryARB, _gloffset_BeginQueryARB },
+   { "glEndQueryARB", (GLvoid *) glEndQueryARB, _gloffset_EndQueryARB },
+   { "glGetQueryivARB", (GLvoid *) glGetQueryivARB, _gloffset_GetQueryivARB },
+   { "glGetQueryObjectivARB", (GLvoid *) glGetQueryObjectivARB, _gloffset_GetQueryObjectivARB },
+   { "glGetQueryObjectuivARB", (GLvoid *) glGetQueryObjectuivARB, _gloffset_GetQueryObjectuivARB },
+   { "glBindBuffer", (GLvoid *) glBindBuffer, _gloffset_BindBufferARB },
+   { "glBufferData", (GLvoid *) glBufferData, _gloffset_BufferDataARB },
+   { "glBufferSubData", (GLvoid *) glBufferSubData, _gloffset_BufferSubDataARB },
+   { "glDeleteBuffers", (GLvoid *) glDeleteBuffers, _gloffset_DeleteBuffersARB },
+   { "glGenBuffers", (GLvoid *) glGenBuffers, _gloffset_GenBuffersARB },
+   { "glGetBufferParameteriv", (GLvoid *) glGetBufferParameteriv, _gloffset_GetBufferParameterivARB },
+   { "glGetBufferPointerv", (GLvoid *) glGetBufferPointerv, _gloffset_GetBufferPointervARB },
+   { "glGetBufferSubData", (GLvoid *) glGetBufferSubData, _gloffset_GetBufferSubDataARB },
+   { "glIsBuffer", (GLvoid *) glIsBuffer, _gloffset_IsBufferARB },
+   { "glMapBuffer", (GLvoid *) glMapBuffer, _gloffset_MapBufferARB },
+   { "glUnmapBuffer", (GLvoid *) glUnmapBuffer, _gloffset_UnmapBufferARB },
+   { "glGenQueries", (GLvoid *) glGenQueries, _gloffset_GenQueriesARB },
+   { "glDeleteQueries", (GLvoid *) glDeleteQueries, _gloffset_DeleteQueriesARB },
+   { "glIsQuery", (GLvoid *) glIsQuery, _gloffset_IsQueryARB },
+   { "glBeginQuery", (GLvoid *) glBeginQuery, _gloffset_BeginQueryARB },
+   { "glEndQuery", (GLvoid *) glEndQuery, _gloffset_EndQueryARB },
+   { "glGetQueryiv", (GLvoid *) glGetQueryiv, _gloffset_GetQueryivARB },
+   { "glGetQueryObjectiv", (GLvoid *) glGetQueryObjectiv, _gloffset_GetQueryObjectivARB },
+   { "glGetQueryObjectuiv", (GLvoid *) glGetQueryObjectuiv, _gloffset_GetQueryObjectuivARB },
+   { NULL, NULL }  /* end of list marker */
+};
diff --git a/reactos/lib/mesa32/src/glapi/glthread.c b/reactos/lib/mesa32/src/glapi/glthread.c
new file mode 100644
index 00000000000..5fa8313975c
--- /dev/null
+++ b/reactos/lib/mesa32/src/glapi/glthread.c
@@ -0,0 +1,367 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * XXX There's probably some work to do in order to make this file
+ * truly reusable outside of Mesa.  First, the glheader.h include must go.
+ */
+
+
+#include "glheader.h"
+#include "glthread.h"
+
+
+/*
+ * This file should still compile even when THREADS is not defined.
+ * This is to make things easier to deal with on the makefile scene..
+ */
+#ifdef THREADS
+#include <errno.h>
+
+/*
+ * Error messages
+ */
+#define INIT_TSD_ERROR "_glthread_: failed to allocate key for thread specific data"
+#define GET_TSD_ERROR "_glthread_: failed to get thread specific data"
+#define SET_TSD_ERROR "_glthread_: thread failed to set thread specific data"
+
+
+/*
+ * Magic number to determine if a TSD object has been initialized.
+ * Kind of a hack but there doesn't appear to be a better cross-platform
+ * solution.
+ */
+#define INIT_MAGIC 0xff8adc98
+
+
+
+/*
+ * POSIX Threads -- The best way to go if your platform supports them.
+ *                  Solaris >= 2.5 have POSIX threads, IRIX >= 6.4 reportedly
+ *                  has them, and many of the free Unixes now have them.
+ *                  Be sure to use appropriate -mt or -D_REENTRANT type
+ *                  compile flags when building.
+ */
+#ifdef PTHREADS
+
+unsigned long
+_glthread_GetID(void)
+{
+   return (unsigned long) pthread_self();
+}
+
+
+void
+_glthread_InitTSD(_glthread_TSD *tsd)
+{
+   if (pthread_key_create(&tsd->key, NULL/*free*/) != 0) {
+      perror(INIT_TSD_ERROR);
+      exit(-1);
+   }
+   tsd->initMagic = INIT_MAGIC;
+}
+
+
+void *
+_glthread_GetTSD(_glthread_TSD *tsd)
+{
+   if (tsd->initMagic != (int) INIT_MAGIC) {
+      _glthread_InitTSD(tsd);
+   }
+   return pthread_getspecific(tsd->key);
+}
+
+
+void
+_glthread_SetTSD(_glthread_TSD *tsd, void *ptr)
+{
+   if (tsd->initMagic != (int) INIT_MAGIC) {
+      _glthread_InitTSD(tsd);
+   }
+   if (pthread_setspecific(tsd->key, ptr) != 0) {
+      perror(SET_TSD_ERROR);
+      exit(-1);
+   }
+}
+
+#endif /* PTHREADS */
+
+
+
+/*
+ * Solaris/Unix International Threads -- Use only if POSIX threads
+ *   aren't available on your Unix platform.  Solaris 2.[34] are examples
+ *   of platforms where this is the case.  Be sure to use -mt and/or
+ *   -D_REENTRANT when compiling.
+ */
+#ifdef SOLARIS_THREADS
+#define USE_LOCK_FOR_KEY	/* undef this to try a version without
+				   lock for the global key... */
+
+unsigned long
+_glthread_GetID(void)
+{
+   abort();   /* XXX not implemented yet */
+   return (unsigned long) 0;
+}
+
+
+void
+_glthread_InitTSD(_glthread_TSD *tsd)
+{
+   if ((errno = mutex_init(&tsd->keylock, 0, NULL)) != 0 ||
+      (errno = thr_keycreate(&(tsd->key), free)) != 0) {
+      perror(INIT_TSD_ERROR);
+      exit(-1);
+   }
+   tsd->initMagic = INIT_MAGIC;
+}
+
+
+void *
+_glthread_GetTSD(_glthread_TSD *tsd)
+{
+   void* ret;
+   if (tsd->initMagic != INIT_MAGIC) {
+      _glthread_InitTSD(tsd);
+   }
+#ifdef USE_LOCK_FOR_KEY
+   mutex_lock(&tsd->keylock);
+   thr_getspecific(tsd->key, &ret);
+   mutex_unlock(&tsd->keylock);
+#else
+   if ((errno = thr_getspecific(tsd->key, &ret)) != 0) {
+      perror(GET_TSD_ERROR);
+      exit(-1);
+   }
+#endif
+   return ret;
+}
+
+
+void
+_glthread_SetTSD(_glthread_TSD *tsd, void *ptr)
+{
+   if (tsd->initMagic != INIT_MAGIC) {
+      _glthread_InitTSD(tsd);
+   }
+   if ((errno = thr_setspecific(tsd->key, ptr)) != 0) {
+      perror(SET_TSD_ERROR);
+      exit(-1);
+   }
+}
+
+#undef USE_LOCK_FOR_KEY
+#endif /* SOLARIS_THREADS */
+
+
+
+/*
+ * Win32 Threads.  The only available option for Windows 95/NT.
+ * Be sure that you compile using the Multithreaded runtime, otherwise
+ * bad things will happen.
+ */
+#ifdef WIN32_THREADS
+
+unsigned long
+_glthread_GetID(void)
+{
+   abort();   /* XXX not implemented yet */
+   return (unsigned long) 0;
+}
+
+
+void
+_glthread_InitTSD(_glthread_TSD *tsd)
+{
+   tsd->key = TlsAlloc();
+   if (tsd->key == 0xffffffff) {
+      /* Can Windows handle stderr messages for non-console
+         applications? Does Windows have perror? */
+      /* perror(SET_INIT_ERROR);*/
+      exit(-1);
+   }
+   tsd->initMagic = INIT_MAGIC;
+}
+
+
+void *
+_glthread_GetTSD(_glthread_TSD *tsd)
+{
+   if (tsd->initMagic != INIT_MAGIC) {
+      _glthread_InitTSD(tsd);
+   }
+   return TlsGetValue(tsd->key);
+}
+
+
+void
+_glthread_SetTSD(_glthread_TSD *tsd, void *ptr)
+{
+   /* the following code assumes that the _glthread_TSD has been initialized
+      to zero at creation */
+   if (tsd->initMagic != INIT_MAGIC) {
+      _glthread_InitTSD(tsd);
+   }
+   if (TlsSetValue(tsd->key, ptr) == 0) {
+      /* Can Windows handle stderr messages for non-console
+         applications? Does Windows have perror? */
+      /* perror(SET_TSD_ERROR);*/
+      exit(-1);
+   }
+}
+
+#endif /* WIN32_THREADS */
+
+
+
+/*
+ * XFree86 has its own thread wrapper, Xthreads.h
+ * We wrap it again for GL.
+ */
+#ifdef XTHREADS
+
+unsigned long
+_glthread_GetID(void)
+{
+   return (unsigned long) xthread_self();
+}
+
+
+void
+_glthread_InitTSD(_glthread_TSD *tsd)
+{
+   if (xthread_key_create(&tsd->key, NULL) != 0) {
+      perror(INIT_TSD_ERROR);
+      exit(-1);
+   }
+   tsd->initMagic = INIT_MAGIC;
+}
+
+
+void *
+_glthread_GetTSD(_glthread_TSD *tsd)
+{
+   void *ptr;
+   if (tsd->initMagic != INIT_MAGIC) {
+      _glthread_InitTSD(tsd);
+   }
+   xthread_get_specific(tsd->key, &ptr);
+   return ptr;
+}
+
+
+void
+_glthread_SetTSD(_glthread_TSD *tsd, void *ptr)
+{
+   if (tsd->initMagic != INIT_MAGIC) {
+      _glthread_InitTSD(tsd);
+   }
+   xthread_set_specific(tsd->key, ptr);
+}
+
+#endif /* XTHREAD */
+
+
+
+/*
+ * BeOS threads
+ */
+#ifdef BEOS_THREADS
+
+unsigned long
+_glthread_GetID(void)
+{
+   return (unsigned long) find_thread(NULL);
+}
+
+void
+_glthread_InitTSD(_glthread_TSD *tsd)
+{
+   tsd->key = tls_allocate();
+   tsd->initMagic = INIT_MAGIC;
+}
+
+void *
+_glthread_GetTSD(_glthread_TSD *tsd)
+{
+   if (tsd->initMagic != (int) INIT_MAGIC) {
+      _glthread_InitTSD(tsd);
+   }
+   return tls_get(tsd->key);
+}
+
+void
+_glthread_SetTSD(_glthread_TSD *tsd, void *ptr)
+{
+   if (tsd->initMagic != (int) INIT_MAGIC) {
+      _glthread_InitTSD(tsd);
+   }
+   tls_set(tsd->key, ptr);
+}
+
+#endif /* BEOS_THREADS */
+
+
+
+#else  /* THREADS */
+
+
+/*
+ * no-op functions
+ */
+
+unsigned long
+_glthread_GetID(void)
+{
+   return 0;
+}
+
+
+void
+_glthread_InitTSD(_glthread_TSD *tsd)
+{
+   (void) tsd;
+}
+
+
+void *
+_glthread_GetTSD(_glthread_TSD *tsd)
+{
+   (void) tsd;
+   return NULL;
+}
+
+
+void
+_glthread_SetTSD(_glthread_TSD *tsd, void *ptr)
+{
+   (void) tsd;
+   (void) ptr;
+}
+
+
+#endif /* THREADS */
diff --git a/reactos/lib/mesa32/src/glapi/glthread.h b/reactos/lib/mesa32/src/glapi/glthread.h
new file mode 100644
index 00000000000..00710c1058e
--- /dev/null
+++ b/reactos/lib/mesa32/src/glapi/glthread.h
@@ -0,0 +1,295 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * Thread support for gl dispatch.
+ *
+ * Initial version by John Stone (j.stone@acm.org) (johns@cs.umr.edu)
+ *                and Christoph Poliwoda (poliwoda@volumegraphics.com)
+ * Revised by Keith Whitwell
+ * Adapted for new gl dispatcher by Brian Paul
+ *
+ *
+ *
+ * DOCUMENTATION
+ *
+ * This thread module exports the following types:
+ *   _glthread_TSD     Thread-specific data area
+ *   _glthread_Thread  Thread datatype
+ *   _glthread_Mutex   Mutual exclusion lock
+ *
+ * Macros:
+ *   _glthread_DECLARE_STATIC_MUTEX(name)   Declare a non-local mutex
+ *   _glthread_INIT_MUTEX(name)             Initialize a mutex
+ *   _glthread_LOCK_MUTEX(name)             Lock a mutex
+ *   _glthread_UNLOCK_MUTEX(name)           Unlock a mutex
+ *
+ * Functions:
+ *   _glthread_GetID(v)      Get integer thread ID
+ *   _glthread_InitTSD()     Initialize thread-specific data
+ *   _glthread_GetTSD()      Get thread-specific data
+ *   _glthread_SetTSD()      Set thread-specific data
+ *
+ */
+
+/*
+ * If this file is accidentally included by a non-threaded build,
+ * it should not cause the build to fail, or otherwise cause problems.
+ * In general, it should only be included when needed however.
+ */
+
+#ifndef GLTHREAD_H
+#define GLTHREAD_H
+
+
+#if defined(PTHREADS) || defined(SOLARIS_THREADS) || defined(WIN32_THREADS) || defined(XTHREADS)
+#define THREADS
+#endif
+
+#ifdef VMS
+#include <GL/vms_x_fix.h>
+#endif
+
+/*
+ * POSIX threads. This should be your choice in the Unix world
+ * whenever possible.  When building with POSIX threads, be sure
+ * to enable any compiler flags which will cause the MT-safe
+ * libc (if one exists) to be used when linking, as well as any
+ * header macros for MT-safe errno, etc.  For Solaris, this is the -mt
+ * compiler flag.  On Solaris with gcc, use -D_REENTRANT to enable
+ * proper compiling for MT-safe libc etc.
+ */
+#if defined(PTHREADS)
+#include <pthread.h> /* POSIX threads headers */
+
+typedef struct {
+   pthread_key_t  key;
+   int initMagic;
+} _glthread_TSD;
+
+typedef pthread_t _glthread_Thread;
+
+typedef pthread_mutex_t _glthread_Mutex;
+
+#define _glthread_DECLARE_STATIC_MUTEX(name) \
+   static _glthread_Mutex name = PTHREAD_MUTEX_INITIALIZER
+
+#define _glthread_INIT_MUTEX(name) \
+   pthread_mutex_init(&(name), NULL)
+
+#define _glthread_DESTROY_MUTEX(name) \
+   pthread_mutex_destroy(&(name))
+
+#define _glthread_LOCK_MUTEX(name) \
+   (void) pthread_mutex_lock(&(name))
+
+#define _glthread_UNLOCK_MUTEX(name) \
+   (void) pthread_mutex_unlock(&(name))
+
+#endif /* PTHREADS */
+
+
+
+
+/*
+ * Solaris threads. Use only up to Solaris 2.4.
+ * Solaris 2.5 and higher provide POSIX threads.
+ * Be sure to compile with -mt on the Solaris compilers, or
+ * use -D_REENTRANT if using gcc.
+ */
+#ifdef SOLARIS_THREADS
+#include <thread.h>
+
+typedef struct {
+   thread_key_t key;
+   mutex_t      keylock;
+   int          initMagic;
+} _glthread_TSD;
+
+typedef thread_t _glthread_Thread;
+
+typedef mutex_t _glthread_Mutex;
+
+/* XXX need to really implement mutex-related macros */
+#define _glthread_DECLARE_STATIC_MUTEX(name)  static _glthread_Mutex name = 0
+#define _glthread_INIT_MUTEX(name)  (void) name
+#define _glthread_DESTROY_MUTEX(name) (void) name
+#define _glthread_LOCK_MUTEX(name)  (void) name
+#define _glthread_UNLOCK_MUTEX(name)  (void) name
+
+#endif /* SOLARIS_THREADS */
+
+
+
+
+/*
+ * Windows threads. Should work with Windows NT and 95.
+ * IMPORTANT: Link with multithreaded runtime library when THREADS are
+ * used!
+ */
+#ifdef WIN32_THREADS
+#include <windows.h>
+
+typedef struct {
+   DWORD key;
+   int   initMagic;
+} _glthread_TSD;
+
+typedef HANDLE _glthread_Thread;
+
+typedef CRITICAL_SECTION _glthread_Mutex;
+
+/* XXX need to really implement mutex-related macros */
+#define _glthread_DECLARE_STATIC_MUTEX(name)  static _glthread_Mutex name = 0
+#define _glthread_INIT_MUTEX(name)  (void) name
+#define _glthread_DESTROY_MUTEX(name)  (void) name
+#define _glthread_LOCK_MUTEX(name)  (void) name
+#define _glthread_UNLOCK_MUTEX(name)  (void) name
+
+#endif /* WIN32_THREADS */
+
+
+
+
+/*
+ * XFree86 has its own thread wrapper, Xthreads.h
+ * We wrap it again for GL.
+ */
+#ifdef XTHREADS
+#include "Xthreads.h"
+
+typedef struct {
+   xthread_key_t key;
+   int initMagic;
+} _glthread_TSD;
+
+typedef xthread_t _glthread_Thread;
+
+typedef xmutex_rec _glthread_Mutex;
+
+#ifdef XMUTEX_INITIALIZER
+#define _glthread_DECLARE_STATIC_MUTEX(name) \
+   static _glthread_Mutex name = XMUTEX_INITIALIZER
+#else
+#define _glthread_DECLARE_STATIC_MUTEX(name) \
+   static _glthread_Mutex name
+#endif
+
+#define _glthread_INIT_MUTEX(name) \
+   xmutex_init(&(name))
+
+#define _glthread_DESTROY_MUTEX(name) \
+   xmutex_clear(&(name))
+
+#define _glthread_LOCK_MUTEX(name) \
+   (void) xmutex_lock(&(name))
+
+#define _glthread_UNLOCK_MUTEX(name) \
+   (void) xmutex_unlock(&(name))
+
+#endif /* XTHREADS */
+
+
+
+/*
+ * BeOS threads. R5.x required.
+ */
+#ifdef BEOS_THREADS
+#include <kernel/OS.h>
+#include <support/TLS.h>
+
+typedef struct {
+   int32        key;
+   int          initMagic;
+} _glthread_TSD;
+
+typedef thread_id _glthread_Thread;
+
+/* Use Benaphore, aka speeder semaphore */
+typedef struct {
+    int32   lock;
+    sem_id  sem;
+} benaphore;
+typedef benaphore _glthread_Mutex;
+
+#define _glthread_DECLARE_STATIC_MUTEX(name)  static _glthread_Mutex name = { 0,
+create_sem(0, #name"_benaphore") }
+#define _glthread_INIT_MUTEX(name)    name.sem = create_sem(0, #name"_benaphore"), name.lock = 0
+#define _glthread_LOCK_MUTEX(name)    if((atomic_add(&(name.lock), 1)) >= 1) acquire_sem(name.sem)
+#define _glthread_UNLOCK_MUTEX(name)  if((atomic_add(&(name.lock), -1)) > 1) release_sem(name.sem)
+
+#endif /* BEOS_THREADS */
+
+
+
+#ifndef THREADS
+
+/*
+ * THREADS not defined
+ */
+
+typedef GLuint _glthread_TSD;
+
+typedef GLuint _glthread_Thread;
+
+typedef GLuint _glthread_Mutex;
+
+#define _glthread_DECLARE_STATIC_MUTEX(name)  static _glthread_Mutex name = 0
+
+#define _glthread_INIT_MUTEX(name)  (void) name
+
+#define _glthread_DESTROY_MUTEX(name)  (void) name
+
+#define _glthread_LOCK_MUTEX(name)  (void) name
+
+#define _glthread_UNLOCK_MUTEX(name)  (void) name
+
+#endif /* THREADS */
+
+
+
+/*
+ * Platform independent thread specific data API.
+ */
+
+extern unsigned long
+_glthread_GetID(void);
+
+
+extern void
+_glthread_InitTSD(_glthread_TSD *);
+
+
+extern void *
+_glthread_GetTSD(_glthread_TSD *);
+
+
+extern void
+_glthread_SetTSD(_glthread_TSD *, void *);
+
+
+
+#endif /* THREADS_H */
diff --git a/reactos/lib/mesa32/src/main/accum.c b/reactos/lib/mesa32/src/main/accum.c
new file mode 100644
index 00000000000..315bd33b61d
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/accum.c
@@ -0,0 +1,97 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "glheader.h"
+#include "accum.h"
+#include "context.h"
+#include "imports.h"
+#include "macros.h"
+#include "state.h"
+#include "mtypes.h"
+
+
+void GLAPIENTRY
+_mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha )
+{
+   GLfloat tmp[4];
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   tmp[0] = CLAMP( red,   -1.0F, 1.0F );
+   tmp[1] = CLAMP( green, -1.0F, 1.0F );
+   tmp[2] = CLAMP( blue,  -1.0F, 1.0F );
+   tmp[3] = CLAMP( alpha, -1.0F, 1.0F );
+
+   if (TEST_EQ_4V(tmp, ctx->Accum.ClearColor))
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_ACCUM);
+   COPY_4FV( ctx->Accum.ClearColor, tmp );
+}
+
+
+void GLAPIENTRY
+_mesa_Accum( GLenum op, GLfloat value )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint xpos, ypos, width, height;
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (ctx->Visual.accumRedBits == 0 || ctx->DrawBuffer != ctx->ReadBuffer) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glAccum");
+      return;
+   }
+
+   if (ctx->NewState)
+      _mesa_update_state( ctx );
+
+   if (ctx->RenderMode != GL_RENDER) {
+      /* no-op */
+      return;
+   }
+
+   /* Determine region to operate upon. */
+   if (ctx->Scissor.Enabled) {
+      xpos = ctx->Scissor.X;
+      ypos = ctx->Scissor.Y;
+      width = ctx->Scissor.Width;
+      height = ctx->Scissor.Height;
+   }
+   else {
+      /* whole window */
+      xpos = 0;
+      ypos = 0;
+      width = ctx->DrawBuffer->Width;
+      height = ctx->DrawBuffer->Height;
+   }
+
+   ctx->Driver.Accum( ctx, op, value, xpos, ypos, width, height );
+}
+
+void 
+_mesa_init_accum( GLcontext *ctx )
+{
+   /* Accumulate buffer group */
+   ASSIGN_4V( ctx->Accum.ClearColor, 0.0, 0.0, 0.0, 0.0 );
+}
diff --git a/reactos/lib/mesa32/src/main/accum.h b/reactos/lib/mesa32/src/main/accum.h
new file mode 100644
index 00000000000..ce92688a5b9
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/accum.h
@@ -0,0 +1,62 @@
+/**
+ * \file accum.h
+ * Accumulation buffer operations.
+ * 
+ * \if subset
+ * (No-op)
+ *
+ * \endif
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+
+#ifndef ACCUM_H
+#define ACCUM_H
+
+
+#include "mtypes.h"
+
+#if _HAVE_FULL_GL
+
+extern void GLAPIENTRY
+_mesa_Accum( GLenum op, GLfloat value );
+
+
+extern void GLAPIENTRY
+_mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha );
+
+extern void 
+_mesa_init_accum( GLcontext *ctx );
+
+#else
+
+/** No-op */
+#define _mesa_init_accum( c ) ((void)0)
+
+#endif
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/api_arrayelt.c b/reactos/lib/mesa32/src/main/api_arrayelt.c
new file mode 100644
index 00000000000..8aa8da69762
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/api_arrayelt.c
@@ -0,0 +1,830 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.1
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/* Author:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+#include "glheader.h"
+#include "api_arrayelt.h"
+#include "context.h"
+#include "glapi.h"
+#include "imports.h"
+#include "macros.h"
+#include "mtypes.h"
+
+typedef void (GLAPIENTRY *array_func)( const void * );
+
+typedef struct {
+   const struct gl_client_array *array;
+   array_func func;
+} AEarray;
+
+typedef void (GLAPIENTRY *attrib_func)( GLuint indx, const void *data );
+
+typedef struct {
+   const struct gl_client_array *array;
+   attrib_func func;
+   GLuint index;
+} AEattrib;
+
+typedef struct {
+   AEarray arrays[32];
+   AEattrib attribs[VERT_ATTRIB_MAX + 1];
+   GLuint NewState;
+} AEcontext;
+
+#define AE_CONTEXT(ctx) ((AEcontext *)(ctx)->aelt_context)
+
+/*
+ * Convert GL_BYTE, GL_UNSIGNED_BYTE, .. GL_DOUBLE into an integer
+ * in the range [0, 7].  Luckily these type tokens are sequentially
+ * numbered in gl.h
+ */
+#define TYPE_IDX(t) ((t) & 0xf)
+
+
+static array_func colorfuncs[2][8] = {
+   { (array_func)glColor3bv,
+     (array_func)glColor3ubv,
+     (array_func)glColor3sv,
+     (array_func)glColor3usv,
+     (array_func)glColor3iv,
+     (array_func)glColor3uiv,
+     (array_func)glColor3fv,
+     (array_func)glColor3dv },
+
+   { (array_func)glColor4bv,
+     (array_func)glColor4ubv,
+     (array_func)glColor4sv,
+     (array_func)glColor4usv,
+     (array_func)glColor4iv,
+     (array_func)glColor4uiv,
+     (array_func)glColor4fv,
+     (array_func)glColor4dv }
+};
+
+static array_func vertexfuncs[3][8] = {
+   { 0,
+     0,
+     (array_func)glVertex2sv,
+     0,
+     (array_func)glVertex2iv,
+     0,
+     (array_func)glVertex2fv,
+     (array_func)glVertex2dv },
+
+   { 0,
+     0,
+     (array_func)glVertex3sv,
+     0,
+     (array_func)glVertex3iv,
+     0,
+     (array_func)glVertex3fv,
+     (array_func)glVertex3dv },
+
+   { 0,
+     0,
+     (array_func)glVertex4sv,
+     0,
+     (array_func)glVertex4iv,
+     0,
+     (array_func)glVertex4fv,
+     (array_func)glVertex4dv }
+};
+
+static array_func indexfuncs[8] = {
+   0,
+   (array_func)glIndexubv,
+   (array_func)glIndexsv,
+   0,
+   (array_func)glIndexiv,
+   0,
+   (array_func)glIndexfv,
+   (array_func)glIndexdv
+};
+
+static array_func normalfuncs[8] = {
+   (array_func)glNormal3bv,
+   0,
+   (array_func)glNormal3sv,
+   0,
+   (array_func)glNormal3iv,
+   0,
+   (array_func)glNormal3fv,
+   (array_func)glNormal3dv,
+};
+
+
+/* Wrapper functions in case glSecondaryColor*EXT doesn't exist */
+static void GLAPIENTRY SecondaryColor3bvEXT(const GLbyte *c)
+{
+   _glapi_Dispatch->SecondaryColor3bvEXT(c);
+}
+
+static void GLAPIENTRY SecondaryColor3ubvEXT(const GLubyte *c)
+{
+   _glapi_Dispatch->SecondaryColor3ubvEXT(c);
+}
+
+static void GLAPIENTRY SecondaryColor3svEXT(const GLshort *c)
+{
+   _glapi_Dispatch->SecondaryColor3svEXT(c);
+}
+
+static void GLAPIENTRY SecondaryColor3usvEXT(const GLushort *c)
+{
+   _glapi_Dispatch->SecondaryColor3usvEXT(c);
+}
+
+static void GLAPIENTRY SecondaryColor3ivEXT(const GLint *c)
+{
+   _glapi_Dispatch->SecondaryColor3ivEXT(c);
+}
+
+static void GLAPIENTRY SecondaryColor3uivEXT(const GLuint *c)
+{
+   _glapi_Dispatch->SecondaryColor3uivEXT(c);
+}
+
+static void GLAPIENTRY SecondaryColor3fvEXT(const GLfloat *c)
+{
+   _glapi_Dispatch->SecondaryColor3fvEXT(c);
+}
+
+static void GLAPIENTRY SecondaryColor3dvEXT(const GLdouble *c)
+{
+   _glapi_Dispatch->SecondaryColor3dvEXT(c);
+}
+
+static array_func secondarycolorfuncs[8] = {
+   (array_func) SecondaryColor3bvEXT,
+   (array_func) SecondaryColor3ubvEXT,
+   (array_func) SecondaryColor3svEXT,
+   (array_func) SecondaryColor3usvEXT,
+   (array_func) SecondaryColor3ivEXT,
+   (array_func) SecondaryColor3uivEXT,
+   (array_func) SecondaryColor3fvEXT,
+   (array_func) SecondaryColor3dvEXT,
+};
+
+
+/* Again, wrapper functions in case glSecondaryColor*EXT doesn't exist */
+static void GLAPIENTRY FogCoordfvEXT(const GLfloat *f)
+{
+   _glapi_Dispatch->FogCoordfvEXT(f);
+}
+
+static void GLAPIENTRY FogCoorddvEXT(const GLdouble *f)
+{
+   _glapi_Dispatch->FogCoorddvEXT(f);
+}
+
+static array_func fogcoordfuncs[8] = {
+   0,
+   0,
+   0,
+   0,
+   0,
+   0,
+   (array_func) FogCoordfvEXT,
+   (array_func) FogCoorddvEXT
+};
+
+
+/**********************************************************************/
+
+/* GL_BYTE attributes */
+
+static void GLAPIENTRY VertexAttrib1Nbv(GLuint index, const GLbyte *v)
+{
+   _glapi_Dispatch->VertexAttrib1fNV(index, BYTE_TO_FLOAT(v[0]));
+}
+
+static void GLAPIENTRY VertexAttrib1bv(GLuint index, const GLbyte *v)
+{
+      _glapi_Dispatch->VertexAttrib1fNV(index, v[0]);
+}
+
+static void GLAPIENTRY VertexAttrib2Nbv(GLuint index, const GLbyte *v)
+{
+   _glapi_Dispatch->VertexAttrib2fNV(index, BYTE_TO_FLOAT(v[0]),
+                                     BYTE_TO_FLOAT(v[1]));
+}
+
+static void GLAPIENTRY VertexAttrib2bv(GLuint index, const GLbyte *v)
+{
+   _glapi_Dispatch->VertexAttrib2fNV(index, v[0], v[1]);
+}
+
+static void GLAPIENTRY VertexAttrib3Nbv(GLuint index, const GLbyte *v)
+{
+   _glapi_Dispatch->VertexAttrib3fNV(index, BYTE_TO_FLOAT(v[0]),
+                                     BYTE_TO_FLOAT(v[1]),
+                                     BYTE_TO_FLOAT(v[2]));
+}
+
+static void GLAPIENTRY VertexAttrib3bv(GLuint index, const GLbyte *v)
+{
+   _glapi_Dispatch->VertexAttrib3fNV(index, v[0], v[1], v[2]);
+}
+
+static void GLAPIENTRY VertexAttrib4Nbv(GLuint index, const GLbyte *v)
+{
+   _glapi_Dispatch->VertexAttrib4fNV(index, BYTE_TO_FLOAT(v[0]),
+                                     BYTE_TO_FLOAT(v[1]),
+                                     BYTE_TO_FLOAT(v[2]),
+                                     BYTE_TO_FLOAT(v[3]));
+}
+
+static void GLAPIENTRY VertexAttrib4bv(GLuint index, const GLbyte *v)
+{
+   _glapi_Dispatch->VertexAttrib4fNV(index, v[0], v[1], v[2], v[3]);
+}
+
+/* GL_UNSIGNED_BYTE attributes */
+
+static void GLAPIENTRY VertexAttrib1Nubv(GLuint index, const GLubyte *v)
+{
+   _glapi_Dispatch->VertexAttrib1fNV(index, UBYTE_TO_FLOAT(v[0]));
+}
+
+static void GLAPIENTRY VertexAttrib1ubv(GLuint index, const GLubyte *v)
+{
+   _glapi_Dispatch->VertexAttrib1fNV(index, v[0]);
+}
+
+static void GLAPIENTRY VertexAttrib2Nubv(GLuint index, const GLubyte *v)
+{
+   _glapi_Dispatch->VertexAttrib2fNV(index, UBYTE_TO_FLOAT(v[0]),
+                                     UBYTE_TO_FLOAT(v[1]));
+}
+
+static void GLAPIENTRY VertexAttrib2ubv(GLuint index, const GLubyte *v)
+{
+   _glapi_Dispatch->VertexAttrib2fNV(index, v[0], v[1]);
+}
+
+static void GLAPIENTRY VertexAttrib3Nubv(GLuint index, const GLubyte *v)
+{
+   _glapi_Dispatch->VertexAttrib3fNV(index, UBYTE_TO_FLOAT(v[0]),
+                                     UBYTE_TO_FLOAT(v[1]),
+                                     UBYTE_TO_FLOAT(v[2]));
+}
+static void GLAPIENTRY VertexAttrib3ubv(GLuint index, const GLubyte *v)
+{
+   _glapi_Dispatch->VertexAttrib3fNV(index, v[0], v[1], v[2]);
+}
+
+static void GLAPIENTRY VertexAttrib4Nubv(GLuint index, const GLubyte *v)
+{
+   _glapi_Dispatch->VertexAttrib4fNV(index, UBYTE_TO_FLOAT(v[0]),
+                                     UBYTE_TO_FLOAT(v[1]),
+                                     UBYTE_TO_FLOAT(v[2]),
+                                     UBYTE_TO_FLOAT(v[3]));
+}
+
+static void GLAPIENTRY VertexAttrib4ubv(GLuint index, const GLubyte *v)
+{
+   _glapi_Dispatch->VertexAttrib4fNV(index, v[0], v[1], v[2], v[3]);
+}
+
+/* GL_SHORT attributes */
+
+static void GLAPIENTRY VertexAttrib1Nsv(GLuint index, const GLshort *v)
+{
+   _glapi_Dispatch->VertexAttrib1fNV(index, SHORT_TO_FLOAT(v[0]));
+}
+
+static void GLAPIENTRY VertexAttrib1sv(GLuint index, const GLshort *v)
+{
+   _glapi_Dispatch->VertexAttrib1fNV(index, v[0]);
+}
+
+static void GLAPIENTRY VertexAttrib2Nsv(GLuint index, const GLshort *v)
+{
+   _glapi_Dispatch->VertexAttrib2fNV(index, SHORT_TO_FLOAT(v[0]),
+                                     SHORT_TO_FLOAT(v[1]));
+}
+
+static void GLAPIENTRY VertexAttrib2sv(GLuint index, const GLshort *v)
+{
+   _glapi_Dispatch->VertexAttrib2fNV(index, v[0], v[1]);
+}
+
+static void GLAPIENTRY VertexAttrib3Nsv(GLuint index, const GLshort *v)
+{
+   _glapi_Dispatch->VertexAttrib3fNV(index, SHORT_TO_FLOAT(v[0]),
+                                     SHORT_TO_FLOAT(v[1]),
+                                     SHORT_TO_FLOAT(v[2]));
+}
+
+static void GLAPIENTRY VertexAttrib3sv(GLuint index, const GLshort *v)
+{
+   _glapi_Dispatch->VertexAttrib3fNV(index, v[0], v[1], v[2]);
+}
+
+static void GLAPIENTRY VertexAttrib4Nsv(GLuint index, const GLshort *v)
+{
+   _glapi_Dispatch->VertexAttrib4fNV(index, SHORT_TO_FLOAT(v[0]),
+                                     SHORT_TO_FLOAT(v[1]),
+                                     SHORT_TO_FLOAT(v[2]),
+                                     SHORT_TO_FLOAT(v[3]));
+}
+
+static void GLAPIENTRY VertexAttrib4sv(GLuint index, const GLshort *v)
+{
+   _glapi_Dispatch->VertexAttrib4fNV(index, v[0], v[1], v[2], v[3]);
+}
+
+/* GL_UNSIGNED_SHORT attributes */
+
+static void GLAPIENTRY VertexAttrib1Nusv(GLuint index, const GLushort *v)
+{
+   _glapi_Dispatch->VertexAttrib1fNV(index, USHORT_TO_FLOAT(v[0]));
+}
+
+static void GLAPIENTRY VertexAttrib1usv(GLuint index, const GLushort *v)
+{
+   _glapi_Dispatch->VertexAttrib1fNV(index, v[0]);
+}
+
+static void GLAPIENTRY VertexAttrib2Nusv(GLuint index, const GLushort *v)
+{
+   _glapi_Dispatch->VertexAttrib2fNV(index, USHORT_TO_FLOAT(v[0]),
+                                     USHORT_TO_FLOAT(v[1]));
+}
+
+static void GLAPIENTRY VertexAttrib2usv(GLuint index, const GLushort *v)
+{
+   _glapi_Dispatch->VertexAttrib2fNV(index, v[0], v[1]);
+}
+
+static void GLAPIENTRY VertexAttrib3Nusv(GLuint index, const GLushort *v)
+{
+   _glapi_Dispatch->VertexAttrib3fNV(index, USHORT_TO_FLOAT(v[0]),
+                                     USHORT_TO_FLOAT(v[1]),
+                                     USHORT_TO_FLOAT(v[2]));
+}
+
+static void GLAPIENTRY VertexAttrib3usv(GLuint index, const GLushort *v)
+{
+   _glapi_Dispatch->VertexAttrib3fNV(index, v[0], v[1], v[2]);
+}
+
+static void GLAPIENTRY VertexAttrib4Nusv(GLuint index, const GLushort *v)
+{
+   _glapi_Dispatch->VertexAttrib4fNV(index, USHORT_TO_FLOAT(v[0]),
+                                     USHORT_TO_FLOAT(v[1]),
+                                     USHORT_TO_FLOAT(v[2]),
+                                     USHORT_TO_FLOAT(v[3]));
+}
+
+static void GLAPIENTRY VertexAttrib4usv(GLuint index, const GLushort *v)
+{
+   _glapi_Dispatch->VertexAttrib4fNV(index, v[0], v[1], v[2], v[3]);
+}
+
+/* GL_INT attributes */
+
+static void GLAPIENTRY VertexAttrib1Niv(GLuint index, const GLint *v)
+{
+   _glapi_Dispatch->VertexAttrib1fNV(index, INT_TO_FLOAT(v[0]));
+}
+
+static void GLAPIENTRY VertexAttrib1iv(GLuint index, const GLint *v)
+{
+   _glapi_Dispatch->VertexAttrib1fNV(index, v[0]);
+}
+
+static void GLAPIENTRY VertexAttrib2Niv(GLuint index, const GLint *v)
+{
+   _glapi_Dispatch->VertexAttrib2fNV(index, INT_TO_FLOAT(v[0]),
+                                     INT_TO_FLOAT(v[1]));
+}
+
+static void GLAPIENTRY VertexAttrib2iv(GLuint index, const GLint *v)
+{
+   _glapi_Dispatch->VertexAttrib2fNV(index, v[0], v[1]);
+}
+
+static void GLAPIENTRY VertexAttrib3Niv(GLuint index, const GLint *v)
+{
+   _glapi_Dispatch->VertexAttrib3fNV(index, INT_TO_FLOAT(v[0]),
+                                     INT_TO_FLOAT(v[1]),
+                                     INT_TO_FLOAT(v[2]));
+}
+
+static void GLAPIENTRY VertexAttrib3iv(GLuint index, const GLint *v)
+{
+   _glapi_Dispatch->VertexAttrib3fNV(index, v[0], v[1], v[2]);
+}
+
+static void GLAPIENTRY VertexAttrib4Niv(GLuint index, const GLint *v)
+{
+   _glapi_Dispatch->VertexAttrib4fNV(index, INT_TO_FLOAT(v[0]),
+                                     INT_TO_FLOAT(v[1]),
+                                     INT_TO_FLOAT(v[2]),
+                                     INT_TO_FLOAT(v[3]));
+}
+
+static void GLAPIENTRY VertexAttrib4iv(GLuint index, const GLint *v)
+{
+   _glapi_Dispatch->VertexAttrib4fNV(index, v[0], v[1], v[2], v[3]);
+}
+
+/* GL_UNSIGNED_INT attributes */
+
+static void GLAPIENTRY VertexAttrib1Nuiv(GLuint index, const GLuint *v)
+{
+   _glapi_Dispatch->VertexAttrib1fNV(index, UINT_TO_FLOAT(v[0]));
+}
+
+static void GLAPIENTRY VertexAttrib1uiv(GLuint index, const GLuint *v)
+{
+   _glapi_Dispatch->VertexAttrib1fNV(index, v[0]);
+}
+
+static void GLAPIENTRY VertexAttrib2Nuiv(GLuint index, const GLuint *v)
+{
+   _glapi_Dispatch->VertexAttrib2fNV(index, UINT_TO_FLOAT(v[0]),
+                                     UINT_TO_FLOAT(v[1]));
+}
+
+static void GLAPIENTRY VertexAttrib2uiv(GLuint index, const GLuint *v)
+{
+   _glapi_Dispatch->VertexAttrib2fNV(index, v[0], v[1]);
+}
+
+static void GLAPIENTRY VertexAttrib3Nuiv(GLuint index, const GLuint *v)
+{
+   _glapi_Dispatch->VertexAttrib3fNV(index, UINT_TO_FLOAT(v[0]),
+                                     UINT_TO_FLOAT(v[1]),
+                                     UINT_TO_FLOAT(v[2]));
+}
+
+static void GLAPIENTRY VertexAttrib3uiv(GLuint index, const GLuint *v)
+{
+   _glapi_Dispatch->VertexAttrib3fNV(index, v[0], v[1], v[2]);
+}
+
+static void GLAPIENTRY VertexAttrib4Nuiv(GLuint index, const GLuint *v)
+{
+   _glapi_Dispatch->VertexAttrib4fNV(index, UINT_TO_FLOAT(v[0]),
+                                     UINT_TO_FLOAT(v[1]),
+                                     UINT_TO_FLOAT(v[2]),
+                                     UINT_TO_FLOAT(v[3]));
+}
+
+static void GLAPIENTRY VertexAttrib4uiv(GLuint index, const GLuint *v)
+{
+   _glapi_Dispatch->VertexAttrib4fNV(index, v[0], v[1], v[2], v[3]);
+}
+
+/* GL_FLOAT attributes */
+
+static void GLAPIENTRY VertexAttrib1fv(GLuint index, const GLfloat *v)
+{
+   _glapi_Dispatch->VertexAttrib1fvNV(index, v);
+}
+
+static void GLAPIENTRY VertexAttrib2fv(GLuint index, const GLfloat *v)
+{
+   _glapi_Dispatch->VertexAttrib2fvNV(index, v);
+}
+
+static void GLAPIENTRY VertexAttrib3fv(GLuint index, const GLfloat *v)
+{
+   _glapi_Dispatch->VertexAttrib3fvNV(index, v);
+}
+
+static void GLAPIENTRY VertexAttrib4fv(GLuint index, const GLfloat *v)
+{
+   _glapi_Dispatch->VertexAttrib4fvNV(index, v);
+}
+
+/* GL_DOUBLE attributes */
+
+static void GLAPIENTRY VertexAttrib1dv(GLuint index, const GLdouble *v)
+{
+   _glapi_Dispatch->VertexAttrib1dvNV(index, v);
+}
+
+static void GLAPIENTRY VertexAttrib2dv(GLuint index, const GLdouble *v)
+{
+   _glapi_Dispatch->VertexAttrib2dvNV(index, v);
+}
+
+static void GLAPIENTRY VertexAttrib3dv(GLuint index, const GLdouble *v)
+{
+   _glapi_Dispatch->VertexAttrib3dvNV(index, v);
+}
+
+static void GLAPIENTRY VertexAttrib4dv(GLuint index, const GLdouble *v)
+{
+   _glapi_Dispatch->VertexAttrib4dvNV(index, v);
+}
+
+
+/*
+ * Array [size][type] of VertexAttrib functions
+ */
+static attrib_func attribfuncs[2][4][8] = {
+   {
+      /* non-normalized */
+      {
+         /* size 1 */
+         (attrib_func) VertexAttrib1bv,
+         (attrib_func) VertexAttrib1ubv,
+         (attrib_func) VertexAttrib1sv,
+         (attrib_func) VertexAttrib1usv,
+         (attrib_func) VertexAttrib1iv,
+         (attrib_func) VertexAttrib1uiv,
+         (attrib_func) VertexAttrib1fv,
+         (attrib_func) VertexAttrib1dv
+      },
+      {
+         /* size 2 */
+         (attrib_func) VertexAttrib2bv,
+         (attrib_func) VertexAttrib2ubv,
+         (attrib_func) VertexAttrib2sv,
+         (attrib_func) VertexAttrib2usv,
+         (attrib_func) VertexAttrib2iv,
+         (attrib_func) VertexAttrib2uiv,
+         (attrib_func) VertexAttrib2fv,
+         (attrib_func) VertexAttrib2dv
+      },
+      {
+         /* size 3 */
+         (attrib_func) VertexAttrib3bv,
+         (attrib_func) VertexAttrib3ubv,
+         (attrib_func) VertexAttrib3sv,
+         (attrib_func) VertexAttrib3usv,
+         (attrib_func) VertexAttrib3iv,
+         (attrib_func) VertexAttrib3uiv,
+         (attrib_func) VertexAttrib3fv,
+         (attrib_func) VertexAttrib3dv
+      },
+      {
+         /* size 4 */
+         (attrib_func) VertexAttrib4bv,
+         (attrib_func) VertexAttrib4ubv,
+         (attrib_func) VertexAttrib4sv,
+         (attrib_func) VertexAttrib4usv,
+         (attrib_func) VertexAttrib4iv,
+         (attrib_func) VertexAttrib4uiv,
+         (attrib_func) VertexAttrib4fv,
+         (attrib_func) VertexAttrib4dv
+      }
+   },
+   {
+      /* normalized (except for float/double) */
+      {
+         /* size 1 */
+         (attrib_func) VertexAttrib1Nbv,
+         (attrib_func) VertexAttrib1Nubv,
+         (attrib_func) VertexAttrib1Nsv,
+         (attrib_func) VertexAttrib1Nusv,
+         (attrib_func) VertexAttrib1Niv,
+         (attrib_func) VertexAttrib1Nuiv,
+         (attrib_func) VertexAttrib1fv,
+         (attrib_func) VertexAttrib1dv
+      },
+      {
+         /* size 2 */
+         (attrib_func) VertexAttrib2Nbv,
+         (attrib_func) VertexAttrib2Nubv,
+         (attrib_func) VertexAttrib2Nsv,
+         (attrib_func) VertexAttrib2Nusv,
+         (attrib_func) VertexAttrib2Niv,
+         (attrib_func) VertexAttrib2Nuiv,
+         (attrib_func) VertexAttrib2fv,
+         (attrib_func) VertexAttrib2dv
+      },
+      {
+         /* size 3 */
+         (attrib_func) VertexAttrib3Nbv,
+         (attrib_func) VertexAttrib3Nubv,
+         (attrib_func) VertexAttrib3Nsv,
+         (attrib_func) VertexAttrib3Nusv,
+         (attrib_func) VertexAttrib3Niv,
+         (attrib_func) VertexAttrib3Nuiv,
+         (attrib_func) VertexAttrib3fv,
+         (attrib_func) VertexAttrib3dv
+      },
+      {
+         /* size 4 */
+         (attrib_func) VertexAttrib4Nbv,
+         (attrib_func) VertexAttrib4Nubv,
+         (attrib_func) VertexAttrib4Nsv,
+         (attrib_func) VertexAttrib4Nusv,
+         (attrib_func) VertexAttrib4Niv,
+         (attrib_func) VertexAttrib4Nuiv,
+         (attrib_func) VertexAttrib4fv,
+         (attrib_func) VertexAttrib4dv
+      }
+   }
+};
+
+/**********************************************************************/
+
+
+GLboolean _ae_create_context( GLcontext *ctx )
+{
+   if (ctx->aelt_context)
+      return GL_TRUE;
+
+   ctx->aelt_context = MALLOC( sizeof(AEcontext) );
+   if (!ctx->aelt_context)
+      return GL_FALSE;
+
+   AE_CONTEXT(ctx)->NewState = ~0;
+   return GL_TRUE;
+}
+
+
+void _ae_destroy_context( GLcontext *ctx )
+{
+   if ( AE_CONTEXT( ctx ) ) {
+      FREE( ctx->aelt_context );
+      ctx->aelt_context = 0;
+   }
+}
+
+
+/**
+ * Make a list of per-vertex functions to call for each glArrayElement call.
+ * These functions access the array data (i.e. glVertex, glColor, glNormal, etc);
+ */
+static void _ae_update_state( GLcontext *ctx )
+{
+   AEcontext *actx = AE_CONTEXT(ctx);
+   AEarray *aa = actx->arrays;
+   AEattrib *at = actx->attribs;
+   GLuint i;
+
+   /* yuck, no generic array to correspond to color index or edge flag */
+   if (ctx->Array.Index.Enabled) {
+      aa->array = &ctx->Array.Index;
+      aa->func = indexfuncs[TYPE_IDX(aa->array->Type)];
+      aa++;
+   }
+   if (ctx->Array.EdgeFlag.Enabled) {
+      aa->array = &ctx->Array.EdgeFlag;
+      aa->func = (array_func) glEdgeFlagv;
+      aa++;
+   }
+
+   /* all other arrays handled here */
+   for (i = 0; i < VERT_ATTRIB_MAX; i++) {
+      /* Note: we count down to zero so glVertex (attrib 0) is last!!! */
+      const GLuint index = VERT_ATTRIB_MAX - i - 1;
+      struct gl_client_array *attribArray = NULL;
+
+      /* Generic arrays take priority over conventional arrays if vertex program
+       * mode is enabled.
+       */
+      if (ctx->VertexProgram.Enabled
+          && ctx->Array.VertexAttrib[index].Enabled) {
+         if (index == 0) {
+            /* Special case: use glVertex() for vertex position so
+             * that it's always executed last.
+             */
+            aa->array = &ctx->Array.VertexAttrib[0];
+            aa->func = vertexfuncs[aa->array->Size-2][TYPE_IDX(aa->array->Type)];
+            aa++;
+         }
+         else {
+            attribArray = &ctx->Array.VertexAttrib[index];
+         }
+      }
+      else {
+         switch (index) {
+         case VERT_ATTRIB_POS:
+            if (ctx->Array.Vertex.Enabled) {
+               aa->array = &ctx->Array.Vertex;
+               aa->func = vertexfuncs[aa->array->Size-2][TYPE_IDX(aa->array->Type)];
+               aa++;
+            }
+            break;
+         case VERT_ATTRIB_NORMAL:
+            if (ctx->Array.Normal.Enabled) {
+               aa->array = &ctx->Array.Normal;
+               aa->func = normalfuncs[TYPE_IDX(aa->array->Type)];
+               aa++;
+            }
+            break;
+         case VERT_ATTRIB_COLOR0:
+            if (ctx->Array.Color.Enabled) {
+               aa->array = &ctx->Array.Color;
+               aa->func = colorfuncs[aa->array->Size-3][TYPE_IDX(aa->array->Type)];
+               aa++;
+            }
+            break;
+         case VERT_ATTRIB_COLOR1:
+            if (ctx->Array.SecondaryColor.Enabled) {
+               aa->array = &ctx->Array.SecondaryColor;
+               aa->func = secondarycolorfuncs[TYPE_IDX(aa->array->Type)];
+               aa++;
+            }
+            break;
+         case VERT_ATTRIB_FOG:
+            if (ctx->Array.FogCoord.Enabled) {
+               aa->array = &ctx->Array.FogCoord;
+               aa->func = fogcoordfuncs[TYPE_IDX(aa->array->Type)];
+               aa++;
+            }
+            break;
+         case VERT_ATTRIB_TEX0:
+         case VERT_ATTRIB_TEX1:
+         case VERT_ATTRIB_TEX2:
+         case VERT_ATTRIB_TEX3:
+         case VERT_ATTRIB_TEX4:
+         case VERT_ATTRIB_TEX5:
+         case VERT_ATTRIB_TEX6:
+         case VERT_ATTRIB_TEX7:
+            /* use generic vertex attribs for texcoords */
+            if (ctx->Array.TexCoord[index - VERT_ATTRIB_TEX0].Enabled) {
+               attribArray = &ctx->Array.TexCoord[index - VERT_ATTRIB_TEX0];
+            }
+         default:
+            /* nothing */;
+         }
+      }
+
+      /* Save glVertexAttrib call (may be for glMultiTexCoord) */
+      if (attribArray) {
+         at->array = attribArray;
+         /* Note: we can't grab the _glapi_Dispatch->VertexAttrib1fvNV
+          * function pointer here (for float arrays) since the pointer may
+          * change from one execution of _ae_loopback_array_elt() to
+          * the next.  Doing so caused UT to break.
+          */
+         at->func = attribfuncs[at->array->Normalized][at->array->Size-1][TYPE_IDX(at->array->Type)];
+         at->index = index;
+         at++;
+      }
+   }
+   ASSERT(at - actx->attribs <= VERT_ATTRIB_MAX);
+   ASSERT(aa - actx->arrays < 32);
+   at->func = NULL;  /* terminate the list */
+   aa->func = NULL;  /* terminate the list */
+
+   actx->NewState = 0;
+}
+
+
+void GLAPIENTRY _ae_loopback_array_elt( GLint elt )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   const AEcontext *actx = AE_CONTEXT(ctx);
+   const AEarray *aa;
+   const AEattrib *at;
+
+   if (actx->NewState)
+      _ae_update_state( ctx );
+
+   /* generic attributes */
+   for (at = actx->attribs; at->func; at++) {
+      const GLubyte *src = at->array->BufferObj->Data
+                         + (unsigned long) at->array->Ptr
+                         + elt * at->array->StrideB;
+      at->func( at->index, src );
+   }
+
+   /* conventional arrays */
+   for (aa = actx->arrays; aa->func ; aa++) {
+      const GLubyte *src = aa->array->BufferObj->Data
+                         + (unsigned long) aa->array->Ptr
+                         + elt * aa->array->StrideB;
+      aa->func( src );
+   }
+}
+
+
+
+void _ae_invalidate_state( GLcontext *ctx, GLuint new_state )
+{
+   AE_CONTEXT(ctx)->NewState |= new_state;
+}
diff --git a/reactos/lib/mesa32/src/main/api_arrayelt.h b/reactos/lib/mesa32/src/main/api_arrayelt.h
new file mode 100644
index 00000000000..1c0af9f3ea8
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/api_arrayelt.h
@@ -0,0 +1,37 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef API_ARRAYELT_H
+#define API_ARRAYELT_H
+
+#include "mtypes.h"
+
+extern GLboolean _ae_create_context( GLcontext *ctx );
+extern void _ae_destroy_context( GLcontext *ctx );
+extern void _ae_invalidate_state( GLcontext *ctx, GLuint new_state );
+extern void GLAPIENTRY _ae_loopback_array_elt( GLint elt );
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/api_eval.h b/reactos/lib/mesa32/src/main/api_eval.h
new file mode 100644
index 00000000000..d6cb38c9f8c
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/api_eval.h
@@ -0,0 +1,42 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef API_EVAL_H
+#define API_EVAL_H
+
+#include "mtypes.h"
+
+extern void _mesa_EvalPoint1( GLint i );
+extern void _mesa_EvalPoint2( GLint i, GLint j );
+extern void _mesa_EvalCoord1f( GLfloat u );
+extern void _mesa_EvalCoord2f( GLfloat u, GLfloat v );
+extern void _mesa_EvalCoord1fv( const GLfloat *u );
+extern void _mesa_EvalCoord2fv( const GLfloat *u );
+
+#endif
+
+
+
diff --git a/reactos/lib/mesa32/src/main/api_loopback.c b/reactos/lib/mesa32/src/main/api_loopback.c
new file mode 100644
index 00000000000..33e7ee8e712
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/api_loopback.c
@@ -0,0 +1,1563 @@
+/**
+ * \file api_loopback.c
+ *
+ * \author Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "glapi.h"
+#include "glapitable.h"
+#include "macros.h"
+#include "colormac.h"
+#include "api_loopback.h"
+
+/* KW: A set of functions to convert unusual Color/Normal/Vertex/etc
+ * calls to a smaller set of driver-provided formats.  Currently just
+ * go back to dispatch to find these (eg. call glNormal3f directly),
+ * hence 'loopback'.
+ *
+ * The driver must supply all of the remaining entry points, which are
+ * listed in dd.h.  The easiest way for a driver to do this is to
+ * install the supplied software t&l module.
+ */
+#define COLORF(r,g,b,a)             glColor4f(r,g,b,a)
+#define VERTEX2(x,y)	            glVertex2f(x,y)
+#define VERTEX3(x,y,z)	            glVertex3f(x,y,z)
+#define VERTEX4(x,y,z,w)            glVertex4f(x,y,z,w)
+#define NORMAL(x,y,z)               glNormal3f(x,y,z)
+#define TEXCOORD1(s)                glTexCoord1f(s)
+#define TEXCOORD2(s,t)              glTexCoord2f(s,t)
+#define TEXCOORD3(s,t,u)            glTexCoord3f(s,t,u)
+#define TEXCOORD4(s,t,u,v)          glTexCoord4f(s,t,u,v)
+#define INDEX(c)		    glIndexf(c)
+#define MULTI_TEXCOORD1(z,s)	    glMultiTexCoord1fARB(z,s)
+#define MULTI_TEXCOORD2(z,s,t)	    glMultiTexCoord2fARB(z,s,t)
+#define MULTI_TEXCOORD3(z,s,t,u)    glMultiTexCoord3fARB(z,s,t,u)
+#define MULTI_TEXCOORD4(z,s,t,u,v)  glMultiTexCoord4fARB(z,s,t,u,v)
+#define EVALCOORD1(x)               glEvalCoord1f(x)
+#define EVALCOORD2(x,y)             glEvalCoord2f(x,y)
+#define MATERIALFV(a,b,c)           glMaterialfv(a,b,c)
+#define RECTF(a,b,c,d)              glRectf(a,b,c,d)
+
+/* Extension functions must be dereferenced through _glapi_Dispatch as
+ * not all libGL.so's will have all the uptodate entrypoints.
+ */
+#define ATTRIB1(index,x)        _glapi_Dispatch->VertexAttrib1fNV(index,x)
+#define ATTRIB2(index,x,y)      _glapi_Dispatch->VertexAttrib2fNV(index,x,y)
+#define ATTRIB3(index,x,y,z)    _glapi_Dispatch->VertexAttrib3fNV(index,x,y,z)
+#define ATTRIB4(index,x,y,z,w)  _glapi_Dispatch->VertexAttrib4fNV(index,x,y,z,w)
+#define FOGCOORDF(x)            _glapi_Dispatch->FogCoordfEXT(x)
+#define SECONDARYCOLORF(a,b,c)  _glapi_Dispatch->SecondaryColor3fEXT(a,b,c)
+
+static void GLAPIENTRY
+loopback_Color3b_f( GLbyte red, GLbyte green, GLbyte blue )
+{
+   COLORF( BYTE_TO_FLOAT(red),
+	   BYTE_TO_FLOAT(green),
+	   BYTE_TO_FLOAT(blue),
+	   1.0 );
+}
+
+static void GLAPIENTRY
+loopback_Color3d_f( GLdouble red, GLdouble green, GLdouble blue )
+{
+   COLORF( (GLfloat) red, (GLfloat) green, (GLfloat) blue, 1.0 );
+}
+
+static void GLAPIENTRY
+loopback_Color3i_f( GLint red, GLint green, GLint blue )
+{
+   COLORF( INT_TO_FLOAT(red), INT_TO_FLOAT(green),
+	   INT_TO_FLOAT(blue), 1.0);
+}
+
+static void GLAPIENTRY
+loopback_Color3s_f( GLshort red, GLshort green, GLshort blue )
+{
+   COLORF( SHORT_TO_FLOAT(red), SHORT_TO_FLOAT(green),
+	   SHORT_TO_FLOAT(blue), 1.0);
+}
+
+static void GLAPIENTRY
+loopback_Color3ui_f( GLuint red, GLuint green, GLuint blue )
+{
+   COLORF( UINT_TO_FLOAT(red), UINT_TO_FLOAT(green),
+	   UINT_TO_FLOAT(blue), 1.0 );
+}
+
+static void GLAPIENTRY
+loopback_Color3us_f( GLushort red, GLushort green, GLushort blue )
+{
+   COLORF( USHORT_TO_FLOAT(red), USHORT_TO_FLOAT(green),
+	   USHORT_TO_FLOAT(blue), 1.0 );
+}
+
+static void GLAPIENTRY
+loopback_Color3ub_f( GLubyte red, GLubyte green, GLubyte blue )
+{
+   COLORF( UBYTE_TO_FLOAT(red), UBYTE_TO_FLOAT(green),
+	   UBYTE_TO_FLOAT(blue), 1.0 );
+}
+
+
+static void GLAPIENTRY
+loopback_Color3bv_f( const GLbyte *v )
+{
+   COLORF( BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]),
+	   BYTE_TO_FLOAT(v[2]), 1.0 );
+}
+
+static void GLAPIENTRY
+loopback_Color3dv_f( const GLdouble *v )
+{
+   COLORF( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0 );
+}
+
+static void GLAPIENTRY
+loopback_Color3iv_f( const GLint *v )
+{
+   COLORF( INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]),
+	   INT_TO_FLOAT(v[2]), INT_TO_FLOAT(v[3]) );
+}
+
+static void GLAPIENTRY
+loopback_Color3sv_f( const GLshort *v )
+{
+   COLORF( SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]),
+	   SHORT_TO_FLOAT(v[2]), 1.0 );
+}
+
+static void GLAPIENTRY
+loopback_Color3uiv_f( const GLuint *v )
+{
+   COLORF( UINT_TO_FLOAT(v[0]), UINT_TO_FLOAT(v[1]),
+	   UINT_TO_FLOAT(v[2]), 1.0 );
+}
+
+static void GLAPIENTRY
+loopback_Color3usv_f( const GLushort *v )
+{
+   COLORF( USHORT_TO_FLOAT(v[0]), USHORT_TO_FLOAT(v[1]),
+	   USHORT_TO_FLOAT(v[2]), 1.0 );
+}
+
+static void GLAPIENTRY
+loopback_Color3ubv_f( const GLubyte *v )
+{
+   COLORF( UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]),
+	   UBYTE_TO_FLOAT(v[2]), 1.0 );
+}
+
+
+static void GLAPIENTRY
+loopback_Color4b_f( GLbyte red, GLbyte green, GLbyte blue,
+			      GLbyte alpha )
+{
+   COLORF( BYTE_TO_FLOAT(red), BYTE_TO_FLOAT(green),
+	   BYTE_TO_FLOAT(blue), BYTE_TO_FLOAT(alpha) );
+}
+
+static void GLAPIENTRY
+loopback_Color4d_f( GLdouble red, GLdouble green, GLdouble blue,
+			      GLdouble alpha )
+{
+   COLORF( (GLfloat) red, (GLfloat) green, (GLfloat) blue, (GLfloat) alpha );
+}
+
+static void GLAPIENTRY
+loopback_Color4i_f( GLint red, GLint green, GLint blue, GLint alpha )
+{
+   COLORF( INT_TO_FLOAT(red), INT_TO_FLOAT(green),
+	   INT_TO_FLOAT(blue), INT_TO_FLOAT(alpha) );
+}
+
+static void GLAPIENTRY
+loopback_Color4s_f( GLshort red, GLshort green, GLshort blue,
+			      GLshort alpha )
+{
+   COLORF( SHORT_TO_FLOAT(red), SHORT_TO_FLOAT(green),
+	   SHORT_TO_FLOAT(blue), SHORT_TO_FLOAT(alpha) );
+}
+
+static void GLAPIENTRY
+loopback_Color4ui_f( GLuint red, GLuint green, GLuint blue, GLuint alpha )
+{
+   COLORF( UINT_TO_FLOAT(red), UINT_TO_FLOAT(green),
+	   UINT_TO_FLOAT(blue), UINT_TO_FLOAT(alpha) );
+}
+
+static void GLAPIENTRY
+loopback_Color4us_f( GLushort red, GLushort green, GLushort blue, GLushort alpha )
+{
+   COLORF( USHORT_TO_FLOAT(red), USHORT_TO_FLOAT(green),
+	   USHORT_TO_FLOAT(blue), USHORT_TO_FLOAT(alpha) );
+}
+
+static void GLAPIENTRY
+loopback_Color4ub_f( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha )
+{
+   COLORF( UBYTE_TO_FLOAT(red), UBYTE_TO_FLOAT(green),
+	   UBYTE_TO_FLOAT(blue), UBYTE_TO_FLOAT(alpha) );
+}
+
+
+static void GLAPIENTRY
+loopback_Color4iv_f( const GLint *v )
+{
+   COLORF( INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]),
+	   INT_TO_FLOAT(v[2]), INT_TO_FLOAT(v[3]) );
+}
+
+
+static void GLAPIENTRY
+loopback_Color4bv_f( const GLbyte *v )
+{
+   COLORF( BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]),
+	   BYTE_TO_FLOAT(v[2]), BYTE_TO_FLOAT(v[3]) );
+}
+
+static void GLAPIENTRY
+loopback_Color4dv_f( const GLdouble *v )
+{
+   COLORF( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] );
+}
+
+
+static void GLAPIENTRY
+loopback_Color4sv_f( const GLshort *v)
+{
+   COLORF( SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]),
+	   SHORT_TO_FLOAT(v[2]), SHORT_TO_FLOAT(v[3]) );
+}
+
+
+static void GLAPIENTRY
+loopback_Color4uiv_f( const GLuint *v)
+{
+   COLORF( UINT_TO_FLOAT(v[0]), UINT_TO_FLOAT(v[1]),
+	   UINT_TO_FLOAT(v[2]), UINT_TO_FLOAT(v[3]) );
+}
+
+static void GLAPIENTRY
+loopback_Color4usv_f( const GLushort *v)
+{
+   COLORF( USHORT_TO_FLOAT(v[0]), USHORT_TO_FLOAT(v[1]),
+	   USHORT_TO_FLOAT(v[2]), USHORT_TO_FLOAT(v[3]) );
+}
+
+static void GLAPIENTRY
+loopback_Color4ubv_f( const GLubyte *v)
+{
+   COLORF( UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]),
+	   UBYTE_TO_FLOAT(v[2]), UBYTE_TO_FLOAT(v[3]) );
+}
+
+static void GLAPIENTRY
+loopback_FogCoorddEXT( GLdouble d )
+{
+   FOGCOORDF( (GLfloat) d );
+}
+
+static void GLAPIENTRY
+loopback_FogCoorddvEXT( const GLdouble *v )
+{
+   FOGCOORDF( (GLfloat) *v );
+}
+
+
+static void GLAPIENTRY
+loopback_Indexd( GLdouble c )
+{
+   INDEX( (GLfloat) c );
+}
+
+static void GLAPIENTRY
+loopback_Indexi( GLint c )
+{
+   INDEX( (GLfloat) c );
+}
+
+static void GLAPIENTRY
+loopback_Indexs( GLshort c )
+{
+   INDEX( (GLfloat) c );
+}
+
+static void GLAPIENTRY
+loopback_Indexub( GLubyte c )
+{
+   INDEX( (GLfloat) c );
+}
+
+static void GLAPIENTRY
+loopback_Indexdv( const GLdouble *c )
+{
+   INDEX( (GLfloat) *c );
+}
+
+static void GLAPIENTRY
+loopback_Indexiv( const GLint *c )
+{
+   INDEX( (GLfloat) *c );
+}
+
+static void GLAPIENTRY
+loopback_Indexsv( const GLshort *c )
+{
+   INDEX( (GLfloat) *c );
+}
+
+static void GLAPIENTRY
+loopback_Indexubv( const GLubyte *c )
+{
+   INDEX( (GLfloat) *c );
+}
+
+static void GLAPIENTRY
+loopback_Normal3b( GLbyte nx, GLbyte ny, GLbyte nz )
+{
+   NORMAL( BYTE_TO_FLOAT(nx), BYTE_TO_FLOAT(ny), BYTE_TO_FLOAT(nz) );
+}
+
+static void GLAPIENTRY
+loopback_Normal3d( GLdouble nx, GLdouble ny, GLdouble nz )
+{
+   NORMAL((GLfloat) nx, (GLfloat) ny, (GLfloat) nz);
+}
+
+static void GLAPIENTRY
+loopback_Normal3i( GLint nx, GLint ny, GLint nz )
+{
+   NORMAL( INT_TO_FLOAT(nx), INT_TO_FLOAT(ny), INT_TO_FLOAT(nz) );
+}
+
+static void GLAPIENTRY
+loopback_Normal3s( GLshort nx, GLshort ny, GLshort nz )
+{
+   NORMAL( SHORT_TO_FLOAT(nx), SHORT_TO_FLOAT(ny), SHORT_TO_FLOAT(nz) );
+}
+
+static void GLAPIENTRY
+loopback_Normal3bv( const GLbyte *v )
+{
+   NORMAL( BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]), BYTE_TO_FLOAT(v[2]) );
+}
+
+static void GLAPIENTRY
+loopback_Normal3dv( const GLdouble *v )
+{
+   NORMAL( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );
+}
+
+static void GLAPIENTRY
+loopback_Normal3iv( const GLint *v )
+{
+   NORMAL( INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]), INT_TO_FLOAT(v[2]) );
+}
+
+static void GLAPIENTRY
+loopback_Normal3sv( const GLshort *v )
+{
+   NORMAL( SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]), SHORT_TO_FLOAT(v[2]) );
+}
+
+static void GLAPIENTRY
+loopback_TexCoord1d( GLdouble s )
+{
+   TEXCOORD1((GLfloat) s);
+}
+
+static void GLAPIENTRY
+loopback_TexCoord1i( GLint s )
+{
+   TEXCOORD1((GLfloat) s);
+}
+
+static void GLAPIENTRY
+loopback_TexCoord1s( GLshort s )
+{
+   TEXCOORD1((GLfloat) s);
+}
+
+static void GLAPIENTRY
+loopback_TexCoord2d( GLdouble s, GLdouble t )
+{
+   TEXCOORD2((GLfloat) s,(GLfloat) t);
+}
+
+static void GLAPIENTRY
+loopback_TexCoord2s( GLshort s, GLshort t )
+{
+   TEXCOORD2((GLfloat) s,(GLfloat) t);
+}
+
+static void GLAPIENTRY
+loopback_TexCoord2i( GLint s, GLint t )
+{
+   TEXCOORD2((GLfloat) s,(GLfloat) t);
+}
+
+static void GLAPIENTRY
+loopback_TexCoord3d( GLdouble s, GLdouble t, GLdouble r )
+{
+   TEXCOORD3((GLfloat) s,(GLfloat) t,(GLfloat) r);
+}
+
+static void GLAPIENTRY
+loopback_TexCoord3i( GLint s, GLint t, GLint r )
+{
+   TEXCOORD3((GLfloat) s,(GLfloat) t,(GLfloat) r);
+}
+
+static void GLAPIENTRY
+loopback_TexCoord3s( GLshort s, GLshort t, GLshort r )
+{
+   TEXCOORD3((GLfloat) s,(GLfloat) t,(GLfloat) r);
+}
+
+static void GLAPIENTRY
+loopback_TexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q )
+{
+   TEXCOORD4((GLfloat) s,(GLfloat) t,(GLfloat) r,(GLfloat) q);
+}
+
+static void GLAPIENTRY
+loopback_TexCoord4i( GLint s, GLint t, GLint r, GLint q )
+{
+   TEXCOORD4((GLfloat) s,(GLfloat) t,(GLfloat) r,(GLfloat) q);
+}
+
+static void GLAPIENTRY
+loopback_TexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q )
+{
+   TEXCOORD4((GLfloat) s,(GLfloat) t,(GLfloat) r,(GLfloat) q);
+}
+
+static void GLAPIENTRY
+loopback_TexCoord1dv( const GLdouble *v )
+{
+   TEXCOORD1((GLfloat) v[0]);
+}
+
+static void GLAPIENTRY
+loopback_TexCoord1iv( const GLint *v )
+{
+   TEXCOORD1((GLfloat) v[0]);
+}
+
+static void GLAPIENTRY
+loopback_TexCoord1sv( const GLshort *v )
+{
+   TEXCOORD1((GLfloat) v[0]);
+}
+
+static void GLAPIENTRY
+loopback_TexCoord2dv( const GLdouble *v )
+{
+   TEXCOORD2((GLfloat) v[0],(GLfloat) v[1]);
+}
+
+static void GLAPIENTRY
+loopback_TexCoord2iv( const GLint *v )
+{
+   TEXCOORD2((GLfloat) v[0],(GLfloat) v[1]);
+}
+
+static void GLAPIENTRY
+loopback_TexCoord2sv( const GLshort *v )
+{
+   TEXCOORD2((GLfloat) v[0],(GLfloat) v[1]);
+}
+
+static void GLAPIENTRY
+loopback_TexCoord3dv( const GLdouble *v )
+{
+   TEXCOORD2((GLfloat) v[0],(GLfloat) v[1]);
+}
+
+static void GLAPIENTRY
+loopback_TexCoord3iv( const GLint *v )
+{
+   TEXCOORD3((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2]);
+}
+
+static void GLAPIENTRY
+loopback_TexCoord3sv( const GLshort *v )
+{
+   TEXCOORD3((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2]);
+}
+
+static void GLAPIENTRY
+loopback_TexCoord4dv( const GLdouble *v )
+{
+   TEXCOORD4((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2],(GLfloat) v[3]);
+}
+
+static void GLAPIENTRY
+loopback_TexCoord4iv( const GLint *v )
+{
+   TEXCOORD4((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2],(GLfloat) v[3]);
+}
+
+static void GLAPIENTRY
+loopback_TexCoord4sv( const GLshort *v )
+{
+   TEXCOORD4((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2],(GLfloat) v[3]);
+}
+
+static void GLAPIENTRY
+loopback_Vertex2d( GLdouble x, GLdouble y )
+{
+   VERTEX2( (GLfloat) x, (GLfloat) y );
+}
+
+static void GLAPIENTRY
+loopback_Vertex2i( GLint x, GLint y )
+{
+   VERTEX2( (GLfloat) x, (GLfloat) y );
+}
+
+static void GLAPIENTRY
+loopback_Vertex2s( GLshort x, GLshort y )
+{
+   VERTEX2( (GLfloat) x, (GLfloat) y );
+}
+
+static void GLAPIENTRY
+loopback_Vertex3d( GLdouble x, GLdouble y, GLdouble z )
+{
+   VERTEX3( (GLfloat) x, (GLfloat) y, (GLfloat) z );
+}
+
+static void GLAPIENTRY
+loopback_Vertex3i( GLint x, GLint y, GLint z )
+{
+   VERTEX3( (GLfloat) x, (GLfloat) y, (GLfloat) z );
+}
+
+static void GLAPIENTRY
+loopback_Vertex3s( GLshort x, GLshort y, GLshort z )
+{
+   VERTEX3( (GLfloat) x, (GLfloat) y, (GLfloat) z );
+}
+
+static void GLAPIENTRY
+loopback_Vertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w )
+{
+   VERTEX4( (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w );
+}
+
+static void GLAPIENTRY
+loopback_Vertex4i( GLint x, GLint y, GLint z, GLint w )
+{
+   VERTEX4( (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w );
+}
+
+static void GLAPIENTRY
+loopback_Vertex4s( GLshort x, GLshort y, GLshort z, GLshort w )
+{
+   VERTEX4( (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w );
+}
+
+static void GLAPIENTRY
+loopback_Vertex2dv( const GLdouble *v )
+{
+   VERTEX2( (GLfloat) v[0], (GLfloat) v[1] );
+}
+
+static void GLAPIENTRY
+loopback_Vertex2iv( const GLint *v )
+{
+   VERTEX2( (GLfloat) v[0], (GLfloat) v[1] );
+}
+
+static void GLAPIENTRY
+loopback_Vertex2sv( const GLshort *v )
+{
+   VERTEX2( (GLfloat) v[0], (GLfloat) v[1] );
+}
+
+static void GLAPIENTRY
+loopback_Vertex3dv( const GLdouble *v )
+{
+   VERTEX3( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );
+}
+
+static void GLAPIENTRY
+loopback_Vertex3iv( const GLint *v )
+{
+   VERTEX3( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );
+}
+
+static void GLAPIENTRY
+loopback_Vertex3sv( const GLshort *v )
+{
+   VERTEX3( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );
+}
+
+static void GLAPIENTRY
+loopback_Vertex4dv( const GLdouble *v )
+{
+   VERTEX4( (GLfloat) v[0], (GLfloat) v[1],
+	    (GLfloat) v[2], (GLfloat) v[3] );
+}
+
+static void GLAPIENTRY
+loopback_Vertex4iv( const GLint *v )
+{
+   VERTEX4( (GLfloat) v[0], (GLfloat) v[1],
+	    (GLfloat) v[2], (GLfloat) v[3] );
+}
+
+static void GLAPIENTRY
+loopback_Vertex4sv( const GLshort *v )
+{
+   VERTEX4( (GLfloat) v[0], (GLfloat) v[1],
+	    (GLfloat) v[2], (GLfloat) v[3] );
+}
+
+static void GLAPIENTRY
+loopback_MultiTexCoord1dARB(GLenum target, GLdouble s)
+{
+   MULTI_TEXCOORD1( target, (GLfloat) s );
+}
+
+static void GLAPIENTRY
+loopback_MultiTexCoord1dvARB(GLenum target, const GLdouble *v)
+{
+   MULTI_TEXCOORD1( target, (GLfloat) v[0] );
+}
+
+static void GLAPIENTRY
+loopback_MultiTexCoord1iARB(GLenum target, GLint s)
+{
+   MULTI_TEXCOORD1( target, (GLfloat) s );
+}
+
+static void GLAPIENTRY
+loopback_MultiTexCoord1ivARB(GLenum target, const GLint *v)
+{
+   MULTI_TEXCOORD1( target, (GLfloat) v[0] );
+}
+
+static void GLAPIENTRY
+loopback_MultiTexCoord1sARB(GLenum target, GLshort s)
+{
+   MULTI_TEXCOORD1( target, (GLfloat) s );
+}
+
+static void GLAPIENTRY
+loopback_MultiTexCoord1svARB(GLenum target, const GLshort *v)
+{
+   MULTI_TEXCOORD1( target, (GLfloat) v[0] );
+}
+
+static void GLAPIENTRY
+loopback_MultiTexCoord2dARB(GLenum target, GLdouble s, GLdouble t)
+{
+   MULTI_TEXCOORD2( target, (GLfloat) s, (GLfloat) t );
+}
+
+static void GLAPIENTRY
+loopback_MultiTexCoord2dvARB(GLenum target, const GLdouble *v)
+{
+   MULTI_TEXCOORD2( target, (GLfloat) v[0], (GLfloat) v[1] );
+}
+
+static void GLAPIENTRY
+loopback_MultiTexCoord2iARB(GLenum target, GLint s, GLint t)
+{
+   MULTI_TEXCOORD2( target, (GLfloat) s, (GLfloat) t );
+}
+
+static void GLAPIENTRY
+loopback_MultiTexCoord2ivARB(GLenum target, const GLint *v)
+{
+   MULTI_TEXCOORD2( target, (GLfloat) v[0], (GLfloat) v[1] );
+}
+
+static void GLAPIENTRY
+loopback_MultiTexCoord2sARB(GLenum target, GLshort s, GLshort t)
+{
+   MULTI_TEXCOORD2( target, (GLfloat) s, (GLfloat) t );
+}
+
+static void GLAPIENTRY
+loopback_MultiTexCoord2svARB(GLenum target, const GLshort *v)
+{
+   MULTI_TEXCOORD2( target, (GLfloat) v[0], (GLfloat) v[1] );
+}
+
+static void GLAPIENTRY
+loopback_MultiTexCoord3dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r)
+{
+   MULTI_TEXCOORD3( target, (GLfloat) s, (GLfloat) t, (GLfloat) r );
+}
+
+static void GLAPIENTRY
+loopback_MultiTexCoord3dvARB(GLenum target, const GLdouble *v)
+{
+   MULTI_TEXCOORD3( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );
+}
+
+static void GLAPIENTRY
+loopback_MultiTexCoord3iARB(GLenum target, GLint s, GLint t, GLint r)
+{
+   MULTI_TEXCOORD3( target, (GLfloat) s, (GLfloat) t, (GLfloat) r );
+}
+
+static void GLAPIENTRY
+loopback_MultiTexCoord3ivARB(GLenum target, const GLint *v)
+{
+   MULTI_TEXCOORD3( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );
+}
+
+static void GLAPIENTRY
+loopback_MultiTexCoord3sARB(GLenum target, GLshort s, GLshort t, GLshort r)
+{
+   MULTI_TEXCOORD3( target, (GLfloat) s, (GLfloat) t, (GLfloat) r );
+}
+
+static void GLAPIENTRY
+loopback_MultiTexCoord3svARB(GLenum target, const GLshort *v)
+{
+   MULTI_TEXCOORD3( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );
+}
+
+static void GLAPIENTRY
+loopback_MultiTexCoord4dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q)
+{
+   MULTI_TEXCOORD4( target, (GLfloat) s, (GLfloat) t, 
+		    (GLfloat) r, (GLfloat) q );
+}
+
+static void GLAPIENTRY
+loopback_MultiTexCoord4dvARB(GLenum target, const GLdouble *v)
+{
+   MULTI_TEXCOORD4( target, (GLfloat) v[0], (GLfloat) v[1], 
+		    (GLfloat) v[2], (GLfloat) v[3] );
+}
+
+static void GLAPIENTRY
+loopback_MultiTexCoord4iARB(GLenum target, GLint s, GLint t, GLint r, GLint q)
+{
+   MULTI_TEXCOORD4( target, (GLfloat) s, (GLfloat) t,
+		    (GLfloat) r, (GLfloat) q );
+}
+
+static void GLAPIENTRY
+loopback_MultiTexCoord4ivARB(GLenum target, const GLint *v)
+{
+   MULTI_TEXCOORD4( target, (GLfloat) v[0], (GLfloat) v[1],
+		    (GLfloat) v[2], (GLfloat) v[3] );
+}
+
+static void GLAPIENTRY
+loopback_MultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q)
+{
+   MULTI_TEXCOORD4( target, (GLfloat) s, (GLfloat) t,
+		    (GLfloat) r, (GLfloat) q );
+}
+
+static void GLAPIENTRY
+loopback_MultiTexCoord4svARB(GLenum target, const GLshort *v)
+{
+   MULTI_TEXCOORD4( target, (GLfloat) v[0], (GLfloat) v[1],
+		    (GLfloat) v[2], (GLfloat) v[3] );
+}
+
+static void GLAPIENTRY
+loopback_EvalCoord2dv( const GLdouble *u )
+{
+   EVALCOORD2( (GLfloat) u[0], (GLfloat) u[1] );
+}
+
+static void GLAPIENTRY
+loopback_EvalCoord2fv( const GLfloat *u )
+{
+   EVALCOORD2( u[0], u[1] );
+}
+
+static void GLAPIENTRY
+loopback_EvalCoord2d( GLdouble u, GLdouble v )
+{
+   EVALCOORD2( (GLfloat) u, (GLfloat) v );
+}
+
+static void GLAPIENTRY
+loopback_EvalCoord1dv( const GLdouble *u )
+{
+   EVALCOORD1( (GLfloat) *u );
+}
+
+static void GLAPIENTRY
+loopback_EvalCoord1fv( const GLfloat *u )
+{
+   EVALCOORD1( (GLfloat) *u );
+}
+
+static void GLAPIENTRY
+loopback_EvalCoord1d( GLdouble u )
+{
+   EVALCOORD1( (GLfloat) u );
+}
+
+static void GLAPIENTRY
+loopback_Materialf( GLenum face, GLenum pname, GLfloat param )
+{
+   GLfloat fparam[4];
+   fparam[0] = param;
+   MATERIALFV( face, pname, fparam );
+}
+
+static void GLAPIENTRY
+loopback_Materiali(GLenum face, GLenum pname, GLint param )
+{
+   GLfloat p = (GLfloat) param;
+   MATERIALFV(face, pname, &p);
+}
+
+static void GLAPIENTRY
+loopback_Materialiv(GLenum face, GLenum pname, const GLint *params )
+{
+   GLfloat fparam[4];
+   switch (pname) {
+   case GL_AMBIENT:
+   case GL_DIFFUSE:
+   case GL_SPECULAR:
+   case GL_EMISSION:
+   case GL_AMBIENT_AND_DIFFUSE:
+      fparam[0] = INT_TO_FLOAT( params[0] );
+      fparam[1] = INT_TO_FLOAT( params[1] );
+      fparam[2] = INT_TO_FLOAT( params[2] );
+      fparam[3] = INT_TO_FLOAT( params[3] );
+      break;
+   case GL_SHININESS:
+      fparam[0] = (GLfloat) params[0];
+      break;
+   case GL_COLOR_INDEXES:
+      fparam[0] = (GLfloat) params[0];
+      fparam[1] = (GLfloat) params[1];
+      fparam[2] = (GLfloat) params[2];
+      break;
+   default:
+      ;
+   }
+   MATERIALFV(face, pname, fparam);
+}
+
+
+static void GLAPIENTRY
+loopback_Rectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
+{
+   RECTF((GLfloat) x1, (GLfloat) y1, (GLfloat) x2, (GLfloat) y2);
+}
+
+static void GLAPIENTRY
+loopback_Rectdv(const GLdouble *v1, const GLdouble *v2)
+{
+   RECTF((GLfloat) v1[0], (GLfloat) v1[1], (GLfloat) v2[0], (GLfloat) v2[1]);
+}
+
+static void GLAPIENTRY
+loopback_Rectfv(const GLfloat *v1, const GLfloat *v2)
+{
+   RECTF(v1[0], v1[1], v2[0], v2[1]);
+}
+
+static void GLAPIENTRY
+loopback_Recti(GLint x1, GLint y1, GLint x2, GLint y2)
+{
+   RECTF((GLfloat) x1, (GLfloat) y1, (GLfloat) x2, (GLfloat) y2);
+}
+
+static void GLAPIENTRY
+loopback_Rectiv(const GLint *v1, const GLint *v2)
+{
+   RECTF((GLfloat) v1[0], (GLfloat) v1[1], (GLfloat) v2[0], (GLfloat) v2[1]);
+}
+
+static void GLAPIENTRY
+loopback_Rects(GLshort x1, GLshort y1, GLshort x2, GLshort y2)
+{
+   RECTF((GLfloat) x1, (GLfloat) y1, (GLfloat) x2, (GLfloat) y2);
+}
+
+static void GLAPIENTRY
+loopback_Rectsv(const GLshort *v1, const GLshort *v2)
+{
+   RECTF((GLfloat) v1[0], (GLfloat) v1[1], (GLfloat) v2[0], (GLfloat) v2[1]);
+}
+
+static void GLAPIENTRY
+loopback_SecondaryColor3bEXT_f( GLbyte red, GLbyte green, GLbyte blue )
+{
+   SECONDARYCOLORF( BYTE_TO_FLOAT(red),
+		    BYTE_TO_FLOAT(green),
+		    BYTE_TO_FLOAT(blue) );
+}
+
+static void GLAPIENTRY
+loopback_SecondaryColor3dEXT_f( GLdouble red, GLdouble green, GLdouble blue )
+{
+   SECONDARYCOLORF( (GLfloat) red, (GLfloat) green, (GLfloat) blue );
+}
+
+static void GLAPIENTRY
+loopback_SecondaryColor3iEXT_f( GLint red, GLint green, GLint blue )
+{
+   SECONDARYCOLORF( INT_TO_FLOAT(red),
+		    INT_TO_FLOAT(green),
+		    INT_TO_FLOAT(blue));
+}
+
+static void GLAPIENTRY
+loopback_SecondaryColor3sEXT_f( GLshort red, GLshort green, GLshort blue )
+{
+   SECONDARYCOLORF(SHORT_TO_FLOAT(red),
+                   SHORT_TO_FLOAT(green),
+                   SHORT_TO_FLOAT(blue));
+}
+
+static void GLAPIENTRY
+loopback_SecondaryColor3uiEXT_f( GLuint red, GLuint green, GLuint blue )
+{
+   SECONDARYCOLORF(UINT_TO_FLOAT(red),
+                   UINT_TO_FLOAT(green),
+                   UINT_TO_FLOAT(blue));
+}
+
+static void GLAPIENTRY
+loopback_SecondaryColor3usEXT_f( GLushort red, GLushort green, GLushort blue )
+{
+   SECONDARYCOLORF(USHORT_TO_FLOAT(red),
+                   USHORT_TO_FLOAT(green),
+                   USHORT_TO_FLOAT(blue));
+}
+
+static void GLAPIENTRY
+loopback_SecondaryColor3ubEXT_f( GLubyte red, GLubyte green, GLubyte blue )
+{
+   SECONDARYCOLORF(UBYTE_TO_FLOAT(red),
+                   UBYTE_TO_FLOAT(green),
+                   UBYTE_TO_FLOAT(blue));
+}
+
+static void GLAPIENTRY
+loopback_SecondaryColor3bvEXT_f( const GLbyte *v )
+{
+   SECONDARYCOLORF(BYTE_TO_FLOAT(v[0]),
+                   BYTE_TO_FLOAT(v[1]),
+                   BYTE_TO_FLOAT(v[2]));
+}
+
+static void GLAPIENTRY
+loopback_SecondaryColor3dvEXT_f( const GLdouble *v )
+{
+   SECONDARYCOLORF( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );
+}
+static void GLAPIENTRY
+loopback_SecondaryColor3ivEXT_f( const GLint *v )
+{
+   SECONDARYCOLORF(INT_TO_FLOAT(v[0]),
+                   INT_TO_FLOAT(v[1]),
+                   INT_TO_FLOAT(v[2]));
+}
+
+static void GLAPIENTRY
+loopback_SecondaryColor3svEXT_f( const GLshort *v )
+{
+   SECONDARYCOLORF(SHORT_TO_FLOAT(v[0]),
+                   SHORT_TO_FLOAT(v[1]),
+                   SHORT_TO_FLOAT(v[2]));
+}
+
+static void GLAPIENTRY
+loopback_SecondaryColor3uivEXT_f( const GLuint *v )
+{
+   SECONDARYCOLORF(UINT_TO_FLOAT(v[0]),
+                   UINT_TO_FLOAT(v[1]),
+                   UINT_TO_FLOAT(v[2]));
+}
+
+static void GLAPIENTRY
+loopback_SecondaryColor3usvEXT_f( const GLushort *v )
+{
+   SECONDARYCOLORF(USHORT_TO_FLOAT(v[0]),
+                   USHORT_TO_FLOAT(v[1]),
+                   USHORT_TO_FLOAT(v[2]));
+}
+
+static void GLAPIENTRY
+loopback_SecondaryColor3ubvEXT_f( const GLubyte *v )
+{
+   SECONDARYCOLORF(UBYTE_TO_FLOAT(v[0]),
+                   UBYTE_TO_FLOAT(v[1]),
+                   UBYTE_TO_FLOAT(v[2]));
+}
+
+
+/*
+ * GL_NV_vertex_program
+ */
+
+static void GLAPIENTRY
+loopback_VertexAttrib1sNV(GLuint index, GLshort x)
+{
+   ATTRIB1(index, (GLfloat) x);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib1fNV(GLuint index, GLfloat x)
+{
+   ATTRIB1(index, x);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib1dNV(GLuint index, GLdouble x)
+{
+   ATTRIB1(index, (GLfloat) x);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib2sNV(GLuint index, GLshort x, GLshort y)
+{
+   ATTRIB2(index, (GLfloat) x, y);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib2fNV(GLuint index, GLfloat x, GLfloat y)
+{
+   ATTRIB2(index, (GLfloat) x, y);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib2dNV(GLuint index, GLdouble x, GLdouble y)
+{
+   ATTRIB2(index, (GLfloat) x, (GLfloat) y);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib3sNV(GLuint index, GLshort x, GLshort y, GLshort z)
+{
+   ATTRIB3(index, (GLfloat) x, y, z);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib3fNV(GLuint index, GLfloat x, GLfloat y, GLfloat z)
+{
+   ATTRIB3(index, x, y, z);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib3dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z)
+{
+   ATTRIB4(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib4sNV(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
+{
+   ATTRIB4(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib4dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
+{
+   ATTRIB4(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib4ubNV(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
+{
+   ATTRIB4(index, UBYTE_TO_FLOAT(x), UBYTE_TO_FLOAT(y),
+	UBYTE_TO_FLOAT(z), UBYTE_TO_FLOAT(w));
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib1svNV(GLuint index, const GLshort *v)
+{
+   ATTRIB1(index, (GLfloat) v[0]);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib1fvNV(GLuint index, const GLfloat *v)
+{
+   ATTRIB1(index, v[0]);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib1dvNV(GLuint index, const GLdouble *v)
+{
+   ATTRIB1(index, (GLfloat) v[0]);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib2svNV(GLuint index, const GLshort *v)
+{
+   ATTRIB2(index, (GLfloat) v[0], (GLfloat) v[1]);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib2fvNV(GLuint index, const GLfloat *v)
+{
+   ATTRIB2(index, v[0], v[1]);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib2dvNV(GLuint index, const GLdouble *v)
+{
+   ATTRIB2(index, (GLfloat) v[0], (GLfloat) v[1]);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib3svNV(GLuint index, const GLshort *v)
+{
+   ATTRIB2(index, (GLfloat) v[0], (GLfloat) v[1]);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib3fvNV(GLuint index, const GLfloat *v)
+{
+   ATTRIB3(index, v[0], v[1], v[2]);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib3dvNV(GLuint index, const GLdouble *v)
+{
+   ATTRIB3(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib4svNV(GLuint index, const GLshort *v)
+{
+   ATTRIB4(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 
+	  (GLfloat)v[3]);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib4fvNV(GLuint index, const GLfloat *v)
+{
+   ATTRIB4(index, v[0], v[1], v[2], v[3]);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib4dvNV(GLuint index, const GLdouble *v)
+{
+   ATTRIB4(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib4ubvNV(GLuint index, const GLubyte *v)
+{
+   ATTRIB4(index, UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]),
+          UBYTE_TO_FLOAT(v[2]), UBYTE_TO_FLOAT(v[3]));
+}
+
+
+static void GLAPIENTRY
+loopback_VertexAttribs1svNV(GLuint index, GLsizei n, const GLshort *v)
+{
+   GLint i;
+   for (i = n - 1; i >= 0; i--)
+      loopback_VertexAttrib1svNV(index + i, v + i);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttribs1fvNV(GLuint index, GLsizei n, const GLfloat *v)
+{
+   GLint i;
+   for (i = n - 1; i >= 0; i--)
+      loopback_VertexAttrib1fvNV(index + i, v + i);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttribs1dvNV(GLuint index, GLsizei n, const GLdouble *v)
+{
+   GLint i;
+   for (i = n - 1; i >= 0; i--)
+      loopback_VertexAttrib1dvNV(index + i, v + i);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttribs2svNV(GLuint index, GLsizei n, const GLshort *v)
+{
+   GLint i;
+   for (i = n - 1; i >= 0; i--)
+      loopback_VertexAttrib2svNV(index + i, v + 2 * i);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttribs2fvNV(GLuint index, GLsizei n, const GLfloat *v)
+{
+   GLint i;
+   for (i = n - 1; i >= 0; i--)
+      loopback_VertexAttrib2fvNV(index + i, v + 2 * i);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttribs2dvNV(GLuint index, GLsizei n, const GLdouble *v)
+{
+   GLint i;
+   for (i = n - 1; i >= 0; i--)
+      loopback_VertexAttrib2dvNV(index + i, v + 2 * i);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttribs3svNV(GLuint index, GLsizei n, const GLshort *v)
+{
+   GLint i;
+   for (i = n - 1; i >= 0; i--)
+      loopback_VertexAttrib3svNV(index + i, v + 3 * i);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttribs3fvNV(GLuint index, GLsizei n, const GLfloat *v)
+{
+   GLint i;
+   for (i = n - 1; i >= 0; i--)
+      loopback_VertexAttrib3fvNV(index + i, v + 3 * i);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttribs3dvNV(GLuint index, GLsizei n, const GLdouble *v)
+{
+   GLint i;
+   for (i = n - 1; i >= 0; i--)
+      loopback_VertexAttrib3dvNV(index + i, v + 3 * i);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttribs4svNV(GLuint index, GLsizei n, const GLshort *v)
+{
+   GLint i;
+   for (i = n - 1; i >= 0; i--)
+      loopback_VertexAttrib4svNV(index + i, v + 4 * i);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttribs4fvNV(GLuint index, GLsizei n, const GLfloat *v)
+{
+   GLint i;
+   for (i = n - 1; i >= 0; i--)
+      loopback_VertexAttrib4fvNV(index + i, v + 4 * i);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttribs4dvNV(GLuint index, GLsizei n, const GLdouble *v)
+{
+   GLint i;
+   for (i = n - 1; i >= 0; i--)
+      loopback_VertexAttrib4dvNV(index + i, v + 4 * i);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v)
+{
+   GLint i;
+   for (i = n - 1; i >= 0; i--)
+      loopback_VertexAttrib4ubvNV(index + i, v + 4 * i);
+}
+
+
+/*
+ * GL_ARB_vertex_program
+ */
+
+static void GLAPIENTRY
+loopback_VertexAttrib4bvARB(GLuint index, const GLbyte * v)
+{
+   ATTRIB4(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib4ivARB(GLuint index, const GLint * v)
+{
+   ATTRIB4(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib4ubvARB(GLuint index, const GLubyte * v)
+{
+   ATTRIB4(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib4usvARB(GLuint index, const GLushort * v)
+{
+   ATTRIB4(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib4uivARB(GLuint index, const GLuint * v)
+{
+   ATTRIB4(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib4NbvARB(GLuint index, const GLbyte * v)
+{
+   ATTRIB4(index, BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]),
+          BYTE_TO_FLOAT(v[2]), BYTE_TO_FLOAT(v[3]));
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib4NsvARB(GLuint index, const GLshort * v)
+{
+   ATTRIB4(index, SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]),
+          SHORT_TO_FLOAT(v[2]), SHORT_TO_FLOAT(v[3]));
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib4NivARB(GLuint index, const GLint * v)
+{
+   ATTRIB4(index, INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]),
+          INT_TO_FLOAT(v[2]), INT_TO_FLOAT(v[3]));
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib4NusvARB(GLuint index, const GLushort * v)
+{
+   ATTRIB4(index, USHORT_TO_FLOAT(v[0]), USHORT_TO_FLOAT(v[1]),
+          USHORT_TO_FLOAT(v[2]), USHORT_TO_FLOAT(v[3]));
+}
+
+static void GLAPIENTRY
+loopback_VertexAttrib4NuivARB(GLuint index, const GLuint * v)
+{
+   ATTRIB4(index, UINT_TO_FLOAT(v[0]), UINT_TO_FLOAT(v[1]),
+          UINT_TO_FLOAT(v[2]), UINT_TO_FLOAT(v[3]));
+}
+
+
+
+
+/*
+ * This code never registers handlers for any of the entry points
+ * listed in vtxfmt.h.
+ */
+void
+_mesa_loopback_init_api_table( struct _glapi_table *dest )
+{
+   dest->Color3b = loopback_Color3b_f;
+   dest->Color3d = loopback_Color3d_f;
+   dest->Color3i = loopback_Color3i_f;
+   dest->Color3s = loopback_Color3s_f;
+   dest->Color3ui = loopback_Color3ui_f;
+   dest->Color3us = loopback_Color3us_f;
+   dest->Color3ub = loopback_Color3ub_f;
+   dest->Color4b = loopback_Color4b_f;
+   dest->Color4d = loopback_Color4d_f;
+   dest->Color4i = loopback_Color4i_f;
+   dest->Color4s = loopback_Color4s_f;
+   dest->Color4ui = loopback_Color4ui_f;
+   dest->Color4us = loopback_Color4us_f;
+   dest->Color4ub = loopback_Color4ub_f;
+   dest->Color3bv = loopback_Color3bv_f;
+   dest->Color3dv = loopback_Color3dv_f;
+   dest->Color3iv = loopback_Color3iv_f;
+   dest->Color3sv = loopback_Color3sv_f;
+   dest->Color3uiv = loopback_Color3uiv_f;
+   dest->Color3usv = loopback_Color3usv_f;
+   dest->Color3ubv = loopback_Color3ubv_f;
+   dest->Color4bv = loopback_Color4bv_f;
+   dest->Color4dv = loopback_Color4dv_f;
+   dest->Color4iv = loopback_Color4iv_f;
+   dest->Color4sv = loopback_Color4sv_f;
+   dest->Color4uiv = loopback_Color4uiv_f;
+   dest->Color4usv = loopback_Color4usv_f;
+   dest->Color4ubv = loopback_Color4ubv_f;
+
+   dest->SecondaryColor3bEXT = loopback_SecondaryColor3bEXT_f;
+   dest->SecondaryColor3dEXT = loopback_SecondaryColor3dEXT_f;
+   dest->SecondaryColor3iEXT = loopback_SecondaryColor3iEXT_f;
+   dest->SecondaryColor3sEXT = loopback_SecondaryColor3sEXT_f;
+   dest->SecondaryColor3uiEXT = loopback_SecondaryColor3uiEXT_f;
+   dest->SecondaryColor3usEXT = loopback_SecondaryColor3usEXT_f;
+   dest->SecondaryColor3ubEXT = loopback_SecondaryColor3ubEXT_f;
+   dest->SecondaryColor3bvEXT = loopback_SecondaryColor3bvEXT_f;
+   dest->SecondaryColor3dvEXT = loopback_SecondaryColor3dvEXT_f;
+   dest->SecondaryColor3ivEXT = loopback_SecondaryColor3ivEXT_f;
+   dest->SecondaryColor3svEXT = loopback_SecondaryColor3svEXT_f;
+   dest->SecondaryColor3uivEXT = loopback_SecondaryColor3uivEXT_f;
+   dest->SecondaryColor3usvEXT = loopback_SecondaryColor3usvEXT_f;
+   dest->SecondaryColor3ubvEXT = loopback_SecondaryColor3ubvEXT_f;
+      
+   dest->Indexd = loopback_Indexd;
+   dest->Indexi = loopback_Indexi;
+   dest->Indexs = loopback_Indexs;
+   dest->Indexub = loopback_Indexub;
+   dest->Indexdv = loopback_Indexdv;
+   dest->Indexiv = loopback_Indexiv;
+   dest->Indexsv = loopback_Indexsv;
+   dest->Indexubv = loopback_Indexubv;
+   dest->Normal3b = loopback_Normal3b;
+   dest->Normal3d = loopback_Normal3d;
+   dest->Normal3i = loopback_Normal3i;
+   dest->Normal3s = loopback_Normal3s;
+   dest->Normal3bv = loopback_Normal3bv;
+   dest->Normal3dv = loopback_Normal3dv;
+   dest->Normal3iv = loopback_Normal3iv;
+   dest->Normal3sv = loopback_Normal3sv;
+   dest->TexCoord1d = loopback_TexCoord1d;
+   dest->TexCoord1i = loopback_TexCoord1i;
+   dest->TexCoord1s = loopback_TexCoord1s;
+   dest->TexCoord2d = loopback_TexCoord2d;
+   dest->TexCoord2s = loopback_TexCoord2s;
+   dest->TexCoord2i = loopback_TexCoord2i;
+   dest->TexCoord3d = loopback_TexCoord3d;
+   dest->TexCoord3i = loopback_TexCoord3i;
+   dest->TexCoord3s = loopback_TexCoord3s;
+   dest->TexCoord4d = loopback_TexCoord4d;
+   dest->TexCoord4i = loopback_TexCoord4i;
+   dest->TexCoord4s = loopback_TexCoord4s;
+   dest->TexCoord1dv = loopback_TexCoord1dv;
+   dest->TexCoord1iv = loopback_TexCoord1iv;
+   dest->TexCoord1sv = loopback_TexCoord1sv;
+   dest->TexCoord2dv = loopback_TexCoord2dv;
+   dest->TexCoord2iv = loopback_TexCoord2iv;
+   dest->TexCoord2sv = loopback_TexCoord2sv;
+   dest->TexCoord3dv = loopback_TexCoord3dv;
+   dest->TexCoord3iv = loopback_TexCoord3iv;
+   dest->TexCoord3sv = loopback_TexCoord3sv;
+   dest->TexCoord4dv = loopback_TexCoord4dv;
+   dest->TexCoord4iv = loopback_TexCoord4iv;
+   dest->TexCoord4sv = loopback_TexCoord4sv;
+   dest->Vertex2d = loopback_Vertex2d;
+   dest->Vertex2i = loopback_Vertex2i;
+   dest->Vertex2s = loopback_Vertex2s;
+   dest->Vertex3d = loopback_Vertex3d;
+   dest->Vertex3i = loopback_Vertex3i;
+   dest->Vertex3s = loopback_Vertex3s;
+   dest->Vertex4d = loopback_Vertex4d;
+   dest->Vertex4i = loopback_Vertex4i;
+   dest->Vertex4s = loopback_Vertex4s;
+   dest->Vertex2dv = loopback_Vertex2dv;
+   dest->Vertex2iv = loopback_Vertex2iv;
+   dest->Vertex2sv = loopback_Vertex2sv;
+   dest->Vertex3dv = loopback_Vertex3dv;
+   dest->Vertex3iv = loopback_Vertex3iv;
+   dest->Vertex3sv = loopback_Vertex3sv;
+   dest->Vertex4dv = loopback_Vertex4dv;
+   dest->Vertex4iv = loopback_Vertex4iv;
+   dest->Vertex4sv = loopback_Vertex4sv;
+   dest->MultiTexCoord1dARB = loopback_MultiTexCoord1dARB;
+   dest->MultiTexCoord1dvARB = loopback_MultiTexCoord1dvARB;
+   dest->MultiTexCoord1iARB = loopback_MultiTexCoord1iARB;
+   dest->MultiTexCoord1ivARB = loopback_MultiTexCoord1ivARB;
+   dest->MultiTexCoord1sARB = loopback_MultiTexCoord1sARB;
+   dest->MultiTexCoord1svARB = loopback_MultiTexCoord1svARB;
+   dest->MultiTexCoord2dARB = loopback_MultiTexCoord2dARB;
+   dest->MultiTexCoord2dvARB = loopback_MultiTexCoord2dvARB;
+   dest->MultiTexCoord2iARB = loopback_MultiTexCoord2iARB;
+   dest->MultiTexCoord2ivARB = loopback_MultiTexCoord2ivARB;
+   dest->MultiTexCoord2sARB = loopback_MultiTexCoord2sARB;
+   dest->MultiTexCoord2svARB = loopback_MultiTexCoord2svARB;
+   dest->MultiTexCoord3dARB = loopback_MultiTexCoord3dARB;
+   dest->MultiTexCoord3dvARB = loopback_MultiTexCoord3dvARB;
+   dest->MultiTexCoord3iARB = loopback_MultiTexCoord3iARB;
+   dest->MultiTexCoord3ivARB = loopback_MultiTexCoord3ivARB;
+   dest->MultiTexCoord3sARB = loopback_MultiTexCoord3sARB;
+   dest->MultiTexCoord3svARB = loopback_MultiTexCoord3svARB;
+   dest->MultiTexCoord4dARB = loopback_MultiTexCoord4dARB;
+   dest->MultiTexCoord4dvARB = loopback_MultiTexCoord4dvARB;
+   dest->MultiTexCoord4iARB = loopback_MultiTexCoord4iARB;
+   dest->MultiTexCoord4ivARB = loopback_MultiTexCoord4ivARB;
+   dest->MultiTexCoord4sARB = loopback_MultiTexCoord4sARB;
+   dest->MultiTexCoord4svARB = loopback_MultiTexCoord4svARB;
+   dest->EvalCoord2dv = loopback_EvalCoord2dv;
+   dest->EvalCoord2fv = loopback_EvalCoord2fv;
+   dest->EvalCoord2d = loopback_EvalCoord2d;
+   dest->EvalCoord1dv = loopback_EvalCoord1dv;
+   dest->EvalCoord1fv = loopback_EvalCoord1fv;
+   dest->EvalCoord1d = loopback_EvalCoord1d;
+   dest->Materialf = loopback_Materialf;
+   dest->Materiali = loopback_Materiali;
+   dest->Materialiv = loopback_Materialiv;
+   dest->Rectd = loopback_Rectd;
+   dest->Rectdv = loopback_Rectdv;
+   dest->Rectfv = loopback_Rectfv;
+   dest->Recti = loopback_Recti;
+   dest->Rectiv = loopback_Rectiv;
+   dest->Rects = loopback_Rects;
+   dest->Rectsv = loopback_Rectsv;
+   dest->FogCoorddEXT = loopback_FogCoorddEXT;
+   dest->FogCoorddvEXT = loopback_FogCoorddvEXT;
+
+   dest->VertexAttrib1sNV = loopback_VertexAttrib1sNV;
+   dest->VertexAttrib1fNV = loopback_VertexAttrib1fNV;
+   dest->VertexAttrib1dNV = loopback_VertexAttrib1dNV;
+   dest->VertexAttrib2sNV = loopback_VertexAttrib2sNV;
+   dest->VertexAttrib2fNV = loopback_VertexAttrib2fNV;
+   dest->VertexAttrib2dNV = loopback_VertexAttrib2dNV;
+   dest->VertexAttrib3sNV = loopback_VertexAttrib3sNV;
+   dest->VertexAttrib3fNV = loopback_VertexAttrib3fNV;
+   dest->VertexAttrib3dNV = loopback_VertexAttrib3dNV;
+   dest->VertexAttrib4sNV = loopback_VertexAttrib4sNV;
+   dest->VertexAttrib4dNV = loopback_VertexAttrib4dNV;
+   dest->VertexAttrib4ubNV = loopback_VertexAttrib4ubNV;
+
+   dest->VertexAttrib1svNV = loopback_VertexAttrib1svNV;
+   dest->VertexAttrib1fvNV = loopback_VertexAttrib1fvNV;
+   dest->VertexAttrib1dvNV = loopback_VertexAttrib1dvNV;
+   dest->VertexAttrib2svNV = loopback_VertexAttrib2svNV;
+   dest->VertexAttrib2fvNV = loopback_VertexAttrib2fvNV;
+   dest->VertexAttrib2dvNV = loopback_VertexAttrib2dvNV;
+   dest->VertexAttrib3svNV = loopback_VertexAttrib3svNV;
+   dest->VertexAttrib3fvNV = loopback_VertexAttrib3fvNV;
+   dest->VertexAttrib3dvNV = loopback_VertexAttrib3dvNV;
+   dest->VertexAttrib4svNV = loopback_VertexAttrib4svNV;
+   dest->VertexAttrib4fvNV = loopback_VertexAttrib4fvNV;
+   dest->VertexAttrib4dvNV = loopback_VertexAttrib4dvNV;
+   dest->VertexAttrib4ubvNV = loopback_VertexAttrib4ubvNV;
+
+   dest->VertexAttribs1svNV = loopback_VertexAttribs1svNV;
+   dest->VertexAttribs1fvNV = loopback_VertexAttribs1fvNV;
+   dest->VertexAttribs1dvNV = loopback_VertexAttribs1dvNV;
+   dest->VertexAttribs2svNV = loopback_VertexAttribs2svNV;
+   dest->VertexAttribs2fvNV = loopback_VertexAttribs2fvNV;
+   dest->VertexAttribs2dvNV = loopback_VertexAttribs2dvNV;
+   dest->VertexAttribs3svNV = loopback_VertexAttribs3svNV;
+   dest->VertexAttribs3fvNV = loopback_VertexAttribs3fvNV;
+   dest->VertexAttribs3dvNV = loopback_VertexAttribs3dvNV;
+   dest->VertexAttribs4svNV = loopback_VertexAttribs4svNV;
+   dest->VertexAttribs4fvNV = loopback_VertexAttribs4fvNV;
+   dest->VertexAttribs4dvNV = loopback_VertexAttribs4dvNV;
+   dest->VertexAttribs4ubvNV = loopback_VertexAttribs4ubvNV;
+
+   dest->VertexAttrib4bvARB = loopback_VertexAttrib4bvARB;
+   dest->VertexAttrib4ivARB = loopback_VertexAttrib4ivARB;
+   dest->VertexAttrib4ubvARB = loopback_VertexAttrib4ubvARB;
+   dest->VertexAttrib4usvARB = loopback_VertexAttrib4usvARB;
+   dest->VertexAttrib4uivARB = loopback_VertexAttrib4uivARB;
+   dest->VertexAttrib4NbvARB = loopback_VertexAttrib4NbvARB;
+   dest->VertexAttrib4NsvARB = loopback_VertexAttrib4NsvARB;
+   dest->VertexAttrib4NivARB = loopback_VertexAttrib4NivARB;
+   dest->VertexAttrib4NusvARB = loopback_VertexAttrib4NusvARB;
+   dest->VertexAttrib4NuivARB = loopback_VertexAttrib4NuivARB;
+}
diff --git a/reactos/lib/mesa32/src/main/api_loopback.h b/reactos/lib/mesa32/src/main/api_loopback.h
new file mode 100644
index 00000000000..6f85bbc1d92
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/api_loopback.h
@@ -0,0 +1,37 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+
+#ifndef API_LOOPBACK_H
+#define API_LOOPBACK_H
+
+#include "glheader.h"
+
+
+struct _glapi_table;
+
+extern void _mesa_loopback_init_api_table( struct _glapi_table *dest );
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/api_noop.c b/reactos/lib/mesa32/src/main/api_noop.c
new file mode 100644
index 00000000000..322f9586c4b
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/api_noop.c
@@ -0,0 +1,863 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0.1
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "api_noop.h"
+#include "api_validate.h"
+#include "api_arrayelt.h"
+#include "context.h"
+#include "colormac.h"
+#include "light.h"
+#include "macros.h"
+#include "mtypes.h"
+#include "dlist.h"
+
+
+/* In states where certain vertex components are required for t&l or
+ * rasterization, we still need to keep track of the current values.
+ * These functions provide this service by keeping uptodate the
+ * 'ctx->Current' struct for all data elements not included in the
+ * currently enabled hardware vertex.
+ *
+ */
+void GLAPIENTRY _mesa_noop_EdgeFlag( GLboolean b )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ctx->Current.EdgeFlag = b;
+}
+
+void GLAPIENTRY _mesa_noop_EdgeFlagv( const GLboolean *b )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ctx->Current.EdgeFlag = *b;
+}
+
+void GLAPIENTRY _mesa_noop_Indexf( GLfloat f )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ctx->Current.Index = f;
+}
+
+void GLAPIENTRY _mesa_noop_Indexfv( const GLfloat *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ctx->Current.Index = *v;
+}
+
+void GLAPIENTRY _mesa_noop_FogCoordfEXT( GLfloat a )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_FOG];
+   dest[0] = a;
+   dest[1] = 0.0;
+   dest[2] = 0.0;
+   dest[3] = 1.0;
+}
+
+void GLAPIENTRY _mesa_noop_FogCoordfvEXT( const GLfloat *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_NORMAL];
+   dest[0] = v[0];
+   dest[1] = 0.0;
+   dest[2] = 0.0;
+   dest[3] = 1.0;
+}
+
+void GLAPIENTRY _mesa_noop_Normal3f( GLfloat a, GLfloat b, GLfloat c )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_NORMAL];
+   dest[0] = a;
+   dest[1] = b;
+   dest[2] = c;
+   dest[3] = 1.0;
+}
+
+void GLAPIENTRY _mesa_noop_Normal3fv( const GLfloat *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_NORMAL];
+   dest[0] = v[0];
+   dest[1] = v[1];
+   dest[2] = v[2];
+   dest[3] = 1.0;
+}
+
+void GLAPIENTRY _mesa_noop_Color4f( GLfloat a, GLfloat b, GLfloat c, GLfloat d )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat *color = ctx->Current.Attrib[VERT_ATTRIB_COLOR0];
+   color[0] = a;
+   color[1] = b;
+   color[2] = c;
+   color[3] = d;
+}
+
+void GLAPIENTRY _mesa_noop_Color4fv( const GLfloat *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat *color = ctx->Current.Attrib[VERT_ATTRIB_COLOR0];
+   color[0] = v[0];
+   color[1] = v[1];
+   color[2] = v[2];
+   color[3] = v[3];
+}
+
+void GLAPIENTRY _mesa_noop_Color3f( GLfloat a, GLfloat b, GLfloat c )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat *color = ctx->Current.Attrib[VERT_ATTRIB_COLOR0];
+   color[0] = a;
+   color[1] = b;
+   color[2] = c;
+   color[3] = 1.0;
+}
+
+void GLAPIENTRY _mesa_noop_Color3fv( const GLfloat *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat *color = ctx->Current.Attrib[VERT_ATTRIB_COLOR0];
+   color[0] = v[0];
+   color[1] = v[1];
+   color[2] = v[2];
+   color[3] = 1.0;
+}
+
+void GLAPIENTRY _mesa_noop_MultiTexCoord1fARB( GLenum target, GLfloat a )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint unit = target - GL_TEXTURE0_ARB;
+
+   /* unit is unsigned -- cannot be less than zero.
+    */
+   if (unit < MAX_TEXTURE_COORD_UNITS)
+   {
+      GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit];
+      dest[0] = a;
+      dest[1] = 0;
+      dest[2] = 0;
+      dest[3] = 1;
+   }
+}
+
+void GLAPIENTRY _mesa_noop_MultiTexCoord1fvARB( GLenum target, const GLfloat *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint unit = target - GL_TEXTURE0_ARB;
+
+   /* unit is unsigned -- cannot be less than zero.
+    */
+   if (unit < MAX_TEXTURE_COORD_UNITS)
+   {
+      GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit];
+      dest[0] = v[0];
+      dest[1] = 0;
+      dest[2] = 0;
+      dest[3] = 1;
+   }
+}
+
+void GLAPIENTRY _mesa_noop_MultiTexCoord2fARB( GLenum target, GLfloat a, GLfloat b )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint unit = target - GL_TEXTURE0_ARB;
+
+   /* unit is unsigned -- cannot be less than zero.
+    */
+   if (unit < MAX_TEXTURE_COORD_UNITS)
+   {
+      GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit];
+      dest[0] = a;
+      dest[1] = b;
+      dest[2] = 0;
+      dest[3] = 1;
+   }
+}
+
+void GLAPIENTRY _mesa_noop_MultiTexCoord2fvARB( GLenum target, const GLfloat *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint unit = target - GL_TEXTURE0_ARB;
+
+   /* unit is unsigned -- cannot be less than zero.
+    */
+   if (unit < MAX_TEXTURE_COORD_UNITS)
+   {
+      GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit];
+      dest[0] = v[0];
+      dest[1] = v[1];
+      dest[2] = 0;
+      dest[3] = 1;
+   }
+}
+
+void GLAPIENTRY _mesa_noop_MultiTexCoord3fARB( GLenum target, GLfloat a, GLfloat b, GLfloat c)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint unit = target - GL_TEXTURE0_ARB;
+
+   /* unit is unsigned -- cannot be less than zero.
+    */
+   if (unit < MAX_TEXTURE_COORD_UNITS)
+   {
+      GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit];
+      dest[0] = a;
+      dest[1] = b;
+      dest[2] = c;
+      dest[3] = 1;
+   }
+}
+
+void GLAPIENTRY _mesa_noop_MultiTexCoord3fvARB( GLenum target, const GLfloat *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint unit = target - GL_TEXTURE0_ARB;
+
+   /* unit is unsigned -- cannot be less than zero.
+    */
+   if (unit < MAX_TEXTURE_COORD_UNITS)
+   {
+      GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit];
+      dest[0] = v[0];
+      dest[1] = v[1];
+      dest[2] = v[2];
+      dest[3] = 1;
+   }
+}
+
+void GLAPIENTRY _mesa_noop_MultiTexCoord4fARB( GLenum target, GLfloat a, GLfloat b,
+			      GLfloat c, GLfloat d )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint unit = target - GL_TEXTURE0_ARB;
+
+   /* unit is unsigned -- cannot be less than zero.
+    */
+   if (unit < MAX_TEXTURE_COORD_UNITS)
+   {
+      GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit];
+      dest[0] = a;
+      dest[1] = b;
+      dest[2] = c;
+      dest[3] = d;
+   }
+}
+
+void GLAPIENTRY _mesa_noop_MultiTexCoord4fvARB( GLenum target, const GLfloat *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint unit = target - GL_TEXTURE0_ARB;
+
+   /* unit is unsigned -- cannot be less than zero.
+    */
+   if (unit < MAX_TEXTURE_COORD_UNITS)
+   {
+      GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit];
+      dest[0] = v[0];
+      dest[1] = v[1];
+      dest[2] = v[2];
+      dest[3] = v[3];
+   }
+}
+
+void GLAPIENTRY _mesa_noop_SecondaryColor3fEXT( GLfloat a, GLfloat b, GLfloat c )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat *color = ctx->Current.Attrib[VERT_ATTRIB_COLOR1];
+   color[0] = a;
+   color[1] = b;
+   color[2] = c;
+   color[3] = 1.0;
+}
+
+void GLAPIENTRY _mesa_noop_SecondaryColor3fvEXT( const GLfloat *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat *color = ctx->Current.Attrib[VERT_ATTRIB_COLOR1];
+   color[0] = v[0];
+   color[1] = v[1];
+   color[2] = v[2];
+   color[3] = 1.0;
+}
+
+void GLAPIENTRY _mesa_noop_TexCoord1f( GLfloat a )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0];
+   dest[0] = a;
+   dest[1] = 0;
+   dest[2] = 0;
+   dest[3] = 1;
+}
+
+void GLAPIENTRY _mesa_noop_TexCoord1fv( const GLfloat *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0];
+   dest[0] = v[0];
+   dest[1] = 0;
+   dest[2] = 0;
+   dest[3] = 1;
+}
+
+void GLAPIENTRY _mesa_noop_TexCoord2f( GLfloat a, GLfloat b )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0];
+   dest[0] = a;
+   dest[1] = b;
+   dest[2] = 0;
+   dest[3] = 1;
+}
+
+void GLAPIENTRY _mesa_noop_TexCoord2fv( const GLfloat *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0];
+   dest[0] = v[0];
+   dest[1] = v[1];
+   dest[2] = 0;
+   dest[3] = 1;
+}
+
+void GLAPIENTRY _mesa_noop_TexCoord3f( GLfloat a, GLfloat b, GLfloat c )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0];
+   dest[0] = a;
+   dest[1] = b;
+   dest[2] = c;
+   dest[3] = 1;
+}
+
+void GLAPIENTRY _mesa_noop_TexCoord3fv( const GLfloat *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0];
+   dest[0] = v[0];
+   dest[1] = v[1];
+   dest[2] = v[2];
+   dest[3] = 1;
+}
+
+void GLAPIENTRY _mesa_noop_TexCoord4f( GLfloat a, GLfloat b, GLfloat c, GLfloat d )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0];
+   dest[0] = a;
+   dest[1] = b;
+   dest[2] = c;
+   dest[3] = d;
+}
+
+void GLAPIENTRY _mesa_noop_TexCoord4fv( const GLfloat *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0];
+   dest[0] = v[0];
+   dest[1] = v[1];
+   dest[2] = v[2];
+   dest[3] = v[3];
+}
+
+
+
+void GLAPIENTRY _mesa_noop_VertexAttrib1fNV( GLuint index, GLfloat x )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index < VERT_ATTRIB_MAX) {
+      ASSIGN_4V(ctx->Current.Attrib[index], x, 0, 0, 1);
+   }
+   else
+      _mesa_error( ctx, GL_INVALID_ENUM, "glVertexAttrib1f" );
+}
+
+void GLAPIENTRY _mesa_noop_VertexAttrib1fvNV( GLuint index, const GLfloat *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index < VERT_ATTRIB_MAX) {
+      ASSIGN_4V(ctx->Current.Attrib[index], v[0], 0, 0, 1);
+   }
+   else
+      _mesa_error( ctx, GL_INVALID_ENUM, "glVertexAttrib1fv" );
+}
+
+void GLAPIENTRY _mesa_noop_VertexAttrib2fNV( GLuint index, GLfloat x, GLfloat y )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index < VERT_ATTRIB_MAX) {
+      ASSIGN_4V(ctx->Current.Attrib[index], x, y, 0, 1);
+   }
+   else
+      _mesa_error( ctx, GL_INVALID_ENUM, "glVertexAttrib2f" );
+}
+
+void GLAPIENTRY _mesa_noop_VertexAttrib2fvNV( GLuint index, const GLfloat *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index < VERT_ATTRIB_MAX) {
+      ASSIGN_4V(ctx->Current.Attrib[index], v[0], v[1], 0, 1);
+   }
+   else
+      _mesa_error( ctx, GL_INVALID_ENUM, "glVertexAttrib2fv" );
+}
+
+void GLAPIENTRY _mesa_noop_VertexAttrib3fNV( GLuint index, GLfloat x,
+                                  GLfloat y, GLfloat z )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index < VERT_ATTRIB_MAX) {
+      ASSIGN_4V(ctx->Current.Attrib[index], x, y, z, 1);
+   }
+   else
+      _mesa_error( ctx, GL_INVALID_ENUM, "glVertexAttrib3f" );
+}
+
+void GLAPIENTRY _mesa_noop_VertexAttrib3fvNV( GLuint index, const GLfloat *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index < VERT_ATTRIB_MAX) {
+      ASSIGN_4V(ctx->Current.Attrib[index], v[0], v[1], v[2], 1);
+   }
+   else
+      _mesa_error( ctx, GL_INVALID_ENUM, "glVertexAttrib3fv" );
+}
+
+void GLAPIENTRY _mesa_noop_VertexAttrib4fNV( GLuint index, GLfloat x,
+                                  GLfloat y, GLfloat z, GLfloat w )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index < VERT_ATTRIB_MAX) {
+      ASSIGN_4V(ctx->Current.Attrib[index], x, y, z, w);
+   }
+   else
+      _mesa_error( ctx, GL_INVALID_ENUM, "glVertexAttrib4f" );
+}
+
+void GLAPIENTRY _mesa_noop_VertexAttrib4fvNV( GLuint index, const GLfloat *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index < VERT_ATTRIB_MAX) {
+      ASSIGN_4V(ctx->Current.Attrib[index], v[0], v[1], v[2], v[3]);
+   }
+   else
+      _mesa_error( ctx, GL_INVALID_ENUM, "glVertexAttrib4fv" );
+}
+
+/* Material
+ */
+void GLAPIENTRY _mesa_noop_Materialfv( GLenum face, GLenum pname, const GLfloat *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint i, nr;
+   struct gl_material *mat = &ctx->Light.Material;
+   GLuint bitmask = _mesa_material_bitmask( ctx, face, pname, ~0,
+                                            "_mesa_noop_Materialfv" );
+
+   if (ctx->Light.ColorMaterialEnabled)
+      bitmask &= ~ctx->Light.ColorMaterialBitmask;
+
+   if (bitmask == 0)
+      return;
+
+   switch (face) {
+   case GL_SHININESS: nr = 1; break;
+   case GL_COLOR_INDEXES: nr = 3; break;
+   default: nr = 4 ; break;
+   }
+
+   for (i = 0 ; i < MAT_ATTRIB_MAX ; i++) 
+      if (bitmask & (1<<i))
+	 COPY_SZ_4V( mat->Attrib[i], nr, params ); 
+
+   _mesa_update_material( ctx, bitmask );
+}
+
+/* These really are noops outside begin/end:
+ */
+void GLAPIENTRY _mesa_noop_Vertex2fv( const GLfloat *v )
+{
+   (void) v;
+}
+
+void GLAPIENTRY _mesa_noop_Vertex3fv( const GLfloat *v )
+{
+   (void) v;
+}
+
+void GLAPIENTRY _mesa_noop_Vertex4fv( const GLfloat *v )
+{
+   (void) v;
+}
+
+void GLAPIENTRY _mesa_noop_Vertex2f( GLfloat a, GLfloat b )
+{
+   (void) a; (void) b;
+}
+
+void GLAPIENTRY _mesa_noop_Vertex3f( GLfloat a, GLfloat b, GLfloat c )
+{
+   (void) a; (void) b; (void) c;
+}
+
+void GLAPIENTRY _mesa_noop_Vertex4f( GLfloat a, GLfloat b, GLfloat c, GLfloat d )
+{
+   (void) a; (void) b; (void) c; (void) d;
+}
+
+/* Similarly, these have no effect outside begin/end:
+ */
+void GLAPIENTRY _mesa_noop_EvalCoord1f( GLfloat a )
+{
+   (void) a;
+}
+
+void GLAPIENTRY _mesa_noop_EvalCoord1fv( const GLfloat *v )
+{
+   (void) v;
+}
+
+void GLAPIENTRY _mesa_noop_EvalCoord2f( GLfloat a, GLfloat b )
+{
+   (void) a; (void) b;
+}
+
+void GLAPIENTRY _mesa_noop_EvalCoord2fv( const GLfloat *v )
+{
+   (void) v;
+}
+
+void GLAPIENTRY _mesa_noop_EvalPoint1( GLint a )
+{
+   (void) a;
+}
+
+void GLAPIENTRY _mesa_noop_EvalPoint2( GLint a, GLint b )
+{
+   (void) a; (void) b;
+}
+
+
+/* Begin -- call into driver, should result in the vtxfmt being
+ * swapped out:
+ */
+void GLAPIENTRY _mesa_noop_Begin( GLenum mode )
+{
+}
+
+
+/* End -- just raise an error
+ */
+void GLAPIENTRY _mesa_noop_End( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_error( ctx, GL_INVALID_OPERATION, "glEnd" );
+}
+
+
+/* Execute a glRectf() function.  This is not suitable for GL_COMPILE
+ * modes (as the test for outside begin/end is not compiled),
+ * but may be useful for drivers in circumstances which exclude
+ * display list interactions.
+ *
+ * (None of the functions in this file are suitable for GL_COMPILE
+ * modes).
+ */
+void GLAPIENTRY _mesa_noop_Rectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 )
+{
+   {
+      GET_CURRENT_CONTEXT(ctx);
+      ASSERT_OUTSIDE_BEGIN_END(ctx);
+   }
+
+   glBegin( GL_QUADS );
+   glVertex2f( x1, y1 );
+   glVertex2f( x2, y1 );
+   glVertex2f( x2, y2 );
+   glVertex2f( x1, y2 );
+   glEnd();
+}
+
+
+/* Some very basic support for arrays.  Drivers without explicit array
+ * support can hook these in, but still need to supply an array-elt
+ * implementation.
+ */
+void GLAPIENTRY _mesa_noop_DrawArrays(GLenum mode, GLint start, GLsizei count)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint i;
+
+   if (!_mesa_validate_DrawArrays( ctx, mode, start, count ))
+      return;
+
+   glBegin(mode);
+   for (i = 0; i < count; i++)
+      glArrayElement(start + i);
+   glEnd();
+}
+
+
+void GLAPIENTRY _mesa_noop_DrawElements(GLenum mode, GLsizei count, GLenum type,
+			     const GLvoid *indices)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint i;
+
+   if (!_mesa_validate_DrawElements( ctx, mode, count, type, indices ))
+      return;
+
+   glBegin(mode);
+
+   switch (type) {
+   case GL_UNSIGNED_BYTE:
+      for (i = 0 ; i < count ; i++)
+	 glArrayElement( ((GLubyte *)indices)[i] );
+      break;
+   case GL_UNSIGNED_SHORT:
+      for (i = 0 ; i < count ; i++)
+	 glArrayElement( ((GLushort *)indices)[i] );
+      break;
+   case GL_UNSIGNED_INT:
+      for (i = 0 ; i < count ; i++)
+	 glArrayElement( ((GLuint *)indices)[i] );
+      break;
+   default:
+      _mesa_error( ctx, GL_INVALID_ENUM, "glDrawElements(type)" );
+      break;
+   }
+
+   glEnd();
+}
+
+void GLAPIENTRY _mesa_noop_DrawRangeElements(GLenum mode,
+				  GLuint start, GLuint end,
+				  GLsizei count, GLenum type,
+				  const GLvoid *indices)
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (_mesa_validate_DrawRangeElements( ctx, mode,
+					 start, end,
+					 count, type, indices ))
+      glDrawElements( mode, count, type, indices );
+}
+
+/*
+ * Eval Mesh
+ */
+
+/* KW: If are compiling, we don't know whether eval will produce a
+ *     vertex when it is run in the future.  If this is pure immediate
+ *     mode, eval is a noop if neither vertex map is enabled.
+ *
+ *     Thus we need to have a check in the display list code or
+ *     elsewhere for eval(1,2) vertices in the case where
+ *     map(1,2)_vertex is disabled, and to purge those vertices from
+ *     the vb.
+ */
+void GLAPIENTRY _mesa_noop_EvalMesh1( GLenum mode, GLint i1, GLint i2 )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint i;
+   GLfloat u, du;
+   GLenum prim;
+
+   switch (mode) {
+   case GL_POINT:
+      prim = GL_POINTS;
+      break;
+   case GL_LINE:
+      prim = GL_LINE_STRIP;
+      break;
+   default:
+      _mesa_error( ctx, GL_INVALID_ENUM, "glEvalMesh1(mode)" );
+      return;
+   }
+
+   /* No effect if vertex maps disabled.
+    */
+   if (!ctx->Eval.Map1Vertex4 && 
+       !ctx->Eval.Map1Vertex3 &&
+       !(ctx->VertexProgram.Enabled && ctx->Eval.Map1Attrib[VERT_ATTRIB_POS]))
+      return;
+
+   du = ctx->Eval.MapGrid1du;
+   u = ctx->Eval.MapGrid1u1 + i1 * du;
+
+   glBegin( prim );
+   for (i=i1;i<=i2;i++,u+=du) {
+      glEvalCoord1f( u );
+   }
+   glEnd();
+}
+
+
+
+void GLAPIENTRY _mesa_noop_EvalMesh2( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat u, du, v, dv, v1, u1;
+   GLint i, j;
+
+   switch (mode) {
+   case GL_POINT:
+   case GL_LINE:
+   case GL_FILL:
+      break;
+   default:
+      _mesa_error( ctx, GL_INVALID_ENUM, "glEvalMesh2(mode)" );
+      return;
+   }
+
+   /* No effect if vertex maps disabled.
+    */
+   if (!ctx->Eval.Map2Vertex4 && 
+       !ctx->Eval.Map2Vertex3 &&
+       !(ctx->VertexProgram.Enabled && ctx->Eval.Map2Attrib[VERT_ATTRIB_POS]))
+      return;
+
+   du = ctx->Eval.MapGrid2du;
+   dv = ctx->Eval.MapGrid2dv;
+   v1 = ctx->Eval.MapGrid2v1 + j1 * dv;
+   u1 = ctx->Eval.MapGrid2u1 + i1 * du;
+
+   switch (mode) {
+   case GL_POINT:
+      glBegin( GL_POINTS );
+      for (v=v1,j=j1;j<=j2;j++,v+=dv) {
+	 for (u=u1,i=i1;i<=i2;i++,u+=du) {
+	    glEvalCoord2f(u, v );
+	 }
+      }
+      glEnd();
+      break;
+   case GL_LINE:
+      for (v=v1,j=j1;j<=j2;j++,v+=dv) {
+	 glBegin( GL_LINE_STRIP );
+	 for (u=u1,i=i1;i<=i2;i++,u+=du) {
+	    glEvalCoord2f(u, v );
+	 }
+	 glEnd();
+      }
+      for (u=u1,i=i1;i<=i2;i++,u+=du) {
+	 glBegin( GL_LINE_STRIP );
+	 for (v=v1,j=j1;j<=j2;j++,v+=dv) {
+	    glEvalCoord2f(u, v );
+	 }
+	 glEnd();
+      }
+      break;
+   case GL_FILL:
+      for (v=v1,j=j1;j<j2;j++,v+=dv) {
+	 glBegin( GL_TRIANGLE_STRIP );
+	 for (u=u1,i=i1;i<=i2;i++,u+=du) {
+	    glEvalCoord2f(u, v );
+	    glEvalCoord2f(u, v+dv );
+	 }
+	 glEnd();
+      }
+      break;
+   default:
+      _mesa_error( ctx, GL_INVALID_ENUM, "glEvalMesh2(mode)" );
+      return;
+   }
+}
+
+
+
+/* Build a vertexformat full of things to use outside begin/end pairs.
+ * 
+ * TODO -- build a whole dispatch table for this purpose, and likewise
+ * for inside begin/end.
+ */
+void _mesa_noop_vtxfmt_init( GLvertexformat *vfmt )
+{
+   vfmt->ArrayElement = _ae_loopback_array_elt;	        /* generic helper */
+   vfmt->Begin = _mesa_noop_Begin;
+   vfmt->CallList = _mesa_CallList;
+   vfmt->CallLists = _mesa_CallLists;
+   vfmt->Color3f = _mesa_noop_Color3f;
+   vfmt->Color3fv = _mesa_noop_Color3fv;
+   vfmt->Color4f = _mesa_noop_Color4f;
+   vfmt->Color4fv = _mesa_noop_Color4fv;
+   vfmt->EdgeFlag = _mesa_noop_EdgeFlag;
+   vfmt->EdgeFlagv = _mesa_noop_EdgeFlagv;
+   vfmt->End = _mesa_noop_End;
+   vfmt->EvalCoord1f = _mesa_noop_EvalCoord1f;
+   vfmt->EvalCoord1fv = _mesa_noop_EvalCoord1fv;
+   vfmt->EvalCoord2f = _mesa_noop_EvalCoord2f;
+   vfmt->EvalCoord2fv = _mesa_noop_EvalCoord2fv;
+   vfmt->EvalPoint1 = _mesa_noop_EvalPoint1;
+   vfmt->EvalPoint2 = _mesa_noop_EvalPoint2;
+   vfmt->FogCoordfEXT = _mesa_noop_FogCoordfEXT;
+   vfmt->FogCoordfvEXT = _mesa_noop_FogCoordfvEXT;
+   vfmt->Indexf = _mesa_noop_Indexf;
+   vfmt->Indexfv = _mesa_noop_Indexfv;
+   vfmt->Materialfv = _mesa_noop_Materialfv;
+   vfmt->MultiTexCoord1fARB = _mesa_noop_MultiTexCoord1fARB;
+   vfmt->MultiTexCoord1fvARB = _mesa_noop_MultiTexCoord1fvARB;
+   vfmt->MultiTexCoord2fARB = _mesa_noop_MultiTexCoord2fARB;
+   vfmt->MultiTexCoord2fvARB = _mesa_noop_MultiTexCoord2fvARB;
+   vfmt->MultiTexCoord3fARB = _mesa_noop_MultiTexCoord3fARB;
+   vfmt->MultiTexCoord3fvARB = _mesa_noop_MultiTexCoord3fvARB;
+   vfmt->MultiTexCoord4fARB = _mesa_noop_MultiTexCoord4fARB;
+   vfmt->MultiTexCoord4fvARB = _mesa_noop_MultiTexCoord4fvARB;
+   vfmt->Normal3f = _mesa_noop_Normal3f;
+   vfmt->Normal3fv = _mesa_noop_Normal3fv;
+   vfmt->SecondaryColor3fEXT = _mesa_noop_SecondaryColor3fEXT;
+   vfmt->SecondaryColor3fvEXT = _mesa_noop_SecondaryColor3fvEXT;
+   vfmt->TexCoord1f = _mesa_noop_TexCoord1f;
+   vfmt->TexCoord1fv = _mesa_noop_TexCoord1fv;
+   vfmt->TexCoord2f = _mesa_noop_TexCoord2f;
+   vfmt->TexCoord2fv = _mesa_noop_TexCoord2fv;
+   vfmt->TexCoord3f = _mesa_noop_TexCoord3f;
+   vfmt->TexCoord3fv = _mesa_noop_TexCoord3fv;
+   vfmt->TexCoord4f = _mesa_noop_TexCoord4f;
+   vfmt->TexCoord4fv = _mesa_noop_TexCoord4fv;
+   vfmt->Vertex2f = _mesa_noop_Vertex2f;
+   vfmt->Vertex2fv = _mesa_noop_Vertex2fv;
+   vfmt->Vertex3f = _mesa_noop_Vertex3f;
+   vfmt->Vertex3fv = _mesa_noop_Vertex3fv;
+   vfmt->Vertex4f = _mesa_noop_Vertex4f;
+   vfmt->Vertex4fv = _mesa_noop_Vertex4fv;
+   vfmt->VertexAttrib1fNV = _mesa_noop_VertexAttrib1fNV;
+   vfmt->VertexAttrib1fvNV = _mesa_noop_VertexAttrib1fvNV;
+   vfmt->VertexAttrib2fNV = _mesa_noop_VertexAttrib2fNV;
+   vfmt->VertexAttrib2fvNV = _mesa_noop_VertexAttrib2fvNV;
+   vfmt->VertexAttrib3fNV = _mesa_noop_VertexAttrib3fNV;
+   vfmt->VertexAttrib3fvNV = _mesa_noop_VertexAttrib3fvNV;
+   vfmt->VertexAttrib4fNV = _mesa_noop_VertexAttrib4fNV;
+   vfmt->VertexAttrib4fvNV = _mesa_noop_VertexAttrib4fvNV;
+
+   vfmt->Rectf = _mesa_noop_Rectf;
+
+   vfmt->DrawArrays = _mesa_noop_DrawArrays;
+   vfmt->DrawElements = _mesa_noop_DrawElements;
+   vfmt->DrawRangeElements = _mesa_noop_DrawRangeElements;
+   vfmt->EvalMesh1 = _mesa_noop_EvalMesh1;
+   vfmt->EvalMesh2 = _mesa_noop_EvalMesh2;
+}
diff --git a/reactos/lib/mesa32/src/main/api_noop.h b/reactos/lib/mesa32/src/main/api_noop.h
new file mode 100644
index 00000000000..7bb9c88dd1a
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/api_noop.h
@@ -0,0 +1,180 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef _API_NOOP_H
+#define _API_NOOP_H
+
+
+#include "glheader.h"
+#include "mtypes.h"
+#include "context.h"
+
+/* In states where certain vertex components are required for t&l or
+ * rasterization, we still need to keep track of the current values.
+ * These functions provide this service by keeping uptodate the
+ * 'ctx->Current' struct for all data elements not included in the
+ * currently enabled hardware vertex.
+ *
+ */
+extern void GLAPIENTRY _mesa_noop_EdgeFlag( GLboolean b );
+
+extern void GLAPIENTRY _mesa_noop_EdgeFlagv( const GLboolean *b );
+
+extern void GLAPIENTRY _mesa_noop_FogCoordfEXT( GLfloat a );
+
+extern void GLAPIENTRY _mesa_noop_FogCoordfvEXT( const GLfloat *v );
+
+extern void GLAPIENTRY _mesa_noop_Indexf( GLfloat i );
+
+extern void GLAPIENTRY _mesa_noop_Indexfv( const GLfloat *v );
+
+extern void GLAPIENTRY _mesa_noop_Normal3f( GLfloat a, GLfloat b, GLfloat c );
+
+extern void GLAPIENTRY _mesa_noop_Normal3fv( const GLfloat *v );
+
+extern void GLAPIENTRY _mesa_noop_Materialfv(  GLenum face, GLenum pname,  const GLfloat *param );
+
+extern void _mesa_noop_Color4ub( GLubyte a, GLubyte b, GLubyte c, GLubyte d );
+
+extern void _mesa_noop_Color4ubv( const GLubyte *v );
+
+extern void GLAPIENTRY _mesa_noop_Color4f( GLfloat a, GLfloat b, GLfloat c, GLfloat d );
+
+extern void GLAPIENTRY _mesa_noop_Color4fv( const GLfloat *v );
+
+extern void _mesa_noop_Color3ub( GLubyte a, GLubyte b, GLubyte c );
+
+extern void _mesa_noop_Color3ubv( const GLubyte *v );
+
+extern void GLAPIENTRY _mesa_noop_Color3f( GLfloat a, GLfloat b, GLfloat c );
+
+extern void GLAPIENTRY _mesa_noop_Color3fv( const GLfloat *v );
+
+extern void GLAPIENTRY _mesa_noop_MultiTexCoord1fARB( GLenum target, GLfloat a );
+
+extern void GLAPIENTRY _mesa_noop_MultiTexCoord1fvARB( GLenum target, const GLfloat *v );
+
+extern void GLAPIENTRY _mesa_noop_MultiTexCoord2fARB( GLenum target, GLfloat a,
+					   GLfloat b );
+
+extern void GLAPIENTRY _mesa_noop_MultiTexCoord2fvARB( GLenum target, const GLfloat *v );
+
+extern void GLAPIENTRY _mesa_noop_MultiTexCoord3fARB( GLenum target, GLfloat a,
+					GLfloat b, GLfloat c);
+
+extern void GLAPIENTRY _mesa_noop_MultiTexCoord3fvARB( GLenum target, const GLfloat *v );
+
+extern void GLAPIENTRY _mesa_noop_MultiTexCoord4fARB( GLenum target, GLfloat a,
+					GLfloat b, GLfloat c, GLfloat d );
+
+extern void GLAPIENTRY _mesa_noop_MultiTexCoord4fvARB( GLenum target, const GLfloat *v );
+
+extern void _mesa_noop_SecondaryColor3ubEXT( GLubyte a, GLubyte b, GLubyte c );
+
+extern void _mesa_noop_SecondaryColor3ubvEXT( const GLubyte *v );
+
+extern void GLAPIENTRY _mesa_noop_SecondaryColor3fEXT( GLfloat a, GLfloat b, GLfloat c );
+
+extern void GLAPIENTRY _mesa_noop_SecondaryColor3fvEXT( const GLfloat *v );
+
+extern void GLAPIENTRY _mesa_noop_TexCoord1f( GLfloat a );
+
+extern void GLAPIENTRY _mesa_noop_TexCoord1fv( const GLfloat *v );
+
+extern void GLAPIENTRY _mesa_noop_TexCoord2f( GLfloat a, GLfloat b );
+
+extern void GLAPIENTRY _mesa_noop_TexCoord2fv( const GLfloat *v );
+
+extern void GLAPIENTRY _mesa_noop_TexCoord3f( GLfloat a, GLfloat b, GLfloat c );
+
+extern void GLAPIENTRY _mesa_noop_TexCoord3fv( const GLfloat *v );
+
+extern void GLAPIENTRY _mesa_noop_TexCoord4f( GLfloat a, GLfloat b, GLfloat c, GLfloat d );
+
+extern void GLAPIENTRY _mesa_noop_TexCoord4fv( const GLfloat *v );
+
+extern void GLAPIENTRY _mesa_noop_Vertex2fv( const GLfloat *v );
+
+extern void GLAPIENTRY _mesa_noop_Vertex3fv( const GLfloat *v );
+
+extern void GLAPIENTRY _mesa_noop_Vertex4fv( const GLfloat *v );
+
+extern void GLAPIENTRY _mesa_noop_Vertex2f( GLfloat a, GLfloat b );
+
+extern void GLAPIENTRY _mesa_noop_Vertex3f( GLfloat a, GLfloat b, GLfloat c );
+
+extern void GLAPIENTRY _mesa_noop_Vertex4f( GLfloat a, GLfloat b, GLfloat c, GLfloat d );
+
+extern void GLAPIENTRY _mesa_noop_VertexAttrib1fNV( GLuint index, GLfloat x );
+
+extern void GLAPIENTRY _mesa_noop_VertexAttrib1fvNV( GLuint index, const GLfloat *v );
+
+extern void GLAPIENTRY _mesa_noop_VertexAttrib2fNV( GLuint index, GLfloat x, GLfloat y );
+extern void GLAPIENTRY _mesa_noop_VertexAttrib2fvNV( GLuint index, const GLfloat *v );
+
+extern void GLAPIENTRY _mesa_noop_VertexAttrib3fNV( GLuint index, GLfloat x,
+					 GLfloat y, GLfloat z );
+extern void GLAPIENTRY _mesa_noop_VertexAttrib3fvNV( GLuint index, const GLfloat *v );
+
+extern void GLAPIENTRY _mesa_noop_VertexAttrib4fNV( GLuint index, GLfloat x,
+                                         GLfloat y, GLfloat z, GLfloat w );
+
+extern void GLAPIENTRY _mesa_noop_VertexAttrib4fvNV( GLuint index, const GLfloat *v );
+
+extern void GLAPIENTRY _mesa_noop_End( void );
+extern void GLAPIENTRY _mesa_noop_Begin( GLenum mode );
+extern void GLAPIENTRY _mesa_noop_EvalPoint2( GLint a, GLint b );
+extern void GLAPIENTRY _mesa_noop_EvalPoint1( GLint a );
+extern void GLAPIENTRY _mesa_noop_EvalCoord2fv( const GLfloat *v );
+extern void GLAPIENTRY _mesa_noop_EvalCoord2f( GLfloat a, GLfloat b );
+extern void GLAPIENTRY _mesa_noop_EvalCoord1fv( const GLfloat *v );
+extern void GLAPIENTRY _mesa_noop_EvalCoord1f( GLfloat a );
+
+extern void _mesa_noop_vtxfmt_init( GLvertexformat *vfmt );
+
+extern void GLAPIENTRY _mesa_noop_EvalMesh2( GLenum mode, GLint i1, GLint i2, 
+				  GLint j1, GLint j2 );
+
+extern void GLAPIENTRY _mesa_noop_EvalMesh1( GLenum mode, GLint i1, GLint i2 );
+
+
+/* Not strictly a noop -- translate Rectf down to Begin/End and
+ * vertices.  Closer to the loopback operations, but doesn't meet the
+ * criteria for inclusion there (cannot be used in the Save table).
+ */
+extern void GLAPIENTRY _mesa_noop_Rectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 );
+
+
+extern void GLAPIENTRY _mesa_noop_DrawArrays(GLenum mode, GLint start, GLsizei count);
+extern void GLAPIENTRY _mesa_noop_DrawElements(GLenum mode, GLsizei count, GLenum type,
+				    const GLvoid *indices);
+extern void GLAPIENTRY _mesa_noop_DrawRangeElements(GLenum mode,
+					 GLuint start, GLuint end,
+					 GLsizei count, GLenum type,
+					 const GLvoid *indices);
+
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/api_validate.c b/reactos/lib/mesa32/src/main/api_validate.c
new file mode 100644
index 00000000000..4e09c2855a5
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/api_validate.c
@@ -0,0 +1,239 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "glheader.h"
+#include "api_validate.h"
+#include "context.h"
+#include "imports.h"
+#include "mtypes.h"
+#include "state.h"
+
+
+GLboolean
+_mesa_validate_DrawElements(GLcontext *ctx,
+			    GLenum mode, GLsizei count, GLenum type,
+			    const GLvoid *indices)
+{
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx,  GL_FALSE);
+
+   if (count <= 0) {
+      if (count < 0)
+	 _mesa_error(ctx, GL_INVALID_VALUE, "glDrawElements(count)" );
+      return GL_FALSE;
+   }
+
+   if (mode > GL_POLYGON) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glDrawElements(mode)" );
+      return GL_FALSE;
+   }
+
+   if (type != GL_UNSIGNED_INT &&
+       type != GL_UNSIGNED_BYTE &&
+       type != GL_UNSIGNED_SHORT)
+   {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glDrawElements(type)" );
+      return GL_FALSE;
+   }
+
+   if (ctx->NewState)
+      _mesa_update_state(ctx);
+
+   /* Always need vertex positions */
+   if (!ctx->Array.Vertex.Enabled
+       && !(ctx->VertexProgram.Enabled && ctx->Array.VertexAttrib[0].Enabled))
+      return GL_FALSE;
+
+   /* Vertex buffer object tests */
+   if (ctx->Array.ElementArrayBufferObj->Name) {
+      GLuint indexBytes;
+
+      /* use indices in the buffer object */
+      if (!ctx->Array.ElementArrayBufferObj->Data) {
+         _mesa_warning(ctx, "DrawElements with empty vertex elements buffer!");
+         return GL_FALSE;
+      }
+
+      /* make sure count doesn't go outside buffer bounds */
+      if (type == GL_UNSIGNED_INT) {
+         indexBytes = count * sizeof(GLuint);
+      }
+      else if (type == GL_UNSIGNED_BYTE) {
+         indexBytes = count * sizeof(GLubyte);
+      }
+      else {
+         ASSERT(type == GL_UNSIGNED_SHORT);
+         indexBytes = count * sizeof(GLushort);
+      }
+
+      if ((GLubyte *) indices + indexBytes >
+          ctx->Array.ElementArrayBufferObj->Data +
+          ctx->Array.ElementArrayBufferObj->Size) {
+         _mesa_warning(ctx, "glDrawElements index out of buffer bounds");
+         return GL_FALSE;
+      }
+
+      /* Actual address is the sum of pointers.  Indices may be used below. */
+      if (ctx->Const.CheckArrayBounds) {
+         indices = (const GLvoid *)
+            ADD_POINTERS(ctx->Array.ElementArrayBufferObj->Data,
+                         (const GLubyte *) indices);
+      }
+   }
+
+   if (ctx->Const.CheckArrayBounds) {
+      /* find max array index */
+      GLuint max = 0;
+      GLint i;
+      if (type == GL_UNSIGNED_INT) {
+         for (i = 0; i < count; i++)
+            if (((GLuint *) indices)[i] > max)
+               max = ((GLuint *) indices)[i];
+      }
+      else if (type == GL_UNSIGNED_SHORT) {
+         for (i = 0; i < count; i++)
+            if (((GLushort *) indices)[i] > max)
+               max = ((GLushort *) indices)[i];
+      }
+      else {
+         ASSERT(type == GL_UNSIGNED_BYTE);
+         for (i = 0; i < count; i++)
+            if (((GLubyte *) indices)[i] > max)
+               max = ((GLubyte *) indices)[i];
+      }
+      if (max >= ctx->Array._MaxElement) {
+         /* the max element is out of bounds of one or more enabled arrays */
+         return GL_FALSE;
+      }
+   }
+
+   return GL_TRUE;
+}
+
+
+GLboolean
+_mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode,
+				 GLuint start, GLuint end,
+				 GLsizei count, GLenum type,
+				 const GLvoid *indices)
+{
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
+
+   if (count <= 0) {
+      if (count < 0)
+	 _mesa_error(ctx, GL_INVALID_VALUE, "glDrawRangeElements(count)" );
+      return GL_FALSE;
+   }
+
+   if (mode > GL_POLYGON) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glDrawRangeElements(mode)" );
+      return GL_FALSE;
+   }
+
+   if (end < start) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glDrawRangeElements(end<start)");
+      return GL_FALSE;
+   }
+
+   if (type != GL_UNSIGNED_INT &&
+       type != GL_UNSIGNED_BYTE &&
+       type != GL_UNSIGNED_SHORT) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glDrawRangeElements(type)" );
+      return GL_FALSE;
+   }
+
+   if (ctx->NewState)
+      _mesa_update_state(ctx);
+
+   /* Always need vertex positions */
+   if (!ctx->Array.Vertex.Enabled
+       && !(ctx->VertexProgram.Enabled && ctx->Array.VertexAttrib[0].Enabled))
+      return GL_FALSE;
+
+   if (ctx->Const.CheckArrayBounds) {
+      /* Find max array index.
+       * We don't trust the user's start and end values.
+       */
+      GLuint max = 0;
+      GLint i;
+      if (type == GL_UNSIGNED_INT) {
+         for (i = 0; i < count; i++)
+            if (((GLuint *) indices)[i] > max)
+               max = ((GLuint *) indices)[i];
+      }
+      else if (type == GL_UNSIGNED_SHORT) {
+         for (i = 0; i < count; i++)
+            if (((GLushort *) indices)[i] > max)
+               max = ((GLushort *) indices)[i];
+      }
+      else {
+         ASSERT(type == GL_UNSIGNED_BYTE);
+         for (i = 0; i < count; i++)
+            if (((GLubyte *) indices)[i] > max)
+               max = ((GLubyte *) indices)[i];
+      }
+      if (max >= ctx->Array._MaxElement) {
+         /* the max element is out of bounds of one or more enabled arrays */
+         return GL_FALSE;
+      }
+   }
+
+   return GL_TRUE;
+}
+
+
+/**
+ * Called from the tnl module to error check the function parameters and
+ * verify that we really can draw something.
+ */
+GLboolean
+_mesa_validate_DrawArrays(GLcontext *ctx,
+			  GLenum mode, GLint start, GLsizei count)
+{
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
+
+   if (count < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glDrawArrays(count)" );
+      return GL_FALSE;
+   }
+
+   if (mode > GL_POLYGON) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glDrawArrays(mode)" );
+      return GL_FALSE;
+   }
+
+   if (ctx->NewState)
+      _mesa_update_state(ctx);
+
+   /* Always need vertex positions */
+   if (!ctx->Array.Vertex.Enabled && !ctx->Array.VertexAttrib[0].Enabled)
+      return GL_FALSE;
+
+   if (ctx->Const.CheckArrayBounds) {
+      if (start + count > (GLint) ctx->Array._MaxElement)
+         return GL_FALSE;
+   }
+
+   return GL_TRUE;
+}
diff --git a/reactos/lib/mesa32/src/main/api_validate.h b/reactos/lib/mesa32/src/main/api_validate.h
new file mode 100644
index 00000000000..10f0c34e663
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/api_validate.h
@@ -0,0 +1,49 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef API_VALIDATE_H
+#define API_VALIDATE_H
+
+
+#include "mtypes.h"
+
+extern GLboolean
+_mesa_validate_DrawArrays(GLcontext *ctx,
+			  GLenum mode, GLint start, GLsizei count);
+
+extern GLboolean
+_mesa_validate_DrawElements(GLcontext *ctx,
+			    GLenum mode, GLsizei count, GLenum type,
+			    const GLvoid *indices);
+
+extern GLboolean
+_mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode,
+				 GLuint start, GLuint end,
+				 GLsizei count, GLenum type,
+				 const GLvoid *indices);
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/arbfragparse.c b/reactos/lib/mesa32/src/main/arbfragparse.c
new file mode 100644
index 00000000000..44475124761
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/arbfragparse.c
@@ -0,0 +1,238 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#define DEBUG_FP 0
+
+/**
+ * \file arbfragparse.c
+ * ARB_fragment_program parser.
+ * \author Karl Rasche
+ */
+
+#include "glheader.h"
+#include "context.h"
+#include "imports.h"
+#include "macros.h"
+#include "mtypes.h"
+#include "arbparse.h"
+#include "arbfragparse.h"
+
+static void
+debug_fp_inst(GLint num, struct fp_instruction *fp)
+{
+   GLint a;
+ 
+   fprintf(stderr, "PROGRAM_OUTPUT: 0x%x\n",    PROGRAM_OUTPUT);
+   fprintf(stderr, "PROGRAM_INPUT: 0x%x\n",     PROGRAM_INPUT);
+   fprintf(stderr, "PROGRAM_TEMPORARY: 0x%x\n", PROGRAM_TEMPORARY);
+
+   for (a=0; a<num; a++) {
+      switch (fp[a].Opcode) {
+         case FP_OPCODE_END:
+            fprintf(stderr, "FP_OPCODE_END"); break;
+
+         case  FP_OPCODE_ABS:
+            fprintf(stderr, "FP_OPCODE_ABS"); break;
+
+         case  FP_OPCODE_ADD:
+            fprintf(stderr, "FP_OPCODE_ADD"); break;
+
+         case  FP_OPCODE_CMP:
+            fprintf(stderr, "FP_OPCODE_CMP"); break;
+
+         case  FP_OPCODE_COS:
+            fprintf(stderr, "FP_OPCODE_COS"); break;
+
+         case  FP_OPCODE_DP3:
+            fprintf(stderr, "FP_OPCODE_DP3"); break;
+
+         case  FP_OPCODE_DP4:
+            fprintf(stderr, "FP_OPCODE_DP4"); break;
+
+         case  FP_OPCODE_DPH:
+            fprintf(stderr, "FP_OPCODE_DPH"); break;
+
+         case  FP_OPCODE_DST:
+            fprintf(stderr, "FP_OPCODE_DST"); break;
+
+         case  FP_OPCODE_EX2:
+            fprintf(stderr, "FP_OPCODE_EX2"); break;
+
+         case  FP_OPCODE_FLR:
+            fprintf(stderr, "FP_OPCODE_FLR"); break;
+
+         case  FP_OPCODE_FRC:
+            fprintf(stderr, "FP_OPCODE_FRC"); break;
+
+         case  FP_OPCODE_KIL:
+            fprintf(stderr, "FP_OPCODE_KIL"); break;
+
+         case  FP_OPCODE_LG2:
+            fprintf(stderr, "FP_OPCODE_LG2"); break;
+
+         case  FP_OPCODE_LIT:
+            fprintf(stderr, "FP_OPCODE_LIT"); break;
+
+         case  FP_OPCODE_LRP:
+            fprintf(stderr, "FP_OPCODE_LRP"); break;
+
+         case  FP_OPCODE_MAD:
+            fprintf(stderr, "FP_OPCODE_MAD"); break;
+
+         case  FP_OPCODE_MAX:
+            fprintf(stderr, "FP_OPCODE_MAX"); break;
+
+         case  FP_OPCODE_MIN:
+            fprintf(stderr, "FP_OPCODE_MIN"); break;
+
+         case  FP_OPCODE_MOV:
+            fprintf(stderr, "FP_OPCODE_MOV"); break;
+
+         case  FP_OPCODE_MUL:
+            fprintf(stderr, "FP_OPCODE_MUL"); break;
+
+         case  FP_OPCODE_POW:
+            fprintf(stderr, "FP_OPCODE_POW"); break;
+
+         case  FP_OPCODE_RCP:
+            fprintf(stderr, "FP_OPCODE_RCP"); break;
+
+         case  FP_OPCODE_RSQ:
+            fprintf(stderr, "FP_OPCODE_RSQ"); break;
+
+         case  FP_OPCODE_SCS:
+            fprintf(stderr, "FP_OPCODE_SCS"); break;
+
+         case  FP_OPCODE_SIN:
+            fprintf(stderr, "FP_OPCODE_SIN"); break;
+
+         case  FP_OPCODE_SLT:
+            fprintf(stderr, "FP_OPCODE_SLT"); break;
+
+         case  FP_OPCODE_SUB:
+            fprintf(stderr, "FP_OPCODE_SUB"); break;
+
+         case  FP_OPCODE_SWZ:
+            fprintf(stderr, "FP_OPCODE_SWZ"); break;
+
+         case  FP_OPCODE_TEX:
+            fprintf(stderr, "FP_OPCODE_TEX"); break;
+
+         case  FP_OPCODE_TXB:
+            fprintf(stderr, "FP_OPCODE_TXB"); break;
+
+         case  FP_OPCODE_TXP:
+            fprintf(stderr, "FP_OPCODE_TXP"); break;
+
+         case  FP_OPCODE_XPD:
+            fprintf(stderr, "FP_OPCODE_XPD"); break;
+
+         default:
+            _mesa_warning(NULL, "Bad opcode in debug_fg_inst()");
+      }
+
+      fprintf(stderr, " D(0x%x:%d:%d%d%d%d) ", 
+         fp[a].DstReg.File, fp[a].DstReg.Index,
+         fp[a].DstReg.WriteMask[0], fp[a].DstReg.WriteMask[1], 
+         fp[a].DstReg.WriteMask[2], fp[a].DstReg.WriteMask[3]); 
+						 
+      fprintf(stderr, "S1(0x%x:%d:%d%d%d%d) ", fp[a].SrcReg[0].File, fp[a].SrcReg[0].Index,
+         fp[a].SrcReg[0].Swizzle[0],
+         fp[a].SrcReg[0].Swizzle[1],
+         fp[a].SrcReg[0].Swizzle[2],
+         fp[a].SrcReg[0].Swizzle[3]);
+
+      fprintf(stderr, "S2(0x%x:%d:%d%d%d%d) ", fp[a].SrcReg[1].File, fp[a].SrcReg[1].Index,
+        fp[a].SrcReg[1].Swizzle[0],
+        fp[a].SrcReg[1].Swizzle[1],
+        fp[a].SrcReg[1].Swizzle[2],
+        fp[a].SrcReg[1].Swizzle[3]);
+
+      fprintf(stderr, "S3(0x%x:%d:%d%d%d%d)",  fp[a].SrcReg[2].File, fp[a].SrcReg[2].Index,
+        fp[a].SrcReg[2].Swizzle[0],
+        fp[a].SrcReg[2].Swizzle[1],
+        fp[a].SrcReg[2].Swizzle[2],
+        fp[a].SrcReg[2].Swizzle[3]);
+
+      fprintf(stderr, "\n");
+   }
+}
+
+void
+_mesa_parse_arb_fragment_program(GLcontext * ctx, GLenum target,
+                                 const GLubyte * str, GLsizei len,
+                                 struct fragment_program *program)
+{
+   GLuint a, retval;
+   struct arb_program ap;
+	
+   retval = _mesa_parse_arb_program(ctx, str, len, &ap);
+
+   /* XXX: Parse error. Cleanup things and return */	
+   if (retval)
+   {
+      program->Instructions = (struct fp_instruction *)
+         _mesa_malloc(sizeof(struct fp_instruction));
+      program->Instructions[0].Opcode = FP_OPCODE_END;
+      return;
+   }
+
+   /* XXX: Eh.. we parsed something that wasn't a fragment program. doh! */
+   if (ap.type != GL_FRAGMENT_PROGRAM_ARB)
+   {
+      program->Instructions = (struct fp_instruction *)
+         _mesa_malloc (sizeof(struct fp_instruction) );
+      program->Instructions[0].Opcode = FP_OPCODE_END;
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "Parsed a non-fragment program as a fragment program");
+      return;      
+   }
+
+   /* copy the relvant contents of the arb_program struct into the 
+    * fragment_program struct
+    */
+   program->Base.String          = ap.Base.String;
+   program->Base.NumInstructions = ap.Base.NumInstructions;
+   program->Base.NumTemporaries  = ap.Base.NumTemporaries;
+   program->Base.NumParameters   = ap.Base.NumParameters;
+   program->Base.NumAttributes   = ap.Base.NumAttributes;
+   program->Base.NumAddressRegs  = ap.Base.NumAddressRegs;
+	
+   program->InputsRead     = ap.InputsRead;
+   program->OutputsWritten = ap.OutputsWritten;
+   for (a=0; a<MAX_TEXTURE_IMAGE_UNITS; a++)
+      program->TexturesUsed[a] = ap.TexturesUsed[a];
+   program->NumAluInstructions = ap.NumAluInstructions;
+   program->NumTexInstructions = ap.NumTexInstructions;
+   program->NumTexIndirections = ap.NumTexIndirections;
+   program->Parameters         = ap.Parameters;
+
+#if DEBUG_FP
+   debug_fp_inst(ap.Base.NumInstructions, ap.FPInstructions);
+#else
+   (void) debug_fp_inst;
+#endif
+
+   program->Instructions   = ap.FPInstructions;
+}
diff --git a/reactos/lib/mesa32/src/main/arbfragparse.h b/reactos/lib/mesa32/src/main/arbfragparse.h
new file mode 100644
index 00000000000..17e8dcf6239
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/arbfragparse.h
@@ -0,0 +1,35 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef ARBFRAGPARSE_H
+#define ARBFRAGPARSE_H
+
+#include "mtypes.h"
+
+extern void
+_mesa_parse_arb_fragment_program(GLcontext * ctx, GLenum target,
+                                 const GLubyte * str, GLsizei len,
+                                 struct fragment_program *program);
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/arbparse.c b/reactos/lib/mesa32/src/main/arbparse.c
new file mode 100644
index 00000000000..c776a57b5d3
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/arbparse.c
@@ -0,0 +1,6058 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#define DEBUG_PARSING 0
+
+/**
+ * \file arbparse.c
+ * ARB_*_program parser core
+ * \author Michal Krol, Karl Rasche
+ */
+
+#include "mtypes.h"
+#include "glheader.h"
+#include "context.h"
+#include "hash.h"
+#include "imports.h"
+#include "macros.h"
+#include "program.h"
+#include "nvvertprog.h"
+#include "nvfragprog.h"
+#include "arbparse.h"
+
+/* TODO:
+ *    Fragment Program Stuff:
+ *    -----------------------------------------------------
+ *
+ *    - things from Michal's email
+ *       + overflow on atoi
+ *       + not-overflowing floats (don't use parse_integer..)
+ *       + can remove range checking in arbparse.c        
+ *       
+ *    - check all limits of number of various variables
+ *      + parameters
+ *
+ *    - test! test! test!    
+ *
+ *    Vertex Program Stuff:
+ *    -----------------------------------------------------
+ *    - Optimize param array usage and count limits correctly, see spec,
+ *         section 2.14.3.7        
+ *       + Record if an array is reference absolutly or relatively (or both)
+ *       + For absolute arrays, store a bitmap of accesses
+ *       + For single parameters, store an access flag
+ *       + After parsing, make a parameter cleanup and merging pass, where
+ *           relative arrays are layed out first, followed by abs arrays, and
+ *           finally single state.
+ *       + Remap offsets for param src and dst registers
+ *       + Now we can properly count parameter usage
+ *                                                                         
+ *    - Multiple state binding errors in param arrays (see spec, just before
+ *         section 2.14.3.3)
+ *    - grep for XXX
+ *    
+ *    Mesa Stuff
+ *    -----------------------------------------------------
+ *    - User clipping planes vs. PositionInvariant 
+ *    - Is it sufficient to just multiply by the mvp to transform in the
+ *        PositionInvariant case? Or do we need something more involved?
+ *                    
+ *    - vp_src swizzle is GLubyte, fp_src swizzle is GLuint
+ *    - fetch state listed in program_parameters list
+ *       + WTF should this go???
+ *       + currently in nvvertexec.c and s_nvfragprog.c 
+ *
+ *    - allow for multiple address registers (and fetch address regs properly)
+ *
+ *    Cosmetic Stuff
+ *    -----------------------------------------------------
+ * 	- remove any leftover unused grammer.c stuff (dict_ ?)
+ * 	- fix grammer.c error handling so its not static
+ * 	- #ifdef around stuff pertaining to extentions
+ *
+ *    Outstanding Questions:
+ *    -----------------------------------------------------
+ *    - ARB_matrix_palette / ARB_vertex_blend -- not supported 
+ *      what gets hacked off because of this:
+ *       + VERTEX_ATTRIB_MATRIXINDEX          
+ *       + VERTEX_ATTRIB_WEIGHT
+ *       + MATRIX_MODELVIEW
+ *       + MATRIX_PALETTE       
+ *
+ *    - When can we fetch env/local params from their own register files, and
+ *      when to we have to fetch them into the main state register file?
+ *      (think arrays)
+ *
+ *    Grammar Changes:
+ *    -----------------------------------------------------
+ */
+
+typedef GLubyte *production;
+
+/*-----------------------------------------------------------------------
+ * From here on down is the syntax checking portion 
+ */
+
+/* VERSION: 0.4 */
+
+/*
+INTRODUCTION
+------------
+
+The task is to check the syntax of an input string. Input string is a
+stream of ASCII characters terminated with null-character
+('\0'). Checking it using C language is difficult and hard to
+implement without bugs. It is hard to maintain and change prior to
+further syntax changes.
+
+This is because of high redundancy of the C code. Large blocks of code
+are duplicated with only small changes. Even using macros does not
+solve the problem, because macros cannot erase the complexity of the
+code.
+
+The resolution is to create a new language that will be highly
+oriented to our task. Once we describe particular syntax, we are
+done. We can then focus on the code that implements the language. The
+size and complexity of it is relatively small than the code that
+directly checks the syntax.
+
+First, we must implement our new language. Here, the language is
+implemented in C, but it could also be implemented in any other
+language. The code is listed below. We must take a good care that it
+is bug free. This is simple because the code is simple and clean.
+
+Next, we must describe the syntax of our new language in itself. Once
+created and checked manually that it is correct, we can use it to
+check another scripts.
+
+Note that our new language loading code does not have to check the
+syntax. It is because we assume that the script describing itself is
+correct, and other scripts can be syntactically checked by the former
+script. The loading code must only do semantic checking which leads us
+to simple resolving references.
+
+THE LANGUAGE
+------------
+
+Here I will describe the syntax of the new language (further called
+"Synek"). It is mainly a sequence of declarations terminated by a
+semicolon. The declaration consists of a symbol, which is an
+identifier, and its definition. A definition is in turn a sequence of
+specifiers connected with ".and" or ".or" operator. These operators
+cannot be mixed together in a one definition. Specifier can be a
+symbol, string, character, character range or a special keyword
+".true" or ".false".
+
+On the very beginning of the script there is a declaration of a root
+symbol and is in the form:
+		.syntax <root_symbol>;
+
+The <root_symbol> must be on of the symbols in declaration
+sequence. The syntax is correct if the root symbol evaluates to
+true. A symbol evaluates to true if the definition associated with the
+symbol evaluates to true. Definition evaluation depends on the
+operator used to connect specifiers in the definition. If ".and"
+operator is used, definition evaluates to true if and only if all the
+specifiers evaluate to true. If ".or" operator is used, definition
+evalutes to true if any of the specifiers evaluates to true. If
+definition contains only one specifier, it is evaluated as if it was
+connected with ".true" keyword by ".and" operator.
+
+If specifier is a ".true" keyword, it always evaluates to true.
+
+If specifier is a ".false" keyword, it always evaluates to
+false. Specifier evaluates to false when it does not evaluate to true.
+
+Character range specifier is in the form:
+	'<first_character>' - '<second_character>'
+
+If specifier is a character range, it evaluates to true if character
+in the stream is greater or equal to <first_character> and less or
+equal to <second_character>. In that situation the stream pointer is
+advanced to point to next character in the stream. All C-style escape
+sequences are supported although trigraph sequences are not. The
+comparisions are performed on 8-bit unsigned integers.
+
+Character specifier is in the form:
+	'<single_character>'
+
+It evaluates to true if the following character range specifier evaluates to
+true:
+	'<single_character>' - '<single_character>'
+
+String specifier is in the form:
+		"<string>"
+
+Let N be the number of characters in <string>. Let <string>[i]
+designate i-th character in <string>. Then the string specifier
+evaluates to true if and only if for i in the range [0, N) the
+following character specifier evaluates to true:
+	'<string>[i]'
+
+If <string>[i] is a quotation mark, '<string>[i]' is replaced with
+'\<string>[i]'.
+
+Symbol specifier can be optionally preceded by a ".loop" keyword in the form:
+	.loop <symbol>					(1)
+	where <symbol> is defined as follows:
+		<symbol> <definition>;			(2)
+	Construction (1) is replaced by the following code:
+		<symbol$1>
+	and declaration (2) is replaced by the following:
+		<symbol$1> <symbol$2> .or .true;
+		<symbol$2> <symbol> .and <symbol$1>;
+		<symbol> <definition>;
+
+
+ESCAPE SEQUENCES
+----------------
+
+Synek supports all escape sequences in character specifiers. The
+mapping table is listed below.  All occurences of the characters in
+the first column are replaced with the corresponding character in the
+second column.
+
+	Escape sequence			Represents
+	-----------------------------------------------------------------------
+	\a				Bell (alert)
+	\b				Backspace
+	\f				Formfeed
+	\n				New line
+	\r				Carriage return
+	\t				Horizontal tab
+	\v				Vertical tab
+	\'				Single quotation mark
+	\"				Double quotation mark
+	\\				Backslash
+	\?				Literal question mark
+	\ooo				ASCII character in octal notation
+	\xhhh				ASCII character in hexadecimal notation
+	-----------------------------------------------------------------------
+
+
+RAISING ERRORS
+--------------
+
+Any specifier can be followed by a special construction that is
+executed when the specifier evaluates to false. The construction is in
+the form:
+	.error <ERROR_TEXT>
+
+<ERROR_TEXT> is an identifier declared earlier by error text
+declaration. The declaration is in the form:
+
+	.errtext <ERROR_TEXT> "<error_desc>"
+
+When specifier evaluates to false and this construction is present,
+parsing is stopped immediately and <error_desc> is returned as a
+result of parsing. The error position is also returned and it is meant
+as an offset from the beggining of the stream to the character that
+was valid so far. Example:
+
+	(**** syntax script ****)
+
+	.syntax program;
+	.errtext MISSING_SEMICOLON		"missing ';'"
+	program			declaration .and .loop space .and ';'
+                                .error MISSING_SEMICOLON .and
+					.loop space .and '\0';
+	declaration		"declare" .and .loop space .and identifier;
+	space			' ';
+		(**** sample code ****)
+	declare foo ,
+
+In the example above checking the sample code will result in error
+message "missing ';'" and error position 12. The sample code is not
+correct. Note the presence of '\0' specifier to assure that there is
+no code after semicolon - only spaces.  <error_desc> can optionally
+contain identifier surrounded by dollar signs $. In such a case, the
+identifier and dollar signs are replaced by a string retrieved by
+invoking symbol with the identifier name. The starting position is the
+error position. The lenght of the resulting string is the position
+after invoking the symbol.
+
+
+PRODUCTION
+----------
+
+Synek not only checks the syntax but it can also produce (emit) bytes
+associated with specifiers that evaluate to true. That is, every
+specifier and optional error construction can be followed by a number
+of emit constructions that are in the form:
+	.emit <parameter>
+
+<paramater> can be a HEX number, identifier, a star * or a dollar
+$. HEX number is preceded by 0x or 0X. If <parameter> is an
+identifier, it must be earlier declared by emit code declaration in
+the form:
+		.emtcode <identifier> <hex_number>
+
+When given specifier evaluates to true, all emits associated with the
+specifier are output in order they were declared. A star means that
+last-read character should be output instead of constant
+value. Example:
+
+	(**** syntax script ****)
+
+	.syntax foobar;
+	.emtcode WORD_FOO		0x01
+	.emtcode WORD_BAR		0x02
+	foobar		FOO .emit WORD_FOO .or BAR .emit WORD_BAR .or .true .emit 0x00;
+	FOO			"foo" .and SPACE;
+	BAR			"bar" .and SPACE;
+	SPACE		' ' .or '\0';
+
+	(**** sample text 1 ****)
+
+	foo
+
+	(**** sample text 2 ****)
+
+	foobar
+
+For both samples the result will be one-element array. For first
+sample text it will be value 1, for second - 0. Note that every text
+will be accepted because of presence of .true as an alternative.
+
+Another example:
+
+	(**** syntax script ****)
+
+	.syntax declaration;
+	.emtcode VARIABLE		0x01
+	declaration		"declare" .and .loop space .and
+				identifier .emit VARIABLE .and		(1)
+					.true .emit 0x00 .and		(2)
+					.loop space .and ';';
+	space			' ' .or '\t';
+	identifier		.loop id_char .emit *;			(3)
+	id_char			'a'-'z' .or 'A'-'Z' .or '_';
+		(**** sample code ****)
+	declare    fubar;
+
+In specifier (1) symbol <identifier> is followed by .emit VARIABLE. If
+it evaluates to true, VARIABLE constant and then production of the
+symbol is output. Specifier (2) is used to terminate the string with
+null to signal when the string ends. Specifier (3) outputs all
+characters that make declared identifier. The result of sample code
+will be the following array:
+		{ 1, 'f', 'u', 'b', 'a', 'r', 0 }
+
+If .emit is followed by dollar $, it means that current position
+should be output. Current position is a 32-bit unsigned integer
+distance from the very beginning of the parsed string to first
+character consumed by the specifier associated with the .emit
+instruction. Current position is stored in the output buffer in
+Little-Endian convention (the lowest byte comes first).  */
+
+/**
+ * This is the text describing the rules to parse the grammar 
+ */
+#include "arbparse_syn.h"
+
+/** 
+ * These should match up with the values defined in arbparse.syn.h
+ */
+
+/*
+    Changes:
+    - changed and merged V_* and F_* opcode values to OP_*.
+*/
+#define REVISION                                   0x05
+
+/* program type */
+#define FRAGMENT_PROGRAM                           0x01
+#define VERTEX_PROGRAM                             0x02
+
+/* program section */
+#define OPTION                                     0x01
+#define INSTRUCTION                                0x02
+#define DECLARATION                                0x03
+#define END                                        0x04
+
+/* fragment program option flags */
+#define ARB_PRECISION_HINT_FASTEST                 0x01
+#define ARB_PRECISION_HINT_NICEST                  0x02
+#define ARB_FOG_EXP                                0x04
+#define ARB_FOG_EXP2                               0x08
+#define ARB_FOG_LINEAR                             0x10
+
+/* vertex program option flags */
+/*
+$4: changed from 0x01 to 0x20.
+*/
+#define ARB_POSITION_INVARIANT                     0x20
+
+/* fragment program 1.0 instruction class */
+#define OP_ALU_INST                                0x00
+#define OP_TEX_INST                                0x01
+
+/* vertex program 1.0 instruction class */
+/*       OP_ALU_INST */
+
+/* fragment program 1.0 instruction type */
+#define OP_ALU_VECTOR                               0x06
+#define OP_ALU_SCALAR                               0x03
+#define OP_ALU_BINSC                                0x02
+#define OP_ALU_BIN                                  0x01
+#define OP_ALU_TRI                                  0x05
+#define OP_ALU_SWZ                                  0x04
+#define OP_TEX_SAMPLE                               0x07
+#define OP_TEX_KIL                                  0x08
+
+/* vertex program 1.0 instruction type */
+#define OP_ALU_ARL                                  0x00
+/*       OP_ALU_VECTOR */
+/*       OP_ALU_SCALAR */
+/*       OP_ALU_BINSC */
+/*       OP_ALU_BIN */
+/*       OP_ALU_TRI */
+/*       OP_ALU_SWZ */
+
+/* fragment program 1.0 instruction code */
+#define OP_ABS                                     0x00
+#define OP_ABS_SAT                                 0x1B
+#define OP_FLR                                     0x09
+#define OP_FLR_SAT                                 0x26
+#define OP_FRC                                     0x0A
+#define OP_FRC_SAT                                 0x27
+#define OP_LIT                                     0x0C
+#define OP_LIT_SAT                                 0x2A
+#define OP_MOV                                     0x11
+#define OP_MOV_SAT                                 0x30
+#define OP_COS                                     0x1F
+#define OP_COS_SAT                                 0x20
+#define OP_EX2                                     0x07
+#define OP_EX2_SAT                                 0x25
+#define OP_LG2                                     0x0B
+#define OP_LG2_SAT                                 0x29
+#define OP_RCP                                     0x14
+#define OP_RCP_SAT                                 0x33
+#define OP_RSQ                                     0x15
+#define OP_RSQ_SAT                                 0x34
+#define OP_SIN                                     0x38
+#define OP_SIN_SAT                                 0x39
+#define OP_SCS                                     0x35
+#define OP_SCS_SAT                                 0x36
+#define OP_POW                                     0x13
+#define OP_POW_SAT                                 0x32
+#define OP_ADD                                     0x01
+#define OP_ADD_SAT                                 0x1C
+#define OP_DP3                                     0x03
+#define OP_DP3_SAT                                 0x21
+#define OP_DP4                                     0x04
+#define OP_DP4_SAT                                 0x22
+#define OP_DPH                                     0x05
+#define OP_DPH_SAT                                 0x23
+#define OP_DST                                     0x06
+#define OP_DST_SAT                                 0x24
+#define OP_MAX                                     0x0F
+#define OP_MAX_SAT                                 0x2E
+#define OP_MIN                                     0x10
+#define OP_MIN_SAT                                 0x2F
+#define OP_MUL                                     0x12
+#define OP_MUL_SAT                                 0x31
+#define OP_SGE                                     0x16
+#define OP_SGE_SAT                                 0x37
+#define OP_SLT                                     0x17
+#define OP_SLT_SAT                                 0x3A
+#define OP_SUB                                     0x18
+#define OP_SUB_SAT                                 0x3B
+#define OP_XPD                                     0x1A
+#define OP_XPD_SAT                                 0x43
+#define OP_CMP                                     0x1D
+#define OP_CMP_SAT                                 0x1E
+#define OP_LRP                                     0x2B
+#define OP_LRP_SAT                                 0x2C
+#define OP_MAD                                     0x0E
+#define OP_MAD_SAT                                 0x2D
+#define OP_SWZ                                     0x19
+#define OP_SWZ_SAT                                 0x3C
+#define OP_TEX                                     0x3D
+#define OP_TEX_SAT                                 0x3E
+#define OP_TXB                                     0x3F
+#define OP_TXB_SAT                                 0x40
+#define OP_TXP                                     0x41
+#define OP_TXP_SAT                                 0x42
+#define OP_KIL                                     0x28
+
+/* vertex program 1.0 instruction code */
+#define OP_ARL                                     0x02
+/*       OP_ABS */
+/*       OP_FLR */
+/*       OP_FRC */
+/*       OP_LIT */
+/*       OP_MOV */
+/*       OP_EX2 */
+#define OP_EXP                                     0x08
+/*       OP_LG2 */
+#define OP_LOG                                     0x0D
+/*       OP_RCP */
+/*       OP_RSQ */
+/*       OP_POW */
+/*       OP_ADD */
+/*       OP_DP3 */
+/*       OP_DP4 */
+/*       OP_DPH */
+/*       OP_DST */
+/*       OP_MAX */
+/*       OP_MIN */
+/*       OP_MUL */
+/*       OP_SGE */
+/*       OP_SLT */
+/*       OP_SUB */
+/*       OP_XPD */
+/*       OP_MAD */
+/*       OP_SWZ */
+
+/* fragment attribute binding */
+#define FRAGMENT_ATTRIB_COLOR                      0x01
+#define FRAGMENT_ATTRIB_TEXCOORD                   0x02
+#define FRAGMENT_ATTRIB_FOGCOORD                   0x03
+#define FRAGMENT_ATTRIB_POSITION                   0x04
+
+/* vertex attribute binding */
+#define VERTEX_ATTRIB_POSITION                     0x01
+#define VERTEX_ATTRIB_WEIGHT                       0x02
+#define VERTEX_ATTRIB_NORMAL                       0x03
+#define VERTEX_ATTRIB_COLOR                        0x04
+#define VERTEX_ATTRIB_FOGCOORD                     0x05
+#define VERTEX_ATTRIB_TEXCOORD                     0x06
+#define VERTEX_ATTRIB_MATRIXINDEX                  0x07
+#define VERTEX_ATTRIB_GENERIC                      0x08
+
+/* fragment result binding */
+#define FRAGMENT_RESULT_COLOR                      0x01
+#define FRAGMENT_RESULT_DEPTH                      0x02
+
+/* vertex result binding */
+#define VERTEX_RESULT_POSITION                     0x01
+#define VERTEX_RESULT_COLOR                        0x02
+#define VERTEX_RESULT_FOGCOORD                     0x03
+#define VERTEX_RESULT_POINTSIZE                    0x04
+#define VERTEX_RESULT_TEXCOORD                     0x05
+
+/* texture target */
+#define TEXTARGET_1D                               0x01
+#define TEXTARGET_2D                               0x02
+#define TEXTARGET_3D                               0x03
+#define TEXTARGET_RECT                             0x04
+#define TEXTARGET_CUBE                             0x05
+
+/* sign */
+/*
+$3: removed. '+' and '-' are used instead.
+*/
+/*
+#define SIGN_PLUS                                  0x00
+#define SIGN_MINUS                                 0x01
+*/
+
+/* face type */
+#define FACE_FRONT                                 0x00
+#define FACE_BACK                                  0x01
+
+/* color type */
+#define COLOR_PRIMARY                              0x00
+#define COLOR_SECONDARY                            0x01
+
+/* component */
+/*
+$3: Added enumerants.
+*/
+#define COMPONENT_X                                0x00
+#define COMPONENT_Y                                0x01
+#define COMPONENT_Z                                0x02
+#define COMPONENT_W                                0x03
+#define COMPONENT_0                                0x04
+#define COMPONENT_1                                0x05
+
+#define ARRAY_INDEX_ABSOLUTE                       0x00
+#define ARRAY_INDEX_RELATIVE                       0x01
+
+/* matrix name */
+#define MATRIX_MODELVIEW                           0x01
+#define MATRIX_PROJECTION                          0x02
+#define MATRIX_MVP                                 0x03
+#define MATRIX_TEXTURE                             0x04
+#define MATRIX_PALETTE                             0x05
+#define MATRIX_PROGRAM                             0x06
+
+/* matrix modifier */
+#define MATRIX_MODIFIER_IDENTITY                   0x00
+#define MATRIX_MODIFIER_INVERSE                    0x01
+#define MATRIX_MODIFIER_TRANSPOSE                  0x02
+#define MATRIX_MODIFIER_INVTRANS                   0x03
+
+/* constant type */
+#define CONSTANT_SCALAR                            0x01
+#define CONSTANT_VECTOR                            0x02
+
+/* program param type */
+#define PROGRAM_PARAM_ENV                          0x01
+#define PROGRAM_PARAM_LOCAL                        0x02
+
+/* register type */
+#define REGISTER_ATTRIB                            0x01
+#define REGISTER_PARAM                             0x02
+#define REGISTER_RESULT                            0x03
+#define REGISTER_ESTABLISHED_NAME                  0x04
+
+/* param binding */
+#define PARAM_NULL                                 0x00
+#define PARAM_ARRAY_ELEMENT                        0x01
+#define PARAM_STATE_ELEMENT                        0x02
+#define PARAM_PROGRAM_ELEMENT                      0x03
+#define PARAM_PROGRAM_ELEMENTS                     0x04
+#define PARAM_CONSTANT                             0x05
+
+/* param state property */
+#define STATE_MATERIAL_PARSER                      0x01
+#define STATE_LIGHT_PARSER                         0x02
+#define STATE_LIGHT_MODEL                          0x03
+#define STATE_LIGHT_PROD                           0x04
+#define STATE_FOG                                  0x05
+#define STATE_MATRIX_ROWS                          0x06
+/* fragment program only */
+#define STATE_TEX_ENV                              0x07
+#define STATE_DEPTH                                0x08
+/* vertex program only */
+/*
+$4: incremented all the three emit codes by two to not collide with other STATE_* emit codes.
+*/
+#define STATE_TEX_GEN                              0x09
+#define STATE_CLIP_PLANE                           0x0A
+#define STATE_POINT                                0x0B
+
+/* state material property */
+#define MATERIAL_AMBIENT                           0x01
+#define MATERIAL_DIFFUSE                           0x02
+#define MATERIAL_SPECULAR                          0x03
+#define MATERIAL_EMISSION                          0x04
+#define MATERIAL_SHININESS                         0x05
+
+/* state light property */
+#define LIGHT_AMBIENT                              0x01
+#define LIGHT_DIFFUSE                              0x02
+#define LIGHT_SPECULAR                             0x03
+#define LIGHT_POSITION                             0x04
+#define LIGHT_ATTENUATION                          0x05
+#define LIGHT_HALF                                 0x06
+#define LIGHT_SPOT_DIRECTION                       0x07
+
+/* state light model property */
+#define LIGHT_MODEL_AMBIENT                        0x01
+#define LIGHT_MODEL_SCENECOLOR                     0x02
+
+/* state light product property */
+#define LIGHT_PROD_AMBIENT                         0x01
+#define LIGHT_PROD_DIFFUSE                         0x02
+#define LIGHT_PROD_SPECULAR                        0x03
+
+/* state texture environment property */
+#define TEX_ENV_COLOR                              0x01
+
+/* state texture generation coord property */
+#define TEX_GEN_EYE                                0x01
+#define TEX_GEN_OBJECT                             0x02
+
+/* state fog property */
+#define FOG_COLOR                                  0x01
+#define FOG_PARAMS                                 0x02
+
+/* state depth property */
+#define DEPTH_RANGE                                0x01
+
+/* state point parameters property */
+#define POINT_SIZE                                 0x01
+#define POINT_ATTENUATION                          0x02
+
+/* declaration */
+#define ATTRIB                                     0x01
+#define PARAM                                      0x02
+#define TEMP                                       0x03
+#define OUTPUT                                     0x04
+#define ALIAS                                      0x05
+/* vertex program 1.0 only */
+#define ADDRESS                                    0x06
+
+/*
+	memory management routines
+*/
+static GLvoid *mem_alloc (GLsizei);
+static GLvoid mem_free (GLvoid **);
+static GLvoid *mem_realloc (GLvoid *, GLsizei, GLsizei);
+static GLubyte *str_duplicate (const GLubyte *);
+
+/*
+	internal error messages
+*/
+static const GLubyte *OUT_OF_MEMORY =
+   (GLubyte *) "internal error 1001: out of physical memory";
+static const GLubyte *UNRESOLVED_REFERENCE =
+   (GLubyte *) "internal error 1002: unresolved reference '$'";
+/*
+static const GLubyte *INVALID_PARAMETER =
+   (GLubyte *) "internal error 1003: invalid parameter";
+*/
+
+static const GLubyte *error_message = NULL;
+static GLubyte *error_param = NULL;        /* this is inserted into error_message in place of $ */
+static GLint error_position = -1;
+
+static GLubyte *unknown = (GLubyte *) "???";
+
+static GLvoid
+clear_last_error (GLvoid)
+{
+   /* reset error message */
+   error_message = NULL;
+
+   /* free error parameter - if error_param is a "???" don't free it - it's static */
+   if (error_param != unknown)
+      mem_free ((GLvoid **) & error_param);
+   else
+      error_param = NULL;
+
+   /* reset error position */
+   error_position = -1;
+}
+
+static GLvoid
+set_last_error (const GLubyte * msg, GLubyte * param, GLint pos)
+{
+   if (error_message != NULL)
+      return;
+
+   error_message = msg;
+   if (param != NULL)
+      error_param = param;
+   else
+      error_param = unknown;
+
+   error_position = pos;
+}
+
+/*
+ * memory management routines
+ */
+static GLvoid *
+mem_alloc (GLsizei size)
+{
+   GLvoid *ptr = _mesa_malloc (size);
+   if (ptr == NULL)
+      set_last_error (OUT_OF_MEMORY, NULL, -1);
+   return ptr;
+}
+
+static GLvoid
+mem_free (GLvoid ** ptr)
+{
+   _mesa_free (*ptr);
+   *ptr = NULL;
+}
+
+static GLvoid *
+mem_realloc (GLvoid * ptr, GLsizei old_size, GLsizei new_size)
+{
+   GLvoid *ptr2 = _mesa_realloc (ptr, old_size, new_size);
+   if (ptr2 == NULL)
+      set_last_error (OUT_OF_MEMORY, NULL, -1);
+   return ptr2;
+}
+
+static GLubyte *
+str_duplicate (const GLubyte * str)
+{
+   return (GLubyte *) _mesa_strdup ((const char *) str);
+}
+
+/*
+ * emit type typedef
+ */
+typedef enum emit_type_
+{
+   et_byte,                     /* explicit number */
+   et_stream,                   /* eaten character */
+   et_position                  /* current position */
+}
+emit_type;
+
+/*
+ * emit typedef
+ */
+typedef struct emit_
+{
+   emit_type m_emit_type;
+   GLubyte m_byte;                 /* et_byte */
+   struct emit_ *m_next;
+}
+emit;
+
+static GLvoid
+emit_create (emit ** em)
+{
+   *em = (emit *) mem_alloc (sizeof (emit));
+   if (*em) {
+      (**em).m_emit_type = et_byte;
+      (**em).m_byte = 0;
+      (**em).m_next = NULL;
+   }
+}
+
+static GLvoid
+emit_destroy (emit ** em)
+{
+   if (*em) {
+      emit_destroy (&(**em).m_next);
+      mem_free ((GLvoid **) em);
+   }
+}
+
+static GLvoid
+emit_append (emit ** em, emit ** ne)
+{
+   if (*em)
+      emit_append (&(**em).m_next, ne);
+   else
+      *em = *ne;
+}
+
+/*
+ * error typedef
+ */
+typedef struct error_
+{
+   GLubyte *m_text;
+   GLubyte *m_token_name;
+   struct defntn_ *m_token;
+}
+error;
+
+static GLvoid
+error_create (error ** er)
+{
+   *er = (error *) mem_alloc (sizeof (error));
+   if (*er) {
+      (**er).m_text = NULL;
+      (**er).m_token_name = NULL;
+      (**er).m_token = NULL;
+   }
+}
+
+static GLvoid
+error_destroy (error ** er)
+{
+   if (*er) {
+      mem_free ((GLvoid **) & (**er).m_text);
+      mem_free ((GLvoid **) & (**er).m_token_name);
+      mem_free ((GLvoid **) er);
+   }
+}
+
+struct dict_;
+static GLubyte *error_get_token (error *, struct dict_ *, const GLubyte *, GLuint);
+
+/*
+ * specifier type typedef
+*/
+typedef enum spec_type_
+{
+   st_false,
+   st_true,
+   st_byte,
+   st_byte_range,
+   st_string,
+   st_identifier,
+   st_identifier_loop,
+   st_debug
+} spec_type;
+
+
+/*
+ * specifier typedef
+ */
+typedef struct spec_
+{
+   spec_type m_spec_type;
+   GLubyte m_byte[2];              /* st_byte, st_byte_range */
+   GLubyte *m_string;              /* st_string */
+   struct defntn_ *m_defntn;    /* st_identifier, st_identifier_loop */
+   emit *m_emits;
+   error *m_errtext;
+   struct spec_ *m_next;
+} spec;
+
+
+static GLvoid
+spec_create (spec ** sp)
+{
+   *sp = (spec *) mem_alloc (sizeof (spec));
+   if (*sp) {
+      (**sp).m_spec_type = st_false;
+      (**sp).m_byte[0] = '\0';
+      (**sp).m_byte[1] = '\0';
+      (**sp).m_string = NULL;
+      (**sp).m_defntn = NULL;
+      (**sp).m_emits = NULL;
+      (**sp).m_errtext = NULL;
+      (**sp).m_next = NULL;
+   }
+}
+
+static GLvoid
+spec_destroy (spec ** sp)
+{
+   if (*sp) {
+      spec_destroy (&(**sp).m_next);
+      emit_destroy (&(**sp).m_emits);
+      error_destroy (&(**sp).m_errtext);
+      mem_free ((GLvoid **) & (**sp).m_string);
+      mem_free ((GLvoid **) sp);
+   }
+}
+
+static GLvoid
+spec_append (spec ** sp, spec ** ns)
+{
+   if (*sp)
+      spec_append (&(**sp).m_next, ns);
+   else
+      *sp = *ns;
+}
+
+/*
+ * operator typedef
+ */
+typedef enum oper_
+{
+   op_none,
+   op_and,
+   op_or
+} oper;
+
+
+/*
+ * definition typedef
+ */
+typedef struct defntn_
+{
+   oper m_oper;
+   spec *m_specs;
+   struct defntn_ *m_next;
+#ifndef NDEBUG
+   GLint m_referenced;
+#endif
+} defntn;
+
+
+static GLvoid
+defntn_create (defntn ** de)
+{
+   *de = (defntn *) mem_alloc (sizeof (defntn));
+   if (*de) {
+      (**de).m_oper = op_none;
+      (**de).m_specs = NULL;
+      (**de).m_next = NULL;
+#ifndef NDEBUG
+      (**de).m_referenced = 0;
+#endif
+   }
+}
+
+static GLvoid
+defntn_destroy (defntn ** de)
+{
+   if (*de) {
+      defntn_destroy (&(**de).m_next);
+      spec_destroy (&(**de).m_specs);
+      mem_free ((GLvoid **) de);
+   }
+}
+
+static GLvoid
+defntn_append (defntn ** de, defntn ** nd)
+{
+   if (*de)
+      defntn_append (&(**de).m_next, nd);
+   else
+      *de = *nd;
+}
+
+/*
+ * dictionary typedef
+ */
+typedef struct dict_
+{
+   defntn *m_defntns;
+   defntn *m_syntax;
+   defntn *m_string;
+   struct dict_ *m_next;
+} dict;
+
+
+static GLvoid
+dict_create (dict ** di)
+{
+   *di = (dict *) mem_alloc (sizeof (dict));
+   if (*di) {
+      (**di).m_defntns = NULL;
+      (**di).m_syntax = NULL;
+      (**di).m_string = NULL;
+      (**di).m_next = NULL;
+   }
+}
+
+static GLvoid
+dict_destroy (dict ** di)
+{
+   if (*di) {
+      dict_destroy (&(**di).m_next);
+      defntn_destroy (&(**di).m_defntns);
+      mem_free ((GLvoid **) di);
+   }
+}
+
+/*
+ * GLubyte array typedef
+ */
+typedef struct barray_
+{
+   GLubyte *data;
+   GLuint len;
+} barray;
+
+
+static GLvoid
+barray_create (barray ** ba)
+{
+   *ba = (barray *) mem_alloc (sizeof (barray));
+   if (*ba) {
+      (**ba).data = NULL;
+      (**ba).len = 0;
+   }
+}
+
+static GLvoid
+barray_destroy (barray ** ba)
+{
+   if (*ba) {
+      mem_free ((GLvoid **) & (**ba).data);
+      mem_free ((GLvoid **) ba);
+   }
+}
+
+/*
+ * reallocates GLubyte array to requested size,
+ * returns 0 on success,
+ * returns 1 otherwise
+ */
+static GLint
+barray_resize (barray ** ba, GLuint nlen)
+{
+   GLubyte *new_pointer;
+
+   if (nlen == 0) {
+      mem_free ((void **) &(**ba).data);
+      (**ba).data = NULL;
+      (**ba).len = 0;
+
+      return 0;
+   }
+   else {
+      new_pointer = (GLubyte *)
+         mem_realloc ((**ba).data, (**ba).len * sizeof (GLubyte),
+                      nlen * sizeof (GLubyte));
+      if (new_pointer) {
+         (**ba).data = new_pointer;
+         (**ba).len = nlen;
+
+         return 0;
+      }
+   }
+
+   return 1;
+}
+
+/*
+ * adds GLubyte array pointed by *nb to the end of array pointed by *ba,
+ * returns 0 on success,
+ * returns 1 otherwise
+ */
+static GLint
+barray_append (barray ** ba, barray ** nb)
+{
+   GLuint i;
+   const GLuint len = (**ba).len;
+
+   if (barray_resize (ba, (**ba).len + (**nb).len))
+      return 1;
+
+   for (i = 0; i < (**nb).len; i++)
+      (**ba).data[len + i] = (**nb).data[i];
+
+   return 0;
+}
+
+
+/**
+ * Adds emit chain pointed by em to the end of array pointed by *ba.
+ * \return 0 on success, 1 otherwise.
+ */
+static GLint
+barray_push (barray ** ba, emit * em, GLubyte c, GLuint pos)
+{
+   emit *temp = em;
+   GLuint count = 0;
+
+   while (temp) {
+      if (temp->m_emit_type == et_position)
+         count += 4;            /* position is a 32-bit unsigned integer */
+      else
+         count++;
+
+      temp = temp->m_next;
+   }
+
+   if (barray_resize (ba, (**ba).len + count))
+      return 1;
+
+   while (em) {
+      if (em->m_emit_type == et_byte)
+         (**ba).data[(**ba).len - count--] = em->m_byte;
+      else if (em->m_emit_type == et_stream)
+         (**ba).data[(**ba).len - count--] = c;
+
+      /* This is where the position is emitted into the stream */
+      else {                    /* em->type == et_position */
+#if 0
+         (**ba).data[(**ba).len - count--] = (GLubyte) pos,
+            (**ba).data[(**ba).len - count--] = (GLubyte) (pos >> 8),
+            (**ba).data[(**ba).len - count--] = (GLubyte) (pos >> 16),
+            (**ba).data[(**ba).len - count--] = (GLubyte) (pos >> 24);
+#else
+         (**ba).data[(**ba).len - count--] = (GLubyte) pos;
+         (**ba).data[(**ba).len - count--] = (GLubyte) (pos / 0x100);
+         (**ba).data[(**ba).len - count--] = (GLubyte) (pos / 0x10000);
+         (**ba).data[(**ba).len - count--] = (GLubyte) (pos / 0x1000000);
+#endif
+      }
+
+      em = em->m_next;
+   }
+
+   return 0;
+}
+
+/**
+ * string to string map typedef
+ */
+typedef struct map_str_
+{
+   GLubyte *key;
+   GLubyte *data;
+   struct map_str_ *next;
+} map_str;
+
+
+static GLvoid
+map_str_create (map_str ** ma)
+{
+   *ma = (map_str *) mem_alloc (sizeof (map_str));
+   if (*ma) {
+      (**ma).key = NULL;
+      (**ma).data = NULL;
+      (**ma).next = NULL;
+   }
+}
+
+static GLvoid
+map_str_destroy (map_str ** ma)
+{
+   if (*ma) {
+      map_str_destroy (&(**ma).next);
+      mem_free ((GLvoid **) & (**ma).key);
+      mem_free ((GLvoid **) & (**ma).data);
+      mem_free ((GLvoid **) ma);
+   }
+}
+
+static GLvoid
+map_str_append (map_str ** ma, map_str ** nm)
+{
+   if (*ma)
+      map_str_append (&(**ma).next, nm);
+   else
+      *ma = *nm;
+}
+
+/**
+ * searches the map for specified key,
+ * if the key is matched, *data is filled with data associated with the key,
+ * \return 0 if the key is matched, 1 otherwise
+ */
+static GLint
+map_str_find (map_str ** ma, const GLubyte * key, GLubyte ** data)
+{
+   while (*ma) {
+      if (strcmp ((const char *) (**ma).key, (const char *) key) == 0) {
+         *data = str_duplicate ((**ma).data);
+         if (*data == NULL)
+            return 1;
+
+         return 0;
+      }
+
+      ma = &(**ma).next;
+   }
+
+   set_last_error (UNRESOLVED_REFERENCE, str_duplicate (key), -1);
+   return 1;
+}
+
+/**
+ * string to GLubyte map typedef
+ */
+typedef struct map_byte_
+{
+   GLubyte *key;
+   GLubyte data;
+   struct map_byte_ *next;
+} map_byte;
+
+static GLvoid
+map_byte_create (map_byte ** ma)
+{
+   *ma = (map_byte *) mem_alloc (sizeof (map_byte));
+   if (*ma) {
+      (**ma).key = NULL;
+      (**ma).data = 0;
+      (**ma).next = NULL;
+   }
+}
+
+static GLvoid
+map_byte_destroy (map_byte ** ma)
+{
+   if (*ma) {
+      map_byte_destroy (&(**ma).next);
+      mem_free ((GLvoid **) & (**ma).key);
+      mem_free ((GLvoid **) ma);
+   }
+}
+
+static GLvoid
+map_byte_append (map_byte ** ma, map_byte ** nm)
+{
+   if (*ma)
+      map_byte_append (&(**ma).next, nm);
+   else
+      *ma = *nm;
+}
+
+/**
+ * Searches the map for specified key,
+ * If the key is matched, *data is filled with data associated with the key,
+ * \return 0 if the is matched, 1 otherwise
+ */
+static GLint
+map_byte_find (map_byte ** ma, const GLubyte * key, GLubyte * data)
+{
+   while (*ma) {
+      if (strcmp ((const char *) (**ma).key, (const char *) key) == 0) {
+         *data = (**ma).data;
+         return 0;
+      }
+
+      ma = &(**ma).next;
+   }
+
+   set_last_error (UNRESOLVED_REFERENCE, str_duplicate (key), -1);
+   return 1;
+}
+
+/*
+ * string to defntn map typedef
+ */
+typedef struct map_def_
+{
+   GLubyte *key;
+   defntn *data;
+   struct map_def_ *next;
+} map_def;
+
+static GLvoid
+map_def_create (map_def ** ma)
+{
+   *ma = (map_def *) mem_alloc (sizeof (map_def));
+   if (*ma) {
+      (**ma).key = NULL;
+      (**ma).data = NULL;
+      (**ma).next = NULL;
+   }
+}
+
+static GLvoid
+map_def_destroy (map_def ** ma)
+{
+   if (*ma) {
+      map_def_destroy (&(**ma).next);
+      mem_free ((GLvoid **) & (**ma).key);
+      mem_free ((GLvoid **) ma);
+   }
+}
+
+static GLvoid
+map_def_append (map_def ** ma, map_def ** nm)
+{
+   if (*ma)
+      map_def_append (&(**ma).next, nm);
+   else
+      *ma = *nm;
+}
+
+/**
+ * searches the map for specified key,
+ * if the key is matched, *data is filled with data associated with the key,
+ * \return 0 if the is matched, 1 otherwise
+ */
+static GLint
+map_def_find (map_def ** ma, const GLubyte * key, defntn ** data)
+{
+   while (*ma) {
+      if (_mesa_strcmp ((const char *) (**ma).key, (const char *) key) == 0) {
+         *data = (**ma).data;
+
+         return 0;
+      }
+
+      ma = &(**ma).next;
+   }
+
+   set_last_error (UNRESOLVED_REFERENCE, str_duplicate (key), -1);
+   return 1;
+}
+
+/*
+ * returns 1 if given character is a space,
+ * returns 0 otherwise
+ */
+static GLint
+is_space (GLubyte c)
+{
+   return c == ' ' || c == '\t' || c == '\n' || c == '\r';
+}
+
+/*
+ * advances text pointer by 1 if character pointed by *text is a space,
+ * returns 1 if a space has been eaten,
+ * returns 0 otherwise
+ */
+static GLint
+eat_space (const GLubyte ** text)
+{
+   if (is_space (**text)) {
+      (*text)++;
+
+      return 1;
+   }
+
+   return 0;
+}
+
+/*
+ * returns 1 if text points to C-style comment start string "/ *",
+ * returns 0 otherwise
+ */
+static GLint
+is_comment_start (const GLubyte * text)
+{
+   return text[0] == '/' && text[1] == '*';
+}
+
+/*
+ * advances text pointer to first character after C-style comment block - if any,
+ * returns 1 if C-style comment block has been encountered and eaten,
+ * returns 0 otherwise
+ */
+static GLint
+eat_comment (const GLubyte ** text)
+{
+   if (is_comment_start (*text)) {
+      /* *text points to comment block - skip two characters to enter comment body */
+      *text += 2;
+      /* skip any character except consecutive '*' and '/' */
+      while (!((*text)[0] == '*' && (*text)[1] == '/'))
+         (*text)++;
+      /* skip those two terminating characters */
+      *text += 2;
+
+      return 1;
+   }
+
+   return 0;
+}
+
+/*
+ * advances text pointer to first character that is neither space nor C-style comment block
+ */
+static GLvoid
+eat_spaces (const GLubyte ** text)
+{
+   while (eat_space (text) || eat_comment (text));
+}
+
+/*
+ * resizes string pointed by *ptr to successfully add character c to the end of the string,
+ * returns 0 on success,
+ * returns 1 otherwise
+ */
+static GLint
+string_grow (GLubyte ** ptr, GLuint * len, GLubyte c)
+{
+   /* reallocate the string in 16-length increments */
+   if ((*len & 0x0F) == 0x0F || *ptr == NULL) {
+      GLubyte *tmp = (GLubyte *) mem_realloc (*ptr, (*len) * sizeof (GLubyte),
+                               ((*len + 1 + 1 +
+                                 0x0F) & ~0x0F) * sizeof (GLubyte));
+      if (tmp == NULL)
+         return 1;
+
+      *ptr = tmp;
+   }
+
+   if (c) {
+      /* append given character */
+      (*ptr)[*len] = c;
+      (*len)++;
+   }
+   (*ptr)[*len] = '\0';
+
+   return 0;
+}
+
+/*
+ * returns 1 if given character is valid identifier character a-z, A-Z, 0-9 or _
+ * returns 0 otherwise
+ */
+static GLint
+is_identifier (GLubyte c)
+{
+   return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') ||
+      (c >= '0' && c <= '9') || c == '_';
+}
+
+/*
+ * copies characters from *text to *id until non-identifier character is encountered,
+ * assumes that *id points to NULL object - caller is responsible for later freeing the string,
+ * text pointer is advanced to point past the copied identifier,
+ * returns 0 if identifier was successfully copied,
+ * returns 1 otherwise
+ */
+static GLint
+get_identifier (const GLubyte ** text, GLubyte ** id)
+{
+   const GLubyte *t = *text;
+   GLubyte *p = NULL;
+   GLuint len = 0;
+
+   if (string_grow (&p, &len, '\0'))
+      return 1;
+
+   /* loop while next character in buffer is valid for identifiers */
+   while (is_identifier (*t)) {
+      if (string_grow (&p, &len, *t++)) {
+         mem_free ((GLvoid **) & p);
+         return 1;
+      }
+   }
+
+   *text = t;
+   *id = p;
+
+   return 0;
+}
+
+/*
+ * returns 1 if given character is HEX digit 0-9, A-F or a-f,
+ * returns 0 otherwise
+ */
+static GLint
+is_hex (GLubyte c)
+{
+   return (c >= '0' && c <= '9') || (c >= 'A' && c <= 'F') || (c >= 'a'
+                                                               && c <= 'f');
+}
+
+/*
+ * returns value of passed character as if it was HEX digit
+ */
+static GLuint
+hex2dec (GLubyte c)
+{
+   if (c >= '0' && c <= '9')
+      return c - '0';
+   if (c >= 'A' && c <= 'F')
+      return c - 'A' + 10;
+   return c - 'a' + 10;
+}
+
+/*
+ * converts sequence of HEX digits pointed by *text until non-HEX digit is encountered,
+ * advances text pointer past the converted sequence,
+ * returns the converted value
+ */
+static GLuint
+hex_convert (const GLubyte ** text)
+{
+   GLuint value = 0;
+
+   while (is_hex (**text)) {
+      value = value * 0x10 + hex2dec (**text);
+      (*text)++;
+   }
+
+   return value;
+}
+
+/*
+ * returns 1 if given character is OCT digit 0-7,
+ * returns 0 otherwise
+ */
+static GLint
+is_oct (GLubyte c)
+{
+   return c >= '0' && c <= '7';
+}
+
+/*
+ * returns value of passed character as if it was OCT digit
+ */
+static GLint
+oct2dec (GLubyte c)
+{
+   return c - '0';
+}
+
+static GLubyte
+get_escape_sequence (const GLubyte ** text)
+{
+   GLint value = 0;
+
+   /* skip '\' character */
+   (*text)++;
+
+   switch (*(*text)++) {
+      case '\'':
+         return '\'';
+      case '"':
+         return '\"';
+      case '?':
+         return '\?';
+      case '\\':
+         return '\\';
+      case 'a':
+         return '\a';
+      case 'b':
+         return '\b';
+      case 'f':
+         return '\f';
+      case 'n':
+         return '\n';
+      case 'r':
+         return '\r';
+      case 't':
+         return '\t';
+      case 'v':
+         return '\v';
+      case 'x':
+         return (GLubyte) hex_convert (text);
+   }
+
+   (*text)--;
+   if (is_oct (**text)) {
+      value = oct2dec (*(*text)++);
+      if (is_oct (**text)) {
+         value = value * 010 + oct2dec (*(*text)++);
+         if (is_oct (**text))
+            value = value * 010 + oct2dec (*(*text)++);
+      }
+   }
+
+   return (GLubyte) value;
+}
+
+/*
+ * copies characters from *text to *str until " or ' character is encountered,
+ * assumes that *str points to NULL object - caller is responsible for later freeing the string,
+ * assumes that *text points to " or ' character that starts the string,
+ * text pointer is advanced to point past the " or ' character,
+ * returns 0 if string was successfully copied,
+ * returns 1 otherwise
+ */
+static GLint
+get_string (const GLubyte ** text, GLubyte ** str)
+{
+   const GLubyte *t = *text;
+   GLubyte *p = NULL;
+   GLuint len = 0;
+   GLubyte term_char;
+
+   if (string_grow (&p, &len, '\0'))
+      return 1;
+
+   /* read " or ' character that starts the string */
+   term_char = *t++;
+   /* while next character is not the terminating character */
+   while (*t && *t != term_char) {
+      GLubyte c;
+
+      if (*t == '\\')
+         c = get_escape_sequence (&t);
+      else
+         c = *t++;
+
+      if (string_grow (&p, &len, c)) {
+         mem_free ((GLvoid **) & p);
+         return 1;
+      }
+   }
+
+   /* skip " or ' character that ends the string */
+   t++;
+
+   *text = t;
+   *str = p;
+   return 0;
+}
+
+/*
+ * gets emit code, the syntax is: ".emtcode" " " <symbol> " " ("0x" | "0X") <hex_value>
+ * assumes that *text already points to <symbol>,
+ * returns 0 if emit code is successfully read,
+ * returns 1 otherwise
+ */
+static GLint
+get_emtcode (const GLubyte ** text, map_byte ** ma)
+{
+   const GLubyte *t = *text;
+   map_byte *m = NULL;
+
+   map_byte_create (&m);
+   if (m == NULL)
+      return 1;
+
+   if (get_identifier (&t, &m->key)) {
+      map_byte_destroy (&m);
+      return 1;
+   }
+   eat_spaces (&t);
+
+   if (*t == '\'') {
+      GLubyte *c;
+
+      if (get_string (&t, &c)) {
+         map_byte_destroy (&m);
+         return 1;
+      }
+
+      m->data = (GLubyte) c[0];
+      mem_free ((GLvoid **) & c);
+   }
+   else {
+      /* skip HEX "0x" or "0X" prefix */
+      t += 2;
+      m->data = (GLubyte) hex_convert (&t);
+   }
+
+   eat_spaces (&t);
+
+   *text = t;
+   *ma = m;
+   return 0;
+}
+
+/*
+ * returns 0 on success,
+ * returns 1 otherwise
+ */
+static GLint
+get_errtext (const GLubyte ** text, map_str ** ma)
+{
+   const GLubyte *t = *text;
+   map_str *m = NULL;
+
+   map_str_create (&m);
+   if (m == NULL)
+      return 1;
+
+   if (get_identifier (&t, &m->key)) {
+      map_str_destroy (&m);
+      return 1;
+   }
+   eat_spaces (&t);
+
+   if (get_string (&t, &m->data)) {
+      map_str_destroy (&m);
+      return 1;
+   }
+   eat_spaces (&t);
+
+   *text = t;
+   *ma = m;
+   return 0;
+}
+
+/*
+ * returns 0 on success,
+ * returns 1 otherwise,
+ */
+static GLint
+get_error (const GLubyte ** text, error ** er, map_str * maps)
+{
+   const GLubyte *t = *text;
+   GLubyte *temp = NULL;
+
+   if (*t != '.')
+      return 0;
+
+   t++;
+   if (get_identifier (&t, &temp))
+      return 1;
+   eat_spaces (&t);
+
+   if (_mesa_strcmp ("error", (char *) temp) != 0) {
+      mem_free ((GLvoid **) & temp);
+      return 0;
+   }
+
+   mem_free ((GLvoid **) & temp);
+
+   error_create (er);
+   if (*er == NULL)
+      return 1;
+
+   if (*t == '\"') {
+      if (get_string (&t, &(**er).m_text)) {
+         error_destroy (er);
+         return 1;
+      }
+      eat_spaces (&t);
+   }
+   else {
+      if (get_identifier (&t, &temp)) {
+         error_destroy (er);
+         return 1;
+      }
+      eat_spaces (&t);
+
+      if (map_str_find (&maps, temp, &(**er).m_text)) {
+         mem_free ((GLvoid **) & temp);
+         error_destroy (er);
+         return 1;
+      }
+
+      mem_free ((GLvoid **) & temp);
+   }
+
+   /* try to extract "token" from "...$token$..." */
+   {
+      char *processed = NULL;
+      GLuint len = 0, i = 0;
+
+      if (string_grow ((GLubyte **) (&processed), &len, '\0')) {
+         error_destroy (er);
+         return 1;
+      }
+
+      while (i < _mesa_strlen ((char *) ((**er).m_text))) {
+         /* check if the dollar sign is repeated - if so skip it */
+         if ((**er).m_text[i] == '$' && (**er).m_text[i + 1] == '$') {
+            if (string_grow ((GLubyte **) (&processed), &len, '$')) {
+               mem_free ((GLvoid **) & processed);
+               error_destroy (er);
+               return 1;
+            }
+
+            i += 2;
+         }
+         else if ((**er).m_text[i] != '$') {
+            if (string_grow ((GLubyte **) (&processed), &len, (**er).m_text[i])) {
+               mem_free ((GLvoid **) & processed);
+               error_destroy (er);
+               return 1;
+            }
+
+            i++;
+         }
+         else {
+            if (string_grow ((GLubyte **) (&processed), &len, '$')) {
+               mem_free ((GLvoid **) & processed);
+               error_destroy (er);
+               return 1;
+            }
+
+            {
+               /* length of token being extracted */
+               GLuint tlen = 0;
+
+               if (string_grow (&(**er).m_token_name, &tlen, '\0')) {
+                  mem_free ((GLvoid **) & processed);
+                  error_destroy (er);
+                  return 1;
+               }
+
+               /* skip the dollar sign */
+               i++;
+
+               while ((**er).m_text[i] != '$') {
+                  if (string_grow
+                      (&(**er).m_token_name, &tlen, (**er).m_text[i])) {
+                     mem_free ((GLvoid **) & processed);
+                     error_destroy (er);
+                     return 1;
+                  }
+
+                  i++;
+               }
+
+               /* skip the dollar sign */
+               i++;
+            }
+         }
+      }
+
+      mem_free ((GLvoid **) & (**er).m_text);
+      (**er).m_text = (GLubyte *) processed;
+   }
+
+   *text = t;
+   return 0;
+}
+
+/*
+ * returns 0 on success,
+ * returns 1 otherwise,
+ */
+static GLint
+get_emits (const GLubyte ** text, emit ** em, map_byte * mapb)
+{
+   const GLubyte *t = *text;
+   GLubyte *temp = NULL;
+   emit *e = NULL;
+
+   if (*t != '.')
+      return 0;
+
+   t++;
+   if (get_identifier (&t, &temp))
+      return 1;
+   eat_spaces (&t);
+
+   /* .emit */
+   if (_mesa_strcmp ("emit", (char *) temp) != 0) {
+      mem_free ((GLvoid **) & temp);
+      return 0;
+   }
+
+   mem_free ((GLvoid **) & temp);
+
+   emit_create (&e);
+   if (e == NULL)
+      return 1;
+
+   /* 0xNN */
+   if (*t == '0') {
+      t += 2;
+      e->m_byte = (GLubyte) hex_convert (&t);
+
+      e->m_emit_type = et_byte;
+   }
+   /* * */
+   else if (*t == '*') {
+      t++;
+
+      e->m_emit_type = et_stream;
+   }
+   /* $ */
+   else if (*t == '$') {
+      t++;
+
+      e->m_emit_type = et_position;
+   }
+   /* 'c' */
+   else if (*t == '\'') {
+      if (get_string (&t, &temp)) {
+         emit_destroy (&e);
+         return 1;
+      }
+      e->m_byte = (GLubyte) temp[0];
+
+      mem_free ((GLvoid **) & temp);
+
+      e->m_emit_type = et_byte;
+   }
+   else {
+      if (get_identifier (&t, &temp)) {
+         emit_destroy (&e);
+         return 1;
+      }
+
+      if (map_byte_find (&mapb, temp, &e->m_byte)) {
+         mem_free ((GLvoid **) & temp);
+         emit_destroy (&e);
+         return 1;
+      }
+
+      mem_free ((GLvoid **) & temp);
+
+      e->m_emit_type = et_byte;
+   }
+
+   eat_spaces (&t);
+
+   if (get_emits (&t, &e->m_next, mapb)) {
+      emit_destroy (&e);
+      return 1;
+   }
+
+   *text = t;
+   *em = e;
+   return 0;
+}
+
+/*
+ * returns 0 on success,
+ * returns 1 otherwise,
+ */
+static GLint
+get_spec (const GLubyte ** text, spec ** sp, map_str * maps, map_byte * mapb)
+{
+   const GLubyte *t = *text;
+   spec *s = NULL;
+
+   spec_create (&s);
+   if (s == NULL)
+      return 1;
+
+   if (*t == '\'') {
+      GLubyte *temp = NULL;
+
+      if (get_string (&t, &temp)) {
+         spec_destroy (&s);
+         return 1;
+      }
+      eat_spaces (&t);
+
+      if (*t == '-') {
+         GLubyte *temp2 = NULL;
+
+         /* skip the '-' character */
+         t++;
+         eat_spaces (&t);
+
+         if (get_string (&t, &temp2)) {
+            mem_free ((GLvoid **) & temp);
+            spec_destroy (&s);
+            return 1;
+         }
+         eat_spaces (&t);
+
+         s->m_spec_type = st_byte_range;
+         s->m_byte[0] = *temp;
+         s->m_byte[1] = *temp2;
+
+         mem_free ((GLvoid **) & temp2);
+      }
+      else {
+         s->m_spec_type = st_byte;
+         *s->m_byte = *temp;
+      }
+
+      mem_free ((GLvoid **) & temp);
+   }
+   else if (*t == '"') {
+      if (get_string (&t, &s->m_string)) {
+         spec_destroy (&s);
+         return 1;
+      }
+      eat_spaces (&t);
+
+      s->m_spec_type = st_string;
+   }
+   else if (*t == '.') {
+      GLubyte *keyword = NULL;
+
+      /* skip the dot */
+      t++;
+
+      if (get_identifier (&t, &keyword)) {
+         spec_destroy (&s);
+         return 1;
+      }
+      eat_spaces (&t);
+
+      /* .true */
+      if (_mesa_strcmp ("true", (char *) keyword) == 0) {
+         s->m_spec_type = st_true;
+      }
+      /* .false */
+      else if (_mesa_strcmp ("false", (char *) keyword) == 0) {
+         s->m_spec_type = st_false;
+      }
+      /* .debug */
+      else if (_mesa_strcmp ("debug", (char *) keyword) == 0) {
+         s->m_spec_type = st_debug;
+      }
+      /* .loop */
+      else if (_mesa_strcmp ("loop", (char *) keyword) == 0) {
+         if (get_identifier (&t, &s->m_string)) {
+            mem_free ((GLvoid **) & keyword);
+            spec_destroy (&s);
+            return 1;
+         }
+         eat_spaces (&t);
+
+         s->m_spec_type = st_identifier_loop;
+      }
+
+      mem_free ((GLvoid **) & keyword);
+   }
+   else {
+      if (get_identifier (&t, &s->m_string)) {
+         spec_destroy (&s);
+         return 1;
+      }
+      eat_spaces (&t);
+
+      s->m_spec_type = st_identifier;
+   }
+
+   if (get_error (&t, &s->m_errtext, maps)) {
+      spec_destroy (&s);
+      return 1;
+   }
+
+   if (get_emits (&t, &s->m_emits, mapb)) {
+      spec_destroy (&s);
+      return 1;
+   }
+
+   *text = t;
+   *sp = s;
+   return 0;
+}
+
+/*
+ * returns 0 on success,
+ * returns 1 otherwise,
+ */
+static GLint
+get_definition (const GLubyte ** text, defntn ** de, map_str * maps,
+                map_byte * mapb)
+{
+   const GLubyte *t = *text;
+   defntn *d = NULL;
+
+   defntn_create (&d);
+   if (d == NULL)
+      return 1;
+
+   if (get_spec (&t, &d->m_specs, maps, mapb)) {
+      defntn_destroy (&d);
+      return 1;
+   }
+
+   while (*t != ';') {
+      GLubyte *op = NULL;
+      spec *sp = NULL;
+
+      /* skip the dot that precedes "and" or "or" */
+      t++;
+
+      /* read "and" or "or" keyword */
+      if (get_identifier (&t, &op)) {
+         defntn_destroy (&d);
+         return 1;
+      }
+      eat_spaces (&t);
+
+      if (d->m_oper == op_none) {
+         /* .and */
+         if (_mesa_strcmp ("and", (char *) op) == 0)
+            d->m_oper = op_and;
+         /* .or */
+         else
+            d->m_oper = op_or;
+      }
+
+      mem_free ((GLvoid **) & op);
+
+      if (get_spec (&t, &sp, maps, mapb)) {
+         defntn_destroy (&d);
+         return 1;
+      }
+
+      spec_append (&d->m_specs, &sp);
+   }
+
+   /* skip the semicolon */
+   t++;
+   eat_spaces (&t);
+
+   *text = t;
+   *de = d;
+   return 0;
+}
+
+/*
+ * returns 0 on success,
+ * returns 1 otherwise,
+ */
+static GLint
+update_dependency (map_def * mapd, GLubyte * symbol, defntn ** def)
+{
+   if (map_def_find (&mapd, symbol, def))
+      return 1;
+
+#ifndef NDEBUG
+   (**def).m_referenced = 1;
+#endif
+
+   return 0;
+}
+
+/*
+ * returns 0 on success,
+ * returns 1 otherwise,
+ */
+static GLint
+update_dependencies (dict * di, map_def * mapd, GLubyte ** syntax_symbol,
+                     GLubyte ** string_symbol)
+{
+   defntn *de = di->m_defntns;
+
+   if (update_dependency (mapd, *syntax_symbol, &di->m_syntax) ||
+       (*string_symbol != NULL
+        && update_dependency (mapd, *string_symbol, &di->m_string)))
+      return 1;
+
+   mem_free ((GLvoid **) syntax_symbol);
+   mem_free ((GLvoid **) string_symbol);
+
+   while (de) {
+      spec *sp = de->m_specs;
+
+      while (sp) {
+         if (sp->m_spec_type == st_identifier
+             || sp->m_spec_type == st_identifier_loop) {
+            if (update_dependency (mapd, sp->m_string, &sp->m_defntn))
+               return 1;
+
+            mem_free ((GLvoid **) & sp->m_string);
+         }
+
+         if (sp->m_errtext && sp->m_errtext->m_token_name) {
+            if (update_dependency
+                (mapd, sp->m_errtext->m_token_name, &sp->m_errtext->m_token))
+               return 1;
+
+            mem_free ((GLvoid **) & sp->m_errtext->m_token_name);
+         }
+
+         sp = sp->m_next;
+      }
+
+      de = de->m_next;
+   }
+
+   return 0;
+}
+
+typedef enum match_result_
+{
+   mr_not_matched,              /* the examined string does not match */
+   mr_matched,                  /* the examined string matches */
+   mr_error_raised,             /* mr_not_matched + error has been raised */
+   mr_dont_emit,                /* used by identifier loops only */
+   mr_internal_error            /* an internal error has occured such as out of memory */
+} match_result;
+
+static match_result
+match (dict * di, const GLubyte * text, GLuint * index, defntn * de,
+       barray ** ba, GLint filtering_string)
+{
+   GLuint ind = *index;
+   match_result status = mr_not_matched;
+   spec *sp = de->m_specs;
+
+   /* for every specifier in the definition */
+   while (sp) {
+      GLuint i, len, save_ind = ind;
+      barray *array = NULL;
+
+      switch (sp->m_spec_type) {
+         case st_identifier:
+            barray_create (&array);
+            if (array == NULL)
+               return mr_internal_error;
+
+            status =
+               match (di, text, &ind, sp->m_defntn, &array, filtering_string);
+            if (status == mr_internal_error) {
+               barray_destroy (&array);
+               return mr_internal_error;
+            }
+            break;
+         case st_string:
+            len = _mesa_strlen ((char *) (sp->m_string));
+
+            /* prefilter the stream */
+            if (!filtering_string && di->m_string) {
+               barray *ba;
+               GLuint filter_index = 0;
+               match_result result;
+
+               barray_create (&ba);
+               if (ba == NULL)
+                  return mr_internal_error;
+
+               result =
+                  match (di, text + ind, &filter_index, di->m_string, &ba, 1);
+
+               if (result == mr_internal_error) {
+                  barray_destroy (&ba);
+                  return mr_internal_error;
+               }
+
+               if (result != mr_matched) {
+                  barray_destroy (&ba);
+                  status = mr_not_matched;
+                  break;
+               }
+
+               barray_destroy (&ba);
+
+               if (filter_index != len
+                   || _mesa_strncmp ((char *)sp->m_string, (char *)(text + ind), len)) {
+                  status = mr_not_matched;
+                  break;
+               }
+
+               status = mr_matched;
+               ind += len;
+            }
+            else {
+               status = mr_matched;
+               for (i = 0; status == mr_matched && i < len; i++)
+                  if (text[ind + i] != sp->m_string[i])
+                     status = mr_not_matched;
+               if (status == mr_matched)
+                  ind += len;
+            }
+            break;
+         case st_byte:
+            status = text[ind] == *sp->m_byte ? mr_matched : mr_not_matched;
+            if (status == mr_matched)
+               ind++;
+            break;
+         case st_byte_range:
+            status = (text[ind] >= sp->m_byte[0]
+                      && text[ind] <=
+                      sp->m_byte[1]) ? mr_matched : mr_not_matched;
+            if (status == mr_matched)
+               ind++;
+            break;
+         case st_true:
+            status = mr_matched;
+            break;
+         case st_false:
+            status = mr_not_matched;
+            break;
+         case st_debug:
+            status = mr_matched;
+            break;
+         case st_identifier_loop:
+            barray_create (&array);
+            if (array == NULL)
+               return mr_internal_error;
+
+            status = mr_dont_emit;
+            for (;;) {
+               match_result result;
+
+               save_ind = ind;
+               result =
+                  match (di, text, &ind, sp->m_defntn, &array,
+                         filtering_string);
+
+               if (result == mr_error_raised) {
+                  status = result;
+                  break;
+               }
+               else if (result == mr_matched) {
+                  if (barray_push (ba, sp->m_emits, text[ind - 1], save_ind)
+                      || barray_append (ba, &array)) {
+                     barray_destroy (&array);
+                     return mr_internal_error;
+                  }
+                  barray_destroy (&array);
+                  barray_create (&array);
+                  if (array == NULL)
+                     return mr_internal_error;
+               }
+               else if (result == mr_internal_error) {
+                  barray_destroy (&array);
+                  return mr_internal_error;
+               }
+               else
+                  break;
+            }
+            break;
+      };
+
+      if (status == mr_error_raised) {
+         barray_destroy (&array);
+
+         return mr_error_raised;
+      }
+
+      if (de->m_oper == op_and && status != mr_matched
+          && status != mr_dont_emit) {
+         barray_destroy (&array);
+
+         if (sp->m_errtext) {
+            set_last_error (sp->m_errtext->m_text,
+                            error_get_token (sp->m_errtext, di, text, ind),
+                            ind);
+
+            return mr_error_raised;
+         }
+
+         return mr_not_matched;
+      }
+
+      if (status == mr_matched) {
+         if (sp->m_emits)
+            if (barray_push (ba, sp->m_emits, text[ind - 1], save_ind)) {
+               barray_destroy (&array);
+               return mr_internal_error;
+            }
+
+         if (array)
+            if (barray_append (ba, &array)) {
+               barray_destroy (&array);
+               return mr_internal_error;
+            }
+      }
+
+      barray_destroy (&array);
+
+      if (de->m_oper == op_or
+          && (status == mr_matched || status == mr_dont_emit)) {
+         *index = ind;
+         return mr_matched;
+      }
+
+      sp = sp->m_next;
+   }
+
+   if (de->m_oper == op_and
+       && (status == mr_matched || status == mr_dont_emit)) {
+      *index = ind;
+      return mr_matched;
+   }
+
+   return mr_not_matched;
+}
+
+static GLubyte *
+error_get_token (error * er, dict * di, const GLubyte * text, unsigned int ind)
+{
+   GLubyte *str = NULL;
+
+   if (er->m_token) {
+      barray *ba;
+      GLuint filter_index = 0;
+
+      barray_create (&ba);
+      if (ba != NULL) {
+         if (match (di, text + ind, &filter_index, er->m_token, &ba, 0) ==
+             mr_matched && filter_index) {
+            str = (GLubyte *) mem_alloc (filter_index + 1);
+            if (str != NULL) {
+               _mesa_strncpy ((char *) str, (char *) (text + ind),
+                              filter_index);
+               str[filter_index] = '\0';
+            }
+         }
+         barray_destroy (&ba);
+      }
+   }
+
+   return str;
+}
+
+typedef struct grammar_load_state_
+{
+   dict *di;
+   GLubyte *syntax_symbol;
+   GLubyte *string_symbol;
+   map_str *maps;
+   map_byte *mapb;
+   map_def *mapd;
+} grammar_load_state;
+
+
+static GLvoid
+grammar_load_state_create (grammar_load_state ** gr)
+{
+   *gr = (grammar_load_state *) mem_alloc (sizeof (grammar_load_state));
+   if (*gr) {
+      (**gr).di = NULL;
+      (**gr).syntax_symbol = NULL;
+      (**gr).string_symbol = NULL;
+      (**gr).maps = NULL;
+      (**gr).mapb = NULL;
+      (**gr).mapd = NULL;
+   }
+}
+
+static GLvoid
+grammar_load_state_destroy (grammar_load_state ** gr)
+{
+   if (*gr) {
+      dict_destroy (&(**gr).di);
+      mem_free ((GLvoid **) &(**gr).syntax_symbol);
+      mem_free ((GLvoid **) &(**gr).string_symbol);
+      map_str_destroy (&(**gr).maps);
+      map_byte_destroy (&(**gr).mapb);
+      map_def_destroy (&(**gr).mapd);
+      mem_free ((GLvoid **) gr);
+   }
+}
+
+/*
+ * the API
+ */
+
+/*
+ * loads grammar script from null-terminated ASCII text
+ * returns the grammar object
+ * returns NULL if an error occurs (call grammar_get_last_error to retrieve the error text)
+ */
+
+static dict *
+grammar_load_from_text (const GLubyte * text)
+{
+   dict *d = NULL;
+   grammar_load_state *g = NULL;
+
+   clear_last_error ();
+
+   grammar_load_state_create (&g);
+   if (g == NULL)
+      return NULL;
+
+   dict_create (&g->di);
+   if (g->di == NULL) {
+      grammar_load_state_destroy (&g);
+      return NULL;
+   }
+
+   eat_spaces (&text);
+
+   /* skip ".syntax" keyword */
+   text += 7;
+   eat_spaces (&text);
+
+   /* retrieve root symbol */
+   if (get_identifier (&text, &g->syntax_symbol)) {
+      grammar_load_state_destroy (&g);
+      return NULL;
+   }
+   eat_spaces (&text);
+
+   /* skip semicolon */
+   text++;
+   eat_spaces (&text);
+
+   while (*text) {
+      GLubyte *symbol = NULL;
+      GLint is_dot = *text == '.';
+
+      if (is_dot)
+         text++;
+
+      if (get_identifier (&text, &symbol)) {
+         grammar_load_state_destroy (&g);
+         return NULL;
+      }
+      eat_spaces (&text);
+
+      /* .emtcode */
+      if (is_dot && _mesa_strcmp ((char *) symbol, "emtcode") == 0) {
+         map_byte *ma = NULL;
+
+         mem_free ((void **) &symbol);
+
+         if (get_emtcode (&text, &ma)) {
+            grammar_load_state_destroy (&g);
+            return NULL;
+         }
+
+         map_byte_append (&g->mapb, &ma);
+      }
+      /* .errtext */
+      else if (is_dot && _mesa_strcmp ((char *) symbol, "errtext") == 0) {
+         map_str *ma = NULL;
+
+         mem_free ((GLvoid **) &symbol);
+
+         if (get_errtext (&text, &ma)) {
+            grammar_load_state_destroy (&g);
+            return NULL;
+         }
+
+         map_str_append (&g->maps, &ma);
+      }
+      /* .string */
+      else if (is_dot && _mesa_strcmp ((char *) symbol, "string") == 0) {
+         mem_free ((GLvoid **) (&symbol));
+
+         if (g->di->m_string != NULL) {
+            grammar_load_state_destroy (&g);
+            return NULL;
+         }
+
+         if (get_identifier (&text, &g->string_symbol)) {
+            grammar_load_state_destroy (&g);
+            return NULL;
+         }
+
+         /* skip semicolon */
+         eat_spaces (&text);
+         text++;
+         eat_spaces (&text);
+      }
+      else {
+         defntn *de = NULL;
+         map_def *ma = NULL;
+
+         if (get_definition (&text, &de, g->maps, g->mapb)) {
+            grammar_load_state_destroy (&g);
+            return NULL;
+         }
+
+         defntn_append (&g->di->m_defntns, &de);
+
+         /* if definition consist of only one specifier, give it an ".and" operator */
+         if (de->m_oper == op_none)
+            de->m_oper = op_and;
+
+         map_def_create (&ma);
+         if (ma == NULL) {
+            grammar_load_state_destroy (&g);
+            return NULL;
+         }
+
+         ma->key = symbol;
+         ma->data = de;
+         map_def_append (&g->mapd, &ma);
+      }
+   }
+
+   if (update_dependencies
+       (g->di, g->mapd, &g->syntax_symbol, &g->string_symbol)) {
+      grammar_load_state_destroy (&g);
+      return NULL;
+   }
+
+   d = g->di;
+   g->di = NULL;
+
+   grammar_load_state_destroy (&g);
+
+   return d;
+}
+
+/**
+ * checks if a null-terminated text matches given grammar
+ * returns 0 on error (call grammar_get_last_error to retrieve the error text)
+ * returns 1 on success, the prod points to newly allocated buffer with
+ * production and size is filled with the production size
+ *
+ * \param id         - The grammar returned from grammar_load_from_text()
+ * \param text       - The program string
+ * \param production - The return parameter for the binary array holding the
+ *                     parsed results
+ * \param size       - The return parameter for the size of production 
+ *
+ * \return 1 on sucess, 0 on parser error
+ */
+static GLint
+grammar_check (dict * di, const GLubyte * text, GLubyte ** production,
+               GLuint *size)
+{
+   barray *ba = NULL;
+   GLuint index = 0;
+
+   clear_last_error ();
+
+   barray_create (&ba);
+   if (ba == NULL)
+      return 0;
+
+   *production = NULL;
+   *size = 0;
+
+   if (match (di, text, &index, di->m_syntax, &ba, 0) != mr_matched) {
+      barray_destroy (&ba);
+      return 0;
+   }
+
+   *production = (GLubyte *) mem_alloc (ba->len * sizeof (GLubyte));
+   if (*production == NULL) {
+      barray_destroy (&ba);
+      return 0;
+   }
+
+   _mesa_memcpy(*production, ba->data, ba->len * sizeof (GLubyte));
+   *size = ba->len;
+   barray_destroy (&ba);
+
+   return 1;
+}
+
+static GLvoid
+grammar_get_last_error (GLubyte * text, GLint size, GLint *pos)
+{
+   GLint len = 0, dots_made = 0;
+   const GLubyte *p = error_message;
+
+   *text = '\0';
+#define APPEND_CHARACTER(x) if (dots_made == 0) {\
+   if (len < size - 1) {\
+      text[len++] = (x); text[len] = '\0';\
+   } else {\
+      GLint i;\
+      for (i = 0; i < 3; i++)\
+         if (--len >= 0)\
+      text[len] = '.';\
+      dots_made = 1;\
+   }\
+}
+
+   if (p) {
+      while (*p) {
+         if (*p == '$') {
+            const GLubyte *r = error_param;
+
+            while (*r) {
+               APPEND_CHARACTER (*r)
+                  r++;
+            }
+
+            p++;
+         }
+         else {
+            APPEND_CHARACTER (*p)
+               p++;
+         }
+      }
+   }
+   *pos = error_position;
+}
+
+/*-----------------------------------------------------------------------
+ * From here on down is the semantic checking portion 
+ *
+ */
+
+/**
+ * Variable Table Handling functions 
+ */
+typedef enum
+{
+   vt_none,
+   vt_address,
+   vt_attrib,
+   vt_param,
+   vt_temp,
+   vt_output,
+   vt_alias
+} var_type;
+
+
+/* 
+ * Setting an explicit field for each of the binding properties is a bit wasteful
+ * of space, but it should be much more clear when reading later on..
+ */
+struct var_cache
+{
+   GLubyte *name;
+   var_type type;
+   GLuint address_binding;      /* The index of the address register we should 
+                                 * be using                                        */
+   GLuint attrib_binding;       /* For type vt_attrib, see nvfragprog.h for values */
+   GLuint attrib_binding_idx;   /* The index into the attrib register file corresponding
+                                 * to the state in attrib_binding                  */
+   GLuint attrib_is_generic;    /* If the attrib was specified through a generic
+                                 * vertex attrib                                   */
+   GLuint temp_binding;         /* The index of the temp register we are to use    */
+   GLuint output_binding;       /* For type vt_output, see nvfragprog.h for values */
+   GLuint output_binding_idx;   /* This is the index into the result register file
+                                 * corresponding to the bound result state         */
+   struct var_cache *alias_binding;     /* For type vt_alias, points to the var_cache entry
+                                         * that this is aliased to                         */
+   GLuint param_binding_type;   /* {PROGRAM_STATE_VAR, PROGRAM_LOCAL_PARAM, 
+                                 *    PROGRAM_ENV_PARAM}                           */
+   GLuint param_binding_begin;  /* This is the offset into the program_parameter_list where
+                                 * the tokens representing our bound state (or constants)
+                                 * start */
+   GLuint param_binding_length; /* This is how many entries in the the program_parameter_list
+                                 * we take up with our state tokens or constants. Note that
+                                 * this is _not_ the same as the number of param registers
+                                 * we eventually use */
+   struct var_cache *next;
+};
+
+static GLvoid
+var_cache_create (struct var_cache **va)
+{
+   *va = (struct var_cache *) _mesa_malloc (sizeof (struct var_cache));
+   if (*va) {
+      (**va).name = NULL;
+      (**va).type = vt_none;
+      (**va).attrib_binding = ~0;
+      (**va).attrib_is_generic = 0;
+      (**va).temp_binding = ~0;
+      (**va).output_binding = ~0;
+      (**va).output_binding_idx = ~0;
+      (**va).param_binding_type = ~0;
+      (**va).param_binding_begin = ~0;
+      (**va).param_binding_length = ~0;
+      (**va).alias_binding = NULL;
+      (**va).next = NULL;
+   }
+}
+
+static GLvoid
+var_cache_destroy (struct var_cache **va)
+{
+   if (*va) {
+      var_cache_destroy (&(**va).next);
+      _mesa_free (*va);
+      *va = NULL;
+   }
+}
+
+static GLvoid
+var_cache_append (struct var_cache **va, struct var_cache *nv)
+{
+   if (*va)
+      var_cache_append (&(**va).next, nv);
+   else
+      *va = nv;
+}
+
+static struct var_cache *
+var_cache_find (struct var_cache *va, GLubyte * name)
+{
+   struct var_cache *first = va;
+
+   while (va) {
+      if (!strcmp ( (const char*) name, (const char*) va->name)) {
+         if (va->type == vt_alias)
+            return var_cache_find (first, va->name);
+         return va;
+      }
+
+      va = va->next;
+   }
+
+   return NULL;
+}
+
+/**
+ * constructs an integer from 4 GLubytes in LE format
+ */
+static GLuint
+parse_position (GLubyte ** inst)
+{
+   GLuint value;
+
+   value =  (GLuint) (*(*inst)++);
+   value += (GLuint) (*(*inst)++) * 0x100;
+   value += (GLuint) (*(*inst)++) * 0x10000;
+   value += (GLuint) (*(*inst)++) * 0x1000000;
+
+   return value;
+}
+
+/**
+ * This will, given a string, lookup the string as a variable name in the
+ * var cache. If the name is found, the var cache node corresponding to the
+ * var name is returned. If it is not found, a new entry is allocated
+ *
+ * \param  I     Points into the binary array where the string identifier begins
+ * \param  found 1 if the string was found in the var_cache, 0 if it was allocated
+ * \return       The location on the var_cache corresponding the the string starting at I
+ */
+static struct var_cache *
+parse_string (GLubyte ** inst, struct var_cache **vc_head,
+              struct arb_program *Program, GLuint * found)
+{
+   GLubyte *i = *inst;
+   struct var_cache *va = NULL;
+
+   *inst += _mesa_strlen ((char *) i) + 1;
+
+   va = var_cache_find (*vc_head, i);
+
+   if (va) {
+      *found = 1;
+      return va;
+   }
+
+   *found = 0;
+   var_cache_create (&va);
+   va->name = i;
+
+   var_cache_append (vc_head, va);
+
+   return va;
+}
+
+static char *
+parse_string_without_adding (GLubyte ** inst, struct arb_program *Program)
+{
+   GLubyte *i = *inst;
+
+   *inst += _mesa_strlen ((char *) i) + 1;
+
+   return (char *) i;
+}
+
+/**
+ * \return 0 if sign is plus, 1 if sign is minus
+ */
+static GLuint
+parse_sign (GLubyte ** inst)
+{
+   /*return *(*inst)++ != '+'; */
+
+   if (**inst == '-') {
+      (*inst)++;
+      return 1;
+   }
+   else if (**inst == '+') {
+      (*inst)++;
+      return 0;
+   }
+
+   return 0;
+}
+
+/**
+ * parses and returns signed integer
+ */
+static GLint
+parse_integer (GLubyte ** inst, struct arb_program *Program)
+{
+   GLint sign;
+   GLint value;
+
+   /* check if *inst points to '+' or '-'
+    * if yes, grab the sign and increment *inst
+    */
+   sign = parse_sign (inst);
+
+   /* now check if *inst points to 0
+    * if yes, increment the *inst and return the default value
+    */
+   if (**inst == 0) {
+      (*inst)++;
+      return 0;
+   }
+
+   /* parse the integer as you normally would do it */
+   value = _mesa_atoi (parse_string_without_adding (inst, Program));
+
+   /* now, after terminating 0 there is a position
+    * to parse it - parse_position()
+    */
+   Program->Position = parse_position (inst);
+
+   if (sign)
+      value *= -1;
+
+   return value;
+}
+
+/**
+ */
+static GLfloat
+parse_float (GLubyte ** inst, struct arb_program *Program)
+{
+   GLint tmp[5], denom;
+   GLuint leading_zeros =0;
+   GLfloat value = 0;
+
+#if 0
+   tmp[0] = parse_sign (inst);  /* This is the sign of the number + - >0, - -> 1 */
+#endif
+   tmp[1] = parse_integer (inst, Program);   /* This is the integer portion of the number */
+
+   /* Now we grab the fractional portion of the number (the digits after 
+	* the .). We can have leading 0's here, which parse_integer will ignore, 
+	* so we'll check for those first
+	*/
+   while ((**inst == '0') && ( *(*inst+1) != 0))
+   {
+	  leading_zeros++;
+	  (*inst)++;
+   }
+   tmp[2] = parse_integer (inst, Program);   /* This is the fractional portion of the number */
+   tmp[3] = parse_sign (inst);               /* This is the sign of the exponent */
+   tmp[4] = parse_integer (inst, Program);   /* This is the exponent */
+
+   value = (GLfloat) tmp[1];
+   denom = 1; 
+   while (denom < tmp[2])
+      denom *= 10;
+   denom *= (GLint) _mesa_pow( 10, leading_zeros );
+   value += (GLfloat) tmp[2] / (GLfloat) denom;
+#if 0
+   if (tmp[0])
+      value *= -1;
+#endif
+   value *= (GLfloat) _mesa_pow (10, (GLfloat) tmp[3] * (GLfloat) tmp[4]);
+
+   return value;
+}
+
+
+/**
+ */
+static GLfloat
+parse_signed_float (GLubyte ** inst, struct arb_program *Program)
+{
+   GLint negate;
+   GLfloat value;
+
+   negate = parse_sign (inst);
+
+   value = parse_float (inst, Program);
+
+   if (negate)
+      value *= -1;
+
+   return value;
+}
+
+/**
+ * This picks out a constant value from the parsed array. The constant vector is r
+ * returned in the *values array, which should be of length 4.
+ *
+ * \param values - The 4 component vector with the constant value in it 
+ */
+static GLvoid
+parse_constant (GLubyte ** inst, GLfloat *values, struct arb_program *Program,
+                GLboolean use)
+{
+   GLuint components, i;
+
+
+   switch (*(*inst)++) {
+      case CONSTANT_SCALAR:
+         if (use == GL_TRUE) {
+            values[0] =
+               values[1] =
+               values[2] = values[3] = parse_float (inst, Program);
+         }
+         else {
+            values[0] =
+               values[1] =
+               values[2] = values[3] = parse_signed_float (inst, Program);
+         }
+
+         break;
+      case CONSTANT_VECTOR:
+         values[0] = values[1] = values[2] = 0;
+         values[3] = 1;
+         components = *(*inst)++;
+         for (i = 0; i < components; i++) {
+            values[i] = parse_signed_float (inst, Program);
+         }
+         break;
+   }
+}
+
+/**
+ * \param offset The offset from the address register that we should
+ *                address
+ *
+ * \return 0 on sucess, 1 on error                
+ */
+static GLuint
+parse_relative_offset (GLcontext *ctx, GLubyte **inst, struct arb_program *Program,
+                        GLint *offset)
+{
+   *offset = parse_integer(inst, Program);
+   if ((*offset > 63) || (*offset < -64)) {
+      _mesa_set_program_error (ctx, Program->Position,
+                               "Relative offset out of range");
+      _mesa_error (ctx, GL_INVALID_OPERATION, "Relative offset %d out of range",
+                                                *offset);
+      return 1;	  
+   }
+
+   return 0;
+}
+
+/**
+ * \param  color 0 if color type is primary, 1 if color type is secondary
+ * \return 0 on sucess, 1 on error
+ */
+static GLuint
+parse_color_type (GLcontext * ctx, GLubyte ** inst, struct arb_program *Program,
+                  GLint * color)
+{
+   *color = *(*inst)++ != COLOR_PRIMARY;
+   return 0;
+}
+
+/**
+ * Get an integer corresponding to a generic vertex attribute.
+ *
+ * \return 0 on sucess, 1 on error
+ */
+static GLuint
+parse_generic_attrib_num(GLcontext *ctx, GLubyte ** inst, 
+                       struct arb_program *Program, GLuint *attrib)
+{
+   *attrib = parse_integer(inst, Program);
+
+   if (*attrib > MAX_VERTEX_PROGRAM_ATTRIBS)
+   {
+      _mesa_set_program_error (ctx, Program->Position,
+                               "Invalid generic vertex attribute index");
+      _mesa_error (ctx, GL_INVALID_OPERATION, "Invalid generic vertex attribute index");
+
+      return 1;
+   }
+
+   return 0;
+}
+
+
+/**
+ * \param coord The texture unit index
+ * \return 0 on sucess, 1 on error 
+ */
+static GLuint
+parse_texcoord_num (GLcontext * ctx, GLubyte ** inst,
+                    struct arb_program *Program, GLuint * coord)
+{
+   *coord = parse_integer (inst, Program);
+
+   if (*coord >= ctx->Const.MaxTextureUnits) {
+      _mesa_set_program_error (ctx, Program->Position,
+                               "Invalid texture unit index");
+      _mesa_error (ctx, GL_INVALID_OPERATION, "Invalid texture unit index");
+      return 1;
+   }
+
+   return 0;
+}
+
+/**
+ * \param coord The weight index
+ * \return 0 on sucess, 1 on error 
+ */
+static GLuint
+parse_weight_num (GLcontext * ctx, GLubyte ** inst, struct arb_program *Program,
+                  GLint * coord)
+{
+   *coord = parse_integer (inst, Program);
+
+   if ((*coord < 0) || (*coord >= 1)) {
+      _mesa_set_program_error (ctx, Program->Position,
+                               "Invalid weight index");
+      _mesa_error (ctx, GL_INVALID_OPERATION, "Invalid weight index");
+      return 1;
+   }
+
+   return 0;
+}
+
+/**
+ * \param coord The clip plane index
+ * \return 0 on sucess, 1 on error 
+ */
+static GLuint
+parse_clipplane_num (GLcontext * ctx, GLubyte ** inst,
+                     struct arb_program *Program, GLint * coord)
+{
+   *coord = parse_integer (inst, Program);
+
+   if ((*coord < 0) || (*coord >= (GLint) ctx->Const.MaxClipPlanes)) {
+      _mesa_set_program_error (ctx, Program->Position,
+                               "Invalid clip plane index");
+      _mesa_error (ctx, GL_INVALID_OPERATION, "Invalid clip plane index");
+      return 1;
+   }
+
+   return 0;
+}
+
+
+/**
+ * \return 0 on front face, 1 on back face
+ */
+static GLuint
+parse_face_type (GLubyte ** inst)
+{
+   switch (*(*inst)++) {
+      case FACE_FRONT:
+         return 0;
+
+      case FACE_BACK:
+         return 1;
+   }
+   return 0;
+}
+
+
+/**
+ * Given a matrix and a modifier token on the binary array, return tokens
+ * that _mesa_fetch_state() [program.c] can understand.
+ *
+ * \param matrix - the matrix we are talking about
+ * \param matrix_idx - the index of the matrix we have (for texture & program matricies)
+ * \param matrix_modifier - the matrix modifier (trans, inv, etc)
+ * \return 0 on sucess, 1 on failure
+ */
+static GLuint
+parse_matrix (GLcontext * ctx, GLubyte ** inst, struct arb_program *Program,
+              GLint * matrix, GLint * matrix_idx, GLint * matrix_modifier)
+{
+   GLubyte mat = *(*inst)++;
+
+   *matrix_idx = 0;
+	
+   switch (mat) {
+      case MATRIX_MODELVIEW:
+         *matrix = STATE_MODELVIEW;
+         *matrix_idx = parse_integer (inst, Program);
+         if (*matrix_idx > 0) {
+            _mesa_set_program_error (ctx, Program->Position,
+               "ARB_vertex_blend not supported\n");
+            _mesa_error (ctx, GL_INVALID_OPERATION,
+               "ARB_vertex_blend not supported\n");
+            return 1;
+         }
+         break;
+
+      case MATRIX_PROJECTION:
+         *matrix = STATE_PROJECTION;
+         break;
+
+      case MATRIX_MVP:
+         *matrix = STATE_MVP;
+         break;
+
+      case MATRIX_TEXTURE:
+         *matrix = STATE_TEXTURE;
+         *matrix_idx = parse_integer (inst, Program);
+         if (*matrix_idx >= (GLint) ctx->Const.MaxTextureUnits) {
+            _mesa_set_program_error (ctx, Program->Position,
+                                     "Invalid Texture Unit");
+            _mesa_error (ctx, GL_INVALID_OPERATION,
+                         "Invalid Texture Unit: %d", *matrix_idx);
+            return 1;
+         }
+         break;
+
+         /* This is not currently supported (ARB_matrix_palette) */
+      case MATRIX_PALETTE:
+         *matrix_idx = parse_integer (inst, Program);
+         _mesa_set_program_error (ctx, Program->Position,
+              "ARB_matrix_palette not supported\n");
+         _mesa_error (ctx, GL_INVALID_OPERATION,
+              "ARB_matrix_palette not supported\n");
+         return 1;
+         break;
+
+      case MATRIX_PROGRAM:
+         *matrix = STATE_PROGRAM;
+         *matrix_idx = parse_integer (inst, Program);
+         if (*matrix_idx >= (GLint) ctx->Const.MaxProgramMatrices) {
+            _mesa_set_program_error (ctx, Program->Position,
+                                     "Invalid Program Matrix");
+            _mesa_error (ctx, GL_INVALID_OPERATION,
+                         "Invalid Program Matrix: %d", *matrix_idx);
+            return 1;
+         }
+         break;
+   }
+
+   switch (*(*inst)++) {
+      case MATRIX_MODIFIER_IDENTITY:
+         *matrix_modifier = 0;
+         break;
+      case MATRIX_MODIFIER_INVERSE:
+         *matrix_modifier = STATE_MATRIX_INVERSE;
+         break;
+      case MATRIX_MODIFIER_TRANSPOSE:
+         *matrix_modifier = STATE_MATRIX_TRANSPOSE;
+         break;
+      case MATRIX_MODIFIER_INVTRANS:
+         *matrix_modifier = STATE_MATRIX_INVTRANS;
+         break;
+   }
+
+   return 0;
+}
+
+
+/**
+ * This parses a state string (rather, the binary version of it) into
+ * a 6-token sequence as described in _mesa_fetch_state() [program.c]
+ *
+ * \param inst         - the start in the binary arry to start working from
+ * \param state_tokens - the storage for the 6-token state description
+ * \return             - 0 on sucess, 1 on error
+ */
+static GLuint
+parse_state_single_item (GLcontext * ctx, GLubyte ** inst,
+                         struct arb_program *Program, GLint * state_tokens)
+{
+   switch (*(*inst)++) {
+      case STATE_MATERIAL_PARSER:
+         state_tokens[0] = STATE_MATERIAL;
+         state_tokens[1] = parse_face_type (inst);
+         switch (*(*inst)++) {
+            case MATERIAL_AMBIENT:
+               state_tokens[2] = STATE_AMBIENT;
+               break;
+            case MATERIAL_DIFFUSE:
+               state_tokens[2] = STATE_DIFFUSE;
+               break;
+            case MATERIAL_SPECULAR:
+               state_tokens[2] = STATE_SPECULAR;
+               break;
+            case MATERIAL_EMISSION:
+               state_tokens[2] = STATE_EMISSION;
+	       break;
+            case MATERIAL_SHININESS:
+               state_tokens[2] = STATE_SHININESS;
+               break;
+         }
+         break;
+
+      case STATE_LIGHT_PARSER:
+         state_tokens[0] = STATE_LIGHT;
+         state_tokens[1] = parse_integer (inst, Program);
+
+         /* Check the value of state_tokens[1] against the # of lights */
+         if (state_tokens[1] >= (GLint) ctx->Const.MaxLights) {
+            _mesa_set_program_error (ctx, Program->Position,
+                                     "Invalid Light Number");
+            _mesa_error (ctx, GL_INVALID_OPERATION,
+                         "Invalid Light Number: %d", state_tokens[1]);
+            return 1;
+         }
+
+         switch (*(*inst)++) {
+            case LIGHT_AMBIENT:
+               state_tokens[2] = STATE_AMBIENT;
+               break;
+            case LIGHT_DIFFUSE:
+               state_tokens[2] = STATE_DIFFUSE;
+               break;
+            case LIGHT_SPECULAR:
+               state_tokens[2] = STATE_SPECULAR;
+               break;
+            case LIGHT_POSITION:
+               state_tokens[2] = STATE_POSITION;
+               break;
+            case LIGHT_ATTENUATION:
+               state_tokens[2] = STATE_ATTENUATION;
+               break;
+            case LIGHT_HALF:
+               state_tokens[2] = STATE_HALF;
+               break;
+            case LIGHT_SPOT_DIRECTION:
+               state_tokens[2] = STATE_SPOT_DIRECTION;
+               break;
+         }
+         break;
+
+      case STATE_LIGHT_MODEL:
+         switch (*(*inst)++) {
+            case LIGHT_MODEL_AMBIENT:
+               state_tokens[0] = STATE_LIGHTMODEL_AMBIENT;
+               break;
+            case LIGHT_MODEL_SCENECOLOR:
+               state_tokens[0] = STATE_LIGHTMODEL_SCENECOLOR;
+               state_tokens[1] = parse_face_type (inst);
+               break;
+         }
+         break;
+
+      case STATE_LIGHT_PROD:
+         state_tokens[0] = STATE_LIGHTPROD;
+         state_tokens[1] = parse_integer (inst, Program);
+
+         /* Check the value of state_tokens[1] against the # of lights */
+         if (state_tokens[1] >= (GLint) ctx->Const.MaxLights) {
+            _mesa_set_program_error (ctx, Program->Position,
+                                     "Invalid Light Number");
+            _mesa_error (ctx, GL_INVALID_OPERATION,
+                         "Invalid Light Number: %d", state_tokens[1]);
+            return 1;
+         }
+
+         state_tokens[2] = parse_face_type (inst);
+         switch (*(*inst)++) {
+            case LIGHT_PROD_AMBIENT:
+               state_tokens[3] = STATE_AMBIENT;
+               break;
+            case LIGHT_PROD_DIFFUSE:
+               state_tokens[3] = STATE_DIFFUSE;
+               break;
+            case LIGHT_PROD_SPECULAR:
+               state_tokens[3] = STATE_SPECULAR;
+               break;
+         }
+         break;
+
+
+      case STATE_FOG:
+         switch (*(*inst)++) {
+            case FOG_COLOR:
+               state_tokens[0] = STATE_FOG_COLOR;
+               break;
+            case FOG_PARAMS:
+               state_tokens[0] = STATE_FOG_PARAMS;
+               break;
+         }
+         break;
+
+      case STATE_TEX_ENV:
+         state_tokens[1] = parse_integer (inst, Program);
+         switch (*(*inst)++) {
+            case TEX_ENV_COLOR:
+               state_tokens[0] = STATE_TEXENV_COLOR;
+               break;
+         }
+         break;
+
+      case STATE_TEX_GEN:
+         {
+            GLuint type, coord;
+
+            state_tokens[0] = STATE_TEXGEN;
+            /*state_tokens[1] = parse_integer (inst, Program);*/    /* Texture Unit */
+
+            if (parse_texcoord_num (ctx, inst, Program, &coord))
+               return 1;
+	    state_tokens[1] = coord;
+	    
+            /* EYE or OBJECT */
+            type = *(*inst++);
+
+            /* 0 - s, 1 - t, 2 - r, 3 - q */
+            coord = *(*inst++);
+
+            if (type == TEX_GEN_EYE) {
+               switch (coord) {
+                  case COMPONENT_X:
+                     state_tokens[2] = STATE_TEXGEN_EYE_S;
+                     break;
+                  case COMPONENT_Y:
+                     state_tokens[2] = STATE_TEXGEN_EYE_T;
+                     break;
+                  case COMPONENT_Z:
+                     state_tokens[2] = STATE_TEXGEN_EYE_R;
+                     break;
+                  case COMPONENT_W:
+                     state_tokens[2] = STATE_TEXGEN_EYE_Q;
+                     break;
+               }
+            }
+            else {
+               switch (coord) {
+                  case COMPONENT_X:
+                     state_tokens[2] = STATE_TEXGEN_OBJECT_S;
+                     break;
+                  case COMPONENT_Y:
+                     state_tokens[2] = STATE_TEXGEN_OBJECT_T;
+                     break;
+                  case COMPONENT_Z:
+                     state_tokens[2] = STATE_TEXGEN_OBJECT_R;
+                     break;
+                  case COMPONENT_W:
+                     state_tokens[2] = STATE_TEXGEN_OBJECT_Q;
+                     break;
+               }
+            }
+         }
+         break;
+
+      case STATE_DEPTH:
+         switch (*(*inst)++) {
+            case DEPTH_RANGE:
+               state_tokens[0] = STATE_DEPTH_RANGE;
+               break;
+         }
+         break;
+
+      case STATE_CLIP_PLANE:
+         state_tokens[0] = STATE_CLIPPLANE;
+         state_tokens[1] = parse_integer (inst, Program);
+         if (parse_clipplane_num (ctx, inst, Program, &state_tokens[1]))
+            return 1;
+         break;
+
+      case STATE_POINT:
+         switch (*(*inst++)) {
+            case POINT_SIZE:
+               state_tokens[0] = STATE_POINT_SIZE;
+               break;
+
+            case POINT_ATTENUATION:
+               state_tokens[0] = STATE_POINT_ATTENUATION;
+               break;
+         }
+         break;
+
+         /* XXX: I think this is the correct format for a matrix row */
+      case STATE_MATRIX_ROWS:
+         state_tokens[0] = STATE_MATRIX;
+         if (parse_matrix
+             (ctx, inst, Program, &state_tokens[1], &state_tokens[2],
+              &state_tokens[5]))
+            return 1;
+
+         state_tokens[3] = parse_integer (inst, Program);       /* The first row to grab */
+
+         if ((**inst) != 0) {                                   /* Either the last row, 0 */
+            state_tokens[4] = parse_integer (inst, Program);       
+            if (state_tokens[4] < state_tokens[3]) {
+               _mesa_set_program_error (ctx, Program->Position,
+                     "Second matrix index less than the first");
+               _mesa_error (ctx, GL_INVALID_OPERATION,
+                     "Second matrix index (%d) less than the first (%d)", 
+                     state_tokens[4], state_tokens[3]);									 
+               return 1;					
+            }						  
+         }
+         else {			
+            state_tokens[4] = state_tokens[3];
+            (*inst)++;
+         }
+         break;
+   }
+
+   return 0;
+}
+
+/**
+ * This parses a state string (rather, the binary version of it) into
+ * a 6-token similar for the state fetching code in program.c
+ *
+ * One might ask, why fetch these parameters into just like  you fetch
+ * state when they are already stored in other places? 
+ *
+ * Because of array offsets -> We can stick env/local parameters in the
+ * middle of a parameter array and then index someplace into the array
+ * when we execute. 
+ *
+ * One optimization might be to only do this for the cases where the 
+ * env/local parameters end up inside of an array, and leave the 
+ * single parameters (or arrays of pure env/local pareameters) in their
+ * respective register files.
+ * 
+ * For ENV parameters, the format is:
+ *    state_tokens[0] = STATE_FRAGMENT_PROGRAM / STATE_VERTEX_PROGRAM
+ *    state_tokens[1] = STATE_ENV
+ *    state_tokens[2] = the parameter index
+ *
+ * for LOCAL parameters, the format is:
+ *    state_tokens[0] = STATE_FRAGMENT_PROGRAM / STATE_VERTEX_PROGRAM
+ *    state_tokens[1] = STATE_LOCAL
+ *    state_tokens[2] = the parameter index
+ *
+ * \param inst         - the start in the binary arry to start working from
+ * \param state_tokens - the storage for the 6-token state description
+ * \return             - 0 on sucess, 1 on failure
+ */
+static GLuint
+parse_program_single_item (GLcontext * ctx, GLubyte ** inst,
+                           struct arb_program *Program, GLint * state_tokens)
+{
+   if (Program->type == GL_FRAGMENT_PROGRAM_ARB)
+      state_tokens[0] = STATE_FRAGMENT_PROGRAM;
+   else
+      state_tokens[0] = STATE_VERTEX_PROGRAM;
+
+
+   switch (*(*inst)++) {
+      case PROGRAM_PARAM_ENV:
+         state_tokens[1] = STATE_ENV;
+         state_tokens[2] = parse_integer (inst, Program);
+
+         /* Check state_tokens[2] against the number of ENV parameters available */
+         if (((Program->type == GL_FRAGMENT_PROGRAM_ARB) &&
+              (state_tokens[2] >= (GLint) ctx->Const.MaxFragmentProgramEnvParams))
+             ||
+             ((Program->type == GL_VERTEX_PROGRAM_ARB) &&
+              (state_tokens[2] >= (GLint) ctx->Const.MaxVertexProgramEnvParams))) {
+            _mesa_set_program_error (ctx, Program->Position,
+                                     "Invalid Program Env Parameter");
+            _mesa_error (ctx, GL_INVALID_OPERATION,
+                         "Invalid Program Env Parameter: %d",
+                         state_tokens[2]);
+            return 1;
+         }
+
+         break;
+
+      case PROGRAM_PARAM_LOCAL:
+         state_tokens[1] = STATE_LOCAL;
+         state_tokens[2] = parse_integer (inst, Program);
+
+         /* Check state_tokens[2] against the number of LOCAL parameters available */
+         if (((Program->type == GL_FRAGMENT_PROGRAM_ARB) &&
+              (state_tokens[2] >= (GLint) ctx->Const.MaxFragmentProgramLocalParams))
+             ||
+             ((Program->type == GL_VERTEX_PROGRAM_ARB) &&
+              (state_tokens[2] >= (GLint) ctx->Const.MaxVertexProgramLocalParams))) {
+            _mesa_set_program_error (ctx, Program->Position,
+                                     "Invalid Program Local Parameter");
+            _mesa_error (ctx, GL_INVALID_OPERATION,
+                         "Invalid Program Local Parameter: %d",
+                         state_tokens[2]);
+            return 1;
+         }
+         break;
+   }
+
+   return 0;
+}
+
+/**
+ * For ARB_vertex_program, programs are not allowed to use both an explicit
+ * vertex attribute and a generic vertex attribute corresponding to the same
+ * state. See section 2.14.3.1 of the GL_ARB_vertex_program spec. 
+ *
+ * This will walk our var_cache and make sure that nobody does anything fishy.
+ *
+ * \return 0 on sucess, 1 on error
+ */
+static GLuint
+generic_attrib_check(struct var_cache *vc_head)
+{
+   int a;
+   struct var_cache *curr;
+   GLboolean explicitAttrib[MAX_VERTEX_PROGRAM_ATTRIBS],
+      genericAttrib[MAX_VERTEX_PROGRAM_ATTRIBS];
+
+   for (a=0; a<MAX_VERTEX_PROGRAM_ATTRIBS; a++) {
+      explicitAttrib[a] = GL_FALSE;
+      genericAttrib[a] = GL_FALSE;
+   }	
+   
+   curr = vc_head;
+   while (curr) {
+      if (curr->type == vt_attrib) {
+         if (curr->attrib_is_generic)
+            genericAttrib[ curr->attrib_binding_idx ] = GL_TRUE;
+         else
+            explicitAttrib[ curr->attrib_binding_idx ] = GL_TRUE;
+      }
+
+      curr = curr->next;
+   }
+
+   for (a=0; a<MAX_VERTEX_PROGRAM_ATTRIBS; a++) {
+      if ((explicitAttrib[a]) && (genericAttrib[a]))
+         return 1;
+   }	
+
+   return 0;	
+}
+
+/**
+ * This will handle the binding side of an ATTRIB var declaration
+ *
+ * \param binding     - the fragment input register state, defined in nvfragprog.h
+ * \param binding_idx - the index in the attrib register file that binding is associated with 	
+ * \return returns 0 on sucess, 1 on error
+ *
+ * See nvfragparse.c for attrib register file layout
+ */
+static GLuint
+parse_attrib_binding (GLcontext * ctx, GLubyte ** inst,
+                      struct arb_program *Program, GLuint * binding,
+                      GLuint * binding_idx, GLuint *is_generic)
+{
+   GLuint texcoord;	
+   GLint coord;
+   GLint err = 0;
+
+   *is_generic = 0;
+   if (Program->type == GL_FRAGMENT_PROGRAM_ARB) {
+      switch (*(*inst)++) {
+         case FRAGMENT_ATTRIB_COLOR:
+            err = parse_color_type (ctx, inst, Program, &coord);
+            *binding = FRAG_ATTRIB_COL0 + coord;
+            *binding_idx = 1 + coord;
+            break;
+
+         case FRAGMENT_ATTRIB_TEXCOORD:
+            err = parse_texcoord_num (ctx, inst, Program, &texcoord);
+            *binding = FRAG_ATTRIB_TEX0 + texcoord;
+            *binding_idx = 4 + texcoord;
+            break;
+
+         case FRAGMENT_ATTRIB_FOGCOORD:
+            *binding = FRAG_ATTRIB_FOGC;
+            *binding_idx = 3;
+            break;
+
+         case FRAGMENT_ATTRIB_POSITION:
+            *binding = FRAG_ATTRIB_WPOS;
+            *binding_idx = 0;
+            break;
+
+         default:
+            err = 1;
+            break;
+      }
+   }
+   else {
+      switch (*(*inst)++) {
+         case VERTEX_ATTRIB_POSITION:
+            *binding = VERT_ATTRIB_POS;
+            *binding_idx = 0;
+            break;
+
+         case VERTEX_ATTRIB_WEIGHT:
+            {
+               GLint weight;
+
+               err = parse_weight_num (ctx, inst, Program, &weight);
+               *binding = VERT_ATTRIB_WEIGHT;
+               *binding_idx = 1;
+            }
+            _mesa_set_program_error (ctx, Program->Position,
+                 "ARB_vertex_blend not supported\n");
+            _mesa_error (ctx, GL_INVALID_OPERATION,
+                 "ARB_vertex_blend not supported\n");
+            return 1;
+            break;
+
+         case VERTEX_ATTRIB_NORMAL:
+            *binding = VERT_ATTRIB_NORMAL;
+            *binding_idx = 2;
+            break;
+
+         case VERTEX_ATTRIB_COLOR:
+            {
+               GLint color;
+
+               err = parse_color_type (ctx, inst, Program, &color);
+               if (color) {
+                  *binding = VERT_ATTRIB_COLOR1;
+                  *binding_idx = 4;
+               }
+               else {
+                  *binding = VERT_ATTRIB_COLOR0;
+                  *binding_idx = 3;
+               }
+            }
+            break;
+
+         case VERTEX_ATTRIB_FOGCOORD:
+            *binding = VERT_ATTRIB_FOG;
+            *binding_idx = 5;
+            break;
+
+         case VERTEX_ATTRIB_TEXCOORD:
+            {
+               GLuint unit;
+
+               err = parse_texcoord_num (ctx, inst, Program, &unit);
+               *binding = VERT_ATTRIB_TEX0 + unit;
+               *binding_idx = 8 + unit;
+            }
+            break;
+
+            /* It looks like we don't support this at all, atm */
+         case VERTEX_ATTRIB_MATRIXINDEX:
+            parse_integer (inst, Program);
+            _mesa_set_program_error (ctx, Program->Position,
+                  "ARB_palette_matrix not supported");
+            _mesa_error (ctx, GL_INVALID_OPERATION,
+                  "ARB_palette_matrix not supported");
+            return 1;
+            break;
+
+         case VERTEX_ATTRIB_GENERIC:
+            {
+               GLuint attrib;
+
+               if (!parse_generic_attrib_num(ctx, inst, Program, &attrib)) {
+                  *is_generic = 1;                   
+                  switch (attrib) {
+                     case 0:
+                        *binding = VERT_ATTRIB_POS;
+                        break;
+                     case 1:
+                        *binding = VERT_ATTRIB_WEIGHT;
+                        break;
+                     case 2:
+                        *binding = VERT_ATTRIB_NORMAL;
+                        break;
+                     case 3:
+                        *binding = VERT_ATTRIB_COLOR0;
+                        break;
+                     case 4:
+                        *binding = VERT_ATTRIB_COLOR1;
+                        break;
+                     case 5:
+                        *binding = VERT_ATTRIB_FOG;
+                        break;
+                     case 6:
+                        break;
+                     case 7:
+                        break;
+                     default:
+                        *binding = VERT_ATTRIB_TEX0 + (attrib-8);
+                        break;
+                  }
+                  *binding_idx = attrib;
+               }
+            }
+            break;
+
+         default:
+            err = 1;
+            break;
+      }
+   }
+
+   /* Can this even happen? */
+   if (err) {
+      _mesa_set_program_error (ctx, Program->Position,
+                               "Bad attribute binding");
+      _mesa_error (ctx, GL_INVALID_OPERATION, "Bad attribute binding");
+   }
+
+   Program->InputsRead |= (1 << *binding_idx);
+
+   return err;
+}
+
+/**
+ * This translates between a binary token for an output variable type
+ * and the mesa token for the same thing.
+ *
+ *
+ * XXX: What is the 'name' for vertex program state? -> do we need it?
+ *         I don't think we do;
+ *
+ * See nvfragprog.h for definitions 
+ *
+ * \param inst        - The parsed tokens
+ * \param binding     - The name of the state we are binding too
+ * \param binding_idx - The index into the result register file that this is bound too
+ *
+ * See nvfragparse.c for the register file layout for fragment programs
+ * See nvvertparse.c for the register file layout for vertex programs
+ */
+static GLuint
+parse_result_binding (GLcontext * ctx, GLubyte ** inst, GLuint * binding,
+                      GLuint * binding_idx, struct arb_program *Program)
+{
+   GLuint b;
+
+   switch (*(*inst)++) {
+      case FRAGMENT_RESULT_COLOR:
+         /* for frag programs, this is FRAGMENT_RESULT_COLOR */
+         if (Program->type == GL_FRAGMENT_PROGRAM_ARB) {
+            *binding = FRAG_OUTPUT_COLR;
+            *binding_idx = 0;
+         }
+         /* for vtx programs, this is VERTEX_RESULT_POSITION */
+         else {
+            *binding_idx = 0;
+         }
+         break;
+
+      case FRAGMENT_RESULT_DEPTH:
+         /* for frag programs, this is FRAGMENT_RESULT_DEPTH */
+         if (Program->type == GL_FRAGMENT_PROGRAM_ARB) {
+            *binding = FRAG_OUTPUT_DEPR;
+            *binding_idx = 2;
+         }
+         /* for vtx programs, this is VERTEX_RESULT_COLOR */
+         else {
+            GLint color_type;
+            GLuint face_type = parse_face_type(inst);
+	    GLint color_type_ret = parse_color_type(ctx, inst, Program, &color_type);
+
+            /* back face */
+            if (face_type) {
+               if (color_type_ret) return 1; 
+
+               /* secondary color */
+               if (color_type) {
+                  *binding_idx = 4;
+               }
+               /*  primary color */
+               else {
+                  *binding_idx = 3;
+               }
+            }
+            /* front face */
+            else {
+               /* secondary color */
+               if (color_type) {
+                  *binding_idx = 2;
+               }
+               /* primary color */
+               else {
+                  *binding_idx = 1;
+               }
+            }
+         }
+         break;
+
+      case VERTEX_RESULT_FOGCOORD:
+         *binding_idx = 5;
+         break;
+
+      case VERTEX_RESULT_POINTSIZE:
+         *binding_idx = 6;
+         break;
+
+      case VERTEX_RESULT_TEXCOORD:
+         if (parse_texcoord_num (ctx, inst, Program, &b))
+            return 1;
+         *binding_idx = 7 + b;
+         break;
+   }
+
+   Program->OutputsWritten |= (1 << *binding_idx);
+
+   return 0;
+}
+
+/**
+ * This handles the declaration of ATTRIB variables
+ *
+ * XXX: Still needs 
+ *      parse_vert_attrib_binding(), or something like that
+ *
+ * \return 0 on sucess, 1 on error
+ */
+static GLint
+parse_attrib (GLcontext * ctx, GLubyte ** inst, struct var_cache **vc_head,
+              struct arb_program *Program)
+{
+   GLuint found;
+   char *error_msg;
+   struct var_cache *attrib_var;
+
+   attrib_var = parse_string (inst, vc_head, Program, &found);
+   Program->Position = parse_position (inst);
+   if (found) {
+      error_msg = (char *)
+         _mesa_malloc (_mesa_strlen ((char *) attrib_var->name) + 40);
+      _mesa_sprintf (error_msg, "Duplicate Varible Declaration: %s",
+                     attrib_var->name);
+
+      _mesa_set_program_error (ctx, Program->Position, error_msg);
+      _mesa_error (ctx, GL_INVALID_OPERATION, error_msg);
+
+      _mesa_free (error_msg);
+      return 1;
+   }
+
+   attrib_var->type = vt_attrib;
+
+   /* I think this is ok now - karl */
+   /* XXX: */
+   /*if (Program->type == GL_FRAGMENT_PROGRAM_ARB) */
+   {
+      if (parse_attrib_binding
+          (ctx, inst, Program, &attrib_var->attrib_binding,
+           &attrib_var->attrib_binding_idx, &attrib_var->attrib_is_generic))
+         return 1;
+      if (generic_attrib_check(*vc_head)) {
+         _mesa_set_program_error (ctx, Program->Position, 
+   "Cannot use both a generic vertex attribute and a specific attribute of the same type");
+         _mesa_error (ctx, GL_INVALID_OPERATION, 
+   "Cannot use both a generic vertex attribute and a specific attribute of the same type");
+         return 1;				
+      }
+
+   }
+
+   Program->Base.NumAttributes++;
+   return 0;
+}
+
+/**
+ * \param use -- TRUE if we're called when declaring implicit parameters,
+ *               FALSE if we're declaraing variables. This has to do with
+ *               if we get a signed or unsigned float for scalar constants
+ */
+static GLuint
+parse_param_elements (GLcontext * ctx, GLubyte ** inst,
+                      struct var_cache *param_var,
+                      struct arb_program *Program, GLboolean use)
+{
+   GLint idx;
+   GLuint err;
+   GLint state_tokens[6];
+   GLfloat const_values[4];
+
+   err = 0;
+
+   switch (*(*inst)++) {
+      case PARAM_STATE_ELEMENT:
+
+         if (parse_state_single_item (ctx, inst, Program, state_tokens))
+            return 1;
+
+         /* If we adding STATE_MATRIX that has multiple rows, we need to
+          * unroll it and call _mesa_add_state_reference() for each row
+          */
+         if ((state_tokens[0] == STATE_MATRIX)
+             && (state_tokens[3] != state_tokens[4])) {
+            GLint row;
+            GLint first_row = state_tokens[3];
+            GLint last_row = state_tokens[4];
+
+            for (row = first_row; row <= last_row; row++) {
+               state_tokens[3] = state_tokens[4] = row;
+
+               idx =
+                  _mesa_add_state_reference (Program->Parameters,
+                                             state_tokens);
+               if (param_var->param_binding_begin == ~0U)
+                  param_var->param_binding_begin = idx;
+               param_var->param_binding_length++;
+               Program->Base.NumParameters++;
+            }
+         }
+         else {
+            idx =
+               _mesa_add_state_reference (Program->Parameters, state_tokens);
+            if (param_var->param_binding_begin == ~0U)
+               param_var->param_binding_begin = idx;
+            param_var->param_binding_length++;
+            Program->Base.NumParameters++;
+         }
+         break;
+
+      case PARAM_PROGRAM_ELEMENT:
+
+         if (parse_program_single_item (ctx, inst, Program, state_tokens))
+            return 1;
+         idx = _mesa_add_state_reference (Program->Parameters, state_tokens);
+         if (param_var->param_binding_begin == ~0U)
+            param_var->param_binding_begin = idx;
+         param_var->param_binding_length++;
+         Program->Base.NumParameters++;
+
+         /* Check if there is more: 0 -> we're done, else its an integer */
+         if (**inst) {
+            GLuint out_of_range, new_idx;
+            GLuint start_idx = state_tokens[2] + 1;
+            GLuint end_idx = parse_integer (inst, Program);
+
+            out_of_range = 0;
+            if (Program->type == GL_FRAGMENT_PROGRAM_ARB) {
+               if (((state_tokens[1] == STATE_ENV)
+                    && (end_idx >= ctx->Const.MaxFragmentProgramEnvParams))
+                   || ((state_tokens[1] == STATE_LOCAL)
+                       && (end_idx >=
+                           ctx->Const.MaxFragmentProgramLocalParams)))
+                  out_of_range = 1;
+            }
+            else {
+               if (((state_tokens[1] == STATE_ENV)
+                    && (end_idx >= ctx->Const.MaxVertexProgramEnvParams))
+                   || ((state_tokens[1] == STATE_LOCAL)
+                       && (end_idx >=
+                           ctx->Const.MaxVertexProgramLocalParams)))
+                  out_of_range = 1;
+            }
+            if (out_of_range) {
+               _mesa_set_program_error (ctx, Program->Position,
+                                        "Invalid Program Parameter");
+               _mesa_error (ctx, GL_INVALID_OPERATION,
+                            "Invalid Program Parameter: %d", end_idx);
+               return 1;
+            }
+
+            for (new_idx = start_idx; new_idx <= end_idx; new_idx++) {
+               state_tokens[2] = new_idx;
+               idx =
+                  _mesa_add_state_reference (Program->Parameters,
+                                             state_tokens);
+               param_var->param_binding_length++;
+               Program->Base.NumParameters++;
+            }
+         }
+			else
+			{
+				(*inst)++;
+			}
+         break;
+
+      case PARAM_CONSTANT:
+         parse_constant (inst, const_values, Program, use);
+         idx =
+            _mesa_add_named_constant (Program->Parameters,
+                                      (char *) param_var->name, const_values);
+         if (param_var->param_binding_begin == ~0U)
+            param_var->param_binding_begin = idx;
+         param_var->param_binding_length++;
+         Program->Base.NumParameters++;
+         break;
+
+      default:
+         _mesa_set_program_error (ctx, Program->Position,
+                                  "Unexpected token in parse_param_elements()");
+         _mesa_error (ctx, GL_INVALID_OPERATION,
+                      "Unexpected token in parse_param_elements()");
+         return 1;
+   }
+
+   /* Make sure we haven't blown past our parameter limits */
+   if (((Program->type == GL_VERTEX_PROGRAM_ARB) &&
+        (Program->Base.NumParameters >=
+         ctx->Const.MaxVertexProgramLocalParams))
+       || ((Program->type == GL_FRAGMENT_PROGRAM_ARB)
+           && (Program->Base.NumParameters >=
+               ctx->Const.MaxFragmentProgramLocalParams))) {
+      _mesa_set_program_error (ctx, Program->Position,
+                               "Too many parameter variables");
+      _mesa_error (ctx, GL_INVALID_OPERATION, "Too many parameter variables");
+      return 1;
+   }
+
+   return err;
+}
+
+/**
+ * This picks out PARAM program parameter bindings.
+ *
+ * XXX: This needs to be stressed & tested
+ *
+ * \return 0 on sucess, 1 on error
+ */
+static GLuint
+parse_param (GLcontext * ctx, GLubyte ** inst, struct var_cache **vc_head,
+             struct arb_program *Program)
+{
+   GLuint found, err;
+   GLint specified_length;
+   char *error_msg;
+   struct var_cache *param_var;
+
+   err = 0;
+   param_var = parse_string (inst, vc_head, Program, &found);
+   Program->Position = parse_position (inst);
+
+   if (found) {
+      error_msg = (char *) _mesa_malloc (_mesa_strlen ((char *) param_var->name) + 40);
+      _mesa_sprintf (error_msg, "Duplicate Varible Declaration: %s",
+                     param_var->name);
+
+      _mesa_set_program_error (ctx, Program->Position, error_msg);
+      _mesa_error (ctx, GL_INVALID_OPERATION, error_msg);
+
+      _mesa_free (error_msg);
+      return 1;
+   }
+
+   specified_length = parse_integer (inst, Program);
+
+   if (specified_length < 0) {
+      _mesa_set_program_error (ctx, Program->Position,
+                               "Negative parameter array length");
+      _mesa_error (ctx, GL_INVALID_OPERATION,
+                   "Negative parameter array length: %d", specified_length);
+      return 1;
+   }
+
+   param_var->type = vt_param;
+   param_var->param_binding_length = 0;
+
+   /* Right now, everything is shoved into the main state register file.
+    * 
+    * In the future, it would be nice to leave things ENV/LOCAL params
+    * in their respective register files, if possible 
+    */
+   param_var->param_binding_type = PROGRAM_STATE_VAR;
+
+   /* Remember to:
+    * *   - add each guy to the parameter list
+    * *   - increment the param_var->param_binding_len
+    * *   - store the param_var->param_binding_begin for the first one
+    * *   - compare the actual len to the specified len at the end
+    */
+   while (**inst != PARAM_NULL) {
+      if (parse_param_elements (ctx, inst, param_var, Program, GL_FALSE))
+         return 1;
+   }
+
+   /* Test array length here! */
+   if (specified_length) {
+      if (specified_length != param_var->param_binding_length) {
+         _mesa_set_program_error (ctx, Program->Position,
+                                  "Declared parameter array lenght does not match parameter list");
+         _mesa_error (ctx, GL_INVALID_OPERATION,
+                      "Declared parameter array lenght does not match parameter list");
+      }
+   }
+
+   (*inst)++;
+
+   return 0;
+}
+
+/**
+ *
+ */
+static GLuint
+parse_param_use (GLcontext * ctx, GLubyte ** inst, struct var_cache **vc_head,
+                 struct arb_program *Program, struct var_cache **new_var)
+{
+   struct var_cache *param_var;
+
+   /* First, insert a dummy entry into the var_cache */
+   var_cache_create (&param_var);
+   param_var->name = (GLubyte *) _mesa_strdup (" ");
+   param_var->type = vt_param;
+
+   param_var->param_binding_length = 0;
+   /* Don't fill in binding_begin; We use the default value of -1
+    * to tell if its already initialized, elsewhere.
+    *
+    * param_var->param_binding_begin  = 0;
+    */
+   param_var->param_binding_type = PROGRAM_STATE_VAR;
+
+   var_cache_append (vc_head, param_var);
+
+   /* Then fill it with juicy parameter goodness */
+   if (parse_param_elements (ctx, inst, param_var, Program, GL_TRUE))
+      return 1;
+
+   *new_var = param_var;
+
+   return 0;
+}
+
+
+/**
+ * This handles the declaration of TEMP variables
+ *
+ * \return 0 on sucess, 1 on error
+ */
+static GLuint
+parse_temp (GLcontext * ctx, GLubyte ** inst, struct var_cache **vc_head,
+            struct arb_program *Program)
+{
+   GLuint found;
+   struct var_cache *temp_var;
+   char *error_msg;
+
+   while (**inst != 0) {
+      temp_var = parse_string (inst, vc_head, Program, &found);
+      Program->Position = parse_position (inst);
+      if (found) {
+         error_msg = (char *)
+            _mesa_malloc (_mesa_strlen ((char *) temp_var->name) + 40);
+         _mesa_sprintf (error_msg, "Duplicate Varible Declaration: %s",
+                        temp_var->name);
+
+         _mesa_set_program_error (ctx, Program->Position, error_msg);
+         _mesa_error (ctx, GL_INVALID_OPERATION, error_msg);
+
+         _mesa_free (error_msg);
+         return 1;
+      }
+
+      temp_var->type = vt_temp;
+
+      if (((Program->type == GL_FRAGMENT_PROGRAM_ARB) &&
+           (Program->Base.NumTemporaries >=
+            ctx->Const.MaxFragmentProgramTemps))
+          || ((Program->type == GL_VERTEX_PROGRAM_ARB)
+              && (Program->Base.NumTemporaries >=
+                  ctx->Const.MaxVertexProgramTemps))) {
+         _mesa_set_program_error (ctx, Program->Position,
+                                  "Too many TEMP variables declared");
+         _mesa_error (ctx, GL_INVALID_OPERATION,
+                      "Too many TEMP variables declared");
+         return 1;
+      }
+
+      temp_var->temp_binding = Program->Base.NumTemporaries;
+      Program->Base.NumTemporaries++;
+   }
+   (*inst)++;
+
+   return 0;
+}
+
+/**
+ * This handles variables of the OUTPUT variety
+ *
+ * \return 0 on sucess, 1 on error
+ */
+static GLuint
+parse_output (GLcontext * ctx, GLubyte ** inst, struct var_cache **vc_head,
+              struct arb_program *Program)
+{
+   GLuint found;
+   struct var_cache *output_var;
+
+   output_var = parse_string (inst, vc_head, Program, &found);
+   Program->Position = parse_position (inst);
+   if (found) {
+      char *error_msg;
+      error_msg = (char *)
+         _mesa_malloc (_mesa_strlen ((char *) output_var->name) + 40);
+      _mesa_sprintf (error_msg, "Duplicate Varible Declaration: %s",
+                     output_var->name);
+
+      _mesa_set_program_error (ctx, Program->Position, error_msg);
+      _mesa_error (ctx, GL_INVALID_OPERATION, error_msg);
+
+      _mesa_free (error_msg);
+      return 1;
+   }
+
+   output_var->type = vt_output;
+   return parse_result_binding (ctx, inst, &output_var->output_binding,
+                                &output_var->output_binding_idx, Program);
+}
+
+/**
+ * This handles variables of the ALIAS kind
+ *
+ * \return 0 on sucess, 1 on error
+ */
+static GLuint
+parse_alias (GLcontext * ctx, GLubyte ** inst, struct var_cache **vc_head,
+             struct arb_program *Program)
+{
+   GLuint found;
+   struct var_cache *temp_var;
+   char *error_msg;
+
+	
+   temp_var = parse_string (inst, vc_head, Program, &found);
+   Program->Position = parse_position (inst);
+
+   if (found) {
+      error_msg = (char *)
+         _mesa_malloc (_mesa_strlen ((char *) temp_var->name) + 40);
+      _mesa_sprintf (error_msg, "Duplicate Varible Declaration: %s",
+                     temp_var->name);
+
+      _mesa_set_program_error (ctx, Program->Position, error_msg);
+      _mesa_error (ctx, GL_INVALID_OPERATION, error_msg);
+
+      _mesa_free (error_msg);
+      return 1;
+   }
+
+   temp_var->type = vt_alias;
+   temp_var->alias_binding =  parse_string (inst, vc_head, Program, &found);
+   Program->Position = parse_position (inst);
+
+   if (!found)
+   {
+      error_msg = (char *)
+         _mesa_malloc (_mesa_strlen ((char *) temp_var->name) + 40);
+      _mesa_sprintf (error_msg, "Alias value %s is not defined",
+                     temp_var->alias_binding->name);
+      
+      _mesa_set_program_error (ctx, Program->Position, error_msg);
+      _mesa_error (ctx, GL_INVALID_OPERATION, error_msg);
+      
+      _mesa_free (error_msg);
+      return 1;
+   }
+
+   return 0;
+}
+
+/**
+ * This handles variables of the ADDRESS kind
+ *
+ * \return 0 on sucess, 1 on error
+ */
+static GLuint
+parse_address (GLcontext * ctx, GLubyte ** inst, struct var_cache **vc_head,
+               struct arb_program *Program)
+{
+   GLuint found;
+   struct var_cache *temp_var;
+   char *error_msg;
+
+   while (**inst != 0) {
+      temp_var = parse_string (inst, vc_head, Program, &found);
+      Program->Position = parse_position (inst);
+      if (found) {
+         error_msg = (char *)
+            _mesa_malloc (_mesa_strlen ((char *) temp_var->name) + 40);
+         _mesa_sprintf (error_msg, "Duplicate Varible Declaration: %s",
+                        temp_var->name);
+
+         _mesa_set_program_error (ctx, Program->Position, error_msg);
+         _mesa_error (ctx, GL_INVALID_OPERATION, error_msg);
+
+         _mesa_free (error_msg);
+         return 1;
+      }
+
+      temp_var->type = vt_address;
+
+      if (Program->Base.NumAddressRegs >=
+          ctx->Const.MaxVertexProgramAddressRegs) {
+         _mesa_set_program_error (ctx, Program->Position,
+                                  "Too many ADDRESS variables declared");
+         _mesa_error (ctx, GL_INVALID_OPERATION,
+                      "Too many ADDRESS variables declared");
+         return 1;
+      }
+
+      temp_var->address_binding = Program->Base.NumAddressRegs;
+      Program->Base.NumAddressRegs++;
+   }
+   (*inst)++;
+
+   return 0;
+}
+
+/**
+ * Parse a program declaration 
+ *
+ * \return 0 on sucess, 1 on error
+ */
+static GLint
+parse_declaration (GLcontext * ctx, GLubyte ** inst, struct var_cache **vc_head,
+                   struct arb_program *Program)
+{
+   GLint err = 0;
+
+   switch (*(*inst)++) {
+      case ADDRESS:
+         err = parse_address (ctx, inst, vc_head, Program);
+         break;
+
+      case ALIAS:
+         err = parse_alias (ctx, inst, vc_head, Program);
+         break;
+
+      case ATTRIB:
+         err = parse_attrib (ctx, inst, vc_head, Program);
+         break;
+
+      case OUTPUT:
+         err = parse_output (ctx, inst, vc_head, Program);
+         break;
+
+      case PARAM:
+         err = parse_param (ctx, inst, vc_head, Program);
+         break;
+
+      case TEMP:
+         err = parse_temp (ctx, inst, vc_head, Program);
+         break;
+   }
+
+   return err;
+}
+
+/**
+ * Handle the parsing out of a masked destination register
+ *
+ * If we are a vertex program, make sure we don't write to
+ * result.position of we have specified that the program is
+ * position invariant
+ * 
+ * \param File      - The register file we write to
+ * \param Index     - The register index we write to
+ * \param WriteMask - The mask controlling which components we write (1->write)
+ *
+ * \return 0 on sucess, 1 on error
+ */
+static GLuint
+parse_masked_dst_reg (GLcontext * ctx, GLubyte ** inst,
+                      struct var_cache **vc_head, struct arb_program *Program,
+                      GLint * File, GLint * Index, GLboolean * WriteMask)
+{
+   GLuint result;
+   GLubyte mask;
+   struct var_cache *dst;
+
+   /* We either have a result register specified, or a
+    * variable that may or may not be writable 
+    */
+   switch (*(*inst)++) {
+      case REGISTER_RESULT:
+         if (parse_result_binding
+             (ctx, inst, &result, (GLuint *) Index, Program))
+            return 1;
+         *File = PROGRAM_OUTPUT;
+         break;
+
+      case REGISTER_ESTABLISHED_NAME:
+         dst = parse_string (inst, vc_head, Program, &result);
+         Program->Position = parse_position (inst);
+
+         /* If the name has never been added to our symbol table, we're hosed */
+         if (!result) {
+            _mesa_set_program_error (ctx, Program->Position,
+                                     "0: Undefined variable");
+            _mesa_error (ctx, GL_INVALID_OPERATION, "0: Undefined variable: %s",
+                         dst->name);
+            return 1;
+         }
+
+         switch (dst->type) {
+            case vt_output:
+               *File = PROGRAM_OUTPUT;
+               *Index = dst->output_binding_idx;
+               break;
+
+            case vt_temp:
+               *File = PROGRAM_TEMPORARY;
+               *Index = dst->temp_binding;
+               break;
+
+               /* If the var type is not vt_output or vt_temp, no go */
+            default:
+               _mesa_set_program_error (ctx, Program->Position,
+                                        "Destination register is read only");
+               _mesa_error (ctx, GL_INVALID_OPERATION,
+                            "Destination register is read only: %s",
+                            dst->name);
+               return 1;
+         }
+         break;
+
+      default:
+         _mesa_set_program_error (ctx, Program->Position,
+                                  "Unexpected opcode in parse_masked_dst_reg()");
+         _mesa_error (ctx, GL_INVALID_OPERATION,
+                      "Unexpected opcode in parse_masked_dst_reg()");
+         return 1;
+   }
+
+
+   /* Position invariance test */	
+   if ((Program->HintPositionInvariant) && (*File == PROGRAM_OUTPUT) &&
+      (*Index == 0))   {
+      _mesa_set_program_error (ctx, Program->Position,
+                  "Vertex program specified position invariance and wrote vertex position");
+      _mesa_error (ctx, GL_INVALID_OPERATION,
+                  "Vertex program specified position invariance and wrote vertex position");
+   }
+	
+   /* And then the mask.
+    *  w,a -> bit 0
+    *  z,b -> bit 1
+    *  y,g -> bit 2
+    *  x,r -> bit 3
+    */
+   mask = *(*inst)++;
+
+   WriteMask[0] = (GLboolean) (mask & (1 << 3)) >> 3;
+   WriteMask[1] = (GLboolean) (mask & (1 << 2)) >> 2;
+   WriteMask[2] = (GLboolean) (mask & (1 << 1)) >> 1;
+   WriteMask[3] = (GLboolean) (mask & (1));
+
+   return 0;
+}
+
+
+/** 
+ * Handle the parsing of a address register 
+ *
+ * \param Index     - The register index we write to
+ *
+ * \return 0 on sucess, 1 on error
+ */
+static GLuint
+parse_address_reg (GLcontext * ctx, GLubyte ** inst,
+                          struct var_cache **vc_head,
+                          struct arb_program *Program, GLint * Index)
+{
+   struct var_cache *dst;
+   GLuint result;
+
+   dst = parse_string (inst, vc_head, Program, &result);
+   Program->Position = parse_position (inst);
+
+   /* If the name has never been added to our symbol table, we're hosed */
+   if (!result) {
+      _mesa_set_program_error (ctx, Program->Position, "Undefined variable");
+      _mesa_error (ctx, GL_INVALID_OPERATION, "Undefined variable: %s",
+                   dst->name);
+      return 1;
+   }
+
+   if (dst->type != vt_address) {
+      _mesa_set_program_error (ctx, Program->Position,
+                               "Variable is not of type ADDRESS");
+      _mesa_error (ctx, GL_INVALID_OPERATION,
+                   "Variable: %s is not of type ADDRESS", dst->name);
+      return 1;
+   }
+
+   return 0;
+}
+
+/**
+ * Handle the parsing out of a masked address register
+ *
+ * \param Index     - The register index we write to
+ * \param WriteMask - The mask controlling which components we write (1->write)
+ *
+ * \return 0 on sucess, 1 on error
+ */
+static GLuint
+parse_masked_address_reg (GLcontext * ctx, GLubyte ** inst,
+                          struct var_cache **vc_head,
+                          struct arb_program *Program, GLint * Index,
+                          GLboolean * WriteMask)
+{
+   if (parse_address_reg (ctx, inst, vc_head, Program, Index))
+      return 1;	     
+
+   /* This should be 0x8 */
+   (*inst)++;
+
+   /* Writemask of .x is implied */
+   WriteMask[0] = 1;
+   WriteMask[1] = WriteMask[2] = WriteMask[3] = 0;
+
+   return 0;
+}
+
+
+/** 
+ * Parse out a swizzle mask.
+ *
+ * The values in the input stream are: 
+ *   COMPONENT_X -> x/r
+ *   COMPONENT_Y -> y/g
+ *   COMPONENT_Z-> z/b
+ *   COMPONENT_W-> w/a
+ *
+ * The values in the output mask are:
+ *   0 -> x/r
+ *   1 -> y/g
+ *   2 -> z/b
+ *   3 -> w/a
+ *
+ * The len parameter allows us to grab 4 components for a vector
+ * swizzle, or just 1 component for a scalar src register selection
+ */
+static GLuint
+parse_swizzle_mask (GLubyte ** inst, GLubyte * mask, GLint len)
+{
+   GLint a;
+
+   for (a = 0; a < 4; a++)
+      mask[a] = a;
+
+   for (a = 0; a < len; a++) {
+      switch (*(*inst)++) {
+         case COMPONENT_X:
+            mask[a] = 0;
+            break;
+
+         case COMPONENT_Y:
+            mask[a] = 1;
+            break;
+
+         case COMPONENT_Z:
+            mask[a] = 2;
+            break;
+
+         case COMPONENT_W:
+            mask[a] = 3;
+            break;
+      }
+   }
+
+   return 0;
+}
+
+/** 
+ */
+static GLuint
+parse_extended_swizzle_mask (GLubyte ** inst, GLubyte * mask, GLboolean * Negate)
+{
+   GLint a;
+   GLubyte swz;
+
+   *Negate = GL_FALSE;
+   for (a = 0; a < 4; a++) {
+      if (parse_sign (inst))
+         *Negate = GL_TRUE;
+
+      swz = *(*inst)++;
+
+      switch (swz) {
+         case COMPONENT_0:
+            mask[a] = SWIZZLE_ZERO;
+            break;
+         case COMPONENT_1:
+            mask[a] = SWIZZLE_ONE;
+            break;
+         case COMPONENT_X:
+            mask[a] = 0;
+            break;
+         case COMPONENT_Y:
+            mask[a] = 1;
+            break;
+         case COMPONENT_Z:
+            mask[a] = 2;
+            break;
+         case COMPONENT_W:
+            mask[a] = 3;
+            break;
+
+      }
+#if 0
+      if (swz == 0)
+         mask[a] = SWIZZLE_ZERO;
+      else if (swz == 1)
+         mask[a] = SWIZZLE_ONE;
+      else
+         mask[a] = swz - 2;
+#endif
+
+   }
+
+   return 0;
+}
+
+
+static GLuint
+parse_src_reg (GLcontext * ctx, GLubyte ** inst, struct var_cache **vc_head,
+               struct arb_program *Program, GLint * File, GLint * Index,
+               GLboolean *IsRelOffset )
+{
+   struct var_cache *src;
+   GLuint binding_state, binding_idx, is_generic, found;
+   GLint offset;
+
+   /* And the binding for the src */
+   switch (*(*inst)++) {
+      case REGISTER_ATTRIB:
+         if (parse_attrib_binding
+             (ctx, inst, Program, &binding_state, &binding_idx, &is_generic))
+            return 1;
+         *File = PROGRAM_INPUT;
+         *Index = binding_idx;
+
+         /* We need to insert a dummy variable into the var_cache so we can 
+          * catch generic vertex attrib aliasing errors 
+          */
+         var_cache_create(&src);
+         src->type = vt_attrib;
+         src->name = (GLubyte *)_mesa_strdup("Dummy Attrib Variable");
+         src->attrib_binding     = binding_state;
+         src->attrib_binding_idx = binding_idx;
+         src->attrib_is_generic  = is_generic;
+         var_cache_append(vc_head, src);
+         if (generic_attrib_check(*vc_head)) {
+            _mesa_set_program_error (ctx, Program->Position, 
+   "Cannot use both a generic vertex attribute and a specific attribute of the same type");
+            _mesa_error (ctx, GL_INVALID_OPERATION, 
+   "Cannot use both a generic vertex attribute and a specific attribute of the same type");
+            return 1;				
+         }
+         break;
+
+      case REGISTER_PARAM:
+         switch (**inst) {
+            case PARAM_ARRAY_ELEMENT:
+               (*inst)++;
+               src = parse_string (inst, vc_head, Program, &found);
+               Program->Position = parse_position (inst);
+
+               if (!found) {
+                  _mesa_set_program_error (ctx, Program->Position,
+                                           "2: Undefined variable");
+                  _mesa_error (ctx, GL_INVALID_OPERATION,
+                               "2: Undefined variable: %s", src->name);
+                  return 1;
+               }
+
+               *File = src->param_binding_type;
+
+               switch (*(*inst)++) {
+                  case ARRAY_INDEX_ABSOLUTE:
+                     offset = parse_integer (inst, Program);
+
+                     if ((offset < 0)
+                         || (offset >= src->param_binding_length)) {
+                        _mesa_set_program_error (ctx, Program->Position,
+                                                 "Index out of range");
+                        _mesa_error (ctx, GL_INVALID_OPERATION,
+                                     "Index %d out of range for %s", offset,
+                                     src->name);
+                        return 1;
+                     }
+
+                     *Index = src->param_binding_begin + offset;
+                     break;
+
+                  case ARRAY_INDEX_RELATIVE:
+                     {
+                        GLint addr_reg_idx, rel_off;
+
+                        /* First, grab the address regiseter */
+                        if (parse_address_reg (ctx, inst, vc_head, Program, &addr_reg_idx))
+                           return 1;					   
+
+                        /* And the .x */			   
+                        ((*inst)++);
+                        ((*inst)++);
+                        ((*inst)++);
+                        ((*inst)++);
+
+                        /* Then the relative offset */
+                        if (parse_relative_offset(ctx, inst, Program, &rel_off)) return 1;	
+
+                        /* And store it properly */
+                        *Index = src->param_binding_begin + rel_off;
+                        *IsRelOffset = 1;				
+                     }
+                     break;
+               }
+               break;
+
+            default:
+
+               if (parse_param_use (ctx, inst, vc_head, Program, &src))
+                  return 1;
+
+               *File = src->param_binding_type;
+               *Index = src->param_binding_begin;
+               break;
+         }
+         break;
+
+      case REGISTER_ESTABLISHED_NAME:
+
+         src = parse_string (inst, vc_head, Program, &found);
+         Program->Position = parse_position (inst);
+
+         /* If the name has never been added to our symbol table, we're hosed */
+         if (!found) {
+            _mesa_set_program_error (ctx, Program->Position,
+                                     "3: Undefined variable");
+            _mesa_error (ctx, GL_INVALID_OPERATION, "3: Undefined variable: %s",
+                         src->name);
+            return 1;
+         }
+
+         switch (src->type) {
+            case vt_attrib:
+               *File = PROGRAM_INPUT;
+               *Index = src->attrib_binding_idx;
+               break;
+
+               /* XXX: We have to handle offsets someplace in here!  -- or are those above? */
+            case vt_param:
+               *File = src->param_binding_type;
+               *Index = src->param_binding_begin;
+               break;
+
+            case vt_temp:
+               *File = PROGRAM_TEMPORARY;
+               *Index = src->temp_binding;
+               break;
+
+               /* If the var type is vt_output no go */
+            default:
+               _mesa_set_program_error (ctx, Program->Position,
+                                        "destination register is read only");
+               _mesa_error (ctx, GL_INVALID_OPERATION,
+                            "destination register is read only: %s",
+                            src->name);
+               return 1;
+         }
+         break;
+
+      default:
+         _mesa_set_program_error (ctx, Program->Position,
+                                  "Unknown token in parse_src_reg");
+         _mesa_error (ctx, GL_INVALID_OPERATION,
+                      "Unknown token in parse_src_reg");
+         return 1;
+   }
+
+   return 0;
+}
+
+/**
+ */
+static GLuint
+parse_vector_src_reg (GLcontext * ctx, GLubyte ** inst,
+                      struct var_cache **vc_head, struct arb_program *Program,
+                      GLint * File, GLint * Index, GLboolean * Negate,
+                      GLubyte * Swizzle, GLboolean *IsRelOffset)
+{
+   /* Grab the sign */
+   *Negate = parse_sign (inst);
+
+   /* And the src reg */
+   if (parse_src_reg (ctx, inst, vc_head, Program, File, Index, IsRelOffset))
+      return 1;
+
+   /* finally, the swizzle */
+   parse_swizzle_mask (inst, Swizzle, 4);
+   
+   return 0;
+}
+
+/**
+ */
+static GLuint
+parse_scalar_src_reg (GLcontext * ctx, GLubyte ** inst,
+                      struct var_cache **vc_head, struct arb_program *Program,
+                      GLint * File, GLint * Index, GLboolean * Negate,
+                      GLubyte * Swizzle, GLboolean *IsRelOffset)
+{
+   /* Grab the sign */
+   *Negate = parse_sign (inst);
+
+   /* And the src reg */
+   if (parse_src_reg (ctx, inst, vc_head, Program, File, Index, IsRelOffset))
+      return 1;
+
+   /* Now, get the component and shove it into all the swizzle slots  */
+   parse_swizzle_mask (inst, Swizzle, 1);
+
+   return 0;
+}
+
+/**
+ * This is a big mother that handles getting opcodes into the instruction
+ * and handling the src & dst registers for fragment program instructions
+ */
+static GLuint
+parse_fp_instruction (GLcontext * ctx, GLubyte ** inst,
+                      struct var_cache **vc_head, struct arb_program *Program,
+                      struct fp_instruction *fp)
+{
+   GLint a, b;
+   GLubyte swz[4]; /* FP's swizzle mask is a GLubyte, while VP's is GLuint */
+   GLuint texcoord;
+   GLubyte instClass, type, code;
+   GLboolean rel;
+
+   /* No condition codes in ARB_fp */
+   fp->UpdateCondRegister = 0;
+
+   /* Record the position in the program string for debugging */
+   fp->StringPos = Program->Position;
+
+   /* OP_ALU_INST or OP_TEX_INST */
+   instClass = *(*inst)++;
+
+   /* OP_ALU_{VECTOR, SCALAR, BINSC, BIN, TRI, SWZ}, 
+    * OP_TEX_{SAMPLE, KIL}
+    */
+   type = *(*inst)++;
+
+   /* The actual opcode name */
+   code = *(*inst)++;
+
+   /* Increment the correct count */
+   switch (instClass) {
+      case OP_ALU_INST:
+         Program->NumAluInstructions++;
+         break;
+      case OP_TEX_INST:
+         Program->NumTexInstructions++;
+         break;
+   }
+
+   fp->Saturate = 0;
+   fp->Precision = FLOAT32;
+
+   fp->DstReg.CondMask = COND_TR;
+
+   switch (type) {
+      case OP_ALU_VECTOR:
+         switch (code) {
+            case OP_ABS_SAT:
+               fp->Saturate = 1;
+            case OP_ABS:
+               fp->Opcode = FP_OPCODE_ABS;
+               break;
+
+            case OP_FLR_SAT:
+               fp->Saturate = 1;
+            case OP_FLR:
+               fp->Opcode = FP_OPCODE_FLR;
+               break;
+
+            case OP_FRC_SAT:
+               fp->Saturate = 1;
+            case OP_FRC:
+               fp->Opcode = FP_OPCODE_FRC;
+               break;
+
+            case OP_LIT_SAT:
+               fp->Saturate = 1;
+            case OP_LIT:
+               fp->Opcode = FP_OPCODE_LIT;
+               break;
+
+            case OP_MOV_SAT:
+               fp->Saturate = 1;
+            case OP_MOV:
+               fp->Opcode = FP_OPCODE_MOV;
+               break;
+         }
+
+         if (parse_masked_dst_reg
+             (ctx, inst, vc_head, Program, (GLint *) & fp->DstReg.File,
+              &fp->DstReg.Index, fp->DstReg.WriteMask))
+            return 1;
+
+         fp->SrcReg[0].Abs = GL_FALSE;
+         fp->SrcReg[0].NegateAbs = GL_FALSE;
+         if (parse_vector_src_reg
+             (ctx, inst, vc_head, Program, (GLint *) & fp->SrcReg[0].File,
+              &fp->SrcReg[0].Index, &fp->SrcReg[0].NegateBase,
+              swz, &rel))
+            return 1;
+         for (b=0; b<4; b++)
+            fp->SrcReg[0].Swizzle[b] = swz[b];
+         break;
+
+      case OP_ALU_SCALAR:
+         switch (code) {
+            case OP_COS_SAT:
+               fp->Saturate = 1;
+            case OP_COS:
+               fp->Opcode = FP_OPCODE_COS;
+               break;
+
+            case OP_EX2_SAT:
+               fp->Saturate = 1;
+            case OP_EX2:
+               fp->Opcode = FP_OPCODE_EX2;
+               break;
+
+            case OP_LG2_SAT:
+               fp->Saturate = 1;
+            case OP_LG2:
+               fp->Opcode = FP_OPCODE_LG2;
+               break;
+
+            case OP_RCP_SAT:
+               fp->Saturate = 1;
+            case OP_RCP:
+               fp->Opcode = FP_OPCODE_RCP;
+               break;
+
+            case OP_RSQ_SAT:
+               fp->Saturate = 1;
+            case OP_RSQ:
+               fp->Opcode = FP_OPCODE_RSQ;
+               break;
+
+            case OP_SIN_SAT:
+               fp->Saturate = 1;
+            case OP_SIN:
+               fp->Opcode = FP_OPCODE_SIN;
+               break;
+
+            case OP_SCS_SAT:
+               fp->Saturate = 1;
+            case OP_SCS:
+	      
+               fp->Opcode = FP_OPCODE_SCS;
+               break;
+         }
+
+         if (parse_masked_dst_reg
+             (ctx, inst, vc_head, Program, (GLint *) & fp->DstReg.File,
+              &fp->DstReg.Index, fp->DstReg.WriteMask))
+            return 1;
+         fp->SrcReg[0].Abs = GL_FALSE;
+         fp->SrcReg[0].NegateAbs = GL_FALSE;
+         if (parse_scalar_src_reg
+             (ctx, inst, vc_head, Program, (GLint *) & fp->SrcReg[0].File,
+              &fp->SrcReg[0].Index, &fp->SrcReg[0].NegateBase,
+              swz, &rel))
+            return 1;
+         for (b=0; b<4; b++)
+            fp->SrcReg[0].Swizzle[b] = swz[b];
+         break;
+
+      case OP_ALU_BINSC:
+         switch (code) {
+            case OP_POW_SAT:
+               fp->Saturate = 1;
+            case OP_POW:
+               fp->Opcode = FP_OPCODE_POW;
+               break;
+         }
+
+         if (parse_masked_dst_reg
+             (ctx, inst, vc_head, Program, (GLint *) & fp->DstReg.File,
+              &fp->DstReg.Index, fp->DstReg.WriteMask))
+            return 1;
+         for (a = 0; a < 2; a++) {
+            fp->SrcReg[a].Abs = GL_FALSE;
+            fp->SrcReg[a].NegateAbs = GL_FALSE;
+            if (parse_scalar_src_reg
+                (ctx, inst, vc_head, Program, (GLint *) & fp->SrcReg[a].File,
+                 &fp->SrcReg[a].Index, &fp->SrcReg[a].NegateBase,
+                 swz, &rel))
+               return 1;
+            for (b=0; b<4; b++)
+               fp->SrcReg[a].Swizzle[b] = swz[b];
+         }
+         break;
+
+
+      case OP_ALU_BIN:
+         switch (code) {
+            case OP_ADD_SAT:
+               fp->Saturate = 1;
+            case OP_ADD:
+               fp->Opcode = FP_OPCODE_ADD;
+               break;
+
+            case OP_DP3_SAT:
+               fp->Saturate = 1;
+            case OP_DP3:
+               fp->Opcode = FP_OPCODE_DP3;
+               break;
+
+            case OP_DP4_SAT:
+               fp->Saturate = 1;
+            case OP_DP4:
+               fp->Opcode = FP_OPCODE_DP4;
+               break;
+
+            case OP_DPH_SAT:
+               fp->Saturate = 1;
+            case OP_DPH:
+               fp->Opcode = FP_OPCODE_DPH;
+               break;
+
+            case OP_DST_SAT:
+               fp->Saturate = 1;
+            case OP_DST:
+               fp->Opcode = FP_OPCODE_DST;
+               break;
+
+            case OP_MAX_SAT:
+               fp->Saturate = 1;
+            case OP_MAX:
+               fp->Opcode = FP_OPCODE_MAX;
+               break;
+
+            case OP_MIN_SAT:
+               fp->Saturate = 1;
+            case OP_MIN:
+               fp->Opcode = FP_OPCODE_MIN;
+               break;
+
+            case OP_MUL_SAT:
+               fp->Saturate = 1;
+            case OP_MUL:
+               fp->Opcode = FP_OPCODE_MUL;
+               break;
+
+            case OP_SGE_SAT:
+               fp->Saturate = 1;
+            case OP_SGE:
+               fp->Opcode = FP_OPCODE_SGE;
+               break;
+
+            case OP_SLT_SAT:
+               fp->Saturate = 1;
+            case OP_SLT:
+               fp->Opcode = FP_OPCODE_SLT;
+               break;
+
+            case OP_SUB_SAT:
+               fp->Saturate = 1;
+            case OP_SUB:
+               fp->Opcode = FP_OPCODE_SUB;
+               break;
+
+            case OP_XPD_SAT:
+               fp->Saturate = 1;
+            case OP_XPD:
+               fp->Opcode = FP_OPCODE_XPD;
+               break;
+         }
+
+         if (parse_masked_dst_reg
+             (ctx, inst, vc_head, Program, (GLint *) & fp->DstReg.File,
+              &fp->DstReg.Index, fp->DstReg.WriteMask))
+            return 1;
+         for (a = 0; a < 2; a++) {
+            fp->SrcReg[a].Abs = GL_FALSE;
+            fp->SrcReg[a].NegateAbs = GL_FALSE;
+            if (parse_vector_src_reg
+                (ctx, inst, vc_head, Program, (GLint *) & fp->SrcReg[a].File,
+                 &fp->SrcReg[a].Index, &fp->SrcReg[a].NegateBase,
+                 swz, &rel))
+               return 1;
+            for (b=0; b<4; b++)
+               fp->SrcReg[a].Swizzle[b] = swz[b];
+         }
+         break;
+
+      case OP_ALU_TRI:
+         switch (code) {
+            case OP_CMP_SAT:
+               fp->Saturate = 1;
+            case OP_CMP:
+               fp->Opcode = FP_OPCODE_CMP;
+               break;
+
+            case OP_LRP_SAT:
+               fp->Saturate = 1;
+            case OP_LRP:
+               fp->Opcode = FP_OPCODE_LRP;
+               break;
+
+            case OP_MAD_SAT:
+               fp->Saturate = 1;
+            case OP_MAD:
+               fp->Opcode = FP_OPCODE_MAD;
+               break;
+         }
+
+         if (parse_masked_dst_reg
+             (ctx, inst, vc_head, Program, (GLint *) & fp->DstReg.File,
+              &fp->DstReg.Index, fp->DstReg.WriteMask))
+            return 1;
+         for (a = 0; a < 3; a++) {
+            fp->SrcReg[a].Abs = GL_FALSE;
+            fp->SrcReg[a].NegateAbs = GL_FALSE;
+            if (parse_vector_src_reg
+                (ctx, inst, vc_head, Program, (GLint *) & fp->SrcReg[a].File,
+                 &fp->SrcReg[a].Index, &fp->SrcReg[a].NegateBase,
+                 swz, &rel))
+               return 1;
+            for (b=0; b<4; b++)
+               fp->SrcReg[a].Swizzle[b] = swz[b];
+         }
+         break;
+
+      case OP_ALU_SWZ:
+         switch (code) {
+            case OP_SWZ_SAT:
+               fp->Saturate = 1;
+            case OP_SWZ:
+               fp->Opcode = FP_OPCODE_SWZ;
+               break;
+         }
+         if (parse_masked_dst_reg
+             (ctx, inst, vc_head, Program, (GLint *) & fp->DstReg.File,
+              &fp->DstReg.Index, fp->DstReg.WriteMask))
+            return 1;
+
+         if (parse_src_reg
+             (ctx, inst, vc_head, Program, (GLint *) & fp->SrcReg[0].File,
+              &fp->SrcReg[0].Index, &rel))
+            return 1;
+         parse_extended_swizzle_mask (inst, swz,
+                                      &fp->SrcReg[0].NegateBase);
+         for (b=0; b<4; b++)
+            fp->SrcReg[0].Swizzle[b] = swz[b];
+         break;
+
+      case OP_TEX_SAMPLE:
+         switch (code) {
+            case OP_TEX_SAT:
+               fp->Saturate = 1;
+            case OP_TEX:
+               fp->Opcode = FP_OPCODE_TEX;
+               break;
+
+            case OP_TXP_SAT:
+               fp->Saturate = 1;
+            case OP_TXP:
+               fp->Opcode = FP_OPCODE_TXP;
+               break;
+
+            case OP_TXB_SAT:
+	      
+               fp->Saturate = 1;
+            case OP_TXB:
+               fp->Opcode = FP_OPCODE_TXB;
+               break;
+         }
+
+         if (parse_masked_dst_reg
+             (ctx, inst, vc_head, Program, (GLint *) & fp->DstReg.File,
+              &fp->DstReg.Index, fp->DstReg.WriteMask))
+            return 1;
+         fp->SrcReg[0].Abs = GL_FALSE;
+         fp->SrcReg[0].NegateAbs = GL_FALSE;
+         if (parse_vector_src_reg
+             (ctx, inst, vc_head, Program, (GLint *) & fp->SrcReg[0].File,
+              &fp->SrcReg[0].Index, &fp->SrcReg[0].NegateBase,
+              swz, &rel))
+            return 1;
+         for (b=0; b<4; b++)
+            fp->SrcReg[0].Swizzle[b] = swz[b];
+
+         /* texImageUnit */
+         if (parse_texcoord_num (ctx, inst, Program, &texcoord))
+            return 1;
+         fp->TexSrcUnit = texcoord;
+
+         /* texTarget */
+         switch (*(*inst)++) {
+            case TEXTARGET_1D:
+               fp->TexSrcBit = TEXTURE_1D_BIT;
+               break;
+            case TEXTARGET_2D:
+               fp->TexSrcBit = TEXTURE_2D_BIT;
+               break;
+            case TEXTARGET_3D:
+               fp->TexSrcBit = TEXTURE_3D_BIT;
+               break;
+            case TEXTARGET_RECT:
+               fp->TexSrcBit = TEXTURE_RECT_BIT;
+               break;
+            case TEXTARGET_CUBE:
+               fp->TexSrcBit = TEXTURE_CUBE_BIT;
+               break;
+         }
+         Program->TexturesUsed[texcoord] |= fp->TexSrcBit;			
+         break;
+
+      case OP_TEX_KIL:
+         fp->Opcode = FP_OPCODE_KIL;
+         fp->SrcReg[0].Abs = GL_FALSE;
+         fp->SrcReg[0].NegateAbs = GL_FALSE;
+         if (parse_vector_src_reg
+             (ctx, inst, vc_head, Program, (GLint *) & fp->SrcReg[0].File,
+              &fp->SrcReg[0].Index, &fp->SrcReg[0].NegateBase,
+              swz, &rel))
+            return 1;
+         for (b=0; b<4; b++)
+            fp->SrcReg[0].Swizzle[b] = swz[b];
+         break;
+   }
+
+   return 0;
+}
+
+/**
+ * This is a big mother that handles getting opcodes into the instruction
+ * and handling the src & dst registers for vertex program instructions
+ */
+static GLuint
+parse_vp_instruction (GLcontext * ctx, GLubyte ** inst,
+                      struct var_cache **vc_head, struct arb_program *Program,
+                      struct vp_instruction *vp)
+{
+   GLint a;
+   GLubyte type, code;
+
+   /* OP_ALU_{ARL, VECTOR, SCALAR, BINSC, BIN, TRI, SWZ} */
+   type = *(*inst)++;
+
+   /* The actual opcode name */
+   code = *(*inst)++;
+
+   /* Record the position in the program string for debugging */
+   vp->StringPos = Program->Position;
+
+   vp->SrcReg[0].RelAddr = vp->SrcReg[1].RelAddr = vp->SrcReg[2].RelAddr = 0;
+
+   for (a = 0; a < 4; a++) {
+      vp->SrcReg[0].Swizzle[a] = a;
+      vp->SrcReg[1].Swizzle[a] = a;
+      vp->SrcReg[2].Swizzle[a] = a;
+      vp->DstReg.WriteMask[a] = 1;
+   }
+
+   switch (type) {
+         /* XXX: */
+      case OP_ALU_ARL:
+         vp->Opcode = VP_OPCODE_ARL;
+
+         /* Remember to set SrcReg.RelAddr; */
+
+         /* Get the masked address register [dst] */
+         if (parse_masked_address_reg
+             (ctx, inst, vc_head, Program, &vp->DstReg.Index,
+              vp->DstReg.WriteMask))
+            return 1;
+         vp->DstReg.File = PROGRAM_ADDRESS;
+
+         /* Get a scalar src register */
+         if (parse_scalar_src_reg
+             (ctx, inst, vc_head, Program, (GLint *) & vp->SrcReg[0].File,
+              &vp->SrcReg[0].Index, &vp->SrcReg[0].Negate,
+              vp->SrcReg[0].Swizzle, &vp->SrcReg[0].RelAddr))
+            return 1;
+
+         break;
+
+      case OP_ALU_VECTOR:
+         switch (code) {
+            case OP_ABS:
+               vp->Opcode = VP_OPCODE_ABS;
+               break;
+            case OP_FLR:
+               vp->Opcode = VP_OPCODE_FLR;
+               break;
+            case OP_FRC:
+               vp->Opcode = VP_OPCODE_FRC;
+               break;
+            case OP_LIT:
+               vp->Opcode = VP_OPCODE_LIT;
+               break;
+            case OP_MOV:
+               vp->Opcode = VP_OPCODE_MOV;
+               break;
+         }
+         if (parse_masked_dst_reg
+             (ctx, inst, vc_head, Program, (GLint *) & vp->DstReg.File,
+              &vp->DstReg.Index, vp->DstReg.WriteMask))
+            return 1;
+         if (parse_vector_src_reg
+             (ctx, inst, vc_head, Program, (GLint *) & vp->SrcReg[0].File,
+              &vp->SrcReg[0].Index, &vp->SrcReg[0].Negate,
+              vp->SrcReg[0].Swizzle, &vp->SrcReg[0].RelAddr))
+            return 1;
+         break;
+
+      case OP_ALU_SCALAR:
+         switch (code) {
+            case OP_EX2:
+               vp->Opcode = VP_OPCODE_EX2;
+               break;
+            case OP_EXP:
+               vp->Opcode = VP_OPCODE_EXP;
+               break;
+            case OP_LG2:
+               vp->Opcode = VP_OPCODE_LG2;
+               break;
+            case OP_LOG:
+               vp->Opcode = VP_OPCODE_LOG;
+               break;
+            case OP_RCP:
+               vp->Opcode = VP_OPCODE_RCP;
+               break;
+            case OP_RSQ:
+               vp->Opcode = VP_OPCODE_RSQ;
+               break;
+         }
+         if (parse_masked_dst_reg
+             (ctx, inst, vc_head, Program, (GLint *) & vp->DstReg.File,
+              &vp->DstReg.Index, vp->DstReg.WriteMask))
+            return 1;
+         if (parse_scalar_src_reg
+             (ctx, inst, vc_head, Program, (GLint *) & vp->SrcReg[0].File,
+              &vp->SrcReg[0].Index, &vp->SrcReg[0].Negate,
+              vp->SrcReg[0].Swizzle, &vp->SrcReg[0].RelAddr))
+            return 1;
+         break;
+
+      case OP_ALU_BINSC:
+         switch (code) {
+            case OP_POW:
+               vp->Opcode = VP_OPCODE_POW;
+               break;
+         }
+         if (parse_masked_dst_reg
+             (ctx, inst, vc_head, Program, (GLint *) & vp->DstReg.File,
+              &vp->DstReg.Index, vp->DstReg.WriteMask))
+            return 1;
+         for (a = 0; a < 2; a++) {
+            if (parse_scalar_src_reg
+                (ctx, inst, vc_head, Program, (GLint *) & vp->SrcReg[a].File,
+                 &vp->SrcReg[a].Index, &vp->SrcReg[a].Negate,
+                 vp->SrcReg[a].Swizzle, &vp->SrcReg[a].RelAddr))
+               return 1;
+         }
+         break;
+
+      case OP_ALU_BIN:
+         switch (code) {
+            case OP_ADD:
+               vp->Opcode = VP_OPCODE_ADD;
+               break;
+            case OP_DP3:
+               vp->Opcode = VP_OPCODE_DP3;
+               break;
+            case OP_DP4:
+               vp->Opcode = VP_OPCODE_DP4;
+               break;
+            case OP_DPH:
+               vp->Opcode = VP_OPCODE_DPH;
+               break;
+            case OP_DST:
+               vp->Opcode = VP_OPCODE_DST;
+               break;
+            case OP_MAX:
+               vp->Opcode = VP_OPCODE_MAX;
+               break;
+            case OP_MIN:
+               vp->Opcode = VP_OPCODE_MIN;
+               break;
+            case OP_MUL:
+               vp->Opcode = VP_OPCODE_MUL;
+               break;
+            case OP_SGE:
+               vp->Opcode = VP_OPCODE_SGE;
+               break;
+            case OP_SLT:
+               vp->Opcode = VP_OPCODE_SLT;
+               break;
+            case OP_SUB:
+               vp->Opcode = VP_OPCODE_SUB;
+               break;
+            case OP_XPD:
+               vp->Opcode = VP_OPCODE_XPD;
+               break;
+         }
+         if (parse_masked_dst_reg
+             (ctx, inst, vc_head, Program, (GLint *) & vp->DstReg.File,
+              &vp->DstReg.Index, vp->DstReg.WriteMask))
+            return 1;
+         for (a = 0; a < 2; a++) {
+            if (parse_vector_src_reg
+                (ctx, inst, vc_head, Program, (GLint *) & vp->SrcReg[a].File,
+                 &vp->SrcReg[a].Index, &vp->SrcReg[a].Negate,
+                 vp->SrcReg[a].Swizzle, &vp->SrcReg[a].RelAddr))
+               return 1;
+         }
+         break;
+
+      case OP_ALU_TRI:
+         switch (code) {
+            case OP_MAD:
+               vp->Opcode = VP_OPCODE_MAD;
+               break;
+         }
+
+         if (parse_masked_dst_reg
+             (ctx, inst, vc_head, Program, (GLint *) & vp->DstReg.File,
+              &vp->DstReg.Index, vp->DstReg.WriteMask))
+            return 1;
+         for (a = 0; a < 3; a++) {
+            if (parse_vector_src_reg
+                (ctx, inst, vc_head, Program, (GLint *) & vp->SrcReg[a].File,
+                 &vp->SrcReg[a].Index, &vp->SrcReg[a].Negate,
+                 vp->SrcReg[a].Swizzle, &vp->SrcReg[a].RelAddr))
+               return 1;
+         }
+         break;
+
+      case OP_ALU_SWZ:
+         switch (code) {
+            case OP_SWZ:
+               vp->Opcode = VP_OPCODE_SWZ;
+               break;
+         }
+         if (parse_masked_dst_reg
+             (ctx, inst, vc_head, Program, (GLint *) & vp->DstReg.File,
+              &vp->DstReg.Index, vp->DstReg.WriteMask))
+            return 1;
+
+         if (parse_src_reg
+             (ctx, inst, vc_head, Program, (GLint *) & vp->SrcReg[0].File,
+              &vp->SrcReg[0].Index, &vp->SrcReg[0].RelAddr))
+            return 1;
+         parse_extended_swizzle_mask (inst, vp->SrcReg[0].Swizzle,
+                                      &vp->SrcReg[0].Negate);
+         break;
+   }
+   return 0;
+}
+
+#if DEBUG_PARSING
+
+static GLvoid
+print_state_token (GLint token)
+{
+   switch (token) {
+      case STATE_MATERIAL:
+         fprintf (stderr, "STATE_MATERIAL ");
+         break;
+      case STATE_LIGHT:
+         fprintf (stderr, "STATE_LIGHT ");
+         break;
+
+      case STATE_LIGHTMODEL_AMBIENT:
+         fprintf (stderr, "STATE_AMBIENT ");
+         break;
+
+      case STATE_LIGHTMODEL_SCENECOLOR:
+         fprintf (stderr, "STATE_SCENECOLOR ");
+         break;
+
+      case STATE_LIGHTPROD:
+         fprintf (stderr, "STATE_LIGHTPROD ");
+         break;
+
+      case STATE_TEXGEN:
+         fprintf (stderr, "STATE_TEXGEN ");
+         break;
+
+      case STATE_FOG_COLOR:
+         fprintf (stderr, "STATE_FOG_COLOR ");
+         break;
+
+      case STATE_FOG_PARAMS:
+         fprintf (stderr, "STATE_FOG_PARAMS ");
+         break;
+
+      case STATE_CLIPPLANE:
+         fprintf (stderr, "STATE_CLIPPLANE ");
+         break;
+
+      case STATE_POINT_SIZE:
+         fprintf (stderr, "STATE_POINT_SIZE ");
+         break;
+
+      case STATE_POINT_ATTENUATION:
+         fprintf (stderr, "STATE_ATTENUATION ");
+         break;
+
+      case STATE_MATRIX:
+         fprintf (stderr, "STATE_MATRIX ");
+         break;
+
+      case STATE_MODELVIEW:
+         fprintf (stderr, "STATE_MODELVIEW ");
+         break;
+
+      case STATE_PROJECTION:
+         fprintf (stderr, "STATE_PROJECTION ");
+         break;
+
+      case STATE_MVP:
+         fprintf (stderr, "STATE_MVP ");
+         break;
+
+      case STATE_TEXTURE:
+         fprintf (stderr, "STATE_TEXTURE ");
+         break;
+
+      case STATE_PROGRAM:
+         fprintf (stderr, "STATE_PROGRAM ");
+         break;
+
+      case STATE_MATRIX_INVERSE:
+         fprintf (stderr, "STATE_INVERSE ");
+         break;
+
+      case STATE_MATRIX_TRANSPOSE:
+         fprintf (stderr, "STATE_TRANSPOSE ");
+         break;
+
+      case STATE_MATRIX_INVTRANS:
+         fprintf (stderr, "STATE_INVTRANS ");
+         break;
+
+      case STATE_AMBIENT:
+         fprintf (stderr, "STATE_AMBIENT ");
+         break;
+
+      case STATE_DIFFUSE:
+         fprintf (stderr, "STATE_DIFFUSE ");
+         break;
+
+      case STATE_SPECULAR:
+         fprintf (stderr, "STATE_SPECULAR ");
+         break;
+
+      case STATE_EMISSION:
+         fprintf (stderr, "STATE_EMISSION ");
+         break;
+
+      case STATE_SHININESS:
+         fprintf (stderr, "STATE_SHININESS ");
+         break;
+
+      case STATE_HALF:
+         fprintf (stderr, "STATE_HALF ");
+         break;
+
+      case STATE_POSITION:
+         fprintf (stderr, "STATE_POSITION ");
+         break;
+
+      case STATE_ATTENUATION:
+         fprintf (stderr, "STATE_ATTENUATION ");
+         break;
+
+      case STATE_SPOT_DIRECTION:
+         fprintf (stderr, "STATE_DIRECTION ");
+         break;
+
+      case STATE_TEXGEN_EYE_S:
+         fprintf (stderr, "STATE_TEXGEN_EYE_S ");
+         break;
+
+      case STATE_TEXGEN_EYE_T:
+         fprintf (stderr, "STATE_TEXGEN_EYE_T ");
+         break;
+
+      case STATE_TEXGEN_EYE_R:
+         fprintf (stderr, "STATE_TEXGEN_EYE_R ");
+         break;
+
+      case STATE_TEXGEN_EYE_Q:
+         fprintf (stderr, "STATE_TEXGEN_EYE_Q ");
+         break;
+
+      case STATE_TEXGEN_OBJECT_S:
+         fprintf (stderr, "STATE_TEXGEN_EYE_S ");
+         break;
+
+      case STATE_TEXGEN_OBJECT_T:
+         fprintf (stderr, "STATE_TEXGEN_OBJECT_T ");
+         break;
+
+      case STATE_TEXGEN_OBJECT_R:
+         fprintf (stderr, "STATE_TEXGEN_OBJECT_R ");
+         break;
+
+      case STATE_TEXGEN_OBJECT_Q:
+         fprintf (stderr, "STATE_TEXGEN_OBJECT_Q ");
+         break;
+
+      case STATE_TEXENV_COLOR:
+         fprintf (stderr, "STATE_TEXENV_COLOR ");
+         break;
+
+      case STATE_DEPTH_RANGE:
+         fprintf (stderr, "STATE_DEPTH_RANGE ");
+         break;
+
+      case STATE_VERTEX_PROGRAM:
+         fprintf (stderr, "STATE_VERTEX_PROGRAM ");
+         break;
+
+      case STATE_FRAGMENT_PROGRAM:
+         fprintf (stderr, "STATE_FRAGMENT_PROGRAM ");
+         break;
+
+      case STATE_ENV:
+         fprintf (stderr, "STATE_ENV ");
+         break;
+
+      case STATE_LOCAL:
+         fprintf (stderr, "STATE_LOCAL ");
+         break;
+
+   }
+   fprintf (stderr, "[%d] ", token);
+}
+
+
+static GLvoid
+debug_variables (GLcontext * ctx, struct var_cache *vc_head,
+                 struct arb_program *Program)
+{
+   struct var_cache *vc;
+   GLint a, b;
+
+   fprintf (stderr, "debug_variables, vc_head: %x\n", vc_head);
+
+   /* First of all, print out the contents of the var_cache */
+   vc = vc_head;
+   while (vc) {
+      fprintf (stderr, "[%x]\n", vc);
+      switch (vc->type) {
+         case vt_none:
+            fprintf (stderr, "UNDEFINED %s\n", vc->name);
+            break;
+         case vt_attrib:
+            fprintf (stderr, "ATTRIB    %s\n", vc->name);
+            fprintf (stderr, "          binding: 0x%x\n", vc->attrib_binding);
+            break;
+         case vt_param:
+            fprintf (stderr, "PARAM     %s  begin: %d len: %d\n", vc->name,
+                     vc->param_binding_begin, vc->param_binding_length);
+            b = vc->param_binding_begin;
+            for (a = 0; a < vc->param_binding_length; a++) {
+               fprintf (stderr, "%s\n",
+                        Program->Parameters->Parameters[a + b].Name);
+               if (Program->Parameters->Parameters[a + b].Type == STATE) {
+                  print_state_token (Program->Parameters->Parameters[a + b].
+                                     StateIndexes[0]);
+                  print_state_token (Program->Parameters->Parameters[a + b].
+                                     StateIndexes[1]);
+                  print_state_token (Program->Parameters->Parameters[a + b].
+                                     StateIndexes[2]);
+                  print_state_token (Program->Parameters->Parameters[a + b].
+                                     StateIndexes[3]);
+                  print_state_token (Program->Parameters->Parameters[a + b].
+                                     StateIndexes[4]);
+                  print_state_token (Program->Parameters->Parameters[a + b].
+                                     StateIndexes[5]);
+               }
+               else
+                  fprintf (stderr, "%f %f %f %f\n",
+                           Program->Parameters->Parameters[a + b].Values[0],
+                           Program->Parameters->Parameters[a + b].Values[1],
+                           Program->Parameters->Parameters[a + b].Values[2],
+                           Program->Parameters->Parameters[a + b].Values[3]);
+            }
+            break;
+         case vt_temp:
+            fprintf (stderr, "TEMP      %s\n", vc->name);
+            fprintf (stderr, "          binding: 0x%x\n", vc->temp_binding);
+            break;
+         case vt_output:
+            fprintf (stderr, "OUTPUT    %s\n", vc->name);
+            fprintf (stderr, "          binding: 0x%x\n", vc->output_binding);
+            break;
+         case vt_alias:
+            fprintf (stderr, "ALIAS     %s\n", vc->name);
+            fprintf (stderr, "          binding: 0x%x (%s)\n",
+                     vc->alias_binding, vc->alias_binding->name);
+            break;
+      }
+      vc = vc->next;
+   }
+}
+
+#endif
+
+
+/** 
+ * The main loop for parsing a fragment or vertex program
+ * 
+ * \return 0 on sucess, 1 on error
+ */
+static GLint
+parse_arb_program (GLcontext * ctx, GLubyte * inst, struct var_cache **vc_head,
+                   struct arb_program *Program)
+{
+   GLint err = 0;
+
+   Program->MajorVersion = (GLuint) * inst++;
+   Program->MinorVersion = (GLuint) * inst++;
+
+   while (*inst != END) {
+      switch (*inst++) {
+            
+         case OPTION:
+            switch (*inst++) {
+               case ARB_PRECISION_HINT_FASTEST:
+                  Program->HintPrecisionFastest = 1;
+                  break;
+
+               case ARB_PRECISION_HINT_NICEST:
+                  Program->HintPrecisionNicest = 1;
+                  break;
+
+               case ARB_FOG_EXP:
+                  Program->HintFogExp = 1;
+                  break;
+
+               case ARB_FOG_EXP2:
+                  Program->HintFogExp2 = 1;
+                  break;
+
+               case ARB_FOG_LINEAR:
+                  Program->HintFogLinear = 1;
+                  break;
+
+               case ARB_POSITION_INVARIANT:
+                  if (Program->type == GL_VERTEX_PROGRAM_ARB)						
+                     Program->HintPositionInvariant = 1;
+                  break;
+            }
+            break;
+
+         case INSTRUCTION:
+            Program->Position = parse_position (&inst);
+
+            if (Program->type == GL_FRAGMENT_PROGRAM_ARB) {
+
+               /* Check the instruction count 
+                * XXX: Does END count as an instruction?
+                */						  
+               if (Program->Base.NumInstructions+1 == MAX_NV_FRAGMENT_PROGRAM_INSTRUCTIONS) {
+                  _mesa_set_program_error (ctx, Program->Position, 
+                      "Max instruction count exceeded!");
+                  _mesa_error (ctx, GL_INVALID_OPERATION,
+                      "Max instruction count exceeded!");
+               }
+					
+               /* Realloc Program->FPInstructions */
+               Program->FPInstructions =
+                  (struct fp_instruction *) _mesa_realloc (Program->FPInstructions,
+                                                           Program->Base.NumInstructions*sizeof(struct fp_instruction),
+                                                           (Program->Base.NumInstructions+1)*sizeof (struct fp_instruction));
+
+               /* parse the current instruction   */
+               err = parse_fp_instruction (ctx, &inst, vc_head, Program,
+                                           &Program->FPInstructions[Program->Base.NumInstructions]);
+                                                                    
+            }
+            else {
+               /* Check the instruction count 
+                * XXX: Does END count as an instruction?
+                */						  
+               if (Program->Base.NumInstructions+1 == MAX_NV_VERTEX_PROGRAM_INSTRUCTIONS) {
+                  _mesa_set_program_error (ctx, Program->Position, 
+                      "Max instruction count exceeded!");
+                  _mesa_error (ctx, GL_INVALID_OPERATION,
+                      "Max instruction count exceeded!");
+               }
+
+               /* Realloc Program->VPInstructions */
+               Program->VPInstructions =
+                  (struct vp_instruction *) _mesa_realloc (Program->VPInstructions,
+                                                           Program->Base.NumInstructions*sizeof(struct vp_instruction),
+                                                           (Program->Base.NumInstructions +1)*sizeof(struct vp_instruction));
+
+               /* parse the current instruction   */
+               err = parse_vp_instruction (ctx, &inst, vc_head, Program,
+                                           &Program->VPInstructions[Program->Base.NumInstructions]);
+            }
+
+            /* increment Program->Base.NumInstructions */
+            Program->Base.NumInstructions++;
+            break;
+
+         case DECLARATION:
+            err = parse_declaration (ctx, &inst, vc_head, Program);
+            break;
+
+         default:
+            break;
+      }
+
+      if (err)
+         break;
+   }
+
+   /* Finally, tag on an OPCODE_END instruction */
+   if (Program->type == GL_FRAGMENT_PROGRAM_ARB) {
+      Program->FPInstructions =
+         (struct fp_instruction *) _mesa_realloc (Program->FPInstructions,
+						  Program->Base.NumInstructions*sizeof(struct fp_instruction),
+                                                  (Program->Base.NumInstructions+1)*sizeof(struct fp_instruction));
+
+      Program->FPInstructions[Program->Base.NumInstructions].Opcode = FP_OPCODE_END;
+      /* YYY Wrong Position in program, whatever, at least not random -> crash
+	 Program->Position = parse_position (&inst);
+      */
+      Program->FPInstructions[Program->Base.NumInstructions].StringPos = Program->Position;
+   }
+   else {
+      Program->VPInstructions =
+         (struct vp_instruction *) _mesa_realloc (Program->VPInstructions,
+                                                  Program->Base.NumInstructions*sizeof(struct vp_instruction),
+                                                  (Program->Base.NumInstructions+1)*sizeof(struct vp_instruction));
+
+      Program->VPInstructions[Program->Base.NumInstructions].Opcode = VP_OPCODE_END;
+      /* YYY Wrong Position in program, whatever, at least not random -> crash
+	 Program->Position = parse_position (&inst);
+      */
+      Program->VPInstructions[Program->Base.NumInstructions].StringPos = Program->Position;
+   }
+
+   /* increment Program->Base.NumInstructions */
+   Program->Base.NumInstructions++;
+
+   return err;
+}
+
+
+/** 
+ * This kicks everything off.
+ *
+ * \param ctx - The GL Context
+ * \param str - The program string
+ * \param len - The program string length
+ * \param Program - The arb_program struct to return all the parsed info in
+ * \return 0 on sucess, 1 on error
+ */
+GLuint
+_mesa_parse_arb_program (GLcontext * ctx, const GLubyte * str, GLsizei len,
+                         struct arb_program * program)
+{
+   GLint a, err, error_pos;
+   char error_msg[300];
+   GLuint parsed_len;
+   struct var_cache *vc_head;
+   dict *dt;
+   GLubyte *parsed, *inst;
+   GLubyte *strCopy;
+
+   /* init to zero in case of parse error */
+   _mesa_bzero(program, sizeof(*program));
+
+   /* Need a null-terminated string for parsing */
+   strCopy = (GLubyte *) _mesa_malloc(len + 1);
+   if (!strCopy) {
+      _mesa_error (ctx, GL_OUT_OF_MEMORY, "glProgramStringARB");
+      return 1;
+   }
+   _mesa_memcpy(strCopy, str, len);
+   strCopy[len] = 0;
+   str = strCopy;
+
+
+#if DEBUG_PARSING
+   fprintf (stderr, "Loading grammar text!\n");
+#endif
+   dt = grammar_load_from_text ((GLubyte *) arb_grammar_text);
+   if (!dt) {
+      grammar_get_last_error ((GLubyte *) error_msg, 300, &error_pos);
+      _mesa_set_program_error (ctx, error_pos, error_msg);
+      _mesa_error (ctx, GL_INVALID_OPERATION,
+                   "Error loading grammer rule set");
+      _mesa_free(strCopy);
+      return 1;
+   }
+
+#if DEBUG_PARSING
+   printf ("Checking Grammar!\n");
+#endif
+   err = grammar_check (dt, str, &parsed, &parsed_len);
+
+
+   /* Syntax parse error */
+   if (err == 0) {
+      grammar_get_last_error ((GLubyte *) error_msg, 300, &error_pos);
+      _mesa_set_program_error (ctx, error_pos, error_msg);
+      _mesa_error (ctx, GL_INVALID_OPERATION, "Parse Error");
+
+      dict_destroy (&dt);
+      _mesa_free(strCopy);
+      return 1;
+   }
+
+#if DEBUG_PARSING
+   printf ("Destroying grammer dict [parse retval: %d]\n", err);
+#endif
+   dict_destroy (&dt);
+
+   /* Initialize the arb_program struct */
+   program->Base.String = strCopy;
+   program->Base.NumInstructions =
+   program->Base.NumTemporaries =
+   program->Base.NumParameters =
+   program->Base.NumAttributes = program->Base.NumAddressRegs = 0;
+   program->Parameters = _mesa_new_parameter_list ();
+   program->InputsRead = 0;
+   program->OutputsWritten = 0;
+   program->Position = 0;
+   program->MajorVersion = program->MinorVersion = 0;
+   program->HintPrecisionFastest =
+   program->HintPrecisionNicest =
+   program->HintFogExp2 =
+   program->HintFogExp =
+   program->HintFogLinear = program->HintPositionInvariant = 0;
+   for (a = 0; a < MAX_TEXTURE_IMAGE_UNITS; a++)
+      program->TexturesUsed[a] = 0;
+   program->NumAluInstructions =
+   program->NumTexInstructions = 
+   program->NumTexIndirections = 0;
+
+   program->FPInstructions = NULL;
+   program->VPInstructions = NULL;
+
+   vc_head = NULL;
+   err = 0;
+
+   /* Start examining the tokens in the array */
+   inst = parsed;
+
+   /* Check the grammer rev */
+   if (*inst++ != REVISION) {
+      _mesa_set_program_error (ctx, 0, "Grammar version mismatch");
+      _mesa_error (ctx, GL_INVALID_OPERATION, "Grammar verison mismatch");
+      err = 1;
+   }
+   else {
+      switch (*inst++) {
+         case FRAGMENT_PROGRAM:
+            program->type = GL_FRAGMENT_PROGRAM_ARB;
+            break;
+
+         case VERTEX_PROGRAM:
+            program->type = GL_VERTEX_PROGRAM_ARB;
+            break;
+      }
+
+      err = parse_arb_program (ctx, inst, &vc_head, program);
+#if DEBUG_PARSING
+      fprintf (stderr, "Symantic analysis returns %d [1 is bad!]\n", err);
+#endif
+   }
+
+   /*debug_variables(ctx, vc_head, program); */
+
+   /* We're done with the parsed binary array */
+   var_cache_destroy (&vc_head);
+
+   _mesa_free (parsed);
+#if DEBUG_PARSING
+   printf ("_mesa_parse_arb_program() done\n");
+#endif
+
+   return err;
+}
diff --git a/reactos/lib/mesa32/src/main/arbparse.h b/reactos/lib/mesa32/src/main/arbparse.h
new file mode 100644
index 00000000000..e6c43b9a983
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/arbparse.h
@@ -0,0 +1,83 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Brian Paul
+ */
+
+
+#ifndef ARBPARSE_H
+#define ARBPARSE_H
+
+#include "context.h"
+#include "mtypes.h"
+#include "nvvertprog.h"
+#include "nvfragprog.h"
+
+/**
+ * This is basically a union of the vertex_program and fragment_program
+ * structs that we can use to parse the program into
+ *
+ * XXX: this should go into mtypes.h?
+ */
+struct arb_program
+{
+	GLuint type; /* FRAGMENT_PROGRAM_ARB or VERTEX_PROGRAM_ARB */
+
+	struct program Base;
+   struct program_parameter_list *Parameters; 
+	GLuint InputsRead;
+	GLuint OutputsWritten;
+
+	GLuint Position;       /* Just used for error reporting while parsing */
+	GLuint MajorVersion;
+	GLuint MinorVersion;
+
+	/* ARB_vertex_program specifics */ 
+	struct vp_instruction *VPInstructions;
+
+	/* Options currently recognized by the parser */
+	/* ARB_fp */
+	GLboolean HintPrecisionFastest;
+	GLboolean HintPrecisionNicest;
+	GLboolean HintFogExp2;
+	GLboolean HintFogExp;
+	GLboolean HintFogLinear;
+
+	/* ARB_fp & _vp */
+	GLboolean HintPositionInvariant;
+
+	/* ARB_fragment_program sepecifics */
+	struct fp_instruction *FPInstructions;
+   GLuint TexturesUsed[MAX_TEXTURE_IMAGE_UNITS]; 
+   GLuint NumAluInstructions; 
+   GLuint NumTexInstructions;
+   GLuint NumTexIndirections;
+};
+
+extern GLuint 
+_mesa_parse_arb_program( GLcontext *ctx, const GLubyte *str, GLsizei len, 
+                                 struct arb_program *Program );
+                          
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/arbparse_syn.h b/reactos/lib/mesa32/src/main/arbparse_syn.h
new file mode 100644
index 00000000000..3d033cd4123
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/arbparse_syn.h
@@ -0,0 +1,1267 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file arbparse.c
+ * ARB_*_program parser syntax 
+ * \author Michal Krole
+ */
+
+
+static char arb_grammar_text[] = ".syntax program;\n"
+".emtcode REVISION 0x05\n"
+".emtcode FRAGMENT_PROGRAM 0x01\n"
+".emtcode VERTEX_PROGRAM 0x02\n"
+".emtcode OPTION 0x01\n"
+".emtcode INSTRUCTION 0x02\n"
+".emtcode DECLARATION 0x03\n"
+".emtcode END 0x04\n"
+".emtcode ARB_PRECISION_HINT_FASTEST 0x01\n"
+".emtcode ARB_PRECISION_HINT_NICEST 0x02\n"
+".emtcode ARB_FOG_EXP 0x04\n"
+".emtcode ARB_FOG_EXP2 0x08\n"
+".emtcode ARB_FOG_LINEAR 0x10\n"
+".emtcode ARB_POSITION_INVARIANT 0x20\n"
+".emtcode OP_ALU_INST 0x00\n"
+".emtcode OP_TEX_INST 0x01\n"
+".emtcode OP_ALU_VECTOR 0x06\n"
+".emtcode OP_ALU_SCALAR 0x03\n"
+".emtcode OP_ALU_BINSC 0x02\n"
+".emtcode OP_ALU_BIN 0x01\n"
+".emtcode OP_ALU_TRI 0x05\n"
+".emtcode OP_ALU_SWZ 0x04\n"
+".emtcode OP_TEX_SAMPLE 0x07\n"
+".emtcode OP_TEX_KIL 0x08\n"
+".emtcode OP_ALU_ARL 0x00\n"
+".emtcode OP_ABS 0x00\n"
+".emtcode OP_ABS_SAT 0x1B\n"
+".emtcode OP_FLR 0x09\n"
+".emtcode OP_FLR_SAT 0x26\n"
+".emtcode OP_FRC 0x0A\n"
+".emtcode OP_FRC_SAT 0x27\n"
+".emtcode OP_LIT 0x0C\n"
+".emtcode OP_LIT_SAT 0x2A\n"
+".emtcode OP_MOV 0x11\n"
+".emtcode OP_MOV_SAT 0x30\n"
+".emtcode OP_COS 0x1F\n"
+".emtcode OP_COS_SAT 0x20\n"
+".emtcode OP_EX2 0x07\n"
+".emtcode OP_EX2_SAT 0x25\n"
+".emtcode OP_LG2 0x0B\n"
+".emtcode OP_LG2_SAT 0x29\n"
+".emtcode OP_RCP 0x14\n"
+".emtcode OP_RCP_SAT 0x33\n"
+".emtcode OP_RSQ 0x15\n"
+".emtcode OP_RSQ_SAT 0x34\n"
+".emtcode OP_SIN 0x38\n"
+".emtcode OP_SIN_SAT 0x39\n"
+".emtcode OP_SCS 0x35\n"
+".emtcode OP_SCS_SAT 0x36\n"
+".emtcode OP_POW 0x13\n"
+".emtcode OP_POW_SAT 0x32\n"
+".emtcode OP_ADD 0x01\n"
+".emtcode OP_ADD_SAT 0x1C\n"
+".emtcode OP_DP3 0x03\n"
+".emtcode OP_DP3_SAT 0x21\n"
+".emtcode OP_DP4 0x04\n"
+".emtcode OP_DP4_SAT 0x22\n"
+".emtcode OP_DPH 0x05\n"
+".emtcode OP_DPH_SAT 0x23\n"
+".emtcode OP_DST 0x06\n"
+".emtcode OP_DST_SAT 0x24\n"
+".emtcode OP_MAX 0x0F\n"
+".emtcode OP_MAX_SAT 0x2E\n"
+".emtcode OP_MIN 0x10\n"
+".emtcode OP_MIN_SAT 0x2F\n"
+".emtcode OP_MUL 0x12\n"
+".emtcode OP_MUL_SAT 0x31\n"
+".emtcode OP_SGE 0x16\n"
+".emtcode OP_SGE_SAT 0x37\n"
+".emtcode OP_SLT 0x17\n"
+".emtcode OP_SLT_SAT 0x3A\n"
+".emtcode OP_SUB 0x18\n"
+".emtcode OP_SUB_SAT 0x3B\n"
+".emtcode OP_XPD 0x1A\n"
+".emtcode OP_XPD_SAT 0x43\n"
+".emtcode OP_CMP 0x1D\n"
+".emtcode OP_CMP_SAT 0x1E\n"
+".emtcode OP_LRP 0x2B\n"
+".emtcode OP_LRP_SAT 0x2C\n"
+".emtcode OP_MAD 0x0E\n"
+".emtcode OP_MAD_SAT 0x2D\n"
+".emtcode OP_SWZ 0x19\n"
+".emtcode OP_SWZ_SAT 0x3C\n"
+".emtcode OP_TEX 0x3D\n"
+".emtcode OP_TEX_SAT 0x3E\n"
+".emtcode OP_TXB 0x3F\n"
+".emtcode OP_TXB_SAT 0x40\n"
+".emtcode OP_TXP 0x41\n"
+".emtcode OP_TXP_SAT 0x42\n"
+".emtcode OP_KIL 0x28\n"
+".emtcode OP_ARL 0x02\n"
+".emtcode OP_EXP 0x08\n"
+".emtcode OP_LOG 0x0D\n"
+".emtcode FRAGMENT_ATTRIB_COLOR 0x01\n"
+".emtcode FRAGMENT_ATTRIB_TEXCOORD 0x02\n"
+".emtcode FRAGMENT_ATTRIB_FOGCOORD 0x03\n"
+".emtcode FRAGMENT_ATTRIB_POSITION 0x04\n"
+".emtcode VERTEX_ATTRIB_POSITION 0x01\n"
+".emtcode VERTEX_ATTRIB_WEIGHT 0x02\n"
+".emtcode VERTEX_ATTRIB_NORMAL 0x03\n"
+".emtcode VERTEX_ATTRIB_COLOR 0x04\n"
+".emtcode VERTEX_ATTRIB_FOGCOORD 0x05\n"
+".emtcode VERTEX_ATTRIB_TEXCOORD 0x06\n"
+".emtcode VERTEX_ATTRIB_MATRIXINDEX 0x07\n"
+".emtcode VERTEX_ATTRIB_GENERIC 0x08\n"
+".emtcode FRAGMENT_RESULT_COLOR 0x01\n"
+".emtcode FRAGMENT_RESULT_DEPTH 0x02\n"
+".emtcode VERTEX_RESULT_POSITION 0x01\n"
+".emtcode VERTEX_RESULT_COLOR 0x02\n"
+".emtcode VERTEX_RESULT_FOGCOORD 0x03\n"
+".emtcode VERTEX_RESULT_POINTSIZE 0x04\n"
+".emtcode VERTEX_RESULT_TEXCOORD 0x05\n"
+".emtcode TEXTARGET_1D 0x01\n"
+".emtcode TEXTARGET_2D 0x02\n"
+".emtcode TEXTARGET_3D 0x03\n"
+".emtcode TEXTARGET_RECT 0x04\n"
+".emtcode TEXTARGET_CUBE 0x05\n"
+".emtcode FACE_FRONT 0x00\n"
+".emtcode FACE_BACK 0x01\n"
+".emtcode COLOR_PRIMARY 0x00\n"
+".emtcode COLOR_SECONDARY 0x01\n"
+".emtcode COMPONENT_X 0x00\n"
+".emtcode COMPONENT_Y 0x01\n"
+".emtcode COMPONENT_Z 0x02\n"
+".emtcode COMPONENT_W 0x03\n"
+".emtcode COMPONENT_0 0x04\n"
+".emtcode COMPONENT_1 0x05\n"
+".emtcode ARRAY_INDEX_ABSOLUTE 0x00\n"
+".emtcode ARRAY_INDEX_RELATIVE 0x01\n"
+".emtcode MATRIX_MODELVIEW 0x01\n"
+".emtcode MATRIX_PROJECTION 0x02\n"
+".emtcode MATRIX_MVP 0x03\n"
+".emtcode MATRIX_TEXTURE 0x04\n"
+".emtcode MATRIX_PALETTE 0x05\n"
+".emtcode MATRIX_PROGRAM 0x06\n"
+".emtcode MATRIX_MODIFIER_IDENTITY 0x00\n"
+".emtcode MATRIX_MODIFIER_INVERSE 0x01\n"
+".emtcode MATRIX_MODIFIER_TRANSPOSE 0x02\n"
+".emtcode MATRIX_MODIFIER_INVTRANS 0x03\n"
+".emtcode CONSTANT_SCALAR 0x01\n"
+".emtcode CONSTANT_VECTOR 0x02\n"
+".emtcode PROGRAM_PARAM_ENV 0x01\n"
+".emtcode PROGRAM_PARAM_LOCAL 0x02\n"
+".emtcode REGISTER_ATTRIB 0x01\n"
+".emtcode REGISTER_PARAM 0x02\n"
+".emtcode REGISTER_RESULT 0x03\n"
+".emtcode REGISTER_ESTABLISHED_NAME 0x04\n"
+".emtcode PARAM_NULL 0x00\n"
+".emtcode PARAM_ARRAY_ELEMENT 0x01\n"
+".emtcode PARAM_STATE_ELEMENT 0x02\n"
+".emtcode PARAM_PROGRAM_ELEMENT 0x03\n"
+".emtcode PARAM_PROGRAM_ELEMENTS 0x04\n"
+".emtcode PARAM_CONSTANT 0x05\n"
+".emtcode STATE_MATERIAL 0x01\n"
+".emtcode STATE_LIGHT 0x02\n"
+".emtcode STATE_LIGHT_MODEL 0x03\n"
+".emtcode STATE_LIGHT_PROD 0x04\n"
+".emtcode STATE_FOG 0x05\n"
+".emtcode STATE_MATRIX_ROWS 0x06\n"
+".emtcode STATE_TEX_ENV 0x07\n"
+".emtcode STATE_DEPTH 0x08\n"
+".emtcode STATE_TEX_GEN 0x09\n"
+".emtcode STATE_CLIP_PLANE 0x0A\n"
+".emtcode STATE_POINT 0x0B\n"
+".emtcode MATERIAL_AMBIENT 0x01\n"
+".emtcode MATERIAL_DIFFUSE 0x02\n"
+".emtcode MATERIAL_SPECULAR 0x03\n"
+".emtcode MATERIAL_EMISSION 0x04\n"
+".emtcode MATERIAL_SHININESS 0x05\n"
+".emtcode LIGHT_AMBIENT 0x01\n"
+".emtcode LIGHT_DIFFUSE 0x02\n"
+".emtcode LIGHT_SPECULAR 0x03\n"
+".emtcode LIGHT_POSITION 0x04\n"
+".emtcode LIGHT_ATTENUATION 0x05\n"
+".emtcode LIGHT_HALF 0x06\n"
+".emtcode LIGHT_SPOT_DIRECTION 0x07\n"
+".emtcode LIGHT_MODEL_AMBIENT 0x01\n"
+".emtcode LIGHT_MODEL_SCENECOLOR 0x02\n"
+".emtcode LIGHT_PROD_AMBIENT 0x01\n"
+".emtcode LIGHT_PROD_DIFFUSE 0x02\n"
+".emtcode LIGHT_PROD_SPECULAR 0x03\n"
+".emtcode TEX_ENV_COLOR 0x01\n"
+".emtcode TEX_GEN_EYE 0x01\n"
+".emtcode TEX_GEN_OBJECT 0x02\n"
+".emtcode FOG_COLOR 0x01\n"
+".emtcode FOG_PARAMS 0x02\n"
+".emtcode DEPTH_RANGE 0x01\n"
+".emtcode POINT_SIZE 0x01\n"
+".emtcode POINT_ATTENUATION 0x02\n"
+".emtcode ATTRIB 0x01\n"
+".emtcode PARAM 0x02\n"
+".emtcode TEMP 0x03\n"
+".emtcode OUTPUT 0x04\n"
+".emtcode ALIAS 0x05\n"
+".emtcode ADDRESS 0x06\n"
+".errtext UNKNOWN_PROGRAM_SIGNATURE \"1001: '$e_signature$': unknown program signature\"\n"
+".errtext MISSING_END_OR_INVALID_STATEMENT \"1002: '$e_statement$': invalid statement\"\n"
+".errtext CODE_AFTER_END \"1003: '$e_statement$': code after 'END' keyword\"\n"
+".errtext INVALID_PROGRAM_OPTION \"1004: '$e_identifier$': invalid program option\"\n"
+".errtext EXT_SWIZ_COMP_EXPECTED \"1005: extended swizzle component expected but '$e_token$' found\"\n"
+".errtext TEX_TARGET_EXPECTED \"1006: texture target expected but '$e_token$' found\"\n"
+".errtext TEXTURE_EXPECTED \"1007: 'texture' expected but '$e_identifier$' found\"\n"
+".errtext SOURCE_REGISTER_EXPECTED \"1008: source register expected but '$e_token$' found\"\n"
+".errtext DESTINATION_REGISTER_EXPECTED \"1009: destination register expected but '$e_token$' found\"\n"
+".errtext INVALID_ADDRESS_COMPONENT \"1010: '$e_identifier$': invalid address component\"\n"
+".errtext INVALID_ADDRESS_WRITEMASK \"1011: '$e_identifier$': invalid address writemask\"\n"
+".errtext INVALID_COMPONENT \"1012: '$e_charordigit$': invalid component\"\n"
+".errtext INVALID_SUFFIX \"1013: '$e_identifier$': invalid suffix\"\n"
+".errtext INVALID_WRITEMASK \"1014: '$e_identifier$': invalid writemask\"\n"
+".errtext FRAGMENT_EXPECTED \"1015: 'fragment' expected but '$e_identifier$' found\"\n"
+".errtext VERTEX_EXPECTED \"1016: 'vertex' expected but '$e_identifier$' found\"\n"
+".errtext INVALID_FRAGMENT_PROPERTY \"1017: '$e_identifier$': invalid fragment property\"\n"
+".errtext INVALID_VERTEX_PROPERTY \"1018: '$e_identifier$': invalid vertex property\"\n"
+".errtext INVALID_STATE_PROPERTY \"1019: '$e_identifier$': invalid state property\"\n"
+".errtext INVALID_MATERIAL_PROPERTY \"1020: '$e_identifier$': invalid material property\"\n"
+".errtext INVALID_LIGHT_PROPERTY \"1021: '$e_identifier$': invalid light property\"\n"
+".errtext INVALID_SPOT_PROPERTY \"1022: '$e_identifier$': invalid spot property\"\n"
+".errtext INVALID_LIGHTMODEL_PROPERTY \"1023: '$e_identifier$': invalid light model property\"\n"
+".errtext INVALID_LIGHTPROD_PROPERTY \"1024: '$e_identifier$': invalid light product property\"\n"
+".errtext INVALID_TEXENV_PROPERTY \"1025: '$e_identifier$': invalid texture environment property\"\n"
+".errtext INVALID_TEXGEN_PROPERTY \"1026: '$e_identifier$': invalid texture generating property\"\n"
+".errtext INVALID_TEXGEN_COORD \"1027: '$e_identifier$': invalid texture generating coord\"\n"
+".errtext INVALID_FOG_PROPERTY \"1028: '$e_identifier$': invalid fog property\"\n"
+".errtext INVALID_DEPTH_PROPERTY \"1029: '$e_identifier$': invalid depth property\"\n"
+".errtext INVALID_CLIPPLANE_PROPERTY \"1030: '$e_identifier$': invalid clip plane property\"\n"
+".errtext INVALID_POINT_PROPERTY \"1031: '$e_identifier$': invalid point property\"\n"
+".errtext MATRIX_ROW_SELECTOR_OR_MODIFIER_EXPECTED \"1032: matrix row selector or modifier expected but '$e_token$' found\"\n"
+".errtext INVALID_MATRIX_NAME \"1033: '$e_identifier$': invalid matrix name\"\n"
+".errtext INVALID_PROGRAM_PROPERTY \"1034: '$e_identifier$': invalid program property\"\n"
+".errtext RESULT_EXPECTED \"1035: 'result' expected but '$e_token$' found\"\n"
+".errtext INVALID_RESULT_PROPERTY \"1036: '$e_identifier$': invalid result property\"\n"
+".errtext INVALID_FACE_PROPERTY \"1037: '$e_identifier$': invalid face property\"\n"
+".errtext INVALID_COLOR_PROPERTY \"1038: '$e_identifier$': invalid color property\"\n"
+".errtext IDENTIFIER_EXPECTED \"1039: identifier expected but '$e_token$' found\"\n"
+".errtext RESERVED_KEYWORD \"1040: use of reserved keyword as an identifier\"\n"
+".errtext INTEGER_EXPECTED \"1041: integer value expected but '$e_token$' found\"\n"
+".errtext MISSING_SEMICOLON \"1042: ';' expected but '$e_token$' found\"\n"
+".errtext MISSING_COMMA \"1043: ',' expected but '$e_token$' found\"\n"
+".errtext MISSING_LBRACKET \"1044: '[' expected but '$e_token$' found\"\n"
+".errtext MISSING_RBRACKET \"1045: ']' expected but '$e_token$' found\"\n"
+".errtext MISSING_DOT \"1046: '.' expected but '$e_token$' found\"\n"
+".errtext MISSING_EQUAL \"1047: '=' expected but '$e_token$' found\"\n"
+".errtext MISSING_LBRACE \"1048: '{' expected but '$e_token$' found\"\n"
+".errtext MISSING_RBRACE \"1049: '}' expected but '$e_token$' found\"\n"
+".errtext MISSING_DOTDOT \"1050: '..' expected but '$e_token$' found\"\n"
+".errtext MISSING_FRACTION_OR_EXPONENT \"1051: missing fraction part or exponent\"\n"
+".errtext MISSING_DOT_OR_EXPONENT \"1052: missing '.' or exponent\"\n"
+".errtext EXPONENT_VALUE_EXPECTED \"1053: exponent value expected\"\n"
+".errtext INTEGER_OUT_OF_RANGE \"1054: integer value out of range\"\n"
+"program\n"
+" programs .error UNKNOWN_PROGRAM_SIGNATURE .emit REVISION;\n"
+"programs\n"
+" frag_program_1_0 .emit FRAGMENT_PROGRAM .emit 0x01 .emit 0x00 .or\n"
+" vert_program_1_0 .emit VERTEX_PROGRAM .emit 0x01 .emit 0x00;\n"
+"frag_program_1_0\n"
+" '!' .and '!' .and 'A' .and 'R' .and 'B' .and 'f' .and 'p' .and '1' .and '.' .and '0' .and\n"
+" optional_space .and fp_optionSequence .and fp_statementSequence .and\n"
+" \"END\" .error MISSING_END_OR_INVALID_STATEMENT .emit END .and optional_space .and\n"
+" '\\0' .error CODE_AFTER_END;\n"
+"vert_program_1_0\n"
+" '!' .and '!' .and 'A' .and 'R' .and 'B' .and 'v' .and 'p' .and '1' .and '.' .and '0' .and\n"
+" optional_space .and vp_optionSequence .and vp_statementSequence .and\n"
+" \"END\" .error MISSING_END_OR_INVALID_STATEMENT .emit END .and optional_space .and\n"
+" '\\0' .error CODE_AFTER_END;\n"
+"fp_optionSequence\n"
+" .loop fp_option;\n"
+"vp_optionSequence\n"
+" .loop vp_option;\n"
+"fp_option\n"
+" \"OPTION\" .emit OPTION .and space .and fp_optionString .error INVALID_PROGRAM_OPTION .and\n"
+" semicolon;\n"
+"vp_option\n"
+" \"OPTION\" .emit OPTION .and space .and vp_optionString .error INVALID_PROGRAM_OPTION .and\n"
+" semicolon;\n"
+"fp_optionString\n"
+" \"ARB_precision_hint_fastest\" .emit ARB_PRECISION_HINT_FASTEST .or\n"
+" \"ARB_precision_hint_nicest\" .emit ARB_PRECISION_HINT_NICEST .or\n"
+" \"ARB_fog_exp\" .emit ARB_FOG_EXP .or\n"
+" \"ARB_fog_exp2\" .emit ARB_FOG_EXP2 .or\n"
+" \"ARB_fog_linear\" .emit ARB_FOG_LINEAR;\n"
+"vp_optionString\n"
+" \"ARB_position_invariant\" .emit ARB_POSITION_INVARIANT;\n"
+"fp_statementSequence\n"
+" .loop fp_statement;\n"
+"vp_statementSequence\n"
+" .loop vp_statement;\n"
+"fp_statement\n"
+" fp_statement_1 .or fp_statement_2;\n"
+"vp_statement\n"
+" vp_statement_1 .or vp_statement_2;\n"
+"fp_statement_1\n"
+" fp_instruction .emit INSTRUCTION .emit $ .and semicolon;\n"
+"fp_statement_2\n"
+" fp_namingStatement .emit DECLARATION .and semicolon;\n"
+"vp_statement_1\n"
+" vp_instruction .emit INSTRUCTION .emit $ .and semicolon;\n"
+"vp_statement_2\n"
+" vp_namingStatement .emit DECLARATION .and semicolon;\n"
+"fp_instruction\n"
+" ALUInstruction .emit OP_ALU_INST .or\n"
+" TexInstruction .emit OP_TEX_INST;\n"
+"vp_instruction\n"
+" ARL_instruction .emit OP_ALU_ARL .or\n"
+" vp_VECTORop_instruction .emit OP_ALU_VECTOR .or\n"
+" vp_SCALARop_instruction .emit OP_ALU_SCALAR .or\n"
+" vp_BINSCop_instruction .emit OP_ALU_BINSC .or\n"
+" vp_BINop_instruction .emit OP_ALU_BIN .or\n"
+" vp_TRIop_instruction .emit OP_ALU_TRI .or\n"
+" vp_SWZ_instruction .emit OP_ALU_SWZ;\n"
+"ALUInstruction\n"
+" fp_VECTORop_instruction .emit OP_ALU_VECTOR .or\n"
+" fp_SCALARop_instruction .emit OP_ALU_SCALAR .or\n"
+" fp_BINSCop_instruction .emit OP_ALU_BINSC .or\n"
+" fp_BINop_instruction .emit OP_ALU_BIN .or\n"
+" fp_TRIop_instruction .emit OP_ALU_TRI .or\n"
+" fp_SWZ_instruction .emit OP_ALU_SWZ;\n"
+"TexInstruction\n"
+" SAMPLE_instruction .emit OP_TEX_SAMPLE .or\n"
+" KIL_instruction .emit OP_TEX_KIL;\n"
+"ARL_instruction\n"
+" \"ARL\" .emit OP_ARL .and space .and maskedAddrReg .and comma .and vp_scalarSrcReg;\n"
+"fp_VECTORop_instruction\n"
+" fp_VECTORop .and space .and fp_maskedDstReg .and comma .and vectorSrcReg;\n"
+"vp_VECTORop_instruction\n"
+" vp_VECTORop .and space .and vp_maskedDstReg .and comma .and swizzleSrcReg;\n"
+"fp_VECTORop\n"
+" \"ABS\" .emit OP_ABS .or \"ABS_SAT\" .emit OP_ABS_SAT .or\n"
+" \"FLR\" .emit OP_FLR .or \"FLR_SAT\" .emit OP_FLR_SAT .or\n"
+" \"FRC\" .emit OP_FRC .or \"FRC_SAT\" .emit OP_FRC_SAT .or\n"
+" \"LIT\" .emit OP_LIT .or \"LIT_SAT\" .emit OP_LIT_SAT .or\n"
+" \"MOV\" .emit OP_MOV .or \"MOV_SAT\" .emit OP_MOV_SAT;\n"
+"vp_VECTORop\n"
+" \"ABS\" .emit OP_ABS .or\n"
+" \"FLR\" .emit OP_FLR .or\n"
+" \"FRC\" .emit OP_FRC .or\n"
+" \"LIT\" .emit OP_LIT .or\n"
+" \"MOV\" .emit OP_MOV;\n"
+"fp_SCALARop_instruction\n"
+" fp_SCALARop .and space .and fp_maskedDstReg .and comma .and fp_scalarSrcReg;\n"
+"vp_SCALARop_instruction\n"
+" vp_SCALARop .and space .and vp_maskedDstReg .and comma .and vp_scalarSrcReg;\n"
+"fp_SCALARop\n"
+" \"COS\" .emit OP_COS .or \"COS_SAT\" .emit OP_COS_SAT .or\n"
+" \"EX2\" .emit OP_EX2 .or \"EX2_SAT\" .emit OP_EX2_SAT .or\n"
+" \"LG2\" .emit OP_LG2 .or \"LG2_SAT\" .emit OP_LG2_SAT .or\n"
+" \"RCP\" .emit OP_RCP .or \"RCP_SAT\" .emit OP_RCP_SAT .or\n"
+" \"RSQ\" .emit OP_RSQ .or \"RSQ_SAT\" .emit OP_RSQ_SAT .or\n"
+" \"SIN\" .emit OP_SIN .or \"SIN_SAT\" .emit OP_SIN_SAT .or\n"
+" \"SCS\" .emit OP_SCS .or \"SCS_SAT\" .emit OP_SCS_SAT;\n"
+"vp_SCALARop\n"
+" \"EX2\" .emit OP_EX2 .or\n"
+" \"EXP\" .emit OP_EXP .or\n"
+" \"LG2\" .emit OP_LG2 .or\n"
+" \"LOG\" .emit OP_LOG .or\n"
+" \"RCP\" .emit OP_RCP .or\n"
+" \"RSQ\" .emit OP_RSQ;\n"
+"fp_BINSCop_instruction\n"
+" fp_BINSCop .and space .and fp_maskedDstReg .and comma .and fp_scalarSrcReg .and comma .and\n"
+" fp_scalarSrcReg;\n"
+"vp_BINSCop_instruction\n"
+" vp_BINSCop .and space .and vp_maskedDstReg .and comma .and vp_scalarSrcReg .and comma .and\n"
+" vp_scalarSrcReg;\n"
+"fp_BINSCop\n"
+" \"POW\" .emit OP_POW .or \"POW_SAT\" .emit OP_POW_SAT;\n"
+"vp_BINSCop\n"
+" \"POW\" .emit OP_POW;\n"
+"fp_BINop_instruction\n"
+" fp_BINop .and space .and fp_maskedDstReg .and comma .and vectorSrcReg .and comma .and\n"
+" vectorSrcReg;\n"
+"vp_BINop_instruction\n"
+" vp_BINop .and space .and vp_maskedDstReg .and comma .and swizzleSrcReg .and comma .and\n"
+" swizzleSrcReg;\n"
+"fp_BINop\n"
+" \"ADD\" .emit OP_ADD .or \"ADD_SAT\" .emit OP_ADD_SAT .or\n"
+" \"DP3\" .emit OP_DP3 .or \"DP3_SAT\" .emit OP_DP3_SAT .or\n"
+" \"DP4\" .emit OP_DP4 .or \"DP4_SAT\" .emit OP_DP4_SAT .or\n"
+" \"DPH\" .emit OP_DPH .or \"DPH_SAT\" .emit OP_DPH_SAT .or\n"
+" \"DST\" .emit OP_DST .or \"DST_SAT\" .emit OP_DST_SAT .or\n"
+" \"MAX\" .emit OP_MAX .or \"MAX_SAT\" .emit OP_MAX_SAT .or\n"
+" \"MIN\" .emit OP_MIN .or \"MIN_SAT\" .emit OP_MIN_SAT .or\n"
+" \"MUL\" .emit OP_MUL .or \"MUL_SAT\" .emit OP_MUL_SAT .or\n"
+" \"SGE\" .emit OP_SGE .or \"SGE_SAT\" .emit OP_SGE_SAT .or\n"
+" \"SLT\" .emit OP_SLT .or \"SLT_SAT\" .emit OP_SLT_SAT .or\n"
+" \"SUB\" .emit OP_SUB .or \"SUB_SAT\" .emit OP_SUB_SAT .or\n"
+" \"XPD\" .emit OP_XPD .or \"XPD_SAT\" .emit OP_XPD_SAT;\n"
+"vp_BINop\n"
+" \"ADD\" .emit OP_ADD .or\n"
+" \"DP3\" .emit OP_DP3 .or\n"
+" \"DP4\" .emit OP_DP4 .or\n"
+" \"DPH\" .emit OP_DPH .or\n"
+" \"DST\" .emit OP_DST .or\n"
+" \"MAX\" .emit OP_MAX .or\n"
+" \"MIN\" .emit OP_MIN .or\n"
+" \"MUL\" .emit OP_MUL .or\n"
+" \"SGE\" .emit OP_SGE .or\n"
+" \"SLT\" .emit OP_SLT .or\n"
+" \"SUB\" .emit OP_SUB .or\n"
+" \"XPD\" .emit OP_XPD;\n"
+"fp_TRIop_instruction\n"
+" fp_TRIop .and space .and fp_maskedDstReg .and comma .and vectorSrcReg .and comma .and\n"
+" vectorSrcReg .and comma .and vectorSrcReg;\n"
+"vp_TRIop_instruction\n"
+" vp_TRIop .and space .and vp_maskedDstReg .and comma .and swizzleSrcReg .and comma .and\n"
+" swizzleSrcReg .and comma .and swizzleSrcReg;\n"
+"fp_TRIop\n"
+" \"CMP\" .emit OP_CMP .or \"CMP_SAT\" .emit OP_CMP_SAT .or\n"
+" \"LRP\" .emit OP_LRP .or \"LRP_SAT\" .emit OP_LRP_SAT .or\n"
+" \"MAD\" .emit OP_MAD .or \"MAD_SAT\" .emit OP_MAD_SAT;\n"
+"vp_TRIop\n"
+" \"MAD\" .emit OP_MAD;\n"
+"fp_SWZ_instruction\n"
+" SWZop .and space .and fp_maskedDstReg .and comma .and fp_srcReg .and comma .and\n"
+" fp_extendedSwizzle .error EXT_SWIZ_COMP_EXPECTED;\n"
+"vp_SWZ_instruction\n"
+" \"SWZ\" .emit OP_SWZ .and space .and vp_maskedDstReg .and comma .and vp_srcReg .and comma .and\n"
+" vp_extendedSwizzle .error EXT_SWIZ_COMP_EXPECTED;\n"
+"SWZop\n"
+" \"SWZ\" .emit OP_SWZ .or \"SWZ_SAT\" .emit OP_SWZ_SAT;\n"
+"SAMPLE_instruction\n"
+" SAMPLEop .and space .and fp_maskedDstReg .and comma .and vectorSrcReg .and comma .and\n"
+" texImageUnit .and comma .and texTarget .error TEX_TARGET_EXPECTED;\n"
+"SAMPLEop\n"
+" \"TEX\" .emit OP_TEX .or \"TEX_SAT\" .emit OP_TEX_SAT .or\n"
+" \"TXB\" .emit OP_TXB .or \"TXB_SAT\" .emit OP_TXB_SAT .or\n"
+" \"TXP\" .emit OP_TXP .or \"TXP_SAT\" .emit OP_TXP_SAT;\n"
+"KIL_instruction\n"
+" \"KIL\" .emit OP_KIL .and space .and vectorSrcReg;\n"
+"texImageUnit\n"
+" \"texture\" .error TEXTURE_EXPECTED .and optTexImageUnitNum;\n"
+"texTarget\n"
+" \"1D\" .emit TEXTARGET_1D .or\n"
+" \"2D\" .emit TEXTARGET_2D .or\n"
+" \"3D\" .emit TEXTARGET_3D .or\n"
+" \"RECT\" .emit TEXTARGET_RECT .or\n"
+" \"CUBE\" .emit TEXTARGET_CUBE;\n"
+"optTexImageUnitNum\n"
+" optTexImageUnitNum_1 .or .true .emit 0x00;\n"
+"optTexImageUnitNum_1\n"
+" lbracket_ne .and texImageUnitNum .and rbracket;\n"
+"texImageUnitNum\n"
+" integer;\n"
+"fp_scalarSrcReg\n"
+" optionalSign .and fp_srcReg .and fp_scalarSuffix;\n"
+"vp_scalarSrcReg\n"
+" optionalSign .and vp_srcReg .and vp_scalarSuffix;\n"
+"swizzleSrcReg\n"
+" optionalSign .and vp_srcReg .and swizzleSuffix;\n"
+"vectorSrcReg\n"
+" optionalSign .and fp_srcReg .and optionalSuffix;\n"
+"fp_maskedDstReg\n"
+" fp_dstReg .and fp_optionalMask;\n"
+"vp_maskedDstReg\n"
+" vp_dstReg .and vp_optionalMask;\n"
+"maskedAddrReg\n"
+" addrReg .and addrWriteMask;\n"
+"fp_extendedSwizzle\n"
+" xyzwExtendedSwizzle .or rgbaExtendedSwizzle;\n"
+"vp_extendedSwizzle\n"
+" extSwizComp .and comma .and\n"
+" extSwizComp .error EXT_SWIZ_COMP_EXPECTED .and comma .and\n"
+" extSwizComp .error EXT_SWIZ_COMP_EXPECTED .and comma .and\n"
+" extSwizComp .error EXT_SWIZ_COMP_EXPECTED;\n"
+"xyzwExtendedSwizzle\n"
+" xyzwExtSwizComp .and comma .and\n"
+" xyzwExtSwizComp .error EXT_SWIZ_COMP_EXPECTED .and comma .and\n"
+" xyzwExtSwizComp .error EXT_SWIZ_COMP_EXPECTED .and comma .and\n"
+" xyzwExtSwizComp .error EXT_SWIZ_COMP_EXPECTED;\n"
+"rgbaExtendedSwizzle\n"
+" rgbaExtSwizComp .and comma .and\n"
+" rgbaExtSwizComp .error EXT_SWIZ_COMP_EXPECTED .and comma .and\n"
+" rgbaExtSwizComp .error EXT_SWIZ_COMP_EXPECTED .and comma .and\n"
+" rgbaExtSwizComp .error EXT_SWIZ_COMP_EXPECTED;\n"
+"xyzwExtSwizComp\n"
+" optionalSign .and xyzwExtSwizSel;\n"
+"rgbaExtSwizComp\n"
+" optionalSign .and rgbaExtSwizSel;\n"
+"extSwizComp\n"
+" optionalSign .and extSwizSel;\n"
+"xyzwExtSwizSel\n"
+" \"0\" .emit COMPONENT_0 .or \"1\" .emit COMPONENT_1 .or xyzwComponent_single;\n"
+"rgbaExtSwizSel\n"
+" \"0\" .emit COMPONENT_0 .or \"1\" .emit COMPONENT_1 .or rgbaComponent_single;\n"
+"extSwizSel\n"
+" \"0\" .emit COMPONENT_0 .or \"1\" .emit COMPONENT_1 .or vp_component_single;\n"
+"fp_srcReg\n"
+" fp_srcReg_1 .error SOURCE_REGISTER_EXPECTED;\n"
+"vp_srcReg\n"
+" vp_srcReg_1 .error SOURCE_REGISTER_EXPECTED;\n"
+"fp_srcReg_1\n"
+" fragmentAttribReg .emit REGISTER_ATTRIB .or\n"
+" fp_progParamReg .emit REGISTER_PARAM .or\n"
+" fp_temporaryReg .emit REGISTER_ESTABLISHED_NAME;\n"
+"vp_srcReg_1\n"
+" vertexAttribReg .emit REGISTER_ATTRIB .or\n"
+" vp_progParamReg .emit REGISTER_PARAM .or\n"
+" vp_temporaryReg .emit REGISTER_ESTABLISHED_NAME;\n"
+"fp_dstReg\n"
+" fp_dstReg_1 .error DESTINATION_REGISTER_EXPECTED;\n"
+"vp_dstReg\n"
+" vp_dstReg_1 .error DESTINATION_REGISTER_EXPECTED;\n"
+"fp_dstReg_1\n"
+" fragmentResultReg .emit REGISTER_RESULT .or\n"
+" fp_temporaryReg .emit REGISTER_ESTABLISHED_NAME;\n"
+"vp_dstReg_1\n"
+" vertexResultReg .emit REGISTER_RESULT .or\n"
+" vp_temporaryReg .emit REGISTER_ESTABLISHED_NAME;\n"
+"fragmentAttribReg\n"
+" fragAttribBinding;\n"
+"vertexAttribReg\n"
+" vtxAttribBinding;\n"
+"fp_temporaryReg\n"
+" fp_establishedName;\n"
+"vp_temporaryReg\n"
+" vp_establishedName;\n"
+"fp_progParamReg\n"
+" fp_paramSingleItemUse .or fp_progParamReg_1;\n"
+"vp_progParamReg\n"
+" vp_paramSingleItemUse .or vp_progParamReg_1;\n"
+"fp_progParamReg_1\n"
+" fp_progParamArray .emit PARAM_ARRAY_ELEMENT .and lbracket_ne .and progParamArrayAbs .and\n"
+" rbracket;\n"
+"vp_progParamReg_1\n"
+" vp_progParamArray .emit PARAM_ARRAY_ELEMENT .and lbracket_ne .and progParamArrayMem .and\n"
+" rbracket;\n"
+"fp_progParamArray\n"
+" fp_establishedName;\n"
+"vp_progParamArray\n"
+" vp_establishedName;\n"
+"progParamArrayMem\n"
+" progParamArrayAbs .or progParamArrayRel;\n"
+"progParamArrayAbs\n"
+" integer_ne .emit ARRAY_INDEX_ABSOLUTE;\n"
+"progParamArrayRel\n"
+" addrReg .emit ARRAY_INDEX_RELATIVE .and addrComponent .and addrRegRelOffset;\n"
+"addrRegRelOffset\n"
+" addrRegRelOffset_1 .or addrRegRelOffset_2 .or .true .emit 0x00;\n"
+"addrRegRelOffset_1\n"
+" plus_ne .and addrRegPosOffset;\n"
+"addrRegRelOffset_2\n"
+" minus_ne .and addrRegNegOffset;\n"
+"addrRegPosOffset\n"
+" integer_0_63;\n"
+"addrRegNegOffset\n"
+" integer_0_64;\n"
+"fragmentResultReg\n"
+" fp_resultBinding;\n"
+"vertexResultReg\n"
+" vp_resultBinding;\n"
+"addrReg\n"
+" vp_establishedName;\n"
+"addrComponent\n"
+" dot .and \"x\" .error INVALID_ADDRESS_COMPONENT .emit COMPONENT_X .emit COMPONENT_X\n"
+" .emit COMPONENT_X .emit COMPONENT_X;\n"
+"addrWriteMask\n"
+" dot .and \"x\" .error INVALID_ADDRESS_WRITEMASK .emit 0x08;\n"
+"fp_scalarSuffix\n"
+" dot .and fp_component_single .error INVALID_COMPONENT;\n"
+"vp_scalarSuffix\n"
+" dot .and vp_component_single .error INVALID_COMPONENT;\n"
+"swizzleSuffix\n"
+" swizzleSuffix_1 .or .true .emit COMPONENT_X .emit COMPONENT_Y .emit COMPONENT_Z\n"
+" .emit COMPONENT_W;\n"
+"swizzleSuffix_1\n"
+" dot_ne .and swizzleSuffix_2 .error INVALID_SUFFIX;\n"
+"swizzleSuffix_2\n"
+" swizzleSuffix_3 .or swizzleSuffix_4;\n"
+"swizzleSuffix_3\n"
+" vp_component_multi .and vp_component_multi .and vp_component_multi .error INVALID_COMPONENT .and\n"
+" vp_component_multi .error INVALID_COMPONENT;\n"
+"swizzleSuffix_4\n"
+" \"x\" .emit COMPONENT_X .emit COMPONENT_X .emit COMPONENT_X .emit COMPONENT_X .or\n"
+" \"y\" .emit COMPONENT_Y .emit COMPONENT_Y .emit COMPONENT_Y .emit COMPONENT_Y .or\n"
+" \"z\" .emit COMPONENT_Z .emit COMPONENT_Z .emit COMPONENT_Z .emit COMPONENT_Z .or\n"
+" \"w\" .emit COMPONENT_W .emit COMPONENT_W .emit COMPONENT_W .emit COMPONENT_W;\n"
+"optionalSuffix\n"
+" optionalSuffix_1 .or .true .emit COMPONENT_X .emit COMPONENT_Y .emit COMPONENT_Z\n"
+" .emit COMPONENT_W;\n"
+"optionalSuffix_1\n"
+" dot_ne .and optionalSuffix_2 .error INVALID_SUFFIX;\n"
+"optionalSuffix_2\n"
+" optionalSuffix_3 .or optionalSuffix_4 .or optionalSuffix_5;\n"
+"optionalSuffix_3\n"
+" xyzwComponent_multi .and xyzwComponent_multi .and\n"
+" xyzwComponent_multi .error INVALID_COMPONENT .and xyzwComponent_multi .error INVALID_COMPONENT;\n"
+"optionalSuffix_4\n"
+" rgbaComponent_multi .and rgbaComponent_multi .and\n"
+" rgbaComponent_multi .error INVALID_COMPONENT .and rgbaComponent_multi .error INVALID_COMPONENT;\n"
+"optionalSuffix_5\n"
+" \"x\" .emit COMPONENT_X .emit COMPONENT_X .emit COMPONENT_X .emit COMPONENT_X .or\n"
+" \"y\" .emit COMPONENT_Y .emit COMPONENT_Y .emit COMPONENT_Y .emit COMPONENT_Y .or\n"
+" \"z\" .emit COMPONENT_Z .emit COMPONENT_Z .emit COMPONENT_Z .emit COMPONENT_Z .or\n"
+" \"w\" .emit COMPONENT_W .emit COMPONENT_W .emit COMPONENT_W .emit COMPONENT_W .or\n"
+" \"r\" .emit COMPONENT_X .emit COMPONENT_X .emit COMPONENT_X .emit COMPONENT_X .or\n"
+" \"g\" .emit COMPONENT_Y .emit COMPONENT_Y .emit COMPONENT_Y .emit COMPONENT_Y .or\n"
+" \"b\" .emit COMPONENT_Z .emit COMPONENT_Z .emit COMPONENT_Z .emit COMPONENT_Z .or\n"
+" \"a\" .emit COMPONENT_W .emit COMPONENT_W .emit COMPONENT_W .emit COMPONENT_W;\n"
+"fp_component_single\n"
+" xyzwComponent_single .or rgbaComponent_single;\n"
+"vp_component_multi\n"
+" 'x' .emit COMPONENT_X .or 'y' .emit COMPONENT_Y .or 'z' .emit COMPONENT_Z .or\n"
+" 'w' .emit COMPONENT_W;\n"
+"vp_component_single\n"
+" \"x\" .emit COMPONENT_X .or \"y\" .emit COMPONENT_Y .or \"z\" .emit COMPONENT_Z .or\n"
+" \"w\" .emit COMPONENT_W;\n"
+"xyzwComponent_multi\n"
+" 'x' .emit COMPONENT_X .or 'y' .emit COMPONENT_Y .or 'z' .emit COMPONENT_Z .or\n"
+" 'w' .emit COMPONENT_W;\n"
+"xyzwComponent_single\n"
+" \"x\" .emit COMPONENT_X .or \"y\" .emit COMPONENT_Y .or \"z\" .emit COMPONENT_Z .or\n"
+" \"w\" .emit COMPONENT_W;\n"
+"rgbaComponent_multi\n"
+" 'r' .emit COMPONENT_X .or 'g' .emit COMPONENT_Y .or 'b' .emit COMPONENT_Z .or\n"
+" 'a' .emit COMPONENT_W;\n"
+"rgbaComponent_single\n"
+" \"r\" .emit COMPONENT_X .or \"g\" .emit COMPONENT_Y .or \"b\" .emit COMPONENT_Z .or\n"
+" \"a\" .emit COMPONENT_W;\n"
+"fp_optionalMask\n"
+" xyzwMask .or rgbaMask .or .true .emit 0x0F;\n"
+"vp_optionalMask\n"
+" xyzwMask .or .true .emit 0x0F;\n"
+"xyzwMask\n"
+" dot_ne .and xyzwMask_1 .error INVALID_WRITEMASK;\n"
+"xyzwMask_1\n"
+" \"xyzw\" .emit 0x0F .or \"xyz\" .emit 0x0E .or \"xyw\" .emit 0x0D .or \"xy\" .emit 0x0C .or\n"
+" \"xzw\" .emit 0x0B .or \"xz\" .emit 0x0A .or \"xw\" .emit 0x09 .or \"x\" .emit 0x08 .or\n"
+" \"yzw\" .emit 0x07 .or \"yz\" .emit 0x06 .or \"yw\" .emit 0x05 .or \"y\" .emit 0x04 .or\n"
+" \"zw\" .emit 0x03 .or \"z\" .emit 0x02 .or \"w\" .emit 0x01;\n"
+"rgbaMask\n"
+" dot_ne .and rgbaMask_1 .error INVALID_WRITEMASK;\n"
+"rgbaMask_1\n"
+" \"rgba\" .emit 0x0F .or \"rgb\" .emit 0x0E .or \"rga\" .emit 0x0D .or \"rg\" .emit 0x0C .or\n"
+" \"rba\" .emit 0x0B .or \"rb\" .emit 0x0A .or \"ra\" .emit 0x09 .or \"r\" .emit 0x08 .or\n"
+" \"gba\" .emit 0x07 .or \"gb\" .emit 0x06 .or \"ga\" .emit 0x05 .or \"g\" .emit 0x04 .or\n"
+" \"ba\" .emit 0x03 .or \"b\" .emit 0x02 .or \"a\" .emit 0x01;\n"
+"fp_namingStatement\n"
+" fp_ATTRIB_statement .emit ATTRIB .or\n"
+" fp_PARAM_statement .emit PARAM .or\n"
+" fp_TEMP_statement .emit TEMP .or\n"
+" fp_OUTPUT_statement .emit OUTPUT .or\n"
+" fp_ALIAS_statement .emit ALIAS;\n"
+"vp_namingStatement\n"
+" vp_ATTRIB_statement .emit ATTRIB .or\n"
+" vp_PARAM_statement .emit PARAM .or\n"
+" vp_TEMP_statement .emit TEMP .or\n"
+" ADDRESS_statement .emit ADDRESS .or\n"
+" vp_OUTPUT_statement .emit OUTPUT .or\n"
+" vp_ALIAS_statement .emit ALIAS;\n"
+"fp_ATTRIB_statement\n"
+" \"ATTRIB\" .and space .and fp_establishName .and equal .and\n"
+" fragAttribBinding .error FRAGMENT_EXPECTED;\n"
+"vp_ATTRIB_statement\n"
+" \"ATTRIB\" .and space .and vp_establishName .and equal .and\n"
+" vtxAttribBinding .error VERTEX_EXPECTED;\n"
+"fragAttribBinding\n"
+" \"fragment\" .and dot .and fragAttribItem .error INVALID_FRAGMENT_PROPERTY;\n"
+"vtxAttribBinding\n"
+" \"vertex\" .and dot .and vtxAttribItem .error INVALID_VERTEX_PROPERTY;\n"
+"fragAttribItem\n"
+" fragAttribItem_1 .emit FRAGMENT_ATTRIB_COLOR .or\n"
+" fragAttribItem_2 .emit FRAGMENT_ATTRIB_TEXCOORD .or\n"
+" \"fogcoord\" .emit FRAGMENT_ATTRIB_FOGCOORD .or\n"
+" \"position\" .emit FRAGMENT_ATTRIB_POSITION;\n"
+"fragAttribItem_1\n"
+" \"color\" .and optColorType;\n"
+"fragAttribItem_2\n"
+" \"texcoord\" .and optTexCoordNum;\n"
+"vtxAttribItem\n"
+" \"position\" .emit VERTEX_ATTRIB_POSITION .or\n"
+" vtxAttribItem_1 .emit VERTEX_ATTRIB_WEIGHT .or\n"
+" \"normal\" .emit VERTEX_ATTRIB_NORMAL .or\n"
+" vtxAttribItem_2 .emit VERTEX_ATTRIB_COLOR .or\n"
+" \"fogcoord\" .emit VERTEX_ATTRIB_FOGCOORD .or\n"
+" vtxAttribItem_3 .emit VERTEX_ATTRIB_TEXCOORD .or\n"
+" vtxAttribItem_4 .emit VERTEX_ATTRIB_MATRIXINDEX .or\n"
+" vtxAttribItem_5 .emit VERTEX_ATTRIB_GENERIC;\n"
+"vtxAttribItem_1\n"
+" \"weight\" .and vtxOptWeightNum;\n"
+"vtxAttribItem_2\n"
+" \"color\" .and optColorType;\n"
+"vtxAttribItem_3\n"
+" \"texcoord\" .and optTexCoordNum;\n"
+"vtxAttribItem_4\n"
+" \"matrixindex\" .and lbracket .and vtxWeightNum .and rbracket;\n"
+"vtxAttribItem_5\n"
+" \"attrib\" .and lbracket .and vtxAttribNum .and rbracket;\n"
+"vtxAttribNum\n"
+" integer;\n"
+"vtxOptWeightNum\n"
+" vtxOptWeightNum_1 .or .true .emit 0x00;\n"
+"vtxOptWeightNum_1\n"
+" lbracket_ne .and vtxWeightNum .and rbracket;\n"
+"vtxWeightNum\n"
+" integer;\n"
+"fp_PARAM_statement\n"
+" fp_PARAM_multipleStmt .or fp_PARAM_singleStmt;\n"
+"vp_PARAM_statement\n"
+" vp_PARAM_multipleStmt .or vp_PARAM_singleStmt;\n"
+"fp_PARAM_singleStmt\n"
+" \"PARAM\" .and space .and fp_establishName .and .true .emit 0x00 .and fp_paramSingleInit .and\n"
+" .true .emit PARAM_NULL;\n"
+"vp_PARAM_singleStmt\n"
+" \"PARAM\" .and space .and vp_establishName .and .true .emit 0x00 .and vp_paramSingleInit .and\n"
+" .true .emit PARAM_NULL;\n"
+"fp_PARAM_multipleStmt\n"
+" \"PARAM\" .and space .and fp_establishName .and lbracket_ne .and optArraySize .and rbracket .and\n"
+" fp_paramMultipleInit .and .true .emit PARAM_NULL;\n"
+"vp_PARAM_multipleStmt\n"
+" \"PARAM\" .and space .and vp_establishName .and lbracket_ne .and optArraySize .and rbracket .and\n"
+" vp_paramMultipleInit .and .true .emit PARAM_NULL;\n"
+"optArraySize\n"
+" optional_integer;\n"
+"fp_paramSingleInit\n"
+" equal .and fp_paramSingleItemDecl;\n"
+"vp_paramSingleInit\n"
+" equal .and vp_paramSingleItemDecl;\n"
+"fp_paramMultipleInit\n"
+" equal .and lbrace .and fp_paramMultInitList .and rbrace;\n"
+"vp_paramMultipleInit\n"
+" equal .and lbrace .and vp_paramMultInitList .and rbrace;\n"
+"fp_paramMultInitList\n"
+" fp_paramMultInitList_1 .or fp_paramMultipleItem;\n"
+"vp_paramMultInitList\n"
+" vp_paramMultInitList_1 .or vp_paramMultipleItem;\n"
+"fp_paramMultInitList_1\n"
+" fp_paramMultipleItem .and comma_ne .and fp_paramMultInitList;\n"
+"vp_paramMultInitList_1\n"
+" vp_paramMultipleItem .and comma_ne .and vp_paramMultInitList;\n"
+"fp_paramSingleItemDecl\n"
+" fp_stateSingleItem .emit PARAM_STATE_ELEMENT .or\n"
+" programSingleItem .emit PARAM_PROGRAM_ELEMENT .or\n"
+" paramConstDecl .emit PARAM_CONSTANT;\n"
+"vp_paramSingleItemDecl\n"
+" vp_stateSingleItem .emit PARAM_STATE_ELEMENT .or\n"
+" programSingleItem .emit PARAM_PROGRAM_ELEMENT .or\n"
+" paramConstDecl .emit PARAM_CONSTANT;\n"
+"fp_paramSingleItemUse\n"
+" fp_stateSingleItem .emit PARAM_STATE_ELEMENT .or\n"
+" programSingleItem .emit PARAM_PROGRAM_ELEMENT .or\n"
+" paramConstUse .emit PARAM_CONSTANT;\n"
+"vp_paramSingleItemUse\n"
+" vp_stateSingleItem .emit PARAM_STATE_ELEMENT .or\n"
+" programSingleItem .emit PARAM_PROGRAM_ELEMENT .or\n"
+" paramConstUse .emit PARAM_CONSTANT;\n"
+"fp_paramMultipleItem\n"
+" fp_stateMultipleItem .emit PARAM_STATE_ELEMENT .or\n"
+" programMultipleItem .emit PARAM_PROGRAM_ELEMENT .or\n"
+" paramConstDecl .emit PARAM_CONSTANT;\n"
+"vp_paramMultipleItem\n"
+" vp_stateMultipleItem .emit PARAM_STATE_ELEMENT .or\n"
+" programMultipleItem .emit PARAM_PROGRAM_ELEMENT .or\n"
+" paramConstDecl .emit PARAM_CONSTANT;\n"
+"fp_stateMultipleItem\n"
+" stateMultipleItem_1 .or fp_stateSingleItem;\n"
+"vp_stateMultipleItem\n"
+" stateMultipleItem_1 .or vp_stateSingleItem;\n"
+"stateMultipleItem_1\n"
+" \"state\" .and dot .and stateMatrixRows .emit STATE_MATRIX_ROWS;\n"
+"fp_stateSingleItem\n"
+" \"state\" .and dot .and fp_stateSingleItem_1 .error INVALID_STATE_PROPERTY;\n"
+"vp_stateSingleItem\n"
+" \"state\" .and dot .and vp_stateSingleItem_1 .error INVALID_STATE_PROPERTY;\n"
+"fp_stateSingleItem_1\n"
+" stateSingleItem_1 .or stateSingleItem_2 .or stateSingleItem_3 .or stateSingleItem_4 .or\n"
+" stateSingleItem_5 .or stateSingleItem_7 .or stateSingleItem_8 .or stateSingleItem_11;\n"
+"vp_stateSingleItem_1\n"
+" stateSingleItem_1 .or stateSingleItem_2 .or stateSingleItem_3 .or stateSingleItem_4 .or\n"
+" stateSingleItem_6 .or stateSingleItem_7 .or stateSingleItem_9 .or stateSingleItem_10 .or\n"
+" stateSingleItem_11;\n"
+"stateSingleItem_1\n"
+" stateMaterialItem .emit STATE_MATERIAL;\n"
+"stateSingleItem_2\n"
+" stateLightItem .emit STATE_LIGHT;\n"
+"stateSingleItem_3\n"
+" stateLightModelItem .emit STATE_LIGHT_MODEL;\n"
+"stateSingleItem_4\n"
+" stateLightProdItem .emit STATE_LIGHT_PROD;\n"
+"stateSingleItem_5\n"
+" stateTexEnvItem .emit STATE_TEX_ENV;\n"
+"stateSingleItem_6\n"
+" stateTexGenItem .emit STATE_TEX_GEN;\n"
+"stateSingleItem_7\n"
+" stateFogItem .emit STATE_FOG;\n"
+"stateSingleItem_8\n"
+" stateDepthItem .emit STATE_DEPTH;\n"
+"stateSingleItem_9\n"
+" stateClipPlaneItem .emit STATE_CLIP_PLANE;\n"
+"stateSingleItem_10\n"
+" statePointItem .emit STATE_POINT;\n"
+"stateSingleItem_11\n"
+" stateMatrixRow .emit STATE_MATRIX_ROWS;\n"
+"stateMaterialItem\n"
+" \"material\" .and optFaceType .and dot .and stateMatProperty .error INVALID_MATERIAL_PROPERTY;\n"
+"stateMatProperty\n"
+" \"ambient\" .emit MATERIAL_AMBIENT .or\n"
+" \"diffuse\" .emit MATERIAL_DIFFUSE .or\n"
+" \"specular\" .emit MATERIAL_SPECULAR .or\n"
+" \"emission\" .emit MATERIAL_EMISSION .or\n"
+" \"shininess\" .emit MATERIAL_SHININESS;\n"
+"stateLightItem\n"
+" \"light\" .and lbracket .and stateLightNumber .and rbracket .and dot .and\n"
+" stateLightProperty .error INVALID_LIGHT_PROPERTY;\n"
+"stateLightProperty\n"
+" \"ambient\" .emit LIGHT_AMBIENT .or\n"
+" \"diffuse\" .emit LIGHT_DIFFUSE .or\n"
+" \"specular\" .emit LIGHT_SPECULAR .or\n"
+" \"position\" .emit LIGHT_POSITION .or\n"
+" \"attenuation\" .emit LIGHT_ATTENUATION .or\n"
+" stateLightProperty_1 .emit LIGHT_SPOT_DIRECTION .or\n"
+" \"half\" .emit LIGHT_HALF;\n"
+"stateLightProperty_1\n"
+" \"spot\" .and dot .and stateSpotProperty .error INVALID_SPOT_PROPERTY;\n"
+"stateSpotProperty\n"
+" \"direction\";\n"
+"stateLightModelItem\n"
+" \"lightmodel\" .and stateLModProperty .error INVALID_LIGHTMODEL_PROPERTY;\n"
+"stateLModProperty\n"
+" stateLModProperty_1 .or stateLModProperty_2;\n"
+"stateLModProperty_1\n"
+" dot .and \"ambient\" .emit LIGHT_MODEL_AMBIENT;\n"
+"stateLModProperty_2\n"
+" stateLModProperty_2A .or stateLModProperty_2B .or stateLModProperty_2C;\n"
+"stateLModProperty_2A\n"
+" dot .and \"front\" .and dot .and \"scenecolor\" .emit LIGHT_MODEL_SCENECOLOR .emit FACE_FRONT;\n"
+"stateLModProperty_2B\n"
+" dot .and \"back\" .and dot .and \"scenecolor\" .emit LIGHT_MODEL_SCENECOLOR .emit FACE_BACK;\n"
+"stateLModProperty_2C\n"
+" dot .and \"scenecolor\" .emit LIGHT_MODEL_SCENECOLOR .emit FACE_FRONT;\n"
+"stateLightProdItem\n"
+" \"lightprod\" .and lbracket .and stateLightNumber .and rbracket .and optFaceType .and dot .and\n"
+" stateLProdProperty .error INVALID_LIGHTPROD_PROPERTY;\n"
+"stateLProdProperty\n"
+" \"ambient\" .emit LIGHT_PROD_AMBIENT .or\n"
+" \"diffuse\" .emit LIGHT_PROD_DIFFUSE .or\n"
+" \"specular\" .emit LIGHT_PROD_SPECULAR;\n"
+"stateLightNumber\n"
+" integer;\n"
+"stateTexEnvItem\n"
+" \"texenv\" .and optLegacyTexUnitNum .and dot .and\n"
+" stateTexEnvProperty .error INVALID_TEXENV_PROPERTY;\n"
+"stateTexEnvProperty\n"
+" \"color\" .emit TEX_ENV_COLOR;\n"
+"optLegacyTexUnitNum\n"
+" lbracket_ne .and legacyTexUnitNum .and rbracket;\n"
+"legacyTexUnitNum\n"
+" integer;\n"
+"stateTexGenItem\n"
+" \"texgen\" .and optTexCoordNum .and dot .and stateTexGenType .error INVALID_TEXGEN_PROPERTY .and\n"
+" dot .and stateTexGenCoord .error INVALID_TEXGEN_COORD;\n"
+"stateTexGenType\n"
+" \"eye\" .emit TEX_GEN_EYE .or\n"
+" \"object\" .emit TEX_GEN_OBJECT;\n"
+"stateTexGenCoord\n"
+" \"s\" .emit COMPONENT_X .or\n"
+" \"t\" .emit COMPONENT_Y .or\n"
+" \"r\" .emit COMPONENT_Z .or\n"
+" \"q\" .emit COMPONENT_W;\n"
+"stateFogItem\n"
+" \"fog\" .and dot .and stateFogProperty .error INVALID_FOG_PROPERTY;\n"
+"stateFogProperty\n"
+" \"color\" .emit FOG_COLOR .or\n"
+" \"params\" .emit FOG_PARAMS;\n"
+"stateDepthItem\n"
+" \"depth\" .and dot .and stateDepthProperty .error INVALID_DEPTH_PROPERTY;\n"
+"stateDepthProperty\n"
+" \"range\" .emit DEPTH_RANGE;\n"
+"stateClipPlaneItem\n"
+" \"clip\" .and lbracket .and stateClipPlaneNum .and rbracket .and dot .and\n"
+" \"plane\" .error INVALID_CLIPPLANE_PROPERTY;\n"
+"stateClipPlaneNum\n"
+" integer;\n"
+"statePointItem\n"
+" \"point\" .and dot .and statePointProperty .error INVALID_POINT_PROPERTY;\n"
+"statePointProperty\n"
+" \"size\" .emit POINT_SIZE .or\n"
+" \"attenuation\" .emit POINT_ATTENUATION;\n"
+"stateMatrixRow\n"
+" stateMatrixItem .and dot .and \"row\" .error MATRIX_ROW_SELECTOR_OR_MODIFIER_EXPECTED .and\n"
+" lbracket .and stateMatrixRowNum .and rbracket .emit 0x0;\n"
+"stateMatrixRows\n"
+" stateMatrixItem .and optMatrixRows;\n"
+"optMatrixRows\n"
+" optMatrixRows_1 .or .true .emit 0x0 .emit '3' .emit 0x0 .emit $;\n"
+"optMatrixRows_1\n"
+" dot_ne .and \"row\" .error MATRIX_ROW_SELECTOR_OR_MODIFIER_EXPECTED .and lbracket .and\n"
+" stateMatrixRowNum .and dotdot .and stateMatrixRowNum .and rbracket;\n"
+"stateMatrixItem\n"
+" \"matrix\" .and dot .and stateMatrixName .error INVALID_MATRIX_NAME .and stateOptMatModifier;\n"
+"stateOptMatModifier\n"
+" stateOptMatModifier_1 .or .true .emit MATRIX_MODIFIER_IDENTITY;\n"
+"stateOptMatModifier_1\n"
+" dot_ne .and stateMatModifier;\n"
+"stateMatModifier\n"
+" \"inverse\" .emit MATRIX_MODIFIER_INVERSE .or\n"
+" \"transpose\" .emit MATRIX_MODIFIER_TRANSPOSE .or\n"
+" \"invtrans\" .emit MATRIX_MODIFIER_INVTRANS;\n"
+"stateMatrixRowNum\n"
+" integer_0_3;\n"
+"stateMatrixName\n"
+" stateMatrixName_1_1 .emit MATRIX_MODELVIEW .or\n"
+" \"projection\" .emit MATRIX_PROJECTION .or\n"
+" \"mvp\" .emit MATRIX_MVP .or\n"
+" stateMatrixName_1_2 .emit MATRIX_TEXTURE .or\n"
+" stateMatrixName_1_3 .emit MATRIX_PALETTE .or\n"
+" stateMatrixName_1_4 .emit MATRIX_PROGRAM;\n"
+"stateMatrixName_1_1\n"
+" \"modelview\" .and stateOptModMatNum;\n"
+"stateMatrixName_1_2\n"
+" \"texture\" .and optTexCoordNum;\n"
+"stateMatrixName_1_3\n"
+" \"palette\" .and lbracket .and statePaletteMatNum .and rbracket;\n"
+"stateMatrixName_1_4\n"
+" \"program\" .and lbracket .and stateProgramMatNum .and rbracket;\n"
+"stateOptModMatNum\n"
+" stateOptModMatNum_1 .or .true .emit 0x00;\n"
+"stateOptModMatNum_1\n"
+" lbracket_ne .and stateModMatNum .and rbracket;\n"
+"stateModMatNum\n"
+" integer;\n"
+"optTexCoordNum\n"
+" optTexCoordNum_1 .or .true .emit 0x00;\n"
+"optTexCoordNum_1\n"
+" lbracket_ne .and texCoordNum .and rbracket;\n"
+"texCoordNum\n"
+" integer;\n"
+"statePaletteMatNum\n"
+" integer;\n"
+"stateProgramMatNum\n"
+" integer;\n"
+"programSingleItem\n"
+" \"program\" .and dot .and programSingleItem_1 .error INVALID_PROGRAM_PROPERTY;\n"
+"programSingleItem_1\n"
+" progEnvParam .or progLocalParam;\n"
+"programMultipleItem\n"
+" \"program\" .and dot .and programMultipleItem_1 .error INVALID_PROGRAM_PROPERTY;\n"
+"programMultipleItem_1\n"
+" progEnvParams .or progLocalParams;\n"
+"progEnvParams\n"
+" \"env\" .emit PROGRAM_PARAM_ENV .and lbracket .and progEnvParamNums .and rbracket;\n"
+"progEnvParamNums\n"
+" progEnvParamNums_1 .or progEnvParamNums_2;\n"
+"progEnvParamNums_1\n"
+" progEnvParamNum .and dotdot_ne .and progEnvParamNum;\n"
+"progEnvParamNums_2\n"
+" progEnvParamNum .and .true .emit 0x00;\n"
+"progEnvParam\n"
+" \"env\" .emit PROGRAM_PARAM_ENV .and lbracket .and progEnvParamNum .and rbracket .emit 0x00;\n"
+"progLocalParams\n"
+" \"local\" .emit PROGRAM_PARAM_LOCAL .and lbracket .and progLocalParamNums .and rbracket;\n"
+"progLocalParamNums\n"
+" progLocalParamNums_1 .or progLocalParamNums_2;\n"
+"progLocalParamNums_1\n"
+" progLocalParamNum .and dotdot_ne .and progLocalParamNum;\n"
+"progLocalParamNums_2\n"
+" progLocalParamNum .and .true .emit 0x00;\n"
+"progLocalParam\n"
+" \"local\" .emit PROGRAM_PARAM_LOCAL .and lbracket .and progLocalParamNum .and rbracket .emit 0x00;\n"
+"progEnvParamNum\n"
+" integer;\n"
+"progLocalParamNum\n"
+" integer;\n"
+"paramConstDecl\n"
+" paramConstScalarDecl .emit CONSTANT_SCALAR .or paramConstVector .emit CONSTANT_VECTOR;\n"
+"paramConstUse\n"
+" paramConstScalarUse .emit CONSTANT_SCALAR .or paramConstVector .emit CONSTANT_VECTOR;\n"
+"paramConstScalarDecl\n"
+" signedFloatConstant;\n"
+"paramConstScalarUse\n"
+" floatConstant;\n"
+"paramConstVector\n"
+" paramConstVector_4 .emit 0x04 .or paramConstVector_3 .emit 0x03 .or\n"
+" paramConstVector_2 .emit 0x02 .or paramConstVector_1 .emit 0x01;\n"
+"paramConstVector_1\n"
+" lbrace_ne .and signedFloatConstant .and rbrace;\n"
+"paramConstVector_2\n"
+" lbrace_ne .and signedFloatConstant .and comma_ne .and signedFloatConstant .and rbrace;\n"
+"paramConstVector_3\n"
+" lbrace_ne .and signedFloatConstant .and comma_ne .and signedFloatConstant .and comma_ne .and\n"
+" signedFloatConstant .and rbrace;\n"
+"paramConstVector_4\n"
+" lbrace_ne .and signedFloatConstant .and comma_ne .and signedFloatConstant .and comma_ne .and\n"
+" signedFloatConstant .and comma_ne .and signedFloatConstant .and rbrace;\n"
+"signedFloatConstant\n"
+" optionalSign .and floatConstant;\n"
+"floatConstant\n"
+" float;\n"
+"optionalSign\n"
+" optional_sign_ne;\n"
+"fp_TEMP_statement\n"
+" \"TEMP\" .and space .and fp_varNameList .and .true .emit 0x00;\n"
+"vp_TEMP_statement\n"
+" \"TEMP\" .and space .and vp_varNameList .and .true .emit 0x00;\n"
+"ADDRESS_statement\n"
+" \"ADDRESS\" .and space .and vp_varNameList .and .true .emit 0x00;\n"
+"fp_varNameList\n"
+" fp_varNameList_1 .or fp_establishName;\n"
+"vp_varNameList\n"
+" vp_varNameList_1 .or vp_establishName;\n"
+"fp_varNameList_1\n"
+" fp_establishName .and comma_ne .and fp_varNameList;\n"
+"vp_varNameList_1\n"
+" vp_establishName .and comma_ne .and vp_varNameList;\n"
+"fp_OUTPUT_statement\n"
+" \"OUTPUT\" .and space .and fp_establishName .and equal .and\n"
+" fp_resultBinding .error RESULT_EXPECTED;\n"
+"vp_OUTPUT_statement\n"
+" \"OUTPUT\" .and space .and vp_establishName .and equal .and\n"
+" vp_resultBinding .error RESULT_EXPECTED;\n"
+"fp_resultBinding\n"
+" \"result\" .and dot .and fp_resultBinding_1 .error INVALID_RESULT_PROPERTY;\n"
+"vp_resultBinding\n"
+" \"result\" .and dot .and vp_resultBinding_1 .error INVALID_RESULT_PROPERTY;\n"
+"fp_resultBinding_1\n"
+" \"color\" .emit FRAGMENT_RESULT_COLOR .or\n"
+" \"depth\" .emit FRAGMENT_RESULT_DEPTH;\n"
+"vp_resultBinding_1\n"
+" \"position\" .emit VERTEX_RESULT_POSITION .or\n"
+" resultColBinding .emit VERTEX_RESULT_COLOR .or\n"
+" \"fogcoord\" .emit VERTEX_RESULT_FOGCOORD .or\n"
+" \"pointsize\" .emit VERTEX_RESULT_POINTSIZE .or\n"
+" vp_resultBinding_2 .emit VERTEX_RESULT_TEXCOORD;\n"
+"vp_resultBinding_2\n"
+" \"texcoord\" .and optTexCoordNum;\n"
+"resultColBinding\n"
+" \"color\" .and optFaceType .and optColorType;\n"
+"optFaceType\n"
+" FaceType .or .true .emit FACE_FRONT;\n"
+"FaceType\n"
+" dot_ne .and FaceProperty;\n"
+"FaceProperty\n"
+" \"front\" .emit FACE_FRONT .or \"back\" .emit FACE_BACK;\n"
+"optColorType\n"
+" ColorType .or .true .emit COLOR_PRIMARY;\n"
+"ColorType\n"
+" dot_ne .and ColorProperty;\n"
+"ColorProperty\n"
+" \"primary\" .emit COLOR_PRIMARY .or \"secondary\" .emit COLOR_SECONDARY;\n"
+"fp_ALIAS_statement\n"
+" \"ALIAS\" .and space .and fp_establishName .and equal .and fp_establishedName;\n"
+"vp_ALIAS_statement\n"
+" \"ALIAS\" .and space .and vp_establishName .and equal .and vp_establishedName;\n"
+"fp_establishName\n"
+" fp_identifier;\n"
+"vp_establishName\n"
+" vp_identifier;\n"
+"fp_establishedName\n"
+" fp_identifier;\n"
+"vp_establishedName\n"
+" vp_identifier;\n"
+"fp_identifier\n"
+" fp_not_reserved_identifier .and identifier_ne .error IDENTIFIER_EXPECTED;\n"
+"vp_identifier\n"
+" vp_not_reserved_identifier .and identifier_ne .error IDENTIFIER_EXPECTED;\n"
+"fp_not_reserved_identifier\n"
+" fp_not_reserved_identifier_1 .or .true;\n"
+"fp_not_reserved_identifier_1\n"
+" fp_reserved_identifier .and .false .error RESERVED_KEYWORD;\n"
+"vp_not_reserved_identifier\n"
+" vp_not_reserved_identifier_1 .or .true;\n"
+"vp_not_reserved_identifier_1\n"
+" vp_reserved_identifier .and .false .error RESERVED_KEYWORD;\n"
+"fp_reserved_identifier\n"
+" \"ABS\" .or \"ABS_SAT\" .or \"ADD\" .or \"ADD_SAT\" .or \"ALIAS\" .or \"ATTRIB\" .or \"CMP\" .or \"CMP_SAT\" .or\n"
+" \"COS\" .or \"COS_SAT\" .or \"DP3\" .or \"DP3_SAT\" .or \"DP4\" .or \"DP4_SAT\" .or \"DPH\" .or \"DPH_SAT\" .or\n"
+" \"DST\" .or \"DST_SAT\" .or \"END\" .or \"EX2\" .or \"EX2_SAT\" .or \"FLR\" .or \"FLR_SAT\" .or \"FRC\" .or\n"
+" \"FRC_SAT\" .or \"KIL\" .or \"LG2\" .or \"LG2_SAT\" .or \"LIT\" .or \"LIT_SAT\" .or \"LRP\" .or \"LRP_SAT\" .or\n"
+" \"MAD\" .or \"MAD_SAT\" .or \"MAX\" .or \"MAX_SAT\" .or \"MIN\" .or \"MIN_SAT\" .or \"MOV\" .or \"MOV_SAT\" .or\n"
+" \"MUL\" .or \"MUL_SAT\" .or \"OPTION\" .or \"OUTPUT\" .or \"PARAM\" .or \"POW\" .or \"POW_SAT\" .or \"RCP\" .or\n"
+" \"RCP_SAT\" .or \"RSQ\" .or \"RSQ_SAT\" .or \"SIN\" .or \"SIN_SAT\" .or \"SCS\" .or \"SCS_SAT\" .or \"SGE\" .or\n"
+" \"SGE_SAT\" .or \"SLT\" .or \"SLT_SAT\" .or \"SUB\" .or \"SUB_SAT\" .or \"SWZ\" .or \"SWZ_SAT\" .or \"TEMP\" .or\n"
+" \"TEX\" .or \"TEX_SAT\" .or \"TXB\" .or \"TXB_SAT\" .or \"TXP\" .or \"TXP_SAT\" .or \"XPD\" .or \"XPD_SAT\" .or\n"
+" \"fragment\" .or \"program\" .or \"result\" .or \"state\" .or \"texture\";\n"
+"vp_reserved_identifier\n"
+" \"ABS\" .or \"ADD\" .or \"ADDRESS\" .or \"ALIAS\" .or \"ARL\" .or \"ATTRIB\" .or \"DP3\" .or \"DP4\" .or\n"
+" \"DPH\" .or \"DST\" .or \"END\" .or \"EX2\" .or \"EXP\" .or \"FLR\" .or \"FRC\" .or \"LG2\" .or \"LIT\" .or\n"
+" \"LOG\" .or \"MAD\" .or \"MAX\" .or \"MIN\" .or \"MOV\" .or \"MUL\" .or \"OPTION\" .or \"OUTPUT\" .or\n"
+" \"PARAM\" .or \"POW\" .or \"RCP\" .or \"RSQ\" .or \"SGE\" .or \"SLT\" .or \"SUB\" .or \"SWZ\" .or \"TEMP\" .or\n"
+" \"XPD\" .or \"program\" .or \"result\" .or \"state\" .or \"vertex\";\n"
+"integer\n"
+" integer_ne .error INTEGER_EXPECTED;\n"
+"zero\n"
+" '0';\n"
+"leading_zeroes\n"
+" .loop zero;\n"
+"no_digit\n"
+" no_digit_1 .or .true;\n"
+"no_digit_1\n"
+" digit10 .and .false .error INTEGER_OUT_OF_RANGE;\n"
+"all_zeroes\n"
+" all_zeroes_1 .or no_digit_1;\n"
+"all_zeroes_1\n"
+" '0' .and .loop zero .and no_digit;\n"
+"integer_0_3\n"
+" integer_0_3_1 .error INTEGER_EXPECTED .and .true .emit 0x00 .emit $;\n"
+"integer_0_3_1\n"
+" integer_0_3_2 .or all_zeroes .emit '0';\n"
+"integer_0_3_2 \n"
+" leading_zeroes .and '1'-'3' .emit * .and no_digit;\n"
+"integer_0_63\n"
+" integer_0_63_1 .error INTEGER_EXPECTED .and .true .emit 0x00 .emit $;\n"
+"integer_0_63_1\n"
+" integer_0_63_2 .or integer_0_63_3 .or integer_0_63_4 .or integer_0_63_5 .or\n"
+" all_zeroes .emit '0';\n"
+"integer_0_63_2 \n"
+" leading_zeroes .and '7'-'9' .emit * .and no_digit;\n"
+"integer_0_63_3 \n"
+" leading_zeroes .and '1'-'5' .emit * .and '0'-'9' .emit * .and no_digit;\n"
+"integer_0_63_4 \n"
+" leading_zeroes .and '6' .emit * .and '0'-'3' .emit * .and no_digit;\n"
+"integer_0_63_5 \n"
+" leading_zeroes .and '1'-'6' .emit * .and no_digit;\n"
+"integer_0_64\n"
+" integer_0_64_1 .error INTEGER_EXPECTED .and .true .emit 0x00 .emit $;\n"
+"integer_0_64_1\n"
+" integer_0_64_2 .or integer_0_64_3 .or integer_0_64_4 .or integer_0_64_5 .or\n"
+" all_zeroes .emit '0';\n"
+"integer_0_64_2 \n"
+" leading_zeroes .and '7'-'9' .emit * .and no_digit;\n"
+"integer_0_64_3 \n"
+" leading_zeroes .and '1'-'5' .emit * .and '0'-'9' .emit * .and no_digit;\n"
+"integer_0_64_4 \n"
+" leading_zeroes .and '6' .emit * .and '0'-'4' .emit * .and no_digit;\n"
+"integer_0_64_5 \n"
+" leading_zeroes .and '1'-'6' .emit * .and no_digit;\n"
+"optional_space\n"
+" space .or .true;\n"
+"space\n"
+" single_space .and .loop single_space;\n"
+"single_space\n"
+" white_char .or comment_block;\n"
+"white_char\n"
+" ' ' .or '\\t' .or '\\n' .or '\\r';\n"
+"comment_block\n"
+" '#' .and .loop comment_char .and new_line;\n"
+"comment_char\n"
+" '\\x0E'-'\\xFF' .or '\\x01'-'\\x09' .or '\\x0B'-'\\x0C';\n"
+"new_line\n"
+" '\\n' .or crlf .or '\\0';\n"
+"crlf\n"
+" '\\r' .and '\\n';\n"
+"semicolon\n"
+" optional_space .and ';' .error MISSING_SEMICOLON .and optional_space;\n"
+"comma\n"
+" optional_space .and ',' .error MISSING_COMMA .and optional_space;\n"
+"comma_ne\n"
+" optional_space .and ',' .and optional_space;\n"
+"lbracket\n"
+" optional_space .and '[' .error MISSING_LBRACKET .and optional_space;\n"
+"lbracket_ne\n"
+" optional_space .and '[' .and optional_space;\n"
+"rbracket\n"
+" optional_space .and ']' .error MISSING_RBRACKET .and optional_space;\n"
+"dot\n"
+" optional_space .and '.' .error MISSING_DOT .and optional_space;\n"
+"dot_ne\n"
+" optional_space .and '.' .and optional_space;\n"
+"equal\n"
+" optional_space .and '=' .error MISSING_EQUAL .and optional_space;\n"
+"lbrace\n"
+" optional_space .and '{' .error MISSING_LBRACE .and optional_space;\n"
+"lbrace_ne\n"
+" optional_space .and '{' .and optional_space;\n"
+"rbrace\n"
+" optional_space .and '}' .error MISSING_RBRACE .and optional_space;\n"
+"dotdot\n"
+" optional_space .and '.' .and '.' .error MISSING_DOTDOT .and optional_space;\n"
+"dotdot_ne\n"
+" optional_space .and '.' .and '.' .and optional_space;\n"
+"float\n"
+" float_1 .or float_2 .or float_legacy;\n"
+"float_1\n"
+" '.' .emit 0x00 .and integer_ne .error MISSING_FRACTION_OR_EXPONENT .and optional_exponent;\n"
+"float_2\n"
+" integer_ne .and float_3;\n"
+"float_3\n"
+" float_4 .or float_5;\n"
+"float_4\n"
+" '.' .and optional_integer .and optional_exponent;\n"
+"float_5\n"
+" exponent .emit 0x00;\n"
+"float_legacy\n"
+" integer_ne .and .true .emit 0x00 .emit 0x00;\n"
+"integer_ne\n"
+" integer_ne_1 .and .true .emit 0x00 .emit $;\n"
+"integer_ne_1\n"
+" digit10 .emit * .and .loop digit10 .emit *;\n"
+"optional_integer\n"
+" integer_ne .or .true .emit 0x00;\n"
+"optional_exponent\n"
+" exponent .or .true .emit 0x00;\n"
+"exponent\n"
+" exponent_1 .and optional_sign_ne .and integer_ne .error EXPONENT_VALUE_EXPECTED;\n"
+"exponent_1\n"
+" 'e' .or 'E';\n"
+"optional_sign_ne\n"
+" minus_ne .or plus_ne .or .true;\n"
+"plus_ne\n"
+" optional_space .and '+' .and optional_space;\n"
+"minus_ne\n"
+" optional_space .and '-' .emit '-' .and optional_space;\n"
+"identifier_ne\n"
+" first_idchar .emit * .and .loop follow_idchar .emit * .and .true .emit 0x00 .emit $;\n"
+"follow_idchar\n"
+" first_idchar .or digit10;\n"
+"first_idchar\n"
+" 'a'-'z' .or 'A'-'Z' .or '_' .or '$';\n"
+"digit10\n"
+" '0'-'9';\n"
+".string __string_filter;\n"
+"__string_filter\n"
+" .loop __identifier_char;\n"
+"__identifier_char\n"
+" 'a'-'z' .or 'A'-'Z' .or '_' .or '$' .or '0'-'9';\n"
+"e_signature\n"
+" e_signature_char .and .loop e_signature_char;\n"
+"e_signature_char\n"
+" '!' .or '.' .or 'A'-'Z' .or 'a'-'z' .or '0'-'9';\n"
+"e_statement\n"
+" .loop e_statement_not_term;\n"
+"e_statement_not_term\n"
+" '\\x3C'-'\\xFF' .or '\\x0E'-'\\x3A' .or '\\x01'-'\\x09' .or '\\x0B'-'\\x0C';\n"
+"e_identifier\n"
+" e_identifier_first .and .loop e_identifier_next;\n"
+"e_identifier_first\n"
+" 'a'-'z' .or 'A'-'Z' .or '_' .or '$';\n"
+"e_identifier_next\n"
+" e_identifier_first .or '0'-'9';\n"
+"e_token\n"
+" e_identifier .or e_token_number .or '[' .or ']' .or '.' .or '{' .or '}' .or '=' .or '+' .or\n"
+" '-' .or ',' .or ';';\n"
+"e_token_number\n"
+" e_token_digit .and .loop e_token_digit;\n"
+"e_token_digit\n"
+" '0'-'9';\n"
+"e_charordigit\n"
+" 'A'-'Z' .or 'a'-'z' .or '0'-'9';\n"
+"";
diff --git a/reactos/lib/mesa32/src/main/arbprogram.c b/reactos/lib/mesa32/src/main/arbprogram.c
new file mode 100644
index 00000000000..348d0cdc0c1
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/arbprogram.c
@@ -0,0 +1,712 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0.1
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file arbprogram.c
+ * ARB_vertex/fragment_program state management functions.
+ * \author Brian Paul
+ */
+
+
+#include "glheader.h"
+#include "arbprogram.h"
+#include "arbfragparse.h"
+#include "arbvertparse.h"
+#include "context.h"
+#include "imports.h"
+#include "macros.h"
+#include "mtypes.h"
+#include "nvprogram.h"
+#include "nvfragparse.h"
+#include "nvfragprog.h"
+#include "nvvertparse.h"
+#include "nvvertprog.h"
+
+
+void GLAPIENTRY
+_mesa_EnableVertexAttribArrayARB(GLuint index)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (index >= ctx->Const.MaxVertexProgramAttribs) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glEnableVertexAttribArrayARB(index)");
+      return;
+   }
+
+   FLUSH_VERTICES(ctx, _NEW_ARRAY);
+   ctx->Array.VertexAttrib[index].Enabled = GL_TRUE;
+   ctx->Array._Enabled |= _NEW_ARRAY_ATTRIB(index);
+   ctx->Array.NewState |= _NEW_ARRAY_ATTRIB(index);
+}
+
+
+void GLAPIENTRY
+_mesa_DisableVertexAttribArrayARB(GLuint index)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (index >= ctx->Const.MaxVertexProgramAttribs) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glEnableVertexAttribArrayARB(index)");
+      return;
+   }
+
+   FLUSH_VERTICES(ctx, _NEW_ARRAY);
+   ctx->Array.VertexAttrib[index].Enabled = GL_FALSE;
+   ctx->Array._Enabled &= ~_NEW_ARRAY_ATTRIB(index);
+   ctx->Array.NewState |= _NEW_ARRAY_ATTRIB(index);
+}
+
+
+void GLAPIENTRY
+_mesa_GetVertexAttribdvARB(GLuint index, GLenum pname, GLdouble *params)
+{
+   GLfloat fparams[4];
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   _mesa_GetVertexAttribfvARB(index, pname, fparams);
+   if (ctx->ErrorValue == GL_NO_ERROR) {
+      if (pname == GL_CURRENT_VERTEX_ATTRIB_ARB) {
+         COPY_4V(params, fparams);
+      }
+      else {
+         params[0] = fparams[0];
+      }
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (index == 0 || index >= VERT_ATTRIB_MAX) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glGetVertexAttribfvARB(index)");
+      return;
+   }
+
+   switch (pname) {
+      case GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB:
+         params[0] = (GLfloat) ctx->Array.VertexAttrib[index].Enabled;
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB:
+         params[0] = (GLfloat) ctx->Array.VertexAttrib[index].Size;
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB:
+         params[0] = (GLfloat) ctx->Array.VertexAttrib[index].Stride;
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB:
+         params[0] = (GLfloat) ctx->Array.VertexAttrib[index].Type;
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB:
+         params[0] = ctx->Array.VertexAttrib[index].Normalized;
+         break;
+      case GL_CURRENT_VERTEX_ATTRIB_ARB:
+	 FLUSH_CURRENT(ctx, 0);
+         COPY_4V(params, ctx->Current.Attrib[index]);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB:
+         if (!ctx->Extensions.ARB_vertex_buffer_object) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glGetVertexAttribfvARB(pname)");
+            return;
+         }
+         params[0] = (GLfloat) ctx->Array.VertexAttrib[index].BufferObj->Name;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetVertexAttribfvARB(pname)");
+         return;
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetVertexAttribivARB(GLuint index, GLenum pname, GLint *params)
+{
+   GLfloat fparams[4];
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   _mesa_GetVertexAttribfvARB(index, pname, fparams);
+   if (ctx->ErrorValue == GL_NO_ERROR) {
+      if (pname == GL_CURRENT_VERTEX_ATTRIB_ARB) {
+         COPY_4V_CAST(params, fparams, GLint);  /* float to int */
+      }
+      else {
+         params[0] = (GLint) fparams[0];
+      }
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetVertexAttribPointervARB(GLuint index, GLenum pname, GLvoid **pointer)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (index >= ctx->Const.MaxVertexProgramAttribs) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glGetVertexAttribPointerARB(index)");
+      return;
+   }
+
+   if (pname != GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetVertexAttribPointerARB(pname)");
+      return;
+   }
+
+   *pointer = (GLvoid *) ctx->Array.VertexAttrib[index].Ptr;;
+}
+
+
+void GLAPIENTRY
+_mesa_ProgramStringARB(GLenum target, GLenum format, GLsizei len,
+                       const GLvoid *string)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
+
+   if (target == GL_VERTEX_PROGRAM_ARB
+       && ctx->Extensions.ARB_vertex_program) {
+      struct vertex_program *prog = ctx->VertexProgram.Current;
+      if (format != GL_PROGRAM_FORMAT_ASCII_ARB) {
+         _mesa_error(ctx, GL_INVALID_ENUM, "glProgramStringARB(format)");
+         return;
+      }
+      _mesa_parse_arb_vertex_program(ctx, target, (const GLubyte *) string,
+                                     len, prog);
+   }
+   else if (target == GL_FRAGMENT_PROGRAM_ARB
+            && ctx->Extensions.ARB_fragment_program) {
+      struct fragment_program *prog = ctx->FragmentProgram.Current;
+      if (format != GL_PROGRAM_FORMAT_ASCII_ARB) {
+         _mesa_error(ctx, GL_INVALID_ENUM, "glProgramStringARB(format)");
+         return;
+      }
+      _mesa_parse_arb_fragment_program(ctx, target, (const GLubyte *) string,
+                                       len, prog);
+   }
+   else {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glProgramStringARB(target)");
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_ProgramEnvParameter4dARB(GLenum target, GLuint index,
+                               GLdouble x, GLdouble y, GLdouble z, GLdouble w)
+{
+   _mesa_ProgramEnvParameter4fARB(target, index, (GLfloat) x, (GLfloat) y, 
+		                  (GLfloat) z, (GLfloat) w);
+}
+
+
+void GLAPIENTRY
+_mesa_ProgramEnvParameter4dvARB(GLenum target, GLuint index,
+                                const GLdouble *params)
+{
+   _mesa_ProgramEnvParameter4fARB(target, index, (GLfloat) params[0], 
+	                          (GLfloat) params[1], (GLfloat) params[2], 
+				  (GLfloat) params[3]);
+}
+
+
+void GLAPIENTRY
+_mesa_ProgramEnvParameter4fARB(GLenum target, GLuint index,
+                               GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
+
+   if (target == GL_FRAGMENT_PROGRAM_ARB
+       && ctx->Extensions.ARB_fragment_program) {
+      if (index >= ctx->Const.MaxFragmentProgramEnvParams) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "glProgramEnvParameter(index)");
+         return;
+      }
+      ASSIGN_4V(ctx->FragmentProgram.Parameters[index], x, y, z, w);
+   }
+   else if (target == GL_VERTEX_PROGRAM_ARB
+            && ctx->Extensions.ARB_vertex_program) {
+      if (index >= ctx->Const.MaxVertexProgramEnvParams) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "glProgramEnvParameter(index)");
+         return;
+      }
+      ASSIGN_4V(ctx->VertexProgram.Parameters[index], x, y, z, w);
+   }
+   else {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glProgramEnvParameter(target)");
+      return;
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_ProgramEnvParameter4fvARB(GLenum target, GLuint index,
+                                   const GLfloat *params)
+{
+   _mesa_ProgramEnvParameter4fARB(target, index, params[0], params[1],
+                                  params[2], params[3]);
+}
+
+
+void GLAPIENTRY
+_mesa_GetProgramEnvParameterdvARB(GLenum target, GLuint index,
+                                  GLdouble *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat fparams[4];
+
+   _mesa_GetProgramEnvParameterfvARB(target, index, fparams);
+   if (ctx->ErrorValue == GL_NO_ERROR) {
+      params[0] = fparams[0];
+      params[1] = fparams[1];
+      params[2] = fparams[2];
+      params[3] = fparams[3];
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetProgramEnvParameterfvARB(GLenum target, GLuint index, 
+                                  GLfloat *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
+
+   if (!ctx->_CurrentProgram)
+      ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (target == GL_FRAGMENT_PROGRAM_ARB
+       && ctx->Extensions.ARB_fragment_program) {
+      if (index >= ctx->Const.MaxFragmentProgramEnvParams) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "glGetProgramEnvParameter(index)");
+         return;
+      }
+      COPY_4V(params, ctx->FragmentProgram.Parameters[index]);
+   }
+   else if (target == GL_VERTEX_PROGRAM_ARB
+            && ctx->Extensions.ARB_vertex_program) {
+      if (index >= ctx->Const.MaxVertexProgramEnvParams) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "glGetProgramEnvParameter(index)");
+         return;
+      }
+      COPY_4V(params, ctx->VertexProgram.Parameters[index]);
+   }
+   else {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramEnvParameter(target)");
+      return;
+   }
+}
+
+
+/**
+ * Note, this function is also used by the GL_NV_fragment_program extension.
+ */
+void GLAPIENTRY
+_mesa_ProgramLocalParameter4fARB(GLenum target, GLuint index,
+                                 GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct program *prog;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
+
+   if ((target == GL_FRAGMENT_PROGRAM_NV
+        && ctx->Extensions.NV_fragment_program) ||
+       (target == GL_FRAGMENT_PROGRAM_ARB
+        && ctx->Extensions.ARB_fragment_program)) {
+      if (index >= ctx->Const.MaxFragmentProgramLocalParams) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "glProgramLocalParameterARB");
+         return;
+      }
+      prog = &(ctx->FragmentProgram.Current->Base);
+   }
+   else if (target == GL_VERTEX_PROGRAM_ARB
+            && ctx->Extensions.ARB_vertex_program) {
+      if (index >= ctx->Const.MaxVertexProgramLocalParams) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "glProgramLocalParameterARB");
+         return;
+      }
+      prog = &(ctx->VertexProgram.Current->Base);
+   }
+   else {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glProgramLocalParameterARB");
+      return;
+   }
+
+   ASSERT(index < MAX_PROGRAM_LOCAL_PARAMS);
+   prog->LocalParams[index][0] = x;
+   prog->LocalParams[index][1] = y;
+   prog->LocalParams[index][2] = z;
+   prog->LocalParams[index][3] = w;
+}
+
+
+/**
+ * Note, this function is also used by the GL_NV_fragment_program extension.
+ */
+void GLAPIENTRY
+_mesa_ProgramLocalParameter4fvARB(GLenum target, GLuint index,
+                                  const GLfloat *params)
+{
+   _mesa_ProgramLocalParameter4fARB(target, index, params[0], params[1],
+                                    params[2], params[3]);
+}
+
+
+/**
+ * Note, this function is also used by the GL_NV_fragment_program extension.
+ */
+void GLAPIENTRY
+_mesa_ProgramLocalParameter4dARB(GLenum target, GLuint index,
+                                 GLdouble x, GLdouble y,
+                                 GLdouble z, GLdouble w)
+{
+   _mesa_ProgramLocalParameter4fARB(target, index, (GLfloat) x, (GLfloat) y, 
+                                    (GLfloat) z, (GLfloat) w);
+}
+
+
+/**
+ * Note, this function is also used by the GL_NV_fragment_program extension.
+ */
+void GLAPIENTRY
+_mesa_ProgramLocalParameter4dvARB(GLenum target, GLuint index,
+                                  const GLdouble *params)
+{
+   _mesa_ProgramLocalParameter4fARB(target, index,
+                                    (GLfloat) params[0], (GLfloat) params[1],
+                                    (GLfloat) params[2], (GLfloat) params[3]);
+}
+
+
+/**
+ * Note, this function is also used by the GL_NV_fragment_program extension.
+ */
+void GLAPIENTRY
+_mesa_GetProgramLocalParameterfvARB(GLenum target, GLuint index,
+                                    GLfloat *params)
+{
+   const struct program *prog;
+   GLuint maxParams;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (target == GL_VERTEX_PROGRAM_ARB
+       && ctx->Extensions.ARB_vertex_program) {
+      prog = &(ctx->VertexProgram.Current->Base);
+      maxParams = ctx->Const.MaxVertexProgramLocalParams;
+   }
+   else if (target == GL_FRAGMENT_PROGRAM_ARB
+            && ctx->Extensions.ARB_fragment_program) {
+      prog = &(ctx->FragmentProgram.Current->Base);
+      maxParams = ctx->Const.MaxFragmentProgramLocalParams;
+   }
+   else if (target == GL_FRAGMENT_PROGRAM_NV
+            && ctx->Extensions.NV_fragment_program) {
+      prog = &(ctx->FragmentProgram.Current->Base);
+      maxParams = MAX_NV_FRAGMENT_PROGRAM_PARAMS;
+   }
+   else {
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glGetProgramLocalParameterARB(target)");
+      return;
+   }
+
+   if (index >= maxParams) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glGetProgramLocalParameterARB(index)");
+      return;
+   }
+
+   ASSERT(prog);
+   ASSERT(index < MAX_PROGRAM_LOCAL_PARAMS);
+   COPY_4V(params, prog->LocalParams[index]);
+}
+
+
+/**
+ * Note, this function is also used by the GL_NV_fragment_program extension.
+ */
+void GLAPIENTRY
+_mesa_GetProgramLocalParameterdvARB(GLenum target, GLuint index,
+                                    GLdouble *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat floatParams[4];
+   _mesa_GetProgramLocalParameterfvARB(target, index, floatParams);
+   if (ctx->ErrorValue == GL_NO_ERROR) {
+      COPY_4V(params, floatParams);
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetProgramivARB(GLenum target, GLenum pname, GLint *params)
+{
+   struct program *prog;
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (!ctx->_CurrentProgram)
+      ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (target == GL_VERTEX_PROGRAM_ARB
+       && ctx->Extensions.ARB_vertex_program) {
+      prog = &(ctx->VertexProgram.Current->Base);
+   }
+   else if (target == GL_FRAGMENT_PROGRAM_ARB
+            && ctx->Extensions.ARB_fragment_program) {
+      prog = &(ctx->FragmentProgram.Current->Base);
+   }
+   else {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramivARB(target)");
+      return;
+   }
+
+   ASSERT(prog);
+
+   switch (pname) {
+      case GL_PROGRAM_LENGTH_ARB:
+         *params = prog->String ? _mesa_strlen((char *) prog->String) : 0;
+         break;
+      case GL_PROGRAM_FORMAT_ARB:
+         *params = prog->Format;
+         break;
+      case GL_PROGRAM_BINDING_ARB:
+         *params = prog->Id;
+         break;
+      case GL_PROGRAM_INSTRUCTIONS_ARB:
+         *params = prog->NumInstructions;
+         break;
+      case GL_MAX_PROGRAM_INSTRUCTIONS_ARB:
+         if (target == GL_VERTEX_PROGRAM_ARB)
+            *params = ctx->Const.MaxVertexProgramInstructions;
+         else
+            *params = ctx->Const.MaxFragmentProgramInstructions;
+         break;
+      case GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB:
+         *params = prog->NumInstructions;
+         break;
+      case GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB:
+         if (target == GL_VERTEX_PROGRAM_ARB)
+            *params = ctx->Const.MaxVertexProgramInstructions;
+         else
+            *params = ctx->Const.MaxFragmentProgramInstructions;
+         break;
+      case GL_PROGRAM_TEMPORARIES_ARB:
+         *params = prog->NumTemporaries;
+         break;
+      case GL_MAX_PROGRAM_TEMPORARIES_ARB:
+         if (target == GL_VERTEX_PROGRAM_ARB)
+            *params = ctx->Const.MaxVertexProgramTemps;
+         else
+            *params = ctx->Const.MaxFragmentProgramTemps;
+         break;
+      case GL_PROGRAM_NATIVE_TEMPORARIES_ARB:
+         /* XXX same as GL_PROGRAM_TEMPORARIES_ARB? */
+         *params = prog->NumTemporaries;
+         break;
+      case GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB:
+         /* XXX same as GL_MAX_PROGRAM_TEMPORARIES_ARB? */
+         if (target == GL_VERTEX_PROGRAM_ARB)
+            *params = ctx->Const.MaxVertexProgramTemps;
+         else
+            *params = ctx->Const.MaxFragmentProgramTemps;
+         break;
+      case GL_PROGRAM_PARAMETERS_ARB:
+         *params = prog->NumParameters;
+         break;
+      case GL_MAX_PROGRAM_PARAMETERS_ARB:
+         if (target == GL_VERTEX_PROGRAM_ARB)
+            *params = ctx->Const.MaxVertexProgramLocalParams;
+         else
+            *params = ctx->Const.MaxFragmentProgramLocalParams;
+         break;
+      case GL_PROGRAM_NATIVE_PARAMETERS_ARB:
+         /* XXX same as GL_MAX_PROGRAM_PARAMETERS_ARB? */
+         *params = prog->NumParameters;
+         break;
+      case GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB:
+         /* XXX same as GL_MAX_PROGRAM_PARAMETERS_ARB? */
+         if (target == GL_VERTEX_PROGRAM_ARB)
+            *params = ctx->Const.MaxVertexProgramLocalParams;
+         else
+            *params = ctx->Const.MaxFragmentProgramLocalParams;
+         break;
+      case GL_PROGRAM_ATTRIBS_ARB:
+         *params = prog->NumAttributes;
+         break;
+      case GL_MAX_PROGRAM_ATTRIBS_ARB:
+         if (target == GL_VERTEX_PROGRAM_ARB)
+            *params = ctx->Const.MaxVertexProgramAttribs;
+         else
+            *params = ctx->Const.MaxFragmentProgramAttribs;
+         break;
+      case GL_PROGRAM_NATIVE_ATTRIBS_ARB:
+         /* XXX same as GL_PROGRAM_ATTRIBS_ARB? */
+         *params = prog->NumAttributes;
+         break;
+      case GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB:
+         /* XXX same as GL_MAX_PROGRAM_ATTRIBS_ARB? */
+         if (target == GL_VERTEX_PROGRAM_ARB)
+            *params = ctx->Const.MaxVertexProgramAttribs;
+         else
+            *params = ctx->Const.MaxFragmentProgramAttribs;
+         break;
+      case GL_PROGRAM_ADDRESS_REGISTERS_ARB:
+         *params = prog->NumAddressRegs;
+         break;
+      case GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB:
+         if (target == GL_VERTEX_PROGRAM_ARB)
+            *params = ctx->Const.MaxVertexProgramAddressRegs;
+         else
+            *params = ctx->Const.MaxFragmentProgramAddressRegs;
+         break;
+      case GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB:
+         /* XXX same as GL_PROGRAM_ADDRESS_REGISTERS_ARB? */
+         *params = prog->NumAddressRegs;
+         break;
+      case GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB:
+         /* XXX same as GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB? */
+         if (target == GL_VERTEX_PROGRAM_ARB)
+            *params = ctx->Const.MaxVertexProgramAddressRegs;
+         else
+            *params = ctx->Const.MaxFragmentProgramAddressRegs;
+         break;
+      case GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB:
+         if (target == GL_VERTEX_PROGRAM_ARB)
+            *params = ctx->Const.MaxVertexProgramLocalParams;
+         else
+            *params = ctx->Const.MaxFragmentProgramLocalParams;
+         break;
+      case GL_MAX_PROGRAM_ENV_PARAMETERS_ARB:
+         if (target == GL_VERTEX_PROGRAM_ARB)
+            *params = ctx->Const.MaxVertexProgramEnvParams;
+         else
+            *params = ctx->Const.MaxFragmentProgramEnvParams;
+         break;
+      case GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB:
+         /* XXX ok? */
+         *params = GL_TRUE;
+         break;
+
+      /*
+       * The following apply to fragment programs only.
+       */
+      case GL_PROGRAM_ALU_INSTRUCTIONS_ARB:
+      case GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB:
+         if (target != GL_FRAGMENT_PROGRAM_ARB) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramivARB(target)");
+            return;
+         }
+         *params = ctx->FragmentProgram.Current->NumAluInstructions;
+         break;
+      case GL_PROGRAM_TEX_INSTRUCTIONS_ARB:
+      case GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB:
+         if (target != GL_FRAGMENT_PROGRAM_ARB) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramivARB(target)");
+            return;
+         }
+         *params = ctx->FragmentProgram.Current->NumTexInstructions;
+         break;
+      case GL_PROGRAM_TEX_INDIRECTIONS_ARB:
+      case GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB:
+         if (target != GL_FRAGMENT_PROGRAM_ARB) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramivARB(target)");
+            return;
+         }
+         *params = ctx->FragmentProgram.Current->NumTexIndirections;
+         break;
+      case GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB:
+      case GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB:
+         if (target != GL_FRAGMENT_PROGRAM_ARB) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramivARB(target)");
+            return;
+         }
+         *params = ctx->Const.MaxFragmentProgramAluInstructions;
+         break;
+      case GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB:
+      case GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB:
+         if (target != GL_FRAGMENT_PROGRAM_ARB) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramivARB(target)");
+            return;
+         }
+         *params = ctx->Const.MaxFragmentProgramTexInstructions;
+         break;
+      case GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB:
+      case GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB:
+         if (target != GL_FRAGMENT_PROGRAM_ARB) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramivARB(target)");
+            return;
+         }
+         *params = ctx->Const.MaxFragmentProgramTexIndirections;
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramivARB(pname)");
+         return;
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetProgramStringARB(GLenum target, GLenum pname, GLvoid *string)
+{
+   struct program *prog;
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (!ctx->_CurrentProgram)
+      ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (target == GL_VERTEX_PROGRAM_ARB) {
+      prog = &(ctx->VertexProgram.Current->Base);
+   }
+   else if (target == GL_FRAGMENT_PROGRAM_ARB) {
+      prog = &(ctx->FragmentProgram.Current->Base);
+   }
+   else {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramStringARB(target)");
+      return;
+   }
+
+   ASSERT(prog);
+
+   if (pname != GL_PROGRAM_STRING_ARB) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramStringARB(pname)");
+      return;
+   }
+
+   MEMCPY(string, prog->String, _mesa_strlen((char *) prog->String));
+}
+
diff --git a/reactos/lib/mesa32/src/main/arbprogram.h b/reactos/lib/mesa32/src/main/arbprogram.h
new file mode 100644
index 00000000000..e1b99ab686f
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/arbprogram.h
@@ -0,0 +1,128 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef ARBPROGRAM_H
+#define ARBPROGRAM_H
+
+
+extern void GLAPIENTRY
+_mesa_EnableVertexAttribArrayARB(GLuint index);
+
+
+extern void GLAPIENTRY
+_mesa_DisableVertexAttribArrayARB(GLuint index);
+
+
+extern void GLAPIENTRY
+_mesa_GetVertexAttribdvARB(GLuint index, GLenum pname, GLdouble *params);
+
+
+extern void GLAPIENTRY
+_mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params);
+
+
+extern void GLAPIENTRY
+_mesa_GetVertexAttribivARB(GLuint index, GLenum pname, GLint *params);
+
+
+extern void GLAPIENTRY
+_mesa_GetVertexAttribPointervARB(GLuint index, GLenum pname, GLvoid **pointer);
+
+
+extern void GLAPIENTRY
+_mesa_ProgramStringARB(GLenum target, GLenum format, GLsizei len,
+                       const GLvoid *string);
+
+
+extern void GLAPIENTRY
+_mesa_ProgramEnvParameter4dARB(GLenum target, GLuint index,
+                               GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+
+
+extern void GLAPIENTRY
+_mesa_ProgramEnvParameter4dvARB(GLenum target, GLuint index,
+                                const GLdouble *params);
+
+
+extern void GLAPIENTRY
+_mesa_ProgramEnvParameter4fARB(GLenum target, GLuint index,
+                               GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+
+
+extern void GLAPIENTRY
+_mesa_ProgramEnvParameter4fvARB(GLenum target, GLuint index,
+                                const GLfloat *params);
+
+
+extern void GLAPIENTRY
+_mesa_ProgramLocalParameter4dARB(GLenum target, GLuint index,
+                                 GLdouble x, GLdouble y,
+                                 GLdouble z, GLdouble w);
+
+
+extern void GLAPIENTRY
+_mesa_ProgramLocalParameter4dvARB(GLenum target, GLuint index,
+                                  const GLdouble *params);
+
+
+extern void GLAPIENTRY
+_mesa_ProgramLocalParameter4fARB(GLenum target, GLuint index,
+                                 GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+
+
+extern void GLAPIENTRY
+_mesa_ProgramLocalParameter4fvARB(GLenum target, GLuint index,
+                                  const GLfloat *params);
+
+
+extern void GLAPIENTRY
+_mesa_GetProgramEnvParameterdvARB(GLenum target, GLuint index,
+                                  GLdouble *params);
+
+
+extern void GLAPIENTRY
+_mesa_GetProgramEnvParameterfvARB(GLenum target, GLuint index, 
+                                  GLfloat *params);
+
+
+extern void GLAPIENTRY
+_mesa_GetProgramLocalParameterdvARB(GLenum target, GLuint index,
+                                    GLdouble *params);
+
+
+extern void GLAPIENTRY
+_mesa_GetProgramLocalParameterfvARB(GLenum target, GLuint index, 
+                                    GLfloat *params);
+
+
+extern void GLAPIENTRY
+_mesa_GetProgramivARB(GLenum target, GLenum pname, GLint *params);
+
+
+extern void GLAPIENTRY
+_mesa_GetProgramStringARB(GLenum target, GLenum pname, GLvoid *string);
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/arbvertparse.c b/reactos/lib/mesa32/src/main/arbvertparse.c
new file mode 100644
index 00000000000..08bbb98af83
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/arbvertparse.c
@@ -0,0 +1,223 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#define DEBUG_VP 0
+
+/**
+ * \file arbvertparse.c
+ * ARB_vertex_program parser.
+ * \author Karl Rasche
+ */
+
+#include "glheader.h"
+#include "context.h"
+#include "arbvertparse.h"
+#include "hash.h"
+#include "imports.h"
+#include "macros.h"
+#include "mtypes.h"
+#include "nvprogram.h"
+#include "nvvertparse.h"
+#include "nvvertprog.h"
+
+#include "arbparse.h"
+
+
+static GLvoid
+debug_vp_inst(GLint num, struct vp_instruction *vp)
+{
+   GLint a;
+
+   for (a=0; a<num; a++) {
+      switch (vp[a].Opcode) {
+         case VP_OPCODE_MOV:
+            fprintf(stderr, "VP_OPCODE_MOV"); break;
+
+         case VP_OPCODE_LIT:
+            fprintf(stderr, "VP_OPCODE_LIT"); break;
+
+         case VP_OPCODE_RCP:
+            fprintf(stderr, "VP_OPCODE_RCP"); break;
+
+         case VP_OPCODE_RSQ:
+            fprintf(stderr, "VP_OPCODE_RSQ"); break;
+
+         case VP_OPCODE_EXP:
+            fprintf(stderr, "VP_OPCODE_EXP"); break;
+
+         case VP_OPCODE_LOG:
+            fprintf(stderr, "VP_OPCODE_LOG"); break;
+
+         case VP_OPCODE_MUL:
+            fprintf(stderr, "VP_OPCODE_MUL"); break;
+
+         case VP_OPCODE_ADD:
+            fprintf(stderr, "VP_OPCODE_ADD"); break;
+				
+         case VP_OPCODE_DP3:
+            fprintf(stderr, "VP_OPCODE_DP3"); break;
+
+         case VP_OPCODE_DP4:
+            fprintf(stderr, "VP_OPCODE_DP4"); break;
+
+         case VP_OPCODE_DST:
+            fprintf(stderr, "VP_OPCODE_DST"); break;
+
+         case VP_OPCODE_MIN:
+            fprintf(stderr, "VP_OPCODE_MIN"); break;
+
+         case VP_OPCODE_MAX:
+            fprintf(stderr, "VP_OPCODE_MAX"); break;
+
+         case VP_OPCODE_SLT:
+            fprintf(stderr, "VP_OPCODE_SLT"); break;
+
+         case VP_OPCODE_SGE:
+            fprintf(stderr, "VP_OPCODE_SGE"); break;
+
+         case VP_OPCODE_MAD:
+            fprintf(stderr, "VP_OPCODE_MAD"); break;
+
+         case VP_OPCODE_ARL:
+            fprintf(stderr, "VP_OPCODE_ARL"); break;
+
+         case VP_OPCODE_DPH:
+            fprintf(stderr, "VP_OPCODE_DPH"); break;
+
+         case VP_OPCODE_RCC:
+            fprintf(stderr, "VP_OPCODE_RCC"); break;
+
+         case VP_OPCODE_SUB:
+            fprintf(stderr, "VP_OPCODE_SUB"); break;
+
+         case VP_OPCODE_ABS:
+            fprintf(stderr, "VP_OPCODE_ABS"); break;
+
+         case VP_OPCODE_FLR:
+            fprintf(stderr, "VP_OPCODE_FLR"); break;
+
+         case VP_OPCODE_FRC:
+            fprintf(stderr, "VP_OPCODE_FRC"); break;
+
+         case VP_OPCODE_EX2:
+            fprintf(stderr, "VP_OPCODE_EX2"); break;
+
+         case VP_OPCODE_LG2:
+            fprintf(stderr, "VP_OPCODE_LG2"); break;
+
+         case VP_OPCODE_POW:
+            fprintf(stderr, "VP_OPCODE_POW"); break;
+
+         case VP_OPCODE_XPD:
+            fprintf(stderr, "VP_OPCODE_XPD"); break;
+
+         case VP_OPCODE_SWZ:
+            fprintf(stderr, "VP_OPCODE_SWZ"); break;
+				
+         case VP_OPCODE_END:
+            fprintf(stderr, "VP_OPCODE_END"); break;
+      }
+
+      fprintf(stderr, " D(0x%x:%d:%d%d%d%d) ", vp[a].DstReg.File, vp[a].DstReg.Index,
+          vp[a].DstReg.WriteMask[0],
+          vp[a].DstReg.WriteMask[1],
+          vp[a].DstReg.WriteMask[2],
+          vp[a].DstReg.WriteMask[3]);
+		
+      fprintf(stderr, "S1(0x%x:%d:%d%d%d%d) ", vp[a].SrcReg[0].File, vp[a].SrcReg[0].Index,
+          vp[a].SrcReg[0].Swizzle[0],
+          vp[a].SrcReg[0].Swizzle[1],
+          vp[a].SrcReg[0].Swizzle[2],
+          vp[a].SrcReg[0].Swizzle[3]);
+
+      fprintf(stderr, "S2(0x%x:%d:%d%d%d%d) ", vp[a].SrcReg[1].File, vp[a].SrcReg[1].Index,
+          vp[a].SrcReg[1].Swizzle[0],
+          vp[a].SrcReg[1].Swizzle[1],
+          vp[a].SrcReg[1].Swizzle[2],
+          vp[a].SrcReg[1].Swizzle[3]);
+
+      fprintf(stderr, "S3(0x%x:%d:%d%d%d%d)",  vp[a].SrcReg[2].File, vp[a].SrcReg[2].Index,	
+          vp[a].SrcReg[2].Swizzle[0],
+          vp[a].SrcReg[2].Swizzle[1],
+          vp[a].SrcReg[2].Swizzle[2],
+          vp[a].SrcReg[2].Swizzle[3]);
+
+      fprintf(stderr, "\n");
+   }
+}
+
+
+void
+_mesa_parse_arb_vertex_program(GLcontext * ctx, GLenum target,
+			       const GLubyte * str, GLsizei len,
+			       struct vertex_program *program)
+{
+   GLuint retval;
+   struct arb_program ap;
+	
+   retval = _mesa_parse_arb_program(ctx, str, len, &ap);
+
+   /*  Parse error. Allocate a dummy program and return */	
+   if (retval)
+   {
+      program->Instructions = (struct vp_instruction *)
+         _mesa_malloc(sizeof(struct vp_instruction) );
+      program->Instructions[0].Opcode = VP_OPCODE_END;
+      return;
+   }
+
+   /* Eh.. we parsed something that wasn't a vertex program. doh! */
+   if (ap.type != GL_VERTEX_PROGRAM_ARB)
+   {
+      program->Instructions = (struct vp_instruction *)
+         _mesa_malloc(sizeof(struct vp_instruction));
+      program->Instructions[0].Opcode = VP_OPCODE_END;
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "Parsed a non-vertex program as a vertex program");
+      return;      
+   }
+
+   /* copy the relvant contents of the arb_program struct into the 
+    * fragment_program struct
+    */
+   program->Base.String          = ap.Base.String;
+   program->Base.NumInstructions = ap.Base.NumInstructions;
+   program->Base.NumTemporaries  = ap.Base.NumTemporaries;
+   program->Base.NumParameters   = ap.Base.NumParameters;
+   program->Base.NumAttributes   = ap.Base.NumAttributes;
+   program->Base.NumAddressRegs  = ap.Base.NumAddressRegs;
+
+   program->IsPositionInvariant = ap.HintPositionInvariant;
+   program->InputsRead     = ap.InputsRead;
+   program->OutputsWritten = ap.OutputsWritten;
+   program->Parameters     = ap.Parameters; 
+   program->Instructions   = ap.VPInstructions;
+
+#if DEBUG_VP
+   debug_vp_inst(ap.Base.NumInstructions, ap.VPInstructions);
+#else
+   (void) debug_vp_inst;
+#endif
+
+}
diff --git a/reactos/lib/mesa32/src/main/arbvertparse.h b/reactos/lib/mesa32/src/main/arbvertparse.h
new file mode 100644
index 00000000000..3e4490b8be5
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/arbvertparse.h
@@ -0,0 +1,33 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef ARBVERTPARSE_H
+#define ARBVERTPARSE_H
+
+extern void
+_mesa_parse_arb_vertex_program(GLcontext * ctx, GLenum target,
+			       const GLubyte * str, GLsizei len,
+			       struct vertex_program *program);
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/attrib.c b/reactos/lib/mesa32/src/main/attrib.c
new file mode 100644
index 00000000000..62d968a32fa
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/attrib.c
@@ -0,0 +1,1244 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "glheader.h"
+#include "imports.h"
+#include "accum.h"
+#include "attrib.h"
+#include "blend.h"
+#include "buffers.h"
+#include "colormac.h"
+#include "colortab.h"
+#include "context.h"
+#include "depth.h"
+#include "enable.h"
+#include "enums.h"
+#include "fog.h"
+#include "hint.h"
+#include "light.h"
+#include "lines.h"
+#include "matrix.h"
+#include "points.h"
+#include "polygon.h"
+#include "simple_list.h"
+#include "stencil.h"
+#include "texobj.h"
+#include "texstate.h"
+#include "mtypes.h"
+#include "math/m_xform.h"
+
+
+/*
+ * Allocate a new attribute state node.  These nodes have a
+ * "kind" value and a pointer to a struct of state data.
+ */
+static struct gl_attrib_node *
+new_attrib_node( GLbitfield kind )
+{
+   struct gl_attrib_node *an = MALLOC_STRUCT(gl_attrib_node);
+   if (an) {
+      an->kind = kind;
+   }
+   return an;
+}
+
+
+void GLAPIENTRY
+_mesa_PushAttrib(GLbitfield mask)
+{
+   struct gl_attrib_node *newnode;
+   struct gl_attrib_node *head;
+
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glPushAttrib %x\n", (int) mask);
+
+   if (ctx->AttribStackDepth >= MAX_ATTRIB_STACK_DEPTH) {
+      _mesa_error( ctx, GL_STACK_OVERFLOW, "glPushAttrib" );
+      return;
+   }
+
+   /* Build linked list of attribute nodes which save all attribute */
+   /* groups specified by the mask. */
+   head = NULL;
+
+   if (mask & GL_ACCUM_BUFFER_BIT) {
+      struct gl_accum_attrib *attr;
+      attr = MALLOC_STRUCT( gl_accum_attrib );
+      MEMCPY( attr, &ctx->Accum, sizeof(struct gl_accum_attrib) );
+      newnode = new_attrib_node( GL_ACCUM_BUFFER_BIT );
+      newnode->data = attr;
+      newnode->next = head;
+      head = newnode;
+   }
+
+   if (mask & GL_COLOR_BUFFER_BIT) {
+      struct gl_colorbuffer_attrib *attr;
+      attr = MALLOC_STRUCT( gl_colorbuffer_attrib );
+      MEMCPY( attr, &ctx->Color, sizeof(struct gl_colorbuffer_attrib) );
+      newnode = new_attrib_node( GL_COLOR_BUFFER_BIT );
+      newnode->data = attr;
+      newnode->next = head;
+      head = newnode;
+   }
+
+   if (mask & GL_CURRENT_BIT) {
+      struct gl_current_attrib *attr;
+      FLUSH_CURRENT( ctx, 0 );
+      attr = MALLOC_STRUCT( gl_current_attrib );
+      MEMCPY( attr, &ctx->Current, sizeof(struct gl_current_attrib) );
+      newnode = new_attrib_node( GL_CURRENT_BIT );
+      newnode->data = attr;
+      newnode->next = head;
+      head = newnode;
+   }
+
+   if (mask & GL_DEPTH_BUFFER_BIT) {
+      struct gl_depthbuffer_attrib *attr;
+      attr = MALLOC_STRUCT( gl_depthbuffer_attrib );
+      MEMCPY( attr, &ctx->Depth, sizeof(struct gl_depthbuffer_attrib) );
+      newnode = new_attrib_node( GL_DEPTH_BUFFER_BIT );
+      newnode->data = attr;
+      newnode->next = head;
+      head = newnode;
+   }
+
+   if (mask & GL_ENABLE_BIT) {
+      struct gl_enable_attrib *attr;
+      GLuint i;
+      attr = MALLOC_STRUCT( gl_enable_attrib );
+      /* Copy enable flags from all other attributes into the enable struct. */
+      attr->AlphaTest = ctx->Color.AlphaEnabled;
+      attr->AutoNormal = ctx->Eval.AutoNormal;
+      attr->Blend = ctx->Color.BlendEnabled;
+      attr->ClipPlanes = ctx->Transform.ClipPlanesEnabled;
+      attr->ColorMaterial = ctx->Light.ColorMaterialEnabled;
+      attr->ColorTable = ctx->Pixel.ColorTableEnabled;
+      attr->PostColorMatrixColorTable = ctx->Pixel.PostColorMatrixColorTableEnabled;
+      attr->PostConvolutionColorTable = ctx->Pixel.PostConvolutionColorTableEnabled;
+      attr->Convolution1D = ctx->Pixel.Convolution1DEnabled;
+      attr->Convolution2D = ctx->Pixel.Convolution2DEnabled;
+      attr->Separable2D = ctx->Pixel.Separable2DEnabled;
+      attr->CullFace = ctx->Polygon.CullFlag;
+      attr->DepthTest = ctx->Depth.Test;
+      attr->Dither = ctx->Color.DitherFlag;
+      attr->Fog = ctx->Fog.Enabled;
+      for (i=0;i<MAX_LIGHTS;i++) {
+         attr->Light[i] = ctx->Light.Light[i].Enabled;
+      }
+      attr->Lighting = ctx->Light.Enabled;
+      attr->LineSmooth = ctx->Line.SmoothFlag;
+      attr->LineStipple = ctx->Line.StippleFlag;
+      attr->Histogram = ctx->Pixel.HistogramEnabled;
+      attr->MinMax = ctx->Pixel.MinMaxEnabled;
+      attr->IndexLogicOp = ctx->Color.IndexLogicOpEnabled;
+      attr->ColorLogicOp = ctx->Color.ColorLogicOpEnabled;
+      attr->Map1Color4 = ctx->Eval.Map1Color4;
+      attr->Map1Index = ctx->Eval.Map1Index;
+      attr->Map1Normal = ctx->Eval.Map1Normal;
+      attr->Map1TextureCoord1 = ctx->Eval.Map1TextureCoord1;
+      attr->Map1TextureCoord2 = ctx->Eval.Map1TextureCoord2;
+      attr->Map1TextureCoord3 = ctx->Eval.Map1TextureCoord3;
+      attr->Map1TextureCoord4 = ctx->Eval.Map1TextureCoord4;
+      attr->Map1Vertex3 = ctx->Eval.Map1Vertex3;
+      attr->Map1Vertex4 = ctx->Eval.Map1Vertex4;
+      MEMCPY(attr->Map1Attrib, ctx->Eval.Map1Attrib, sizeof(ctx->Eval.Map1Attrib));
+      attr->Map2Color4 = ctx->Eval.Map2Color4;
+      attr->Map2Index = ctx->Eval.Map2Index;
+      attr->Map2Normal = ctx->Eval.Map2Normal;
+      attr->Map2TextureCoord1 = ctx->Eval.Map2TextureCoord1;
+      attr->Map2TextureCoord2 = ctx->Eval.Map2TextureCoord2;
+      attr->Map2TextureCoord3 = ctx->Eval.Map2TextureCoord3;
+      attr->Map2TextureCoord4 = ctx->Eval.Map2TextureCoord4;
+      attr->Map2Vertex3 = ctx->Eval.Map2Vertex3;
+      attr->Map2Vertex4 = ctx->Eval.Map2Vertex4;
+      MEMCPY(attr->Map2Attrib, ctx->Eval.Map2Attrib, sizeof(ctx->Eval.Map2Attrib));
+      attr->Normalize = ctx->Transform.Normalize;
+      attr->RasterPositionUnclipped = ctx->Transform.RasterPositionUnclipped;
+      attr->PixelTexture = ctx->Pixel.PixelTextureEnabled;
+      attr->PointSmooth = ctx->Point.SmoothFlag;
+      attr->PointSprite = ctx->Point.PointSprite;
+      attr->PolygonOffsetPoint = ctx->Polygon.OffsetPoint;
+      attr->PolygonOffsetLine = ctx->Polygon.OffsetLine;
+      attr->PolygonOffsetFill = ctx->Polygon.OffsetFill;
+      attr->PolygonSmooth = ctx->Polygon.SmoothFlag;
+      attr->PolygonStipple = ctx->Polygon.StippleFlag;
+      attr->RescaleNormals = ctx->Transform.RescaleNormals;
+      attr->Scissor = ctx->Scissor.Enabled;
+      attr->Stencil = ctx->Stencil.Enabled;
+      attr->MultisampleEnabled = ctx->Multisample.Enabled;
+      attr->SampleAlphaToCoverage = ctx->Multisample.SampleAlphaToCoverage;
+      attr->SampleAlphaToOne = ctx->Multisample.SampleAlphaToOne;
+      attr->SampleCoverage = ctx->Multisample.SampleCoverage;
+      attr->SampleCoverageInvert = ctx->Multisample.SampleCoverageInvert;
+      for (i=0; i<MAX_TEXTURE_UNITS; i++) {
+         attr->Texture[i] = ctx->Texture.Unit[i].Enabled;
+         attr->TexGen[i] = ctx->Texture.Unit[i].TexGenEnabled;
+         attr->TextureColorTable[i] = ctx->Texture.Unit[i].ColorTableEnabled;
+      }
+      /* GL_NV_vertex_program */
+      attr->VertexProgram = ctx->VertexProgram.Enabled;
+      attr->VertexProgramPointSize = ctx->VertexProgram.PointSizeEnabled;
+      attr->VertexProgramTwoSide = ctx->VertexProgram.TwoSideEnabled;
+      newnode = new_attrib_node( GL_ENABLE_BIT );
+      newnode->data = attr;
+      newnode->next = head;
+      head = newnode;
+   }
+
+   if (mask & GL_EVAL_BIT) {
+      struct gl_eval_attrib *attr;
+      attr = MALLOC_STRUCT( gl_eval_attrib );
+      MEMCPY( attr, &ctx->Eval, sizeof(struct gl_eval_attrib) );
+      newnode = new_attrib_node( GL_EVAL_BIT );
+      newnode->data = attr;
+      newnode->next = head;
+      head = newnode;
+   }
+
+   if (mask & GL_FOG_BIT) {
+      struct gl_fog_attrib *attr;
+      attr = MALLOC_STRUCT( gl_fog_attrib );
+      MEMCPY( attr, &ctx->Fog, sizeof(struct gl_fog_attrib) );
+      newnode = new_attrib_node( GL_FOG_BIT );
+      newnode->data = attr;
+      newnode->next = head;
+      head = newnode;
+   }
+
+   if (mask & GL_HINT_BIT) {
+      struct gl_hint_attrib *attr;
+      attr = MALLOC_STRUCT( gl_hint_attrib );
+      MEMCPY( attr, &ctx->Hint, sizeof(struct gl_hint_attrib) );
+      newnode = new_attrib_node( GL_HINT_BIT );
+      newnode->data = attr;
+      newnode->next = head;
+      head = newnode;
+   }
+
+   if (mask & GL_LIGHTING_BIT) {
+      struct gl_light_attrib *attr;
+      FLUSH_CURRENT(ctx, 0);	/* flush material changes */
+      attr = MALLOC_STRUCT( gl_light_attrib );
+      MEMCPY( attr, &ctx->Light, sizeof(struct gl_light_attrib) );
+      newnode = new_attrib_node( GL_LIGHTING_BIT );
+      newnode->data = attr;
+      newnode->next = head;
+      head = newnode;
+   }
+
+   if (mask & GL_LINE_BIT) {
+      struct gl_line_attrib *attr;
+      attr = MALLOC_STRUCT( gl_line_attrib );
+      MEMCPY( attr, &ctx->Line, sizeof(struct gl_line_attrib) );
+      newnode = new_attrib_node( GL_LINE_BIT );
+      newnode->data = attr;
+      newnode->next = head;
+      head = newnode;
+   }
+
+   if (mask & GL_LIST_BIT) {
+      struct gl_list_attrib *attr;
+      attr = MALLOC_STRUCT( gl_list_attrib );
+      MEMCPY( attr, &ctx->List, sizeof(struct gl_list_attrib) );
+      newnode = new_attrib_node( GL_LIST_BIT );
+      newnode->data = attr;
+      newnode->next = head;
+      head = newnode;
+   }
+
+   if (mask & GL_PIXEL_MODE_BIT) {
+      struct gl_pixel_attrib *attr;
+      attr = MALLOC_STRUCT( gl_pixel_attrib );
+      MEMCPY( attr, &ctx->Pixel, sizeof(struct gl_pixel_attrib) );
+      newnode = new_attrib_node( GL_PIXEL_MODE_BIT );
+      newnode->data = attr;
+      newnode->next = head;
+      head = newnode;
+   }
+
+   if (mask & GL_POINT_BIT) {
+      struct gl_point_attrib *attr;
+      attr = MALLOC_STRUCT( gl_point_attrib );
+      MEMCPY( attr, &ctx->Point, sizeof(struct gl_point_attrib) );
+      newnode = new_attrib_node( GL_POINT_BIT );
+      newnode->data = attr;
+      newnode->next = head;
+      head = newnode;
+   }
+
+   if (mask & GL_POLYGON_BIT) {
+      struct gl_polygon_attrib *attr;
+      attr = MALLOC_STRUCT( gl_polygon_attrib );
+      MEMCPY( attr, &ctx->Polygon, sizeof(struct gl_polygon_attrib) );
+      newnode = new_attrib_node( GL_POLYGON_BIT );
+      newnode->data = attr;
+      newnode->next = head;
+      head = newnode;
+   }
+
+   if (mask & GL_POLYGON_STIPPLE_BIT) {
+      GLuint *stipple;
+      stipple = (GLuint *) MALLOC( 32*sizeof(GLuint) );
+      MEMCPY( stipple, ctx->PolygonStipple, 32*sizeof(GLuint) );
+      newnode = new_attrib_node( GL_POLYGON_STIPPLE_BIT );
+      newnode->data = stipple;
+      newnode->next = head;
+      head = newnode;
+   }
+
+   if (mask & GL_SCISSOR_BIT) {
+      struct gl_scissor_attrib *attr;
+      attr = MALLOC_STRUCT( gl_scissor_attrib );
+      MEMCPY( attr, &ctx->Scissor, sizeof(struct gl_scissor_attrib) );
+      newnode = new_attrib_node( GL_SCISSOR_BIT );
+      newnode->data = attr;
+      newnode->next = head;
+      head = newnode;
+   }
+
+   if (mask & GL_STENCIL_BUFFER_BIT) {
+      struct gl_stencil_attrib *attr;
+      attr = MALLOC_STRUCT( gl_stencil_attrib );
+      MEMCPY( attr, &ctx->Stencil, sizeof(struct gl_stencil_attrib) );
+      newnode = new_attrib_node( GL_STENCIL_BUFFER_BIT );
+      newnode->data = attr;
+      newnode->next = head;
+      head = newnode;
+   }
+
+   if (mask & GL_TEXTURE_BIT) {
+      struct gl_texture_attrib *attr;
+      GLuint u;
+      /* Bump the texture object reference counts so that they don't
+       * inadvertantly get deleted.
+       */
+      for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {
+	 ctx->Texture.Unit[u].Current1D->RefCount++;
+	 ctx->Texture.Unit[u].Current2D->RefCount++;
+	 ctx->Texture.Unit[u].Current3D->RefCount++;
+	 ctx->Texture.Unit[u].CurrentCubeMap->RefCount++;
+	 ctx->Texture.Unit[u].CurrentRect->RefCount++;
+      }
+      attr = MALLOC_STRUCT( gl_texture_attrib );
+      MEMCPY( attr, &ctx->Texture, sizeof(struct gl_texture_attrib) );
+      /* copy state of the currently bound texture objects */
+      for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {
+         _mesa_copy_texture_object(&attr->Unit[u].Saved1D,
+                                   attr->Unit[u].Current1D);
+         _mesa_copy_texture_object(&attr->Unit[u].Saved2D,
+                                   attr->Unit[u].Current2D);
+         _mesa_copy_texture_object(&attr->Unit[u].Saved3D,
+                                   attr->Unit[u].Current3D);
+         _mesa_copy_texture_object(&attr->Unit[u].SavedCubeMap,
+                                   attr->Unit[u].CurrentCubeMap);
+         _mesa_copy_texture_object(&attr->Unit[u].SavedRect,
+                                   attr->Unit[u].CurrentRect);
+      }
+      newnode = new_attrib_node( GL_TEXTURE_BIT );
+      newnode->data = attr;
+      newnode->next = head;
+      head = newnode;
+   }
+
+   if (mask & GL_TRANSFORM_BIT) {
+      struct gl_transform_attrib *attr;
+      attr = MALLOC_STRUCT( gl_transform_attrib );
+      MEMCPY( attr, &ctx->Transform, sizeof(struct gl_transform_attrib) );
+      newnode = new_attrib_node( GL_TRANSFORM_BIT );
+      newnode->data = attr;
+      newnode->next = head;
+      head = newnode;
+   }
+
+   if (mask & GL_VIEWPORT_BIT) {
+      struct gl_viewport_attrib *attr;
+      attr = MALLOC_STRUCT( gl_viewport_attrib );
+      MEMCPY( attr, &ctx->Viewport, sizeof(struct gl_viewport_attrib) );
+      newnode = new_attrib_node( GL_VIEWPORT_BIT );
+      newnode->data = attr;
+      newnode->next = head;
+      head = newnode;
+   }
+
+   /* GL_ARB_multisample */
+   if (mask & GL_MULTISAMPLE_BIT_ARB) {
+      struct gl_multisample_attrib *attr;
+      attr = MALLOC_STRUCT( gl_multisample_attrib );
+      MEMCPY( attr, &ctx->Multisample, sizeof(struct gl_multisample_attrib) );
+      newnode = new_attrib_node( GL_MULTISAMPLE_BIT_ARB );
+      newnode->data = attr;
+      newnode->next = head;
+      head = newnode;
+   }
+
+   ctx->AttribStack[ctx->AttribStackDepth] = head;
+   ctx->AttribStackDepth++;
+}
+
+
+
+static void
+pop_enable_group(GLcontext *ctx, const struct gl_enable_attrib *enable)
+{
+   GLuint i;
+
+#define TEST_AND_UPDATE(VALUE, NEWVALUE, ENUM)		\
+	if ((VALUE) != (NEWVALUE)) {			\
+	   _mesa_set_enable( ctx, ENUM, (NEWVALUE) );	\
+	}
+
+   TEST_AND_UPDATE(ctx->Color.AlphaEnabled, enable->AlphaTest, GL_ALPHA_TEST);
+   TEST_AND_UPDATE(ctx->Color.BlendEnabled, enable->Blend, GL_BLEND);
+
+   for (i=0;i<MAX_CLIP_PLANES;i++) {
+      const GLuint mask = 1 << i;
+      if ((ctx->Transform.ClipPlanesEnabled & mask) != (enable->ClipPlanes & mask))
+	  _mesa_set_enable(ctx, (GLenum) (GL_CLIP_PLANE0 + i),
+			   (GLboolean) ((enable->ClipPlanes & mask) ? GL_TRUE : GL_FALSE));
+   }
+
+   TEST_AND_UPDATE(ctx->Light.ColorMaterialEnabled, enable->ColorMaterial,
+                   GL_COLOR_MATERIAL);
+   TEST_AND_UPDATE(ctx->Pixel.ColorTableEnabled, enable->ColorTable,
+                   GL_COLOR_TABLE);
+   TEST_AND_UPDATE(ctx->Pixel.PostColorMatrixColorTableEnabled,
+                   enable->PostColorMatrixColorTable,
+                   GL_POST_COLOR_MATRIX_COLOR_TABLE);
+   TEST_AND_UPDATE(ctx->Pixel.PostConvolutionColorTableEnabled,
+                   enable->PostConvolutionColorTable,
+                   GL_POST_CONVOLUTION_COLOR_TABLE);
+   TEST_AND_UPDATE(ctx->Polygon.CullFlag, enable->CullFace, GL_CULL_FACE);
+   TEST_AND_UPDATE(ctx->Depth.Test, enable->DepthTest, GL_DEPTH_TEST);
+   TEST_AND_UPDATE(ctx->Color.DitherFlag, enable->Dither, GL_DITHER);
+   TEST_AND_UPDATE(ctx->Pixel.Convolution1DEnabled, enable->Convolution1D,
+                   GL_CONVOLUTION_1D);
+   TEST_AND_UPDATE(ctx->Pixel.Convolution2DEnabled, enable->Convolution2D,
+                   GL_CONVOLUTION_2D);
+   TEST_AND_UPDATE(ctx->Pixel.Separable2DEnabled, enable->Separable2D,
+                   GL_SEPARABLE_2D);
+   TEST_AND_UPDATE(ctx->Fog.Enabled, enable->Fog, GL_FOG);
+   TEST_AND_UPDATE(ctx->Light.Enabled, enable->Lighting, GL_LIGHTING);
+   TEST_AND_UPDATE(ctx->Line.SmoothFlag, enable->LineSmooth, GL_LINE_SMOOTH);
+   TEST_AND_UPDATE(ctx->Line.StippleFlag, enable->LineStipple,
+                   GL_LINE_STIPPLE);
+   TEST_AND_UPDATE(ctx->Color.IndexLogicOpEnabled, enable->IndexLogicOp,
+                   GL_INDEX_LOGIC_OP);
+   TEST_AND_UPDATE(ctx->Color.ColorLogicOpEnabled, enable->ColorLogicOp,
+                   GL_COLOR_LOGIC_OP);
+
+   TEST_AND_UPDATE(ctx->Eval.Map1Color4, enable->Map1Color4, GL_MAP1_COLOR_4);
+   TEST_AND_UPDATE(ctx->Eval.Map1Index, enable->Map1Index, GL_MAP1_INDEX);
+   TEST_AND_UPDATE(ctx->Eval.Map1Normal, enable->Map1Normal, GL_MAP1_NORMAL);
+   TEST_AND_UPDATE(ctx->Eval.Map1TextureCoord1, enable->Map1TextureCoord1,
+                   GL_MAP1_TEXTURE_COORD_1);
+   TEST_AND_UPDATE(ctx->Eval.Map1TextureCoord2, enable->Map1TextureCoord2,
+                   GL_MAP1_TEXTURE_COORD_2);
+   TEST_AND_UPDATE(ctx->Eval.Map1TextureCoord3, enable->Map1TextureCoord3,
+                   GL_MAP1_TEXTURE_COORD_3);
+   TEST_AND_UPDATE(ctx->Eval.Map1TextureCoord4, enable->Map1TextureCoord4,
+                   GL_MAP1_TEXTURE_COORD_4);
+   TEST_AND_UPDATE(ctx->Eval.Map1Vertex3, enable->Map1Vertex3,
+                   GL_MAP1_VERTEX_3);
+   TEST_AND_UPDATE(ctx->Eval.Map1Vertex4, enable->Map1Vertex4,
+                   GL_MAP1_VERTEX_4);
+   for (i = 0; i < 16; i++) {
+      TEST_AND_UPDATE(ctx->Eval.Map1Attrib[i], enable->Map1Attrib[i],
+                      GL_MAP1_VERTEX_ATTRIB0_4_NV + i);
+   }
+
+   TEST_AND_UPDATE(ctx->Eval.Map2Color4, enable->Map2Color4, GL_MAP2_COLOR_4);
+   TEST_AND_UPDATE(ctx->Eval.Map2Index, enable->Map2Index, GL_MAP2_INDEX);
+   TEST_AND_UPDATE(ctx->Eval.Map2Normal, enable->Map2Normal, GL_MAP2_NORMAL);
+   TEST_AND_UPDATE(ctx->Eval.Map2TextureCoord1, enable->Map2TextureCoord1,
+                   GL_MAP2_TEXTURE_COORD_1);
+   TEST_AND_UPDATE(ctx->Eval.Map2TextureCoord2, enable->Map2TextureCoord2,
+                   GL_MAP2_TEXTURE_COORD_2);
+   TEST_AND_UPDATE(ctx->Eval.Map2TextureCoord3, enable->Map2TextureCoord3,
+                   GL_MAP2_TEXTURE_COORD_3);
+   TEST_AND_UPDATE(ctx->Eval.Map2TextureCoord4, enable->Map2TextureCoord4,
+                   GL_MAP2_TEXTURE_COORD_4);
+   TEST_AND_UPDATE(ctx->Eval.Map2Vertex3, enable->Map2Vertex3,
+                   GL_MAP2_VERTEX_3);
+   TEST_AND_UPDATE(ctx->Eval.Map2Vertex4, enable->Map2Vertex4,
+                   GL_MAP2_VERTEX_4);
+   for (i = 0; i < 16; i++) {
+      TEST_AND_UPDATE(ctx->Eval.Map2Attrib[i], enable->Map2Attrib[i],
+                      GL_MAP2_VERTEX_ATTRIB0_4_NV + i);
+   }
+
+   TEST_AND_UPDATE(ctx->Eval.AutoNormal, enable->AutoNormal, GL_AUTO_NORMAL);
+   TEST_AND_UPDATE(ctx->Transform.Normalize, enable->Normalize, GL_NORMALIZE);
+   TEST_AND_UPDATE(ctx->Transform.RescaleNormals, enable->RescaleNormals,
+                   GL_RESCALE_NORMAL_EXT);
+   TEST_AND_UPDATE(ctx->Transform.RasterPositionUnclipped,
+                   enable->RasterPositionUnclipped,
+                   GL_RASTER_POSITION_UNCLIPPED_IBM);
+   TEST_AND_UPDATE(ctx->Pixel.PixelTextureEnabled, enable->PixelTexture,
+                   GL_POINT_SMOOTH);
+   TEST_AND_UPDATE(ctx->Point.SmoothFlag, enable->PointSmooth,
+                   GL_POINT_SMOOTH);
+   if (ctx->Extensions.NV_point_sprite || ctx->Extensions.ARB_point_sprite) {
+      TEST_AND_UPDATE(ctx->Point.PointSprite, enable->PointSprite,
+                      GL_POINT_SPRITE_NV);
+   }
+   TEST_AND_UPDATE(ctx->Polygon.OffsetPoint, enable->PolygonOffsetPoint,
+                   GL_POLYGON_OFFSET_POINT);
+   TEST_AND_UPDATE(ctx->Polygon.OffsetLine, enable->PolygonOffsetLine,
+                   GL_POLYGON_OFFSET_LINE);
+   TEST_AND_UPDATE(ctx->Polygon.OffsetFill, enable->PolygonOffsetFill,
+                   GL_POLYGON_OFFSET_FILL);
+   TEST_AND_UPDATE(ctx->Polygon.SmoothFlag, enable->PolygonSmooth,
+                   GL_POLYGON_SMOOTH);
+   TEST_AND_UPDATE(ctx->Polygon.StippleFlag, enable->PolygonStipple,
+                   GL_POLYGON_STIPPLE);
+   TEST_AND_UPDATE(ctx->Scissor.Enabled, enable->Scissor, GL_SCISSOR_TEST);
+   TEST_AND_UPDATE(ctx->Stencil.Enabled, enable->Stencil, GL_STENCIL_TEST);
+   /* XXX two-sided stencil */
+   TEST_AND_UPDATE(ctx->Multisample.Enabled, enable->MultisampleEnabled,
+                   GL_MULTISAMPLE_ARB);
+   TEST_AND_UPDATE(ctx->Multisample.SampleAlphaToCoverage,
+                   enable->SampleAlphaToCoverage,
+                   GL_SAMPLE_ALPHA_TO_COVERAGE_ARB);
+   TEST_AND_UPDATE(ctx->Multisample.SampleAlphaToOne,
+                   enable->SampleAlphaToOne,
+                   GL_SAMPLE_ALPHA_TO_ONE_ARB);
+   TEST_AND_UPDATE(ctx->Multisample.SampleCoverage,
+                   enable->SampleCoverage,
+                   GL_SAMPLE_COVERAGE_ARB);
+   TEST_AND_UPDATE(ctx->Multisample.SampleCoverageInvert,
+                   enable->SampleCoverageInvert,
+                   GL_SAMPLE_COVERAGE_INVERT_ARB);
+   /* GL_NV_vertex_program */
+   TEST_AND_UPDATE(ctx->VertexProgram.Enabled,
+                   enable->VertexProgram,
+                   GL_VERTEX_PROGRAM_NV);
+   TEST_AND_UPDATE(ctx->VertexProgram.PointSizeEnabled,
+                   enable->VertexProgramPointSize,
+                   GL_VERTEX_PROGRAM_POINT_SIZE_NV);
+   TEST_AND_UPDATE(ctx->VertexProgram.TwoSideEnabled,
+                   enable->VertexProgramTwoSide,
+                   GL_VERTEX_PROGRAM_TWO_SIDE_NV);
+
+#undef TEST_AND_UPDATE
+
+   /* texture unit enables */
+   for (i = 0; i < ctx->Const.MaxTextureUnits; i++) {
+      if (ctx->Texture.Unit[i].Enabled != enable->Texture[i]) {
+         ctx->Texture.Unit[i].Enabled = enable->Texture[i];
+         if (ctx->Driver.Enable) {
+            if (ctx->Driver.ActiveTexture) {
+               (*ctx->Driver.ActiveTexture)(ctx, i);
+            }
+            (*ctx->Driver.Enable)( ctx, GL_TEXTURE_1D,
+                             (GLboolean) (enable->Texture[i] & TEXTURE_1D_BIT) );
+            (*ctx->Driver.Enable)( ctx, GL_TEXTURE_2D,
+                             (GLboolean) (enable->Texture[i] & TEXTURE_2D_BIT) );
+            (*ctx->Driver.Enable)( ctx, GL_TEXTURE_3D,
+                             (GLboolean) (enable->Texture[i] & TEXTURE_3D_BIT) );
+            if (ctx->Extensions.ARB_texture_cube_map)
+               (*ctx->Driver.Enable)( ctx, GL_TEXTURE_CUBE_MAP_ARB,
+                          (GLboolean) (enable->Texture[i] & TEXTURE_CUBE_BIT) );
+            if (ctx->Extensions.NV_texture_rectangle)
+               (*ctx->Driver.Enable)( ctx, GL_TEXTURE_RECTANGLE_NV,
+                          (GLboolean) (enable->Texture[i] & TEXTURE_RECT_BIT) );
+         }
+      }
+
+      if (ctx->Texture.Unit[i].TexGenEnabled != enable->TexGen[i]) {
+         ctx->Texture.Unit[i].TexGenEnabled = enable->TexGen[i];
+         if (ctx->Driver.Enable) {
+            if (ctx->Driver.ActiveTexture) {
+               (*ctx->Driver.ActiveTexture)(ctx, i);
+            }
+            if (enable->TexGen[i] & S_BIT)
+               (*ctx->Driver.Enable)( ctx, GL_TEXTURE_GEN_S, GL_TRUE);
+            else
+               (*ctx->Driver.Enable)( ctx, GL_TEXTURE_GEN_S, GL_FALSE);
+            if (enable->TexGen[i] & T_BIT)
+               (*ctx->Driver.Enable)( ctx, GL_TEXTURE_GEN_T, GL_TRUE);
+            else
+               (*ctx->Driver.Enable)( ctx, GL_TEXTURE_GEN_T, GL_FALSE);
+            if (enable->TexGen[i] & R_BIT)
+               (*ctx->Driver.Enable)( ctx, GL_TEXTURE_GEN_R, GL_TRUE);
+            else
+               (*ctx->Driver.Enable)( ctx, GL_TEXTURE_GEN_R, GL_FALSE);
+            if (enable->TexGen[i] & Q_BIT)
+               (*ctx->Driver.Enable)( ctx, GL_TEXTURE_GEN_Q, GL_TRUE);
+            else
+               (*ctx->Driver.Enable)( ctx, GL_TEXTURE_GEN_Q, GL_FALSE);
+         }
+      }
+
+      /* GL_SGI_texture_color_table */
+      ctx->Texture.Unit[i].ColorTableEnabled = enable->TextureColorTable[i];
+   }
+
+   if (ctx->Driver.ActiveTexture) {
+      (*ctx->Driver.ActiveTexture)(ctx, ctx->Texture.CurrentUnit);
+   }
+}
+
+
+static void
+pop_texture_group(GLcontext *ctx, const struct gl_texture_attrib *texAttrib)
+{
+   GLuint u;
+
+   for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {
+      const struct gl_texture_unit *unit = &texAttrib->Unit[u];
+      GLuint i;
+
+      _mesa_ActiveTextureARB(GL_TEXTURE0_ARB + u);
+      _mesa_set_enable(ctx, GL_TEXTURE_1D,
+              (GLboolean) (unit->Enabled & TEXTURE_1D_BIT ? GL_TRUE : GL_FALSE));
+      _mesa_set_enable(ctx, GL_TEXTURE_2D,
+              (GLboolean) (unit->Enabled & TEXTURE_2D_BIT ? GL_TRUE : GL_FALSE));
+      _mesa_set_enable(ctx, GL_TEXTURE_3D,
+              (GLboolean) (unit->Enabled & TEXTURE_3D_BIT ? GL_TRUE : GL_FALSE));
+      if (ctx->Extensions.ARB_texture_cube_map) {
+         _mesa_set_enable(ctx, GL_TEXTURE_CUBE_MAP_ARB,
+             (GLboolean) (unit->Enabled & TEXTURE_CUBE_BIT ? GL_TRUE : GL_FALSE));
+      }
+      if (ctx->Extensions.NV_texture_rectangle) {
+         _mesa_set_enable(ctx, GL_TEXTURE_RECTANGLE_NV,
+             (GLboolean) (unit->Enabled & TEXTURE_RECT_BIT ? GL_TRUE : GL_FALSE));
+      }
+      if (ctx->Extensions.SGI_texture_color_table) {
+         _mesa_set_enable(ctx, GL_TEXTURE_COLOR_TABLE_SGI,
+                          unit->ColorTableEnabled);
+      }
+      _mesa_TexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, unit->EnvMode);
+      _mesa_TexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, unit->EnvColor);
+      _mesa_TexGeni(GL_S, GL_TEXTURE_GEN_MODE, unit->GenModeS);
+      _mesa_TexGeni(GL_T, GL_TEXTURE_GEN_MODE, unit->GenModeT);
+      _mesa_TexGeni(GL_R, GL_TEXTURE_GEN_MODE, unit->GenModeR);
+      _mesa_TexGeni(GL_Q, GL_TEXTURE_GEN_MODE, unit->GenModeQ);
+      _mesa_TexGenfv(GL_S, GL_OBJECT_PLANE, unit->ObjectPlaneS);
+      _mesa_TexGenfv(GL_T, GL_OBJECT_PLANE, unit->ObjectPlaneT);
+      _mesa_TexGenfv(GL_R, GL_OBJECT_PLANE, unit->ObjectPlaneR);
+      _mesa_TexGenfv(GL_Q, GL_OBJECT_PLANE, unit->ObjectPlaneQ);
+      _mesa_TexGenfv(GL_S, GL_EYE_PLANE, unit->EyePlaneS);
+      _mesa_TexGenfv(GL_T, GL_EYE_PLANE, unit->EyePlaneT);
+      _mesa_TexGenfv(GL_R, GL_EYE_PLANE, unit->EyePlaneR);
+      _mesa_TexGenfv(GL_Q, GL_EYE_PLANE, unit->EyePlaneQ);
+      if (ctx->Extensions.EXT_texture_lod_bias) {
+         _mesa_TexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT,
+                       GL_TEXTURE_LOD_BIAS_EXT, unit->LodBias);
+      }
+      if (ctx->Extensions.EXT_texture_env_combine ||
+          ctx->Extensions.ARB_texture_env_combine) {
+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT,
+                       unit->CombineModeRGB);
+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_EXT,
+                       unit->CombineModeA);
+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB_EXT,
+                       unit->CombineSourceRGB[0]);
+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT,
+                       unit->CombineSourceRGB[1]);
+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_SOURCE2_RGB_EXT,
+                       unit->CombineSourceRGB[2]);
+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_EXT,
+                       unit->CombineSourceA[0]);
+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_ALPHA_EXT,
+                       unit->CombineSourceA[1]);
+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_SOURCE2_ALPHA_EXT,
+                       unit->CombineSourceA[2]);
+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_RGB_EXT,
+                       unit->CombineOperandRGB[0]);
+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_RGB_EXT,
+                       unit->CombineOperandRGB[1]);
+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_RGB_EXT,
+                       unit->CombineOperandRGB[2]);
+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_ALPHA_EXT,
+                       unit->CombineOperandA[0]);
+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_ALPHA_EXT,
+                       unit->CombineOperandA[1]);
+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_ALPHA_EXT,
+                       unit->CombineOperandA[2]);
+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE_EXT,
+                       1 << unit->CombineScaleShiftRGB);
+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_ALPHA_SCALE,
+                       1 << unit->CombineScaleShiftA);
+      }
+
+      /* Restore texture object state */
+      for (i = 0; i < NUM_TEXTURE_TARGETS; i++) {
+         GLenum target = 0;
+         const struct gl_texture_object *obj = NULL;
+         GLfloat bordColor[4];
+
+         switch (i) {
+         case 0:
+            target = GL_TEXTURE_1D;
+            obj = &unit->Saved1D;
+            break;
+         case 1:
+            target = GL_TEXTURE_2D;
+            obj = &unit->Saved2D;
+            break;
+         case 2:
+            target = GL_TEXTURE_3D;
+            obj = &unit->Saved3D;
+            break;
+         case 3:
+            if (!ctx->Extensions.ARB_texture_cube_map)
+               continue;
+            target = GL_TEXTURE_CUBE_MAP_ARB;
+            obj = &unit->SavedCubeMap;
+            break;
+         case 4:
+            if (!ctx->Extensions.NV_texture_rectangle)
+               continue;
+            target = GL_TEXTURE_RECTANGLE_NV;
+            obj = &unit->SavedRect;
+            break;
+         default:
+            ; /* silence warnings */
+         }
+
+         _mesa_BindTexture(target, obj->Name);
+
+         bordColor[0] = CHAN_TO_FLOAT(obj->BorderColor[0]);
+         bordColor[1] = CHAN_TO_FLOAT(obj->BorderColor[1]);
+         bordColor[2] = CHAN_TO_FLOAT(obj->BorderColor[2]);
+         bordColor[3] = CHAN_TO_FLOAT(obj->BorderColor[3]);
+
+         _mesa_TexParameterf(target, GL_TEXTURE_PRIORITY, obj->Priority);
+         _mesa_TexParameterfv(target, GL_TEXTURE_BORDER_COLOR, bordColor);
+         _mesa_TexParameteri(target, GL_TEXTURE_WRAP_S, obj->WrapS);
+         _mesa_TexParameteri(target, GL_TEXTURE_WRAP_T, obj->WrapT);
+         _mesa_TexParameteri(target, GL_TEXTURE_WRAP_R, obj->WrapR);
+         _mesa_TexParameteri(target, GL_TEXTURE_MIN_FILTER, obj->MinFilter);
+         _mesa_TexParameteri(target, GL_TEXTURE_MAG_FILTER, obj->MagFilter);
+         _mesa_TexParameterf(target, GL_TEXTURE_MIN_LOD, obj->MinLod);
+         _mesa_TexParameterf(target, GL_TEXTURE_MAX_LOD, obj->MaxLod);
+         _mesa_TexParameteri(target, GL_TEXTURE_BASE_LEVEL, obj->BaseLevel);
+         _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, obj->MaxLevel);
+         if (ctx->Extensions.EXT_texture_filter_anisotropic) {
+            _mesa_TexParameterf(target, GL_TEXTURE_MAX_ANISOTROPY_EXT,
+                                obj->MaxAnisotropy);
+         }
+         if (ctx->Extensions.SGIX_shadow) {
+            _mesa_TexParameteri(target, GL_TEXTURE_COMPARE_SGIX,
+                                obj->CompareFlag);
+            _mesa_TexParameteri(target, GL_TEXTURE_COMPARE_OPERATOR_SGIX,
+                                obj->CompareOperator);
+         }
+         if (ctx->Extensions.SGIX_shadow_ambient) {
+            _mesa_TexParameterf(target, GL_SHADOW_AMBIENT_SGIX,
+                                obj->ShadowAmbient);
+         }
+
+      }
+   }
+   _mesa_ActiveTextureARB(GL_TEXTURE0_ARB
+                          + texAttrib->CurrentUnit);
+
+   /* "un-bump" the texture object reference counts.  We did that so they
+    * wouldn't inadvertantly get deleted while they were still referenced
+    * inside the attribute state stack.
+    */
+   for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {
+      ctx->Texture.Unit[u].Current1D->RefCount--;
+      ctx->Texture.Unit[u].Current2D->RefCount--;
+      ctx->Texture.Unit[u].Current3D->RefCount--;
+      ctx->Texture.Unit[u].CurrentCubeMap->RefCount--;
+      ctx->Texture.Unit[u].CurrentRect->RefCount--;
+   }
+}
+
+
+/*
+ * This function is kind of long just because we have to call a lot
+ * of device driver functions to update device driver state.
+ *
+ * XXX As it is now, most of the pop-code calls immediate-mode Mesa functions
+ * in order to restore GL state.  This isn't terribly efficient but it
+ * ensures that dirty flags and any derived state gets updated correctly.
+ * We could at least check if the value to restore equals the current value
+ * and then skip the Mesa call.
+ */
+void GLAPIENTRY
+_mesa_PopAttrib(void)
+{
+   struct gl_attrib_node *attr, *next;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (ctx->AttribStackDepth == 0) {
+      _mesa_error( ctx, GL_STACK_UNDERFLOW, "glPopAttrib" );
+      return;
+   }
+
+   ctx->AttribStackDepth--;
+   attr = ctx->AttribStack[ctx->AttribStackDepth];
+
+   while (attr) {
+
+      if (MESA_VERBOSE & VERBOSE_API) {
+         _mesa_debug(ctx, "glPopAttrib %s\n",
+                     _mesa_lookup_enum_by_nr(attr->kind));
+      }
+
+      switch (attr->kind) {
+         case GL_ACCUM_BUFFER_BIT:
+            {
+               const struct gl_accum_attrib *accum;
+               accum = (const struct gl_accum_attrib *) attr->data;
+               _mesa_ClearAccum(accum->ClearColor[0],
+                                accum->ClearColor[1],
+                                accum->ClearColor[2],
+                                accum->ClearColor[3]);
+            }
+            break;
+         case GL_COLOR_BUFFER_BIT:
+            {
+               const struct gl_colorbuffer_attrib *color;
+               color = (const struct gl_colorbuffer_attrib *) attr->data;
+               _mesa_ClearIndex((GLfloat) color->ClearIndex);
+               _mesa_ClearColor(color->ClearColor[0],
+                                color->ClearColor[1],
+                                color->ClearColor[2],
+                                color->ClearColor[3]);
+               _mesa_IndexMask(color->IndexMask);
+               _mesa_ColorMask((GLboolean) (color->ColorMask[0] != 0),
+                               (GLboolean) (color->ColorMask[1] != 0),
+                               (GLboolean) (color->ColorMask[2] != 0),
+                               (GLboolean) (color->ColorMask[3] != 0));
+               _mesa_DrawBuffer(color->DrawBuffer);
+               _mesa_set_enable(ctx, GL_ALPHA_TEST, color->AlphaEnabled);
+               _mesa_AlphaFunc(color->AlphaFunc, color->AlphaRef);
+               _mesa_set_enable(ctx, GL_BLEND, color->BlendEnabled);
+               _mesa_BlendFuncSeparateEXT(color->BlendSrcRGB,
+                                          color->BlendDstRGB,
+                                          color->BlendSrcA,
+                                          color->BlendDstA);
+               _mesa_BlendEquation(color->BlendEquation);
+               _mesa_BlendColor(color->BlendColor[0],
+                                color->BlendColor[1],
+                                color->BlendColor[2],
+                                color->BlendColor[3]);
+               _mesa_LogicOp(color->LogicOp);
+               _mesa_set_enable(ctx, GL_COLOR_LOGIC_OP,
+                                color->ColorLogicOpEnabled);
+               _mesa_set_enable(ctx, GL_INDEX_LOGIC_OP,
+                                color->IndexLogicOpEnabled);
+               _mesa_set_enable(ctx, GL_DITHER, color->DitherFlag);
+            }
+            break;
+         case GL_CURRENT_BIT:
+	    FLUSH_CURRENT( ctx, 0 );
+            MEMCPY( &ctx->Current, attr->data,
+		    sizeof(struct gl_current_attrib) );
+            break;
+         case GL_DEPTH_BUFFER_BIT:
+            {
+               const struct gl_depthbuffer_attrib *depth;
+               depth = (const struct gl_depthbuffer_attrib *) attr->data;
+               _mesa_DepthFunc(depth->Func);
+               _mesa_ClearDepth(depth->Clear);
+               _mesa_set_enable(ctx, GL_DEPTH_TEST, depth->Test);
+               _mesa_DepthMask(depth->Mask);
+               if (ctx->Extensions.HP_occlusion_test)
+                  _mesa_set_enable(ctx, GL_OCCLUSION_TEST_HP,
+                                   depth->OcclusionTest);
+            }
+            break;
+         case GL_ENABLE_BIT:
+            {
+               const struct gl_enable_attrib *enable;
+               enable = (const struct gl_enable_attrib *) attr->data;
+               pop_enable_group(ctx, enable);
+	       ctx->NewState |= _NEW_ALL;
+            }
+            break;
+         case GL_EVAL_BIT:
+            MEMCPY( &ctx->Eval, attr->data, sizeof(struct gl_eval_attrib) );
+	    ctx->NewState |= _NEW_EVAL;
+            break;
+         case GL_FOG_BIT:
+            {
+               const struct gl_fog_attrib *fog;
+               fog = (const struct gl_fog_attrib *) attr->data;
+               _mesa_set_enable(ctx, GL_FOG, fog->Enabled);
+               _mesa_Fogfv(GL_FOG_COLOR, fog->Color);
+               _mesa_Fogf(GL_FOG_DENSITY, fog->Density);
+               _mesa_Fogf(GL_FOG_START, fog->Start);
+               _mesa_Fogf(GL_FOG_END, fog->End);
+               _mesa_Fogf(GL_FOG_INDEX, fog->Index);
+               _mesa_Fogi(GL_FOG_MODE, fog->Mode);
+            }
+            break;
+         case GL_HINT_BIT:
+            {
+               const struct gl_hint_attrib *hint;
+               hint = (const struct gl_hint_attrib *) attr->data;
+               _mesa_Hint(GL_PERSPECTIVE_CORRECTION_HINT,
+                          hint->PerspectiveCorrection );
+               _mesa_Hint(GL_POINT_SMOOTH_HINT, hint->PointSmooth);
+               _mesa_Hint(GL_LINE_SMOOTH_HINT, hint->LineSmooth);
+               _mesa_Hint(GL_POLYGON_SMOOTH_HINT, hint->PolygonSmooth);
+               _mesa_Hint(GL_FOG_HINT, hint->Fog);
+               _mesa_Hint(GL_CLIP_VOLUME_CLIPPING_HINT_EXT,
+                          hint->ClipVolumeClipping);
+               if (ctx->Extensions.ARB_texture_compression)
+                  _mesa_Hint(GL_TEXTURE_COMPRESSION_HINT_ARB,
+                             hint->TextureCompression);
+            }
+            break;
+         case GL_LIGHTING_BIT:
+            {
+               GLuint i;
+               const struct gl_light_attrib *light;
+               light = (const struct gl_light_attrib *) attr->data;
+               /* lighting enable */
+               _mesa_set_enable(ctx, GL_LIGHTING, light->Enabled);
+               /* per-light state */
+
+	       if (ctx->ModelviewMatrixStack.Top->flags & MAT_DIRTY_INVERSE) 
+		  _math_matrix_analyse( ctx->ModelviewMatrixStack.Top );
+	       
+               for (i = 0; i < MAX_LIGHTS; i++) {
+                  GLenum lgt = (GLenum) (GL_LIGHT0 + i);
+		  const struct gl_light *l = &light->Light[i];
+		  GLfloat tmp[4];
+                  _mesa_set_enable(ctx, lgt, l->Enabled);
+		  _mesa_Lightfv( lgt, GL_AMBIENT, l->Ambient );
+		  _mesa_Lightfv( lgt, GL_DIFFUSE, l->Diffuse );
+		  _mesa_Lightfv( lgt, GL_SPECULAR, l->Specular );
+		  TRANSFORM_POINT( tmp, ctx->ModelviewMatrixStack.Top->inv, l->EyePosition );
+		  _mesa_Lightfv( lgt, GL_POSITION, tmp );
+		  TRANSFORM_POINT( tmp, ctx->ModelviewMatrixStack.Top->m, l->EyeDirection );
+		  _mesa_Lightfv( lgt, GL_SPOT_DIRECTION, tmp );
+		  _mesa_Lightfv( lgt, GL_SPOT_EXPONENT, &l->SpotExponent );
+		  _mesa_Lightfv( lgt, GL_SPOT_CUTOFF, &l->SpotCutoff );
+		  _mesa_Lightfv( lgt, GL_CONSTANT_ATTENUATION, 
+				 &l->ConstantAttenuation );
+		  _mesa_Lightfv( lgt, GL_LINEAR_ATTENUATION, 
+				 &l->LinearAttenuation );
+		  _mesa_Lightfv( lgt, GL_QUADRATIC_ATTENUATION, 
+				 &l->QuadraticAttenuation );
+               }
+               /* light model */
+               _mesa_LightModelfv(GL_LIGHT_MODEL_AMBIENT,
+                                  light->Model.Ambient);
+               _mesa_LightModelf(GL_LIGHT_MODEL_LOCAL_VIEWER,
+                                 (GLfloat) light->Model.LocalViewer);
+               _mesa_LightModelf(GL_LIGHT_MODEL_TWO_SIDE,
+                                 (GLfloat) light->Model.TwoSide);
+               _mesa_LightModelf(GL_LIGHT_MODEL_COLOR_CONTROL,
+                                 (GLfloat) light->Model.ColorControl);
+               /* materials */
+               MEMCPY(&ctx->Light.Material, &light->Material,
+                      sizeof(struct gl_material));
+               /* shade model */
+               _mesa_ShadeModel(light->ShadeModel);
+               /* color material */
+               _mesa_ColorMaterial(light->ColorMaterialFace,
+                                   light->ColorMaterialMode);
+               _mesa_set_enable(ctx, GL_COLOR_MATERIAL,
+                                light->ColorMaterialEnabled);
+            }
+            break;
+         case GL_LINE_BIT:
+            {
+               const struct gl_line_attrib *line;
+               line = (const struct gl_line_attrib *) attr->data;
+               _mesa_set_enable(ctx, GL_LINE_SMOOTH, line->SmoothFlag);
+               _mesa_set_enable(ctx, GL_LINE_STIPPLE, line->StippleFlag);
+               _mesa_LineStipple(line->StippleFactor, line->StipplePattern);
+               _mesa_LineWidth(line->Width);
+            }
+            break;
+         case GL_LIST_BIT:
+            MEMCPY( &ctx->List, attr->data, sizeof(struct gl_list_attrib) );
+            break;
+         case GL_PIXEL_MODE_BIT:
+            MEMCPY( &ctx->Pixel, attr->data, sizeof(struct gl_pixel_attrib) );
+	    ctx->NewState |= _NEW_PIXEL;
+            break;
+         case GL_POINT_BIT:
+            {
+               const struct gl_point_attrib *point;
+               point = (const struct gl_point_attrib *) attr->data;
+               _mesa_PointSize(point->Size);
+               _mesa_set_enable(ctx, GL_POINT_SMOOTH, point->SmoothFlag);
+               if (ctx->Extensions.EXT_point_parameters) {
+                  _mesa_PointParameterfvEXT(GL_DISTANCE_ATTENUATION_EXT,
+                                            point->Params);
+                  _mesa_PointParameterfEXT(GL_POINT_SIZE_MIN_EXT,
+                                           point->MinSize);
+                  _mesa_PointParameterfEXT(GL_POINT_SIZE_MAX_EXT,
+                                           point->MaxSize);
+                  _mesa_PointParameterfEXT(GL_POINT_FADE_THRESHOLD_SIZE_EXT,
+                                           point->Threshold);
+               }
+               if (ctx->Extensions.NV_point_sprite
+		   || ctx->Extensions.ARB_point_sprite) {
+                  GLuint u;
+                  for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {
+                     _mesa_TexEnvi(GL_POINT_SPRITE_NV, GL_COORD_REPLACE_NV,
+                                   (GLint) point->CoordReplace[u]);
+                  }
+                  _mesa_set_enable(ctx, GL_POINT_SPRITE_NV,point->PointSprite);
+                  _mesa_PointParameteriNV(GL_POINT_SPRITE_R_MODE_NV,
+                                          ctx->Point.SpriteRMode);
+               }
+            }
+            break;
+         case GL_POLYGON_BIT:
+            {
+               const struct gl_polygon_attrib *polygon;
+               polygon = (const struct gl_polygon_attrib *) attr->data;
+               _mesa_CullFace(polygon->CullFaceMode);
+               _mesa_FrontFace(polygon->FrontFace);
+               _mesa_PolygonMode(GL_FRONT, polygon->FrontMode);
+               _mesa_PolygonMode(GL_BACK, polygon->BackMode);
+               _mesa_PolygonOffset(polygon->OffsetFactor,
+                                   polygon->OffsetUnits);
+               _mesa_set_enable(ctx, GL_POLYGON_SMOOTH, polygon->SmoothFlag);
+               _mesa_set_enable(ctx, GL_POLYGON_STIPPLE, polygon->StippleFlag);
+               _mesa_set_enable(ctx, GL_CULL_FACE, polygon->CullFlag);
+               _mesa_set_enable(ctx, GL_POLYGON_OFFSET_POINT,
+                                polygon->OffsetPoint);
+               _mesa_set_enable(ctx, GL_POLYGON_OFFSET_LINE,
+                                polygon->OffsetLine);
+               _mesa_set_enable(ctx, GL_POLYGON_OFFSET_FILL,
+                                polygon->OffsetFill);
+            }
+            break;
+	 case GL_POLYGON_STIPPLE_BIT:
+	    MEMCPY( ctx->PolygonStipple, attr->data, 32*sizeof(GLuint) );
+	    ctx->NewState |= _NEW_POLYGONSTIPPLE;
+	    if (ctx->Driver.PolygonStipple)
+	       ctx->Driver.PolygonStipple( ctx, (const GLubyte *) attr->data );
+	    break;
+         case GL_SCISSOR_BIT:
+            {
+               const struct gl_scissor_attrib *scissor;
+               scissor = (const struct gl_scissor_attrib *) attr->data;
+               _mesa_Scissor(scissor->X, scissor->Y,
+                             scissor->Width, scissor->Height);
+               _mesa_set_enable(ctx, GL_SCISSOR_TEST, scissor->Enabled);
+            }
+            break;
+         case GL_STENCIL_BUFFER_BIT:
+            {
+               const GLint face = 0; /* XXX stencil two side */
+               const struct gl_stencil_attrib *stencil;
+               stencil = (const struct gl_stencil_attrib *) attr->data;
+               _mesa_set_enable(ctx, GL_STENCIL_TEST, stencil->Enabled);
+               _mesa_ClearStencil(stencil->Clear);
+               _mesa_StencilFunc(stencil->Function[face], stencil->Ref[face],
+                                 stencil->ValueMask[face]);
+               _mesa_StencilMask(stencil->WriteMask[face]);
+               _mesa_StencilOp(stencil->FailFunc[face],
+                               stencil->ZFailFunc[face],
+                               stencil->ZPassFunc[face]);
+            }
+            break;
+         case GL_TRANSFORM_BIT:
+            {
+               GLuint i;
+               const struct gl_transform_attrib *xform;
+               xform = (const struct gl_transform_attrib *) attr->data;
+               _mesa_MatrixMode(xform->MatrixMode);
+
+               if (ctx->ProjectionMatrixStack.Top->flags & MAT_DIRTY)
+                  _math_matrix_analyse( ctx->ProjectionMatrixStack.Top );
+
+               /* restore clip planes */
+               for (i = 0; i < MAX_CLIP_PLANES; i++) {
+                  const GLuint mask = 1 << 1;
+                  const GLfloat *eyePlane = xform->EyeUserPlane[i];
+                  COPY_4V(ctx->Transform.EyeUserPlane[i], eyePlane);
+                  if (xform->ClipPlanesEnabled & mask) {
+                     _mesa_set_enable(ctx, GL_CLIP_PLANE0 + i, GL_TRUE);
+                  }
+                  else {
+                     _mesa_set_enable(ctx, GL_CLIP_PLANE0 + i, GL_FALSE);
+                  }
+                  if (ctx->Driver.ClipPlane)
+                     ctx->Driver.ClipPlane( ctx, GL_CLIP_PLANE0 + i, eyePlane );
+               }
+
+               /* normalize/rescale */
+               if (xform->Normalize != ctx->Transform.Normalize)
+                  _mesa_set_enable(ctx, GL_NORMALIZE,ctx->Transform.Normalize);
+               if (xform->RescaleNormals != ctx->Transform.RescaleNormals)
+                  _mesa_set_enable(ctx, GL_RESCALE_NORMAL_EXT,
+                                   ctx->Transform.RescaleNormals);
+            }
+            break;
+         case GL_TEXTURE_BIT:
+            /* Take care of texture object reference counters */
+            {
+               const struct gl_texture_attrib *texture;
+               texture = (const struct gl_texture_attrib *) attr->data;
+               pop_texture_group(ctx, texture);
+	       ctx->NewState |= _NEW_TEXTURE;
+            }
+            break;
+         case GL_VIEWPORT_BIT:
+            {
+               const struct gl_viewport_attrib *vp;
+               vp = (const struct gl_viewport_attrib *) attr->data;
+               _mesa_Viewport(vp->X, vp->Y, vp->Width, vp->Height);
+               _mesa_DepthRange(vp->Near, vp->Far);
+            }
+            break;
+         case GL_MULTISAMPLE_BIT_ARB:
+            {
+               const struct gl_multisample_attrib *ms;
+               ms = (const struct gl_multisample_attrib *) attr->data;
+               _mesa_SampleCoverageARB(ms->SampleCoverageValue,
+                                       ms->SampleCoverageInvert);
+            }
+            break;
+
+         default:
+            _mesa_problem( ctx, "Bad attrib flag in PopAttrib");
+            break;
+      }
+
+      next = attr->next;
+      FREE( attr->data );
+      FREE( attr );
+      attr = next;
+   }
+}
+
+
+#define GL_CLIENT_PACK_BIT (1<<20)
+#define GL_CLIENT_UNPACK_BIT (1<<21)
+
+
+void GLAPIENTRY
+_mesa_PushClientAttrib(GLbitfield mask)
+{
+   struct gl_attrib_node *newnode;
+   struct gl_attrib_node *head;
+
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (ctx->ClientAttribStackDepth >= MAX_CLIENT_ATTRIB_STACK_DEPTH) {
+      _mesa_error( ctx, GL_STACK_OVERFLOW, "glPushClientAttrib" );
+      return;
+   }
+
+   /* Build linked list of attribute nodes which save all attribute */
+   /* groups specified by the mask. */
+   head = NULL;
+
+   if (mask & GL_CLIENT_PIXEL_STORE_BIT) {
+      struct gl_pixelstore_attrib *attr;
+      /* packing attribs */
+      attr = MALLOC_STRUCT( gl_pixelstore_attrib );
+      MEMCPY( attr, &ctx->Pack, sizeof(struct gl_pixelstore_attrib) );
+      newnode = new_attrib_node( GL_CLIENT_PACK_BIT );
+      newnode->data = attr;
+      newnode->next = head;
+      head = newnode;
+      /* unpacking attribs */
+      attr = MALLOC_STRUCT( gl_pixelstore_attrib );
+      MEMCPY( attr, &ctx->Unpack, sizeof(struct gl_pixelstore_attrib) );
+      newnode = new_attrib_node( GL_CLIENT_UNPACK_BIT );
+      newnode->data = attr;
+      newnode->next = head;
+      head = newnode;
+   }
+   if (mask & GL_CLIENT_VERTEX_ARRAY_BIT) {
+      struct gl_array_attrib *attr;
+      attr = MALLOC_STRUCT( gl_array_attrib );
+      MEMCPY( attr, &ctx->Array, sizeof(struct gl_array_attrib) );
+      newnode = new_attrib_node( GL_CLIENT_VERTEX_ARRAY_BIT );
+      newnode->data = attr;
+      newnode->next = head;
+      head = newnode;
+   }
+
+   ctx->ClientAttribStack[ctx->ClientAttribStackDepth] = head;
+   ctx->ClientAttribStackDepth++;
+}
+
+
+
+
+void GLAPIENTRY
+_mesa_PopClientAttrib(void)
+{
+   struct gl_attrib_node *attr, *next;
+
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (ctx->ClientAttribStackDepth == 0) {
+      _mesa_error( ctx, GL_STACK_UNDERFLOW, "glPopClientAttrib" );
+      return;
+   }
+
+   ctx->ClientAttribStackDepth--;
+   attr = ctx->ClientAttribStack[ctx->ClientAttribStackDepth];
+
+   while (attr) {
+      switch (attr->kind) {
+         case GL_CLIENT_PACK_BIT:
+            MEMCPY( &ctx->Pack, attr->data,
+                    sizeof(struct gl_pixelstore_attrib) );
+	    ctx->NewState |= _NEW_PACKUNPACK;
+            break;
+         case GL_CLIENT_UNPACK_BIT:
+            MEMCPY( &ctx->Unpack, attr->data,
+                    sizeof(struct gl_pixelstore_attrib) );
+	    ctx->NewState |= _NEW_PACKUNPACK;
+            break;
+         case GL_CLIENT_VERTEX_ARRAY_BIT:
+            MEMCPY( &ctx->Array, attr->data,
+		    sizeof(struct gl_array_attrib) );
+	    ctx->NewState |= _NEW_ARRAY;
+            break;
+         default:
+            _mesa_problem( ctx, "Bad attrib flag in PopClientAttrib");
+            break;
+      }
+
+      next = attr->next;
+      FREE( attr->data );
+      FREE( attr );
+      attr = next;
+   }
+}
+
+
+void _mesa_init_attrib( GLcontext *ctx )
+{
+   /* Renderer and client attribute stacks */
+   ctx->AttribStackDepth = 0;
+   ctx->ClientAttribStackDepth = 0;
+}
diff --git a/reactos/lib/mesa32/src/main/attrib.h b/reactos/lib/mesa32/src/main/attrib.h
new file mode 100644
index 00000000000..09d75196b23
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/attrib.h
@@ -0,0 +1,68 @@
+/**
+ * \file attrib.h
+ * Attribute stacks.
+ * 
+ * \if subset
+ * (No-op)
+ *
+ * \endif
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+
+#ifndef ATTRIB_H
+#define ATTRIB_H
+
+
+#include "mtypes.h"
+
+
+#if _HAVE_FULL_GL
+
+extern void GLAPIENTRY
+_mesa_PushAttrib( GLbitfield mask );
+
+extern void GLAPIENTRY
+_mesa_PopAttrib( void );
+
+extern void GLAPIENTRY
+_mesa_PushClientAttrib( GLbitfield mask );
+
+extern void GLAPIENTRY
+_mesa_PopClientAttrib( void );
+
+extern void 
+_mesa_init_attrib( GLcontext *ctx );
+
+#else
+
+/** No-op */
+#define _mesa_init_attrib( c ) ((void)0)
+
+#endif
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/blend.c b/reactos/lib/mesa32/src/main/blend.c
new file mode 100644
index 00000000000..e5032bf1bb6
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/blend.c
@@ -0,0 +1,590 @@
+/**
+ * \file blend.c
+ * Blending operations.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+
+#include "glheader.h"
+#include "blend.h"
+#include "colormac.h"
+#include "context.h"
+#include "enums.h"
+#include "macros.h"
+#include "mtypes.h"
+
+
+/**
+ * Specify the blending operation.
+ *
+ * \param sfactor source factor operator.
+ * \param dfactor destination factor operator.
+ *
+ * \sa glBlendFunc().
+ * 
+ * Verifies the parameters and updates gl_colorbuffer_attrib.  On a change,
+ * flushes the vertices and notifies the driver via
+ * dd_function_table::BlendFunc callback.
+ */
+void GLAPIENTRY
+_mesa_BlendFunc( GLenum sfactor, GLenum dfactor )
+{
+
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
+      _mesa_debug(ctx, "glBlendFunc %s %s\n",
+                  _mesa_lookup_enum_by_nr(sfactor),
+                  _mesa_lookup_enum_by_nr(dfactor));
+
+   switch (sfactor) {
+      case GL_SRC_COLOR:
+      case GL_ONE_MINUS_SRC_COLOR:
+         if (!ctx->Extensions.NV_blend_square) {
+            _mesa_error( ctx, GL_INVALID_ENUM, "glBlendFunc(sfactor)" );
+            return;
+         }
+         /* fall-through */
+      case GL_ZERO:
+      case GL_ONE:
+      case GL_DST_COLOR:
+      case GL_ONE_MINUS_DST_COLOR:
+      case GL_SRC_ALPHA:
+      case GL_ONE_MINUS_SRC_ALPHA:
+      case GL_DST_ALPHA:
+      case GL_ONE_MINUS_DST_ALPHA:
+      case GL_SRC_ALPHA_SATURATE:
+      case GL_CONSTANT_COLOR:
+      case GL_ONE_MINUS_CONSTANT_COLOR:
+      case GL_CONSTANT_ALPHA:
+      case GL_ONE_MINUS_CONSTANT_ALPHA:
+         break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glBlendFunc(sfactor)" );
+         return;
+   }
+
+   switch (dfactor) {
+      case GL_DST_COLOR:
+      case GL_ONE_MINUS_DST_COLOR:
+         if (!ctx->Extensions.NV_blend_square) {
+            _mesa_error( ctx, GL_INVALID_ENUM, "glBlendFunc(dfactor)" );
+            return;
+         }
+         /* fall-through */
+      case GL_ZERO:
+      case GL_ONE:
+      case GL_SRC_COLOR:
+      case GL_ONE_MINUS_SRC_COLOR:
+      case GL_SRC_ALPHA:
+      case GL_ONE_MINUS_SRC_ALPHA:
+      case GL_DST_ALPHA:
+      case GL_ONE_MINUS_DST_ALPHA:
+      case GL_CONSTANT_COLOR:
+      case GL_ONE_MINUS_CONSTANT_COLOR:
+      case GL_CONSTANT_ALPHA:
+      case GL_ONE_MINUS_CONSTANT_ALPHA:
+         break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glBlendFunc(dfactor)" );
+         return;
+   }
+
+   if (ctx->Color.BlendDstRGB == dfactor &&
+       ctx->Color.BlendSrcRGB == sfactor &&
+       ctx->Color.BlendDstA == dfactor &&
+       ctx->Color.BlendSrcA == sfactor)
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_COLOR);
+   ctx->Color.BlendDstRGB = ctx->Color.BlendDstA = dfactor;
+   ctx->Color.BlendSrcRGB = ctx->Color.BlendSrcA = sfactor;
+
+   if (ctx->Driver.BlendFunc)
+      ctx->Driver.BlendFunc( ctx, sfactor, dfactor );
+}
+
+
+#if _HAVE_FULL_GL
+
+/**
+ * Process GL_EXT_blend_func_separate().
+ *
+ * \param sfactorRGB RGB source factor operator.
+ * \param dfactorRGB RGB destination factor operator.
+ * \param sfactorA alpha source factor operator.
+ * \param dfactorA alpha destination factor operator.
+ *
+ * Verifies the parameters and updates gl_colorbuffer_attrib.
+ * On a change, flush the vertices and notify the driver via
+ * dd_function_table::BlendFuncSeparate.
+ */
+void GLAPIENTRY
+_mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB,
+                            GLenum sfactorA, GLenum dfactorA )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
+      _mesa_debug(ctx, "glBlendFuncSeparate %s %s %s %s\n",
+                  _mesa_lookup_enum_by_nr(sfactorRGB),
+                  _mesa_lookup_enum_by_nr(dfactorRGB),
+                  _mesa_lookup_enum_by_nr(sfactorA),
+                  _mesa_lookup_enum_by_nr(dfactorA));
+
+   switch (sfactorRGB) {
+      case GL_SRC_COLOR:
+      case GL_ONE_MINUS_SRC_COLOR:
+         if (!ctx->Extensions.NV_blend_square) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glBlendFuncSeparate(sfactorRGB)");
+            return;
+         }
+         /* fall-through */
+      case GL_ZERO:
+      case GL_ONE:
+      case GL_DST_COLOR:
+      case GL_ONE_MINUS_DST_COLOR:
+      case GL_SRC_ALPHA:
+      case GL_ONE_MINUS_SRC_ALPHA:
+      case GL_DST_ALPHA:
+      case GL_ONE_MINUS_DST_ALPHA:
+      case GL_SRC_ALPHA_SATURATE:
+      case GL_CONSTANT_COLOR:
+      case GL_ONE_MINUS_CONSTANT_COLOR:
+      case GL_CONSTANT_ALPHA:
+      case GL_ONE_MINUS_CONSTANT_ALPHA:
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glBlendFuncSeparate(sfactorRGB)");
+         return;
+   }
+
+   switch (dfactorRGB) {
+      case GL_DST_COLOR:
+      case GL_ONE_MINUS_DST_COLOR:
+         if (!ctx->Extensions.NV_blend_square) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glBlendFuncSeparate(dfactorRGB)");
+            return;
+         }
+         /* fall-through */
+      case GL_ZERO:
+      case GL_ONE:
+      case GL_SRC_COLOR:
+      case GL_ONE_MINUS_SRC_COLOR:
+      case GL_SRC_ALPHA:
+      case GL_ONE_MINUS_SRC_ALPHA:
+      case GL_DST_ALPHA:
+      case GL_ONE_MINUS_DST_ALPHA:
+      case GL_CONSTANT_COLOR:
+      case GL_ONE_MINUS_CONSTANT_COLOR:
+      case GL_CONSTANT_ALPHA:
+      case GL_ONE_MINUS_CONSTANT_ALPHA:
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glBlendFuncSeparate(dfactorRGB)");
+         return;
+   }
+
+   switch (sfactorA) {
+      case GL_SRC_COLOR:
+      case GL_ONE_MINUS_SRC_COLOR:
+         if (!ctx->Extensions.NV_blend_square) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glBlendFuncSeparate(sfactorA)");
+            return;
+         }
+         /* fall-through */
+      case GL_ZERO:
+      case GL_ONE:
+      case GL_DST_COLOR:
+      case GL_ONE_MINUS_DST_COLOR:
+      case GL_SRC_ALPHA:
+      case GL_ONE_MINUS_SRC_ALPHA:
+      case GL_DST_ALPHA:
+      case GL_ONE_MINUS_DST_ALPHA:
+      case GL_SRC_ALPHA_SATURATE:
+      case GL_CONSTANT_COLOR:
+      case GL_ONE_MINUS_CONSTANT_COLOR:
+      case GL_CONSTANT_ALPHA:
+      case GL_ONE_MINUS_CONSTANT_ALPHA:
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glBlendFuncSeparate(sfactorA)");
+         return;
+   }
+
+   switch (dfactorA) {
+      case GL_DST_COLOR:
+      case GL_ONE_MINUS_DST_COLOR:
+         if (!ctx->Extensions.NV_blend_square) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glBlendFuncSeparate(dfactorA)");
+            return;
+         }
+         /* fall-through */
+      case GL_ZERO:
+      case GL_ONE:
+      case GL_SRC_COLOR:
+      case GL_ONE_MINUS_SRC_COLOR:
+      case GL_SRC_ALPHA:
+      case GL_ONE_MINUS_SRC_ALPHA:
+      case GL_DST_ALPHA:
+      case GL_ONE_MINUS_DST_ALPHA:
+      case GL_CONSTANT_COLOR:
+      case GL_ONE_MINUS_CONSTANT_COLOR:
+      case GL_CONSTANT_ALPHA:
+      case GL_ONE_MINUS_CONSTANT_ALPHA:
+         break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glBlendFuncSeparate(dfactorA)" );
+         return;
+   }
+
+   if (ctx->Color.BlendSrcRGB == sfactorRGB &&
+       ctx->Color.BlendDstRGB == dfactorRGB &&
+       ctx->Color.BlendSrcA == sfactorA &&
+       ctx->Color.BlendDstA == dfactorA)
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_COLOR);
+
+   ctx->Color.BlendSrcRGB = sfactorRGB;
+   ctx->Color.BlendDstRGB = dfactorRGB;
+   ctx->Color.BlendSrcA = sfactorA;
+   ctx->Color.BlendDstA = dfactorA;
+
+   if (ctx->Driver.BlendFuncSeparate) {
+      (*ctx->Driver.BlendFuncSeparate)( ctx, sfactorRGB, dfactorRGB,
+					sfactorA, dfactorA );
+   }
+}
+
+
+/* This is really an extension function! */
+void GLAPIENTRY
+_mesa_BlendEquation( GLenum mode )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
+      _mesa_debug(ctx, "glBlendEquation %s\n",
+                  _mesa_lookup_enum_by_nr(mode));
+
+   switch (mode) {
+      case GL_FUNC_ADD_EXT:
+         break;
+      case GL_MIN_EXT:
+      case GL_MAX_EXT:
+         if (!ctx->Extensions.EXT_blend_minmax &&
+             !ctx->Extensions.ARB_imaging) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquation");
+            return;
+         }
+         break;
+      case GL_LOGIC_OP:
+         if (!ctx->Extensions.EXT_blend_logic_op) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquation");
+            return;
+         }
+         break;
+      case GL_FUNC_SUBTRACT_EXT:
+      case GL_FUNC_REVERSE_SUBTRACT_EXT:
+         if (!ctx->Extensions.EXT_blend_subtract &&
+             !ctx->Extensions.ARB_imaging) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquation");
+            return;
+         }
+         break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glBlendEquation" );
+         return;
+   }
+
+   if (ctx->Color.BlendEquation == mode)
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_COLOR);
+   ctx->Color.BlendEquation = mode;
+
+   /* This is needed to support 1.1's RGB logic ops AND
+    * 1.0's blending logicops.
+    */
+   ctx->Color._LogicOpEnabled = (ctx->Color.ColorLogicOpEnabled ||
+                                 (ctx->Color.BlendEnabled &&
+                                  mode == GL_LOGIC_OP));
+
+   if (ctx->Driver.BlendEquation)
+      (*ctx->Driver.BlendEquation)( ctx, mode );
+}
+
+#endif
+
+
+/**
+ * Set the blending color.
+ *
+ * \param red red color component.
+ * \param green green color component.
+ * \param blue blue color component.
+ * \param alpha alpha color component.
+ *
+ * \sa glBlendColor().
+ *
+ * Clamps the parameters and updates gl_colorbuffer_attrib::BlendColor.  On a
+ * change, flushes the vertices and notifies the driver via
+ * dd_function_table::BlendColor callback.
+ */
+void GLAPIENTRY
+_mesa_BlendColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha )
+{
+   GLfloat tmp[4];
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   tmp[0] = CLAMP( red,   0.0F, 1.0F );
+   tmp[1] = CLAMP( green, 0.0F, 1.0F );
+   tmp[2] = CLAMP( blue,  0.0F, 1.0F );
+   tmp[3] = CLAMP( alpha, 0.0F, 1.0F );
+
+   if (TEST_EQ_4V(tmp, ctx->Color.BlendColor))
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_COLOR);
+   COPY_4FV( ctx->Color.BlendColor, tmp );
+
+   if (ctx->Driver.BlendColor)
+      (*ctx->Driver.BlendColor)(ctx, tmp);
+}
+
+
+/**
+ * Specify the alpha test function.
+ *
+ * \param func alpha comparison function.
+ * \param ref reference value.
+ *
+ * Verifies the parameters and updates gl_colorbuffer_attrib. 
+ * On a change, flushes the vertices and notifies the driver via
+ * dd_function_table::AlphaFunc callback.
+ */
+void GLAPIENTRY
+_mesa_AlphaFunc( GLenum func, GLclampf ref )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   switch (func) {
+   case GL_NEVER:
+   case GL_LESS:
+   case GL_EQUAL:
+   case GL_LEQUAL:
+   case GL_GREATER:
+   case GL_NOTEQUAL:
+   case GL_GEQUAL:
+   case GL_ALWAYS:
+      ref = CLAMP(ref, 0.0F, 1.0F);
+
+      if (ctx->Color.AlphaFunc == func && ctx->Color.AlphaRef == ref)
+         return; /* no change */
+
+      FLUSH_VERTICES(ctx, _NEW_COLOR);
+      ctx->Color.AlphaFunc = func;
+      ctx->Color.AlphaRef = ref;
+
+      if (ctx->Driver.AlphaFunc)
+         ctx->Driver.AlphaFunc(ctx, func, ref);
+      return;
+
+   default:
+      _mesa_error( ctx, GL_INVALID_ENUM, "glAlphaFunc(func)" );
+      return;
+   }
+}
+
+
+/**
+ * Specify a logic pixel operation for color index rendering.
+ *
+ * \param opcode operation.
+ *
+ * Verifies that \p opcode is a valid enum and updates
+gl_colorbuffer_attrib::LogicOp.
+ * On a change, flushes the vertices and notifies the driver via the
+ * dd_function_table::LogicOpcode callback.
+ */
+void GLAPIENTRY
+_mesa_LogicOp( GLenum opcode )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   switch (opcode) {
+      case GL_CLEAR:
+      case GL_SET:
+      case GL_COPY:
+      case GL_COPY_INVERTED:
+      case GL_NOOP:
+      case GL_INVERT:
+      case GL_AND:
+      case GL_NAND:
+      case GL_OR:
+      case GL_NOR:
+      case GL_XOR:
+      case GL_EQUIV:
+      case GL_AND_REVERSE:
+      case GL_AND_INVERTED:
+      case GL_OR_REVERSE:
+      case GL_OR_INVERTED:
+	 break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glLogicOp" );
+	 return;
+   }
+
+   if (ctx->Color.LogicOp == opcode)
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_COLOR);
+   ctx->Color.LogicOp = opcode;
+
+   if (ctx->Driver.LogicOpcode)
+      ctx->Driver.LogicOpcode( ctx, opcode );
+}
+
+#if _HAVE_FULL_GL
+void GLAPIENTRY
+_mesa_IndexMask( GLuint mask )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (ctx->Color.IndexMask == mask)
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_COLOR);
+   ctx->Color.IndexMask = mask;
+
+   if (ctx->Driver.IndexMask)
+      ctx->Driver.IndexMask( ctx, mask );
+}
+#endif
+
+
+/**
+ * Enable or disable writing of frame buffer color components.
+ *
+ * \param red whether to mask writing of the red color component.
+ * \param green whether to mask writing of the green color component.
+ * \param blue whether to mask writing of the blue color component.
+ * \param alpha whether to mask writing of the alpha color component.
+ *
+ * \sa glColorMask().
+ *
+ * Sets the appropriate value of gl_colorbuffer_attrib::ColorMask.  On a
+ * change, flushes the vertices and notifies the driver via the
+ * dd_function_table::ColorMask callback.
+ */
+void GLAPIENTRY
+_mesa_ColorMask( GLboolean red, GLboolean green,
+                 GLboolean blue, GLboolean alpha )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLubyte tmp[4];
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glColorMask %d %d %d %d\n", red, green, blue, alpha);
+
+   /* Shouldn't have any information about channel depth in core mesa
+    * -- should probably store these as the native booleans:
+    */
+   tmp[RCOMP] = red    ? 0xff : 0x0;
+   tmp[GCOMP] = green  ? 0xff : 0x0;
+   tmp[BCOMP] = blue   ? 0xff : 0x0;
+   tmp[ACOMP] = alpha  ? 0xff : 0x0;
+
+   if (TEST_EQ_4UBV(tmp, ctx->Color.ColorMask))
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_COLOR);
+   COPY_4UBV(ctx->Color.ColorMask, tmp);
+
+   if (ctx->Driver.ColorMask)
+      ctx->Driver.ColorMask( ctx, red, green, blue, alpha );
+}
+
+/**********************************************************************/
+/** \name Initialization */
+/*@{*/
+
+/**
+ * Initialization of the context color data.
+ *
+ * \param ctx GL context.
+ *
+ * Initializes the related fields in the context color attribute group,
+ * __GLcontextRec::Color.
+ */
+void _mesa_init_color( GLcontext * ctx )
+{
+   /* Color buffer group */
+   ctx->Color.IndexMask = 0xffffffff;
+   ctx->Color.ColorMask[0] = 0xff;
+   ctx->Color.ColorMask[1] = 0xff;
+   ctx->Color.ColorMask[2] = 0xff;
+   ctx->Color.ColorMask[3] = 0xff;
+   ctx->Color.ClearIndex = 0;
+   ASSIGN_4V( ctx->Color.ClearColor, 0, 0, 0, 0 );
+   ctx->Color.DrawBuffer = GL_FRONT;
+   ctx->Color.AlphaEnabled = GL_FALSE;
+   ctx->Color.AlphaFunc = GL_ALWAYS;
+   ctx->Color.AlphaRef = 0;
+   ctx->Color.BlendEnabled = GL_FALSE;
+   ctx->Color.BlendSrcRGB = GL_ONE;
+   ctx->Color.BlendDstRGB = GL_ZERO;
+   ctx->Color.BlendSrcA = GL_ONE;
+   ctx->Color.BlendDstA = GL_ZERO;
+   ctx->Color.BlendEquation = GL_FUNC_ADD_EXT;
+   ASSIGN_4V( ctx->Color.BlendColor, 0.0, 0.0, 0.0, 0.0 );
+   ctx->Color.IndexLogicOpEnabled = GL_FALSE;
+   ctx->Color.ColorLogicOpEnabled = GL_FALSE;
+   ctx->Color._LogicOpEnabled = GL_FALSE;
+   ctx->Color.LogicOp = GL_COPY;
+   ctx->Color.DitherFlag = GL_TRUE;
+
+   if (ctx->Visual.doubleBufferMode) {
+      ctx->Color.DrawBuffer = GL_BACK;
+      ctx->Color._DrawDestMask = BACK_LEFT_BIT;
+   }
+   else {
+      ctx->Color.DrawBuffer = GL_FRONT;
+      ctx->Color._DrawDestMask = FRONT_LEFT_BIT;
+   }
+}
+
+/*@}*/
diff --git a/reactos/lib/mesa32/src/main/blend.h b/reactos/lib/mesa32/src/main/blend.h
new file mode 100644
index 00000000000..ae96bd46b65
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/blend.h
@@ -0,0 +1,74 @@
+/**
+ * \file blend.h
+ * Blending functions operations.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+
+#ifndef BLEND_H
+#define BLEND_H
+
+
+#include "mtypes.h"
+
+
+extern void GLAPIENTRY
+_mesa_BlendFunc( GLenum sfactor, GLenum dfactor );
+
+
+extern void GLAPIENTRY
+_mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB,
+                            GLenum sfactorA, GLenum dfactorA );
+
+
+extern void GLAPIENTRY
+_mesa_BlendEquation( GLenum mode );
+
+
+extern void GLAPIENTRY
+_mesa_BlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+
+
+extern void GLAPIENTRY
+_mesa_AlphaFunc( GLenum func, GLclampf ref );
+
+
+extern void GLAPIENTRY
+_mesa_LogicOp( GLenum opcode );
+
+
+extern void GLAPIENTRY
+_mesa_IndexMask( GLuint mask );
+
+extern void GLAPIENTRY
+_mesa_ColorMask( GLboolean red, GLboolean green,
+                 GLboolean blue, GLboolean alpha );
+
+extern void  
+_mesa_init_color( GLcontext * ctx );
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/bufferobj.c b/reactos/lib/mesa32/src/main/bufferobj.c
new file mode 100644
index 00000000000..3ec4e562e67
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/bufferobj.c
@@ -0,0 +1,804 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0.1
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/**
+ * \file bufferobj.c
+ * \brief Functions for the GL_ARB_vertex_buffer_object extension.
+ * \author Brian Paul, Ian Romanick
+ */
+
+
+#include "glheader.h"
+#include "hash.h"
+#include "imports.h"
+#include "context.h"
+#include "bufferobj.h"
+
+
+/**
+ * Get the buffer object bound to the specified target in a GL context.
+ *
+ * \param ctx     GL context
+ * \param target  Buffer object target to be retrieved.  Currently this must
+ *                be either \c GL_ARRAY_BUFFER or \c GL_ELEMENT_ARRAY_BUFFER.
+ * \param str     Name of caller for logging errors.
+ * \return   A pointer to the buffer object bound to \c target in the
+ *           specified context or \c NULL if \c target is invalid or no
+ *           buffer object is bound.
+ */
+static INLINE struct gl_buffer_object *
+buffer_object_get_target( GLcontext *ctx, GLenum target, const char * str )
+{
+   struct gl_buffer_object * bufObj = NULL;
+
+   switch (target) {
+      case GL_ARRAY_BUFFER_ARB:
+         bufObj = ctx->Array.ArrayBufferObj;
+         break;
+      case GL_ELEMENT_ARRAY_BUFFER_ARB:
+         bufObj = ctx->Array.ElementArrayBufferObj;
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "gl%s(target)", str);
+         return NULL;
+   }
+
+   if (bufObj->Name == 0)
+      return NULL;
+
+   return bufObj;
+}
+
+
+/**
+ * Tests the subdata range parameters and sets the GL error code for
+ * \c glBufferSubDataARB and \c glGetBufferSubDataARB.
+ *
+ * \param ctx     GL context.
+ * \param target  Buffer object target on which to operate.
+ * \param offset  Offset of the first byte of the subdata range.
+ * \param size    Size, in bytes, of the subdata range.
+ * \param str     Name of caller for logging errors.
+ * \return   A pointer to the buffer object bound to \c target in the
+ *           specified context or \c NULL if any of the parameter or state
+ *           conditions for \c glBufferSubDataARB or \c glGetBufferSubDataARB
+ *           are invalid.
+ *
+ * \sa glBufferSubDataARB, glGetBufferSubDataARB
+ */
+static struct gl_buffer_object *
+buffer_object_subdata_range_good( GLcontext * ctx, GLenum target, 
+                                  GLintptrARB offset, GLsizeiptrARB size,
+                                  const char * str )
+{
+   struct gl_buffer_object *bufObj;
+
+   if (size < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "%s(size < 0)", str);
+      return NULL;
+   }
+
+   if (offset < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "%s(offset < 0)", str);
+      return NULL;
+   }
+
+   bufObj = buffer_object_get_target( ctx, target, str );
+   if ( bufObj == NULL ) {
+      return NULL;
+   }
+
+   if ( (GLuint)(offset + size) > bufObj->Size ) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+		  "%s(size + offset > buffer size)", str);
+      return NULL;
+   }
+
+   if ( bufObj->Pointer != NULL ) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "%s", str);
+      return NULL;
+   }
+
+   return bufObj;
+}
+
+
+/**
+ * Allocate and initialize a new buffer object.
+ * 
+ * This function is intended to be called via
+ * \c dd_function_table::NewBufferObject.
+ */
+struct gl_buffer_object *
+_mesa_new_buffer_object( GLcontext *ctx, GLuint name, GLenum target )
+{
+   struct gl_buffer_object *obj;
+   obj = MALLOC_STRUCT(gl_buffer_object);
+   _mesa_initialize_buffer_object(obj, name, target);
+   return obj;
+}
+
+
+/**
+ * Delete a buffer object.
+ * 
+ * This function is intended to be called via
+ * \c dd_function_table::DeleteBufferObject.
+ */
+void
+_mesa_delete_buffer_object( GLcontext *ctx, struct gl_buffer_object *bufObj )
+{
+   if (bufObj->Data)
+      _mesa_free(bufObj->Data);
+   _mesa_free(bufObj);
+}
+
+
+/**
+ * Initialize a buffer object to default values.
+ */
+void
+_mesa_initialize_buffer_object( struct gl_buffer_object *obj,
+				GLuint name, GLenum target )
+{
+   _mesa_bzero(obj, sizeof(struct gl_buffer_object));
+   obj->RefCount = 1;
+   obj->Name = name;
+   obj->Usage = GL_STATIC_DRAW_ARB;
+   obj->Access = GL_READ_WRITE_ARB;
+}
+
+
+/**
+ * Add the given buffer object to the buffer object pool.
+ */
+void
+_mesa_save_buffer_object( GLcontext *ctx, struct gl_buffer_object *obj )
+{
+   if (obj->Name > 0) {
+      /* insert into hash table */
+      _mesa_HashInsert(ctx->Shared->BufferObjects, obj->Name, obj);
+   }
+}
+
+
+/**
+ * Remove the given buffer object from the buffer object pool.
+ * Do not deallocate the buffer object though.
+ */
+void
+_mesa_remove_buffer_object( GLcontext *ctx, struct gl_buffer_object *bufObj )
+{
+   if (bufObj->Name > 0) {
+      /* remove from hash table */
+      _mesa_HashRemove(ctx->Shared->BufferObjects, bufObj->Name);
+   }
+}
+
+
+/**
+ * Allocate space for and store data in a buffer object.  Any data that was
+ * previously stored in the buffer object is lost.  If \c data is \c NULL,
+ * memory will be allocated, but no copy will occur.
+ *
+ * This function is intended to be called via
+ * \c dd_function_table::BufferData.  This function need not set GL error
+ * codes.  The input parameters will have been tested before calling.
+ *
+ * \param ctx     GL context.
+ * \param target  Buffer object target on which to operate.
+ * \param size    Size, in bytes, of the new data store.
+ * \param data    Pointer to the data to store in the buffer object.  This
+ *                pointer may be \c NULL.
+ * \param usage   Hints about how the data will be used.
+ * \param bufObj  Object to be used.
+ *
+ * \sa glBufferDataARB, dd_function_table::BufferData.
+ */
+void
+_mesa_buffer_data( GLcontext *ctx, GLenum target, GLsizeiptrARB size,
+		   const GLvoid * data, GLenum usage,
+		   struct gl_buffer_object * bufObj )
+{
+   void * new_data;
+
+   (void) target;
+
+   new_data = _mesa_realloc( bufObj->Data, bufObj->Size, size );
+   if ( new_data != NULL ) {
+      bufObj->Data = (GLubyte *) new_data;
+      bufObj->Size = size;
+      bufObj->Usage = usage;
+
+      if ( data != NULL ) {
+	 _mesa_memcpy( bufObj->Data, data, size );
+      }
+   }
+}
+
+
+/**
+ * Replace data in a subrange of buffer object.  If the data range
+ * specified by \c size + \c offset extends beyond the end of the buffer or
+ * if \c data is \c NULL, no copy is performed.
+ *
+ * This function is intended to be called by
+ * \c dd_function_table::BufferSubData.  This function need not set GL error
+ * codes.  The input parameters will have been tested before calling.
+ *
+ * \param ctx     GL context.
+ * \param target  Buffer object target on which to operate.
+ * \param offset  Offset of the first byte to be modified.
+ * \param size    Size, in bytes, of the data range.
+ * \param data    Pointer to the data to store in the buffer object.
+ * \param bufObj  Object to be used.
+ *
+ * \sa glBufferSubDataARB, dd_function_table::BufferSubData.
+ */
+void
+_mesa_buffer_subdata( GLcontext *ctx, GLenum target, GLintptrARB offset,
+		      GLsizeiptrARB size, const GLvoid * data,
+		      struct gl_buffer_object * bufObj )
+{
+   if ( (bufObj->Data != NULL)
+	&& ((GLuint)(size + offset) <= bufObj->Size) ) {
+      _mesa_memcpy( (GLubyte *) bufObj->Data + offset, data, size );
+   }
+}
+
+
+/**
+ * Retrieve data from a subrange of buffer object.  If the data range
+ * specified by \c size + \c offset extends beyond the end of the buffer or
+ * if \c data is \c NULL, no copy is performed.
+ *
+ * This function is intended to be called by
+ * \c dd_function_table::BufferGetSubData.  This function need not set GL error
+ * codes.  The input parameters will have been tested before calling.
+ *
+ * \param ctx     GL context.
+ * \param target  Buffer object target on which to operate.
+ * \param offset  Offset of the first byte to be modified.
+ * \param size    Size, in bytes, of the data range.
+ * \param data    Pointer to the data to store in the buffer object.
+ * \param bufObj  Object to be used.
+ *
+ * \sa glBufferGetSubDataARB, dd_function_table::GetBufferSubData.
+ */
+void
+_mesa_buffer_get_subdata( GLcontext *ctx, GLenum target, GLintptrARB offset,
+			  GLsizeiptrARB size, GLvoid * data,
+			  struct gl_buffer_object * bufObj )
+{
+   if ( (bufObj->Data != NULL)
+	&& ((GLuint)(size + offset) <= bufObj->Size) ) {
+      _mesa_memcpy( data, (GLubyte *) bufObj->Data + offset, size );
+   }
+}
+
+
+/**
+ * Maps the private data buffer into the processor's address space.
+ *
+ * This function is intended to be called by \c dd_function_table::MapBuffer.
+ * This function need not set GL error codes.  The input parameters will have
+ * been tested before calling.
+ *
+ * \param ctx     GL context.
+ * \param target  Buffer object target on which to operate.
+ * \param access  Information about how the buffer will be accessed.
+ * \param bufObj  Object to be used.
+ * \return  A pointer to the object's internal data store that can be accessed
+ *          by the processor
+ *
+ * \sa glMapBufferARB, dd_function_table::MapBuffer
+ */
+void *
+_mesa_buffer_map( GLcontext *ctx, GLenum target, GLenum access,
+		  struct gl_buffer_object * bufObj )
+{
+   return bufObj->Data;
+}
+
+
+/**
+ * Initialize the state associated with buffer objects
+ */
+void
+_mesa_init_buffer_objects( GLcontext *ctx )
+{
+   GLuint i;
+
+   ctx->Array.NullBufferObj = _mesa_new_buffer_object(ctx, 0, 0);
+   ctx->Array.ArrayBufferObj = ctx->Array.NullBufferObj;
+   ctx->Array.ElementArrayBufferObj = ctx->Array.NullBufferObj;
+
+   /* Vertex array buffers */
+   ctx->Array.Vertex.BufferObj = ctx->Array.NullBufferObj;
+   ctx->Array.Normal.BufferObj = ctx->Array.NullBufferObj;
+   ctx->Array.Color.BufferObj = ctx->Array.NullBufferObj;
+   ctx->Array.SecondaryColor.BufferObj = ctx->Array.NullBufferObj;
+   ctx->Array.FogCoord.BufferObj = ctx->Array.NullBufferObj;
+   ctx->Array.Index.BufferObj = ctx->Array.NullBufferObj;
+   for (i = 0; i < MAX_TEXTURE_UNITS; i++) {
+      ctx->Array.TexCoord[i].BufferObj = ctx->Array.NullBufferObj;
+   }
+   ctx->Array.EdgeFlag.BufferObj = ctx->Array.NullBufferObj;
+   for (i = 0; i < VERT_ATTRIB_MAX; i++) {
+      ctx->Array.VertexAttrib[i].BufferObj = ctx->Array.NullBufferObj;
+   }
+
+   /* Device drivers might override these assignments after the Mesa
+    * context is initialized.
+    */
+   ctx->Driver.NewBufferObject = _mesa_new_buffer_object;
+   ctx->Driver.DeleteBuffer = _mesa_delete_buffer_object;
+   ctx->Driver.BindBuffer = NULL;
+   ctx->Driver.BufferData = _mesa_buffer_data;
+   ctx->Driver.BufferSubData = _mesa_buffer_subdata;
+   ctx->Driver.GetBufferSubData = _mesa_buffer_get_subdata;
+   ctx->Driver.MapBuffer = _mesa_buffer_map;
+   ctx->Driver.UnmapBuffer = NULL;
+}
+
+
+
+/**********************************************************************/
+/* API Functions                                                      */
+/**********************************************************************/
+
+void GLAPIENTRY
+_mesa_BindBufferARB(GLenum target, GLuint buffer)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *oldBufObj;
+   struct gl_buffer_object *newBufObj = 0;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   oldBufObj = buffer_object_get_target( ctx, target, "BindBufferARB" );
+   if ( (oldBufObj != NULL) && (oldBufObj->Name == buffer) )
+      return;   /* rebinding the same buffer object- no change */
+
+   /*
+    * Get pointer to new buffer object (newBufObj)
+    */
+   if ( buffer == 0 ) {
+      /* The spec says there's not a buffer object named 0, but we use
+       * one internally because it simplifies things.
+       */
+      newBufObj = ctx->Array.NullBufferObj;
+   }
+   else {
+      /* non-default buffer object */
+      const struct _mesa_HashTable *hash = ctx->Shared->BufferObjects;
+      newBufObj = (struct gl_buffer_object *) _mesa_HashLookup(hash, buffer);
+      if (!newBufObj) {
+         /* if this is a new buffer object id, allocate a buffer object now */
+	 newBufObj = (*ctx->Driver.NewBufferObject)(ctx, buffer, target);
+         if (!newBufObj) {
+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindBufferARB");
+            return;
+         }
+         _mesa_save_buffer_object(ctx, newBufObj);
+      }
+      newBufObj->RefCount++;
+   }
+   
+   switch (target) {
+      case GL_ARRAY_BUFFER_ARB:
+         ctx->Array.ArrayBufferObj = newBufObj;
+         break;
+      case GL_ELEMENT_ARRAY_BUFFER_ARB:
+         ctx->Array.ElementArrayBufferObj = newBufObj;
+         break;
+   }
+
+   /* Pass BindBuffer call to device driver */
+   if ( (ctx->Driver.BindBuffer != NULL) && (newBufObj != NULL) )
+      (*ctx->Driver.BindBuffer)( ctx, target, newBufObj );
+
+   if ( oldBufObj != NULL ) {
+      oldBufObj->RefCount--;
+      assert(oldBufObj->RefCount >= 0);
+      if (oldBufObj->RefCount == 0) {
+	 assert(oldBufObj->Name != 0);
+	 _mesa_remove_buffer_object(ctx, oldBufObj);
+	 ASSERT(ctx->Driver.DeleteBuffer);
+	 (*ctx->Driver.DeleteBuffer)( ctx, oldBufObj );
+      }
+   }
+}
+
+
+/**
+ * Delete a set of buffer objects.
+ * 
+ * \param n      Number of buffer objects to delete.
+ * \param buffer Array of \c n buffer object IDs.
+ */
+void GLAPIENTRY
+_mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLsizei i;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (n < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glDeleteBuffersARB(n)");
+      return;
+   }
+
+   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
+
+   for (i = 0; i < n; i++) {
+      if (ids[i] != 0) {
+         struct gl_buffer_object *bufObj = (struct gl_buffer_object *)
+            _mesa_HashLookup(ctx->Shared->BufferObjects, ids[i]);
+         if (bufObj) {
+            /* unbind any vertex pointers bound to this buffer */
+            GLuint j;
+
+            ASSERT(bufObj->Name != 0);
+
+            if (ctx->Array.Vertex.BufferObj == bufObj)
+               ctx->Array.Vertex.BufferObj = ctx->Array.NullBufferObj;
+            if (ctx->Array.Normal.BufferObj == bufObj)
+               ctx->Array.Normal.BufferObj = ctx->Array.NullBufferObj;
+            if (ctx->Array.Color.BufferObj == bufObj)
+               ctx->Array.Color.BufferObj = ctx->Array.NullBufferObj;
+            if (ctx->Array.SecondaryColor.BufferObj == bufObj)
+               ctx->Array.SecondaryColor.BufferObj = ctx->Array.NullBufferObj;
+            if (ctx->Array.FogCoord.BufferObj == bufObj)
+               ctx->Array.FogCoord.BufferObj = ctx->Array.NullBufferObj;
+            if (ctx->Array.Index.BufferObj == bufObj)
+               ctx->Array.Index.BufferObj = ctx->Array.NullBufferObj;
+            if (ctx->Array.EdgeFlag.BufferObj == bufObj)
+               ctx->Array.EdgeFlag.BufferObj = ctx->Array.NullBufferObj;
+            for (j = 0; j < MAX_TEXTURE_UNITS; j++) {
+               if (ctx->Array.TexCoord[j].BufferObj == bufObj)
+                  ctx->Array.TexCoord[j].BufferObj = ctx->Array.NullBufferObj;
+            }
+            for (j = 0; j < VERT_ATTRIB_MAX; j++) {
+               if (ctx->Array.VertexAttrib[j].BufferObj == bufObj)
+                  ctx->Array.VertexAttrib[j].BufferObj = ctx->Array.NullBufferObj;
+            }
+
+            /* if deleting bound buffers, rebind to zero */
+            if (ctx->Array.ArrayBufferObj == bufObj) {
+	       _mesa_BindBufferARB( GL_ARRAY_BUFFER_ARB, 0 );
+            }
+            if (ctx->Array.ElementArrayBufferObj == bufObj) {
+	       _mesa_BindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, 0 );
+            }
+
+            bufObj->RefCount--;
+            if (bufObj->RefCount <= 0) {
+               _mesa_remove_buffer_object(ctx, bufObj);
+               ASSERT(ctx->Driver.DeleteBuffer);
+               (*ctx->Driver.DeleteBuffer)(ctx, bufObj);
+            }
+         }
+      }
+   }
+
+   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
+}
+
+
+/**
+ * Generate a set of unique buffer object IDs and store them in \c buffer.
+ * 
+ * \param n       Number of IDs to generate.
+ * \param buffer  Array of \c n locations to store the IDs.
+ */
+void GLAPIENTRY
+_mesa_GenBuffersARB(GLsizei n, GLuint *buffer)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint first;
+   GLint i;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (n < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glGenBuffersARB");
+      return;
+   }
+
+   if ( buffer == NULL ) {
+      return;
+   }
+
+   /*
+    * This must be atomic (generation and allocation of buffer object IDs)
+    */
+   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
+
+   first = _mesa_HashFindFreeKeyBlock(ctx->Shared->BufferObjects, n);
+
+   /* Allocate new, empty buffer objects and return identifiers */
+   for (i = 0; i < n; i++) {
+      struct gl_buffer_object *bufObj;
+      GLuint name = first + i;
+      GLenum target = 0;
+      bufObj = (*ctx->Driver.NewBufferObject)( ctx, name, target );
+      if (!bufObj) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenBuffersARB");
+         return;
+      }
+      _mesa_save_buffer_object(ctx, bufObj);
+      buffer[i] = first + i;
+   }
+
+   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
+}
+
+
+/**
+ * Determine if ID is the name of a buffer object.
+ * 
+ * \param id  ID of the potential buffer object.
+ * \return  \c GL_TRUE if \c id is the name of a buffer object, 
+ *          \c GL_FALSE otherwise.
+ */
+GLboolean GLAPIENTRY
+_mesa_IsBufferARB(GLuint id)
+{
+   struct gl_buffer_object * bufObj;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
+
+   if (id == 0)
+      return GL_FALSE;
+
+   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
+   bufObj = (struct gl_buffer_object *) _mesa_HashLookup(ctx->Shared->BufferObjects, id);
+   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
+
+   return (bufObj != NULL);
+}
+
+
+void GLAPIENTRY
+_mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
+                    const GLvoid * data, GLenum usage)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *bufObj;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (size < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glBufferDataARB(size < 0)");
+      return;
+   }
+
+   switch (usage) {
+      case GL_STREAM_DRAW_ARB:
+      case GL_STREAM_READ_ARB:
+      case GL_STREAM_COPY_ARB:
+      case GL_STATIC_DRAW_ARB:
+      case GL_STATIC_READ_ARB:
+      case GL_STATIC_COPY_ARB:
+      case GL_DYNAMIC_DRAW_ARB:
+      case GL_DYNAMIC_READ_ARB:
+      case GL_DYNAMIC_COPY_ARB:
+         /* OK */
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glBufferDataARB(usage)");
+         return;
+   }
+
+   bufObj = buffer_object_get_target( ctx, target, "BufferDataARB" );
+   if ( bufObj == NULL ) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glBufferDataARB" );
+      return;
+   }
+   
+   if (bufObj->Pointer) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glBufferDataARB(buffer is mapped)" );
+      return;
+   }  
+
+   ASSERT(ctx->Driver.BufferData);
+
+   /* Give the buffer object to the driver!  <data> may be null! */
+   (*ctx->Driver.BufferData)( ctx, target, size, data, usage, bufObj );
+}
+
+
+void GLAPIENTRY
+_mesa_BufferSubDataARB(GLenum target, GLintptrARB offset,
+                       GLsizeiptrARB size, const GLvoid * data)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *bufObj;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   bufObj = buffer_object_subdata_range_good( ctx, target, offset, size,
+                                              "BufferSubDataARB" );
+   if (!bufObj) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glBufferSubDataARB" );
+      return;
+   }
+
+   if (bufObj->Pointer) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glBufferSubDataARB(buffer is mapped)" );
+      return;
+   }  
+
+   ASSERT(ctx->Driver.BufferSubData);
+   (*ctx->Driver.BufferSubData)( ctx, target, offset, size, data, bufObj );
+}
+
+
+void GLAPIENTRY
+_mesa_GetBufferSubDataARB(GLenum target, GLintptrARB offset,
+                          GLsizeiptrARB size, void * data)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *bufObj;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   bufObj = buffer_object_subdata_range_good( ctx, target, offset, size,
+                                              "GetBufferSubDataARB" );
+   if (!bufObj) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetBufferSubDataARB" );
+      return;
+   }
+
+   if (bufObj->Pointer) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetBufferSubDataARB(buffer is mapped)" );
+      return;
+   }  
+
+   ASSERT(ctx->Driver.GetBufferSubData);
+   (*ctx->Driver.GetBufferSubData)( ctx, target, offset, size, data, bufObj );
+}
+
+
+void * GLAPIENTRY
+_mesa_MapBufferARB(GLenum target, GLenum access)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object * bufObj;
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL);
+
+   switch (access) {
+      case GL_READ_ONLY_ARB:
+      case GL_WRITE_ONLY_ARB:
+      case GL_READ_WRITE_ARB:
+         /* OK */
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glMapBufferARB(access)");
+         return NULL;
+   }
+
+   bufObj = buffer_object_get_target( ctx, target, "MapBufferARB" );
+   if ( bufObj == NULL ) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glMapBufferARB" );
+      return NULL;
+   }
+
+   if ( bufObj->Pointer != NULL ) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glMapBufferARB(already mapped)");
+      return NULL;
+   }
+
+   ASSERT(ctx->Driver.MapBuffer);
+   bufObj->Pointer = (*ctx->Driver.MapBuffer)( ctx, target, access, bufObj );
+   if ( bufObj->Pointer == NULL ) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glMapBufferARB(access)");
+   }
+
+   bufObj->Access = access;
+
+   return bufObj->Pointer;
+}
+
+
+GLboolean GLAPIENTRY
+_mesa_UnmapBufferARB(GLenum target)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *bufObj;
+   GLboolean status = GL_TRUE;
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
+
+   bufObj = buffer_object_get_target( ctx, target, "UnmapBufferARB" );
+   if ( bufObj == NULL ) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glUnmapBufferARB" );
+      return GL_FALSE;
+   }
+
+   if ( bufObj->Pointer == NULL ) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glUnmapBufferARB");
+      return GL_FALSE;
+   }
+
+   if ( ctx->Driver.UnmapBuffer != NULL ) {
+      status = (*ctx->Driver.UnmapBuffer)( ctx, target, bufObj );
+   }
+
+   bufObj->Access = GL_READ_WRITE_ARB; /* initial value, OK? */
+   bufObj->Pointer = NULL;
+
+   return status;
+}
+
+
+void GLAPIENTRY
+_mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *bufObj;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   bufObj = buffer_object_get_target( ctx, target, "GetBufferParameterivARB" );
+   if (!bufObj) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "GetBufferParameterivARB" );
+      return;
+   }
+
+   switch (pname) {
+      case GL_BUFFER_SIZE_ARB:
+         *params = bufObj->Size;
+         break;
+      case GL_BUFFER_USAGE_ARB:
+         *params = bufObj->Usage;
+         break;
+      case GL_BUFFER_ACCESS_ARB:
+         *params = bufObj->Access;
+         break;
+      case GL_BUFFER_MAPPED_ARB:
+         *params = (bufObj->Pointer != NULL);
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameterivARB(pname)");
+         return;
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetBufferPointervARB(GLenum target, GLenum pname, GLvoid **params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object * bufObj;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (pname != GL_BUFFER_MAP_POINTER_ARB) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferPointervARB(pname)");
+      return;
+   }
+
+   bufObj = buffer_object_get_target( ctx, target, "GetBufferPointervARB" );
+   if ( bufObj == NULL ) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetBufferPointervARB" );
+      return;
+   }
+
+   *params = bufObj->Pointer;
+}
diff --git a/reactos/lib/mesa32/src/main/bufferobj.h b/reactos/lib/mesa32/src/main/bufferobj.h
new file mode 100644
index 00000000000..236545b9abe
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/bufferobj.h
@@ -0,0 +1,116 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+
+#ifndef BUFFEROBJ_H
+#define BUFFEROBJ_H
+
+
+#include "context.h"
+
+
+/*
+ * Internal functions
+ */
+
+extern void
+_mesa_init_buffer_objects( GLcontext *ctx );
+
+extern struct gl_buffer_object *
+_mesa_new_buffer_object( GLcontext *ctx, GLuint name, GLenum target );
+
+extern void
+_mesa_delete_buffer_object( GLcontext *ctx, struct gl_buffer_object *bufObj );
+
+extern void
+_mesa_initialize_buffer_object( struct gl_buffer_object *obj,
+				GLuint name, GLenum target );
+
+extern void
+_mesa_save_buffer_object( GLcontext *ctx, struct gl_buffer_object *obj );
+
+extern void
+_mesa_remove_buffer_object( GLcontext *ctx, struct gl_buffer_object *bufObj );
+
+extern void
+_mesa_buffer_data( GLcontext *ctx, GLenum target, GLsizeiptrARB size,
+		   const GLvoid * data, GLenum usage,
+		   struct gl_buffer_object * bufObj );
+
+extern void
+_mesa_buffer_subdata( GLcontext *ctx, GLenum target, GLintptrARB offset,
+		      GLsizeiptrARB size, const GLvoid * data,
+		      struct gl_buffer_object * bufObj );
+
+extern void
+_mesa_buffer_get_subdata( GLcontext *ctx, GLenum target, GLintptrARB offset,
+			  GLsizeiptrARB size, GLvoid * data,
+			  struct gl_buffer_object * bufObj );
+
+extern void *
+_mesa_buffer_map( GLcontext *ctx, GLenum target, GLenum access,
+		  struct gl_buffer_object * bufObj );
+
+
+
+/*
+ * API functions
+ */
+
+extern void GLAPIENTRY
+_mesa_BindBufferARB(GLenum target, GLuint buffer);
+
+extern void GLAPIENTRY
+_mesa_DeleteBuffersARB(GLsizei n, const GLuint * buffer);
+
+extern void GLAPIENTRY
+_mesa_GenBuffersARB(GLsizei n, GLuint * buffer);
+
+extern GLboolean GLAPIENTRY
+_mesa_IsBufferARB(GLuint buffer);
+
+extern void GLAPIENTRY
+_mesa_BufferDataARB(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage);
+
+extern void GLAPIENTRY
+_mesa_BufferSubDataARB(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data);
+
+extern void GLAPIENTRY
+_mesa_GetBufferSubDataARB(GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data);
+
+extern void * GLAPIENTRY
+_mesa_MapBufferARB(GLenum target, GLenum access);
+
+extern GLboolean GLAPIENTRY
+_mesa_UnmapBufferARB(GLenum target);
+
+extern void GLAPIENTRY
+_mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params);
+
+extern void GLAPIENTRY
+_mesa_GetBufferPointervARB(GLenum target, GLenum pname, GLvoid **params);
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/buffers.c b/reactos/lib/mesa32/src/main/buffers.c
new file mode 100644
index 00000000000..30fa4332804
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/buffers.c
@@ -0,0 +1,620 @@
+/**
+ * \file buffers.c
+ * Frame buffer management.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0.1
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "imports.h"
+#include "buffers.h"
+#include "colormac.h"
+#include "context.h"
+#include "depth.h"
+#include "enums.h"
+#include "stencil.h"
+#include "state.h"
+#include "mtypes.h"
+
+
+#if _HAVE_FULL_GL
+void GLAPIENTRY
+_mesa_ClearIndex( GLfloat c )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (ctx->Color.ClearIndex == (GLuint) c)
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_COLOR);
+   ctx->Color.ClearIndex = (GLuint) c;
+
+   if (!ctx->Visual.rgbMode && ctx->Driver.ClearIndex) {
+      /* it's OK to call glClearIndex in RGBA mode but it should be a NOP */
+      (*ctx->Driver.ClearIndex)( ctx, ctx->Color.ClearIndex );
+   }
+}
+#endif
+
+
+/**
+ * Specify the clear values for the color buffers.
+ *
+ * \param red red color component.
+ * \param green green color component.
+ * \param blue blue color component.
+ * \param alpha alpha component.
+ *
+ * \sa glClearColor().
+ *
+ * Clamps the parameters and updates gl_colorbuffer_attrib::ClearColor.  On a
+ * change, flushes the vertices and notifies the driver via the
+ * dd_function_table::ClearColor callback.
+ */
+void GLAPIENTRY
+_mesa_ClearColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha )
+{
+   GLfloat tmp[4];
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   tmp[0] = CLAMP(red,   0.0F, 1.0F);
+   tmp[1] = CLAMP(green, 0.0F, 1.0F);
+   tmp[2] = CLAMP(blue,  0.0F, 1.0F);
+   tmp[3] = CLAMP(alpha, 0.0F, 1.0F);
+
+   if (TEST_EQ_4V(tmp, ctx->Color.ClearColor))
+      return; /* no change */
+
+   FLUSH_VERTICES(ctx, _NEW_COLOR);
+   COPY_4V(ctx->Color.ClearColor, tmp);
+
+   if (ctx->Visual.rgbMode && ctx->Driver.ClearColor) {
+      /* it's OK to call glClearColor in CI mode but it should be a NOP */
+      (*ctx->Driver.ClearColor)(ctx, ctx->Color.ClearColor);
+   }
+}
+
+
+/**
+ * Clear buffers.
+ * 
+ * \param mask bit-mask indicating the buffers to be cleared.
+ *
+ * Flushes the vertices and verifies the parameter. If __GLcontextRec::NewState
+ * is set then calls _mesa_update_state() to update gl_frame_buffer::_Xmin,
+ * etc. If the rasterization mode is set to GL_RENDER then requests the driver
+ * to clear the buffers, via the dd_function_table::Clear callback.
+ */ 
+void GLAPIENTRY
+_mesa_Clear( GLbitfield mask )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glClear 0x%x\n", mask);
+
+   if (mask & ~(GL_COLOR_BUFFER_BIT |
+                GL_DEPTH_BUFFER_BIT |
+                GL_STENCIL_BUFFER_BIT |
+                GL_ACCUM_BUFFER_BIT)) {
+      /* invalid bit set */
+      _mesa_error( ctx, GL_INVALID_VALUE, "glClear(0x%x)", mask);
+      return;
+   }
+
+   if (ctx->NewState) {
+      _mesa_update_state( ctx );	/* update _Xmin, etc */
+   }
+
+   if (ctx->RenderMode==GL_RENDER) {
+      const GLint x = ctx->DrawBuffer->_Xmin;
+      const GLint y = ctx->DrawBuffer->_Ymin;
+      const GLint height = ctx->DrawBuffer->_Ymax - ctx->DrawBuffer->_Ymin;
+      const GLint width  = ctx->DrawBuffer->_Xmax - ctx->DrawBuffer->_Xmin;
+      GLbitfield ddMask;
+
+      /* don't clear depth buffer if depth writing disabled */
+      if (!ctx->Depth.Mask)
+         mask &= ~GL_DEPTH_BUFFER_BIT;
+
+      /* Build the bitmask to send to device driver's Clear function.
+       * Note that the GL_COLOR_BUFFER_BIT flag will expand to 0, 1, 2 or 4
+       * of the FRONT/BACK_LEFT/RIGHT_BIT flags.
+       */
+      ddMask = 0;
+      if (mask & GL_COLOR_BUFFER_BIT)
+         ddMask |= ctx->Color._DrawDestMask;
+      if ((mask & GL_DEPTH_BUFFER_BIT) && ctx->Visual.depthBits > 0)
+         ddMask |= GL_DEPTH_BUFFER_BIT;
+      if ((mask & GL_STENCIL_BUFFER_BIT) && ctx->Visual.stencilBits > 0)
+         ddMask |= GL_STENCIL_BUFFER_BIT;
+      if ((mask & GL_ACCUM_BUFFER_BIT) && ctx->Visual.accumRedBits > 0)
+         ddMask |= GL_ACCUM_BUFFER_BIT;
+
+      ASSERT(ctx->Driver.Clear);
+      ctx->Driver.Clear( ctx, ddMask, (GLboolean) !ctx->Scissor.Enabled,
+			 x, y, width, height );
+   }
+}
+
+
+/**
+ * Specify which color buffers to draw into.
+ *
+ * \param mode color buffer combination.
+ *
+ * \sa glDrawBuffer().
+ *
+ * Flushes the vertices and verifies the parameter and updates the
+ * gl_colorbuffer_attrib::_DrawDestMask bitfield. Marks new color state in
+ * __GLcontextRec::NewState and notifies the driver via the
+ * dd_function_table::DrawBuffer callback.
+ */
+void GLAPIENTRY
+_mesa_DrawBuffer( GLenum mode )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* too complex... */
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glDrawBuffer %s\n", _mesa_lookup_enum_by_nr(mode));
+
+   /*
+    * Do error checking and compute the _DrawDestMask bitfield.
+    */
+   switch (mode) {
+      case GL_FRONT:
+         /* never an error */
+         if (ctx->Visual.stereoMode)
+            ctx->Color._DrawDestMask = FRONT_LEFT_BIT | FRONT_RIGHT_BIT;
+         else
+            ctx->Color._DrawDestMask = FRONT_LEFT_BIT;
+         break;
+      case GL_BACK:
+         if (!ctx->Visual.doubleBufferMode) {
+            _mesa_error(ctx, GL_INVALID_OPERATION, "glDrawBuffer(GL_BACK)");
+            return;
+         }
+         if (ctx->Visual.stereoMode)
+            ctx->Color._DrawDestMask = BACK_LEFT_BIT | BACK_RIGHT_BIT;
+         else
+            ctx->Color._DrawDestMask = BACK_LEFT_BIT;
+         break;
+      case GL_NONE:
+         /* never an error */
+         ctx->Color._DrawDestMask = 0;
+         break;
+#if _HAVE_FULL_GL
+      case GL_RIGHT:
+         if (!ctx->Visual.stereoMode) {
+            _mesa_error(ctx, GL_INVALID_OPERATION, "glDrawBuffer(GL_RIGHT)");
+            return;}
+         if (ctx->Visual.doubleBufferMode)
+            ctx->Color._DrawDestMask = FRONT_RIGHT_BIT | BACK_RIGHT_BIT;
+         else
+            ctx->Color._DrawDestMask = FRONT_RIGHT_BIT;
+         break;
+      case GL_FRONT_RIGHT:
+         if (!ctx->Visual.stereoMode) {
+            _mesa_error(ctx, GL_INVALID_OPERATION, "glDrawBuffer(GL_FRONT_RIGHT)");
+            return;
+         }
+         ctx->Color._DrawDestMask = FRONT_RIGHT_BIT;
+         break;
+      case GL_BACK_RIGHT:
+         if (!ctx->Visual.stereoMode || !ctx->Visual.doubleBufferMode) {
+            _mesa_error(ctx, GL_INVALID_OPERATION, "glDrawBuffer(GL_BACK_RIGHT)");
+            return;
+         }
+         ctx->Color._DrawDestMask = BACK_RIGHT_BIT;
+         break;
+      case GL_BACK_LEFT:
+         if (!ctx->Visual.doubleBufferMode) {
+            _mesa_error(ctx, GL_INVALID_OPERATION, "glDrawBuffer(GL_BACK_LEFT)");
+            return;
+         }
+         ctx->Color._DrawDestMask = BACK_LEFT_BIT;
+         break;
+      case GL_FRONT_AND_BACK:
+         if (!ctx->Visual.doubleBufferMode) {
+            _mesa_error(ctx, GL_INVALID_OPERATION, "glDrawBuffer(GL_FRONT_AND_BACK)");
+            return;
+         }
+         if (ctx->Visual.stereoMode)
+            ctx->Color._DrawDestMask = FRONT_LEFT_BIT | BACK_LEFT_BIT
+                                    | FRONT_RIGHT_BIT | BACK_RIGHT_BIT;
+         else
+            ctx->Color._DrawDestMask = FRONT_LEFT_BIT | BACK_LEFT_BIT;
+         break;
+      case GL_LEFT:
+         /* never an error */
+         if (ctx->Visual.doubleBufferMode)
+            ctx->Color._DrawDestMask = FRONT_LEFT_BIT | BACK_LEFT_BIT;
+         else
+            ctx->Color._DrawDestMask = FRONT_LEFT_BIT;
+         break;
+      case GL_FRONT_LEFT:
+         /* never an error */
+         ctx->Color._DrawDestMask = FRONT_LEFT_BIT;
+         break;
+      case GL_AUX0:
+         if (ctx->Const.NumAuxBuffers >= 1) {
+            ctx->Color._DrawDestMask = AUX0_BIT;
+         }
+         else {
+            _mesa_error( ctx, GL_INVALID_OPERATION, "glDrawBuffer(GL_AUX0)" );
+            return;
+         }
+         break;
+      case GL_AUX1:
+         if (ctx->Const.NumAuxBuffers >= 2) {
+            ctx->Color._DrawDestMask = AUX1_BIT;
+         }
+         else {
+            _mesa_error( ctx, GL_INVALID_OPERATION, "glDrawBuffer(GL_AUX1)" );
+            return;
+         }
+         break;
+      case GL_AUX2:
+         if (ctx->Const.NumAuxBuffers >= 3) {
+            ctx->Color._DrawDestMask = AUX2_BIT;
+         }
+         else {
+            _mesa_error( ctx, GL_INVALID_OPERATION, "glDrawBuffer(GL_AUX2)" );
+            return;
+         }
+         break;
+      case GL_AUX3:
+         if (ctx->Const.NumAuxBuffers >= 4) {
+            ctx->Color._DrawDestMask = AUX3_BIT;
+         }
+         else {
+            _mesa_error( ctx, GL_INVALID_OPERATION, "glDrawBuffer(GL_AUX3)" );
+            return;
+         }
+         break;
+#endif
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glDrawBuffer" );
+         return;
+   }
+
+   ctx->Color.DrawBuffer = mode;
+   ctx->NewState |= _NEW_COLOR;
+
+   /*
+    * Call device driver function.
+    */
+   if (ctx->Driver.DrawBuffer)
+      (*ctx->Driver.DrawBuffer)(ctx, mode);
+}
+
+
+/**
+ * Set the color buffer source for reading pixels.
+ *
+ * \param mode color buffer.
+ *
+ * \sa glReadBuffer().
+ *
+ * Verifies the parameter and updates gl_pixel_attrib::_ReadSrcMask.  Marks
+ * new pixel state in __GLcontextRec::NewState and notifies the driver via
+ * dd_function_table::ReadBuffer.
+ */
+void GLAPIENTRY
+_mesa_ReadBuffer( GLenum mode )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glReadBuffer %s\n", _mesa_lookup_enum_by_nr(mode));
+
+   /*
+    * Do error checking and compute ctx->Pixel._ReadSrcMask.
+    */
+   switch (mode) {
+      case GL_LEFT:
+      case GL_FRONT:
+      case GL_FRONT_LEFT:
+         /* Front-Left buffer, always exists */
+         ctx->Pixel._ReadSrcMask = FRONT_LEFT_BIT;
+         break;
+      case GL_BACK:
+      case GL_BACK_LEFT:
+         /* Back-Left buffer, requires double buffering */
+         if (!ctx->Visual.doubleBufferMode) {
+            _mesa_error( ctx, GL_INVALID_OPERATION, "glReadBuffer" );
+            return;
+         }
+         ctx->Pixel._ReadSrcMask = BACK_LEFT_BIT;
+         break;
+#if _HAVE_FULL_GL
+      case GL_FRONT_RIGHT:
+      case GL_RIGHT:
+         if (!ctx->Visual.stereoMode) {
+            _mesa_error( ctx, GL_INVALID_OPERATION, "glReadBuffer" );
+            return;
+         }
+         ctx->Pixel._ReadSrcMask = FRONT_RIGHT_BIT;
+         break;
+      case GL_BACK_RIGHT:
+         if (!ctx->Visual.stereoMode || !ctx->Visual.doubleBufferMode) {
+            _mesa_error( ctx, GL_INVALID_OPERATION, "glReadBuffer" );
+            return;
+         }
+         ctx->Pixel._ReadSrcMask = BACK_RIGHT_BIT;
+         break;
+      case GL_AUX0:
+         if (ctx->Const.NumAuxBuffers >= 1) {
+            ctx->Pixel._ReadSrcMask = AUX0_BIT;
+         }
+         else {
+            _mesa_error( ctx, GL_INVALID_OPERATION, "glReadBuffer(GL_AUX0)" );
+            return;
+         }
+         break;
+      case GL_AUX1:
+         if (ctx->Const.NumAuxBuffers >= 2) {
+            ctx->Pixel._ReadSrcMask = AUX1_BIT;
+         }
+         else {
+            _mesa_error( ctx, GL_INVALID_OPERATION, "glReadBuffer(GL_AUX1)" );
+            return;
+         }
+         break;
+      case GL_AUX2:
+         if (ctx->Const.NumAuxBuffers >= 3) {
+            ctx->Pixel._ReadSrcMask = AUX2_BIT;
+         }
+         else {
+            _mesa_error( ctx, GL_INVALID_OPERATION, "glReadBuffer(GL_AUX2)" );
+            return;
+         }
+         break;
+      case GL_AUX3:
+         if (ctx->Const.NumAuxBuffers >= 4) {
+            ctx->Pixel._ReadSrcMask = AUX3_BIT;
+         }
+         else {
+            _mesa_error( ctx, GL_INVALID_OPERATION, "glReadBuffer(GL_AUX3)" );
+            return;
+         }
+         break;
+#endif
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glReadBuffer" );
+         return;
+   }
+
+   ctx->Pixel.ReadBuffer = mode;
+   ctx->NewState |= _NEW_PIXEL;
+
+   /*
+    * Call device driver function.
+    */
+   if (ctx->Driver.ReadBuffer)
+      (*ctx->Driver.ReadBuffer)(ctx, mode);
+}
+
+#if _HAVE_FULL_GL
+
+/**
+ * GL_MESA_resize_buffers extension.
+ *
+ * When this function is called, we'll ask the window system how large
+ * the current window is.  If it's a new size, we'll call the driver's
+ * ResizeBuffers function.  The driver will then resize its color buffers
+ * as needed, and maybe call the swrast's routine for reallocating
+ * swrast-managed depth/stencil/accum/etc buffers.
+ * \note This function may be called from within Mesa or called by the
+ * user directly (see the GL_MESA_resize_buffers extension).
+ */
+void GLAPIENTRY
+_mesa_ResizeBuffersMESA( void )
+{
+   GLcontext *ctx = _mesa_get_current_context();
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glResizeBuffersMESA\n");
+
+   if (ctx) {
+      ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH( ctx );
+
+      if (ctx->DrawBuffer) {
+         GLuint buf_width, buf_height;
+         GLframebuffer *buffer = ctx->DrawBuffer;
+
+         /* ask device driver for size of output buffer */
+         (*ctx->Driver.GetBufferSize)( buffer, &buf_width, &buf_height );
+
+         /* see if size of device driver's color buffer (window) has changed */
+         if (buffer->Width == buf_width && buffer->Height == buf_height)
+            return; /* size is as expected */
+
+         buffer->Width = buf_width;
+         buffer->Height = buf_height;
+
+         ctx->Driver.ResizeBuffers( buffer );
+      }
+
+      if (ctx->ReadBuffer && ctx->ReadBuffer != ctx->DrawBuffer) {
+         GLuint buf_width, buf_height;
+         GLframebuffer *buffer = ctx->ReadBuffer;
+
+         /* ask device driver for size of read buffer */
+         (*ctx->Driver.GetBufferSize)( buffer, &buf_width, &buf_height );
+
+         /* see if size of device driver's color buffer (window) has changed */
+         if (buffer->Width == buf_width && buffer->Height == buf_height)
+            return; /* size is as expected */
+
+         buffer->Width = buf_width;
+         buffer->Height = buf_height;
+
+         ctx->Driver.ResizeBuffers( buffer );
+      }
+
+      ctx->NewState |= _NEW_BUFFERS;  /* to update scissor / window bounds */
+   }
+}
+
+/*
+ * XXX move somewhere else someday?
+ */
+void GLAPIENTRY
+_mesa_SampleCoverageARB(GLclampf value, GLboolean invert)
+{
+   GLcontext *ctx = _mesa_get_current_context();
+
+   if (!ctx->Extensions.ARB_multisample) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glSampleCoverageARB");
+      return;
+   }
+
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH( ctx );
+   ctx->Multisample.SampleCoverageValue = (GLfloat) CLAMP(value, 0.0, 1.0);
+   ctx->Multisample.SampleCoverageInvert = invert;
+   ctx->NewState |= _NEW_MULTISAMPLE;
+}
+
+#endif
+
+
+/**
+ * Define the scissor box.
+ *
+ * \param x, y coordinates of the scissor box lower-left corner.
+ * \param width width of the scissor box.
+ * \param height height of the scissor box.
+ *
+ * \sa glScissor().
+ *
+ * Verifies the parameters and updates __GLcontextRec::Scissor. On a
+ * change flushes the vertices and notifies the driver via
+ * the dd_function_table::Scissor callback.
+ */
+void GLAPIENTRY
+_mesa_Scissor( GLint x, GLint y, GLsizei width, GLsizei height )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (width < 0 || height < 0) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glScissor" );
+      return;
+   }
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glScissor %d %d %d %d\n", x, y, width, height);
+
+   if (x == ctx->Scissor.X &&
+       y == ctx->Scissor.Y &&
+       width == ctx->Scissor.Width &&
+       height == ctx->Scissor.Height)
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_SCISSOR);
+   ctx->Scissor.X = x;
+   ctx->Scissor.Y = y;
+   ctx->Scissor.Width = width;
+   ctx->Scissor.Height = height;
+
+   if (ctx->Driver.Scissor)
+      ctx->Driver.Scissor( ctx, x, y, width, height );
+}
+
+/**********************************************************************/
+/** \name State management */
+/*@{*/
+
+/**
+ * Update screen bounds.
+ *
+ * \param ctx GL context.
+ *
+ * Update gl_frame_buffer::_Xmin, and etc.
+ */
+void _mesa_update_buffers( GLcontext *ctx )
+{
+   ctx->DrawBuffer->_Xmin = 0;
+   ctx->DrawBuffer->_Ymin = 0;
+   ctx->DrawBuffer->_Xmax = ctx->DrawBuffer->Width;
+   ctx->DrawBuffer->_Ymax = ctx->DrawBuffer->Height;
+   if (ctx->Scissor.Enabled) {
+      if (ctx->Scissor.X > ctx->DrawBuffer->_Xmin) {
+	 ctx->DrawBuffer->_Xmin = ctx->Scissor.X;
+      }
+      if (ctx->Scissor.Y > ctx->DrawBuffer->_Ymin) {
+	 ctx->DrawBuffer->_Ymin = ctx->Scissor.Y;
+      }
+      if (ctx->Scissor.X + ctx->Scissor.Width < ctx->DrawBuffer->_Xmax) {
+	 ctx->DrawBuffer->_Xmax = ctx->Scissor.X + ctx->Scissor.Width;
+      }
+      if (ctx->Scissor.Y + ctx->Scissor.Height < ctx->DrawBuffer->_Ymax) {
+	 ctx->DrawBuffer->_Ymax = ctx->Scissor.Y + ctx->Scissor.Height;
+      }
+   }
+}
+
+/*@}*/
+
+			   
+/**********************************************************************/
+/** \name Initialization */
+/*@{*/
+
+/**
+ * Initialize the context scissor data.
+ *
+ * \param ctx GL context.
+ * 
+ * Initializes the __GLcontextRec::Scissor and __GLcontextRec::Multisample
+ * attribute groups, and related constants in __GLcontextRec::Const.
+ */
+void _mesa_init_buffers( GLcontext * ctx )
+{
+   /* Scissor group */
+   ctx->Scissor.Enabled = GL_FALSE;
+   ctx->Scissor.X = 0;
+   ctx->Scissor.Y = 0;
+   ctx->Scissor.Width = 0;
+   ctx->Scissor.Height = 0;
+
+   /* Multisample */
+   ctx->Multisample.Enabled = GL_FALSE;
+   ctx->Multisample.SampleAlphaToCoverage = GL_FALSE;
+   ctx->Multisample.SampleAlphaToOne = GL_FALSE;
+   ctx->Multisample.SampleCoverage = GL_FALSE;
+   ctx->Multisample.SampleCoverageValue = 1.0;
+   ctx->Multisample.SampleCoverageInvert = GL_FALSE;
+
+}
+
+/*@}*/
diff --git a/reactos/lib/mesa32/src/main/buffers.h b/reactos/lib/mesa32/src/main/buffers.h
new file mode 100644
index 00000000000..83e1b482511
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/buffers.h
@@ -0,0 +1,70 @@
+/**
+ * \file buffers.h
+ * Frame buffer management functions declarations.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+
+#ifndef BUFFERS_H
+#define BUFFERS_H
+
+
+#include "mtypes.h"
+
+
+extern void GLAPIENTRY
+_mesa_ClearIndex( GLfloat c );
+
+extern void GLAPIENTRY
+_mesa_ClearColor( GLclampf red, GLclampf green,
+                  GLclampf blue, GLclampf alpha );
+
+extern void GLAPIENTRY
+_mesa_Clear( GLbitfield mask );
+
+extern void GLAPIENTRY
+_mesa_DrawBuffer( GLenum mode );
+
+extern void GLAPIENTRY
+_mesa_ReadBuffer( GLenum mode );
+
+extern void GLAPIENTRY
+_mesa_ResizeBuffersMESA( void );
+
+extern void GLAPIENTRY
+_mesa_Scissor( GLint x, GLint y, GLsizei width, GLsizei height );
+
+extern void GLAPIENTRY
+_mesa_SampleCoverageARB(GLclampf value, GLboolean invert);
+
+extern void 
+_mesa_init_buffers( GLcontext * ctx );
+
+extern void 
+_mesa_update_buffers( GLcontext *ctx );
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/clip.c b/reactos/lib/mesa32/src/main/clip.c
new file mode 100644
index 00000000000..31e6af91bd1
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/clip.c
@@ -0,0 +1,119 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "clip.h"
+#include "context.h"
+#include "macros.h"
+#include "mtypes.h"
+
+#include "math/m_xform.h"
+#include "math/m_matrix.h"
+
+
+
+/**********************************************************************/
+/*                     Get/Set User clip-planes.                      */
+/**********************************************************************/
+
+
+
+void GLAPIENTRY
+_mesa_ClipPlane( GLenum plane, const GLdouble *eq )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint p;
+   GLfloat equation[4];
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   p = (GLint) plane - (GLint) GL_CLIP_PLANE0;
+   if (p < 0 || p >= (GLint) ctx->Const.MaxClipPlanes) {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glClipPlane" );
+      return;
+   }
+
+   equation[0] = (GLfloat) eq[0];
+   equation[1] = (GLfloat) eq[1];
+   equation[2] = (GLfloat) eq[2];
+   equation[3] = (GLfloat) eq[3];
+
+   /*
+    * The equation is transformed by the transpose of the inverse of the
+    * current modelview matrix and stored in the resulting eye coordinates.
+    *
+    * KW: Eqn is then transformed to the current clip space, where user
+    * clipping now takes place.  The clip-space equations are recalculated
+    * whenever the projection matrix changes.
+    */
+   if (ctx->ModelviewMatrixStack.Top->flags & MAT_DIRTY)
+      _math_matrix_analyse( ctx->ModelviewMatrixStack.Top );
+
+   _mesa_transform_vector( equation, equation,
+                           ctx->ModelviewMatrixStack.Top->inv );
+
+   if (TEST_EQ_4V(ctx->Transform.EyeUserPlane[p], equation))
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
+   COPY_4FV(ctx->Transform.EyeUserPlane[p], equation);
+
+   /* Update derived state.  This state also depends on the projection
+    * matrix, and is recalculated on changes to the projection matrix by
+    * code in _mesa_update_state().
+    */
+   if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {
+      if (ctx->ProjectionMatrixStack.Top->flags & MAT_DIRTY)
+         _math_matrix_analyse( ctx->ProjectionMatrixStack.Top );
+
+      _mesa_transform_vector( ctx->Transform._ClipUserPlane[p],
+			   ctx->Transform.EyeUserPlane[p],
+			   ctx->ProjectionMatrixStack.Top->inv );
+   }
+
+   if (ctx->Driver.ClipPlane)
+      ctx->Driver.ClipPlane( ctx, plane, equation );
+}
+
+
+void GLAPIENTRY
+_mesa_GetClipPlane( GLenum plane, GLdouble *equation )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint p;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   p = (GLint) (plane - GL_CLIP_PLANE0);
+   if (p < 0 || p >= (GLint) ctx->Const.MaxClipPlanes) {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetClipPlane" );
+      return;
+   }
+
+   equation[0] = (GLdouble) ctx->Transform.EyeUserPlane[p][0];
+   equation[1] = (GLdouble) ctx->Transform.EyeUserPlane[p][1];
+   equation[2] = (GLdouble) ctx->Transform.EyeUserPlane[p][2];
+   equation[3] = (GLdouble) ctx->Transform.EyeUserPlane[p][3];
+}
+
diff --git a/reactos/lib/mesa32/src/main/clip.h b/reactos/lib/mesa32/src/main/clip.h
new file mode 100644
index 00000000000..9442e864395
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/clip.h
@@ -0,0 +1,42 @@
+/**
+ * \file clip.h
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+
+#ifndef CLIP_H
+#define CLIP_H
+
+#include "mtypes.h"
+
+extern void GLAPIENTRY 
+_mesa_ClipPlane( GLenum plane, const GLdouble *equation );
+
+extern void GLAPIENTRY 
+_mesa_GetClipPlane( GLenum plane, GLdouble *equation );
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/colormac.h b/reactos/lib/mesa32/src/main/colormac.h
new file mode 100644
index 00000000000..cf89a818f66
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/colormac.h
@@ -0,0 +1,239 @@
+/**
+ * \file colormac.h
+ * Color-related macros
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+
+#ifndef COLORMAC_H
+#define COLORMAC_H
+
+
+#include "imports.h"
+#include "config.h"
+#include "macros.h"
+
+
+/** \def BYTE_TO_CHAN
+ * Convert from GLbyte to GLchan */
+
+/** \def UBYTE_TO_CHAN
+ * Convert from GLubyte to GLchan */
+
+/** \def SHORT_TO_CHAN
+ * Convert from GLshort to GLchan */
+
+/** \def USHORT_TO_CHAN
+ * Convert from GLushort to GLchan */
+
+/** \def INT_TO_CHAN
+ * Convert from GLint to GLchan */
+
+/** \def UINT_TO_CHAN
+ * Convert from GLuint to GLchan */
+
+/** \def CHAN_TO_UBYTE
+ * Convert from GLchan to GLubyte */
+
+/** \def CHAN_TO_FLOAT
+ * Convert from GLchan to GLfloat */
+
+/** \def CLAMPED_FLOAT_TO_CHAN
+ * Convert from GLclampf to GLchan */
+
+/** \def UNCLAMPED_FLOAT_TO_CHAN
+ * Convert from GLfloat to GLchan */
+
+/** \def COPY_CHAN4
+ * Copy a GLchan[4] array */
+
+/** \def CHAN_PRODUCT
+ * Scaled product (usually approximated) between two GLchan arguments */
+
+#if CHAN_BITS == 8
+
+#define BYTE_TO_CHAN(b)   ((b) < 0 ? 0 : (GLchan) (b))
+#define UBYTE_TO_CHAN(b)  (b)
+#define SHORT_TO_CHAN(s)  ((s) < 0 ? 0 : (GLchan) ((s) >> 7))
+#define USHORT_TO_CHAN(s) ((GLchan) ((s) >> 8))
+#define INT_TO_CHAN(i)    ((i) < 0 ? 0 : (GLchan) ((i) >> 23))
+#define UINT_TO_CHAN(i)   ((GLchan) ((i) >> 24))
+
+#define CHAN_TO_UBYTE(c)  (c)
+#define CHAN_TO_FLOAT(c)  UBYTE_TO_FLOAT(c)
+
+#define CLAMPED_FLOAT_TO_CHAN(c, f)    CLAMPED_FLOAT_TO_UBYTE(c, f)
+#define UNCLAMPED_FLOAT_TO_CHAN(c, f)  UNCLAMPED_FLOAT_TO_UBYTE(c, f)
+
+#define COPY_CHAN4(DST, SRC)  COPY_4UBV(DST, SRC)
+
+#define CHAN_PRODUCT(a, b)  ((GLubyte) (((GLint)(a) * ((GLint)(b) + 1)) >> 8))
+
+#elif CHAN_BITS == 16
+
+#define BYTE_TO_CHAN(b)   ((b) < 0 ? 0 : (((GLchan) (b)) * 516))
+#define UBYTE_TO_CHAN(b)  ((((GLchan) (b)) << 8) | ((GLchan) (b)))
+#define SHORT_TO_CHAN(s)  ((s) < 0 ? 0 : (GLchan) (s))
+#define USHORT_TO_CHAN(s) (s)
+#define INT_TO_CHAN(i)    ((i) < 0 ? 0 : (GLchan) ((i) >> 15))
+#define UINT_TO_CHAN(i)   ((GLchan) ((i) >> 16))
+
+#define CHAN_TO_UBYTE(c)  ((c) >> 8)
+#define CHAN_TO_FLOAT(c)  ((GLfloat) ((c) * (1.0 / CHAN_MAXF)))
+
+#define CLAMPED_FLOAT_TO_CHAN(c, f)    CLAMPED_FLOAT_TO_USHORT(c, f)
+#define UNCLAMPED_FLOAT_TO_CHAN(c, f)  UNCLAMPED_FLOAT_TO_USHORT(c, f)
+
+#define COPY_CHAN4(DST, SRC)  COPY_4V(DST, SRC)
+
+#define CHAN_PRODUCT(a, b) ((GLchan) ((((GLuint) (a)) * ((GLuint) (b))) / 65535))
+
+#elif CHAN_BITS == 32
+
+/* XXX floating-point color channels not fully thought-out */
+#define BYTE_TO_CHAN(b)   ((GLfloat) ((b) * (1.0F / 127.0F)))
+#define UBYTE_TO_CHAN(b)  ((GLfloat) ((b) * (1.0F / 255.0F)))
+#define SHORT_TO_CHAN(s)  ((GLfloat) ((s) * (1.0F / 32767.0F)))
+#define USHORT_TO_CHAN(s) ((GLfloat) ((s) * (1.0F / 65535.0F)))
+#define INT_TO_CHAN(i)    ((GLfloat) ((i) * (1.0F / 2147483647.0F)))
+#define UINT_TO_CHAN(i)   ((GLfloat) ((i) * (1.0F / 4294967295.0F)))
+
+#define CHAN_TO_UBYTE(c)  FLOAT_TO_UBYTE(c)
+#define CHAN_TO_FLOAT(c)  (c)
+
+#define CLAMPED_FLOAT_TO_CHAN(c, f)  c = (f)
+#define UNCLAMPED_FLOAT_TO_CHAN(c, f)      c = (f)
+
+#define COPY_CHAN4(DST, SRC)  COPY_4V(DST, SRC)
+
+#define CHAN_PRODUCT(a, b)    ((a) * (b))
+
+#else
+
+#error unexpected CHAN_BITS size
+
+#endif
+
+
+/**
+ * Convert 3 channels at once.
+ *
+ * \param dst pointer to destination GLchan[3] array.
+ * \param f pointer to source GLfloat[3] array.
+ *
+ * \sa #UNCLAMPED_FLOAT_TO_CHAN.
+ */
+#define UNCLAMPED_FLOAT_TO_RGB_CHAN(dst, f)	\
+do {						\
+   UNCLAMPED_FLOAT_TO_CHAN(dst[0], f[0]);	\
+   UNCLAMPED_FLOAT_TO_CHAN(dst[1], f[1]);	\
+   UNCLAMPED_FLOAT_TO_CHAN(dst[2], f[2]);	\
+} while (0)
+
+
+/**
+ * Convert 4 channels at once.
+ *
+ * \param dst pointer to destination GLchan[4] array.
+ * \param f pointer to source GLfloat[4] array.
+ *
+ * \sa #UNCLAMPED_FLOAT_TO_CHAN.
+ */
+#define UNCLAMPED_FLOAT_TO_RGBA_CHAN(dst, f)	\
+do {						\
+   UNCLAMPED_FLOAT_TO_CHAN(dst[0], f[0]);	\
+   UNCLAMPED_FLOAT_TO_CHAN(dst[1], f[1]);	\
+   UNCLAMPED_FLOAT_TO_CHAN(dst[2], f[2]);	\
+   UNCLAMPED_FLOAT_TO_CHAN(dst[3], f[3]);	\
+} while (0)
+
+
+
+/**
+ * \name Generic color packing macros
+ *
+ * \todo We may move these into texutil.h at some point.
+ */
+/*@{*/
+
+#define PACK_COLOR_8888( a, b, c, d )					\
+   (((a) << 24) | ((b) << 16) | ((c) << 8) | (d))
+
+#define PACK_COLOR_888( a, b, c )					\
+   (((a) << 16) | ((b) << 8) | (c))
+
+#define PACK_COLOR_565( a, b, c )					\
+   ((((a) & 0xf8) << 8) | (((b) & 0xfc) << 3) | (((c) & 0xf8) >> 3))
+
+#define PACK_COLOR_1555( a, b, c, d )					\
+   ((((b) & 0xf8) << 7) | (((c) & 0xf8) << 2) | (((d) & 0xf8) >> 3) |	\
+    ((a) ? 0x8000 : 0))
+
+#define PACK_COLOR_4444( a, b, c, d )					\
+   ((((a) & 0xf0) << 8) | (((b) & 0xf0) << 4) | ((c) & 0xf0) | ((d) >> 4))
+
+#define PACK_COLOR_88( a, b )						\
+   (((a) << 8) | (b))
+
+#define PACK_COLOR_332( a, b, c )					\
+   (((a) & 0xe0) | (((b) & 0xe0) >> 3) | (((c) & 0xc0) >> 6))
+
+
+#ifdef MESA_BIG_ENDIAN
+
+#define PACK_COLOR_8888_LE( a, b, c, d )	PACK_COLOR_8888( d, c, b, a )
+
+#define PACK_COLOR_565_LE( a, b, c )					\
+   (((a) & 0xf8) | (((b) & 0xe0) >> 5) | (((b) & 0x1c) << 11) |		\
+   (((c) & 0xf8) << 5))
+
+#define PACK_COLOR_1555_LE( a, b, c, d )				\
+   ((((b) & 0xf8) >> 1) | (((c) & 0xc0) >> 6) | (((c) & 0x38) << 10) |	\
+    (((d) & 0xf8) << 5) | ((a) ? 0x80 : 0))
+
+#define PACK_COLOR_4444_LE( a, b, c, d )	PACK_COLOR_4444( c, d, a, b )
+
+#define PACK_COLOR_88_LE( a, b )		PACK_COLOR_88( b, a )
+
+#else	/* little endian */
+
+#define PACK_COLOR_8888_LE( a, b, c, d )	PACK_COLOR_8888( a, b, c, d )
+
+#define PACK_COLOR_565_LE( a, b, c )		PACK_COLOR_565( a, b, c )
+
+#define PACK_COLOR_1555_LE( a, b, c, d )	PACK_COLOR_1555( a, b, c, d )
+
+#define PACK_COLOR_4444_LE( a, b, c, d )	PACK_COLOR_4444( a, b, c, d )
+
+#define PACK_COLOR_88_LE( a, b )		PACK_COLOR_88( a, b )
+
+#endif	/* endianness */
+
+/*@}*/
+
+
+#endif /* COLORMAC_H */
diff --git a/reactos/lib/mesa32/src/main/colortab.c b/reactos/lib/mesa32/src/main/colortab.c
new file mode 100644
index 00000000000..a44f9a01c54
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/colortab.c
@@ -0,0 +1,1381 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "imports.h"
+#include "colortab.h"
+#include "context.h"
+#include "image.h"
+#include "macros.h"
+#include "state.h"
+
+
+/*
+ * Given an internalFormat token passed to glColorTable,
+ * return the corresponding base format.
+ * Return -1 if invalid token.
+ */
+static GLint
+base_colortab_format( GLenum format )
+{
+   switch (format) {
+      case GL_ALPHA:
+      case GL_ALPHA4:
+      case GL_ALPHA8:
+      case GL_ALPHA12:
+      case GL_ALPHA16:
+         return GL_ALPHA;
+      case GL_LUMINANCE:
+      case GL_LUMINANCE4:
+      case GL_LUMINANCE8:
+      case GL_LUMINANCE12:
+      case GL_LUMINANCE16:
+         return GL_LUMINANCE;
+      case GL_LUMINANCE_ALPHA:
+      case GL_LUMINANCE4_ALPHA4:
+      case GL_LUMINANCE6_ALPHA2:
+      case GL_LUMINANCE8_ALPHA8:
+      case GL_LUMINANCE12_ALPHA4:
+      case GL_LUMINANCE12_ALPHA12:
+      case GL_LUMINANCE16_ALPHA16:
+         return GL_LUMINANCE_ALPHA;
+      case GL_INTENSITY:
+      case GL_INTENSITY4:
+      case GL_INTENSITY8:
+      case GL_INTENSITY12:
+      case GL_INTENSITY16:
+         return GL_INTENSITY;
+      case GL_RGB:
+      case GL_R3_G3_B2:
+      case GL_RGB4:
+      case GL_RGB5:
+      case GL_RGB8:
+      case GL_RGB10:
+      case GL_RGB12:
+      case GL_RGB16:
+         return GL_RGB;
+      case GL_RGBA:
+      case GL_RGBA2:
+      case GL_RGBA4:
+      case GL_RGB5_A1:
+      case GL_RGBA8:
+      case GL_RGB10_A2:
+      case GL_RGBA12:
+      case GL_RGBA16:
+         return GL_RGBA;
+      default:
+         return -1;  /* error */
+   }
+}
+
+
+
+/*
+ * Examine table's format and set the component sizes accordingly.
+ */
+static void
+set_component_sizes( struct gl_color_table *table )
+{
+   switch (table->Format) {
+      case GL_ALPHA:
+         table->RedSize = 0;
+         table->GreenSize = 0;
+         table->BlueSize = 0;
+         table->AlphaSize = CHAN_BITS;
+         table->IntensitySize = 0;
+         table->LuminanceSize = 0;
+         break;
+      case GL_LUMINANCE:
+         table->RedSize = 0;
+         table->GreenSize = 0;
+         table->BlueSize = 0;
+         table->AlphaSize = 0;
+         table->IntensitySize = 0;
+         table->LuminanceSize = CHAN_BITS;
+         break;
+      case GL_LUMINANCE_ALPHA:
+         table->RedSize = 0;
+         table->GreenSize = 0;
+         table->BlueSize = 0;
+         table->AlphaSize = CHAN_BITS;
+         table->IntensitySize = 0;
+         table->LuminanceSize = CHAN_BITS;
+         break;
+      case GL_INTENSITY:
+         table->RedSize = 0;
+         table->GreenSize = 0;
+         table->BlueSize = 0;
+         table->AlphaSize = 0;
+         table->IntensitySize = CHAN_BITS;
+         table->LuminanceSize = 0;
+         break;
+      case GL_RGB:
+         table->RedSize = CHAN_BITS;
+         table->GreenSize = CHAN_BITS;
+         table->BlueSize = CHAN_BITS;
+         table->AlphaSize = 0;
+         table->IntensitySize = 0;
+         table->LuminanceSize = 0;
+         break;
+      case GL_RGBA:
+         table->RedSize = CHAN_BITS;
+         table->GreenSize = CHAN_BITS;
+         table->BlueSize = CHAN_BITS;
+         table->AlphaSize = CHAN_BITS;
+         table->IntensitySize = 0;
+         table->LuminanceSize = 0;
+         break;
+      default:
+         _mesa_problem(NULL, "unexpected format in set_component_sizes");
+   }
+}
+
+
+
+void GLAPIENTRY
+_mesa_ColorTable( GLenum target, GLenum internalFormat,
+                  GLsizei width, GLenum format, GLenum type,
+                  const GLvoid *data )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   struct gl_texture_object *texObj = NULL;
+   struct gl_color_table *table = NULL;
+   GLboolean proxy = GL_FALSE;
+   GLint baseFormat;
+   GLfloat rScale = 1.0, gScale = 1.0, bScale = 1.0, aScale = 1.0;
+   GLfloat rBias  = 0.0, gBias  = 0.0, bBias  = 0.0, aBias  = 0.0;
+   GLboolean floatTable = GL_FALSE;
+   GLint comps;
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* too complex */
+
+   switch (target) {
+      case GL_TEXTURE_1D:
+         texObj = texUnit->Current1D;
+         table = &texObj->Palette;
+         break;
+      case GL_TEXTURE_2D:
+         texObj = texUnit->Current2D;
+         table = &texObj->Palette;
+         break;
+      case GL_TEXTURE_3D:
+         texObj = texUnit->Current3D;
+         table = &texObj->Palette;
+         break;
+      case GL_TEXTURE_CUBE_MAP_ARB:
+         if (!ctx->Extensions.ARB_texture_cube_map) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glColorTable(target)");
+            return;
+         }
+         texObj = texUnit->CurrentCubeMap;
+         table = &texObj->Palette;
+         break;
+      case GL_PROXY_TEXTURE_1D:
+         texObj = ctx->Texture.Proxy1D;
+         table = &texObj->Palette;
+         proxy = GL_TRUE;
+         break;
+      case GL_PROXY_TEXTURE_2D:
+         texObj = ctx->Texture.Proxy2D;
+         table = &texObj->Palette;
+         proxy = GL_TRUE;
+         break;
+      case GL_PROXY_TEXTURE_3D:
+         texObj = ctx->Texture.Proxy3D;
+         table = &texObj->Palette;
+         proxy = GL_TRUE;
+         break;
+      case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
+         if (!ctx->Extensions.ARB_texture_cube_map) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glColorTable(target)");
+            return;
+         }
+         texObj = ctx->Texture.ProxyCubeMap;
+         table = &texObj->Palette;
+         break;
+      case GL_SHARED_TEXTURE_PALETTE_EXT:
+         table = &ctx->Texture.Palette;
+         break;
+      case GL_COLOR_TABLE:
+         table = &ctx->ColorTable;
+         floatTable = GL_TRUE;
+         rScale = ctx->Pixel.ColorTableScale[0];
+         gScale = ctx->Pixel.ColorTableScale[1];
+         bScale = ctx->Pixel.ColorTableScale[2];
+         aScale = ctx->Pixel.ColorTableScale[3];
+         rBias = ctx->Pixel.ColorTableBias[0];
+         gBias = ctx->Pixel.ColorTableBias[1];
+         bBias = ctx->Pixel.ColorTableBias[2];
+         aBias = ctx->Pixel.ColorTableBias[3];
+         break;
+      case GL_PROXY_COLOR_TABLE:
+         table = &ctx->ProxyColorTable;
+         proxy = GL_TRUE;
+         break;
+      case GL_TEXTURE_COLOR_TABLE_SGI:
+         if (!ctx->Extensions.SGI_texture_color_table) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glColorTable(target)");
+            return;
+         }
+         table = &(texUnit->ColorTable);
+         floatTable = GL_TRUE;
+         rScale = ctx->Pixel.TextureColorTableScale[0];
+         gScale = ctx->Pixel.TextureColorTableScale[1];
+         bScale = ctx->Pixel.TextureColorTableScale[2];
+         aScale = ctx->Pixel.TextureColorTableScale[3];
+         rBias = ctx->Pixel.TextureColorTableBias[0];
+         gBias = ctx->Pixel.TextureColorTableBias[1];
+         bBias = ctx->Pixel.TextureColorTableBias[2];
+         aBias = ctx->Pixel.TextureColorTableBias[3];
+         break;
+      case GL_PROXY_TEXTURE_COLOR_TABLE_SGI:
+         if (!ctx->Extensions.SGI_texture_color_table) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glColorTable(target)");
+            return;
+         }
+         table = &(texUnit->ProxyColorTable);
+         proxy = GL_TRUE;
+         break;
+      case GL_POST_CONVOLUTION_COLOR_TABLE:
+         table = &ctx->PostConvolutionColorTable;
+         floatTable = GL_TRUE;
+         rScale = ctx->Pixel.PCCTscale[0];
+         gScale = ctx->Pixel.PCCTscale[1];
+         bScale = ctx->Pixel.PCCTscale[2];
+         aScale = ctx->Pixel.PCCTscale[3];
+         rBias = ctx->Pixel.PCCTbias[0];
+         gBias = ctx->Pixel.PCCTbias[1];
+         bBias = ctx->Pixel.PCCTbias[2];
+         aBias = ctx->Pixel.PCCTbias[3];
+         break;
+      case GL_PROXY_POST_CONVOLUTION_COLOR_TABLE:
+         table = &ctx->ProxyPostConvolutionColorTable;
+         proxy = GL_TRUE;
+         break;
+      case GL_POST_COLOR_MATRIX_COLOR_TABLE:
+         table = &ctx->PostColorMatrixColorTable;
+         floatTable = GL_TRUE;
+         rScale = ctx->Pixel.PCMCTscale[0];
+         gScale = ctx->Pixel.PCMCTscale[1];
+         bScale = ctx->Pixel.PCMCTscale[2];
+         aScale = ctx->Pixel.PCMCTscale[3];
+         rBias = ctx->Pixel.PCMCTbias[0];
+         gBias = ctx->Pixel.PCMCTbias[1];
+         bBias = ctx->Pixel.PCMCTbias[2];
+         aBias = ctx->Pixel.PCMCTbias[3];
+         break;
+      case GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE:
+         table = &ctx->ProxyPostColorMatrixColorTable;
+         proxy = GL_TRUE;
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glColorTable(target)");
+         return;
+   }
+
+   assert(table);
+
+   if (!_mesa_is_legal_format_and_type(format, type) ||
+       format == GL_INTENSITY) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glColorTable(format or type)");
+      return;
+   }
+
+   baseFormat = base_colortab_format(internalFormat);
+   if (baseFormat < 0 || baseFormat == GL_COLOR_INDEX) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glColorTable(internalFormat)");
+      return;
+   }
+
+   if (width < 0 || (width != 0 && _mesa_bitcount(width) != 1)) {
+      /* error */
+      if (proxy) {
+         table->Size = 0;
+         table->IntFormat = (GLenum) 0;
+         table->Format = (GLenum) 0;
+      }
+      else {
+         _mesa_error(ctx, GL_INVALID_VALUE, "glColorTable(width=%d)", width);
+      }
+      return;
+   }
+
+   if (width > (GLsizei) ctx->Const.MaxColorTableSize) {
+      if (proxy) {
+         table->Size = 0;
+         table->IntFormat = (GLenum) 0;
+         table->Format = (GLenum) 0;
+      }
+      else {
+         _mesa_error(ctx, GL_TABLE_TOO_LARGE, "glColorTable(width)");
+      }
+      return;
+   }
+
+   table->Size = width;
+   table->IntFormat = internalFormat;
+   table->Format = (GLenum) baseFormat;
+   set_component_sizes(table);
+
+   comps = _mesa_components_in_format(table->Format);
+   assert(comps > 0);  /* error should have been caught sooner */
+
+   if (!proxy) {
+      /* free old table, if any */
+      if (table->Table) {
+         FREE(table->Table);
+         table->Table = NULL;
+      }
+      if (width > 0) {
+         if (floatTable) {
+            GLfloat tempTab[MAX_COLOR_TABLE_SIZE * 4];
+            GLfloat *tableF;
+            GLint i;
+
+            _mesa_unpack_float_color_span(ctx, width, table->Format,
+                                          tempTab,  /* dest */
+                                          format, type, data, &ctx->Unpack,
+                                          0, GL_FALSE);
+
+            table->FloatTable = GL_TRUE;
+            table->Table = MALLOC(comps * width * sizeof(GLfloat));
+            if (!table->Table) {
+               _mesa_error(ctx, GL_OUT_OF_MEMORY, "glColorTable");
+               return;
+            }
+
+            tableF = (GLfloat *) table->Table;
+
+            switch (table->Format) {
+               case GL_INTENSITY:
+                  for (i = 0; i < width; i++) {
+                     tableF[i] = CLAMP(tempTab[i] * rScale + rBias, 0.0F, 1.0F);
+                  }
+                  break;
+               case GL_LUMINANCE:
+                  for (i = 0; i < width; i++) {
+                     tableF[i] = CLAMP(tempTab[i] * rScale + rBias, 0.0F, 1.0F);
+                  }
+                  break;
+               case GL_ALPHA:
+                  for (i = 0; i < width; i++) {
+                     tableF[i] = CLAMP(tempTab[i] * aScale + aBias, 0.0F, 1.0F);
+                  }
+                  break;
+               case GL_LUMINANCE_ALPHA:
+                  for (i = 0; i < width; i++) {
+                     tableF[i*2+0] = CLAMP(tempTab[i*2+0] * rScale + rBias, 0.0F, 1.0F);
+                     tableF[i*2+1] = CLAMP(tempTab[i*2+1] * aScale + aBias, 0.0F, 1.0F);
+                  }
+                  break;
+               case GL_RGB:
+                  for (i = 0; i < width; i++) {
+                     tableF[i*3+0] = CLAMP(tempTab[i*3+0] * rScale + rBias, 0.0F, 1.0F);
+                     tableF[i*3+1] = CLAMP(tempTab[i*3+1] * gScale + gBias, 0.0F, 1.0F);
+                     tableF[i*3+2] = CLAMP(tempTab[i*3+2] * bScale + bBias, 0.0F, 1.0F);
+                  }
+                  break;
+               case GL_RGBA:
+                  for (i = 0; i < width; i++) {
+                     tableF[i*4+0] = CLAMP(tempTab[i*4+0] * rScale + rBias, 0.0F, 1.0F);
+                     tableF[i*4+1] = CLAMP(tempTab[i*4+1] * gScale + gBias, 0.0F, 1.0F);
+                     tableF[i*4+2] = CLAMP(tempTab[i*4+2] * bScale + bBias, 0.0F, 1.0F);
+                     tableF[i*4+3] = CLAMP(tempTab[i*4+3] * aScale + aBias, 0.0F, 1.0F);
+                  }
+                  break;
+               default:
+                  _mesa_problem(ctx, "Bad format in _mesa_ColorTable");
+                  return;
+            }
+         }
+         else {
+            /* store GLchan table */
+            table->FloatTable = GL_FALSE;
+            table->Table = MALLOC(comps * width * sizeof(GLchan));
+            if (!table->Table) {
+               _mesa_error(ctx, GL_OUT_OF_MEMORY, "glColorTable");
+               return;
+            }
+            _mesa_unpack_chan_color_span(ctx, width, table->Format,
+                                         (GLchan *) table->Table,  /* dest */
+                                         format, type, data,
+                                         &ctx->Unpack, 0);
+         } /* floatTable */
+      } /* width > 0 */
+   } /* proxy */
+
+   if (texObj || target == GL_SHARED_TEXTURE_PALETTE_EXT) {
+      /* texture object palette, texObj==NULL means the shared palette */
+      if (ctx->Driver.UpdateTexturePalette) {
+         (*ctx->Driver.UpdateTexturePalette)( ctx, texObj );
+      }
+   }
+
+   ctx->NewState |= _NEW_PIXEL;
+}
+
+
+
+void GLAPIENTRY
+_mesa_ColorSubTable( GLenum target, GLsizei start,
+                     GLsizei count, GLenum format, GLenum type,
+                     const GLvoid *data )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   struct gl_texture_object *texObj = NULL;
+   struct gl_color_table *table = NULL;
+   GLfloat rScale = 1.0, gScale = 1.0, bScale = 1.0, aScale = 1.0;
+   GLfloat rBias  = 0.0, gBias  = 0.0, bBias  = 0.0, aBias  = 0.0;
+   GLint comps;
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   switch (target) {
+      case GL_TEXTURE_1D:
+         texObj = texUnit->Current1D;
+         table = &texObj->Palette;
+         break;
+      case GL_TEXTURE_2D:
+         texObj = texUnit->Current2D;
+         table = &texObj->Palette;
+         break;
+      case GL_TEXTURE_3D:
+         texObj = texUnit->Current3D;
+         table = &texObj->Palette;
+         break;
+      case GL_TEXTURE_CUBE_MAP_ARB:
+         if (!ctx->Extensions.ARB_texture_cube_map) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glColorSubTable(target)");
+            return;
+         }
+         texObj = texUnit->CurrentCubeMap;
+         table = &texObj->Palette;
+         break;
+      case GL_SHARED_TEXTURE_PALETTE_EXT:
+         table = &ctx->Texture.Palette;
+         break;
+      case GL_COLOR_TABLE:
+         table = &ctx->ColorTable;
+         rScale = ctx->Pixel.ColorTableScale[0];
+         gScale = ctx->Pixel.ColorTableScale[1];
+         bScale = ctx->Pixel.ColorTableScale[2];
+         aScale = ctx->Pixel.ColorTableScale[3];
+         rBias = ctx->Pixel.ColorTableBias[0];
+         gBias = ctx->Pixel.ColorTableBias[1];
+         bBias = ctx->Pixel.ColorTableBias[2];
+         aBias = ctx->Pixel.ColorTableBias[3];
+         break;
+      case GL_TEXTURE_COLOR_TABLE_SGI:
+         if (!ctx->Extensions.SGI_texture_color_table) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glColorSubTable(target)");
+            return;
+         }
+         table = &(texUnit->ColorTable);
+         rScale = ctx->Pixel.TextureColorTableScale[0];
+         gScale = ctx->Pixel.TextureColorTableScale[1];
+         bScale = ctx->Pixel.TextureColorTableScale[2];
+         aScale = ctx->Pixel.TextureColorTableScale[3];
+         rBias = ctx->Pixel.TextureColorTableBias[0];
+         gBias = ctx->Pixel.TextureColorTableBias[1];
+         bBias = ctx->Pixel.TextureColorTableBias[2];
+         aBias = ctx->Pixel.TextureColorTableBias[3];
+         break;
+      case GL_POST_CONVOLUTION_COLOR_TABLE:
+         table = &ctx->PostConvolutionColorTable;
+         rScale = ctx->Pixel.PCCTscale[0];
+         gScale = ctx->Pixel.PCCTscale[1];
+         bScale = ctx->Pixel.PCCTscale[2];
+         aScale = ctx->Pixel.PCCTscale[3];
+         rBias = ctx->Pixel.PCCTbias[0];
+         gBias = ctx->Pixel.PCCTbias[1];
+         bBias = ctx->Pixel.PCCTbias[2];
+         aBias = ctx->Pixel.PCCTbias[3];
+         break;
+      case GL_POST_COLOR_MATRIX_COLOR_TABLE:
+         table = &ctx->PostColorMatrixColorTable;
+         rScale = ctx->Pixel.PCMCTscale[0];
+         gScale = ctx->Pixel.PCMCTscale[1];
+         bScale = ctx->Pixel.PCMCTscale[2];
+         aScale = ctx->Pixel.PCMCTscale[3];
+         rBias = ctx->Pixel.PCMCTbias[0];
+         gBias = ctx->Pixel.PCMCTbias[1];
+         bBias = ctx->Pixel.PCMCTbias[2];
+         aBias = ctx->Pixel.PCMCTbias[3];
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glColorSubTable(target)");
+         return;
+   }
+
+   assert(table);
+
+   if (!_mesa_is_legal_format_and_type(format, type) ||
+       format == GL_INTENSITY) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glColorSubTable(format or type)");
+      return;
+   }
+
+   if (count < 1) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glColorSubTable(count)");
+      return;
+   }
+
+   comps = _mesa_components_in_format(table->Format);
+   assert(comps > 0);  /* error should have been caught sooner */
+
+   if (start + count > (GLint) table->Size) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glColorSubTable(count)");
+      return;
+   }
+
+   if (!table->Table) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glColorSubTable");
+      return;
+   }
+
+   if (!table->FloatTable) {
+      GLchan *dest = (GLchan *) table->Table + start * comps * sizeof(GLchan);
+      _mesa_unpack_chan_color_span(ctx, count, table->Format, dest,
+                                   format, type, data, &ctx->Unpack, 0);
+   }
+   else {
+      GLfloat tempTab[MAX_COLOR_TABLE_SIZE * 4];
+      GLfloat *tableF;
+      GLint i;
+
+      ASSERT(table->FloatTable);
+
+      _mesa_unpack_float_color_span(ctx, count, table->Format,
+                                    tempTab,  /* dest */
+                                    format, type, data, &ctx->Unpack,
+                                    0, GL_FALSE);
+
+      tableF = (GLfloat *) table->Table;
+
+      switch (table->Format) {
+         case GL_INTENSITY:
+            for (i = 0; i < count; i++) {
+               GLuint j = start + i;
+               tableF[j] = CLAMP(tempTab[i] * rScale + rBias, 0.0F, 1.0F);
+            }
+            break;
+         case GL_LUMINANCE:
+            for (i = 0; i < count; i++) {
+               GLuint j = start + i;
+               tableF[j] = CLAMP(tempTab[i] * rScale + rBias, 0.0F, 1.0F);
+            }
+            break;
+         case GL_ALPHA:
+            for (i = 0; i < count; i++) {
+               GLuint j = start + i;
+               tableF[j] = CLAMP(tempTab[i] * aScale + aBias, 0.0F, 1.0F);
+            }
+            break;
+         case GL_LUMINANCE_ALPHA:
+            for (i = 0; i < count; i++) {
+               GLuint j = start + i;
+               tableF[j*2+0] = CLAMP(tempTab[i*2+0] * rScale + rBias, 0.0F, 1.0F);
+               tableF[j*2+1] = CLAMP(tempTab[i*2+1] * aScale + aBias, 0.0F, 1.0F);
+            }
+            break;
+         case GL_RGB:
+            for (i = 0; i < count; i++) {
+               GLuint j = start + i;
+               tableF[j*3+0] = CLAMP(tempTab[i*3+0] * rScale + rBias, 0.0F, 1.0F);
+               tableF[j*3+1] = CLAMP(tempTab[i*3+1] * gScale + gBias, 0.0F, 1.0F);
+               tableF[j*3+2] = CLAMP(tempTab[i*3+2] * bScale + bBias, 0.0F, 1.0F);
+            }
+            break;
+         case GL_RGBA:
+            for (i = 0; i < count; i++) {
+               GLuint j = start + i;
+               tableF[j*4+0] = CLAMP(tempTab[i*4+0] * rScale + rBias, 0.0F, 1.0F);
+               tableF[j*4+1] = CLAMP(tempTab[i*4+1] * gScale + gBias, 0.0F, 1.0F);
+               tableF[j*4+2] = CLAMP(tempTab[i*4+2] * bScale + bBias, 0.0F, 1.0F);
+               tableF[j*4+3] = CLAMP(tempTab[i*4+3] * aScale + aBias, 0.0F, 1.0F);
+            }
+            break;
+         default:
+            _mesa_problem(ctx, "Bad format in _mesa_ColorSubTable");
+            return;
+         }
+   }
+
+   if (texObj || target == GL_SHARED_TEXTURE_PALETTE_EXT) {
+      /* per-texture object palette */
+      if (ctx->Driver.UpdateTexturePalette) {
+         (*ctx->Driver.UpdateTexturePalette)( ctx, texObj );
+      }
+   }
+
+   ctx->NewState |= _NEW_PIXEL;
+}
+
+
+
+/* XXX not tested */
+void GLAPIENTRY
+_mesa_CopyColorTable(GLenum target, GLenum internalformat,
+                     GLint x, GLint y, GLsizei width)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   /* Select buffer to read from */
+   ctx->Driver.CopyColorTable( ctx, target, internalformat, x, y, width );
+}
+
+
+
+/* XXX not tested */
+void GLAPIENTRY
+_mesa_CopyColorSubTable(GLenum target, GLsizei start,
+                        GLint x, GLint y, GLsizei width)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   ctx->Driver.CopyColorSubTable( ctx, target, start, x, y, width );
+}
+
+
+
+void GLAPIENTRY
+_mesa_GetColorTable( GLenum target, GLenum format,
+                     GLenum type, GLvoid *data )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   struct gl_color_table *table = NULL;
+   GLchan rgba[MAX_COLOR_TABLE_SIZE][4];
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (ctx->NewState) {
+      _mesa_update_state(ctx);
+   }
+
+   switch (target) {
+      case GL_TEXTURE_1D:
+         table = &texUnit->Current1D->Palette;
+         break;
+      case GL_TEXTURE_2D:
+         table = &texUnit->Current2D->Palette;
+         break;
+      case GL_TEXTURE_3D:
+         table = &texUnit->Current3D->Palette;
+         break;
+      case GL_TEXTURE_CUBE_MAP_ARB:
+         if (!ctx->Extensions.ARB_texture_cube_map) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTable(target)");
+            return;
+         }
+         table = &texUnit->CurrentCubeMap->Palette;
+         break;
+      case GL_SHARED_TEXTURE_PALETTE_EXT:
+         table = &ctx->Texture.Palette;
+         break;
+      case GL_COLOR_TABLE:
+         table = &ctx->ColorTable;
+         break;
+      case GL_TEXTURE_COLOR_TABLE_SGI:
+         if (!ctx->Extensions.SGI_texture_color_table) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTable(target)");
+            return;
+         }
+         table = &(texUnit->ColorTable);
+         break;
+      case GL_POST_CONVOLUTION_COLOR_TABLE:
+         table = &ctx->PostConvolutionColorTable;
+         break;
+      case GL_POST_COLOR_MATRIX_COLOR_TABLE:
+         table = &ctx->PostColorMatrixColorTable;
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTable(target)");
+         return;
+   }
+
+   assert(table);
+
+   switch (table->Format) {
+      case GL_ALPHA:
+         if (table->FloatTable) {
+            const GLfloat *tableF = (const GLfloat *) table->Table;
+            GLuint i;
+            for (i = 0; i < table->Size; i++) {
+               rgba[i][RCOMP] = 0;
+               rgba[i][GCOMP] = 0;
+               rgba[i][BCOMP] = 0;
+               rgba[i][ACOMP] = IROUND_POS(tableF[i] * CHAN_MAXF);
+            }
+         }
+         else {
+            const GLchan *tableUB = (const GLchan *) table->Table;
+            GLuint i;
+            for (i = 0; i < table->Size; i++) {
+               rgba[i][RCOMP] = 0;
+               rgba[i][GCOMP] = 0;
+               rgba[i][BCOMP] = 0;
+               rgba[i][ACOMP] = tableUB[i];
+            }
+         }
+         break;
+      case GL_LUMINANCE:
+         if (table->FloatTable) {
+            const GLfloat *tableF = (const GLfloat *) table->Table;
+            GLuint i;
+            for (i = 0; i < table->Size; i++) {
+               rgba[i][RCOMP] = IROUND_POS(tableF[i] * CHAN_MAXF);
+               rgba[i][GCOMP] = IROUND_POS(tableF[i] * CHAN_MAXF);
+               rgba[i][BCOMP] = IROUND_POS(tableF[i] * CHAN_MAXF);
+               rgba[i][ACOMP] = CHAN_MAX;
+            }
+         }
+         else {
+            const GLchan *tableUB = (const GLchan *) table->Table;
+            GLuint i;
+            for (i = 0; i < table->Size; i++) {
+               rgba[i][RCOMP] = tableUB[i];
+               rgba[i][GCOMP] = tableUB[i];
+               rgba[i][BCOMP] = tableUB[i];
+               rgba[i][ACOMP] = CHAN_MAX;
+            }
+         }
+         break;
+      case GL_LUMINANCE_ALPHA:
+         if (table->FloatTable) {
+            const GLfloat *tableF = (const GLfloat *) table->Table;
+            GLuint i;
+            for (i = 0; i < table->Size; i++) {
+               rgba[i][RCOMP] = IROUND_POS(tableF[i*2+0] * CHAN_MAXF);
+               rgba[i][GCOMP] = IROUND_POS(tableF[i*2+0] * CHAN_MAXF);
+               rgba[i][BCOMP] = IROUND_POS(tableF[i*2+0] * CHAN_MAXF);
+               rgba[i][ACOMP] = IROUND_POS(tableF[i*2+1] * CHAN_MAXF);
+            }
+         }
+         else {
+            const GLchan *tableUB = (const GLchan *) table->Table;
+            GLuint i;
+            for (i = 0; i < table->Size; i++) {
+               rgba[i][RCOMP] = tableUB[i*2+0];
+               rgba[i][GCOMP] = tableUB[i*2+0];
+               rgba[i][BCOMP] = tableUB[i*2+0];
+               rgba[i][ACOMP] = tableUB[i*2+1];
+            }
+         }
+         break;
+      case GL_INTENSITY:
+         if (table->FloatTable) {
+            const GLfloat *tableF = (const GLfloat *) table->Table;
+            GLuint i;
+            for (i = 0; i < table->Size; i++) {
+               rgba[i][RCOMP] = IROUND_POS(tableF[i] * CHAN_MAXF);
+               rgba[i][GCOMP] = IROUND_POS(tableF[i] * CHAN_MAXF);
+               rgba[i][BCOMP] = IROUND_POS(tableF[i] * CHAN_MAXF);
+               rgba[i][ACOMP] = IROUND_POS(tableF[i] * CHAN_MAXF);
+            }
+         }
+         else {
+            const GLchan *tableUB = (const GLchan *) table->Table;
+            GLuint i;
+            for (i = 0; i < table->Size; i++) {
+               rgba[i][RCOMP] = tableUB[i];
+               rgba[i][GCOMP] = tableUB[i];
+               rgba[i][BCOMP] = tableUB[i];
+               rgba[i][ACOMP] = tableUB[i];
+            }
+         }
+         break;
+      case GL_RGB:
+         if (table->FloatTable) {
+            const GLfloat *tableF = (const GLfloat *) table->Table;
+            GLuint i;
+            for (i = 0; i < table->Size; i++) {
+               rgba[i][RCOMP] = IROUND_POS(tableF[i*3+0] * CHAN_MAXF);
+               rgba[i][GCOMP] = IROUND_POS(tableF[i*3+1] * CHAN_MAXF);
+               rgba[i][BCOMP] = IROUND_POS(tableF[i*3+2] * CHAN_MAXF);
+               rgba[i][ACOMP] = CHAN_MAX;
+            }
+         }
+         else {
+            const GLchan *tableUB = (const GLchan *) table->Table;
+            GLuint i;
+            for (i = 0; i < table->Size; i++) {
+               rgba[i][RCOMP] = tableUB[i*3+0];
+               rgba[i][GCOMP] = tableUB[i*3+1];
+               rgba[i][BCOMP] = tableUB[i*3+2];
+               rgba[i][ACOMP] = CHAN_MAX;
+            }
+         }
+         break;
+      case GL_RGBA:
+         if (table->FloatTable) {
+            const GLfloat *tableF = (const GLfloat *) table->Table;
+            GLuint i;
+            for (i = 0; i < table->Size; i++) {
+               rgba[i][RCOMP] = IROUND_POS(tableF[i*4+0] * CHAN_MAXF);
+               rgba[i][GCOMP] = IROUND_POS(tableF[i*4+1] * CHAN_MAXF);
+               rgba[i][BCOMP] = IROUND_POS(tableF[i*4+2] * CHAN_MAXF);
+               rgba[i][ACOMP] = IROUND_POS(tableF[i*4+3] * CHAN_MAXF);
+            }
+         }
+         else {
+            const GLchan *tableUB = (const GLchan *) table->Table;
+            GLuint i;
+            for (i = 0; i < table->Size; i++) {
+               rgba[i][RCOMP] = tableUB[i*4+0];
+               rgba[i][GCOMP] = tableUB[i*4+1];
+               rgba[i][BCOMP] = tableUB[i*4+2];
+               rgba[i][ACOMP] = tableUB[i*4+3];
+            }
+         }
+         break;
+      default:
+         _mesa_problem(ctx, "bad table format in glGetColorTable");
+         return;
+   }
+
+   _mesa_pack_rgba_span(ctx, table->Size, (const GLchan (*)[4]) rgba,
+                        format, type, data, &ctx->Pack, GL_FALSE);
+}
+
+
+
+void GLAPIENTRY
+_mesa_ColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   switch (target) {
+      case GL_COLOR_TABLE_SGI:
+         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
+            ctx->Pixel.ColorTableScale[0] = params[0];
+            ctx->Pixel.ColorTableScale[1] = params[1];
+            ctx->Pixel.ColorTableScale[2] = params[2];
+            ctx->Pixel.ColorTableScale[3] = params[3];
+         }
+         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
+            ctx->Pixel.ColorTableBias[0] = params[0];
+            ctx->Pixel.ColorTableBias[1] = params[1];
+            ctx->Pixel.ColorTableBias[2] = params[2];
+            ctx->Pixel.ColorTableBias[3] = params[3];
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glColorTableParameterfv(pname)");
+            return;
+         }
+         break;
+      case GL_TEXTURE_COLOR_TABLE_SGI:
+         if (!ctx->Extensions.SGI_texture_color_table) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glColorTableParameter(target)");
+            return;
+         }
+         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
+            ctx->Pixel.TextureColorTableScale[0] = params[0];
+            ctx->Pixel.TextureColorTableScale[1] = params[1];
+            ctx->Pixel.TextureColorTableScale[2] = params[2];
+            ctx->Pixel.TextureColorTableScale[3] = params[3];
+         }
+         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
+            ctx->Pixel.TextureColorTableBias[0] = params[0];
+            ctx->Pixel.TextureColorTableBias[1] = params[1];
+            ctx->Pixel.TextureColorTableBias[2] = params[2];
+            ctx->Pixel.TextureColorTableBias[3] = params[3];
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glColorTableParameterfv(pname)");
+            return;
+         }
+         break;
+      case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
+         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
+            ctx->Pixel.PCCTscale[0] = params[0];
+            ctx->Pixel.PCCTscale[1] = params[1];
+            ctx->Pixel.PCCTscale[2] = params[2];
+            ctx->Pixel.PCCTscale[3] = params[3];
+         }
+         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
+            ctx->Pixel.PCCTbias[0] = params[0];
+            ctx->Pixel.PCCTbias[1] = params[1];
+            ctx->Pixel.PCCTbias[2] = params[2];
+            ctx->Pixel.PCCTbias[3] = params[3];
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glColorTableParameterfv(pname)");
+            return;
+         }
+         break;
+      case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
+         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
+            ctx->Pixel.PCMCTscale[0] = params[0];
+            ctx->Pixel.PCMCTscale[1] = params[1];
+            ctx->Pixel.PCMCTscale[2] = params[2];
+            ctx->Pixel.PCMCTscale[3] = params[3];
+         }
+         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
+            ctx->Pixel.PCMCTbias[0] = params[0];
+            ctx->Pixel.PCMCTbias[1] = params[1];
+            ctx->Pixel.PCMCTbias[2] = params[2];
+            ctx->Pixel.PCMCTbias[3] = params[3];
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glColorTableParameterfv(pname)");
+            return;
+         }
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glColorTableParameter(target)");
+         return;
+   }
+
+   ctx->NewState |= _NEW_PIXEL;
+}
+
+
+
+void GLAPIENTRY
+_mesa_ColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)
+{
+   GLfloat fparams[4];
+   if (pname == GL_COLOR_TABLE_SGI ||
+       pname == GL_TEXTURE_COLOR_TABLE_SGI ||
+       pname == GL_POST_CONVOLUTION_COLOR_TABLE_SGI ||
+       pname == GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI) {
+      /* four values */
+      fparams[0] = (GLfloat) params[0];
+      fparams[1] = (GLfloat) params[1];
+      fparams[2] = (GLfloat) params[2];
+      fparams[3] = (GLfloat) params[3];
+   }
+   else {
+      /* one values */
+      fparams[0] = (GLfloat) params[0];
+   }
+   _mesa_ColorTableParameterfv(target, pname, fparams);
+}
+
+
+
+void GLAPIENTRY
+_mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   struct gl_color_table *table = NULL;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   switch (target) {
+      case GL_TEXTURE_1D:
+         table = &texUnit->Current1D->Palette;
+         break;
+      case GL_TEXTURE_2D:
+         table = &texUnit->Current2D->Palette;
+         break;
+      case GL_TEXTURE_3D:
+         table = &texUnit->Current3D->Palette;
+         break;
+      case GL_TEXTURE_CUBE_MAP_ARB:
+         if (!ctx->Extensions.ARB_texture_cube_map) {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glGetColorTableParameterfv(target)");
+            return;
+         }
+         table = &texUnit->CurrentCubeMap->Palette;
+         break;
+      case GL_PROXY_TEXTURE_1D:
+         table = &ctx->Texture.Proxy1D->Palette;
+         break;
+      case GL_PROXY_TEXTURE_2D:
+         table = &ctx->Texture.Proxy2D->Palette;
+         break;
+      case GL_PROXY_TEXTURE_3D:
+         table = &ctx->Texture.Proxy3D->Palette;
+         break;
+      case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
+         if (!ctx->Extensions.ARB_texture_cube_map) {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glGetColorTableParameterfv(target)");
+            return;
+         }
+         table = &ctx->Texture.ProxyCubeMap->Palette;
+         break;
+      case GL_SHARED_TEXTURE_PALETTE_EXT:
+         table = &ctx->Texture.Palette;
+         break;
+      case GL_COLOR_TABLE:
+         table = &ctx->ColorTable;
+         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
+            params[0] = ctx->Pixel.ColorTableScale[0];
+            params[1] = ctx->Pixel.ColorTableScale[1];
+            params[2] = ctx->Pixel.ColorTableScale[2];
+            params[3] = ctx->Pixel.ColorTableScale[3];
+            return;
+         }
+         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
+            params[0] = ctx->Pixel.ColorTableBias[0];
+            params[1] = ctx->Pixel.ColorTableBias[1];
+            params[2] = ctx->Pixel.ColorTableBias[2];
+            params[3] = ctx->Pixel.ColorTableBias[3];
+            return;
+         }
+         break;
+      case GL_PROXY_COLOR_TABLE:
+         table = &ctx->ProxyColorTable;
+         break;
+      case GL_TEXTURE_COLOR_TABLE_SGI:
+         if (!ctx->Extensions.SGI_texture_color_table) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameter(target)");
+            return;
+         }
+         table = &(texUnit->ColorTable);
+         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
+            params[0] = ctx->Pixel.TextureColorTableScale[0];
+            params[1] = ctx->Pixel.TextureColorTableScale[1];
+            params[2] = ctx->Pixel.TextureColorTableScale[2];
+            params[3] = ctx->Pixel.TextureColorTableScale[3];
+            return;
+         }
+         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
+            params[0] = ctx->Pixel.TextureColorTableBias[0];
+            params[1] = ctx->Pixel.TextureColorTableBias[1];
+            params[2] = ctx->Pixel.TextureColorTableBias[2];
+            params[3] = ctx->Pixel.TextureColorTableBias[3];
+            return;
+         }
+         break;
+      case GL_PROXY_TEXTURE_COLOR_TABLE_SGI:
+         if (!ctx->Extensions.SGI_texture_color_table) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameter(target)");
+            return;
+         }
+         table = &(texUnit->ProxyColorTable);
+         break;
+      case GL_POST_CONVOLUTION_COLOR_TABLE:
+         table = &ctx->PostConvolutionColorTable;
+         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
+            params[0] = ctx->Pixel.PCCTscale[0];
+            params[1] = ctx->Pixel.PCCTscale[1];
+            params[2] = ctx->Pixel.PCCTscale[2];
+            params[3] = ctx->Pixel.PCCTscale[3];
+            return;
+         }
+         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
+            params[0] = ctx->Pixel.PCCTbias[0];
+            params[1] = ctx->Pixel.PCCTbias[1];
+            params[2] = ctx->Pixel.PCCTbias[2];
+            params[3] = ctx->Pixel.PCCTbias[3];
+            return;
+         }
+         break;
+      case GL_PROXY_POST_CONVOLUTION_COLOR_TABLE:
+         table = &ctx->ProxyPostConvolutionColorTable;
+         break;
+      case GL_POST_COLOR_MATRIX_COLOR_TABLE:
+         table = &ctx->PostColorMatrixColorTable;
+         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
+            params[0] = ctx->Pixel.PCMCTscale[0];
+            params[1] = ctx->Pixel.PCMCTscale[1];
+            params[2] = ctx->Pixel.PCMCTscale[2];
+            params[3] = ctx->Pixel.PCMCTscale[3];
+            return;
+         }
+         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
+            params[0] = ctx->Pixel.PCMCTbias[0];
+            params[1] = ctx->Pixel.PCMCTbias[1];
+            params[2] = ctx->Pixel.PCMCTbias[2];
+            params[3] = ctx->Pixel.PCMCTbias[3];
+            return;
+         }
+         break;
+      case GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE:
+         table = &ctx->ProxyPostColorMatrixColorTable;
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameterfv(target)");
+         return;
+   }
+
+   assert(table);
+
+   switch (pname) {
+      case GL_COLOR_TABLE_FORMAT:
+         *params = (GLfloat) table->IntFormat;
+         break;
+      case GL_COLOR_TABLE_WIDTH:
+         *params = (GLfloat) table->Size;
+         break;
+      case GL_COLOR_TABLE_RED_SIZE:
+         *params = (GLfloat) table->RedSize;
+         break;
+      case GL_COLOR_TABLE_GREEN_SIZE:
+         *params = (GLfloat) table->GreenSize;
+         break;
+      case GL_COLOR_TABLE_BLUE_SIZE:
+         *params = (GLfloat) table->BlueSize;
+         break;
+      case GL_COLOR_TABLE_ALPHA_SIZE:
+         *params = (GLfloat) table->AlphaSize;
+         break;
+      case GL_COLOR_TABLE_LUMINANCE_SIZE:
+         *params = (GLfloat) table->LuminanceSize;
+         break;
+      case GL_COLOR_TABLE_INTENSITY_SIZE:
+         *params = (GLfloat) table->IntensitySize;
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameterfv(pname)" );
+         return;
+   }
+}
+
+
+
+void GLAPIENTRY
+_mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   struct gl_color_table *table = NULL;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   switch (target) {
+      case GL_TEXTURE_1D:
+         table = &texUnit->Current1D->Palette;
+         break;
+      case GL_TEXTURE_2D:
+         table = &texUnit->Current2D->Palette;
+         break;
+      case GL_TEXTURE_3D:
+         table = &texUnit->Current3D->Palette;
+         break;
+      case GL_TEXTURE_CUBE_MAP_ARB:
+         if (!ctx->Extensions.ARB_texture_cube_map) {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glGetColorTableParameteriv(target)");
+            return;
+         }
+         table = &texUnit->CurrentCubeMap->Palette;
+         break;
+      case GL_PROXY_TEXTURE_1D:
+         table = &ctx->Texture.Proxy1D->Palette;
+         break;
+      case GL_PROXY_TEXTURE_2D:
+         table = &ctx->Texture.Proxy2D->Palette;
+         break;
+      case GL_PROXY_TEXTURE_3D:
+         table = &ctx->Texture.Proxy3D->Palette;
+         break;
+      case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
+         if (!ctx->Extensions.ARB_texture_cube_map) {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glGetColorTableParameteriv(target)");
+            return;
+         }
+         table = &ctx->Texture.ProxyCubeMap->Palette;
+         break;
+      case GL_SHARED_TEXTURE_PALETTE_EXT:
+         table = &ctx->Texture.Palette;
+         break;
+      case GL_COLOR_TABLE:
+         table = &ctx->ColorTable;
+         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
+            params[0] = (GLint) ctx->Pixel.ColorTableScale[0];
+            params[1] = (GLint) ctx->Pixel.ColorTableScale[1];
+            params[2] = (GLint) ctx->Pixel.ColorTableScale[2];
+            params[3] = (GLint) ctx->Pixel.ColorTableScale[3];
+            return;
+         }
+         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
+            params[0] = (GLint) ctx->Pixel.ColorTableBias[0];
+            params[1] = (GLint) ctx->Pixel.ColorTableBias[1];
+            params[2] = (GLint) ctx->Pixel.ColorTableBias[2];
+            params[3] = (GLint) ctx->Pixel.ColorTableBias[3];
+            return;
+         }
+         break;
+      case GL_PROXY_COLOR_TABLE:
+         table = &ctx->ProxyColorTable;
+         break;
+      case GL_TEXTURE_COLOR_TABLE_SGI:
+         if (!ctx->Extensions.SGI_texture_color_table) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameter(target)");
+            return;
+         }
+         table = &(texUnit->ColorTable);
+         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
+            params[0] = (GLint) ctx->Pixel.TextureColorTableScale[0];
+            params[1] = (GLint) ctx->Pixel.TextureColorTableScale[1];
+            params[2] = (GLint) ctx->Pixel.TextureColorTableScale[2];
+            params[3] = (GLint) ctx->Pixel.TextureColorTableScale[3];
+            return;
+         }
+         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
+            params[0] = (GLint) ctx->Pixel.TextureColorTableBias[0];
+            params[1] = (GLint) ctx->Pixel.TextureColorTableBias[1];
+            params[2] = (GLint) ctx->Pixel.TextureColorTableBias[2];
+            params[3] = (GLint) ctx->Pixel.TextureColorTableBias[3];
+            return;
+         }
+         break;
+      case GL_PROXY_TEXTURE_COLOR_TABLE_SGI:
+         if (!ctx->Extensions.SGI_texture_color_table) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameter(target)");
+            return;
+         }
+         table = &(texUnit->ProxyColorTable);
+         break;
+      case GL_POST_CONVOLUTION_COLOR_TABLE:
+         table = &ctx->PostConvolutionColorTable;
+         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
+            params[0] = (GLint) ctx->Pixel.PCCTscale[0];
+            params[1] = (GLint) ctx->Pixel.PCCTscale[1];
+            params[2] = (GLint) ctx->Pixel.PCCTscale[2];
+            params[3] = (GLint) ctx->Pixel.PCCTscale[3];
+            return;
+         }
+         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
+            params[0] = (GLint) ctx->Pixel.PCCTbias[0];
+            params[1] = (GLint) ctx->Pixel.PCCTbias[1];
+            params[2] = (GLint) ctx->Pixel.PCCTbias[2];
+            params[3] = (GLint) ctx->Pixel.PCCTbias[3];
+            return;
+         }
+         break;
+      case GL_PROXY_POST_CONVOLUTION_COLOR_TABLE:
+         table = &ctx->ProxyPostConvolutionColorTable;
+         break;
+      case GL_POST_COLOR_MATRIX_COLOR_TABLE:
+         table = &ctx->PostColorMatrixColorTable;
+         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
+            params[0] = (GLint) ctx->Pixel.PCMCTscale[0];
+            params[1] = (GLint) ctx->Pixel.PCMCTscale[1];
+            params[2] = (GLint) ctx->Pixel.PCMCTscale[2];
+            params[3] = (GLint) ctx->Pixel.PCMCTscale[3];
+            return;
+         }
+         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
+            params[0] = (GLint) ctx->Pixel.PCMCTbias[0];
+            params[1] = (GLint) ctx->Pixel.PCMCTbias[1];
+            params[2] = (GLint) ctx->Pixel.PCMCTbias[2];
+            params[3] = (GLint) ctx->Pixel.PCMCTbias[3];
+            return;
+         }
+         break;
+      case GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE:
+         table = &ctx->ProxyPostColorMatrixColorTable;
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameteriv(target)");
+         return;
+   }
+
+   assert(table);
+
+   switch (pname) {
+      case GL_COLOR_TABLE_FORMAT:
+         *params = table->IntFormat;
+         break;
+      case GL_COLOR_TABLE_WIDTH:
+         *params = table->Size;
+         break;
+      case GL_COLOR_TABLE_RED_SIZE:
+         *params = table->RedSize;
+         break;
+      case GL_COLOR_TABLE_GREEN_SIZE:
+         *params = table->GreenSize;
+         break;
+      case GL_COLOR_TABLE_BLUE_SIZE:
+         *params = table->BlueSize;
+         break;
+      case GL_COLOR_TABLE_ALPHA_SIZE:
+         *params = table->AlphaSize;
+         break;
+      case GL_COLOR_TABLE_LUMINANCE_SIZE:
+         *params = table->LuminanceSize;
+         break;
+      case GL_COLOR_TABLE_INTENSITY_SIZE:
+         *params = table->IntensitySize;
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameteriv(pname)" );
+         return;
+   }
+}
+
+/**********************************************************************/
+/*****                      Initialization                        *****/
+/**********************************************************************/
+
+
+void
+_mesa_init_colortable( struct gl_color_table *p )
+{
+   p->FloatTable = GL_FALSE;
+   p->Table = NULL;
+   p->Size = 0;
+   p->IntFormat = GL_RGBA;
+}
+
+
+
+void
+_mesa_free_colortable_data( struct gl_color_table *p )
+{
+   if (p->Table) {
+      FREE(p->Table);
+      p->Table = NULL;
+   }
+}
+
+
+/*
+ * Initialize all colortables for a context.
+ */
+void _mesa_init_colortables( GLcontext * ctx )
+{
+   /* Color tables */
+   _mesa_init_colortable(&ctx->ColorTable);
+   _mesa_init_colortable(&ctx->ProxyColorTable);
+   _mesa_init_colortable(&ctx->PostConvolutionColorTable);
+   _mesa_init_colortable(&ctx->ProxyPostConvolutionColorTable);
+   _mesa_init_colortable(&ctx->PostColorMatrixColorTable);
+   _mesa_init_colortable(&ctx->ProxyPostColorMatrixColorTable);
+}
+
+
+/*
+ * Free all colortable data for a context
+ */
+void _mesa_free_colortables_data( GLcontext *ctx )
+{
+   _mesa_free_colortable_data(&ctx->ColorTable);
+   _mesa_free_colortable_data(&ctx->ProxyColorTable);
+   _mesa_free_colortable_data(&ctx->PostConvolutionColorTable);
+   _mesa_free_colortable_data(&ctx->ProxyPostConvolutionColorTable);
+   _mesa_free_colortable_data(&ctx->PostColorMatrixColorTable);
+   _mesa_free_colortable_data(&ctx->ProxyPostColorMatrixColorTable);
+}
diff --git a/reactos/lib/mesa32/src/main/colortab.h b/reactos/lib/mesa32/src/main/colortab.h
new file mode 100644
index 00000000000..4bd16210a0b
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/colortab.h
@@ -0,0 +1,110 @@
+/**
+ * \file colortab.h
+ * Color tables.
+ * 
+ * \if subset
+ * (No-op)
+ *
+ * \endif
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef COLORTAB_H
+#define COLORTAB_H
+
+
+#include "mtypes.h"
+
+#if _HAVE_FULL_GL
+
+extern void GLAPIENTRY
+_mesa_ColorTable( GLenum target, GLenum internalformat,
+                  GLsizei width, GLenum format, GLenum type,
+                  const GLvoid *table );
+
+extern void GLAPIENTRY
+_mesa_ColorSubTable( GLenum target, GLsizei start,
+                     GLsizei count, GLenum format, GLenum type,
+                     const GLvoid *table );
+
+extern void GLAPIENTRY
+_mesa_CopyColorSubTable(GLenum target, GLsizei start,
+                        GLint x, GLint y, GLsizei width);
+
+extern void GLAPIENTRY
+_mesa_CopyColorTable(GLenum target, GLenum internalformat,
+                     GLint x, GLint y, GLsizei width);
+
+extern void GLAPIENTRY
+_mesa_GetColorTable( GLenum target, GLenum format,
+                     GLenum type, GLvoid *table );
+
+extern void GLAPIENTRY
+_mesa_ColorTableParameterfv(GLenum target, GLenum pname,
+                            const GLfloat *params);
+
+extern void GLAPIENTRY
+_mesa_ColorTableParameteriv(GLenum target, GLenum pname,
+                            const GLint *params);
+
+extern void GLAPIENTRY
+_mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params );
+
+extern void GLAPIENTRY
+_mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params );
+
+
+
+extern void
+_mesa_init_colortable( struct gl_color_table *table );
+
+extern void
+_mesa_free_colortable_data( struct gl_color_table *table );
+
+extern void 
+_mesa_init_colortables( GLcontext *ctx );
+
+extern void 
+_mesa_free_colortables_data( GLcontext *ctx );
+
+#else
+
+/** No-op */
+#define _mesa_init_colortable( p ) ((void) 0)
+
+/** No-op */
+#define _mesa_free_colortable_data( p ) ((void) 0)
+
+/** No-op */
+#define _mesa_init_colortables( p ) ((void)0)
+
+/** No-op */
+#define _mesa_free_colortables_data( p ) ((void)0)
+
+#endif
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/config.h b/reactos/lib/mesa32/src/main/config.h
new file mode 100644
index 00000000000..25ed2ff2755
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/config.h
@@ -0,0 +1,269 @@
+/**
+ * \file config.h
+ * Tunable configuration parameters.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#ifdef HAVE_CONFIG_H
+#include "conf.h"
+#endif
+
+
+/**
+ * \name OpenGL implementation limits
+ */
+/*@{*/
+
+/** Maximum modelview matrix stack depth */
+#define MAX_MODELVIEW_STACK_DEPTH 32
+
+/** Maximum projection matrix stack depth */
+#define MAX_PROJECTION_STACK_DEPTH 32
+
+/** Maximum texture matrix stack depth */
+#define MAX_TEXTURE_STACK_DEPTH 10
+
+/** Maximum color matrix stack depth */
+#define MAX_COLOR_STACK_DEPTH 4
+
+/** Maximum attribute stack depth */
+#define MAX_ATTRIB_STACK_DEPTH 16
+
+/** Maximum client attribute stack depth */
+#define MAX_CLIENT_ATTRIB_STACK_DEPTH 16
+
+/** Maximum recursion depth of display list calls */
+#define MAX_LIST_NESTING 64
+
+/** Maximum number of lights */
+#define MAX_LIGHTS 8
+
+/** Maximum user-defined clipping planes */
+#define MAX_CLIP_PLANES 6
+
+/** Maximum pixel map lookup table size */
+#define MAX_PIXEL_MAP_TABLE 256
+
+/** Number of auxillary color buffers */
+#define NUM_AUX_BUFFERS 0
+
+/** Maximum order (degree) of curves */
+#ifdef AMIGA
+#   define MAX_EVAL_ORDER 12
+#else
+#   define MAX_EVAL_ORDER 30
+#endif
+
+/** Maximum Name stack depth */
+#define MAX_NAME_STACK_DEPTH 64
+
+/** Minimum point size */
+#define MIN_POINT_SIZE 1.0
+/** Maximum point size */
+#define MAX_POINT_SIZE 20.0
+/** Point size granularity */
+#define POINT_SIZE_GRANULARITY 0.1
+
+/** Minimum line width */
+#define MIN_LINE_WIDTH 1.0
+/** Maximum line width */
+#define MAX_LINE_WIDTH 10.0
+/** Line width granularity */
+#define LINE_WIDTH_GRANULARITY 0.1
+
+/** Max texture palette / color table size */
+#define MAX_COLOR_TABLE_SIZE 256
+
+/** Number of 1D/2D texture mipmap levels */
+#define MAX_TEXTURE_LEVELS 12
+
+/** Number of 3D texture mipmap levels */
+#define MAX_3D_TEXTURE_LEVELS 9
+
+/** Number of cube texture mipmap levels - GL_ARB_texture_cube_map */
+#define MAX_CUBE_TEXTURE_LEVELS 12
+
+/** Maximum rectangular texture size - GL_NV_texture_rectangle */
+#define MAX_TEXTURE_RECT_SIZE 2048
+
+/** Number of texture units - GL_ARB_multitexture */
+#define MAX_TEXTURE_UNITS 8
+
+/**
+ * \name Separate numbers of texture coordinates and texture image units.
+ *
+ * These values will eventually replace most instances of MAX_TEXTURE_UNITS.
+ * We should always have MAX_TEXTURE_COORD_UNITS <= MAX_TEXTURE_IMAGE_UNITS.
+ * And, GL_MAX_TEXTURE_UNITS <= MAX_TEXTURE_COORD_UNITS.
+ */
+/*@{*/
+#define MAX_TEXTURE_COORD_UNITS 8
+#define MAX_TEXTURE_IMAGE_UNITS 8
+/*@}*/
+
+/** 
+ * Maximum viewport/image width. Must accomodate all texture sizes too. 
+ */
+#define MAX_WIDTH 4096
+/** Maximum viewport/image height */
+#define MAX_HEIGHT 4096
+
+/** Maxmimum size for CVA.  May be overridden by the drivers.  */
+#define MAX_ARRAY_LOCK_SIZE 3000
+
+/** Subpixel precision for antialiasing, window coordinate snapping */
+#define SUB_PIXEL_BITS 4
+
+/** Size of histogram tables */
+#define HISTOGRAM_TABLE_SIZE 256
+
+/** Max convolution filter width */
+#define MAX_CONVOLUTION_WIDTH 9
+/** Max convolution filter height */
+#define MAX_CONVOLUTION_HEIGHT 9
+
+/** GL_ARB_texture_compression */
+#define MAX_COMPRESSED_TEXTURE_FORMATS 25
+
+/** GL_EXT_texture_filter_anisotropic */
+#define MAX_TEXTURE_MAX_ANISOTROPY 16.0
+
+/** GL_EXT_texture_lod_bias */
+#define MAX_TEXTURE_LOD_BIAS 4.0
+
+/* GL_NV_vertex_program */
+#define MAX_NV_VERTEX_PROGRAM_INSTRUCTIONS 128
+#define MAX_NV_VERTEX_PROGRAM_TEMPS         12
+#define MAX_NV_VERTEX_PROGRAM_PARAMS        96
+#define MAX_NV_VERTEX_PROGRAM_INPUTS        16
+#define MAX_NV_VERTEX_PROGRAM_OUTPUTS       15
+
+/* GL_NV_fragment_program */
+#define MAX_NV_FRAGMENT_PROGRAM_INSTRUCTIONS 128
+#define MAX_NV_FRAGMENT_PROGRAM_TEMPS         96
+#define MAX_NV_FRAGMENT_PROGRAM_PARAMS        64
+#define MAX_NV_FRAGMENT_PROGRAM_INPUTS        12
+#define MAX_NV_FRAGMENT_PROGRAM_OUTPUTS        3
+#define MAX_NV_FRAGMENT_PROGRAM_WRITE_ONLYS    2
+
+/* GL_ARB_vertex_program */
+#define MAX_VERTEX_PROGRAM_ADDRESS_REGS 1
+#define MAX_VERTEX_PROGRAM_ATTRIBS     16
+
+/* GL_ARB_fragment_program */
+#define MAX_FRAGMENT_PROGRAM_ADDRESS_REGS 1
+#define MAX_FRAGMENT_PROGRAM_ALU_INSTRUCTIONS 48
+#define MAX_FRAGMENT_PROGRAM_TEX_INSTRUCTIONS 24
+#define MAX_FRAGMENT_PROGRAM_TEX_INDIRECTIONS  4
+
+/* Any program target/extension */
+#define MAX_PROGRAM_LOCAL_PARAMS 96
+#define MAX_PROGRAM_MATRICES 8
+#define MAX_PROGRAM_MATRIX_STACK_DEPTH 4
+
+/*@}*/
+
+
+/**
+ * \name Mesa-specific parameters
+ */
+/*@{*/
+
+
+/**
+ * Bits per accumulation buffer color component:  8, 16 or 32
+ */
+#define ACCUM_BITS 16
+
+/**
+ * Bits per depth buffer value.  
+ *
+ * Any reasonable value up to 31 will work.  32 doesn't work because of integer
+ * overflow problems in the rasterizer code.
+ */
+#ifndef DEFAULT_SOFTWARE_DEPTH_BITS
+#define DEFAULT_SOFTWARE_DEPTH_BITS 16
+#endif
+/** Depth buffer data type */
+#if DEFAULT_SOFTWARE_DEPTH_BITS <= 16
+#define DEFAULT_SOFTWARE_DEPTH_TYPE GLushort
+#else
+#define DEFAULT_SOFTWARE_DEPTH_TYPE GLuint
+#endif
+
+
+/**
+ * Bits per stencil value: 8
+ */
+#define STENCIL_BITS 8
+
+
+/**
+ * Bits per color channel:  8, 16 or 32
+ */
+#ifndef CHAN_BITS
+#define CHAN_BITS 8
+#endif
+
+
+/*
+ * Color channel component order
+ * 
+ * \note Changes will almost certainly cause problems at this time.
+ */
+#define RCOMP 0
+#define GCOMP 1
+#define BCOMP 2
+#define ACOMP 3
+
+
+/*
+ * Enable/disable features (blocks of code) by setting FEATURE_xyz to 0 or 1.
+ */
+#ifndef _HAVE_FULL_GL
+#define _HAVE_FULL_GL 1
+#endif
+
+#define FEATURE_ARB_vertex_buffer_object  _HAVE_FULL_GL
+#define FEATURE_ARB_vertex_program  _HAVE_FULL_GL
+#define FEATURE_ARB_fragment_program  _HAVE_FULL_GL
+#define FEATURE_ARB_occlusion_query  _HAVE_FULL_GL
+#define FEATURE_MESA_program_debug  _HAVE_FULL_GL
+#define FEATURE_NV_fence  _HAVE_FULL_GL
+#define FEATURE_NV_fragment_program  _HAVE_FULL_GL
+#define FEATURE_NV_vertex_program  _HAVE_FULL_GL
+#define FEATURE_userclip  _HAVE_FULL_GL
+#define FEATURE_texgen  _HAVE_FULL_GL
+#define FEATURE_windowpos  _HAVE_FULL_GL
+
+/*@}*/
+
+
+#endif /* CONFIG_H */
diff --git a/reactos/lib/mesa32/src/main/context.c b/reactos/lib/mesa32/src/main/context.c
new file mode 100644
index 00000000000..e554f7508e7
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/context.c
@@ -0,0 +1,1945 @@
+/**
+ * \file context.c
+ * Mesa context/visual/framebuffer management functions.
+ * \author Brian Paul
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/**
+ * \mainpage Mesa Core Module
+ *
+ * \section CoreIntroduction Introduction
+ *
+ * The Mesa core module consists of all the top-level files in the src
+ * directory.  The core module basically takes care of API dispatch,
+ * and OpenGL state management.
+ *
+ * For example, calls to glPolygonMode() are routed to _mesa_PolygonMode()
+ * which updates the state related to polygonmode.  Furthermore, dirty
+ * state flags related to polygon mode are set and if the device driver
+ * implements a special routine for PolygonMode, it will be called.
+ *
+ *
+ * \section AboutDoxygen About Doxygen
+ *
+ * If you're viewing this information as Doxygen-generated HTML you'll
+ * see the documentation index at the top of this page.
+ *
+ * The first line lists the Mesa source code modules.
+ * The second line lists the indexes available for viewing the documentation
+ * for each module.
+ *
+ * Selecting the <b>Main page</b> link will display a summary of the module
+ * (this page).
+ *
+ * Selecting <b>Data Structures</b> will list all C structures.
+ *
+ * Selecting the <b>File List</b> link will list all the source files in
+ * the module.
+ * Selecting a filename will show a list of all functions defined in that file.
+ *
+ * Selecting the <b>Data Fields</b> link will display a list of all
+ * documented structure members.
+ *
+ * Selecting the <b>Globals</b> link will display a list
+ * of all functions, structures, global variables and macros in the module.
+ *
+ */
+
+
+#include "glheader.h"
+#include "imports.h"
+#include "accum.h"
+#include "attrib.h"
+#include "blend.h"
+#include "buffers.h"
+#include "bufferobj.h"
+#include "colortab.h"
+#include "context.h"
+#include "debug.h"
+#include "depth.h"
+#include "dlist.h"
+#include "eval.h"
+#include "enums.h"
+#include "extensions.h"
+#include "feedback.h"
+#include "fog.h"
+#include "get.h"
+#include "glthread.h"
+#include "glapioffsets.h"
+#include "histogram.h"
+#include "hint.h"
+#include "hash.h"
+#include "light.h"
+#include "lines.h"
+#include "macros.h"
+#include "matrix.h"
+#include "occlude.h"
+#include "pixel.h"
+#include "points.h"
+#include "polygon.h"
+#if FEATURE_NV_vertex_program || FEATURE_NV_fragment_program
+#include "program.h"
+#endif
+#include "rastpos.h"
+#include "simple_list.h"
+#include "state.h"
+#include "stencil.h"
+#include "teximage.h"
+#include "texobj.h"
+#include "texstate.h"
+#include "mtypes.h"
+#include "varray.h"
+#include "vtxfmt.h"
+#if _HAVE_FULL_GL
+#include "math/m_translate.h"
+#include "math/m_matrix.h"
+#include "math/m_xform.h"
+#include "math/mathmod.h"
+#endif
+
+#ifdef USE_SPARC_ASM
+#include "SPARC/sparc.h"
+#endif
+
+#ifndef MESA_VERBOSE
+int MESA_VERBOSE = 0;
+#endif
+
+#ifndef MESA_DEBUG_FLAGS
+int MESA_DEBUG_FLAGS = 0;
+#endif
+
+
+/* ubyte -> float conversion */
+GLfloat _mesa_ubyte_to_float_color_tab[256];
+
+static void
+free_shared_state( GLcontext *ctx, struct gl_shared_state *ss );
+
+
+/**********************************************************************/
+/** \name OpenGL SI-style interface (new in Mesa 3.5)
+ *
+ * \if subset
+ * \note Most of these functions are never called in the Mesa subset.
+ * \endif
+ */
+/*@{*/
+
+/**
+ * Destroy context callback.
+ * 
+ * \param gc context.
+ * \return GL_TRUE on success, or GL_FALSE on failure.
+ * 
+ * \ifnot subset
+ * Called by window system/device driver (via __GLexports::destroyCurrent) when
+ * the rendering context is to be destroyed.
+ * \endif
+ *
+ * Frees the context data and the context structure.
+ */
+GLboolean
+_mesa_destroyContext(__GLcontext *gc)
+{
+   if (gc) {
+      _mesa_free_context_data(gc);
+      _mesa_free(gc);
+   }
+   return GL_TRUE;
+}
+
+/**
+ * Unbind context callback.
+ * 
+ * \param gc context.
+ * \return GL_TRUE on success, or GL_FALSE on failure.
+ *
+ * \ifnot subset
+ * Called by window system/device driver (via __GLexports::loseCurrent)
+ * when the rendering context is made non-current.
+ * \endif
+ *
+ * No-op
+ */
+GLboolean
+_mesa_loseCurrent(__GLcontext *gc)
+{
+   /* XXX unbind context from thread */
+   return GL_TRUE;
+}
+
+/**
+ * Bind context callback.
+ * 
+ * \param gc context.
+ * \return GL_TRUE on success, or GL_FALSE on failure.
+ *
+ * \ifnot subset
+ * Called by window system/device driver (via __GLexports::makeCurrent)
+ * when the rendering context is made current.
+ * \endif
+ *
+ * No-op
+ */
+GLboolean
+_mesa_makeCurrent(__GLcontext *gc)
+{
+   /* XXX bind context to thread */
+   return GL_TRUE;
+}
+
+/**
+ * Share context callback.
+ * 
+ * \param gc context.
+ * \param gcShare shared context.
+ * \return GL_TRUE on success, or GL_FALSE on failure.
+ *
+ * \ifnot subset
+ * Called by window system/device driver (via __GLexports::shareContext)
+ * \endif
+ *
+ * Update the shared context reference count, gl_shared_state::RefCount.
+ */
+GLboolean
+_mesa_shareContext(__GLcontext *gc, __GLcontext *gcShare)
+{
+   if (gc && gcShare && gc->Shared && gcShare->Shared) {
+      gc->Shared->RefCount--;
+      if (gc->Shared->RefCount == 0) {
+         free_shared_state(gc, gc->Shared);
+      }
+      gc->Shared = gcShare->Shared;
+      gc->Shared->RefCount++;
+      return GL_TRUE;
+   }
+   else {
+      return GL_FALSE;
+   }
+}
+
+
+#if _HAVE_FULL_GL
+/**
+ * Copy context callback.
+ */
+GLboolean
+_mesa_copyContext(__GLcontext *dst, const __GLcontext *src, GLuint mask)
+{
+   if (dst && src) {
+      _mesa_copy_context( src, dst, mask );
+      return GL_TRUE;
+   }
+   else {
+      return GL_FALSE;
+   }
+}
+#endif
+
+/** No-op */
+GLboolean
+_mesa_forceCurrent(__GLcontext *gc)
+{
+   return GL_TRUE;
+}
+
+/**
+ * Windows/buffer resizing notification callback.
+ *
+ * \param gc GL context.
+ * \return GL_TRUE on success, or GL_FALSE on failure.
+ */
+GLboolean
+_mesa_notifyResize(__GLcontext *gc)
+{
+   GLint x, y;
+   GLuint width, height;
+   __GLdrawablePrivate *d = gc->imports.getDrawablePrivate(gc);
+   if (!d || !d->getDrawableSize)
+      return GL_FALSE;
+   d->getDrawableSize( d, &x, &y, &width, &height );
+   /* update viewport, resize software buffers, etc. */
+   return GL_TRUE;
+}
+
+/**
+ * Window/buffer destruction notification callback.
+ *
+ * \param gc GL context.
+ * 
+ * Called when the context's window/buffer is going to be destroyed. 
+ *
+ * No-op
+ */
+void
+_mesa_notifyDestroy(__GLcontext *gc)
+{
+   /* Unbind from it. */
+}
+
+/**
+ * Swap buffers notification callback.
+ * 
+ * \param gc GL context.
+ *
+ * Called by window system just before swapping buffers.
+ * We have to finish any pending rendering.
+ */
+void
+_mesa_notifySwapBuffers(__GLcontext *gc)
+{
+   FLUSH_VERTICES( gc, 0 );
+}
+
+/** No-op */
+struct __GLdispatchStateRec *
+_mesa_dispatchExec(__GLcontext *gc)
+{
+   return NULL;
+}
+
+/** No-op */
+void
+_mesa_beginDispatchOverride(__GLcontext *gc)
+{
+}
+
+/** No-op */
+void
+_mesa_endDispatchOverride(__GLcontext *gc)
+{
+}
+
+/**
+ * \ifnot subset
+ * Setup the exports.  
+ *
+ * The window system will call these functions when it needs Mesa to do
+ * something.
+ * 
+ * \note Device drivers should override these functions!  For example,
+ * the Xlib driver should plug in the XMesa*-style functions into this
+ * structure.  The XMesa-style functions should then call the _mesa_*
+ * version of these functions.  This is an approximation to OO design
+ * (inheritance and virtual functions).
+ * \endif
+ *
+ * \if subset
+ * No-op.
+ * 
+ * \endif
+ */
+static void
+_mesa_init_default_exports(__GLexports *exports)
+{
+#if _HAVE_FULL_GL
+    exports->destroyContext = _mesa_destroyContext;
+    exports->loseCurrent = _mesa_loseCurrent;
+    exports->makeCurrent = _mesa_makeCurrent;
+    exports->shareContext = _mesa_shareContext;
+    exports->copyContext = _mesa_copyContext;
+    exports->forceCurrent = _mesa_forceCurrent;
+    exports->notifyResize = _mesa_notifyResize;
+    exports->notifyDestroy = _mesa_notifyDestroy;
+    exports->notifySwapBuffers = _mesa_notifySwapBuffers;
+    exports->dispatchExec = _mesa_dispatchExec;
+    exports->beginDispatchOverride = _mesa_beginDispatchOverride;
+    exports->endDispatchOverride = _mesa_endDispatchOverride;
+#endif
+}
+
+/**
+ * Exported OpenGL SI interface.
+ */
+__GLcontext *
+__glCoreCreateContext(__GLimports *imports, __GLcontextModes *modes)
+{
+    GLcontext *ctx;
+
+    ctx = (GLcontext *) (*imports->calloc)(NULL, 1, sizeof(GLcontext));
+    if (ctx == NULL) {
+	return NULL;
+    }
+
+    _mesa_initialize_context(ctx, modes, NULL, imports, GL_FALSE);
+    ctx->imports = *imports;
+
+    return ctx;
+}
+
+/**
+ * Exported OpenGL SI interface.
+ */
+void
+__glCoreNopDispatch(void)
+{
+#if 0
+   /* SI */
+   __gl_dispatch = __glNopDispatchState;
+#else
+   /* Mesa */
+   _glapi_set_dispatch(NULL);
+#endif
+}
+
+/*@}*/
+
+
+/**********************************************************************/
+/** \name GL Visual allocation/destruction                            */
+/**********************************************************************/
+/*@{*/
+
+/**
+ * Allocate a new GLvisual object.
+ * 
+ * \param rgbFlag GL_TRUE for RGB(A) mode, GL_FALSE for Color Index mode.
+ * \param dbFlag double buffering
+ * \param stereoFlag stereo buffer
+ * \param depthBits requested bits per depth buffer value. Any value in [0, 32]
+ * is acceptable but the actual depth type will be GLushort or GLuint as
+ * needed.
+ * \param stencilBits requested minimum bits per stencil buffer value
+ * \param accumRedBits, accumGreenBits, accumBlueBits, accumAlphaBits number of bits per color component in accum buffer.
+ * \param indexBits number of bits per pixel if \p rgbFlag is GL_FALSE
+ * \param redBits number of bits per color component in frame buffer for RGB(A)
+ * mode.  We always use 8 in core Mesa though.
+ * \param greenBits same as above.
+ * \param blueBits same as above.
+ * \param alphaBits same as above.
+ * \param numSamples not really used.
+ * 
+ * \return pointer to new GLvisual or NULL if requested parameters can't be
+ * met.
+ *
+ * Allocates a GLvisual structure and initializes it via
+ * _mesa_initialize_visual().
+ */
+GLvisual *
+_mesa_create_visual( GLboolean rgbFlag,
+                     GLboolean dbFlag,
+                     GLboolean stereoFlag,
+                     GLint redBits,
+                     GLint greenBits,
+                     GLint blueBits,
+                     GLint alphaBits,
+                     GLint indexBits,
+                     GLint depthBits,
+                     GLint stencilBits,
+                     GLint accumRedBits,
+                     GLint accumGreenBits,
+                     GLint accumBlueBits,
+                     GLint accumAlphaBits,
+                     GLint numSamples )
+{
+   GLvisual *vis = (GLvisual *) CALLOC( sizeof(GLvisual) );
+   if (vis) {
+      if (!_mesa_initialize_visual(vis, rgbFlag, dbFlag, stereoFlag,
+                                   redBits, greenBits, blueBits, alphaBits,
+                                   indexBits, depthBits, stencilBits,
+                                   accumRedBits, accumGreenBits,
+                                   accumBlueBits, accumAlphaBits,
+                                   numSamples)) {
+         FREE(vis);
+         return NULL;
+      }
+   }
+   return vis;
+}
+
+/**
+ * Initialize the fields of the given GLvisual.
+ * 
+ * \return GL_TRUE on success, or GL_FALSE on failure.
+ *
+ * \sa _mesa_create_visual() above for the parameter description.
+ *
+ * Makes some sanity checks and fills in the fields of the
+ * GLvisual structure with the given parameters.
+ */
+GLboolean
+_mesa_initialize_visual( GLvisual *vis,
+                         GLboolean rgbFlag,
+                         GLboolean dbFlag,
+                         GLboolean stereoFlag,
+                         GLint redBits,
+                         GLint greenBits,
+                         GLint blueBits,
+                         GLint alphaBits,
+                         GLint indexBits,
+                         GLint depthBits,
+                         GLint stencilBits,
+                         GLint accumRedBits,
+                         GLint accumGreenBits,
+                         GLint accumBlueBits,
+                         GLint accumAlphaBits,
+                         GLint numSamples )
+{
+   (void) numSamples;
+
+   assert(vis);
+
+   /* This is to catch bad values from device drivers not updated for
+    * Mesa 3.3.  Some device drivers just passed 1.  That's a REALLY
+    * bad value now (a 1-bit depth buffer!?!).
+    */
+   assert(depthBits == 0 || depthBits > 1);
+
+   if (depthBits < 0 || depthBits > 32) {
+      return GL_FALSE;
+   }
+   if (stencilBits < 0 || stencilBits > (GLint) (8 * sizeof(GLstencil))) {
+      return GL_FALSE;
+   }
+   if (accumRedBits < 0 || accumRedBits > (GLint) (8 * sizeof(GLaccum))) {
+      return GL_FALSE;
+   }
+   if (accumGreenBits < 0 || accumGreenBits > (GLint) (8 * sizeof(GLaccum))) {
+      return GL_FALSE;
+   }
+   if (accumBlueBits < 0 || accumBlueBits > (GLint) (8 * sizeof(GLaccum))) {
+      return GL_FALSE;
+   }
+   if (accumAlphaBits < 0 || accumAlphaBits > (GLint) (8 * sizeof(GLaccum))) {
+      return GL_FALSE;
+   }
+
+   vis->rgbMode          = rgbFlag;
+   vis->doubleBufferMode = dbFlag;
+   vis->stereoMode       = stereoFlag;
+
+   vis->redBits          = redBits;
+   vis->greenBits        = greenBits;
+   vis->blueBits         = blueBits;
+   vis->alphaBits        = alphaBits;
+
+   vis->indexBits      = indexBits;
+   vis->depthBits      = depthBits;
+   vis->accumRedBits   = (accumRedBits > 0) ? (8 * sizeof(GLaccum)) : 0;
+   vis->accumGreenBits = (accumGreenBits > 0) ? (8 * sizeof(GLaccum)) : 0;
+   vis->accumBlueBits  = (accumBlueBits > 0) ? (8 * sizeof(GLaccum)) : 0;
+   vis->accumAlphaBits = (accumAlphaBits > 0) ? (8 * sizeof(GLaccum)) : 0;
+   vis->stencilBits    = (stencilBits > 0) ? (8 * sizeof(GLstencil)) : 0;
+
+   vis->haveAccumBuffer   = accumRedBits > 0;
+   vis->haveDepthBuffer   = depthBits > 0;
+   vis->haveStencilBuffer = stencilBits > 0;
+
+   vis->numAuxBuffers = 0;
+   vis->level = 0;
+   vis->pixmapMode = 0;
+
+   return GL_TRUE;
+}
+
+/**
+ * Destroy a visual.
+ *
+ * \param vis visual.
+ * 
+ * Frees the visual structure.
+ */
+void
+_mesa_destroy_visual( GLvisual *vis )
+{
+   FREE(vis);
+}
+
+/*@}*/
+
+
+/**********************************************************************/
+/** \name GL Framebuffer allocation/destruction                       */
+/**********************************************************************/
+/*@{*/
+
+/**
+ * Create a new framebuffer.  
+ *
+ * A GLframebuffer is a structure which encapsulates the depth, stencil and
+ * accum buffers and related parameters.
+ * 
+ * \param visual a GLvisual pointer (we copy the struct contents)
+ * \param softwareDepth create/use a software depth buffer?
+ * \param softwareStencil create/use a software stencil buffer?
+ * \param softwareAccum create/use a software accum buffer?
+ * \param softwareAlpha create/use a software alpha buffer?
+ *
+ * \return pointer to new GLframebuffer struct or NULL if error.
+ *
+ * Allocate a GLframebuffer structure and initializes it via
+ * _mesa_initialize_framebuffer().
+ */
+GLframebuffer *
+_mesa_create_framebuffer( const GLvisual *visual,
+                          GLboolean softwareDepth,
+                          GLboolean softwareStencil,
+                          GLboolean softwareAccum,
+                          GLboolean softwareAlpha )
+{
+   GLframebuffer *buffer = CALLOC_STRUCT(gl_frame_buffer);
+   assert(visual);
+   if (buffer) {
+      _mesa_initialize_framebuffer(buffer, visual,
+                                   softwareDepth, softwareStencil,
+                                   softwareAccum, softwareAlpha );
+   }
+   return buffer;
+}
+
+/**
+ * Initialize a GLframebuffer object.
+ * 
+ * \sa _mesa_create_framebuffer() above for the parameter description.
+ *
+ * Makes some sanity checks and fills in the fields of the
+ * GLframebuffer structure with the given parameters.
+ */
+void
+_mesa_initialize_framebuffer( GLframebuffer *buffer,
+                              const GLvisual *visual,
+                              GLboolean softwareDepth,
+                              GLboolean softwareStencil,
+                              GLboolean softwareAccum,
+                              GLboolean softwareAlpha )
+{
+   assert(buffer);
+   assert(visual);
+
+   _mesa_bzero(buffer, sizeof(GLframebuffer));
+
+   /* sanity checks */
+   if (softwareDepth ) {
+      assert(visual->depthBits > 0);
+   }
+   if (softwareStencil) {
+      assert(visual->stencilBits > 0);
+   }
+   if (softwareAccum) {
+      assert(visual->rgbMode);
+      assert(visual->accumRedBits > 0);
+      assert(visual->accumGreenBits > 0);
+      assert(visual->accumBlueBits > 0);
+   }
+   if (softwareAlpha) {
+      assert(visual->rgbMode);
+      assert(visual->alphaBits > 0);
+   }
+
+   buffer->Visual = *visual;
+   buffer->UseSoftwareDepthBuffer = softwareDepth;
+   buffer->UseSoftwareStencilBuffer = softwareStencil;
+   buffer->UseSoftwareAccumBuffer = softwareAccum;
+   buffer->UseSoftwareAlphaBuffers = softwareAlpha;
+}
+
+/**
+ * Free a framebuffer struct and its buffers.
+ *
+ * Calls _mesa_free_framebuffer_data() and frees the structure.
+ */
+void
+_mesa_destroy_framebuffer( GLframebuffer *buffer )
+{
+   if (buffer) {
+      _mesa_free_framebuffer_data(buffer);
+      FREE(buffer);
+   }
+}
+
+/**
+ * Free the data hanging off of \p buffer, but not \p buffer itself.
+ *
+ * \param buffer framebuffer.
+ *
+ * Frees all the buffers associated with the structure.
+ */
+void
+_mesa_free_framebuffer_data( GLframebuffer *buffer )
+{
+   if (!buffer)
+      return;
+
+   if (buffer->UseSoftwareDepthBuffer && buffer->DepthBuffer) {
+      MESA_PBUFFER_FREE( buffer->DepthBuffer );
+      buffer->DepthBuffer = NULL;
+   }
+   if (buffer->UseSoftwareAccumBuffer && buffer->Accum) {
+      MESA_PBUFFER_FREE( buffer->Accum );
+      buffer->Accum = NULL;
+   }
+   if (buffer->UseSoftwareStencilBuffer && buffer->Stencil) {
+      MESA_PBUFFER_FREE( buffer->Stencil );
+      buffer->Stencil = NULL;
+   }
+   if (buffer->UseSoftwareAlphaBuffers){
+      if (buffer->FrontLeftAlpha) {
+         MESA_PBUFFER_FREE( buffer->FrontLeftAlpha );
+         buffer->FrontLeftAlpha = NULL;
+      }
+      if (buffer->BackLeftAlpha) {
+         MESA_PBUFFER_FREE( buffer->BackLeftAlpha );
+         buffer->BackLeftAlpha = NULL;
+      }
+      if (buffer->FrontRightAlpha) {
+         MESA_PBUFFER_FREE( buffer->FrontRightAlpha );
+         buffer->FrontRightAlpha = NULL;
+      }
+      if (buffer->BackRightAlpha) {
+         MESA_PBUFFER_FREE( buffer->BackRightAlpha );
+         buffer->BackRightAlpha = NULL;
+      }
+   }
+}
+
+/*@}*/
+
+
+/**********************************************************************/
+/** \name Context allocation, initialization, destroying
+ *
+ * The purpose of the most initialization functions here is to provide the
+ * default state values according to the OpenGL specification.
+ */
+/**********************************************************************/
+/*@{*/
+
+/**
+ * One-time initialization mutex lock.
+ *
+ * \sa Used by one_time_init().
+ */
+_glthread_DECLARE_STATIC_MUTEX(OneTimeLock);
+
+/**
+ * Calls all the various one-time-init functions in Mesa.
+ *
+ * While holding a global mutex lock, calls several initialization functions,
+ * and sets the glapi callbacks if the \c MESA_DEBUG environment variable is
+ * defined.
+ *
+ * \sa _mesa_init_lists(), _math_init().
+ */
+static void
+one_time_init( GLcontext *ctx )
+{
+   static GLboolean alreadyCalled = GL_FALSE;
+   _glthread_LOCK_MUTEX(OneTimeLock);
+   if (!alreadyCalled) {
+      GLuint i;
+
+      /* do some implementation tests */
+      assert( sizeof(GLbyte) == 1 );
+      assert( sizeof(GLshort) >= 2 );
+      assert( sizeof(GLint) >= 4 );
+      assert( sizeof(GLubyte) == 1 );
+      assert( sizeof(GLushort) >= 2 );
+      assert( sizeof(GLuint) >= 4 );
+
+      _mesa_init_lists();
+
+#if _HAVE_FULL_GL
+      _math_init();
+
+      for (i = 0; i < 256; i++) {
+         _mesa_ubyte_to_float_color_tab[i] = (float) i / 255.0F;
+      }
+#endif
+
+#ifdef USE_SPARC_ASM
+      _mesa_init_sparc_glapi_relocs();
+#endif
+      if (_mesa_getenv("MESA_DEBUG")) {
+         _glapi_noop_enable_warnings(GL_TRUE);
+#ifndef GLX_DIRECT_RENDERING
+         /* libGL from before 2002/06/28 don't have this function.  Someday,
+          * when newer libGL libs are common, remove the #ifdef test.  This
+          * only serves to print warnings when calling undefined GL functions.
+          */
+         _glapi_set_warning_func( (_glapi_warning_func) _mesa_warning );
+#endif
+      }
+      else {
+         _glapi_noop_enable_warnings(GL_FALSE);
+      }
+
+#if defined(DEBUG) && defined(__DATE__) && defined(__TIME__)
+      _mesa_debug(ctx, "Mesa DEBUG build %s %s\n", __DATE__, __TIME__);
+#endif
+
+      alreadyCalled = GL_TRUE;
+   }
+   _glthread_UNLOCK_MUTEX(OneTimeLock);
+}
+
+/**
+ * Allocate and initialize a shared context state structure.
+ *
+ * \return pointer to a gl_shared_state structure on success, or NULL on
+ * failure.
+ *
+ * Initializes the display list, texture objects and vertex programs hash
+ * tables, allocates the texture objects. If it runs out of memory, frees
+ * everything already allocated before returning NULL.
+ */
+static GLboolean
+alloc_shared_state( GLcontext *ctx )
+{
+   struct gl_shared_state *ss = CALLOC_STRUCT(gl_shared_state);
+   if (!ss)
+      return GL_FALSE;
+
+   ctx->Shared = ss;
+
+   _glthread_INIT_MUTEX(ss->Mutex);
+
+   ss->DisplayList = _mesa_NewHashTable();
+   ss->TexObjects = _mesa_NewHashTable();
+#if FEATURE_NV_vertex_program || FEATURE_NV_fragment_program
+   ss->Programs = _mesa_NewHashTable();
+#endif
+
+#if FEATURE_ARB_vertex_program
+   ss->DefaultVertexProgram = _mesa_alloc_program(ctx, GL_VERTEX_PROGRAM_ARB, 0);
+   if (!ss->DefaultVertexProgram)
+      goto cleanup;
+#endif
+#if FEATURE_ARB_fragment_program
+   ss->DefaultFragmentProgram = _mesa_alloc_program(ctx, GL_FRAGMENT_PROGRAM_ARB, 0);
+   if (!ss->DefaultFragmentProgram)
+      goto cleanup;
+#endif
+
+   ss->BufferObjects = _mesa_NewHashTable();
+
+   ss->Default1D = (*ctx->Driver.NewTextureObject)(ctx, 0, GL_TEXTURE_1D);
+   if (!ss->Default1D)
+      goto cleanup;
+
+   ss->Default2D = (*ctx->Driver.NewTextureObject)(ctx, 0, GL_TEXTURE_2D);
+   if (!ss->Default2D)
+      goto cleanup;
+
+   ss->Default3D = (*ctx->Driver.NewTextureObject)(ctx, 0, GL_TEXTURE_3D);
+   if (!ss->Default3D)
+      goto cleanup;
+
+   ss->DefaultCubeMap = (*ctx->Driver.NewTextureObject)(ctx, 0, GL_TEXTURE_CUBE_MAP_ARB);
+   if (!ss->DefaultCubeMap)
+      goto cleanup;
+
+   ss->DefaultRect = (*ctx->Driver.NewTextureObject)(ctx, 0, GL_TEXTURE_RECTANGLE_NV);
+   if (!ss->DefaultRect)
+      goto cleanup;
+
+#if 0
+   _mesa_save_texture_object(ctx, ss->Default1D);
+   _mesa_save_texture_object(ctx, ss->Default2D);
+   _mesa_save_texture_object(ctx, ss->Default3D);
+   _mesa_save_texture_object(ctx, ss->DefaultCubeMap);
+   _mesa_save_texture_object(ctx, ss->DefaultRect);
+#endif
+
+   /* Effectively bind the default textures to all texture units */
+   ss->Default1D->RefCount += MAX_TEXTURE_IMAGE_UNITS;
+   ss->Default2D->RefCount += MAX_TEXTURE_IMAGE_UNITS;
+   ss->Default3D->RefCount += MAX_TEXTURE_IMAGE_UNITS;
+   ss->DefaultCubeMap->RefCount += MAX_TEXTURE_IMAGE_UNITS;
+   ss->DefaultRect->RefCount += MAX_TEXTURE_IMAGE_UNITS;
+
+   return GL_TRUE;
+
+ cleanup:
+   /* Ran out of memory at some point.  Free everything and return NULL */
+   if (ss->DisplayList)
+      _mesa_DeleteHashTable(ss->DisplayList);
+   if (ss->TexObjects)
+      _mesa_DeleteHashTable(ss->TexObjects);
+#if FEATURE_NV_vertex_program
+   if (ss->Programs)
+      _mesa_DeleteHashTable(ss->Programs);
+#endif
+#if FEATURE_ARB_vertex_program
+   if (ss->DefaultVertexProgram)
+      _mesa_delete_program(ctx, ss->DefaultVertexProgram);
+#endif
+#if FEATURE_ARB_fragment_program
+   if (ss->DefaultFragmentProgram)
+      _mesa_delete_program(ctx, ss->DefaultFragmentProgram);
+#endif
+   if (ss->BufferObjects)
+      _mesa_DeleteHashTable(ss->BufferObjects);
+
+   if (ss->Default1D)
+      (*ctx->Driver.DeleteTexture)(ctx, ss->Default1D);
+   if (ss->Default2D)
+      (*ctx->Driver.DeleteTexture)(ctx, ss->Default2D);
+   if (ss->Default3D)
+      (*ctx->Driver.DeleteTexture)(ctx, ss->Default3D);
+   if (ss->DefaultCubeMap)
+      (*ctx->Driver.DeleteTexture)(ctx, ss->DefaultCubeMap);
+   if (ss->DefaultRect)
+      (*ctx->Driver.DeleteTexture)(ctx, ss->DefaultRect);
+   if (ss)
+      _mesa_free(ss);
+   return GL_FALSE;
+}
+
+/**
+ * Deallocate a shared state context and all children structures.
+ *
+ * \param ctx GL context.
+ * \param ss shared state pointer.
+ * 
+ * Frees the display lists, the texture objects (calling the driver texture
+ * deletion callback to free its private data) and the vertex programs, as well
+ * as their hash tables.
+ *
+ * \sa alloc_shared_state().
+ */
+static void
+free_shared_state( GLcontext *ctx, struct gl_shared_state *ss )
+{
+   /* Free display lists */
+   while (1) {
+      GLuint list = _mesa_HashFirstEntry(ss->DisplayList);
+      if (list) {
+         _mesa_destroy_list(ctx, list);
+      }
+      else {
+         break;
+      }
+   }
+   _mesa_DeleteHashTable(ss->DisplayList);
+
+   /* Free texture objects */
+   ASSERT(ctx->Driver.DeleteTexture);
+   while (1) {
+      GLuint texName = _mesa_HashFirstEntry(ss->TexObjects);
+      if (texName) {
+         struct gl_texture_object *texObj = (struct gl_texture_object *)
+            _mesa_HashLookup(ss->TexObjects, texName);
+         ASSERT(texObj);
+         (*ctx->Driver.DeleteTexture)(ctx, texObj);
+         _mesa_HashRemove(ss->TexObjects, texName);
+      }
+      else {
+         break;
+      }
+   }
+   _mesa_DeleteHashTable(ss->TexObjects);
+
+#if FEATURE_NV_vertex_program
+   /* Free vertex programs */
+   while (1) {
+      GLuint prog = _mesa_HashFirstEntry(ss->Programs);
+      if (prog) {
+         struct program *p = (struct program *) _mesa_HashLookup(ss->Programs,
+                                                                 prog);
+         ASSERT(p);
+         _mesa_delete_program(ctx, p);
+         _mesa_HashRemove(ss->Programs, prog);
+      }
+      else {
+         break;
+      }
+   }
+   _mesa_DeleteHashTable(ss->Programs);
+#endif
+
+   _mesa_DeleteHashTable(ss->BufferObjects);
+
+   _glthread_DESTROY_MUTEX(ss->Mutex);
+
+   FREE(ss);
+}
+
+
+static void _mesa_init_current( GLcontext *ctx )
+{
+   int i;
+
+   /* Current group */
+   for (i = 0; i < VERT_ATTRIB_MAX; i++) {
+      ASSIGN_4V( ctx->Current.Attrib[i], 0.0, 0.0, 0.0, 1.0 );
+   }
+   /* special cases: */
+   ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_WEIGHT], 1.0, 0.0, 0.0, 1.0 );
+   ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_NORMAL], 0.0, 0.0, 1.0, 1.0 );
+   ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_COLOR0], 1.0, 1.0, 1.0, 1.0 );
+   ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_COLOR1], 0.0, 0.0, 0.0, 0.0 );
+   ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_FOG], 0.0, 0.0, 0.0, 0.0 );
+   for (i = 0; i < MAX_TEXTURE_UNITS; i++)
+      ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_TEX0 + i], 0.0, 0.0, 0.0, 1.0);
+   ctx->Current.Index = 1;
+   ctx->Current.EdgeFlag = GL_TRUE;
+}
+
+
+static void 
+_mesa_init_constants( GLcontext *ctx )
+{
+   assert(ctx);
+
+   assert(MAX_TEXTURE_LEVELS >= MAX_3D_TEXTURE_LEVELS);
+   assert(MAX_TEXTURE_LEVELS >= MAX_CUBE_TEXTURE_LEVELS);
+
+   /* Constants, may be overriden by device drivers */
+   ctx->Const.MaxTextureLevels = MAX_TEXTURE_LEVELS;
+   ctx->Const.Max3DTextureLevels = MAX_3D_TEXTURE_LEVELS;
+   ctx->Const.MaxCubeTextureLevels = MAX_CUBE_TEXTURE_LEVELS;
+   ctx->Const.MaxTextureRectSize = MAX_TEXTURE_RECT_SIZE;
+   ctx->Const.MaxTextureUnits = MAX_TEXTURE_UNITS;
+   ctx->Const.MaxTextureCoordUnits = MAX_TEXTURE_COORD_UNITS;
+   ctx->Const.MaxTextureImageUnits = MAX_TEXTURE_IMAGE_UNITS;
+   ctx->Const.MaxTextureMaxAnisotropy = MAX_TEXTURE_MAX_ANISOTROPY;
+   ctx->Const.MaxTextureLodBias = MAX_TEXTURE_LOD_BIAS;
+   ctx->Const.MaxArrayLockSize = MAX_ARRAY_LOCK_SIZE;
+   ctx->Const.SubPixelBits = SUB_PIXEL_BITS;
+   ctx->Const.MinPointSize = MIN_POINT_SIZE;
+   ctx->Const.MaxPointSize = MAX_POINT_SIZE;
+   ctx->Const.MinPointSizeAA = MIN_POINT_SIZE;
+   ctx->Const.MaxPointSizeAA = MAX_POINT_SIZE;
+   ctx->Const.PointSizeGranularity = (GLfloat) POINT_SIZE_GRANULARITY;
+   ctx->Const.MinLineWidth = MIN_LINE_WIDTH;
+   ctx->Const.MaxLineWidth = MAX_LINE_WIDTH;
+   ctx->Const.MinLineWidthAA = MIN_LINE_WIDTH;
+   ctx->Const.MaxLineWidthAA = MAX_LINE_WIDTH;
+   ctx->Const.LineWidthGranularity = (GLfloat) LINE_WIDTH_GRANULARITY;
+   ctx->Const.NumAuxBuffers = NUM_AUX_BUFFERS;
+   ctx->Const.MaxColorTableSize = MAX_COLOR_TABLE_SIZE;
+   ctx->Const.MaxConvolutionWidth = MAX_CONVOLUTION_WIDTH;
+   ctx->Const.MaxConvolutionHeight = MAX_CONVOLUTION_HEIGHT;
+   ctx->Const.MaxClipPlanes = MAX_CLIP_PLANES;
+   ctx->Const.MaxLights = MAX_LIGHTS;
+   ctx->Const.MaxSpotExponent = 128.0;
+   ctx->Const.MaxShininess = 128.0;
+#if FEATURE_ARB_vertex_program
+   ctx->Const.MaxVertexProgramInstructions = MAX_NV_VERTEX_PROGRAM_INSTRUCTIONS;
+   ctx->Const.MaxVertexProgramAttribs = MAX_NV_VERTEX_PROGRAM_INPUTS;
+   ctx->Const.MaxVertexProgramTemps = MAX_NV_VERTEX_PROGRAM_TEMPS;
+   ctx->Const.MaxVertexProgramLocalParams = MAX_NV_VERTEX_PROGRAM_PARAMS;
+   ctx->Const.MaxVertexProgramEnvParams = MAX_NV_VERTEX_PROGRAM_PARAMS;/*XXX*/
+   ctx->Const.MaxVertexProgramAddressRegs = MAX_VERTEX_PROGRAM_ADDRESS_REGS;
+#endif
+#if FEATURE_ARB_fragment_program
+   ctx->Const.MaxFragmentProgramInstructions = MAX_NV_FRAGMENT_PROGRAM_INSTRUCTIONS;
+   ctx->Const.MaxFragmentProgramAttribs = MAX_NV_FRAGMENT_PROGRAM_INPUTS;
+   ctx->Const.MaxFragmentProgramTemps = MAX_NV_FRAGMENT_PROGRAM_TEMPS;
+   ctx->Const.MaxFragmentProgramLocalParams = MAX_NV_FRAGMENT_PROGRAM_PARAMS;
+   ctx->Const.MaxFragmentProgramEnvParams = MAX_NV_FRAGMENT_PROGRAM_PARAMS;/*XXX*/
+   ctx->Const.MaxFragmentProgramAddressRegs = MAX_FRAGMENT_PROGRAM_ADDRESS_REGS;
+   ctx->Const.MaxFragmentProgramAluInstructions = MAX_FRAGMENT_PROGRAM_ALU_INSTRUCTIONS;
+   ctx->Const.MaxFragmentProgramTexInstructions = MAX_FRAGMENT_PROGRAM_TEX_INSTRUCTIONS;
+   ctx->Const.MaxFragmentProgramTexIndirections = MAX_FRAGMENT_PROGRAM_TEX_INDIRECTIONS;
+#endif
+   ctx->Const.MaxProgramMatrices = MAX_PROGRAM_MATRICES;
+   ctx->Const.MaxProgramMatrixStackDepth = MAX_PROGRAM_MATRIX_STACK_DEPTH;
+
+   /* If we're running in the X server, do bounds checking to prevent
+    * segfaults and server crashes!
+    */
+#if defined(XFree86LOADER) && defined(IN_MODULE)
+   ctx->Const.CheckArrayBounds = GL_TRUE;
+#else
+   ctx->Const.CheckArrayBounds = GL_FALSE;
+#endif
+
+   ASSERT(ctx->Const.MaxTextureUnits == MAX2(ctx->Const.MaxTextureImageUnits, ctx->Const.MaxTextureCoordUnits));
+}
+
+/**
+ * Initialize the attribute groups in a GL context.
+ *
+ * \param ctx GL context.
+ *
+ * Initializes all the attributes, calling the respective <tt>init*</tt>
+ * functions for the more complex data structures.
+ */
+static GLboolean
+init_attrib_groups( GLcontext *ctx )
+{
+   assert(ctx);
+
+   /* Constants */
+   _mesa_init_constants( ctx );
+
+   /* Extensions */
+   _mesa_init_extensions( ctx );
+
+   /* Attribute Groups */
+   _mesa_init_accum( ctx );
+   _mesa_init_attrib( ctx );
+   _mesa_init_buffers( ctx );
+   _mesa_init_buffer_objects( ctx );
+   _mesa_init_color( ctx );
+   _mesa_init_colortables( ctx );
+   _mesa_init_current( ctx );
+   _mesa_init_depth( ctx );
+   _mesa_init_debug( ctx );
+   _mesa_init_display_list( ctx );
+   _mesa_init_eval( ctx );
+   _mesa_init_feedback( ctx );
+   _mesa_init_fog( ctx );
+   _mesa_init_histogram( ctx );
+   _mesa_init_hint( ctx );
+   _mesa_init_line( ctx );
+   _mesa_init_lighting( ctx );
+   _mesa_init_matrix( ctx );
+   _mesa_init_occlude( ctx );
+   _mesa_init_pixel( ctx );
+   _mesa_init_point( ctx );
+   _mesa_init_polygon( ctx );
+   _mesa_init_program( ctx );
+   _mesa_init_rastpos( ctx );
+   _mesa_init_stencil( ctx );
+   _mesa_init_transform( ctx );
+   _mesa_init_varray( ctx );
+   _mesa_init_viewport( ctx );
+
+   if (!_mesa_init_texture( ctx ))
+      return GL_FALSE;
+
+   /* Miscellaneous */
+   ctx->NewState = _NEW_ALL;
+   ctx->ErrorValue = (GLenum) GL_NO_ERROR;
+   ctx->CatchSignals = GL_TRUE;
+   ctx->_Facing = 0;
+
+   return GL_TRUE;
+}
+
+
+/**
+ * If the DRI libGL.so library is old, it may not have the entrypoints for
+ * some recent OpenGL extensions.  Dynamically add them now.
+ * If we're building stand-alone Mesa where libGL.so has both the dispatcher
+ * and driver code, this won't be an issue (and calling this function won't
+ * do any harm).
+ */
+static void
+add_newer_entrypoints(void)
+{
+   unsigned   i;
+   static const struct {
+      const char * const name;
+      unsigned  offset;
+   }
+   newer_entrypoints[] = {
+      /* GL_ARB_window_pos aliases with GL_MESA_window_pos */
+      { "glWindowPos2dARB", 513 },
+      { "glWindowPos2dvARB", 514 },
+      { "glWindowPos2fARB", 515 },
+      { "glWindowPos2fvARB", 516 },
+      { "glWindowPos2iARB", 517 },
+      { "glWindowPos2ivARB", 518 },
+      { "glWindowPos2sARB", 519 },
+      { "glWindowPos2svARB", 520 },
+      { "glWindowPos3dARB", 521 },
+      { "glWindowPos3dvARB", 522 },
+      { "glWindowPos3fARB", 523 },
+      { "glWindowPos3fvARB", 524 },
+      { "glWindowPos3iARB", 525 },
+      { "glWindowPos3ivARB", 526 },
+      { "glWindowPos3sARB", 527 },
+      { "glWindowPos3svARB", 528 },
+#if FEATURE_NV_vertex_program
+      { "glAreProgramsResidentNV", 578 },
+      { "glBindProgramNV", 579 },
+      { "glDeleteProgramsNV", 580 },
+      { "glExecuteProgramNV", 581 },
+      { "glGenProgramsNV", 582 },
+      { "glGetProgramParameterdvNV", 583 },
+      { "glGetProgramParameterfvNV", 584 },
+      { "glGetProgramivNV", 585 },
+      { "glGetProgramStringNV", 586 },
+      { "glGetTrackMatrixivNV", 587 },
+      { "glGetVertexAttribdvNV", 588 },
+      { "glGetVertexAttribfvNV", 589 },
+      { "glGetVertexAttribivNV", 590 },
+      { "glGetVertexAttribPointervNV", 591 },
+      { "glIsProgramNV", 592 },
+      { "glLoadProgramNV", 593 },
+      { "glProgramParameter4dNV", 594 },
+      { "glProgramParameter4dvNV", 595 },
+      { "glProgramParameter4fNV", 596 },
+      { "glProgramParameter4fvNV", 597 },
+      { "glProgramParameters4dvNV", 598 },
+      { "glProgramParameters4fvNV", 599 },
+      { "glRequestResidentProgramsNV", 600 },
+      { "glTrackMatrixNV", 601 },
+      { "glVertexAttribPointerNV", 602 },
+      { "glVertexAttrib1dNV", 603 },
+      { "glVertexAttrib1dvNV", 604 },
+      { "glVertexAttrib1fNV", 605 },
+      { "glVertexAttrib1fvNV", 606 },
+      { "glVertexAttrib1sNV", 607 },
+      { "glVertexAttrib1svNV", 608 },
+      { "glVertexAttrib2dNV", 609 },
+      { "glVertexAttrib2dvNV", 610 },
+      { "glVertexAttrib2fNV", 611 },
+      { "glVertexAttrib2fvNV", 612 },
+      { "glVertexAttrib2sNV", 613 },
+      { "glVertexAttrib2svNV", 614 },
+      { "glVertexAttrib3dNV", 615 },
+      { "glVertexAttrib3dvNV", 616 },
+      { "glVertexAttrib3fNV", 617 },
+      { "glVertexAttrib3fvNV", 618 },
+      { "glVertexAttrib3sNV", 619 },
+      { "glVertexAttrib3svNV", 620 },
+      { "glVertexAttrib4dNV", 621 },
+      { "glVertexAttrib4dvNV", 622 },
+      { "glVertexAttrib4fNV", 623 },
+      { "glVertexAttrib4fvNV", 624 },
+      { "glVertexAttrib4sNV", 625 },
+      { "glVertexAttrib4svNV", 626 },
+      { "glVertexAttrib4ubNV", 627 },
+      { "glVertexAttrib4ubvNV", 628 },
+      { "glVertexAttribs1dvNV", 629 },
+      { "glVertexAttribs1fvNV", 630 },
+      { "glVertexAttribs1svNV", 631 },
+      { "glVertexAttribs2dvNV", 632 },
+      { "glVertexAttribs2fvNV", 633 },
+      { "glVertexAttribs2svNV", 634 },
+      { "glVertexAttribs3dvNV", 635 },
+      { "glVertexAttribs3fvNV", 636 },
+      { "glVertexAttribs3svNV", 637 },
+      { "glVertexAttribs4dvNV", 638 },
+      { "glVertexAttribs4fvNV", 639 },
+      { "glVertexAttribs4svNV", 640 },
+      { "glVertexAttribs4ubvNV", 641 },
+#endif
+      { "glPointParameteriNV", 642 },
+      { "glPointParameterivNV", 643 },
+      { "glMultiDrawArraysEXT", 644 },
+      { "glMultiDrawElementsEXT", 645 },
+      { "glMultiDrawArraysSUN", _gloffset_MultiDrawArraysEXT  },
+      { "glMultiDrawElementsSUN", _gloffset_MultiDrawElementsEXT  },
+      { "glActiveStencilFaceEXT", 646 },
+#if FEATURE_NV_fence
+      { "glDeleteFencesNV", 647 },
+      { "glGenFencesNV", 648 },
+      { "glIsFenceNV", 649 },
+      { "glTestFenceNV", 650 },
+      { "glGetFenceivNV", 651 },
+      { "glFinishFenceNV", 652 },
+      { "glSetFenceNV", 653 },
+#endif
+#if FEATURE_NV_fragment_program
+      { "glProgramNamedParameter4fNV", 682 },
+      { "glProgramNamedParameter4dNV", 683 },
+      { "glProgramNamedParameter4fvNV", 683 },
+      { "glProgramNamedParameter4dvNV", 684 },
+      { "glGetProgramNamedParameterfvNV", 685 },
+      { "glGetProgramNamedParameterdvNV", 686 },
+#endif
+#if FEATURE_ARB_vertex_program
+      { "glVertexAttrib1sARB", _gloffset_VertexAttrib1sNV },
+      { "glVertexAttrib1fARB", _gloffset_VertexAttrib1fNV },
+      { "glVertexAttrib1dARB", _gloffset_VertexAttrib1dNV },
+      { "glVertexAttrib2sARB", _gloffset_VertexAttrib2sNV },
+      { "glVertexAttrib2fARB", _gloffset_VertexAttrib2fNV },
+      { "glVertexAttrib2dARB", _gloffset_VertexAttrib2dNV },
+      { "glVertexAttrib3sARB", _gloffset_VertexAttrib3sNV },
+      { "glVertexAttrib3fARB", _gloffset_VertexAttrib3fNV },
+      { "glVertexAttrib3dARB", _gloffset_VertexAttrib3dNV },
+      { "glVertexAttrib4sARB", _gloffset_VertexAttrib4sNV },
+      { "glVertexAttrib4fARB", _gloffset_VertexAttrib4fNV },
+      { "glVertexAttrib4dARB", _gloffset_VertexAttrib4dNV },
+      { "glVertexAttrib4NubARB", _gloffset_VertexAttrib4ubNV },
+      { "glVertexAttrib1svARB", _gloffset_VertexAttrib1svNV },
+      { "glVertexAttrib1fvARB", _gloffset_VertexAttrib1fvNV },
+      { "glVertexAttrib1dvARB", _gloffset_VertexAttrib1dvNV },
+      { "glVertexAttrib2svARB", _gloffset_VertexAttrib2svNV },
+      { "glVertexAttrib2fvARB", _gloffset_VertexAttrib2fvNV },
+      { "glVertexAttrib2dvARB", _gloffset_VertexAttrib2dvNV },
+      { "glVertexAttrib3svARB", _gloffset_VertexAttrib3svNV },
+      { "glVertexAttrib3fvARB", _gloffset_VertexAttrib3fvNV },
+      { "glVertexAttrib3dvARB", _gloffset_VertexAttrib3dvNV },
+      { "glVertexAttrib4bvARB", _gloffset_VertexAttrib4bvARB },
+      { "glVertexAttrib4svARB", _gloffset_VertexAttrib4svNV },
+      { "glVertexAttrib4ivARB", _gloffset_VertexAttrib4ivARB },
+      { "glVertexAttrib4ubvARB", _gloffset_VertexAttrib4ubvARB },
+      { "glVertexAttrib4usvARB", _gloffset_VertexAttrib4usvARB },
+      { "glVertexAttrib4uivARB", _gloffset_VertexAttrib4uivARB },
+      { "glVertexAttrib4fvARB", _gloffset_VertexAttrib4fvNV },
+      { "glVertexAttrib4dvARB", _gloffset_VertexAttrib4dvNV },
+      { "glVertexAttrib4NbvARB", _gloffset_VertexAttrib4NbvARB },
+      { "glVertexAttrib4NsvARB", _gloffset_VertexAttrib4NsvARB },
+      { "glVertexAttrib4NivARB", _gloffset_VertexAttrib4NivARB },
+      { "glVertexAttrib4NubvARB", _gloffset_VertexAttrib4ubvNV },
+      { "glVertexAttrib4NusvARB", _gloffset_VertexAttrib4NusvARB },
+      { "glVertexAttrib4NuivARB", _gloffset_VertexAttrib4NuivARB },
+      { "glVertexAttribPointerARB", _gloffset_VertexAttribPointerARB },
+      { "glEnableVertexAttribArrayARB", _gloffset_EnableVertexAttribArrayARB },
+      { "glDisableVertexAttribArrayARB", _gloffset_DisableVertexAttribArrayARB },
+      { "glProgramStringARB", _gloffset_ProgramStringARB },
+      { "glBindProgramARB", _gloffset_BindProgramNV },
+      { "glDeleteProgramsARB", _gloffset_DeleteProgramsNV },
+      { "glGenProgramsARB", _gloffset_GenProgramsNV },
+      { "glIsProgramARB", _gloffset_IsProgramNV },
+      { "glProgramEnvParameter4dARB", _gloffset_ProgramEnvParameter4dARB },
+      { "glProgramEnvParameter4dvARB", _gloffset_ProgramEnvParameter4dvARB },
+      { "glProgramEnvParameter4fARB", _gloffset_ProgramEnvParameter4fARB },
+      { "glProgramEnvParameter4fvARB", _gloffset_ProgramEnvParameter4fvARB },
+      { "glProgramLocalParameter4dARB", _gloffset_ProgramLocalParameter4dARB },
+      { "glProgramLocalParameter4dvARB", _gloffset_ProgramLocalParameter4dvARB },
+      { "glProgramLocalParameter4fARB", _gloffset_ProgramLocalParameter4fARB },
+      { "glProgramLocalParameter4fvARB", _gloffset_ProgramLocalParameter4fvARB },
+      { "glGetProgramEnvParameterdvARB", _gloffset_GetProgramEnvParameterdvARB },
+      { "glGetProgramEnvParameterfvARB", _gloffset_GetProgramEnvParameterfvARB },
+      { "glGetProgramLocalParameterdvARB", _gloffset_GetProgramLocalParameterdvARB },
+      { "glGetProgramLocalParameterfvARB", _gloffset_GetProgramLocalParameterfvARB },
+      { "glGetProgramivARB", _gloffset_GetProgramivARB },
+      { "glGetProgramStringARB", _gloffset_GetProgramStringARB },
+      { "glGetVertexAttribdvARB", _gloffset_GetVertexAttribdvNV },
+      { "glGetVertexAttribfvARB", _gloffset_GetVertexAttribfvNV },
+      { "glGetVertexAttribivARB", _gloffset_GetVertexAttribivNV },
+      { "glGetVertexAttribPointervARB", _gloffset_GetVertexAttribPointervNV },
+#endif
+      { "glMultiModeDrawArraysIBM", _gloffset_MultiModeDrawArraysIBM },
+      { "glMultiModeDrawElementsIBM", _gloffset_MultiModeDrawElementsIBM },
+   };
+   
+   for ( i = 0 ; i < Elements(newer_entrypoints) ; i++ ) {
+      _glapi_add_entrypoint( newer_entrypoints[i].name,
+			     newer_entrypoints[i].offset );
+   }
+}
+
+
+/**
+ * Initialize a GLcontext struct. 
+ *
+ * This includes allocating all the other structs and arrays which hang off of
+ * the context by pointers.
+ * 
+ * \sa _mesa_create_context() for the parameter description.
+ *
+ * Performs the imports and exports callback tables initialization, and
+ * miscellaneous one-time initializations. If no shared context is supplied one
+ * is allocated, and increase its reference count.  Setups the GL API dispatch
+ * tables.  Initialize the TNL module. Sets the maximum Z buffer depth.
+ * Finally queries the \c MESA_DEBUG and \c MESA_VERBOSE environment variables
+ * for debug flags.
+ *
+ * \note the direct parameter is ignored (obsolete).
+ */
+GLboolean
+_mesa_initialize_context( GLcontext *ctx,
+                          const GLvisual *visual,
+                          GLcontext *share_list,
+                          void *driver_ctx,
+                          GLboolean direct )
+{
+   GLuint dispatchSize;
+
+   ASSERT(driver_ctx);
+
+   /* If the driver wants core Mesa to use special imports, it'll have to
+    * override these defaults.
+    */
+   _mesa_init_default_imports( &(ctx->imports), driver_ctx );
+
+   /* initialize the exports (Mesa functions called by the window system) */
+   _mesa_init_default_exports( &(ctx->exports) );
+
+   /* misc one-time initializations */
+   one_time_init(ctx);
+
+   ctx->DriverCtx = driver_ctx;
+   ctx->Visual = *visual;
+   ctx->DrawBuffer = NULL;
+   ctx->ReadBuffer = NULL;
+
+   /* Set these pointers to defaults now in case they're not set since
+    * we need them while creating the default textures.
+    */
+   if (!ctx->Driver.NewTextureObject)
+      ctx->Driver.NewTextureObject = _mesa_new_texture_object;
+   if (!ctx->Driver.DeleteTexture)
+      ctx->Driver.DeleteTexture = _mesa_delete_texture_object;
+   if (!ctx->Driver.NewTextureImage)
+      ctx->Driver.NewTextureImage = _mesa_new_texture_image;
+
+   if (share_list) {
+      /* share state with another context */
+      ctx->Shared = share_list->Shared;
+   }
+   else {
+      /* allocate new, unshared state */
+      if (!alloc_shared_state( ctx )) {
+         return GL_FALSE;
+      }
+   }
+   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
+   ctx->Shared->RefCount++;
+   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
+
+   if (!init_attrib_groups( ctx )) {
+      free_shared_state(ctx, ctx->Shared);
+      return GL_FALSE;
+   }
+
+   /* libGL ABI coordination */
+   add_newer_entrypoints();
+
+   /* Find the larger of Mesa's dispatch table and libGL's dispatch table.
+    * In practice, this'll be the same for stand-alone Mesa.  But for DRI
+    * Mesa we do this to accomodate different versions of libGL and various
+    * DRI drivers.
+    */
+   dispatchSize = MAX2(_glapi_get_dispatch_table_size(),
+                       sizeof(struct _glapi_table) / sizeof(void *));
+
+   /* setup API dispatch tables */
+   ctx->Exec = (struct _glapi_table *) CALLOC(dispatchSize * sizeof(void*));
+   ctx->Save = (struct _glapi_table *) CALLOC(dispatchSize * sizeof(void*));
+   if (!ctx->Exec || !ctx->Save) {
+      free_shared_state(ctx, ctx->Shared);
+      if (ctx->Exec)
+         FREE( ctx->Exec );
+   }
+   _mesa_init_exec_table(ctx->Exec, dispatchSize);
+   ctx->CurrentDispatch = ctx->Exec;
+
+#if _HAVE_FULL_GL
+   _mesa_init_dlist_table(ctx->Save, dispatchSize);
+   _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );
+
+
+   /* Neutral tnl module stuff */
+   _mesa_init_exec_vtxfmt( ctx ); 
+   ctx->TnlModule.Current = NULL;
+   ctx->TnlModule.SwapCount = 0;
+#endif
+
+   return GL_TRUE;
+}
+
+/**
+ * Allocate and initialize a GLcontext structure.
+ *
+ * \param visual a GLvisual pointer (we copy the struct contents)
+ * \param share_list another context to share display lists with or NULL
+ * \param driver_ctx pointer to device driver's context state struct
+ * \param direct obsolete, ignored
+ * 
+ * \return pointer to a new __GLcontextRec or NULL if error.
+ */
+GLcontext *
+_mesa_create_context( const GLvisual *visual,
+                      GLcontext *share_list,
+                      void *driver_ctx,
+                      GLboolean direct )
+
+{
+   GLcontext *ctx;
+
+   ASSERT(visual);
+   ASSERT(driver_ctx);
+
+   ctx = (GLcontext *) _mesa_calloc(sizeof(GLcontext));
+   if (!ctx)
+      return NULL;
+
+   if (_mesa_initialize_context(ctx, visual, share_list, driver_ctx, direct)) {
+      return ctx;
+   }
+   else {
+      _mesa_free(ctx);
+      return NULL;
+   }
+}
+
+/**
+ * Free the data associated with the given context.
+ * 
+ * But doesn't free the GLcontext struct itself.
+ *
+ * \sa _mesa_initialize_context() and init_attrib_groups().
+ */
+void
+_mesa_free_context_data( GLcontext *ctx )
+{
+   /* if we're destroying the current context, unbind it first */
+   if (ctx == _mesa_get_current_context()) {
+      _mesa_make_current(NULL, NULL);
+   }
+
+   _mesa_free_lighting_data( ctx );
+   _mesa_free_eval_data( ctx );
+   _mesa_free_texture_data( ctx );
+   _mesa_free_matrix_data( ctx );
+   _mesa_free_viewport_data( ctx );
+   _mesa_free_colortables_data( ctx );
+#if FEATURE_NV_vertex_program
+   if (ctx->VertexProgram.Current) {
+      ctx->VertexProgram.Current->Base.RefCount--;
+      if (ctx->VertexProgram.Current->Base.RefCount <= 0)
+         _mesa_delete_program(ctx, &(ctx->VertexProgram.Current->Base));
+   }
+#endif
+#if FEATURE_NV_fragment_program
+   if (ctx->FragmentProgram.Current) {
+      ctx->FragmentProgram.Current->Base.RefCount--;
+      if (ctx->FragmentProgram.Current->Base.RefCount <= 0)
+         _mesa_delete_program(ctx, &(ctx->FragmentProgram.Current->Base));
+   }
+#endif
+
+   /* Shared context state (display lists, textures, etc) */
+   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
+   ctx->Shared->RefCount--;
+   assert(ctx->Shared->RefCount >= 0);
+   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
+   if (ctx->Shared->RefCount == 0) {
+      /* free shared state */
+      free_shared_state( ctx, ctx->Shared );
+   }
+
+   if (ctx->Extensions.String)
+      FREE((void *) ctx->Extensions.String);
+
+   FREE(ctx->Exec);
+   FREE(ctx->Save);
+}
+
+/**
+ * Destroy a GLcontext structure.
+ *
+ * \param ctx GL context.
+ * 
+ * Calls _mesa_free_context_data() and free the structure.
+ */
+void
+_mesa_destroy_context( GLcontext *ctx )
+{
+   if (ctx) {
+      _mesa_free_context_data(ctx);
+      FREE( (void *) ctx );
+   }
+}
+
+#if _HAVE_FULL_GL
+/**
+ * Copy attribute groups from one context to another.
+ * 
+ * \param src source context
+ * \param dst destination context
+ * \param mask bitwise OR of GL_*_BIT flags
+ *
+ * According to the bits specified in \p mask, copies the corresponding
+ * attributes from \p src into \dst.  For many of the attributes a simple \c
+ * memcpy is not enough due to the existence of internal pointers in their data
+ * structures.
+ */
+void
+_mesa_copy_context( const GLcontext *src, GLcontext *dst, GLuint mask )
+{
+   if (mask & GL_ACCUM_BUFFER_BIT) {
+      /* OK to memcpy */
+      dst->Accum = src->Accum;
+   }
+   if (mask & GL_COLOR_BUFFER_BIT) {
+      /* OK to memcpy */
+      dst->Color = src->Color;
+   }
+   if (mask & GL_CURRENT_BIT) {
+      /* OK to memcpy */
+      dst->Current = src->Current;
+   }
+   if (mask & GL_DEPTH_BUFFER_BIT) {
+      /* OK to memcpy */
+      dst->Depth = src->Depth;
+   }
+   if (mask & GL_ENABLE_BIT) {
+      /* no op */
+   }
+   if (mask & GL_EVAL_BIT) {
+      /* OK to memcpy */
+      dst->Eval = src->Eval;
+   }
+   if (mask & GL_FOG_BIT) {
+      /* OK to memcpy */
+      dst->Fog = src->Fog;
+   }
+   if (mask & GL_HINT_BIT) {
+      /* OK to memcpy */
+      dst->Hint = src->Hint;
+   }
+   if (mask & GL_LIGHTING_BIT) {
+      GLuint i;
+      /* begin with memcpy */
+      MEMCPY( &dst->Light, &src->Light, sizeof(struct gl_light) );
+      /* fixup linked lists to prevent pointer insanity */
+      make_empty_list( &(dst->Light.EnabledList) );
+      for (i = 0; i < MAX_LIGHTS; i++) {
+         if (dst->Light.Light[i].Enabled) {
+            insert_at_tail(&(dst->Light.EnabledList), &(dst->Light.Light[i]));
+         }
+      }
+   }
+   if (mask & GL_LINE_BIT) {
+      /* OK to memcpy */
+      dst->Line = src->Line;
+   }
+   if (mask & GL_LIST_BIT) {
+      /* OK to memcpy */
+      dst->List = src->List;
+   }
+   if (mask & GL_PIXEL_MODE_BIT) {
+      /* OK to memcpy */
+      dst->Pixel = src->Pixel;
+   }
+   if (mask & GL_POINT_BIT) {
+      /* OK to memcpy */
+      dst->Point = src->Point;
+   }
+   if (mask & GL_POLYGON_BIT) {
+      /* OK to memcpy */
+      dst->Polygon = src->Polygon;
+   }
+   if (mask & GL_POLYGON_STIPPLE_BIT) {
+      /* Use loop instead of MEMCPY due to problem with Portland Group's
+       * C compiler.  Reported by John Stone.
+       */
+      GLuint i;
+      for (i = 0; i < 32; i++) {
+         dst->PolygonStipple[i] = src->PolygonStipple[i];
+      }
+   }
+   if (mask & GL_SCISSOR_BIT) {
+      /* OK to memcpy */
+      dst->Scissor = src->Scissor;
+   }
+   if (mask & GL_STENCIL_BUFFER_BIT) {
+      /* OK to memcpy */
+      dst->Stencil = src->Stencil;
+   }
+   if (mask & GL_TEXTURE_BIT) {
+      /* Cannot memcpy because of pointers */
+      _mesa_copy_texture_state(src, dst);
+   }
+   if (mask & GL_TRANSFORM_BIT) {
+      /* OK to memcpy */
+      dst->Transform = src->Transform;
+   }
+   if (mask & GL_VIEWPORT_BIT) {
+      /* Cannot use memcpy, because of pointers in GLmatrix _WindowMap */
+      dst->Viewport.X = src->Viewport.X;
+      dst->Viewport.Y = src->Viewport.Y;
+      dst->Viewport.Width = src->Viewport.Width;
+      dst->Viewport.Height = src->Viewport.Height;
+      dst->Viewport.Near = src->Viewport.Near;
+      dst->Viewport.Far = src->Viewport.Far;
+      _math_matrix_copy(&dst->Viewport._WindowMap, &src->Viewport._WindowMap);
+   }
+
+   /* XXX FIXME:  Call callbacks?
+    */
+   dst->NewState = _NEW_ALL;
+}
+#endif
+
+
+/**
+ * Check if the given context can render into the given framebuffer
+ * by checking visual attributes.
+ * \return GL_TRUE if compatible, GL_FALSE otherwise.
+ */
+static GLboolean 
+check_compatible(const GLcontext *ctx, const GLframebuffer *buffer)
+{
+   const GLvisual *ctxvis = &ctx->Visual;
+   const GLvisual *bufvis = &buffer->Visual;
+
+   if (ctxvis == bufvis)
+      return GL_TRUE;
+
+   if (ctxvis->rgbMode != bufvis->rgbMode)
+      return GL_FALSE;
+   if (ctxvis->doubleBufferMode && !bufvis->doubleBufferMode)
+      return GL_FALSE;
+   if (ctxvis->stereoMode && !bufvis->stereoMode)
+      return GL_FALSE;
+   if (ctxvis->haveAccumBuffer && !bufvis->haveAccumBuffer)
+      return GL_FALSE;
+   if (ctxvis->haveDepthBuffer && !bufvis->haveDepthBuffer)
+      return GL_FALSE;
+   if (ctxvis->haveStencilBuffer && !bufvis->haveStencilBuffer)
+      return GL_FALSE;
+   if (ctxvis->redMask && ctxvis->redMask != bufvis->redMask)
+      return GL_FALSE;
+   if (ctxvis->greenMask && ctxvis->greenMask != bufvis->greenMask)
+      return GL_FALSE;
+   if (ctxvis->blueMask && ctxvis->blueMask != bufvis->blueMask)
+      return GL_FALSE;
+   if (ctxvis->depthBits && ctxvis->depthBits != bufvis->depthBits)
+      return GL_FALSE;
+   if (ctxvis->stencilBits && ctxvis->stencilBits != bufvis->stencilBits)
+      return GL_FALSE;
+
+   return GL_TRUE;
+}
+
+
+/**
+ * Set the current context, binding the given frame buffer to the context.
+ *
+ * \param newCtx new GL context.
+ * \param buffer framebuffer.
+ * 
+ * Calls _mesa_make_current2() with \p buffer as read and write framebuffer.
+ */
+void
+_mesa_make_current( GLcontext *newCtx, GLframebuffer *buffer )
+{
+   _mesa_make_current2( newCtx, buffer, buffer );
+}
+
+/**
+ * Bind the given context to the given draw-buffer and read-buffer and
+ * make it the current context for this thread.
+ *
+ * \param newCtx new GL context. If NULL then there will be no current GL
+ * context.
+ * \param drawBuffer draw framebuffer.
+ * \param readBuffer read framebuffer.
+ * 
+ * Check that the context's and framebuffer's visuals are compatible, returning
+ * immediately otherwise. Sets the glapi current context via
+ * _glapi_set_context(). If \p newCtx is not NULL, associates \p drawBuffer and
+ * \p readBuffer with it and calls dd_function_table::ResizeBuffers if the buffers size has changed. 
+ * Calls dd_function_table::MakeCurrent callback if defined.
+ *
+ * When a context is bound by the first time and the \c MESA_INFO environment
+ * variable is set it calls print_info() as an aid for remote user
+ * troubleshooting.
+ */
+void
+_mesa_make_current2( GLcontext *newCtx, GLframebuffer *drawBuffer,
+                     GLframebuffer *readBuffer )
+{
+   if (MESA_VERBOSE)
+      _mesa_debug(newCtx, "_mesa_make_current2()\n");
+
+   /* Check that the context's and framebuffer's visuals are compatible.
+    */
+   if (newCtx && drawBuffer && newCtx->DrawBuffer != drawBuffer) {
+      if (!check_compatible(newCtx, drawBuffer))
+         return;
+   }
+   if (newCtx && readBuffer && newCtx->ReadBuffer != readBuffer) {
+      if (!check_compatible(newCtx, readBuffer))
+         return;
+   }
+
+   /* We call this function periodically (just here for now) in
+    * order to detect when multithreading has begun.
+    */
+   _glapi_check_multithread();
+
+   _glapi_set_context((void *) newCtx);
+   ASSERT(_mesa_get_current_context() == newCtx);
+
+
+   if (!newCtx) {
+      _glapi_set_dispatch(NULL);  /* none current */
+   }
+   else {
+      _glapi_set_dispatch(newCtx->CurrentDispatch);
+
+      if (drawBuffer && readBuffer) {
+	 /* TODO: check if newCtx and buffer's visual match??? */
+	 newCtx->DrawBuffer = drawBuffer;
+	 newCtx->ReadBuffer = readBuffer;
+	 newCtx->NewState |= _NEW_BUFFERS;
+
+#if _HAVE_FULL_GL
+         if (drawBuffer->Width == 0 && drawBuffer->Height == 0) {
+            /* get initial window size */
+            GLuint bufWidth, bufHeight;
+
+            /* ask device driver for size of output buffer */
+            (*newCtx->Driver.GetBufferSize)( drawBuffer, &bufWidth, &bufHeight );
+
+            if (drawBuffer->Width != bufWidth || 
+		drawBuffer->Height != bufHeight) {
+
+	       drawBuffer->Width = bufWidth;
+	       drawBuffer->Height = bufHeight;
+
+ 	       newCtx->Driver.ResizeBuffers( drawBuffer );
+	    }
+         }
+
+         if (readBuffer != drawBuffer &&
+             readBuffer->Width == 0 && readBuffer->Height == 0) {
+            /* get initial window size */
+            GLuint bufWidth, bufHeight;
+
+            /* ask device driver for size of output buffer */
+            (*newCtx->Driver.GetBufferSize)( readBuffer, &bufWidth, &bufHeight );
+
+            if (readBuffer->Width != bufWidth ||
+		readBuffer->Height != bufHeight) {
+
+	       readBuffer->Width = bufWidth;
+	       readBuffer->Height = bufHeight;
+
+	       newCtx->Driver.ResizeBuffers( readBuffer );
+	    }
+         }
+#endif
+      }
+
+      /* Alert the driver - usually passed on to the sw t&l module,
+       * but also used to detect threaded cases in the radeon codegen
+       * hw t&l module.
+       */
+      if (newCtx->Driver.MakeCurrent)
+	 newCtx->Driver.MakeCurrent( newCtx, drawBuffer, readBuffer );
+
+      /* We can use this to help debug user's problems.  Tell them to set
+       * the MESA_INFO env variable before running their app.  Then the
+       * first time each context is made current we'll print some useful
+       * information.
+       */
+      if (newCtx->FirstTimeCurrent) {
+	 if (_mesa_getenv("MESA_INFO")) {
+	    _mesa_print_info();
+	 }
+	 newCtx->FirstTimeCurrent = GL_FALSE;
+      }
+   }
+}
+
+/**
+ * Get current context for the calling thread.
+ * 
+ * \return pointer to the current GL context.
+ * 
+ * Calls _glapi_get_context(). This isn't the fastest way to get the current
+ * context.  If you need speed, see the #GET_CURRENT_CONTEXT macro in context.h.
+ */
+GLcontext *
+_mesa_get_current_context( void )
+{
+   return (GLcontext *) _glapi_get_context();
+}
+
+/**
+ * Get context's current API dispatch table.
+ *
+ * It'll either be the immediate-mode execute dispatcher or the display list
+ * compile dispatcher.
+ * 
+ * \param ctx GL context.
+ *
+ * \return pointer to dispatch_table.
+ *
+ * Simply returns __GLcontextRec::CurrentDispatch.
+ */
+struct _glapi_table *
+_mesa_get_dispatch(GLcontext *ctx)
+{
+   return ctx->CurrentDispatch;
+}
+
+/*@}*/
+
+
+/**********************************************************************/
+/** \name Miscellaneous functions                                     */
+/**********************************************************************/
+/*@{*/
+
+/**
+ * Record an error.
+ *
+ * \param ctx GL context.
+ * \param error error code.
+ * 
+ * Records the given error code and call the driver's dd_function_table::Error
+ * function if defined.
+ *
+ * \sa
+ * This is called via _mesa_error().
+ */
+void
+_mesa_record_error( GLcontext *ctx, GLenum error )
+{
+   if (!ctx)
+      return;
+
+   if (ctx->ErrorValue == GL_NO_ERROR) {
+      ctx->ErrorValue = error;
+   }
+
+   /* Call device driver's error handler, if any.  This is used on the Mac. */
+   if (ctx->Driver.Error) {
+      (*ctx->Driver.Error)( ctx );
+   }
+}
+
+/**
+ * Execute glFinish().
+ *
+ * Calls the #ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH macro and the
+ * dd_function_table::Finish driver callback, if not NULL.
+ */
+void GLAPIENTRY
+_mesa_Finish( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+   if (ctx->Driver.Finish) {
+      (*ctx->Driver.Finish)( ctx );
+   }
+}
+
+/**
+ * Execute glFlush().
+ *
+ * Calls the #ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH macro and the
+ * dd_function_table::Flush driver callback, if not NULL.
+ */
+void GLAPIENTRY
+_mesa_Flush( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+   if (ctx->Driver.Flush) {
+      (*ctx->Driver.Flush)( ctx );
+   }
+}
+
+
+/*@}*/
diff --git a/reactos/lib/mesa32/src/main/context.h b/reactos/lib/mesa32/src/main/context.h
new file mode 100644
index 00000000000..d6d7920bb4f
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/context.h
@@ -0,0 +1,395 @@
+/**
+ * \file context.h
+ * Mesa context/visual/framebuffer management functions.
+ *
+ * There are three Mesa data types which are meant to be used by device
+ * drivers:
+ * - GLcontext: this contains the Mesa rendering state
+ * - GLvisual:  this describes the color buffer (RGB vs. ci), whether or not
+ *   there's a depth buffer, stencil buffer, etc.
+ * - GLframebuffer:  contains pointers to the depth buffer, stencil buffer,
+ *   accum buffer and alpha buffers.
+ *
+ * These types should be encapsulated by corresponding device driver
+ * data types.  See xmesa.h and xmesaP.h for an example.
+ *
+ * In OOP terms, GLcontext, GLvisual, and GLframebuffer are base classes
+ * which the device driver must derive from.
+ *
+ * The following functions create and destroy these data types.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef CONTEXT_H
+#define CONTEXT_H
+
+
+#include "glapi.h"
+#include "imports.h"
+#include "mtypes.h"
+
+
+/**********************************************************************/
+/** \name Create/destroy a GLvisual. */
+/*@{*/
+ 
+extern GLvisual *
+_mesa_create_visual( GLboolean rgbFlag,
+                     GLboolean dbFlag,
+                     GLboolean stereoFlag,
+                     GLint redBits,
+                     GLint greenBits,
+                     GLint blueBits,
+                     GLint alphaBits,
+                     GLint indexBits,
+                     GLint depthBits,
+                     GLint stencilBits,
+                     GLint accumRedBits,
+                     GLint accumGreenBits,
+                     GLint accumBlueBits,
+                     GLint accumAlphaBits,
+                     GLint numSamples );
+
+extern GLboolean
+_mesa_initialize_visual( GLvisual *v,
+                         GLboolean rgbFlag,
+                         GLboolean dbFlag,
+                         GLboolean stereoFlag,
+                         GLint redBits,
+                         GLint greenBits,
+                         GLint blueBits,
+                         GLint alphaBits,
+                         GLint indexBits,
+                         GLint depthBits,
+                         GLint stencilBits,
+                         GLint accumRedBits,
+                         GLint accumGreenBits,
+                         GLint accumBlueBits,
+                         GLint accumAlphaBits,
+                         GLint numSamples );
+
+extern void
+_mesa_destroy_visual( GLvisual *vis );
+
+/*@}*/
+
+
+/**********************************************************************/
+/** \name Create/destroy a GLframebuffer. */
+/*@{*/
+ 
+extern GLframebuffer *
+_mesa_create_framebuffer( const GLvisual *visual,
+                          GLboolean softwareDepth,
+                          GLboolean softwareStencil,
+                          GLboolean softwareAccum,
+                          GLboolean softwareAlpha );
+
+extern void
+_mesa_initialize_framebuffer( GLframebuffer *fb,
+                              const GLvisual *visual,
+                              GLboolean softwareDepth,
+                              GLboolean softwareStencil,
+                              GLboolean softwareAccum,
+                              GLboolean softwareAlpha );
+
+extern void
+_mesa_free_framebuffer_data( GLframebuffer *buffer );
+
+extern void
+_mesa_destroy_framebuffer( GLframebuffer *buffer );
+
+/*@}*/
+
+
+/**********************************************************************/
+/** \name Create/destroy a GLcontext. */
+/*@{*/
+
+extern GLcontext *
+_mesa_create_context( const GLvisual *visual,
+                      GLcontext *share_list,
+                      void *driver_ctx,
+                      GLboolean direct );
+
+extern GLboolean
+_mesa_initialize_context( GLcontext *ctx,
+                          const GLvisual *visual,
+                          GLcontext *share_list,
+                          void *driver_ctx,
+                          GLboolean direct );
+
+extern void
+_mesa_free_context_data( GLcontext *ctx );
+
+extern void
+_mesa_destroy_context( GLcontext *ctx );
+
+
+extern void
+_mesa_copy_context(const GLcontext *src, GLcontext *dst, GLuint mask);
+
+
+extern void
+_mesa_make_current( GLcontext *ctx, GLframebuffer *buffer );
+
+
+extern void
+_mesa_make_current2( GLcontext *ctx, GLframebuffer *drawBuffer,
+                     GLframebuffer *readBuffer );
+
+
+extern GLcontext *
+_mesa_get_current_context(void);
+
+/*@}*/
+
+
+/**
+ * Macro for declaration and fetching the current context.
+ *
+ * \param C local variable which will hold the current context.
+ *
+ * It should be used in the variable declaration area of a function:
+ * \code
+ * ...
+ * {
+ *   GET_CURRENT_CONTEXT(ctx);
+ *   ...
+ * \endcode
+ */
+#ifdef THREADS
+
+#define GET_CURRENT_CONTEXT(C)	GLcontext *C = (GLcontext *) (_glapi_Context ? _glapi_Context : _glapi_get_context())
+
+#else
+
+#define GET_CURRENT_CONTEXT(C)  GLcontext *C = (GLcontext *) _glapi_Context
+
+#endif
+
+
+
+/**********************************************************************/
+/** \name OpenGL SI-style export functions. */
+/*@{*/
+
+extern GLboolean
+_mesa_destroyContext(__GLcontext *gc);
+
+extern GLboolean
+_mesa_loseCurrent(__GLcontext *gc);
+
+extern GLboolean
+_mesa_makeCurrent(__GLcontext *gc);
+
+extern GLboolean
+_mesa_shareContext(__GLcontext *gc, __GLcontext *gcShare);
+
+extern GLboolean
+_mesa_copyContext(__GLcontext *dst, const __GLcontext *src, GLuint mask);
+
+extern GLboolean
+_mesa_forceCurrent(__GLcontext *gc);
+
+extern GLboolean
+_mesa_notifyResize(__GLcontext *gc);
+
+extern void
+_mesa_notifyDestroy(__GLcontext *gc);
+
+extern void
+_mesa_notifySwapBuffers(__GLcontext *gc);
+
+extern struct __GLdispatchStateRec *
+_mesa_dispatchExec(__GLcontext *gc);
+
+extern void
+_mesa_beginDispatchOverride(__GLcontext *gc);
+
+extern void
+_mesa_endDispatchOverride(__GLcontext *gc);
+
+/*@}*/
+
+
+extern struct _glapi_table *
+_mesa_get_dispatch(GLcontext *ctx);
+
+
+
+/**********************************************************************/
+/** \name Miscellaneous */
+/*@{*/
+
+extern void
+_mesa_record_error( GLcontext *ctx, GLenum error );
+
+
+extern void GLAPIENTRY
+_mesa_Finish( void );
+
+extern void GLAPIENTRY
+_mesa_Flush( void );
+
+/*@}*/
+
+
+
+/**********************************************************************/
+/** \name Macros for contexts/flushing. */
+/*@{*/
+
+
+/**
+ * Flush vertices.
+ *
+ * \param ctx GL context.
+ * \param newstate new state.
+ *
+ * Checks if dd_function_table::NeedFlush is marked to flush stored vertices,
+ * and calls dd_function_table::FlushVertices if so. Marks
+ * __GLcontextRec::NewState with \p newstate.
+ */
+#define FLUSH_VERTICES(ctx, newstate)				\
+do {								\
+   if (MESA_VERBOSE & VERBOSE_STATE)				\
+      _mesa_debug(ctx, "FLUSH_VERTICES in %s\n", MESA_FUNCTION);\
+   if (ctx->Driver.NeedFlush & FLUSH_STORED_VERTICES)		\
+      ctx->Driver.FlushVertices(ctx, FLUSH_STORED_VERTICES);	\
+   ctx->NewState |= newstate;					\
+} while (0)
+
+/**
+ * Flush current state.
+ *
+ * \param ctx GL context.
+ * \param newstate new state.
+ *
+ * Checks if dd_function_table::NeedFlush is marked to flush current state,
+ * and calls dd_function_table::FlushVertices if so. Marks
+ * __GLcontextRec::NewState with \p newstate.
+ */
+#define FLUSH_CURRENT(ctx, newstate)				\
+do {								\
+   if (MESA_VERBOSE & VERBOSE_STATE)				\
+      _mesa_debug(ctx, "FLUSH_CURRENT in %s\n", MESA_FUNCTION);	\
+   if (ctx->Driver.NeedFlush & FLUSH_UPDATE_CURRENT)		\
+      ctx->Driver.FlushVertices(ctx, FLUSH_UPDATE_CURRENT);	\
+   ctx->NewState |= newstate;					\
+} while (0)
+
+/**
+ * Macro to assert that the API call was made outside the
+ * glBegin()/glEnd() pair, with return value.
+ * 
+ * \param ctx GL context.
+ * \param retval value to return value in case the assertion fails.
+ */
+#define ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, retval)		\
+do {									\
+   if (ctx->Driver.CurrentExecPrimitive != PRIM_OUTSIDE_BEGIN_END) {	\
+      _mesa_error( ctx, GL_INVALID_OPERATION, "begin/end" );		\
+      return retval;							\
+   }									\
+} while (0)
+
+/**
+ * Macro to assert that the API call was made outside the
+ * glBegin()/glEnd() pair.
+ * 
+ * \param ctx GL context.
+ */
+#define ASSERT_OUTSIDE_BEGIN_END(ctx)					\
+do {									\
+   if (ctx->Driver.CurrentExecPrimitive != PRIM_OUTSIDE_BEGIN_END) {	\
+      _mesa_error( ctx, GL_INVALID_OPERATION, "begin/end" );		\
+      return;								\
+   }									\
+} while (0)
+
+/**
+ * Macro to assert that the API call was made outside the
+ * glBegin()/glEnd() pair and flush the vertices.
+ * 
+ * \param ctx GL context.
+ */
+#define ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx)				\
+do {									\
+   ASSERT_OUTSIDE_BEGIN_END(ctx);					\
+   FLUSH_VERTICES(ctx, 0);						\
+} while (0)
+
+/**
+ * Macro to assert that the API call was made outside the
+ * glBegin()/glEnd() pair and flush the vertices, with return value.
+ * 
+ * \param ctx GL context.
+ * \param retval value to return value in case the assertion fails.
+ */
+#define ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH_WITH_RETVAL(ctx, retval)	\
+do {									\
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, retval);			\
+   FLUSH_VERTICES(ctx, 0);						\
+} while (0)
+
+
+/*@}*/
+
+
+
+/**
+ * Macros to help evaluate current state conditions
+ */
+
+/*@{*/
+
+/**
+ * Is the secondary color needed?
+ */
+#define NEED_SECONDARY_COLOR(CTX)					\
+   (((CTX)->Light.Enabled &&						\
+     (CTX)->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR)	\
+    || (CTX)->Fog.ColorSumEnabled					\
+    || ((CTX)->VertexProgram.Enabled &&					\
+        ((CTX)->VertexProgram.Current->InputsRead & VERT_BIT_COLOR1))	\
+    || ((CTX)->FragmentProgram.Enabled &&				\
+        ((CTX)->FragmentProgram.Current->InputsRead & FRAG_BIT_COL1))	\
+   )
+
+
+/**
+ * Is two-sided lighting in effect?
+ */
+#define NEED_TWO_SIDED_LIGHTING(CTX) \
+   (ctx->Light.Enabled && ctx->Light.Model.TwoSide)
+
+
+/*@}*/
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/convolve.c b/reactos/lib/mesa32/src/main/convolve.c
new file mode 100644
index 00000000000..e6b19fabd42
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/convolve.c
@@ -0,0 +1,1412 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * Image convolution functions.
+ *
+ * Notes: filter kernel elements are indexed by <n> and <m> as in
+ * the GL spec.
+ */
+
+
+#include "glheader.h"
+#include "colormac.h"
+#include "convolve.h"
+#include "context.h"
+#include "image.h"
+#include "mtypes.h"
+#include "state.h"
+
+
+/*
+ * Given an internalFormat token passed to glConvolutionFilter
+ * or glSeparableFilter, return the corresponding base format.
+ * Return -1 if invalid token.
+ */
+static GLint
+base_filter_format( GLenum format )
+{
+   switch (format) {
+      case GL_ALPHA:
+      case GL_ALPHA4:
+      case GL_ALPHA8:
+      case GL_ALPHA12:
+      case GL_ALPHA16:
+         return GL_ALPHA;
+      case GL_LUMINANCE:
+      case GL_LUMINANCE4:
+      case GL_LUMINANCE8:
+      case GL_LUMINANCE12:
+      case GL_LUMINANCE16:
+         return GL_LUMINANCE;
+      case GL_LUMINANCE_ALPHA:
+      case GL_LUMINANCE4_ALPHA4:
+      case GL_LUMINANCE6_ALPHA2:
+      case GL_LUMINANCE8_ALPHA8:
+      case GL_LUMINANCE12_ALPHA4:
+      case GL_LUMINANCE12_ALPHA12:
+      case GL_LUMINANCE16_ALPHA16:
+         return GL_LUMINANCE_ALPHA;
+      case GL_INTENSITY:
+      case GL_INTENSITY4:
+      case GL_INTENSITY8:
+      case GL_INTENSITY12:
+      case GL_INTENSITY16:
+         return GL_INTENSITY;
+      case GL_RGB:
+      case GL_R3_G3_B2:
+      case GL_RGB4:
+      case GL_RGB5:
+      case GL_RGB8:
+      case GL_RGB10:
+      case GL_RGB12:
+      case GL_RGB16:
+         return GL_RGB;
+      case 4:
+      case GL_RGBA:
+      case GL_RGBA2:
+      case GL_RGBA4:
+      case GL_RGB5_A1:
+      case GL_RGBA8:
+      case GL_RGB10_A2:
+      case GL_RGBA12:
+      case GL_RGBA16:
+         return GL_RGBA;
+      default:
+         return -1;  /* error */
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *image)
+{
+   GLint baseFormat;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (target != GL_CONVOLUTION_1D) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionFilter1D(target)");
+      return;
+   }
+
+   baseFormat = base_filter_format(internalFormat);
+   if (baseFormat < 0 || baseFormat == GL_COLOR_INDEX) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionFilter1D(internalFormat)");
+      return;
+   }
+
+   if (width < 0 || width > MAX_CONVOLUTION_WIDTH) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glConvolutionFilter1D(width)");
+      return;
+   }
+
+   if (!_mesa_is_legal_format_and_type(format, type)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glConvolutionFilter1D(format or type)");
+      return;
+   }
+
+   if (format == GL_COLOR_INDEX ||
+       format == GL_STENCIL_INDEX ||
+       format == GL_DEPTH_COMPONENT ||
+       format == GL_INTENSITY ||
+       type == GL_BITMAP) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionFilter1D(format or type)");
+      return;
+   }
+
+   ctx->Convolution1D.Format = format;
+   ctx->Convolution1D.InternalFormat = internalFormat;
+   ctx->Convolution1D.Width = width;
+   ctx->Convolution1D.Height = 1;
+
+   /* unpack filter image */
+   _mesa_unpack_float_color_span(ctx, width, GL_RGBA,
+                                 ctx->Convolution1D.Filter,
+                                 format, type, image, &ctx->Unpack,
+                                 0, GL_FALSE);
+
+   /* apply scale and bias */
+   {
+      const GLfloat *scale = ctx->Pixel.ConvolutionFilterScale[0];
+      const GLfloat *bias = ctx->Pixel.ConvolutionFilterBias[0];
+      GLint i;
+      for (i = 0; i < width; i++) {
+         GLfloat r = ctx->Convolution1D.Filter[i * 4 + 0];
+         GLfloat g = ctx->Convolution1D.Filter[i * 4 + 1];
+         GLfloat b = ctx->Convolution1D.Filter[i * 4 + 2];
+         GLfloat a = ctx->Convolution1D.Filter[i * 4 + 3];
+         r = r * scale[0] + bias[0];
+         g = g * scale[1] + bias[1];
+         b = b * scale[2] + bias[2];
+         a = a * scale[3] + bias[3];
+         ctx->Convolution1D.Filter[i * 4 + 0] = r;
+         ctx->Convolution1D.Filter[i * 4 + 1] = g;
+         ctx->Convolution1D.Filter[i * 4 + 2] = b;
+         ctx->Convolution1D.Filter[i * 4 + 3] = a;
+      }
+   }
+
+   ctx->NewState |= _NEW_PIXEL;
+}
+
+
+void GLAPIENTRY
+_mesa_ConvolutionFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image)
+{
+   GLint baseFormat;
+   GLint i;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (target != GL_CONVOLUTION_2D) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionFilter2D(target)");
+      return;
+   }
+
+   baseFormat = base_filter_format(internalFormat);
+   if (baseFormat < 0 || baseFormat == GL_COLOR_INDEX) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionFilter2D(internalFormat)");
+      return;
+   }
+
+   if (width < 0 || width > MAX_CONVOLUTION_WIDTH) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glConvolutionFilter2D(width)");
+      return;
+   }
+   if (height < 0 || height > MAX_CONVOLUTION_HEIGHT) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glConvolutionFilter2D(height)");
+      return;
+   }
+
+   if (!_mesa_is_legal_format_and_type(format, type)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glConvolutionFilter2D(format or type)");
+      return;
+   }
+   if (format == GL_COLOR_INDEX ||
+       format == GL_STENCIL_INDEX ||
+       format == GL_DEPTH_COMPONENT ||
+       format == GL_INTENSITY ||
+       type == GL_BITMAP) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionFilter2D(format or type)");
+      return;
+   }
+
+   /* this should have been caught earlier */
+   assert(_mesa_components_in_format(format));
+
+   ctx->Convolution2D.Format = format;
+   ctx->Convolution2D.InternalFormat = internalFormat;
+   ctx->Convolution2D.Width = width;
+   ctx->Convolution2D.Height = height;
+
+   /* Unpack filter image.  We always store filters in RGBA format. */
+   for (i = 0; i < height; i++) {
+      const GLvoid *src = _mesa_image_address(&ctx->Unpack, image, width,
+                                              height, format, type, 0, i, 0);
+      GLfloat *dst = ctx->Convolution2D.Filter + i * width * 4;
+      _mesa_unpack_float_color_span(ctx, width, GL_RGBA, dst,
+                                    format, type, src, &ctx->Unpack,
+                                    0, GL_FALSE);
+   }
+
+   /* apply scale and bias */
+   {
+      const GLfloat *scale = ctx->Pixel.ConvolutionFilterScale[1];
+      const GLfloat *bias = ctx->Pixel.ConvolutionFilterBias[1];
+      for (i = 0; i < width * height; i++) {
+         GLfloat r = ctx->Convolution2D.Filter[i * 4 + 0];
+         GLfloat g = ctx->Convolution2D.Filter[i * 4 + 1];
+         GLfloat b = ctx->Convolution2D.Filter[i * 4 + 2];
+         GLfloat a = ctx->Convolution2D.Filter[i * 4 + 3];
+         r = r * scale[0] + bias[0];
+         g = g * scale[1] + bias[1];
+         b = b * scale[2] + bias[2];
+         a = a * scale[3] + bias[3];
+         ctx->Convolution2D.Filter[i * 4 + 0] = r;
+         ctx->Convolution2D.Filter[i * 4 + 1] = g;
+         ctx->Convolution2D.Filter[i * 4 + 2] = b;
+         ctx->Convolution2D.Filter[i * 4 + 3] = a;
+      }
+   }
+
+   ctx->NewState |= _NEW_PIXEL;
+}
+
+
+void GLAPIENTRY
+_mesa_ConvolutionParameterf(GLenum target, GLenum pname, GLfloat param)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint c;
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   switch (target) {
+      case GL_CONVOLUTION_1D:
+         c = 0;
+         break;
+      case GL_CONVOLUTION_2D:
+         c = 1;
+         break;
+      case GL_SEPARABLE_2D:
+         c = 2;
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameterf(target)");
+         return;
+   }
+
+   switch (pname) {
+      case GL_CONVOLUTION_BORDER_MODE:
+         if (param == (GLfloat) GL_REDUCE ||
+             param == (GLfloat) GL_CONSTANT_BORDER ||
+             param == (GLfloat) GL_REPLICATE_BORDER) {
+            ctx->Pixel.ConvolutionBorderMode[c] = (GLenum) param;
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameterf(params)");
+            return;
+         }
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameterf(pname)");
+         return;
+   }
+
+   ctx->NewState |= _NEW_PIXEL;
+}
+
+
+void GLAPIENTRY
+_mesa_ConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint c;
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   switch (target) {
+      case GL_CONVOLUTION_1D:
+         c = 0;
+         break;
+      case GL_CONVOLUTION_2D:
+         c = 1;
+         break;
+      case GL_SEPARABLE_2D:
+         c = 2;
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameterfv(target)");
+         return;
+   }
+
+   switch (pname) {
+      case GL_CONVOLUTION_BORDER_COLOR:
+         COPY_4V(ctx->Pixel.ConvolutionBorderColor[c], params);
+         break;
+      case GL_CONVOLUTION_BORDER_MODE:
+         if (params[0] == (GLfloat) GL_REDUCE ||
+             params[0] == (GLfloat) GL_CONSTANT_BORDER ||
+             params[0] == (GLfloat) GL_REPLICATE_BORDER) {
+            ctx->Pixel.ConvolutionBorderMode[c] = (GLenum) params[0];
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameterfv(params)");
+            return;
+         }
+         break;
+      case GL_CONVOLUTION_FILTER_SCALE:
+         COPY_4V(ctx->Pixel.ConvolutionFilterScale[c], params);
+         break;
+      case GL_CONVOLUTION_FILTER_BIAS:
+         COPY_4V(ctx->Pixel.ConvolutionFilterBias[c], params);
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameterfv(pname)");
+         return;
+   }
+
+   ctx->NewState |= _NEW_PIXEL;
+}
+
+
+void GLAPIENTRY
+_mesa_ConvolutionParameteri(GLenum target, GLenum pname, GLint param)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint c;
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   switch (target) {
+      case GL_CONVOLUTION_1D:
+         c = 0;
+         break;
+      case GL_CONVOLUTION_2D:
+         c = 1;
+         break;
+      case GL_SEPARABLE_2D:
+         c = 2;
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameteri(target)");
+         return;
+   }
+
+   switch (pname) {
+      case GL_CONVOLUTION_BORDER_MODE:
+         if (param == (GLint) GL_REDUCE ||
+             param == (GLint) GL_CONSTANT_BORDER ||
+             param == (GLint) GL_REPLICATE_BORDER) {
+            ctx->Pixel.ConvolutionBorderMode[c] = (GLenum) param;
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameteri(params)");
+            return;
+         }
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameteri(pname)");
+         return;
+   }
+
+   ctx->NewState |= _NEW_PIXEL;
+}
+
+
+void GLAPIENTRY
+_mesa_ConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint c;
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   switch (target) {
+      case GL_CONVOLUTION_1D:
+         c = 0;
+         break;
+      case GL_CONVOLUTION_2D:
+         c = 1;
+         break;
+      case GL_SEPARABLE_2D:
+         c = 2;
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameteriv(target)");
+         return;
+   }
+
+   switch (pname) {
+      case GL_CONVOLUTION_BORDER_COLOR:
+	 ctx->Pixel.ConvolutionBorderColor[c][0] = INT_TO_FLOAT(params[0]);
+	 ctx->Pixel.ConvolutionBorderColor[c][1] = INT_TO_FLOAT(params[1]);
+	 ctx->Pixel.ConvolutionBorderColor[c][2] = INT_TO_FLOAT(params[2]);
+	 ctx->Pixel.ConvolutionBorderColor[c][3] = INT_TO_FLOAT(params[3]);
+         break;
+      case GL_CONVOLUTION_BORDER_MODE:
+         if (params[0] == (GLint) GL_REDUCE ||
+             params[0] == (GLint) GL_CONSTANT_BORDER ||
+             params[0] == (GLint) GL_REPLICATE_BORDER) {
+            ctx->Pixel.ConvolutionBorderMode[c] = (GLenum) params[0];
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameteriv(params)");
+            return;
+         }
+         break;
+      case GL_CONVOLUTION_FILTER_SCALE:
+	 /* COPY_4V(ctx->Pixel.ConvolutionFilterScale[c], params); */
+	 /* need cast to prevent compiler warnings */  
+	 ctx->Pixel.ConvolutionFilterScale[c][0] = (GLfloat) params[0]; 
+	 ctx->Pixel.ConvolutionFilterScale[c][1] = (GLfloat) params[1]; 
+	 ctx->Pixel.ConvolutionFilterScale[c][2] = (GLfloat) params[2]; 
+	 ctx->Pixel.ConvolutionFilterScale[c][3] = (GLfloat) params[3]; 
+         break;
+      case GL_CONVOLUTION_FILTER_BIAS:
+	 /* COPY_4V(ctx->Pixel.ConvolutionFilterBias[c], params); */
+	 /* need cast to prevent compiler warnings */  
+	 ctx->Pixel.ConvolutionFilterBias[c][0] = (GLfloat) params[0]; 
+	 ctx->Pixel.ConvolutionFilterBias[c][1] = (GLfloat) params[1]; 
+	 ctx->Pixel.ConvolutionFilterBias[c][2] = (GLfloat) params[2]; 
+	 ctx->Pixel.ConvolutionFilterBias[c][3] = (GLfloat) params[3]; 
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameteriv(pname)");
+         return;
+   }
+
+   ctx->NewState |= _NEW_PIXEL;
+}
+
+
+void GLAPIENTRY
+_mesa_CopyConvolutionFilter1D(GLenum target, GLenum internalFormat, GLint x, GLint y, GLsizei width)
+{
+   GLint baseFormat;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (target != GL_CONVOLUTION_1D) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glCopyConvolutionFilter1D(target)");
+      return;
+   }
+
+   baseFormat = base_filter_format(internalFormat);
+   if (baseFormat < 0 || baseFormat == GL_COLOR_INDEX) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glCopyConvolutionFilter1D(internalFormat)");
+      return;
+   }
+
+   if (width < 0 || width > MAX_CONVOLUTION_WIDTH) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glCopyConvolutionFilter1D(width)");
+      return;
+   }
+
+   ctx->Driver.CopyConvolutionFilter1D( ctx, target, 
+					internalFormat, x, y, width);
+}
+
+
+void GLAPIENTRY
+_mesa_CopyConvolutionFilter2D(GLenum target, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height)
+{
+   GLint baseFormat;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (target != GL_CONVOLUTION_2D) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glCopyConvolutionFilter2D(target)");
+      return;
+   }
+
+   baseFormat = base_filter_format(internalFormat);
+   if (baseFormat < 0 || baseFormat == GL_COLOR_INDEX) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glCopyConvolutionFilter2D(internalFormat)");
+      return;
+   }
+
+   if (width < 0 || width > MAX_CONVOLUTION_WIDTH) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glCopyConvolutionFilter2D(width)");
+      return;
+   }
+   if (height < 0 || height > MAX_CONVOLUTION_HEIGHT) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glCopyConvolutionFilter2D(height)");
+      return;
+   }
+
+   ctx->Driver.CopyConvolutionFilter2D( ctx, target, internalFormat, x, y, 
+					width, height );
+
+}
+
+
+void GLAPIENTRY
+_mesa_GetConvolutionFilter(GLenum target, GLenum format, GLenum type, GLvoid *image)
+{
+   const struct gl_convolution_attrib *filter;
+   GLuint row;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (ctx->NewState) {
+      _mesa_update_state(ctx);
+   }
+
+   if (!_mesa_is_legal_format_and_type(format, type)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetConvolutionFilter(format or type)");
+      return;
+   }
+
+   if (format == GL_COLOR_INDEX ||
+       format == GL_STENCIL_INDEX ||
+       format == GL_DEPTH_COMPONENT ||
+       format == GL_INTENSITY ||
+       type == GL_BITMAP) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetConvolutionFilter(format or type)");
+      return;
+   }
+
+   switch (target) {
+      case GL_CONVOLUTION_1D:
+         filter = &(ctx->Convolution1D);
+         break;
+      case GL_CONVOLUTION_2D:
+         filter = &(ctx->Convolution2D);
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetConvolutionFilter(target)");
+         return;
+   }
+
+   for (row = 0; row < filter->Height; row++) {
+      GLvoid *dst = _mesa_image_address( &ctx->Pack, image, filter->Width,
+                                         filter->Height, format, type,
+                                         0, row, 0);
+      const GLfloat *src = filter->Filter + row * filter->Width * 4;
+      _mesa_pack_float_rgba_span(ctx, filter->Width,
+                                 (const GLfloat (*)[4]) src,
+                                 format, type, dst, &ctx->Pack, 0);
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   const struct gl_convolution_attrib *conv;
+   GLuint c;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   switch (target) {
+      case GL_CONVOLUTION_1D:
+         c = 0;
+         conv = &ctx->Convolution1D;
+         break;
+      case GL_CONVOLUTION_2D:
+         c = 1;
+         conv = &ctx->Convolution2D;
+         break;
+      case GL_SEPARABLE_2D:
+         c = 2;
+         conv = &ctx->Separable2D;
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetConvolutionParameterfv(target)");
+         return;
+   }
+
+   switch (pname) {
+      case GL_CONVOLUTION_BORDER_COLOR:
+         COPY_4V(params, ctx->Pixel.ConvolutionBorderColor[c]);
+         break;
+      case GL_CONVOLUTION_BORDER_MODE:
+         *params = (GLfloat) ctx->Pixel.ConvolutionBorderMode[c];
+         break;
+      case GL_CONVOLUTION_FILTER_SCALE:
+         COPY_4V(params, ctx->Pixel.ConvolutionFilterScale[c]);
+         break;
+      case GL_CONVOLUTION_FILTER_BIAS:
+         COPY_4V(params, ctx->Pixel.ConvolutionFilterBias[c]);
+         break;
+      case GL_CONVOLUTION_FORMAT:
+         *params = (GLfloat) conv->Format;
+         break;
+      case GL_CONVOLUTION_WIDTH:
+         *params = (GLfloat) conv->Width;
+         break;
+      case GL_CONVOLUTION_HEIGHT:
+         *params = (GLfloat) conv->Height;
+         break;
+      case GL_MAX_CONVOLUTION_WIDTH:
+         *params = (GLfloat) ctx->Const.MaxConvolutionWidth;
+         break;
+      case GL_MAX_CONVOLUTION_HEIGHT:
+         *params = (GLfloat) ctx->Const.MaxConvolutionHeight;
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetConvolutionParameterfv(pname)");
+         return;
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   const struct gl_convolution_attrib *conv;
+   GLuint c;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   switch (target) {
+      case GL_CONVOLUTION_1D:
+         c = 0;
+         conv = &ctx->Convolution1D;
+         break;
+      case GL_CONVOLUTION_2D:
+         c = 1;
+         conv = &ctx->Convolution2D;
+         break;
+      case GL_SEPARABLE_2D:
+         c = 2;
+         conv = &ctx->Separable2D;
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetConvolutionParameteriv(target)");
+         return;
+   }
+
+   switch (pname) {
+      case GL_CONVOLUTION_BORDER_COLOR:
+         params[0] = FLOAT_TO_INT(ctx->Pixel.ConvolutionBorderColor[c][0]);
+         params[1] = FLOAT_TO_INT(ctx->Pixel.ConvolutionBorderColor[c][1]);
+         params[2] = FLOAT_TO_INT(ctx->Pixel.ConvolutionBorderColor[c][2]);
+         params[3] = FLOAT_TO_INT(ctx->Pixel.ConvolutionBorderColor[c][3]);
+         break;
+      case GL_CONVOLUTION_BORDER_MODE:
+         *params = (GLint) ctx->Pixel.ConvolutionBorderMode[c];
+         break;
+      case GL_CONVOLUTION_FILTER_SCALE:
+         params[0] = (GLint) ctx->Pixel.ConvolutionFilterScale[c][0];
+         params[1] = (GLint) ctx->Pixel.ConvolutionFilterScale[c][1];
+         params[2] = (GLint) ctx->Pixel.ConvolutionFilterScale[c][2];
+         params[3] = (GLint) ctx->Pixel.ConvolutionFilterScale[c][3];
+         break;
+      case GL_CONVOLUTION_FILTER_BIAS:
+         params[0] = (GLint) ctx->Pixel.ConvolutionFilterBias[c][0];
+         params[1] = (GLint) ctx->Pixel.ConvolutionFilterBias[c][1];
+         params[2] = (GLint) ctx->Pixel.ConvolutionFilterBias[c][2];
+         params[3] = (GLint) ctx->Pixel.ConvolutionFilterBias[c][3];
+         break;
+      case GL_CONVOLUTION_FORMAT:
+         *params = (GLint) conv->Format;
+         break;
+      case GL_CONVOLUTION_WIDTH:
+         *params = (GLint) conv->Width;
+         break;
+      case GL_CONVOLUTION_HEIGHT:
+         *params = (GLint) conv->Height;
+         break;
+      case GL_MAX_CONVOLUTION_WIDTH:
+         *params = (GLint) ctx->Const.MaxConvolutionWidth;
+         break;
+      case GL_MAX_CONVOLUTION_HEIGHT:
+         *params = (GLint) ctx->Const.MaxConvolutionHeight;
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetConvolutionParameteriv(pname)");
+         return;
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetSeparableFilter(GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span)
+{
+   const GLint colStart = MAX_CONVOLUTION_WIDTH * 4;
+   const struct gl_convolution_attrib *filter;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (ctx->NewState) {
+      _mesa_update_state(ctx);
+   }
+
+   if (target != GL_SEPARABLE_2D) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetSeparableFilter(target)");
+      return;
+   }
+
+   if (!_mesa_is_legal_format_and_type(format, type)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetConvolutionFilter(format or type)");
+      return;
+   }
+
+   if (format == GL_COLOR_INDEX ||
+       format == GL_STENCIL_INDEX ||
+       format == GL_DEPTH_COMPONENT ||
+       format == GL_INTENSITY ||
+       type == GL_BITMAP) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetConvolutionFilter(format or type)");
+      return;
+   }
+
+   filter = &ctx->Separable2D;
+
+   /* Row filter */
+   {
+      GLvoid *dst = _mesa_image_address( &ctx->Pack, row, filter->Width,
+                                         filter->Height, format, type,
+                                         0, 0, 0);
+      _mesa_pack_float_rgba_span(ctx, filter->Width,
+                                 (const GLfloat (*)[4]) filter->Filter,
+                                 format, type, dst, &ctx->Pack, 0);
+   }
+
+   /* Column filter */
+   {
+      GLvoid *dst = _mesa_image_address( &ctx->Pack, column, filter->Width,
+                                         1, format, type,
+                                         0, 0, 0);
+      const GLfloat *src = filter->Filter + colStart;
+      _mesa_pack_float_rgba_span(ctx, filter->Height,
+                                 (const GLfloat (*)[4]) src,
+                                 format, type, dst, &ctx->Pack, 0);
+   }
+
+   (void) span;  /* unused at this time */
+}
+
+
+void GLAPIENTRY
+_mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column)
+{
+   const GLint colStart = MAX_CONVOLUTION_WIDTH * 4;
+   GLint baseFormat;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (target != GL_SEPARABLE_2D) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glSeparableFilter2D(target)");
+      return;
+   }
+
+   baseFormat = base_filter_format(internalFormat);
+   if (baseFormat < 0 || baseFormat == GL_COLOR_INDEX) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glSeparableFilter2D(internalFormat)");
+      return;
+   }
+
+   if (width < 0 || width > MAX_CONVOLUTION_WIDTH) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glSeparableFilter2D(width)");
+      return;
+   }
+   if (height < 0 || height > MAX_CONVOLUTION_HEIGHT) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glSeparableFilter2D(height)");
+      return;
+   }
+
+   if (!_mesa_is_legal_format_and_type(format, type)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glSeparableFilter2D(format or type)");
+      return;
+   }
+
+   if (format == GL_COLOR_INDEX ||
+       format == GL_STENCIL_INDEX ||
+       format == GL_DEPTH_COMPONENT ||
+       format == GL_INTENSITY ||
+       type == GL_BITMAP) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glSeparableFilter2D(format or type)");
+      return;
+   }
+
+   ctx->Separable2D.Format = format;
+   ctx->Separable2D.InternalFormat = internalFormat;
+   ctx->Separable2D.Width = width;
+   ctx->Separable2D.Height = height;
+
+   /* unpack row filter */
+   _mesa_unpack_float_color_span(ctx, width, GL_RGBA,
+                                 ctx->Separable2D.Filter,
+                                 format, type, row, &ctx->Unpack,
+                                 0, GL_FALSE);
+
+   /* apply scale and bias */
+   {
+      const GLfloat *scale = ctx->Pixel.ConvolutionFilterScale[2];
+      const GLfloat *bias = ctx->Pixel.ConvolutionFilterBias[2];
+      GLint i;
+      for (i = 0; i < width; i++) {
+         GLfloat r = ctx->Separable2D.Filter[i * 4 + 0];
+         GLfloat g = ctx->Separable2D.Filter[i * 4 + 1];
+         GLfloat b = ctx->Separable2D.Filter[i * 4 + 2];
+         GLfloat a = ctx->Separable2D.Filter[i * 4 + 3];
+         r = r * scale[0] + bias[0];
+         g = g * scale[1] + bias[1];
+         b = b * scale[2] + bias[2];
+         a = a * scale[3] + bias[3];
+         ctx->Separable2D.Filter[i * 4 + 0] = r;
+         ctx->Separable2D.Filter[i * 4 + 1] = g;
+         ctx->Separable2D.Filter[i * 4 + 2] = b;
+         ctx->Separable2D.Filter[i * 4 + 3] = a;
+      }
+   }
+
+   /* unpack column filter */
+   _mesa_unpack_float_color_span(ctx, width, GL_RGBA,
+                                 &ctx->Separable2D.Filter[colStart],
+                                 format, type, column, &ctx->Unpack,
+                                 0, GL_FALSE);
+
+   /* apply scale and bias */
+   {
+      const GLfloat *scale = ctx->Pixel.ConvolutionFilterScale[2];
+      const GLfloat *bias = ctx->Pixel.ConvolutionFilterBias[2];
+      GLint i;
+      for (i = 0; i < width; i++) {
+         GLfloat r = ctx->Separable2D.Filter[i * 4 + 0 + colStart];
+         GLfloat g = ctx->Separable2D.Filter[i * 4 + 1 + colStart];
+         GLfloat b = ctx->Separable2D.Filter[i * 4 + 2 + colStart];
+         GLfloat a = ctx->Separable2D.Filter[i * 4 + 3 + colStart];
+         r = r * scale[0] + bias[0];
+         g = g * scale[1] + bias[1];
+         b = b * scale[2] + bias[2];
+         a = a * scale[3] + bias[3];
+         ctx->Separable2D.Filter[i * 4 + 0 + colStart] = r;
+         ctx->Separable2D.Filter[i * 4 + 1 + colStart] = g;
+         ctx->Separable2D.Filter[i * 4 + 2 + colStart] = b;
+         ctx->Separable2D.Filter[i * 4 + 3 + colStart] = a;
+      }
+   }
+
+   ctx->NewState |= _NEW_PIXEL;
+}
+
+
+/**********************************************************************/
+/***                   image convolution functions                  ***/
+/**********************************************************************/
+
+static void
+convolve_1d_reduce(GLint srcWidth, const GLfloat src[][4],
+                   GLint filterWidth, const GLfloat filter[][4],
+                   GLfloat dest[][4])
+{
+   GLint dstWidth;
+   GLint i, n;
+
+   if (filterWidth >= 1)
+      dstWidth = srcWidth - (filterWidth - 1);
+   else
+      dstWidth = srcWidth;
+
+   if (dstWidth <= 0)
+      return;  /* null result */
+
+   for (i = 0; i < dstWidth; i++) {
+      GLfloat sumR = 0.0;
+      GLfloat sumG = 0.0;
+      GLfloat sumB = 0.0;
+      GLfloat sumA = 0.0;
+      for (n = 0; n < filterWidth; n++) {
+         sumR += src[i + n][RCOMP] * filter[n][RCOMP];
+         sumG += src[i + n][GCOMP] * filter[n][GCOMP];
+         sumB += src[i + n][BCOMP] * filter[n][BCOMP];
+         sumA += src[i + n][ACOMP] * filter[n][ACOMP];
+      }
+      dest[i][RCOMP] = sumR;
+      dest[i][GCOMP] = sumG;
+      dest[i][BCOMP] = sumB;
+      dest[i][ACOMP] = sumA;
+   }
+}
+
+
+static void
+convolve_1d_constant(GLint srcWidth, const GLfloat src[][4],
+                     GLint filterWidth, const GLfloat filter[][4],
+                     GLfloat dest[][4],
+                     const GLfloat borderColor[4])
+{
+   const GLint halfFilterWidth = filterWidth / 2;
+   GLint i, n;
+
+   for (i = 0; i < srcWidth; i++) {
+      GLfloat sumR = 0.0;
+      GLfloat sumG = 0.0;
+      GLfloat sumB = 0.0;
+      GLfloat sumA = 0.0;
+      for (n = 0; n < filterWidth; n++) {
+         if (i + n < halfFilterWidth || i + n - halfFilterWidth >= srcWidth) {
+            sumR += borderColor[RCOMP] * filter[n][RCOMP];
+            sumG += borderColor[GCOMP] * filter[n][GCOMP];
+            sumB += borderColor[BCOMP] * filter[n][BCOMP];
+            sumA += borderColor[ACOMP] * filter[n][ACOMP];
+         }
+         else {
+            sumR += src[i + n - halfFilterWidth][RCOMP] * filter[n][RCOMP];
+            sumG += src[i + n - halfFilterWidth][GCOMP] * filter[n][GCOMP];
+            sumB += src[i + n - halfFilterWidth][BCOMP] * filter[n][BCOMP];
+            sumA += src[i + n - halfFilterWidth][ACOMP] * filter[n][ACOMP];
+         }
+      }
+      dest[i][RCOMP] = sumR;
+      dest[i][GCOMP] = sumG;
+      dest[i][BCOMP] = sumB;
+      dest[i][ACOMP] = sumA;
+   }
+}
+
+
+static void
+convolve_1d_replicate(GLint srcWidth, const GLfloat src[][4],
+                      GLint filterWidth, const GLfloat filter[][4],
+                      GLfloat dest[][4])
+{
+   const GLint halfFilterWidth = filterWidth / 2;
+   GLint i, n;
+
+   for (i = 0; i < srcWidth; i++) {
+      GLfloat sumR = 0.0;
+      GLfloat sumG = 0.0;
+      GLfloat sumB = 0.0;
+      GLfloat sumA = 0.0;
+      for (n = 0; n < filterWidth; n++) {
+         if (i + n < halfFilterWidth) {
+            sumR += src[0][RCOMP] * filter[n][RCOMP];
+            sumG += src[0][GCOMP] * filter[n][GCOMP];
+            sumB += src[0][BCOMP] * filter[n][BCOMP];
+            sumA += src[0][ACOMP] * filter[n][ACOMP];
+         }
+         else if (i + n - halfFilterWidth >= srcWidth) {
+            sumR += src[srcWidth - 1][RCOMP] * filter[n][RCOMP];
+            sumG += src[srcWidth - 1][GCOMP] * filter[n][GCOMP];
+            sumB += src[srcWidth - 1][BCOMP] * filter[n][BCOMP];
+            sumA += src[srcWidth - 1][ACOMP] * filter[n][ACOMP];
+         }
+         else {
+            sumR += src[i + n - halfFilterWidth][RCOMP] * filter[n][RCOMP];
+            sumG += src[i + n - halfFilterWidth][GCOMP] * filter[n][GCOMP];
+            sumB += src[i + n - halfFilterWidth][BCOMP] * filter[n][BCOMP];
+            sumA += src[i + n - halfFilterWidth][ACOMP] * filter[n][ACOMP];
+         }
+      }
+      dest[i][RCOMP] = sumR;
+      dest[i][GCOMP] = sumG;
+      dest[i][BCOMP] = sumB;
+      dest[i][ACOMP] = sumA;
+   }
+}
+
+
+static void
+convolve_2d_reduce(GLint srcWidth, GLint srcHeight,
+                   const GLfloat src[][4],
+                   GLint filterWidth, GLint filterHeight,
+                   const GLfloat filter[][4],
+                   GLfloat dest[][4])
+{
+   GLint dstWidth, dstHeight;
+   GLint i, j, n, m;
+
+   if (filterWidth >= 1)
+      dstWidth = srcWidth - (filterWidth - 1);
+   else
+      dstWidth = srcWidth;
+
+   if (filterHeight >= 1)
+      dstHeight = srcHeight - (filterHeight - 1);
+   else
+      dstHeight = srcHeight;
+
+   if (dstWidth <= 0 || dstHeight <= 0)
+      return;
+
+   for (j = 0; j < dstHeight; j++) {
+      for (i = 0; i < dstWidth; i++) {
+         GLfloat sumR = 0.0;
+         GLfloat sumG = 0.0;
+         GLfloat sumB = 0.0;
+         GLfloat sumA = 0.0;
+         for (m = 0; m < filterHeight; m++) {
+            for (n = 0; n < filterWidth; n++) {
+               const GLint k = (j + m) * srcWidth + i + n;
+               const GLint f = m * filterWidth + n;
+               sumR += src[k][RCOMP] * filter[f][RCOMP];
+               sumG += src[k][GCOMP] * filter[f][GCOMP];
+               sumB += src[k][BCOMP] * filter[f][BCOMP];
+               sumA += src[k][ACOMP] * filter[f][ACOMP];
+            }
+         }
+         dest[j * dstWidth + i][RCOMP] = sumR;
+         dest[j * dstWidth + i][GCOMP] = sumG;
+         dest[j * dstWidth + i][BCOMP] = sumB;
+         dest[j * dstWidth + i][ACOMP] = sumA;
+      }
+   }
+}
+
+
+static void
+convolve_2d_constant(GLint srcWidth, GLint srcHeight,
+                     const GLfloat src[][4],
+                     GLint filterWidth, GLint filterHeight,
+                     const GLfloat filter[][4],
+                     GLfloat dest[][4],
+                     const GLfloat borderColor[4])
+{
+   const GLint halfFilterWidth = filterWidth / 2;
+   const GLint halfFilterHeight = filterHeight / 2;
+   GLint i, j, n, m;
+
+   for (j = 0; j < srcHeight; j++) {
+      for (i = 0; i < srcWidth; i++) {
+         GLfloat sumR = 0.0;
+         GLfloat sumG = 0.0;
+         GLfloat sumB = 0.0;
+         GLfloat sumA = 0.0;
+         for (m = 0; m < filterHeight; m++) {
+            for (n = 0; n < filterWidth; n++) {
+               const GLint f = m * filterWidth + n;
+               const GLint is = i + n - halfFilterWidth;
+               const GLint js = j + m - halfFilterHeight;
+               if (is < 0 || is >= srcWidth ||
+                   js < 0 || js >= srcHeight) {
+                  sumR += borderColor[RCOMP] * filter[f][RCOMP];
+                  sumG += borderColor[GCOMP] * filter[f][GCOMP];
+                  sumB += borderColor[BCOMP] * filter[f][BCOMP];
+                  sumA += borderColor[ACOMP] * filter[f][ACOMP];
+               }
+               else {
+                  const GLint k = js * srcWidth + is;
+                  sumR += src[k][RCOMP] * filter[f][RCOMP];
+                  sumG += src[k][GCOMP] * filter[f][GCOMP];
+                  sumB += src[k][BCOMP] * filter[f][BCOMP];
+                  sumA += src[k][ACOMP] * filter[f][ACOMP];
+               }
+            }
+         }
+         dest[j * srcWidth + i][RCOMP] = sumR;
+         dest[j * srcWidth + i][GCOMP] = sumG;
+         dest[j * srcWidth + i][BCOMP] = sumB;
+         dest[j * srcWidth + i][ACOMP] = sumA;
+      }
+   }
+}
+
+
+static void
+convolve_2d_replicate(GLint srcWidth, GLint srcHeight,
+                      const GLfloat src[][4],
+                      GLint filterWidth, GLint filterHeight,
+                      const GLfloat filter[][4],
+                      GLfloat dest[][4])
+{
+   const GLint halfFilterWidth = filterWidth / 2;
+   const GLint halfFilterHeight = filterHeight / 2;
+   GLint i, j, n, m;
+
+   for (j = 0; j < srcHeight; j++) {
+      for (i = 0; i < srcWidth; i++) {
+         GLfloat sumR = 0.0;
+         GLfloat sumG = 0.0;
+         GLfloat sumB = 0.0;
+         GLfloat sumA = 0.0;
+         for (m = 0; m < filterHeight; m++) {
+            for (n = 0; n < filterWidth; n++) {
+               const GLint f = m * filterWidth + n;
+               GLint is = i + n - halfFilterWidth;
+               GLint js = j + m - halfFilterHeight;
+               GLint k;
+               if (is < 0)
+                  is = 0;
+               else if (is >= srcWidth)
+                  is = srcWidth - 1;
+               if (js < 0)
+                  js = 0;
+               else if (js >= srcHeight)
+                  js = srcHeight - 1;
+               k = js * srcWidth + is;
+               sumR += src[k][RCOMP] * filter[f][RCOMP];
+               sumG += src[k][GCOMP] * filter[f][GCOMP];
+               sumB += src[k][BCOMP] * filter[f][BCOMP];
+               sumA += src[k][ACOMP] * filter[f][ACOMP];
+            }
+         }
+         dest[j * srcWidth + i][RCOMP] = sumR;
+         dest[j * srcWidth + i][GCOMP] = sumG;
+         dest[j * srcWidth + i][BCOMP] = sumB;
+         dest[j * srcWidth + i][ACOMP] = sumA;
+      }
+   }
+}
+
+
+static void
+convolve_sep_reduce(GLint srcWidth, GLint srcHeight,
+                    const GLfloat src[][4],
+                    GLint filterWidth, GLint filterHeight,
+                    const GLfloat rowFilt[][4],
+                    const GLfloat colFilt[][4],
+                    GLfloat dest[][4])
+{
+   GLint dstWidth, dstHeight;
+   GLint i, j, n, m;
+
+   if (filterWidth >= 1)
+      dstWidth = srcWidth - (filterWidth - 1);
+   else
+      dstWidth = srcWidth;
+
+   if (filterHeight >= 1)
+      dstHeight = srcHeight - (filterHeight - 1);
+   else
+      dstHeight = srcHeight;
+
+   if (dstWidth <= 0 || dstHeight <= 0)
+      return;
+
+   for (j = 0; j < dstHeight; j++) {
+      for (i = 0; i < dstWidth; i++) {
+         GLfloat sumR = 0.0;
+         GLfloat sumG = 0.0;
+         GLfloat sumB = 0.0;
+         GLfloat sumA = 0.0;
+         for (m = 0; m < filterHeight; m++) {
+            for (n = 0; n < filterWidth; n++) {
+               GLint k = (j + m) * srcWidth + i + n;
+               sumR += src[k][RCOMP] * rowFilt[n][RCOMP] * colFilt[m][RCOMP];
+               sumG += src[k][GCOMP] * rowFilt[n][GCOMP] * colFilt[m][GCOMP];
+               sumB += src[k][BCOMP] * rowFilt[n][BCOMP] * colFilt[m][BCOMP];
+               sumA += src[k][ACOMP] * rowFilt[n][ACOMP] * colFilt[m][ACOMP];
+            }
+         }
+         dest[j * dstWidth + i][RCOMP] = sumR;
+         dest[j * dstWidth + i][GCOMP] = sumG;
+         dest[j * dstWidth + i][BCOMP] = sumB;
+         dest[j * dstWidth + i][ACOMP] = sumA;
+      }
+   }
+}
+
+
+static void
+convolve_sep_constant(GLint srcWidth, GLint srcHeight,
+                      const GLfloat src[][4],
+                      GLint filterWidth, GLint filterHeight,
+                      const GLfloat rowFilt[][4],
+                      const GLfloat colFilt[][4],
+                      GLfloat dest[][4],
+                      const GLfloat borderColor[4])
+{
+   const GLint halfFilterWidth = filterWidth / 2;
+   const GLint halfFilterHeight = filterHeight / 2;
+   GLint i, j, n, m;
+
+   for (j = 0; j < srcHeight; j++) {
+      for (i = 0; i < srcWidth; i++) {
+         GLfloat sumR = 0.0;
+         GLfloat sumG = 0.0;
+         GLfloat sumB = 0.0;
+         GLfloat sumA = 0.0;
+         for (m = 0; m < filterHeight; m++) {
+            for (n = 0; n < filterWidth; n++) {
+               const GLint is = i + n - halfFilterWidth;
+               const GLint js = j + m - halfFilterHeight;
+               if (is < 0 || is >= srcWidth ||
+                   js < 0 || js >= srcHeight) {
+                  sumR += borderColor[RCOMP] * rowFilt[n][RCOMP] * colFilt[m][RCOMP];
+                  sumG += borderColor[GCOMP] * rowFilt[n][GCOMP] * colFilt[m][GCOMP];
+                  sumB += borderColor[BCOMP] * rowFilt[n][BCOMP] * colFilt[m][BCOMP];
+                  sumA += borderColor[ACOMP] * rowFilt[n][ACOMP] * colFilt[m][ACOMP];
+               }
+               else {
+                  GLint k = js * srcWidth + is;
+                  sumR += src[k][RCOMP] * rowFilt[n][RCOMP] * colFilt[m][RCOMP];
+                  sumG += src[k][GCOMP] * rowFilt[n][GCOMP] * colFilt[m][GCOMP];
+                  sumB += src[k][BCOMP] * rowFilt[n][BCOMP] * colFilt[m][BCOMP];
+                  sumA += src[k][ACOMP] * rowFilt[n][ACOMP] * colFilt[m][ACOMP];
+               }
+
+            }
+         }
+         dest[j * srcWidth + i][RCOMP] = sumR;
+         dest[j * srcWidth + i][GCOMP] = sumG;
+         dest[j * srcWidth + i][BCOMP] = sumB;
+         dest[j * srcWidth + i][ACOMP] = sumA;
+      }
+   }
+}
+
+
+static void
+convolve_sep_replicate(GLint srcWidth, GLint srcHeight,
+                       const GLfloat src[][4],
+                       GLint filterWidth, GLint filterHeight,
+                       const GLfloat rowFilt[][4],
+                       const GLfloat colFilt[][4],
+                       GLfloat dest[][4])
+{
+   const GLint halfFilterWidth = filterWidth / 2;
+   const GLint halfFilterHeight = filterHeight / 2;
+   GLint i, j, n, m;
+
+   for (j = 0; j < srcHeight; j++) {
+      for (i = 0; i < srcWidth; i++) {
+         GLfloat sumR = 0.0;
+         GLfloat sumG = 0.0;
+         GLfloat sumB = 0.0;
+         GLfloat sumA = 0.0;
+         for (m = 0; m < filterHeight; m++) {
+            for (n = 0; n < filterWidth; n++) {
+               GLint is = i + n - halfFilterWidth;
+               GLint js = j + m - halfFilterHeight;
+               GLint k;
+               if (is < 0)
+                  is = 0;
+               else if (is >= srcWidth)
+                  is = srcWidth - 1;
+               if (js < 0)
+                  js = 0;
+               else if (js >= srcHeight)
+                  js = srcHeight - 1;
+               k = js * srcWidth + is;
+               sumR += src[k][RCOMP] * rowFilt[n][RCOMP] * colFilt[m][RCOMP];
+               sumG += src[k][GCOMP] * rowFilt[n][GCOMP] * colFilt[m][GCOMP];
+               sumB += src[k][BCOMP] * rowFilt[n][BCOMP] * colFilt[m][BCOMP];
+               sumA += src[k][ACOMP] * rowFilt[n][ACOMP] * colFilt[m][ACOMP];
+            }
+         }
+         dest[j * srcWidth + i][RCOMP] = sumR;
+         dest[j * srcWidth + i][GCOMP] = sumG;
+         dest[j * srcWidth + i][BCOMP] = sumB;
+         dest[j * srcWidth + i][ACOMP] = sumA;
+      }
+   }
+}
+
+
+
+void
+_mesa_convolve_1d_image(const GLcontext *ctx, GLsizei *width,
+                        const GLfloat *srcImage, GLfloat *dstImage)
+{
+   switch (ctx->Pixel.ConvolutionBorderMode[0]) {
+      case GL_REDUCE:
+         convolve_1d_reduce(*width, (const GLfloat (*)[4]) srcImage,
+                            ctx->Convolution1D.Width,
+                            (const GLfloat (*)[4]) ctx->Convolution1D.Filter,
+                            (GLfloat (*)[4]) dstImage);
+         *width = *width - (MAX2(ctx->Convolution1D.Width, 1) - 1);
+         break;
+      case GL_CONSTANT_BORDER:
+         convolve_1d_constant(*width, (const GLfloat (*)[4]) srcImage,
+                              ctx->Convolution1D.Width,
+                              (const GLfloat (*)[4]) ctx->Convolution1D.Filter,
+                              (GLfloat (*)[4]) dstImage,
+                              ctx->Pixel.ConvolutionBorderColor[0]);
+         break;
+      case GL_REPLICATE_BORDER:
+         convolve_1d_replicate(*width, (const GLfloat (*)[4]) srcImage,
+                              ctx->Convolution1D.Width,
+                              (const GLfloat (*)[4]) ctx->Convolution1D.Filter,
+                              (GLfloat (*)[4]) dstImage);
+         break;
+      default:
+         ;
+   }
+}
+
+
+void
+_mesa_convolve_2d_image(const GLcontext *ctx, GLsizei *width, GLsizei *height,
+                        const GLfloat *srcImage, GLfloat *dstImage)
+{
+   switch (ctx->Pixel.ConvolutionBorderMode[1]) {
+      case GL_REDUCE:
+         convolve_2d_reduce(*width, *height,
+                            (const GLfloat (*)[4]) srcImage,
+                            ctx->Convolution2D.Width,
+                            ctx->Convolution2D.Height,
+                            (const GLfloat (*)[4]) ctx->Convolution2D.Filter,
+                            (GLfloat (*)[4]) dstImage);
+         *width = *width - (MAX2(ctx->Convolution2D.Width, 1) - 1);
+         *height = *height - (MAX2(ctx->Convolution2D.Height, 1) - 1);
+         break;
+      case GL_CONSTANT_BORDER:
+         convolve_2d_constant(*width, *height,
+                              (const GLfloat (*)[4]) srcImage,
+                              ctx->Convolution2D.Width,
+                              ctx->Convolution2D.Height,
+                              (const GLfloat (*)[4]) ctx->Convolution2D.Filter,
+                              (GLfloat (*)[4]) dstImage,
+                              ctx->Pixel.ConvolutionBorderColor[1]);
+         break;
+      case GL_REPLICATE_BORDER:
+         convolve_2d_replicate(*width, *height,
+                               (const GLfloat (*)[4]) srcImage,
+                               ctx->Convolution2D.Width,
+                               ctx->Convolution2D.Height,
+                               (const GLfloat (*)[4])ctx->Convolution2D.Filter,
+                               (GLfloat (*)[4]) dstImage);
+         break;
+      default:
+         ;
+      }
+}
+
+
+void
+_mesa_convolve_sep_image(const GLcontext *ctx,
+                         GLsizei *width, GLsizei *height,
+                         const GLfloat *srcImage, GLfloat *dstImage)
+{
+   const GLfloat *rowFilter = ctx->Separable2D.Filter;
+   const GLfloat *colFilter = rowFilter + 4 * MAX_CONVOLUTION_WIDTH;
+
+   switch (ctx->Pixel.ConvolutionBorderMode[2]) {
+      case GL_REDUCE:
+         convolve_sep_reduce(*width, *height,
+                             (const GLfloat (*)[4]) srcImage,
+                             ctx->Separable2D.Width,
+                             ctx->Separable2D.Height,
+                             (const GLfloat (*)[4]) rowFilter,
+                             (const GLfloat (*)[4]) colFilter,
+                             (GLfloat (*)[4]) dstImage);
+         *width = *width - (MAX2(ctx->Separable2D.Width, 1) - 1);
+         *height = *height - (MAX2(ctx->Separable2D.Height, 1) - 1);
+         break;
+      case GL_CONSTANT_BORDER:
+         convolve_sep_constant(*width, *height,
+                               (const GLfloat (*)[4]) srcImage,
+                               ctx->Separable2D.Width,
+                               ctx->Separable2D.Height,
+                               (const GLfloat (*)[4]) rowFilter,
+                               (const GLfloat (*)[4]) colFilter,
+                               (GLfloat (*)[4]) dstImage,
+                               ctx->Pixel.ConvolutionBorderColor[2]);
+         break;
+      case GL_REPLICATE_BORDER:
+         convolve_sep_replicate(*width, *height,
+                                (const GLfloat (*)[4]) srcImage,
+                                ctx->Separable2D.Width,
+                                ctx->Separable2D.Height,
+                                (const GLfloat (*)[4]) rowFilter,
+                                (const GLfloat (*)[4]) colFilter,
+                                (GLfloat (*)[4]) dstImage);
+         break;
+      default:
+         ;
+   }
+}
+
+
+
+/*
+ * This function computes an image's size after convolution.
+ * If the convolution border mode is GL_REDUCE, the post-convolution
+ * image will be smaller than the original.
+ */
+void
+_mesa_adjust_image_for_convolution(const GLcontext *ctx, GLuint dimensions,
+                                   GLsizei *width, GLsizei *height)
+{
+   if (ctx->Pixel.Convolution1DEnabled
+       && dimensions == 1
+       && ctx->Pixel.ConvolutionBorderMode[0] == GL_REDUCE) {
+      *width = *width - (MAX2(ctx->Convolution1D.Width, 1) - 1);
+   }
+   else if (ctx->Pixel.Convolution2DEnabled
+            && dimensions > 1
+            && ctx->Pixel.ConvolutionBorderMode[1] == GL_REDUCE) {
+      *width = *width - (MAX2(ctx->Convolution2D.Width, 1) - 1);
+      *height = *height - (MAX2(ctx->Convolution2D.Height, 1) - 1);
+   }
+   else if (ctx->Pixel.Separable2DEnabled
+            && dimensions > 1
+            && ctx->Pixel.ConvolutionBorderMode[2] == GL_REDUCE) {
+      *width = *width - (MAX2(ctx->Separable2D.Width, 1) - 1);
+      *height = *height - (MAX2(ctx->Separable2D.Height, 1) - 1);
+   }
+}
diff --git a/reactos/lib/mesa32/src/main/convolve.h b/reactos/lib/mesa32/src/main/convolve.h
new file mode 100644
index 00000000000..4505cdae01e
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/convolve.h
@@ -0,0 +1,114 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef CONVOLVE_H
+#define CONVOLVE_H
+
+
+#include "mtypes.h"
+
+
+#if _HAVE_FULL_GL
+extern void GLAPIENTRY
+_mesa_ConvolutionFilter1D(GLenum target, GLenum internalformat, GLsizei width,
+                          GLenum format, GLenum type, const GLvoid *image);
+
+extern void GLAPIENTRY
+_mesa_ConvolutionFilter2D(GLenum target, GLenum internalformat, GLsizei width,
+                          GLsizei height, GLenum format, GLenum type,
+                          const GLvoid *image);
+
+extern void GLAPIENTRY
+_mesa_ConvolutionParameterf(GLenum target, GLenum pname, GLfloat params);
+
+extern void GLAPIENTRY
+_mesa_ConvolutionParameterfv(GLenum target, GLenum pname,
+                             const GLfloat *params);
+
+extern void GLAPIENTRY
+_mesa_ConvolutionParameteri(GLenum target, GLenum pname, GLint params);
+
+extern void GLAPIENTRY
+_mesa_ConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params);
+
+extern void GLAPIENTRY
+_mesa_CopyConvolutionFilter1D(GLenum target, GLenum internalformat,
+                              GLint x, GLint y, GLsizei width);
+
+extern void GLAPIENTRY
+_mesa_CopyConvolutionFilter2D(GLenum target, GLenum internalformat,
+                              GLint x, GLint y, GLsizei width, GLsizei height);
+
+extern void GLAPIENTRY
+_mesa_GetConvolutionFilter(GLenum target, GLenum format, GLenum type,
+                           GLvoid *image);
+
+extern void GLAPIENTRY
+_mesa_GetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params);
+
+extern void GLAPIENTRY
+_mesa_GetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params);
+
+extern void GLAPIENTRY
+_mesa_GetSeparableFilter(GLenum target, GLenum format, GLenum type,
+                         GLvoid *row, GLvoid *column, GLvoid *span);
+
+extern void GLAPIENTRY
+_mesa_SeparableFilter2D(GLenum target, GLenum internalformat,
+                        GLsizei width, GLsizei height,
+                        GLenum format, GLenum type,
+                        const GLvoid *row, const GLvoid *column);
+
+
+
+extern void
+_mesa_convolve_1d_image(const GLcontext *ctx, GLsizei *width,
+                        const GLfloat *srcImage, GLfloat *dstImage);
+
+
+extern void
+_mesa_convolve_2d_image(const GLcontext *ctx, GLsizei *width, GLsizei *height,
+                        const GLfloat *srcImage, GLfloat *dstImage);
+
+
+extern void
+_mesa_convolve_sep_image(const GLcontext *ctx,
+                         GLsizei *width, GLsizei *height,
+                         const GLfloat *srcImage, GLfloat *dstImage);
+
+
+extern void
+_mesa_adjust_image_for_convolution(const GLcontext *ctx, GLuint dimensions,
+                                   GLsizei *width, GLsizei *height);
+
+#else
+#define _mesa_adjust_image_for_convolution(c, d, w, h) ((void)0)
+#define _mesa_convolve_1d_image(c,w,s,d) ((void)0)
+#define _mesa_convolve_2d_image(c,w,h,s,d) ((void)0)
+#define _mesa_convolve_sep_image(c,w,h,s,d) ((void)0)
+#endif
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/dd.h b/reactos/lib/mesa32/src/main/dd.h
new file mode 100644
index 00000000000..e9826abd6d2
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/dd.h
@@ -0,0 +1,1011 @@
+/**
+ * \file dd.h
+ * Device driver interfaces.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef DD_INCLUDED
+#define DD_INCLUDED
+
+/* THIS FILE ONLY INCLUDED BY mtypes.h !!!!! */
+
+struct gl_pixelstore_attrib;
+
+/* Mask bits sent to the driver Clear() function */
+#define DD_FRONT_LEFT_BIT  FRONT_LEFT_BIT         /* 1 */
+#define DD_FRONT_RIGHT_BIT FRONT_RIGHT_BIT        /* 2 */
+#define DD_BACK_LEFT_BIT   BACK_LEFT_BIT          /* 4 */
+#define DD_BACK_RIGHT_BIT  BACK_RIGHT_BIT         /* 8 */
+#define DD_AUX0            AUX0_BIT               /* future use */
+#define DD_AUX1            AUX1_BIT               /* future use */
+#define DD_AUX2            AUX2_BIT               /* future use */
+#define DD_AUX3            AUX3_BIT               /* future use */
+#define DD_DEPTH_BIT       GL_DEPTH_BUFFER_BIT    /* 0x00000100 */
+#define DD_ACCUM_BIT       GL_ACCUM_BUFFER_BIT    /* 0x00000200 */
+#define DD_STENCIL_BIT     GL_STENCIL_BUFFER_BIT  /* 0x00000400 */
+
+
+/**
+ * Device driver function table.
+ * Core Mesa uses these function pointers to call into device drivers.
+ * Most of these functions directly correspond to OpenGL state commands.
+ * Core Mesa will call these functions after error checking has been done
+ * so that the drivers don't have to worry about error testing.
+ *
+ * Vertex transformation/clipping/lighting is patched into the T&L module.
+ * Rasterization functions are patched into the swrast module.
+ */
+struct dd_function_table {
+   /**
+    * Return a string as needed by glGetString().
+    *
+    * Only the GL_RENDERER token must be implemented.  Otherwise, NULL can be
+    * returned.
+    */
+   const GLubyte * (*GetString)( GLcontext *ctx, GLenum name );
+
+   /**
+    * Notify the driver after Mesa has made some internal state changes.  
+    *
+    * This is in addition to any state change callbacks Mesa may already have
+    * made.
+    */
+   void (*UpdateState)( GLcontext *ctx, GLuint new_state );
+
+   /**
+    * Clear the color/depth/stencil/accum buffer(s).
+    *
+    * \param mask a bitmask of the DD_*_BIT values defined above that indicates
+    * which buffers need to be cleared.
+    * \param all if true then clear the whole buffer, else clear only the
+    * region defined by <tt>(x, y, width, height)</tt>.
+    * 
+    * This function must obey the glColorMask(), glIndexMask() and glStencilMask()
+    * settings!
+    * Software Mesa can do masked clears if the device driver can't.
+    */
+   void (*Clear)( GLcontext *ctx, GLbitfield mask, GLboolean all,
+		  GLint x, GLint y, GLint width, GLint height );
+
+   /**
+    * Specify the current buffer for writing.  
+    *
+    * Called via glDrawBuffer().  Note the driver must organize fallbacks (e.g.
+    * with swrast) if it cannot implement the requested mode.
+    */
+   void (*DrawBuffer)( GLcontext *ctx, GLenum buffer );
+
+   /**
+    * Specifies the current buffer for reading.  
+    *
+    * Called via glReadBuffer().
+    */
+   void (*ReadBuffer)( GLcontext *ctx, GLenum buffer );
+
+   /**
+    * Get the width and height of the named buffer/window.
+    *
+    * Mesa uses this to determine when the driver's window size has changed.
+    */
+   void (*GetBufferSize)( GLframebuffer *buffer,
+                          GLuint *width, GLuint *height );
+
+   /**
+    * Resize the driver's depth/stencil/accum/back buffers to match the
+    * size given in the GLframebuffer struct.  
+    *
+    * This is typically called when Mesa detects that a window size has changed.
+    */
+   void (*ResizeBuffers)( GLframebuffer *buffer );
+
+   /**
+    * This is called whenever glFinish() is called.
+    */
+   void (*Finish)( GLcontext *ctx );
+
+   /**
+    * This is called whenever glFlush() is called.
+    */
+   void (*Flush)( GLcontext *ctx );
+
+   /**
+    * Called whenever an error is generated.  
+    *
+    * __GLcontextRec::ErrorValue contains the error value.
+    */
+   void (*Error)( GLcontext *ctx );
+
+
+   /**
+    * \name For hardware accumulation buffer
+    */
+   /*@{*/
+   /**
+    * Execute glAccum command within the given scissor region.
+    */
+   void (*Accum)( GLcontext *ctx, GLenum op, GLfloat value,
+		  GLint xpos, GLint ypos, GLint width, GLint height );
+   /*@}*/
+
+
+   /**
+    * \name glDraw(), glRead(), glCopyPixels() and glBitmap() functions
+    */
+   /*@{*/
+
+   /**
+    * This is called by glDrawPixels().
+    *
+    * \p unpack describes how to unpack the source image data.
+    */
+   void (*DrawPixels)( GLcontext *ctx,
+		       GLint x, GLint y, GLsizei width, GLsizei height,
+		       GLenum format, GLenum type,
+		       const struct gl_pixelstore_attrib *unpack,
+		       const GLvoid *pixels );
+
+   /**
+    * Called by glReadPixels().
+    */
+   void (*ReadPixels)( GLcontext *ctx,
+		       GLint x, GLint y, GLsizei width, GLsizei height,
+		       GLenum format, GLenum type,
+		       const struct gl_pixelstore_attrib *unpack,
+		       GLvoid *dest );
+
+   /**
+    * Do a glCopyPixels().  
+    *
+    * This function must respect all rasterization state, glPixelTransfer(),
+    * glPixelZoom(), etc.
+    */
+   void (*CopyPixels)( GLcontext *ctx,
+                            GLint srcx, GLint srcy,
+                            GLsizei width, GLsizei height,
+                            GLint dstx, GLint dsty, GLenum type );
+
+   /**
+    * This is called by glBitmap().  
+    *
+    * Works the same as dd_function_table::DrawPixels, above.
+    */
+   void (*Bitmap)( GLcontext *ctx,
+		   GLint x, GLint y, GLsizei width, GLsizei height,
+		   const struct gl_pixelstore_attrib *unpack,
+		   const GLubyte *bitmap );
+   /*@}*/
+
+   
+   /**
+    * \name Texture image functions
+    */
+   /*@{*/
+
+   /**
+    * Choose texture format.
+    * 
+    * This is called by the \c _mesa_store_tex[sub]image[123]d() fallback
+    * functions.  The driver should examine \p internalFormat and return a
+    * pointer to an appropriate gl_texture_format.
+    */
+   const struct gl_texture_format *
+   (*ChooseTextureFormat)( GLcontext *ctx, GLint internalFormat,
+                           GLenum srcFormat, GLenum srcType );
+
+   /**
+    * Called by glTexImage1D().
+    * 
+    * \param target user specified.
+    * \param format user specified.
+    * \param type user specified.
+    * \param pixels user specified.
+    * \param packing indicates the image packing of pixels.
+    * \param texObj is the target texture object.
+    * \param texImage is the target texture image.  It will have the texture \p
+    * width, \p height, \p depth, \p border and \p internalFormat information.
+    * 
+    * \p retainInternalCopy is returned by this function and indicates whether
+    * core Mesa should keep an internal copy of the texture image.
+    *
+    * Drivers should call a fallback routine from texstore.c if needed.
+    */
+   void (*TexImage1D)( GLcontext *ctx, GLenum target, GLint level,
+                       GLint internalFormat,
+                       GLint width, GLint border,
+                       GLenum format, GLenum type, const GLvoid *pixels,
+                       const struct gl_pixelstore_attrib *packing,
+                       struct gl_texture_object *texObj,
+                       struct gl_texture_image *texImage );
+
+   /**
+    * Called by glTexImage2D().
+    * 
+    * \sa dd_function_table::TexImage1D.
+    */
+   void (*TexImage2D)( GLcontext *ctx, GLenum target, GLint level,
+                       GLint internalFormat,
+                       GLint width, GLint height, GLint border,
+                       GLenum format, GLenum type, const GLvoid *pixels,
+                       const struct gl_pixelstore_attrib *packing,
+                       struct gl_texture_object *texObj,
+                       struct gl_texture_image *texImage );
+   
+   /**
+    * Called by glTexImage3D().
+    * 
+    * \sa dd_function_table::TexImage1D.
+    */
+   void (*TexImage3D)( GLcontext *ctx, GLenum target, GLint level,
+                       GLint internalFormat,
+                       GLint width, GLint height, GLint depth, GLint border,
+                       GLenum format, GLenum type, const GLvoid *pixels,
+                       const struct gl_pixelstore_attrib *packing,
+                       struct gl_texture_object *texObj,
+                       struct gl_texture_image *texImage );
+
+   /**
+    * Called by glTexSubImage1D().
+    *
+    * \param target user specified.
+    * \param level user specified.
+    * \param xoffset user specified.
+    * \param yoffset user specified.
+    * \param zoffset user specified.
+    * \param width user specified.
+    * \param height user specified.
+    * \param depth user specified.
+    * \param format user specified.
+    * \param type user specified.
+    * \param pixels user specified.
+    * \param packing indicates the image packing of pixels.
+    * \param texObj is the target texture object.
+    * \param texImage is the target texture image.  It will have the texture \p
+    * width, \p height, \p border and \p internalFormat information.
+    *
+    * The driver should use a fallback routine from texstore.c if needed.
+    */
+   void (*TexSubImage1D)( GLcontext *ctx, GLenum target, GLint level,
+                          GLint xoffset, GLsizei width,
+                          GLenum format, GLenum type,
+                          const GLvoid *pixels,
+                          const struct gl_pixelstore_attrib *packing,
+                          struct gl_texture_object *texObj,
+                          struct gl_texture_image *texImage );
+   
+   /**
+    * Called by glTexSubImage2D().
+    *
+    * \sa dd_function_table::TexSubImage1D.
+    */
+   void (*TexSubImage2D)( GLcontext *ctx, GLenum target, GLint level,
+                          GLint xoffset, GLint yoffset,
+                          GLsizei width, GLsizei height,
+                          GLenum format, GLenum type,
+                          const GLvoid *pixels,
+                          const struct gl_pixelstore_attrib *packing,
+                          struct gl_texture_object *texObj,
+                          struct gl_texture_image *texImage );
+   
+   /**
+    * Called by glTexSubImage3D().
+    *
+    * \sa dd_function_table::TexSubImage1D.
+    */
+   void (*TexSubImage3D)( GLcontext *ctx, GLenum target, GLint level,
+                          GLint xoffset, GLint yoffset, GLint zoffset,
+                          GLsizei width, GLsizei height, GLint depth,
+                          GLenum format, GLenum type,
+                          const GLvoid *pixels,
+                          const struct gl_pixelstore_attrib *packing,
+                          struct gl_texture_object *texObj,
+                          struct gl_texture_image *texImage );
+
+   /**
+    * Called by glCopyTexImage1D().
+    * 
+    * Drivers should use a fallback routine from texstore.c if needed.
+    */
+   void (*CopyTexImage1D)( GLcontext *ctx, GLenum target, GLint level,
+                           GLenum internalFormat, GLint x, GLint y,
+                           GLsizei width, GLint border );
+
+   /**
+    * Called by glCopyTexImage2D().
+    * 
+    * Drivers should use a fallback routine from texstore.c if needed.
+    */
+   void (*CopyTexImage2D)( GLcontext *ctx, GLenum target, GLint level,
+                           GLenum internalFormat, GLint x, GLint y,
+                           GLsizei width, GLsizei height, GLint border );
+
+   /**
+    * Called by glCopyTexSubImage1D().
+    * 
+    * Drivers should use a fallback routine from texstore.c if needed.
+    */
+   void (*CopyTexSubImage1D)( GLcontext *ctx, GLenum target, GLint level,
+                              GLint xoffset,
+                              GLint x, GLint y, GLsizei width );
+   /**
+    * Called by glCopyTexSubImage2D().
+    * 
+    * Drivers should use a fallback routine from texstore.c if needed.
+    */
+   void (*CopyTexSubImage2D)( GLcontext *ctx, GLenum target, GLint level,
+                              GLint xoffset, GLint yoffset,
+                              GLint x, GLint y,
+                              GLsizei width, GLsizei height );
+   /**
+    * Called by glCopyTexSubImage3D().
+    * 
+    * Drivers should use a fallback routine from texstore.c if needed.
+    */
+   void (*CopyTexSubImage3D)( GLcontext *ctx, GLenum target, GLint level,
+                              GLint xoffset, GLint yoffset, GLint zoffset,
+                              GLint x, GLint y,
+                              GLsizei width, GLsizei height );
+
+   /**
+    * Called by glTexImage[123]D when user specifies a proxy texture
+    * target.  
+    *
+    * \return GL_TRUE if the proxy test passes, or GL_FALSE if the test fails.
+    */
+   GLboolean (*TestProxyTexImage)(GLcontext *ctx, GLenum target,
+                                  GLint level, GLint internalFormat,
+                                  GLenum format, GLenum type,
+                                  GLint width, GLint height,
+                                  GLint depth, GLint border);
+   /*@}*/
+
+   
+   /**
+    * \name Compressed texture functions
+    */
+   /*@{*/
+
+   /**
+    * Called by glCompressedTexImage1D().
+    *
+    * \param target user specified.
+    * \param format user specified.
+    * \param type user specified.
+    * \param pixels user specified.
+    * \param packing indicates the image packing of pixels.
+    * \param texObj is the target texture object.
+    * \param texImage is the target texture image.  It will have the texture \p
+    * width, \p height, \p depth, \p border and \p internalFormat information.
+    *      
+    * \a retainInternalCopy is returned by this function and indicates whether
+    * core Mesa should keep an internal copy of the texture image.
+    */
+   void (*CompressedTexImage1D)( GLcontext *ctx, GLenum target,
+                                 GLint level, GLint internalFormat,
+                                 GLsizei width, GLint border,
+                                 GLsizei imageSize, const GLvoid *data,
+                                 struct gl_texture_object *texObj,
+                                 struct gl_texture_image *texImage );
+   /**
+    * Called by glCompressedTexImage2D().
+    *
+    * \sa dd_function_table::CompressedTexImage1D.
+    */
+   void (*CompressedTexImage2D)( GLcontext *ctx, GLenum target,
+                                 GLint level, GLint internalFormat,
+                                 GLsizei width, GLsizei height, GLint border,
+                                 GLsizei imageSize, const GLvoid *data,
+                                 struct gl_texture_object *texObj,
+                                 struct gl_texture_image *texImage );
+   /**
+    * Called by glCompressedTexImage3D().
+    *
+    * \sa dd_function_table::CompressedTexImage3D.
+    */
+   void (*CompressedTexImage3D)( GLcontext *ctx, GLenum target,
+                                 GLint level, GLint internalFormat,
+                                 GLsizei width, GLsizei height, GLsizei depth,
+                                 GLint border,
+                                 GLsizei imageSize, const GLvoid *data,
+                                 struct gl_texture_object *texObj,
+                                 struct gl_texture_image *texImage );
+
+   /**
+    * Called by glCompressedTexSubImage1D().
+    * 
+    * \param target user specified.
+    * \param level user specified.
+    * \param xoffset user specified.
+    * \param yoffset user specified.
+    * \param zoffset user specified.
+    * \param width user specified.
+    * \param height user specified.
+    * \param depth user specified.
+    * \param imageSize user specified.
+    * \param data user specified.
+    * \param texObj is the target texture object.
+    * \param texImage is the target texture image.  It will have the texture \p
+    * width, \p height, \p depth, \p border and \p internalFormat information.
+    */
+   void (*CompressedTexSubImage1D)(GLcontext *ctx, GLenum target, GLint level,
+                                   GLint xoffset, GLsizei width,
+                                   GLenum format,
+                                   GLsizei imageSize, const GLvoid *data,
+                                   struct gl_texture_object *texObj,
+                                   struct gl_texture_image *texImage);
+   /**
+    * Called by glCompressedTexSubImage2D().
+    *
+    * \sa dd_function_table::CompressedTexImage3D.
+    */
+   void (*CompressedTexSubImage2D)(GLcontext *ctx, GLenum target, GLint level,
+                                   GLint xoffset, GLint yoffset,
+                                   GLsizei width, GLint height,
+                                   GLenum format,
+                                   GLsizei imageSize, const GLvoid *data,
+                                   struct gl_texture_object *texObj,
+                                   struct gl_texture_image *texImage);
+   /**
+    * Called by glCompressedTexSubImage3D().
+    *
+    * \sa dd_function_table::CompressedTexImage3D.
+    */
+   void (*CompressedTexSubImage3D)(GLcontext *ctx, GLenum target, GLint level,
+                                   GLint xoffset, GLint yoffset, GLint zoffset,
+                                   GLsizei width, GLint height, GLint depth,
+                                   GLenum format,
+                                   GLsizei imageSize, const GLvoid *data,
+                                   struct gl_texture_object *texObj,
+                                   struct gl_texture_image *texImage);
+   /**
+    * Called to validate a certain compressed format.
+    */
+   GLboolean (*IsCompressedFormat)( GLcontext *ctx, GLenum internalFormat );
+   /**
+    * Called to get bytes of storage needed for the given texture size and
+    * compressed format.
+    */
+   GLuint (*CompressedTextureSize)( GLcontext *ctx,
+                                    GLsizei width, GLsizei height, GLsizei depth,
+                                    GLenum format );
+   /*@}*/
+
+   /**
+    * \name Texture object functions
+    */
+   /*@{*/
+
+   /**
+    * Called by glBindTexture().
+    */
+   void (*BindTexture)( GLcontext *ctx, GLenum target,
+                        struct gl_texture_object *tObj );
+
+   /**
+    * Called when a texture object is created.
+    */
+   void (*CreateTexture)( GLcontext *ctx, struct gl_texture_object *tObj );
+
+   /**
+    * Called to allocate a new texture object.
+    * 
+    * \note This function pointer should be initialized by drivers \e before
+    * calling _mesa_initialize_context() since context initialization involves
+    * allocating some texture objects!
+    */
+   struct gl_texture_object * (*NewTextureObject)( GLcontext *ctx, GLuint name,
+                                                   GLenum target );
+   /**
+    * Called when a texture object is about to be deallocated.  
+    *
+    * Driver should free anything attached to the DriverData pointers.
+    */
+   void (*DeleteTexture)( GLcontext *ctx, struct gl_texture_object *tObj );
+
+   /**
+    * Called to allocate a new texture image object.
+    */
+   struct gl_texture_image * (*NewTextureImage)( GLcontext *ctx );
+
+   /**
+    * Called by glAreTextureResident().
+    */
+   GLboolean (*IsTextureResident)( GLcontext *ctx,
+                                   struct gl_texture_object *t );
+
+   /**
+    * Called by glPrioritizeTextures().
+    */
+   void (*PrioritizeTexture)( GLcontext *ctx,  struct gl_texture_object *t,
+                              GLclampf priority );
+
+   /**
+    * Called by glActiveTextureARB() to set current texture unit.
+    */
+   void (*ActiveTexture)( GLcontext *ctx, GLuint texUnitNumber );
+
+   /**
+    * Called when the texture's color lookup table is changed.
+    * 
+    * If \p tObj is NULL then the shared texture palette
+    * gl_texture_object::Palette is to be updated.
+    */
+   void (*UpdateTexturePalette)( GLcontext *ctx,
+                                 struct gl_texture_object *tObj );
+   /*@}*/
+
+   
+   /**
+    * \name Imaging functionality
+    */
+   /*@{*/
+   void (*CopyColorTable)( GLcontext *ctx,
+			   GLenum target, GLenum internalformat,
+			   GLint x, GLint y, GLsizei width );
+
+   void (*CopyColorSubTable)( GLcontext *ctx,
+			      GLenum target, GLsizei start,
+			      GLint x, GLint y, GLsizei width );
+
+   void (*CopyConvolutionFilter1D)( GLcontext *ctx, GLenum target,
+				    GLenum internalFormat,
+				    GLint x, GLint y, GLsizei width );
+
+   void (*CopyConvolutionFilter2D)( GLcontext *ctx, GLenum target,
+				    GLenum internalFormat,
+				    GLint x, GLint y,
+				    GLsizei width, GLsizei height );
+   /*@}*/
+
+
+   /**
+    * \name State-changing functions.
+    *
+    * \note drawing functions are above.
+    *
+    * These functions are called by their corresponding OpenGL API functions.
+    * They are \e also called by the gl_PopAttrib() function!!!
+    * May add more functions like these to the device driver in the future.
+    */
+   /*@{*/
+   /** Specify the alpha test function */
+   void (*AlphaFunc)(GLcontext *ctx, GLenum func, GLfloat ref);
+   /** Set the blend color */
+   void (*BlendColor)(GLcontext *ctx, const GLfloat color[4]);
+   /** Set the blend equation */
+   void (*BlendEquation)(GLcontext *ctx, GLenum mode);
+   /** Specify pixel arithmetic */
+   void (*BlendFunc)(GLcontext *ctx, GLenum sfactor, GLenum dfactor);
+   void (*BlendFuncSeparate)(GLcontext *ctx,
+                             GLenum sfactorRGB, GLenum dfactorRGB,
+                             GLenum sfactorA, GLenum dfactorA);
+   /** Specify clear values for the color buffers */
+   void (*ClearColor)(GLcontext *ctx, const GLfloat color[4]);
+   /** Specify the clear value for the depth buffer */
+   void (*ClearDepth)(GLcontext *ctx, GLclampd d);
+   /** Specify the clear value for the color index buffers */
+   void (*ClearIndex)(GLcontext *ctx, GLuint index);
+   /** Specify the clear value for the stencil buffer */
+   void (*ClearStencil)(GLcontext *ctx, GLint s);
+   /** Specify a plane against which all geometry is clipped */
+   void (*ClipPlane)(GLcontext *ctx, GLenum plane, const GLfloat *equation );
+   /** Enable and disable writing of frame buffer color components */
+   void (*ColorMask)(GLcontext *ctx, GLboolean rmask, GLboolean gmask,
+                     GLboolean bmask, GLboolean amask );
+   /** Cause a material color to track the current color */
+   void (*ColorMaterial)(GLcontext *ctx, GLenum face, GLenum mode);
+   /** Specify whether front- or back-facing facets can be culled */
+   void (*CullFace)(GLcontext *ctx, GLenum mode);
+   /** Define front- and back-facing polygons */
+   void (*FrontFace)(GLcontext *ctx, GLenum mode);
+   /** Specify the value used for depth buffer comparisons */
+   void (*DepthFunc)(GLcontext *ctx, GLenum func);
+   /** Enable or disable writing into the depth buffer */
+   void (*DepthMask)(GLcontext *ctx, GLboolean flag);
+   /** Specify mapping of depth values from normalized device coordinates to window coordinates */
+   void (*DepthRange)(GLcontext *ctx, GLclampd nearval, GLclampd farval);
+   /** Enable or disable server-side gl capabilities */
+   void (*Enable)(GLcontext *ctx, GLenum cap, GLboolean state);
+   /** Specify fog parameters */
+   void (*Fogfv)(GLcontext *ctx, GLenum pname, const GLfloat *params);
+   /** Specify implementation-specific hints */
+   void (*Hint)(GLcontext *ctx, GLenum target, GLenum mode);
+   /** Control the writing of individual bits in the color index buffers */
+   void (*IndexMask)(GLcontext *ctx, GLuint mask);
+   /** Set light source parameters */
+   void (*Lightfv)(GLcontext *ctx, GLenum light,
+		   GLenum pname, const GLfloat *params );
+   /** Set the lighting model parameters */
+   void (*LightModelfv)(GLcontext *ctx, GLenum pname, const GLfloat *params);
+   /** Specify the line stipple pattern */
+   void (*LineStipple)(GLcontext *ctx, GLint factor, GLushort pattern );
+   /** Specify the width of rasterized lines */
+   void (*LineWidth)(GLcontext *ctx, GLfloat width);
+   /** Specify a logical pixel operation for color index rendering */
+   void (*LogicOpcode)(GLcontext *ctx, GLenum opcode);
+   void (*PointParameterfv)(GLcontext *ctx, GLenum pname,
+                            const GLfloat *params);
+   /** Specify the diameter of rasterized points */
+   void (*PointSize)(GLcontext *ctx, GLfloat size);
+   /** Select a polygon rasterization mode */
+   void (*PolygonMode)(GLcontext *ctx, GLenum face, GLenum mode);
+   /** Set the scale and units used to calculate depth values */
+   void (*PolygonOffset)(GLcontext *ctx, GLfloat factor, GLfloat units);
+   /** Set the polygon stippling pattern */
+   void (*PolygonStipple)(GLcontext *ctx, const GLubyte *mask );
+   /** Set rasterization mode */
+   void (*RenderMode)(GLcontext *ctx, GLenum mode );
+   /** Define the scissor box */
+   void (*Scissor)(GLcontext *ctx, GLint x, GLint y, GLsizei w, GLsizei h);
+   /** Select flat or smooth shading */
+   void (*ShadeModel)(GLcontext *ctx, GLenum mode);
+   /** Set function and reference value for stencil testing */
+   void (*StencilFunc)(GLcontext *ctx, GLenum func, GLint ref, GLuint mask);
+   /** Control the writing of individual bits in the stencil planes */
+   void (*StencilMask)(GLcontext *ctx, GLuint mask);
+   /** Set stencil test actions */
+   void (*StencilOp)(GLcontext *ctx, GLenum fail, GLenum zfail, GLenum zpass);
+   void (*ActiveStencilFace)(GLcontext *ctx, GLuint face);
+   /** Control the generation of texture coordinates */
+   void (*TexGen)(GLcontext *ctx, GLenum coord, GLenum pname,
+		  const GLfloat *params);
+   /** Set texture environment parameters */
+   void (*TexEnv)(GLcontext *ctx, GLenum target, GLenum pname,
+                  const GLfloat *param);
+   /** Set texture parameters */
+   void (*TexParameter)(GLcontext *ctx, GLenum target,
+                        struct gl_texture_object *texObj,
+                        GLenum pname, const GLfloat *params);
+   void (*TextureMatrix)(GLcontext *ctx, GLuint unit, const GLmatrix *mat);
+   /** Set the viewport */
+   void (*Viewport)(GLcontext *ctx, GLint x, GLint y, GLsizei w, GLsizei h);
+   /*@}*/
+
+
+   /**
+    * \name Vertex array functions
+    *
+    * Called by the corresponding OpenGL functions.
+    */
+   /*@{*/
+   void (*VertexPointer)(GLcontext *ctx, GLint size, GLenum type,
+			 GLsizei stride, const GLvoid *ptr);
+   void (*NormalPointer)(GLcontext *ctx, GLenum type,
+			 GLsizei stride, const GLvoid *ptr);
+   void (*ColorPointer)(GLcontext *ctx, GLint size, GLenum type,
+			GLsizei stride, const GLvoid *ptr);
+   void (*FogCoordPointer)(GLcontext *ctx, GLenum type,
+			   GLsizei stride, const GLvoid *ptr);
+   void (*IndexPointer)(GLcontext *ctx, GLenum type,
+			GLsizei stride, const GLvoid *ptr);
+   void (*SecondaryColorPointer)(GLcontext *ctx, GLint size, GLenum type,
+				 GLsizei stride, const GLvoid *ptr);
+   void (*TexCoordPointer)(GLcontext *ctx, GLint size, GLenum type,
+			   GLsizei stride, const GLvoid *ptr);
+   void (*EdgeFlagPointer)(GLcontext *ctx, GLsizei stride, const GLvoid *ptr);
+   void (*VertexAttribPointer)(GLcontext *ctx, GLuint index, GLint size,
+                               GLenum type, GLsizei stride, const GLvoid *ptr);
+   /*@}*/
+
+
+   /** 
+    * \name State-query functions
+    *
+    * Return GL_TRUE if query was completed, GL_FALSE otherwise.
+    */
+   /*@{*/
+   /** Return the value or values of a selected parameter */
+   GLboolean (*GetBooleanv)(GLcontext *ctx, GLenum pname, GLboolean *result);
+   /** Return the value or values of a selected parameter */
+   GLboolean (*GetDoublev)(GLcontext *ctx, GLenum pname, GLdouble *result);
+   /** Return the value or values of a selected parameter */
+   GLboolean (*GetFloatv)(GLcontext *ctx, GLenum pname, GLfloat *result);
+   /** Return the value or values of a selected parameter */
+   GLboolean (*GetIntegerv)(GLcontext *ctx, GLenum pname, GLint *result);
+   /** Return the value or values of a selected parameter */
+   GLboolean (*GetPointerv)(GLcontext *ctx, GLenum pname, GLvoid **result);
+   /*@}*/
+   
+
+   /**
+    * \name Vertex buffer object functions
+    */
+#if FEATURE_ARB_vertex_buffer_object
+   /*@{*/
+   void (*BindBuffer)( GLcontext *ctx, GLenum target,
+		       struct gl_buffer_object *obj );
+
+   struct gl_buffer_object * (*NewBufferObject)( GLcontext *ctx, GLuint buffer,
+						 GLenum target );
+   
+   void (*DeleteBuffer)( GLcontext *ctx, struct gl_buffer_object *obj );
+
+   void (*BufferData)( GLcontext *ctx, GLenum target, GLsizeiptrARB size,
+		       const GLvoid *data, GLenum usage,
+		       struct gl_buffer_object *obj );
+
+   void (*BufferSubData)( GLcontext *ctx, GLenum target, GLintptrARB offset,
+			  GLsizeiptrARB size, const GLvoid *data,
+			  struct gl_buffer_object *obj );
+
+   void (*GetBufferSubData)( GLcontext *ctx, GLenum target,
+			     GLintptrARB offset, GLsizeiptrARB size,
+			     GLvoid *data, struct gl_buffer_object *obj );
+
+   void * (*MapBuffer)( GLcontext *ctx, GLenum target, GLenum access,
+			struct gl_buffer_object *obj );
+
+   GLboolean (*UnmapBuffer)( GLcontext *ctx, GLenum target,
+			     struct gl_buffer_object *obj );
+   /*@}*/
+#endif
+
+   /**
+    * \name Support for multiple T&L engines
+    */
+   /*@{*/
+
+   /**
+    * Bitmask of state changes that require the current T&L module to be
+    * validated, using ValidateTnlModule() below.
+    */
+   GLuint NeedValidate;
+
+   /**
+    * Validate the current T&L module. 
+    *
+    * This is called directly after UpdateState() when a state change that has
+    * occurred matches the dd_function_table::NeedValidate bitmask above.  This
+    * ensures all computed values are up to date, thus allowing the driver to
+    * decide if the current T&L module needs to be swapped out.
+    *
+    * This must be non-NULL if a driver installs a custom T&L module and sets
+    * the dd_function_table::NeedValidate bitmask, but may be NULL otherwise.
+    */
+   void (*ValidateTnlModule)( GLcontext *ctx, GLuint new_state );
+
+
+#define PRIM_OUTSIDE_BEGIN_END   GL_POLYGON+1
+#define PRIM_INSIDE_UNKNOWN_PRIM GL_POLYGON+2
+#define PRIM_UNKNOWN             GL_POLYGON+3
+
+   /**
+    * Set by the driver-supplied T&L engine.  
+    *
+    * Set to PRIM_OUTSIDE_BEGIN_END when outside glBegin()/glEnd().
+    */
+   GLuint CurrentExecPrimitive;
+
+   /**
+    * Current state of an in-progress compilation.  
+    *
+    * May take on any of the additional values PRIM_OUTSIDE_BEGIN_END,
+    * PRIM_INSIDE_UNKNOWN_PRIM or PRIM_UNKNOWN defined above.
+    */
+   GLuint CurrentSavePrimitive;
+
+
+#define FLUSH_STORED_VERTICES 0x1
+#define FLUSH_UPDATE_CURRENT  0x2
+   /**
+    * Set by the driver-supplied T&L engine whenever vertices are buffered
+    * between glBegin()/glEnd() objects or __GLcontextRec::Current is not
+    * updated.
+    *
+    * The dd_function_table::FlushVertices call below may be used to resolve
+    * these conditions.
+    */
+   GLuint NeedFlush;
+   GLuint SaveNeedFlush;
+
+   /**
+    * If inside glBegin()/glEnd(), it should ASSERT(0).  Otherwise, if
+    * FLUSH_STORED_VERTICES bit in \p flags is set flushes any buffered
+    * vertices, if FLUSH_UPDATE_CURRENT bit is set updates
+    * __GLcontextRec::Current and gl_light_attrib::Material
+    *
+    * Note that the default T&L engine never clears the
+    * FLUSH_UPDATE_CURRENT bit, even after performing the update.
+    */
+   void (*FlushVertices)( GLcontext *ctx, GLuint flags );
+   void (*SaveFlushVertices)( GLcontext *ctx );
+
+   /**
+    * Give the driver the opportunity to hook in its own vtxfmt for
+    * compiling optimized display lists.  This is called on each valid
+    * glBegin() during list compilation.
+    */
+   GLboolean (*NotifySaveBegin)( GLcontext *ctx, GLenum mode );
+
+   /**
+    * Notify driver that the special derived value _NeedEyeCoords has
+    * changed.
+    */
+   void (*LightingSpaceChange)( GLcontext *ctx );
+
+   /**
+    * Called by glNewList().
+    *
+    * Let the T&L component know what is going on with display lists
+    * in time to make changes to dispatch tables, etc.
+    */
+   void (*NewList)( GLcontext *ctx, GLuint list, GLenum mode );
+   /**
+    * Called by glEndList().
+    *
+    * \sa dd_function_table::NewList.
+    */
+   void (*EndList)( GLcontext *ctx );
+
+   /**
+    * Called by glCallList(s), but not recursively.
+    *
+    * Notify the T&L component before and after calling a display list.
+    * Called by glCallList(s), but not recursively.
+    */
+   void (*BeginCallList)( GLcontext *ctx, GLuint list );
+   /**
+    * Called by glEndCallList().
+    *
+    * \sa dd_function_table::BeginCallList.
+    */
+   void (*EndCallList)( GLcontext *ctx );
+
+   /**
+    * Let the T&L component know when the context becomes current.
+    */
+   void (*MakeCurrent)( GLcontext *ctx, GLframebuffer *drawBuffer,
+			GLframebuffer *readBuffer );
+
+   /**
+    * Called by glLockArraysEXT().
+    */
+   void (*LockArraysEXT)( GLcontext *ctx, GLint first, GLsizei count );
+   /**
+    * Called by UnlockArraysEXT().
+    */
+   void (*UnlockArraysEXT)( GLcontext *ctx );
+   /*@}*/
+
+};
+
+
+/**
+ * Transform/Clip/Lighting interface
+ *
+ * Drivers present a reduced set of the functions possible in
+ * glBegin()/glEnd() objects.  Core mesa provides translation stubs for the
+ * remaining functions to map down to these entry points.
+ *
+ * These are the initial values to be installed into dispatch by
+ * mesa.  If the T&L driver wants to modify the dispatch table
+ * while installed, it must do so itself.  It would be possible for
+ * the vertexformat to install it's own initial values for these
+ * functions, but this way there is an obvious list of what is
+ * expected of the driver.
+ *
+ * If the driver wants to hook in entry points other than those
+ * listed, it must restore them to their original values in
+ * the disable() callback, below.
+ */
+typedef struct {
+   /**
+    * \name Vertex
+    */
+   /*@{*/
+   void (GLAPIENTRYP ArrayElement)( GLint ); /* NOTE */
+   void (GLAPIENTRYP Color3f)( GLfloat, GLfloat, GLfloat );
+   void (GLAPIENTRYP Color3fv)( const GLfloat * );
+   void (GLAPIENTRYP Color4f)( GLfloat, GLfloat, GLfloat, GLfloat );
+   void (GLAPIENTRYP Color4fv)( const GLfloat * );
+   void (GLAPIENTRYP EdgeFlag)( GLboolean );
+   void (GLAPIENTRYP EdgeFlagv)( const GLboolean * );
+   void (GLAPIENTRYP EvalCoord1f)( GLfloat );          /* NOTE */
+   void (GLAPIENTRYP EvalCoord1fv)( const GLfloat * ); /* NOTE */
+   void (GLAPIENTRYP EvalCoord2f)( GLfloat, GLfloat ); /* NOTE */
+   void (GLAPIENTRYP EvalCoord2fv)( const GLfloat * ); /* NOTE */
+   void (GLAPIENTRYP EvalPoint1)( GLint );             /* NOTE */
+   void (GLAPIENTRYP EvalPoint2)( GLint, GLint );      /* NOTE */
+   void (GLAPIENTRYP FogCoordfEXT)( GLfloat );
+   void (GLAPIENTRYP FogCoordfvEXT)( const GLfloat * );
+   void (GLAPIENTRYP Indexf)( GLfloat );
+   void (GLAPIENTRYP Indexfv)( const GLfloat * );
+   void (GLAPIENTRYP Materialfv)( GLenum face, GLenum pname, const GLfloat * ); /* NOTE */
+   void (GLAPIENTRYP MultiTexCoord1fARB)( GLenum, GLfloat );
+   void (GLAPIENTRYP MultiTexCoord1fvARB)( GLenum, const GLfloat * );
+   void (GLAPIENTRYP MultiTexCoord2fARB)( GLenum, GLfloat, GLfloat );
+   void (GLAPIENTRYP MultiTexCoord2fvARB)( GLenum, const GLfloat * );
+   void (GLAPIENTRYP MultiTexCoord3fARB)( GLenum, GLfloat, GLfloat, GLfloat );
+   void (GLAPIENTRYP MultiTexCoord3fvARB)( GLenum, const GLfloat * );
+   void (GLAPIENTRYP MultiTexCoord4fARB)( GLenum, GLfloat, GLfloat, GLfloat, GLfloat );
+   void (GLAPIENTRYP MultiTexCoord4fvARB)( GLenum, const GLfloat * );
+   void (GLAPIENTRYP Normal3f)( GLfloat, GLfloat, GLfloat );
+   void (GLAPIENTRYP Normal3fv)( const GLfloat * );
+   void (GLAPIENTRYP SecondaryColor3fEXT)( GLfloat, GLfloat, GLfloat );
+   void (GLAPIENTRYP SecondaryColor3fvEXT)( const GLfloat * );
+   void (GLAPIENTRYP TexCoord1f)( GLfloat );
+   void (GLAPIENTRYP TexCoord1fv)( const GLfloat * );
+   void (GLAPIENTRYP TexCoord2f)( GLfloat, GLfloat );
+   void (GLAPIENTRYP TexCoord2fv)( const GLfloat * );
+   void (GLAPIENTRYP TexCoord3f)( GLfloat, GLfloat, GLfloat );
+   void (GLAPIENTRYP TexCoord3fv)( const GLfloat * );
+   void (GLAPIENTRYP TexCoord4f)( GLfloat, GLfloat, GLfloat, GLfloat );
+   void (GLAPIENTRYP TexCoord4fv)( const GLfloat * );
+   void (GLAPIENTRYP Vertex2f)( GLfloat, GLfloat );
+   void (GLAPIENTRYP Vertex2fv)( const GLfloat * );
+   void (GLAPIENTRYP Vertex3f)( GLfloat, GLfloat, GLfloat );
+   void (GLAPIENTRYP Vertex3fv)( const GLfloat * );
+   void (GLAPIENTRYP Vertex4f)( GLfloat, GLfloat, GLfloat, GLfloat );
+   void (GLAPIENTRYP Vertex4fv)( const GLfloat * );
+   void (GLAPIENTRYP CallList)( GLuint );	/* NOTE */
+   void (GLAPIENTRYP CallLists)( GLsizei, GLenum, const GLvoid * );	/* NOTE */
+   void (GLAPIENTRYP Begin)( GLenum );
+   void (GLAPIENTRYP End)( void );
+   void (GLAPIENTRYP VertexAttrib1fNV)( GLuint index, GLfloat x );
+   void (GLAPIENTRYP VertexAttrib1fvNV)( GLuint index, const GLfloat *v );
+   void (GLAPIENTRYP VertexAttrib2fNV)( GLuint index, GLfloat x, GLfloat y );
+   void (GLAPIENTRYP VertexAttrib2fvNV)( GLuint index, const GLfloat *v );
+   void (GLAPIENTRYP VertexAttrib3fNV)( GLuint index, GLfloat x, GLfloat y, GLfloat z );
+   void (GLAPIENTRYP VertexAttrib3fvNV)( GLuint index, const GLfloat *v );
+   void (GLAPIENTRYP VertexAttrib4fNV)( GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w );
+   void (GLAPIENTRYP VertexAttrib4fvNV)( GLuint index, const GLfloat *v );
+   /*@}*/
+
+   /*
+    */
+   void (GLAPIENTRYP Rectf)( GLfloat, GLfloat, GLfloat, GLfloat );
+
+   /**
+    * \name Array
+    */
+   /*@{*/
+   void (GLAPIENTRYP DrawArrays)( GLenum mode, GLint start, GLsizei count );
+   void (GLAPIENTRYP DrawElements)( GLenum mode, GLsizei count, GLenum type,
+			 const GLvoid *indices );
+   void (GLAPIENTRYP DrawRangeElements)( GLenum mode, GLuint start,
+			      GLuint end, GLsizei count,
+			      GLenum type, const GLvoid *indices );
+   /*@}*/
+
+   /**
+    * \name Eval
+    *
+    * If you don't support eval, fallback to the default vertex format
+    * on receiving an eval call and use the pipeline mechanism to
+    * provide partial T&L acceleration.
+    *
+    * Mesa will provide a set of helper functions to do eval within
+    * accelerated vertex formats, eventually...
+    */
+   /*@{*/
+   void (GLAPIENTRYP EvalMesh1)( GLenum mode, GLint i1, GLint i2 );
+   void (GLAPIENTRYP EvalMesh2)( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 );
+   /*@}*/
+
+} GLvertexformat;
+
+
+#endif /* DD_INCLUDED */
diff --git a/reactos/lib/mesa32/src/main/debug.c b/reactos/lib/mesa32/src/main/debug.c
new file mode 100644
index 00000000000..5848acaafe0
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/debug.c
@@ -0,0 +1,251 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "mtypes.h"
+#include "context.h"
+#include "imports.h"
+#include "debug.h"
+#include "get.h"
+
+/**
+ * Primitive names
+ */
+const char *_mesa_prim_name[GL_POLYGON+4] = {
+   "GL_POINTS",
+   "GL_LINES",
+   "GL_LINE_LOOP",
+   "GL_LINE_STRIP",
+   "GL_TRIANGLES",
+   "GL_TRIANGLE_STRIP",
+   "GL_TRIANGLE_FAN",
+   "GL_QUADS",
+   "GL_QUAD_STRIP",
+   "GL_POLYGON",
+   "outside begin/end",
+   "inside unkown primitive",
+   "unknown state"
+};
+
+void
+_mesa_print_state( const char *msg, GLuint state )
+{
+   _mesa_debug(NULL,
+	   "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
+	   msg,
+	   state,
+	   (state & _NEW_MODELVIEW)       ? "ctx->ModelView, " : "",
+	   (state & _NEW_PROJECTION)      ? "ctx->Projection, " : "",
+	   (state & _NEW_TEXTURE_MATRIX)  ? "ctx->TextureMatrix, " : "",
+	   (state & _NEW_COLOR_MATRIX)    ? "ctx->ColorMatrix, " : "",
+	   (state & _NEW_ACCUM)           ? "ctx->Accum, " : "",
+	   (state & _NEW_COLOR)           ? "ctx->Color, " : "",
+	   (state & _NEW_DEPTH)           ? "ctx->Depth, " : "",
+	   (state & _NEW_EVAL)            ? "ctx->Eval/EvalMap, " : "",
+	   (state & _NEW_FOG)             ? "ctx->Fog, " : "",
+	   (state & _NEW_HINT)            ? "ctx->Hint, " : "",
+	   (state & _NEW_LIGHT)           ? "ctx->Light, " : "",
+	   (state & _NEW_LINE)            ? "ctx->Line, " : "",
+	   (state & _NEW_PIXEL)           ? "ctx->Pixel, " : "",
+	   (state & _NEW_POINT)           ? "ctx->Point, " : "",
+	   (state & _NEW_POLYGON)         ? "ctx->Polygon, " : "",
+	   (state & _NEW_POLYGONSTIPPLE)  ? "ctx->PolygonStipple, " : "",
+	   (state & _NEW_SCISSOR)         ? "ctx->Scissor, " : "",
+	   (state & _NEW_TEXTURE)         ? "ctx->Texture, " : "",
+	   (state & _NEW_TRANSFORM)       ? "ctx->Transform, " : "",
+	   (state & _NEW_VIEWPORT)        ? "ctx->Viewport, " : "",
+	   (state & _NEW_PACKUNPACK)      ? "ctx->Pack/Unpack, " : "",
+	   (state & _NEW_ARRAY)           ? "ctx->Array, " : "",
+	   (state & _NEW_RENDERMODE)      ? "ctx->RenderMode, " : "",
+	   (state & _NEW_BUFFERS)         ? "ctx->Visual, ctx->DrawBuffer,, " : "");
+}
+
+
+
+void
+_mesa_print_tri_caps( const char *name, GLuint flags )
+{
+   _mesa_debug(NULL,
+	   "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
+	   name,
+	   flags,
+	   (flags & DD_FLATSHADE)           ? "flat-shade, " : "",
+	   (flags & DD_SEPARATE_SPECULAR)   ? "separate-specular, " : "",
+	   (flags & DD_TRI_LIGHT_TWOSIDE)   ? "tri-light-twoside, " : "",
+	   (flags & DD_TRI_UNFILLED)        ? "tri-unfilled, " : "",
+	   (flags & DD_TRI_STIPPLE)         ? "tri-stipple, " : "",
+	   (flags & DD_TRI_OFFSET)          ? "tri-offset, " : "",
+	   (flags & DD_TRI_SMOOTH)          ? "tri-smooth, " : "",
+	   (flags & DD_LINE_SMOOTH)         ? "line-smooth, " : "",
+	   (flags & DD_LINE_STIPPLE)        ? "line-stipple, " : "",
+	   (flags & DD_LINE_WIDTH)          ? "line-wide, " : "",
+	   (flags & DD_POINT_SMOOTH)        ? "point-smooth, " : "",
+	   (flags & DD_POINT_SIZE)          ? "point-size, " : "",
+	   (flags & DD_POINT_ATTEN)         ? "point-atten, " : "",
+	   (flags & DD_TRI_CULL_FRONT_BACK) ? "cull-all, " : ""
+      );
+}
+
+
+void
+_mesa_check_driver_hooks( GLcontext *ctx )
+{
+   ASSERT(ctx->Driver.GetString);
+   ASSERT(ctx->Driver.UpdateState);
+   ASSERT(ctx->Driver.Clear);
+   ASSERT(ctx->Driver.GetBufferSize);
+   if (ctx->Visual.accumRedBits > 0) {
+      ASSERT(ctx->Driver.Accum);
+   }
+   ASSERT(ctx->Driver.DrawPixels);
+   ASSERT(ctx->Driver.ReadPixels);
+   ASSERT(ctx->Driver.CopyPixels);
+   ASSERT(ctx->Driver.Bitmap);
+   ASSERT(ctx->Driver.ResizeBuffers);
+   ASSERT(ctx->Driver.TexImage1D);
+   ASSERT(ctx->Driver.TexImage2D);
+   ASSERT(ctx->Driver.TexImage3D);
+   ASSERT(ctx->Driver.TexSubImage1D);
+   ASSERT(ctx->Driver.TexSubImage2D);
+   ASSERT(ctx->Driver.TexSubImage3D);
+   ASSERT(ctx->Driver.CopyTexImage1D);
+   ASSERT(ctx->Driver.CopyTexImage2D);
+   ASSERT(ctx->Driver.CopyTexSubImage1D);
+   ASSERT(ctx->Driver.CopyTexSubImage2D);
+   ASSERT(ctx->Driver.CopyTexSubImage3D);
+   if (ctx->Extensions.ARB_texture_compression) {
+#if 0  /* HW drivers need these, but not SW rasterizers */
+      ASSERT(ctx->Driver.CompressedTexImage1D);
+      ASSERT(ctx->Driver.CompressedTexImage2D);
+      ASSERT(ctx->Driver.CompressedTexImage3D);
+      ASSERT(ctx->Driver.CompressedTexSubImage1D);
+      ASSERT(ctx->Driver.CompressedTexSubImage2D);
+      ASSERT(ctx->Driver.CompressedTexSubImage3D);
+#endif
+   }
+}
+
+/**
+ * Print information about this Mesa version and build options.
+ */
+void _mesa_print_info( void )
+{
+   _mesa_debug(NULL, "Mesa GL_VERSION = %s\n",
+	   (char *) _mesa_GetString(GL_VERSION));
+   _mesa_debug(NULL, "Mesa GL_RENDERER = %s\n",
+	   (char *) _mesa_GetString(GL_RENDERER));
+   _mesa_debug(NULL, "Mesa GL_VENDOR = %s\n",
+	   (char *) _mesa_GetString(GL_VENDOR));
+   _mesa_debug(NULL, "Mesa GL_EXTENSIONS = %s\n",
+	   (char *) _mesa_GetString(GL_EXTENSIONS));
+#if defined(THREADS)
+   _mesa_debug(NULL, "Mesa thread-safe: YES\n");
+#else
+   _mesa_debug(NULL, "Mesa thread-safe: NO\n");
+#endif
+#if defined(USE_X86_ASM)
+   _mesa_debug(NULL, "Mesa x86-optimized: YES\n");
+#else
+   _mesa_debug(NULL, "Mesa x86-optimized: NO\n");
+#endif
+#if defined(USE_SPARC_ASM)
+   _mesa_debug(NULL, "Mesa sparc-optimized: YES\n");
+#else
+   _mesa_debug(NULL, "Mesa sparc-optimized: NO\n");
+#endif
+}
+
+
+/**
+ * Set the debugging flags.
+ *
+ * \param debug debug string
+ *
+ * If compiled with debugging support then search for keywords in \p debug and
+ * enables the verbose debug output of the respective feature.
+ */
+static void add_debug_flags( const char *debug )
+{
+#ifdef MESA_DEBUG
+   if (_mesa_strstr(debug, "varray")) 
+      MESA_VERBOSE |= VERBOSE_VARRAY;
+
+   if (_mesa_strstr(debug, "tex")) 
+      MESA_VERBOSE |= VERBOSE_TEXTURE;
+
+   if (_mesa_strstr(debug, "imm")) 
+      MESA_VERBOSE |= VERBOSE_IMMEDIATE;
+
+   if (_mesa_strstr(debug, "pipe")) 
+      MESA_VERBOSE |= VERBOSE_PIPELINE;
+
+   if (_mesa_strstr(debug, "driver")) 
+      MESA_VERBOSE |= VERBOSE_DRIVER;
+
+   if (_mesa_strstr(debug, "state")) 
+      MESA_VERBOSE |= VERBOSE_STATE;
+
+   if (_mesa_strstr(debug, "api")) 
+      MESA_VERBOSE |= VERBOSE_API;
+
+   if (_mesa_strstr(debug, "list")) 
+      MESA_VERBOSE |= VERBOSE_DISPLAY_LIST;
+
+   if (_mesa_strstr(debug, "lighting")) 
+      MESA_VERBOSE |= VERBOSE_LIGHTING;
+   
+   /* Debug flag:
+    */
+   if (_mesa_strstr(debug, "flush")) 
+      MESA_DEBUG_FLAGS |= DEBUG_ALWAYS_FLUSH;
+#endif
+}
+
+
+void 
+_mesa_init_debug( GLcontext *ctx )
+{
+   char *c;
+
+   /* For debug/development only */
+   ctx->FirstTimeCurrent = GL_TRUE;
+
+   /* Dither disable */
+   ctx->NoDither = _mesa_getenv("MESA_NO_DITHER") ? GL_TRUE : GL_FALSE;
+   if (ctx->NoDither) {
+      if (_mesa_getenv("MESA_DEBUG")) {
+         _mesa_debug(ctx, "MESA_NO_DITHER set - dithering disabled\n");
+      }
+      ctx->Color.DitherFlag = GL_FALSE;
+   }
+
+   c = _mesa_getenv("MESA_DEBUG");
+   if (c)
+      add_debug_flags(c);
+
+   c = _mesa_getenv("MESA_VERBOSE");
+   if (c)
+      add_debug_flags(c);
+}
+
diff --git a/reactos/lib/mesa32/src/main/debug.h b/reactos/lib/mesa32/src/main/debug.h
new file mode 100644
index 00000000000..4d17771ce52
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/debug.h
@@ -0,0 +1,64 @@
+/**
+ * \file debug.h
+ * Debugging functions.
+ * 
+ * \if subset
+ * (No-op)
+ *
+ * \endif
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef _DEBUG_H
+#define _DEBUG_H
+
+#if _HAVE_FULL_GL
+
+extern void _mesa_print_tri_caps( const char *name, GLuint flags );
+extern void _mesa_print_enable_flags( const char *msg, GLuint flags );
+extern void _mesa_print_state( const char *msg, GLuint state );
+extern void _mesa_print_info( void );
+extern void _mesa_init_debug( GLcontext *ctx );
+extern void _mesa_check_driver_hooks( GLcontext *ctx );
+
+#else
+
+/** No-op */
+#define _mesa_print_state( m, s ) ((void)0)
+
+/** No-op */
+#define _mesa_print_info() ((void)0)
+
+/** No-op */
+#define _mesa_init_debug( c ) ((void)0)
+
+/** No-op */
+#define _mesa_check_driver_hooks( c ) ((void)0)
+
+#endif
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/depth.c b/reactos/lib/mesa32/src/main/depth.c
new file mode 100644
index 00000000000..eb8c8b821b2
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/depth.c
@@ -0,0 +1,186 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "imports.h"
+#include "context.h"
+#include "depth.h"
+#include "enums.h"
+#include "hash.h"
+#include "macros.h"
+#include "mtypes.h"
+
+
+/**********************************************************************/
+/*****                          API Functions                     *****/
+/**********************************************************************/
+
+
+
+void GLAPIENTRY
+_mesa_ClearDepth( GLclampd depth )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   depth = CLAMP( depth, 0.0, 1.0 );
+
+   if (ctx->Depth.Clear == depth)
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_DEPTH);
+   ctx->Depth.Clear = depth;
+   if (ctx->Driver.ClearDepth)
+      (*ctx->Driver.ClearDepth)( ctx, ctx->Depth.Clear );
+}
+
+
+
+void GLAPIENTRY
+_mesa_DepthFunc( GLenum func )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
+      _mesa_debug(ctx, "glDepthFunc %s\n", _mesa_lookup_enum_by_nr(func));
+
+   switch (func) {
+   case GL_LESS:    /* (default) pass if incoming z < stored z */
+   case GL_GEQUAL:
+   case GL_LEQUAL:
+   case GL_GREATER:
+   case GL_NOTEQUAL:
+   case GL_EQUAL:
+   case GL_ALWAYS:
+   case GL_NEVER:
+      break;
+   default:
+      _mesa_error( ctx, GL_INVALID_ENUM, "glDepth.Func" );
+      return;
+   }
+
+   if (ctx->Depth.Func == func)
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_DEPTH);
+   ctx->Depth.Func = func;
+
+   if (ctx->Driver.DepthFunc)
+      ctx->Driver.DepthFunc( ctx, func );
+}
+
+
+
+void GLAPIENTRY
+_mesa_DepthMask( GLboolean flag )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
+      _mesa_debug(ctx, "glDepthMask %d\n", flag);
+
+   /*
+    * GL_TRUE indicates depth buffer writing is enabled (default)
+    * GL_FALSE indicates depth buffer writing is disabled
+    */
+   if (ctx->Depth.Mask == flag)
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_DEPTH);
+   ctx->Depth.Mask = flag;
+
+   if (ctx->Driver.DepthMask)
+      ctx->Driver.DepthMask( ctx, flag );
+}
+
+
+
+/* GL_EXT_depth_bounds_test */
+void GLAPIENTRY
+_mesa_DepthBoundsEXT( GLclampd zmin, GLclampd zmax )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (zmin > zmax) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glDepthBoundsEXT(zmin > zmax)");
+      return;
+   }
+
+   zmin = CLAMP(zmin, 0.0, 1.0);
+   zmax = CLAMP(zmax, 0.0, 1.0);
+
+   if (ctx->Depth.BoundsMin == zmin && ctx->Depth.BoundsMax == zmax)
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_DEPTH);
+   ctx->Depth.BoundsMin = (GLfloat) zmin;
+   ctx->Depth.BoundsMax = (GLfloat) zmax;
+}
+
+
+/**********************************************************************/
+/*****                      Initialization                        *****/
+/**********************************************************************/
+
+void _mesa_init_depth( GLcontext * ctx )
+{
+   /* Depth buffer group */
+   ctx->Depth.Test = GL_FALSE;
+   ctx->Depth.Clear = 1.0;
+   ctx->Depth.Func = GL_LESS;
+   ctx->Depth.Mask = GL_TRUE;
+   ctx->Depth.OcclusionTest = GL_FALSE;
+
+   /* Z buffer stuff */
+   if (ctx->Visual.depthBits == 0) {
+      /* Special case.  Even if we don't have a depth buffer we need
+       * good values for DepthMax for Z vertex transformation purposes
+       * and for per-fragment fog computation.
+       */
+      ctx->DepthMax = 1 << 16;
+      ctx->DepthMaxF = (GLfloat) ctx->DepthMax;
+   }
+   else if (ctx->Visual.depthBits < 32) {
+      ctx->DepthMax = (1 << ctx->Visual.depthBits) - 1;
+      ctx->DepthMaxF = (GLfloat) ctx->DepthMax;
+   }
+   else {
+      /* Special case since shift values greater than or equal to the
+       * number of bits in the left hand expression's type are undefined.
+       */
+      ctx->DepthMax = 0xffffffff;
+      ctx->DepthMaxF = (GLfloat) ctx->DepthMax;
+   }
+   ctx->MRD = 1.0;  /* Minimum resolvable depth value, for polygon offset */
+
+#if FEATURE_ARB_occlusion_query
+   ctx->Occlusion.QueryObjects = _mesa_NewHashTable();
+#endif
+   ctx->OcclusionResult = GL_FALSE;
+   ctx->OcclusionResultSaved = GL_FALSE;
+}
diff --git a/reactos/lib/mesa32/src/main/depth.h b/reactos/lib/mesa32/src/main/depth.h
new file mode 100644
index 00000000000..0532a2e6d16
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/depth.h
@@ -0,0 +1,62 @@
+/**
+ * \file depth.h
+ * Depth buffer operations.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef DEPTH_H
+#define DEPTH_H
+
+
+#include "mtypes.h"
+
+
+#if _HAVE_FULL_GL
+
+extern void GLAPIENTRY
+_mesa_ClearDepth( GLclampd depth );
+
+extern void GLAPIENTRY
+_mesa_DepthFunc( GLenum func );
+
+extern void GLAPIENTRY
+_mesa_DepthMask( GLboolean flag );
+
+extern void 
+_mesa_init_depth( GLcontext * ctx );
+
+extern void GLAPIENTRY
+_mesa_DepthBoundsEXT( GLclampd zmin, GLclampd zmax );
+
+#else
+
+/** No-op */
+#define _mesa_init_depth( c ) ((void)0)
+
+#endif
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/dispatch.c b/reactos/lib/mesa32/src/main/dispatch.c
new file mode 100644
index 00000000000..87dc64f02d9
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/dispatch.c
@@ -0,0 +1,90 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * This file generates all the gl* function entyrpoints.
+ * But if we're using X86-optimized dispatch (X86/glapi_x86.S) then
+ * we don't use this code.
+ *
+ * NOTE: This file should _not_ be used when compiling Mesa for a DRI-
+ * based device driver.
+ *
+ */
+
+
+#include "glheader.h"
+#include "glapi.h"
+#include "glapitable.h"
+#include "glthread.h"
+
+
+#if !(defined(USE_X86_ASM) || defined(USE_SPARC_ASM))
+
+#if defined(WIN32)
+#define KEYWORD1 GLAPI
+#else
+#define KEYWORD1
+#endif
+
+#define KEYWORD2 GLAPIENTRY
+
+#if defined(USE_MGL_NAMESPACE)
+#define NAME(func)  mgl##func
+#else
+#define NAME(func)  gl##func
+#endif
+
+
+#if 0  /* Use this to log GL calls to stdout (for DEBUG only!) */
+
+#define F stdout
+#define DISPATCH(FUNC, ARGS, MESSAGE)		\
+   fprintf MESSAGE;				\
+   (_glapi_Dispatch->FUNC) ARGS;
+
+#define RETURN_DISPATCH(FUNC, ARGS, MESSAGE) 	\
+   fprintf MESSAGE;				\
+   return (_glapi_Dispatch->FUNC) ARGS
+
+#else
+
+#define DISPATCH(FUNC, ARGS, MESSAGE)		\
+   (_glapi_Dispatch->FUNC) ARGS;
+
+#define RETURN_DISPATCH(FUNC, ARGS, MESSAGE) 	\
+   return (_glapi_Dispatch->FUNC) ARGS
+
+#endif /* logging */
+
+
+#ifndef GLAPIENTRY
+#define GLAPIENTRY
+#endif
+
+#include "glapitemp.h"
+
+
+#endif /* USE_X86_ASM */
diff --git a/reactos/lib/mesa32/src/main/dlist.c b/reactos/lib/mesa32/src/main/dlist.c
new file mode 100644
index 00000000000..3fe3007b8fe
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/dlist.c
@@ -0,0 +1,7815 @@
+/**
+ * \file dlist.c
+ * Display lists management functions.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "imports.h"
+#include "api_arrayelt.h"
+#include "api_loopback.h"
+#include "config.h"
+#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
+#include "arbprogram.h"
+#include "program.h"
+#endif
+#include "attrib.h"
+#include "blend.h"
+#include "buffers.h"
+#if FEATURE_ARB_vertex_buffer_object
+#include "bufferobj.h"
+#endif
+#include "clip.h"
+#include "colormac.h"
+#include "colortab.h"
+#include "context.h"
+#include "convolve.h"
+#include "depth.h"
+#include "dlist.h"
+#include "enable.h"
+#include "enums.h"
+#include "eval.h"
+#include "extensions.h"
+#include "feedback.h"
+#include "get.h"
+#include "glapi.h"
+#include "hash.h"
+#include "histogram.h"
+#include "image.h"
+#include "light.h"
+#include "lines.h"
+#include "dlist.h"
+#include "macros.h"
+#include "matrix.h"
+#include "pixel.h"
+#include "points.h"
+#include "polygon.h"
+#include "state.h"
+#include "texobj.h"
+#include "teximage.h"
+#include "texstate.h"
+#include "mtypes.h"
+#include "varray.h"
+#if FEATURE_NV_vertex_program || FEATURE_NV_fragment_program
+#include "nvprogram.h"
+#include "program.h"
+#endif
+
+#include "math/m_matrix.h"
+#include "math/m_xform.h"
+
+
+/**
+ * Flush vertices.
+ *
+ * \param ctx GL context.
+ *
+ * Checks if dd_function_table::SaveNeedFlush is marked to flush
+ * stored (save) vertices, and calls
+ * dd_function_table::SaveFlushVertices if so.
+ */
+#define SAVE_FLUSH_VERTICES(ctx)		\
+do {						\
+   if (ctx->Driver.SaveNeedFlush)		\
+      ctx->Driver.SaveFlushVertices(ctx);	\
+} while (0)
+
+
+/**
+ * Macro to assert that the API call was made outside the
+ * glBegin()/glEnd() pair, with return value.
+ * 
+ * \param ctx GL context.
+ * \param retval value to return value in case the assertion fails.
+ */
+#define ASSERT_OUTSIDE_SAVE_BEGIN_END_WITH_RETVAL(ctx, retval)		\
+do {									\
+   if (ctx->Driver.CurrentSavePrimitive <= GL_POLYGON ||		\
+       ctx->Driver.CurrentSavePrimitive == PRIM_INSIDE_UNKNOWN_PRIM) {	\
+      _mesa_compile_error( ctx, GL_INVALID_OPERATION, "begin/end" );	\
+      return retval;							\
+   }									\
+} while (0)
+
+/**
+ * Macro to assert that the API call was made outside the
+ * glBegin()/glEnd() pair.
+ * 
+ * \param ctx GL context.
+ */
+#define ASSERT_OUTSIDE_SAVE_BEGIN_END(ctx)				\
+do {									\
+   if (ctx->Driver.CurrentSavePrimitive <= GL_POLYGON ||		\
+       ctx->Driver.CurrentSavePrimitive == PRIM_INSIDE_UNKNOWN_PRIM) {	\
+      _mesa_compile_error( ctx, GL_INVALID_OPERATION, "begin/end" );	\
+      return;								\
+   }									\
+} while (0)
+
+/**
+ * Macro to assert that the API call was made outside the
+ * glBegin()/glEnd() pair and flush the vertices.
+ * 
+ * \param ctx GL context.
+ */
+#define ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx)			\
+do {									\
+   ASSERT_OUTSIDE_SAVE_BEGIN_END(ctx);					\
+   SAVE_FLUSH_VERTICES(ctx);						\
+} while (0)
+
+/**
+ * Macro to assert that the API call was made outside the
+ * glBegin()/glEnd() pair and flush the vertices, with return value.
+ * 
+ * \param ctx GL context.
+ * \param retval value to return value in case the assertion fails.
+ */
+#define ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH_WITH_RETVAL(ctx, retval)\
+do {									\
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_WITH_RETVAL(ctx, retval);		\
+   SAVE_FLUSH_VERTICES(ctx);						\
+} while (0)
+
+
+
+/**
+ * Display list opcodes.
+ *
+ * The fact that these identifiers are assigned consecutive
+ * integer values starting at 0 is very important, see InstSize array usage)
+ */
+typedef enum {
+	OPCODE_ACCUM,
+	OPCODE_ALPHA_FUNC,
+        OPCODE_BIND_TEXTURE,
+	OPCODE_BITMAP,
+	OPCODE_BLEND_COLOR,
+	OPCODE_BLEND_EQUATION,
+	OPCODE_BLEND_FUNC,
+	OPCODE_BLEND_FUNC_SEPARATE,
+        OPCODE_CALL_LIST,
+        OPCODE_CALL_LIST_OFFSET,
+	OPCODE_CLEAR,
+	OPCODE_CLEAR_ACCUM,
+	OPCODE_CLEAR_COLOR,
+	OPCODE_CLEAR_DEPTH,
+	OPCODE_CLEAR_INDEX,
+	OPCODE_CLEAR_STENCIL,
+        OPCODE_CLIP_PLANE,
+	OPCODE_COLOR_MASK,
+	OPCODE_COLOR_MATERIAL,
+	OPCODE_COLOR_TABLE,
+	OPCODE_COLOR_TABLE_PARAMETER_FV,
+	OPCODE_COLOR_TABLE_PARAMETER_IV,
+	OPCODE_COLOR_SUB_TABLE,
+        OPCODE_CONVOLUTION_FILTER_1D,
+        OPCODE_CONVOLUTION_FILTER_2D,
+        OPCODE_CONVOLUTION_PARAMETER_I,
+        OPCODE_CONVOLUTION_PARAMETER_IV,
+        OPCODE_CONVOLUTION_PARAMETER_F,
+        OPCODE_CONVOLUTION_PARAMETER_FV,
+        OPCODE_COPY_COLOR_SUB_TABLE,
+        OPCODE_COPY_COLOR_TABLE,
+	OPCODE_COPY_PIXELS,
+        OPCODE_COPY_TEX_IMAGE1D,
+        OPCODE_COPY_TEX_IMAGE2D,
+        OPCODE_COPY_TEX_SUB_IMAGE1D,
+        OPCODE_COPY_TEX_SUB_IMAGE2D,
+        OPCODE_COPY_TEX_SUB_IMAGE3D,
+	OPCODE_CULL_FACE,
+	OPCODE_DEPTH_FUNC,
+	OPCODE_DEPTH_MASK,
+	OPCODE_DEPTH_RANGE,
+	OPCODE_DISABLE,
+	OPCODE_DRAW_BUFFER,
+	OPCODE_DRAW_PIXELS,
+	OPCODE_ENABLE,
+	OPCODE_EVALMESH1,
+	OPCODE_EVALMESH2,
+	OPCODE_FOG,
+	OPCODE_FRONT_FACE,
+	OPCODE_FRUSTUM,
+	OPCODE_HINT,
+	OPCODE_HISTOGRAM,
+	OPCODE_INDEX_MASK,
+	OPCODE_INIT_NAMES,
+	OPCODE_LIGHT,
+	OPCODE_LIGHT_MODEL,
+	OPCODE_LINE_STIPPLE,
+	OPCODE_LINE_WIDTH,
+	OPCODE_LIST_BASE,
+	OPCODE_LOAD_IDENTITY,
+	OPCODE_LOAD_MATRIX,
+	OPCODE_LOAD_NAME,
+	OPCODE_LOGIC_OP,
+	OPCODE_MAP1,
+	OPCODE_MAP2,
+	OPCODE_MAPGRID1,
+	OPCODE_MAPGRID2,
+	OPCODE_MATRIX_MODE,
+        OPCODE_MIN_MAX,
+	OPCODE_MULT_MATRIX,
+	OPCODE_ORTHO,
+	OPCODE_PASSTHROUGH,
+	OPCODE_PIXEL_MAP,
+	OPCODE_PIXEL_TRANSFER,
+	OPCODE_PIXEL_ZOOM,
+	OPCODE_POINT_SIZE,
+        OPCODE_POINT_PARAMETERS,
+	OPCODE_POLYGON_MODE,
+        OPCODE_POLYGON_STIPPLE,
+	OPCODE_POLYGON_OFFSET,
+	OPCODE_POP_ATTRIB,
+	OPCODE_POP_MATRIX,
+	OPCODE_POP_NAME,
+	OPCODE_PRIORITIZE_TEXTURE,
+	OPCODE_PUSH_ATTRIB,
+	OPCODE_PUSH_MATRIX,
+	OPCODE_PUSH_NAME,
+	OPCODE_RASTER_POS,
+	OPCODE_READ_BUFFER,
+        OPCODE_RESET_HISTOGRAM,
+        OPCODE_RESET_MIN_MAX,
+        OPCODE_ROTATE,
+        OPCODE_SCALE,
+	OPCODE_SCISSOR,
+	OPCODE_SELECT_TEXTURE_SGIS,
+	OPCODE_SELECT_TEXTURE_COORD_SET,
+	OPCODE_SHADE_MODEL,
+	OPCODE_STENCIL_FUNC,
+	OPCODE_STENCIL_MASK,
+	OPCODE_STENCIL_OP,
+        OPCODE_TEXENV,
+        OPCODE_TEXGEN,
+        OPCODE_TEXPARAMETER,
+	OPCODE_TEX_IMAGE1D,
+	OPCODE_TEX_IMAGE2D,
+	OPCODE_TEX_IMAGE3D,
+	OPCODE_TEX_SUB_IMAGE1D,
+	OPCODE_TEX_SUB_IMAGE2D,
+	OPCODE_TEX_SUB_IMAGE3D,
+        OPCODE_TRANSLATE,
+	OPCODE_VIEWPORT,
+	OPCODE_WINDOW_POS,
+        /* GL_ARB_multitexture */
+        OPCODE_ACTIVE_TEXTURE,
+        /* GL_SGIX/SGIS_pixel_texture */
+        OPCODE_PIXEL_TEXGEN_SGIX,
+        OPCODE_PIXEL_TEXGEN_PARAMETER_SGIS,
+        /* GL_ARB_texture_compression */
+        OPCODE_COMPRESSED_TEX_IMAGE_1D,
+        OPCODE_COMPRESSED_TEX_IMAGE_2D,
+        OPCODE_COMPRESSED_TEX_IMAGE_3D,
+        OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D,
+        OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D,
+        OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D,
+        /* GL_ARB_multisample */
+        OPCODE_SAMPLE_COVERAGE,
+        /* GL_ARB_window_pos */
+	OPCODE_WINDOW_POS_ARB,
+        /* GL_NV_vertex_program */
+        OPCODE_BIND_PROGRAM_NV,
+        OPCODE_EXECUTE_PROGRAM_NV,
+        OPCODE_REQUEST_RESIDENT_PROGRAMS_NV,
+        OPCODE_LOAD_PROGRAM_NV,
+        OPCODE_PROGRAM_PARAMETER4F_NV,
+        OPCODE_TRACK_MATRIX_NV,
+        /* GL_NV_fragment_program */
+        OPCODE_PROGRAM_LOCAL_PARAMETER_ARB,
+        OPCODE_PROGRAM_NAMED_PARAMETER_NV,
+        /* GL_EXT_stencil_two_side */
+        OPCODE_ACTIVE_STENCIL_FACE_EXT,
+        /* GL_EXT_depth_bounds_test */
+        OPCODE_DEPTH_BOUNDS_EXT,
+        /* GL_ARB_vertex/fragment_program */
+        OPCODE_PROGRAM_STRING_ARB,
+        OPCODE_PROGRAM_ENV_PARAMETER_ARB,
+
+
+	/* Vertex attributes -- fallback for when optimized display
+	 * list build isn't active.
+	 */
+	OPCODE_ATTR_1F,
+	OPCODE_ATTR_2F,
+	OPCODE_ATTR_3F,
+	OPCODE_ATTR_4F,
+	OPCODE_MATERIAL,
+	OPCODE_INDEX,
+	OPCODE_EDGEFLAG,
+	OPCODE_BEGIN,
+	OPCODE_END,
+	OPCODE_RECTF,
+	OPCODE_EVAL_C1,
+	OPCODE_EVAL_C2,
+	OPCODE_EVAL_P1,
+	OPCODE_EVAL_P2,
+
+
+	/* The following three are meta instructions */
+	OPCODE_ERROR,	        /* raise compiled-in error */
+	OPCODE_CONTINUE,
+	OPCODE_END_OF_LIST,
+	OPCODE_DRV_0
+} OpCode;
+
+
+
+/**
+ * Display list node.
+ *
+ * Display list instructions are stored as sequences of "nodes".  Nodes
+ * are allocated in blocks.  Each block has BLOCK_SIZE nodes.  Blocks
+ * are linked together with a pointer.
+ *
+ * Each instruction in the display list is stored as a sequence of
+ * contiguous nodes in memory.
+ * Each node is the union of a variety of data types.
+ */
+union node {
+	OpCode		opcode;
+	GLboolean	b;
+	GLbitfield	bf;
+	GLubyte		ub;
+	GLshort		s;
+	GLushort	us;
+	GLint		i;
+	GLuint		ui;
+	GLenum		e;
+	GLfloat		f;
+	GLvoid		*data;
+	void		*next;	/* If prev node's opcode==OPCODE_CONTINUE */
+};
+
+
+/**
+ * How many nodes to allocate at a time.
+ *
+ * \note Reduced now that we hold vertices etc. elsewhere.
+ */
+#define BLOCK_SIZE 256
+
+
+
+/**
+ * Number of nodes of storage needed for each instruction.
+ * Sizes for dynamically allocated opcodes are stored in the context struct.
+ */
+static GLuint InstSize[ OPCODE_END_OF_LIST+1 ];
+
+void mesa_print_display_list( GLuint list );
+
+
+/**********************************************************************/
+/*****                           Private                          *****/
+/**********************************************************************/
+
+/*
+ * Make an empty display list.  This is used by glGenLists() to
+ * reserver display list IDs.
+ */
+static Node *make_empty_list( void )
+{
+   Node *n = (Node *) MALLOC( sizeof(Node) );
+   n[0].opcode = OPCODE_END_OF_LIST;
+   return n;
+}
+
+
+
+/*
+ * Destroy all nodes in a display list.
+ * \param list - display list number
+ */
+void _mesa_destroy_list( GLcontext *ctx, GLuint list )
+{
+   Node *n, *block;
+   GLboolean done;
+
+   if (list==0)
+      return;
+
+   block = (Node *) _mesa_HashLookup(ctx->Shared->DisplayList, list);
+   n = block;
+
+   done = block ? GL_FALSE : GL_TRUE;
+   while (!done) {
+
+      /* check for extension opcodes first */
+
+      GLint i = (GLint) n[0].opcode - (GLint) OPCODE_DRV_0;
+      if (i >= 0 && i < (GLint) ctx->listext.nr_opcodes) {
+	 ctx->listext.opcode[i].destroy(ctx, &n[1]);
+	 n += ctx->listext.opcode[i].size;
+      }
+      else {
+	 switch (n[0].opcode) {
+         /* for some commands, we need to free malloc'd memory */
+	 case OPCODE_MAP1:
+            FREE(n[6].data);
+	    n += InstSize[n[0].opcode];
+	    break;
+	 case OPCODE_MAP2:
+            FREE(n[10].data);
+	    n += InstSize[n[0].opcode];
+	    break;
+	 case OPCODE_DRAW_PIXELS:
+	    FREE( n[5].data );
+	    n += InstSize[n[0].opcode];
+	    break;
+	 case OPCODE_BITMAP:
+	    FREE( n[7].data );
+	    n += InstSize[n[0].opcode];
+	    break;
+         case OPCODE_COLOR_TABLE:
+            FREE( n[6].data );
+            n += InstSize[n[0].opcode];
+            break;
+         case OPCODE_COLOR_SUB_TABLE:
+            FREE( n[6].data );
+            n += InstSize[n[0].opcode];
+            break;
+         case OPCODE_CONVOLUTION_FILTER_1D:
+            FREE( n[6].data );
+            n += InstSize[n[0].opcode];
+            break;
+         case OPCODE_CONVOLUTION_FILTER_2D:
+            FREE( n[7].data );
+            n += InstSize[n[0].opcode];
+            break;
+         case OPCODE_POLYGON_STIPPLE:
+            FREE( n[1].data );
+	    n += InstSize[n[0].opcode];
+            break;
+	 case OPCODE_TEX_IMAGE1D:
+            FREE(n[8].data);
+            n += InstSize[n[0].opcode];
+	    break;
+	 case OPCODE_TEX_IMAGE2D:
+            FREE( n[9]. data );
+            n += InstSize[n[0].opcode];
+	    break;
+	 case OPCODE_TEX_IMAGE3D:
+            FREE( n[10]. data );
+            n += InstSize[n[0].opcode];
+	    break;
+         case OPCODE_TEX_SUB_IMAGE1D:
+            FREE(n[7].data);
+            n += InstSize[n[0].opcode];
+            break;
+         case OPCODE_TEX_SUB_IMAGE2D:
+            FREE(n[9].data);
+            n += InstSize[n[0].opcode];
+            break;
+         case OPCODE_TEX_SUB_IMAGE3D:
+            FREE(n[11].data);
+            n += InstSize[n[0].opcode];
+            break;
+         case OPCODE_COMPRESSED_TEX_IMAGE_1D:
+            FREE(n[7].data);
+            n += InstSize[n[0].opcode];
+            break;
+         case OPCODE_COMPRESSED_TEX_IMAGE_2D:
+            FREE(n[8].data);
+            n += InstSize[n[0].opcode];
+            break;
+         case OPCODE_COMPRESSED_TEX_IMAGE_3D:
+            FREE(n[9].data);
+            n += InstSize[n[0].opcode];
+            break;
+         case OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D:
+            FREE(n[7].data);
+            n += InstSize[n[0].opcode];
+            break;
+         case OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D:
+            FREE(n[9].data);
+            n += InstSize[n[0].opcode];
+            break;
+         case OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D:
+            FREE(n[11].data);
+            n += InstSize[n[0].opcode];
+            break;
+#if FEATURE_NV_vertex_program
+         case OPCODE_LOAD_PROGRAM_NV:
+            FREE(n[4].data);  /* program string */
+            n += InstSize[n[0].opcode];
+            break;
+         case OPCODE_REQUEST_RESIDENT_PROGRAMS_NV:
+            FREE(n[2].data);  /* array of program ids */
+            n += InstSize[n[0].opcode];
+            break;
+#endif
+#if FEATURE_NV_fragment_program
+         case OPCODE_PROGRAM_NAMED_PARAMETER_NV:
+            FREE(n[3].data);  /* parameter name */
+            n += InstSize[n[0].opcode];
+            break;
+#endif
+#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
+         case OPCODE_PROGRAM_STRING_ARB:
+            FREE(n[4].data);  /* program string */
+            n += InstSize[n[0].opcode];
+            break;
+#endif
+	 case OPCODE_CONTINUE:
+	    n = (Node *) n[1].next;
+	    FREE( block );
+	    block = n;
+	    break;
+	 case OPCODE_END_OF_LIST:
+	    FREE( block );
+	    done = GL_TRUE;
+	    break;
+	 default:
+	    /* Most frequent case */
+	    n += InstSize[n[0].opcode];
+	    break;
+	 }
+      }
+   }
+
+   _mesa_HashRemove(ctx->Shared->DisplayList, list);
+}
+
+
+
+/*
+ * Translate the nth element of list from type to GLuint.
+ */
+static GLuint translate_id( GLsizei n, GLenum type, const GLvoid *list )
+{
+   GLbyte *bptr;
+   GLubyte *ubptr;
+   GLshort *sptr;
+   GLushort *usptr;
+   GLint *iptr;
+   GLuint *uiptr;
+   GLfloat *fptr;
+
+   switch (type) {
+      case GL_BYTE:
+         bptr = (GLbyte *) list;
+         return (GLuint) *(bptr+n);
+      case GL_UNSIGNED_BYTE:
+         ubptr = (GLubyte *) list;
+         return (GLuint) *(ubptr+n);
+      case GL_SHORT:
+         sptr = (GLshort *) list;
+         return (GLuint) *(sptr+n);
+      case GL_UNSIGNED_SHORT:
+         usptr = (GLushort *) list;
+         return (GLuint) *(usptr+n);
+      case GL_INT:
+         iptr = (GLint *) list;
+         return (GLuint) *(iptr+n);
+      case GL_UNSIGNED_INT:
+         uiptr = (GLuint *) list;
+         return (GLuint) *(uiptr+n);
+      case GL_FLOAT:
+         fptr = (GLfloat *) list;
+         return (GLuint) *(fptr+n);
+      case GL_2_BYTES:
+         ubptr = ((GLubyte *) list) + 2*n;
+         return (GLuint) *ubptr * 256 + (GLuint) *(ubptr+1);
+      case GL_3_BYTES:
+         ubptr = ((GLubyte *) list) + 3*n;
+         return (GLuint) *ubptr * 65536
+              + (GLuint) *(ubptr+1) * 256
+              + (GLuint) *(ubptr+2);
+      case GL_4_BYTES:
+         ubptr = ((GLubyte *) list) + 4*n;
+         return (GLuint) *ubptr * 16777216
+              + (GLuint) *(ubptr+1) * 65536
+              + (GLuint) *(ubptr+2) * 256
+              + (GLuint) *(ubptr+3);
+      default:
+         return 0;
+   }
+}
+
+
+
+
+/**********************************************************************/
+/*****                        Public                              *****/
+/**********************************************************************/
+
+void _mesa_init_lists( void )
+{
+   static int init_flag = 0;
+
+   if (init_flag==0) {
+      InstSize[OPCODE_ACCUM] = 3;
+      InstSize[OPCODE_ALPHA_FUNC] = 3;
+      InstSize[OPCODE_BIND_TEXTURE] = 3;
+      InstSize[OPCODE_BITMAP] = 8;
+      InstSize[OPCODE_BLEND_COLOR] = 5;
+      InstSize[OPCODE_BLEND_EQUATION] = 2;
+      InstSize[OPCODE_BLEND_FUNC] = 3;
+      InstSize[OPCODE_BLEND_FUNC_SEPARATE] = 5;
+      InstSize[OPCODE_CALL_LIST] = 2;
+      InstSize[OPCODE_CALL_LIST_OFFSET] = 3;
+      InstSize[OPCODE_CLEAR] = 2;
+      InstSize[OPCODE_CLEAR_ACCUM] = 5;
+      InstSize[OPCODE_CLEAR_COLOR] = 5;
+      InstSize[OPCODE_CLEAR_DEPTH] = 2;
+      InstSize[OPCODE_CLEAR_INDEX] = 2;
+      InstSize[OPCODE_CLEAR_STENCIL] = 2;
+      InstSize[OPCODE_CLIP_PLANE] = 6;
+      InstSize[OPCODE_COLOR_MASK] = 5;
+      InstSize[OPCODE_COLOR_MATERIAL] = 3;
+      InstSize[OPCODE_COLOR_TABLE] = 7;
+      InstSize[OPCODE_COLOR_TABLE_PARAMETER_FV] = 7;
+      InstSize[OPCODE_COLOR_TABLE_PARAMETER_IV] = 7;
+      InstSize[OPCODE_COLOR_SUB_TABLE] = 7;
+      InstSize[OPCODE_CONVOLUTION_FILTER_1D] = 7;
+      InstSize[OPCODE_CONVOLUTION_FILTER_2D] = 8;
+      InstSize[OPCODE_CONVOLUTION_PARAMETER_I] = 4;
+      InstSize[OPCODE_CONVOLUTION_PARAMETER_IV] = 7;
+      InstSize[OPCODE_CONVOLUTION_PARAMETER_F] = 4;
+      InstSize[OPCODE_CONVOLUTION_PARAMETER_FV] = 7;
+      InstSize[OPCODE_COPY_PIXELS] = 6;
+      InstSize[OPCODE_COPY_COLOR_SUB_TABLE] = 6;
+      InstSize[OPCODE_COPY_COLOR_TABLE] = 6;
+      InstSize[OPCODE_COPY_TEX_IMAGE1D] = 8;
+      InstSize[OPCODE_COPY_TEX_IMAGE2D] = 9;
+      InstSize[OPCODE_COPY_TEX_SUB_IMAGE1D] = 7;
+      InstSize[OPCODE_COPY_TEX_SUB_IMAGE2D] = 9;
+      InstSize[OPCODE_COPY_TEX_SUB_IMAGE3D] = 10;
+      InstSize[OPCODE_CULL_FACE] = 2;
+      InstSize[OPCODE_DEPTH_FUNC] = 2;
+      InstSize[OPCODE_DEPTH_MASK] = 2;
+      InstSize[OPCODE_DEPTH_RANGE] = 3;
+      InstSize[OPCODE_DISABLE] = 2;
+      InstSize[OPCODE_DRAW_BUFFER] = 2;
+      InstSize[OPCODE_DRAW_PIXELS] = 6;
+      InstSize[OPCODE_ENABLE] = 2;
+      InstSize[OPCODE_EVALMESH1] = 4;
+      InstSize[OPCODE_EVALMESH2] = 6;
+      InstSize[OPCODE_FOG] = 6;
+      InstSize[OPCODE_FRONT_FACE] = 2;
+      InstSize[OPCODE_FRUSTUM] = 7;
+      InstSize[OPCODE_HINT] = 3;
+      InstSize[OPCODE_HISTOGRAM] = 5;
+      InstSize[OPCODE_INDEX_MASK] = 2;
+      InstSize[OPCODE_INIT_NAMES] = 1;
+      InstSize[OPCODE_LIGHT] = 7;
+      InstSize[OPCODE_LIGHT_MODEL] = 6;
+      InstSize[OPCODE_LINE_STIPPLE] = 3;
+      InstSize[OPCODE_LINE_WIDTH] = 2;
+      InstSize[OPCODE_LIST_BASE] = 2;
+      InstSize[OPCODE_LOAD_IDENTITY] = 1;
+      InstSize[OPCODE_LOAD_MATRIX] = 17;
+      InstSize[OPCODE_LOAD_NAME] = 2;
+      InstSize[OPCODE_LOGIC_OP] = 2;
+      InstSize[OPCODE_MAP1] = 7;
+      InstSize[OPCODE_MAP2] = 11;
+      InstSize[OPCODE_MAPGRID1] = 4;
+      InstSize[OPCODE_MAPGRID2] = 7;
+      InstSize[OPCODE_MATRIX_MODE] = 2;
+      InstSize[OPCODE_MIN_MAX] = 4;
+      InstSize[OPCODE_MULT_MATRIX] = 17;
+      InstSize[OPCODE_ORTHO] = 7;
+      InstSize[OPCODE_PASSTHROUGH] = 2;
+      InstSize[OPCODE_PIXEL_MAP] = 4;
+      InstSize[OPCODE_PIXEL_TRANSFER] = 3;
+      InstSize[OPCODE_PIXEL_ZOOM] = 3;
+      InstSize[OPCODE_POINT_SIZE] = 2;
+      InstSize[OPCODE_POINT_PARAMETERS] = 5;
+      InstSize[OPCODE_POLYGON_MODE] = 3;
+      InstSize[OPCODE_POLYGON_STIPPLE] = 2;
+      InstSize[OPCODE_POLYGON_OFFSET] = 3;
+      InstSize[OPCODE_POP_ATTRIB] = 1;
+      InstSize[OPCODE_POP_MATRIX] = 1;
+      InstSize[OPCODE_POP_NAME] = 1;
+      InstSize[OPCODE_PRIORITIZE_TEXTURE] = 3;
+      InstSize[OPCODE_PUSH_ATTRIB] = 2;
+      InstSize[OPCODE_PUSH_MATRIX] = 1;
+      InstSize[OPCODE_PUSH_NAME] = 2;
+      InstSize[OPCODE_RASTER_POS] = 5;
+      InstSize[OPCODE_READ_BUFFER] = 2;
+      InstSize[OPCODE_RESET_HISTOGRAM] = 2;
+      InstSize[OPCODE_RESET_MIN_MAX] = 2;
+      InstSize[OPCODE_ROTATE] = 5;
+      InstSize[OPCODE_SCALE] = 4;
+      InstSize[OPCODE_SCISSOR] = 5;
+      InstSize[OPCODE_STENCIL_FUNC] = 4;
+      InstSize[OPCODE_STENCIL_MASK] = 2;
+      InstSize[OPCODE_STENCIL_OP] = 4;
+      InstSize[OPCODE_SHADE_MODEL] = 2;
+      InstSize[OPCODE_TEXENV] = 7;
+      InstSize[OPCODE_TEXGEN] = 7;
+      InstSize[OPCODE_TEXPARAMETER] = 7;
+      InstSize[OPCODE_TEX_IMAGE1D] = 9;
+      InstSize[OPCODE_TEX_IMAGE2D] = 10;
+      InstSize[OPCODE_TEX_IMAGE3D] = 11;
+      InstSize[OPCODE_TEX_SUB_IMAGE1D] = 8;
+      InstSize[OPCODE_TEX_SUB_IMAGE2D] = 10;
+      InstSize[OPCODE_TEX_SUB_IMAGE3D] = 12;
+      InstSize[OPCODE_TRANSLATE] = 4;
+      InstSize[OPCODE_VIEWPORT] = 5;
+      InstSize[OPCODE_WINDOW_POS] = 5;
+      InstSize[OPCODE_CONTINUE] = 2;
+      InstSize[OPCODE_ERROR] = 3;
+      InstSize[OPCODE_END_OF_LIST] = 1;
+      /* GL_SGIX/SGIS_pixel_texture */
+      InstSize[OPCODE_PIXEL_TEXGEN_SGIX] = 2;
+      InstSize[OPCODE_PIXEL_TEXGEN_PARAMETER_SGIS] = 3;
+      /* GL_ARB_texture_compression */
+      InstSize[OPCODE_COMPRESSED_TEX_IMAGE_1D] = 8;
+      InstSize[OPCODE_COMPRESSED_TEX_IMAGE_2D] = 9;
+      InstSize[OPCODE_COMPRESSED_TEX_IMAGE_3D] = 10;
+      InstSize[OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D] = 8;
+      InstSize[OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D] = 10;
+      InstSize[OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D] = 12;
+      /* GL_ARB_multisample */
+      InstSize[OPCODE_SAMPLE_COVERAGE] = 3;
+      /* GL_ARB_multitexture */
+      InstSize[OPCODE_ACTIVE_TEXTURE] = 2;
+      /* GL_ARB_window_pos */
+      InstSize[OPCODE_WINDOW_POS_ARB] = 4;
+      /* GL_NV_vertex_program */
+      InstSize[OPCODE_BIND_PROGRAM_NV] = 3;
+      InstSize[OPCODE_EXECUTE_PROGRAM_NV] = 7;
+      InstSize[OPCODE_REQUEST_RESIDENT_PROGRAMS_NV] = 2;
+      InstSize[OPCODE_LOAD_PROGRAM_NV] = 5;
+      InstSize[OPCODE_PROGRAM_PARAMETER4F_NV] = 7;
+      InstSize[OPCODE_TRACK_MATRIX_NV] = 5;
+      /* GL_NV_fragment_program */
+      InstSize[OPCODE_PROGRAM_LOCAL_PARAMETER_ARB] = 7;
+      InstSize[OPCODE_PROGRAM_NAMED_PARAMETER_NV] = 8;
+      /* GL_EXT_stencil_two_side */
+      InstSize[OPCODE_ACTIVE_STENCIL_FACE_EXT] = 2;
+      /* GL_EXT_depth_bounds_test */
+      InstSize[OPCODE_DEPTH_BOUNDS_EXT] = 3;
+#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
+      InstSize[OPCODE_PROGRAM_STRING_ARB] = 5;
+      InstSize[OPCODE_PROGRAM_ENV_PARAMETER_ARB] = 7;
+#endif
+      InstSize[OPCODE_ATTR_1F] = 3;
+      InstSize[OPCODE_ATTR_2F] = 4;
+      InstSize[OPCODE_ATTR_3F] = 5;
+      InstSize[OPCODE_ATTR_4F] = 6;
+      InstSize[OPCODE_MATERIAL] = 7;
+      InstSize[OPCODE_INDEX] = 2;
+      InstSize[OPCODE_EDGEFLAG] = 2;
+      InstSize[OPCODE_BEGIN] = 2;
+      InstSize[OPCODE_END] = 1;
+      InstSize[OPCODE_RECTF] = 5;
+      InstSize[OPCODE_EVAL_C1] = 2;
+      InstSize[OPCODE_EVAL_C2] = 3;
+      InstSize[OPCODE_EVAL_P1] = 2;
+      InstSize[OPCODE_EVAL_P2] = 3;
+   }
+   init_flag = 1;
+}
+
+
+/*
+ * Allocate space for a display list instruction.
+ * \param opcode - type of instruction
+ *         argcount - size in bytes of data required.
+ * \return pointer to the usable data area (not including the internal
+ *         opcode).
+ */
+void *
+_mesa_alloc_instruction( GLcontext *ctx, int opcode, GLint sz )
+{
+   Node *n, *newblock;
+   GLuint count = 1 + (sz + sizeof(Node) - 1) / sizeof(Node);
+
+#ifdef DEBUG
+   if (opcode < (int) OPCODE_DRV_0) {
+      assert( count == InstSize[opcode] );
+   }
+#endif
+
+   if (ctx->ListState.CurrentPos + count + 2 > BLOCK_SIZE) {
+      /* This block is full.  Allocate a new block and chain to it */
+      n = ctx->ListState.CurrentBlock + ctx->ListState.CurrentPos;
+      n[0].opcode = OPCODE_CONTINUE;
+      newblock = (Node *) MALLOC( sizeof(Node) * BLOCK_SIZE );
+      if (!newblock) {
+         _mesa_error( ctx, GL_OUT_OF_MEMORY, "Building display list" );
+         return NULL;
+      }
+      n[1].next = (Node *) newblock;
+      ctx->ListState.CurrentBlock = newblock;
+      ctx->ListState.CurrentPos = 0;
+   }
+
+   n = ctx->ListState.CurrentBlock + ctx->ListState.CurrentPos;
+   ctx->ListState.CurrentPos += count;
+
+   n[0].opcode = (OpCode) opcode;
+
+   return (void *)&n[1];
+}
+
+
+/* Allow modules and drivers to get their own opcodes.
+ */
+int
+_mesa_alloc_opcode( GLcontext *ctx,
+		    GLuint sz,
+		    void (*execute)( GLcontext *, void * ),
+		    void (*destroy)( GLcontext *, void * ),
+		    void (*print)( GLcontext *, void * ) )
+{
+   if (ctx->listext.nr_opcodes < GL_MAX_EXT_OPCODES) {
+      GLuint i = ctx->listext.nr_opcodes++;
+      ctx->listext.opcode[i].size = 1 + (sz + sizeof(Node) - 1)/sizeof(Node);
+      ctx->listext.opcode[i].execute = execute;
+      ctx->listext.opcode[i].destroy = destroy;
+      ctx->listext.opcode[i].print = print;
+      return i + OPCODE_DRV_0;
+   }
+   return -1;
+}
+
+
+
+/* Mimic the old behaviour of alloc_instruction:
+ *   - sz is in units of sizeof(Node)
+ *   - return value a pointer to sizeof(Node) before the actual
+ *     usable data area.
+ */
+#define ALLOC_INSTRUCTION(ctx, opcode, sz) \
+        ((Node *)_mesa_alloc_instruction(ctx, opcode, sz*sizeof(Node)) - 1)
+
+
+
+/*
+ * Display List compilation functions
+ */
+static void GLAPIENTRY save_Accum( GLenum op, GLfloat value )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_ACCUM, 2 );
+   if (n) {
+      n[1].e = op;
+      n[2].f = value;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->Accum)( op, value );
+   }
+}
+
+
+static void GLAPIENTRY save_AlphaFunc( GLenum func, GLclampf ref )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_ALPHA_FUNC, 2 );
+   if (n) {
+      n[1].e = func;
+      n[2].f = (GLfloat) ref;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->AlphaFunc)( func, ref );
+   }
+}
+
+
+static void GLAPIENTRY save_BindTexture( GLenum target, GLuint texture )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_BIND_TEXTURE, 2 );
+   if (n) {
+      n[1].e = target;
+      n[2].ui = texture;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->BindTexture)( target, texture );
+   }
+}
+
+
+static void GLAPIENTRY save_Bitmap( GLsizei width, GLsizei height,
+                         GLfloat xorig, GLfloat yorig,
+                         GLfloat xmove, GLfloat ymove,
+                         const GLubyte *pixels )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLvoid *image = _mesa_unpack_bitmap( width, height, pixels, &ctx->Unpack );
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_BITMAP, 7 );
+   if (n) {
+      n[1].i = (GLint) width;
+      n[2].i = (GLint) height;
+      n[3].f = xorig;
+      n[4].f = yorig;
+      n[5].f = xmove;
+      n[6].f = ymove;
+      n[7].data = image;
+   }
+   else if (image) {
+      FREE(image);
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->Bitmap)( width, height,
+                           xorig, yorig, xmove, ymove, pixels );
+   }
+}
+
+
+static void GLAPIENTRY save_BlendEquation( GLenum mode )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_BLEND_EQUATION, 1 );
+   if (n) {
+      n[1].e = mode;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->BlendEquation)( mode );
+   }
+}
+
+
+static void GLAPIENTRY save_BlendFunc( GLenum sfactor, GLenum dfactor )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_BLEND_FUNC, 2 );
+   if (n) {
+      n[1].e = sfactor;
+      n[2].e = dfactor;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->BlendFunc)( sfactor, dfactor );
+   }
+}
+
+
+static void GLAPIENTRY save_BlendFuncSeparateEXT(GLenum sfactorRGB, GLenum dfactorRGB,
+                                      GLenum sfactorA, GLenum dfactorA)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_BLEND_FUNC_SEPARATE, 4 );
+   if (n) {
+      n[1].e = sfactorRGB;
+      n[2].e = dfactorRGB;
+      n[3].e = sfactorA;
+      n[4].e = dfactorA;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->BlendFuncSeparateEXT)( sfactorRGB, dfactorRGB,
+                                          sfactorA, dfactorA);
+   }
+}
+
+
+static void GLAPIENTRY save_BlendColor( GLfloat red, GLfloat green,
+                             GLfloat blue, GLfloat alpha )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_BLEND_COLOR, 4 );
+   if (n) {
+      n[1].f = red;
+      n[2].f = green;
+      n[3].f = blue;
+      n[4].f = alpha;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->BlendColor)( red, green, blue, alpha );
+   }
+}
+
+
+void GLAPIENTRY _mesa_save_CallList( GLuint list )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   SAVE_FLUSH_VERTICES(ctx);
+
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_CALL_LIST, 1 );
+   if (n) {
+      n[1].ui = list;
+   }
+   
+   /* After this, we don't know what begin/end state we're in:
+    */
+   ctx->Driver.CurrentSavePrimitive = PRIM_UNKNOWN;
+
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->CallList)( list );
+   }
+}
+
+
+void GLAPIENTRY _mesa_save_CallLists( GLsizei n, GLenum type, const GLvoid *lists )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint i;
+   GLboolean typeErrorFlag;
+
+   SAVE_FLUSH_VERTICES(ctx);
+
+   switch (type) {
+      case GL_BYTE:
+      case GL_UNSIGNED_BYTE:
+      case GL_SHORT:
+      case GL_UNSIGNED_SHORT:
+      case GL_INT:
+      case GL_UNSIGNED_INT:
+      case GL_FLOAT:
+      case GL_2_BYTES:
+      case GL_3_BYTES:
+      case GL_4_BYTES:
+         typeErrorFlag = GL_FALSE;
+         break;
+      default:
+         typeErrorFlag = GL_TRUE;
+   }
+
+   for (i=0;i<n;i++) {
+      GLuint list = translate_id( i, type, lists );
+      Node *n = ALLOC_INSTRUCTION( ctx, OPCODE_CALL_LIST_OFFSET, 2 );
+      if (n) {
+         n[1].ui = list;
+         n[2].b = typeErrorFlag;
+      }
+   }
+
+   /* After this, we don't know what begin/end state we're in:
+    */
+   ctx->Driver.CurrentSavePrimitive = PRIM_UNKNOWN;
+
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->CallLists)( n, type, lists );
+   }
+}
+
+
+static void GLAPIENTRY save_Clear( GLbitfield mask )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_CLEAR, 1 );
+   if (n) {
+      n[1].bf = mask;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->Clear)( mask );
+   }
+}
+
+
+static void GLAPIENTRY save_ClearAccum( GLfloat red, GLfloat green,
+                             GLfloat blue, GLfloat alpha )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_CLEAR_ACCUM, 4 );
+   if (n) {
+      n[1].f = red;
+      n[2].f = green;
+      n[3].f = blue;
+      n[4].f = alpha;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ClearAccum)( red, green, blue, alpha );
+   }
+}
+
+
+static void GLAPIENTRY save_ClearColor( GLclampf red, GLclampf green,
+                             GLclampf blue, GLclampf alpha )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_CLEAR_COLOR, 4 );
+   if (n) {
+      n[1].f = red;
+      n[2].f = green;
+      n[3].f = blue;
+      n[4].f = alpha;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ClearColor)( red, green, blue, alpha );
+   }
+}
+
+
+static void GLAPIENTRY save_ClearDepth( GLclampd depth )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_CLEAR_DEPTH, 1 );
+   if (n) {
+      n[1].f = (GLfloat) depth;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ClearDepth)( depth );
+   }
+}
+
+
+static void GLAPIENTRY save_ClearIndex( GLfloat c )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_CLEAR_INDEX, 1 );
+   if (n) {
+      n[1].f = c;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ClearIndex)( c );
+   }
+}
+
+
+static void GLAPIENTRY save_ClearStencil( GLint s )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_CLEAR_STENCIL, 1 );
+   if (n) {
+      n[1].i = s;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ClearStencil)( s );
+   }
+}
+
+
+static void GLAPIENTRY save_ClipPlane( GLenum plane, const GLdouble *equ )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_CLIP_PLANE, 5 );
+   if (n) {
+      n[1].e = plane;
+      n[2].f = (GLfloat) equ[0];
+      n[3].f = (GLfloat) equ[1];
+      n[4].f = (GLfloat) equ[2];
+      n[5].f = (GLfloat) equ[3];
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ClipPlane)( plane, equ );
+   }
+}
+
+
+
+static void GLAPIENTRY save_ColorMask( GLboolean red, GLboolean green,
+                            GLboolean blue, GLboolean alpha )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_COLOR_MASK, 4 );
+   if (n) {
+      n[1].b = red;
+      n[2].b = green;
+      n[3].b = blue;
+      n[4].b = alpha;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ColorMask)( red, green, blue, alpha );
+   }
+}
+
+
+static void GLAPIENTRY save_ColorMaterial( GLenum face, GLenum mode )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_COLOR_MATERIAL, 2 );
+   if (n) {
+      n[1].e = face;
+      n[2].e = mode;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ColorMaterial)( face, mode );
+   }
+}
+
+
+static void GLAPIENTRY save_ColorTable( GLenum target, GLenum internalFormat,
+                             GLsizei width, GLenum format, GLenum type,
+                             const GLvoid *table )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (target == GL_PROXY_TEXTURE_1D ||
+       target == GL_PROXY_TEXTURE_2D ||
+       target == GL_PROXY_TEXTURE_3D ||
+       target == GL_PROXY_TEXTURE_CUBE_MAP_ARB) {
+      /* execute immediately */
+      (*ctx->Exec->ColorTable)( target, internalFormat, width,
+                                format, type, table );
+   }
+   else {
+      GLvoid *image = _mesa_unpack_image(width, 1, 1, format, type, table,
+                                         &ctx->Unpack);
+      Node *n;
+      ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+      n = ALLOC_INSTRUCTION( ctx, OPCODE_COLOR_TABLE, 6 );
+      if (n) {
+         n[1].e = target;
+         n[2].e = internalFormat;
+         n[3].i = width;
+         n[4].e = format;
+         n[5].e = type;
+         n[6].data = image;
+      }
+      else if (image) {
+         FREE(image);
+      }
+      if (ctx->ExecuteFlag) {
+         (*ctx->Exec->ColorTable)( target, internalFormat, width,
+                                   format, type, table );
+      }
+   }
+}
+
+
+
+static void GLAPIENTRY
+save_ColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_COLOR_TABLE_PARAMETER_FV, 6 );
+   if (n) {
+      n[1].e = target;
+      n[2].e = pname;
+      n[3].f = params[0];
+      if (pname == GL_COLOR_TABLE_SGI ||
+          pname == GL_POST_CONVOLUTION_COLOR_TABLE_SGI ||
+          pname == GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI ||
+          pname == GL_TEXTURE_COLOR_TABLE_SGI) {
+         n[4].f = params[1];
+         n[5].f = params[2];
+         n[6].f = params[3];
+      }
+   }
+
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ColorTableParameterfv)( target, pname, params );
+   }
+}
+
+
+static void GLAPIENTRY
+save_ColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_COLOR_TABLE_PARAMETER_IV, 6 );
+   if (n) {
+      n[1].e = target;
+      n[2].e = pname;
+      n[3].i = params[0];
+      if (pname == GL_COLOR_TABLE_SGI ||
+          pname == GL_POST_CONVOLUTION_COLOR_TABLE_SGI ||
+          pname == GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI ||
+          pname == GL_TEXTURE_COLOR_TABLE_SGI) {
+         n[4].i = params[1];
+         n[5].i = params[2];
+         n[6].i = params[3];
+      }
+   }
+
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ColorTableParameteriv)( target, pname, params );
+   }
+}
+
+
+
+static void GLAPIENTRY save_ColorSubTable( GLenum target, GLsizei start, GLsizei count,
+                                GLenum format, GLenum type,
+                                const GLvoid *table)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLvoid *image = _mesa_unpack_image(count, 1, 1, format, type, table,
+                                      &ctx->Unpack);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_COLOR_SUB_TABLE, 6 );
+   if (n) {
+      n[1].e = target;
+      n[2].i = start;
+      n[3].i = count;
+      n[4].e = format;
+      n[5].e = type;
+      n[6].data = image;
+   }
+   else if (image) {
+      FREE(image);
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ColorSubTable)(target, start, count, format, type, table);
+   }
+}
+
+
+static void GLAPIENTRY
+save_CopyColorSubTable(GLenum target, GLsizei start,
+                       GLint x, GLint y, GLsizei width)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_COPY_COLOR_SUB_TABLE, 5 );
+   if (n) {
+      n[1].e = target;
+      n[2].i = start;
+      n[3].i = x;
+      n[4].i = y;
+      n[5].i = width;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->CopyColorSubTable)(target, start, x, y, width);
+   }
+}
+
+
+static void GLAPIENTRY
+save_CopyColorTable(GLenum target, GLenum internalformat,
+                    GLint x, GLint y, GLsizei width)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_COPY_COLOR_TABLE, 5 );
+   if (n) {
+      n[1].e = target;
+      n[2].e = internalformat;
+      n[3].i = x;
+      n[4].i = y;
+      n[5].i = width;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->CopyColorTable)(target, internalformat, x, y, width);
+   }
+}
+
+
+static void GLAPIENTRY
+save_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width,
+                         GLenum format, GLenum type, const GLvoid *filter)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLvoid *image = _mesa_unpack_image(width, 1, 1, format, type, filter,
+                                      &ctx->Unpack);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_CONVOLUTION_FILTER_1D, 6 );
+   if (n) {
+      n[1].e = target;
+      n[2].e = internalFormat;
+      n[3].i = width;
+      n[4].e = format;
+      n[5].e = type;
+      n[6].data = image;
+   }
+   else if (image) {
+      FREE(image);
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ConvolutionFilter1D)( target, internalFormat, width,
+                                         format, type, filter );
+   }
+}
+
+
+static void GLAPIENTRY
+save_ConvolutionFilter2D(GLenum target, GLenum internalFormat,
+                         GLsizei width, GLsizei height, GLenum format,
+                         GLenum type, const GLvoid *filter)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLvoid *image = _mesa_unpack_image(width, height, 1, format, type, filter,
+                                      &ctx->Unpack);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_CONVOLUTION_FILTER_2D, 7 );
+   if (n) {
+      n[1].e = target;
+      n[2].e = internalFormat;
+      n[3].i = width;
+      n[4].i = height;
+      n[5].e = format;
+      n[6].e = type;
+      n[7].data = image;
+   }
+   else if (image) {
+      FREE(image);
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ConvolutionFilter2D)( target, internalFormat, width, height,
+                                         format, type, filter );
+   }
+}
+
+
+static void GLAPIENTRY
+save_ConvolutionParameteri(GLenum target, GLenum pname, GLint param)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_CONVOLUTION_PARAMETER_I, 3 );
+   if (n) {
+      n[1].e = target;
+      n[2].e = pname;
+      n[3].i = param;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ConvolutionParameteri)( target, pname, param );
+   }
+}
+
+
+static void GLAPIENTRY
+save_ConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_CONVOLUTION_PARAMETER_IV, 6 );
+   if (n) {
+      n[1].e = target;
+      n[2].e = pname;
+      n[3].i = params[0];
+      if (pname == GL_CONVOLUTION_BORDER_COLOR ||
+          pname == GL_CONVOLUTION_FILTER_SCALE ||
+          pname == GL_CONVOLUTION_FILTER_BIAS) {
+         n[4].i = params[1];
+         n[5].i = params[2];
+         n[6].i = params[3];
+      }
+      else {
+         n[4].i = n[5].i = n[6].i = 0;
+      }
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ConvolutionParameteriv)( target, pname, params );
+   }
+}
+
+
+static void GLAPIENTRY
+save_ConvolutionParameterf(GLenum target, GLenum pname, GLfloat param)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_CONVOLUTION_PARAMETER_F, 3 );
+   if (n) {
+      n[1].e = target;
+      n[2].e = pname;
+      n[3].f = param;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ConvolutionParameterf)( target, pname, param );
+   }
+}
+
+
+static void GLAPIENTRY
+save_ConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_CONVOLUTION_PARAMETER_FV, 6 );
+   if (n) {
+      n[1].e = target;
+      n[2].e = pname;
+      n[3].f = params[0];
+      if (pname == GL_CONVOLUTION_BORDER_COLOR ||
+          pname == GL_CONVOLUTION_FILTER_SCALE ||
+          pname == GL_CONVOLUTION_FILTER_BIAS) {
+         n[4].f = params[1];
+         n[5].f = params[2];
+         n[6].f = params[3];
+      }
+      else {
+         n[4].f = n[5].f = n[6].f = 0.0F;
+      }
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ConvolutionParameterfv)( target, pname, params );
+   }
+}
+
+
+static void GLAPIENTRY
+save_CopyPixels( GLint x, GLint y,
+		 GLsizei width, GLsizei height, GLenum type )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_COPY_PIXELS, 5 );
+   if (n) {
+      n[1].i = x;
+      n[2].i = y;
+      n[3].i = (GLint) width;
+      n[4].i = (GLint) height;
+      n[5].e = type;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->CopyPixels)( x, y, width, height, type );
+   }
+}
+
+
+
+static void GLAPIENTRY
+save_CopyTexImage1D( GLenum target, GLint level, GLenum internalformat,
+                     GLint x, GLint y, GLsizei width, GLint border )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_COPY_TEX_IMAGE1D, 7 );
+   if (n) {
+      n[1].e = target;
+      n[2].i = level;
+      n[3].e = internalformat;
+      n[4].i = x;
+      n[5].i = y;
+      n[6].i = width;
+      n[7].i = border;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->CopyTexImage1D)( target, level, internalformat,
+                                   x, y, width, border );
+   }
+}
+
+
+static void GLAPIENTRY
+save_CopyTexImage2D( GLenum target, GLint level,
+                     GLenum internalformat,
+                     GLint x, GLint y, GLsizei width,
+                     GLsizei height, GLint border )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_COPY_TEX_IMAGE2D, 8 );
+   if (n) {
+      n[1].e = target;
+      n[2].i = level;
+      n[3].e = internalformat;
+      n[4].i = x;
+      n[5].i = y;
+      n[6].i = width;
+      n[7].i = height;
+      n[8].i = border;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->CopyTexImage2D)( target, level, internalformat,
+                                   x, y, width, height, border );
+   }
+}
+
+
+
+static void GLAPIENTRY
+save_CopyTexSubImage1D( GLenum target, GLint level,
+                        GLint xoffset, GLint x, GLint y,
+                        GLsizei width )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_COPY_TEX_SUB_IMAGE1D, 6 );
+   if (n) {
+      n[1].e = target;
+      n[2].i = level;
+      n[3].i = xoffset;
+      n[4].i = x;
+      n[5].i = y;
+      n[6].i = width;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->CopyTexSubImage1D)( target, level, xoffset, x, y, width );
+   }
+}
+
+
+static void GLAPIENTRY
+save_CopyTexSubImage2D( GLenum target, GLint level,
+                        GLint xoffset, GLint yoffset,
+                        GLint x, GLint y,
+                        GLsizei width, GLint height )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_COPY_TEX_SUB_IMAGE2D, 8 );
+   if (n) {
+      n[1].e = target;
+      n[2].i = level;
+      n[3].i = xoffset;
+      n[4].i = yoffset;
+      n[5].i = x;
+      n[6].i = y;
+      n[7].i = width;
+      n[8].i = height;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->CopyTexSubImage2D)( target, level, xoffset, yoffset,
+                               x, y, width, height );
+   }
+}
+
+
+static void GLAPIENTRY
+save_CopyTexSubImage3D( GLenum target, GLint level,
+                        GLint xoffset, GLint yoffset, GLint zoffset,
+                        GLint x, GLint y,
+                        GLsizei width, GLint height )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_COPY_TEX_SUB_IMAGE3D, 9 );
+   if (n) {
+      n[1].e = target;
+      n[2].i = level;
+      n[3].i = xoffset;
+      n[4].i = yoffset;
+      n[5].i = zoffset;
+      n[6].i = x;
+      n[7].i = y;
+      n[8].i = width;
+      n[9].i = height;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->CopyTexSubImage3D)( target, level,
+                                      xoffset, yoffset, zoffset,
+                                      x, y, width, height );
+   }
+}
+
+
+static void GLAPIENTRY save_CullFace( GLenum mode )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_CULL_FACE, 1 );
+   if (n) {
+      n[1].e = mode;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->CullFace)( mode );
+   }
+}
+
+
+static void GLAPIENTRY save_DepthFunc( GLenum func )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_DEPTH_FUNC, 1 );
+   if (n) {
+      n[1].e = func;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->DepthFunc)( func );
+   }
+}
+
+
+static void GLAPIENTRY save_DepthMask( GLboolean mask )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_DEPTH_MASK, 1 );
+   if (n) {
+      n[1].b = mask;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->DepthMask)( mask );
+   }
+}
+
+
+static void GLAPIENTRY save_DepthRange( GLclampd nearval, GLclampd farval )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_DEPTH_RANGE, 2 );
+   if (n) {
+      n[1].f = (GLfloat) nearval;
+      n[2].f = (GLfloat) farval;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->DepthRange)( nearval, farval );
+   }
+}
+
+
+static void GLAPIENTRY save_Disable( GLenum cap )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_DISABLE, 1 );
+   if (n) {
+      n[1].e = cap;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->Disable)( cap );
+   }
+}
+
+
+static void GLAPIENTRY save_DrawBuffer( GLenum mode )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_DRAW_BUFFER, 1 );
+   if (n) {
+      n[1].e = mode;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->DrawBuffer)( mode );
+   }
+}
+
+
+static void GLAPIENTRY save_DrawPixels( GLsizei width, GLsizei height,
+                             GLenum format, GLenum type,
+                             const GLvoid *pixels )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLvoid *image = _mesa_unpack_image(width, height, 1, format, type,
+                                      pixels, &ctx->Unpack);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_DRAW_PIXELS, 5 );
+   if (n) {
+      n[1].i = width;
+      n[2].i = height;
+      n[3].e = format;
+      n[4].e = type;
+      n[5].data = image;
+   }
+   else if (image) {
+      FREE(image);
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->DrawPixels)( width, height, format, type, pixels );
+   }
+}
+
+
+
+static void GLAPIENTRY save_Enable( GLenum cap )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_ENABLE, 1 );
+   if (n) {
+      n[1].e = cap;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->Enable)( cap );
+   }
+}
+
+
+
+void GLAPIENTRY _mesa_save_EvalMesh1( GLenum mode, GLint i1, GLint i2 )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_EVALMESH1, 3 );
+   if (n) {
+      n[1].e = mode;
+      n[2].i = i1;
+      n[3].i = i2;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->EvalMesh1)( mode, i1, i2 );
+   }
+}
+
+
+void GLAPIENTRY _mesa_save_EvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_EVALMESH2, 5 );
+   if (n) {
+      n[1].e = mode;
+      n[2].i = i1;
+      n[3].i = i2;
+      n[4].i = j1;
+      n[5].i = j2;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->EvalMesh2)( mode, i1, i2, j1, j2 );
+   }
+}
+
+
+
+
+static void GLAPIENTRY save_Fogfv( GLenum pname, const GLfloat *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_FOG, 5 );
+   if (n) {
+      n[1].e = pname;
+      n[2].f = params[0];
+      n[3].f = params[1];
+      n[4].f = params[2];
+      n[5].f = params[3];
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->Fogfv)( pname, params );
+   }
+}
+
+
+static void GLAPIENTRY save_Fogf( GLenum pname, GLfloat param )
+{
+   save_Fogfv(pname, &param);
+}
+
+
+static void GLAPIENTRY save_Fogiv(GLenum pname, const GLint *params )
+{
+   GLfloat p[4];
+   switch (pname) {
+      case GL_FOG_MODE:
+      case GL_FOG_DENSITY:
+      case GL_FOG_START:
+      case GL_FOG_END:
+      case GL_FOG_INDEX:
+	 p[0] = (GLfloat) *params;
+	 break;
+      case GL_FOG_COLOR:
+	 p[0] = INT_TO_FLOAT( params[0] );
+	 p[1] = INT_TO_FLOAT( params[1] );
+	 p[2] = INT_TO_FLOAT( params[2] );
+	 p[3] = INT_TO_FLOAT( params[3] );
+	 break;
+      default:
+         /* Error will be caught later in gl_Fogfv */
+         ;
+   }
+   save_Fogfv(pname, p);
+}
+
+
+static void GLAPIENTRY save_Fogi(GLenum pname, GLint param )
+{
+   save_Fogiv(pname, &param);
+}
+
+
+static void GLAPIENTRY save_FrontFace( GLenum mode )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_FRONT_FACE, 1 );
+   if (n) {
+      n[1].e = mode;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->FrontFace)( mode );
+   }
+}
+
+
+static void GLAPIENTRY save_Frustum( GLdouble left, GLdouble right,
+                      GLdouble bottom, GLdouble top,
+                      GLdouble nearval, GLdouble farval )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_FRUSTUM, 6 );
+   if (n) {
+      n[1].f = (GLfloat) left;
+      n[2].f = (GLfloat) right;
+      n[3].f = (GLfloat) bottom;
+      n[4].f = (GLfloat) top;
+      n[5].f = (GLfloat) nearval;
+      n[6].f = (GLfloat) farval;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->Frustum)( left, right, bottom, top, nearval, farval );
+   }
+}
+
+
+static void GLAPIENTRY save_Hint( GLenum target, GLenum mode )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_HINT, 2 );
+   if (n) {
+      n[1].e = target;
+      n[2].e = mode;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->Hint)( target, mode );
+   }
+}
+
+
+static void GLAPIENTRY
+save_Histogram(GLenum target, GLsizei width, GLenum internalFormat, GLboolean sink)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_HISTOGRAM, 4 );
+   if (n) {
+      n[1].e = target;
+      n[2].i = width;
+      n[3].e = internalFormat;
+      n[4].b = sink;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->Histogram)( target, width, internalFormat, sink );
+   }
+}
+
+
+static void GLAPIENTRY save_IndexMask( GLuint mask )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_INDEX_MASK, 1 );
+   if (n) {
+      n[1].ui = mask;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->IndexMask)( mask );
+   }
+}
+
+
+static void GLAPIENTRY save_InitNames( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   (void) ALLOC_INSTRUCTION( ctx, OPCODE_INIT_NAMES, 0 );
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->InitNames)();
+   }
+}
+
+
+static void GLAPIENTRY save_Lightfv( GLenum light, GLenum pname, const GLfloat *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_LIGHT, 6 );
+   if (OPCODE_LIGHT) {
+      GLint i, nParams;
+      n[1].e = light;
+      n[2].e = pname;
+      switch (pname) {
+         case GL_AMBIENT:
+            nParams = 4;
+            break;
+         case GL_DIFFUSE:
+            nParams = 4;
+            break;
+         case GL_SPECULAR:
+            nParams = 4;
+            break;
+         case GL_POSITION:
+            nParams = 4;
+            break;
+         case GL_SPOT_DIRECTION:
+            nParams = 3;
+            break;
+         case GL_SPOT_EXPONENT:
+            nParams = 1;
+            break;
+         case GL_SPOT_CUTOFF:
+            nParams = 1;
+            break;
+         case GL_CONSTANT_ATTENUATION:
+            nParams = 1;
+            break;
+         case GL_LINEAR_ATTENUATION:
+            nParams = 1;
+            break;
+         case GL_QUADRATIC_ATTENUATION:
+            nParams = 1;
+            break;
+         default:
+            nParams = 0;
+      }
+      for (i = 0; i < nParams; i++) {
+	 n[3+i].f = params[i];
+      }
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->Lightfv)( light, pname, params );
+   }
+}
+
+
+static void GLAPIENTRY save_Lightf( GLenum light, GLenum pname, GLfloat params )
+{
+   save_Lightfv(light, pname, &params);
+}
+
+
+static void GLAPIENTRY save_Lightiv( GLenum light, GLenum pname, const GLint *params )
+{
+   GLfloat fparam[4];
+   switch (pname) {
+      case GL_AMBIENT:
+      case GL_DIFFUSE:
+      case GL_SPECULAR:
+         fparam[0] = INT_TO_FLOAT( params[0] );
+         fparam[1] = INT_TO_FLOAT( params[1] );
+         fparam[2] = INT_TO_FLOAT( params[2] );
+         fparam[3] = INT_TO_FLOAT( params[3] );
+         break;
+      case GL_POSITION:
+         fparam[0] = (GLfloat) params[0];
+         fparam[1] = (GLfloat) params[1];
+         fparam[2] = (GLfloat) params[2];
+         fparam[3] = (GLfloat) params[3];
+         break;
+      case GL_SPOT_DIRECTION:
+         fparam[0] = (GLfloat) params[0];
+         fparam[1] = (GLfloat) params[1];
+         fparam[2] = (GLfloat) params[2];
+         break;
+      case GL_SPOT_EXPONENT:
+      case GL_SPOT_CUTOFF:
+      case GL_CONSTANT_ATTENUATION:
+      case GL_LINEAR_ATTENUATION:
+      case GL_QUADRATIC_ATTENUATION:
+         fparam[0] = (GLfloat) params[0];
+         break;
+      default:
+         /* error will be caught later in gl_Lightfv */
+         ;
+   }
+   save_Lightfv( light, pname, fparam );
+}
+
+
+static void GLAPIENTRY save_Lighti( GLenum light, GLenum pname, GLint param )
+{
+   save_Lightiv( light, pname, &param );
+}
+
+
+static void GLAPIENTRY save_LightModelfv( GLenum pname, const GLfloat *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_LIGHT_MODEL, 5 );
+   if (n) {
+      n[1].e = pname;
+      n[2].f = params[0];
+      n[3].f = params[1];
+      n[4].f = params[2];
+      n[5].f = params[3];
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->LightModelfv)( pname, params );
+   }
+}
+
+
+static void GLAPIENTRY save_LightModelf( GLenum pname, GLfloat param )
+{
+   save_LightModelfv(pname, &param);
+}
+
+
+static void GLAPIENTRY save_LightModeliv( GLenum pname, const GLint *params )
+{
+   GLfloat fparam[4];
+   switch (pname) {
+      case GL_LIGHT_MODEL_AMBIENT:
+         fparam[0] = INT_TO_FLOAT( params[0] );
+         fparam[1] = INT_TO_FLOAT( params[1] );
+         fparam[2] = INT_TO_FLOAT( params[2] );
+         fparam[3] = INT_TO_FLOAT( params[3] );
+         break;
+      case GL_LIGHT_MODEL_LOCAL_VIEWER:
+      case GL_LIGHT_MODEL_TWO_SIDE:
+      case GL_LIGHT_MODEL_COLOR_CONTROL:
+         fparam[0] = (GLfloat) params[0];
+         break;
+      default:
+         /* Error will be caught later in gl_LightModelfv */
+         ;
+   }
+   save_LightModelfv(pname, fparam);
+}
+
+
+static void GLAPIENTRY save_LightModeli( GLenum pname, GLint param )
+{
+   save_LightModeliv(pname, &param);
+}
+
+
+static void GLAPIENTRY save_LineStipple( GLint factor, GLushort pattern )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_LINE_STIPPLE, 2 );
+   if (n) {
+      n[1].i = factor;
+      n[2].us = pattern;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->LineStipple)( factor, pattern );
+   }
+}
+
+
+static void GLAPIENTRY save_LineWidth( GLfloat width )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_LINE_WIDTH, 1 );
+   if (n) {
+      n[1].f = width;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->LineWidth)( width );
+   }
+}
+
+
+static void GLAPIENTRY save_ListBase( GLuint base )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_LIST_BASE, 1 );
+   if (n) {
+      n[1].ui = base;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ListBase)( base );
+   }
+}
+
+
+static void GLAPIENTRY save_LoadIdentity( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   (void) ALLOC_INSTRUCTION( ctx, OPCODE_LOAD_IDENTITY, 0 );
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->LoadIdentity)();
+   }
+}
+
+
+static void GLAPIENTRY save_LoadMatrixf( const GLfloat *m )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_LOAD_MATRIX, 16 );
+   if (n) {
+      GLuint i;
+      for (i=0;i<16;i++) {
+	 n[1+i].f = m[i];
+      }
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->LoadMatrixf)( m );
+   }
+}
+
+
+static void GLAPIENTRY save_LoadMatrixd( const GLdouble *m )
+{
+   GLfloat f[16];
+   GLint i;
+   for (i = 0; i < 16; i++) {
+      f[i] = (GLfloat) m[i];
+   }
+   save_LoadMatrixf(f);
+}
+
+
+static void GLAPIENTRY save_LoadName( GLuint name )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_LOAD_NAME, 1 );
+   if (n) {
+      n[1].ui = name;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->LoadName)( name );
+   }
+}
+
+
+static void GLAPIENTRY save_LogicOp( GLenum opcode )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_LOGIC_OP, 1 );
+   if (n) {
+      n[1].e = opcode;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->LogicOp)( opcode );
+   }
+}
+
+
+static void GLAPIENTRY save_Map1d( GLenum target, GLdouble u1, GLdouble u2, GLint stride,
+                        GLint order, const GLdouble *points)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_MAP1, 6 );
+   if (n) {
+      GLfloat *pnts = _mesa_copy_map_points1d( target, stride, order, points );
+      n[1].e = target;
+      n[2].f = (GLfloat) u1;
+      n[3].f = (GLfloat) u2;
+      n[4].i = _mesa_evaluator_components(target);  /* stride */
+      n[5].i = order;
+      n[6].data = (void *) pnts;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->Map1d)( target, u1, u2, stride, order, points );
+   }
+}
+
+static void GLAPIENTRY save_Map1f( GLenum target, GLfloat u1, GLfloat u2, GLint stride,
+                        GLint order, const GLfloat *points)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_MAP1, 6 );
+   if (n) {
+      GLfloat *pnts = _mesa_copy_map_points1f( target, stride, order, points );
+      n[1].e = target;
+      n[2].f = u1;
+      n[3].f = u2;
+      n[4].i = _mesa_evaluator_components(target);  /* stride */
+      n[5].i = order;
+      n[6].data = (void *) pnts;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->Map1f)( target, u1, u2, stride, order, points );
+   }
+}
+
+
+static void GLAPIENTRY save_Map2d( GLenum target,
+                        GLdouble u1, GLdouble u2, GLint ustride, GLint uorder,
+                        GLdouble v1, GLdouble v2, GLint vstride, GLint vorder,
+                        const GLdouble *points )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_MAP2, 10 );
+   if (n) {
+      GLfloat *pnts = _mesa_copy_map_points2d( target, ustride, uorder,
+                                            vstride, vorder, points );
+      n[1].e = target;
+      n[2].f = (GLfloat) u1;
+      n[3].f = (GLfloat) u2;
+      n[4].f = (GLfloat) v1;
+      n[5].f = (GLfloat) v2;
+      /* XXX verify these strides are correct */
+      n[6].i = _mesa_evaluator_components(target) * vorder;  /*ustride*/
+      n[7].i = _mesa_evaluator_components(target);           /*vstride*/
+      n[8].i = uorder;
+      n[9].i = vorder;
+      n[10].data = (void *) pnts;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->Map2d)( target,
+                          u1, u2, ustride, uorder,
+                          v1, v2, vstride, vorder, points );
+   }
+}
+
+
+static void GLAPIENTRY save_Map2f( GLenum target,
+                        GLfloat u1, GLfloat u2, GLint ustride, GLint uorder,
+                        GLfloat v1, GLfloat v2, GLint vstride, GLint vorder,
+                        const GLfloat *points )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_MAP2, 10 );
+   if (n) {
+      GLfloat *pnts = _mesa_copy_map_points2f( target, ustride, uorder,
+                                            vstride, vorder, points );
+      n[1].e = target;
+      n[2].f = u1;
+      n[3].f = u2;
+      n[4].f = v1;
+      n[5].f = v2;
+      /* XXX verify these strides are correct */
+      n[6].i = _mesa_evaluator_components(target) * vorder;  /*ustride*/
+      n[7].i = _mesa_evaluator_components(target);           /*vstride*/
+      n[8].i = uorder;
+      n[9].i = vorder;
+      n[10].data = (void *) pnts;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->Map2f)( target, u1, u2, ustride, uorder,
+                          v1, v2, vstride, vorder, points );
+   }
+}
+
+
+static void GLAPIENTRY save_MapGrid1f( GLint un, GLfloat u1, GLfloat u2 )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_MAPGRID1, 3 );
+   if (n) {
+      n[1].i = un;
+      n[2].f = u1;
+      n[3].f = u2;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->MapGrid1f)( un, u1, u2 );
+   }
+}
+
+
+static void GLAPIENTRY save_MapGrid1d( GLint un, GLdouble u1, GLdouble u2 )
+{
+   save_MapGrid1f(un, (GLfloat) u1, (GLfloat) u2);
+}
+
+
+static void GLAPIENTRY save_MapGrid2f( GLint un, GLfloat u1, GLfloat u2,
+                            GLint vn, GLfloat v1, GLfloat v2 )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_MAPGRID2, 6 );
+   if (n) {
+      n[1].i = un;
+      n[2].f = u1;
+      n[3].f = u2;
+      n[4].i = vn;
+      n[5].f = v1;
+      n[6].f = v2;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->MapGrid2f)( un, u1, u2, vn, v1, v2 );
+   }
+}
+
+
+
+static void GLAPIENTRY save_MapGrid2d( GLint un, GLdouble u1, GLdouble u2,
+                            GLint vn, GLdouble v1, GLdouble v2 )
+{
+   save_MapGrid2f(un, (GLfloat) u1, (GLfloat) u2,
+		  vn, (GLfloat) v1, (GLfloat) v2);
+}
+
+
+static void GLAPIENTRY save_MatrixMode( GLenum mode )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_MATRIX_MODE, 1 );
+   if (n) {
+      n[1].e = mode;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->MatrixMode)( mode );
+   }
+}
+
+
+static void GLAPIENTRY
+save_Minmax(GLenum target, GLenum internalFormat, GLboolean sink)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_MIN_MAX, 3 );
+   if (n) {
+      n[1].e = target;
+      n[2].e = internalFormat;
+      n[3].b = sink;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->Minmax)( target, internalFormat, sink );
+   }
+}
+
+
+static void GLAPIENTRY save_MultMatrixf( const GLfloat *m )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_MULT_MATRIX, 16 );
+   if (n) {
+      GLuint i;
+      for (i=0;i<16;i++) {
+	 n[1+i].f = m[i];
+      }
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->MultMatrixf)( m );
+   }
+}
+
+
+static void GLAPIENTRY save_MultMatrixd( const GLdouble *m )
+{
+   GLfloat f[16];
+   GLint i;
+   for (i = 0; i < 16; i++) {
+      f[i] = (GLfloat) m[i];
+   }
+   save_MultMatrixf(f);
+}
+
+
+static void GLAPIENTRY save_NewList( GLuint list, GLenum mode )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   /* It's an error to call this function while building a display list */
+   _mesa_error( ctx, GL_INVALID_OPERATION, "glNewList" );
+   (void) list;
+   (void) mode;
+}
+
+
+
+static void GLAPIENTRY save_Ortho( GLdouble left, GLdouble right,
+                    GLdouble bottom, GLdouble top,
+                    GLdouble nearval, GLdouble farval )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_ORTHO, 6 );
+   if (n) {
+      n[1].f = (GLfloat) left;
+      n[2].f = (GLfloat) right;
+      n[3].f = (GLfloat) bottom;
+      n[4].f = (GLfloat) top;
+      n[5].f = (GLfloat) nearval;
+      n[6].f = (GLfloat) farval;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->Ortho)( left, right, bottom, top, nearval, farval );
+   }
+}
+
+
+static void GLAPIENTRY
+save_PixelMapfv( GLenum map, GLint mapsize, const GLfloat *values )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_PIXEL_MAP, 3 );
+   if (n) {
+      n[1].e = map;
+      n[2].i = mapsize;
+      n[3].data  = (void *) MALLOC( mapsize * sizeof(GLfloat) );
+      MEMCPY( n[3].data, (void *) values, mapsize * sizeof(GLfloat) );
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->PixelMapfv)( map, mapsize, values );
+   }
+}
+
+
+static void GLAPIENTRY
+save_PixelMapuiv(GLenum map, GLint mapsize, const GLuint *values )
+{
+   GLfloat fvalues[MAX_PIXEL_MAP_TABLE];
+   GLint i;
+   if (map==GL_PIXEL_MAP_I_TO_I || map==GL_PIXEL_MAP_S_TO_S) {
+      for (i=0;i<mapsize;i++) {
+         fvalues[i] = (GLfloat) values[i];
+      }
+   }
+   else {
+      for (i=0;i<mapsize;i++) {
+         fvalues[i] = UINT_TO_FLOAT( values[i] );
+      }
+   }
+   save_PixelMapfv(map, mapsize, fvalues);
+}
+
+
+static void GLAPIENTRY
+save_PixelMapusv(GLenum map, GLint mapsize, const GLushort *values)
+{
+   GLfloat fvalues[MAX_PIXEL_MAP_TABLE];
+   GLint i;
+   if (map==GL_PIXEL_MAP_I_TO_I || map==GL_PIXEL_MAP_S_TO_S) {
+      for (i=0;i<mapsize;i++) {
+         fvalues[i] = (GLfloat) values[i];
+      }
+   }
+   else {
+      for (i=0;i<mapsize;i++) {
+         fvalues[i] = USHORT_TO_FLOAT( values[i] );
+      }
+   }
+   save_PixelMapfv(map, mapsize, fvalues);
+}
+
+
+static void GLAPIENTRY
+save_PixelTransferf( GLenum pname, GLfloat param )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_PIXEL_TRANSFER, 2 );
+   if (n) {
+      n[1].e = pname;
+      n[2].f = param;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->PixelTransferf)( pname, param );
+   }
+}
+
+
+static void GLAPIENTRY
+save_PixelTransferi( GLenum pname, GLint param )
+{
+   save_PixelTransferf( pname, (GLfloat) param );
+}
+
+
+static void GLAPIENTRY
+save_PixelZoom( GLfloat xfactor, GLfloat yfactor )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_PIXEL_ZOOM, 2 );
+   if (n) {
+      n[1].f = xfactor;
+      n[2].f = yfactor;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->PixelZoom)( xfactor, yfactor );
+   }
+}
+
+
+static void GLAPIENTRY
+save_PointParameterfvEXT( GLenum pname, const GLfloat *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_POINT_PARAMETERS, 4 );
+   if (n) {
+      n[1].e = pname;
+      n[2].f = params[0];
+      n[3].f = params[1];
+      n[4].f = params[2];
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->PointParameterfvEXT)( pname, params );
+   }
+}
+
+
+static void GLAPIENTRY save_PointParameterfEXT( GLenum pname, GLfloat param )
+{
+   save_PointParameterfvEXT(pname, &param);
+}
+
+static void GLAPIENTRY save_PointParameteriNV( GLenum pname, GLint param )
+{
+   GLfloat p = (GLfloat) param;
+   save_PointParameterfvEXT(pname, &p);
+}
+
+static void GLAPIENTRY save_PointParameterivNV( GLenum pname, const GLint *param )
+{
+   GLfloat p = (GLfloat) param[0];
+   save_PointParameterfvEXT(pname, &p);
+}
+
+
+static void GLAPIENTRY save_PointSize( GLfloat size )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_POINT_SIZE, 1 );
+   if (n) {
+      n[1].f = size;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->PointSize)( size );
+   }
+}
+
+
+static void GLAPIENTRY save_PolygonMode( GLenum face, GLenum mode )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_POLYGON_MODE, 2 );
+   if (n) {
+      n[1].e = face;
+      n[2].e = mode;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->PolygonMode)( face, mode );
+   }
+}
+
+
+/*
+ * Polygon stipple must have been upacked already!
+ */
+static void GLAPIENTRY save_PolygonStipple( const GLubyte *pattern )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_POLYGON_STIPPLE, 1 );
+   if (n) {
+      void *data;
+      n[1].data = MALLOC( 32 * 4 );
+      data = n[1].data;   /* This needed for Acorn compiler */
+      MEMCPY( data, pattern, 32 * 4 );
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->PolygonStipple)( (GLubyte*) pattern );
+   }
+}
+
+
+static void GLAPIENTRY save_PolygonOffset( GLfloat factor, GLfloat units )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_POLYGON_OFFSET, 2 );
+   if (n) {
+      n[1].f = factor;
+      n[2].f = units;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->PolygonOffset)( factor, units );
+   }
+}
+
+
+static void GLAPIENTRY save_PolygonOffsetEXT( GLfloat factor, GLfloat bias )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   save_PolygonOffset(factor, ctx->DepthMaxF * bias);
+}
+
+
+static void GLAPIENTRY save_PopAttrib( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   (void) ALLOC_INSTRUCTION( ctx, OPCODE_POP_ATTRIB, 0 );
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->PopAttrib)();
+   }
+}
+
+
+static void GLAPIENTRY save_PopMatrix( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   (void) ALLOC_INSTRUCTION( ctx, OPCODE_POP_MATRIX, 0 );
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->PopMatrix)();
+   }
+}
+
+
+static void GLAPIENTRY save_PopName( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   (void) ALLOC_INSTRUCTION( ctx, OPCODE_POP_NAME, 0 );
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->PopName)();
+   }
+}
+
+
+static void GLAPIENTRY save_PrioritizeTextures( GLsizei num, const GLuint *textures,
+                                     const GLclampf *priorities )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint i;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+
+   for (i=0;i<num;i++) {
+      Node *n;
+      n = ALLOC_INSTRUCTION( ctx,  OPCODE_PRIORITIZE_TEXTURE, 2 );
+      if (n) {
+         n[1].ui = textures[i];
+         n[2].f = priorities[i];
+      }
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->PrioritizeTextures)( num, textures, priorities );
+   }
+}
+
+
+static void GLAPIENTRY save_PushAttrib( GLbitfield mask )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_PUSH_ATTRIB, 1 );
+   if (n) {
+      n[1].bf = mask;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->PushAttrib)( mask );
+   }
+}
+
+
+static void GLAPIENTRY save_PushMatrix( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   (void) ALLOC_INSTRUCTION( ctx, OPCODE_PUSH_MATRIX, 0 );
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->PushMatrix)();
+   }
+}
+
+
+static void GLAPIENTRY save_PushName( GLuint name )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_PUSH_NAME, 1 );
+   if (n) {
+      n[1].ui = name;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->PushName)( name );
+   }
+}
+
+
+static void GLAPIENTRY save_RasterPos4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_RASTER_POS, 4 );
+   if (n) {
+      n[1].f = x;
+      n[2].f = y;
+      n[3].f = z;
+      n[4].f = w;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->RasterPos4f)( x, y, z, w );
+   }
+}
+
+static void GLAPIENTRY save_RasterPos2d(GLdouble x, GLdouble y)
+{
+   save_RasterPos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);
+}
+
+static void GLAPIENTRY save_RasterPos2f(GLfloat x, GLfloat y)
+{
+   save_RasterPos4f(x, y, 0.0F, 1.0F);
+}
+
+static void GLAPIENTRY save_RasterPos2i(GLint x, GLint y)
+{
+   save_RasterPos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);
+}
+
+static void GLAPIENTRY save_RasterPos2s(GLshort x, GLshort y)
+{
+   save_RasterPos4f(x, y, 0.0F, 1.0F);
+}
+
+static void GLAPIENTRY save_RasterPos3d(GLdouble x, GLdouble y, GLdouble z)
+{
+   save_RasterPos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
+}
+
+static void GLAPIENTRY save_RasterPos3f(GLfloat x, GLfloat y, GLfloat z)
+{
+   save_RasterPos4f(x, y, z, 1.0F);
+}
+
+static void GLAPIENTRY save_RasterPos3i(GLint x, GLint y, GLint z)
+{
+   save_RasterPos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
+}
+
+static void GLAPIENTRY save_RasterPos3s(GLshort x, GLshort y, GLshort z)
+{
+   save_RasterPos4f(x, y, z, 1.0F);
+}
+
+static void GLAPIENTRY save_RasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
+{
+   save_RasterPos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
+}
+
+static void GLAPIENTRY save_RasterPos4i(GLint x, GLint y, GLint z, GLint w)
+{
+   save_RasterPos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
+}
+
+static void GLAPIENTRY save_RasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w)
+{
+   save_RasterPos4f(x, y, z, w);
+}
+
+static void GLAPIENTRY save_RasterPos2dv(const GLdouble *v)
+{
+   save_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);
+}
+
+static void GLAPIENTRY save_RasterPos2fv(const GLfloat *v)
+{
+   save_RasterPos4f(v[0], v[1], 0.0F, 1.0F);
+}
+
+static void GLAPIENTRY save_RasterPos2iv(const GLint *v)
+{
+   save_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);
+}
+
+static void GLAPIENTRY save_RasterPos2sv(const GLshort *v)
+{
+   save_RasterPos4f(v[0], v[1], 0.0F, 1.0F);
+}
+
+static void GLAPIENTRY save_RasterPos3dv(const GLdouble *v)
+{
+   save_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);
+}
+
+static void GLAPIENTRY save_RasterPos3fv(const GLfloat *v)
+{
+   save_RasterPos4f(v[0], v[1], v[2], 1.0F);
+}
+
+static void GLAPIENTRY save_RasterPos3iv(const GLint *v)
+{
+   save_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);
+}
+
+static void GLAPIENTRY save_RasterPos3sv(const GLshort *v)
+{
+   save_RasterPos4f(v[0], v[1], v[2], 1.0F);
+}
+
+static void GLAPIENTRY save_RasterPos4dv(const GLdouble *v)
+{
+   save_RasterPos4f((GLfloat) v[0], (GLfloat) v[1],
+		    (GLfloat) v[2], (GLfloat) v[3]);
+}
+
+static void GLAPIENTRY save_RasterPos4fv(const GLfloat *v)
+{
+   save_RasterPos4f(v[0], v[1], v[2], v[3]);
+}
+
+static void GLAPIENTRY save_RasterPos4iv(const GLint *v)
+{
+   save_RasterPos4f((GLfloat) v[0], (GLfloat) v[1],
+		    (GLfloat) v[2], (GLfloat) v[3]);
+}
+
+static void GLAPIENTRY save_RasterPos4sv(const GLshort *v)
+{
+   save_RasterPos4f(v[0], v[1], v[2], v[3]);
+}
+
+
+static void GLAPIENTRY save_PassThrough( GLfloat token )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_PASSTHROUGH, 1 );
+   if (n) {
+      n[1].f = token;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->PassThrough)( token );
+   }
+}
+
+
+static void GLAPIENTRY save_ReadBuffer( GLenum mode )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_READ_BUFFER, 1 );
+   if (n) {
+      n[1].e = mode;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ReadBuffer)( mode );
+   }
+}
+
+
+static void GLAPIENTRY
+save_ResetHistogram(GLenum target)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_RESET_HISTOGRAM, 1 );
+   if (n) {
+      n[1].e = target;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ResetHistogram)( target );
+   }
+}
+
+
+static void GLAPIENTRY
+save_ResetMinmax(GLenum target)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_RESET_MIN_MAX, 1 );
+   if (n) {
+      n[1].e = target;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ResetMinmax)( target );
+   }
+}
+
+
+static void GLAPIENTRY save_Rotatef( GLfloat angle, GLfloat x, GLfloat y, GLfloat z )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_ROTATE, 4 );
+   if (n) {
+      n[1].f = angle;
+      n[2].f = x;
+      n[3].f = y;
+      n[4].f = z;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->Rotatef)( angle, x, y, z );
+   }
+}
+
+
+static void GLAPIENTRY save_Rotated( GLdouble angle, GLdouble x, GLdouble y, GLdouble z )
+{
+   save_Rotatef((GLfloat) angle, (GLfloat) x, (GLfloat) y, (GLfloat) z);
+}
+
+
+static void GLAPIENTRY save_Scalef( GLfloat x, GLfloat y, GLfloat z )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_SCALE, 3 );
+   if (n) {
+      n[1].f = x;
+      n[2].f = y;
+      n[3].f = z;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->Scalef)( x, y, z );
+   }
+}
+
+
+static void GLAPIENTRY save_Scaled( GLdouble x, GLdouble y, GLdouble z )
+{
+   save_Scalef((GLfloat) x, (GLfloat) y, (GLfloat) z);
+}
+
+
+static void GLAPIENTRY save_Scissor( GLint x, GLint y, GLsizei width, GLsizei height )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_SCISSOR, 4 );
+   if (n) {
+      n[1].i = x;
+      n[2].i = y;
+      n[3].i = width;
+      n[4].i = height;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->Scissor)( x, y, width, height );
+   }
+}
+
+
+static void GLAPIENTRY save_ShadeModel( GLenum mode )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_SHADE_MODEL, 1 );
+   if (n) {
+      n[1].e = mode;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ShadeModel)( mode );
+   }
+}
+
+
+static void GLAPIENTRY save_StencilFunc( GLenum func, GLint ref, GLuint mask )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_STENCIL_FUNC, 3 );
+   if (n) {
+      n[1].e = func;
+      n[2].i = ref;
+      n[3].ui = mask;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->StencilFunc)( func, ref, mask );
+   }
+}
+
+
+static void GLAPIENTRY save_StencilMask( GLuint mask )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_STENCIL_MASK, 1 );
+   if (n) {
+      n[1].ui = mask;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->StencilMask)( mask );
+   }
+}
+
+
+static void GLAPIENTRY save_StencilOp( GLenum fail, GLenum zfail, GLenum zpass )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_STENCIL_OP, 3 );
+   if (n) {
+      n[1].e = fail;
+      n[2].e = zfail;
+      n[3].e = zpass;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->StencilOp)( fail, zfail, zpass );
+   }
+}
+
+
+static void GLAPIENTRY save_TexEnvfv( GLenum target, GLenum pname, const GLfloat *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_TEXENV, 6 );
+   if (n) {
+      n[1].e = target;
+      n[2].e = pname;
+      n[3].f = params[0];
+      n[4].f = params[1];
+      n[5].f = params[2];
+      n[6].f = params[3];
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->TexEnvfv)( target, pname, params );
+   }
+}
+
+
+static void GLAPIENTRY save_TexEnvf( GLenum target, GLenum pname, GLfloat param )
+{
+   save_TexEnvfv( target, pname, &param );
+}
+
+
+static void GLAPIENTRY save_TexEnvi( GLenum target, GLenum pname, GLint param )
+{
+   GLfloat p[4];
+   p[0] = (GLfloat) param;
+   p[1] = p[2] = p[3] = 0.0;
+   save_TexEnvfv( target, pname, p );
+}
+
+
+static void GLAPIENTRY save_TexEnviv( GLenum target, GLenum pname, const GLint *param )
+{
+   GLfloat p[4];
+   p[0] = INT_TO_FLOAT( param[0] );
+   p[1] = INT_TO_FLOAT( param[1] );
+   p[2] = INT_TO_FLOAT( param[2] );
+   p[3] = INT_TO_FLOAT( param[3] );
+   save_TexEnvfv( target, pname, p );
+}
+
+
+static void GLAPIENTRY save_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_TEXGEN, 6 );
+   if (n) {
+      n[1].e = coord;
+      n[2].e = pname;
+      n[3].f = params[0];
+      n[4].f = params[1];
+      n[5].f = params[2];
+      n[6].f = params[3];
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->TexGenfv)( coord, pname, params );
+   }
+}
+
+
+static void GLAPIENTRY save_TexGeniv(GLenum coord, GLenum pname, const GLint *params )
+{
+   GLfloat p[4];
+   p[0] = (GLfloat) params[0];
+   p[1] = (GLfloat) params[1];
+   p[2] = (GLfloat) params[2];
+   p[3] = (GLfloat) params[3];
+   save_TexGenfv(coord, pname, p);
+}
+
+
+static void GLAPIENTRY save_TexGend(GLenum coord, GLenum pname, GLdouble param )
+{
+   GLfloat p = (GLfloat) param;
+   save_TexGenfv( coord, pname, &p );
+}
+
+
+static void GLAPIENTRY save_TexGendv(GLenum coord, GLenum pname, const GLdouble *params )
+{
+   GLfloat p[4];
+   p[0] = (GLfloat) params[0];
+   p[1] = (GLfloat) params[1];
+   p[2] = (GLfloat) params[2];
+   p[3] = (GLfloat) params[3];
+   save_TexGenfv( coord, pname, p );
+}
+
+
+static void GLAPIENTRY save_TexGenf( GLenum coord, GLenum pname, GLfloat param )
+{
+   save_TexGenfv(coord, pname, &param);
+}
+
+
+static void GLAPIENTRY save_TexGeni( GLenum coord, GLenum pname, GLint param )
+{
+   save_TexGeniv( coord, pname, &param );
+}
+
+
+static void GLAPIENTRY save_TexParameterfv( GLenum target,
+                             GLenum pname, const GLfloat *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_TEXPARAMETER, 6 );
+   if (n) {
+      n[1].e = target;
+      n[2].e = pname;
+      n[3].f = params[0];
+      n[4].f = params[1];
+      n[5].f = params[2];
+      n[6].f = params[3];
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->TexParameterfv)( target, pname, params );
+   }
+}
+
+
+static void GLAPIENTRY save_TexParameterf( GLenum target, GLenum pname, GLfloat param )
+{
+   save_TexParameterfv(target, pname, &param);
+}
+
+
+static void GLAPIENTRY save_TexParameteri( GLenum target, GLenum pname, GLint param )
+{
+   GLfloat fparam[4];
+   fparam[0] = (GLfloat) param;
+   fparam[1] = fparam[2] = fparam[3] = 0.0;
+   save_TexParameterfv(target, pname, fparam);
+}
+
+
+static void GLAPIENTRY save_TexParameteriv( GLenum target, GLenum pname, const GLint *params )
+{
+   GLfloat fparam[4];
+   fparam[0] = (GLfloat) params[0];
+   fparam[1] = fparam[2] = fparam[3] = 0.0;
+   save_TexParameterfv(target, pname, fparam);
+}
+
+
+static void GLAPIENTRY save_TexImage1D( GLenum target,
+                             GLint level, GLint components,
+                             GLsizei width, GLint border,
+                             GLenum format, GLenum type,
+                             const GLvoid *pixels )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (target == GL_PROXY_TEXTURE_1D) {
+      /* don't compile, execute immediately */
+      (*ctx->Exec->TexImage1D)( target, level, components, width,
+                               border, format, type, pixels );
+   }
+   else {
+      GLvoid *image = _mesa_unpack_image(width, 1, 1, format, type,
+                                         pixels, &ctx->Unpack);
+      Node *n;
+      ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+      n = ALLOC_INSTRUCTION( ctx, OPCODE_TEX_IMAGE1D, 8 );
+      if (n) {
+         n[1].e = target;
+         n[2].i = level;
+         n[3].i = components;
+         n[4].i = (GLint) width;
+         n[5].i = border;
+         n[6].e = format;
+         n[7].e = type;
+         n[8].data = image;
+      }
+      else if (image) {
+         FREE(image);
+      }
+      if (ctx->ExecuteFlag) {
+         (*ctx->Exec->TexImage1D)( target, level, components, width,
+                                  border, format, type, pixels );
+      }
+   }
+}
+
+
+static void GLAPIENTRY save_TexImage2D( GLenum target,
+                             GLint level, GLint components,
+                             GLsizei width, GLsizei height, GLint border,
+                             GLenum format, GLenum type,
+                             const GLvoid *pixels)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (target == GL_PROXY_TEXTURE_2D) {
+      /* don't compile, execute immediately */
+      (*ctx->Exec->TexImage2D)( target, level, components, width,
+                               height, border, format, type, pixels );
+   }
+   else {
+      GLvoid *image = _mesa_unpack_image(width, height, 1, format, type,
+                                         pixels, &ctx->Unpack);
+      Node *n;
+      ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+      n = ALLOC_INSTRUCTION( ctx, OPCODE_TEX_IMAGE2D, 9 );
+      if (n) {
+         n[1].e = target;
+         n[2].i = level;
+         n[3].i = components;
+         n[4].i = (GLint) width;
+         n[5].i = (GLint) height;
+         n[6].i = border;
+         n[7].e = format;
+         n[8].e = type;
+         n[9].data = image;
+      }
+      else if (image) {
+         FREE(image);
+      }
+      if (ctx->ExecuteFlag) {
+         (*ctx->Exec->TexImage2D)( target, level, components, width,
+                                  height, border, format, type, pixels );
+      }
+   }
+}
+
+
+static void GLAPIENTRY save_TexImage3D( GLenum target,
+                             GLint level, GLint internalFormat,
+                             GLsizei width, GLsizei height, GLsizei depth,
+                             GLint border,
+                             GLenum format, GLenum type,
+                             const GLvoid *pixels )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (target == GL_PROXY_TEXTURE_3D) {
+      /* don't compile, execute immediately */
+      (*ctx->Exec->TexImage3D)( target, level, internalFormat, width,
+                               height, depth, border, format, type, pixels );
+   }
+   else {
+      Node *n;
+      GLvoid *image = _mesa_unpack_image(width, height, depth, format, type,
+                                         pixels, &ctx->Unpack);
+      ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+      n = ALLOC_INSTRUCTION( ctx, OPCODE_TEX_IMAGE3D, 10 );
+      if (n) {
+         n[1].e = target;
+         n[2].i = level;
+         n[3].i = (GLint) internalFormat;
+         n[4].i = (GLint) width;
+         n[5].i = (GLint) height;
+         n[6].i = (GLint) depth;
+         n[7].i = border;
+         n[8].e = format;
+         n[9].e = type;
+         n[10].data = image;
+      }
+      else if (image) {
+         FREE(image);
+      }
+      if (ctx->ExecuteFlag) {
+         (*ctx->Exec->TexImage3D)( target, level, internalFormat, width,
+                                height, depth, border, format, type, pixels );
+      }
+   }
+}
+
+
+static void GLAPIENTRY save_TexSubImage1D( GLenum target, GLint level, GLint xoffset,
+                                GLsizei width, GLenum format, GLenum type,
+                                const GLvoid *pixels )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   GLvoid *image = _mesa_unpack_image(width, 1, 1, format, type,
+                                      pixels, &ctx->Unpack);
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_TEX_SUB_IMAGE1D, 7 );
+   if (n) {
+      n[1].e = target;
+      n[2].i = level;
+      n[3].i = xoffset;
+      n[4].i = (GLint) width;
+      n[5].e = format;
+      n[6].e = type;
+      n[7].data = image;
+   }
+   else if (image) {
+      FREE(image);
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->TexSubImage1D)( target, level, xoffset, width,
+                                  format, type, pixels );
+   }
+}
+
+
+static void GLAPIENTRY save_TexSubImage2D( GLenum target, GLint level,
+                                GLint xoffset, GLint yoffset,
+                                GLsizei width, GLsizei height,
+                                GLenum format, GLenum type,
+                                const GLvoid *pixels )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   GLvoid *image = _mesa_unpack_image(width, height, 1, format, type,
+                                      pixels, &ctx->Unpack);
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_TEX_SUB_IMAGE2D, 9 );
+   if (n) {
+      n[1].e = target;
+      n[2].i = level;
+      n[3].i = xoffset;
+      n[4].i = yoffset;
+      n[5].i = (GLint) width;
+      n[6].i = (GLint) height;
+      n[7].e = format;
+      n[8].e = type;
+      n[9].data = image;
+   }
+   else if (image) {
+      FREE(image);
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->TexSubImage2D)( target, level, xoffset, yoffset,
+                           width, height, format, type, pixels );
+   }
+}
+
+
+static void GLAPIENTRY save_TexSubImage3D( GLenum target, GLint level,
+                                GLint xoffset, GLint yoffset,GLint zoffset,
+                                GLsizei width, GLsizei height, GLsizei depth,
+                                GLenum format, GLenum type,
+                                const GLvoid *pixels )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   GLvoid *image = _mesa_unpack_image(width, height, depth, format, type,
+                                      pixels, &ctx->Unpack);
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_TEX_SUB_IMAGE3D, 11 );
+   if (n) {
+      n[1].e = target;
+      n[2].i = level;
+      n[3].i = xoffset;
+      n[4].i = yoffset;
+      n[5].i = zoffset;
+      n[6].i = (GLint) width;
+      n[7].i = (GLint) height;
+      n[8].i = (GLint) depth;
+      n[9].e = format;
+      n[10].e = type;
+      n[11].data = image;
+   }
+   else if (image) {
+      FREE(image);
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->TexSubImage3D)( target, level,
+                                  xoffset, yoffset, zoffset,
+                                  width, height, depth, format, type, pixels );
+   }
+}
+
+
+static void GLAPIENTRY save_Translatef( GLfloat x, GLfloat y, GLfloat z )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx,  OPCODE_TRANSLATE, 3 );
+   if (n) {
+      n[1].f = x;
+      n[2].f = y;
+      n[3].f = z;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->Translatef)( x, y, z );
+   }
+}
+
+
+static void GLAPIENTRY save_Translated( GLdouble x, GLdouble y, GLdouble z )
+{
+   save_Translatef((GLfloat) x, (GLfloat) y, (GLfloat) z);
+}
+
+
+
+static void GLAPIENTRY save_Viewport( GLint x, GLint y, GLsizei width, GLsizei height )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx,  OPCODE_VIEWPORT, 4 );
+   if (n) {
+      n[1].i = x;
+      n[2].i = y;
+      n[3].i = (GLint) width;
+      n[4].i = (GLint) height;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->Viewport)( x, y, width, height );
+   }
+}
+
+
+static void GLAPIENTRY save_WindowPos4fMESA( GLfloat x, GLfloat y, GLfloat z, GLfloat w )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx,  OPCODE_WINDOW_POS, 4 );
+   if (n) {
+      n[1].f = x;
+      n[2].f = y;
+      n[3].f = z;
+      n[4].f = w;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->WindowPos4fMESA)( x, y, z, w );
+   }
+}
+
+static void GLAPIENTRY save_WindowPos2dMESA(GLdouble x, GLdouble y)
+{
+   save_WindowPos4fMESA((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);
+}
+
+static void GLAPIENTRY save_WindowPos2fMESA(GLfloat x, GLfloat y)
+{
+   save_WindowPos4fMESA(x, y, 0.0F, 1.0F);
+}
+
+static void GLAPIENTRY save_WindowPos2iMESA(GLint x, GLint y)
+{
+   save_WindowPos4fMESA((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);
+}
+
+static void GLAPIENTRY save_WindowPos2sMESA(GLshort x, GLshort y)
+{
+   save_WindowPos4fMESA(x, y, 0.0F, 1.0F);
+}
+
+static void GLAPIENTRY save_WindowPos3dMESA(GLdouble x, GLdouble y, GLdouble z)
+{
+   save_WindowPos4fMESA((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
+}
+
+static void GLAPIENTRY save_WindowPos3fMESA(GLfloat x, GLfloat y, GLfloat z)
+{
+   save_WindowPos4fMESA(x, y, z, 1.0F);
+}
+
+static void GLAPIENTRY save_WindowPos3iMESA(GLint x, GLint y, GLint z)
+{
+   save_WindowPos4fMESA((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
+}
+
+static void GLAPIENTRY save_WindowPos3sMESA(GLshort x, GLshort y, GLshort z)
+{
+   save_WindowPos4fMESA(x, y, z, 1.0F);
+}
+
+static void GLAPIENTRY save_WindowPos4dMESA(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
+{
+   save_WindowPos4fMESA((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
+}
+
+static void GLAPIENTRY save_WindowPos4iMESA(GLint x, GLint y, GLint z, GLint w)
+{
+   save_WindowPos4fMESA((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
+}
+
+static void GLAPIENTRY save_WindowPos4sMESA(GLshort x, GLshort y, GLshort z, GLshort w)
+{
+   save_WindowPos4fMESA(x, y, z, w);
+}
+
+static void GLAPIENTRY save_WindowPos2dvMESA(const GLdouble *v)
+{
+   save_WindowPos4fMESA((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);
+}
+
+static void GLAPIENTRY save_WindowPos2fvMESA(const GLfloat *v)
+{
+   save_WindowPos4fMESA(v[0], v[1], 0.0F, 1.0F);
+}
+
+static void GLAPIENTRY save_WindowPos2ivMESA(const GLint *v)
+{
+   save_WindowPos4fMESA((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);
+}
+
+static void GLAPIENTRY save_WindowPos2svMESA(const GLshort *v)
+{
+   save_WindowPos4fMESA(v[0], v[1], 0.0F, 1.0F);
+}
+
+static void GLAPIENTRY save_WindowPos3dvMESA(const GLdouble *v)
+{
+   save_WindowPos4fMESA((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);
+}
+
+static void GLAPIENTRY save_WindowPos3fvMESA(const GLfloat *v)
+{
+   save_WindowPos4fMESA(v[0], v[1], v[2], 1.0F);
+}
+
+static void GLAPIENTRY save_WindowPos3ivMESA(const GLint *v)
+{
+   save_WindowPos4fMESA((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);
+}
+
+static void GLAPIENTRY save_WindowPos3svMESA(const GLshort *v)
+{
+   save_WindowPos4fMESA(v[0], v[1], v[2], 1.0F);
+}
+
+static void GLAPIENTRY save_WindowPos4dvMESA(const GLdouble *v)
+{
+   save_WindowPos4fMESA((GLfloat) v[0], (GLfloat) v[1],
+			(GLfloat) v[2], (GLfloat) v[3]);
+}
+
+static void GLAPIENTRY save_WindowPos4fvMESA(const GLfloat *v)
+{
+   save_WindowPos4fMESA(v[0], v[1], v[2], v[3]);
+}
+
+static void GLAPIENTRY save_WindowPos4ivMESA(const GLint *v)
+{
+   save_WindowPos4fMESA((GLfloat) v[0], (GLfloat) v[1],
+			(GLfloat) v[2], (GLfloat) v[3]);
+}
+
+static void GLAPIENTRY save_WindowPos4svMESA(const GLshort *v)
+{
+   save_WindowPos4fMESA(v[0], v[1], v[2], v[3]);
+}
+
+
+
+/* GL_ARB_multitexture */
+static void GLAPIENTRY save_ActiveTextureARB( GLenum target )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_ACTIVE_TEXTURE, 1 );
+   if (n) {
+      n[1].e = target;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ActiveTextureARB)( target );
+   }
+}
+
+
+/* GL_ARB_transpose_matrix */
+
+static void GLAPIENTRY save_LoadTransposeMatrixdARB( const GLdouble m[16] )
+{
+   GLfloat tm[16];
+   _math_transposefd(tm, m);
+   save_LoadMatrixf(tm);
+}
+
+
+static void GLAPIENTRY save_LoadTransposeMatrixfARB( const GLfloat m[16] )
+{
+   GLfloat tm[16];
+   _math_transposef(tm, m);
+   save_LoadMatrixf(tm);
+}
+
+
+static void GLAPIENTRY
+save_MultTransposeMatrixdARB( const GLdouble m[16] )
+{
+   GLfloat tm[16];
+   _math_transposefd(tm, m);
+   save_MultMatrixf(tm);
+}
+
+
+static void GLAPIENTRY
+save_MultTransposeMatrixfARB( const GLfloat m[16] )
+{
+   GLfloat tm[16];
+   _math_transposef(tm, m);
+   save_MultMatrixf(tm);
+}
+
+
+static void GLAPIENTRY
+save_PixelTexGenSGIX(GLenum mode)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_PIXEL_TEXGEN_SGIX, 1 );
+   if (n) {
+      n[1].e = mode;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->PixelTexGenSGIX)( mode );
+   }
+}
+
+
+/* GL_ARB_texture_compression */
+static void GLAPIENTRY
+save_CompressedTexImage1DARB(GLenum target, GLint level,
+                             GLenum internalFormat, GLsizei width,
+                             GLint border, GLsizei imageSize,
+                             const GLvoid *data)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (target == GL_PROXY_TEXTURE_1D) {
+      /* don't compile, execute immediately */
+      (*ctx->Exec->CompressedTexImage1DARB)(target, level, internalFormat,
+                                            width, border, imageSize, data);
+   }
+   else {
+      Node *n;
+      GLvoid *image;
+      ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+      /* make copy of image */
+      image = MALLOC(imageSize);
+      if (!image) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage1DARB");
+         return;
+      }
+      MEMCPY(image, data, imageSize);
+      n = ALLOC_INSTRUCTION( ctx, OPCODE_COMPRESSED_TEX_IMAGE_1D, 7 );
+      if (n) {
+         n[1].e = target;
+         n[2].i = level;
+         n[3].e = internalFormat;
+         n[4].i = (GLint) width;
+         n[5].i = border;
+         n[6].i = imageSize;
+         n[7].data = image;
+      }
+      else if (image) {
+         FREE(image);
+      }
+      if (ctx->ExecuteFlag) {
+         (*ctx->Exec->CompressedTexImage1DARB)(target, level, internalFormat,
+                                               width, border, imageSize, data);
+      }
+   }
+}
+
+
+static void GLAPIENTRY
+save_CompressedTexImage2DARB(GLenum target, GLint level,
+                             GLenum internalFormat, GLsizei width,
+                             GLsizei height, GLint border, GLsizei imageSize,
+                             const GLvoid *data)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (target == GL_PROXY_TEXTURE_2D) {
+      /* don't compile, execute immediately */
+      (*ctx->Exec->CompressedTexImage2DARB)(target, level, internalFormat,
+                                       width, height, border, imageSize, data);
+   }
+   else {
+      Node *n;
+      GLvoid *image;
+      ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+      /* make copy of image */
+      image = MALLOC(imageSize);
+      if (!image) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage2DARB");
+         return;
+      }
+      MEMCPY(image, data, imageSize);
+      n = ALLOC_INSTRUCTION( ctx, OPCODE_COMPRESSED_TEX_IMAGE_2D, 8 );
+      if (n) {
+         n[1].e = target;
+         n[2].i = level;
+         n[3].e = internalFormat;
+         n[4].i = (GLint) width;
+         n[5].i = (GLint) height;
+         n[6].i = border;
+         n[7].i = imageSize;
+         n[8].data = image;
+      }
+      else if (image) {
+         FREE(image);
+      }
+      if (ctx->ExecuteFlag) {
+         (*ctx->Exec->CompressedTexImage2DARB)(target, level, internalFormat,
+                                      width, height, border, imageSize, data);
+      }
+   }
+}
+
+
+static void GLAPIENTRY
+save_CompressedTexImage3DARB(GLenum target, GLint level,
+                             GLenum internalFormat, GLsizei width,
+                             GLsizei height, GLsizei depth, GLint border,
+                             GLsizei imageSize, const GLvoid *data)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (target == GL_PROXY_TEXTURE_3D) {
+      /* don't compile, execute immediately */
+      (*ctx->Exec->CompressedTexImage3DARB)(target, level, internalFormat,
+                                width, height, depth, border, imageSize, data);
+   }
+   else {
+      Node *n;
+      GLvoid *image;
+      ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+      /* make copy of image */
+      image = MALLOC(imageSize);
+      if (!image) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage3DARB");
+         return;
+      }
+      MEMCPY(image, data, imageSize);
+      n = ALLOC_INSTRUCTION( ctx, OPCODE_COMPRESSED_TEX_IMAGE_3D, 9 );
+      if (n) {
+         n[1].e = target;
+         n[2].i = level;
+         n[3].e = internalFormat;
+         n[4].i = (GLint) width;
+         n[5].i = (GLint) height;
+         n[6].i = (GLint) depth;
+         n[7].i = border;
+         n[8].i = imageSize;
+         n[9].data = image;
+      }
+      else if (image) {
+         FREE(image);
+      }
+      if (ctx->ExecuteFlag) {
+         (*ctx->Exec->CompressedTexImage3DARB)(target, level, internalFormat,
+                                width, height, depth, border, imageSize, data);
+      }
+   }
+}
+
+
+static void GLAPIENTRY
+save_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,
+                                GLsizei width, GLenum format,
+                                GLsizei imageSize, const GLvoid *data)
+{
+   Node *n;
+   GLvoid *image;
+
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+
+   /* make copy of image */
+   image = MALLOC(imageSize);
+   if (!image) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexSubImage1DARB");
+      return;
+   }
+   MEMCPY(image, data, imageSize);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D, 7 );
+   if (n) {
+      n[1].e = target;
+      n[2].i = level;
+      n[3].i = xoffset;
+      n[4].i = (GLint) width;
+      n[5].e = format;
+      n[6].i = imageSize;
+      n[7].data = image;
+   }
+   else if (image) {
+      FREE(image);
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->CompressedTexSubImage1DARB)(target, level, xoffset,
+                                            width, format, imageSize, data);
+   }
+}
+
+
+static void GLAPIENTRY
+save_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,
+                                GLint yoffset, GLsizei width, GLsizei height,
+                                GLenum format, GLsizei imageSize,
+                                const GLvoid *data)
+{
+   Node *n;
+   GLvoid *image;
+
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+
+   /* make copy of image */
+   image = MALLOC(imageSize);
+   if (!image) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexSubImage2DARB");
+      return;
+   }
+   MEMCPY(image, data, imageSize);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D, 9 );
+   if (n) {
+      n[1].e = target;
+      n[2].i = level;
+      n[3].i = xoffset;
+      n[4].i = yoffset;
+      n[5].i = (GLint) width;
+      n[6].i = (GLint) height;
+      n[7].e = format;
+      n[8].i = imageSize;
+      n[9].data = image;
+   }
+   else if (image) {
+      FREE(image);
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->CompressedTexSubImage2DARB)(target, level, xoffset, yoffset,
+                                       width, height, format, imageSize, data);
+   }
+}
+
+
+static void GLAPIENTRY
+save_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
+                                GLint yoffset, GLint zoffset, GLsizei width,
+                                GLsizei height, GLsizei depth, GLenum format,
+                                GLsizei imageSize, const GLvoid *data)
+{
+   Node *n;
+   GLvoid *image;
+
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+
+   /* make copy of image */
+   image = MALLOC(imageSize);
+   if (!image) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexSubImage3DARB");
+      return;
+   }
+   MEMCPY(image, data, imageSize);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D, 11 );
+   if (n) {
+      n[1].e = target;
+      n[2].i = level;
+      n[3].i = xoffset;
+      n[4].i = yoffset;
+      n[5].i = zoffset;
+      n[6].i = (GLint) width;
+      n[7].i = (GLint) height;
+      n[8].i = (GLint) depth;
+      n[9].e = format;
+      n[10].i = imageSize;
+      n[11].data = image;
+   }
+   else if (image) {
+      FREE(image);
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->CompressedTexSubImage3DARB)(target, level, xoffset, yoffset,
+                       zoffset, width, height, depth, format, imageSize, data);
+   }
+}
+
+
+/* GL_ARB_multisample */
+static void GLAPIENTRY
+save_SampleCoverageARB(GLclampf value, GLboolean invert)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_SAMPLE_COVERAGE, 2 );
+   if (n) {
+      n[1].f = value;
+      n[2].b = invert;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->SampleCoverageARB)( value, invert );
+   }
+}
+
+
+/* GL_SGIS_pixel_texture */
+
+static void GLAPIENTRY
+save_PixelTexGenParameteriSGIS(GLenum target, GLint value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_PIXEL_TEXGEN_PARAMETER_SGIS, 2 );
+   if (n) {
+      n[1].e = target;
+      n[2].i = value;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->PixelTexGenParameteriSGIS)( target, value );
+   }
+}
+
+
+static void GLAPIENTRY
+save_PixelTexGenParameterfSGIS(GLenum target, GLfloat value)
+{
+   save_PixelTexGenParameteriSGIS(target, (GLint) value);
+}
+
+
+static void GLAPIENTRY
+save_PixelTexGenParameterivSGIS(GLenum target, const GLint *value)
+{
+   save_PixelTexGenParameteriSGIS(target, *value);
+}
+
+
+static void GLAPIENTRY
+save_PixelTexGenParameterfvSGIS(GLenum target, const GLfloat *value)
+{
+   save_PixelTexGenParameteriSGIS(target, (GLint) *value);
+}
+
+
+/*
+ * GL_NV_vertex_program
+ */
+#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
+static void GLAPIENTRY
+save_BindProgramNV(GLenum target, GLuint id)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_BIND_PROGRAM_NV, 2 );
+   if (n) {
+      n[1].e = target;
+      n[2].ui = id;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->BindProgramNV)( target, id );
+   }
+}
+#endif /* FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program */
+
+#if FEATURE_NV_vertex_program
+static void GLAPIENTRY
+save_ExecuteProgramNV(GLenum target, GLuint id, const GLfloat *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_EXECUTE_PROGRAM_NV, 6 );
+   if (n) {
+      n[1].e = target;
+      n[2].ui = id;
+      n[3].f = params[0];
+      n[4].f = params[1];
+      n[5].f = params[2];
+      n[6].f = params[3];
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ExecuteProgramNV)(target, id, params);
+   }
+}
+
+
+static void GLAPIENTRY
+save_ProgramParameter4fNV(GLenum target, GLuint index,
+                          GLfloat x, GLfloat y,
+                          GLfloat z, GLfloat w)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_PROGRAM_PARAMETER4F_NV, 6 );
+   if (n) {
+      n[1].e = target;
+      n[2].ui = index;
+      n[3].f = x;
+      n[4].f = y;
+      n[5].f = z;
+      n[6].f = w;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ProgramParameter4fNV)(target, index, x, y, z, w);
+   }
+}
+
+
+static void GLAPIENTRY
+save_ProgramParameter4fvNV(GLenum target, GLuint index, const GLfloat *params)
+{
+   save_ProgramParameter4fNV(target, index, params[0], params[1],
+                             params[2], params[3]);
+}
+
+
+static void GLAPIENTRY
+save_ProgramParameter4dNV(GLenum target, GLuint index,
+                          GLdouble x, GLdouble y,
+                          GLdouble z, GLdouble w)
+{
+   save_ProgramParameter4fNV(target, index, (GLfloat) x, (GLfloat) y,
+                             (GLfloat) z, (GLfloat) w);
+}
+
+
+static void GLAPIENTRY
+save_ProgramParameter4dvNV(GLenum target, GLuint index,
+                           const GLdouble *params)
+{
+   save_ProgramParameter4fNV(target, index, (GLfloat) params[0],
+                             (GLfloat) params[1], (GLfloat) params[2],
+                             (GLfloat) params[3]);
+}
+
+
+static void GLAPIENTRY
+save_ProgramParameters4dvNV(GLenum target, GLuint index,
+                            GLuint num, const GLdouble *params)
+{
+   GLuint i;
+   for (i = 0; i < num; i++) {
+      save_ProgramParameter4dvNV(target, index + i, params + 4 * i);
+   }
+}
+
+
+static void GLAPIENTRY
+save_ProgramParameters4fvNV(GLenum target, GLuint index,
+                            GLuint num, const GLfloat *params)
+{
+   GLuint i;
+   for (i = 0; i < num; i++) {
+      save_ProgramParameter4fvNV(target, index + i, params + 4 * i);
+   }
+}
+
+
+static void GLAPIENTRY
+save_LoadProgramNV(GLenum target, GLuint id, GLsizei len,
+                   const GLubyte *program)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   GLubyte *programCopy;
+
+   programCopy = (GLubyte *) _mesa_malloc(len);
+   if (!programCopy) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");
+      return;
+   }
+   _mesa_memcpy(programCopy, program, len);
+
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_LOAD_PROGRAM_NV, 4 );
+   if (n) {
+      n[1].e = target;
+      n[2].ui = id;
+      n[3].i = len;
+      n[4].data = programCopy;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->LoadProgramNV)(target, id, len, program);
+   }
+}
+
+
+static void GLAPIENTRY
+save_RequestResidentProgramsNV(GLsizei num, const GLuint *ids)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   GLuint *idCopy = (GLuint *) _mesa_malloc(num * sizeof(GLuint));
+   if (!idCopy) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glRequestResidentProgramsNV");
+      return;
+   }
+   _mesa_memcpy(idCopy, ids, num * sizeof(GLuint));
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_TRACK_MATRIX_NV, 2 );
+   if (n) {
+      n[1].i = num;
+      n[2].data = idCopy;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->RequestResidentProgramsNV)(num, ids);
+   }
+}
+
+
+static void GLAPIENTRY
+save_TrackMatrixNV(GLenum target, GLuint address,
+                   GLenum matrix, GLenum transform)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_TRACK_MATRIX_NV, 4 );
+   if (n) {
+      n[1].e = target;
+      n[2].ui = address;
+      n[3].e = matrix;
+      n[4].e = transform;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->TrackMatrixNV)(target, address, matrix, transform);
+   }
+}
+#endif /* FEATURE_NV_vertex_program */
+
+
+/*
+ * GL_NV_fragment_program
+ */
+#if FEATURE_NV_fragment_program
+static void GLAPIENTRY
+save_ProgramLocalParameter4fARB(GLenum target, GLuint index,
+                                GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_PROGRAM_LOCAL_PARAMETER_ARB, 6 );
+   if (n) {
+      n[1].e = target;
+      n[2].ui = index;
+      n[3].f = x;
+      n[4].f = y;
+      n[5].f = z;
+      n[6].f = w;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ProgramLocalParameter4fARB)(target, index, x, y, z, w);
+   }
+}
+
+
+static void GLAPIENTRY
+save_ProgramLocalParameter4fvARB(GLenum target, GLuint index,
+                                 const GLfloat *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_PROGRAM_LOCAL_PARAMETER_ARB, 6 );
+   if (n) {
+      n[1].e = target;
+      n[2].ui = index;
+      n[3].f = params[0];
+      n[4].f = params[1];
+      n[5].f = params[2];
+      n[6].f = params[3];
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ProgramLocalParameter4fvARB)(target, index, params);
+   }
+}
+
+
+static void GLAPIENTRY
+save_ProgramLocalParameter4dARB(GLenum target, GLuint index,
+                                GLdouble x, GLdouble y,
+                                GLdouble z, GLdouble w)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_PROGRAM_LOCAL_PARAMETER_ARB, 6 );
+   if (n) {
+      n[1].e = target;
+      n[2].ui = index;
+      n[3].f = (GLfloat) x;
+      n[4].f = (GLfloat) y;
+      n[5].f = (GLfloat) z;
+      n[6].f = (GLfloat) w;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ProgramLocalParameter4dARB)(target, index, x, y, z, w);
+   }
+}
+
+
+static void GLAPIENTRY
+save_ProgramLocalParameter4dvARB(GLenum target, GLuint index,
+                                 const GLdouble *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_PROGRAM_LOCAL_PARAMETER_ARB, 6 );
+   if (n) {
+      n[1].e = target;
+      n[2].ui = index;
+      n[3].f = (GLfloat) params[0];
+      n[4].f = (GLfloat) params[1];
+      n[5].f = (GLfloat) params[2];
+      n[6].f = (GLfloat) params[3];
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ProgramLocalParameter4dvARB)(target, index, params);
+   }
+}
+
+static void GLAPIENTRY
+save_ProgramNamedParameter4fNV(GLuint id, GLsizei len, const GLubyte *name,
+                               GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   GLubyte *nameCopy = (GLubyte *) _mesa_malloc(len);
+   if (!nameCopy) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glProgramNamedParameter4fNV");
+      return;
+   }
+   _mesa_memcpy(nameCopy, name, len);
+
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_PROGRAM_NAMED_PARAMETER_NV, 6 );
+   if (n) {
+      n[1].ui = id;
+      n[2].i = len;
+      n[3].data = nameCopy;
+      n[4].f = x;
+      n[5].f = y;
+      n[6].f = z;
+      n[7].f = w;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ProgramNamedParameter4fNV)(id, len, name, x, y, z, w);
+   }
+}
+
+
+static void GLAPIENTRY
+save_ProgramNamedParameter4fvNV(GLuint id, GLsizei len, const GLubyte *name,
+                                const float v[])
+{
+   save_ProgramNamedParameter4fNV(id, len, name, v[0], v[1], v[2], v[3]);
+}
+
+
+static void GLAPIENTRY
+save_ProgramNamedParameter4dNV(GLuint id, GLsizei len, const GLubyte *name,
+                               GLdouble x, GLdouble y, GLdouble z, GLdouble w)
+{
+   save_ProgramNamedParameter4fNV(id, len, name, (GLfloat) x, (GLfloat) y,
+                                  (GLfloat) z,(GLfloat) w);
+}
+
+
+static void GLAPIENTRY
+save_ProgramNamedParameter4dvNV(GLuint id, GLsizei len, const GLubyte *name,
+                                const double v[])
+{
+   save_ProgramNamedParameter4fNV(id, len, name, (GLfloat) v[0],
+                                  (GLfloat) v[1], (GLfloat) v[2],
+                                  (GLfloat) v[3]);
+}
+
+#endif /* FEATURE_NV_fragment_program */
+
+
+
+/* GL_EXT_stencil_two_side */
+static void GLAPIENTRY save_ActiveStencilFaceEXT( GLenum face )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_ACTIVE_STENCIL_FACE_EXT, 1 );
+   if (n) {
+      n[1].e = face;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ActiveStencilFaceEXT)( face );
+   }
+}
+
+
+/* GL_EXT_depth_bounds_test */
+static void GLAPIENTRY save_DepthBoundsEXT( GLclampd zmin, GLclampd zmax )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_ACTIVE_STENCIL_FACE_EXT, 2 );
+   if (n) {
+      n[1].f = (GLfloat) zmin;
+      n[2].f = (GLfloat) zmax;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->DepthBoundsEXT)( zmin, zmax );
+   }
+}
+
+
+
+#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
+
+static void GLAPIENTRY
+save_ProgramStringARB(GLenum target, GLenum format, GLsizei len,
+                      const GLvoid *string)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   GLubyte *programCopy;
+
+   programCopy = (GLubyte *) _mesa_malloc(len);
+   if (!programCopy) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glProgramStringARB");
+      return;
+   }
+   _mesa_memcpy(programCopy, string, len);
+
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_PROGRAM_STRING_ARB, 4 );
+   if (n) {
+      n[1].e = target;
+      n[2].e = format;
+      n[3].i = len;
+      n[4].data = programCopy;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ProgramStringARB)(target, format, len, string);
+   }
+}
+
+
+static void GLAPIENTRY
+save_ProgramEnvParameter4fARB(GLenum target, GLuint index,
+                              GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_PROGRAM_ENV_PARAMETER_ARB, 6 );
+   if (n) {
+      n[1].e = target;
+      n[2].ui = index;
+      n[3].f = x;
+      n[4].f = y;
+      n[5].f = z;
+      n[6].f = w;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->ProgramEnvParameter4fARB)( target, index, x, y, z, w);
+   }
+}
+
+
+static void GLAPIENTRY
+save_ProgramEnvParameter4fvARB(GLenum target, GLuint index,
+                               const GLfloat *params)
+{
+   save_ProgramEnvParameter4fARB(target, index, params[0], params[1],
+                                 params[2], params[3]);
+}
+
+
+static void GLAPIENTRY
+save_ProgramEnvParameter4dARB(GLenum target, GLuint index,
+                              GLdouble x, GLdouble y, GLdouble z, GLdouble w)
+{
+   save_ProgramEnvParameter4fARB(target, index,
+                                 (GLfloat) x,
+                                 (GLfloat) y,
+                                 (GLfloat) z,
+                                 (GLfloat) w);
+}
+
+
+static void GLAPIENTRY
+save_ProgramEnvParameter4dvARB(GLenum target, GLuint index,
+                               const GLdouble *params)
+{
+   save_ProgramEnvParameter4fARB(target, index,
+                                 (GLfloat) params[0],
+                                 (GLfloat) params[1],
+                                 (GLfloat) params[2],
+                                 (GLfloat) params[3]);
+}
+
+#endif /* FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program */
+
+
+
+
+static void save_Attr1f( GLenum attr, GLfloat x )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   SAVE_FLUSH_VERTICES( ctx );
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_ATTR_1F, 2 );
+   if (n) {
+      n[1].e = attr;
+      n[2].f = x;
+   }
+
+   ctx->ListState.ActiveAttribSize[attr] = 1;
+   ASSIGN_4V( ctx->ListState.CurrentAttrib[attr], x, 0, 0, 1);
+
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->VertexAttrib1fNV)( attr, x );
+   }
+}
+
+static void save_Attr2f( GLenum attr, GLfloat x, GLfloat y )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   SAVE_FLUSH_VERTICES( ctx );
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_ATTR_2F, 3 );
+   if (n) {
+      n[1].e = attr;
+      n[2].f = x;
+      n[3].f = y;
+   }
+
+   ctx->ListState.ActiveAttribSize[attr] = 2;
+   ASSIGN_4V( ctx->ListState.CurrentAttrib[attr], x, y, 0, 1);
+
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->VertexAttrib2fNV)( attr, x, y );
+   }
+}
+
+static void save_Attr3f( GLenum attr, GLfloat x, GLfloat y, GLfloat z )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   SAVE_FLUSH_VERTICES( ctx );
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_ATTR_3F, 4 );
+   if (n) {
+      n[1].e = attr;
+      n[2].f = x;
+      n[3].f = y;
+      n[4].f = z;
+   }
+
+   ctx->ListState.ActiveAttribSize[attr] = 3;
+   ASSIGN_4V( ctx->ListState.CurrentAttrib[attr], x, y, z, 1);
+
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->VertexAttrib3fNV)( attr, x, y, z );
+   }
+}
+
+static void save_Attr4f( GLenum attr, GLfloat x, GLfloat y, GLfloat z,
+			 GLfloat w )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   SAVE_FLUSH_VERTICES( ctx );
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_ATTR_4F, 5 );
+   if (n) {
+      n[1].e = attr;
+      n[2].f = x;
+      n[3].f = y;
+      n[4].f = z;
+      n[5].f = w;
+   }
+
+   ctx->ListState.ActiveAttribSize[attr] = 4;
+   ASSIGN_4V( ctx->ListState.CurrentAttrib[attr], x, y, z, w);
+
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->VertexAttrib4fNV)( attr, x, y, z, w );
+   }
+}
+
+static void GLAPIENTRY save_EvalCoord1f( GLfloat x )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   SAVE_FLUSH_VERTICES( ctx );
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_EVAL_C1, 1 );
+   if (n) {
+      n[1].f = x;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->EvalCoord1f)( x );
+   }
+}
+
+static void GLAPIENTRY save_EvalCoord1fv( const GLfloat *v )
+{
+   save_EvalCoord1f( v[0] );
+}
+
+static void GLAPIENTRY save_EvalCoord2f( GLfloat x, GLfloat y )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   SAVE_FLUSH_VERTICES( ctx );
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_EVAL_C2, 2 );
+   if (n) {
+      n[1].f = x;
+      n[2].f = y;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->EvalCoord2f)( x, y );
+   }
+}
+
+static void GLAPIENTRY save_EvalCoord2fv( const GLfloat *v )
+{
+   save_EvalCoord2f( v[0], v[1] );
+}
+
+
+static void GLAPIENTRY save_EvalPoint1( GLint x )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   SAVE_FLUSH_VERTICES( ctx );
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_EVAL_P1, 1 );
+   if (n) {
+      n[1].i = x;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->EvalPoint1)( x );
+   }
+}
+
+static void GLAPIENTRY save_EvalPoint2( GLint x, GLint y )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   SAVE_FLUSH_VERTICES( ctx );
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_EVAL_P2, 2 );
+   if (n) {
+      n[1].i = x;
+      n[2].i = y;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->EvalPoint2)( x, y );
+   }
+}
+
+static void GLAPIENTRY save_Indexf( GLfloat x )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   SAVE_FLUSH_VERTICES( ctx );
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_INDEX, 1 );
+   if (n) {
+      n[1].f = x;
+   }
+
+   ctx->ListState.ActiveIndex = 1;
+   ctx->ListState.CurrentIndex = x;
+
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->Indexi)( (GLint) x );
+   }
+}
+
+static void GLAPIENTRY save_Indexfv( const GLfloat *v )
+{
+   save_Indexf( v[0] );
+}
+
+static void GLAPIENTRY save_EdgeFlag( GLboolean x )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   SAVE_FLUSH_VERTICES( ctx );
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_EDGEFLAG, 1 );
+   if (n) {
+      n[1].b = x;
+   }
+
+   ctx->ListState.ActiveEdgeFlag = 1;
+   ctx->ListState.CurrentEdgeFlag = x;
+
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->EdgeFlag)( x );
+   }
+}
+
+static void GLAPIENTRY save_EdgeFlagv( const GLboolean *v )
+{
+   save_EdgeFlag( v[0] );
+}
+
+static void GLAPIENTRY save_Materialfv( GLenum face, GLenum pname, const GLfloat *param )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   int args, i;
+
+   SAVE_FLUSH_VERTICES( ctx );
+
+   switch (face) {
+   case GL_BACK:
+   case GL_FRONT:
+   case GL_FRONT_AND_BACK:
+      break;
+   default:
+      _mesa_compile_error( ctx, GL_INVALID_ENUM, "material(face)" );
+      return;
+   }
+
+   switch (pname) {
+   case GL_EMISSION:
+   case GL_AMBIENT:
+   case GL_DIFFUSE:
+   case GL_SPECULAR:
+   case GL_AMBIENT_AND_DIFFUSE:
+      args = 4;
+      break;
+   case GL_SHININESS:
+      args = 1;
+      break;
+   case GL_COLOR_INDEXES:
+      args = 3;
+      break;
+   default:
+      _mesa_compile_error( ctx, GL_INVALID_ENUM, "material(pname)" );
+      return;
+   }
+
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_MATERIAL, 6 );
+   if (n) {
+      n[1].e = face;
+      n[2].e = pname;
+      for (i = 0 ; i < args ; i++)
+	 n[3+i].f = param[i];
+   }
+
+   {
+      GLuint bitmask = _mesa_material_bitmask( ctx, face, pname, ~0, 0 );
+      for (i = 0 ; i < MAT_ATTRIB_MAX ; i++) 
+	 if (bitmask & (1<<i)) {
+	    ctx->ListState.ActiveMaterialSize[i] = args;
+	    COPY_SZ_4V( ctx->ListState.CurrentMaterial[i], args, param );
+	 }
+   }
+
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->Materialfv)( face, pname, param );
+   }
+}
+
+static void GLAPIENTRY save_Begin( GLenum mode )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   GLboolean error = GL_FALSE;
+
+   if (/*mode < GL_POINTS ||*/ mode > GL_POLYGON) {
+      _mesa_compile_error( ctx, GL_INVALID_ENUM, "Begin (mode)");
+      error = GL_TRUE;
+   }
+   else if (ctx->Driver.CurrentSavePrimitive == PRIM_UNKNOWN) {
+      /* Typically the first begin.  This may raise an error on
+       * playback, depending on whether CallList is issued from inside
+       * a begin/end or not.
+       */
+      ctx->Driver.CurrentSavePrimitive = PRIM_INSIDE_UNKNOWN_PRIM;
+   }
+   else if (ctx->Driver.CurrentSavePrimitive == PRIM_OUTSIDE_BEGIN_END) {
+      ctx->Driver.CurrentSavePrimitive = mode;
+   }
+   else {
+      _mesa_compile_error( ctx, GL_INVALID_OPERATION, "recursive begin" );
+      error = GL_TRUE;
+   }
+
+   if (!error) {
+      /* Give the driver an opportunity to hook in an optimized
+       * display list compiler.
+       */
+      if (ctx->Driver.NotifySaveBegin( ctx, mode ))
+	 return;
+
+      SAVE_FLUSH_VERTICES( ctx );
+      n = ALLOC_INSTRUCTION( ctx, OPCODE_BEGIN, 1 );
+      if (n) {
+	 n[1].e = mode;
+      }
+   }
+
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->Begin)( mode );
+   }
+}
+
+static void GLAPIENTRY save_End( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   SAVE_FLUSH_VERTICES( ctx );
+   (void) ALLOC_INSTRUCTION( ctx, OPCODE_END, 0 );
+   ctx->Driver.CurrentSavePrimitive = PRIM_OUTSIDE_BEGIN_END;
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->End)( );
+   }
+}
+
+static void GLAPIENTRY save_Rectf( GLfloat a, GLfloat b,
+			GLfloat c, GLfloat d )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   Node *n;
+   SAVE_FLUSH_VERTICES( ctx );
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_RECTF, 4 );
+   if (n) {
+      n[1].f = a;
+      n[2].f = b;
+      n[3].f = c;
+      n[4].f = d;
+   }
+   if (ctx->ExecuteFlag) {
+      (*ctx->Exec->Rectf)( a, b, c, d );
+   }
+}
+
+/*
+ */
+static void GLAPIENTRY save_Vertex2f( GLfloat x, GLfloat y )
+{
+   save_Attr2f( VERT_ATTRIB_POS, x, y );
+}
+
+static void GLAPIENTRY save_Vertex2fv( const GLfloat *v )
+{
+   save_Attr2f( VERT_ATTRIB_POS, v[0], v[1] );
+}
+
+static void GLAPIENTRY save_Vertex3f( GLfloat x, GLfloat y, GLfloat z )
+{
+   save_Attr3f( VERT_ATTRIB_POS, x, y, z );
+}
+
+static void GLAPIENTRY save_Vertex3fv( const GLfloat *v )
+{
+   save_Attr3f( VERT_ATTRIB_POS, v[0], v[1], v[2] );
+}
+
+static void GLAPIENTRY save_Vertex4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w )
+{
+   save_Attr4f( VERT_ATTRIB_POS, x, y, z, w );
+}
+
+static void GLAPIENTRY save_Vertex4fv( const GLfloat *v )
+{
+   save_Attr4f( VERT_ATTRIB_POS, v[0], v[1], v[2], v[3] );
+}
+
+static void GLAPIENTRY save_TexCoord1f( GLfloat x )
+{
+   save_Attr1f( VERT_ATTRIB_TEX0, x );
+}
+
+static void GLAPIENTRY save_TexCoord1fv( const GLfloat *v )
+{
+   save_Attr1f( VERT_ATTRIB_TEX0, v[0] );
+}
+
+static void GLAPIENTRY save_TexCoord2f( GLfloat x, GLfloat y )
+{
+   save_Attr2f( VERT_ATTRIB_TEX0, x, y );
+}
+
+static void GLAPIENTRY save_TexCoord2fv( const GLfloat *v )
+{
+   save_Attr2f( VERT_ATTRIB_TEX0, v[0], v[1] );
+}
+
+static void GLAPIENTRY save_TexCoord3f( GLfloat x, GLfloat y, GLfloat z )
+{
+   save_Attr3f( VERT_ATTRIB_TEX0, x, y, z );
+}
+
+static void GLAPIENTRY save_TexCoord3fv( const GLfloat *v )
+{
+   save_Attr3f( VERT_ATTRIB_TEX0, v[0], v[1], v[2] );
+}
+
+static void GLAPIENTRY save_TexCoord4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w )
+{
+   save_Attr4f( VERT_ATTRIB_TEX0, x, y, z, w );
+}
+
+static void GLAPIENTRY save_TexCoord4fv( const GLfloat *v )
+{
+   save_Attr4f( VERT_ATTRIB_TEX0, v[0], v[1], v[2], v[3] );
+}
+
+static void GLAPIENTRY save_Normal3f( GLfloat x, GLfloat y, GLfloat z )
+{
+   save_Attr3f( VERT_ATTRIB_NORMAL, x, y, z );
+}
+
+static void GLAPIENTRY save_Normal3fv( const GLfloat *v )
+{
+   save_Attr3f( VERT_ATTRIB_NORMAL, v[0], v[1], v[2] );
+}
+
+static void GLAPIENTRY save_FogCoordfEXT( GLfloat x )
+{
+   save_Attr1f( VERT_ATTRIB_FOG, x );
+}
+
+static void GLAPIENTRY save_FogCoordfvEXT( const GLfloat *v )
+{
+   save_Attr1f( VERT_ATTRIB_FOG, v[0] );
+}
+
+static void GLAPIENTRY save_Color3f( GLfloat x, GLfloat y, GLfloat z )
+{
+   save_Attr3f( VERT_ATTRIB_COLOR0, x, y, z );
+}
+
+static void GLAPIENTRY save_Color3fv( const GLfloat *v )
+{
+   save_Attr3f( VERT_ATTRIB_COLOR0, v[0], v[1], v[2] );
+}
+
+static void GLAPIENTRY save_Color4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w )
+{
+   save_Attr4f( VERT_ATTRIB_COLOR0, x, y, z, w );
+}
+
+static void GLAPIENTRY save_Color4fv( const GLfloat *v )
+{
+   save_Attr4f( VERT_ATTRIB_COLOR0, v[0], v[1], v[2], v[3] );
+}
+
+static void GLAPIENTRY save_SecondaryColor3fEXT( GLfloat x, GLfloat y, GLfloat z )
+{
+   save_Attr3f( VERT_ATTRIB_COLOR1, x, y, z );
+}
+
+static void GLAPIENTRY save_SecondaryColor3fvEXT( const GLfloat *v )
+{
+   save_Attr3f( VERT_ATTRIB_COLOR1, v[0], v[1], v[2] );
+}
+
+
+/* Just call the respective ATTR for texcoord
+ */
+static void GLAPIENTRY save_MultiTexCoord1f( GLenum target, GLfloat x  )
+{
+   GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0;
+   save_Attr1f( attr, x );
+}
+
+static void GLAPIENTRY save_MultiTexCoord1fv( GLenum target, const GLfloat *v )
+{
+   GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0;
+   save_Attr1f( attr, v[0] );
+}
+
+static void GLAPIENTRY save_MultiTexCoord2f( GLenum target, GLfloat x, GLfloat y )
+{
+   GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0;
+   save_Attr2f( attr, x, y );
+}
+
+static void GLAPIENTRY save_MultiTexCoord2fv( GLenum target, const GLfloat *v )
+{
+   GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0;
+   save_Attr2f( attr, v[0], v[1] );
+}
+
+static void GLAPIENTRY save_MultiTexCoord3f( GLenum target, GLfloat x, GLfloat y,
+				    GLfloat z)
+{
+   GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0;
+   save_Attr3f( attr, x, y, z );
+}
+
+static void GLAPIENTRY save_MultiTexCoord3fv( GLenum target, const GLfloat *v )
+{
+   GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0;
+   save_Attr3f( attr, v[0], v[1], v[2] );
+}
+
+static void GLAPIENTRY save_MultiTexCoord4f( GLenum target, GLfloat x, GLfloat y,
+				  GLfloat z, GLfloat w )
+{
+   GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0;
+   save_Attr4f( attr, x, y, z, w );
+}
+
+static void GLAPIENTRY save_MultiTexCoord4fv( GLenum target, const GLfloat *v )
+{
+   GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0;
+   save_Attr4f( attr, v[0], v[1], v[2], v[3] );
+}
+
+
+static void enum_error() 
+{
+   GET_CURRENT_CONTEXT( ctx );
+   _mesa_error( ctx, GL_INVALID_ENUM, "VertexAttribfNV" );
+}
+
+/* First level for NV_vertex_program:
+ *
+ * Check for errors at compile time?.
+ */
+static void GLAPIENTRY save_VertexAttrib1fNV( GLuint index, GLfloat x )
+{
+   if (index < VERT_ATTRIB_MAX)
+      save_Attr1f( index, x );
+   else
+      enum_error(); 
+}
+
+static void GLAPIENTRY save_VertexAttrib1fvNV( GLuint index, const GLfloat *v )
+{
+   if (index < VERT_ATTRIB_MAX)
+      save_Attr1f( index, v[0] );
+   else
+      enum_error();
+}
+
+static void GLAPIENTRY save_VertexAttrib2fNV( GLuint index, GLfloat x, GLfloat y )
+{
+   if (index < VERT_ATTRIB_MAX)
+      save_Attr2f( index, x, y );
+   else
+      enum_error();
+}
+
+static void GLAPIENTRY save_VertexAttrib2fvNV( GLuint index, const GLfloat *v )
+{
+   if (index < VERT_ATTRIB_MAX)
+      save_Attr2f( index, v[0], v[1] );
+   else
+      enum_error();
+}
+
+static void GLAPIENTRY save_VertexAttrib3fNV( GLuint index, GLfloat x, GLfloat y, 
+				   GLfloat z )
+{
+   if (index < VERT_ATTRIB_MAX)
+      save_Attr3f( index, x, y, z );
+   else
+      enum_error();
+}
+
+static void GLAPIENTRY save_VertexAttrib3fvNV( GLuint index, const GLfloat *v )
+{
+   if (index < VERT_ATTRIB_MAX)
+      save_Attr3f( index, v[0], v[1], v[2] );
+   else
+      enum_error();
+}
+
+static void GLAPIENTRY save_VertexAttrib4fNV( GLuint index, GLfloat x, GLfloat y,
+				   GLfloat z, GLfloat w )
+{
+   if (index < VERT_ATTRIB_MAX)
+      save_Attr4f( index, x, y, z, w );
+   else
+      enum_error();
+}
+
+static void GLAPIENTRY save_VertexAttrib4fvNV( GLuint index, const GLfloat *v )
+{
+   if (index < VERT_ATTRIB_MAX)
+      save_Attr4f( index, v[0], v[1], v[2], v[3] );
+   else
+      enum_error();
+}
+
+
+
+
+
+/* KW: Compile commands
+ *
+ * Will appear in the list before the vertex buffer containing the
+ * command that provoked the error.  I don't see this as a problem.
+ */
+void
+_mesa_save_error( GLcontext *ctx, GLenum error, const char *s )
+{
+   Node *n;
+   n = ALLOC_INSTRUCTION( ctx, OPCODE_ERROR, 2 );
+   if (n) {
+      n[1].e = error;
+      n[2].data = (void *) s;
+   }
+   /* execute already done */
+}
+
+
+/*
+ * Compile an error into current display list.
+ */
+void
+_mesa_compile_error( GLcontext *ctx, GLenum error, const char *s )
+{
+   if (ctx->CompileFlag)
+      _mesa_save_error( ctx, error, s );
+
+   if (ctx->ExecuteFlag)
+      _mesa_error( ctx, error, s );
+}
+
+
+
+static GLboolean
+islist(GLcontext *ctx, GLuint list)
+{
+   if (list > 0 && _mesa_HashLookup(ctx->Shared->DisplayList, list)) {
+      return GL_TRUE;
+   }
+   else {
+      return GL_FALSE;
+   }
+}
+
+
+
+/**********************************************************************/
+/*                     Display list execution                         */
+/**********************************************************************/
+
+
+/*
+ * Execute a display list.  Note that the ListBase offset must have already
+ * been added before calling this function.  I.e. the list argument is
+ * the absolute list number, not relative to ListBase.
+ * \param list - display list number
+ */
+static void GLAPIENTRY
+execute_list( GLcontext *ctx, GLuint list )
+{
+   Node *n;
+   GLboolean done;
+
+   if (list == 0 || !islist(ctx,list))
+      return;
+
+   if (ctx->Driver.BeginCallList)
+      ctx->Driver.BeginCallList( ctx, list );
+
+   ctx->ListState.CallDepth++;
+
+   n = (Node *) _mesa_HashLookup(ctx->Shared->DisplayList, list);
+
+   done = GL_FALSE;
+   while (!done) {
+      OpCode opcode = n[0].opcode;
+      int i = (int)n[0].opcode - (int)OPCODE_DRV_0;
+
+      if (i >= 0 && i < (GLint) ctx->listext.nr_opcodes) {
+	 ctx->listext.opcode[i].execute(ctx, &n[1]);
+	 n += ctx->listext.opcode[i].size;
+      }
+      else {
+	 switch (opcode) {
+	 case OPCODE_ERROR:
+	    _mesa_error( ctx, n[1].e, (const char *) n[2].data );
+	    break;
+         case OPCODE_ACCUM:
+	    (*ctx->Exec->Accum)( n[1].e, n[2].f );
+	    break;
+         case OPCODE_ALPHA_FUNC:
+	    (*ctx->Exec->AlphaFunc)( n[1].e, n[2].f );
+	    break;
+         case OPCODE_BIND_TEXTURE:
+            (*ctx->Exec->BindTexture)( n[1].e, n[2].ui );
+            break;
+	 case OPCODE_BITMAP:
+            {
+               struct gl_pixelstore_attrib save = ctx->Unpack;
+               ctx->Unpack = _mesa_native_packing;
+               (*ctx->Exec->Bitmap)( (GLsizei) n[1].i, (GLsizei) n[2].i,
+                 n[3].f, n[4].f, n[5].f, n[6].f, (const GLubyte *) n[7].data );
+               ctx->Unpack = save;  /* restore */
+            }
+	    break;
+	 case OPCODE_BLEND_COLOR:
+	    (*ctx->Exec->BlendColor)( n[1].f, n[2].f, n[3].f, n[4].f );
+	    break;
+	 case OPCODE_BLEND_EQUATION:
+	    (*ctx->Exec->BlendEquation)( n[1].e );
+	    break;
+	 case OPCODE_BLEND_FUNC:
+	    (*ctx->Exec->BlendFunc)( n[1].e, n[2].e );
+	    break;
+	 case OPCODE_BLEND_FUNC_SEPARATE:
+	    (*ctx->Exec->BlendFuncSeparateEXT)(n[1].e, n[2].e, n[3].e, n[4].e);
+	    break;
+         case OPCODE_CALL_LIST:
+	    /* Generated by glCallList(), don't add ListBase */
+            if (ctx->ListState.CallDepth<MAX_LIST_NESTING) {
+               execute_list( ctx, n[1].ui );
+            }
+            break;
+         case OPCODE_CALL_LIST_OFFSET:
+	    /* Generated by glCallLists() so we must add ListBase */
+            if (n[2].b) {
+               /* user specified a bad data type at compile time */
+               _mesa_error(ctx, GL_INVALID_ENUM, "glCallLists(type)");
+            }
+            else if (ctx->ListState.CallDepth < MAX_LIST_NESTING) {
+               execute_list( ctx, ctx->List.ListBase + n[1].ui );
+            }
+            break;
+	 case OPCODE_CLEAR:
+	    (*ctx->Exec->Clear)( n[1].bf );
+	    break;
+	 case OPCODE_CLEAR_COLOR:
+	    (*ctx->Exec->ClearColor)( n[1].f, n[2].f, n[3].f, n[4].f );
+	    break;
+	 case OPCODE_CLEAR_ACCUM:
+	    (*ctx->Exec->ClearAccum)( n[1].f, n[2].f, n[3].f, n[4].f );
+	    break;
+	 case OPCODE_CLEAR_DEPTH:
+	    (*ctx->Exec->ClearDepth)( (GLclampd) n[1].f );
+	    break;
+	 case OPCODE_CLEAR_INDEX:
+	    (*ctx->Exec->ClearIndex)( (GLfloat) n[1].ui );
+	    break;
+	 case OPCODE_CLEAR_STENCIL:
+	    (*ctx->Exec->ClearStencil)( n[1].i );
+	    break;
+         case OPCODE_CLIP_PLANE:
+            {
+               GLdouble eq[4];
+               eq[0] = n[2].f;
+               eq[1] = n[3].f;
+               eq[2] = n[4].f;
+               eq[3] = n[5].f;
+               (*ctx->Exec->ClipPlane)( n[1].e, eq );
+            }
+            break;
+	 case OPCODE_COLOR_MASK:
+	    (*ctx->Exec->ColorMask)( n[1].b, n[2].b, n[3].b, n[4].b );
+	    break;
+	 case OPCODE_COLOR_MATERIAL:
+	    (*ctx->Exec->ColorMaterial)( n[1].e, n[2].e );
+	    break;
+         case OPCODE_COLOR_TABLE:
+            {
+               struct gl_pixelstore_attrib save = ctx->Unpack;
+               ctx->Unpack = _mesa_native_packing;
+               (*ctx->Exec->ColorTable)( n[1].e, n[2].e, n[3].i, n[4].e,
+                                         n[5].e, n[6].data );
+               ctx->Unpack = save;  /* restore */
+            }
+            break;
+         case OPCODE_COLOR_TABLE_PARAMETER_FV:
+            {
+               GLfloat params[4];
+               params[0] = n[3].f;
+               params[1] = n[4].f;
+               params[2] = n[5].f;
+               params[3] = n[6].f;
+               (*ctx->Exec->ColorTableParameterfv)( n[1].e, n[2].e, params );
+            }
+            break;
+         case OPCODE_COLOR_TABLE_PARAMETER_IV:
+            {
+               GLint params[4];
+               params[0] = n[3].i;
+               params[1] = n[4].i;
+               params[2] = n[5].i;
+               params[3] = n[6].i;
+               (*ctx->Exec->ColorTableParameteriv)( n[1].e, n[2].e, params );
+            }
+            break;
+         case OPCODE_COLOR_SUB_TABLE:
+            {
+               struct gl_pixelstore_attrib save = ctx->Unpack;
+               ctx->Unpack = _mesa_native_packing;
+               (*ctx->Exec->ColorSubTable)( n[1].e, n[2].i, n[3].i,
+                                            n[4].e, n[5].e, n[6].data );
+               ctx->Unpack = save;  /* restore */
+            }
+            break;
+         case OPCODE_CONVOLUTION_FILTER_1D:
+            {
+               struct gl_pixelstore_attrib save = ctx->Unpack;
+               ctx->Unpack = _mesa_native_packing;
+               (*ctx->Exec->ConvolutionFilter1D)( n[1].e, n[2].i, n[3].i,
+                                                  n[4].e, n[5].e, n[6].data );
+               ctx->Unpack = save;  /* restore */
+            }
+            break;
+         case OPCODE_CONVOLUTION_FILTER_2D:
+            {
+               struct gl_pixelstore_attrib save = ctx->Unpack;
+               ctx->Unpack = _mesa_native_packing;
+               (*ctx->Exec->ConvolutionFilter2D)( n[1].e, n[2].i, n[3].i,
+                                       n[4].i, n[5].e, n[6].e, n[7].data );
+               ctx->Unpack = save;  /* restore */
+            }
+            break;
+         case OPCODE_CONVOLUTION_PARAMETER_I:
+            (*ctx->Exec->ConvolutionParameteri)( n[1].e, n[2].e, n[3].i );
+            break;
+         case OPCODE_CONVOLUTION_PARAMETER_IV:
+            {
+               GLint params[4];
+               params[0] = n[3].i;
+               params[1] = n[4].i;
+               params[2] = n[5].i;
+               params[3] = n[6].i;
+               (*ctx->Exec->ConvolutionParameteriv)( n[1].e, n[2].e, params );
+            }
+            break;
+         case OPCODE_CONVOLUTION_PARAMETER_F:
+            (*ctx->Exec->ConvolutionParameterf)( n[1].e, n[2].e, n[3].f );
+            break;
+         case OPCODE_CONVOLUTION_PARAMETER_FV:
+            {
+               GLfloat params[4];
+               params[0] = n[3].f;
+               params[1] = n[4].f;
+               params[2] = n[5].f;
+               params[3] = n[6].f;
+               (*ctx->Exec->ConvolutionParameterfv)( n[1].e, n[2].e, params );
+            }
+            break;
+         case OPCODE_COPY_COLOR_SUB_TABLE:
+            (*ctx->Exec->CopyColorSubTable)( n[1].e, n[2].i,
+                                             n[3].i, n[4].i, n[5].i );
+            break;
+         case OPCODE_COPY_COLOR_TABLE:
+            (*ctx->Exec->CopyColorSubTable)( n[1].e, n[2].i,
+                                             n[3].i, n[4].i, n[5].i );
+            break;
+	 case OPCODE_COPY_PIXELS:
+	    (*ctx->Exec->CopyPixels)( n[1].i, n[2].i,
+			   (GLsizei) n[3].i, (GLsizei) n[4].i, n[5].e );
+	    break;
+         case OPCODE_COPY_TEX_IMAGE1D:
+	    (*ctx->Exec->CopyTexImage1D)( n[1].e, n[2].i, n[3].e, n[4].i,
+                                         n[5].i, n[6].i, n[7].i );
+            break;
+         case OPCODE_COPY_TEX_IMAGE2D:
+	    (*ctx->Exec->CopyTexImage2D)( n[1].e, n[2].i, n[3].e, n[4].i,
+                                         n[5].i, n[6].i, n[7].i, n[8].i );
+            break;
+         case OPCODE_COPY_TEX_SUB_IMAGE1D:
+	    (*ctx->Exec->CopyTexSubImage1D)( n[1].e, n[2].i, n[3].i,
+                                            n[4].i, n[5].i, n[6].i );
+            break;
+         case OPCODE_COPY_TEX_SUB_IMAGE2D:
+	    (*ctx->Exec->CopyTexSubImage2D)( n[1].e, n[2].i, n[3].i,
+                                     n[4].i, n[5].i, n[6].i, n[7].i, n[8].i );
+            break;
+         case OPCODE_COPY_TEX_SUB_IMAGE3D:
+            (*ctx->Exec->CopyTexSubImage3D)( n[1].e, n[2].i, n[3].i,
+                            n[4].i, n[5].i, n[6].i, n[7].i, n[8].i , n[9].i);
+            break;
+	 case OPCODE_CULL_FACE:
+	    (*ctx->Exec->CullFace)( n[1].e );
+	    break;
+	 case OPCODE_DEPTH_FUNC:
+	    (*ctx->Exec->DepthFunc)( n[1].e );
+	    break;
+	 case OPCODE_DEPTH_MASK:
+	    (*ctx->Exec->DepthMask)( n[1].b );
+	    break;
+	 case OPCODE_DEPTH_RANGE:
+	    (*ctx->Exec->DepthRange)( (GLclampd) n[1].f, (GLclampd) n[2].f );
+	    break;
+	 case OPCODE_DISABLE:
+	    (*ctx->Exec->Disable)( n[1].e );
+	    break;
+	 case OPCODE_DRAW_BUFFER:
+	    (*ctx->Exec->DrawBuffer)( n[1].e );
+	    break;
+	 case OPCODE_DRAW_PIXELS:
+            {
+               struct gl_pixelstore_attrib save = ctx->Unpack;
+               ctx->Unpack = _mesa_native_packing;
+               (*ctx->Exec->DrawPixels)( n[1].i, n[2].i, n[3].e, n[4].e,
+                                        n[5].data );
+               ctx->Unpack = save;  /* restore */
+            }
+	    break;
+	 case OPCODE_ENABLE:
+	    (*ctx->Exec->Enable)( n[1].e );
+	    break;
+	 case OPCODE_EVALMESH1:
+	    (*ctx->Exec->EvalMesh1)( n[1].e, n[2].i, n[3].i );
+	    break;
+	 case OPCODE_EVALMESH2:
+	    (*ctx->Exec->EvalMesh2)( n[1].e, n[2].i, n[3].i, n[4].i, n[5].i );
+	    break;
+	 case OPCODE_FOG:
+	    {
+	       GLfloat p[4];
+	       p[0] = n[2].f;
+	       p[1] = n[3].f;
+	       p[2] = n[4].f;
+	       p[3] = n[5].f;
+	       (*ctx->Exec->Fogfv)( n[1].e, p );
+	    }
+	    break;
+	 case OPCODE_FRONT_FACE:
+	    (*ctx->Exec->FrontFace)( n[1].e );
+	    break;
+         case OPCODE_FRUSTUM:
+            (*ctx->Exec->Frustum)( n[1].f, n[2].f, n[3].f, n[4].f, n[5].f, n[6].f );
+            break;
+	 case OPCODE_HINT:
+	    (*ctx->Exec->Hint)( n[1].e, n[2].e );
+	    break;
+	 case OPCODE_HISTOGRAM:
+	    (*ctx->Exec->Histogram)( n[1].e, n[2].i, n[3].e, n[4].b );
+	    break;
+	 case OPCODE_INDEX_MASK:
+	    (*ctx->Exec->IndexMask)( n[1].ui );
+	    break;
+	 case OPCODE_INIT_NAMES:
+	    (*ctx->Exec->InitNames)();
+	    break;
+         case OPCODE_LIGHT:
+	    {
+	       GLfloat p[4];
+	       p[0] = n[3].f;
+	       p[1] = n[4].f;
+	       p[2] = n[5].f;
+	       p[3] = n[6].f;
+	       (*ctx->Exec->Lightfv)( n[1].e, n[2].e, p );
+	    }
+	    break;
+         case OPCODE_LIGHT_MODEL:
+	    {
+	       GLfloat p[4];
+	       p[0] = n[2].f;
+	       p[1] = n[3].f;
+	       p[2] = n[4].f;
+	       p[3] = n[5].f;
+	       (*ctx->Exec->LightModelfv)( n[1].e, p );
+	    }
+	    break;
+	 case OPCODE_LINE_STIPPLE:
+	    (*ctx->Exec->LineStipple)( n[1].i, n[2].us );
+	    break;
+	 case OPCODE_LINE_WIDTH:
+	    (*ctx->Exec->LineWidth)( n[1].f );
+	    break;
+	 case OPCODE_LIST_BASE:
+	    (*ctx->Exec->ListBase)( n[1].ui );
+	    break;
+	 case OPCODE_LOAD_IDENTITY:
+            (*ctx->Exec->LoadIdentity)();
+            break;
+	 case OPCODE_LOAD_MATRIX:
+	    if (sizeof(Node)==sizeof(GLfloat)) {
+	       (*ctx->Exec->LoadMatrixf)( &n[1].f );
+	    }
+	    else {
+	       GLfloat m[16];
+	       GLuint i;
+	       for (i=0;i<16;i++) {
+		  m[i] = n[1+i].f;
+	       }
+	       (*ctx->Exec->LoadMatrixf)( m );
+	    }
+	    break;
+	 case OPCODE_LOAD_NAME:
+	    (*ctx->Exec->LoadName)( n[1].ui );
+	    break;
+	 case OPCODE_LOGIC_OP:
+	    (*ctx->Exec->LogicOp)( n[1].e );
+	    break;
+	 case OPCODE_MAP1:
+            {
+               GLenum target = n[1].e;
+               GLint ustride = _mesa_evaluator_components(target);
+               GLint uorder = n[5].i;
+               GLfloat u1 = n[2].f;
+               GLfloat u2 = n[3].f;
+               (*ctx->Exec->Map1f)( target, u1, u2, ustride, uorder,
+                                   (GLfloat *) n[6].data );
+            }
+	    break;
+	 case OPCODE_MAP2:
+            {
+               GLenum target = n[1].e;
+               GLfloat u1 = n[2].f;
+               GLfloat u2 = n[3].f;
+               GLfloat v1 = n[4].f;
+               GLfloat v2 = n[5].f;
+               GLint ustride = n[6].i;
+               GLint vstride = n[7].i;
+               GLint uorder = n[8].i;
+               GLint vorder = n[9].i;
+               (*ctx->Exec->Map2f)( target, u1, u2, ustride, uorder,
+                                   v1, v2, vstride, vorder,
+                                   (GLfloat *) n[10].data );
+            }
+	    break;
+	 case OPCODE_MAPGRID1:
+	    (*ctx->Exec->MapGrid1f)( n[1].i, n[2].f, n[3].f );
+	    break;
+	 case OPCODE_MAPGRID2:
+	    (*ctx->Exec->MapGrid2f)( n[1].i, n[2].f, n[3].f, n[4].i, n[5].f, n[6].f);
+	    break;
+         case OPCODE_MATRIX_MODE:
+            (*ctx->Exec->MatrixMode)( n[1].e );
+            break;
+         case OPCODE_MIN_MAX:
+            (*ctx->Exec->Minmax)(n[1].e, n[2].e, n[3].b);
+            break;
+	 case OPCODE_MULT_MATRIX:
+	    if (sizeof(Node)==sizeof(GLfloat)) {
+	       (*ctx->Exec->MultMatrixf)( &n[1].f );
+	    }
+	    else {
+	       GLfloat m[16];
+	       GLuint i;
+	       for (i=0;i<16;i++) {
+		  m[i] = n[1+i].f;
+	       }
+	       (*ctx->Exec->MultMatrixf)( m );
+	    }
+	    break;
+         case OPCODE_ORTHO:
+            (*ctx->Exec->Ortho)( n[1].f, n[2].f, n[3].f, n[4].f, n[5].f, n[6].f );
+            break;
+	 case OPCODE_PASSTHROUGH:
+	    (*ctx->Exec->PassThrough)( n[1].f );
+	    break;
+	 case OPCODE_PIXEL_MAP:
+	    (*ctx->Exec->PixelMapfv)( n[1].e, n[2].i, (GLfloat *) n[3].data );
+	    break;
+	 case OPCODE_PIXEL_TRANSFER:
+	    (*ctx->Exec->PixelTransferf)( n[1].e, n[2].f );
+	    break;
+	 case OPCODE_PIXEL_ZOOM:
+	    (*ctx->Exec->PixelZoom)( n[1].f, n[2].f );
+	    break;
+	 case OPCODE_POINT_SIZE:
+	    (*ctx->Exec->PointSize)( n[1].f );
+	    break;
+	 case OPCODE_POINT_PARAMETERS:
+	    {
+		GLfloat params[3];
+		params[0] = n[2].f;
+		params[1] = n[3].f;
+		params[2] = n[4].f;
+		(*ctx->Exec->PointParameterfvEXT)( n[1].e, params );
+	    }
+	    break;
+	 case OPCODE_POLYGON_MODE:
+	    (*ctx->Exec->PolygonMode)( n[1].e, n[2].e );
+	    break;
+	 case OPCODE_POLYGON_STIPPLE:
+	    (*ctx->Exec->PolygonStipple)( (GLubyte *) n[1].data );
+	    break;
+	 case OPCODE_POLYGON_OFFSET:
+	    (*ctx->Exec->PolygonOffset)( n[1].f, n[2].f );
+	    break;
+	 case OPCODE_POP_ATTRIB:
+	    (*ctx->Exec->PopAttrib)();
+	    break;
+	 case OPCODE_POP_MATRIX:
+	    (*ctx->Exec->PopMatrix)();
+	    break;
+	 case OPCODE_POP_NAME:
+	    (*ctx->Exec->PopName)();
+	    break;
+	 case OPCODE_PRIORITIZE_TEXTURE:
+            (*ctx->Exec->PrioritizeTextures)( 1, &n[1].ui, &n[2].f );
+	    break;
+	 case OPCODE_PUSH_ATTRIB:
+	    (*ctx->Exec->PushAttrib)( n[1].bf );
+	    break;
+	 case OPCODE_PUSH_MATRIX:
+	    (*ctx->Exec->PushMatrix)();
+	    break;
+	 case OPCODE_PUSH_NAME:
+	    (*ctx->Exec->PushName)( n[1].ui );
+	    break;
+	 case OPCODE_RASTER_POS:
+            (*ctx->Exec->RasterPos4f)( n[1].f, n[2].f, n[3].f, n[4].f );
+	    break;
+	 case OPCODE_READ_BUFFER:
+	    (*ctx->Exec->ReadBuffer)( n[1].e );
+	    break;
+         case OPCODE_RESET_HISTOGRAM:
+            (*ctx->Exec->ResetHistogram)( n[1].e );
+            break;
+         case OPCODE_RESET_MIN_MAX:
+            (*ctx->Exec->ResetMinmax)( n[1].e );
+            break;
+         case OPCODE_ROTATE:
+            (*ctx->Exec->Rotatef)( n[1].f, n[2].f, n[3].f, n[4].f );
+            break;
+         case OPCODE_SCALE:
+            (*ctx->Exec->Scalef)( n[1].f, n[2].f, n[3].f );
+            break;
+	 case OPCODE_SCISSOR:
+	    (*ctx->Exec->Scissor)( n[1].i, n[2].i, n[3].i, n[4].i );
+	    break;
+	 case OPCODE_SHADE_MODEL:
+	    (*ctx->Exec->ShadeModel)( n[1].e );
+	    break;
+	 case OPCODE_STENCIL_FUNC:
+	    (*ctx->Exec->StencilFunc)( n[1].e, n[2].i, n[3].ui );
+	    break;
+	 case OPCODE_STENCIL_MASK:
+	    (*ctx->Exec->StencilMask)( n[1].ui );
+	    break;
+	 case OPCODE_STENCIL_OP:
+	    (*ctx->Exec->StencilOp)( n[1].e, n[2].e, n[3].e );
+	    break;
+         case OPCODE_TEXENV:
+            {
+               GLfloat params[4];
+               params[0] = n[3].f;
+               params[1] = n[4].f;
+               params[2] = n[5].f;
+               params[3] = n[6].f;
+               (*ctx->Exec->TexEnvfv)( n[1].e, n[2].e, params );
+            }
+            break;
+         case OPCODE_TEXGEN:
+            {
+               GLfloat params[4];
+               params[0] = n[3].f;
+               params[1] = n[4].f;
+               params[2] = n[5].f;
+               params[3] = n[6].f;
+               (*ctx->Exec->TexGenfv)( n[1].e, n[2].e, params );
+            }
+            break;
+         case OPCODE_TEXPARAMETER:
+            {
+               GLfloat params[4];
+               params[0] = n[3].f;
+               params[1] = n[4].f;
+               params[2] = n[5].f;
+               params[3] = n[6].f;
+               (*ctx->Exec->TexParameterfv)( n[1].e, n[2].e, params );
+            }
+            break;
+	 case OPCODE_TEX_IMAGE1D:
+            {
+               struct gl_pixelstore_attrib save = ctx->Unpack;
+               ctx->Unpack = _mesa_native_packing;
+               (*ctx->Exec->TexImage1D)(
+                                        n[1].e, /* target */
+                                        n[2].i, /* level */
+                                        n[3].i, /* components */
+                                        n[4].i, /* width */
+                                        n[5].e, /* border */
+                                        n[6].e, /* format */
+                                        n[7].e, /* type */
+                                        n[8].data );
+               ctx->Unpack = save;  /* restore */
+            }
+	    break;
+	 case OPCODE_TEX_IMAGE2D:
+            {
+               struct gl_pixelstore_attrib save = ctx->Unpack;
+               ctx->Unpack = _mesa_native_packing;
+               (*ctx->Exec->TexImage2D)(
+                                        n[1].e, /* target */
+                                        n[2].i, /* level */
+                                        n[3].i, /* components */
+                                        n[4].i, /* width */
+                                        n[5].i, /* height */
+                                        n[6].e, /* border */
+                                        n[7].e, /* format */
+                                        n[8].e, /* type */
+                                        n[9].data );
+               ctx->Unpack = save;  /* restore */
+            }
+	    break;
+         case OPCODE_TEX_IMAGE3D:
+            {
+               struct gl_pixelstore_attrib save = ctx->Unpack;
+               ctx->Unpack = _mesa_native_packing;
+               (*ctx->Exec->TexImage3D)(
+                                        n[1].e, /* target */
+                                        n[2].i, /* level */
+                                        n[3].i, /* components */
+                                        n[4].i, /* width */
+                                        n[5].i, /* height */
+                                        n[6].i, /* depth  */
+                                        n[7].e, /* border */
+                                        n[8].e, /* format */
+                                        n[9].e, /* type */
+                                        n[10].data );
+               ctx->Unpack = save;  /* restore */
+            }
+            break;
+         case OPCODE_TEX_SUB_IMAGE1D:
+            {
+               struct gl_pixelstore_attrib save = ctx->Unpack;
+               ctx->Unpack = _mesa_native_packing;
+               (*ctx->Exec->TexSubImage1D)( n[1].e, n[2].i, n[3].i,
+                                           n[4].i, n[5].e,
+                                           n[6].e, n[7].data );
+               ctx->Unpack = save;  /* restore */
+            }
+            break;
+         case OPCODE_TEX_SUB_IMAGE2D:
+            {
+               struct gl_pixelstore_attrib save = ctx->Unpack;
+               ctx->Unpack = _mesa_native_packing;
+               (*ctx->Exec->TexSubImage2D)( n[1].e, n[2].i, n[3].i,
+                                           n[4].i, n[5].e,
+                                           n[6].i, n[7].e, n[8].e, n[9].data );
+               ctx->Unpack = save;  /* restore */
+            }
+            break;
+         case OPCODE_TEX_SUB_IMAGE3D:
+            {
+               struct gl_pixelstore_attrib save = ctx->Unpack;
+               ctx->Unpack = _mesa_native_packing;
+               (*ctx->Exec->TexSubImage3D)( n[1].e, n[2].i, n[3].i,
+                                           n[4].i, n[5].i, n[6].i, n[7].i,
+                                           n[8].i, n[9].e, n[10].e,
+                                           n[11].data );
+               ctx->Unpack = save;  /* restore */
+            }
+            break;
+         case OPCODE_TRANSLATE:
+            (*ctx->Exec->Translatef)( n[1].f, n[2].f, n[3].f );
+            break;
+	 case OPCODE_VIEWPORT:
+	    (*ctx->Exec->Viewport)(n[1].i, n[2].i,
+                                  (GLsizei) n[3].i, (GLsizei) n[4].i);
+	    break;
+	 case OPCODE_WINDOW_POS:
+            (*ctx->Exec->WindowPos4fMESA)( n[1].f, n[2].f, n[3].f, n[4].f );
+	    break;
+         case OPCODE_ACTIVE_TEXTURE:  /* GL_ARB_multitexture */
+            (*ctx->Exec->ActiveTextureARB)( n[1].e );
+            break;
+         case OPCODE_PIXEL_TEXGEN_SGIX:  /* GL_SGIX_pixel_texture */
+            (*ctx->Exec->PixelTexGenSGIX)( n[1].e );
+            break;
+         case OPCODE_PIXEL_TEXGEN_PARAMETER_SGIS:  /* GL_SGIS_pixel_texture */
+            (*ctx->Exec->PixelTexGenParameteriSGIS)( n[1].e, n[2].i );
+            break;
+         case OPCODE_COMPRESSED_TEX_IMAGE_1D: /* GL_ARB_texture_compression */
+            (*ctx->Exec->CompressedTexImage1DARB)(n[1].e, n[2].i, n[3].e,
+                                            n[4].i, n[5].i, n[6].i, n[7].data);
+            break;
+         case OPCODE_COMPRESSED_TEX_IMAGE_2D: /* GL_ARB_texture_compression */
+            (*ctx->Exec->CompressedTexImage2DARB)(n[1].e, n[2].i, n[3].e,
+                                    n[4].i, n[5].i, n[6].i, n[7].i, n[8].data);
+            break;
+         case OPCODE_COMPRESSED_TEX_IMAGE_3D: /* GL_ARB_texture_compression */
+            (*ctx->Exec->CompressedTexImage3DARB)(n[1].e, n[2].i, n[3].e,
+                            n[4].i, n[5].i, n[6].i, n[7].i, n[8].i, n[9].data);
+            break;
+         case OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D: /* GL_ARB_texture_compress */
+            (*ctx->Exec->CompressedTexSubImage1DARB)(n[1].e, n[2].i, n[3].i,
+                                            n[4].i, n[5].e, n[6].i, n[7].data);
+            break;
+         case OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D: /* GL_ARB_texture_compress */
+            (*ctx->Exec->CompressedTexSubImage2DARB)(n[1].e, n[2].i, n[3].i,
+                            n[4].i, n[5].i, n[6].i, n[7].e, n[8].i, n[9].data);
+            break;
+         case OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D: /* GL_ARB_texture_compress */
+            (*ctx->Exec->CompressedTexSubImage3DARB)(n[1].e, n[2].i, n[3].i,
+                                        n[4].i, n[5].i, n[6].i, n[7].i, n[8].i,
+                                        n[9].e, n[10].i, n[11].data);
+            break;
+         case OPCODE_SAMPLE_COVERAGE: /* GL_ARB_multisample */
+            (*ctx->Exec->SampleCoverageARB)(n[1].f, n[2].b);
+            break;
+	 case OPCODE_WINDOW_POS_ARB: /* GL_ARB_window_pos */
+            (*ctx->Exec->WindowPos3fMESA)( n[1].f, n[2].f, n[3].f );
+	    break;
+#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
+         case OPCODE_BIND_PROGRAM_NV: /* GL_NV_vertex_program */
+            (*ctx->Exec->BindProgramNV)( n[1].e, n[2].ui );
+            break;
+#endif
+#if FEATURE_NV_vertex_program
+         case OPCODE_EXECUTE_PROGRAM_NV:
+            {
+               GLfloat v[4];
+               v[0] = n[3].f;
+               v[1] = n[4].f;
+               v[2] = n[5].f;
+               v[3] = n[6].f;
+               (*ctx->Exec->ExecuteProgramNV)(n[1].e, n[2].ui, v);
+            }
+            break;
+         case OPCODE_REQUEST_RESIDENT_PROGRAMS_NV:
+            (*ctx->Exec->RequestResidentProgramsNV)(n[1].ui,
+                                                    (GLuint *) n[2].data);
+            break;
+         case OPCODE_LOAD_PROGRAM_NV:
+            (*ctx->Exec->LoadProgramNV)(n[1].e, n[2].ui, n[3].i,
+                                        (const GLubyte *) n[4].data);
+            break;
+         case OPCODE_PROGRAM_PARAMETER4F_NV:
+            (*ctx->Exec->ProgramParameter4fNV)(n[1].e, n[2].ui, n[3].f,
+                                               n[4].f, n[5].f, n[6].f);
+            break;
+         case OPCODE_TRACK_MATRIX_NV:
+            (*ctx->Exec->TrackMatrixNV)(n[1].e, n[2].ui, n[3].e, n[4].e);
+            break;
+#endif
+
+#if FEATURE_NV_fragment_program
+         case OPCODE_PROGRAM_LOCAL_PARAMETER_ARB:
+            (*ctx->Exec->ProgramLocalParameter4fARB)(n[1].e, n[2].ui, n[3].f,
+                                                     n[4].f, n[5].f, n[6].f);
+            break;
+         case OPCODE_PROGRAM_NAMED_PARAMETER_NV:
+            (*ctx->Exec->ProgramNamedParameter4fNV)(n[1].ui, n[2].i,
+                                               (const GLubyte *) n[3].data,
+                                               n[4].f, n[5].f, n[6].f, n[7].f);
+            break;
+#endif
+
+         case OPCODE_ACTIVE_STENCIL_FACE_EXT:
+            (*ctx->Exec->ActiveStencilFaceEXT)(n[1].e);
+            break;
+         case OPCODE_DEPTH_BOUNDS_EXT:
+            (*ctx->Exec->DepthBoundsEXT)(n[1].f, n[2].f);
+            break;
+#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
+         case OPCODE_PROGRAM_STRING_ARB:
+            (*ctx->Exec->ProgramStringARB)(n[1].e, n[2].e, n[3].i, n[4].data);
+            break;
+         case OPCODE_PROGRAM_ENV_PARAMETER_ARB:
+            (*ctx->Exec->ProgramEnvParameter4fARB)(n[1].e, n[2].ui, n[3].f,
+                                                   n[4].f, n[5].f, n[6].f);
+            break;
+#endif
+
+	 case OPCODE_ATTR_1F:
+	    (*ctx->Exec->VertexAttrib1fNV)(n[1].e, n[2].f);
+	    break;
+	 case OPCODE_ATTR_2F:
+	    (*ctx->Exec->VertexAttrib2fvNV)(n[1].e, &n[2].f);
+	    break;
+	 case OPCODE_ATTR_3F:
+	    (*ctx->Exec->VertexAttrib3fvNV)(n[1].e, &n[2].f);
+	    break;
+	 case OPCODE_ATTR_4F:
+	    (*ctx->Exec->VertexAttrib4fvNV)(n[1].e, &n[2].f);
+	    break;
+	 case OPCODE_MATERIAL:
+	    (*ctx->Exec->Materialfv)(n[1].e, n[2].e, &n[3].f);
+	    break;
+	 case OPCODE_INDEX:
+	    (*ctx->Exec->Indexi)(n[1].i);
+	    break;
+	 case OPCODE_EDGEFLAG:
+	    (*ctx->Exec->EdgeFlag)(n[1].b);
+	    break;
+	 case OPCODE_BEGIN:
+	    (*ctx->Exec->Begin)(n[1].e);
+	    break;
+	 case OPCODE_END:
+	    (*ctx->Exec->End)();
+	    break;
+	 case OPCODE_RECTF:
+	    (*ctx->Exec->Rectf)(n[1].f, n[2].f, n[3].f, n[4].f);
+	    break;
+	 case OPCODE_EVAL_C1:
+	    (*ctx->Exec->EvalCoord1f)(n[1].f);
+	    break;
+	 case OPCODE_EVAL_C2:
+	    (*ctx->Exec->EvalCoord2fv)(&n[1].f);
+	    break;
+	 case OPCODE_EVAL_P1:
+	    (*ctx->Exec->EvalPoint1)(n[1].i);
+	    break;
+	 case OPCODE_EVAL_P2:
+	    (*ctx->Exec->EvalPoint2)(n[1].i, n[2].i);
+	    break;
+
+
+
+
+	 case OPCODE_CONTINUE:
+	    n = (Node *) n[1].next;
+	    break;
+	 case OPCODE_END_OF_LIST:
+	    done = GL_TRUE;
+	    break;
+	 default:
+            {
+               char msg[1000];
+               _mesa_sprintf(msg, "Error in execute_list: opcode=%d", (int) opcode);
+               _mesa_problem(ctx, msg);
+            }
+            done = GL_TRUE;
+	 }
+
+	 /* increment n to point to next compiled command */
+	 if (opcode!=OPCODE_CONTINUE) {
+	    n += InstSize[opcode];
+	 }
+      }
+   }
+   ctx->ListState.CallDepth--;
+
+   if (ctx->Driver.EndCallList)
+      ctx->Driver.EndCallList( ctx );
+}
+
+
+
+
+
+/**********************************************************************/
+/*                           GL functions                             */
+/**********************************************************************/
+
+
+
+
+/*
+ * Test if a display list number is valid.
+ */
+GLboolean GLAPIENTRY
+_mesa_IsList( GLuint list )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);	/* must be called before assert */
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
+   return islist(ctx, list);
+}
+
+
+/*
+ * Delete a sequence of consecutive display lists.
+ */
+void GLAPIENTRY
+_mesa_DeleteLists( GLuint list, GLsizei range )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint i;
+   FLUSH_VERTICES(ctx, 0);	/* must be called before assert */
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (range<0) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glDeleteLists" );
+      return;
+   }
+   for (i=list;i<list+range;i++) {
+      _mesa_destroy_list( ctx, i );
+   }
+}
+
+
+
+/*
+ * Return a display list number, n, such that lists n through n+range-1
+ * are free.
+ */
+GLuint GLAPIENTRY
+_mesa_GenLists(GLsizei range )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint base;
+   FLUSH_VERTICES(ctx, 0);	/* must be called before assert */
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
+
+   if (range<0) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glGenLists" );
+      return 0;
+   }
+   if (range==0) {
+      return 0;
+   }
+
+   /*
+    * Make this an atomic operation
+    */
+   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
+
+   base = _mesa_HashFindFreeKeyBlock(ctx->Shared->DisplayList, range);
+   if (base) {
+      /* reserve the list IDs by with empty/dummy lists */
+      GLint i;
+      for (i=0; i<range; i++) {
+         _mesa_HashInsert(ctx->Shared->DisplayList, base+i, make_empty_list());
+      }
+   }
+
+   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
+
+   return base;
+}
+
+
+
+/*
+ * Begin a new display list.
+ */
+void GLAPIENTRY
+_mesa_NewList( GLuint list, GLenum mode )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint i;
+
+   FLUSH_CURRENT(ctx, 0);	/* must be called before assert */
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE&VERBOSE_API)
+      _mesa_debug(ctx, "glNewList %u %s\n", list,
+                  _mesa_lookup_enum_by_nr(mode));
+
+   if (list==0) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glNewList" );
+      return;
+   }
+
+   if (mode!=GL_COMPILE && mode!=GL_COMPILE_AND_EXECUTE) {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glNewList" );
+      return;
+   }
+
+   if (ctx->ListState.CurrentListPtr) {
+      /* already compiling a display list */
+      _mesa_error( ctx, GL_INVALID_OPERATION, "glNewList" );
+      return;
+   }
+
+   ctx->CompileFlag = GL_TRUE;
+   ctx->ExecuteFlag = (mode == GL_COMPILE_AND_EXECUTE);
+
+   /* Allocate new display list */
+   ctx->ListState.CurrentListNum = list;
+   ctx->ListState.CurrentBlock = (Node *) CALLOC( sizeof(Node) * BLOCK_SIZE );
+   ctx->ListState.CurrentListPtr = ctx->ListState.CurrentBlock;
+   ctx->ListState.CurrentPos = 0;
+
+   /* Reset acumulated list state:
+    */
+   for (i = 0; i < VERT_ATTRIB_MAX; i++)
+      ctx->ListState.ActiveAttribSize[i] = 0;
+
+   for (i = 0; i < MAT_ATTRIB_MAX; i++)
+      ctx->ListState.ActiveMaterialSize[i] = 0;
+      
+   ctx->ListState.ActiveIndex = 0;
+   ctx->ListState.ActiveEdgeFlag = 0;
+
+   ctx->Driver.CurrentSavePrimitive = PRIM_UNKNOWN;
+   ctx->Driver.NewList( ctx, list, mode );
+
+   ctx->CurrentDispatch = ctx->Save;
+   _glapi_set_dispatch( ctx->CurrentDispatch );
+}
+
+
+
+/*
+ * End definition of current display list. 
+ */
+void GLAPIENTRY
+_mesa_EndList( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   SAVE_FLUSH_VERTICES(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (MESA_VERBOSE&VERBOSE_API)
+      _mesa_debug(ctx, "glEndList\n");
+
+   /* Check that a list is under construction */
+   if (!ctx->ListState.CurrentListPtr) {
+      _mesa_error( ctx, GL_INVALID_OPERATION, "glEndList" );
+      return;
+   }
+
+   (void) ALLOC_INSTRUCTION( ctx, OPCODE_END_OF_LIST, 0 );
+
+   /* Destroy old list, if any */
+   _mesa_destroy_list(ctx, ctx->ListState.CurrentListNum);
+   /* Install the list */
+   _mesa_HashInsert(ctx->Shared->DisplayList, ctx->ListState.CurrentListNum, ctx->ListState.CurrentListPtr);
+
+
+   if (MESA_VERBOSE & VERBOSE_DISPLAY_LIST)
+      mesa_print_display_list(ctx->ListState.CurrentListNum);
+
+   ctx->ListState.CurrentListNum = 0;
+   ctx->ListState.CurrentListPtr = NULL;
+   ctx->ExecuteFlag = GL_TRUE;
+   ctx->CompileFlag = GL_FALSE;
+
+   ctx->Driver.EndList( ctx );
+
+   ctx->CurrentDispatch = ctx->Exec;
+   _glapi_set_dispatch( ctx->CurrentDispatch );
+}
+
+
+
+void GLAPIENTRY
+_mesa_CallList( GLuint list )
+{
+   GLboolean save_compile_flag;
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_CURRENT(ctx, 0);
+   /* VERY IMPORTANT:  Save the CompileFlag status, turn it off, */
+   /* execute the display list, and restore the CompileFlag. */
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glCallList %d\n", list);
+
+   if (list == 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glCallList(list==0)");
+      return;
+   }
+
+/*     mesa_print_display_list( list ); */
+
+   save_compile_flag = ctx->CompileFlag;
+   if (save_compile_flag) {
+      ctx->CompileFlag = GL_FALSE;
+   }
+
+   execute_list( ctx, list );
+   ctx->CompileFlag = save_compile_flag;
+
+   /* also restore API function pointers to point to "save" versions */
+   if (save_compile_flag) {
+      ctx->CurrentDispatch = ctx->Save;
+      _glapi_set_dispatch( ctx->CurrentDispatch );
+   }
+}
+
+
+
+/*
+ * Execute glCallLists:  call multiple display lists.
+ */
+void GLAPIENTRY
+_mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint list;
+   GLint i;
+   GLboolean save_compile_flag;
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glCallLists %d\n", n);
+
+   switch (type) {
+      case GL_BYTE:
+      case GL_UNSIGNED_BYTE:
+      case GL_SHORT:
+      case GL_UNSIGNED_SHORT:
+      case GL_INT:
+      case GL_UNSIGNED_INT:
+      case GL_FLOAT:
+      case GL_2_BYTES:
+      case GL_3_BYTES:
+      case GL_4_BYTES:
+         /* OK */
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glCallLists(type)");
+         return;
+   }
+
+   /* Save the CompileFlag status, turn it off, execute display list,
+    * and restore the CompileFlag.
+    */
+   save_compile_flag = ctx->CompileFlag;
+   ctx->CompileFlag = GL_FALSE;
+
+   for (i=0;i<n;i++) {
+      list = translate_id( i, type, lists );
+      execute_list( ctx, ctx->List.ListBase + list );
+   }
+
+   ctx->CompileFlag = save_compile_flag;
+
+   /* also restore API function pointers to point to "save" versions */
+   if (save_compile_flag) {
+      ctx->CurrentDispatch = ctx->Save;
+      _glapi_set_dispatch( ctx->CurrentDispatch );
+   }
+}
+
+
+
+/*
+ * Set the offset added to list numbers in glCallLists.
+ */
+void GLAPIENTRY
+_mesa_ListBase( GLuint base )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);	/* must be called before assert */
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+   ctx->List.ListBase = base;
+}
+
+
+/* Can no longer assume ctx->Exec->Func is equal to _mesa_Func.
+ */
+static void GLAPIENTRY exec_Finish( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->Finish();
+}
+
+static void GLAPIENTRY exec_Flush( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->Flush( );
+}
+
+static void GLAPIENTRY exec_GetBooleanv( GLenum pname, GLboolean *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetBooleanv( pname, params );
+}
+
+static void GLAPIENTRY exec_GetClipPlane( GLenum plane, GLdouble *equation )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetClipPlane( plane, equation );
+}
+
+static void GLAPIENTRY exec_GetDoublev( GLenum pname, GLdouble *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetDoublev(  pname, params );
+}
+
+static GLenum GLAPIENTRY exec_GetError( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   return ctx->Exec->GetError( );
+}
+
+static void GLAPIENTRY exec_GetFloatv( GLenum pname, GLfloat *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetFloatv( pname, params );
+}
+
+static void GLAPIENTRY exec_GetIntegerv( GLenum pname, GLint *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetIntegerv( pname, params );
+}
+
+static void GLAPIENTRY exec_GetLightfv( GLenum light, GLenum pname, GLfloat *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetLightfv( light, pname, params );
+}
+
+static void GLAPIENTRY exec_GetLightiv( GLenum light, GLenum pname, GLint *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetLightiv( light, pname, params );
+}
+
+static void GLAPIENTRY exec_GetMapdv( GLenum target, GLenum query, GLdouble *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetMapdv( target, query, v );
+}
+
+static void GLAPIENTRY exec_GetMapfv( GLenum target, GLenum query, GLfloat *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetMapfv( target, query, v );
+}
+
+static void GLAPIENTRY exec_GetMapiv( GLenum target, GLenum query, GLint *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetMapiv( target, query, v );
+}
+
+static void GLAPIENTRY exec_GetMaterialfv( GLenum face, GLenum pname, GLfloat *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetMaterialfv( face, pname, params );
+}
+
+static void GLAPIENTRY exec_GetMaterialiv( GLenum face, GLenum pname, GLint *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetMaterialiv( face, pname, params );
+}
+
+static void GLAPIENTRY exec_GetPixelMapfv( GLenum map, GLfloat *values )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetPixelMapfv( map,  values );
+}
+
+static void GLAPIENTRY exec_GetPixelMapuiv( GLenum map, GLuint *values )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetPixelMapuiv( map, values );
+}
+
+static void GLAPIENTRY exec_GetPixelMapusv( GLenum map, GLushort *values )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetPixelMapusv( map, values );
+}
+
+static void GLAPIENTRY exec_GetPolygonStipple( GLubyte *dest )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetPolygonStipple( dest );
+}
+
+static const GLubyte * GLAPIENTRY exec_GetString( GLenum name )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   return ctx->Exec->GetString( name );
+}
+
+static void GLAPIENTRY exec_GetTexEnvfv( GLenum target, GLenum pname, GLfloat *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetTexEnvfv( target, pname, params );
+}
+
+static void GLAPIENTRY exec_GetTexEnviv( GLenum target, GLenum pname, GLint *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetTexEnviv( target, pname, params );
+}
+
+static void GLAPIENTRY exec_GetTexGendv( GLenum coord, GLenum pname, GLdouble *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetTexGendv( coord, pname, params );
+}
+
+static void GLAPIENTRY exec_GetTexGenfv( GLenum coord, GLenum pname, GLfloat *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetTexGenfv( coord, pname, params );
+}
+
+static void GLAPIENTRY exec_GetTexGeniv( GLenum coord, GLenum pname, GLint *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetTexGeniv( coord, pname, params );
+}
+
+static void GLAPIENTRY exec_GetTexImage( GLenum target, GLint level, GLenum format,
+                   GLenum type, GLvoid *pixels )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetTexImage( target, level, format, type, pixels );
+}
+
+static void GLAPIENTRY exec_GetTexLevelParameterfv( GLenum target, GLint level,
+                              GLenum pname, GLfloat *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetTexLevelParameterfv( target, level, pname, params );
+}
+
+static void GLAPIENTRY exec_GetTexLevelParameteriv( GLenum target, GLint level,
+                              GLenum pname, GLint *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetTexLevelParameteriv( target, level, pname, params );
+}
+
+static void GLAPIENTRY exec_GetTexParameterfv( GLenum target, GLenum pname,
+				    GLfloat *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetTexParameterfv( target, pname, params );
+}
+
+static void GLAPIENTRY exec_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetTexParameteriv( target, pname, params );
+}
+
+static GLboolean GLAPIENTRY exec_IsEnabled( GLenum cap )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   return ctx->Exec->IsEnabled( cap );
+}
+
+static void GLAPIENTRY exec_PixelStoref( GLenum pname, GLfloat param )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->PixelStoref( pname, param );
+}
+
+static void GLAPIENTRY exec_PixelStorei( GLenum pname, GLint param )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->PixelStorei( pname, param );
+}
+
+static void GLAPIENTRY exec_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,
+		  GLenum format, GLenum type, GLvoid *pixels )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->ReadPixels( x, y, width, height, format, type, pixels );
+}
+
+static GLint GLAPIENTRY exec_RenderMode( GLenum mode )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   return ctx->Exec->RenderMode( mode );
+}
+
+static void GLAPIENTRY exec_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->FeedbackBuffer( size, type, buffer );
+}
+
+static void GLAPIENTRY exec_SelectBuffer( GLsizei size, GLuint *buffer )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->SelectBuffer( size, buffer );
+}
+
+static GLboolean GLAPIENTRY exec_AreTexturesResident(GLsizei n, const GLuint *texName,
+					  GLboolean *residences)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   return ctx->Exec->AreTexturesResident( n, texName, residences);
+}
+
+static void GLAPIENTRY exec_ColorPointer(GLint size, GLenum type, GLsizei stride,
+			      const GLvoid *ptr)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->ColorPointer( size, type, stride, ptr);
+}
+
+static void GLAPIENTRY exec_DeleteTextures( GLsizei n, const GLuint *texName)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->DeleteTextures( n, texName);
+}
+
+static void GLAPIENTRY exec_DisableClientState( GLenum cap )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->DisableClientState( cap );
+}
+
+static void GLAPIENTRY exec_EdgeFlagPointer(GLsizei stride, const GLvoid *vptr)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->EdgeFlagPointer( stride, vptr);
+}
+
+static void GLAPIENTRY exec_EnableClientState( GLenum cap )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->EnableClientState( cap );
+}
+
+static void GLAPIENTRY exec_GenTextures( GLsizei n, GLuint *texName )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GenTextures( n, texName );
+}
+
+static void GLAPIENTRY exec_GetPointerv( GLenum pname, GLvoid **params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetPointerv( pname, params );
+}
+
+static void GLAPIENTRY exec_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->IndexPointer( type, stride, ptr);
+}
+
+static void GLAPIENTRY exec_InterleavedArrays(GLenum format, GLsizei stride,
+				   const GLvoid *pointer)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->InterleavedArrays( format, stride, pointer);
+}
+
+static GLboolean GLAPIENTRY exec_IsTexture( GLuint texture )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   return ctx->Exec->IsTexture( texture );
+}
+
+static void GLAPIENTRY exec_NormalPointer(GLenum type, GLsizei stride, const GLvoid *ptr )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->NormalPointer( type, stride, ptr );
+}
+
+static void GLAPIENTRY exec_PopClientAttrib(void)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->PopClientAttrib();
+}
+
+static void GLAPIENTRY exec_PushClientAttrib(GLbitfield mask)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->PushClientAttrib( mask);
+}
+
+static void GLAPIENTRY exec_TexCoordPointer(GLint size, GLenum type, GLsizei stride,
+				 const GLvoid *ptr)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->TexCoordPointer( size,  type,  stride, ptr);
+}
+
+static void GLAPIENTRY exec_GetCompressedTexImageARB(GLenum target, GLint level,
+					  GLvoid *img)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetCompressedTexImageARB( target, level, img);
+}
+
+static void GLAPIENTRY exec_VertexPointer(GLint size, GLenum type, GLsizei stride,
+			       const GLvoid *ptr)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->VertexPointer( size, type, stride, ptr);
+}
+
+static void GLAPIENTRY exec_CopyConvolutionFilter1D(GLenum target, GLenum internalFormat,
+					 GLint x, GLint y, GLsizei width)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->CopyConvolutionFilter1D( target, internalFormat, x, y, width);
+}
+
+static void GLAPIENTRY exec_CopyConvolutionFilter2D(GLenum target, GLenum internalFormat,
+					 GLint x, GLint y, GLsizei width,
+					 GLsizei height)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->CopyConvolutionFilter2D( target, internalFormat, x, y, width,
+				       height);
+}
+
+static void GLAPIENTRY exec_GetColorTable( GLenum target, GLenum format,
+				GLenum type, GLvoid *data )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetColorTable( target, format, type, data );
+}
+
+static void GLAPIENTRY exec_GetColorTableParameterfv( GLenum target, GLenum pname,
+					   GLfloat *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetColorTableParameterfv( target, pname, params );
+}
+
+static void GLAPIENTRY exec_GetColorTableParameteriv( GLenum target, GLenum pname,
+					   GLint *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetColorTableParameteriv( target, pname, params );
+}
+
+static void GLAPIENTRY exec_GetConvolutionFilter(GLenum target, GLenum format, GLenum type,
+				      GLvoid *image)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetConvolutionFilter( target, format, type, image);
+}
+
+static void GLAPIENTRY exec_GetConvolutionParameterfv(GLenum target, GLenum pname,
+					   GLfloat *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetConvolutionParameterfv( target, pname, params);
+}
+
+static void GLAPIENTRY exec_GetConvolutionParameteriv(GLenum target, GLenum pname,
+					   GLint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetConvolutionParameteriv( target, pname, params);
+}
+
+static void GLAPIENTRY exec_GetHistogram(GLenum target, GLboolean reset, GLenum format,
+			      GLenum type, GLvoid *values)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetHistogram( target, reset, format, type, values);
+}
+
+static void GLAPIENTRY exec_GetHistogramParameterfv(GLenum target, GLenum pname,
+					 GLfloat *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetHistogramParameterfv( target, pname, params);
+}
+
+static void GLAPIENTRY exec_GetHistogramParameteriv(GLenum target, GLenum pname,
+					 GLint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetHistogramParameteriv( target, pname, params);
+}
+
+static void GLAPIENTRY exec_GetMinmax(GLenum target, GLboolean reset, GLenum format,
+			   GLenum type, GLvoid *values)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetMinmax( target, reset, format, type, values);
+}
+
+static void GLAPIENTRY exec_GetMinmaxParameterfv(GLenum target, GLenum pname,
+				      GLfloat *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetMinmaxParameterfv( target, pname, params);
+}
+
+static void GLAPIENTRY exec_GetMinmaxParameteriv(GLenum target, GLenum pname,
+				      GLint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetMinmaxParameteriv( target, pname, params);
+}
+
+static void GLAPIENTRY exec_GetSeparableFilter(GLenum target, GLenum format, GLenum type,
+				    GLvoid *row, GLvoid *column, GLvoid *span)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetSeparableFilter( target, format, type, row, column, span);
+}
+
+static void GLAPIENTRY exec_SeparableFilter2D(GLenum target, GLenum internalFormat,
+				   GLsizei width, GLsizei height, GLenum format,
+				   GLenum type, const GLvoid *row,
+				   const GLvoid *column)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->SeparableFilter2D( target, internalFormat, width, height, format,
+				 type, row, column);
+}
+
+static void GLAPIENTRY exec_GetPixelTexGenParameterivSGIS(GLenum target, GLint *value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetPixelTexGenParameterivSGIS( target, value);
+}
+
+static void GLAPIENTRY exec_GetPixelTexGenParameterfvSGIS(GLenum target, GLfloat *value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->GetPixelTexGenParameterfvSGIS( target, value);
+}
+
+static void GLAPIENTRY exec_ColorPointerEXT(GLint size, GLenum type, GLsizei stride,
+				 GLsizei count, const GLvoid *ptr)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->ColorPointerEXT( size, type, stride, count, ptr);
+}
+
+static void GLAPIENTRY exec_EdgeFlagPointerEXT(GLsizei stride, GLsizei count,
+				    const GLboolean *ptr)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->EdgeFlagPointerEXT( stride, count, ptr);
+}
+
+static void GLAPIENTRY exec_IndexPointerEXT(GLenum type, GLsizei stride, GLsizei count,
+                      const GLvoid *ptr)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->IndexPointerEXT( type, stride, count, ptr);
+}
+
+static void GLAPIENTRY exec_NormalPointerEXT(GLenum type, GLsizei stride, GLsizei count,
+                       const GLvoid *ptr)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->NormalPointerEXT( type, stride, count, ptr);
+}
+
+static void GLAPIENTRY exec_TexCoordPointerEXT(GLint size, GLenum type, GLsizei stride,
+				    GLsizei count, const GLvoid *ptr)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->TexCoordPointerEXT( size, type, stride, count, ptr);
+}
+
+static void GLAPIENTRY exec_VertexPointerEXT(GLint size, GLenum type, GLsizei stride,
+                       GLsizei count, const GLvoid *ptr)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->VertexPointerEXT( size, type, stride, count, ptr);
+}
+
+static void GLAPIENTRY exec_LockArraysEXT(GLint first, GLsizei count)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->LockArraysEXT( first, count);
+}
+
+static void GLAPIENTRY exec_UnlockArraysEXT( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->UnlockArraysEXT( );
+}
+
+static void GLAPIENTRY exec_ResizeBuffersMESA( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->ResizeBuffersMESA( );
+}
+
+
+static void GLAPIENTRY exec_ClientActiveTextureARB( GLenum target )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->ClientActiveTextureARB(target);
+}
+
+static void GLAPIENTRY exec_SecondaryColorPointerEXT(GLint size, GLenum type,
+			       GLsizei stride, const GLvoid *ptr)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->SecondaryColorPointerEXT( size, type, stride, ptr);
+}
+
+static void GLAPIENTRY exec_FogCoordPointerEXT(GLenum type, GLsizei stride,
+				    const GLvoid *ptr)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->FogCoordPointerEXT( type, stride, ptr);
+}
+
+/* GL_EXT_multi_draw_arrays */
+static void GLAPIENTRY exec_MultiDrawArraysEXT(GLenum mode, GLint *first,
+                                    GLsizei *count, GLsizei primcount)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->MultiDrawArraysEXT( mode, first, count, primcount );
+}
+
+/* GL_EXT_multi_draw_arrays */
+static void GLAPIENTRY exec_MultiDrawElementsEXT(GLenum mode, const GLsizei *count,
+                                      GLenum type, const GLvoid **indices,
+                                      GLsizei primcount)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->MultiDrawElementsEXT(mode, count, type, indices, primcount);
+}
+
+/* GL_IBM_multimode_draw_arrays */
+static void GLAPIENTRY exec_MultiModeDrawArraysIBM(const GLenum *mode, const GLint *first,
+					const GLsizei *count, GLsizei primcount,
+					GLint modestride)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->MultiModeDrawArraysIBM(mode, first, count, primcount, modestride);
+}
+
+/* GL_IBM_multimode_draw_arrays */
+static void GLAPIENTRY exec_MultiModeDrawElementsIBM(const GLenum *mode,
+					  const GLsizei *count,
+					  GLenum type,
+					  const GLvoid * const *indices,
+					  GLsizei primcount, GLint modestride)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FLUSH_VERTICES(ctx, 0);
+   ctx->Exec->MultiModeDrawElementsIBM(mode, count, type, indices, primcount,
+				       modestride);
+}
+
+
+
+
+/**
+ * Setup the given dispatch table to point to Mesa's display list
+ * building functions.
+ *
+ * This does not include any of the tnl functions - they are
+ * initialized from _mesa_init_api_defaults and from the active vtxfmt
+ * struct.
+ */
+void
+_mesa_init_dlist_table( struct _glapi_table *table, GLuint tableSize )
+{
+   _mesa_init_no_op_table(table, tableSize);
+
+   _mesa_loopback_init_api_table( table );
+
+   /* GL 1.0 */
+   table->Accum = save_Accum;
+   table->AlphaFunc = save_AlphaFunc;
+   table->Bitmap = save_Bitmap;
+   table->BlendFunc = save_BlendFunc;
+   table->CallList = _mesa_save_CallList;
+   table->CallLists = _mesa_save_CallLists;
+   table->Clear = save_Clear;
+   table->ClearAccum = save_ClearAccum;
+   table->ClearColor = save_ClearColor;
+   table->ClearDepth = save_ClearDepth;
+   table->ClearIndex = save_ClearIndex;
+   table->ClearStencil = save_ClearStencil;
+   table->ClipPlane = save_ClipPlane;
+   table->ColorMask = save_ColorMask;
+   table->ColorMaterial = save_ColorMaterial;
+   table->CopyPixels = save_CopyPixels;
+   table->CullFace = save_CullFace;
+   table->DeleteLists = _mesa_DeleteLists;
+   table->DepthFunc = save_DepthFunc;
+   table->DepthMask = save_DepthMask;
+   table->DepthRange = save_DepthRange;
+   table->Disable = save_Disable;
+   table->DrawBuffer = save_DrawBuffer;
+   table->DrawPixels = save_DrawPixels;
+   table->Enable = save_Enable;
+   table->EndList = _mesa_EndList;
+   table->EvalMesh1 = _mesa_save_EvalMesh1;
+   table->EvalMesh2 = _mesa_save_EvalMesh2;
+   table->Finish = exec_Finish;
+   table->Flush = exec_Flush;
+   table->Fogf = save_Fogf;
+   table->Fogfv = save_Fogfv;
+   table->Fogi = save_Fogi;
+   table->Fogiv = save_Fogiv;
+   table->FrontFace = save_FrontFace;
+   table->Frustum = save_Frustum;
+   table->GenLists = _mesa_GenLists;
+   table->GetBooleanv = exec_GetBooleanv;
+   table->GetClipPlane = exec_GetClipPlane;
+   table->GetDoublev = exec_GetDoublev;
+   table->GetError = exec_GetError;
+   table->GetFloatv = exec_GetFloatv;
+   table->GetIntegerv = exec_GetIntegerv;
+   table->GetLightfv = exec_GetLightfv;
+   table->GetLightiv = exec_GetLightiv;
+   table->GetMapdv = exec_GetMapdv;
+   table->GetMapfv = exec_GetMapfv;
+   table->GetMapiv = exec_GetMapiv;
+   table->GetMaterialfv = exec_GetMaterialfv;
+   table->GetMaterialiv = exec_GetMaterialiv;
+   table->GetPixelMapfv = exec_GetPixelMapfv;
+   table->GetPixelMapuiv = exec_GetPixelMapuiv;
+   table->GetPixelMapusv = exec_GetPixelMapusv;
+   table->GetPolygonStipple = exec_GetPolygonStipple;
+   table->GetString = exec_GetString;
+   table->GetTexEnvfv = exec_GetTexEnvfv;
+   table->GetTexEnviv = exec_GetTexEnviv;
+   table->GetTexGendv = exec_GetTexGendv;
+   table->GetTexGenfv = exec_GetTexGenfv;
+   table->GetTexGeniv = exec_GetTexGeniv;
+   table->GetTexImage = exec_GetTexImage;
+   table->GetTexLevelParameterfv = exec_GetTexLevelParameterfv;
+   table->GetTexLevelParameteriv = exec_GetTexLevelParameteriv;
+   table->GetTexParameterfv = exec_GetTexParameterfv;
+   table->GetTexParameteriv = exec_GetTexParameteriv;
+   table->Hint = save_Hint;
+   table->IndexMask = save_IndexMask;
+   table->InitNames = save_InitNames;
+   table->IsEnabled = exec_IsEnabled;
+   table->IsList = _mesa_IsList;
+   table->LightModelf = save_LightModelf;
+   table->LightModelfv = save_LightModelfv;
+   table->LightModeli = save_LightModeli;
+   table->LightModeliv = save_LightModeliv;
+   table->Lightf = save_Lightf;
+   table->Lightfv = save_Lightfv;
+   table->Lighti = save_Lighti;
+   table->Lightiv = save_Lightiv;
+   table->LineStipple = save_LineStipple;
+   table->LineWidth = save_LineWidth;
+   table->ListBase = save_ListBase;
+   table->LoadIdentity = save_LoadIdentity;
+   table->LoadMatrixd = save_LoadMatrixd;
+   table->LoadMatrixf = save_LoadMatrixf;
+   table->LoadName = save_LoadName;
+   table->LogicOp = save_LogicOp;
+   table->Map1d = save_Map1d;
+   table->Map1f = save_Map1f;
+   table->Map2d = save_Map2d;
+   table->Map2f = save_Map2f;
+   table->MapGrid1d = save_MapGrid1d;
+   table->MapGrid1f = save_MapGrid1f;
+   table->MapGrid2d = save_MapGrid2d;
+   table->MapGrid2f = save_MapGrid2f;
+   table->MatrixMode = save_MatrixMode;
+   table->MultMatrixd = save_MultMatrixd;
+   table->MultMatrixf = save_MultMatrixf;
+   table->NewList = save_NewList;
+   table->Ortho = save_Ortho;
+   table->PassThrough = save_PassThrough;
+   table->PixelMapfv = save_PixelMapfv;
+   table->PixelMapuiv = save_PixelMapuiv;
+   table->PixelMapusv = save_PixelMapusv;
+   table->PixelStoref = exec_PixelStoref;
+   table->PixelStorei = exec_PixelStorei;
+   table->PixelTransferf = save_PixelTransferf;
+   table->PixelTransferi = save_PixelTransferi;
+   table->PixelZoom = save_PixelZoom;
+   table->PointSize = save_PointSize;
+   table->PolygonMode = save_PolygonMode;
+   table->PolygonOffset = save_PolygonOffset;
+   table->PolygonStipple = save_PolygonStipple;
+   table->PopAttrib = save_PopAttrib;
+   table->PopMatrix = save_PopMatrix;
+   table->PopName = save_PopName;
+   table->PushAttrib = save_PushAttrib;
+   table->PushMatrix = save_PushMatrix;
+   table->PushName = save_PushName;
+   table->RasterPos2d = save_RasterPos2d;
+   table->RasterPos2dv = save_RasterPos2dv;
+   table->RasterPos2f = save_RasterPos2f;
+   table->RasterPos2fv = save_RasterPos2fv;
+   table->RasterPos2i = save_RasterPos2i;
+   table->RasterPos2iv = save_RasterPos2iv;
+   table->RasterPos2s = save_RasterPos2s;
+   table->RasterPos2sv = save_RasterPos2sv;
+   table->RasterPos3d = save_RasterPos3d;
+   table->RasterPos3dv = save_RasterPos3dv;
+   table->RasterPos3f = save_RasterPos3f;
+   table->RasterPos3fv = save_RasterPos3fv;
+   table->RasterPos3i = save_RasterPos3i;
+   table->RasterPos3iv = save_RasterPos3iv;
+   table->RasterPos3s = save_RasterPos3s;
+   table->RasterPos3sv = save_RasterPos3sv;
+   table->RasterPos4d = save_RasterPos4d;
+   table->RasterPos4dv = save_RasterPos4dv;
+   table->RasterPos4f = save_RasterPos4f;
+   table->RasterPos4fv = save_RasterPos4fv;
+   table->RasterPos4i = save_RasterPos4i;
+   table->RasterPos4iv = save_RasterPos4iv;
+   table->RasterPos4s = save_RasterPos4s;
+   table->RasterPos4sv = save_RasterPos4sv;
+   table->ReadBuffer = save_ReadBuffer;
+   table->ReadPixels = exec_ReadPixels;
+   table->RenderMode = exec_RenderMode;
+   table->Rotated = save_Rotated;
+   table->Rotatef = save_Rotatef;
+   table->Scaled = save_Scaled;
+   table->Scalef = save_Scalef;
+   table->Scissor = save_Scissor;
+   table->FeedbackBuffer = exec_FeedbackBuffer;
+   table->SelectBuffer = exec_SelectBuffer;
+   table->ShadeModel = save_ShadeModel;
+   table->StencilFunc = save_StencilFunc;
+   table->StencilMask = save_StencilMask;
+   table->StencilOp = save_StencilOp;
+   table->TexEnvf = save_TexEnvf;
+   table->TexEnvfv = save_TexEnvfv;
+   table->TexEnvi = save_TexEnvi;
+   table->TexEnviv = save_TexEnviv;
+   table->TexGend = save_TexGend;
+   table->TexGendv = save_TexGendv;
+   table->TexGenf = save_TexGenf;
+   table->TexGenfv = save_TexGenfv;
+   table->TexGeni = save_TexGeni;
+   table->TexGeniv = save_TexGeniv;
+   table->TexImage1D = save_TexImage1D;
+   table->TexImage2D = save_TexImage2D;
+   table->TexParameterf = save_TexParameterf;
+   table->TexParameterfv = save_TexParameterfv;
+   table->TexParameteri = save_TexParameteri;
+   table->TexParameteriv = save_TexParameteriv;
+   table->Translated = save_Translated;
+   table->Translatef = save_Translatef;
+   table->Viewport = save_Viewport;
+
+   /* GL 1.1 */
+   table->AreTexturesResident = exec_AreTexturesResident;
+   table->AreTexturesResidentEXT = exec_AreTexturesResident;
+   table->BindTexture = save_BindTexture;
+   table->ColorPointer = exec_ColorPointer;
+   table->CopyTexImage1D = save_CopyTexImage1D;
+   table->CopyTexImage2D = save_CopyTexImage2D;
+   table->CopyTexSubImage1D = save_CopyTexSubImage1D;
+   table->CopyTexSubImage2D = save_CopyTexSubImage2D;
+   table->DeleteTextures = exec_DeleteTextures;
+   table->DisableClientState = exec_DisableClientState;
+   table->EdgeFlagPointer = exec_EdgeFlagPointer;
+   table->EnableClientState = exec_EnableClientState;
+   table->GenTextures = exec_GenTextures;
+   table->GenTexturesEXT = exec_GenTextures;
+   table->GetPointerv = exec_GetPointerv;
+   table->IndexPointer = exec_IndexPointer;
+   table->InterleavedArrays = exec_InterleavedArrays;
+   table->IsTexture = exec_IsTexture;
+   table->IsTextureEXT = exec_IsTexture;
+   table->NormalPointer = exec_NormalPointer;
+   table->PopClientAttrib = exec_PopClientAttrib;
+   table->PrioritizeTextures = save_PrioritizeTextures;
+   table->PushClientAttrib = exec_PushClientAttrib;
+   table->TexCoordPointer = exec_TexCoordPointer;
+   table->TexSubImage1D = save_TexSubImage1D;
+   table->TexSubImage2D = save_TexSubImage2D;
+   table->VertexPointer = exec_VertexPointer;
+
+   /* GL 1.2 */
+   table->CopyTexSubImage3D = save_CopyTexSubImage3D;
+   table->TexImage3D = save_TexImage3D;
+   table->TexSubImage3D = save_TexSubImage3D;
+
+   /* GL_ARB_imaging */
+   /* Not all are supported */
+   table->BlendColor = save_BlendColor;
+   table->BlendEquation = save_BlendEquation;
+   table->ColorSubTable = save_ColorSubTable;
+   table->ColorTable = save_ColorTable;
+   table->ColorTableParameterfv = save_ColorTableParameterfv;
+   table->ColorTableParameteriv = save_ColorTableParameteriv;
+   table->ConvolutionFilter1D = save_ConvolutionFilter1D;
+   table->ConvolutionFilter2D = save_ConvolutionFilter2D;
+   table->ConvolutionParameterf = save_ConvolutionParameterf;
+   table->ConvolutionParameterfv = save_ConvolutionParameterfv;
+   table->ConvolutionParameteri = save_ConvolutionParameteri;
+   table->ConvolutionParameteriv = save_ConvolutionParameteriv;
+   table->CopyColorSubTable = save_CopyColorSubTable;
+   table->CopyColorTable = save_CopyColorTable;
+   table->CopyConvolutionFilter1D = exec_CopyConvolutionFilter1D;
+   table->CopyConvolutionFilter2D = exec_CopyConvolutionFilter2D;
+   table->GetColorTable = exec_GetColorTable;
+   table->GetColorTableEXT = exec_GetColorTable;
+   table->GetColorTableParameterfv = exec_GetColorTableParameterfv;
+   table->GetColorTableParameterfvEXT = exec_GetColorTableParameterfv;
+   table->GetColorTableParameteriv = exec_GetColorTableParameteriv;
+   table->GetColorTableParameterivEXT = exec_GetColorTableParameteriv;
+   table->GetConvolutionFilter = exec_GetConvolutionFilter;
+   table->GetConvolutionFilterEXT = exec_GetConvolutionFilter;
+   table->GetConvolutionParameterfv = exec_GetConvolutionParameterfv;
+   table->GetConvolutionParameterfvEXT = exec_GetConvolutionParameterfv;
+   table->GetConvolutionParameteriv = exec_GetConvolutionParameteriv;
+   table->GetConvolutionParameterivEXT = exec_GetConvolutionParameteriv;
+   table->GetHistogram = exec_GetHistogram;
+   table->GetHistogramEXT = exec_GetHistogram;
+   table->GetHistogramParameterfv = exec_GetHistogramParameterfv;
+   table->GetHistogramParameterfvEXT = exec_GetHistogramParameterfv;
+   table->GetHistogramParameteriv = exec_GetHistogramParameteriv;
+   table->GetHistogramParameterivEXT = exec_GetHistogramParameteriv;
+   table->GetMinmax = exec_GetMinmax;
+   table->GetMinmaxEXT = exec_GetMinmax;
+   table->GetMinmaxParameterfv = exec_GetMinmaxParameterfv;
+   table->GetMinmaxParameterfvEXT = exec_GetMinmaxParameterfv;
+   table->GetMinmaxParameteriv = exec_GetMinmaxParameteriv;
+   table->GetMinmaxParameterivEXT = exec_GetMinmaxParameteriv;
+   table->GetSeparableFilter = exec_GetSeparableFilter;
+   table->GetSeparableFilterEXT = exec_GetSeparableFilter;
+   table->Histogram = save_Histogram;
+   table->Minmax = save_Minmax;
+   table->ResetHistogram = save_ResetHistogram;
+   table->ResetMinmax = save_ResetMinmax;
+   table->SeparableFilter2D = exec_SeparableFilter2D;
+
+   /* 2. GL_EXT_blend_color */
+#if 0
+   table->BlendColorEXT = save_BlendColorEXT;
+#endif
+
+   /* 3. GL_EXT_polygon_offset */
+   table->PolygonOffsetEXT = save_PolygonOffsetEXT;
+
+   /* 6. GL_EXT_texture3d */
+#if 0
+   table->CopyTexSubImage3DEXT = save_CopyTexSubImage3D;
+   table->TexImage3DEXT = save_TexImage3DEXT;
+   table->TexSubImage3DEXT = save_TexSubImage3D;
+#endif
+
+   /* 15. GL_SGIX_pixel_texture */
+   table->PixelTexGenSGIX = save_PixelTexGenSGIX;
+
+   /* 15. GL_SGIS_pixel_texture */
+   table->PixelTexGenParameteriSGIS = save_PixelTexGenParameteriSGIS;
+   table->PixelTexGenParameterfSGIS = save_PixelTexGenParameterfSGIS;
+   table->PixelTexGenParameterivSGIS = save_PixelTexGenParameterivSGIS;
+   table->PixelTexGenParameterfvSGIS = save_PixelTexGenParameterfvSGIS;
+   table->GetPixelTexGenParameterivSGIS = exec_GetPixelTexGenParameterivSGIS;
+   table->GetPixelTexGenParameterfvSGIS = exec_GetPixelTexGenParameterfvSGIS;
+
+   /* 30. GL_EXT_vertex_array */
+   table->ColorPointerEXT = exec_ColorPointerEXT;
+   table->EdgeFlagPointerEXT = exec_EdgeFlagPointerEXT;
+   table->IndexPointerEXT = exec_IndexPointerEXT;
+   table->NormalPointerEXT = exec_NormalPointerEXT;
+   table->TexCoordPointerEXT = exec_TexCoordPointerEXT;
+   table->VertexPointerEXT = exec_VertexPointerEXT;
+
+   /* 37. GL_EXT_blend_minmax */
+#if 0
+   table->BlendEquationEXT = save_BlendEquationEXT;
+#endif
+
+   /* 54. GL_EXT_point_parameters */
+   table->PointParameterfEXT = save_PointParameterfEXT;
+   table->PointParameterfvEXT = save_PointParameterfvEXT;
+
+   /* 78. GL_EXT_paletted_texture */
+#if 0
+   table->ColorTableEXT = save_ColorTable;
+   table->ColorSubTableEXT = save_ColorSubTable;
+#endif
+   table->GetColorTableEXT = exec_GetColorTable;
+   table->GetColorTableParameterfvEXT = exec_GetColorTableParameterfv;
+   table->GetColorTableParameterivEXT = exec_GetColorTableParameteriv;
+
+   /* 97. GL_EXT_compiled_vertex_array */
+   table->LockArraysEXT = exec_LockArraysEXT;
+   table->UnlockArraysEXT = exec_UnlockArraysEXT;
+
+   /* 145. GL_EXT_secondary_color */
+   table->SecondaryColorPointerEXT = exec_SecondaryColorPointerEXT;
+
+   /* 148. GL_EXT_multi_draw_arrays */
+   table->MultiDrawArraysEXT = exec_MultiDrawArraysEXT;
+   table->MultiDrawElementsEXT = exec_MultiDrawElementsEXT;
+
+   /* 149. GL_EXT_fog_coord */
+   table->FogCoordPointerEXT = exec_FogCoordPointerEXT;
+
+   /* 173. GL_EXT_blend_func_separate */
+   table->BlendFuncSeparateEXT = save_BlendFuncSeparateEXT;
+
+   /* 196. GL_MESA_resize_buffers */
+   table->ResizeBuffersMESA = exec_ResizeBuffersMESA;
+
+   /* 197. GL_MESA_window_pos */
+   table->WindowPos2dMESA = save_WindowPos2dMESA;
+   table->WindowPos2dvMESA = save_WindowPos2dvMESA;
+   table->WindowPos2fMESA = save_WindowPos2fMESA;
+   table->WindowPos2fvMESA = save_WindowPos2fvMESA;
+   table->WindowPos2iMESA = save_WindowPos2iMESA;
+   table->WindowPos2ivMESA = save_WindowPos2ivMESA;
+   table->WindowPos2sMESA = save_WindowPos2sMESA;
+   table->WindowPos2svMESA = save_WindowPos2svMESA;
+   table->WindowPos3dMESA = save_WindowPos3dMESA;
+   table->WindowPos3dvMESA = save_WindowPos3dvMESA;
+   table->WindowPos3fMESA = save_WindowPos3fMESA;
+   table->WindowPos3fvMESA = save_WindowPos3fvMESA;
+   table->WindowPos3iMESA = save_WindowPos3iMESA;
+   table->WindowPos3ivMESA = save_WindowPos3ivMESA;
+   table->WindowPos3sMESA = save_WindowPos3sMESA;
+   table->WindowPos3svMESA = save_WindowPos3svMESA;
+   table->WindowPos4dMESA = save_WindowPos4dMESA;
+   table->WindowPos4dvMESA = save_WindowPos4dvMESA;
+   table->WindowPos4fMESA = save_WindowPos4fMESA;
+   table->WindowPos4fvMESA = save_WindowPos4fvMESA;
+   table->WindowPos4iMESA = save_WindowPos4iMESA;
+   table->WindowPos4ivMESA = save_WindowPos4ivMESA;
+   table->WindowPos4sMESA = save_WindowPos4sMESA;
+   table->WindowPos4svMESA = save_WindowPos4svMESA;
+
+   /* 200. GL_IBM_multimode_draw_arrays */
+   table->MultiModeDrawArraysIBM = exec_MultiModeDrawArraysIBM;
+   table->MultiModeDrawElementsIBM = exec_MultiModeDrawElementsIBM;
+
+#if FEATURE_NV_vertex_program
+   /* 233. GL_NV_vertex_program */
+   /* The following commands DO NOT go into display lists:
+    * AreProgramsResidentNV, IsProgramNV, GenProgramsNV, DeleteProgramsNV,
+    * VertexAttribPointerNV, GetProgram*, GetVertexAttrib*
+    */
+   table->BindProgramNV = save_BindProgramNV;
+   table->DeleteProgramsNV = _mesa_DeletePrograms;
+   table->ExecuteProgramNV = save_ExecuteProgramNV;
+   table->GenProgramsNV = _mesa_GenPrograms;
+   table->AreProgramsResidentNV = _mesa_AreProgramsResidentNV;
+   table->RequestResidentProgramsNV = save_RequestResidentProgramsNV;
+   table->GetProgramParameterfvNV = _mesa_GetProgramParameterfvNV;
+   table->GetProgramParameterdvNV = _mesa_GetProgramParameterdvNV;
+   table->GetProgramivNV = _mesa_GetProgramivNV;
+   table->GetProgramStringNV = _mesa_GetProgramStringNV;
+   table->GetTrackMatrixivNV = _mesa_GetTrackMatrixivNV;
+   table->GetVertexAttribdvNV = _mesa_GetVertexAttribdvNV;
+   table->GetVertexAttribfvNV = _mesa_GetVertexAttribfvNV;
+   table->GetVertexAttribivNV = _mesa_GetVertexAttribivNV;
+   table->GetVertexAttribPointervNV = _mesa_GetVertexAttribPointervNV;
+   table->IsProgramNV = _mesa_IsProgram;
+   table->LoadProgramNV = save_LoadProgramNV;
+   table->ProgramParameter4dNV = save_ProgramParameter4dNV;
+   table->ProgramParameter4dvNV = save_ProgramParameter4dvNV;
+   table->ProgramParameter4fNV = save_ProgramParameter4fNV;
+   table->ProgramParameter4fvNV = save_ProgramParameter4fvNV;
+   table->ProgramParameters4dvNV = save_ProgramParameters4dvNV;
+   table->ProgramParameters4fvNV = save_ProgramParameters4fvNV;
+   table->TrackMatrixNV = save_TrackMatrixNV;
+   table->VertexAttribPointerNV = _mesa_VertexAttribPointerNV;
+#endif
+
+   /* 282. GL_NV_fragment_program */
+#if FEATURE_NV_fragment_program
+   table->ProgramNamedParameter4fNV = save_ProgramNamedParameter4fNV;
+   table->ProgramNamedParameter4dNV = save_ProgramNamedParameter4dNV;
+   table->ProgramNamedParameter4fvNV = save_ProgramNamedParameter4fvNV;
+   table->ProgramNamedParameter4dvNV = save_ProgramNamedParameter4dvNV;
+   table->GetProgramNamedParameterfvNV = _mesa_GetProgramNamedParameterfvNV;
+   table->GetProgramNamedParameterdvNV = _mesa_GetProgramNamedParameterdvNV;
+   table->ProgramLocalParameter4dARB = save_ProgramLocalParameter4dARB;
+   table->ProgramLocalParameter4dvARB = save_ProgramLocalParameter4dvARB;
+   table->ProgramLocalParameter4fARB = save_ProgramLocalParameter4fARB;
+   table->ProgramLocalParameter4fvARB = save_ProgramLocalParameter4fvARB;
+   table->GetProgramLocalParameterdvARB = _mesa_GetProgramLocalParameterdvARB;
+   table->GetProgramLocalParameterfvARB = _mesa_GetProgramLocalParameterfvARB;
+#endif
+
+   /* 262. GL_NV_point_sprite */
+   table->PointParameteriNV = save_PointParameteriNV;
+   table->PointParameterivNV = save_PointParameterivNV;
+
+   /* 268. GL_EXT_stencil_two_side */
+   table->ActiveStencilFaceEXT = save_ActiveStencilFaceEXT;
+
+   /* ???. GL_EXT_depth_bounds_test */
+   table->DepthBoundsEXT = save_DepthBoundsEXT;
+
+   /* ARB 1. GL_ARB_multitexture */
+   table->ActiveTextureARB = save_ActiveTextureARB;
+   table->ClientActiveTextureARB = exec_ClientActiveTextureARB;
+
+   /* ARB 3. GL_ARB_transpose_matrix */
+   table->LoadTransposeMatrixdARB = save_LoadTransposeMatrixdARB;
+   table->LoadTransposeMatrixfARB = save_LoadTransposeMatrixfARB;
+   table->MultTransposeMatrixdARB = save_MultTransposeMatrixdARB;
+   table->MultTransposeMatrixfARB = save_MultTransposeMatrixfARB;
+
+   /* ARB 5. GL_ARB_multisample */
+   table->SampleCoverageARB = save_SampleCoverageARB;
+
+   /* ARB 12. GL_ARB_texture_compression */
+   table->CompressedTexImage3DARB = save_CompressedTexImage3DARB;
+   table->CompressedTexImage2DARB = save_CompressedTexImage2DARB;
+   table->CompressedTexImage1DARB = save_CompressedTexImage1DARB;
+   table->CompressedTexSubImage3DARB = save_CompressedTexSubImage3DARB;
+   table->CompressedTexSubImage2DARB = save_CompressedTexSubImage2DARB;
+   table->CompressedTexSubImage1DARB = save_CompressedTexSubImage1DARB;
+   table->GetCompressedTexImageARB = exec_GetCompressedTexImageARB;
+
+   /* ARB 14. GL_ARB_point_parameters */
+   /* aliased with EXT_point_parameters functions */
+
+   /* ARB 25. GL_ARB_window_pos */
+   /* aliased with MESA_window_pos functions */
+
+   /* ARB 26. GL_ARB_vertex_program */
+   /* ARB 27. GL_ARB_fragment_program */
+#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
+   /* glVertexAttrib* functions alias the NV ones, handled elsewhere */
+   table->VertexAttribPointerARB = _mesa_VertexAttribPointerARB;
+   table->EnableVertexAttribArrayARB = _mesa_EnableVertexAttribArrayARB;
+   table->DisableVertexAttribArrayARB = _mesa_DisableVertexAttribArrayARB;
+   table->ProgramStringARB = save_ProgramStringARB;
+   table->BindProgramNV = save_BindProgramNV;
+   table->DeleteProgramsNV = _mesa_DeletePrograms;
+   table->GenProgramsNV = _mesa_GenPrograms;
+   table->IsProgramNV = _mesa_IsProgram;
+   table->GetVertexAttribdvNV = _mesa_GetVertexAttribdvNV;
+   table->GetVertexAttribfvNV = _mesa_GetVertexAttribfvNV;
+   table->GetVertexAttribivNV = _mesa_GetVertexAttribivNV;
+   table->GetVertexAttribPointervNV = _mesa_GetVertexAttribPointervNV;
+   table->ProgramEnvParameter4dARB = save_ProgramEnvParameter4dARB;
+   table->ProgramEnvParameter4dvARB = save_ProgramEnvParameter4dvARB;
+   table->ProgramEnvParameter4fARB = save_ProgramEnvParameter4fARB;
+   table->ProgramEnvParameter4fvARB = save_ProgramEnvParameter4fvARB;
+   table->ProgramLocalParameter4dARB = save_ProgramLocalParameter4dARB;
+   table->ProgramLocalParameter4dvARB = save_ProgramLocalParameter4dvARB;
+   table->ProgramLocalParameter4fARB = save_ProgramLocalParameter4fARB;
+   table->ProgramLocalParameter4fvARB = save_ProgramLocalParameter4fvARB;
+   table->GetProgramEnvParameterdvARB = _mesa_GetProgramEnvParameterdvARB;
+   table->GetProgramEnvParameterfvARB = _mesa_GetProgramEnvParameterfvARB;
+   table->GetProgramLocalParameterdvARB = _mesa_GetProgramLocalParameterdvARB;
+   table->GetProgramLocalParameterfvARB = _mesa_GetProgramLocalParameterfvARB;
+   table->GetProgramivARB = _mesa_GetProgramivARB;
+   table->GetProgramStringARB = _mesa_GetProgramStringARB;
+#endif
+
+   /* ARB 28. GL_ARB_vertex_buffer_object */
+#if FEATURE_ARB_vertex_buffer_object
+   /* None of the extension's functions get compiled */
+   table->BindBufferARB = _mesa_BindBufferARB;
+   table->BufferDataARB = _mesa_BufferDataARB;
+   table->BufferSubDataARB = _mesa_BufferSubDataARB;
+   table->DeleteBuffersARB = _mesa_DeleteBuffersARB;
+   table->GenBuffersARB = _mesa_GenBuffersARB;
+   table->GetBufferParameterivARB = _mesa_GetBufferParameterivARB;
+   table->GetBufferPointervARB = _mesa_GetBufferPointervARB;
+   table->GetBufferSubDataARB = _mesa_GetBufferSubDataARB;
+   table->IsBufferARB = _mesa_IsBufferARB;
+   table->MapBufferARB = _mesa_MapBufferARB;
+   table->UnmapBufferARB = _mesa_UnmapBufferARB;
+#endif
+}
+
+
+
+/***
+ *** Debugging code
+ ***/
+static const char *enum_string( GLenum k )
+{
+   return _mesa_lookup_enum_by_nr( k );
+}
+
+
+/*
+ * Print the commands in a display list.  For debugging only.
+ * TODO: many commands aren't handled yet.
+ */
+static void GLAPIENTRY print_list( GLcontext *ctx, GLuint list )
+{
+   Node *n;
+   GLboolean done;
+
+   if (!glIsList(list)) {
+      _mesa_printf("%u is not a display list ID\n", list);
+      return;
+   }
+
+   n = (Node *) _mesa_HashLookup(ctx->Shared->DisplayList, list);
+
+   _mesa_printf("START-LIST %u, address %p\n", list, (void*)n );
+
+   done = n ? GL_FALSE : GL_TRUE;
+   while (!done) {
+      OpCode opcode = n[0].opcode;
+      GLint i = (GLint) n[0].opcode - (GLint) OPCODE_DRV_0;
+
+      if (i >= 0 && i < (GLint) ctx->listext.nr_opcodes) {
+	 ctx->listext.opcode[i].print(ctx, &n[1]);
+	 n += ctx->listext.opcode[i].size;
+      }
+      else {
+	 switch (opcode) {
+         case OPCODE_ACCUM:
+            _mesa_printf("accum %s %g\n", enum_string(n[1].e), n[2].f );
+	    break;
+	 case OPCODE_BITMAP:
+            _mesa_printf("Bitmap %d %d %g %g %g %g %p\n", n[1].i, n[2].i,
+		       n[3].f, n[4].f, n[5].f, n[6].f, (void *) n[7].data );
+	    break;
+         case OPCODE_CALL_LIST:
+            _mesa_printf("CallList %d\n", (int) n[1].ui );
+            break;
+         case OPCODE_CALL_LIST_OFFSET:
+            _mesa_printf("CallList %d + offset %u = %u\n", (int) n[1].ui,
+                    ctx->List.ListBase, ctx->List.ListBase + n[1].ui );
+            break;
+         case OPCODE_COLOR_TABLE_PARAMETER_FV:
+            _mesa_printf("ColorTableParameterfv %s %s %f %f %f %f\n",
+                    enum_string(n[1].e), enum_string(n[2].e),
+                    n[3].f, n[4].f, n[5].f, n[6].f);
+            break;
+         case OPCODE_COLOR_TABLE_PARAMETER_IV:
+            _mesa_printf("ColorTableParameteriv %s %s %d %d %d %d\n",
+                    enum_string(n[1].e), enum_string(n[2].e),
+                    n[3].i, n[4].i, n[5].i, n[6].i);
+            break;
+	 case OPCODE_DISABLE:
+            _mesa_printf("Disable %s\n", enum_string(n[1].e));
+	    break;
+	 case OPCODE_ENABLE:
+            _mesa_printf("Enable %s\n", enum_string(n[1].e));
+	    break;
+         case OPCODE_FRUSTUM:
+            _mesa_printf("Frustum %g %g %g %g %g %g\n",
+                    n[1].f, n[2].f, n[3].f, n[4].f, n[5].f, n[6].f );
+            break;
+	 case OPCODE_LINE_STIPPLE:
+	    _mesa_printf("LineStipple %d %x\n", n[1].i, (int) n[2].us );
+	    break;
+	 case OPCODE_LOAD_IDENTITY:
+            _mesa_printf("LoadIdentity\n");
+	    break;
+	 case OPCODE_LOAD_MATRIX:
+            _mesa_printf("LoadMatrix\n");
+            _mesa_printf("  %8f %8f %8f %8f\n",
+                         n[1].f, n[5].f,  n[9].f, n[13].f);
+            _mesa_printf("  %8f %8f %8f %8f\n",
+                         n[2].f, n[6].f, n[10].f, n[14].f);
+            _mesa_printf("  %8f %8f %8f %8f\n",
+                         n[3].f, n[7].f, n[11].f, n[15].f);
+            _mesa_printf("  %8f %8f %8f %8f\n",
+                         n[4].f, n[8].f, n[12].f, n[16].f);
+	    break;
+	 case OPCODE_MULT_MATRIX:
+            _mesa_printf("MultMatrix (or Rotate)\n");
+            _mesa_printf("  %8f %8f %8f %8f\n",
+                         n[1].f, n[5].f,  n[9].f, n[13].f);
+            _mesa_printf("  %8f %8f %8f %8f\n",
+                         n[2].f, n[6].f, n[10].f, n[14].f);
+            _mesa_printf("  %8f %8f %8f %8f\n",
+                         n[3].f, n[7].f, n[11].f, n[15].f);
+            _mesa_printf("  %8f %8f %8f %8f\n",
+                         n[4].f, n[8].f, n[12].f, n[16].f);
+	    break;
+         case OPCODE_ORTHO:
+            _mesa_printf("Ortho %g %g %g %g %g %g\n",
+                    n[1].f, n[2].f, n[3].f, n[4].f, n[5].f, n[6].f );
+            break;
+	 case OPCODE_POP_ATTRIB:
+            _mesa_printf("PopAttrib\n");
+	    break;
+	 case OPCODE_POP_MATRIX:
+            _mesa_printf("PopMatrix\n");
+	    break;
+	 case OPCODE_POP_NAME:
+            _mesa_printf("PopName\n");
+	    break;
+	 case OPCODE_PUSH_ATTRIB:
+            _mesa_printf("PushAttrib %x\n", n[1].bf );
+	    break;
+	 case OPCODE_PUSH_MATRIX:
+            _mesa_printf("PushMatrix\n");
+	    break;
+	 case OPCODE_PUSH_NAME:
+            _mesa_printf("PushName %d\n", (int) n[1].ui );
+	    break;
+	 case OPCODE_RASTER_POS:
+            _mesa_printf("RasterPos %g %g %g %g\n",
+                         n[1].f, n[2].f,n[3].f,n[4].f);
+	    break;
+         case OPCODE_ROTATE:
+            _mesa_printf("Rotate %g %g %g %g\n",
+                         n[1].f, n[2].f, n[3].f, n[4].f );
+            break;
+         case OPCODE_SCALE:
+            _mesa_printf("Scale %g %g %g\n", n[1].f, n[2].f, n[3].f );
+            break;
+         case OPCODE_TRANSLATE:
+            _mesa_printf("Translate %g %g %g\n", n[1].f, n[2].f, n[3].f );
+            break;
+         case OPCODE_BIND_TEXTURE:
+	    _mesa_printf("BindTexture %s %d\n",
+                         _mesa_lookup_enum_by_nr(n[1].ui), n[2].ui);
+	    break;
+         case OPCODE_SHADE_MODEL:
+	    _mesa_printf("ShadeModel %s\n",
+                         _mesa_lookup_enum_by_nr(n[1].ui));
+	    break;
+	 case OPCODE_MAP1:
+	    _mesa_printf("Map1 %s %.3f %.3f %d %d\n",
+		    _mesa_lookup_enum_by_nr(n[1].ui),
+		    n[2].f, n[3].f, n[4].i, n[5].i);
+	    break;
+	 case OPCODE_MAP2:
+	    _mesa_printf("Map2 %s %.3f %.3f %.3f %.3f %d %d %d %d\n",
+                         _mesa_lookup_enum_by_nr(n[1].ui),
+                         n[2].f, n[3].f, n[4].f, n[5].f,
+                         n[6].i, n[7].i, n[8].i, n[9].i);
+	    break;
+	 case OPCODE_MAPGRID1:
+	    _mesa_printf("MapGrid1 %d %.3f %.3f\n",
+                         n[1].i, n[2].f, n[3].f);
+	    break;
+	 case OPCODE_MAPGRID2:
+	    _mesa_printf("MapGrid2 %d %.3f %.3f, %d %.3f %.3f\n",
+                         n[1].i, n[2].f, n[3].f,
+                         n[4].i, n[5].f, n[6].f);
+	    break;
+	 case OPCODE_EVALMESH1:
+	    _mesa_printf("EvalMesh1 %d %d\n", n[1].i, n[2].i);
+	    break;
+	 case OPCODE_EVALMESH2:
+	    _mesa_printf("EvalMesh2 %d %d %d %d\n",
+                         n[1].i, n[2].i, n[3].i, n[4].i);
+	    break;
+
+	 /*
+	  * meta opcodes/commands
+	  */
+         case OPCODE_ERROR:
+            _mesa_printf("Error: %s %s\n",
+                         enum_string(n[1].e), (const char *)n[2].data );
+            break;
+	 case OPCODE_CONTINUE:
+            _mesa_printf("DISPLAY-LIST-CONTINUE\n");
+	    n = (Node *) n[1].next;
+	    break;
+	 case OPCODE_END_OF_LIST:
+            _mesa_printf("END-LIST %u\n", list);
+	    done = GL_TRUE;
+	    break;
+         default:
+            if (opcode < 0 || opcode > OPCODE_END_OF_LIST) {
+               _mesa_printf("ERROR IN DISPLAY LIST: opcode = %d, address = %p\n",
+                            opcode, (void*) n);
+               return;
+            }
+            else {
+               _mesa_printf("command %d, %u operands\n", opcode, InstSize[opcode]);
+            }
+	 }
+	 /* increment n to point to next compiled command */
+	 if (opcode!=OPCODE_CONTINUE) {
+	    n += InstSize[opcode];
+	 }
+      }
+   }
+}
+
+
+
+/*
+ * Clients may call this function to help debug display list problems.
+ * This function is _ONLY_FOR_DEBUGGING_PURPOSES_.  It may be removed,
+ * changed, or break in the future without notice.
+ */
+void mesa_print_display_list( GLuint list )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   print_list( ctx, list );
+}
+
+
+/**********************************************************************/
+/*****                      Initialization                        *****/
+/**********************************************************************/
+
+
+void _mesa_save_vtxfmt_init( GLvertexformat *vfmt )
+{
+   vfmt->ArrayElement = _ae_loopback_array_elt;	        /* generic helper */
+   vfmt->Begin = save_Begin;
+   vfmt->CallList = _mesa_save_CallList;
+   vfmt->CallLists = _mesa_save_CallLists;
+   vfmt->Color3f = save_Color3f;
+   vfmt->Color3fv = save_Color3fv;
+   vfmt->Color4f = save_Color4f;
+   vfmt->Color4fv = save_Color4fv;
+   vfmt->EdgeFlag = save_EdgeFlag;
+   vfmt->EdgeFlagv = save_EdgeFlagv;
+   vfmt->End = save_End;
+   vfmt->EvalCoord1f = save_EvalCoord1f;
+   vfmt->EvalCoord1fv = save_EvalCoord1fv;
+   vfmt->EvalCoord2f = save_EvalCoord2f;
+   vfmt->EvalCoord2fv = save_EvalCoord2fv;
+   vfmt->EvalPoint1 = save_EvalPoint1;
+   vfmt->EvalPoint2 = save_EvalPoint2;
+   vfmt->FogCoordfEXT = save_FogCoordfEXT;
+   vfmt->FogCoordfvEXT = save_FogCoordfvEXT;
+   vfmt->Indexf = save_Indexf;
+   vfmt->Indexfv = save_Indexfv;
+   vfmt->Materialfv = save_Materialfv;
+   vfmt->MultiTexCoord1fARB = save_MultiTexCoord1f;
+   vfmt->MultiTexCoord1fvARB = save_MultiTexCoord1fv;
+   vfmt->MultiTexCoord2fARB = save_MultiTexCoord2f;
+   vfmt->MultiTexCoord2fvARB = save_MultiTexCoord2fv;
+   vfmt->MultiTexCoord3fARB = save_MultiTexCoord3f;
+   vfmt->MultiTexCoord3fvARB = save_MultiTexCoord3fv;
+   vfmt->MultiTexCoord4fARB = save_MultiTexCoord4f;
+   vfmt->MultiTexCoord4fvARB = save_MultiTexCoord4fv;
+   vfmt->Normal3f = save_Normal3f;
+   vfmt->Normal3fv = save_Normal3fv;
+   vfmt->SecondaryColor3fEXT = save_SecondaryColor3fEXT;
+   vfmt->SecondaryColor3fvEXT = save_SecondaryColor3fvEXT;
+   vfmt->TexCoord1f = save_TexCoord1f;
+   vfmt->TexCoord1fv = save_TexCoord1fv;
+   vfmt->TexCoord2f = save_TexCoord2f;
+   vfmt->TexCoord2fv = save_TexCoord2fv;
+   vfmt->TexCoord3f = save_TexCoord3f;
+   vfmt->TexCoord3fv = save_TexCoord3fv;
+   vfmt->TexCoord4f = save_TexCoord4f;
+   vfmt->TexCoord4fv = save_TexCoord4fv;
+   vfmt->Vertex2f = save_Vertex2f;
+   vfmt->Vertex2fv = save_Vertex2fv;
+   vfmt->Vertex3f = save_Vertex3f;
+   vfmt->Vertex3fv = save_Vertex3fv;
+   vfmt->Vertex4f = save_Vertex4f;
+   vfmt->Vertex4fv = save_Vertex4fv;
+   vfmt->VertexAttrib1fNV = save_VertexAttrib1fNV;
+   vfmt->VertexAttrib1fvNV = save_VertexAttrib1fvNV;
+   vfmt->VertexAttrib2fNV = save_VertexAttrib2fNV;
+   vfmt->VertexAttrib2fvNV = save_VertexAttrib2fvNV;
+   vfmt->VertexAttrib3fNV = save_VertexAttrib3fNV;
+   vfmt->VertexAttrib3fvNV = save_VertexAttrib3fvNV;
+   vfmt->VertexAttrib4fNV = save_VertexAttrib4fNV;
+   vfmt->VertexAttrib4fvNV = save_VertexAttrib4fvNV;
+
+   vfmt->EvalMesh1 = _mesa_save_EvalMesh1;
+   vfmt->EvalMesh2 = _mesa_save_EvalMesh2;
+   vfmt->Rectf = save_Rectf;
+
+   /* The driver is required to implement these as
+    * 1) They can probably do a better job.
+    * 2) A lot of new mechanisms would have to be added to this module
+    *     to support it.  That code would probably never get used,
+    *     because of (1).
+    */
+#if 0
+   vfmt->DrawArrays = 0;
+   vfmt->DrawElements = 0;
+   vfmt->DrawRangeElements = 0;
+#endif
+}
+
+
+
+void _mesa_init_display_list( GLcontext * ctx )
+{
+   /* Display list */
+   ctx->ListState.CallDepth = 0;
+   ctx->ExecuteFlag = GL_TRUE;
+   ctx->CompileFlag = GL_FALSE;
+   ctx->ListState.CurrentListPtr = NULL;
+   ctx->ListState.CurrentBlock = NULL;
+   ctx->ListState.CurrentListNum = 0;
+   ctx->ListState.CurrentPos = 0;
+
+   /* Display List group */
+   ctx->List.ListBase = 0;
+
+   _mesa_save_vtxfmt_init( &ctx->ListState.ListVtxfmt );
+}
diff --git a/reactos/lib/mesa32/src/main/dlist.h b/reactos/lib/mesa32/src/main/dlist.h
new file mode 100644
index 00000000000..a6b9c363a11
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/dlist.h
@@ -0,0 +1,104 @@
+/**
+ * \file dlist.h
+ * Display lists management.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+
+#ifndef DLIST_H
+#define DLIST_H
+
+
+#include "mtypes.h"
+
+
+#if _HAVE_FULL_GL
+
+extern void _mesa_init_lists( void );
+
+extern void _mesa_destroy_list( GLcontext *ctx, GLuint list );
+
+extern void GLAPIENTRY _mesa_CallList( GLuint list );
+
+extern void GLAPIENTRY _mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists );
+
+extern void GLAPIENTRY _mesa_DeleteLists( GLuint list, GLsizei range );
+
+extern void GLAPIENTRY _mesa_EndList( void );
+
+extern GLuint GLAPIENTRY _mesa_GenLists( GLsizei range );
+
+extern GLboolean GLAPIENTRY _mesa_IsList( GLuint list );
+
+extern void GLAPIENTRY _mesa_ListBase( GLuint base );
+
+extern void GLAPIENTRY _mesa_NewList( GLuint list, GLenum mode );
+
+extern void _mesa_init_dlist_table( struct _glapi_table *table,
+                                    GLuint tableSize );
+
+extern void _mesa_save_error( GLcontext *ctx, GLenum error, const char *s );
+
+extern void _mesa_compile_error( GLcontext *ctx, GLenum error, const char *s );
+
+
+extern void *_mesa_alloc_instruction( GLcontext *ctx, int opcode, GLint sz );
+
+extern int _mesa_alloc_opcode( GLcontext *ctx, GLuint sz,
+                               void (*execute)( GLcontext *, void * ),
+                               void (*destroy)( GLcontext *, void * ),
+                               void (*print)( GLcontext *, void * ) );
+
+extern void GLAPIENTRY _mesa_save_EvalMesh2(GLenum mode, GLint i1, GLint i2,
+				 GLint j1, GLint j2 );
+extern void GLAPIENTRY _mesa_save_EvalMesh1( GLenum mode, GLint i1, GLint i2 );
+extern void GLAPIENTRY _mesa_save_CallLists( GLsizei n, GLenum type, const GLvoid *lists );
+extern void GLAPIENTRY _mesa_save_CallList( GLuint list );
+extern void _mesa_init_display_list( GLcontext * ctx );
+extern void _mesa_save_vtxfmt_init( GLvertexformat *vfmt );
+
+
+#else
+
+/** No-op */
+#define _mesa_init_lists() ((void)0)
+
+/** No-op */
+#define _mesa_destroy_list(c,l) ((void)0)
+
+/** No-op */
+#define _mesa_init_dlist_table(t,ts) ((void)0)
+
+/** No-op */
+#define _mesa_init_display_list(c) ((void)0)
+
+/** No-op */
+#define _mesa_save_vtxfmt_init(v) ((void)0)
+
+#endif
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/drawpix.c b/reactos/lib/mesa32/src/main/drawpix.c
new file mode 100644
index 00000000000..14442d0027a
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/drawpix.c
@@ -0,0 +1,308 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "glheader.h"
+#include "imports.h"
+#include "colormac.h"
+#include "context.h"
+#include "drawpix.h"
+#include "feedback.h"
+#include "macros.h"
+#include "state.h"
+#include "mtypes.h"
+
+#if _HAVE_FULL_GL
+
+/*
+ * Execute glDrawPixels
+ */
+void GLAPIENTRY
+_mesa_DrawPixels( GLsizei width, GLsizei height,
+                  GLenum format, GLenum type, const GLvoid *pixels )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (ctx->FragmentProgram.Enabled
+       && !ctx->FragmentProgram.Current->Instructions) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glDrawPixels (invalid fragment program)");
+      return;
+   }
+
+   if (width < 0 || height < 0) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glDrawPixels(width or height < 0" );
+      return;
+   }
+
+   if (ctx->RenderMode==GL_RENDER) {
+      GLint x, y;
+      if (!pixels || !ctx->Current.RasterPosValid) {
+	 return;
+      }
+
+      if (ctx->NewState) {
+         _mesa_update_state(ctx);
+      }
+
+      /* Round, to satisfy conformance tests (matches SGI's OpenGL) */
+      x = IROUND(ctx->Current.RasterPos[0]);
+      y = IROUND(ctx->Current.RasterPos[1]);
+
+      ctx->OcclusionResult = GL_TRUE;
+      ctx->Driver.DrawPixels(ctx, x, y, width, height, format, type,
+			     &ctx->Unpack, pixels);
+   }
+   else if (ctx->RenderMode==GL_FEEDBACK) {
+      /* Feedback the current raster pos info */
+      if (ctx->Current.RasterPosValid) {
+	 FLUSH_CURRENT( ctx, 0 );
+         FEEDBACK_TOKEN( ctx, (GLfloat) (GLint) GL_DRAW_PIXEL_TOKEN );
+         _mesa_feedback_vertex( ctx,
+				ctx->Current.RasterPos,
+				ctx->Current.RasterColor,
+				ctx->Current.RasterIndex,
+				ctx->Current.RasterTexCoords[0] );
+      }
+   }
+   else if (ctx->RenderMode==GL_SELECT) {
+      if (ctx->Current.RasterPosValid) {
+         _mesa_update_hitflag( ctx, ctx->Current.RasterPos[2] );
+      }
+   }
+}
+
+void GLAPIENTRY
+_mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
+                  GLenum type )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint destx, desty;
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (ctx->FragmentProgram.Enabled
+       && !ctx->FragmentProgram.Current->Instructions) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glCopyPixels (invalid fragment program)");
+      return;
+   }
+
+   if (width < 0 || height < 0) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glCopyPixels(width or height < 0)" );
+      return;
+   }
+
+   if (ctx->NewState) {
+      _mesa_update_state(ctx);
+   }
+
+   if (ctx->RenderMode==GL_RENDER) {
+      /* Destination of copy: */
+      if (!ctx->Current.RasterPosValid) {
+	 return;
+      }
+
+      /* Round, to satisfy conformance tests (matches SGI's OpenGL) */
+      destx = IROUND(ctx->Current.RasterPos[0]);
+      desty = IROUND(ctx->Current.RasterPos[1]);
+
+      ctx->OcclusionResult = GL_TRUE;
+
+      ctx->Driver.CopyPixels( ctx, srcx, srcy, width, height, destx, desty,
+			      type );
+   }
+   else if (ctx->RenderMode == GL_FEEDBACK) {
+      if (ctx->Current.RasterPosValid) {
+         FLUSH_CURRENT( ctx, 0 );
+         FEEDBACK_TOKEN( ctx, (GLfloat) (GLint) GL_COPY_PIXEL_TOKEN );
+         _mesa_feedback_vertex( ctx, 
+                                ctx->Current.RasterPos,
+                                ctx->Current.RasterColor,
+                                ctx->Current.RasterIndex,
+                                ctx->Current.RasterTexCoords[0] );
+      }
+   }
+   else if (ctx->RenderMode == GL_SELECT) {
+      _mesa_update_hitflag( ctx, ctx->Current.RasterPos[2] );
+   }
+}
+
+#endif
+
+
+
+void GLAPIENTRY
+_mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,
+		  GLenum format, GLenum type, GLvoid *pixels )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (width < 0 || height < 0) {
+      _mesa_error( ctx, GL_INVALID_VALUE,
+                   "glReadPixels(width=%d height=%d)", width, height );
+      return;
+   }
+
+   if (!pixels) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glReadPixels(pixels)" );
+      return;
+   }
+
+   if (ctx->NewState)
+      _mesa_update_state(ctx);
+
+   ctx->Driver.ReadPixels(ctx, x, y, width, height,
+			  format, type, &ctx->Pack, pixels);
+}
+
+
+
+
+
+void GLAPIENTRY
+_mesa_Bitmap( GLsizei width, GLsizei height,
+              GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove,
+              const GLubyte *bitmap )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (ctx->FragmentProgram.Enabled
+       && !ctx->FragmentProgram.Current->Instructions) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glBitmap (invalid fragment program)");
+      return;
+   }
+
+   if (width < 0 || height < 0) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glBitmap(width or height < 0)" );
+      return;
+   }
+
+   if (ctx->Current.RasterPosValid == GL_FALSE) {
+      return;    /* do nothing */
+   }
+
+   if (ctx->RenderMode==GL_RENDER) {
+      if (bitmap) {
+         /* Truncate, to satisfy conformance tests (matches SGI's OpenGL). */
+         GLint x = IFLOOR(ctx->Current.RasterPos[0] - xorig);
+         GLint y = IFLOOR(ctx->Current.RasterPos[1] - yorig);
+
+         if (ctx->NewState) {
+            _mesa_update_state(ctx);
+         }
+
+         ctx->OcclusionResult = GL_TRUE;
+	 ctx->Driver.Bitmap( ctx, x, y, width, height, &ctx->Unpack, bitmap );
+      }
+   }
+#if _HAVE_FULL_GL
+   else if (ctx->RenderMode==GL_FEEDBACK) {
+      if (ctx->Current.RasterPosValid) {
+	 FLUSH_CURRENT(ctx, 0);
+         FEEDBACK_TOKEN( ctx, (GLfloat) (GLint) GL_BITMAP_TOKEN );
+         _mesa_feedback_vertex( ctx,
+				ctx->Current.RasterPos,
+				ctx->Current.RasterColor,
+				ctx->Current.RasterIndex, 
+				ctx->Current.RasterTexCoords[0] );
+      }
+   }
+   else {
+      ASSERT(ctx->RenderMode == GL_SELECT);
+      /* Bitmaps don't generate selection hits.  See appendix B of 1.1 spec. */
+   }
+#endif
+
+   /* update raster position */
+   ctx->Current.RasterPos[0] += xmove;
+   ctx->Current.RasterPos[1] += ymove;
+}
+
+
+
+#if 0  /* experimental */
+/*
+ * Execute glDrawDepthPixelsMESA().  This function accepts both a color
+ * image and depth (Z) image.  Rasterization produces fragments with
+ * color and Z taken from these images.  This function is intended for
+ * Z-compositing.  Normally, this operation requires two glDrawPixels
+ * calls with stencil testing.
+ */
+void GLAPIENTRY
+_mesa_DrawDepthPixelsMESA( GLsizei width, GLsizei height,
+                           GLenum colorFormat, GLenum colorType,
+                           const GLvoid *colors,
+                           GLenum depthType, const GLvoid *depths )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (width < 0 || height < 0) {
+      _mesa_error( ctx, GL_INVALID_VALUE,
+                   "glDrawDepthPixelsMESA(width or height < 0" );
+      return;
+   }
+
+   if (ctx->RenderMode==GL_RENDER) {
+      GLint x, y;
+      if (!colors || !depths || !ctx->Current.RasterPosValid) {
+	 return;
+      }
+
+      if (ctx->NewState) {
+         _mesa_update_state(ctx);
+      }
+
+      /* Round, to satisfy conformance tests (matches SGI's OpenGL) */
+      x = IROUND(ctx->Current.RasterPos[0]);
+      y = IROUND(ctx->Current.RasterPos[1]);
+
+      ctx->OcclusionResult = GL_TRUE;
+      ctx->Driver.DrawDepthPixelsMESA(ctx, x, y, width, height,
+                                      colorFormat, colorType, colors,
+                                      depthType, depths, &ctx->Unpack);
+   }
+   else if (ctx->RenderMode==GL_FEEDBACK) {
+      /* Feedback the current raster pos info */
+      if (ctx->Current.RasterPosValid) {
+	 FLUSH_CURRENT( ctx, 0 );
+         FEEDBACK_TOKEN( ctx, (GLfloat) (GLint) GL_DRAW_PIXEL_TOKEN );
+         _mesa_feedback_vertex( ctx,
+				ctx->Current.RasterPos,
+				ctx->Current.RasterColor,
+				ctx->Current.RasterIndex,
+				ctx->Current.RasterTexCoords[0] );
+      }
+   }
+   else if (ctx->RenderMode==GL_SELECT) {
+      if (ctx->Current.RasterPosValid) {
+         _mesa_update_hitflag( ctx, ctx->Current.RasterPos[2] );
+      }
+   }
+}
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/drawpix.h b/reactos/lib/mesa32/src/main/drawpix.h
new file mode 100644
index 00000000000..2a2d7de8d81
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/drawpix.h
@@ -0,0 +1,55 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef DRAWPIXELS_H
+#define DRAWPIXELS_H
+
+
+#include "mtypes.h"
+
+
+extern void GLAPIENTRY
+_mesa_DrawPixels( GLsizei width, GLsizei height,
+                  GLenum format, GLenum type, const GLvoid *pixels );
+
+
+extern void GLAPIENTRY
+_mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,
+                  GLenum format, GLenum type, GLvoid *pixels );
+
+
+extern void GLAPIENTRY
+_mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
+                  GLenum type );
+
+
+extern void GLAPIENTRY
+_mesa_Bitmap( GLsizei width, GLsizei height,
+              GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove,
+              const GLubyte *bitmap );
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/enable.c b/reactos/lib/mesa32/src/main/enable.c
new file mode 100644
index 00000000000..630dfb2861c
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/enable.c
@@ -0,0 +1,1441 @@
+/**
+ * \file enable.c
+ * Enable/disable/query GL capabilities.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0.1
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "context.h"
+#include "enable.h"
+#include "light.h"
+#include "macros.h"
+#include "simple_list.h"
+#include "mtypes.h"
+#include "enums.h"
+#include "math/m_matrix.h"
+#include "math/m_xform.h"
+
+
+
+#define CHECK_EXTENSION(EXTNAME, CAP)					\
+   if (!ctx->Extensions.EXTNAME) {					\
+      _mesa_error(ctx, GL_INVALID_ENUM, "gl%sClientState(0x%x)",	\
+                  state ? "Enable" : "Disable", CAP);			\
+      return;								\
+   }
+
+#define CHECK_EXTENSION2(EXT1, EXT2, CAP)				\
+   if (!ctx->Extensions.EXT1 && !ctx->Extensions.EXT2) {		\
+      _mesa_error(ctx, GL_INVALID_ENUM, "gl%sClientState(0x%x)",	\
+                  state ? "Enable" : "Disable", CAP);			\
+      return;								\
+   }
+
+
+static void
+client_state( GLcontext *ctx, GLenum cap, GLboolean state )
+{
+   GLuint flag;
+   GLuint *var;
+
+   switch (cap) {
+      case GL_VERTEX_ARRAY:
+         var = &ctx->Array.Vertex.Enabled;
+         flag = _NEW_ARRAY_VERTEX;
+         break;
+      case GL_NORMAL_ARRAY:
+         var = &ctx->Array.Normal.Enabled;
+         flag = _NEW_ARRAY_NORMAL;
+         break;
+      case GL_COLOR_ARRAY:
+         var = &ctx->Array.Color.Enabled;
+         flag = _NEW_ARRAY_COLOR0;
+         break;
+      case GL_INDEX_ARRAY:
+         var = &ctx->Array.Index.Enabled;
+         flag = _NEW_ARRAY_INDEX;
+         break;
+      case GL_TEXTURE_COORD_ARRAY:
+         var = &ctx->Array.TexCoord[ctx->Array.ActiveTexture].Enabled;
+         flag = _NEW_ARRAY_TEXCOORD(ctx->Array.ActiveTexture);
+         break;
+      case GL_EDGE_FLAG_ARRAY:
+         var = &ctx->Array.EdgeFlag.Enabled;
+         flag = _NEW_ARRAY_EDGEFLAG;
+         break;
+      case GL_FOG_COORDINATE_ARRAY_EXT:
+         var = &ctx->Array.FogCoord.Enabled;
+         flag = _NEW_ARRAY_FOGCOORD;
+         break;
+      case GL_SECONDARY_COLOR_ARRAY_EXT:
+         var = &ctx->Array.SecondaryColor.Enabled;
+         flag = _NEW_ARRAY_COLOR1;
+         break;
+
+#if FEATURE_NV_vertex_program
+      case GL_VERTEX_ATTRIB_ARRAY0_NV:
+      case GL_VERTEX_ATTRIB_ARRAY1_NV:
+      case GL_VERTEX_ATTRIB_ARRAY2_NV:
+      case GL_VERTEX_ATTRIB_ARRAY3_NV:
+      case GL_VERTEX_ATTRIB_ARRAY4_NV:
+      case GL_VERTEX_ATTRIB_ARRAY5_NV:
+      case GL_VERTEX_ATTRIB_ARRAY6_NV:
+      case GL_VERTEX_ATTRIB_ARRAY7_NV:
+      case GL_VERTEX_ATTRIB_ARRAY8_NV:
+      case GL_VERTEX_ATTRIB_ARRAY9_NV:
+      case GL_VERTEX_ATTRIB_ARRAY10_NV:
+      case GL_VERTEX_ATTRIB_ARRAY11_NV:
+      case GL_VERTEX_ATTRIB_ARRAY12_NV:
+      case GL_VERTEX_ATTRIB_ARRAY13_NV:
+      case GL_VERTEX_ATTRIB_ARRAY14_NV:
+      case GL_VERTEX_ATTRIB_ARRAY15_NV:
+         CHECK_EXTENSION(NV_vertex_program, cap);
+         {
+            GLint n = (GLint) cap - GL_VERTEX_ATTRIB_ARRAY0_NV;
+            var = &ctx->Array.VertexAttrib[n].Enabled;
+            flag = _NEW_ARRAY_ATTRIB(n);
+         }
+         break;
+#endif /* FEATURE_NV_vertex_program */
+
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM,
+                      "glEnable/DisableClientState(0x%x)", cap);
+         return;
+   }
+
+   if (*var == state)
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_ARRAY);
+   ctx->Array.NewState |= flag;
+   *var = state;
+
+   if (state)
+      ctx->Array._Enabled |= flag;
+   else
+      ctx->Array._Enabled &= ~flag;
+
+   if (ctx->Driver.Enable) {
+      (*ctx->Driver.Enable)( ctx, cap, state );
+   }
+}
+
+
+/**
+ * Enable GL capability.
+ *
+ * \param cap capability.
+ *
+ * \sa glEnable().
+ *
+ * Get's the current context, assures that we're outside glBegin()/glEnd() and
+ * calls client_state().
+ */
+void GLAPIENTRY
+_mesa_EnableClientState( GLenum cap )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+   client_state( ctx, cap, GL_TRUE );
+}
+
+
+/**
+ * Disable GL capability.
+ *
+ * \param cap capability.
+ *
+ * \sa glDisable().
+ *
+ * Get's the current context, assures that we're outside glBegin()/glEnd() and
+ * calls client_state().
+ */
+void GLAPIENTRY
+_mesa_DisableClientState( GLenum cap )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+   client_state( ctx, cap, GL_FALSE );
+}
+
+
+#undef CHECK_EXTENSION
+#define CHECK_EXTENSION(EXTNAME, CAP)					\
+   if (!ctx->Extensions.EXTNAME) {					\
+      _mesa_error(ctx, GL_INVALID_ENUM, "gl%s(0x%x)",			\
+                  state ? "Enable" : "Disable", CAP);			\
+      return;								\
+   }
+
+
+/**
+ * Perform glEnable() and glDisable() calls.
+ *
+ * \param ctx GL context.
+ * \param cap capability.
+ * \param state whether to enable or disable the specified capability.
+ *
+ * Updates the current context and flushes the vertices as needed. For
+ * capabilities associated with extensions it verifies that those extensions
+ * are effectivly present before updating. Notifies the driver via
+ * dd_function_table::Enable.
+ */
+void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state )
+{
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "%s %s (newstate is %x)\n",
+                  state ? "glEnable" : "glDisable",
+                  _mesa_lookup_enum_by_nr(cap),
+                  ctx->NewState);
+
+   switch (cap) {
+      case GL_ALPHA_TEST:
+         if (ctx->Color.AlphaEnabled == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_COLOR);
+         ctx->Color.AlphaEnabled = state;
+         break;
+      case GL_AUTO_NORMAL:
+         if (ctx->Eval.AutoNormal == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_EVAL);
+         ctx->Eval.AutoNormal = state;
+         break;
+      case GL_BLEND:
+         if (ctx->Color.BlendEnabled == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_COLOR);
+         ctx->Color.BlendEnabled = state;
+         /* This is needed to support 1.1's RGB logic ops AND
+          * 1.0's blending logicops.
+          */
+         ctx->Color._LogicOpEnabled =
+            (ctx->Color.ColorLogicOpEnabled ||
+             (state && ctx->Color.BlendEquation == GL_LOGIC_OP));
+         break;
+#if FEATURE_userclip
+      case GL_CLIP_PLANE0:
+      case GL_CLIP_PLANE1:
+      case GL_CLIP_PLANE2:
+      case GL_CLIP_PLANE3:
+      case GL_CLIP_PLANE4:
+      case GL_CLIP_PLANE5:
+         {
+            const GLuint p = cap - GL_CLIP_PLANE0;
+
+            if ((ctx->Transform.ClipPlanesEnabled & (1 << p)) == ((GLuint) state << p))
+               return;
+
+            FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
+
+            if (state) {
+               ctx->Transform.ClipPlanesEnabled |= (1 << p);
+
+               if (ctx->ProjectionMatrixStack.Top->flags & MAT_DIRTY)
+                  _math_matrix_analyse( ctx->ProjectionMatrixStack.Top );
+
+               /* This derived state also calculated in clip.c and
+                * from _mesa_update_state() on changes to EyeUserPlane
+                * and ctx->ProjectionMatrix respectively.
+                */
+               _mesa_transform_vector( ctx->Transform._ClipUserPlane[p],
+                                    ctx->Transform.EyeUserPlane[p],
+                                    ctx->ProjectionMatrixStack.Top->inv );
+            }
+            else {
+               ctx->Transform.ClipPlanesEnabled &= ~(1 << p);
+            }               
+         }
+         break;
+#endif
+      case GL_COLOR_MATERIAL:
+         if (ctx->Light.ColorMaterialEnabled == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_LIGHT);
+         FLUSH_CURRENT(ctx, 0);
+         ctx->Light.ColorMaterialEnabled = state;
+         if (state) {
+            _mesa_update_color_material( ctx,
+                                  ctx->Current.Attrib[VERT_ATTRIB_COLOR0] );
+         }
+         break;
+      case GL_CULL_FACE:
+         if (ctx->Polygon.CullFlag == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_POLYGON);
+         ctx->Polygon.CullFlag = state;
+         break;
+      case GL_DEPTH_TEST:
+         if (state && ctx->Visual.depthBits==0) {
+            _mesa_warning(ctx,"glEnable(GL_DEPTH_TEST) but no depth buffer");
+            return;
+         }
+         if (ctx->Depth.Test==state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_DEPTH);
+         ctx->Depth.Test = state;
+         break;
+      case GL_DITHER:
+         if (ctx->NoDither) {
+            state = GL_FALSE; /* MESA_NO_DITHER env var */
+         }
+         if (ctx->Color.DitherFlag==state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_COLOR);
+         ctx->Color.DitherFlag = state;
+         break;
+      case GL_FOG:
+         if (ctx->Fog.Enabled==state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_FOG);
+         ctx->Fog.Enabled = state;
+         break;
+      case GL_HISTOGRAM:
+         CHECK_EXTENSION(EXT_histogram, cap);
+         if (ctx->Pixel.HistogramEnabled == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.HistogramEnabled = state;
+         break;
+      case GL_LIGHT0:
+      case GL_LIGHT1:
+      case GL_LIGHT2:
+      case GL_LIGHT3:
+      case GL_LIGHT4:
+      case GL_LIGHT5:
+      case GL_LIGHT6:
+      case GL_LIGHT7:
+         if (ctx->Light.Light[cap-GL_LIGHT0].Enabled == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_LIGHT);
+         ctx->Light.Light[cap-GL_LIGHT0].Enabled = state;
+         if (state) {
+            insert_at_tail(&ctx->Light.EnabledList,
+                           &ctx->Light.Light[cap-GL_LIGHT0]);
+         }
+         else {
+            remove_from_list(&ctx->Light.Light[cap-GL_LIGHT0]);
+         }
+         break;
+      case GL_LIGHTING:
+         if (ctx->Light.Enabled == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_LIGHT);
+         ctx->Light.Enabled = state;
+
+         if (ctx->Light.Enabled && ctx->Light.Model.TwoSide)
+   	   ctx->_TriangleCaps |= DD_TRI_LIGHT_TWOSIDE;
+         else
+ 	   ctx->_TriangleCaps &= ~DD_TRI_LIGHT_TWOSIDE;
+ 
+         if ((ctx->Light.Enabled &&
+              ctx->Light.Model.ColorControl==GL_SEPARATE_SPECULAR_COLOR)
+             || ctx->Fog.ColorSumEnabled)
+            ctx->_TriangleCaps |= DD_SEPARATE_SPECULAR;
+         else
+            ctx->_TriangleCaps &= ~DD_SEPARATE_SPECULAR;
+
+         break;
+      case GL_LINE_SMOOTH:
+         if (ctx->Line.SmoothFlag == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_LINE);
+         ctx->Line.SmoothFlag = state;
+         ctx->_TriangleCaps ^= DD_LINE_SMOOTH;
+         break;
+      case GL_LINE_STIPPLE:
+         if (ctx->Line.StippleFlag == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_LINE);
+         ctx->Line.StippleFlag = state;
+         ctx->_TriangleCaps ^= DD_LINE_STIPPLE;
+         break;
+      case GL_INDEX_LOGIC_OP:
+         if (ctx->Color.IndexLogicOpEnabled == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_COLOR);
+         ctx->Color.IndexLogicOpEnabled = state;
+         break;
+      case GL_COLOR_LOGIC_OP:
+         if (ctx->Color.ColorLogicOpEnabled == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_COLOR);
+         ctx->Color.ColorLogicOpEnabled = state;
+         /* This is needed to support 1.1's RGB logic ops AND
+          * 1.0's blending logicops.
+          */
+         ctx->Color._LogicOpEnabled =
+            (state || (ctx->Color.BlendEnabled &&
+                       ctx->Color.BlendEquation == GL_LOGIC_OP));
+         break;
+      case GL_MAP1_COLOR_4:
+         if (ctx->Eval.Map1Color4 == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_EVAL);
+         ctx->Eval.Map1Color4 = state;
+         break;
+      case GL_MAP1_INDEX:
+         if (ctx->Eval.Map1Index == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_EVAL);
+         ctx->Eval.Map1Index = state;
+         break;
+      case GL_MAP1_NORMAL:
+         if (ctx->Eval.Map1Normal == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_EVAL);
+         ctx->Eval.Map1Normal = state;
+         break;
+      case GL_MAP1_TEXTURE_COORD_1:
+         if (ctx->Eval.Map1TextureCoord1 == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_EVAL);
+         ctx->Eval.Map1TextureCoord1 = state;
+         break;
+      case GL_MAP1_TEXTURE_COORD_2:
+         if (ctx->Eval.Map1TextureCoord2 == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_EVAL);
+         ctx->Eval.Map1TextureCoord2 = state;
+         break;
+      case GL_MAP1_TEXTURE_COORD_3:
+         if (ctx->Eval.Map1TextureCoord3 == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_EVAL);
+         ctx->Eval.Map1TextureCoord3 = state;
+         break;
+      case GL_MAP1_TEXTURE_COORD_4:
+         if (ctx->Eval.Map1TextureCoord4 == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_EVAL);
+         ctx->Eval.Map1TextureCoord4 = state;
+         break;
+      case GL_MAP1_VERTEX_3:
+         if (ctx->Eval.Map1Vertex3 == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_EVAL);
+         ctx->Eval.Map1Vertex3 = state;
+         break;
+      case GL_MAP1_VERTEX_4:
+         if (ctx->Eval.Map1Vertex4 == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_EVAL);
+         ctx->Eval.Map1Vertex4 = state;
+         break;
+      case GL_MAP2_COLOR_4:
+         if (ctx->Eval.Map2Color4 == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_EVAL);
+         ctx->Eval.Map2Color4 = state;
+         break;
+      case GL_MAP2_INDEX:
+         if (ctx->Eval.Map2Index == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_EVAL);
+         ctx->Eval.Map2Index = state;
+         break;
+      case GL_MAP2_NORMAL:
+         if (ctx->Eval.Map2Normal == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_EVAL);
+         ctx->Eval.Map2Normal = state;
+         break;
+      case GL_MAP2_TEXTURE_COORD_1:
+         if (ctx->Eval.Map2TextureCoord1 == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_EVAL);
+         ctx->Eval.Map2TextureCoord1 = state;
+         break;
+      case GL_MAP2_TEXTURE_COORD_2:
+         if (ctx->Eval.Map2TextureCoord2 == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_EVAL);
+         ctx->Eval.Map2TextureCoord2 = state;
+         break;
+      case GL_MAP2_TEXTURE_COORD_3:
+         if (ctx->Eval.Map2TextureCoord3 == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_EVAL);
+         ctx->Eval.Map2TextureCoord3 = state;
+         break;
+      case GL_MAP2_TEXTURE_COORD_4:
+         if (ctx->Eval.Map2TextureCoord4 == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_EVAL);
+         ctx->Eval.Map2TextureCoord4 = state;
+         break;
+      case GL_MAP2_VERTEX_3:
+         if (ctx->Eval.Map2Vertex3 == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_EVAL);
+         ctx->Eval.Map2Vertex3 = state;
+         break;
+      case GL_MAP2_VERTEX_4:
+         if (ctx->Eval.Map2Vertex4 == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_EVAL);
+         ctx->Eval.Map2Vertex4 = state;
+         break;
+      case GL_MINMAX:
+         if (ctx->Pixel.MinMaxEnabled == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.MinMaxEnabled = state;
+         break;
+      case GL_NORMALIZE:
+         if (ctx->Transform.Normalize == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
+         ctx->Transform.Normalize = state;
+         break;
+      case GL_POINT_SMOOTH:
+         if (ctx->Point.SmoothFlag==state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_POINT);
+         ctx->Point.SmoothFlag = state;
+         ctx->_TriangleCaps ^= DD_POINT_SMOOTH;
+         break;
+      case GL_POLYGON_SMOOTH:
+         if (ctx->Polygon.SmoothFlag==state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_POLYGON);
+         ctx->Polygon.SmoothFlag = state;
+         ctx->_TriangleCaps ^= DD_TRI_SMOOTH;
+         break;
+      case GL_POLYGON_STIPPLE:
+         if (ctx->Polygon.StippleFlag==state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_POLYGON);
+         ctx->Polygon.StippleFlag = state;
+         ctx->_TriangleCaps ^= DD_TRI_STIPPLE;
+         break;
+      case GL_POLYGON_OFFSET_POINT:
+         if (ctx->Polygon.OffsetPoint==state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_POLYGON);
+         ctx->Polygon.OffsetPoint = state;
+         break;
+      case GL_POLYGON_OFFSET_LINE:
+         if (ctx->Polygon.OffsetLine==state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_POLYGON);
+         ctx->Polygon.OffsetLine = state;
+         break;
+      case GL_POLYGON_OFFSET_FILL:
+         /*case GL_POLYGON_OFFSET_EXT:*/
+         if (ctx->Polygon.OffsetFill==state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_POLYGON);
+         ctx->Polygon.OffsetFill = state;
+         break;
+      case GL_RESCALE_NORMAL_EXT:
+         if (ctx->Transform.RescaleNormals == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
+         ctx->Transform.RescaleNormals = state;
+         break;
+      case GL_SCISSOR_TEST:
+         if (ctx->Scissor.Enabled==state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_SCISSOR);
+         ctx->Scissor.Enabled = state;
+         break;
+      case GL_SHARED_TEXTURE_PALETTE_EXT:
+         if (ctx->Texture.SharedPalette == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         ctx->Texture.SharedPalette = state;
+         break;
+      case GL_STENCIL_TEST:
+         if (state && ctx->Visual.stencilBits==0) {
+            _mesa_warning(ctx,
+                          "glEnable(GL_STENCIL_TEST) but no stencil buffer");
+            return;
+         }
+         if (ctx->Stencil.Enabled==state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_STENCIL);
+         ctx->Stencil.Enabled = state;
+         break;
+      case GL_TEXTURE_1D: {
+         const GLuint curr = ctx->Texture.CurrentUnit;
+         struct gl_texture_unit *texUnit = &ctx->Texture.Unit[curr];
+         GLuint newenabled = texUnit->Enabled & ~TEXTURE_1D_BIT;
+         if (state)
+            newenabled |= TEXTURE_1D_BIT;
+         if (!ctx->Visual.rgbMode || texUnit->Enabled == newenabled)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         texUnit->Enabled = newenabled;
+         break;
+      }
+      case GL_TEXTURE_2D: {
+         const GLuint curr = ctx->Texture.CurrentUnit;
+         struct gl_texture_unit *texUnit = &ctx->Texture.Unit[curr];
+         GLuint newenabled = texUnit->Enabled & ~TEXTURE_2D_BIT;
+         if (state)
+            newenabled |= TEXTURE_2D_BIT;
+         if (!ctx->Visual.rgbMode || texUnit->Enabled == newenabled)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         texUnit->Enabled = newenabled;
+         break;
+      }
+      case GL_TEXTURE_3D: {
+         const GLuint curr = ctx->Texture.CurrentUnit;
+         struct gl_texture_unit *texUnit = &ctx->Texture.Unit[curr];
+         GLuint newenabled = texUnit->Enabled & ~TEXTURE_3D_BIT;
+         if (state)
+            newenabled |= TEXTURE_3D_BIT;
+         if (!ctx->Visual.rgbMode || texUnit->Enabled == newenabled)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         texUnit->Enabled = newenabled;
+         break;
+      }
+      case GL_TEXTURE_GEN_Q: {
+         GLuint unit = ctx->Texture.CurrentUnit;
+         struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
+         GLuint newenabled = texUnit->TexGenEnabled & ~Q_BIT;
+         if (state)
+            newenabled |= Q_BIT;
+         if (texUnit->TexGenEnabled == newenabled)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         texUnit->TexGenEnabled = newenabled;
+         break;
+      }
+      case GL_TEXTURE_GEN_R: {
+         GLuint unit = ctx->Texture.CurrentUnit;
+         struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
+         GLuint newenabled = texUnit->TexGenEnabled & ~R_BIT;
+         if (state)
+            newenabled |= R_BIT;
+         if (texUnit->TexGenEnabled == newenabled)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         texUnit->TexGenEnabled = newenabled;
+         break;
+      }
+      break;
+      case GL_TEXTURE_GEN_S: {
+         GLuint unit = ctx->Texture.CurrentUnit;
+         struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
+         GLuint newenabled = texUnit->TexGenEnabled & ~S_BIT;
+         if (state)
+            newenabled |= S_BIT;
+         if (texUnit->TexGenEnabled == newenabled)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         texUnit->TexGenEnabled = newenabled;
+         break;
+      }
+      break;
+      case GL_TEXTURE_GEN_T: {
+         GLuint unit = ctx->Texture.CurrentUnit;
+         struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
+         GLuint newenabled = texUnit->TexGenEnabled & ~T_BIT;
+         if (state)
+            newenabled |= T_BIT;
+         if (texUnit->TexGenEnabled == newenabled)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         texUnit->TexGenEnabled = newenabled;
+         break;
+      }
+      break;
+
+      /*
+       * CLIENT STATE!!!
+       */
+      case GL_VERTEX_ARRAY:
+      case GL_NORMAL_ARRAY:
+      case GL_COLOR_ARRAY:
+      case GL_INDEX_ARRAY:
+      case GL_TEXTURE_COORD_ARRAY:
+      case GL_EDGE_FLAG_ARRAY:
+      case GL_FOG_COORDINATE_ARRAY_EXT:
+      case GL_SECONDARY_COLOR_ARRAY_EXT:
+         client_state( ctx, cap, state );
+         return;
+
+      /* GL_HP_occlusion_test */
+      case GL_OCCLUSION_TEST_HP:
+         CHECK_EXTENSION(HP_occlusion_test, cap);
+         if (ctx->Depth.OcclusionTest == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_DEPTH);
+         ctx->Depth.OcclusionTest = state;
+         if (state)
+            ctx->OcclusionResult = ctx->OcclusionResultSaved;
+         else
+            ctx->OcclusionResultSaved = ctx->OcclusionResult;
+         break;
+
+      /* GL_SGIS_pixel_texture */
+      case GL_PIXEL_TEXTURE_SGIS:
+         CHECK_EXTENSION(SGIS_pixel_texture, cap);
+         if (ctx->Pixel.PixelTextureEnabled == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.PixelTextureEnabled = state;
+         break;
+
+      /* GL_SGIX_pixel_texture */
+      case GL_PIXEL_TEX_GEN_SGIX:
+         CHECK_EXTENSION(SGIX_pixel_texture, cap);
+         if (ctx->Pixel.PixelTextureEnabled == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.PixelTextureEnabled = state;
+         break;
+
+      /* GL_SGI_color_table */
+      case GL_COLOR_TABLE_SGI:
+         CHECK_EXTENSION(SGI_color_table, cap);
+         if (ctx->Pixel.ColorTableEnabled == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.ColorTableEnabled = state;
+         break;
+      case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
+         CHECK_EXTENSION(SGI_color_table, cap);
+         if (ctx->Pixel.PostConvolutionColorTableEnabled == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.PostConvolutionColorTableEnabled = state;
+         break;
+      case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
+         CHECK_EXTENSION(SGI_color_table, cap);
+         if (ctx->Pixel.PostColorMatrixColorTableEnabled == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.PostColorMatrixColorTableEnabled = state;
+         break;
+      case GL_TEXTURE_COLOR_TABLE_SGI:
+         CHECK_EXTENSION(SGI_texture_color_table, cap);
+         if (ctx->Texture.Unit[ctx->Texture.CurrentUnit].ColorTableEnabled == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         ctx->Texture.Unit[ctx->Texture.CurrentUnit].ColorTableEnabled = state;
+         break;
+
+      /* GL_EXT_convolution */
+      case GL_CONVOLUTION_1D:
+         CHECK_EXTENSION(EXT_convolution, cap);
+         if (ctx->Pixel.Convolution1DEnabled == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.Convolution1DEnabled = state;
+         break;
+      case GL_CONVOLUTION_2D:
+         CHECK_EXTENSION(EXT_convolution, cap);
+         if (ctx->Pixel.Convolution2DEnabled == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.Convolution2DEnabled = state;
+         break;
+      case GL_SEPARABLE_2D:
+         CHECK_EXTENSION(EXT_convolution, cap);
+         if (ctx->Pixel.Separable2DEnabled == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.Separable2DEnabled = state;
+         break;
+
+      /* GL_ARB_texture_cube_map */
+      case GL_TEXTURE_CUBE_MAP_ARB:
+         {
+            const GLuint curr = ctx->Texture.CurrentUnit;
+            struct gl_texture_unit *texUnit = &ctx->Texture.Unit[curr];
+            GLuint newenabled = texUnit->Enabled & ~TEXTURE_CUBE_BIT;
+            CHECK_EXTENSION(ARB_texture_cube_map, cap);
+            if (state)
+               newenabled |= TEXTURE_CUBE_BIT;
+            if (!ctx->Visual.rgbMode || texUnit->Enabled == newenabled)
+               return;
+            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            texUnit->Enabled = newenabled;
+         }
+         break;
+
+      /* GL_EXT_secondary_color */
+      case GL_COLOR_SUM_EXT:
+         CHECK_EXTENSION(EXT_secondary_color, cap);
+         if (ctx->Fog.ColorSumEnabled == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_FOG);
+         ctx->Fog.ColorSumEnabled = state;
+
+         if ((ctx->Light.Enabled &&
+              ctx->Light.Model.ColorControl==GL_SEPARATE_SPECULAR_COLOR)
+             || ctx->Fog.ColorSumEnabled)
+            ctx->_TriangleCaps |= DD_SEPARATE_SPECULAR;
+         else
+            ctx->_TriangleCaps &= ~DD_SEPARATE_SPECULAR;
+
+         break;
+
+      /* GL_ARB_multisample */
+      case GL_MULTISAMPLE_ARB:
+         CHECK_EXTENSION(ARB_multisample, cap);
+         if (ctx->Multisample.Enabled == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_MULTISAMPLE);
+         ctx->Multisample.Enabled = state;
+         break;
+      case GL_SAMPLE_ALPHA_TO_COVERAGE_ARB:
+         CHECK_EXTENSION(ARB_multisample, cap);
+         if (ctx->Multisample.SampleAlphaToCoverage == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_MULTISAMPLE);
+         ctx->Multisample.SampleAlphaToCoverage = state;
+         break;
+      case GL_SAMPLE_ALPHA_TO_ONE_ARB:
+         CHECK_EXTENSION(ARB_multisample, cap);
+         if (ctx->Multisample.SampleAlphaToOne == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_MULTISAMPLE);
+         ctx->Multisample.SampleAlphaToOne = state;
+         break;
+      case GL_SAMPLE_COVERAGE_ARB:
+         CHECK_EXTENSION(ARB_multisample, cap);
+         if (ctx->Multisample.SampleCoverage == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_MULTISAMPLE);
+         ctx->Multisample.SampleCoverage = state;
+         break;
+      case GL_SAMPLE_COVERAGE_INVERT_ARB:
+         CHECK_EXTENSION(ARB_multisample, cap);
+         if (ctx->Multisample.SampleCoverageInvert == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_MULTISAMPLE);
+         ctx->Multisample.SampleCoverageInvert = state;
+         break;
+
+      /* GL_IBM_rasterpos_clip */
+      case GL_RASTER_POSITION_UNCLIPPED_IBM:
+         CHECK_EXTENSION(IBM_rasterpos_clip, cap);
+         if (ctx->Transform.RasterPositionUnclipped == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
+         ctx->Transform.RasterPositionUnclipped = state;
+         break;
+
+      /* GL_NV_point_sprite */
+      case GL_POINT_SPRITE_NV:
+         CHECK_EXTENSION2(NV_point_sprite, ARB_point_sprite, cap);
+         if (ctx->Point.PointSprite == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_POINT);
+         ctx->Point.PointSprite = state;
+         break;
+
+#if FEATURE_NV_vertex_program
+      case GL_VERTEX_PROGRAM_NV:
+         CHECK_EXTENSION(NV_vertex_program, cap);
+         if (ctx->VertexProgram.Enabled == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_PROGRAM);
+         ctx->VertexProgram.Enabled = state;
+         break;
+      case GL_VERTEX_PROGRAM_POINT_SIZE_NV:
+         CHECK_EXTENSION(NV_vertex_program, cap);
+         if (ctx->VertexProgram.PointSizeEnabled == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_PROGRAM);
+         ctx->VertexProgram.PointSizeEnabled = state;
+         break;
+      case GL_VERTEX_PROGRAM_TWO_SIDE_NV:
+         CHECK_EXTENSION(NV_vertex_program, cap);
+         if (ctx->VertexProgram.TwoSideEnabled == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_PROGRAM);
+         ctx->VertexProgram.TwoSideEnabled = state;
+         break;
+      case GL_MAP1_VERTEX_ATTRIB0_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB1_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB2_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB3_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB4_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB5_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB6_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB7_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB8_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB9_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB10_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB11_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB12_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB13_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB14_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB15_4_NV:
+         CHECK_EXTENSION(NV_vertex_program, cap);
+         {
+            const GLuint map = (GLuint) (cap - GL_MAP1_VERTEX_ATTRIB0_4_NV);
+            FLUSH_VERTICES(ctx, _NEW_EVAL);
+            ctx->Eval.Map1Attrib[map] = state;
+         }
+         break;
+      case GL_MAP2_VERTEX_ATTRIB0_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB1_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB2_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB3_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB4_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB5_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB6_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB7_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB8_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB9_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB10_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB11_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB12_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB13_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB14_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB15_4_NV:
+         CHECK_EXTENSION(NV_vertex_program, cap);
+         {
+            const GLuint map = (GLuint) (cap - GL_MAP2_VERTEX_ATTRIB0_4_NV);
+            FLUSH_VERTICES(ctx, _NEW_EVAL);
+            ctx->Eval.Map2Attrib[map] = state;
+         }
+         break;
+#endif /* FEATURE_NV_vertex_program */
+
+#if FEATURE_NV_fragment_program
+      case GL_FRAGMENT_PROGRAM_NV:
+         CHECK_EXTENSION(NV_fragment_program, cap);
+         if (ctx->FragmentProgram.Enabled == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_PROGRAM);
+         ctx->FragmentProgram.Enabled = state;
+         break;
+#endif /* FEATURE_NV_fragment_program */
+
+      /* GL_NV_texture_rectangle */
+      case GL_TEXTURE_RECTANGLE_NV:
+         CHECK_EXTENSION(NV_texture_rectangle, cap);
+         {
+            const GLuint curr = ctx->Texture.CurrentUnit;
+            struct gl_texture_unit *texUnit = &ctx->Texture.Unit[curr];
+            GLuint newenabled = texUnit->Enabled & ~TEXTURE_RECT_BIT;
+            CHECK_EXTENSION(NV_texture_rectangle, cap);
+            if (state)
+               newenabled |= TEXTURE_RECT_BIT;
+            if (!ctx->Visual.rgbMode || texUnit->Enabled == newenabled)
+               return;
+            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            texUnit->Enabled = newenabled;
+         }
+         break;
+
+      /* GL_EXT_stencil_two_side */
+      case GL_STENCIL_TEST_TWO_SIDE_EXT:
+         CHECK_EXTENSION(EXT_stencil_two_side, cap);
+         if (ctx->Stencil.TestTwoSide == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_STENCIL);
+         ctx->Stencil.TestTwoSide = state;
+         break;
+
+#if FEATURE_ARB_fragment_program
+      case GL_FRAGMENT_PROGRAM_ARB:
+         CHECK_EXTENSION(ARB_fragment_program, cap);
+         if (ctx->FragmentProgram.Enabled == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_PROGRAM);
+         ctx->FragmentProgram.Enabled = state;
+         break;
+#endif /* FEATURE_ARB_fragment_program */
+
+      /* GL_EXT_depth_bounds_test */
+      case GL_DEPTH_BOUNDS_TEST_EXT:
+         CHECK_EXTENSION(EXT_depth_bounds_test, cap);
+         if (state && ctx->Visual.depthBits==0) {
+            _mesa_warning(ctx,
+                   "glEnable(GL_DEPTH_BOUNDS_TEST_EXT) but no depth buffer");
+            return;
+         }
+         if (ctx->Depth.BoundsTest == state)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_DEPTH);
+         ctx->Depth.BoundsTest = state;
+         break;
+
+      /* GL_MESA_program_debug */
+      case GL_FRAGMENT_PROGRAM_CALLBACK_MESA:
+         CHECK_EXTENSION(MESA_program_debug, cap);
+         ctx->FragmentProgram.CallbackEnabled = state;
+         break;
+      case GL_VERTEX_PROGRAM_CALLBACK_MESA:
+         CHECK_EXTENSION(MESA_program_debug, cap);
+         ctx->VertexProgram.CallbackEnabled = state;
+         break;
+
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM,
+                     "%s(0x%x)", state ? "glEnable" : "glDisable", cap);
+         return;
+   }
+
+   if (ctx->Driver.Enable) {
+      (*ctx->Driver.Enable)( ctx, cap, state );
+   }
+}
+
+
+/**
+ * Enable GL capability.
+ *
+ * \param cap capability.
+ *
+ * \sa glEnable().
+ *
+ * Get's the current context, assures that we're outside glBegin()/glEnd() and
+ * calls _mesa_set_enable().
+ */
+void GLAPIENTRY
+_mesa_Enable( GLenum cap )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   _mesa_set_enable( ctx, cap, GL_TRUE );
+}
+
+
+/**
+ * Disable GL capability.
+ *
+ * \param cap capability.
+ *
+ * \sa glDisable().
+ *
+ * Get's the current context, assures that we're outside glBegin()/glEnd() and
+ * calls _mesa_set_enable().
+ */
+void GLAPIENTRY
+_mesa_Disable( GLenum cap )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   _mesa_set_enable( ctx, cap, GL_FALSE );
+}
+
+
+#undef CHECK_EXTENSION
+#define CHECK_EXTENSION(EXTNAME)			\
+   if (!ctx->Extensions.EXTNAME) {			\
+      _mesa_error(ctx, GL_INVALID_ENUM, "glIsEnabled");	\
+      return GL_FALSE;					\
+   }
+
+
+/**
+ * Test whether a capability is enabled.
+ *
+ * \param cap capability.
+ *
+ * Returns the state of the specified capability from the current GL context.
+ * For the capabilities associated with extensions verifies that those
+ * extensions are effectively present before reporting.
+ */
+GLboolean GLAPIENTRY
+_mesa_IsEnabled( GLenum cap )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   switch (cap) {
+      case GL_ALPHA_TEST:
+         return ctx->Color.AlphaEnabled;
+      case GL_AUTO_NORMAL:
+	 return ctx->Eval.AutoNormal;
+      case GL_BLEND:
+         return ctx->Color.BlendEnabled;
+      case GL_CLIP_PLANE0:
+      case GL_CLIP_PLANE1:
+      case GL_CLIP_PLANE2:
+      case GL_CLIP_PLANE3:
+      case GL_CLIP_PLANE4:
+      case GL_CLIP_PLANE5:
+	 return (ctx->Transform.ClipPlanesEnabled >> (cap - GL_CLIP_PLANE0)) & 1;
+      case GL_COLOR_MATERIAL:
+	 return ctx->Light.ColorMaterialEnabled;
+      case GL_CULL_FACE:
+         return ctx->Polygon.CullFlag;
+      case GL_DEPTH_TEST:
+         return ctx->Depth.Test;
+      case GL_DITHER:
+	 return ctx->Color.DitherFlag;
+      case GL_FOG:
+	 return ctx->Fog.Enabled;
+      case GL_LIGHTING:
+         return ctx->Light.Enabled;
+      case GL_LIGHT0:
+      case GL_LIGHT1:
+      case GL_LIGHT2:
+      case GL_LIGHT3:
+      case GL_LIGHT4:
+      case GL_LIGHT5:
+      case GL_LIGHT6:
+      case GL_LIGHT7:
+         return ctx->Light.Light[cap-GL_LIGHT0].Enabled;
+      case GL_LINE_SMOOTH:
+	 return ctx->Line.SmoothFlag;
+      case GL_LINE_STIPPLE:
+	 return ctx->Line.StippleFlag;
+      case GL_INDEX_LOGIC_OP:
+	 return ctx->Color.IndexLogicOpEnabled;
+      case GL_COLOR_LOGIC_OP:
+	 return ctx->Color.ColorLogicOpEnabled;
+      case GL_MAP1_COLOR_4:
+	 return ctx->Eval.Map1Color4;
+      case GL_MAP1_INDEX:
+	 return ctx->Eval.Map1Index;
+      case GL_MAP1_NORMAL:
+	 return ctx->Eval.Map1Normal;
+      case GL_MAP1_TEXTURE_COORD_1:
+	 return ctx->Eval.Map1TextureCoord1;
+      case GL_MAP1_TEXTURE_COORD_2:
+	 return ctx->Eval.Map1TextureCoord2;
+      case GL_MAP1_TEXTURE_COORD_3:
+	 return ctx->Eval.Map1TextureCoord3;
+      case GL_MAP1_TEXTURE_COORD_4:
+	 return ctx->Eval.Map1TextureCoord4;
+      case GL_MAP1_VERTEX_3:
+	 return ctx->Eval.Map1Vertex3;
+      case GL_MAP1_VERTEX_4:
+	 return ctx->Eval.Map1Vertex4;
+      case GL_MAP2_COLOR_4:
+	 return ctx->Eval.Map2Color4;
+      case GL_MAP2_INDEX:
+	 return ctx->Eval.Map2Index;
+      case GL_MAP2_NORMAL:
+	 return ctx->Eval.Map2Normal;
+      case GL_MAP2_TEXTURE_COORD_1:
+	 return ctx->Eval.Map2TextureCoord1;
+      case GL_MAP2_TEXTURE_COORD_2:
+	 return ctx->Eval.Map2TextureCoord2;
+      case GL_MAP2_TEXTURE_COORD_3:
+	 return ctx->Eval.Map2TextureCoord3;
+      case GL_MAP2_TEXTURE_COORD_4:
+	 return ctx->Eval.Map2TextureCoord4;
+      case GL_MAP2_VERTEX_3:
+	 return ctx->Eval.Map2Vertex3;
+      case GL_MAP2_VERTEX_4:
+	 return ctx->Eval.Map2Vertex4;
+      case GL_NORMALIZE:
+	 return ctx->Transform.Normalize;
+      case GL_POINT_SMOOTH:
+	 return ctx->Point.SmoothFlag;
+      case GL_POLYGON_SMOOTH:
+	 return ctx->Polygon.SmoothFlag;
+      case GL_POLYGON_STIPPLE:
+	 return ctx->Polygon.StippleFlag;
+      case GL_POLYGON_OFFSET_POINT:
+	 return ctx->Polygon.OffsetPoint;
+      case GL_POLYGON_OFFSET_LINE:
+	 return ctx->Polygon.OffsetLine;
+      case GL_POLYGON_OFFSET_FILL:
+      /*case GL_POLYGON_OFFSET_EXT:*/
+	 return ctx->Polygon.OffsetFill;
+      case GL_RESCALE_NORMAL_EXT:
+         return ctx->Transform.RescaleNormals;
+      case GL_SCISSOR_TEST:
+	 return ctx->Scissor.Enabled;
+      case GL_SHARED_TEXTURE_PALETTE_EXT:
+         return ctx->Texture.SharedPalette;
+      case GL_STENCIL_TEST:
+	 return ctx->Stencil.Enabled;
+      case GL_TEXTURE_1D:
+         {
+            const struct gl_texture_unit *texUnit;
+            texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+            return (texUnit->Enabled & TEXTURE_1D_BIT) ? GL_TRUE : GL_FALSE;
+         }
+      case GL_TEXTURE_2D:
+         {
+            const struct gl_texture_unit *texUnit;
+            texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+            return (texUnit->Enabled & TEXTURE_2D_BIT) ? GL_TRUE : GL_FALSE;
+         }
+      case GL_TEXTURE_3D:
+         {
+            const struct gl_texture_unit *texUnit;
+            texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+            return (texUnit->Enabled & TEXTURE_3D_BIT) ? GL_TRUE : GL_FALSE;
+         }
+      case GL_TEXTURE_GEN_Q:
+         {
+            const struct gl_texture_unit *texUnit;
+            texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+            return (texUnit->TexGenEnabled & Q_BIT) ? GL_TRUE : GL_FALSE;
+         }
+      case GL_TEXTURE_GEN_R:
+         {
+            const struct gl_texture_unit *texUnit;
+            texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+            return (texUnit->TexGenEnabled & R_BIT) ? GL_TRUE : GL_FALSE;
+         }
+      case GL_TEXTURE_GEN_S:
+         {
+            const struct gl_texture_unit *texUnit;
+            texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+            return (texUnit->TexGenEnabled & S_BIT) ? GL_TRUE : GL_FALSE;
+         }
+      case GL_TEXTURE_GEN_T:
+         {
+            const struct gl_texture_unit *texUnit;
+            texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+            return (texUnit->TexGenEnabled & T_BIT) ? GL_TRUE : GL_FALSE;
+         }
+
+      /*
+       * CLIENT STATE!!!
+       */
+      case GL_VERTEX_ARRAY:
+         return (ctx->Array.Vertex.Enabled != 0);
+      case GL_NORMAL_ARRAY:
+         return (ctx->Array.Normal.Enabled != 0);
+      case GL_COLOR_ARRAY:
+         return (ctx->Array.Color.Enabled != 0);
+      case GL_INDEX_ARRAY:
+         return (ctx->Array.Index.Enabled != 0);
+      case GL_TEXTURE_COORD_ARRAY:
+         return (ctx->Array.TexCoord[ctx->Array.ActiveTexture].Enabled != 0);
+      case GL_EDGE_FLAG_ARRAY:
+         return (ctx->Array.EdgeFlag.Enabled != 0);
+      case GL_FOG_COORDINATE_ARRAY_EXT:
+         CHECK_EXTENSION(EXT_fog_coord);
+         return (ctx->Array.FogCoord.Enabled != 0);
+      case GL_SECONDARY_COLOR_ARRAY_EXT:
+         CHECK_EXTENSION(EXT_secondary_color);
+         return (ctx->Array.SecondaryColor.Enabled != 0);
+
+      /* GL_EXT_histogram */
+      case GL_HISTOGRAM:
+         CHECK_EXTENSION(EXT_histogram);
+         return ctx->Pixel.HistogramEnabled;
+      case GL_MINMAX:
+         CHECK_EXTENSION(EXT_histogram);
+         return ctx->Pixel.MinMaxEnabled;
+
+      /* GL_HP_occlusion_test */
+      case GL_OCCLUSION_TEST_HP:
+         CHECK_EXTENSION(HP_occlusion_test);
+         return ctx->Depth.OcclusionTest;
+
+      /* GL_SGIS_pixel_texture */
+      case GL_PIXEL_TEXTURE_SGIS:
+         CHECK_EXTENSION(SGIS_pixel_texture);
+         return ctx->Pixel.PixelTextureEnabled;
+
+      /* GL_SGIX_pixel_texture */
+      case GL_PIXEL_TEX_GEN_SGIX:
+         CHECK_EXTENSION(SGIX_pixel_texture);
+         return ctx->Pixel.PixelTextureEnabled;
+
+      /* GL_SGI_color_table */
+      case GL_COLOR_TABLE_SGI:
+         CHECK_EXTENSION(SGI_color_table);
+         return ctx->Pixel.ColorTableEnabled;
+      case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
+         CHECK_EXTENSION(SGI_color_table);
+         return ctx->Pixel.PostConvolutionColorTableEnabled;
+      case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
+         CHECK_EXTENSION(SGI_color_table);
+         return ctx->Pixel.PostColorMatrixColorTableEnabled;
+
+      /* GL_SGI_texture_color_table */
+      case GL_TEXTURE_COLOR_TABLE_SGI:
+         CHECK_EXTENSION(SGI_texture_color_table);
+         return ctx->Texture.Unit[ctx->Texture.CurrentUnit].ColorTableEnabled;
+
+      /* GL_EXT_convolution */
+      case GL_CONVOLUTION_1D:
+         CHECK_EXTENSION(EXT_convolution);
+         return ctx->Pixel.Convolution1DEnabled;
+      case GL_CONVOLUTION_2D:
+         CHECK_EXTENSION(EXT_convolution);
+         return ctx->Pixel.Convolution2DEnabled;
+      case GL_SEPARABLE_2D:
+         CHECK_EXTENSION(EXT_convolution);
+         return ctx->Pixel.Separable2DEnabled;
+
+      /* GL_ARB_texture_cube_map */
+      case GL_TEXTURE_CUBE_MAP_ARB:
+         CHECK_EXTENSION(ARB_texture_cube_map);
+         {
+            const struct gl_texture_unit *texUnit;
+            texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+            return (texUnit->Enabled & TEXTURE_CUBE_BIT) ? GL_TRUE : GL_FALSE;
+         }
+
+      /* GL_ARB_multisample */
+      case GL_MULTISAMPLE_ARB:
+         CHECK_EXTENSION(ARB_multisample);
+         return ctx->Multisample.Enabled;
+      case GL_SAMPLE_ALPHA_TO_COVERAGE_ARB:
+         CHECK_EXTENSION(ARB_multisample);
+         return ctx->Multisample.SampleAlphaToCoverage;
+      case GL_SAMPLE_ALPHA_TO_ONE_ARB:
+         CHECK_EXTENSION(ARB_multisample);
+         return ctx->Multisample.SampleAlphaToOne;
+      case GL_SAMPLE_COVERAGE_ARB:
+         CHECK_EXTENSION(ARB_multisample);
+         return ctx->Multisample.SampleCoverage;
+      case GL_SAMPLE_COVERAGE_INVERT_ARB:
+         CHECK_EXTENSION(ARB_multisample);
+         return ctx->Multisample.SampleCoverageInvert;
+
+      /* GL_IBM_rasterpos_clip */
+      case GL_RASTER_POSITION_UNCLIPPED_IBM:
+         CHECK_EXTENSION(IBM_rasterpos_clip);
+         return ctx->Transform.RasterPositionUnclipped;
+
+      /* GL_NV_point_sprite */
+      case GL_POINT_SPRITE_NV:
+         return ctx->Point.PointSprite;
+
+#if FEATURE_NV_vertex_program
+      case GL_VERTEX_PROGRAM_NV:
+         CHECK_EXTENSION(NV_vertex_program);
+         return ctx->VertexProgram.Enabled;
+      case GL_VERTEX_PROGRAM_POINT_SIZE_NV:
+         CHECK_EXTENSION(NV_vertex_program);
+         return ctx->VertexProgram.PointSizeEnabled;
+      case GL_VERTEX_PROGRAM_TWO_SIDE_NV:
+         CHECK_EXTENSION(NV_vertex_program);
+         return ctx->VertexProgram.TwoSideEnabled;
+      case GL_VERTEX_ATTRIB_ARRAY0_NV:
+      case GL_VERTEX_ATTRIB_ARRAY1_NV:
+      case GL_VERTEX_ATTRIB_ARRAY2_NV:
+      case GL_VERTEX_ATTRIB_ARRAY3_NV:
+      case GL_VERTEX_ATTRIB_ARRAY4_NV:
+      case GL_VERTEX_ATTRIB_ARRAY5_NV:
+      case GL_VERTEX_ATTRIB_ARRAY6_NV:
+      case GL_VERTEX_ATTRIB_ARRAY7_NV:
+      case GL_VERTEX_ATTRIB_ARRAY8_NV:
+      case GL_VERTEX_ATTRIB_ARRAY9_NV:
+      case GL_VERTEX_ATTRIB_ARRAY10_NV:
+      case GL_VERTEX_ATTRIB_ARRAY11_NV:
+      case GL_VERTEX_ATTRIB_ARRAY12_NV:
+      case GL_VERTEX_ATTRIB_ARRAY13_NV:
+      case GL_VERTEX_ATTRIB_ARRAY14_NV:
+      case GL_VERTEX_ATTRIB_ARRAY15_NV:
+         CHECK_EXTENSION(NV_vertex_program);
+         {
+            GLint n = (GLint) cap - GL_VERTEX_ATTRIB_ARRAY0_NV;
+            return (ctx->Array.VertexAttrib[n].Enabled != 0);
+         }
+      case GL_MAP1_VERTEX_ATTRIB0_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB1_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB2_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB3_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB4_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB5_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB6_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB7_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB8_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB9_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB10_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB11_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB12_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB13_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB14_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB15_4_NV:
+         CHECK_EXTENSION(NV_vertex_program);
+         {
+            const GLuint map = (GLuint) (cap - GL_MAP1_VERTEX_ATTRIB0_4_NV);
+            return ctx->Eval.Map1Attrib[map];
+         }
+      case GL_MAP2_VERTEX_ATTRIB0_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB1_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB2_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB3_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB4_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB5_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB6_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB7_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB8_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB9_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB10_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB11_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB12_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB13_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB14_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB15_4_NV:
+         CHECK_EXTENSION(NV_vertex_program);
+         {
+            const GLuint map = (GLuint) (cap - GL_MAP2_VERTEX_ATTRIB0_4_NV);
+            return ctx->Eval.Map2Attrib[map];
+         }
+#endif /* FEATURE_NV_vertex_program */
+
+#if FEATURE_NV_fragment_program
+      case GL_FRAGMENT_PROGRAM_NV:
+         CHECK_EXTENSION(NV_fragment_program);
+         return ctx->FragmentProgram.Enabled;
+#endif /* FEATURE_NV_fragment_program */
+
+      /* GL_NV_texture_rectangle */
+      case GL_TEXTURE_RECTANGLE_NV:
+         CHECK_EXTENSION(NV_texture_rectangle);
+         {
+            const struct gl_texture_unit *texUnit;
+            texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+            return (texUnit->Enabled & TEXTURE_RECT_BIT) ? GL_TRUE : GL_FALSE;
+         }
+
+      /* GL_EXT_stencil_two_side */
+      case GL_STENCIL_TEST_TWO_SIDE_EXT:
+         CHECK_EXTENSION(EXT_stencil_two_side);
+         return ctx->Stencil.TestTwoSide;
+
+#if FEATURE_ARB_fragment_program
+      case GL_FRAGMENT_PROGRAM_ARB:
+         return ctx->FragmentProgram.Enabled;
+#endif /* FEATURE_ARB_fragment_program */
+
+      /* GL_EXT_depth_bounds_test */
+      case GL_DEPTH_BOUNDS_TEST_EXT:
+         CHECK_EXTENSION(EXT_depth_bounds_test);
+         return ctx->Depth.BoundsTest;
+
+      /* GL_MESA_program_debug */
+      case GL_FRAGMENT_PROGRAM_CALLBACK_MESA:
+         CHECK_EXTENSION(MESA_program_debug);
+         return ctx->FragmentProgram.CallbackEnabled;
+      case GL_VERTEX_PROGRAM_CALLBACK_MESA:
+         CHECK_EXTENSION(MESA_program_debug);
+         return ctx->VertexProgram.CallbackEnabled;
+
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glIsEnabled(0x%x)", (int) cap);
+	 return GL_FALSE;
+   }
+}
diff --git a/reactos/lib/mesa32/src/main/enable.h b/reactos/lib/mesa32/src/main/enable.h
new file mode 100644
index 00000000000..25c90b0275a
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/enable.h
@@ -0,0 +1,57 @@
+/**
+ * \file enable.h
+ * Enable/disable/query GL capabilities.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef ENABLE_H
+#define ENABLE_H
+
+
+#include "mtypes.h"
+
+
+extern void
+_mesa_set_enable( GLcontext* ctx, GLenum cap, GLboolean state );
+
+extern void GLAPIENTRY
+_mesa_Disable( GLenum cap );
+
+extern void GLAPIENTRY
+_mesa_Enable( GLenum cap );
+
+extern GLboolean GLAPIENTRY
+_mesa_IsEnabled( GLenum cap );
+
+extern void GLAPIENTRY
+_mesa_EnableClientState( GLenum cap );
+
+extern void GLAPIENTRY
+_mesa_DisableClientState( GLenum cap );
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/enums.c b/reactos/lib/mesa32/src/main/enums.c
new file mode 100644
index 00000000000..20009d66dd3
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/enums.c
@@ -0,0 +1,973 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Author:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+
+#include "glheader.h"
+#include "enums.h"
+#include "imports.h"
+
+
+typedef struct {
+   const char *c;
+   int n;
+} enum_elt;
+
+enum_elt all_enums[] =
+{
+   /* Boolean values */
+   { "GL_FALSE", 0 },
+   { "GL_TRUE", 1 },
+
+   /* Data types */
+   { "GL_BYTE", 0x1400 },
+   { "GL_UNSIGNED_BYTE", 0x1401 },
+   { "GL_SHORT", 0x1402 },
+   { "GL_UNSIGNED_SHORT", 0x1403 },
+   { "GL_INT", 0x1404 },
+   { "GL_UNSIGNED_INT", 0x1405 },
+   { "GL_FLOAT", 0x1406 },
+   { "GL_DOUBLE", 0x140A },
+   { "GL_2_BYTES", 0x1407 },
+   { "GL_3_BYTES", 0x1408 },
+   { "GL_4_BYTES", 0x1409 },
+
+   /* Primitives */
+   { "GL_LINES", 0x0001 },
+   { "GL_POINTS", 0x0000 },
+   { "GL_LINE_STRIP", 0x0003 },
+   { "GL_LINE_LOOP", 0x0002 },
+   { "GL_TRIANGLES", 0x0004 },
+   { "GL_TRIANGLE_STRIP", 0x0005 },
+   { "GL_TRIANGLE_FAN", 0x0006 },
+   { "GL_QUADS", 0x0007 },
+   { "GL_QUAD_STRIP", 0x0008 },
+   { "GL_POLYGON", 0x0009 },
+   { "GL_EDGE_FLAG", 0x0B43 },
+
+   /* Vertex Arrays */
+   { "GL_VERTEX_ARRAY", 0x8074 },
+   { "GL_NORMAL_ARRAY", 0x8075 },
+   { "GL_COLOR_ARRAY", 0x8076 },
+   { "GL_INDEX_ARRAY", 0x8077 },
+   { "GL_TEXTURE_COORD_ARRAY", 0x8078 },
+   { "GL_EDGE_FLAG_ARRAY", 0x8079 },
+   { "GL_VERTEX_ARRAY_SIZE", 0x807A },
+   { "GL_VERTEX_ARRAY_TYPE", 0x807B },
+   { "GL_VERTEX_ARRAY_STRIDE", 0x807C },
+   { "GL_NORMAL_ARRAY_TYPE", 0x807E },
+   { "GL_NORMAL_ARRAY_STRIDE", 0x807F },
+   { "GL_COLOR_ARRAY_SIZE", 0x8081 },
+   { "GL_COLOR_ARRAY_TYPE", 0x8082 },
+   { "GL_COLOR_ARRAY_STRIDE", 0x8083 },
+   { "GL_INDEX_ARRAY_TYPE", 0x8085 },
+   { "GL_INDEX_ARRAY_STRIDE", 0x8086 },
+   { "GL_TEXTURE_COORD_ARRAY_SIZE", 0x8088 },
+   { "GL_TEXTURE_COORD_ARRAY_TYPE", 0x8089 },
+   { "GL_TEXTURE_COORD_ARRAY_STRIDE", 0x808A },
+   { "GL_EDGE_FLAG_ARRAY_STRIDE", 0x808C },
+   { "GL_VERTEX_ARRAY_POINTER", 0x808E },
+   { "GL_NORMAL_ARRAY_POINTER", 0x808F },
+   { "GL_COLOR_ARRAY_POINTER", 0x8090 },
+   { "GL_INDEX_ARRAY_POINTER", 0x8091 },
+   { "GL_TEXTURE_COORD_ARRAY_POINTER", 0x8092 },
+   { "GL_EDGE_FLAG_ARRAY_POINTER", 0x8093 },
+   { "GL_V2F", 0x2A20 },
+   { "GL_V3F", 0x2A21 },
+   { "GL_C4UB_V2F", 0x2A22 },
+   { "GL_C4UB_V3F", 0x2A23 },
+   { "GL_C3F_V3F", 0x2A24 },
+   { "GL_N3F_V3F", 0x2A25 },
+   { "GL_C4F_N3F_V3F", 0x2A26 },
+   { "GL_T2F_V3F", 0x2A27 },
+   { "GL_T4F_V4F", 0x2A28 },
+   { "GL_T2F_C4UB_V3F", 0x2A29 },
+   { "GL_T2F_C3F_V3F", 0x2A2A },
+   { "GL_T2F_N3F_V3F", 0x2A2B },
+   { "GL_T2F_C4F_N3F_V3F", 0x2A2C },
+   { "GL_T4F_C4F_N3F_V4F", 0x2A2D },
+
+   /* Matrix Mode */
+   { "GL_MATRIX_MODE", 0x0BA0 },
+   { "GL_MODELVIEW", 0x1700 },
+   { "GL_PROJECTION", 0x1701 },
+   { "GL_TEXTURE", 0x1702 },
+
+   /* Points */
+   { "GL_POINT_SMOOTH", 0x0B10 },
+   { "GL_POINT_SIZE", 0x0B11 },
+   { "GL_POINT_SIZE_GRANULARITY ", 0x0B13 },
+   { "GL_POINT_SIZE_RANGE", 0x0B12 },
+
+   /* Lines */
+   { "GL_LINE_SMOOTH", 0x0B20 },
+   { "GL_LINE_STIPPLE", 0x0B24 },
+   { "GL_LINE_STIPPLE_PATTERN", 0x0B25 },
+   { "GL_LINE_STIPPLE_REPEAT", 0x0B26 },
+   { "GL_LINE_WIDTH", 0x0B21 },
+   { "GL_LINE_WIDTH_GRANULARITY", 0x0B23 },
+   { "GL_LINE_WIDTH_RANGE", 0x0B22 },
+
+   /* Polygons */
+   { "GL_POINT", 0x1B00 },
+   { "GL_LINE", 0x1B01 },
+   { "GL_FILL", 0x1B02 },
+   { "GL_CCW", 0x0901 },
+   { "GL_CW", 0x0900 },
+   { "GL_FRONT", 0x0404 },
+   { "GL_BACK", 0x0405 },
+   { "GL_CULL_FACE", 0x0B44 },
+   { "GL_CULL_FACE_MODE", 0x0B45 },
+   { "GL_POLYGON_SMOOTH", 0x0B41 },
+   { "GL_POLYGON_STIPPLE", 0x0B42 },
+   { "GL_FRONT_FACE", 0x0B46 },
+   { "GL_POLYGON_MODE", 0x0B40 },
+   { "GL_POLYGON_OFFSET_FACTOR", 0x8038 },
+   { "GL_POLYGON_OFFSET_UNITS", 0x2A00 },
+   { "GL_POLYGON_OFFSET_POINT", 0x2A01 },
+   { "GL_POLYGON_OFFSET_LINE", 0x2A02 },
+   { "GL_POLYGON_OFFSET_FILL", 0x8037 },
+
+   /* Display Lists */
+   { "GL_COMPILE", 0x1300 },
+   { "GL_COMPILE_AND_EXECUTE", 0x1301 },
+   { "GL_LIST_BASE", 0x0B32 },
+   { "GL_LIST_INDEX", 0x0B33 },
+   { "GL_LIST_MODE", 0x0B30 },
+
+   /* Depth buffer */
+   { "GL_NEVER", 0x0200 },
+   { "GL_LESS", 0x0201 },
+   { "GL_GEQUAL", 0x0206 },
+   { "GL_LEQUAL", 0x0203 },
+   { "GL_GREATER", 0x0204 },
+   { "GL_NOTEQUAL", 0x0205 },
+   { "GL_EQUAL", 0x0202 },
+   { "GL_ALWAYS", 0x0207 },
+   { "GL_DEPTH_TEST", 0x0B71 },
+   { "GL_DEPTH_BITS", 0x0D56 },
+   { "GL_DEPTH_CLEAR_VALUE", 0x0B73 },
+   { "GL_DEPTH_FUNC", 0x0B74 },
+   { "GL_DEPTH_RANGE", 0x0B70 },
+   { "GL_DEPTH_WRITEMASK", 0x0B72 },
+   { "GL_DEPTH_COMPONENT", 0x1902 },
+
+   /* Lighting */
+   { "GL_LIGHTING", 0x0B50 },
+   { "GL_LIGHT0", 0x4000 },
+   { "GL_LIGHT1", 0x4001 },
+   { "GL_LIGHT2", 0x4002 },
+   { "GL_LIGHT3", 0x4003 },
+   { "GL_LIGHT4", 0x4004 },
+   { "GL_LIGHT5", 0x4005 },
+   { "GL_LIGHT6", 0x4006 },
+   { "GL_LIGHT7", 0x4007 },
+   { "GL_SPOT_EXPONENT", 0x1205 },
+   { "GL_SPOT_CUTOFF", 0x1206 },
+   { "GL_CONSTANT_ATTENUATION", 0x1207 },
+   { "GL_LINEAR_ATTENUATION", 0x1208 },
+   { "GL_QUADRATIC_ATTENUATION", 0x1209 },
+   { "GL_AMBIENT", 0x1200 },
+   { "GL_DIFFUSE", 0x1201 },
+   { "GL_SPECULAR", 0x1202 },
+   { "GL_SHININESS", 0x1601 },
+   { "GL_EMISSION", 0x1600 },
+   { "GL_POSITION", 0x1203 },
+   { "GL_SPOT_DIRECTION", 0x1204 },
+   { "GL_AMBIENT_AND_DIFFUSE", 0x1602 },
+   { "GL_COLOR_INDEXES", 0x1603 },
+   { "GL_LIGHT_MODEL_TWO_SIDE", 0x0B52 },
+   { "GL_LIGHT_MODEL_LOCAL_VIEWER", 0x0B51 },
+   { "GL_LIGHT_MODEL_AMBIENT", 0x0B53 },
+   { "GL_FRONT_AND_BACK", 0x0408 },
+   { "GL_SHADE_MODEL", 0x0B54 },
+   { "GL_FLAT", 0x1D00 },
+   { "GL_SMOOTH", 0x1D01 },
+   { "GL_COLOR_MATERIAL", 0x0B57 },
+   { "GL_COLOR_MATERIAL_FACE", 0x0B55 },
+   { "GL_COLOR_MATERIAL_PARAMETER", 0x0B56 },
+   { "GL_NORMALIZE", 0x0BA1 },
+
+   /* User clipping planes */
+   { "GL_CLIP_PLANE0", 0x3000 },
+   { "GL_CLIP_PLANE1", 0x3001 },
+   { "GL_CLIP_PLANE2", 0x3002 },
+   { "GL_CLIP_PLANE3", 0x3003 },
+   { "GL_CLIP_PLANE4", 0x3004 },
+   { "GL_CLIP_PLANE5", 0x3005 },
+
+   /* Accumulation buffer */
+   { "GL_ACCUM_RED_BITS", 0x0D58 },
+   { "GL_ACCUM_GREEN_BITS", 0x0D59 },
+   { "GL_ACCUM_BLUE_BITS", 0x0D5A },
+   { "GL_ACCUM_ALPHA_BITS", 0x0D5B },
+   { "GL_ACCUM_CLEAR_VALUE", 0x0B80 },
+   { "GL_ACCUM", 0x0100 },
+   { "GL_ADD", 0x0104 },
+   { "GL_LOAD", 0x0101 },
+   { "GL_MULT", 0x0103 },
+   { "GL_RETURN", 0x0102 },
+
+   /* Alpha testing */
+   { "GL_ALPHA_TEST", 0x0BC0 },
+   { "GL_ALPHA_TEST_REF", 0x0BC2 },
+   { "GL_ALPHA_TEST_FUNC", 0x0BC1 },
+
+   /* Blending */
+   { "GL_BLEND", 0x0BE2 },
+   { "GL_BLEND_SRC", 0x0BE1 },
+   { "GL_BLEND_DST", 0x0BE0 },
+   { "GL_ZERO", 0 },
+   { "GL_ONE", 1 },
+   { "GL_SRC_COLOR", 0x0300 },
+   { "GL_ONE_MINUS_SRC_COLOR", 0x0301 },
+   { "GL_DST_COLOR", 0x0306 },
+   { "GL_ONE_MINUS_DST_COLOR", 0x0307 },
+   { "GL_SRC_ALPHA", 0x0302 },
+   { "GL_ONE_MINUS_SRC_ALPHA", 0x0303 },
+   { "GL_DST_ALPHA", 0x0304 },
+   { "GL_ONE_MINUS_DST_ALPHA", 0x0305 },
+   { "GL_SRC_ALPHA_SATURATE", 0x0308 },
+   { "GL_CONSTANT_COLOR", 0x8001 },
+   { "GL_ONE_MINUS_CONSTANT_COLOR", 0x8002 },
+   { "GL_CONSTANT_ALPHA", 0x8003 },
+   { "GL_ONE_MINUS_CONSTANT_ALPHA", 0x8004 },
+
+   /* Render Mode */
+   { "GL_FEEDBACK", 0x1C01 },
+   { "GL_RENDER", 0x1C00 },
+   { "GL_SELECT", 0x1C02 },
+
+   /* Feedback */
+   { "GL_2D", 0x0600 },
+   { "GL_3D", 0x0601 },
+   { "GL_3D_COLOR", 0x0602 },
+   { "GL_3D_COLOR_TEXTURE", 0x0603 },
+   { "GL_4D_COLOR_TEXTURE", 0x0604 },
+   { "GL_POINT_TOKEN", 0x0701 },
+   { "GL_LINE_TOKEN", 0x0702 },
+   { "GL_LINE_RESET_TOKEN", 0x0707 },
+   { "GL_POLYGON_TOKEN", 0x0703 },
+   { "GL_BITMAP_TOKEN", 0x0704 },
+   { "GL_DRAW_PIXEL_TOKEN", 0x0705 },
+   { "GL_COPY_PIXEL_TOKEN", 0x0706 },
+   { "GL_PASS_THROUGH_TOKEN", 0x0700 },
+   { "GL_FEEDBACK_BUFFER_POINTER", 0x0DF0 },
+   { "GL_FEEDBACK_BUFFER_SIZE", 0x0DF1 },
+   { "GL_FEEDBACK_BUFFER_TYPE", 0x0DF2 },
+
+   /* Selection */
+   { "GL_SELECTION_BUFFER_POINTER", 0x0DF3 },
+   { "GL_SELECTION_BUFFER_SIZE", 0x0DF4 },
+
+   /* Fog */
+   { "GL_FOG", 0x0B60 },
+   { "GL_FOG_MODE", 0x0B65 },
+   { "GL_FOG_DENSITY", 0x0B62 },
+   { "GL_FOG_COLOR", 0x0B66 },
+   { "GL_FOG_INDEX", 0x0B61 },
+   { "GL_FOG_START", 0x0B63 },
+   { "GL_FOG_END", 0x0B64 },
+   { "GL_LINEAR", 0x2601 },
+   { "GL_EXP", 0x0800 },
+   { "GL_EXP2", 0x0801 },
+
+   /* Logic Ops */
+   { "GL_LOGIC_OP", 0x0BF1 },
+   { "GL_INDEX_LOGIC_OP", 0x0BF1 },
+   { "GL_COLOR_LOGIC_OP", 0x0BF2 },
+   { "GL_LOGIC_OP_MODE", 0x0BF0 },
+   { "GL_CLEAR", 0x1500 },
+   { "GL_SET", 0x150F },
+   { "GL_COPY", 0x1503 },
+   { "GL_COPY_INVERTED", 0x150C },
+   { "GL_NOOP", 0x1505 },
+   { "GL_INVERT", 0x150A },
+   { "GL_AND", 0x1501 },
+   { "GL_NAND", 0x150E },
+   { "GL_OR", 0x1507 },
+   { "GL_NOR", 0x1508 },
+   { "GL_XOR", 0x1506 },
+   { "GL_EQUIV", 0x1509 },
+   { "GL_AND_REVERSE", 0x1502 },
+   { "GL_AND_INVERTED", 0x1504 },
+   { "GL_OR_REVERSE", 0x150B },
+   { "GL_OR_INVERTED", 0x150D },
+
+   /* Stencil */
+   { "GL_STENCIL_TEST", 0x0B90 },
+   { "GL_STENCIL_WRITEMASK", 0x0B98 },
+   { "GL_STENCIL_BITS", 0x0D57 },
+   { "GL_STENCIL_FUNC", 0x0B92 },
+   { "GL_STENCIL_VALUE_MASK", 0x0B93 },
+   { "GL_STENCIL_REF", 0x0B97 },
+   { "GL_STENCIL_FAIL", 0x0B94 },
+   { "GL_STENCIL_PASS_DEPTH_PASS", 0x0B96 },
+   { "GL_STENCIL_PASS_DEPTH_FAIL", 0x0B95 },
+   { "GL_STENCIL_CLEAR_VALUE", 0x0B91 },
+   { "GL_STENCIL_INDEX", 0x1901 },
+   { "GL_KEEP", 0x1E00 },
+   { "GL_REPLACE", 0x1E01 },
+   { "GL_INCR", 0x1E02 },
+   { "GL_DECR", 0x1E03 },
+
+   /* Buffers, Pixel Drawing/Reading */
+   { "GL_NONE", 0 },
+   { "GL_LEFT", 0x0406 },
+   { "GL_RIGHT", 0x0407 },
+   { "GL_FRONT_LEFT", 0x0400 },
+   { "GL_FRONT_RIGHT", 0x0401 },
+   { "GL_BACK_LEFT", 0x0402 },
+   { "GL_BACK_RIGHT", 0x0403 },
+   { "GL_AUX0", 0x0409 },
+   { "GL_AUX1", 0x040A },
+   { "GL_AUX2", 0x040B },
+   { "GL_AUX3", 0x040C },
+   { "GL_COLOR_INDEX", 0x1900 },
+   { "GL_RED", 0x1903 },
+   { "GL_GREEN", 0x1904 },
+   { "GL_BLUE", 0x1905 },
+   { "GL_ALPHA", 0x1906 },
+   { "GL_LUMINANCE", 0x1909 },
+   { "GL_LUMINANCE_ALPHA", 0x190A },
+   { "GL_ALPHA_BITS", 0x0D55 },
+   { "GL_RED_BITS", 0x0D52 },
+   { "GL_GREEN_BITS", 0x0D53 },
+   { "GL_BLUE_BITS", 0x0D54 },
+   { "GL_INDEX_BITS", 0x0D51 },
+   { "GL_SUBPIXEL_BITS", 0x0D50 },
+   { "GL_AUX_BUFFERS", 0x0C00 },
+   { "GL_READ_BUFFER", 0x0C02 },
+   { "GL_DRAW_BUFFER", 0x0C01 },
+   { "GL_DOUBLEBUFFER", 0x0C32 },
+   { "GL_STEREO", 0x0C33 },
+   { "GL_BITMAP", 0x1A00 },
+   { "GL_COLOR", 0x1800 },
+   { "GL_DEPTH", 0x1801 },
+   { "GL_STENCIL", 0x1802 },
+   { "GL_DITHER", 0x0BD0 },
+   { "GL_RGB", 0x1907 },
+   { "GL_RGBA", 0x1908 },
+
+   /* Implementation limits */
+   { "GL_MAX_LIST_NESTING", 0x0B31 },
+   { "GL_MAX_ATTRIB_STACK_DEPTH", 0x0D35 },
+   { "GL_MAX_MODELVIEW_STACK_DEPTH", 0x0D36 },
+   { "GL_MAX_NAME_STACK_DEPTH", 0x0D37 },
+   { "GL_MAX_PROJECTION_STACK_DEPTH", 0x0D38 },
+   { "GL_MAX_TEXTURE_STACK_DEPTH", 0x0D39 },
+   { "GL_MAX_EVAL_ORDER", 0x0D30 },
+   { "GL_MAX_LIGHTS", 0x0D31 },
+   { "GL_MAX_CLIP_PLANES", 0x0D32 },
+   { "GL_MAX_TEXTURE_SIZE", 0x0D33 },
+   { "GL_MAX_PIXEL_MAP_TABLE", 0x0D34 },
+   { "GL_MAX_VIEWPORT_DIMS", 0x0D3A },
+   { "GL_MAX_CLIENT_ATTRIB_STACK_DEPTH", 0x0D3B },
+
+
+   { "GL_ATTRIB_STACK_DEPTH", 0x0BB0 },
+   { "GL_CLIENT_ATTRIB_STACK_DEPTH", 0x0BB1 },
+   { "GL_COLOR_CLEAR_VALUE", 0x0C22 },
+   { "GL_COLOR_WRITEMASK", 0x0C23 },
+   { "GL_CURRENT_INDEX", 0x0B01 },
+   { "GL_CURRENT_COLOR", 0x0B00 },
+   { "GL_CURRENT_NORMAL", 0x0B02 },
+   { "GL_CURRENT_RASTER_COLOR", 0x0B04 },
+   { "GL_CURRENT_RASTER_DISTANCE", 0x0B09 },
+   { "GL_CURRENT_RASTER_INDEX", 0x0B05 },
+   { "GL_CURRENT_RASTER_POSITION", 0x0B07 },
+   { "GL_CURRENT_RASTER_TEXTURE_COORDS", 0x0B06},
+   { "GL_CURRENT_RASTER_POSITION_VALID", 0x0B08 },
+   { "GL_CURRENT_TEXTURE_COORDS", 0x0B03 },
+   { "GL_INDEX_CLEAR_VALUE", 0x0C20 },
+   { "GL_INDEX_MODE", 0x0C30 },
+   { "GL_INDEX_WRITEMASK", 0x0C21 },
+   { "GL_MODELVIEW_MATRIX", 0x0BA6 },
+   { "GL_MODELVIEW_STACK_DEPTH", 0x0BA3 },
+   { "GL_NAME_STACK_DEPTH", 0x0D70 },
+   { "GL_PROJECTION_MATRIX", 0x0BA7 },
+   { "GL_PROJECTION_STACK_DEPTH", 0x0BA4 },
+   { "GL_RENDER_MODE", 0x0C40 },
+   { "GL_RGBA_MODE", 0x0C31 },
+   { "GL_TEXTURE_MATRIX", 0x0BA8 },
+   { "GL_TEXTURE_STACK_DEPTH", 0x0BA5 },
+   { "GL_VIEWPORT", 0x0BA2 },
+
+
+   /* Evaluators */
+   { "GL_AUTO_NORMAL", 0x0D80 },
+   { "GL_MAP1_COLOR_4", 0x0D90 },
+   { "GL_MAP1_GRID_DOMAIN", 0x0DD0 },
+   { "GL_MAP1_GRID_SEGMENTS", 0x0DD1 },
+   { "GL_MAP1_INDEX", 0x0D91 },
+   { "GL_MAP1_NORMAL", 0x0D92 },
+   { "GL_MAP1_TEXTURE_COORD_1", 0x0D93 },
+   { "GL_MAP1_TEXTURE_COORD_2", 0x0D94 },
+   { "GL_MAP1_TEXTURE_COORD_3", 0x0D95 },
+   { "GL_MAP1_TEXTURE_COORD_4", 0x0D96 },
+   { "GL_MAP1_VERTEX_3", 0x0D97 },
+   { "GL_MAP1_VERTEX_4", 0x0D98 },
+   { "GL_MAP2_COLOR_4", 0x0DB0 },
+   { "GL_MAP2_GRID_DOMAIN", 0x0DD2 },
+   { "GL_MAP2_GRID_SEGMENTS", 0x0DD3 },
+   { "GL_MAP2_INDEX", 0x0DB1 },
+   { "GL_MAP2_NORMAL", 0x0DB2 },
+   { "GL_MAP2_TEXTURE_COORD_1", 0x0DB3 },
+   { "GL_MAP2_TEXTURE_COORD_2", 0x0DB4 },
+   { "GL_MAP2_TEXTURE_COORD_3", 0x0DB5 },
+   { "GL_MAP2_TEXTURE_COORD_4", 0x0DB6 },
+   { "GL_MAP2_VERTEX_3", 0x0DB7 },
+   { "GL_MAP2_VERTEX_4", 0x0DB8 },
+   { "GL_COEFF", 0x0A00 },
+   { "GL_DOMAIN", 0x0A02 },
+   { "GL_ORDER", 0x0A01 },
+
+   /* Hints */
+   { "GL_FOG_HINT", 0x0C54 },
+   { "GL_LINE_SMOOTH_HINT", 0x0C52 },
+   { "GL_PERSPECTIVE_CORRECTION_HINT", 0x0C50 },
+   { "GL_POINT_SMOOTH_HINT", 0x0C51 },
+   { "GL_POLYGON_SMOOTH_HINT", 0x0C53 },
+   { "GL_DONT_CARE", 0x1100 },
+   { "GL_FASTEST", 0x1101 },
+   { "GL_NICEST", 0x1102 },
+
+   /* Scissor box */
+   { "GL_SCISSOR_TEST", 0x0C11 },
+   { "GL_SCISSOR_BOX", 0x0C10 },
+
+   /* Pixel Mode / Transfer */
+   { "GL_MAP_COLOR", 0x0D10 },
+   { "GL_MAP_STENCIL", 0x0D11 },
+   { "GL_INDEX_SHIFT", 0x0D12 },
+   { "GL_INDEX_OFFSET", 0x0D13 },
+   { "GL_RED_SCALE", 0x0D14 },
+   { "GL_RED_BIAS", 0x0D15 },
+   { "GL_GREEN_SCALE", 0x0D18 },
+   { "GL_GREEN_BIAS", 0x0D19 },
+   { "GL_BLUE_SCALE", 0x0D1A },
+   { "GL_BLUE_BIAS", 0x0D1B },
+   { "GL_ALPHA_SCALE", 0x0D1C },
+   { "GL_ALPHA_BIAS", 0x0D1D },
+   { "GL_DEPTH_SCALE", 0x0D1E },
+   { "GL_DEPTH_BIAS", 0x0D1F },
+   { "GL_PIXEL_MAP_S_TO_S_SIZE", 0x0CB1 },
+   { "GL_PIXEL_MAP_I_TO_I_SIZE", 0x0CB0 },
+   { "GL_PIXEL_MAP_I_TO_R_SIZE", 0x0CB2 },
+   { "GL_PIXEL_MAP_I_TO_G_SIZE", 0x0CB3 },
+   { "GL_PIXEL_MAP_I_TO_B_SIZE", 0x0CB4 },
+   { "GL_PIXEL_MAP_I_TO_A_SIZE", 0x0CB5 },
+   { "GL_PIXEL_MAP_R_TO_R_SIZE", 0x0CB6 },
+   { "GL_PIXEL_MAP_G_TO_G_SIZE", 0x0CB7 },
+   { "GL_PIXEL_MAP_B_TO_B_SIZE", 0x0CB8 },
+   { "GL_PIXEL_MAP_A_TO_A_SIZE", 0x0CB9 },
+   { "GL_PIXEL_MAP_S_TO_S", 0x0C71 },
+   { "GL_PIXEL_MAP_I_TO_I", 0x0C70 },
+   { "GL_PIXEL_MAP_I_TO_R", 0x0C72 },
+   { "GL_PIXEL_MAP_I_TO_G", 0x0C73 },
+   { "GL_PIXEL_MAP_I_TO_B", 0x0C74 },
+   { "GL_PIXEL_MAP_I_TO_A", 0x0C75 },
+   { "GL_PIXEL_MAP_R_TO_R", 0x0C76 },
+   { "GL_PIXEL_MAP_G_TO_G", 0x0C77 },
+   { "GL_PIXEL_MAP_B_TO_B", 0x0C78 },
+   { "GL_PIXEL_MAP_A_TO_A", 0x0C79 },
+   { "GL_PACK_ALIGNMENT", 0x0D05 },
+   { "GL_PACK_LSB_FIRST", 0x0D01 },
+   { "GL_PACK_ROW_LENGTH", 0x0D02 },
+   { "GL_PACK_SKIP_PIXELS", 0x0D04 },
+   { "GL_PACK_SKIP_ROWS", 0x0D03 },
+   { "GL_PACK_SWAP_BYTES", 0x0D00 },
+   { "GL_UNPACK_ALIGNMENT", 0x0CF5 },
+   { "GL_UNPACK_LSB_FIRST", 0x0CF1 },
+   { "GL_UNPACK_ROW_LENGTH", 0x0CF2 },
+   { "GL_UNPACK_SKIP_PIXELS", 0x0CF4 },
+   { "GL_UNPACK_SKIP_ROWS", 0x0CF3 },
+   { "GL_UNPACK_SWAP_BYTES", 0x0CF0 },
+   { "GL_ZOOM_X", 0x0D16 },
+   { "GL_ZOOM_Y", 0x0D17 },
+
+   /* Texture mapping */
+   { "GL_TEXTURE_ENV", 0x2300 },
+   { "GL_TEXTURE_ENV_MODE", 0x2200 },
+   { "GL_TEXTURE_1D", 0x0DE0 },
+   { "GL_TEXTURE_2D", 0x0DE1 },
+   { "GL_TEXTURE_WRAP_S", 0x2802 },
+   { "GL_TEXTURE_WRAP_T", 0x2803 },
+   { "GL_TEXTURE_MAG_FILTER", 0x2800 },
+   { "GL_TEXTURE_MIN_FILTER", 0x2801 },
+   { "GL_TEXTURE_ENV_COLOR", 0x2201 },
+   { "GL_TEXTURE_GEN_S", 0x0C60 },
+   { "GL_TEXTURE_GEN_T", 0x0C61 },
+   { "GL_TEXTURE_GEN_MODE", 0x2500 },
+   { "GL_TEXTURE_BORDER_COLOR", 0x1004 },
+   { "GL_TEXTURE_WIDTH", 0x1000 },
+   { "GL_TEXTURE_HEIGHT", 0x1001 },
+   { "GL_TEXTURE_BORDER", 0x1005 },
+   { "GL_TEXTURE_COMPONENTS", 0x1003 },
+   { "GL_TEXTURE_RED_SIZE", 0x805C },
+   { "GL_TEXTURE_GREEN_SIZE", 0x805D },
+   { "GL_TEXTURE_BLUE_SIZE", 0x805E },
+   { "GL_TEXTURE_ALPHA_SIZE", 0x805F },
+   { "GL_TEXTURE_LUMINANCE_SIZE", 0x8060 },
+   { "GL_TEXTURE_INTENSITY_SIZE", 0x8061 },
+   { "GL_NEAREST_MIPMAP_NEAREST", 0x2700 },
+   { "GL_NEAREST_MIPMAP_LINEAR", 0x2702 },
+   { "GL_LINEAR_MIPMAP_NEAREST", 0x2701 },
+   { "GL_LINEAR_MIPMAP_LINEAR", 0x2703 },
+   { "GL_OBJECT_LINEAR", 0x2401 },
+   { "GL_OBJECT_PLANE", 0x2501 },
+   { "GL_EYE_LINEAR", 0x2400 },
+   { "GL_EYE_PLANE", 0x2502 },
+   { "GL_SPHERE_MAP", 0x2402 },
+   { "GL_DECAL", 0x2101 },
+   { "GL_MODULATE", 0x2100 },
+   { "GL_NEAREST", 0x2600 },
+   { "GL_REPEAT", 0x2901 },
+   { "GL_CLAMP", 0x2900 },
+   { "GL_S", 0x2000 },
+   { "GL_T", 0x2001 },
+   { "GL_R", 0x2002 },
+   { "GL_Q", 0x2003 },
+   { "GL_TEXTURE_GEN_R", 0x0C62 },
+   { "GL_TEXTURE_GEN_Q", 0x0C63 },
+
+   /* GL 1.1 texturing */
+   { "GL_PROXY_TEXTURE_1D", 0x8063 },
+   { "GL_PROXY_TEXTURE_2D", 0x8064 },
+   { "GL_TEXTURE_PRIORITY", 0x8066 },
+   { "GL_TEXTURE_RESIDENT", 0x8067 },
+   { "GL_TEXTURE_BINDING_1D", 0x8068 },
+   { "GL_TEXTURE_BINDING_2D", 0x8069 },
+   { "GL_TEXTURE_INTERNAL_FORMAT", 0x1003 },
+
+   /* GL 1.2 texturing */
+   { "GL_PACK_SKIP_IMAGES", 0x806B },
+   { "GL_PACK_IMAGE_HEIGHT", 0x806C },
+   { "GL_UNPACK_SKIP_IMAGES", 0x806D },
+   { "GL_UNPACK_IMAGE_HEIGHT", 0x806E },
+   { "GL_TEXTURE_3D", 0x806F },
+   { "GL_PROXY_TEXTURE_3D", 0x8070 },
+   { "GL_TEXTURE_DEPTH", 0x8071 },
+   { "GL_TEXTURE_WRAP_R", 0x8072 },
+   { "GL_MAX_3D_TEXTURE_SIZE", 0x8073 },
+   { "GL_TEXTURE_BINDING_3D", 0x806A },
+
+   /* Internal texture formats (GL 1.1) */
+   { "GL_ALPHA4", 0x803B },
+   { "GL_ALPHA8", 0x803C },
+   { "GL_ALPHA12", 0x803D },
+   { "GL_ALPHA16", 0x803E },
+   { "GL_LUMINANCE4", 0x803F },
+   { "GL_LUMINANCE8", 0x8040 },
+   { "GL_LUMINANCE12", 0x8041 },
+   { "GL_LUMINANCE16", 0x8042 },
+   { "GL_LUMINANCE4_ALPHA4", 0x8043 },
+   { "GL_LUMINANCE6_ALPHA2", 0x8044 },
+   { "GL_LUMINANCE8_ALPHA8", 0x8045 },
+   { "GL_LUMINANCE12_ALPHA4", 0x8046 },
+   { "GL_LUMINANCE12_ALPHA12", 0x8047 },
+   { "GL_LUMINANCE16_ALPHA16", 0x8048 },
+   { "GL_INTENSITY", 0x8049 },
+   { "GL_INTENSITY4", 0x804A },
+   { "GL_INTENSITY8", 0x804B },
+   { "GL_INTENSITY12", 0x804C },
+   { "GL_INTENSITY16", 0x804D },
+   { "GL_R3_G3_B2", 0x2A10 },
+   { "GL_RGB4", 0x804F },
+   { "GL_RGB5", 0x8050 },
+   { "GL_RGB8", 0x8051 },
+   { "GL_RGB10", 0x8052 },
+   { "GL_RGB12", 0x8053 },
+   { "GL_RGB16", 0x8054 },
+   { "GL_RGBA2", 0x8055 },
+   { "GL_RGBA4", 0x8056 },
+   { "GL_RGB5_A1", 0x8057 },
+   { "GL_RGBA8", 0x8058 },
+   { "GL_RGB10_A2", 0x8059 },
+   { "GL_RGBA12", 0x805A },
+   { "GL_RGBA16", 0x805B },
+
+   /* Utility */
+   { "GL_VENDOR", 0x1F00 },
+   { "GL_RENDERER", 0x1F01 },
+   { "GL_VERSION", 0x1F02 },
+   { "GL_EXTENSIONS", 0x1F03 },
+
+   /* Errors */
+   { "GL_INVALID_VALUE", 0x0501 },
+   { "GL_INVALID_ENUM", 0x0500 },
+   { "GL_INVALID_OPERATION", 0x0502 },
+   { "GL_STACK_OVERFLOW", 0x0503 },
+   { "GL_STACK_UNDERFLOW", 0x0504 },
+   { "GL_OUT_OF_MEMORY", 0x0505 },
+
+   /*
+    * Extensions
+    */
+
+   { "GL_CONSTANT_COLOR_EXT", 0x8001 },
+   { "GL_ONE_MINUS_CONSTANT_COLOR_EXT", 0x8002 },
+   { "GL_CONSTANT_ALPHA_EXT", 0x8003 },
+   { "GL_ONE_MINUS_CONSTANT_ALPHA_EXT", 0x8004 },
+   { "GL_BLEND_EQUATION_EXT", 0x8009 },
+   { "GL_MIN_EXT", 0x8007 },
+   { "GL_MAX_EXT", 0x8008 },
+   { "GL_FUNC_ADD_EXT", 0x8006 },
+   { "GL_FUNC_SUBTRACT_EXT", 0x800A },
+   { "GL_FUNC_REVERSE_SUBTRACT_EXT", 0x800B },
+   { "GL_BLEND_COLOR_EXT", 0x8005 },
+
+   { "GL_POLYGON_OFFSET_EXT", 0x8037 },
+   { "GL_POLYGON_OFFSET_FACTOR_EXT", 0x8038 },
+   { "GL_POLYGON_OFFSET_BIAS_EXT", 0x8039 },
+
+
+   { "GL_VERTEX_ARRAY_EXT", 0x8074 },
+   { "GL_NORMAL_ARRAY_EXT", 0x8075 },
+   { "GL_COLOR_ARRAY_EXT", 0x8076 },
+   { "GL_INDEX_ARRAY_EXT", 0x8077 },
+   { "GL_TEXTURE_COORD_ARRAY_EXT", 0x8078 },
+   { "GL_EDGE_FLAG_ARRAY_EXT", 0x8079 },
+   { "GL_VERTEX_ARRAY_SIZE_EXT", 0x807A },
+   { "GL_VERTEX_ARRAY_TYPE_EXT", 0x807B },
+   { "GL_VERTEX_ARRAY_STRIDE_EXT", 0x807C },
+   { "GL_VERTEX_ARRAY_COUNT_EXT", 0x807D },
+   { "GL_NORMAL_ARRAY_TYPE_EXT", 0x807E },
+   { "GL_NORMAL_ARRAY_STRIDE_EXT", 0x807F },
+   { "GL_NORMAL_ARRAY_COUNT_EXT", 0x8080 },
+   { "GL_COLOR_ARRAY_SIZE_EXT", 0x8081 },
+   { "GL_COLOR_ARRAY_TYPE_EXT", 0x8082 },
+   { "GL_COLOR_ARRAY_STRIDE_EXT", 0x8083 },
+   { "GL_COLOR_ARRAY_COUNT_EXT", 0x8084 },
+   { "GL_INDEX_ARRAY_TYPE_EXT", 0x8085 },
+   { "GL_INDEX_ARRAY_STRIDE_EXT", 0x8086 },
+   { "GL_INDEX_ARRAY_COUNT_EXT", 0x8087 },
+   { "GL_TEXTURE_COORD_ARRAY_SIZE_EXT", 0x8088 },
+   { "GL_TEXTURE_COORD_ARRAY_TYPE_EXT", 0x8089 },
+   { "GL_TEXTURE_COORD_ARRAY_STRIDE_EXT", 0x808A },
+   { "GL_TEXTURE_COORD_ARRAY_COUNT_EXT", 0x808B },
+   { "GL_EDGE_FLAG_ARRAY_STRIDE_EXT", 0x808C },
+   { "GL_EDGE_FLAG_ARRAY_COUNT_EXT", 0x808D },
+   { "GL_VERTEX_ARRAY_POINTER_EXT", 0x808E },
+   { "GL_NORMAL_ARRAY_POINTER_EXT", 0x808F },
+   { "GL_COLOR_ARRAY_POINTER_EXT", 0x8090 },
+   { "GL_INDEX_ARRAY_POINTER_EXT", 0x8091 },
+   { "GL_TEXTURE_COORD_ARRAY_POINTER_EXT", 0x8092 },
+   { "GL_EDGE_FLAG_ARRAY_POINTER_EXT", 0x8093 },
+
+   { "GL_TEXTURE_PRIORITY_EXT", 0x8066 },
+   { "GL_TEXTURE_RESIDENT_EXT", 0x8067 },
+   { "GL_TEXTURE_1D_BINDING_EXT", 0x8068 },
+   { "GL_TEXTURE_2D_BINDING_EXT", 0x8069 },
+
+   { "GL_PACK_SKIP_IMAGES_EXT", 0x806B },
+   { "GL_PACK_IMAGE_HEIGHT_EXT", 0x806C },
+   { "GL_UNPACK_SKIP_IMAGES_EXT", 0x806D },
+   { "GL_UNPACK_IMAGE_HEIGHT_EXT", 0x806E },
+   { "GL_TEXTURE_3D_EXT", 0x806F },
+   { "GL_PROXY_TEXTURE_3D_EXT", 0x8070 },
+   { "GL_TEXTURE_DEPTH_EXT", 0x8071 },
+   { "GL_TEXTURE_WRAP_R_EXT", 0x8072 },
+   { "GL_MAX_3D_TEXTURE_SIZE_EXT", 0x8073 },
+   { "GL_TEXTURE_3D_BINDING_EXT", 0x806A },
+
+   { "GL_TABLE_TOO_LARGE_EXT", 0x8031 },
+   { "GL_COLOR_TABLE_FORMAT_EXT", 0x80D8 },
+   { "GL_COLOR_TABLE_WIDTH_EXT", 0x80D9 },
+   { "GL_COLOR_TABLE_RED_SIZE_EXT", 0x80DA },
+   { "GL_COLOR_TABLE_GREEN_SIZE_EXT", 0x80DB },
+   { "GL_COLOR_TABLE_BLUE_SIZE_EXT", 0x80DC },
+   { "GL_COLOR_TABLE_ALPHA_SIZE_EXT", 0x80DD },
+   { "GL_COLOR_TABLE_LUMINANCE_SIZE_EXT", 0x80DE },
+   { "GL_COLOR_TABLE_INTENSITY_SIZE_EXT", 0x80DF },
+   { "GL_TEXTURE_INDEX_SIZE_EXT", 0x80ED },
+   { "GL_COLOR_INDEX1_EXT", 0x80E2 },
+   { "GL_COLOR_INDEX2_EXT", 0x80E3 },
+   { "GL_COLOR_INDEX4_EXT", 0x80E4 },
+   { "GL_COLOR_INDEX8_EXT", 0x80E5 },
+   { "GL_COLOR_INDEX12_EXT", 0x80E6 },
+   { "GL_COLOR_INDEX16_EXT", 0x80E7 },
+
+   { "GL_SHARED_TEXTURE_PALETTE_EXT", 0x81FB },
+
+   { "GL_POINT_SIZE_MIN_EXT", 0x8126 },
+   { "GL_POINT_SIZE_MAX_EXT", 0x8127 },
+   { "GL_POINT_FADE_THRESHOLD_SIZE_EXT", 0x8128 },
+   { "GL_DISTANCE_ATTENUATION_EXT", 0x8129 },
+
+   { "GL_RESCALE_NORMAL_EXT", 0x803A },
+
+   { "GL_ABGR_EXT", 0x8000 },
+
+   { "GL_INCR_WRAP_EXT", 0x8507 },
+   { "GL_DECR_WRAP_EXT", 0x8508 },
+
+   { "GL_CLAMP_TO_EDGE_SGIS", 0x812F },
+
+   { "GL_BLEND_DST_RGB_INGR", 0x80C8 },
+   { "GL_BLEND_SRC_RGB_INGR", 0x80C9 },
+   { "GL_BLEND_DST_ALPHA_INGR", 0x80CA },
+   { "GL_BLEND_SRC_ALPHA_INGR", 0x80CB },
+
+   { "GL_RESCALE_NORMAL", 0x803A },
+   { "GL_CLAMP_TO_EDGE", 0x812F },
+   { "GL_MAX_ELEMENTS_VERTICES", 0xF0E8 },
+   { "GL_MAX_ELEMENTS_INDICES", 0xF0E9 },
+   { "GL_BGR", 0x80E0 },
+   { "GL_BGRA", 0x80E1 },
+   { "GL_UNSIGNED_BYTE_3_3_2", 0x8032 },
+   { "GL_UNSIGNED_BYTE_2_3_3_REV", 0x8362 },
+   { "GL_UNSIGNED_SHORT_5_6_5", 0x8363 },
+   { "GL_UNSIGNED_SHORT_5_6_5_REV", 0x8364 },
+   { "GL_UNSIGNED_SHORT_4_4_4_4", 0x8033 },
+   { "GL_UNSIGNED_SHORT_4_4_4_4_REV", 0x8365 },
+   { "GL_UNSIGNED_SHORT_5_5_5_1", 0x8034 },
+   { "GL_UNSIGNED_SHORT_1_5_5_5_REV", 0x8366 },
+   { "GL_UNSIGNED_INT_8_8_8_8", 0x8035 },
+   { "GL_UNSIGNED_INT_8_8_8_8_REV", 0x8367 },
+   { "GL_UNSIGNED_INT_10_10_10_2", 0x8036 },
+   { "GL_UNSIGNED_INT_2_10_10_10_REV", 0x8368 },
+   { "GL_LIGHT_MODEL_COLOR_CONTROL", 0x81F8 },
+   { "GL_SINGLE_COLOR", 0x81F9 },
+   { "GL_SEPARATE_SPECULAR_COLOR", 0x81FA },
+   { "GL_TEXTURE_MIN_LOD", 0x813A },
+   { "GL_TEXTURE_MAX_LOD", 0x813B },
+   { "GL_TEXTURE_BASE_LEVEL", 0x813C },
+   { "GL_TEXTURE_MAX_LEVEL", 0x813D },
+
+   { "GL_TEXTURE0_ARB", 0x84C0 },
+   { "GL_TEXTURE1_ARB", 0x84C1 },
+   { "GL_TEXTURE2_ARB", 0x84C2 },
+   { "GL_TEXTURE3_ARB", 0x84C3 },
+   { "GL_ACTIVE_TEXTURE_ARB", 0x84E0 },
+   { "GL_CLIENT_ACTIVE_TEXTURE_ARB", 0x84E1 },
+   { "GL_MAX_TEXTURE_UNITS_ARB", 0x84E2 },
+
+   { "GL_OCCLUSION_TEST_HP", 0x8165 },
+   { "GL_OCCLUSION_TEST_RESULT_HP", 0x8166 },
+
+   { "GL_TEXTURE_FILTER_CONTROL_EXT", 0x8500 },
+   { "GL_TEXTURE_LOD_BIAS_EXT", 0x8501 },
+
+   /* GL_ARB_texture_cube_map */
+   { "GL_NORMAL_MAP_ARB", 0x8511 },
+   { "GL_REFLECTION_MAP_ARB", 0x8512 },
+   { "GL_TEXTURE_CUBE_MAP_ARB", 0x8513 },
+   { "GL_TEXTURE_BINDING_CUBE_MAP_ARB", 0x8514 },
+   { "GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB", 0x8515 },
+   { "GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB", 0x8516 },
+   { "GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB", 0x8517 },
+   { "GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB", 0x8518 },
+   { "GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB", 0x8519 },
+   { "GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB", 0x851a },
+   { "GL_PROXY_TEXTURE_CUBE_MAP_ARB", 0x851b },
+   { "GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB", 0x851c },
+
+   { "GL_PREFER_DOUBLEBUFFER_HINT_PGI", 107000 },
+   { "GL_STRICT_DEPTHFUNC_HINT_PGI", 107030 },
+   { "GL_STRICT_LIGHTING_HINT_PGI", 107031 },
+   { "GL_STRICT_SCISSOR_HINT_PGI", 107032 },
+   { "GL_FULL_STIPPLE_HINT_PGI", 107033 },
+   { "GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI", 107011 },
+   { "GL_NATIVE_GRAPHICS_END_HINT_PGI", 107012 },
+   { "GL_CONSERVE_MEMORY_HINT_PGI", 107005 },
+   { "GL_RECLAIM_MEMORY_HINT_PGI", 107006 },
+   { "GL_ALWAYS_FAST_HINT_PGI", 107020 },
+   { "GL_ALWAYS_SOFT_HINT_PGI", 107021 },
+   { "GL_ALLOW_DRAW_OBJ_HINT_PGI", 107022 },
+   { "GL_ALLOW_DRAW_WIN_HINT_PGI", 107023 },
+   { "GL_ALLOW_DRAW_FRG_HINT_PGI", 107024 },
+   { "GL_ALLOW_DRAW_SPN_HINT_PGI", 107024 },
+   { "GL_ALLOW_DRAW_MEM_HINT_PGI", 107025 },
+   { "GL_CLIP_NEAR_HINT_PGI", 107040 },
+   { "GL_CLIP_FAR_HINT_PGI", 107041 },
+   { "GL_WIDE_LINE_HINT_PGI", 107042 },
+   { "GL_BACK_NORMALS_HINT_PGI", 107043 },
+   { "GL_NATIVE_GRAPHICS_HANDLE_PGI", 107010 },
+
+   /* GL_EXT_compiled_vertex_array */
+   { "GL_ARRAY_ELEMENT_LOCK_FIRST_EXT", 0x81A8},
+   { "GL_ARRAY_ELEMENT_LOCK_COUNT_EXT", 0x81A9},
+
+   /* GL_EXT_clip_volume_hint */
+   { "GL_CLIP_VOLUME_CLIPPING_HINT_EXT", 0x80F0},
+
+   /* GL_EXT_texture_env_combine */
+   { "GL_COMBINE_EXT", 0x8570 },
+   { "GL_COMBINE_RGB_EXT", 0x8571 },
+   { "GL_COMBINE_ALPHA_EXT", 0x8572 },
+   { "GL_SOURCE0_RGB_EXT", 0x8580 },
+   { "GL_SOURCE1_RGB_EXT", 0x8581 },
+   { "GL_SOURCE2_RGB_EXT", 0x8582 },
+   { "GL_SOURCE0_ALPHA_EXT", 0x8588 },
+   { "GL_SOURCE1_ALPHA_EXT", 0x8589 },
+   { "GL_SOURCE2_ALPHA_EXT", 0x858A },
+   { "GL_OPERAND0_RGB_EXT", 0x8590 },
+   { "GL_OPERAND1_RGB_EXT", 0x8591 },
+   { "GL_OPERAND2_RGB_EXT", 0x8592 },
+   { "GL_OPERAND0_ALPHA_EXT", 0x8598 },
+   { "GL_OPERAND1_ALPHA_EXT", 0x8599 },
+   { "GL_OPERAND2_ALPHA_EXT", 0x859A },
+   { "GL_RGB_SCALE_EXT", 0x8573 },
+   { "GL_ADD_SIGNED_EXT", 0x8574 },
+   { "GL_INTERPOLATE_EXT", 0x8575 },
+   { "GL_CONSTANT_EXT", 0x8576 },
+   { "GL_PRIMARY_COLOR_EXT", 0x8577 },
+   { "GL_PREVIOUS_EXT", 0x8578 },
+
+   /* GL_ARB_texture_env_combine */
+   { "GL_SUBTRACT_ARB", 0x84E7 },
+
+   /* GL_EXT_texture_env_dot3 */
+   { "GL_DOT3_RGB_EXT", 0x8740 },
+   { "GL_DOT3_RGBA_EXT", 0x8741 },
+
+   /* GL_ARB_texture_env_dot3 */
+   { "GL_DOT3_RGB_ARB", 0x86ae },
+   { "GL_DOT3_RGBA_ARB", 0x86af },
+
+   /* GL_ARB_texture_border_clamp */
+   { "GL_CLAMP_TO_BORDER_ARB", 0x812D },
+
+   /* GL_ATI_texture_env_combine3 */
+   { "GL_MODULATE_ADD_ATI", 0x8744 },
+   { "GL_MODULATE_SIGNED_ADD_ATI", 0x8745 },
+   { "GL_MODULATE_SUBTRACT_ATI", 0x8746 },
+
+   /* GL_ARB_texture_compression */
+   { "GL_COMPRESSED_ALPHA_ARB", 0x84E9 },
+   { "GL_COMPRESSED_LUMINANCE_ARB", 0x84EA },
+   { "GL_COMPRESSED_LUMINANCE_ALPHA_ARB", 0x84EB },
+   { "GL_COMPRESSED_INTENSITY_ARB", 0x84EC },
+   { "GL_COMPRESSED_RGB_ARB", 0x84ED },
+   { "GL_COMPRESSED_RGBA_ARB", 0x84EE },
+   { "GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB", 0x86A0 },
+   { "GL_TEXTURE_COMPRESSED_ARB", 0x86A1 },
+   { "GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB", 0x86A2 },
+   { "GL_COMPRESSED_TEXTURE_FORMATS_ARB", 0x86A3 },
+
+   /* GL_EXT_texture_compression_s3tc */
+   { "GL_COMPRESSED_RGB_S3TC_DXT1_EXT", 0x83F0 },
+   { "GL_COMPRESSED_RGBA_S3TC_DXT1_EXT", 0x83F1 },
+   { "GL_COMPRESSED_RGBA_S3TC_DXT3_EXT", 0x83F2 },
+   { "GL_COMPRESSED_RGBA_S3TC_DXT5_EXT", 0x83F3 },
+
+   /* GL_S3_s3tc */
+   { "GL_RGB_S3TC", 0x83A0 },
+   { "GL_RGB4_S3TC", 0x83A1 },
+   { "GL_RGBA_S3TC", 0x83A2 },
+   { "GL_RGBA4_S3TC", 0x83A3 },
+
+   /* GL_3DFX_texture_compression_FXT1 */
+   { "GL_COMPRESSED_RGB_FXT1_3DFX", 0x86B0 },
+   { "GL_COMPRESSED_RGBA_FXT1_3DFX", 0x86B1 },
+};
+
+#define Elements(x) sizeof(x)/sizeof(*x)
+
+typedef int (GLWINAPIV *cfunc)(const void *, const void *);
+
+static enum_elt **index1 = 0;
+static int sorted = 0;
+
+static int compar_name( const enum_elt *a, const enum_elt *b )
+{
+   return _mesa_strcmp(a->c, b->c);
+}
+
+
+/* note the extra level of indirection
+ */
+static int compar_nr( const enum_elt **a, const enum_elt **b )
+{
+   return (*a)->n - (*b)->n;
+}
+
+
+static void sort_enums( void )
+{
+   GLuint i;
+   index1 = (enum_elt **)MALLOC( Elements(all_enums) * sizeof(enum_elt *) );
+   sorted = 1;
+
+   if (!index1)
+      return;  /* what else can we do? */
+
+   qsort( all_enums, Elements(all_enums), sizeof(*all_enums),
+	  (cfunc) compar_name );
+
+   for (i = 0 ; i < Elements(all_enums) ; i++)
+      index1[i] = &all_enums[i];
+
+   qsort( index1, Elements(all_enums), sizeof(*index1), (cfunc) compar_nr );
+}
+
+
+
+int _mesa_lookup_enum_by_name( const char *symbol )
+{
+   enum_elt tmp;
+   enum_elt *e;
+
+   if (!sorted)
+      sort_enums();
+
+   if (!symbol)
+      return 0;
+
+   tmp.c = symbol;
+   e = (enum_elt *)bsearch( &tmp, all_enums, Elements(all_enums),
+			    sizeof(*all_enums), (cfunc) compar_name );
+
+   return e ? e->n : -1;
+}
+
+
+static char token_tmp[20];
+
+const char *_mesa_lookup_enum_by_nr( int nr )
+{
+   enum_elt tmp, *e, **f;
+
+   if (!sorted)
+      sort_enums();
+
+   tmp.n = nr;
+   e = &tmp;
+
+   f = (enum_elt **)bsearch( &e, index1, Elements(all_enums),
+			     sizeof(*index1), (cfunc) compar_nr );
+
+   if (f) {
+      return (*f)->c;
+   }
+   else {
+      /* this isn't re-entrant safe, no big deal here */
+      _mesa_sprintf(token_tmp, "0x%x", nr);
+      return token_tmp;
+   }
+}
diff --git a/reactos/lib/mesa32/src/main/enums.h b/reactos/lib/mesa32/src/main/enums.h
new file mode 100644
index 00000000000..1e7b86e3a09
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/enums.h
@@ -0,0 +1,55 @@
+/**
+ * \file enums.h
+ * Enumeration name/number lookup functions.
+ * 
+ * \if subset
+ * (No-op)
+ *
+ * \endif
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef _ENUMS_H_
+#define _ENUMS_H_
+
+
+#if _HAVE_FULL_GL
+
+extern const char *_mesa_lookup_enum_by_nr( int nr );
+extern int _mesa_lookup_enum_by_name( const char *symbol );
+
+#else
+
+/** No-op */
+#define _mesa_lookup_enum_by_name( s ) 0
+
+/** No-op */
+#define _mesa_lookup_enum_by_nr( n ) "unknown"
+
+#endif
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/eval.c b/reactos/lib/mesa32/src/main/eval.c
new file mode 100644
index 00000000000..3f89f9c1eae
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/eval.c
@@ -0,0 +1,962 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * eval.c was written by
+ * Bernd Barsuhn (bdbarsuh@cip.informatik.uni-erlangen.de) and
+ * Volker Weiss (vrweiss@cip.informatik.uni-erlangen.de).
+ *
+ * My original implementation of evaluators was simplistic and didn't
+ * compute surface normal vectors properly.  Bernd and Volker applied
+ * used more sophisticated methods to get better results.
+ *
+ * Thanks guys!
+ */
+
+
+#include "glheader.h"
+#include "imports.h"
+#include "colormac.h"
+#include "context.h"
+#include "eval.h"
+#include "macros.h"
+#include "mtypes.h"
+
+
+/*
+ * Return the number of components per control point for any type of
+ * evaluator.  Return 0 if bad target.
+ * See table 5.1 in the OpenGL 1.2 spec.
+ */
+GLuint _mesa_evaluator_components( GLenum target )
+{
+   switch (target) {
+      case GL_MAP1_VERTEX_3:		return 3;
+      case GL_MAP1_VERTEX_4:		return 4;
+      case GL_MAP1_INDEX:		return 1;
+      case GL_MAP1_COLOR_4:		return 4;
+      case GL_MAP1_NORMAL:		return 3;
+      case GL_MAP1_TEXTURE_COORD_1:	return 1;
+      case GL_MAP1_TEXTURE_COORD_2:	return 2;
+      case GL_MAP1_TEXTURE_COORD_3:	return 3;
+      case GL_MAP1_TEXTURE_COORD_4:	return 4;
+      case GL_MAP2_VERTEX_3:		return 3;
+      case GL_MAP2_VERTEX_4:		return 4;
+      case GL_MAP2_INDEX:		return 1;
+      case GL_MAP2_COLOR_4:		return 4;
+      case GL_MAP2_NORMAL:		return 3;
+      case GL_MAP2_TEXTURE_COORD_1:	return 1;
+      case GL_MAP2_TEXTURE_COORD_2:	return 2;
+      case GL_MAP2_TEXTURE_COORD_3:	return 3;
+      case GL_MAP2_TEXTURE_COORD_4:	return 4;
+      default:				break;
+   }
+
+   /* XXX need to check for the vertex program extension
+   if (!ctx->Extensions.NV_vertex_program)
+      return 0;
+   */
+
+   if (target >= GL_MAP1_VERTEX_ATTRIB0_4_NV &&
+       target <= GL_MAP1_VERTEX_ATTRIB15_4_NV)
+      return 4;
+
+   if (target >= GL_MAP2_VERTEX_ATTRIB0_4_NV &&
+       target <= GL_MAP2_VERTEX_ATTRIB15_4_NV)
+      return 4;
+
+   return 0;
+}
+
+
+/*
+ * Return pointer to the gl_1d_map struct for the named target.
+ */
+static struct gl_1d_map *
+get_1d_map( GLcontext *ctx, GLenum target )
+{
+   switch (target) {
+      case GL_MAP1_VERTEX_3:
+         return &ctx->EvalMap.Map1Vertex3;
+      case GL_MAP1_VERTEX_4:
+         return &ctx->EvalMap.Map1Vertex4;
+      case GL_MAP1_INDEX:
+         return &ctx->EvalMap.Map1Index;
+      case GL_MAP1_COLOR_4:
+         return &ctx->EvalMap.Map1Color4;
+      case GL_MAP1_NORMAL:
+         return &ctx->EvalMap.Map1Normal;
+      case GL_MAP1_TEXTURE_COORD_1:
+         return &ctx->EvalMap.Map1Texture1;
+      case GL_MAP1_TEXTURE_COORD_2:
+         return &ctx->EvalMap.Map1Texture2;
+      case GL_MAP1_TEXTURE_COORD_3:
+         return &ctx->EvalMap.Map1Texture3;
+      case GL_MAP1_TEXTURE_COORD_4:
+         return &ctx->EvalMap.Map1Texture4;
+      case GL_MAP1_VERTEX_ATTRIB0_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB1_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB2_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB3_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB4_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB5_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB6_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB7_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB8_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB9_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB10_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB11_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB12_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB13_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB14_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB15_4_NV:
+         if (!ctx->Extensions.NV_vertex_program)
+            return NULL;
+         return &ctx->EvalMap.Map1Attrib[target - GL_MAP1_VERTEX_ATTRIB0_4_NV];
+      default:
+         return NULL;
+   }
+}
+
+
+/*
+ * Return pointer to the gl_2d_map struct for the named target.
+ */
+static struct gl_2d_map *
+get_2d_map( GLcontext *ctx, GLenum target )
+{
+   switch (target) {
+      case GL_MAP2_VERTEX_3:
+         return &ctx->EvalMap.Map2Vertex3;
+      case GL_MAP2_VERTEX_4:
+         return &ctx->EvalMap.Map2Vertex4;
+      case GL_MAP2_INDEX:
+         return &ctx->EvalMap.Map2Index;
+      case GL_MAP2_COLOR_4:
+         return &ctx->EvalMap.Map2Color4;
+      case GL_MAP2_NORMAL:
+         return &ctx->EvalMap.Map2Normal;
+      case GL_MAP2_TEXTURE_COORD_1:
+         return &ctx->EvalMap.Map2Texture1;
+      case GL_MAP2_TEXTURE_COORD_2:
+         return &ctx->EvalMap.Map2Texture2;
+      case GL_MAP2_TEXTURE_COORD_3:
+         return &ctx->EvalMap.Map2Texture3;
+      case GL_MAP2_TEXTURE_COORD_4:
+         return &ctx->EvalMap.Map2Texture4;
+      case GL_MAP2_VERTEX_ATTRIB0_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB1_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB2_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB3_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB4_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB5_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB6_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB7_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB8_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB9_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB10_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB11_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB12_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB13_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB14_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB15_4_NV:
+         if (!ctx->Extensions.NV_vertex_program)
+            return NULL;
+         return &ctx->EvalMap.Map2Attrib[target - GL_MAP2_VERTEX_ATTRIB0_4_NV];
+      default:
+         return NULL;
+   }
+}
+
+
+/**********************************************************************/
+/***            Copy and deallocate control points                  ***/
+/**********************************************************************/
+
+
+/*
+ * Copy 1-parametric evaluator control points from user-specified
+ * memory space to a buffer of contiguous control points.
+ * \param see glMap1f for details
+ * \return pointer to buffer of contiguous control points or NULL if out
+ *          of memory.
+ */
+GLfloat *_mesa_copy_map_points1f( GLenum target, GLint ustride, GLint uorder,
+                                  const GLfloat *points )
+{
+   GLfloat *buffer, *p;
+   GLint i, k, size = _mesa_evaluator_components(target);
+
+   if (!points || !size)
+      return NULL;
+
+   buffer = (GLfloat *) MALLOC(uorder * size * sizeof(GLfloat));
+
+   if (buffer)
+      for (i = 0, p = buffer; i < uorder; i++, points += ustride)
+	for (k = 0; k < size; k++)
+	  *p++ = points[k];
+
+   return buffer;
+}
+
+
+
+/*
+ * Same as above but convert doubles to floats.
+ */
+GLfloat *_mesa_copy_map_points1d( GLenum target, GLint ustride, GLint uorder,
+                                  const GLdouble *points )
+{
+   GLfloat *buffer, *p;
+   GLint i, k, size = _mesa_evaluator_components(target);
+
+   if (!points || !size)
+      return NULL;
+
+   buffer = (GLfloat *) MALLOC(uorder * size * sizeof(GLfloat));
+
+   if (buffer)
+      for (i = 0, p = buffer; i < uorder; i++, points += ustride)
+	for (k = 0; k < size; k++)
+	  *p++ = (GLfloat) points[k];
+
+   return buffer;
+}
+
+
+
+/*
+ * Copy 2-parametric evaluator control points from user-specified
+ * memory space to a buffer of contiguous control points.
+ * Additional memory is allocated to be used by the horner and
+ * de Casteljau evaluation schemes.
+ *
+ * \param see glMap2f for details
+ * \return pointer to buffer of contiguous control points or NULL if out
+ *          of memory.
+ */
+GLfloat *_mesa_copy_map_points2f( GLenum target,
+                                  GLint ustride, GLint uorder,
+                                  GLint vstride, GLint vorder,
+                                  const GLfloat *points )
+{
+   GLfloat *buffer, *p;
+   GLint i, j, k, size, dsize, hsize;
+   GLint uinc;
+
+   size = _mesa_evaluator_components(target);
+
+   if (!points || size==0) {
+      return NULL;
+   }
+
+   /* max(uorder, vorder) additional points are used in      */
+   /* horner evaluation and uorder*vorder additional */
+   /* values are needed for de Casteljau                     */
+   dsize = (uorder == 2 && vorder == 2)? 0 : uorder*vorder;
+   hsize = (uorder > vorder ? uorder : vorder)*size;
+
+   if(hsize>dsize)
+     buffer = (GLfloat *) MALLOC((uorder*vorder*size+hsize)*sizeof(GLfloat));
+   else
+     buffer = (GLfloat *) MALLOC((uorder*vorder*size+dsize)*sizeof(GLfloat));
+
+   /* compute the increment value for the u-loop */
+   uinc = ustride - vorder*vstride;
+
+   if (buffer)
+      for (i=0, p=buffer; i<uorder; i++, points += uinc)
+	 for (j=0; j<vorder; j++, points += vstride)
+	    for (k=0; k<size; k++)
+	       *p++ = points[k];
+
+   return buffer;
+}
+
+
+
+/*
+ * Same as above but convert doubles to floats.
+ */
+GLfloat *_mesa_copy_map_points2d(GLenum target,
+                                 GLint ustride, GLint uorder,
+                                 GLint vstride, GLint vorder,
+                                 const GLdouble *points )
+{
+   GLfloat *buffer, *p;
+   GLint i, j, k, size, hsize, dsize;
+   GLint uinc;
+
+   size = _mesa_evaluator_components(target);
+
+   if (!points || size==0) {
+      return NULL;
+   }
+
+   /* max(uorder, vorder) additional points are used in      */
+   /* horner evaluation and uorder*vorder additional */
+   /* values are needed for de Casteljau                     */
+   dsize = (uorder == 2 && vorder == 2)? 0 : uorder*vorder;
+   hsize = (uorder > vorder ? uorder : vorder)*size;
+
+   if(hsize>dsize)
+     buffer = (GLfloat *) MALLOC((uorder*vorder*size+hsize)*sizeof(GLfloat));
+   else
+     buffer = (GLfloat *) MALLOC((uorder*vorder*size+dsize)*sizeof(GLfloat));
+
+   /* compute the increment value for the u-loop */
+   uinc = ustride - vorder*vstride;
+
+   if (buffer)
+      for (i=0, p=buffer; i<uorder; i++, points += uinc)
+	 for (j=0; j<vorder; j++, points += vstride)
+	    for (k=0; k<size; k++)
+	       *p++ = (GLfloat) points[k];
+
+   return buffer;
+}
+
+
+
+
+/**********************************************************************/
+/***                      API entry points                          ***/
+/**********************************************************************/
+
+
+/*
+ * This does the work of glMap1[fd].
+ */
+static void
+map1(GLenum target, GLfloat u1, GLfloat u2, GLint ustride,
+     GLint uorder, const GLvoid *points, GLenum type )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint k;
+   GLfloat *pnts;
+   struct gl_1d_map *map = NULL;
+
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+   ASSERT(type == GL_FLOAT || type == GL_DOUBLE);
+
+   if (u1 == u2) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glMap1(u1,u2)" );
+      return;
+   }
+   if (uorder < 1 || uorder > MAX_EVAL_ORDER) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glMap1(order)" );
+      return;
+   }
+   if (!points) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glMap1(points)" );
+      return;
+   }
+
+   k = _mesa_evaluator_components( target );
+   if (k == 0) {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glMap1(target)" );
+   }
+
+   if (ustride < k) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glMap1(stride)" );
+      return;
+   }
+
+   if (ctx->Texture.CurrentUnit != 0) {
+      /* See OpenGL 1.2.1 spec, section F.2.13 */
+      _mesa_error( ctx, GL_INVALID_OPERATION, "glMap2(ACTIVE_TEXTURE != 0)" );
+      return;
+   }
+
+   map = get_1d_map(ctx, target);
+   if (!map) {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glMap1(target)" );
+      return;
+   }
+
+   /* make copy of the control points */
+   if (type == GL_FLOAT)
+      pnts = _mesa_copy_map_points1f(target, ustride, uorder, (GLfloat*) points);
+   else
+      pnts = _mesa_copy_map_points1d(target, ustride, uorder, (GLdouble*) points);
+
+
+   FLUSH_VERTICES(ctx, _NEW_EVAL);
+   map->Order = uorder;
+   map->u1 = u1;
+   map->u2 = u2;
+   map->du = 1.0F / (u2 - u1);
+   if (map->Points)
+      FREE( map->Points );
+   map->Points = pnts;
+}
+
+
+
+void GLAPIENTRY
+_mesa_Map1f( GLenum target, GLfloat u1, GLfloat u2, GLint stride,
+             GLint order, const GLfloat *points )
+{
+   map1(target, u1, u2, stride, order, points, GL_FLOAT);
+}
+
+
+void GLAPIENTRY
+_mesa_Map1d( GLenum target, GLdouble u1, GLdouble u2, GLint stride,
+             GLint order, const GLdouble *points )
+{
+   map1(target, (GLfloat) u1, (GLfloat) u2, stride, order, points, GL_DOUBLE);
+}
+
+
+static void
+map2( GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder,
+      GLfloat v1, GLfloat v2, GLint vstride, GLint vorder,
+      const GLvoid *points, GLenum type )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint k;
+   GLfloat *pnts;
+   struct gl_2d_map *map = NULL;
+
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+   ASSERT(type == GL_FLOAT || type == GL_DOUBLE);
+
+   if (u1==u2) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glMap2(u1,u2)" );
+      return;
+   }
+
+   if (v1==v2) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glMap2(v1,v2)" );
+      return;
+   }
+
+   if (uorder<1 || uorder>MAX_EVAL_ORDER) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glMap2(uorder)" );
+      return;
+   }
+
+   if (vorder<1 || vorder>MAX_EVAL_ORDER) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glMap2(vorder)" );
+      return;
+   }
+
+   k = _mesa_evaluator_components( target );
+   if (k==0) {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glMap2(target)" );
+   }
+
+   if (ustride < k) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glMap2(ustride)" );
+      return;
+   }
+   if (vstride < k) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glMap2(vstride)" );
+      return;
+   }
+
+   if (ctx->Texture.CurrentUnit != 0) {
+      /* See OpenGL 1.2.1 spec, section F.2.13 */
+      _mesa_error( ctx, GL_INVALID_OPERATION, "glMap2(ACTIVE_TEXTURE != 0)" );
+      return;
+   }
+
+   map = get_2d_map(ctx, target);
+   if (!map) {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glMap2(target)" );
+      return;
+   }
+
+   /* make copy of the control points */
+   if (type == GL_FLOAT)
+      pnts = _mesa_copy_map_points2f(target, ustride, uorder,
+                                  vstride, vorder, (GLfloat*) points);
+   else
+      pnts = _mesa_copy_map_points2d(target, ustride, uorder,
+                                  vstride, vorder, (GLdouble*) points);
+
+
+   FLUSH_VERTICES(ctx, _NEW_EVAL);
+   map->Uorder = uorder;
+   map->u1 = u1;
+   map->u2 = u2;
+   map->du = 1.0F / (u2 - u1);
+   map->Vorder = vorder;
+   map->v1 = v1;
+   map->v2 = v2;
+   map->dv = 1.0F / (v2 - v1);
+   if (map->Points)
+      FREE( map->Points );
+   map->Points = pnts;
+}
+
+
+void GLAPIENTRY
+_mesa_Map2f( GLenum target,
+             GLfloat u1, GLfloat u2, GLint ustride, GLint uorder,
+             GLfloat v1, GLfloat v2, GLint vstride, GLint vorder,
+             const GLfloat *points)
+{
+   map2(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder,
+        points, GL_FLOAT);
+}
+
+
+void GLAPIENTRY
+_mesa_Map2d( GLenum target,
+             GLdouble u1, GLdouble u2, GLint ustride, GLint uorder,
+             GLdouble v1, GLdouble v2, GLint vstride, GLint vorder,
+             const GLdouble *points )
+{
+   map2(target, (GLfloat) u1, (GLfloat) u2, ustride, uorder, 
+	(GLfloat) v1, (GLfloat) v2, vstride, vorder, points, GL_DOUBLE);
+}
+
+
+
+void GLAPIENTRY
+_mesa_GetMapdv( GLenum target, GLenum query, GLdouble *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_1d_map *map1d;
+   struct gl_2d_map *map2d;
+   GLint i, n;
+   GLfloat *data;
+   GLuint comps;
+
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   comps = _mesa_evaluator_components(target);
+   if (!comps) {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetMapdv(target)" );
+      return;
+   }
+
+   map1d = get_1d_map(ctx, target);
+   map2d = get_2d_map(ctx, target);
+   ASSERT(map1d || map2d);
+
+   switch (query) {
+      case GL_COEFF:
+         if (map1d) {
+            data = map1d->Points;
+            n = map1d->Order * comps;
+         }
+         else {
+            data = map2d->Points;
+            n = map2d->Uorder * map2d->Vorder * comps;
+         }
+	 if (data) {
+	    for (i=0;i<n;i++) {
+	       v[i] = data[i];
+	    }
+	 }
+         break;
+      case GL_ORDER:
+         if (map1d) {
+            v[0] = (GLdouble) map1d->Order;
+         }
+         else {
+            v[0] = (GLdouble) map2d->Uorder;
+            v[1] = (GLdouble) map2d->Vorder;
+         }
+         break;
+      case GL_DOMAIN:
+         if (map1d) {
+            v[0] = (GLdouble) map1d->u1;
+            v[1] = (GLdouble) map1d->u2;
+         }
+         else {
+            v[0] = (GLdouble) map2d->u1;
+            v[1] = (GLdouble) map2d->u2;
+            v[2] = (GLdouble) map2d->v1;
+            v[3] = (GLdouble) map2d->v2;
+         }
+         break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetMapdv(query)" );
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetMapfv( GLenum target, GLenum query, GLfloat *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_1d_map *map1d;
+   struct gl_2d_map *map2d;
+   GLint i, n;
+   GLfloat *data;
+   GLuint comps;
+
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   comps = _mesa_evaluator_components(target);
+   if (!comps) {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetMapfv(target)" );
+      return;
+   }
+
+   map1d = get_1d_map(ctx, target);
+   map2d = get_2d_map(ctx, target);
+   ASSERT(map1d || map2d);
+
+   switch (query) {
+      case GL_COEFF:
+         if (map1d) {
+            data = map1d->Points;
+            n = map1d->Order * comps;
+         }
+         else {
+            data = map2d->Points;
+            n = map2d->Uorder * map2d->Vorder * comps;
+         }
+	 if (data) {
+	    for (i=0;i<n;i++) {
+	       v[i] = data[i];
+	    }
+	 }
+         break;
+      case GL_ORDER:
+         if (map1d) {
+            v[0] = (GLfloat) map1d->Order;
+         }
+         else {
+            v[0] = (GLfloat) map2d->Uorder;
+            v[1] = (GLfloat) map2d->Vorder;
+         }
+         break;
+      case GL_DOMAIN:
+         if (map1d) {
+            v[0] = map1d->u1;
+            v[1] = map1d->u2;
+         }
+         else {
+            v[0] = map2d->u1;
+            v[1] = map2d->u2;
+            v[2] = map2d->v1;
+            v[3] = map2d->v2;
+         }
+         break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetMapfv(query)" );
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetMapiv( GLenum target, GLenum query, GLint *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_1d_map *map1d;
+   struct gl_2d_map *map2d;
+   GLuint i, n;
+   GLfloat *data;
+   GLuint comps;
+
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   comps = _mesa_evaluator_components(target);
+   if (!comps) {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetMapiv(target)" );
+      return;
+   }
+
+   map1d = get_1d_map(ctx, target);
+   map2d = get_2d_map(ctx, target);
+   ASSERT(map1d || map2d);
+
+   switch (query) {
+      case GL_COEFF:
+         if (map1d) {
+            data = map1d->Points;
+            n = map1d->Order * comps;
+         }
+         else {
+            data = map2d->Points;
+            n = map2d->Uorder * map2d->Vorder * comps;
+         }
+	 if (data) {
+	    for (i=0;i<n;i++) {
+	       v[i] = IROUND(data[i]);
+	    }
+	 }
+         break;
+      case GL_ORDER:
+         if (map1d) {
+            v[0] = map1d->Order;
+         }
+         else {
+            v[0] = map2d->Uorder;
+            v[1] = map2d->Vorder;
+         }
+         break;
+      case GL_DOMAIN:
+         if (map1d) {
+            v[0] = IROUND(map1d->u1);
+            v[1] = IROUND(map1d->u2);
+         }
+         else {
+            v[0] = IROUND(map2d->u1);
+            v[1] = IROUND(map2d->u2);
+            v[2] = IROUND(map2d->v1);
+            v[3] = IROUND(map2d->v2);
+         }
+         break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetMapiv(query)" );
+   }
+}
+
+
+
+void GLAPIENTRY
+_mesa_MapGrid1f( GLint un, GLfloat u1, GLfloat u2 )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (un<1) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glMapGrid1f" );
+      return;
+   }
+   FLUSH_VERTICES(ctx, _NEW_EVAL);
+   ctx->Eval.MapGrid1un = un;
+   ctx->Eval.MapGrid1u1 = u1;
+   ctx->Eval.MapGrid1u2 = u2;
+   ctx->Eval.MapGrid1du = (u2 - u1) / (GLfloat) un;
+}
+
+
+void GLAPIENTRY
+_mesa_MapGrid1d( GLint un, GLdouble u1, GLdouble u2 )
+{
+   _mesa_MapGrid1f( un, (GLfloat) u1, (GLfloat) u2 );
+}
+
+
+void GLAPIENTRY
+_mesa_MapGrid2f( GLint un, GLfloat u1, GLfloat u2,
+                 GLint vn, GLfloat v1, GLfloat v2 )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (un<1) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glMapGrid2f(un)" );
+      return;
+   }
+   if (vn<1) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glMapGrid2f(vn)" );
+      return;
+   }
+
+   FLUSH_VERTICES(ctx, _NEW_EVAL);
+   ctx->Eval.MapGrid2un = un;
+   ctx->Eval.MapGrid2u1 = u1;
+   ctx->Eval.MapGrid2u2 = u2;
+   ctx->Eval.MapGrid2du = (u2 - u1) / (GLfloat) un;
+   ctx->Eval.MapGrid2vn = vn;
+   ctx->Eval.MapGrid2v1 = v1;
+   ctx->Eval.MapGrid2v2 = v2;
+   ctx->Eval.MapGrid2dv = (v2 - v1) / (GLfloat) vn;
+}
+
+
+void GLAPIENTRY
+_mesa_MapGrid2d( GLint un, GLdouble u1, GLdouble u2,
+                 GLint vn, GLdouble v1, GLdouble v2 )
+{
+   _mesa_MapGrid2f( un, (GLfloat) u1, (GLfloat) u2, 
+		    vn, (GLfloat) v1, (GLfloat) v2 );
+}
+
+
+
+/**********************************************************************/
+/*****                      Initialization                        *****/
+/**********************************************************************/
+
+/**
+ * Initialize a 1-D evaluator map.
+ */
+static void
+init_1d_map( struct gl_1d_map *map, int n, const float *initial )
+{
+   map->Order = 1;
+   map->u1 = 0.0;
+   map->u2 = 1.0;
+   map->Points = (GLfloat *) MALLOC(n * sizeof(GLfloat));
+   if (map->Points) {
+      GLint i;
+      for (i=0;i<n;i++)
+         map->Points[i] = initial[i];
+   }
+}
+
+
+/**
+ * Initialize a 2-D evaluator map 
+ */
+static void
+init_2d_map( struct gl_2d_map *map, int n, const float *initial )
+{
+   map->Uorder = 1;
+   map->Vorder = 1;
+   map->u1 = 0.0;
+   map->u2 = 1.0;
+   map->v1 = 0.0;
+   map->v2 = 1.0;
+   map->Points = (GLfloat *) MALLOC(n * sizeof(GLfloat));
+   if (map->Points) {
+      GLint i;
+      for (i=0;i<n;i++)
+         map->Points[i] = initial[i];
+   }
+}
+
+
+void _mesa_init_eval( GLcontext *ctx )
+{
+   int i;
+
+   /* Evaluators group */
+   ctx->Eval.Map1Color4 = GL_FALSE;
+   ctx->Eval.Map1Index = GL_FALSE;
+   ctx->Eval.Map1Normal = GL_FALSE;
+   ctx->Eval.Map1TextureCoord1 = GL_FALSE;
+   ctx->Eval.Map1TextureCoord2 = GL_FALSE;
+   ctx->Eval.Map1TextureCoord3 = GL_FALSE;
+   ctx->Eval.Map1TextureCoord4 = GL_FALSE;
+   ctx->Eval.Map1Vertex3 = GL_FALSE;
+   ctx->Eval.Map1Vertex4 = GL_FALSE;
+   MEMSET(ctx->Eval.Map1Attrib, 0, sizeof(ctx->Eval.Map1Attrib));
+   ctx->Eval.Map2Color4 = GL_FALSE;
+   ctx->Eval.Map2Index = GL_FALSE;
+   ctx->Eval.Map2Normal = GL_FALSE;
+   ctx->Eval.Map2TextureCoord1 = GL_FALSE;
+   ctx->Eval.Map2TextureCoord2 = GL_FALSE;
+   ctx->Eval.Map2TextureCoord3 = GL_FALSE;
+   ctx->Eval.Map2TextureCoord4 = GL_FALSE;
+   ctx->Eval.Map2Vertex3 = GL_FALSE;
+   ctx->Eval.Map2Vertex4 = GL_FALSE;
+   MEMSET(ctx->Eval.Map2Attrib, 0, sizeof(ctx->Eval.Map2Attrib));
+   ctx->Eval.AutoNormal = GL_FALSE;
+   ctx->Eval.MapGrid1un = 1;
+   ctx->Eval.MapGrid1u1 = 0.0;
+   ctx->Eval.MapGrid1u2 = 1.0;
+   ctx->Eval.MapGrid2un = 1;
+   ctx->Eval.MapGrid2vn = 1;
+   ctx->Eval.MapGrid2u1 = 0.0;
+   ctx->Eval.MapGrid2u2 = 1.0;
+   ctx->Eval.MapGrid2v1 = 0.0;
+   ctx->Eval.MapGrid2v2 = 1.0;
+
+   /* Evaluator data */
+   {
+      static GLfloat vertex[4] = { 0.0, 0.0, 0.0, 1.0 };
+      static GLfloat normal[3] = { 0.0, 0.0, 1.0 };
+      static GLfloat index[1] = { 1.0 };
+      static GLfloat color[4] = { 1.0, 1.0, 1.0, 1.0 };
+      static GLfloat texcoord[4] = { 0.0, 0.0, 0.0, 1.0 };
+      static GLfloat attrib[4] = { 0.0, 0.0, 0.0, 1.0 };
+
+      init_1d_map( &ctx->EvalMap.Map1Vertex3, 3, vertex );
+      init_1d_map( &ctx->EvalMap.Map1Vertex4, 4, vertex );
+      init_1d_map( &ctx->EvalMap.Map1Index, 1, index );
+      init_1d_map( &ctx->EvalMap.Map1Color4, 4, color );
+      init_1d_map( &ctx->EvalMap.Map1Normal, 3, normal );
+      init_1d_map( &ctx->EvalMap.Map1Texture1, 1, texcoord );
+      init_1d_map( &ctx->EvalMap.Map1Texture2, 2, texcoord );
+      init_1d_map( &ctx->EvalMap.Map1Texture3, 3, texcoord );
+      init_1d_map( &ctx->EvalMap.Map1Texture4, 4, texcoord );
+      for (i = 0; i < 16; i++)
+         init_1d_map( ctx->EvalMap.Map1Attrib + i, 4, attrib );
+
+      init_2d_map( &ctx->EvalMap.Map2Vertex3, 3, vertex );
+      init_2d_map( &ctx->EvalMap.Map2Vertex4, 4, vertex );
+      init_2d_map( &ctx->EvalMap.Map2Index, 1, index );
+      init_2d_map( &ctx->EvalMap.Map2Color4, 4, color );
+      init_2d_map( &ctx->EvalMap.Map2Normal, 3, normal );
+      init_2d_map( &ctx->EvalMap.Map2Texture1, 1, texcoord );
+      init_2d_map( &ctx->EvalMap.Map2Texture2, 2, texcoord );
+      init_2d_map( &ctx->EvalMap.Map2Texture3, 3, texcoord );
+      init_2d_map( &ctx->EvalMap.Map2Texture4, 4, texcoord );
+      for (i = 0; i < 16; i++)
+         init_2d_map( ctx->EvalMap.Map2Attrib + i, 4, attrib );
+   }
+}
+
+
+void _mesa_free_eval_data( GLcontext *ctx )
+{
+   int i;
+
+   /* Free evaluator data */
+   if (ctx->EvalMap.Map1Vertex3.Points)
+      FREE( ctx->EvalMap.Map1Vertex3.Points );
+   if (ctx->EvalMap.Map1Vertex4.Points)
+      FREE( ctx->EvalMap.Map1Vertex4.Points );
+   if (ctx->EvalMap.Map1Index.Points)
+      FREE( ctx->EvalMap.Map1Index.Points );
+   if (ctx->EvalMap.Map1Color4.Points)
+      FREE( ctx->EvalMap.Map1Color4.Points );
+   if (ctx->EvalMap.Map1Normal.Points)
+      FREE( ctx->EvalMap.Map1Normal.Points );
+   if (ctx->EvalMap.Map1Texture1.Points)
+      FREE( ctx->EvalMap.Map1Texture1.Points );
+   if (ctx->EvalMap.Map1Texture2.Points)
+      FREE( ctx->EvalMap.Map1Texture2.Points );
+   if (ctx->EvalMap.Map1Texture3.Points)
+      FREE( ctx->EvalMap.Map1Texture3.Points );
+   if (ctx->EvalMap.Map1Texture4.Points)
+      FREE( ctx->EvalMap.Map1Texture4.Points );
+   for (i = 0; i < 16; i++)
+      FREE((ctx->EvalMap.Map1Attrib[i].Points));
+
+   if (ctx->EvalMap.Map2Vertex3.Points)
+      FREE( ctx->EvalMap.Map2Vertex3.Points );
+   if (ctx->EvalMap.Map2Vertex4.Points)
+      FREE( ctx->EvalMap.Map2Vertex4.Points );
+   if (ctx->EvalMap.Map2Index.Points)
+      FREE( ctx->EvalMap.Map2Index.Points );
+   if (ctx->EvalMap.Map2Color4.Points)
+      FREE( ctx->EvalMap.Map2Color4.Points );
+   if (ctx->EvalMap.Map2Normal.Points)
+      FREE( ctx->EvalMap.Map2Normal.Points );
+   if (ctx->EvalMap.Map2Texture1.Points)
+      FREE( ctx->EvalMap.Map2Texture1.Points );
+   if (ctx->EvalMap.Map2Texture2.Points)
+      FREE( ctx->EvalMap.Map2Texture2.Points );
+   if (ctx->EvalMap.Map2Texture3.Points)
+      FREE( ctx->EvalMap.Map2Texture3.Points );
+   if (ctx->EvalMap.Map2Texture4.Points)
+      FREE( ctx->EvalMap.Map2Texture4.Points );
+   for (i = 0; i < 16; i++)
+      FREE((ctx->EvalMap.Map2Attrib[i].Points));
+}
diff --git a/reactos/lib/mesa32/src/main/eval.h b/reactos/lib/mesa32/src/main/eval.h
new file mode 100644
index 00000000000..b3ff0a96f82
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/eval.h
@@ -0,0 +1,128 @@
+/**
+ * \file eval.h
+ * Eval operations.
+ * 
+ * \if subset
+ * (No-op)
+ *
+ * \endif
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef EVAL_H
+#define EVAL_H
+
+
+#include "mtypes.h"
+
+#if _HAVE_FULL_GL
+
+extern void _mesa_init_eval( GLcontext *ctx );
+extern void _mesa_free_eval_data( GLcontext *ctx );
+
+
+extern GLuint _mesa_evaluator_components( GLenum target );
+
+
+extern void gl_free_control_points( GLcontext *ctx,
+                                    GLenum target, GLfloat *data );
+
+
+extern GLfloat *_mesa_copy_map_points1f( GLenum target,
+                                      GLint ustride, GLint uorder,
+                                      const GLfloat *points );
+
+extern GLfloat *_mesa_copy_map_points1d( GLenum target,
+                                      GLint ustride, GLint uorder,
+                                      const GLdouble *points );
+
+extern GLfloat *_mesa_copy_map_points2f( GLenum target,
+                                      GLint ustride, GLint uorder,
+                                      GLint vstride, GLint vorder,
+                                      const GLfloat *points );
+
+extern GLfloat *_mesa_copy_map_points2d(GLenum target,
+                                     GLint ustride, GLint uorder,
+                                     GLint vstride, GLint vorder,
+                                     const GLdouble *points );
+
+
+
+extern void GLAPIENTRY
+_mesa_Map1f( GLenum target, GLfloat u1, GLfloat u2, GLint stride,
+             GLint order, const GLfloat *points );
+
+extern void GLAPIENTRY
+_mesa_Map2f( GLenum target,
+             GLfloat u1, GLfloat u2, GLint ustride, GLint uorder,
+             GLfloat v1, GLfloat v2, GLint vstride, GLint vorder,
+             const GLfloat *points );
+
+extern void GLAPIENTRY
+_mesa_Map1d( GLenum target, GLdouble u1, GLdouble u2, GLint stride,
+             GLint order, const GLdouble *points );
+
+extern void GLAPIENTRY
+_mesa_Map2d( GLenum target,
+             GLdouble u1, GLdouble u2, GLint ustride, GLint uorder,
+             GLdouble v1, GLdouble v2, GLint vstride, GLint vorder,
+             const GLdouble *points );
+
+extern void GLAPIENTRY
+_mesa_MapGrid1f( GLint un, GLfloat u1, GLfloat u2 );
+
+extern void GLAPIENTRY
+_mesa_MapGrid1d( GLint un, GLdouble u1, GLdouble u2 );
+
+extern void GLAPIENTRY
+_mesa_MapGrid2f( GLint un, GLfloat u1, GLfloat u2,
+                 GLint vn, GLfloat v1, GLfloat v2 );
+
+extern void GLAPIENTRY
+_mesa_MapGrid2d( GLint un, GLdouble u1, GLdouble u2,
+                 GLint vn, GLdouble v1, GLdouble v2 );
+
+extern void GLAPIENTRY
+_mesa_GetMapdv( GLenum target, GLenum query, GLdouble *v );
+
+extern void GLAPIENTRY
+_mesa_GetMapfv( GLenum target, GLenum query, GLfloat *v );
+
+extern void GLAPIENTRY
+_mesa_GetMapiv( GLenum target, GLenum query, GLint *v );
+
+#else
+
+/** No-op */
+#define _mesa_init_eval( c ) ((void)0)
+
+/** No-op */
+#define _mesa_free_eval_data( c ) ((void)0)
+
+#endif
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/extensions.c b/reactos/lib/mesa32/src/main/extensions.c
new file mode 100644
index 00000000000..1e9ce3e54e3
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/extensions.c
@@ -0,0 +1,450 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0.1
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "imports.h"
+#include "context.h"
+#include "extensions.h"
+#include "simple_list.h"
+#include "mtypes.h"
+
+
+#define F(x) (int)(unsigned long)&(((struct gl_extensions *)0)->x)
+#define ON GL_TRUE
+#define OFF GL_FALSE
+
+
+static const struct {
+   GLboolean enabled;
+   const char *name;
+   int flag_offset;
+} default_extensions[] = {
+   { OFF, "GL_ARB_depth_texture",              F(ARB_depth_texture) },
+   { OFF, "GL_ARB_fragment_program",           F(ARB_fragment_program) },
+   { OFF, "GL_ARB_imaging",                    F(ARB_imaging) },
+   { OFF, "GL_ARB_multisample",                F(ARB_multisample) },
+   { OFF, "GL_ARB_multitexture",               F(ARB_multitexture) },
+   { OFF, "GL_ARB_occlusion_query",            F(ARB_occlusion_query) },
+   { OFF, "GL_ARB_point_parameters",           F(EXT_point_parameters) },
+   { OFF, "GL_ARB_point_sprite",               F(ARB_point_sprite) },
+   { OFF, "GL_ARB_shadow",                     F(ARB_shadow) },
+   { OFF, "GL_ARB_shadow_ambient",             F(SGIX_shadow_ambient) },
+   { OFF, "GL_ARB_texture_border_clamp",       F(ARB_texture_border_clamp) },
+   { OFF, "GL_ARB_texture_compression",        F(ARB_texture_compression) },
+   { OFF, "GL_ARB_texture_cube_map",           F(ARB_texture_cube_map) },
+   { OFF, "GL_ARB_texture_env_add",            F(EXT_texture_env_add) },
+   { OFF, "GL_ARB_texture_env_combine",        F(ARB_texture_env_combine) },
+   { OFF, "GL_ARB_texture_env_crossbar",       F(ARB_texture_env_crossbar) },
+   { OFF, "GL_ARB_texture_env_dot3",           F(ARB_texture_env_dot3) },
+   { OFF, "GL_ARB_texture_mirrored_repeat",    F(ARB_texture_mirrored_repeat)},
+   { OFF, "GL_ARB_texture_non_power_of_two",   F(ARB_texture_non_power_of_two)},
+   { ON,  "GL_ARB_transpose_matrix",           F(ARB_transpose_matrix) },
+   { OFF, "GL_ARB_vertex_buffer_object",       F(ARB_vertex_buffer_object) },
+   { OFF, "GL_ARB_vertex_program",             F(ARB_vertex_program) },
+   { ON,  "GL_ARB_window_pos",                 F(ARB_window_pos) },
+   { ON,  "GL_EXT_abgr",                       F(EXT_abgr) },
+   { ON,  "GL_EXT_bgra",                       F(EXT_bgra) },
+   { OFF, "GL_EXT_blend_color",                F(EXT_blend_color) },
+   { OFF, "GL_EXT_blend_equation_separate",    F(EXT_blend_equation_separate) },
+   { OFF, "GL_EXT_blend_func_separate",        F(EXT_blend_func_separate) },
+   { OFF, "GL_EXT_blend_logic_op",             F(EXT_blend_logic_op) },
+   { OFF, "GL_EXT_blend_minmax",               F(EXT_blend_minmax) },
+   { OFF, "GL_EXT_blend_subtract",             F(EXT_blend_subtract) },
+   { ON,  "GL_EXT_clip_volume_hint",           F(EXT_clip_volume_hint) },
+   { ON,  "GL_EXT_compiled_vertex_array",      F(EXT_compiled_vertex_array) },
+   { OFF, "GL_EXT_convolution",                F(EXT_convolution) },
+   { ON,  "GL_EXT_copy_texture",               F(EXT_copy_texture) },
+   { OFF, "GL_EXT_depth_bounds_test",          F(EXT_depth_bounds_test) },
+   { ON,  "GL_EXT_draw_range_elements",        F(EXT_draw_range_elements) },
+   { OFF, "GL_EXT_fog_coord",                  F(EXT_fog_coord) },
+   { OFF, "GL_EXT_histogram",                  F(EXT_histogram) },
+   { OFF, "GL_EXT_multi_draw_arrays",          F(EXT_multi_draw_arrays) },
+   { ON,  "GL_EXT_packed_pixels",              F(EXT_packed_pixels) },
+   { OFF, "GL_EXT_paletted_texture",           F(EXT_paletted_texture) },
+   { OFF, "GL_EXT_point_parameters",           F(EXT_point_parameters) },
+   { ON,  "GL_EXT_polygon_offset",             F(EXT_polygon_offset) },
+   { ON,  "GL_EXT_rescale_normal",             F(EXT_rescale_normal) },
+   { OFF, "GL_EXT_secondary_color",            F(EXT_secondary_color) },
+   { ON,  "GL_EXT_separate_specular_color",    F(EXT_separate_specular_color) },
+   { OFF, "GL_EXT_shadow_funcs",               F(EXT_shadow_funcs) },
+   { OFF, "GL_EXT_shared_texture_palette",     F(EXT_shared_texture_palette) },
+   { OFF, "GL_EXT_stencil_two_side",           F(EXT_stencil_two_side) },
+   { OFF, "GL_EXT_stencil_wrap",               F(EXT_stencil_wrap) },
+   { ON,  "GL_EXT_subtexture",                 F(EXT_subtexture) },
+   { ON,  "GL_EXT_texture",                    F(EXT_texture) },
+   { ON,  "GL_EXT_texture3D",                  F(EXT_texture3D) },
+   { OFF, "GL_EXT_texture_compression_s3tc",   F(EXT_texture_compression_s3tc) },
+   { ON,  "GL_EXT_texture_edge_clamp",         F(SGIS_texture_edge_clamp) },
+   { OFF, "GL_EXT_texture_env_add",            F(EXT_texture_env_add) },
+   { OFF, "GL_EXT_texture_env_combine",        F(EXT_texture_env_combine) },
+   { OFF, "GL_EXT_texture_env_dot3",           F(EXT_texture_env_dot3) },
+   { OFF, "GL_EXT_texture_filter_anisotropic", F(EXT_texture_filter_anisotropic) },
+   { OFF, "GL_EXT_texture_lod_bias",           F(EXT_texture_lod_bias) },
+   { OFF, "GL_EXT_texture_mirror_clamp",       F(EXT_texture_mirror_clamp) },
+   { ON,  "GL_EXT_texture_object",             F(EXT_texture_object) },
+   { OFF, "GL_EXT_texture_rectangle",          F(NV_texture_rectangle) },
+   { ON,  "GL_EXT_vertex_array",               F(EXT_vertex_array) },
+   { OFF, "GL_EXT_vertex_array_set",           F(EXT_vertex_array_set) },
+   { OFF, "GL_3DFX_texture_compression_FXT1",  F(TDFX_texture_compression_FXT1) },
+   { OFF, "GL_APPLE_client_storage",           F(APPLE_client_storage) },
+   { ON,  "GL_APPLE_packed_pixels",            F(APPLE_packed_pixels) },
+   { OFF, "GL_ATI_blend_equation_separate",    F(EXT_blend_equation_separate) },
+   { OFF, "GL_ATI_texture_env_combine3",       F(ATI_texture_env_combine3)},
+   { OFF, "GL_ATI_texture_mirror_once",        F(ATI_texture_mirror_once)},
+   { OFF, "GL_HP_occlusion_test",              F(HP_occlusion_test) },
+   { OFF, "GL_IBM_multimode_draw_arrays",      F(IBM_multimode_draw_arrays) },
+   { ON,  "GL_IBM_rasterpos_clip",             F(IBM_rasterpos_clip) },
+   { OFF, "GL_IBM_texture_mirrored_repeat",    F(ARB_texture_mirrored_repeat)},
+   { OFF, "GL_INGR_blend_func_separate",       F(EXT_blend_func_separate) },
+   { OFF, "GL_MESA_pack_invert",               F(MESA_pack_invert) },
+   { OFF, "GL_MESA_packed_depth_stencil",      F(MESA_packed_depth_stencil) },
+   { OFF, "GL_MESA_program_debug",             F(MESA_program_debug) },
+   { OFF, "GL_MESA_resize_buffers",            F(MESA_resize_buffers) },
+   { OFF, "GL_MESA_ycbcr_texture",             F(MESA_ycbcr_texture) },
+   { ON,  "GL_MESA_window_pos",                F(ARB_window_pos) },
+   { OFF, "GL_NV_blend_square",                F(NV_blend_square) },
+   { OFF, "GL_NV_fragment_program",            F(NV_fragment_program) },
+   { ON,  "GL_NV_light_max_exponent",          F(NV_light_max_exponent) },
+   { OFF, "GL_NV_point_sprite",                F(NV_point_sprite) },
+   { OFF, "GL_NV_texture_rectangle",           F(NV_texture_rectangle) },
+   { ON,  "GL_NV_texgen_reflection",           F(NV_texgen_reflection) },
+   { OFF, "GL_NV_vertex_program",              F(NV_vertex_program) },
+   { OFF, "GL_NV_vertex_program1_1",           F(NV_vertex_program1_1) },
+   { OFF, "GL_SGI_color_matrix",               F(SGI_color_matrix) },
+   { OFF, "GL_SGI_color_table",                F(SGI_color_table) },
+   { OFF, "GL_SGI_texture_color_table",        F(SGI_texture_color_table) },
+   { OFF, "GL_SGIS_generate_mipmap",           F(SGIS_generate_mipmap) },
+   { OFF, "GL_SGIS_pixel_texture",             F(SGIS_pixel_texture) },
+   { OFF, "GL_SGIS_texture_border_clamp",      F(ARB_texture_border_clamp) },
+   { ON,  "GL_SGIS_texture_edge_clamp",        F(SGIS_texture_edge_clamp) },
+   { ON,  "GL_SGIS_texture_lod",               F(SGIS_texture_lod) },
+   { OFF, "GL_SGIX_depth_texture",             F(SGIX_depth_texture) },
+   { OFF, "GL_SGIX_pixel_texture",             F(SGIX_pixel_texture) },
+   { OFF, "GL_SGIX_shadow",                    F(SGIX_shadow) },
+   { OFF, "GL_SGIX_shadow_ambient",            F(SGIX_shadow_ambient) },
+   { OFF, "GL_SUN_multi_draw_arrays",          F(EXT_multi_draw_arrays) },
+   { OFF, "GL_S3_s3tc",                        F(S3_s3tc) },
+};
+
+
+
+/**
+ * Enable all extensions suitable for a software-only renderer.
+ * This is a convenience function used by the XMesa, OSMesa, GGI drivers, etc.
+ */
+void
+_mesa_enable_sw_extensions(GLcontext *ctx)
+{
+   ctx->Extensions.ARB_depth_texture = GL_TRUE;
+#if FEATURE_ARB_fragment_program
+   /*ctx->Extensions.ARB_fragment_program = GL_TRUE;*/
+#endif
+   ctx->Extensions.ARB_imaging = GL_TRUE;
+   ctx->Extensions.ARB_multitexture = GL_TRUE;
+#if FEATURE_ARB_occlusion_query
+   ctx->Extensions.ARB_occlusion_query = GL_TRUE;
+#endif
+   ctx->Extensions.ARB_point_sprite = GL_TRUE;
+   ctx->Extensions.ARB_shadow = GL_TRUE;
+   ctx->Extensions.ARB_texture_border_clamp = GL_TRUE;
+   ctx->Extensions.ARB_texture_cube_map = GL_TRUE;
+   ctx->Extensions.ARB_texture_env_combine = GL_TRUE;
+   ctx->Extensions.ARB_texture_env_crossbar = GL_TRUE;
+   ctx->Extensions.ARB_texture_env_dot3 = GL_TRUE;
+   ctx->Extensions.ARB_texture_mirrored_repeat = GL_TRUE;
+   ctx->Extensions.ARB_texture_non_power_of_two = GL_TRUE;
+#if FEATURE_ARB_vertex_program
+   /*ctx->Extensions.ARB_vertex_program = GL_TRUE;*/
+#endif
+#if FEATURE_ARB_vertex_buffer_object
+   ctx->Extensions.ARB_vertex_buffer_object = GL_TRUE;
+#endif
+   ctx->Extensions.ATI_texture_env_combine3 = GL_TRUE;
+   ctx->Extensions.ATI_texture_mirror_once = GL_TRUE;
+   ctx->Extensions.EXT_blend_color = GL_TRUE;
+   ctx->Extensions.EXT_blend_func_separate = GL_TRUE;
+   ctx->Extensions.EXT_blend_logic_op = GL_TRUE;
+   ctx->Extensions.EXT_blend_minmax = GL_TRUE;
+   ctx->Extensions.EXT_blend_subtract = GL_TRUE;
+   ctx->Extensions.EXT_convolution = GL_TRUE;
+   ctx->Extensions.EXT_depth_bounds_test = GL_TRUE;
+   ctx->Extensions.EXT_fog_coord = GL_TRUE;
+   ctx->Extensions.EXT_histogram = GL_TRUE;
+   ctx->Extensions.EXT_multi_draw_arrays = GL_TRUE;
+   ctx->Extensions.EXT_paletted_texture = GL_TRUE;
+   ctx->Extensions.EXT_point_parameters = GL_TRUE;
+   ctx->Extensions.EXT_shadow_funcs = GL_TRUE;
+   ctx->Extensions.EXT_secondary_color = GL_TRUE;
+   ctx->Extensions.EXT_shared_texture_palette = GL_TRUE;
+   ctx->Extensions.EXT_stencil_wrap = GL_TRUE;
+   ctx->Extensions.EXT_stencil_two_side = GL_TRUE;
+   ctx->Extensions.EXT_texture_env_add = GL_TRUE;
+   ctx->Extensions.EXT_texture_env_combine = GL_TRUE;
+   ctx->Extensions.EXT_texture_env_dot3 = GL_TRUE;
+   ctx->Extensions.EXT_texture_mirror_clamp = GL_TRUE;
+   ctx->Extensions.EXT_texture_lod_bias = GL_TRUE;
+   ctx->Extensions.HP_occlusion_test = GL_TRUE;
+   ctx->Extensions.IBM_multimode_draw_arrays = GL_TRUE;
+   ctx->Extensions.MESA_pack_invert = GL_TRUE;
+#if FEATURE_MESA_program_debug
+   ctx->Extensions.MESA_program_debug = GL_TRUE;
+#endif
+   ctx->Extensions.MESA_resize_buffers = GL_TRUE;
+   ctx->Extensions.MESA_ycbcr_texture = GL_TRUE;
+   ctx->Extensions.NV_blend_square = GL_TRUE;
+   /*ctx->Extensions.NV_light_max_exponent = GL_TRUE;*/
+   ctx->Extensions.NV_point_sprite = GL_TRUE;
+   ctx->Extensions.NV_texture_rectangle = GL_TRUE;
+   /*ctx->Extensions.NV_texgen_reflection = GL_TRUE;*/
+#if FEATURE_NV_vertex_program
+   ctx->Extensions.NV_vertex_program = GL_TRUE;
+   ctx->Extensions.NV_vertex_program1_1 = GL_TRUE;
+#endif
+#if FEATURE_NV_fragment_program
+   ctx->Extensions.NV_fragment_program = GL_TRUE;
+#endif
+   ctx->Extensions.SGI_color_matrix = GL_TRUE;
+   ctx->Extensions.SGI_color_table = GL_TRUE;
+   ctx->Extensions.SGI_texture_color_table = GL_TRUE;
+   ctx->Extensions.SGIS_generate_mipmap = GL_TRUE;
+   ctx->Extensions.SGIS_pixel_texture = GL_TRUE;
+   ctx->Extensions.SGIS_texture_edge_clamp = GL_TRUE;
+   ctx->Extensions.SGIX_depth_texture = GL_TRUE;
+   ctx->Extensions.SGIX_pixel_texture = GL_TRUE;
+   ctx->Extensions.SGIX_shadow = GL_TRUE;
+   ctx->Extensions.SGIX_shadow_ambient = GL_TRUE;
+}
+
+
+/**
+ * Enable GL_ARB_imaging and all the EXT extensions that are subsets of it.
+ */
+void
+_mesa_enable_imaging_extensions(GLcontext *ctx)
+{
+   ctx->Extensions.ARB_imaging = GL_TRUE;
+   ctx->Extensions.EXT_blend_color = GL_TRUE;
+   ctx->Extensions.EXT_blend_minmax = GL_TRUE;
+   ctx->Extensions.EXT_blend_subtract = GL_TRUE;
+   ctx->Extensions.EXT_convolution = GL_TRUE;
+   ctx->Extensions.EXT_histogram = GL_TRUE;
+   ctx->Extensions.SGI_color_matrix = GL_TRUE;
+   ctx->Extensions.SGI_color_table = GL_TRUE;
+}
+
+
+
+/**
+ * Enable all OpenGL 1.3 features and extensions.
+ * A convenience function to be called by drivers.
+ */
+void
+_mesa_enable_1_3_extensions(GLcontext *ctx)
+{
+   ctx->Extensions.ARB_multisample = GL_TRUE;
+   ctx->Extensions.ARB_multitexture = GL_TRUE;
+   ctx->Extensions.ARB_texture_border_clamp = GL_TRUE;
+   ctx->Extensions.ARB_texture_compression = GL_TRUE;
+   ctx->Extensions.ARB_texture_cube_map = GL_TRUE;
+   ctx->Extensions.ARB_texture_env_combine = GL_TRUE;
+   ctx->Extensions.ARB_texture_env_dot3 = GL_TRUE;
+   ctx->Extensions.EXT_texture_env_add = GL_TRUE;
+   /*ctx->Extensions.ARB_transpose_matrix = GL_TRUE;*/
+}
+
+
+
+/**
+ * Enable all OpenGL 1.4 features and extensions.
+ * A convenience function to be called by drivers.
+ */
+void
+_mesa_enable_1_4_extensions(GLcontext *ctx)
+{
+   ctx->Extensions.ARB_depth_texture = GL_TRUE;
+   ctx->Extensions.ARB_fragment_program = GL_TRUE;
+   ctx->Extensions.ARB_shadow = GL_TRUE;
+   ctx->Extensions.ARB_texture_env_crossbar = GL_TRUE;
+   ctx->Extensions.ARB_texture_mirrored_repeat = GL_TRUE;
+   ctx->Extensions.ARB_vertex_program = GL_TRUE;
+   ctx->Extensions.ARB_window_pos = GL_TRUE;
+   ctx->Extensions.EXT_blend_color = GL_TRUE;
+   ctx->Extensions.EXT_blend_func_separate = GL_TRUE;
+   ctx->Extensions.EXT_blend_logic_op = GL_TRUE;
+   ctx->Extensions.EXT_blend_minmax = GL_TRUE;
+   ctx->Extensions.EXT_blend_subtract = GL_TRUE;
+   ctx->Extensions.EXT_fog_coord = GL_TRUE;
+   ctx->Extensions.EXT_multi_draw_arrays = GL_TRUE;
+   ctx->Extensions.EXT_point_parameters = GL_TRUE;
+   ctx->Extensions.EXT_secondary_color = GL_TRUE;
+   ctx->Extensions.EXT_stencil_wrap = GL_TRUE;
+   ctx->Extensions.EXT_texture_lod_bias = GL_TRUE;
+   ctx->Extensions.SGIS_generate_mipmap = GL_TRUE;
+}
+
+
+/**
+ * Enable all OpenGL 1.5 features and extensions.
+ * A convenience function to be called by drivers.
+ */
+void
+_mesa_enable_1_5_extensions(GLcontext *ctx)
+{
+   ctx->Extensions.ARB_occlusion_query = GL_TRUE;
+   ctx->Extensions.ARB_vertex_buffer_object = GL_TRUE;
+   ctx->Extensions.ARB_texture_non_power_of_two = GL_TRUE;
+   ctx->Extensions.EXT_shadow_funcs = GL_TRUE;
+}
+
+
+/**
+ * Either enable or disable the named extension.
+ */
+static void
+set_extension( GLcontext *ctx, const char *name, GLboolean state )
+{
+   GLboolean *base = (GLboolean *) &ctx->Extensions;
+   GLuint i;
+
+   if (ctx->Extensions.String) {
+      /* The string was already queried - can't change it now! */
+      _mesa_problem(ctx, "Trying to enable/disable extension after glGetString(GL_EXTENSIONS): %s", name);
+      return;
+   }
+
+   for (i = 0 ; i < Elements(default_extensions) ; i++) {
+      if (_mesa_strcmp(default_extensions[i].name, name) == 0) {
+         if (default_extensions[i].flag_offset) {
+            GLboolean *enabled = base + default_extensions[i].flag_offset;
+            *enabled = state;
+         }
+         return;
+      }
+   }
+   _mesa_problem(ctx, "Trying to enable unknown extension: %s", name);
+}
+
+
+/**
+ * Enable the named extension.
+ * Typically called by drivers.
+ */
+void
+_mesa_enable_extension( GLcontext *ctx, const char *name )
+{
+   set_extension(ctx, name, GL_TRUE);
+}
+
+
+/**
+ * Disable the named extension.
+ * XXX is this really needed???
+ */
+void
+_mesa_disable_extension( GLcontext *ctx, const char *name )
+{
+   set_extension(ctx, name, GL_FALSE);
+}
+
+
+/**
+ * Test if the named extension is enabled in this context.
+ */
+GLboolean
+_mesa_extension_is_enabled( GLcontext *ctx, const char *name )
+{
+   const GLboolean *base = (const GLboolean *) &ctx->Extensions;
+   GLuint i;
+
+   for (i = 0 ; i < Elements(default_extensions) ; i++) {
+      if (_mesa_strcmp(default_extensions[i].name, name) == 0) {
+         if (!default_extensions[i].flag_offset)
+            return GL_TRUE;
+         return *(base + default_extensions[i].flag_offset);
+      }
+   }
+   return GL_FALSE;
+}
+
+
+/**
+ * Run through the default_extensions array above and set the
+ * ctx->Extensions.ARB/EXT_* flags accordingly.
+ * To be called during context initialization.
+ */
+void
+_mesa_init_extensions( GLcontext *ctx )
+{
+   GLboolean *base = (GLboolean *) &ctx->Extensions;
+   GLuint i;
+
+   for (i = 0 ; i < Elements(default_extensions) ; i++) {
+      if (default_extensions[i].enabled &&
+          default_extensions[i].flag_offset) {
+         *(base + default_extensions[i].flag_offset) = GL_TRUE;
+      }
+   }
+}
+
+
+/**
+ * Construct the GL_EXTENSIONS string.  Called the first time that
+ * glGetString(GL_EXTENSIONS) is called.
+ */
+GLubyte *
+_mesa_make_extension_string( GLcontext *ctx )
+{
+   const GLboolean *base = (const GLboolean *) &ctx->Extensions;
+   GLuint extStrLen = 0;
+   GLubyte *s;
+   GLuint i;
+
+   /* first, compute length of the extension string */
+   for (i = 0 ; i < Elements(default_extensions) ; i++) {
+      if (!default_extensions[i].flag_offset ||
+          *(base + default_extensions[i].flag_offset)) {
+         extStrLen += _mesa_strlen(default_extensions[i].name) + 1;
+      }
+   }
+   s = (GLubyte *) _mesa_malloc(extStrLen);
+
+   /* second, build the extension string */
+   extStrLen = 0;
+   for (i = 0 ; i < Elements(default_extensions) ; i++) {
+      if (!default_extensions[i].flag_offset ||
+          *(base + default_extensions[i].flag_offset)) {
+         GLuint len = _mesa_strlen(default_extensions[i].name);
+         _mesa_memcpy(s + extStrLen, default_extensions[i].name, len);
+         extStrLen += len;
+         s[extStrLen] = (GLubyte) ' ';
+         extStrLen++;
+      }
+   }
+   ASSERT(extStrLen > 0);
+
+   s[extStrLen - 1] = 0;
+
+   return s;
+}
diff --git a/reactos/lib/mesa32/src/main/extensions.h b/reactos/lib/mesa32/src/main/extensions.h
new file mode 100644
index 00000000000..54aa25511b4
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/extensions.h
@@ -0,0 +1,82 @@
+/**
+ * \file extensions.h
+ * Extension handling.
+ * 
+ * \if subset
+ * (No-op)
+ *
+ * \endif
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef _EXTENSIONS_H_
+#define _EXTENSIONS_H_
+
+#include "mtypes.h"
+
+#if _HAVE_FULL_GL
+
+extern void _mesa_enable_sw_extensions(GLcontext *ctx);
+
+extern void _mesa_enable_imaging_extensions(GLcontext *ctx);
+
+extern void _mesa_enable_1_3_extensions(GLcontext *ctx);
+
+extern void _mesa_enable_1_4_extensions(GLcontext *ctx);
+
+extern void _mesa_enable_1_5_extensions(GLcontext *ctx);
+
+extern void _mesa_enable_extension(GLcontext *ctx, const char *name);
+
+extern void _mesa_disable_extension(GLcontext *ctx, const char *name);
+
+extern GLboolean _mesa_extension_is_enabled(GLcontext *ctx, const char *name);
+
+extern void _mesa_init_extensions(GLcontext *ctx);
+
+extern GLubyte *_mesa_make_extension_string(GLcontext *ctx);
+
+#else
+
+/** No-op */
+#define _mesa_extensions_dtr( ctx ) ((void)0)
+
+/** No-op */
+#define _mesa_extensions_ctr( ctx ) ((void)0)
+
+/** No-op */
+#define _mesa_extensions_get_string( ctx ) "GL_EXT_texture_object"
+
+/** No-op */
+#define _mesa_enable_imaging_extensions( c ) ((void)0)
+
+/** No-op */
+#define _mesa_enable_extension( c, n ) ((void)0)
+
+#endif
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/feedback.c b/reactos/lib/mesa32/src/main/feedback.c
new file mode 100644
index 00000000000..69b235a3e57
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/feedback.c
@@ -0,0 +1,529 @@
+/**
+ * \file feedback.c
+ * Selection and feedback modes functions.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "colormac.h"
+#include "context.h"
+#include "enums.h"
+#include "feedback.h"
+#include "macros.h"
+#include "mtypes.h"
+
+
+#if _HAVE_FULL_GL
+
+
+#define FB_3D		0x01
+#define FB_4D		0x02
+#define FB_INDEX	0x04
+#define FB_COLOR	0x08
+#define FB_TEXTURE	0X10
+
+
+
+void GLAPIENTRY
+_mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (ctx->RenderMode==GL_FEEDBACK) {
+      _mesa_error( ctx, GL_INVALID_OPERATION, "glFeedbackBuffer" );
+      return;
+   }
+   if (size<0) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glFeedbackBuffer(size<0)" );
+      return;
+   }
+   if (!buffer) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glFeedbackBuffer(buffer==NULL)" );
+      ctx->Feedback.BufferSize = 0;
+      return;
+   }
+
+   switch (type) {
+      case GL_2D:
+	 ctx->Feedback._Mask = 0;
+	 break;
+      case GL_3D:
+	 ctx->Feedback._Mask = FB_3D;
+	 break;
+      case GL_3D_COLOR:
+	 ctx->Feedback._Mask = (FB_3D |
+				(ctx->Visual.rgbMode ? FB_COLOR : FB_INDEX));
+	 break;
+      case GL_3D_COLOR_TEXTURE:
+	 ctx->Feedback._Mask = (FB_3D |
+				(ctx->Visual.rgbMode ? FB_COLOR : FB_INDEX) |
+				FB_TEXTURE);
+	 break;
+      case GL_4D_COLOR_TEXTURE:
+	 ctx->Feedback._Mask = (FB_3D | FB_4D |
+				(ctx->Visual.rgbMode ? FB_COLOR : FB_INDEX) |
+				FB_TEXTURE);
+	 break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glFeedbackBuffer" );
+	 return;
+   }
+
+   FLUSH_VERTICES(ctx, _NEW_RENDERMODE); /* Always flush */
+   ctx->Feedback.Type = type;
+   ctx->Feedback.BufferSize = size;
+   ctx->Feedback.Buffer = buffer;
+   ctx->Feedback.Count = 0;	              /* Becaues of this. */
+}
+
+
+void GLAPIENTRY
+_mesa_PassThrough( GLfloat token )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (ctx->RenderMode==GL_FEEDBACK) {
+      FLUSH_VERTICES(ctx, 0);
+      FEEDBACK_TOKEN( ctx, (GLfloat) (GLint) GL_PASS_THROUGH_TOKEN );
+      FEEDBACK_TOKEN( ctx, token );
+   }
+}
+
+
+
+/*
+ * Put a vertex into the feedback buffer.
+ */
+void _mesa_feedback_vertex( GLcontext *ctx,
+                            const GLfloat win[4],
+                            const GLfloat color[4],
+                            GLfloat index,
+                            const GLfloat texcoord[4] )
+{
+   FEEDBACK_TOKEN( ctx, win[0] );
+   FEEDBACK_TOKEN( ctx, win[1] );
+   if (ctx->Feedback._Mask & FB_3D) {
+      FEEDBACK_TOKEN( ctx, win[2] );
+   }
+   if (ctx->Feedback._Mask & FB_4D) {
+      FEEDBACK_TOKEN( ctx, win[3] );
+   }
+   if (ctx->Feedback._Mask & FB_INDEX) {
+      FEEDBACK_TOKEN( ctx, (GLfloat) index );
+   }
+   if (ctx->Feedback._Mask & FB_COLOR) {
+      FEEDBACK_TOKEN( ctx, color[0] );
+      FEEDBACK_TOKEN( ctx, color[1] );
+      FEEDBACK_TOKEN( ctx, color[2] );
+      FEEDBACK_TOKEN( ctx, color[3] );
+   }
+   if (ctx->Feedback._Mask & FB_TEXTURE) {
+      FEEDBACK_TOKEN( ctx, texcoord[0] );
+      FEEDBACK_TOKEN( ctx, texcoord[1] );
+      FEEDBACK_TOKEN( ctx, texcoord[2] );
+      FEEDBACK_TOKEN( ctx, texcoord[3] );
+   }
+}
+
+#endif
+
+
+/**********************************************************************/
+/** \name Selection */
+/*@{*/
+
+/**
+ * Establish a buffer for selection mode values.
+ * 
+ * \param size buffer size.
+ * \param buffer buffer.
+ *
+ * \sa glSelectBuffer().
+ * 
+ * \note this function can't be put in a display list.
+ * 
+ * Verifies we're not in selection mode, flushes the vertices and initialize
+ * the fields in __GLcontextRec::Select with the given buffer.
+ */
+void GLAPIENTRY
+_mesa_SelectBuffer( GLsizei size, GLuint *buffer )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (ctx->RenderMode==GL_SELECT) {
+      _mesa_error( ctx, GL_INVALID_OPERATION, "glSelectBuffer" );
+      return;			/* KW: added return */
+   }
+
+   FLUSH_VERTICES(ctx, _NEW_RENDERMODE); 
+   ctx->Select.Buffer = buffer;
+   ctx->Select.BufferSize = size;
+   ctx->Select.BufferCount = 0;
+   ctx->Select.HitFlag = GL_FALSE;
+   ctx->Select.HitMinZ = 1.0;
+   ctx->Select.HitMaxZ = 0.0;
+}
+
+
+/**
+ * Write a value of a record into the selection buffer.
+ * 
+ * \param CTX GL context.
+ * \param V value.
+ *
+ * Verifies there is free space in the buffer to write the value and
+ * increments the pointer.
+ */
+#define WRITE_RECORD( CTX, V )					\
+	if (CTX->Select.BufferCount < CTX->Select.BufferSize) {	\
+	   CTX->Select.Buffer[CTX->Select.BufferCount] = (V);	\
+	}							\
+	CTX->Select.BufferCount++;
+
+
+/**
+ * Update the hit flag and the maximum and minimum depth values.
+ *
+ * \param ctx GL context.
+ * \param z depth.
+ *
+ * Sets gl_selection::HitFlag and updates gl_selection::HitMinZ and
+ * gl_selection::HitMaxZ.
+ */
+void _mesa_update_hitflag( GLcontext *ctx, GLfloat z )
+{
+   ctx->Select.HitFlag = GL_TRUE;
+   if (z < ctx->Select.HitMinZ) {
+      ctx->Select.HitMinZ = z;
+   }
+   if (z > ctx->Select.HitMaxZ) {
+      ctx->Select.HitMaxZ = z;
+   }
+}
+
+
+/**
+ * Write the hit record.
+ *
+ * \param ctx GL context.
+ *
+ * Write the hit record, i.e., the number of names in the stack, the minimum and
+ * maximum depth values and the number of names in the name stack at the time
+ * of the event. Resets the hit flag. 
+ *
+ * \sa gl_selection.
+ */
+static void write_hit_record( GLcontext *ctx )
+{
+   GLuint i;
+   GLuint zmin, zmax, zscale = (~0u);
+
+   /* HitMinZ and HitMaxZ are in [0,1].  Multiply these values by */
+   /* 2^32-1 and round to nearest unsigned integer. */
+
+   assert( ctx != NULL ); /* this line magically fixes a SunOS 5.x/gcc bug */
+   zmin = (GLuint) ((GLfloat) zscale * ctx->Select.HitMinZ);
+   zmax = (GLuint) ((GLfloat) zscale * ctx->Select.HitMaxZ);
+
+   WRITE_RECORD( ctx, ctx->Select.NameStackDepth );
+   WRITE_RECORD( ctx, zmin );
+   WRITE_RECORD( ctx, zmax );
+   for (i = 0; i < ctx->Select.NameStackDepth; i++) {
+      WRITE_RECORD( ctx, ctx->Select.NameStack[i] );
+   }
+
+   ctx->Select.Hits++;
+   ctx->Select.HitFlag = GL_FALSE;
+   ctx->Select.HitMinZ = 1.0;
+   ctx->Select.HitMaxZ = -1.0;
+}
+
+
+/**
+ * Initialize the name stack.
+ *
+ * Verifies we are in select mode and resets the name stack depth and resets
+ * the hit record data in gl_selection. Marks new render mode in
+ * __GLcontextRec::NewState.
+ */
+void GLAPIENTRY
+_mesa_InitNames( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   /* Record the hit before the HitFlag is wiped out again. */
+   if (ctx->RenderMode == GL_SELECT) {
+      if (ctx->Select.HitFlag) {
+         write_hit_record( ctx );
+      }
+   }
+   ctx->Select.NameStackDepth = 0;
+   ctx->Select.HitFlag = GL_FALSE;
+   ctx->Select.HitMinZ = 1.0;
+   ctx->Select.HitMaxZ = 0.0;
+   ctx->NewState |= _NEW_RENDERMODE;
+}
+
+
+/**
+ * Load the top-most name of the name stack.
+ *
+ * \param name name.
+ *
+ * Verifies we are in selection mode and that the name stack is not empty.
+ * Flushes vertices. If there is a hit flag writes it (via write_hit_record()),
+ * and replace the top-most name in the stack.
+ *
+ * sa __GLcontextRec::Select.
+ */
+void GLAPIENTRY
+_mesa_LoadName( GLuint name )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (ctx->RenderMode != GL_SELECT) {
+      return;
+   }
+   if (ctx->Select.NameStackDepth == 0) {
+      _mesa_error( ctx, GL_INVALID_OPERATION, "glLoadName" );
+      return;
+   }
+
+   FLUSH_VERTICES(ctx, _NEW_RENDERMODE);
+
+   if (ctx->Select.HitFlag) {
+      write_hit_record( ctx );
+   }
+   if (ctx->Select.NameStackDepth < MAX_NAME_STACK_DEPTH) {
+      ctx->Select.NameStack[ctx->Select.NameStackDepth-1] = name;
+   }
+   else {
+      ctx->Select.NameStack[MAX_NAME_STACK_DEPTH-1] = name;
+   }
+}
+
+
+/**
+ * Push a name into the name stack.
+ *
+ * \param name name.
+ *
+ * Verifies we are in selection mode and that the name stack is not full.
+ * Flushes vertices. If there is a hit flag writes it (via write_hit_record()),
+ * and adds the name to the top of the name stack.
+ *
+ * sa __GLcontextRec::Select.
+ */
+void GLAPIENTRY
+_mesa_PushName( GLuint name )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (ctx->RenderMode != GL_SELECT) {
+      return;
+   }
+
+   FLUSH_VERTICES(ctx, _NEW_RENDERMODE);
+   if (ctx->Select.HitFlag) {
+      write_hit_record( ctx );
+   }
+   if (ctx->Select.NameStackDepth >= MAX_NAME_STACK_DEPTH) {
+      _mesa_error( ctx, GL_STACK_OVERFLOW, "glPushName" );
+   }
+   else
+      ctx->Select.NameStack[ctx->Select.NameStackDepth++] = name;
+}
+
+
+/**
+ * Pop a name into the name stack.
+ *
+ * Verifies we are in selection mode and that the name stack is not empty.
+ * Flushes vertices. If there is a hit flag writes it (via write_hit_record()),
+ * and removes top-most name in the name stack.
+ *
+ * sa __GLcontextRec::Select.
+ */
+void GLAPIENTRY
+_mesa_PopName( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (ctx->RenderMode != GL_SELECT) {
+      return;
+   }
+
+   FLUSH_VERTICES(ctx, _NEW_RENDERMODE);
+   if (ctx->Select.HitFlag) {
+      write_hit_record( ctx );
+   }
+   if (ctx->Select.NameStackDepth == 0) {
+      _mesa_error( ctx, GL_STACK_UNDERFLOW, "glPopName" );
+   }
+   else
+      ctx->Select.NameStackDepth--;
+}
+
+/*@}*/
+
+
+/**********************************************************************/
+/** \name Render Mode */
+/*@{*/
+
+/**
+ * Set rasterization mode.
+ *
+ * \param mode rasterization mode.
+ *
+ * \note this function can't be put in a display list.
+ *
+ * \sa glRenderMode().
+ * 
+ * Flushes the vertices and do the necessary cleanup according to the previous
+ * rasterization mode, such as writing the hit record or resent the select
+ * buffer index when exiting the select mode. Updates
+ * __GLcontextRec::RenderMode and notifies the driver via the
+ * dd_function_table::RenderMode callback.
+ */
+GLint GLAPIENTRY
+_mesa_RenderMode( GLenum mode )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint result;
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glRenderMode %s\n", _mesa_lookup_enum_by_nr(mode));
+
+   FLUSH_VERTICES(ctx, _NEW_RENDERMODE);
+
+   switch (ctx->RenderMode) {
+      case GL_RENDER:
+	 result = 0;
+	 break;
+      case GL_SELECT:
+	 if (ctx->Select.HitFlag) {
+	    write_hit_record( ctx );
+	 }
+	 if (ctx->Select.BufferCount > ctx->Select.BufferSize) {
+	    /* overflow */
+#ifdef DEBUG
+            _mesa_warning(ctx, "Feedback buffer overflow");
+#endif
+	    result = -1;
+	 }
+	 else {
+	    result = ctx->Select.Hits;
+	 }
+	 ctx->Select.BufferCount = 0;
+	 ctx->Select.Hits = 0;
+	 ctx->Select.NameStackDepth = 0;
+	 break;
+#if _HAVE_FULL_GL
+      case GL_FEEDBACK:
+	 if (ctx->Feedback.Count > ctx->Feedback.BufferSize) {
+	    /* overflow */
+	    result = -1;
+	 }
+	 else {
+	    result = ctx->Feedback.Count;
+	 }
+	 ctx->Feedback.Count = 0;
+	 break;
+#endif
+      default:
+	 _mesa_error( ctx, GL_INVALID_ENUM, "glRenderMode" );
+	 return 0;
+   }
+
+   switch (mode) {
+      case GL_RENDER:
+         break;
+      case GL_SELECT:
+	 if (ctx->Select.BufferSize==0) {
+	    /* haven't called glSelectBuffer yet */
+	    _mesa_error( ctx, GL_INVALID_OPERATION, "glRenderMode" );
+	 }
+	 break;
+#if _HAVE_FULL_GL
+      case GL_FEEDBACK:
+	 if (ctx->Feedback.BufferSize==0) {
+	    /* haven't called glFeedbackBuffer yet */
+	    _mesa_error( ctx, GL_INVALID_OPERATION, "glRenderMode" );
+	 }
+	 break;
+#endif
+      default:
+	 _mesa_error( ctx, GL_INVALID_ENUM, "glRenderMode" );
+	 return 0;
+   }
+
+   ctx->RenderMode = mode;
+   if (ctx->Driver.RenderMode)
+      ctx->Driver.RenderMode( ctx, mode );
+
+   return result;
+}
+
+/*@}*/
+
+
+/**********************************************************************/
+/** \name Initialization */
+/*@{*/
+
+/**
+ * Initialize context feedback data.
+ */
+void _mesa_init_feedback( GLcontext * ctx )
+{
+   /* Feedback */
+   ctx->Feedback.Type = GL_2D;   /* TODO: verify */
+   ctx->Feedback.Buffer = NULL;
+   ctx->Feedback.BufferSize = 0;
+   ctx->Feedback.Count = 0;
+
+   /* Selection/picking */
+   ctx->Select.Buffer = NULL;
+   ctx->Select.BufferSize = 0;
+   ctx->Select.BufferCount = 0;
+   ctx->Select.Hits = 0;
+   ctx->Select.NameStackDepth = 0;
+
+   /* Miscellaneous */
+   ctx->RenderMode = GL_RENDER;
+}
+
+/*@}*/
diff --git a/reactos/lib/mesa32/src/main/feedback.h b/reactos/lib/mesa32/src/main/feedback.h
new file mode 100644
index 00000000000..6c448ad631b
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/feedback.h
@@ -0,0 +1,82 @@
+/**
+ * \file feedback.h
+ * Selection and feedback modes functions.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef FEEDBACK_H
+#define FEEDBACK_H
+
+
+#include "mtypes.h"
+
+
+#define FEEDBACK_TOKEN( CTX, T )				\
+	if (CTX->Feedback.Count < CTX->Feedback.BufferSize) {	\
+	   CTX->Feedback.Buffer[CTX->Feedback.Count] = (GLfloat) (T); \
+	}							\
+	CTX->Feedback.Count++;
+
+
+extern void _mesa_init_feedback( GLcontext * ctx );
+
+extern void _mesa_feedback_vertex( GLcontext *ctx,
+                                const GLfloat win[4],
+                                const GLfloat color[4],
+				GLfloat index,
+                                const GLfloat texcoord[4] );
+
+
+extern void _mesa_update_hitflag( GLcontext *ctx, GLfloat z );
+
+
+extern void GLAPIENTRY
+_mesa_PassThrough( GLfloat token );
+
+extern void GLAPIENTRY
+_mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer );
+
+extern void GLAPIENTRY
+_mesa_SelectBuffer( GLsizei size, GLuint *buffer );
+
+extern void GLAPIENTRY
+_mesa_InitNames( void );
+
+extern void GLAPIENTRY
+_mesa_LoadName( GLuint name );
+
+extern void GLAPIENTRY
+_mesa_PushName( GLuint name );
+
+extern void GLAPIENTRY
+_mesa_PopName( void );
+
+extern GLint GLAPIENTRY
+_mesa_RenderMode( GLenum mode );
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/fog.c b/reactos/lib/mesa32/src/main/fog.c
new file mode 100644
index 00000000000..d3b8a923aae
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/fog.c
@@ -0,0 +1,177 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "colormac.h"
+#include "context.h"
+#include "fog.h"
+#include "mtypes.h"
+
+
+
+void GLAPIENTRY
+_mesa_Fogf(GLenum pname, GLfloat param)
+{
+   _mesa_Fogfv(pname, &param);
+}
+
+
+void GLAPIENTRY
+_mesa_Fogi(GLenum pname, GLint param )
+{
+   GLfloat fparam = (GLfloat) param;
+   _mesa_Fogfv(pname, &fparam);
+}
+
+
+void GLAPIENTRY
+_mesa_Fogiv(GLenum pname, const GLint *params )
+{
+   GLfloat p[4];
+   switch (pname) {
+      case GL_FOG_MODE:
+      case GL_FOG_DENSITY:
+      case GL_FOG_START:
+      case GL_FOG_END:
+      case GL_FOG_INDEX:
+      case GL_FOG_COORDINATE_SOURCE_EXT:
+	 p[0] = (GLfloat) *params;
+	 break;
+      case GL_FOG_COLOR:
+	 p[0] = INT_TO_FLOAT( params[0] );
+	 p[1] = INT_TO_FLOAT( params[1] );
+	 p[2] = INT_TO_FLOAT( params[2] );
+	 p[3] = INT_TO_FLOAT( params[3] );
+	 break;
+      default:
+         /* Error will be caught later in _mesa_Fogfv */
+         ;
+   }
+   _mesa_Fogfv(pname, p);
+}
+
+
+void GLAPIENTRY
+_mesa_Fogfv( GLenum pname, const GLfloat *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLenum m;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   switch (pname) {
+      case GL_FOG_MODE:
+         m = (GLenum) (GLint) *params;
+	 switch (m) {
+	 case GL_LINEAR:
+	 case GL_EXP:
+	 case GL_EXP2:
+	    break;
+	 default:
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glFog" );
+            return;
+	 }
+	 if (ctx->Fog.Mode == m)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_FOG);
+	 ctx->Fog.Mode = m;
+	 break;
+      case GL_FOG_DENSITY:
+	 if (*params<0.0) {
+	    _mesa_error( ctx, GL_INVALID_VALUE, "glFog" );
+            return;
+	 }
+	 if (ctx->Fog.Density == *params)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_FOG);
+	 ctx->Fog.Density = *params;
+	 break;
+      case GL_FOG_START:
+	 if (ctx->Fog.Start == *params)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_FOG);
+	 ctx->Fog.Start = *params;
+	 break;
+      case GL_FOG_END:
+	 if (ctx->Fog.End == *params)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_FOG);
+	 ctx->Fog.End = *params;
+	 break;
+      case GL_FOG_INDEX:
+ 	 if (ctx->Fog.Index == *params)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_FOG);
+ 	 ctx->Fog.Index = *params;
+	 break;
+      case GL_FOG_COLOR:
+	 if (TEST_EQ_4V(ctx->Fog.Color, params))
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_FOG);
+	 ctx->Fog.Color[0] = CLAMP(params[0], 0.0F, 1.0F);
+	 ctx->Fog.Color[1] = CLAMP(params[1], 0.0F, 1.0F);
+	 ctx->Fog.Color[2] = CLAMP(params[2], 0.0F, 1.0F);
+	 ctx->Fog.Color[3] = CLAMP(params[3], 0.0F, 1.0F);
+         break;
+      case GL_FOG_COORDINATE_SOURCE_EXT: {
+	 GLenum p = (GLenum) (GLint) *params;
+         if (!ctx->Extensions.EXT_fog_coord ||
+             (p != GL_FOG_COORDINATE_EXT && p != GL_FRAGMENT_DEPTH_EXT)) {
+	    _mesa_error(ctx, GL_INVALID_ENUM, "glFog");
+	    return;
+	 }
+	 if (ctx->Fog.FogCoordinateSource == p)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_FOG);
+	 ctx->Fog.FogCoordinateSource = p;
+	 break;
+      }
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glFog" );
+         return;
+   }
+
+   if (ctx->Driver.Fogfv) {
+      (*ctx->Driver.Fogfv)( ctx, pname, params );
+   }
+}
+
+
+/**********************************************************************/
+/*****                      Initialization                        *****/
+/**********************************************************************/
+
+void _mesa_init_fog( GLcontext * ctx )
+{
+   /* Fog group */
+   ctx->Fog.Enabled = GL_FALSE;
+   ctx->Fog.Mode = GL_EXP;
+   ASSIGN_4V( ctx->Fog.Color, 0.0, 0.0, 0.0, 0.0 );
+   ctx->Fog.Index = 0.0;
+   ctx->Fog.Density = 1.0;
+   ctx->Fog.Start = 0.0;
+   ctx->Fog.End = 1.0;
+   ctx->Fog.ColorSumEnabled = GL_FALSE;
+   ctx->Fog.FogCoordinateSource = GL_FRAGMENT_DEPTH_EXT;
+}
diff --git a/reactos/lib/mesa32/src/main/fog.h b/reactos/lib/mesa32/src/main/fog.h
new file mode 100644
index 00000000000..a14d19cdb39
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/fog.h
@@ -0,0 +1,66 @@
+/**
+ * \file fog.h
+ * Fog operations.
+ * 
+ * \if subset
+ * (No-op)
+ *
+ * \endif
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef FOG_H
+#define FOG_H
+
+
+#include "mtypes.h"
+
+
+#if _HAVE_FULL_GL
+
+extern void GLAPIENTRY
+_mesa_Fogf(GLenum pname, GLfloat param);
+
+extern void GLAPIENTRY
+_mesa_Fogi(GLenum pname, GLint param );
+
+extern void GLAPIENTRY
+_mesa_Fogfv(GLenum pname, const GLfloat *params );
+
+extern void GLAPIENTRY
+_mesa_Fogiv(GLenum pname, const GLint *params );
+
+extern void _mesa_init_fog( GLcontext * ctx );
+
+#else
+
+/** No-op */
+#define _mesa_init_fog( c ) ((void)0)
+
+#endif
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/get.c b/reactos/lib/mesa32/src/main/get.c
new file mode 100644
index 00000000000..287eae75bef
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/get.c
@@ -0,0 +1,6488 @@
+/**
+ * \file get.c
+ * State query functions.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * Regarding GL_NV_light_max_exponent:
+ *
+ * Portions of this software may use or implement intellectual
+ * property owned and licensed by NVIDIA Corporation. NVIDIA disclaims
+ * any and all warranties with respect to such intellectual property,
+ * including any use thereof or modifications thereto.
+ */
+
+#include "glheader.h"
+#include "colormac.h"
+#include "context.h"
+#include "enable.h"
+#include "enums.h"
+#include "extensions.h"
+#include "get.h"
+#include "macros.h"
+#include "mtypes.h"
+#include "texcompress.h"
+#include "version.h"
+#include "math/m_matrix.h"
+
+
+#define FLOAT_TO_BOOL(X)	( (X)==0.0F ? GL_FALSE : GL_TRUE )
+#define INT_TO_BOOL(I)		( (I)==0 ? GL_FALSE : GL_TRUE )
+#define ENUM_TO_BOOL(E)		( (E)==0 ? GL_FALSE : GL_TRUE )
+
+#ifdef SPECIALCAST
+/* Needed for an Amiga compiler */
+#define ENUM_TO_FLOAT(X) ((GLfloat)(GLint)(X))
+#define ENUM_TO_DOUBLE(X) ((GLdouble)(GLint)(X))
+#else
+/* all other compilers */
+#define ENUM_TO_FLOAT(X) ((GLfloat)(X))
+#define ENUM_TO_DOUBLE(X) ((GLdouble)(X))
+#endif
+
+
+/* Check if named extension is enabled, if not generate error and return */
+
+#define CHECK1(E1, str, PNAME)					\
+   if (!ctx->Extensions.E1) {					\
+      _mesa_error(ctx, GL_INVALID_VALUE,			\
+                  "glGet" str "v(0x%x)", (int) PNAME);		\
+      return;							\
+   }
+    
+#define CHECK2(E1, E2, str, PNAME)				\
+   if (!ctx->Extensions.E1 && !ctx->Extensions.E2) {		\
+      _mesa_error(ctx, GL_INVALID_VALUE,			\
+                  "glGet" str "v(0x%x)", (int) PNAME);		\
+      return;							\
+   }
+    
+#define CHECK_EXTENSION_B(EXTNAME, PNAME)			\
+   CHECK1(EXTNAME, "Boolean", PNAME )
+
+#define CHECK_EXTENSION_I(EXTNAME, PNAME)			\
+   CHECK1(EXTNAME, "Integer", PNAME )
+
+#define CHECK_EXTENSION_F(EXTNAME, PNAME)			\
+   CHECK1(EXTNAME, "Float", PNAME )
+
+#define CHECK_EXTENSION_D(EXTNAME, PNAME)			\
+   CHECK1(EXTNAME, "Double", PNAME )
+
+#define CHECK_EXTENSION2_B(EXT1, EXT2, PNAME)			\
+   CHECK2(EXT1, EXT2, "Boolean", PNAME)
+
+#define CHECK_EXTENSION2_I(EXT1, EXT2, PNAME)			\
+   CHECK2(EXT1, EXT2, "Integer", PNAME)
+
+#define CHECK_EXTENSION2_F(EXT1, EXT2, PNAME)			\
+   CHECK2(EXT1, EXT2, "Float", PNAME)
+
+#define CHECK_EXTENSION2_D(EXT1, EXT2, PNAME)			\
+   CHECK2(EXT1, EXT2, "Double", PNAME)
+
+
+
+static GLenum
+pixel_texgen_mode(const GLcontext *ctx)
+{
+   if (ctx->Pixel.FragmentRgbSource == GL_CURRENT_RASTER_POSITION) {
+      if (ctx->Pixel.FragmentAlphaSource == GL_CURRENT_RASTER_POSITION) {
+         return GL_RGBA;
+      }
+      else {
+         return GL_RGB;
+      }
+   }
+   else {
+      if (ctx->Pixel.FragmentAlphaSource == GL_CURRENT_RASTER_POSITION) {
+         return GL_ALPHA;
+      }
+      else {
+         return GL_NONE;
+      }
+   }
+}
+
+
+/**
+ * Get the value(s) of a selected parameter.
+ *
+ * \param pname parameter to be returned.
+ * \param params will hold the value(s) of the speficifed parameter.
+ *
+ * \sa glGetBooleanv().
+ *
+ * Tries to get the specified parameter via dd_function_table::GetBooleanv,
+ * otherwise gets the specified parameter from the current context, converting
+ * it value into GLboolean.
+ */
+void GLAPIENTRY
+_mesa_GetBooleanv( GLenum pname, GLboolean *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint i;
+   const GLuint clientUnit = ctx->Array.ActiveTexture;
+   const GLuint texUnit = ctx->Texture.CurrentUnit;
+   const struct gl_texture_unit *textureUnit = &ctx->Texture.Unit[texUnit];
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (!params)
+      return;
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glGetBooleanv %s\n", _mesa_lookup_enum_by_nr(pname));
+
+   if (!ctx->_CurrentProgram) {
+      /* We need this in order to get correct results for
+       * GL_OCCLUSION_TEST_RESULT_HP.  There might be other important cases.
+       */
+      FLUSH_VERTICES(ctx, 0);
+   }
+
+   if (ctx->Driver.GetBooleanv
+       && (*ctx->Driver.GetBooleanv)(ctx, pname, params))
+      return;
+
+   switch (pname) {
+      case GL_ACCUM_RED_BITS:
+         *params = INT_TO_BOOL(ctx->Visual.accumRedBits);
+         break;
+      case GL_ACCUM_GREEN_BITS:
+         *params = INT_TO_BOOL(ctx->Visual.accumGreenBits);
+         break;
+      case GL_ACCUM_BLUE_BITS:
+         *params = INT_TO_BOOL(ctx->Visual.accumBlueBits);
+         break;
+      case GL_ACCUM_ALPHA_BITS:
+         *params = INT_TO_BOOL(ctx->Visual.accumAlphaBits);
+         break;
+      case GL_ACCUM_CLEAR_VALUE:
+         params[0] = FLOAT_TO_BOOL(ctx->Accum.ClearColor[0]);
+         params[1] = FLOAT_TO_BOOL(ctx->Accum.ClearColor[1]);
+         params[2] = FLOAT_TO_BOOL(ctx->Accum.ClearColor[2]);
+         params[3] = FLOAT_TO_BOOL(ctx->Accum.ClearColor[3]);
+         break;
+      case GL_ALPHA_BIAS:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.AlphaBias);
+         break;
+      case GL_ALPHA_BITS:
+         *params = INT_TO_BOOL(ctx->Visual.alphaBits);
+         break;
+      case GL_ALPHA_SCALE:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.AlphaScale);
+         break;
+      case GL_ALPHA_TEST:
+         *params = ctx->Color.AlphaEnabled;
+         break;
+      case GL_ALPHA_TEST_FUNC:
+         *params = ENUM_TO_BOOL(ctx->Color.AlphaFunc);
+         break;
+      case GL_ALPHA_TEST_REF:
+         *params = ctx->Color.AlphaRef ? GL_TRUE : GL_FALSE;
+         break;
+      case GL_ATTRIB_STACK_DEPTH:
+         *params = INT_TO_BOOL(ctx->AttribStackDepth);
+         break;
+      case GL_AUTO_NORMAL:
+         *params = ctx->Eval.AutoNormal;
+         break;
+      case GL_AUX_BUFFERS:
+         *params = (ctx->Const.NumAuxBuffers) ? GL_TRUE : GL_FALSE;
+         break;
+      case GL_BLEND:
+         *params = ctx->Color.BlendEnabled;
+         break;
+      case GL_BLEND_DST:
+         *params = ENUM_TO_BOOL(ctx->Color.BlendDstRGB);
+         break;
+      case GL_BLEND_SRC:
+         *params = ENUM_TO_BOOL(ctx->Color.BlendSrcRGB);
+         break;
+      case GL_BLEND_SRC_RGB_EXT:
+         *params = ENUM_TO_BOOL(ctx->Color.BlendSrcRGB);
+         break;
+      case GL_BLEND_DST_RGB_EXT:
+         *params = ENUM_TO_BOOL(ctx->Color.BlendDstRGB);
+         break;
+      case GL_BLEND_SRC_ALPHA_EXT:
+         *params = ENUM_TO_BOOL(ctx->Color.BlendSrcA);
+         break;
+      case GL_BLEND_DST_ALPHA_EXT:
+         *params = ENUM_TO_BOOL(ctx->Color.BlendDstA);
+         break;
+      case GL_BLEND_EQUATION_EXT:
+	 *params = ENUM_TO_BOOL( ctx->Color.BlendEquation );
+	 break;
+      case GL_BLEND_COLOR_EXT:
+	 params[0] = FLOAT_TO_BOOL( ctx->Color.BlendColor[0] );
+	 params[1] = FLOAT_TO_BOOL( ctx->Color.BlendColor[1] );
+	 params[2] = FLOAT_TO_BOOL( ctx->Color.BlendColor[2] );
+	 params[3] = FLOAT_TO_BOOL( ctx->Color.BlendColor[3] );
+	 break;
+      case GL_BLUE_BIAS:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.BlueBias);
+         break;
+      case GL_BLUE_BITS:
+         *params = INT_TO_BOOL( ctx->Visual.blueBits );
+         break;
+      case GL_BLUE_SCALE:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.BlueScale);
+         break;
+      case GL_CLIENT_ATTRIB_STACK_DEPTH:
+         *params = INT_TO_BOOL(ctx->ClientAttribStackDepth);
+         break;
+      case GL_CLIP_PLANE0:
+      case GL_CLIP_PLANE1:
+      case GL_CLIP_PLANE2:
+      case GL_CLIP_PLANE3:
+      case GL_CLIP_PLANE4:
+      case GL_CLIP_PLANE5:
+         if (ctx->Transform.ClipPlanesEnabled & (1 << (pname - GL_CLIP_PLANE0)))
+            *params = GL_TRUE;
+         else
+            *params = GL_FALSE;
+         break;
+      case GL_COLOR_CLEAR_VALUE:
+         params[0] = ctx->Color.ClearColor[0] ? GL_TRUE : GL_FALSE;
+         params[1] = ctx->Color.ClearColor[1] ? GL_TRUE : GL_FALSE;
+         params[2] = ctx->Color.ClearColor[2] ? GL_TRUE : GL_FALSE;
+         params[3] = ctx->Color.ClearColor[3] ? GL_TRUE : GL_FALSE;
+         break;
+      case GL_COLOR_MATERIAL:
+         *params = ctx->Light.ColorMaterialEnabled;
+         break;
+      case GL_COLOR_MATERIAL_FACE:
+         *params = ENUM_TO_BOOL(ctx->Light.ColorMaterialFace);
+         break;
+      case GL_COLOR_MATERIAL_PARAMETER:
+         *params = ENUM_TO_BOOL(ctx->Light.ColorMaterialMode);
+         break;
+      case GL_COLOR_WRITEMASK:
+         params[0] = ctx->Color.ColorMask[RCOMP] ? GL_TRUE : GL_FALSE;
+         params[1] = ctx->Color.ColorMask[GCOMP] ? GL_TRUE : GL_FALSE;
+         params[2] = ctx->Color.ColorMask[BCOMP] ? GL_TRUE : GL_FALSE;
+         params[3] = ctx->Color.ColorMask[ACOMP] ? GL_TRUE : GL_FALSE;
+         break;
+      case GL_CULL_FACE:
+         *params = ctx->Polygon.CullFlag;
+         break;
+      case GL_CULL_FACE_MODE:
+         *params = ENUM_TO_BOOL(ctx->Polygon.CullFaceMode);
+         break;
+      case GL_CURRENT_COLOR:
+	 FLUSH_CURRENT(ctx, 0);
+         params[0] = FLOAT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][0]);
+         params[1] = FLOAT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][1]);
+         params[2] = FLOAT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][2]);
+         params[3] = FLOAT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3]);
+         break;
+      case GL_CURRENT_INDEX:
+	 FLUSH_CURRENT(ctx, 0);
+         *params = FLOAT_TO_BOOL(ctx->Current.Index);
+         break;
+      case GL_CURRENT_NORMAL:
+	 FLUSH_CURRENT(ctx, 0);
+         params[0] = FLOAT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_NORMAL][0]);
+         params[1] = FLOAT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_NORMAL][1]);
+         params[2] = FLOAT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_NORMAL][2]);
+         break;
+      case GL_CURRENT_RASTER_COLOR:
+	 params[0] = FLOAT_TO_BOOL(ctx->Current.RasterColor[0]);
+	 params[1] = FLOAT_TO_BOOL(ctx->Current.RasterColor[1]);
+	 params[2] = FLOAT_TO_BOOL(ctx->Current.RasterColor[2]);
+	 params[3] = FLOAT_TO_BOOL(ctx->Current.RasterColor[3]);
+	 break;
+      case GL_CURRENT_RASTER_DISTANCE:
+	 *params = FLOAT_TO_BOOL(ctx->Current.RasterDistance);
+	 break;
+      case GL_CURRENT_RASTER_INDEX:
+	 *params = FLOAT_TO_BOOL(ctx->Current.RasterIndex);
+	 break;
+      case GL_CURRENT_RASTER_POSITION:
+	 params[0] = FLOAT_TO_BOOL(ctx->Current.RasterPos[0]);
+	 params[1] = FLOAT_TO_BOOL(ctx->Current.RasterPos[1]);
+	 params[2] = FLOAT_TO_BOOL(ctx->Current.RasterPos[2]);
+	 params[3] = FLOAT_TO_BOOL(ctx->Current.RasterPos[3]);
+	 break;
+      case GL_CURRENT_RASTER_TEXTURE_COORDS:
+         params[0] = FLOAT_TO_BOOL(ctx->Current.RasterTexCoords[texUnit][0]);
+         params[1] = FLOAT_TO_BOOL(ctx->Current.RasterTexCoords[texUnit][1]);
+         params[2] = FLOAT_TO_BOOL(ctx->Current.RasterTexCoords[texUnit][2]);
+         params[3] = FLOAT_TO_BOOL(ctx->Current.RasterTexCoords[texUnit][3]);
+	 break;
+      case GL_CURRENT_RASTER_POSITION_VALID:
+         *params = ctx->Current.RasterPosValid;
+	 break;
+      case GL_CURRENT_TEXTURE_COORDS:
+	 FLUSH_CURRENT(ctx, 0);
+         params[0] = FLOAT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][0]);
+         params[1] = FLOAT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][1]);
+         params[2] = FLOAT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][2]);
+         params[3] = FLOAT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][3]);
+	 break;
+      case GL_DEPTH_BIAS:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.DepthBias);
+	 break;
+      case GL_DEPTH_BITS:
+	 *params = INT_TO_BOOL(ctx->Visual.depthBits);
+	 break;
+      case GL_DEPTH_CLEAR_VALUE:
+         *params = FLOAT_TO_BOOL(ctx->Depth.Clear);
+	 break;
+      case GL_DEPTH_FUNC:
+         *params = ENUM_TO_BOOL(ctx->Depth.Func);
+	 break;
+      case GL_DEPTH_RANGE:
+         params[0] = FLOAT_TO_BOOL(ctx->Viewport.Near);
+         params[1] = FLOAT_TO_BOOL(ctx->Viewport.Far);
+	 break;
+      case GL_DEPTH_SCALE:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.DepthScale);
+	 break;
+      case GL_DEPTH_TEST:
+         *params = ctx->Depth.Test;
+	 break;
+      case GL_DEPTH_WRITEMASK:
+	 *params = ctx->Depth.Mask;
+	 break;
+      case GL_DITHER:
+	 *params = ctx->Color.DitherFlag;
+	 break;
+      case GL_DOUBLEBUFFER:
+	 *params = ctx->Visual.doubleBufferMode;
+	 break;
+      case GL_DRAW_BUFFER:
+	 *params = ENUM_TO_BOOL(ctx->Color.DrawBuffer);
+	 break;
+      case GL_EDGE_FLAG:
+	 FLUSH_CURRENT(ctx, 0);
+	 *params = ctx->Current.EdgeFlag;
+	 break;
+      case GL_FEEDBACK_BUFFER_SIZE:
+         *params = INT_TO_BOOL(ctx->Feedback.BufferSize);
+         break;
+      case GL_FEEDBACK_BUFFER_TYPE:
+         *params = INT_TO_BOOL(ctx->Feedback.Type);
+         break;
+      case GL_FOG:
+	 *params = ctx->Fog.Enabled;
+	 break;
+      case GL_FOG_COLOR:
+         params[0] = FLOAT_TO_BOOL(ctx->Fog.Color[0]);
+         params[1] = FLOAT_TO_BOOL(ctx->Fog.Color[1]);
+         params[2] = FLOAT_TO_BOOL(ctx->Fog.Color[2]);
+         params[3] = FLOAT_TO_BOOL(ctx->Fog.Color[3]);
+	 break;
+      case GL_FOG_DENSITY:
+         *params = FLOAT_TO_BOOL(ctx->Fog.Density);
+	 break;
+      case GL_FOG_END:
+         *params = FLOAT_TO_BOOL(ctx->Fog.End);
+	 break;
+      case GL_FOG_HINT:
+	 *params = ENUM_TO_BOOL(ctx->Hint.Fog);
+	 break;
+      case GL_FOG_INDEX:
+	 *params = FLOAT_TO_BOOL(ctx->Fog.Index);
+	 break;
+      case GL_FOG_MODE:
+	 *params = ENUM_TO_BOOL(ctx->Fog.Mode);
+	 break;
+      case GL_FOG_START:
+         *params = FLOAT_TO_BOOL(ctx->Fog.End);
+	 break;
+      case GL_FRONT_FACE:
+	 *params = ENUM_TO_BOOL(ctx->Polygon.FrontFace);
+	 break;
+      case GL_GREEN_BIAS:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.GreenBias);
+	 break;
+      case GL_GREEN_BITS:
+         *params = INT_TO_BOOL( ctx->Visual.greenBits );
+	 break;
+      case GL_GREEN_SCALE:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.GreenScale);
+	 break;
+      case GL_INDEX_BITS:
+         *params = INT_TO_BOOL( ctx->Visual.indexBits );
+	 break;
+      case GL_INDEX_CLEAR_VALUE:
+	 *params = INT_TO_BOOL(ctx->Color.ClearIndex);
+	 break;
+      case GL_INDEX_MODE:
+	 *params = ctx->Visual.rgbMode ? GL_FALSE : GL_TRUE;
+	 break;
+      case GL_INDEX_OFFSET:
+	 *params = INT_TO_BOOL(ctx->Pixel.IndexOffset);
+	 break;
+      case GL_INDEX_SHIFT:
+	 *params = INT_TO_BOOL(ctx->Pixel.IndexShift);
+	 break;
+      case GL_INDEX_WRITEMASK:
+	 *params = INT_TO_BOOL(ctx->Color.IndexMask);
+	 break;
+      case GL_LIGHT0:
+      case GL_LIGHT1:
+      case GL_LIGHT2:
+      case GL_LIGHT3:
+      case GL_LIGHT4:
+      case GL_LIGHT5:
+      case GL_LIGHT6:
+      case GL_LIGHT7:
+	 *params = ctx->Light.Light[pname-GL_LIGHT0].Enabled;
+	 break;
+      case GL_LIGHTING:
+	 *params = ctx->Light.Enabled;
+	 break;
+      case GL_LIGHT_MODEL_AMBIENT:
+	 params[0] = FLOAT_TO_BOOL(ctx->Light.Model.Ambient[0]);
+	 params[1] = FLOAT_TO_BOOL(ctx->Light.Model.Ambient[1]);
+	 params[2] = FLOAT_TO_BOOL(ctx->Light.Model.Ambient[2]);
+	 params[3] = FLOAT_TO_BOOL(ctx->Light.Model.Ambient[3]);
+	 break;
+      case GL_LIGHT_MODEL_COLOR_CONTROL:
+         params[0] = ENUM_TO_BOOL(ctx->Light.Model.ColorControl);
+         break;
+      case GL_LIGHT_MODEL_LOCAL_VIEWER:
+	 *params = ctx->Light.Model.LocalViewer;
+	 break;
+      case GL_LIGHT_MODEL_TWO_SIDE:
+	 *params = ctx->Light.Model.TwoSide;
+	 break;
+      case GL_LINE_SMOOTH:
+	 *params = ctx->Line.SmoothFlag;
+	 break;
+      case GL_LINE_SMOOTH_HINT:
+	 *params = ENUM_TO_BOOL(ctx->Hint.LineSmooth);
+	 break;
+      case GL_LINE_STIPPLE:
+	 *params = ctx->Line.StippleFlag;
+	 break;
+      case GL_LINE_STIPPLE_PATTERN:
+	 *params = INT_TO_BOOL(ctx->Line.StipplePattern);
+	 break;
+      case GL_LINE_STIPPLE_REPEAT:
+	 *params = INT_TO_BOOL(ctx->Line.StippleFactor);
+	 break;
+      case GL_LINE_WIDTH:
+	 *params = FLOAT_TO_BOOL(ctx->Line.Width);
+	 break;
+      case GL_LINE_WIDTH_GRANULARITY:
+	 *params = FLOAT_TO_BOOL(ctx->Const.LineWidthGranularity);
+	 break;
+      case GL_LINE_WIDTH_RANGE:
+	 params[0] = FLOAT_TO_BOOL(ctx->Const.MinLineWidthAA);
+	 params[1] = FLOAT_TO_BOOL(ctx->Const.MaxLineWidthAA);
+         break;
+      case GL_ALIASED_LINE_WIDTH_RANGE:
+	 params[0] = FLOAT_TO_BOOL(ctx->Const.MinLineWidth);
+	 params[1] = FLOAT_TO_BOOL(ctx->Const.MaxLineWidth);
+	 break;
+      case GL_LIST_BASE:
+	 *params = INT_TO_BOOL(ctx->List.ListBase);
+	 break;
+      case GL_LIST_INDEX:
+	 *params = INT_TO_BOOL( ctx->ListState.CurrentListNum );
+	 break;
+      case GL_LIST_MODE:
+         if (!ctx->CompileFlag)
+            *params = 0;
+         else if (ctx->ExecuteFlag)
+            *params = ENUM_TO_BOOL(GL_COMPILE_AND_EXECUTE);
+         else
+            *params = ENUM_TO_BOOL(GL_COMPILE);
+	 break;
+      case GL_INDEX_LOGIC_OP:
+	 *params = ctx->Color.IndexLogicOpEnabled;
+	 break;
+      case GL_COLOR_LOGIC_OP:
+	 *params = ctx->Color.ColorLogicOpEnabled;
+	 break;
+      case GL_LOGIC_OP_MODE:
+	 *params = ENUM_TO_BOOL(ctx->Color.LogicOp);
+	 break;
+      case GL_MAP1_COLOR_4:
+	 *params = ctx->Eval.Map1Color4;
+	 break;
+      case GL_MAP1_GRID_DOMAIN:
+	 params[0] = FLOAT_TO_BOOL(ctx->Eval.MapGrid1u1);
+	 params[1] = FLOAT_TO_BOOL(ctx->Eval.MapGrid1u2);
+	 break;
+      case GL_MAP1_GRID_SEGMENTS:
+	 *params = INT_TO_BOOL(ctx->Eval.MapGrid1un);
+	 break;
+      case GL_MAP1_INDEX:
+	 *params = ctx->Eval.Map1Index;
+	 break;
+      case GL_MAP1_NORMAL:
+	 *params = ctx->Eval.Map1Normal;
+	 break;
+      case GL_MAP1_TEXTURE_COORD_1:
+	 *params = ctx->Eval.Map1TextureCoord1;
+	 break;
+      case GL_MAP1_TEXTURE_COORD_2:
+	 *params = ctx->Eval.Map1TextureCoord2;
+	 break;
+      case GL_MAP1_TEXTURE_COORD_3:
+	 *params = ctx->Eval.Map1TextureCoord3;
+	 break;
+      case GL_MAP1_TEXTURE_COORD_4:
+	 *params = ctx->Eval.Map1TextureCoord4;
+	 break;
+      case GL_MAP1_VERTEX_3:
+	 *params = ctx->Eval.Map1Vertex3;
+	 break;
+      case GL_MAP1_VERTEX_4:
+	 *params = ctx->Eval.Map1Vertex4;
+	 break;
+      case GL_MAP2_COLOR_4:
+	 *params = ctx->Eval.Map2Color4;
+	 break;
+      case GL_MAP2_GRID_DOMAIN:
+	 params[0] = FLOAT_TO_BOOL(ctx->Eval.MapGrid2u1);
+	 params[1] = FLOAT_TO_BOOL(ctx->Eval.MapGrid2u2);
+	 params[2] = FLOAT_TO_BOOL(ctx->Eval.MapGrid2v1);
+	 params[3] = FLOAT_TO_BOOL(ctx->Eval.MapGrid2v2);
+	 break;
+      case GL_MAP2_GRID_SEGMENTS:
+	 params[0] = INT_TO_BOOL(ctx->Eval.MapGrid2un);
+	 params[1] = INT_TO_BOOL(ctx->Eval.MapGrid2vn);
+	 break;
+      case GL_MAP2_INDEX:
+	 *params = ctx->Eval.Map2Index;
+	 break;
+      case GL_MAP2_NORMAL:
+	 *params = ctx->Eval.Map2Normal;
+	 break;
+      case GL_MAP2_TEXTURE_COORD_1:
+	 *params = ctx->Eval.Map2TextureCoord1;
+	 break;
+      case GL_MAP2_TEXTURE_COORD_2:
+	 *params = ctx->Eval.Map2TextureCoord2;
+	 break;
+      case GL_MAP2_TEXTURE_COORD_3:
+	 *params = ctx->Eval.Map2TextureCoord3;
+	 break;
+      case GL_MAP2_TEXTURE_COORD_4:
+	 *params = ctx->Eval.Map2TextureCoord4;
+	 break;
+      case GL_MAP2_VERTEX_3:
+	 *params = ctx->Eval.Map2Vertex3;
+	 break;
+      case GL_MAP2_VERTEX_4:
+	 *params = ctx->Eval.Map2Vertex4;
+	 break;
+      case GL_MAP_COLOR:
+	 *params = ctx->Pixel.MapColorFlag;
+	 break;
+      case GL_MAP_STENCIL:
+	 *params = ctx->Pixel.MapStencilFlag;
+	 break;
+      case GL_MATRIX_MODE:
+	 *params = ENUM_TO_BOOL( ctx->Transform.MatrixMode );
+	 break;
+      case GL_MAX_ATTRIB_STACK_DEPTH:
+	 *params = INT_TO_BOOL(MAX_ATTRIB_STACK_DEPTH);
+	 break;
+      case GL_MAX_CLIENT_ATTRIB_STACK_DEPTH:
+         *params = INT_TO_BOOL( MAX_CLIENT_ATTRIB_STACK_DEPTH);
+         break;
+      case GL_MAX_CLIP_PLANES:
+	 *params = INT_TO_BOOL(ctx->Const.MaxClipPlanes);
+	 break;
+      case GL_MAX_ELEMENTS_VERTICES:  /* GL_VERSION_1_2 */
+         *params = INT_TO_BOOL(ctx->Const.MaxArrayLockSize);
+         break;
+      case GL_MAX_ELEMENTS_INDICES:   /* GL_VERSION_1_2 */
+         *params = INT_TO_BOOL(ctx->Const.MaxArrayLockSize);
+         break;
+      case GL_MAX_EVAL_ORDER:
+	 *params = INT_TO_BOOL(MAX_EVAL_ORDER);
+	 break;
+      case GL_MAX_LIGHTS:
+	 *params = INT_TO_BOOL(ctx->Const.MaxLights);
+	 break;
+      case GL_MAX_LIST_NESTING:
+	 *params = INT_TO_BOOL(MAX_LIST_NESTING);
+	 break;
+      case GL_MAX_MODELVIEW_STACK_DEPTH:
+	 *params = INT_TO_BOOL(MAX_MODELVIEW_STACK_DEPTH);
+	 break;
+      case GL_MAX_NAME_STACK_DEPTH:
+	 *params = INT_TO_BOOL(MAX_NAME_STACK_DEPTH);
+	 break;
+      case GL_MAX_PIXEL_MAP_TABLE:
+	 *params = INT_TO_BOOL(MAX_PIXEL_MAP_TABLE);
+	 break;
+      case GL_MAX_PROJECTION_STACK_DEPTH:
+	 *params = INT_TO_BOOL(MAX_PROJECTION_STACK_DEPTH);
+	 break;
+      case GL_MAX_TEXTURE_SIZE:
+         *params = INT_TO_BOOL(1 << (ctx->Const.MaxTextureLevels - 1));
+	 break;
+      case GL_MAX_3D_TEXTURE_SIZE:
+         *params = INT_TO_BOOL(1 << (ctx->Const.Max3DTextureLevels - 1));
+	 break;
+      case GL_MAX_TEXTURE_STACK_DEPTH:
+	 *params = INT_TO_BOOL(MAX_TEXTURE_STACK_DEPTH);
+	 break;
+      case GL_MAX_VIEWPORT_DIMS:
+	 params[0] = INT_TO_BOOL(MAX_WIDTH);
+	 params[1] = INT_TO_BOOL(MAX_HEIGHT);
+	 break;
+      case GL_MODELVIEW_MATRIX:
+	 for (i=0;i<16;i++) {
+	    params[i] = FLOAT_TO_BOOL(ctx->ModelviewMatrixStack.Top->m[i]);
+	 }
+	 break;
+      case GL_MODELVIEW_STACK_DEPTH:
+         *params = INT_TO_BOOL(ctx->ModelviewMatrixStack.Depth + 1);
+	 break;
+      case GL_NAME_STACK_DEPTH:
+	 *params = INT_TO_BOOL(ctx->Select.NameStackDepth);
+	 break;
+      case GL_NORMALIZE:
+	 *params = ctx->Transform.Normalize;
+	 break;
+      case GL_PACK_ALIGNMENT:
+	 *params = INT_TO_BOOL(ctx->Pack.Alignment);
+	 break;
+      case GL_PACK_LSB_FIRST:
+	 *params = ctx->Pack.LsbFirst;
+	 break;
+      case GL_PACK_ROW_LENGTH:
+	 *params = INT_TO_BOOL(ctx->Pack.RowLength);
+	 break;
+      case GL_PACK_SKIP_PIXELS:
+	 *params = INT_TO_BOOL(ctx->Pack.SkipPixels);
+	 break;
+      case GL_PACK_SKIP_ROWS:
+	 *params = INT_TO_BOOL(ctx->Pack.SkipRows);
+	 break;
+      case GL_PACK_SWAP_BYTES:
+	 *params = ctx->Pack.SwapBytes;
+	 break;
+      case GL_PACK_SKIP_IMAGES_EXT:
+         *params = ctx->Pack.SkipImages;
+         break;
+      case GL_PACK_IMAGE_HEIGHT_EXT:
+         *params = ctx->Pack.ImageHeight;
+         break;
+      case GL_PACK_INVERT_MESA:
+         *params = ctx->Pack.Invert;
+         break;
+      case GL_PERSPECTIVE_CORRECTION_HINT:
+	 *params = ENUM_TO_BOOL(ctx->Hint.PerspectiveCorrection);
+	 break;
+      case GL_PIXEL_MAP_A_TO_A_SIZE:
+	 *params = INT_TO_BOOL(ctx->Pixel.MapAtoAsize);
+	 break;
+      case GL_PIXEL_MAP_B_TO_B_SIZE:
+	 *params = INT_TO_BOOL(ctx->Pixel.MapBtoBsize);
+	 break;
+      case GL_PIXEL_MAP_G_TO_G_SIZE:
+	 *params = INT_TO_BOOL(ctx->Pixel.MapGtoGsize);
+	 break;
+      case GL_PIXEL_MAP_I_TO_A_SIZE:
+	 *params = INT_TO_BOOL(ctx->Pixel.MapItoAsize);
+	 break;
+      case GL_PIXEL_MAP_I_TO_B_SIZE:
+	 *params = INT_TO_BOOL(ctx->Pixel.MapItoBsize);
+	 break;
+      case GL_PIXEL_MAP_I_TO_G_SIZE:
+	 *params = INT_TO_BOOL(ctx->Pixel.MapItoGsize);
+	 break;
+      case GL_PIXEL_MAP_I_TO_I_SIZE:
+	 *params = INT_TO_BOOL(ctx->Pixel.MapItoIsize);
+	 break;
+      case GL_PIXEL_MAP_I_TO_R_SIZE:
+	 *params = INT_TO_BOOL(ctx->Pixel.MapItoRsize);
+	 break;
+      case GL_PIXEL_MAP_R_TO_R_SIZE:
+	 *params = INT_TO_BOOL(ctx->Pixel.MapRtoRsize);
+	 break;
+      case GL_PIXEL_MAP_S_TO_S_SIZE:
+	 *params = INT_TO_BOOL(ctx->Pixel.MapStoSsize);
+	 break;
+      case GL_POINT_SIZE:
+	 *params = FLOAT_TO_BOOL(ctx->Point.Size);
+	 break;
+      case GL_POINT_SIZE_GRANULARITY:
+	 *params = FLOAT_TO_BOOL(ctx->Const.PointSizeGranularity );
+	 break;
+      case GL_POINT_SIZE_RANGE:
+	 params[0] = FLOAT_TO_BOOL(ctx->Const.MinPointSizeAA);
+	 params[1] = FLOAT_TO_BOOL(ctx->Const.MaxPointSizeAA);
+         break;
+      case GL_ALIASED_POINT_SIZE_RANGE:
+	 params[0] = FLOAT_TO_BOOL(ctx->Const.MinPointSize);
+	 params[1] = FLOAT_TO_BOOL(ctx->Const.MaxPointSize);
+	 break;
+      case GL_POINT_SMOOTH:
+	 *params = ctx->Point.SmoothFlag;
+	 break;
+      case GL_POINT_SMOOTH_HINT:
+	 *params = ENUM_TO_BOOL(ctx->Hint.PointSmooth);
+	 break;
+      case GL_POINT_SIZE_MIN_EXT:
+	 *params = FLOAT_TO_BOOL(ctx->Point.MinSize);
+	 break;
+      case GL_POINT_SIZE_MAX_EXT:
+	 *params = FLOAT_TO_BOOL(ctx->Point.MaxSize);
+	 break;
+      case GL_POINT_FADE_THRESHOLD_SIZE_EXT:
+	 *params = FLOAT_TO_BOOL(ctx->Point.Threshold);
+	 break;
+      case GL_DISTANCE_ATTENUATION_EXT:
+	 params[0] = FLOAT_TO_BOOL(ctx->Point.Params[0]);
+	 params[1] = FLOAT_TO_BOOL(ctx->Point.Params[1]);
+	 params[2] = FLOAT_TO_BOOL(ctx->Point.Params[2]);
+	 break;
+      case GL_POLYGON_MODE:
+	 params[0] = ENUM_TO_BOOL(ctx->Polygon.FrontMode);
+	 params[1] = ENUM_TO_BOOL(ctx->Polygon.BackMode);
+	 break;
+      case GL_POLYGON_OFFSET_BIAS_EXT:  /* GL_EXT_polygon_offset */
+         *params = FLOAT_TO_BOOL( ctx->Polygon.OffsetUnits );
+         break;
+      case GL_POLYGON_OFFSET_FACTOR:
+         *params = FLOAT_TO_BOOL( ctx->Polygon.OffsetFactor );
+         break;
+      case GL_POLYGON_OFFSET_UNITS:
+         *params = FLOAT_TO_BOOL( ctx->Polygon.OffsetUnits );
+         break;
+      case GL_POLYGON_SMOOTH:
+	 *params = ctx->Polygon.SmoothFlag;
+	 break;
+      case GL_POLYGON_SMOOTH_HINT:
+	 *params = ENUM_TO_BOOL(ctx->Hint.PolygonSmooth);
+	 break;
+      case GL_POLYGON_STIPPLE:
+	 *params = ctx->Polygon.StippleFlag;
+	 break;
+      case GL_PROJECTION_MATRIX:
+	 for (i=0;i<16;i++) {
+	    params[i] = FLOAT_TO_BOOL(ctx->ProjectionMatrixStack.Top->m[i]);
+	 }
+	 break;
+      case GL_PROJECTION_STACK_DEPTH:
+	 *params = INT_TO_BOOL(ctx->ProjectionMatrixStack.Depth + 1);
+	 break;
+      case GL_READ_BUFFER:
+	 *params = ENUM_TO_BOOL(ctx->Pixel.ReadBuffer);
+	 break;
+      case GL_RED_BIAS:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.RedBias);
+	 break;
+      case GL_RED_BITS:
+         *params = INT_TO_BOOL( ctx->Visual.redBits );
+	 break;
+      case GL_RED_SCALE:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.RedScale);
+	 break;
+      case GL_RENDER_MODE:
+	 *params = ENUM_TO_BOOL(ctx->RenderMode);
+	 break;
+      case GL_RESCALE_NORMAL:
+         *params = ctx->Transform.RescaleNormals;
+         break;
+      case GL_RGBA_MODE:
+         *params = ctx->Visual.rgbMode;
+	 break;
+      case GL_SCISSOR_BOX:
+	 params[0] = INT_TO_BOOL(ctx->Scissor.X);
+	 params[1] = INT_TO_BOOL(ctx->Scissor.Y);
+	 params[2] = INT_TO_BOOL(ctx->Scissor.Width);
+	 params[3] = INT_TO_BOOL(ctx->Scissor.Height);
+	 break;
+      case GL_SCISSOR_TEST:
+	 *params = ctx->Scissor.Enabled;
+	 break;
+      case GL_SELECTION_BUFFER_SIZE:
+         *params = INT_TO_BOOL(ctx->Select.BufferSize);
+         break;
+      case GL_SHADE_MODEL:
+	 *params = ENUM_TO_BOOL(ctx->Light.ShadeModel);
+	 break;
+      case GL_SHARED_TEXTURE_PALETTE_EXT:
+         *params = ctx->Texture.SharedPalette;
+         break;
+      case GL_STENCIL_BITS:
+	 *params = INT_TO_BOOL(ctx->Visual.stencilBits);
+	 break;
+      case GL_STENCIL_CLEAR_VALUE:
+	 *params = INT_TO_BOOL(ctx->Stencil.Clear);
+	 break;
+      case GL_STENCIL_FAIL:
+	 *params = ENUM_TO_BOOL(ctx->Stencil.FailFunc[ctx->Stencil.ActiveFace]);
+	 break;
+      case GL_STENCIL_FUNC:
+	 *params = ENUM_TO_BOOL(ctx->Stencil.Function[ctx->Stencil.ActiveFace]);
+	 break;
+      case GL_STENCIL_PASS_DEPTH_FAIL:
+	 *params = ENUM_TO_BOOL(ctx->Stencil.ZFailFunc[ctx->Stencil.ActiveFace]);
+	 break;
+      case GL_STENCIL_PASS_DEPTH_PASS:
+	 *params = ENUM_TO_BOOL(ctx->Stencil.ZPassFunc[ctx->Stencil.ActiveFace]);
+	 break;
+      case GL_STENCIL_REF:
+	 *params = INT_TO_BOOL(ctx->Stencil.Ref[ctx->Stencil.ActiveFace]);
+	 break;
+      case GL_STENCIL_TEST:
+	 *params = ctx->Stencil.Enabled;
+	 break;
+      case GL_STENCIL_VALUE_MASK:
+	 *params = INT_TO_BOOL(ctx->Stencil.ValueMask[ctx->Stencil.ActiveFace]);
+	 break;
+      case GL_STENCIL_WRITEMASK:
+	 *params = INT_TO_BOOL(ctx->Stencil.WriteMask[ctx->Stencil.ActiveFace]);
+	 break;
+      case GL_STEREO:
+	 *params = ctx->Visual.stereoMode;
+	 break;
+      case GL_SUBPIXEL_BITS:
+	 *params = INT_TO_BOOL(ctx->Const.SubPixelBits);
+	 break;
+      case GL_TEXTURE_1D:
+         *params = _mesa_IsEnabled(GL_TEXTURE_1D);
+	 break;
+      case GL_TEXTURE_2D:
+         *params = _mesa_IsEnabled(GL_TEXTURE_2D);
+	 break;
+      case GL_TEXTURE_3D:
+         *params = _mesa_IsEnabled(GL_TEXTURE_3D);
+	 break;
+      case GL_TEXTURE_BINDING_1D:
+         *params = INT_TO_BOOL(textureUnit->Current1D->Name);
+          break;
+      case GL_TEXTURE_BINDING_2D:
+         *params = INT_TO_BOOL(textureUnit->Current2D->Name);
+          break;
+      case GL_TEXTURE_BINDING_3D:
+         *params = INT_TO_BOOL(textureUnit->Current3D->Name);
+         break;
+      case GL_TEXTURE_ENV_COLOR:
+         {
+            params[0] = FLOAT_TO_BOOL(textureUnit->EnvColor[0]);
+            params[1] = FLOAT_TO_BOOL(textureUnit->EnvColor[1]);
+            params[2] = FLOAT_TO_BOOL(textureUnit->EnvColor[2]);
+            params[3] = FLOAT_TO_BOOL(textureUnit->EnvColor[3]);
+         }
+	 break;
+      case GL_TEXTURE_ENV_MODE:
+	 *params = ENUM_TO_BOOL(textureUnit->EnvMode);
+	 break;
+      case GL_TEXTURE_GEN_S:
+	 *params = (textureUnit->TexGenEnabled & S_BIT) ? GL_TRUE : GL_FALSE;
+	 break;
+      case GL_TEXTURE_GEN_T:
+	 *params = (textureUnit->TexGenEnabled & T_BIT) ? GL_TRUE : GL_FALSE;
+	 break;
+      case GL_TEXTURE_GEN_R:
+	 *params = (textureUnit->TexGenEnabled & R_BIT) ? GL_TRUE : GL_FALSE;
+	 break;
+      case GL_TEXTURE_GEN_Q:
+	 *params = (textureUnit->TexGenEnabled & Q_BIT) ? GL_TRUE : GL_FALSE;
+	 break;
+      case GL_TEXTURE_MATRIX:
+	 for (i=0;i<16;i++) {
+	    params[i] =
+	       FLOAT_TO_BOOL(ctx->TextureMatrixStack[texUnit].Top->m[i]);
+	 }
+	 break;
+      case GL_TEXTURE_STACK_DEPTH:
+	 *params = INT_TO_BOOL(ctx->TextureMatrixStack[texUnit].Depth + 1);
+	 break;
+      case GL_UNPACK_ALIGNMENT:
+	 *params = INT_TO_BOOL(ctx->Unpack.Alignment);
+	 break;
+      case GL_UNPACK_LSB_FIRST:
+	 *params = ctx->Unpack.LsbFirst;
+	 break;
+      case GL_UNPACK_ROW_LENGTH:
+	 *params = INT_TO_BOOL(ctx->Unpack.RowLength);
+	 break;
+      case GL_UNPACK_SKIP_PIXELS:
+	 *params = INT_TO_BOOL(ctx->Unpack.SkipPixels);
+	 break;
+      case GL_UNPACK_SKIP_ROWS:
+	 *params = INT_TO_BOOL(ctx->Unpack.SkipRows);
+	 break;
+      case GL_UNPACK_SWAP_BYTES:
+	 *params = ctx->Unpack.SwapBytes;
+	 break;
+      case GL_UNPACK_SKIP_IMAGES_EXT:
+         *params = ctx->Unpack.SkipImages;
+         break;
+      case GL_UNPACK_IMAGE_HEIGHT_EXT:
+         *params = ctx->Unpack.ImageHeight;
+         break;
+      case GL_UNPACK_CLIENT_STORAGE_APPLE:
+         *params = ctx->Unpack.ClientStorage;
+         break;
+      case GL_VIEWPORT:
+	 params[0] = INT_TO_BOOL(ctx->Viewport.X);
+	 params[1] = INT_TO_BOOL(ctx->Viewport.Y);
+	 params[2] = INT_TO_BOOL(ctx->Viewport.Width);
+	 params[3] = INT_TO_BOOL(ctx->Viewport.Height);
+	 break;
+      case GL_ZOOM_X:
+	 *params = FLOAT_TO_BOOL(ctx->Pixel.ZoomX);
+	 break;
+      case GL_ZOOM_Y:
+	 *params = FLOAT_TO_BOOL(ctx->Pixel.ZoomY);
+	 break;
+      case GL_VERTEX_ARRAY:
+         *params = ctx->Array.Vertex.Enabled;
+         break;
+      case GL_VERTEX_ARRAY_SIZE:
+         *params = INT_TO_BOOL(ctx->Array.Vertex.Size);
+         break;
+      case GL_VERTEX_ARRAY_TYPE:
+         *params = ENUM_TO_BOOL(ctx->Array.Vertex.Type);
+         break;
+      case GL_VERTEX_ARRAY_STRIDE:
+         *params = INT_TO_BOOL(ctx->Array.Vertex.Stride);
+         break;
+      case GL_VERTEX_ARRAY_COUNT_EXT:
+         *params = INT_TO_BOOL(0);
+         break;
+      case GL_NORMAL_ARRAY:
+         *params = ctx->Array.Normal.Enabled;
+         break;
+      case GL_NORMAL_ARRAY_TYPE:
+         *params = ENUM_TO_BOOL(ctx->Array.Normal.Type);
+         break;
+      case GL_NORMAL_ARRAY_STRIDE:
+         *params = INT_TO_BOOL(ctx->Array.Normal.Stride);
+         break;
+      case GL_NORMAL_ARRAY_COUNT_EXT:
+         *params = INT_TO_BOOL(0);
+         break;
+      case GL_COLOR_ARRAY:
+         *params = ctx->Array.Color.Enabled;
+         break;
+      case GL_COLOR_ARRAY_SIZE:
+         *params = INT_TO_BOOL(ctx->Array.Color.Size);
+         break;
+      case GL_COLOR_ARRAY_TYPE:
+         *params = ENUM_TO_BOOL(ctx->Array.Color.Type);
+         break;
+      case GL_COLOR_ARRAY_STRIDE:
+         *params = INT_TO_BOOL(ctx->Array.Color.Stride);
+         break;
+      case GL_COLOR_ARRAY_COUNT_EXT:
+         *params = INT_TO_BOOL(0);
+         break;
+      case GL_INDEX_ARRAY:
+         *params = ctx->Array.Index.Enabled;
+         break;
+      case GL_INDEX_ARRAY_TYPE:
+         *params = ENUM_TO_BOOL(ctx->Array.Index.Type);
+         break;
+      case GL_INDEX_ARRAY_STRIDE:
+         *params = INT_TO_BOOL(ctx->Array.Index.Stride);
+         break;
+      case GL_INDEX_ARRAY_COUNT_EXT:
+         *params = INT_TO_BOOL(0);
+         break;
+      case GL_TEXTURE_COORD_ARRAY:
+         *params = ctx->Array.TexCoord[clientUnit].Enabled;
+         break;
+      case GL_TEXTURE_COORD_ARRAY_SIZE:
+         *params = INT_TO_BOOL(ctx->Array.TexCoord[clientUnit].Size);
+         break;
+      case GL_TEXTURE_COORD_ARRAY_TYPE:
+         *params = ENUM_TO_BOOL(ctx->Array.TexCoord[clientUnit].Type);
+         break;
+      case GL_TEXTURE_COORD_ARRAY_STRIDE:
+         *params = INT_TO_BOOL(ctx->Array.TexCoord[clientUnit].Stride);
+         break;
+      case GL_TEXTURE_COORD_ARRAY_COUNT_EXT:
+         *params = INT_TO_BOOL(0);
+         break;
+      case GL_EDGE_FLAG_ARRAY:
+         *params = ctx->Array.EdgeFlag.Enabled;
+         break;
+      case GL_EDGE_FLAG_ARRAY_STRIDE:
+         *params = INT_TO_BOOL(ctx->Array.EdgeFlag.Stride);
+         break;
+      case GL_EDGE_FLAG_ARRAY_COUNT_EXT:
+         *params = INT_TO_BOOL(0);
+         break;
+
+      /* GL_ARB_multitexture */
+      case GL_MAX_TEXTURE_UNITS_ARB:
+         CHECK_EXTENSION_B(ARB_multitexture, pname);
+         *params = INT_TO_BOOL(MIN2(ctx->Const.MaxTextureImageUnits,
+                                    ctx->Const.MaxTextureCoordUnits));
+         break;
+      case GL_ACTIVE_TEXTURE_ARB:
+         CHECK_EXTENSION_B(ARB_multitexture, pname);
+         *params = INT_TO_BOOL(GL_TEXTURE0_ARB + ctx->Texture.CurrentUnit);
+         break;
+      case GL_CLIENT_ACTIVE_TEXTURE_ARB:
+         CHECK_EXTENSION_B(ARB_multitexture, pname);
+         *params = INT_TO_BOOL(GL_TEXTURE0_ARB + clientUnit);
+         break;
+
+      /* GL_ARB_texture_cube_map */
+      case GL_TEXTURE_CUBE_MAP_ARB:
+         CHECK_EXTENSION_B(ARB_texture_cube_map, pname);
+         *params = _mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB);
+         break;
+      case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
+         CHECK_EXTENSION_B(ARB_texture_cube_map, pname);
+         *params = INT_TO_BOOL(textureUnit->CurrentCubeMap->Name);
+         break;
+      case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
+         CHECK_EXTENSION_B(ARB_texture_cube_map, pname);
+         *params = INT_TO_BOOL(1 << (ctx->Const.MaxCubeTextureLevels - 1));
+         break;
+
+      /* GL_ARB_texture_compression */
+      case GL_TEXTURE_COMPRESSION_HINT_ARB:
+         CHECK_EXTENSION_B(ARB_texture_compression, pname);
+         *params = INT_TO_BOOL(ctx->Hint.TextureCompression);
+         break;
+      case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:
+         CHECK_EXTENSION_B(ARB_texture_compression, pname);
+         *params = INT_TO_BOOL(_mesa_get_compressed_formats(ctx, NULL));
+         break;
+      case GL_COMPRESSED_TEXTURE_FORMATS_ARB:
+         CHECK_EXTENSION_B(ARB_texture_compression, pname);
+         {
+            GLint formats[100];
+            GLuint i, n;
+            n = _mesa_get_compressed_formats(ctx, formats);
+            for (i = 0; i < n; i++)
+               params[i] = INT_TO_BOOL(formats[i]);
+         }
+         break;
+
+      /* GL_EXT_compiled_vertex_array */
+      case GL_ARRAY_ELEMENT_LOCK_FIRST_EXT:
+	 *params = ctx->Array.LockFirst ? GL_TRUE : GL_FALSE;
+	 break;
+      case GL_ARRAY_ELEMENT_LOCK_COUNT_EXT:
+	 *params = ctx->Array.LockCount ? GL_TRUE : GL_FALSE;
+	 break;
+
+      /* GL_ARB_transpose_matrix */
+      case GL_TRANSPOSE_COLOR_MATRIX_ARB:
+         {
+            GLfloat tm[16];
+            GLuint i;
+            _math_transposef(tm, ctx->ColorMatrixStack.Top->m);
+            for (i=0;i<16;i++) {
+               params[i] = FLOAT_TO_BOOL(tm[i]);
+            }
+         }
+         break;
+      case GL_TRANSPOSE_MODELVIEW_MATRIX_ARB:
+         {
+            GLfloat tm[16];
+            GLuint i;
+            _math_transposef(tm, ctx->ModelviewMatrixStack.Top->m);
+            for (i=0;i<16;i++) {
+               params[i] = FLOAT_TO_BOOL(tm[i]);
+            }
+         }
+         break;
+      case GL_TRANSPOSE_PROJECTION_MATRIX_ARB:
+         {
+            GLfloat tm[16];
+            GLuint i;
+            _math_transposef(tm, ctx->ProjectionMatrixStack.Top->m);
+            for (i=0;i<16;i++) {
+               params[i] = FLOAT_TO_BOOL(tm[i]);
+            }
+         }
+         break;
+      case GL_TRANSPOSE_TEXTURE_MATRIX_ARB:
+         {
+            GLfloat tm[16];
+            GLuint i;
+            _math_transposef(tm, ctx->TextureMatrixStack[texUnit].Top->m);
+            for (i=0;i<16;i++) {
+               params[i] = FLOAT_TO_BOOL(tm[i]);
+            }
+         }
+         break;
+
+      /* GL_HP_occlusion_test */
+      case GL_OCCLUSION_TEST_HP:
+         CHECK_EXTENSION_B(HP_occlusion_test, pname);
+         *params = ctx->Depth.OcclusionTest;
+         return;
+      case GL_OCCLUSION_TEST_RESULT_HP:
+         CHECK_EXTENSION_B(HP_occlusion_test, pname);
+         if (ctx->Depth.OcclusionTest)
+            *params = ctx->OcclusionResult;
+         else
+            *params = ctx->OcclusionResultSaved;
+         /* reset flag now */
+         ctx->OcclusionResult = GL_FALSE;
+         ctx->OcclusionResultSaved = GL_FALSE;
+         return;
+
+      /* GL_SGIS_pixel_texture */
+      case GL_PIXEL_TEXTURE_SGIS:
+         *params = ctx->Pixel.PixelTextureEnabled;
+         break;
+
+      /* GL_SGIX_pixel_texture */
+      case GL_PIXEL_TEX_GEN_SGIX:
+         *params = ctx->Pixel.PixelTextureEnabled;
+         break;
+      case GL_PIXEL_TEX_GEN_MODE_SGIX:
+         *params = (GLboolean) pixel_texgen_mode(ctx);
+         break;
+
+      /* GL_SGI_color_matrix (also in 1.2 imaging) */
+      case GL_COLOR_MATRIX_SGI:
+         for (i=0;i<16;i++) {
+	    params[i] = FLOAT_TO_BOOL(ctx->ColorMatrixStack.Top->m[i]);
+	 }
+	 break;
+      case GL_COLOR_MATRIX_STACK_DEPTH_SGI:
+         *params = INT_TO_BOOL(ctx->ColorMatrixStack.Depth + 1);
+         break;
+      case GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI:
+         *params = FLOAT_TO_BOOL(MAX_COLOR_STACK_DEPTH);
+         break;
+      case GL_POST_COLOR_MATRIX_RED_SCALE_SGI:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostColorMatrixScale[0]);
+         break;
+      case GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostColorMatrixScale[1]);
+         break;
+      case GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostColorMatrixScale[2]);
+         break;
+      case GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostColorMatrixScale[3]);
+         break;
+      case GL_POST_COLOR_MATRIX_RED_BIAS_SGI:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostColorMatrixBias[0]);
+         break;
+      case GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostColorMatrixBias[1]);
+         break;
+      case GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostColorMatrixBias[2]);
+         break;
+      case GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostColorMatrixBias[3]);
+         break;
+
+      /* GL_EXT_convolution (also in 1.2 imaging) */
+      case GL_CONVOLUTION_1D_EXT:
+         CHECK_EXTENSION_B(EXT_convolution, pname);
+         *params = ctx->Pixel.Convolution1DEnabled;
+         break;
+      case GL_CONVOLUTION_2D:
+         CHECK_EXTENSION_B(EXT_convolution, pname);
+         *params = ctx->Pixel.Convolution2DEnabled;
+         break;
+      case GL_SEPARABLE_2D:
+         CHECK_EXTENSION_B(EXT_convolution, pname);
+         *params = ctx->Pixel.Separable2DEnabled;
+         break;
+      case GL_POST_CONVOLUTION_RED_SCALE_EXT:
+         CHECK_EXTENSION_B(EXT_convolution, pname);
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostConvolutionScale[0]);
+         break;
+      case GL_POST_CONVOLUTION_GREEN_SCALE_EXT:
+         CHECK_EXTENSION_B(EXT_convolution, pname);
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostConvolutionScale[1]);
+         break;
+      case GL_POST_CONVOLUTION_BLUE_SCALE_EXT:
+         CHECK_EXTENSION_B(EXT_convolution, pname);
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostConvolutionScale[2]);
+         break;
+      case GL_POST_CONVOLUTION_ALPHA_SCALE_EXT:
+         CHECK_EXTENSION_B(EXT_convolution, pname);
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostConvolutionScale[3]);
+         break;
+      case GL_POST_CONVOLUTION_RED_BIAS_EXT:
+         CHECK_EXTENSION_B(EXT_convolution, pname);
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostConvolutionBias[0]);
+         break;
+      case GL_POST_CONVOLUTION_GREEN_BIAS_EXT:
+         CHECK_EXTENSION_B(EXT_convolution, pname);
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostConvolutionBias[1]);
+         break;
+      case GL_POST_CONVOLUTION_BLUE_BIAS_EXT:
+         CHECK_EXTENSION_B(EXT_convolution, pname);
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostConvolutionBias[2]);
+         break;
+      case GL_POST_CONVOLUTION_ALPHA_BIAS_EXT:
+         CHECK_EXTENSION_B(EXT_convolution, pname);
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostConvolutionBias[2]);
+         break;
+
+      /* GL_EXT_histogram (also in 1.2 imaging) */
+      case GL_HISTOGRAM:
+         CHECK_EXTENSION_B(EXT_histogram, pname);
+         *params = ctx->Pixel.HistogramEnabled;
+	 break;
+      case GL_MINMAX:
+         CHECK_EXTENSION_B(EXT_histogram, pname);
+         *params = ctx->Pixel.MinMaxEnabled;
+         break;
+
+      /* GL_SGI_color_table (also in 1.2 imaging */
+      case GL_COLOR_TABLE_SGI:
+         *params = ctx->Pixel.ColorTableEnabled;
+         break;
+      case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
+         *params = ctx->Pixel.PostConvolutionColorTableEnabled;
+         break;
+      case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
+         *params = ctx->Pixel.PostColorMatrixColorTableEnabled;
+         break;
+
+      /* GL_SGI_texture_color_table */
+      case GL_TEXTURE_COLOR_TABLE_SGI:
+         CHECK_EXTENSION_B(SGI_texture_color_table, pname);
+         *params = textureUnit->ColorTableEnabled;
+         break;
+
+      /* GL_EXT_secondary_color */
+      case GL_COLOR_SUM_EXT:
+         CHECK_EXTENSION_B(EXT_secondary_color, pname);
+	 *params = ctx->Fog.ColorSumEnabled;
+	 break;
+      case GL_CURRENT_SECONDARY_COLOR_EXT:
+         CHECK_EXTENSION_B(EXT_secondary_color, pname);
+	 FLUSH_CURRENT(ctx, 0);
+         params[0] = INT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][0]);
+         params[1] = INT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][1]);
+         params[2] = INT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][2]);
+         params[3] = INT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][3]);
+	 break;
+      case GL_SECONDARY_COLOR_ARRAY_EXT:
+         CHECK_EXTENSION_B(EXT_secondary_color, pname);
+         *params = ctx->Array.SecondaryColor.Enabled;
+         break;
+      case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
+         CHECK_EXTENSION_B(EXT_secondary_color, pname);
+	 *params = ENUM_TO_BOOL(ctx->Array.SecondaryColor.Type);
+	 break;
+      case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
+         CHECK_EXTENSION_B(EXT_secondary_color, pname);
+	 *params = INT_TO_BOOL(ctx->Array.SecondaryColor.Stride);
+	 break;
+      case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
+         CHECK_EXTENSION_B(EXT_secondary_color, pname);
+	 *params = INT_TO_BOOL(ctx->Array.SecondaryColor.Size);
+	 break;
+
+      /* GL_EXT_fog_coord */
+      case GL_CURRENT_FOG_COORDINATE_EXT:
+         CHECK_EXTENSION_B(EXT_fog_coord, pname);
+	 FLUSH_CURRENT(ctx, 0);
+	 *params = FLOAT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_FOG][0]);
+	 break;
+      case GL_FOG_COORDINATE_ARRAY_EXT:
+         CHECK_EXTENSION_B(EXT_fog_coord, pname);
+         *params = ctx->Array.FogCoord.Enabled;
+         break;
+      case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
+         CHECK_EXTENSION_B(EXT_fog_coord, pname);
+	 *params = ENUM_TO_BOOL(ctx->Array.FogCoord.Type);
+	 break;
+      case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
+         CHECK_EXTENSION_B(EXT_fog_coord, pname);
+	 *params = INT_TO_BOOL(ctx->Array.FogCoord.Stride);
+	 break;
+      case GL_FOG_COORDINATE_SOURCE_EXT:
+         CHECK_EXTENSION_B(EXT_fog_coord, pname);
+	 *params = ENUM_TO_BOOL(ctx->Fog.FogCoordinateSource);
+	 break;
+
+      /* GL_EXT_texture_lod_bias */
+      case GL_MAX_TEXTURE_LOD_BIAS_EXT:
+         *params = FLOAT_TO_BOOL(ctx->Const.MaxTextureLodBias);
+         break;
+
+      /* GL_EXT_texture_filter_anisotropic */
+      case GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT:
+         CHECK_EXTENSION_B(EXT_texture_filter_anisotropic, pname);
+         *params = FLOAT_TO_BOOL(ctx->Const.MaxTextureMaxAnisotropy);
+	 break;
+
+      /* GL_ARB_multisample */
+      case GL_MULTISAMPLE_ARB:
+         CHECK_EXTENSION_B(ARB_multisample, pname);
+         *params = ctx->Multisample.Enabled;
+         break;
+      case GL_SAMPLE_ALPHA_TO_COVERAGE_ARB:
+         CHECK_EXTENSION_B(ARB_multisample, pname);
+         *params = ctx->Multisample.SampleAlphaToCoverage;
+         break;
+      case GL_SAMPLE_ALPHA_TO_ONE_ARB:
+         CHECK_EXTENSION_B(ARB_multisample, pname);
+         *params = ctx->Multisample.SampleAlphaToOne;
+         break;
+      case GL_SAMPLE_COVERAGE_ARB:
+         CHECK_EXTENSION_B(ARB_multisample, pname);
+         *params = ctx->Multisample.SampleCoverage;
+         break;
+      case GL_SAMPLE_COVERAGE_VALUE_ARB:
+         CHECK_EXTENSION_B(ARB_multisample, pname);
+         *params = FLOAT_TO_BOOL(ctx->Multisample.SampleCoverageValue);
+         break;
+      case GL_SAMPLE_COVERAGE_INVERT_ARB:
+         CHECK_EXTENSION_B(ARB_multisample, pname);
+         *params = ctx->Multisample.SampleCoverageInvert;
+         break;
+      case GL_SAMPLE_BUFFERS_ARB:
+         CHECK_EXTENSION_B(ARB_multisample, pname);
+         *params = 0; /* XXX fix someday */
+         break;
+      case GL_SAMPLES_ARB:
+         CHECK_EXTENSION_B(ARB_multisample, pname);
+         *params = 0; /* XXX fix someday */
+         break;
+
+      /* GL_IBM_rasterpos_clip */
+      case GL_RASTER_POSITION_UNCLIPPED_IBM:
+         CHECK_EXTENSION_B(IBM_rasterpos_clip, pname);
+         *params = ctx->Transform.RasterPositionUnclipped;
+         break;
+
+      /* GL_NV_point_sprite */
+      case GL_POINT_SPRITE_NV:
+         CHECK_EXTENSION2_B(NV_point_sprite, ARB_point_sprite, pname);
+         *params = ctx->Point.PointSprite;
+         break;
+      case GL_POINT_SPRITE_R_MODE_NV:
+         CHECK_EXTENSION_B(NV_point_sprite, pname);
+         *params = ENUM_TO_BOOL(ctx->Point.SpriteRMode);
+         break;
+
+      /* GL_SGIS_generate_mipmap */
+      case GL_GENERATE_MIPMAP_HINT_SGIS:
+         CHECK_EXTENSION_B(SGIS_generate_mipmap, pname);
+         *params = ENUM_TO_BOOL(ctx->Hint.GenerateMipmap);
+         break;
+
+#if FEATURE_NV_vertex_program
+      case GL_VERTEX_PROGRAM_NV:
+         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         *params = ctx->VertexProgram.Enabled;
+         break;
+      case GL_VERTEX_PROGRAM_POINT_SIZE_NV:
+         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         *params = ctx->VertexProgram.PointSizeEnabled;
+         break;
+      case GL_VERTEX_PROGRAM_TWO_SIDE_NV:
+         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         *params = ctx->VertexProgram.TwoSideEnabled;
+         break;
+      case GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV:
+         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         *params = (ctx->Const.MaxProgramMatrixStackDepth > 0) ? GL_TRUE : GL_FALSE;
+         break;
+      case GL_MAX_TRACK_MATRICES_NV:
+         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         *params = (ctx->Const.MaxProgramMatrices > 0) ? GL_TRUE : GL_FALSE;
+         break;
+      case GL_CURRENT_MATRIX_STACK_DEPTH_NV:
+         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         *params = GL_TRUE;
+         break;
+      case GL_CURRENT_MATRIX_NV:
+         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         for (i = 0; i < 16; i++)
+            params[i] = FLOAT_TO_BOOL(ctx->CurrentStack->Top->m[i]);
+         break;
+      case GL_VERTEX_PROGRAM_BINDING_NV:
+         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         if (ctx->VertexProgram.Current &&
+             ctx->VertexProgram.Current->Base.Id != 0)
+            *params = GL_TRUE;
+         else
+            *params = GL_FALSE;
+         break;
+      case GL_PROGRAM_ERROR_POSITION_NV:
+         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         *params = (ctx->Program.ErrorPos != 0) ? GL_TRUE : GL_FALSE;
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY0_NV:
+      case GL_VERTEX_ATTRIB_ARRAY1_NV:
+      case GL_VERTEX_ATTRIB_ARRAY2_NV:
+      case GL_VERTEX_ATTRIB_ARRAY3_NV:
+      case GL_VERTEX_ATTRIB_ARRAY4_NV:
+      case GL_VERTEX_ATTRIB_ARRAY5_NV:
+      case GL_VERTEX_ATTRIB_ARRAY6_NV:
+      case GL_VERTEX_ATTRIB_ARRAY7_NV:
+      case GL_VERTEX_ATTRIB_ARRAY8_NV:
+      case GL_VERTEX_ATTRIB_ARRAY9_NV:
+      case GL_VERTEX_ATTRIB_ARRAY10_NV:
+      case GL_VERTEX_ATTRIB_ARRAY11_NV:
+      case GL_VERTEX_ATTRIB_ARRAY12_NV:
+      case GL_VERTEX_ATTRIB_ARRAY13_NV:
+      case GL_VERTEX_ATTRIB_ARRAY14_NV:
+      case GL_VERTEX_ATTRIB_ARRAY15_NV:
+         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         {
+            GLuint n = (GLuint) pname - GL_VERTEX_ATTRIB_ARRAY0_NV;
+            *params = ctx->Array.VertexAttrib[n].Enabled;
+         }
+         break;
+      case GL_MAP1_VERTEX_ATTRIB0_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB1_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB2_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB3_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB4_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB5_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB6_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB7_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB8_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB9_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB10_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB11_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB12_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB13_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB14_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB15_4_NV:
+         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         {
+            GLuint n = (GLuint) pname - GL_MAP1_VERTEX_ATTRIB0_4_NV;
+            *params = ctx->Eval.Map1Attrib[n];
+         }
+         break;
+      case GL_MAP2_VERTEX_ATTRIB0_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB1_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB2_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB3_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB4_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB5_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB6_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB7_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB8_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB9_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB10_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB11_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB12_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB13_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB14_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB15_4_NV:
+         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         {
+            GLuint n = (GLuint) pname - GL_MAP2_VERTEX_ATTRIB0_4_NV;
+            *params = ctx->Eval.Map2Attrib[n];
+         }
+         break;
+#endif /* FEATURE_NV_vertex_program */
+
+#if FEATURE_NV_fragment_program
+      case GL_FRAGMENT_PROGRAM_NV:
+         CHECK_EXTENSION_B(NV_fragment_program, pname);
+         *params = ctx->FragmentProgram.Enabled;
+         break;
+      case GL_MAX_TEXTURE_COORDS_NV:
+         CHECK_EXTENSION_B(NV_fragment_program, pname);
+         *params = INT_TO_BOOL(ctx->Const.MaxTextureCoordUnits);
+         break;
+      case GL_MAX_TEXTURE_IMAGE_UNITS_NV:
+         CHECK_EXTENSION_B(NV_fragment_program, pname);
+         *params = INT_TO_BOOL(ctx->Const.MaxTextureImageUnits);
+         break;
+      case GL_FRAGMENT_PROGRAM_BINDING_NV:
+         CHECK_EXTENSION_B(NV_fragment_program, pname);
+         if (ctx->VertexProgram.Current &&
+             ctx->VertexProgram.Current->Base.Id != 0)
+            *params = GL_TRUE;
+         else
+            *params = GL_FALSE;
+         break;
+      case GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV:
+         CHECK_EXTENSION_B(NV_fragment_program, pname);
+         *params = MAX_NV_FRAGMENT_PROGRAM_PARAMS ? GL_TRUE : GL_FALSE;
+         break;
+#endif /* FEATURE_NV_fragment_program */
+
+      /* GL_NV_texture_rectangle */
+      case GL_TEXTURE_RECTANGLE_NV:
+         CHECK_EXTENSION_B(NV_texture_rectangle, pname);
+         *params = _mesa_IsEnabled(GL_TEXTURE_RECTANGLE_NV);
+         break;
+      case GL_TEXTURE_BINDING_RECTANGLE_NV:
+         CHECK_EXTENSION_B(NV_texture_rectangle, pname);
+         *params = INT_TO_BOOL(textureUnit->CurrentRect->Name);
+         break;
+      case GL_MAX_RECTANGLE_TEXTURE_SIZE_NV:
+         CHECK_EXTENSION_B(NV_texture_rectangle, pname);
+         *params = INT_TO_BOOL(ctx->Const.MaxTextureRectSize);
+         break;
+
+      /* GL_EXT_stencil_two_side */
+      case GL_STENCIL_TEST_TWO_SIDE_EXT:
+         CHECK_EXTENSION_B(EXT_stencil_two_side, pname);
+         *params = ctx->Stencil.TestTwoSide;
+         break;
+      case GL_ACTIVE_STENCIL_FACE_EXT:
+         CHECK_EXTENSION_B(EXT_stencil_two_side, pname);
+         *params = ENUM_TO_BOOL(ctx->Stencil.ActiveFace ? GL_BACK : GL_FRONT);
+         break;
+
+      /* GL_NV_light_max_exponent */
+      case GL_MAX_SHININESS_NV:
+         *params = FLOAT_TO_BOOL(ctx->Const.MaxShininess);
+         break;
+      case GL_MAX_SPOT_EXPONENT_NV:
+         *params = FLOAT_TO_BOOL(ctx->Const.MaxSpotExponent);
+         break;
+         
+#if FEATURE_ARB_vertex_buffer_object
+      case GL_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_B(ARB_vertex_buffer_object, pname);
+         *params = INT_TO_BOOL(ctx->Array.ArrayBufferObj->Name);
+         break;
+      case GL_VERTEX_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_B(ARB_vertex_buffer_object, pname);
+         *params = INT_TO_BOOL(ctx->Array.Vertex.BufferObj->Name);
+         break;
+      case GL_NORMAL_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_B(ARB_vertex_buffer_object, pname);
+         *params = INT_TO_BOOL(ctx->Array.Normal.BufferObj->Name);
+         break;
+      case GL_COLOR_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_B(ARB_vertex_buffer_object, pname);
+         *params = INT_TO_BOOL(ctx->Array.Color.BufferObj->Name);
+         break;
+      case GL_INDEX_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_B(ARB_vertex_buffer_object, pname);
+         *params = INT_TO_BOOL(ctx->Array.Index.BufferObj->Name);
+         break;
+      case GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_B(ARB_vertex_buffer_object, pname);
+         *params = INT_TO_BOOL(ctx->Array.TexCoord[clientUnit].BufferObj->Name);
+         break;
+      case GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_B(ARB_vertex_buffer_object, pname);
+         *params = INT_TO_BOOL(ctx->Array.EdgeFlag.BufferObj->Name);
+         break;
+      case GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_B(ARB_vertex_buffer_object, pname);
+         *params = INT_TO_BOOL(ctx->Array.SecondaryColor.BufferObj->Name);
+         break;
+      case GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_B(ARB_vertex_buffer_object, pname);
+         *params = INT_TO_BOOL(ctx->Array.FogCoord.BufferObj->Name);
+         break;
+      /*case GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB: - not supported */
+      case GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_B(ARB_vertex_buffer_object, pname);
+         *params = INT_TO_BOOL(ctx->Array.ElementArrayBufferObj->Name);
+         break;
+#endif
+
+#if FEATURE_ARB_fragment_program
+      case GL_FRAGMENT_PROGRAM_ARB:
+         CHECK_EXTENSION_B(ARB_fragment_program, pname);
+         *params = ctx->FragmentProgram.Enabled;
+         break;
+      case GL_TRANSPOSE_CURRENT_MATRIX_ARB:
+         CHECK_EXTENSION_B(ARB_fragment_program, pname);
+         params[0] = FLOAT_TO_BOOL(ctx->CurrentStack->Top->m[0]);
+         params[1] = FLOAT_TO_BOOL(ctx->CurrentStack->Top->m[4]);
+         params[2] = FLOAT_TO_BOOL(ctx->CurrentStack->Top->m[8]);
+         params[3] = FLOAT_TO_BOOL(ctx->CurrentStack->Top->m[12]);
+         params[4] = FLOAT_TO_BOOL(ctx->CurrentStack->Top->m[1]);
+         params[5] = FLOAT_TO_BOOL(ctx->CurrentStack->Top->m[5]);
+         params[6] = FLOAT_TO_BOOL(ctx->CurrentStack->Top->m[9]);
+         params[7] = FLOAT_TO_BOOL(ctx->CurrentStack->Top->m[13]);
+         params[8] = FLOAT_TO_BOOL(ctx->CurrentStack->Top->m[2]);
+         params[9] = FLOAT_TO_BOOL(ctx->CurrentStack->Top->m[6]);
+         params[10] = FLOAT_TO_BOOL(ctx->CurrentStack->Top->m[10]);
+         params[11] = FLOAT_TO_BOOL(ctx->CurrentStack->Top->m[14]);
+         params[12] = FLOAT_TO_BOOL(ctx->CurrentStack->Top->m[3]);
+         params[13] = FLOAT_TO_BOOL(ctx->CurrentStack->Top->m[7]);
+         params[14] = FLOAT_TO_BOOL(ctx->CurrentStack->Top->m[11]);
+         params[15] = FLOAT_TO_BOOL(ctx->CurrentStack->Top->m[15]);
+         break;
+      /* Remaining ARB_fragment_program queries alias with
+       * the GL_NV_fragment_program queries.
+       */
+#endif
+
+      /* GL_EXT_depth_bounds_test */
+      case GL_DEPTH_BOUNDS_TEST_EXT:
+         CHECK_EXTENSION_B(EXT_depth_bounds_test, pname);
+         params[0] = ctx->Depth.BoundsTest;
+         break;
+      case GL_DEPTH_BOUNDS_EXT:
+         CHECK_EXTENSION_B(EXT_depth_bounds_test, pname);
+         params[0] = FLOAT_TO_BOOL(ctx->Depth.BoundsMin);
+         params[1] = FLOAT_TO_BOOL(ctx->Depth.BoundsMax);
+         break;
+
+#if FEATURE_MESA_program_debug
+      case GL_FRAGMENT_PROGRAM_CALLBACK_MESA:
+         CHECK_EXTENSION_B(MESA_program_debug, pname);
+         *params = ctx->FragmentProgram.CallbackEnabled;
+         break;
+      case GL_VERTEX_PROGRAM_CALLBACK_MESA:
+         CHECK_EXTENSION_B(MESA_program_debug, pname);
+         *params = ctx->VertexProgram.CallbackEnabled;
+         break;
+      case GL_FRAGMENT_PROGRAM_POSITION_MESA:
+         CHECK_EXTENSION_B(MESA_program_debug, pname);
+         *params = INT_TO_BOOL(ctx->FragmentProgram.CurrentPosition);
+         break;
+      case GL_VERTEX_PROGRAM_POSITION_MESA:
+         CHECK_EXTENSION_B(MESA_program_debug, pname);
+         *params = INT_TO_BOOL(ctx->VertexProgram.CurrentPosition);
+         break;
+#endif
+
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetBooleanv(pname=0x%x)", pname);
+   }
+}
+
+
+/**
+ * Get the value(s) of a selected parameter.
+ *
+ * \param pname parameter to be returned.
+ * \param params will hold the value(s) of the speficifed parameter.
+ *
+ * \sa glGetDoublev().
+ *
+ * Tries to get the specified parameter via dd_function_table::GetDoublev,
+ * otherwise gets the specified parameter from the current context, converting
+ * it value into GLdouble.
+ */
+void GLAPIENTRY
+_mesa_GetDoublev( GLenum pname, GLdouble *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint i;
+   const GLuint clientUnit = ctx->Array.ActiveTexture;
+   const GLuint texUnit = ctx->Texture.CurrentUnit;
+   const struct gl_texture_unit *textureUnit = &ctx->Texture.Unit[texUnit];
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (!params)
+      return;
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glGetDoublev %s\n", _mesa_lookup_enum_by_nr(pname));
+
+   if (!ctx->_CurrentProgram) {
+      /* We need this in order to get correct results for
+       * GL_OCCLUSION_TEST_RESULT_HP.  There might be other important cases.
+       */
+      FLUSH_VERTICES(ctx, 0);
+   }
+
+   if (ctx->Driver.GetDoublev && (*ctx->Driver.GetDoublev)(ctx, pname, params))
+      return;
+
+   switch (pname) {
+      case GL_ACCUM_RED_BITS:
+         *params = (GLdouble) ctx->Visual.accumRedBits;
+         break;
+      case GL_ACCUM_GREEN_BITS:
+         *params = (GLdouble) ctx->Visual.accumGreenBits;
+         break;
+      case GL_ACCUM_BLUE_BITS:
+         *params = (GLdouble) ctx->Visual.accumBlueBits;
+         break;
+      case GL_ACCUM_ALPHA_BITS:
+         *params = (GLdouble) ctx->Visual.accumAlphaBits;
+         break;
+      case GL_ACCUM_CLEAR_VALUE:
+         params[0] = (GLdouble) ctx->Accum.ClearColor[0];
+         params[1] = (GLdouble) ctx->Accum.ClearColor[1];
+         params[2] = (GLdouble) ctx->Accum.ClearColor[2];
+         params[3] = (GLdouble) ctx->Accum.ClearColor[3];
+         break;
+      case GL_ALPHA_BIAS:
+         *params = (GLdouble) ctx->Pixel.AlphaBias;
+         break;
+      case GL_ALPHA_BITS:
+         *params = (GLdouble) ctx->Visual.alphaBits;
+         break;
+      case GL_ALPHA_SCALE:
+         *params = (GLdouble) ctx->Pixel.AlphaScale;
+         break;
+      case GL_ALPHA_TEST:
+         *params = (GLdouble) ctx->Color.AlphaEnabled;
+         break;
+      case GL_ALPHA_TEST_FUNC:
+         *params = ENUM_TO_DOUBLE(ctx->Color.AlphaFunc);
+         break;
+      case GL_ALPHA_TEST_REF:
+         *params = (GLdouble) ctx->Color.AlphaRef;
+         break;
+      case GL_ATTRIB_STACK_DEPTH:
+         *params = (GLdouble ) (ctx->AttribStackDepth);
+         break;
+      case GL_AUTO_NORMAL:
+         *params = (GLdouble) ctx->Eval.AutoNormal;
+         break;
+      case GL_AUX_BUFFERS:
+         *params = (GLdouble) ctx->Const.NumAuxBuffers;
+         break;
+      case GL_BLEND:
+         *params = (GLdouble) ctx->Color.BlendEnabled;
+         break;
+      case GL_BLEND_DST:
+         *params = ENUM_TO_DOUBLE(ctx->Color.BlendDstRGB);
+         break;
+      case GL_BLEND_SRC:
+         *params = ENUM_TO_DOUBLE(ctx->Color.BlendSrcRGB);
+         break;
+      case GL_BLEND_SRC_RGB_EXT:
+         *params = ENUM_TO_DOUBLE(ctx->Color.BlendSrcRGB);
+         break;
+      case GL_BLEND_DST_RGB_EXT:
+         *params = ENUM_TO_DOUBLE(ctx->Color.BlendDstRGB);
+         break;
+      case GL_BLEND_SRC_ALPHA_EXT:
+         *params = ENUM_TO_DOUBLE(ctx->Color.BlendSrcA);
+         break;
+      case GL_BLEND_DST_ALPHA_EXT:
+         *params = ENUM_TO_DOUBLE(ctx->Color.BlendDstA);
+         break;
+      case GL_BLEND_EQUATION_EXT:
+	 *params = ENUM_TO_DOUBLE(ctx->Color.BlendEquation);
+	 break;
+      case GL_BLEND_COLOR_EXT:
+	 params[0] = (GLdouble) ctx->Color.BlendColor[0];
+	 params[1] = (GLdouble) ctx->Color.BlendColor[1];
+	 params[2] = (GLdouble) ctx->Color.BlendColor[2];
+	 params[3] = (GLdouble) ctx->Color.BlendColor[3];
+	 break;
+      case GL_BLUE_BIAS:
+         *params = (GLdouble) ctx->Pixel.BlueBias;
+         break;
+      case GL_BLUE_BITS:
+         *params = (GLdouble) ctx->Visual.blueBits;
+         break;
+      case GL_BLUE_SCALE:
+         *params = (GLdouble) ctx->Pixel.BlueScale;
+         break;
+      case GL_CLIENT_ATTRIB_STACK_DEPTH:
+         *params = (GLdouble) (ctx->ClientAttribStackDepth);
+         break;
+      case GL_CLIP_PLANE0:
+      case GL_CLIP_PLANE1:
+      case GL_CLIP_PLANE2:
+      case GL_CLIP_PLANE3:
+      case GL_CLIP_PLANE4:
+      case GL_CLIP_PLANE5:
+         if (ctx->Transform.ClipPlanesEnabled & (1 << (pname - GL_CLIP_PLANE0)))
+            *params = 1.0;
+         else
+            *params = 0.0;
+         break;
+      case GL_COLOR_CLEAR_VALUE:
+         params[0] = (GLdouble) ctx->Color.ClearColor[0];
+         params[1] = (GLdouble) ctx->Color.ClearColor[1];
+         params[2] = (GLdouble) ctx->Color.ClearColor[2];
+         params[3] = (GLdouble) ctx->Color.ClearColor[3];
+         break;
+      case GL_COLOR_MATERIAL:
+         *params = (GLdouble) ctx->Light.ColorMaterialEnabled;
+         break;
+      case GL_COLOR_MATERIAL_FACE:
+         *params = ENUM_TO_DOUBLE(ctx->Light.ColorMaterialFace);
+         break;
+      case GL_COLOR_MATERIAL_PARAMETER:
+         *params = ENUM_TO_DOUBLE(ctx->Light.ColorMaterialMode);
+         break;
+      case GL_COLOR_WRITEMASK:
+         params[0] = ctx->Color.ColorMask[RCOMP] ? 1.0 : 0.0;
+         params[1] = ctx->Color.ColorMask[GCOMP] ? 1.0 : 0.0;
+         params[2] = ctx->Color.ColorMask[BCOMP] ? 1.0 : 0.0;
+         params[3] = ctx->Color.ColorMask[ACOMP] ? 1.0 : 0.0;
+         break;
+      case GL_CULL_FACE:
+         *params = (GLdouble) ctx->Polygon.CullFlag;
+         break;
+      case GL_CULL_FACE_MODE:
+         *params = ENUM_TO_DOUBLE(ctx->Polygon.CullFaceMode);
+         break;
+      case GL_CURRENT_COLOR:
+	 FLUSH_CURRENT(ctx, 0);
+         params[0] = ctx->Current.Attrib[VERT_ATTRIB_COLOR0][0];
+         params[1] = ctx->Current.Attrib[VERT_ATTRIB_COLOR0][1];
+         params[2] = ctx->Current.Attrib[VERT_ATTRIB_COLOR0][2];
+         params[3] = ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3];
+         break;
+      case GL_CURRENT_INDEX:
+	 FLUSH_CURRENT(ctx, 0);
+         *params = (GLdouble) ctx->Current.Index;
+         break;
+      case GL_CURRENT_NORMAL:
+	 FLUSH_CURRENT(ctx, 0);
+         params[0] = (GLdouble) ctx->Current.Attrib[VERT_ATTRIB_NORMAL][0];
+         params[1] = (GLdouble) ctx->Current.Attrib[VERT_ATTRIB_NORMAL][1];
+         params[2] = (GLdouble) ctx->Current.Attrib[VERT_ATTRIB_NORMAL][2];
+         break;
+      case GL_CURRENT_RASTER_COLOR:
+	 params[0] = (GLdouble) ctx->Current.RasterColor[0];
+	 params[1] = (GLdouble) ctx->Current.RasterColor[1];
+	 params[2] = (GLdouble) ctx->Current.RasterColor[2];
+	 params[3] = (GLdouble) ctx->Current.RasterColor[3];
+	 break;
+      case GL_CURRENT_RASTER_DISTANCE:
+	 params[0] = (GLdouble) ctx->Current.RasterDistance;
+	 break;
+      case GL_CURRENT_RASTER_INDEX:
+	 *params = (GLdouble) ctx->Current.RasterIndex;
+	 break;
+      case GL_CURRENT_RASTER_POSITION:
+	 params[0] = (GLdouble) ctx->Current.RasterPos[0];
+	 params[1] = (GLdouble) ctx->Current.RasterPos[1];
+	 params[2] = (GLdouble) ctx->Current.RasterPos[2];
+	 params[3] = (GLdouble) ctx->Current.RasterPos[3];
+	 break;
+      case GL_CURRENT_RASTER_TEXTURE_COORDS:
+	 params[0] = (GLdouble) ctx->Current.RasterTexCoords[texUnit][0];
+	 params[1] = (GLdouble) ctx->Current.RasterTexCoords[texUnit][1];
+	 params[2] = (GLdouble) ctx->Current.RasterTexCoords[texUnit][2];
+	 params[3] = (GLdouble) ctx->Current.RasterTexCoords[texUnit][3];
+	 break;
+      case GL_CURRENT_RASTER_POSITION_VALID:
+	 *params = (GLdouble) ctx->Current.RasterPosValid;
+	 break;
+      case GL_CURRENT_TEXTURE_COORDS:
+	 FLUSH_CURRENT(ctx, 0);
+	 params[0] = (GLdouble) ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][0];
+	 params[1] = (GLdouble) ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][1];
+	 params[2] = (GLdouble) ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][2];
+	 params[3] = (GLdouble) ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][3];
+	 break;
+      case GL_DEPTH_BIAS:
+	 *params = (GLdouble) ctx->Pixel.DepthBias;
+	 break;
+      case GL_DEPTH_BITS:
+	 *params = (GLdouble) ctx->Visual.depthBits;
+	 break;
+      case GL_DEPTH_CLEAR_VALUE:
+	 *params = (GLdouble) ctx->Depth.Clear;
+	 break;
+      case GL_DEPTH_FUNC:
+	 *params = ENUM_TO_DOUBLE(ctx->Depth.Func);
+	 break;
+      case GL_DEPTH_RANGE:
+         params[0] = (GLdouble) ctx->Viewport.Near;
+         params[1] = (GLdouble) ctx->Viewport.Far;
+	 break;
+      case GL_DEPTH_SCALE:
+	 *params = (GLdouble) ctx->Pixel.DepthScale;
+	 break;
+      case GL_DEPTH_TEST:
+	 *params = (GLdouble) ctx->Depth.Test;
+	 break;
+      case GL_DEPTH_WRITEMASK:
+	 *params = (GLdouble) ctx->Depth.Mask;
+	 break;
+      case GL_DITHER:
+	 *params = (GLdouble) ctx->Color.DitherFlag;
+	 break;
+      case GL_DOUBLEBUFFER:
+	 *params = (GLdouble) ctx->Visual.doubleBufferMode;
+	 break;
+      case GL_DRAW_BUFFER:
+	 *params = ENUM_TO_DOUBLE(ctx->Color.DrawBuffer);
+	 break;
+      case GL_EDGE_FLAG:
+	 FLUSH_CURRENT(ctx, 0);
+	 *params = (GLdouble) ctx->Current.EdgeFlag;
+	 break;
+      case GL_FEEDBACK_BUFFER_SIZE:
+         *params = (GLdouble) ctx->Feedback.BufferSize;
+         break;
+      case GL_FEEDBACK_BUFFER_TYPE:
+         *params = ENUM_TO_DOUBLE(ctx->Feedback.Type);
+         break;
+      case GL_FOG:
+	 *params = (GLdouble) ctx->Fog.Enabled;
+	 break;
+      case GL_FOG_COLOR:
+	 params[0] = (GLdouble) ctx->Fog.Color[0];
+	 params[1] = (GLdouble) ctx->Fog.Color[1];
+	 params[2] = (GLdouble) ctx->Fog.Color[2];
+	 params[3] = (GLdouble) ctx->Fog.Color[3];
+	 break;
+      case GL_FOG_DENSITY:
+	 *params = (GLdouble) ctx->Fog.Density;
+	 break;
+      case GL_FOG_END:
+	 *params = (GLdouble) ctx->Fog.End;
+	 break;
+      case GL_FOG_HINT:
+	 *params = ENUM_TO_DOUBLE(ctx->Hint.Fog);
+	 break;
+      case GL_FOG_INDEX:
+	 *params = (GLdouble) ctx->Fog.Index;
+	 break;
+      case GL_FOG_MODE:
+	 *params = ENUM_TO_DOUBLE(ctx->Fog.Mode);
+	 break;
+      case GL_FOG_START:
+	 *params = (GLdouble) ctx->Fog.Start;
+	 break;
+      case GL_FRONT_FACE:
+	 *params = ENUM_TO_DOUBLE(ctx->Polygon.FrontFace);
+	 break;
+      case GL_GREEN_BIAS:
+         *params = (GLdouble) ctx->Pixel.GreenBias;
+         break;
+      case GL_GREEN_BITS:
+         *params = (GLdouble) ctx->Visual.greenBits;
+         break;
+      case GL_GREEN_SCALE:
+         *params = (GLdouble) ctx->Pixel.GreenScale;
+         break;
+      case GL_INDEX_BITS:
+         *params = (GLdouble) ctx->Visual.indexBits;
+	 break;
+      case GL_INDEX_CLEAR_VALUE:
+         *params = (GLdouble) ctx->Color.ClearIndex;
+	 break;
+      case GL_INDEX_MODE:
+	 *params = ctx->Visual.rgbMode ? 0.0 : 1.0;
+	 break;
+      case GL_INDEX_OFFSET:
+	 *params = (GLdouble) ctx->Pixel.IndexOffset;
+	 break;
+      case GL_INDEX_SHIFT:
+	 *params = (GLdouble) ctx->Pixel.IndexShift;
+	 break;
+      case GL_INDEX_WRITEMASK:
+	 *params = (GLdouble) ctx->Color.IndexMask;
+	 break;
+      case GL_LIGHT0:
+      case GL_LIGHT1:
+      case GL_LIGHT2:
+      case GL_LIGHT3:
+      case GL_LIGHT4:
+      case GL_LIGHT5:
+      case GL_LIGHT6:
+      case GL_LIGHT7:
+	 *params = (GLdouble) ctx->Light.Light[pname-GL_LIGHT0].Enabled;
+	 break;
+      case GL_LIGHTING:
+	 *params = (GLdouble) ctx->Light.Enabled;
+	 break;
+      case GL_LIGHT_MODEL_AMBIENT:
+	 params[0] = (GLdouble) ctx->Light.Model.Ambient[0];
+	 params[1] = (GLdouble) ctx->Light.Model.Ambient[1];
+	 params[2] = (GLdouble) ctx->Light.Model.Ambient[2];
+	 params[3] = (GLdouble) ctx->Light.Model.Ambient[3];
+	 break;
+      case GL_LIGHT_MODEL_COLOR_CONTROL:
+         params[0] = (GLdouble) ctx->Light.Model.ColorControl;
+         break;
+      case GL_LIGHT_MODEL_LOCAL_VIEWER:
+	 *params = (GLdouble) ctx->Light.Model.LocalViewer;
+	 break;
+      case GL_LIGHT_MODEL_TWO_SIDE:
+	 *params = (GLdouble) ctx->Light.Model.TwoSide;
+	 break;
+      case GL_LINE_SMOOTH:
+	 *params = (GLdouble) ctx->Line.SmoothFlag;
+	 break;
+      case GL_LINE_SMOOTH_HINT:
+	 *params = ENUM_TO_DOUBLE(ctx->Hint.LineSmooth);
+	 break;
+      case GL_LINE_STIPPLE:
+	 *params = (GLdouble) ctx->Line.StippleFlag;
+	 break;
+      case GL_LINE_STIPPLE_PATTERN:
+         *params = (GLdouble) ctx->Line.StipplePattern;
+         break;
+      case GL_LINE_STIPPLE_REPEAT:
+         *params = (GLdouble) ctx->Line.StippleFactor;
+         break;
+      case GL_LINE_WIDTH:
+	 *params = (GLdouble) ctx->Line.Width;
+	 break;
+      case GL_LINE_WIDTH_GRANULARITY:
+	 *params = (GLdouble) ctx->Const.LineWidthGranularity;
+	 break;
+      case GL_LINE_WIDTH_RANGE:
+	 params[0] = (GLdouble) ctx->Const.MinLineWidthAA;
+	 params[1] = (GLdouble) ctx->Const.MaxLineWidthAA;
+	 break;
+      case GL_ALIASED_LINE_WIDTH_RANGE:
+	 params[0] = (GLdouble) ctx->Const.MinLineWidth;
+	 params[1] = (GLdouble) ctx->Const.MaxLineWidth;
+	 break;
+      case GL_LIST_BASE:
+	 *params = (GLdouble) ctx->List.ListBase;
+	 break;
+      case GL_LIST_INDEX:
+	 *params = (GLdouble) ctx->ListState.CurrentListNum;
+	 break;
+      case GL_LIST_MODE:
+         if (!ctx->CompileFlag)
+            *params = 0.0;
+         else if (ctx->ExecuteFlag)
+            *params = ENUM_TO_DOUBLE(GL_COMPILE_AND_EXECUTE);
+         else
+            *params = ENUM_TO_DOUBLE(GL_COMPILE);
+	 break;
+      case GL_INDEX_LOGIC_OP:
+	 *params = (GLdouble) ctx->Color.IndexLogicOpEnabled;
+	 break;
+      case GL_COLOR_LOGIC_OP:
+	 *params = (GLdouble) ctx->Color.ColorLogicOpEnabled;
+	 break;
+      case GL_LOGIC_OP_MODE:
+         *params = ENUM_TO_DOUBLE(ctx->Color.LogicOp);
+	 break;
+      case GL_MAP1_COLOR_4:
+	 *params = (GLdouble) ctx->Eval.Map1Color4;
+	 break;
+      case GL_MAP1_GRID_DOMAIN:
+	 params[0] = (GLdouble) ctx->Eval.MapGrid1u1;
+	 params[1] = (GLdouble) ctx->Eval.MapGrid1u2;
+	 break;
+      case GL_MAP1_GRID_SEGMENTS:
+	 *params = (GLdouble) ctx->Eval.MapGrid1un;
+	 break;
+      case GL_MAP1_INDEX:
+	 *params = (GLdouble) ctx->Eval.Map1Index;
+	 break;
+      case GL_MAP1_NORMAL:
+	 *params = (GLdouble) ctx->Eval.Map1Normal;
+	 break;
+      case GL_MAP1_TEXTURE_COORD_1:
+	 *params = (GLdouble) ctx->Eval.Map1TextureCoord1;
+	 break;
+      case GL_MAP1_TEXTURE_COORD_2:
+	 *params = (GLdouble) ctx->Eval.Map1TextureCoord2;
+	 break;
+      case GL_MAP1_TEXTURE_COORD_3:
+	 *params = (GLdouble) ctx->Eval.Map1TextureCoord3;
+	 break;
+      case GL_MAP1_TEXTURE_COORD_4:
+	 *params = (GLdouble) ctx->Eval.Map1TextureCoord4;
+	 break;
+      case GL_MAP1_VERTEX_3:
+	 *params = (GLdouble) ctx->Eval.Map1Vertex3;
+	 break;
+      case GL_MAP1_VERTEX_4:
+	 *params = (GLdouble) ctx->Eval.Map1Vertex4;
+	 break;
+      case GL_MAP2_COLOR_4:
+	 *params = (GLdouble) ctx->Eval.Map2Color4;
+	 break;
+      case GL_MAP2_GRID_DOMAIN:
+	 params[0] = (GLdouble) ctx->Eval.MapGrid2u1;
+	 params[1] = (GLdouble) ctx->Eval.MapGrid2u2;
+	 params[2] = (GLdouble) ctx->Eval.MapGrid2v1;
+	 params[3] = (GLdouble) ctx->Eval.MapGrid2v2;
+	 break;
+      case GL_MAP2_GRID_SEGMENTS:
+	 params[0] = (GLdouble) ctx->Eval.MapGrid2un;
+	 params[1] = (GLdouble) ctx->Eval.MapGrid2vn;
+	 break;
+      case GL_MAP2_INDEX:
+	 *params = (GLdouble) ctx->Eval.Map2Index;
+	 break;
+      case GL_MAP2_NORMAL:
+	 *params = (GLdouble) ctx->Eval.Map2Normal;
+	 break;
+      case GL_MAP2_TEXTURE_COORD_1:
+	 *params = (GLdouble) ctx->Eval.Map2TextureCoord1;
+	 break;
+      case GL_MAP2_TEXTURE_COORD_2:
+	 *params = (GLdouble) ctx->Eval.Map2TextureCoord2;
+	 break;
+      case GL_MAP2_TEXTURE_COORD_3:
+	 *params = (GLdouble) ctx->Eval.Map2TextureCoord3;
+	 break;
+      case GL_MAP2_TEXTURE_COORD_4:
+	 *params = (GLdouble) ctx->Eval.Map2TextureCoord4;
+	 break;
+      case GL_MAP2_VERTEX_3:
+	 *params = (GLdouble) ctx->Eval.Map2Vertex3;
+	 break;
+      case GL_MAP2_VERTEX_4:
+	 *params = (GLdouble) ctx->Eval.Map2Vertex4;
+	 break;
+      case GL_MAP_COLOR:
+	 *params = (GLdouble) ctx->Pixel.MapColorFlag;
+	 break;
+      case GL_MAP_STENCIL:
+	 *params = (GLdouble) ctx->Pixel.MapStencilFlag;
+	 break;
+      case GL_MATRIX_MODE:
+	 *params = ENUM_TO_DOUBLE(ctx->Transform.MatrixMode);
+	 break;
+      case GL_MAX_ATTRIB_STACK_DEPTH:
+	 *params = (GLdouble) MAX_ATTRIB_STACK_DEPTH;
+	 break;
+      case GL_MAX_CLIENT_ATTRIB_STACK_DEPTH:
+         *params = (GLdouble) MAX_CLIENT_ATTRIB_STACK_DEPTH;
+         break;
+      case GL_MAX_CLIP_PLANES:
+	 *params = (GLdouble) ctx->Const.MaxClipPlanes;
+	 break;
+      case GL_MAX_ELEMENTS_VERTICES:  /* GL_VERSION_1_2 */
+         *params = (GLdouble) ctx->Const.MaxArrayLockSize;
+         break;
+      case GL_MAX_ELEMENTS_INDICES:   /* GL_VERSION_1_2 */
+         *params = (GLdouble) ctx->Const.MaxArrayLockSize;
+         break;
+      case GL_MAX_EVAL_ORDER:
+	 *params = (GLdouble) MAX_EVAL_ORDER;
+	 break;
+      case GL_MAX_LIGHTS:
+	 *params = (GLdouble) ctx->Const.MaxLights;
+	 break;
+      case GL_MAX_LIST_NESTING:
+	 *params = (GLdouble) MAX_LIST_NESTING;
+	 break;
+      case GL_MAX_MODELVIEW_STACK_DEPTH:
+	 *params = (GLdouble) MAX_MODELVIEW_STACK_DEPTH;
+	 break;
+      case GL_MAX_NAME_STACK_DEPTH:
+	 *params = (GLdouble) MAX_NAME_STACK_DEPTH;
+	 break;
+      case GL_MAX_PIXEL_MAP_TABLE:
+	 *params = (GLdouble) MAX_PIXEL_MAP_TABLE;
+	 break;
+      case GL_MAX_PROJECTION_STACK_DEPTH:
+	 *params = (GLdouble) MAX_PROJECTION_STACK_DEPTH;
+	 break;
+      case GL_MAX_TEXTURE_SIZE:
+         *params = (GLdouble) (1 << (ctx->Const.MaxTextureLevels - 1));
+	 break;
+      case GL_MAX_3D_TEXTURE_SIZE:
+         *params = (GLdouble) (1 << (ctx->Const.Max3DTextureLevels - 1));
+	 break;
+      case GL_MAX_TEXTURE_STACK_DEPTH:
+	 *params = (GLdouble) MAX_TEXTURE_STACK_DEPTH;
+	 break;
+      case GL_MAX_VIEWPORT_DIMS:
+         params[0] = (GLdouble) MAX_WIDTH;
+         params[1] = (GLdouble) MAX_HEIGHT;
+         break;
+      case GL_MODELVIEW_MATRIX:
+	 for (i=0;i<16;i++) {
+	    params[i] = (GLdouble) ctx->ModelviewMatrixStack.Top->m[i];
+	 }
+	 break;
+      case GL_MODELVIEW_STACK_DEPTH:
+	 *params = (GLdouble) (ctx->ModelviewMatrixStack.Depth + 1);
+	 break;
+      case GL_NAME_STACK_DEPTH:
+	 *params = (GLdouble) ctx->Select.NameStackDepth;
+	 break;
+      case GL_NORMALIZE:
+	 *params = (GLdouble) ctx->Transform.Normalize;
+	 break;
+      case GL_PACK_ALIGNMENT:
+	 *params = (GLdouble) ctx->Pack.Alignment;
+	 break;
+      case GL_PACK_LSB_FIRST:
+	 *params = (GLdouble) ctx->Pack.LsbFirst;
+	 break;
+      case GL_PACK_ROW_LENGTH:
+	 *params = (GLdouble) ctx->Pack.RowLength;
+	 break;
+      case GL_PACK_SKIP_PIXELS:
+	 *params = (GLdouble) ctx->Pack.SkipPixels;
+	 break;
+      case GL_PACK_SKIP_ROWS:
+	 *params = (GLdouble) ctx->Pack.SkipRows;
+	 break;
+      case GL_PACK_SWAP_BYTES:
+	 *params = (GLdouble) ctx->Pack.SwapBytes;
+	 break;
+      case GL_PACK_SKIP_IMAGES_EXT:
+         *params = (GLdouble) ctx->Pack.SkipImages;
+         break;
+      case GL_PACK_IMAGE_HEIGHT_EXT:
+         *params = (GLdouble) ctx->Pack.ImageHeight;
+         break;
+      case GL_PACK_INVERT_MESA:
+         *params = (GLdouble) ctx->Pack.Invert;
+         break;
+      case GL_PERSPECTIVE_CORRECTION_HINT:
+	 *params = ENUM_TO_DOUBLE(ctx->Hint.PerspectiveCorrection);
+	 break;
+      case GL_PIXEL_MAP_A_TO_A_SIZE:
+	 *params = (GLdouble) ctx->Pixel.MapAtoAsize;
+	 break;
+      case GL_PIXEL_MAP_B_TO_B_SIZE:
+	 *params = (GLdouble) ctx->Pixel.MapBtoBsize;
+	 break;
+      case GL_PIXEL_MAP_G_TO_G_SIZE:
+	 *params = (GLdouble) ctx->Pixel.MapGtoGsize;
+	 break;
+      case GL_PIXEL_MAP_I_TO_A_SIZE:
+	 *params = (GLdouble) ctx->Pixel.MapItoAsize;
+	 break;
+      case GL_PIXEL_MAP_I_TO_B_SIZE:
+	 *params = (GLdouble) ctx->Pixel.MapItoBsize;
+	 break;
+      case GL_PIXEL_MAP_I_TO_G_SIZE:
+	 *params = (GLdouble) ctx->Pixel.MapItoGsize;
+	 break;
+      case GL_PIXEL_MAP_I_TO_I_SIZE:
+	 *params = (GLdouble) ctx->Pixel.MapItoIsize;
+	 break;
+      case GL_PIXEL_MAP_I_TO_R_SIZE:
+	 *params = (GLdouble) ctx->Pixel.MapItoRsize;
+	 break;
+      case GL_PIXEL_MAP_R_TO_R_SIZE:
+	 *params = (GLdouble) ctx->Pixel.MapRtoRsize;
+	 break;
+      case GL_PIXEL_MAP_S_TO_S_SIZE:
+	 *params = (GLdouble) ctx->Pixel.MapStoSsize;
+	 break;
+      case GL_POINT_SIZE:
+         *params = (GLdouble) ctx->Point.Size;
+         break;
+      case GL_POINT_SIZE_GRANULARITY:
+	 *params = (GLdouble) ctx->Const.PointSizeGranularity;
+	 break;
+      case GL_POINT_SIZE_RANGE:
+	 params[0] = (GLdouble) ctx->Const.MinPointSizeAA;
+	 params[1] = (GLdouble) ctx->Const.MaxPointSizeAA;
+	 break;
+      case GL_ALIASED_POINT_SIZE_RANGE:
+	 params[0] = (GLdouble) ctx->Const.MinPointSize;
+	 params[1] = (GLdouble) ctx->Const.MaxPointSize;
+	 break;
+      case GL_POINT_SMOOTH:
+	 *params = (GLdouble) ctx->Point.SmoothFlag;
+	 break;
+      case GL_POINT_SMOOTH_HINT:
+	 *params = ENUM_TO_DOUBLE(ctx->Hint.PointSmooth);
+	 break;
+      case GL_POINT_SIZE_MIN_EXT:
+	 *params = (GLdouble) (ctx->Point.MinSize);
+	 break;
+      case GL_POINT_SIZE_MAX_EXT:
+	 *params = (GLdouble) (ctx->Point.MaxSize);
+	 break;
+      case GL_POINT_FADE_THRESHOLD_SIZE_EXT:
+	 *params = (GLdouble) (ctx->Point.Threshold);
+	 break;
+      case GL_DISTANCE_ATTENUATION_EXT:
+	 params[0] = (GLdouble) (ctx->Point.Params[0]);
+	 params[1] = (GLdouble) (ctx->Point.Params[1]);
+	 params[2] = (GLdouble) (ctx->Point.Params[2]);
+	 break;
+      case GL_POLYGON_MODE:
+	 params[0] = ENUM_TO_DOUBLE(ctx->Polygon.FrontMode);
+	 params[1] = ENUM_TO_DOUBLE(ctx->Polygon.BackMode);
+	 break;
+      case GL_POLYGON_OFFSET_BIAS_EXT:  /* GL_EXT_polygon_offset */
+         *params = (GLdouble) ctx->Polygon.OffsetUnits;
+         break;
+      case GL_POLYGON_OFFSET_FACTOR:
+         *params = (GLdouble) ctx->Polygon.OffsetFactor;
+         break;
+      case GL_POLYGON_OFFSET_UNITS:
+         *params = (GLdouble) ctx->Polygon.OffsetUnits;
+         break;
+      case GL_POLYGON_SMOOTH:
+	 *params = (GLdouble) ctx->Polygon.SmoothFlag;
+	 break;
+      case GL_POLYGON_SMOOTH_HINT:
+	 *params = ENUM_TO_DOUBLE(ctx->Hint.PolygonSmooth);
+	 break;
+      case GL_POLYGON_STIPPLE:
+         *params = (GLdouble) ctx->Polygon.StippleFlag;
+	 break;
+      case GL_PROJECTION_MATRIX:
+	 for (i=0;i<16;i++) {
+	    params[i] = (GLdouble) ctx->ProjectionMatrixStack.Top->m[i];
+	 }
+	 break;
+      case GL_PROJECTION_STACK_DEPTH:
+	 *params = (GLdouble) (ctx->ProjectionMatrixStack.Depth + 1);
+	 break;
+      case GL_READ_BUFFER:
+	 *params = ENUM_TO_DOUBLE(ctx->Pixel.ReadBuffer);
+	 break;
+      case GL_RED_BIAS:
+         *params = (GLdouble) ctx->Pixel.RedBias;
+         break;
+      case GL_RED_BITS:
+         *params = (GLdouble) ctx->Visual.redBits;
+         break;
+      case GL_RED_SCALE:
+         *params = (GLdouble) ctx->Pixel.RedScale;
+         break;
+      case GL_RENDER_MODE:
+	 *params = ENUM_TO_DOUBLE(ctx->RenderMode);
+	 break;
+      case GL_RESCALE_NORMAL:
+         *params = (GLdouble) ctx->Transform.RescaleNormals;
+         break;
+      case GL_RGBA_MODE:
+	 *params = (GLdouble) ctx->Visual.rgbMode;
+	 break;
+      case GL_SCISSOR_BOX:
+	 params[0] = (GLdouble) ctx->Scissor.X;
+	 params[1] = (GLdouble) ctx->Scissor.Y;
+	 params[2] = (GLdouble) ctx->Scissor.Width;
+	 params[3] = (GLdouble) ctx->Scissor.Height;
+	 break;
+      case GL_SCISSOR_TEST:
+	 *params = (GLdouble) ctx->Scissor.Enabled;
+	 break;
+      case GL_SELECTION_BUFFER_SIZE:
+         *params = (GLdouble) ctx->Select.BufferSize;
+         break;
+      case GL_SHADE_MODEL:
+	 *params = ENUM_TO_DOUBLE(ctx->Light.ShadeModel);
+	 break;
+      case GL_SHARED_TEXTURE_PALETTE_EXT:
+         *params = (GLdouble) ctx->Texture.SharedPalette;
+         break;
+      case GL_STENCIL_BITS:
+         *params = (GLdouble) ctx->Visual.stencilBits;
+         break;
+      case GL_STENCIL_CLEAR_VALUE:
+	 *params = (GLdouble) ctx->Stencil.Clear;
+	 break;
+      case GL_STENCIL_FAIL:
+	 *params = ENUM_TO_DOUBLE(ctx->Stencil.FailFunc[ctx->Stencil.ActiveFace]);
+	 break;
+      case GL_STENCIL_FUNC:
+	 *params = ENUM_TO_DOUBLE(ctx->Stencil.Function[ctx->Stencil.ActiveFace]);
+	 break;
+      case GL_STENCIL_PASS_DEPTH_FAIL:
+	 *params = ENUM_TO_DOUBLE(ctx->Stencil.ZFailFunc[ctx->Stencil.ActiveFace]);
+	 break;
+      case GL_STENCIL_PASS_DEPTH_PASS:
+	 *params = ENUM_TO_DOUBLE(ctx->Stencil.ZPassFunc[ctx->Stencil.ActiveFace]);
+	 break;
+      case GL_STENCIL_REF:
+	 *params = (GLdouble) ctx->Stencil.Ref[ctx->Stencil.ActiveFace];
+	 break;
+      case GL_STENCIL_TEST:
+	 *params = (GLdouble) ctx->Stencil.Enabled;
+	 break;
+      case GL_STENCIL_VALUE_MASK:
+	 *params = (GLdouble) ctx->Stencil.ValueMask[ctx->Stencil.ActiveFace];
+	 break;
+      case GL_STENCIL_WRITEMASK:
+	 *params = (GLdouble) ctx->Stencil.WriteMask[ctx->Stencil.ActiveFace];
+	 break;
+      case GL_STEREO:
+	 *params = (GLdouble) ctx->Visual.stereoMode;
+	 break;
+      case GL_SUBPIXEL_BITS:
+	 *params = (GLdouble) ctx->Const.SubPixelBits;
+	 break;
+      case GL_TEXTURE_1D:
+         *params = _mesa_IsEnabled(GL_TEXTURE_1D) ? 1.0 : 0.0;
+	 break;
+      case GL_TEXTURE_2D:
+         *params = _mesa_IsEnabled(GL_TEXTURE_2D) ? 1.0 : 0.0;
+	 break;
+      case GL_TEXTURE_3D:
+         *params = _mesa_IsEnabled(GL_TEXTURE_3D) ? 1.0 : 0.0;
+	 break;
+      case GL_TEXTURE_BINDING_1D:
+         *params = (GLdouble) textureUnit->Current1D->Name;
+          break;
+      case GL_TEXTURE_BINDING_2D:
+         *params = (GLdouble) textureUnit->Current2D->Name;
+          break;
+      case GL_TEXTURE_BINDING_3D:
+         *params = (GLdouble) textureUnit->Current3D->Name;
+          break;
+      case GL_TEXTURE_ENV_COLOR:
+	 params[0] = (GLdouble) textureUnit->EnvColor[0];
+	 params[1] = (GLdouble) textureUnit->EnvColor[1];
+	 params[2] = (GLdouble) textureUnit->EnvColor[2];
+	 params[3] = (GLdouble) textureUnit->EnvColor[3];
+	 break;
+      case GL_TEXTURE_ENV_MODE:
+	 *params = ENUM_TO_DOUBLE(textureUnit->EnvMode);
+	 break;
+      case GL_TEXTURE_GEN_S:
+	 *params = (textureUnit->TexGenEnabled & S_BIT) ? 1.0 : 0.0;
+	 break;
+      case GL_TEXTURE_GEN_T:
+	 *params = (textureUnit->TexGenEnabled & T_BIT) ? 1.0 : 0.0;
+	 break;
+      case GL_TEXTURE_GEN_R:
+	 *params = (textureUnit->TexGenEnabled & R_BIT) ? 1.0 : 0.0;
+	 break;
+      case GL_TEXTURE_GEN_Q:
+	 *params = (textureUnit->TexGenEnabled & Q_BIT) ? 1.0 : 0.0;
+	 break;
+      case GL_TEXTURE_MATRIX:
+         for (i=0;i<16;i++) {
+	    params[i] = (GLdouble) ctx->TextureMatrixStack[texUnit].Top->m[i];
+	 }
+	 break;
+      case GL_TEXTURE_STACK_DEPTH:
+	 *params = (GLdouble) (ctx->TextureMatrixStack[texUnit].Depth + 1);
+	 break;
+      case GL_UNPACK_ALIGNMENT:
+	 *params = (GLdouble) ctx->Unpack.Alignment;
+	 break;
+      case GL_UNPACK_LSB_FIRST:
+	 *params = (GLdouble) ctx->Unpack.LsbFirst;
+	 break;
+      case GL_UNPACK_ROW_LENGTH:
+	 *params = (GLdouble) ctx->Unpack.RowLength;
+	 break;
+      case GL_UNPACK_SKIP_PIXELS:
+	 *params = (GLdouble) ctx->Unpack.SkipPixels;
+	 break;
+      case GL_UNPACK_SKIP_ROWS:
+	 *params = (GLdouble) ctx->Unpack.SkipRows;
+	 break;
+      case GL_UNPACK_SWAP_BYTES:
+	 *params = (GLdouble) ctx->Unpack.SwapBytes;
+	 break;
+      case GL_UNPACK_SKIP_IMAGES_EXT:
+         *params = (GLdouble) ctx->Unpack.SkipImages;
+         break;
+      case GL_UNPACK_IMAGE_HEIGHT_EXT:
+         *params = (GLdouble) ctx->Unpack.ImageHeight;
+         break;
+      case GL_UNPACK_CLIENT_STORAGE_APPLE:
+         *params = (GLdouble) ctx->Unpack.ClientStorage;
+         break;
+      case GL_VIEWPORT:
+	 params[0] = (GLdouble) ctx->Viewport.X;
+	 params[1] = (GLdouble) ctx->Viewport.Y;
+	 params[2] = (GLdouble) ctx->Viewport.Width;
+	 params[3] = (GLdouble) ctx->Viewport.Height;
+	 break;
+      case GL_ZOOM_X:
+	 *params = (GLdouble) ctx->Pixel.ZoomX;
+	 break;
+      case GL_ZOOM_Y:
+	 *params = (GLdouble) ctx->Pixel.ZoomY;
+	 break;
+      case GL_VERTEX_ARRAY:
+         *params = (GLdouble) ctx->Array.Vertex.Enabled;
+         break;
+      case GL_VERTEX_ARRAY_SIZE:
+         *params = (GLdouble) ctx->Array.Vertex.Size;
+         break;
+      case GL_VERTEX_ARRAY_TYPE:
+         *params = ENUM_TO_DOUBLE(ctx->Array.Vertex.Type);
+         break;
+      case GL_VERTEX_ARRAY_STRIDE:
+         *params = (GLdouble) ctx->Array.Vertex.Stride;
+         break;
+      case GL_VERTEX_ARRAY_COUNT_EXT:
+         *params = 0.0;
+         break;
+      case GL_NORMAL_ARRAY:
+         *params = (GLdouble) ctx->Array.Normal.Enabled;
+         break;
+      case GL_NORMAL_ARRAY_TYPE:
+         *params = ENUM_TO_DOUBLE(ctx->Array.Normal.Type);
+         break;
+      case GL_NORMAL_ARRAY_STRIDE:
+         *params = (GLdouble) ctx->Array.Normal.Stride;
+         break;
+      case GL_NORMAL_ARRAY_COUNT_EXT:
+         *params = 0.0;
+         break;
+      case GL_COLOR_ARRAY:
+         *params = (GLdouble) ctx->Array.Color.Enabled;
+         break;
+      case GL_COLOR_ARRAY_SIZE:
+         *params = (GLdouble) ctx->Array.Color.Size;
+         break;
+      case GL_COLOR_ARRAY_TYPE:
+         *params = ENUM_TO_DOUBLE(ctx->Array.Color.Type);
+         break;
+      case GL_COLOR_ARRAY_STRIDE:
+         *params = (GLdouble) ctx->Array.Color.Stride;
+         break;
+      case GL_COLOR_ARRAY_COUNT_EXT:
+         *params = 0.0;
+         break;
+      case GL_INDEX_ARRAY:
+         *params = (GLdouble) ctx->Array.Index.Enabled;
+         break;
+      case GL_INDEX_ARRAY_TYPE:
+         *params = ENUM_TO_DOUBLE(ctx->Array.Index.Type);
+         break;
+      case GL_INDEX_ARRAY_STRIDE:
+         *params = (GLdouble) ctx->Array.Index.Stride;
+         break;
+      case GL_INDEX_ARRAY_COUNT_EXT:
+         *params = 0.0;
+         break;
+      case GL_TEXTURE_COORD_ARRAY:
+         *params = (GLdouble) ctx->Array.TexCoord[clientUnit].Enabled;
+         break;
+      case GL_TEXTURE_COORD_ARRAY_SIZE:
+         *params = (GLdouble) ctx->Array.TexCoord[clientUnit].Size;
+         break;
+      case GL_TEXTURE_COORD_ARRAY_TYPE:
+         *params = ENUM_TO_DOUBLE(ctx->Array.TexCoord[clientUnit].Type);
+         break;
+      case GL_TEXTURE_COORD_ARRAY_STRIDE:
+         *params = (GLdouble) ctx->Array.TexCoord[clientUnit].Stride;
+         break;
+      case GL_TEXTURE_COORD_ARRAY_COUNT_EXT:
+         *params = 0.0;
+         break;
+      case GL_EDGE_FLAG_ARRAY:
+         *params = (GLdouble) ctx->Array.EdgeFlag.Enabled;
+         break;
+      case GL_EDGE_FLAG_ARRAY_STRIDE:
+         *params = (GLdouble) ctx->Array.EdgeFlag.Stride;
+         break;
+      case GL_EDGE_FLAG_ARRAY_COUNT_EXT:
+         *params = 0.0;
+         break;
+
+      /* GL_ARB_multitexture */
+      case GL_MAX_TEXTURE_UNITS_ARB:
+         CHECK_EXTENSION_D(ARB_multitexture, pname);
+         *params = (GLdouble) MIN2(ctx->Const.MaxTextureImageUnits,
+                                   ctx->Const.MaxTextureCoordUnits);
+         break;
+      case GL_ACTIVE_TEXTURE_ARB:
+         CHECK_EXTENSION_D(ARB_multitexture, pname);
+         *params = (GLdouble) (GL_TEXTURE0_ARB + ctx->Texture.CurrentUnit);
+         break;
+      case GL_CLIENT_ACTIVE_TEXTURE_ARB:
+         CHECK_EXTENSION_D(ARB_multitexture, pname);
+         *params = (GLdouble) (GL_TEXTURE0_ARB + clientUnit);
+         break;
+
+      /* GL_ARB_texture_cube_map */
+      case GL_TEXTURE_CUBE_MAP_ARB:
+         CHECK_EXTENSION_D(ARB_texture_cube_map, pname);
+         *params = (GLdouble) _mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB);
+         break;
+      case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
+         CHECK_EXTENSION_D(ARB_texture_cube_map, pname);
+         *params = (GLdouble) textureUnit->CurrentCubeMap->Name;
+         break;
+      case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
+         CHECK_EXTENSION_D(ARB_texture_cube_map, pname);
+         *params = (GLdouble) (1 << (ctx->Const.MaxCubeTextureLevels - 1));
+         break;
+
+      /* GL_ARB_texture_compression */
+      case GL_TEXTURE_COMPRESSION_HINT_ARB:
+         CHECK_EXTENSION_D(ARB_texture_compression, pname);
+         *params = (GLdouble) ctx->Hint.TextureCompression;
+         break;
+      case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:
+         CHECK_EXTENSION_D(ARB_texture_compression, pname);
+         *params = (GLdouble) _mesa_get_compressed_formats(ctx, NULL);
+         break;
+      case GL_COMPRESSED_TEXTURE_FORMATS_ARB:
+         CHECK_EXTENSION_D(ARB_texture_compression, pname);
+         {
+            GLint formats[100];
+            GLuint i, n;
+            n = _mesa_get_compressed_formats(ctx, formats);
+            for (i = 0; i < n; i++)
+               params[i] = (GLdouble) formats[i];
+         }
+         break;
+
+      /* GL_EXT_compiled_vertex_array */
+      case GL_ARRAY_ELEMENT_LOCK_FIRST_EXT:
+	 *params = (GLdouble) ctx->Array.LockFirst;
+	 break;
+      case GL_ARRAY_ELEMENT_LOCK_COUNT_EXT:
+	 *params = (GLdouble) ctx->Array.LockCount;
+	 break;
+
+      /* GL_ARB_transpose_matrix */
+      case GL_TRANSPOSE_COLOR_MATRIX_ARB:
+         {
+            GLfloat tm[16];
+            GLuint i;
+            _math_transposef(tm, ctx->ColorMatrixStack.Top->m);
+            for (i=0;i<16;i++) {
+               params[i] = (GLdouble) tm[i];
+            }
+         }
+         break;
+      case GL_TRANSPOSE_MODELVIEW_MATRIX_ARB:
+         {
+            GLfloat tm[16];
+            GLuint i;
+            _math_transposef(tm, ctx->ModelviewMatrixStack.Top->m);
+            for (i=0;i<16;i++) {
+               params[i] = (GLdouble) tm[i];
+            }
+         }
+         break;
+      case GL_TRANSPOSE_PROJECTION_MATRIX_ARB:
+         {
+            GLfloat tm[16];
+            GLuint i;
+            _math_transposef(tm, ctx->ProjectionMatrixStack.Top->m);
+            for (i=0;i<16;i++) {
+               params[i] = (GLdouble) tm[i];
+            }
+         }
+         break;
+      case GL_TRANSPOSE_TEXTURE_MATRIX_ARB:
+         {
+            GLfloat tm[16];
+            GLuint i;
+            _math_transposef(tm, ctx->TextureMatrixStack[texUnit].Top->m);
+            for (i=0;i<16;i++) {
+               params[i] = (GLdouble) tm[i];
+            }
+         }
+         break;
+
+      /* GL_HP_occlusion_test */
+      case GL_OCCLUSION_TEST_HP:
+         CHECK_EXTENSION_D(HP_occlusion_test, pname);
+         *params = (GLdouble) ctx->Depth.OcclusionTest;
+         break;
+      case GL_OCCLUSION_TEST_RESULT_HP:
+         CHECK_EXTENSION_D(HP_occlusion_test, pname);
+         if (ctx->Depth.OcclusionTest)
+            *params = (GLdouble) ctx->OcclusionResult;
+         else
+            *params = (GLdouble) ctx->OcclusionResultSaved;
+         /* reset flag now */
+         ctx->OcclusionResult = GL_FALSE;
+         ctx->OcclusionResultSaved = GL_FALSE;
+         break;
+
+      /* GL_SGIS_pixel_texture */
+      case GL_PIXEL_TEXTURE_SGIS:
+         *params = (GLdouble) ctx->Pixel.PixelTextureEnabled;
+         break;
+
+      /* GL_SGIX_pixel_texture */
+      case GL_PIXEL_TEX_GEN_SGIX:
+         *params = (GLdouble) ctx->Pixel.PixelTextureEnabled;
+         break;
+      case GL_PIXEL_TEX_GEN_MODE_SGIX:
+         *params = (GLdouble) pixel_texgen_mode(ctx);
+         break;
+
+      /* GL_SGI_color_matrix (also in 1.2 imaging) */
+      case GL_COLOR_MATRIX_SGI:
+         for (i=0;i<16;i++) {
+	    params[i] = (GLdouble) ctx->ColorMatrixStack.Top->m[i];
+	 }
+	 break;
+      case GL_COLOR_MATRIX_STACK_DEPTH_SGI:
+         *params = (GLdouble) (ctx->ColorMatrixStack.Depth + 1);
+         break;
+      case GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI:
+         *params = (GLdouble) MAX_COLOR_STACK_DEPTH;
+         break;
+      case GL_POST_COLOR_MATRIX_RED_SCALE_SGI:
+         *params = (GLdouble) ctx->Pixel.PostColorMatrixScale[0];
+         break;
+      case GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI:
+         *params = (GLdouble) ctx->Pixel.PostColorMatrixScale[1];
+         break;
+      case GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI:
+         *params = (GLdouble) ctx->Pixel.PostColorMatrixScale[2];
+         break;
+      case GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI:
+         *params = (GLdouble) ctx->Pixel.PostColorMatrixScale[3];
+         break;
+      case GL_POST_COLOR_MATRIX_RED_BIAS_SGI:
+         *params = (GLdouble) ctx->Pixel.PostColorMatrixBias[0];
+         break;
+      case GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI:
+         *params = (GLdouble) ctx->Pixel.PostColorMatrixBias[1];
+         break;
+      case GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI:
+         *params = (GLdouble) ctx->Pixel.PostColorMatrixBias[2];
+         break;
+      case GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI:
+         *params = (GLdouble) ctx->Pixel.PostColorMatrixBias[3];
+         break;
+
+      /* GL_EXT_convolution (also in 1.2 imaging) */
+      case GL_CONVOLUTION_1D_EXT:
+         CHECK_EXTENSION_D(EXT_convolution, pname);
+         *params = (GLdouble) ctx->Pixel.Convolution1DEnabled;
+         break;
+      case GL_CONVOLUTION_2D:
+         CHECK_EXTENSION_D(EXT_convolution, pname);
+         *params = (GLdouble) ctx->Pixel.Convolution2DEnabled;
+         break;
+      case GL_SEPARABLE_2D:
+         CHECK_EXTENSION_D(EXT_convolution, pname);
+         *params = (GLdouble) ctx->Pixel.Separable2DEnabled;
+         break;
+      case GL_POST_CONVOLUTION_RED_SCALE_EXT:
+         CHECK_EXTENSION_D(EXT_convolution, pname);
+         *params = (GLdouble) ctx->Pixel.PostConvolutionScale[0];
+         break;
+      case GL_POST_CONVOLUTION_GREEN_SCALE_EXT:
+         CHECK_EXTENSION_D(EXT_convolution, pname);
+         *params = (GLdouble) ctx->Pixel.PostConvolutionScale[1];
+         break;
+      case GL_POST_CONVOLUTION_BLUE_SCALE_EXT:
+         CHECK_EXTENSION_D(EXT_convolution, pname);
+         *params = (GLdouble) ctx->Pixel.PostConvolutionScale[2];
+         break;
+      case GL_POST_CONVOLUTION_ALPHA_SCALE_EXT:
+         CHECK_EXTENSION_D(EXT_convolution, pname);
+         *params = (GLdouble) ctx->Pixel.PostConvolutionScale[3];
+         break;
+      case GL_POST_CONVOLUTION_RED_BIAS_EXT:
+         CHECK_EXTENSION_D(EXT_convolution, pname);
+         *params = (GLdouble) ctx->Pixel.PostConvolutionBias[0];
+         break;
+      case GL_POST_CONVOLUTION_GREEN_BIAS_EXT:
+         CHECK_EXTENSION_D(EXT_convolution, pname);
+         *params = (GLdouble) ctx->Pixel.PostConvolutionBias[1];
+         break;
+      case GL_POST_CONVOLUTION_BLUE_BIAS_EXT:
+         CHECK_EXTENSION_D(EXT_convolution, pname);
+         *params = (GLdouble) ctx->Pixel.PostConvolutionBias[2];
+         break;
+      case GL_POST_CONVOLUTION_ALPHA_BIAS_EXT:
+         CHECK_EXTENSION_D(EXT_convolution, pname);
+         *params = (GLdouble) ctx->Pixel.PostConvolutionBias[2];
+         break;
+
+      /* GL_EXT_histogram (also in 1.2 imaging) */
+      case GL_HISTOGRAM:
+         CHECK_EXTENSION_D(EXT_histogram, pname);
+         *params = (GLdouble) ctx->Pixel.HistogramEnabled;
+	 break;
+      case GL_MINMAX:
+         CHECK_EXTENSION_D(EXT_histogram, pname);
+         *params = (GLdouble) ctx->Pixel.MinMaxEnabled;
+         break;
+
+      /* GL_SGI_color_table (also in 1.2 imaging */
+      case GL_COLOR_TABLE_SGI:
+         *params = (GLdouble) ctx->Pixel.ColorTableEnabled;
+         break;
+      case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
+         *params = (GLdouble) ctx->Pixel.PostConvolutionColorTableEnabled;
+         break;
+      case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
+         *params = (GLdouble) ctx->Pixel.PostColorMatrixColorTableEnabled;
+         break;
+
+      /* GL_SGI_texture_color_table */
+      case GL_TEXTURE_COLOR_TABLE_SGI:
+         CHECK_EXTENSION_D(SGI_texture_color_table, pname);
+         *params = (GLdouble) textureUnit->ColorTableEnabled;
+         break;
+
+      /* GL_EXT_secondary_color */
+      case GL_COLOR_SUM_EXT:
+         CHECK_EXTENSION_D(EXT_secondary_color, pname);
+	 *params = (GLdouble) ctx->Fog.ColorSumEnabled;
+	 break;
+      case GL_CURRENT_SECONDARY_COLOR_EXT:
+         CHECK_EXTENSION_D(EXT_secondary_color, pname);
+	 FLUSH_CURRENT(ctx, 0);
+         params[0] = ctx->Current.Attrib[VERT_ATTRIB_COLOR1][0];
+         params[1] = ctx->Current.Attrib[VERT_ATTRIB_COLOR1][1];
+         params[2] = ctx->Current.Attrib[VERT_ATTRIB_COLOR1][2];
+         params[3] = ctx->Current.Attrib[VERT_ATTRIB_COLOR1][3];
+	 break;
+      case GL_SECONDARY_COLOR_ARRAY_EXT:
+         CHECK_EXTENSION_D(EXT_secondary_color, pname);
+         *params = (GLdouble) ctx->Array.SecondaryColor.Enabled;
+         break;
+      case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
+         CHECK_EXTENSION_D(EXT_secondary_color, pname);
+	 *params = (GLdouble) ctx->Array.SecondaryColor.Type;
+	 break;
+      case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
+         CHECK_EXTENSION_D(EXT_secondary_color, pname);
+	 *params = (GLdouble) ctx->Array.SecondaryColor.Stride;
+	 break;
+      case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
+         CHECK_EXTENSION_D(EXT_secondary_color, pname);
+	 *params = (GLdouble) ctx->Array.SecondaryColor.Size;
+	 break;
+
+      /* GL_EXT_fog_coord */
+      case GL_CURRENT_FOG_COORDINATE_EXT:
+         CHECK_EXTENSION_D(EXT_fog_coord, pname);
+	 FLUSH_CURRENT(ctx, 0);
+	 *params = (GLdouble) ctx->Current.Attrib[VERT_ATTRIB_FOG][0];
+	 break;
+      case GL_FOG_COORDINATE_ARRAY_EXT:
+         CHECK_EXTENSION_D(EXT_fog_coord, pname);
+         *params = (GLdouble) ctx->Array.FogCoord.Enabled;
+         break;
+      case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
+         CHECK_EXTENSION_D(EXT_fog_coord, pname);
+	 *params = (GLdouble) ctx->Array.FogCoord.Type;
+	 break;
+      case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
+         CHECK_EXTENSION_D(EXT_fog_coord, pname);
+	 *params = (GLdouble) ctx->Array.FogCoord.Stride;
+	 break;
+      case GL_FOG_COORDINATE_SOURCE_EXT:
+         CHECK_EXTENSION_D(EXT_fog_coord, pname);
+	 *params = (GLdouble) ctx->Fog.FogCoordinateSource;
+	 break;
+
+      /* GL_EXT_texture_lod_bias */
+      case GL_MAX_TEXTURE_LOD_BIAS_EXT:
+         *params = (GLdouble) ctx->Const.MaxTextureLodBias;
+         break;
+
+      /* GL_EXT_texture_filter_anisotropic */
+      case GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT:
+         CHECK_EXTENSION_D(EXT_texture_filter_anisotropic, pname);
+         *params = (GLdouble) ctx->Const.MaxTextureMaxAnisotropy;
+	 break;
+
+      /* GL_ARB_multisample */
+      case GL_MULTISAMPLE_ARB:
+         CHECK_EXTENSION_D(ARB_multisample, pname);
+         *params = (GLdouble) ctx->Multisample.Enabled;
+         break;
+      case GL_SAMPLE_ALPHA_TO_COVERAGE_ARB:
+         CHECK_EXTENSION_D(ARB_multisample, pname);
+         *params = (GLdouble) ctx->Multisample.SampleAlphaToCoverage;
+         break;
+      case GL_SAMPLE_ALPHA_TO_ONE_ARB:
+         CHECK_EXTENSION_D(ARB_multisample, pname);
+         *params = (GLdouble) ctx->Multisample.SampleAlphaToOne;
+         break;
+      case GL_SAMPLE_COVERAGE_ARB:
+         CHECK_EXTENSION_D(ARB_multisample, pname);
+         *params = (GLdouble) ctx->Multisample.SampleCoverage;
+         break;
+      case GL_SAMPLE_COVERAGE_VALUE_ARB:
+         CHECK_EXTENSION_D(ARB_multisample, pname);
+         *params = ctx->Multisample.SampleCoverageValue;
+         break;
+      case GL_SAMPLE_COVERAGE_INVERT_ARB:
+         CHECK_EXTENSION_D(ARB_multisample, pname);
+         *params = (GLdouble) ctx->Multisample.SampleCoverageInvert;
+         break;
+      case GL_SAMPLE_BUFFERS_ARB:
+         CHECK_EXTENSION_D(ARB_multisample, pname);
+         *params = 0.0; /* XXX fix someday */
+         break;
+      case GL_SAMPLES_ARB:
+         CHECK_EXTENSION_D(ARB_multisample, pname);
+         *params = 0.0; /* XXX fix someday */
+         break;
+
+      /* GL_IBM_rasterpos_clip */
+      case GL_RASTER_POSITION_UNCLIPPED_IBM:
+         CHECK_EXTENSION_D(IBM_rasterpos_clip, pname);
+         *params = (GLdouble) ctx->Transform.RasterPositionUnclipped;
+         break;
+
+      /* GL_NV_point_sprite */
+      case GL_POINT_SPRITE_NV:
+         CHECK_EXTENSION2_D(NV_point_sprite, ARB_point_sprite, pname);
+         *params = (GLdouble) ctx->Point.PointSprite;
+         break;
+      case GL_POINT_SPRITE_R_MODE_NV:
+         CHECK_EXTENSION_D(NV_point_sprite, pname);
+         *params = (GLdouble) ctx->Point.SpriteRMode;
+         break;
+
+      /* GL_SGIS_generate_mipmap */
+      case GL_GENERATE_MIPMAP_HINT_SGIS:
+         CHECK_EXTENSION_D(SGIS_generate_mipmap, pname);
+         *params = (GLdouble) ctx->Hint.GenerateMipmap;
+         break;
+
+#if FEATURE_NV_vertex_program
+      case GL_VERTEX_PROGRAM_NV:
+         CHECK_EXTENSION_D(NV_vertex_program, pname);
+         *params = (GLdouble) ctx->VertexProgram.Enabled;
+         break;
+      case GL_VERTEX_PROGRAM_POINT_SIZE_NV:
+         CHECK_EXTENSION_D(NV_vertex_program, pname);
+         *params = (GLdouble) ctx->VertexProgram.PointSizeEnabled;
+         break;
+      case GL_VERTEX_PROGRAM_TWO_SIDE_NV:
+         CHECK_EXTENSION_D(NV_vertex_program, pname);
+         *params = (GLdouble) ctx->VertexProgram.TwoSideEnabled;
+         break;
+      case GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV:
+         CHECK_EXTENSION_D(NV_vertex_program, pname);
+         *params = (GLdouble) ctx->Const.MaxProgramMatrixStackDepth;
+         break;
+      case GL_MAX_TRACK_MATRICES_NV:
+         CHECK_EXTENSION_D(NV_vertex_program, pname);
+         *params = (GLdouble) ctx->Const.MaxProgramMatrices;
+         break;
+      case GL_CURRENT_MATRIX_STACK_DEPTH_NV:
+         CHECK_EXTENSION_D(NV_vertex_program, pname);
+         *params = (GLdouble) ctx->CurrentStack->Depth + 1;
+         break;
+      case GL_CURRENT_MATRIX_NV:
+         CHECK_EXTENSION_D(NV_vertex_program, pname);
+         for (i = 0; i < 16; i++)
+            params[i] = (GLdouble) ctx->CurrentStack->Top->m[i];
+         break;
+      case GL_VERTEX_PROGRAM_BINDING_NV:
+         CHECK_EXTENSION_D(NV_vertex_program, pname);
+         if (ctx->VertexProgram.Current)
+            *params = (GLdouble) ctx->VertexProgram.Current->Base.Id;
+         else
+            *params = 0.0;
+         break;
+      case GL_PROGRAM_ERROR_POSITION_NV:
+         CHECK_EXTENSION_D(NV_vertex_program, pname);
+         *params = (GLdouble) ctx->Program.ErrorPos;
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY0_NV:
+      case GL_VERTEX_ATTRIB_ARRAY1_NV:
+      case GL_VERTEX_ATTRIB_ARRAY2_NV:
+      case GL_VERTEX_ATTRIB_ARRAY3_NV:
+      case GL_VERTEX_ATTRIB_ARRAY4_NV:
+      case GL_VERTEX_ATTRIB_ARRAY5_NV:
+      case GL_VERTEX_ATTRIB_ARRAY6_NV:
+      case GL_VERTEX_ATTRIB_ARRAY7_NV:
+      case GL_VERTEX_ATTRIB_ARRAY8_NV:
+      case GL_VERTEX_ATTRIB_ARRAY9_NV:
+      case GL_VERTEX_ATTRIB_ARRAY10_NV:
+      case GL_VERTEX_ATTRIB_ARRAY11_NV:
+      case GL_VERTEX_ATTRIB_ARRAY12_NV:
+      case GL_VERTEX_ATTRIB_ARRAY13_NV:
+      case GL_VERTEX_ATTRIB_ARRAY14_NV:
+      case GL_VERTEX_ATTRIB_ARRAY15_NV:
+         CHECK_EXTENSION_D(NV_vertex_program, pname);
+         {
+            GLuint n = (GLuint) pname - GL_VERTEX_ATTRIB_ARRAY0_NV;
+            *params = (GLdouble) ctx->Array.VertexAttrib[n].Enabled;
+         }
+         break;
+      case GL_MAP1_VERTEX_ATTRIB0_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB1_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB2_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB3_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB4_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB5_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB6_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB7_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB8_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB9_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB10_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB11_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB12_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB13_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB14_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB15_4_NV:
+         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         {
+            GLuint n = (GLuint) pname - GL_MAP1_VERTEX_ATTRIB0_4_NV;
+            *params = (GLdouble) ctx->Eval.Map1Attrib[n];
+         }
+         break;
+      case GL_MAP2_VERTEX_ATTRIB0_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB1_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB2_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB3_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB4_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB5_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB6_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB7_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB8_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB9_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB10_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB11_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB12_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB13_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB14_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB15_4_NV:
+         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         {
+            GLuint n = (GLuint) pname - GL_MAP2_VERTEX_ATTRIB0_4_NV;
+            *params = (GLdouble) ctx->Eval.Map2Attrib[n];
+         }
+         break;
+#endif /* FEATURE_NV_vertex_program */
+
+#if FEATURE_NV_fragment_program
+      case GL_FRAGMENT_PROGRAM_NV:
+         CHECK_EXTENSION_D(NV_fragment_program, pname);
+         *params = (GLdouble) ctx->FragmentProgram.Enabled;
+         break;
+      case GL_MAX_TEXTURE_COORDS_NV:
+         CHECK_EXTENSION_B(NV_fragment_program, pname);
+         *params = (GLdouble) ctx->Const.MaxTextureCoordUnits;
+         break;
+      case GL_MAX_TEXTURE_IMAGE_UNITS_NV:
+         CHECK_EXTENSION_B(NV_fragment_program, pname);
+         *params = (GLdouble) ctx->Const.MaxTextureImageUnits;
+         break;
+      case GL_FRAGMENT_PROGRAM_BINDING_NV:
+         CHECK_EXTENSION_D(NV_fragment_program, pname);
+         if (ctx->FragmentProgram.Current)
+            *params = (GLdouble) ctx->FragmentProgram.Current->Base.Id;
+         else
+            *params = 0.0;
+         break;
+      case GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV:
+         CHECK_EXTENSION_D(NV_fragment_program, pname);
+         *params = (GLdouble) MAX_NV_FRAGMENT_PROGRAM_PARAMS;
+         break;
+#endif /* FEATURE_NV_fragment_program */
+
+      /* GL_NV_texture_rectangle */
+      case GL_TEXTURE_RECTANGLE_NV:
+         CHECK_EXTENSION_D(NV_texture_rectangle, pname);
+         *params = (GLdouble) _mesa_IsEnabled(GL_TEXTURE_RECTANGLE_NV);
+         break;
+      case GL_TEXTURE_BINDING_RECTANGLE_NV:
+         CHECK_EXTENSION_D(NV_texture_rectangle, pname);
+         *params = (GLdouble) textureUnit->CurrentRect->Name;
+         break;
+      case GL_MAX_RECTANGLE_TEXTURE_SIZE_NV:
+         CHECK_EXTENSION_D(NV_texture_rectangle, pname);
+         *params = (GLdouble) ctx->Const.MaxTextureRectSize;
+         break;
+
+      /* GL_EXT_stencil_two_side */
+      case GL_STENCIL_TEST_TWO_SIDE_EXT:
+         CHECK_EXTENSION_D(EXT_stencil_two_side, pname);
+         *params = (GLdouble) ctx->Stencil.TestTwoSide;
+         break;
+      case GL_ACTIVE_STENCIL_FACE_EXT:
+         CHECK_EXTENSION_D(EXT_stencil_two_side, pname);
+         *params = (GLdouble) (ctx->Stencil.ActiveFace ? GL_BACK : GL_FRONT);
+         break;
+
+      /* GL_NV_light_max_exponent */
+      case GL_MAX_SHININESS_NV:
+         *params = (GLdouble) ctx->Const.MaxShininess;
+         break;
+      case GL_MAX_SPOT_EXPONENT_NV:
+         *params = (GLdouble) ctx->Const.MaxSpotExponent;
+         break;
+
+#if FEATURE_ARB_vertex_buffer_object
+      case GL_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_D(ARB_vertex_buffer_object, pname);
+         *params = (GLdouble) ctx->Array.ArrayBufferObj->Name;
+         break;
+      case GL_VERTEX_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_D(ARB_vertex_buffer_object, pname);
+         *params = (GLdouble) ctx->Array.Vertex.BufferObj->Name;
+         break;
+      case GL_NORMAL_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_D(ARB_vertex_buffer_object, pname);
+         *params = (GLdouble) ctx->Array.Normal.BufferObj->Name;
+         break;
+      case GL_COLOR_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_D(ARB_vertex_buffer_object, pname);
+         *params = (GLdouble) ctx->Array.Color.BufferObj->Name;
+         break;
+      case GL_INDEX_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_D(ARB_vertex_buffer_object, pname);
+         *params = (GLdouble) ctx->Array.Index.BufferObj->Name;
+         break;
+      case GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_D(ARB_vertex_buffer_object, pname);
+         *params = (GLdouble) ctx->Array.TexCoord[clientUnit].BufferObj->Name;
+         break;
+      case GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_D(ARB_vertex_buffer_object, pname);
+         *params = (GLdouble) ctx->Array.EdgeFlag.BufferObj->Name;
+         break;
+      case GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_D(ARB_vertex_buffer_object, pname);
+         *params = (GLdouble) ctx->Array.SecondaryColor.BufferObj->Name;
+         break;
+      case GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_D(ARB_vertex_buffer_object, pname);
+         *params = (GLdouble) ctx->Array.FogCoord.BufferObj->Name;
+         break;
+      /*case GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB: - not supported */
+      case GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_D(ARB_vertex_buffer_object, pname);
+         *params = (GLdouble) ctx->Array.ElementArrayBufferObj->Name;
+         break;
+#endif
+
+#if FEATURE_ARB_fragment_program
+      case GL_FRAGMENT_PROGRAM_ARB:
+         CHECK_EXTENSION_D(ARB_fragment_program, pname);
+         *params = (GLdouble) ctx->FragmentProgram.Enabled;
+         break;
+      case GL_TRANSPOSE_CURRENT_MATRIX_ARB:
+         CHECK_EXTENSION_D(ARB_fragment_program, pname);
+         params[0] = ctx->CurrentStack->Top->m[0];
+         params[1] = ctx->CurrentStack->Top->m[4];
+         params[2] = ctx->CurrentStack->Top->m[8];
+         params[3] = ctx->CurrentStack->Top->m[12];
+         params[4] = ctx->CurrentStack->Top->m[1];
+         params[5] = ctx->CurrentStack->Top->m[5];
+         params[6] = ctx->CurrentStack->Top->m[9];
+         params[7] = ctx->CurrentStack->Top->m[13];
+         params[8] = ctx->CurrentStack->Top->m[2];
+         params[9] = ctx->CurrentStack->Top->m[6];
+         params[10] = ctx->CurrentStack->Top->m[10];
+         params[11] = ctx->CurrentStack->Top->m[14];
+         params[12] = ctx->CurrentStack->Top->m[3];
+         params[13] = ctx->CurrentStack->Top->m[7];
+         params[14] = ctx->CurrentStack->Top->m[11];
+         params[15] = ctx->CurrentStack->Top->m[15];
+         break;
+      /* Remaining ARB_fragment_program queries alias with
+       * the GL_NV_fragment_program queries.
+       */
+#endif
+
+      /* GL_EXT_depth_bounds_test */
+      case GL_DEPTH_BOUNDS_TEST_EXT:
+         CHECK_EXTENSION_D(EXT_depth_bounds_test, pname);
+         params[0] = (GLdouble) ctx->Depth.BoundsTest;
+         break;
+      case GL_DEPTH_BOUNDS_EXT:
+         CHECK_EXTENSION_D(EXT_depth_bounds_test, pname);
+         params[0] = ctx->Depth.BoundsMin;
+         params[1] = ctx->Depth.BoundsMax;
+         break;
+
+#if FEATURE_MESA_program_debug
+      case GL_FRAGMENT_PROGRAM_CALLBACK_MESA:
+         CHECK_EXTENSION_D(MESA_program_debug, pname);
+         *params = (GLdouble) ctx->FragmentProgram.CallbackEnabled;
+         break;
+      case GL_VERTEX_PROGRAM_CALLBACK_MESA:
+         CHECK_EXTENSION_D(MESA_program_debug, pname);
+         *params = (GLdouble) ctx->VertexProgram.CallbackEnabled;
+         break;
+      case GL_FRAGMENT_PROGRAM_POSITION_MESA:
+         CHECK_EXTENSION_D(MESA_program_debug, pname);
+         *params = (GLdouble) ctx->FragmentProgram.CurrentPosition;
+         break;
+      case GL_VERTEX_PROGRAM_POSITION_MESA:
+         CHECK_EXTENSION_D(MESA_program_debug, pname);
+         *params = (GLdouble) ctx->VertexProgram.CurrentPosition;
+         break;
+#endif
+
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetDoublev(pname=0x%x)", pname);
+   }
+}
+
+
+/**
+ * Get the value(s) of a selected parameter.
+ *
+ * \param pname parameter to be returned.
+ * \param params will hold the value(s) of the speficifed parameter.
+ *
+ * \sa glGetFloatv().
+ *
+ * Tries to get the specified parameter via dd_function_table::GetFloatv,
+ * otherwise gets the specified parameter from the current context, converting
+ * it value into GLfloat.
+ */
+void GLAPIENTRY
+_mesa_GetFloatv( GLenum pname, GLfloat *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint i;
+   const GLuint clientUnit = ctx->Array.ActiveTexture;
+   const GLuint texUnit = ctx->Texture.CurrentUnit;
+   const struct gl_texture_unit *textureUnit = &ctx->Texture.Unit[texUnit];
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (!params)
+      return;
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glGetFloatv %s\n", _mesa_lookup_enum_by_nr(pname));
+
+   if (!ctx->_CurrentProgram) {
+      /* We need this in order to get correct results for
+       * GL_OCCLUSION_TEST_RESULT_HP.  There might be other important cases.
+       */
+      FLUSH_VERTICES(ctx, 0);
+   }
+
+   if (ctx->Driver.GetFloatv && (*ctx->Driver.GetFloatv)(ctx, pname, params))
+      return;
+
+   switch (pname) {
+      case GL_ACCUM_RED_BITS:
+         *params = (GLfloat) ctx->Visual.accumRedBits;
+         break;
+      case GL_ACCUM_GREEN_BITS:
+         *params = (GLfloat) ctx->Visual.accumGreenBits;
+         break;
+      case GL_ACCUM_BLUE_BITS:
+         *params = (GLfloat) ctx->Visual.accumBlueBits;
+         break;
+      case GL_ACCUM_ALPHA_BITS:
+         *params = (GLfloat) ctx->Visual.accumAlphaBits;
+         break;
+      case GL_ACCUM_CLEAR_VALUE:
+         params[0] = ctx->Accum.ClearColor[0];
+         params[1] = ctx->Accum.ClearColor[1];
+         params[2] = ctx->Accum.ClearColor[2];
+         params[3] = ctx->Accum.ClearColor[3];
+         break;
+      case GL_ALPHA_BIAS:
+         *params = ctx->Pixel.AlphaBias;
+         break;
+      case GL_ALPHA_BITS:
+         *params = (GLfloat) ctx->Visual.alphaBits;
+         break;
+      case GL_ALPHA_SCALE:
+         *params = ctx->Pixel.AlphaScale;
+         break;
+      case GL_ALPHA_TEST:
+         *params = (GLfloat) ctx->Color.AlphaEnabled;
+         break;
+      case GL_ALPHA_TEST_FUNC:
+         *params = ENUM_TO_FLOAT(ctx->Color.AlphaFunc);
+         break;
+      case GL_ALPHA_TEST_REF:
+         *params = (GLfloat) ctx->Color.AlphaRef;
+         break;
+      case GL_ATTRIB_STACK_DEPTH:
+         *params = (GLfloat) (ctx->AttribStackDepth);
+         break;
+      case GL_AUTO_NORMAL:
+         *params = (GLfloat) ctx->Eval.AutoNormal;
+         break;
+      case GL_AUX_BUFFERS:
+         *params = (GLfloat) ctx->Const.NumAuxBuffers;
+         break;
+      case GL_BLEND:
+         *params = (GLfloat) ctx->Color.BlendEnabled;
+         break;
+      case GL_BLEND_DST:
+         *params = ENUM_TO_FLOAT(ctx->Color.BlendDstRGB);
+         break;
+      case GL_BLEND_SRC:
+         *params = ENUM_TO_FLOAT(ctx->Color.BlendSrcRGB);
+         break;
+      case GL_BLEND_SRC_RGB_EXT:
+         *params = ENUM_TO_FLOAT(ctx->Color.BlendSrcRGB);
+         break;
+      case GL_BLEND_DST_RGB_EXT:
+         *params = ENUM_TO_FLOAT(ctx->Color.BlendDstRGB);
+         break;
+      case GL_BLEND_SRC_ALPHA_EXT:
+         *params = ENUM_TO_FLOAT(ctx->Color.BlendSrcA);
+         break;
+      case GL_BLEND_DST_ALPHA_EXT:
+         *params = ENUM_TO_FLOAT(ctx->Color.BlendDstA);
+         break;
+      case GL_BLEND_EQUATION_EXT:
+	 *params = ENUM_TO_FLOAT(ctx->Color.BlendEquation);
+	 break;
+      case GL_BLEND_COLOR_EXT:
+	 params[0] = ctx->Color.BlendColor[0];
+	 params[1] = ctx->Color.BlendColor[1];
+	 params[2] = ctx->Color.BlendColor[2];
+	 params[3] = ctx->Color.BlendColor[3];
+	 break;
+      case GL_BLUE_BIAS:
+         *params = ctx->Pixel.BlueBias;
+         break;
+      case GL_BLUE_BITS:
+         *params = (GLfloat) ctx->Visual.blueBits;
+         break;
+      case GL_BLUE_SCALE:
+         *params = ctx->Pixel.BlueScale;
+         break;
+      case GL_CLIENT_ATTRIB_STACK_DEPTH:
+         *params = (GLfloat) (ctx->ClientAttribStackDepth);
+         break;
+      case GL_CLIP_PLANE0:
+      case GL_CLIP_PLANE1:
+      case GL_CLIP_PLANE2:
+      case GL_CLIP_PLANE3:
+      case GL_CLIP_PLANE4:
+      case GL_CLIP_PLANE5:
+         if (ctx->Transform.ClipPlanesEnabled & (1 << (pname - GL_CLIP_PLANE0)))
+            *params = 1.0;
+         else
+            *params = 0.0;
+         break;
+      case GL_COLOR_CLEAR_VALUE:
+         params[0] = ctx->Color.ClearColor[0];
+         params[1] = ctx->Color.ClearColor[1];
+         params[2] = ctx->Color.ClearColor[2];
+         params[3] = ctx->Color.ClearColor[3];
+         break;
+      case GL_COLOR_MATERIAL:
+         *params = (GLfloat) ctx->Light.ColorMaterialEnabled;
+         break;
+      case GL_COLOR_MATERIAL_FACE:
+         *params = ENUM_TO_FLOAT(ctx->Light.ColorMaterialFace);
+         break;
+      case GL_COLOR_MATERIAL_PARAMETER:
+         *params = ENUM_TO_FLOAT(ctx->Light.ColorMaterialMode);
+         break;
+      case GL_COLOR_WRITEMASK:
+         params[0] = ctx->Color.ColorMask[RCOMP] ? 1.0F : 0.0F;
+         params[1] = ctx->Color.ColorMask[GCOMP] ? 1.0F : 0.0F;
+         params[2] = ctx->Color.ColorMask[BCOMP] ? 1.0F : 0.0F;
+         params[3] = ctx->Color.ColorMask[ACOMP] ? 1.0F : 0.0F;
+         break;
+      case GL_CULL_FACE:
+         *params = (GLfloat) ctx->Polygon.CullFlag;
+         break;
+      case GL_CULL_FACE_MODE:
+         *params = ENUM_TO_FLOAT(ctx->Polygon.CullFaceMode);
+         break;
+      case GL_CURRENT_COLOR:
+	 FLUSH_CURRENT(ctx, 0);
+         params[0] = ctx->Current.Attrib[VERT_ATTRIB_COLOR0][0];
+         params[1] = ctx->Current.Attrib[VERT_ATTRIB_COLOR0][1];
+         params[2] = ctx->Current.Attrib[VERT_ATTRIB_COLOR0][2];
+         params[3] = ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3];
+         break;
+      case GL_CURRENT_INDEX:
+	 FLUSH_CURRENT(ctx, 0);
+         *params = (GLfloat) ctx->Current.Index;
+         break;
+      case GL_CURRENT_NORMAL:
+	 FLUSH_CURRENT(ctx, 0);
+         params[0] = ctx->Current.Attrib[VERT_ATTRIB_NORMAL][0];
+         params[1] = ctx->Current.Attrib[VERT_ATTRIB_NORMAL][1];
+         params[2] = ctx->Current.Attrib[VERT_ATTRIB_NORMAL][2];
+         break;
+      case GL_CURRENT_RASTER_COLOR:
+	 params[0] = ctx->Current.RasterColor[0];
+	 params[1] = ctx->Current.RasterColor[1];
+	 params[2] = ctx->Current.RasterColor[2];
+	 params[3] = ctx->Current.RasterColor[3];
+	 break;
+      case GL_CURRENT_RASTER_DISTANCE:
+	 params[0] = ctx->Current.RasterDistance;
+	 break;
+      case GL_CURRENT_RASTER_INDEX:
+	 *params = ctx->Current.RasterIndex;
+	 break;
+      case GL_CURRENT_RASTER_POSITION:
+	 params[0] = ctx->Current.RasterPos[0];
+	 params[1] = ctx->Current.RasterPos[1];
+	 params[2] = ctx->Current.RasterPos[2];
+	 params[3] = ctx->Current.RasterPos[3];
+	 break;
+      case GL_CURRENT_RASTER_TEXTURE_COORDS:
+	 params[0] = ctx->Current.RasterTexCoords[texUnit][0];
+	 params[1] = ctx->Current.RasterTexCoords[texUnit][1];
+	 params[2] = ctx->Current.RasterTexCoords[texUnit][2];
+	 params[3] = ctx->Current.RasterTexCoords[texUnit][3];
+	 break;
+      case GL_CURRENT_RASTER_POSITION_VALID:
+	 *params = (GLfloat) ctx->Current.RasterPosValid;
+	 break;
+      case GL_CURRENT_TEXTURE_COORDS:
+	 FLUSH_CURRENT(ctx, 0);
+	 params[0] = (GLfloat) ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][0];
+	 params[1] = (GLfloat) ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][1];
+	 params[2] = (GLfloat) ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][2];
+	 params[3] = (GLfloat) ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][3];
+	 break;
+      case GL_DEPTH_BIAS:
+	 *params = (GLfloat) ctx->Pixel.DepthBias;
+	 break;
+      case GL_DEPTH_BITS:
+	 *params = (GLfloat) ctx->Visual.depthBits;
+	 break;
+      case GL_DEPTH_CLEAR_VALUE:
+	 *params = (GLfloat) ctx->Depth.Clear;
+	 break;
+      case GL_DEPTH_FUNC:
+	 *params = ENUM_TO_FLOAT(ctx->Depth.Func);
+	 break;
+      case GL_DEPTH_RANGE:
+         params[0] = (GLfloat) ctx->Viewport.Near;
+         params[1] = (GLfloat) ctx->Viewport.Far;
+	 break;
+      case GL_DEPTH_SCALE:
+	 *params = (GLfloat) ctx->Pixel.DepthScale;
+	 break;
+      case GL_DEPTH_TEST:
+	 *params = (GLfloat) ctx->Depth.Test;
+	 break;
+      case GL_DEPTH_WRITEMASK:
+	 *params = (GLfloat) ctx->Depth.Mask;
+	 break;
+      case GL_DITHER:
+	 *params = (GLfloat) ctx->Color.DitherFlag;
+	 break;
+      case GL_DOUBLEBUFFER:
+	 *params = (GLfloat) ctx->Visual.doubleBufferMode;
+	 break;
+      case GL_DRAW_BUFFER:
+	 *params = ENUM_TO_FLOAT(ctx->Color.DrawBuffer);
+	 break;
+      case GL_EDGE_FLAG:
+	 FLUSH_CURRENT(ctx, 0);
+	 *params = (GLfloat) ctx->Current.EdgeFlag;
+	 break;
+      case GL_FEEDBACK_BUFFER_SIZE:
+         *params = (GLfloat) ctx->Feedback.BufferSize;
+         break;
+      case GL_FEEDBACK_BUFFER_TYPE:
+         *params = ENUM_TO_FLOAT(ctx->Feedback.Type);
+         break;
+      case GL_FOG:
+	 *params = (GLfloat) ctx->Fog.Enabled;
+	 break;
+      case GL_FOG_COLOR:
+	 params[0] = ctx->Fog.Color[0];
+	 params[1] = ctx->Fog.Color[1];
+	 params[2] = ctx->Fog.Color[2];
+	 params[3] = ctx->Fog.Color[3];
+	 break;
+      case GL_FOG_DENSITY:
+	 *params = ctx->Fog.Density;
+	 break;
+      case GL_FOG_END:
+	 *params = ctx->Fog.End;
+	 break;
+      case GL_FOG_HINT:
+	 *params = ENUM_TO_FLOAT(ctx->Hint.Fog);
+	 break;
+      case GL_FOG_INDEX:
+	 *params = ctx->Fog.Index;
+	 break;
+      case GL_FOG_MODE:
+	 *params = ENUM_TO_FLOAT(ctx->Fog.Mode);
+	 break;
+      case GL_FOG_START:
+	 *params = ctx->Fog.Start;
+	 break;
+      case GL_FRONT_FACE:
+	 *params = ENUM_TO_FLOAT(ctx->Polygon.FrontFace);
+	 break;
+      case GL_GREEN_BIAS:
+         *params = (GLfloat) ctx->Pixel.GreenBias;
+         break;
+      case GL_GREEN_BITS:
+         *params = (GLfloat) ctx->Visual.greenBits;
+         break;
+      case GL_GREEN_SCALE:
+         *params = (GLfloat) ctx->Pixel.GreenScale;
+         break;
+      case GL_INDEX_BITS:
+         *params = (GLfloat) ctx->Visual.indexBits;
+	 break;
+      case GL_INDEX_CLEAR_VALUE:
+         *params = (GLfloat) ctx->Color.ClearIndex;
+	 break;
+      case GL_INDEX_MODE:
+	 *params = ctx->Visual.rgbMode ? 0.0F : 1.0F;
+	 break;
+      case GL_INDEX_OFFSET:
+	 *params = (GLfloat) ctx->Pixel.IndexOffset;
+	 break;
+      case GL_INDEX_SHIFT:
+	 *params = (GLfloat) ctx->Pixel.IndexShift;
+	 break;
+      case GL_INDEX_WRITEMASK:
+	 *params = (GLfloat) ctx->Color.IndexMask;
+	 break;
+      case GL_LIGHT0:
+      case GL_LIGHT1:
+      case GL_LIGHT2:
+      case GL_LIGHT3:
+      case GL_LIGHT4:
+      case GL_LIGHT5:
+      case GL_LIGHT6:
+      case GL_LIGHT7:
+	 *params = (GLfloat) ctx->Light.Light[pname-GL_LIGHT0].Enabled;
+	 break;
+      case GL_LIGHTING:
+	 *params = (GLfloat) ctx->Light.Enabled;
+	 break;
+      case GL_LIGHT_MODEL_AMBIENT:
+	 params[0] = ctx->Light.Model.Ambient[0];
+	 params[1] = ctx->Light.Model.Ambient[1];
+	 params[2] = ctx->Light.Model.Ambient[2];
+	 params[3] = ctx->Light.Model.Ambient[3];
+	 break;
+      case GL_LIGHT_MODEL_COLOR_CONTROL:
+         params[0] = ENUM_TO_FLOAT(ctx->Light.Model.ColorControl);
+         break;
+      case GL_LIGHT_MODEL_LOCAL_VIEWER:
+	 *params = (GLfloat) ctx->Light.Model.LocalViewer;
+	 break;
+      case GL_LIGHT_MODEL_TWO_SIDE:
+	 *params = (GLfloat) ctx->Light.Model.TwoSide;
+	 break;
+      case GL_LINE_SMOOTH:
+	 *params = (GLfloat) ctx->Line.SmoothFlag;
+	 break;
+      case GL_LINE_SMOOTH_HINT:
+	 *params = ENUM_TO_FLOAT(ctx->Hint.LineSmooth);
+	 break;
+      case GL_LINE_STIPPLE:
+	 *params = (GLfloat) ctx->Line.StippleFlag;
+	 break;
+      case GL_LINE_STIPPLE_PATTERN:
+         *params = (GLfloat) ctx->Line.StipplePattern;
+         break;
+      case GL_LINE_STIPPLE_REPEAT:
+         *params = (GLfloat) ctx->Line.StippleFactor;
+         break;
+      case GL_LINE_WIDTH:
+	 *params = (GLfloat) ctx->Line.Width;
+	 break;
+      case GL_LINE_WIDTH_GRANULARITY:
+	 *params = (GLfloat) ctx->Const.LineWidthGranularity;
+	 break;
+      case GL_LINE_WIDTH_RANGE:
+	 params[0] = (GLfloat) ctx->Const.MinLineWidthAA;
+	 params[1] = (GLfloat) ctx->Const.MaxLineWidthAA;
+	 break;
+      case GL_ALIASED_LINE_WIDTH_RANGE:
+	 params[0] = (GLfloat) ctx->Const.MinLineWidth;
+	 params[1] = (GLfloat) ctx->Const.MaxLineWidth;
+	 break;
+      case GL_LIST_BASE:
+	 *params = (GLfloat) ctx->List.ListBase;
+	 break;
+      case GL_LIST_INDEX:
+	 *params = (GLfloat) ctx->ListState.CurrentListNum;
+	 break;
+      case GL_LIST_MODE:
+         if (!ctx->CompileFlag)
+            *params = 0.0F;
+         else if (ctx->ExecuteFlag)
+            *params = ENUM_TO_FLOAT(GL_COMPILE_AND_EXECUTE);
+         else
+            *params = ENUM_TO_FLOAT(GL_COMPILE);
+	 break;
+      case GL_INDEX_LOGIC_OP:
+	 *params = (GLfloat) ctx->Color.IndexLogicOpEnabled;
+	 break;
+      case GL_COLOR_LOGIC_OP:
+	 *params = (GLfloat) ctx->Color.ColorLogicOpEnabled;
+	 break;
+      case GL_LOGIC_OP_MODE:
+         *params = ENUM_TO_FLOAT(ctx->Color.LogicOp);
+	 break;
+      case GL_MAP1_COLOR_4:
+	 *params = (GLfloat) ctx->Eval.Map1Color4;
+	 break;
+      case GL_MAP1_GRID_DOMAIN:
+	 params[0] = ctx->Eval.MapGrid1u1;
+	 params[1] = ctx->Eval.MapGrid1u2;
+	 break;
+      case GL_MAP1_GRID_SEGMENTS:
+	 *params = (GLfloat) ctx->Eval.MapGrid1un;
+	 break;
+      case GL_MAP1_INDEX:
+	 *params = (GLfloat) ctx->Eval.Map1Index;
+	 break;
+      case GL_MAP1_NORMAL:
+	 *params = (GLfloat) ctx->Eval.Map1Normal;
+	 break;
+      case GL_MAP1_TEXTURE_COORD_1:
+	 *params = (GLfloat) ctx->Eval.Map1TextureCoord1;
+	 break;
+      case GL_MAP1_TEXTURE_COORD_2:
+	 *params = (GLfloat) ctx->Eval.Map1TextureCoord2;
+	 break;
+      case GL_MAP1_TEXTURE_COORD_3:
+	 *params = (GLfloat) ctx->Eval.Map1TextureCoord3;
+	 break;
+      case GL_MAP1_TEXTURE_COORD_4:
+	 *params = (GLfloat) ctx->Eval.Map1TextureCoord4;
+	 break;
+      case GL_MAP1_VERTEX_3:
+	 *params = (GLfloat) ctx->Eval.Map1Vertex3;
+	 break;
+      case GL_MAP1_VERTEX_4:
+	 *params = (GLfloat) ctx->Eval.Map1Vertex4;
+	 break;
+      case GL_MAP2_COLOR_4:
+	 *params = (GLfloat) ctx->Eval.Map2Color4;
+	 break;
+      case GL_MAP2_GRID_DOMAIN:
+	 params[0] = ctx->Eval.MapGrid2u1;
+	 params[1] = ctx->Eval.MapGrid2u2;
+	 params[2] = ctx->Eval.MapGrid2v1;
+	 params[3] = ctx->Eval.MapGrid2v2;
+	 break;
+      case GL_MAP2_GRID_SEGMENTS:
+	 params[0] = (GLfloat) ctx->Eval.MapGrid2un;
+	 params[1] = (GLfloat) ctx->Eval.MapGrid2vn;
+	 break;
+      case GL_MAP2_INDEX:
+	 *params = (GLfloat) ctx->Eval.Map2Index;
+	 break;
+      case GL_MAP2_NORMAL:
+	 *params = (GLfloat) ctx->Eval.Map2Normal;
+	 break;
+      case GL_MAP2_TEXTURE_COORD_1:
+	 *params = ctx->Eval.Map2TextureCoord1;
+	 break;
+      case GL_MAP2_TEXTURE_COORD_2:
+	 *params = ctx->Eval.Map2TextureCoord2;
+	 break;
+      case GL_MAP2_TEXTURE_COORD_3:
+	 *params = ctx->Eval.Map2TextureCoord3;
+	 break;
+      case GL_MAP2_TEXTURE_COORD_4:
+	 *params = ctx->Eval.Map2TextureCoord4;
+	 break;
+      case GL_MAP2_VERTEX_3:
+	 *params = (GLfloat) ctx->Eval.Map2Vertex3;
+	 break;
+      case GL_MAP2_VERTEX_4:
+	 *params = (GLfloat) ctx->Eval.Map2Vertex4;
+	 break;
+      case GL_MAP_COLOR:
+	 *params = (GLfloat) ctx->Pixel.MapColorFlag;
+	 break;
+      case GL_MAP_STENCIL:
+	 *params = (GLfloat) ctx->Pixel.MapStencilFlag;
+	 break;
+      case GL_MATRIX_MODE:
+	 *params = ENUM_TO_FLOAT(ctx->Transform.MatrixMode);
+	 break;
+      case GL_MAX_ATTRIB_STACK_DEPTH:
+	 *params = (GLfloat) MAX_ATTRIB_STACK_DEPTH;
+	 break;
+      case GL_MAX_CLIENT_ATTRIB_STACK_DEPTH:
+         *params = (GLfloat) MAX_CLIENT_ATTRIB_STACK_DEPTH;
+         break;
+      case GL_MAX_CLIP_PLANES:
+	 *params = (GLfloat) ctx->Const.MaxClipPlanes;
+	 break;
+      case GL_MAX_ELEMENTS_VERTICES:  /* GL_VERSION_1_2 */
+         *params = (GLfloat) ctx->Const.MaxArrayLockSize;
+         break;
+      case GL_MAX_ELEMENTS_INDICES:   /* GL_VERSION_1_2 */
+         *params = (GLfloat) ctx->Const.MaxArrayLockSize;
+         break;
+      case GL_MAX_EVAL_ORDER:
+	 *params = (GLfloat) MAX_EVAL_ORDER;
+	 break;
+      case GL_MAX_LIGHTS:
+	 *params = (GLfloat) ctx->Const.MaxLights;
+	 break;
+      case GL_MAX_LIST_NESTING:
+	 *params = (GLfloat) MAX_LIST_NESTING;
+	 break;
+      case GL_MAX_MODELVIEW_STACK_DEPTH:
+	 *params = (GLfloat) MAX_MODELVIEW_STACK_DEPTH;
+	 break;
+      case GL_MAX_NAME_STACK_DEPTH:
+	 *params = (GLfloat) MAX_NAME_STACK_DEPTH;
+	 break;
+      case GL_MAX_PIXEL_MAP_TABLE:
+	 *params = (GLfloat) MAX_PIXEL_MAP_TABLE;
+	 break;
+      case GL_MAX_PROJECTION_STACK_DEPTH:
+	 *params = (GLfloat) MAX_PROJECTION_STACK_DEPTH;
+	 break;
+      case GL_MAX_TEXTURE_SIZE:
+         *params = (GLfloat) (1 << (ctx->Const.MaxTextureLevels - 1));
+	 break;
+      case GL_MAX_3D_TEXTURE_SIZE:
+         *params = (GLfloat) (1 << (ctx->Const.Max3DTextureLevels - 1));
+	 break;
+      case GL_MAX_TEXTURE_STACK_DEPTH:
+	 *params = (GLfloat) MAX_TEXTURE_STACK_DEPTH;
+	 break;
+      case GL_MAX_VIEWPORT_DIMS:
+         params[0] = (GLfloat) MAX_WIDTH;
+         params[1] = (GLfloat) MAX_HEIGHT;
+         break;
+      case GL_MODELVIEW_MATRIX:
+	 for (i=0;i<16;i++) {
+	    params[i] = ctx->ModelviewMatrixStack.Top->m[i];
+	 }
+	 break;
+      case GL_MODELVIEW_STACK_DEPTH:
+	 *params = (GLfloat) (ctx->ModelviewMatrixStack.Depth + 1);
+	 break;
+      case GL_NAME_STACK_DEPTH:
+	 *params = (GLfloat) ctx->Select.NameStackDepth;
+	 break;
+      case GL_NORMALIZE:
+	 *params = (GLfloat) ctx->Transform.Normalize;
+	 break;
+      case GL_PACK_ALIGNMENT:
+	 *params = (GLfloat) ctx->Pack.Alignment;
+	 break;
+      case GL_PACK_LSB_FIRST:
+	 *params = (GLfloat) ctx->Pack.LsbFirst;
+	 break;
+      case GL_PACK_ROW_LENGTH:
+	 *params = (GLfloat) ctx->Pack.RowLength;
+	 break;
+      case GL_PACK_SKIP_PIXELS:
+	 *params = (GLfloat) ctx->Pack.SkipPixels;
+	 break;
+      case GL_PACK_SKIP_ROWS:
+	 *params = (GLfloat) ctx->Pack.SkipRows;
+	 break;
+      case GL_PACK_SWAP_BYTES:
+	 *params = (GLfloat) ctx->Pack.SwapBytes;
+	 break;
+      case GL_PACK_SKIP_IMAGES_EXT:
+         *params = (GLfloat) ctx->Pack.SkipImages;
+         break;
+      case GL_PACK_IMAGE_HEIGHT_EXT:
+         *params = (GLfloat) ctx->Pack.ImageHeight;
+         break;
+      case GL_PACK_INVERT_MESA:
+         *params = (GLfloat) ctx->Pack.Invert;
+         break;
+      case GL_PERSPECTIVE_CORRECTION_HINT:
+	 *params = ENUM_TO_FLOAT(ctx->Hint.PerspectiveCorrection);
+	 break;
+      case GL_PIXEL_MAP_A_TO_A_SIZE:
+	 *params = (GLfloat) ctx->Pixel.MapAtoAsize;
+	 break;
+      case GL_PIXEL_MAP_B_TO_B_SIZE:
+	 *params = (GLfloat) ctx->Pixel.MapBtoBsize;
+	 break;
+      case GL_PIXEL_MAP_G_TO_G_SIZE:
+	 *params = (GLfloat) ctx->Pixel.MapGtoGsize;
+	 break;
+      case GL_PIXEL_MAP_I_TO_A_SIZE:
+	 *params = (GLfloat) ctx->Pixel.MapItoAsize;
+	 break;
+      case GL_PIXEL_MAP_I_TO_B_SIZE:
+	 *params = (GLfloat) ctx->Pixel.MapItoBsize;
+	 break;
+      case GL_PIXEL_MAP_I_TO_G_SIZE:
+	 *params = (GLfloat) ctx->Pixel.MapItoGsize;
+	 break;
+      case GL_PIXEL_MAP_I_TO_I_SIZE:
+	 *params = (GLfloat) ctx->Pixel.MapItoIsize;
+	 break;
+      case GL_PIXEL_MAP_I_TO_R_SIZE:
+	 *params = (GLfloat) ctx->Pixel.MapItoRsize;
+	 break;
+      case GL_PIXEL_MAP_R_TO_R_SIZE:
+	 *params = (GLfloat) ctx->Pixel.MapRtoRsize;
+	 break;
+      case GL_PIXEL_MAP_S_TO_S_SIZE:
+	 *params = (GLfloat) ctx->Pixel.MapStoSsize;
+	 break;
+      case GL_POINT_SIZE:
+         *params = (GLfloat) ctx->Point.Size;
+         break;
+      case GL_POINT_SIZE_GRANULARITY:
+	 *params = (GLfloat) ctx->Const.PointSizeGranularity;
+	 break;
+      case GL_POINT_SIZE_RANGE:
+	 params[0] = (GLfloat) ctx->Const.MinPointSizeAA;
+	 params[1] = (GLfloat) ctx->Const.MaxPointSizeAA;
+	 break;
+      case GL_ALIASED_POINT_SIZE_RANGE:
+	 params[0] = (GLfloat) ctx->Const.MinPointSize;
+	 params[1] = (GLfloat) ctx->Const.MaxPointSize;
+	 break;
+      case GL_POINT_SMOOTH:
+	 *params = (GLfloat) ctx->Point.SmoothFlag;
+	 break;
+      case GL_POINT_SMOOTH_HINT:
+	 *params = ENUM_TO_FLOAT(ctx->Hint.PointSmooth);
+	 break;
+      case GL_POINT_SIZE_MIN_EXT:
+	 *params = (GLfloat) (ctx->Point.MinSize);
+	 break;
+      case GL_POINT_SIZE_MAX_EXT:
+	 *params = (GLfloat) (ctx->Point.MaxSize);
+	 break;
+      case GL_POINT_FADE_THRESHOLD_SIZE_EXT:
+	 *params = (GLfloat) (ctx->Point.Threshold);
+	 break;
+      case GL_DISTANCE_ATTENUATION_EXT:
+	 params[0] = (GLfloat) (ctx->Point.Params[0]);
+	 params[1] = (GLfloat) (ctx->Point.Params[1]);
+	 params[2] = (GLfloat) (ctx->Point.Params[2]);
+	 break;
+      case GL_POLYGON_MODE:
+	 params[0] = ENUM_TO_FLOAT(ctx->Polygon.FrontMode);
+	 params[1] = ENUM_TO_FLOAT(ctx->Polygon.BackMode);
+	 break;
+#ifdef GL_EXT_polygon_offset
+      case GL_POLYGON_OFFSET_BIAS_EXT:
+         *params = ctx->Polygon.OffsetUnits;
+         break;
+#endif
+      case GL_POLYGON_OFFSET_FACTOR:
+         *params = ctx->Polygon.OffsetFactor;
+         break;
+      case GL_POLYGON_OFFSET_UNITS:
+         *params = ctx->Polygon.OffsetUnits;
+         break;
+      case GL_POLYGON_SMOOTH:
+	 *params = (GLfloat) ctx->Polygon.SmoothFlag;
+	 break;
+      case GL_POLYGON_SMOOTH_HINT:
+	 *params = ENUM_TO_FLOAT(ctx->Hint.PolygonSmooth);
+	 break;
+      case GL_POLYGON_STIPPLE:
+         *params = (GLfloat) ctx->Polygon.StippleFlag;
+	 break;
+      case GL_PROJECTION_MATRIX:
+	 for (i=0;i<16;i++) {
+	    params[i] = ctx->ProjectionMatrixStack.Top->m[i];
+	 }
+	 break;
+      case GL_PROJECTION_STACK_DEPTH:
+	 *params = (GLfloat) (ctx->ProjectionMatrixStack.Depth + 1);
+	 break;
+      case GL_READ_BUFFER:
+	 *params = ENUM_TO_FLOAT(ctx->Pixel.ReadBuffer);
+	 break;
+      case GL_RED_BIAS:
+         *params = ctx->Pixel.RedBias;
+         break;
+      case GL_RED_BITS:
+         *params = (GLfloat) ctx->Visual.redBits;
+         break;
+      case GL_RED_SCALE:
+         *params = ctx->Pixel.RedScale;
+         break;
+      case GL_RENDER_MODE:
+	 *params = ENUM_TO_FLOAT(ctx->RenderMode);
+	 break;
+      case GL_RESCALE_NORMAL:
+         *params = (GLfloat) ctx->Transform.RescaleNormals;
+         break;
+      case GL_RGBA_MODE:
+	 *params = (GLfloat) ctx->Visual.rgbMode;
+	 break;
+      case GL_SCISSOR_BOX:
+	 params[0] = (GLfloat) ctx->Scissor.X;
+	 params[1] = (GLfloat) ctx->Scissor.Y;
+	 params[2] = (GLfloat) ctx->Scissor.Width;
+	 params[3] = (GLfloat) ctx->Scissor.Height;
+	 break;
+      case GL_SCISSOR_TEST:
+	 *params = (GLfloat) ctx->Scissor.Enabled;
+	 break;
+      case GL_SELECTION_BUFFER_SIZE:
+         *params = (GLfloat) ctx->Select.BufferSize;
+         break;
+      case GL_SHADE_MODEL:
+	 *params = ENUM_TO_FLOAT(ctx->Light.ShadeModel);
+	 break;
+      case GL_SHARED_TEXTURE_PALETTE_EXT:
+         *params = (GLfloat) ctx->Texture.SharedPalette;
+         break;
+      case GL_STENCIL_BITS:
+         *params = (GLfloat) ctx->Visual.stencilBits;
+         break;
+      case GL_STENCIL_CLEAR_VALUE:
+	 *params = (GLfloat) ctx->Stencil.Clear;
+	 break;
+      case GL_STENCIL_FAIL:
+	 *params = ENUM_TO_FLOAT(ctx->Stencil.FailFunc[ctx->Stencil.ActiveFace]);
+	 break;
+      case GL_STENCIL_FUNC:
+	 *params = ENUM_TO_FLOAT(ctx->Stencil.Function[ctx->Stencil.ActiveFace]);
+	 break;
+      case GL_STENCIL_PASS_DEPTH_FAIL:
+	 *params = ENUM_TO_FLOAT(ctx->Stencil.ZFailFunc[ctx->Stencil.ActiveFace]);
+	 break;
+      case GL_STENCIL_PASS_DEPTH_PASS:
+	 *params = ENUM_TO_FLOAT(ctx->Stencil.ZPassFunc[ctx->Stencil.ActiveFace]);
+	 break;
+      case GL_STENCIL_REF:
+	 *params = (GLfloat) ctx->Stencil.Ref[ctx->Stencil.ActiveFace];
+	 break;
+      case GL_STENCIL_TEST:
+	 *params = (GLfloat) ctx->Stencil.Enabled;
+	 break;
+      case GL_STENCIL_VALUE_MASK:
+	 *params = (GLfloat) ctx->Stencil.ValueMask[ctx->Stencil.ActiveFace];
+	 break;
+      case GL_STENCIL_WRITEMASK:
+	 *params = (GLfloat) ctx->Stencil.WriteMask[ctx->Stencil.ActiveFace];
+	 break;
+      case GL_STEREO:
+	 *params = (GLfloat) ctx->Visual.stereoMode;
+	 break;
+      case GL_SUBPIXEL_BITS:
+	 *params = (GLfloat) ctx->Const.SubPixelBits;
+	 break;
+      case GL_TEXTURE_1D:
+         *params = _mesa_IsEnabled(GL_TEXTURE_1D) ? 1.0F : 0.0F;
+	 break;
+      case GL_TEXTURE_2D:
+         *params = _mesa_IsEnabled(GL_TEXTURE_2D) ? 1.0F : 0.0F;
+	 break;
+      case GL_TEXTURE_3D:
+         *params = _mesa_IsEnabled(GL_TEXTURE_3D) ? 1.0F : 0.0F;
+	 break;
+      case GL_TEXTURE_BINDING_1D:
+         *params = (GLfloat) textureUnit->Current1D->Name;
+          break;
+      case GL_TEXTURE_BINDING_2D:
+         *params = (GLfloat) textureUnit->Current2D->Name;
+          break;
+      case GL_TEXTURE_BINDING_3D:
+         *params = (GLfloat) textureUnit->Current2D->Name;
+          break;
+      case GL_TEXTURE_ENV_COLOR:
+	 params[0] = textureUnit->EnvColor[0];
+	 params[1] = textureUnit->EnvColor[1];
+	 params[2] = textureUnit->EnvColor[2];
+	 params[3] = textureUnit->EnvColor[3];
+	 break;
+      case GL_TEXTURE_ENV_MODE:
+	 *params = ENUM_TO_FLOAT(textureUnit->EnvMode);
+	 break;
+      case GL_TEXTURE_GEN_S:
+	 *params = (textureUnit->TexGenEnabled & S_BIT) ? 1.0F : 0.0F;
+	 break;
+      case GL_TEXTURE_GEN_T:
+	 *params = (textureUnit->TexGenEnabled & T_BIT) ? 1.0F : 0.0F;
+	 break;
+      case GL_TEXTURE_GEN_R:
+	 *params = (textureUnit->TexGenEnabled & R_BIT) ? 1.0F : 0.0F;
+	 break;
+      case GL_TEXTURE_GEN_Q:
+	 *params = (textureUnit->TexGenEnabled & Q_BIT) ? 1.0F : 0.0F;
+	 break;
+      case GL_TEXTURE_MATRIX:
+         for (i=0;i<16;i++) {
+	    params[i] = ctx->TextureMatrixStack[texUnit].Top->m[i];
+	 }
+	 break;
+      case GL_TEXTURE_STACK_DEPTH:
+	 *params = (GLfloat) (ctx->TextureMatrixStack[texUnit].Depth + 1);
+	 break;
+      case GL_UNPACK_ALIGNMENT:
+	 *params = (GLfloat) ctx->Unpack.Alignment;
+	 break;
+      case GL_UNPACK_LSB_FIRST:
+	 *params = (GLfloat) ctx->Unpack.LsbFirst;
+	 break;
+      case GL_UNPACK_ROW_LENGTH:
+	 *params = (GLfloat) ctx->Unpack.RowLength;
+	 break;
+      case GL_UNPACK_SKIP_PIXELS:
+	 *params = (GLfloat) ctx->Unpack.SkipPixels;
+	 break;
+      case GL_UNPACK_SKIP_ROWS:
+	 *params = (GLfloat) ctx->Unpack.SkipRows;
+	 break;
+      case GL_UNPACK_SWAP_BYTES:
+	 *params = (GLfloat) ctx->Unpack.SwapBytes;
+	 break;
+      case GL_UNPACK_SKIP_IMAGES_EXT:
+         *params = (GLfloat) ctx->Unpack.SkipImages;
+         break;
+      case GL_UNPACK_IMAGE_HEIGHT_EXT:
+         *params = (GLfloat) ctx->Unpack.ImageHeight;
+         break;
+      case GL_UNPACK_CLIENT_STORAGE_APPLE:
+         *params = (GLfloat) ctx->Unpack.ClientStorage;
+         break;
+      case GL_VIEWPORT:
+	 params[0] = (GLfloat) ctx->Viewport.X;
+	 params[1] = (GLfloat) ctx->Viewport.Y;
+	 params[2] = (GLfloat) ctx->Viewport.Width;
+	 params[3] = (GLfloat) ctx->Viewport.Height;
+	 break;
+      case GL_ZOOM_X:
+	 *params = (GLfloat) ctx->Pixel.ZoomX;
+	 break;
+      case GL_ZOOM_Y:
+	 *params = (GLfloat) ctx->Pixel.ZoomY;
+	 break;
+      case GL_VERTEX_ARRAY:
+         *params = (GLfloat) ctx->Array.Vertex.Enabled;
+         break;
+      case GL_VERTEX_ARRAY_SIZE:
+         *params = (GLfloat) ctx->Array.Vertex.Size;
+         break;
+      case GL_VERTEX_ARRAY_TYPE:
+         *params = ENUM_TO_FLOAT(ctx->Array.Vertex.Type);
+         break;
+      case GL_VERTEX_ARRAY_STRIDE:
+         *params = (GLfloat) ctx->Array.Vertex.Stride;
+         break;
+      case GL_VERTEX_ARRAY_COUNT_EXT:
+         *params = 0.0;
+         break;
+      case GL_NORMAL_ARRAY:
+         *params = (GLfloat) ctx->Array.Normal.Enabled;
+         break;
+      case GL_NORMAL_ARRAY_TYPE:
+         *params = ENUM_TO_FLOAT(ctx->Array.Normal.Type);
+         break;
+      case GL_NORMAL_ARRAY_STRIDE:
+         *params = (GLfloat) ctx->Array.Normal.Stride;
+         break;
+      case GL_NORMAL_ARRAY_COUNT_EXT:
+         *params = 0.0;
+         break;
+      case GL_COLOR_ARRAY:
+         *params = (GLfloat) ctx->Array.Color.Enabled;
+         break;
+      case GL_COLOR_ARRAY_SIZE:
+         *params = (GLfloat) ctx->Array.Color.Size;
+         break;
+      case GL_COLOR_ARRAY_TYPE:
+         *params = ENUM_TO_FLOAT(ctx->Array.Color.Type);
+         break;
+      case GL_COLOR_ARRAY_STRIDE:
+         *params = (GLfloat) ctx->Array.Color.Stride;
+         break;
+      case GL_COLOR_ARRAY_COUNT_EXT:
+         *params = 0.0;
+         break;
+      case GL_INDEX_ARRAY:
+         *params = (GLfloat) ctx->Array.Index.Enabled;
+         break;
+      case GL_INDEX_ARRAY_TYPE:
+         *params = ENUM_TO_FLOAT(ctx->Array.Index.Type);
+         break;
+      case GL_INDEX_ARRAY_STRIDE:
+         *params = (GLfloat) ctx->Array.Index.Stride;
+         break;
+      case GL_INDEX_ARRAY_COUNT_EXT:
+         *params = 0.0;
+         break;
+      case GL_TEXTURE_COORD_ARRAY:
+         *params = (GLfloat) ctx->Array.TexCoord[clientUnit].Enabled;
+         break;
+      case GL_TEXTURE_COORD_ARRAY_SIZE:
+         *params = (GLfloat) ctx->Array.TexCoord[clientUnit].Size;
+         break;
+      case GL_TEXTURE_COORD_ARRAY_TYPE:
+         *params = ENUM_TO_FLOAT(ctx->Array.TexCoord[clientUnit].Type);
+         break;
+      case GL_TEXTURE_COORD_ARRAY_STRIDE:
+         *params = (GLfloat) ctx->Array.TexCoord[clientUnit].Stride;
+         break;
+      case GL_TEXTURE_COORD_ARRAY_COUNT_EXT:
+         *params = 0.0;
+         break;
+      case GL_EDGE_FLAG_ARRAY:
+         *params = (GLfloat) ctx->Array.EdgeFlag.Enabled;
+         break;
+      case GL_EDGE_FLAG_ARRAY_STRIDE:
+         *params = (GLfloat) ctx->Array.EdgeFlag.Stride;
+         break;
+      case GL_EDGE_FLAG_ARRAY_COUNT_EXT:
+         *params = 0.0;
+         break;
+
+      /* GL_ARB_multitexture */
+      case GL_MAX_TEXTURE_UNITS_ARB:
+         CHECK_EXTENSION_F(ARB_multitexture, pname);
+         *params = (GLfloat) MIN2(ctx->Const.MaxTextureImageUnits,
+                                  ctx->Const.MaxTextureCoordUnits);
+         break;
+      case GL_ACTIVE_TEXTURE_ARB:
+         CHECK_EXTENSION_F(ARB_multitexture, pname);
+         *params = (GLfloat) (GL_TEXTURE0_ARB + ctx->Texture.CurrentUnit);
+         break;
+      case GL_CLIENT_ACTIVE_TEXTURE_ARB:
+         CHECK_EXTENSION_F(ARB_multitexture, pname);
+         *params = (GLfloat) (GL_TEXTURE0_ARB + clientUnit);
+         break;
+
+      /* GL_ARB_texture_cube_map */
+      case GL_TEXTURE_CUBE_MAP_ARB:
+         CHECK_EXTENSION_F(ARB_texture_cube_map, pname);
+         *params = (GLfloat) _mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB);
+         break;
+      case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
+         CHECK_EXTENSION_F(ARB_texture_cube_map, pname);
+         *params = (GLfloat) textureUnit->CurrentCubeMap->Name;
+         break;
+      case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
+         CHECK_EXTENSION_F(ARB_texture_cube_map, pname);
+         *params = (GLfloat) (1 << (ctx->Const.MaxCubeTextureLevels - 1));
+         break;
+
+      /* GL_ARB_texture_compression */
+      case GL_TEXTURE_COMPRESSION_HINT_ARB:
+         CHECK_EXTENSION_F(ARB_texture_compression, pname);
+         *params = (GLfloat) ctx->Hint.TextureCompression;
+         break;
+      case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:
+         CHECK_EXTENSION_F(ARB_texture_compression, pname);
+         *params = (GLfloat) _mesa_get_compressed_formats(ctx, NULL);
+         break;
+      case GL_COMPRESSED_TEXTURE_FORMATS_ARB:
+         CHECK_EXTENSION_F(ARB_texture_compression, pname);
+         {
+            GLint formats[100];
+            GLuint i, n;
+            n = _mesa_get_compressed_formats(ctx, formats);
+            for (i = 0; i < n; i++)
+               params[i] = (GLfloat) formats[i];
+         }
+         break;
+
+      /* GL_EXT_compiled_vertex_array */
+      case GL_ARRAY_ELEMENT_LOCK_FIRST_EXT:
+         CHECK_EXTENSION_F(EXT_compiled_vertex_array, pname);
+	 *params = (GLfloat) ctx->Array.LockFirst;
+	 break;
+      case GL_ARRAY_ELEMENT_LOCK_COUNT_EXT:
+         CHECK_EXTENSION_F(EXT_compiled_vertex_array, pname);
+	 *params = (GLfloat) ctx->Array.LockCount;
+	 break;
+
+      /* GL_ARB_transpose_matrix */
+      case GL_TRANSPOSE_COLOR_MATRIX_ARB:
+         _math_transposef(params, ctx->ColorMatrixStack.Top->m);
+         break;
+      case GL_TRANSPOSE_MODELVIEW_MATRIX_ARB:
+         _math_transposef(params, ctx->ModelviewMatrixStack.Top->m);
+         break;
+      case GL_TRANSPOSE_PROJECTION_MATRIX_ARB:
+         _math_transposef(params, ctx->ProjectionMatrixStack.Top->m);
+         break;
+      case GL_TRANSPOSE_TEXTURE_MATRIX_ARB:
+         _math_transposef(params, ctx->TextureMatrixStack[texUnit].Top->m);
+         break;
+
+      /* GL_HP_occlusion_test */
+      case GL_OCCLUSION_TEST_HP:
+         CHECK_EXTENSION_F(HP_occlusion_test, pname);
+         *params = (GLfloat) ctx->Depth.OcclusionTest;
+         break;
+      case GL_OCCLUSION_TEST_RESULT_HP:
+         CHECK_EXTENSION_F(HP_occlusion_test, pname);
+         if (ctx->Depth.OcclusionTest)
+            *params = (GLfloat) ctx->OcclusionResult;
+         else
+            *params = (GLfloat) ctx->OcclusionResultSaved;
+         /* reset flag now */
+         ctx->OcclusionResult = GL_FALSE;
+         ctx->OcclusionResultSaved = GL_FALSE;
+         break;
+
+      /* GL_SGIS_pixel_texture */
+      case GL_PIXEL_TEXTURE_SGIS:
+         *params = (GLfloat) ctx->Pixel.PixelTextureEnabled;
+         break;
+
+      /* GL_SGIX_pixel_texture */
+      case GL_PIXEL_TEX_GEN_SGIX:
+         *params = (GLfloat) ctx->Pixel.PixelTextureEnabled;
+         break;
+      case GL_PIXEL_TEX_GEN_MODE_SGIX:
+         *params = (GLfloat) pixel_texgen_mode(ctx);
+         break;
+
+      /* GL_SGI_color_matrix (also in 1.2 imaging) */
+      case GL_COLOR_MATRIX_SGI:
+         for (i=0;i<16;i++) {
+	    params[i] = ctx->ColorMatrixStack.Top->m[i];
+	 }
+	 break;
+      case GL_COLOR_MATRIX_STACK_DEPTH_SGI:
+         *params = (GLfloat) (ctx->ColorMatrixStack.Depth + 1);
+         break;
+      case GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI:
+         *params = (GLfloat) MAX_COLOR_STACK_DEPTH;
+         break;
+      case GL_POST_COLOR_MATRIX_RED_SCALE_SGI:
+         *params = ctx->Pixel.PostColorMatrixScale[0];
+         break;
+      case GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI:
+         *params = ctx->Pixel.PostColorMatrixScale[1];
+         break;
+      case GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI:
+         *params = ctx->Pixel.PostColorMatrixScale[2];
+         break;
+      case GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI:
+         *params = ctx->Pixel.PostColorMatrixScale[3];
+         break;
+      case GL_POST_COLOR_MATRIX_RED_BIAS_SGI:
+         *params = ctx->Pixel.PostColorMatrixBias[0];
+         break;
+      case GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI:
+         *params = ctx->Pixel.PostColorMatrixBias[1];
+         break;
+      case GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI:
+         *params = ctx->Pixel.PostColorMatrixBias[2];
+         break;
+      case GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI:
+         *params = ctx->Pixel.PostColorMatrixBias[3];
+         break;
+
+      /* GL_EXT_convolution (also in 1.2 imaging) */
+      case GL_CONVOLUTION_1D_EXT:
+         CHECK_EXTENSION_F(EXT_convolution, pname);
+         *params = (GLfloat) ctx->Pixel.Convolution1DEnabled;
+         break;
+      case GL_CONVOLUTION_2D:
+         CHECK_EXTENSION_F(EXT_convolution, pname);
+         *params = (GLfloat) ctx->Pixel.Convolution2DEnabled;
+         break;
+      case GL_SEPARABLE_2D:
+         CHECK_EXTENSION_F(EXT_convolution, pname);
+         *params = (GLfloat) ctx->Pixel.Separable2DEnabled;
+         break;
+      case GL_POST_CONVOLUTION_RED_SCALE_EXT:
+         CHECK_EXTENSION_F(EXT_convolution, pname);
+         *params = ctx->Pixel.PostConvolutionScale[0];
+         break;
+      case GL_POST_CONVOLUTION_GREEN_SCALE_EXT:
+         CHECK_EXTENSION_F(EXT_convolution, pname);
+         *params = ctx->Pixel.PostConvolutionScale[1];
+         break;
+      case GL_POST_CONVOLUTION_BLUE_SCALE_EXT:
+         CHECK_EXTENSION_F(EXT_convolution, pname);
+         *params = ctx->Pixel.PostConvolutionScale[2];
+         break;
+      case GL_POST_CONVOLUTION_ALPHA_SCALE_EXT:
+         CHECK_EXTENSION_F(EXT_convolution, pname);
+         *params = ctx->Pixel.PostConvolutionScale[3];
+         break;
+      case GL_POST_CONVOLUTION_RED_BIAS_EXT:
+         CHECK_EXTENSION_F(EXT_convolution, pname);
+         *params = ctx->Pixel.PostConvolutionBias[0];
+         break;
+      case GL_POST_CONVOLUTION_GREEN_BIAS_EXT:
+         CHECK_EXTENSION_F(EXT_convolution, pname);
+         *params = ctx->Pixel.PostConvolutionBias[1];
+         break;
+      case GL_POST_CONVOLUTION_BLUE_BIAS_EXT:
+         CHECK_EXTENSION_F(EXT_convolution, pname);
+         *params = ctx->Pixel.PostConvolutionBias[2];
+         break;
+      case GL_POST_CONVOLUTION_ALPHA_BIAS_EXT:
+         CHECK_EXTENSION_F(EXT_convolution, pname);
+         *params = ctx->Pixel.PostConvolutionBias[2];
+         break;
+
+      /* GL_EXT_histogram (also in 1.2 imaging) */
+      case GL_HISTOGRAM:
+         CHECK_EXTENSION_F(EXT_histogram, pname);
+         *params = (GLfloat) ctx->Pixel.HistogramEnabled;
+	 break;
+      case GL_MINMAX:
+         CHECK_EXTENSION_F(EXT_histogram, pname);
+         *params = (GLfloat) ctx->Pixel.MinMaxEnabled;
+         break;
+
+      /* GL_SGI_color_table (also in 1.2 imaging */
+      case GL_COLOR_TABLE_SGI:
+         *params = (GLfloat) ctx->Pixel.ColorTableEnabled;
+         break;
+      case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
+         *params = (GLfloat) ctx->Pixel.PostConvolutionColorTableEnabled;
+         break;
+      case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
+         *params = (GLfloat) ctx->Pixel.PostColorMatrixColorTableEnabled;
+         break;
+
+      /* GL_SGI_texture_color_table */
+      case GL_TEXTURE_COLOR_TABLE_SGI:
+         CHECK_EXTENSION_F(SGI_texture_color_table, pname);
+         *params = (GLfloat) textureUnit->ColorTableEnabled;
+         break;
+
+      /* GL_EXT_secondary_color */
+      case GL_COLOR_SUM_EXT:
+         CHECK_EXTENSION_F(EXT_secondary_color, pname);
+	 *params = (GLfloat) ctx->Fog.ColorSumEnabled;
+	 break;
+      case GL_CURRENT_SECONDARY_COLOR_EXT:
+         CHECK_EXTENSION_F(EXT_secondary_color, pname);
+	 FLUSH_CURRENT(ctx, 0);
+         params[0] = ctx->Current.Attrib[VERT_ATTRIB_COLOR1][0];
+         params[1] = ctx->Current.Attrib[VERT_ATTRIB_COLOR1][1];
+         params[2] = ctx->Current.Attrib[VERT_ATTRIB_COLOR1][2];
+         params[3] = ctx->Current.Attrib[VERT_ATTRIB_COLOR1][3];
+	 break;
+      case GL_SECONDARY_COLOR_ARRAY_EXT:
+         CHECK_EXTENSION_F(EXT_secondary_color, pname);
+         *params = (GLfloat) ctx->Array.SecondaryColor.Enabled;
+         break;
+      case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
+         CHECK_EXTENSION_F(EXT_secondary_color, pname);
+	 *params = (GLfloat) ctx->Array.SecondaryColor.Type;
+	 break;
+      case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
+         CHECK_EXTENSION_F(EXT_secondary_color, pname);
+	 *params = (GLfloat) ctx->Array.SecondaryColor.Stride;
+	 break;
+      case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
+         CHECK_EXTENSION_F(EXT_secondary_color, pname);
+	 *params = (GLfloat) ctx->Array.SecondaryColor.Size;
+	 break;
+
+      /* GL_EXT_fog_coord */
+      case GL_CURRENT_FOG_COORDINATE_EXT:
+         CHECK_EXTENSION_F(EXT_fog_coord, pname);
+	 FLUSH_CURRENT(ctx, 0);
+	 *params = (GLfloat) ctx->Current.Attrib[VERT_ATTRIB_FOG][0];
+	 break;
+      case GL_FOG_COORDINATE_ARRAY_EXT:
+         CHECK_EXTENSION_F(EXT_fog_coord, pname);
+         *params = (GLfloat) ctx->Array.FogCoord.Enabled;
+         break;
+      case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
+         CHECK_EXTENSION_F(EXT_fog_coord, pname);
+	 *params = (GLfloat) ctx->Array.FogCoord.Type;
+	 break;
+      case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
+         CHECK_EXTENSION_F(EXT_fog_coord, pname);
+	 *params = (GLfloat) ctx->Array.FogCoord.Stride;
+	 break;
+      case GL_FOG_COORDINATE_SOURCE_EXT:
+         CHECK_EXTENSION_F(EXT_fog_coord, pname);
+	 *params = (GLfloat) ctx->Fog.FogCoordinateSource;
+	 break;
+
+      /* GL_EXT_texture_lod_bias */
+      case GL_MAX_TEXTURE_LOD_BIAS_EXT:
+         *params = ctx->Const.MaxTextureLodBias;
+         break;
+
+      /* GL_EXT_texture_filter_anisotropic */
+      case GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT:
+         CHECK_EXTENSION_F(EXT_texture_filter_anisotropic, pname);
+         *params = ctx->Const.MaxTextureMaxAnisotropy;
+	 break;
+
+      /* GL_ARB_multisample */
+      case GL_MULTISAMPLE_ARB:
+         CHECK_EXTENSION_F(ARB_multisample, pname);
+         *params = (GLfloat) ctx->Multisample.Enabled;
+         break;
+      case GL_SAMPLE_ALPHA_TO_COVERAGE_ARB:
+         CHECK_EXTENSION_F(ARB_multisample, pname);
+         *params = (GLfloat) ctx->Multisample.SampleAlphaToCoverage;
+         break;
+      case GL_SAMPLE_ALPHA_TO_ONE_ARB:
+         CHECK_EXTENSION_F(ARB_multisample, pname);
+         *params = (GLfloat) ctx->Multisample.SampleAlphaToOne;
+         break;
+      case GL_SAMPLE_COVERAGE_ARB:
+         CHECK_EXTENSION_F(ARB_multisample, pname);
+         *params = (GLfloat) ctx->Multisample.SampleCoverage;
+         break;
+      case GL_SAMPLE_COVERAGE_VALUE_ARB:
+         CHECK_EXTENSION_F(ARB_multisample, pname);
+         *params = ctx->Multisample.SampleCoverageValue;
+         break;
+      case GL_SAMPLE_COVERAGE_INVERT_ARB:
+         CHECK_EXTENSION_F(ARB_multisample, pname);
+         *params = (GLfloat) ctx->Multisample.SampleCoverageInvert;
+         break;
+      case GL_SAMPLE_BUFFERS_ARB:
+         CHECK_EXTENSION_F(ARB_multisample, pname);
+         *params = 0.0; /* XXX fix someday */
+         break;
+      case GL_SAMPLES_ARB:
+         CHECK_EXTENSION_F(ARB_multisample, pname);
+         *params = 0.0; /* XXX fix someday */
+         break;
+
+      /* GL_IBM_rasterpos_clip */
+      case GL_RASTER_POSITION_UNCLIPPED_IBM:
+         CHECK_EXTENSION_F(IBM_rasterpos_clip, pname);
+         *params = (GLfloat) ctx->Transform.RasterPositionUnclipped;
+         break;
+
+      /* GL_NV_point_sprite */
+      case GL_POINT_SPRITE_NV:
+         CHECK_EXTENSION2_F(NV_point_sprite, ARB_point_sprite, pname);
+         *params = (GLfloat) ctx->Point.PointSprite;
+         break;
+      case GL_POINT_SPRITE_R_MODE_NV:
+         CHECK_EXTENSION_F(NV_point_sprite, pname);
+         *params = (GLfloat) ctx->Point.SpriteRMode;
+         break;
+
+      /* GL_SGIS_generate_mipmap */
+      case GL_GENERATE_MIPMAP_HINT_SGIS:
+         CHECK_EXTENSION_F(SGIS_generate_mipmap, pname);
+         *params = (GLfloat) ctx->Hint.GenerateMipmap;
+         break;
+
+#if FEATURE_NV_vertex_program
+      case GL_VERTEX_PROGRAM_NV:
+         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         *params = (GLfloat) ctx->VertexProgram.Enabled;
+         break;
+      case GL_VERTEX_PROGRAM_POINT_SIZE_NV:
+         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         *params = (GLfloat) ctx->VertexProgram.PointSizeEnabled;
+         break;
+      case GL_VERTEX_PROGRAM_TWO_SIDE_NV:
+         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         *params = (GLfloat) ctx->VertexProgram.TwoSideEnabled;
+         break;
+      case GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV:
+         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         *params = (GLfloat) ctx->Const.MaxProgramMatrixStackDepth;
+         break;
+      case GL_MAX_TRACK_MATRICES_NV:
+         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         *params = (GLfloat) ctx->Const.MaxProgramMatrices;
+         break;
+      case GL_CURRENT_MATRIX_STACK_DEPTH_NV:
+         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         *params = (GLfloat) ctx->CurrentStack->Depth + 1;
+         break;
+      case GL_CURRENT_MATRIX_NV:
+         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         for (i = 0; i < 16; i++)
+            params[i] = ctx->CurrentStack->Top->m[i];
+         break;
+      case GL_VERTEX_PROGRAM_BINDING_NV:
+         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         if (ctx->VertexProgram.Current)
+            *params = (GLfloat) ctx->VertexProgram.Current->Base.Id;
+         else
+            *params = 0.0;
+         break;
+      case GL_PROGRAM_ERROR_POSITION_NV:
+         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         *params = (GLfloat) ctx->Program.ErrorPos;
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY0_NV:
+      case GL_VERTEX_ATTRIB_ARRAY1_NV:
+      case GL_VERTEX_ATTRIB_ARRAY2_NV:
+      case GL_VERTEX_ATTRIB_ARRAY3_NV:
+      case GL_VERTEX_ATTRIB_ARRAY4_NV:
+      case GL_VERTEX_ATTRIB_ARRAY5_NV:
+      case GL_VERTEX_ATTRIB_ARRAY6_NV:
+      case GL_VERTEX_ATTRIB_ARRAY7_NV:
+      case GL_VERTEX_ATTRIB_ARRAY8_NV:
+      case GL_VERTEX_ATTRIB_ARRAY9_NV:
+      case GL_VERTEX_ATTRIB_ARRAY10_NV:
+      case GL_VERTEX_ATTRIB_ARRAY11_NV:
+      case GL_VERTEX_ATTRIB_ARRAY12_NV:
+      case GL_VERTEX_ATTRIB_ARRAY13_NV:
+      case GL_VERTEX_ATTRIB_ARRAY14_NV:
+      case GL_VERTEX_ATTRIB_ARRAY15_NV:
+         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         {
+            GLuint n = (GLuint) pname - GL_VERTEX_ATTRIB_ARRAY0_NV;
+            *params = (GLfloat) ctx->Array.VertexAttrib[n].Enabled;
+         }
+         break;
+      case GL_MAP1_VERTEX_ATTRIB0_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB1_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB2_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB3_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB4_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB5_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB6_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB7_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB8_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB9_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB10_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB11_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB12_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB13_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB14_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB15_4_NV:
+         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         {
+            GLuint n = (GLuint) pname - GL_MAP1_VERTEX_ATTRIB0_4_NV;
+            *params = (GLfloat) ctx->Eval.Map1Attrib[n];
+         }
+         break;
+      case GL_MAP2_VERTEX_ATTRIB0_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB1_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB2_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB3_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB4_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB5_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB6_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB7_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB8_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB9_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB10_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB11_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB12_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB13_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB14_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB15_4_NV:
+         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         {
+            GLuint n = (GLuint) pname - GL_MAP2_VERTEX_ATTRIB0_4_NV;
+            *params = (GLfloat) ctx->Eval.Map2Attrib[n];
+         }
+         break;
+#endif /* FEATURE_NV_vertex_program */
+
+#if FEATURE_NV_fragment_program
+      case GL_FRAGMENT_PROGRAM_NV:
+         CHECK_EXTENSION_F(NV_fragment_program, pname);
+         *params = (GLfloat) ctx->FragmentProgram.Enabled;
+         break;
+      case GL_MAX_TEXTURE_COORDS_NV:
+         CHECK_EXTENSION_F(NV_fragment_program, pname);
+         *params = (GLfloat) ctx->Const.MaxTextureCoordUnits;
+         break;
+      case GL_MAX_TEXTURE_IMAGE_UNITS_NV:
+         CHECK_EXTENSION_F(NV_fragment_program, pname);
+         *params = (GLfloat) ctx->Const.MaxTextureImageUnits;
+         break;
+      case GL_FRAGMENT_PROGRAM_BINDING_NV:
+         CHECK_EXTENSION_F(NV_fragment_program, pname);
+         if (ctx->FragmentProgram.Current)
+            *params = (GLfloat) ctx->FragmentProgram.Current->Base.Id;
+         else
+            *params = 0.0;
+         break;
+      case GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV:
+         CHECK_EXTENSION_F(NV_fragment_program, pname);
+         *params = (GLfloat) MAX_NV_FRAGMENT_PROGRAM_PARAMS;
+         break;
+#endif /* FEATURE_NV_fragment_program */
+
+      /* GL_NV_texture_rectangle */
+      case GL_TEXTURE_RECTANGLE_NV:
+         CHECK_EXTENSION_F(NV_texture_rectangle, pname);
+         *params = (GLfloat) _mesa_IsEnabled(GL_TEXTURE_RECTANGLE_NV);
+         break;
+      case GL_TEXTURE_BINDING_RECTANGLE_NV:
+         CHECK_EXTENSION_F(NV_texture_rectangle, pname);
+         *params = (GLfloat) textureUnit->CurrentRect->Name;
+         break;
+      case GL_MAX_RECTANGLE_TEXTURE_SIZE_NV:
+         CHECK_EXTENSION_F(NV_texture_rectangle, pname);
+         *params = (GLfloat) ctx->Const.MaxTextureRectSize;
+         break;
+
+      /* GL_EXT_stencil_two_side */
+      case GL_STENCIL_TEST_TWO_SIDE_EXT:
+         CHECK_EXTENSION_F(EXT_stencil_two_side, pname);
+         *params = (GLfloat) ctx->Stencil.TestTwoSide;
+         break;
+      case GL_ACTIVE_STENCIL_FACE_EXT:
+         CHECK_EXTENSION_F(EXT_stencil_two_side, pname);
+         *params = (GLfloat) (ctx->Stencil.ActiveFace ? GL_BACK : GL_FRONT);
+         break;
+
+      /* GL_NV_light_max_exponent */
+      case GL_MAX_SHININESS_NV:
+         *params = ctx->Const.MaxShininess;
+         break;
+      case GL_MAX_SPOT_EXPONENT_NV:
+         *params = ctx->Const.MaxSpotExponent;
+         break;
+
+#if FEATURE_ARB_vertex_buffer_object
+      case GL_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_F(ARB_vertex_buffer_object, pname);
+         *params = (GLfloat) ctx->Array.ArrayBufferObj->Name;
+         break;
+      case GL_VERTEX_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_F(ARB_vertex_buffer_object, pname);
+         *params = (GLfloat) ctx->Array.Vertex.BufferObj->Name;
+         break;
+      case GL_NORMAL_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_F(ARB_vertex_buffer_object, pname);
+         *params = (GLfloat) ctx->Array.Normal.BufferObj->Name;
+         break;
+      case GL_COLOR_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_F(ARB_vertex_buffer_object, pname);
+         *params = (GLfloat) ctx->Array.Color.BufferObj->Name;
+         break;
+      case GL_INDEX_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_F(ARB_vertex_buffer_object, pname);
+         *params = (GLfloat) ctx->Array.Index.BufferObj->Name;
+         break;
+      case GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_F(ARB_vertex_buffer_object, pname);
+         *params = (GLfloat) ctx->Array.TexCoord[clientUnit].BufferObj->Name;
+         break;
+      case GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_F(ARB_vertex_buffer_object, pname);
+         *params = (GLfloat) ctx->Array.EdgeFlag.BufferObj->Name;
+         break;
+      case GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_F(ARB_vertex_buffer_object, pname);
+         *params = (GLfloat) ctx->Array.SecondaryColor.BufferObj->Name;
+         break;
+      case GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_F(ARB_vertex_buffer_object, pname);
+         *params = (GLfloat) ctx->Array.FogCoord.BufferObj->Name;
+         break;
+      /*case GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB: - not supported */
+      case GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_F(ARB_vertex_buffer_object, pname);
+         *params = (GLfloat) ctx->Array.ElementArrayBufferObj->Name;
+         break;
+#endif
+
+#if FEATURE_ARB_fragment_program
+      case GL_FRAGMENT_PROGRAM_ARB:
+         CHECK_EXTENSION_F(ARB_fragment_program, pname);
+         *params = (GLfloat) ctx->FragmentProgram.Enabled;
+         break;
+      case GL_TRANSPOSE_CURRENT_MATRIX_ARB:
+         CHECK_EXTENSION_F(ARB_fragment_program, pname);
+         params[0] = ctx->CurrentStack->Top->m[0];
+         params[1] = ctx->CurrentStack->Top->m[4];
+         params[2] = ctx->CurrentStack->Top->m[8];
+         params[3] = ctx->CurrentStack->Top->m[12];
+         params[4] = ctx->CurrentStack->Top->m[1];
+         params[5] = ctx->CurrentStack->Top->m[5];
+         params[6] = ctx->CurrentStack->Top->m[9];
+         params[7] = ctx->CurrentStack->Top->m[13];
+         params[8] = ctx->CurrentStack->Top->m[2];
+         params[9] = ctx->CurrentStack->Top->m[6];
+         params[10] = ctx->CurrentStack->Top->m[10];
+         params[11] = ctx->CurrentStack->Top->m[14];
+         params[12] = ctx->CurrentStack->Top->m[3];
+         params[13] = ctx->CurrentStack->Top->m[7];
+         params[14] = ctx->CurrentStack->Top->m[11];
+         params[15] = ctx->CurrentStack->Top->m[15];
+         break;
+      /* Remaining ARB_fragment_program queries alias with
+       * the GL_NV_fragment_program queries.
+       */
+#endif
+
+      /* GL_EXT_depth_bounds_test */
+      case GL_DEPTH_BOUNDS_TEST_EXT:
+         CHECK_EXTENSION_F(EXT_depth_bounds_test, pname);
+         params[0] = (GLfloat) ctx->Depth.BoundsTest;
+         break;
+      case GL_DEPTH_BOUNDS_EXT:
+         CHECK_EXTENSION_F(EXT_depth_bounds_test, pname);
+         params[0] = ctx->Depth.BoundsMin;
+         params[1] = ctx->Depth.BoundsMax;
+         break;
+
+#if FEATURE_MESA_program_debug
+      case GL_FRAGMENT_PROGRAM_CALLBACK_MESA:
+         CHECK_EXTENSION_F(MESA_program_debug, pname);
+         *params = (GLfloat) ctx->FragmentProgram.CallbackEnabled;
+         break;
+      case GL_VERTEX_PROGRAM_CALLBACK_MESA:
+         CHECK_EXTENSION_F(MESA_program_debug, pname);
+         *params = (GLfloat) ctx->VertexProgram.CallbackEnabled;
+         break;
+      case GL_FRAGMENT_PROGRAM_POSITION_MESA:
+         CHECK_EXTENSION_F(MESA_program_debug, pname);
+         *params = (GLfloat) ctx->FragmentProgram.CurrentPosition;
+         break;
+      case GL_VERTEX_PROGRAM_POSITION_MESA:
+         CHECK_EXTENSION_F(MESA_program_debug, pname);
+         *params = (GLfloat) ctx->VertexProgram.CurrentPosition;
+         break;
+#endif
+
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetFloatv(0x%x)", pname);
+   }
+}
+
+
+/**
+ * Get the value(s) of a selected parameter.
+ *
+ * \param pname parameter to be returned.
+ * \param params will hold the value(s) of the speficifed parameter.
+ *
+ * \sa glGetIntegerv().
+ *
+ * Tries to get the specified parameter via dd_function_table::GetIntegerv,
+ * otherwise gets the specified parameter from the current context, converting
+ * it value into GLinteger.
+ */
+void GLAPIENTRY
+_mesa_GetIntegerv( GLenum pname, GLint *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint i;
+   const GLuint clientUnit = ctx->Array.ActiveTexture;
+   const GLuint texUnit = ctx->Texture.CurrentUnit;
+   const struct gl_texture_unit *textureUnit = &ctx->Texture.Unit[texUnit];
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (!params)
+      return;
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glGetIntegerv %s\n", _mesa_lookup_enum_by_nr(pname));
+
+   if (!ctx->_CurrentProgram) {
+      /* We need this in order to get correct results for
+       * GL_OCCLUSION_TEST_RESULT_HP.  There might be other important cases.
+       */
+      FLUSH_VERTICES(ctx, 0);
+   }
+
+   if (ctx->Driver.GetIntegerv
+       && (*ctx->Driver.GetIntegerv)(ctx, pname, params))
+      return;
+
+   switch (pname) {
+      case GL_ACCUM_RED_BITS:
+         *params = (GLint) ctx->Visual.accumRedBits;
+         break;
+      case GL_ACCUM_GREEN_BITS:
+         *params = (GLint) ctx->Visual.accumGreenBits;
+         break;
+      case GL_ACCUM_BLUE_BITS:
+         *params = (GLint) ctx->Visual.accumBlueBits;
+         break;
+      case GL_ACCUM_ALPHA_BITS:
+         *params = (GLint) ctx->Visual.accumAlphaBits;
+         break;
+      case GL_ACCUM_CLEAR_VALUE:
+         params[0] = FLOAT_TO_INT( ctx->Accum.ClearColor[0] );
+         params[1] = FLOAT_TO_INT( ctx->Accum.ClearColor[1] );
+         params[2] = FLOAT_TO_INT( ctx->Accum.ClearColor[2] );
+         params[3] = FLOAT_TO_INT( ctx->Accum.ClearColor[3] );
+         break;
+      case GL_ALPHA_BIAS:
+         *params = (GLint) ctx->Pixel.AlphaBias;
+         break;
+      case GL_ALPHA_BITS:
+         *params = ctx->Visual.alphaBits;
+         break;
+      case GL_ALPHA_SCALE:
+         *params = (GLint) ctx->Pixel.AlphaScale;
+         break;
+      case GL_ALPHA_TEST:
+         *params = (GLint) ctx->Color.AlphaEnabled;
+         break;
+      case GL_ALPHA_TEST_REF:
+         *params = FLOAT_TO_INT(ctx->Color.AlphaRef);
+         break;
+      case GL_ALPHA_TEST_FUNC:
+         *params = (GLint) ctx->Color.AlphaFunc;
+         break;
+      case GL_ATTRIB_STACK_DEPTH:
+         *params = (GLint) (ctx->AttribStackDepth);
+         break;
+      case GL_AUTO_NORMAL:
+         *params = (GLint) ctx->Eval.AutoNormal;
+         break;
+      case GL_AUX_BUFFERS:
+         *params = (GLint) ctx->Const.NumAuxBuffers;
+         break;
+      case GL_BLEND:
+         *params = (GLint) ctx->Color.BlendEnabled;
+         break;
+      case GL_BLEND_DST:
+         *params = (GLint) ctx->Color.BlendDstRGB;
+         break;
+      case GL_BLEND_SRC:
+         *params = (GLint) ctx->Color.BlendSrcRGB;
+         break;
+      case GL_BLEND_SRC_RGB_EXT:
+         *params = (GLint) ctx->Color.BlendSrcRGB;
+         break;
+      case GL_BLEND_DST_RGB_EXT:
+         *params = (GLint) ctx->Color.BlendDstRGB;
+         break;
+      case GL_BLEND_SRC_ALPHA_EXT:
+         *params = (GLint) ctx->Color.BlendSrcA;
+         break;
+      case GL_BLEND_DST_ALPHA_EXT:
+         *params = (GLint) ctx->Color.BlendDstA;
+         break;
+      case GL_BLEND_EQUATION_EXT:
+	 *params = (GLint) ctx->Color.BlendEquation;
+	 break;
+      case GL_BLEND_COLOR_EXT:
+	 params[0] = FLOAT_TO_INT( ctx->Color.BlendColor[0] );
+	 params[1] = FLOAT_TO_INT( ctx->Color.BlendColor[1] );
+	 params[2] = FLOAT_TO_INT( ctx->Color.BlendColor[2] );
+	 params[3] = FLOAT_TO_INT( ctx->Color.BlendColor[3] );
+	 break;
+      case GL_BLUE_BIAS:
+         *params = (GLint) ctx->Pixel.BlueBias;
+         break;
+      case GL_BLUE_BITS:
+         *params = (GLint) ctx->Visual.blueBits;
+         break;
+      case GL_BLUE_SCALE:
+         *params = (GLint) ctx->Pixel.BlueScale;
+         break;
+      case GL_CLIENT_ATTRIB_STACK_DEPTH:
+         *params = (GLint) (ctx->ClientAttribStackDepth);
+         break;
+      case GL_CLIP_PLANE0:
+      case GL_CLIP_PLANE1:
+      case GL_CLIP_PLANE2:
+      case GL_CLIP_PLANE3:
+      case GL_CLIP_PLANE4:
+      case GL_CLIP_PLANE5:
+         if (ctx->Transform.ClipPlanesEnabled & (1 << (pname - GL_CLIP_PLANE0)))
+            *params = 1;
+         else
+            *params = 0;
+         break;
+      case GL_COLOR_CLEAR_VALUE:
+         params[0] = FLOAT_TO_INT( (ctx->Color.ClearColor[0]) );
+         params[1] = FLOAT_TO_INT( (ctx->Color.ClearColor[1]) );
+         params[2] = FLOAT_TO_INT( (ctx->Color.ClearColor[2]) );
+         params[3] = FLOAT_TO_INT( (ctx->Color.ClearColor[3]) );
+         break;
+      case GL_COLOR_MATERIAL:
+         *params = (GLint) ctx->Light.ColorMaterialEnabled;
+         break;
+      case GL_COLOR_MATERIAL_FACE:
+         *params = (GLint) ctx->Light.ColorMaterialFace;
+         break;
+      case GL_COLOR_MATERIAL_PARAMETER:
+         *params = (GLint) ctx->Light.ColorMaterialMode;
+         break;
+      case GL_COLOR_WRITEMASK:
+         params[0] = ctx->Color.ColorMask[RCOMP] ? 1 : 0;
+         params[1] = ctx->Color.ColorMask[GCOMP] ? 1 : 0;
+         params[2] = ctx->Color.ColorMask[BCOMP] ? 1 : 0;
+         params[3] = ctx->Color.ColorMask[ACOMP] ? 1 : 0;
+         break;
+      case GL_CULL_FACE:
+         *params = (GLint) ctx->Polygon.CullFlag;
+         break;
+      case GL_CULL_FACE_MODE:
+         *params = (GLint) ctx->Polygon.CullFaceMode;
+         break;
+      case GL_CURRENT_COLOR:
+	 FLUSH_CURRENT(ctx, 0);
+         params[0] = FLOAT_TO_INT(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][0]);
+         params[1] = FLOAT_TO_INT(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][1]);
+         params[2] = FLOAT_TO_INT(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][2]);
+         params[3] = FLOAT_TO_INT(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3]);
+         break;
+      case GL_CURRENT_INDEX:
+	 FLUSH_CURRENT(ctx, 0);
+         *params = (GLint) ctx->Current.Index;
+         break;
+      case GL_CURRENT_NORMAL:
+	 FLUSH_CURRENT(ctx, 0);
+         params[0] = FLOAT_TO_INT(ctx->Current.Attrib[VERT_ATTRIB_NORMAL][0]);
+         params[1] = FLOAT_TO_INT(ctx->Current.Attrib[VERT_ATTRIB_NORMAL][1]);
+         params[2] = FLOAT_TO_INT(ctx->Current.Attrib[VERT_ATTRIB_NORMAL][2]);
+         break;
+      case GL_CURRENT_RASTER_COLOR:
+	 params[0] = FLOAT_TO_INT( ctx->Current.RasterColor[0] );
+	 params[1] = FLOAT_TO_INT( ctx->Current.RasterColor[1] );
+	 params[2] = FLOAT_TO_INT( ctx->Current.RasterColor[2] );
+	 params[3] = FLOAT_TO_INT( ctx->Current.RasterColor[3] );
+	 break;
+      case GL_CURRENT_RASTER_DISTANCE:
+	 params[0] = (GLint) ctx->Current.RasterDistance;
+	 break;
+      case GL_CURRENT_RASTER_INDEX:
+	 *params = (GLint) ctx->Current.RasterIndex;
+	 break;
+      case GL_CURRENT_RASTER_POSITION:
+	 params[0] = (GLint) ctx->Current.RasterPos[0];
+	 params[1] = (GLint) ctx->Current.RasterPos[1];
+	 params[2] = (GLint) ctx->Current.RasterPos[2];
+	 params[3] = (GLint) ctx->Current.RasterPos[3];
+	 break;
+      case GL_CURRENT_RASTER_TEXTURE_COORDS:
+	 params[0] = (GLint) ctx->Current.RasterTexCoords[texUnit][0];
+	 params[1] = (GLint) ctx->Current.RasterTexCoords[texUnit][1];
+	 params[2] = (GLint) ctx->Current.RasterTexCoords[texUnit][2];
+	 params[3] = (GLint) ctx->Current.RasterTexCoords[texUnit][3];
+	 break;
+      case GL_CURRENT_RASTER_POSITION_VALID:
+	 *params = (GLint) ctx->Current.RasterPosValid;
+	 break;
+      case GL_CURRENT_TEXTURE_COORDS:
+	 FLUSH_CURRENT(ctx, 0);
+         params[0] = (GLint) ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][0];
+         params[1] = (GLint) ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][1];
+         params[2] = (GLint) ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][2];
+         params[3] = (GLint) ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][3];
+	 break;
+      case GL_DEPTH_BIAS:
+         *params = (GLint) ctx->Pixel.DepthBias;
+	 break;
+      case GL_DEPTH_BITS:
+	 *params = ctx->Visual.depthBits;
+	 break;
+      case GL_DEPTH_CLEAR_VALUE:
+         *params = (GLint) ctx->Depth.Clear;
+	 break;
+      case GL_DEPTH_FUNC:
+         *params = (GLint) ctx->Depth.Func;
+	 break;
+      case GL_DEPTH_RANGE:
+         params[0] = (GLint) ctx->Viewport.Near;
+         params[1] = (GLint) ctx->Viewport.Far;
+	 break;
+      case GL_DEPTH_SCALE:
+         *params = (GLint) ctx->Pixel.DepthScale;
+	 break;
+      case GL_DEPTH_TEST:
+         *params = (GLint) ctx->Depth.Test;
+	 break;
+      case GL_DEPTH_WRITEMASK:
+	 *params = (GLint) ctx->Depth.Mask;
+	 break;
+      case GL_DITHER:
+	 *params = (GLint) ctx->Color.DitherFlag;
+	 break;
+      case GL_DOUBLEBUFFER:
+	 *params = (GLint) ctx->Visual.doubleBufferMode;
+	 break;
+      case GL_DRAW_BUFFER:
+	 *params = (GLint) ctx->Color.DrawBuffer;
+	 break;
+      case GL_EDGE_FLAG:
+	 FLUSH_CURRENT(ctx, 0);
+	 *params = (GLint) ctx->Current.EdgeFlag;
+	 break;
+      case GL_FEEDBACK_BUFFER_SIZE:
+         *params = ctx->Feedback.BufferSize;
+         break;
+      case GL_FEEDBACK_BUFFER_TYPE:
+         *params = ctx->Feedback.Type;
+         break;
+      case GL_FOG:
+	 *params = (GLint) ctx->Fog.Enabled;
+	 break;
+      case GL_FOG_COLOR:
+	 params[0] = FLOAT_TO_INT( ctx->Fog.Color[0] );
+	 params[1] = FLOAT_TO_INT( ctx->Fog.Color[1] );
+	 params[2] = FLOAT_TO_INT( ctx->Fog.Color[2] );
+	 params[3] = FLOAT_TO_INT( ctx->Fog.Color[3] );
+	 break;
+      case GL_FOG_DENSITY:
+	 *params = (GLint) ctx->Fog.Density;
+	 break;
+      case GL_FOG_END:
+	 *params = (GLint) ctx->Fog.End;
+	 break;
+      case GL_FOG_HINT:
+	 *params = (GLint) ctx->Hint.Fog;
+	 break;
+      case GL_FOG_INDEX:
+	 *params = (GLint) ctx->Fog.Index;
+	 break;
+      case GL_FOG_MODE:
+	 *params = (GLint) ctx->Fog.Mode;
+	 break;
+      case GL_FOG_START:
+	 *params = (GLint) ctx->Fog.Start;
+	 break;
+      case GL_FRONT_FACE:
+	 *params = (GLint) ctx->Polygon.FrontFace;
+	 break;
+      case GL_GREEN_BIAS:
+         *params = (GLint) ctx->Pixel.GreenBias;
+         break;
+      case GL_GREEN_BITS:
+         *params = (GLint) ctx->Visual.greenBits;
+         break;
+      case GL_GREEN_SCALE:
+         *params = (GLint) ctx->Pixel.GreenScale;
+         break;
+      case GL_INDEX_BITS:
+         *params = (GLint) ctx->Visual.indexBits;
+         break;
+      case GL_INDEX_CLEAR_VALUE:
+         *params = (GLint) ctx->Color.ClearIndex;
+         break;
+      case GL_INDEX_MODE:
+	 *params = ctx->Visual.rgbMode ? 0 : 1;
+	 break;
+      case GL_INDEX_OFFSET:
+	 *params = ctx->Pixel.IndexOffset;
+	 break;
+      case GL_INDEX_SHIFT:
+	 *params = ctx->Pixel.IndexShift;
+	 break;
+      case GL_INDEX_WRITEMASK:
+	 *params = (GLint) ctx->Color.IndexMask;
+	 break;
+      case GL_LIGHT0:
+      case GL_LIGHT1:
+      case GL_LIGHT2:
+      case GL_LIGHT3:
+      case GL_LIGHT4:
+      case GL_LIGHT5:
+      case GL_LIGHT6:
+      case GL_LIGHT7:
+	 *params = (GLint) ctx->Light.Light[pname-GL_LIGHT0].Enabled;
+	 break;
+      case GL_LIGHTING:
+	 *params = (GLint) ctx->Light.Enabled;
+	 break;
+      case GL_LIGHT_MODEL_AMBIENT:
+	 params[0] = FLOAT_TO_INT( ctx->Light.Model.Ambient[0] );
+	 params[1] = FLOAT_TO_INT( ctx->Light.Model.Ambient[1] );
+	 params[2] = FLOAT_TO_INT( ctx->Light.Model.Ambient[2] );
+	 params[3] = FLOAT_TO_INT( ctx->Light.Model.Ambient[3] );
+	 break;
+      case GL_LIGHT_MODEL_COLOR_CONTROL:
+         params[0] = (GLint) ctx->Light.Model.ColorControl;
+         break;
+      case GL_LIGHT_MODEL_LOCAL_VIEWER:
+	 *params = (GLint) ctx->Light.Model.LocalViewer;
+	 break;
+      case GL_LIGHT_MODEL_TWO_SIDE:
+	 *params = (GLint) ctx->Light.Model.TwoSide;
+	 break;
+      case GL_LINE_SMOOTH:
+	 *params = (GLint) ctx->Line.SmoothFlag;
+	 break;
+      case GL_LINE_SMOOTH_HINT:
+	 *params = (GLint) ctx->Hint.LineSmooth;
+	 break;
+      case GL_LINE_STIPPLE:
+	 *params = (GLint) ctx->Line.StippleFlag;
+	 break;
+      case GL_LINE_STIPPLE_PATTERN:
+         *params = (GLint) ctx->Line.StipplePattern;
+         break;
+      case GL_LINE_STIPPLE_REPEAT:
+         *params = (GLint) ctx->Line.StippleFactor;
+         break;
+      case GL_LINE_WIDTH:
+	 *params = (GLint) ctx->Line.Width;
+	 break;
+      case GL_LINE_WIDTH_GRANULARITY:
+	 *params = (GLint) ctx->Const.LineWidthGranularity;
+	 break;
+      case GL_LINE_WIDTH_RANGE:
+	 params[0] = (GLint) ctx->Const.MinLineWidthAA;
+	 params[1] = (GLint) ctx->Const.MaxLineWidthAA;
+	 break;
+      case GL_ALIASED_LINE_WIDTH_RANGE:
+	 params[0] = (GLint) ctx->Const.MinLineWidth;
+	 params[1] = (GLint) ctx->Const.MaxLineWidth;
+	 break;
+      case GL_LIST_BASE:
+	 *params = (GLint) ctx->List.ListBase;
+	 break;
+      case GL_LIST_INDEX:
+	 *params = (GLint) ctx->ListState.CurrentListNum;
+	 break;
+      case GL_LIST_MODE:
+         if (!ctx->CompileFlag)
+            *params = 0;
+         else if (ctx->ExecuteFlag)
+            *params = (GLint) GL_COMPILE_AND_EXECUTE;
+         else
+            *params = (GLint) GL_COMPILE;
+	 break;
+      case GL_INDEX_LOGIC_OP:
+	 *params = (GLint) ctx->Color.IndexLogicOpEnabled;
+	 break;
+      case GL_COLOR_LOGIC_OP:
+	 *params = (GLint) ctx->Color.ColorLogicOpEnabled;
+	 break;
+      case GL_LOGIC_OP_MODE:
+         *params = (GLint) ctx->Color.LogicOp;
+         break;
+      case GL_MAP1_COLOR_4:
+	 *params = (GLint) ctx->Eval.Map1Color4;
+	 break;
+      case GL_MAP1_GRID_DOMAIN:
+	 params[0] = (GLint) ctx->Eval.MapGrid1u1;
+	 params[1] = (GLint) ctx->Eval.MapGrid1u2;
+	 break;
+      case GL_MAP1_GRID_SEGMENTS:
+	 *params = (GLint) ctx->Eval.MapGrid1un;
+	 break;
+      case GL_MAP1_INDEX:
+	 *params = (GLint) ctx->Eval.Map1Index;
+	 break;
+      case GL_MAP1_NORMAL:
+	 *params = (GLint) ctx->Eval.Map1Normal;
+	 break;
+      case GL_MAP1_TEXTURE_COORD_1:
+	 *params = (GLint) ctx->Eval.Map1TextureCoord1;
+	 break;
+      case GL_MAP1_TEXTURE_COORD_2:
+	 *params = (GLint) ctx->Eval.Map1TextureCoord2;
+	 break;
+      case GL_MAP1_TEXTURE_COORD_3:
+	 *params = (GLint) ctx->Eval.Map1TextureCoord3;
+	 break;
+      case GL_MAP1_TEXTURE_COORD_4:
+	 *params = (GLint) ctx->Eval.Map1TextureCoord4;
+	 break;
+      case GL_MAP1_VERTEX_3:
+	 *params = (GLint) ctx->Eval.Map1Vertex3;
+	 break;
+      case GL_MAP1_VERTEX_4:
+	 *params = (GLint) ctx->Eval.Map1Vertex4;
+	 break;
+      case GL_MAP2_COLOR_4:
+	 *params = (GLint) ctx->Eval.Map2Color4;
+	 break;
+      case GL_MAP2_GRID_DOMAIN:
+	 params[0] = (GLint) ctx->Eval.MapGrid2u1;
+	 params[1] = (GLint) ctx->Eval.MapGrid2u2;
+	 params[2] = (GLint) ctx->Eval.MapGrid2v1;
+	 params[3] = (GLint) ctx->Eval.MapGrid2v2;
+	 break;
+      case GL_MAP2_GRID_SEGMENTS:
+	 params[0] = (GLint) ctx->Eval.MapGrid2un;
+	 params[1] = (GLint) ctx->Eval.MapGrid2vn;
+	 break;
+      case GL_MAP2_INDEX:
+	 *params = (GLint) ctx->Eval.Map2Index;
+	 break;
+      case GL_MAP2_NORMAL:
+	 *params = (GLint) ctx->Eval.Map2Normal;
+	 break;
+      case GL_MAP2_TEXTURE_COORD_1:
+	 *params = (GLint) ctx->Eval.Map2TextureCoord1;
+	 break;
+      case GL_MAP2_TEXTURE_COORD_2:
+	 *params = (GLint) ctx->Eval.Map2TextureCoord2;
+	 break;
+      case GL_MAP2_TEXTURE_COORD_3:
+	 *params = (GLint) ctx->Eval.Map2TextureCoord3;
+	 break;
+      case GL_MAP2_TEXTURE_COORD_4:
+	 *params = (GLint) ctx->Eval.Map2TextureCoord4;
+	 break;
+      case GL_MAP2_VERTEX_3:
+	 *params = (GLint) ctx->Eval.Map2Vertex3;
+	 break;
+      case GL_MAP2_VERTEX_4:
+	 *params = (GLint) ctx->Eval.Map2Vertex4;
+	 break;
+      case GL_MAP_COLOR:
+	 *params = (GLint) ctx->Pixel.MapColorFlag;
+	 break;
+      case GL_MAP_STENCIL:
+	 *params = (GLint) ctx->Pixel.MapStencilFlag;
+	 break;
+      case GL_MATRIX_MODE:
+	 *params = (GLint) ctx->Transform.MatrixMode;
+	 break;
+      case GL_MAX_ATTRIB_STACK_DEPTH:
+         *params = (GLint) MAX_ATTRIB_STACK_DEPTH;
+         break;
+      case GL_MAX_CLIENT_ATTRIB_STACK_DEPTH:
+         *params = (GLint) MAX_CLIENT_ATTRIB_STACK_DEPTH;
+         break;
+      case GL_MAX_CLIP_PLANES:
+         *params = (GLint) ctx->Const.MaxClipPlanes;
+         break;
+      case GL_MAX_ELEMENTS_VERTICES:  /* GL_VERSION_1_2 */
+         *params = (GLint) ctx->Const.MaxArrayLockSize;
+         break;
+      case GL_MAX_ELEMENTS_INDICES:   /* GL_VERSION_1_2 */
+         *params = (GLint) ctx->Const.MaxArrayLockSize;
+         break;
+      case GL_MAX_EVAL_ORDER:
+	 *params = (GLint) MAX_EVAL_ORDER;
+	 break;
+      case GL_MAX_LIGHTS:
+         *params = (GLint) ctx->Const.MaxLights;
+         break;
+      case GL_MAX_LIST_NESTING:
+         *params = (GLint) MAX_LIST_NESTING;
+         break;
+      case GL_MAX_MODELVIEW_STACK_DEPTH:
+         *params = (GLint) MAX_MODELVIEW_STACK_DEPTH;
+         break;
+      case GL_MAX_NAME_STACK_DEPTH:
+	 *params = (GLint) MAX_NAME_STACK_DEPTH;
+	 break;
+      case GL_MAX_PIXEL_MAP_TABLE:
+	 *params = (GLint) MAX_PIXEL_MAP_TABLE;
+	 break;
+      case GL_MAX_PROJECTION_STACK_DEPTH:
+         *params = (GLint) MAX_PROJECTION_STACK_DEPTH;
+         break;
+      case GL_MAX_TEXTURE_SIZE:
+         *params = (1 << (ctx->Const.MaxTextureLevels - 1));
+	 break;
+      case GL_MAX_3D_TEXTURE_SIZE:
+         *params = (1 << (ctx->Const.Max3DTextureLevels - 1));
+	 break;
+      case GL_MAX_TEXTURE_STACK_DEPTH:
+	 *params = (GLint) MAX_TEXTURE_STACK_DEPTH;
+	 break;
+      case GL_MAX_VIEWPORT_DIMS:
+         params[0] = (GLint) MAX_WIDTH;
+         params[1] = (GLint) MAX_HEIGHT;
+         break;
+      case GL_MODELVIEW_MATRIX:
+	 for (i=0;i<16;i++) {
+	    params[i] = (GLint) ctx->ModelviewMatrixStack.Top->m[i];
+	 }
+	 break;
+      case GL_MODELVIEW_STACK_DEPTH:
+	 *params = (GLint) (ctx->ModelviewMatrixStack.Depth + 1);
+	 break;
+      case GL_NAME_STACK_DEPTH:
+	 *params = (GLint) ctx->Select.NameStackDepth;
+	 break;
+      case GL_NORMALIZE:
+	 *params = (GLint) ctx->Transform.Normalize;
+	 break;
+      case GL_PACK_ALIGNMENT:
+	 *params = ctx->Pack.Alignment;
+	 break;
+      case GL_PACK_LSB_FIRST:
+	 *params = (GLint) ctx->Pack.LsbFirst;
+	 break;
+      case GL_PACK_ROW_LENGTH:
+	 *params = ctx->Pack.RowLength;
+	 break;
+      case GL_PACK_SKIP_PIXELS:
+	 *params = ctx->Pack.SkipPixels;
+	 break;
+      case GL_PACK_SKIP_ROWS:
+	 *params = ctx->Pack.SkipRows;
+	 break;
+      case GL_PACK_SWAP_BYTES:
+	 *params = (GLint) ctx->Pack.SwapBytes;
+	 break;
+      case GL_PACK_SKIP_IMAGES_EXT:
+         *params = ctx->Pack.SkipImages;
+         break;
+      case GL_PACK_IMAGE_HEIGHT_EXT:
+         *params = ctx->Pack.ImageHeight;
+         break;
+      case GL_PACK_INVERT_MESA:
+         *params = ctx->Pack.Invert;
+         break;
+      case GL_PERSPECTIVE_CORRECTION_HINT:
+	 *params = (GLint) ctx->Hint.PerspectiveCorrection;
+	 break;
+      case GL_PIXEL_MAP_A_TO_A_SIZE:
+	 *params = ctx->Pixel.MapAtoAsize;
+	 break;
+      case GL_PIXEL_MAP_B_TO_B_SIZE:
+	 *params = ctx->Pixel.MapBtoBsize;
+	 break;
+      case GL_PIXEL_MAP_G_TO_G_SIZE:
+	 *params = ctx->Pixel.MapGtoGsize;
+	 break;
+      case GL_PIXEL_MAP_I_TO_A_SIZE:
+	 *params = ctx->Pixel.MapItoAsize;
+	 break;
+      case GL_PIXEL_MAP_I_TO_B_SIZE:
+	 *params = ctx->Pixel.MapItoBsize;
+	 break;
+      case GL_PIXEL_MAP_I_TO_G_SIZE:
+	 *params = ctx->Pixel.MapItoGsize;
+	 break;
+      case GL_PIXEL_MAP_I_TO_I_SIZE:
+	 *params = ctx->Pixel.MapItoIsize;
+	 break;
+      case GL_PIXEL_MAP_I_TO_R_SIZE:
+	 *params = ctx->Pixel.MapItoRsize;
+	 break;
+      case GL_PIXEL_MAP_R_TO_R_SIZE:
+	 *params = ctx->Pixel.MapRtoRsize;
+	 break;
+      case GL_PIXEL_MAP_S_TO_S_SIZE:
+	 *params = ctx->Pixel.MapStoSsize;
+	 break;
+      case GL_POINT_SIZE:
+         *params = (GLint) ctx->Point.Size;
+         break;
+      case GL_POINT_SIZE_GRANULARITY:
+	 *params = (GLint) ctx->Const.PointSizeGranularity;
+	 break;
+      case GL_POINT_SIZE_RANGE:
+	 params[0] = (GLint) ctx->Const.MinPointSizeAA;
+	 params[1] = (GLint) ctx->Const.MaxPointSizeAA;
+	 break;
+      case GL_ALIASED_POINT_SIZE_RANGE:
+	 params[0] = (GLint) ctx->Const.MinPointSize;
+	 params[1] = (GLint) ctx->Const.MaxPointSize;
+	 break;
+      case GL_POINT_SMOOTH:
+	 *params = (GLint) ctx->Point.SmoothFlag;
+	 break;
+      case GL_POINT_SMOOTH_HINT:
+	 *params = (GLint) ctx->Hint.PointSmooth;
+	 break;
+      case GL_POINT_SIZE_MIN_EXT:
+	 *params = (GLint) (ctx->Point.MinSize);
+	 break;
+      case GL_POINT_SIZE_MAX_EXT:
+	 *params = (GLint) (ctx->Point.MaxSize);
+	 break;
+      case GL_POINT_FADE_THRESHOLD_SIZE_EXT:
+	 *params = (GLint) (ctx->Point.Threshold);
+	 break;
+      case GL_DISTANCE_ATTENUATION_EXT:
+	 params[0] = (GLint) (ctx->Point.Params[0]);
+	 params[1] = (GLint) (ctx->Point.Params[1]);
+	 params[2] = (GLint) (ctx->Point.Params[2]);
+	 break;
+      case GL_POLYGON_MODE:
+	 params[0] = (GLint) ctx->Polygon.FrontMode;
+	 params[1] = (GLint) ctx->Polygon.BackMode;
+	 break;
+      case GL_POLYGON_OFFSET_BIAS_EXT: /* GL_EXT_polygon_offset */
+         *params = (GLint) ctx->Polygon.OffsetUnits;
+         break;
+      case GL_POLYGON_OFFSET_FACTOR:
+         *params = (GLint) ctx->Polygon.OffsetFactor;
+         break;
+      case GL_POLYGON_OFFSET_UNITS:
+         *params = (GLint) ctx->Polygon.OffsetUnits;
+         break;
+      case GL_POLYGON_SMOOTH:
+	 *params = (GLint) ctx->Polygon.SmoothFlag;
+	 break;
+      case GL_POLYGON_SMOOTH_HINT:
+	 *params = (GLint) ctx->Hint.PolygonSmooth;
+	 break;
+      case GL_POLYGON_STIPPLE:
+         *params = (GLint) ctx->Polygon.StippleFlag;
+	 break;
+      case GL_PROJECTION_MATRIX:
+	 for (i=0;i<16;i++) {
+	    params[i] = (GLint) ctx->ProjectionMatrixStack.Top->m[i];
+	 }
+	 break;
+      case GL_PROJECTION_STACK_DEPTH:
+	 *params = (GLint) (ctx->ProjectionMatrixStack.Depth + 1);
+	 break;
+      case GL_READ_BUFFER:
+	 *params = (GLint) ctx->Pixel.ReadBuffer;
+	 break;
+      case GL_RED_BIAS:
+         *params = (GLint) ctx->Pixel.RedBias;
+         break;
+      case GL_RED_BITS:
+         *params = (GLint) ctx->Visual.redBits;
+         break;
+      case GL_RED_SCALE:
+         *params = (GLint) ctx->Pixel.RedScale;
+         break;
+      case GL_RENDER_MODE:
+	 *params = (GLint) ctx->RenderMode;
+	 break;
+      case GL_RESCALE_NORMAL:
+         *params = (GLint) ctx->Transform.RescaleNormals;
+         break;
+      case GL_RGBA_MODE:
+	 *params = (GLint) ctx->Visual.rgbMode;
+	 break;
+      case GL_SCISSOR_BOX:
+	 params[0] = (GLint) ctx->Scissor.X;
+	 params[1] = (GLint) ctx->Scissor.Y;
+	 params[2] = (GLint) ctx->Scissor.Width;
+	 params[3] = (GLint) ctx->Scissor.Height;
+	 break;
+      case GL_SCISSOR_TEST:
+	 *params = (GLint) ctx->Scissor.Enabled;
+	 break;
+      case GL_SELECTION_BUFFER_SIZE:
+         *params = (GLint) ctx->Select.BufferSize;
+         break;
+      case GL_SHADE_MODEL:
+	 *params = (GLint) ctx->Light.ShadeModel;
+	 break;
+      case GL_SHARED_TEXTURE_PALETTE_EXT:
+         *params = (GLint) ctx->Texture.SharedPalette;
+         break;
+      case GL_STENCIL_BITS:
+         *params = ctx->Visual.stencilBits;
+         break;
+      case GL_STENCIL_CLEAR_VALUE:
+	 *params = (GLint) ctx->Stencil.Clear;
+	 break;
+      case GL_STENCIL_FAIL:
+	 *params = (GLint) ctx->Stencil.FailFunc[ctx->Stencil.ActiveFace];
+	 break;
+      case GL_STENCIL_FUNC:
+	 *params = (GLint) ctx->Stencil.Function[ctx->Stencil.ActiveFace];
+	 break;
+      case GL_STENCIL_PASS_DEPTH_FAIL:
+	 *params = (GLint) ctx->Stencil.ZFailFunc[ctx->Stencil.ActiveFace];
+	 break;
+      case GL_STENCIL_PASS_DEPTH_PASS:
+	 *params = (GLint) ctx->Stencil.ZPassFunc[ctx->Stencil.ActiveFace];
+	 break;
+      case GL_STENCIL_REF:
+	 *params = (GLint) ctx->Stencil.Ref[ctx->Stencil.ActiveFace];
+	 break;
+      case GL_STENCIL_TEST:
+	 *params = (GLint) ctx->Stencil.Enabled;
+	 break;
+      case GL_STENCIL_VALUE_MASK:
+	 *params = (GLint) ctx->Stencil.ValueMask[ctx->Stencil.ActiveFace];
+	 break;
+      case GL_STENCIL_WRITEMASK:
+	 *params = (GLint) ctx->Stencil.WriteMask[ctx->Stencil.ActiveFace];
+	 break;
+      case GL_STEREO:
+	 *params = (GLint) ctx->Visual.stereoMode;
+	 break;
+      case GL_SUBPIXEL_BITS:
+	 *params = ctx->Const.SubPixelBits;
+	 break;
+      case GL_TEXTURE_1D:
+         *params = _mesa_IsEnabled(GL_TEXTURE_1D) ? 1 : 0;
+	 break;
+      case GL_TEXTURE_2D:
+         *params = _mesa_IsEnabled(GL_TEXTURE_2D) ? 1 : 0;
+	 break;
+      case GL_TEXTURE_3D:
+         *params = _mesa_IsEnabled(GL_TEXTURE_3D) ? 1 : 0;
+	 break;
+      case GL_TEXTURE_BINDING_1D:
+         *params = textureUnit->Current1D->Name;
+          break;
+      case GL_TEXTURE_BINDING_2D:
+         *params = textureUnit->Current2D->Name;
+          break;
+      case GL_TEXTURE_BINDING_3D:
+         *params = textureUnit->Current3D->Name;
+          break;
+      case GL_TEXTURE_ENV_COLOR:
+	 params[0] = FLOAT_TO_INT( textureUnit->EnvColor[0] );
+	 params[1] = FLOAT_TO_INT( textureUnit->EnvColor[1] );
+	 params[2] = FLOAT_TO_INT( textureUnit->EnvColor[2] );
+	 params[3] = FLOAT_TO_INT( textureUnit->EnvColor[3] );
+	 break;
+      case GL_TEXTURE_ENV_MODE:
+	 *params = (GLint) textureUnit->EnvMode;
+	 break;
+      case GL_TEXTURE_GEN_S:
+	 *params = (textureUnit->TexGenEnabled & S_BIT) ? 1 : 0;
+	 break;
+      case GL_TEXTURE_GEN_T:
+	 *params = (textureUnit->TexGenEnabled & T_BIT) ? 1 : 0;
+	 break;
+      case GL_TEXTURE_GEN_R:
+	 *params = (textureUnit->TexGenEnabled & R_BIT) ? 1 : 0;
+	 break;
+      case GL_TEXTURE_GEN_Q:
+	 *params = (textureUnit->TexGenEnabled & Q_BIT) ? 1 : 0;
+	 break;
+      case GL_TEXTURE_MATRIX:
+         for (i=0;i<16;i++) {
+	    params[i] = (GLint) ctx->TextureMatrixStack[texUnit].Top->m[i];
+	 }
+	 break;
+      case GL_TEXTURE_STACK_DEPTH:
+	 *params = (GLint) (ctx->TextureMatrixStack[texUnit].Depth + 1);
+	 break;
+      case GL_UNPACK_ALIGNMENT:
+	 *params = ctx->Unpack.Alignment;
+	 break;
+      case GL_UNPACK_LSB_FIRST:
+	 *params = (GLint) ctx->Unpack.LsbFirst;
+	 break;
+      case GL_UNPACK_ROW_LENGTH:
+	 *params = ctx->Unpack.RowLength;
+	 break;
+      case GL_UNPACK_SKIP_PIXELS:
+	 *params = ctx->Unpack.SkipPixels;
+	 break;
+      case GL_UNPACK_SKIP_ROWS:
+	 *params = ctx->Unpack.SkipRows;
+	 break;
+      case GL_UNPACK_SWAP_BYTES:
+	 *params = (GLint) ctx->Unpack.SwapBytes;
+	 break;
+      case GL_UNPACK_SKIP_IMAGES_EXT:
+         *params = ctx->Unpack.SkipImages;
+         break;
+      case GL_UNPACK_IMAGE_HEIGHT_EXT:
+         *params = ctx->Unpack.ImageHeight;
+         break;
+      case GL_UNPACK_CLIENT_STORAGE_APPLE:
+         *params = ctx->Unpack.ClientStorage;
+         break;
+      case GL_VIEWPORT:
+         params[0] = (GLint) ctx->Viewport.X;
+         params[1] = (GLint) ctx->Viewport.Y;
+         params[2] = (GLint) ctx->Viewport.Width;
+         params[3] = (GLint) ctx->Viewport.Height;
+         break;
+      case GL_ZOOM_X:
+	 *params = (GLint) ctx->Pixel.ZoomX;
+	 break;
+      case GL_ZOOM_Y:
+	 *params = (GLint) ctx->Pixel.ZoomY;
+	 break;
+      case GL_VERTEX_ARRAY:
+         *params = (GLint) ctx->Array.Vertex.Enabled;
+         break;
+      case GL_VERTEX_ARRAY_SIZE:
+         *params = ctx->Array.Vertex.Size;
+         break;
+      case GL_VERTEX_ARRAY_TYPE:
+         *params = ctx->Array.Vertex.Type;
+         break;
+      case GL_VERTEX_ARRAY_STRIDE:
+         *params = ctx->Array.Vertex.Stride;
+         break;
+      case GL_VERTEX_ARRAY_COUNT_EXT:
+         *params = 0;
+         break;
+      case GL_NORMAL_ARRAY:
+         *params = (GLint) ctx->Array.Normal.Enabled;
+         break;
+      case GL_NORMAL_ARRAY_TYPE:
+         *params = ctx->Array.Normal.Type;
+         break;
+      case GL_NORMAL_ARRAY_STRIDE:
+         *params = ctx->Array.Normal.Stride;
+         break;
+      case GL_NORMAL_ARRAY_COUNT_EXT:
+         *params = 0;
+         break;
+      case GL_COLOR_ARRAY:
+         *params = (GLint) ctx->Array.Color.Enabled;
+         break;
+      case GL_COLOR_ARRAY_SIZE:
+         *params = ctx->Array.Color.Size;
+         break;
+      case GL_COLOR_ARRAY_TYPE:
+         *params = ctx->Array.Color.Type;
+         break;
+      case GL_COLOR_ARRAY_STRIDE:
+         *params = ctx->Array.Color.Stride;
+         break;
+      case GL_COLOR_ARRAY_COUNT_EXT:
+         *params = 0;
+         break;
+      case GL_INDEX_ARRAY:
+         *params = (GLint) ctx->Array.Index.Enabled;
+         break;
+      case GL_INDEX_ARRAY_TYPE:
+         *params = ctx->Array.Index.Type;
+         break;
+      case GL_INDEX_ARRAY_STRIDE:
+         *params = ctx->Array.Index.Stride;
+         break;
+      case GL_INDEX_ARRAY_COUNT_EXT:
+         *params = 0;
+         break;
+      case GL_TEXTURE_COORD_ARRAY:
+         *params = (GLint) ctx->Array.TexCoord[clientUnit].Enabled;
+         break;
+      case GL_TEXTURE_COORD_ARRAY_SIZE:
+         *params = ctx->Array.TexCoord[clientUnit].Size;
+         break;
+      case GL_TEXTURE_COORD_ARRAY_TYPE:
+         *params = ctx->Array.TexCoord[clientUnit].Type;
+         break;
+      case GL_TEXTURE_COORD_ARRAY_STRIDE:
+         *params = ctx->Array.TexCoord[clientUnit].Stride;
+         break;
+      case GL_TEXTURE_COORD_ARRAY_COUNT_EXT:
+         *params = 0;
+         break;
+      case GL_EDGE_FLAG_ARRAY:
+         *params = (GLint) ctx->Array.EdgeFlag.Enabled;
+         break;
+      case GL_EDGE_FLAG_ARRAY_STRIDE:
+         *params = ctx->Array.EdgeFlag.Stride;
+         break;
+      case GL_EDGE_FLAG_ARRAY_COUNT_EXT:
+         *params = 0;
+         break;
+
+      /* GL_ARB_multitexture */
+      case GL_MAX_TEXTURE_UNITS_ARB:
+         CHECK_EXTENSION_I(ARB_multitexture, pname);
+         *params = MIN2(ctx->Const.MaxTextureImageUnits,
+                        ctx->Const.MaxTextureCoordUnits);
+         break;
+      case GL_ACTIVE_TEXTURE_ARB:
+         CHECK_EXTENSION_I(ARB_multitexture, pname);
+         *params = GL_TEXTURE0_ARB + ctx->Texture.CurrentUnit;
+         break;
+      case GL_CLIENT_ACTIVE_TEXTURE_ARB:
+         CHECK_EXTENSION_I(ARB_multitexture, pname);
+         *params = GL_TEXTURE0_ARB + clientUnit;
+         break;
+
+      /* GL_ARB_texture_cube_map */
+      case GL_TEXTURE_CUBE_MAP_ARB:
+         CHECK_EXTENSION_I(ARB_texture_cube_map, pname);
+         *params = (GLint) _mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB);
+         break;
+      case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
+         CHECK_EXTENSION_I(ARB_texture_cube_map, pname);
+         *params = textureUnit->CurrentCubeMap->Name;
+         break;
+      case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
+         CHECK_EXTENSION_I(ARB_texture_cube_map, pname);
+         *params = (1 << (ctx->Const.MaxCubeTextureLevels - 1));
+         break;
+
+      /* GL_ARB_texture_compression */
+      case GL_TEXTURE_COMPRESSION_HINT_ARB:
+         CHECK_EXTENSION_I(ARB_texture_compression, pname);
+         *params = (GLint) ctx->Hint.TextureCompression;
+         break;
+      case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:
+         CHECK_EXTENSION_I(ARB_texture_compression, pname);
+         *params = (GLint) _mesa_get_compressed_formats(ctx, NULL);
+         break;
+      case GL_COMPRESSED_TEXTURE_FORMATS_ARB:
+         CHECK_EXTENSION_I(ARB_texture_compression, pname);
+         (void) _mesa_get_compressed_formats(ctx, params);
+         break;
+
+      /* GL_EXT_compiled_vertex_array */
+      case GL_ARRAY_ELEMENT_LOCK_FIRST_EXT:
+         CHECK_EXTENSION_I(EXT_compiled_vertex_array, pname);
+	 *params = ctx->Array.LockFirst;
+	 break;
+      case GL_ARRAY_ELEMENT_LOCK_COUNT_EXT:
+         CHECK_EXTENSION_I(EXT_compiled_vertex_array, pname);
+	 *params = ctx->Array.LockCount;
+	 break;
+
+      /* GL_ARB_transpose_matrix */
+      case GL_TRANSPOSE_COLOR_MATRIX_ARB:
+         {
+            GLfloat tm[16];
+            GLuint i;
+            _math_transposef(tm, ctx->ColorMatrixStack.Top->m);
+            for (i=0;i<16;i++) {
+               params[i] = (GLint) tm[i];
+            }
+         }
+         break;
+      case GL_TRANSPOSE_MODELVIEW_MATRIX_ARB:
+         {
+            GLfloat tm[16];
+            GLuint i;
+            _math_transposef(tm, ctx->ModelviewMatrixStack.Top->m);
+            for (i=0;i<16;i++) {
+               params[i] = (GLint) tm[i];
+            }
+         }
+         break;
+      case GL_TRANSPOSE_PROJECTION_MATRIX_ARB:
+         {
+            GLfloat tm[16];
+            GLuint i;
+            _math_transposef(tm, ctx->ProjectionMatrixStack.Top->m);
+            for (i=0;i<16;i++) {
+               params[i] = (GLint) tm[i];
+            }
+         }
+         break;
+      case GL_TRANSPOSE_TEXTURE_MATRIX_ARB:
+         {
+            GLfloat tm[16];
+            GLuint i;
+            _math_transposef(tm, ctx->TextureMatrixStack[texUnit].Top->m);
+            for (i=0;i<16;i++) {
+               params[i] = (GLint) tm[i];
+            }
+         }
+         break;
+
+      /* GL_HP_occlusion_test */
+      case GL_OCCLUSION_TEST_HP:
+         CHECK_EXTENSION_I(HP_occlusion_test, pname);
+         *params = (GLint) ctx->Depth.OcclusionTest;
+         break;
+      case GL_OCCLUSION_TEST_RESULT_HP:
+         CHECK_EXTENSION_I(HP_occlusion_test, pname);
+         if (ctx->Depth.OcclusionTest)
+            *params = (GLint) ctx->OcclusionResult;
+         else
+            *params = (GLint) ctx->OcclusionResultSaved;
+         /* reset flag now */
+         ctx->OcclusionResult = GL_FALSE;
+         ctx->OcclusionResultSaved = GL_FALSE;
+         break;
+
+      /* GL_SGIS_pixel_texture */
+      case GL_PIXEL_TEXTURE_SGIS:
+         CHECK_EXTENSION_I(SGIS_pixel_texture, pname);
+         *params = (GLint) ctx->Pixel.PixelTextureEnabled;
+         break;
+
+      /* GL_SGIX_pixel_texture */
+      case GL_PIXEL_TEX_GEN_SGIX:
+         CHECK_EXTENSION_I(SGIX_pixel_texture, pname);
+         *params = (GLint) ctx->Pixel.PixelTextureEnabled;
+         break;
+      case GL_PIXEL_TEX_GEN_MODE_SGIX:
+         CHECK_EXTENSION_I(SGIX_pixel_texture, pname);
+         *params = (GLint) pixel_texgen_mode(ctx);
+         break;
+
+      /* GL_SGI_color_matrix (also in 1.2 imaging) */
+      case GL_COLOR_MATRIX_SGI:
+         CHECK_EXTENSION_I(SGI_color_matrix, pname);
+         for (i=0;i<16;i++) {
+	    params[i] = (GLint) ctx->ColorMatrixStack.Top->m[i];
+	 }
+	 break;
+      case GL_COLOR_MATRIX_STACK_DEPTH_SGI:
+         CHECK_EXTENSION_I(SGI_color_matrix, pname);
+         *params = ctx->ColorMatrixStack.Depth + 1;
+         break;
+      case GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI:
+         CHECK_EXTENSION_I(SGI_color_matrix, pname);
+         *params = MAX_COLOR_STACK_DEPTH;
+         break;
+      case GL_POST_COLOR_MATRIX_RED_SCALE_SGI:
+         CHECK_EXTENSION_I(SGI_color_matrix, pname);
+         *params = (GLint) ctx->Pixel.PostColorMatrixScale[0];
+         break;
+      case GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI:
+         CHECK_EXTENSION_I(SGI_color_matrix, pname);
+         *params = (GLint) ctx->Pixel.PostColorMatrixScale[1];
+         break;
+      case GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI:
+         CHECK_EXTENSION_I(SGI_color_matrix, pname);
+         *params = (GLint) ctx->Pixel.PostColorMatrixScale[2];
+         break;
+      case GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI:
+         CHECK_EXTENSION_I(SGI_color_matrix, pname);
+         *params = (GLint) ctx->Pixel.PostColorMatrixScale[3];
+         break;
+      case GL_POST_COLOR_MATRIX_RED_BIAS_SGI:
+         CHECK_EXTENSION_I(SGI_color_matrix, pname);
+         *params = (GLint) ctx->Pixel.PostColorMatrixBias[0];
+         break;
+      case GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI:
+         CHECK_EXTENSION_I(SGI_color_matrix, pname);
+         *params = (GLint) ctx->Pixel.PostColorMatrixBias[1];
+         break;
+      case GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI:
+         CHECK_EXTENSION_I(SGI_color_matrix, pname);
+         *params = (GLint) ctx->Pixel.PostColorMatrixBias[2];
+         break;
+      case GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI:
+         CHECK_EXTENSION_I(SGI_color_matrix, pname);
+         *params = (GLint) ctx->Pixel.PostColorMatrixBias[3];
+         break;
+
+      /* GL_EXT_convolution (also in 1.2 imaging) */
+      case GL_CONVOLUTION_1D_EXT:
+         CHECK_EXTENSION_I(EXT_convolution, pname);
+         *params = (GLint) ctx->Pixel.Convolution1DEnabled;
+         break;
+      case GL_CONVOLUTION_2D:
+         CHECK_EXTENSION_I(EXT_convolution, pname);
+         *params = (GLint) ctx->Pixel.Convolution2DEnabled;
+         break;
+      case GL_SEPARABLE_2D:
+         CHECK_EXTENSION_I(EXT_convolution, pname);
+         *params = (GLint) ctx->Pixel.Separable2DEnabled;
+         break;
+      case GL_POST_CONVOLUTION_RED_SCALE_EXT:
+         CHECK_EXTENSION_I(EXT_convolution, pname);
+         *params = (GLint) ctx->Pixel.PostConvolutionScale[0];
+         break;
+      case GL_POST_CONVOLUTION_GREEN_SCALE_EXT:
+         CHECK_EXTENSION_I(EXT_convolution, pname);
+         *params = (GLint) ctx->Pixel.PostConvolutionScale[1];
+         break;
+      case GL_POST_CONVOLUTION_BLUE_SCALE_EXT:
+         CHECK_EXTENSION_I(EXT_convolution, pname);
+         *params = (GLint) ctx->Pixel.PostConvolutionScale[2];
+         break;
+      case GL_POST_CONVOLUTION_ALPHA_SCALE_EXT:
+         CHECK_EXTENSION_I(EXT_convolution, pname);
+         *params = (GLint) ctx->Pixel.PostConvolutionScale[3];
+         break;
+      case GL_POST_CONVOLUTION_RED_BIAS_EXT:
+         CHECK_EXTENSION_I(EXT_convolution, pname);
+         *params = (GLint) ctx->Pixel.PostConvolutionBias[0];
+         break;
+      case GL_POST_CONVOLUTION_GREEN_BIAS_EXT:
+         CHECK_EXTENSION_I(EXT_convolution, pname);
+         *params = (GLint) ctx->Pixel.PostConvolutionBias[1];
+         break;
+      case GL_POST_CONVOLUTION_BLUE_BIAS_EXT:
+         CHECK_EXTENSION_I(EXT_convolution, pname);
+         *params = (GLint) ctx->Pixel.PostConvolutionBias[2];
+         break;
+      case GL_POST_CONVOLUTION_ALPHA_BIAS_EXT:
+         CHECK_EXTENSION_I(EXT_convolution, pname);
+         *params = (GLint) ctx->Pixel.PostConvolutionBias[2];
+         break;
+
+      /* GL_EXT_histogram (also in 1.2 imaging) */
+      case GL_HISTOGRAM:
+         CHECK_EXTENSION_I(EXT_histogram, pname);
+         *params = (GLint) ctx->Pixel.HistogramEnabled;
+	 break;
+      case GL_MINMAX:
+         CHECK_EXTENSION_I(EXT_histogram, pname);
+         *params = (GLint) ctx->Pixel.MinMaxEnabled;
+         break;
+
+      /* GL_SGI_color_table (also in 1.2 imaging */
+      case GL_COLOR_TABLE_SGI:
+         CHECK_EXTENSION_I(SGI_color_table, pname);
+         *params = (GLint) ctx->Pixel.ColorTableEnabled;
+         break;
+      case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
+         CHECK_EXTENSION_I(SGI_color_table, pname);
+         *params = (GLint) ctx->Pixel.PostConvolutionColorTableEnabled;
+         break;
+      case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
+         CHECK_EXTENSION_I(SGI_color_table, pname);
+         *params = (GLint) ctx->Pixel.PostColorMatrixColorTableEnabled;
+         break;
+
+      /* GL_SGI_texture_color_table */
+      case GL_TEXTURE_COLOR_TABLE_SGI:
+         CHECK_EXTENSION_I(SGI_texture_color_table, pname);
+         *params = (GLint) textureUnit->ColorTableEnabled;
+         break;
+
+      /* GL_EXT_secondary_color */
+      case GL_COLOR_SUM_EXT:
+         CHECK_EXTENSION_I(EXT_secondary_color, pname);
+	 *params = (GLint) ctx->Fog.ColorSumEnabled;
+	 break;
+      case GL_CURRENT_SECONDARY_COLOR_EXT:
+         CHECK_EXTENSION_I(EXT_secondary_color, pname);
+	 FLUSH_CURRENT(ctx, 0);
+         params[0] = FLOAT_TO_INT( (ctx->Current.Attrib[VERT_ATTRIB_COLOR1][0]) );
+         params[1] = FLOAT_TO_INT( (ctx->Current.Attrib[VERT_ATTRIB_COLOR1][1]) );
+         params[2] = FLOAT_TO_INT( (ctx->Current.Attrib[VERT_ATTRIB_COLOR1][2]) );
+         params[3] = FLOAT_TO_INT( (ctx->Current.Attrib[VERT_ATTRIB_COLOR1][3]) );
+	 break;
+      case GL_SECONDARY_COLOR_ARRAY_EXT:
+         CHECK_EXTENSION_I(EXT_secondary_color, pname);
+         *params = (GLint) ctx->Array.SecondaryColor.Enabled;
+         break;
+      case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
+         CHECK_EXTENSION_I(EXT_secondary_color, pname);
+	 *params = (GLint) ctx->Array.SecondaryColor.Type;
+	 break;
+      case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
+         CHECK_EXTENSION_I(EXT_secondary_color, pname);
+	 *params = (GLint) ctx->Array.SecondaryColor.Stride;
+	 break;
+      case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
+         CHECK_EXTENSION_I(EXT_secondary_color, pname);
+	 *params = (GLint) ctx->Array.SecondaryColor.Size;
+	 break;
+
+      /* GL_EXT_fog_coord */
+      case GL_CURRENT_FOG_COORDINATE_EXT:
+         CHECK_EXTENSION_I(EXT_fog_coord, pname);
+         FLUSH_CURRENT(ctx, 0);
+         *params = (GLint) ctx->Current.Attrib[VERT_ATTRIB_FOG][0];
+	 break;
+      case GL_FOG_COORDINATE_ARRAY_EXT:
+         CHECK_EXTENSION_I(EXT_fog_coord, pname);
+         *params = (GLint) ctx->Array.FogCoord.Enabled;
+         break;
+      case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
+         CHECK_EXTENSION_I(EXT_fog_coord, pname);
+         *params = (GLint) ctx->Array.FogCoord.Type;
+	 break;
+      case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
+         CHECK_EXTENSION_I(EXT_fog_coord, pname);
+         *params = (GLint) ctx->Array.FogCoord.Stride;
+	 break;
+      case GL_FOG_COORDINATE_SOURCE_EXT:
+         CHECK_EXTENSION_I(EXT_fog_coord, pname);
+	 *params = (GLint) ctx->Fog.FogCoordinateSource;
+	 break;
+
+      /* GL_EXT_texture_lod_bias */
+      case GL_MAX_TEXTURE_LOD_BIAS_EXT:
+         *params = (GLint) ctx->Const.MaxTextureLodBias;
+         break;
+
+      /* GL_EXT_texture_filter_anisotropic */
+      case GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT:
+         CHECK_EXTENSION_I(EXT_texture_filter_anisotropic, pname);
+         *params = (GLint) ctx->Const.MaxTextureMaxAnisotropy;
+	 break;
+
+      /* GL_ARB_multisample */
+      case GL_MULTISAMPLE_ARB:
+         CHECK_EXTENSION_I(ARB_multisample, pname);
+         *params = (GLint) ctx->Multisample.Enabled;
+         break;
+      case GL_SAMPLE_ALPHA_TO_COVERAGE_ARB:
+         CHECK_EXTENSION_I(ARB_multisample, pname);
+         *params = (GLint) ctx->Multisample.SampleAlphaToCoverage;
+         break;
+      case GL_SAMPLE_ALPHA_TO_ONE_ARB:
+         CHECK_EXTENSION_I(ARB_multisample, pname);
+         *params = (GLint) ctx->Multisample.SampleAlphaToOne;
+         break;
+      case GL_SAMPLE_COVERAGE_ARB:
+         CHECK_EXTENSION_I(ARB_multisample, pname);
+         *params = (GLint) ctx->Multisample.SampleCoverage;
+         break;
+      case GL_SAMPLE_COVERAGE_VALUE_ARB:
+         CHECK_EXTENSION_I(ARB_multisample, pname);
+         *params = (GLint) ctx->Multisample.SampleCoverageValue;
+         break;
+      case GL_SAMPLE_COVERAGE_INVERT_ARB:
+         CHECK_EXTENSION_I(ARB_multisample, pname);
+         *params = (GLint) ctx->Multisample.SampleCoverageInvert;
+         break;
+      case GL_SAMPLE_BUFFERS_ARB:
+         CHECK_EXTENSION_I(ARB_multisample, pname);
+         *params = 0; /* XXX fix someday */
+         break;
+      case GL_SAMPLES_ARB:
+         CHECK_EXTENSION_I(ARB_multisample, pname);
+         *params = 0; /* XXX fix someday */
+         break;
+
+      /* GL_IBM_rasterpos_clip */
+      case GL_RASTER_POSITION_UNCLIPPED_IBM:
+         CHECK_EXTENSION_I(IBM_rasterpos_clip, pname);
+         *params = (GLint) ctx->Transform.RasterPositionUnclipped;
+         break;
+
+      /* GL_NV_point_sprite */
+      case GL_POINT_SPRITE_NV:
+         CHECK_EXTENSION2_I(NV_point_sprite, ARB_point_sprite, pname);
+         *params = (GLint) ctx->Point.PointSprite;
+         break;
+      case GL_POINT_SPRITE_R_MODE_NV:
+         CHECK_EXTENSION_I(NV_point_sprite, pname);
+         *params = (GLint) ctx->Point.SpriteRMode;
+         break;
+
+      /* GL_SGIS_generate_mipmap */
+      case GL_GENERATE_MIPMAP_HINT_SGIS:
+         CHECK_EXTENSION_I(SGIS_generate_mipmap, pname);
+         *params = (GLint) ctx->Hint.GenerateMipmap;
+         break;
+
+#if FEATURE_NV_vertex_program
+      case GL_VERTEX_PROGRAM_NV:
+         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         *params = (GLint) ctx->VertexProgram.Enabled;
+         break;
+      case GL_VERTEX_PROGRAM_POINT_SIZE_NV:
+         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         *params = (GLint) ctx->VertexProgram.PointSizeEnabled;
+         break;
+      case GL_VERTEX_PROGRAM_TWO_SIDE_NV:
+         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         *params = (GLint) ctx->VertexProgram.TwoSideEnabled;
+         break;
+      case GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV:
+         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         *params = ctx->Const.MaxProgramMatrixStackDepth;
+         break;
+      case GL_MAX_TRACK_MATRICES_NV:
+         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         *params = ctx->Const.MaxProgramMatrices;
+         break;
+      case GL_CURRENT_MATRIX_STACK_DEPTH_NV:
+         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         *params = ctx->CurrentStack->Depth + 1;
+         break;
+      case GL_CURRENT_MATRIX_NV:
+         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         for (i = 0; i < 16; i++)
+            params[i] = (GLint) ctx->CurrentStack->Top->m[i];
+         break;
+      case GL_VERTEX_PROGRAM_BINDING_NV:
+         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         if (ctx->VertexProgram.Current)
+            *params = (GLint) ctx->VertexProgram.Current->Base.Id;
+         else
+            *params = 0;
+         break;
+      case GL_PROGRAM_ERROR_POSITION_NV:
+         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         *params = (GLint) ctx->Program.ErrorPos;
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY0_NV:
+      case GL_VERTEX_ATTRIB_ARRAY1_NV:
+      case GL_VERTEX_ATTRIB_ARRAY2_NV:
+      case GL_VERTEX_ATTRIB_ARRAY3_NV:
+      case GL_VERTEX_ATTRIB_ARRAY4_NV:
+      case GL_VERTEX_ATTRIB_ARRAY5_NV:
+      case GL_VERTEX_ATTRIB_ARRAY6_NV:
+      case GL_VERTEX_ATTRIB_ARRAY7_NV:
+      case GL_VERTEX_ATTRIB_ARRAY8_NV:
+      case GL_VERTEX_ATTRIB_ARRAY9_NV:
+      case GL_VERTEX_ATTRIB_ARRAY10_NV:
+      case GL_VERTEX_ATTRIB_ARRAY11_NV:
+      case GL_VERTEX_ATTRIB_ARRAY12_NV:
+      case GL_VERTEX_ATTRIB_ARRAY13_NV:
+      case GL_VERTEX_ATTRIB_ARRAY14_NV:
+      case GL_VERTEX_ATTRIB_ARRAY15_NV:
+         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         {
+            GLuint n = (GLuint) pname - GL_VERTEX_ATTRIB_ARRAY0_NV;
+            *params = (GLint) ctx->Array.VertexAttrib[n].Enabled;
+         }
+         break;
+      case GL_MAP1_VERTEX_ATTRIB0_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB1_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB2_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB3_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB4_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB5_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB6_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB7_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB8_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB9_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB10_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB11_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB12_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB13_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB14_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB15_4_NV:
+         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         {
+            GLuint n = (GLuint) pname - GL_MAP1_VERTEX_ATTRIB0_4_NV;
+            *params = (GLint) ctx->Eval.Map1Attrib[n];
+         }
+         break;
+      case GL_MAP2_VERTEX_ATTRIB0_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB1_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB2_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB3_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB4_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB5_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB6_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB7_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB8_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB9_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB10_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB11_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB12_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB13_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB14_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB15_4_NV:
+         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         {
+            GLuint n = (GLuint) pname - GL_MAP2_VERTEX_ATTRIB0_4_NV;
+            *params = (GLint) ctx->Eval.Map2Attrib[n];
+         }
+         break;
+#endif /* FEATURE_NV_vertex_program */
+
+#if FEATURE_NV_fragment_program
+      case GL_FRAGMENT_PROGRAM_NV:
+         CHECK_EXTENSION_I(NV_fragment_program, pname);
+         *params = (GLint) ctx->FragmentProgram.Enabled;
+         break;
+      case GL_MAX_TEXTURE_COORDS_NV:
+         CHECK_EXTENSION_I(NV_fragment_program, pname);
+         *params = (GLint) ctx->Const.MaxTextureCoordUnits;
+         break;
+      case GL_MAX_TEXTURE_IMAGE_UNITS_NV:
+         CHECK_EXTENSION_I(NV_fragment_program, pname);
+         *params = (GLint) ctx->Const.MaxTextureImageUnits;
+         break;
+      case GL_FRAGMENT_PROGRAM_BINDING_NV:
+         CHECK_EXTENSION_I(NV_fragment_program, pname);
+         if (ctx->FragmentProgram.Current)
+            *params = (GLint) ctx->FragmentProgram.Current->Base.Id;
+         else
+            *params = 0;
+         break;
+      case GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV:
+         CHECK_EXTENSION_I(NV_fragment_program, pname);
+         *params = MAX_NV_FRAGMENT_PROGRAM_PARAMS;
+         break;
+#endif /* FEATURE_NV_fragment_program */
+
+      /* GL_NV_texture_rectangle */
+      case GL_TEXTURE_RECTANGLE_NV:
+         CHECK_EXTENSION_I(NV_texture_rectangle, pname);
+         *params = (GLint) _mesa_IsEnabled(GL_TEXTURE_RECTANGLE_NV);
+         break;
+      case GL_TEXTURE_BINDING_RECTANGLE_NV:
+         CHECK_EXTENSION_I(NV_texture_rectangle, pname);
+         *params = (GLint) textureUnit->CurrentRect->Name;
+         break;
+      case GL_MAX_RECTANGLE_TEXTURE_SIZE_NV:
+         CHECK_EXTENSION_I(NV_texture_rectangle, pname);
+         *params = (GLint) ctx->Const.MaxTextureRectSize;
+         break;
+
+      /* GL_EXT_stencil_two_side */
+      case GL_STENCIL_TEST_TWO_SIDE_EXT:
+         CHECK_EXTENSION_I(EXT_stencil_two_side, pname);
+         *params = (GLint) ctx->Stencil.TestTwoSide;
+         break;
+      case GL_ACTIVE_STENCIL_FACE_EXT:
+         CHECK_EXTENSION_I(EXT_stencil_two_side, pname);
+         *params = (GLint) (ctx->Stencil.ActiveFace ? GL_BACK : GL_FRONT);
+         break;
+
+      /* GL_NV_light_max_exponent */
+      case GL_MAX_SHININESS_NV:
+         *params = (GLint) ctx->Const.MaxShininess;
+         break;
+      case GL_MAX_SPOT_EXPONENT_NV:
+         *params = (GLint) ctx->Const.MaxSpotExponent;
+         break;
+
+#if FEATURE_ARB_vertex_buffer_object
+      case GL_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_I(ARB_vertex_buffer_object, pname);
+         *params = (GLint) ctx->Array.ArrayBufferObj->Name;
+         break;
+      case GL_VERTEX_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_I(ARB_vertex_buffer_object, pname);
+         *params = (GLint) ctx->Array.Vertex.BufferObj->Name;
+         break;
+      case GL_NORMAL_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_I(ARB_vertex_buffer_object, pname);
+         *params = (GLint) ctx->Array.Normal.BufferObj->Name;
+         break;
+      case GL_COLOR_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_I(ARB_vertex_buffer_object, pname);
+         *params = (GLint) ctx->Array.Color.BufferObj->Name;
+         break;
+      case GL_INDEX_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_I(ARB_vertex_buffer_object, pname);
+         *params = (GLint) ctx->Array.Index.BufferObj->Name;
+         break;
+      case GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_I(ARB_vertex_buffer_object, pname);
+         *params = (GLint) ctx->Array.TexCoord[clientUnit].BufferObj->Name;
+         break;
+      case GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_I(ARB_vertex_buffer_object, pname);
+         *params = (GLint) ctx->Array.EdgeFlag.BufferObj->Name;
+         break;
+      case GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_I(ARB_vertex_buffer_object, pname);
+         *params = (GLint) ctx->Array.SecondaryColor.BufferObj->Name;
+         break;
+      case GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_I(ARB_vertex_buffer_object, pname);
+         *params = (GLint) ctx->Array.FogCoord.BufferObj->Name;
+         break;
+      /*case GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB: - not supported */
+      case GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB:
+         CHECK_EXTENSION_I(ARB_vertex_buffer_object, pname);
+         *params = (GLint) ctx->Array.ElementArrayBufferObj->Name;
+         break;
+#endif
+
+#if FEATURE_ARB_fragment_program
+      case GL_FRAGMENT_PROGRAM_ARB:
+         CHECK_EXTENSION_I(ARB_fragment_program, pname);
+         *params = ctx->FragmentProgram.Enabled;
+         break;
+      case GL_TRANSPOSE_CURRENT_MATRIX_ARB:
+         CHECK_EXTENSION_I(ARB_fragment_program, pname);
+         params[0] = (GLint) ctx->CurrentStack->Top->m[0];
+         params[1] = (GLint) ctx->CurrentStack->Top->m[4];
+         params[2] = (GLint) ctx->CurrentStack->Top->m[8];
+         params[3] = (GLint) ctx->CurrentStack->Top->m[12];
+         params[4] = (GLint) ctx->CurrentStack->Top->m[1];
+         params[5] = (GLint) ctx->CurrentStack->Top->m[5];
+         params[6] = (GLint) ctx->CurrentStack->Top->m[9];
+         params[7] = (GLint) ctx->CurrentStack->Top->m[13];
+         params[8] = (GLint) ctx->CurrentStack->Top->m[2];
+         params[9] = (GLint) ctx->CurrentStack->Top->m[6];
+         params[10] = (GLint) ctx->CurrentStack->Top->m[10];
+         params[11] = (GLint) ctx->CurrentStack->Top->m[14];
+         params[12] = (GLint) ctx->CurrentStack->Top->m[3];
+         params[13] = (GLint) ctx->CurrentStack->Top->m[7];
+         params[14] = (GLint) ctx->CurrentStack->Top->m[11];
+         params[15] = (GLint) ctx->CurrentStack->Top->m[15];
+         break;
+      /* Remaining ARB_fragment_program queries alias with
+       * the GL_NV_fragment_program queries.
+       */
+#endif
+
+      /* GL_EXT_depth_bounds_test */
+      case GL_DEPTH_BOUNDS_TEST_EXT:
+         CHECK_EXTENSION_I(EXT_depth_bounds_test, pname);
+         params[0] = ctx->Depth.BoundsTest;
+         break;
+      case GL_DEPTH_BOUNDS_EXT:
+         CHECK_EXTENSION_I(EXT_depth_bounds_test, pname);
+         params[0] = (GLint) ctx->Depth.BoundsMin;
+         params[1] = (GLint) ctx->Depth.BoundsMax;
+         break;
+
+#if FEATURE_MESA_program_debug
+      case GL_FRAGMENT_PROGRAM_CALLBACK_MESA:
+         CHECK_EXTENSION_I(MESA_program_debug, pname);
+         *params = (GLint) ctx->FragmentProgram.CallbackEnabled;
+         break;
+      case GL_VERTEX_PROGRAM_CALLBACK_MESA:
+         CHECK_EXTENSION_I(MESA_program_debug, pname);
+         *params = (GLint) ctx->VertexProgram.CallbackEnabled;
+         break;
+      case GL_FRAGMENT_PROGRAM_POSITION_MESA:
+         CHECK_EXTENSION_I(MESA_program_debug, pname);
+         *params = (GLint) ctx->FragmentProgram.CurrentPosition;
+         break;
+      case GL_VERTEX_PROGRAM_POSITION_MESA:
+         CHECK_EXTENSION_I(MESA_program_debug, pname);
+         *params = (GLint) ctx->VertexProgram.CurrentPosition;
+         break;
+#endif
+
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetIntegerv(pname=0x%x)", pname);
+   }
+}
+
+
+/**
+ * Get the address of a selected pointer.
+ *
+ * \param pname array or buffer to be returned.
+ * \param params will hold the pointer speficifed by \p pname.
+ *
+ * \sa glGetPointerv().
+ *
+ * Tries to get the specified pointer via dd_function_table::GetPointerv,
+ * otherwise gets the specified pointer from the current context.
+ */
+void GLAPIENTRY
+_mesa_GetPointerv( GLenum pname, GLvoid **params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   const GLuint clientUnit = ctx->Array.ActiveTexture;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (!params)
+      return;
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glGetPointerv %s\n", _mesa_lookup_enum_by_nr(pname));
+
+   if (ctx->Driver.GetPointerv
+       && (*ctx->Driver.GetPointerv)(ctx, pname, params))
+      return;
+
+   switch (pname) {
+      case GL_VERTEX_ARRAY_POINTER:
+         *params = (GLvoid *) ctx->Array.Vertex.Ptr;
+         break;
+      case GL_NORMAL_ARRAY_POINTER:
+         *params = (GLvoid *) ctx->Array.Normal.Ptr;
+         break;
+      case GL_COLOR_ARRAY_POINTER:
+         *params = (GLvoid *) ctx->Array.Color.Ptr;
+         break;
+      case GL_SECONDARY_COLOR_ARRAY_POINTER_EXT:
+         *params = (GLvoid *) ctx->Array.SecondaryColor.Ptr;
+         break;
+      case GL_FOG_COORDINATE_ARRAY_POINTER_EXT:
+         *params = (GLvoid *) ctx->Array.FogCoord.Ptr;
+         break;
+      case GL_INDEX_ARRAY_POINTER:
+         *params = (GLvoid *) ctx->Array.Index.Ptr;
+         break;
+      case GL_TEXTURE_COORD_ARRAY_POINTER:
+         *params = (GLvoid *) ctx->Array.TexCoord[clientUnit].Ptr;
+         break;
+      case GL_EDGE_FLAG_ARRAY_POINTER:
+         *params = (GLvoid *) ctx->Array.EdgeFlag.Ptr;
+         break;
+      case GL_FEEDBACK_BUFFER_POINTER:
+         *params = ctx->Feedback.Buffer;
+         break;
+      case GL_SELECTION_BUFFER_POINTER:
+         *params = ctx->Select.Buffer;
+         break;
+#if FEATURE_MESA_program_debug
+      case GL_FRAGMENT_PROGRAM_CALLBACK_FUNC_MESA:
+         if (!ctx->Extensions.MESA_program_debug) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glGetPointerv");
+            return;
+         }
+         *params = (GLvoid *) ctx->FragmentProgram.Callback;
+         break;
+      case GL_FRAGMENT_PROGRAM_CALLBACK_DATA_MESA:
+         if (!ctx->Extensions.MESA_program_debug) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glGetPointerv");
+            return;
+         }
+         *params = ctx->FragmentProgram.CallbackData;
+         break;
+      case GL_VERTEX_PROGRAM_CALLBACK_FUNC_MESA:
+         if (!ctx->Extensions.MESA_program_debug) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glGetPointerv");
+            return;
+         }
+         *params = (GLvoid *) ctx->VertexProgram.Callback;
+         break;
+      case GL_VERTEX_PROGRAM_CALLBACK_DATA_MESA:
+         if (!ctx->Extensions.MESA_program_debug) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glGetPointerv");
+            return;
+         }
+         *params = ctx->VertexProgram.CallbackData;
+         break;
+#endif
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetPointerv" );
+         return;
+   }
+}
+
+
+/**
+ * Get a string describing the current GL connection.
+ *
+ * \param name name symbolic constant.
+ *
+ * \sa glGetString().
+ *
+ * Tries to get the string from dd_function_table::GetString, otherwise returns
+ * the hardcoded strings.
+ */
+const GLubyte * GLAPIENTRY
+_mesa_GetString( GLenum name )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   static const char *vendor = "Brian Paul";
+   static const char *renderer = "Mesa";
+   static const char *version_1_2 = "1.2 Mesa " MESA_VERSION_STRING;
+   static const char *version_1_3 = "1.3 Mesa " MESA_VERSION_STRING;
+   static const char *version_1_4 = "1.4 Mesa " MESA_VERSION_STRING;
+   static const char *version_1_5 = "1.5 Mesa " MESA_VERSION_STRING;
+
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
+
+   /* this is a required driver function */
+   assert(ctx->Driver.GetString);
+   {
+      const GLubyte *str = (*ctx->Driver.GetString)(ctx, name);
+      if (str)
+         return str;
+
+      switch (name) {
+         case GL_VENDOR:
+            return (const GLubyte *) vendor;
+         case GL_RENDERER:
+            return (const GLubyte *) renderer;
+         case GL_VERSION:
+            if (ctx->Extensions.ARB_multisample &&
+                ctx->Extensions.ARB_multitexture &&
+                ctx->Extensions.ARB_texture_border_clamp &&
+                ctx->Extensions.ARB_texture_compression &&
+                ctx->Extensions.ARB_texture_cube_map &&
+                ctx->Extensions.EXT_texture_env_add &&
+                ctx->Extensions.ARB_texture_env_combine &&
+                ctx->Extensions.ARB_texture_env_dot3) {
+               if (ctx->Extensions.ARB_depth_texture &&
+                   ctx->Extensions.ARB_shadow &&
+                   ctx->Extensions.ARB_texture_env_crossbar &&
+                   ctx->Extensions.ARB_texture_mirrored_repeat &&
+                   ctx->Extensions.ARB_window_pos &&
+                   ctx->Extensions.EXT_blend_color &&
+                   ctx->Extensions.EXT_blend_func_separate &&
+                   ctx->Extensions.EXT_blend_logic_op &&
+                   ctx->Extensions.EXT_blend_minmax &&
+                   ctx->Extensions.EXT_blend_subtract &&
+                   ctx->Extensions.EXT_fog_coord &&
+                   ctx->Extensions.EXT_multi_draw_arrays &&
+                   ctx->Extensions.EXT_point_parameters && /*aka ARB*/
+                   ctx->Extensions.EXT_secondary_color &&
+                   ctx->Extensions.EXT_stencil_wrap &&
+                   ctx->Extensions.EXT_texture_lod_bias &&
+                   ctx->Extensions.SGIS_generate_mipmap) {
+                  if (ctx->Extensions.ARB_occlusion_query &&
+                      ctx->Extensions.ARB_vertex_buffer_object &&
+                      ctx->Extensions.ARB_texture_non_power_of_two &&
+                      ctx->Extensions.EXT_shadow_funcs) {
+                     return (const GLubyte *) version_1_5;
+                  }
+                  else {
+                     return (const GLubyte *) version_1_4;
+                  }
+               }
+               else {
+                  return (const GLubyte *) version_1_3;
+               }
+            }
+            else {
+               return (const GLubyte *) version_1_2;
+            }
+         case GL_EXTENSIONS:
+            if (!ctx->Extensions.String)
+               ctx->Extensions.String = _mesa_make_extension_string(ctx);
+            return (const GLubyte *) ctx->Extensions.String;
+#if FEATURE_NV_fragment_program
+         case GL_PROGRAM_ERROR_STRING_NV:
+            if (ctx->Extensions.NV_fragment_program) {
+               return (const GLubyte *) ctx->Program.ErrorString;
+            }
+            /* FALL-THROUGH */
+#endif
+         default:
+            _mesa_error( ctx, GL_INVALID_ENUM, "glGetString" );
+            return (const GLubyte *) 0;
+      }
+   }
+}
+
+
+/**
+ * Execute a glGetError() command.
+ *
+ * \return error number.
+ *
+ * Returns __GLcontextRec::ErrorValue.
+ */
+GLenum GLAPIENTRY
+_mesa_GetError( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLenum e = ctx->ErrorValue;
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glGetError <-- %s\n", _mesa_lookup_enum_by_nr(e));
+
+   ctx->ErrorValue = (GLenum) GL_NO_ERROR;
+   return e;
+}
diff --git a/reactos/lib/mesa32/src/main/get.h b/reactos/lib/mesa32/src/main/get.h
new file mode 100644
index 00000000000..9b47b230a98
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/get.h
@@ -0,0 +1,59 @@
+/**
+ * \file get.h
+ * State query functions.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef GET_H
+#define GET_H
+
+
+#include "mtypes.h"
+
+
+extern void GLAPIENTRY
+_mesa_GetBooleanv( GLenum pname, GLboolean *params );
+
+extern void GLAPIENTRY
+_mesa_GetDoublev( GLenum pname, GLdouble *params );
+
+extern void GLAPIENTRY
+_mesa_GetFloatv( GLenum pname, GLfloat *params );
+
+extern void GLAPIENTRY
+_mesa_GetIntegerv( GLenum pname, GLint *params );
+
+extern void GLAPIENTRY
+_mesa_GetPointerv( GLenum pname, GLvoid **params );
+
+extern const GLubyte * GLAPIENTRY
+_mesa_GetString( GLenum name );
+
+extern GLenum GLAPIENTRY
+_mesa_GetError( void );
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/glheader.h b/reactos/lib/mesa32/src/main/glheader.h
new file mode 100644
index 00000000000..a75c65dd4aa
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/glheader.h
@@ -0,0 +1,300 @@
+/**
+ * \file glheader.h
+ * Top-most include file.
+ *
+ * This is the top-most include file of the Mesa sources.
+ * It includes gl.h and all system headers which are needed.
+ * Other Mesa source files should \e not directly include any system
+ * headers.  This allows Mesa to be integrated into XFree86 and
+ * allows system-dependent hacks/workarounds to be collected in one place.
+ *
+ * \note Actually, a lot of system-dependent stuff is now in imports.[ch].
+ *
+ * If you touch this file, everything gets recompiled!
+ *
+ * This file should be included before any other header in the .c files.
+ *
+ * Put compiler/OS/assembly pragmas and macros here to avoid
+ * cluttering other source files.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.1
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef GLHEADER_H
+#define GLHEADER_H
+
+
+#if defined(XFree86LOADER) && defined(IN_MODULE)
+#include "xf86_ansic.h"
+#else
+#include <assert.h>
+#include <ctype.h>
+/* If we can use Compaq's Fast Math Library on Alpha */
+#if defined(__alpha__) && defined(CCPML)
+#include <cpml.h>
+#else
+#include <math.h>
+#endif
+#include <limits.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#if defined(__linux__) && defined(__i386__)
+#include <fpu_control.h>
+#endif
+#endif
+#include <float.h>
+#include <stdarg.h>
+
+
+#ifdef HAVE_CONFIG_H
+#include "conf.h"
+#endif
+
+
+#if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__) && !defined(BUILD_FOR_SNAP)
+#	define __WIN32__
+#	define finite _finite
+#endif
+
+#if defined(__WATCOMC__)
+#	define finite _finite
+#endif
+
+#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__)) && !defined(BUILD_FOR_SNAP)
+#  pragma warning( disable : 4068 ) /* unknown pragma */
+#  pragma warning( disable : 4710 ) /* function 'foo' not inlined */
+#  pragma warning( disable : 4711 ) /* function 'foo' selected for automatic inline expansion */
+#  pragma warning( disable : 4127 ) /* conditional expression is constant */
+#  if defined(MESA_MINWARN)
+#    pragma warning( disable : 4244 ) /* '=' : conversion from 'const double ' to 'float ', possible loss of data */
+#    pragma warning( disable : 4018 ) /* '<' : signed/unsigned mismatch */
+#    pragma warning( disable : 4305 ) /* '=' : truncation from 'const double ' to 'float ' */
+#    pragma warning( disable : 4550 ) /* 'function' undefined; assuming extern returning int */
+#    pragma warning( disable : 4761 ) /* integral size mismatch in argument; conversion supplied */
+#  endif
+#  if defined(_MSC_VER) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
+#    define GLAPI __declspec(dllexport)
+#    define WGLAPI __declspec(dllexport)
+#  elif defined(_MSC_VER) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
+#    define GLAPI __declspec(dllimport)
+#    define WGLAPI __declspec(dllimport)
+#  else /* for use with static link lib build of Win32 edition only */
+#    define GLAPI extern
+#    define WGLAPI __declspec(dllimport)
+#  endif /* _STATIC_MESA support */
+#  define GLAPIENTRY __stdcall
+#  define GLAPIENTRYP GLAPIENTRY *
+#  define GLCALLBACK __stdcall
+#  define GLCALLBACKP GLCALLBACK *
+#  if defined(__CYGWIN__)
+#    define GLCALLBACKPCAST *
+#  else
+#    define GLCALLBACKPCAST __stdcall *
+#  endif
+#  define GLWINAPI __stdcall
+#  define GLWINAPIV __cdecl
+#elif !defined(BUILD_FOR_SNAP)
+/* non-Windows compilation */
+#  define GLAPI extern
+#  define GLAPIENTRY
+#  ifndef GLAPIENTRYP
+#    define GLAPIENTRYP *
+#  endif
+#  define GLCALLBACK
+#  define GLCALLBACKP *
+#  define GLCALLBACKPCAST *
+#  define GLWINAPI
+#  define GLWINAPIV
+#endif /* WIN32 / CYGWIN bracket */
+
+/* compatibility guard so we don't need to change client code */
+
+#if defined(_WIN32) && !defined(_WINDEF_) && !defined(_WINDEF_H) && !defined(_GNU_H_WINDOWS32_BASE) && !defined(OPENSTEP) && !defined(__CYGWIN__) && !defined(BUILD_FOR_SNAP)
+#if 0
+#	define CALLBACK GLCALLBACK
+typedef void *HGLRC;
+typedef void *HDC;
+#endif
+typedef int (GLAPIENTRY *PROC)();
+typedef unsigned long COLORREF;
+#endif
+
+
+/* Make sure we include glext.h from gl.h */
+#define GL_GLEXT_PROTOTYPES
+
+
+#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_WINGDI_H) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP) && !defined(BUILD_FOR_SNAP) 
+#	define WGL_FONT_LINES      0
+#	define WGL_FONT_POLYGONS   1
+#ifndef _GNU_H_WINDOWS32_FUNCTIONS
+#	ifdef UNICODE
+#		define wglUseFontBitmaps  wglUseFontBitmapsW
+#		define wglUseFontOutlines  wglUseFontOutlinesW
+#	else
+#		define wglUseFontBitmaps  wglUseFontBitmapsA
+#		define wglUseFontOutlines  wglUseFontOutlinesA
+#	endif /* !UNICODE */
+#endif /* _GNU_H_WINDOWS32_FUNCTIONS */
+typedef struct tagLAYERPLANEDESCRIPTOR LAYERPLANEDESCRIPTOR, *PLAYERPLANEDESCRIPTOR, *LPLAYERPLANEDESCRIPTOR;
+typedef struct _GLYPHMETRICSFLOAT GLYPHMETRICSFLOAT, *PGLYPHMETRICSFLOAT, *LPGLYPHMETRICSFLOAT;
+typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESCRIPTOR, *LPPIXELFORMATDESCRIPTOR;
+#if !defined(GLX_USE_MESA)
+#include <GL/mesa_wgl.h>
+#endif
+#endif
+
+
+/*
+ * Either define MESA_BIG_ENDIAN or MESA_LITTLE_ENDIAN.
+ * Do not use them unless absolutely necessary!
+ * Try to use a runtime test instead.
+ * For now, only used by some DRI hardware drivers for color/texel packing.
+ */
+#if defined(BYTE_ORDER) && defined(BIG_ENDIAN) && BYTE_ORDER == BIG_ENDIAN
+#if defined(__linux__)
+#include <byteswap.h>
+#define CPU_TO_LE32( x )	bswap_32( x )
+#else /*__linux__*/
+#define CPU_TO_LE32( x )	( x )  /* fix me for non-Linux big-endian! */
+#endif /*__linux__*/
+#define MESA_BIG_ENDIAN 1
+#else
+#define CPU_TO_LE32( x )	( x )
+#define MESA_LITTLE_ENDIAN 1
+#endif
+#define LE32_TO_CPU( x )	CPU_TO_LE32( x )
+
+
+/* This is a macro on IRIX */
+#ifdef _P
+#undef _P
+#endif
+
+
+
+#include "GL/gl.h"
+#include "GL/glext.h"
+
+
+#ifndef CAPI
+#if defined(WIN32) && !defined(BUILD_FOR_SNAP)
+#define CAPI _cdecl
+#else
+#define CAPI
+#endif
+#endif
+#include <GL/internal/glcore.h>
+
+
+
+/* Disable unreachable code warnings for Watcom C++ */
+#ifdef	__WATCOMC__
+#pragma disable_message(201)
+#endif
+
+
+/* Turn off macro checking systems used by other libraries */
+#ifdef CHECK
+#undef CHECK
+#endif
+
+
+/* Create a macro so that asm functions can be linked into compilers other
+ * than GNU C
+ */
+#ifndef _ASMAPI
+#if defined(WIN32) && !defined(BUILD_FOR_SNAP)/* was: !defined( __GNUC__ ) && !defined( VMS ) && !defined( __INTEL_COMPILER )*/
+#define _ASMAPI __cdecl
+#else
+#define _ASMAPI
+#endif
+#ifdef	PTR_DECL_IN_FRONT
+#define	_ASMAPIP * _ASMAPI
+#else
+#define	_ASMAPIP _ASMAPI *
+#endif
+#endif
+
+#ifdef USE_X86_ASM
+#define _NORMAPI _ASMAPI
+#define _NORMAPIP _ASMAPIP
+#else
+#define _NORMAPI
+#define _NORMAPIP *
+#endif
+
+
+/* Function inlining */
+#if defined(__GNUC__)
+#  define INLINE __inline__
+#elif defined(__MSC__)
+#  define INLINE __inline
+#elif defined(_MSC_VER)
+#  define INLINE __inline
+#elif defined(__ICL)
+#  define INLINE __inline
+#elif defined(__INTEL_COMPILER)
+#  define INLINE inline
+#elif defined(__WATCOMC__) && (__WATCOMC__ >= 1100)
+#  define INLINE __inline
+#else
+#  define INLINE
+#endif
+
+
+/* Some compilers don't like some of Mesa's const usage */
+#ifdef NO_CONST
+#  define CONST
+#else
+#  define CONST const
+#endif
+
+
+#if defined(BUILD_FOR_SNAP) && defined(CHECKED)
+#  define ASSERT(X)   _CHECK(X) 
+#elif defined(DEBUG)
+#  define ASSERT(X)   assert(X)
+#else
+#  define ASSERT(X)
+#endif
+
+
+/**
+ * Sometimes we treat GLfloats as GLints.  On x86 systems, moving a float
+ * as a int (thereby using integer registers instead of FP registers) is
+ * a performance win.  Typically, this can be done with ordinary casts.
+ * But with gcc's -fstrict-aliasing flag (which defaults to on in gcc 3.0)
+ * these casts generate warnings.
+ * The following union typedef is used to solve that.
+ */
+typedef union { GLfloat f; GLint i; } fi_type;
+
+
+#include "config.h"
+
+#endif /* GLHEADER_H */
diff --git a/reactos/lib/mesa32/src/main/hash.c b/reactos/lib/mesa32/src/main/hash.c
new file mode 100644
index 00000000000..78be122aab5
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/hash.c
@@ -0,0 +1,360 @@
+/**
+ * \file hash.c
+ * Generic hash table. 
+ *
+ * Used for display lists and texture objects.  The hash functions are
+ * thread-safe.
+ * 
+ * \note key=0 is illegal.
+ *
+ * \author Brian Paul
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "imports.h"
+#include "glthread.h"
+#include "hash.h"
+#include "context.h"
+
+
+#define TABLE_SIZE 1023  /**< Size of lookup table/array */
+
+/**
+ * An entry in the hash table.  
+ *
+ * This struct is private to this file.
+ */
+struct HashEntry {
+   GLuint Key;             /**< the entry's key */
+   void *Data;             /**< the entry's data */
+   struct HashEntry *Next; /**< pointer to next entry */
+};
+
+/**
+ * The hash table data structure.  
+ *
+ * This is an opaque types (it's not defined in hash.h file).
+ */
+struct _mesa_HashTable {
+   struct HashEntry *Table[TABLE_SIZE];  /**< the lookup table */
+   GLuint MaxKey;                        /**< highest key inserted so far */
+   _glthread_Mutex Mutex;                /**< mutual exclusion lock */
+};
+
+
+
+/**
+ * Create a new hash table.
+ * 
+ * \return pointer to a new, empty hash table.
+ */
+struct _mesa_HashTable *_mesa_NewHashTable(void)
+{
+   struct _mesa_HashTable *table = CALLOC_STRUCT(_mesa_HashTable);
+   if (table) {
+      _glthread_INIT_MUTEX(table->Mutex);
+   }
+   return table;
+}
+
+
+
+/**
+ * Delete a hash table.
+ * 
+ * \param table the hash table to delete.
+ *
+ * Frees each entry on the hash table and then the hash table structure itself.
+ */
+void _mesa_DeleteHashTable(struct _mesa_HashTable *table)
+{
+   GLuint i;
+   assert(table);
+   for (i=0;i<TABLE_SIZE;i++) {
+      struct HashEntry *entry = table->Table[i];
+      while (entry) {
+	 struct HashEntry *next = entry->Next;
+	 FREE(entry);
+	 entry = next;
+      }
+   }
+   _glthread_DESTROY_MUTEX(table->Mutex);
+   FREE(table);
+}
+
+
+
+/**
+ * Lookup an entry in the hash table.
+ * 
+ * \param table the hash table.
+ * \param key the key.
+ * 
+ * \return pointer to user's data or NULL if key not in table
+ *
+ * Walks through the hash entry until finding the matching key.
+ */
+void *_mesa_HashLookup(const struct _mesa_HashTable *table, GLuint key)
+{
+   GLuint pos;
+   const struct HashEntry *entry;
+
+   assert(table);
+   assert(key);
+
+   pos = key & (TABLE_SIZE-1);
+   entry = table->Table[pos];
+   while (entry) {
+      if (entry->Key == key) {
+	 return entry->Data;
+      }
+      entry = entry->Next;
+   }
+   return NULL;
+}
+
+
+
+/**
+ * Insert into the hash table.  
+ *
+ * If an entry with this key already exists we'll replace the existing entry.
+ * 
+ * \param table the hash table.
+ * \param key the key (not zero).
+ * \param data pointer to user data.
+ *
+ * While holding the hash table's lock, walk through the hash entry list replacing the data if a
+ * matching key is found, or inserts a new table entry otherwise.
+ */
+void _mesa_HashInsert(struct _mesa_HashTable *table, GLuint key, void *data)
+{
+   /* search for existing entry with this key */
+   GLuint pos;
+   struct HashEntry *entry;
+
+   assert(table);
+   assert(key);
+
+   _glthread_LOCK_MUTEX(table->Mutex);
+
+   if (key > table->MaxKey)
+      table->MaxKey = key;
+
+   pos = key & (TABLE_SIZE-1);
+   entry = table->Table[pos];
+   while (entry) {
+      if (entry->Key == key) {
+         /* replace entry's data */
+	 entry->Data = data;
+         _glthread_UNLOCK_MUTEX(table->Mutex);
+	 return;
+      }
+      entry = entry->Next;
+   }
+
+   /* alloc and insert new table entry */
+   entry = MALLOC_STRUCT(HashEntry);
+   entry->Key = key;
+   entry->Data = data;
+   entry->Next = table->Table[pos];
+   table->Table[pos] = entry;
+
+   _glthread_UNLOCK_MUTEX(table->Mutex);
+}
+
+
+
+/**
+ * Remove an entry from the hash table.
+ * 
+ * \param table the hash table.
+ * \param key key of entry to remove.
+ *
+ * While holding the hash table's lock, searches the entry with the matching
+ * key and unlinks it.
+ */
+void _mesa_HashRemove(struct _mesa_HashTable *table, GLuint key)
+{
+   GLuint pos;
+   struct HashEntry *entry, *prev;
+
+   assert(table);
+   assert(key);
+
+   _glthread_LOCK_MUTEX(table->Mutex);
+
+   pos = key & (TABLE_SIZE-1);
+   prev = NULL;
+   entry = table->Table[pos];
+   while (entry) {
+      if (entry->Key == key) {
+         /* found it! */
+         if (prev) {
+            prev->Next = entry->Next;
+         }
+         else {
+            table->Table[pos] = entry->Next;
+         }
+         FREE(entry);
+         _glthread_UNLOCK_MUTEX(table->Mutex);
+	 return;
+      }
+      prev = entry;
+      entry = entry->Next;
+   }
+
+   _glthread_UNLOCK_MUTEX(table->Mutex);
+}
+
+
+
+/**
+ * Get the key of the "first" entry in the hash table.
+ * 
+ * This is used in the course of deleting all display lists when
+ * a context is destroyed.
+ * 
+ * \param table the hash table
+ * 
+ * \return key for the "first" entry in the hash table.
+ *
+ * While holding the lock, walks through all table positions until finding
+ * the first entry of the first non-empty one.
+ */
+GLuint _mesa_HashFirstEntry(struct _mesa_HashTable *table)
+{
+   GLuint pos;
+   assert(table);
+   _glthread_LOCK_MUTEX(table->Mutex);
+   for (pos=0; pos < TABLE_SIZE; pos++) {
+      if (table->Table[pos]) {
+         _glthread_UNLOCK_MUTEX(table->Mutex);
+         return table->Table[pos]->Key;
+      }
+   }
+   _glthread_UNLOCK_MUTEX(table->Mutex);
+   return 0;
+}
+
+
+
+/**
+ * Dump contents of hash table for debugging.
+ * 
+ * \param table the hash table.
+ */
+void _mesa_HashPrint(const struct _mesa_HashTable *table)
+{
+   GLuint i;
+   assert(table);
+   for (i=0;i<TABLE_SIZE;i++) {
+      const struct HashEntry *entry = table->Table[i];
+      while (entry) {
+	 _mesa_debug(NULL, "%u %p\n", entry->Key, entry->Data);
+	 entry = entry->Next;
+      }
+   }
+}
+
+
+
+/**
+ * Find a block of adjacent unused hash keys.
+ * 
+ * \param table the hash table.
+ * \param numKeys number of keys needed.
+ * 
+ * \return Starting key of free block or 0 if failure.
+ *
+ * If there are enough free keys between the maximum key existing in the table
+ * (_mesa_HashTable::MaxKey) and the maximum key possible, then simply return
+ * the adjacent key. Otherwise do a full search for a free key block in the
+ * allowable key range.
+ */
+GLuint _mesa_HashFindFreeKeyBlock(struct _mesa_HashTable *table, GLuint numKeys)
+{
+   GLuint maxKey = ~((GLuint) 0);
+   _glthread_LOCK_MUTEX(table->Mutex);
+   if (maxKey - numKeys > table->MaxKey) {
+      /* the quick solution */
+      _glthread_UNLOCK_MUTEX(table->Mutex);
+      return table->MaxKey + 1;
+   }
+   else {
+      /* the slow solution */
+      GLuint freeCount = 0;
+      GLuint freeStart = 1;
+      GLuint key;
+      for (key=1; key!=maxKey; key++) {
+	 if (_mesa_HashLookup(table, key)) {
+	    /* darn, this key is already in use */
+	    freeCount = 0;
+	    freeStart = key+1;
+	 }
+	 else {
+	    /* this key not in use, check if we've found enough */
+	    freeCount++;
+	    if (freeCount == numKeys) {
+               _glthread_UNLOCK_MUTEX(table->Mutex);
+	       return freeStart;
+	    }
+	 }
+      }
+      /* cannot allocate a block of numKeys consecutive keys */
+      _glthread_UNLOCK_MUTEX(table->Mutex);
+      return 0;
+   }
+}
+
+
+
+#ifdef HASH_TEST_HARNESS
+int main(int argc, char *argv[])
+{
+   int a, b, c;
+   struct HashTable *t;
+
+   _mesa_printf("&a = %p\n", &a);
+   _mesa_printf("&b = %p\n", &b);
+
+   t = _mesa_NewHashTable();
+   _mesa_HashInsert(t, 501, &a);
+   _mesa_HashInsert(t, 10, &c);
+   _mesa_HashInsert(t, 0xfffffff8, &b);
+   _mesa_HashPrint(t);
+
+   _mesa_printf("Find 501: %p\n", _mesa_HashLookup(t,501));
+   _mesa_printf("Find 1313: %p\n", _mesa_HashLookup(t,1313));
+   _mesa_printf("Find block of 100: %d\n", _mesa_HashFindFreeKeyBlock(t, 100));
+
+   _mesa_DeleteHashTable(t);
+
+   return 0;
+}
+#endif
diff --git a/reactos/lib/mesa32/src/main/hash.h b/reactos/lib/mesa32/src/main/hash.h
new file mode 100644
index 00000000000..359ba512742
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/hash.h
@@ -0,0 +1,62 @@
+/**
+ * \file hash.h
+ * Generic hash table. 
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef HASH_H
+#define HASH_H
+
+
+#include "glheader.h"
+
+
+/**
+ * Opaque hash table type.
+ */
+struct HashTable;
+
+
+
+extern struct _mesa_HashTable *_mesa_NewHashTable(void);
+
+extern void _mesa_DeleteHashTable(struct _mesa_HashTable *table);
+
+extern void *_mesa_HashLookup(const struct _mesa_HashTable *table, GLuint key);
+
+extern void _mesa_HashInsert(struct _mesa_HashTable *table, GLuint key, void *data);
+
+extern void _mesa_HashRemove(struct _mesa_HashTable *table, GLuint key);
+
+extern GLuint _mesa_HashFirstEntry(struct _mesa_HashTable *table);
+
+extern void _mesa_HashPrint(const struct _mesa_HashTable *table);
+
+extern GLuint _mesa_HashFindFreeKeyBlock(struct _mesa_HashTable *table, GLuint numKeys);
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/hint.c b/reactos/lib/mesa32/src/main/hint.c
new file mode 100644
index 00000000000..23ab1e6d0e6
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/hint.c
@@ -0,0 +1,140 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "enums.h"
+#include "context.h"
+#include "hint.h"
+#include "imports.h"
+
+
+
+void GLAPIENTRY
+_mesa_Hint( GLenum target, GLenum mode )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glHint %s %d\n",
+                  _mesa_lookup_enum_by_nr(target), mode);
+
+   if (mode != GL_NICEST && mode != GL_FASTEST && mode != GL_DONT_CARE) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glHint(mode)");
+      return;
+   }
+
+   switch (target) {
+      case GL_FOG_HINT:
+         if (ctx->Hint.Fog == mode)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_HINT);
+         ctx->Hint.Fog = mode;
+         break;
+      case GL_LINE_SMOOTH_HINT:
+         if (ctx->Hint.LineSmooth == mode)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_HINT);
+         ctx->Hint.LineSmooth = mode;
+         break;
+      case GL_PERSPECTIVE_CORRECTION_HINT:
+         if (ctx->Hint.PerspectiveCorrection == mode)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_HINT);
+         ctx->Hint.PerspectiveCorrection = mode;
+         break;
+      case GL_POINT_SMOOTH_HINT:
+         if (ctx->Hint.PointSmooth == mode)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_HINT);
+         ctx->Hint.PointSmooth = mode;
+         break;
+      case GL_POLYGON_SMOOTH_HINT:
+         if (ctx->Hint.PolygonSmooth == mode)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_HINT);
+         ctx->Hint.PolygonSmooth = mode;
+         break;
+
+      /* GL_EXT_clip_volume_hint */
+      case GL_CLIP_VOLUME_CLIPPING_HINT_EXT:
+         if (ctx->Hint.ClipVolumeClipping == mode)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_HINT);
+         ctx->Hint.ClipVolumeClipping = mode;
+         break;
+
+      /* GL_ARB_texture_compression */
+      case GL_TEXTURE_COMPRESSION_HINT_ARB:
+         if (!ctx->Extensions.ARB_texture_compression) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glHint(target)");
+	    return;
+         }
+	 if (ctx->Hint.TextureCompression == mode)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_HINT);
+	 ctx->Hint.TextureCompression = mode;
+         break;
+
+      /* GL_SGIS_generate_mipmap */
+      case GL_GENERATE_MIPMAP_HINT_SGIS:
+         if (!ctx->Extensions.SGIS_generate_mipmap) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glHint(target)");
+	    return;
+         }
+         if (ctx->Hint.GenerateMipmap == mode)
+            return;
+	 FLUSH_VERTICES(ctx, _NEW_HINT);
+	 ctx->Hint.GenerateMipmap = mode;
+         break;
+
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glHint(target)");
+         return;
+   }
+
+   if (ctx->Driver.Hint) {
+      (*ctx->Driver.Hint)( ctx, target, mode );
+   }
+}
+
+
+/**********************************************************************/
+/*****                      Initialization                        *****/
+/**********************************************************************/
+
+void _mesa_init_hint( GLcontext * ctx )
+{
+   /* Hint group */
+   ctx->Hint.PerspectiveCorrection = GL_DONT_CARE;
+   ctx->Hint.PointSmooth = GL_DONT_CARE;
+   ctx->Hint.LineSmooth = GL_DONT_CARE;
+   ctx->Hint.PolygonSmooth = GL_DONT_CARE;
+   ctx->Hint.Fog = GL_DONT_CARE;
+   ctx->Hint.ClipVolumeClipping = GL_DONT_CARE;
+   ctx->Hint.TextureCompression = GL_DONT_CARE;
+   ctx->Hint.GenerateMipmap = GL_DONT_CARE;
+}
diff --git a/reactos/lib/mesa32/src/main/hint.h b/reactos/lib/mesa32/src/main/hint.h
new file mode 100644
index 00000000000..bfc3887107d
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/hint.h
@@ -0,0 +1,57 @@
+/**
+ * \file hint.h
+ * Hints operations.
+ * 
+ * \if subset
+ * (No-op)
+ *
+ * \endif
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef HINT_H
+#define HINT_H
+
+
+#include "mtypes.h"
+
+#if _HAVE_FULL_GL
+
+extern void GLAPIENTRY
+_mesa_Hint( GLenum target, GLenum mode );
+
+extern void 
+_mesa_init_hint( GLcontext * ctx );
+
+#else
+
+/** No-op */
+#define _mesa_init_hint( c ) ((void) 0)
+
+#endif
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/histogram.c b/reactos/lib/mesa32/src/main/histogram.c
new file mode 100644
index 00000000000..f390a2dade9
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/histogram.c
@@ -0,0 +1,1136 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "colormac.h"
+#include "context.h"
+#include "image.h"
+#include "histogram.h"
+
+
+/**********************************************************************
+ * Internal functions
+ */
+
+
+/*
+ * Update the min/max values from an array of fragment colors.
+ */
+void
+_mesa_update_minmax(GLcontext *ctx, GLuint n, const GLfloat rgba[][4])
+{
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      /* update mins */
+      if (rgba[i][RCOMP] < ctx->MinMax.Min[RCOMP])
+         ctx->MinMax.Min[RCOMP] = rgba[i][RCOMP];
+      if (rgba[i][GCOMP] < ctx->MinMax.Min[GCOMP])
+         ctx->MinMax.Min[GCOMP] = rgba[i][GCOMP];
+      if (rgba[i][BCOMP] < ctx->MinMax.Min[BCOMP])
+         ctx->MinMax.Min[BCOMP] = rgba[i][BCOMP];
+      if (rgba[i][ACOMP] < ctx->MinMax.Min[ACOMP])
+         ctx->MinMax.Min[ACOMP] = rgba[i][ACOMP];
+
+      /* update maxs */
+      if (rgba[i][RCOMP] > ctx->MinMax.Max[RCOMP])
+         ctx->MinMax.Max[RCOMP] = rgba[i][RCOMP];
+      if (rgba[i][GCOMP] > ctx->MinMax.Max[GCOMP])
+         ctx->MinMax.Max[GCOMP] = rgba[i][GCOMP];
+      if (rgba[i][BCOMP] > ctx->MinMax.Max[BCOMP])
+         ctx->MinMax.Max[BCOMP] = rgba[i][BCOMP];
+      if (rgba[i][ACOMP] > ctx->MinMax.Max[ACOMP])
+         ctx->MinMax.Max[ACOMP] = rgba[i][ACOMP];
+   }
+}
+
+
+/*
+ * Update the histogram values from an array of fragment colors.
+ */
+void
+_mesa_update_histogram(GLcontext *ctx, GLuint n, const GLfloat rgba[][4])
+{
+   const GLint max = ctx->Histogram.Width - 1;
+   GLfloat w = (GLfloat) max;
+   GLuint i;
+
+   if (ctx->Histogram.Width == 0)
+      return;
+
+   for (i = 0; i < n; i++) {
+      GLint ri = IROUND(rgba[i][RCOMP] * w);
+      GLint gi = IROUND(rgba[i][GCOMP] * w);
+      GLint bi = IROUND(rgba[i][BCOMP] * w);
+      GLint ai = IROUND(rgba[i][ACOMP] * w);
+      ri = CLAMP(ri, 0, max);
+      gi = CLAMP(gi, 0, max);
+      bi = CLAMP(bi, 0, max);
+      ai = CLAMP(ai, 0, max);
+      ctx->Histogram.Count[ri][RCOMP]++;
+      ctx->Histogram.Count[gi][GCOMP]++;
+      ctx->Histogram.Count[bi][BCOMP]++;
+      ctx->Histogram.Count[ai][ACOMP]++;
+   }
+}
+
+
+/*
+ * XXX the packed pixel formats haven't been tested.
+ */
+static void
+pack_histogram( GLcontext *ctx,
+                GLuint n, CONST GLuint rgba[][4],
+                GLenum format, GLenum type, GLvoid *destination,
+                const struct gl_pixelstore_attrib *packing )
+{
+   const GLint comps = _mesa_components_in_format(format);
+   GLuint luminance[MAX_WIDTH];
+
+   if (format == GL_LUMINANCE || format == GL_LUMINANCE_ALPHA) {
+      GLuint i;
+      for (i = 0; i < n; i++) {
+         luminance[i] = rgba[i][RCOMP] + rgba[i][GCOMP] + rgba[i][BCOMP];
+      }
+   }
+
+#define PACK_MACRO(TYPE)					\
+   {								\
+      GLuint i;							\
+      switch (format) {						\
+         case GL_RED:						\
+            for (i=0;i<n;i++)					\
+               dst[i] = (TYPE) rgba[i][RCOMP];			\
+            break;						\
+         case GL_GREEN:						\
+            for (i=0;i<n;i++)					\
+               dst[i] = (TYPE) rgba[i][GCOMP];			\
+            break;						\
+         case GL_BLUE:						\
+            for (i=0;i<n;i++)					\
+               dst[i] = (TYPE) rgba[i][BCOMP];			\
+            break;						\
+         case GL_ALPHA:						\
+            for (i=0;i<n;i++)					\
+               dst[i] = (TYPE) rgba[i][ACOMP];			\
+            break;						\
+         case GL_LUMINANCE:					\
+            for (i=0;i<n;i++)					\
+               dst[i] = (TYPE) luminance[i];			\
+            break;						\
+         case GL_LUMINANCE_ALPHA:				\
+            for (i=0;i<n;i++) {					\
+               dst[i*2+0] = (TYPE) luminance[i];		\
+               dst[i*2+1] = (TYPE) rgba[i][ACOMP];		\
+            }							\
+            break;						\
+         case GL_RGB:						\
+            for (i=0;i<n;i++) {					\
+               dst[i*3+0] = (TYPE) rgba[i][RCOMP];		\
+               dst[i*3+1] = (TYPE) rgba[i][GCOMP];		\
+               dst[i*3+2] = (TYPE) rgba[i][BCOMP];		\
+            }							\
+            break;						\
+         case GL_RGBA:						\
+            for (i=0;i<n;i++) {					\
+               dst[i*4+0] = (TYPE) rgba[i][RCOMP];		\
+               dst[i*4+1] = (TYPE) rgba[i][GCOMP];		\
+               dst[i*4+2] = (TYPE) rgba[i][BCOMP];		\
+               dst[i*4+3] = (TYPE) rgba[i][ACOMP];		\
+            }							\
+            break;						\
+         case GL_BGR:						\
+            for (i=0;i<n;i++) {					\
+               dst[i*3+0] = (TYPE) rgba[i][BCOMP];		\
+               dst[i*3+1] = (TYPE) rgba[i][GCOMP];		\
+               dst[i*3+2] = (TYPE) rgba[i][RCOMP];		\
+            }							\
+            break;						\
+         case GL_BGRA:						\
+            for (i=0;i<n;i++) {					\
+               dst[i*4+0] = (TYPE) rgba[i][BCOMP];		\
+               dst[i*4+1] = (TYPE) rgba[i][GCOMP];		\
+               dst[i*4+2] = (TYPE) rgba[i][RCOMP];		\
+               dst[i*4+3] = (TYPE) rgba[i][ACOMP];		\
+            }							\
+            break;						\
+         case GL_ABGR_EXT:					\
+            for (i=0;i<n;i++) {					\
+               dst[i*4+0] = (TYPE) rgba[i][ACOMP];		\
+               dst[i*4+1] = (TYPE) rgba[i][BCOMP];		\
+               dst[i*4+2] = (TYPE) rgba[i][GCOMP];		\
+               dst[i*4+3] = (TYPE) rgba[i][RCOMP];		\
+            }							\
+            break;						\
+         default:						\
+            _mesa_problem(ctx, "bad format in pack_histogram");	\
+      }								\
+   }
+
+   switch (type) {
+      case GL_UNSIGNED_BYTE:
+         {
+            GLubyte *dst = (GLubyte *) destination;
+            PACK_MACRO(GLubyte);
+         }
+         break;
+      case GL_BYTE:
+         {
+            GLbyte *dst = (GLbyte *) destination;
+            PACK_MACRO(GLbyte);
+         }
+         break;
+      case GL_UNSIGNED_SHORT:
+         {
+            GLushort *dst = (GLushort *) destination;
+            PACK_MACRO(GLushort);
+            if (packing->SwapBytes) {
+               _mesa_swap2(dst, n * comps);
+            }
+         }
+         break;
+      case GL_SHORT:
+         {
+            GLshort *dst = (GLshort *) destination;
+            PACK_MACRO(GLshort);
+            if (packing->SwapBytes) {
+               _mesa_swap2((GLushort *) dst, n * comps);
+            }
+         }
+         break;
+      case GL_UNSIGNED_INT:
+         {
+            GLuint *dst = (GLuint *) destination;
+            PACK_MACRO(GLuint);
+            if (packing->SwapBytes) {
+               _mesa_swap4(dst, n * comps);
+            }
+         }
+         break;
+      case GL_INT:
+         {
+            GLint *dst = (GLint *) destination;
+            PACK_MACRO(GLint);
+            if (packing->SwapBytes) {
+               _mesa_swap4((GLuint *) dst, n * comps);
+            }
+         }
+         break;
+      case GL_FLOAT:
+         {
+            GLfloat *dst = (GLfloat *) destination;
+            PACK_MACRO(GLfloat);
+            if (packing->SwapBytes) {
+               _mesa_swap4((GLuint *) dst, n * comps);
+            }
+         }
+         break;
+      case GL_UNSIGNED_BYTE_3_3_2:
+         if (format == GL_RGB) {
+            GLubyte *dst = (GLubyte *) destination;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               dst[i] = ((rgba[i][RCOMP] & 0x7) << 5)
+                      | ((rgba[i][GCOMP] & 0x7) << 2)
+                      | ((rgba[i][BCOMP] & 0x3)     );
+            }
+         }
+         else {
+            GLubyte *dst = (GLubyte *) destination;
+            GLuint i;
+            ASSERT(format == GL_BGR);
+            for (i = 0; i < n; i++) {
+               dst[i] = ((rgba[i][BCOMP] & 0x7) << 5)
+                      | ((rgba[i][GCOMP] & 0x7) << 2)
+                      | ((rgba[i][RCOMP] & 0x3)     );
+            }
+         }
+         break;
+      case GL_UNSIGNED_BYTE_2_3_3_REV:
+         if (format == GL_RGB) {
+            GLubyte *dst = (GLubyte *) destination;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               dst[i] = ((rgba[i][RCOMP] & 0x3) << 6)
+                      | ((rgba[i][GCOMP] & 0x7) << 3)
+                      | ((rgba[i][BCOMP] & 0x7)     );
+            }
+         }
+         else {
+            GLubyte *dst = (GLubyte *) destination;
+            GLuint i;
+            ASSERT(format == GL_BGR);
+            for (i = 0; i < n; i++) {
+               dst[i] = ((rgba[i][BCOMP] & 0x3) << 6)
+                      | ((rgba[i][GCOMP] & 0x7) << 3)
+                      | ((rgba[i][RCOMP] & 0x7)     );
+            }
+         }
+         break;
+      case GL_UNSIGNED_SHORT_5_6_5:
+         if (format == GL_RGB) {
+            GLushort *dst = (GLushort *) destination;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               dst[i] = ((rgba[i][RCOMP] & 0x1f) << 11)
+                      | ((rgba[i][GCOMP] & 0x3f) <<  5)
+                      | ((rgba[i][BCOMP] & 0x1f)      );
+            }
+         }
+         else {
+            GLushort *dst = (GLushort *) destination;
+            GLuint i;
+            ASSERT(format == GL_BGR);
+            for (i = 0; i < n; i++) {
+               dst[i] = ((rgba[i][BCOMP] & 0x1f) << 11)
+                      | ((rgba[i][GCOMP] & 0x3f) <<  5)
+                      | ((rgba[i][RCOMP] & 0x1f)      );
+            }
+         }
+         break;
+      case GL_UNSIGNED_SHORT_5_6_5_REV:
+         if (format == GL_RGB) {
+            GLushort *dst = (GLushort *) destination;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               dst[i] = ((rgba[i][BCOMP] & 0x1f) << 11)
+                      | ((rgba[i][GCOMP] & 0x3f) <<  5)
+                      | ((rgba[i][RCOMP] & 0x1f)      );
+            }
+         }
+         else {
+            GLushort *dst = (GLushort *) destination;
+            GLuint i;
+            ASSERT(format == GL_BGR);
+            for (i = 0; i < n; i++) {
+               dst[i] = ((rgba[i][RCOMP] & 0x1f) << 11)
+                      | ((rgba[i][GCOMP] & 0x3f) <<  5)
+                      | ((rgba[i][BCOMP] & 0x1f)      );
+            }
+         }
+         break;
+      case GL_UNSIGNED_SHORT_4_4_4_4:
+         if (format == GL_RGBA) {
+            GLushort *dst = (GLushort *) destination;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               dst[i] = ((rgba[i][RCOMP] & 0xf) << 12)
+                      | ((rgba[i][GCOMP] & 0xf) <<  8)
+                      | ((rgba[i][BCOMP] & 0xf) <<  4)
+                      | ((rgba[i][ACOMP] & 0xf)      );
+            }
+         }
+         else if (format == GL_BGRA) {
+            GLushort *dst = (GLushort *) destination;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               dst[i] = ((rgba[i][BCOMP] & 0xf) << 12)
+                      | ((rgba[i][GCOMP] & 0xf) <<  8)
+                      | ((rgba[i][RCOMP] & 0xf) <<  4)
+                      | ((rgba[i][ACOMP] & 0xf)      );
+            }
+         }
+         else {
+            GLushort *dst = (GLushort *) destination;
+            GLuint i;
+            ASSERT(format == GL_ABGR_EXT);
+            for (i = 0; i < n; i++) {
+               dst[i] = ((rgba[i][ACOMP] & 0xf) << 12)
+                      | ((rgba[i][BCOMP] & 0xf) <<  8)
+                      | ((rgba[i][GCOMP] & 0xf) <<  4)
+                      | ((rgba[i][RCOMP] & 0xf)      );
+            }
+         }
+         break;
+      case GL_UNSIGNED_SHORT_4_4_4_4_REV:
+         if (format == GL_RGBA) {
+            GLushort *dst = (GLushort *) destination;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               dst[i] = ((rgba[i][ACOMP] & 0xf) << 12)
+                      | ((rgba[i][BCOMP] & 0xf) <<  8)
+                      | ((rgba[i][GCOMP] & 0xf) <<  4)
+                      | ((rgba[i][RCOMP] & 0xf)      );
+            }
+         }
+         else if (format == GL_BGRA) {
+            GLushort *dst = (GLushort *) destination;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               dst[i] = ((rgba[i][ACOMP] & 0xf) << 12)
+                      | ((rgba[i][RCOMP] & 0xf) <<  8)
+                      | ((rgba[i][GCOMP] & 0xf) <<  4)
+                      | ((rgba[i][BCOMP] & 0xf)      );
+            }
+         }
+         else {
+            GLushort *dst = (GLushort *) destination;
+            GLuint i;
+            ASSERT(format == GL_ABGR_EXT);
+            for (i = 0; i < n; i++) {
+               dst[i] = ((rgba[i][RCOMP] & 0xf) << 12)
+                      | ((rgba[i][GCOMP] & 0xf) <<  8)
+                      | ((rgba[i][BCOMP] & 0xf) <<  4)
+                      | ((rgba[i][ACOMP] & 0xf)      );
+            }
+         }
+         break;
+      case GL_UNSIGNED_SHORT_5_5_5_1:
+         if (format == GL_RGBA) {
+            GLushort *dst = (GLushort *) destination;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               dst[i] = ((rgba[i][RCOMP] & 0x1f) << 11)
+                      | ((rgba[i][GCOMP] & 0x1f) <<  6)
+                      | ((rgba[i][BCOMP] & 0x1f) <<  1)
+                      | ((rgba[i][ACOMP] & 0x1)       );
+            }
+         }
+         else if (format == GL_BGRA) {
+            GLushort *dst = (GLushort *) destination;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               dst[i] = ((rgba[i][BCOMP] & 0x1f) << 11)
+                      | ((rgba[i][GCOMP] & 0x1f) <<  6)
+                      | ((rgba[i][RCOMP] & 0x1f) <<  1)
+                      | ((rgba[i][ACOMP] & 0x1)       );
+            }
+         }
+         else {
+            GLushort *dst = (GLushort *) destination;
+            GLuint i;
+            ASSERT(format == GL_ABGR_EXT);
+            for (i = 0; i < n; i++) {
+               dst[i] = ((rgba[i][ACOMP] & 0x1f) << 11)
+                      | ((rgba[i][BCOMP] & 0x1f) <<  6)
+                      | ((rgba[i][GCOMP] & 0x1f) <<  1)
+                      | ((rgba[i][RCOMP] & 0x1)       );
+            }
+         }
+         break;
+      case GL_UNSIGNED_SHORT_1_5_5_5_REV:
+         if (format == GL_RGBA) {
+            GLushort *dst = (GLushort *) destination;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               dst[i] = ((rgba[i][ACOMP] & 0x1f) << 11)
+                      | ((rgba[i][BCOMP] & 0x1f) <<  6)
+                      | ((rgba[i][GCOMP] & 0x1f) <<  1)
+                      | ((rgba[i][RCOMP] & 0x1)       );
+            }
+         }
+         else if (format == GL_BGRA) {
+            GLushort *dst = (GLushort *) destination;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               dst[i] = ((rgba[i][ACOMP] & 0x1f) << 11)
+                      | ((rgba[i][RCOMP] & 0x1f) <<  6)
+                      | ((rgba[i][GCOMP] & 0x1f) <<  1)
+                      | ((rgba[i][BCOMP] & 0x1)       );
+            }
+         }
+         else {
+            GLushort *dst = (GLushort *) destination;
+            GLuint i;
+            ASSERT(format == GL_ABGR_EXT);
+            for (i = 0; i < n; i++) {
+               dst[i] = ((rgba[i][RCOMP] & 0x1f) << 11)
+                      | ((rgba[i][GCOMP] & 0x1f) <<  6)
+                      | ((rgba[i][BCOMP] & 0x1f) <<  1)
+                      | ((rgba[i][ACOMP] & 0x1)       );
+            }
+         }
+         break;
+      case GL_UNSIGNED_INT_8_8_8_8:
+         if (format == GL_RGBA) {
+            GLuint *dst = (GLuint *) destination;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               dst[i] = ((rgba[i][RCOMP] & 0xff) << 24)
+                      | ((rgba[i][GCOMP] & 0xff) << 16)
+                      | ((rgba[i][BCOMP] & 0xff) <<  8)
+                      | ((rgba[i][ACOMP] & 0xff)      );
+            }
+         }
+         else if (format == GL_BGRA) {
+            GLuint *dst = (GLuint *) destination;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               dst[i] = ((rgba[i][BCOMP] & 0xff) << 24)
+                      | ((rgba[i][GCOMP] & 0xff) << 16)
+                      | ((rgba[i][RCOMP] & 0xff) <<  8)
+                      | ((rgba[i][ACOMP] & 0xff)      );
+            }
+         }
+         else {
+            GLuint *dst = (GLuint *) destination;
+            GLuint i;
+            ASSERT(format == GL_ABGR_EXT);
+            for (i = 0; i < n; i++) {
+               dst[i] = ((rgba[i][ACOMP] & 0xff) << 24)
+                      | ((rgba[i][BCOMP] & 0xff) << 16)
+                      | ((rgba[i][GCOMP] & 0xff) <<  8)
+                      | ((rgba[i][RCOMP] & 0xff)      );
+            }
+         }
+         break;
+      case GL_UNSIGNED_INT_8_8_8_8_REV:
+         if (format == GL_RGBA) {
+            GLuint *dst = (GLuint *) destination;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               dst[i] = ((rgba[i][ACOMP] & 0xff) << 24)
+                      | ((rgba[i][BCOMP] & 0xff) << 16)
+                      | ((rgba[i][GCOMP] & 0xff) <<  8)
+                      | ((rgba[i][RCOMP] & 0xff)      );
+            }
+         }
+         else if (format == GL_BGRA) {
+            GLuint *dst = (GLuint *) destination;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               dst[i] = ((rgba[i][ACOMP] & 0xff) << 24)
+                      | ((rgba[i][RCOMP] & 0xff) << 16)
+                      | ((rgba[i][GCOMP] & 0xff) <<  8)
+                      | ((rgba[i][BCOMP] & 0xff)      );
+            }
+         }
+         else {
+            GLuint *dst = (GLuint *) destination;
+            GLuint i;
+            ASSERT(format == GL_ABGR_EXT);
+            for (i = 0; i < n; i++) {
+               dst[i] = ((rgba[i][RCOMP] & 0xff) << 24)
+                      | ((rgba[i][GCOMP] & 0xff) << 16)
+                      | ((rgba[i][BCOMP] & 0xff) <<  8)
+                      | ((rgba[i][ACOMP] & 0xff)      );
+            }
+         }
+         break;
+      case GL_UNSIGNED_INT_10_10_10_2:
+         if (format == GL_RGBA) {
+            GLuint *dst = (GLuint *) destination;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               dst[i] = ((rgba[i][RCOMP] & 0x3ff) << 22)
+                      | ((rgba[i][GCOMP] & 0x3ff) << 12)
+                      | ((rgba[i][BCOMP] & 0x3ff) <<  2)
+                      | ((rgba[i][ACOMP] & 0x3)        );
+            }
+         }
+         else if (format == GL_BGRA) {
+            GLuint *dst = (GLuint *) destination;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               dst[i] = ((rgba[i][BCOMP] & 0x3ff) << 22)
+                      | ((rgba[i][GCOMP] & 0x3ff) << 12)
+                      | ((rgba[i][RCOMP] & 0x3ff) <<  2)
+                      | ((rgba[i][ACOMP] & 0x3)        );
+            }
+         }
+         else {
+            GLuint *dst = (GLuint *) destination;
+            GLuint i;
+            ASSERT(format == GL_ABGR_EXT);
+            for (i = 0; i < n; i++) {
+               dst[i] = ((rgba[i][ACOMP] & 0x3ff) << 22)
+                      | ((rgba[i][BCOMP] & 0x3ff) << 12)
+                      | ((rgba[i][GCOMP] & 0x3ff) <<  2)
+                      | ((rgba[i][RCOMP] & 0x3)        );
+            }
+         }
+         break;
+      case GL_UNSIGNED_INT_2_10_10_10_REV:
+         if (format == GL_RGBA) {
+            GLuint *dst = (GLuint *) destination;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               dst[i] = ((rgba[i][ACOMP] & 0x3ff) << 22)
+                      | ((rgba[i][BCOMP] & 0x3ff) << 12)
+                      | ((rgba[i][GCOMP] & 0x3ff) <<  2)
+                      | ((rgba[i][RCOMP] & 0x3)        );
+            }
+         }
+         else if (format == GL_BGRA) {
+            GLuint *dst = (GLuint *) destination;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               dst[i] = ((rgba[i][ACOMP] & 0x3ff) << 22)
+                      | ((rgba[i][RCOMP] & 0x3ff) << 12)
+                      | ((rgba[i][GCOMP] & 0x3ff) <<  2)
+                      | ((rgba[i][BCOMP] & 0x3)        );
+            }
+         }
+         else {
+            GLuint *dst = (GLuint *) destination;
+            GLuint i;
+            ASSERT(format == GL_ABGR_EXT);
+            for (i = 0; i < n; i++) {
+               dst[i] = ((rgba[i][RCOMP] & 0x3ff) << 22)
+                      | ((rgba[i][GCOMP] & 0x3ff) << 12)
+                      | ((rgba[i][BCOMP] & 0x3ff) <<  2)
+                      | ((rgba[i][ACOMP] & 0x3)        );
+            }
+         }
+         break;
+      default:
+         _mesa_problem(ctx, "Bad type in pack_histogram");
+   }
+
+#undef PACK_MACRO
+}
+
+
+/*
+ * Given an internalFormat token passed to glHistogram or glMinMax,
+ * return the corresponding base format.
+ * Return -1 if invalid token.
+ */
+static GLint
+base_histogram_format( GLenum format )
+{
+   switch (format) {
+      case GL_ALPHA:
+      case GL_ALPHA4:
+      case GL_ALPHA8:
+      case GL_ALPHA12:
+      case GL_ALPHA16:
+         return GL_ALPHA;
+      case GL_LUMINANCE:
+      case GL_LUMINANCE4:
+      case GL_LUMINANCE8:
+      case GL_LUMINANCE12:
+      case GL_LUMINANCE16:
+         return GL_LUMINANCE;
+      case GL_LUMINANCE_ALPHA:
+      case GL_LUMINANCE4_ALPHA4:
+      case GL_LUMINANCE6_ALPHA2:
+      case GL_LUMINANCE8_ALPHA8:
+      case GL_LUMINANCE12_ALPHA4:
+      case GL_LUMINANCE12_ALPHA12:
+      case GL_LUMINANCE16_ALPHA16:
+         return GL_LUMINANCE_ALPHA;
+      case GL_RGB:
+      case GL_R3_G3_B2:
+      case GL_RGB4:
+      case GL_RGB5:
+      case GL_RGB8:
+      case GL_RGB10:
+      case GL_RGB12:
+      case GL_RGB16:
+         return GL_RGB;
+      case GL_RGBA:
+      case GL_RGBA2:
+      case GL_RGBA4:
+      case GL_RGB5_A1:
+      case GL_RGBA8:
+      case GL_RGB10_A2:
+      case GL_RGBA12:
+      case GL_RGBA16:
+         return GL_RGBA;
+      default:
+         return -1;  /* error */
+   }
+}
+
+
+
+/**********************************************************************
+ * API functions
+ */
+
+
+void GLAPIENTRY
+_mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetMinmax");
+      return;
+   }
+
+   if (target != GL_MINMAX) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetMinmax(target)");
+      return;
+   }
+
+   if (!_mesa_is_legal_format_and_type(format, type)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetMinmax(format or type)");
+      return;
+   }
+
+   if (type != GL_UNSIGNED_BYTE &&
+       type != GL_BYTE &&
+       type != GL_UNSIGNED_SHORT &&
+       type != GL_SHORT &&
+       type != GL_UNSIGNED_INT &&
+       type != GL_INT &&
+       type != GL_FLOAT &&
+       type != GL_UNSIGNED_BYTE_3_3_2 &&
+       type != GL_UNSIGNED_BYTE_2_3_3_REV &&
+       type != GL_UNSIGNED_SHORT_5_6_5 &&
+       type != GL_UNSIGNED_SHORT_5_6_5_REV &&
+       type != GL_UNSIGNED_SHORT_4_4_4_4 &&
+       type != GL_UNSIGNED_SHORT_4_4_4_4_REV &&
+       type != GL_UNSIGNED_SHORT_5_5_5_1 &&
+       type != GL_UNSIGNED_SHORT_1_5_5_5_REV &&
+       type != GL_UNSIGNED_INT_8_8_8_8 &&
+       type != GL_UNSIGNED_INT_8_8_8_8_REV &&
+       type != GL_UNSIGNED_INT_10_10_10_2 &&
+       type != GL_UNSIGNED_INT_2_10_10_10_REV) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetMinmax(type)");
+      return;
+   }
+
+   if (!values)
+      return;
+
+   {
+      GLfloat minmax[2][4];
+      minmax[0][RCOMP] = CLAMP(ctx->MinMax.Min[RCOMP], 0.0F, 1.0F);
+      minmax[0][GCOMP] = CLAMP(ctx->MinMax.Min[GCOMP], 0.0F, 1.0F);
+      minmax[0][BCOMP] = CLAMP(ctx->MinMax.Min[BCOMP], 0.0F, 1.0F);
+      minmax[0][ACOMP] = CLAMP(ctx->MinMax.Min[ACOMP], 0.0F, 1.0F);
+      minmax[1][RCOMP] = CLAMP(ctx->MinMax.Max[RCOMP], 0.0F, 1.0F);
+      minmax[1][GCOMP] = CLAMP(ctx->MinMax.Max[GCOMP], 0.0F, 1.0F);
+      minmax[1][BCOMP] = CLAMP(ctx->MinMax.Max[BCOMP], 0.0F, 1.0F);
+      minmax[1][ACOMP] = CLAMP(ctx->MinMax.Max[ACOMP], 0.0F, 1.0F);
+      _mesa_pack_float_rgba_span(ctx, 2, (CONST GLfloat (*)[4]) minmax,
+                                 format, type, values, &ctx->Pack, 0);
+   }
+
+   if (reset) {
+      _mesa_ResetMinmax(GL_MINMAX);
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogram");
+      return;
+   }
+
+   if (target != GL_HISTOGRAM) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetHistogram(target)");
+      return;
+   }
+
+   if (!_mesa_is_legal_format_and_type(format, type)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogram(format or type)");
+      return;
+   }
+
+   if (type != GL_UNSIGNED_BYTE &&
+       type != GL_BYTE &&
+       type != GL_UNSIGNED_SHORT &&
+       type != GL_SHORT &&
+       type != GL_UNSIGNED_INT &&
+       type != GL_INT &&
+       type != GL_FLOAT &&
+       type != GL_UNSIGNED_BYTE_3_3_2 &&
+       type != GL_UNSIGNED_BYTE_2_3_3_REV &&
+       type != GL_UNSIGNED_SHORT_5_6_5 &&
+       type != GL_UNSIGNED_SHORT_5_6_5_REV &&
+       type != GL_UNSIGNED_SHORT_4_4_4_4 &&
+       type != GL_UNSIGNED_SHORT_4_4_4_4_REV &&
+       type != GL_UNSIGNED_SHORT_5_5_5_1 &&
+       type != GL_UNSIGNED_SHORT_1_5_5_5_REV &&
+       type != GL_UNSIGNED_INT_8_8_8_8 &&
+       type != GL_UNSIGNED_INT_8_8_8_8_REV &&
+       type != GL_UNSIGNED_INT_10_10_10_2 &&
+       type != GL_UNSIGNED_INT_2_10_10_10_REV) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetHistogram(type)");
+      return;
+   }
+
+   if (!values)
+      return;
+
+   pack_histogram(ctx, ctx->Histogram.Width,
+                  (CONST GLuint (*)[4]) ctx->Histogram.Count,
+                  format, type, values, &ctx->Pack);
+
+   if (reset) {
+      GLuint i;
+      for (i = 0; i < HISTOGRAM_TABLE_SIZE; i++) {
+         ctx->Histogram.Count[i][0] = 0;
+         ctx->Histogram.Count[i][1] = 0;
+         ctx->Histogram.Count[i][2] = 0;
+         ctx->Histogram.Count[i][3] = 0;
+      }
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogramParameterfv");
+      return;
+   }
+
+   if (target != GL_HISTOGRAM && target != GL_PROXY_HISTOGRAM) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetHistogramParameterfv(target)");
+      return;
+   }
+
+   switch (pname) {
+      case GL_HISTOGRAM_WIDTH:
+         *params = (GLfloat) ctx->Histogram.Width;
+         break;
+      case GL_HISTOGRAM_FORMAT:
+         *params = (GLfloat) ctx->Histogram.Format;
+         break;
+      case GL_HISTOGRAM_RED_SIZE:
+         *params = (GLfloat) ctx->Histogram.RedSize;
+         break;
+      case GL_HISTOGRAM_GREEN_SIZE:
+         *params = (GLfloat) ctx->Histogram.GreenSize;
+         break;
+      case GL_HISTOGRAM_BLUE_SIZE:
+         *params = (GLfloat) ctx->Histogram.BlueSize;
+         break;
+      case GL_HISTOGRAM_ALPHA_SIZE:
+         *params = (GLfloat) ctx->Histogram.AlphaSize;
+         break;
+      case GL_HISTOGRAM_LUMINANCE_SIZE:
+         *params = (GLfloat) ctx->Histogram.LuminanceSize;
+         break;
+      case GL_HISTOGRAM_SINK:
+         *params = (GLfloat) ctx->Histogram.Sink;
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetHistogramParameterfv(pname)");
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogramParameteriv");
+      return;
+   }
+
+   if (target != GL_HISTOGRAM && target != GL_PROXY_HISTOGRAM) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetHistogramParameteriv(target)");
+      return;
+   }
+
+   switch (pname) {
+      case GL_HISTOGRAM_WIDTH:
+         *params = (GLint) ctx->Histogram.Width;
+         break;
+      case GL_HISTOGRAM_FORMAT:
+         *params = (GLint) ctx->Histogram.Format;
+         break;
+      case GL_HISTOGRAM_RED_SIZE:
+         *params = (GLint) ctx->Histogram.RedSize;
+         break;
+      case GL_HISTOGRAM_GREEN_SIZE:
+         *params = (GLint) ctx->Histogram.GreenSize;
+         break;
+      case GL_HISTOGRAM_BLUE_SIZE:
+         *params = (GLint) ctx->Histogram.BlueSize;
+         break;
+      case GL_HISTOGRAM_ALPHA_SIZE:
+         *params = (GLint) ctx->Histogram.AlphaSize;
+         break;
+      case GL_HISTOGRAM_LUMINANCE_SIZE:
+         *params = (GLint) ctx->Histogram.LuminanceSize;
+         break;
+      case GL_HISTOGRAM_SINK:
+         *params = (GLint) ctx->Histogram.Sink;
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetHistogramParameteriv(pname)");
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetMinmaxParameterfv");
+      return;
+   }
+   if (target != GL_MINMAX) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetMinmaxParameterfv(target)");
+      return;
+   }
+   if (pname == GL_MINMAX_FORMAT) {
+      *params = (GLfloat) ctx->MinMax.Format;
+   }
+   else if (pname == GL_MINMAX_SINK) {
+      *params = (GLfloat) ctx->MinMax.Sink;
+   }
+   else {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetMinMaxParameterfv(pname)");
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetMinmaxParameteriv");
+      return;
+   }
+   if (target != GL_MINMAX) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetMinmaxParameteriv(target)");
+      return;
+   }
+   if (pname == GL_MINMAX_FORMAT) {
+      *params = (GLint) ctx->MinMax.Format;
+   }
+   else if (pname == GL_MINMAX_SINK) {
+      *params = (GLint) ctx->MinMax.Sink;
+   }
+   else {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetMinMaxParameteriv(pname)");
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_Histogram(GLenum target, GLsizei width, GLenum internalFormat, GLboolean sink)
+{
+   GLuint i;
+   GLboolean error = GL_FALSE;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* sideeffects */
+
+   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glHistogram");
+      return;
+   }
+
+   if (target != GL_HISTOGRAM && target != GL_PROXY_HISTOGRAM) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glHistogram(target)");
+      return;
+   }
+
+   if (width < 0 || width > HISTOGRAM_TABLE_SIZE) {
+      if (target == GL_PROXY_HISTOGRAM) {
+         error = GL_TRUE;
+      }
+      else {
+         if (width < 0)
+            _mesa_error(ctx, GL_INVALID_VALUE, "glHistogram(width)");
+         else
+            _mesa_error(ctx, GL_TABLE_TOO_LARGE, "glHistogram(width)");
+         return;
+      }
+   }
+
+   if (width != 0 && _mesa_bitcount(width) != 1) {
+      if (target == GL_PROXY_HISTOGRAM) {
+         error = GL_TRUE;
+      }
+      else {
+         _mesa_error(ctx, GL_INVALID_VALUE, "glHistogram(width)");
+         return;
+      }
+   }
+
+   if (base_histogram_format(internalFormat) < 0) {
+      if (target == GL_PROXY_HISTOGRAM) {
+         error = GL_TRUE;
+      }
+      else {
+         _mesa_error(ctx, GL_INVALID_ENUM, "glHistogram(internalFormat)");
+         return;
+      }
+   }
+
+   /* reset histograms */
+   for (i = 0; i < HISTOGRAM_TABLE_SIZE; i++) {
+      ctx->Histogram.Count[i][0] = 0;
+      ctx->Histogram.Count[i][1] = 0;
+      ctx->Histogram.Count[i][2] = 0;
+      ctx->Histogram.Count[i][3] = 0;
+   }
+
+   if (error) {
+      ctx->Histogram.Width = 0;
+      ctx->Histogram.Format = 0;
+      ctx->Histogram.RedSize       = 0;
+      ctx->Histogram.GreenSize     = 0;
+      ctx->Histogram.BlueSize      = 0;
+      ctx->Histogram.AlphaSize     = 0;
+      ctx->Histogram.LuminanceSize = 0;
+   }
+   else {
+      ctx->Histogram.Width = width;
+      ctx->Histogram.Format = internalFormat;
+      ctx->Histogram.Sink = sink;
+      ctx->Histogram.RedSize       = 8 * sizeof(GLuint);
+      ctx->Histogram.GreenSize     = 8 * sizeof(GLuint);
+      ctx->Histogram.BlueSize      = 8 * sizeof(GLuint);
+      ctx->Histogram.AlphaSize     = 8 * sizeof(GLuint);
+      ctx->Histogram.LuminanceSize = 8 * sizeof(GLuint);
+   }
+
+   ctx->NewState |= _NEW_PIXEL;
+}
+
+
+void GLAPIENTRY
+_mesa_Minmax(GLenum target, GLenum internalFormat, GLboolean sink)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glMinmax");
+      return;
+   }
+
+   if (target != GL_MINMAX) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glMinMax(target)");
+      return;
+   }
+
+   if (base_histogram_format(internalFormat) < 0) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glMinMax(internalFormat)");
+      return;
+   }
+
+   if (ctx->MinMax.Sink == sink)
+      return;
+   FLUSH_VERTICES(ctx, _NEW_PIXEL);
+   ctx->MinMax.Sink = sink;
+}
+
+
+void GLAPIENTRY
+_mesa_ResetHistogram(GLenum target)
+{
+   GLuint i;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* sideeffects */
+
+   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glResetHistogram");
+      return;
+   }
+
+   if (target != GL_HISTOGRAM) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glResetHistogram(target)");
+      return;
+   }
+
+   for (i = 0; i < HISTOGRAM_TABLE_SIZE; i++) {
+      ctx->Histogram.Count[i][0] = 0;
+      ctx->Histogram.Count[i][1] = 0;
+      ctx->Histogram.Count[i][2] = 0;
+      ctx->Histogram.Count[i][3] = 0;
+   }
+
+   ctx->NewState |= _NEW_PIXEL;
+}
+
+
+void GLAPIENTRY
+_mesa_ResetMinmax(GLenum target)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glResetMinmax");
+      return;
+   }
+
+   if (target != GL_MINMAX) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glResetMinMax(target)");
+      return;
+   }
+
+   ctx->MinMax.Min[RCOMP] = 1000;    ctx->MinMax.Max[RCOMP] = -1000;
+   ctx->MinMax.Min[GCOMP] = 1000;    ctx->MinMax.Max[GCOMP] = -1000;
+   ctx->MinMax.Min[BCOMP] = 1000;    ctx->MinMax.Max[BCOMP] = -1000;
+   ctx->MinMax.Min[ACOMP] = 1000;    ctx->MinMax.Max[ACOMP] = -1000;
+   ctx->NewState |= _NEW_PIXEL;
+}
+
+
+
+/**********************************************************************/
+/*****                      Initialization                        *****/
+/**********************************************************************/
+
+void _mesa_init_histogram( GLcontext * ctx )
+{
+   int i;
+
+   /* Histogram group */
+   ctx->Histogram.Width = 0;
+   ctx->Histogram.Format = GL_RGBA;
+   ctx->Histogram.Sink = GL_FALSE;
+   ctx->Histogram.RedSize       = 0;
+   ctx->Histogram.GreenSize     = 0;
+   ctx->Histogram.BlueSize      = 0;
+   ctx->Histogram.AlphaSize     = 0;
+   ctx->Histogram.LuminanceSize = 0;
+   for (i = 0; i < HISTOGRAM_TABLE_SIZE; i++) {
+      ctx->Histogram.Count[i][0] = 0;
+      ctx->Histogram.Count[i][1] = 0;
+      ctx->Histogram.Count[i][2] = 0;
+      ctx->Histogram.Count[i][3] = 0;
+   }
+
+   /* Min/Max group */
+   ctx->MinMax.Format = GL_RGBA;
+   ctx->MinMax.Sink = GL_FALSE;
+   ctx->MinMax.Min[RCOMP] = 1000;    ctx->MinMax.Max[RCOMP] = -1000;
+   ctx->MinMax.Min[GCOMP] = 1000;    ctx->MinMax.Max[GCOMP] = -1000;
+   ctx->MinMax.Min[BCOMP] = 1000;    ctx->MinMax.Max[BCOMP] = -1000;
+   ctx->MinMax.Min[ACOMP] = 1000;    ctx->MinMax.Max[ACOMP] = -1000;
+}
diff --git a/reactos/lib/mesa32/src/main/histogram.h b/reactos/lib/mesa32/src/main/histogram.h
new file mode 100644
index 00000000000..974447231dd
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/histogram.h
@@ -0,0 +1,89 @@
+/**
+ * \file histogram.h
+ * Histogram.
+ * 
+ * \if subset
+ * (No-op)
+ *
+ * \endif
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef HISTOGRAM_H
+#define HISTOGRAM_H
+
+#include "glheader.h"
+#include "mtypes.h"
+
+#if _HAVE_FULL_GL
+
+extern void GLAPIENTRY 
+_mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum types, GLvoid *values);
+
+extern void GLAPIENTRY 
+_mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+
+extern void GLAPIENTRY 
+_mesa_GetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params);
+
+extern void GLAPIENTRY 
+_mesa_GetHistogramParameteriv(GLenum target, GLenum pname, GLint *params);
+
+extern void GLAPIENTRY 
+_mesa_GetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params);
+
+extern void GLAPIENTRY 
+_mesa_GetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params);
+
+extern void GLAPIENTRY 
+_mesa_Histogram(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+
+extern void GLAPIENTRY 
+_mesa_Minmax(GLenum target, GLenum internalformat, GLboolean sink);
+
+extern void GLAPIENTRY 
+_mesa_ResetHistogram(GLenum target);
+
+extern void GLAPIENTRY 
+_mesa_ResetMinmax(GLenum target);
+
+extern void
+_mesa_update_minmax(GLcontext *ctx, GLuint n, const GLfloat rgba[][4]);
+
+extern void
+_mesa_update_histogram(GLcontext *ctx, GLuint n, const GLfloat rgba[][4]);
+
+extern void _mesa_init_histogram( GLcontext * ctx );
+
+#else
+
+/** No-op */
+#define _mesa_init_histogram( c ) ((void) 0)
+
+#endif
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/image.c b/reactos/lib/mesa32/src/main/image.c
new file mode 100644
index 00000000000..648ad8fe34b
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/image.c
@@ -0,0 +1,4136 @@
+/**
+ * \file image.c
+ * Image handling.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "colormac.h"
+#include "context.h"
+#include "image.h"
+#include "imports.h"
+#include "histogram.h"
+#include "macros.h"
+#include "pixel.h"
+#include "mtypes.h"
+
+
+/** Compute ceiling of integer quotient of A divided by B. */
+#define CEILING( A, B )  ( (A) % (B) == 0 ? (A)/(B) : (A)/(B)+1 )
+
+
+/**
+ * Image packing parameters for Mesa's internal images.
+ * 
+ * _mesa_unpack_image() returns image data in this format.  When we execute
+ * image commands (glDrawPixels(), glTexImage(), etc) from within display lists
+ * we have to be sure to set the current unpacking parameters to these values!
+ */
+const struct gl_pixelstore_attrib _mesa_native_packing = {
+   1,            /* Alignment */
+   0,            /* RowLength */
+   0,            /* SkipPixels */
+   0,            /* SkipRows */
+   0,            /* ImageHeight */
+   0,            /* SkipImages */
+   GL_FALSE,     /* SwapBytes */
+   GL_FALSE,     /* LsbFirst */
+   GL_FALSE,     /* ClientStorage */
+   GL_FALSE      /* Invert */
+};
+
+
+/**
+ * Flip the 8 bits in each byte of the given array.
+ *
+ * \param p array.
+ * \param n number of bytes.
+ *
+ * \todo try this trick to flip bytes someday:
+ * \code
+ *  v = ((v & 0x55555555) << 1) | ((v >> 1) & 0x55555555);
+ *  v = ((v & 0x33333333) << 2) | ((v >> 2) & 0x33333333);
+ *  v = ((v & 0x0f0f0f0f) << 4) | ((v >> 4) & 0x0f0f0f0f);
+ * \endcode
+ */
+static void
+flip_bytes( GLubyte *p, GLuint n )
+{
+   register GLuint i, a, b;
+
+   for (i=0;i<n;i++) {
+      b = (GLuint) p[i];        /* words are often faster than bytes */
+      a = ((b & 0x01) << 7) |
+	  ((b & 0x02) << 5) |
+	  ((b & 0x04) << 3) |
+	  ((b & 0x08) << 1) |
+	  ((b & 0x10) >> 1) |
+	  ((b & 0x20) >> 3) |
+	  ((b & 0x40) >> 5) |
+	  ((b & 0x80) >> 7);
+      p[i] = (GLubyte) a;
+   }
+}
+
+
+/**
+ * Flip the order of the 2 bytes in each word in the given array.
+ *
+ * \param p array.
+ * \param n number of words.
+ */
+void
+_mesa_swap2( GLushort *p, GLuint n )
+{
+   register GLuint i;
+
+   for (i=0;i<n;i++) {
+      p[i] = (p[i] >> 8) | ((p[i] << 8) & 0xff00);
+   }
+}
+
+
+
+/*
+ * Flip the order of the 4 bytes in each word in the given array.
+ */
+void
+_mesa_swap4( GLuint *p, GLuint n )
+{
+   register GLuint i, a, b;
+
+   for (i=0;i<n;i++) {
+      b = p[i];
+      a =  (b >> 24)
+	| ((b >> 8) & 0xff00)
+	| ((b << 8) & 0xff0000)
+	| ((b << 24) & 0xff000000);
+      p[i] = a;
+   }
+}
+
+
+/**
+ * Get the size of a GL data type.
+ *
+ * \param type GL data type.
+ *
+ * \return the size, in bytes, of the given data type, 0 if a GL_BITMAP, or -1
+ * if an invalid type enum.
+ */
+GLint _mesa_sizeof_type( GLenum type )
+{
+   switch (type) {
+      case GL_BITMAP:
+	 return 0;
+      case GL_UNSIGNED_BYTE:
+         return sizeof(GLubyte);
+      case GL_BYTE:
+	 return sizeof(GLbyte);
+      case GL_UNSIGNED_SHORT:
+	 return sizeof(GLushort);
+      case GL_SHORT:
+	 return sizeof(GLshort);
+      case GL_UNSIGNED_INT:
+	 return sizeof(GLuint);
+      case GL_INT:
+	 return sizeof(GLint);
+      case GL_FLOAT:
+	 return sizeof(GLfloat);
+      case GL_HALF_FLOAT_NV:
+	 return sizeof(GLhalfNV);
+      default:
+         return -1;
+   }
+}
+
+
+/**
+ * Same as _mesa_sizeof_type() but also accepting the packed pixel
+ * format data types.
+ */
+GLint _mesa_sizeof_packed_type( GLenum type )
+{
+   switch (type) {
+      case GL_BITMAP:
+	 return 0;
+      case GL_UNSIGNED_BYTE:
+         return sizeof(GLubyte);
+      case GL_BYTE:
+	 return sizeof(GLbyte);
+      case GL_UNSIGNED_SHORT:
+	 return sizeof(GLushort);
+      case GL_SHORT:
+	 return sizeof(GLshort);
+      case GL_UNSIGNED_INT:
+	 return sizeof(GLuint);
+      case GL_INT:
+	 return sizeof(GLint);
+      case GL_HALF_FLOAT_NV:
+	 return sizeof(GLhalfNV);
+      case GL_FLOAT:
+	 return sizeof(GLfloat);
+      case GL_UNSIGNED_BYTE_3_3_2:
+         return sizeof(GLubyte);
+      case GL_UNSIGNED_BYTE_2_3_3_REV:
+         return sizeof(GLubyte);
+      case GL_UNSIGNED_SHORT_5_6_5:
+         return sizeof(GLushort);
+      case GL_UNSIGNED_SHORT_5_6_5_REV:
+         return sizeof(GLushort);
+      case GL_UNSIGNED_SHORT_4_4_4_4:
+         return sizeof(GLushort);
+      case GL_UNSIGNED_SHORT_4_4_4_4_REV:
+         return sizeof(GLushort);
+      case GL_UNSIGNED_SHORT_5_5_5_1:
+         return sizeof(GLushort);
+      case GL_UNSIGNED_SHORT_1_5_5_5_REV:
+         return sizeof(GLushort);
+      case GL_UNSIGNED_INT_8_8_8_8:
+         return sizeof(GLuint);
+      case GL_UNSIGNED_INT_8_8_8_8_REV:
+         return sizeof(GLuint);
+      case GL_UNSIGNED_INT_10_10_10_2:
+         return sizeof(GLuint);
+      case GL_UNSIGNED_INT_2_10_10_10_REV:
+         return sizeof(GLuint);
+      case GL_UNSIGNED_SHORT_8_8_MESA:
+      case GL_UNSIGNED_SHORT_8_8_REV_MESA:
+          return sizeof(GLushort);      
+      default:
+         return -1;
+   }
+}
+
+
+/**
+ * Get the number of components in a pixel format.
+ *
+ * \param format pixel format.
+ *
+ * \return the number of components in the given format, or -1 if a bad format.
+ */
+GLint _mesa_components_in_format( GLenum format )
+{
+   switch (format) {
+      case GL_COLOR_INDEX:
+      case GL_COLOR_INDEX1_EXT:
+      case GL_COLOR_INDEX2_EXT:
+      case GL_COLOR_INDEX4_EXT:
+      case GL_COLOR_INDEX8_EXT:
+      case GL_COLOR_INDEX12_EXT:
+      case GL_COLOR_INDEX16_EXT:
+      case GL_STENCIL_INDEX:
+      case GL_DEPTH_COMPONENT:
+      case GL_RED:
+      case GL_GREEN:
+      case GL_BLUE:
+      case GL_ALPHA:
+      case GL_LUMINANCE:
+      case GL_INTENSITY:
+         return 1;
+      case GL_LUMINANCE_ALPHA:
+	 return 2;
+      case GL_RGB:
+	 return 3;
+      case GL_RGBA:
+	 return 4;
+      case GL_BGR:
+	 return 3;
+      case GL_BGRA:
+	 return 4;
+      case GL_ABGR_EXT:
+         return 4;
+      case GL_YCBCR_MESA:
+         return 2;
+      default:
+         return -1;
+   }
+}
+
+
+/**
+ * Get the bytes per pixel of pixel format type pair.
+ *
+ * \param format pixel format.
+ * \param type pixel type.
+ *
+ * \return bytes per pixel, or -1 if a bad format or type was given.
+ */
+GLint _mesa_bytes_per_pixel( GLenum format, GLenum type )
+{
+   GLint comps = _mesa_components_in_format( format );
+   if (comps < 0)
+      return -1;
+
+   switch (type) {
+      case GL_BITMAP:
+         return 0;  /* special case */
+      case GL_BYTE:
+      case GL_UNSIGNED_BYTE:
+         return comps * sizeof(GLubyte);
+      case GL_SHORT:
+      case GL_UNSIGNED_SHORT:
+         return comps * sizeof(GLshort);
+      case GL_INT:
+      case GL_UNSIGNED_INT:
+         return comps * sizeof(GLint);
+      case GL_FLOAT:
+         return comps * sizeof(GLfloat);
+      case GL_HALF_FLOAT_NV:
+         return comps * sizeof(GLhalfNV);
+      case GL_UNSIGNED_BYTE_3_3_2:
+      case GL_UNSIGNED_BYTE_2_3_3_REV:
+         if (format == GL_RGB || format == GL_BGR)
+            return sizeof(GLubyte);
+         else
+            return -1;  /* error */
+      case GL_UNSIGNED_SHORT_5_6_5:
+      case GL_UNSIGNED_SHORT_5_6_5_REV:
+         if (format == GL_RGB || format == GL_BGR)
+            return sizeof(GLushort);
+         else
+            return -1;  /* error */
+      case GL_UNSIGNED_SHORT_4_4_4_4:
+      case GL_UNSIGNED_SHORT_4_4_4_4_REV:
+      case GL_UNSIGNED_SHORT_5_5_5_1:
+      case GL_UNSIGNED_SHORT_1_5_5_5_REV:
+         if (format == GL_RGBA || format == GL_BGRA || format == GL_ABGR_EXT)
+            return sizeof(GLushort);
+         else
+            return -1;
+      case GL_UNSIGNED_INT_8_8_8_8:
+      case GL_UNSIGNED_INT_8_8_8_8_REV:
+      case GL_UNSIGNED_INT_10_10_10_2:
+      case GL_UNSIGNED_INT_2_10_10_10_REV:
+         if (format == GL_RGBA || format == GL_BGRA || format == GL_ABGR_EXT)
+            return sizeof(GLuint);
+         else
+            return -1;
+      case GL_UNSIGNED_SHORT_8_8_MESA:
+      case GL_UNSIGNED_SHORT_8_8_REV_MESA:
+         if (format == GL_YCBCR_MESA)
+            return sizeof(GLushort);
+         else
+            return -1;
+      default:
+         return -1;
+   }
+}
+
+
+/**
+ * Test for a legal pixel format and type.
+ *
+ * \param format pixel format.
+ * \param type pixel type.
+ *
+ * \return GL_TRUE if the given pixel format and type are legal, or GL_FALSE
+ * otherwise.
+ */
+GLboolean
+_mesa_is_legal_format_and_type( GLenum format, GLenum type )
+{
+   switch (format) {
+      case GL_COLOR_INDEX:
+      case GL_STENCIL_INDEX:
+         switch (type) {
+            case GL_BITMAP:
+            case GL_BYTE:
+            case GL_UNSIGNED_BYTE:
+            case GL_SHORT:
+            case GL_UNSIGNED_SHORT:
+            case GL_INT:
+            case GL_UNSIGNED_INT:
+            case GL_FLOAT:
+            case GL_HALF_FLOAT_NV:
+               return GL_TRUE;
+            default:
+               return GL_FALSE;
+         }
+      case GL_RED:
+      case GL_GREEN:
+      case GL_BLUE:
+      case GL_ALPHA:
+      case GL_INTENSITY:
+      case GL_LUMINANCE:
+      case GL_LUMINANCE_ALPHA:
+      case GL_DEPTH_COMPONENT:
+         switch (type) {
+            case GL_BYTE:
+            case GL_UNSIGNED_BYTE:
+            case GL_SHORT:
+            case GL_UNSIGNED_SHORT:
+            case GL_INT:
+            case GL_UNSIGNED_INT:
+            case GL_FLOAT:
+            case GL_HALF_FLOAT_NV:
+               return GL_TRUE;
+            default:
+               return GL_FALSE;
+         }
+      case GL_RGB:
+      case GL_BGR:
+         switch (type) {
+            case GL_BYTE:
+            case GL_UNSIGNED_BYTE:
+            case GL_SHORT:
+            case GL_UNSIGNED_SHORT:
+            case GL_INT:
+            case GL_UNSIGNED_INT:
+            case GL_FLOAT:
+            case GL_HALF_FLOAT_NV:
+            case GL_UNSIGNED_BYTE_3_3_2:
+            case GL_UNSIGNED_BYTE_2_3_3_REV:
+            case GL_UNSIGNED_SHORT_5_6_5:
+            case GL_UNSIGNED_SHORT_5_6_5_REV:
+               return GL_TRUE;
+            default:
+               return GL_FALSE;
+         }
+      case GL_RGBA:
+      case GL_BGRA:
+      case GL_ABGR_EXT:
+         switch (type) {
+            case GL_BYTE:
+            case GL_UNSIGNED_BYTE:
+            case GL_SHORT:
+            case GL_UNSIGNED_SHORT:
+            case GL_INT:
+            case GL_UNSIGNED_INT:
+            case GL_FLOAT:
+            case GL_HALF_FLOAT_NV:
+            case GL_UNSIGNED_SHORT_4_4_4_4:
+            case GL_UNSIGNED_SHORT_4_4_4_4_REV:
+            case GL_UNSIGNED_SHORT_5_5_5_1:
+            case GL_UNSIGNED_SHORT_1_5_5_5_REV:
+            case GL_UNSIGNED_INT_8_8_8_8:
+            case GL_UNSIGNED_INT_8_8_8_8_REV:
+            case GL_UNSIGNED_INT_10_10_10_2:
+            case GL_UNSIGNED_INT_2_10_10_10_REV:
+               return GL_TRUE;
+            default:
+               return GL_FALSE;
+         }
+      case GL_YCBCR_MESA:
+         if (type == GL_UNSIGNED_SHORT_8_8_MESA ||
+             type == GL_UNSIGNED_SHORT_8_8_REV_MESA)
+            return GL_TRUE;
+         else
+            return GL_FALSE;
+      default:
+         ; /* fall-through */
+   }
+   return GL_FALSE;
+}
+
+
+/**
+ * Get the address of a pixel in an image (actually a volume).
+ *
+ * Pixel unpacking/packing parameters are observed according to \p packing.
+ *
+ * \param image start of image data.
+ * \param width image width.
+ * \param height image height.
+ * \param format pixel format.
+ * \param type pixel data type.
+ * \param packing the pixelstore attributes
+ * \param img which image in the volume (0 for 1D or 2D images)
+ * \param row of pixel in the image
+ * \param column of pixel in the image
+ * 
+ * \return address of pixel on success, or NULL on error.
+ *
+ * According to the \p packing information calculates the number of pixel/bytes
+ * per row/image and refers it.
+ *
+ * \sa gl_pixelstore_attrib.
+ */
+GLvoid *
+_mesa_image_address( const struct gl_pixelstore_attrib *packing,
+                     const GLvoid *image, GLsizei width,
+                     GLsizei height, GLenum format, GLenum type,
+                     GLint img, GLint row, GLint column )
+{
+   GLint alignment;        /* 1, 2 or 4 */
+   GLint pixels_per_row;
+   GLint rows_per_image;
+   GLint skiprows;
+   GLint skippixels;
+   GLint skipimages;       /* for 3-D volume images */
+   GLubyte *pixel_addr;
+
+   alignment = packing->Alignment;
+   if (packing->RowLength > 0) {
+      pixels_per_row = packing->RowLength;
+   }
+   else {
+      pixels_per_row = width;
+   }
+   if (packing->ImageHeight > 0) {
+      rows_per_image = packing->ImageHeight;
+   }
+   else {
+      rows_per_image = height;
+   }
+   skiprows = packing->SkipRows;
+   skippixels = packing->SkipPixels;
+   skipimages = packing->SkipImages;
+
+   if (type==GL_BITMAP) {
+      /* BITMAP data */
+      GLint comp_per_pixel;   /* components per pixel */
+      GLint bytes_per_comp;   /* bytes per component */
+      GLint bytes_per_row;
+      GLint bytes_per_image;
+
+      /* Compute bytes per component */
+      bytes_per_comp = _mesa_sizeof_packed_type( type );
+      if (bytes_per_comp<0) {
+         return NULL;
+      }
+
+      /* Compute number of components per pixel */
+      comp_per_pixel = _mesa_components_in_format( format );
+      if (comp_per_pixel<0 && type != GL_BITMAP) {
+         return NULL;
+      }
+
+      bytes_per_row = alignment
+                    * CEILING( comp_per_pixel*pixels_per_row, 8*alignment );
+
+      bytes_per_image = bytes_per_row * rows_per_image;
+
+      pixel_addr = (GLubyte *) image
+                 + (skipimages + img) * bytes_per_image
+                 + (skiprows + row) * bytes_per_row
+                 + (skippixels + column) / 8;
+   }
+   else {
+      /* Non-BITMAP data */
+      GLint bytes_per_pixel, bytes_per_row, remainder, bytes_per_image;
+      GLint topOfImage;
+
+      bytes_per_pixel = _mesa_bytes_per_pixel( format, type );
+
+      /* The pixel type and format should have been error checked earlier */
+      assert(bytes_per_pixel > 0);
+
+      bytes_per_row = pixels_per_row * bytes_per_pixel;
+      remainder = bytes_per_row % alignment;
+      if (remainder > 0)
+         bytes_per_row += (alignment - remainder);
+
+      ASSERT(bytes_per_row % alignment == 0);
+
+      bytes_per_image = bytes_per_row * rows_per_image;
+
+      if (packing->Invert) {
+         /* set pixel_addr to the last row */
+         topOfImage = bytes_per_row * (height - 1);
+         bytes_per_row = -bytes_per_row;
+      }
+      else {
+         topOfImage = 0;
+      }
+
+      /* compute final pixel address */
+      pixel_addr = (GLubyte *) image
+                 + (skipimages + img) * bytes_per_image
+                 + topOfImage
+                 + (skiprows + row) * bytes_per_row
+                 + (skippixels + column) * bytes_per_pixel;
+   }
+
+   return (GLvoid *) pixel_addr;
+}
+
+
+/**
+ * Compute the stride between image rows.
+ *
+ * \param packing the pixelstore attributes
+ * \param width image width.
+ * \param format pixel format.
+ * \param type pixel data type.
+ * 
+ * \return the stride in bytes for the given parameters.
+ *
+ * Computes the number of bytes per pixel and row and compensates for alignment.
+ *
+ * \sa gl_pixelstore_attrib.
+ */
+GLint
+_mesa_image_row_stride( const struct gl_pixelstore_attrib *packing,
+                        GLint width, GLenum format, GLenum type )
+{
+   ASSERT(packing);
+   if (type == GL_BITMAP) {
+      /* BITMAP data */
+      GLint bytes;
+      if (packing->RowLength == 0) {
+         bytes = (width + 7) / 8;
+      }
+      else {
+         bytes = (packing->RowLength + 7) / 8;
+      }
+      if (packing->Invert) {
+         /* negate the bytes per row (negative row stride) */
+         bytes = -bytes;
+      }
+      return bytes;
+   }
+   else {
+      /* Non-BITMAP data */
+      const GLint bytesPerPixel = _mesa_bytes_per_pixel(format, type);
+      GLint bytesPerRow, remainder;
+      if (bytesPerPixel <= 0)
+         return -1;  /* error */
+      if (packing->RowLength == 0) {
+         bytesPerRow = bytesPerPixel * width;
+      }
+      else {
+         bytesPerRow = bytesPerPixel * packing->RowLength;
+      }
+      remainder = bytesPerRow % packing->Alignment;
+      if (remainder > 0)
+         bytesPerRow += (packing->Alignment - remainder);
+      if (packing->Invert)
+         bytesPerRow = -bytesPerRow;
+      return bytesPerRow;
+   }
+}
+
+
+#if _HAVE_FULL_GL
+
+/*
+ * Compute the stride between images in a 3D texture (in bytes) for the given
+ * pixel packing parameters and image width, format and type.
+ */
+GLint
+_mesa_image_image_stride( const struct gl_pixelstore_attrib *packing,
+                          GLint width, GLint height,
+                          GLenum format, GLenum type )
+{
+   ASSERT(packing);
+   ASSERT(type != GL_BITMAP);
+
+   {
+      const GLint bytesPerPixel = _mesa_bytes_per_pixel(format, type);
+      GLint bytesPerRow, bytesPerImage, remainder;
+
+      if (bytesPerPixel <= 0)
+         return -1;  /* error */
+      if (packing->RowLength == 0) {
+         bytesPerRow = bytesPerPixel * width;
+      }
+      else {
+         bytesPerRow = bytesPerPixel * packing->RowLength;
+      }
+      remainder = bytesPerRow % packing->Alignment;
+      if (remainder > 0)
+         bytesPerRow += (packing->Alignment - remainder);
+
+      if (packing->ImageHeight == 0)
+         bytesPerImage = bytesPerRow * height;
+      else
+         bytesPerImage = bytesPerRow * packing->ImageHeight;
+
+      return bytesPerImage;
+   }
+}
+
+
+/*
+ * Unpack a 32x32 pixel polygon stipple from user memory using the
+ * current pixel unpack settings.
+ */
+void
+_mesa_unpack_polygon_stipple( const GLubyte *pattern, GLuint dest[32],
+                              const struct gl_pixelstore_attrib *unpacking )
+{
+   GLubyte *ptrn = (GLubyte *) _mesa_unpack_bitmap( 32, 32, pattern, unpacking );
+   if (ptrn) {
+      /* Convert pattern from GLubytes to GLuints and handle big/little
+       * endian differences
+       */
+      GLubyte *p = ptrn;
+      GLint i;
+      for (i = 0; i < 32; i++) {
+         dest[i] = (p[0] << 24)
+                 | (p[1] << 16)
+                 | (p[2] <<  8)
+                 | (p[3]      );
+         p += 4;
+      }
+      FREE(ptrn);
+   }
+}
+
+
+/*
+ * Pack polygon stipple into user memory given current pixel packing
+ * settings.
+ */
+void
+_mesa_pack_polygon_stipple( const GLuint pattern[32], GLubyte *dest,
+                            const struct gl_pixelstore_attrib *packing )
+{
+   /* Convert pattern from GLuints to GLubytes to handle big/little
+    * endian differences.
+    */
+   GLubyte ptrn[32*4];
+   GLint i;
+   for (i = 0; i < 32; i++) {
+      ptrn[i * 4 + 0] = (GLubyte) ((pattern[i] >> 24) & 0xff);
+      ptrn[i * 4 + 1] = (GLubyte) ((pattern[i] >> 16) & 0xff);
+      ptrn[i * 4 + 2] = (GLubyte) ((pattern[i] >> 8 ) & 0xff);
+      ptrn[i * 4 + 3] = (GLubyte) ((pattern[i]      ) & 0xff);
+   }
+
+   _mesa_pack_bitmap(32, 32, ptrn, dest, packing);
+}
+
+
+/*
+ * Unpack bitmap data.  Resulting data will be in most-significant-bit-first
+ * order with row alignment = 1 byte.
+ */
+GLvoid *
+_mesa_unpack_bitmap( GLint width, GLint height, const GLubyte *pixels,
+                     const struct gl_pixelstore_attrib *packing )
+{
+   GLint bytes, row, width_in_bytes;
+   GLubyte *buffer, *dst;
+
+   if (!pixels)
+      return NULL;
+
+   /* Alloc dest storage */
+   bytes = ((width + 7) / 8 * height);
+   buffer = (GLubyte *) MALLOC( bytes );
+   if (!buffer)
+      return NULL;
+
+
+   width_in_bytes = CEILING( width, 8 );
+   dst = buffer;
+   for (row = 0; row < height; row++) {
+      const GLubyte *src = (const GLubyte *)
+         _mesa_image_address(packing, pixels, width, height,
+                             GL_COLOR_INDEX, GL_BITMAP, 0, row, 0);
+      if (!src) {
+         FREE(buffer);
+         return NULL;
+      }
+
+      if (packing->SkipPixels == 0) {
+         MEMCPY( dst, src, width_in_bytes );
+         if (packing->LsbFirst) {
+            flip_bytes( dst, width_in_bytes );
+         }
+      }
+      else {
+         /* handling SkipPixels is a bit tricky (no pun intended!) */
+         GLint i;
+         if (packing->LsbFirst) {
+            GLubyte srcMask = 1 << (packing->SkipPixels & 0x7);
+            GLubyte dstMask = 128;
+            const GLubyte *s = src;
+            GLubyte *d = dst;
+            *d = 0;
+            for (i = 0; i < width; i++) {
+               if (*s & srcMask) {
+                  *d |= dstMask;
+               }
+               if (srcMask == 128) {
+                  srcMask = 1;
+                  s++;
+               }
+               else {
+                  srcMask = srcMask << 1;
+               }
+               if (dstMask == 1) {
+                  dstMask = 128;
+                  d++;
+                  *d = 0;
+               }
+               else {
+                  dstMask = dstMask >> 1;
+               }
+            }
+         }
+         else {
+            GLubyte srcMask = 128 >> (packing->SkipPixels & 0x7);
+            GLubyte dstMask = 128;
+            const GLubyte *s = src;
+            GLubyte *d = dst;
+            *d = 0;
+            for (i = 0; i < width; i++) {
+               if (*s & srcMask) {
+                  *d |= dstMask;
+               }
+               if (srcMask == 1) {
+                  srcMask = 128;
+                  s++;
+               }
+               else {
+                  srcMask = srcMask >> 1;
+               }
+               if (dstMask == 1) {
+                  dstMask = 128;
+                  d++;
+                  *d = 0;
+               }
+               else {
+                  dstMask = dstMask >> 1;
+               }
+            }
+         }
+      }
+      dst += width_in_bytes;
+   }
+
+   return buffer;
+}
+
+
+/*
+ * Pack bitmap data.
+ */
+void
+_mesa_pack_bitmap( GLint width, GLint height, const GLubyte *source,
+                   GLubyte *dest, const struct gl_pixelstore_attrib *packing )
+{
+   GLint row, width_in_bytes;
+   const GLubyte *src;
+
+   if (!source)
+      return;
+
+   width_in_bytes = CEILING( width, 8 );
+   src = source;
+   for (row = 0; row < height; row++) {
+      GLubyte *dst = (GLubyte *) _mesa_image_address( packing, dest,
+                       width, height, GL_COLOR_INDEX, GL_BITMAP, 0, row, 0 );
+      if (!dst)
+         return;
+
+      if (packing->SkipPixels == 0) {
+         MEMCPY( dst, src, width_in_bytes );
+         if (packing->LsbFirst) {
+            flip_bytes( dst, width_in_bytes );
+         }
+      }
+      else {
+         /* handling SkipPixels is a bit tricky (no pun intended!) */
+         GLint i;
+         if (packing->LsbFirst) {
+            GLubyte srcMask = 1 << (packing->SkipPixels & 0x7);
+            GLubyte dstMask = 128;
+            const GLubyte *s = src;
+            GLubyte *d = dst;
+            *d = 0;
+            for (i = 0; i < width; i++) {
+               if (*s & srcMask) {
+                  *d |= dstMask;
+               }
+               if (srcMask == 128) {
+                  srcMask = 1;
+                  s++;
+               }
+               else {
+                  srcMask = srcMask << 1;
+               }
+               if (dstMask == 1) {
+                  dstMask = 128;
+                  d++;
+                  *d = 0;
+               }
+               else {
+                  dstMask = dstMask >> 1;
+               }
+            }
+         }
+         else {
+            GLubyte srcMask = 128 >> (packing->SkipPixels & 0x7);
+            GLubyte dstMask = 128;
+            const GLubyte *s = src;
+            GLubyte *d = dst;
+            *d = 0;
+            for (i = 0; i < width; i++) {
+               if (*s & srcMask) {
+                  *d |= dstMask;
+               }
+               if (srcMask == 1) {
+                  srcMask = 128;
+                  s++;
+               }
+               else {
+                  srcMask = srcMask >> 1;
+               }
+               if (dstMask == 1) {
+                  dstMask = 128;
+                  d++;
+                  *d = 0;
+               }
+               else {
+                  dstMask = dstMask >> 1;
+               }
+            }
+         }
+      }
+      src += width_in_bytes;
+   }
+}
+
+
+/*
+ * Used to pack an array [][4] of RGBA GLchan colors as specified
+ * by the dstFormat, dstType and dstPacking.  Used by glReadPixels,
+ * glGetConvolutionFilter(), etc.
+ */
+void
+_mesa_pack_float_rgba_span( GLcontext *ctx,
+                            GLuint n, CONST GLfloat rgbaIn[][4],
+                            GLenum dstFormat, GLenum dstType,
+                            GLvoid *dstAddr,
+                            const struct gl_pixelstore_attrib *dstPacking,
+                            GLuint transferOps )
+{
+   const GLint comps = _mesa_components_in_format(dstFormat);
+   GLfloat luminance[MAX_WIDTH];
+   GLfloat (*rgba)[4];
+   GLuint i;
+
+   if (transferOps) {
+      /* make copy of incoming data */
+      DEFMARRAY(GLfloat, rgbaCopy, MAX_WIDTH, 4);  /* mac 32k limitation */
+      CHECKARRAY(rgbaCopy, return);  /* mac 32k limitation */
+
+      for (i = 0; i < n; i++) {
+         rgbaCopy[i][0] = rgbaIn[i][0];
+         rgbaCopy[i][1] = rgbaIn[i][1];
+         rgbaCopy[i][2] = rgbaIn[i][2];
+         rgbaCopy[i][3] = rgbaIn[i][3];
+      }
+
+      rgba = (GLfloat (*)[4]) rgbaCopy;
+
+      /* scale & bias */
+      if (transferOps & IMAGE_SCALE_BIAS_BIT) {
+         _mesa_scale_and_bias_rgba(ctx, n, rgba,
+                                   ctx->Pixel.RedScale, ctx->Pixel.GreenScale,
+                                   ctx->Pixel.BlueScale, ctx->Pixel.AlphaScale,
+                                   ctx->Pixel.RedBias, ctx->Pixel.GreenBias,
+                                   ctx->Pixel.BlueBias, ctx->Pixel.AlphaBias);
+      }
+      /* color map lookup */
+      if (transferOps & IMAGE_MAP_COLOR_BIT) {
+         _mesa_map_rgba( ctx, n, rgba );
+      }
+      /* GL_COLOR_TABLE lookup */
+      if (transferOps & IMAGE_COLOR_TABLE_BIT) {
+         _mesa_lookup_rgba(&ctx->ColorTable, n, rgba);
+      }
+      /* convolution */
+      if (transferOps & IMAGE_CONVOLUTION_BIT) {
+         /* this has to be done in the calling code */
+      }
+      /* GL_POST_CONVOLUTION_RED/GREEN/BLUE/ALPHA_SCALE/BIAS */
+      if (transferOps & IMAGE_POST_CONVOLUTION_SCALE_BIAS) {
+         _mesa_scale_and_bias_rgba(ctx, n, rgba,
+                                   ctx->Pixel.PostConvolutionScale[RCOMP],
+                                   ctx->Pixel.PostConvolutionScale[GCOMP],
+                                   ctx->Pixel.PostConvolutionScale[BCOMP],
+                                   ctx->Pixel.PostConvolutionScale[ACOMP],
+                                   ctx->Pixel.PostConvolutionBias[RCOMP],
+                                   ctx->Pixel.PostConvolutionBias[GCOMP],
+                                   ctx->Pixel.PostConvolutionBias[BCOMP],
+                                   ctx->Pixel.PostConvolutionBias[ACOMP]);
+      }
+      /* GL_POST_CONVOLUTION_COLOR_TABLE lookup */
+      if (transferOps & IMAGE_POST_CONVOLUTION_COLOR_TABLE_BIT) {
+         _mesa_lookup_rgba(&ctx->PostConvolutionColorTable, n, rgba);
+      }
+      /* color matrix transform */
+      if (transferOps & IMAGE_COLOR_MATRIX_BIT) {
+         _mesa_transform_rgba(ctx, n, rgba);
+      }
+      /* GL_POST_COLOR_MATRIX_COLOR_TABLE lookup */
+      if (transferOps & IMAGE_POST_COLOR_MATRIX_COLOR_TABLE_BIT) {
+         _mesa_lookup_rgba(&ctx->PostColorMatrixColorTable, n, rgba);
+      }
+      /* update histogram count */
+      if (transferOps & IMAGE_HISTOGRAM_BIT) {
+         _mesa_update_histogram(ctx, n, (CONST GLfloat (*)[4]) rgba);
+      }
+      /* min/max here */
+      if (transferOps & IMAGE_MIN_MAX_BIT) {
+         _mesa_update_minmax(ctx, n, (CONST GLfloat (*)[4]) rgba);
+         if (ctx->MinMax.Sink) {
+            UNDEFARRAY(rgbaCopy);  /* mac 32k limitation */
+            return;
+         }
+      }
+      UNDEFARRAY(rgbaCopy);  /* mac 32k limitation */
+   }
+   else {
+      /* use incoming data, not a copy */
+      rgba = (GLfloat (*)[4]) rgbaIn;
+   }
+
+   /* XXX clamp rgba to [0,1]? */
+
+
+   if (dstFormat == GL_LUMINANCE || dstFormat == GL_LUMINANCE_ALPHA) {
+      for (i = 0; i < n; i++) {
+         GLfloat sum = rgba[i][RCOMP] + rgba[i][GCOMP] + rgba[i][BCOMP];
+#if CHAN_TYPE == GL_FLOAT
+         luminance[i] = sum;
+#else
+         luminance[i] = CLAMP(sum, 0.0F, 1.0F);
+#endif
+      }
+   }
+
+   /*
+    * Pack/store the pixels.  Ugh!  Lots of cases!!!
+    */
+   switch (dstType) {
+      case GL_UNSIGNED_BYTE:
+         {
+            GLubyte *dst = (GLubyte *) dstAddr;
+            switch (dstFormat) {
+               case GL_RED:
+                  for (i=0;i<n;i++)
+                     dst[i] = FLOAT_TO_UBYTE(rgba[i][RCOMP]);
+                  break;
+               case GL_GREEN:
+                  for (i=0;i<n;i++)
+                     dst[i] = FLOAT_TO_UBYTE(rgba[i][GCOMP]);
+                  break;
+               case GL_BLUE:
+                  for (i=0;i<n;i++)
+                     dst[i] = FLOAT_TO_UBYTE(rgba[i][BCOMP]);
+                  break;
+               case GL_ALPHA:
+                  for (i=0;i<n;i++)
+                     dst[i] = FLOAT_TO_UBYTE(rgba[i][ACOMP]);
+                  break;
+               case GL_LUMINANCE:
+                  for (i=0;i<n;i++)
+                     dst[i] = FLOAT_TO_UBYTE(luminance[i]);
+                  break;
+               case GL_LUMINANCE_ALPHA:
+                  for (i=0;i<n;i++) {
+                     dst[i*2+0] = FLOAT_TO_UBYTE(luminance[i]);
+                     dst[i*2+1] = FLOAT_TO_UBYTE(rgba[i][ACOMP]);
+                  }
+                  break;
+               case GL_RGB:
+                  for (i=0;i<n;i++) {
+                     dst[i*3+0] = FLOAT_TO_UBYTE(rgba[i][RCOMP]);
+                     dst[i*3+1] = FLOAT_TO_UBYTE(rgba[i][GCOMP]);
+                     dst[i*3+2] = FLOAT_TO_UBYTE(rgba[i][BCOMP]);
+                  }
+                  break;
+               case GL_RGBA:
+                  for (i=0;i<n;i++) {
+                     dst[i*4+0] = FLOAT_TO_UBYTE(rgba[i][RCOMP]);
+                     dst[i*4+1] = FLOAT_TO_UBYTE(rgba[i][GCOMP]);
+                     dst[i*4+2] = FLOAT_TO_UBYTE(rgba[i][BCOMP]);
+                     dst[i*4+3] = FLOAT_TO_UBYTE(rgba[i][ACOMP]);
+                  }
+                  break;
+               case GL_BGR:
+                  for (i=0;i<n;i++) {
+                     dst[i*3+0] = FLOAT_TO_UBYTE(rgba[i][BCOMP]);
+                     dst[i*3+1] = FLOAT_TO_UBYTE(rgba[i][GCOMP]);
+                     dst[i*3+2] = FLOAT_TO_UBYTE(rgba[i][RCOMP]);
+                  }
+                  break;
+               case GL_BGRA:
+                  for (i=0;i<n;i++) {
+                     dst[i*4+0] = FLOAT_TO_UBYTE(rgba[i][BCOMP]);
+                     dst[i*4+1] = FLOAT_TO_UBYTE(rgba[i][GCOMP]);
+                     dst[i*4+2] = FLOAT_TO_UBYTE(rgba[i][RCOMP]);
+                     dst[i*4+3] = FLOAT_TO_UBYTE(rgba[i][ACOMP]);
+                  }
+                  break;
+               case GL_ABGR_EXT:
+                  for (i=0;i<n;i++) {
+                     dst[i*4+0] = FLOAT_TO_UBYTE(rgba[i][ACOMP]);
+                     dst[i*4+1] = FLOAT_TO_UBYTE(rgba[i][BCOMP]);
+                     dst[i*4+2] = FLOAT_TO_UBYTE(rgba[i][GCOMP]);
+                     dst[i*4+3] = FLOAT_TO_UBYTE(rgba[i][RCOMP]);
+                  }
+                  break;
+               default:
+                  _mesa_problem(ctx, "bad format in _mesa_pack_rgba_span\n");
+            }
+         }
+         break;
+      case GL_BYTE:
+         {
+            GLbyte *dst = (GLbyte *) dstAddr;
+            switch (dstFormat) {
+               case GL_RED:
+                  for (i=0;i<n;i++)
+                     dst[i] = FLOAT_TO_BYTE(rgba[i][RCOMP]);
+                  break;
+               case GL_GREEN:
+                  for (i=0;i<n;i++)
+                     dst[i] = FLOAT_TO_BYTE(rgba[i][GCOMP]);
+                  break;
+               case GL_BLUE:
+                  for (i=0;i<n;i++)
+                     dst[i] = FLOAT_TO_BYTE(rgba[i][BCOMP]);
+                  break;
+               case GL_ALPHA:
+                  for (i=0;i<n;i++)
+                     dst[i] = FLOAT_TO_BYTE(rgba[i][ACOMP]);
+                  break;
+               case GL_LUMINANCE:
+                  for (i=0;i<n;i++)
+                     dst[i] = FLOAT_TO_BYTE(luminance[i]);
+                  break;
+               case GL_LUMINANCE_ALPHA:
+                  for (i=0;i<n;i++) {
+                     dst[i*2+0] = FLOAT_TO_BYTE(luminance[i]);
+                     dst[i*2+1] = FLOAT_TO_BYTE(rgba[i][ACOMP]);
+                  }
+                  break;
+               case GL_RGB:
+                  for (i=0;i<n;i++) {
+                     dst[i*3+0] = FLOAT_TO_BYTE(rgba[i][RCOMP]);
+                     dst[i*3+1] = FLOAT_TO_BYTE(rgba[i][GCOMP]);
+                     dst[i*3+2] = FLOAT_TO_BYTE(rgba[i][BCOMP]);
+                  }
+                  break;
+               case GL_RGBA:
+                  for (i=0;i<n;i++) {
+                     dst[i*4+0] = FLOAT_TO_BYTE(rgba[i][RCOMP]);
+                     dst[i*4+1] = FLOAT_TO_BYTE(rgba[i][GCOMP]);
+                     dst[i*4+2] = FLOAT_TO_BYTE(rgba[i][BCOMP]);
+                     dst[i*4+3] = FLOAT_TO_BYTE(rgba[i][ACOMP]);
+                  }
+                  break;
+               case GL_BGR:
+                  for (i=0;i<n;i++) {
+                     dst[i*3+0] = FLOAT_TO_BYTE(rgba[i][BCOMP]);
+                     dst[i*3+1] = FLOAT_TO_BYTE(rgba[i][GCOMP]);
+                     dst[i*3+2] = FLOAT_TO_BYTE(rgba[i][RCOMP]);
+                  }
+                  break;
+               case GL_BGRA:
+                  for (i=0;i<n;i++) {
+                     dst[i*4+0] = FLOAT_TO_BYTE(rgba[i][BCOMP]);
+                     dst[i*4+1] = FLOAT_TO_BYTE(rgba[i][GCOMP]);
+                     dst[i*4+2] = FLOAT_TO_BYTE(rgba[i][RCOMP]);
+                     dst[i*4+3] = FLOAT_TO_BYTE(rgba[i][ACOMP]);
+                  }
+               case GL_ABGR_EXT:
+                  for (i=0;i<n;i++) {
+                     dst[i*4+0] = FLOAT_TO_BYTE(rgba[i][ACOMP]);
+                     dst[i*4+1] = FLOAT_TO_BYTE(rgba[i][BCOMP]);
+                     dst[i*4+2] = FLOAT_TO_BYTE(rgba[i][GCOMP]);
+                     dst[i*4+3] = FLOAT_TO_BYTE(rgba[i][RCOMP]);
+                  }
+                  break;
+               default:
+                  _mesa_problem(ctx, "bad format in _mesa_pack_rgba_span\n");
+            }
+         }
+         break;
+      case GL_UNSIGNED_SHORT:
+         {
+            GLushort *dst = (GLushort *) dstAddr;
+            switch (dstFormat) {
+               case GL_RED:
+                  for (i=0;i<n;i++)
+                     dst[i] = FLOAT_TO_USHORT(rgba[i][RCOMP]);
+                  break;
+               case GL_GREEN:
+                  for (i=0;i<n;i++)
+                     dst[i] = FLOAT_TO_USHORT(rgba[i][GCOMP]);
+                  break;
+               case GL_BLUE:
+                  for (i=0;i<n;i++)
+                     dst[i] = FLOAT_TO_USHORT(rgba[i][BCOMP]);
+                  break;
+               case GL_ALPHA:
+                  for (i=0;i<n;i++)
+                     dst[i] = FLOAT_TO_USHORT(rgba[i][ACOMP]);
+                  break;
+               case GL_LUMINANCE:
+                  for (i=0;i<n;i++)
+                     dst[i] = FLOAT_TO_USHORT(luminance[i]);
+                  break;
+               case GL_LUMINANCE_ALPHA:
+                  for (i=0;i<n;i++) {
+                     dst[i*2+0] = FLOAT_TO_USHORT(luminance[i]);
+                     dst[i*2+1] = FLOAT_TO_USHORT(rgba[i][ACOMP]);
+                  }
+                  break;
+               case GL_RGB:
+                  for (i=0;i<n;i++) {
+                     dst[i*3+0] = FLOAT_TO_USHORT(rgba[i][RCOMP]);
+                     dst[i*3+1] = FLOAT_TO_USHORT(rgba[i][GCOMP]);
+                     dst[i*3+2] = FLOAT_TO_USHORT(rgba[i][BCOMP]);
+                  }
+                  break;
+               case GL_RGBA:
+                  for (i=0;i<n;i++) {
+                     dst[i*4+0] = FLOAT_TO_USHORT(rgba[i][RCOMP]);
+                     dst[i*4+1] = FLOAT_TO_USHORT(rgba[i][GCOMP]);
+                     dst[i*4+2] = FLOAT_TO_USHORT(rgba[i][BCOMP]);
+                     dst[i*4+3] = FLOAT_TO_USHORT(rgba[i][ACOMP]);
+                  }
+                  break;
+               case GL_BGR:
+                  for (i=0;i<n;i++) {
+                     dst[i*3+0] = FLOAT_TO_USHORT(rgba[i][BCOMP]);
+                     dst[i*3+1] = FLOAT_TO_USHORT(rgba[i][GCOMP]);
+                     dst[i*3+2] = FLOAT_TO_USHORT(rgba[i][RCOMP]);
+                  }
+                  break;
+               case GL_BGRA:
+                  for (i=0;i<n;i++) {
+                     dst[i*4+0] = FLOAT_TO_USHORT(rgba[i][BCOMP]);
+                     dst[i*4+1] = FLOAT_TO_USHORT(rgba[i][GCOMP]);
+                     dst[i*4+2] = FLOAT_TO_USHORT(rgba[i][RCOMP]);
+                     dst[i*4+3] = FLOAT_TO_USHORT(rgba[i][ACOMP]);
+                  }
+                  break;
+               case GL_ABGR_EXT:
+                  for (i=0;i<n;i++) {
+                     dst[i*4+0] = FLOAT_TO_USHORT(rgba[i][ACOMP]);
+                     dst[i*4+1] = FLOAT_TO_USHORT(rgba[i][BCOMP]);
+                     dst[i*4+2] = FLOAT_TO_USHORT(rgba[i][GCOMP]);
+                     dst[i*4+3] = FLOAT_TO_USHORT(rgba[i][RCOMP]);
+                  }
+                  break;
+               default:
+                  _mesa_problem(ctx, "bad format in _mesa_pack_rgba_span\n");
+            }
+            if (dstPacking->SwapBytes) {
+               _mesa_swap2( (GLushort *) dst, n * comps);
+            }
+         }
+         break;
+      case GL_SHORT:
+         {
+            GLshort *dst = (GLshort *) dstAddr;
+            switch (dstFormat) {
+               case GL_RED:
+                  for (i=0;i<n;i++)
+                     dst[i] = FLOAT_TO_SHORT(rgba[i][RCOMP]);
+                  break;
+               case GL_GREEN:
+                  for (i=0;i<n;i++)
+                     dst[i] = FLOAT_TO_SHORT(rgba[i][GCOMP]);
+                  break;
+               case GL_BLUE:
+                  for (i=0;i<n;i++)
+                     dst[i] = FLOAT_TO_SHORT(rgba[i][BCOMP]);
+                  break;
+               case GL_ALPHA:
+                  for (i=0;i<n;i++)
+                     dst[i] = FLOAT_TO_SHORT(rgba[i][ACOMP]);
+                  break;
+               case GL_LUMINANCE:
+                  for (i=0;i<n;i++)
+                     dst[i] = FLOAT_TO_SHORT(luminance[i]);
+                  break;
+               case GL_LUMINANCE_ALPHA:
+                  for (i=0;i<n;i++) {
+                     dst[i*2+0] = FLOAT_TO_SHORT(luminance[i]);
+                     dst[i*2+1] = FLOAT_TO_SHORT(rgba[i][ACOMP]);
+                  }
+                  break;
+               case GL_RGB:
+                  for (i=0;i<n;i++) {
+                     dst[i*3+0] = FLOAT_TO_SHORT(rgba[i][RCOMP]);
+                     dst[i*3+1] = FLOAT_TO_SHORT(rgba[i][GCOMP]);
+                     dst[i*3+2] = FLOAT_TO_SHORT(rgba[i][BCOMP]);
+                  }
+                  break;
+               case GL_RGBA:
+                  for (i=0;i<n;i++) {
+                     dst[i*4+0] = FLOAT_TO_SHORT(rgba[i][RCOMP]);
+                     dst[i*4+1] = FLOAT_TO_SHORT(rgba[i][GCOMP]);
+                     dst[i*4+2] = FLOAT_TO_SHORT(rgba[i][BCOMP]);
+                     dst[i*4+3] = FLOAT_TO_SHORT(rgba[i][ACOMP]);
+                  }
+                  break;
+               case GL_BGR:
+                  for (i=0;i<n;i++) {
+                     dst[i*3+0] = FLOAT_TO_SHORT(rgba[i][BCOMP]);
+                     dst[i*3+1] = FLOAT_TO_SHORT(rgba[i][GCOMP]);
+                     dst[i*3+2] = FLOAT_TO_SHORT(rgba[i][RCOMP]);
+                  }
+                  break;
+               case GL_BGRA:
+                  for (i=0;i<n;i++) {
+                     dst[i*4+0] = FLOAT_TO_SHORT(rgba[i][BCOMP]);
+                     dst[i*4+1] = FLOAT_TO_SHORT(rgba[i][GCOMP]);
+                     dst[i*4+2] = FLOAT_TO_SHORT(rgba[i][RCOMP]);
+                     dst[i*4+3] = FLOAT_TO_SHORT(rgba[i][ACOMP]);
+                  }
+               case GL_ABGR_EXT:
+                  for (i=0;i<n;i++) {
+                     dst[i*4+0] = FLOAT_TO_SHORT(rgba[i][ACOMP]);
+                     dst[i*4+1] = FLOAT_TO_SHORT(rgba[i][BCOMP]);
+                     dst[i*4+2] = FLOAT_TO_SHORT(rgba[i][GCOMP]);
+                     dst[i*4+3] = FLOAT_TO_SHORT(rgba[i][RCOMP]);
+                  }
+                  break;
+               default:
+                  _mesa_problem(ctx, "bad format in _mesa_pack_rgba_span\n");
+            }
+            if (dstPacking->SwapBytes) {
+               _mesa_swap2( (GLushort *) dst, n * comps );
+            }
+         }
+         break;
+      case GL_UNSIGNED_INT:
+         {
+            GLuint *dst = (GLuint *) dstAddr;
+            switch (dstFormat) {
+               case GL_RED:
+                  for (i=0;i<n;i++)
+                     dst[i] = FLOAT_TO_UINT(rgba[i][RCOMP]);
+                  break;
+               case GL_GREEN:
+                  for (i=0;i<n;i++)
+                     dst[i] = FLOAT_TO_UINT(rgba[i][GCOMP]);
+                  break;
+               case GL_BLUE:
+                  for (i=0;i<n;i++)
+                     dst[i] = FLOAT_TO_UINT(rgba[i][BCOMP]);
+                  break;
+               case GL_ALPHA:
+                  for (i=0;i<n;i++)
+                     dst[i] = FLOAT_TO_UINT(rgba[i][ACOMP]);
+                  break;
+               case GL_LUMINANCE:
+                  for (i=0;i<n;i++)
+                     dst[i] = FLOAT_TO_UINT(luminance[i]);
+                  break;
+               case GL_LUMINANCE_ALPHA:
+                  for (i=0;i<n;i++) {
+                     dst[i*2+0] = FLOAT_TO_UINT(luminance[i]);
+                     dst[i*2+1] = FLOAT_TO_UINT(rgba[i][ACOMP]);
+                  }
+                  break;
+               case GL_RGB:
+                  for (i=0;i<n;i++) {
+                     dst[i*3+0] = FLOAT_TO_UINT(rgba[i][RCOMP]);
+                     dst[i*3+1] = FLOAT_TO_UINT(rgba[i][GCOMP]);
+                     dst[i*3+2] = FLOAT_TO_UINT(rgba[i][BCOMP]);
+                  }
+                  break;
+               case GL_RGBA:
+                  for (i=0;i<n;i++) {
+                     dst[i*4+0] = FLOAT_TO_UINT(rgba[i][RCOMP]);
+                     dst[i*4+1] = FLOAT_TO_UINT(rgba[i][GCOMP]);
+                     dst[i*4+2] = FLOAT_TO_UINT(rgba[i][BCOMP]);
+                     dst[i*4+3] = FLOAT_TO_UINT(rgba[i][ACOMP]);
+                  }
+                  break;
+               case GL_BGR:
+                  for (i=0;i<n;i++) {
+                     dst[i*3+0] = FLOAT_TO_UINT(rgba[i][BCOMP]);
+                     dst[i*3+1] = FLOAT_TO_UINT(rgba[i][GCOMP]);
+                     dst[i*3+2] = FLOAT_TO_UINT(rgba[i][RCOMP]);
+                  }
+                  break;
+               case GL_BGRA:
+                  for (i=0;i<n;i++) {
+                     dst[i*4+0] = FLOAT_TO_UINT(rgba[i][BCOMP]);
+                     dst[i*4+1] = FLOAT_TO_UINT(rgba[i][GCOMP]);
+                     dst[i*4+2] = FLOAT_TO_UINT(rgba[i][RCOMP]);
+                     dst[i*4+3] = FLOAT_TO_UINT(rgba[i][ACOMP]);
+                  }
+                  break;
+               case GL_ABGR_EXT:
+                  for (i=0;i<n;i++) {
+                     dst[i*4+0] = FLOAT_TO_UINT(rgba[i][ACOMP]);
+                     dst[i*4+1] = FLOAT_TO_UINT(rgba[i][BCOMP]);
+                     dst[i*4+2] = FLOAT_TO_UINT(rgba[i][GCOMP]);
+                     dst[i*4+3] = FLOAT_TO_UINT(rgba[i][RCOMP]);
+                  }
+                  break;
+               default:
+                  _mesa_problem(ctx, "bad format in _mesa_pack_rgba_span\n");
+            }
+            if (dstPacking->SwapBytes) {
+               _mesa_swap4( (GLuint *) dst, n * comps );
+            }
+         }
+         break;
+      case GL_INT:
+         {
+            GLint *dst = (GLint *) dstAddr;
+            switch (dstFormat) {
+               case GL_RED:
+                  for (i=0;i<n;i++)
+                     dst[i] = FLOAT_TO_INT(rgba[i][RCOMP]);
+                  break;
+               case GL_GREEN:
+                  for (i=0;i<n;i++)
+                     dst[i] = FLOAT_TO_INT(rgba[i][GCOMP]);
+                  break;
+               case GL_BLUE:
+                  for (i=0;i<n;i++)
+                     dst[i] = FLOAT_TO_INT(rgba[i][BCOMP]);
+                  break;
+               case GL_ALPHA:
+                  for (i=0;i<n;i++)
+                     dst[i] = FLOAT_TO_INT(rgba[i][ACOMP]);
+                  break;
+               case GL_LUMINANCE:
+                  for (i=0;i<n;i++)
+                     dst[i] = FLOAT_TO_INT(luminance[i]);
+                  break;
+               case GL_LUMINANCE_ALPHA:
+                  for (i=0;i<n;i++) {
+                     dst[i*2+0] = FLOAT_TO_INT(luminance[i]);
+                     dst[i*2+1] = FLOAT_TO_INT(rgba[i][ACOMP]);
+                  }
+                  break;
+               case GL_RGB:
+                  for (i=0;i<n;i++) {
+                     dst[i*3+0] = FLOAT_TO_INT(rgba[i][RCOMP]);
+                     dst[i*3+1] = FLOAT_TO_INT(rgba[i][GCOMP]);
+                     dst[i*3+2] = FLOAT_TO_INT(rgba[i][BCOMP]);
+                  }
+                  break;
+               case GL_RGBA:
+                  for (i=0;i<n;i++) {
+                     dst[i*4+0] = FLOAT_TO_INT(rgba[i][RCOMP]);
+                     dst[i*4+1] = FLOAT_TO_INT(rgba[i][GCOMP]);
+                     dst[i*4+2] = FLOAT_TO_INT(rgba[i][BCOMP]);
+                     dst[i*4+3] = FLOAT_TO_INT(rgba[i][ACOMP]);
+                  }
+                  break;
+               case GL_BGR:
+                  for (i=0;i<n;i++) {
+                     dst[i*3+0] = FLOAT_TO_INT(rgba[i][BCOMP]);
+                     dst[i*3+1] = FLOAT_TO_INT(rgba[i][GCOMP]);
+                     dst[i*3+2] = FLOAT_TO_INT(rgba[i][RCOMP]);
+                  }
+                  break;
+               case GL_BGRA:
+                  for (i=0;i<n;i++) {
+                     dst[i*4+0] = FLOAT_TO_INT(rgba[i][BCOMP]);
+                     dst[i*4+1] = FLOAT_TO_INT(rgba[i][GCOMP]);
+                     dst[i*4+2] = FLOAT_TO_INT(rgba[i][RCOMP]);
+                     dst[i*4+3] = FLOAT_TO_INT(rgba[i][ACOMP]);
+                  }
+                  break;
+               case GL_ABGR_EXT:
+                  for (i=0;i<n;i++) {
+                     dst[i*4+0] = FLOAT_TO_INT(rgba[i][ACOMP]);
+                     dst[i*4+1] = FLOAT_TO_INT(rgba[i][BCOMP]);
+                     dst[i*4+2] = FLOAT_TO_INT(rgba[i][GCOMP]);
+                     dst[i*4+3] = FLOAT_TO_INT(rgba[i][RCOMP]);
+                  }
+                  break;
+               default:
+                  _mesa_problem(ctx, "bad format in _mesa_pack_rgba_span\n");
+            }
+            if (dstPacking->SwapBytes) {
+               _mesa_swap4( (GLuint *) dst, n * comps );
+            }
+         }
+         break;
+      case GL_FLOAT:
+         {
+            GLfloat *dst = (GLfloat *) dstAddr;
+            switch (dstFormat) {
+               case GL_RED:
+                  for (i=0;i<n;i++)
+                     dst[i] = rgba[i][RCOMP];
+                  break;
+               case GL_GREEN:
+                  for (i=0;i<n;i++)
+                     dst[i] = rgba[i][GCOMP];
+                  break;
+               case GL_BLUE:
+                  for (i=0;i<n;i++)
+                     dst[i] = rgba[i][BCOMP];
+                  break;
+               case GL_ALPHA:
+                  for (i=0;i<n;i++)
+                     dst[i] = rgba[i][ACOMP];
+                  break;
+               case GL_LUMINANCE:
+                  for (i=0;i<n;i++)
+                     dst[i] = luminance[i];
+                  break;
+               case GL_LUMINANCE_ALPHA:
+                  for (i=0;i<n;i++) {
+                     dst[i*2+0] = luminance[i];
+                     dst[i*2+1] = rgba[i][ACOMP];
+                  }
+                  break;
+               case GL_RGB:
+                  for (i=0;i<n;i++) {
+                     dst[i*3+0] = rgba[i][RCOMP];
+                     dst[i*3+1] = rgba[i][GCOMP];
+                     dst[i*3+2] = rgba[i][BCOMP];
+                  }
+                  break;
+               case GL_RGBA:
+                  for (i=0;i<n;i++) {
+                     dst[i*4+0] = rgba[i][RCOMP];
+                     dst[i*4+1] = rgba[i][GCOMP];
+                     dst[i*4+2] = rgba[i][BCOMP];
+                     dst[i*4+3] = rgba[i][ACOMP];
+                  }
+                  break;
+               case GL_BGR:
+                  for (i=0;i<n;i++) {
+                     dst[i*3+0] = rgba[i][BCOMP];
+                     dst[i*3+1] = rgba[i][GCOMP];
+                     dst[i*3+2] = rgba[i][RCOMP];
+                  }
+                  break;
+               case GL_BGRA:
+                  for (i=0;i<n;i++) {
+                     dst[i*4+0] = rgba[i][BCOMP];
+                     dst[i*4+1] = rgba[i][GCOMP];
+                     dst[i*4+2] = rgba[i][RCOMP];
+                     dst[i*4+3] = rgba[i][ACOMP];
+                  }
+                  break;
+               case GL_ABGR_EXT:
+                  for (i=0;i<n;i++) {
+                     dst[i*4+0] = rgba[i][ACOMP];
+                     dst[i*4+1] = rgba[i][BCOMP];
+                     dst[i*4+2] = rgba[i][GCOMP];
+                     dst[i*4+3] = rgba[i][RCOMP];
+                  }
+                  break;
+               default:
+                  _mesa_problem(ctx, "bad format in _mesa_pack_rgba_span\n");
+            }
+            if (dstPacking->SwapBytes) {
+               _mesa_swap4( (GLuint *) dst, n * comps );
+            }
+         }
+         break;
+      case GL_HALF_FLOAT_NV:
+         {
+            GLhalfNV *dst = (GLhalfNV *) dstAddr;
+            switch (dstFormat) {
+               case GL_RED:
+                  for (i=0;i<n;i++)
+                     dst[i] = _mesa_float_to_half(rgba[i][RCOMP]);
+                  break;
+               case GL_GREEN:
+                  for (i=0;i<n;i++)
+                     dst[i] = _mesa_float_to_half(rgba[i][GCOMP]);
+                  break;
+               case GL_BLUE:
+                  for (i=0;i<n;i++)
+                     dst[i] = _mesa_float_to_half(rgba[i][BCOMP]);
+                  break;
+               case GL_ALPHA:
+                  for (i=0;i<n;i++)
+                     dst[i] = _mesa_float_to_half(rgba[i][ACOMP]);
+                  break;
+               case GL_LUMINANCE:
+                  for (i=0;i<n;i++)
+                     dst[i] = _mesa_float_to_half(luminance[i]);
+                  break;
+               case GL_LUMINANCE_ALPHA:
+                  for (i=0;i<n;i++) {
+                     dst[i*2+0] = _mesa_float_to_half(luminance[i]);
+                     dst[i*2+1] = _mesa_float_to_half(rgba[i][ACOMP]);
+                  }
+                  break;
+               case GL_RGB:
+                  for (i=0;i<n;i++) {
+                     dst[i*3+0] = _mesa_float_to_half(rgba[i][RCOMP]);
+                     dst[i*3+1] = _mesa_float_to_half(rgba[i][GCOMP]);
+                     dst[i*3+2] = _mesa_float_to_half(rgba[i][BCOMP]);
+                  }
+                  break;
+               case GL_RGBA:
+                  for (i=0;i<n;i++) {
+                     dst[i*4+0] = _mesa_float_to_half(rgba[i][RCOMP]);
+                     dst[i*4+1] = _mesa_float_to_half(rgba[i][GCOMP]);
+                     dst[i*4+2] = _mesa_float_to_half(rgba[i][BCOMP]);
+                     dst[i*4+3] = _mesa_float_to_half(rgba[i][ACOMP]);
+                  }
+                  break;
+               case GL_BGR:
+                  for (i=0;i<n;i++) {
+                     dst[i*3+0] = _mesa_float_to_half(rgba[i][BCOMP]);
+                     dst[i*3+1] = _mesa_float_to_half(rgba[i][GCOMP]);
+                     dst[i*3+2] = _mesa_float_to_half(rgba[i][RCOMP]);
+                  }
+                  break;
+               case GL_BGRA:
+                  for (i=0;i<n;i++) {
+                     dst[i*4+0] = _mesa_float_to_half(rgba[i][BCOMP]);
+                     dst[i*4+1] = _mesa_float_to_half(rgba[i][GCOMP]);
+                     dst[i*4+2] = _mesa_float_to_half(rgba[i][RCOMP]);
+                     dst[i*4+3] = _mesa_float_to_half(rgba[i][ACOMP]);
+                  }
+                  break;
+               case GL_ABGR_EXT:
+                  for (i=0;i<n;i++) {
+                     dst[i*4+0] = _mesa_float_to_half(rgba[i][ACOMP]);
+                     dst[i*4+1] = _mesa_float_to_half(rgba[i][BCOMP]);
+                     dst[i*4+2] = _mesa_float_to_half(rgba[i][GCOMP]);
+                     dst[i*4+3] = _mesa_float_to_half(rgba[i][RCOMP]);
+                  }
+                  break;
+               default:
+                  _mesa_problem(ctx, "bad format in _mesa_pack_rgba_span\n");
+            }
+            if (dstPacking->SwapBytes) {
+               _mesa_swap2( (GLushort *) dst, n * comps );
+            }
+         }
+         break;
+      case GL_UNSIGNED_BYTE_3_3_2:
+         if (dstFormat == GL_RGB) {
+            GLubyte *dst = (GLubyte *) dstAddr;
+            for (i=0;i<n;i++) {
+               dst[i] = (((GLint) (rgba[i][RCOMP] * 7.0F)) << 5)
+                      | (((GLint) (rgba[i][GCOMP] * 7.0F)) << 2)
+                      | (((GLint) (rgba[i][BCOMP] * 3.0F))     );
+            }
+         }
+         break;
+      case GL_UNSIGNED_BYTE_2_3_3_REV:
+         if (dstFormat == GL_RGB) {
+            GLubyte *dst = (GLubyte *) dstAddr;
+            for (i=0;i<n;i++) {
+               dst[i] = (((GLint) (rgba[i][RCOMP] * 7.0F))     )
+                      | (((GLint) (rgba[i][GCOMP] * 7.0F)) << 3)
+                      | (((GLint) (rgba[i][BCOMP] * 3.0F)) << 5);
+            }
+         }
+         break;
+      case GL_UNSIGNED_SHORT_5_6_5:
+         if (dstFormat == GL_RGB) {
+            GLushort *dst = (GLushort *) dstAddr;
+            for (i=0;i<n;i++) {
+               dst[i] = (((GLint) (rgba[i][RCOMP] * 31.0F)) << 11)
+                      | (((GLint) (rgba[i][GCOMP] * 63.0F)) <<  5)
+                      | (((GLint) (rgba[i][BCOMP] * 31.0F))      );
+            }
+         }
+         break;
+      case GL_UNSIGNED_SHORT_5_6_5_REV:
+         if (dstFormat == GL_RGB) {
+            GLushort *dst = (GLushort *) dstAddr;
+            for (i=0;i<n;i++) {
+               dst[i] = (((GLint) (rgba[i][RCOMP] * 31.0F))      )
+                      | (((GLint) (rgba[i][GCOMP] * 63.0F)) <<  5)
+                      | (((GLint) (rgba[i][BCOMP] * 31.0F)) << 11);
+            }
+         }
+         break;
+      case GL_UNSIGNED_SHORT_4_4_4_4:
+         if (dstFormat == GL_RGBA) {
+            GLushort *dst = (GLushort *) dstAddr;
+            for (i=0;i<n;i++) {
+               dst[i] = (((GLint) (rgba[i][RCOMP] * 15.0F)) << 12)
+                      | (((GLint) (rgba[i][GCOMP] * 15.0F)) <<  8)
+                      | (((GLint) (rgba[i][BCOMP] * 15.0F)) <<  4)
+                      | (((GLint) (rgba[i][ACOMP] * 15.0F))      );
+            }
+         }
+         else if (dstFormat == GL_BGRA) {
+            GLushort *dst = (GLushort *) dstAddr;
+            for (i=0;i<n;i++) {
+               dst[i] = (((GLint) (rgba[i][BCOMP] * 15.0F)) << 12)
+                      | (((GLint) (rgba[i][GCOMP] * 15.0F)) <<  8)
+                      | (((GLint) (rgba[i][RCOMP] * 15.0F)) <<  4)
+                      | (((GLint) (rgba[i][ACOMP] * 15.0F))      );
+            }
+         }
+         else if (dstFormat == GL_ABGR_EXT) {
+            GLushort *dst = (GLushort *) dstAddr;
+            for (i=0;i<n;i++) {
+               dst[i] = (((GLint) (rgba[i][ACOMP] * 15.0F)) <<  4)
+                      | (((GLint) (rgba[i][BCOMP] * 15.0F)) <<  8)
+                      | (((GLint) (rgba[i][GCOMP] * 15.0F)) << 12)
+                      | (((GLint) (rgba[i][RCOMP] * 15.0F))      );
+            }
+         }
+         break;
+      case GL_UNSIGNED_SHORT_4_4_4_4_REV:
+         if (dstFormat == GL_RGBA) {
+            GLushort *dst = (GLushort *) dstAddr;
+            for (i=0;i<n;i++) {
+               dst[i] = (((GLint) (rgba[i][RCOMP] * 15.0F))      )
+                      | (((GLint) (rgba[i][GCOMP] * 15.0F)) <<  4)
+                      | (((GLint) (rgba[i][BCOMP] * 15.0F)) <<  8)
+                      | (((GLint) (rgba[i][ACOMP] * 15.0F)) << 12);
+            }
+         }
+         else if (dstFormat == GL_BGRA) {
+            GLushort *dst = (GLushort *) dstAddr;
+            for (i=0;i<n;i++) {
+               dst[i] = (((GLint) (rgba[i][BCOMP] * 15.0F))      )
+                      | (((GLint) (rgba[i][GCOMP] * 15.0F)) <<  4)
+                      | (((GLint) (rgba[i][RCOMP] * 15.0F)) <<  8)
+                      | (((GLint) (rgba[i][ACOMP] * 15.0F)) << 12);
+            }
+         }
+         else if (dstFormat == GL_ABGR_EXT) {
+            GLushort *dst = (GLushort *) dstAddr;
+            for (i=0;i<n;i++) {
+               dst[i] = (((GLint) (rgba[i][ACOMP] * 15.0F))      )
+                      | (((GLint) (rgba[i][BCOMP] * 15.0F)) <<  4)
+                      | (((GLint) (rgba[i][GCOMP] * 15.0F)) <<  8)
+                      | (((GLint) (rgba[i][RCOMP] * 15.0F)) << 12);
+            }
+         }
+         break;
+      case GL_UNSIGNED_SHORT_5_5_5_1:
+         if (dstFormat == GL_RGBA) {
+            GLushort *dst = (GLushort *) dstAddr;
+            for (i=0;i<n;i++) {
+               dst[i] = (((GLint) (rgba[i][RCOMP] * 31.0F)) << 11)
+                      | (((GLint) (rgba[i][GCOMP] * 31.0F)) <<  6)
+                      | (((GLint) (rgba[i][BCOMP] * 31.0F)) <<  1)
+                      | (((GLint) (rgba[i][ACOMP] *  1.0F))      );
+            }
+         }
+         else if (dstFormat == GL_BGRA) {
+            GLushort *dst = (GLushort *) dstAddr;
+            for (i=0;i<n;i++) {
+               dst[i] = (((GLint) (rgba[i][BCOMP] * 31.0F)) << 11)
+                      | (((GLint) (rgba[i][GCOMP] * 31.0F)) <<  6)
+                      | (((GLint) (rgba[i][RCOMP] * 31.0F)) <<  1)
+                      | (((GLint) (rgba[i][ACOMP] *  1.0F))      );
+            }
+         }
+         else if (dstFormat == GL_ABGR_EXT) {
+            GLushort *dst = (GLushort *) dstAddr;
+            for (i=0;i<n;i++) {
+               dst[i] = (((GLint) (rgba[i][ACOMP] * 31.0F)) << 11)
+                      | (((GLint) (rgba[i][BCOMP] * 31.0F)) <<  6)
+                      | (((GLint) (rgba[i][GCOMP] * 31.0F)) <<  1)
+                      | (((GLint) (rgba[i][RCOMP] *  1.0F))      );
+            }
+         }
+         break;
+      case GL_UNSIGNED_SHORT_1_5_5_5_REV:
+         if (dstFormat == GL_RGBA) {
+            GLushort *dst = (GLushort *) dstAddr;
+            for (i=0;i<n;i++) {
+               dst[i] = (((GLint) (rgba[i][RCOMP] * 31.0F))      )
+                      | (((GLint) (rgba[i][GCOMP] * 31.0F)) <<  5)
+                      | (((GLint) (rgba[i][BCOMP] * 31.0F)) << 10)
+                      | (((GLint) (rgba[i][ACOMP] *  1.0F)) << 15);
+            }
+         }
+         else if (dstFormat == GL_BGRA) {
+            GLushort *dst = (GLushort *) dstAddr;
+            for (i=0;i<n;i++) {
+               dst[i] = (((GLint) (rgba[i][BCOMP] * 31.0F))      )
+                      | (((GLint) (rgba[i][GCOMP] * 31.0F)) <<  5)
+                      | (((GLint) (rgba[i][RCOMP] * 31.0F)) << 10)
+                      | (((GLint) (rgba[i][ACOMP] *  1.0F)) << 15);
+            }
+         }
+         else if (dstFormat == GL_ABGR_EXT) {
+            GLushort *dst = (GLushort *) dstAddr;
+            for (i=0;i<n;i++) {
+               dst[i] = (((GLint) (rgba[i][ACOMP] * 31.0F))      )
+                      | (((GLint) (rgba[i][BCOMP] * 31.0F)) <<  5)
+                      | (((GLint) (rgba[i][GCOMP] * 31.0F)) << 10)
+                      | (((GLint) (rgba[i][RCOMP] *  1.0F)) << 15);
+            }
+         }
+         break;
+      case GL_UNSIGNED_INT_8_8_8_8:
+         if (dstFormat == GL_RGBA) {
+            GLuint *dst = (GLuint *) dstAddr;
+            for (i=0;i<n;i++) {
+               dst[i] = (((GLuint) (rgba[i][RCOMP] * 255.0F)) << 24)
+                      | (((GLuint) (rgba[i][GCOMP] * 255.0F)) << 16)
+                      | (((GLuint) (rgba[i][BCOMP] * 255.0F)) <<  8)
+                      | (((GLuint) (rgba[i][ACOMP] * 255.0F))      );
+            }
+         }
+         else if (dstFormat == GL_BGRA) {
+            GLuint *dst = (GLuint *) dstAddr;
+            for (i=0;i<n;i++) {
+               dst[i] = (((GLuint) (rgba[i][BCOMP] * 255.0F)) << 24)
+                      | (((GLuint) (rgba[i][GCOMP] * 255.0F)) << 16)
+                      | (((GLuint) (rgba[i][RCOMP] * 255.0F)) <<  8)
+                      | (((GLuint) (rgba[i][ACOMP] * 255.0F))      );
+            }
+         }
+         else if (dstFormat == GL_ABGR_EXT) {
+            GLuint *dst = (GLuint *) dstAddr;
+            for (i=0;i<n;i++) {
+               dst[i] = (((GLuint) (rgba[i][ACOMP] * 255.0F)) << 24)
+                      | (((GLuint) (rgba[i][BCOMP] * 255.0F)) << 16)
+                      | (((GLuint) (rgba[i][GCOMP] * 255.0F)) <<  8)
+                      | (((GLuint) (rgba[i][RCOMP] * 255.0F))      );
+            }
+         }
+         break;
+      case GL_UNSIGNED_INT_8_8_8_8_REV:
+         if (dstFormat == GL_RGBA) {
+            GLuint *dst = (GLuint *) dstAddr;
+            for (i=0;i<n;i++) {
+               dst[i] = (((GLuint) (rgba[i][RCOMP] * 255.0F))      )
+                      | (((GLuint) (rgba[i][GCOMP] * 255.0F)) <<  8)
+                      | (((GLuint) (rgba[i][BCOMP] * 255.0F)) << 16)
+                      | (((GLuint) (rgba[i][ACOMP] * 255.0F)) << 24);
+            }
+         }
+         else if (dstFormat == GL_BGRA) {
+            GLuint *dst = (GLuint *) dstAddr;
+            for (i=0;i<n;i++) {
+               dst[i] = (((GLuint) (rgba[i][BCOMP] * 255.0F))      )
+                      | (((GLuint) (rgba[i][GCOMP] * 255.0F)) <<  8)
+                      | (((GLuint) (rgba[i][RCOMP] * 255.0F)) << 16)
+                      | (((GLuint) (rgba[i][ACOMP] * 255.0F)) << 24);
+            }
+         }
+         else if (dstFormat == GL_ABGR_EXT) {
+            GLuint *dst = (GLuint *) dstAddr;
+            for (i=0;i<n;i++) {
+               dst[i] = (((GLuint) (rgba[i][ACOMP] * 255.0F))      )
+                      | (((GLuint) (rgba[i][BCOMP] * 255.0F)) <<  8)
+                      | (((GLuint) (rgba[i][GCOMP] * 255.0F)) << 16)
+                      | (((GLuint) (rgba[i][RCOMP] * 255.0F)) << 24);
+            }
+         }
+         break;
+      case GL_UNSIGNED_INT_10_10_10_2:
+         if (dstFormat == GL_RGBA) {
+            GLuint *dst = (GLuint *) dstAddr;
+            for (i=0;i<n;i++) {
+               dst[i] = (((GLuint) (rgba[i][RCOMP] * 1023.0F)) << 22)
+                      | (((GLuint) (rgba[i][GCOMP] * 1023.0F)) << 12)
+                      | (((GLuint) (rgba[i][BCOMP] * 1023.0F)) <<  2)
+                      | (((GLuint) (rgba[i][ACOMP] *    3.0F))      );
+            }
+         }
+         else if (dstFormat == GL_BGRA) {
+            GLuint *dst = (GLuint *) dstAddr;
+            for (i=0;i<n;i++) {
+               dst[i] = (((GLuint) (rgba[i][BCOMP] * 1023.0F)) << 22)
+                      | (((GLuint) (rgba[i][GCOMP] * 1023.0F)) << 12)
+                      | (((GLuint) (rgba[i][RCOMP] * 1023.0F)) <<  2)
+                      | (((GLuint) (rgba[i][ACOMP] *    3.0F))      );
+            }
+         }
+         else if (dstFormat == GL_ABGR_EXT) {
+            GLuint *dst = (GLuint *) dstAddr;
+            for (i=0;i<n;i++) {
+               dst[i] = (((GLuint) (rgba[i][ACOMP] * 1023.0F)) << 22)
+                      | (((GLuint) (rgba[i][BCOMP] * 1023.0F)) << 12)
+                      | (((GLuint) (rgba[i][GCOMP] * 1023.0F)) <<  2)
+                      | (((GLuint) (rgba[i][RCOMP] *    3.0F))      );
+            }
+         }
+         break;
+      case GL_UNSIGNED_INT_2_10_10_10_REV:
+         if (dstFormat == GL_RGBA) {
+            GLuint *dst = (GLuint *) dstAddr;
+            for (i=0;i<n;i++) {
+               dst[i] = (((GLuint) (rgba[i][RCOMP] * 1023.0F))      )
+                      | (((GLuint) (rgba[i][GCOMP] * 1023.0F)) << 10)
+                      | (((GLuint) (rgba[i][BCOMP] * 1023.0F)) << 20)
+                      | (((GLuint) (rgba[i][ACOMP] *    3.0F)) << 30);
+            }
+         }
+         else if (dstFormat == GL_BGRA) {
+            GLuint *dst = (GLuint *) dstAddr;
+            for (i=0;i<n;i++) {
+               dst[i] = (((GLuint) (rgba[i][BCOMP] * 1023.0F))      )
+                      | (((GLuint) (rgba[i][GCOMP] * 1023.0F)) << 10)
+                      | (((GLuint) (rgba[i][RCOMP] * 1023.0F)) << 20)
+                      | (((GLuint) (rgba[i][ACOMP] *    3.0F)) << 30);
+            }
+         }
+         else if (dstFormat == GL_ABGR_EXT) {
+            GLuint *dst = (GLuint *) dstAddr;
+            for (i=0;i<n;i++) {
+               dst[i] = (((GLuint) (rgba[i][ACOMP] * 1023.0F))      )
+                      | (((GLuint) (rgba[i][BCOMP] * 1023.0F)) << 10)
+                      | (((GLuint) (rgba[i][GCOMP] * 1023.0F)) << 20)
+                      | (((GLuint) (rgba[i][RCOMP] *    3.0F)) << 30);
+            }
+         }
+         break;
+      default:
+         _mesa_problem(ctx, "bad type in _mesa_pack_float_rgba_span");
+   }
+}
+
+
+/*
+ * Pack the given RGBA span into client memory at 'dest' address
+ * in the given pixel format and type.
+ * Optionally apply the enabled pixel transfer ops.
+ * Pack into memory using the given packing params struct.
+ * This is used by glReadPixels and glGetTexImage?D()
+ * \param ctx - the context
+ *         n - number of pixels in the span
+ *         rgba - the pixels
+ *         format - dest packing format
+ *         type - dest packing data type
+ *         destination - destination packing address
+ *         packing - pixel packing parameters
+ *         transferOps - bitmask of IMAGE_*_BIT operations to apply
+ */
+void
+_mesa_pack_rgba_span( GLcontext *ctx,
+                      GLuint n, CONST GLchan srcRgba[][4],
+                      GLenum dstFormat, GLenum dstType,
+                      GLvoid *dstAddr,
+                      const struct gl_pixelstore_attrib *dstPacking,
+                      GLuint transferOps)
+{
+   ASSERT((ctx->NewState & _NEW_PIXEL) == 0 || transferOps == 0);
+
+   /* Test for optimized case first */
+   if (transferOps == 0 && dstFormat == GL_RGBA && dstType == CHAN_TYPE) {
+      /* common simple case */
+      MEMCPY(dstAddr, srcRgba, n * 4 * sizeof(GLchan));
+   }
+   else if (transferOps == 0 && dstFormat == GL_RGB && dstType == CHAN_TYPE) {
+      /* common simple case */
+      GLuint i;
+      GLchan *dest = (GLchan *) dstAddr;
+      for (i = 0; i < n; i++) {
+         dest[0] = srcRgba[i][RCOMP];
+         dest[1] = srcRgba[i][GCOMP];
+         dest[2] = srcRgba[i][BCOMP];
+         dest += 3;
+      }
+   }
+   else if (transferOps == 0 && dstFormat == GL_RGBA && dstType == GL_UNSIGNED_BYTE) {
+      /* common simple case */
+      GLuint i;
+      GLubyte *dest = (GLubyte *) dstAddr;
+      for (i = 0; i < n; i++) {
+         dest[0] = CHAN_TO_UBYTE(srcRgba[i][RCOMP]);
+         dest[1] = CHAN_TO_UBYTE(srcRgba[i][GCOMP]);
+         dest[2] = CHAN_TO_UBYTE(srcRgba[i][BCOMP]);
+         dest[3] = CHAN_TO_UBYTE(srcRgba[i][ACOMP]);
+         dest += 4;
+      }
+   }
+   else {
+      /* general solution */
+      GLuint i;
+      DEFMARRAY(GLfloat, rgba, MAX_WIDTH, 4);  /* mac 32k limitation */
+      CHECKARRAY(rgba, return);  /* mac 32k limitation */
+
+      assert(n <= MAX_WIDTH);
+      /* convert color components to floating point */
+      for (i=0;i<n;i++) {
+         rgba[i][RCOMP] = CHAN_TO_FLOAT(srcRgba[i][RCOMP]);
+         rgba[i][GCOMP] = CHAN_TO_FLOAT(srcRgba[i][GCOMP]);
+         rgba[i][BCOMP] = CHAN_TO_FLOAT(srcRgba[i][BCOMP]);
+         rgba[i][ACOMP] = CHAN_TO_FLOAT(srcRgba[i][ACOMP]);
+      }
+      _mesa_pack_float_rgba_span(ctx, n, (const GLfloat (*)[4]) rgba,
+                                 dstFormat, dstType, dstAddr,
+                                 dstPacking, transferOps);
+      UNDEFARRAY(rgba);  /* mac 32k limitation */
+   }
+}
+
+
+#define SWAP2BYTE(VALUE)			\
+   {						\
+      GLubyte *bytes = (GLubyte *) &(VALUE);	\
+      GLubyte tmp = bytes[0];			\
+      bytes[0] = bytes[1];			\
+      bytes[1] = tmp;				\
+   }
+
+#define SWAP4BYTE(VALUE)			\
+   {						\
+      GLubyte *bytes = (GLubyte *) &(VALUE);	\
+      GLubyte tmp = bytes[0];			\
+      bytes[0] = bytes[3];			\
+      bytes[3] = tmp;				\
+      tmp = bytes[1];				\
+      bytes[1] = bytes[2];			\
+      bytes[2] = tmp;				\
+   }
+
+
+static void
+extract_uint_indexes(GLuint n, GLuint indexes[],
+                     GLenum srcFormat, GLenum srcType, const GLvoid *src,
+                     const struct gl_pixelstore_attrib *unpack )
+{
+   assert(srcFormat == GL_COLOR_INDEX);
+
+   ASSERT(srcType == GL_BITMAP ||
+          srcType == GL_UNSIGNED_BYTE ||
+          srcType == GL_BYTE ||
+          srcType == GL_UNSIGNED_SHORT ||
+          srcType == GL_SHORT ||
+          srcType == GL_UNSIGNED_INT ||
+          srcType == GL_INT ||
+          srcType == GL_HALF_FLOAT_NV ||
+          srcType == GL_FLOAT);
+
+   switch (srcType) {
+      case GL_BITMAP:
+         {
+            GLubyte *ubsrc = (GLubyte *) src;
+            if (unpack->LsbFirst) {
+               GLubyte mask = 1 << (unpack->SkipPixels & 0x7);
+               GLuint i;
+               for (i = 0; i < n; i++) {
+                  indexes[i] = (*ubsrc & mask) ? 1 : 0;
+                  if (mask == 128) {
+                     mask = 1;
+                     ubsrc++;
+                  }
+                  else {
+                     mask = mask << 1;
+                  }
+               }
+            }
+            else {
+               GLubyte mask = 128 >> (unpack->SkipPixels & 0x7);
+               GLuint i;
+               for (i = 0; i < n; i++) {
+                  indexes[i] = (*ubsrc & mask) ? 1 : 0;
+                  if (mask == 1) {
+                     mask = 128;
+                     ubsrc++;
+                  }
+                  else {
+                     mask = mask >> 1;
+                  }
+               }
+            }
+         }
+         break;
+      case GL_UNSIGNED_BYTE:
+         {
+            GLuint i;
+            const GLubyte *s = (const GLubyte *) src;
+            for (i = 0; i < n; i++)
+               indexes[i] = s[i];
+         }
+         break;
+      case GL_BYTE:
+         {
+            GLuint i;
+            const GLbyte *s = (const GLbyte *) src;
+            for (i = 0; i < n; i++)
+               indexes[i] = s[i];
+         }
+         break;
+      case GL_UNSIGNED_SHORT:
+         {
+            GLuint i;
+            const GLushort *s = (const GLushort *) src;
+            if (unpack->SwapBytes) {
+               for (i = 0; i < n; i++) {
+                  GLushort value = s[i];
+                  SWAP2BYTE(value);
+                  indexes[i] = value;
+               }
+            }
+            else {
+               for (i = 0; i < n; i++)
+                  indexes[i] = s[i];
+            }
+         }
+         break;
+      case GL_SHORT:
+         {
+            GLuint i;
+            const GLshort *s = (const GLshort *) src;
+            if (unpack->SwapBytes) {
+               for (i = 0; i < n; i++) {
+                  GLshort value = s[i];
+                  SWAP2BYTE(value);
+                  indexes[i] = value;
+               }
+            }
+            else {
+               for (i = 0; i < n; i++)
+                  indexes[i] = s[i];
+            }
+         }
+         break;
+      case GL_UNSIGNED_INT:
+         {
+            GLuint i;
+            const GLuint *s = (const GLuint *) src;
+            if (unpack->SwapBytes) {
+               for (i = 0; i < n; i++) {
+                  GLuint value = s[i];
+                  SWAP4BYTE(value);
+                  indexes[i] = value;
+               }
+            }
+            else {
+               for (i = 0; i < n; i++)
+                  indexes[i] = s[i];
+            }
+         }
+         break;
+      case GL_INT:
+         {
+            GLuint i;
+            const GLint *s = (const GLint *) src;
+            if (unpack->SwapBytes) {
+               for (i = 0; i < n; i++) {
+                  GLint value = s[i];
+                  SWAP4BYTE(value);
+                  indexes[i] = value;
+               }
+            }
+            else {
+               for (i = 0; i < n; i++)
+                  indexes[i] = s[i];
+            }
+         }
+         break;
+      case GL_FLOAT:
+         {
+            GLuint i;
+            const GLfloat *s = (const GLfloat *) src;
+            if (unpack->SwapBytes) {
+               for (i = 0; i < n; i++) {
+                  GLfloat value = s[i];
+                  SWAP4BYTE(value);
+                  indexes[i] = (GLuint) value;
+               }
+            }
+            else {
+               for (i = 0; i < n; i++)
+                  indexes[i] = (GLuint) s[i];
+            }
+         }
+         break;
+      case GL_HALF_FLOAT_NV:
+         {
+            GLuint i;
+            const GLhalfNV *s = (const GLhalfNV *) src;
+            if (unpack->SwapBytes) {
+               for (i = 0; i < n; i++) {
+                  GLhalfNV value = s[i];
+                  SWAP2BYTE(value);
+                  indexes[i] = (GLuint) _mesa_half_to_float(value);
+               }
+            }
+            else {
+               for (i = 0; i < n; i++)
+                  indexes[i] = (GLuint) _mesa_half_to_float(s[i]);
+            }
+         }
+         break;
+      default:
+         _mesa_problem(NULL, "bad srcType in extract_uint_indexes");
+         return;
+   }
+}
+
+
+/*
+ * This function extracts floating point RGBA values from arbitrary
+ * image data.  srcFormat and srcType are the format and type parameters
+ * passed to glDrawPixels, glTexImage[123]D, glTexSubImage[123]D, etc.
+ *
+ * Refering to section 3.6.4 of the OpenGL 1.2 spec, this function
+ * implements the "Conversion to floating point", "Conversion to RGB",
+ * and "Final Expansion to RGBA" operations.
+ *
+ * Args:  n - number of pixels
+ *        rgba - output colors
+ *        srcFormat - format of incoming data
+ *        srcType - data type of incoming data
+ *        src - source data pointer
+ *        swapBytes - perform byteswapping of incoming data?
+ */
+static void
+extract_float_rgba(GLuint n, GLfloat rgba[][4],
+                   GLenum srcFormat, GLenum srcType, const GLvoid *src,
+                   GLboolean swapBytes)
+{
+   GLint redIndex, greenIndex, blueIndex, alphaIndex;
+   GLint stride;
+   GLint rComp, bComp, gComp, aComp;
+
+   ASSERT(srcFormat == GL_RED ||
+          srcFormat == GL_GREEN ||
+          srcFormat == GL_BLUE ||
+          srcFormat == GL_ALPHA ||
+          srcFormat == GL_LUMINANCE ||
+          srcFormat == GL_LUMINANCE_ALPHA ||
+          srcFormat == GL_INTENSITY ||
+          srcFormat == GL_RGB ||
+          srcFormat == GL_BGR ||
+          srcFormat == GL_RGBA ||
+          srcFormat == GL_BGRA ||
+          srcFormat == GL_ABGR_EXT);
+
+   ASSERT(srcType == GL_UNSIGNED_BYTE ||
+          srcType == GL_BYTE ||
+          srcType == GL_UNSIGNED_SHORT ||
+          srcType == GL_SHORT ||
+          srcType == GL_UNSIGNED_INT ||
+          srcType == GL_INT ||
+          srcType == GL_HALF_FLOAT_NV ||
+          srcType == GL_FLOAT ||
+          srcType == GL_UNSIGNED_BYTE_3_3_2 ||
+          srcType == GL_UNSIGNED_BYTE_2_3_3_REV ||
+          srcType == GL_UNSIGNED_SHORT_5_6_5 ||
+          srcType == GL_UNSIGNED_SHORT_5_6_5_REV ||
+          srcType == GL_UNSIGNED_SHORT_4_4_4_4 ||
+          srcType == GL_UNSIGNED_SHORT_4_4_4_4_REV ||
+          srcType == GL_UNSIGNED_SHORT_5_5_5_1 ||
+          srcType == GL_UNSIGNED_SHORT_1_5_5_5_REV ||
+          srcType == GL_UNSIGNED_INT_8_8_8_8 ||
+          srcType == GL_UNSIGNED_INT_8_8_8_8_REV ||
+          srcType == GL_UNSIGNED_INT_10_10_10_2 ||
+          srcType == GL_UNSIGNED_INT_2_10_10_10_REV);
+
+   rComp = gComp = bComp = aComp = -1;
+
+   switch (srcFormat) {
+      case GL_RED:
+         redIndex = 0;
+         greenIndex = blueIndex = alphaIndex = -1;
+         stride = 1;
+         break;
+      case GL_GREEN:
+         greenIndex = 0;
+         redIndex = blueIndex = alphaIndex = -1;
+         stride = 1;
+         break;
+      case GL_BLUE:
+         blueIndex = 0;
+         redIndex = greenIndex = alphaIndex = -1;
+         stride = 1;
+         break;
+      case GL_ALPHA:
+         redIndex = greenIndex = blueIndex = -1;
+         alphaIndex = 0;
+         stride = 1;
+         break;
+      case GL_LUMINANCE:
+         redIndex = greenIndex = blueIndex = 0;
+         alphaIndex = -1;
+         stride = 1;
+         break;
+      case GL_LUMINANCE_ALPHA:
+         redIndex = greenIndex = blueIndex = 0;
+         alphaIndex = 1;
+         stride = 2;
+         break;
+      case GL_INTENSITY:
+         redIndex = greenIndex = blueIndex = alphaIndex = 0;
+         stride = 1;
+         break;
+      case GL_RGB:
+         redIndex = 0;
+         greenIndex = 1;
+         blueIndex = 2;
+         alphaIndex = -1;
+         stride = 3;
+         break;
+      case GL_BGR:
+         redIndex = 2;
+         greenIndex = 1;
+         blueIndex = 0;
+         alphaIndex = -1;
+         stride = 3;
+         break;
+      case GL_RGBA:
+         redIndex = 0;
+         greenIndex = 1;
+         blueIndex = 2;
+         alphaIndex = 3;
+         rComp = 0;
+         gComp = 1;
+         bComp = 2;
+         aComp = 3;
+         stride = 4;
+         break;
+      case GL_BGRA:
+         redIndex = 2;
+         greenIndex = 1;
+         blueIndex = 0;
+         alphaIndex = 3;
+         rComp = 2;
+         gComp = 1;
+         bComp = 0;
+         aComp = 3;
+         stride = 4;
+         break;
+      case GL_ABGR_EXT:
+         redIndex = 3;
+         greenIndex = 2;
+         blueIndex = 1;
+         alphaIndex = 0;
+         rComp = 3;
+         gComp = 2;
+         bComp = 1;
+         aComp = 0;
+         stride = 4;
+         break;
+      default:
+         _mesa_problem(NULL, "bad srcFormat in extract float data");
+         return;
+   }
+
+
+#define PROCESS(INDEX, CHANNEL, DEFAULT, TYPE, CONVERSION)		\
+   if ((INDEX) < 0) {							\
+      GLuint i;								\
+      for (i = 0; i < n; i++) {						\
+         rgba[i][CHANNEL] = DEFAULT;					\
+      }									\
+   }									\
+   else if (swapBytes) {						\
+      const TYPE *s = (const TYPE *) src;				\
+      GLuint i;								\
+      for (i = 0; i < n; i++) {						\
+         TYPE value = s[INDEX];						\
+         if (sizeof(TYPE) == 2) {					\
+            SWAP2BYTE(value);						\
+         }								\
+         else if (sizeof(TYPE) == 4) {					\
+            SWAP4BYTE(value);						\
+         }								\
+         rgba[i][CHANNEL] = (GLfloat) CONVERSION(value);		\
+         s += stride;							\
+      }									\
+   }									\
+   else {								\
+      const TYPE *s = (const TYPE *) src;				\
+      GLuint i;								\
+      for (i = 0; i < n; i++) {						\
+         rgba[i][CHANNEL] = (GLfloat) CONVERSION(s[INDEX]);		\
+         s += stride;							\
+      }									\
+   }
+
+   switch (srcType) {
+      case GL_UNSIGNED_BYTE:
+         PROCESS(redIndex,   RCOMP, 0.0F, GLubyte, UBYTE_TO_FLOAT);
+         PROCESS(greenIndex, GCOMP, 0.0F, GLubyte, UBYTE_TO_FLOAT);
+         PROCESS(blueIndex,  BCOMP, 0.0F, GLubyte, UBYTE_TO_FLOAT);
+         PROCESS(alphaIndex, ACOMP, 1.0F, GLubyte, UBYTE_TO_FLOAT);
+         break;
+      case GL_BYTE:
+         PROCESS(redIndex,   RCOMP, 0.0F, GLbyte, BYTE_TO_FLOAT);
+         PROCESS(greenIndex, GCOMP, 0.0F, GLbyte, BYTE_TO_FLOAT);
+         PROCESS(blueIndex,  BCOMP, 0.0F, GLbyte, BYTE_TO_FLOAT);
+         PROCESS(alphaIndex, ACOMP, 1.0F, GLbyte, BYTE_TO_FLOAT);
+         break;
+      case GL_UNSIGNED_SHORT:
+         PROCESS(redIndex,   RCOMP, 0.0F, GLushort, USHORT_TO_FLOAT);
+         PROCESS(greenIndex, GCOMP, 0.0F, GLushort, USHORT_TO_FLOAT);
+         PROCESS(blueIndex,  BCOMP, 0.0F, GLushort, USHORT_TO_FLOAT);
+         PROCESS(alphaIndex, ACOMP, 1.0F, GLushort, USHORT_TO_FLOAT);
+         break;
+      case GL_SHORT:
+         PROCESS(redIndex,   RCOMP, 0.0F, GLshort, SHORT_TO_FLOAT);
+         PROCESS(greenIndex, GCOMP, 0.0F, GLshort, SHORT_TO_FLOAT);
+         PROCESS(blueIndex,  BCOMP, 0.0F, GLshort, SHORT_TO_FLOAT);
+         PROCESS(alphaIndex, ACOMP, 1.0F, GLshort, SHORT_TO_FLOAT);
+         break;
+      case GL_UNSIGNED_INT:
+         PROCESS(redIndex,   RCOMP, 0.0F, GLuint, UINT_TO_FLOAT);
+         PROCESS(greenIndex, GCOMP, 0.0F, GLuint, UINT_TO_FLOAT);
+         PROCESS(blueIndex,  BCOMP, 0.0F, GLuint, UINT_TO_FLOAT);
+         PROCESS(alphaIndex, ACOMP, 1.0F, GLuint, UINT_TO_FLOAT);
+         break;
+      case GL_INT:
+         PROCESS(redIndex,   RCOMP, 0.0F, GLint, INT_TO_FLOAT);
+         PROCESS(greenIndex, GCOMP, 0.0F, GLint, INT_TO_FLOAT);
+         PROCESS(blueIndex,  BCOMP, 0.0F, GLint, INT_TO_FLOAT);
+         PROCESS(alphaIndex, ACOMP, 1.0F, GLint, INT_TO_FLOAT);
+         break;
+      case GL_FLOAT:
+         PROCESS(redIndex,   RCOMP, 0.0F, GLfloat, (GLfloat));
+         PROCESS(greenIndex, GCOMP, 0.0F, GLfloat, (GLfloat));
+         PROCESS(blueIndex,  BCOMP, 0.0F, GLfloat, (GLfloat));
+         PROCESS(alphaIndex, ACOMP, 1.0F, GLfloat, (GLfloat));
+         break;
+      case GL_HALF_FLOAT_NV:
+         PROCESS(redIndex,   RCOMP, 0.0F, GLhalfNV, _mesa_half_to_float);
+         PROCESS(greenIndex, GCOMP, 0.0F, GLhalfNV, _mesa_half_to_float);
+         PROCESS(blueIndex,  BCOMP, 0.0F, GLhalfNV, _mesa_half_to_float);
+         PROCESS(alphaIndex, ACOMP, 1.0F, GLhalfNV, _mesa_half_to_float);
+         break;
+      case GL_UNSIGNED_BYTE_3_3_2:
+         {
+            const GLubyte *ubsrc = (const GLubyte *) src;
+            GLuint i;
+            for (i = 0; i < n; i ++) {
+               GLubyte p = ubsrc[i];
+               rgba[i][RCOMP] = ((p >> 5)      ) * (1.0F / 7.0F);
+               rgba[i][GCOMP] = ((p >> 2) & 0x7) * (1.0F / 7.0F);
+               rgba[i][BCOMP] = ((p     ) & 0x3) * (1.0F / 3.0F);
+               rgba[i][ACOMP] = 1.0F;
+            }
+         }
+         break;
+      case GL_UNSIGNED_BYTE_2_3_3_REV:
+         {
+            const GLubyte *ubsrc = (const GLubyte *) src;
+            GLuint i;
+            for (i = 0; i < n; i ++) {
+               GLubyte p = ubsrc[i];
+               rgba[i][RCOMP] = ((p     ) & 0x7) * (1.0F / 7.0F);
+               rgba[i][GCOMP] = ((p >> 3) & 0x7) * (1.0F / 7.0F);
+               rgba[i][BCOMP] = ((p >> 6)      ) * (1.0F / 3.0F);
+               rgba[i][ACOMP] = 1.0F;
+            }
+         }
+         break;
+      case GL_UNSIGNED_SHORT_5_6_5:
+         if (swapBytes) {
+            const GLushort *ussrc = (const GLushort *) src;
+            GLuint i;
+            for (i = 0; i < n; i ++) {
+               GLushort p = ussrc[i];
+               SWAP2BYTE(p);
+               rgba[i][RCOMP] = ((p >> 11)       ) * (1.0F / 31.0F);
+               rgba[i][GCOMP] = ((p >>  5) & 0x3f) * (1.0F / 63.0F);
+               rgba[i][BCOMP] = ((p      ) & 0x1f) * (1.0F / 31.0F);
+               rgba[i][ACOMP] = 1.0F;
+            }
+         }
+         else {
+            const GLushort *ussrc = (const GLushort *) src;
+            GLuint i;
+            for (i = 0; i < n; i ++) {
+               GLushort p = ussrc[i];
+               rgba[i][RCOMP] = ((p >> 11)       ) * (1.0F / 31.0F);
+               rgba[i][GCOMP] = ((p >>  5) & 0x3f) * (1.0F / 63.0F);
+               rgba[i][BCOMP] = ((p      ) & 0x1f) * (1.0F / 31.0F);
+               rgba[i][ACOMP] = 1.0F;
+            }
+         }
+         break;
+      case GL_UNSIGNED_SHORT_5_6_5_REV:
+         if (swapBytes) {
+            const GLushort *ussrc = (const GLushort *) src;
+            GLuint i;
+            for (i = 0; i < n; i ++) {
+               GLushort p = ussrc[i];
+               SWAP2BYTE(p);
+               rgba[i][RCOMP] = ((p      ) & 0x1f) * (1.0F / 31.0F);
+               rgba[i][GCOMP] = ((p >>  5) & 0x3f) * (1.0F / 63.0F);
+               rgba[i][BCOMP] = ((p >> 11)       ) * (1.0F / 31.0F);
+               rgba[i][ACOMP] = 1.0F;
+            }
+         }
+         else {
+            const GLushort *ussrc = (const GLushort *) src;
+            GLuint i;
+            for (i = 0; i < n; i ++) {
+               GLushort p = ussrc[i];
+               rgba[i][RCOMP] = ((p      ) & 0x1f) * (1.0F / 31.0F);
+               rgba[i][GCOMP] = ((p >>  5) & 0x3f) * (1.0F / 63.0F);
+               rgba[i][BCOMP] = ((p >> 11)       ) * (1.0F / 31.0F);
+               rgba[i][ACOMP] = 1.0F;
+            }
+         }
+         break;
+      case GL_UNSIGNED_SHORT_4_4_4_4:
+         if (swapBytes) {
+            const GLushort *ussrc = (const GLushort *) src;
+            GLuint i;
+            for (i = 0; i < n; i ++) {
+               GLushort p = ussrc[i];
+               SWAP2BYTE(p);
+               rgba[i][rComp] = ((p >> 12)      ) * (1.0F / 15.0F);
+               rgba[i][gComp] = ((p >>  8) & 0xf) * (1.0F / 15.0F);
+               rgba[i][bComp] = ((p >>  4) & 0xf) * (1.0F / 15.0F);
+               rgba[i][aComp] = ((p      ) & 0xf) * (1.0F / 15.0F);
+            }
+         }
+         else {
+            const GLushort *ussrc = (const GLushort *) src;
+            GLuint i;
+            for (i = 0; i < n; i ++) {
+               GLushort p = ussrc[i];
+               rgba[i][rComp] = ((p >> 12)      ) * (1.0F / 15.0F);
+               rgba[i][gComp] = ((p >>  8) & 0xf) * (1.0F / 15.0F);
+               rgba[i][bComp] = ((p >>  4) & 0xf) * (1.0F / 15.0F);
+               rgba[i][aComp] = ((p      ) & 0xf) * (1.0F / 15.0F);
+            }
+         }
+         break;
+      case GL_UNSIGNED_SHORT_4_4_4_4_REV:
+         if (swapBytes) {
+            const GLushort *ussrc = (const GLushort *) src;
+            GLuint i;
+            for (i = 0; i < n; i ++) {
+               GLushort p = ussrc[i];
+               SWAP2BYTE(p);
+               rgba[i][rComp] = ((p      ) & 0xf) * (1.0F / 15.0F);
+               rgba[i][gComp] = ((p >>  4) & 0xf) * (1.0F / 15.0F);
+               rgba[i][bComp] = ((p >>  8) & 0xf) * (1.0F / 15.0F);
+               rgba[i][aComp] = ((p >> 12)      ) * (1.0F / 15.0F);
+            }
+         }
+         else {
+            const GLushort *ussrc = (const GLushort *) src;
+            GLuint i;
+            for (i = 0; i < n; i ++) {
+               GLushort p = ussrc[i];
+               rgba[i][rComp] = ((p      ) & 0xf) * (1.0F / 15.0F);
+               rgba[i][gComp] = ((p >>  4) & 0xf) * (1.0F / 15.0F);
+               rgba[i][bComp] = ((p >>  8) & 0xf) * (1.0F / 15.0F);
+               rgba[i][aComp] = ((p >> 12)      ) * (1.0F / 15.0F);
+            }
+         }
+         break;
+      case GL_UNSIGNED_SHORT_5_5_5_1:
+         if (swapBytes) {
+            const GLushort *ussrc = (const GLushort *) src;
+            GLuint i;
+            for (i = 0; i < n; i ++) {
+               GLushort p = ussrc[i];
+               SWAP2BYTE(p);
+               rgba[i][rComp] = ((p >> 11)       ) * (1.0F / 31.0F);
+               rgba[i][gComp] = ((p >>  6) & 0x1f) * (1.0F / 31.0F);
+               rgba[i][bComp] = ((p >>  1) & 0x1f) * (1.0F / 31.0F);
+               rgba[i][aComp] = ((p      ) & 0x1)  * (1.0F /  1.0F);
+            }
+         }
+         else {
+            const GLushort *ussrc = (const GLushort *) src;
+            GLuint i;
+            for (i = 0; i < n; i ++) {
+               GLushort p = ussrc[i];
+               rgba[i][rComp] = ((p >> 11)       ) * (1.0F / 31.0F);
+               rgba[i][gComp] = ((p >>  6) & 0x1f) * (1.0F / 31.0F);
+               rgba[i][bComp] = ((p >>  1) & 0x1f) * (1.0F / 31.0F);
+               rgba[i][aComp] = ((p      ) & 0x1)  * (1.0F /  1.0F);
+            }
+         }
+         break;
+      case GL_UNSIGNED_SHORT_1_5_5_5_REV:
+         if (swapBytes) {
+            const GLushort *ussrc = (const GLushort *) src;
+            GLuint i;
+            for (i = 0; i < n; i ++) {
+               GLushort p = ussrc[i];
+               SWAP2BYTE(p);
+               rgba[i][rComp] = ((p      ) & 0x1f) * (1.0F / 31.0F);
+               rgba[i][gComp] = ((p >>  5) & 0x1f) * (1.0F / 31.0F);
+               rgba[i][bComp] = ((p >> 10) & 0x1f) * (1.0F / 31.0F);
+               rgba[i][aComp] = ((p >> 15)       ) * (1.0F /  1.0F);
+            }
+         }
+         else {
+            const GLushort *ussrc = (const GLushort *) src;
+            GLuint i;
+            for (i = 0; i < n; i ++) {
+               GLushort p = ussrc[i];
+               rgba[i][rComp] = ((p      ) & 0x1f) * (1.0F / 31.0F);
+               rgba[i][gComp] = ((p >>  5) & 0x1f) * (1.0F / 31.0F);
+               rgba[i][bComp] = ((p >> 10) & 0x1f) * (1.0F / 31.0F);
+               rgba[i][aComp] = ((p >> 15)       ) * (1.0F /  1.0F);
+            }
+         }
+         break;
+      case GL_UNSIGNED_INT_8_8_8_8:
+         if (swapBytes) {
+            const GLuint *uisrc = (const GLuint *) src;
+            GLuint i;
+            for (i = 0; i < n; i ++) {
+               GLuint p = uisrc[i];
+               rgba[i][rComp] = UBYTE_TO_FLOAT((p      ) & 0xff);
+               rgba[i][gComp] = UBYTE_TO_FLOAT((p >>  8) & 0xff);
+               rgba[i][bComp] = UBYTE_TO_FLOAT((p >> 16) & 0xff);
+               rgba[i][aComp] = UBYTE_TO_FLOAT((p >> 24)       );
+            }
+         }
+         else {
+            const GLuint *uisrc = (const GLuint *) src;
+            GLuint i;
+            for (i = 0; i < n; i ++) {
+               GLuint p = uisrc[i];
+               rgba[i][rComp] = UBYTE_TO_FLOAT((p >> 24)       );
+               rgba[i][gComp] = UBYTE_TO_FLOAT((p >> 16) & 0xff);
+               rgba[i][bComp] = UBYTE_TO_FLOAT((p >>  8) & 0xff);
+               rgba[i][aComp] = UBYTE_TO_FLOAT((p      ) & 0xff);
+            }
+         }
+         break;
+      case GL_UNSIGNED_INT_8_8_8_8_REV:
+         if (swapBytes) {
+            const GLuint *uisrc = (const GLuint *) src;
+            GLuint i;
+            for (i = 0; i < n; i ++) {
+               GLuint p = uisrc[i];
+               rgba[i][rComp] = UBYTE_TO_FLOAT((p >> 24)       );
+               rgba[i][gComp] = UBYTE_TO_FLOAT((p >> 16) & 0xff);
+               rgba[i][bComp] = UBYTE_TO_FLOAT((p >>  8) & 0xff);
+               rgba[i][aComp] = UBYTE_TO_FLOAT((p      ) & 0xff);
+            }
+         }
+         else {
+            const GLuint *uisrc = (const GLuint *) src;
+            GLuint i;
+            for (i = 0; i < n; i ++) {
+               GLuint p = uisrc[i];
+               rgba[i][rComp] = UBYTE_TO_FLOAT((p      ) & 0xff);
+               rgba[i][gComp] = UBYTE_TO_FLOAT((p >>  8) & 0xff);
+               rgba[i][bComp] = UBYTE_TO_FLOAT((p >> 16) & 0xff);
+               rgba[i][aComp] = UBYTE_TO_FLOAT((p >> 24)       );
+            }
+         }
+         break;
+      case GL_UNSIGNED_INT_10_10_10_2:
+         if (swapBytes) {
+            const GLuint *uisrc = (const GLuint *) src;
+            GLuint i;
+            for (i = 0; i < n; i ++) {
+               GLuint p = uisrc[i];
+               SWAP4BYTE(p);
+               rgba[i][rComp] = ((p >> 22)        ) * (1.0F / 1023.0F);
+               rgba[i][gComp] = ((p >> 12) & 0x3ff) * (1.0F / 1023.0F);
+               rgba[i][bComp] = ((p >>  2) & 0x3ff) * (1.0F / 1023.0F);
+               rgba[i][aComp] = ((p      ) & 0x3  ) * (1.0F /    3.0F);
+            }
+         }
+         else {
+            const GLuint *uisrc = (const GLuint *) src;
+            GLuint i;
+            for (i = 0; i < n; i ++) {
+               GLuint p = uisrc[i];
+               rgba[i][rComp] = ((p >> 22)        ) * (1.0F / 1023.0F);
+               rgba[i][gComp] = ((p >> 12) & 0x3ff) * (1.0F / 1023.0F);
+               rgba[i][bComp] = ((p >>  2) & 0x3ff) * (1.0F / 1023.0F);
+               rgba[i][aComp] = ((p      ) & 0x3  ) * (1.0F /    3.0F);
+            }
+         }
+         break;
+      case GL_UNSIGNED_INT_2_10_10_10_REV:
+         if (swapBytes) {
+            const GLuint *uisrc = (const GLuint *) src;
+            GLuint i;
+            for (i = 0; i < n; i ++) {
+               GLuint p = uisrc[i];
+               SWAP4BYTE(p);
+               rgba[i][rComp] = ((p      ) & 0x3ff) * (1.0F / 1023.0F);
+               rgba[i][gComp] = ((p >> 10) & 0x3ff) * (1.0F / 1023.0F);
+               rgba[i][bComp] = ((p >> 20) & 0x3ff) * (1.0F / 1023.0F);
+               rgba[i][aComp] = ((p >> 30)        ) * (1.0F /    3.0F);
+            }
+         }
+         else {
+            const GLuint *uisrc = (const GLuint *) src;
+            GLuint i;
+            for (i = 0; i < n; i ++) {
+               GLuint p = uisrc[i];
+               rgba[i][rComp] = ((p      ) & 0x3ff) * (1.0F / 1023.0F);
+               rgba[i][gComp] = ((p >> 10) & 0x3ff) * (1.0F / 1023.0F);
+               rgba[i][bComp] = ((p >> 20) & 0x3ff) * (1.0F / 1023.0F);
+               rgba[i][aComp] = ((p >> 30)        ) * (1.0F /    3.0F);
+            }
+         }
+         break;
+      default:
+         _mesa_problem(NULL, "bad srcType in extract float data");
+         break;
+   }
+}
+
+
+/*
+ * Unpack a row of color image data from a client buffer according to
+ * the pixel unpacking parameters.
+ * Return GLubyte values in the specified dest image format.
+ * This is (or will be) used by glDrawPixels and glTexImage?D().
+ * \param ctx - the context
+ *         n - number of pixels in the span
+ *         dstFormat - format of destination color array
+ *         dest - the destination color array
+ *         srcFormat - source image format
+ *         srcType - source image  data type
+ *         source - source image pointer
+ *         srcPacking - pixel unpacking parameters
+ *         transferOps - bitmask of IMAGE_*_BIT values of operations to apply
+ *
+ * XXX perhaps expand this to process whole images someday.
+ */
+void
+_mesa_unpack_chan_color_span( GLcontext *ctx,
+                              GLuint n, GLenum dstFormat, GLchan dest[],
+                              GLenum srcFormat, GLenum srcType,
+                              const GLvoid *source,
+                              const struct gl_pixelstore_attrib *srcPacking,
+                              GLuint transferOps )
+{
+   ASSERT(dstFormat == GL_ALPHA ||
+          dstFormat == GL_LUMINANCE ||
+          dstFormat == GL_LUMINANCE_ALPHA ||
+          dstFormat == GL_INTENSITY ||
+          dstFormat == GL_RGB ||
+          dstFormat == GL_RGBA ||
+          dstFormat == GL_COLOR_INDEX);
+
+   ASSERT(srcFormat == GL_RED ||
+          srcFormat == GL_GREEN ||
+          srcFormat == GL_BLUE ||
+          srcFormat == GL_ALPHA ||
+          srcFormat == GL_LUMINANCE ||
+          srcFormat == GL_LUMINANCE_ALPHA ||
+          srcFormat == GL_INTENSITY ||
+          srcFormat == GL_RGB ||
+          srcFormat == GL_BGR ||
+          srcFormat == GL_RGBA ||
+          srcFormat == GL_BGRA ||
+          srcFormat == GL_ABGR_EXT ||
+          srcFormat == GL_COLOR_INDEX);
+
+   ASSERT(srcType == GL_BITMAP ||
+          srcType == GL_UNSIGNED_BYTE ||
+          srcType == GL_BYTE ||
+          srcType == GL_UNSIGNED_SHORT ||
+          srcType == GL_SHORT ||
+          srcType == GL_UNSIGNED_INT ||
+          srcType == GL_INT ||
+          srcType == GL_HALF_FLOAT_NV ||
+          srcType == GL_FLOAT ||
+          srcType == GL_UNSIGNED_BYTE_3_3_2 ||
+          srcType == GL_UNSIGNED_BYTE_2_3_3_REV ||
+          srcType == GL_UNSIGNED_SHORT_5_6_5 ||
+          srcType == GL_UNSIGNED_SHORT_5_6_5_REV ||
+          srcType == GL_UNSIGNED_SHORT_4_4_4_4 ||
+          srcType == GL_UNSIGNED_SHORT_4_4_4_4_REV ||
+          srcType == GL_UNSIGNED_SHORT_5_5_5_1 ||
+          srcType == GL_UNSIGNED_SHORT_1_5_5_5_REV ||
+          srcType == GL_UNSIGNED_INT_8_8_8_8 ||
+          srcType == GL_UNSIGNED_INT_8_8_8_8_REV ||
+          srcType == GL_UNSIGNED_INT_10_10_10_2 ||
+          srcType == GL_UNSIGNED_INT_2_10_10_10_REV);
+
+   /* Try simple cases first */
+   if (transferOps == 0 ){
+      if (srcType == CHAN_TYPE) {
+         if (dstFormat == GL_RGBA) {
+            if (srcFormat == GL_RGBA) {
+               MEMCPY( dest, source, n * 4 * sizeof(GLchan) );
+               return;
+            }
+            else if (srcFormat == GL_RGB) {
+               GLuint i;
+               const GLchan *src = (const GLchan *) source;
+               GLchan *dst = dest;
+               for (i = 0; i < n; i++) {
+                  dst[0] = src[0];
+                  dst[1] = src[1];
+                  dst[2] = src[2];
+                  dst[3] = CHAN_MAX;
+                  src += 3;
+                  dst += 4;
+               }
+               return;
+            }
+         }
+         else if (dstFormat == GL_RGB) {
+            if (srcFormat == GL_RGB) {
+               MEMCPY( dest, source, n * 3 * sizeof(GLchan) );
+               return;
+            }
+            else if (srcFormat == GL_RGBA) {
+               GLuint i;
+               const GLchan *src = (const GLchan *) source;
+               GLchan *dst = dest;
+               for (i = 0; i < n; i++) {
+                  dst[0] = src[0];
+                  dst[1] = src[1];
+                  dst[2] = src[2];
+                  src += 4;
+                  dst += 3;
+               }
+               return;
+            }
+         }
+         else if (dstFormat == srcFormat) {
+            GLint comps = _mesa_components_in_format(srcFormat);
+            assert(comps > 0);
+            MEMCPY( dest, source, n * comps * sizeof(GLchan) );
+            return;
+         }
+      }
+      /*
+       * Common situation, loading 8bit RGBA/RGB source images
+       * into 16/32 bit destination. (OSMesa16/32)
+       */
+      else if (srcType == GL_UNSIGNED_BYTE) {
+         if (dstFormat == GL_RGBA) {
+            if (srcFormat == GL_RGB) {
+               GLuint i;
+               const GLubyte *src = (const GLubyte *) source;
+               GLchan *dst = dest;
+               for (i = 0; i < n; i++) {
+                  dst[0] = UBYTE_TO_CHAN(src[0]);
+                  dst[1] = UBYTE_TO_CHAN(src[1]);
+                  dst[2] = UBYTE_TO_CHAN(src[2]);
+                  dst[3] = CHAN_MAX;
+                  src += 3;
+                  dst += 4;
+               }
+               return;
+            }
+            else if (srcFormat == GL_RGBA) {
+               GLuint i;
+               const GLubyte *src = (const GLubyte *) source;
+               GLchan *dst = dest;
+               for (i = 0; i < n; i++) {
+                  dst[0] = UBYTE_TO_CHAN(src[0]);
+                  dst[1] = UBYTE_TO_CHAN(src[1]);
+                  dst[2] = UBYTE_TO_CHAN(src[2]);
+                  dst[3] = UBYTE_TO_CHAN(src[3]);
+                  src += 4;
+                  dst += 4;
+               }
+               return;
+             }
+         }
+         else if (dstFormat == GL_RGB) {
+            if (srcFormat == GL_RGB) {
+               GLuint i;
+               const GLubyte *src = (const GLubyte *) source;
+               GLchan *dst = dest;
+               for (i = 0; i < n; i++) {
+                  dst[0] = UBYTE_TO_CHAN(src[0]);
+                  dst[1] = UBYTE_TO_CHAN(src[1]);
+                  dst[2] = UBYTE_TO_CHAN(src[2]);
+                  src += 3;
+                  dst += 3;
+               }
+               return;
+            }
+            else if (srcFormat == GL_RGBA) {
+               GLuint i;
+               const GLubyte *src = (const GLubyte *) source;
+               GLchan *dst = dest;
+               for (i = 0; i < n; i++) {
+                  dst[0] = UBYTE_TO_CHAN(src[0]);
+                  dst[1] = UBYTE_TO_CHAN(src[1]);
+                  dst[2] = UBYTE_TO_CHAN(src[2]);
+                  src += 4;
+                  dst += 3;
+               }
+               return;
+            }
+         }
+      }
+   }
+
+
+   /* general solution begins here */
+   {
+      GLint dstComponents;
+      GLint dstRedIndex, dstGreenIndex, dstBlueIndex, dstAlphaIndex;
+      GLint dstLuminanceIndex, dstIntensityIndex;
+      DEFMARRAY(GLfloat, rgba, MAX_WIDTH, 4);  /* mac 32k limitation */
+      CHECKARRAY(rgba, return);  /* mac 32k limitation */
+
+      dstComponents = _mesa_components_in_format( dstFormat );
+      /* source & dest image formats should have been error checked by now */
+      assert(dstComponents > 0);
+
+      /*
+       * Extract image data and convert to RGBA floats
+       */
+      assert(n <= MAX_WIDTH);
+      if (srcFormat == GL_COLOR_INDEX) {
+         GLuint indexes[MAX_WIDTH];
+         extract_uint_indexes(n, indexes, srcFormat, srcType, source,
+                              srcPacking);
+
+         if (dstFormat == GL_COLOR_INDEX
+             && (transferOps & IMAGE_MAP_COLOR_BIT)) {
+            _mesa_map_ci(ctx, n, indexes);
+         }
+         if (transferOps & IMAGE_SHIFT_OFFSET_BIT) {
+            _mesa_shift_and_offset_ci(ctx, n, indexes);
+         }
+
+         if (dstFormat == GL_COLOR_INDEX) {
+            /* convert to GLchan and return */
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               dest[i] = (GLchan) (indexes[i] & 0xff);
+            }
+            UNDEFARRAY(rgba);  /* mac 32k limitation */
+            return;
+         }
+         else {
+            /* Convert indexes to RGBA */
+            _mesa_map_ci_to_rgba(ctx, n, indexes, rgba);
+         }
+      }
+      else {
+         extract_float_rgba(n, rgba, srcFormat, srcType, source,
+                            srcPacking->SwapBytes);
+
+         /* scale and bias colors */
+         if (transferOps & IMAGE_SCALE_BIAS_BIT) {
+            _mesa_scale_and_bias_rgba(ctx, n, rgba,
+                                   ctx->Pixel.RedScale, ctx->Pixel.GreenScale,
+                                   ctx->Pixel.BlueScale, ctx->Pixel.AlphaScale,
+                                   ctx->Pixel.RedBias, ctx->Pixel.GreenBias,
+                                   ctx->Pixel.BlueBias, ctx->Pixel.AlphaBias);
+         }
+         /* color map lookup */
+         if (transferOps & IMAGE_MAP_COLOR_BIT) {
+            _mesa_map_rgba(ctx, n, rgba);
+         }
+      }
+
+      if (transferOps) {
+         /* GL_COLOR_TABLE lookup */
+         if (transferOps & IMAGE_COLOR_TABLE_BIT) {
+            _mesa_lookup_rgba(&ctx->ColorTable, n, rgba);
+         }
+         /* convolution */
+         if (transferOps & IMAGE_CONVOLUTION_BIT) {
+            /* this has to be done in the calling code */
+         }
+         /* GL_POST_CONVOLUTION_RED/GREEN/BLUE/ALPHA_SCALE/BIAS */
+         if (transferOps & IMAGE_POST_CONVOLUTION_SCALE_BIAS) {
+            _mesa_scale_and_bias_rgba(ctx, n, rgba,
+                                      ctx->Pixel.PostConvolutionScale[RCOMP],
+                                      ctx->Pixel.PostConvolutionScale[GCOMP],
+                                      ctx->Pixel.PostConvolutionScale[BCOMP],
+                                      ctx->Pixel.PostConvolutionScale[ACOMP],
+                                      ctx->Pixel.PostConvolutionBias[RCOMP],
+                                      ctx->Pixel.PostConvolutionBias[GCOMP],
+                                      ctx->Pixel.PostConvolutionBias[BCOMP],
+                                      ctx->Pixel.PostConvolutionBias[ACOMP]);
+         }
+         /* GL_POST_CONVOLUTION_COLOR_TABLE lookup */
+         if (transferOps & IMAGE_POST_CONVOLUTION_COLOR_TABLE_BIT) {
+            _mesa_lookup_rgba(&ctx->PostConvolutionColorTable, n, rgba);
+         }
+         /* color matrix transform */
+         if (transferOps & IMAGE_COLOR_MATRIX_BIT) {
+            _mesa_transform_rgba(ctx, n, rgba);
+         }
+         /* GL_POST_COLOR_MATRIX_COLOR_TABLE lookup */
+         if (transferOps & IMAGE_POST_COLOR_MATRIX_COLOR_TABLE_BIT) {
+            _mesa_lookup_rgba(&ctx->PostColorMatrixColorTable, n, rgba);
+         }
+         /* update histogram count */
+         if (transferOps & IMAGE_HISTOGRAM_BIT) {
+            _mesa_update_histogram(ctx, n, (CONST GLfloat (*)[4]) rgba);
+         }
+         /* min/max here */
+         if (transferOps & IMAGE_MIN_MAX_BIT) {
+            _mesa_update_minmax(ctx, n, (CONST GLfloat (*)[4]) rgba);
+         }
+      }
+
+      /* clamp to [0,1] */
+#if CHAN_TYPE != GL_FLOAT
+      {
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            rgba[i][RCOMP] = CLAMP(rgba[i][RCOMP], 0.0F, 1.0F);
+            rgba[i][GCOMP] = CLAMP(rgba[i][GCOMP], 0.0F, 1.0F);
+            rgba[i][BCOMP] = CLAMP(rgba[i][BCOMP], 0.0F, 1.0F);
+            rgba[i][ACOMP] = CLAMP(rgba[i][ACOMP], 0.0F, 1.0F);
+         }
+      }
+#endif
+
+      /* Now determine which color channels we need to produce.
+       * And determine the dest index (offset) within each color tuple.
+       */
+      switch (dstFormat) {
+         case GL_ALPHA:
+            dstAlphaIndex = 0;
+            dstRedIndex = dstGreenIndex = dstBlueIndex = -1;
+            dstLuminanceIndex = dstIntensityIndex = -1;
+            break;
+         case GL_LUMINANCE:
+            dstLuminanceIndex = 0;
+            dstRedIndex = dstGreenIndex = dstBlueIndex = dstAlphaIndex = -1;
+            dstIntensityIndex = -1;
+            break;
+         case GL_LUMINANCE_ALPHA:
+            dstLuminanceIndex = 0;
+            dstAlphaIndex = 1;
+            dstRedIndex = dstGreenIndex = dstBlueIndex = -1;
+            dstIntensityIndex = -1;
+            break;
+         case GL_INTENSITY:
+            dstIntensityIndex = 0;
+            dstRedIndex = dstGreenIndex = dstBlueIndex = dstAlphaIndex = -1;
+            dstLuminanceIndex = -1;
+            break;
+         case GL_RGB:
+            dstRedIndex = 0;
+            dstGreenIndex = 1;
+            dstBlueIndex = 2;
+            dstAlphaIndex = dstLuminanceIndex = dstIntensityIndex = -1;
+            break;
+         case GL_RGBA:
+            dstRedIndex = 0;
+            dstGreenIndex = 1;
+            dstBlueIndex = 2;
+            dstAlphaIndex = 3;
+            dstLuminanceIndex = dstIntensityIndex = -1;
+            break;
+         default:
+            _mesa_problem(ctx, "bad dstFormat in _mesa_unpack_chan_span()");
+            UNDEFARRAY(rgba);  /* mac 32k limitation */
+            return;
+      }
+
+
+      /* Now return the GLchan data in the requested dstFormat */
+
+      if (dstRedIndex >= 0) {
+         GLchan *dst = dest;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            CLAMPED_FLOAT_TO_CHAN(dst[dstRedIndex], rgba[i][RCOMP]);
+            dst += dstComponents;
+         }
+      }
+
+      if (dstGreenIndex >= 0) {
+         GLchan *dst = dest;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            CLAMPED_FLOAT_TO_CHAN(dst[dstGreenIndex], rgba[i][GCOMP]);
+            dst += dstComponents;
+         }
+      }
+
+      if (dstBlueIndex >= 0) {
+         GLchan *dst = dest;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            CLAMPED_FLOAT_TO_CHAN(dst[dstBlueIndex], rgba[i][BCOMP]);
+            dst += dstComponents;
+         }
+      }
+
+      if (dstAlphaIndex >= 0) {
+         GLchan *dst = dest;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            CLAMPED_FLOAT_TO_CHAN(dst[dstAlphaIndex], rgba[i][ACOMP]);
+            dst += dstComponents;
+         }
+      }
+
+      if (dstIntensityIndex >= 0) {
+         GLchan *dst = dest;
+         GLuint i;
+         assert(dstIntensityIndex == 0);
+         assert(dstComponents == 1);
+         for (i = 0; i < n; i++) {
+            /* Intensity comes from red channel */
+            CLAMPED_FLOAT_TO_CHAN(dst[i], rgba[i][RCOMP]);
+         }
+      }
+
+      if (dstLuminanceIndex >= 0) {
+         GLchan *dst = dest;
+         GLuint i;
+         assert(dstLuminanceIndex == 0);
+         for (i = 0; i < n; i++) {
+            /* Luminance comes from red channel */
+            CLAMPED_FLOAT_TO_CHAN(dst[0], rgba[i][RCOMP]);
+            dst += dstComponents;
+         }
+      }
+      UNDEFARRAY(rgba);  /* mac 32k limitation */
+   }
+}
+
+
+void
+_mesa_unpack_float_color_span( GLcontext *ctx,
+                               GLuint n, GLenum dstFormat, GLfloat dest[],
+                               GLenum srcFormat, GLenum srcType,
+                               const GLvoid *source,
+                               const struct gl_pixelstore_attrib *srcPacking,
+                               GLuint transferOps, GLboolean clamp )
+{
+   ASSERT(dstFormat == GL_ALPHA ||
+          dstFormat == GL_LUMINANCE ||
+          dstFormat == GL_LUMINANCE_ALPHA ||
+          dstFormat == GL_INTENSITY ||
+          dstFormat == GL_RGB ||
+          dstFormat == GL_RGBA ||
+          dstFormat == GL_COLOR_INDEX);
+
+   ASSERT(srcFormat == GL_RED ||
+          srcFormat == GL_GREEN ||
+          srcFormat == GL_BLUE ||
+          srcFormat == GL_ALPHA ||
+          srcFormat == GL_LUMINANCE ||
+          srcFormat == GL_LUMINANCE_ALPHA ||
+          srcFormat == GL_INTENSITY ||
+          srcFormat == GL_RGB ||
+          srcFormat == GL_BGR ||
+          srcFormat == GL_RGBA ||
+          srcFormat == GL_BGRA ||
+          srcFormat == GL_ABGR_EXT ||
+          srcFormat == GL_COLOR_INDEX);
+
+   ASSERT(srcType == GL_BITMAP ||
+          srcType == GL_UNSIGNED_BYTE ||
+          srcType == GL_BYTE ||
+          srcType == GL_UNSIGNED_SHORT ||
+          srcType == GL_SHORT ||
+          srcType == GL_UNSIGNED_INT ||
+          srcType == GL_INT ||
+          srcType == GL_HALF_FLOAT_NV ||
+          srcType == GL_FLOAT ||
+          srcType == GL_UNSIGNED_BYTE_3_3_2 ||
+          srcType == GL_UNSIGNED_BYTE_2_3_3_REV ||
+          srcType == GL_UNSIGNED_SHORT_5_6_5 ||
+          srcType == GL_UNSIGNED_SHORT_5_6_5_REV ||
+          srcType == GL_UNSIGNED_SHORT_4_4_4_4 ||
+          srcType == GL_UNSIGNED_SHORT_4_4_4_4_REV ||
+          srcType == GL_UNSIGNED_SHORT_5_5_5_1 ||
+          srcType == GL_UNSIGNED_SHORT_1_5_5_5_REV ||
+          srcType == GL_UNSIGNED_INT_8_8_8_8 ||
+          srcType == GL_UNSIGNED_INT_8_8_8_8_REV ||
+          srcType == GL_UNSIGNED_INT_10_10_10_2 ||
+          srcType == GL_UNSIGNED_INT_2_10_10_10_REV);
+
+   /* general solution, no special cases, yet */
+   {
+      GLint dstComponents;
+      GLint dstRedIndex, dstGreenIndex, dstBlueIndex, dstAlphaIndex;
+      GLint dstLuminanceIndex, dstIntensityIndex;
+      DEFMARRAY(GLfloat, rgba, MAX_WIDTH, 4);  /* mac 32k limitation */
+      CHECKARRAY(rgba, return);  /* mac 32k limitation */
+
+      dstComponents = _mesa_components_in_format( dstFormat );
+      /* source & dest image formats should have been error checked by now */
+      assert(dstComponents > 0);
+
+      /*
+       * Extract image data and convert to RGBA floats
+       */
+      assert(n <= MAX_WIDTH);
+      if (srcFormat == GL_COLOR_INDEX) {
+         GLuint indexes[MAX_WIDTH];
+         extract_uint_indexes(n, indexes, srcFormat, srcType, source,
+                              srcPacking);
+
+         if (dstFormat == GL_COLOR_INDEX
+             && (transferOps & IMAGE_MAP_COLOR_BIT)) {
+            _mesa_map_ci(ctx, n, indexes);
+         }
+         if (transferOps & IMAGE_SHIFT_OFFSET_BIT) {
+            _mesa_shift_and_offset_ci(ctx, n, indexes);
+         }
+
+         if (dstFormat == GL_COLOR_INDEX) {
+            /* convert to GLchan and return */
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               dest[i] = (GLchan) (indexes[i] & 0xff);
+            }
+            UNDEFARRAY(rgba);  /* mac 32k limitation */
+            return;
+         }
+         else {
+            /* Convert indexes to RGBA */
+            _mesa_map_ci_to_rgba(ctx, n, indexes, rgba);
+         }
+      }
+      else {
+         extract_float_rgba(n, rgba, srcFormat, srcType, source,
+                            srcPacking->SwapBytes);
+
+         /* scale and bias colors */
+         if (transferOps & IMAGE_SCALE_BIAS_BIT) {
+            _mesa_scale_and_bias_rgba(ctx, n, rgba,
+                                   ctx->Pixel.RedScale, ctx->Pixel.GreenScale,
+                                   ctx->Pixel.BlueScale, ctx->Pixel.AlphaScale,
+                                   ctx->Pixel.RedBias, ctx->Pixel.GreenBias,
+                                   ctx->Pixel.BlueBias, ctx->Pixel.AlphaBias);
+         }
+         /* color map lookup */
+         if (transferOps & IMAGE_MAP_COLOR_BIT) {
+            _mesa_map_rgba(ctx, n, rgba);
+         }
+      }
+
+      if (transferOps) {
+         /* GL_COLOR_TABLE lookup */
+         if (transferOps & IMAGE_COLOR_TABLE_BIT) {
+            _mesa_lookup_rgba(&ctx->ColorTable, n, rgba);
+         }
+         /* convolution */
+         if (transferOps & IMAGE_CONVOLUTION_BIT) {
+            /* XXX to do */
+         }
+         /* GL_POST_CONVOLUTION_RED/GREEN/BLUE/ALPHA_SCALE/BIAS */
+         if (transferOps & IMAGE_POST_CONVOLUTION_SCALE_BIAS) {
+            _mesa_scale_and_bias_rgba(ctx, n, rgba,
+                                      ctx->Pixel.PostConvolutionScale[RCOMP],
+                                      ctx->Pixel.PostConvolutionScale[GCOMP],
+                                      ctx->Pixel.PostConvolutionScale[BCOMP],
+                                      ctx->Pixel.PostConvolutionScale[ACOMP],
+                                      ctx->Pixel.PostConvolutionBias[RCOMP],
+                                      ctx->Pixel.PostConvolutionBias[GCOMP],
+                                      ctx->Pixel.PostConvolutionBias[BCOMP],
+                                      ctx->Pixel.PostConvolutionBias[ACOMP]);
+         }
+         /* GL_POST_CONVOLUTION_COLOR_TABLE lookup */
+         if (transferOps & IMAGE_POST_CONVOLUTION_COLOR_TABLE_BIT) {
+            _mesa_lookup_rgba(&ctx->PostConvolutionColorTable, n, rgba);
+         }
+         /* color matrix transform */
+         if (transferOps & IMAGE_COLOR_MATRIX_BIT) {
+            _mesa_transform_rgba(ctx, n, rgba);
+         }
+         /* GL_POST_COLOR_MATRIX_COLOR_TABLE lookup */
+         if (transferOps & IMAGE_POST_COLOR_MATRIX_COLOR_TABLE_BIT) {
+            _mesa_lookup_rgba(&ctx->PostColorMatrixColorTable, n, rgba);
+         }
+         /* update histogram count */
+         if (transferOps & IMAGE_HISTOGRAM_BIT) {
+            _mesa_update_histogram(ctx, n, (CONST GLfloat (*)[4]) rgba);
+         }
+         /* min/max here */
+         if (transferOps & IMAGE_MIN_MAX_BIT) {
+            _mesa_update_minmax(ctx, n, (CONST GLfloat (*)[4]) rgba);
+         }
+      }
+
+      /* clamp to [0,1] */
+#if CHAN_TYPE != GL_FLOAT
+      if (clamp) {
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            rgba[i][RCOMP] = CLAMP(rgba[i][RCOMP], 0.0F, 1.0F);
+            rgba[i][GCOMP] = CLAMP(rgba[i][GCOMP], 0.0F, 1.0F);
+            rgba[i][BCOMP] = CLAMP(rgba[i][BCOMP], 0.0F, 1.0F);
+            rgba[i][ACOMP] = CLAMP(rgba[i][ACOMP], 0.0F, 1.0F);
+         }
+      }
+#endif
+
+      /* Now determine which color channels we need to produce.
+       * And determine the dest index (offset) within each color tuple.
+       */
+      switch (dstFormat) {
+         case GL_ALPHA:
+            dstAlphaIndex = 0;
+            dstRedIndex = dstGreenIndex = dstBlueIndex = -1;
+            dstLuminanceIndex = dstIntensityIndex = -1;
+            break;
+         case GL_LUMINANCE:
+            dstLuminanceIndex = 0;
+            dstRedIndex = dstGreenIndex = dstBlueIndex = dstAlphaIndex = -1;
+            dstIntensityIndex = -1;
+            break;
+         case GL_LUMINANCE_ALPHA:
+            dstLuminanceIndex = 0;
+            dstAlphaIndex = 1;
+            dstRedIndex = dstGreenIndex = dstBlueIndex = -1;
+            dstIntensityIndex = -1;
+            break;
+         case GL_INTENSITY:
+            dstIntensityIndex = 0;
+            dstRedIndex = dstGreenIndex = dstBlueIndex = dstAlphaIndex = -1;
+            dstLuminanceIndex = -1;
+            break;
+         case GL_RGB:
+            dstRedIndex = 0;
+            dstGreenIndex = 1;
+            dstBlueIndex = 2;
+            dstAlphaIndex = dstLuminanceIndex = dstIntensityIndex = -1;
+            break;
+         case GL_RGBA:
+            dstRedIndex = 0;
+            dstGreenIndex = 1;
+            dstBlueIndex = 2;
+            dstAlphaIndex = 3;
+            dstLuminanceIndex = dstIntensityIndex = -1;
+            break;
+         default:
+            _mesa_problem(ctx, "bad dstFormat in _mesa_unpack_float_color_span()");
+            UNDEFARRAY(rgba);  /* mac 32k limitation */
+            return;
+      }
+
+      /* Now pack results in the requested dstFormat */
+      if (dstRedIndex >= 0) {
+         GLfloat *dst = dest;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            dst[dstRedIndex] = rgba[i][RCOMP];
+            dst += dstComponents;
+         }
+      }
+
+      if (dstGreenIndex >= 0) {
+         GLfloat *dst = dest;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            dst[dstGreenIndex] = rgba[i][GCOMP];
+            dst += dstComponents;
+         }
+      }
+
+      if (dstBlueIndex >= 0) {
+         GLfloat *dst = dest;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            dst[dstBlueIndex] = rgba[i][BCOMP];
+            dst += dstComponents;
+         }
+      }
+
+      if (dstAlphaIndex >= 0) {
+         GLfloat *dst = dest;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            dst[dstAlphaIndex] = rgba[i][ACOMP];
+            dst += dstComponents;
+         }
+      }
+
+      if (dstIntensityIndex >= 0) {
+         GLfloat *dst = dest;
+         GLuint i;
+         assert(dstIntensityIndex == 0);
+         assert(dstComponents == 1);
+         for (i = 0; i < n; i++) {
+            /* Intensity comes from red channel */
+            dst[i] = rgba[i][RCOMP];
+         }
+      }
+
+      if (dstLuminanceIndex >= 0) {
+         GLfloat *dst = dest;
+         GLuint i;
+         assert(dstLuminanceIndex == 0);
+         for (i = 0; i < n; i++) {
+            /* Luminance comes from red channel */
+            dst[0] = rgba[i][RCOMP];
+            dst += dstComponents;
+         }
+      }
+      UNDEFARRAY(rgba);  /* mac 32k limitation */
+   }
+}
+
+
+/*
+ * Unpack a row of color index data from a client buffer according to
+ * the pixel unpacking parameters.
+ * This is (or will be) used by glDrawPixels, glTexImage[123]D, etc.
+ *
+ * Args:  ctx - the context
+ *        n - number of pixels
+ *        dstType - destination data type
+ *        dest - destination array
+ *        srcType - source pixel type
+ *        source - source data pointer
+ *        srcPacking - pixel unpacking parameters
+ *        transferOps - the pixel transfer operations to apply
+ */
+void
+_mesa_unpack_index_span( const GLcontext *ctx, GLuint n,
+                         GLenum dstType, GLvoid *dest,
+                         GLenum srcType, const GLvoid *source,
+                         const struct gl_pixelstore_attrib *srcPacking,
+                         GLuint transferOps )
+{
+   ASSERT(srcType == GL_BITMAP ||
+          srcType == GL_UNSIGNED_BYTE ||
+          srcType == GL_BYTE ||
+          srcType == GL_UNSIGNED_SHORT ||
+          srcType == GL_SHORT ||
+          srcType == GL_UNSIGNED_INT ||
+          srcType == GL_INT ||
+          srcType == GL_HALF_FLOAT_NV ||
+          srcType == GL_FLOAT);
+
+   ASSERT(dstType == GL_UNSIGNED_BYTE ||
+          dstType == GL_UNSIGNED_SHORT ||
+          dstType == GL_UNSIGNED_INT);
+
+
+   transferOps &= (IMAGE_MAP_COLOR_BIT | IMAGE_SHIFT_OFFSET_BIT);
+
+   /*
+    * Try simple cases first
+    */
+   if (transferOps == 0 && srcType == GL_UNSIGNED_BYTE
+       && dstType == GL_UNSIGNED_BYTE) {
+      MEMCPY(dest, source, n * sizeof(GLubyte));
+   }
+   else if (transferOps == 0 && srcType == GL_UNSIGNED_INT
+            && dstType == GL_UNSIGNED_INT && !srcPacking->SwapBytes) {
+      MEMCPY(dest, source, n * sizeof(GLuint));
+   }
+   else {
+      /*
+       * general solution
+       */
+      GLuint indexes[MAX_WIDTH];
+      assert(n <= MAX_WIDTH);
+
+      extract_uint_indexes(n, indexes, GL_COLOR_INDEX, srcType, source,
+                           srcPacking);
+
+      if (transferOps & IMAGE_SHIFT_OFFSET_BIT) {
+         /* shift and offset indexes */
+         _mesa_shift_and_offset_ci(ctx, n, indexes);
+      }
+      if (transferOps & IMAGE_MAP_COLOR_BIT) {
+         /* Apply lookup table */
+         _mesa_map_ci(ctx, n, indexes);
+      }
+
+      /* convert to dest type */
+      switch (dstType) {
+         case GL_UNSIGNED_BYTE:
+            {
+               GLubyte *dst = (GLubyte *) dest;
+               GLuint i;
+               for (i = 0; i < n; i++) {
+                  dst[i] = (GLubyte) (indexes[i] & 0xff);
+               }
+            }
+            break;
+         case GL_UNSIGNED_SHORT:
+            {
+               GLuint *dst = (GLuint *) dest;
+               GLuint i;
+               for (i = 0; i < n; i++) {
+                  dst[i] = (GLushort) (indexes[i] & 0xffff);
+               }
+            }
+            break;
+         case GL_UNSIGNED_INT:
+            MEMCPY(dest, indexes, n * sizeof(GLuint));
+            break;
+         default:
+            _mesa_problem(ctx, "bad dstType in _mesa_unpack_index_span");
+      }
+   }
+}
+
+
+void
+_mesa_pack_index_span( const GLcontext *ctx, GLuint n,
+                       GLenum dstType, GLvoid *dest, const GLuint *source,
+                       const struct gl_pixelstore_attrib *dstPacking,
+                       GLuint transferOps )
+{
+   GLuint indexes[MAX_WIDTH];
+
+   ASSERT(n <= MAX_WIDTH);
+
+   transferOps &= (IMAGE_MAP_COLOR_BIT | IMAGE_SHIFT_OFFSET_BIT);
+
+   if (transferOps & (IMAGE_MAP_COLOR_BIT | IMAGE_SHIFT_OFFSET_BIT)) {
+      /* make a copy of input */
+      MEMCPY(indexes, source, n * sizeof(GLuint));
+      if (transferOps & IMAGE_SHIFT_OFFSET_BIT) {
+         _mesa_shift_and_offset_ci( ctx, n, indexes);
+      }
+      if (transferOps & IMAGE_MAP_COLOR_BIT) {
+         _mesa_map_ci(ctx, n, indexes);
+      }
+      source = indexes;
+   }
+
+   switch (dstType) {
+   case GL_UNSIGNED_BYTE:
+      {
+         GLubyte *dst = (GLubyte *) dest;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            *dst++ = (GLubyte) source[i];
+         }
+      }
+      break;
+   case GL_BYTE:
+      {
+         GLbyte *dst = (GLbyte *) dest;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            dst[i] = (GLbyte) source[i];
+         }
+      }
+      break;
+   case GL_UNSIGNED_SHORT:
+      {
+         GLushort *dst = (GLushort *) dest;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            dst[i] = (GLushort) source[i];
+         }
+         if (dstPacking->SwapBytes) {
+            _mesa_swap2( (GLushort *) dst, n );
+         }
+      }
+      break;
+   case GL_SHORT:
+      {
+         GLshort *dst = (GLshort *) dest;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            dst[i] = (GLshort) source[i];
+         }
+         if (dstPacking->SwapBytes) {
+            _mesa_swap2( (GLushort *) dst, n );
+         }
+      }
+      break;
+   case GL_UNSIGNED_INT:
+      {
+         GLuint *dst = (GLuint *) dest;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            dst[i] = (GLuint) source[i];
+         }
+         if (dstPacking->SwapBytes) {
+            _mesa_swap4( (GLuint *) dst, n );
+         }
+      }
+      break;
+   case GL_INT:
+      {
+         GLint *dst = (GLint *) dest;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            dst[i] = (GLint) source[i];
+         }
+         if (dstPacking->SwapBytes) {
+            _mesa_swap4( (GLuint *) dst, n );
+         }
+      }
+      break;
+   case GL_FLOAT:
+      {
+         GLfloat *dst = (GLfloat *) dest;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            dst[i] = (GLfloat) source[i];
+         }
+         if (dstPacking->SwapBytes) {
+            _mesa_swap4( (GLuint *) dst, n );
+         }
+      }
+      break;
+   case GL_HALF_FLOAT_NV:
+      {
+         GLhalfNV *dst = (GLhalfNV *) dest;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            dst[i] = _mesa_float_to_half((GLfloat) source[i]);
+         }
+         if (dstPacking->SwapBytes) {
+            _mesa_swap2( (GLushort *) dst, n );
+         }
+      }
+      break;
+   default:
+      _mesa_problem(ctx, "bad type in _mesa_pack_index_span");
+   }
+}
+
+
+/*
+ * Unpack a row of stencil data from a client buffer according to
+ * the pixel unpacking parameters.
+ * This is (or will be) used by glDrawPixels
+ *
+ * Args:  ctx - the context
+ *        n - number of pixels
+ *        dstType - destination data type
+ *        dest - destination array
+ *        srcType - source pixel type
+ *        source - source data pointer
+ *        srcPacking - pixel unpacking parameters
+ *        transferOps - apply offset/bias/lookup ops?
+ */
+void
+_mesa_unpack_stencil_span( const GLcontext *ctx, GLuint n,
+                           GLenum dstType, GLvoid *dest,
+                           GLenum srcType, const GLvoid *source,
+                           const struct gl_pixelstore_attrib *srcPacking,
+                           GLuint transferOps )
+{
+   ASSERT(srcType == GL_BITMAP ||
+          srcType == GL_UNSIGNED_BYTE ||
+          srcType == GL_BYTE ||
+          srcType == GL_UNSIGNED_SHORT ||
+          srcType == GL_SHORT ||
+          srcType == GL_UNSIGNED_INT ||
+          srcType == GL_INT ||
+          srcType == GL_HALF_FLOAT_NV ||
+          srcType == GL_FLOAT);
+
+   ASSERT(dstType == GL_UNSIGNED_BYTE ||
+          dstType == GL_UNSIGNED_SHORT ||
+          dstType == GL_UNSIGNED_INT);
+
+   /* only shift and offset apply to stencil */
+   transferOps &= IMAGE_SHIFT_OFFSET_BIT;
+
+   /*
+    * Try simple cases first
+    */
+   if (transferOps == 0 &&
+       srcType == GL_UNSIGNED_BYTE &&
+       dstType == GL_UNSIGNED_BYTE) {
+      MEMCPY(dest, source, n * sizeof(GLubyte));
+   }
+   else if (transferOps == 0 &&
+            srcType == GL_UNSIGNED_INT &&
+            dstType == GL_UNSIGNED_INT &&
+            !srcPacking->SwapBytes) {
+      MEMCPY(dest, source, n * sizeof(GLuint));
+   }
+   else {
+      /*
+       * general solution
+       */
+      GLuint indexes[MAX_WIDTH];
+      assert(n <= MAX_WIDTH);
+
+      extract_uint_indexes(n, indexes, GL_COLOR_INDEX, srcType, source,
+                           srcPacking);
+
+      if (transferOps) {
+         if (transferOps & IMAGE_SHIFT_OFFSET_BIT) {
+            /* shift and offset indexes */
+            _mesa_shift_and_offset_ci(ctx, n, indexes);
+         }
+
+         if (ctx->Pixel.MapStencilFlag) {
+            /* Apply stencil lookup table */
+            GLuint mask = ctx->Pixel.MapStoSsize - 1;
+            GLuint i;
+            for (i=0;i<n;i++) {
+               indexes[i] = ctx->Pixel.MapStoS[ indexes[i] & mask ];
+            }
+         }
+      }
+
+      /* convert to dest type */
+      switch (dstType) {
+         case GL_UNSIGNED_BYTE:
+            {
+               GLubyte *dst = (GLubyte *) dest;
+               GLuint i;
+               for (i = 0; i < n; i++) {
+                  dst[i] = (GLubyte) (indexes[i] & 0xff);
+               }
+            }
+            break;
+         case GL_UNSIGNED_SHORT:
+            {
+               GLuint *dst = (GLuint *) dest;
+               GLuint i;
+               for (i = 0; i < n; i++) {
+                  dst[i] = (GLushort) (indexes[i] & 0xffff);
+               }
+            }
+            break;
+         case GL_UNSIGNED_INT:
+            MEMCPY(dest, indexes, n * sizeof(GLuint));
+            break;
+         default:
+            _mesa_problem(ctx, "bad dstType in _mesa_unpack_stencil_span");
+      }
+   }
+}
+
+
+void
+_mesa_pack_stencil_span( const GLcontext *ctx, GLuint n,
+                         GLenum dstType, GLvoid *dest, const GLstencil *source,
+                         const struct gl_pixelstore_attrib *dstPacking )
+{
+   GLstencil stencil[MAX_WIDTH];
+
+   ASSERT(n <= MAX_WIDTH);
+
+   if (ctx->Pixel.IndexShift || ctx->Pixel.IndexOffset ||
+       ctx->Pixel.MapStencilFlag) {
+      /* make a copy of input */
+      MEMCPY(stencil, source, n * sizeof(GLstencil));
+      if (ctx->Pixel.IndexShift || ctx->Pixel.IndexOffset) {
+         _mesa_shift_and_offset_stencil( ctx, n, stencil );
+      }
+      if (ctx->Pixel.MapStencilFlag) {
+         _mesa_map_stencil( ctx, n, stencil );
+      }
+      source = stencil;
+   }
+
+   switch (dstType) {
+   case GL_UNSIGNED_BYTE:
+      if (sizeof(GLstencil) == 8) {
+         MEMCPY( dest, source, n );
+      }
+      else {
+         GLubyte *dst = (GLubyte *) dest;
+         GLuint i;
+         for (i=0;i<n;i++) {
+            dst[i] = (GLubyte) source[i];
+         }
+      }
+      break;
+   case GL_BYTE:
+      if (sizeof(GLstencil) == 8) {
+         MEMCPY( dest, source, n );
+      }
+      else {
+         GLbyte *dst = (GLbyte *) dest;
+         GLuint i;
+         for (i=0;i<n;i++) {
+            dst[i] = (GLbyte) source[i];
+         }
+      }
+      break;
+   case GL_UNSIGNED_SHORT:
+      {
+         GLushort *dst = (GLushort *) dest;
+         GLuint i;
+         for (i=0;i<n;i++) {
+            dst[i] = (GLushort) source[i];
+         }
+         if (dstPacking->SwapBytes) {
+            _mesa_swap2( (GLushort *) dst, n );
+         }
+      }
+      break;
+   case GL_SHORT:
+      {
+         GLshort *dst = (GLshort *) dest;
+         GLuint i;
+         for (i=0;i<n;i++) {
+            dst[i] = (GLshort) source[i];
+         }
+         if (dstPacking->SwapBytes) {
+            _mesa_swap2( (GLushort *) dst, n );
+         }
+      }
+      break;
+   case GL_UNSIGNED_INT:
+      {
+         GLuint *dst = (GLuint *) dest;
+         GLuint i;
+         for (i=0;i<n;i++) {
+            dst[i] = (GLuint) source[i];
+         }
+         if (dstPacking->SwapBytes) {
+            _mesa_swap4( (GLuint *) dst, n );
+         }
+      }
+      break;
+   case GL_INT:
+      {
+         GLint *dst = (GLint *) dest;
+         GLuint i;
+         for (i=0;i<n;i++) {
+            *dst++ = (GLint) source[i];
+         }
+         if (dstPacking->SwapBytes) {
+            _mesa_swap4( (GLuint *) dst, n );
+         }
+      }
+      break;
+   case GL_FLOAT:
+      {
+         GLfloat *dst = (GLfloat *) dest;
+         GLuint i;
+         for (i=0;i<n;i++) {
+            dst[i] = (GLfloat) source[i];
+         }
+         if (dstPacking->SwapBytes) {
+            _mesa_swap4( (GLuint *) dst, n );
+         }
+      }
+      break;
+   case GL_HALF_FLOAT_NV:
+      {
+         GLhalfNV *dst = (GLhalfNV *) dest;
+         GLuint i;
+         for (i=0;i<n;i++) {
+            dst[i] = _mesa_float_to_half( (float) source[i] );
+         }
+         if (dstPacking->SwapBytes) {
+            _mesa_swap2( (GLushort *) dst, n );
+         }
+      }
+      break;
+   case GL_BITMAP:
+      if (dstPacking->LsbFirst) {
+         GLubyte *dst = (GLubyte *) dest;
+         GLint shift = 0;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            if (shift == 0)
+               *dst = 0;
+            *dst |= ((source[i] != 0) << shift);
+            shift++;
+            if (shift == 8) {
+               shift = 0;
+               dst++;
+            }
+         }
+      }
+      else {
+         GLubyte *dst = (GLubyte *) dest;
+         GLint shift = 7;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            if (shift == 7)
+               *dst = 0;
+            *dst |= ((source[i] != 0) << shift);
+            shift--;
+            if (shift < 0) {
+               shift = 7;
+               dst++;
+            }
+         }
+      }
+      break;
+   default:
+      _mesa_problem(ctx, "bad type in _mesa_pack_index_span");
+   }
+}
+
+
+void
+_mesa_unpack_depth_span( const GLcontext *ctx, GLuint n, GLfloat *dest,
+                         GLenum srcType, const GLvoid *source,
+                         const struct gl_pixelstore_attrib *srcPacking )
+{
+   switch (srcType) {
+      case GL_BYTE:
+         {
+            GLuint i;
+            const GLubyte *src = (const GLubyte *) source;
+            for (i = 0; i < n; i++) {
+               dest[i] = BYTE_TO_FLOAT(src[i]);
+            }
+         }
+         break;
+      case GL_UNSIGNED_BYTE:
+         {
+            GLuint i;
+            const GLubyte *src = (const GLubyte *) source;
+            for (i = 0; i < n; i++) {
+               dest[i] = UBYTE_TO_FLOAT(src[i]);
+            }
+         }
+         break;
+      case GL_SHORT:
+         {
+            GLuint i;
+            const GLshort *src = (const GLshort *) source;
+            for (i = 0; i < n; i++) {
+               dest[i] = SHORT_TO_FLOAT(src[i]);
+            }
+         }
+         break;
+      case GL_UNSIGNED_SHORT:
+         {
+            GLuint i;
+            const GLushort *src = (const GLushort *) source;
+            for (i = 0; i < n; i++) {
+               dest[i] = USHORT_TO_FLOAT(src[i]);
+            }
+         }
+         break;
+      case GL_INT:
+         {
+            GLuint i;
+            const GLint *src = (const GLint *) source;
+            for (i = 0; i < n; i++) {
+               dest[i] = INT_TO_FLOAT(src[i]);
+            }
+         }
+         break;
+      case GL_UNSIGNED_INT:
+         {
+            GLuint i;
+            const GLuint *src = (const GLuint *) source;
+            for (i = 0; i < n; i++) {
+               dest[i] = UINT_TO_FLOAT(src[i]);
+            }
+         }
+         break;
+      case GL_FLOAT:
+         MEMCPY(dest, source, n * sizeof(GLfloat));
+         break;
+      case GL_HALF_FLOAT_NV:
+         {
+            GLuint i;
+            const GLhalfNV *src = (const GLhalfNV *) source;
+            for (i = 0; i < n; i++) {
+               dest[i] = _mesa_half_to_float(src[i]);
+            }
+         }
+         break;
+      default:
+         _mesa_problem(NULL, "bad type in _mesa_unpack_depth_span()");
+         return;
+   }
+
+
+   /* apply depth scale and bias and clamp to [0,1] */
+   if (ctx->Pixel.DepthScale != 1.0 || ctx->Pixel.DepthBias != 0.0) {
+      GLuint i;
+      for (i = 0; i < n; i++) {
+         GLfloat d = dest[i] * ctx->Pixel.DepthScale + ctx->Pixel.DepthBias;
+         dest[i] = CLAMP(d, 0.0F, 1.0F);
+      }
+   }
+}
+
+
+/*
+ * Pack an array of depth values.  The values are floats in [0,1].
+ */
+void
+_mesa_pack_depth_span( const GLcontext *ctx, GLuint n, GLvoid *dest,
+                       GLenum dstType, const GLfloat *depthSpan,
+                       const struct gl_pixelstore_attrib *dstPacking )
+{
+   GLfloat depthCopy[MAX_WIDTH];
+   const GLboolean bias_or_scale = ctx->Pixel.DepthBias != 0.0 ||
+                                   ctx->Pixel.DepthScale != 1.0;
+
+   ASSERT(n <= MAX_WIDTH);
+
+   if (bias_or_scale) {
+      GLuint i;
+      for (i = 0; i < n; i++) {
+         GLfloat d;
+         d = depthSpan[i] * ctx->Pixel.DepthScale + ctx->Pixel.DepthBias;
+         depthCopy[i] = CLAMP(d, 0.0F, 1.0F);
+      }
+      depthSpan = depthCopy;
+   }
+
+   switch (dstType) {
+   case GL_UNSIGNED_BYTE:
+      {
+         GLubyte *dst = (GLubyte *) dest;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            dst[i] = FLOAT_TO_UBYTE( depthSpan[i] );
+         }
+      }
+      break;
+   case GL_BYTE:
+      {
+         GLbyte *dst = (GLbyte *) dest;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            dst[i] = FLOAT_TO_BYTE( depthSpan[i] );
+         }
+      }
+      break;
+   case GL_UNSIGNED_SHORT:
+      {
+         GLushort *dst = (GLushort *) dest;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            dst[i] = FLOAT_TO_USHORT( depthSpan[i] );
+         }
+         if (dstPacking->SwapBytes) {
+            _mesa_swap2( (GLushort *) dst, n );
+         }
+      }
+      break;
+   case GL_SHORT:
+      {
+         GLshort *dst = (GLshort *) dest;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            dst[i] = FLOAT_TO_SHORT( depthSpan[i] );
+         }
+         if (dstPacking->SwapBytes) {
+            _mesa_swap2( (GLushort *) dst, n );
+         }
+      }
+      break;
+   case GL_UNSIGNED_INT:
+      {
+         GLuint *dst = (GLuint *) dest;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            dst[i] = FLOAT_TO_UINT( depthSpan[i] );
+         }
+         if (dstPacking->SwapBytes) {
+            _mesa_swap4( (GLuint *) dst, n );
+         }
+      }
+      break;
+   case GL_INT:
+      {
+         GLint *dst = (GLint *) dest;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            dst[i] = FLOAT_TO_INT( depthSpan[i] );
+         }
+         if (dstPacking->SwapBytes) {
+            _mesa_swap4( (GLuint *) dst, n );
+         }
+      }
+      break;
+   case GL_FLOAT:
+      {
+         GLfloat *dst = (GLfloat *) dest;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            dst[i] = depthSpan[i];
+         }
+         if (dstPacking->SwapBytes) {
+            _mesa_swap4( (GLuint *) dst, n );
+         }
+      }
+      break;
+   case GL_HALF_FLOAT_NV:
+      {
+         GLhalfNV *dst = (GLhalfNV *) dest;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            dst[i] = _mesa_float_to_half(depthSpan[i]);
+         }
+         if (dstPacking->SwapBytes) {
+            _mesa_swap2( (GLushort *) dst, n );
+         }
+      }
+      break;
+   default:
+      _mesa_problem(ctx, "bad type in _mesa_pack_depth_span");
+   }
+}
+
+
+/*
+ * Unpack image data.  Apply byteswapping, byte flipping (bitmap).
+ * Return all image data in a contiguous block.
+ */
+void *
+_mesa_unpack_image( GLsizei width, GLsizei height, GLsizei depth,
+                    GLenum format, GLenum type, const GLvoid *pixels,
+                    const struct gl_pixelstore_attrib *unpack )
+{
+   GLint bytesPerRow, compsPerRow;
+   GLboolean flipBytes, swap2, swap4;
+
+   if (!pixels)
+      return NULL;  /* not necessarily an error */
+
+   if (width <= 0 || height <= 0 || depth <= 0)
+      return NULL;  /* generate error later */
+
+   if (format == GL_BITMAP) {
+      bytesPerRow = (width + 7) >> 3;
+      flipBytes = !unpack->LsbFirst;
+      swap2 = swap4 = GL_FALSE;
+      compsPerRow = 0;
+   }
+   else {
+      const GLint bytesPerPixel = _mesa_bytes_per_pixel(format, type);
+      const GLint components = _mesa_components_in_format(format);
+      GLint bytesPerComp;
+      if (bytesPerPixel <= 0 || components <= 0)
+         return NULL;   /* bad format or type.  generate error later */
+      bytesPerRow = bytesPerPixel * width;
+      bytesPerComp = bytesPerPixel / components;
+      flipBytes = GL_FALSE;
+      swap2 = (bytesPerComp == 2) && unpack->SwapBytes;
+      swap4 = (bytesPerComp == 4) && unpack->SwapBytes;
+      compsPerRow = components * width;
+      assert(compsPerRow >= width);
+   }
+
+   {
+      GLubyte *destBuffer = (GLubyte *) MALLOC(bytesPerRow * height * depth);
+      GLubyte *dst;
+      GLint img, row;
+      if (!destBuffer)
+         return NULL;   /* generate GL_OUT_OF_MEMORY later */
+
+      dst = destBuffer;
+      for (img = 0; img < depth; img++) {
+         for (row = 0; row < height; row++) {
+            const GLvoid *src = _mesa_image_address(unpack, pixels,
+                               width, height, format, type, img, row, 0);
+            MEMCPY(dst, src, bytesPerRow);
+            /* byte flipping/swapping */
+            if (flipBytes) {
+               flip_bytes((GLubyte *) dst, bytesPerRow);
+            }
+            else if (swap2) {
+               _mesa_swap2((GLushort*) dst, compsPerRow);
+            }
+            else if (swap4) {
+               _mesa_swap4((GLuint*) dst, compsPerRow);
+            }
+            dst += bytesPerRow;
+         }
+      }
+      return destBuffer;
+   }
+}
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/image.h b/reactos/lib/mesa32/src/main/image.h
new file mode 100644
index 00000000000..6c8b342ba51
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/image.h
@@ -0,0 +1,178 @@
+/**
+ * \file image.h
+ * Image handling.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef IMAGE_H
+#define IMAGE_H
+
+
+#include "mtypes.h"
+
+
+extern const struct gl_pixelstore_attrib _mesa_native_packing;
+
+
+extern void
+_mesa_swap2( GLushort *p, GLuint n );
+
+extern void
+_mesa_swap4( GLuint *p, GLuint n );
+
+extern GLint
+_mesa_sizeof_type( GLenum type );
+
+extern GLint
+_mesa_sizeof_packed_type( GLenum type );
+
+extern GLint
+_mesa_components_in_format( GLenum format );
+
+extern GLint
+_mesa_bytes_per_pixel( GLenum format, GLenum type );
+
+extern GLboolean
+_mesa_is_legal_format_and_type( GLenum format, GLenum type );
+
+
+extern GLvoid *
+_mesa_image_address( const struct gl_pixelstore_attrib *packing,
+                     const GLvoid *image, GLsizei width,
+                     GLsizei height, GLenum format, GLenum type,
+                     GLint img, GLint row, GLint column );
+
+
+extern GLint
+_mesa_image_row_stride( const struct gl_pixelstore_attrib *packing,
+                        GLint width, GLenum format, GLenum type );
+
+
+extern GLint
+_mesa_image_image_stride( const struct gl_pixelstore_attrib *packing,
+                          GLint width, GLint height,
+                          GLenum format, GLenum type );
+
+extern void
+_mesa_unpack_polygon_stipple( const GLubyte *pattern, GLuint dest[32],
+                              const struct gl_pixelstore_attrib *unpacking );
+
+
+extern void
+_mesa_pack_polygon_stipple( const GLuint pattern[32], GLubyte *dest,
+                            const struct gl_pixelstore_attrib *packing );
+
+
+extern GLvoid *
+_mesa_unpack_bitmap( GLint width, GLint height, const GLubyte *pixels,
+                     const struct gl_pixelstore_attrib *packing );
+
+extern void
+_mesa_pack_bitmap( GLint width, GLint height, const GLubyte *source,
+                   GLubyte *dest, const struct gl_pixelstore_attrib *packing );
+
+
+extern void
+_mesa_pack_float_rgba_span( GLcontext *ctx,
+                            GLuint n, CONST GLfloat rgba[][4],
+                            GLenum dstFormat, GLenum dstType, GLvoid *dstAddr,
+                            const struct gl_pixelstore_attrib *dstPacking,
+                            GLuint transferOps );
+
+
+extern void
+_mesa_pack_rgba_span( GLcontext *ctx,
+                      GLuint n, CONST GLchan rgba[][4],
+                      GLenum dstFormat, GLenum dstType, GLvoid *dstAddr,
+                      const struct gl_pixelstore_attrib *dstPacking,
+                      GLuint transferOps );
+
+
+extern void
+_mesa_unpack_chan_color_span( GLcontext *ctx,
+                              GLuint n, GLenum dstFormat, GLchan dest[],
+                              GLenum srcFormat, GLenum srcType,
+                              const GLvoid *source,
+                              const struct gl_pixelstore_attrib *srcPacking,
+                              GLuint transferOps );
+
+
+extern void
+_mesa_unpack_float_color_span( GLcontext *ctx,
+                               GLuint n, GLenum dstFormat, GLfloat dest[],
+                               GLenum srcFormat, GLenum srcType,
+                               const GLvoid *source,
+                               const struct gl_pixelstore_attrib *srcPacking,
+                               GLuint transferOps, GLboolean clamp );
+
+
+extern void
+_mesa_unpack_index_span( const GLcontext *ctx, GLuint n,
+                         GLenum dstType, GLvoid *dest,
+                         GLenum srcType, const GLvoid *source,
+                         const struct gl_pixelstore_attrib *srcPacking,
+                         GLuint transferOps );
+
+
+extern void
+_mesa_pack_index_span( const GLcontext *ctx, GLuint n,
+                       GLenum dstType, GLvoid *dest, const GLuint *source,
+                       const struct gl_pixelstore_attrib *dstPacking,
+                       GLuint transferOps );
+
+
+extern void
+_mesa_unpack_stencil_span( const GLcontext *ctx, GLuint n,
+                           GLenum dstType, GLvoid *dest,
+                           GLenum srcType, const GLvoid *source,
+                           const struct gl_pixelstore_attrib *srcPacking,
+                           GLuint transferOps );
+
+extern void
+_mesa_pack_stencil_span( const GLcontext *ctx, GLuint n,
+                         GLenum dstType, GLvoid *dest, const GLstencil *source,
+                         const struct gl_pixelstore_attrib *dstPacking );
+
+
+extern void
+_mesa_unpack_depth_span( const GLcontext *ctx, GLuint n, GLfloat *dest,
+                         GLenum srcType, const GLvoid *source,
+                         const struct gl_pixelstore_attrib *srcPacking );
+
+extern void
+_mesa_pack_depth_span( const GLcontext *ctx, GLuint n, GLvoid *dest,
+                       GLenum dstType, const GLfloat *depthSpan,
+                       const struct gl_pixelstore_attrib *dstPacking );
+
+
+extern void *
+_mesa_unpack_image( GLsizei width, GLsizei height, GLsizei depth,
+                    GLenum format, GLenum type, const GLvoid *pixels,
+                    const struct gl_pixelstore_attrib *unpack );
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/imports.c b/reactos/lib/mesa32/src/main/imports.c
new file mode 100644
index 00000000000..f8fa835394a
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/imports.c
@@ -0,0 +1,1190 @@
+/**
+ * \file imports.c
+ * Standard C library function wrappers.
+ * 
+ * Imports are services which the device driver or window system or
+ * operating system provides to the core renderer.  The core renderer (Mesa)
+ * will call these functions in order to do memory allocation, simple I/O,
+ * etc.
+ *
+ * Some drivers will want to override/replace this file with something
+ * specialized, but that'll be rare.
+ *
+ * Eventually, I want to move roll the glheader.h file into this.
+ *
+ * The OpenGL SI's __GLimports structure allows per-context specification of
+ * replacements for the standard C lib functions.  In practice that's probably
+ * never needed; compile-time replacements are far more likely.
+ *
+ * The _mesa_*() functions defined here don't in general take a context
+ * parameter.  I guess we can change that someday, if need be.
+ * So for now, the __GLimports stuff really isn't used.
+ *
+ * \todo Functions still needed:
+ * - scanf
+ * - qsort
+ * - bsearch
+ * - rand and RAND_MAX
+ *
+ * \note When compiled into a XFree86 module these functions wrap around
+ * XFree86 own wrappers.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+
+#include "imports.h"
+#include "context.h"
+
+
+#define MAXSTRING 4000  /* for vsnprintf() */
+
+#ifdef WIN32
+#define vsnprintf _vsnprintf
+#elif defined(__IBMC__) || defined(__IBMCPP__) || ( defined(__VMS) && __CRTL_VER < 70312000 )
+extern int vsnprintf(char *str, size_t count, const char *fmt, va_list arg);
+#ifdef __VMS
+#include "vsnprintf.c"
+#endif
+#endif
+
+
+/**********************************************************************/
+/** \name Memory */
+/*@{*/
+
+/** Wrapper around either malloc() or xf86malloc() */
+void *
+_mesa_malloc(size_t bytes)
+{
+#if defined(XFree86LOADER) && defined(IN_MODULE)
+   return xf86malloc(bytes);
+#else
+   return malloc(bytes);
+#endif
+}
+
+/** Wrapper around either calloc() or xf86calloc() */
+void *
+_mesa_calloc(size_t bytes)
+{
+#if defined(XFree86LOADER) && defined(IN_MODULE)
+   return xf86calloc(1, bytes);
+#else
+   return calloc(1, bytes);
+#endif
+}
+
+/** Wrapper around either free() or xf86free() */
+void
+_mesa_free(void *ptr)
+{
+#if defined(XFree86LOADER) && defined(IN_MODULE)
+   xf86free(ptr);
+#else
+   free(ptr);
+#endif
+}
+
+/**
+ * Allocate aligned memory.
+ *
+ * \param bytes number of bytes to allocate.
+ * \param alignment alignment (must be greater than zero).
+ * 
+ * Allocates extra memory to accommodate rounding up the address for
+ * alignment and to record the real malloc address.
+ *
+ * \sa _mesa_align_free().
+ */
+void *
+_mesa_align_malloc(size_t bytes, unsigned long alignment)
+{
+   unsigned long ptr, buf;
+
+   ASSERT( alignment > 0 );
+
+   ptr = (unsigned long) _mesa_malloc(bytes + alignment + sizeof(void *));
+   if (!ptr)
+      return NULL;
+
+   buf = (ptr + alignment + sizeof(void *)) & ~(unsigned long)(alignment - 1);
+   *(unsigned long *)(buf - sizeof(void *)) = ptr;
+
+#ifdef DEBUG
+   /* mark the non-aligned area */
+   while ( ptr < buf - sizeof(void *) ) {
+      *(unsigned long *)ptr = 0xcdcdcdcd;
+      ptr += sizeof(unsigned long);
+   }
+#endif
+
+   return (void *) buf;
+}
+
+/** Same as _mesa_align_malloc(), but using _mesa_calloc() instead of
+ * _mesa_malloc() */
+void *
+_mesa_align_calloc(size_t bytes, unsigned long alignment)
+{
+   unsigned long ptr, buf;
+
+   ASSERT( alignment > 0 );
+
+   ptr = (unsigned long) _mesa_calloc(bytes + alignment + sizeof(void *));
+   if (!ptr)
+      return NULL;
+
+   buf = (ptr + alignment + sizeof(void *)) & ~(unsigned long)(alignment - 1);
+   *(unsigned long *)(buf - sizeof(void *)) = ptr;
+
+#ifdef DEBUG
+   /* mark the non-aligned area */
+   while ( ptr < buf - sizeof(void *) ) {
+      *(unsigned long *)ptr = 0xcdcdcdcd;
+      ptr += sizeof(unsigned long);
+   }
+#endif
+
+   return (void *)buf;
+}
+
+/**
+ * Free memory allocated with _mesa_align_malloc() or _mesa_align_calloc().
+ *
+ * \param ptr pointer to the memory to be freed.
+ * 
+ * The actual address to free is stored in the word immediately before the
+ * address the client sees.
+ */
+void
+_mesa_align_free(void *ptr)
+{
+#if 0
+   _mesa_free( (void *)(*(unsigned long *)((unsigned long)ptr - sizeof(void *))) );
+#else
+   void **cubbyHole = (void **) ((char *) ptr - sizeof(void *));
+   void *realAddr = *cubbyHole;
+   _mesa_free(realAddr);
+#endif
+}
+
+/** Wrapper around either memcpy() or xf86memcpy() */
+void *
+_mesa_realloc(void *oldBuffer, size_t oldSize, size_t newSize)
+{
+   const size_t copySize = (oldSize < newSize) ? oldSize : newSize;
+   void *newBuffer = _mesa_malloc(newSize);
+   if (newBuffer && copySize > 0)
+      _mesa_memcpy(newBuffer, oldBuffer, copySize);
+   if (oldBuffer)
+      _mesa_free(oldBuffer);
+   return newBuffer;
+}
+
+
+void *
+_mesa_memcpy(void *dest, const void *src, size_t n)
+{
+#if defined(XFree86LOADER) && defined(IN_MODULE)
+   return xf86memcpy(dest, src, n);
+#elif defined(SUNOS4)
+   return memcpy((char *) dest, (char *) src, (int) n);
+#else
+   return memcpy(dest, src, n);
+#endif
+}
+
+/** Wrapper around either memset() or xf86memset() */
+void
+_mesa_memset( void *dst, int val, size_t n )
+{
+#if defined(XFree86LOADER) && defined(IN_MODULE)
+   xf86memset( dst, val, n );
+#elif defined(SUNOS4)
+   memset( (char *) dst, (int) val, (int) n );
+#else
+   memset(dst, val, n);
+#endif
+}
+
+/** Fill memory with a constant 16bit word.
+ *
+ * \param dst destination pointer.
+ * \param val value.
+ * \param n number of words.
+ */
+void
+_mesa_memset16( unsigned short *dst, unsigned short val, size_t n )
+{
+   while (n-- > 0)
+      *dst++ = val;
+}
+
+/** Wrapper around either memcpy() or xf86memcpy() or bzero() */
+void
+_mesa_bzero( void *dst, size_t n )
+{
+#if defined(XFree86LOADER) && defined(IN_MODULE)
+   xf86memset( dst, 0, n );
+#elif defined(__FreeBSD__)
+   bzero( dst, n );
+#else
+   memset( dst, 0, n );
+#endif
+}
+
+/*@}*/
+
+
+/**********************************************************************/
+/** \name Math */
+/*@{*/
+
+/** Wrapper around either sin() or xf86sin() */
+double
+_mesa_sin(double a)
+{
+#if defined(XFree86LOADER) && defined(IN_MODULE)
+   return xf86sin(a);
+#else
+   return sin(a);
+#endif
+}
+
+/** Wrapper around either cos() or xf86cos() */
+double
+_mesa_cos(double a)
+{
+#if defined(XFree86LOADER) && defined(IN_MODULE)
+   return xf86cos(a);
+#else
+   return cos(a);
+#endif
+}
+
+/** Wrapper around either sqrt() or xf86sqrt() */
+double
+_mesa_sqrtd(double x)
+{
+#if defined(XFree86LOADER) && defined(IN_MODULE)
+   return xf86sqrt(x);
+#else
+   return sqrt(x);
+#endif
+}
+
+
+/*
+ * A High Speed, Low Precision Square Root
+ * by Paul Lalonde and Robert Dawson
+ * from "Graphics Gems", Academic Press, 1990
+ *
+ * SPARC implementation of a fast square root by table
+ * lookup.
+ * SPARC floating point format is as follows:
+ *
+ * BIT 31 	30 	23 	22 	0
+ *     sign	exponent	mantissa
+ */
+static short sqrttab[0x100];    /* declare table of square roots */
+
+static void init_sqrt_table(void)
+{
+#if defined(USE_IEEE) && !defined(DEBUG)
+   unsigned short i;
+   fi_type fi;     /* to access the bits of a float in  C quickly  */
+                   /* we use a union defined in glheader.h         */
+
+   for(i=0; i<= 0x7f; i++) {
+      fi.i = 0;
+
+      /*
+       * Build a float with the bit pattern i as mantissa
+       * and an exponent of 0, stored as 127
+       */
+
+      fi.i = (i << 16) | (127 << 23);
+      fi.f = _mesa_sqrtd(fi.f);
+
+      /*
+       * Take the square root then strip the first 7 bits of
+       * the mantissa into the table
+       */
+
+      sqrttab[i] = (fi.i & 0x7fffff) >> 16;
+
+      /*
+       * Repeat the process, this time with an exponent of
+       * 1, stored as 128
+       */
+
+      fi.i = 0;
+      fi.i = (i << 16) | (128 << 23);
+      fi.f = sqrt(fi.f);
+      sqrttab[i+0x80] = (fi.i & 0x7fffff) >> 16;
+   }
+#else
+   (void) sqrttab;  /* silence compiler warnings */
+#endif /*HAVE_FAST_MATH*/
+}
+
+
+/**
+ * Single precision square root.
+ */
+float
+_mesa_sqrtf( float x )
+{
+#if defined(USE_IEEE) && !defined(DEBUG)
+   fi_type num;
+                                /* to access the bits of a float in C
+                                 * we use a union from glheader.h     */
+
+   short e;                     /* the exponent */
+   if (x == 0.0F) return 0.0F;  /* check for square root of 0 */
+   num.f = x;
+   e = (num.i >> 23) - 127;     /* get the exponent - on a SPARC the */
+                                /* exponent is stored with 127 added */
+   num.i &= 0x7fffff;           /* leave only the mantissa */
+   if (e & 0x01) num.i |= 0x800000;
+                                /* the exponent is odd so we have to */
+                                /* look it up in the second half of  */
+                                /* the lookup table, so we set the   */
+                                /* high bit                                */
+   e >>= 1;                     /* divide the exponent by two */
+                                /* note that in C the shift */
+                                /* operators are sign preserving */
+                                /* for signed operands */
+   /* Do the table lookup, based on the quaternary mantissa,
+    * then reconstruct the result back into a float
+    */
+   num.i = ((sqrttab[num.i >> 16]) << 16) | ((e + 127) << 23);
+
+   return num.f;
+#else
+   return (float) _mesa_sqrtd((double) x);
+#endif
+}
+
+
+/**
+ inv_sqrt - A single precision 1/sqrt routine for IEEE format floats.
+ written by Josh Vanderhoof, based on newsgroup posts by James Van Buskirk
+ and Vesa Karvonen.
+*/
+float
+_mesa_inv_sqrtf(float n)
+{
+#if defined(USE_IEEE) && !defined(DEBUG)
+        float r0, x0, y0;
+        float r1, x1, y1;
+        float r2, x2, y2;
+#if 0 /* not used, see below -BP */
+        float r3, x3, y3;
+#endif
+        union { float f; unsigned int i; } u;
+        unsigned int magic;
+
+        /*
+         Exponent part of the magic number -
+
+         We want to:
+         1. subtract the bias from the exponent,
+         2. negate it
+         3. divide by two (rounding towards -inf)
+         4. add the bias back
+
+         Which is the same as subtracting the exponent from 381 and dividing
+         by 2.
+
+         floor(-(x - 127) / 2) + 127 = floor((381 - x) / 2)
+        */
+
+        magic = 381 << 23;
+
+        /*
+         Significand part of magic number -
+
+         With the current magic number, "(magic - u.i) >> 1" will give you:
+
+         for 1 <= u.f <= 2: 1.25 - u.f / 4
+         for 2 <= u.f <= 4: 1.00 - u.f / 8
+
+         This isn't a bad approximation of 1/sqrt.  The maximum difference from
+         1/sqrt will be around .06.  After three Newton-Raphson iterations, the
+         maximum difference is less than 4.5e-8.  (Which is actually close
+         enough to make the following bias academic...)
+
+         To get a better approximation you can add a bias to the magic
+         number.  For example, if you subtract 1/2 of the maximum difference in
+         the first approximation (.03), you will get the following function:
+
+         for 1 <= u.f <= 2:    1.22 - u.f / 4
+         for 2 <= u.f <= 3.76: 0.97 - u.f / 8
+         for 3.76 <= u.f <= 4: 0.72 - u.f / 16
+         (The 3.76 to 4 range is where the result is < .5.)
+
+         This is the closest possible initial approximation, but with a maximum
+         error of 8e-11 after three NR iterations, it is still not perfect.  If
+         you subtract 0.0332281 instead of .03, the maximum error will be
+         2.5e-11 after three NR iterations, which should be about as close as
+         is possible.
+
+         for 1 <= u.f <= 2:    1.2167719 - u.f / 4
+         for 2 <= u.f <= 3.73: 0.9667719 - u.f / 8
+         for 3.73 <= u.f <= 4: 0.7167719 - u.f / 16
+
+        */
+
+        magic -= (int)(0.0332281 * (1 << 25));
+
+        u.f = n;
+        u.i = (magic - u.i) >> 1;
+
+        /*
+         Instead of Newton-Raphson, we use Goldschmidt's algorithm, which
+         allows more parallelism.  From what I understand, the parallelism
+         comes at the cost of less precision, because it lets error
+         accumulate across iterations.
+        */
+        x0 = 1.0f;
+        y0 = 0.5f * n;
+        r0 = u.f;
+
+        x1 = x0 * r0;
+        y1 = y0 * r0 * r0;
+        r1 = 1.5f - y1;
+
+        x2 = x1 * r1;
+        y2 = y1 * r1 * r1;
+        r2 = 1.5f - y2;
+
+#if 1
+        return x2 * r2;  /* we can stop here, and be conformant -BP */
+#else
+        x3 = x2 * r2;
+        y3 = y2 * r2 * r2;
+        r3 = 1.5f - y3;
+
+        return x3 * r3;
+#endif
+#elif defined(XFree86LOADER) && defined(IN_MODULE)
+        return 1.0F / xf86sqrt(n);
+#else
+        return (float) (1.0 / sqrt(n));
+#endif
+}
+
+
+/**
+ * Wrapper around either pow() or xf86pow().
+ */
+double
+_mesa_pow(double x, double y)
+{
+#if defined(XFree86LOADER) && defined(IN_MODULE)
+   return xf86pow(x, y);
+#else
+   return pow(x, y);
+#endif
+}
+
+
+/**
+ * Return number of bits set in given GLuint.
+ */
+unsigned int
+_mesa_bitcount(unsigned int n)
+{
+   unsigned int bits;
+   for (bits = 0; n > 0; n = n >> 1) {
+      bits += (n & 1);
+   }
+   return bits;
+}
+
+
+/**
+ * Convert a 4-byte float to a 2-byte half float.
+ * Based on code from:
+ * http://www.opengl.org/discussion_boards/ubb/Forum3/HTML/008786.html
+ */
+GLhalfNV
+_mesa_float_to_half(float val)
+{
+   const int flt = *((int *) &val);
+   const int flt_m = flt & 0x7fffff;
+   const int flt_e = (flt >> 23) & 0xff;
+   const int flt_s = (flt >> 31) & 0x1;
+   int s, e, m = 0;
+   GLhalfNV result;
+   
+   /* sign bit */
+   s = flt_s;
+
+   /* handle special cases */
+   if ((flt_e == 0) && (flt_m == 0)) {
+      /* zero */
+      /* m = 0; - already set */
+      e = 0;
+   }
+   else if ((flt_e == 0) && (flt_m != 0)) {
+      /* denorm -- denorm float maps to 0 half */
+      /* m = 0; - already set */
+      e = 0;
+   }
+   else if ((flt_e == 0xff) && (flt_m == 0)) {
+      /* infinity */
+      /* m = 0; - already set */
+      e = 31;
+   }
+   else if ((flt_e == 0xff) && (flt_m != 0)) {
+      /* NaN */
+      m = 1;
+      e = 31;
+   }
+   else {
+      /* regular number */
+      const int new_exp = flt_e - 127;
+      if (new_exp < -24) {
+         /* this maps to 0 */
+         /* m = 0; - already set */
+         e = 0;
+      }
+      else if (new_exp < -14) {
+         /* this maps to a denorm */
+         unsigned int exp_val = (unsigned int) (-14 - new_exp); /* 2^-exp_val*/
+         e = 0;
+         switch (exp_val) {
+            case 0:
+               _mesa_warning(NULL,
+                   "float_to_half: logical error in denorm creation!\n");
+               /* m = 0; - already set */
+               break;
+            case 1: m = 512 + (flt_m >> 14); break;
+            case 2: m = 256 + (flt_m >> 15); break;
+            case 3: m = 128 + (flt_m >> 16); break;
+            case 4: m = 64 + (flt_m >> 17); break;
+            case 5: m = 32 + (flt_m >> 18); break;
+            case 6: m = 16 + (flt_m >> 19); break;
+            case 7: m = 8 + (flt_m >> 20); break;
+            case 8: m = 4 + (flt_m >> 21); break;
+            case 9: m = 2 + (flt_m >> 22); break;
+            case 10: m = 1; break;
+         }
+      }
+      else if (new_exp > 15) {
+         /* map this value to infinity */
+         /* m = 0; - already set */
+         e = 31;
+      }
+      else {
+         /* regular */
+         e = new_exp + 15;
+         m = flt_m >> 13;
+      }
+   }
+
+   result = (s << 15) | (e << 10) | m;
+   return result;
+}
+
+
+/**
+ * Convert a 2-byte half float to a 4-byte float.
+ * Based on code from:
+ * http://www.opengl.org/discussion_boards/ubb/Forum3/HTML/008786.html
+ */
+float
+_mesa_half_to_float(GLhalfNV val)
+{
+   /* XXX could also use a 64K-entry lookup table */
+   const int m = val & 0x3ff;
+   const int e = (val >> 10) & 0x1f;
+   const int s = (val >> 15) & 0x1;
+   int flt_m, flt_e, flt_s, flt;
+   float result;
+
+   /* sign bit */
+   flt_s = s;
+
+   /* handle special cases */
+   if ((e == 0) && (m == 0)) {
+      /* zero */
+      flt_m = 0;
+      flt_e = 0;
+   }
+   else if ((e == 0) && (m != 0)) {
+      /* denorm -- denorm half will fit in non-denorm single */
+      const float half_denorm = 1.0f / 16384.0f; /* 2^-14 */
+      float mantissa = ((float) (m)) / 1024.0f;
+      float sign = s ? -1.0f : 1.0f;
+      return sign * mantissa * half_denorm;
+   }
+   else if ((e == 31) && (m == 0)) {
+      /* infinity */
+      flt_e = 0xff;
+      flt_m = 0;
+   }
+   else if ((e == 31) && (m != 0)) {
+      /* NaN */
+      flt_e = 0xff;
+      flt_m = 1;
+   }
+   else {
+      /* regular */
+      flt_e = e + 112;
+      flt_m = m << 13;
+   }
+
+   flt = (flt_s << 31) | (flt_e << 23) | flt_m;
+   result = *((float *) &flt);
+   return result;
+}
+
+/*@}*/
+
+
+/**********************************************************************/
+/** \name Environment vars */
+/*@{*/
+
+/**
+ * Wrapper for getenv().
+ */
+char *
+_mesa_getenv( const char *var )
+{
+#if defined(XFree86LOADER) && defined(IN_MODULE)
+   return xf86getenv(var);
+#else
+   return getenv(var);
+#endif
+}
+
+/*@}*/
+
+
+/**********************************************************************/
+/** \name String */
+/*@{*/
+
+/** Wrapper around either strstr() or xf86strstr() */
+char *
+_mesa_strstr( const char *haystack, const char *needle )
+{
+#if defined(XFree86LOADER) && defined(IN_MODULE)
+   return xf86strstr(haystack, needle);
+#else
+   return strstr(haystack, needle);
+#endif
+}
+
+/** Wrapper around either strncat() or xf86strncat() */
+char *
+_mesa_strncat( char *dest, const char *src, size_t n )
+{
+#if defined(XFree86LOADER) && defined(IN_MODULE)
+   return xf86strncat(dest, src, n);
+#else
+   return strncat(dest, src, n);
+#endif
+}
+
+/** Wrapper around either strcpy() or xf86strcpy() */
+char *
+_mesa_strcpy( char *dest, const char *src )
+{
+#if defined(XFree86LOADER) && defined(IN_MODULE)
+   return xf86strcpy(dest, src);
+#else
+   return strcpy(dest, src);
+#endif
+}
+
+/** Wrapper around either strncpy() or xf86strncpy() */
+char *
+_mesa_strncpy( char *dest, const char *src, size_t n )
+{
+#if defined(XFree86LOADER) && defined(IN_MODULE)
+   return xf86strncpy(dest, src, n);
+#else
+   return strncpy(dest, src, n);
+#endif
+}
+
+/** Wrapper around either strlen() or xf86strlen() */
+size_t
+_mesa_strlen( const char *s )
+{
+#if defined(XFree86LOADER) && defined(IN_MODULE)
+   return xf86strlen(s);
+#else
+   return strlen(s);
+#endif
+}
+
+/** Wrapper around either strcmp() or xf86strcmp() */
+int
+_mesa_strcmp( const char *s1, const char *s2 )
+{
+#if defined(XFree86LOADER) && defined(IN_MODULE)
+   return xf86strcmp(s1, s2);
+#else
+   return strcmp(s1, s2);
+#endif
+}
+
+/** Wrapper around either strncmp() or xf86strncmp() */
+int
+_mesa_strncmp( const char *s1, const char *s2, size_t n )
+{
+#if defined(XFree86LOADER) && defined(IN_MODULE)
+   return xf86strncmp(s1, s2, n);
+#else
+   return strncmp(s1, s2, n);
+#endif
+}
+
+/** Implemented using _mesa_malloc() and _mesa_strcpy */
+char *
+_mesa_strdup( const char *s )
+{
+   int l = _mesa_strlen(s);
+   char *s2 = (char *) _mesa_malloc(l + 1);
+   if (s2)
+      _mesa_strcpy(s2, s);
+   return s2;
+}
+
+/** Wrapper around either atoi() or xf86atoi() */
+int
+_mesa_atoi(const char *s)
+{
+#if defined(XFree86LOADER) && defined(IN_MODULE)
+   return xf86atoi(s);
+#else
+   return atoi(s);
+#endif
+}
+
+/** Wrapper around either strtod() or xf86strtod() */
+double
+_mesa_strtod( const char *s, char **end )
+{
+#if defined(XFree86LOADER) && defined(IN_MODULE)
+   return xf86strtod(s, end);
+#else
+   return strtod(s, end);
+#endif
+}
+
+/*@}*/
+
+
+/**********************************************************************/
+/** \name I/O */
+/*@{*/
+
+/** Wrapper around either vsprintf() or xf86vsprintf() */
+int
+_mesa_sprintf( char *str, const char *fmt, ... )
+{
+   int r;
+   va_list args;
+   va_start( args, fmt );  
+   va_end( args );
+#if defined(XFree86LOADER) && defined(IN_MODULE)
+   r = xf86vsprintf( str, fmt, args );
+#else
+   r = vsprintf( str, fmt, args );
+#endif
+   return r;
+}
+
+/** Wrapper around either printf() or xf86printf(), using vsprintf() for
+ * the formatting. */
+void
+_mesa_printf( const char *fmtString, ... )
+{
+   char s[MAXSTRING];
+   va_list args;
+   va_start( args, fmtString );  
+   vsnprintf(s, MAXSTRING, fmtString, args);
+   va_end( args );
+#if defined(XFree86LOADER) && defined(IN_MODULE)
+   xf86printf("%s", s);
+#else
+   printf("%s", s);
+#endif
+}
+
+/*@}*/
+
+
+/**********************************************************************/
+/** \name Diagnostics */
+/*@{*/
+
+/**
+ * Display a warning.
+ *
+ * \param ctx GL context.
+ * \param fmtString printf() alike format string.
+ * 
+ * If debugging is enabled (either at compile-time via the DEBUG macro, or
+ * run-time via the MESA_DEBUG environment variable), prints the warning to
+ * stderr, either via fprintf() or xf86printf().
+ */
+void
+_mesa_warning( GLcontext *ctx, const char *fmtString, ... )
+{
+   GLboolean debug;
+   char str[MAXSTRING];
+   va_list args;
+   (void) ctx;
+   va_start( args, fmtString );  
+   (void) vsnprintf( str, MAXSTRING, fmtString, args );
+   va_end( args );
+#ifdef DEBUG
+   debug = GL_TRUE; /* always print warning */
+#else
+   debug = _mesa_getenv("MESA_DEBUG") ? GL_TRUE : GL_FALSE;
+#endif
+   if (debug) {
+#if defined(XFree86LOADER) && defined(IN_MODULE)
+      xf86fprintf(stderr, "Mesa warning: %s\n", str);
+#else
+      fprintf(stderr, "Mesa warning: %s\n", str);
+#endif
+   }
+}
+
+/**
+ * This function is called when the Mesa user has stumbled into a code
+ * path which may not be implemented fully or correctly.
+ *
+ * \param ctx GL context.
+ * \param s problem description string.
+ *
+ * Prints the message to stderr, either via fprintf() or xf86fprintf().
+ */
+void
+_mesa_problem( const GLcontext *ctx, const char *fmtString, ... )
+{
+   va_list args;
+   char str[MAXSTRING];
+   (void) ctx;
+
+   va_start( args, fmtString );  
+   vsnprintf( str, MAXSTRING, fmtString, args );
+   va_end( args );
+
+#if defined(XFree86LOADER) && defined(IN_MODULE)
+   xf86fprintf(stderr, "Mesa implementation error: %s\n", str);
+   xf86fprintf(stderr, "Please report to the DRI project at dri.sourceforge.net\n");
+#else
+   fprintf(stderr, "Mesa implementation error: %s\n", str);
+   fprintf(stderr, "Please report to the Mesa bug database at www.mesa3d.org\n" );
+#endif
+}
+
+/**
+ * Display an error message.
+ *
+ * If in debug mode, print error message.
+ * Also, record the error code by calling _mesa_record_error().
+ * 
+ * \param ctx the GL context.
+ * \param error the error value.
+ * \param fmtString printf() style format string, followed by optional args
+ *         
+ * If debugging is enabled (either at compile-time via the DEBUG macro, or
+ * run-time via the MESA_DEBUG environment variable), interperts the error code and 
+ * prints the error message via _mesa_debug().
+ */
+void
+_mesa_error( GLcontext *ctx, GLenum error, const char *fmtString, ... )
+{
+   const char *debugEnv;
+   GLboolean debug;
+
+   debugEnv = _mesa_getenv("MESA_DEBUG");
+
+#ifdef DEBUG
+   if (debugEnv && _mesa_strstr(debugEnv, "silent"))
+      debug = GL_FALSE;
+   else
+      debug = GL_TRUE;
+#else
+   if (debugEnv)
+      debug = GL_TRUE;
+   else
+      debug = GL_FALSE;
+#endif
+
+   if (debug) {
+      va_list args;
+      char where[MAXSTRING];
+      const char *errstr;
+
+      va_start( args, fmtString );  
+      vsnprintf( where, MAXSTRING, fmtString, args );
+      va_end( args );
+
+      switch (error) {
+	 case GL_NO_ERROR:
+	    errstr = "GL_NO_ERROR";
+	    break;
+	 case GL_INVALID_VALUE:
+	    errstr = "GL_INVALID_VALUE";
+	    break;
+	 case GL_INVALID_ENUM:
+	    errstr = "GL_INVALID_ENUM";
+	    break;
+	 case GL_INVALID_OPERATION:
+	    errstr = "GL_INVALID_OPERATION";
+	    break;
+	 case GL_STACK_OVERFLOW:
+	    errstr = "GL_STACK_OVERFLOW";
+	    break;
+	 case GL_STACK_UNDERFLOW:
+	    errstr = "GL_STACK_UNDERFLOW";
+	    break;
+	 case GL_OUT_OF_MEMORY:
+	    errstr = "GL_OUT_OF_MEMORY";
+	    break;
+         case GL_TABLE_TOO_LARGE:
+            errstr = "GL_TABLE_TOO_LARGE";
+            break;
+	 default:
+	    errstr = "unknown";
+	    break;
+      }
+      _mesa_debug(ctx, "User error: %s in %s\n", errstr, where);
+   }
+
+   _mesa_record_error(ctx, error);
+}  
+
+/**
+ * Report debug information.
+ * 
+ * \param ctx GL context.
+ * \param fmtString printf() alike format string.
+ * 
+ * Prints the message to stderr, either via fprintf() or xf86printf().
+ */
+void
+_mesa_debug( const GLcontext *ctx, const char *fmtString, ... )
+{
+   char s[MAXSTRING];
+   va_list args;
+   va_start(args, fmtString);
+   vsnprintf(s, MAXSTRING, fmtString, args);
+   va_end(args);
+#if defined(XFree86LOADER) && defined(IN_MODULE)
+   xf86fprintf(stderr, "Mesa: %s", s);
+#else
+   fprintf(stderr, "Mesa: %s", s);
+#endif
+}
+
+/*@}*/
+
+
+/**********************************************************************/
+/** \name Default Imports Wrapper */
+/*@{*/
+
+/** Wrapper around _mesa_malloc() */
+static void *
+default_malloc(__GLcontext *gc, size_t size)
+{
+   (void) gc;
+   return _mesa_malloc(size);
+}
+
+/** Wrapper around _mesa_malloc() */
+static void *
+default_calloc(__GLcontext *gc, size_t numElem, size_t elemSize)
+{
+   (void) gc;
+   return _mesa_calloc(numElem * elemSize);
+}
+
+/** Wrapper around either realloc() or xf86realloc() */
+static void *
+default_realloc(__GLcontext *gc, void *oldAddr, size_t newSize)
+{
+   (void) gc;
+#if defined(XFree86LOADER) && defined(IN_MODULE)
+   return xf86realloc(oldAddr, newSize);
+#else
+   return realloc(oldAddr, newSize);
+#endif
+}
+
+/** Wrapper around _mesa_free() */
+static void
+default_free(__GLcontext *gc, void *addr)
+{
+   (void) gc;
+   _mesa_free(addr);
+}
+
+/** Wrapper around _mesa_getenv() */
+static char * CAPI
+default_getenv( __GLcontext *gc, const char *var )
+{
+   (void) gc;
+   return _mesa_getenv(var);
+}
+
+/** Wrapper around _mesa_warning() */
+static void
+default_warning(__GLcontext *gc, char *str)
+{
+   _mesa_warning(gc, str);
+}
+
+/** Wrapper around _mesa_problem() */
+static void
+default_fatal(__GLcontext *gc, char *str)
+{
+   _mesa_problem(gc, str);
+   abort();
+}
+
+/** Wrapper around atoi() */
+static int CAPI
+default_atoi(__GLcontext *gc, const char *str)
+{
+   (void) gc;
+   return atoi(str);
+}
+
+/** Wrapper around vsprintf() */
+static int CAPI
+default_sprintf(__GLcontext *gc, char *str, const char *fmt, ...)
+{
+   int r;
+   va_list args;
+   va_start( args, fmt );  
+   r = vsprintf( str, fmt, args );
+   va_end( args );
+   return r;
+}
+
+/** Wrapper around fopen() */
+static void * CAPI
+default_fopen(__GLcontext *gc, const char *path, const char *mode)
+{
+   return fopen(path, mode);
+}
+
+/** Wrapper around fclose() */
+static int CAPI
+default_fclose(__GLcontext *gc, void *stream)
+{
+   return fclose((FILE *) stream);
+}
+
+/** Wrapper around vfprintf() */
+static int CAPI
+default_fprintf(__GLcontext *gc, void *stream, const char *fmt, ...)
+{
+   int r;
+   va_list args;
+   va_start( args, fmt );  
+   r = vfprintf( (FILE *) stream, fmt, args );
+   va_end( args );
+   return r;
+}
+
+/**
+ * \todo this really is driver-specific and can't be here 
+ */
+static __GLdrawablePrivate *
+default_GetDrawablePrivate(__GLcontext *gc)
+{
+   return NULL;
+}
+
+/*@}*/
+
+
+/**
+ * Initialize a __GLimports object to point to the functions in this
+ * file.  
+ *
+ * This is to be called from device drivers.
+ * 
+ * Also, do some one-time initializations.
+ * 
+ * \param imports the object to initialize.
+ * \param driverCtx pointer to device driver-specific data.
+ */
+void
+_mesa_init_default_imports(__GLimports *imports, void *driverCtx)
+{
+   /* XXX maybe move this one-time init stuff into context.c */
+   static GLboolean initialized = GL_FALSE;
+   if (!initialized) {
+      init_sqrt_table();
+
+#if defined(_FPU_GETCW) && defined(_FPU_SETCW)
+      {
+         const char *debug = _mesa_getenv("MESA_DEBUG");
+         if (debug && _mesa_strcmp(debug, "FP")==0) {
+            /* die on FP exceptions */
+            fpu_control_t mask;
+            _FPU_GETCW(mask);
+            mask &= ~(_FPU_MASK_IM | _FPU_MASK_DM | _FPU_MASK_ZM
+                      | _FPU_MASK_OM | _FPU_MASK_UM);
+            _FPU_SETCW(mask);
+         }
+      }
+#endif
+      initialized = GL_TRUE;
+   }
+
+   imports->malloc = default_malloc;
+   imports->calloc = default_calloc;
+   imports->realloc = default_realloc;
+   imports->free = default_free;
+   imports->warning = default_warning;
+   imports->fatal = default_fatal;
+   imports->getenv = default_getenv; /* not used for now */
+   imports->atoi = default_atoi;
+   imports->sprintf = default_sprintf;
+   imports->fopen = default_fopen;
+   imports->fclose = default_fclose;
+   imports->fprintf = default_fprintf;
+   imports->getDrawablePrivate = default_GetDrawablePrivate;
+   imports->other = driverCtx;
+}
diff --git a/reactos/lib/mesa32/src/main/imports.h b/reactos/lib/mesa32/src/main/imports.h
new file mode 100644
index 00000000000..5cdac06ba82
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/imports.h
@@ -0,0 +1,776 @@
+/**
+ * \file imports.h
+ * Standard C library function wrappers.
+ *
+ * This file provides wrappers for all the standard C library functions
+ * like malloc(), free(), printf(), getenv(), etc.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef IMPORTS_H
+#define IMPORTS_H
+
+
+/* XXX some of the stuff in glheader.h should be moved into this file.
+ */
+#include "glheader.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/**********************************************************************/
+/** \name General macros */
+/*@{*/
+
+#ifndef NULL
+#define NULL 0
+#endif
+
+/*@}*/
+
+
+/**********************************************************************/
+/** Memory macros */
+/*@{*/
+
+/** Allocate \p BYTES bytes */
+#define MALLOC(BYTES)      _mesa_malloc(BYTES)
+/** Allocate and zero \p BYTES bytes */
+#define CALLOC(BYTES)      _mesa_calloc(BYTES)
+/** Allocate a structure of type \p T */
+#define MALLOC_STRUCT(T)   (struct T *) _mesa_malloc(sizeof(struct T))
+/** Allocate and zero a structure of type \p T */
+#define CALLOC_STRUCT(T)   (struct T *) _mesa_calloc(sizeof(struct T))
+/** Free memory */
+#define FREE(PTR)          _mesa_free(PTR)
+
+/** Allocate \p BYTES aligned at \p N bytes */
+#define ALIGN_MALLOC(BYTES, N)     _mesa_align_malloc(BYTES, N)
+/** Allocate and zero \p BYTES bytes aligned at \p N bytes */
+#define ALIGN_CALLOC(BYTES, N)     _mesa_align_calloc(BYTES, N)
+/** Allocate a structure of type \p T aligned at \p N bytes */
+#define ALIGN_MALLOC_STRUCT(T, N)  (struct T *) _mesa_align_malloc(sizeof(struct T), N)
+/** Allocate and zero a structure of type \p T aligned at \p N bytes */
+#define ALIGN_CALLOC_STRUCT(T, N)  (struct T *) _mesa_align_calloc(sizeof(struct T), N)
+/** Free aligned memory */
+#define ALIGN_FREE(PTR)            _mesa_align_free(PTR)
+
+/** Copy \p BYTES bytes from \p SRC into \p DST */
+#define MEMCPY( DST, SRC, BYTES)   _mesa_memcpy(DST, SRC, BYTES)
+/** Set \p N bytes in \p DST to \p VAL */
+#define MEMSET( DST, VAL, N )      _mesa_memset(DST, VAL, N)
+
+#define MEMSET16( DST, VAL, N )   _mesa_memset16( (DST), (VAL), (size_t) (N) )
+
+/*@}*/
+
+
+/*
+ * For GL_ARB_vertex_buffer_object we need to treat vertex array pointers
+ * as offsets into buffer stores.  Since the vertex array pointer and
+ * buffer store pointer are both pointers and we need to add them, we use
+ * this macro.
+ * Both pointers/offsets are expressed in bytes.
+ */
+#define ADD_POINTERS(A, B)  ( (A) + (unsigned long) (B) )
+
+
+/**********************************************************************/
+/** \name [Pseudo] static array declaration.
+ *
+ * MACs and BeOS don't support static larger than 32kb, so ...
+ */
+/*@{*/
+
+/**
+ * \def DEFARRAY
+ * Define a [static] unidimensional array
+ */
+
+/**
+ * \def DEFMARRAY
+ * Define a [static] bi-dimensional array
+ */
+
+/**
+ * \def DEFMNARRAY
+ * Define a [static] tri-dimensional array
+ */
+
+/**
+ * \def CHECKARRAY
+ * Verifies a [static] array was properly allocated.
+ */
+
+/**
+ * \def UNDEFARRAY
+ * Undefine (free) a [static] array.
+ */
+
+#if defined(macintosh) && !defined(__MRC__)
+/*extern char *AGLAlloc(int size);*/
+/*extern void AGLFree(char* ptr);*/
+#  define DEFARRAY(TYPE,NAME,SIZE)  			TYPE *NAME = (TYPE*)_mesa_alloc(sizeof(TYPE)*(SIZE))
+#  define DEFMARRAY(TYPE,NAME,SIZE1,SIZE2)		TYPE (*NAME)[SIZE2] = (TYPE(*)[SIZE2])_mesa_alloc(sizeof(TYPE)*(SIZE1)*(SIZE2))
+#  define DEFMNARRAY(TYPE,NAME,SIZE1,SIZE2,SIZE3)	TYPE (*NAME)[SIZE2][SIZE3] = (TYPE(*)[SIZE2][SIZE3])_mesa_alloc(sizeof(TYPE)*(SIZE1)*(SIZE2)*(SIZE3))
+#  define CHECKARRAY(NAME,CMD)				do {if (!(NAME)) {CMD;}} while (0)
+#  define UNDEFARRAY(NAME)          			do {if ((NAME)) {_mesa_free((char*)NAME);}  }while (0)
+#elif defined(__BEOS__)
+#  define DEFARRAY(TYPE,NAME,SIZE)  			TYPE *NAME = (TYPE*)_mesa_malloc(sizeof(TYPE)*(SIZE))
+#  define DEFMARRAY(TYPE,NAME,SIZE1,SIZE2)  		TYPE (*NAME)[SIZE2] = (TYPE(*)[SIZE2])_mesa_malloc(sizeof(TYPE)*(SIZE1)*(SIZE2))
+#  define DEFMNARRAY(TYPE,NAME,SIZE1,SIZE2,SIZE3)	TYPE (*NAME)[SIZE2][SIZE3] = (TYPE(*)[SIZE2][SIZE3])_mesa_malloc(sizeof(TYPE)*(SIZE1)*(SIZE2)*(SIZE3))
+#  define CHECKARRAY(NAME,CMD)				do {if (!(NAME)) {CMD;}} while (0)
+#  define UNDEFARRAY(NAME)          			do {if ((NAME)) {_mesa_free((char*)NAME);}  }while (0)
+#else
+#  define DEFARRAY(TYPE,NAME,SIZE)  			TYPE NAME[SIZE]
+#  define DEFMARRAY(TYPE,NAME,SIZE1,SIZE2)		TYPE NAME[SIZE1][SIZE2]
+#  define DEFMNARRAY(TYPE,NAME,SIZE1,SIZE2,SIZE3)	TYPE NAME[SIZE1][SIZE2][SIZE3]
+#  define CHECKARRAY(NAME,CMD)				do {} while(0)
+#  define UNDEFARRAY(NAME)
+#endif
+
+/*@}*/
+
+
+/**********************************************************************/
+/** \name External pixel buffer allocation.
+ *
+ * If you want Mesa's depth/stencil/accum/etc buffers to be allocated with a
+ * specialized allocator you can define MESA_EXTERNAL_BUFFERALLOC and implement
+ * _ext_mesa_alloc_pixelbuffer() _ext_mesa_free_pixelbuffer() in your
+ * application.
+ *
+ * \author
+ * Contributed by Gerk Huisma (gerk@five-d.demon.nl).
+ */
+/*@{*/
+
+/**
+ * \def MESA_PBUFFER_ALLOC
+ * Allocate a pixel buffer.
+ */
+
+/**
+ * \def MESA_PBUFFER_FREE
+ * Free a pixel buffer.
+ */
+
+#ifdef MESA_EXTERNAL_BUFFERALLOC
+extern void *_ext_mesa_alloc_pixelbuffer( unsigned int size );
+extern void _ext_mesa_free_pixelbuffer( void *pb );
+
+#define MESA_PBUFFER_ALLOC(BYTES)  (void *) _ext_mesa_alloc_pixelbuffer(BYTES)
+#define MESA_PBUFFER_FREE(PTR)     _ext_mesa_free_pixelbuffer(PTR)
+#else
+/* Default buffer allocation uses the aligned allocation routines: */
+#define MESA_PBUFFER_ALLOC(BYTES)  (void *) _mesa_align_malloc(BYTES, 512)
+#define MESA_PBUFFER_FREE(PTR)     _mesa_align_free(PTR)
+#endif
+
+/*@}*/
+
+
+
+/**********************************************************************
+ * Math macros
+ */
+
+#define MAX_GLUSHORT	0xffff
+#define MAX_GLUINT	0xffffffff
+
+#ifndef M_PI
+#define M_PI (3.1415926536)
+#endif
+
+/* XXX this is a bit of a hack needed for compilation within XFree86 */
+#ifndef FLT_MIN
+#define FLT_MIN (1.0e-37)
+#endif
+
+/* Degrees to radians conversion: */
+#define DEG2RAD (M_PI/180.0)
+
+
+/***
+ *** USE_IEEE: Determine if we're using IEEE floating point
+ ***/
+#if defined(__i386__) || defined(__386__) || defined(__sparc__) || \
+    defined(__s390x__) || defined(__powerpc__) || \
+    ( defined(__alpha__) && ( defined(__IEEE_FLOAT) || !defined(VMS) ) )
+#define USE_IEEE
+#define IEEE_ONE 0x3f800000
+#endif
+
+
+/***
+ *** SQRTF: single-precision square root
+ ***/
+#if 0 /* _mesa_sqrtf() not accurate enough - temporarily disabled */
+#  define SQRTF(X)  _mesa_sqrtf(X)
+#elif defined(XFree86LOADER) && defined(IN_MODULE)
+#  define SQRTF(X)  (float) xf86sqrt((float) (X))
+#else
+#  define SQRTF(X)  (float) sqrt((float) (X))
+#endif
+
+
+/***
+ *** INV_SQRTF: single-precision inverse square root
+ ***/
+#if 0
+#define INV_SQRTF(X) _mesa_inv_sqrt(X)
+#else
+#define INV_SQRTF(X) (1.0F / SQRTF(X))  /* this is faster on a P4 */
+#endif
+
+
+/***
+ *** LOG2: Log base 2 of float
+ ***/
+#ifdef USE_IEEE
+#if 0
+/* This is pretty fast, but not accurate enough (only 2 fractional bits).
+ * Based on code from http://www.stereopsis.com/log2.html
+ */
+static INLINE GLfloat LOG2(GLfloat x)
+{
+   const GLfloat y = x * x * x * x;
+   const GLuint ix = *((GLuint *) &y);
+   const GLuint exp = (ix >> 23) & 0xFF;
+   const GLint log2 = ((GLint) exp) - 127;
+   return (GLfloat) log2 * (1.0 / 4.0);  /* 4, because of x^4 above */
+}
+#endif
+/* Pretty fast, and accurate.
+ * Based on code from http://www.flipcode.com/totd/
+ */
+static INLINE GLfloat LOG2(GLfloat val)
+{
+   fi_type num;
+   GLint log_2;
+   num.f = val;
+   log_2 = ((num.i >> 23) & 255) - 128;
+   num.i &= ~(255 << 23);
+   num.i += 127 << 23;
+   num.f = ((-1.0f/3) * num.f + 2) * num.f - 2.0f/3;
+   return num.f + log_2;
+}
+#elif defined(XFree86LOADER) && defined(IN_MODULE)
+#define LOG2(x) ((GLfloat) (xf86log(x) * 1.442695))
+#else
+/*
+ * NOTE: log_base_2(x) = log(x) / log(2)
+ * NOTE: 1.442695 = 1/log(2).
+ */
+#define LOG2(x)  ((GLfloat) (log(x) * 1.442695F))
+#endif
+
+
+/***
+ *** IS_INF_OR_NAN: test if float is infinite or NaN
+ ***/
+#ifdef USE_IEEE
+static INLINE int IS_INF_OR_NAN( float x )
+{
+   fi_type tmp;
+   tmp.f = x;
+   return !(int)((unsigned int)((tmp.i & 0x7fffffff)-0x7f800000) >> 31);
+}
+#elif defined(isfinite)
+#define IS_INF_OR_NAN(x)        (!isfinite(x))
+#elif defined(finite)
+#define IS_INF_OR_NAN(x)        (!finite(x))
+#elif __VMS
+#define IS_INF_OR_NAN(x)        (!finite(x))
+#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#define IS_INF_OR_NAN(x)        (!isfinite(x))
+#else
+#define IS_INF_OR_NAN(x)        (!finite(x))
+#endif
+
+
+/***
+ *** IS_NEGATIVE: test if float is negative
+ ***/
+#if defined(USE_IEEE)
+#define GET_FLOAT_BITS(x) ((fi_type *) &(x))->i
+#define IS_NEGATIVE(x) (GET_FLOAT_BITS(x) & (1<<31))
+#else
+#define IS_NEGATIVE(x) (x < 0.0F)
+#endif
+
+
+/***
+ *** DIFFERENT_SIGNS: test if two floats have opposite signs
+ ***/
+#if defined(USE_IEEE)
+#define DIFFERENT_SIGNS(x,y) ((GET_FLOAT_BITS(x) ^ GET_FLOAT_BITS(y)) & (1<<31))
+#else
+/* Could just use (x*y<0) except for the flatshading requirements.
+ * Maybe there's a better way?
+ */
+#define DIFFERENT_SIGNS(x,y) ((x) * (y) <= 0.0F && (x) - (y) != 0.0F)
+#endif
+
+
+/***
+ *** CEILF: ceiling of float
+ *** FLOORF: floor of float
+ *** FABSF: absolute value of float
+ ***/
+#if defined(XFree86LOADER) && defined(IN_MODULE)
+#define CEILF(x)   ((GLfloat) xf86ceil(x))
+#define FLOORF(x)  ((GLfloat) xf86floor(x))
+#define FABSF(x)   ((GLfloat) xf86fabs(x))
+#elif defined(__gnu_linux__)
+/* C99 functions */
+#define CEILF(x)   ceilf(x)
+#define FLOORF(x)  floorf(x)
+#define FABSF(x)   fabsf(x)
+#else
+#define CEILF(x)   ((GLfloat) ceil(x))
+#define FLOORF(x)  ((GLfloat) floor(x))
+#define FABSF(x)   ((GLfloat) fabs(x))
+#endif
+
+
+/***
+ *** IROUND: return (as an integer) float rounded to nearest integer
+ ***/
+#if defined(USE_SPARC_ASM) && defined(__GNUC__) && defined(__sparc__)
+static INLINE int iround(float f)
+{
+   int r;
+   __asm__ ("fstoi %1, %0" : "=f" (r) : "f" (f));
+   return r;
+}
+#define IROUND(x)  iround(x)
+#elif defined(USE_X86_ASM) && defined(__GNUC__) && defined(__i386__)
+static INLINE int iround(float f)
+{
+   int r;
+   __asm__ ("fistpl %0" : "=m" (r) : "t" (f) : "st");
+   return r;
+}
+#define IROUND(x)  iround(x)
+#elif defined(USE_X86_ASM) && defined(__MSC__) && defined(__WIN32__)
+static INLINE int iround(float f)
+{
+   int r;
+   _asm {
+	 fld f
+	 fistp r
+	}
+   return r;
+}
+#define IROUND(x)  iround(x)
+#elif defined(__WATCOMC__) && defined(__386__)
+long iround(float f);
+#pragma aux iround =                    \
+	"push   eax"                        \
+	"fistp  dword ptr [esp]"            \
+	"pop    eax"                        \
+	parm [8087]                         \
+	value [eax]                         \
+	modify exact [eax];
+#define IROUND(x)  iround(x)
+#else
+#define IROUND(f)  ((int) (((f) >= 0.0F) ? ((f) + 0.5F) : ((f) - 0.5F)))
+#endif
+
+
+/***
+ *** IROUND_POS: return (as an integer) positive float rounded to nearest int
+ ***/
+#ifdef DEBUG
+#define IROUND_POS(f) (assert((f) >= 0.0F), IROUND(f))
+#else
+#define IROUND_POS(f) (IROUND(f))
+#endif
+
+
+/***
+ *** IFLOOR: return (as an integer) floor of float
+ ***/
+#if defined(USE_X86_ASM) && defined(__GNUC__) && defined(__i386__)
+/*
+ * IEEE floor for computers that round to nearest or even.
+ * 'f' must be between -4194304 and 4194303.
+ * This floor operation is done by "(iround(f + .5) + iround(f - .5)) >> 1",
+ * but uses some IEEE specific tricks for better speed.
+ * Contributed by Josh Vanderhoof
+ */
+static INLINE int ifloor(float f)
+{
+   int ai, bi;
+   double af, bf;
+   af = (3 << 22) + 0.5 + (double)f;
+   bf = (3 << 22) + 0.5 - (double)f;
+   /* GCC generates an extra fstp/fld without this. */
+   __asm__ ("fstps %0" : "=m" (ai) : "t" (af) : "st");
+   __asm__ ("fstps %0" : "=m" (bi) : "t" (bf) : "st");
+   return (ai - bi) >> 1;
+}
+#define IFLOOR(x)  ifloor(x)
+#elif defined(USE_IEEE)
+static INLINE int ifloor(float f)
+{
+   int ai, bi;
+   double af, bf;
+   fi_type u;
+
+   af = (3 << 22) + 0.5 + (double)f;
+   bf = (3 << 22) + 0.5 - (double)f;
+   u.f = (float) af;  ai = u.i;
+   u.f = (float) bf;  bi = u.i;
+   return (ai - bi) >> 1;
+}
+#define IFLOOR(x)  ifloor(x)
+#else
+static INLINE int ifloor(float f)
+{
+   int i = IROUND(f);
+   return (i > f) ? i - 1 : i;
+}
+#define IFLOOR(x)  ifloor(x)
+#endif
+
+
+/***
+ *** ICEIL: return (as an integer) ceiling of float
+ ***/
+#if defined(USE_X86_ASM) && defined(__GNUC__) && defined(__i386__)
+/*
+ * IEEE ceil for computers that round to nearest or even.
+ * 'f' must be between -4194304 and 4194303.
+ * This ceil operation is done by "(iround(f + .5) + iround(f - .5) + 1) >> 1",
+ * but uses some IEEE specific tricks for better speed.
+ * Contributed by Josh Vanderhoof
+ */
+static INLINE int iceil(float f)
+{
+   int ai, bi;
+   double af, bf;
+   af = (3 << 22) + 0.5 + (double)f;
+   bf = (3 << 22) + 0.5 - (double)f;
+   /* GCC generates an extra fstp/fld without this. */
+   __asm__ ("fstps %0" : "=m" (ai) : "t" (af) : "st");
+   __asm__ ("fstps %0" : "=m" (bi) : "t" (bf) : "st");
+   return (ai - bi + 1) >> 1;
+}
+#define ICEIL(x)  iceil(x)
+#elif defined(USE_IEEE)
+static INLINE int iceil(float f)
+{
+   int ai, bi;
+   double af, bf;
+   fi_type u;
+   af = (3 << 22) + 0.5 + (double)f;
+   bf = (3 << 22) + 0.5 - (double)f;
+   u.f = (float) af; ai = u.i;
+   u.f = (float) bf; bi = u.i;
+   return (ai - bi + 1) >> 1;
+}
+#define ICEIL(x)  iceil(x)
+#else
+static INLINE int iceil(float f)
+{
+   int i = IROUND(f);
+   return (i < f) ? i + 1 : i;
+}
+#define ICEIL(x)  iceil(x)
+#endif
+
+
+/***
+ *** UNCLAMPED_FLOAT_TO_UBYTE: clamp float to [0,1] and map to ubyte in [0,255]
+ *** CLAMPED_FLOAT_TO_UBYTE: map float known to be in [0,1] to ubyte in [0,255]
+ ***/
+#if defined(USE_IEEE) && !defined(DEBUG)
+#define IEEE_0996 0x3f7f0000	/* 0.996 or so */
+/* This function/macro is sensitive to precision.  Test very carefully
+ * if you change it!
+ */
+#define UNCLAMPED_FLOAT_TO_UBYTE(UB, F)					\
+        do {								\
+           fi_type __tmp;						\
+           __tmp.f = (F);						\
+           if (__tmp.i < 0)						\
+              UB = (GLubyte) 0;						\
+           else if (__tmp.i >= IEEE_0996)				\
+              UB = (GLubyte) 255;					\
+           else {							\
+              __tmp.f = __tmp.f * (255.0F/256.0F) + 32768.0F;		\
+              UB = (GLubyte) __tmp.i;					\
+           }								\
+        } while (0)
+#define CLAMPED_FLOAT_TO_UBYTE(UB, F)					\
+        do {								\
+           fi_type __tmp;						\
+           __tmp.f = (F) * (255.0F/256.0F) + 32768.0F;			\
+           UB = (GLubyte) __tmp.i;					\
+        } while (0)
+#else
+#define UNCLAMPED_FLOAT_TO_UBYTE(ub, f) \
+	ub = ((GLubyte) IROUND(CLAMP((f), 0.0F, 1.0F) * 255.0F))
+#define CLAMPED_FLOAT_TO_UBYTE(ub, f) \
+	ub = ((GLubyte) IROUND((f) * 255.0F))
+#endif
+
+
+/***
+ *** COPY_FLOAT: copy a float from src to dest, avoid slow FP regs if possible
+ ***/
+#if defined(USE_IEEE) && !defined(DEBUG)
+#define COPY_FLOAT( dst, src )					\
+	((fi_type *) &(dst))->i = ((fi_type *) &(src))->i
+#else
+#define COPY_FLOAT( dst, src )		(dst) = (src)
+#endif
+
+
+/***
+ *** START_FAST_MATH: Set x86 FPU to faster, 32-bit precision mode (and save
+ ***                  original mode to a temporary).
+ *** END_FAST_MATH: Restore x86 FPU to original mode.
+ ***/
+#if defined(__GNUC__) && defined(__i386__)
+/*
+ * Set the x86 FPU control word to guarentee only 32 bits of precision
+ * are stored in registers.  Allowing the FPU to store more introduces
+ * differences between situations where numbers are pulled out of memory
+ * vs. situations where the compiler is able to optimize register usage.
+ *
+ * In the worst case, we force the compiler to use a memory access to
+ * truncate the float, by specifying the 'volatile' keyword.
+ */
+/* Hardware default: All exceptions masked, extended double precision,
+ * round to nearest (IEEE compliant):
+ */
+#define DEFAULT_X86_FPU		0x037f
+/* All exceptions masked, single precision, round to nearest:
+ */
+#define FAST_X86_FPU		0x003f
+/* The fldcw instruction will cause any pending FP exceptions to be
+ * raised prior to entering the block, and we clear any pending
+ * exceptions before exiting the block.  Hence, asm code has free
+ * reign over the FPU while in the fast math block.
+ */
+#if defined(NO_FAST_MATH)
+#define START_FAST_MATH(x)						\
+do {									\
+   static GLuint mask = DEFAULT_X86_FPU;				\
+   __asm__ ( "fnstcw %0" : "=m" (*&(x)) );				\
+   __asm__ ( "fldcw %0" : : "m" (mask) );				\
+} while (0)
+#else
+#define START_FAST_MATH(x)						\
+do {									\
+   static GLuint mask = FAST_X86_FPU;					\
+   __asm__ ( "fnstcw %0" : "=m" (*&(x)) );				\
+   __asm__ ( "fldcw %0" : : "m" (mask) );				\
+} while (0)
+#endif
+/* Restore original FPU mode, and clear any exceptions that may have
+ * occurred in the FAST_MATH block.
+ */
+#define END_FAST_MATH(x)						\
+do {									\
+   __asm__ ( "fnclex ; fldcw %0" : : "m" (*&(x)) );			\
+} while (0)
+
+#elif defined(__WATCOMC__) && defined(__386__)
+#define DEFAULT_X86_FPU		0x037f /* See GCC comments above */
+#define FAST_X86_FPU		0x003f /* See GCC comments above */
+void _watcom_start_fast_math(unsigned short *x,unsigned short *mask);
+#pragma aux _watcom_start_fast_math =                                   \
+   "fnstcw  word ptr [eax]"                                             \
+   "fldcw   word ptr [ecx]"                                             \
+   parm [eax] [ecx]                                                     \
+   modify exact [];
+void _watcom_end_fast_math(unsigned short *x);
+#pragma aux _watcom_end_fast_math =                                     \
+   "fnclex"                                                             \
+   "fldcw   word ptr [eax]"                                             \
+   parm [eax]                                                           \
+   modify exact [];
+#if defined(NO_FAST_MATH)
+#define START_FAST_MATH(x)                                              \
+do {                                                                    \
+   static GLushort mask = DEFAULT_X86_FPU;	                            \
+   _watcom_start_fast_math(&x,&mask);                                   \
+} while (0)
+#else
+#define START_FAST_MATH(x)                                              \
+do {                                                                    \
+   static GLushort mask = FAST_X86_FPU;                                 \
+   _watcom_start_fast_math(&x,&mask);                                   \
+} while (0)
+#endif
+#define END_FAST_MATH(x)  _watcom_end_fast_math(&x)
+#else
+#define START_FAST_MATH(x)  x = 0
+#define END_FAST_MATH(x)  (void)(x)
+#endif
+
+
+
+/**********************************************************************
+ * Functions
+ */
+
+extern void *
+_mesa_malloc( size_t bytes );
+
+extern void *
+_mesa_calloc( size_t bytes );
+
+extern void
+_mesa_free( void *ptr );
+
+extern void *
+_mesa_align_malloc( size_t bytes, unsigned long alignment );
+
+extern void *
+_mesa_align_calloc( size_t bytes, unsigned long alignment );
+
+extern void
+_mesa_align_free( void *ptr );
+
+extern void *
+_mesa_realloc( void *oldBuffer, size_t oldSize, size_t newSize );
+
+extern void *
+_mesa_memcpy( void *dest, const void *src, size_t n );
+
+extern void
+_mesa_memset( void *dst, int val, size_t n );
+
+extern void
+_mesa_memset16( unsigned short *dst, unsigned short val, size_t n );
+
+extern void
+_mesa_bzero( void *dst, size_t n );
+
+
+extern double
+_mesa_sin(double a);
+
+extern double
+_mesa_cos(double a);
+
+extern double
+_mesa_sqrtd(double x);
+
+extern float
+_mesa_sqrtf(float x);
+
+extern float
+_mesa_inv_sqrtf(float x);
+
+extern double
+_mesa_pow(double x, double y);
+
+extern float
+_mesa_log2(float x);
+
+extern unsigned int
+_mesa_bitcount(unsigned int n);
+
+extern GLhalfNV
+_mesa_float_to_half(float f);
+
+extern float
+_mesa_half_to_float(GLhalfNV h);
+
+
+extern char *
+_mesa_getenv( const char *var );
+
+extern char *
+_mesa_strstr( const char *haystack, const char *needle );
+
+extern char *
+_mesa_strncat( char *dest, const char *src, size_t n );
+
+extern char *
+_mesa_strcpy( char *dest, const char *src );
+
+extern char *
+_mesa_strncpy( char *dest, const char *src, size_t n );
+
+extern size_t
+_mesa_strlen( const char *s );
+
+extern int
+_mesa_strcmp( const char *s1, const char *s2 );
+
+extern int
+_mesa_strncmp( const char *s1, const char *s2, size_t n );
+
+extern char *
+_mesa_strdup( const char *s );
+
+extern int
+_mesa_atoi( const char *s );
+
+extern double
+_mesa_strtod( const char *s, char **end );
+
+extern int
+_mesa_sprintf( char *str, const char *fmt, ... );
+
+extern void
+_mesa_printf( const char *fmtString, ... );
+
+
+extern void
+_mesa_warning( __GLcontext *gc, const char *fmtString, ... );
+
+extern void
+_mesa_problem( const __GLcontext *ctx, const char *fmtString, ... );
+
+extern void
+_mesa_error( __GLcontext *ctx, GLenum error, const char *fmtString, ... );
+
+extern void
+_mesa_debug( const __GLcontext *ctx, const char *fmtString, ... );
+
+
+extern void
+_mesa_init_default_imports( __GLimports *imports, void *driverCtx );
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* IMPORTS_H */
diff --git a/reactos/lib/mesa32/src/main/light.c b/reactos/lib/mesa32/src/main/light.c
new file mode 100644
index 00000000000..d3e1f8c36ea
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/light.c
@@ -0,0 +1,1323 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0.1
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "imports.h"
+#include "context.h"
+#include "enums.h"
+#include "light.h"
+#include "macros.h"
+#include "simple_list.h"
+#include "mtypes.h"
+#include "math/m_matrix.h"
+
+
+void GLAPIENTRY
+_mesa_ShadeModel( GLenum mode )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glShadeModel %s\n", _mesa_lookup_enum_by_nr(mode));
+
+   if (mode != GL_FLAT && mode != GL_SMOOTH) {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glShadeModel" );
+      return;
+   }
+
+   if (ctx->Light.ShadeModel == mode)
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_LIGHT);
+   ctx->Light.ShadeModel = mode;
+   ctx->_TriangleCaps ^= DD_FLATSHADE;
+   if (ctx->Driver.ShadeModel)
+      (*ctx->Driver.ShadeModel)( ctx, mode );
+}
+
+
+void GLAPIENTRY
+_mesa_Lightf( GLenum light, GLenum pname, GLfloat param )
+{
+   _mesa_Lightfv( light, pname, &param );
+}
+
+
+void GLAPIENTRY
+_mesa_Lightfv( GLenum light, GLenum pname, const GLfloat *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint i = (GLint) (light - GL_LIGHT0);
+   struct gl_light *l = &ctx->Light.Light[i];
+
+   if (i < 0 || i >= (GLint) ctx->Const.MaxLights) {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glLight(light=0x%x)", light );
+      return;
+   }
+
+   switch (pname) {
+   case GL_AMBIENT:
+      if (TEST_EQ_4V(l->Ambient, params))
+	 return;
+      FLUSH_VERTICES(ctx, _NEW_LIGHT);
+      COPY_4V( l->Ambient, params );
+      break;
+   case GL_DIFFUSE:
+      if (TEST_EQ_4V(l->Diffuse, params))
+	 return;
+      FLUSH_VERTICES(ctx, _NEW_LIGHT);
+      COPY_4V( l->Diffuse, params );
+      break;
+   case GL_SPECULAR:
+      if (TEST_EQ_4V(l->Specular, params))
+	 return;
+      FLUSH_VERTICES(ctx, _NEW_LIGHT);
+      COPY_4V( l->Specular, params );
+      break;
+   case GL_POSITION: {
+      GLfloat tmp[4];
+      /* transform position by ModelView matrix */
+      TRANSFORM_POINT( tmp, ctx->ModelviewMatrixStack.Top->m, params );
+      if (TEST_EQ_4V(l->EyePosition, tmp))
+	 return;
+      FLUSH_VERTICES(ctx, _NEW_LIGHT);
+      COPY_4V(l->EyePosition, tmp);
+      if (l->EyePosition[3] != 0.0F)
+	 l->_Flags |= LIGHT_POSITIONAL;
+      else
+	 l->_Flags &= ~LIGHT_POSITIONAL;
+      break;
+   }
+   case GL_SPOT_DIRECTION: {
+      GLfloat tmp[4];
+      /* transform direction by inverse modelview */
+      if (ctx->ModelviewMatrixStack.Top->flags & MAT_DIRTY_INVERSE) {
+	 _math_matrix_analyse( ctx->ModelviewMatrixStack.Top );
+      }
+      TRANSFORM_NORMAL( tmp, params, ctx->ModelviewMatrixStack.Top->inv );
+      if (TEST_EQ_3V(l->EyeDirection, tmp))
+	 return;
+      FLUSH_VERTICES(ctx, _NEW_LIGHT);
+      COPY_3V(l->EyeDirection, tmp);
+      break;
+   }
+   case GL_SPOT_EXPONENT:
+      if (params[0]<0.0 || params[0]>ctx->Const.MaxSpotExponent) {
+	 _mesa_error( ctx, GL_INVALID_VALUE, "glLight" );
+	 return;
+      }
+      if (l->SpotExponent == params[0])
+	 return;
+      FLUSH_VERTICES(ctx, _NEW_LIGHT);
+      l->SpotExponent = params[0];
+      _mesa_invalidate_spot_exp_table( l );
+      break;
+   case GL_SPOT_CUTOFF:
+      if ((params[0]<0.0 || params[0]>90.0) && params[0]!=180.0) {
+	 _mesa_error( ctx, GL_INVALID_VALUE, "glLight" );
+	 return;
+      }
+      if (l->SpotCutoff == params[0])
+	 return;
+      FLUSH_VERTICES(ctx, _NEW_LIGHT);
+      l->SpotCutoff = params[0];
+      l->_CosCutoff = (GLfloat) _mesa_cos(params[0]*DEG2RAD);
+      if (l->_CosCutoff < 0)
+	 l->_CosCutoff = 0;
+      if (l->SpotCutoff != 180.0F)
+	 l->_Flags |= LIGHT_SPOT;
+      else
+	 l->_Flags &= ~LIGHT_SPOT;
+      break;
+   case GL_CONSTANT_ATTENUATION:
+      if (params[0]<0.0) {
+	 _mesa_error( ctx, GL_INVALID_VALUE, "glLight" );
+	 return;
+      }
+      if (l->ConstantAttenuation == params[0])
+	 return;
+      FLUSH_VERTICES(ctx, _NEW_LIGHT);
+      l->ConstantAttenuation = params[0];
+      break;
+   case GL_LINEAR_ATTENUATION:
+      if (params[0]<0.0) {
+	 _mesa_error( ctx, GL_INVALID_VALUE, "glLight" );
+	 return;
+      }
+      if (l->LinearAttenuation == params[0])
+	 return;
+      FLUSH_VERTICES(ctx, _NEW_LIGHT);
+      l->LinearAttenuation = params[0];
+      break;
+   case GL_QUADRATIC_ATTENUATION:
+      if (params[0]<0.0) {
+	 _mesa_error( ctx, GL_INVALID_VALUE, "glLight" );
+	 return;
+      }
+      if (l->QuadraticAttenuation == params[0])
+	 return;
+      FLUSH_VERTICES(ctx, _NEW_LIGHT);
+      l->QuadraticAttenuation = params[0];
+      break;
+   default:
+      _mesa_error( ctx, GL_INVALID_ENUM, "glLight(pname=0x%x)", pname );
+      return;
+   }
+
+   if (ctx->Driver.Lightfv)
+      ctx->Driver.Lightfv( ctx, light, pname, params );
+}
+
+
+void GLAPIENTRY
+_mesa_Lighti( GLenum light, GLenum pname, GLint param )
+{
+   _mesa_Lightiv( light, pname, &param );
+}
+
+
+void GLAPIENTRY
+_mesa_Lightiv( GLenum light, GLenum pname, const GLint *params )
+{
+   GLfloat fparam[4];
+
+   switch (pname) {
+      case GL_AMBIENT:
+      case GL_DIFFUSE:
+      case GL_SPECULAR:
+         fparam[0] = INT_TO_FLOAT( params[0] );
+         fparam[1] = INT_TO_FLOAT( params[1] );
+         fparam[2] = INT_TO_FLOAT( params[2] );
+         fparam[3] = INT_TO_FLOAT( params[3] );
+         break;
+      case GL_POSITION:
+         fparam[0] = (GLfloat) params[0];
+         fparam[1] = (GLfloat) params[1];
+         fparam[2] = (GLfloat) params[2];
+         fparam[3] = (GLfloat) params[3];
+         break;
+      case GL_SPOT_DIRECTION:
+         fparam[0] = (GLfloat) params[0];
+         fparam[1] = (GLfloat) params[1];
+         fparam[2] = (GLfloat) params[2];
+         break;
+      case GL_SPOT_EXPONENT:
+      case GL_SPOT_CUTOFF:
+      case GL_CONSTANT_ATTENUATION:
+      case GL_LINEAR_ATTENUATION:
+      case GL_QUADRATIC_ATTENUATION:
+         fparam[0] = (GLfloat) params[0];
+         break;
+      default:
+         /* error will be caught later in gl_Lightfv */
+         ;
+   }
+
+   _mesa_Lightfv( light, pname, fparam );
+}
+
+
+
+void GLAPIENTRY
+_mesa_GetLightfv( GLenum light, GLenum pname, GLfloat *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint l = (GLint) (light - GL_LIGHT0);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (l < 0 || l >= (GLint) ctx->Const.MaxLights) {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetLightfv" );
+      return;
+   }
+
+   switch (pname) {
+      case GL_AMBIENT:
+         COPY_4V( params, ctx->Light.Light[l].Ambient );
+         break;
+      case GL_DIFFUSE:
+         COPY_4V( params, ctx->Light.Light[l].Diffuse );
+         break;
+      case GL_SPECULAR:
+         COPY_4V( params, ctx->Light.Light[l].Specular );
+         break;
+      case GL_POSITION:
+         COPY_4V( params, ctx->Light.Light[l].EyePosition );
+         break;
+      case GL_SPOT_DIRECTION:
+         COPY_3V( params, ctx->Light.Light[l].EyeDirection );
+         break;
+      case GL_SPOT_EXPONENT:
+         params[0] = ctx->Light.Light[l].SpotExponent;
+         break;
+      case GL_SPOT_CUTOFF:
+         params[0] = ctx->Light.Light[l].SpotCutoff;
+         break;
+      case GL_CONSTANT_ATTENUATION:
+         params[0] = ctx->Light.Light[l].ConstantAttenuation;
+         break;
+      case GL_LINEAR_ATTENUATION:
+         params[0] = ctx->Light.Light[l].LinearAttenuation;
+         break;
+      case GL_QUADRATIC_ATTENUATION:
+         params[0] = ctx->Light.Light[l].QuadraticAttenuation;
+         break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetLightfv" );
+         break;
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetLightiv( GLenum light, GLenum pname, GLint *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint l = (GLint) (light - GL_LIGHT0);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (l < 0 || l >= (GLint) ctx->Const.MaxLights) {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetLightiv" );
+      return;
+   }
+
+   switch (pname) {
+      case GL_AMBIENT:
+         params[0] = FLOAT_TO_INT(ctx->Light.Light[l].Ambient[0]);
+         params[1] = FLOAT_TO_INT(ctx->Light.Light[l].Ambient[1]);
+         params[2] = FLOAT_TO_INT(ctx->Light.Light[l].Ambient[2]);
+         params[3] = FLOAT_TO_INT(ctx->Light.Light[l].Ambient[3]);
+         break;
+      case GL_DIFFUSE:
+         params[0] = FLOAT_TO_INT(ctx->Light.Light[l].Diffuse[0]);
+         params[1] = FLOAT_TO_INT(ctx->Light.Light[l].Diffuse[1]);
+         params[2] = FLOAT_TO_INT(ctx->Light.Light[l].Diffuse[2]);
+         params[3] = FLOAT_TO_INT(ctx->Light.Light[l].Diffuse[3]);
+         break;
+      case GL_SPECULAR:
+         params[0] = FLOAT_TO_INT(ctx->Light.Light[l].Specular[0]);
+         params[1] = FLOAT_TO_INT(ctx->Light.Light[l].Specular[1]);
+         params[2] = FLOAT_TO_INT(ctx->Light.Light[l].Specular[2]);
+         params[3] = FLOAT_TO_INT(ctx->Light.Light[l].Specular[3]);
+         break;
+      case GL_POSITION:
+         params[0] = (GLint) ctx->Light.Light[l].EyePosition[0];
+         params[1] = (GLint) ctx->Light.Light[l].EyePosition[1];
+         params[2] = (GLint) ctx->Light.Light[l].EyePosition[2];
+         params[3] = (GLint) ctx->Light.Light[l].EyePosition[3];
+         break;
+      case GL_SPOT_DIRECTION:
+         params[0] = (GLint) ctx->Light.Light[l].EyeDirection[0];
+         params[1] = (GLint) ctx->Light.Light[l].EyeDirection[1];
+         params[2] = (GLint) ctx->Light.Light[l].EyeDirection[2];
+         break;
+      case GL_SPOT_EXPONENT:
+         params[0] = (GLint) ctx->Light.Light[l].SpotExponent;
+         break;
+      case GL_SPOT_CUTOFF:
+         params[0] = (GLint) ctx->Light.Light[l].SpotCutoff;
+         break;
+      case GL_CONSTANT_ATTENUATION:
+         params[0] = (GLint) ctx->Light.Light[l].ConstantAttenuation;
+         break;
+      case GL_LINEAR_ATTENUATION:
+         params[0] = (GLint) ctx->Light.Light[l].LinearAttenuation;
+         break;
+      case GL_QUADRATIC_ATTENUATION:
+         params[0] = (GLint) ctx->Light.Light[l].QuadraticAttenuation;
+         break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetLightiv" );
+         break;
+   }
+}
+
+
+
+/**********************************************************************/
+/***                        Light Model                             ***/
+/**********************************************************************/
+
+
+void GLAPIENTRY
+_mesa_LightModelfv( GLenum pname, const GLfloat *params )
+{
+   GLenum newenum;
+   GLboolean newbool;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   switch (pname) {
+      case GL_LIGHT_MODEL_AMBIENT:
+         if (TEST_EQ_4V( ctx->Light.Model.Ambient, params ))
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_LIGHT);
+         COPY_4V( ctx->Light.Model.Ambient, params );
+         break;
+      case GL_LIGHT_MODEL_LOCAL_VIEWER:
+         newbool = (params[0]!=0.0);
+	 if (ctx->Light.Model.LocalViewer == newbool)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_LIGHT);
+	 ctx->Light.Model.LocalViewer = newbool;
+         break;
+      case GL_LIGHT_MODEL_TWO_SIDE:
+         newbool = (params[0]!=0.0);
+	 if (ctx->Light.Model.TwoSide == newbool)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_LIGHT);
+	 ctx->Light.Model.TwoSide = newbool;
+
+	 if (ctx->Light.Enabled && ctx->Light.Model.TwoSide)
+	    ctx->_TriangleCaps |= DD_TRI_LIGHT_TWOSIDE;
+	 else
+	    ctx->_TriangleCaps &= ~DD_TRI_LIGHT_TWOSIDE;
+         break;
+      case GL_LIGHT_MODEL_COLOR_CONTROL:
+         if (params[0] == (GLfloat) GL_SINGLE_COLOR)
+	    newenum = GL_SINGLE_COLOR;
+         else if (params[0] == (GLfloat) GL_SEPARATE_SPECULAR_COLOR)
+	    newenum = GL_SEPARATE_SPECULAR_COLOR;
+	 else {
+            _mesa_error( ctx, GL_INVALID_ENUM, "glLightModel(param=0x0%x)",
+                         (GLint) params[0] );
+	    return;
+         }
+	 if (ctx->Light.Model.ColorControl == newenum)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_LIGHT);
+	 ctx->Light.Model.ColorControl = newenum;
+
+	 if ((ctx->Light.Enabled &&
+	      ctx->Light.Model.ColorControl==GL_SEPARATE_SPECULAR_COLOR)
+	     || ctx->Fog.ColorSumEnabled)
+	    ctx->_TriangleCaps |= DD_SEPARATE_SPECULAR;
+	 else
+	    ctx->_TriangleCaps &= ~DD_SEPARATE_SPECULAR;
+
+         break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glLightModel(pname=0x%x)", pname );
+         break;
+   }
+
+   if (ctx->Driver.LightModelfv)
+      ctx->Driver.LightModelfv( ctx, pname, params );
+}
+
+
+void GLAPIENTRY
+_mesa_LightModeliv( GLenum pname, const GLint *params )
+{
+   GLfloat fparam[4];
+
+   switch (pname) {
+      case GL_LIGHT_MODEL_AMBIENT:
+         fparam[0] = INT_TO_FLOAT( params[0] );
+         fparam[1] = INT_TO_FLOAT( params[1] );
+         fparam[2] = INT_TO_FLOAT( params[2] );
+         fparam[3] = INT_TO_FLOAT( params[3] );
+         break;
+      case GL_LIGHT_MODEL_LOCAL_VIEWER:
+      case GL_LIGHT_MODEL_TWO_SIDE:
+      case GL_LIGHT_MODEL_COLOR_CONTROL:
+         fparam[0] = (GLfloat) params[0];
+         break;
+      default:
+         /* Error will be caught later in gl_LightModelfv */
+         ;
+   }
+   _mesa_LightModelfv( pname, fparam );
+}
+
+
+void GLAPIENTRY
+_mesa_LightModeli( GLenum pname, GLint param )
+{
+   _mesa_LightModeliv( pname, &param );
+}
+
+
+void GLAPIENTRY
+_mesa_LightModelf( GLenum pname, GLfloat param )
+{
+   _mesa_LightModelfv( pname, &param );
+}
+
+
+
+/********** MATERIAL **********/
+
+
+/*
+ * Given a face and pname value (ala glColorMaterial), compute a bitmask
+ * of the targeted material values.
+ */
+GLuint
+_mesa_material_bitmask( GLcontext *ctx, GLenum face, GLenum pname,
+                        GLuint legal, const char *where )
+{
+   GLuint bitmask = 0;
+
+   /* Make a bitmask indicating what material attribute(s) we're updating */
+   switch (pname) {
+      case GL_EMISSION:
+         bitmask |= MAT_BIT_FRONT_EMISSION | MAT_BIT_BACK_EMISSION;
+         break;
+      case GL_AMBIENT:
+         bitmask |= MAT_BIT_FRONT_AMBIENT | MAT_BIT_BACK_AMBIENT;
+         break;
+      case GL_DIFFUSE:
+         bitmask |= MAT_BIT_FRONT_DIFFUSE | MAT_BIT_BACK_DIFFUSE;
+         break;
+      case GL_SPECULAR:
+         bitmask |= MAT_BIT_FRONT_SPECULAR | MAT_BIT_BACK_SPECULAR;
+         break;
+      case GL_SHININESS:
+         bitmask |= MAT_BIT_FRONT_SHININESS | MAT_BIT_BACK_SHININESS;
+         break;
+      case GL_AMBIENT_AND_DIFFUSE:
+         bitmask |= MAT_BIT_FRONT_AMBIENT | MAT_BIT_BACK_AMBIENT;
+         bitmask |= MAT_BIT_FRONT_DIFFUSE | MAT_BIT_BACK_DIFFUSE;
+         break;
+      case GL_COLOR_INDEXES:
+         bitmask |= MAT_BIT_FRONT_INDEXES  | MAT_BIT_BACK_INDEXES;
+         break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, where );
+         return 0;
+   }
+
+   if (face==GL_FRONT) {
+      bitmask &= FRONT_MATERIAL_BITS;
+   }
+   else if (face==GL_BACK) {
+      bitmask &= BACK_MATERIAL_BITS;
+   }
+   else if (face != GL_FRONT_AND_BACK) {
+      _mesa_error( ctx, GL_INVALID_ENUM, where );
+      return 0;
+   }
+
+   if (bitmask & ~legal) {
+      _mesa_error( ctx, GL_INVALID_ENUM, where );
+      return 0;
+   }
+
+   return bitmask;
+}
+
+
+
+/* Perform a straight copy between materials.
+ */
+void
+_mesa_copy_materials( struct gl_material *dst,
+                      const struct gl_material *src,
+                      GLuint bitmask )
+{
+   int i;
+
+   for (i = 0 ; i < MAT_ATTRIB_MAX ; i++) 
+      if (bitmask & (1<<i))
+	 COPY_4FV( dst->Attrib[i], src->Attrib[i] );
+}
+
+
+
+/* Update derived values following a change in ctx->Light.Material
+ */
+void
+_mesa_update_material( GLcontext *ctx, GLuint bitmask )
+{
+   struct gl_light *light, *list = &ctx->Light.EnabledList;
+   GLfloat (*mat)[4] = ctx->Light.Material.Attrib;
+
+   if (MESA_VERBOSE&VERBOSE_IMMEDIATE) 
+      _mesa_debug(ctx, "_mesa_update_material, mask 0x%x\n", bitmask);
+
+   if (!bitmask)
+      return;
+
+   /* update material ambience */
+   if (bitmask & MAT_BIT_FRONT_AMBIENT) {
+      foreach (light, list) {
+         SCALE_3V( light->_MatAmbient[0], light->Ambient, 
+		   mat[MAT_ATTRIB_FRONT_AMBIENT]);
+      }
+   }
+
+   if (bitmask & MAT_BIT_BACK_AMBIENT) {
+      foreach (light, list) {
+         SCALE_3V( light->_MatAmbient[1], light->Ambient, 
+		   mat[MAT_ATTRIB_BACK_AMBIENT]);
+      }
+   }
+
+   /* update BaseColor = emission + scene's ambience * material's ambience */
+   if (bitmask & (MAT_BIT_FRONT_EMISSION | MAT_BIT_FRONT_AMBIENT)) {
+      COPY_3V( ctx->Light._BaseColor[0], mat[MAT_ATTRIB_FRONT_EMISSION] );
+      ACC_SCALE_3V( ctx->Light._BaseColor[0], mat[MAT_ATTRIB_FRONT_AMBIENT],
+		    ctx->Light.Model.Ambient );
+   }
+
+   if (bitmask & (MAT_BIT_BACK_EMISSION | MAT_BIT_BACK_AMBIENT)) {
+      COPY_3V( ctx->Light._BaseColor[1], mat[MAT_ATTRIB_BACK_EMISSION] );
+      ACC_SCALE_3V( ctx->Light._BaseColor[1], mat[MAT_ATTRIB_BACK_AMBIENT],
+		    ctx->Light.Model.Ambient );
+   }
+
+   /* update material diffuse values */
+   if (bitmask & MAT_BIT_FRONT_DIFFUSE) {
+      foreach (light, list) {
+	 SCALE_3V( light->_MatDiffuse[0], light->Diffuse, 
+		   mat[MAT_ATTRIB_FRONT_DIFFUSE] );
+      }
+   }
+
+   if (bitmask & MAT_BIT_BACK_DIFFUSE) {
+      foreach (light, list) {
+	 SCALE_3V( light->_MatDiffuse[1], light->Diffuse, 
+		   mat[MAT_ATTRIB_BACK_DIFFUSE] );
+      }
+   }
+
+   /* update material specular values */
+   if (bitmask & MAT_BIT_FRONT_SPECULAR) {
+      foreach (light, list) {
+	 SCALE_3V( light->_MatSpecular[0], light->Specular, 
+		   mat[MAT_ATTRIB_FRONT_SPECULAR]);
+      }
+   }
+
+   if (bitmask & MAT_BIT_BACK_SPECULAR) {
+      foreach (light, list) {
+	 SCALE_3V( light->_MatSpecular[1], light->Specular,
+		   mat[MAT_ATTRIB_BACK_SPECULAR]);
+      }
+   }
+
+   if (bitmask & MAT_BIT_FRONT_SHININESS) {
+      _mesa_invalidate_shine_table( ctx, 0 );
+   }
+
+   if (bitmask & MAT_BIT_BACK_SHININESS) {
+      _mesa_invalidate_shine_table( ctx, 1 );
+   }
+}
+
+
+/*
+ * Update the current materials from the given rgba color
+ * according to the bitmask in ColorMaterialBitmask, which is
+ * set by glColorMaterial().
+ */
+void
+_mesa_update_color_material( GLcontext *ctx, const GLfloat color[4] )
+{
+   GLuint bitmask = ctx->Light.ColorMaterialBitmask;
+   struct gl_material *mat = &ctx->Light.Material;
+   int i;
+
+   for (i = 0 ; i < MAT_ATTRIB_MAX ; i++) 
+      if (bitmask & (1<<i))
+	 COPY_4FV( mat->Attrib[i], color );
+
+   _mesa_update_material( ctx, bitmask );
+}
+
+
+void GLAPIENTRY
+_mesa_ColorMaterial( GLenum face, GLenum mode )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint bitmask;
+   GLuint legal = (MAT_BIT_FRONT_EMISSION | MAT_BIT_BACK_EMISSION |
+		   MAT_BIT_FRONT_SPECULAR | MAT_BIT_BACK_SPECULAR |
+		   MAT_BIT_FRONT_DIFFUSE  | MAT_BIT_BACK_DIFFUSE  |
+		   MAT_BIT_FRONT_AMBIENT  | MAT_BIT_BACK_AMBIENT);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE&VERBOSE_API)
+      _mesa_debug(ctx, "glColorMaterial %s %s\n",
+                  _mesa_lookup_enum_by_nr(face),
+                  _mesa_lookup_enum_by_nr(mode));
+
+   bitmask = _mesa_material_bitmask(ctx, face, mode, legal, "glColorMaterial");
+
+   if (ctx->Light.ColorMaterialBitmask == bitmask &&
+       ctx->Light.ColorMaterialFace == face &&
+       ctx->Light.ColorMaterialMode == mode)
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_LIGHT);
+   ctx->Light.ColorMaterialBitmask = bitmask;
+   ctx->Light.ColorMaterialFace = face;
+   ctx->Light.ColorMaterialMode = mode;
+
+   if (ctx->Light.ColorMaterialEnabled) {
+      FLUSH_CURRENT( ctx, 0 );
+      _mesa_update_color_material(ctx,ctx->Current.Attrib[VERT_ATTRIB_COLOR0]);
+   }
+
+   if (ctx->Driver.ColorMaterial)
+      (*ctx->Driver.ColorMaterial)( ctx, face, mode );
+}
+
+
+void GLAPIENTRY
+_mesa_GetMaterialfv( GLenum face, GLenum pname, GLfloat *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint f;
+   GLfloat (*mat)[4] = ctx->Light.Material.Attrib;
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* update materials */
+
+   FLUSH_CURRENT(ctx, 0); /* update ctx->Light.Material from vertex buffer */
+
+   if (face==GL_FRONT) {
+      f = 0;
+   }
+   else if (face==GL_BACK) {
+      f = 1;
+   }
+   else {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetMaterialfv(face)" );
+      return;
+   }
+
+   switch (pname) {
+      case GL_AMBIENT:
+         COPY_4FV( params, mat[MAT_ATTRIB_AMBIENT(f)] );
+         break;
+      case GL_DIFFUSE:
+         COPY_4FV( params, mat[MAT_ATTRIB_DIFFUSE(f)] );
+	 break;
+      case GL_SPECULAR:
+         COPY_4FV( params, mat[MAT_ATTRIB_SPECULAR(f)] );
+	 break;
+      case GL_EMISSION:
+	 COPY_4FV( params, mat[MAT_ATTRIB_EMISSION(f)] );
+	 break;
+      case GL_SHININESS:
+	 *params = mat[MAT_ATTRIB_SHININESS(f)][0];
+	 break;
+      case GL_COLOR_INDEXES:
+	 params[0] = mat[MAT_ATTRIB_INDEXES(f)][0];
+	 params[1] = mat[MAT_ATTRIB_INDEXES(f)][1];
+	 params[2] = mat[MAT_ATTRIB_INDEXES(f)][2];
+	 break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetMaterialfv(pname)" );
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetMaterialiv( GLenum face, GLenum pname, GLint *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint f;
+   GLfloat (*mat)[4] = ctx->Light.Material.Attrib;
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* update materials */
+
+   FLUSH_CURRENT(ctx, 0); /* update ctx->Light.Material from vertex buffer */
+
+   if (face==GL_FRONT) {
+      f = 0;
+   }
+   else if (face==GL_BACK) {
+      f = 1;
+   }
+   else {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetMaterialiv(face)" );
+      return;
+   }
+   switch (pname) {
+      case GL_AMBIENT:
+         params[0] = FLOAT_TO_INT( mat[MAT_ATTRIB_AMBIENT(f)][0] );
+         params[1] = FLOAT_TO_INT( mat[MAT_ATTRIB_AMBIENT(f)][1] );
+         params[2] = FLOAT_TO_INT( mat[MAT_ATTRIB_AMBIENT(f)][2] );
+         params[3] = FLOAT_TO_INT( mat[MAT_ATTRIB_AMBIENT(f)][3] );
+         break;
+      case GL_DIFFUSE:
+         params[0] = FLOAT_TO_INT( mat[MAT_ATTRIB_DIFFUSE(f)][0] );
+         params[1] = FLOAT_TO_INT( mat[MAT_ATTRIB_DIFFUSE(f)][1] );
+         params[2] = FLOAT_TO_INT( mat[MAT_ATTRIB_DIFFUSE(f)][2] );
+         params[3] = FLOAT_TO_INT( mat[MAT_ATTRIB_DIFFUSE(f)][3] );
+	 break;
+      case GL_SPECULAR:
+         params[0] = FLOAT_TO_INT( mat[MAT_ATTRIB_SPECULAR(f)][0] );
+         params[1] = FLOAT_TO_INT( mat[MAT_ATTRIB_SPECULAR(f)][1] );
+         params[2] = FLOAT_TO_INT( mat[MAT_ATTRIB_SPECULAR(f)][2] );
+         params[3] = FLOAT_TO_INT( mat[MAT_ATTRIB_SPECULAR(f)][3] );
+	 break;
+      case GL_EMISSION:
+         params[0] = FLOAT_TO_INT( mat[MAT_ATTRIB_EMISSION(f)][0] );
+         params[1] = FLOAT_TO_INT( mat[MAT_ATTRIB_EMISSION(f)][1] );
+         params[2] = FLOAT_TO_INT( mat[MAT_ATTRIB_EMISSION(f)][2] );
+         params[3] = FLOAT_TO_INT( mat[MAT_ATTRIB_EMISSION(f)][3] );
+	 break;
+      case GL_SHININESS:
+         *params = IROUND( mat[MAT_ATTRIB_SHININESS(f)][0] );
+	 break;
+      case GL_COLOR_INDEXES:
+	 params[0] = IROUND( mat[MAT_ATTRIB_INDEXES(f)][0] );
+	 params[1] = IROUND( mat[MAT_ATTRIB_INDEXES(f)][1] );
+	 params[2] = IROUND( mat[MAT_ATTRIB_INDEXES(f)][2] );
+	 break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetMaterialfv(pname)" );
+   }
+}
+
+
+
+/**********************************************************************/
+/*****                  Lighting computation                      *****/
+/**********************************************************************/
+
+
+/*
+ * Notes:
+ *   When two-sided lighting is enabled we compute the color (or index)
+ *   for both the front and back side of the primitive.  Then, when the
+ *   orientation of the facet is later learned, we can determine which
+ *   color (or index) to use for rendering.
+ *
+ *   KW: We now know orientation in advance and only shade for
+ *       the side or sides which are actually required.
+ *
+ * Variables:
+ *   n = normal vector
+ *   V = vertex position
+ *   P = light source position
+ *   Pe = (0,0,0,1)
+ *
+ * Precomputed:
+ *   IF P[3]==0 THEN
+ *       // light at infinity
+ *       IF local_viewer THEN
+ *           _VP_inf_norm = unit vector from V to P      // Precompute
+ *       ELSE
+ *           // eye at infinity
+ *           _h_inf_norm = Normalize( VP + <0,0,1> )     // Precompute
+ *       ENDIF
+ *   ENDIF
+ *
+ * Functions:
+ *   Normalize( v ) = normalized vector v
+ *   Magnitude( v ) = length of vector v
+ */
+
+
+
+/*
+ * Whenever the spotlight exponent for a light changes we must call
+ * this function to recompute the exponent lookup table.
+ */
+void
+_mesa_invalidate_spot_exp_table( struct gl_light *l )
+{
+   l->_SpotExpTable[0][0] = -1;
+}
+
+
+static void
+validate_spot_exp_table( struct gl_light *l )
+{
+   GLint i;
+   GLdouble exponent = l->SpotExponent;
+   GLdouble tmp = 0;
+   GLint clamp = 0;
+
+   l->_SpotExpTable[0][0] = 0.0;
+
+   for (i = EXP_TABLE_SIZE - 1; i > 0 ;i--) {
+      if (clamp == 0) {
+	 tmp = _mesa_pow(i / (GLdouble) (EXP_TABLE_SIZE - 1), exponent);
+	 if (tmp < FLT_MIN * 100.0) {
+	    tmp = 0.0;
+	    clamp = 1;
+	 }
+      }
+      l->_SpotExpTable[i][0] = (GLfloat) tmp;
+   }
+   for (i = 0; i < EXP_TABLE_SIZE - 1; i++) {
+      l->_SpotExpTable[i][1] = (l->_SpotExpTable[i+1][0] -
+				l->_SpotExpTable[i][0]);
+   }
+   l->_SpotExpTable[EXP_TABLE_SIZE-1][1] = 0.0;
+}
+
+
+
+/* Calculate a new shine table.  Doing this here saves a branch in
+ * lighting, and the cost of doing it early may be partially offset
+ * by keeping a MRU cache of shine tables for various shine values.
+ */
+void
+_mesa_invalidate_shine_table( GLcontext *ctx, GLuint side )
+{
+   ASSERT(side < 2);
+   if (ctx->_ShineTable[side])
+      ctx->_ShineTable[side]->refcount--;
+   ctx->_ShineTable[side] = 0;
+}
+
+
+static void
+validate_shine_table( GLcontext *ctx, GLuint side, GLfloat shininess )
+{
+   struct gl_shine_tab *list = ctx->_ShineTabList;
+   struct gl_shine_tab *s;
+
+   ASSERT(side < 2);
+
+   foreach(s, list)
+      if ( s->shininess == shininess )
+	 break;
+
+   if (s == list) {
+      GLint j;
+      GLfloat *m;
+
+      foreach(s, list)
+	 if (s->refcount == 0)
+	    break;
+
+      m = s->tab;
+      m[0] = 0.0;
+      if (shininess == 0.0) {
+	 for (j = 1 ; j <= SHINE_TABLE_SIZE ; j++)
+	    m[j] = 1.0;
+      }
+      else {
+	 for (j = 1 ; j < SHINE_TABLE_SIZE ; j++) {
+            GLdouble t, x = j / (GLfloat) (SHINE_TABLE_SIZE - 1);
+            if (x < 0.005) /* underflow check */
+               x = 0.005;
+            t = _mesa_pow(x, shininess);
+	    if (t > 1e-20)
+	       m[j] = (GLfloat) t;
+	    else
+	       m[j] = 0.0;
+	 }
+	 m[SHINE_TABLE_SIZE] = 1.0;
+      }
+
+      s->shininess = shininess;
+   }
+
+   if (ctx->_ShineTable[side])
+      ctx->_ShineTable[side]->refcount--;
+
+   ctx->_ShineTable[side] = s;
+   move_to_tail( list, s );
+   s->refcount++;
+}
+
+
+void
+_mesa_validate_all_lighting_tables( GLcontext *ctx )
+{
+   GLuint i;
+   GLfloat shininess;
+   
+   shininess = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_SHININESS][0];
+   if (!ctx->_ShineTable[0] || ctx->_ShineTable[0]->shininess != shininess)
+      validate_shine_table( ctx, 0, shininess );
+
+   shininess = ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_SHININESS][0];
+   if (!ctx->_ShineTable[1] || ctx->_ShineTable[1]->shininess != shininess)
+      validate_shine_table( ctx, 1, shininess );
+
+   for (i = 0 ; i < MAX_LIGHTS ; i++)
+      if (ctx->Light.Light[i]._SpotExpTable[0][0] == -1)
+	 validate_spot_exp_table( &ctx->Light.Light[i] );
+}
+
+
+
+/*
+ * Examine current lighting parameters to determine if the optimized lighting
+ * function can be used.
+ * Also, precompute some lighting values such as the products of light
+ * source and material ambient, diffuse and specular coefficients.
+ */
+void
+_mesa_update_lighting( GLcontext *ctx )
+{
+   struct gl_light *light;
+   ctx->Light._NeedEyeCoords = 0;
+   ctx->Light._Flags = 0;
+
+   if (!ctx->Light.Enabled)
+      return;
+
+   foreach(light, &ctx->Light.EnabledList) {
+      ctx->Light._Flags |= light->_Flags;
+   }
+
+   ctx->Light._NeedVertices =
+      ((ctx->Light._Flags & (LIGHT_POSITIONAL|LIGHT_SPOT)) ||
+       ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR ||
+       ctx->Light.Model.LocalViewer);
+
+   ctx->Light._NeedEyeCoords = ((ctx->Light._Flags & LIGHT_POSITIONAL) ||
+				ctx->Light.Model.LocalViewer);
+
+
+
+   /* XXX: This test is overkill & needs to be fixed both for software and
+    * hardware t&l drivers.  The above should be sufficient & should
+    * be tested to verify this.
+    */
+   if (ctx->Light._NeedVertices)
+      ctx->Light._NeedEyeCoords = GL_TRUE;
+
+
+   /* Precompute some shading values.  Although we reference
+    * Light.Material here, we can get away without flushing
+    * FLUSH_UPDATE_CURRENT, as when any outstanding material changes
+    * are flushed, they will update the derived state at that time.
+    */
+   if (ctx->Visual.rgbMode) {
+      if (ctx->Light.Model.TwoSide)
+	 _mesa_update_material( ctx, 
+				MAT_BIT_FRONT_EMISSION |
+				MAT_BIT_FRONT_AMBIENT |
+				MAT_BIT_FRONT_DIFFUSE | 
+				MAT_BIT_FRONT_SPECULAR |
+				MAT_BIT_BACK_EMISSION |
+				MAT_BIT_BACK_AMBIENT |
+				MAT_BIT_BACK_DIFFUSE | 
+				MAT_BIT_BACK_SPECULAR);
+      else
+	 _mesa_update_material( ctx, 
+				MAT_BIT_FRONT_EMISSION |
+				MAT_BIT_FRONT_AMBIENT |
+				MAT_BIT_FRONT_DIFFUSE | 
+				MAT_BIT_FRONT_SPECULAR);
+   }
+   else {
+      static const GLfloat ci[3] = { .30F, .59F, .11F };
+      foreach(light, &ctx->Light.EnabledList) {
+	 light->_dli = DOT3(ci, light->Diffuse);
+	 light->_sli = DOT3(ci, light->Specular);
+      }
+   }
+}
+
+
+/* _NEW_MODELVIEW
+ * _NEW_LIGHT
+ * _TNL_NEW_NEED_EYE_COORDS
+ *
+ * Update on (_NEW_MODELVIEW | _NEW_LIGHT) when lighting is enabled.
+ * Also update on lighting space changes.
+ */
+static void
+compute_light_positions( GLcontext *ctx )
+{
+   struct gl_light *light;
+   static const GLfloat eye_z[3] = { 0, 0, 1 };
+
+   if (!ctx->Light.Enabled)
+      return;
+
+   if (ctx->_NeedEyeCoords) {
+      COPY_3V( ctx->_EyeZDir, eye_z );
+   }
+   else {
+      TRANSFORM_NORMAL( ctx->_EyeZDir, eye_z, ctx->ModelviewMatrixStack.Top->m );
+   }
+
+   foreach (light, &ctx->Light.EnabledList) {
+
+      if (ctx->_NeedEyeCoords) {
+	 COPY_4FV( light->_Position, light->EyePosition );
+      }
+      else {
+	 TRANSFORM_POINT( light->_Position, ctx->ModelviewMatrixStack.Top->inv,
+			  light->EyePosition );
+      }
+
+      if (!(light->_Flags & LIGHT_POSITIONAL)) {
+	 /* VP (VP) = Normalize( Position ) */
+	 COPY_3V( light->_VP_inf_norm, light->_Position );
+	 NORMALIZE_3FV( light->_VP_inf_norm );
+
+	 if (!ctx->Light.Model.LocalViewer) {
+	    /* _h_inf_norm = Normalize( V_to_P + <0,0,1> ) */
+	    ADD_3V( light->_h_inf_norm, light->_VP_inf_norm, ctx->_EyeZDir);
+	    NORMALIZE_3FV( light->_h_inf_norm );
+	 }
+	 light->_VP_inf_spot_attenuation = 1.0;
+      }
+
+      if (light->_Flags & LIGHT_SPOT) {
+	 if (ctx->_NeedEyeCoords) {
+	    COPY_3V( light->_NormDirection, light->EyeDirection );
+	 }
+         else {
+	    TRANSFORM_NORMAL( light->_NormDirection,
+			      light->EyeDirection,
+			      ctx->ModelviewMatrixStack.Top->m);
+	 }
+
+	 NORMALIZE_3FV( light->_NormDirection );
+
+	 if (!(light->_Flags & LIGHT_POSITIONAL)) {
+	    GLfloat PV_dot_dir = - DOT3(light->_VP_inf_norm,
+					light->_NormDirection);
+
+	    if (PV_dot_dir > light->_CosCutoff) {
+	       double x = PV_dot_dir * (EXP_TABLE_SIZE-1);
+	       int k = (int) x;
+	       light->_VP_inf_spot_attenuation =
+		  (GLfloat) (light->_SpotExpTable[k][0] +
+		   (x-k)*light->_SpotExpTable[k][1]);
+	    }
+	    else {
+	       light->_VP_inf_spot_attenuation = 0;
+            }
+	 }
+      }
+   }
+}
+
+
+
+static void
+update_modelview_scale( GLcontext *ctx )
+{
+   ctx->_ModelViewInvScale = 1.0F;
+   if (ctx->ModelviewMatrixStack.Top->flags & (MAT_FLAG_UNIFORM_SCALE |
+			       MAT_FLAG_GENERAL_SCALE |
+			       MAT_FLAG_GENERAL_3D |
+			       MAT_FLAG_GENERAL) ) {
+      const GLfloat *m = ctx->ModelviewMatrixStack.Top->inv;
+      GLfloat f = m[2] * m[2] + m[6] * m[6] + m[10] * m[10];
+      if (f < 1e-12) f = 1.0;
+      if (ctx->_NeedEyeCoords)
+	 ctx->_ModelViewInvScale = (GLfloat) INV_SQRTF(f);
+      else
+	 ctx->_ModelViewInvScale = (GLfloat) SQRTF(f);
+   }
+}
+
+
+/* Bring uptodate any state that relies on _NeedEyeCoords.
+ */
+void
+_mesa_update_tnl_spaces( GLcontext *ctx, GLuint new_state )
+{
+   const GLuint oldneedeyecoords = ctx->_NeedEyeCoords;
+
+   ctx->_NeedEyeCoords = 0;
+
+   if (ctx->_ForceEyeCoords ||
+       (ctx->Texture._GenFlags & TEXGEN_NEED_EYE_COORD) ||
+       ctx->Point._Attenuated ||
+       ctx->Light._NeedEyeCoords)
+      ctx->_NeedEyeCoords = 1;
+
+   if (ctx->Light.Enabled &&
+       !TEST_MAT_FLAGS( ctx->ModelviewMatrixStack.Top, 
+			MAT_FLAGS_LENGTH_PRESERVING))
+      ctx->_NeedEyeCoords = 1;
+
+
+   /* Check if the truth-value interpretations of the bitfields have
+    * changed:
+    */
+   if (oldneedeyecoords != ctx->_NeedEyeCoords) {
+      /* Recalculate all state that depends on _NeedEyeCoords.
+       */
+      update_modelview_scale(ctx);
+      compute_light_positions( ctx );
+
+      if (ctx->Driver.LightingSpaceChange)
+	 ctx->Driver.LightingSpaceChange( ctx );
+   }
+   else {
+      GLuint new_state = ctx->NewState;
+
+      /* Recalculate that same state only if it has been invalidated
+       * by other statechanges.
+       */
+      if (new_state & _NEW_MODELVIEW)
+	 update_modelview_scale(ctx);
+
+      if (new_state & (_NEW_LIGHT|_NEW_MODELVIEW))
+	 compute_light_positions( ctx );
+   }
+}
+
+
+/* Drivers may need this if the hardware tnl unit doesn't support the
+ * light-in-modelspace optimization.  It's also useful for debugging.
+ */
+void
+_mesa_allow_light_in_model( GLcontext *ctx, GLboolean flag )
+{
+   ctx->_ForceEyeCoords = !flag;
+   ctx->NewState |= _NEW_POINT;	/* one of the bits from
+				 * _MESA_NEW_NEED_EYE_COORDS.
+				 */
+}
+
+
+
+/**********************************************************************/
+/*****                      Initialization                        *****/
+/**********************************************************************/
+
+/**
+ * Initialize the n-th light data structure.
+ *
+ * \param l pointer to the gl_light structure to be initialized.
+ * \param n number of the light. 
+ * \note The defaults for light 0 are different than the other lights.
+ */
+static void
+init_light( struct gl_light *l, GLuint n )
+{
+   make_empty_list( l );
+
+   ASSIGN_4V( l->Ambient, 0.0, 0.0, 0.0, 1.0 );
+   if (n==0) {
+      ASSIGN_4V( l->Diffuse, 1.0, 1.0, 1.0, 1.0 );
+      ASSIGN_4V( l->Specular, 1.0, 1.0, 1.0, 1.0 );
+   }
+   else {
+      ASSIGN_4V( l->Diffuse, 0.0, 0.0, 0.0, 1.0 );
+      ASSIGN_4V( l->Specular, 0.0, 0.0, 0.0, 1.0 );
+   }
+   ASSIGN_4V( l->EyePosition, 0.0, 0.0, 1.0, 0.0 );
+   ASSIGN_3V( l->EyeDirection, 0.0, 0.0, -1.0 );
+   l->SpotExponent = 0.0;
+   _mesa_invalidate_spot_exp_table( l );
+   l->SpotCutoff = 180.0;
+   l->_CosCutoff = 0.0;		/* KW: -ve values not admitted */
+   l->ConstantAttenuation = 1.0;
+   l->LinearAttenuation = 0.0;
+   l->QuadraticAttenuation = 0.0;
+   l->Enabled = GL_FALSE;
+}
+
+
+/**
+ * Initialize the light model data structure.
+ *
+ * \param lm pointer to the gl_lightmodel structure to be initialized.
+ */
+static void
+init_lightmodel( struct gl_lightmodel *lm )
+{
+   ASSIGN_4V( lm->Ambient, 0.2F, 0.2F, 0.2F, 1.0F );
+   lm->LocalViewer = GL_FALSE;
+   lm->TwoSide = GL_FALSE;
+   lm->ColorControl = GL_SINGLE_COLOR;
+}
+
+
+/**
+ * Initialize the material data structure.
+ * 
+ * \param m pointer to the gl_material structure to be initialized.
+ */
+static void
+init_material( struct gl_material *m )
+{
+   ASSIGN_4V( m->Attrib[MAT_ATTRIB_FRONT_AMBIENT],  0.2F, 0.2F, 0.2F, 1.0F );
+   ASSIGN_4V( m->Attrib[MAT_ATTRIB_FRONT_DIFFUSE],  0.8F, 0.8F, 0.8F, 1.0F );
+   ASSIGN_4V( m->Attrib[MAT_ATTRIB_FRONT_SPECULAR], 0.0F, 0.0F, 0.0F, 1.0F );
+   ASSIGN_4V( m->Attrib[MAT_ATTRIB_FRONT_EMISSION], 0.0F, 0.0F, 0.0F, 1.0F );
+   ASSIGN_4V( m->Attrib[MAT_ATTRIB_FRONT_SHININESS], 0.0F, 0.0F, 0.0F, 0.0F );
+   ASSIGN_4V( m->Attrib[MAT_ATTRIB_FRONT_INDEXES], 0.0F, 1.0F, 1.0F, 0.0F );
+ 
+   ASSIGN_4V( m->Attrib[MAT_ATTRIB_BACK_AMBIENT],  0.2F, 0.2F, 0.2F, 1.0F );
+   ASSIGN_4V( m->Attrib[MAT_ATTRIB_BACK_DIFFUSE],  0.8F, 0.8F, 0.8F, 1.0F );
+   ASSIGN_4V( m->Attrib[MAT_ATTRIB_BACK_SPECULAR], 0.0F, 0.0F, 0.0F, 1.0F );
+   ASSIGN_4V( m->Attrib[MAT_ATTRIB_BACK_EMISSION], 0.0F, 0.0F, 0.0F, 1.0F );
+   ASSIGN_4V( m->Attrib[MAT_ATTRIB_BACK_SHININESS], 0.0F, 0.0F, 0.0F, 0.0F );
+   ASSIGN_4V( m->Attrib[MAT_ATTRIB_BACK_INDEXES], 0.0F, 1.0F, 1.0F, 0.0F );
+}
+
+
+void
+_mesa_init_lighting( GLcontext *ctx )
+{
+   GLuint i;
+
+   /* Lighting group */
+   for (i = 0; i < MAX_LIGHTS; i++) {
+      init_light( &ctx->Light.Light[i], i );
+   }
+   make_empty_list( &ctx->Light.EnabledList );
+
+   init_lightmodel( &ctx->Light.Model );
+   init_material( &ctx->Light.Material );
+   ctx->Light.ShadeModel = GL_SMOOTH;
+   ctx->Light.Enabled = GL_FALSE;
+   ctx->Light.ColorMaterialFace = GL_FRONT_AND_BACK;
+   ctx->Light.ColorMaterialMode = GL_AMBIENT_AND_DIFFUSE;
+   ctx->Light.ColorMaterialBitmask = _mesa_material_bitmask( ctx,
+                                               GL_FRONT_AND_BACK,
+                                               GL_AMBIENT_AND_DIFFUSE, ~0, 0 );
+
+   ctx->Light.ColorMaterialEnabled = GL_FALSE;
+
+   /* Lighting miscellaneous */
+   ctx->_ShineTabList = MALLOC_STRUCT( gl_shine_tab );
+   make_empty_list( ctx->_ShineTabList );
+   /* Allocate 10 (arbitrary) shininess lookup tables */
+   for (i = 0 ; i < 10 ; i++) {
+      struct gl_shine_tab *s = MALLOC_STRUCT( gl_shine_tab );
+      s->shininess = -1;
+      s->refcount = 0;
+      insert_at_tail( ctx->_ShineTabList, s );
+   }
+
+   /* Miscellaneous */
+   ctx->Light._NeedEyeCoords = 0;
+   ctx->_NeedEyeCoords = 0;
+   ctx->_ModelViewInvScale = 1.0;
+}
+
+
+void
+_mesa_free_lighting_data( GLcontext *ctx )
+{
+   struct gl_shine_tab *s, *tmps;
+
+   /* Free lighting shininess exponentiation table */
+   foreach_s( s, tmps, ctx->_ShineTabList ) {
+      FREE( s );
+   }
+   FREE( ctx->_ShineTabList );
+}
diff --git a/reactos/lib/mesa32/src/main/light.h b/reactos/lib/mesa32/src/main/light.h
new file mode 100644
index 00000000000..1f19019450f
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/light.h
@@ -0,0 +1,141 @@
+/**
+ * \file light.h
+ * Lighting.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef LIGHT_H
+#define LIGHT_H
+
+
+#include "mtypes.h"
+
+extern void GLAPIENTRY
+_mesa_ShadeModel( GLenum mode );
+
+#if _HAVE_FULL_GL
+extern void GLAPIENTRY
+_mesa_ColorMaterial( GLenum face, GLenum mode );
+
+extern void GLAPIENTRY
+_mesa_Lightf( GLenum light, GLenum pname, GLfloat param );
+
+extern void GLAPIENTRY
+_mesa_Lightfv( GLenum light, GLenum pname, const GLfloat *params );
+
+extern void GLAPIENTRY
+_mesa_Lightiv( GLenum light, GLenum pname, const GLint *params );
+
+extern void GLAPIENTRY
+_mesa_Lighti( GLenum light, GLenum pname, GLint param );
+
+extern void GLAPIENTRY
+_mesa_LightModelf( GLenum pname, GLfloat param );
+
+extern void GLAPIENTRY
+_mesa_LightModelfv( GLenum pname, const GLfloat *params );
+
+extern void GLAPIENTRY
+_mesa_LightModeli( GLenum pname, GLint param );
+
+extern void GLAPIENTRY
+_mesa_LightModeliv( GLenum pname, const GLint *params );
+
+extern void GLAPIENTRY
+_mesa_GetLightfv( GLenum light, GLenum pname, GLfloat *params );
+
+extern void GLAPIENTRY
+_mesa_GetLightiv( GLenum light, GLenum pname, GLint *params );
+
+extern void GLAPIENTRY
+_mesa_GetMaterialfv( GLenum face, GLenum pname, GLfloat *params );
+
+extern void GLAPIENTRY
+_mesa_GetMaterialiv( GLenum face, GLenum pname, GLint *params );
+
+
+/* Lerp between adjacent values in the f(x) lookup table, giving a
+ * continuous function, with adequeate overall accuracy.  (Though
+ * still pretty good compared to a straight lookup).
+ * Result should be a GLfloat.
+ */
+#define GET_SHINE_TAB_ENTRY( table, dp, result )			\
+do {									\
+   struct gl_shine_tab *_tab = table;					\
+   float f = (dp * (SHINE_TABLE_SIZE-1));				\
+   int k = (int) f;							\
+   if (k > SHINE_TABLE_SIZE-2) 						\
+      result = (GLfloat) _mesa_pow( dp, _tab->shininess );		\
+   else									\
+      result = _tab->tab[k] + (f-k)*(_tab->tab[k+1]-_tab->tab[k]);	\
+} while (0)
+
+
+extern GLuint _mesa_material_bitmask( GLcontext *ctx,
+                                      GLenum face, GLenum pname,
+                                      GLuint legal,
+                                      const char * );
+
+extern void _mesa_invalidate_spot_exp_table( struct gl_light *l );
+
+extern void _mesa_invalidate_shine_table( GLcontext *ctx, GLuint i );
+
+extern void _mesa_validate_all_lighting_tables( GLcontext *ctx );
+
+extern void _mesa_update_lighting( GLcontext *ctx );
+
+extern void _mesa_update_tnl_spaces( GLcontext *ctx, GLuint new_state );
+
+extern void _mesa_update_material( GLcontext *ctx,
+                                   GLuint bitmask );
+
+extern void _mesa_copy_materials( struct gl_material *dst,
+				  const struct gl_material *src,
+				  GLuint bitmask );
+
+extern void _mesa_update_color_material( GLcontext *ctx,
+                                         const GLfloat rgba[4] );
+
+extern void _mesa_init_lighting( GLcontext *ctx );
+
+extern void _mesa_free_lighting_data( GLcontext *ctx );
+
+extern void _mesa_allow_light_in_model( GLcontext *ctx, GLboolean flag );
+
+#else
+#define _mesa_update_color_material( c, r ) ((void)0)
+#define _mesa_validate_all_lighting_tables( c ) ((void)0)
+#define _mesa_invalidate_spot_exp_table( l ) ((void)0)
+#define _mesa_material_bitmask( c, f, p, l, s ) 0
+#define _mesa_init_lighting( c ) ((void)0)
+#define _mesa_free_lighting_data( c ) ((void)0)
+#define _mesa_update_lighting( c ) ((void)0)
+#define _mesa_update_tnl_spaces( c, n ) ((void)0)
+#define GET_SHINE_TAB_ENTRY( table, dp, result )  ((result)=0)
+#endif
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/lines.c b/reactos/lib/mesa32/src/main/lines.c
new file mode 100644
index 00000000000..c30d9ac109e
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/lines.c
@@ -0,0 +1,134 @@
+/**
+ * \file lines.c
+ * Line operations.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "context.h"
+#include "depth.h"
+#include "lines.h"
+#include "macros.h"
+#include "texstate.h"
+#include "mtypes.h"
+
+
+/**
+ * Set the line width.
+ *
+ * \param width line width in pixels.
+ *
+ * \sa glLineWidth().
+ *
+ * Verifies the parameter and updates gl_line_attrib::Width. On a change,
+ * flushes the vertices, updates the clamped line width and marks the
+ * DD_LINE_WIDTH flag in __GLcontextRec::_TriangleCaps for the drivers if the
+ * width is different from one. Notifies the driver via the
+ * dd_function_table::LineWidth callback.
+ */
+void GLAPIENTRY
+_mesa_LineWidth( GLfloat width )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (width<=0.0) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glLineWidth" );
+      return;
+   }
+
+   if (ctx->Line.Width == width)
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_LINE);
+   ctx->Line.Width = width;
+   ctx->Line._Width = CLAMP(width,
+			    ctx->Const.MinLineWidth,
+			    ctx->Const.MaxLineWidth);
+
+
+   if (width != 1.0)
+      ctx->_TriangleCaps |= DD_LINE_WIDTH;
+   else
+      ctx->_TriangleCaps &= ~DD_LINE_WIDTH;
+
+   if (ctx->Driver.LineWidth)
+      (*ctx->Driver.LineWidth)(ctx, width);
+}
+
+
+/**
+ * Set the line stipple pattern.
+ *
+ * \param factor pattern scale factor.
+ * \param pattern bit pattern.
+ * 
+ * \sa glLineStipple().
+ *
+ * Updates gl_line_attrib::StippleFactor and gl_line_attrib::StipplePattern. On
+ * change flushes the vertices and notifies the driver via
+ * the dd_function_table::LineStipple callback.
+ */
+void GLAPIENTRY
+_mesa_LineStipple( GLint factor, GLushort pattern )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   factor = CLAMP( factor, 1, 256 );
+
+   if (ctx->Line.StippleFactor == factor &&
+       ctx->Line.StipplePattern == pattern)
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_LINE);
+   ctx->Line.StippleFactor = factor;
+   ctx->Line.StipplePattern = pattern;
+
+   if (ctx->Driver.LineStipple)
+      ctx->Driver.LineStipple( ctx, factor, pattern );
+}
+
+
+/**
+ * Initialize the context line state.
+ *
+ * \param ctx GL context.
+ *
+ * Initializes __GLcontextRec::Line and line related constants in
+ * __GLcontextRec::Const.
+ */
+void GLAPIENTRY _mesa_init_line( GLcontext * ctx )
+{
+   /* Line group */
+   ctx->Line.SmoothFlag = GL_FALSE;
+   ctx->Line.StippleFlag = GL_FALSE;
+   ctx->Line.Width = 1.0;
+   ctx->Line._Width = 1.0;
+   ctx->Line.StipplePattern = 0xffff;
+   ctx->Line.StippleFactor = 1;
+}
diff --git a/reactos/lib/mesa32/src/main/lines.h b/reactos/lib/mesa32/src/main/lines.h
new file mode 100644
index 00000000000..5a47e9858d5
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/lines.h
@@ -0,0 +1,48 @@
+/**
+ * \file lines.h
+ * Line operations.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+
+#ifndef LINES_H
+#define LINES_H
+
+
+#include "mtypes.h"
+
+
+extern void GLAPIENTRY
+_mesa_LineWidth( GLfloat width );
+
+extern void GLAPIENTRY
+_mesa_LineStipple( GLint factor, GLushort pattern );
+
+extern void GLAPIENTRY 
+_mesa_init_line( GLcontext * ctx );
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/macros.h b/reactos/lib/mesa32/src/main/macros.h
new file mode 100644
index 00000000000..67e4de9239a
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/macros.h
@@ -0,0 +1,658 @@
+/**
+ * \file macros.h
+ * A collection of useful macros.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef MACROS_H
+#define MACROS_H
+
+#include "imports.h"
+
+
+/**
+ * \name Integer / float conversion for colors, normals, etc.
+ */
+/*@{*/
+
+/** Convert GLubyte in [0,255] to GLfloat in [0.0,1.0] */
+extern GLfloat _mesa_ubyte_to_float_color_tab[256];
+#define UBYTE_TO_FLOAT(u) _mesa_ubyte_to_float_color_tab[(unsigned int)(u)]
+
+/** Convert GLfloat in [0.0,1.0] to GLubyte in [0,255] */
+#define FLOAT_TO_UBYTE(X)   ((GLubyte) (GLint) ((X) * 255.0F))
+
+
+/** Convert GLbyte in [-128,127] to GLfloat in [-1.0,1.0] */
+#define BYTE_TO_FLOAT(B)    ((2.0F * (B) + 1.0F) * (1.0F/255.0F))
+
+/** Convert GLfloat in [-1.0,1.0] to GLbyte in [-128,127] */
+#define FLOAT_TO_BYTE(X)    ( (((GLint) (255.0F * (X))) - 1) / 2 )
+
+
+/** Convert GLushort in [0,65536] to GLfloat in [0.0,1.0] */
+#define USHORT_TO_FLOAT(S)  ((GLfloat) (S) * (1.0F / 65535.0F))
+
+/** Convert GLfloat in [0.0,1.0] to GLushort in [0,65536] */
+#define FLOAT_TO_USHORT(X)  ((GLushort) (GLint) ((X) * 65535.0F))
+
+/** Convert GLshort in [-32768,32767] to GLfloat in [-1.0,1.0] */
+#define SHORT_TO_FLOAT(S)   ((2.0F * (S) + 1.0F) * (1.0F/65535.0F))
+
+/** Convert GLfloat in [0.0,1.0] to GLshort in [-32768,32767] */
+#define FLOAT_TO_SHORT(X)   ( (((GLint) (65535.0F * (X))) - 1) / 2 )
+
+
+/** Convert GLuint in [0,4294967295] to GLfloat in [0.0,1.0] */
+#define UINT_TO_FLOAT(U)    ((GLfloat) (U) * (1.0F / 4294967295.0F))
+
+/** Convert GLfloat in [0.0,1.0] to GLuint in [0,4294967295] */
+#define FLOAT_TO_UINT(X)    ((GLuint) ((X) * 4294967295.0))
+
+
+/** Convert GLint in [-2147483648,2147483647] to GLfloat in [-1.0,1.0] */
+#define INT_TO_FLOAT(I)     ((2.0F * (I) + 1.0F) * (1.0F/4294967294.0F))
+
+/** Convert GLfloat in [-1.0,1.0] to GLint in [-2147483648,2147483647] */
+/* causes overflow:
+#define FLOAT_TO_INT(X)     ( (((GLint) (4294967294.0F * (X))) - 1) / 2 )
+*/
+/* a close approximation: */
+#define FLOAT_TO_INT(X)     ( (GLint) (2147483647.0 * (X)) )
+
+
+#define BYTE_TO_UBYTE(b)   ((GLubyte) ((b) < 0 ? 0 : (GLubyte) (b)))
+#define SHORT_TO_UBYTE(s)  ((GLubyte) ((s) < 0 ? 0 : (GLubyte) ((s) >> 7)))
+#define USHORT_TO_UBYTE(s) ((GLubyte) ((s) >> 8))
+#define INT_TO_UBYTE(i)    ((GLubyte) ((i) < 0 ? 0 : (GLubyte) ((i) >> 23)))
+#define UINT_TO_UBYTE(i)   ((GLubyte) ((i) >> 24))
+
+
+#define BYTE_TO_USHORT(b)  ((b) < 0 ? 0 : ((GLushort) (((b) * 65535) / 255)))
+#define UBYTE_TO_USHORT(b) (((GLushort) (b) << 8) | (GLushort) (b))
+#define SHORT_TO_USHORT(s) ((s) < 0 ? 0 : ((GLushort) (((s) * 65535 / 32767))))
+#define INT_TO_USHORT(i)   ((i) < 0 ? 0 : ((GLushort) ((i) >> 15)))
+#define UINT_TO_USHORT(i)  ((i) < 0 ? 0 : ((GLushort) ((i) >> 16)))
+#define UNCLAMPED_FLOAT_TO_USHORT(us, f)  \
+        us = ( (GLushort) IROUND( CLAMP((f), 0.0, 1.0) * 65535.0F) )
+#define CLAMPED_FLOAT_TO_USHORT(us, f)  \
+        us = ( (GLushort) IROUND( (f) * 65535.0F) )
+
+
+/** Stepping a GLfloat pointer by a byte stride */
+#define STRIDE_F(p, i)  (p = (GLfloat *)((GLubyte *)p + i))
+/** Stepping a GLuint pointer by a byte stride */
+#define STRIDE_UI(p, i)  (p = (GLuint *)((GLubyte *)p + i))
+/** Stepping a GLubyte[4] pointer by a byte stride */
+#define STRIDE_4UB(p, i)  (p = (GLubyte (*)[4])((GLubyte *)p + i))
+/** Stepping a GLfloat[4] pointer by a byte stride */
+#define STRIDE_4F(p, i)  (p = (GLfloat (*)[4])((GLubyte *)p + i))
+/** Stepping a GLchan[4] pointer by a byte stride */
+#define STRIDE_4CHAN(p, i)  (p = (GLchan (*)[4])((GLubyte *)p + i))
+/** Stepping a GLchan pointer by a byte stride */
+#define STRIDE_CHAN(p, i)  (p = (GLchan *)((GLubyte *)p + i))
+/** Stepping a \p t pointer by a byte stride */
+#define STRIDE_T(p, t, i)  (p = (t)((GLubyte *)p + i))
+
+
+/**********************************************************************/
+/** \name 4-element vector operations */
+/*@{*/
+
+/** Zero */
+#define ZERO_4V( DST )  (DST)[0] = (DST)[1] = (DST)[2] = (DST)[3] = 0
+
+/** Test for equality */
+#define TEST_EQ_4V(a,b)  ((a)[0] == (b)[0] &&   \
+              (a)[1] == (b)[1] &&   \
+              (a)[2] == (b)[2] &&   \
+              (a)[3] == (b)[3])
+
+/** Test for equality (unsigned bytes) */
+#if defined(__i386__)
+#define TEST_EQ_4UBV(DST, SRC) *((GLuint*)(DST)) == *((GLuint*)(SRC))
+#else
+#define TEST_EQ_4UBV(DST, SRC) TEST_EQ_4V(DST, SRC)
+#endif
+
+/** Copy a 4-element vector */
+#define COPY_4V( DST, SRC )         \
+do {                                \
+   (DST)[0] = (SRC)[0];             \
+   (DST)[1] = (SRC)[1];             \
+   (DST)[2] = (SRC)[2];             \
+   (DST)[3] = (SRC)[3];             \
+} while (0)
+
+/** Copy a 4-element vector with cast */
+#define COPY_4V_CAST( DST, SRC, CAST )  \
+do {                                    \
+   (DST)[0] = (CAST)(SRC)[0];           \
+   (DST)[1] = (CAST)(SRC)[1];           \
+   (DST)[2] = (CAST)(SRC)[2];           \
+   (DST)[3] = (CAST)(SRC)[3];           \
+} while (0)
+
+/** Copy a 4-element unsigned byte vector */
+#if defined(__i386__)
+#define COPY_4UBV(DST, SRC)                 \
+do {                                        \
+   *((GLuint*)(DST)) = *((GLuint*)(SRC));   \
+} while (0)
+#else
+/* The GLuint cast might fail if DST or SRC are not dword-aligned (RISC) */
+#define COPY_4UBV(DST, SRC)         \
+do {                                \
+   (DST)[0] = (SRC)[0];             \
+   (DST)[1] = (SRC)[1];             \
+   (DST)[2] = (SRC)[2];             \
+   (DST)[3] = (SRC)[3];             \
+} while (0)
+#endif
+
+/** Copy a 4-element float vector (Use COPY_FLOAT to avoid loading FPU) */
+#define COPY_4FV( DST, SRC )        \
+do {                                \
+   COPY_FLOAT((DST)[0], (SRC)[0]);  \
+   COPY_FLOAT((DST)[1], (SRC)[1]);  \
+   COPY_FLOAT((DST)[2], (SRC)[2]);  \
+   COPY_FLOAT((DST)[3], (SRC)[3]);  \
+} while (0)
+
+
+/** Copy \p SZ elements into a 4-element vector */
+#define COPY_SZ_4V(DST, SZ, SRC)  \
+do {                              \
+   switch (SZ) {                  \
+   case 4: (DST)[3] = (SRC)[3];   \
+   case 3: (DST)[2] = (SRC)[2];   \
+   case 2: (DST)[1] = (SRC)[1];   \
+   case 1: (DST)[0] = (SRC)[0];   \
+   }                              \
+} while(0)
+
+/** Copy \p SZ elements into a homegeneous (4-element) vector, giving
+ * default values to the remaining */
+#define COPY_CLEAN_4V(DST, SZ, SRC)  \
+do {                                 \
+      ASSIGN_4V( DST, 0, 0, 0, 1 );  \
+      COPY_SZ_4V( DST, SZ, SRC );    \
+} while (0)
+
+/** Subtraction */
+#define SUB_4V( DST, SRCA, SRCB )           \
+do {                                        \
+      (DST)[0] = (SRCA)[0] - (SRCB)[0];     \
+      (DST)[1] = (SRCA)[1] - (SRCB)[1];     \
+      (DST)[2] = (SRCA)[2] - (SRCB)[2];     \
+      (DST)[3] = (SRCA)[3] - (SRCB)[3];     \
+} while (0)
+
+/** Addition */
+#define ADD_4V( DST, SRCA, SRCB )           \
+do {                                        \
+      (DST)[0] = (SRCA)[0] + (SRCB)[0];     \
+      (DST)[1] = (SRCA)[1] + (SRCB)[1];     \
+      (DST)[2] = (SRCA)[2] + (SRCB)[2];     \
+      (DST)[3] = (SRCA)[3] + (SRCB)[3];     \
+} while (0)
+
+/** Element-wise multiplication */
+#define SCALE_4V( DST, SRCA, SRCB )         \
+do {                                        \
+      (DST)[0] = (SRCA)[0] * (SRCB)[0];     \
+      (DST)[1] = (SRCA)[1] * (SRCB)[1];     \
+      (DST)[2] = (SRCA)[2] * (SRCB)[2];     \
+      (DST)[3] = (SRCA)[3] * (SRCB)[3];     \
+} while (0)
+
+/** In-place addition */
+#define ACC_4V( DST, SRC )          \
+do {                                \
+      (DST)[0] += (SRC)[0];         \
+      (DST)[1] += (SRC)[1];         \
+      (DST)[2] += (SRC)[2];         \
+      (DST)[3] += (SRC)[3];         \
+} while (0)
+
+/** Element-wise multiplication and addition */
+#define ACC_SCALE_4V( DST, SRCA, SRCB )     \
+do {                                        \
+      (DST)[0] += (SRCA)[0] * (SRCB)[0];    \
+      (DST)[1] += (SRCA)[1] * (SRCB)[1];    \
+      (DST)[2] += (SRCA)[2] * (SRCB)[2];    \
+      (DST)[3] += (SRCA)[3] * (SRCB)[3];    \
+} while (0)
+
+/** In-place scalar multiplication and addition */
+#define ACC_SCALE_SCALAR_4V( DST, S, SRCB ) \
+do {                                        \
+      (DST)[0] += S * (SRCB)[0];            \
+      (DST)[1] += S * (SRCB)[1];            \
+      (DST)[2] += S * (SRCB)[2];            \
+      (DST)[3] += S * (SRCB)[3];            \
+} while (0)
+
+/** Scalar multiplication */
+#define SCALE_SCALAR_4V( DST, S, SRCB ) \
+do {                                    \
+      (DST)[0] = S * (SRCB)[0];         \
+      (DST)[1] = S * (SRCB)[1];         \
+      (DST)[2] = S * (SRCB)[2];         \
+      (DST)[3] = S * (SRCB)[3];         \
+} while (0)
+
+/** In-place scalar multiplication */
+#define SELF_SCALE_SCALAR_4V( DST, S ) \
+do {                                   \
+      (DST)[0] *= S;                   \
+      (DST)[1] *= S;                   \
+      (DST)[2] *= S;                   \
+      (DST)[3] *= S;                   \
+} while (0)
+
+/** Assignment */
+#define ASSIGN_4V( V, V0, V1, V2, V3 )  \
+do {                                    \
+    V[0] = V0;                          \
+    V[1] = V1;                          \
+    V[2] = V2;                          \
+    V[3] = V3;                          \
+} while(0)
+
+/*@}*/
+
+
+/**********************************************************************/
+/** \name 3-element vector operations*/
+/*@{*/
+
+/** Zero */
+#define ZERO_3V( DST )  (DST)[0] = (DST)[1] = (DST)[2] = 0
+
+/** Test for equality */
+#define TEST_EQ_3V(a,b)  \
+   ((a)[0] == (b)[0] &&  \
+    (a)[1] == (b)[1] &&  \
+    (a)[2] == (b)[2])
+
+/** Copy a 3-element vector */
+#define COPY_3V( DST, SRC )         \
+do {                                \
+   (DST)[0] = (SRC)[0];             \
+   (DST)[1] = (SRC)[1];             \
+   (DST)[2] = (SRC)[2];             \
+} while (0)
+
+/** Copy a 3-element vector with cast */
+#define COPY_3V_CAST( DST, SRC, CAST )  \
+do {                                    \
+   (DST)[0] = (CAST)(SRC)[0];           \
+   (DST)[1] = (CAST)(SRC)[1];           \
+   (DST)[2] = (CAST)(SRC)[2];           \
+} while (0)
+
+/** Copy a 3-element float vector */
+#define COPY_3FV( DST, SRC )        \
+do {                                \
+   const GLfloat *_tmp = (SRC);     \
+   (DST)[0] = _tmp[0];              \
+   (DST)[1] = _tmp[1];              \
+   (DST)[2] = _tmp[2];              \
+} while (0)
+
+/** Subtraction */
+#define SUB_3V( DST, SRCA, SRCB )        \
+do {                                     \
+      (DST)[0] = (SRCA)[0] - (SRCB)[0];  \
+      (DST)[1] = (SRCA)[1] - (SRCB)[1];  \
+      (DST)[2] = (SRCA)[2] - (SRCB)[2];  \
+} while (0)
+
+/** Addition */
+#define ADD_3V( DST, SRCA, SRCB )       \
+do {                                    \
+      (DST)[0] = (SRCA)[0] + (SRCB)[0]; \
+      (DST)[1] = (SRCA)[1] + (SRCB)[1]; \
+      (DST)[2] = (SRCA)[2] + (SRCB)[2]; \
+} while (0)
+
+/** In-place scalar multiplication */
+#define SCALE_3V( DST, SRCA, SRCB )     \
+do {                                    \
+      (DST)[0] = (SRCA)[0] * (SRCB)[0]; \
+      (DST)[1] = (SRCA)[1] * (SRCB)[1]; \
+      (DST)[2] = (SRCA)[2] * (SRCB)[2]; \
+} while (0)
+
+/** In-place element-wise multiplication */
+#define SELF_SCALE_3V( DST, SRC )   \
+do {                                \
+      (DST)[0] *= (SRC)[0];         \
+      (DST)[1] *= (SRC)[1];         \
+      (DST)[2] *= (SRC)[2];         \
+} while (0)
+
+/** In-place addition */
+#define ACC_3V( DST, SRC )          \
+do {                                \
+      (DST)[0] += (SRC)[0];         \
+      (DST)[1] += (SRC)[1];         \
+      (DST)[2] += (SRC)[2];         \
+} while (0)
+
+/** Element-wise multiplication and addition */
+#define ACC_SCALE_3V( DST, SRCA, SRCB )     \
+do {                                        \
+      (DST)[0] += (SRCA)[0] * (SRCB)[0];    \
+      (DST)[1] += (SRCA)[1] * (SRCB)[1];    \
+      (DST)[2] += (SRCA)[2] * (SRCB)[2];    \
+} while (0)
+
+/** Scalar multiplication */
+#define SCALE_SCALAR_3V( DST, S, SRCB ) \
+do {                                    \
+      (DST)[0] = S * (SRCB)[0];         \
+      (DST)[1] = S * (SRCB)[1];         \
+      (DST)[2] = S * (SRCB)[2];         \
+} while (0)
+
+/** In-place scalar multiplication and addition */
+#define ACC_SCALE_SCALAR_3V( DST, S, SRCB ) \
+do {                                        \
+      (DST)[0] += S * (SRCB)[0];            \
+      (DST)[1] += S * (SRCB)[1];            \
+      (DST)[2] += S * (SRCB)[2];            \
+} while (0)
+
+/** In-place scalar multiplication */
+#define SELF_SCALE_SCALAR_3V( DST, S ) \
+do {                                   \
+      (DST)[0] *= S;                   \
+      (DST)[1] *= S;                   \
+      (DST)[2] *= S;                   \
+} while (0)
+
+/** In-place scalar addition */
+#define ACC_SCALAR_3V( DST, S )     \
+do {                                \
+      (DST)[0] += S;                \
+      (DST)[1] += S;                \
+      (DST)[2] += S;                \
+} while (0)
+
+/** Assignment */
+#define ASSIGN_3V( V, V0, V1, V2 )  \
+do {                                \
+    V[0] = V0;                      \
+    V[1] = V1;                      \
+    V[2] = V2;                      \
+} while(0)
+
+/*@}*/
+
+
+/**********************************************************************/
+/** \name 2-element vector operations*/
+/*@{*/
+
+/** Zero */
+#define ZERO_2V( DST )  (DST)[0] = (DST)[1] = 0
+
+/** Copy a 2-element vector */
+#define COPY_2V( DST, SRC )         \
+do {                        \
+   (DST)[0] = (SRC)[0];             \
+   (DST)[1] = (SRC)[1];             \
+} while (0)
+
+/** Copy a 2-element vector with cast */
+#define COPY_2V_CAST( DST, SRC, CAST )      \
+do {                        \
+   (DST)[0] = (CAST)(SRC)[0];           \
+   (DST)[1] = (CAST)(SRC)[1];           \
+} while (0)
+
+/** Copy a 2-element float vector */
+#define COPY_2FV( DST, SRC )            \
+do {                        \
+   const GLfloat *_tmp = (SRC);         \
+   (DST)[0] = _tmp[0];              \
+   (DST)[1] = _tmp[1];              \
+} while (0)
+
+/** Subtraction */
+#define SUB_2V( DST, SRCA, SRCB )       \
+do {                        \
+      (DST)[0] = (SRCA)[0] - (SRCB)[0];     \
+      (DST)[1] = (SRCA)[1] - (SRCB)[1];     \
+} while (0)
+
+/** Addition */
+#define ADD_2V( DST, SRCA, SRCB )       \
+do {                        \
+      (DST)[0] = (SRCA)[0] + (SRCB)[0];     \
+      (DST)[1] = (SRCA)[1] + (SRCB)[1];     \
+} while (0)
+
+/** In-place scalar multiplication */
+#define SCALE_2V( DST, SRCA, SRCB )     \
+do {                        \
+      (DST)[0] = (SRCA)[0] * (SRCB)[0];     \
+      (DST)[1] = (SRCA)[1] * (SRCB)[1];     \
+} while (0)
+
+/** In-place addition */
+#define ACC_2V( DST, SRC )          \
+do {                        \
+      (DST)[0] += (SRC)[0];         \
+      (DST)[1] += (SRC)[1];         \
+} while (0)
+
+/** Element-wise multiplication and addition */
+#define ACC_SCALE_2V( DST, SRCA, SRCB )     \
+do {                        \
+      (DST)[0] += (SRCA)[0] * (SRCB)[0];    \
+      (DST)[1] += (SRCA)[1] * (SRCB)[1];    \
+} while (0)
+
+/** Scalar multiplication */
+#define SCALE_SCALAR_2V( DST, S, SRCB )     \
+do {                        \
+      (DST)[0] = S * (SRCB)[0];         \
+      (DST)[1] = S * (SRCB)[1];         \
+} while (0)
+
+/** In-place scalar multiplication and addition */
+#define ACC_SCALE_SCALAR_2V( DST, S, SRCB ) \
+do {                        \
+      (DST)[0] += S * (SRCB)[0];        \
+      (DST)[1] += S * (SRCB)[1];        \
+} while (0)
+
+/** In-place scalar multiplication */
+#define SELF_SCALE_SCALAR_2V( DST, S )      \
+do {                        \
+      (DST)[0] *= S;                \
+      (DST)[1] *= S;                \
+} while (0)
+
+/** In-place scalar addition */
+#define ACC_SCALAR_2V( DST, S )         \
+do {                        \
+      (DST)[0] += S;                \
+      (DST)[1] += S;                \
+} while (0)
+
+
+
+/**
+ * Linear interpolation
+ *
+ * \note \p OUT argument is evaluated twice!
+ * \note Be wary of using *coord++ as an argument to any of these macros!
+ */
+#define LINTERP(T, OUT, IN) ((OUT) + (T) * ((IN) - (OUT)))
+
+/* Can do better with integer math
+ */
+#define INTERP_UB( t, dstub, outub, inub )  \
+do {                        \
+   GLfloat inf = UBYTE_TO_FLOAT( inub );    \
+   GLfloat outf = UBYTE_TO_FLOAT( outub );  \
+   GLfloat dstf = LINTERP( t, outf, inf );  \
+   UNCLAMPED_FLOAT_TO_UBYTE( dstub, dstf ); \
+} while (0)
+
+#define INTERP_CHAN( t, dstc, outc, inc )   \
+do {                        \
+   GLfloat inf = CHAN_TO_FLOAT( inc );      \
+   GLfloat outf = CHAN_TO_FLOAT( outc );    \
+   GLfloat dstf = LINTERP( t, outf, inf );  \
+   UNCLAMPED_FLOAT_TO_CHAN( dstc, dstf );   \
+} while (0)
+
+#define INTERP_UI( t, dstui, outui, inui )  \
+   dstui = (GLuint) (GLint) LINTERP( (t), (GLfloat) (outui), (GLfloat) (inui) )
+
+#define INTERP_F( t, dstf, outf, inf )      \
+   dstf = LINTERP( t, outf, inf )
+
+#define INTERP_4F( t, dst, out, in )        \
+do {                        \
+   dst[0] = LINTERP( (t), (out)[0], (in)[0] );  \
+   dst[1] = LINTERP( (t), (out)[1], (in)[1] );  \
+   dst[2] = LINTERP( (t), (out)[2], (in)[2] );  \
+   dst[3] = LINTERP( (t), (out)[3], (in)[3] );  \
+} while (0)
+
+#define INTERP_3F( t, dst, out, in )        \
+do {                        \
+   dst[0] = LINTERP( (t), (out)[0], (in)[0] );  \
+   dst[1] = LINTERP( (t), (out)[1], (in)[1] );  \
+   dst[2] = LINTERP( (t), (out)[2], (in)[2] );  \
+} while (0)
+
+#define INTERP_4CHAN( t, dst, out, in )         \
+do {                            \
+   INTERP_CHAN( (t), (dst)[0], (out)[0], (in)[0] ); \
+   INTERP_CHAN( (t), (dst)[1], (out)[1], (in)[1] ); \
+   INTERP_CHAN( (t), (dst)[2], (out)[2], (in)[2] ); \
+   INTERP_CHAN( (t), (dst)[3], (out)[3], (in)[3] ); \
+} while (0)
+
+#define INTERP_3CHAN( t, dst, out, in )         \
+do {                            \
+   INTERP_CHAN( (t), (dst)[0], (out)[0], (in)[0] ); \
+   INTERP_CHAN( (t), (dst)[1], (out)[1], (in)[1] ); \
+   INTERP_CHAN( (t), (dst)[2], (out)[2], (in)[2] ); \
+} while (0)
+
+#define INTERP_SZ( t, vec, to, out, in, sz )                \
+do {                                    \
+   switch (sz) {                            \
+   case 4: vec[to][3] = LINTERP( (t), (vec)[out][3], (vec)[in][3] );    \
+   case 3: vec[to][2] = LINTERP( (t), (vec)[out][2], (vec)[in][2] );    \
+   case 2: vec[to][1] = LINTERP( (t), (vec)[out][1], (vec)[in][1] );    \
+   case 1: vec[to][0] = LINTERP( (t), (vec)[out][0], (vec)[in][0] );    \
+   }                                    \
+} while(0)
+
+
+
+/** Assign scalers to short vectors */
+#define ASSIGN_2V( V, V0, V1 )  \
+do {                \
+    V[0] = V0;          \
+    V[1] = V1;          \
+} while(0)
+
+/*@}*/
+
+
+
+/** Clamp X to [MIN,MAX] */
+#define CLAMP( X, MIN, MAX )  ( (X)<(MIN) ? (MIN) : ((X)>(MAX) ? (MAX) : (X)) )
+
+/** Assign X to CLAMP(X, MIN, MAX) */
+#define CLAMP_SELF(x, mn, mx)  \
+   ( (x)<(mn) ? ((x) = (mn)) : ((x)>(mx) ? ((x)=(mx)) : (x)) )
+
+
+
+/** Minimum of two values: */
+#define MIN2( A, B )   ( (A)<(B) ? (A) : (B) )
+
+/** Maximum of two values: */
+#define MAX2( A, B )   ( (A)>(B) ? (A) : (B) )
+
+/** Dot product of two 2-element vectors */
+#define DOT2( a, b )  ( (a)[0]*(b)[0] + (a)[1]*(b)[1] )
+
+/** Dot product of two 3-element vectors */
+#define DOT3( a, b )  ( (a)[0]*(b)[0] + (a)[1]*(b)[1] + (a)[2]*(b)[2] )
+
+/** Dot product of two 4-element vectors */
+#define DOT4( a, b )  ( (a)[0]*(b)[0] + (a)[1]*(b)[1] + \
+            (a)[2]*(b)[2] + (a)[3]*(b)[3] )
+
+/** Dot product of two 4-element vectors */
+#define DOT4V(v,a,b,c,d) (v[0]*(a) + v[1]*(b) + v[2]*(c) + v[3]*(d))
+
+
+/** Cross product of two 3-element vectors */
+#define CROSS3(n, u, v)             \
+do {                        \
+   (n)[0] = (u)[1]*(v)[2] - (u)[2]*(v)[1];  \
+   (n)[1] = (u)[2]*(v)[0] - (u)[0]*(v)[2];  \
+   (n)[2] = (u)[0]*(v)[1] - (u)[1]*(v)[0];  \
+} while (0)
+
+
+/* Normalize a 3-element vector to unit length. */
+#define NORMALIZE_3FV( V )          \
+do {                        \
+   GLfloat len = (GLfloat) LEN_SQUARED_3FV(V);  \
+   if (len) {                   \
+      len = INV_SQRTF(len);         \
+      (V)[0] = (GLfloat) ((V)[0] * len);    \
+      (V)[1] = (GLfloat) ((V)[1] * len);    \
+      (V)[2] = (GLfloat) ((V)[2] * len);    \
+   }                        \
+} while(0)
+
+#define LEN_3FV( V ) (SQRTF((V)[0]*(V)[0]+(V)[1]*(V)[1]+(V)[2]*(V)[2]))
+#define LEN_2FV( V ) (SQRTF((V)[0]*(V)[0]+(V)[1]*(V)[1]))
+
+#define LEN_SQUARED_3FV( V ) ((V)[0]*(V)[0]+(V)[1]*(V)[1]+(V)[2]*(V)[2])
+#define LEN_SQUARED_2FV( V ) ((V)[0]*(V)[0]+(V)[1]*(V)[1])
+
+
+/*@}*/
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/main.dsp b/reactos/lib/mesa32/src/main/main.dsp
new file mode 100644
index 00000000000..8fa3752fb0b
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/main.dsp
@@ -0,0 +1,612 @@
+# Microsoft Developer Studio Project File - Name="main" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=main - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "main.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "main.mak" CFG="main - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "main - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "main - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "main - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "../../../include" /I "../" /I "../glapi" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /Zm1000 /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "main - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../" /I "../glapi" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /Zm1000 /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "main - Win32 Release"
+# Name "main - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\accum.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\api_arrayelt.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\api_loopback.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\api_noop.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\api_validate.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\arbfragparse.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\arbparse.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\arbprogram.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\arbvertparse.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\attrib.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\blend.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\bufferobj.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\buffers.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\clip.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\colortab.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\context.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\convolve.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\debug.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\depth.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\dispatch.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\dlist.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\drawpix.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\enable.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\enums.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\eval.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\extensions.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\feedback.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\fog.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\get.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\hash.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\hint.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\histogram.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\image.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\imports.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\light.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\lines.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\matrix.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\nvfragparse.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\nvprogram.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\nvvertexec.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\nvvertparse.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\occlude.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pixel.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\points.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\polygon.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\program.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\rastpos.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\state.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\stencil.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\texcompress.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\texformat.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\teximage.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\texobj.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\texstate.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\texstore.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\texutil.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\varray.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\vtxfmt.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\accum.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\api_arrayelt.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\api_eval.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\api_loopback.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\api_noop.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\api_validate.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\arbfragparse.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\arbparse.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\arbparse_syn.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\arbprogram.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\arbvertparse.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\attrib.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\blend.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\bufferobj.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\buffers.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\clip.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\colormac.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\colortab.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\config.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\context.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\convolve.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\dd.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\debug.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\depth.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\dlist.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\drawpix.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\enable.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\enums.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\eval.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\extensions.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\feedback.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\fog.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\get.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\glheader.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\hash.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\hint.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\histogram.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\image.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\imports.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\light.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\lines.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\macros.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\matrix.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\mtypes.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\nvfragparse.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\nvfragprog.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\nvprogram.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\nvvertexec.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\nvvertparse.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\nvvertprog.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\occlude.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\pixel.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\points.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\polygon.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\program.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\rastpos.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\simple_list.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\state.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\stencil.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\texcompress.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\texformat.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\texformat_tmp.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\teximage.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\texobj.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\texstate.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\texstore.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\texutil.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\texutil_tmp.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\varray.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\version.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\vtxfmt.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\vtxfmt_tmp.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/reactos/lib/mesa32/src/main/matrix.c b/reactos/lib/mesa32/src/main/matrix.c
new file mode 100644
index 00000000000..76ca28451f7
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/matrix.c
@@ -0,0 +1,938 @@
+/**
+ * \file matrix.c
+ * Matrix operations.
+ *
+ * \note
+ * -# 4x4 transformation matrices are stored in memory in column major order.
+ * -# Points/vertices are to be thought of as column vectors.
+ * -# Transformation of a point p by a matrix M is: p' = M * p
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "imports.h"
+#include "buffers.h"
+#include "context.h"
+#include "enums.h"
+#include "macros.h"
+#include "matrix.h"
+#include "mtypes.h"
+#include "math/m_matrix.h"
+#include "math/m_xform.h"
+
+
+/**
+ * Apply a perspective projection matrix.
+ *
+ * \param left left clipping plane coordinate.
+ * \param right right clipping plane coordinate.
+ * \param bottom bottom clipping plane coordinate.
+ * \param top top clipping plane coordinate.
+ * \param nearval distance to the near clipping plane.
+ * \param farval distance to the far clipping plane.
+ *
+ * \sa glFrustum().
+ *
+ * Flushes vertices and validates parameters. Calls _math_matrix_frustum() with
+ * the top matrix of the current matrix stack and sets
+ * __GLcontextRec::NewState.
+ */
+void GLAPIENTRY
+_mesa_Frustum( GLdouble left, GLdouble right,
+               GLdouble bottom, GLdouble top,
+               GLdouble nearval, GLdouble farval )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (nearval <= 0.0 ||
+       farval <= 0.0 ||
+       nearval == farval ||
+       left == right ||
+       top == bottom)
+   {
+      _mesa_error( ctx,  GL_INVALID_VALUE, "glFrustum" );
+      return;
+   }
+
+   _math_matrix_frustum( ctx->CurrentStack->Top,
+                         (GLfloat) left, (GLfloat) right, 
+			 (GLfloat) bottom, (GLfloat) top, 
+			 (GLfloat) nearval, (GLfloat) farval );
+   ctx->NewState |= ctx->CurrentStack->DirtyFlag;
+}
+
+
+/**
+ * Apply an orthographic projection matrix.
+ *
+ * \param left left clipping plane coordinate.
+ * \param right right clipping plane coordinate.
+ * \param bottom bottom clipping plane coordinate.
+ * \param top top clipping plane coordinate.
+ * \param nearval distance to the near clipping plane.
+ * \param farval distance to the far clipping plane.
+ *
+ * \sa glOrtho().
+ *
+ * Flushes vertices and validates parameters. Calls _math_matrix_ortho() with
+ * the top matrix of the current matrix stack and sets
+ * __GLcontextRec::NewState.
+ */
+void GLAPIENTRY
+_mesa_Ortho( GLdouble left, GLdouble right,
+             GLdouble bottom, GLdouble top,
+             GLdouble nearval, GLdouble farval )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glFrustum(%f, %f, %f, %f, %f, %f)\n",
+                  left, right, bottom, top, nearval, farval);
+
+   if (left == right ||
+       bottom == top ||
+       nearval == farval)
+   {
+      _mesa_error( ctx,  GL_INVALID_VALUE, "glOrtho" );
+      return;
+   }
+
+   _math_matrix_ortho( ctx->CurrentStack->Top,
+                       (GLfloat) left, (GLfloat) right, 
+		       (GLfloat) bottom, (GLfloat) top, 
+		       (GLfloat) nearval, (GLfloat) farval );
+   ctx->NewState |= ctx->CurrentStack->DirtyFlag;
+}
+
+
+/**
+ * Set the current matrix stack.
+ *
+ * \param mode matrix stack.
+ *
+ * \sa glMatrixMode().
+ *
+ * Flushes the vertices, validates the parameter and updates
+ * __GLcontextRec::CurrentStack and gl_transform_attrib::MatrixMode with the
+ * specified matrix stack.
+ */
+void GLAPIENTRY
+_mesa_MatrixMode( GLenum mode )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (ctx->Transform.MatrixMode == mode && mode != GL_TEXTURE)
+      return;
+   FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
+
+   switch (mode) {
+   case GL_MODELVIEW:
+      ctx->CurrentStack = &ctx->ModelviewMatrixStack;
+      break;
+   case GL_PROJECTION:
+      ctx->CurrentStack = &ctx->ProjectionMatrixStack;
+      break;
+   case GL_TEXTURE:
+      ctx->CurrentStack = &ctx->TextureMatrixStack[ctx->Texture.CurrentUnit];
+      break;
+   case GL_COLOR:
+      ctx->CurrentStack = &ctx->ColorMatrixStack;
+      break;
+   case GL_MATRIX0_NV:
+   case GL_MATRIX1_NV:
+   case GL_MATRIX2_NV:
+   case GL_MATRIX3_NV:
+   case GL_MATRIX4_NV:
+   case GL_MATRIX5_NV:
+   case GL_MATRIX6_NV:
+   case GL_MATRIX7_NV:
+      if (ctx->Extensions.NV_vertex_program) {
+         ctx->CurrentStack = &ctx->ProgramMatrixStack[mode - GL_MATRIX0_NV];
+      }
+      else {
+         _mesa_error( ctx,  GL_INVALID_ENUM, "glMatrixMode(mode)" );
+         return;
+      }
+      break;
+   case GL_MATRIX0_ARB:
+   case GL_MATRIX1_ARB:
+   case GL_MATRIX2_ARB:
+   case GL_MATRIX3_ARB:
+   case GL_MATRIX4_ARB:
+   case GL_MATRIX5_ARB:
+   case GL_MATRIX6_ARB:
+   case GL_MATRIX7_ARB:
+      if (ctx->Extensions.ARB_vertex_program ||
+          ctx->Extensions.ARB_fragment_program) {
+         const GLuint m = mode - GL_MATRIX0_ARB;
+         if (m > ctx->Const.MaxProgramMatrices) {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glMatrixMode(GL_MATRIX%d_ARB)", m);
+            return;
+         }
+         ctx->CurrentStack = &ctx->ProgramMatrixStack[m];
+      }
+      else {
+         _mesa_error( ctx,  GL_INVALID_ENUM, "glMatrixMode(mode)" );
+         return;
+      }
+      break;
+   default:
+      _mesa_error( ctx,  GL_INVALID_ENUM, "glMatrixMode(mode)" );
+      return;
+   }
+
+   ctx->Transform.MatrixMode = mode;
+}
+
+
+/**
+ * Push the current matrix stack.
+ *
+ * \sa glPushMatrix().
+ * 
+ * Verifies the current matrix stack is not full, and duplicates the top-most
+ * matrix in the stack. Marks __GLcontextRec::NewState with the stack dirty
+ * flag.
+ */
+void GLAPIENTRY
+_mesa_PushMatrix( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct matrix_stack *stack = ctx->CurrentStack;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE&VERBOSE_API)
+      _mesa_debug(ctx, "glPushMatrix %s\n",
+                  _mesa_lookup_enum_by_nr(ctx->Transform.MatrixMode));
+
+   if (stack->Depth + 1 >= stack->MaxDepth) {
+      _mesa_error( ctx,  GL_STACK_OVERFLOW, "glPushMatrix" );
+      return;
+   }
+   _math_matrix_copy( &stack->Stack[stack->Depth + 1],
+                      &stack->Stack[stack->Depth] );
+   stack->Depth++;
+   stack->Top = &(stack->Stack[stack->Depth]);
+   ctx->NewState |= stack->DirtyFlag;
+}
+
+
+/**
+ * Pop the current matrix stack.
+ *
+ * \sa glPopMatrix().
+ * 
+ * Flushes the vertices, verifies the current matrix stack is not empty, and
+ * moves the stack head down. Marks __GLcontextRec::NewState with the dirty
+ * stack flag.
+ */
+void GLAPIENTRY
+_mesa_PopMatrix( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct matrix_stack *stack = ctx->CurrentStack;
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (MESA_VERBOSE&VERBOSE_API)
+      _mesa_debug(ctx, "glPopMatrix %s\n",
+                  _mesa_lookup_enum_by_nr(ctx->Transform.MatrixMode));
+
+   if (stack->Depth == 0) {
+      _mesa_error( ctx,  GL_STACK_UNDERFLOW, "glPopMatrix" );
+      return;
+   }
+   stack->Depth--;
+   stack->Top = &(stack->Stack[stack->Depth]);
+   ctx->NewState |= stack->DirtyFlag;
+}
+
+
+/**
+ * Replace the current matrix with the identity matrix.
+ *
+ * \sa glLoadIdentity().
+ *
+ * Flushes the vertices and calls _math_matrix_set_identity() with the top-most
+ * matrix in the current stack. Marks __GLcontextRec::NewState with the stack
+ * dirty flag.
+ */
+void GLAPIENTRY
+_mesa_LoadIdentity( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glLoadIdentity()");
+
+   _math_matrix_set_identity( ctx->CurrentStack->Top );
+   ctx->NewState |= ctx->CurrentStack->DirtyFlag;
+}
+
+
+/**
+ * Replace the current matrix with a given matrix.
+ *
+ * \param m matrix.
+ *
+ * \sa glLoadMatrixf().
+ *
+ * Flushes the vertices and calls _math_matrix_loadf() with the top-most matrix
+ * in the current stack and the given matrix. Marks __GLcontextRec::NewState
+ * with the dirty stack flag.
+ */
+void GLAPIENTRY
+_mesa_LoadMatrixf( const GLfloat *m )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (!m) return;
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx,
+          "glLoadMatrix(%f %f %f %f, %f %f %f %f, %f %f %f %f, %f %f %f %f\n",
+          m[0], m[4], m[8], m[12],
+          m[1], m[5], m[9], m[13],
+          m[2], m[6], m[10], m[14],
+          m[3], m[7], m[11], m[15]);
+
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+   _math_matrix_loadf( ctx->CurrentStack->Top, m );
+   ctx->NewState |= ctx->CurrentStack->DirtyFlag;
+}
+
+
+/**
+ * Multiply the current matrix with a given matrix.
+ *
+ * \param m matrix.
+ *
+ * \sa glMultMatrixf().
+ *
+ * Flushes the vertices and calls _math_matrix_mul_floats() with the top-most
+ * matrix in the current stack and the given matrix. Marks
+ * __GLcontextRec::NewState with the dirty stack flag.
+ */
+void GLAPIENTRY
+_mesa_MultMatrixf( const GLfloat *m )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (!m) return;
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx,
+          "glMultMatrix(%f %f %f %f, %f %f %f %f, %f %f %f %f, %f %f %f %f\n",
+          m[0], m[4], m[8], m[12],
+          m[1], m[5], m[9], m[13],
+          m[2], m[6], m[10], m[14],
+          m[3], m[7], m[11], m[15]);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+   _math_matrix_mul_floats( ctx->CurrentStack->Top, m );
+   ctx->NewState |= ctx->CurrentStack->DirtyFlag;
+}
+
+
+/**
+ * Multiply the current matrix with a rotation matrix.
+ *
+ * \param angle angle of rotation, in degrees.
+ * \param x rotation vector x coordinate.
+ * \param y rotation vector y coordinate.
+ * \param z rotation vector z coordinate.
+ *
+ * \sa glRotatef().
+ *
+ * Flushes the vertices and calls _math_matrix_rotate() with the top-most
+ * matrix in the current stack and the given parameters. Marks
+ * __GLcontextRec::NewState with the dirty stack flag.
+ */
+void GLAPIENTRY
+_mesa_Rotatef( GLfloat angle, GLfloat x, GLfloat y, GLfloat z )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+   if (angle != 0.0F) {
+      _math_matrix_rotate( ctx->CurrentStack->Top, angle, x, y, z);
+      ctx->NewState |= ctx->CurrentStack->DirtyFlag;
+   }
+}
+
+
+/**
+ * Multiply the current matrix with a general scaling matrix.
+ *
+ * \param x x axis scale factor.
+ * \param y y axis scale factor.
+ * \param z z axis scale factor.
+ *
+ * \sa glScalef().
+ *
+ * Flushes the vertices and calls _math_matrix_scale() with the top-most
+ * matrix in the current stack and the given parameters. Marks
+ * __GLcontextRec::NewState with the dirty stack flag.
+ */
+void GLAPIENTRY
+_mesa_Scalef( GLfloat x, GLfloat y, GLfloat z )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+   _math_matrix_scale( ctx->CurrentStack->Top, x, y, z);
+   ctx->NewState |= ctx->CurrentStack->DirtyFlag;
+}
+
+
+/**
+ * Multiply the current matrix with a general scaling matrix.
+ *
+ * \param x translation vector x coordinate.
+ * \param y translation vector y coordinate.
+ * \param z translation vector z coordinate.
+ *
+ * \sa glTranslatef().
+ *
+ * Flushes the vertices and calls _math_matrix_translate() with the top-most
+ * matrix in the current stack and the given parameters. Marks
+ * __GLcontextRec::NewState with the dirty stack flag.
+ */
+void GLAPIENTRY
+_mesa_Translatef( GLfloat x, GLfloat y, GLfloat z )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+   _math_matrix_translate( ctx->CurrentStack->Top, x, y, z);
+   ctx->NewState |= ctx->CurrentStack->DirtyFlag;
+}
+
+ 
+#if _HAVE_FULL_GL
+void GLAPIENTRY
+_mesa_LoadMatrixd( const GLdouble *m )
+{
+   GLint i;
+   GLfloat f[16];
+   if (!m) return;
+   for (i = 0; i < 16; i++)
+      f[i] = (GLfloat) m[i];
+   _mesa_LoadMatrixf(f);
+}
+
+void GLAPIENTRY
+_mesa_MultMatrixd( const GLdouble *m )
+{
+   GLint i;
+   GLfloat f[16];
+   if (!m) return;
+   for (i = 0; i < 16; i++)
+      f[i] = (GLfloat) m[i];
+   _mesa_MultMatrixf( f );
+}
+
+
+void GLAPIENTRY
+_mesa_Rotated( GLdouble angle, GLdouble x, GLdouble y, GLdouble z )
+{
+   _mesa_Rotatef((GLfloat) angle, (GLfloat) x, (GLfloat) y, (GLfloat) z);
+}
+
+
+void GLAPIENTRY
+_mesa_Scaled( GLdouble x, GLdouble y, GLdouble z )
+{
+   _mesa_Scalef((GLfloat) x, (GLfloat) y, (GLfloat) z);
+}
+
+
+void GLAPIENTRY
+_mesa_Translated( GLdouble x, GLdouble y, GLdouble z )
+{
+   _mesa_Translatef((GLfloat) x, (GLfloat) y, (GLfloat) z);
+}
+#endif
+
+
+#if _HAVE_FULL_GL
+void GLAPIENTRY
+_mesa_LoadTransposeMatrixfARB( const GLfloat *m )
+{
+   GLfloat tm[16];
+   if (!m) return;
+   _math_transposef(tm, m);
+   _mesa_LoadMatrixf(tm);
+}
+
+
+void GLAPIENTRY
+_mesa_LoadTransposeMatrixdARB( const GLdouble *m )
+{
+   GLfloat tm[16];
+   if (!m) return;
+   _math_transposefd(tm, m);
+   _mesa_LoadMatrixf(tm);
+}
+
+
+void GLAPIENTRY
+_mesa_MultTransposeMatrixfARB( const GLfloat *m )
+{
+   GLfloat tm[16];
+   if (!m) return;
+   _math_transposef(tm, m);
+   _mesa_MultMatrixf(tm);
+}
+
+
+void GLAPIENTRY
+_mesa_MultTransposeMatrixdARB( const GLdouble *m )
+{
+   GLfloat tm[16];
+   if (!m) return;
+   _math_transposefd(tm, m);
+   _mesa_MultMatrixf(tm);
+}
+#endif
+
+/**
+ * Set the viewport.
+ * 
+ * \param x, y coordinates of the lower-left corner of the viewport rectangle.
+ * \param width width of the viewport rectangle.
+ * \param height height of the viewport rectangle.
+ *
+ * \sa Called via glViewport() or display list execution.
+ *
+ * Flushes the vertices and calls _mesa_set_viewport() with the given
+ * parameters.
+ */
+void GLAPIENTRY
+_mesa_Viewport( GLint x, GLint y, GLsizei width, GLsizei height )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+   _mesa_set_viewport(ctx, x, y, width, height);
+}
+
+/**
+ * Set new viewport parameters and update derived state (the _WindowMap
+ * matrix).  Usually called from _mesa_Viewport().
+ * 
+ * \note  We also call _mesa_ResizeBuffersMESA() because this is a good
+ * time to check if the window has been resized.  Many device drivers
+ * can't get direct notification from the window system of size changes
+ * so this is an ad-hoc solution to that problem.
+ * 
+ * \param ctx GL context.
+ * \param x, y coordinates of the lower left corner of the viewport rectangle.
+ * \param width width of the viewport rectangle.
+ * \param height height of the viewport rectangle.
+ *
+ * Verifies the parameters, clamps them to the implementation dependent range
+ * and updates __GLcontextRec::Viewport. Computes the scale and bias values for
+ * the drivers and notifies the driver via the dd_function_table::Viewport
+ * callback.
+ */
+void
+_mesa_set_viewport( GLcontext *ctx, GLint x, GLint y,
+                    GLsizei width, GLsizei height )
+{
+   const GLfloat n = ctx->Viewport.Near;
+   const GLfloat f = ctx->Viewport.Far;
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glViewport %d %d %d %d\n", x, y, width, height);
+
+   if (width < 0 || height < 0) {
+      _mesa_error( ctx,  GL_INVALID_VALUE,
+                   "glViewport(%d, %d, %d, %d)", x, y, width, height );
+      return;
+   }
+
+   /* clamp width, and height to implementation dependent range */
+   width  = CLAMP( width,  1, MAX_WIDTH );
+   height = CLAMP( height, 1, MAX_HEIGHT );
+
+   /* Save viewport */
+   ctx->Viewport.X = x;
+   ctx->Viewport.Width = width;
+   ctx->Viewport.Y = y;
+   ctx->Viewport.Height = height;
+
+   /* Check if window/buffer has been resized and if so, reallocate the
+    * ancillary buffers.
+    */
+/*    _mesa_ResizeBuffersMESA(); */
+
+   if (ctx->Driver.Viewport) {
+      (*ctx->Driver.Viewport)( ctx, x, y, width, height );
+   }
+
+   if (ctx->_RotateMode) {
+      GLint tmp, tmps;
+      tmp = x; x = y; y = tmp;
+      tmps = width; width = height; height = tmps;
+   }
+
+   /* compute scale and bias values :: This is really driver-specific
+    * and should be maintained elsewhere if at all.  NOTE: RasterPos
+    * uses this.
+    */
+   ctx->Viewport._WindowMap.m[MAT_SX] = (GLfloat) width / 2.0F;
+   ctx->Viewport._WindowMap.m[MAT_TX] = ctx->Viewport._WindowMap.m[MAT_SX] + x;
+   ctx->Viewport._WindowMap.m[MAT_SY] = (GLfloat) height / 2.0F;
+   ctx->Viewport._WindowMap.m[MAT_TY] = ctx->Viewport._WindowMap.m[MAT_SY] + y;
+   ctx->Viewport._WindowMap.m[MAT_SZ] = ctx->DepthMaxF * ((f - n) / 2.0F);
+   ctx->Viewport._WindowMap.m[MAT_TZ] = ctx->DepthMaxF * ((f - n) / 2.0F + n);
+   ctx->Viewport._WindowMap.flags = MAT_FLAG_GENERAL_SCALE|MAT_FLAG_TRANSLATION;
+   ctx->Viewport._WindowMap.type = MATRIX_3D_NO_ROT;
+   ctx->NewState |= _NEW_VIEWPORT;
+
+   /* Check if window/buffer has been resized and if so, reallocate the
+    * ancillary buffers.  This is an ad-hoc solution to detecting window
+    * size changes.  99% of all GL apps call glViewport when a window is
+    * resized so this is a good time to check for new window dims and
+    * reallocate color buffers and ancilliary buffers.
+    */
+   _mesa_ResizeBuffersMESA();
+
+   if (ctx->Driver.Viewport) {
+      (*ctx->Driver.Viewport)( ctx, x, y, width, height );
+   }
+}
+
+
+#if _HAVE_FULL_GL
+void GLAPIENTRY
+_mesa_DepthRange( GLclampd nearval, GLclampd farval )
+{
+   /*
+    * nearval - specifies mapping of the near clipping plane to window
+    *   coordinates, default is 0
+    * farval - specifies mapping of the far clipping plane to window
+    *   coordinates, default is 1
+    *
+    * After clipping and div by w, z coords are in -1.0 to 1.0,
+    * corresponding to near and far clipping planes.  glDepthRange
+    * specifies a linear mapping of the normalized z coords in
+    * this range to window z coords.
+    */
+   GLfloat n, f;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (MESA_VERBOSE&VERBOSE_API)
+      _mesa_debug(ctx, "glDepthRange %f %f\n", nearval, farval);
+
+   n = (GLfloat) CLAMP( nearval, 0.0, 1.0 );
+   f = (GLfloat) CLAMP( farval, 0.0, 1.0 );
+
+   ctx->Viewport.Near = n;
+   ctx->Viewport.Far = f;
+   ctx->Viewport._WindowMap.m[MAT_SZ] = ctx->DepthMaxF * ((f - n) / 2.0F);
+   ctx->Viewport._WindowMap.m[MAT_TZ] = ctx->DepthMaxF * ((f - n) / 2.0F + n);
+   ctx->NewState |= _NEW_VIEWPORT;
+
+   if (ctx->Driver.DepthRange) {
+      (*ctx->Driver.DepthRange)( ctx, nearval, farval );
+   }
+}
+#endif
+
+
+
+/**********************************************************************/
+/** \name State management */
+/*@{*/
+
+
+/**
+ * Update the projection matrix stack.
+ *
+ * \param ctx GL context.
+ *
+ * Calls _math_matrix_analyse() with the top-matrix of the projection matrix
+ * stack, and recomputes user clip positions if necessary.
+ * 
+ * \note This routine references __GLcontextRec::Tranform attribute values to
+ * compute userclip positions in clip space, but is only called on
+ * _NEW_PROJECTION.  The _mesa_ClipPlane() function keeps these values up to
+ * date across changes to the __GLcontextRec::Transform attributes.
+ */
+static void
+update_projection( GLcontext *ctx )
+{
+   _math_matrix_analyse( ctx->ProjectionMatrixStack.Top );
+
+#if FEATURE_userclip
+   /* Recompute clip plane positions in clipspace.  This is also done
+    * in _mesa_ClipPlane().
+    */
+   if (ctx->Transform.ClipPlanesEnabled) {
+      GLuint p;
+      for (p = 0; p < ctx->Const.MaxClipPlanes; p++) {
+	 if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {
+	    _mesa_transform_vector( ctx->Transform._ClipUserPlane[p],
+				 ctx->Transform.EyeUserPlane[p],
+				 ctx->ProjectionMatrixStack.Top->inv );
+	 }
+      }
+   }
+#endif
+}
+
+
+/**
+ * Calculate the combined modelview-projection matrix.
+ *
+ * \param ctx GL context.
+ *
+ * Multiplies the top matrices of the projection and model view stacks into
+ * __GLcontextRec::_ModelProjectMatrix via _math_matrix_mul_matrix() and
+ * analyzes the resulting matrix via _math_matrix_analyse().
+ */
+static void
+calculate_model_project_matrix( GLcontext *ctx )
+{
+   _math_matrix_mul_matrix( &ctx->_ModelProjectMatrix,
+                            ctx->ProjectionMatrixStack.Top,
+                            ctx->ModelviewMatrixStack.Top );
+
+   _math_matrix_analyse( &ctx->_ModelProjectMatrix );
+}
+
+
+/**
+ * Updates the combined modelview-projection matrix.
+ *
+ * \param ctx GL context.
+ * \param new_state new state bit mask.
+ *
+ * If there is a new model view matrix then analyzes it. If there is a new
+ * projection matrix, updates it. Finally calls
+ * calculate_model_project_matrix() to recalculate the modelview-projection
+ * matrix.
+ */
+void _mesa_update_modelview_project( GLcontext *ctx, GLuint new_state )
+{
+   if (new_state & _NEW_MODELVIEW)
+      _math_matrix_analyse( ctx->ModelviewMatrixStack.Top );
+
+   if (new_state & _NEW_PROJECTION)
+      update_projection( ctx );
+
+   /* Keep ModelviewProject uptodate always to allow tnl
+    * implementations that go model->clip even when eye is required.
+    */
+   calculate_model_project_matrix(ctx);
+}
+
+/*@}*/
+
+
+/**********************************************************************/
+/** Matrix stack initialization */
+/*@{*/
+
+
+/**
+ * Initialize a matrix stack.
+ *
+ * \param stack matrix stack.
+ * \param maxDepth maximum stack depth.
+ * \param dirtyFlag dirty flag.
+ * 
+ * Allocates an array of \p maxDepth elements for the matrix stack and calls
+ * _math_matrix_ctr() and _math_matrix_alloc_inv() for each element to
+ * initialize it.
+ */
+static void
+init_matrix_stack( struct matrix_stack *stack,
+                   GLuint maxDepth, GLuint dirtyFlag )
+{
+   GLuint i;
+
+   stack->Depth = 0;
+   stack->MaxDepth = maxDepth;
+   stack->DirtyFlag = dirtyFlag;
+   /* The stack */
+   stack->Stack = (GLmatrix *) CALLOC(maxDepth * sizeof(GLmatrix));
+   for (i = 0; i < maxDepth; i++) {
+      _math_matrix_ctr(&stack->Stack[i]);
+      _math_matrix_alloc_inv(&stack->Stack[i]);
+   }
+   stack->Top = stack->Stack;
+}
+
+/**
+ * Free matrix stack.
+ * 
+ * \param stack matrix stack.
+ * 
+ * Calls _math_matrix_dtr() for each element of the matrix stack and
+ * frees the array.
+ */
+static void
+free_matrix_stack( struct matrix_stack *stack )
+{
+   GLuint i;
+   for (i = 0; i < stack->MaxDepth; i++) {
+      _math_matrix_dtr(&stack->Stack[i]);
+   }
+   FREE(stack->Stack);
+   stack->Stack = stack->Top = NULL;
+}
+
+/*@}*/
+
+
+/**********************************************************************/
+/** \name Initialization */
+/*@{*/
+
+
+/**
+ * Initialize the context matrix data.
+ *
+ * \param ctx GL context.
+ *
+ * Initializes each of the matrix stacks and the combined modelview-projection
+ * matrix.
+ */
+void _mesa_init_matrix( GLcontext * ctx )
+{
+   GLint i;
+
+   /* Initialize matrix stacks */
+   init_matrix_stack(&ctx->ModelviewMatrixStack, MAX_MODELVIEW_STACK_DEPTH,
+                     _NEW_MODELVIEW);
+   init_matrix_stack(&ctx->ProjectionMatrixStack, MAX_PROJECTION_STACK_DEPTH,
+                     _NEW_PROJECTION);
+   init_matrix_stack(&ctx->ColorMatrixStack, MAX_COLOR_STACK_DEPTH,
+                     _NEW_COLOR_MATRIX);
+   for (i = 0; i < MAX_TEXTURE_UNITS; i++)
+      init_matrix_stack(&ctx->TextureMatrixStack[i], MAX_TEXTURE_STACK_DEPTH,
+                        _NEW_TEXTURE_MATRIX);
+   for (i = 0; i < MAX_PROGRAM_MATRICES; i++)
+      init_matrix_stack(&ctx->ProgramMatrixStack[i], 
+		        MAX_PROGRAM_MATRIX_STACK_DEPTH, _NEW_TRACK_MATRIX);
+   ctx->CurrentStack = &ctx->ModelviewMatrixStack;
+
+   /* Init combined Modelview*Projection matrix */
+   _math_matrix_ctr( &ctx->_ModelProjectMatrix );
+}
+
+
+/**
+ * Free the context matrix data.
+ * 
+ * \param ctx GL context.
+ *
+ * Frees each of the matrix stacks and the combined modelview-projection
+ * matrix.
+ */
+void _mesa_free_matrix_data( GLcontext *ctx )
+{
+   GLint i;
+
+   free_matrix_stack(&ctx->ModelviewMatrixStack);
+   free_matrix_stack(&ctx->ProjectionMatrixStack);
+   free_matrix_stack(&ctx->ColorMatrixStack);
+   for (i = 0; i < MAX_TEXTURE_UNITS; i++)
+      free_matrix_stack(&ctx->TextureMatrixStack[i]);
+   for (i = 0; i < MAX_PROGRAM_MATRICES; i++)
+      free_matrix_stack(&ctx->ProgramMatrixStack[i]);
+   /* combined Modelview*Projection matrix */
+   _math_matrix_dtr( &ctx->_ModelProjectMatrix );
+
+}
+
+
+/** 
+ * Initialize the context transform attribute group.
+ *
+ * \param ctx GL context.
+ *
+ * \todo Move this to a new file with other 'transform' routines.
+ */
+void _mesa_init_transform( GLcontext *ctx )
+{
+   GLint i;
+
+   /* Transformation group */
+   ctx->Transform.MatrixMode = GL_MODELVIEW;
+   ctx->Transform.Normalize = GL_FALSE;
+   ctx->Transform.RescaleNormals = GL_FALSE;
+   ctx->Transform.RasterPositionUnclipped = GL_FALSE;
+   for (i=0;i<MAX_CLIP_PLANES;i++) {
+      ASSIGN_4V( ctx->Transform.EyeUserPlane[i], 0.0, 0.0, 0.0, 0.0 );
+   }
+   ctx->Transform.ClipPlanesEnabled = 0;
+}
+
+
+/** 
+ * Initialize the context viewport attribute group.
+ *
+ * \param ctx GL context.
+ * 
+ * \todo Move this to a new file with other 'viewport' routines.
+ */
+void _mesa_init_viewport( GLcontext *ctx )
+{
+   /* Viewport group */
+   ctx->Viewport.X = 0;
+   ctx->Viewport.Y = 0;
+   ctx->Viewport.Width = 0;
+   ctx->Viewport.Height = 0;
+   ctx->Viewport.Near = 0.0;
+   ctx->Viewport.Far = 1.0;
+   _math_matrix_ctr(&ctx->Viewport._WindowMap);
+
+#define Sz 10
+#define Tz 14
+   ctx->Viewport._WindowMap.m[Sz] = 0.5F * ctx->DepthMaxF;
+   ctx->Viewport._WindowMap.m[Tz] = 0.5F * ctx->DepthMaxF;
+#undef Sz
+#undef Tz
+
+   ctx->Viewport._WindowMap.flags = MAT_FLAG_GENERAL_SCALE|MAT_FLAG_TRANSLATION;
+   ctx->Viewport._WindowMap.type = MATRIX_3D_NO_ROT;
+}
+
+
+/** 
+ * Free the context viewport attribute group data.
+ *
+ * \param ctx GL context.
+ * 
+ * \todo Move this to a new file with other 'viewport' routines.
+ */
+void _mesa_free_viewport_data( GLcontext *ctx )
+{
+   _math_matrix_dtr(&ctx->Viewport._WindowMap);
+}
+
+/*@}*/
diff --git a/reactos/lib/mesa32/src/main/matrix.h b/reactos/lib/mesa32/src/main/matrix.h
new file mode 100644
index 00000000000..38769867a75
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/matrix.h
@@ -0,0 +1,131 @@
+/**
+ * \file matrix.h
+ * Matrix operations.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef MATRIX_H
+#define MATRIX_H
+
+
+#include "mtypes.h"
+
+
+extern void GLAPIENTRY
+_mesa_Frustum( GLdouble left, GLdouble right,
+               GLdouble bottom, GLdouble top,
+               GLdouble nearval, GLdouble farval );
+
+extern void GLAPIENTRY
+_mesa_Ortho( GLdouble left, GLdouble right,
+             GLdouble bottom, GLdouble top,
+             GLdouble nearval, GLdouble farval );
+
+extern void GLAPIENTRY
+_mesa_PushMatrix( void );
+
+extern void GLAPIENTRY
+_mesa_PopMatrix( void );
+
+extern void GLAPIENTRY
+_mesa_LoadIdentity( void );
+
+extern void GLAPIENTRY
+_mesa_LoadMatrixf( const GLfloat *m );
+
+extern void GLAPIENTRY
+_mesa_LoadMatrixd( const GLdouble *m );
+
+extern void GLAPIENTRY
+_mesa_MatrixMode( GLenum mode );
+
+extern void GLAPIENTRY
+_mesa_MultMatrixf( const GLfloat *m );
+
+extern void GLAPIENTRY
+_mesa_MultMatrixd( const GLdouble *m );
+
+extern void GLAPIENTRY
+_mesa_Rotatef( GLfloat angle, GLfloat x, GLfloat y, GLfloat z );
+
+extern void GLAPIENTRY
+_mesa_Rotated( GLdouble angle, GLdouble x, GLdouble y, GLdouble z );
+
+extern void GLAPIENTRY
+_mesa_Scalef( GLfloat x, GLfloat y, GLfloat z );
+
+extern void GLAPIENTRY
+_mesa_Scaled( GLdouble x, GLdouble y, GLdouble z );
+
+extern void GLAPIENTRY
+_mesa_Translatef( GLfloat x, GLfloat y, GLfloat z );
+
+extern void GLAPIENTRY
+_mesa_Translated( GLdouble x, GLdouble y, GLdouble z );
+
+extern void GLAPIENTRY
+_mesa_LoadTransposeMatrixfARB( const GLfloat *m );
+
+extern void GLAPIENTRY
+_mesa_LoadTransposeMatrixdARB( const GLdouble *m );
+
+extern void GLAPIENTRY
+_mesa_MultTransposeMatrixfARB( const GLfloat *m );
+
+extern void GLAPIENTRY
+_mesa_MultTransposeMatrixdARB( const GLdouble *m );
+
+extern void GLAPIENTRY
+_mesa_Viewport( GLint x, GLint y, GLsizei width, GLsizei height );
+
+extern void 
+_mesa_set_viewport( GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height );
+
+extern void GLAPIENTRY
+_mesa_DepthRange( GLclampd nearval, GLclampd farval );
+
+
+extern void 
+_mesa_init_matrix( GLcontext * ctx );
+
+extern void 
+_mesa_init_transform( GLcontext *ctx );
+
+extern void 
+_mesa_init_viewport( GLcontext *ctx );
+
+extern void
+_mesa_free_matrix_data( GLcontext *ctx );
+
+extern void 
+_mesa_free_viewport_data( GLcontext *ctx );
+
+extern void 
+_mesa_update_modelview_project( GLcontext *ctx, GLuint newstate );
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/mtypes.h b/reactos/lib/mesa32/src/main/mtypes.h
new file mode 100644
index 00000000000..e7ff84f8885
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/mtypes.h
@@ -0,0 +1,2320 @@
+/**
+ * \file mtypes.h
+ * Main Mesa data structures.
+ *
+ * Please try to mark derived values with a leading underscore ('_').
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+
+#ifndef TYPES_H
+#define TYPES_H
+
+
+#include "glheader.h"
+#include "config.h"		/* Hardwired parameters */
+#include "glapitable.h"
+#include "glthread.h"
+#include "math/m_matrix.h"	/* GLmatrix */
+
+
+/**
+ * Color channel data type.
+ */
+#if CHAN_BITS == 8
+   typedef GLubyte GLchan;
+#define CHAN_MAX 255
+#define CHAN_MAXF 255.0F
+#define CHAN_TYPE GL_UNSIGNED_BYTE
+#elif CHAN_BITS == 16
+   typedef GLushort GLchan;
+#define CHAN_MAX 65535
+#define CHAN_MAXF 65535.0F
+#define CHAN_TYPE GL_UNSIGNED_SHORT
+#elif CHAN_BITS == 32
+   typedef GLfloat GLchan;
+#define CHAN_MAX 1.0
+#define CHAN_MAXF 1.0F
+#define CHAN_TYPE GL_FLOAT
+#else
+#error "illegal number of color channel bits"
+#endif
+
+
+/**
+ * Accumulation buffer data type.
+ */
+#if ACCUM_BITS==8
+   typedef GLbyte GLaccum;
+#elif ACCUM_BITS==16
+   typedef GLshort GLaccum;
+#elif ACCUM_BITS==32
+   typedef GLfloat GLaccum;
+#else
+#  error "illegal number of accumulation bits"
+#endif
+
+
+/**
+ * Stencil buffer data type.
+ */
+#if STENCIL_BITS==8
+   typedef GLubyte GLstencil;
+#  define STENCIL_MAX 0xff
+#elif STENCIL_BITS==16
+   typedef GLushort GLstencil;
+#  define STENCIL_MAX 0xffff
+#else
+#  error "illegal number of stencil bits"
+#endif
+
+
+/**
+ * Depth buffer data type.
+ *
+ * \note Must be 32-bits!
+ */
+typedef GLuint GLdepth;  
+
+
+/**
+ * Fixed point data type.
+ */
+typedef int GLfixed;
+/*
+ * Fixed point arithmetic macros
+ */
+#ifdef FIXED_14
+#define FIXED_ONE       0x00004000
+#define FIXED_HALF      0x00002000
+#define FIXED_FRAC_MASK 0x00003FFF
+#define FIXED_SCALE     16384.0f
+#define FIXED_SHIFT     14
+#else
+#define FIXED_ONE       0x00000800
+#define FIXED_HALF      0x00000400
+#define FIXED_FRAC_MASK 0x000007FF
+#define FIXED_SCALE     2048.0f
+#define FIXED_SHIFT     11
+#endif
+#define FIXED_INT_MASK  (~FIXED_FRAC_MASK)
+#define FIXED_EPSILON   1
+#define FloatToFixed(X) (IROUND((X) * FIXED_SCALE))
+#define IntToFixed(I)   ((I) << FIXED_SHIFT)
+#define FixedToInt(X)   ((X) >> FIXED_SHIFT)
+#define FixedToUns(X)   (((unsigned int)(X)) >> FIXED_SHIFT)
+#define FixedCeil(X)    (((X) + FIXED_ONE - FIXED_EPSILON) & FIXED_INT_MASK)
+#define FixedFloor(X)   ((X) & FIXED_INT_MASK)
+#define FixedToFloat(X) ((X) * (1.0F / FIXED_SCALE))
+#define PosFloatToFixed(X)      FloatToFixed(X)
+#define SignedFloatToFixed(X)   FloatToFixed(X)
+
+
+
+/**
+ * \name Some forward type declarations
+ */
+/*@{*/
+struct _mesa_HashTable;
+struct gl_texture_image;
+struct gl_texture_object;
+typedef struct __GLcontextRec GLcontext;
+typedef struct __GLcontextModesRec GLvisual;
+typedef struct gl_frame_buffer GLframebuffer;
+/*@}*/
+
+
+
+/**
+ * These define the aliases between numbered vertex attributes and
+ * conventional OpenGL vertex attributes.  We use these values in
+ * quite a few places.  
+ *
+ * New in Mesa 4.1.
+ */
+enum {
+	VERT_ATTRIB_POS = 0,
+	VERT_ATTRIB_WEIGHT = 1,
+	VERT_ATTRIB_NORMAL = 2,
+	VERT_ATTRIB_COLOR0 = 3,
+	VERT_ATTRIB_COLOR1 = 4,
+	VERT_ATTRIB_FOG = 5,
+	VERT_ATTRIB_SIX = 6,
+	VERT_ATTRIB_SEVEN = 7,
+	VERT_ATTRIB_TEX0 = 8,
+	VERT_ATTRIB_TEX1 = 9,
+	VERT_ATTRIB_TEX2 = 10,
+	VERT_ATTRIB_TEX3 = 11,
+	VERT_ATTRIB_TEX4 = 12,
+	VERT_ATTRIB_TEX5 = 13,
+	VERT_ATTRIB_TEX6 = 14,
+	VERT_ATTRIB_TEX7 = 15,
+	VERT_ATTRIB_MAX = 16
+} ;
+
+/* These are used in bitfields in many places */
+#define VERT_BIT_POS     (1 << VERT_ATTRIB_POS)
+#define VERT_BIT_WEIGHT  (1 << VERT_ATTRIB_WEIGHT)
+#define VERT_BIT_NORMAL  (1 << VERT_ATTRIB_NORMAL)
+#define VERT_BIT_COLOR0  (1 << VERT_ATTRIB_COLOR0)
+#define VERT_BIT_COLOR1  (1 << VERT_ATTRIB_COLOR1)
+#define VERT_BIT_FOG     (1 << VERT_ATTRIB_FOG)
+#define VERT_BIT_SIX     (1 << VERT_ATTRIB_SIX)
+#define VERT_BIT_SEVEN   (1 << VERT_ATTRIB_SEVEN)
+#define VERT_BIT_TEX0    (1 << VERT_ATTRIB_TEX0)
+#define VERT_BIT_TEX1    (1 << VERT_ATTRIB_TEX1)
+#define VERT_BIT_TEX2    (1 << VERT_ATTRIB_TEX2)
+#define VERT_BIT_TEX3    (1 << VERT_ATTRIB_TEX3)
+#define VERT_BIT_TEX4    (1 << VERT_ATTRIB_TEX4)
+#define VERT_BIT_TEX5    (1 << VERT_ATTRIB_TEX5)
+#define VERT_BIT_TEX6    (1 << VERT_ATTRIB_TEX6)
+#define VERT_BIT_TEX7    (1 << VERT_ATTRIB_TEX7)
+
+#define VERT_BIT_TEX(u)  (1 << (VERT_ATTRIB_TEX0 + (u)))
+
+
+
+/**
+ * Maximum number of temporary vertices required for clipping.  
+ *
+ * Used in array_cache and tnl modules.
+ */
+#define MAX_CLIPPED_VERTICES ((2 * (6 + MAX_CLIP_PLANES))+1)
+
+
+/**
+ * Data structure for color tables
+ */
+struct gl_color_table {
+   GLenum Format;         /**< GL_ALPHA, GL_RGB, GL_RGB, etc */
+   GLenum IntFormat;
+   GLuint Size;           /**< number of entries (rows) in table */
+   GLvoid *Table;         /**< either GLfloat * or GLchan * */
+   GLboolean FloatTable;  /**< are entries stored as floats? */
+   GLubyte RedSize;
+   GLubyte GreenSize;
+   GLubyte BlueSize;
+   GLubyte AlphaSize;
+   GLubyte LuminanceSize;
+   GLubyte IntensitySize;
+};
+
+
+/**
+ * \name Bit flags used for updating material values.
+ */
+/*@{*/
+#define MAT_ATTRIB_FRONT_AMBIENT           0 
+#define MAT_ATTRIB_BACK_AMBIENT            1
+#define MAT_ATTRIB_FRONT_DIFFUSE           2 
+#define MAT_ATTRIB_BACK_DIFFUSE            3
+#define MAT_ATTRIB_FRONT_SPECULAR          4 
+#define MAT_ATTRIB_BACK_SPECULAR           5
+#define MAT_ATTRIB_FRONT_EMISSION          6
+#define MAT_ATTRIB_BACK_EMISSION           7
+#define MAT_ATTRIB_FRONT_SHININESS         8
+#define MAT_ATTRIB_BACK_SHININESS          9
+#define MAT_ATTRIB_FRONT_INDEXES           10
+#define MAT_ATTRIB_BACK_INDEXES            11
+#define MAT_ATTRIB_MAX                     12
+
+#define MAT_ATTRIB_AMBIENT(f)  (MAT_ATTRIB_FRONT_AMBIENT+(f))  
+#define MAT_ATTRIB_DIFFUSE(f)  (MAT_ATTRIB_FRONT_DIFFUSE+(f))  
+#define MAT_ATTRIB_SPECULAR(f) (MAT_ATTRIB_FRONT_SPECULAR+(f)) 
+#define MAT_ATTRIB_EMISSION(f) (MAT_ATTRIB_FRONT_EMISSION+(f)) 
+#define MAT_ATTRIB_SHININESS(f)(MAT_ATTRIB_FRONT_SHININESS+(f))
+#define MAT_ATTRIB_INDEXES(f)  (MAT_ATTRIB_FRONT_INDEXES+(f))  
+
+#define MAT_INDEX_AMBIENT  0
+#define MAT_INDEX_DIFFUSE  1
+#define MAT_INDEX_SPECULAR 2
+
+#define MAT_BIT_FRONT_AMBIENT         (1<<MAT_ATTRIB_FRONT_AMBIENT)
+#define MAT_BIT_BACK_AMBIENT          (1<<MAT_ATTRIB_BACK_AMBIENT)
+#define MAT_BIT_FRONT_DIFFUSE         (1<<MAT_ATTRIB_FRONT_DIFFUSE)
+#define MAT_BIT_BACK_DIFFUSE          (1<<MAT_ATTRIB_BACK_DIFFUSE)
+#define MAT_BIT_FRONT_SPECULAR        (1<<MAT_ATTRIB_FRONT_SPECULAR)
+#define MAT_BIT_BACK_SPECULAR         (1<<MAT_ATTRIB_BACK_SPECULAR)
+#define MAT_BIT_FRONT_EMISSION        (1<<MAT_ATTRIB_FRONT_EMISSION)
+#define MAT_BIT_BACK_EMISSION         (1<<MAT_ATTRIB_BACK_EMISSION)
+#define MAT_BIT_FRONT_SHININESS       (1<<MAT_ATTRIB_FRONT_SHININESS)
+#define MAT_BIT_BACK_SHININESS        (1<<MAT_ATTRIB_BACK_SHININESS)
+#define MAT_BIT_FRONT_INDEXES         (1<<MAT_ATTRIB_FRONT_INDEXES)
+#define MAT_BIT_BACK_INDEXES          (1<<MAT_ATTRIB_BACK_INDEXES)
+
+
+#define FRONT_MATERIAL_BITS	(MAT_BIT_FRONT_EMISSION | 	\
+				 MAT_BIT_FRONT_AMBIENT |	\
+				 MAT_BIT_FRONT_DIFFUSE | 	\
+				 MAT_BIT_FRONT_SPECULAR |	\
+				 MAT_BIT_FRONT_SHININESS | 	\
+				 MAT_BIT_FRONT_INDEXES)
+
+#define BACK_MATERIAL_BITS	(MAT_BIT_BACK_EMISSION |	\
+				 MAT_BIT_BACK_AMBIENT |		\
+				 MAT_BIT_BACK_DIFFUSE |		\
+				 MAT_BIT_BACK_SPECULAR |	\
+				 MAT_BIT_BACK_SHININESS |	\
+				 MAT_BIT_BACK_INDEXES)
+
+#define ALL_MATERIAL_BITS	(FRONT_MATERIAL_BITS | BACK_MATERIAL_BITS)
+/*@}*/
+
+
+#define EXP_TABLE_SIZE 512	/**< Specular exponent lookup table sizes */
+#define SHINE_TABLE_SIZE 256	/**< Material shininess lookup table sizes */
+
+/**
+ * Material shininess lookup table.
+ */
+struct gl_shine_tab {
+   struct gl_shine_tab *next, *prev;
+   GLfloat tab[SHINE_TABLE_SIZE+1];
+   GLfloat shininess;
+   GLuint refcount;
+};
+
+
+/**
+ * Light.
+ */
+struct gl_light {
+   struct gl_light *next;	/**< double linked list with sentinel */
+   struct gl_light *prev;
+
+   GLfloat Ambient[4];		/**< ambient color */
+   GLfloat Diffuse[4];		/**< diffuse color */
+   GLfloat Specular[4];		/**< specular color */
+   GLfloat EyePosition[4];	/**< position in eye coordinates */
+   GLfloat EyeDirection[4];	/**< spotlight dir in eye coordinates */
+   GLfloat SpotExponent;
+   GLfloat SpotCutoff;		/**< in degrees */
+   GLfloat _CosCutoff;		/**< = MAX(0, cos(SpotCutoff)) */
+   GLfloat ConstantAttenuation;
+   GLfloat LinearAttenuation;
+   GLfloat QuadraticAttenuation;
+   GLboolean Enabled;		/**< On/off flag */
+
+   /** 
+    * \name Derived fields
+    */
+   /*@{*/
+   GLuint _Flags;		/**< State */
+
+   GLfloat _Position[4];	/**< position in eye/obj coordinates */
+   GLfloat _VP_inf_norm[3];	/**< Norm direction to infinite light */
+   GLfloat _h_inf_norm[3];	/**< Norm( _VP_inf_norm + <0,0,1> ) */
+   GLfloat _NormDirection[4];	/**< normalized spotlight direction */
+   GLfloat _VP_inf_spot_attenuation;
+
+   GLfloat _SpotExpTable[EXP_TABLE_SIZE][2];  /**< to replace a pow() call */
+   GLfloat _MatAmbient[2][3];	/**< material ambient * light ambient */
+   GLfloat _MatDiffuse[2][3];	/**< material diffuse * light diffuse */
+   GLfloat _MatSpecular[2][3];	/**< material spec * light specular */
+   GLfloat _dli;		/**< CI diffuse light intensity */
+   GLfloat _sli;		/**< CI specular light intensity */
+   /*@}*/
+};
+
+
+/**
+ * Light model.
+ */
+struct gl_lightmodel {
+   GLfloat Ambient[4];		/**< ambient color */
+   GLboolean LocalViewer;	/**< Local (or infinite) view point? */
+   GLboolean TwoSide;		/**< Two (or one) sided lighting? */
+   GLenum ColorControl;		/**< either GL_SINGLE_COLOR
+				 *    or GL_SEPARATE_SPECULAR_COLOR */
+};
+
+
+/**
+ * Material.
+ */
+struct gl_material
+{
+   GLfloat Attrib[MAT_ATTRIB_MAX][4];
+};
+
+
+/**
+ * Accumulation buffer attributes.
+ */
+struct gl_accum_attrib {
+   GLfloat ClearColor[4];	/**< Accumulation buffer clear color */
+};
+
+
+/**
+ * \name Clipping planes bits
+ * 
+ * Used in gl_colorbuffer_attrib::_DrawDestMask and
+ * gl_colorbuffer_attrib::_ReadSrcMask below to identify color buffers.
+ */
+/*@{*/
+#define FRONT_LEFT_BIT  0x1
+#define FRONT_RIGHT_BIT 0x2
+#define BACK_LEFT_BIT   0x4
+#define BACK_RIGHT_BIT  0x8
+#define AUX0_BIT        0x10
+#define AUX1_BIT        0x20
+#define AUX2_BIT        0x40
+#define AUX3_BIT        0x80
+/*@}*/
+
+
+/**
+ * Color buffers attributes.
+ */
+struct gl_colorbuffer_attrib {
+   GLuint ClearIndex;			/**< Index to use for glClear */
+   GLclampf ClearColor[4];		/**< Color to use for glClear */
+
+   GLuint IndexMask;			/**< Color index write mask */
+   GLubyte ColorMask[4];		/**< Each flag is 0xff or 0x0 */
+
+   GLenum DrawBuffer;			/**< Which buffer to draw into */
+   GLubyte _DrawDestMask;		/**< bitwise-OR of FRONT/BACK_LEFT/RIGHT_BITs */
+
+   /** 
+    * \name alpha testing
+    */
+   /*@{*/
+   GLboolean AlphaEnabled;		/**< Alpha test enabled flag */
+   GLenum AlphaFunc;			/**< Alpha test function */
+   GLclampf AlphaRef;			/**< Alpha reference value */
+   /*@}*/
+
+   /** 
+    * \name Blending
+    */
+   /*@{*/
+   GLboolean BlendEnabled;		/**< Blending enabled flag */
+   GLenum BlendSrcRGB;			/**< Blending source operator */
+   GLenum BlendDstRGB;			/**< Blending destination operator */
+   GLenum BlendSrcA;			/**< GL_INGR_blend_func_separate */
+   GLenum BlendDstA;			/**< GL_INGR_blend_func_separate */
+   GLenum BlendEquation;		/**< Blending equation */
+   GLfloat BlendColor[4];		/**< Blending color */
+   /*@}*/
+
+   /** 
+    * \name Logic op
+    */
+   /*@{*/
+   GLenum LogicOp;			/**< Logic operator */
+   GLboolean IndexLogicOpEnabled;	/**< Color index logic op enabled flag */
+   GLboolean ColorLogicOpEnabled;	/**< RGBA logic op enabled flag */
+   GLboolean _LogicOpEnabled;		/**< RGBA logic op + EXT_blend_logic_op enabled flag */
+   /*@}*/
+
+   GLboolean DitherFlag;		/**< Dither enable flag */
+};
+
+
+/**
+ * Current attributes.
+ */
+struct gl_current_attrib {
+   /**
+    * \name Values valid only when FLUSH_VERTICES has been called.
+    */
+   /*@{*/
+   GLfloat Attrib[VERT_ATTRIB_MAX][4];		/**< Current vertex attributes
+						  *  indexed by VERT_ATTRIB_* */
+   GLfloat Index;				/**< Current color index */
+   GLboolean EdgeFlag;				/**< Current edge flag */
+   /*@}*/
+
+   /**
+    * \name Values are always valid.  
+    * 
+    * \note BTW, note how similar this set of attributes is to the SWvertex
+    * data type in the software rasterizer...
+    */
+   /*@{*/
+   GLfloat RasterPos[4];			/**< Current raster position */
+   GLfloat RasterDistance;			/**< Current raster distance */
+   GLfloat RasterColor[4];			/**< Current raster color */
+   GLfloat RasterSecondaryColor[4];             /**< Current raster secondary color */
+   GLfloat RasterIndex;				/**< Current raster index */
+   GLfloat RasterTexCoords[MAX_TEXTURE_UNITS][4];/**< Current raster texcoords */
+   GLboolean RasterPosValid;			/**< Raster pos valid flag */
+   /*@}*/
+};
+
+
+/**
+ * Depth buffer attributes.
+ */
+struct gl_depthbuffer_attrib {
+   GLenum Func;			/**< Function for depth buffer compare */
+   GLclampd Clear;		/**< Value to clear depth buffer to */
+   GLboolean Test;		/**< Depth buffering enabled flag */
+   GLboolean Mask;		/**< Depth buffer writable? */
+   GLboolean OcclusionTest;	/**< GL_HP_occlusion_test */
+   GLboolean BoundsTest;        /**< GL_EXT_depth_bounds_test */
+   GLfloat BoundsMin, BoundsMax;/**< GL_EXT_depth_bounds_test */
+};
+
+
+/**
+ * glEnable()/glDisable() attributes.
+ */
+struct gl_enable_attrib {
+   GLboolean AlphaTest;
+   GLboolean AutoNormal;
+   GLboolean Blend;
+   GLuint ClipPlanes;
+   GLboolean ColorMaterial;
+   GLboolean ColorTable;                /* SGI_color_table */
+   GLboolean PostColorMatrixColorTable; /* SGI_color_table */
+   GLboolean PostConvolutionColorTable; /* SGI_color_table */
+   GLboolean Convolution1D;
+   GLboolean Convolution2D;
+   GLboolean Separable2D;
+   GLboolean CullFace;
+   GLboolean DepthTest;
+   GLboolean Dither;
+   GLboolean Fog;
+   GLboolean Histogram;
+   GLboolean Light[MAX_LIGHTS];
+   GLboolean Lighting;
+   GLboolean LineSmooth;
+   GLboolean LineStipple;
+   GLboolean IndexLogicOp;
+   GLboolean ColorLogicOp;
+   GLboolean Map1Color4;
+   GLboolean Map1Index;
+   GLboolean Map1Normal;
+   GLboolean Map1TextureCoord1;
+   GLboolean Map1TextureCoord2;
+   GLboolean Map1TextureCoord3;
+   GLboolean Map1TextureCoord4;
+   GLboolean Map1Vertex3;
+   GLboolean Map1Vertex4;
+   GLboolean Map1Attrib[16];  /* GL_NV_vertex_program */
+   GLboolean Map2Color4;
+   GLboolean Map2Index;
+   GLboolean Map2Normal;
+   GLboolean Map2TextureCoord1;
+   GLboolean Map2TextureCoord2;
+   GLboolean Map2TextureCoord3;
+   GLboolean Map2TextureCoord4;
+   GLboolean Map2Vertex3;
+   GLboolean Map2Vertex4;
+   GLboolean Map2Attrib[16];  /* GL_NV_vertex_program */
+   GLboolean MinMax;
+   GLboolean Normalize;
+   GLboolean PixelTexture;
+   GLboolean PointSmooth;
+   GLboolean PolygonOffsetPoint;
+   GLboolean PolygonOffsetLine;
+   GLboolean PolygonOffsetFill;
+   GLboolean PolygonSmooth;
+   GLboolean PolygonStipple;
+   GLboolean RescaleNormals;
+   GLboolean Scissor;
+   GLboolean Stencil;
+   GLboolean MultisampleEnabled;      /* GL_ARB_multisample */
+   GLboolean SampleAlphaToCoverage;   /* GL_ARB_multisample */
+   GLboolean SampleAlphaToOne;        /* GL_ARB_multisample */
+   GLboolean SampleCoverage;          /* GL_ARB_multisample */
+   GLboolean SampleCoverageInvert;    /* GL_ARB_multisample */
+   GLboolean RasterPositionUnclipped; /* GL_IBM_rasterpos_clip */
+   GLuint Texture[MAX_TEXTURE_IMAGE_UNITS];
+   GLuint TexGen[MAX_TEXTURE_COORD_UNITS];
+   /* SGI_texture_color_table */
+   GLboolean TextureColorTable[MAX_TEXTURE_IMAGE_UNITS];
+   /* GL_NV_vertex_program */
+   GLboolean VertexProgram;
+   GLboolean VertexProgramPointSize;
+   GLboolean VertexProgramTwoSide;
+   /* GL_ARB_point_sprite / GL_NV_point_sprite */
+   GLboolean PointSprite;
+};
+
+
+/**
+ * Eval attributes.
+ */
+struct gl_eval_attrib {
+   /**
+    * \name Enable bits 
+    */
+   /*@{*/
+   GLboolean Map1Color4;
+   GLboolean Map1Index;
+   GLboolean Map1Normal;
+   GLboolean Map1TextureCoord1;
+   GLboolean Map1TextureCoord2;
+   GLboolean Map1TextureCoord3;
+   GLboolean Map1TextureCoord4;
+   GLboolean Map1Vertex3;
+   GLboolean Map1Vertex4;
+   GLboolean Map1Attrib[16];  /* GL_NV_vertex_program */
+   GLboolean Map2Color4;
+   GLboolean Map2Index;
+   GLboolean Map2Normal;
+   GLboolean Map2TextureCoord1;
+   GLboolean Map2TextureCoord2;
+   GLboolean Map2TextureCoord3;
+   GLboolean Map2TextureCoord4;
+   GLboolean Map2Vertex3;
+   GLboolean Map2Vertex4;
+   GLboolean Map2Attrib[16];  /* GL_NV_vertex_program */
+   GLboolean AutoNormal;
+   /*@}*/
+   
+   /**
+    * \name Map Grid endpoints and divisions and calculated du values
+    */
+   /*@{*/
+   GLint MapGrid1un;
+   GLfloat MapGrid1u1, MapGrid1u2, MapGrid1du;
+   GLint MapGrid2un, MapGrid2vn;
+   GLfloat MapGrid2u1, MapGrid2u2, MapGrid2du;
+   GLfloat MapGrid2v1, MapGrid2v2, MapGrid2dv;
+   /*@}*/
+};
+
+
+/**
+ * Fog attributes.
+ */
+struct gl_fog_attrib {
+   GLboolean Enabled;		/**< Fog enabled flag */
+   GLfloat Color[4];		/**< Fog color */
+   GLfloat Density;		/**< Density >= 0.0 */
+   GLfloat Start;		/**< Start distance in eye coords */
+   GLfloat End;			/**< End distance in eye coords */
+   GLfloat Index;		/**< Fog index */
+   GLenum Mode;			/**< Fog mode */
+   GLboolean ColorSumEnabled;
+   GLenum FogCoordinateSource;  /**< GL_EXT_fog_coord */
+};
+
+
+/** 
+ * Hint attributes.
+ * 
+ * Values are always one of GL_FASTEST, GL_NICEST, or GL_DONT_CARE.
+ */
+struct gl_hint_attrib {
+   GLenum PerspectiveCorrection;
+   GLenum PointSmooth;
+   GLenum LineSmooth;
+   GLenum PolygonSmooth;
+   GLenum Fog;
+   GLenum ClipVolumeClipping;   /**< GL_EXT_clip_volume_hint */
+   GLenum TextureCompression;   /**< GL_ARB_texture_compression */
+   GLenum GenerateMipmap;       /**< GL_SGIS_generate_mipmap */
+};
+
+
+/**
+ * Histogram attributes.
+ */
+struct gl_histogram_attrib {
+   GLuint Width;				/**< number of table entries */
+   GLint Format;				/**< GL_ALPHA, GL_RGB, etc */
+   GLuint Count[HISTOGRAM_TABLE_SIZE][4];	/**< the histogram */
+   GLboolean Sink;				/**< terminate image transfer? */
+   GLubyte RedSize;				/**< Bits per counter */
+   GLubyte GreenSize;
+   GLubyte BlueSize;
+   GLubyte AlphaSize;
+   GLubyte LuminanceSize;
+};
+
+
+struct gl_minmax_attrib {
+   GLenum Format;
+   GLboolean Sink;
+   GLfloat Min[4], Max[4];   /**< RGBA */
+};
+
+
+struct gl_convolution_attrib {
+   GLenum Format;
+   GLenum InternalFormat;
+   GLuint Width;
+   GLuint Height;
+   GLfloat Filter[MAX_CONVOLUTION_WIDTH * MAX_CONVOLUTION_HEIGHT * 4];
+};
+
+
+#define LIGHT_SPOT         0x1
+#define LIGHT_LOCAL_VIEWER 0x2
+#define LIGHT_POSITIONAL   0x4
+#define LIGHT_NEED_VERTICES (LIGHT_POSITIONAL|LIGHT_LOCAL_VIEWER)
+
+/**
+ * Lighting attributes.
+ */
+struct gl_light_attrib {
+   struct gl_light Light[MAX_LIGHTS];	/**< Array of lights */
+   struct gl_lightmodel Model;		/**< Lighting model */
+
+   /**
+    * Must flush FLUSH_VERTICES before referencing:
+    */
+   /*@{*/
+   struct gl_material Material; 	/**< Includes front & back values */
+   /*@}*/
+
+   GLboolean Enabled;			/**< Lighting enabled flag */
+   GLenum ShadeModel;			/**< GL_FLAT or GL_SMOOTH */
+   GLenum ColorMaterialFace;		/**< GL_FRONT, BACK or FRONT_AND_BACK */
+   GLenum ColorMaterialMode;		/**< GL_AMBIENT, GL_DIFFUSE, etc */
+   GLuint ColorMaterialBitmask;		/**< bitmask formed from Face and Mode */
+   GLboolean ColorMaterialEnabled;
+
+   struct gl_light EnabledList;         /**< List sentinel */
+
+   /** 
+    * Derived for optimizations: 
+    */
+   /*@{*/
+   GLboolean _NeedEyeCoords;		
+   GLboolean _NeedVertices;		/**< Use fast shader? */
+   GLuint  _Flags;		        /**< LIGHT_* flags, see above */
+   GLfloat _BaseColor[2][3];
+   /*@}*/
+};
+
+
+/**
+ * Line attributes.
+ */
+struct gl_line_attrib {
+   GLboolean SmoothFlag;	/**< GL_LINE_SMOOTH enabled? */
+   GLboolean StippleFlag;	/**< GL_LINE_STIPPLE enabled? */
+   GLushort StipplePattern;	/**< Stipple pattern */
+   GLint StippleFactor;		/**< Stipple repeat factor */
+   GLfloat Width;		/**< Line width */
+   GLfloat _Width;		/**< Clamped Line width */
+};
+
+
+struct gl_list_attrib {
+   GLuint ListBase;
+};
+
+
+struct gl_list_opcode {
+   GLuint size;
+   void (*execute)( GLcontext *ctx, void *data );
+   void (*destroy)( GLcontext *ctx, void *data );
+   void (*print)( GLcontext *ctx, void *data );
+};
+
+#define GL_MAX_EXT_OPCODES 16
+
+struct gl_list_extensions {
+   struct gl_list_opcode opcode[GL_MAX_EXT_OPCODES];
+   GLuint nr_opcodes;
+};
+
+
+struct gl_multisample_attrib {
+   GLboolean Enabled;
+   GLboolean SampleAlphaToCoverage;
+   GLboolean SampleAlphaToOne;
+   GLboolean SampleCoverage;
+   GLfloat SampleCoverageValue;
+   GLboolean SampleCoverageInvert;
+};
+
+
+/**
+ * Pixel attributes.
+ */
+struct gl_pixel_attrib {
+   GLenum ReadBuffer;		/**< source buffer for glReadPixels()/glCopyPixels() */
+   GLubyte _ReadSrcMask;	/**< Not really a mask, but like _DrawDestMask
+				  *
+				  * May be: FRONT_LEFT_BIT, BACK_LEFT_BIT,
+				  * FRONT_RIGHT_BIT or BACK_RIGHT_BIT. */
+   GLfloat RedBias, RedScale;
+   GLfloat GreenBias, GreenScale;
+   GLfloat BlueBias, BlueScale;
+   GLfloat AlphaBias, AlphaScale;
+   GLfloat DepthBias, DepthScale;
+   GLint IndexShift, IndexOffset;
+   GLboolean MapColorFlag;
+   GLboolean MapStencilFlag;
+   GLfloat ZoomX, ZoomY;
+   /* XXX move these out of gl_pixel_attrib */
+   GLint MapStoSsize;		/**< Size of each pixel map */
+   GLint MapItoIsize;
+   GLint MapItoRsize;
+   GLint MapItoGsize;
+   GLint MapItoBsize;
+   GLint MapItoAsize;
+   GLint MapRtoRsize;
+   GLint MapGtoGsize;
+   GLint MapBtoBsize;
+   GLint MapAtoAsize;
+   GLint MapStoS[MAX_PIXEL_MAP_TABLE];	/**< Pixel map tables */
+   GLint MapItoI[MAX_PIXEL_MAP_TABLE];
+   GLfloat MapItoR[MAX_PIXEL_MAP_TABLE];
+   GLfloat MapItoG[MAX_PIXEL_MAP_TABLE];
+   GLfloat MapItoB[MAX_PIXEL_MAP_TABLE];
+   GLfloat MapItoA[MAX_PIXEL_MAP_TABLE];
+   GLubyte MapItoR8[MAX_PIXEL_MAP_TABLE];  /**< converted to 8-bit color */
+   GLubyte MapItoG8[MAX_PIXEL_MAP_TABLE];
+   GLubyte MapItoB8[MAX_PIXEL_MAP_TABLE];
+   GLubyte MapItoA8[MAX_PIXEL_MAP_TABLE];
+   GLfloat MapRtoR[MAX_PIXEL_MAP_TABLE];
+   GLfloat MapGtoG[MAX_PIXEL_MAP_TABLE];
+   GLfloat MapBtoB[MAX_PIXEL_MAP_TABLE];
+   GLfloat MapAtoA[MAX_PIXEL_MAP_TABLE];
+   /** GL_EXT_histogram */
+   GLboolean HistogramEnabled;
+   GLboolean MinMaxEnabled;
+   /** GL_SGIS_pixel_texture */
+   GLboolean PixelTextureEnabled;
+   GLenum FragmentRgbSource;
+   GLenum FragmentAlphaSource;
+   /** GL_SGI_color_matrix */
+   GLfloat PostColorMatrixScale[4];  /**< RGBA */
+   GLfloat PostColorMatrixBias[4];   /**< RGBA */
+   /** GL_SGI_color_table */
+   GLfloat ColorTableScale[4];
+   GLfloat ColorTableBias[4];
+   GLboolean ColorTableEnabled;
+   GLfloat PCCTscale[4];
+   GLfloat PCCTbias[4];
+   GLboolean PostConvolutionColorTableEnabled;
+   GLfloat PCMCTscale[4];
+   GLfloat PCMCTbias[4];
+   GLboolean PostColorMatrixColorTableEnabled;
+   /** GL_SGI_texture_color_table */
+   GLfloat TextureColorTableScale[4];
+   GLfloat TextureColorTableBias[4];
+   /** Convolution */
+   GLboolean Convolution1DEnabled;
+   GLboolean Convolution2DEnabled;
+   GLboolean Separable2DEnabled;
+   GLfloat ConvolutionBorderColor[3][4];
+   GLenum ConvolutionBorderMode[3];
+   GLfloat ConvolutionFilterScale[3][4];
+   GLfloat ConvolutionFilterBias[3][4];
+   GLfloat PostConvolutionScale[4];  /**< RGBA */
+   GLfloat PostConvolutionBias[4];   /**< RGBA */
+};
+
+
+/**
+ * Point attributes.
+ */
+struct gl_point_attrib {
+   GLboolean SmoothFlag;	/**< True if GL_POINT_SMOOTH is enabled */
+   GLfloat Size;		/**< User-specified point size */
+   GLfloat _Size;		/**< Size clamped to Const.Min/MaxPointSize */
+   GLfloat Params[3];		/**< GL_EXT_point_parameters */
+   GLfloat MinSize, MaxSize;	/**< GL_EXT_point_parameters */
+   GLfloat Threshold;		/**< GL_EXT_point_parameters */
+   GLboolean _Attenuated;	/**< True if Params != [1, 0, 0] */
+   GLboolean PointSprite;	/**< GL_NV_point_sprite / GL_NV_point_sprite */
+   GLboolean CoordReplace[MAX_TEXTURE_UNITS]; /**< GL_NV_point_sprite / GL_NV_point_sprite */
+   GLenum SpriteRMode;		/**< GL_NV_point_sprite (only!) */
+};
+
+
+/**
+ * Polygon attributes.
+ */
+struct gl_polygon_attrib {
+   GLenum FrontFace;		/**< Either GL_CW or GL_CCW */
+   GLenum FrontMode;		/**< Either GL_POINT, GL_LINE or GL_FILL */
+   GLenum BackMode;		/**< Either GL_POINT, GL_LINE or GL_FILL */
+   GLboolean _FrontBit;		/**< 0=GL_CCW, 1=GL_CW */
+   GLboolean CullFlag;		/**< Culling on/off flag */
+   GLboolean SmoothFlag;	/**< True if GL_POLYGON_SMOOTH is enabled */
+   GLboolean StippleFlag;	/**< True if GL_POLYGON_STIPPLE is enabled */
+   GLenum CullFaceMode;		/**< Culling mode GL_FRONT or GL_BACK */
+   GLfloat OffsetFactor;	/**< Polygon offset factor, from user */
+   GLfloat OffsetUnits;		/**< Polygon offset units, from user */
+   GLboolean OffsetPoint;	/**< Offset in GL_POINT mode */
+   GLboolean OffsetLine;	/**< Offset in GL_LINE mode */
+   GLboolean OffsetFill;	/**< Offset in GL_FILL mode */
+};
+
+
+/**
+ * Scissor attributes.
+ */
+struct gl_scissor_attrib {
+   GLboolean Enabled;		/**< Scissor test enabled? */
+   GLint X, Y;			/**< Lower left corner of box */
+   GLsizei Width, Height;	/**< Size of box */
+};
+
+
+/**
+ * Stencil attributes.
+ */
+struct gl_stencil_attrib {
+   GLboolean Enabled;		/**< Enabled flag */
+   GLboolean TestTwoSide;	/**< GL_EXT_stencil_two_side */
+   GLubyte ActiveFace;		/**< GL_EXT_stencil_two_side (0 or 1) */
+   GLenum Function[2];		/**< Stencil function */
+   GLenum FailFunc[2];		/**< Fail function */
+   GLenum ZPassFunc[2];		/**< Depth buffer pass function */
+   GLenum ZFailFunc[2];		/**< Depth buffer fail function */
+   GLstencil Ref[2];		/**< Reference value */
+   GLstencil ValueMask[2];	/**< Value mask */
+   GLstencil WriteMask[2];	/**< Write mask */
+   GLstencil Clear;		/**< Clear value */
+};
+
+
+#define NUM_TEXTURE_TARGETS 5   /* 1D, 2D, 3D, CUBE and RECT */
+
+#define TEXTURE_1D_INDEX    0
+#define TEXTURE_2D_INDEX    1
+#define TEXTURE_3D_INDEX    2
+#define TEXTURE_CUBE_INDEX  3
+#define TEXTURE_RECT_INDEX  4
+
+/* Texture.Unit[]._ReallyEnabled flags: */
+#define TEXTURE_1D_BIT   (1 << TEXTURE_1D_INDEX)
+#define TEXTURE_2D_BIT   (1 << TEXTURE_2D_INDEX)
+#define TEXTURE_3D_BIT   (1 << TEXTURE_3D_INDEX)
+#define TEXTURE_CUBE_BIT (1 << TEXTURE_CUBE_INDEX)
+#define TEXTURE_RECT_BIT (1 << TEXTURE_RECT_INDEX)
+
+
+/* TexGenEnabled flags */
+#define S_BIT 1
+#define T_BIT 2
+#define R_BIT 4
+#define Q_BIT 8
+
+/* Bitmap versions of the GL_ constants. */
+#define TEXGEN_SPHERE_MAP        0x1
+#define TEXGEN_OBJ_LINEAR        0x2
+#define TEXGEN_EYE_LINEAR        0x4
+#define TEXGEN_REFLECTION_MAP_NV 0x8
+#define TEXGEN_NORMAL_MAP_NV     0x10
+
+#define TEXGEN_NEED_NORMALS      (TEXGEN_SPHERE_MAP        | \
+				  TEXGEN_REFLECTION_MAP_NV | \
+				  TEXGEN_NORMAL_MAP_NV)
+#define TEXGEN_NEED_EYE_COORD    (TEXGEN_SPHERE_MAP        | \
+				  TEXGEN_REFLECTION_MAP_NV | \
+				  TEXGEN_NORMAL_MAP_NV     | \
+				  TEXGEN_EYE_LINEAR)
+
+/* A selection of state flags to make driver and module's lives easier. */
+#define ENABLE_TEXGEN0        0x1
+#define ENABLE_TEXGEN1        0x2
+#define ENABLE_TEXGEN2        0x4
+#define ENABLE_TEXGEN3        0x8
+#define ENABLE_TEXGEN4        0x10
+#define ENABLE_TEXGEN5        0x20
+#define ENABLE_TEXGEN6        0x40
+#define ENABLE_TEXGEN7        0x80
+
+#define ENABLE_TEXMAT0        0x1	/* Ie. not the identity matrix */
+#define ENABLE_TEXMAT1        0x2
+#define ENABLE_TEXMAT2        0x4
+#define ENABLE_TEXMAT3        0x8
+#define ENABLE_TEXMAT4        0x10
+#define ENABLE_TEXMAT5        0x20
+#define ENABLE_TEXMAT6        0x40
+#define ENABLE_TEXMAT7        0x80
+
+#define ENABLE_TEXGEN(i) (ENABLE_TEXGEN0 << (i))
+#define ENABLE_TEXMAT(i) (ENABLE_TEXMAT0 << (i))
+
+/**
+ * Texel fetch function prototype.
+ * 
+ * \param texImage texture image.
+ * \param col texel column.
+ * \param row texel row.
+ * \param img texel level.
+ * \param texelOut output texel. If \p texImage is color-index, \p texelOut
+ * returns <tt>GLchan[1]</tt>.  If \p texImage is depth, \p texelOut returns
+ * <tt>GLfloat[1]</tt>.  Otherwise, \p texelOut returns <tt>GLchan[4]</tt>.
+ */
+typedef void (*FetchTexelFunc)( const struct gl_texture_image *texImage,
+                                GLint col, GLint row, GLint img,
+                                GLvoid *texelOut );
+
+/**
+ * Texture format record 
+ */
+struct gl_texture_format {
+   GLint MesaFormat;		/**< One of the MESA_FORMAT_* values */
+
+   GLenum BaseFormat;		/**< Either GL_ALPHA, GL_INTENSITY, GL_LUMINANCE,
+                                 *   GL_LUMINANCE_ALPHA, GL_RGB, GL_RGBA,
+                                 *   GL_COLOR_INDEX or GL_DEPTH_COMPONENT.
+                                 */
+   GLubyte RedBits;		/**< Bits per texel component */
+   GLubyte GreenBits;		/**< These are just rough approximations for */
+   GLubyte BlueBits;		/**< compressed texture formats. */
+   GLubyte AlphaBits;
+   GLubyte LuminanceBits;
+   GLubyte IntensityBits;
+   GLubyte IndexBits;
+   GLubyte DepthBits;
+
+   GLint TexelBytes;		/**< Bytes per texel (0 for compressed formats */
+
+   /**
+    * \name Texel fetch function pointers
+    */
+   /*@{*/
+   FetchTexelFunc FetchTexel1D;
+   FetchTexelFunc FetchTexel2D;
+   FetchTexelFunc FetchTexel3D;
+   /*@}*/
+};
+
+
+/**
+ * Texture image record 
+ */
+struct gl_texture_image {
+   GLenum Format;		/**< GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA,
+				 *    GL_INTENSITY, GL_RGB, GL_RGBA,
+                                 *    GL_COLOR_INDEX or GL_DEPTH_COMPONENT only.
+                                 *    Used for choosing TexEnv arithmetic.
+				 */
+   GLint IntFormat;		/**< Internal format as given by the user */
+   GLuint Border;		/**< 0 or 1 */
+   GLuint Width;		/**< = 2^WidthLog2 + 2*Border */
+   GLuint Height;		/**< = 2^HeightLog2 + 2*Border */
+   GLuint Depth;		/**< = 2^DepthLog2 + 2*Border */
+   GLuint RowStride;		/**< == Width unless IsClientData and padded */
+   GLuint Width2;		/**< = Width - 2*Border */
+   GLuint Height2;		/**< = Height - 2*Border */
+   GLuint Depth2;		/**< = Depth - 2*Border */
+   GLuint WidthLog2;		/**< = log2(Width2) */
+   GLuint HeightLog2;		/**< = log2(Height2) */
+   GLuint DepthLog2;		/**< = log2(Depth2) */
+   GLuint MaxLog2;		/**< = MAX(WidthLog2, HeightLog2) */
+   GLfloat WidthScale;		/**< used for mipmap LOD computation */
+   GLfloat HeightScale;		/**< used for mipmap LOD computation */
+   GLfloat DepthScale;		/**< used for mipmap LOD computation */
+   GLvoid *Data;		/**< Image data, accessed via FetchTexel() */
+   GLboolean IsClientData;	/**< Data owned by client? */
+   GLboolean _IsPowerOfTwo;	/**< Are all dimensions powers of two? */
+
+   const struct gl_texture_format *TexFormat;
+
+   FetchTexelFunc FetchTexel;	/**< Texel fetch function pointer */
+
+   GLboolean IsCompressed;	/**< GL_ARB_texture_compression */
+   GLuint CompressedSize;	/**< GL_ARB_texture_compression */
+
+   /**
+    * \name For device driver:
+    */
+   /*@{*/
+   void *DriverData;		/**< Arbitrary device driver data */
+   /*@}*/
+};
+
+
+/**
+ * Texture object record
+ */
+struct gl_texture_object {
+   _glthread_Mutex Mutex;	/**< for thread safety */
+   GLint RefCount;		/**< reference count */
+   GLuint Name;			/**< an unsigned integer */
+   GLenum Target;               /**< GL_TEXTURE_1D, GL_TEXTURE_2D, etc. */
+   GLfloat Priority;		/**< in [0,1] */
+   GLfloat BorderColor[4];	/**< unclamped */
+   GLchan _BorderChan[4];	/**< clamped, as GLchan */
+   /** \name Wrap modes
+    * Are GL_CLAMP, REPEAT, GL_CLAMP_TO_EDGE, and GL_CLAMP_TO_BORDER_ARB. */
+   /*@{*/
+   GLenum WrapS;
+   GLenum WrapT;
+   GLenum WrapR;
+   /*@}*/
+   GLenum MinFilter;		/**< minification filter */
+   GLenum MagFilter;		/**< magnification filter */
+   GLfloat MinLod;		/**< min lambda, OpenGL 1.2 */
+   GLfloat MaxLod;		/**< max lambda, OpenGL 1.2 */
+   GLfloat LodBias;		/**< OpenGL 1.4 */
+   GLint BaseLevel;		/**< min mipmap level, OpenGL 1.2 */
+   GLint MaxLevel;		/**< max mipmap level, OpenGL 1.2 */
+   GLfloat MaxAnisotropy;	/**< GL_EXT_texture_filter_anisotropic */
+   GLboolean CompareFlag;	/**< GL_SGIX_shadow */
+   GLenum CompareOperator;	/**< GL_SGIX_shadow */
+   GLfloat ShadowAmbient;
+   GLenum CompareMode;		/**< GL_ARB_shadow */
+   GLenum CompareFunc;		/**< GL_ARB_shadow */
+   GLenum DepthMode;		/**< GL_ARB_depth_texture */
+   GLint _MaxLevel;		/**< actual max mipmap level (q in the spec) */
+   GLfloat _MaxLambda;		/**< = _MaxLevel - BaseLevel (q - b in spec) */
+   GLboolean GenerateMipmap;    /**< GL_SGIS_generate_mipmap */
+   GLboolean _IsPowerOfTwo;	/**< Are all image dimensions powers of two? */
+
+   struct gl_texture_image *Image[MAX_TEXTURE_LEVELS];
+
+   /**
+    * \name Texture cube faces 
+    * 
+    * Image[] is alias for *PosX[MAX_TEXTURE_LEVELS];
+    */
+   /*@{*/
+   struct gl_texture_image *NegX[MAX_TEXTURE_LEVELS];
+   struct gl_texture_image *PosY[MAX_TEXTURE_LEVELS];
+   struct gl_texture_image *NegY[MAX_TEXTURE_LEVELS];
+   struct gl_texture_image *PosZ[MAX_TEXTURE_LEVELS];
+   struct gl_texture_image *NegZ[MAX_TEXTURE_LEVELS];
+   /*@}*/
+
+   /** GL_EXT_paletted_texture */
+   struct gl_color_table Palette;
+
+   GLboolean Complete;			/**< Is texture object complete? */
+   struct gl_texture_object *Next;	/**< Next in linked list */
+
+   /**
+    * \name For device driver
+    */
+   /*@{*/
+   void *DriverData;	/**< Arbitrary device driver data */
+   /*@}*/
+};
+
+
+/**
+ * Texture unit record 
+ */
+struct gl_texture_unit {
+   GLuint Enabled;              /**< bitmask of TEXTURE_*_BIT flags */
+   GLuint _ReallyEnabled;       /**< 0 or exactly one of TEXTURE_*_BIT flags */
+
+   GLenum EnvMode;              /**< GL_MODULATE, GL_DECAL, GL_BLEND, etc. */
+   GLfloat EnvColor[4];
+   GLuint TexGenEnabled;	/**< Bitwise-OR of [STRQ]_BIT values */
+   /** \name Tex coord generation mode
+    * Either GL_OBJECT_LINEAR, GL_EYE_LINEAR or GL_SPHERE_MAP. */
+   /*@{*/
+   GLenum GenModeS;		
+   GLenum GenModeT;
+   GLenum GenModeR;
+   GLenum GenModeQ;
+   /*@}*/
+   GLuint _GenBitS;
+   GLuint _GenBitT;
+   GLuint _GenBitR;
+   GLuint _GenBitQ;
+   GLuint _GenFlags;		/**< bitwise or of GenBit[STRQ] */
+   GLfloat ObjectPlaneS[4];
+   GLfloat ObjectPlaneT[4];
+   GLfloat ObjectPlaneR[4];
+   GLfloat ObjectPlaneQ[4];
+   GLfloat EyePlaneS[4];
+   GLfloat EyePlaneT[4];
+   GLfloat EyePlaneR[4];
+   GLfloat EyePlaneQ[4];
+   GLfloat LodBias;		/**< for biasing mipmap levels */
+
+   /** 
+    * \name GL_EXT_texture_env_combine 
+    */
+   /*@{*/
+   GLenum CombineModeRGB;       /**< GL_REPLACE, GL_DECAL, GL_ADD, etc. */
+   GLenum CombineModeA;         /**< GL_REPLACE, GL_DECAL, GL_ADD, etc. */
+   GLenum CombineSourceRGB[3];  /**< GL_PRIMARY_COLOR, GL_TEXTURE, etc. */
+   GLenum CombineSourceA[3];    /**< GL_PRIMARY_COLOR, GL_TEXTURE, etc. */
+   GLenum CombineOperandRGB[3]; /**< SRC_COLOR, ONE_MINUS_SRC_COLOR, etc */
+   GLenum CombineOperandA[3];   /**< SRC_ALPHA, ONE_MINUS_SRC_ALPHA, etc */
+   GLuint CombineScaleShiftRGB; /**< 0, 1 or 2 */
+   GLuint CombineScaleShiftA;   /**< 0, 1 or 2 */
+   /*@}*/
+
+   struct gl_texture_object *Current1D;
+   struct gl_texture_object *Current2D;
+   struct gl_texture_object *Current3D;
+   struct gl_texture_object *CurrentCubeMap; /**< GL_ARB_texture_cube_map */
+   struct gl_texture_object *CurrentRect;    /**< GL_NV_texture_rectangle */
+
+   struct gl_texture_object *_Current; /**< Points to really enabled tex obj */
+
+   struct gl_texture_object Saved1D;  /**< only used by glPush/PopAttrib */
+   struct gl_texture_object Saved2D;
+   struct gl_texture_object Saved3D;
+   struct gl_texture_object SavedCubeMap;
+   struct gl_texture_object SavedRect;
+
+   /* GL_SGI_texture_color_table */
+   struct gl_color_table ColorTable;
+   struct gl_color_table ProxyColorTable;
+   GLboolean ColorTableEnabled;
+};
+
+
+/**
+ * Texture attributes
+ */
+struct gl_texture_attrib {
+   /**
+    * name multitexture 
+    */
+   /**@{*/
+   GLuint CurrentUnit;	        /**< Active texture unit */
+   GLuint _EnabledUnits;        /**< one bit set for each really-enabled unit */
+   GLuint _EnabledCoordUnits;   /**< one bit per enabled coordinate unit */
+   GLuint _GenFlags;            /**< for texgen */
+   GLuint _TexGenEnabled;
+   GLuint _TexMatEnabled;
+   /**@}*/
+
+   struct gl_texture_unit Unit[MAX_TEXTURE_UNITS];
+
+   struct gl_texture_object *Proxy1D;
+   struct gl_texture_object *Proxy2D;
+   struct gl_texture_object *Proxy3D;
+   struct gl_texture_object *ProxyCubeMap;
+   struct gl_texture_object *ProxyRect;
+
+   /** GL_EXT_shared_texture_palette */
+   GLboolean SharedPalette;
+   struct gl_color_table Palette;
+};
+
+
+/**
+ * Transformation attributes.
+ */
+struct gl_transform_attrib {
+   GLenum MatrixMode;				/**< Matrix mode */
+   GLfloat EyeUserPlane[MAX_CLIP_PLANES][4];	/**< User clip planes */
+   GLfloat _ClipUserPlane[MAX_CLIP_PLANES][4];	/**< derived */
+   GLuint ClipPlanesEnabled;                    /**< on/off bitmask */
+   GLboolean Normalize;				/**< Normalize all normals? */
+   GLboolean RescaleNormals;			/**< GL_EXT_rescale_normal */
+   GLboolean RasterPositionUnclipped;           /**< GL_IBM_rasterpos_clip */
+};
+
+
+/**
+ * Viewport attributes.
+ */
+struct gl_viewport_attrib {
+   GLint X, Y;			/**< position */
+   GLsizei Width, Height;	/**< size */
+   GLfloat Near, Far;		/**< Depth buffer range */
+   GLmatrix _WindowMap;		/**< Mapping transformation as a matrix. */
+};
+
+
+/**
+ * Node for the attribute stack
+ */
+struct gl_attrib_node {
+   GLbitfield kind;
+   void *data;
+   struct gl_attrib_node *next;
+};
+
+
+/**
+ * GL_ARB_vertex_buffer_object buffer object
+ */
+struct gl_buffer_object {
+   GLint RefCount;
+   GLuint Name;
+   GLenum Usage;
+   GLenum Access;
+   GLvoid *Pointer;   /**< Only valid while buffer is mapped */
+   GLuint Size;       /**< Size of data array in bytes */
+   GLubyte *Data;     /**< The storage */
+};
+
+
+
+/**
+ * Client pixel packing/unpacking attributes
+ */
+struct gl_pixelstore_attrib {
+   GLint Alignment;
+   GLint RowLength;
+   GLint SkipPixels;
+   GLint SkipRows;
+   GLint ImageHeight;     /**< for GL_EXT_texture3D */
+   GLint SkipImages;      /**< for GL_EXT_texture3D */
+   GLboolean SwapBytes;
+   GLboolean LsbFirst;
+   GLboolean ClientStorage; /**< GL_APPLE_client_storage */
+   GLboolean Invert;        /**< GL_MESA_pack_invert */
+};
+
+
+#define CA_CLIENT_DATA     0x1	/**< Data not allocated by mesa */
+
+
+/**
+ * Client vertex array attributes
+ */
+struct gl_client_array {
+   GLint Size;
+   GLenum Type;
+   GLsizei Stride;		/**< user-specified stride */
+   GLsizei StrideB;		/**< actual stride in bytes */
+   const GLubyte *Ptr;
+   GLuint Enabled;		/**< one of the _NEW_ARRAY_ bits */
+   GLboolean Normalized;        /**< GL_ARB_vertex_program */
+
+   /**< GL_ARB_vertex_buffer_object */
+   struct gl_buffer_object *BufferObj;
+   GLuint _MaxElement;
+
+   GLuint Flags;
+};
+
+
+/**
+ * Array attributes.
+ */
+struct gl_array_attrib {
+   struct gl_client_array Vertex;	     /**< client data descriptors */
+   struct gl_client_array Normal;
+   struct gl_client_array Color;
+   struct gl_client_array SecondaryColor;
+   struct gl_client_array FogCoord;
+   struct gl_client_array Index;
+   struct gl_client_array TexCoord[MAX_TEXTURE_COORD_UNITS];
+   struct gl_client_array EdgeFlag;
+
+   struct gl_client_array VertexAttrib[VERT_ATTRIB_MAX];  /**< GL_NV_vertex_program */
+
+   GLint ActiveTexture;		/**< Client Active Texture */
+   GLuint LockFirst;            /**< GL_EXT_compiled_vertex_array */
+   GLuint LockCount;            /**< GL_EXT_compiled_vertex_array */
+
+   GLuint _Enabled;		/**< _NEW_ARRAY_* - bit set if array enabled */
+   GLuint NewState;		/**< _NEW_ARRAY_* */
+
+#if FEATURE_ARB_vertex_buffer_object
+   struct gl_buffer_object *NullBufferObj;
+   struct gl_buffer_object *ArrayBufferObj;
+   struct gl_buffer_object *ElementArrayBufferObj;
+#endif
+   GLuint _MaxElement;          /* Min of all enabled array's maxes */
+};
+
+
+struct gl_feedback {
+   GLenum Type;
+   GLuint _Mask;		/* FB_* bits */
+   GLfloat *Buffer;
+   GLuint BufferSize;
+   GLuint Count;
+};
+
+
+/**
+ * Selection attributes.
+ */
+struct gl_selection {
+   GLuint *Buffer;	/**< selection buffer */
+   GLuint BufferSize;	/**< size of the selection buffer */
+   GLuint BufferCount;	/**< number of values in the selection buffer */
+   GLuint Hits;		/**< number of records in the selection buffer */
+   GLuint NameStackDepth; /**< name stack depth */
+   GLuint NameStack[MAX_NAME_STACK_DEPTH]; /**< name stack */
+   GLboolean HitFlag;	/**< hit flag */
+   GLfloat HitMinZ;	/**< minimum hit depth */
+   GLfloat HitMaxZ;	/**< maximum hit depth */
+};
+
+
+/**
+ * 1-D Evaluator control points
+ */
+struct gl_1d_map
+{
+   GLuint Order;	/**< Number of control points */
+   GLfloat u1, u2, du;	/**< u1, u2, 1.0/(u2-u1) */
+   GLfloat *Points;	/**< Points to contiguous control points */
+};
+
+
+/**
+ * 2-D Evaluator control points
+ */
+struct gl_2d_map
+{
+   GLuint Uorder;		/**< Number of control points in U dimension */
+   GLuint Vorder;		/**< Number of control points in V dimension */
+   GLfloat u1, u2, du;
+   GLfloat v1, v2, dv;
+   GLfloat *Points;		/**< Points to contiguous control points */
+};
+
+
+/**
+ * All evaluator control points
+ */
+struct gl_evaluators
+{
+   /** 
+    * \name 1-D maps
+    */
+   /*@{*/
+   struct gl_1d_map Map1Vertex3;
+   struct gl_1d_map Map1Vertex4;
+   struct gl_1d_map Map1Index;
+   struct gl_1d_map Map1Color4;
+   struct gl_1d_map Map1Normal;
+   struct gl_1d_map Map1Texture1;
+   struct gl_1d_map Map1Texture2;
+   struct gl_1d_map Map1Texture3;
+   struct gl_1d_map Map1Texture4;
+   struct gl_1d_map Map1Attrib[16];  /**< GL_NV_vertex_program */
+   /*@}*/
+
+   /** 
+    * \name 2-D maps 
+    */
+   /*@{*/
+   struct gl_2d_map Map2Vertex3;
+   struct gl_2d_map Map2Vertex4;
+   struct gl_2d_map Map2Index;
+   struct gl_2d_map Map2Color4;
+   struct gl_2d_map Map2Normal;
+   struct gl_2d_map Map2Texture1;
+   struct gl_2d_map Map2Texture2;
+   struct gl_2d_map Map2Texture3;
+   struct gl_2d_map Map2Texture4;
+   struct gl_2d_map Map2Attrib[16];  /**< GL_NV_vertex_program */
+   /*@}*/
+};
+
+
+/**
+ * NV_fragment_program runtime state
+ */
+struct fp_machine
+{
+   GLfloat Temporaries[MAX_NV_FRAGMENT_PROGRAM_TEMPS][4];
+   GLfloat Inputs[MAX_NV_FRAGMENT_PROGRAM_INPUTS][4];
+   GLfloat Outputs[MAX_NV_FRAGMENT_PROGRAM_OUTPUTS][4];
+   GLuint CondCodes[4];
+};
+
+
+/**
+ * Names of the various vertex/fragment register files
+ */
+enum register_file
+{
+   PROGRAM_TEMPORARY = 10,
+   PROGRAM_INPUT,
+   PROGRAM_OUTPUT,
+   PROGRAM_LOCAL_PARAM,
+   PROGRAM_ENV_PARAM,
+   PROGRAM_NAMED_PARAM,
+   PROGRAM_STATE_VAR,
+   PROGRAM_WRITE_ONLY,
+	PROGRAM_ADDRESS
+};
+
+
+/* Vertex and fragment instructions */
+struct vp_instruction;
+struct fp_instruction;
+
+struct program_parameter_list;
+
+
+/**
+ * Base class for any kind of program object
+ */
+struct program
+{
+   GLuint Id;
+   GLubyte *String;    /* Null-terminated program text */
+   GLenum Target;
+   GLenum Format;      /* String encoding format */
+   GLint RefCount;
+   GLboolean Resident;
+   GLfloat LocalParams[MAX_PROGRAM_LOCAL_PARAMS][4];
+   GLuint NumInstructions;  /* GL_ARB_vertex/fragment_program */
+   GLuint NumTemporaries;
+   GLuint NumParameters;
+   GLuint NumAttributes;
+   GLuint NumAddressRegs;
+};
+
+
+/** Vertex program object */
+struct vertex_program
+{
+   struct program Base;   /* base class */
+   struct vp_instruction *Instructions;  /* Compiled instructions */
+   GLboolean IsPositionInvariant;  /* GL_NV_vertex_program1_1 */
+   GLuint InputsRead;     /* Bitmask of which input regs are read */
+   GLuint OutputsWritten; /* Bitmask of which output regs are written to */
+   struct program_parameter_list *Parameters; /**< array [NumParameters] */
+};
+
+
+/** Fragment program object */
+struct fragment_program
+{
+   struct program Base;   /**< base class */
+   struct fp_instruction *Instructions;  /**< Compiled instructions */
+   GLuint InputsRead;     /**< Bitmask of which input regs are read */
+   GLuint OutputsWritten; /**< Bitmask of which output regs are written to */
+   GLuint TexturesUsed[MAX_TEXTURE_IMAGE_UNITS];  /**< TEXTURE_x_INDEX bitmask */
+   GLuint NumAluInstructions; /**< GL_ARB_fragment_program */
+   GLuint NumTexInstructions;
+   GLuint NumTexIndirections;
+   struct program_parameter_list *Parameters; /**< array [NumParameters] */
+};
+
+
+/**
+ * State common to vertex and fragment programs.
+ */
+struct program_state {
+   GLint ErrorPos;                       /* GL_PROGRAM_ERROR_POSITION_NV */
+   const char *ErrorString;              /* GL_PROGRAM_ERROR_STRING_NV */
+};
+
+
+/**
+ * State vars for GL_NV_vertex_program
+ */
+struct vertex_program_state
+{
+   GLboolean Enabled;                    /**< GL_VERTEX_PROGRAM_NV */
+   GLboolean PointSizeEnabled;           /**< GL_VERTEX_PROGRAM_POINT_SIZE_NV */
+   GLboolean TwoSideEnabled;             /**< GL_VERTEX_PROGRAM_TWO_SIDE_NV */
+   struct vertex_program *Current;       /**< ptr to currently bound program */
+
+   GLenum TrackMatrix[MAX_NV_VERTEX_PROGRAM_PARAMS / 4];
+   GLenum TrackMatrixTransform[MAX_NV_VERTEX_PROGRAM_PARAMS / 4];
+
+   GLfloat Parameters[MAX_NV_VERTEX_PROGRAM_PARAMS][4]; /* Env params */
+   /* Only used during program execution (may be moved someday): */
+   GLfloat Temporaries[MAX_NV_VERTEX_PROGRAM_TEMPS][4];
+   GLfloat Inputs[MAX_NV_VERTEX_PROGRAM_INPUTS][4];
+   GLfloat Outputs[MAX_NV_VERTEX_PROGRAM_OUTPUTS][4];
+   GLint AddressReg[4];
+
+#if FEATURE_MESA_program_debug
+   GLprogramcallbackMESA Callback;
+   GLvoid *CallbackData;
+   GLboolean CallbackEnabled;
+   GLuint CurrentPosition;
+#endif
+};
+
+
+/*
+ * State for GL_ARB/NV_fragment_program
+ */
+struct fragment_program_state
+{
+   GLboolean Enabled;                    /* GL_VERTEX_PROGRAM_NV */
+   struct fragment_program *Current;     /* ptr to currently bound program */
+   struct fp_machine Machine;            /* machine state */
+   GLfloat Parameters[MAX_NV_FRAGMENT_PROGRAM_PARAMS][4]; /* Env params */
+
+#if FEATURE_MESA_program_debug
+   GLprogramcallbackMESA Callback;
+   GLvoid *CallbackData;
+   GLboolean CallbackEnabled;
+   GLuint CurrentPosition;
+#endif
+};
+
+
+/*
+ * State for GL_ARB_occlusion_query
+ */
+struct occlusion_state
+{
+   GLboolean Active;
+   GLuint CurrentQueryObject;
+   GLuint PassedCounter;
+   struct _mesa_HashTable *QueryObjects;
+};
+
+
+/**
+ * State which can be shared by multiple contexts:
+ */
+struct gl_shared_state
+{
+   _glthread_Mutex Mutex;		   /**< for thread safety */
+   GLint RefCount;			   /**< Reference count */
+   struct _mesa_HashTable *DisplayList;	   /**< Display lists hash table */
+   struct _mesa_HashTable *TexObjects;	   /**< Texture objects hash table */
+   struct gl_texture_object *TexObjectList;/**< Linked list of texture objects */
+
+   /**
+    * \name Default texture objects (shared by all multi-texture units)
+    */
+   /*@{*/
+   struct gl_texture_object *Default1D;
+   struct gl_texture_object *Default2D;
+   struct gl_texture_object *Default3D;
+   struct gl_texture_object *DefaultCubeMap;
+   struct gl_texture_object *DefaultRect;
+   /*@}*/
+
+   /**
+    * \name GL_NV_vertex/_program 
+    */
+   /*@{*/
+   struct _mesa_HashTable *Programs;
+#if FEATURE_ARB_vertex_program
+   struct program *DefaultVertexProgram;
+#endif
+#if FEATURE_ARB_fragment_program
+   struct program *DefaultFragmentProgram;
+#endif
+   /*@}*/
+
+#if FEATURE_ARB_vertex_buffer_object
+   struct _mesa_HashTable *BufferObjects;
+#endif
+
+   void *DriverData;  /**< Device driver shared state */
+};
+
+
+/**
+ * Frame buffer.
+ *
+ * A "frame buffer" is a color buffer and its optional ancillary buffers:
+ * depth, accum, stencil, and software-simulated alpha buffers.
+ * In C++ terms, think of this as a base class from which device drivers
+ * will make derived classes.
+ */
+struct gl_frame_buffer
+{
+   GLvisual Visual;		/**< The corresponding visual */
+
+   GLuint Width, Height;	/**< size of frame buffer in pixels */
+
+   GLboolean UseSoftwareDepthBuffer;
+   GLboolean UseSoftwareAccumBuffer;
+   GLboolean UseSoftwareStencilBuffer;
+   GLboolean UseSoftwareAlphaBuffers;
+
+   /** \name Software depth (aka Z) buffer */
+   /*@{*/
+   GLvoid *DepthBuffer;		/**< array [Width*Height] of GLushort or GLuint*/
+   /*@}*/
+
+   /** \name Software stencil buffer */
+   /*@{*/
+   GLstencil *Stencil;		/**< array [Width*Height] of GLstencil values */
+   /*@}*/
+
+   /** \name Software accumulation buffer */
+   /*@{*/
+   GLaccum *Accum;		/**< array [4*Width*Height] of GLaccum values */
+   /*@}*/
+
+   /** \name Software alpha planes */
+   /*@{*/
+   GLvoid *FrontLeftAlpha;	/**< array [Width*Height] of GLubyte */
+   GLvoid *BackLeftAlpha;	/**< array [Width*Height] of GLubyte */
+   GLvoid *FrontRightAlpha;	/**< array [Width*Height] of GLubyte */
+   GLvoid *BackRightAlpha;	/**< array [Width*Height] of GLubyte */
+   /*@}*/
+
+   /** 
+    * \name Drawing bounds
+    *
+    * Intersection of window size and scissor box 
+    */
+   /*@{*/
+   GLint _Xmin;  /**< inclusive */
+   GLint _Ymin;  /**< inclusive */
+   GLint _Xmax;  /**< exclusive */
+   GLint _Ymax;  /**< exclusive */
+   /*@}*/
+};
+
+
+/**
+ * Constants which may be overridden by device driver during context creation
+ * but are never changed after that.
+ */
+struct gl_constants
+{
+   GLint MaxTextureLevels;		/**< Maximum number of allowed mipmap levels. */ 
+   GLint Max3DTextureLevels;		/**< Maximum number of allowed mipmap levels for 3D texture targets. */
+   GLint MaxCubeTextureLevels;          /**< Maximum number of allowed mipmap levels for GL_ARB_texture_cube_map */
+   GLint MaxTextureRectSize;            /* GL_NV_texture_rectangle */
+   GLuint MaxTextureCoordUnits;
+   GLuint MaxTextureImageUnits;
+   GLuint MaxTextureUnits;              /* = MAX(CoordUnits, ImageUnits) */
+   GLfloat MaxTextureMaxAnisotropy;	/* GL_EXT_texture_filter_anisotropic */
+   GLfloat MaxTextureLodBias;           /* GL_EXT_texture_lod_bias */
+   GLuint MaxArrayLockSize;
+   GLint SubPixelBits;
+   GLfloat MinPointSize, MaxPointSize;		/* aliased */
+   GLfloat MinPointSizeAA, MaxPointSizeAA;	/* antialiased */
+   GLfloat PointSizeGranularity;
+   GLfloat MinLineWidth, MaxLineWidth;		/* aliased */
+   GLfloat MinLineWidthAA, MaxLineWidthAA;	/* antialiased */
+   GLfloat LineWidthGranularity;
+   GLuint NumAuxBuffers;
+   GLuint MaxColorTableSize;
+   GLuint MaxConvolutionWidth;
+   GLuint MaxConvolutionHeight;
+   GLuint MaxClipPlanes;
+   GLuint MaxLights;
+   GLfloat MaxShininess;			/* GL_NV_light_max_exponent */
+   GLfloat MaxSpotExponent;			/* GL_NV_light_max_exponent */
+   /* GL_ARB_vertex_program */
+   GLuint MaxVertexProgramInstructions;
+   GLuint MaxVertexProgramAttribs;
+   GLuint MaxVertexProgramTemps;
+   GLuint MaxVertexProgramLocalParams;
+   GLuint MaxVertexProgramEnvParams;
+   GLuint MaxVertexProgramAddressRegs;
+   /* GL_ARB_fragment_program */
+   GLuint MaxFragmentProgramInstructions;
+   GLuint MaxFragmentProgramAttribs;
+   GLuint MaxFragmentProgramTemps;
+   GLuint MaxFragmentProgramLocalParams;
+   GLuint MaxFragmentProgramEnvParams;
+   GLuint MaxFragmentProgramAddressRegs;
+   GLuint MaxFragmentProgramAluInstructions;
+   GLuint MaxFragmentProgramTexInstructions;
+   GLuint MaxFragmentProgramTexIndirections;
+   /* vertex or fragment program */
+   GLuint MaxProgramMatrices;
+   GLuint MaxProgramMatrixStackDepth;
+   /* vertex array / buffer object bounds checking */
+   GLboolean CheckArrayBounds;
+};
+
+
+/**
+ * List of extensions.
+ */
+struct gl_extensions
+{
+   /**
+    * \name Flags to quickly test if certain extensions are available.
+    * 
+    * Not every extension needs to have such a flag, but it's encouraged.
+    */
+   /*@{*/
+   GLboolean dummy;  /* don't remove this! */
+   GLboolean ARB_depth_texture;
+   GLboolean ARB_fragment_program;
+   GLboolean ARB_imaging;
+   GLboolean ARB_multisample;
+   GLboolean ARB_multitexture;
+   GLboolean ARB_occlusion_query;
+   GLboolean ARB_point_sprite;
+   GLboolean ARB_shadow;
+   GLboolean ARB_texture_border_clamp;
+   GLboolean ARB_texture_compression;
+   GLboolean ARB_texture_cube_map;
+   GLboolean ARB_texture_env_combine;
+   GLboolean ARB_texture_env_crossbar;
+   GLboolean ARB_texture_env_dot3;
+   GLboolean ARB_texture_mirrored_repeat;
+   GLboolean ARB_texture_non_power_of_two;
+   GLboolean ARB_transpose_matrix;
+   GLboolean ARB_vertex_buffer_object;
+   GLboolean ARB_vertex_program;
+   GLboolean ARB_window_pos;
+   GLboolean EXT_abgr;
+   GLboolean EXT_bgra;
+   GLboolean EXT_blend_color;
+   GLboolean EXT_blend_equation_separate;
+   GLboolean EXT_blend_func_separate;
+   GLboolean EXT_blend_logic_op;
+   GLboolean EXT_blend_minmax;
+   GLboolean EXT_blend_subtract;
+   GLboolean EXT_clip_volume_hint;
+   GLboolean EXT_convolution;
+   GLboolean EXT_compiled_vertex_array;
+   GLboolean EXT_copy_texture;
+   GLboolean EXT_depth_bounds_test;
+   GLboolean EXT_draw_range_elements;
+   GLboolean EXT_fog_coord;
+   GLboolean EXT_histogram;
+   GLboolean EXT_multi_draw_arrays;
+   GLboolean EXT_paletted_texture;
+   GLboolean EXT_packed_pixels;
+   GLboolean EXT_point_parameters;
+   GLboolean EXT_polygon_offset;
+   GLboolean EXT_rescale_normal;
+   GLboolean EXT_shadow_funcs;
+   GLboolean EXT_secondary_color;
+   GLboolean EXT_separate_specular_color;
+   GLboolean EXT_shared_texture_palette;
+   GLboolean EXT_stencil_wrap;
+   GLboolean EXT_stencil_two_side;
+   GLboolean EXT_subtexture;
+   GLboolean EXT_texture;
+   GLboolean EXT_texture_object;
+   GLboolean EXT_texture3D;
+   GLboolean EXT_texture_compression_s3tc;
+   GLboolean EXT_texture_env_add;
+   GLboolean EXT_texture_env_combine;
+   GLboolean EXT_texture_env_dot3;
+   GLboolean EXT_texture_filter_anisotropic;
+   GLboolean EXT_texture_lod_bias;
+   GLboolean EXT_texture_mirror_clamp;
+   GLboolean EXT_vertex_array;
+   GLboolean EXT_vertex_array_set;
+   /* vendor extensions */
+   GLboolean APPLE_client_storage;
+   GLboolean APPLE_packed_pixels;
+   GLboolean ATI_texture_mirror_once;
+   GLboolean ATI_texture_env_combine3;
+   GLboolean HP_occlusion_test;
+   GLboolean IBM_rasterpos_clip;
+   GLboolean IBM_multimode_draw_arrays;
+   GLboolean MESA_pack_invert;
+   GLboolean MESA_packed_depth_stencil;
+   GLboolean MESA_program_debug;
+   GLboolean MESA_resize_buffers;
+   GLboolean MESA_ycbcr_texture;
+   GLboolean NV_blend_square;
+   GLboolean NV_fragment_program;
+   GLboolean NV_light_max_exponent;
+   GLboolean NV_point_sprite;
+   GLboolean NV_texgen_reflection;
+   GLboolean NV_texture_rectangle;
+   GLboolean NV_vertex_program;
+   GLboolean NV_vertex_program1_1;
+   GLboolean SGI_color_matrix;
+   GLboolean SGI_color_table;
+   GLboolean SGI_texture_color_table;
+   GLboolean SGIS_generate_mipmap;
+   GLboolean SGIS_pixel_texture;
+   GLboolean SGIS_texture_edge_clamp;
+   GLboolean SGIS_texture_lod;
+   GLboolean SGIX_depth_texture;
+   GLboolean SGIX_pixel_texture;
+   GLboolean SGIX_shadow;
+   GLboolean SGIX_shadow_ambient; /* or GL_ARB_shadow_ambient */
+   GLboolean TDFX_texture_compression_FXT1;
+   GLboolean S3_s3tc;
+   /*@}*/
+   /* The extension string */
+   const GLubyte *String;
+};
+
+
+/**
+ * A stack of matrices (projection, modelview, color, texture, etc).
+ */
+struct matrix_stack
+{
+   GLmatrix *Top;      /**< points into Stack */
+   GLmatrix *Stack;    /**< array [MaxDepth] of GLmatrix */
+   GLuint Depth;       /**< 0 <= Depth < MaxDepth */
+   GLuint MaxDepth;    /**< size of Stack[] array */
+   GLuint DirtyFlag;   /**< _NEW_MODELVIEW or _NEW_PROJECTION, for example */
+};
+
+
+/**
+ * \name Bits for image transfer operations 
+ *
+ * \sa __GLcontextRec::ImageTransferState.
+ */
+/*@{*/
+#define IMAGE_SCALE_BIAS_BIT                      0x1
+#define IMAGE_SHIFT_OFFSET_BIT                    0x2
+#define IMAGE_MAP_COLOR_BIT                       0x4
+#define IMAGE_COLOR_TABLE_BIT                     0x8
+#define IMAGE_CONVOLUTION_BIT                     0x10
+#define IMAGE_POST_CONVOLUTION_SCALE_BIAS         0x20
+#define IMAGE_POST_CONVOLUTION_COLOR_TABLE_BIT    0x40
+#define IMAGE_COLOR_MATRIX_BIT                    0x80
+#define IMAGE_POST_COLOR_MATRIX_COLOR_TABLE_BIT   0x100
+#define IMAGE_HISTOGRAM_BIT                       0x200
+#define IMAGE_MIN_MAX_BIT                         0x400
+
+/** Transfer ops up to convolution */
+#define IMAGE_PRE_CONVOLUTION_BITS (IMAGE_SCALE_BIAS_BIT |     \
+                                    IMAGE_SHIFT_OFFSET_BIT |   \
+                                    IMAGE_MAP_COLOR_BIT |      \
+                                    IMAGE_COLOR_TABLE_BIT)
+
+/** Transfer ops after convolution */
+#define IMAGE_POST_CONVOLUTION_BITS (IMAGE_POST_CONVOLUTION_SCALE_BIAS |      \
+                                     IMAGE_POST_CONVOLUTION_COLOR_TABLE_BIT | \
+                                     IMAGE_COLOR_MATRIX_BIT |                 \
+                                     IMAGE_POST_COLOR_MATRIX_COLOR_TABLE_BIT |\
+                                     IMAGE_HISTOGRAM_BIT |                    \
+                                     IMAGE_MIN_MAX_BIT)
+/*@}*/
+
+
+/**
+ * \name Bits to indicate what state has changed.  
+ *
+ * 4 unused flags.
+ */
+/*@{*/
+#define _NEW_MODELVIEW		0x1        /**< __GLcontextRec::ModelView */
+#define _NEW_PROJECTION		0x2        /**< __GLcontextRec::Projection */
+#define _NEW_TEXTURE_MATRIX	0x4        /**< __GLcontextRec::TextureMatrix */
+#define _NEW_COLOR_MATRIX	0x8        /**< __GLcontextRec::ColorMatrix */
+#define _NEW_ACCUM		0x10       /**< __GLcontextRec::Accum */
+#define _NEW_COLOR		0x20       /**< __GLcontextRec::Color */
+#define _NEW_DEPTH		0x40       /**< __GLcontextRec::Depth */
+#define _NEW_EVAL		0x80       /**< __GLcontextRec::Eval, __GLcontextRec::EvalMap */
+#define _NEW_FOG		0x100      /**< __GLcontextRec::Fog */
+#define _NEW_HINT		0x200      /**< __GLcontextRec::Hint */
+#define _NEW_LIGHT		0x400      /**< __GLcontextRec::Light */
+#define _NEW_LINE		0x800      /**< __GLcontextRec::Line */
+#define _NEW_PIXEL		0x1000     /**< __GLcontextRec::Pixel */
+#define _NEW_POINT		0x2000     /**< __GLcontextRec::Point */
+#define _NEW_POLYGON		0x4000     /**< __GLcontextRec::Polygon */
+#define _NEW_POLYGONSTIPPLE	0x8000     /**< __GLcontextRec::PolygonStipple */
+#define _NEW_SCISSOR		0x10000    /**< __GLcontextRec::Scissor */
+#define _NEW_STENCIL		0x20000    /**< __GLcontextRec::Stencil */
+#define _NEW_TEXTURE		0x40000    /**< __GLcontextRec::Texture */
+#define _NEW_TRANSFORM		0x80000    /**< __GLcontextRec::Transform */
+#define _NEW_VIEWPORT		0x100000   /**< __GLcontextRec::Viewport */
+#define _NEW_PACKUNPACK		0x200000   /**< __GLcontextRec::Pack, __GLcontextRec::Unpack */
+#define _NEW_ARRAY	        0x400000   /**< __GLcontextRec::Array */
+#define _NEW_RENDERMODE		0x800000   /**< __GLcontextRec::RenderMode, __GLcontextRec::Feedback, __GLcontextRec::Select */
+#define _NEW_BUFFERS            0x1000000  /**< __GLcontextRec::Visual, __GLcontextRec::DrawBuffer, */
+#define _NEW_MULTISAMPLE        0x2000000  /**< __GLcontextRec::Multisample */
+#define _NEW_TRACK_MATRIX       0x4000000  /**< __GLcontextRec::VertexProgram */
+#define _NEW_PROGRAM            0x8000000  /**< __GLcontextRec::VertexProgram */
+#define _NEW_ALL ~0
+/*@}*/
+
+
+/**
+ * \name Bits to track array state changes 
+ *
+ * Also used to summarize array enabled.
+ */
+/*@{*/
+#define _NEW_ARRAY_VERTEX           VERT_BIT_POS
+#define _NEW_ARRAY_WEIGHT           VERT_BIT_WEIGHT
+#define _NEW_ARRAY_NORMAL           VERT_BIT_NORMAL
+#define _NEW_ARRAY_COLOR0           VERT_BIT_COLOR0
+#define _NEW_ARRAY_COLOR1           VERT_BIT_COLOR1
+#define _NEW_ARRAY_FOGCOORD         VERT_BIT_FOG
+#define _NEW_ARRAY_INDEX            VERT_BIT_SIX
+#define _NEW_ARRAY_EDGEFLAG         VERT_BIT_SEVEN
+#define _NEW_ARRAY_TEXCOORD_0       VERT_BIT_TEX0
+#define _NEW_ARRAY_TEXCOORD_1       VERT_BIT_TEX1
+#define _NEW_ARRAY_TEXCOORD_2       VERT_BIT_TEX2
+#define _NEW_ARRAY_TEXCOORD_3       VERT_BIT_TEX3
+#define _NEW_ARRAY_TEXCOORD_4       VERT_BIT_TEX4
+#define _NEW_ARRAY_TEXCOORD_5       VERT_BIT_TEX5
+#define _NEW_ARRAY_TEXCOORD_6       VERT_BIT_TEX6
+#define _NEW_ARRAY_TEXCOORD_7       VERT_BIT_TEX7
+#define _NEW_ARRAY_ATTRIB_0         0x10000  /* start at bit 16 */
+#define _NEW_ARRAY_ALL              0xffffffff
+
+
+#define _NEW_ARRAY_TEXCOORD(i) (_NEW_ARRAY_TEXCOORD_0 << (i))
+#define _NEW_ARRAY_ATTRIB(i) (_NEW_ARRAY_ATTRIB_0 << (i))
+/*@}*/
+
+
+/**
+ * \name A bunch of flags that we think might be useful to drivers.
+ * 
+ * Set in the __GLcontextRec::_TriangleCaps bitfield.
+ */
+/*@{*/
+#define DD_FLATSHADE                0x1
+#define DD_SEPARATE_SPECULAR        0x2
+#define DD_TRI_CULL_FRONT_BACK      0x4 /* special case on some hw */
+#define DD_TRI_LIGHT_TWOSIDE        0x8
+#define DD_TRI_UNFILLED             0x10
+#define DD_TRI_SMOOTH               0x20
+#define DD_TRI_STIPPLE              0x40
+#define DD_TRI_OFFSET               0x80
+#define DD_LINE_SMOOTH              0x100
+#define DD_LINE_STIPPLE             0x200
+#define DD_LINE_WIDTH               0x400
+#define DD_POINT_SMOOTH             0x800
+#define DD_POINT_SIZE               0x1000
+#define DD_POINT_ATTEN              0x2000
+/*@}*/
+
+
+/**
+ * \name Define the state changes under which each of these bits might change
+ */
+/*@{*/
+#define _DD_NEW_FLATSHADE                _NEW_LIGHT
+#define _DD_NEW_SEPARATE_SPECULAR        (_NEW_LIGHT | _NEW_FOG)
+#define _DD_NEW_TRI_CULL_FRONT_BACK      _NEW_POLYGON
+#define _DD_NEW_TRI_LIGHT_TWOSIDE        _NEW_LIGHT
+#define _DD_NEW_TRI_UNFILLED             _NEW_POLYGON
+#define _DD_NEW_TRI_SMOOTH               _NEW_POLYGON
+#define _DD_NEW_TRI_STIPPLE              _NEW_POLYGON
+#define _DD_NEW_TRI_OFFSET               _NEW_POLYGON
+#define _DD_NEW_LINE_SMOOTH              _NEW_LINE
+#define _DD_NEW_LINE_STIPPLE             _NEW_LINE
+#define _DD_NEW_LINE_WIDTH               _NEW_LINE
+#define _DD_NEW_POINT_SMOOTH             _NEW_POINT
+#define _DD_NEW_POINT_SIZE               _NEW_POINT
+#define _DD_NEW_POINT_ATTEN              _NEW_POINT
+/*@}*/
+
+
+#define _MESA_NEW_NEED_EYE_COORDS         (_NEW_LIGHT |		\
+                                           _NEW_TEXTURE |	\
+                                           _NEW_POINT |		\
+                                           _NEW_MODELVIEW)
+
+#define _MESA_NEW_NEED_NORMALS            (_NEW_LIGHT |		\
+                                           _NEW_TEXTURE)
+
+#define _IMAGE_NEW_TRANSFER_STATE         (_NEW_PIXEL | _NEW_COLOR_MATRIX)
+
+
+
+
+/*
+ * Forward declaration of display list data types:
+ */
+union node;
+typedef union node Node;
+
+
+/* This has to be included here. */
+#include "dd.h"
+
+
+#define NUM_VERTEX_FORMAT_ENTRIES (sizeof(GLvertexformat) / sizeof(void *))
+
+/**
+ * Core Mesa's support for tnl modules:
+ */
+struct gl_tnl_module {
+   /**
+    * Vertex format to be lazily swapped into current dispatch.
+    */
+   GLvertexformat *Current;
+
+   /**
+    * \name Record of functions swapped out.  
+    * On restore, only need to swap these functions back in.
+    */
+   /*@{*/
+   void *Swapped[NUM_VERTEX_FORMAT_ENTRIES][2];
+   GLuint SwapCount;
+   /*@}*/
+};
+
+struct mesa_list_state {
+   GLuint CallDepth;		/**< Current recursion calling depth */
+   Node *CurrentListPtr;	/**< Head of list being compiled */
+   GLuint CurrentListNum;	/**< Number of the list being compiled */
+   Node *CurrentBlock;		/**< Pointer to current block of nodes */
+   GLuint CurrentPos;		/**< Index into current block of nodes */
+   GLvertexformat ListVtxfmt;
+
+   GLubyte ActiveAttribSize[VERT_ATTRIB_MAX];
+   GLfloat CurrentAttrib[VERT_ATTRIB_MAX][4];
+   
+   GLubyte ActiveMaterialSize[MAT_ATTRIB_MAX];
+   GLfloat CurrentMaterial[MAT_ATTRIB_MAX][4];
+
+   GLubyte ActiveIndex;
+   GLfloat CurrentIndex;
+   
+   GLubyte ActiveEdgeFlag;
+   GLboolean CurrentEdgeFlag;
+};
+
+
+/**
+ * Mesa context
+ *
+ * This is the central context data structure for Mesa.  Almost all
+ * OpenGL state is contained in this structure.
+ * Think of this as a base class from which device drivers will derive
+ * sub classes.
+ */
+struct __GLcontextRec {
+   /**
+    * \name OS related interfaces. 
+    *
+    * These \b must be the first members of this structure, because they are
+    * exposed to the outside world (i.e. GLX extension).
+    */
+   /*@{*/
+   __GLimports imports;
+   __GLexports exports;
+   /*@}*/
+
+   /** State possibly shared with other contexts in the address space */
+   struct gl_shared_state *Shared;
+
+   /** \name API function pointer tables */
+   /*@{*/
+   struct _glapi_table *Save;	/**< Display list save functions */
+   struct _glapi_table *Exec;	/**< Execute functions */
+   struct _glapi_table *CurrentDispatch;  /**< == Save or Exec !! */
+   /*@}*/
+
+   GLvisual Visual;
+   GLframebuffer *DrawBuffer;	/**< buffer for writing */
+   GLframebuffer *ReadBuffer;	/**< buffer for reading */
+
+   /**
+    * Device driver function pointer table
+    */
+   struct dd_function_table Driver;
+
+   void *DriverCtx;	/**< Points to device driver context/state */
+   void *DriverMgrCtx;	/**< Points to device driver manager (optional)*/
+
+   /** Core/Driver constants */
+   struct gl_constants Const;
+
+   /** \name The various 4x4 matrix stacks */
+   /*@{*/
+   struct matrix_stack ModelviewMatrixStack;
+   struct matrix_stack ProjectionMatrixStack;
+   struct matrix_stack ColorMatrixStack;
+   struct matrix_stack TextureMatrixStack[MAX_TEXTURE_COORD_UNITS];
+   struct matrix_stack ProgramMatrixStack[MAX_PROGRAM_MATRICES];
+   struct matrix_stack *CurrentStack; /**< Points to one of the above stacks */
+   /*@}*/
+
+   /** Combined modelview and projection matrix */
+   GLmatrix _ModelProjectMatrix;
+
+   /** \name Display lists */
+   struct mesa_list_state ListState;
+
+   GLboolean ExecuteFlag;	/**< Execute GL commands? */
+   GLboolean CompileFlag;	/**< Compile GL commands into display list? */
+
+   /** Extensions */
+   struct gl_extensions Extensions;
+
+   /** \name Renderer attribute stack */
+   /*@{*/
+   GLuint AttribStackDepth;
+   struct gl_attrib_node *AttribStack[MAX_ATTRIB_STACK_DEPTH];
+   /*@}*/
+
+   /** \name Renderer attribute groups
+    * 
+    * We define a struct for each attribute group to make pushing and popping
+    * attributes easy.  Also it's a good organization.
+    */
+   /*@{*/
+   struct gl_accum_attrib	Accum;		/**< Accumulation buffer attributes */
+   struct gl_colorbuffer_attrib	Color;		/**< Color buffers attributes */
+   struct gl_current_attrib	Current;	/**< Current attributes */
+   struct gl_depthbuffer_attrib	Depth;		/**< Depth buffer attributes */
+   struct gl_eval_attrib	Eval;		/**< Eval attributes */
+   struct gl_fog_attrib		Fog;		/**< Fog attributes */
+   struct gl_hint_attrib	Hint;		/**< Hint attributes */
+   struct gl_light_attrib	Light;		/**< Light attributes */
+   struct gl_line_attrib	Line;		/**< Line attributes */
+   struct gl_list_attrib	List;		/**< List attributes */
+   struct gl_multisample_attrib Multisample;
+   struct gl_pixel_attrib	Pixel;		/**< Pixel attributes */
+   struct gl_point_attrib	Point;		/**< Point attributes */
+   struct gl_polygon_attrib	Polygon;	/**< Polygon attributes */
+   GLuint PolygonStipple[32];			/**< Polygon stipple */
+   struct gl_scissor_attrib	Scissor;	/**< Scissor attributes */
+   struct gl_stencil_attrib	Stencil;	/**< Stencil buffer attributes */
+   struct gl_texture_attrib	Texture;	/**< Texture attributes */
+   struct gl_transform_attrib	Transform;	/**< Transformation attributes */
+   struct gl_viewport_attrib	Viewport;	/**< Viewport attributes */
+   /*@}*/
+
+   /** \name Other attribute groups */
+   /*@{*/
+   struct gl_histogram_attrib	Histogram;
+   struct gl_minmax_attrib	MinMax;
+   struct gl_convolution_attrib Convolution1D;
+   struct gl_convolution_attrib Convolution2D;
+   struct gl_convolution_attrib Separable2D;
+   /*@}*/
+
+   /** \name Client attribute stack */
+   /*@{*/
+   GLuint ClientAttribStackDepth;
+   struct gl_attrib_node *ClientAttribStack[MAX_CLIENT_ATTRIB_STACK_DEPTH];
+   /*@}*/
+
+   /** \name Client attribute groups */
+   /*@{*/
+   struct gl_array_attrib	Array;	/**< Vertex arrays */
+   struct gl_pixelstore_attrib	Pack;	/**< Pixel packing */
+   struct gl_pixelstore_attrib	Unpack;	/**< Pixel unpacking */
+
+   struct gl_evaluators EvalMap;   /**< All evaluators */
+   struct gl_feedback   Feedback;  /**< Feedback */
+   struct gl_selection  Select;    /**< Selection */
+
+   struct gl_color_table ColorTable;       /**< Pre-convolution */
+   struct gl_color_table ProxyColorTable;  /**< Pre-convolution */
+   struct gl_color_table PostConvolutionColorTable;
+   struct gl_color_table ProxyPostConvolutionColorTable;
+   struct gl_color_table PostColorMatrixColorTable;
+   struct gl_color_table ProxyPostColorMatrixColorTable;
+
+   struct program_state Program;             /**< for vertex or fragment progs */
+   struct vertex_program_state VertexProgram;      /**< GL_NV_vertex_program */
+   struct fragment_program_state FragmentProgram;  /**< GL_NV_fragment_program */
+
+   struct occlusion_state Occlusion;  /**< GL_ARB_occlusion_query */
+
+   GLenum ErrorValue;        /**< Last error code */
+   GLenum RenderMode;        /**< either GL_RENDER, GL_SELECT, GL_FEEDBACK */
+   GLuint NewState;          /**< bitwise-or of _NEW_* flags */
+   /*@}*/
+
+   /** \name Derived */
+   /*@{*/
+   GLuint _TriangleCaps;      /**< bitwise-or of DD_* flags */
+   GLuint _ImageTransferState;/**< bitwise-or of IMAGE_*_BIT flags */
+   GLfloat _EyeZDir[3];
+   GLfloat _ModelViewInvScale;
+   GLuint _NeedEyeCoords;
+   GLuint _ForceEyeCoords; 
+   GLboolean _RotateMode;
+   GLenum _CurrentProgram;    /* currently executing program */
+
+   struct gl_shine_tab *_ShineTable[2]; /**< Active shine tables */
+   struct gl_shine_tab *_ShineTabList;  /**< MRU list of inactive shine tables */
+   /**@}*/
+
+   struct gl_list_extensions listext; /**< driver dlist extensions */
+
+
+   GLboolean OcclusionResult;       /**< for GL_HP_occlusion_test */
+   GLboolean OcclusionResultSaved;  /**< for GL_HP_occlusion_test */
+   GLuint _Facing; /**< This is a hack for 2-sided stencil test.
+		    *
+		    * We don't have a better way to communicate this value from
+		    * swrast_setup to swrast. */
+
+
+   /** \name Z buffer stuff */
+   /*@{*/
+   GLuint DepthMax;	/**< Max depth buffer value */
+   GLfloat DepthMaxF;	/**< Float max depth buffer value */
+   GLfloat MRD;		/**< minimum resolvable difference in Z values */
+   /*@}*/
+
+   /** Should 3Dfx Glide driver catch signals? */
+   GLboolean CatchSignals;
+
+   /** \name For debugging/development only */
+   /*@{*/
+   GLboolean FirstTimeCurrent;
+   /*@}*/
+
+   /** Dither disable via MESA_NO_DITHER env var */
+   GLboolean NoDither;
+
+   /** Core tnl module support */
+   struct gl_tnl_module TnlModule;
+
+   /**
+    * \name Hooks for module contexts.  
+    *
+    * These will eventually live in the driver or elsewhere.
+    */
+   /*@{*/
+   void *swrast_context;
+   void *swsetup_context;
+   void *swtnl_context;
+   void *swtnl_im;
+   void *acache_context;
+   void *aelt_context;
+   /*@}*/
+};
+
+
+/** The string names for GL_POINT, GL_LINE_LOOP, etc */
+extern const char *_mesa_prim_name[GL_POLYGON+4];
+
+
+#ifdef MESA_DEBUG
+extern int MESA_VERBOSE;
+extern int MESA_DEBUG_FLAGS;
+# define MESA_FUNCTION __FUNCTION__
+#else
+# define MESA_VERBOSE 0
+# define MESA_DEBUG_FLAGS 0
+# define MESA_FUNCTION "a function"
+# ifndef NDEBUG
+#  define NDEBUG
+# endif
+#endif
+
+
+enum _verbose {
+   VERBOSE_VARRAY		= 0x0001,
+   VERBOSE_TEXTURE		= 0x0002,
+   VERBOSE_IMMEDIATE		= 0x0004,
+   VERBOSE_PIPELINE		= 0x0008,
+   VERBOSE_DRIVER		= 0x0010,
+   VERBOSE_STATE		= 0x0020,
+   VERBOSE_API			= 0x0040,
+   VERBOSE_DISPLAY_LIST		= 0x0100,
+   VERBOSE_LIGHTING		= 0x0200,
+   VERBOSE_PRIMS		= 0x0400,
+   VERBOSE_VERTS		= 0x0800
+};
+
+
+enum _debug {
+   DEBUG_ALWAYS_FLUSH		= 0x1
+};
+
+
+
+#define Elements(x) sizeof(x)/sizeof(*(x))
+
+
+#endif /* TYPES_H */
diff --git a/reactos/lib/mesa32/src/main/nvfragparse.c b/reactos/lib/mesa32/src/main/nvfragparse.c
new file mode 100644
index 00000000000..bdc2c7ef94a
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/nvfragparse.c
@@ -0,0 +1,1767 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file nvfragparse.c
+ * NVIDIA fragment program parser.
+ * \author Brian Paul
+ */
+
+/*
+ * Regarding GL_NV_fragment_program:
+ *
+ * Portions of this software may use or implement intellectual
+ * property owned and licensed by NVIDIA Corporation. NVIDIA disclaims
+ * any and all warranties with respect to such intellectual property,
+ * including any use thereof or modifications thereto.
+ */
+
+#include "glheader.h"
+#include "context.h"
+#include "hash.h"
+#include "imports.h"
+#include "macros.h"
+#include "mtypes.h"
+#include "nvfragprog.h"
+#include "nvfragparse.h"
+#include "nvprogram.h"
+#include "program.h"
+
+
+#define INPUT_1V     1
+#define INPUT_2V     2
+#define INPUT_3V     3
+#define INPUT_1S     4
+#define INPUT_2S     5
+#define INPUT_CC     6
+#define INPUT_1V_T   7  /* one source vector, plus textureId */
+#define INPUT_3V_T   8  /* one source vector, plus textureId */
+#define INPUT_NONE   9
+#define OUTPUT_V    20
+#define OUTPUT_S    21
+#define OUTPUT_NONE 22
+
+/* IRIX defines some of these */
+#undef _R
+#undef _H
+#undef _X
+#undef _C
+#undef _S
+
+/* Optional suffixes */
+#define _R  FLOAT32  /* float */
+#define _H  FLOAT16  /* half-float */
+#define _X  FIXED12  /* fixed */
+#define _C  0x08     /* set cond codes */
+#define _S  0x10     /* saturate, clamp result to [0,1] */
+
+struct instruction_pattern {
+   const char *name;
+   enum fp_opcode opcode;
+   GLuint inputs;
+   GLuint outputs;
+   GLuint suffixes;
+};
+
+static const struct instruction_pattern Instructions[] = {
+   { "ADD", FP_OPCODE_ADD, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
+   { "COS", FP_OPCODE_COS, INPUT_1S, OUTPUT_S, _R | _H |      _C | _S },
+   { "DDX", FP_OPCODE_DDX, INPUT_1V, OUTPUT_V, _R | _H |      _C | _S },
+   { "DDY", FP_OPCODE_DDY, INPUT_1V, OUTPUT_V, _R | _H |      _C | _S },
+   { "DP3", FP_OPCODE_DP3, INPUT_2V, OUTPUT_S, _R | _H | _X | _C | _S },
+   { "DP4", FP_OPCODE_DP4, INPUT_2V, OUTPUT_S, _R | _H | _X | _C | _S },
+   { "DST", FP_OPCODE_DP4, INPUT_2V, OUTPUT_V, _R | _H |      _C | _S },
+   { "EX2", FP_OPCODE_DP4, INPUT_1S, OUTPUT_S, _R | _H |      _C | _S },
+   { "FLR", FP_OPCODE_FLR, INPUT_1V, OUTPUT_V, _R | _H | _X | _C | _S },
+   { "FRC", FP_OPCODE_FRC, INPUT_1V, OUTPUT_V, _R | _H | _X | _C | _S },
+   { "KIL", FP_OPCODE_KIL_NV, INPUT_CC, OUTPUT_NONE, 0                   },
+   { "LG2", FP_OPCODE_LG2, INPUT_1S, OUTPUT_S, _R | _H |      _C | _S },
+   { "LIT", FP_OPCODE_LIT, INPUT_1V, OUTPUT_V, _R | _H |      _C | _S },
+   { "LRP", FP_OPCODE_LRP, INPUT_3V, OUTPUT_V, _R | _H | _X | _C | _S },
+   { "MAD", FP_OPCODE_MAD, INPUT_3V, OUTPUT_V, _R | _H | _X | _C | _S },
+   { "MAX", FP_OPCODE_MAX, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
+   { "MIN", FP_OPCODE_MIN, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
+   { "MOV", FP_OPCODE_MOV, INPUT_1V, OUTPUT_V, _R | _H | _X | _C | _S },
+   { "MUL", FP_OPCODE_MUL, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
+   { "PK2H",  FP_OPCODE_PK2H,  INPUT_1V, OUTPUT_S, 0                  },
+   { "PK2US", FP_OPCODE_PK2US, INPUT_1V, OUTPUT_S, 0                  },
+   { "PK4B",  FP_OPCODE_PK4B,  INPUT_1V, OUTPUT_S, 0                  },
+   { "PK4UB", FP_OPCODE_PK4UB, INPUT_1V, OUTPUT_S, 0                  },
+   { "POW", FP_OPCODE_POW, INPUT_2S, OUTPUT_S, _R | _H |      _C | _S },
+   { "RCP", FP_OPCODE_RCP, INPUT_1S, OUTPUT_S, _R | _H |      _C | _S },
+   { "RFL", FP_OPCODE_RFL, INPUT_2V, OUTPUT_V, _R | _H |      _C | _S },
+   { "RSQ", FP_OPCODE_RSQ, INPUT_1S, OUTPUT_S, _R | _H |      _C | _S },
+   { "SEQ", FP_OPCODE_SEQ, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
+   { "SFL", FP_OPCODE_SFL, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
+   { "SGE", FP_OPCODE_SGE, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
+   { "SGT", FP_OPCODE_SGT, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
+   { "SIN", FP_OPCODE_SIN, INPUT_1S, OUTPUT_S, _R | _H |      _C | _S },
+   { "SLE", FP_OPCODE_SLE, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
+   { "SLT", FP_OPCODE_SLT, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
+   { "SNE", FP_OPCODE_SNE, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
+   { "STR", FP_OPCODE_STR, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
+   { "SUB", FP_OPCODE_SUB, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
+   { "TEX", FP_OPCODE_TEX, INPUT_1V_T, OUTPUT_V,              _C | _S },
+   { "TXD", FP_OPCODE_TXD, INPUT_3V_T, OUTPUT_V,              _C | _S },
+   { "TXP", FP_OPCODE_TXP, INPUT_1V_T, OUTPUT_V,              _C | _S },
+   { "UP2H",  FP_OPCODE_UP2H,  INPUT_1S, OUTPUT_V,            _C | _S },
+   { "UP2US", FP_OPCODE_UP2US, INPUT_1S, OUTPUT_V,            _C | _S },
+   { "UP4B",  FP_OPCODE_UP4B,  INPUT_1S, OUTPUT_V,            _C | _S },
+   { "UP4UB", FP_OPCODE_UP4UB, INPUT_1S, OUTPUT_V,            _C | _S },
+   { "X2D", FP_OPCODE_X2D, INPUT_3V, OUTPUT_V, _R | _H |      _C | _S },
+   { NULL, (enum fp_opcode) -1, 0, 0, 0 }
+};
+
+
+/*
+ * Information needed or computed during parsing.
+ * Remember, we can't modify the target program object until we've
+ * _successfully_ parsed the program text.
+ */
+struct parse_state {
+   GLcontext *ctx;
+   const GLubyte *start;              /* start of program string */
+   const GLubyte *pos;                /* current position */
+   const GLubyte *curLine;
+   struct fragment_program *program;  /* current program */
+
+   struct program_parameter_list *parameters;
+
+   GLuint numInst;                    /* number of instructions parsed */
+   GLuint inputsRead;                 /* bitmask of input registers used */
+   GLuint outputsWritten;             /* bitmask of 1 << FRAG_OUTPUT_* bits */
+   GLuint texturesUsed[MAX_TEXTURE_IMAGE_UNITS];
+};
+
+
+
+/*
+ * Called whenever we find an error during parsing.
+ */
+static void
+record_error(struct parse_state *parseState, const char *msg, int lineNo)
+{
+#ifdef DEBUG
+   GLint line, column;
+   const GLubyte *lineStr;
+   lineStr = _mesa_find_line_column(parseState->start,
+                                    parseState->pos, &line, &column);
+   _mesa_debug(parseState->ctx,
+               "nvfragparse.c(%d): line %d, column %d:%s (%s)\n",
+               lineNo, line, column, (char *) lineStr, msg);
+   _mesa_free((void *) lineStr);
+#else
+   (void) lineNo;
+#endif
+
+   /* Check that no error was already recorded.  Only record the first one. */
+   if (parseState->ctx->Program.ErrorString[0] == 0) {
+      _mesa_set_program_error(parseState->ctx,
+                              parseState->pos - parseState->start,
+                              msg);
+   }
+}
+
+
+#define RETURN_ERROR							\
+do {									\
+   record_error(parseState, "Unexpected end of input.", __LINE__);	\
+   return GL_FALSE;							\
+} while(0)
+
+#define RETURN_ERROR1(msg)						\
+do {									\
+   record_error(parseState, msg, __LINE__);				\
+   return GL_FALSE;							\
+} while(0)
+
+#define RETURN_ERROR2(msg1, msg2)					\
+do {									\
+   char err[1000];							\
+   _mesa_sprintf(err, "%s %s", msg1, msg2);				\
+   record_error(parseState, err, __LINE__);				\
+   return GL_FALSE;							\
+} while(0)
+
+
+
+
+/*
+ * Search a list of instruction structures for a match.
+ */
+static struct instruction_pattern
+MatchInstruction(const GLubyte *token)
+{
+   const struct instruction_pattern *inst;
+   struct instruction_pattern result;
+
+   for (inst = Instructions; inst->name; inst++) {
+      if (_mesa_strncmp((const char *) token, inst->name, 3) == 0) {
+         /* matched! */
+         int i = 3;
+         result = *inst;
+         result.suffixes = 0;
+         /* look at suffix */
+         if (token[i] == 'R') {
+            result.suffixes |= _R;
+            i++;
+         }
+         else if (token[i] == 'H') {
+            result.suffixes |= _H;
+            i++;
+         }
+         else if (token[i] == 'X') {
+            result.suffixes |= _X;
+            i++;
+         }
+         if (token[i] == 'C') {
+            result.suffixes |= _C;
+            i++;
+         }
+         if (token[i] == '_' && token[i+1] == 'S' &&
+             token[i+2] == 'A' && token[i+3] == 'T') {
+            result.suffixes |= _S;
+         }
+         return result;
+      }
+   }
+   result.opcode = (enum fp_opcode) -1;
+   return result;
+}
+
+
+
+
+/**********************************************************************/
+
+
+static GLboolean IsLetter(GLubyte b)
+{
+   return (b >= 'a' && b <= 'z') ||
+          (b >= 'A' && b <= 'Z') ||
+          (b == '_') ||
+          (b == '$');
+}
+
+
+static GLboolean IsDigit(GLubyte b)
+{
+   return b >= '0' && b <= '9';
+}
+
+
+static GLboolean IsWhitespace(GLubyte b)
+{
+   return b == ' ' || b == '\t' || b == '\n' || b == '\r';
+}
+
+
+/**
+ * Starting at 'str' find the next token.  A token can be an integer,
+ * an identifier or punctuation symbol.
+ * \return <= 0 we found an error, else, return number of characters parsed.
+ */
+static GLint
+GetToken(struct parse_state *parseState, GLubyte *token)
+{
+   const GLubyte *str = parseState->pos;
+   GLint i = 0, j = 0;
+
+   token[0] = 0;
+
+   /* skip whitespace and comments */
+   while (str[i] && (IsWhitespace(str[i]) || str[i] == '#')) {
+      if (str[i] == '#') {
+         /* skip comment */
+         while (str[i] && (str[i] != '\n' && str[i] != '\r')) {
+            i++;
+         }
+         if (str[i] == '\n' || str[i] == '\r')
+            parseState->curLine = str + i + 1;
+      }
+      else {
+         /* skip whitespace */
+         if (str[i] == '\n' || str[i] == '\r')
+            parseState->curLine = str + i + 1;
+         i++;
+      }
+   }
+
+   if (str[i] == 0)
+      return -i;
+
+   /* try matching an integer */
+   while (str[i] && IsDigit(str[i])) {
+      token[j++] = str[i++];
+   }
+   if (j > 0 || !str[i]) {
+      token[j] = 0;
+      return i;
+   }
+
+   /* try matching an identifier */
+   if (IsLetter(str[i])) {
+      while (str[i] && (IsLetter(str[i]) || IsDigit(str[i]))) {
+         token[j++] = str[i++];
+      }
+      token[j] = 0;
+      return i;
+   }
+
+   /* punctuation character */
+   if (str[i]) {
+      token[0] = str[i++];
+      token[1] = 0;
+      return i;
+   }
+
+   /* end of input */
+   token[0] = 0;
+   return i;
+}
+
+
+/**
+ * Get next token from input stream and increment stream pointer past token.
+ */
+static GLboolean
+Parse_Token(struct parse_state *parseState, GLubyte *token)
+{
+   GLint i;
+   i = GetToken(parseState, token);
+   if (i <= 0) {
+      parseState->pos += (-i);
+      return GL_FALSE;
+   }
+   parseState->pos += i;
+   return GL_TRUE;
+}
+
+
+/**
+ * Get next token from input stream but don't increment stream pointer.
+ */
+static GLboolean
+Peek_Token(struct parse_state *parseState, GLubyte *token)
+{
+   GLint i, len;
+   i = GetToken(parseState, token);
+   if (i <= 0) {
+      parseState->pos += (-i);
+      return GL_FALSE;
+   }
+   len = _mesa_strlen((const char *) token);
+   parseState->pos += (i - len);
+   return GL_TRUE;
+}
+
+
+/**********************************************************************/
+
+static const char *InputRegisters[MAX_NV_FRAGMENT_PROGRAM_INPUTS + 1] = {
+   "WPOS", "COL0", "COL1", "FOGC",
+   "TEX0", "TEX1", "TEX2", "TEX3", "TEX4", "TEX5", "TEX6", "TEX7", NULL
+};
+
+static const char *OutputRegisters[MAX_NV_FRAGMENT_PROGRAM_OUTPUTS + 1] = {
+   "COLR", "COLH",
+   /* These are only allows for register combiners */
+   /*
+   "TEX0", "TEX1", "TEX2", "TEX3",
+   */
+   "DEPR", NULL
+};
+
+
+
+
+/**********************************************************************/
+
+/**
+ * Try to match 'pattern' as the next token after any whitespace/comments.
+ */
+static GLboolean
+Parse_String(struct parse_state *parseState, const char *pattern)
+{
+   const GLubyte *m;
+   GLint i;
+
+   /* skip whitespace and comments */
+   while (IsWhitespace(*parseState->pos) || *parseState->pos == '#') {
+      if (*parseState->pos == '#') {
+         while (*parseState->pos && (*parseState->pos != '\n' && *parseState->pos != '\r')) {
+            parseState->pos += 1;
+         }
+         if (*parseState->pos == '\n' || *parseState->pos == '\r')
+            parseState->curLine = parseState->pos + 1;
+      }
+      else {
+         /* skip whitespace */
+         if (*parseState->pos == '\n' || *parseState->pos == '\r')
+            parseState->curLine = parseState->pos + 1;
+         parseState->pos += 1;
+      }
+   }
+
+   /* Try to match the pattern */
+   m = parseState->pos;
+   for (i = 0; pattern[i]; i++) {
+      if (*m != (GLubyte) pattern[i])
+         return GL_FALSE;
+      m += 1;
+   }
+   parseState->pos = m;
+
+   return GL_TRUE; /* success */
+}
+
+
+static GLboolean
+Parse_Identifier(struct parse_state *parseState, GLubyte *ident)
+{
+   if (!Parse_Token(parseState, ident))
+      RETURN_ERROR;
+   if (IsLetter(ident[0]))
+      return GL_TRUE;
+   else
+      RETURN_ERROR1("Expected an identfier");
+}
+
+
+/**
+ * Parse a floating point constant, or a defined symbol name.
+ * [+/-]N[.N[eN]]
+ * Output:  number[0 .. 3] will get the value.
+ */
+static GLboolean
+Parse_ScalarConstant(struct parse_state *parseState, GLfloat *number)
+{
+   char *end = NULL;
+
+   *number = (GLfloat) _mesa_strtod((const char *) parseState->pos, &end);
+
+   if (end && end > (char *) parseState->pos) {
+      /* got a number */
+      parseState->pos = (GLubyte *) end;
+      number[1] = *number;
+      number[2] = *number;
+      number[3] = *number;
+      return GL_TRUE;
+   }
+   else {
+      /* should be an identifier */
+      GLubyte ident[100];
+      const GLfloat *constant;
+      if (!Parse_Identifier(parseState, ident))
+         RETURN_ERROR1("Expected an identifier");
+      constant = _mesa_lookup_parameter_value(parseState->parameters,
+                                              -1, (const char *) ident);
+      /* XXX Check that it's a constant and not a parameter */
+      if (!constant) {
+         RETURN_ERROR1("Undefined symbol");
+      }
+      else {
+         COPY_4V(number, constant);
+         return GL_TRUE;
+      }
+   }
+}
+
+
+
+/**
+ * Parse a vector constant, one of:
+ *   { float }
+ *   { float, float }
+ *   { float, float, float }
+ *   { float, float, float, float }
+ */
+static GLboolean
+Parse_VectorConstant(struct parse_state *parseState, GLfloat *vec)
+{
+   /* "{" was already consumed */
+
+   ASSIGN_4V(vec, 0.0, 0.0, 0.0, 1.0);
+
+   if (!Parse_ScalarConstant(parseState, vec+0))  /* X */
+      return GL_FALSE;
+
+   if (Parse_String(parseState, "}")) {
+      return GL_TRUE;
+   }
+
+   if (!Parse_String(parseState, ","))
+      RETURN_ERROR1("Expected comma in vector constant");
+
+   if (!Parse_ScalarConstant(parseState, vec+1))  /* Y */
+      return GL_FALSE;
+
+   if (Parse_String(parseState, "}")) {
+      return GL_TRUE;
+   }
+
+   if (!Parse_String(parseState, ","))
+      RETURN_ERROR1("Expected comma in vector constant");
+
+   if (!Parse_ScalarConstant(parseState, vec+2))  /* Z */
+      return GL_FALSE;
+
+   if (Parse_String(parseState, "}")) {
+      return GL_TRUE;
+   }
+
+   if (!Parse_String(parseState, ","))
+      RETURN_ERROR1("Expected comma in vector constant");
+
+   if (!Parse_ScalarConstant(parseState, vec+3))  /* W */
+      return GL_FALSE;
+
+   if (!Parse_String(parseState, "}"))
+      RETURN_ERROR1("Expected closing brace in vector constant");
+
+   return GL_TRUE;
+}
+
+
+/**
+ * Parse <number>, <varname> or {a, b, c, d}.
+ * Return number of values in the vector or scalar, or zero if parse error.
+ */
+static GLuint
+Parse_VectorOrScalarConstant(struct parse_state *parseState, GLfloat *vec)
+{
+   if (Parse_String(parseState, "{")) {
+      return Parse_VectorConstant(parseState, vec);
+   }
+   else {
+      GLboolean b = Parse_ScalarConstant(parseState, vec);
+      if (b) {
+         vec[1] = vec[2] = vec[3] = vec[0];
+      }
+      return b;
+   }
+}
+
+
+/**
+ * Parse a texture image source:
+ *    [TEX0 | TEX1 | .. | TEX15] , [1D | 2D | 3D | CUBE | RECT]
+ */
+static GLboolean
+Parse_TextureImageId(struct parse_state *parseState,
+                     GLubyte *texUnit, GLubyte *texTargetBit)
+{
+   GLubyte imageSrc[100];
+   GLint unit;
+
+   if (!Parse_Token(parseState, imageSrc))
+      RETURN_ERROR;
+   
+   if (imageSrc[0] != 'T' ||
+       imageSrc[1] != 'E' ||
+       imageSrc[2] != 'X') {
+      RETURN_ERROR1("Expected TEX# source");
+   }
+   unit = _mesa_atoi((const char *) imageSrc + 3);
+   if ((unit < 0 || unit > MAX_TEXTURE_IMAGE_UNITS) ||
+       (unit == 0 && (imageSrc[3] != '0' || imageSrc[4] != 0))) {
+      RETURN_ERROR1("Invalied TEX# source index");
+   }
+   *texUnit = unit;
+
+   if (!Parse_String(parseState, ","))
+      RETURN_ERROR1("Expected ,");
+
+   if (Parse_String(parseState, "1D")) {
+      *texTargetBit = TEXTURE_1D_BIT;
+   }
+   else if (Parse_String(parseState, "2D")) {
+      *texTargetBit = TEXTURE_2D_BIT;
+   }
+   else if (Parse_String(parseState, "3D")) {
+      *texTargetBit = TEXTURE_3D_BIT;
+   }
+   else if (Parse_String(parseState, "CUBE")) {
+      *texTargetBit = TEXTURE_CUBE_BIT;
+   }
+   else if (Parse_String(parseState, "RECT")) {
+      *texTargetBit = TEXTURE_RECT_BIT;
+   }
+   else {
+      RETURN_ERROR1("Invalid texture target token");
+   }
+
+   /* update record of referenced texture units */
+   parseState->texturesUsed[*texUnit] |= *texTargetBit;
+   if (_mesa_bitcount(parseState->texturesUsed[*texUnit]) > 1) {
+      RETURN_ERROR1("Only one texture target can be used per texture unit.");
+   }
+
+   return GL_TRUE;
+}
+
+
+/**
+ * Parse a scalar suffix like .x, .y, .z or .w or parse a swizzle suffix
+ * like .wxyz, .xxyy, etc and return the swizzle indexes.
+ */
+static GLboolean
+Parse_SwizzleSuffix(const GLubyte *token, GLuint swizzle[4])
+{
+   if (token[1] == 0) {
+      /* single letter swizzle (scalar) */
+      if (token[0] == 'x')
+         ASSIGN_4V(swizzle, 0, 0, 0, 0);
+      else if (token[0] == 'y')
+         ASSIGN_4V(swizzle, 1, 1, 1, 1);
+      else if (token[0] == 'z')
+         ASSIGN_4V(swizzle, 2, 2, 2, 2);
+      else if (token[0] == 'w')
+         ASSIGN_4V(swizzle, 3, 3, 3, 3);
+      else
+         return GL_FALSE;
+   }
+   else {
+      /* 4-component swizzle (vector) */
+      GLint k;
+      for (k = 0; token[k] && k < 4; k++) {
+         if (token[k] == 'x')
+            swizzle[k] = 0;
+         else if (token[k] == 'y')
+            swizzle[k] = 1;
+         else if (token[k] == 'z')
+            swizzle[k] = 2;
+         else if (token[k] == 'w')
+            swizzle[k] = 3;
+         else
+            return GL_FALSE;
+      }
+      if (k != 4)
+         return GL_FALSE;
+   }
+   return GL_TRUE;
+}
+
+
+static GLboolean
+Parse_CondCodeMask(struct parse_state *parseState,
+                   struct fp_dst_register *dstReg)
+{
+   if (Parse_String(parseState, "EQ"))
+      dstReg->CondMask = COND_EQ;
+   else if (Parse_String(parseState, "GE"))
+      dstReg->CondMask = COND_GE;
+   else if (Parse_String(parseState, "GT"))
+      dstReg->CondMask = COND_GT;
+   else if (Parse_String(parseState, "LE"))
+      dstReg->CondMask = COND_LE;
+   else if (Parse_String(parseState, "LT"))
+      dstReg->CondMask = COND_LT;
+   else if (Parse_String(parseState, "NE"))
+      dstReg->CondMask = COND_NE;
+   else if (Parse_String(parseState, "TR"))
+      dstReg->CondMask = COND_TR;
+   else if (Parse_String(parseState, "FL"))
+      dstReg->CondMask = COND_FL;
+   else
+      RETURN_ERROR1("Invalid condition code mask");
+
+   /* look for optional .xyzw swizzle */
+   if (Parse_String(parseState, ".")) {
+      GLubyte token[100];
+      if (!Parse_Token(parseState, token))  /* get xyzw suffix */
+         RETURN_ERROR;
+
+      if (!Parse_SwizzleSuffix(token, dstReg->CondSwizzle))
+         RETURN_ERROR1("Invalid swizzle suffix");
+   }
+
+   return GL_TRUE;
+}
+
+
+/**
+ * Parse a temporary register: Rnn or Hnn
+ */
+static GLboolean
+Parse_TempReg(struct parse_state *parseState, GLint *tempRegNum)
+{
+   GLubyte token[100];
+
+   /* Should be 'R##' or 'H##' */
+   if (!Parse_Token(parseState, token))
+      RETURN_ERROR;
+   if (token[0] != 'R' && token[0] != 'H')
+      RETURN_ERROR1("Expected R## or H##");
+
+   if (IsDigit(token[1])) {
+      GLint reg = _mesa_atoi((const char *) (token + 1));
+      if (token[0] == 'H')
+         reg += 32;
+      if (reg >= MAX_NV_FRAGMENT_PROGRAM_TEMPS)
+         RETURN_ERROR1("Invalid temporary register name");
+      *tempRegNum = reg;
+   }
+   else {
+      RETURN_ERROR1("Invalid temporary register name");
+   }
+
+   return GL_TRUE;
+}
+
+
+/**
+ * Parse a write-only dummy register: RC or HC.
+ */
+static GLboolean
+Parse_DummyReg(struct parse_state *parseState, GLint *regNum)
+{
+   if (Parse_String(parseState, "RC")) {
+       *regNum = 0;
+   }
+   else if (Parse_String(parseState, "HC")) {
+       *regNum = 1;
+   }
+   else {
+      RETURN_ERROR1("Invalid write-only register name");
+   }
+
+   return GL_TRUE;
+}
+
+
+/**
+ * Parse a program local parameter register "p[##]"
+ */
+static GLboolean
+Parse_ProgramParamReg(struct parse_state *parseState, GLint *regNum)
+{
+   GLubyte token[100];
+
+   if (!Parse_String(parseState, "p["))
+      RETURN_ERROR1("Expected p[");
+
+   if (!Parse_Token(parseState, token))
+      RETURN_ERROR;
+
+   if (IsDigit(token[0])) {
+      /* a numbered program parameter register */
+      GLint reg = _mesa_atoi((const char *) token);
+      if (reg >= MAX_NV_FRAGMENT_PROGRAM_PARAMS)
+         RETURN_ERROR1("Invalid constant program number");
+      *regNum = reg;
+   }
+   else {
+      RETURN_ERROR;
+   }
+
+   if (!Parse_String(parseState, "]"))
+      RETURN_ERROR1("Expected ]");
+
+   return GL_TRUE;
+}
+
+
+/**
+ * Parse f[name]  - fragment input register
+ */
+static GLboolean
+Parse_FragReg(struct parse_state *parseState, GLint *tempRegNum)
+{
+   GLubyte token[100];
+   GLint j;
+
+   /* Match 'f[' */
+   if (!Parse_String(parseState, "f["))
+      RETURN_ERROR1("Expected f[");
+
+   /* get <name> and look for match */
+   if (!Parse_Token(parseState, token)) {
+      RETURN_ERROR;
+   }
+   for (j = 0; InputRegisters[j]; j++) {
+      if (_mesa_strcmp((const char *) token, InputRegisters[j]) == 0) {
+         *tempRegNum = j;
+         parseState->inputsRead |= (1 << j);
+         break;
+      }
+   }
+   if (!InputRegisters[j]) {
+      /* unknown input register label */
+      RETURN_ERROR2("Invalid register name", token);
+   }
+
+   /* Match '[' */
+   if (!Parse_String(parseState, "]"))
+      RETURN_ERROR1("Expected ]");
+
+   return GL_TRUE;
+}
+
+
+static GLboolean
+Parse_OutputReg(struct parse_state *parseState, GLint *outputRegNum)
+{
+   GLubyte token[100];
+   GLint j;
+
+   /* Match "o[" */
+   if (!Parse_String(parseState, "o["))
+      RETURN_ERROR1("Expected o[");
+
+   /* Get output reg name */
+   if (!Parse_Token(parseState, token))
+      RETURN_ERROR;
+
+   /* try to match an output register name */
+   for (j = 0; OutputRegisters[j]; j++) {
+      if (_mesa_strcmp((const char *) token, OutputRegisters[j]) == 0) {
+         static GLuint bothColors = (1 << FRAG_OUTPUT_COLR) | (1 << FRAG_OUTPUT_COLH);
+         *outputRegNum = j;
+         parseState->outputsWritten |= (1 << j);
+         if ((parseState->outputsWritten & bothColors) == bothColors) {
+            RETURN_ERROR1("Illegal to write to both o[COLR] and o[COLH]");
+         }
+         break;
+      }
+   }
+   if (!OutputRegisters[j])
+      RETURN_ERROR1("Invalid output register name");
+
+   /* Match ']' */
+   if (!Parse_String(parseState, "]"))
+      RETURN_ERROR1("Expected ]");
+
+   return GL_TRUE;
+}
+
+
+static GLboolean
+Parse_MaskedDstReg(struct parse_state *parseState,
+                   struct fp_dst_register *dstReg)
+{
+   GLubyte token[100];
+
+   /* Dst reg can be R<n>, H<n>, o[n], RC or HC */
+   if (!Peek_Token(parseState, token))
+      RETURN_ERROR;
+
+   if (_mesa_strcmp((const char *) token, "RC") == 0 ||
+       _mesa_strcmp((const char *) token, "HC") == 0) {
+      /* a write-only register */
+      dstReg->File = PROGRAM_WRITE_ONLY;
+      if (!Parse_DummyReg(parseState, &dstReg->Index))
+         RETURN_ERROR;
+   }
+   else if (token[0] == 'R' || token[0] == 'H') {
+      /* a temporary register */
+      dstReg->File = PROGRAM_TEMPORARY;
+      if (!Parse_TempReg(parseState, &dstReg->Index))
+         RETURN_ERROR;
+   }
+   else if (token[0] == 'o') {
+      /* an output register */
+      dstReg->File = PROGRAM_OUTPUT;
+      if (!Parse_OutputReg(parseState, &dstReg->Index))
+         RETURN_ERROR;
+   }
+   else {
+      RETURN_ERROR1("Invalid destination register name");
+   }
+
+   /* Parse optional write mask */
+   if (Parse_String(parseState, ".")) {
+      /* got a mask */
+      GLint k = 0;
+
+      if (!Parse_Token(parseState, token))  /* get xyzw writemask */
+         RETURN_ERROR;
+
+      dstReg->WriteMask[0] = GL_FALSE;
+      dstReg->WriteMask[1] = GL_FALSE;
+      dstReg->WriteMask[2] = GL_FALSE;
+      dstReg->WriteMask[3] = GL_FALSE;
+
+      if (token[k] == 'x') {
+         dstReg->WriteMask[0] = GL_TRUE;
+         k++;
+      }
+      if (token[k] == 'y') {
+         dstReg->WriteMask[1] = GL_TRUE;
+         k++;
+      }
+      if (token[k] == 'z') {
+         dstReg->WriteMask[2] = GL_TRUE;
+         k++;
+      }
+      if (token[k] == 'w') {
+         dstReg->WriteMask[3] = GL_TRUE;
+         k++;
+      }
+      if (k == 0) {
+         RETURN_ERROR1("Invalid writemask character");
+      }
+
+   }
+   else {
+      dstReg->WriteMask[0] = GL_TRUE;
+      dstReg->WriteMask[1] = GL_TRUE;
+      dstReg->WriteMask[2] = GL_TRUE;
+      dstReg->WriteMask[3] = GL_TRUE;
+   }
+
+   /* optional condition code mask */
+   if (Parse_String(parseState, "(")) {
+      /* ("EQ" | "GE" | "GT" | "LE" | "LT" | "NE" | "TR" | "FL".x|y|z|w) */
+      /* ("EQ" | "GE" | "GT" | "LE" | "LT" | "NE" | "TR" | "FL".[xyzw]) */
+      if (!Parse_CondCodeMask(parseState, dstReg))
+         RETURN_ERROR;
+
+      if (!Parse_String(parseState, ")"))  /* consume ")" */
+         RETURN_ERROR1("Expected )");
+
+      return GL_TRUE;
+   }
+   else {
+      /* no cond code mask */
+      dstReg->CondMask = COND_TR;
+      dstReg->CondSwizzle[0] = 0;
+      dstReg->CondSwizzle[1] = 1;
+      dstReg->CondSwizzle[2] = 2;
+      dstReg->CondSwizzle[3] = 3;
+      return GL_TRUE;
+   }
+}
+
+
+/**
+ * Parse a vector source (register, constant, etc):
+ *   <vectorSrc>    ::= <absVectorSrc>
+ *                    | <baseVectorSrc>
+ *   <absVectorSrc> ::= <negate> "|" <baseVectorSrc> "|"
+ */
+static GLboolean
+Parse_VectorSrc(struct parse_state *parseState,
+                struct fp_src_register *srcReg)
+{
+   GLfloat sign = 1.0F;
+   GLubyte token[100];
+
+   /*
+    * First, take care of +/- and absolute value stuff.
+    */
+   if (Parse_String(parseState, "-"))
+      sign = -1.0F;
+   else if (Parse_String(parseState, "+"))
+      sign = +1.0F;
+
+   if (Parse_String(parseState, "|")) {
+      srcReg->Abs = GL_TRUE;
+      srcReg->NegateAbs = (sign < 0.0F) ? GL_TRUE : GL_FALSE;
+
+      if (Parse_String(parseState, "-"))
+         srcReg->NegateBase = GL_TRUE;
+      else if (Parse_String(parseState, "+"))
+         srcReg->NegateBase = GL_FALSE;
+      else
+         srcReg->NegateBase = GL_FALSE;
+   }
+   else {
+      srcReg->Abs = GL_FALSE;
+      srcReg->NegateAbs = GL_FALSE;
+      srcReg->NegateBase = (sign < 0.0F) ? GL_TRUE : GL_FALSE;
+   }
+
+   /* This should be the real src vector/register name */
+   if (!Peek_Token(parseState, token))
+      RETURN_ERROR;
+
+   /* Src reg can be Rn, Hn, f[n], p[n], a named parameter, a scalar
+    * literal or vector literal.
+    */
+   if (token[0] == 'R' || token[0] == 'H') {
+      srcReg->File = PROGRAM_TEMPORARY;
+      if (!Parse_TempReg(parseState, &srcReg->Index))
+         RETURN_ERROR;
+   }
+   else if (token[0] == 'f') {
+      /* XXX this might be an identier! */
+      srcReg->File = PROGRAM_INPUT;
+      if (!Parse_FragReg(parseState, &srcReg->Index))
+         RETURN_ERROR;
+   }
+   else if (token[0] == 'p') {
+      /* XXX this might be an identier! */
+      srcReg->File = PROGRAM_LOCAL_PARAM;
+      if (!Parse_ProgramParamReg(parseState, &srcReg->Index))
+         RETURN_ERROR;
+   }
+   else if (IsLetter(token[0])){
+      GLubyte ident[100];
+      GLint paramIndex;
+      if (!Parse_Identifier(parseState, ident))
+         RETURN_ERROR;
+      paramIndex = _mesa_lookup_parameter_index(parseState->parameters,
+                                                -1, (const char *) ident);
+      if (paramIndex < 0) {
+         RETURN_ERROR2("Undefined constant or parameter: ", ident);
+      }
+      srcReg->File = PROGRAM_NAMED_PARAM;
+      srcReg->Index = paramIndex;      
+   }
+   else if (IsDigit(token[0]) || token[0] == '-' || token[0] == '+' || token[0] == '.'){
+      /* literal scalar constant */
+      GLfloat values[4];
+      GLuint paramIndex;
+      if (!Parse_ScalarConstant(parseState, values))
+         RETURN_ERROR;
+      paramIndex = _mesa_add_unnamed_constant(parseState->parameters, values);
+      srcReg->File = PROGRAM_NAMED_PARAM;
+      srcReg->Index = paramIndex;
+   }
+   else if (token[0] == '{'){
+      /* literal vector constant */
+      GLfloat values[4];
+      GLuint paramIndex;
+      (void) Parse_String(parseState, "{");
+      if (!Parse_VectorConstant(parseState, values))
+         RETURN_ERROR;
+      paramIndex = _mesa_add_unnamed_constant(parseState->parameters, values);
+      srcReg->File = PROGRAM_NAMED_PARAM;
+      srcReg->Index = paramIndex;      
+   }
+   else {
+      RETURN_ERROR2("Invalid source register name", token);
+   }
+
+   /* init swizzle fields */
+   srcReg->Swizzle[0] = 0;
+   srcReg->Swizzle[1] = 1;
+   srcReg->Swizzle[2] = 2;
+   srcReg->Swizzle[3] = 3;
+
+   /* Look for optional swizzle suffix */
+   if (Parse_String(parseState, ".")) {
+      if (!Parse_Token(parseState, token))
+         RETURN_ERROR;
+
+      if (!Parse_SwizzleSuffix(token, srcReg->Swizzle))
+         RETURN_ERROR1("Invalid swizzle suffix");
+   }
+
+   /* Finish absolute value */
+   if (srcReg->Abs && !Parse_String(parseState, "|")) {
+      RETURN_ERROR1("Expected |");
+   }
+
+   return GL_TRUE;
+}
+
+
+static GLboolean
+Parse_ScalarSrcReg(struct parse_state *parseState,
+                   struct fp_src_register *srcReg)
+{
+   GLubyte token[100];
+   GLfloat sign = 1.0F;
+   GLboolean needSuffix = GL_TRUE;
+
+   /*
+    * First, take care of +/- and absolute value stuff.
+    */
+   if (Parse_String(parseState, "-"))
+      sign = -1.0F;
+   else if (Parse_String(parseState, "+"))
+      sign = +1.0F;
+
+   if (Parse_String(parseState, "|")) {
+      srcReg->Abs = GL_TRUE;
+      srcReg->NegateAbs = (sign < 0.0F) ? GL_TRUE : GL_FALSE;
+
+      if (Parse_String(parseState, "-"))
+         srcReg->NegateBase = GL_TRUE;
+      else if (Parse_String(parseState, "+"))
+         srcReg->NegateBase = GL_FALSE;
+      else
+         srcReg->NegateBase = GL_FALSE;
+   }
+   else {
+      srcReg->Abs = GL_FALSE;
+      srcReg->NegateAbs = GL_FALSE;
+      srcReg->NegateBase = (sign < 0.0F) ? GL_TRUE : GL_FALSE;
+   }
+
+   if (!Peek_Token(parseState, token))
+      RETURN_ERROR;
+
+   /* Src reg can be R<n>, H<n> or a named fragment attrib */
+   if (token[0] == 'R' || token[0] == 'H') {
+      srcReg->File = PROGRAM_TEMPORARY;
+      if (!Parse_TempReg(parseState, &srcReg->Index))
+         RETURN_ERROR;
+   }
+   else if (token[0] == 'f') {
+      srcReg->File = PROGRAM_INPUT;
+      if (!Parse_FragReg(parseState, &srcReg->Index))
+         RETURN_ERROR;
+   }
+   else if (token[0] == '{') {
+      /* vector literal */
+      GLfloat values[4];
+      GLuint paramIndex;
+      (void) Parse_String(parseState, "{");
+      if (!Parse_VectorConstant(parseState, values))
+         RETURN_ERROR;
+      paramIndex = _mesa_add_unnamed_constant(parseState->parameters, values);
+      srcReg->File = PROGRAM_NAMED_PARAM;
+      srcReg->Index = paramIndex;      
+   }
+   else if (IsDigit(token[0])) {
+      /* scalar literal */
+      GLfloat values[4];
+      GLuint paramIndex;
+      if (!Parse_ScalarConstant(parseState, values))
+         RETURN_ERROR;
+      paramIndex = _mesa_add_unnamed_constant(parseState->parameters, values);
+      srcReg->Index = paramIndex;      
+      srcReg->File = PROGRAM_NAMED_PARAM;
+      needSuffix = GL_FALSE;
+   }
+   else {
+      RETURN_ERROR2("Invalid scalar source argument", token);
+   }
+
+   if (needSuffix) {
+      /* parse .[xyzw] suffix */
+      if (!Parse_String(parseState, "."))
+         RETURN_ERROR1("Expected .");
+
+      if (!Parse_Token(parseState, token))
+         RETURN_ERROR;
+
+      if (token[0] == 'x' && token[1] == 0) {
+         srcReg->Swizzle[0] = 0;
+      }
+      else if (token[0] == 'y' && token[1] == 0) {
+         srcReg->Swizzle[0] = 1;
+      }
+      else if (token[0] == 'z' && token[1] == 0) {
+         srcReg->Swizzle[0] = 2;
+      }
+      else if (token[0] == 'w' && token[1] == 0) {
+         srcReg->Swizzle[0] = 3;
+      }
+      else {
+         RETURN_ERROR1("Invalid scalar source suffix");
+      }
+   }
+   else {
+      srcReg->Swizzle[0] = 0;
+   }
+   srcReg->Swizzle[1] = srcReg->Swizzle[2] = srcReg->Swizzle[3] = 0;
+
+   /* Finish absolute value */
+   if (srcReg->Abs && !Parse_String(parseState, "|")) {
+      RETURN_ERROR1("Expected |");
+   }
+
+   return GL_TRUE;
+}
+
+
+
+static GLboolean
+Parse_InstructionSequence(struct parse_state *parseState,
+                          struct fp_instruction program[])
+{
+   while (1) {
+      struct fp_instruction *inst = program + parseState->numInst;
+      struct instruction_pattern instMatch;
+      GLubyte token[100];
+
+      /* Initialize the instruction */
+      inst->SrcReg[0].File = (enum register_file) -1;
+      inst->SrcReg[1].File = (enum register_file) -1;
+      inst->SrcReg[2].File = (enum register_file) -1;
+      inst->DstReg.File = (enum register_file) -1;
+      inst->DstReg.CondSwizzle[0] = 0;
+      inst->DstReg.CondSwizzle[1] = 1;
+      inst->DstReg.CondSwizzle[2] = 2;
+      inst->DstReg.CondSwizzle[3] = 3;
+
+      /* special instructions */
+      if (Parse_String(parseState, "DEFINE")) {
+         GLubyte id[100];
+         GLfloat value[7];  /* yes, 7 to be safe */
+         if (!Parse_Identifier(parseState, id))
+            RETURN_ERROR;
+         /* XXX make sure id is not a reserved identifer, like R9 */
+         if (!Parse_String(parseState, "="))
+            RETURN_ERROR1("Expected =");
+         if (!Parse_VectorOrScalarConstant(parseState, value))
+            RETURN_ERROR;
+         if (!Parse_String(parseState, ";"))
+            RETURN_ERROR1("Expected ;");
+         if (_mesa_lookup_parameter_index(parseState->parameters,
+                                          -1, (const char *) id) >= 0) {
+            RETURN_ERROR2(id, "already defined");
+         }
+         _mesa_add_named_parameter(parseState->parameters,
+                                   (const char *) id, value);
+      }
+      else if (Parse_String(parseState, "DECLARE")) {
+         GLubyte id[100];
+         GLfloat value[7] = {0, 0, 0, 0, 0, 0, 0};  /* yes, to be safe */
+         if (!Parse_Identifier(parseState, id))
+            RETURN_ERROR;
+         /* XXX make sure id is not a reserved identifer, like R9 */
+         if (Parse_String(parseState, "=")) {
+            if (!Parse_VectorOrScalarConstant(parseState, value))
+               RETURN_ERROR;
+         }
+         if (!Parse_String(parseState, ";"))
+            RETURN_ERROR1("Expected ;");
+         if (_mesa_lookup_parameter_index(parseState->parameters,
+                                          -1, (const char *) id) >= 0) {
+            RETURN_ERROR2(id, "already declared");
+         }
+         _mesa_add_named_parameter(parseState->parameters,
+                                   (const char *) id, value);
+      }
+      else if (Parse_String(parseState, "END")) {
+         inst->Opcode = FP_OPCODE_END;
+         inst->StringPos = parseState->curLine - parseState->start;
+         assert(inst->StringPos >= 0);
+         parseState->numInst++;
+         if (Parse_Token(parseState, token)) {
+            RETURN_ERROR1("Code after END opcode.");
+         }
+         break;
+      }
+      else {
+         /* general/arithmetic instruction */
+
+         /* get token */
+         if (!Parse_Token(parseState, token)) {
+            RETURN_ERROR1("Missing END instruction.");
+         }
+
+         /* try to find matching instuction */
+         instMatch = MatchInstruction(token);
+         if (instMatch.opcode < 0) {
+            /* bad instruction name */
+            RETURN_ERROR2("Unexpected token: ", token);
+         }
+
+         inst->Opcode = instMatch.opcode;
+         inst->Precision = instMatch.suffixes & (_R | _H | _X);
+         inst->Saturate = (instMatch.suffixes & (_S)) ? GL_TRUE : GL_FALSE;
+         inst->UpdateCondRegister = (instMatch.suffixes & (_C)) ? GL_TRUE : GL_FALSE;
+         inst->StringPos = parseState->curLine - parseState->start;
+         assert(inst->StringPos >= 0);
+
+         /*
+          * parse the input and output operands
+          */
+         if (instMatch.outputs == OUTPUT_S || instMatch.outputs == OUTPUT_V) {
+            if (!Parse_MaskedDstReg(parseState, &inst->DstReg))
+               RETURN_ERROR;
+            if (!Parse_String(parseState, ","))
+               RETURN_ERROR1("Expected ,");
+         }
+         else if (instMatch.outputs == OUTPUT_NONE) {
+            ASSERT(instMatch.opcode == FP_OPCODE_KIL_NV);
+            /* This is a little weird, the cond code info is in the dest register */
+            if (!Parse_CondCodeMask(parseState, &inst->DstReg))
+               RETURN_ERROR;
+         }
+
+         if (instMatch.inputs == INPUT_1V) {
+            if (!Parse_VectorSrc(parseState, &inst->SrcReg[0]))
+               RETURN_ERROR;
+         }
+         else if (instMatch.inputs == INPUT_2V) {
+            if (!Parse_VectorSrc(parseState, &inst->SrcReg[0]))
+               RETURN_ERROR;
+            if (!Parse_String(parseState, ","))
+               RETURN_ERROR1("Expected ,");
+            if (!Parse_VectorSrc(parseState, &inst->SrcReg[1]))
+               RETURN_ERROR;
+         }
+         else if (instMatch.inputs == INPUT_3V) {
+            if (!Parse_VectorSrc(parseState, &inst->SrcReg[0]))
+               RETURN_ERROR;
+            if (!Parse_String(parseState, ","))
+               RETURN_ERROR1("Expected ,");
+            if (!Parse_VectorSrc(parseState, &inst->SrcReg[1]))
+               RETURN_ERROR;
+            if (!Parse_String(parseState, ","))
+               RETURN_ERROR1("Expected ,");
+            if (!Parse_VectorSrc(parseState, &inst->SrcReg[2]))
+               RETURN_ERROR;
+         }
+         else if (instMatch.inputs == INPUT_1S) {
+            if (!Parse_ScalarSrcReg(parseState, &inst->SrcReg[0]))
+               RETURN_ERROR;
+         }
+         else if (instMatch.inputs == INPUT_2S) {
+            if (!Parse_ScalarSrcReg(parseState, &inst->SrcReg[0]))
+               RETURN_ERROR;
+            if (!Parse_String(parseState, ","))
+               RETURN_ERROR1("Expected ,");
+            if (!Parse_ScalarSrcReg(parseState, &inst->SrcReg[1]))
+               RETURN_ERROR;
+         }
+         else if (instMatch.inputs == INPUT_CC) {
+            /* XXX to-do */
+         }
+         else if (instMatch.inputs == INPUT_1V_T) {
+            if (!Parse_VectorSrc(parseState, &inst->SrcReg[0]))
+               RETURN_ERROR;
+            if (!Parse_String(parseState, ","))
+               RETURN_ERROR1("Expected ,");
+            if (!Parse_TextureImageId(parseState, &inst->TexSrcUnit,
+                                      &inst->TexSrcBit))
+               RETURN_ERROR;
+         }
+         else if (instMatch.inputs == INPUT_3V_T) {
+            if (!Parse_VectorSrc(parseState, &inst->SrcReg[0]))
+               RETURN_ERROR;
+            if (!Parse_String(parseState, ","))
+               RETURN_ERROR1("Expected ,");
+            if (!Parse_VectorSrc(parseState, &inst->SrcReg[1]))
+               RETURN_ERROR;
+            if (!Parse_String(parseState, ","))
+               RETURN_ERROR1("Expected ,");
+            if (!Parse_VectorSrc(parseState, &inst->SrcReg[2]))
+               RETURN_ERROR;
+            if (!Parse_String(parseState, ","))
+               RETURN_ERROR1("Expected ,");
+            if (!Parse_TextureImageId(parseState, &inst->TexSrcUnit,
+                                      &inst->TexSrcBit))
+               RETURN_ERROR;
+         }
+
+         /* end of statement semicolon */
+         if (!Parse_String(parseState, ";"))
+            RETURN_ERROR1("Expected ;");
+
+         parseState->numInst++;
+
+         if (parseState->numInst >= MAX_NV_FRAGMENT_PROGRAM_INSTRUCTIONS)
+            RETURN_ERROR1("Program too long");
+      }
+   }
+   return GL_TRUE;
+}
+
+
+
+/**
+ * Parse/compile the 'str' returning the compiled 'program'.
+ * ctx->Program.ErrorPos will be -1 if successful.  Otherwise, ErrorPos
+ * indicates the position of the error in 'str'.
+ */
+void
+_mesa_parse_nv_fragment_program(GLcontext *ctx, GLenum dstTarget,
+                                const GLubyte *str, GLsizei len,
+                                struct fragment_program *program)
+{
+   struct parse_state parseState;
+   struct fp_instruction instBuffer[MAX_NV_FRAGMENT_PROGRAM_INSTRUCTIONS];
+   struct fp_instruction *newInst;
+   GLenum target;
+   GLubyte *programString;
+
+   /* Make a null-terminated copy of the program string */
+   programString = (GLubyte *) MALLOC(len + 1);
+   if (!programString) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");
+      return;
+   }
+   MEMCPY(programString, str, len);
+   programString[len] = 0;
+
+   /* Get ready to parse */
+   _mesa_bzero(&parseState, sizeof(struct parse_state));
+   parseState.ctx = ctx;
+   parseState.start = programString;
+   parseState.program = program;
+   parseState.numInst = 0;
+   parseState.curLine = programString;
+   parseState.parameters = _mesa_new_parameter_list();
+
+   /* Reset error state */
+   _mesa_set_program_error(ctx, -1, NULL);
+
+   /* check the program header */
+   if (_mesa_strncmp((const char *) programString, "!!FP1.0", 7) == 0) {
+      target = GL_FRAGMENT_PROGRAM_NV;
+      parseState.pos = programString + 7;
+   }
+   else if (_mesa_strncmp((const char *) programString, "!!FCP1.0", 8) == 0) {
+      /* fragment / register combiner program - not supported */
+      _mesa_set_program_error(ctx, 0, "Invalid fragment program header");
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glLoadProgramNV(bad header)");
+      return;
+   }
+   else {
+      /* invalid header */
+      _mesa_set_program_error(ctx, 0, "Invalid fragment program header");
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glLoadProgramNV(bad header)");
+      return;
+   }
+
+   /* make sure target and header match */
+   if (target != dstTarget) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glLoadProgramNV(target mismatch 0x%x != 0x%x)",
+                  target, dstTarget);
+      return;
+   }
+
+   if (Parse_InstructionSequence(&parseState, instBuffer)) {
+      GLuint u;
+      /* successful parse! */
+
+      if (parseState.outputsWritten == 0) {
+         /* must write at least one output! */
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "Invalid fragment program - no outputs written.");
+         return;
+      }
+
+      /* copy the compiled instructions */
+      assert(parseState.numInst <= MAX_NV_FRAGMENT_PROGRAM_INSTRUCTIONS);
+      newInst = (struct fp_instruction *)
+         MALLOC(parseState.numInst * sizeof(struct fp_instruction));
+      if (!newInst) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");
+         return;  /* out of memory */
+      }
+      MEMCPY(newInst, instBuffer,
+             parseState.numInst * sizeof(struct fp_instruction));
+
+      /* install the program */
+      program->Base.Target = target;
+      if (program->Base.String) {
+         FREE(program->Base.String);
+      }
+      program->Base.String = programString;
+      program->Base.Format = GL_PROGRAM_FORMAT_ASCII_ARB;
+      if (program->Instructions) {
+         FREE(program->Instructions);
+      }
+      program->Instructions = newInst;
+      program->InputsRead = parseState.inputsRead;
+      program->OutputsWritten = parseState.outputsWritten;
+      for (u = 0; u < ctx->Const.MaxTextureImageUnits; u++)
+         program->TexturesUsed[u] = parseState.texturesUsed[u];
+
+      /* save program parameters */
+      program->Parameters = parseState.parameters;
+
+      /* allocate registers for declared program parameters */
+#if 00
+      _mesa_assign_program_registers(&(program->SymbolTable));
+#endif
+
+#ifdef DEBUG
+      _mesa_printf("--- glLoadProgramNV(%d) result ---\n", program->Base.Id);
+      _mesa_print_nv_fragment_program(program);
+      _mesa_printf("----------------------------------\n");
+#endif
+   }
+   else {
+      /* Error! */
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glLoadProgramNV");
+      /* NOTE: _mesa_set_program_error would have been called already */
+   }
+}
+
+
+static void
+PrintSrcReg(const struct fragment_program *program,
+            const struct fp_src_register *src)
+{
+   static const char comps[5] = "xyzw";
+
+   if (src->NegateAbs) {
+      _mesa_printf("-");
+   }
+   if (src->Abs) {
+      _mesa_printf("|");
+   }
+   if (src->NegateBase) {
+      _mesa_printf("-");
+   }
+   if (src->File == PROGRAM_NAMED_PARAM) {
+      if (program->Parameters->Parameters[src->Index].Type == CONSTANT) {
+         printf("{%g, %g, %g, %g}",
+                program->Parameters->Parameters[src->Index].Values[0],
+                program->Parameters->Parameters[src->Index].Values[1],
+                program->Parameters->Parameters[src->Index].Values[2],
+                program->Parameters->Parameters[src->Index].Values[3]);
+      }
+      else {
+         ASSERT(program->Parameters->Parameters[src->Index].Type
+                == NAMED_PARAMETER);
+         printf("%s", program->Parameters->Parameters[src->Index].Name);
+      }
+   }
+   else if (src->File == PROGRAM_OUTPUT) {
+      _mesa_printf("o[%s]", OutputRegisters[src->Index]);
+   }
+   else if (src->File == PROGRAM_INPUT) {
+      _mesa_printf("f[%s]", InputRegisters[src->Index]);
+   }
+   else if (src->File == PROGRAM_LOCAL_PARAM) {
+      _mesa_printf("p[%d]", src->Index);
+   }
+   else if (src->File == PROGRAM_TEMPORARY) {
+      if (src->Index >= 32)
+         _mesa_printf("H%d", src->Index);
+      else
+         _mesa_printf("R%d", src->Index);
+   }
+   else if (src->File == PROGRAM_WRITE_ONLY) {
+      _mesa_printf("%cC", "HR"[src->Index]);
+   }
+   else {
+      _mesa_problem(NULL, "Invalid fragment register %d", src->Index);
+      return;
+   }
+   if (src->Swizzle[0] == src->Swizzle[1] &&
+       src->Swizzle[0] == src->Swizzle[2] &&
+       src->Swizzle[0] == src->Swizzle[3]) {
+      _mesa_printf(".%c", comps[src->Swizzle[0]]);
+   }
+   else if (src->Swizzle[0] != 0 ||
+            src->Swizzle[1] != 1 ||
+            src->Swizzle[2] != 2 ||
+            src->Swizzle[3] != 3) {
+      _mesa_printf(".%c%c%c%c",
+                   comps[src->Swizzle[0]],
+                   comps[src->Swizzle[1]],
+                   comps[src->Swizzle[2]],
+                   comps[src->Swizzle[3]]);
+   }
+   if (src->Abs) {
+      _mesa_printf("|");
+   }
+}
+
+static void
+PrintTextureSrc(const struct fp_instruction *inst)
+{
+   _mesa_printf("TEX%d, ", inst->TexSrcUnit);
+   switch (inst->TexSrcBit) {
+   case TEXTURE_1D_BIT:
+      _mesa_printf("1D");
+      break;
+   case TEXTURE_2D_BIT:
+      _mesa_printf("2D");
+      break;
+   case TEXTURE_3D_BIT:
+      _mesa_printf("3D");
+      break;
+   case TEXTURE_RECT_BIT:
+      _mesa_printf("RECT");
+      break;
+   case TEXTURE_CUBE_BIT:
+      _mesa_printf("CUBE");
+      break;
+   default:
+      _mesa_problem(NULL, "Invalid textue target in PrintTextureSrc");
+   }
+}
+
+static void
+PrintCondCode(const struct fp_dst_register *dst)
+{
+   static const char *comps = "xyzw";
+   static const char *ccString[] = {
+      "??", "GT", "EQ", "LT", "UN", "GE", "LE", "NE", "TR", "FL", "??"
+   };
+
+   _mesa_printf("%s", ccString[dst->CondMask]);
+   if (dst->CondSwizzle[0] == dst->CondSwizzle[1] &&
+       dst->CondSwizzle[0] == dst->CondSwizzle[2] &&
+       dst->CondSwizzle[0] == dst->CondSwizzle[3]) {
+      _mesa_printf(".%c", comps[dst->CondSwizzle[0]]);
+   }
+   else if (dst->CondSwizzle[0] != 0 ||
+            dst->CondSwizzle[1] != 1 ||
+            dst->CondSwizzle[2] != 2 ||
+            dst->CondSwizzle[3] != 3) {
+      _mesa_printf(".%c%c%c%c",
+                   comps[dst->CondSwizzle[0]],
+                   comps[dst->CondSwizzle[1]],
+                   comps[dst->CondSwizzle[2]],
+                   comps[dst->CondSwizzle[3]]);
+   }
+}
+
+
+static void
+PrintDstReg(const struct fp_dst_register *dst)
+{
+   GLint w = dst->WriteMask[0] + dst->WriteMask[1]
+           + dst->WriteMask[2] + dst->WriteMask[3];
+
+   if (dst->File == PROGRAM_OUTPUT) {
+      _mesa_printf("o[%s]", OutputRegisters[dst->Index]);
+   }
+   else if (dst->File == PROGRAM_TEMPORARY) {
+      if (dst->Index >= 32)
+         _mesa_printf("H%d", dst->Index);
+      else
+         _mesa_printf("R%d", dst->Index);
+   }
+   else if (dst->File == PROGRAM_LOCAL_PARAM) {
+      _mesa_printf("p[%d]", dst->Index);
+   }
+   else if (dst->File == PROGRAM_WRITE_ONLY) {
+      _mesa_printf("%cC", "HR"[dst->Index]);
+   }
+   else {
+      _mesa_printf("???");
+   }
+
+   if (w != 0 && w != 4) {
+      _mesa_printf(".");
+      if (dst->WriteMask[0])
+         _mesa_printf("x");
+      if (dst->WriteMask[1])
+         _mesa_printf("y");
+      if (dst->WriteMask[2])
+         _mesa_printf("z");
+      if (dst->WriteMask[3])
+         _mesa_printf("w");
+   }
+
+   if (dst->CondMask != COND_TR ||
+       dst->CondSwizzle[0] != 0 ||
+       dst->CondSwizzle[1] != 1 ||
+       dst->CondSwizzle[2] != 2 ||
+       dst->CondSwizzle[3] != 3) {
+      _mesa_printf(" (");
+      PrintCondCode(dst);
+      _mesa_printf(")");
+   }
+}
+
+
+/**
+ * Print (unparse) the given vertex program.  Just for debugging.
+ */
+void
+_mesa_print_nv_fragment_program(const struct fragment_program *program)
+{
+   const struct fp_instruction *inst;
+
+   for (inst = program->Instructions; inst->Opcode != FP_OPCODE_END; inst++) {
+      int i;
+      for (i = 0; Instructions[i].name; i++) {
+         if (inst->Opcode == Instructions[i].opcode) {
+            /* print instruction name */
+            _mesa_printf("%s", Instructions[i].name);
+            if (inst->Precision == FLOAT16)
+               _mesa_printf("H");
+            else if (inst->Precision == FIXED12)
+               _mesa_printf("X");
+            if (inst->UpdateCondRegister)
+               _mesa_printf("C");
+            if (inst->Saturate)
+               _mesa_printf("_SAT");
+            _mesa_printf(" ");
+
+            if (Instructions[i].inputs == INPUT_CC) {
+               PrintCondCode(&inst->DstReg);
+            }
+            else if (Instructions[i].outputs == OUTPUT_V ||
+                     Instructions[i].outputs == OUTPUT_S) {
+               /* print dest register */
+               PrintDstReg(&inst->DstReg);
+               _mesa_printf(", ");
+            }
+
+            /* print source register(s) */
+            if (Instructions[i].inputs == INPUT_1V ||
+                Instructions[i].inputs == INPUT_1S) {
+               PrintSrcReg(program, &inst->SrcReg[0]);
+            }
+            else if (Instructions[i].inputs == INPUT_2V ||
+                     Instructions[i].inputs == INPUT_2S) {
+               PrintSrcReg(program, &inst->SrcReg[0]);
+               _mesa_printf(", ");
+               PrintSrcReg(program, &inst->SrcReg[1]);
+            }
+            else if (Instructions[i].inputs == INPUT_3V) {
+               PrintSrcReg(program, &inst->SrcReg[0]);
+               _mesa_printf(", ");
+               PrintSrcReg(program, &inst->SrcReg[1]);
+               _mesa_printf(", ");
+               PrintSrcReg(program, &inst->SrcReg[2]);
+            }
+            else if (Instructions[i].inputs == INPUT_1V_T) {
+               PrintSrcReg(program, &inst->SrcReg[0]);
+               _mesa_printf(", ");
+               PrintTextureSrc(inst);
+            }
+            else if (Instructions[i].inputs == INPUT_3V_T) {
+               PrintSrcReg(program, &inst->SrcReg[0]);
+               _mesa_printf(", ");
+               PrintSrcReg(program, &inst->SrcReg[1]);
+               _mesa_printf(", ");
+               PrintSrcReg(program, &inst->SrcReg[2]);
+               _mesa_printf(", ");
+               PrintTextureSrc(inst);
+            }
+            _mesa_printf(";\n");
+            break;
+         }
+      }
+      if (!Instructions[i].name) {
+         _mesa_printf("Invalid opcode %d\n", inst->Opcode);
+      }
+   }
+   _mesa_printf("END\n");
+}
+
+
+const char *
+_mesa_nv_fragment_input_register_name(GLuint i)
+{
+   ASSERT(i < MAX_NV_FRAGMENT_PROGRAM_INPUTS);
+   return InputRegisters[i];
+}
+
+
+const char *
+_mesa_nv_fragment_output_register_name(GLuint i)
+{
+   ASSERT(i < MAX_NV_FRAGMENT_PROGRAM_OUTPUTS);
+   return OutputRegisters[i];
+}
diff --git a/reactos/lib/mesa32/src/main/nvfragparse.h b/reactos/lib/mesa32/src/main/nvfragparse.h
new file mode 100644
index 00000000000..849a7fbc7d6
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/nvfragparse.h
@@ -0,0 +1,52 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Brian Paul
+ */
+
+
+#ifndef NVFRAGPARSE_H
+#define NVFRAGPARSE_H
+
+
+extern void
+_mesa_parse_nv_fragment_program(GLcontext *ctx, GLenum target,
+                                const GLubyte *str, GLsizei len,
+                                struct fragment_program *program);
+
+
+extern void
+_mesa_print_nv_fragment_program(const struct fragment_program *program);
+
+
+extern const char *
+_mesa_nv_fragment_input_register_name(GLuint i);
+
+
+extern const char *
+_mesa_nv_fragment_output_register_name(GLuint i);
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/nvfragprog.h b/reactos/lib/mesa32/src/main/nvfragprog.h
new file mode 100644
index 00000000000..a9361f063c3
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/nvfragprog.h
@@ -0,0 +1,190 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/* Private fragment program types and constants only used by files
+ * related to fragment programs.
+ *
+ * XXX TO-DO: Rename this file "fragprog.h" since it's not NV-specific.
+ */
+
+
+#ifndef NVFRAGPROG_H
+#define NVFRAGPROG_H
+
+#include "config.h"
+
+
+/* Fragment input registers / attributes */
+#define FRAG_ATTRIB_WPOS  0
+#define FRAG_ATTRIB_COL0  1
+#define FRAG_ATTRIB_COL1  2
+#define FRAG_ATTRIB_FOGC  3
+#define FRAG_ATTRIB_TEX0  4
+#define FRAG_ATTRIB_TEX1  5
+#define FRAG_ATTRIB_TEX2  6
+#define FRAG_ATTRIB_TEX3  7
+#define FRAG_ATTRIB_TEX4  8
+#define FRAG_ATTRIB_TEX5  9
+#define FRAG_ATTRIB_TEX6  10
+#define FRAG_ATTRIB_TEX7  11
+
+/* Bitmasks for the above */
+#define FRAG_BIT_WPOS  (1 << FRAG_ATTRIB_WPOS)
+#define FRAG_BIT_COL0  (1 << FRAG_ATTRIB_COL0)
+#define FRAG_BIT_COL1  (1 << FRAG_ATTRIB_COL1)
+#define FRAG_BIT_FOGC  (1 << FRAG_ATTRIB_FOGC)
+#define FRAG_BIT_TEX0  (1 << FRAG_ATTRIB_TEX0)
+#define FRAG_BIT_TEX1  (1 << FRAG_ATTRIB_TEX1)
+#define FRAG_BIT_TEX2  (1 << FRAG_ATTRIB_TEX2)
+#define FRAG_BIT_TEX3  (1 << FRAG_ATTRIB_TEX3)
+#define FRAG_BIT_TEX4  (1 << FRAG_ATTRIB_TEX4)
+#define FRAG_BIT_TEX5  (1 << FRAG_ATTRIB_TEX5)
+#define FRAG_BIT_TEX6  (1 << FRAG_ATTRIB_TEX6)
+#define FRAG_BIT_TEX7  (1 << FRAG_ATTRIB_TEX7)
+
+/* output registers */
+#define FRAG_OUTPUT_COLR  0
+#define FRAG_OUTPUT_COLH  1
+#define FRAG_OUTPUT_DEPR  2
+
+
+/* condition codes */
+#define COND_GT  1  /* greater than zero */
+#define COND_EQ  2  /* equal to zero */
+#define COND_LT  3  /* less than zero */
+#define COND_UN  4  /* unordered (NaN) */
+#define COND_GE  5  /* greater then or equal to zero */
+#define COND_LE  6  /* less then or equal to zero */
+#define COND_NE  7  /* not equal to zero */
+#define COND_TR  8  /* always true */
+#define COND_FL  9  /* always false */
+
+
+/* instruction precision */
+#define FLOAT32  0x1
+#define FLOAT16  0x2
+#define FIXED12  0x4
+
+
+/* Fragment program instruction opcodes */
+enum fp_opcode {
+   FP_OPCODE_ABS = 1000,     /* ARB_f_p only */
+   FP_OPCODE_ADD,
+   FP_OPCODE_CMP,            /* ARB_f_p only */
+   FP_OPCODE_COS,
+   FP_OPCODE_DDX,            /* NV_f_p only */
+   FP_OPCODE_DDY,            /* NV_f_p only */
+   FP_OPCODE_DP3,
+   FP_OPCODE_DP4,
+   FP_OPCODE_DPH,            /* ARB_f_p only */
+   FP_OPCODE_DST,
+   FP_OPCODE_EX2,
+   FP_OPCODE_FLR,
+   FP_OPCODE_FRC,
+   FP_OPCODE_KIL_NV,         /* NV_f_p only */
+   FP_OPCODE_KIL,            /* ARB_f_p only */
+   FP_OPCODE_LG2,
+   FP_OPCODE_LIT,
+   FP_OPCODE_LRP,
+   FP_OPCODE_MAD,
+   FP_OPCODE_MAX,
+   FP_OPCODE_MIN,
+   FP_OPCODE_MOV,
+   FP_OPCODE_MUL,
+   FP_OPCODE_PK2H,           /* NV_f_p only */
+   FP_OPCODE_PK2US,          /* NV_f_p only */
+   FP_OPCODE_PK4B,           /* NV_f_p only */
+   FP_OPCODE_PK4UB,          /* NV_f_p only */
+   FP_OPCODE_POW,
+   FP_OPCODE_RCP,
+   FP_OPCODE_RFL,            /* NV_f_p only */
+   FP_OPCODE_RSQ,
+   FP_OPCODE_SCS,            /* ARB_f_p only */
+   FP_OPCODE_SEQ,            /* NV_f_p only */
+   FP_OPCODE_SFL,            /* NV_f_p only */
+   FP_OPCODE_SGE,            /* NV_f_p only */
+   FP_OPCODE_SGT,            /* NV_f_p only */
+   FP_OPCODE_SIN,
+   FP_OPCODE_SLE,            /* NV_f_p only */
+   FP_OPCODE_SLT,
+   FP_OPCODE_SNE,            /* NV_f_p only */
+   FP_OPCODE_STR,            /* NV_f_p only */
+   FP_OPCODE_SUB,
+   FP_OPCODE_SWZ,            /* ARB_f_p only */
+   FP_OPCODE_TEX,
+   FP_OPCODE_TXB,            /* ARB_f_p only */
+   FP_OPCODE_TXD,            /* NV_f_p only */
+   FP_OPCODE_TXP,
+   FP_OPCODE_UP2H,           /* NV_f_p only */
+   FP_OPCODE_UP2US,          /* NV_f_p only */
+   FP_OPCODE_UP4B,           /* NV_f_p only */
+   FP_OPCODE_UP4UB,          /* NV_f_p only */
+   FP_OPCODE_X2D,            /* NV_f_p only - 2d mat mul */
+   FP_OPCODE_XPD,            /* ARB_f_p only - cross product */
+   FP_OPCODE_END /* private opcode */
+};
+
+
+/* Instruction source register */
+struct fp_src_register
+{
+   enum register_file File;
+   GLint Index;
+   GLuint Swizzle[4];
+   GLboolean NegateBase; /* negate before absolute value? */
+   GLboolean Abs;        /* take absolute value? */
+   GLboolean NegateAbs;  /* negate after absolute value? */
+};
+
+
+/* Instruction destination register */
+struct fp_dst_register
+{
+   enum register_file File;
+   GLint Index;
+   GLboolean WriteMask[4];
+   GLuint CondMask;
+   GLuint CondSwizzle[4];
+};
+
+
+/* Fragment program instruction */
+struct fp_instruction
+{
+   enum fp_opcode Opcode;
+   struct fp_src_register SrcReg[3];
+   struct fp_dst_register DstReg;
+   GLboolean Saturate;
+   GLboolean UpdateCondRegister;
+   GLubyte Precision;    /* FLOAT32, FLOAT16 or FIXED12 */
+   GLubyte TexSrcUnit;   /* texture unit for TEX, TXD, TXP instructions */
+   GLubyte TexSrcBit;    /* TEXTURE_1D,2D,3D,CUBE,RECT_BIT source target */
+#if FEATURE_MESA_program_debug
+   GLint StringPos;
+#endif
+};
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/nvprogram.c b/reactos/lib/mesa32/src/main/nvprogram.c
new file mode 100644
index 00000000000..d32cb7f2b51
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/nvprogram.c
@@ -0,0 +1,871 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file nvprogram.c
+ * NVIDIA vertex/fragment program state management functions.
+ * \author Brian Paul
+ */
+
+/*
+ * Regarding GL_NV_fragment/vertex_program, GL_NV_vertex_program1_1, etc:
+ *
+ * Portions of this software may use or implement intellectual
+ * property owned and licensed by NVIDIA Corporation. NVIDIA disclaims
+ * any and all warranties with respect to such intellectual property,
+ * including any use thereof or modifications thereto.
+ */
+
+#include "glheader.h"
+#include "context.h"
+#include "hash.h"
+#include "imports.h"
+#include "macros.h"
+#include "mtypes.h"
+#include "nvfragparse.h"
+#include "nvfragprog.h"
+#include "nvvertexec.h"
+#include "nvvertparse.h"
+#include "nvvertprog.h"
+#include "nvprogram.h"
+#include "program.h"
+
+
+
+/**
+ * Execute a vertex state program.
+ * \note Called from the GL API dispatcher.
+ */
+void GLAPIENTRY
+_mesa_ExecuteProgramNV(GLenum target, GLuint id, const GLfloat *params)
+{
+   struct vertex_program *vprog;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (target != GL_VERTEX_STATE_PROGRAM_NV) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glExecuteProgramNV");
+      return;
+   }
+
+   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
+
+   vprog = (struct vertex_program *)
+      _mesa_HashLookup(ctx->Shared->Programs, id);
+
+   if (!vprog || vprog->Base.Target != GL_VERTEX_STATE_PROGRAM_NV) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glExecuteProgramNV");
+      return;
+   }
+   
+   _mesa_init_vp_registers(ctx);
+   _mesa_init_tracked_matrices(ctx);
+   COPY_4V(ctx->VertexProgram.Inputs[VERT_ATTRIB_POS], params);
+   _mesa_exec_vertex_program(ctx, vprog);
+}
+
+
+/**
+ * Determine if a set of programs is resident in hardware.
+ * \note Not compiled into display lists.
+ * \note Called from the GL API dispatcher.
+ */
+GLboolean GLAPIENTRY _mesa_AreProgramsResidentNV(GLsizei n, const GLuint *ids,
+                                      GLboolean *residences)
+{
+   GLint i, j;
+   GLboolean allResident = GL_TRUE;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
+
+   if (n < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glAreProgramsResidentNV(n)");
+      return GL_FALSE;
+   }
+
+   for (i = 0; i < n; i++) {
+      const struct program *prog;
+      if (ids[i] == 0) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "glAreProgramsResidentNV");
+         return GL_FALSE;
+      }
+      prog = (const struct program *)
+         _mesa_HashLookup(ctx->Shared->Programs, ids[i]);
+      if (!prog) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "glAreProgramsResidentNV");
+         return GL_FALSE;
+      }
+      if (prog->Resident) {
+	 if (!allResident)
+	    residences[i] = GL_TRUE;
+      }
+      else {
+         if (allResident) {
+	    allResident = GL_FALSE;
+	    for (j = 0; j < i; j++)
+	       residences[j] = GL_TRUE;
+	 }
+	 residences[i] = GL_FALSE;
+      }
+   }
+
+   return allResident;
+}
+
+
+/**
+ * Request that a set of programs be resident in hardware.
+ * \note Called from the GL API dispatcher.
+ */
+void GLAPIENTRY
+_mesa_RequestResidentProgramsNV(GLsizei n, const GLuint *ids)
+{
+   GLint i;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (n < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glRequestResidentProgramsNV(n)");
+      return;
+   }
+
+   /* just error checking for now */
+   for (i = 0; i < n; i++) {
+      struct program *prog;
+
+      if (ids[i] == 0) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "glRequestResidentProgramsNV(id)");
+         return;
+      }
+
+      prog = (struct program *) _mesa_HashLookup(ctx->Shared->Programs, ids[i]);
+
+      if (!prog) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "glRequestResidentProgramsNV(id)");
+         return;
+      }
+
+      prog->Resident = GL_TRUE;
+   }
+}
+
+
+/**
+ * Get a program parameter register.
+ * \note Not compiled into display lists.
+ * \note Called from the GL API dispatcher.
+ */
+void GLAPIENTRY
+_mesa_GetProgramParameterfvNV(GLenum target, GLuint index,
+                              GLenum pname, GLfloat *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (target == GL_VERTEX_PROGRAM_NV) {
+      if (pname == GL_PROGRAM_PARAMETER_NV) {
+         if (index < MAX_NV_VERTEX_PROGRAM_PARAMS) {
+            COPY_4V(params, ctx->VertexProgram.Parameters[index]);
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_VALUE,
+                        "glGetProgramParameterfvNV(index)");
+            return;
+         }
+      }
+      else {
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramParameterfvNV(pname)");
+         return;
+      }
+   }
+   else {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramParameterfvNV(target)");
+      return;
+   }
+}
+
+
+/**
+ * Get a program parameter register.
+ * \note Not compiled into display lists.
+ * \note Called from the GL API dispatcher.
+ */
+void GLAPIENTRY
+_mesa_GetProgramParameterdvNV(GLenum target, GLuint index,
+                              GLenum pname, GLdouble *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (target == GL_VERTEX_PROGRAM_NV) {
+      if (pname == GL_PROGRAM_PARAMETER_NV) {
+         if (index < MAX_NV_VERTEX_PROGRAM_PARAMS) {
+            COPY_4V(params, ctx->VertexProgram.Parameters[index]);
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_VALUE,
+                        "glGetProgramParameterdvNV(index)");
+            return;
+         }
+      }
+      else {
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramParameterdvNV(pname)");
+         return;
+      }
+   }
+   else {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramParameterdvNV(target)");
+      return;
+   }
+}
+
+
+/**
+ * Get a program attribute.
+ * \note Not compiled into display lists.
+ * \note Called from the GL API dispatcher.
+ */
+void GLAPIENTRY
+_mesa_GetProgramivNV(GLuint id, GLenum pname, GLint *params)
+{
+   struct program *prog;
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (!ctx->_CurrentProgram)
+      ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   prog = (struct program *) _mesa_HashLookup(ctx->Shared->Programs, id);
+   if (!prog) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetProgramivNV");
+      return;
+   }
+
+   switch (pname) {
+      case GL_PROGRAM_TARGET_NV:
+         *params = prog->Target;
+         return;
+      case GL_PROGRAM_LENGTH_NV:
+         *params = prog->String ? _mesa_strlen((char *) prog->String) : 0;
+         return;
+      case GL_PROGRAM_RESIDENT_NV:
+         *params = prog->Resident;
+         return;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramivNV(pname)");
+         return;
+   }
+}
+
+
+/**
+ * Get the program source code.
+ * \note Not compiled into display lists.
+ * \note Called from the GL API dispatcher.
+ */
+void GLAPIENTRY
+_mesa_GetProgramStringNV(GLuint id, GLenum pname, GLubyte *program)
+{
+   struct program *prog;
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (!ctx->_CurrentProgram)
+      ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (pname != GL_PROGRAM_STRING_NV) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramStringNV(pname)");
+      return;
+   }
+
+   prog = (struct program *) _mesa_HashLookup(ctx->Shared->Programs, id);
+   if (!prog) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetProgramStringNV");
+      return;
+   }
+
+   if (prog->String) {
+      MEMCPY(program, prog->String, _mesa_strlen((char *) prog->String));
+   }
+   else {
+      program[0] = 0;
+   }
+}
+
+
+/**
+ * Get matrix tracking information.
+ * \note Not compiled into display lists.
+ * \note Called from the GL API dispatcher.
+ */
+void GLAPIENTRY
+_mesa_GetTrackMatrixivNV(GLenum target, GLuint address,
+                         GLenum pname, GLint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (target == GL_VERTEX_PROGRAM_NV
+       && ctx->Extensions.NV_vertex_program) {
+      GLuint i;
+
+      if ((address & 0x3) || address >= MAX_NV_VERTEX_PROGRAM_PARAMS) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "glGetTrackMatrixivNV(address)");
+         return;
+      }
+
+      i = address / 4;
+
+      switch (pname) {
+         case GL_TRACK_MATRIX_NV:
+            params[0] = (GLint) ctx->VertexProgram.TrackMatrix[i];
+            return;
+         case GL_TRACK_MATRIX_TRANSFORM_NV:
+            params[0] = (GLint) ctx->VertexProgram.TrackMatrixTransform[i];
+            return;
+         default:
+            _mesa_error(ctx, GL_INVALID_ENUM, "glGetTrackMatrixivNV");
+            return;
+      }
+   }
+   else {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTrackMatrixivNV");
+      return;
+   }
+}
+
+
+/**
+ * Get a vertex (or vertex array) attribute.
+ * \note Not compiled into display lists.
+ * \note Called from the GL API dispatcher.
+ */
+void GLAPIENTRY
+_mesa_GetVertexAttribdvNV(GLuint index, GLenum pname, GLdouble *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (index == 0 || index >= MAX_NV_VERTEX_PROGRAM_INPUTS) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glGetVertexAttribdvNV(index)");
+      return;
+   }
+
+   switch (pname) {
+      case GL_ATTRIB_ARRAY_SIZE_NV:
+         params[0] = ctx->Array.VertexAttrib[index].Size;
+         break;
+      case GL_ATTRIB_ARRAY_STRIDE_NV:
+         params[0] = ctx->Array.VertexAttrib[index].Stride;
+         break;
+      case GL_ATTRIB_ARRAY_TYPE_NV:
+         params[0] = ctx->Array.VertexAttrib[index].Type;
+         break;
+      case GL_CURRENT_ATTRIB_NV:
+	 FLUSH_CURRENT(ctx, 0);
+         COPY_4V(params, ctx->Current.Attrib[index]);
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetVertexAttribdvNV");
+         return;
+   }
+}
+
+/**
+ * Get a vertex (or vertex array) attribute.
+ * \note Not compiled into display lists.
+ * \note Called from the GL API dispatcher.
+ */
+void GLAPIENTRY
+_mesa_GetVertexAttribfvNV(GLuint index, GLenum pname, GLfloat *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (index == 0 || index >= MAX_NV_VERTEX_PROGRAM_INPUTS) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glGetVertexAttribdvNV(index)");
+      return;
+   }
+
+   switch (pname) {
+      case GL_ATTRIB_ARRAY_SIZE_NV:
+         params[0] = (GLfloat) ctx->Array.VertexAttrib[index].Size;
+         break;
+      case GL_ATTRIB_ARRAY_STRIDE_NV:
+         params[0] = (GLfloat) ctx->Array.VertexAttrib[index].Stride;
+         break;
+      case GL_ATTRIB_ARRAY_TYPE_NV:
+         params[0] = (GLfloat) ctx->Array.VertexAttrib[index].Type;
+         break;
+      case GL_CURRENT_ATTRIB_NV:
+	 FLUSH_CURRENT(ctx, 0);
+         COPY_4V(params, ctx->Current.Attrib[index]);
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetVertexAttribdvNV");
+         return;
+   }
+}
+
+/**
+ * Get a vertex (or vertex array) attribute.
+ * \note Not compiled into display lists.
+ * \note Called from the GL API dispatcher.
+ */
+void GLAPIENTRY
+_mesa_GetVertexAttribivNV(GLuint index, GLenum pname, GLint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (index == 0 || index >= MAX_NV_VERTEX_PROGRAM_INPUTS) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glGetVertexAttribdvNV(index)");
+      return;
+   }
+
+   switch (pname) {
+      case GL_ATTRIB_ARRAY_SIZE_NV:
+         params[0] = ctx->Array.VertexAttrib[index].Size;
+         break;
+      case GL_ATTRIB_ARRAY_STRIDE_NV:
+         params[0] = ctx->Array.VertexAttrib[index].Stride;
+         break;
+      case GL_ATTRIB_ARRAY_TYPE_NV:
+         params[0] = ctx->Array.VertexAttrib[index].Type;
+         break;
+      case GL_CURRENT_ATTRIB_NV:
+	 FLUSH_CURRENT(ctx, 0);
+         params[0] = (GLint) ctx->Current.Attrib[index][0];
+         params[1] = (GLint) ctx->Current.Attrib[index][1];
+         params[2] = (GLint) ctx->Current.Attrib[index][2];
+         params[3] = (GLint) ctx->Current.Attrib[index][3];
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB:
+         if (!ctx->Extensions.ARB_vertex_buffer_object) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glGetVertexAttribdvNV");
+            return;
+         }
+         params[0] = ctx->Array.VertexAttrib[index].BufferObj->Name;
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetVertexAttribdvNV");
+         return;
+   }
+}
+
+
+/**
+ * Get a vertex array attribute pointer.
+ * \note Not compiled into display lists.
+ * \note Called from the GL API dispatcher.
+ */
+void GLAPIENTRY
+_mesa_GetVertexAttribPointervNV(GLuint index, GLenum pname, GLvoid **pointer)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (index >= MAX_NV_VERTEX_PROGRAM_INPUTS) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glGetVertexAttribPointerNV(index)");
+      return;
+   }
+
+   if (pname != GL_ATTRIB_ARRAY_POINTER_NV) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetVertexAttribPointerNV(pname)");
+      return;
+   }
+
+   *pointer = (GLvoid *) ctx->Array.VertexAttrib[index].Ptr;;
+}
+
+
+
+/**
+ * Load/parse/compile a program.
+ * \note Called from the GL API dispatcher.
+ */
+void GLAPIENTRY
+_mesa_LoadProgramNV(GLenum target, GLuint id, GLsizei len,
+                    const GLubyte *program)
+{
+   struct program *prog;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (id == 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glLoadProgramNV(id)");
+      return;
+   }
+
+   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
+
+   prog = (struct program *) _mesa_HashLookup(ctx->Shared->Programs, id);
+
+   if (prog && prog->Target != 0 && prog->Target != target) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glLoadProgramNV(target)");
+      return;
+   }
+
+   if ((target == GL_VERTEX_PROGRAM_NV ||
+        target == GL_VERTEX_STATE_PROGRAM_NV)
+       && ctx->Extensions.NV_vertex_program) {
+      struct vertex_program *vprog = (struct vertex_program *) prog;
+      if (!vprog) {
+         vprog = CALLOC_STRUCT(vertex_program);
+         if (!vprog) {
+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");
+            return;
+         }
+         vprog->Base.RefCount = 1;
+         vprog->Base.Resident = GL_TRUE;
+         _mesa_HashInsert(ctx->Shared->Programs, id, vprog);
+      }
+      _mesa_parse_nv_vertex_program(ctx, target, program, len, vprog);
+   }
+   else if (target == GL_FRAGMENT_PROGRAM_NV
+            && ctx->Extensions.NV_fragment_program) {
+      struct fragment_program *fprog = (struct fragment_program *) prog;
+      if (!fprog) {
+         fprog = CALLOC_STRUCT(fragment_program);
+         if (!fprog) {
+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");
+            return;
+         }
+         fprog->Base.RefCount = 1;
+         fprog->Base.Resident = GL_TRUE;
+         _mesa_HashInsert(ctx->Shared->Programs, id, fprog);
+      }
+      _mesa_parse_nv_fragment_program(ctx, target, program, len, fprog);
+   }
+   else {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glLoadProgramNV(target)");
+   }
+}
+
+
+
+/**
+ * Set a program parameter register.
+ * \note Called from the GL API dispatcher.
+ */
+void GLAPIENTRY
+_mesa_ProgramParameter4dNV(GLenum target, GLuint index,
+                           GLdouble x, GLdouble y, GLdouble z, GLdouble w)
+{
+   _mesa_ProgramParameter4fNV(target, index, 
+		   	      (GLfloat)x, (GLfloat)y, (GLfloat)z, (GLfloat)w);
+}
+
+
+/**
+ * Set a program parameter register.
+ * \note Called from the GL API dispatcher.
+ */
+void GLAPIENTRY
+_mesa_ProgramParameter4dvNV(GLenum target, GLuint index,
+                            const GLdouble *params)
+{
+   _mesa_ProgramParameter4fNV(target, index,
+                              (GLfloat)params[0], (GLfloat)params[1], 
+			      (GLfloat)params[2], (GLfloat)params[3]);
+}
+
+
+/**
+ * Set a program parameter register.
+ * \note Called from the GL API dispatcher.
+ */
+void GLAPIENTRY
+_mesa_ProgramParameter4fNV(GLenum target, GLuint index,
+                           GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (target == GL_VERTEX_PROGRAM_NV && ctx->Extensions.NV_vertex_program) {
+      if (index < MAX_NV_VERTEX_PROGRAM_PARAMS) {
+         FLUSH_VERTICES(ctx, _NEW_PROGRAM);
+         ASSIGN_4V(ctx->VertexProgram.Parameters[index], x, y, z, w);
+      }
+      else {
+         _mesa_error(ctx, GL_INVALID_VALUE, "glProgramParameterNV(index)");
+         return;
+      }
+   }
+   else {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glProgramParameterNV");
+      return;
+   }
+}
+
+
+/**
+ * Set a program parameter register.
+ * \note Called from the GL API dispatcher.
+ */
+void GLAPIENTRY
+_mesa_ProgramParameter4fvNV(GLenum target, GLuint index,
+                            const GLfloat *params)
+{
+   _mesa_ProgramParameter4fNV(target, index,
+                              params[0], params[1], params[2], params[3]);
+}
+
+
+
+/**
+ * Set a sequence of program parameter registers.
+ * \note Called from the GL API dispatcher.
+ */
+void GLAPIENTRY
+_mesa_ProgramParameters4dvNV(GLenum target, GLuint index,
+                             GLuint num, const GLdouble *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (target == GL_VERTEX_PROGRAM_NV && ctx->Extensions.NV_vertex_program) {
+      GLuint i;
+      if (index + num > MAX_NV_VERTEX_PROGRAM_PARAMS) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "glProgramParameters4dvNV");
+         return;
+      }
+      for (i = 0; i < num; i++) {
+         ctx->VertexProgram.Parameters[index + i][0] = (GLfloat) params[0];
+         ctx->VertexProgram.Parameters[index + i][1] = (GLfloat) params[1];
+         ctx->VertexProgram.Parameters[index + i][2] = (GLfloat) params[2];
+         ctx->VertexProgram.Parameters[index + i][3] = (GLfloat) params[3];
+         params += 4;
+      };
+   }
+   else {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glProgramParameters4dvNV");
+      return;
+   }
+}
+
+
+/**
+ * Set a sequence of program parameter registers.
+ * \note Called from the GL API dispatcher.
+ */
+void GLAPIENTRY
+_mesa_ProgramParameters4fvNV(GLenum target, GLuint index,
+                             GLuint num, const GLfloat *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (target == GL_VERTEX_PROGRAM_NV && ctx->Extensions.NV_vertex_program) {
+      GLuint i;
+      if (index + num > MAX_NV_VERTEX_PROGRAM_PARAMS) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "glProgramParameters4fvNV");
+         return;
+      }
+      for (i = 0; i < num; i++) {
+         COPY_4V(ctx->VertexProgram.Parameters[index + i], params);
+         params += 4;
+      };
+   }
+   else {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glProgramParameters4fvNV");
+      return;
+   }
+}
+
+
+
+/**
+ * Setup tracking of matrices into program parameter registers.
+ * \note Called from the GL API dispatcher.
+ */
+void GLAPIENTRY
+_mesa_TrackMatrixNV(GLenum target, GLuint address,
+                    GLenum matrix, GLenum transform)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
+
+   if (target == GL_VERTEX_PROGRAM_NV && ctx->Extensions.NV_vertex_program) {
+      if (address & 0x3) {
+         /* addr must be multiple of four */
+         _mesa_error(ctx, GL_INVALID_VALUE, "glTrackMatrixNV(address)");
+         return;
+      }
+
+      switch (matrix) {
+         case GL_NONE:
+         case GL_MODELVIEW:
+         case GL_PROJECTION:
+         case GL_TEXTURE:
+         case GL_COLOR:
+         case GL_MODELVIEW_PROJECTION_NV:
+         case GL_MATRIX0_NV:
+         case GL_MATRIX1_NV:
+         case GL_MATRIX2_NV:
+         case GL_MATRIX3_NV:
+         case GL_MATRIX4_NV:
+         case GL_MATRIX5_NV:
+         case GL_MATRIX6_NV:
+         case GL_MATRIX7_NV:
+            /* OK, fallthrough */
+            break;
+         default:
+            _mesa_error(ctx, GL_INVALID_ENUM, "glTrackMatrixNV(matrix)");
+            return;
+      }
+
+      switch (transform) {
+         case GL_IDENTITY_NV:
+         case GL_INVERSE_NV:
+         case GL_TRANSPOSE_NV:
+         case GL_INVERSE_TRANSPOSE_NV:
+            /* OK, fallthrough */
+            break;
+         default:
+            _mesa_error(ctx, GL_INVALID_ENUM, "glTrackMatrixNV(transform)");
+            return;
+      }
+
+      ctx->VertexProgram.TrackMatrix[address / 4] = matrix;
+      ctx->VertexProgram.TrackMatrixTransform[address / 4] = transform;
+   }
+   else {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glTrackMatrixNV(target)");
+      return;
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_ProgramNamedParameter4fNV(GLuint id, GLsizei len, const GLubyte *name,
+                                GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   struct program *prog;
+   struct fragment_program *fragProg;
+   GLfloat *v;
+
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
+
+   prog = (struct program *) _mesa_HashLookup(ctx->Shared->Programs, id);
+   if (!prog || prog->Target != GL_FRAGMENT_PROGRAM_NV) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glProgramNamedParameterNV");
+      return;
+   }
+
+   if (len <= 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glProgramNamedParameterNV");
+      return;
+   }
+
+   fragProg = (struct fragment_program *) prog;
+   v = _mesa_lookup_parameter_value(fragProg->Parameters, len, (char *) name);
+   if (v) {
+      v[0] = x;
+      v[1] = y;
+      v[2] = z;
+      v[3] = w;
+      return;
+   }
+
+   _mesa_error(ctx, GL_INVALID_VALUE, "glProgramNamedParameterNV");
+}
+
+
+void GLAPIENTRY
+_mesa_ProgramNamedParameter4fvNV(GLuint id, GLsizei len, const GLubyte *name,
+                                 const float v[])
+{
+   _mesa_ProgramNamedParameter4fNV(id, len, name, v[0], v[1], v[2], v[3]);
+}
+
+
+void GLAPIENTRY
+_mesa_ProgramNamedParameter4dNV(GLuint id, GLsizei len, const GLubyte *name,
+                                GLdouble x, GLdouble y, GLdouble z, GLdouble w)
+{
+   _mesa_ProgramNamedParameter4fNV(id, len, name, (GLfloat)x, (GLfloat)y, 
+                                   (GLfloat)z, (GLfloat)w);
+}
+
+
+void GLAPIENTRY
+_mesa_ProgramNamedParameter4dvNV(GLuint id, GLsizei len, const GLubyte *name,
+                                 const double v[])
+{
+   _mesa_ProgramNamedParameter4fNV(id, len, name,
+                                   (GLfloat)v[0], (GLfloat)v[1],
+                                   (GLfloat)v[2], (GLfloat)v[3]);
+}
+
+
+void GLAPIENTRY
+_mesa_GetProgramNamedParameterfvNV(GLuint id, GLsizei len, const GLubyte *name,
+                                   GLfloat *params)
+{
+   struct program *prog;
+   struct fragment_program *fragProg;
+   const GLfloat *v;
+
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (!ctx->_CurrentProgram)
+      ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   prog = (struct program *) _mesa_HashLookup(ctx->Shared->Programs, id);
+   if (!prog || prog->Target != GL_FRAGMENT_PROGRAM_NV) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetProgramNamedParameterNV");
+      return;
+   }
+
+   if (len <= 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glGetProgramNamedParameterNV");
+      return;
+   }
+
+   fragProg = (struct fragment_program *) prog;
+   v = _mesa_lookup_parameter_value(fragProg->Parameters, len, (char *) name);
+   if (v) {
+      params[0] = v[0];
+      params[1] = v[1];
+      params[2] = v[2];
+      params[3] = v[3];
+      return;
+   }
+
+   _mesa_error(ctx, GL_INVALID_VALUE, "glGetProgramNamedParameterNV");
+}
+
+
+void GLAPIENTRY
+_mesa_GetProgramNamedParameterdvNV(GLuint id, GLsizei len, const GLubyte *name,
+                                   GLdouble *params)
+{
+   GLfloat floatParams[4];
+   _mesa_GetProgramNamedParameterfvNV(id, len, name, floatParams);
+   COPY_4V(params, floatParams);
+}
diff --git a/reactos/lib/mesa32/src/main/nvprogram.h b/reactos/lib/mesa32/src/main/nvprogram.h
new file mode 100644
index 00000000000..dcea7727e04
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/nvprogram.h
@@ -0,0 +1,119 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Brian Paul
+ */
+
+
+#ifndef NVPROGRAM_H
+#define NVPROGRAM_H
+
+
+extern void GLAPIENTRY
+_mesa_ExecuteProgramNV(GLenum target, GLuint id, const GLfloat *params);
+
+extern GLboolean GLAPIENTRY 
+_mesa_AreProgramsResidentNV(GLsizei n, const GLuint *ids, GLboolean *residences);
+
+extern void GLAPIENTRY
+_mesa_RequestResidentProgramsNV(GLsizei n, const GLuint *ids);
+
+extern void GLAPIENTRY
+_mesa_GetProgramParameterfvNV(GLenum target, GLuint index, GLenum pname, GLfloat *params);
+
+extern void GLAPIENTRY
+_mesa_GetProgramParameterdvNV(GLenum target, GLuint index, GLenum pname, GLdouble *params);
+
+extern void GLAPIENTRY
+_mesa_GetProgramivNV(GLuint id, GLenum pname, GLint *params);
+
+extern void GLAPIENTRY
+_mesa_GetProgramStringNV(GLuint id, GLenum pname, GLubyte *program);
+
+extern void GLAPIENTRY
+_mesa_GetTrackMatrixivNV(GLenum target, GLuint address, GLenum pname, GLint *params);
+
+extern void GLAPIENTRY
+_mesa_GetVertexAttribdvNV(GLuint index, GLenum pname, GLdouble *params);
+
+extern void GLAPIENTRY
+_mesa_GetVertexAttribfvNV(GLuint index, GLenum pname, GLfloat *params);
+
+extern void GLAPIENTRY
+_mesa_GetVertexAttribivNV(GLuint index, GLenum pname, GLint *params);
+
+extern void GLAPIENTRY
+_mesa_GetVertexAttribPointervNV(GLuint index, GLenum pname, GLvoid **pointer);
+
+extern void GLAPIENTRY
+_mesa_LoadProgramNV(GLenum target, GLuint id, GLsizei len, const GLubyte *program);
+
+extern void GLAPIENTRY
+_mesa_ProgramParameter4dNV(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+
+extern void GLAPIENTRY
+_mesa_ProgramParameter4dvNV(GLenum target, GLuint index, const GLdouble *params);
+
+extern void GLAPIENTRY
+_mesa_ProgramParameter4fNV(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+
+extern void GLAPIENTRY
+_mesa_ProgramParameter4fvNV(GLenum target, GLuint index, const GLfloat *params);
+
+extern void GLAPIENTRY
+_mesa_ProgramParameters4dvNV(GLenum target, GLuint index, GLuint num, const GLdouble *params);
+
+extern void GLAPIENTRY
+_mesa_ProgramParameters4fvNV(GLenum target, GLuint index, GLuint num, const GLfloat *params);
+
+extern void GLAPIENTRY
+_mesa_TrackMatrixNV(GLenum target, GLuint address, GLenum matrix, GLenum transform);
+
+
+extern void GLAPIENTRY
+_mesa_ProgramNamedParameter4fNV(GLuint id, GLsizei len, const GLubyte *name,
+                                GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+
+extern void GLAPIENTRY
+_mesa_ProgramNamedParameter4fvNV(GLuint id, GLsizei len, const GLubyte *name,
+                                 const float v[]);
+
+extern void GLAPIENTRY
+_mesa_ProgramNamedParameter4dNV(GLuint id, GLsizei len, const GLubyte *name,
+                                GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+
+extern void GLAPIENTRY
+_mesa_ProgramNamedParameter4dvNV(GLuint id, GLsizei len, const GLubyte *name,
+                                 const double v[]);
+
+extern void GLAPIENTRY
+_mesa_GetProgramNamedParameterfvNV(GLuint id, GLsizei len, const GLubyte *name,
+                                   GLfloat *params);
+
+extern void GLAPIENTRY
+_mesa_GetProgramNamedParameterdvNV(GLuint id, GLsizei len, const GLubyte *name,
+                                   GLdouble *params);
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/nvvertexec.c b/reactos/lib/mesa32/src/main/nvvertexec.c
new file mode 100644
index 00000000000..9663b38157d
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/nvvertexec.c
@@ -0,0 +1,839 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0.1
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file nvvertexec.c
+ * Code to execute vertex programs.
+ * \author Brian Paul
+ */
+
+#include "glheader.h"
+#include "context.h"
+#include "imports.h"
+#include "macros.h"
+#include "mtypes.h"
+#include "nvvertexec.h"
+#include "nvvertprog.h"
+#include "program.h"
+#include "math/m_matrix.h"
+
+
+static const GLfloat zeroVec[4] = { 0, 0, 0, 0 };
+
+
+/**
+ * Load/initialize the vertex program registers.
+ * This needs to be done per vertex.
+ */
+void
+_mesa_init_vp_registers(GLcontext *ctx)
+{
+   GLuint i;
+
+   /* Input registers get initialized from the current vertex attribs */
+   MEMCPY(ctx->VertexProgram.Inputs, ctx->Current.Attrib,
+          VERT_ATTRIB_MAX * 4 * sizeof(GLfloat));
+
+   /* Output and temp regs are initialized to [0,0,0,1] */
+   for (i = 0; i < MAX_NV_VERTEX_PROGRAM_OUTPUTS; i++) {
+      ASSIGN_4V(ctx->VertexProgram.Outputs[i], 0.0F, 0.0F, 0.0F, 1.0F);
+   }
+   for (i = 0; i < MAX_NV_VERTEX_PROGRAM_TEMPS; i++) {
+      ASSIGN_4V(ctx->VertexProgram.Temporaries[i], 0.0F, 0.0F, 0.0F, 1.0F);
+   }
+
+   /* The program parameters aren't touched */
+   /* XXX: This should be moved to glBegin() time, but its safe (and slow!) 
+    * here - Karl
+    */
+   if (ctx->VertexProgram.Current->Parameters) {
+      /* Grab the state */			  
+      _mesa_load_state_parameters(ctx, ctx->VertexProgram.Current->Parameters);
+
+      /* And copy it into the program state */
+      for (i=0; i<ctx->VertexProgram.Current->Parameters->NumParameters; i++) {
+         MEMCPY(ctx->VertexProgram.Parameters[i], 
+                &ctx->VertexProgram.Current->Parameters->Parameters[i].Values,
+                4*sizeof(GLfloat));				
+      }				  
+   }
+}
+
+
+
+/**
+ * Copy the 16 elements of a matrix into four consecutive program
+ * registers starting at 'pos'.
+ */
+static void
+load_matrix(GLfloat registers[][4], GLuint pos, const GLfloat mat[16])
+{
+   GLuint i;
+   for (i = 0; i < 4; i++) {
+      registers[pos + i][0] = mat[0 + i];
+      registers[pos + i][1] = mat[4 + i];
+      registers[pos + i][2] = mat[8 + i];
+      registers[pos + i][3] = mat[12 + i];
+   }
+}
+
+
+/**
+ * As above, but transpose the matrix.
+ */
+static void
+load_transpose_matrix(GLfloat registers[][4], GLuint pos,
+                      const GLfloat mat[16])
+{
+   MEMCPY(registers[pos], mat, 16 * sizeof(GLfloat));
+}
+
+
+/**
+ * Load all currently tracked matrices into the program registers.
+ * This needs to be done per glBegin/glEnd.
+ */
+void
+_mesa_init_tracked_matrices(GLcontext *ctx)
+{
+   GLuint i;
+
+   for (i = 0; i < MAX_NV_VERTEX_PROGRAM_PARAMS / 4; i++) {
+      /* point 'mat' at source matrix */
+      GLmatrix *mat;
+      if (ctx->VertexProgram.TrackMatrix[i] == GL_MODELVIEW) {
+         mat = ctx->ModelviewMatrixStack.Top;
+      }
+      else if (ctx->VertexProgram.TrackMatrix[i] == GL_PROJECTION) {
+         mat = ctx->ProjectionMatrixStack.Top;
+      }
+      else if (ctx->VertexProgram.TrackMatrix[i] == GL_TEXTURE) {
+         mat = ctx->TextureMatrixStack[ctx->Texture.CurrentUnit].Top;
+      }
+      else if (ctx->VertexProgram.TrackMatrix[i] == GL_COLOR) {
+         mat = ctx->ColorMatrixStack.Top;
+      }
+      else if (ctx->VertexProgram.TrackMatrix[i]==GL_MODELVIEW_PROJECTION_NV) {
+         /* XXX verify the combined matrix is up to date */
+         mat = &ctx->_ModelProjectMatrix;
+      }
+      else if (ctx->VertexProgram.TrackMatrix[i] >= GL_MATRIX0_NV &&
+               ctx->VertexProgram.TrackMatrix[i] <= GL_MATRIX7_NV) {
+         GLuint n = ctx->VertexProgram.TrackMatrix[i] - GL_MATRIX0_NV;
+         ASSERT(n < MAX_PROGRAM_MATRICES);
+         mat = ctx->ProgramMatrixStack[n].Top;
+      }
+      else {
+         /* no matrix is tracked, but we leave the register values as-is */
+         assert(ctx->VertexProgram.TrackMatrix[i] == GL_NONE);
+         continue;
+      }
+
+      /* load the matrix */
+      if (ctx->VertexProgram.TrackMatrixTransform[i] == GL_IDENTITY_NV) {
+         load_matrix(ctx->VertexProgram.Parameters, i*4, mat->m);
+      }
+      else if (ctx->VertexProgram.TrackMatrixTransform[i] == GL_INVERSE_NV) {
+         _math_matrix_analyse(mat); /* update the inverse */
+         assert((mat->flags & MAT_DIRTY_INVERSE) == 0);
+         load_matrix(ctx->VertexProgram.Parameters, i*4, mat->inv);
+      }
+      else if (ctx->VertexProgram.TrackMatrixTransform[i] == GL_TRANSPOSE_NV) {
+         load_transpose_matrix(ctx->VertexProgram.Parameters, i*4, mat->m);
+      }
+      else {
+         assert(ctx->VertexProgram.TrackMatrixTransform[i]
+                == GL_INVERSE_TRANSPOSE_NV);
+         _math_matrix_analyse(mat); /* update the inverse */
+         assert((mat->flags & MAT_DIRTY_INVERSE) == 0);
+         load_transpose_matrix(ctx->VertexProgram.Parameters, i*4, mat->inv);
+      }
+   }
+}
+
+
+
+/**
+ * For debugging.  Dump the current vertex program machine registers.
+ */
+void
+_mesa_dump_vp_state( const struct vertex_program_state *state )
+{
+   int i;
+   _mesa_printf("VertexIn:\n");
+   for (i = 0; i < MAX_NV_VERTEX_PROGRAM_INPUTS; i++) {
+      _mesa_printf("%d: %f %f %f %f   ", i,
+                   state->Inputs[i][0],
+                   state->Inputs[i][1],
+                   state->Inputs[i][2],
+                   state->Inputs[i][3]);
+   }
+   _mesa_printf("\n");
+
+   _mesa_printf("VertexOut:\n");
+   for (i = 0; i < MAX_NV_VERTEX_PROGRAM_OUTPUTS; i++) {
+      _mesa_printf("%d: %f %f %f %f   ", i,
+                  state->Outputs[i][0],
+                  state->Outputs[i][1],
+                  state->Outputs[i][2],
+                  state->Outputs[i][3]);
+   }
+   _mesa_printf("\n");
+
+   _mesa_printf("Registers:\n");
+   for (i = 0; i < MAX_NV_VERTEX_PROGRAM_TEMPS; i++) {
+      _mesa_printf("%d: %f %f %f %f   ", i,
+                  state->Temporaries[i][0],
+                  state->Temporaries[i][1],
+                  state->Temporaries[i][2],
+                  state->Temporaries[i][3]);
+   }
+   _mesa_printf("\n");
+
+   _mesa_printf("Parameters:\n");
+   for (i = 0; i < MAX_NV_VERTEX_PROGRAM_PARAMS; i++) {
+      _mesa_printf("%d: %f %f %f %f   ", i,
+                  state->Parameters[i][0],
+                  state->Parameters[i][1],
+                  state->Parameters[i][2],
+                  state->Parameters[i][3]);
+   }
+   _mesa_printf("\n");
+}
+
+
+
+/**
+ * Return a pointer to the 4-element float vector specified by the given
+ * source register.
+ */
+static INLINE const GLfloat *
+get_register_pointer( const struct vp_src_register *source,
+                      const struct vertex_program_state *state )
+{
+   if (source->RelAddr) {
+      const GLint reg = source->Index + state->AddressReg[0];
+      ASSERT( (source->File == PROGRAM_ENV_PARAM) || 
+        (source->File == PROGRAM_STATE_VAR) );
+      if (reg < 0 || reg > MAX_NV_VERTEX_PROGRAM_PARAMS)
+         return zeroVec;
+      else
+         return state->Parameters[reg];
+   }
+   else {
+      switch (source->File) {
+         case PROGRAM_TEMPORARY:
+            return state->Temporaries[source->Index];
+         case PROGRAM_INPUT:
+            return state->Inputs[source->Index];
+         case PROGRAM_LOCAL_PARAM:
+            /* XXX fix */
+            return state->Temporaries[source->Index]; 
+         case PROGRAM_ENV_PARAM:
+            return state->Parameters[source->Index];
+         case PROGRAM_STATE_VAR:
+            return state->Parameters[source->Index];
+         default:
+            _mesa_problem(NULL,
+                          "Bad source register file in fetch_vector4(vp)");
+            return NULL;
+      }
+   }
+   return NULL;
+}
+
+
+/**
+ * Fetch a 4-element float vector from the given source register.
+ * Apply swizzling and negating as needed.
+ */
+static INLINE void
+fetch_vector4( const struct vp_src_register *source,
+               const struct vertex_program_state *state,
+               GLfloat result[4] )
+{
+   const GLfloat *src = get_register_pointer(source, state);
+
+   if (source->Negate) {
+      result[0] = -src[source->Swizzle[0]];
+      result[1] = -src[source->Swizzle[1]];
+      result[2] = -src[source->Swizzle[2]];
+      result[3] = -src[source->Swizzle[3]];
+   }
+   else {
+      result[0] = src[source->Swizzle[0]];
+      result[1] = src[source->Swizzle[1]];
+      result[2] = src[source->Swizzle[2]];
+      result[3] = src[source->Swizzle[3]];
+   }
+}
+
+
+
+/**
+ * As above, but only return result[0] element.
+ */
+static INLINE void
+fetch_vector1( const struct vp_src_register *source,
+               const struct vertex_program_state *state,
+               GLfloat result[4] )
+{
+   const GLfloat *src = get_register_pointer(source, state);
+
+   if (source->Negate) {
+      result[0] = -src[source->Swizzle[0]];
+   }
+   else {
+      result[0] = src[source->Swizzle[0]];
+   }
+}
+
+
+/**
+ * Store 4 floats into a register.
+ */
+static void
+store_vector4( const struct vp_dst_register *dest,
+               struct vertex_program_state *state,
+               const GLfloat value[4] )
+{
+   GLfloat *dst;
+   switch (dest->File) {
+      case PROGRAM_TEMPORARY:
+         dst = state->Temporaries[dest->Index];
+         break;
+      case PROGRAM_OUTPUT:
+         dst = state->Outputs[dest->Index];
+         break;
+      case PROGRAM_ENV_PARAM:
+         {
+            /* a slight hack */
+            GET_CURRENT_CONTEXT(ctx);
+            dst = ctx->VertexProgram.Parameters[dest->Index];
+         }
+         break;
+      default:
+         _mesa_problem(NULL, "Invalid register file in store_vector4(file=%d)",
+                       dest->File);
+         return;
+   }
+
+   if (dest->WriteMask[0])
+      dst[0] = value[0];
+   if (dest->WriteMask[1])
+      dst[1] = value[1];
+   if (dest->WriteMask[2])
+      dst[2] = value[2];
+   if (dest->WriteMask[3])
+      dst[3] = value[3];
+}
+
+
+/**
+ * Set x to positive or negative infinity.
+ */
+#if defined(USE_IEEE) || defined(_WIN32)
+#define SET_POS_INFINITY(x)  ( *((GLuint *) &x) = 0x7F800000 )
+#define SET_NEG_INFINITY(x)  ( *((GLuint *) &x) = 0xFF800000 )
+#elif defined(VMS)
+#define SET_POS_INFINITY(x)  x = __MAXFLOAT
+#define SET_NEG_INFINITY(x)  x = -__MAXFLOAT
+#else
+#define SET_POS_INFINITY(x)  x = (GLfloat) HUGE_VAL
+#define SET_NEG_INFINITY(x)  x = (GLfloat) -HUGE_VAL
+#endif
+
+#define SET_FLOAT_BITS(x, bits) ((fi_type *) &(x))->i = bits
+
+
+/**
+ * Execute the given vertex program
+ */
+void
+_mesa_exec_vertex_program(GLcontext *ctx, const struct vertex_program *program)
+{
+   struct vertex_program_state *state = &ctx->VertexProgram;
+   const struct vp_instruction *inst;
+
+   ctx->_CurrentProgram = GL_VERTEX_PROGRAM_ARB; /* or NV, doesn't matter */
+
+   /* If the program is position invariant, multiply the input
+    * position and the MVP matrix and stick it into the output pos slot
+    */
+   if (ctx->VertexProgram.Current->IsPositionInvariant) {
+      TRANSFORM_POINT( ctx->VertexProgram.Outputs[0], 
+                       ctx->_ModelProjectMatrix.m, 
+                       ctx->VertexProgram.Inputs[0]);
+
+      /* XXX: This could go elsewhere */
+      ctx->VertexProgram.Current->OutputsWritten |= 0x1;
+   }
+
+   for (inst = program->Instructions; /*inst->Opcode != VP_OPCODE_END*/; inst++) {
+
+      if (ctx->VertexProgram.CallbackEnabled &&
+          ctx->VertexProgram.Callback) {
+         ctx->VertexProgram.CurrentPosition = inst->StringPos;
+         ctx->VertexProgram.Callback(program->Base.Target,
+                                     ctx->VertexProgram.CallbackData);
+      }
+
+      switch (inst->Opcode) {
+         case VP_OPCODE_MOV:
+            {
+               GLfloat t[4];
+               fetch_vector4( &inst->SrcReg[0], state, t );
+               store_vector4( &inst->DstReg, state, t );
+            }
+            break;
+         case VP_OPCODE_LIT:
+            {
+               const GLfloat epsilon = 1.0e-5F; /* XXX fix? */
+               GLfloat t[4], lit[4];
+               fetch_vector4( &inst->SrcReg[0], state, t );
+               if (t[3] < -(128.0F - epsilon))
+                   t[3] = - (128.0F - epsilon);
+               else if (t[3] > 128.0F - epsilon)
+                  t[3] = 128.0F - epsilon;
+               if (t[0] < 0.0)
+                  t[0] = 0.0;
+               if (t[1] < 0.0)
+                  t[1] = 0.0;
+               lit[0] = 1.0;
+               lit[1] = t[0];
+               lit[2] = (t[0] > 0.0) ? (GLfloat) exp(t[3] * log(t[1])) : 0.0F;
+               lit[3] = 1.0;
+               store_vector4( &inst->DstReg, state, lit );
+            }
+            break;
+         case VP_OPCODE_RCP:
+            {
+               GLfloat t[4];
+               fetch_vector1( &inst->SrcReg[0], state, t );
+               if (t[0] != 1.0F)
+                  t[0] = 1.0F / t[0];  /* div by zero is infinity! */
+               t[1] = t[2] = t[3] = t[0];
+               store_vector4( &inst->DstReg, state, t );
+            }
+            break;
+         case VP_OPCODE_RSQ:
+            {
+               GLfloat t[4];
+               fetch_vector1( &inst->SrcReg[0], state, t );
+               t[0] = INV_SQRTF(FABSF(t[0]));
+               t[1] = t[2] = t[3] = t[0];
+               store_vector4( &inst->DstReg, state, t );
+            }
+            break;
+         case VP_OPCODE_EXP:
+            {
+               GLfloat t[4], q[4], floor_t0;
+               fetch_vector1( &inst->SrcReg[0], state, t );
+               floor_t0 = (float) floor(t[0]);
+               if (floor_t0 > FLT_MAX_EXP) {
+                  SET_POS_INFINITY(q[0]);
+                  SET_POS_INFINITY(q[2]);
+               }
+               else if (floor_t0 < FLT_MIN_EXP) {
+                  q[0] = 0.0F;
+                  q[2] = 0.0F;
+               }
+               else {
+#ifdef USE_IEEE
+                  GLint ii = (GLint) floor_t0;
+                  ii = (ii < 23) + 0x3f800000;
+                  SET_FLOAT_BITS(q[0], ii);
+                  q[0] = *((GLfloat *) &ii);
+#else
+                  q[0] = (GLfloat) pow(2.0, floor_t0);
+#endif
+                  q[2] = (GLfloat) (q[0] * LOG2(q[1]));
+               }
+               q[1] = t[0] - floor_t0;
+               q[3] = 1.0F;
+               store_vector4( &inst->DstReg, state, q );
+            }
+            break;
+         case VP_OPCODE_LOG:
+            {
+               GLfloat t[4], q[4], abs_t0;
+               fetch_vector1( &inst->SrcReg[0], state, t );
+               abs_t0 = (GLfloat) fabs(t[0]);
+               if (abs_t0 != 0.0F) {
+                  /* Since we really can't handle infinite values on VMS
+                   * like other OSes we'll use __MAXFLOAT to represent
+                   * infinity.  This may need some tweaking.
+                   */
+#ifdef VMS
+                  if (abs_t0 == __MAXFLOAT)
+#else
+                  if (IS_INF_OR_NAN(abs_t0))
+#endif
+                  {
+                     SET_POS_INFINITY(q[0]);
+                     q[1] = 1.0F;
+                     SET_POS_INFINITY(q[2]);
+                  }
+                  else {
+                     int exponent;
+                     double mantissa = frexp(t[0], &exponent);
+                     q[0] = (GLfloat) (exponent - 1);
+                     q[1] = (GLfloat) (2.0 * mantissa); /* map [.5, 1) -> [1, 2) */
+                     q[2] = (GLfloat) (q[0] + LOG2(q[1]));
+                  }
+                  }
+               else {
+                  SET_NEG_INFINITY(q[0]);
+                  q[1] = 1.0F;
+                  SET_NEG_INFINITY(q[2]);
+               }
+               q[3] = 1.0;
+               store_vector4( &inst->DstReg, state, q );
+            }
+            break;
+         case VP_OPCODE_MUL:
+            {
+               GLfloat t[4], u[4], prod[4];
+               fetch_vector4( &inst->SrcReg[0], state, t );
+               fetch_vector4( &inst->SrcReg[1], state, u );
+               prod[0] = t[0] * u[0];
+               prod[1] = t[1] * u[1];
+               prod[2] = t[2] * u[2];
+               prod[3] = t[3] * u[3];
+               store_vector4( &inst->DstReg, state, prod );
+            }
+            break;
+         case VP_OPCODE_ADD:
+            {
+               GLfloat t[4], u[4], sum[4];
+               fetch_vector4( &inst->SrcReg[0], state, t );
+               fetch_vector4( &inst->SrcReg[1], state, u );
+               sum[0] = t[0] + u[0];
+               sum[1] = t[1] + u[1];
+               sum[2] = t[2] + u[2];
+               sum[3] = t[3] + u[3];
+               store_vector4( &inst->DstReg, state, sum );
+            }
+            break;
+         case VP_OPCODE_DP3:
+            {
+               GLfloat t[4], u[4], dot[4];
+               fetch_vector4( &inst->SrcReg[0], state, t );
+               fetch_vector4( &inst->SrcReg[1], state, u );
+               dot[0] = t[0] * u[0] + t[1] * u[1] + t[2] * u[2];
+               dot[1] = dot[2] = dot[3] = dot[0];
+               store_vector4( &inst->DstReg, state, dot );
+            }
+            break;
+         case VP_OPCODE_DP4:
+            {
+               GLfloat t[4], u[4], dot[4];
+               fetch_vector4( &inst->SrcReg[0], state, t );
+               fetch_vector4( &inst->SrcReg[1], state, u );
+               dot[0] = t[0] * u[0] + t[1] * u[1] + t[2] * u[2] + t[3] * u[3];
+               dot[1] = dot[2] = dot[3] = dot[0];
+               store_vector4( &inst->DstReg, state, dot );
+            }
+            break;
+         case VP_OPCODE_DST:
+            {
+               GLfloat t[4], u[4], dst[4];
+               fetch_vector4( &inst->SrcReg[0], state, t );
+               fetch_vector4( &inst->SrcReg[1], state, u );
+               dst[0] = 1.0F;
+               dst[1] = t[1] * u[1];
+               dst[2] = t[2];
+               dst[3] = u[3];
+               store_vector4( &inst->DstReg, state, dst );
+            }
+            break;
+         case VP_OPCODE_MIN:
+            {
+               GLfloat t[4], u[4], min[4];
+               fetch_vector4( &inst->SrcReg[0], state, t );
+               fetch_vector4( &inst->SrcReg[1], state, u );
+               min[0] = (t[0] < u[0]) ? t[0] : u[0];
+               min[1] = (t[1] < u[1]) ? t[1] : u[1];
+               min[2] = (t[2] < u[2]) ? t[2] : u[2];
+               min[3] = (t[3] < u[3]) ? t[3] : u[3];
+               store_vector4( &inst->DstReg, state, min );
+            }
+            break;
+         case VP_OPCODE_MAX:
+            {
+               GLfloat t[4], u[4], max[4];
+               fetch_vector4( &inst->SrcReg[0], state, t );
+               fetch_vector4( &inst->SrcReg[1], state, u );
+               max[0] = (t[0] > u[0]) ? t[0] : u[0];
+               max[1] = (t[1] > u[1]) ? t[1] : u[1];
+               max[2] = (t[2] > u[2]) ? t[2] : u[2];
+               max[3] = (t[3] > u[3]) ? t[3] : u[3];
+               store_vector4( &inst->DstReg, state, max );
+            }
+            break;
+         case VP_OPCODE_SLT:
+            {
+               GLfloat t[4], u[4], slt[4];
+               fetch_vector4( &inst->SrcReg[0], state, t );
+               fetch_vector4( &inst->SrcReg[1], state, u );
+               slt[0] = (t[0] < u[0]) ? 1.0F : 0.0F;
+               slt[1] = (t[1] < u[1]) ? 1.0F : 0.0F;
+               slt[2] = (t[2] < u[2]) ? 1.0F : 0.0F;
+               slt[3] = (t[3] < u[3]) ? 1.0F : 0.0F;
+               store_vector4( &inst->DstReg, state, slt );
+            }
+            break;
+         case VP_OPCODE_SGE:
+            {
+               GLfloat t[4], u[4], sge[4];
+               fetch_vector4( &inst->SrcReg[0], state, t );
+               fetch_vector4( &inst->SrcReg[1], state, u );
+               sge[0] = (t[0] >= u[0]) ? 1.0F : 0.0F;
+               sge[1] = (t[1] >= u[1]) ? 1.0F : 0.0F;
+               sge[2] = (t[2] >= u[2]) ? 1.0F : 0.0F;
+               sge[3] = (t[3] >= u[3]) ? 1.0F : 0.0F;
+               store_vector4( &inst->DstReg, state, sge );
+            }
+            break;
+         case VP_OPCODE_MAD:
+            {
+               GLfloat t[4], u[4], v[4], sum[4];
+               fetch_vector4( &inst->SrcReg[0], state, t );
+               fetch_vector4( &inst->SrcReg[1], state, u );
+               fetch_vector4( &inst->SrcReg[2], state, v );
+               sum[0] = t[0] * u[0] + v[0];
+               sum[1] = t[1] * u[1] + v[1];
+               sum[2] = t[2] * u[2] + v[2];
+               sum[3] = t[3] * u[3] + v[3];
+               store_vector4( &inst->DstReg, state, sum );
+            }
+            break;
+         case VP_OPCODE_ARL:
+            {
+               GLfloat t[4];
+               fetch_vector4( &inst->SrcReg[0], state, t );
+               state->AddressReg[0] = (GLint) floor(t[0]);
+            }
+            break;
+         case VP_OPCODE_DPH:
+            {
+               GLfloat t[4], u[4], dot[4];
+               fetch_vector4( &inst->SrcReg[0], state, t );
+               fetch_vector4( &inst->SrcReg[1], state, u );
+               dot[0] = t[0] * u[0] + t[1] * u[1] + t[2] * u[2] + u[3];
+               dot[1] = dot[2] = dot[3] = dot[0];
+               store_vector4( &inst->DstReg, state, dot );
+            }
+            break;
+         case VP_OPCODE_RCC:
+            {
+               GLfloat t[4], u;
+               fetch_vector1( &inst->SrcReg[0], state, t );
+               if (t[0] == 1.0F)
+                  u = 1.0F;
+               else
+                  u = 1.0F / t[0];
+               if (u > 0.0F) {
+                  if (u > 1.884467e+019F) {
+                     u = 1.884467e+019F;  /* IEEE 32-bit binary value 0x5F800000 */
+                  }
+                  else if (u < 5.42101e-020F) {
+                     u = 5.42101e-020F;   /* IEEE 32-bit binary value 0x1F800000 */
+                  }
+               }
+               else {
+                  if (u < -1.884467e+019F) {
+                     u = -1.884467e+019F; /* IEEE 32-bit binary value 0xDF800000 */
+                  }
+                  else if (u > -5.42101e-020F) {
+                     u = -5.42101e-020F;  /* IEEE 32-bit binary value 0x9F800000 */
+                  }
+               }
+               t[0] = t[1] = t[2] = t[3] = u;
+               store_vector4( &inst->DstReg, state, t );
+            }
+            break;
+         case VP_OPCODE_SUB: /* GL_NV_vertex_program1_1 */
+            {
+               GLfloat t[4], u[4], sum[4];
+               fetch_vector4( &inst->SrcReg[0], state, t );
+               fetch_vector4( &inst->SrcReg[1], state, u );
+               sum[0] = t[0] - u[0];
+               sum[1] = t[1] - u[1];
+               sum[2] = t[2] - u[2];
+               sum[3] = t[3] - u[3];
+               store_vector4( &inst->DstReg, state, sum );
+            }
+            break;
+         case VP_OPCODE_ABS: /* GL_NV_vertex_program1_1 */
+            {
+               GLfloat t[4];
+               fetch_vector4( &inst->SrcReg[0], state, t );
+               if (t[0] < 0.0)  t[0] = -t[0];
+               if (t[1] < 0.0)  t[1] = -t[1];
+               if (t[2] < 0.0)  t[2] = -t[2];
+               if (t[3] < 0.0)  t[3] = -t[3];
+               store_vector4( &inst->DstReg, state, t );
+            }
+            break;
+         case VP_OPCODE_FLR: /* GL_ARB_vertex_program */
+            {
+               GLfloat t[4];
+               fetch_vector4( &inst->SrcReg[0], state, t );
+               t[0] = FLOORF(t[0]);
+               t[1] = FLOORF(t[1]);
+               t[2] = FLOORF(t[2]);
+               t[3] = FLOORF(t[3]);
+               store_vector4( &inst->DstReg, state, t );
+            }
+            break;
+         case VP_OPCODE_FRC: /* GL_ARB_vertex_program */
+            {
+               GLfloat t[4];
+               fetch_vector4( &inst->SrcReg[0], state, t );
+               t[0] = t[0] - FLOORF(t[0]);
+               t[1] = t[1] - FLOORF(t[1]);
+               t[2] = t[2] - FLOORF(t[2]);
+               t[3] = t[3] - FLOORF(t[3]);
+               store_vector4( &inst->DstReg, state, t );
+            }
+            break;
+         case VP_OPCODE_EX2: /* GL_ARB_vertex_program */
+            {
+               GLfloat t[4];
+               fetch_vector1( &inst->SrcReg[0], state, t );
+               t[0] = t[1] = t[2] = t[3] = (GLfloat)_mesa_pow(2.0, t[0]);
+               store_vector4( &inst->DstReg, state, t );
+            }
+            break;
+         case VP_OPCODE_LG2: /* GL_ARB_vertex_program */
+            {
+               GLfloat t[4];
+               fetch_vector1( &inst->SrcReg[0], state, t );
+               t[0] = t[1] = t[2] = t[3] = LOG2(t[0]);
+               store_vector4( &inst->DstReg, state, t );
+            }
+            break;
+         case VP_OPCODE_POW: /* GL_ARB_vertex_program */
+            {
+               GLfloat t[4], u[4];
+               fetch_vector1( &inst->SrcReg[0], state, t );
+               fetch_vector1( &inst->SrcReg[1], state, u );
+               t[0] = t[1] = t[2] = t[3] = (GLfloat)_mesa_pow(t[0], u[0]);
+               store_vector4( &inst->DstReg, state, t );
+            }
+            break;
+         case VP_OPCODE_XPD: /* GL_ARB_vertex_program */
+            {
+               GLfloat t[4], u[4], cross[4];
+               fetch_vector4( &inst->SrcReg[0], state, t );
+               fetch_vector4( &inst->SrcReg[1], state, u );
+               cross[0] = t[1] * u[2] - t[2] * u[1];
+               cross[1] = t[2] * u[0] - t[0] * u[2];
+               cross[2] = t[0] * u[1] - t[1] * u[0];
+               store_vector4( &inst->DstReg, state, cross );
+            }
+            break;
+         case VP_OPCODE_SWZ: /* GL_ARB_vertex_program */
+            {
+               const struct vp_src_register *source = &inst->SrcReg[0];
+               const GLfloat *src = get_register_pointer(source, state);
+               GLfloat result[4];
+               GLuint i;
+
+               /* do extended swizzling here */
+               for (i = 0; i < 3; i++) {
+                  if (source->Swizzle[i] == SWIZZLE_ZERO)
+                     result[i] = 0.0;
+                  else if (source->Swizzle[i] == SWIZZLE_ONE)
+                     result[i] = -1.0;
+                  else
+                     result[i] = -src[source->Swizzle[i]];
+                  if (source->Negate)
+                     result[i] = -result[i];
+               }
+               store_vector4( &inst->DstReg, state, result );
+            }
+            break;
+
+         case VP_OPCODE_END:
+            ctx->_CurrentProgram = 0;
+            return;
+         default:
+            /* bad instruction opcode */
+            _mesa_problem(ctx, "Bad VP Opcode in _mesa_exec_vertex_program");
+            ctx->_CurrentProgram = 0;
+            return;
+      } /* switch */
+   } /* for */
+
+   ctx->_CurrentProgram = 0;
+}
+
+
+
+/**
+Thoughts on vertex program optimization:
+
+The obvious thing to do is to compile the vertex program into X86/SSE/3DNow!
+assembly code.  That will probably be a lot of work.
+
+Another approach might be to replace the vp_instruction->Opcode field with
+a pointer to a specialized C function which executes the instruction.
+In particular we can write functions which skip swizzling, negating,
+masking, relative addressing, etc. when they're not needed.
+
+For example:
+
+void simple_add( struct vp_instruction *inst )
+{
+   GLfloat *sum = machine->Registers[inst->DstReg.Register];
+   GLfloat *a = machine->Registers[inst->SrcReg[0].Register];
+   GLfloat *b = machine->Registers[inst->SrcReg[1].Register];
+   sum[0] = a[0] + b[0];
+   sum[1] = a[1] + b[1];
+   sum[2] = a[2] + b[2];
+   sum[3] = a[3] + b[3];
+}
+
+*/
+
+/*
+
+KW:
+
+A first step would be to 'vectorize' the programs in the same way as
+the normal transformation code in the tnl module.  Thus each opcode
+takes zero or more input vectors (registers) and produces one or more
+output vectors.
+
+These operations would intially be coded in C, with machine-specific
+assembly following, as is currently the case for matrix
+transformations in the math/ directory.  The preprocessing scheme for
+selecting simpler operations Brian describes above would also work
+here.
+
+This should give reasonable performance without excessive effort.
+
+*/
diff --git a/reactos/lib/mesa32/src/main/nvvertexec.h b/reactos/lib/mesa32/src/main/nvvertexec.h
new file mode 100644
index 00000000000..0e4b60ec9e7
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/nvvertexec.h
@@ -0,0 +1,43 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Brian Paul
+ */
+
+#ifndef NVVERTEXEC_H
+#define NVVERTEXEC_H
+
+extern void
+_mesa_init_vp_registers(GLcontext *ctx);
+
+extern void
+_mesa_init_tracked_matrices(GLcontext *ctx);
+
+extern void
+_mesa_exec_vertex_program(GLcontext *ctx, const struct vertex_program *program);
+
+extern void
+_mesa_dump_vp_state( const struct vertex_program_state *state );
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/nvvertparse.c b/reactos/lib/mesa32/src/main/nvvertparse.c
new file mode 100644
index 00000000000..bacf5a5af3b
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/nvvertparse.c
@@ -0,0 +1,1496 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0.1
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file nvvertparse.c
+ * NVIDIA vertex program parser.
+ * \author Brian Paul
+ */
+
+/*
+ * Regarding GL_NV_vertex_program, GL_NV_vertex_program1_1:
+ *
+ * Portions of this software may use or implement intellectual
+ * property owned and licensed by NVIDIA Corporation. NVIDIA disclaims
+ * any and all warranties with respect to such intellectual property,
+ * including any use thereof or modifications thereto.
+ */
+
+#include "glheader.h"
+#include "context.h"
+#include "hash.h"
+#include "imports.h"
+#include "macros.h"
+#include "mtypes.h"
+#include "nvprogram.h"
+#include "nvvertparse.h"
+#include "nvvertprog.h"
+#include "program.h"
+
+
+/**
+ * Current parsing state.  This structure is passed among the parsing
+ * functions and keeps track of the current parser position and various
+ * program attributes.
+ */
+struct parse_state {
+   GLcontext *ctx;
+   const GLubyte *start;
+   const GLubyte *pos;
+   const GLubyte *curLine;
+   GLboolean isStateProgram;
+   GLboolean isPositionInvariant;
+   GLboolean isVersion1_1;
+   GLuint inputsRead;
+   GLuint outputsWritten;
+   GLboolean anyProgRegsWritten;
+   GLuint numInst;                 /* number of instructions parsed */
+};
+
+
+/*
+ * Called whenever we find an error during parsing.
+ */
+static void
+record_error(struct parse_state *parseState, const char *msg, int lineNo)
+{
+#ifdef DEBUG
+   GLint line, column;
+   const GLubyte *lineStr;
+   lineStr = _mesa_find_line_column(parseState->start,
+                                    parseState->pos, &line, &column);
+   _mesa_debug(parseState->ctx,
+               "nvfragparse.c(%d): line %d, column %d:%s (%s)\n",
+               lineNo, line, column, (char *) lineStr, msg);
+   _mesa_free((void *) lineStr);
+#else
+   (void) lineNo;
+#endif
+
+   /* Check that no error was already recorded.  Only record the first one. */
+   if (parseState->ctx->Program.ErrorString[0] == 0) {
+      _mesa_set_program_error(parseState->ctx,
+                              parseState->pos - parseState->start,
+                              msg);
+   }
+}
+
+
+#define RETURN_ERROR							\
+do {									\
+   record_error(parseState, "Unexpected end of input.", __LINE__);	\
+   return GL_FALSE;							\
+} while(0)
+
+#define RETURN_ERROR1(msg)						\
+do {									\
+   record_error(parseState, msg, __LINE__);				\
+   return GL_FALSE;							\
+} while(0)
+
+#define RETURN_ERROR2(msg1, msg2)					\
+do {									\
+   char err[1000];							\
+   _mesa_sprintf(err, "%s %s", msg1, msg2);				\
+   record_error(parseState, err, __LINE__);				\
+   return GL_FALSE;							\
+} while(0)
+
+
+
+
+
+static GLboolean IsLetter(GLubyte b)
+{
+   return (b >= 'a' && b <= 'z') || (b >= 'A' && b <= 'Z');
+}
+
+
+static GLboolean IsDigit(GLubyte b)
+{
+   return b >= '0' && b <= '9';
+}
+
+
+static GLboolean IsWhitespace(GLubyte b)
+{
+   return b == ' ' || b == '\t' || b == '\n' || b == '\r';
+}
+
+
+/**
+ * Starting at 'str' find the next token.  A token can be an integer,
+ * an identifier or punctuation symbol.
+ * \return <= 0 we found an error, else, return number of characters parsed.
+ */
+static GLint
+GetToken(struct parse_state *parseState, GLubyte *token)
+{
+   const GLubyte *str = parseState->pos;
+   GLint i = 0, j = 0;
+
+   token[0] = 0;
+
+   /* skip whitespace and comments */
+   while (str[i] && (IsWhitespace(str[i]) || str[i] == '#')) {
+      if (str[i] == '#') {
+         /* skip comment */
+         while (str[i] && (str[i] != '\n' && str[i] != '\r')) {
+            i++;
+         }
+         if (str[i] == '\n' || str[i] == '\r')
+            parseState->curLine = str + i + 1;
+      }
+      else {
+         /* skip whitespace */
+         if (str[i] == '\n' || str[i] == '\r')
+            parseState->curLine = str + i + 1;
+         i++;
+      }
+   }
+
+   if (str[i] == 0)
+      return -i;
+
+   /* try matching an integer */
+   while (str[i] && IsDigit(str[i])) {
+      token[j++] = str[i++];
+   }
+   if (j > 0 || !str[i]) {
+      token[j] = 0;
+      return i;
+   }
+
+   /* try matching an identifier */
+   if (IsLetter(str[i])) {
+      while (str[i] && (IsLetter(str[i]) || IsDigit(str[i]))) {
+         token[j++] = str[i++];
+      }
+      token[j] = 0;
+      return i;
+   }
+
+   /* punctuation character */
+   if (str[i]) {
+      token[0] = str[i++];
+      token[1] = 0;
+      return i;
+   }
+
+   /* end of input */
+   token[0] = 0;
+   return i;
+}
+
+
+/**
+ * Get next token from input stream and increment stream pointer past token.
+ */
+static GLboolean
+Parse_Token(struct parse_state *parseState, GLubyte *token)
+{
+   GLint i;
+   i = GetToken(parseState, token);
+   if (i <= 0) {
+      parseState->pos += (-i);
+      return GL_FALSE;
+   }
+   parseState->pos += i;
+   return GL_TRUE;
+}
+
+
+/**
+ * Get next token from input stream but don't increment stream pointer.
+ */
+static GLboolean
+Peek_Token(struct parse_state *parseState, GLubyte *token)
+{
+   GLint i, len;
+   i = GetToken(parseState, token);
+   if (i <= 0) {
+      parseState->pos += (-i);
+      return GL_FALSE;
+   }
+   len = _mesa_strlen((const char *) token);
+   parseState->pos += (i - len);
+   return GL_TRUE;
+}
+
+
+/**
+ * Try to match 'pattern' as the next token after any whitespace/comments.
+ * Advance the current parsing position only if we match the pattern.
+ * \return GL_TRUE if pattern is matched, GL_FALSE otherwise.
+ */
+static GLboolean
+Parse_String(struct parse_state *parseState, const char *pattern)
+{
+   const GLubyte *m;
+   GLint i;
+
+   /* skip whitespace and comments */
+   while (IsWhitespace(*parseState->pos) || *parseState->pos == '#') {
+      if (*parseState->pos == '#') {
+         while (*parseState->pos && (*parseState->pos != '\n' && *parseState->pos != '\r')) {
+            parseState->pos += 1;
+         }
+         if (*parseState->pos == '\n' || *parseState->pos == '\r')
+            parseState->curLine = parseState->pos + 1;
+      }
+      else {
+         /* skip whitespace */
+         if (*parseState->pos == '\n' || *parseState->pos == '\r')
+            parseState->curLine = parseState->pos + 1;
+         parseState->pos += 1;
+      }
+   }
+
+   /* Try to match the pattern */
+   m = parseState->pos;
+   for (i = 0; pattern[i]; i++) {
+      if (*m != (GLubyte) pattern[i])
+         return GL_FALSE;
+      m += 1;
+   }
+   parseState->pos = m;
+
+   return GL_TRUE; /* success */
+}
+
+
+/**********************************************************************/
+
+static const char *InputRegisters[MAX_NV_VERTEX_PROGRAM_INPUTS + 1] = {
+   "OPOS", "WGHT", "NRML", "COL0", "COL1", "FOGC", "6", "7",
+   "TEX0", "TEX1", "TEX2", "TEX3", "TEX4", "TEX5", "TEX6", "TEX7", NULL
+};
+
+static const char *OutputRegisters[MAX_NV_VERTEX_PROGRAM_OUTPUTS + 1] = {
+   "HPOS", "COL0", "COL1", "BFC0", "BFC1", "FOGC", "PSIZ",
+   "TEX0", "TEX1", "TEX2", "TEX3", "TEX4", "TEX5", "TEX6", "TEX7", NULL
+};
+
+/* NOTE: the order here must match opcodes in nvvertprog.h */
+static const char *Opcodes[] = {
+   "MOV", "LIT", "RCP", "RSQ", "EXP", "LOG", "MUL", "ADD", "DP3", "DP4",
+   "DST", "MIN", "MAX", "SLT", "SGE", "MAD", "ARL", "DPH", "RCC", "SUB",
+   "ABS", "END",
+   /* GL_ARB_vertex_program */
+   "FLR", "FRC", "EX2", "LG2", "POW", "XPD", "SWZ",
+   NULL
+};
+
+
+
+/**
+ * Parse a temporary register: Rnn
+ */
+static GLboolean
+Parse_TempReg(struct parse_state *parseState, GLint *tempRegNum)
+{
+   GLubyte token[100];
+
+   /* Should be 'R##' */
+   if (!Parse_Token(parseState, token))
+      RETURN_ERROR;
+   if (token[0] != 'R')
+      RETURN_ERROR1("Expected R##");
+
+   if (IsDigit(token[1])) {
+      GLint reg = _mesa_atoi((char *) (token + 1));
+      if (reg >= MAX_NV_VERTEX_PROGRAM_TEMPS)
+         RETURN_ERROR1("Bad temporary register name");
+      *tempRegNum = reg;
+   }
+   else {
+      RETURN_ERROR1("Bad temporary register name");
+   }
+
+   return GL_TRUE;
+}
+
+
+/**
+ * Parse address register "A0.x"
+ */
+static GLboolean
+Parse_AddrReg(struct parse_state *parseState)
+{
+   /* match 'A0' */
+   if (!Parse_String(parseState, "A0"))
+      RETURN_ERROR;
+
+   /* match '.' */
+   if (!Parse_String(parseState, "."))
+      RETURN_ERROR;
+
+   /* match 'x' */
+   if (!Parse_String(parseState, "x"))
+      RETURN_ERROR;
+
+   return GL_TRUE;
+}
+
+
+/**
+ * Parse absolute program parameter register "c[##]"
+ */
+static GLboolean
+Parse_AbsParamReg(struct parse_state *parseState, GLint *regNum)
+{
+   GLubyte token[100];
+
+   if (!Parse_String(parseState, "c"))
+      RETURN_ERROR;
+
+   if (!Parse_String(parseState, "["))
+      RETURN_ERROR;
+
+   if (!Parse_Token(parseState, token))
+      RETURN_ERROR;
+
+   if (IsDigit(token[0])) {
+      /* a numbered program parameter register */
+      GLint reg = _mesa_atoi((char *) token);
+      if (reg >= MAX_NV_VERTEX_PROGRAM_PARAMS)
+         RETURN_ERROR1("Bad program parameter number");
+      *regNum = reg;
+   }
+   else {
+      RETURN_ERROR;
+   }
+
+   if (!Parse_String(parseState, "]"))
+      RETURN_ERROR;
+
+   return GL_TRUE;
+}
+
+
+static GLboolean
+Parse_ParamReg(struct parse_state *parseState, struct vp_src_register *srcReg)
+{
+   GLubyte token[100];
+
+   if (!Parse_String(parseState, "c"))
+      RETURN_ERROR;
+
+   if (!Parse_String(parseState, "["))
+      RETURN_ERROR;
+
+   if (!Peek_Token(parseState, token))
+      RETURN_ERROR;
+
+   if (IsDigit(token[0])) {
+      /* a numbered program parameter register */
+      GLint reg;
+      (void) Parse_Token(parseState, token);
+      reg = _mesa_atoi((char *) token);
+      if (reg >= MAX_NV_VERTEX_PROGRAM_PARAMS)
+         RETURN_ERROR1("Bad program parameter number");
+      srcReg->File = PROGRAM_ENV_PARAM;
+      srcReg->Index = reg;
+   }
+   else if (_mesa_strcmp((const char *) token, "A0") == 0) {
+      /* address register "A0.x" */
+      if (!Parse_AddrReg(parseState))
+         RETURN_ERROR;
+
+      srcReg->RelAddr = GL_TRUE;
+      srcReg->File = PROGRAM_ENV_PARAM;
+      /* Look for +/-N offset */
+      if (!Peek_Token(parseState, token))
+         RETURN_ERROR;
+
+      if (token[0] == '-' || token[0] == '+') {
+         const GLubyte sign = token[0];
+         (void) Parse_Token(parseState, token); /* consume +/- */
+
+         /* an integer should be next */
+         if (!Parse_Token(parseState, token))
+            RETURN_ERROR;
+
+         if (IsDigit(token[0])) {
+            const GLint k = _mesa_atoi((char *) token);
+            if (sign == '-') {
+               if (k > 64)
+                  RETURN_ERROR1("Bad address offset");
+               srcReg->Index = -k;
+            }
+            else {
+               if (k > 63)
+                  RETURN_ERROR1("Bad address offset");
+               srcReg->Index = k;
+            }
+         }
+         else {
+            RETURN_ERROR;
+         }
+      }
+      else {
+         /* probably got a ']', catch it below */
+      }
+   }
+   else {
+      RETURN_ERROR;
+   }
+
+   /* Match closing ']' */
+   if (!Parse_String(parseState, "]"))
+      RETURN_ERROR;
+
+   return GL_TRUE;
+}
+
+
+/**
+ * Parse v[#] or v[<name>]
+ */
+static GLboolean
+Parse_AttribReg(struct parse_state *parseState, GLint *tempRegNum)
+{
+   GLubyte token[100];
+   GLint j;
+
+   /* Match 'v' */
+   if (!Parse_String(parseState, "v"))
+      RETURN_ERROR;
+
+   /* Match '[' */
+   if (!Parse_String(parseState, "["))
+      RETURN_ERROR;
+
+   /* match number or named register */
+   if (!Parse_Token(parseState, token))
+      RETURN_ERROR;
+
+   if (parseState->isStateProgram && token[0] != '0')
+      RETURN_ERROR1("Only v[0] accessible in vertex state programs");
+
+   if (IsDigit(token[0])) {
+      GLint reg = _mesa_atoi((char *) token);
+      if (reg >= MAX_NV_VERTEX_PROGRAM_INPUTS)
+         RETURN_ERROR1("Bad vertex attribute register name");
+      *tempRegNum = reg;
+   }
+   else {
+      for (j = 0; InputRegisters[j]; j++) {
+         if (_mesa_strcmp((const char *) token, InputRegisters[j]) == 0) {
+            *tempRegNum = j;
+            break;
+         }
+      }
+      if (!InputRegisters[j]) {
+         /* unknown input register label */
+         RETURN_ERROR2("Bad register name", token);
+      }
+   }
+
+   /* Match '[' */
+   if (!Parse_String(parseState, "]"))
+      RETURN_ERROR;
+
+   return GL_TRUE;
+}
+
+
+static GLboolean
+Parse_OutputReg(struct parse_state *parseState, GLint *outputRegNum)
+{
+   GLubyte token[100];
+   GLint start, j;
+
+   /* Match 'o' */
+   if (!Parse_String(parseState, "o"))
+      RETURN_ERROR;
+
+   /* Match '[' */
+   if (!Parse_String(parseState, "["))
+      RETURN_ERROR;
+
+   /* Get output reg name */
+   if (!Parse_Token(parseState, token))
+      RETURN_ERROR;
+
+   if (parseState->isPositionInvariant)
+      start = 1; /* skip HPOS register name */
+   else
+      start = 0;
+
+   /* try to match an output register name */
+   for (j = start; OutputRegisters[j]; j++) {
+      if (_mesa_strcmp((const char *) token, OutputRegisters[j]) == 0) {
+         *outputRegNum = j;
+         break;
+      }
+   }
+   if (!OutputRegisters[j])
+      RETURN_ERROR1("Unrecognized output register name");
+
+   /* Match ']' */
+   if (!Parse_String(parseState, "]"))
+      RETURN_ERROR1("Expected ]");
+
+   return GL_TRUE;
+}
+
+
+static GLboolean
+Parse_MaskedDstReg(struct parse_state *parseState, struct vp_dst_register *dstReg)
+{
+   GLubyte token[100];
+
+   /* Dst reg can be R<n> or o[n] */
+   if (!Peek_Token(parseState, token))
+      RETURN_ERROR;
+
+   if (token[0] == 'R') {
+      /* a temporary register */
+      dstReg->File = PROGRAM_TEMPORARY;
+      if (!Parse_TempReg(parseState, &dstReg->Index))
+         RETURN_ERROR;
+   }
+   else if (!parseState->isStateProgram && token[0] == 'o') {
+      /* an output register */
+      dstReg->File = PROGRAM_OUTPUT;
+      if (!Parse_OutputReg(parseState, &dstReg->Index))
+         RETURN_ERROR;
+   }
+   else if (parseState->isStateProgram && token[0] == 'c' &&
+            parseState->isStateProgram) {
+      /* absolute program parameter register */
+      /* Only valid for vertex state programs */
+      dstReg->File = PROGRAM_ENV_PARAM;
+      if (!Parse_AbsParamReg(parseState, &dstReg->Index))
+         RETURN_ERROR;
+   }
+   else {
+      RETURN_ERROR1("Bad destination register name");
+   }
+
+   /* Parse optional write mask */
+   if (!Peek_Token(parseState, token))
+      RETURN_ERROR;
+
+   if (token[0] == '.') {
+      /* got a mask */
+      GLint k = 0;
+
+      if (!Parse_String(parseState, "."))
+         RETURN_ERROR;
+
+      if (!Parse_Token(parseState, token))
+         RETURN_ERROR;
+
+      dstReg->WriteMask[0] = GL_FALSE;
+      dstReg->WriteMask[1] = GL_FALSE;
+      dstReg->WriteMask[2] = GL_FALSE;
+      dstReg->WriteMask[3] = GL_FALSE;
+
+      if (token[k] == 'x') {
+         dstReg->WriteMask[0] = GL_TRUE;
+         k++;
+      }
+      if (token[k] == 'y') {
+         dstReg->WriteMask[1] = GL_TRUE;
+         k++;
+      }
+      if (token[k] == 'z') {
+         dstReg->WriteMask[2] = GL_TRUE;
+         k++;
+      }
+      if (token[k] == 'w') {
+         dstReg->WriteMask[3] = GL_TRUE;
+         k++;
+      }
+      if (k == 0) {
+         RETURN_ERROR1("Bad writemask character");
+      }
+      return GL_TRUE;
+   }
+   else {
+      dstReg->WriteMask[0] = GL_TRUE;
+      dstReg->WriteMask[1] = GL_TRUE;
+      dstReg->WriteMask[2] = GL_TRUE;
+      dstReg->WriteMask[3] = GL_TRUE;
+      return GL_TRUE;
+   }
+}
+
+
+static GLboolean
+Parse_SwizzleSrcReg(struct parse_state *parseState, struct vp_src_register *srcReg)
+{
+   GLubyte token[100];
+
+   srcReg->RelAddr = GL_FALSE;
+
+   /* check for '-' */
+   if (!Peek_Token(parseState, token))
+      RETURN_ERROR;
+   if (token[0] == '-') {
+      (void) Parse_String(parseState, "-");
+      srcReg->Negate = GL_TRUE;
+      if (!Peek_Token(parseState, token))
+         RETURN_ERROR;
+   }
+   else {
+      srcReg->Negate = GL_FALSE;
+   }
+
+   /* Src reg can be R<n>, c[n], c[n +/- offset], or a named vertex attrib */
+   if (token[0] == 'R') {
+      srcReg->File = PROGRAM_TEMPORARY;
+      if (!Parse_TempReg(parseState, &srcReg->Index))
+         RETURN_ERROR;
+   }
+   else if (token[0] == 'c') {
+      if (!Parse_ParamReg(parseState, srcReg))
+         RETURN_ERROR;
+   }
+   else if (token[0] == 'v') {
+      srcReg->File = PROGRAM_INPUT;
+      if (!Parse_AttribReg(parseState, &srcReg->Index))
+         RETURN_ERROR;
+   }
+   else {
+      RETURN_ERROR2("Bad source register name", token);
+   }
+
+   /* init swizzle fields */
+   srcReg->Swizzle[0] = 0;
+   srcReg->Swizzle[1] = 1;
+   srcReg->Swizzle[2] = 2;
+   srcReg->Swizzle[3] = 3;
+
+   /* Look for optional swizzle suffix */
+   if (!Peek_Token(parseState, token))
+      RETURN_ERROR;
+   if (token[0] == '.') {
+      (void) Parse_String(parseState, ".");  /* consume . */
+
+      if (!Parse_Token(parseState, token))
+         RETURN_ERROR;
+
+      if (token[1] == 0) {
+         /* single letter swizzle */
+         if (token[0] == 'x')
+            ASSIGN_4V(srcReg->Swizzle, 0, 0, 0, 0);
+         else if (token[0] == 'y')
+            ASSIGN_4V(srcReg->Swizzle, 1, 1, 1, 1);
+         else if (token[0] == 'z')
+            ASSIGN_4V(srcReg->Swizzle, 2, 2, 2, 2);
+         else if (token[0] == 'w')
+            ASSIGN_4V(srcReg->Swizzle, 3, 3, 3, 3);
+         else
+            RETURN_ERROR1("Expected x, y, z, or w");
+      }
+      else {
+         /* 2, 3 or 4-component swizzle */
+         GLint k;
+         for (k = 0; token[k] && k < 5; k++) {
+            if (token[k] == 'x')
+               srcReg->Swizzle[k] = 0;
+            else if (token[k] == 'y')
+               srcReg->Swizzle[k] = 1;
+            else if (token[k] == 'z')
+               srcReg->Swizzle[k] = 2;
+            else if (token[k] == 'w')
+               srcReg->Swizzle[k] = 3;
+            else
+               RETURN_ERROR;
+         }
+         if (k >= 5)
+            RETURN_ERROR;
+      }
+   }
+
+   return GL_TRUE;
+}
+
+
+static GLboolean
+Parse_ScalarSrcReg(struct parse_state *parseState, struct vp_src_register *srcReg)
+{
+   GLubyte token[100];
+
+   srcReg->RelAddr = GL_FALSE;
+
+   /* check for '-' */
+   if (!Peek_Token(parseState, token))
+      RETURN_ERROR;
+   if (token[0] == '-') {
+      srcReg->Negate = GL_TRUE;
+      (void) Parse_String(parseState, "-"); /* consume '-' */
+      if (!Peek_Token(parseState, token))
+         RETURN_ERROR;
+   }
+   else {
+      srcReg->Negate = GL_FALSE;
+   }
+
+   /* Src reg can be R<n>, c[n], c[n +/- offset], or a named vertex attrib */
+   if (token[0] == 'R') {
+      srcReg->File = PROGRAM_TEMPORARY;
+      if (!Parse_TempReg(parseState, &srcReg->Index))
+         RETURN_ERROR;
+   }
+   else if (token[0] == 'c') {
+      if (!Parse_ParamReg(parseState, srcReg))
+         RETURN_ERROR;
+   }
+   else if (token[0] == 'v') {
+      srcReg->File = PROGRAM_INPUT;
+      if (!Parse_AttribReg(parseState, &srcReg->Index))
+         RETURN_ERROR;
+   }
+   else {
+      RETURN_ERROR2("Bad source register name", token);
+   }
+
+   /* Look for .[xyzw] suffix */
+   if (!Parse_String(parseState, "."))
+      RETURN_ERROR;
+
+   if (!Parse_Token(parseState, token))
+      RETURN_ERROR;
+
+   if (token[0] == 'x' && token[1] == 0) {
+      srcReg->Swizzle[0] = 0;
+   }
+   else if (token[0] == 'y' && token[1] == 0) {
+      srcReg->Swizzle[0] = 1;
+   }
+   else if (token[0] == 'z' && token[1] == 0) {
+      srcReg->Swizzle[0] = 2;
+   }
+   else if (token[0] == 'w' && token[1] == 0) {
+      srcReg->Swizzle[0] = 3;
+   }
+   else {
+      RETURN_ERROR1("Bad scalar source suffix");
+   }
+   srcReg->Swizzle[1] = srcReg->Swizzle[2] = srcReg->Swizzle[3] = 0;
+
+   return GL_TRUE;
+}
+
+
+static GLint
+Parse_UnaryOpInstruction(struct parse_state *parseState,
+                         struct vp_instruction *inst, enum vp_opcode opcode)
+{
+   if (opcode == VP_OPCODE_ABS && !parseState->isVersion1_1)
+      RETURN_ERROR1("ABS illegal for vertex program 1.0");
+
+   inst->Opcode = opcode;
+   inst->StringPos = parseState->curLine - parseState->start;
+
+   /* dest reg */
+   if (!Parse_MaskedDstReg(parseState, &inst->DstReg))
+      RETURN_ERROR;
+
+   /* comma */
+   if (!Parse_String(parseState, ","))
+      RETURN_ERROR;
+
+   /* src arg */
+   if (!Parse_SwizzleSrcReg(parseState, &inst->SrcReg[0]))
+      RETURN_ERROR;
+
+   /* semicolon */
+   if (!Parse_String(parseState, ";"))
+      RETURN_ERROR;
+
+   return GL_TRUE;
+}
+
+
+static GLboolean
+Parse_BiOpInstruction(struct parse_state *parseState,
+                      struct vp_instruction *inst, enum vp_opcode opcode)
+{
+   if (opcode == VP_OPCODE_DPH && !parseState->isVersion1_1)
+      RETURN_ERROR1("DPH illegal for vertex program 1.0");
+   if (opcode == VP_OPCODE_SUB && !parseState->isVersion1_1)
+      RETURN_ERROR1("SUB illegal for vertex program 1.0");
+
+   inst->Opcode = opcode;
+   inst->StringPos = parseState->curLine - parseState->start;
+
+   /* dest reg */
+   if (!Parse_MaskedDstReg(parseState, &inst->DstReg))
+      RETURN_ERROR;
+
+   /* comma */
+   if (!Parse_String(parseState, ","))
+      RETURN_ERROR;
+
+   /* first src arg */
+   if (!Parse_SwizzleSrcReg(parseState, &inst->SrcReg[0]))
+      RETURN_ERROR;
+
+   /* comma */
+   if (!Parse_String(parseState, ","))
+      RETURN_ERROR;
+
+   /* second src arg */
+   if (!Parse_SwizzleSrcReg(parseState, &inst->SrcReg[1]))
+      RETURN_ERROR;
+
+   /* semicolon */
+   if (!Parse_String(parseState, ";"))
+      RETURN_ERROR;
+
+   /* make sure we don't reference more than one program parameter register */
+   if (inst->SrcReg[0].File == PROGRAM_ENV_PARAM &&
+       inst->SrcReg[1].File == PROGRAM_ENV_PARAM &&
+       inst->SrcReg[0].Index != inst->SrcReg[1].Index)
+      RETURN_ERROR1("Can't reference two program parameter registers");
+
+   /* make sure we don't reference more than one vertex attribute register */
+   if (inst->SrcReg[0].File == PROGRAM_INPUT &&
+       inst->SrcReg[1].File == PROGRAM_INPUT &&
+       inst->SrcReg[0].Index != inst->SrcReg[1].Index)
+      RETURN_ERROR1("Can't reference two vertex attribute registers");
+
+   return GL_TRUE;
+}
+
+
+static GLboolean
+Parse_TriOpInstruction(struct parse_state *parseState,
+                       struct vp_instruction *inst, enum vp_opcode opcode)
+{
+   inst->Opcode = opcode;
+   inst->StringPos = parseState->curLine - parseState->start;
+
+   /* dest reg */
+   if (!Parse_MaskedDstReg(parseState, &inst->DstReg))
+      RETURN_ERROR;
+
+   /* comma */
+   if (!Parse_String(parseState, ","))
+      RETURN_ERROR;
+
+   /* first src arg */
+   if (!Parse_SwizzleSrcReg(parseState, &inst->SrcReg[0]))
+      RETURN_ERROR;
+
+   /* comma */
+   if (!Parse_String(parseState, ","))
+      RETURN_ERROR;
+
+   /* second src arg */
+   if (!Parse_SwizzleSrcReg(parseState, &inst->SrcReg[1]))
+      RETURN_ERROR;
+
+   /* comma */
+   if (!Parse_String(parseState, ","))
+      RETURN_ERROR;
+
+   /* third src arg */
+   if (!Parse_SwizzleSrcReg(parseState, &inst->SrcReg[2]))
+      RETURN_ERROR;
+
+   /* semicolon */
+   if (!Parse_String(parseState, ";"))
+      RETURN_ERROR;
+
+   /* make sure we don't reference more than one program parameter register */
+   if ((inst->SrcReg[0].File == PROGRAM_ENV_PARAM &&
+        inst->SrcReg[1].File == PROGRAM_ENV_PARAM &&
+        inst->SrcReg[0].Index != inst->SrcReg[1].Index) ||
+       (inst->SrcReg[0].File == PROGRAM_ENV_PARAM &&
+        inst->SrcReg[2].File == PROGRAM_ENV_PARAM &&
+        inst->SrcReg[0].Index != inst->SrcReg[2].Index) ||
+       (inst->SrcReg[1].File == PROGRAM_ENV_PARAM &&
+        inst->SrcReg[2].File == PROGRAM_ENV_PARAM &&
+        inst->SrcReg[1].Index != inst->SrcReg[2].Index))
+      RETURN_ERROR1("Can only reference one program register");
+
+   /* make sure we don't reference more than one vertex attribute register */
+   if ((inst->SrcReg[0].File == PROGRAM_INPUT &&
+        inst->SrcReg[1].File == PROGRAM_INPUT &&
+        inst->SrcReg[0].Index != inst->SrcReg[1].Index) ||
+       (inst->SrcReg[0].File == PROGRAM_INPUT &&
+        inst->SrcReg[2].File == PROGRAM_INPUT &&
+        inst->SrcReg[0].Index != inst->SrcReg[2].Index) ||
+       (inst->SrcReg[1].File == PROGRAM_INPUT &&
+        inst->SrcReg[2].File == PROGRAM_INPUT &&
+        inst->SrcReg[1].Index != inst->SrcReg[2].Index))
+      RETURN_ERROR1("Can only reference one input register");
+
+   return GL_TRUE;
+}
+
+
+static GLboolean
+Parse_ScalarInstruction(struct parse_state *parseState,
+                        struct vp_instruction *inst, enum vp_opcode opcode)
+{
+   if (opcode == VP_OPCODE_RCC && !parseState->isVersion1_1)
+      RETURN_ERROR1("RCC illegal for vertex program 1.0");
+
+   inst->Opcode = opcode;
+   inst->StringPos = parseState->curLine - parseState->start;
+
+   /* dest reg */
+   if (!Parse_MaskedDstReg(parseState, &inst->DstReg))
+      RETURN_ERROR;
+
+   /* comma */
+   if (!Parse_String(parseState, ","))
+      RETURN_ERROR;
+
+   /* first src arg */
+   if (!Parse_ScalarSrcReg(parseState, &inst->SrcReg[0]))
+      RETURN_ERROR;
+
+   /* semicolon */
+   if (!Parse_String(parseState, ";"))
+      RETURN_ERROR;
+
+   return GL_TRUE;
+}
+
+
+static GLboolean
+Parse_AddressInstruction(struct parse_state *parseState, struct vp_instruction *inst)
+{
+   inst->Opcode = VP_OPCODE_ARL;
+   inst->StringPos = parseState->curLine - parseState->start;
+
+   /* dest A0 reg */
+   if (!Parse_AddrReg(parseState))
+      RETURN_ERROR;
+
+   /* comma */
+   if (!Parse_String(parseState, ","))
+      RETURN_ERROR;
+
+   /* parse src reg */
+   if (!Parse_ScalarSrcReg(parseState, &inst->SrcReg[0]))
+      RETURN_ERROR;
+
+   /* semicolon */
+   if (!Parse_String(parseState, ";"))
+      RETURN_ERROR;
+
+   return GL_TRUE;
+}
+
+
+static GLboolean
+Parse_EndInstruction(struct parse_state *parseState, struct vp_instruction *inst)
+{
+   GLubyte token[100];
+
+   inst->Opcode = VP_OPCODE_END;
+   inst->StringPos = parseState->curLine - parseState->start;
+
+   /* this should fail! */
+   if (Parse_Token(parseState, token))
+      RETURN_ERROR2("Unexpected token after END:", token);
+   else
+      return GL_TRUE;
+}
+
+
+static GLboolean
+Parse_OptionSequence(struct parse_state *parseState,
+                     struct vp_instruction program[])
+{
+   while (1) {
+      if (!Parse_String(parseState, "OPTION"))
+         return GL_TRUE;  /* ok, not an OPTION statement */
+      if (Parse_String(parseState, "NV_position_invariant")) {
+         parseState->isPositionInvariant = GL_TRUE;
+      }
+      else {
+         RETURN_ERROR1("unexpected OPTION statement");
+      }
+      if (!Parse_String(parseState, ";"))
+         return GL_FALSE;
+   }
+}
+
+
+static GLboolean
+Parse_InstructionSequence(struct parse_state *parseState,
+                          struct vp_instruction program[])
+{
+   while (1) {
+      struct vp_instruction *inst = program + parseState->numInst;
+
+      /* Initialize the instruction */
+      inst->SrcReg[0].File = (enum register_file) -1;
+      inst->SrcReg[1].File = (enum register_file) -1;
+      inst->SrcReg[2].File = (enum register_file) -1;
+      inst->DstReg.File = (enum register_file) -1;
+
+      if (Parse_String(parseState, "MOV")) {
+         if (!Parse_UnaryOpInstruction(parseState, inst, VP_OPCODE_MOV))
+            RETURN_ERROR;
+      }
+      else if (Parse_String(parseState, "LIT")) {
+         if (!Parse_UnaryOpInstruction(parseState, inst, VP_OPCODE_LIT))
+            RETURN_ERROR;
+      }
+      else if (Parse_String(parseState, "ABS")) {
+         if (!Parse_UnaryOpInstruction(parseState, inst, VP_OPCODE_ABS))
+            RETURN_ERROR;
+      }
+      else if (Parse_String(parseState, "MUL")) {
+         if (!Parse_BiOpInstruction(parseState, inst, VP_OPCODE_MUL))
+            RETURN_ERROR;
+      }
+      else if (Parse_String(parseState, "ADD")) {
+         if (!Parse_BiOpInstruction(parseState, inst, VP_OPCODE_ADD))
+            RETURN_ERROR;
+      }
+      else if (Parse_String(parseState, "DP3")) {
+         if (!Parse_BiOpInstruction(parseState, inst, VP_OPCODE_DP3))
+            RETURN_ERROR;
+      }
+      else if (Parse_String(parseState, "DP4")) {
+         if (!Parse_BiOpInstruction(parseState, inst, VP_OPCODE_DP4))
+            RETURN_ERROR;
+      }
+      else if (Parse_String(parseState, "DST")) {
+         if (!Parse_BiOpInstruction(parseState, inst, VP_OPCODE_DST))
+            RETURN_ERROR;
+      }
+      else if (Parse_String(parseState, "MIN")) {
+         if (!Parse_BiOpInstruction(parseState, inst, VP_OPCODE_MIN))
+            RETURN_ERROR;
+      }
+      else if (Parse_String(parseState, "MAX")) {
+         if (!Parse_BiOpInstruction(parseState, inst, VP_OPCODE_MAX))
+            RETURN_ERROR;
+      }
+      else if (Parse_String(parseState, "SLT")) {
+         if (!Parse_BiOpInstruction(parseState, inst, VP_OPCODE_SLT))
+            RETURN_ERROR;
+      }
+      else if (Parse_String(parseState, "SGE")) {
+         if (!Parse_BiOpInstruction(parseState, inst, VP_OPCODE_SGE))
+            RETURN_ERROR;
+      }
+      else if (Parse_String(parseState, "DPH")) {
+         if (!Parse_BiOpInstruction(parseState, inst, VP_OPCODE_DPH))
+            RETURN_ERROR;
+      }
+      else if (Parse_String(parseState, "SUB")) {
+         if (!Parse_BiOpInstruction(parseState, inst, VP_OPCODE_SUB))
+            RETURN_ERROR;
+      }
+      else if (Parse_String(parseState, "MAD")) {
+         if (!Parse_TriOpInstruction(parseState, inst, VP_OPCODE_MAD))
+            RETURN_ERROR;
+      }
+      else if (Parse_String(parseState, "RCP")) {
+         if (!Parse_ScalarInstruction(parseState, inst, VP_OPCODE_RCP))
+            RETURN_ERROR;
+      }
+      else if (Parse_String(parseState, "RSQ")) {
+         if (!Parse_ScalarInstruction(parseState, inst, VP_OPCODE_RSQ))
+            RETURN_ERROR;
+      }
+      else if (Parse_String(parseState, "EXP")) {
+         if (!Parse_ScalarInstruction(parseState, inst, VP_OPCODE_EXP))
+            RETURN_ERROR;
+      }
+      else if (Parse_String(parseState, "LOG")) {
+         if (!Parse_ScalarInstruction(parseState, inst, VP_OPCODE_LOG))
+            RETURN_ERROR;
+      }
+      else if (Parse_String(parseState, "RCC")) {
+         if (!Parse_ScalarInstruction(parseState, inst, VP_OPCODE_RCC))
+            RETURN_ERROR;
+      }
+      else if (Parse_String(parseState, "ARL")) {
+         if (!Parse_AddressInstruction(parseState, inst))
+            RETURN_ERROR;
+      }
+      else if (Parse_String(parseState, "END")) {
+         if (!Parse_EndInstruction(parseState, inst))
+            RETURN_ERROR;
+         else {
+            parseState->numInst++;
+            return GL_TRUE;  /* all done */
+         }
+      }
+      else {
+         /* bad instruction name */
+         RETURN_ERROR1("Unexpected token");
+      }
+
+      /* examine input/output registers */
+      if (inst->DstReg.File == PROGRAM_OUTPUT)
+         parseState->outputsWritten |= (1 << inst->DstReg.Index);
+      else if (inst->DstReg.File == PROGRAM_ENV_PARAM)
+         parseState->anyProgRegsWritten = GL_TRUE;
+
+      if (inst->SrcReg[0].File == PROGRAM_INPUT)
+         parseState->inputsRead |= (1 << inst->SrcReg[0].Index);
+      if (inst->SrcReg[1].File == PROGRAM_INPUT)
+         parseState->inputsRead |= (1 << inst->SrcReg[1].Index);
+      if (inst->SrcReg[2].File == PROGRAM_INPUT)
+         parseState->inputsRead |= (1 << inst->SrcReg[2].Index);
+
+      parseState->numInst++;
+
+      if (parseState->numInst >= MAX_NV_VERTEX_PROGRAM_INSTRUCTIONS)
+         RETURN_ERROR1("Program too long");
+   }
+
+   RETURN_ERROR;
+}
+
+
+static GLboolean
+Parse_Program(struct parse_state *parseState,
+              struct vp_instruction instBuffer[])
+{
+   if (parseState->isVersion1_1) {
+      if (!Parse_OptionSequence(parseState, instBuffer)) {
+         return GL_FALSE;
+      }
+   }
+   return Parse_InstructionSequence(parseState, instBuffer);
+}
+
+
+/**
+ * Parse/compile the 'str' returning the compiled 'program'.
+ * ctx->Program.ErrorPos will be -1 if successful.  Otherwise, ErrorPos
+ * indicates the position of the error in 'str'.
+ */
+void
+_mesa_parse_nv_vertex_program(GLcontext *ctx, GLenum dstTarget,
+                              const GLubyte *str, GLsizei len,
+                              struct vertex_program *program)
+{
+   struct parse_state parseState;
+   struct vp_instruction instBuffer[MAX_NV_VERTEX_PROGRAM_INSTRUCTIONS];
+   struct vp_instruction *newInst;
+   GLenum target;
+   GLubyte *programString;
+
+   /* Make a null-terminated copy of the program string */
+   programString = (GLubyte *) MALLOC(len + 1);
+   if (!programString) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");
+      return;
+   }
+   MEMCPY(programString, str, len);
+   programString[len] = 0;
+
+   /* Get ready to parse */
+   parseState.ctx = ctx;
+   parseState.start = programString;
+   parseState.isPositionInvariant = GL_FALSE;
+   parseState.isVersion1_1 = GL_FALSE;
+   parseState.numInst = 0;
+   parseState.inputsRead = 0;
+   parseState.outputsWritten = 0;
+   parseState.anyProgRegsWritten = GL_FALSE;
+
+   /* Reset error state */
+   _mesa_set_program_error(ctx, -1, NULL);
+
+   /* check the program header */
+   if (_mesa_strncmp((const char *) programString, "!!VP1.0", 7) == 0) {
+      target = GL_VERTEX_PROGRAM_NV;
+      parseState.pos = programString + 7;
+      parseState.isStateProgram = GL_FALSE;
+   }
+   else if (_mesa_strncmp((const char *) programString, "!!VP1.1", 7) == 0) {
+      target = GL_VERTEX_PROGRAM_NV;
+      parseState.pos = programString + 7;
+      parseState.isStateProgram = GL_FALSE;
+      parseState.isVersion1_1 = GL_TRUE;
+   }
+   else if (_mesa_strncmp((const char *) programString, "!!VSP1.0", 8) == 0) {
+      target = GL_VERTEX_STATE_PROGRAM_NV;
+      parseState.pos = programString + 8;
+      parseState.isStateProgram = GL_TRUE;
+   }
+   else {
+      /* invalid header */
+      ctx->Program.ErrorPos = 0;
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glLoadProgramNV(bad header)");
+      return;
+   }
+
+   /* make sure target and header match */
+   if (target != dstTarget) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glLoadProgramNV(target mismatch)");
+      return;
+   }
+
+
+   if (Parse_Program(&parseState, instBuffer)) {
+      /* successful parse! */
+
+      if (parseState.isStateProgram) {
+         if (!parseState.anyProgRegsWritten) {
+            _mesa_error(ctx, GL_INVALID_OPERATION,
+                        "glLoadProgramNV(c[#] not written)");
+            return;
+         }
+      }
+      else {
+         if (!parseState.isPositionInvariant &&
+             !(parseState.outputsWritten & 1)) {
+            /* bit 1 = HPOS register */
+            _mesa_error(ctx, GL_INVALID_OPERATION,
+                        "glLoadProgramNV(HPOS not written)");
+            return;
+         }
+      }
+
+      /* copy the compiled instructions */
+      assert(parseState.numInst <= MAX_NV_VERTEX_PROGRAM_INSTRUCTIONS);
+      newInst = (struct vp_instruction *)
+         MALLOC(parseState.numInst * sizeof(struct vp_instruction));
+      if (!newInst) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");
+         FREE(programString);
+         return;  /* out of memory */
+      }
+      MEMCPY(newInst, instBuffer,
+             parseState.numInst * sizeof(struct vp_instruction));
+
+      /* install the program */
+      program->Base.Target = target;
+      if (program->Base.String) {
+         FREE(program->Base.String);
+      }
+      program->Base.String = programString;
+      program->Base.Format = GL_PROGRAM_FORMAT_ASCII_ARB;
+      if (program->Instructions) {
+         FREE(program->Instructions);
+      }
+      program->Instructions = newInst;
+      program->InputsRead = parseState.inputsRead;
+      program->OutputsWritten = parseState.outputsWritten;
+      program->IsPositionInvariant = parseState.isPositionInvariant;
+
+#ifdef DEBUG
+      _mesa_printf("--- glLoadProgramNV result ---\n");
+      _mesa_print_nv_vertex_program(program);
+      _mesa_printf("------------------------------\n");
+#endif
+   }
+   else {
+      /* Error! */
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glLoadProgramNV");
+      /* NOTE: _mesa_set_program_error would have been called already */
+      /* GL_NV_vertex_program isn't supposed to set the error string
+       * so we reset it here.
+       */
+      _mesa_set_program_error(ctx, ctx->Program.ErrorPos, NULL);
+   }
+}
+
+
+static void
+PrintSrcReg(const struct vp_src_register *src)
+{
+   static const char comps[5] = "xyzw";
+   if (src->Negate)
+      _mesa_printf("-");
+   if (src->RelAddr) {
+      if (src->Index > 0)
+         _mesa_printf("c[A0.x + %d]", src->Index);
+      else if (src->Index < 0)
+         _mesa_printf("c[A0.x - %d]", -src->Index);
+      else
+         _mesa_printf("c[A0.x]");
+   }
+   else if (src->File == PROGRAM_OUTPUT) {
+      _mesa_printf("o[%s]", OutputRegisters[src->Index]);
+   }
+   else if (src->File == PROGRAM_INPUT) {
+      _mesa_printf("v[%s]", InputRegisters[src->Index]);
+   }
+   else if (src->File == PROGRAM_ENV_PARAM) {
+      _mesa_printf("c[%d]", src->Index);
+   }
+   else {
+      ASSERT(src->File == PROGRAM_TEMPORARY);
+      _mesa_printf("R%d", src->Index);
+   }
+
+   if (src->Swizzle[0] == src->Swizzle[1] &&
+       src->Swizzle[0] == src->Swizzle[2] &&
+       src->Swizzle[0] == src->Swizzle[3]) {
+      _mesa_printf(".%c", comps[src->Swizzle[0]]);
+   }
+   else if (src->Swizzle[0] != 0 ||
+            src->Swizzle[1] != 1 ||
+            src->Swizzle[2] != 2 ||
+            src->Swizzle[3] != 3) {
+      _mesa_printf(".%c%c%c%c",
+             comps[src->Swizzle[0]],
+             comps[src->Swizzle[1]],
+             comps[src->Swizzle[2]],
+             comps[src->Swizzle[3]]);
+   }
+}
+
+
+static void
+PrintDstReg(const struct vp_dst_register *dst)
+{
+   GLint w = dst->WriteMask[0] + dst->WriteMask[1]
+           + dst->WriteMask[2] + dst->WriteMask[3];
+
+   if (dst->File == PROGRAM_OUTPUT) {
+      _mesa_printf("o[%s]", OutputRegisters[dst->Index]);
+   }
+   else if (dst->File == PROGRAM_INPUT) {
+      _mesa_printf("v[%s]", InputRegisters[dst->Index]);
+   }
+   else if (dst->File == PROGRAM_ENV_PARAM) {
+      _mesa_printf("c[%d]", dst->Index);
+   }
+   else {
+      ASSERT(dst->File == PROGRAM_TEMPORARY);
+      _mesa_printf("R%d", dst->Index);
+   }
+
+   if (w != 0 && w != 4) {
+      _mesa_printf(".");
+      if (dst->WriteMask[0])
+         _mesa_printf("x");
+      if (dst->WriteMask[1])
+         _mesa_printf("y");
+      if (dst->WriteMask[2])
+         _mesa_printf("z");
+      if (dst->WriteMask[3])
+         _mesa_printf("w");
+   }
+}
+
+
+/**
+ * Print a single NVIDIA vertex program instruction.
+ */
+void
+_mesa_print_nv_vertex_instruction(const struct vp_instruction *inst)
+{
+   switch (inst->Opcode) {
+      case VP_OPCODE_MOV:
+      case VP_OPCODE_LIT:
+      case VP_OPCODE_RCP:
+      case VP_OPCODE_RSQ:
+      case VP_OPCODE_EXP:
+      case VP_OPCODE_LOG:
+      case VP_OPCODE_RCC:
+      case VP_OPCODE_ABS:
+         _mesa_printf("%s ", Opcodes[(int) inst->Opcode]);
+         PrintDstReg(&inst->DstReg);
+         _mesa_printf(", ");
+         PrintSrcReg(&inst->SrcReg[0]);
+         _mesa_printf(";\n");
+         break;
+      case VP_OPCODE_MUL:
+      case VP_OPCODE_ADD:
+      case VP_OPCODE_DP3:
+      case VP_OPCODE_DP4:
+      case VP_OPCODE_DST:
+      case VP_OPCODE_MIN:
+      case VP_OPCODE_MAX:
+      case VP_OPCODE_SLT:
+      case VP_OPCODE_SGE:
+      case VP_OPCODE_DPH:
+      case VP_OPCODE_SUB:
+         _mesa_printf("%s ", Opcodes[(int) inst->Opcode]);
+         PrintDstReg(&inst->DstReg);
+         _mesa_printf(", ");
+         PrintSrcReg(&inst->SrcReg[0]);
+         _mesa_printf(", ");
+         PrintSrcReg(&inst->SrcReg[1]);
+         _mesa_printf(";\n");
+         break;
+      case VP_OPCODE_MAD:
+         _mesa_printf("MAD ");
+         PrintDstReg(&inst->DstReg);
+         _mesa_printf(", ");
+         PrintSrcReg(&inst->SrcReg[0]);
+         _mesa_printf(", ");
+         PrintSrcReg(&inst->SrcReg[1]);
+         _mesa_printf(", ");
+         PrintSrcReg(&inst->SrcReg[2]);
+         _mesa_printf(";\n");
+         break;
+      case VP_OPCODE_ARL:
+         _mesa_printf("ARL A0.x, ");
+         PrintSrcReg(&inst->SrcReg[0]);
+         _mesa_printf(";\n");
+         break;
+      case VP_OPCODE_END:
+         _mesa_printf("END\n");
+         break;
+      default:
+         _mesa_printf("BAD INSTRUCTION\n");
+   }
+}
+
+
+/**
+ * Print (unparse) the given vertex program.  Just for debugging.
+ */
+void
+_mesa_print_nv_vertex_program(const struct vertex_program *program)
+{
+   const struct vp_instruction *inst;
+
+   for (inst = program->Instructions; ; inst++) {
+      _mesa_print_nv_vertex_instruction(inst);
+      if (inst->Opcode == VP_OPCODE_END)
+         return;
+   }
+}
+
+
+const char *
+_mesa_nv_vertex_input_register_name(GLuint i)
+{
+   ASSERT(i < MAX_NV_VERTEX_PROGRAM_INPUTS);
+   return InputRegisters[i];
+}
+
+
+const char *
+_mesa_nv_vertex_output_register_name(GLuint i)
+{
+   ASSERT(i < MAX_NV_VERTEX_PROGRAM_OUTPUTS);
+   return OutputRegisters[i];
+}
diff --git a/reactos/lib/mesa32/src/main/nvvertparse.h b/reactos/lib/mesa32/src/main/nvvertparse.h
new file mode 100644
index 00000000000..205885f45c3
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/nvvertparse.h
@@ -0,0 +1,50 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Brian Paul
+ */
+
+
+#ifndef NVVERTPARSE_H
+#define NVVERTPARSE_H
+
+
+extern void
+_mesa_parse_nv_vertex_program(GLcontext *ctx, GLenum target,
+                              const GLubyte *str, GLsizei len,
+                              struct vertex_program *program);
+
+extern void
+_mesa_print_nv_vertex_instruction(const struct vp_instruction *inst);
+
+extern void
+_mesa_print_nv_vertex_program(const struct vertex_program *program);
+
+extern const char *
+_mesa_nv_vertex_input_register_name(GLuint i);
+
+extern const char *
+_mesa_nv_vertex_output_register_name(GLuint i);
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/nvvertprog.h b/reactos/lib/mesa32/src/main/nvvertprog.h
new file mode 100644
index 00000000000..820b3e5692b
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/nvvertprog.h
@@ -0,0 +1,107 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/* Private vertex program types and constants only used by files
+ * related to vertex programs.
+ *
+ * XXX TO-DO: Rename this file "vertprog.h" since it's not NV-specific.
+ */
+
+
+#ifndef NVVERTPROG_H
+#define NVVERTPROG_H
+
+
+/* Vertex program opcodes */
+enum vp_opcode
+{
+   VP_OPCODE_MOV,
+   VP_OPCODE_LIT,
+   VP_OPCODE_RCP,
+   VP_OPCODE_RSQ,
+   VP_OPCODE_EXP,
+   VP_OPCODE_LOG,
+   VP_OPCODE_MUL,
+   VP_OPCODE_ADD,
+   VP_OPCODE_DP3,
+   VP_OPCODE_DP4,
+   VP_OPCODE_DST,
+   VP_OPCODE_MIN,
+   VP_OPCODE_MAX,
+   VP_OPCODE_SLT,
+   VP_OPCODE_SGE,
+   VP_OPCODE_MAD,
+   VP_OPCODE_ARL,
+   VP_OPCODE_DPH,
+   VP_OPCODE_RCC,
+   VP_OPCODE_SUB,
+   VP_OPCODE_ABS,
+   VP_OPCODE_END,
+   /* Additional opcodes for GL_ARB_vertex_program */ 
+   VP_OPCODE_FLR,
+   VP_OPCODE_FRC,
+   VP_OPCODE_EX2,
+   VP_OPCODE_LG2,
+   VP_OPCODE_POW,
+   VP_OPCODE_XPD,
+   VP_OPCODE_SWZ
+};
+
+
+
+/* Instruction source register */
+struct vp_src_register
+{
+   enum register_file File;  /* which register file */
+   GLint Index;              /* index into register file */
+   GLubyte Swizzle[4]; /* Each value is 0,1,2,3 for x,y,z,w or */
+                       /* SWIZZLE_ZERO or SWIZZLE_ONE for VP_OPCODE_SWZ. */
+   GLboolean Negate;
+   GLboolean RelAddr;
+};
+
+
+/* Instruction destination register */
+struct vp_dst_register
+{
+   enum register_file File;  /* which register file */
+   GLint Index;              /* index into register file */
+   GLboolean WriteMask[4];
+};
+
+
+/* Vertex program instruction */
+struct vp_instruction
+{
+   enum vp_opcode Opcode;
+   struct vp_src_register SrcReg[3];
+   struct vp_dst_register DstReg;
+#if FEATURE_MESA_program_debug
+   GLint StringPos;
+#endif
+};
+
+
+#endif /* VERTPROG_H */
diff --git a/reactos/lib/mesa32/src/main/occlude.c b/reactos/lib/mesa32/src/main/occlude.c
new file mode 100644
index 00000000000..d329f11f098
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/occlude.c
@@ -0,0 +1,329 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.1
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * Functions to implement the GL_ARB_occlusion_query extension.
+ */
+
+
+#include "glheader.h"
+#include "context.h"
+#include "hash.h"
+#include "imports.h"
+#include "occlude.h"
+#include "mtypes.h"
+
+
+struct occlusion_query
+{
+   GLenum Target;
+   GLuint Id;
+   GLuint PassedCounter;
+   GLboolean Active;
+};
+
+
+
+void
+_mesa_init_occlude(GLcontext *ctx)
+{
+#if FEATURE_ARB_occlusion_query
+   ctx->Occlusion.QueryObjects = _mesa_NewHashTable();
+#endif
+
+   ctx->OcclusionResult = GL_FALSE;
+   ctx->OcclusionResultSaved = GL_FALSE;
+}
+
+
+
+/**
+ * Allocate a new occlusion query object.
+ * \param target - must be GL_SAMPLES_PASSED_ARB at this time
+ * \param id - the object's ID
+ * \return pointer to new occlusion_query object or NULL if out of memory.
+ */
+static struct occlusion_query *
+new_query_object(GLenum target, GLuint id)
+{
+   struct occlusion_query *q = MALLOC_STRUCT(occlusion_query);
+   if (q) {
+      q->Target = target;
+      q->Id = id;
+      q->PassedCounter = 0;
+      q->Active = GL_FALSE;
+   }
+   return q;
+}
+
+
+/**
+ * Delete an occlusion query object.
+ */
+static void
+delete_query_object(struct occlusion_query *q)
+{
+   FREE(q);
+}
+
+
+void GLAPIENTRY
+_mesa_GenQueriesARB(GLsizei n, GLuint *ids)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint first;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (n < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glGenQueriesARB(n < 0)");
+      return;
+   }
+
+   if (ctx->Occlusion.Active) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGenQueriesARB");
+      return;
+   }
+
+   first = _mesa_HashFindFreeKeyBlock(ctx->Occlusion.QueryObjects, n);
+   if (first) {
+      GLsizei i;
+      for (i = 0; i < n; i++) {
+         struct occlusion_query *q = new_query_object(GL_SAMPLES_PASSED_ARB,
+                                                      first + i);
+         if (!q) {
+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenQueriesARB");
+            return;
+         }
+         ids[i] = first + i;
+         _mesa_HashInsert(ctx->Occlusion.QueryObjects, first + i, q);
+      }
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint i;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (n < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glDeleteQueriesARB(n < 0)");
+      return;
+   }
+
+   if (ctx->Occlusion.Active) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glDeleteQueriesARB");
+      return;
+   }
+
+   for (i = 0; i < n; i++) {
+      if (ids[i] > 0) {
+         struct occlusion_query *q = (struct occlusion_query *)
+            _mesa_HashLookup(ctx->Occlusion.QueryObjects, ids[i]);
+         if (q) {
+            _mesa_HashRemove(ctx->Occlusion.QueryObjects, ids[i]);
+            delete_query_object(q);
+         }
+      }
+   }
+}
+
+
+GLboolean GLAPIENTRY
+_mesa_IsQueryARB(GLuint id)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
+
+   if (id && _mesa_HashLookup(ctx->Occlusion.QueryObjects, id))
+      return GL_TRUE;
+   else
+      return GL_FALSE;
+}
+
+
+void GLAPIENTRY
+_mesa_BeginQueryARB(GLenum target, GLuint id)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct occlusion_query *q;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   FLUSH_VERTICES(ctx, _NEW_DEPTH);
+
+   if (target != GL_SAMPLES_PASSED_ARB) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glBeginQueryARB(target)");
+      return;
+   }
+
+   if (id == 0) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glBeginQueryARB(id==0)");
+      return;
+   }
+
+   if (ctx->Occlusion.CurrentQueryObject) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glBeginQueryARB(target)");
+      return;
+   }
+
+   q = (struct occlusion_query *)
+      _mesa_HashLookup(ctx->Occlusion.QueryObjects, id);
+   if (q && q->Active) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glBeginQueryARB");
+      return;
+   }
+   else if (!q) {
+      q = new_query_object(target, id);
+      if (!q) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBeginQueryARB");
+         return;
+      }
+      _mesa_HashInsert(ctx->Occlusion.QueryObjects, id, q);
+   }
+
+   q->Active = GL_TRUE;
+   q->PassedCounter = 0;
+   ctx->Occlusion.Active = GL_TRUE;
+   ctx->Occlusion.CurrentQueryObject = id;
+   ctx->Occlusion.PassedCounter = 0;
+}
+
+
+void GLAPIENTRY
+_mesa_EndQueryARB(GLenum target)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct occlusion_query *q = NULL;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   FLUSH_VERTICES(ctx, _NEW_DEPTH);
+
+   if (target != GL_SAMPLES_PASSED_ARB) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glEndQueryARB(target)");
+      return;
+   }
+
+   if (ctx->Occlusion.CurrentQueryObject)
+      q = (struct occlusion_query *)
+         _mesa_HashLookup(ctx->Occlusion.QueryObjects,
+                          ctx->Occlusion.CurrentQueryObject);
+   if (!q || !q->Active) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glEndQuery with no glBeginQuery");
+      return;
+   }
+
+   q->PassedCounter = ctx->Occlusion.PassedCounter;
+   q->Active = GL_FALSE;
+   ctx->Occlusion.Active = GL_FALSE;
+   ctx->Occlusion.CurrentQueryObject = 0;
+}
+
+
+void GLAPIENTRY
+_mesa_GetQueryivARB(GLenum target, GLenum pname, GLint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (target != GL_SAMPLES_PASSED_ARB) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryivARB(target)");
+      return;
+   }
+
+   switch (pname) {
+      case GL_QUERY_COUNTER_BITS_ARB:
+         *params = 8 * sizeof(GLuint);
+         break;
+      case GL_CURRENT_QUERY_ARB:
+         *params = ctx->Occlusion.CurrentQueryObject;
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryivARB(pname)");
+         return;
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct occlusion_query *q = NULL;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (id)
+      q = (struct occlusion_query *)
+         _mesa_HashLookup(ctx->Occlusion.QueryObjects, id);
+
+   if (!q || q->Active) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetQueryObjectivARB(id=%d)", id);
+      return;
+   }
+
+   switch (pname) {
+      case GL_QUERY_RESULT_ARB:
+         *params = q->PassedCounter;
+         break;
+      case GL_QUERY_RESULT_AVAILABLE_ARB:
+         /* XXX revisit when we have a hardware implementation! */
+         *params = GL_TRUE;
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryObjectivARB(pname)");
+         return;
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct occlusion_query *q = NULL;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (id)
+      q = (struct occlusion_query *)
+         _mesa_HashLookup(ctx->Occlusion.QueryObjects, id);
+   if (!q || q->Active) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetQueryObjectuivARB(id=%d", id);
+      return;
+   }
+
+   switch (pname) {
+      case GL_QUERY_RESULT_ARB:
+         *params = q->PassedCounter;
+         break;
+      case GL_QUERY_RESULT_AVAILABLE_ARB:
+         /* XXX revisit when we have a hardware implementation! */
+         *params = GL_TRUE;
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryObjectuivARB(pname)");
+         return;
+   }
+}
diff --git a/reactos/lib/mesa32/src/main/occlude.h b/reactos/lib/mesa32/src/main/occlude.h
new file mode 100644
index 00000000000..5696463aecf
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/occlude.h
@@ -0,0 +1,58 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef OCCLUDE_H
+#define OCCLUDE_H
+
+
+extern void
+_mesa_init_occlude(GLcontext *ctx);
+
+extern void GLAPIENTRY
+_mesa_GenQueriesARB(GLsizei n, GLuint *ids);
+
+extern void GLAPIENTRY
+_mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids);
+
+extern GLboolean GLAPIENTRY
+_mesa_IsQueryARB(GLuint id);
+
+extern void GLAPIENTRY
+_mesa_BeginQueryARB(GLenum target, GLuint id);
+
+extern void GLAPIENTRY
+_mesa_EndQueryARB(GLenum target);
+
+extern void GLAPIENTRY
+_mesa_GetQueryivARB(GLenum target, GLenum pname, GLint *params);
+
+extern void GLAPIENTRY
+_mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params);
+
+extern void GLAPIENTRY
+_mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params);
+
+
+#endif /* OCCLUDE_H */
diff --git a/reactos/lib/mesa32/src/main/pixel.c b/reactos/lib/mesa32/src/main/pixel.c
new file mode 100644
index 00000000000..61c7e570da1
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/pixel.c
@@ -0,0 +1,1529 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "glheader.h"
+#include "imports.h"
+#include "colormac.h"
+#include "context.h"
+#include "macros.h"
+#include "pixel.h"
+#include "mtypes.h"
+
+
+/**********************************************************************/
+/*****                    glPixelZoom                             *****/
+/**********************************************************************/
+
+
+
+void GLAPIENTRY
+_mesa_PixelZoom( GLfloat xfactor, GLfloat yfactor )
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (ctx->Pixel.ZoomX == xfactor &&
+       ctx->Pixel.ZoomY == yfactor)
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_PIXEL);
+   ctx->Pixel.ZoomX = xfactor;
+   ctx->Pixel.ZoomY = yfactor;
+}
+
+
+
+/**********************************************************************/
+/*****                    glPixelStore                            *****/
+/**********************************************************************/
+
+
+void GLAPIENTRY
+_mesa_PixelStorei( GLenum pname, GLint param )
+{
+   /* NOTE: this call can't be compiled into the display list */
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   switch (pname) {
+      case GL_PACK_SWAP_BYTES:
+	 if (param == (GLint)ctx->Pack.SwapBytes)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+         ctx->Pack.SwapBytes = param ? GL_TRUE : GL_FALSE;
+	 break;
+      case GL_PACK_LSB_FIRST:
+	 if (param == (GLint)ctx->Pack.LsbFirst)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+         ctx->Pack.LsbFirst = param ? GL_TRUE : GL_FALSE;
+	 break;
+      case GL_PACK_ROW_LENGTH:
+	 if (param<0) {
+	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
+	    return;
+	 }
+	 if (ctx->Pack.RowLength == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+	 ctx->Pack.RowLength = param;
+	 break;
+      case GL_PACK_IMAGE_HEIGHT:
+         if (param<0) {
+            _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
+	    return;
+	 }
+	 if (ctx->Pack.ImageHeight == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+	 ctx->Pack.ImageHeight = param;
+         break;
+      case GL_PACK_SKIP_PIXELS:
+	 if (param<0) {
+	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
+	    return;
+	 }
+	 if (ctx->Pack.SkipPixels == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+	 ctx->Pack.SkipPixels = param;
+	 break;
+      case GL_PACK_SKIP_ROWS:
+	 if (param<0) {
+	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
+	    return;
+	 }
+	 if (ctx->Pack.SkipRows == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+	 ctx->Pack.SkipRows = param;
+	 break;
+      case GL_PACK_SKIP_IMAGES:
+	 if (param<0) {
+	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
+	    return;
+	 }
+	 if (ctx->Pack.SkipImages == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+	 ctx->Pack.SkipImages = param;
+	 break;
+      case GL_PACK_ALIGNMENT:
+         if (param!=1 && param!=2 && param!=4 && param!=8) {
+	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
+	    return;
+	 }
+	 if (ctx->Pack.Alignment == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+	 ctx->Pack.Alignment = param;
+	 break;
+      case GL_PACK_INVERT_MESA:
+         if (!ctx->Extensions.MESA_pack_invert) {
+            _mesa_error( ctx, GL_INVALID_ENUM, "glPixelstore(pname)" );
+            return;
+         }
+         if (ctx->Pack.Invert == param)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+         ctx->Pack.Invert = param;
+         break;
+
+      case GL_UNPACK_SWAP_BYTES:
+	 if (param == (GLint)ctx->Unpack.SwapBytes)
+	    return;
+	 if ((GLint)ctx->Unpack.SwapBytes == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+	 ctx->Unpack.SwapBytes = param ? GL_TRUE : GL_FALSE;
+         break;
+      case GL_UNPACK_LSB_FIRST:
+	 if (param == (GLint)ctx->Unpack.LsbFirst)
+	    return;
+	 if ((GLint)ctx->Unpack.LsbFirst == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+	 ctx->Unpack.LsbFirst = param ? GL_TRUE : GL_FALSE;
+	 break;
+      case GL_UNPACK_ROW_LENGTH:
+	 if (param<0) {
+	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
+	    return;
+	 }
+	 if (ctx->Unpack.RowLength == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+	 ctx->Unpack.RowLength = param;
+	 break;
+      case GL_UNPACK_IMAGE_HEIGHT:
+         if (param<0) {
+            _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
+	    return;
+	 }
+	 if (ctx->Unpack.ImageHeight == param)
+	    return;
+
+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+	 ctx->Unpack.ImageHeight = param;
+         break;
+      case GL_UNPACK_SKIP_PIXELS:
+	 if (param<0) {
+	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
+	    return;
+	 }
+	 if (ctx->Unpack.SkipPixels == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+	 ctx->Unpack.SkipPixels = param;
+	 break;
+      case GL_UNPACK_SKIP_ROWS:
+	 if (param<0) {
+	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
+	    return;
+	 }
+	 if (ctx->Unpack.SkipRows == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+	 ctx->Unpack.SkipRows = param;
+	 break;
+      case GL_UNPACK_SKIP_IMAGES:
+	 if (param < 0) {
+	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
+	    return;
+	 }
+	 if (ctx->Unpack.SkipImages == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+	 ctx->Unpack.SkipImages = param;
+	 break;
+      case GL_UNPACK_ALIGNMENT:
+         if (param!=1 && param!=2 && param!=4 && param!=8) {
+	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore" );
+	    return;
+	 }
+	 if (ctx->Unpack.Alignment == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+	 ctx->Unpack.Alignment = param;
+	 break;
+      case GL_UNPACK_CLIENT_STORAGE_APPLE:
+         if (param == (GLint)ctx->Unpack.ClientStorage)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
+         ctx->Unpack.ClientStorage = param ? GL_TRUE : GL_FALSE;
+         break;
+      default:
+	 _mesa_error( ctx, GL_INVALID_ENUM, "glPixelStore" );
+	 return;
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_PixelStoref( GLenum pname, GLfloat param )
+{
+   _mesa_PixelStorei( pname, (GLint) param );
+}
+
+
+
+/**********************************************************************/
+/*****                         glPixelMap                         *****/
+/**********************************************************************/
+
+
+
+void GLAPIENTRY
+_mesa_PixelMapfv( GLenum map, GLsizei mapsize, const GLfloat *values )
+{
+   GLint i;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (mapsize < 1 || mapsize > MAX_PIXEL_MAP_TABLE) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glPixelMapfv(mapsize)" );
+      return;
+   }
+
+   if (map >= GL_PIXEL_MAP_S_TO_S && map <= GL_PIXEL_MAP_I_TO_A) {
+      /* test that mapsize is a power of two */
+      if (_mesa_bitcount((GLuint) mapsize) != 1) {
+	 _mesa_error( ctx, GL_INVALID_VALUE, "glPixelMapfv(mapsize)" );
+         return;
+      }
+   }
+
+   FLUSH_VERTICES(ctx, _NEW_PIXEL);
+
+   switch (map) {
+      case GL_PIXEL_MAP_S_TO_S:
+         ctx->Pixel.MapStoSsize = mapsize;
+         for (i=0;i<mapsize;i++) {
+	    ctx->Pixel.MapStoS[i] = (GLint) values[i];
+	 }
+	 break;
+      case GL_PIXEL_MAP_I_TO_I:
+         ctx->Pixel.MapItoIsize = mapsize;
+         for (i=0;i<mapsize;i++) {
+	    ctx->Pixel.MapItoI[i] = (GLint) values[i];
+	 }
+	 break;
+      case GL_PIXEL_MAP_I_TO_R:
+         ctx->Pixel.MapItoRsize = mapsize;
+         for (i=0;i<mapsize;i++) {
+            GLfloat val = CLAMP( values[i], 0.0F, 1.0F );
+	    ctx->Pixel.MapItoR[i] = val;
+	    ctx->Pixel.MapItoR8[i] = (GLint) (val * 255.0F);
+	 }
+	 break;
+      case GL_PIXEL_MAP_I_TO_G:
+         ctx->Pixel.MapItoGsize = mapsize;
+         for (i=0;i<mapsize;i++) {
+            GLfloat val = CLAMP( values[i], 0.0F, 1.0F );
+	    ctx->Pixel.MapItoG[i] = val;
+	    ctx->Pixel.MapItoG8[i] = (GLint) (val * 255.0F);
+	 }
+	 break;
+      case GL_PIXEL_MAP_I_TO_B:
+         ctx->Pixel.MapItoBsize = mapsize;
+         for (i=0;i<mapsize;i++) {
+            GLfloat val = CLAMP( values[i], 0.0F, 1.0F );
+	    ctx->Pixel.MapItoB[i] = val;
+	    ctx->Pixel.MapItoB8[i] = (GLint) (val * 255.0F);
+	 }
+	 break;
+      case GL_PIXEL_MAP_I_TO_A:
+         ctx->Pixel.MapItoAsize = mapsize;
+         for (i=0;i<mapsize;i++) {
+            GLfloat val = CLAMP( values[i], 0.0F, 1.0F );
+	    ctx->Pixel.MapItoA[i] = val;
+	    ctx->Pixel.MapItoA8[i] = (GLint) (val * 255.0F);
+	 }
+	 break;
+      case GL_PIXEL_MAP_R_TO_R:
+         ctx->Pixel.MapRtoRsize = mapsize;
+         for (i=0;i<mapsize;i++) {
+	    ctx->Pixel.MapRtoR[i] = CLAMP( values[i], 0.0F, 1.0F );
+	 }
+	 break;
+      case GL_PIXEL_MAP_G_TO_G:
+         ctx->Pixel.MapGtoGsize = mapsize;
+         for (i=0;i<mapsize;i++) {
+	    ctx->Pixel.MapGtoG[i] = CLAMP( values[i], 0.0F, 1.0F );
+	 }
+	 break;
+      case GL_PIXEL_MAP_B_TO_B:
+         ctx->Pixel.MapBtoBsize = mapsize;
+         for (i=0;i<mapsize;i++) {
+	    ctx->Pixel.MapBtoB[i] = CLAMP( values[i], 0.0F, 1.0F );
+	 }
+	 break;
+      case GL_PIXEL_MAP_A_TO_A:
+         ctx->Pixel.MapAtoAsize = mapsize;
+         for (i=0;i<mapsize;i++) {
+	    ctx->Pixel.MapAtoA[i] = CLAMP( values[i], 0.0F, 1.0F );
+	 }
+	 break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glPixelMapfv(map)" );
+   }
+}
+
+
+
+void GLAPIENTRY
+_mesa_PixelMapuiv(GLenum map, GLsizei mapsize, const GLuint *values )
+{
+   const GLint n = MIN2(mapsize, MAX_PIXEL_MAP_TABLE);
+   GLfloat fvalues[MAX_PIXEL_MAP_TABLE];
+   GLint i;
+   if (map==GL_PIXEL_MAP_I_TO_I || map==GL_PIXEL_MAP_S_TO_S) {
+      for (i=0;i<n;i++) {
+         fvalues[i] = (GLfloat) values[i];
+      }
+   }
+   else {
+      for (i=0;i<n;i++) {
+         fvalues[i] = UINT_TO_FLOAT( values[i] );
+      }
+   }
+   _mesa_PixelMapfv(map, mapsize, fvalues);
+}
+
+
+
+void GLAPIENTRY
+_mesa_PixelMapusv(GLenum map, GLsizei mapsize, const GLushort *values )
+{
+   const GLint n = MIN2(mapsize, MAX_PIXEL_MAP_TABLE);
+   GLfloat fvalues[MAX_PIXEL_MAP_TABLE];
+   GLint i;
+   if (map==GL_PIXEL_MAP_I_TO_I || map==GL_PIXEL_MAP_S_TO_S) {
+      for (i=0;i<n;i++) {
+         fvalues[i] = (GLfloat) values[i];
+      }
+   }
+   else {
+      for (i=0;i<n;i++) {
+         fvalues[i] = USHORT_TO_FLOAT( values[i] );
+      }
+   }
+   _mesa_PixelMapfv(map, mapsize, fvalues);
+}
+
+
+
+void GLAPIENTRY
+_mesa_GetPixelMapfv( GLenum map, GLfloat *values )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint i;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   switch (map) {
+      case GL_PIXEL_MAP_I_TO_I:
+         for (i=0;i<ctx->Pixel.MapItoIsize;i++) {
+	    values[i] = (GLfloat) ctx->Pixel.MapItoI[i];
+	 }
+	 break;
+      case GL_PIXEL_MAP_S_TO_S:
+         for (i=0;i<ctx->Pixel.MapStoSsize;i++) {
+	    values[i] = (GLfloat) ctx->Pixel.MapStoS[i];
+	 }
+	 break;
+      case GL_PIXEL_MAP_I_TO_R:
+         MEMCPY(values,ctx->Pixel.MapItoR,ctx->Pixel.MapItoRsize*sizeof(GLfloat));
+	 break;
+      case GL_PIXEL_MAP_I_TO_G:
+         MEMCPY(values,ctx->Pixel.MapItoG,ctx->Pixel.MapItoGsize*sizeof(GLfloat));
+	 break;
+      case GL_PIXEL_MAP_I_TO_B:
+         MEMCPY(values,ctx->Pixel.MapItoB,ctx->Pixel.MapItoBsize*sizeof(GLfloat));
+	 break;
+      case GL_PIXEL_MAP_I_TO_A:
+         MEMCPY(values,ctx->Pixel.MapItoA,ctx->Pixel.MapItoAsize*sizeof(GLfloat));
+	 break;
+      case GL_PIXEL_MAP_R_TO_R:
+         MEMCPY(values,ctx->Pixel.MapRtoR,ctx->Pixel.MapRtoRsize*sizeof(GLfloat));
+	 break;
+      case GL_PIXEL_MAP_G_TO_G:
+         MEMCPY(values,ctx->Pixel.MapGtoG,ctx->Pixel.MapGtoGsize*sizeof(GLfloat));
+	 break;
+      case GL_PIXEL_MAP_B_TO_B:
+         MEMCPY(values,ctx->Pixel.MapBtoB,ctx->Pixel.MapBtoBsize*sizeof(GLfloat));
+	 break;
+      case GL_PIXEL_MAP_A_TO_A:
+         MEMCPY(values,ctx->Pixel.MapAtoA,ctx->Pixel.MapAtoAsize*sizeof(GLfloat));
+	 break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetPixelMapfv" );
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetPixelMapuiv( GLenum map, GLuint *values )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint i;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   switch (map) {
+      case GL_PIXEL_MAP_I_TO_I:
+         MEMCPY(values, ctx->Pixel.MapItoI, ctx->Pixel.MapItoIsize*sizeof(GLint));
+	 break;
+      case GL_PIXEL_MAP_S_TO_S:
+         MEMCPY(values, ctx->Pixel.MapStoS, ctx->Pixel.MapStoSsize*sizeof(GLint));
+	 break;
+      case GL_PIXEL_MAP_I_TO_R:
+	 for (i=0;i<ctx->Pixel.MapItoRsize;i++) {
+	    values[i] = FLOAT_TO_UINT( ctx->Pixel.MapItoR[i] );
+	 }
+	 break;
+      case GL_PIXEL_MAP_I_TO_G:
+	 for (i=0;i<ctx->Pixel.MapItoGsize;i++) {
+	    values[i] = FLOAT_TO_UINT( ctx->Pixel.MapItoG[i] );
+	 }
+	 break;
+      case GL_PIXEL_MAP_I_TO_B:
+	 for (i=0;i<ctx->Pixel.MapItoBsize;i++) {
+	    values[i] = FLOAT_TO_UINT( ctx->Pixel.MapItoB[i] );
+	 }
+	 break;
+      case GL_PIXEL_MAP_I_TO_A:
+	 for (i=0;i<ctx->Pixel.MapItoAsize;i++) {
+	    values[i] = FLOAT_TO_UINT( ctx->Pixel.MapItoA[i] );
+	 }
+	 break;
+      case GL_PIXEL_MAP_R_TO_R:
+	 for (i=0;i<ctx->Pixel.MapRtoRsize;i++) {
+	    values[i] = FLOAT_TO_UINT( ctx->Pixel.MapRtoR[i] );
+	 }
+	 break;
+      case GL_PIXEL_MAP_G_TO_G:
+	 for (i=0;i<ctx->Pixel.MapGtoGsize;i++) {
+	    values[i] = FLOAT_TO_UINT( ctx->Pixel.MapGtoG[i] );
+	 }
+	 break;
+      case GL_PIXEL_MAP_B_TO_B:
+	 for (i=0;i<ctx->Pixel.MapBtoBsize;i++) {
+	    values[i] = FLOAT_TO_UINT( ctx->Pixel.MapBtoB[i] );
+	 }
+	 break;
+      case GL_PIXEL_MAP_A_TO_A:
+	 for (i=0;i<ctx->Pixel.MapAtoAsize;i++) {
+	    values[i] = FLOAT_TO_UINT( ctx->Pixel.MapAtoA[i] );
+	 }
+	 break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetPixelMapfv" );
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetPixelMapusv( GLenum map, GLushort *values )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint i;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   switch (map) {
+      case GL_PIXEL_MAP_I_TO_I:
+	 for (i=0;i<ctx->Pixel.MapItoIsize;i++) {
+	    values[i] = (GLushort) ctx->Pixel.MapItoI[i];
+	 }
+	 break;
+      case GL_PIXEL_MAP_S_TO_S:
+	 for (i=0;i<ctx->Pixel.MapStoSsize;i++) {
+	    values[i] = (GLushort) ctx->Pixel.MapStoS[i];
+	 }
+	 break;
+      case GL_PIXEL_MAP_I_TO_R:
+	 for (i=0;i<ctx->Pixel.MapItoRsize;i++) {
+	    values[i] = FLOAT_TO_USHORT( ctx->Pixel.MapItoR[i] );
+	 }
+	 break;
+      case GL_PIXEL_MAP_I_TO_G:
+	 for (i=0;i<ctx->Pixel.MapItoGsize;i++) {
+	    values[i] = FLOAT_TO_USHORT( ctx->Pixel.MapItoG[i] );
+	 }
+	 break;
+      case GL_PIXEL_MAP_I_TO_B:
+	 for (i=0;i<ctx->Pixel.MapItoBsize;i++) {
+	    values[i] = FLOAT_TO_USHORT( ctx->Pixel.MapItoB[i] );
+	 }
+	 break;
+      case GL_PIXEL_MAP_I_TO_A:
+	 for (i=0;i<ctx->Pixel.MapItoAsize;i++) {
+	    values[i] = FLOAT_TO_USHORT( ctx->Pixel.MapItoA[i] );
+	 }
+	 break;
+      case GL_PIXEL_MAP_R_TO_R:
+	 for (i=0;i<ctx->Pixel.MapRtoRsize;i++) {
+	    values[i] = FLOAT_TO_USHORT( ctx->Pixel.MapRtoR[i] );
+	 }
+	 break;
+      case GL_PIXEL_MAP_G_TO_G:
+	 for (i=0;i<ctx->Pixel.MapGtoGsize;i++) {
+	    values[i] = FLOAT_TO_USHORT( ctx->Pixel.MapGtoG[i] );
+	 }
+	 break;
+      case GL_PIXEL_MAP_B_TO_B:
+	 for (i=0;i<ctx->Pixel.MapBtoBsize;i++) {
+	    values[i] = FLOAT_TO_USHORT( ctx->Pixel.MapBtoB[i] );
+	 }
+	 break;
+      case GL_PIXEL_MAP_A_TO_A:
+	 for (i=0;i<ctx->Pixel.MapAtoAsize;i++) {
+	    values[i] = FLOAT_TO_USHORT( ctx->Pixel.MapAtoA[i] );
+	 }
+	 break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetPixelMapfv" );
+   }
+}
+
+
+
+/**********************************************************************/
+/*****                       glPixelTransfer                      *****/
+/**********************************************************************/
+
+
+/*
+ * Implements glPixelTransfer[fi] whether called immediately or from a
+ * display list.
+ */
+void GLAPIENTRY
+_mesa_PixelTransferf( GLenum pname, GLfloat param )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   switch (pname) {
+      case GL_MAP_COLOR:
+         if (ctx->Pixel.MapColorFlag == (param ? GL_TRUE : GL_FALSE))
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.MapColorFlag = param ? GL_TRUE : GL_FALSE;
+	 break;
+      case GL_MAP_STENCIL:
+         if (ctx->Pixel.MapStencilFlag == (param ? GL_TRUE : GL_FALSE))
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.MapStencilFlag = param ? GL_TRUE : GL_FALSE;
+	 break;
+      case GL_INDEX_SHIFT:
+         if (ctx->Pixel.IndexShift == (GLint) param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.IndexShift = (GLint) param;
+	 break;
+      case GL_INDEX_OFFSET:
+         if (ctx->Pixel.IndexOffset == (GLint) param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.IndexOffset = (GLint) param;
+	 break;
+      case GL_RED_SCALE:
+         if (ctx->Pixel.RedScale == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.RedScale = param;
+	 break;
+      case GL_RED_BIAS:
+         if (ctx->Pixel.RedBias == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.RedBias = param;
+	 break;
+      case GL_GREEN_SCALE:
+         if (ctx->Pixel.GreenScale == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.GreenScale = param;
+	 break;
+      case GL_GREEN_BIAS:
+         if (ctx->Pixel.GreenBias == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.GreenBias = param;
+	 break;
+      case GL_BLUE_SCALE:
+         if (ctx->Pixel.BlueScale == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.BlueScale = param;
+	 break;
+      case GL_BLUE_BIAS:
+         if (ctx->Pixel.BlueBias == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.BlueBias = param;
+	 break;
+      case GL_ALPHA_SCALE:
+         if (ctx->Pixel.AlphaScale == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.AlphaScale = param;
+	 break;
+      case GL_ALPHA_BIAS:
+         if (ctx->Pixel.AlphaBias == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.AlphaBias = param;
+	 break;
+      case GL_DEPTH_SCALE:
+         if (ctx->Pixel.DepthScale == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.DepthScale = param;
+	 break;
+      case GL_DEPTH_BIAS:
+         if (ctx->Pixel.DepthBias == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.DepthBias = param;
+	 break;
+      case GL_POST_COLOR_MATRIX_RED_SCALE:
+         if (ctx->Pixel.PostColorMatrixScale[0] == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.PostColorMatrixScale[0] = param;
+	 break;
+      case GL_POST_COLOR_MATRIX_RED_BIAS:
+         if (ctx->Pixel.PostColorMatrixBias[0] == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.PostColorMatrixBias[0] = param;
+	 break;
+      case GL_POST_COLOR_MATRIX_GREEN_SCALE:
+         if (ctx->Pixel.PostColorMatrixScale[1] == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.PostColorMatrixScale[1] = param;
+	 break;
+      case GL_POST_COLOR_MATRIX_GREEN_BIAS:
+         if (ctx->Pixel.PostColorMatrixBias[1] == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.PostColorMatrixBias[1] = param;
+	 break;
+      case GL_POST_COLOR_MATRIX_BLUE_SCALE:
+         if (ctx->Pixel.PostColorMatrixScale[2] == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.PostColorMatrixScale[2] = param;
+	 break;
+      case GL_POST_COLOR_MATRIX_BLUE_BIAS:
+         if (ctx->Pixel.PostColorMatrixBias[2] == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.PostColorMatrixBias[2] = param;
+	 break;
+      case GL_POST_COLOR_MATRIX_ALPHA_SCALE:
+         if (ctx->Pixel.PostColorMatrixScale[3] == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.PostColorMatrixScale[3] = param;
+	 break;
+      case GL_POST_COLOR_MATRIX_ALPHA_BIAS:
+         if (ctx->Pixel.PostColorMatrixBias[3] == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.PostColorMatrixBias[3] = param;
+	 break;
+      case GL_POST_CONVOLUTION_RED_SCALE:
+         if (ctx->Pixel.PostConvolutionScale[0] == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.PostConvolutionScale[0] = param;
+	 break;
+      case GL_POST_CONVOLUTION_RED_BIAS:
+         if (ctx->Pixel.PostConvolutionBias[0] == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.PostConvolutionBias[0] = param;
+	 break;
+      case GL_POST_CONVOLUTION_GREEN_SCALE:
+         if (ctx->Pixel.PostConvolutionScale[1] == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.PostConvolutionScale[1] = param;
+	 break;
+      case GL_POST_CONVOLUTION_GREEN_BIAS:
+         if (ctx->Pixel.PostConvolutionBias[1] == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.PostConvolutionBias[1] = param;
+	 break;
+      case GL_POST_CONVOLUTION_BLUE_SCALE:
+         if (ctx->Pixel.PostConvolutionScale[2] == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.PostConvolutionScale[2] = param;
+	 break;
+      case GL_POST_CONVOLUTION_BLUE_BIAS:
+         if (ctx->Pixel.PostConvolutionBias[2] == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.PostConvolutionBias[2] = param;
+	 break;
+      case GL_POST_CONVOLUTION_ALPHA_SCALE:
+         if (ctx->Pixel.PostConvolutionScale[2] == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.PostConvolutionScale[2] = param;
+	 break;
+      case GL_POST_CONVOLUTION_ALPHA_BIAS:
+         if (ctx->Pixel.PostConvolutionBias[2] == param)
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
+         ctx->Pixel.PostConvolutionBias[2] = param;
+	 break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glPixelTransfer(pname)" );
+         return;
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_PixelTransferi( GLenum pname, GLint param )
+{
+   _mesa_PixelTransferf( pname, (GLfloat) param );
+}
+
+/**********************************************************************/
+/*****                  Pixel processing functions               ******/
+/**********************************************************************/
+
+
+/*
+ * Apply scale and bias factors to an array of RGBA pixels.
+ */
+void
+_mesa_scale_and_bias_rgba(const GLcontext *ctx, GLuint n, GLfloat rgba[][4],
+                          GLfloat rScale, GLfloat gScale,
+                          GLfloat bScale, GLfloat aScale,
+                          GLfloat rBias, GLfloat gBias,
+                          GLfloat bBias, GLfloat aBias)
+{
+   if (rScale != 1.0 || rBias != 0.0) {
+      GLuint i;
+      for (i = 0; i < n; i++) {
+         rgba[i][RCOMP] = rgba[i][RCOMP] * rScale + rBias;
+      }
+   }
+   if (gScale != 1.0 || gBias != 0.0) {
+      GLuint i;
+      for (i = 0; i < n; i++) {
+         rgba[i][GCOMP] = rgba[i][GCOMP] * gScale + gBias;
+      }
+   }
+   if (bScale != 1.0 || bBias != 0.0) {
+      GLuint i;
+      for (i = 0; i < n; i++) {
+         rgba[i][BCOMP] = rgba[i][BCOMP] * bScale + bBias;
+      }
+   }
+   if (aScale != 1.0 || aBias != 0.0) {
+      GLuint i;
+      for (i = 0; i < n; i++) {
+         rgba[i][ACOMP] = rgba[i][ACOMP] * aScale + aBias;
+      }
+   }
+}
+
+
+/*
+ * Apply pixel mapping to an array of floating point RGBA pixels.
+ */
+void
+_mesa_map_rgba( const GLcontext *ctx, GLuint n, GLfloat rgba[][4] )
+{
+   const GLfloat rscale = (GLfloat) (ctx->Pixel.MapRtoRsize - 1);
+   const GLfloat gscale = (GLfloat) (ctx->Pixel.MapGtoGsize - 1);
+   const GLfloat bscale = (GLfloat) (ctx->Pixel.MapBtoBsize - 1);
+   const GLfloat ascale = (GLfloat) (ctx->Pixel.MapAtoAsize - 1);
+   const GLfloat *rMap = ctx->Pixel.MapRtoR;
+   const GLfloat *gMap = ctx->Pixel.MapGtoG;
+   const GLfloat *bMap = ctx->Pixel.MapBtoB;
+   const GLfloat *aMap = ctx->Pixel.MapAtoA;
+   GLuint i;
+   for (i=0;i<n;i++) {
+      GLfloat r = CLAMP(rgba[i][RCOMP], 0.0F, 1.0F);
+      GLfloat g = CLAMP(rgba[i][GCOMP], 0.0F, 1.0F);
+      GLfloat b = CLAMP(rgba[i][BCOMP], 0.0F, 1.0F);
+      GLfloat a = CLAMP(rgba[i][ACOMP], 0.0F, 1.0F);
+      rgba[i][RCOMP] = rMap[IROUND(r * rscale)];
+      rgba[i][GCOMP] = gMap[IROUND(g * gscale)];
+      rgba[i][BCOMP] = bMap[IROUND(b * bscale)];
+      rgba[i][ACOMP] = aMap[IROUND(a * ascale)];
+   }
+}
+
+
+/*
+ * Apply the color matrix and post color matrix scaling and biasing.
+ */
+void
+_mesa_transform_rgba(const GLcontext *ctx, GLuint n, GLfloat rgba[][4])
+{
+   const GLfloat rs = ctx->Pixel.PostColorMatrixScale[0];
+   const GLfloat rb = ctx->Pixel.PostColorMatrixBias[0];
+   const GLfloat gs = ctx->Pixel.PostColorMatrixScale[1];
+   const GLfloat gb = ctx->Pixel.PostColorMatrixBias[1];
+   const GLfloat bs = ctx->Pixel.PostColorMatrixScale[2];
+   const GLfloat bb = ctx->Pixel.PostColorMatrixBias[2];
+   const GLfloat as = ctx->Pixel.PostColorMatrixScale[3];
+   const GLfloat ab = ctx->Pixel.PostColorMatrixBias[3];
+   const GLfloat *m = ctx->ColorMatrixStack.Top->m;
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      const GLfloat r = rgba[i][RCOMP];
+      const GLfloat g = rgba[i][GCOMP];
+      const GLfloat b = rgba[i][BCOMP];
+      const GLfloat a = rgba[i][ACOMP];
+      rgba[i][RCOMP] = (m[0] * r + m[4] * g + m[ 8] * b + m[12] * a) * rs + rb;
+      rgba[i][GCOMP] = (m[1] * r + m[5] * g + m[ 9] * b + m[13] * a) * gs + gb;
+      rgba[i][BCOMP] = (m[2] * r + m[6] * g + m[10] * b + m[14] * a) * bs + bb;
+      rgba[i][ACOMP] = (m[3] * r + m[7] * g + m[11] * b + m[15] * a) * as + ab;
+   }
+}
+
+
+/*
+ * Apply a color table lookup to an array of colors.
+ */
+void
+_mesa_lookup_rgba(const struct gl_color_table *table,
+                  GLuint n, GLfloat rgba[][4])
+{
+   if (!table->Table || table->Size == 0)
+      return;
+
+   switch (table->Format) {
+      case GL_INTENSITY:
+         /* replace RGBA with I */
+         if (!table->FloatTable) {
+            const GLint max = table->Size - 1;
+            const GLfloat scale = (GLfloat) max;
+            const GLchan *lut = (const GLchan *) table->Table;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               GLint j = IROUND(rgba[i][RCOMP] * scale);
+               GLfloat c = CHAN_TO_FLOAT(lut[CLAMP(j, 0, max)]);
+               rgba[i][RCOMP] = rgba[i][GCOMP] =
+                  rgba[i][BCOMP] = rgba[i][ACOMP] = c;
+            }
+         }
+         else {
+            const GLint max = table->Size - 1;
+            const GLfloat scale = (GLfloat) max;
+            const GLfloat *lut = (const GLfloat *) table->Table;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               GLint j = IROUND(rgba[i][RCOMP] * scale);
+               GLfloat c = lut[CLAMP(j, 0, max)];
+               rgba[i][RCOMP] = rgba[i][GCOMP] =
+                  rgba[i][BCOMP] = rgba[i][ACOMP] = c;
+            }
+         }
+         break;
+      case GL_LUMINANCE:
+         /* replace RGB with L */
+         if (!table->FloatTable) {
+            const GLint max = table->Size - 1;
+            const GLfloat scale = (GLfloat) max;
+            const GLchan *lut = (const GLchan *) table->Table;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               GLint j = IROUND(rgba[i][RCOMP] * scale);
+               GLfloat c = CHAN_TO_FLOAT(lut[CLAMP(j, 0, max)]);
+               rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = c;
+            }
+         }
+         else {
+            const GLint max = table->Size - 1;
+            const GLfloat scale = (GLfloat) max;
+            const GLfloat *lut = (const GLfloat *) table->Table;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               GLint j = IROUND(rgba[i][RCOMP] * scale);
+               GLfloat c = lut[CLAMP(j, 0, max)];
+               rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = c;
+            }
+         }
+         break;
+      case GL_ALPHA:
+         /* replace A with A */
+         if (!table->FloatTable) {
+            const GLint max = table->Size - 1;
+            const GLfloat scale = (GLfloat) max;
+            const GLchan *lut = (const GLchan *) table->Table;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               GLint j = IROUND(rgba[i][ACOMP] * scale);
+               rgba[i][ACOMP] = CHAN_TO_FLOAT(lut[CLAMP(j, 0, max)]);
+            }
+         }
+         else  {
+            const GLint max = table->Size - 1;
+            const GLfloat scale = (GLfloat) max;
+            const GLfloat *lut = (const GLfloat *) table->Table;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               GLint j = IROUND(rgba[i][ACOMP] * scale);
+               rgba[i][ACOMP] = lut[CLAMP(j, 0, max)];
+            }
+         }
+         break;
+      case GL_LUMINANCE_ALPHA:
+         /* replace RGBA with LLLA */
+         if (!table->FloatTable) {
+            const GLint max = table->Size - 1;
+            const GLfloat scale = (GLfloat) max;
+            const GLchan *lut = (const GLchan *) table->Table;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               GLint jL = IROUND(rgba[i][RCOMP] * scale);
+               GLint jA = IROUND(rgba[i][ACOMP] * scale);
+               GLfloat luminance, alpha;
+               jL = CLAMP(jL, 0, max);
+               jA = CLAMP(jA, 0, max);
+               luminance = CHAN_TO_FLOAT(lut[jL * 2 + 0]);
+               alpha     = CHAN_TO_FLOAT(lut[jA * 2 + 1]);
+               rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = luminance;
+               rgba[i][ACOMP] = alpha;;
+            }
+         }
+         else {
+            const GLint max = table->Size - 1;
+            const GLfloat scale = (GLfloat) max;
+            const GLfloat *lut = (const GLfloat *) table->Table;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               GLint jL = IROUND(rgba[i][RCOMP] * scale);
+               GLint jA = IROUND(rgba[i][ACOMP] * scale);
+               GLfloat luminance, alpha;
+               jL = CLAMP(jL, 0, max);
+               jA = CLAMP(jA, 0, max);
+               luminance = lut[jL * 2 + 0];
+               alpha     = lut[jA * 2 + 1];
+               rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = luminance;
+               rgba[i][ACOMP] = alpha;;
+            }
+         }
+         break;
+      case GL_RGB:
+         /* replace RGB with RGB */
+         if (!table->FloatTable) {
+            const GLint max = table->Size - 1;
+            const GLfloat scale = (GLfloat) max;
+            const GLchan *lut = (const GLchan *) table->Table;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               GLint jR = IROUND(rgba[i][RCOMP] * scale);
+               GLint jG = IROUND(rgba[i][GCOMP] * scale);
+               GLint jB = IROUND(rgba[i][BCOMP] * scale);
+               jR = CLAMP(jR, 0, max);
+               jG = CLAMP(jG, 0, max);
+               jB = CLAMP(jB, 0, max);
+               rgba[i][RCOMP] = CHAN_TO_FLOAT(lut[jR * 3 + 0]);
+               rgba[i][GCOMP] = CHAN_TO_FLOAT(lut[jG * 3 + 1]);
+               rgba[i][BCOMP] = CHAN_TO_FLOAT(lut[jB * 3 + 2]);
+            }
+         }
+         else {
+            const GLint max = table->Size - 1;
+            const GLfloat scale = (GLfloat) max;
+            const GLfloat *lut = (const GLfloat *) table->Table;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               GLint jR = IROUND(rgba[i][RCOMP] * scale);
+               GLint jG = IROUND(rgba[i][GCOMP] * scale);
+               GLint jB = IROUND(rgba[i][BCOMP] * scale);
+               jR = CLAMP(jR, 0, max);
+               jG = CLAMP(jG, 0, max);
+               jB = CLAMP(jB, 0, max);
+               rgba[i][RCOMP] = lut[jR * 3 + 0];
+               rgba[i][GCOMP] = lut[jG * 3 + 1];
+               rgba[i][BCOMP] = lut[jB * 3 + 2];
+            }
+         }
+         break;
+      case GL_RGBA:
+         /* replace RGBA with RGBA */
+         if (!table->FloatTable) {
+            const GLint max = table->Size - 1;
+            const GLfloat scale = (GLfloat) max;
+            const GLchan *lut = (const GLchan *) table->Table;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               GLint jR = IROUND(rgba[i][RCOMP] * scale);
+               GLint jG = IROUND(rgba[i][GCOMP] * scale);
+               GLint jB = IROUND(rgba[i][BCOMP] * scale);
+               GLint jA = IROUND(rgba[i][ACOMP] * scale);
+               jR = CLAMP(jR, 0, max);
+               jG = CLAMP(jG, 0, max);
+               jB = CLAMP(jB, 0, max);
+               jA = CLAMP(jA, 0, max);
+               rgba[i][RCOMP] = CHAN_TO_FLOAT(lut[jR * 4 + 0]);
+               rgba[i][GCOMP] = CHAN_TO_FLOAT(lut[jG * 4 + 1]);
+               rgba[i][BCOMP] = CHAN_TO_FLOAT(lut[jB * 4 + 2]);
+               rgba[i][ACOMP] = CHAN_TO_FLOAT(lut[jA * 4 + 3]);
+            }
+         }
+         else {
+            const GLint max = table->Size - 1;
+            const GLfloat scale = (GLfloat) max;
+            const GLfloat *lut = (const GLfloat *) table->Table;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               GLint jR = IROUND(rgba[i][RCOMP] * scale);
+               GLint jG = IROUND(rgba[i][GCOMP] * scale);
+               GLint jB = IROUND(rgba[i][BCOMP] * scale);
+               GLint jA = IROUND(rgba[i][ACOMP] * scale);
+               jR = CLAMP(jR, 0, max);
+               jG = CLAMP(jG, 0, max);
+               jB = CLAMP(jB, 0, max);
+               jA = CLAMP(jA, 0, max);
+               rgba[i][RCOMP] = lut[jR * 4 + 0];
+               rgba[i][GCOMP] = lut[jG * 4 + 1];
+               rgba[i][BCOMP] = lut[jB * 4 + 2];
+               rgba[i][ACOMP] = lut[jA * 4 + 3];
+            }
+         }
+         break;
+      default:
+         _mesa_problem(NULL, "Bad format in _mesa_lookup_rgba");
+         return;
+   }
+}
+
+
+
+/*
+ * Apply color index shift and offset to an array of pixels.
+ */
+void
+_mesa_shift_and_offset_ci( const GLcontext *ctx, GLuint n, GLuint indexes[] )
+{
+   GLint shift = ctx->Pixel.IndexShift;
+   GLint offset = ctx->Pixel.IndexOffset;
+   GLuint i;
+   if (shift > 0) {
+      for (i=0;i<n;i++) {
+         indexes[i] = (indexes[i] << shift) + offset;
+      }
+   }
+   else if (shift < 0) {
+      shift = -shift;
+      for (i=0;i<n;i++) {
+         indexes[i] = (indexes[i] >> shift) + offset;
+      }
+   }
+   else {
+      for (i=0;i<n;i++) {
+         indexes[i] = indexes[i] + offset;
+      }
+   }
+}
+
+
+/*
+ * Apply color index mapping to color indexes.
+ */
+void
+_mesa_map_ci( const GLcontext *ctx, GLuint n, GLuint index[] )
+{
+   GLuint mask = ctx->Pixel.MapItoIsize - 1;
+   GLuint i;
+   for (i=0;i<n;i++) {
+      index[i] = ctx->Pixel.MapItoI[ index[i] & mask ];
+   }
+}
+
+
+/*
+ * Map color indexes to rgba values.
+ */
+void
+_mesa_map_ci_to_rgba_chan( const GLcontext *ctx, GLuint n,
+                           const GLuint index[], GLchan rgba[][4] )
+{
+#if CHAN_BITS == 8
+   GLuint rmask = ctx->Pixel.MapItoRsize - 1;
+   GLuint gmask = ctx->Pixel.MapItoGsize - 1;
+   GLuint bmask = ctx->Pixel.MapItoBsize - 1;
+   GLuint amask = ctx->Pixel.MapItoAsize - 1;
+   const GLubyte *rMap = ctx->Pixel.MapItoR8;
+   const GLubyte *gMap = ctx->Pixel.MapItoG8;
+   const GLubyte *bMap = ctx->Pixel.MapItoB8;
+   const GLubyte *aMap = ctx->Pixel.MapItoA8;
+   GLuint i;
+   for (i=0;i<n;i++) {
+      rgba[i][RCOMP] = rMap[index[i] & rmask];
+      rgba[i][GCOMP] = gMap[index[i] & gmask];
+      rgba[i][BCOMP] = bMap[index[i] & bmask];
+      rgba[i][ACOMP] = aMap[index[i] & amask];
+   }
+#else
+   GLuint rmask = ctx->Pixel.MapItoRsize - 1;
+   GLuint gmask = ctx->Pixel.MapItoGsize - 1;
+   GLuint bmask = ctx->Pixel.MapItoBsize - 1;
+   GLuint amask = ctx->Pixel.MapItoAsize - 1;
+   const GLfloat *rMap = ctx->Pixel.MapItoR;
+   const GLfloat *gMap = ctx->Pixel.MapItoG;
+   const GLfloat *bMap = ctx->Pixel.MapItoB;
+   const GLfloat *aMap = ctx->Pixel.MapItoA;
+   GLuint i;
+   for (i=0;i<n;i++) {
+      CLAMPED_FLOAT_TO_CHAN(rgba[i][RCOMP], rMap[index[i] & rmask]);
+      CLAMPED_FLOAT_TO_CHAN(rgba[i][GCOMP], gMap[index[i] & gmask]);
+      CLAMPED_FLOAT_TO_CHAN(rgba[i][BCOMP], bMap[index[i] & bmask]);
+      CLAMPED_FLOAT_TO_CHAN(rgba[i][ACOMP], aMap[index[i] & amask]);
+   }
+#endif
+}
+
+
+/*
+ * Map color indexes to float rgba values.
+ */
+void
+_mesa_map_ci_to_rgba( const GLcontext *ctx, GLuint n,
+                      const GLuint index[], GLfloat rgba[][4] )
+{
+   GLuint rmask = ctx->Pixel.MapItoRsize - 1;
+   GLuint gmask = ctx->Pixel.MapItoGsize - 1;
+   GLuint bmask = ctx->Pixel.MapItoBsize - 1;
+   GLuint amask = ctx->Pixel.MapItoAsize - 1;
+   const GLfloat *rMap = ctx->Pixel.MapItoR;
+   const GLfloat *gMap = ctx->Pixel.MapItoG;
+   const GLfloat *bMap = ctx->Pixel.MapItoB;
+   const GLfloat *aMap = ctx->Pixel.MapItoA;
+   GLuint i;
+   for (i=0;i<n;i++) {
+      rgba[i][RCOMP] = rMap[index[i] & rmask];
+      rgba[i][GCOMP] = gMap[index[i] & gmask];
+      rgba[i][BCOMP] = bMap[index[i] & bmask];
+      rgba[i][ACOMP] = aMap[index[i] & amask];
+   }
+}
+
+
+/*
+ * Map 8-bit color indexes to rgb values.
+ */
+void
+_mesa_map_ci8_to_rgba( const GLcontext *ctx, GLuint n, const GLubyte index[],
+                       GLchan rgba[][4] )
+{
+#if CHAN_BITS == 8
+   GLuint rmask = ctx->Pixel.MapItoRsize - 1;
+   GLuint gmask = ctx->Pixel.MapItoGsize - 1;
+   GLuint bmask = ctx->Pixel.MapItoBsize - 1;
+   GLuint amask = ctx->Pixel.MapItoAsize - 1;
+   const GLubyte *rMap = ctx->Pixel.MapItoR8;
+   const GLubyte *gMap = ctx->Pixel.MapItoG8;
+   const GLubyte *bMap = ctx->Pixel.MapItoB8;
+   const GLubyte *aMap = ctx->Pixel.MapItoA8;
+   GLuint i;
+   for (i=0;i<n;i++) {
+      rgba[i][RCOMP] = rMap[index[i] & rmask];
+      rgba[i][GCOMP] = gMap[index[i] & gmask];
+      rgba[i][BCOMP] = bMap[index[i] & bmask];
+      rgba[i][ACOMP] = aMap[index[i] & amask];
+   }
+#else
+   GLuint rmask = ctx->Pixel.MapItoRsize - 1;
+   GLuint gmask = ctx->Pixel.MapItoGsize - 1;
+   GLuint bmask = ctx->Pixel.MapItoBsize - 1;
+   GLuint amask = ctx->Pixel.MapItoAsize - 1;
+   const GLfloat *rMap = ctx->Pixel.MapItoR;
+   const GLfloat *gMap = ctx->Pixel.MapItoG;
+   const GLfloat *bMap = ctx->Pixel.MapItoB;
+   const GLfloat *aMap = ctx->Pixel.MapItoA;
+   GLuint i;
+   for (i=0;i<n;i++) {
+      CLAMPED_FLOAT_TO_CHAN(rgba[i][RCOMP], rMap[index[i] & rmask]);
+      CLAMPED_FLOAT_TO_CHAN(rgba[i][GCOMP], gMap[index[i] & gmask]);
+      CLAMPED_FLOAT_TO_CHAN(rgba[i][BCOMP], bMap[index[i] & bmask]);
+      CLAMPED_FLOAT_TO_CHAN(rgba[i][ACOMP], aMap[index[i] & amask]);
+   }
+#endif
+}
+
+
+void
+_mesa_shift_and_offset_stencil( const GLcontext *ctx, GLuint n,
+                                GLstencil stencil[] )
+{
+   GLuint i;
+   GLint shift = ctx->Pixel.IndexShift;
+   GLint offset = ctx->Pixel.IndexOffset;
+   if (shift > 0) {
+      for (i=0;i<n;i++) {
+         stencil[i] = (stencil[i] << shift) + offset;
+      }
+   }
+   else if (shift < 0) {
+      shift = -shift;
+      for (i=0;i<n;i++) {
+         stencil[i] = (stencil[i] >> shift) + offset;
+      }
+   }
+   else {
+      for (i=0;i<n;i++) {
+         stencil[i] = stencil[i] + offset;
+      }
+   }
+
+}
+
+
+void
+_mesa_map_stencil( const GLcontext *ctx, GLuint n, GLstencil stencil[] )
+{
+   GLuint mask = ctx->Pixel.MapStoSsize - 1;
+   GLuint i;
+   for (i=0;i<n;i++) {
+      stencil[i] = ctx->Pixel.MapStoS[ stencil[i] & mask ];
+   }
+}
+
+
+
+/*
+ * This function converts an array of GLchan colors to GLfloat colors.
+ * Most importantly, it undoes the non-uniform quantization of pixel
+ * values introduced when we convert shallow (< 8 bit) pixel values
+ * to GLubytes in the ctx->Driver.ReadRGBASpan() functions.
+ * This fixes a number of OpenGL conformance failures when running on
+ * 16bpp displays, for example.
+ */
+void
+_mesa_chan_to_float_span(const GLcontext *ctx, GLuint n,
+                         CONST GLchan rgba[][4], GLfloat rgbaf[][4])
+{
+#if CHAN_TYPE == GL_FLOAT
+   MEMCPY(rgbaf, rgba, n * 4 * sizeof(GLfloat));
+#else
+   const GLuint rShift = CHAN_BITS - ctx->Visual.redBits;
+   const GLuint gShift = CHAN_BITS - ctx->Visual.greenBits;
+   const GLuint bShift = CHAN_BITS - ctx->Visual.blueBits;
+   GLuint aShift;
+   const GLfloat rScale = 1.0F / (GLfloat) ((1 << ctx->Visual.redBits  ) - 1);
+   const GLfloat gScale = 1.0F / (GLfloat) ((1 << ctx->Visual.greenBits) - 1);
+   const GLfloat bScale = 1.0F / (GLfloat) ((1 << ctx->Visual.blueBits ) - 1);
+   GLfloat aScale;
+   GLuint i;
+
+   if (ctx->Visual.alphaBits > 0) {
+      aShift = CHAN_BITS - ctx->Visual.alphaBits;
+      aScale = 1.0F / (GLfloat) ((1 << ctx->Visual.alphaBits) - 1);
+   }
+   else {
+      aShift = 0;
+      aScale = 1.0F / CHAN_MAXF;
+   }
+
+   for (i = 0; i < n; i++) {
+      const GLint r = rgba[i][RCOMP] >> rShift;
+      const GLint g = rgba[i][GCOMP] >> gShift;
+      const GLint b = rgba[i][BCOMP] >> bShift;
+      const GLint a = rgba[i][ACOMP] >> aShift;
+      rgbaf[i][RCOMP] = (GLfloat) r * rScale;
+      rgbaf[i][GCOMP] = (GLfloat) g * gScale;
+      rgbaf[i][BCOMP] = (GLfloat) b * bScale;
+      rgbaf[i][ACOMP] = (GLfloat) a * aScale;
+   }
+#endif
+}
+
+/**********************************************************************/
+/*****                    State Management                        *****/
+/**********************************************************************/
+
+/*
+ * Return a bitmask of IMAGE_*_BIT flags which to indicate which
+ * pixel transfer operations are enabled.
+ */
+static void
+update_image_transfer_state(GLcontext *ctx)
+{
+   GLuint mask = 0;
+
+   if (ctx->Pixel.RedScale   != 1.0F || ctx->Pixel.RedBias   != 0.0F ||
+       ctx->Pixel.GreenScale != 1.0F || ctx->Pixel.GreenBias != 0.0F ||
+       ctx->Pixel.BlueScale  != 1.0F || ctx->Pixel.BlueBias  != 0.0F ||
+       ctx->Pixel.AlphaScale != 1.0F || ctx->Pixel.AlphaBias != 0.0F)
+      mask |= IMAGE_SCALE_BIAS_BIT;
+
+   if (ctx->Pixel.IndexShift || ctx->Pixel.IndexOffset)
+      mask |= IMAGE_SHIFT_OFFSET_BIT;
+
+   if (ctx->Pixel.MapColorFlag)
+      mask |= IMAGE_MAP_COLOR_BIT;
+
+   if (ctx->Pixel.ColorTableEnabled)
+      mask |= IMAGE_COLOR_TABLE_BIT;
+
+   if (ctx->Pixel.Convolution1DEnabled ||
+       ctx->Pixel.Convolution2DEnabled ||
+       ctx->Pixel.Separable2DEnabled) {
+      mask |= IMAGE_CONVOLUTION_BIT;
+      if (ctx->Pixel.PostConvolutionScale[0] != 1.0F ||
+          ctx->Pixel.PostConvolutionScale[1] != 1.0F ||
+          ctx->Pixel.PostConvolutionScale[2] != 1.0F ||
+          ctx->Pixel.PostConvolutionScale[3] != 1.0F ||
+          ctx->Pixel.PostConvolutionBias[0] != 0.0F ||
+          ctx->Pixel.PostConvolutionBias[1] != 0.0F ||
+          ctx->Pixel.PostConvolutionBias[2] != 0.0F ||
+          ctx->Pixel.PostConvolutionBias[3] != 0.0F) {
+         mask |= IMAGE_POST_CONVOLUTION_SCALE_BIAS;
+      }
+   }
+
+   if (ctx->Pixel.PostConvolutionColorTableEnabled)
+      mask |= IMAGE_POST_CONVOLUTION_COLOR_TABLE_BIT;
+
+   if (ctx->ColorMatrixStack.Top->type != MATRIX_IDENTITY ||
+       ctx->Pixel.PostColorMatrixScale[0] != 1.0F ||
+       ctx->Pixel.PostColorMatrixBias[0]  != 0.0F ||
+       ctx->Pixel.PostColorMatrixScale[1] != 1.0F ||
+       ctx->Pixel.PostColorMatrixBias[1]  != 0.0F ||
+       ctx->Pixel.PostColorMatrixScale[2] != 1.0F ||
+       ctx->Pixel.PostColorMatrixBias[2]  != 0.0F ||
+       ctx->Pixel.PostColorMatrixScale[3] != 1.0F ||
+       ctx->Pixel.PostColorMatrixBias[3]  != 0.0F)
+      mask |= IMAGE_COLOR_MATRIX_BIT;
+
+   if (ctx->Pixel.PostColorMatrixColorTableEnabled)
+      mask |= IMAGE_POST_COLOR_MATRIX_COLOR_TABLE_BIT;
+
+   if (ctx->Pixel.HistogramEnabled)
+      mask |= IMAGE_HISTOGRAM_BIT;
+
+   if (ctx->Pixel.MinMaxEnabled)
+      mask |= IMAGE_MIN_MAX_BIT;
+
+   ctx->_ImageTransferState = mask;
+}
+
+
+void _mesa_update_pixel( GLcontext *ctx, GLuint new_state )
+{
+   if (new_state & _NEW_COLOR_MATRIX)
+      _math_matrix_analyse( ctx->ColorMatrixStack.Top );
+
+   /* References ColorMatrix.type (derived above).
+    */
+   if (new_state & _IMAGE_NEW_TRANSFER_STATE)
+      update_image_transfer_state(ctx);
+}
+
+
+/**********************************************************************/
+/*****                      Initialization                        *****/
+/**********************************************************************/
+
+void _mesa_init_pixel( GLcontext * ctx )
+{
+   int i;
+
+   /* Pixel group */
+   ctx->Pixel.RedBias = 0.0;
+   ctx->Pixel.RedScale = 1.0;
+   ctx->Pixel.GreenBias = 0.0;
+   ctx->Pixel.GreenScale = 1.0;
+   ctx->Pixel.BlueBias = 0.0;
+   ctx->Pixel.BlueScale = 1.0;
+   ctx->Pixel.AlphaBias = 0.0;
+   ctx->Pixel.AlphaScale = 1.0;
+   ctx->Pixel.DepthBias = 0.0;
+   ctx->Pixel.DepthScale = 1.0;
+   ctx->Pixel.IndexOffset = 0;
+   ctx->Pixel.IndexShift = 0;
+   ctx->Pixel.ZoomX = 1.0;
+   ctx->Pixel.ZoomY = 1.0;
+   ctx->Pixel.MapColorFlag = GL_FALSE;
+   ctx->Pixel.MapStencilFlag = GL_FALSE;
+   ctx->Pixel.MapStoSsize = 1;
+   ctx->Pixel.MapItoIsize = 1;
+   ctx->Pixel.MapItoRsize = 1;
+   ctx->Pixel.MapItoGsize = 1;
+   ctx->Pixel.MapItoBsize = 1;
+   ctx->Pixel.MapItoAsize = 1;
+   ctx->Pixel.MapRtoRsize = 1;
+   ctx->Pixel.MapGtoGsize = 1;
+   ctx->Pixel.MapBtoBsize = 1;
+   ctx->Pixel.MapAtoAsize = 1;
+   ctx->Pixel.MapStoS[0] = 0;
+   ctx->Pixel.MapItoI[0] = 0;
+   ctx->Pixel.MapItoR[0] = 0.0;
+   ctx->Pixel.MapItoG[0] = 0.0;
+   ctx->Pixel.MapItoB[0] = 0.0;
+   ctx->Pixel.MapItoA[0] = 0.0;
+   ctx->Pixel.MapItoR8[0] = 0;
+   ctx->Pixel.MapItoG8[0] = 0;
+   ctx->Pixel.MapItoB8[0] = 0;
+   ctx->Pixel.MapItoA8[0] = 0;
+   ctx->Pixel.MapRtoR[0] = 0.0;
+   ctx->Pixel.MapGtoG[0] = 0.0;
+   ctx->Pixel.MapBtoB[0] = 0.0;
+   ctx->Pixel.MapAtoA[0] = 0.0;
+   ctx->Pixel.HistogramEnabled = GL_FALSE;
+   ctx->Pixel.MinMaxEnabled = GL_FALSE;
+   ctx->Pixel.PixelTextureEnabled = GL_FALSE;
+   ctx->Pixel.FragmentRgbSource = GL_PIXEL_GROUP_COLOR_SGIS;
+   ctx->Pixel.FragmentAlphaSource = GL_PIXEL_GROUP_COLOR_SGIS;
+   ASSIGN_4V(ctx->Pixel.PostColorMatrixScale, 1.0, 1.0, 1.0, 1.0);
+   ASSIGN_4V(ctx->Pixel.PostColorMatrixBias, 0.0, 0.0, 0.0, 0.0);
+   ASSIGN_4V(ctx->Pixel.ColorTableScale, 1.0, 1.0, 1.0, 1.0);
+   ASSIGN_4V(ctx->Pixel.ColorTableBias, 0.0, 0.0, 0.0, 0.0);
+   ASSIGN_4V(ctx->Pixel.PCCTscale, 1.0, 1.0, 1.0, 1.0);
+   ASSIGN_4V(ctx->Pixel.PCCTbias, 0.0, 0.0, 0.0, 0.0);
+   ASSIGN_4V(ctx->Pixel.PCMCTscale, 1.0, 1.0, 1.0, 1.0);
+   ASSIGN_4V(ctx->Pixel.PCMCTbias, 0.0, 0.0, 0.0, 0.0);
+   ctx->Pixel.ColorTableEnabled = GL_FALSE;
+   ctx->Pixel.PostConvolutionColorTableEnabled = GL_FALSE;
+   ctx->Pixel.PostColorMatrixColorTableEnabled = GL_FALSE;
+   ctx->Pixel.Convolution1DEnabled = GL_FALSE;
+   ctx->Pixel.Convolution2DEnabled = GL_FALSE;
+   ctx->Pixel.Separable2DEnabled = GL_FALSE;
+   for (i = 0; i < 3; i++) {
+      ASSIGN_4V(ctx->Pixel.ConvolutionBorderColor[i], 0.0, 0.0, 0.0, 0.0);
+      ctx->Pixel.ConvolutionBorderMode[i] = GL_REDUCE;
+      ASSIGN_4V(ctx->Pixel.ConvolutionFilterScale[i], 1.0, 1.0, 1.0, 1.0);
+      ASSIGN_4V(ctx->Pixel.ConvolutionFilterBias[i], 0.0, 0.0, 0.0, 0.0);
+   }
+   for (i = 0; i < MAX_CONVOLUTION_WIDTH * MAX_CONVOLUTION_WIDTH * 4; i++) {
+      ctx->Convolution1D.Filter[i] = 0.0;
+      ctx->Convolution2D.Filter[i] = 0.0;
+      ctx->Separable2D.Filter[i] = 0.0;
+   }
+   ASSIGN_4V(ctx->Pixel.PostConvolutionScale, 1.0, 1.0, 1.0, 1.0);
+   ASSIGN_4V(ctx->Pixel.PostConvolutionBias, 0.0, 0.0, 0.0, 0.0);
+   /* GL_SGI_texture_color_table */
+   ASSIGN_4V(ctx->Pixel.TextureColorTableScale, 1.0, 1.0, 1.0, 1.0);
+   ASSIGN_4V(ctx->Pixel.TextureColorTableBias, 0.0, 0.0, 0.0, 0.0);
+
+   /* Pixel transfer */
+   ctx->Pack.Alignment = 4;
+   ctx->Pack.RowLength = 0;
+   ctx->Pack.ImageHeight = 0;
+   ctx->Pack.SkipPixels = 0;
+   ctx->Pack.SkipRows = 0;
+   ctx->Pack.SkipImages = 0;
+   ctx->Pack.SwapBytes = GL_FALSE;
+   ctx->Pack.LsbFirst = GL_FALSE;
+   ctx->Pack.ClientStorage = GL_FALSE;
+   ctx->Pack.Invert = GL_FALSE;
+   ctx->Unpack.Alignment = 4;
+   ctx->Unpack.RowLength = 0;
+   ctx->Unpack.ImageHeight = 0;
+   ctx->Unpack.SkipPixels = 0;
+   ctx->Unpack.SkipRows = 0;
+   ctx->Unpack.SkipImages = 0;
+   ctx->Unpack.SwapBytes = GL_FALSE;
+   ctx->Unpack.LsbFirst = GL_FALSE;
+   ctx->Unpack.ClientStorage = GL_FALSE;
+   ctx->Unpack.Invert = GL_FALSE;
+
+   if (ctx->Visual.doubleBufferMode) {
+      ctx->Pixel.ReadBuffer = GL_BACK;
+      ctx->Pixel._ReadSrcMask = BACK_LEFT_BIT;
+   }
+   else {
+      ctx->Pixel.ReadBuffer = GL_FRONT;
+      ctx->Pixel._ReadSrcMask = FRONT_LEFT_BIT;
+   }
+
+   /* Miscellaneous */
+   ctx->_ImageTransferState = 0;
+}
diff --git a/reactos/lib/mesa32/src/main/pixel.h b/reactos/lib/mesa32/src/main/pixel.h
new file mode 100644
index 00000000000..a3efcf5666e
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/pixel.h
@@ -0,0 +1,149 @@
+/**
+ * \file pixel.h
+ * Pixel operations.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef PIXEL_H
+#define PIXEL_H
+
+
+#include "mtypes.h"
+
+
+/** \name API functions */
+/*@*/
+
+extern void GLAPIENTRY
+_mesa_GetPixelMapfv( GLenum map, GLfloat *values );
+
+extern void GLAPIENTRY
+_mesa_GetPixelMapuiv( GLenum map, GLuint *values );
+
+extern void GLAPIENTRY
+_mesa_GetPixelMapusv( GLenum map, GLushort *values );
+
+extern void GLAPIENTRY
+_mesa_PixelMapfv( GLenum map, GLsizei mapsize, const GLfloat *values );
+
+extern void GLAPIENTRY
+_mesa_PixelMapuiv(GLenum map, GLsizei mapsize, const GLuint *values );
+
+extern void GLAPIENTRY
+_mesa_PixelMapusv(GLenum map, GLsizei mapsize, const GLushort *values );
+
+extern void GLAPIENTRY
+_mesa_PixelStoref( GLenum pname, GLfloat param );
+
+
+extern void GLAPIENTRY
+_mesa_PixelStorei( GLenum pname, GLint param );
+
+extern void GLAPIENTRY
+_mesa_PixelTransferf( GLenum pname, GLfloat param );
+
+extern void GLAPIENTRY
+_mesa_PixelTransferi( GLenum pname, GLint param );
+
+extern void GLAPIENTRY
+_mesa_PixelZoom( GLfloat xfactor, GLfloat yfactor );
+
+/*@}*/
+
+
+/** \name Pixel processing functions */
+/*@{*/
+
+extern void
+_mesa_scale_and_bias_rgba(const GLcontext *ctx, GLuint n, GLfloat rgba[][4],
+                          GLfloat rScale, GLfloat gScale,
+                          GLfloat bScale, GLfloat aScale,
+                          GLfloat rBias, GLfloat gBias,
+                          GLfloat bBias, GLfloat aBias);
+
+extern void
+_mesa_map_rgba(const GLcontext *ctx, GLuint n, GLfloat rgba[][4]);
+
+
+extern void
+_mesa_transform_rgba(const GLcontext *ctx, GLuint n, GLfloat rgba[][4]);
+
+
+extern void
+_mesa_lookup_rgba(const struct gl_color_table *table,
+                  GLuint n, GLfloat rgba[][4]);
+
+
+extern void
+_mesa_shift_and_offset_ci(const GLcontext *ctx, GLuint n,
+                          GLuint indexes[]);
+
+
+extern void
+_mesa_map_ci(const GLcontext *ctx, GLuint n, GLuint index[]);
+
+
+extern void
+_mesa_map_ci_to_rgba_chan(const GLcontext *ctx,
+                          GLuint n, const GLuint index[],
+                          GLchan rgba[][4]);
+
+
+extern void
+_mesa_map_ci_to_rgba(const GLcontext *ctx,
+                     GLuint n, const GLuint index[], GLfloat rgba[][4]);
+
+
+extern void
+_mesa_map_ci8_to_rgba(const GLcontext *ctx,
+                      GLuint n, const GLubyte index[],
+                      GLchan rgba[][4]);
+
+
+extern void
+_mesa_shift_and_offset_stencil(const GLcontext *ctx, GLuint n,
+                               GLstencil indexes[]);
+
+
+extern void
+_mesa_map_stencil(const GLcontext *ctx, GLuint n, GLstencil index[]);
+
+
+extern void
+_mesa_chan_to_float_span(const GLcontext *ctx, GLuint n,
+                         CONST GLchan rgba[][4], GLfloat rgbaf[][4]);
+
+
+extern void 
+_mesa_update_pixel( GLcontext *ctx, GLuint newstate );
+
+extern void 
+_mesa_init_pixel( GLcontext * ctx );
+
+/*@}*/
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/points.c b/reactos/lib/mesa32/src/main/points.c
new file mode 100644
index 00000000000..cbb91554a1e
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/points.c
@@ -0,0 +1,272 @@
+/**
+ * \file points.c
+ * Point operations.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "context.h"
+#include "macros.h"
+#include "points.h"
+#include "texstate.h"
+#include "mtypes.h"
+
+
+/**
+ * Set the point size.
+ *
+ * \param size pointer diameter.
+ *
+ * \sa glPointSize().
+ *
+ * Verifies the parameter and updates gl_point_attrib::Size. On a change,
+ * flushes the vertices, updates the clamped point size and marks the
+ * DD_POINT_SIZE flag in __GLcontextRec::_TriangleCaps for the drivers if the
+ * size is different from one. Notifies the driver via
+ * the dd_function_table::PointSize callback.
+ */
+void GLAPIENTRY
+_mesa_PointSize( GLfloat size )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (size <= 0.0) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glPointSize" );
+      return;
+   }
+
+   if (ctx->Point.Size == size)
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_POINT);
+   ctx->Point.Size = size;
+   ctx->Point._Size = CLAMP(size,
+			    ctx->Const.MinPointSize,
+			    ctx->Const.MaxPointSize);
+
+   if (ctx->Point._Size == 1.0F)
+      ctx->_TriangleCaps &= ~DD_POINT_SIZE;
+   else
+      ctx->_TriangleCaps |= DD_POINT_SIZE;
+
+   if (ctx->Driver.PointSize)
+      (*ctx->Driver.PointSize)(ctx, size);
+}
+
+
+#if _HAVE_FULL_GL
+
+/*
+ * Added by GL_NV_point_sprite
+ */
+void GLAPIENTRY
+_mesa_PointParameteriNV( GLenum pname, GLint param )
+{
+   const GLfloat value = (GLfloat) param;
+   _mesa_PointParameterfvEXT(pname, &value);
+}
+
+
+/*
+ * Added by GL_NV_point_sprite
+ */
+void GLAPIENTRY
+_mesa_PointParameterivNV( GLenum pname, const GLint *params )
+{
+   const GLfloat value = (GLfloat) params[0];
+   _mesa_PointParameterfvEXT(pname, &value);
+}
+
+
+
+/*
+ * Same for both GL_EXT_point_parameters and GL_ARB_point_parameters.
+ */
+void GLAPIENTRY
+_mesa_PointParameterfEXT( GLenum pname, GLfloat param)
+{
+   _mesa_PointParameterfvEXT(pname, &param);
+}
+
+
+
+/*
+ * Same for both GL_EXT_point_parameters and GL_ARB_point_parameters.
+ */
+void GLAPIENTRY
+_mesa_PointParameterfvEXT( GLenum pname, const GLfloat *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   switch (pname) {
+      case GL_DISTANCE_ATTENUATION_EXT:
+         if (ctx->Extensions.EXT_point_parameters) {
+            const GLboolean tmp = ctx->Point._Attenuated;
+            if (TEST_EQ_3V(ctx->Point.Params, params))
+	       return;
+
+	    FLUSH_VERTICES(ctx, _NEW_POINT);
+            COPY_3V(ctx->Point.Params, params);
+
+	    /* Update several derived values now.  This likely to be
+	     * more efficient than trying to catch this statechange in
+	     * state.c.
+	     */
+            ctx->Point._Attenuated = (params[0] != 1.0 ||
+				      params[1] != 0.0 ||
+				      params[2] != 0.0);
+
+            if (tmp != ctx->Point._Attenuated) {
+               ctx->_TriangleCaps ^= DD_POINT_ATTEN;
+            }
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glPointParameterf[v]{EXT,ARB}(pname)");
+            return;
+         }
+         break;
+      case GL_POINT_SIZE_MIN_EXT:
+         if (ctx->Extensions.EXT_point_parameters) {
+            if (params[0] < 0.0F) {
+               _mesa_error( ctx, GL_INVALID_VALUE,
+                            "glPointParameterf[v]{EXT,ARB}(param)" );
+               return;
+            }
+            if (ctx->Point.MinSize == params[0])
+               return;
+            FLUSH_VERTICES(ctx, _NEW_POINT);
+            ctx->Point.MinSize = params[0];
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glPointParameterf[v]{EXT,ARB}(pname)");
+            return;
+         }
+         break;
+      case GL_POINT_SIZE_MAX_EXT:
+         if (ctx->Extensions.EXT_point_parameters) {
+            if (params[0] < 0.0F) {
+               _mesa_error( ctx, GL_INVALID_VALUE,
+                            "glPointParameterf[v]{EXT,ARB}(param)" );
+               return;
+            }
+            if (ctx->Point.MaxSize == params[0])
+               return;
+            FLUSH_VERTICES(ctx, _NEW_POINT);
+            ctx->Point.MaxSize = params[0];
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glPointParameterf[v]{EXT,ARB}(pname)");
+            return;
+         }
+         break;
+      case GL_POINT_FADE_THRESHOLD_SIZE_EXT:
+         if (ctx->Extensions.EXT_point_parameters) {
+            if (params[0] < 0.0F) {
+               _mesa_error( ctx, GL_INVALID_VALUE,
+                            "glPointParameterf[v]{EXT,ARB}(param)" );
+               return;
+            }
+            if (ctx->Point.Threshold == params[0])
+               return;
+            FLUSH_VERTICES(ctx, _NEW_POINT);
+            ctx->Point.Threshold = params[0];
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glPointParameterf[v]{EXT,ARB}(pname)");
+            return;
+         }
+         break;
+      case GL_POINT_SPRITE_R_MODE_NV:
+         /* This is one area where ARB_point_sprite and NV_point_sprite
+	  * differ.  In ARB_point_sprite the POINT_SPRITE_R_MODE is
+	  * always ZERO.  NV_point_sprite adds the S and R modes.
+	  */
+         if (ctx->Extensions.NV_point_sprite) {
+            GLenum value = (GLenum) params[0];
+            if (value != GL_ZERO && value != GL_S && value != GL_R) {
+               _mesa_error(ctx, GL_INVALID_VALUE,
+                           "glPointParameterf[v]{EXT,ARB}(param)");
+               return;
+            }
+            if (ctx->Point.SpriteRMode == value)
+               return;
+            FLUSH_VERTICES(ctx, _NEW_POINT);
+            ctx->Point.SpriteRMode = value;
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glPointParameterf[v]{EXT,ARB}(pname)");
+            return;
+         }
+         break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM,
+                      "glPointParameterf[v]{EXT,ARB}(pname)" );
+         return;
+   }
+
+   if (ctx->Driver.PointParameterfv)
+      (*ctx->Driver.PointParameterfv)(ctx, pname, params);
+}
+#endif
+
+
+/**
+ * Initialize the context point state.
+ *
+ * \param ctx GL context.
+ *
+ * Initializes __GLcontextRec::Point and point related constants in
+ * __GLcontextRec::Const.
+ */
+void _mesa_init_point( GLcontext * ctx )
+{
+   int i;
+   
+   /* Point group */
+   ctx->Point.SmoothFlag = GL_FALSE;
+   ctx->Point.Size = 1.0;
+   ctx->Point._Size = 1.0;
+   ctx->Point.Params[0] = 1.0;
+   ctx->Point.Params[1] = 0.0;
+   ctx->Point.Params[2] = 0.0;
+   ctx->Point._Attenuated = GL_FALSE;
+   ctx->Point.MinSize = 0.0;
+   ctx->Point.MaxSize = ctx->Const.MaxPointSize;
+   ctx->Point.Threshold = 1.0;
+   ctx->Point.PointSprite = GL_FALSE; /* GL_ARB_point_sprite / GL_NV_point_sprite */
+   ctx->Point.SpriteRMode = GL_ZERO; /* GL_NV_point_sprite (only!) */
+   for (i = 0; i < MAX_TEXTURE_UNITS; i++) {
+      ctx->Point.CoordReplace[i] = GL_FALSE; /* GL_ARB_point_sprite / GL_NV_point_sprite */
+   }
+}
diff --git a/reactos/lib/mesa32/src/main/points.h b/reactos/lib/mesa32/src/main/points.h
new file mode 100644
index 00000000000..16513c3ec67
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/points.h
@@ -0,0 +1,57 @@
+/**
+ * \file points.h
+ * Point operations.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef POINTS_H
+#define POINTS_H
+
+
+#include "mtypes.h"
+
+
+extern void GLAPIENTRY
+_mesa_PointSize( GLfloat size );
+
+extern void GLAPIENTRY
+_mesa_PointParameteriNV( GLenum pname, GLint param );
+
+extern void GLAPIENTRY
+_mesa_PointParameterivNV( GLenum pname, const GLint *params );
+
+extern void GLAPIENTRY
+_mesa_PointParameterfEXT( GLenum pname, GLfloat param );
+
+extern void GLAPIENTRY
+_mesa_PointParameterfvEXT( GLenum pname, const GLfloat *params );
+
+extern void 
+_mesa_init_point( GLcontext * ctx );
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/polygon.c b/reactos/lib/mesa32/src/main/polygon.c
new file mode 100644
index 00000000000..192c40516fb
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/polygon.c
@@ -0,0 +1,304 @@
+/**
+ * \file polygon.c
+ * Polygon operations.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "imports.h"
+#include "context.h"
+#include "image.h"
+#include "enums.h"
+#include "macros.h"
+#include "polygon.h"
+#include "mtypes.h"
+
+
+/**
+ * Specify whether to cull front- or back-facing facets.
+ *
+ * \param mode culling mode.
+ *
+ * \sa glCullFace().
+ *
+ * Verifies the parameter and updates gl_polygon_attrib::CullFaceMode. On
+ * change, flushes the vertices and notifies the driver via
+ * the dd_function_table::CullFace callback.
+ */
+void GLAPIENTRY
+_mesa_CullFace( GLenum mode )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE&VERBOSE_API)
+      _mesa_debug(ctx, "glCullFace %s\n", _mesa_lookup_enum_by_nr(mode));
+
+   if (mode!=GL_FRONT && mode!=GL_BACK && mode!=GL_FRONT_AND_BACK) {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glCullFace" );
+      return;
+   }
+
+   if (ctx->Polygon.CullFaceMode == mode)
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_POLYGON);
+   ctx->Polygon.CullFaceMode = mode;
+
+   if (ctx->Driver.CullFace)
+      ctx->Driver.CullFace( ctx, mode );
+}
+
+
+/**
+ * Define front- and back-facing 
+ *
+ * \param mode orientation of front-facing polygons.
+ *
+ * \sa glFrontFace().
+ *
+ * Verifies the parameter and updates gl_polygon_attrib::FrontFace. On change
+ * flushes the vertices and notifies the driver via
+ * the dd_function_table::FrontFace callback.
+ */
+void GLAPIENTRY
+_mesa_FrontFace( GLenum mode )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE&VERBOSE_API)
+      _mesa_debug(ctx, "glFrontFace %s\n", _mesa_lookup_enum_by_nr(mode));
+
+   if (mode!=GL_CW && mode!=GL_CCW) {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glFrontFace" );
+      return;
+   }
+
+   if (ctx->Polygon.FrontFace == mode)
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_POLYGON);
+   ctx->Polygon.FrontFace = mode;
+
+   ctx->Polygon._FrontBit = (GLboolean) (mode == GL_CW);
+
+   if (ctx->Driver.FrontFace)
+      ctx->Driver.FrontFace( ctx, mode );
+}
+
+
+/**
+ * Set the polygon rasterization mode.
+ *
+ * \param face the polygons which \p mode applies to.
+ * \param mode how polygons should be rasterized.
+ *
+ * \sa glPolygonMode(). 
+ * 
+ * Verifies the parameters and updates gl_polygon_attrib::FrontMode and
+ * gl_polygon_attrib::BackMode. On change flushes the vertices and notifies the
+ * driver via the dd_function_table::PolygonMode callback.
+ */
+void GLAPIENTRY
+_mesa_PolygonMode( GLenum face, GLenum mode )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE&VERBOSE_API)
+      _mesa_debug(ctx, "glPolygonMode %s %s\n",
+                  _mesa_lookup_enum_by_nr(face),
+                  _mesa_lookup_enum_by_nr(mode));
+
+   if (mode!=GL_POINT && mode!=GL_LINE && mode!=GL_FILL) {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glPolygonMode(mode)" );
+      return;
+   }
+
+   switch (face) {
+   case GL_FRONT:
+      if (ctx->Polygon.FrontMode == mode)
+	 return;
+      FLUSH_VERTICES(ctx, _NEW_POLYGON);
+      ctx->Polygon.FrontMode = mode;
+      break;
+   case GL_FRONT_AND_BACK:
+      if (ctx->Polygon.FrontMode == mode &&
+	  ctx->Polygon.BackMode == mode)
+	 return;
+      FLUSH_VERTICES(ctx, _NEW_POLYGON);
+      ctx->Polygon.FrontMode = mode;
+      ctx->Polygon.BackMode = mode;
+      break;
+   case GL_BACK:
+      if (ctx->Polygon.BackMode == mode)
+	 return;
+      FLUSH_VERTICES(ctx, _NEW_POLYGON);
+      ctx->Polygon.BackMode = mode;
+      break;
+   default:
+      _mesa_error( ctx, GL_INVALID_ENUM, "glPolygonMode(face)" );
+      return;
+   }
+
+   ctx->_TriangleCaps &= ~DD_TRI_UNFILLED;
+   if (ctx->Polygon.FrontMode!=GL_FILL || ctx->Polygon.BackMode!=GL_FILL)
+      ctx->_TriangleCaps |= DD_TRI_UNFILLED;
+
+   if (ctx->Driver.PolygonMode) {
+      (*ctx->Driver.PolygonMode)( ctx, face, mode );
+   }
+}
+
+#if _HAVE_FULL_GL
+
+void GLAPIENTRY
+_mesa_PolygonStipple( const GLubyte *pattern )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE&VERBOSE_API)
+      _mesa_debug(ctx, "glPolygonStipple\n");
+
+   FLUSH_VERTICES(ctx, _NEW_POLYGONSTIPPLE);
+   _mesa_unpack_polygon_stipple(pattern, ctx->PolygonStipple, &ctx->Unpack);
+
+   if (ctx->Driver.PolygonStipple)
+      ctx->Driver.PolygonStipple( ctx, (const GLubyte *) ctx->PolygonStipple );
+}
+
+
+
+void GLAPIENTRY
+_mesa_GetPolygonStipple( GLubyte *dest )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE&VERBOSE_API)
+      _mesa_debug(ctx, "glGetPolygonStipple\n");
+
+   _mesa_pack_polygon_stipple(ctx->PolygonStipple, dest, &ctx->Pack);
+}
+
+
+void GLAPIENTRY
+_mesa_PolygonOffset( GLfloat factor, GLfloat units )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE&VERBOSE_API)
+      _mesa_debug(ctx, "glPolygonOffset %f %f\n", factor, units);
+
+   if (ctx->Polygon.OffsetFactor == factor &&
+       ctx->Polygon.OffsetUnits == units)
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_POLYGON);
+   ctx->Polygon.OffsetFactor = factor;
+   ctx->Polygon.OffsetUnits = units;
+
+   if (ctx->Driver.PolygonOffset)
+      ctx->Driver.PolygonOffset( ctx, factor, units );
+}
+
+
+
+void GLAPIENTRY
+_mesa_PolygonOffsetEXT( GLfloat factor, GLfloat bias )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_PolygonOffset(factor, bias * ctx->DepthMaxF );
+}
+
+#endif
+
+
+/**********************************************************************/
+/** \name State Management */
+/*@{*/
+
+/*
+ * Check polygon state and set DD_TRI_CULL_FRONT_BACK and/or DD_TRI_OFFSET
+ * in ctx->_TriangleCaps if needed.
+ */
+void _mesa_update_polygon( GLcontext *ctx )
+{
+   ctx->_TriangleCaps &= ~(DD_TRI_CULL_FRONT_BACK | DD_TRI_OFFSET);
+
+   if (ctx->Polygon.CullFlag && ctx->Polygon.CullFaceMode == GL_FRONT_AND_BACK)
+      ctx->_TriangleCaps |= DD_TRI_CULL_FRONT_BACK;
+
+   /* Any Polygon offsets enabled? */
+   if (ctx->Polygon.OffsetPoint ||
+       ctx->Polygon.OffsetLine ||
+       ctx->Polygon.OffsetFill) {
+      ctx->_TriangleCaps |= DD_TRI_OFFSET;
+   }
+}
+
+/*@}*/
+
+
+/**********************************************************************/
+/** \name Initialization */
+/*@{*/
+
+/**
+ * Initialize the context polygon state.
+ *
+ * \param ctx GL context.
+ *
+ * Initializes __GLcontextRec::Polygon and __GLcontextRec::PolygonStipple
+ * attribute groups.
+ */
+void _mesa_init_polygon( GLcontext * ctx )
+{
+   /* Polygon group */
+   ctx->Polygon.CullFlag = GL_FALSE;
+   ctx->Polygon.CullFaceMode = GL_BACK;
+   ctx->Polygon.FrontFace = GL_CCW;
+   ctx->Polygon._FrontBit = 0;
+   ctx->Polygon.FrontMode = GL_FILL;
+   ctx->Polygon.BackMode = GL_FILL;
+   ctx->Polygon.SmoothFlag = GL_FALSE;
+   ctx->Polygon.StippleFlag = GL_FALSE;
+   ctx->Polygon.OffsetFactor = 0.0F;
+   ctx->Polygon.OffsetUnits = 0.0F;
+   ctx->Polygon.OffsetPoint = GL_FALSE;
+   ctx->Polygon.OffsetLine = GL_FALSE;
+   ctx->Polygon.OffsetFill = GL_FALSE;
+
+
+   /* Polygon Stipple group */
+   MEMSET( ctx->PolygonStipple, 0xff, 32*sizeof(GLuint) );
+}
+
+/*@}*/
diff --git a/reactos/lib/mesa32/src/main/polygon.h b/reactos/lib/mesa32/src/main/polygon.h
new file mode 100644
index 00000000000..ef2fd0e92d1
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/polygon.h
@@ -0,0 +1,65 @@
+/**
+ * \file polygon.h
+ * Polygon operations.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef POLYGON_H
+#define POLYGON_H
+
+
+#include "mtypes.h"
+
+
+extern void GLAPIENTRY
+_mesa_CullFace( GLenum mode );
+
+extern void GLAPIENTRY
+_mesa_FrontFace( GLenum mode );
+
+extern void GLAPIENTRY
+_mesa_PolygonMode( GLenum face, GLenum mode );
+
+extern void GLAPIENTRY
+_mesa_PolygonOffset( GLfloat factor, GLfloat units );
+
+extern void GLAPIENTRY
+_mesa_PolygonOffsetEXT( GLfloat factor, GLfloat bias );
+
+extern void GLAPIENTRY
+_mesa_PolygonStipple( const GLubyte *mask );
+
+extern void GLAPIENTRY
+_mesa_GetPolygonStipple( GLubyte *mask );
+
+extern void  
+_mesa_update_polygon( GLcontext *ctx );
+
+extern void 
+_mesa_init_polygon( GLcontext * ctx );
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/program.c b/reactos/lib/mesa32/src/main/program.c
new file mode 100644
index 00000000000..22b687a2d9e
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/program.c
@@ -0,0 +1,1244 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file program.c
+ * Vertex and fragment program support functions.
+ * \author Brian Paul
+ */
+
+
+#include "glheader.h"
+#include "context.h"
+#include "hash.h"
+#include "imports.h"
+#include "macros.h"
+#include "mtypes.h"
+#include "program.h"
+#include "nvfragparse.h"
+#include "nvfragprog.h"
+#include "nvvertparse.h"
+
+
+/**********************************************************************/
+/* Utility functions                                                  */
+/**********************************************************************/
+
+
+/**
+ * Init context's program state
+ */
+void
+_mesa_init_program(GLcontext *ctx)
+{
+   GLuint i;
+
+   ctx->Program.ErrorPos = -1;
+   ctx->Program.ErrorString = _mesa_strdup("");
+
+#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program
+   ctx->VertexProgram.Enabled = GL_FALSE;
+   ctx->VertexProgram.PointSizeEnabled = GL_FALSE;
+   ctx->VertexProgram.TwoSideEnabled = GL_FALSE;
+   ctx->VertexProgram.Current = NULL;
+   ctx->VertexProgram.Current = (struct vertex_program *) ctx->Shared->DefaultVertexProgram;
+   assert(ctx->VertexProgram.Current);
+   ctx->VertexProgram.Current->Base.RefCount++;
+   for (i = 0; i < MAX_NV_VERTEX_PROGRAM_PARAMS / 4; i++) {
+      ctx->VertexProgram.TrackMatrix[i] = GL_NONE;
+      ctx->VertexProgram.TrackMatrixTransform[i] = GL_IDENTITY_NV;
+   }
+#endif
+
+#if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program
+   ctx->FragmentProgram.Enabled = GL_FALSE;
+   ctx->FragmentProgram.Current = (struct fragment_program *) ctx->Shared->DefaultFragmentProgram;
+   assert(ctx->FragmentProgram.Current);
+   ctx->FragmentProgram.Current->Base.RefCount++;
+#endif
+}
+
+
+/**
+ * Set the vertex/fragment program error state (position and error string).
+ * This is generally called from within the parsers.
+ */
+void
+_mesa_set_program_error(GLcontext *ctx, GLint pos, const char *string)
+{
+   ctx->Program.ErrorPos = pos;
+   _mesa_free((void *) ctx->Program.ErrorString);
+   if (!string)
+      string = "";
+   ctx->Program.ErrorString = _mesa_strdup(string);
+}
+
+
+/**
+ * Find the line number and column for 'pos' within 'string'.
+ * Return a copy of the line which contains 'pos'.  Free the line with
+ * _mesa_free().
+ * \param string  the program string
+ * \param pos     the position within the string
+ * \param line    returns the line number corresponding to 'pos'.
+ * \param col     returns the column number corresponding to 'pos'.
+ * \return copy of the line containing 'pos'.
+ */
+const GLubyte *
+_mesa_find_line_column(const GLubyte *string, const GLubyte *pos,
+                       GLint *line, GLint *col)
+{
+   const GLubyte *lineStart = string;
+   const GLubyte *p = string;
+   GLubyte *s;
+   int len;
+
+   *line = 1;
+
+   while (p != pos) {
+      if (*p == (GLubyte) '\n') {
+         (*line)++;
+         lineStart = p + 1;
+      }
+      p++;
+   }
+
+   *col = (pos - lineStart) + 1;
+
+   /* return copy of this line */
+   while (*p != 0 && *p != '\n')
+      p++;
+   len = p - lineStart;
+   s = (GLubyte *) _mesa_malloc(len + 1);
+   _mesa_memcpy(s, lineStart, len);
+   s[len] = 0;
+
+   return s;
+}
+
+
+
+/**
+ * Allocate and initialize a new fragment/vertex program object
+ * \param ctx  context
+ * \param id   program id/number
+ * \param target  program target/type
+ * \return  pointer to new program object
+ */
+struct program *
+_mesa_alloc_program(GLcontext *ctx, GLenum target, GLuint id)
+{
+   struct program *prog;
+
+   if (target == GL_VERTEX_PROGRAM_NV
+       || target == GL_VERTEX_PROGRAM_ARB) {
+      struct vertex_program *vprog = CALLOC_STRUCT(vertex_program);
+      if (!vprog) {
+         return NULL;
+      }
+      prog = &(vprog->Base);
+   }
+   else if (target == GL_FRAGMENT_PROGRAM_NV
+            || target == GL_FRAGMENT_PROGRAM_ARB) {
+      struct fragment_program *fprog = CALLOC_STRUCT(fragment_program);
+      if (!fprog) {
+         return NULL;
+      }
+      prog = &(fprog->Base);
+   }
+   else {
+      _mesa_problem(ctx, "bad target in _mesa_alloc_program");
+      return NULL;
+   }
+   prog->Id = id;
+   prog->Target = target;
+   prog->Resident = GL_TRUE;
+   prog->RefCount = 1;
+   return prog;
+}
+
+
+/**
+ * Delete a program and remove it from the hash table, ignoring the
+ * reference count.
+ */
+void
+_mesa_delete_program(GLcontext *ctx, struct program *prog)
+{
+   ASSERT(prog);
+
+   if (prog->String)
+      _mesa_free(prog->String);
+   if (prog->Target == GL_VERTEX_PROGRAM_NV ||
+       prog->Target == GL_VERTEX_STATE_PROGRAM_NV) {
+      struct vertex_program *vprog = (struct vertex_program *) prog;
+      if (vprog->Instructions)
+         _mesa_free(vprog->Instructions);
+   }
+   else if (prog->Target == GL_FRAGMENT_PROGRAM_NV ||
+            prog->Target == GL_FRAGMENT_PROGRAM_ARB) {
+      struct fragment_program *fprog = (struct fragment_program *) prog;
+      if (fprog->Instructions)
+         _mesa_free(fprog->Instructions);
+      if (fprog->Parameters) {
+         _mesa_free_parameter_list(fprog->Parameters);
+      }
+   }
+   _mesa_free(prog);
+}
+
+
+
+/**********************************************************************/
+/* Program parameter functions                                        */
+/**********************************************************************/
+
+struct program_parameter_list *
+_mesa_new_parameter_list(void)
+{
+   return (struct program_parameter_list *)
+      _mesa_calloc(sizeof(struct program_parameter_list));
+}
+
+
+/**
+ * Free a parameter list and all its parameters
+ */
+void
+_mesa_free_parameter_list(struct program_parameter_list *paramList)
+{
+   _mesa_free_parameters(paramList);
+   _mesa_free(paramList);
+}
+
+
+/**
+ * Free all the parameters in the given list, but don't free the
+ * paramList structure itself.
+ */
+void
+_mesa_free_parameters(struct program_parameter_list *paramList)
+{
+   GLuint i;
+   for (i = 0; i < paramList->NumParameters; i++) {
+      _mesa_free((void *) paramList->Parameters[i].Name);
+   }
+   _mesa_free(paramList->Parameters);
+   paramList->NumParameters = 0;
+   paramList->Parameters = NULL;
+}
+
+
+/**
+ * Helper function used by the functions below.
+ */
+static GLint
+add_parameter(struct program_parameter_list *paramList,
+              const char *name, const GLfloat values[4],
+              enum parameter_type type)
+{
+   const GLuint n = paramList->NumParameters;
+
+   paramList->Parameters = (struct program_parameter *)
+      _mesa_realloc(paramList->Parameters,
+                    n * sizeof(struct program_parameter),
+                    (n + 1) * sizeof(struct program_parameter));
+   if (!paramList->Parameters) {
+      /* out of memory */
+      paramList->NumParameters = 0;
+      return -1;
+   }
+   else {
+      paramList->NumParameters = n + 1;
+      paramList->Parameters[n].Name = _mesa_strdup(name);
+      paramList->Parameters[n].Type = type;
+      if (values)
+         COPY_4V(paramList->Parameters[n].Values, values);
+      return (GLint) n;
+   }
+}
+
+
+/**
+ * Add a new named program parameter (Ex: NV_fragment_program DEFINE statement)
+ * \return index of the new entry in the parameter list
+ */
+GLint
+_mesa_add_named_parameter(struct program_parameter_list *paramList,
+                          const char *name, const GLfloat values[4])
+{
+   return add_parameter(paramList, name, values, NAMED_PARAMETER);
+}
+
+
+/**
+ * Add a new unnamed constant to the parameter list.
+ * \param paramList - the parameter list
+ * \param values - four float values
+ * \return index of the new parameter.
+ */
+GLint
+_mesa_add_named_constant(struct program_parameter_list *paramList,
+                         const char *name, const GLfloat values[4])
+{
+   return add_parameter(paramList, name, values, CONSTANT);
+}
+
+
+/**
+ * Add a new unnamed constant to the parameter list.
+ * \param paramList - the parameter list
+ * \param values - four float values
+ * \return index of the new parameter.
+ */
+GLint
+_mesa_add_unnamed_constant(struct program_parameter_list *paramList,
+                           const GLfloat values[4])
+{
+   /* generate a new dummy name */
+   static GLuint n = 0;
+   char name[20];
+   _mesa_sprintf(name, "constant%d", n);
+   n++;
+   /* store it */
+   return add_parameter(paramList, name, values, CONSTANT);
+}
+
+
+/**
+ * Add a new state reference to the parameter list.
+ * \param paramList - the parameter list
+ * \param state     - an array of 6 state tokens
+ *
+ * \return index of the new parameter.
+ */
+GLint
+_mesa_add_state_reference(struct program_parameter_list *paramList,
+                          GLint *stateTokens)
+{
+   /* XXX Should we parse <stateString> here and produce the parameter's
+    * list of STATE_* tokens here, or in the parser?
+    */
+   GLint a, idx;
+
+   idx = add_parameter(paramList, "Some State", NULL, STATE);
+	
+   for (a=0; a<6; a++)
+      paramList->Parameters[idx].StateIndexes[a] = (enum state_index) stateTokens[a];
+
+   return idx;
+}
+
+
+/**
+ * Lookup a parameter value by name in the given parameter list.
+ * \return pointer to the float[4] values.
+ */
+GLfloat *
+_mesa_lookup_parameter_value(struct program_parameter_list *paramList,
+                             GLsizei nameLen, const char *name)
+{
+   GLuint i;
+
+   if (!paramList)
+      return NULL;
+
+   if (nameLen == -1) {
+      /* name is null-terminated */
+      for (i = 0; i < paramList->NumParameters; i++) {
+         if (_mesa_strcmp(paramList->Parameters[i].Name, name) == 0)
+            return paramList->Parameters[i].Values;
+      }
+   }
+   else {
+      /* name is not null-terminated, use nameLen */
+      for (i = 0; i < paramList->NumParameters; i++) {
+         if (_mesa_strncmp(paramList->Parameters[i].Name, name, nameLen) == 0
+             && _mesa_strlen(paramList->Parameters[i].Name) == (size_t)nameLen)
+            return paramList->Parameters[i].Values;
+      }
+   }
+   return NULL;
+}
+
+
+/**
+ * Lookup a parameter index by name in the given parameter list.
+ * \return index of parameter in the list.
+ */
+GLint
+_mesa_lookup_parameter_index(struct program_parameter_list *paramList,
+                             GLsizei nameLen, const char *name)
+{
+   GLint i;
+
+   if (!paramList)
+      return -1;
+
+   if (nameLen == -1) {
+      /* name is null-terminated */
+      for (i = 0; i < (GLint) paramList->NumParameters; i++) {
+         if (_mesa_strcmp(paramList->Parameters[i].Name, name) == 0)
+            return i;
+      }
+   }
+   else {
+      /* name is not null-terminated, use nameLen */
+      for (i = 0; i < (GLint) paramList->NumParameters; i++) {
+         if (_mesa_strncmp(paramList->Parameters[i].Name, name, nameLen) == 0
+             && _mesa_strlen(paramList->Parameters[i].Name) == (size_t)nameLen)
+            return i;
+      }
+   }
+   return -1;
+}
+
+
+/**
+ * Use the list of tokens in the state[] array to find global GL state
+ * and return it in <value>.  Usually, four values are returned in <value>
+ * but matrix queries may return as many as 16 values.
+ * This function is used for ARB vertex/fragment programs.
+ * The program parser will produce the state[] values.
+ */
+static void
+_mesa_fetch_state(GLcontext *ctx, const enum state_index state[],
+                  GLfloat *value)
+{
+   switch (state[0]) {
+   case STATE_MATERIAL:
+      {
+         /* state[1] is either 0=front or 1=back side */
+         const GLuint face = (GLuint) state[1];
+         /* state[2] is the material attribute */
+         switch (state[2]) {
+         case STATE_AMBIENT:
+            if (face == 0)
+               COPY_4V(value, ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_AMBIENT]);
+            else
+               COPY_4V(value, ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_AMBIENT]);
+            return;
+         case STATE_DIFFUSE:
+            if (face == 0)
+               COPY_4V(value, ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE]);
+            else
+               COPY_4V(value, ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_DIFFUSE]);
+            return;
+         case STATE_SPECULAR:
+            if (face == 0)
+               COPY_4V(value, ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_SPECULAR]);
+            else
+               COPY_4V(value, ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_SPECULAR]);
+            return;
+         case STATE_EMISSION:
+            if (face == 0)
+               COPY_4V(value, ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_EMISSION]);
+            else
+               COPY_4V(value, ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_EMISSION]);
+            return;
+         case STATE_SHININESS:
+            if (face == 0)
+               value[0] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_SHININESS][0];
+            else
+               value[0] = ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_SHININESS][0];
+            value[1] = 0.0F;
+            value[2] = 0.0F;
+            value[3] = 1.0F;
+            return;
+         default:
+            _mesa_problem(ctx, "Invalid material state in fetch_state");
+            return;
+         }
+      };
+      return;
+   case STATE_LIGHT:
+      {
+         /* state[1] is the light number */
+         const GLuint ln = (GLuint) state[1];
+         /* state[2] is the light attribute */
+         switch (state[2]) {
+         case STATE_AMBIENT:
+            COPY_4V(value, ctx->Light.Light[ln].Ambient);
+            return;
+         case STATE_DIFFUSE:
+            COPY_4V(value, ctx->Light.Light[ln].Diffuse);
+            return;
+         case STATE_SPECULAR:
+            COPY_4V(value, ctx->Light.Light[ln].Specular);
+            return;
+         case STATE_POSITION:
+            COPY_4V(value, ctx->Light.Light[ln].EyePosition);
+            return;
+         case STATE_ATTENUATION:
+            value[0] = ctx->Light.Light[ln].ConstantAttenuation;
+            value[1] = ctx->Light.Light[ln].LinearAttenuation;
+            value[2] = ctx->Light.Light[ln].QuadraticAttenuation;
+            value[3] = ctx->Light.Light[ln].SpotExponent;
+            return;
+         case STATE_SPOT_DIRECTION:
+            COPY_4V(value, ctx->Light.Light[ln].EyeDirection);
+            return;
+         case STATE_HALF:
+            {
+               GLfloat eye_z[] = {0, 0, 1};
+					
+               /* Compute infinite half angle vector:
+                *   half-vector = light_position + (0, 0, 1) 
+                * and then normalize.  w = 0
+					 *
+					 * light.EyePosition.w should be 0 for infinite lights.
+                */
+					ADD_3V(value, eye_z, ctx->Light.Light[ln].EyePosition);
+					NORMALIZE_3FV(value);
+					value[3] = 0;
+            }						  
+            return;
+         default:
+            _mesa_problem(ctx, "Invalid light state in fetch_state");
+            return;
+         }
+      }
+      return;
+   case STATE_LIGHTMODEL_AMBIENT:
+      COPY_4V(value, ctx->Light.Model.Ambient);
+      return;
+   case STATE_LIGHTMODEL_SCENECOLOR:
+      if (state[1] == 0) {
+         /* front */
+         GLint i;
+         for (i = 0; i < 4; i++) {
+            value[i] = ctx->Light.Model.Ambient[i]
+               * ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_AMBIENT][i]
+               + ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_EMISSION][i];
+         }
+      }
+      else {
+         /* back */
+         GLint i;
+         for (i = 0; i < 4; i++) {
+            value[i] = ctx->Light.Model.Ambient[i]
+               * ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_AMBIENT][i]
+               + ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_EMISSION][i];
+         }
+      }
+      return;
+   case STATE_LIGHTPROD:
+      {
+         const GLuint ln = (GLuint) state[1];
+         const GLuint face = (GLuint) state[2];
+         GLint i;
+         ASSERT(face == 0 || face == 1);
+         switch (state[3]) {
+            case STATE_AMBIENT:
+               for (i = 0; i < 3; i++) {
+                  value[i] = ctx->Light.Light[ln].Ambient[i] *
+                     ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_AMBIENT+face][i];
+               }
+               /* [3] = material alpha */
+               value[3] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE+face][3];
+               return;
+            case STATE_DIFFUSE:
+               for (i = 0; i < 3; i++) {
+                  value[i] = ctx->Light.Light[ln].Diffuse[i] *
+                     ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE+face][i];
+               }
+               /* [3] = material alpha */
+               value[3] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE+face][3];
+               return;
+            case STATE_SPECULAR:
+               for (i = 0; i < 3; i++) {
+                  value[i] = ctx->Light.Light[ln].Specular[i] *
+                     ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_SPECULAR+face][i];
+               }
+               /* [3] = material alpha */
+               value[3] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE+face][3];
+               return;
+            default:
+               _mesa_problem(ctx, "Invalid lightprod state in fetch_state");
+               return;
+         }
+      }
+      return;
+   case STATE_TEXGEN:
+      {
+         /* state[1] is the texture unit */
+         const GLuint unit = (GLuint) state[1];
+         /* state[2] is the texgen attribute */
+         switch (state[2]) {
+         case STATE_TEXGEN_EYE_S:
+            COPY_4V(value, ctx->Texture.Unit[unit].EyePlaneS);
+            return;
+         case STATE_TEXGEN_EYE_T:
+            COPY_4V(value, ctx->Texture.Unit[unit].EyePlaneT);
+            return;
+         case STATE_TEXGEN_EYE_R:
+            COPY_4V(value, ctx->Texture.Unit[unit].EyePlaneR);
+            return;
+         case STATE_TEXGEN_EYE_Q:
+            COPY_4V(value, ctx->Texture.Unit[unit].EyePlaneQ);
+            return;
+         case STATE_TEXGEN_OBJECT_S:
+            COPY_4V(value, ctx->Texture.Unit[unit].ObjectPlaneS);
+            return;
+         case STATE_TEXGEN_OBJECT_T:
+            COPY_4V(value, ctx->Texture.Unit[unit].ObjectPlaneT);
+            return;
+         case STATE_TEXGEN_OBJECT_R:
+            COPY_4V(value, ctx->Texture.Unit[unit].ObjectPlaneR);
+            return;
+         case STATE_TEXGEN_OBJECT_Q:
+            COPY_4V(value, ctx->Texture.Unit[unit].ObjectPlaneQ);
+            return;
+         default:
+            _mesa_problem(ctx, "Invalid texgen state in fetch_state");
+            return;
+         }
+      }
+      return;
+   case STATE_TEXENV_COLOR:
+      {		
+         /* state[1] is the texture unit */
+         const GLuint unit = (GLuint) state[1];
+         COPY_4V(value, ctx->Texture.Unit[unit].EnvColor);
+      }			
+      return;
+   case STATE_FOG_COLOR:
+      COPY_4V(value, ctx->Fog.Color);
+      return;
+   case STATE_FOG_PARAMS:
+      value[0] = ctx->Fog.Density;
+      value[1] = ctx->Fog.Start;
+      value[2] = ctx->Fog.End;
+      value[3] = 1.0F / (ctx->Fog.End - ctx->Fog.Start);
+      return;
+   case STATE_CLIPPLANE:
+      {
+         const GLuint plane = (GLuint) state[1];
+         COPY_4V(value, ctx->Transform.EyeUserPlane[plane]);
+      }
+      return;
+   case STATE_POINT_SIZE:
+      value[0] = ctx->Point.Size;
+      value[1] = ctx->Point.MinSize;
+      value[2] = ctx->Point.MaxSize;
+      value[3] = ctx->Point.Threshold;
+      return;
+   case STATE_POINT_ATTENUATION:
+      value[0] = ctx->Point.Params[0];
+      value[1] = ctx->Point.Params[1];
+      value[2] = ctx->Point.Params[2];
+      value[3] = 1.0F;
+      return;
+   case STATE_MATRIX:
+      {
+         /* state[1] = modelview, projection, texture, etc. */
+         /* state[2] = which texture matrix or program matrix */
+         /* state[3] = first column to fetch */
+         /* state[4] = last column to fetch */
+         /* state[5] = transpose, inverse or invtrans */
+
+         const GLmatrix *matrix;
+         const enum state_index mat = state[1];
+         const GLuint index = (GLuint) state[2];
+         const GLuint first = (GLuint) state[3];
+         const GLuint last = (GLuint) state[4];
+         const enum state_index modifier = state[5];
+         const GLfloat *m;
+         GLuint row, i;
+         if (mat == STATE_MODELVIEW) {
+            matrix = ctx->ModelviewMatrixStack.Top;
+         }
+         else if (mat == STATE_PROJECTION) {
+            matrix = ctx->ProjectionMatrixStack.Top;
+         }
+         else if (mat == STATE_MVP) {
+            matrix = &ctx->_ModelProjectMatrix;
+         }
+         else if (mat == STATE_TEXTURE) {
+            matrix = ctx->TextureMatrixStack[index].Top;
+         }
+         else if (mat == STATE_PROGRAM) {
+            matrix = ctx->ProgramMatrixStack[index].Top;
+         }
+         else {
+            _mesa_problem(ctx, "Bad matrix name in _mesa_fetch_state()");
+            return;
+         }
+         if (modifier == STATE_MATRIX_INVERSE ||
+             modifier == STATE_MATRIX_INVTRANS) {
+            /* XXX be sure inverse is up to date */
+            m = matrix->inv;
+         }
+         else {
+            m = matrix->m;
+         }
+         if (modifier == STATE_MATRIX_TRANSPOSE ||
+             modifier == STATE_MATRIX_INVTRANS) {
+            for (i = 0, row = first; row <= last; row++) {
+               value[i++] = m[row * 4 + 0];
+               value[i++] = m[row * 4 + 1];
+               value[i++] = m[row * 4 + 2];
+               value[i++] = m[row * 4 + 3];
+            }
+         }
+         else {
+            for (i = 0, row = first; row <= last; row++) {
+               value[i++] = m[row + 0];
+               value[i++] = m[row + 4];
+               value[i++] = m[row + 8];
+               value[i++] = m[row + 12];
+            }
+         }
+      }
+      return;
+   case STATE_DEPTH_RANGE:
+      value[0] = ctx->Viewport.Near;                     /* near       */		
+      value[1] = ctx->Viewport.Far;                      /* far        */		
+      value[2] = ctx->Viewport.Far - ctx->Viewport.Near; /* far - near */		
+      value[3] = 0;		
+      return;
+   case STATE_FRAGMENT_PROGRAM:
+      {
+         /* state[1] = {STATE_ENV, STATE_LOCAL} */
+         /* state[2] = parameter index          */
+         int idx = state[2];				  
+
+         switch (state[1]) {
+            case STATE_ENV:
+               COPY_4V(value, ctx->FragmentProgram.Parameters[idx]);						  
+               break;
+
+            case STATE_LOCAL:
+               COPY_4V(value, ctx->FragmentProgram.Current->Base.LocalParams[idx]);
+               break;				
+            default:
+               _mesa_problem(ctx, "Bad state switch in _mesa_fetch_state()");
+               return;
+         }				  
+      }			
+      return;
+		
+   case STATE_VERTEX_PROGRAM:
+      {		
+         /* state[1] = {STATE_ENV, STATE_LOCAL} */
+         /* state[2] = parameter index          */
+         int idx = state[2];				  
+			
+         switch (state[1]) {
+            case STATE_ENV:
+               COPY_4V(value, ctx->VertexProgram.Parameters[idx]);						  
+               break;
+
+            case STATE_LOCAL:
+               COPY_4V(value, ctx->VertexProgram.Current->Base.LocalParams[idx]);
+               break;				
+            default:
+               _mesa_problem(ctx, "Bad state switch in _mesa_fetch_state()");
+               return;
+         }				  
+      }			
+      return;
+   default:
+      _mesa_problem(ctx, "Invalid state in fetch_state");
+      return;
+   }
+}
+
+
+/**
+ * Loop over all the parameters in a parameter list.  If the parameter
+ * is a GL state reference, look up the current value of that state
+ * variable and put it into the parameter's Value[4] array.
+ * This would be called at glBegin time when using a fragment program.
+ */
+void
+_mesa_load_state_parameters(GLcontext *ctx,
+                            struct program_parameter_list *paramList)
+{
+   GLuint i;
+
+   if (!paramList)
+      return;
+
+   for (i = 0; i < paramList->NumParameters; i++) {
+      if (paramList->Parameters[i].Type == STATE) {
+         _mesa_fetch_state(ctx, paramList->Parameters[i].StateIndexes,
+                           paramList->Parameters[i].Values);
+      }
+   }
+}
+
+
+
+/**********************************************************************/
+/* API functions                                                      */
+/**********************************************************************/
+
+
+/**
+ * Bind a program (make it current)
+ * \note Called from the GL API dispatcher by both glBindProgramNV
+ * and glBindProgramARB.
+ */
+void GLAPIENTRY
+_mesa_BindProgram(GLenum target, GLuint id)
+{
+   struct program *prog;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   /* texture state is dependent on current fragment and vertex programs */
+   FLUSH_VERTICES(ctx, _NEW_PROGRAM | _NEW_TEXTURE);
+
+   if ((target == GL_VERTEX_PROGRAM_NV
+        && ctx->Extensions.NV_vertex_program) ||
+       (target == GL_VERTEX_PROGRAM_ARB
+        && ctx->Extensions.ARB_vertex_program)) {
+      if (ctx->VertexProgram.Current &&
+          ctx->VertexProgram.Current->Base.Id == id)
+         return;
+      /* decrement refcount on previously bound vertex program */
+      if (ctx->VertexProgram.Current) {
+         ctx->VertexProgram.Current->Base.RefCount--;
+         /* and delete if refcount goes below one */
+         if (ctx->VertexProgram.Current->Base.RefCount <= 0) {
+            _mesa_delete_program(ctx, &(ctx->VertexProgram.Current->Base));
+            _mesa_HashRemove(ctx->Shared->Programs, id);
+         }
+      }
+   }
+   else if ((target == GL_FRAGMENT_PROGRAM_NV
+             && ctx->Extensions.NV_fragment_program) ||
+            (target == GL_FRAGMENT_PROGRAM_ARB
+             && ctx->Extensions.ARB_fragment_program)) {
+      if (ctx->FragmentProgram.Current &&
+          ctx->FragmentProgram.Current->Base.Id == id)
+         return;
+      /* decrement refcount on previously bound fragment program */
+      if (ctx->FragmentProgram.Current) {
+         ctx->FragmentProgram.Current->Base.RefCount--;
+         /* and delete if refcount goes below one */
+         if (ctx->FragmentProgram.Current->Base.RefCount <= 0) {
+            _mesa_delete_program(ctx, &(ctx->FragmentProgram.Current->Base));
+            _mesa_HashRemove(ctx->Shared->Programs, id);
+         }
+      }
+   }
+   else {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glBindProgramNV/ARB(target)");
+      return;
+   }
+
+   /* NOTE: binding to a non-existant program is not an error.
+    * That's supposed to be caught in glBegin.
+    */
+   if (id == 0) {
+      /* default program */
+      prog = NULL;
+      if (target == GL_VERTEX_PROGRAM_NV || target == GL_VERTEX_PROGRAM_ARB)
+         prog = ctx->Shared->DefaultVertexProgram;
+      else
+         prog = ctx->Shared->DefaultFragmentProgram;
+   }
+   else {
+      prog = (struct program *) _mesa_HashLookup(ctx->Shared->Programs, id);
+      if (prog) {
+         if (prog->Target == 0) {
+            /* prog was allocated with glGenProgramsNV */
+            prog->Target = target;
+         }
+         else if (prog->Target != target) {
+            _mesa_error(ctx, GL_INVALID_OPERATION,
+                        "glBindProgramNV/ARB(target mismatch)");
+            return;
+         }
+      }
+      else {
+         /* allocate a new program now */
+         prog = _mesa_alloc_program(ctx, target, id);
+         if (!prog) {
+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindProgramNV/ARB");
+            return;
+         }
+         prog->Id = id;
+         prog->Target = target;
+         prog->Resident = GL_TRUE;
+         prog->RefCount = 1;
+         _mesa_HashInsert(ctx->Shared->Programs, id, prog);
+      }
+   }
+
+   /* bind now */
+   if (target == GL_VERTEX_PROGRAM_NV || target == GL_VERTEX_PROGRAM_ARB) {
+      ctx->VertexProgram.Current = (struct vertex_program *) prog;
+   }
+   else if (target == GL_FRAGMENT_PROGRAM_NV || target == GL_FRAGMENT_PROGRAM_ARB) {
+      ctx->FragmentProgram.Current = (struct fragment_program *) prog;
+   }
+
+   if (prog)
+      prog->RefCount++;
+}
+
+
+/**
+ * Delete a list of programs.
+ * \note Not compiled into display lists.
+ * \note Called by both glDeleteProgramsNV and glDeleteProgramsARB.
+ */
+void GLAPIENTRY 
+_mesa_DeletePrograms(GLsizei n, const GLuint *ids)
+{
+   GLint i;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (n < 0) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glDeleteProgramsNV" );
+      return;
+   }
+
+   for (i = 0; i < n; i++) {
+      if (ids[i] != 0) {
+         struct program *prog = (struct program *)
+            _mesa_HashLookup(ctx->Shared->Programs, ids[i]);
+         if (prog) {
+            if (prog->Target == GL_VERTEX_PROGRAM_NV ||
+                prog->Target == GL_VERTEX_STATE_PROGRAM_NV) {
+               if (ctx->VertexProgram.Current &&
+                   ctx->VertexProgram.Current->Base.Id == ids[i]) {
+                  /* unbind this currently bound program */
+                  _mesa_BindProgram(prog->Target, 0);
+               }
+            }
+            else if (prog->Target == GL_FRAGMENT_PROGRAM_NV ||
+                     prog->Target == GL_FRAGMENT_PROGRAM_ARB) {
+               if (ctx->FragmentProgram.Current &&
+                   ctx->FragmentProgram.Current->Base.Id == ids[i]) {
+                  /* unbind this currently bound program */
+                  _mesa_BindProgram(prog->Target, 0);
+               }
+            }
+            else {
+               _mesa_problem(ctx, "bad target in glDeleteProgramsNV");
+               return;
+            }
+            prog->RefCount--;
+            if (prog->RefCount <= 0) {
+               _mesa_delete_program(ctx, prog);
+            }
+         }
+      }
+   }
+}
+
+
+/**
+ * Generate a list of new program identifiers.
+ * \note Not compiled into display lists.
+ * \note Called by both glGenProgramsNV and glGenProgramsARB.
+ */
+void GLAPIENTRY
+_mesa_GenPrograms(GLsizei n, GLuint *ids)
+{
+   GLuint first;
+   GLuint i;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (n < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glGenPrograms");
+      return;
+   }
+
+   if (!ids)
+      return;
+
+   first = _mesa_HashFindFreeKeyBlock(ctx->Shared->Programs, n);
+
+   for (i = 0; i < (GLuint) n; i++) {
+      const int bytes = MAX2(sizeof(struct vertex_program),
+                             sizeof(struct fragment_program));
+      struct program *prog = (struct program *) _mesa_calloc(bytes);
+      if (!prog) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenPrograms");
+         return;
+      }
+      prog->RefCount = 1;
+      prog->Id = first + i;
+      _mesa_HashInsert(ctx->Shared->Programs, first + i, prog);
+   }
+
+   /* Return the program names */
+   for (i = 0; i < (GLuint) n; i++) {
+      ids[i] = first + i;
+   }
+}
+
+
+/**
+ * Determine if id names a program.
+ * \note Not compiled into display lists.
+ * \note Called from both glIsProgramNV and glIsProgramARB.
+ * \param id is the program identifier
+ * \return GL_TRUE if id is a program, else GL_FALSE.
+ */
+GLboolean GLAPIENTRY
+_mesa_IsProgram(GLuint id)
+{
+   struct program *prog;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
+
+   if (id == 0)
+      return GL_FALSE;
+
+   prog = (struct program *) _mesa_HashLookup(ctx->Shared->Programs, id);
+   if (prog && prog->Target)
+      return GL_TRUE;
+   else
+      return GL_FALSE;
+}
+
+
+
+/**********************************************************************/
+/* GL_MESA_program_debug extension                                    */
+/**********************************************************************/
+
+
+/* XXX temporary */
+void
+glProgramCallbackMESA(GLenum target, GLprogramcallbackMESA callback,
+                      GLvoid *data)
+{
+   _mesa_ProgramCallbackMESA(target, callback, data);
+}
+
+
+void
+_mesa_ProgramCallbackMESA(GLenum target, GLprogramcallbackMESA callback,
+                          GLvoid *data)
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   switch (target) {
+      case GL_FRAGMENT_PROGRAM_ARB:
+         if (!ctx->Extensions.ARB_fragment_program) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glProgramCallbackMESA(target)");
+            return;
+         }
+         ctx->FragmentProgram.Callback = callback;
+         ctx->FragmentProgram.CallbackData = data;
+         break;
+      case GL_FRAGMENT_PROGRAM_NV:
+         if (!ctx->Extensions.NV_fragment_program) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glProgramCallbackMESA(target)");
+            return;
+         }
+         ctx->FragmentProgram.Callback = callback;
+         ctx->FragmentProgram.CallbackData = data;
+         break;
+      case GL_VERTEX_PROGRAM_ARB: /* == GL_VERTEX_PROGRAM_NV */
+         if (!ctx->Extensions.ARB_vertex_program &&
+             !ctx->Extensions.NV_vertex_program) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glProgramCallbackMESA(target)");
+            return;
+         }
+         ctx->VertexProgram.Callback = callback;
+         ctx->VertexProgram.CallbackData = data;
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glProgramCallbackMESA(target)");
+         return;
+   }
+}
+
+
+/* XXX temporary */
+void
+glGetProgramRegisterfvMESA(GLenum target,
+                           GLsizei len, const GLubyte *registerName,
+                           GLfloat *v)
+{
+   _mesa_GetProgramRegisterfvMESA(target, len, registerName, v);
+}
+
+
+void
+_mesa_GetProgramRegisterfvMESA(GLenum target,
+                               GLsizei len, const GLubyte *registerName,
+                               GLfloat *v)
+{
+   char reg[1000];
+   GET_CURRENT_CONTEXT(ctx);
+
+   /* We _should_ be inside glBegin/glEnd */
+#if 0
+   if (ctx->Driver.CurrentExecPrimitive == PRIM_OUTSIDE_BEGIN_END) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetProgramRegisterfvMESA");
+      return;
+   }
+#endif
+
+   /* make null-terminated copy of registerName */
+   len = MIN2((unsigned int) len, sizeof(reg) - 1);
+   _mesa_memcpy(reg, registerName, len);
+   reg[len] = 0;
+
+   switch (target) {
+      case GL_VERTEX_PROGRAM_NV:
+         if (!ctx->Extensions.ARB_vertex_program &&
+             !ctx->Extensions.NV_vertex_program) {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glGetProgramRegisterfvMESA(target)");
+            return;
+         }
+         if (!ctx->VertexProgram.Enabled) {
+            _mesa_error(ctx, GL_INVALID_OPERATION,
+                        "glGetProgramRegisterfvMESA");
+            return;
+         }
+         /* GL_NV_vertex_program */
+         if (reg[0] == 'R') {
+            /* Temp register */
+            GLint i = _mesa_atoi(reg + 1);
+            if (i >= (GLint)ctx->Const.MaxVertexProgramTemps) {
+               _mesa_error(ctx, GL_INVALID_VALUE,
+                           "glGetProgramRegisterfvMESA(registerName)");
+               return;
+            }
+            COPY_4V(v, ctx->VertexProgram.Temporaries[i]);
+         }
+         else if (reg[0] == 'v' && reg[1] == '[') {
+            /* Vertex Input attribute */
+            GLuint i;
+            for (i = 0; i < ctx->Const.MaxVertexProgramAttribs; i++) {
+               const char *name = _mesa_nv_vertex_input_register_name(i);
+               char number[10];
+               sprintf(number, "%d", i);
+               if (_mesa_strncmp(reg + 2, name, 4) == 0 ||
+                   _mesa_strncmp(reg + 2, number, _mesa_strlen(number)) == 0) {
+                  COPY_4V(v, ctx->VertexProgram.Inputs[i]);
+                  return;
+               }
+            }
+            _mesa_error(ctx, GL_INVALID_VALUE,
+                        "glGetProgramRegisterfvMESA(registerName)");
+            return;
+         }
+         else if (reg[0] == 'o' && reg[1] == '[') {
+            /* Vertex output attribute */
+         }
+         /* GL_ARB_vertex_program */
+         else if (_mesa_strncmp(reg, "vertex.", 7) == 0) {
+
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_VALUE,
+                        "glGetProgramRegisterfvMESA(registerName)");
+            return;
+         }
+         break;
+      case GL_FRAGMENT_PROGRAM_ARB:
+         if (!ctx->Extensions.ARB_fragment_program) {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glGetProgramRegisterfvMESA(target)");
+            return;
+         }
+         if (!ctx->FragmentProgram.Enabled) {
+            _mesa_error(ctx, GL_INVALID_OPERATION,
+                        "glGetProgramRegisterfvMESA");
+            return;
+         }
+         /* XXX to do */
+         break;
+      case GL_FRAGMENT_PROGRAM_NV:
+         if (!ctx->Extensions.NV_fragment_program) {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glGetProgramRegisterfvMESA(target)");
+            return;
+         }
+         if (!ctx->FragmentProgram.Enabled) {
+            _mesa_error(ctx, GL_INVALID_OPERATION,
+                        "glGetProgramRegisterfvMESA");
+            return;
+         }
+         if (reg[0] == 'R') {
+            /* Temp register */
+            GLint i = _mesa_atoi(reg + 1);
+            if (i >= (GLint)ctx->Const.MaxFragmentProgramTemps) {
+               _mesa_error(ctx, GL_INVALID_VALUE,
+                           "glGetProgramRegisterfvMESA(registerName)");
+               return;
+            }
+            COPY_4V(v, ctx->FragmentProgram.Machine.Temporaries[i]);
+         }
+         else if (reg[0] == 'f' && reg[1] == '[') {
+            /* Fragment input attribute */
+            GLuint i;
+            for (i = 0; i < ctx->Const.MaxFragmentProgramAttribs; i++) {
+               const char *name = _mesa_nv_fragment_input_register_name(i);
+               if (_mesa_strncmp(reg + 2, name, 4) == 0) {
+                  COPY_4V(v, ctx->FragmentProgram.Machine.Inputs[i]);
+                  return;
+               }
+            }
+            _mesa_error(ctx, GL_INVALID_VALUE,
+                        "glGetProgramRegisterfvMESA(registerName)");
+            return;
+         }
+         else if (_mesa_strcmp(reg, "o[COLR]") == 0) {
+            /* Fragment output color */
+            COPY_4V(v, ctx->FragmentProgram.Machine.Outputs[FRAG_OUTPUT_COLR]);
+         }
+         else if (_mesa_strcmp(reg, "o[COLH]") == 0) {
+            /* Fragment output color */
+            COPY_4V(v, ctx->FragmentProgram.Machine.Outputs[FRAG_OUTPUT_COLH]);
+         }
+         else if (_mesa_strcmp(reg, "o[DEPR]") == 0) {
+            /* Fragment output depth */
+            COPY_4V(v, ctx->FragmentProgram.Machine.Outputs[FRAG_OUTPUT_DEPR]);
+         }
+         else {
+            /* try user-defined identifiers */
+            const GLfloat *value = _mesa_lookup_parameter_value(
+                       ctx->FragmentProgram.Current->Parameters, -1, reg);
+            if (value) {
+               COPY_4V(v, value);
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_VALUE,
+                           "glGetProgramRegisterfvMESA(registerName)");
+               return;
+            }
+         }
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM,
+                     "glGetProgramRegisterfvMESA(target)");
+         return;
+   }
+
+}
diff --git a/reactos/lib/mesa32/src/main/program.h b/reactos/lib/mesa32/src/main/program.h
new file mode 100644
index 00000000000..3c2aa1cdac6
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/program.h
@@ -0,0 +1,236 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file program.c
+ * Vertex and fragment program support functions.
+ * \author Brian Paul
+ */
+
+
+#ifndef PROGRAM_H
+#define PROGRAM_H
+
+#include "mtypes.h"
+
+
+/* for GL_ARB_v_p and GL_ARB_f_p SWZ instruction */
+#define SWIZZLE_ZERO 100
+#define SWIZZLE_ONE  101
+
+
+/*
+ * Internal functions
+ */
+
+extern void
+_mesa_init_program(GLcontext *ctx);
+
+extern void
+_mesa_set_program_error(GLcontext *ctx, GLint pos, const char *string);
+
+extern const GLubyte *
+_mesa_find_line_column(const GLubyte *string, const GLubyte *pos,
+                       GLint *line, GLint *col);
+
+extern struct program *
+_mesa_alloc_program(GLcontext *ctx, GLenum target, GLuint id);
+
+extern void
+_mesa_delete_program(GLcontext *ctx, struct program *prog);
+
+
+
+/*
+ * Used for describing GL state referenced from inside ARB vertex and
+ * fragment programs.
+ * A string such as "state.light[0].ambient" gets translated into a
+ * sequence of tokens such as [ STATE_LIGHT, 0, STATE_AMBIENT ].
+ */
+enum state_index {
+   STATE_MATERIAL,
+
+   STATE_LIGHT,
+   STATE_LIGHTMODEL_AMBIENT,
+   STATE_LIGHTMODEL_SCENECOLOR,
+   STATE_LIGHTPROD,
+
+   STATE_TEXGEN,
+
+   STATE_FOG_COLOR,
+   STATE_FOG_PARAMS,
+
+   STATE_CLIPPLANE,
+
+   STATE_POINT_SIZE,
+   STATE_POINT_ATTENUATION,
+
+   STATE_MATRIX,
+   STATE_MODELVIEW,
+   STATE_PROJECTION,
+   STATE_MVP,
+   STATE_TEXTURE,
+   STATE_PROGRAM,
+   STATE_MATRIX_INVERSE,
+   STATE_MATRIX_TRANSPOSE,
+   STATE_MATRIX_INVTRANS,
+
+   STATE_AMBIENT,
+   STATE_DIFFUSE,
+   STATE_SPECULAR,
+   STATE_EMISSION,
+   STATE_SHININESS,
+   STATE_HALF,	
+
+   STATE_POSITION,
+   STATE_ATTENUATION,
+   STATE_SPOT_DIRECTION,
+
+   STATE_TEXGEN_EYE_S,
+   STATE_TEXGEN_EYE_T,
+   STATE_TEXGEN_EYE_R,
+   STATE_TEXGEN_EYE_Q,
+   STATE_TEXGEN_OBJECT_S,
+   STATE_TEXGEN_OBJECT_T,
+   STATE_TEXGEN_OBJECT_R,
+   STATE_TEXGEN_OBJECT_Q,
+
+   STATE_TEXENV_COLOR,
+	
+   STATE_DEPTH_RANGE,
+
+   STATE_VERTEX_PROGRAM,
+   STATE_FRAGMENT_PROGRAM,
+
+   STATE_ENV,
+   STATE_LOCAL
+};
+
+
+
+/*
+ * Named program parameters 
+ * Used for NV_fragment_program "DEFINE"d constants and "DECLARE"d parameters,
+ * and ARB_fragment_program global state references.  For the later, Name
+ * might be "state.light[0].diffuse", for example.
+ */
+
+enum parameter_type
+{
+   NAMED_PARAMETER,
+   CONSTANT,
+   STATE
+};
+
+
+struct program_parameter
+{
+   const char *Name;                   /* Null-terminated */
+   enum parameter_type Type;
+   enum state_index StateIndexes[6];   /* Global state reference */
+   GLfloat Values[4];
+};
+
+
+struct program_parameter_list
+{
+   GLuint NumParameters;
+   struct program_parameter *Parameters;
+};
+
+
+/*
+ * Program parameter functions
+ */
+
+extern struct program_parameter_list *
+_mesa_new_parameter_list(void);
+
+extern void
+_mesa_free_parameter_list(struct program_parameter_list *paramList);
+
+extern void
+_mesa_free_parameters(struct program_parameter_list *paramList);
+
+extern GLint
+_mesa_add_named_parameter(struct program_parameter_list *paramList,
+                          const char *name, const GLfloat values[4]);
+
+extern GLint
+_mesa_add_named_constant(struct program_parameter_list *paramList,
+                         const char *name, const GLfloat values[4]);
+
+extern GLint
+_mesa_add_unnamed_constant(struct program_parameter_list *paramList,
+                           const GLfloat values[4]);
+
+extern GLint
+_mesa_add_state_reference(struct program_parameter_list *paramList,
+                          GLint *stateTokens);
+
+extern GLfloat *
+_mesa_lookup_parameter_value(struct program_parameter_list *paramList,
+                             GLsizei nameLen, const char *name);
+
+extern GLint
+_mesa_lookup_parameter_index(struct program_parameter_list *paramList,
+                             GLsizei nameLen, const char *name);
+
+extern void
+_mesa_load_state_parameters(GLcontext *ctx,
+                            struct program_parameter_list *paramList);
+
+
+/*
+ * API functions
+ */
+
+extern void GLAPIENTRY
+_mesa_BindProgram(GLenum target, GLuint id);
+
+extern void GLAPIENTRY
+_mesa_DeletePrograms(GLsizei n, const GLuint *ids);
+
+extern void GLAPIENTRY
+_mesa_GenPrograms(GLsizei n, GLuint *ids);
+
+extern GLboolean GLAPIENTRY
+_mesa_IsProgram(GLuint id);
+
+
+
+/*
+ * GL_MESA_program_debug
+ */
+
+extern void
+_mesa_ProgramCallbackMESA(GLenum target, GLprogramcallbackMESA callback,
+                          GLvoid *data);
+
+extern void
+_mesa_GetProgramRegisterfvMESA(GLenum target, GLsizei len,
+                               const GLubyte *registerName, GLfloat *v);
+
+
+#endif /* PROGRAM_H */
diff --git a/reactos/lib/mesa32/src/main/rastpos.c b/reactos/lib/mesa32/src/main/rastpos.c
new file mode 100644
index 00000000000..5e7ef50b46b
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/rastpos.c
@@ -0,0 +1,905 @@
+/**
+ * \file rastpos.c
+ * Raster position operations.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+/*#include "clip.h"*/
+#include "colormac.h"
+#include "context.h"
+#include "feedback.h"
+#include "light.h"
+#include "macros.h"
+#include "rastpos.h"
+#include "state.h"
+#include "simple_list.h"
+#include "mtypes.h"
+
+#include "math/m_matrix.h"
+
+
+/**
+ * Clip a point against the view volume.
+ *
+ * \param v vertex vector describing the point to clip.
+ * 
+ * \return zero if outside view volume, or one if inside.
+ */
+static GLuint
+viewclip_point( const GLfloat v[] )
+{
+   if (   v[0] > v[3] || v[0] < -v[3]
+       || v[1] > v[3] || v[1] < -v[3]
+       || v[2] > v[3] || v[2] < -v[3] ) {
+      return 0;
+   }
+   else {
+      return 1;
+   }
+}
+
+
+/**
+ * Clip a point against the far/near Z clipping planes.
+ *
+ * \param v vertex vector describing the point to clip.
+ * 
+ * \return zero if outside view volume, or one if inside.
+ */
+static GLuint
+viewclip_point_z( const GLfloat v[] )
+{
+   if (v[2] > v[3] || v[2] < -v[3] ) {
+      return 0;
+   }
+   else {
+      return 1;
+   }
+}
+
+
+/**
+ * Clip a point against the user clipping planes.
+ * 
+ * \param ctx GL context.
+ * \param v vertex vector describing the point to clip.
+ * 
+ * \return zero if the point was clipped, or one otherwise.
+ */
+static GLuint
+userclip_point( GLcontext *ctx, const GLfloat v[] )
+{
+   GLuint p;
+
+   for (p = 0; p < ctx->Const.MaxClipPlanes; p++) {
+      if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {
+	 GLfloat dot = v[0] * ctx->Transform._ClipUserPlane[p][0]
+		     + v[1] * ctx->Transform._ClipUserPlane[p][1]
+		     + v[2] * ctx->Transform._ClipUserPlane[p][2]
+		     + v[3] * ctx->Transform._ClipUserPlane[p][3];
+         if (dot < 0.0F) {
+            return 0;
+         }
+      }
+   }
+
+   return 1;
+}
+
+
+/**
+ * This has been split off to allow the normal shade routines to
+ * get a little closer to the vertex buffer, and to use the
+ * GLvector objects directly.
+ * \param ctx the context
+ * \param vertex vertex location
+ * \param normal normal vector
+ * \param Rcolor returned color
+ * \param Rspec returned specular color (if separate specular enabled)
+ * \param Rindex returned color index
+ */
+static void
+shade_rastpos(GLcontext *ctx,
+              const GLfloat vertex[4],
+              const GLfloat normal[3],
+              GLfloat Rcolor[4],
+              GLfloat Rspec[4],
+              GLfloat *Rindex)
+{
+   GLfloat (*base)[3] = ctx->Light._BaseColor;
+   struct gl_light *light;
+   GLfloat diffuseColor[4], specularColor[4];
+   GLfloat diffuse = 0, specular = 0;
+
+   if (!ctx->_ShineTable[0] || !ctx->_ShineTable[1])
+      _mesa_validate_all_lighting_tables( ctx );
+
+   COPY_3V(diffuseColor, base[0]);
+   diffuseColor[3] = CLAMP( 
+      ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE][3], 0.0F, 1.0F );
+   ASSIGN_4V(specularColor, 0.0, 0.0, 0.0, 0.0);
+
+   foreach (light, &ctx->Light.EnabledList) {
+      GLfloat n_dot_h;
+      GLfloat attenuation = 1.0;
+      GLfloat VP[3];
+      GLfloat n_dot_VP;
+      GLfloat *h;
+      GLfloat diffuseContrib[3], specularContrib[3];
+      GLboolean normalized;
+
+      if (!(light->_Flags & LIGHT_POSITIONAL)) {
+	 COPY_3V(VP, light->_VP_inf_norm);
+	 attenuation = light->_VP_inf_spot_attenuation;
+      }
+      else {
+	 GLfloat d;
+
+	 SUB_3V(VP, light->_Position, vertex);
+	 d = (GLfloat) LEN_3FV( VP );
+
+	 if ( d > 1e-6) {
+	    GLfloat invd = 1.0F / d;
+	    SELF_SCALE_SCALAR_3V(VP, invd);
+	 }
+	 attenuation = 1.0F / (light->ConstantAttenuation + d *
+			       (light->LinearAttenuation + d *
+				light->QuadraticAttenuation));
+
+	 if (light->_Flags & LIGHT_SPOT) {
+	    GLfloat PV_dot_dir = - DOT3(VP, light->_NormDirection);
+
+	    if (PV_dot_dir<light->_CosCutoff) {
+	       continue;
+	    }
+	    else {
+	       double x = PV_dot_dir * (EXP_TABLE_SIZE-1);
+	       int k = (int) x;
+	       GLfloat spot = (GLfloat) (light->_SpotExpTable[k][0]
+			       + (x-k)*light->_SpotExpTable[k][1]);
+	       attenuation *= spot;
+	    }
+	 }
+      }
+
+      if (attenuation < 1e-3)
+	 continue;
+
+      n_dot_VP = DOT3( normal, VP );
+
+      if (n_dot_VP < 0.0F) {
+	 ACC_SCALE_SCALAR_3V(diffuseColor, attenuation, light->_MatAmbient[0]);
+	 continue;
+      }
+
+      COPY_3V(diffuseContrib, light->_MatAmbient[0]);
+      ACC_SCALE_SCALAR_3V(diffuseContrib, n_dot_VP, light->_MatDiffuse[0]);
+      diffuse += n_dot_VP * light->_dli * attenuation;
+      ASSIGN_3V(specularContrib, 0.0, 0.0, 0.0);
+
+      {
+	 if (ctx->Light.Model.LocalViewer) {
+	    GLfloat v[3];
+	    COPY_3V(v, vertex);
+	    NORMALIZE_3FV(v);
+	    SUB_3V(VP, VP, v);
+	    h = VP;
+	    normalized = 0;
+	 }
+	 else if (light->_Flags & LIGHT_POSITIONAL) {
+	    h = VP;
+	    ACC_3V(h, ctx->_EyeZDir);
+	    normalized = 0;
+	 }
+         else {
+	    h = light->_h_inf_norm;
+	    normalized = 1;
+	 }
+
+	 n_dot_h = DOT3(normal, h);
+
+	 if (n_dot_h > 0.0F) {
+	    GLfloat (*mat)[4] = ctx->Light.Material.Attrib;
+	    GLfloat spec_coef;
+	    GLfloat shininess = mat[MAT_ATTRIB_FRONT_SHININESS][0];
+
+	    if (!normalized) {
+	       n_dot_h *= n_dot_h;
+	       n_dot_h /= LEN_SQUARED_3FV( h );
+	       shininess *= .5;
+	    }
+
+	    GET_SHINE_TAB_ENTRY( ctx->_ShineTable[0], n_dot_h, spec_coef );
+
+	    if (spec_coef > 1.0e-10) {
+               if (ctx->Light.Model.ColorControl==GL_SEPARATE_SPECULAR_COLOR) {
+                  ACC_SCALE_SCALAR_3V( specularContrib, spec_coef,
+                                       light->_MatSpecular[0]);
+               }
+               else {
+                  ACC_SCALE_SCALAR_3V( diffuseContrib, spec_coef,
+                                       light->_MatSpecular[0]);
+               }
+	       specular += spec_coef * light->_sli * attenuation;
+	    }
+	 }
+      }
+
+      ACC_SCALE_SCALAR_3V( diffuseColor, attenuation, diffuseContrib );
+      ACC_SCALE_SCALAR_3V( specularColor, attenuation, specularContrib );
+   }
+
+   if (ctx->Visual.rgbMode) {
+      Rcolor[0] = CLAMP(diffuseColor[0], 0.0F, 1.0F);
+      Rcolor[1] = CLAMP(diffuseColor[1], 0.0F, 1.0F);
+      Rcolor[2] = CLAMP(diffuseColor[2], 0.0F, 1.0F);
+      Rcolor[3] = CLAMP(diffuseColor[3], 0.0F, 1.0F);
+      Rspec[0] = CLAMP(specularColor[0], 0.0F, 1.0F);
+      Rspec[1] = CLAMP(specularColor[1], 0.0F, 1.0F);
+      Rspec[2] = CLAMP(specularColor[2], 0.0F, 1.0F);
+      Rspec[3] = CLAMP(specularColor[3], 0.0F, 1.0F);
+   }
+   else {
+      GLfloat *ind = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_INDEXES];
+      GLfloat d_a = ind[MAT_INDEX_DIFFUSE] - ind[MAT_INDEX_AMBIENT];
+      GLfloat s_a = ind[MAT_INDEX_SPECULAR] - ind[MAT_INDEX_AMBIENT];
+      GLfloat i = (ind[MAT_INDEX_AMBIENT]
+		   + diffuse * (1.0F-specular) * d_a
+		   + specular * s_a);
+      if (i > ind[MAT_INDEX_SPECULAR]) {
+	 i = ind[MAT_INDEX_SPECULAR];
+      }
+      *Rindex = i;
+   }
+}
+
+
+/**
+ * Set the raster position for pixel operations.
+ *
+ * All glRasterPos command call this function to update the current
+ * raster position.
+ * 
+ * \param ctx GL context.
+ * \param x x coordinate for the raster position.
+ * \param y y coordinate for the raster position.
+ * \param z z coordinate for the raster position.
+ * \param w w coordinate for the raster position.
+ * 
+ * \sa Called by _mesa_RasterPos4f().
+ *
+ * Flushes the vertices, transforms and clips the vertex coordinates, and
+ * finally sets the current raster position and associated data in
+ * __GLcontextRec::Current.  When in selection mode calls
+ * _mesa_update_hitflag() with the current raster position.
+ */
+static void
+raster_pos4f(GLcontext *ctx, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   GLfloat v[4], eye[4], clip[4], ndc[3], d;
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+   FLUSH_CURRENT(ctx, 0);
+
+   if (ctx->NewState)
+      _mesa_update_state( ctx );
+
+   if (ctx->VertexProgram.Enabled) {
+      /* XXX implement this */
+      _mesa_problem(ctx, "Vertex programs not implemented for glRasterPos");
+      return;
+   }
+   else {
+      ASSIGN_4V( v, x, y, z, w );
+      TRANSFORM_POINT( eye, ctx->ModelviewMatrixStack.Top->m, v );
+
+      /* raster color */
+      if (ctx->Light.Enabled) {
+         GLfloat *norm, eyenorm[3];
+         GLfloat *objnorm = ctx->Current.Attrib[VERT_ATTRIB_NORMAL];
+
+         if (ctx->_NeedEyeCoords) {
+            GLfloat *inv = ctx->ModelviewMatrixStack.Top->inv;
+            TRANSFORM_NORMAL( eyenorm, objnorm, inv );
+            norm = eyenorm;
+         }
+         else {
+            norm = objnorm;
+         }
+
+         shade_rastpos( ctx, v, norm,
+                        ctx->Current.RasterColor,
+                        ctx->Current.RasterSecondaryColor,
+                        &ctx->Current.RasterIndex );
+      }
+      else {
+         /* use current color or index */
+         if (ctx->Visual.rgbMode) {
+            COPY_4FV(ctx->Current.RasterColor,
+                     ctx->Current.Attrib[VERT_ATTRIB_COLOR0]);
+            COPY_4FV(ctx->Current.RasterSecondaryColor,
+                     ctx->Current.Attrib[VERT_ATTRIB_COLOR1]);
+         }
+         else {
+            ctx->Current.RasterIndex = ctx->Current.Index;
+         }
+      }
+
+      /* compute raster distance */
+      if (ctx->Fog.FogCoordinateSource == GL_FOG_COORDINATE_EXT)
+         ctx->Current.RasterDistance = ctx->Current.Attrib[VERT_ATTRIB_FOG][0];
+      else
+         ctx->Current.RasterDistance =
+                         SQRTF( eye[0]*eye[0] + eye[1]*eye[1] + eye[2]*eye[2] );
+
+      /* apply projection matrix:  clip = Proj * eye */
+      TRANSFORM_POINT( clip, ctx->ProjectionMatrixStack.Top->m, eye );
+
+      /* clip to view volume */
+      if (ctx->Transform.RasterPositionUnclipped) {
+         /* GL_IBM_rasterpos_clip: only clip against Z */
+         if (viewclip_point_z(clip) == 0) {
+            ctx->Current.RasterPosValid = GL_FALSE;
+            return;
+         }
+      }
+      else if (viewclip_point(clip) == 0) {
+         /* Normal OpenGL behaviour */
+         ctx->Current.RasterPosValid = GL_FALSE;
+         return;
+      }
+
+      /* clip to user clipping planes */
+      if (ctx->Transform.ClipPlanesEnabled && !userclip_point(ctx, clip)) {
+         ctx->Current.RasterPosValid = GL_FALSE;
+         return;
+      }
+
+      /* ndc = clip / W */
+      d = (clip[3] == 0.0F) ? 1.0F : 1.0F / clip[3];
+      ndc[0] = clip[0] * d;
+      ndc[1] = clip[1] * d;
+      ndc[2] = clip[2] * d;
+
+      ctx->Current.RasterPos[0] = (ndc[0] * ctx->Viewport._WindowMap.m[MAT_SX] +
+                                   ctx->Viewport._WindowMap.m[MAT_TX]);
+      ctx->Current.RasterPos[1] = (ndc[1] * ctx->Viewport._WindowMap.m[MAT_SY] +
+                                   ctx->Viewport._WindowMap.m[MAT_TY]);
+      ctx->Current.RasterPos[2] = (ndc[2] * ctx->Viewport._WindowMap.m[MAT_SZ] +
+                                   ctx->Viewport._WindowMap.m[MAT_TZ]) / ctx->DepthMaxF;
+      ctx->Current.RasterPos[3] = clip[3];
+      ctx->Current.RasterPosValid = GL_TRUE;
+
+      {
+         GLuint texSet;
+         for (texSet = 0; texSet < ctx->Const.MaxTextureCoordUnits; texSet++) {
+            COPY_4FV( ctx->Current.RasterTexCoords[texSet],
+                     ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texSet] );
+         }
+      }
+
+   }
+
+   if (ctx->RenderMode==GL_SELECT) {
+      _mesa_update_hitflag( ctx, ctx->Current.RasterPos[2] );
+   }
+}
+
+
+/** Calls _mesa_RasterPos4f() */
+void GLAPIENTRY
+_mesa_RasterPos2d(GLdouble x, GLdouble y)
+{
+   _mesa_RasterPos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);
+}
+
+/** Calls _mesa_RasterPos4f() */
+void GLAPIENTRY
+_mesa_RasterPos2f(GLfloat x, GLfloat y)
+{
+   _mesa_RasterPos4f(x, y, 0.0F, 1.0F);
+}
+
+/** Calls _mesa_RasterPos4f() */
+void GLAPIENTRY
+_mesa_RasterPos2i(GLint x, GLint y)
+{
+   _mesa_RasterPos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);
+}
+
+/** Calls _mesa_RasterPos4f() */
+void GLAPIENTRY
+_mesa_RasterPos2s(GLshort x, GLshort y)
+{
+   _mesa_RasterPos4f(x, y, 0.0F, 1.0F);
+}
+
+/** Calls _mesa_RasterPos4f() */
+void GLAPIENTRY
+_mesa_RasterPos3d(GLdouble x, GLdouble y, GLdouble z)
+{
+   _mesa_RasterPos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
+}
+
+/** Calls _mesa_RasterPos4f() */
+void GLAPIENTRY
+_mesa_RasterPos3f(GLfloat x, GLfloat y, GLfloat z)
+{
+   _mesa_RasterPos4f(x, y, z, 1.0F);
+}
+
+/** Calls _mesa_RasterPos4f() */
+void GLAPIENTRY
+_mesa_RasterPos3i(GLint x, GLint y, GLint z)
+{
+   _mesa_RasterPos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
+}
+
+/** Calls _mesa_RasterPos4f() */
+void GLAPIENTRY
+_mesa_RasterPos3s(GLshort x, GLshort y, GLshort z)
+{
+   _mesa_RasterPos4f(x, y, z, 1.0F);
+}
+
+/** Calls _mesa_RasterPos4f() */
+void GLAPIENTRY
+_mesa_RasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
+{
+   _mesa_RasterPos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
+}
+
+/** Calls raster_pos4f() */
+void GLAPIENTRY
+_mesa_RasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   raster_pos4f(ctx, x, y, z, w);
+}
+
+/** Calls _mesa_RasterPos4f() */
+void GLAPIENTRY
+_mesa_RasterPos4i(GLint x, GLint y, GLint z, GLint w)
+{
+   _mesa_RasterPos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
+}
+
+/** Calls _mesa_RasterPos4f() */
+void GLAPIENTRY
+_mesa_RasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w)
+{
+   _mesa_RasterPos4f(x, y, z, w);
+}
+
+/** Calls _mesa_RasterPos4f() */
+void GLAPIENTRY
+_mesa_RasterPos2dv(const GLdouble *v)
+{
+   _mesa_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);
+}
+
+/** Calls _mesa_RasterPos4f() */
+void GLAPIENTRY
+_mesa_RasterPos2fv(const GLfloat *v)
+{
+   _mesa_RasterPos4f(v[0], v[1], 0.0F, 1.0F);
+}
+
+/** Calls _mesa_RasterPos4f() */
+void GLAPIENTRY
+_mesa_RasterPos2iv(const GLint *v)
+{
+   _mesa_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);
+}
+
+/** Calls _mesa_RasterPos4f() */
+void GLAPIENTRY
+_mesa_RasterPos2sv(const GLshort *v)
+{
+   _mesa_RasterPos4f(v[0], v[1], 0.0F, 1.0F);
+}
+
+/** Calls _mesa_RasterPos4f() */
+void GLAPIENTRY
+_mesa_RasterPos3dv(const GLdouble *v)
+{
+   _mesa_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);
+}
+
+/** Calls _mesa_RasterPos4f() */
+void GLAPIENTRY
+_mesa_RasterPos3fv(const GLfloat *v)
+{
+   _mesa_RasterPos4f(v[0], v[1], v[2], 1.0F);
+}
+
+/** Calls _mesa_RasterPos4f() */
+void GLAPIENTRY
+_mesa_RasterPos3iv(const GLint *v)
+{
+   _mesa_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);
+}
+
+/** Calls _mesa_RasterPos4f() */
+void GLAPIENTRY
+_mesa_RasterPos3sv(const GLshort *v)
+{
+   _mesa_RasterPos4f(v[0], v[1], v[2], 1.0F);
+}
+
+/** Calls _mesa_RasterPos4f() */
+void GLAPIENTRY
+_mesa_RasterPos4dv(const GLdouble *v)
+{
+   _mesa_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], 
+		     (GLfloat) v[2], (GLfloat) v[3]);
+}
+
+/** Calls _mesa_RasterPos4f() */
+void GLAPIENTRY
+_mesa_RasterPos4fv(const GLfloat *v)
+{
+   _mesa_RasterPos4f(v[0], v[1], v[2], v[3]);
+}
+
+/** Calls _mesa_RasterPos4f() */
+void GLAPIENTRY
+_mesa_RasterPos4iv(const GLint *v)
+{
+   _mesa_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], 
+		     (GLfloat) v[2], (GLfloat) v[3]);
+}
+
+/** Calls _mesa_RasterPos4f() */
+void GLAPIENTRY
+_mesa_RasterPos4sv(const GLshort *v)
+{
+   _mesa_RasterPos4f(v[0], v[1], v[2], v[3]);
+}
+
+
+/**********************************************************************/
+/***           GL_ARB_window_pos / GL_MESA_window_pos               ***/
+/**********************************************************************/
+
+#if FEATURE_windowpos
+/**
+ * All glWindowPosMESA and glWindowPosARB commands call this function to
+ * update the current raster position.
+ */
+static void
+window_pos3f(GLfloat x, GLfloat y, GLfloat z)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat z2;
+
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+   FLUSH_CURRENT(ctx, 0);
+
+   z2 = CLAMP(z, 0.0F, 1.0F) * (ctx->Viewport.Far - ctx->Viewport.Near)
+      + ctx->Viewport.Near;
+
+   /* set raster position */
+   ctx->Current.RasterPos[0] = x;
+   ctx->Current.RasterPos[1] = y;
+   ctx->Current.RasterPos[2] = z2;
+   ctx->Current.RasterPos[3] = 1.0F;
+
+   ctx->Current.RasterPosValid = GL_TRUE;
+
+   if (ctx->Fog.FogCoordinateSource == GL_FOG_COORDINATE_EXT)
+      ctx->Current.RasterDistance = ctx->Current.Attrib[VERT_ATTRIB_FOG][0];
+   else
+      ctx->Current.RasterDistance = 0.0;
+
+   /* raster color = current color or index */
+   if (ctx->Visual.rgbMode) {
+      ctx->Current.RasterColor[0]
+         = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][0], 0.0F, 1.0F);
+      ctx->Current.RasterColor[1]
+         = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][1], 0.0F, 1.0F);
+      ctx->Current.RasterColor[2]
+         = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][2], 0.0F, 1.0F);
+      ctx->Current.RasterColor[3]
+         = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3], 0.0F, 1.0F);
+      ctx->Current.RasterSecondaryColor[0]
+         = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][0], 0.0F, 1.0F);
+      ctx->Current.RasterSecondaryColor[1]
+         = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][1], 0.0F, 1.0F);
+      ctx->Current.RasterSecondaryColor[2]
+         = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][2], 0.0F, 1.0F);
+      ctx->Current.RasterSecondaryColor[3]
+         = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][3], 0.0F, 1.0F);
+   }
+   else {
+      ctx->Current.RasterIndex = ctx->Current.Index;
+   }
+
+   /* raster texcoord = current texcoord */
+   {
+      GLuint texSet;
+      for (texSet = 0; texSet < ctx->Const.MaxTextureCoordUnits; texSet++) {
+         COPY_4FV( ctx->Current.RasterTexCoords[texSet],
+                  ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texSet] );
+      }
+   }
+
+   if (ctx->RenderMode==GL_SELECT) {
+      _mesa_update_hitflag( ctx, ctx->Current.RasterPos[2] );
+   }
+}
+
+
+/* This is just to support the GL_MESA_window_pos version */
+static void
+window_pos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   window_pos3f(x, y, z);
+   ctx->Current.RasterPos[3] = w;
+}
+
+
+void GLAPIENTRY
+_mesa_WindowPos2dMESA(GLdouble x, GLdouble y)
+{
+   window_pos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);
+}
+
+void GLAPIENTRY
+_mesa_WindowPos2fMESA(GLfloat x, GLfloat y)
+{
+   window_pos4f(x, y, 0.0F, 1.0F);
+}
+
+void GLAPIENTRY
+_mesa_WindowPos2iMESA(GLint x, GLint y)
+{
+   window_pos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);
+}
+
+void GLAPIENTRY
+_mesa_WindowPos2sMESA(GLshort x, GLshort y)
+{
+   window_pos4f(x, y, 0.0F, 1.0F);
+}
+
+void GLAPIENTRY
+_mesa_WindowPos3dMESA(GLdouble x, GLdouble y, GLdouble z)
+{
+   window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
+}
+
+void GLAPIENTRY
+_mesa_WindowPos3fMESA(GLfloat x, GLfloat y, GLfloat z)
+{
+   window_pos4f(x, y, z, 1.0F);
+}
+
+void GLAPIENTRY
+_mesa_WindowPos3iMESA(GLint x, GLint y, GLint z)
+{
+   window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
+}
+
+void GLAPIENTRY
+_mesa_WindowPos3sMESA(GLshort x, GLshort y, GLshort z)
+{
+   window_pos4f(x, y, z, 1.0F);
+}
+
+void GLAPIENTRY
+_mesa_WindowPos4dMESA(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
+{
+   window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
+}
+
+void GLAPIENTRY
+_mesa_WindowPos4fMESA(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   window_pos4f(x, y, z, w);
+}
+
+void GLAPIENTRY
+_mesa_WindowPos4iMESA(GLint x, GLint y, GLint z, GLint w)
+{
+   window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
+}
+
+void GLAPIENTRY
+_mesa_WindowPos4sMESA(GLshort x, GLshort y, GLshort z, GLshort w)
+{
+   window_pos4f(x, y, z, w);
+}
+
+void GLAPIENTRY
+_mesa_WindowPos2dvMESA(const GLdouble *v)
+{
+   window_pos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);
+}
+
+void GLAPIENTRY
+_mesa_WindowPos2fvMESA(const GLfloat *v)
+{
+   window_pos4f(v[0], v[1], 0.0F, 1.0F);
+}
+
+void GLAPIENTRY
+_mesa_WindowPos2ivMESA(const GLint *v)
+{
+   window_pos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);
+}
+
+void GLAPIENTRY
+_mesa_WindowPos2svMESA(const GLshort *v)
+{
+   window_pos4f(v[0], v[1], 0.0F, 1.0F);
+}
+
+void GLAPIENTRY
+_mesa_WindowPos3dvMESA(const GLdouble *v)
+{
+   window_pos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);
+}
+
+void GLAPIENTRY
+_mesa_WindowPos3fvMESA(const GLfloat *v)
+{
+   window_pos4f(v[0], v[1], v[2], 1.0);
+}
+
+void GLAPIENTRY
+_mesa_WindowPos3ivMESA(const GLint *v)
+{
+   window_pos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);
+}
+
+void GLAPIENTRY
+_mesa_WindowPos3svMESA(const GLshort *v)
+{
+   window_pos4f(v[0], v[1], v[2], 1.0F);
+}
+
+void GLAPIENTRY
+_mesa_WindowPos4dvMESA(const GLdouble *v)
+{
+   window_pos4f((GLfloat) v[0], (GLfloat) v[1], 
+			 (GLfloat) v[2], (GLfloat) v[3]);
+}
+
+void GLAPIENTRY
+_mesa_WindowPos4fvMESA(const GLfloat *v)
+{
+   window_pos4f(v[0], v[1], v[2], v[3]);
+}
+
+void GLAPIENTRY
+_mesa_WindowPos4ivMESA(const GLint *v)
+{
+   window_pos4f((GLfloat) v[0], (GLfloat) v[1], 
+			 (GLfloat) v[2], (GLfloat) v[3]);
+}
+
+void GLAPIENTRY
+_mesa_WindowPos4svMESA(const GLshort *v)
+{
+   window_pos4f(v[0], v[1], v[2], v[3]);
+}
+
+#endif
+
+#if 0
+
+/*
+ * OpenGL implementation of glWindowPos*MESA()
+ */
+void glWindowPos4fMESA( GLfloat x, GLfloat y, GLfloat z, GLfloat w )
+{
+   GLfloat fx, fy;
+
+   /* Push current matrix mode and viewport attributes */
+   glPushAttrib( GL_TRANSFORM_BIT | GL_VIEWPORT_BIT );
+
+   /* Setup projection parameters */
+   glMatrixMode( GL_PROJECTION );
+   glPushMatrix();
+   glLoadIdentity();
+   glMatrixMode( GL_MODELVIEW );
+   glPushMatrix();
+   glLoadIdentity();
+
+   glDepthRange( z, z );
+   glViewport( (int) x - 1, (int) y - 1, 2, 2 );
+
+   /* set the raster (window) position */
+   fx = x - (int) x;
+   fy = y - (int) y;
+   glRasterPos4f( fx, fy, 0.0, w );
+
+   /* restore matrices, viewport and matrix mode */
+   glPopMatrix();
+   glMatrixMode( GL_PROJECTION );
+   glPopMatrix();
+
+   glPopAttrib();
+}
+
+#endif
+
+
+/**********************************************************************/
+/** \name Initialization                                              */
+/**********************************************************************/
+/*@{*/
+
+/**
+ * Initialize the context current raster position information.
+ *
+ * \param ctx GL context.
+ *
+ * Initialize the current raster position information in
+ * __GLcontextRec::Current, and adds the extension entry points to the
+ * dispatcher.
+ */
+void _mesa_init_rastpos( GLcontext * ctx )
+{
+   int i;
+
+   ASSIGN_4V( ctx->Current.RasterPos, 0.0, 0.0, 0.0, 1.0 );
+   ctx->Current.RasterDistance = 0.0;
+   ASSIGN_4V( ctx->Current.RasterColor, 1.0, 1.0, 1.0, 1.0 );
+   ctx->Current.RasterIndex = 1.0;
+   for (i=0; i<MAX_TEXTURE_UNITS; i++)
+      ASSIGN_4V( ctx->Current.RasterTexCoords[i], 0.0, 0.0, 0.0, 1.0 );
+   ctx->Current.RasterPosValid = GL_TRUE;
+
+  /*
+    * For XFree86/DRI: tell libGL to add these functions to the dispatcher.
+    * Basically, we should add all extension functions above offset 577.
+    * This enables older libGL libraries to work with newer drivers that
+    * have newer extensions.
+    */
+   /* GL_ARB_window_pos aliases with GL_MESA_window_pos */
+   _glapi_add_entrypoint("glWindowPos2dARB", 513);
+   _glapi_add_entrypoint("glWindowPos2dvARB", 514);
+   _glapi_add_entrypoint("glWindowPos2fARB", 515);
+   _glapi_add_entrypoint("glWindowPos2fvARB", 516);
+   _glapi_add_entrypoint("glWindowPos2iARB", 517);
+   _glapi_add_entrypoint("glWindowPos2ivARB", 518);
+   _glapi_add_entrypoint("glWindowPos2sARB", 519);
+   _glapi_add_entrypoint("glWindowPos2svARB", 520);
+   _glapi_add_entrypoint("glWindowPos3dARB", 521);
+   _glapi_add_entrypoint("glWindowPos3dvARB", 522);
+   _glapi_add_entrypoint("glWindowPos3fARB", 523);
+   _glapi_add_entrypoint("glWindowPos3fvARB", 524);
+   _glapi_add_entrypoint("glWindowPos3iARB", 525);
+   _glapi_add_entrypoint("glWindowPos3ivARB", 526);
+   _glapi_add_entrypoint("glWindowPos3sARB", 527);
+   _glapi_add_entrypoint("glWindowPos3svARB", 528);
+}
+
+/*@}*/
diff --git a/reactos/lib/mesa32/src/main/rastpos.h b/reactos/lib/mesa32/src/main/rastpos.h
new file mode 100644
index 00000000000..363f86ad87b
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/rastpos.h
@@ -0,0 +1,193 @@
+/**
+ * \file rastpos.h
+ * Raster position operations.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef RASTPOS_H
+#define RASTPOS_H
+
+
+#include "glheader.h"
+
+
+extern void GLAPIENTRY
+_mesa_RasterPos2d(GLdouble x, GLdouble y);
+
+extern void GLAPIENTRY
+_mesa_RasterPos2f(GLfloat x, GLfloat y);
+
+extern void GLAPIENTRY
+_mesa_RasterPos2i(GLint x, GLint y);
+
+extern void GLAPIENTRY
+_mesa_RasterPos2s(GLshort x, GLshort y);
+
+extern void GLAPIENTRY
+_mesa_RasterPos3d(GLdouble x, GLdouble y, GLdouble z);
+
+extern void GLAPIENTRY
+_mesa_RasterPos3f(GLfloat x, GLfloat y, GLfloat z);
+
+extern void GLAPIENTRY
+_mesa_RasterPos3i(GLint x, GLint y, GLint z);
+
+extern void GLAPIENTRY
+_mesa_RasterPos3s(GLshort x, GLshort y, GLshort z);
+
+extern void GLAPIENTRY
+_mesa_RasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+
+extern void GLAPIENTRY
+_mesa_RasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+
+extern void GLAPIENTRY
+_mesa_RasterPos4i(GLint x, GLint y, GLint z, GLint w);
+
+extern void GLAPIENTRY
+_mesa_RasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w);
+
+extern void GLAPIENTRY
+_mesa_RasterPos2dv(const GLdouble *v);
+
+extern void GLAPIENTRY
+_mesa_RasterPos2fv(const GLfloat *v);
+
+extern void GLAPIENTRY
+_mesa_RasterPos2iv(const GLint *v);
+
+extern void GLAPIENTRY
+_mesa_RasterPos2sv(const GLshort *v);
+
+extern void GLAPIENTRY
+_mesa_RasterPos3dv(const GLdouble *v);
+
+extern void GLAPIENTRY
+_mesa_RasterPos3fv(const GLfloat *v);
+
+extern void GLAPIENTRY
+_mesa_RasterPos3iv(const GLint *v);
+
+extern void GLAPIENTRY
+_mesa_RasterPos3sv(const GLshort *v);
+
+extern void GLAPIENTRY
+_mesa_RasterPos4dv(const GLdouble *v);
+
+extern void GLAPIENTRY
+_mesa_RasterPos4fv(const GLfloat *v);
+
+extern void GLAPIENTRY
+_mesa_RasterPos4iv(const GLint *v);
+
+extern void GLAPIENTRY
+_mesa_RasterPos4sv(const GLshort *v);
+
+
+/**********************************************************************/
+/** \name GL_MESA_window_pos                                          */
+/**********************************************************************/
+/*@{*/
+
+extern void GLAPIENTRY
+_mesa_WindowPos2dMESA(GLdouble x, GLdouble y);
+
+extern void GLAPIENTRY
+_mesa_WindowPos2fMESA(GLfloat x, GLfloat y);
+
+extern void GLAPIENTRY
+_mesa_WindowPos2iMESA(GLint x, GLint y);
+
+extern void GLAPIENTRY
+_mesa_WindowPos2sMESA(GLshort x, GLshort y);
+
+extern void GLAPIENTRY
+_mesa_WindowPos3dMESA(GLdouble x, GLdouble y, GLdouble z);
+
+extern void GLAPIENTRY
+_mesa_WindowPos3fMESA(GLfloat x, GLfloat y, GLfloat z);
+
+extern void GLAPIENTRY
+_mesa_WindowPos3iMESA(GLint x, GLint y, GLint z);
+
+extern void GLAPIENTRY
+_mesa_WindowPos3sMESA(GLshort x, GLshort y, GLshort z);
+
+extern void GLAPIENTRY
+_mesa_WindowPos4dMESA(GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+
+extern void GLAPIENTRY
+_mesa_WindowPos4fMESA(GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+
+extern void GLAPIENTRY
+_mesa_WindowPos4iMESA(GLint x, GLint y, GLint z, GLint w);
+
+extern void GLAPIENTRY
+_mesa_WindowPos4sMESA(GLshort x, GLshort y, GLshort z, GLshort w);
+
+extern void GLAPIENTRY
+_mesa_WindowPos2dvMESA(const GLdouble *v);
+
+extern void GLAPIENTRY
+_mesa_WindowPos2fvMESA(const GLfloat *v);
+
+extern void GLAPIENTRY
+_mesa_WindowPos2ivMESA(const GLint *v);
+
+extern void GLAPIENTRY
+_mesa_WindowPos2svMESA(const GLshort *v);
+
+extern void GLAPIENTRY
+_mesa_WindowPos3dvMESA(const GLdouble *v);
+
+extern void GLAPIENTRY
+_mesa_WindowPos3fvMESA(const GLfloat *v);
+
+extern void GLAPIENTRY
+_mesa_WindowPos3ivMESA(const GLint *v);
+
+extern void GLAPIENTRY
+_mesa_WindowPos3svMESA(const GLshort *v);
+
+extern void GLAPIENTRY
+_mesa_WindowPos4dvMESA(const GLdouble *v);
+
+extern void GLAPIENTRY
+_mesa_WindowPos4fvMESA(const GLfloat *v);
+
+extern void GLAPIENTRY
+_mesa_WindowPos4ivMESA(const GLint *v);
+
+extern void GLAPIENTRY
+_mesa_WindowPos4svMESA(const GLshort *v);
+
+extern void 
+_mesa_init_rastpos( GLcontext * ctx );
+
+/*@}*/
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/simple_list.h b/reactos/lib/mesa32/src/main/simple_list.h
new file mode 100644
index 00000000000..63475f6f740
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/simple_list.h
@@ -0,0 +1,197 @@
+/**
+ * \file simple_list.h
+ * Simple macros for type-safe, intrusive lists.
+ *
+ *  Intended to work with a list sentinal which is created as an empty
+ *  list.  Insert & delete are O(1).
+ *  
+ * \author
+ *  (C) 1997, Keith Whitwell
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef _SIMPLE_LIST_H
+#define _SIMPLE_LIST_H
+
+/**
+ * Remove an element from list.
+ *
+ * \param elem element to remove.
+ */
+#define remove_from_list(elem)			\
+do {						\
+   (elem)->next->prev = (elem)->prev;		\
+   (elem)->prev->next = (elem)->next;		\
+} while (0)
+
+/**
+ * Insert an element to the list head.
+ *
+ * \param list list.
+ * \param elem element to insert.
+ */
+#define insert_at_head(list, elem)		\
+do {						\
+   (elem)->prev = list;				\
+   (elem)->next = (list)->next;			\
+   (list)->next->prev = elem;			\
+   (list)->next = elem;				\
+} while(0)
+
+/**
+ * Insert an element to the list tail.
+ *
+ * \param list list.
+ * \param elem element to insert.
+ */
+#define insert_at_tail(list, elem)		\
+do {						\
+   (elem)->next = list;				\
+   (elem)->prev = (list)->prev;			\
+   (list)->prev->next = elem;			\
+   (list)->prev = elem;				\
+} while(0)
+
+/**
+ * Move an element to the list head.
+ *
+ * \param list list.
+ * \param elem element to move.
+ */
+#define move_to_head(list, elem)		\
+do {						\
+   remove_from_list(elem);			\
+   insert_at_head(list, elem);			\
+} while (0)
+
+/**
+ * Move an element to the list tail.
+ *
+ * \param list list.
+ * \param elem element to move.
+ */
+#define move_to_tail(list, elem)		\
+do {						\
+   remove_from_list(elem);			\
+   insert_at_tail(list, elem);			\
+} while (0)
+
+/**
+ * Make a empty list empty.
+ *
+ * \param sentinal list (sentinal element).
+ */
+#define make_empty_list(sentinal)		\
+do {						\
+   (sentinal)->next = sentinal;			\
+   (sentinal)->prev = sentinal;			\
+} while (0)
+
+/**
+ * Get list first element.
+ *
+ * \param list list.
+ *
+ * \return pointer to first element.
+ */
+#define first_elem(list)       ((list)->next)
+
+/**
+ * Get list last element.
+ *
+ * \param list list.
+ *
+ * \return pointer to last element.
+ */
+#define last_elem(list)        ((list)->prev)
+
+/**
+ * Get next element.
+ *
+ * \param elem element.
+ *
+ * \return pointer to next element.
+ */
+#define next_elem(elem)        ((elem)->next)
+
+/**
+ * Get previous element.
+ *
+ * \param elem element.
+ *
+ * \return pointer to previous element.
+ */
+#define prev_elem(elem)        ((elem)->prev)
+
+/**
+ * Test whether element is at end of the list.
+ * 
+ * \param list list.
+ * \param elem element.
+ * 
+ * \return non-zero if element is at end of list, or zero otherwise.
+ */
+#define at_end(list, elem)     ((elem) == (list))
+
+/**
+ * Test if a list is empty.
+ * 
+ * \param list list.
+ * 
+ * \return non-zero if list empty, or zero otherwise.
+ */
+#define is_empty_list(list)    ((list)->next == (list))
+
+/**
+ * Walk through the elements of a list.
+ *
+ * \param ptr pointer to the current element.
+ * \param list list.
+ *
+ * \note It should be followed by a { } block or a single statement, as in a \c
+ * for loop.
+ */
+#define foreach(ptr, list)     \
+        for( ptr=(list)->next ;  ptr!=list ;  ptr=(ptr)->next )
+
+/**
+ * Walk through the elements of a list.
+ *
+ * Same as #foreach but lets you unlink the current value during a list
+ * traversal.  Useful for freeing a list, element by element.
+ * 
+ * \param ptr pointer to the current element.
+ * \param t temporary pointer.
+ * \param list list.
+ *
+ * \note It should be followed by a { } block or a single statement, as in a \c
+ * for loop.
+ */
+#define foreach_s(ptr, t, list)   \
+        for(ptr=(list)->next,t=(ptr)->next; list != ptr; ptr=t, t=(t)->next)
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/state.c b/reactos/lib/mesa32/src/main/state.c
new file mode 100644
index 00000000000..2f65024a6f2
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/state.c
@@ -0,0 +1,935 @@
+/**
+ * \file state.c
+ * State management.
+ * 
+ * This file manages recalculation of derived values in the __GLcontextRec.
+ * Also, this is where we initialize the API dispatch table.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "accum.h"
+#include "api_loopback.h"
+#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
+#include "arbprogram.h"
+#endif
+#include "attrib.h"
+#include "blend.h"
+#if FEATURE_ARB_vertex_buffer_object
+#include "bufferobj.h"
+#endif
+#include "buffers.h"
+#include "clip.h"
+#include "colortab.h"
+#include "context.h"
+#include "convolve.h"
+#include "depth.h"
+#include "dlist.h"
+#include "drawpix.h"
+#include "enable.h"
+#include "eval.h"
+#include "get.h"
+#include "feedback.h"
+#include "fog.h"
+#include "hint.h"
+#include "histogram.h"
+#include "imports.h"
+#include "light.h"
+#include "lines.h"
+#include "macros.h"
+#include "matrix.h"
+#if FEATURE_ARB_occlusion_query
+#include "occlude.h"
+#endif
+#include "pixel.h"
+#include "points.h"
+#include "polygon.h"
+#include "rastpos.h"
+#include "state.h"
+#include "stencil.h"
+#include "teximage.h"
+#include "texobj.h"
+#include "texstate.h"
+#include "mtypes.h"
+#include "varray.h"
+#if FEATURE_NV_vertex_program
+#include "nvprogram.h"
+#endif
+#if FEATURE_NV_fragment_program
+#include "nvfragprog.h"
+#include "nvprogram.h"
+#include "program.h"
+#endif
+#include "debug.h"
+
+/* #include "math/m_matrix.h" */
+/* #include "math/m_xform.h" */
+
+
+/**********************************************************************/
+/** \name Dispatch table setup */
+/*@{*/
+
+/**
+ * Generic no-op dispatch function.
+ *
+ * Used in replacement of the functions which are not part of Mesa subset.
+ *
+ * Displays a message.
+ */
+static int
+generic_noop(void)
+{
+   _mesa_problem(NULL, "User called no-op dispatch function (not part of Mesa subset?)");
+   return 0;
+}
+
+
+/**
+ * Set all pointers in the given dispatch table to point to a
+ * generic no-op function - generic_noop().
+ *
+ * \param table dispatch table.
+ * \param tableSize dispatch table size.
+ */
+void
+_mesa_init_no_op_table(struct _glapi_table *table, GLuint tableSize)
+{
+   GLuint i;
+   void **dispatch = (void **) table;
+   for (i = 0; i < tableSize; i++) {
+      dispatch[i] = (void *) generic_noop;
+   }
+}
+
+
+/**
+ * Initialize a dispatch table with pointers to Mesa's immediate-mode
+ * commands.
+ *
+ * Pointers to glBegin()/glEnd() object commands and a few others
+ * are provided via the GLvertexformat interface.
+ *
+ * \param exec dispatch table.
+ * \param tableSize dispatch table size.
+ */
+void
+_mesa_init_exec_table(struct _glapi_table *exec, GLuint tableSize)
+{
+   /* first initialize all dispatch slots to no-op */
+   _mesa_init_no_op_table(exec, tableSize);
+
+#if _HAVE_FULL_GL
+   _mesa_loopback_init_api_table( exec );
+#endif
+
+   /* load the dispatch slots we understand */
+   exec->AlphaFunc = _mesa_AlphaFunc;
+   exec->BlendFunc = _mesa_BlendFunc;
+   exec->Clear = _mesa_Clear;
+   exec->ClearColor = _mesa_ClearColor;
+   exec->ClearStencil = _mesa_ClearStencil;
+   exec->ColorMask = _mesa_ColorMask;
+   exec->CullFace = _mesa_CullFace;
+   exec->Disable = _mesa_Disable;
+   exec->DrawBuffer = _mesa_DrawBuffer;
+   exec->Enable = _mesa_Enable;
+   exec->Finish = _mesa_Finish;
+   exec->Flush = _mesa_Flush;
+   exec->FrontFace = _mesa_FrontFace;
+   exec->Frustum = _mesa_Frustum;
+   exec->GetError = _mesa_GetError;
+   exec->GetFloatv = _mesa_GetFloatv;
+   exec->GetString = _mesa_GetString;
+   exec->InitNames = _mesa_InitNames;
+   exec->LineStipple = _mesa_LineStipple;
+   exec->LineWidth = _mesa_LineWidth;
+   exec->LoadIdentity = _mesa_LoadIdentity;
+   exec->LoadMatrixf = _mesa_LoadMatrixf;
+   exec->LoadName = _mesa_LoadName;
+   exec->LogicOp = _mesa_LogicOp;
+   exec->MatrixMode = _mesa_MatrixMode;
+   exec->MultMatrixf = _mesa_MultMatrixf;
+   exec->Ortho = _mesa_Ortho;
+   exec->PixelStorei = _mesa_PixelStorei;
+   exec->PopMatrix = _mesa_PopMatrix;
+   exec->PopName = _mesa_PopName;
+   exec->PushMatrix = _mesa_PushMatrix;
+   exec->PushName = _mesa_PushName;
+   exec->RasterPos2f = _mesa_RasterPos2f;
+   exec->RasterPos2fv = _mesa_RasterPos2fv;
+   exec->RasterPos2i = _mesa_RasterPos2i;
+   exec->RasterPos2iv = _mesa_RasterPos2iv;
+   exec->ReadBuffer = _mesa_ReadBuffer;
+   exec->RenderMode = _mesa_RenderMode;
+   exec->Rotatef = _mesa_Rotatef;
+   exec->Scalef = _mesa_Scalef;
+   exec->Scissor = _mesa_Scissor;
+   exec->SelectBuffer = _mesa_SelectBuffer;
+   exec->ShadeModel = _mesa_ShadeModel;
+   exec->StencilFunc = _mesa_StencilFunc;
+   exec->StencilMask = _mesa_StencilMask;
+   exec->StencilOp = _mesa_StencilOp;
+   exec->TexEnvfv = _mesa_TexEnvfv;
+   exec->TexEnvi = _mesa_TexEnvi;
+   exec->TexImage2D = _mesa_TexImage2D;
+   exec->TexParameteri = _mesa_TexParameteri; 
+   exec->Translatef = _mesa_Translatef;
+   exec->Viewport = _mesa_Viewport;
+#if _HAVE_FULL_GL
+   exec->Accum = _mesa_Accum;
+   exec->Bitmap = _mesa_Bitmap;
+   exec->CallList = _mesa_CallList;
+   exec->CallLists = _mesa_CallLists;
+   exec->ClearAccum = _mesa_ClearAccum;
+   exec->ClearDepth = _mesa_ClearDepth;
+   exec->ClearIndex = _mesa_ClearIndex;
+   exec->ClipPlane = _mesa_ClipPlane;
+   exec->ColorMaterial = _mesa_ColorMaterial;
+   exec->CopyPixels = _mesa_CopyPixels;
+   exec->DeleteLists = _mesa_DeleteLists;
+   exec->DepthFunc = _mesa_DepthFunc;
+   exec->DepthMask = _mesa_DepthMask;
+   exec->DepthRange = _mesa_DepthRange;
+   exec->DrawPixels = _mesa_DrawPixels;
+   exec->EndList = _mesa_EndList;
+   exec->FeedbackBuffer = _mesa_FeedbackBuffer;
+   exec->FogCoordPointerEXT = _mesa_FogCoordPointerEXT;
+   exec->Fogf = _mesa_Fogf;
+   exec->Fogfv = _mesa_Fogfv;
+   exec->Fogi = _mesa_Fogi;
+   exec->Fogiv = _mesa_Fogiv;
+   exec->GenLists = _mesa_GenLists;
+   exec->GetClipPlane = _mesa_GetClipPlane;
+   exec->GetBooleanv = _mesa_GetBooleanv;
+   exec->GetDoublev = _mesa_GetDoublev;
+   exec->GetIntegerv = _mesa_GetIntegerv;
+   exec->GetLightfv = _mesa_GetLightfv;
+   exec->GetLightiv = _mesa_GetLightiv;
+   exec->GetMapdv = _mesa_GetMapdv;
+   exec->GetMapfv = _mesa_GetMapfv;
+   exec->GetMapiv = _mesa_GetMapiv;
+   exec->GetMaterialfv = _mesa_GetMaterialfv;
+   exec->GetMaterialiv = _mesa_GetMaterialiv;
+   exec->GetPixelMapfv = _mesa_GetPixelMapfv;
+   exec->GetPixelMapuiv = _mesa_GetPixelMapuiv;
+   exec->GetPixelMapusv = _mesa_GetPixelMapusv;
+   exec->GetPolygonStipple = _mesa_GetPolygonStipple;
+   exec->GetTexEnvfv = _mesa_GetTexEnvfv;
+   exec->GetTexEnviv = _mesa_GetTexEnviv;
+   exec->GetTexLevelParameterfv = _mesa_GetTexLevelParameterfv;
+   exec->GetTexLevelParameteriv = _mesa_GetTexLevelParameteriv;
+   exec->GetTexParameterfv = _mesa_GetTexParameterfv;
+   exec->GetTexParameteriv = _mesa_GetTexParameteriv;
+   exec->GetTexGendv = _mesa_GetTexGendv;
+   exec->GetTexGenfv = _mesa_GetTexGenfv;
+   exec->GetTexGeniv = _mesa_GetTexGeniv;
+   exec->GetTexImage = _mesa_GetTexImage;
+   exec->Hint = _mesa_Hint;
+   exec->IndexMask = _mesa_IndexMask;
+   exec->IsEnabled = _mesa_IsEnabled;
+   exec->IsList = _mesa_IsList;
+   exec->LightModelf = _mesa_LightModelf;
+   exec->LightModelfv = _mesa_LightModelfv;
+   exec->LightModeli = _mesa_LightModeli;
+   exec->LightModeliv = _mesa_LightModeliv;
+   exec->Lightf = _mesa_Lightf;
+   exec->Lightfv = _mesa_Lightfv;
+   exec->Lighti = _mesa_Lighti;
+   exec->Lightiv = _mesa_Lightiv;
+   exec->ListBase = _mesa_ListBase;
+   exec->LoadMatrixd = _mesa_LoadMatrixd;
+   exec->Map1d = _mesa_Map1d;
+   exec->Map1f = _mesa_Map1f;
+   exec->Map2d = _mesa_Map2d;
+   exec->Map2f = _mesa_Map2f;
+   exec->MapGrid1d = _mesa_MapGrid1d;
+   exec->MapGrid1f = _mesa_MapGrid1f;
+   exec->MapGrid2d = _mesa_MapGrid2d;
+   exec->MapGrid2f = _mesa_MapGrid2f;
+   exec->MultMatrixd = _mesa_MultMatrixd;
+   exec->NewList = _mesa_NewList;
+   exec->PassThrough = _mesa_PassThrough;
+   exec->PixelMapfv = _mesa_PixelMapfv;
+   exec->PixelMapuiv = _mesa_PixelMapuiv;
+   exec->PixelMapusv = _mesa_PixelMapusv;
+   exec->PixelStoref = _mesa_PixelStoref;
+   exec->PixelTransferf = _mesa_PixelTransferf;
+   exec->PixelTransferi = _mesa_PixelTransferi;
+   exec->PixelZoom = _mesa_PixelZoom;
+   exec->PointSize = _mesa_PointSize;
+   exec->PolygonMode = _mesa_PolygonMode;
+   exec->PolygonOffset = _mesa_PolygonOffset;
+   exec->PolygonStipple = _mesa_PolygonStipple;
+   exec->PopAttrib = _mesa_PopAttrib;
+   exec->PushAttrib = _mesa_PushAttrib;
+   exec->RasterPos2d = _mesa_RasterPos2d;
+   exec->RasterPos2dv = _mesa_RasterPos2dv;
+   exec->RasterPos2s = _mesa_RasterPos2s;
+   exec->RasterPos2sv = _mesa_RasterPos2sv;
+   exec->RasterPos3d = _mesa_RasterPos3d;
+   exec->RasterPos3dv = _mesa_RasterPos3dv;
+   exec->RasterPos3f = _mesa_RasterPos3f;
+   exec->RasterPos3fv = _mesa_RasterPos3fv;
+   exec->RasterPos3i = _mesa_RasterPos3i;
+   exec->RasterPos3iv = _mesa_RasterPos3iv;
+   exec->RasterPos3s = _mesa_RasterPos3s;
+   exec->RasterPos3sv = _mesa_RasterPos3sv;
+   exec->RasterPos4d = _mesa_RasterPos4d;
+   exec->RasterPos4dv = _mesa_RasterPos4dv;
+   exec->RasterPos4f = _mesa_RasterPos4f;
+   exec->RasterPos4fv = _mesa_RasterPos4fv;
+   exec->RasterPos4i = _mesa_RasterPos4i;
+   exec->RasterPos4iv = _mesa_RasterPos4iv;
+   exec->RasterPos4s = _mesa_RasterPos4s;
+   exec->RasterPos4sv = _mesa_RasterPos4sv;
+   exec->ReadPixels = _mesa_ReadPixels;
+   exec->Rotated = _mesa_Rotated;
+   exec->Scaled = _mesa_Scaled;
+   exec->SecondaryColorPointerEXT = _mesa_SecondaryColorPointerEXT;
+   exec->TexEnvf = _mesa_TexEnvf;
+   exec->TexEnviv = _mesa_TexEnviv;
+   exec->TexGend = _mesa_TexGend;
+   exec->TexGendv = _mesa_TexGendv;
+   exec->TexGenf = _mesa_TexGenf;
+   exec->TexGenfv = _mesa_TexGenfv;
+   exec->TexGeni = _mesa_TexGeni;
+   exec->TexGeniv = _mesa_TexGeniv;
+   exec->TexImage1D = _mesa_TexImage1D;
+   exec->TexParameterf = _mesa_TexParameterf;
+   exec->TexParameterfv = _mesa_TexParameterfv;
+   exec->TexParameteriv = _mesa_TexParameteriv;
+   exec->Translated = _mesa_Translated;
+#endif
+
+   /* 1.1 */
+   exec->BindTexture = _mesa_BindTexture;
+   exec->DeleteTextures = _mesa_DeleteTextures;
+   exec->GenTextures = _mesa_GenTextures;
+#if _HAVE_FULL_GL
+   exec->AreTexturesResident = _mesa_AreTexturesResident;
+   exec->AreTexturesResidentEXT = _mesa_AreTexturesResident;
+   exec->ColorPointer = _mesa_ColorPointer;
+   exec->CopyTexImage1D = _mesa_CopyTexImage1D;
+   exec->CopyTexImage2D = _mesa_CopyTexImage2D;
+   exec->CopyTexSubImage1D = _mesa_CopyTexSubImage1D;
+   exec->CopyTexSubImage2D = _mesa_CopyTexSubImage2D;
+   exec->DisableClientState = _mesa_DisableClientState;
+   exec->EdgeFlagPointer = _mesa_EdgeFlagPointer;
+   exec->EnableClientState = _mesa_EnableClientState;
+   exec->GenTexturesEXT = _mesa_GenTextures;
+   exec->GetPointerv = _mesa_GetPointerv;
+   exec->IndexPointer = _mesa_IndexPointer;
+   exec->InterleavedArrays = _mesa_InterleavedArrays;
+   exec->IsTexture = _mesa_IsTexture;
+   exec->IsTextureEXT = _mesa_IsTexture;
+   exec->NormalPointer = _mesa_NormalPointer;
+   exec->PopClientAttrib = _mesa_PopClientAttrib;
+   exec->PrioritizeTextures = _mesa_PrioritizeTextures;
+   exec->PushClientAttrib = _mesa_PushClientAttrib;
+   exec->TexCoordPointer = _mesa_TexCoordPointer;
+   exec->TexSubImage1D = _mesa_TexSubImage1D;
+   exec->TexSubImage2D = _mesa_TexSubImage2D;
+   exec->VertexPointer = _mesa_VertexPointer;
+#endif
+
+   /* 1.2 */
+#if _HAVE_FULL_GL
+   exec->CopyTexSubImage3D = _mesa_CopyTexSubImage3D;
+   exec->TexImage3D = _mesa_TexImage3D;
+   exec->TexSubImage3D = _mesa_TexSubImage3D;
+#endif
+
+   /* OpenGL 1.2  GL_ARB_imaging */
+#if _HAVE_FULL_GL
+   exec->BlendColor = _mesa_BlendColor;
+   exec->BlendEquation = _mesa_BlendEquation;
+   exec->ColorSubTable = _mesa_ColorSubTable;
+   exec->ColorTable = _mesa_ColorTable;
+   exec->ColorTableParameterfv = _mesa_ColorTableParameterfv;
+   exec->ColorTableParameteriv = _mesa_ColorTableParameteriv;
+   exec->ConvolutionFilter1D = _mesa_ConvolutionFilter1D;
+   exec->ConvolutionFilter2D = _mesa_ConvolutionFilter2D;
+   exec->ConvolutionParameterf = _mesa_ConvolutionParameterf;
+   exec->ConvolutionParameterfv = _mesa_ConvolutionParameterfv;
+   exec->ConvolutionParameteri = _mesa_ConvolutionParameteri;
+   exec->ConvolutionParameteriv = _mesa_ConvolutionParameteriv;
+   exec->CopyColorSubTable = _mesa_CopyColorSubTable;
+   exec->CopyColorTable = _mesa_CopyColorTable;
+   exec->CopyConvolutionFilter1D = _mesa_CopyConvolutionFilter1D;
+   exec->CopyConvolutionFilter2D = _mesa_CopyConvolutionFilter2D;
+   exec->GetColorTable = _mesa_GetColorTable;
+   exec->GetColorTableEXT = _mesa_GetColorTable;
+   exec->GetColorTableParameterfv = _mesa_GetColorTableParameterfv;
+   exec->GetColorTableParameterfvEXT = _mesa_GetColorTableParameterfv;
+   exec->GetColorTableParameteriv = _mesa_GetColorTableParameteriv;
+   exec->GetColorTableParameterivEXT = _mesa_GetColorTableParameteriv;
+   exec->GetConvolutionFilter = _mesa_GetConvolutionFilter;
+   exec->GetConvolutionFilterEXT = _mesa_GetConvolutionFilter;
+   exec->GetConvolutionParameterfv = _mesa_GetConvolutionParameterfv;
+   exec->GetConvolutionParameterfvEXT = _mesa_GetConvolutionParameterfv;
+   exec->GetConvolutionParameteriv = _mesa_GetConvolutionParameteriv;
+   exec->GetConvolutionParameterivEXT = _mesa_GetConvolutionParameteriv;
+   exec->GetHistogram = _mesa_GetHistogram;
+   exec->GetHistogramEXT = _mesa_GetHistogram;
+   exec->GetHistogramParameterfv = _mesa_GetHistogramParameterfv;
+   exec->GetHistogramParameterfvEXT = _mesa_GetHistogramParameterfv;
+   exec->GetHistogramParameteriv = _mesa_GetHistogramParameteriv;
+   exec->GetHistogramParameterivEXT = _mesa_GetHistogramParameteriv;
+   exec->GetMinmax = _mesa_GetMinmax;
+   exec->GetMinmaxEXT = _mesa_GetMinmax;
+   exec->GetMinmaxParameterfv = _mesa_GetMinmaxParameterfv;
+   exec->GetMinmaxParameterfvEXT = _mesa_GetMinmaxParameterfv;
+   exec->GetMinmaxParameteriv = _mesa_GetMinmaxParameteriv;
+   exec->GetMinmaxParameterivEXT = _mesa_GetMinmaxParameteriv;
+   exec->GetSeparableFilter = _mesa_GetSeparableFilter;
+   exec->GetSeparableFilterEXT = _mesa_GetSeparableFilter;
+   exec->Histogram = _mesa_Histogram;
+   exec->Minmax = _mesa_Minmax;
+   exec->ResetHistogram = _mesa_ResetHistogram;
+   exec->ResetMinmax = _mesa_ResetMinmax;
+   exec->SeparableFilter2D = _mesa_SeparableFilter2D;
+#endif
+
+   /* 2. GL_EXT_blend_color */
+#if 0
+/*    exec->BlendColorEXT = _mesa_BlendColorEXT; */
+#endif
+
+   /* 3. GL_EXT_polygon_offset */
+#if _HAVE_FULL_GL
+   exec->PolygonOffsetEXT = _mesa_PolygonOffsetEXT;
+#endif
+
+   /* 6. GL_EXT_texture3d */
+#if 0
+/*    exec->CopyTexSubImage3DEXT = _mesa_CopyTexSubImage3D; */
+/*    exec->TexImage3DEXT = _mesa_TexImage3DEXT; */
+/*    exec->TexSubImage3DEXT = _mesa_TexSubImage3D; */
+#endif
+
+   /* 11. GL_EXT_histogram */
+#if _HAVE_FULL_GL
+   exec->GetHistogramEXT = _mesa_GetHistogram;
+   exec->GetHistogramParameterfvEXT = _mesa_GetHistogramParameterfv;
+   exec->GetHistogramParameterivEXT = _mesa_GetHistogramParameteriv;
+   exec->GetMinmaxEXT = _mesa_GetMinmax;
+   exec->GetMinmaxParameterfvEXT = _mesa_GetMinmaxParameterfv;
+   exec->GetMinmaxParameterivEXT = _mesa_GetMinmaxParameteriv;
+#endif
+
+   /* ?. GL_SGIX_pixel_texture */
+#if _HAVE_FULL_GL
+   exec->PixelTexGenSGIX = _mesa_PixelTexGenSGIX;
+#endif
+
+   /* 15. GL_SGIS_pixel_texture */
+#if _HAVE_FULL_GL
+   exec->PixelTexGenParameteriSGIS = _mesa_PixelTexGenParameteriSGIS;
+   exec->PixelTexGenParameterivSGIS = _mesa_PixelTexGenParameterivSGIS;
+   exec->PixelTexGenParameterfSGIS = _mesa_PixelTexGenParameterfSGIS;
+   exec->PixelTexGenParameterfvSGIS = _mesa_PixelTexGenParameterfvSGIS;
+   exec->GetPixelTexGenParameterivSGIS = _mesa_GetPixelTexGenParameterivSGIS;
+   exec->GetPixelTexGenParameterfvSGIS = _mesa_GetPixelTexGenParameterfvSGIS;
+#endif
+
+   /* 30. GL_EXT_vertex_array */
+#if _HAVE_FULL_GL
+   exec->ColorPointerEXT = _mesa_ColorPointerEXT;
+   exec->EdgeFlagPointerEXT = _mesa_EdgeFlagPointerEXT;
+   exec->IndexPointerEXT = _mesa_IndexPointerEXT;
+   exec->NormalPointerEXT = _mesa_NormalPointerEXT;
+   exec->TexCoordPointerEXT = _mesa_TexCoordPointerEXT;
+   exec->VertexPointerEXT = _mesa_VertexPointerEXT;
+#endif
+
+   /* 37. GL_EXT_blend_minmax */
+#if 0
+   exec->BlendEquationEXT = _mesa_BlendEquationEXT;
+#endif
+
+   /* 54. GL_EXT_point_parameters */
+#if _HAVE_FULL_GL
+   exec->PointParameterfEXT = _mesa_PointParameterfEXT;
+   exec->PointParameterfvEXT = _mesa_PointParameterfvEXT;
+#endif
+
+   /* 78. GL_EXT_paletted_texture */
+#if 0
+   exec->ColorTableEXT = _mesa_ColorTableEXT;
+   exec->ColorSubTableEXT = _mesa_ColorSubTableEXT;
+#endif
+#if _HAVE_FULL_GL
+   exec->GetColorTableEXT = _mesa_GetColorTable;
+   exec->GetColorTableParameterfvEXT = _mesa_GetColorTableParameterfv;
+   exec->GetColorTableParameterivEXT = _mesa_GetColorTableParameteriv;
+#endif
+
+   /* 97. GL_EXT_compiled_vertex_array */
+#if _HAVE_FULL_GL
+   exec->LockArraysEXT = _mesa_LockArraysEXT;
+   exec->UnlockArraysEXT = _mesa_UnlockArraysEXT;
+#endif
+
+   /* 148. GL_EXT_multi_draw_arrays */
+#if _HAVE_FULL_GL
+   exec->MultiDrawArraysEXT = _mesa_MultiDrawArraysEXT;
+   exec->MultiDrawElementsEXT = _mesa_MultiDrawElementsEXT;
+#endif
+
+   /* 173. GL_INGR_blend_func_separate */
+#if _HAVE_FULL_GL
+   exec->BlendFuncSeparateEXT = _mesa_BlendFuncSeparateEXT;
+#endif
+
+   /* 196. GL_MESA_resize_buffers */
+#if _HAVE_FULL_GL
+   exec->ResizeBuffersMESA = _mesa_ResizeBuffersMESA;
+#endif
+
+   /* 197. GL_MESA_window_pos */
+#if _HAVE_FULL_GL
+   exec->WindowPos2dMESA = _mesa_WindowPos2dMESA;
+   exec->WindowPos2dvMESA = _mesa_WindowPos2dvMESA;
+   exec->WindowPos2fMESA = _mesa_WindowPos2fMESA;
+   exec->WindowPos2fvMESA = _mesa_WindowPos2fvMESA;
+   exec->WindowPos2iMESA = _mesa_WindowPos2iMESA;
+   exec->WindowPos2ivMESA = _mesa_WindowPos2ivMESA;
+   exec->WindowPos2sMESA = _mesa_WindowPos2sMESA;
+   exec->WindowPos2svMESA = _mesa_WindowPos2svMESA;
+   exec->WindowPos3dMESA = _mesa_WindowPos3dMESA;
+   exec->WindowPos3dvMESA = _mesa_WindowPos3dvMESA;
+   exec->WindowPos3fMESA = _mesa_WindowPos3fMESA;
+   exec->WindowPos3fvMESA = _mesa_WindowPos3fvMESA;
+   exec->WindowPos3iMESA = _mesa_WindowPos3iMESA;
+   exec->WindowPos3ivMESA = _mesa_WindowPos3ivMESA;
+   exec->WindowPos3sMESA = _mesa_WindowPos3sMESA;
+   exec->WindowPos3svMESA = _mesa_WindowPos3svMESA;
+   exec->WindowPos4dMESA = _mesa_WindowPos4dMESA;
+   exec->WindowPos4dvMESA = _mesa_WindowPos4dvMESA;
+   exec->WindowPos4fMESA = _mesa_WindowPos4fMESA;
+   exec->WindowPos4fvMESA = _mesa_WindowPos4fvMESA;
+   exec->WindowPos4iMESA = _mesa_WindowPos4iMESA;
+   exec->WindowPos4ivMESA = _mesa_WindowPos4ivMESA;
+   exec->WindowPos4sMESA = _mesa_WindowPos4sMESA;
+   exec->WindowPos4svMESA = _mesa_WindowPos4svMESA;
+#endif
+
+   /* 200. GL_IBM_multimode_draw_arrays */
+#if _HAVE_FULL_GL
+   exec->MultiModeDrawArraysIBM = _mesa_MultiModeDrawArraysIBM;
+   exec->MultiModeDrawElementsIBM = _mesa_MultiModeDrawElementsIBM;
+#endif
+
+   /* 233. GL_NV_vertex_program */
+#if FEATURE_NV_vertex_program
+   exec->BindProgramNV = _mesa_BindProgram;
+   exec->DeleteProgramsNV = _mesa_DeletePrograms;
+   exec->ExecuteProgramNV = _mesa_ExecuteProgramNV;
+   exec->GenProgramsNV = _mesa_GenPrograms;
+   exec->AreProgramsResidentNV = _mesa_AreProgramsResidentNV;
+   exec->RequestResidentProgramsNV = _mesa_RequestResidentProgramsNV;
+   exec->GetProgramParameterfvNV = _mesa_GetProgramParameterfvNV;
+   exec->GetProgramParameterdvNV = _mesa_GetProgramParameterdvNV;
+   exec->GetProgramivNV = _mesa_GetProgramivNV;
+   exec->GetProgramStringNV = _mesa_GetProgramStringNV;
+   exec->GetTrackMatrixivNV = _mesa_GetTrackMatrixivNV;
+   exec->GetVertexAttribdvNV = _mesa_GetVertexAttribdvNV;
+   exec->GetVertexAttribfvNV = _mesa_GetVertexAttribfvNV;
+   exec->GetVertexAttribivNV = _mesa_GetVertexAttribivNV;
+   exec->GetVertexAttribPointervNV = _mesa_GetVertexAttribPointervNV;
+   exec->IsProgramNV = _mesa_IsProgram;
+   exec->LoadProgramNV = _mesa_LoadProgramNV;
+   exec->ProgramParameter4dNV = _mesa_ProgramParameter4dNV;
+   exec->ProgramParameter4dvNV = _mesa_ProgramParameter4dvNV;
+   exec->ProgramParameter4fNV = _mesa_ProgramParameter4fNV;
+   exec->ProgramParameter4fvNV = _mesa_ProgramParameter4fvNV;
+   exec->ProgramParameters4dvNV = _mesa_ProgramParameters4dvNV;
+   exec->ProgramParameters4fvNV = _mesa_ProgramParameters4fvNV;
+   exec->TrackMatrixNV = _mesa_TrackMatrixNV;
+   exec->VertexAttribPointerNV = _mesa_VertexAttribPointerNV;
+   /* glVertexAttrib*NV functions handled in api_loopback.c */
+#endif
+
+   /* 282. GL_NV_fragment_program */
+#if FEATURE_NV_fragment_program
+   exec->ProgramNamedParameter4fNV = _mesa_ProgramNamedParameter4fNV;
+   exec->ProgramNamedParameter4dNV = _mesa_ProgramNamedParameter4dNV;
+   exec->ProgramNamedParameter4fvNV = _mesa_ProgramNamedParameter4fvNV;
+   exec->ProgramNamedParameter4dvNV = _mesa_ProgramNamedParameter4dvNV;
+   exec->GetProgramNamedParameterfvNV = _mesa_GetProgramNamedParameterfvNV;
+   exec->GetProgramNamedParameterdvNV = _mesa_GetProgramNamedParameterdvNV;
+   exec->ProgramLocalParameter4dARB = _mesa_ProgramLocalParameter4dARB;
+   exec->ProgramLocalParameter4dvARB = _mesa_ProgramLocalParameter4dvARB;
+   exec->ProgramLocalParameter4fARB = _mesa_ProgramLocalParameter4fARB;
+   exec->ProgramLocalParameter4fvARB = _mesa_ProgramLocalParameter4fvARB;
+   exec->GetProgramLocalParameterdvARB = _mesa_GetProgramLocalParameterdvARB;
+   exec->GetProgramLocalParameterfvARB = _mesa_GetProgramLocalParameterfvARB;
+#endif
+
+   /* 262. GL_NV_point_sprite */
+#if _HAVE_FULL_GL
+   exec->PointParameteriNV = _mesa_PointParameteriNV;
+   exec->PointParameterivNV = _mesa_PointParameterivNV;
+#endif
+
+   /* 268. GL_EXT_stencil_two_side */
+#if _HAVE_FULL_GL
+   exec->ActiveStencilFaceEXT = _mesa_ActiveStencilFaceEXT;
+#endif
+
+   /* ???. GL_EXT_depth_bounds_test */
+   exec->DepthBoundsEXT = _mesa_DepthBoundsEXT;
+
+   /* ARB 1. GL_ARB_multitexture */
+#if _HAVE_FULL_GL
+   exec->ActiveTextureARB = _mesa_ActiveTextureARB;
+   exec->ClientActiveTextureARB = _mesa_ClientActiveTextureARB;
+#endif
+
+   /* ARB 3. GL_ARB_transpose_matrix */
+#if _HAVE_FULL_GL
+   exec->LoadTransposeMatrixdARB = _mesa_LoadTransposeMatrixdARB;
+   exec->LoadTransposeMatrixfARB = _mesa_LoadTransposeMatrixfARB;
+   exec->MultTransposeMatrixdARB = _mesa_MultTransposeMatrixdARB;
+   exec->MultTransposeMatrixfARB = _mesa_MultTransposeMatrixfARB;
+#endif
+
+   /* ARB 5. GL_ARB_multisample */
+#if _HAVE_FULL_GL
+   exec->SampleCoverageARB = _mesa_SampleCoverageARB;
+#endif
+
+   /* ARB 12. GL_ARB_texture_compression */
+#if _HAVE_FULL_GL
+   exec->CompressedTexImage3DARB = _mesa_CompressedTexImage3DARB;
+   exec->CompressedTexImage2DARB = _mesa_CompressedTexImage2DARB;
+   exec->CompressedTexImage1DARB = _mesa_CompressedTexImage1DARB;
+   exec->CompressedTexSubImage3DARB = _mesa_CompressedTexSubImage3DARB;
+   exec->CompressedTexSubImage2DARB = _mesa_CompressedTexSubImage2DARB;
+   exec->CompressedTexSubImage1DARB = _mesa_CompressedTexSubImage1DARB;
+   exec->GetCompressedTexImageARB = _mesa_GetCompressedTexImageARB;
+#endif
+
+   /* ARB 14. GL_ARB_point_parameters */
+   /* reuse EXT_point_parameters functions */
+
+   /* ARB 26. GL_ARB_vertex_program */
+   /* ARB 27. GL_ARB_fragment_program */
+#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
+   /* glVertexAttrib1sARB aliases glVertexAttrib1sNV */
+   /* glVertexAttrib1fARB aliases glVertexAttrib1fNV */
+   /* glVertexAttrib1dARB aliases glVertexAttrib1dNV */
+   /* glVertexAttrib2sARB aliases glVertexAttrib2sNV */
+   /* glVertexAttrib2fARB aliases glVertexAttrib2fNV */
+   /* glVertexAttrib2dARB aliases glVertexAttrib2dNV */
+   /* glVertexAttrib3sARB aliases glVertexAttrib3sNV */
+   /* glVertexAttrib3fARB aliases glVertexAttrib3fNV */
+   /* glVertexAttrib3dARB aliases glVertexAttrib3dNV */
+   /* glVertexAttrib4sARB aliases glVertexAttrib4sNV */
+   /* glVertexAttrib4fARB aliases glVertexAttrib4fNV */
+   /* glVertexAttrib4dARB aliases glVertexAttrib4dNV */
+   /* glVertexAttrib4NubARB aliases glVertexAttrib4NubNV */
+   /* glVertexAttrib1svARB aliases glVertexAttrib1svNV */
+   /* glVertexAttrib1fvARB aliases glVertexAttrib1fvNV */
+   /* glVertexAttrib1dvARB aliases glVertexAttrib1dvNV */
+   /* glVertexAttrib2svARB aliases glVertexAttrib2svNV */
+   /* glVertexAttrib2fvARB aliases glVertexAttrib2fvNV */
+   /* glVertexAttrib2dvARB aliases glVertexAttrib2dvNV */
+   /* glVertexAttrib3svARB aliases glVertexAttrib3svNV */
+   /* glVertexAttrib3fvARB aliases glVertexAttrib3fvNV */
+   /* glVertexAttrib3dvARB aliases glVertexAttrib3dvNV */
+   /* glVertexAttrib4svARB aliases glVertexAttrib4svNV */
+   /* glVertexAttrib4fvARB aliases glVertexAttrib4fvNV */
+   /* glVertexAttrib4dvARB aliases glVertexAttrib4dvNV */
+   /* glVertexAttrib4NubvARB aliases glVertexAttrib4NubvNV */
+   /* glVertexAttrib4bvARB handled in api_loopback.c */
+   /* glVertexAttrib4ivARB handled in api_loopback.c */
+   /* glVertexAttrib4ubvARB handled in api_loopback.c */
+   /* glVertexAttrib4usvARB handled in api_loopback.c */
+   /* glVertexAttrib4uivARB handled in api_loopback.c */
+   /* glVertexAttrib4NbvARB handled in api_loopback.c */
+   /* glVertexAttrib4NsvARB handled in api_loopback.c */
+   /* glVertexAttrib4NivARB handled in api_loopback.c */
+   /* glVertexAttrib4NusvARB handled in api_loopback.c */
+   /* glVertexAttrib4NuivARB handled in api_loopback.c */
+   exec->VertexAttribPointerARB = _mesa_VertexAttribPointerARB;
+   exec->EnableVertexAttribArrayARB = _mesa_EnableVertexAttribArrayARB;
+   exec->DisableVertexAttribArrayARB = _mesa_DisableVertexAttribArrayARB;
+   exec->ProgramStringARB = _mesa_ProgramStringARB;
+   /* glBindProgramARB aliases glBindProgramNV */
+   /* glDeleteProgramsARB aliases glDeleteProgramsNV */
+   /* glGenProgramsARB aliases glGenProgramsNV */
+   /* glIsProgramARB aliases glIsProgramNV */
+   /* glGetVertexAttribdvARB aliases glGetVertexAttribdvNV */
+   /* glGetVertexAttribfvARB aliases glGetVertexAttribfvNV */
+   /* glGetVertexAttribivARB aliases glGetVertexAttribivNV */
+   /* glGetVertexAttribPointervARB aliases glGetVertexAttribPointervNV */
+   exec->ProgramEnvParameter4dARB = _mesa_ProgramEnvParameter4dARB;
+   exec->ProgramEnvParameter4dvARB = _mesa_ProgramEnvParameter4dvARB;
+   exec->ProgramEnvParameter4fARB = _mesa_ProgramEnvParameter4fARB;
+   exec->ProgramEnvParameter4fvARB = _mesa_ProgramEnvParameter4fvARB;
+   exec->ProgramLocalParameter4dARB = _mesa_ProgramLocalParameter4dARB;
+   exec->ProgramLocalParameter4dvARB = _mesa_ProgramLocalParameter4dvARB;
+   exec->ProgramLocalParameter4fARB = _mesa_ProgramLocalParameter4fARB;
+   exec->ProgramLocalParameter4fvARB = _mesa_ProgramLocalParameter4fvARB;
+   exec->GetProgramEnvParameterdvARB = _mesa_GetProgramEnvParameterdvARB;
+   exec->GetProgramEnvParameterfvARB = _mesa_GetProgramEnvParameterfvARB;
+   exec->GetProgramLocalParameterdvARB = _mesa_GetProgramLocalParameterdvARB;
+   exec->GetProgramLocalParameterfvARB = _mesa_GetProgramLocalParameterfvARB;
+   exec->GetProgramivARB = _mesa_GetProgramivARB;
+   exec->GetProgramStringARB = _mesa_GetProgramStringARB;
+#endif
+
+   /* ARB 28. GL_ARB_vertex_buffer_object */
+#if FEATURE_ARB_vertex_buffer_object
+   exec->BindBufferARB = _mesa_BindBufferARB;
+   exec->BufferDataARB = _mesa_BufferDataARB;
+   exec->BufferSubDataARB = _mesa_BufferSubDataARB;
+   exec->DeleteBuffersARB = _mesa_DeleteBuffersARB;
+   exec->GenBuffersARB = _mesa_GenBuffersARB;
+   exec->GetBufferParameterivARB = _mesa_GetBufferParameterivARB;
+   exec->GetBufferPointervARB = _mesa_GetBufferPointervARB;
+   exec->GetBufferSubDataARB = _mesa_GetBufferSubDataARB;
+   exec->IsBufferARB = _mesa_IsBufferARB;
+   exec->MapBufferARB = _mesa_MapBufferARB;
+   exec->UnmapBufferARB = _mesa_UnmapBufferARB;
+#endif
+
+#if FEATURE_ARB_occlusion_query
+   exec->GenQueriesARB = _mesa_GenQueriesARB;
+   exec->DeleteQueriesARB = _mesa_DeleteQueriesARB;
+   exec->IsQueryARB = _mesa_IsQueryARB;
+   exec->BeginQueryARB = _mesa_BeginQueryARB;
+   exec->EndQueryARB = _mesa_EndQueryARB;
+   exec->GetQueryivARB = _mesa_GetQueryivARB;
+   exec->GetQueryObjectivARB = _mesa_GetQueryObjectivARB;
+   exec->GetQueryObjectuivARB = _mesa_GetQueryObjectuivARB;
+#endif
+}
+
+/*@}*/
+
+
+/**********************************************************************/
+/** \name State update logic */
+/*@{*/
+
+
+/*
+ * Update items which depend on vertex/fragment programs.
+ */
+static void
+update_program( GLcontext *ctx )
+{
+   if (ctx->FragmentProgram.Enabled && ctx->FragmentProgram.Current) {
+      if (ctx->FragmentProgram.Current->InputsRead & (1 << FRAG_ATTRIB_COL1))
+         ctx->_TriangleCaps |= DD_SEPARATE_SPECULAR;
+   }
+}
+
+
+/**
+ * Update state dependent on vertex arrays.
+ */
+static void
+update_arrays( GLcontext *ctx )
+{
+   GLuint i, min;
+
+   /* find min of _MaxElement values for all enabled arrays */
+
+   /* 0 */
+   if (ctx->VertexProgram.Enabled
+       && ctx->Array.VertexAttrib[VERT_ATTRIB_POS].Enabled) {
+      min = ctx->Array.VertexAttrib[VERT_ATTRIB_POS]._MaxElement;
+   }
+   else if (ctx->Array.Vertex.Enabled) {
+      min = ctx->Array.Vertex._MaxElement;
+   }
+   else {
+      /* can't draw anything without vertex positions! */
+      min = 0;
+   }
+
+   /* 1 */
+   if (ctx->VertexProgram.Enabled
+       && ctx->Array.VertexAttrib[VERT_ATTRIB_WEIGHT].Enabled) {
+      min = MIN2(min, ctx->Array.VertexAttrib[VERT_ATTRIB_WEIGHT]._MaxElement);
+   }
+   /* no conventional vertex weight array */
+
+   /* 2 */
+   if (ctx->VertexProgram.Enabled
+       && ctx->Array.VertexAttrib[VERT_ATTRIB_NORMAL].Enabled) {
+      min = MIN2(min, ctx->Array.VertexAttrib[VERT_ATTRIB_NORMAL]._MaxElement);
+   }
+   else if (ctx->Array.Normal.Enabled) {
+      min = MIN2(min, ctx->Array.Normal._MaxElement);
+   }
+
+   /* 3 */
+   if (ctx->VertexProgram.Enabled
+       && ctx->Array.VertexAttrib[VERT_ATTRIB_COLOR0].Enabled) {
+      min = MIN2(min, ctx->Array.VertexAttrib[VERT_ATTRIB_COLOR0]._MaxElement);
+   }
+   else if (ctx->Array.Color.Enabled) {
+      min = MIN2(min, ctx->Array.Color._MaxElement);
+   }
+
+   /* 4 */
+   if (ctx->VertexProgram.Enabled
+       && ctx->Array.VertexAttrib[VERT_ATTRIB_COLOR1].Enabled) {
+      min = MIN2(min, ctx->Array.VertexAttrib[VERT_ATTRIB_COLOR1]._MaxElement);
+   }
+   else if (ctx->Array.SecondaryColor.Enabled) {
+      min = MIN2(min, ctx->Array.SecondaryColor._MaxElement);
+   }
+
+   /* 5 */
+   if (ctx->VertexProgram.Enabled
+       && ctx->Array.VertexAttrib[VERT_ATTRIB_FOG].Enabled) {
+      min = MIN2(min, ctx->Array.VertexAttrib[VERT_ATTRIB_FOG]._MaxElement);
+   }
+   else if (ctx->Array.FogCoord.Enabled) {
+      min = MIN2(min, ctx->Array.FogCoord._MaxElement);
+   }
+
+   /* 6 */
+   if (ctx->VertexProgram.Enabled
+       && ctx->Array.VertexAttrib[VERT_ATTRIB_SIX].Enabled) {
+      min = MIN2(min, ctx->Array.VertexAttrib[VERT_ATTRIB_SIX]._MaxElement);
+   }
+
+   /* 7 */
+   if (ctx->VertexProgram.Enabled
+       && ctx->Array.VertexAttrib[VERT_ATTRIB_SEVEN].Enabled) {
+      min = MIN2(min, ctx->Array.VertexAttrib[VERT_ATTRIB_SEVEN]._MaxElement);
+   }
+
+   /* 8..15 */
+   for (i = VERT_ATTRIB_TEX0; i < VERT_ATTRIB_MAX; i++) {
+      if (ctx->VertexProgram.Enabled
+          && ctx->Array.VertexAttrib[i].Enabled) {
+         min = MIN2(min, ctx->Array.VertexAttrib[i]._MaxElement);
+      }
+      else if (i - VERT_ATTRIB_TEX0 < ctx->Const.MaxTextureCoordUnits
+               && ctx->Array.TexCoord[i - VERT_ATTRIB_TEX0].Enabled) {
+         min = MIN2(min, ctx->Array.TexCoord[i - VERT_ATTRIB_TEX0]._MaxElement);
+      }
+   }
+
+   if (ctx->Array.Index.Enabled) {
+      min = MIN2(min, ctx->Array.Index._MaxElement);
+   }
+
+   if (ctx->Array.EdgeFlag.Enabled) {
+      min = MIN2(min, ctx->Array.EdgeFlag._MaxElement);
+   }
+
+   /* _MaxElement is one past the last legal array element */
+   ctx->Array._MaxElement = min;
+}
+
+
+
+/*
+ * If __GLcontextRec::NewState is non-zero then this function \b must be called
+ * before rendering any primitive.  Basically, function pointers and
+ * miscellaneous flags are updated to reflect the current state of the state
+ * machine.
+ *
+ * Calls dd_function_table::UpdateState to perform any internal state management
+ * necessary.
+ * 
+ * \sa _mesa_update_modelview_project(), _mesa_update_texture(),
+ * _mesa_update_buffers(), _mesa_update_polygon(), _mesa_update_lighting() and
+ * _mesa_update_tnl_spaces().
+ */
+void _mesa_update_state( GLcontext *ctx )
+{
+   const GLuint new_state = ctx->NewState;
+
+   if (MESA_VERBOSE & VERBOSE_STATE)
+      _mesa_print_state("_mesa_update_state", new_state);
+
+   if (new_state & (_NEW_MODELVIEW|_NEW_PROJECTION))
+      _mesa_update_modelview_project( ctx, new_state );
+
+   if (new_state & (_NEW_PROGRAM|_NEW_TEXTURE|_NEW_TEXTURE_MATRIX))
+      _mesa_update_texture( ctx, new_state );
+
+   if (new_state & (_NEW_SCISSOR|_NEW_BUFFERS))
+      _mesa_update_buffers( ctx );
+
+   if (new_state & _NEW_POLYGON)
+      _mesa_update_polygon( ctx );
+
+   if (new_state & _NEW_LIGHT)
+      _mesa_update_lighting( ctx );
+
+   if (new_state & _IMAGE_NEW_TRANSFER_STATE)
+      _mesa_update_pixel( ctx, new_state );
+
+   if (new_state & _NEW_PROGRAM)
+      update_program( ctx );
+
+   if (new_state & (_NEW_ARRAY | _NEW_PROGRAM))
+      update_arrays( ctx );
+
+   /* ctx->_NeedEyeCoords is now up to date.
+    *
+    * If the truth value of this variable has changed, update for the
+    * new lighting space and recompute the positions of lights and the
+    * normal transform.
+    *
+    * If the lighting space hasn't changed, may still need to recompute
+    * light positions & normal transforms for other reasons.
+    */
+   if (new_state & _MESA_NEW_NEED_EYE_COORDS) 
+      _mesa_update_tnl_spaces( ctx, new_state );
+
+   /*
+    * Here the driver sets up all the ctx->Driver function pointers
+    * to it's specific, private functions, and performs any
+    * internal state management necessary, including invalidating
+    * state of active modules.
+    *
+    * Set ctx->NewState to zero to avoid recursion if
+    * Driver.UpdateState() has to call FLUSH_VERTICES().  (fixed?)
+    */
+   ctx->NewState = 0;
+   ctx->Driver.UpdateState(ctx, new_state);
+   ctx->Array.NewState = 0;
+
+   /* At this point we can do some assertions to be sure the required
+    * device driver function pointers are all initialized.
+    */
+   _mesa_check_driver_hooks( ctx );
+}
+
+/*@}*/
diff --git a/reactos/lib/mesa32/src/main/state.h b/reactos/lib/mesa32/src/main/state.h
new file mode 100644
index 00000000000..fe577a85637
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/state.h
@@ -0,0 +1,46 @@
+/**
+ * \file state.h
+ * State management.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef STATE_H
+#define STATE_H
+
+#include "mtypes.h"
+
+extern void
+_mesa_init_no_op_table(struct _glapi_table *exec, GLuint tableSize);
+
+extern void
+_mesa_init_exec_table(struct _glapi_table *exec, GLuint tableSize);
+
+extern void
+_mesa_update_state( GLcontext *ctx );
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/stencil.c b/reactos/lib/mesa32/src/main/stencil.c
new file mode 100644
index 00000000000..8c89e8cc13c
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/stencil.c
@@ -0,0 +1,296 @@
+/**
+ * \file stencil.c
+ * Stencil operations.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "imports.h"
+#include "context.h"
+#include "depth.h"
+#include "macros.h"
+#include "stencil.h"
+#include "mtypes.h"
+#include "enable.h"
+
+
+/**
+ * Set the clear value for the stencil buffer.
+ *
+ * \param s clear value.
+ *
+ * \sa glClearStencil().
+ *
+ * Updates gl_stencil_attrib::Clear. On change
+ * flushes the vertices and notifies the driver via
+ * the dd_function_table::ClearStencil callback.
+ */
+void GLAPIENTRY
+_mesa_ClearStencil( GLint s )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (ctx->Stencil.Clear == (GLstencil) s)
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_STENCIL);
+   ctx->Stencil.Clear = (GLstencil) s;
+
+   if (ctx->Driver.ClearStencil) {
+      (*ctx->Driver.ClearStencil)( ctx, s );
+   }
+}
+
+
+/**
+ * Set the function and reference value for stencil testing.
+ *
+ * \param func test function.
+ * \param ref reference value.
+ * \param mask bitmask.
+ *
+ * \sa glStencilFunc().
+ *
+ * Verifies the parameters and updates the respective values in
+ * __GLcontextRec::Stencil. On change flushes the vertices and notifies the
+ * driver via the dd_function_table::StencilFunc callback.
+ */
+void GLAPIENTRY
+_mesa_StencilFunc( GLenum func, GLint ref, GLuint mask )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   const GLint face = ctx->Stencil.ActiveFace;
+   GLint maxref;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   switch (func) {
+      case GL_NEVER:
+      case GL_LESS:
+      case GL_LEQUAL:
+      case GL_GREATER:
+      case GL_GEQUAL:
+      case GL_EQUAL:
+      case GL_NOTEQUAL:
+      case GL_ALWAYS:
+         break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glStencilFunc" );
+         return;
+   }
+
+   maxref = (1 << STENCIL_BITS) - 1;
+   ref = (GLstencil) CLAMP( ref, 0, maxref );
+
+   if (ctx->Stencil.Function[face] == func &&
+       ctx->Stencil.ValueMask[face] == (GLstencil) mask &&
+       ctx->Stencil.Ref[face] == ref)
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_STENCIL);
+   ctx->Stencil.Function[face] = func;
+   ctx->Stencil.Ref[face] = ref;
+   ctx->Stencil.ValueMask[face] = (GLstencil) mask;
+
+   if (ctx->Driver.StencilFunc) {
+      (*ctx->Driver.StencilFunc)( ctx, func, ref, mask );
+   }
+}
+
+
+/**
+ * Set the stencil writing mask.
+ *
+ * \param mask bit-mask to enable/disable writing of individual bits in the
+ * stencil planes.
+ *
+ * \sa glStencilMask().
+ *
+ * Updates gl_stencil_attrib::WriteMask. On change flushes the vertices and
+ * notifies the driver via the dd_function_table::StencilMask callback.
+ */
+void GLAPIENTRY
+_mesa_StencilMask( GLuint mask )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   const GLint face = ctx->Stencil.ActiveFace;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (ctx->Stencil.WriteMask[face] == (GLstencil) mask)
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_STENCIL);
+   ctx->Stencil.WriteMask[face] = (GLstencil) mask;
+
+   if (ctx->Driver.StencilMask) {
+      (*ctx->Driver.StencilMask)( ctx, mask );
+   }
+}
+
+
+/**
+ * Set the stencil test actions.
+ *
+ * \param fail action to take when stencil test fails.
+ * \param zfail action to take when stencil test passes, but the depth test fails.
+ * \param zpass action to take when stencil test passes and the depth test
+ * passes (or depth testing is not enabled).
+ * 
+ * \sa glStencilOp().
+ * 
+ * Verifies the parameters and updates the respective fields in
+ * __GLcontextRec::Stencil. On change flushes the vertices and notifies the
+ * driver via the dd_function_table::StencilOp callback.
+ */
+void GLAPIENTRY
+_mesa_StencilOp(GLenum fail, GLenum zfail, GLenum zpass)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   const GLint face = ctx->Stencil.ActiveFace;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   switch (fail) {
+      case GL_KEEP:
+      case GL_ZERO:
+      case GL_REPLACE:
+      case GL_INCR:
+      case GL_DECR:
+      case GL_INVERT:
+         break;
+      case GL_INCR_WRAP_EXT:
+      case GL_DECR_WRAP_EXT:
+         if (ctx->Extensions.EXT_stencil_wrap) {
+            break;
+         }
+         /* FALL-THROUGH */
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOp");
+         return;
+   }
+   switch (zfail) {
+      case GL_KEEP:
+      case GL_ZERO:
+      case GL_REPLACE:
+      case GL_INCR:
+      case GL_DECR:
+      case GL_INVERT:
+         break;
+      case GL_INCR_WRAP_EXT:
+      case GL_DECR_WRAP_EXT:
+         if (ctx->Extensions.EXT_stencil_wrap) {
+            break;
+         }
+         /* FALL-THROUGH */
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOp");
+         return;
+   }
+   switch (zpass) {
+      case GL_KEEP:
+      case GL_ZERO:
+      case GL_REPLACE:
+      case GL_INCR:
+      case GL_DECR:
+      case GL_INVERT:
+         break;
+      case GL_INCR_WRAP_EXT:
+      case GL_DECR_WRAP_EXT:
+         if (ctx->Extensions.EXT_stencil_wrap) {
+            break;
+         }
+         /* FALL-THROUGH */
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glStencilOp");
+         return;
+   }
+
+   if (ctx->Stencil.ZFailFunc[face] == zfail &&
+       ctx->Stencil.ZPassFunc[face] == zpass &&
+       ctx->Stencil.FailFunc[face] == fail)
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_STENCIL);
+   ctx->Stencil.ZFailFunc[face] = zfail;
+   ctx->Stencil.ZPassFunc[face] = zpass;
+   ctx->Stencil.FailFunc[face] = fail;
+
+   if (ctx->Driver.StencilOp) {
+      (*ctx->Driver.StencilOp)(ctx, fail, zfail, zpass);
+   }
+}
+
+
+#if _HAVE_FULL_GL
+/* GL_EXT_stencil_two_side */
+void GLAPIENTRY
+_mesa_ActiveStencilFaceEXT(GLenum face)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (face == GL_FRONT || face == GL_BACK) {
+      FLUSH_VERTICES(ctx, _NEW_STENCIL);
+      ctx->Stencil.ActiveFace = (face == GL_FRONT) ? 0 : 1;
+   }
+
+   if (ctx->Driver.ActiveStencilFace) {
+      (*ctx->Driver.ActiveStencilFace)( ctx, (GLuint) ctx->Stencil.ActiveFace );
+   }
+}
+#endif
+
+
+/**
+ * Initialize the context stipple state.
+ *
+ * \param ctx GL context.
+ *
+ * Initializes __GLcontextRec::Stencil attribute group.
+ */
+void _mesa_init_stencil( GLcontext * ctx )
+{
+
+   /* Stencil group */
+   ctx->Stencil.Enabled = GL_FALSE;
+   ctx->Stencil.TestTwoSide = GL_FALSE;
+   ctx->Stencil.ActiveFace = 0;  /* 0 = GL_FRONT, 1 = GL_BACK */
+   ctx->Stencil.Function[0] = GL_ALWAYS;
+   ctx->Stencil.Function[1] = GL_ALWAYS;
+   ctx->Stencil.FailFunc[0] = GL_KEEP;
+   ctx->Stencil.FailFunc[1] = GL_KEEP;
+   ctx->Stencil.ZPassFunc[0] = GL_KEEP;
+   ctx->Stencil.ZPassFunc[1] = GL_KEEP;
+   ctx->Stencil.ZFailFunc[0] = GL_KEEP;
+   ctx->Stencil.ZFailFunc[1] = GL_KEEP;
+   ctx->Stencil.Ref[0] = 0;
+   ctx->Stencil.Ref[1] = 0;
+   ctx->Stencil.ValueMask[0] = STENCIL_MAX;
+   ctx->Stencil.ValueMask[1] = STENCIL_MAX;
+   ctx->Stencil.WriteMask[0] = STENCIL_MAX;
+   ctx->Stencil.WriteMask[1] = STENCIL_MAX;
+   ctx->Stencil.Clear = 0;
+}
diff --git a/reactos/lib/mesa32/src/main/stencil.h b/reactos/lib/mesa32/src/main/stencil.h
new file mode 100644
index 00000000000..5620d14c730
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/stencil.h
@@ -0,0 +1,61 @@
+/**
+ * \file stencil.h
+ * Stencil operations.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef STENCIL_H
+#define STENCIL_H
+
+
+#include "mtypes.h"
+
+
+extern void GLAPIENTRY
+_mesa_ClearStencil( GLint s );
+
+
+extern void GLAPIENTRY
+_mesa_StencilFunc( GLenum func, GLint ref, GLuint mask );
+
+
+extern void GLAPIENTRY
+_mesa_StencilMask( GLuint mask );
+
+
+extern void GLAPIENTRY
+_mesa_StencilOp( GLenum fail, GLenum zfail, GLenum zpass );
+
+
+extern void GLAPIENTRY
+_mesa_ActiveStencilFaceEXT(GLenum face);
+
+
+extern void 
+_mesa_init_stencil( GLcontext * ctx );
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/texcompress.c b/reactos/lib/mesa32/src/main/texcompress.c
new file mode 100644
index 00000000000..4c6eaae4cf3
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/texcompress.c
@@ -0,0 +1,274 @@
+/**
+ * \file texcompress.c
+ * Compressed textures functions.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "imports.h"
+#include "context.h"
+#include "image.h"
+#include "texcompress.h"
+#include "texformat.h"
+
+
+/**
+ * Get the list of supported internal compression formats.
+ * 
+ * \param ctx GL context.
+ * \param formats the resulting format list (may be NULL).
+ *
+ * \return number of formats.
+ */
+GLuint
+_mesa_get_compressed_formats( GLcontext *ctx, GLint *formats )
+{
+   GLuint n = 0;
+   if (ctx->Extensions.ARB_texture_compression) {
+      if (ctx->Extensions.TDFX_texture_compression_FXT1) {
+         if (formats) {
+            formats[n++] = GL_COMPRESSED_RGB_FXT1_3DFX;
+            formats[n++] = GL_COMPRESSED_RGBA_FXT1_3DFX;
+         }
+         else {
+            n += 2;
+         }
+      }
+      if (ctx->Extensions.EXT_texture_compression_s3tc) {
+         if (formats) {
+            formats[n++] = GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
+            /* Skip this one because it has a restriction (all transparent
+             * pixels become black).  See the texture compressions spec for
+             * a detailed explanation.  This is what NVIDIA does.
+            formats[n++] = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;
+            */
+            formats[n++] = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
+            formats[n++] = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
+         }
+         else {
+            n += 3;
+         }
+      }
+      if (ctx->Extensions.S3_s3tc) {
+         if (formats) {
+            formats[n++] = GL_RGB_S3TC;
+            formats[n++] = GL_RGB4_S3TC;
+            formats[n++] = GL_RGBA_S3TC;
+            formats[n++] = GL_RGBA4_S3TC;
+         }
+         else {
+            n += 4;
+         }
+      }
+   }
+   return n;
+}
+
+
+/**
+ * Return bytes of storage needed for the given texture size and
+ * compressed format.
+ * 
+ * \param width texture width in texels.
+ * \param height texture height in texels.
+ * \param depth texture depth in texels.
+ * \param texFormat one of the compressed format enums
+ * 
+ * \return size in bytes, or zero if bad \p texFormat.
+ */
+GLuint
+_mesa_compressed_texture_size( GLcontext *ctx,
+                               GLsizei width, GLsizei height, GLsizei depth,
+                               GLenum format )
+{
+   GLuint size;
+
+   if (ctx->Driver.CompressedTextureSize) {
+      return ctx->Driver.CompressedTextureSize(ctx, width, height, depth, format);
+   }
+
+   ASSERT(depth == 1);
+
+   switch (format) {
+   case GL_COMPRESSED_RGB_FXT1_3DFX:
+   case GL_COMPRESSED_RGBA_FXT1_3DFX:
+      /* round up width to next multiple of 8, height to next multiple of 4 */
+      width = (width + 7) & ~7;
+      height = (height + 3) & ~3;
+      /* 16 bytes per 8x4 tile of RGB[A] texels */
+      size = width * height / 2;
+      /* Textures smaller than 8x4 will effectively be made into 8x4 and
+       * take 16 bytes.
+       */
+      if (size < 16)
+         size = 16;
+      return size;
+   case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
+   case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
+   case GL_RGB_S3TC:
+   case GL_RGB4_S3TC:
+      /* round up width, height to next multiple of 4 */
+      width = (width + 3) & ~3;
+      height = (height + 3) & ~3;
+      /* 8 bytes per 4x4 tile of RGB[A] texels */
+      size = width * height / 2;
+      /* Textures smaller than 4x4 will effectively be made into 4x4 and
+       * take 8 bytes.
+       */
+      if (size < 8)
+         size = 8;
+      return size;
+   case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
+   case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
+   case GL_RGBA_S3TC:
+   case GL_RGBA4_S3TC:
+      /* round up width, height to next multiple of 4 */
+      width = (width + 3) & ~3;
+      height = (height + 3) & ~3;
+      /* 16 bytes per 4x4 tile of RGBA texels */
+      size = width * height; /* simple! */
+      /* Textures smaller than 4x4 will effectively be made into 4x4 and
+       * take 16 bytes.
+       */
+      if (size < 16)
+         size = 16;
+      return size;
+   default:
+      _mesa_problem(ctx, "bad texformat in compressed_texture_size");
+      return 0;
+   }
+}
+
+
+/**
+ * Compute the bytes per row in a compressed texture image.
+ * We use this for computing the destination address for sub-texture updates.
+ * \param format  one of the specific texture compression formats
+ * \param width  image width in pixels
+ * \return stride, in bytes, between rows for compressed image
+ */
+GLint
+_mesa_compressed_row_stride(GLenum format, GLsizei width)
+{
+   GLint stride;
+
+   switch (format) {
+   case GL_COMPRESSED_RGB_FXT1_3DFX:
+   case GL_COMPRESSED_RGBA_FXT1_3DFX:
+      stride = ((width + 7) / 8) * 16; /* 16 bytes per 8x4 tile */
+      break;
+   case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
+   case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
+   case GL_RGB_S3TC:
+   case GL_RGB4_S3TC:
+      stride = ((width + 3) / 4) * 8; /* 8 bytes per 4x4 tile */
+      break;
+   case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
+   case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
+   case GL_RGBA_S3TC:
+   case GL_RGBA4_S3TC:
+      stride = ((width + 3) / 4) * 16; /* 16 bytes per 4x4 tile */
+      break;
+   default:
+      return 0;
+   }
+
+   return stride;
+}
+
+
+/**
+ * Return the address of the pixel at (col, row, img) in a
+ * compressed texture image.
+ * 
+ * \param col image position.
+ * \param row image position.
+ * \param img image position.
+ * \param format compressed image format.
+ * \param width image width.
+ * \param image the image address.
+ * 
+ * \return address of pixel at (row, col).
+ */
+GLubyte *
+_mesa_compressed_image_address(GLint col, GLint row, GLint img,
+                               GLenum format,
+                               GLsizei width, const GLubyte *image)
+{
+   GLubyte *addr;
+
+   (void) img;
+
+   /* We try to spot a "complete" subtexture "above" ROW, COL;
+    * this texture is given by appropriate rounding of WIDTH x ROW.
+    * Then we just add the amount left (usually on the left).
+    *
+    * Example for X*Y microtiles (Z bytes each)
+    * offset = Z * (((width + X - 1) / X) * (row / Y) + col / X);
+    */
+
+   switch (format) {
+   case GL_COMPRESSED_RGB_FXT1_3DFX:
+   case GL_COMPRESSED_RGBA_FXT1_3DFX:
+      addr = (GLubyte *) image + 16 * (((width + 7) / 8) * (row / 4) + col / 8);
+      break;
+   case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
+   case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
+   case GL_RGB_S3TC:
+   case GL_RGB4_S3TC:
+      addr = (GLubyte *) image + 8 * (((width + 3) / 4) * (row / 4) + col / 4);
+      break;
+   case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
+   case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
+   case GL_RGBA_S3TC:
+   case GL_RGBA4_S3TC:
+      addr = (GLubyte *) image + 16 * (((width + 3) / 4) * (row / 4) + col / 4);
+      break;
+   default:
+      return 0;
+   }
+
+   return addr;
+}
+
+
+/**
+ * \param srcRowStride source stride, in pixels
+ */
+void
+_mesa_compress_teximage( GLcontext *ctx, GLsizei width, GLsizei height,
+                         GLenum srcFormat, const GLchan *source,
+                         GLint srcRowStride,
+                         const struct gl_texture_format *dstFormat,
+                         GLubyte *dest, GLint dstRowStride )
+{
+   switch (dstFormat->MesaFormat) {
+   default:
+      _mesa_problem(ctx, "Bad dstFormat in _mesa_compress_teximage()");
+      return;
+   }
+}
diff --git a/reactos/lib/mesa32/src/main/texcompress.h b/reactos/lib/mesa32/src/main/texcompress.h
new file mode 100644
index 00000000000..457c1d7582d
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/texcompress.h
@@ -0,0 +1,64 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef TEXCOMPRESS_H
+#define TEXCOMPRESS_H
+
+#include "mtypes.h"
+
+#if _HAVE_FULL_GL
+extern GLuint
+_mesa_get_compressed_formats( GLcontext *ctx, GLint *formats );
+
+extern GLuint
+_mesa_compressed_texture_size( GLcontext *ctx,
+                               GLsizei width, GLsizei height, GLsizei depth,
+                               GLenum format );
+
+extern GLint
+_mesa_compressed_row_stride(GLenum format, GLsizei width);
+
+
+extern GLubyte *
+_mesa_compressed_image_address(GLint col, GLint row, GLint img,
+                               GLenum format,
+                               GLsizei width, const GLubyte *image);
+
+
+extern void
+_mesa_compress_teximage( GLcontext *ctx, GLsizei width, GLsizei height,
+                         GLenum srcFormat, const GLchan *source,
+                         GLint srcRowStride,
+                         const struct gl_texture_format *dstFormat,
+                         GLubyte *dest, GLint dstRowStride );
+#else
+#define _mesa_get_compressed_formats( c, f ) 0
+#define _mesa_compressed_texture_size( c, w, h, d, f ) 0
+#define _mesa_compressed_row_stride( f, w) 0
+#define _mesa_compressed_image_address(c, r, i, f, w, i2 ) 0
+#define _mesa_compress_teximage( c, w, h, sF, s, sRS, dF, d, drs ) ((void)0)
+#endif
+
+#endif /* TEXCOMPRESS_H */
diff --git a/reactos/lib/mesa32/src/main/texformat.c b/reactos/lib/mesa32/src/main/texformat.c
new file mode 100644
index 00000000000..7af0b1cdf48
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/texformat.c
@@ -0,0 +1,978 @@
+/**
+ * \file texformat.c
+ * Texture formats.
+ *
+ * \author Gareth Hughes
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "colormac.h"
+#include "context.h"
+#include "image.h"
+#include "imports.h"
+#include "mtypes.h"
+#include "texformat.h"
+#include "teximage.h"
+#include "texstate.h"
+
+
+/* Texel fetch routines for all supported formats
+ */
+#define DIM 1
+#include "texformat_tmp.h"
+
+#define DIM 2
+#include "texformat_tmp.h"
+
+#define DIM 3
+#include "texformat_tmp.h"
+
+/**
+ * Null texel fetch function.
+ *
+ * Have to have this so the FetchTexel function pointer is never NULL.
+ */
+static void fetch_null_texel( const struct gl_texture_image *texImage,
+			      GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   GLchan *rgba = (GLchan *) texel;
+   rgba[RCOMP] = 0;
+   rgba[GCOMP] = 0;
+   rgba[BCOMP] = 0;
+   rgba[ACOMP] = 0;
+}
+
+
+/***************************************************************/
+/** \name Default GLchan-based formats */
+/*@{*/
+
+const struct gl_texture_format _mesa_texformat_rgba = {
+   MESA_FORMAT_RGBA,			/* MesaFormat */
+   GL_RGBA,				/* BaseFormat */
+   CHAN_BITS,				/* RedBits */
+   CHAN_BITS,				/* GreenBits */
+   CHAN_BITS,				/* BlueBits */
+   CHAN_BITS,				/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   4 * CHAN_BITS / 8,			/* TexelBytes */
+   fetch_1d_texel_rgba,			/* FetchTexel1D */
+   fetch_2d_texel_rgba,			/* FetchTexel2D */
+   fetch_3d_texel_rgba,			/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_rgb = {
+   MESA_FORMAT_RGB,			/* MesaFormat */
+   GL_RGB,				/* BaseFormat */
+   CHAN_BITS,				/* RedBits */
+   CHAN_BITS,				/* GreenBits */
+   CHAN_BITS,				/* BlueBits */
+   0,					/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   3 * CHAN_BITS / 8,			/* TexelBytes */
+   fetch_1d_texel_rgb,			/* FetchTexel1D */
+   fetch_2d_texel_rgb,			/* FetchTexel2D */
+   fetch_3d_texel_rgb,			/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_alpha = {
+   MESA_FORMAT_ALPHA,			/* MesaFormat */
+   GL_ALPHA,				/* BaseFormat */
+   0,					/* RedBits */
+   0,					/* GreenBits */
+   0,					/* BlueBits */
+   CHAN_BITS,				/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   CHAN_BITS / 8,			/* TexelBytes */
+   fetch_1d_texel_alpha,		/* FetchTexel1D */
+   fetch_2d_texel_alpha,		/* FetchTexel2D */
+   fetch_3d_texel_alpha,		/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_luminance = {
+   MESA_FORMAT_LUMINANCE,		/* MesaFormat */
+   GL_LUMINANCE,			/* BaseFormat */
+   0,					/* RedBits */
+   0,					/* GreenBits */
+   0,					/* BlueBits */
+   0,					/* AlphaBits */
+   CHAN_BITS,				/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   CHAN_BITS / 8,			/* TexelBytes */
+   fetch_1d_texel_luminance,		/* FetchTexel1D */
+   fetch_2d_texel_luminance,		/* FetchTexel2D */
+   fetch_3d_texel_luminance,		/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_luminance_alpha = {
+   MESA_FORMAT_LUMINANCE_ALPHA,		/* MesaFormat */
+   GL_LUMINANCE_ALPHA,			/* BaseFormat */
+   0,					/* RedBits */
+   0,					/* GreenBits */
+   0,					/* BlueBits */
+   CHAN_BITS,				/* AlphaBits */
+   CHAN_BITS,				/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   2 * CHAN_BITS / 8,			/* TexelBytes */
+   fetch_1d_texel_luminance_alpha,	/* FetchTexel1D */
+   fetch_2d_texel_luminance_alpha,	/* FetchTexel2D */
+   fetch_3d_texel_luminance_alpha,	/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_intensity = {
+   MESA_FORMAT_INTENSITY,		/* MesaFormat */
+   GL_INTENSITY,			/* BaseFormat */
+   0,					/* RedBits */
+   0,					/* GreenBits */
+   0,					/* BlueBits */
+   0,					/* AlphaBits */
+   0,					/* LuminanceBits */
+   CHAN_BITS,				/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   CHAN_BITS / 8,			/* TexelBytes */
+   fetch_1d_texel_intensity,		/* FetchTexel1D */
+   fetch_2d_texel_intensity,		/* FetchTexel2D */
+   fetch_3d_texel_intensity,		/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_color_index = {
+   MESA_FORMAT_COLOR_INDEX,		/* MesaFormat */
+   GL_COLOR_INDEX,			/* BaseFormat */
+   0,					/* RedBits */
+   0,					/* GreenBits */
+   0,					/* BlueBits */
+   0,					/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   CHAN_BITS,				/* IndexBits */
+   0,					/* DepthBits */
+   CHAN_BITS / 8,			/* TexelBytes */
+   fetch_1d_texel_color_index,		/* FetchTexel1D */
+   fetch_2d_texel_color_index,		/* FetchTexel2D */
+   fetch_3d_texel_color_index,		/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_depth_component = {
+   MESA_FORMAT_DEPTH_COMPONENT,		/* MesaFormat */
+   GL_DEPTH_COMPONENT,			/* BaseFormat */
+   0,					/* RedBits */
+   0,					/* GreenBits */
+   0,					/* BlueBits */
+   0,					/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   sizeof(GLfloat) * 8,			/* DepthBits */
+   sizeof(GLfloat),			/* TexelBytes */
+   fetch_1d_texel_depth_component,	/* FetchTexel1D */
+   fetch_2d_texel_depth_component,	/* FetchTexel2D */
+   fetch_3d_texel_depth_component,	/* FetchTexel3D */
+};
+
+/*@}*/
+
+
+/***************************************************************/
+/** \name Hardware formats */
+/*@{*/
+
+const struct gl_texture_format _mesa_texformat_rgba8888 = {
+   MESA_FORMAT_RGBA8888,		/* MesaFormat */
+   GL_RGBA,				/* BaseFormat */
+   8,					/* RedBits */
+   8,					/* GreenBits */
+   8,					/* BlueBits */
+   8,					/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   4,					/* TexelBytes */
+   fetch_1d_texel_rgba8888,		/* FetchTexel1D */
+   fetch_2d_texel_rgba8888,		/* FetchTexel2D */
+   fetch_3d_texel_rgba8888,		/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_argb8888 = {
+   MESA_FORMAT_ARGB8888,		/* MesaFormat */
+   GL_RGBA,				/* BaseFormat */
+   8,					/* RedBits */
+   8,					/* GreenBits */
+   8,					/* BlueBits */
+   8,					/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   4,					/* TexelBytes */
+   fetch_1d_texel_argb8888,		/* FetchTexel1D */
+   fetch_2d_texel_argb8888,		/* FetchTexel2D */
+   fetch_3d_texel_argb8888,		/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_rgb888 = {
+   MESA_FORMAT_RGB888,			/* MesaFormat */
+   GL_RGB,				/* BaseFormat */
+   8,					/* RedBits */
+   8,					/* GreenBits */
+   8,					/* BlueBits */
+   0,					/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   3,					/* TexelBytes */
+   fetch_1d_texel_rgb888,		/* FetchTexel1D */
+   fetch_2d_texel_rgb888,		/* FetchTexel2D */
+   fetch_3d_texel_rgb888,		/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_rgb565 = {
+   MESA_FORMAT_RGB565,			/* MesaFormat */
+   GL_RGB,				/* BaseFormat */
+   5,					/* RedBits */
+   6,					/* GreenBits */
+   5,					/* BlueBits */
+   0,					/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   2,					/* TexelBytes */
+   fetch_1d_texel_rgb565,		/* FetchTexel1D */
+   fetch_2d_texel_rgb565,		/* FetchTexel2D */
+   fetch_3d_texel_rgb565,		/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_argb4444 = {
+   MESA_FORMAT_ARGB4444,		/* MesaFormat */
+   GL_RGBA,				/* BaseFormat */
+   4,					/* RedBits */
+   4,					/* GreenBits */
+   4,					/* BlueBits */
+   4,					/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   2,					/* TexelBytes */
+   fetch_1d_texel_argb4444,		/* FetchTexel1D */
+   fetch_2d_texel_argb4444,		/* FetchTexel2D */
+   fetch_3d_texel_argb4444,		/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_argb1555 = {
+   MESA_FORMAT_ARGB1555,		/* MesaFormat */
+   GL_RGBA,				/* BaseFormat */
+   5,					/* RedBits */
+   5,					/* GreenBits */
+   5,					/* BlueBits */
+   1,					/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   2,					/* TexelBytes */
+   fetch_1d_texel_argb1555,		/* FetchTexel1D */
+   fetch_2d_texel_argb1555,		/* FetchTexel2D */
+   fetch_3d_texel_argb1555,		/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_al88 = {
+   MESA_FORMAT_AL88,			/* MesaFormat */
+   GL_LUMINANCE_ALPHA,			/* BaseFormat */
+   0,					/* RedBits */
+   0,					/* GreenBits */
+   0,					/* BlueBits */
+   8,					/* AlphaBits */
+   8,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   2,					/* TexelBytes */
+   fetch_1d_texel_al88,			/* FetchTexel1D */
+   fetch_2d_texel_al88,			/* FetchTexel2D */
+   fetch_3d_texel_al88,			/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_rgb332 = {
+   MESA_FORMAT_RGB332,			/* MesaFormat */
+   GL_RGB,				/* BaseFormat */
+   3,					/* RedBits */
+   3,					/* GreenBits */
+   2,					/* BlueBits */
+   0,					/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   1,					/* TexelBytes */
+   fetch_1d_texel_rgb332,		/* FetchTexel1D */
+   fetch_2d_texel_rgb332,		/* FetchTexel2D */
+   fetch_3d_texel_rgb332,		/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_a8 = {
+   MESA_FORMAT_A8,			/* MesaFormat */
+   GL_ALPHA,				/* BaseFormat */
+   0,					/* RedBits */
+   0,					/* GreenBits */
+   0,					/* BlueBits */
+   8,					/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   1,					/* TexelBytes */
+   fetch_1d_texel_a8,			/* FetchTexel1D */
+   fetch_2d_texel_a8,			/* FetchTexel2D */
+   fetch_3d_texel_a8,			/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_l8 = {
+   MESA_FORMAT_L8,			/* MesaFormat */
+   GL_LUMINANCE,			/* BaseFormat */
+   0,					/* RedBits */
+   0,					/* GreenBits */
+   0,					/* BlueBits */
+   0,					/* AlphaBits */
+   8,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   1,					/* TexelBytes */
+   fetch_1d_texel_l8,			/* FetchTexel1D */
+   fetch_2d_texel_l8,			/* FetchTexel2D */
+   fetch_3d_texel_l8,			/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_i8 = {
+   MESA_FORMAT_I8,			/* MesaFormat */
+   GL_INTENSITY,			/* BaseFormat */
+   0,					/* RedBits */
+   0,					/* GreenBits */
+   0,					/* BlueBits */
+   0,					/* AlphaBits */
+   0,					/* LuminanceBits */
+   8,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   1,					/* TexelBytes */
+   fetch_1d_texel_i8,			/* FetchTexel1D */
+   fetch_2d_texel_i8,			/* FetchTexel2D */
+   fetch_3d_texel_i8,			/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_ci8 = {
+   MESA_FORMAT_CI8,			/* MesaFormat */
+   GL_COLOR_INDEX,			/* BaseFormat */
+   0,					/* RedBits */
+   0,					/* GreenBits */
+   0,					/* BlueBits */
+   0,					/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   8,					/* IndexBits */
+   0,					/* DepthBits */
+   1,					/* TexelBytes */
+   fetch_1d_texel_ci8,			/* FetchTexel1D */
+   fetch_2d_texel_ci8,			/* FetchTexel2D */
+   fetch_3d_texel_ci8,			/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_ycbcr = {
+   MESA_FORMAT_YCBCR,			/* MesaFormat */
+   GL_YCBCR_MESA,			/* BaseFormat */
+   0,					/* RedBits */
+   0,					/* GreenBits */
+   0,					/* BlueBits */
+   0,					/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   2,					/* TexelBytes */
+   fetch_1d_texel_ycbcr,		/* FetchTexel1D */
+   fetch_2d_texel_ycbcr,		/* FetchTexel2D */
+   fetch_3d_texel_ycbcr,		/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_ycbcr_rev = {
+   MESA_FORMAT_YCBCR_REV,		/* MesaFormat */
+   GL_YCBCR_MESA,			/* BaseFormat */
+   0,					/* RedBits */
+   0,					/* GreenBits */
+   0,					/* BlueBits */
+   0,					/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   2,					/* TexelBytes */
+   fetch_1d_texel_ycbcr_rev,		/* FetchTexel1D */
+   fetch_2d_texel_ycbcr_rev,		/* FetchTexel2D */
+   fetch_3d_texel_ycbcr_rev,		/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_rgb_fxt1 = {
+   MESA_FORMAT_RGB_FXT1,		/* MesaFormat */
+   GL_RGB,				/* BaseFormat */
+   4, /*approx*/			/* RedBits */
+   4, /*approx*/			/* GreenBits */
+   4, /*approx*/			/* BlueBits */
+   0,					/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   0,					/* TexelBytes */
+   NULL, /*impossible*/ 		/* FetchTexel1D */
+   fetch_2d_texel_rgb_fxt1, 		/* FetchTexel2D */
+   NULL, /*impossible*/ 		/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_rgba_fxt1 = {
+   MESA_FORMAT_RGBA_FXT1,		/* MesaFormat */
+   GL_RGBA,				/* BaseFormat */
+   4, /*approx*/			/* RedBits */
+   4, /*approx*/			/* GreenBits */
+   4, /*approx*/			/* BlueBits */
+   1, /*approx*/			/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   0,					/* TexelBytes */
+   NULL, /*impossible*/ 		/* FetchTexel1D */
+   fetch_2d_texel_rgba_fxt1, 		/* FetchTexel2D */
+   NULL, /*impossible*/ 		/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_rgb_dxt1 = {
+   MESA_FORMAT_RGB_DXT1,		/* MesaFormat */
+   GL_RGB,				/* BaseFormat */
+   4, /*approx*/			/* RedBits */
+   4, /*approx*/			/* GreenBits */
+   4, /*approx*/			/* BlueBits */
+   0,					/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   0,					/* TexelBytes */
+   NULL, /*impossible*/ 		/* FetchTexel1D */
+   fetch_2d_texel_rgb_dxt1, 		/* FetchTexel2D */
+   NULL, /*impossible*/ 		/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_rgba_dxt1 = {
+   MESA_FORMAT_RGBA_DXT1,		/* MesaFormat */
+   GL_RGBA,				/* BaseFormat */
+   4, /*approx*/			/* RedBits */
+   4, /*approx*/			/* GreenBits */
+   4, /*approx*/			/* BlueBits */
+   1, /*approx*/			/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   0,					/* TexelBytes */
+   NULL, /*impossible*/ 		/* FetchTexel1D */
+   fetch_2d_texel_rgba_dxt1, 		/* FetchTexel2D */
+   NULL, /*impossible*/ 		/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_rgba_dxt3 = {
+   MESA_FORMAT_RGBA_DXT3,		/* MesaFormat */
+   GL_RGBA,				/* BaseFormat */
+   4, /*approx*/			/* RedBits */
+   4, /*approx*/			/* GreenBits */
+   4, /*approx*/			/* BlueBits */
+   4, /*approx*/			/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   0,					/* TexelBytes */
+   NULL, /*impossible*/ 		/* FetchTexel1D */
+   fetch_2d_texel_rgba_dxt3, 		/* FetchTexel2D */
+   NULL, /*impossible*/ 		/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_rgba_dxt5 = {
+   MESA_FORMAT_RGBA_DXT5,		/* MesaFormat */
+   GL_RGBA,				/* BaseFormat */
+   4,/*approx*/				/* RedBits */
+   4,/*approx*/				/* GreenBits */
+   4,/*approx*/				/* BlueBits */
+   4,/*approx*/				/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   0,					/* TexelBytes */
+   NULL, /*impossible*/ 		/* FetchTexel1D */
+   fetch_2d_texel_rgba_dxt5, 		/* FetchTexel2D */
+   NULL, /*impossible*/ 		/* FetchTexel3D */
+};
+
+
+/* Big-endian */
+#if 0
+const struct gl_texture_format _mesa_texformat_abgr8888 = {
+   MESA_FORMAT_ABGR8888,		/* MesaFormat */
+   GL_RGBA,				/* BaseFormat */
+   GL_UNSIGNED_INT_8_8_8_8,		/* Type */
+   8,					/* RedBits */
+   8,					/* GreenBits */
+   8,					/* BlueBits */
+   8,					/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   4,					/* TexelBytes */
+   fetch_1d_texel_abgr8888,		/* FetchTexel1D */
+   fetch_2d_texel_abgr8888,		/* FetchTexel2D */
+   fetch_3d_texel_abgr8888,		/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_bgra8888 = {
+   MESA_FORMAT_BGRA8888,		/* MesaFormat */
+   GL_RGBA,				/* BaseFormat */
+   GL_UNSIGNED_INT_8_8_8_8,		/* Type */
+   8,					/* RedBits */
+   8,					/* GreenBits */
+   8,					/* BlueBits */
+   8,					/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   4,					/* TexelBytes */
+   fetch_1d_texel_bgra8888,		/* FetchTexel1D */
+   fetch_2d_texel_bgra8888,		/* FetchTexel2D */
+   fetch_3d_texel_bgra8888,		/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_bgr888 = {
+   MESA_FORMAT_BGR888,			/* MesaFormat */
+   GL_RGB,				/* BaseFormat */
+   GL_UNSIGNED_BYTE,			/* Type */
+   8,					/* RedBits */
+   8,					/* GreenBits */
+   8,					/* BlueBits */
+   0,					/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   3,					/* TexelBytes */
+   fetch_1d_texel_bgr888,		/* FetchTexel1D */
+   fetch_2d_texel_bgr888,		/* FetchTexel2D */
+   fetch_3d_texel_bgr888,		/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_bgr565 = {
+   MESA_FORMAT_BGR565,			/* MesaFormat */
+   GL_RGB,				/* BaseFormat */
+   GL_UNSIGNED_SHORT_5_6_5,		/* Type */
+   5,					/* RedBits */
+   6,					/* GreenBits */
+   5,					/* BlueBits */
+   0,					/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   2,					/* TexelBytes */
+   fetch_1d_texel_bgr565,		/* FetchTexel1D */
+   fetch_2d_texel_bgr565,		/* FetchTexel2D */
+   fetch_3d_texel_bgr565,		/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_bgra4444 = {
+   MESA_FORMAT_BGRA4444,		/* MesaFormat */
+   GL_RGBA,				/* BaseFormat */
+   GL_UNSIGNED_SHORT_4_4_4_4_REV,	/* Type */
+   4,					/* RedBits */
+   4,					/* GreenBits */
+   4,					/* BlueBits */
+   4,					/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   2,					/* TexelBytes */
+   fetch_1d_texel_bgra4444,		/* FetchTexel1D */
+   fetch_2d_texel_bgra4444,		/* FetchTexel2D */
+   fetch_3d_texel_bgra4444,		/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_bgra5551 = {
+   MESA_FORMAT_BGRA5551,		/* MesaFormat */
+   GL_RGBA,				/* BaseFormat */
+   GL_UNSIGNED_SHORT_1_5_5_5_REV,	/* Type */
+   5,					/* RedBits */
+   5,					/* GreenBits */
+   5,					/* BlueBits */
+   1,					/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   2,					/* TexelBytes */
+   fetch_1d_texel_bgra1555,		/* FetchTexel1D */
+   fetch_2d_texel_bgra1555,		/* FetchTexel2D */
+   fetch_3d_texel_bgra1555,		/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_la88 = {
+   MESA_FORMAT_LA88,			/* MesaFormat */
+   GL_LUMINANCE_ALPHA,			/* BaseFormat */
+   GL_UNSIGNED_BYTE,			/* Type */
+   0,					/* RedBits */
+   0,					/* GreenBits */
+   0,					/* BlueBits */
+   8,					/* AlphaBits */
+   8,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   2,					/* TexelBytes */
+   fetch_1d_texel_la88,			/* FetchTexel1D */
+   fetch_2d_texel_la88,			/* FetchTexel2D */
+   fetch_3d_texel_la88,			/* FetchTexel3D */
+};
+
+const struct gl_texture_format _mesa_texformat_bgr233 = {
+   MESA_FORMAT_BGR233,			/* MesaFormat */
+   GL_RGB,				/* BaseFormat */
+   GL_UNSIGNED_BYTE_3_3_2,		/* Type */
+   3,					/* RedBits */
+   3,					/* GreenBits */
+   2,					/* BlueBits */
+   0,					/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   1,					/* TexelBytes */
+   fetch_1d_texel_bgr233,		/* FetchTexel1D */
+   fetch_2d_texel_bgr233,		/* FetchTexel2D */
+   fetch_3d_texel_bgr233,		/* FetchTexel3D */
+};
+#endif
+
+/*@}*/
+
+
+/***************************************************************/
+/** \name Null format (useful for proxy textures) */
+/*@{*/
+
+const struct gl_texture_format _mesa_null_texformat = {
+   -1,					/* MesaFormat */
+   0,					/* BaseFormat */
+   0,					/* RedBits */
+   0,					/* GreenBits */
+   0,					/* BlueBits */
+   0,					/* AlphaBits */
+   0,					/* LuminanceBits */
+   0,					/* IntensityBits */
+   0,					/* IndexBits */
+   0,					/* DepthBits */
+   0,					/* TexelBytes */
+   fetch_null_texel,			/* FetchTexel1D */
+   fetch_null_texel,			/* FetchTexel2D */
+   fetch_null_texel,			/* FetchTexel3D */
+};
+
+/*@}*/
+
+
+/**
+ * Determine whether a given texture format is a hardware texture
+ * format.
+ *
+ * \param format texture format.
+ * 
+ * \return GL_TRUE if \p format is a hardware texture format, or GL_FALSE
+ * otherwise.
+ *
+ * \p format is a hardware texture format if gl_texture_format::MesaFormat is
+ * lower than _format::MESA_FORMAT_RGBA.
+ */
+GLboolean
+_mesa_is_hardware_tex_format( const struct gl_texture_format *format )
+{
+   return (format->MesaFormat < MESA_FORMAT_RGBA);
+}
+
+
+/**
+ * Choose an appropriate texture format.
+ *
+ * \param ctx GL context.
+ * \param internalFormat internal texture format.
+ * \param format pixel format.
+ * \param type data type.
+ *
+ * \return a pointer to a gl_texture_format in which to store the texture on
+ * success, or NULL on failure.
+ * 
+ * This is called via dd_function_table::ChooseTextureFormat.  Hardware drivers
+ * typically override this function with a specialized version.
+ */
+const struct gl_texture_format *
+_mesa_choose_tex_format( GLcontext *ctx, GLint internalFormat,
+                         GLenum format, GLenum type )
+{
+   (void) format;
+   (void) type;
+
+   switch ( internalFormat ) {
+      /* GH: Bias towards GL_RGB, GL_RGBA texture formats.  This has
+       * got to be better than sticking them way down the end of this
+       * huge list.
+       */
+   case 4:				/* Quake3 uses this... */
+   case GL_RGBA:
+      return &_mesa_texformat_rgba;
+
+   case 3:				/* ... and this. */
+   case GL_RGB:
+      return &_mesa_texformat_rgb;
+
+      /* GH: Okay, keep checking as normal.  Still test for GL_RGB,
+       * GL_RGBA formats first.
+       */
+   case GL_RGBA2:
+   case GL_RGBA4:
+   case GL_RGB5_A1:
+   case GL_RGBA8:
+   case GL_RGB10_A2:
+   case GL_RGBA12:
+   case GL_RGBA16:
+      return &_mesa_texformat_rgba;
+
+   case GL_R3_G3_B2:
+   case GL_RGB4:
+   case GL_RGB5:
+   case GL_RGB8:
+   case GL_RGB10:
+   case GL_RGB12:
+   case GL_RGB16:
+      return &_mesa_texformat_rgb;
+
+   case GL_ALPHA:
+   case GL_ALPHA4:
+   case GL_ALPHA8:
+   case GL_ALPHA12:
+   case GL_ALPHA16:
+      return &_mesa_texformat_alpha;
+
+   case 1:
+   case GL_LUMINANCE:
+   case GL_LUMINANCE4:
+   case GL_LUMINANCE8:
+   case GL_LUMINANCE12:
+   case GL_LUMINANCE16:
+      return &_mesa_texformat_luminance;
+
+   case 2:
+   case GL_LUMINANCE_ALPHA:
+   case GL_LUMINANCE4_ALPHA4:
+   case GL_LUMINANCE6_ALPHA2:
+   case GL_LUMINANCE8_ALPHA8:
+   case GL_LUMINANCE12_ALPHA4:
+   case GL_LUMINANCE12_ALPHA12:
+   case GL_LUMINANCE16_ALPHA16:
+      return &_mesa_texformat_luminance_alpha;
+
+   case GL_INTENSITY:
+   case GL_INTENSITY4:
+   case GL_INTENSITY8:
+   case GL_INTENSITY12:
+   case GL_INTENSITY16:
+      return &_mesa_texformat_intensity;
+
+   case GL_COLOR_INDEX:
+   case GL_COLOR_INDEX1_EXT:
+   case GL_COLOR_INDEX2_EXT:
+   case GL_COLOR_INDEX4_EXT:
+   case GL_COLOR_INDEX8_EXT:
+   case GL_COLOR_INDEX12_EXT:
+   case GL_COLOR_INDEX16_EXT:
+      return &_mesa_texformat_color_index;
+
+   case GL_DEPTH_COMPONENT:
+   case GL_DEPTH_COMPONENT16_SGIX:
+   case GL_DEPTH_COMPONENT24_SGIX:
+   case GL_DEPTH_COMPONENT32_SGIX:
+      if (!ctx->Extensions.SGIX_depth_texture)
+	 _mesa_problem(ctx, "depth format without GL_SGIX_depth_texture");
+      return &_mesa_texformat_depth_component;
+
+   case GL_COMPRESSED_ALPHA_ARB:
+      if (!ctx->Extensions.ARB_texture_compression)
+	 _mesa_problem(ctx, "texture compression extension not enabled");
+      return &_mesa_texformat_alpha;
+   case GL_COMPRESSED_LUMINANCE_ARB:
+      if (!ctx->Extensions.ARB_texture_compression)
+	 _mesa_problem(ctx, "texture compression extension not enabled");
+      return &_mesa_texformat_luminance;
+   case GL_COMPRESSED_LUMINANCE_ALPHA_ARB:
+      if (!ctx->Extensions.ARB_texture_compression)
+	 _mesa_problem(ctx, "texture compression extension not enabled");
+      return &_mesa_texformat_luminance_alpha;
+   case GL_COMPRESSED_INTENSITY_ARB:
+      if (!ctx->Extensions.ARB_texture_compression)
+	 _mesa_problem(ctx, "texture compression extension not enabled");
+      return &_mesa_texformat_intensity;
+   case GL_COMPRESSED_RGB_ARB:
+      if (!ctx->Extensions.ARB_texture_compression)
+	 _mesa_problem(ctx, "texture compression extension not enabled");
+      if (ctx->Extensions.TDFX_texture_compression_FXT1)
+         return &_mesa_texformat_rgb_fxt1;
+      else if (ctx->Extensions.EXT_texture_compression_s3tc || ctx->Extensions.S3_s3tc)
+         return &_mesa_texformat_rgb_dxt1;
+      return &_mesa_texformat_rgb;
+   case GL_COMPRESSED_RGBA_ARB:
+      if (!ctx->Extensions.ARB_texture_compression)
+	 _mesa_problem(ctx, "texture compression extension not enabled");
+      if (ctx->Extensions.TDFX_texture_compression_FXT1)
+         return &_mesa_texformat_rgba_fxt1;
+      else if (ctx->Extensions.EXT_texture_compression_s3tc || ctx->Extensions.S3_s3tc)
+         return &_mesa_texformat_rgba_dxt3;  /* Not rgba_dxt1!  See the spec */
+      return &_mesa_texformat_rgba;
+
+   /* GL_MESA_ycrcr_texture */
+   case GL_YCBCR_MESA:
+      if (type == GL_UNSIGNED_SHORT_8_8_MESA)
+         return &_mesa_texformat_ycbcr;
+      else
+         return &_mesa_texformat_ycbcr_rev;
+
+   /* GL_3DFX_texture_compression_FXT1 */
+   case GL_COMPRESSED_RGB_FXT1_3DFX:
+      if (ctx->Extensions.TDFX_texture_compression_FXT1)
+         return &_mesa_texformat_rgb_fxt1;
+      else
+         return NULL;
+   case GL_COMPRESSED_RGBA_FXT1_3DFX:
+      if (ctx->Extensions.TDFX_texture_compression_FXT1)
+         return &_mesa_texformat_rgba_fxt1;
+      else
+         return NULL;
+
+   /* GL_EXT_texture_compression_s3tc */
+   case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
+      if (ctx->Extensions.EXT_texture_compression_s3tc)
+         return &_mesa_texformat_rgb_dxt1;
+      else
+         return NULL;
+   case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
+      if (ctx->Extensions.EXT_texture_compression_s3tc)
+         return &_mesa_texformat_rgba_dxt1;
+      else
+         return NULL;
+   case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
+      if (ctx->Extensions.EXT_texture_compression_s3tc)
+         return &_mesa_texformat_rgba_dxt3;
+      else
+         return NULL;
+   case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
+      if (ctx->Extensions.EXT_texture_compression_s3tc)
+         return &_mesa_texformat_rgba_dxt5;
+      else
+         return NULL;
+
+   /* GL_S3_s3tc */
+   case GL_RGB_S3TC:
+   case GL_RGB4_S3TC:
+      if (ctx->Extensions.S3_s3tc)
+         return &_mesa_texformat_rgb_dxt1;
+      else
+         return NULL;
+   case GL_RGBA_S3TC:
+   case GL_RGBA4_S3TC:
+      if (ctx->Extensions.S3_s3tc)
+         return &_mesa_texformat_rgba_dxt3;
+      else
+         return NULL;
+
+   default:
+      _mesa_problem(ctx, "unexpected format in _mesa_choose_tex_format()");
+      return NULL;
+   }
+}
+
+
+/**
+ * Return the base texture format for the given compressed format
+ * 
+ * Called via dd_function_table::Driver.BaseCompressedTexFormat.
+ * This function is used by software rasterizers.  Hardware drivers
+ * which support texture compression should not use this function but
+ * a specialized function instead.
+ */
+GLint
+_mesa_base_compressed_texformat(GLcontext *ctx, GLint intFormat)
+{
+   switch (intFormat) {
+   case GL_COMPRESSED_ALPHA_ARB:
+      return GL_ALPHA;
+   case GL_COMPRESSED_LUMINANCE_ARB:
+      return GL_LUMINANCE;
+   case GL_COMPRESSED_LUMINANCE_ALPHA_ARB:
+      return GL_LUMINANCE_ALPHA;
+   case GL_COMPRESSED_INTENSITY_ARB:
+      return GL_INTENSITY;
+   case GL_COMPRESSED_RGB_ARB:
+      return GL_RGB;
+   case GL_COMPRESSED_RGBA_ARB:
+      return GL_RGBA;
+   default:
+      return -1;  /* not a recognized compressed format */
+   }
+}
diff --git a/reactos/lib/mesa32/src/main/texformat.h b/reactos/lib/mesa32/src/main/texformat.h
new file mode 100644
index 00000000000..c43da46d7b1
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/texformat.h
@@ -0,0 +1,180 @@
+/**
+ * \file texformat.h
+ * Texture formats definitions.
+ *
+ * \author Gareth Hughes
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef TEXFORMAT_H
+#define TEXFORMAT_H
+
+#include "mtypes.h"
+
+
+/**
+ * Mesa internal texture image types.
+ * 
+ * All texture images must be stored in one of these formats.
+ */
+enum _format {
+   /** 
+    * \name Hardware-friendly formats.  
+    *
+    * Drivers can override the default formats and convert texture images to
+    * one of these as required.  The driver's
+    * dd_function_table::ChooseTextureFormat function will choose one of these
+    * formats.  These formats are all little endian, as shown below.  They will
+    * be most useful for x86-based PC graphics card drivers.
+    *
+    * \note In the default case, some of these formats will be duplicates of
+    * the generic formats listed below.  However, these formats guarantee their
+    * internal component sizes, while GLchan may vary between GLubyte, GLushort
+    * and GLfloat.
+    */
+   /*@{*/
+				/* msb <------ TEXEL BITS -----------> lsb */
+				/* ---- ---- ---- ---- ---- ---- ---- ---- */
+   MESA_FORMAT_RGBA8888,	/* RRRR RRRR GGGG GGGG BBBB BBBB AAAA AAAA */
+   MESA_FORMAT_ARGB8888,	/* AAAA AAAA RRRR RRRR GGGG GGGG BBBB BBBB */
+   MESA_FORMAT_RGB888,		/*           RRRR RRRR GGGG GGGG BBBB BBBB */
+   MESA_FORMAT_RGB565,		/*                     RRRR RGGG GGGB BBBB */
+   MESA_FORMAT_ARGB4444,	/*                     AAAA RRRR GGGG BBBB */
+   MESA_FORMAT_ARGB1555,	/*                     ARRR RRGG GGGB BBBB */
+   MESA_FORMAT_AL88,		/*                     AAAA AAAA LLLL LLLL */
+   MESA_FORMAT_RGB332,		/*                               RRRG GGBB */
+   MESA_FORMAT_A8,		/*                               AAAA AAAA */
+   MESA_FORMAT_L8,		/*                               LLLL LLLL */
+   MESA_FORMAT_I8,		/*                               IIII IIII */
+   MESA_FORMAT_CI8,		/*                               CCCC CCCC */
+   MESA_FORMAT_YCBCR,		/*                     YYYY YYYY UorV UorV */
+   MESA_FORMAT_YCBCR_REV,	/*                     UorV UorV YYYY YYYY */
+   /*@}*/
+
+   MESA_FORMAT_RGB_FXT1,
+   MESA_FORMAT_RGBA_FXT1,
+   MESA_FORMAT_RGB_DXT1,
+   MESA_FORMAT_RGBA_DXT1,
+   MESA_FORMAT_RGBA_DXT3,
+   MESA_FORMAT_RGBA_DXT5,
+
+#if 0
+   /** 
+    * \name Upcoming little-endian formats 
+    */
+   /*@{*/
+				/* msb <------ TEXEL BITS -----------> lsb */
+				/* ---- ---- ---- ---- ---- ---- ---- ---- */
+   MESA_FORMAT_ABGR8888,	/* AAAA AAAA BBBB BBBB GGGG GGGG RRRR RRRR */
+   MESA_FORMAT_BGRA8888,	/* BBBB BBBB GGGG GGGG RRRR RRRR AAAA AAAA */
+   MESA_FORMAT_BGR888,		/*           BBBB BBBB GGGG GGGG RRRR RRRR */
+   MESA_FORMAT_BGR565,		/*                     BBBB BGGG GGGR RRRR */
+   MESA_FORMAT_BGRA4444,	/*                     BBBB GGGG RRRR AAAA */
+   MESA_FORMAT_BGRA5551,	/*                     BBBB BGGG GGRR RRRA */
+   MESA_FORMAT_LA88,		/*                     LLLL LLLL AAAA AAAA */
+   MESA_FORMAT_BGR233,		/*                               BBGG GRRR */
+   /*@}*/
+#endif
+
+   /**
+    * \name Generic GLchan-based formats.
+    *
+    * These are the default formats used by the software rasterizer and, unless
+    * the driver overrides the texture image functions, incoming images will be
+    * converted to one of these formats.  Components are arrays of GLchan
+    * values, so there will be no big/little endian issues.
+    *
+    * \note Because these are based on the GLchan data type, one cannot assume 8
+    * bits per channel with these formats.  If you require GLubyte channels,
+    * use one of the hardware formats above.
+    */
+   /*@{*/
+   MESA_FORMAT_RGBA,
+   MESA_FORMAT_RGB,
+   MESA_FORMAT_ALPHA,
+   MESA_FORMAT_LUMINANCE,
+   MESA_FORMAT_LUMINANCE_ALPHA,
+   MESA_FORMAT_INTENSITY,
+   MESA_FORMAT_COLOR_INDEX,
+   MESA_FORMAT_DEPTH_COMPONENT
+   /*@}*/
+};
+
+
+extern GLboolean
+_mesa_is_hardware_tex_format( const struct gl_texture_format *format );
+
+extern const struct gl_texture_format *
+_mesa_choose_tex_format( GLcontext *ctx, GLint internalFormat,
+                         GLenum format, GLenum type );
+
+extern GLint
+_mesa_base_compressed_texformat(GLcontext *ctx, GLint intFormat);
+
+
+/** The default formats, GLchan per component */
+/*@{*/
+extern const struct gl_texture_format _mesa_texformat_rgba;
+extern const struct gl_texture_format _mesa_texformat_rgb;
+extern const struct gl_texture_format _mesa_texformat_alpha;
+extern const struct gl_texture_format _mesa_texformat_luminance;
+extern const struct gl_texture_format _mesa_texformat_luminance_alpha;
+extern const struct gl_texture_format _mesa_texformat_intensity;
+extern const struct gl_texture_format _mesa_texformat_color_index;
+extern const struct gl_texture_format _mesa_texformat_depth_component;
+/*@}*/
+
+/** \name The hardware-friendly formats */
+/*@{*/
+extern const struct gl_texture_format _mesa_texformat_rgba8888;
+extern const struct gl_texture_format _mesa_texformat_argb8888;
+extern const struct gl_texture_format _mesa_texformat_rgb888;
+extern const struct gl_texture_format _mesa_texformat_rgb565;
+extern const struct gl_texture_format _mesa_texformat_argb4444;
+extern const struct gl_texture_format _mesa_texformat_argb1555;
+extern const struct gl_texture_format _mesa_texformat_al88;
+extern const struct gl_texture_format _mesa_texformat_rgb332;
+extern const struct gl_texture_format _mesa_texformat_a8;
+extern const struct gl_texture_format _mesa_texformat_l8;
+extern const struct gl_texture_format _mesa_texformat_i8;
+extern const struct gl_texture_format _mesa_texformat_ci8;
+extern const struct gl_texture_format _mesa_texformat_ycbcr;
+extern const struct gl_texture_format _mesa_texformat_ycbcr_rev;
+extern const struct gl_texture_format _mesa_texformat_rgb_fxt1;
+extern const struct gl_texture_format _mesa_texformat_rgba_fxt1;
+extern const struct gl_texture_format _mesa_texformat_rgb_dxt1;
+extern const struct gl_texture_format _mesa_texformat_rgba_dxt1;
+extern const struct gl_texture_format _mesa_texformat_rgba_dxt3;
+extern const struct gl_texture_format _mesa_texformat_rgba_dxt5;
+/*@}*/
+
+/** \name The null format */
+/*@{*/
+extern const struct gl_texture_format _mesa_null_texformat;
+/*@}*/
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/texformat_tmp.h b/reactos/lib/mesa32/src/main/texformat_tmp.h
new file mode 100644
index 00000000000..75090f854e3
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/texformat_tmp.h
@@ -0,0 +1,529 @@
+/**
+ * \file texformat_tmp.h
+ * Texel fetch functions template.
+ * 
+ * This template file is used by texformat.c to generate texel fetch functions
+ * for 1-D, 2-D and 3-D texture images. 
+ *
+ * It should be expanded by definining \p DIM as the number texture dimensions
+ * (1, 2 or 3).  According to the value of \p DIM a serie of macros is defined
+ * for the texel lookup in the gl_texture_image::Data.
+ * 
+ * \sa texformat.c and FetchTexel.
+ * 
+ * \author Gareth Hughes
+ * \author Brian Paul
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0.1
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#if DIM == 1
+
+#define CHAN_SRC( t, i, j, k, sz )					\
+	((GLchan *)(t)->Data + (i) * (sz))
+#define UBYTE_SRC( t, i, j, k, sz )					\
+	((GLubyte *)(t)->Data + (i) * (sz))
+#define USHORT_SRC( t, i, j, k )					\
+	((GLushort *)(t)->Data + (i))
+#define FLOAT_SRC( t, i, j, k )						\
+	((GLfloat *)(t)->Data + (i))
+
+#define FETCH(x) fetch_1d_texel_##x
+
+#elif DIM == 2
+
+#define CHAN_SRC( t, i, j, k, sz )					\
+	((GLchan *)(t)->Data + ((t)->RowStride * (j) + (i)) * (sz))
+#define UBYTE_SRC( t, i, j, k, sz )					\
+	((GLubyte *)(t)->Data + ((t)->RowStride * (j) + (i)) * (sz))
+#define USHORT_SRC( t, i, j, k )					\
+	((GLushort *)(t)->Data + ((t)->RowStride * (j) + (i)))
+#define FLOAT_SRC( t, i, j, k )						\
+	((GLfloat *)(t)->Data + ((t)->RowStride * (j) + (i)))
+
+#define FETCH(x) fetch_2d_texel_##x
+
+#elif DIM == 3
+
+#define CHAN_SRC( t, i, j, k, sz )					\
+	(GLchan *)(t)->Data + (((t)->Height * (k) + (j)) *		\
+				(t)->RowStride + (i)) * (sz)
+#define UBYTE_SRC( t, i, j, k, sz )					\
+	((GLubyte *)(t)->Data + (((t)->Height * (k) + (j)) *		\
+				 (t)->RowStride + (i)) * (sz))
+#define USHORT_SRC( t, i, j, k )					\
+	((GLushort *)(t)->Data + (((t)->Height * (k) + (j)) *		\
+				  (t)->RowStride + (i)))
+#define FLOAT_SRC( t, i, j, k )						\
+	((GLfloat *)(t)->Data + (((t)->Height * (k) + (j)) *		\
+				  (t)->RowStride + (i)))
+
+#define FETCH(x) fetch_3d_texel_##x
+
+#else
+#error	illegal number of texture dimensions
+#endif
+
+
+static void FETCH(rgba)( const struct gl_texture_image *texImage,
+			 GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   const GLchan *src = CHAN_SRC( texImage, i, j, k, 4 );
+   GLchan *rgba = (GLchan *) texel;
+   COPY_CHAN4( rgba, src );
+}
+
+static void FETCH(rgb)( const struct gl_texture_image *texImage,
+			GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   const GLchan *src = CHAN_SRC( texImage, i, j, k, 3 );
+   GLchan *rgba = (GLchan *) texel;
+   rgba[RCOMP] = src[0];
+   rgba[GCOMP] = src[1];
+   rgba[BCOMP] = src[2];
+   rgba[ACOMP] = CHAN_MAX;
+}
+
+static void FETCH(alpha)( const struct gl_texture_image *texImage,
+			  GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   const GLchan *src = CHAN_SRC( texImage, i, j, k, 1 );
+   GLchan *rgba = (GLchan *) texel;
+   rgba[RCOMP] = 0;
+   rgba[GCOMP] = 0;
+   rgba[BCOMP] = 0;
+   rgba[ACOMP] = src[0];
+}
+
+static void FETCH(luminance)( const struct gl_texture_image *texImage,
+			      GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   const GLchan *src = CHAN_SRC( texImage, i, j, k, 1 );
+   GLchan *rgba = (GLchan *) texel;
+   rgba[RCOMP] = src[0];
+   rgba[GCOMP] = src[0];
+   rgba[BCOMP] = src[0];
+   rgba[ACOMP] = CHAN_MAX;
+}
+
+static void FETCH(luminance_alpha)( const struct gl_texture_image *texImage,
+				    GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   const GLchan *src = CHAN_SRC( texImage, i, j, k, 2 );
+   GLchan *rgba = (GLchan *) texel;
+   rgba[RCOMP] = src[0];
+   rgba[GCOMP] = src[0];
+   rgba[BCOMP] = src[0];
+   rgba[ACOMP] = src[1];
+}
+
+static void FETCH(intensity)( const struct gl_texture_image *texImage,
+			      GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   const GLchan *src = CHAN_SRC( texImage, i, j, k, 1 );
+   GLchan *rgba = (GLchan *) texel;
+   rgba[RCOMP] = src[0];
+   rgba[GCOMP] = src[0];
+   rgba[BCOMP] = src[0];
+   rgba[ACOMP] = src[0];
+}
+
+static void FETCH(color_index)( const struct gl_texture_image *texImage,
+				GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   const GLchan *src = CHAN_SRC( texImage, i, j, k, 1 );
+   GLchan *index = (GLchan *) texel;
+   *index = *src;
+}
+
+static void FETCH(depth_component)( const struct gl_texture_image *texImage,
+				    GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   const GLfloat *src = FLOAT_SRC( texImage, i, j, k );
+   GLfloat *depth = (GLfloat *) texel;
+   *depth = *src;
+}
+
+static void FETCH(rgba8888)( const struct gl_texture_image *texImage,
+			     GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   const GLubyte *src = UBYTE_SRC( texImage, i, j, k, 4 );
+   GLchan *rgba = (GLchan *) texel;
+   rgba[RCOMP] = UBYTE_TO_CHAN( src[3] );
+   rgba[GCOMP] = UBYTE_TO_CHAN( src[2] );
+   rgba[BCOMP] = UBYTE_TO_CHAN( src[1] );
+   rgba[ACOMP] = UBYTE_TO_CHAN( src[0] );
+}
+
+static void FETCH(argb8888)( const struct gl_texture_image *texImage,
+			     GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   const GLubyte *src = UBYTE_SRC( texImage, i, j, k, 4 );
+   GLchan *rgba = (GLchan *) texel;
+   rgba[RCOMP] = UBYTE_TO_CHAN( src[2] );
+   rgba[GCOMP] = UBYTE_TO_CHAN( src[1] );
+   rgba[BCOMP] = UBYTE_TO_CHAN( src[0] );
+   rgba[ACOMP] = UBYTE_TO_CHAN( src[3] );
+}
+
+static void FETCH(rgb888)( const struct gl_texture_image *texImage,
+			   GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   const GLubyte *src = UBYTE_SRC( texImage, i, j, k, 3 );
+   GLchan *rgba = (GLchan *) texel;
+   rgba[RCOMP] = UBYTE_TO_CHAN( src[2] );
+   rgba[GCOMP] = UBYTE_TO_CHAN( src[1] );
+   rgba[BCOMP] = UBYTE_TO_CHAN( src[0] );
+   rgba[ACOMP] = CHAN_MAX;
+}
+
+static void FETCH(rgb565)( const struct gl_texture_image *texImage,
+			   GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   const GLushort *src = USHORT_SRC( texImage, i, j, k );
+   const GLushort s = *src;
+   GLchan *rgba = (GLchan *) texel;
+   rgba[RCOMP] = UBYTE_TO_CHAN( ((s >> 8) & 0xf8) * 255 / 0xf8 );
+   rgba[GCOMP] = UBYTE_TO_CHAN( ((s >> 3) & 0xfc) * 255 / 0xfc );
+   rgba[BCOMP] = UBYTE_TO_CHAN( ((s << 3) & 0xf8) * 255 / 0xf8 );
+   rgba[ACOMP] = CHAN_MAX;
+}
+
+static void FETCH(argb4444)( const struct gl_texture_image *texImage,
+			     GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   const GLushort *src = USHORT_SRC( texImage, i, j, k );
+   const GLushort s = *src;
+   GLchan *rgba = (GLchan *) texel;
+   rgba[RCOMP] = UBYTE_TO_CHAN( ((s >>  8) & 0xf) * 255 / 0xf );
+   rgba[GCOMP] = UBYTE_TO_CHAN( ((s >>  4) & 0xf) * 255 / 0xf );
+   rgba[BCOMP] = UBYTE_TO_CHAN( ((s      ) & 0xf) * 255 / 0xf );
+   rgba[ACOMP] = UBYTE_TO_CHAN( ((s >> 12) & 0xf) * 255 / 0xf );
+}
+
+static void FETCH(argb1555)( const struct gl_texture_image *texImage,
+			     GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   const GLushort *src = USHORT_SRC( texImage, i, j, k );
+   const GLushort s = *src;
+   GLchan *rgba = (GLchan *) texel;
+   rgba[RCOMP] = UBYTE_TO_CHAN( ((s >> 10) & 0x1f) * 255 / 0x1f );
+   rgba[GCOMP] = UBYTE_TO_CHAN( ((s >>  5) & 0x1f) * 255 / 0x1f );
+   rgba[BCOMP] = UBYTE_TO_CHAN( ((s      ) & 0x1f) * 255 / 0x1f );
+   rgba[ACOMP] = UBYTE_TO_CHAN( ((s >> 15) & 0x01) * 255 );
+}
+
+static void FETCH(al88)( const struct gl_texture_image *texImage,
+			 GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   const GLubyte *src = UBYTE_SRC( texImage, i, j, k, 2 );
+   GLchan *rgba = (GLchan *) texel;
+   rgba[RCOMP] = UBYTE_TO_CHAN( src[0] );
+   rgba[GCOMP] = UBYTE_TO_CHAN( src[0] );
+   rgba[BCOMP] = UBYTE_TO_CHAN( src[0] );
+   rgba[ACOMP] = UBYTE_TO_CHAN( src[1] );
+}
+
+static void FETCH(rgb332)( const struct gl_texture_image *texImage,
+			   GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   const GLubyte *src = UBYTE_SRC( texImage, i, j, k, 1 );
+   const GLubyte s = *src;
+   GLchan *rgba = (GLchan *) texel;
+   rgba[RCOMP] = UBYTE_TO_CHAN( ((s     ) & 0xe0) * 255 / 0xe0 );
+   rgba[GCOMP] = UBYTE_TO_CHAN( ((s << 3) & 0xe0) * 255 / 0xe0 );
+   rgba[BCOMP] = UBYTE_TO_CHAN( ((s << 6) & 0xc0) * 255 / 0xc0 );
+   rgba[ACOMP] = CHAN_MAX;
+}
+
+static void FETCH(a8)( const struct gl_texture_image *texImage,
+		       GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   const GLubyte *src = UBYTE_SRC( texImage, i, j, k, 1 );
+   GLchan *rgba = (GLchan *) texel;
+   rgba[RCOMP] = 0;
+   rgba[GCOMP] = 0;
+   rgba[BCOMP] = 0;
+   rgba[ACOMP] = UBYTE_TO_CHAN( src[0] );
+}
+
+static void FETCH(l8)( const struct gl_texture_image *texImage,
+		       GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   const GLubyte *src = UBYTE_SRC( texImage, i, j, k, 1 );
+   GLchan *rgba = (GLchan *) texel;
+   rgba[RCOMP] = UBYTE_TO_CHAN( src[0] );
+   rgba[GCOMP] = UBYTE_TO_CHAN( src[0] );
+   rgba[BCOMP] = UBYTE_TO_CHAN( src[0] );
+   rgba[ACOMP] = CHAN_MAX;
+}
+
+static void FETCH(i8)( const struct gl_texture_image *texImage,
+		       GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   const GLubyte *src = UBYTE_SRC( texImage, i, j, k, 1 );
+   GLchan *rgba = (GLchan *) texel;
+   rgba[RCOMP] = UBYTE_TO_CHAN( src[0] );
+   rgba[GCOMP] = UBYTE_TO_CHAN( src[0] );
+   rgba[BCOMP] = UBYTE_TO_CHAN( src[0] );
+   rgba[ACOMP] = UBYTE_TO_CHAN( src[0] );
+}
+
+static void FETCH(ci8)( const struct gl_texture_image *texImage,
+			GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   const GLubyte *src = UBYTE_SRC( texImage, i, j, k, 1 );
+   GLchan *index = (GLchan *) texel;
+   *index = UBYTE_TO_CHAN( *src );
+}
+
+/* XXX this may break if GLchan != GLubyte */
+static void FETCH(ycbcr)( const struct gl_texture_image *texImage,
+                          GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   const GLushort *src0 = USHORT_SRC( texImage, (i & ~1), j, k ); /* even */
+   const GLushort *src1 = src0 + 1;                               /* odd */
+   const GLubyte y0 = (*src0 >> 8) & 0xff;  /* luminance */
+   const GLubyte cb = *src0 & 0xff;         /* chroma U */
+   const GLubyte y1 = (*src1 >> 8) & 0xff;  /* luminance */
+   const GLubyte cr = *src1 & 0xff;         /* chroma V */
+   GLchan *rgba = (GLchan *) texel;
+   GLint r, g, b;
+   if (i & 1) {
+      /* odd pixel: use y1,cr,cb */
+      r = (GLint) (1.164 * (y1-16) + 1.596 * (cr-128));
+      g = (GLint) (1.164 * (y1-16) - 0.813 * (cr-128) - 0.391 * (cb-128));
+      b = (GLint) (1.164 * (y1-16) + 2.018 * (cb-128));
+   }
+   else {
+      /* even pixel: use y0,cr,cb */
+      r = (GLint) (1.164 * (y0-16) + 1.596 * (cr-128));
+      g = (GLint) (1.164 * (y0-16) - 0.813 * (cr-128) - 0.391 * (cb-128));
+      b = (GLint) (1.164 * (y0-16) + 2.018 * (cb-128));
+   }
+   rgba[RCOMP] = CLAMP(r, 0, CHAN_MAX);
+   rgba[GCOMP] = CLAMP(g, 0, CHAN_MAX);
+   rgba[BCOMP] = CLAMP(b, 0, CHAN_MAX);
+   rgba[ACOMP] = CHAN_MAX;
+}
+
+/* XXX this may break if GLchan != GLubyte */
+static void FETCH(ycbcr_rev)( const struct gl_texture_image *texImage,
+                              GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   const GLushort *src0 = USHORT_SRC( texImage, (i & ~1), j, k ); /* even */
+   const GLushort *src1 = src0 + 1;                               /* odd */
+   const GLubyte y0 = *src0 & 0xff;         /* luminance */
+   const GLubyte cr = (*src0 >> 8) & 0xff;  /* chroma V */
+   const GLubyte y1 = *src1 & 0xff;         /* luminance */
+   const GLubyte cb = (*src1 >> 8) & 0xff;  /* chroma U */
+   GLchan *rgba = (GLchan *) texel;
+   GLint r, g, b;
+   if (i & 1) {
+      /* odd pixel: use y1,cr,cb */
+      r = (GLint) (1.164 * (y1-16) + 1.596 * (cr-128));
+      g = (GLint) (1.164 * (y1-16) - 0.813 * (cr-128) - 0.391 * (cb-128));
+      b = (GLint) (1.164 * (y1-16) + 2.018 * (cb-128));
+   }
+   else {
+      /* even pixel: use y0,cr,cb */
+      r = (GLint) (1.164 * (y0-16) + 1.596 * (cr-128));
+      g = (GLint) (1.164 * (y0-16) - 0.813 * (cr-128) - 0.391 * (cb-128));
+      b = (GLint) (1.164 * (y0-16) + 2.018 * (cb-128));
+   }
+   rgba[RCOMP] = CLAMP(r, 0, CHAN_MAX);
+   rgba[GCOMP] = CLAMP(g, 0, CHAN_MAX);
+   rgba[BCOMP] = CLAMP(b, 0, CHAN_MAX);
+   rgba[ACOMP] = CHAN_MAX;
+}
+
+
+#if DIM == 2
+static void FETCH(rgb_fxt1)( const struct gl_texture_image *texImage,
+                             GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   /* Extract the (i,j) pixel from texImage->Data and return it
+    * in texel[RCOMP], texel[GCOMP], texel[BCOMP], texel[ACOMP].
+    */
+}
+#endif
+
+#if DIM == 2
+static void FETCH(rgba_fxt1)( const struct gl_texture_image *texImage,
+                              GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   /* Extract the (i,j) pixel from texImage->Data and return it
+    * in texel[RCOMP], texel[GCOMP], texel[BCOMP], texel[ACOMP].
+    */
+}
+#endif
+
+
+#if DIM == 2
+static void FETCH(rgb_dxt1)( const struct gl_texture_image *texImage,
+                             GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   /* Extract the (i,j) pixel from texImage->Data and return it
+    * in texel[RCOMP], texel[GCOMP], texel[BCOMP], texel[ACOMP].
+    */
+}
+#endif
+
+#if DIM == 2
+static void FETCH(rgba_dxt1)( const struct gl_texture_image *texImage,
+                              GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   /* Extract the (i,j) pixel from texImage->Data and return it
+    * in texel[RCOMP], texel[GCOMP], texel[BCOMP], texel[ACOMP].
+    */
+}
+#endif
+
+#if DIM == 2
+static void FETCH(rgba_dxt3)( const struct gl_texture_image *texImage,
+                              GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   /* Extract the (i,j) pixel from texImage->Data and return it
+    * in texel[RCOMP], texel[GCOMP], texel[BCOMP], texel[ACOMP].
+    */
+}
+#endif
+
+#if DIM == 2
+static void FETCH(rgba_dxt5)( const struct gl_texture_image *texImage,
+                              GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   /* Extract the (i,j) pixel from texImage->Data and return it
+    * in texel[RCOMP], texel[GCOMP], texel[BCOMP], texel[ACOMP].
+    */
+}
+#endif
+
+
+
+/* big-endian */
+
+#if 0
+static void FETCH(abgr8888)( const struct gl_texture_image *texImage,
+			     GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   const GLubyte *src = UBYTE_SRC( texImage, i, j, k, 4 );
+   GLchan *rgba = (GLchan *) texel;
+   rgba[RCOMP] = UBYTE_TO_CHAN( src[3] );
+   rgba[GCOMP] = UBYTE_TO_CHAN( src[2] );
+   rgba[BCOMP] = UBYTE_TO_CHAN( src[1] );
+   rgba[ACOMP] = UBYTE_TO_CHAN( src[0] );
+}
+
+static void FETCH(bgra8888)( const struct gl_texture_image *texImage,
+			     GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   const GLubyte *src = UBYTE_SRC( texImage, i, j, k, 4 );
+   GLchan *rgba = (GLchan *) texel;
+   rgba[RCOMP] = UBYTE_TO_CHAN( src[2] );
+   rgba[GCOMP] = UBYTE_TO_CHAN( src[1] );
+   rgba[BCOMP] = UBYTE_TO_CHAN( src[0] );
+   rgba[ACOMP] = UBYTE_TO_CHAN( src[3] );
+}
+
+static void FETCH(bgr888)( const struct gl_texture_image *texImage,
+			   GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   const GLubyte *src = UBYTE_SRC( texImage, i, j, k, 3 );
+   GLchan *rgba = (GLchan *) texel;
+   rgba[RCOMP] = UBYTE_TO_CHAN( src[2] );
+   rgba[GCOMP] = UBYTE_TO_CHAN( src[1] );
+   rgba[BCOMP] = UBYTE_TO_CHAN( src[0] );
+   rgba[ACOMP] = CHAN_MAX;
+}
+
+static void FETCH(bgr565)( const struct gl_texture_image *texImage,
+			   GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   const GLushort *src = USHORT_SRC( texImage, i, j, k );
+   const GLushort s = *src;
+   GLchan *rgba = (GLchan *) texel;
+   rgba[RCOMP] = UBYTE_TO_CHAN( ((s >> 8) & 0xf8) * 255 / 0xf8 );
+   rgba[GCOMP] = UBYTE_TO_CHAN( ((s >> 3) & 0xfc) * 255 / 0xfc );
+   rgba[BCOMP] = UBYTE_TO_CHAN( ((s << 3) & 0xf8) * 255 / 0xf8 );
+   rgba[ACOMP] = CHAN_MAX;
+}
+
+static void FETCH(bgra4444)( const struct gl_texture_image *texImage,
+			     GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   const GLushort *src = USHORT_SRC( texImage, i, j, k );
+   const GLushort s = *src;
+   GLchan *rgba = (GLchan *) texel;
+   rgba[RCOMP] = UBYTE_TO_CHAN( ((s >>  8) & 0xf) * 255 / 0xf );
+   rgba[GCOMP] = UBYTE_TO_CHAN( ((s >>  4) & 0xf) * 255 / 0xf );
+   rgba[BCOMP] = UBYTE_TO_CHAN( ((s      ) & 0xf) * 255 / 0xf );
+   rgba[ACOMP] = UBYTE_TO_CHAN( ((s >> 12) & 0xf) * 255 / 0xf );
+}
+
+static void FETCH(bgra5551)( const struct gl_texture_image *texImage,
+			     GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   const GLushort *src = USHORT_SRC( texImage, i, j, k );
+   const GLushort s = *src;
+   GLchan *rgba = (GLchan *) texel;
+   rgba[RCOMP] = UBYTE_TO_CHAN( ((s >> 10) & 0x1f) * 255 / 0x1f );
+   rgba[GCOMP] = UBYTE_TO_CHAN( ((s >>  5) & 0x1f) * 255 / 0x1f );
+   rgba[BCOMP] = UBYTE_TO_CHAN( ((s      ) & 0x1f) * 255 / 0x1f );
+   rgba[ACOMP] = UBYTE_TO_CHAN( ((s >> 15) & 0x01) * 255 );
+}
+
+static void FETCH(la88)( const struct gl_texture_image *texImage,
+			 GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   const GLubyte *src = UBYTE_SRC( texImage, i, j, k, 2 );
+   GLchan *rgba = (GLchan *) texel;
+   rgba[RCOMP] = UBYTE_TO_CHAN( src[0] );
+   rgba[GCOMP] = UBYTE_TO_CHAN( src[0] );
+   rgba[BCOMP] = UBYTE_TO_CHAN( src[0] );
+   rgba[ACOMP] = UBYTE_TO_CHAN( src[1] );
+}
+
+static void FETCH(bgr233)( const struct gl_texture_image *texImage,
+			   GLint i, GLint j, GLint k, GLvoid *texel )
+{
+   const GLubyte *src = UBYTE_SRC( texImage, i, j, k, 1 );
+   const GLubyte s = *src;
+   GLchan *rgba = (GLchan *) texel;
+   rgba[RCOMP] = UBYTE_TO_CHAN( ((s     ) & 0xe0) * 255 / 0xe0 );
+   rgba[GCOMP] = UBYTE_TO_CHAN( ((s << 3) & 0xe0) * 255 / 0xe0 );
+   rgba[BCOMP] = UBYTE_TO_CHAN( ((s << 5) & 0xc0) * 255 / 0xc0 );
+   rgba[ACOMP] = CHAN_MAX;
+}
+#endif
+
+
+#undef CHAN_SRC
+#undef UBYTE_SRC
+#undef USHORT_SRC
+#undef FLOAT_SRC
+#undef FETCH
+#undef DIM
diff --git a/reactos/lib/mesa32/src/main/teximage.c b/reactos/lib/mesa32/src/main/teximage.c
new file mode 100644
index 00000000000..c47d9dce712
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/teximage.c
@@ -0,0 +1,3204 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0.1
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/**
+ * \file teximage.c
+ * Texture images manipulation functions.
+ *
+ * \note Mesa's native texture data type is GLchan.  Native formats are
+ * GL_ALPHA, GL_LUMINANCE, GL_LUMANCE_ALPHA, GL_INTENSITY, GL_RGB, GL_RGBA, and
+ * GL_COLOR_INDEX.
+ *
+ * \note Device drivers are free to implement any internal format they want.
+ */
+
+
+#include "glheader.h"
+#include "context.h"
+#include "convolve.h"
+#include "image.h"
+#include "imports.h"
+#include "macros.h"
+#include "state.h"
+#include "texcompress.h"
+#include "texformat.h"
+#include "teximage.h"
+#include "texstate.h"
+#include "texstore.h"
+#include "mtypes.h"
+
+
+#if 0
+static void PrintTexture(GLcontext *ctx, const struct gl_texture_image *img)
+{
+#if CHAN_TYPE == GL_FLOAT
+   _mesa_problem(NULL, "PrintTexture doesn't support float channels");
+#else
+   GLuint i, j, c;
+   const GLchan *data = (const GLchan *) img->Data;
+
+   if (!data) {
+      _mesa_printf("No texture data\n");
+      return;
+   }
+
+   switch (img->Format) {
+      case GL_ALPHA:
+      case GL_LUMINANCE:
+      case GL_INTENSITY:
+      case GL_COLOR_INDEX:
+         c = 1;
+         break;
+      case GL_LUMINANCE_ALPHA:
+         c = 2;
+         break;
+      case GL_RGB:
+         c = 3;
+         break;
+      case GL_RGBA:
+         c = 4;
+         break;
+      default:
+         _mesa_problem(NULL, "error in PrintTexture\n");
+         return;
+   }
+
+   for (i = 0; i < img->Height; i++) {
+      for (j = 0; j < img->Width; j++) {
+         if (c==1)
+            _mesa_printf("%02x  ", data[0]);
+         else if (c==2)
+            _mesa_printf("%02x%02x  ", data[0], data[1]);
+         else if (c==3)
+            _mesa_printf("%02x%02x%02x  ", data[0], data[1], data[2]);
+         else if (c==4)
+            _mesa_printf("%02x%02x%02x%02x  ", data[0], data[1], data[2], data[3]);
+         data += (img->RowStride - img->Width) * c;
+      }
+      _mesa_printf("\n");
+   }
+#endif
+}
+#endif
+
+
+/*
+ * Compute floor(log_base_2(n)).
+ * If n < 0 return -1.
+ */
+static int
+logbase2( int n )
+{
+   GLint i = 1;
+   GLint log2 = 0;
+
+   if (n < 0)
+      return -1;
+
+   if (n == 0)
+      return 0;
+
+   while ( n > i ) {
+      i *= 2;
+      log2++;
+   }
+   if (i != n) {
+      return log2 - 1;
+   }
+   else {
+      return log2;
+   }
+}
+
+
+
+/**
+ * Get base internal format.
+ *
+ * \param ctx GL context.
+ * \param format internal texture format enum or 1, 2, 3, 4.
+ *
+ * \return the corresponding \u base internal format (GL_ALPHA, GL_LUMINANCE,
+ * GL_LUMANCE_ALPHA, GL_INTENSITY, GL_RGB, or GL_RGBA), or -1 if invalid enum.
+ *
+ * This is the format which is used during texture application (i.e. the
+ * texture format and env mode determine the arithmetic used.
+ */
+GLint
+_mesa_base_tex_format( GLcontext *ctx, GLint format )
+{
+   /*
+    * Ask the driver for the base format, if it doesn't
+    * know, it will return -1;
+    */
+   switch (format) {
+      case GL_ALPHA:
+      case GL_ALPHA4:
+      case GL_ALPHA8:
+      case GL_ALPHA12:
+      case GL_ALPHA16:
+         return GL_ALPHA;
+      case 1:
+      case GL_LUMINANCE:
+      case GL_LUMINANCE4:
+      case GL_LUMINANCE8:
+      case GL_LUMINANCE12:
+      case GL_LUMINANCE16:
+         return GL_LUMINANCE;
+      case 2:
+      case GL_LUMINANCE_ALPHA:
+      case GL_LUMINANCE4_ALPHA4:
+      case GL_LUMINANCE6_ALPHA2:
+      case GL_LUMINANCE8_ALPHA8:
+      case GL_LUMINANCE12_ALPHA4:
+      case GL_LUMINANCE12_ALPHA12:
+      case GL_LUMINANCE16_ALPHA16:
+         return GL_LUMINANCE_ALPHA;
+      case GL_INTENSITY:
+      case GL_INTENSITY4:
+      case GL_INTENSITY8:
+      case GL_INTENSITY12:
+      case GL_INTENSITY16:
+         return GL_INTENSITY;
+      case 3:
+      case GL_RGB:
+      case GL_R3_G3_B2:
+      case GL_RGB4:
+      case GL_RGB5:
+      case GL_RGB8:
+      case GL_RGB10:
+      case GL_RGB12:
+      case GL_RGB16:
+         return GL_RGB;
+      case 4:
+      case GL_RGBA:
+      case GL_RGBA2:
+      case GL_RGBA4:
+      case GL_RGB5_A1:
+      case GL_RGBA8:
+      case GL_RGB10_A2:
+      case GL_RGBA12:
+      case GL_RGBA16:
+         return GL_RGBA;
+      case GL_COLOR_INDEX:
+      case GL_COLOR_INDEX1_EXT:
+      case GL_COLOR_INDEX2_EXT:
+      case GL_COLOR_INDEX4_EXT:
+      case GL_COLOR_INDEX8_EXT:
+      case GL_COLOR_INDEX12_EXT:
+      case GL_COLOR_INDEX16_EXT:
+         if (ctx->Extensions.EXT_paletted_texture)
+            return GL_COLOR_INDEX;
+         else
+            return -1;
+      case GL_DEPTH_COMPONENT:
+      case GL_DEPTH_COMPONENT16_SGIX:
+      case GL_DEPTH_COMPONENT24_SGIX:
+      case GL_DEPTH_COMPONENT32_SGIX:
+         if (ctx->Extensions.SGIX_depth_texture)
+            return GL_DEPTH_COMPONENT;
+         else
+            return -1;
+
+      /* GL_ARB_texture_compression */
+      case GL_COMPRESSED_ALPHA:
+         if (ctx->Extensions.ARB_texture_compression)
+            return GL_ALPHA;
+         else
+            return -1;
+      case GL_COMPRESSED_LUMINANCE:
+         if (ctx->Extensions.ARB_texture_compression)
+            return GL_LUMINANCE;
+         else
+            return -1;
+      case GL_COMPRESSED_LUMINANCE_ALPHA:
+         if (ctx->Extensions.ARB_texture_compression)
+            return GL_LUMINANCE_ALPHA;
+         else
+            return -1;
+      case GL_COMPRESSED_INTENSITY:
+         if (ctx->Extensions.ARB_texture_compression)
+            return GL_INTENSITY;
+         else
+            return -1;
+      case GL_COMPRESSED_RGB:
+         if (ctx->Extensions.ARB_texture_compression)
+            return GL_RGB;
+         else
+            return -1;
+      case GL_COMPRESSED_RGBA:
+         if (ctx->Extensions.ARB_texture_compression)
+            return GL_RGBA;
+         else
+            return -1;
+      case GL_COMPRESSED_RGB_FXT1_3DFX:
+         if (ctx->Extensions.TDFX_texture_compression_FXT1)
+            return GL_RGB;
+         else
+            return -1;
+      case GL_COMPRESSED_RGBA_FXT1_3DFX:
+         if (ctx->Extensions.TDFX_texture_compression_FXT1)
+            return GL_RGBA;
+         else
+            return -1;
+      case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
+         if (ctx->Extensions.EXT_texture_compression_s3tc)
+            return GL_RGB;
+         else
+            return -1;
+      case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
+      case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
+      case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
+         if (ctx->Extensions.EXT_texture_compression_s3tc)
+            return GL_RGBA;
+         else
+            return -1;
+      case GL_RGB_S3TC:
+      case GL_RGB4_S3TC:
+         if (ctx->Extensions.S3_s3tc)
+            return GL_RGB;
+         else
+            return -1;
+      case GL_RGBA_S3TC:
+      case GL_RGBA4_S3TC:
+         if (ctx->Extensions.S3_s3tc)
+            return GL_RGBA;
+         else
+            return -1;
+
+      case GL_YCBCR_MESA:
+         if (ctx->Extensions.MESA_ycbcr_texture)
+            return GL_YCBCR_MESA;
+         else
+            return -1;
+
+      default:
+         return -1;  /* error */
+   }
+}
+
+
+/**
+ * Test if the given image format is a color/RGBA format, i.e., not
+ * color index, depth, stencil, etc.
+ */
+static GLboolean
+is_color_format(GLenum format)
+{
+   switch (format) {
+      case GL_ALPHA:
+      case GL_ALPHA4:
+      case GL_ALPHA8:
+      case GL_ALPHA12:
+      case GL_ALPHA16:
+      case 1:
+      case GL_LUMINANCE:
+      case GL_LUMINANCE4:
+      case GL_LUMINANCE8:
+      case GL_LUMINANCE12:
+      case GL_LUMINANCE16:
+      case 2:
+      case GL_LUMINANCE_ALPHA:
+      case GL_LUMINANCE4_ALPHA4:
+      case GL_LUMINANCE6_ALPHA2:
+      case GL_LUMINANCE8_ALPHA8:
+      case GL_LUMINANCE12_ALPHA4:
+      case GL_LUMINANCE12_ALPHA12:
+      case GL_LUMINANCE16_ALPHA16:
+      case GL_INTENSITY:
+      case GL_INTENSITY4:
+      case GL_INTENSITY8:
+      case GL_INTENSITY12:
+      case GL_INTENSITY16:
+      case 3:
+      case GL_RGB:
+      case GL_R3_G3_B2:
+      case GL_RGB4:
+      case GL_RGB5:
+      case GL_RGB8:
+      case GL_RGB10:
+      case GL_RGB12:
+      case GL_RGB16:
+      case 4:
+      case GL_RGBA:
+      case GL_RGBA2:
+      case GL_RGBA4:
+      case GL_RGB5_A1:
+      case GL_RGBA8:
+      case GL_RGB10_A2:
+      case GL_RGBA12:
+      case GL_RGBA16:
+         return GL_TRUE;
+      case GL_YCBCR_MESA:  /* not considered to be RGB */
+      default:
+         return GL_FALSE;
+   }
+}
+
+
+/**
+ * Test if the given image format is a color index format.
+ */
+static GLboolean
+is_index_format(GLenum format)
+{
+   switch (format) {
+      case GL_COLOR_INDEX:
+      case GL_COLOR_INDEX1_EXT:
+      case GL_COLOR_INDEX2_EXT:
+      case GL_COLOR_INDEX4_EXT:
+      case GL_COLOR_INDEX8_EXT:
+      case GL_COLOR_INDEX12_EXT:
+      case GL_COLOR_INDEX16_EXT:
+         return GL_TRUE;
+      default:
+         return GL_FALSE;
+   }
+}
+
+
+/**
+ * Test if it is a supported compressed format.
+ * 
+ * \param internalFormat the internal format token provided by the user.
+ * 
+ * \ret GL_TRUE if \p internalFormat is a supported compressed format, or
+ * GL_FALSE otherwise.
+ *
+ * Currently only GL_COMPRESSED_RGB_FXT1_3DFX and GL_COMPRESSED_RGBA_FXT1_3DFX
+ * are supported.
+ */
+static GLboolean
+is_compressed_format(GLcontext *ctx, GLenum internalFormat)
+{
+   switch (internalFormat) {
+      case GL_COMPRESSED_RGB_FXT1_3DFX:
+      case GL_COMPRESSED_RGBA_FXT1_3DFX:
+      case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
+      case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
+      case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
+      case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
+      case GL_RGB_S3TC:
+      case GL_RGB4_S3TC:
+      case GL_RGBA_S3TC:
+      case GL_RGBA4_S3TC:
+         return GL_TRUE;
+      default:
+         if (ctx->Driver.IsCompressedFormat) {
+            return ctx->Driver.IsCompressedFormat(ctx, internalFormat);
+         }
+         return GL_FALSE;
+   }
+}
+
+
+/**
+ * Store a gl_texture_image pointer in a gl_texture_object structure
+ * according to the target and level parameters.
+ * 
+ * \param tObj texture object.
+ * \param target texture target.
+ * \param level image level.
+ * \param texImage texture image.
+ * 
+ * This was basically prompted by the introduction of cube maps.
+ */
+void
+_mesa_set_tex_image(struct gl_texture_object *tObj,
+                    GLenum target, GLint level,
+                    struct gl_texture_image *texImage)
+{
+   ASSERT(tObj);
+   ASSERT(texImage);
+   switch (target) {
+      case GL_TEXTURE_1D:
+      case GL_TEXTURE_2D:
+      case GL_TEXTURE_3D:
+         tObj->Image[level] = texImage;
+         return;
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB:
+         tObj->Image[level] = texImage;
+         return;
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB:
+         tObj->NegX[level] = texImage;
+         return;
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB:
+         tObj->PosY[level] = texImage;
+         return;
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB:
+         tObj->NegY[level] = texImage;
+         return;
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB:
+         tObj->PosZ[level] = texImage;
+         return;
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB:
+         tObj->NegZ[level] = texImage;
+         return;
+      case GL_TEXTURE_RECTANGLE_NV:
+         ASSERT(level == 0);
+         tObj->Image[level] = texImage;
+         return;
+      default:
+         _mesa_problem(NULL, "bad target in _mesa_set_tex_image()");
+         return;
+   }
+}
+
+
+/**
+ * Allocate a texture image structure.
+ * 
+ * Called via ctx->Driver.NewTextureImage() unless overriden by a device
+ * driver.
+ *
+ * \return a pointer to gl_texture_image struct with all fields initialized to
+ * zero.
+ */
+struct gl_texture_image *
+_mesa_new_texture_image( GLcontext *ctx )
+{
+   (void) ctx;
+   return CALLOC_STRUCT(gl_texture_image);
+}
+
+
+/**
+ * Free texture image.
+ *
+ * \param teximage texture image.
+ *
+ * Free the texture image structure and the associated image data if it's not
+ * marked as client data.
+ */
+void
+_mesa_delete_texture_image( struct gl_texture_image *teximage )
+{
+   if (teximage->Data && !teximage->IsClientData) {
+      MESA_PBUFFER_FREE( teximage->Data );
+      teximage->Data = NULL;
+   }
+   FREE( teximage );
+}
+
+
+/**
+ * Test if a target is a proxy target.
+ *
+ * \param target texture target.
+ *
+ * \return GL_TRUE if the target is a proxy target, GL_FALSE otherwise.
+ */
+static GLboolean
+is_proxy_target(GLenum target)
+{
+   return (target == GL_PROXY_TEXTURE_1D ||
+           target == GL_PROXY_TEXTURE_2D ||
+           target == GL_PROXY_TEXTURE_3D ||
+           target == GL_PROXY_TEXTURE_CUBE_MAP_ARB ||
+           target == GL_PROXY_TEXTURE_RECTANGLE_NV);
+}
+
+
+/**
+ * Get the texture object that corresponds to the target of the given texture unit.
+ *
+ * \param ctx GL context.
+ * \param texUnit texture unit.
+ * \param target texture target.
+ *
+ * \return pointer to the texture object on success, or NULL on failure.
+ * 
+ * \sa gl_texture_unit.
+ */
+struct gl_texture_object *
+_mesa_select_tex_object(GLcontext *ctx, const struct gl_texture_unit *texUnit,
+                        GLenum target)
+{
+   switch (target) {
+      case GL_TEXTURE_1D:
+         return texUnit->Current1D;
+      case GL_PROXY_TEXTURE_1D:
+         return ctx->Texture.Proxy1D;
+      case GL_TEXTURE_2D:
+         return texUnit->Current2D;
+      case GL_PROXY_TEXTURE_2D:
+         return ctx->Texture.Proxy2D;
+      case GL_TEXTURE_3D:
+         return texUnit->Current3D;
+      case GL_PROXY_TEXTURE_3D:
+         return ctx->Texture.Proxy3D;
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB:
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB:
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB:
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB:
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB:
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB:
+      case GL_TEXTURE_CUBE_MAP_ARB:
+         return ctx->Extensions.ARB_texture_cube_map
+                ? texUnit->CurrentCubeMap : NULL;
+      case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
+         return ctx->Extensions.ARB_texture_cube_map
+                ? ctx->Texture.ProxyCubeMap : NULL;
+      case GL_TEXTURE_RECTANGLE_NV:
+         return ctx->Extensions.NV_texture_rectangle
+                ? texUnit->CurrentRect : NULL;
+      case GL_PROXY_TEXTURE_RECTANGLE_NV:
+         return ctx->Extensions.NV_texture_rectangle
+                ? ctx->Texture.ProxyRect : NULL;
+      default:
+         _mesa_problem(NULL, "bad target in _mesa_select_tex_object()");
+         return NULL;
+   }
+}
+
+
+/**
+ * Get the texture image struct which corresponds to target and level
+ * of the given texture unit.
+ *
+ * \param ctx GL context.
+ * \param texUnit texture unit.
+ * \param target texture target.
+ * \param level image level.
+ *
+ * \return pointer to the texture image structure on success, or NULL on failure.
+ *
+ * \sa gl_texture_unit.
+ */
+struct gl_texture_image *
+_mesa_select_tex_image(GLcontext *ctx, const struct gl_texture_unit *texUnit,
+                       GLenum target, GLint level)
+{
+   ASSERT(texUnit);
+   ASSERT(level < MAX_TEXTURE_LEVELS);
+   switch (target) {
+      case GL_TEXTURE_1D:
+         return texUnit->Current1D->Image[level];
+      case GL_PROXY_TEXTURE_1D:
+         return ctx->Texture.Proxy1D->Image[level];
+      case GL_TEXTURE_2D:
+         return texUnit->Current2D->Image[level];
+      case GL_PROXY_TEXTURE_2D:
+         return ctx->Texture.Proxy2D->Image[level];
+      case GL_TEXTURE_3D:
+         return texUnit->Current3D->Image[level];
+      case GL_PROXY_TEXTURE_3D:
+         return ctx->Texture.Proxy3D->Image[level];
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB:
+         if (ctx->Extensions.ARB_texture_cube_map)
+            return texUnit->CurrentCubeMap->Image[level];
+         else
+            return NULL;
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB:
+         if (ctx->Extensions.ARB_texture_cube_map)
+            return texUnit->CurrentCubeMap->NegX[level];
+         else
+            return NULL;
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB:
+         if (ctx->Extensions.ARB_texture_cube_map)
+            return texUnit->CurrentCubeMap->PosY[level];
+         else
+            return NULL;
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB:
+         if (ctx->Extensions.ARB_texture_cube_map)
+            return texUnit->CurrentCubeMap->NegY[level];
+         else
+            return NULL;
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB:
+         if (ctx->Extensions.ARB_texture_cube_map)
+            return texUnit->CurrentCubeMap->PosZ[level];
+         else
+            return NULL;
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB:
+         if (ctx->Extensions.ARB_texture_cube_map)
+            return texUnit->CurrentCubeMap->NegZ[level];
+         else
+            return NULL;
+      case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
+         if (ctx->Extensions.ARB_texture_cube_map)
+            return ctx->Texture.ProxyCubeMap->Image[level];
+         else
+            return NULL;
+      case GL_TEXTURE_RECTANGLE_NV:
+         if (ctx->Extensions.NV_texture_rectangle) {
+            ASSERT(level == 0);
+            return texUnit->CurrentRect->Image[level];
+         }
+         else {
+            return NULL;
+         }
+      case GL_PROXY_TEXTURE_RECTANGLE_NV:
+         if (ctx->Extensions.NV_texture_rectangle) {
+            ASSERT(level == 0);
+            return ctx->Texture.ProxyRect->Image[level];
+         }
+         else {
+            return NULL;
+         }
+      default:
+         _mesa_problem(ctx, "bad target in _mesa_select_tex_image()");
+         return NULL;
+   }
+}
+
+
+/**
+ * Like _mesa_select_tex_image() but if the image doesn't exist, allocate
+ * it and install it.  Only return NULL if passed a bad parameter or run
+ * out of memory.
+ */
+struct gl_texture_image *
+_mesa_get_tex_image(GLcontext *ctx, const struct gl_texture_unit *texUnit,
+                    GLenum target, GLint level)
+{
+   struct gl_texture_image *texImage;
+   texImage = _mesa_select_tex_image(ctx, texUnit, target, level);
+   if (!texImage) {
+      struct gl_texture_object *texObj;
+      texImage = ctx->Driver.NewTextureImage(ctx);
+      if (!texImage) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "texture image allocation");
+         return NULL;
+      }
+      texObj = _mesa_select_tex_object(ctx, texUnit, target);
+      ASSERT(texObj);
+      _mesa_set_tex_image(texObj, target, level, texImage);
+   }
+   return texImage;
+}
+
+
+/**
+ * Return pointer to the specified proxy texture image.
+ * Note that proxy textures are per-context, not per-texture unit.
+ * \return pointer to texture image or NULL if invalid target, invalid
+ *         level, or out of memory.
+ */
+struct gl_texture_image *
+_mesa_get_proxy_tex_image(GLcontext *ctx, GLenum target, GLint level)
+{
+   struct gl_texture_image *texImage;
+
+   if (level < 0 )
+      return NULL;
+
+   switch (target) {
+   case GL_PROXY_TEXTURE_1D:
+      if (level >= ctx->Const.MaxTextureLevels)
+         return NULL;
+      texImage = ctx->Texture.Proxy1D->Image[level];
+      if (!texImage) {
+         texImage = ctx->Driver.NewTextureImage(ctx);
+         if (!texImage) {
+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "proxy texture allocation");
+            return NULL;
+         }
+         ctx->Texture.Proxy1D->Image[level] = texImage;
+      }
+      return texImage;
+   case GL_PROXY_TEXTURE_2D:
+      if (level >= ctx->Const.MaxTextureLevels)
+         return NULL;
+      texImage = ctx->Texture.Proxy2D->Image[level];
+      if (!texImage) {
+         texImage = ctx->Driver.NewTextureImage(ctx);
+         if (!texImage) {
+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "proxy texture allocation");
+            return NULL;
+         }
+         ctx->Texture.Proxy2D->Image[level] = texImage;
+      }
+      return texImage;
+   case GL_PROXY_TEXTURE_3D:
+      if (level >= ctx->Const.Max3DTextureLevels)
+         return NULL;
+      texImage = ctx->Texture.Proxy3D->Image[level];
+      if (!texImage) {
+         texImage = ctx->Driver.NewTextureImage(ctx);
+         if (!texImage) {
+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "proxy texture allocation");
+            return NULL;
+         }
+         ctx->Texture.Proxy3D->Image[level] = texImage;
+      }
+      return texImage;
+   case GL_PROXY_TEXTURE_CUBE_MAP:
+      if (level >= ctx->Const.MaxCubeTextureLevels)
+         return NULL;
+      texImage = ctx->Texture.ProxyCubeMap->Image[level];
+      if (!texImage) {
+         texImage = ctx->Driver.NewTextureImage(ctx);
+         if (!texImage) {
+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "proxy texture allocation");
+            return NULL;
+         }
+         ctx->Texture.ProxyCubeMap->Image[level] = texImage;
+      }
+      return texImage;
+   case GL_PROXY_TEXTURE_RECTANGLE_NV:
+      if (level > 0)
+         return NULL;
+      texImage = ctx->Texture.ProxyRect->Image[level];
+      if (!texImage) {
+         texImage = ctx->Driver.NewTextureImage(ctx);
+         if (!texImage) {
+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "proxy texture allocation");
+            return NULL;
+         }
+         ctx->Texture.ProxyRect->Image[level] = texImage;
+      }
+      return texImage;
+   default:
+      return NULL;
+   }
+}
+
+
+/**
+ * Get the maximum number of allowed mipmap levels.
+ *
+ * \param ctx GL context.
+ * \param target texture target.
+ * 
+ * \return the maximum number of allowed mipmap levels for the given
+ * texture target, or zero if passed a bad target.
+ *
+ * \sa gl_constants.
+ */
+GLint
+_mesa_max_texture_levels(GLcontext *ctx, GLenum target)
+{
+   switch (target) {
+   case GL_TEXTURE_1D:
+   case GL_PROXY_TEXTURE_1D:
+   case GL_TEXTURE_2D:
+   case GL_PROXY_TEXTURE_2D:
+      return ctx->Const.MaxTextureLevels;
+   case GL_TEXTURE_3D:
+   case GL_PROXY_TEXTURE_3D:
+      return ctx->Const.Max3DTextureLevels;
+   case GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB:
+   case GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB:
+   case GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB:
+   case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB:
+   case GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB:
+   case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB:
+   case GL_TEXTURE_CUBE_MAP_ARB:
+   case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
+      return ctx->Const.MaxCubeTextureLevels;
+      break;
+   case GL_TEXTURE_RECTANGLE_NV:
+   case GL_PROXY_TEXTURE_RECTANGLE_NV:
+      return 1;
+      break;
+   default:
+      return 0; /* bad target */
+   }
+}
+
+
+
+#if 000 /* not used anymore */
+/*
+ * glTexImage[123]D can accept a NULL image pointer.  In this case we
+ * create a texture image with unspecified image contents per the OpenGL
+ * spec.
+ */
+static GLubyte *
+make_null_texture(GLint width, GLint height, GLint depth, GLenum format)
+{
+   const GLint components = _mesa_components_in_format(format);
+   const GLint numPixels = width * height * depth;
+   GLubyte *data = (GLubyte *) MALLOC(numPixels * components * sizeof(GLubyte));
+
+#ifdef DEBUG
+   /*
+    * Let's see if anyone finds this.  If glTexImage2D() is called with
+    * a NULL image pointer then load the texture image with something
+    * interesting instead of leaving it indeterminate.
+    */
+   if (data) {
+      static const char message[8][32] = {
+         "   X   X  XXXXX   XXX     X    ",
+         "   XX XX  X      X   X   X X   ",
+         "   X X X  X      X      X   X  ",
+         "   X   X  XXXX    XXX   XXXXX  ",
+         "   X   X  X          X  X   X  ",
+         "   X   X  X      X   X  X   X  ",
+         "   X   X  XXXXX   XXX   X   X  ",
+         "                               "
+      };
+
+      GLubyte *imgPtr = data;
+      GLint h, i, j, k;
+      for (h = 0; h < depth; h++) {
+         for (i = 0; i < height; i++) {
+            GLint srcRow = 7 - (i % 8);
+            for (j = 0; j < width; j++) {
+               GLint srcCol = j % 32;
+               GLubyte texel = (message[srcRow][srcCol]=='X') ? 255 : 70;
+               for (k = 0; k < components; k++) {
+                  *imgPtr++ = texel;
+               }
+            }
+         }
+      }
+   }
+#endif
+
+   return data;
+}
+#endif
+
+
+
+/**
+ * Reset the fields of a gl_texture_image struct to zero.
+ * 
+ * \param img texture image structure.
+ *
+ * This is called when a proxy texture test fails, we set all the
+ * image members (except DriverData) to zero.
+ * It's also used in glTexImage[123]D as a safeguard to be sure all
+ * required fields get initialized properly by the Driver.TexImage[123]D
+ * functions.
+ */
+static void
+clear_teximage_fields(struct gl_texture_image *img)
+{
+   ASSERT(img);
+   img->Format = 0;
+   img->IntFormat = 0;
+   img->Border = 0;
+   img->Width = 0;
+   img->Height = 0;
+   img->Depth = 0;
+   img->RowStride = 0;
+   img->Width2 = 0;
+   img->Height2 = 0;
+   img->Depth2 = 0;
+   img->WidthLog2 = 0;
+   img->HeightLog2 = 0;
+   img->DepthLog2 = 0;
+   img->Data = NULL;
+   img->TexFormat = &_mesa_null_texformat;
+   img->FetchTexel = NULL;
+   img->IsCompressed = 0;
+   img->CompressedSize = 0;
+}
+
+
+/**
+ * Initialize basic fields of the gl_texture_image struct.
+ *
+ * \param ctx GL context.
+ * \param target texture target.
+ * \param img texture image structure to be initialized.
+ * \param width image width.
+ * \param height image height.
+ * \param depth image depth.
+ * \param border image border.
+ * \param internalFormat internal format.
+ *
+ * Fills in the fields of \p img with the given information.
+ * Note: width, height and depth include the border.
+ */
+void
+_mesa_init_teximage_fields(GLcontext *ctx, GLenum target,
+                           struct gl_texture_image *img,
+                           GLsizei width, GLsizei height, GLsizei depth,
+                           GLint border, GLenum internalFormat)
+{
+   ASSERT(img);
+   img->Format = _mesa_base_tex_format( ctx, internalFormat );
+   ASSERT(img->Format > 0);
+   img->IntFormat = internalFormat;
+   img->Border = border;
+   img->Width = width;
+   img->Height = height;
+   img->Depth = depth;
+   img->RowStride = width;
+   img->WidthLog2 = logbase2(width - 2 * border);
+   if (height == 1)  /* 1-D texture */
+      img->HeightLog2 = 0;
+   else
+      img->HeightLog2 = logbase2(height - 2 * border);
+   if (depth == 1)   /* 2-D texture */
+      img->DepthLog2 = 0;
+   else
+      img->DepthLog2 = logbase2(depth - 2 * border);
+   img->Width2 = width - 2 * border; /*1 << img->WidthLog2;*/
+   img->Height2 = height - 2 * border; /*1 << img->HeightLog2;*/
+   img->Depth2 = depth - 2 * border; /*1 << img->DepthLog2;*/
+   img->MaxLog2 = MAX2(img->WidthLog2, img->HeightLog2);
+   img->IsCompressed = is_compressed_format(ctx, internalFormat);
+   if (img->IsCompressed)
+      img->CompressedSize = _mesa_compressed_texture_size(ctx, width, height,
+                                                       depth, internalFormat);
+   else
+      img->CompressedSize = 0;
+
+   if ((width == 1 || _mesa_bitcount(width - 2 * border) == 1) &&
+       (height == 1 || _mesa_bitcount(height - 2 * border) == 1) &&
+       (depth == 1 || _mesa_bitcount(depth - 2 * border) == 1))
+      img->_IsPowerOfTwo = GL_TRUE;
+   else
+      img->_IsPowerOfTwo = GL_FALSE;
+
+   /* Compute Width/Height/DepthScale for mipmap lod computation */
+   if (target == GL_TEXTURE_RECTANGLE_NV) {
+      /* scale = 1.0 since texture coords directly map to texels */
+      img->WidthScale = 1.0;
+      img->HeightScale = 1.0;
+      img->DepthScale = 1.0;
+   }
+   else {
+      img->WidthScale = (GLfloat) img->Width;
+      img->HeightScale = (GLfloat) img->Height;
+      img->DepthScale = (GLfloat) img->Depth;
+   }
+}
+
+
+/**
+ * This is the fallback for Driver.TestProxyTexImage().  Test the texture
+ * level, width, height and depth against the ctx->Const limits for textures.
+ *
+ * A hardware driver might override this function if, for example, the
+ * max 3D texture size is 512x512x64 (i.e. not a cube).
+ *
+ * \param target  one of GL_PROXY_TEXTURE_1D, GL_PROXY_TEXTURE_2D,
+ *                GL_PROXY_TEXTURE_3D, GL_PROXY_TEXTURE_RECTANGLE_NV,
+ *                GL_PROXY_TEXTURE_CUBE_MAP_ARB.
+ * \param level  as passed to glTexImage
+ * \param internalFormat  as passed to glTexImage
+ * \param format  as passed to glTexImage
+ * \param type  as passed to glTexImage
+ * \param width  as passed to glTexImage
+ * \param height  as passed to glTexImage
+ * \param depth  as passed to glTexImage
+ * \param border  as passed to glTexImage
+ * \return GL_TRUE if the image is acceptable, GL_FALSE if not acceptable.
+ */
+GLboolean
+_mesa_test_proxy_teximage(GLcontext *ctx, GLenum target, GLint level,
+                          GLint internalFormat, GLenum format, GLenum type,
+                          GLint width, GLint height, GLint depth, GLint border)
+{
+   GLint maxSize;
+
+   (void) internalFormat;
+   (void) format;
+   (void) type;
+
+   switch (target) {
+   case GL_PROXY_TEXTURE_1D:
+      maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);
+      if (width < 2 * border || width > 2 + maxSize ||
+          (!ctx->Extensions.ARB_texture_non_power_of_two &&
+           _mesa_bitcount(width - 2 * border) != 1) ||
+          level >= ctx->Const.MaxTextureLevels) {
+         /* bad width or level */
+         return GL_FALSE;
+      }
+      return GL_TRUE;
+   case GL_PROXY_TEXTURE_2D:
+      maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);
+      if (width < 2 * border || width > 2 + maxSize ||
+          (!ctx->Extensions.ARB_texture_non_power_of_two &&
+           _mesa_bitcount(width - 2 * border) != 1) ||
+          height < 2 * border || height > 2 + maxSize ||
+          (!ctx->Extensions.ARB_texture_non_power_of_two &&
+           _mesa_bitcount(height - 2 * border) != 1) ||
+          level >= ctx->Const.MaxTextureLevels) {
+         /* bad width or height or level */
+         return GL_FALSE;
+      }
+      return GL_TRUE;
+   case GL_PROXY_TEXTURE_3D:
+      maxSize = 1 << (ctx->Const.Max3DTextureLevels - 1);
+      if (width < 2 * border || width > 2 + maxSize ||
+          (!ctx->Extensions.ARB_texture_non_power_of_two &&
+           _mesa_bitcount(width - 2 * border) != 1) ||
+          height < 2 * border || height > 2 + maxSize ||
+          (!ctx->Extensions.ARB_texture_non_power_of_two &&
+           _mesa_bitcount(height - 2 * border) != 1) ||
+          depth < 2 * border || depth > 2 + maxSize ||
+          (!ctx->Extensions.ARB_texture_non_power_of_two &&
+           _mesa_bitcount(depth - 2 * border) != 1) ||
+          level >= ctx->Const.Max3DTextureLevels) {
+         /* bad width or height or depth or level */
+         return GL_FALSE;
+      }
+      return GL_TRUE;
+   case GL_PROXY_TEXTURE_RECTANGLE_NV:
+      if (width < 1 || width > ctx->Const.MaxTextureRectSize ||
+          height < 1 || height > ctx->Const.MaxTextureRectSize ||
+          level != 0) {
+         /* bad width or height or level */
+         return GL_FALSE;
+      }
+      return GL_TRUE;
+   case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
+      maxSize = 1 << (ctx->Const.MaxCubeTextureLevels - 1);
+      if (width < 2 * border || width > 2 + maxSize ||
+          (!ctx->Extensions.ARB_texture_non_power_of_two &&
+           _mesa_bitcount(width - 2 * border) != 1) ||
+          height < 2 * border || height > 2 + maxSize ||
+          (!ctx->Extensions.ARB_texture_non_power_of_two &&
+           _mesa_bitcount(height - 2 * border) != 1) ||
+          level >= ctx->Const.MaxCubeTextureLevels) {
+         /* bad width or height */
+         return GL_FALSE;
+      }
+      return GL_TRUE;
+   default:
+      _mesa_problem(ctx, "Invalid target in _mesa_test_proxy_teximage");
+      return GL_FALSE;
+   }
+}
+
+
+/**
+ * Test the glTexImage[123]D() parameters for errors.
+ * 
+ * \param ctx GL context.
+ * \param target texture target given by the user.
+ * \param level image level given by the user.
+ * \param internalFormat internal format given by the user.
+ * \param format pixel data format given by the user.
+ * \param type pixel data type given by the user.
+ * \param dimensions texture image dimensions (must be 1, 2 or 3).
+ * \param width image width given by the user.
+ * \param height image height given by the user.
+ * \param depth image depth given by the user.
+ * \param border image border given by the user.
+ * 
+ * \return GL_TRUE if an error was detected, or GL_FALSE if no errors.
+ *
+ * Verifies each of the parameters against the constants specified in
+ * __GLcontextRec::Const and the supported extensions, and according to the
+ * OpenGL specification.
+ */
+static GLboolean
+texture_error_check( GLcontext *ctx, GLenum target,
+                     GLint level, GLint internalFormat,
+                     GLenum format, GLenum type,
+                     GLuint dimensions,
+                     GLint width, GLint height,
+                     GLint depth, GLint border )
+{
+   const GLboolean isProxy = is_proxy_target(target);
+   GLboolean sizeOK;
+
+   /* Basic level check (more checking in ctx->Driver.TestProxyTexImage) */
+   if (level < 0 || level >= MAX_TEXTURE_LEVELS) {
+      if (!isProxy) {
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glTexImage%dD(level=%d)", dimensions, level);
+      }
+      return GL_TRUE;
+   }
+
+   /* Check border */
+   if (border < 0 || border > 1 ||
+       ((target == GL_TEXTURE_RECTANGLE_NV ||
+         target == GL_PROXY_TEXTURE_RECTANGLE_NV) && border != 0)) {
+      if (!isProxy) {
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glTexImage%dD(border=%d)", dimensions, border);
+      }
+      return GL_TRUE;
+   }
+
+   if (width < 0 || height < 0 || depth < 0) {
+      if (!isProxy) {
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glTexImage%dD(width, height or depth < 0)", dimensions);
+      }
+      return GL_TRUE;
+   }
+
+   /* Check target and call ctx->Driver.TestProxyTexImage() to check the
+    * level, width, height and depth.
+    */
+   if (dimensions == 1) {
+      if (target == GL_PROXY_TEXTURE_1D || target == GL_TEXTURE_1D) {
+         sizeOK = ctx->Driver.TestProxyTexImage(ctx, GL_PROXY_TEXTURE_1D,
+                                                level, internalFormat,
+                                                format, type,
+                                                width, 1, 1, border);
+      }
+      else {
+         _mesa_error( ctx, GL_INVALID_ENUM, "glTexImage1D(target)" );
+         return GL_TRUE;
+      }
+   }
+   else if (dimensions == 2) {
+      if (target == GL_PROXY_TEXTURE_2D || target == GL_TEXTURE_2D) {
+         sizeOK = ctx->Driver.TestProxyTexImage(ctx, GL_PROXY_TEXTURE_2D,
+                                                level, internalFormat,
+                                                format, type,
+                                                width, height, 1, border);
+      }
+      else if (target == GL_PROXY_TEXTURE_CUBE_MAP_ARB ||
+               (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&
+                target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB)) {
+         if (!ctx->Extensions.ARB_texture_cube_map) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glTexImage2D(target)");
+            return GL_TRUE;
+         }
+         sizeOK = (width == height) &&
+            ctx->Driver.TestProxyTexImage(ctx, GL_PROXY_TEXTURE_CUBE_MAP_ARB,
+                                          level, internalFormat, format, type,
+                                          width, height, 1, border);
+      }
+      else if (target == GL_PROXY_TEXTURE_RECTANGLE_NV ||
+               target == GL_TEXTURE_RECTANGLE_NV) {
+         if (!ctx->Extensions.NV_texture_rectangle) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glTexImage2D(target)");
+            return GL_TRUE;
+         }
+         sizeOK = ctx->Driver.TestProxyTexImage(ctx,
+                                                GL_PROXY_TEXTURE_RECTANGLE_NV,
+                                                level, internalFormat,
+                                                format, type,
+                                                width, height, 1, border);
+      }
+      else {
+         _mesa_error(ctx, GL_INVALID_ENUM, "glTexImage2D(target)");
+         return GL_TRUE;
+      }
+   }
+   else if (dimensions == 3) {
+      if (target == GL_PROXY_TEXTURE_3D || target == GL_TEXTURE_3D) {
+         sizeOK = ctx->Driver.TestProxyTexImage(ctx, GL_PROXY_TEXTURE_3D,
+                                                level, internalFormat,
+                                                format, type,
+                                                width, height, depth, border);
+      }
+      else {
+         _mesa_error( ctx, GL_INVALID_ENUM, "glTexImage3D(target)" );
+         return GL_TRUE;
+      }
+   }
+   else {
+      _mesa_problem( ctx, "bad dims in texture_error_check" );
+      return GL_TRUE;
+   }
+
+   if (!sizeOK) {
+      if (!isProxy) {
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glTexImage%dD(level=%d, width=%d, height=%d, depth=%d)",
+                     dimensions, level, width, height, depth);
+      }
+      return GL_TRUE;
+   }
+
+   /* Check internalFormat */
+   if (_mesa_base_tex_format(ctx, internalFormat) < 0) {
+      if (!isProxy) {
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glTexImage%dD(internalFormat=0x%x)",
+                     dimensions, internalFormat);
+      }
+      return GL_TRUE;
+   }
+
+   /* Check incoming image format and type */
+   if (!_mesa_is_legal_format_and_type(format, type)) {
+      /* Yes, generate GL_INVALID_OPERATION, not GL_INVALID_ENUM, if there
+       * is a type/format mismatch.  See 1.2 spec page 94, sec 3.6.4.
+       */
+      if (!isProxy) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glTexImage%dD(format or type)", dimensions);
+      }
+      return GL_TRUE;
+   }
+
+   if (format == GL_YCBCR_MESA || internalFormat == GL_YCBCR_MESA) {
+      ASSERT(ctx->Extensions.MESA_ycbcr_texture);
+      if (format != GL_YCBCR_MESA ||
+          internalFormat != GL_YCBCR_MESA ||
+          (type != GL_UNSIGNED_SHORT_8_8_MESA &&
+          type != GL_UNSIGNED_SHORT_8_8_REV_MESA)) {
+         char message[100];
+         _mesa_sprintf(message,
+                 "glTexImage%d(format/type/internalFormat YCBCR mismatch",
+                 dimensions);
+         _mesa_error(ctx, GL_INVALID_ENUM, message);
+         return GL_TRUE; /* error */
+      }
+      if (target != GL_TEXTURE_2D &&
+          target != GL_PROXY_TEXTURE_2D &&
+          target != GL_TEXTURE_RECTANGLE_NV &&
+          target != GL_PROXY_TEXTURE_RECTANGLE_NV) {
+         if (!isProxy)
+            _mesa_error(ctx, GL_INVALID_ENUM, "glTexImage(target)");
+         return GL_TRUE;
+      }
+      if (border != 0) {
+         if (!isProxy) {
+            char message[100];
+            _mesa_sprintf(message,
+                    "glTexImage%d(format=GL_YCBCR_MESA and border=%d)",
+                    dimensions, border);
+            _mesa_error(ctx, GL_INVALID_VALUE, message);
+         }
+         return GL_TRUE;
+      }
+   }
+
+   if (is_compressed_format(ctx, internalFormat)) {
+      if (target == GL_TEXTURE_2D || target == GL_PROXY_TEXTURE_2D) {
+         /* OK */
+      }
+      else if (ctx->Extensions.ARB_texture_cube_map &&
+               (target == GL_PROXY_TEXTURE_CUBE_MAP ||
+                (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X &&
+                 target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z))) {
+         /* OK */
+      }
+      else {
+         if (!isProxy) {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glTexImage%d(target)", dimensions);
+            return GL_TRUE;
+         }
+      }
+      if (border != 0) {
+         if (!isProxy) {
+            _mesa_error(ctx, GL_INVALID_OPERATION,
+                        "glTexImage%D(border!=0)", dimensions);
+         }
+         return GL_TRUE;
+      }
+   }
+
+   /* if we get here, the parameters are OK */
+   return GL_FALSE;
+}
+
+
+/**
+ * Test glTexSubImage[123]D() parameters for errors.
+ * 
+ * \param ctx GL context.
+ * \param dimensions texture image dimensions (must be 1, 2 or 3).
+ * \param target texture target given by the user.
+ * \param level image level given by the user.
+ * \param xoffset sub-image x offset given by the user.
+ * \param yoffset sub-image y offset given by the user.
+ * \param zoffset sub-image z offset given by the user.
+ * \param format pixel data format given by the user.
+ * \param type pixel data type given by the user.
+ * \param width image width given by the user.
+ * \param height image height given by the user.
+ * \param depth image depth given by the user.
+ * 
+ * \return GL_TRUE if an error was detected, or GL_FALSE if no errors.
+ *
+ * Verifies each of the parameters against the constants specified in
+ * __GLcontextRec::Const and the supported extensions, and according to the
+ * OpenGL specification.
+ */
+static GLboolean
+subtexture_error_check( GLcontext *ctx, GLuint dimensions,
+                        GLenum target, GLint level,
+                        GLint xoffset, GLint yoffset, GLint zoffset,
+                        GLint width, GLint height, GLint depth,
+                        GLenum format, GLenum type )
+{
+   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   struct gl_texture_image *destTex;
+
+   /* Check target */
+   if (dimensions == 1) {
+      if (target != GL_TEXTURE_1D) {
+         _mesa_error( ctx, GL_INVALID_ENUM, "glTexSubImage1D(target)" );
+         return GL_TRUE;
+      }
+   }
+   else if (dimensions == 2) {
+      if (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&
+          target <=GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB) {
+         if (!ctx->Extensions.ARB_texture_cube_map) {
+            _mesa_error( ctx, GL_INVALID_ENUM, "glTexSubImage2D(target)" );
+            return GL_TRUE;
+         }
+      }
+      else if (ctx->Extensions.NV_texture_rectangle &&
+               target == GL_TEXTURE_RECTANGLE_NV) {
+         if (!ctx->Extensions.NV_texture_rectangle) {
+            _mesa_error( ctx, GL_INVALID_ENUM, "glTexSubImage2D(target)" );
+            return GL_TRUE;
+         }
+      }
+      else if (target != GL_TEXTURE_2D) {
+         _mesa_error( ctx, GL_INVALID_ENUM, "glTexSubImage2D(target)" );
+         return GL_TRUE;
+      }
+   }
+   else if (dimensions == 3) {
+      if (target != GL_TEXTURE_3D) {
+         _mesa_error( ctx, GL_INVALID_ENUM, "glTexSubImage3D(target)" );
+         return GL_TRUE;
+      }
+   }
+   else {
+      _mesa_problem( ctx, "invalid dims in texture_error_check" );
+      return GL_TRUE;
+   }
+
+   /* Basic level check */
+   if (level < 0 || level >= MAX_TEXTURE_LEVELS) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glTexSubImage2D(level=%d)", level);
+      return GL_TRUE;
+   }
+
+   if (width < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glTexSubImage%dD(width=%d)", dimensions, width);
+      return GL_TRUE;
+   }
+   if (height < 0 && dimensions > 1) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glTexSubImage%dD(height=%d)", dimensions, height);
+      return GL_TRUE;
+   }
+   if (depth < 0 && dimensions > 2) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glTexSubImage%dD(depth=%d)", dimensions, depth);
+      return GL_TRUE;
+   }
+
+   destTex = _mesa_select_tex_image(ctx, texUnit, target, level);
+
+   if (!destTex) {
+      /* undefined image level */
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glTexSubImage%dD", dimensions);
+      return GL_TRUE;
+   }
+
+   if (xoffset < -((GLint)destTex->Border)) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glTexSubImage%dD(xoffset)",
+                  dimensions);
+      return GL_TRUE;
+   }
+   if (xoffset + width > (GLint) (destTex->Width + destTex->Border)) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glTexSubImage%dD(xoffset+width)",
+                  dimensions);
+      return GL_TRUE;
+   }
+   if (dimensions > 1) {
+      if (yoffset < -((GLint)destTex->Border)) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "glTexSubImage%dD(yoffset)",
+                     dimensions);
+         return GL_TRUE;
+      }
+      if (yoffset + height > (GLint) (destTex->Height + destTex->Border)) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "glTexSubImage%dD(yoffset+height)",
+                     dimensions);
+         return GL_TRUE;
+      }
+   }
+   if (dimensions > 2) {
+      if (zoffset < -((GLint)destTex->Border)) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "glTexSubImage3D(zoffset)");
+         return GL_TRUE;
+      }
+      if (zoffset + depth  > (GLint) (destTex->Depth + destTex->Border)) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "glTexSubImage3D(zoffset+depth)");
+         return GL_TRUE;
+      }
+   }
+
+   if (!_mesa_is_legal_format_and_type(format, type)) {
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glTexSubImage%dD(format or type)", dimensions);
+      return GL_TRUE;
+   }
+
+   if (destTex->IsCompressed) {
+      const struct gl_texture_unit *texUnit;
+      const struct gl_texture_image *texImage;
+      texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+      texImage = _mesa_select_tex_image(ctx, texUnit, target, level);
+
+      if (target == GL_TEXTURE_2D || target == GL_PROXY_TEXTURE_2D) {
+         /* OK */
+      }
+      else if (ctx->Extensions.ARB_texture_cube_map &&
+               (target == GL_PROXY_TEXTURE_CUBE_MAP ||
+                (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X &&
+                 target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z))) {
+         /* OK */
+      }
+      else {
+         _mesa_error(ctx, GL_INVALID_ENUM,
+                     "glTexSubImage%D(target)", dimensions);
+         return GL_TRUE;
+      }
+      /* offset must be multiple of 4 */
+      if ((xoffset & 3) || (yoffset & 3)) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glTexSubImage%D(xoffset or yoffset)", dimensions);
+         return GL_TRUE;
+      }
+      /* size must be multiple of 4 or equal to whole texture size */
+      if ((width & 3) && (GLuint) width != texImage->Width) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glTexSubImage%D(width)", dimensions);
+         return GL_TRUE;
+      }         
+      if ((height & 3) && (GLuint) height != texImage->Height) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glTexSubImage%D(width)", dimensions);
+         return GL_TRUE;
+      }         
+   }
+
+   return GL_FALSE;
+}
+
+
+/**
+ * Test glCopyTexImage[12]D() parameters for errors.
+ * 
+ * \param ctx GL context.
+ * \param dimensions texture image dimensions (must be 1, 2 or 3).
+ * \param target texture target given by the user.
+ * \param level image level given by the user.
+ * \param internalFormat internal format given by the user.
+ * \param width image width given by the user.
+ * \param height image height given by the user.
+ * \param depth image depth given by the user.
+ * \param border texture border.
+ * 
+ * \return GL_TRUE if an error was detected, or GL_FALSE if no errors.
+ * 
+ * Verifies each of the parameters against the constants specified in
+ * __GLcontextRec::Const and the supported extensions, and according to the
+ * OpenGL specification.
+ */
+static GLboolean
+copytexture_error_check( GLcontext *ctx, GLuint dimensions,
+                         GLenum target, GLint level, GLint internalFormat,
+                         GLint width, GLint height, GLint border )
+{
+   GLenum format, type;
+   GLboolean sizeOK;
+
+   /* Basic level check (more checking in ctx->Driver.TestProxyTexImage) */
+   if (level < 0 || level >= MAX_TEXTURE_LEVELS) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glCopyTexImage%dD(level=%d)", dimensions, level);
+      return GL_TRUE;
+   }
+
+   /* Check border */
+   if (border < 0 || border > 1 ||
+       ((target == GL_TEXTURE_RECTANGLE_NV ||
+         target == GL_PROXY_TEXTURE_RECTANGLE_NV) && border != 0)) {
+      return GL_TRUE;
+   }
+
+   /* The format and type aren't really significant here, but we need to pass
+    * something to TestProxyTexImage().
+    */
+   format = _mesa_base_tex_format(ctx, internalFormat);
+   type = GL_FLOAT;
+
+   /* Check target and call ctx->Driver.TestProxyTexImage() to check the
+    * level, width, height and depth.
+    */
+   if (dimensions == 1) {
+      if (target == GL_TEXTURE_1D) {
+         sizeOK = ctx->Driver.TestProxyTexImage(ctx, GL_PROXY_TEXTURE_1D,
+                                                level, internalFormat,
+                                                format, type,
+                                                width, 1, 1, border);
+      }
+      else {
+         _mesa_error( ctx, GL_INVALID_ENUM, "glCopyTexImage1D(target)" );
+         return GL_TRUE;
+      }
+   }
+   else if (dimensions == 2) {
+      if (target == GL_TEXTURE_2D) {
+         sizeOK = ctx->Driver.TestProxyTexImage(ctx, GL_PROXY_TEXTURE_2D,
+                                                level, internalFormat,
+                                                format, type,
+                                                width, height, 1, border);
+      }
+      else if (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&
+               target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB) {
+         if (!ctx->Extensions.ARB_texture_cube_map) {
+            _mesa_error( ctx, GL_INVALID_ENUM, "glCopyTexImage2D(target)" );
+            return GL_TRUE;
+         }
+         sizeOK = (width == height) &&
+            ctx->Driver.TestProxyTexImage(ctx, GL_PROXY_TEXTURE_CUBE_MAP_ARB,
+                                          level, internalFormat, format, type,
+                                          width, height, 1, border);
+      }
+      else if (target == GL_TEXTURE_RECTANGLE_NV) {
+         if (!ctx->Extensions.NV_texture_rectangle) {
+            _mesa_error( ctx, GL_INVALID_ENUM, "glCopyTexImage2D(target)" );
+            return GL_TRUE;
+         }
+         sizeOK = ctx->Driver.TestProxyTexImage(ctx,
+                                                GL_PROXY_TEXTURE_RECTANGLE_NV,
+                                                level, internalFormat,
+                                                format, type,
+                                                width, height, 1, border);
+      }
+      else {
+         _mesa_error( ctx, GL_INVALID_ENUM, "glCopyTexImage2D(target)" );
+         return GL_TRUE;
+      }
+   }
+   else {
+      _mesa_problem(ctx, "invalid dimensions in copytexture_error_check");
+      return GL_TRUE;
+   }
+
+   if (!sizeOK) {
+      if (dimensions == 1) {
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glCopyTexImage1D(width=%d)", width);
+      }
+      else {
+         ASSERT(dimensions == 2);
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glCopyTexImage2D(width=%d, height=%d)", width, height);
+      }
+      return GL_TRUE;
+   }
+
+   if (_mesa_base_tex_format(ctx, internalFormat) < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glCopyTexImage%dD(internalFormat)", dimensions);
+      return GL_TRUE;
+   }
+
+   if (is_compressed_format(ctx, internalFormat)) {
+      if (target != GL_TEXTURE_2D) {
+         _mesa_error(ctx, GL_INVALID_ENUM,
+                     "glCopyTexImage%d(target)", dimensions);
+         return GL_TRUE;
+      }
+      if (border != 0) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glCopyTexImage%D(border!=0)", dimensions);
+         return GL_TRUE;
+      }
+   }
+
+   /* if we get here, the parameters are OK */
+   return GL_FALSE;
+}
+
+
+/**
+ * Test glCopyTexImage[12]D() parameters for errors.
+ * 
+ * \param ctx GL context.
+ * \param dimensions texture image dimensions (must be 1, 2 or 3).
+ * \param target texture target given by the user.
+ * \param level image level given by the user.
+ * \param xoffset sub-image x offset given by the user.
+ * \param yoffset sub-image y offset given by the user.
+ * \param zoffset sub-image z offset given by the user.
+ * \param width image width given by the user.
+ * \param height image height given by the user.
+ * 
+ * \return GL_TRUE if an error was detected, or GL_FALSE if no errors.
+ * 
+ * Verifies each of the parameters against the constants specified in
+ * __GLcontextRec::Const and the supported extensions, and according to the
+ * OpenGL specification.
+ */
+static GLboolean
+copytexsubimage_error_check( GLcontext *ctx, GLuint dimensions,
+                             GLenum target, GLint level,
+                             GLint xoffset, GLint yoffset, GLint zoffset,
+                             GLsizei width, GLsizei height )
+{
+   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   struct gl_texture_image *teximage;
+
+   /* Check target */
+   if (dimensions == 1) {
+      if (target != GL_TEXTURE_1D) {
+         _mesa_error( ctx, GL_INVALID_ENUM, "glCopyTexSubImage1D(target)" );
+         return GL_TRUE;
+      }
+   }
+   else if (dimensions == 2) {
+      if (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&
+          target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB) {
+         if (!ctx->Extensions.ARB_texture_cube_map) {
+            _mesa_error( ctx, GL_INVALID_ENUM, "glCopyTexSubImage2D(target)" );
+            return GL_TRUE;
+         }
+      }
+      else if (target == GL_TEXTURE_RECTANGLE_NV) {
+         if (!ctx->Extensions.NV_texture_rectangle) {
+            _mesa_error( ctx, GL_INVALID_ENUM, "glCopyTexSubImage2D(target)" );
+            return GL_TRUE;
+         }
+      }
+      else if (target != GL_TEXTURE_2D) {
+         _mesa_error( ctx, GL_INVALID_ENUM, "glCopyTexSubImage2D(target)" );
+         return GL_TRUE;
+      }
+   }
+   else if (dimensions == 3) {
+      if (target != GL_TEXTURE_3D) {
+         _mesa_error( ctx, GL_INVALID_ENUM, "glCopyTexSubImage3D(target)" );
+         return GL_TRUE;
+      }
+   }
+
+   /* Check level */
+   if (level < 0 || level >= MAX_TEXTURE_LEVELS) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glCopyTexSubImage%dD(level=%d)", dimensions, level);
+      return GL_TRUE;
+   }
+
+   /* Check size */
+   if (width < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glCopyTexSubImage%dD(width=%d)", dimensions, width);
+      return GL_TRUE;
+   }
+   if (dimensions > 1 && height < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glCopyTexSubImage%dD(height=%d)", dimensions, height);
+      return GL_TRUE;
+   }
+
+   teximage = _mesa_select_tex_image(ctx, texUnit, target, level);
+   if (!teximage) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glCopyTexSubImage%dD(undefined texture level: %d)",
+                  dimensions, level);
+      return GL_TRUE;
+   }
+
+   if (xoffset < -((GLint)teximage->Border)) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glCopyTexSubImage%dD(xoffset=%d)", dimensions, xoffset);
+      return GL_TRUE;
+   }
+   if (xoffset + width > (GLint) (teximage->Width + teximage->Border)) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glCopyTexSubImage%dD(xoffset+width)", dimensions);
+      return GL_TRUE;
+   }
+   if (dimensions > 1) {
+      if (yoffset < -((GLint)teximage->Border)) {
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glCopyTexSubImage%dD(yoffset=%d)", dimensions, yoffset);
+         return GL_TRUE;
+      }
+      /* NOTE: we're adding the border here, not subtracting! */
+      if (yoffset + height > (GLint) (teximage->Height + teximage->Border)) {
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glCopyTexSubImage%dD(yoffset+height)", dimensions);
+         return GL_TRUE;
+      }
+   }
+
+   if (dimensions > 2) {
+      if (zoffset < -((GLint)teximage->Border)) {
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glCopyTexSubImage%dD(zoffset)", dimensions);
+         return GL_TRUE;
+      }
+      if (zoffset > (GLint) (teximage->Depth + teximage->Border)) {
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glCopyTexSubImage%dD(zoffset+depth)", dimensions);
+         return GL_TRUE;
+      }
+   }
+
+   if (teximage->IsCompressed) {
+      if (target != GL_TEXTURE_2D) {
+         _mesa_error(ctx, GL_INVALID_ENUM,
+                     "glCopyTexSubImage%d(target)", dimensions);
+         return GL_TRUE;
+      }
+      /* offset must be multiple of 4 */
+      if ((xoffset & 3) || (yoffset & 3)) {
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glCopyTexSubImage%D(xoffset or yoffset)", dimensions);
+         return GL_TRUE;
+      }
+      /* size must be multiple of 4 */
+      if ((width & 3) != 0 && (GLuint) width != teximage->Width) {
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glCopyTexSubImage%D(width)", dimensions);
+         return GL_TRUE;
+      }         
+      if ((height & 3) != 0 && (GLuint) height != teximage->Height) {
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glCopyTexSubImage%D(height)", dimensions);
+         return GL_TRUE;
+      }         
+   }
+
+   if (teximage->IntFormat == GL_YCBCR_MESA) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glCopyTexSubImage2D");
+      return GL_TRUE;
+   }
+
+   /* if we get here, the parameters are OK */
+   return GL_FALSE;
+}
+
+
+/**
+ * Get texture image.
+ *
+ * \param target texture target.
+ * \param level image level.
+ * \param format pixel data format.
+ * \param type pixel data type.
+ * \param pixels pixel data.
+ */
+void GLAPIENTRY
+_mesa_GetTexImage( GLenum target, GLint level, GLenum format,
+                   GLenum type, GLvoid *pixels )
+{
+   const struct gl_texture_unit *texUnit;
+   const struct gl_texture_object *texObj;
+   const struct gl_texture_image *texImage;
+   GLint maxLevels = 0;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   texUnit = &(ctx->Texture.Unit[ctx->Texture.CurrentUnit]);
+   texObj = _mesa_select_tex_object(ctx, texUnit, target);
+   if (!texObj || is_proxy_target(target)) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(target)");
+      return;
+   }
+
+   maxLevels = _mesa_max_texture_levels(ctx, target);
+   ASSERT(maxLevels > 0);  /* 0 indicates bad target, caught above */
+
+   if (level < 0 || level >= maxLevels) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glGetTexImage(level)" );
+      return;
+   }
+
+   if (_mesa_sizeof_packed_type(type) <= 0) {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexImage(type)" );
+      return;
+   }
+
+   if (_mesa_components_in_format(format) <= 0 ||
+       format == GL_STENCIL_INDEX) {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexImage(format)" );
+      return;
+   }
+
+   if (!ctx->Extensions.EXT_paletted_texture && is_index_format(format)) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");
+   }
+
+   if (!ctx->Extensions.SGIX_depth_texture && format == GL_DEPTH_COMPONENT) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");
+   }
+
+   if (!ctx->Extensions.MESA_ycbcr_texture && format == GL_YCBCR_MESA) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");
+   }
+
+   /* XXX what if format/type doesn't match texture format/type? */
+
+   if (!pixels)
+      return;
+
+   texImage = _mesa_select_tex_image(ctx, texUnit, target, level);
+   if (!texImage) {
+      /* invalid mipmap level, not an error */
+      return;
+   }
+
+   if (!texImage->Data) {
+      /* no image data, not an error */
+      return;
+   }
+
+   {
+      const GLint width = texImage->Width;
+      const GLint height = texImage->Height;
+      const GLint depth = texImage->Depth;
+      GLint img, row;
+      for (img = 0; img < depth; img++) {
+         for (row = 0; row < height; row++) {
+            /* compute destination address in client memory */
+            GLvoid *dest = _mesa_image_address( &ctx->Pack, pixels,
+                                                width, height, format, type,
+                                                img, row, 0);
+            assert(dest);
+
+            if (format == GL_COLOR_INDEX) {
+               GLuint indexRow[MAX_WIDTH];
+               GLint col;
+               for (col = 0; col < width; col++) {
+                  GLchan indx;
+                  (*texImage->FetchTexel)(texImage, col, row, img,
+                                          (GLvoid *) &indx);
+                  indexRow[col] = indx;
+               }
+               _mesa_pack_index_span(ctx, width, type, dest,
+                                     indexRow, &ctx->Pack,
+                                     0 /* no image transfer */);
+            }
+            else if (format == GL_DEPTH_COMPONENT) {
+               GLfloat depthRow[MAX_WIDTH];
+               GLint col;
+               for (col = 0; col < width; col++) {
+                  (*texImage->FetchTexel)(texImage, col, row, img,
+                                          (GLvoid *) &depthRow[col]);
+               }
+               _mesa_pack_depth_span(ctx, width, dest, type,
+                                     depthRow, &ctx->Pack);
+            }
+            else if (format == GL_YCBCR_MESA) {
+               /* No pixel transfer */
+               const GLint rowstride = texImage->RowStride;
+               MEMCPY(dest,
+                      (const GLushort *) texImage->Data + row * rowstride,
+                      width * sizeof(GLushort));
+               /* check for byte swapping */
+               if ((texImage->TexFormat->MesaFormat == MESA_FORMAT_YCBCR
+                    && type == GL_UNSIGNED_SHORT_8_8_REV_MESA) ||
+                   (texImage->TexFormat->MesaFormat == MESA_FORMAT_YCBCR_REV
+                    && type == GL_UNSIGNED_SHORT_8_8_MESA)) {
+                  if (!ctx->Pack.SwapBytes)
+                     _mesa_swap2((GLushort *) dest, width);
+               }
+               else if (ctx->Pack.SwapBytes) {
+                  _mesa_swap2((GLushort *) dest, width);
+               }
+            }
+            else {
+               /* general case:  convert row to RGBA format */
+               GLchan rgba[MAX_WIDTH][4];
+               GLint col;
+               for (col = 0; col < width; col++) {
+                  (*texImage->FetchTexel)(texImage, col, row, img,
+                                          (GLvoid *) rgba[col]);
+               }
+               _mesa_pack_rgba_span(ctx, width, (const GLchan (*)[4])rgba,
+                                    format, type, dest, &ctx->Pack,
+                                    0 /* no image transfer */);
+            } /* format */
+         } /* row */
+      } /* img */
+   }
+}
+
+
+
+/*
+ * Called from the API.  Note that width includes the border.
+ */
+void GLAPIENTRY
+_mesa_TexImage1D( GLenum target, GLint level, GLint internalFormat,
+                  GLsizei width, GLint border, GLenum format,
+                  GLenum type, const GLvoid *pixels )
+{
+   GLsizei postConvWidth = width;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (is_color_format(internalFormat)) {
+      _mesa_adjust_image_for_convolution(ctx, 1, &postConvWidth, NULL);
+   }
+
+   if (target == GL_TEXTURE_1D) {
+      struct gl_texture_unit *texUnit;
+      struct gl_texture_object *texObj;
+      struct gl_texture_image *texImage;
+
+      if (texture_error_check(ctx, target, level, internalFormat,
+                              format, type, 1, postConvWidth, 1, 1, border)) {
+         return;   /* error was recorded */
+      }
+
+      texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+      texObj = _mesa_select_tex_object(ctx, texUnit, target);
+      texImage = _mesa_get_tex_image(ctx, texUnit, target, level);
+
+      if (!texImage) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage1D");
+         return;
+      }
+      else if (texImage->Data && !texImage->IsClientData) {
+         /* free the old texture data */
+         MESA_PBUFFER_FREE(texImage->Data);
+      }
+      texImage->Data = NULL;
+      clear_teximage_fields(texImage); /* not really needed, but helpful */
+      _mesa_init_teximage_fields(ctx, target, texImage,
+                                 postConvWidth, 1, 1,
+                                 border, internalFormat);
+
+      if (ctx->NewState & _IMAGE_NEW_TRANSFER_STATE)
+         _mesa_update_state(ctx);
+
+      ASSERT(ctx->Driver.TexImage1D);
+
+      /* Give the texture to the driver!  <pixels> may be null! */
+      (*ctx->Driver.TexImage1D)(ctx, target, level, internalFormat,
+                                width, border, format, type, pixels,
+                                &ctx->Unpack, texObj, texImage);
+
+      ASSERT(texImage->TexFormat);
+      if (!texImage->FetchTexel) {
+         /* If driver didn't explicitly set this, use the default */
+         texImage->FetchTexel = texImage->TexFormat->FetchTexel1D;
+      }
+      ASSERT(texImage->FetchTexel);
+
+      /* state update */
+      texObj->Complete = GL_FALSE;
+      ctx->NewState |= _NEW_TEXTURE;
+   }
+   else if (target == GL_PROXY_TEXTURE_1D) {
+      /* Proxy texture: check for errors and update proxy state */
+      struct gl_texture_image *texImage;
+      texImage = _mesa_get_proxy_tex_image(ctx, target, level);
+      if (texture_error_check(ctx, target, level, internalFormat,
+                              format, type, 1, postConvWidth, 1, 1, border)) {
+         /* when error, clear all proxy texture image parameters */
+         if (texImage)
+            clear_teximage_fields(texImage);
+      }
+      else {
+         /* no error, set the tex image parameters */
+         ASSERT(texImage);
+         _mesa_init_teximage_fields(ctx, target, texImage,
+                                    postConvWidth, 1, 1,
+                                    border, internalFormat);
+         texImage->TexFormat = (*ctx->Driver.ChooseTextureFormat)(ctx,
+                                          internalFormat, format, type);
+      }
+   }
+   else {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glTexImage1D(target)" );
+      return;
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
+                  GLsizei width, GLsizei height, GLint border,
+                  GLenum format, GLenum type,
+                  const GLvoid *pixels )
+{
+   GLsizei postConvWidth = width, postConvHeight = height;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (is_color_format(internalFormat)) {
+      _mesa_adjust_image_for_convolution(ctx, 2, &postConvWidth,
+					 &postConvHeight);
+   }
+
+   if (target == GL_TEXTURE_2D ||
+       (ctx->Extensions.ARB_texture_cube_map &&
+        target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&
+        target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB) ||
+       (ctx->Extensions.NV_texture_rectangle &&
+        target == GL_TEXTURE_RECTANGLE_NV)) {
+      /* non-proxy target */
+      struct gl_texture_unit *texUnit;
+      struct gl_texture_object *texObj;
+      struct gl_texture_image *texImage;
+
+      if (texture_error_check(ctx, target, level, internalFormat,
+                              format, type, 2, postConvWidth, postConvHeight,
+                              1, border)) {
+         return;   /* error was recorded */
+      }
+
+      texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+      texObj = _mesa_select_tex_object(ctx, texUnit, target);
+      texImage = _mesa_get_tex_image(ctx, texUnit, target, level);
+      if (!texImage) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage2D");
+         return;
+      }
+      else if (texImage->Data && !texImage->IsClientData) {
+         /* free the old texture data */
+         MESA_PBUFFER_FREE(texImage->Data);
+      }
+      texImage->Data = NULL;
+      clear_teximage_fields(texImage); /* not really needed, but helpful */
+      _mesa_init_teximage_fields(ctx, target, texImage,
+                                 postConvWidth, postConvHeight, 1,
+                                 border, internalFormat);
+
+      if (ctx->NewState & _IMAGE_NEW_TRANSFER_STATE)
+         _mesa_update_state(ctx);
+
+      ASSERT(ctx->Driver.TexImage2D);
+
+      /* Give the texture to the driver!  <pixels> may be null! */
+      (*ctx->Driver.TexImage2D)(ctx, target, level, internalFormat,
+                                width, height, border, format, type, pixels,
+                                &ctx->Unpack, texObj, texImage);
+
+      ASSERT(texImage->TexFormat);
+      if (!texImage->FetchTexel) {
+         /* If driver didn't explicitly set this, use the default */
+         texImage->FetchTexel = texImage->TexFormat->FetchTexel2D;
+      }
+      ASSERT(texImage->FetchTexel);
+
+      /* state update */
+      texObj->Complete = GL_FALSE;
+      ctx->NewState |= _NEW_TEXTURE;
+   }
+   else if (target == GL_PROXY_TEXTURE_2D ||
+            (target == GL_PROXY_TEXTURE_CUBE_MAP_ARB &&
+             ctx->Extensions.ARB_texture_cube_map) ||
+            (target == GL_PROXY_TEXTURE_RECTANGLE_NV &&
+             ctx->Extensions.NV_texture_rectangle)) {
+      /* Proxy texture: check for errors and update proxy state */
+      struct gl_texture_image *texImage;
+      texImage = _mesa_get_proxy_tex_image(ctx, target, level);
+      if (texture_error_check(ctx, target, level, internalFormat,
+                              format, type, 2, postConvWidth, postConvHeight,
+                              1, border)) {
+         /* when error, clear all proxy texture image parameters */
+         if (texImage)
+            clear_teximage_fields(ctx->Texture.Proxy2D->Image[level]);
+      }
+      else {
+         /* no error, set the tex image parameters */
+         _mesa_init_teximage_fields(ctx, target, texImage,
+                                    postConvWidth, postConvHeight, 1,
+                                    border, internalFormat);
+         texImage->TexFormat = (*ctx->Driver.ChooseTextureFormat)(ctx,
+                                          internalFormat, format, type);
+      }
+   }
+   else {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glTexImage2D(target)" );
+      return;
+   }
+}
+
+
+/*
+ * Called by the API or display list executor.
+ * Note that width and height include the border.
+ */
+void GLAPIENTRY
+_mesa_TexImage3D( GLenum target, GLint level, GLint internalFormat,
+                  GLsizei width, GLsizei height, GLsizei depth,
+                  GLint border, GLenum format, GLenum type,
+                  const GLvoid *pixels )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (target == GL_TEXTURE_3D) {
+      struct gl_texture_unit *texUnit;
+      struct gl_texture_object *texObj;
+      struct gl_texture_image *texImage;
+
+      if (texture_error_check(ctx, target, level, (GLint) internalFormat,
+                              format, type, 3, width, height, depth, border)) {
+         return;   /* error was recorded */
+      }
+
+      texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+      texObj = _mesa_select_tex_object(ctx, texUnit, target);
+      texImage = _mesa_get_tex_image(ctx, texUnit, target, level);
+      if (!texImage) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage3D");
+         return;
+      }
+      else if (texImage->Data && !texImage->IsClientData) {
+         MESA_PBUFFER_FREE(texImage->Data);
+      }
+      texImage->Data = NULL;
+      clear_teximage_fields(texImage); /* not really needed, but helpful */
+      _mesa_init_teximage_fields(ctx, target, texImage,
+                                 width, height, depth,
+                                 border, internalFormat);
+
+      if (ctx->NewState & _IMAGE_NEW_TRANSFER_STATE)
+         _mesa_update_state(ctx);
+
+      ASSERT(ctx->Driver.TexImage3D);
+
+      /* Give the texture to the driver!  <pixels> may be null! */
+      (*ctx->Driver.TexImage3D)(ctx, target, level, internalFormat,
+                                width, height, depth, border, format, type,
+                                pixels, &ctx->Unpack, texObj, texImage);
+
+      ASSERT(texImage->TexFormat);
+      if (!texImage->FetchTexel) {
+         /* If driver didn't explicitly set this, use the default */
+         texImage->FetchTexel = texImage->TexFormat->FetchTexel3D;
+      }
+      ASSERT(texImage->FetchTexel);
+
+      /* state update */
+      texObj->Complete = GL_FALSE;
+      ctx->NewState |= _NEW_TEXTURE;
+   }
+   else if (target == GL_PROXY_TEXTURE_3D) {
+      /* Proxy texture: check for errors and update proxy state */
+      struct gl_texture_image *texImage;
+      texImage = _mesa_get_proxy_tex_image(ctx, target, level);
+      if (texture_error_check(ctx, target, level, internalFormat,
+                              format, type, 3, width, height, depth, border)) {
+         /* when error, clear all proxy texture image parameters */
+         if (texImage)
+            clear_teximage_fields(texImage);
+      }
+      else {
+         /* no error, set the tex image parameters */
+         _mesa_init_teximage_fields(ctx, target, texImage, width, height, 1,
+                                    border, internalFormat);
+         texImage->TexFormat = (*ctx->Driver.ChooseTextureFormat)(ctx,
+                                          internalFormat, format, type);
+      }
+   }
+   else {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glTexImage3D(target)" );
+      return;
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_TexImage3DEXT( GLenum target, GLint level, GLenum internalFormat,
+                     GLsizei width, GLsizei height, GLsizei depth,
+                     GLint border, GLenum format, GLenum type,
+                     const GLvoid *pixels )
+{
+   _mesa_TexImage3D(target, level, (GLint) internalFormat, width, height,
+                    depth, border, format, type, pixels);
+}
+
+
+
+void GLAPIENTRY
+_mesa_TexSubImage1D( GLenum target, GLint level,
+                     GLint xoffset, GLsizei width,
+                     GLenum format, GLenum type,
+                     const GLvoid *pixels )
+{
+   GLsizei postConvWidth = width;
+   struct gl_texture_unit *texUnit;
+   struct gl_texture_object *texObj;
+   struct gl_texture_image *texImage;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (ctx->NewState & _IMAGE_NEW_TRANSFER_STATE)
+      _mesa_update_state(ctx);
+
+   /* XXX should test internal format */
+   if (is_color_format(format)) {
+      _mesa_adjust_image_for_convolution(ctx, 1, &postConvWidth, NULL);
+   }
+
+   if (subtexture_error_check(ctx, 1, target, level, xoffset, 0, 0,
+                              postConvWidth, 1, 1, format, type)) {
+      return;   /* error was detected */
+   }
+
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texObj = _mesa_select_tex_object(ctx, texUnit, target);
+   texImage = _mesa_select_tex_image(ctx, texUnit, target, level);
+   assert(texImage);
+
+   if (width == 0 || !pixels)
+      return;  /* no-op, not an error */
+
+   /* If we have a border, xoffset=-1 is legal.  Bias by border width */
+   xoffset += texImage->Border;
+
+   ASSERT(ctx->Driver.TexSubImage1D);
+   (*ctx->Driver.TexSubImage1D)(ctx, target, level, xoffset, width,
+                                format, type, pixels, &ctx->Unpack,
+                                texObj, texImage);
+   ctx->NewState |= _NEW_TEXTURE;
+}
+
+
+void GLAPIENTRY
+_mesa_TexSubImage2D( GLenum target, GLint level,
+                     GLint xoffset, GLint yoffset,
+                     GLsizei width, GLsizei height,
+                     GLenum format, GLenum type,
+                     const GLvoid *pixels )
+{
+   GLsizei postConvWidth = width, postConvHeight = height;
+   struct gl_texture_unit *texUnit;
+   struct gl_texture_object *texObj;
+   struct gl_texture_image *texImage;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (ctx->NewState & _IMAGE_NEW_TRANSFER_STATE)
+      _mesa_update_state(ctx);
+
+   /* XXX should test internal format */
+   if (is_color_format(format)) {
+      _mesa_adjust_image_for_convolution(ctx, 2, &postConvWidth,
+                                         &postConvHeight);
+   }
+
+   if (subtexture_error_check(ctx, 2, target, level, xoffset, yoffset, 0,
+                             postConvWidth, postConvHeight, 1, format, type)) {
+      return;   /* error was detected */
+   }
+
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texObj = _mesa_select_tex_object(ctx, texUnit, target);
+   texImage = _mesa_select_tex_image(ctx, texUnit, target, level);
+   assert(texImage);
+
+   if (width == 0 || height == 0 || !pixels)
+      return;  /* no-op, not an error */
+
+   /* If we have a border, xoffset=-1 is legal.  Bias by border width */
+   xoffset += texImage->Border;
+   yoffset += texImage->Border;
+
+   ASSERT(ctx->Driver.TexSubImage2D);
+   (*ctx->Driver.TexSubImage2D)(ctx, target, level, xoffset, yoffset,
+                                width, height, format, type, pixels,
+                                &ctx->Unpack, texObj, texImage);
+   ctx->NewState |= _NEW_TEXTURE;
+}
+
+
+
+void GLAPIENTRY
+_mesa_TexSubImage3D( GLenum target, GLint level,
+                     GLint xoffset, GLint yoffset, GLint zoffset,
+                     GLsizei width, GLsizei height, GLsizei depth,
+                     GLenum format, GLenum type,
+                     const GLvoid *pixels )
+{
+   struct gl_texture_unit *texUnit;
+   struct gl_texture_object *texObj;
+   struct gl_texture_image *texImage;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (ctx->NewState & _IMAGE_NEW_TRANSFER_STATE)
+      _mesa_update_state(ctx);
+
+   if (subtexture_error_check(ctx, 3, target, level, xoffset, yoffset, zoffset,
+                              width, height, depth, format, type)) {
+      return;   /* error was detected */
+   }
+
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texObj = _mesa_select_tex_object(ctx, texUnit, target);
+   texImage = _mesa_select_tex_image(ctx, texUnit, target, level);
+   assert(texImage);
+
+   if (width == 0 || height == 0 || height == 0 || !pixels)
+      return;  /* no-op, not an error */
+
+   /* If we have a border, xoffset=-1 is legal.  Bias by border width */
+   xoffset += texImage->Border;
+   yoffset += texImage->Border;
+   zoffset += texImage->Border;
+
+   ASSERT(ctx->Driver.TexSubImage3D);
+   (*ctx->Driver.TexSubImage3D)(ctx, target, level,
+                                xoffset, yoffset, zoffset,
+                                width, height, depth,
+                                format, type, pixels,
+                                &ctx->Unpack, texObj, texImage );
+   ctx->NewState |= _NEW_TEXTURE;
+}
+
+
+
+void GLAPIENTRY
+_mesa_CopyTexImage1D( GLenum target, GLint level,
+                      GLenum internalFormat,
+                      GLint x, GLint y,
+                      GLsizei width, GLint border )
+{
+   struct gl_texture_unit *texUnit;
+   struct gl_texture_object *texObj;
+   struct gl_texture_image *texImage;
+   GLsizei postConvWidth = width;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (ctx->NewState & _IMAGE_NEW_TRANSFER_STATE)
+      _mesa_update_state(ctx);
+
+   if (is_color_format(internalFormat)) {
+      _mesa_adjust_image_for_convolution(ctx, 1, &postConvWidth, NULL);
+   }
+
+   if (copytexture_error_check(ctx, 1, target, level, internalFormat,
+                               postConvWidth, 1, border))
+      return;
+
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texObj = _mesa_select_tex_object(ctx, texUnit, target);
+   texImage = _mesa_get_tex_image(ctx, texUnit, target, level);
+   if (!texImage) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyTexImage1D");
+      return;
+   }
+   else if (texImage->Data && !texImage->IsClientData) {
+      /* free the old texture data */
+      MESA_PBUFFER_FREE(texImage->Data);
+   }
+   texImage->Data = NULL;
+
+   clear_teximage_fields(texImage); /* not really needed, but helpful */
+   _mesa_init_teximage_fields(ctx, target, texImage, postConvWidth, 1, 1,
+                              border, internalFormat);
+
+
+   ASSERT(ctx->Driver.CopyTexImage1D);
+   (*ctx->Driver.CopyTexImage1D)(ctx, target, level, internalFormat,
+                                 x, y, width, border);
+
+   ASSERT(texImage->TexFormat);
+   if (!texImage->FetchTexel) {
+      /* If driver didn't explicitly set this, use the default */
+      texImage->FetchTexel = texImage->TexFormat->FetchTexel1D;
+   }
+   ASSERT(texImage->FetchTexel);
+
+   /* state update */
+   texObj->Complete = GL_FALSE;
+   ctx->NewState |= _NEW_TEXTURE;
+}
+
+
+
+void GLAPIENTRY
+_mesa_CopyTexImage2D( GLenum target, GLint level, GLenum internalFormat,
+                      GLint x, GLint y, GLsizei width, GLsizei height,
+                      GLint border )
+{
+   struct gl_texture_unit *texUnit;
+   struct gl_texture_object *texObj;
+   struct gl_texture_image *texImage;
+   GLsizei postConvWidth = width, postConvHeight = height;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (ctx->NewState & _IMAGE_NEW_TRANSFER_STATE)
+      _mesa_update_state(ctx);
+
+   if (is_color_format(internalFormat)) {
+      _mesa_adjust_image_for_convolution(ctx, 2, &postConvWidth,
+                                         &postConvHeight);
+   }
+
+   if (copytexture_error_check(ctx, 2, target, level, internalFormat,
+                               postConvWidth, postConvHeight, border))
+      return;
+
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texObj = _mesa_select_tex_object(ctx, texUnit, target);
+   texImage = _mesa_get_tex_image(ctx, texUnit, target, level);
+   if (!texImage) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyTexImage2D");
+      return;
+   }
+   else if (texImage->Data && !texImage->IsClientData) {
+      /* free the old texture data */
+      MESA_PBUFFER_FREE(texImage->Data);
+   }
+   texImage->Data = NULL;
+
+   clear_teximage_fields(texImage); /* not really needed, but helpful */
+   _mesa_init_teximage_fields(ctx, target, texImage,
+                              postConvWidth, postConvHeight, 1,
+                              border, internalFormat);
+
+   ASSERT(ctx->Driver.CopyTexImage2D);
+   (*ctx->Driver.CopyTexImage2D)(ctx, target, level, internalFormat,
+                                 x, y, width, height, border);
+
+   ASSERT(texImage->TexFormat);
+   if (!texImage->FetchTexel) {
+      /* If driver didn't explicitly set this, use the default */
+      texImage->FetchTexel = texImage->TexFormat->FetchTexel2D;
+   }
+   ASSERT(texImage->FetchTexel);
+
+   /* state update */
+   texObj->Complete = GL_FALSE;
+   ctx->NewState |= _NEW_TEXTURE;
+}
+
+
+
+void GLAPIENTRY
+_mesa_CopyTexSubImage1D( GLenum target, GLint level,
+                         GLint xoffset, GLint x, GLint y, GLsizei width )
+{
+   struct gl_texture_unit *texUnit;
+   struct gl_texture_image *texImage;
+   GLsizei postConvWidth = width;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (ctx->NewState & _IMAGE_NEW_TRANSFER_STATE)
+      _mesa_update_state(ctx);
+
+   /* XXX should test internal format */
+   _mesa_adjust_image_for_convolution(ctx, 1, &postConvWidth, NULL);
+
+   if (copytexsubimage_error_check(ctx, 1, target, level,
+                                   xoffset, 0, 0, postConvWidth, 1))
+      return;
+
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texImage = _mesa_select_tex_image(ctx, texUnit, target, level);
+   ASSERT(texImage);
+
+   /* If we have a border, xoffset=-1 is legal.  Bias by border width */
+   xoffset += texImage->Border;
+
+   ASSERT(ctx->Driver.CopyTexSubImage1D);
+   (*ctx->Driver.CopyTexSubImage1D)(ctx, target, level, xoffset, x, y, width);
+   ctx->NewState |= _NEW_TEXTURE;
+}
+
+
+
+void GLAPIENTRY
+_mesa_CopyTexSubImage2D( GLenum target, GLint level,
+                         GLint xoffset, GLint yoffset,
+                         GLint x, GLint y, GLsizei width, GLsizei height )
+{
+   struct gl_texture_unit *texUnit;
+   struct gl_texture_image *texImage;
+   GLsizei postConvWidth = width, postConvHeight = height;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (ctx->NewState & _IMAGE_NEW_TRANSFER_STATE)
+      _mesa_update_state(ctx);
+
+   /* XXX should test internal format */
+   _mesa_adjust_image_for_convolution(ctx, 2, &postConvWidth, &postConvHeight);
+
+   if (copytexsubimage_error_check(ctx, 2, target, level, xoffset, yoffset, 0,
+                                   postConvWidth, postConvHeight))
+      return;
+
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texImage = _mesa_select_tex_image(ctx, texUnit, target, level);
+   ASSERT(texImage);
+
+   /* If we have a border, xoffset=-1 is legal.  Bias by border width */
+   xoffset += texImage->Border;
+   yoffset += texImage->Border;
+
+   ASSERT(ctx->Driver.CopyTexSubImage2D);
+   (*ctx->Driver.CopyTexSubImage2D)(ctx, target, level,
+                                    xoffset, yoffset, x, y, width, height);
+   ctx->NewState |= _NEW_TEXTURE;
+}
+
+
+
+void GLAPIENTRY
+_mesa_CopyTexSubImage3D( GLenum target, GLint level,
+                         GLint xoffset, GLint yoffset, GLint zoffset,
+                         GLint x, GLint y, GLsizei width, GLsizei height )
+{
+   struct gl_texture_unit *texUnit;
+   struct gl_texture_image *texImage;
+   GLsizei postConvWidth = width, postConvHeight = height;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (ctx->NewState & _IMAGE_NEW_TRANSFER_STATE)
+      _mesa_update_state(ctx);
+
+   /* XXX should test internal format */
+   _mesa_adjust_image_for_convolution(ctx, 2, &postConvWidth, &postConvHeight);
+
+   if (copytexsubimage_error_check(ctx, 3, target, level, xoffset, yoffset,
+                                   zoffset, postConvWidth, postConvHeight))
+      return;
+
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texImage = _mesa_select_tex_image(ctx, texUnit, target, level);
+   ASSERT(texImage);
+
+   /* If we have a border, xoffset=-1 is legal.  Bias by border width */
+   xoffset += texImage->Border;
+   yoffset += texImage->Border;
+   zoffset += texImage->Border;
+
+   ASSERT(ctx->Driver.CopyTexSubImage3D);
+   (*ctx->Driver.CopyTexSubImage3D)(ctx, target, level,
+                                    xoffset, yoffset, zoffset,
+                                    x, y, width, height);
+   ctx->NewState |= _NEW_TEXTURE;
+}
+
+
+
+
+/**********************************************************************/
+/******                   Compressed Textures                    ******/
+/**********************************************************************/
+
+
+/**
+ * Error checking for glCompressedTexImage[123]D().
+ * \return error code or GL_NO_ERROR.
+ */
+static GLenum
+compressed_texture_error_check(GLcontext *ctx, GLint dimensions,
+                               GLenum target, GLint level,
+                               GLenum internalFormat, GLsizei width,
+                               GLsizei height, GLsizei depth, GLint border,
+                               GLsizei imageSize)
+{
+   GLint expectedSize, maxLevels = 0, maxTextureSize;
+
+   if (dimensions == 1) {
+      /* 1D compressed textures not allowed */
+      return GL_INVALID_ENUM;
+   }
+   else if (dimensions == 2) {
+      if (target == GL_PROXY_TEXTURE_2D) {
+         maxLevels = ctx->Const.MaxTextureLevels;
+      }
+      else if (target == GL_TEXTURE_2D) {
+         maxLevels = ctx->Const.MaxTextureLevels;
+      }
+      else if (target == GL_PROXY_TEXTURE_CUBE_MAP_ARB) {
+         if (!ctx->Extensions.ARB_texture_cube_map)
+            return GL_INVALID_ENUM; /*target*/
+         maxLevels = ctx->Const.MaxCubeTextureLevels;
+      }
+      else if (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&
+               target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB) {
+         if (!ctx->Extensions.ARB_texture_cube_map)
+            return GL_INVALID_ENUM; /*target*/
+         maxLevels = ctx->Const.MaxCubeTextureLevels;
+      }
+      else {
+         return GL_INVALID_ENUM; /*target*/
+      }
+   }
+   else if (dimensions == 3) {
+      /* 3D compressed textures not allowed */
+      return GL_INVALID_ENUM;
+   }
+
+   maxTextureSize = 1 << (maxLevels - 1);
+
+   if (!is_compressed_format(ctx, internalFormat))
+      return GL_INVALID_ENUM;
+
+   if (border != 0)
+      return GL_INVALID_VALUE;
+
+   /*
+    * XXX We should probably use the proxy texture error check function here.
+    */
+   if (width < 1 || width > maxTextureSize ||
+       (!ctx->Extensions.ARB_texture_non_power_of_two && logbase2(width) < 0))
+      return GL_INVALID_VALUE;
+
+   if ((height < 1 || height > maxTextureSize ||
+        (!ctx->Extensions.ARB_texture_non_power_of_two && logbase2(height) < 0))
+       && dimensions > 1)
+      return GL_INVALID_VALUE;
+
+   if ((depth < 1 || depth > maxTextureSize ||
+        (!ctx->Extensions.ARB_texture_non_power_of_two && logbase2(depth) < 0))
+       && dimensions > 2)
+      return GL_INVALID_VALUE;
+
+   /* For cube map, width must equal height */
+   if (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&
+       target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB && width != height)
+      return GL_INVALID_VALUE;
+
+   if (level < 0 || level >= maxLevels)
+      return GL_INVALID_VALUE;
+
+   expectedSize = _mesa_compressed_texture_size(ctx, width, height, depth,
+                                                internalFormat);
+   if (expectedSize != imageSize)
+      return GL_INVALID_VALUE;
+
+   return GL_NO_ERROR;
+}
+
+
+/**
+ * Error checking for glCompressedTexSubImage[123]D().
+ * \return error code or GL_NO_ERROR.
+ */
+static GLenum
+compressed_subtexture_error_check(GLcontext *ctx, GLint dimensions,
+                                  GLenum target, GLint level,
+                                  GLint xoffset, GLint yoffset, GLint zoffset,
+                                  GLsizei width, GLsizei height, GLsizei depth,
+                                  GLenum format, GLsizei imageSize)
+{
+   GLint expectedSize, maxLevels = 0, maxTextureSize;
+
+   if (dimensions == 1) {
+      /* 1D compressed textures not allowed */
+      return GL_INVALID_ENUM;
+   }
+   else if (dimensions == 2) {
+      if (target == GL_PROXY_TEXTURE_2D) {
+         maxLevels = ctx->Const.MaxTextureLevels;
+      }
+      else if (target == GL_TEXTURE_2D) {
+         maxLevels = ctx->Const.MaxTextureLevels;
+      }
+      else if (target == GL_PROXY_TEXTURE_CUBE_MAP_ARB) {
+         if (!ctx->Extensions.ARB_texture_cube_map)
+            return GL_INVALID_ENUM; /*target*/
+         maxLevels = ctx->Const.MaxCubeTextureLevels;
+      }
+      else if (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&
+               target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB) {
+         if (!ctx->Extensions.ARB_texture_cube_map)
+            return GL_INVALID_ENUM; /*target*/
+         maxLevels = ctx->Const.MaxCubeTextureLevels;
+      }
+      else {
+         return GL_INVALID_ENUM; /*target*/
+      }
+   }
+   else if (dimensions == 3) {
+      /* 3D compressed textures not allowed */
+      return GL_INVALID_ENUM;
+   }
+
+   maxTextureSize = 1 << (maxLevels - 1);
+
+   if (!is_compressed_format(ctx, format))
+      return GL_INVALID_ENUM;
+
+   if (width < 1 || width > maxTextureSize)
+      return GL_INVALID_VALUE;
+
+   if ((height < 1 || height > maxTextureSize)
+       && dimensions > 1)
+      return GL_INVALID_VALUE;
+
+   if (level < 0 || level >= maxLevels)
+      return GL_INVALID_VALUE;
+
+   if ((xoffset & 3) != 0 || (yoffset & 3) != 0)
+      return GL_INVALID_VALUE;
+
+   if ((width & 3) != 0 && width != 2 && width != 1)
+      return GL_INVALID_VALUE;
+
+   if ((height & 3) != 0 && height != 2 && height != 1)
+      return GL_INVALID_VALUE;
+
+   expectedSize = _mesa_compressed_texture_size(ctx, width, height, depth,
+                                                format);
+   if (expectedSize != imageSize)
+      return GL_INVALID_VALUE;
+
+   return GL_NO_ERROR;
+}
+
+
+
+void GLAPIENTRY
+_mesa_CompressedTexImage1DARB(GLenum target, GLint level,
+                              GLenum internalFormat, GLsizei width,
+                              GLint border, GLsizei imageSize,
+                              const GLvoid *data)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (target == GL_TEXTURE_1D) {
+      struct gl_texture_unit *texUnit;
+      struct gl_texture_object *texObj;
+      struct gl_texture_image *texImage;
+      GLenum error = compressed_texture_error_check(ctx, 1, target, level,
+                               internalFormat, width, 1, 1, border, imageSize);
+      if (error) {
+         _mesa_error(ctx, error, "glCompressedTexImage1D");
+         return;
+      }
+
+      texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+      texObj = _mesa_select_tex_object(ctx, texUnit, target);
+      texImage = _mesa_get_tex_image(ctx, texUnit, target, level);
+      if (!texImage) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage1D");
+         return;
+      }
+      else if (texImage->Data && !texImage->IsClientData) {
+         MESA_PBUFFER_FREE(texImage->Data);
+      }
+      texImage->Data = NULL;
+
+      _mesa_init_teximage_fields(ctx, target, texImage, width, 1, 1,
+                                 border, internalFormat);
+
+      ASSERT(ctx->Driver.CompressedTexImage1D);
+      (*ctx->Driver.CompressedTexImage1D)(ctx, target, level,
+                                          internalFormat, width, border,
+                                          imageSize, data,
+                                          texObj, texImage);
+
+      /* state update */
+      texObj->Complete = GL_FALSE;
+      ctx->NewState |= _NEW_TEXTURE;
+   }
+   else if (target == GL_PROXY_TEXTURE_1D) {
+      /* Proxy texture: check for errors and update proxy state */
+      GLenum error = compressed_texture_error_check(ctx, 1, target, level,
+                               internalFormat, width, 1, 1, border, imageSize);
+      if (!error) {
+         ASSERT(ctx->Driver.TestProxyTexImage);
+         error = !(*ctx->Driver.TestProxyTexImage)(ctx, target, level,
+                                             internalFormat, GL_NONE, GL_NONE,
+                                             width, 1, 1, border);
+      }
+      if (error) {
+         /* if error, clear all proxy texture image parameters */
+         struct gl_texture_image *texImage;
+         texImage = _mesa_get_proxy_tex_image(ctx, target, level);
+         if (texImage)
+            clear_teximage_fields(texImage);
+      }
+      else {
+         /* store the teximage parameters */
+         struct gl_texture_unit *texUnit;
+         struct gl_texture_image *texImage;
+         texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+         texImage = _mesa_select_tex_image(ctx, texUnit, target, level);
+         _mesa_init_teximage_fields(ctx, target, texImage, width, 1, 1,
+                                    border, internalFormat);
+      }
+   }
+   else {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glCompressedTexImage1D(target)");
+      return;
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_CompressedTexImage2DARB(GLenum target, GLint level,
+                              GLenum internalFormat, GLsizei width,
+                              GLsizei height, GLint border, GLsizei imageSize,
+                              const GLvoid *data)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (target == GL_TEXTURE_2D ||
+       (ctx->Extensions.ARB_texture_cube_map &&
+        target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&
+        target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB)) {
+      struct gl_texture_unit *texUnit;
+      struct gl_texture_object *texObj;
+      struct gl_texture_image *texImage;
+      GLenum error = compressed_texture_error_check(ctx, 2, target, level,
+                          internalFormat, width, height, 1, border, imageSize);
+      if (error) {
+         _mesa_error(ctx, error, "glCompressedTexImage2D");
+         return;
+      }
+
+      texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+      texObj = _mesa_select_tex_object(ctx, texUnit, target);
+      texImage = _mesa_get_tex_image(ctx, texUnit, target, level);
+      if (!texImage) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage2D");
+         return;
+      }
+      else if (texImage->Data && !texImage->IsClientData) {
+         MESA_PBUFFER_FREE(texImage->Data);
+      }
+      texImage->Data = NULL;
+
+      _mesa_init_teximage_fields(ctx, target, texImage, width, height, 1,
+                                 border, internalFormat);
+
+      ASSERT(ctx->Driver.CompressedTexImage2D);
+      (*ctx->Driver.CompressedTexImage2D)(ctx, target, level,
+                                          internalFormat, width, height,
+                                          border, imageSize, data,
+                                          texObj, texImage);
+
+      /* state update */
+      texObj->Complete = GL_FALSE;
+      ctx->NewState |= _NEW_TEXTURE;
+   }
+   else if (target == GL_PROXY_TEXTURE_2D ||
+            (target == GL_PROXY_TEXTURE_CUBE_MAP_ARB &&
+             ctx->Extensions.ARB_texture_cube_map)) {
+      /* Proxy texture: check for errors and update proxy state */
+      GLenum error = compressed_texture_error_check(ctx, 2, target, level,
+                          internalFormat, width, height, 1, border, imageSize);
+      if (!error) {
+         ASSERT(ctx->Driver.TestProxyTexImage);
+         error = !(*ctx->Driver.TestProxyTexImage)(ctx, target, level,
+                                              internalFormat, GL_NONE, GL_NONE,
+                                              width, height, 1, border);
+      }
+      if (error) {
+         /* if error, clear all proxy texture image parameters */
+         struct gl_texture_image *texImage;
+         texImage = _mesa_get_proxy_tex_image(ctx, target, level);
+         if (texImage)
+            clear_teximage_fields(texImage);
+      }
+      else {
+         /* store the teximage parameters */
+         struct gl_texture_unit *texUnit;
+         struct gl_texture_image *texImage;
+         texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+         texImage = _mesa_select_tex_image(ctx, texUnit, target, level);
+         _mesa_init_teximage_fields(ctx, target, texImage, width, height, 1,
+                                    border, internalFormat);
+      }
+   }
+   else {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glCompressedTexImage2D(target)");
+      return;
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_CompressedTexImage3DARB(GLenum target, GLint level,
+                              GLenum internalFormat, GLsizei width,
+                              GLsizei height, GLsizei depth, GLint border,
+                              GLsizei imageSize, const GLvoid *data)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (target == GL_TEXTURE_3D) {
+      struct gl_texture_unit *texUnit;
+      struct gl_texture_object *texObj;
+      struct gl_texture_image *texImage;
+      GLenum error = compressed_texture_error_check(ctx, 3, target, level,
+                      internalFormat, width, height, depth, border, imageSize);
+      if (error) {
+         _mesa_error(ctx, error, "glCompressedTexImage3D");
+         return;
+      }
+
+      texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+      texObj = _mesa_select_tex_object(ctx, texUnit, target);
+      texImage = _mesa_get_tex_image(ctx, texUnit, target, level);
+      if (!texImage) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage3D");
+         return;
+      }
+      else if (texImage->Data && !texImage->IsClientData) {
+         MESA_PBUFFER_FREE(texImage->Data);
+      }
+      texImage->Data = NULL;
+
+      _mesa_init_teximage_fields(ctx, target, texImage, width, height, depth,
+                                 border, internalFormat);
+
+      ASSERT(ctx->Driver.CompressedTexImage3D);
+      (*ctx->Driver.CompressedTexImage3D)(ctx, target, level,
+                                          internalFormat,
+                                          width, height, depth,
+                                          border, imageSize, data,
+                                          texObj, texImage);
+
+      /* state update */
+      texObj->Complete = GL_FALSE;
+      ctx->NewState |= _NEW_TEXTURE;
+   }
+   else if (target == GL_PROXY_TEXTURE_3D) {
+      /* Proxy texture: check for errors and update proxy state */
+      GLenum error = compressed_texture_error_check(ctx, 3, target, level,
+                      internalFormat, width, height, depth, border, imageSize);
+      if (!error) {
+         ASSERT(ctx->Driver.TestProxyTexImage);
+         error = !(*ctx->Driver.TestProxyTexImage)(ctx, target, level,
+                                             internalFormat, GL_NONE, GL_NONE,
+                                             width, height, depth, border);
+      }
+      if (error) {
+         /* if error, clear all proxy texture image parameters */
+         struct gl_texture_image *texImage;
+         texImage = _mesa_get_proxy_tex_image(ctx, target, level);
+         if (texImage)
+            clear_teximage_fields(texImage);
+      }
+      else {
+         /* store the teximage parameters */
+         struct gl_texture_unit *texUnit;
+         struct gl_texture_image *texImage;
+         texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+         texImage = _mesa_select_tex_image(ctx, texUnit, target, level);
+         _mesa_init_teximage_fields(ctx, target, texImage, width, height,
+                                    depth, border, internalFormat);
+      }
+   }
+   else {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glCompressedTexImage3D(target)");
+      return;
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,
+                                 GLsizei width, GLenum format,
+                                 GLsizei imageSize, const GLvoid *data)
+{
+   struct gl_texture_unit *texUnit;
+   struct gl_texture_object *texObj;
+   struct gl_texture_image *texImage;
+   GLenum error;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   error = compressed_subtexture_error_check(ctx, 1, target, level,
+                                xoffset, 0, 0, width, 1, 1, format, imageSize);
+   if (error) {
+      _mesa_error(ctx, error, "glCompressedTexSubImage1D");
+      return;
+   }
+
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texObj = _mesa_select_tex_object(ctx, texUnit, target);
+   texImage = _mesa_select_tex_image(ctx, texUnit, target, level);
+   assert(texImage);
+
+   if ((GLint) format != texImage->IntFormat) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glCompressedTexSubImage1D(format)");
+      return;
+   }
+
+   if ((width == 1 || width == 2) && (GLuint) width != texImage->Width) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glCompressedTexSubImage1D(width)");
+      return;
+   }
+      
+   if (width == 0 || !data)
+      return;  /* no-op, not an error */
+
+   if (ctx->Driver.CompressedTexSubImage1D) {
+      (*ctx->Driver.CompressedTexSubImage1D)(ctx, target, level,
+                                             xoffset, width,
+                                             format, imageSize, data,
+                                             texObj, texImage);
+   }
+   ctx->NewState |= _NEW_TEXTURE;
+}
+
+
+void GLAPIENTRY
+_mesa_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,
+                                 GLint yoffset, GLsizei width, GLsizei height,
+                                 GLenum format, GLsizei imageSize,
+                                 const GLvoid *data)
+{
+   struct gl_texture_unit *texUnit;
+   struct gl_texture_object *texObj;
+   struct gl_texture_image *texImage;
+   GLenum error;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   error = compressed_subtexture_error_check(ctx, 2, target, level,
+                     xoffset, yoffset, 0, width, height, 1, format, imageSize);
+   if (error) {
+      /* XXX proxy target? */
+      _mesa_error(ctx, error, "glCompressedTexSubImage2D");
+      return;
+   }
+
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texObj = _mesa_select_tex_object(ctx, texUnit, target);
+   texImage = _mesa_select_tex_image(ctx, texUnit, target, level);
+   assert(texImage);
+
+   if ((GLint) format != texImage->IntFormat) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glCompressedTexSubImage2D(format)");
+      return;
+   }
+
+   if (((width == 1 || width == 2) && (GLuint) width != texImage->Width) ||
+       ((height == 1 || height == 2) && (GLuint) height != texImage->Height)) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glCompressedTexSubImage2D(size)");
+      return;
+   }
+      
+   if (width == 0 || height == 0 || !data)
+      return;  /* no-op, not an error */
+
+   if (ctx->Driver.CompressedTexSubImage2D) {
+      (*ctx->Driver.CompressedTexSubImage2D)(ctx, target, level,
+                                             xoffset, yoffset, width, height,
+                                             format, imageSize, data,
+                                             texObj, texImage);
+   }
+   ctx->NewState |= _NEW_TEXTURE;
+}
+
+
+void GLAPIENTRY
+_mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
+                                 GLint yoffset, GLint zoffset, GLsizei width,
+                                 GLsizei height, GLsizei depth, GLenum format,
+                                 GLsizei imageSize, const GLvoid *data)
+{
+   struct gl_texture_unit *texUnit;
+   struct gl_texture_object *texObj;
+   struct gl_texture_image *texImage;
+   GLenum error;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   error = compressed_subtexture_error_check(ctx, 3, target, level,
+           xoffset, yoffset, zoffset, width, height, depth, format, imageSize);
+   if (error) {
+      _mesa_error(ctx, error, "glCompressedTexSubImage2D");
+      return;
+   }
+
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texObj = _mesa_select_tex_object(ctx, texUnit, target);
+   texImage = _mesa_select_tex_image(ctx, texUnit, target, level);
+   assert(texImage);
+
+   if ((GLint) format != texImage->IntFormat) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glCompressedTexSubImage3D(format)");
+      return;
+   }
+
+   if (((width == 1 || width == 2) && (GLuint) width != texImage->Width) ||
+       ((height == 1 || height == 2) && (GLuint) height != texImage->Height) ||
+       ((depth == 1 || depth == 2) && (GLuint) depth != texImage->Depth)) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glCompressedTexSubImage3D(size)");
+      return;
+   }
+      
+   if (width == 0 || height == 0 || depth == 0 || !data)
+      return;  /* no-op, not an error */
+
+   if (ctx->Driver.CompressedTexSubImage3D) {
+      (*ctx->Driver.CompressedTexSubImage3D)(ctx, target, level,
+                                             xoffset, yoffset, zoffset,
+                                             width, height, depth,
+                                             format, imageSize, data,
+                                             texObj, texImage);
+   }
+   ctx->NewState |= _NEW_TEXTURE;
+}
+
+
+void GLAPIENTRY
+_mesa_GetCompressedTexImageARB(GLenum target, GLint level, GLvoid *img)
+{
+   const struct gl_texture_unit *texUnit;
+   const struct gl_texture_object *texObj;
+   struct gl_texture_image *texImage;
+   GLint maxLevels;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texObj = _mesa_select_tex_object(ctx, texUnit, target);
+   if (!texObj) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetCompressedTexImageARB");
+      return;
+   }
+
+   maxLevels = _mesa_max_texture_levels(ctx, target);
+   ASSERT(maxLevels > 0); /* 0 indicates bad target, caught above */
+
+   if (level < 0 || level >= maxLevels) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glGetCompressedTexImageARB(level)");
+      return;
+   }
+
+   if (is_proxy_target(target)) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetCompressedTexImageARB(target)");
+      return;
+   }
+
+   texImage = _mesa_select_tex_image(ctx, texUnit, target, level);
+   if (!texImage) {
+      /* probably invalid mipmap level */
+      _mesa_error(ctx, GL_INVALID_VALUE, "glGetCompressedTexImageARB(level)");
+      return;
+   }
+
+   if (!texImage->IsCompressed) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetCompressedTexImageARB");
+      return;
+   }
+
+   if (!img)
+      return;
+
+   /* just memcpy, no pixelstore or pixel transfer */
+   MEMCPY(img, texImage->Data, texImage->CompressedSize);
+}
diff --git a/reactos/lib/mesa32/src/main/teximage.h b/reactos/lib/mesa32/src/main/teximage.h
new file mode 100644
index 00000000000..699b4e6bdf3
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/teximage.h
@@ -0,0 +1,227 @@
+/**
+ * \file teximage.h
+ * Texture images manipulation functions.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef TEXIMAGE_H
+#define TEXIMAGE_H
+
+
+#include "mtypes.h"
+
+
+/** \name Internal functions */
+/*@{*/
+
+extern GLint
+_mesa_base_tex_format( GLcontext *ctx, GLint format );
+
+
+extern struct gl_texture_image *
+_mesa_new_texture_image( GLcontext *ctx );
+
+
+extern void
+_mesa_delete_texture_image( struct gl_texture_image *teximage );
+
+
+extern void
+_mesa_init_teximage_fields(GLcontext *ctx, GLenum target,
+                           struct gl_texture_image *img,
+                           GLsizei width, GLsizei height, GLsizei depth,
+                           GLint border, GLenum internalFormat);
+
+
+extern void
+_mesa_set_tex_image(struct gl_texture_object *tObj,
+                    GLenum target, GLint level,
+                    struct gl_texture_image *texImage);
+
+
+extern struct gl_texture_object *
+_mesa_select_tex_object(GLcontext *ctx, const struct gl_texture_unit *texUnit,
+                        GLenum target);
+
+
+extern struct gl_texture_image *
+_mesa_select_tex_image(GLcontext *ctx, const struct gl_texture_unit *texUnit,
+                       GLenum target, GLint level);
+
+
+extern struct gl_texture_image *
+_mesa_get_tex_image(GLcontext *ctx, const struct gl_texture_unit *texUnit,
+                    GLenum target, GLint level);
+
+
+extern struct gl_texture_image *
+_mesa_get_proxy_tex_image(GLcontext *ctx, GLenum target, GLint level);
+
+
+extern GLint
+_mesa_max_texture_levels(GLcontext *ctx, GLenum target);
+
+
+extern GLboolean
+_mesa_test_proxy_teximage(GLcontext *ctx, GLenum target, GLint level,
+                         GLint internalFormat, GLenum format, GLenum type,
+                         GLint width, GLint height, GLint depth, GLint border);
+
+/*@}*/
+
+
+/** \name API entry point functions */
+/*@{*/
+
+extern void GLAPIENTRY
+_mesa_TexImage1D( GLenum target, GLint level, GLint internalformat,
+                  GLsizei width, GLint border,
+                  GLenum format, GLenum type, const GLvoid *pixels );
+
+
+extern void GLAPIENTRY
+_mesa_TexImage2D( GLenum target, GLint level, GLint internalformat,
+                  GLsizei width, GLsizei height, GLint border,
+                  GLenum format, GLenum type, const GLvoid *pixels );
+
+
+extern void GLAPIENTRY
+_mesa_TexImage3D( GLenum target, GLint level, GLint internalformat,
+                  GLsizei width, GLsizei height, GLsizei depth, GLint border,
+                  GLenum format, GLenum type, const GLvoid *pixels );
+
+
+extern void GLAPIENTRY
+_mesa_TexImage3DEXT( GLenum target, GLint level, GLenum internalformat,
+                     GLsizei width, GLsizei height, GLsizei depth,
+                     GLint border, GLenum format, GLenum type,
+                     const GLvoid *pixels );
+
+
+extern void GLAPIENTRY
+_mesa_GetTexImage( GLenum target, GLint level,
+                   GLenum format, GLenum type, GLvoid *pixels );
+
+
+extern void GLAPIENTRY
+_mesa_TexSubImage1D( GLenum target, GLint level, GLint xoffset,
+                     GLsizei width,
+                     GLenum format, GLenum type,
+                     const GLvoid *pixels );
+
+
+extern void GLAPIENTRY
+_mesa_TexSubImage2D( GLenum target, GLint level,
+                     GLint xoffset, GLint yoffset,
+                     GLsizei width, GLsizei height,
+                     GLenum format, GLenum type,
+                     const GLvoid *pixels );
+
+
+extern void GLAPIENTRY
+_mesa_TexSubImage3D( GLenum target, GLint level,
+                     GLint xoffset, GLint yoffset, GLint zoffset,
+                     GLsizei width, GLsizei height, GLsizei depth,
+                     GLenum format, GLenum type,
+                     const GLvoid *pixels );
+
+
+extern void GLAPIENTRY
+_mesa_CopyTexImage1D( GLenum target, GLint level, GLenum internalformat,
+                      GLint x, GLint y, GLsizei width, GLint border );
+
+
+extern void GLAPIENTRY
+_mesa_CopyTexImage2D( GLenum target, GLint level,
+                      GLenum internalformat, GLint x, GLint y,
+                      GLsizei width, GLsizei height, GLint border );
+
+
+extern void GLAPIENTRY
+_mesa_CopyTexSubImage1D( GLenum target, GLint level, GLint xoffset,
+                         GLint x, GLint y, GLsizei width );
+
+
+extern void GLAPIENTRY
+_mesa_CopyTexSubImage2D( GLenum target, GLint level,
+                         GLint xoffset, GLint yoffset,
+                         GLint x, GLint y, GLsizei width, GLsizei height );
+
+
+extern void GLAPIENTRY
+_mesa_CopyTexSubImage3D( GLenum target, GLint level,
+                         GLint xoffset, GLint yoffset, GLint zoffset,
+                         GLint x, GLint y, GLsizei width, GLsizei height );
+
+
+
+extern void GLAPIENTRY
+_mesa_CompressedTexImage1DARB(GLenum target, GLint level,
+                              GLenum internalformat, GLsizei width,
+                              GLint border, GLsizei imageSize,
+                              const GLvoid *data);
+
+extern void GLAPIENTRY
+_mesa_CompressedTexImage2DARB(GLenum target, GLint level,
+                              GLenum internalformat, GLsizei width,
+                              GLsizei height, GLint border, GLsizei imageSize,
+                              const GLvoid *data);
+
+extern void GLAPIENTRY
+_mesa_CompressedTexImage3DARB(GLenum target, GLint level,
+                              GLenum internalformat, GLsizei width,
+                              GLsizei height, GLsizei depth, GLint border,
+                              GLsizei imageSize, const GLvoid *data);
+
+#ifdef VMS
+#define _mesa_CompressedTexSubImage1DARB _mesa_CompressedTexSubImage1DAR
+#define _mesa_CompressedTexSubImage2DARB _mesa_CompressedTexSubImage2DAR
+#define _mesa_CompressedTexSubImage3DARB _mesa_CompressedTexSubImage3DAR
+#endif
+extern void GLAPIENTRY
+_mesa_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,
+                                 GLsizei width, GLenum format,
+                                 GLsizei imageSize, const GLvoid *data);
+
+extern void GLAPIENTRY
+_mesa_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,
+                                 GLint yoffset, GLsizei width, GLsizei height,
+                                 GLenum format, GLsizei imageSize,
+                                 const GLvoid *data);
+
+extern void GLAPIENTRY
+_mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
+                                 GLint yoffset, GLint zoffset, GLsizei width,
+                                 GLsizei height, GLsizei depth, GLenum format,
+                                 GLsizei imageSize, const GLvoid *data);
+
+extern void GLAPIENTRY
+_mesa_GetCompressedTexImageARB(GLenum target, GLint lod, GLvoid *img);
+
+/*@}*/
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/texobj.c b/reactos/lib/mesa32/src/main/texobj.c
new file mode 100644
index 00000000000..168fa13b6d7
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/texobj.c
@@ -0,0 +1,1020 @@
+/**
+ * \file texobj.c
+ * Texture object management.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "colortab.h"
+#include "context.h"
+#include "enums.h"
+#include "hash.h"
+#include "imports.h"
+#include "macros.h"
+#include "teximage.h"
+#include "texstate.h"
+#include "texobj.h"
+#include "mtypes.h"
+
+
+/**********************************************************************/
+/** \name Internal functions */
+/*@{*/
+
+/**
+ * Allocate and initialize a new texture object.  But don't put it into the
+ * texture object hash table.
+ *
+ * Called via ctx->Driver.NewTextureObject, unless overridden by a device
+ * driver.
+ * 
+ * \param shared the shared GL state structure to contain the texture object
+ * \param name integer name for the texture object
+ * \param target either GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D,
+ * GL_TEXTURE_CUBE_MAP_ARB or GL_TEXTURE_RECTANGLE_NV.  zero is ok for the sake
+ * of GenTextures()
+ *
+ * \return pointer to new texture object.
+ *
+ * Allocate and initialize a gl_texture_object structure, and insert in the
+ * shared state texture list while holding its mutex.
+ * If <tt>name > 0</tt> then also insert the new texture object into the hash
+ * table.
+ * 
+ */
+struct gl_texture_object *
+_mesa_new_texture_object( GLcontext *ctx, GLuint name, GLenum target )
+{
+   struct gl_texture_object *obj;
+   obj = CALLOC_STRUCT(gl_texture_object);
+   _mesa_initialize_texture_object(obj, name, target);
+   return obj;
+}
+
+
+/**
+ * Initialize a texture object to default values.
+ * \param obj  the texture object
+ * \param name  the texture name
+ * \param target  the texture target
+ */
+void
+_mesa_initialize_texture_object( struct gl_texture_object *obj,
+                                 GLuint name, GLenum target )
+{
+   ASSERT(target == 0 ||
+          target == GL_TEXTURE_1D ||
+          target == GL_TEXTURE_2D ||
+          target == GL_TEXTURE_3D ||
+          target == GL_TEXTURE_CUBE_MAP_ARB ||
+          target == GL_TEXTURE_RECTANGLE_NV);
+
+   /* init the non-zero fields */
+   _glthread_INIT_MUTEX(obj->Mutex);
+   obj->RefCount = 1;
+   obj->Name = name;
+   obj->Target = target;
+   obj->Priority = 1.0F;
+   if (target == GL_TEXTURE_RECTANGLE_NV) {
+      obj->WrapS = GL_CLAMP_TO_EDGE;
+      obj->WrapT = GL_CLAMP_TO_EDGE;
+      obj->WrapR = GL_CLAMP_TO_EDGE;
+      obj->MinFilter = GL_LINEAR;
+   }
+   else {
+      obj->WrapS = GL_REPEAT;
+      obj->WrapT = GL_REPEAT;
+      obj->WrapR = GL_REPEAT;
+      obj->MinFilter = GL_NEAREST_MIPMAP_LINEAR;
+   }
+   obj->MagFilter = GL_LINEAR;
+   obj->MinLod = -1000.0;
+   obj->MaxLod = 1000.0;
+   obj->LodBias = 0.0;
+   obj->BaseLevel = 0;
+   obj->MaxLevel = 1000;
+   obj->MaxAnisotropy = 1.0;
+   obj->CompareFlag = GL_FALSE;                      /* SGIX_shadow */
+   obj->CompareOperator = GL_TEXTURE_LEQUAL_R_SGIX;  /* SGIX_shadow */
+   obj->CompareMode = GL_NONE;         /* ARB_shadow */
+   obj->CompareFunc = GL_LEQUAL;       /* ARB_shadow */
+   obj->DepthMode = GL_LUMINANCE;      /* ARB_depth_texture */
+   obj->ShadowAmbient = 0.0F;          /* ARB/SGIX_shadow_ambient */
+   _mesa_init_colortable(&obj->Palette);
+}
+
+
+/**
+ * Deallocate a texture object struct.  It should have already been
+ * removed from the texture object pool.
+ *
+ * \param shared the shared GL state to which the object belongs.
+ * \param texOjb the texture object to delete.
+ *
+ * Unlink the texture object from the shared state texture linked list while
+ * holding its lock. If the texture is a name number it's also removed from the
+ * hash table. Finally frees the texture images and the object itself.
+ */
+void
+_mesa_delete_texture_object( GLcontext *ctx, struct gl_texture_object *texObj )
+{
+   GLuint i;
+
+   (void) ctx;
+
+   assert(texObj);
+
+   _mesa_free_colortable_data(&texObj->Palette);
+
+   /* free the texture images */
+   for (i = 0; i < MAX_TEXTURE_LEVELS; i++) {
+      if (texObj->Image[i]) {
+         _mesa_delete_texture_image( texObj->Image[i] );
+      }
+   }
+
+   /* destroy the mutex -- it may have allocated memory (eg on bsd) */
+   _glthread_DESTROY_MUTEX(texObj->Mutex);
+
+   /* free this object */
+   _mesa_free(texObj);
+}
+
+
+/**
+ * Add the given texture object to the texture object pool.
+ */
+void
+_mesa_save_texture_object( GLcontext *ctx, struct gl_texture_object *texObj )
+{
+   /* insert into linked list */
+   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
+   texObj->Next = ctx->Shared->TexObjectList;
+   ctx->Shared->TexObjectList = texObj;
+   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
+
+   if (texObj->Name > 0) {
+      /* insert into hash table */
+      _mesa_HashInsert(ctx->Shared->TexObjects, texObj->Name, texObj);
+   }
+}
+
+
+/**
+ * Remove the given texture object from the texture object pool.
+ * Do not deallocate the texture object though.
+ */
+void
+_mesa_remove_texture_object( GLcontext *ctx, struct gl_texture_object *texObj )
+{
+   struct gl_texture_object *tprev, *tcurr;
+
+   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
+
+   /* unlink from the linked list */
+   tprev = NULL;
+   tcurr = ctx->Shared->TexObjectList;
+   while (tcurr) {
+      if (tcurr == texObj) {
+         if (tprev) {
+            tprev->Next = texObj->Next;
+         }
+         else {
+            ctx->Shared->TexObjectList = texObj->Next;
+         }
+         break;
+      }
+      tprev = tcurr;
+      tcurr = tcurr->Next;
+   }
+
+   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
+
+   if (texObj->Name > 0) {
+      /* remove from hash table */
+      _mesa_HashRemove(ctx->Shared->TexObjects, texObj->Name);
+   }
+}
+
+/**
+ * Copy texture object state from one texture object to another.
+ *
+ * \param dest destination texture object.
+ * \param src source texture object.
+ */
+void
+_mesa_copy_texture_object( struct gl_texture_object *dest,
+                           const struct gl_texture_object *src )
+{
+   dest->Name = src->Name;
+   dest->Priority = src->Priority;
+   dest->BorderColor[0] = src->BorderColor[0];
+   dest->BorderColor[1] = src->BorderColor[1];
+   dest->BorderColor[2] = src->BorderColor[2];
+   dest->BorderColor[3] = src->BorderColor[3];
+   dest->WrapS = src->WrapS;
+   dest->WrapT = src->WrapT;
+   dest->WrapR = src->WrapR;
+   dest->MinFilter = src->MinFilter;
+   dest->MagFilter = src->MagFilter;
+   dest->MinLod = src->MinLod;
+   dest->MaxLod = src->MaxLod;
+   dest->LodBias = src->LodBias;
+   dest->BaseLevel = src->BaseLevel;
+   dest->MaxLevel = src->MaxLevel;
+   dest->MaxAnisotropy = src->MaxAnisotropy;
+   dest->CompareFlag = src->CompareFlag;
+   dest->CompareOperator = src->CompareOperator;
+   dest->ShadowAmbient = src->ShadowAmbient;
+   dest->CompareMode = src->CompareMode;
+   dest->CompareFunc = src->CompareFunc;
+   dest->DepthMode = src->DepthMode;
+   dest->_MaxLevel = src->_MaxLevel;
+   dest->_MaxLambda = src->_MaxLambda;
+   dest->GenerateMipmap = src->GenerateMipmap;
+   dest->Palette = src->Palette;
+   dest->Complete = src->Complete;
+   dest->_IsPowerOfTwo = src->_IsPowerOfTwo;
+}
+
+
+/**
+ * Report why a texture object is incomplete.  
+ *
+ * \param t texture object.
+ * \param why string describing why it's incomplete.
+ *
+ * \note For debug purposes only.
+ */
+#if 0
+static void
+incomplete(const struct gl_texture_object *t, const char *why)
+{
+   _mesa_printf("Texture Obj %d incomplete because: %s\n", t->Name, why);
+}
+#else
+#define incomplete(t, why)
+#endif
+
+
+/**
+ * Examine a texture object to determine if it is complete.
+ *
+ * The gl_texture_object::Complete flag will be set to GL_TRUE or GL_FALSE
+ * accordingly.
+ *
+ * \param ctx GL context.
+ * \param t texture object.
+ *
+ * According to the texture target, verifies that each of the mipmaps is
+ * present and has the expected size.
+ */
+void
+_mesa_test_texobj_completeness( const GLcontext *ctx,
+                                struct gl_texture_object *t )
+{
+   const GLint baseLevel = t->BaseLevel;
+   GLint maxLog2 = 0, maxLevels = 0;
+
+   t->Complete = GL_TRUE;  /* be optimistic */
+   t->_IsPowerOfTwo = GL_TRUE;  /* may be set FALSE below */
+
+   /* Always need the base level image */
+   if (!t->Image[baseLevel]) {
+      char s[100];
+      sprintf(s, "obj %p (%d) Image[baseLevel=%d] == NULL",
+              (void *) t, t->Name, baseLevel);
+      incomplete(t, s);
+      t->Complete = GL_FALSE;
+      return;
+   }
+
+   /* Check width/height/depth for zero */
+   if (t->Image[baseLevel]->Width == 0 ||
+       t->Image[baseLevel]->Height == 0 ||
+       t->Image[baseLevel]->Depth == 0) {
+      incomplete(t, "texture width = 0");
+      t->Complete = GL_FALSE;
+      return;
+   }
+
+   /* Compute _MaxLevel */
+   if (t->Target == GL_TEXTURE_1D) {
+      maxLog2 = t->Image[baseLevel]->WidthLog2;
+      maxLevels = ctx->Const.MaxTextureLevels;
+   }
+   else if (t->Target == GL_TEXTURE_2D) {
+      maxLog2 = MAX2(t->Image[baseLevel]->WidthLog2,
+                     t->Image[baseLevel]->HeightLog2);
+      maxLevels = ctx->Const.MaxTextureLevels;
+   }
+   else if (t->Target == GL_TEXTURE_3D) {
+      GLint max = MAX2(t->Image[baseLevel]->WidthLog2,
+                       t->Image[baseLevel]->HeightLog2);
+      maxLog2 = MAX2(max, (GLint)(t->Image[baseLevel]->DepthLog2));
+      maxLevels = ctx->Const.Max3DTextureLevels;
+   }
+   else if (t->Target == GL_TEXTURE_CUBE_MAP_ARB) {
+      maxLog2 = MAX2(t->Image[baseLevel]->WidthLog2,
+                     t->Image[baseLevel]->HeightLog2);
+      maxLevels = ctx->Const.MaxCubeTextureLevels;
+   }
+   else if (t->Target == GL_TEXTURE_RECTANGLE_NV) {
+      maxLog2 = 0;  /* not applicable */
+      maxLevels = 1;  /* no mipmapping */
+   }
+   else {
+      _mesa_problem(ctx, "Bad t->Target in _mesa_test_texobj_completeness");
+      return;
+   }
+
+   ASSERT(maxLevels > 0);
+
+   t->_MaxLevel = baseLevel + maxLog2;
+   t->_MaxLevel = MIN2(t->_MaxLevel, t->MaxLevel);
+   t->_MaxLevel = MIN2(t->_MaxLevel, maxLevels - 1);
+
+   /* Compute _MaxLambda = q - b (see the 1.2 spec) used during mipmapping */
+   t->_MaxLambda = (GLfloat) (t->_MaxLevel - t->BaseLevel);
+
+   if (t->Target == GL_TEXTURE_CUBE_MAP_ARB) {
+      /* make sure that all six cube map level 0 images are the same size */
+      const GLuint w = t->Image[baseLevel]->Width2;
+      const GLuint h = t->Image[baseLevel]->Height2;
+      if (!t->NegX[baseLevel] ||
+          t->NegX[baseLevel]->Width2 != w ||
+          t->NegX[baseLevel]->Height2 != h ||
+          !t->PosY[baseLevel] ||
+          t->PosY[baseLevel]->Width2 != w ||
+          t->PosY[baseLevel]->Height2 != h ||
+          !t->NegY[baseLevel] ||
+          t->NegY[baseLevel]->Width2 != w ||
+          t->NegY[baseLevel]->Height2 != h ||
+          !t->PosZ[baseLevel] ||
+          t->PosZ[baseLevel]->Width2 != w ||
+          t->PosZ[baseLevel]->Height2 != h ||
+          !t->NegZ[baseLevel] ||
+          t->NegZ[baseLevel]->Width2 != w ||
+          t->NegZ[baseLevel]->Height2 != h) {
+         t->Complete = GL_FALSE;
+         incomplete(t, "Non-quare cubemap image");
+         return;
+      }
+   }
+
+   /* check for non power of two */
+   if (!t->Image[baseLevel]->_IsPowerOfTwo) {
+      t->_IsPowerOfTwo = GL_FALSE;
+   }
+
+   /* extra checking for mipmaps */
+   if (t->MinFilter != GL_NEAREST && t->MinFilter != GL_LINEAR) {
+      /*
+       * Mipmapping: determine if we have a complete set of mipmaps
+       */
+      GLint i;
+      GLint minLevel = baseLevel;
+      GLint maxLevel = t->_MaxLevel;
+
+      if (minLevel > maxLevel) {
+         t->Complete = GL_FALSE;
+         incomplete(t, "minLevel > maxLevel");
+         return;
+      }
+
+      /* Test dimension-independent attributes */
+      for (i = minLevel; i <= maxLevel; i++) {
+         if (t->Image[i]) {
+            if (t->Image[i]->TexFormat != t->Image[baseLevel]->TexFormat) {
+               t->Complete = GL_FALSE;
+               incomplete(t, "Format[i] != Format[baseLevel]");
+               return;
+            }
+            if (t->Image[i]->Border != t->Image[baseLevel]->Border) {
+               t->Complete = GL_FALSE;
+               incomplete(t, "Border[i] != Border[baseLevel]");
+               return;
+            }
+         }
+      }
+
+      /* Test things which depend on number of texture image dimensions */
+      if (t->Target == GL_TEXTURE_1D) {
+         /* Test 1-D mipmaps */
+         GLuint width = t->Image[baseLevel]->Width2;
+         for (i = baseLevel + 1; i < maxLevels; i++) {
+            if (width > 1) {
+               width /= 2;
+            }
+            if (i >= minLevel && i <= maxLevel) {
+               if (!t->Image[i]) {
+                  t->Complete = GL_FALSE;
+                  incomplete(t, "1D Image[i] == NULL");
+                  return;
+               }
+               if (t->Image[i]->Width2 != width ) {
+                  t->Complete = GL_FALSE;
+                  incomplete(t, "1D Image[i] bad width");
+                  return;
+               }
+            }
+            if (width == 1) {
+               return;  /* found smallest needed mipmap, all done! */
+            }
+         }
+      }
+      else if (t->Target == GL_TEXTURE_2D) {
+         /* Test 2-D mipmaps */
+         GLuint width = t->Image[baseLevel]->Width2;
+         GLuint height = t->Image[baseLevel]->Height2;
+         for (i = baseLevel + 1; i < maxLevels; i++) {
+            if (width > 1) {
+               width /= 2;
+            }
+            if (height > 1) {
+               height /= 2;
+            }
+            if (i >= minLevel && i <= maxLevel) {
+               if (!t->Image[i]) {
+                  t->Complete = GL_FALSE;
+                  incomplete(t, "2D Image[i] == NULL");
+                  return;
+               }
+               if (t->Image[i]->Width2 != width) {
+                  t->Complete = GL_FALSE;
+                  incomplete(t, "2D Image[i] bad width");
+                  return;
+               }
+               if (t->Image[i]->Height2 != height) {
+                  t->Complete = GL_FALSE;
+                  incomplete(t, "2D Image[i] bad height");
+                  return;
+               }
+               if (width==1 && height==1) {
+                  return;  /* found smallest needed mipmap, all done! */
+               }
+            }
+         }
+      }
+      else if (t->Target == GL_TEXTURE_3D) {
+         /* Test 3-D mipmaps */
+         GLuint width = t->Image[baseLevel]->Width2;
+         GLuint height = t->Image[baseLevel]->Height2;
+         GLuint depth = t->Image[baseLevel]->Depth2;
+	 for (i = baseLevel + 1; i < maxLevels; i++) {
+            if (width > 1) {
+               width /= 2;
+            }
+            if (height > 1) {
+               height /= 2;
+            }
+            if (depth > 1) {
+               depth /= 2;
+            }
+            if (i >= minLevel && i <= maxLevel) {
+               if (!t->Image[i]) {
+                  incomplete(t, "3D Image[i] == NULL");
+                  t->Complete = GL_FALSE;
+                  return;
+               }
+               if (t->Image[i]->Format == GL_DEPTH_COMPONENT) {
+                  t->Complete = GL_FALSE;
+                  incomplete(t, "GL_DEPTH_COMPONENT only works with 1/2D tex");
+                  return;
+               }
+               if (t->Image[i]->Width2 != width) {
+                  t->Complete = GL_FALSE;
+                  incomplete(t, "3D Image[i] bad width");
+                  return;
+               }
+               if (t->Image[i]->Height2 != height) {
+                  t->Complete = GL_FALSE;
+                  incomplete(t, "3D Image[i] bad height");
+                  return;
+               }
+               if (t->Image[i]->Depth2 != depth) {
+                  t->Complete = GL_FALSE;
+                  incomplete(t, "3D Image[i] bad depth");
+                  return;
+               }
+            }
+            if (width == 1 && height == 1 && depth == 1) {
+               return;  /* found smallest needed mipmap, all done! */
+            }
+         }
+      }
+      else if (t->Target == GL_TEXTURE_CUBE_MAP_ARB) {
+         /* make sure 6 cube faces are consistant */
+         GLuint width = t->Image[baseLevel]->Width2;
+         GLuint height = t->Image[baseLevel]->Height2;
+	 for (i = baseLevel + 1; i < maxLevels; i++) {
+            if (width > 1) {
+               width /= 2;
+            }
+            if (height > 1) {
+               height /= 2;
+            }
+            if (i >= minLevel && i <= maxLevel) {
+               /* check that we have images defined */
+               if (!t->Image[i] || !t->NegX[i] ||
+                   !t->PosY[i]  || !t->NegY[i] ||
+                   !t->PosZ[i]  || !t->NegZ[i]) {
+                  t->Complete = GL_FALSE;
+                  incomplete(t, "CubeMap Image[i] == NULL");
+                  return;
+               }
+               /* Don't support GL_DEPTH_COMPONENT for cube maps */
+               if (t->Image[i]->Format == GL_DEPTH_COMPONENT) {
+                  t->Complete = GL_FALSE;
+                  incomplete(t, "GL_DEPTH_COMPONENT only works with 1/2D tex");
+                  return;
+               }
+               /* check that all six images have same size */
+               if (t->NegX[i]->Width2!=width || t->NegX[i]->Height2!=height ||
+                   t->PosY[i]->Width2!=width || t->PosY[i]->Height2!=height ||
+                   t->NegY[i]->Width2!=width || t->NegY[i]->Height2!=height ||
+                   t->PosZ[i]->Width2!=width || t->PosZ[i]->Height2!=height ||
+                   t->NegZ[i]->Width2!=width || t->NegZ[i]->Height2!=height) {
+                  t->Complete = GL_FALSE;
+                  incomplete(t, "CubeMap Image[i] bad size");
+                  return;
+               }
+            }
+            if (width == 1 && height == 1) {
+               return;  /* found smallest needed mipmap, all done! */
+            }
+         }
+      }
+      else if (t->Target == GL_TEXTURE_RECTANGLE_NV) {
+         /* XXX special checking? */
+      }
+      else {
+         /* Target = ??? */
+         _mesa_problem(ctx, "Bug in gl_test_texture_object_completeness\n");
+      }
+   }
+}
+
+/*@}*/
+
+
+/***********************************************************************/
+/** \name API functions */
+/*@{*/
+
+/**
+ * Texture name generation lock.
+ *
+ * Used by _mesa_GenTextures() to guarantee that the generation and allocation
+ * of texture IDs is atomic.
+ */
+_glthread_DECLARE_STATIC_MUTEX(GenTexturesLock);
+
+/**
+ * Generate texture names.
+ *
+ * \param n number of texture names to be generated.
+ * \param texName an array in which will hold the generated texture names.
+ *
+ * \sa glGenTextures().
+ *
+ * While holding the GenTexturesLock lock, calls _mesa_HashFindFreeKeyBlock()
+ * to find a block of free texture IDs which are stored in \p texName.
+ * Corresponding empty texture objects are also generated.
+ */ 
+void GLAPIENTRY
+_mesa_GenTextures( GLsizei n, GLuint *texName )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint first;
+   GLint i;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (n < 0) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glGenTextures" );
+      return;
+   }
+
+   if (!texName)
+      return;
+
+   /*
+    * This must be atomic (generation and allocation of texture IDs)
+    */
+   _glthread_LOCK_MUTEX(GenTexturesLock);
+
+   first = _mesa_HashFindFreeKeyBlock(ctx->Shared->TexObjects, n);
+
+   /* Allocate new, empty texture objects */
+   for (i = 0; i < n; i++) {
+      struct gl_texture_object *texObj;
+      GLuint name = first + i;
+      GLenum target = 0;
+      texObj = (*ctx->Driver.NewTextureObject)( ctx, name, target);
+      if (!texObj) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenTextures");
+         return;
+      }
+      _mesa_save_texture_object(ctx, texObj);
+      texName[i] = name;
+   }
+
+   _glthread_UNLOCK_MUTEX(GenTexturesLock);
+}
+
+/**
+ * Delete named textures.
+ *
+ * \param n number of textures to be deleted.
+ * \param texName array of textures names to be deleted.
+ *
+ * \sa glDeleteTextures().
+ *
+ * For each texture checks if its bound to any of the texture units, unbinding
+ * it and decrementing the reference count if so. If the texture reference
+ * count is zero, delete its object.
+ */
+void GLAPIENTRY
+_mesa_DeleteTextures( GLsizei n, const GLuint *texName)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint i;
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* too complex */
+
+   if (!texName)
+      return;
+
+   for (i=0;i<n;i++) {
+      if (texName[i] > 0) {
+         struct gl_texture_object *delObj = (struct gl_texture_object *)
+            _mesa_HashLookup(ctx->Shared->TexObjects, texName[i]);
+         if (delObj) {
+            /* First check if this texture is currently bound.
+             * If so, unbind it and decrement the reference count.
+             */
+            GLuint u;
+            for (u = 0; u < MAX_TEXTURE_IMAGE_UNITS; u++) {
+               struct gl_texture_unit *unit = &ctx->Texture.Unit[u];
+               if (delObj == unit->Current1D) {
+                  unit->Current1D = ctx->Shared->Default1D;
+                  ctx->Shared->Default1D->RefCount++;
+                  delObj->RefCount--;
+                  if (delObj == unit->_Current)
+                     unit->_Current = unit->Current1D;
+               }
+               else if (delObj == unit->Current2D) {
+                  unit->Current2D = ctx->Shared->Default2D;
+                  ctx->Shared->Default2D->RefCount++;
+                  delObj->RefCount--;
+                  if (delObj == unit->_Current)
+                     unit->_Current = unit->Current2D;
+               }
+               else if (delObj == unit->Current3D) {
+                  unit->Current3D = ctx->Shared->Default3D;
+                  ctx->Shared->Default3D->RefCount++;
+                  delObj->RefCount--;
+                  if (delObj == unit->_Current)
+                     unit->_Current = unit->Current3D;
+               }
+               else if (delObj == unit->CurrentCubeMap) {
+                  unit->CurrentCubeMap = ctx->Shared->DefaultCubeMap;
+                  ctx->Shared->DefaultCubeMap->RefCount++;
+                  delObj->RefCount--;
+                  if (delObj == unit->_Current)
+                     unit->_Current = unit->CurrentCubeMap;
+               }
+               else if (delObj == unit->CurrentRect) {
+                  unit->CurrentRect = ctx->Shared->DefaultRect;
+                  ctx->Shared->DefaultRect->RefCount++;
+                  delObj->RefCount--;
+                  if (delObj == unit->_Current)
+                     unit->_Current = unit->CurrentRect;
+               }
+            }
+            ctx->NewState |= _NEW_TEXTURE;
+
+            /* Decrement reference count and delete if zero */
+            delObj->RefCount--;
+            ASSERT(delObj->RefCount >= 0);
+
+            if (delObj->RefCount == 0) {
+               ASSERT(delObj->Name != 0);
+               _mesa_remove_texture_object(ctx, delObj);
+               ASSERT(ctx->Driver.DeleteTexture);
+               (*ctx->Driver.DeleteTexture)(ctx, delObj);
+            }
+         }
+      }
+   }
+}
+
+/**
+ * Bind a named texture to a texturing target.
+ * 
+ * \param target texture target.
+ * \param texName texture name.
+ * 
+ * \sa glBindTexture().
+ *
+ * Determines the old texture object bound and returns immediately if rebinding
+ * the same texture.  Get the current texture which is either a default texture
+ * if name is null, a named texture from the hash, or a new texture if the
+ * given texture name is new. Increments its reference count, binds it, and
+ * calls dd_function_table::BindTexture. Decrements the old texture reference
+ * count and deletes it if it reaches zero.
+ */
+void GLAPIENTRY
+_mesa_BindTexture( GLenum target, GLuint texName )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint unit = ctx->Texture.CurrentUnit;
+   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
+   struct gl_texture_object *oldTexObj;
+   struct gl_texture_object *newTexObj = 0;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
+      _mesa_debug(ctx, "glBindTexture %s %d\n",
+                  _mesa_lookup_enum_by_nr(target), (GLint) texName);
+
+   switch (target) {
+      case GL_TEXTURE_1D:
+         oldTexObj = texUnit->Current1D;
+         break;
+      case GL_TEXTURE_2D:
+         oldTexObj = texUnit->Current2D;
+         break;
+      case GL_TEXTURE_3D:
+         oldTexObj = texUnit->Current3D;
+         break;
+      case GL_TEXTURE_CUBE_MAP_ARB:
+         if (!ctx->Extensions.ARB_texture_cube_map) {
+            _mesa_error( ctx, GL_INVALID_ENUM, "glBindTexture(target)" );
+            return;
+         }
+         oldTexObj = texUnit->CurrentCubeMap;
+         break;
+      case GL_TEXTURE_RECTANGLE_NV:
+         if (!ctx->Extensions.NV_texture_rectangle) {
+            _mesa_error( ctx, GL_INVALID_ENUM, "glBindTexture(target)" );
+            return;
+         }
+         oldTexObj = texUnit->CurrentRect;
+         break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glBindTexture(target)" );
+         return;
+   }
+
+   if (oldTexObj->Name == texName)
+      return;   /* rebinding the same texture- no change */
+
+   /*
+    * Get pointer to new texture object (newTexObj)
+    */
+   if (texName == 0) {
+      /* newTexObj = a default texture object */
+      switch (target) {
+         case GL_TEXTURE_1D:
+            newTexObj = ctx->Shared->Default1D;
+            break;
+         case GL_TEXTURE_2D:
+            newTexObj = ctx->Shared->Default2D;
+            break;
+         case GL_TEXTURE_3D:
+            newTexObj = ctx->Shared->Default3D;
+            break;
+         case GL_TEXTURE_CUBE_MAP_ARB:
+            newTexObj = ctx->Shared->DefaultCubeMap;
+            break;
+         case GL_TEXTURE_RECTANGLE_NV:
+            newTexObj = ctx->Shared->DefaultRect;
+            break;
+         default:
+            ; /* Bad targets are caught above */
+      }
+   }
+   else {
+      /* non-default texture object */
+      const struct _mesa_HashTable *hash = ctx->Shared->TexObjects;
+      newTexObj = (struct gl_texture_object *) _mesa_HashLookup(hash, texName);
+      if (newTexObj) {
+         /* error checking */
+         if (newTexObj->Target != 0 && newTexObj->Target != target) {
+            /* the named texture object's dimensions don't match the target */
+            _mesa_error( ctx, GL_INVALID_OPERATION,
+                         "glBindTexture(wrong dimensionality)" );
+            return;
+         }
+         if (newTexObj->Target == 0 && target == GL_TEXTURE_RECTANGLE_NV) {
+            /* have to init wrap and filter state here - kind of klunky */
+            newTexObj->WrapS = GL_CLAMP_TO_EDGE;
+            newTexObj->WrapT = GL_CLAMP_TO_EDGE;
+            newTexObj->WrapR = GL_CLAMP_TO_EDGE;
+            newTexObj->MinFilter = GL_LINEAR;
+         }
+      }
+      else {
+         /* if this is a new texture id, allocate a texture object now */
+	 newTexObj = (*ctx->Driver.NewTextureObject)(ctx, texName, target);
+         if (!newTexObj) {
+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindTexture");
+            return;
+         }
+         _mesa_save_texture_object(ctx, newTexObj);
+      }
+      newTexObj->Target = target;
+   }
+
+   newTexObj->RefCount++;
+
+   /* do the actual binding, but first flush outstanding vertices:
+    */
+   FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+
+   switch (target) {
+      case GL_TEXTURE_1D:
+         texUnit->Current1D = newTexObj;
+         break;
+      case GL_TEXTURE_2D:
+         texUnit->Current2D = newTexObj;
+         break;
+      case GL_TEXTURE_3D:
+         texUnit->Current3D = newTexObj;
+         break;
+      case GL_TEXTURE_CUBE_MAP_ARB:
+         texUnit->CurrentCubeMap = newTexObj;
+         break;
+      case GL_TEXTURE_RECTANGLE_NV:
+         texUnit->CurrentRect = newTexObj;
+         break;
+      default:
+         _mesa_problem(ctx, "bad target in BindTexture");
+         return;
+   }
+
+   /* Pass BindTexture call to device driver */
+   if (ctx->Driver.BindTexture)
+      (*ctx->Driver.BindTexture)( ctx, target, newTexObj );
+
+   oldTexObj->RefCount--;
+   assert(oldTexObj->RefCount >= 0);
+   if (oldTexObj->RefCount == 0) {
+      assert(oldTexObj->Name != 0);
+      _mesa_remove_texture_object(ctx, oldTexObj);
+      ASSERT(ctx->Driver.DeleteTexture);
+      (*ctx->Driver.DeleteTexture)( ctx, oldTexObj );
+   }
+}
+
+/**
+ * Set texture priorities.
+ * 
+ * \param n number of textures.
+ * \param texName texture names.
+ * \param priorities corresponding texture priorities.
+ * 
+ * \sa glPrioritizeTextures().
+ * 
+ * Looks up each texture in the hash, clamps the corresponding priority between
+ * 0.0 and 1.0, and calls dd_function_table::PrioritizeTexture.
+ */
+void GLAPIENTRY
+_mesa_PrioritizeTextures( GLsizei n, const GLuint *texName,
+                          const GLclampf *priorities )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint i;
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (n < 0) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glPrioritizeTextures" );
+      return;
+   }
+
+   if (!priorities)
+      return;
+
+   for (i = 0; i < n; i++) {
+      if (texName[i] > 0) {
+         struct gl_texture_object *t = (struct gl_texture_object *)
+            _mesa_HashLookup(ctx->Shared->TexObjects, texName[i]);
+         if (t) {
+            t->Priority = CLAMP( priorities[i], 0.0F, 1.0F );
+	    if (ctx->Driver.PrioritizeTexture)
+	       ctx->Driver.PrioritizeTexture( ctx, t, t->Priority );
+         }
+      }
+   }
+
+   ctx->NewState |= _NEW_TEXTURE;
+}
+
+/**
+ * See if textures are loaded in texture memory.
+ * 
+ * \param n number of textures to query.
+ * \param texName array with the texture names.
+ * \param residences array which will hold the residence status.
+ *
+ * \return GL_TRUE if all textures are resident and \p residences is left unchanged, 
+ * 
+ * \sa glAreTexturesResident().
+ *
+ * Looks up each texture in the hash and calls
+ * dd_function_table::IsTextureResident.
+ */
+GLboolean GLAPIENTRY
+_mesa_AreTexturesResident(GLsizei n, const GLuint *texName,
+                          GLboolean *residences)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLboolean allResident = GL_TRUE;
+   GLint i, j;
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
+
+   if (n < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glAreTexturesResident(n)");
+      return GL_FALSE;
+   }
+
+   if (!texName || !residences)
+      return GL_FALSE;
+
+   for (i = 0; i < n; i++) {
+      struct gl_texture_object *t;
+      if (texName[i] == 0) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "glAreTexturesResident");
+         return GL_FALSE;
+      }
+      t = (struct gl_texture_object *)
+         _mesa_HashLookup(ctx->Shared->TexObjects, texName[i]);
+      if (!t) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "glAreTexturesResident");
+         return GL_FALSE;
+      }
+      if (!ctx->Driver.IsTextureResident ||
+          ctx->Driver.IsTextureResident(ctx, t)) {
+         /* The texture is resident */
+	 if (!allResident)
+	    residences[i] = GL_TRUE;
+      }
+      else {
+         /* The texture is not resident */
+         if (allResident) {
+	    allResident = GL_FALSE;
+	    for (j = 0; j < i; j++)
+	       residences[j] = GL_TRUE;
+	 }
+	 residences[i] = GL_FALSE;
+      }
+   }
+   
+   return allResident;
+}
+
+/**
+ * See if a name corresponds to a texture.
+ *
+ * \param texture texture name.
+ *
+ * \return GL_TRUE if texture name corresponds to a texture, or GL_FALSE
+ * otherwise.
+ * 
+ * \sa glIsTexture().
+ *
+ * Calls _mesa_HashLookup().
+ */
+GLboolean GLAPIENTRY
+_mesa_IsTexture( GLuint texture )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
+   return texture > 0 && _mesa_HashLookup(ctx->Shared->TexObjects, texture);
+}
+
+/*@}*/
diff --git a/reactos/lib/mesa32/src/main/texobj.h b/reactos/lib/mesa32/src/main/texobj.h
new file mode 100644
index 00000000000..c5cce28c370
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/texobj.h
@@ -0,0 +1,101 @@
+/**
+ * \file texobj.h
+ * Texture object management.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef TEXTOBJ_H
+#define TEXTOBJ_H
+
+
+#include "mtypes.h"
+
+
+/**
+ * \name Internal functions
+ */
+/*@{*/
+
+extern struct gl_texture_object *
+_mesa_new_texture_object( GLcontext *ctx, GLuint name, GLenum target );
+
+extern void
+_mesa_initialize_texture_object( struct gl_texture_object *obj,
+                                 GLuint name, GLenum target );
+
+extern void
+_mesa_delete_texture_object( GLcontext *ctx, struct gl_texture_object *obj );
+
+extern void
+_mesa_save_texture_object( GLcontext *ctx, struct gl_texture_object *obj );
+
+extern void
+_mesa_remove_texture_object( GLcontext *ctx, struct gl_texture_object *obj );
+
+extern void
+_mesa_copy_texture_object( struct gl_texture_object *dest,
+                           const struct gl_texture_object *src );
+
+extern void
+_mesa_test_texobj_completeness( const GLcontext *ctx,
+                                struct gl_texture_object *obj );
+
+/*@}*/
+
+
+/**
+ * \name API functions
+ */
+/*@{*/
+
+extern void GLAPIENTRY
+_mesa_GenTextures( GLsizei n, GLuint *textures );
+
+
+extern void GLAPIENTRY
+_mesa_DeleteTextures( GLsizei n, const GLuint *textures );
+
+
+extern void GLAPIENTRY
+_mesa_BindTexture( GLenum target, GLuint texture );
+
+
+extern void GLAPIENTRY
+_mesa_PrioritizeTextures( GLsizei n, const GLuint *textures,
+                          const GLclampf *priorities );
+
+
+extern GLboolean GLAPIENTRY
+_mesa_AreTexturesResident( GLsizei n, const GLuint *textures,
+                           GLboolean *residences );
+
+extern GLboolean GLAPIENTRY
+_mesa_IsTexture( GLuint texture );
+
+/*@}*/
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/texstate.c b/reactos/lib/mesa32/src/main/texstate.c
new file mode 100644
index 00000000000..d604ba7a95f
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/texstate.c
@@ -0,0 +1,2996 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "colormac.h"
+#include "colortab.h"
+#include "context.h"
+#include "enums.h"
+#include "extensions.h"
+#include "macros.h"
+#include "nvfragprog.h"
+#include "texobj.h"
+#include "teximage.h"
+#include "texstate.h"
+#include "mtypes.h"
+#include "math/m_xform.h"
+#include "math/m_matrix.h"
+
+
+
+#ifdef SPECIALCAST
+/* Needed for an Amiga compiler */
+#define ENUM_TO_FLOAT(X) ((GLfloat)(GLint)(X))
+#define ENUM_TO_DOUBLE(X) ((GLdouble)(GLint)(X))
+#else
+/* all other compilers */
+#define ENUM_TO_FLOAT(X) ((GLfloat)(X))
+#define ENUM_TO_DOUBLE(X) ((GLdouble)(X))
+#endif
+
+
+
+void
+_mesa_copy_texture_state( const GLcontext *src, GLcontext *dst )
+{
+   GLuint i;
+
+   ASSERT(src);
+   ASSERT(dst);
+
+   dst->Texture.CurrentUnit = src->Texture.CurrentUnit;
+   dst->Texture._GenFlags = src->Texture._GenFlags;
+   dst->Texture._TexGenEnabled = src->Texture._TexGenEnabled;
+   dst->Texture._TexMatEnabled = src->Texture._TexMatEnabled;
+   dst->Texture.SharedPalette = src->Texture.SharedPalette;
+
+   /* per-unit state */
+   for (i = 0; i < src->Const.MaxTextureUnits; i++) {
+      dst->Texture.Unit[i].Enabled = src->Texture.Unit[i].Enabled;
+      dst->Texture.Unit[i].EnvMode = src->Texture.Unit[i].EnvMode;
+      COPY_4V(dst->Texture.Unit[i].EnvColor, src->Texture.Unit[i].EnvColor);
+      dst->Texture.Unit[i].TexGenEnabled = src->Texture.Unit[i].TexGenEnabled;
+      dst->Texture.Unit[i].GenModeS = src->Texture.Unit[i].GenModeS;
+      dst->Texture.Unit[i].GenModeT = src->Texture.Unit[i].GenModeT;
+      dst->Texture.Unit[i].GenModeR = src->Texture.Unit[i].GenModeR;
+      dst->Texture.Unit[i].GenModeQ = src->Texture.Unit[i].GenModeQ;
+      dst->Texture.Unit[i]._GenBitS = src->Texture.Unit[i]._GenBitS;
+      dst->Texture.Unit[i]._GenBitT = src->Texture.Unit[i]._GenBitT;
+      dst->Texture.Unit[i]._GenBitR = src->Texture.Unit[i]._GenBitR;
+      dst->Texture.Unit[i]._GenBitQ = src->Texture.Unit[i]._GenBitQ;
+      dst->Texture.Unit[i]._GenFlags = src->Texture.Unit[i]._GenFlags;
+      COPY_4V(dst->Texture.Unit[i].ObjectPlaneS, src->Texture.Unit[i].ObjectPlaneS);
+      COPY_4V(dst->Texture.Unit[i].ObjectPlaneT, src->Texture.Unit[i].ObjectPlaneT);
+      COPY_4V(dst->Texture.Unit[i].ObjectPlaneR, src->Texture.Unit[i].ObjectPlaneR);
+      COPY_4V(dst->Texture.Unit[i].ObjectPlaneQ, src->Texture.Unit[i].ObjectPlaneQ);
+      COPY_4V(dst->Texture.Unit[i].EyePlaneS, src->Texture.Unit[i].EyePlaneS);
+      COPY_4V(dst->Texture.Unit[i].EyePlaneT, src->Texture.Unit[i].EyePlaneT);
+      COPY_4V(dst->Texture.Unit[i].EyePlaneR, src->Texture.Unit[i].EyePlaneR);
+      COPY_4V(dst->Texture.Unit[i].EyePlaneQ, src->Texture.Unit[i].EyePlaneQ);
+      dst->Texture.Unit[i].LodBias = src->Texture.Unit[i].LodBias;
+
+      /* GL_EXT_texture_env_combine */
+      dst->Texture.Unit[i].CombineModeRGB = src->Texture.Unit[i].CombineModeRGB;
+      dst->Texture.Unit[i].CombineModeA = src->Texture.Unit[i].CombineModeA;
+      COPY_3V(dst->Texture.Unit[i].CombineSourceRGB, src->Texture.Unit[i].CombineSourceRGB);
+      COPY_3V(dst->Texture.Unit[i].CombineSourceA, src->Texture.Unit[i].CombineSourceA);
+      COPY_3V(dst->Texture.Unit[i].CombineOperandRGB, src->Texture.Unit[i].CombineOperandRGB);
+      COPY_3V(dst->Texture.Unit[i].CombineOperandA, src->Texture.Unit[i].CombineOperandA);
+      dst->Texture.Unit[i].CombineScaleShiftRGB = src->Texture.Unit[i].CombineScaleShiftRGB;
+      dst->Texture.Unit[i].CombineScaleShiftA = src->Texture.Unit[i].CombineScaleShiftA;
+
+      /* texture object state */
+      _mesa_copy_texture_object(dst->Texture.Unit[i].Current1D,
+                                src->Texture.Unit[i].Current1D);
+      _mesa_copy_texture_object(dst->Texture.Unit[i].Current2D,
+                                src->Texture.Unit[i].Current2D);
+      _mesa_copy_texture_object(dst->Texture.Unit[i].Current3D,
+                                src->Texture.Unit[i].Current3D);
+      _mesa_copy_texture_object(dst->Texture.Unit[i].CurrentCubeMap,
+                                src->Texture.Unit[i].CurrentCubeMap);
+      _mesa_copy_texture_object(dst->Texture.Unit[i].CurrentRect,
+                                src->Texture.Unit[i].CurrentRect);
+   }
+}
+
+
+/*
+ * For debugging
+ */
+void
+_mesa_print_texunit_state( GLcontext *ctx, GLuint unit )
+{
+   const struct gl_texture_unit *texUnit = ctx->Texture.Unit + unit;
+   _mesa_printf("Texture Unit %d\n", unit);
+   _mesa_printf("  GL_TEXTURE_ENV_MODE = %s\n", _mesa_lookup_enum_by_nr(texUnit->EnvMode));
+   _mesa_printf("  GL_COMBINE_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->CombineModeRGB));
+   _mesa_printf("  GL_COMBINE_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->CombineModeA));
+   _mesa_printf("  GL_SOURCE0_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->CombineSourceRGB[0]));
+   _mesa_printf("  GL_SOURCE1_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->CombineSourceRGB[1]));
+   _mesa_printf("  GL_SOURCE2_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->CombineSourceRGB[2]));
+   _mesa_printf("  GL_SOURCE0_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->CombineSourceA[0]));
+   _mesa_printf("  GL_SOURCE1_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->CombineSourceA[1]));
+   _mesa_printf("  GL_SOURCE2_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->CombineSourceA[2]));
+   _mesa_printf("  GL_OPERAND0_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->CombineOperandRGB[0]));
+   _mesa_printf("  GL_OPERAND1_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->CombineOperandRGB[1]));
+   _mesa_printf("  GL_OPERAND2_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->CombineOperandRGB[2]));
+   _mesa_printf("  GL_OPERAND0_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->CombineOperandA[0]));
+   _mesa_printf("  GL_OPERAND1_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->CombineOperandA[1]));
+   _mesa_printf("  GL_OPERAND2_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->CombineOperandA[2]));
+   _mesa_printf("  GL_RGB_SCALE = %d\n", 1 << texUnit->CombineScaleShiftRGB);
+   _mesa_printf("  GL_ALPHA_SCALE = %d\n", 1 << texUnit->CombineScaleShiftA);
+   _mesa_printf("  GL_TEXTURE_ENV_COLOR = (%f, %f, %f, %f)\n", texUnit->EnvColor[0], texUnit->EnvColor[1], texUnit->EnvColor[2], texUnit->EnvColor[3]);
+}
+
+
+
+/**********************************************************************/
+/*                       Texture Environment                          */
+/**********************************************************************/
+
+
+void GLAPIENTRY
+_mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+#define TE_ERROR(errCode, msg, value)				\
+   _mesa_error(ctx, errCode, msg, _mesa_lookup_enum_by_nr(value));
+
+   if (target == GL_TEXTURE_ENV) {
+      switch (pname) {
+      case GL_TEXTURE_ENV_MODE:
+         {
+            const GLenum mode = (GLenum) (GLint) *param;
+            if (mode == GL_MODULATE ||
+                mode == GL_BLEND ||
+                mode == GL_DECAL ||
+                mode == GL_REPLACE ||
+                (mode == GL_ADD && ctx->Extensions.EXT_texture_env_add) ||
+                (mode == GL_COMBINE &&
+                 (ctx->Extensions.EXT_texture_env_combine ||
+                  ctx->Extensions.ARB_texture_env_combine))) {
+               /* legal */
+               if (texUnit->EnvMode == mode)
+                  return;
+               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+               texUnit->EnvMode = mode;
+            }
+            else {
+               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
+               return;
+            }
+         }
+         break;
+      case GL_TEXTURE_ENV_COLOR:
+         {
+            GLfloat tmp[4];
+            tmp[0] = CLAMP( param[0], 0.0F, 1.0F );
+            tmp[1] = CLAMP( param[1], 0.0F, 1.0F );
+            tmp[2] = CLAMP( param[2], 0.0F, 1.0F );
+            tmp[3] = CLAMP( param[3], 0.0F, 1.0F );
+            if (TEST_EQ_4V(tmp, texUnit->EnvColor))
+               return;
+            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            COPY_4FV(texUnit->EnvColor, tmp);
+         }
+         break;
+      case GL_COMBINE_RGB:
+	 if (ctx->Extensions.EXT_texture_env_combine ||
+             ctx->Extensions.ARB_texture_env_combine) {
+	    const GLenum mode = (GLenum) (GLint) *param;
+	    switch (mode) {
+	    case GL_REPLACE:
+	    case GL_MODULATE:
+	    case GL_ADD:
+	    case GL_ADD_SIGNED:
+	    case GL_INTERPOLATE:
+               /* OK */
+	       break;
+            case GL_SUBTRACT:
+               if (!ctx->Extensions.ARB_texture_env_combine) {
+                  TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
+                  return;
+               }
+               break;
+	    case GL_DOT3_RGB_EXT:
+	    case GL_DOT3_RGBA_EXT:
+	       if (!ctx->Extensions.EXT_texture_env_dot3) {
+                  TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
+		  return;
+	       }
+	       break;
+	    case GL_DOT3_RGB:
+	    case GL_DOT3_RGBA:
+	       if (!ctx->Extensions.ARB_texture_env_dot3) {
+                  TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
+		  return;
+	       }
+	       break;
+	    case GL_MODULATE_ADD_ATI:
+	    case GL_MODULATE_SIGNED_ADD_ATI:
+	    case GL_MODULATE_SUBTRACT_ATI:
+	       if (!ctx->Extensions.ATI_texture_env_combine3) {
+                  TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
+		  return;
+	       }
+	       break;
+	    default:
+               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
+	       return;
+	    }
+	    if (texUnit->CombineModeRGB == mode)
+	       return;
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	    texUnit->CombineModeRGB = mode;
+	 }
+	 else {
+            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+	    return;
+	 }
+         break;
+      case GL_COMBINE_ALPHA:
+	 if (ctx->Extensions.EXT_texture_env_combine ||
+             ctx->Extensions.ARB_texture_env_combine) {
+	    const GLenum mode = (GLenum) (GLint) *param;
+            switch (mode) {
+	    case GL_REPLACE:
+	    case GL_MODULATE:
+	    case GL_ADD:
+	    case GL_ADD_SIGNED:
+	    case GL_INTERPOLATE:
+	       /* OK */
+	       break;
+	    case GL_SUBTRACT:
+	       if (!ctx->Extensions.ARB_texture_env_combine) {
+		  TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
+		  return;
+	       }
+	       break;
+	    case GL_MODULATE_ADD_ATI:
+	    case GL_MODULATE_SIGNED_ADD_ATI:
+	    case GL_MODULATE_SUBTRACT_ATI:
+	       if (!ctx->Extensions.ATI_texture_env_combine3) {
+                  TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
+		  return;
+	       }
+	       break;
+	    default:
+	       TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
+	       return;
+	    }
+
+	    if (texUnit->CombineModeA == mode)
+		return;
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	    texUnit->CombineModeA = mode;
+	 }
+	 else {
+            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+	    return;
+	 }
+	 break;
+      case GL_SOURCE0_RGB:
+      case GL_SOURCE1_RGB:
+      case GL_SOURCE2_RGB:
+	 if (ctx->Extensions.EXT_texture_env_combine ||
+	     ctx->Extensions.ARB_texture_env_combine) {
+	    const GLenum source = (GLenum) (GLint) *param;
+	    const GLuint s = pname - GL_SOURCE0_RGB;
+            if (source == GL_TEXTURE ||
+                source == GL_CONSTANT ||
+                source == GL_PRIMARY_COLOR ||
+                source == GL_PREVIOUS ||
+                (ctx->Extensions.ARB_texture_env_crossbar &&
+                 source >= GL_TEXTURE0 &&
+                 source < GL_TEXTURE0 + ctx->Const.MaxTextureUnits) ||
+                (ctx->Extensions.ATI_texture_env_combine3 &&
+                 (source == GL_ZERO || source == GL_ONE))) {
+               /* legal */
+               if (texUnit->CombineSourceRGB[s] == source)
+                  return;
+	       FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	       texUnit->CombineSourceRGB[s] = source;
+            }
+            else {
+               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", source);
+	       return;
+	    }
+	 }
+	 else {
+            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+	    return;
+	 }
+	 break;
+      case GL_SOURCE0_ALPHA:
+      case GL_SOURCE1_ALPHA:
+      case GL_SOURCE2_ALPHA:
+	 if (ctx->Extensions.EXT_texture_env_combine ||
+             ctx->Extensions.ARB_texture_env_combine) {
+	    const GLenum source = (GLenum) (GLint) *param;
+	    const GLuint s = pname - GL_SOURCE0_ALPHA;
+            if (source == GL_TEXTURE ||
+                source == GL_CONSTANT ||
+                source == GL_PRIMARY_COLOR ||
+                source == GL_PREVIOUS ||
+                (ctx->Extensions.ARB_texture_env_crossbar &&
+                 source >= GL_TEXTURE0 &&
+                 source < GL_TEXTURE0 + ctx->Const.MaxTextureUnits) ||
+		(ctx->Extensions.ATI_texture_env_combine3 &&
+                 (source == GL_ZERO || source == GL_ONE))) {
+               /* legal */
+	       if (texUnit->CombineSourceA[s] == source)
+                  return;
+	       FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	       texUnit->CombineSourceA[s] = source;
+            }
+            else {
+               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", source);
+	       return;
+	    }
+	 }
+	 else {
+            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+	    return;
+	 }
+	 break;
+      case GL_OPERAND0_RGB:
+      case GL_OPERAND1_RGB:
+	 if (ctx->Extensions.EXT_texture_env_combine ||
+	     ctx->Extensions.ARB_texture_env_combine) {
+	    const GLenum operand = (GLenum) (GLint) *param;
+	    const GLuint s = pname - GL_OPERAND0_RGB;
+	    switch (operand) {
+	    case GL_SRC_COLOR:
+	    case GL_ONE_MINUS_SRC_COLOR:
+	    case GL_SRC_ALPHA:
+	    case GL_ONE_MINUS_SRC_ALPHA:
+	       if (texUnit->CombineOperandRGB[s] == operand)
+		  return;
+	       FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	       texUnit->CombineOperandRGB[s] = operand;
+	       break;
+	    default:
+               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", operand);
+	       return;
+	    }
+	 }
+	 else {
+            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+	    return;
+	 }
+	 break;
+      case GL_OPERAND0_ALPHA:
+      case GL_OPERAND1_ALPHA:
+	 if (ctx->Extensions.EXT_texture_env_combine ||
+             ctx->Extensions.ARB_texture_env_combine) {
+	    const GLenum operand = (GLenum) (GLint) *param;
+	    switch (operand) {
+	    case GL_SRC_ALPHA:
+	    case GL_ONE_MINUS_SRC_ALPHA:
+	       if (texUnit->CombineOperandA[pname-GL_OPERAND0_ALPHA] ==
+		   operand)
+		  return;
+	       FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	       texUnit->CombineOperandA[pname-GL_OPERAND0_ALPHA] = operand;
+	       break;
+	    default:
+               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", operand);
+	       return;
+	    }
+	 }
+	 else {
+            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+	    return;
+	 }
+	 break;
+      case GL_OPERAND2_RGB:
+	 if (ctx->Extensions.EXT_texture_env_combine ||
+             ctx->Extensions.ARB_texture_env_combine) {
+	    const GLenum operand = (GLenum) (GLint) *param;
+	    switch (operand) {
+	    case GL_SRC_COLOR:           /* ARB combine only */
+	    case GL_ONE_MINUS_SRC_COLOR: /* ARB combine only */
+	    case GL_SRC_ALPHA:
+	    case GL_ONE_MINUS_SRC_ALPHA: /* ARB combine only */
+	       if (texUnit->CombineOperandRGB[2] == operand)
+		  return;
+	       FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	       texUnit->CombineOperandRGB[2] = operand;
+               break;
+	    default:
+               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", operand);
+	       return;
+	    }
+	 }
+	 else {
+            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+	    return;
+	 }
+	 break;
+      case GL_OPERAND2_ALPHA:
+	 if (ctx->Extensions.EXT_texture_env_combine ||
+             ctx->Extensions.ARB_texture_env_combine) {
+	    const GLenum operand = (GLenum) (GLint) *param;
+	    switch (operand) {
+	    case GL_SRC_ALPHA:
+	    case GL_ONE_MINUS_SRC_ALPHA: /* ARB combine only */
+	       if (texUnit->CombineOperandA[2] == operand)
+		  return;
+	       FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	       texUnit->CombineOperandA[2] = operand;
+	       break;
+	    default:
+               TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", operand);
+	       return;
+	    }
+	 }
+	 else {
+            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+	    return;
+	 }
+	 break;
+      case GL_RGB_SCALE:
+	 if (ctx->Extensions.EXT_texture_env_combine ||
+             ctx->Extensions.ARB_texture_env_combine) {
+	    GLuint newshift;
+	    if (*param == 1.0) {
+	       newshift = 0;
+	    }
+	    else if (*param == 2.0) {
+	       newshift = 1;
+	    }
+	    else if (*param == 4.0) {
+	       newshift = 2;
+	    }
+	    else {
+	       _mesa_error( ctx, GL_INVALID_VALUE,
+                            "glTexEnv(GL_RGB_SCALE not 1, 2 or 4)" );
+	       return;
+	    }
+	    if (texUnit->CombineScaleShiftRGB == newshift)
+	       return;
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	    texUnit->CombineScaleShiftRGB = newshift;
+	 }
+	 else {
+            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+	    return;
+	 }
+	 break;
+      case GL_ALPHA_SCALE:
+	 if (ctx->Extensions.EXT_texture_env_combine ||
+             ctx->Extensions.ARB_texture_env_combine) {
+	    GLuint newshift;
+	    if (*param == 1.0) {
+	       newshift = 0;
+	    }
+	    else if (*param == 2.0) {
+	       newshift = 1;
+	    }
+	    else if (*param == 4.0) {
+	       newshift = 2;
+	    }
+	    else {
+	       _mesa_error( ctx, GL_INVALID_VALUE,
+                            "glTexEnv(GL_ALPHA_SCALE not 1, 2 or 4)" );
+	       return;
+	    }
+	    if (texUnit->CombineScaleShiftA == newshift)
+	       return;
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	    texUnit->CombineScaleShiftA = newshift;
+	 }
+	 else {
+            TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+	    return;
+	 }
+	 break;
+      default:
+	 _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(pname)" );
+	 return;
+      }
+   }
+   else if (target == GL_TEXTURE_FILTER_CONTROL_EXT) {
+      /* GL_EXT_texture_lod_bias */
+      if (!ctx->Extensions.EXT_texture_lod_bias) {
+	 _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(target=0x%x)", target );
+	 return;
+      }
+      if (pname == GL_TEXTURE_LOD_BIAS_EXT) {
+	 if (texUnit->LodBias == param[0])
+	    return;
+	 FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         texUnit->LodBias = param[0];
+      }
+      else {
+         TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
+	 return;
+      }
+   }
+   else if (target == GL_POINT_SPRITE_NV) {
+      /* GL_ARB_point_sprite / GL_NV_point_sprite */
+      if (!ctx->Extensions.NV_point_sprite
+	  && !ctx->Extensions.ARB_point_sprite) {
+	 _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(target=0x%x)", target );
+	 return;
+      }
+      if (pname == GL_COORD_REPLACE_NV) {
+         const GLenum value = (GLenum) param[0];
+         if (value == GL_TRUE || value == GL_FALSE) {
+            /* It's kind of weird to set point state via glTexEnv,
+             * but that's what the spec calls for.
+             */
+            const GLboolean state = (GLboolean) value;
+            if (ctx->Point.CoordReplace[ctx->Texture.CurrentUnit] == state)
+               return;
+            FLUSH_VERTICES(ctx, _NEW_POINT);
+            ctx->Point.CoordReplace[ctx->Texture.CurrentUnit] = state;
+         }
+         else {
+            _mesa_error( ctx, GL_INVALID_VALUE, "glTexEnv(param=0x%x)", value);
+            return;
+         }
+      }
+      else {
+         _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(pname=0x%x)", pname );
+         return;
+      }
+   }
+   else {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(target=0x%x)",target );
+      return;
+   }
+
+   if (MESA_VERBOSE&(VERBOSE_API|VERBOSE_TEXTURE))
+      _mesa_debug(ctx, "glTexEnv %s %s %.1f(%s) ...\n",
+                  _mesa_lookup_enum_by_nr(target),
+                  _mesa_lookup_enum_by_nr(pname),
+                  *param,
+                  _mesa_lookup_enum_by_nr((GLenum) (GLint) *param));
+
+   /* Tell device driver about the new texture environment */
+   if (ctx->Driver.TexEnv) {
+      (*ctx->Driver.TexEnv)( ctx, target, pname, param );
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_TexEnvf( GLenum target, GLenum pname, GLfloat param )
+{
+   _mesa_TexEnvfv( target, pname, &param );
+}
+
+
+
+void GLAPIENTRY
+_mesa_TexEnvi( GLenum target, GLenum pname, GLint param )
+{
+   GLfloat p[4];
+   p[0] = (GLfloat) param;
+   p[1] = p[2] = p[3] = 0.0;
+   _mesa_TexEnvfv( target, pname, p );
+}
+
+
+void GLAPIENTRY
+_mesa_TexEnviv( GLenum target, GLenum pname, const GLint *param )
+{
+   GLfloat p[4];
+   if (pname == GL_TEXTURE_ENV_COLOR) {
+      p[0] = INT_TO_FLOAT( param[0] );
+      p[1] = INT_TO_FLOAT( param[1] );
+      p[2] = INT_TO_FLOAT( param[2] );
+      p[3] = INT_TO_FLOAT( param[3] );
+   }
+   else {
+      p[0] = (GLfloat) param[0];
+      p[1] = p[2] = p[3] = 0;  /* init to zero, just to be safe */
+   }
+   _mesa_TexEnvfv( target, pname, p );
+}
+
+
+void GLAPIENTRY
+_mesa_GetTexEnvfv( GLenum target, GLenum pname, GLfloat *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (target == GL_TEXTURE_ENV) {
+      switch (pname) {
+         case GL_TEXTURE_ENV_MODE:
+            *params = ENUM_TO_FLOAT(texUnit->EnvMode);
+            break;
+         case GL_TEXTURE_ENV_COLOR:
+            COPY_4FV( params, texUnit->EnvColor );
+            break;
+         case GL_COMBINE_RGB:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               *params = (GLfloat) texUnit->CombineModeRGB;
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+            }
+            break;
+         case GL_COMBINE_ALPHA:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               *params = (GLfloat) texUnit->CombineModeA;
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+            }
+            break;
+         case GL_SOURCE0_RGB:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               *params = (GLfloat) texUnit->CombineSourceRGB[0];
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+            }
+            break;
+         case GL_SOURCE1_RGB:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               *params = (GLfloat) texUnit->CombineSourceRGB[1];
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+            }
+            break;
+         case GL_SOURCE2_RGB:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               *params = (GLfloat) texUnit->CombineSourceRGB[2];
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+            }
+            break;
+         case GL_SOURCE0_ALPHA:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               *params = (GLfloat) texUnit->CombineSourceA[0];
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+            }
+            break;
+         case GL_SOURCE1_ALPHA:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               *params = (GLfloat) texUnit->CombineSourceA[1];
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+            }
+            break;
+         case GL_SOURCE2_ALPHA:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               *params = (GLfloat) texUnit->CombineSourceA[2];
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+            }
+            break;
+         case GL_OPERAND0_RGB:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               *params = (GLfloat) texUnit->CombineOperandRGB[0];
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+            }
+            break;
+         case GL_OPERAND1_RGB:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               *params = (GLfloat) texUnit->CombineOperandRGB[1];
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+            }
+            break;
+         case GL_OPERAND2_RGB:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               *params = (GLfloat) texUnit->CombineOperandRGB[2];
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+            }
+            break;
+         case GL_OPERAND0_ALPHA:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               *params = (GLfloat) texUnit->CombineOperandA[0];
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+            }
+            break;
+         case GL_OPERAND1_ALPHA:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               *params = (GLfloat) texUnit->CombineOperandA[1];
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+            }
+            break;
+         case GL_OPERAND2_ALPHA:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               *params = (GLfloat) texUnit->CombineOperandA[2];
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+            }
+            break;
+         case GL_RGB_SCALE:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               if (texUnit->CombineScaleShiftRGB == 0)
+                  *params = 1.0;
+               else if (texUnit->CombineScaleShiftRGB == 1)
+                  *params = 2.0;
+               else
+                  *params = 4.0;
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+               return;
+            }
+            break;
+         case GL_ALPHA_SCALE:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               if (texUnit->CombineScaleShiftA == 0)
+                  *params = 1.0;
+               else if (texUnit->CombineScaleShiftA == 1)
+                  *params = 2.0;
+               else
+                  *params = 4.0;
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)");
+               return;
+            }
+            break;
+         default:
+            _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname=0x%x)", pname);
+      }
+   }
+   else if (target == GL_TEXTURE_FILTER_CONTROL_EXT) {
+      /* GL_EXT_texture_lod_bias */
+      if (!ctx->Extensions.EXT_texture_lod_bias) {
+	 _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnvfv(target)" );
+	 return;
+      }
+      if (pname == GL_TEXTURE_LOD_BIAS_EXT) {
+         *params = texUnit->LodBias;
+      }
+      else {
+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)" );
+	 return;
+      }
+   }
+   else if (target == GL_POINT_SPRITE_NV) {
+      /* GL_ARB_point_sprite / GL_NV_point_sprite */
+      if (!ctx->Extensions.NV_point_sprite
+	  && !ctx->Extensions.ARB_point_sprite) {
+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnvfv(target)" );
+         return;
+      }
+      if (pname == GL_COORD_REPLACE_NV) {
+         *params = (GLfloat) ctx->Point.CoordReplace[ctx->Texture.CurrentUnit];
+      }
+      else {
+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnvfv(pname)" );
+         return;
+      }
+   }
+   else {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnvfv(target)" );
+      return;
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetTexEnviv( GLenum target, GLenum pname, GLint *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (target == GL_TEXTURE_ENV) {
+      switch (pname) {
+         case GL_TEXTURE_ENV_MODE:
+            *params = (GLint) texUnit->EnvMode;
+            break;
+         case GL_TEXTURE_ENV_COLOR:
+            params[0] = FLOAT_TO_INT( texUnit->EnvColor[0] );
+            params[1] = FLOAT_TO_INT( texUnit->EnvColor[1] );
+            params[2] = FLOAT_TO_INT( texUnit->EnvColor[2] );
+            params[3] = FLOAT_TO_INT( texUnit->EnvColor[3] );
+            break;
+         case GL_COMBINE_RGB:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               *params = (GLint) texUnit->CombineModeRGB;
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
+            }
+            break;
+         case GL_COMBINE_ALPHA:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               *params = (GLint) texUnit->CombineModeA;
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
+            }
+            break;
+         case GL_SOURCE0_RGB:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               *params = (GLint) texUnit->CombineSourceRGB[0];
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
+            }
+            break;
+         case GL_SOURCE1_RGB:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               *params = (GLint) texUnit->CombineSourceRGB[1];
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
+            }
+            break;
+         case GL_SOURCE2_RGB:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               *params = (GLint) texUnit->CombineSourceRGB[2];
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
+            }
+            break;
+         case GL_SOURCE0_ALPHA:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               *params = (GLint) texUnit->CombineSourceA[0];
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
+            }
+            break;
+         case GL_SOURCE1_ALPHA:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               *params = (GLint) texUnit->CombineSourceA[1];
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
+            }
+            break;
+         case GL_SOURCE2_ALPHA:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               *params = (GLint) texUnit->CombineSourceA[2];
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
+            }
+            break;
+         case GL_OPERAND0_RGB:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               *params = (GLint) texUnit->CombineOperandRGB[0];
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
+            }
+            break;
+         case GL_OPERAND1_RGB:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               *params = (GLint) texUnit->CombineOperandRGB[1];
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
+            }
+            break;
+         case GL_OPERAND2_RGB:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               *params = (GLint) texUnit->CombineOperandRGB[2];
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
+            }
+            break;
+         case GL_OPERAND0_ALPHA:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               *params = (GLint) texUnit->CombineOperandA[0];
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
+            }
+            break;
+         case GL_OPERAND1_ALPHA:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               *params = (GLint) texUnit->CombineOperandA[1];
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
+            }
+            break;
+         case GL_OPERAND2_ALPHA:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               *params = (GLint) texUnit->CombineOperandA[2];
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
+            }
+            break;
+         case GL_RGB_SCALE:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               if (texUnit->CombineScaleShiftRGB == 0)
+                  *params = 1;
+               else if (texUnit->CombineScaleShiftRGB == 1)
+                  *params = 2;
+               else
+                  *params = 4;
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
+               return;
+            }
+            break;
+         case GL_ALPHA_SCALE:
+            if (ctx->Extensions.EXT_texture_env_combine ||
+                ctx->Extensions.ARB_texture_env_combine) {
+               if (texUnit->CombineScaleShiftA == 0)
+                  *params = 1;
+               else if (texUnit->CombineScaleShiftA == 1)
+                  *params = 2;
+               else
+                  *params = 4;
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)");
+               return;
+            }
+            break;
+         default:
+            _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname=0x%x)",
+                        pname);
+      }
+   }
+   else if (target == GL_TEXTURE_FILTER_CONTROL_EXT) {
+      /* GL_EXT_texture_lod_bias */
+      if (!ctx->Extensions.EXT_texture_lod_bias) {
+	 _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnviv(target)" );
+	 return;
+      }
+      if (pname == GL_TEXTURE_LOD_BIAS_EXT) {
+         *params = (GLint) texUnit->LodBias;
+      }
+      else {
+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)" );
+	 return;
+      }
+   }
+   else if (target == GL_POINT_SPRITE_NV) {
+      /* GL_ARB_point_sprite / GL_NV_point_sprite */
+      if (!ctx->Extensions.NV_point_sprite
+	  && !ctx->Extensions.ARB_point_sprite) {
+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnviv(target)" );
+         return;
+      }
+      if (pname == GL_COORD_REPLACE_NV) {
+         *params = (GLint) ctx->Point.CoordReplace[ctx->Texture.CurrentUnit];
+      }
+      else {
+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnviv(pname)" );
+         return;
+      }
+   }
+   else {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnviv(target)" );
+      return;
+   }
+}
+
+
+
+
+/**********************************************************************/
+/*                       Texture Parameters                           */
+/**********************************************************************/
+
+static GLboolean 
+_mesa_validate_texture_wrap_mode(GLcontext * ctx,
+				 GLenum target, GLenum eparam)
+{
+   const struct gl_extensions * const e = & ctx->Extensions;
+
+   if (eparam == GL_CLAMP || eparam == GL_CLAMP_TO_EDGE ||
+       (eparam == GL_CLAMP_TO_BORDER && e->ARB_texture_border_clamp)) {
+      /* any texture target */
+      return GL_TRUE;
+   }
+   else if (target != GL_TEXTURE_RECTANGLE_NV &&
+	    (eparam == GL_REPEAT ||
+	     (eparam == GL_MIRRORED_REPEAT &&
+	      e->ARB_texture_mirrored_repeat) ||
+	     (eparam == GL_MIRROR_CLAMP_EXT &&
+	      (e->ATI_texture_mirror_once || e->EXT_texture_mirror_clamp)) ||
+	     (eparam == GL_MIRROR_CLAMP_TO_EDGE_EXT &&
+	      (e->ATI_texture_mirror_once || e->EXT_texture_mirror_clamp)) ||
+	     (eparam == GL_MIRROR_CLAMP_TO_BORDER_EXT &&
+	      (e->EXT_texture_mirror_clamp)))) {
+      /* non-rectangle texture */
+      return GL_TRUE;
+   }
+
+   _mesa_error( ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
+   return GL_FALSE;
+}
+
+
+void GLAPIENTRY
+_mesa_TexParameterf( GLenum target, GLenum pname, GLfloat param )
+{
+   _mesa_TexParameterfv(target, pname, &param);
+}
+
+
+void GLAPIENTRY
+_mesa_TexParameterfv( GLenum target, GLenum pname, const GLfloat *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   GLenum eparam = (GLenum) (GLint) params[0];
+   struct gl_texture_object *texObj;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE&(VERBOSE_API|VERBOSE_TEXTURE))
+      _mesa_debug(ctx, "glTexParameter %s %s %.1f(%s)...\n",
+                  _mesa_lookup_enum_by_nr(target),
+                  _mesa_lookup_enum_by_nr(pname),
+                  *params,
+		  _mesa_lookup_enum_by_nr(eparam));
+
+
+   switch (target) {
+      case GL_TEXTURE_1D:
+         texObj = texUnit->Current1D;
+         break;
+      case GL_TEXTURE_2D:
+         texObj = texUnit->Current2D;
+         break;
+      case GL_TEXTURE_3D:
+         texObj = texUnit->Current3D;
+         break;
+      case GL_TEXTURE_CUBE_MAP:
+         if (!ctx->Extensions.ARB_texture_cube_map) {
+            _mesa_error( ctx, GL_INVALID_ENUM, "glTexParameter(target)" );
+            return;
+         }
+         texObj = texUnit->CurrentCubeMap;
+         break;
+      case GL_TEXTURE_RECTANGLE_NV:
+         if (!ctx->Extensions.NV_texture_rectangle) {
+            _mesa_error( ctx, GL_INVALID_ENUM, "glTexParameter(target)" );
+            return;
+         }
+         texObj = texUnit->CurrentRect;
+         break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glTexParameter(target)" );
+         return;
+   }
+
+   switch (pname) {
+      case GL_TEXTURE_MIN_FILTER:
+         /* A small optimization */
+         if (texObj->MinFilter == eparam)
+            return;
+         if (eparam==GL_NEAREST || eparam==GL_LINEAR) {
+            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            texObj->MinFilter = eparam;
+         }
+         else if ((eparam==GL_NEAREST_MIPMAP_NEAREST ||
+                   eparam==GL_LINEAR_MIPMAP_NEAREST ||
+                   eparam==GL_NEAREST_MIPMAP_LINEAR ||
+                   eparam==GL_LINEAR_MIPMAP_LINEAR) &&
+                  texObj->Target != GL_TEXTURE_RECTANGLE_NV) {
+            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            texObj->MinFilter = eparam;
+         }
+         else {
+            _mesa_error( ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
+            return;
+         }
+         break;
+      case GL_TEXTURE_MAG_FILTER:
+         /* A small optimization */
+         if (texObj->MagFilter == eparam)
+            return;
+
+         if (eparam==GL_NEAREST || eparam==GL_LINEAR) {
+            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            texObj->MagFilter = eparam;
+         }
+         else {
+            _mesa_error( ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
+            return;
+         }
+         break;
+      case GL_TEXTURE_WRAP_S:
+         if (texObj->WrapS == eparam)
+            return;
+         if (_mesa_validate_texture_wrap_mode(ctx, texObj->Target, eparam)) {
+            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            texObj->WrapS = eparam;
+         }
+         else {
+            return;
+         }
+         break;
+      case GL_TEXTURE_WRAP_T:
+         if (texObj->WrapT == eparam)
+            return;
+         if (_mesa_validate_texture_wrap_mode(ctx, texObj->Target, eparam)) {
+            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            texObj->WrapT = eparam;
+         }
+         else {
+            return;
+         }
+         break;
+      case GL_TEXTURE_WRAP_R:
+         if (texObj->WrapR == eparam)
+            return;
+         if (_mesa_validate_texture_wrap_mode(ctx, texObj->Target, eparam)) {
+            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            texObj->WrapR = eparam;
+         }
+         else {
+	    return;
+         }
+         break;
+      case GL_TEXTURE_BORDER_COLOR:
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         texObj->BorderColor[RCOMP] = params[0];
+         texObj->BorderColor[GCOMP] = params[1];
+         texObj->BorderColor[BCOMP] = params[2];
+         texObj->BorderColor[ACOMP] = params[3];
+         UNCLAMPED_FLOAT_TO_CHAN(texObj->_BorderChan[RCOMP], params[0]);
+         UNCLAMPED_FLOAT_TO_CHAN(texObj->_BorderChan[GCOMP], params[1]);
+         UNCLAMPED_FLOAT_TO_CHAN(texObj->_BorderChan[BCOMP], params[2]);
+         UNCLAMPED_FLOAT_TO_CHAN(texObj->_BorderChan[ACOMP], params[3]);
+         break;
+      case GL_TEXTURE_MIN_LOD:
+         if (texObj->MinLod == params[0])
+            return;
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         texObj->MinLod = params[0];
+         break;
+      case GL_TEXTURE_MAX_LOD:
+         if (texObj->MaxLod == params[0])
+            return;
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         texObj->MaxLod = params[0];
+         break;
+      case GL_TEXTURE_BASE_LEVEL:
+         if (params[0] < 0.0) {
+            _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
+            return;
+         }
+         if (target == GL_TEXTURE_RECTANGLE_NV && params[0] != 0.0) {
+            _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
+            return;
+         }
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         texObj->BaseLevel = (GLint) params[0];
+         break;
+      case GL_TEXTURE_MAX_LEVEL:
+         if (params[0] < 0.0) {
+            _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
+            return;
+         }
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         texObj->MaxLevel = (GLint) params[0];
+         break;
+      case GL_TEXTURE_PRIORITY:
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+         texObj->Priority = CLAMP( params[0], 0.0F, 1.0F );
+         break;
+      case GL_TEXTURE_MAX_ANISOTROPY_EXT:
+         if (ctx->Extensions.EXT_texture_filter_anisotropic) {
+	    if (params[0] < 1.0) {
+	       _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param)" );
+	       return;
+	    }
+            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            texObj->MaxAnisotropy = params[0];
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glTexParameter(pname=GL_TEXTURE_MAX_ANISOTROPY_EXT)");
+            return;
+         }
+         break;
+      case GL_TEXTURE_COMPARE_SGIX:
+         if (ctx->Extensions.SGIX_shadow) {
+            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            texObj->CompareFlag = params[0] ? GL_TRUE : GL_FALSE;
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glTexParameter(pname=GL_TEXTURE_COMPARE_SGIX)");
+            return;
+         }
+         break;
+      case GL_TEXTURE_COMPARE_OPERATOR_SGIX:
+         if (ctx->Extensions.SGIX_shadow) {
+            GLenum op = (GLenum) params[0];
+            if (op == GL_TEXTURE_LEQUAL_R_SGIX ||
+                op == GL_TEXTURE_GEQUAL_R_SGIX) {
+               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+               texObj->CompareOperator = op;
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(param)");
+            }
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                    "glTexParameter(pname=GL_TEXTURE_COMPARE_OPERATOR_SGIX)");
+            return;
+         }
+         break;
+      case GL_SHADOW_AMBIENT_SGIX: /* aka GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+         if (ctx->Extensions.SGIX_shadow_ambient) {
+            FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+            texObj->ShadowAmbient = CLAMP(params[0], 0.0F, 1.0F);
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glTexParameter(pname=GL_SHADOW_AMBIENT_SGIX)");
+            return;
+         }
+         break;
+      case GL_GENERATE_MIPMAP_SGIS:
+         if (ctx->Extensions.SGIS_generate_mipmap) {
+            texObj->GenerateMipmap = params[0] ? GL_TRUE : GL_FALSE;
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glTexParameter(pname=GL_GENERATE_MIPMAP_SGIS)");
+            return;
+         }
+         break;
+      case GL_TEXTURE_COMPARE_MODE_ARB:
+         if (ctx->Extensions.ARB_shadow) {
+            const GLenum mode = (GLenum) params[0];
+            if (mode == GL_NONE || mode == GL_COMPARE_R_TO_TEXTURE_ARB) {
+               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+               texObj->CompareMode = mode;
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM,
+                           "glTexParameter(bad GL_TEXTURE_COMPARE_MODE_ARB: 0x%x)", mode);
+               return;
+            }
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glTexParameter(pname=GL_TEXTURE_COMPARE_MODE_ARB)");
+            return;
+         }
+         break;
+      case GL_TEXTURE_COMPARE_FUNC_ARB:
+         if (ctx->Extensions.ARB_shadow) {
+            const GLenum func = (GLenum) params[0];
+            if (func == GL_LEQUAL || func == GL_GEQUAL) {
+               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+               texObj->CompareFunc = func;
+            }
+            else if (ctx->Extensions.EXT_shadow_funcs &&
+                     (func == GL_EQUAL ||
+                      func == GL_NOTEQUAL ||
+                      func == GL_LESS ||
+                      func == GL_GREATER ||
+                      func == GL_ALWAYS ||
+                      func == GL_NEVER)) {
+               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+               texObj->CompareFunc = func;
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM,
+                           "glTexParameter(bad GL_TEXTURE_COMPARE_FUNC_ARB)");
+               return;
+            }
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glTexParameter(pname=GL_TEXTURE_COMPARE_FUNC_ARB)");
+            return;
+         }
+         break;
+      case GL_DEPTH_TEXTURE_MODE_ARB:
+         if (ctx->Extensions.ARB_depth_texture) {
+            const GLenum result = (GLenum) params[0];
+            if (result == GL_LUMINANCE || result == GL_INTENSITY
+                || result == GL_ALPHA) {
+               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+               texObj->DepthMode = result;
+            }
+            else {
+               _mesa_error(ctx, GL_INVALID_ENUM,
+                          "glTexParameter(bad GL_DEPTH_TEXTURE_MODE_ARB)");
+               return;
+            }
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glTexParameter(pname=GL_DEPTH_TEXTURE_MODE_ARB)");
+            return;
+         }
+         break;
+      case GL_TEXTURE_LOD_BIAS:
+         /* NOTE: this is really part of OpenGL 1.4, not EXT_texture_lod_bias*/
+         if (ctx->Extensions.EXT_texture_lod_bias) {
+            if (texObj->LodBias != params[0]) {
+               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+               texObj->LodBias = params[0];
+            }
+         }
+         break;
+
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM,
+                     "glTexParameter(pname=0x%x)", pname);
+         return;
+   }
+
+   texObj->Complete = GL_FALSE;
+
+   if (ctx->Driver.TexParameter) {
+      (*ctx->Driver.TexParameter)( ctx, target, texObj, pname, params );
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_TexParameteri( GLenum target, GLenum pname, GLint param )
+{
+   GLfloat fparam[4];
+   if (pname == GL_TEXTURE_PRIORITY)
+      fparam[0] = INT_TO_FLOAT(param);
+   else
+      fparam[0] = (GLfloat) param;
+   fparam[1] = fparam[2] = fparam[3] = 0.0;
+   _mesa_TexParameterfv(target, pname, fparam);
+}
+
+
+void GLAPIENTRY
+_mesa_TexParameteriv( GLenum target, GLenum pname, const GLint *params )
+{
+   GLfloat fparam[4];
+   if (pname == GL_TEXTURE_BORDER_COLOR) {
+      fparam[0] = INT_TO_FLOAT(params[0]);
+      fparam[1] = INT_TO_FLOAT(params[1]);
+      fparam[2] = INT_TO_FLOAT(params[2]);
+      fparam[3] = INT_TO_FLOAT(params[3]);
+   }
+   else {
+      if (pname == GL_TEXTURE_PRIORITY)
+         fparam[0] = INT_TO_FLOAT(params[0]);
+      else
+         fparam[0] = (GLfloat) params[0];
+      fparam[1] = fparam[2] = fparam[3] = 0.0F;
+   }
+   _mesa_TexParameterfv(target, pname, fparam);
+}
+
+
+void GLAPIENTRY
+_mesa_GetTexLevelParameterfv( GLenum target, GLint level,
+                              GLenum pname, GLfloat *params )
+{
+   GLint iparam;
+   _mesa_GetTexLevelParameteriv( target, level, pname, &iparam );
+   *params = (GLfloat) iparam;
+}
+
+
+static GLuint
+tex_image_dimensions(GLcontext *ctx, GLenum target)
+{
+   switch (target) {
+      case GL_TEXTURE_1D:
+      case GL_PROXY_TEXTURE_1D:
+         return 1;
+      case GL_TEXTURE_2D:
+      case GL_PROXY_TEXTURE_2D:
+         return 2;
+      case GL_TEXTURE_3D:
+      case GL_PROXY_TEXTURE_3D:
+         return 3;
+      case GL_TEXTURE_CUBE_MAP:
+      case GL_PROXY_TEXTURE_CUBE_MAP:
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
+         return ctx->Extensions.ARB_texture_cube_map ? 2 : 0;
+      case GL_TEXTURE_RECTANGLE_NV:
+      case GL_PROXY_TEXTURE_RECTANGLE_NV:
+         return ctx->Extensions.NV_texture_rectangle ? 2 : 0;
+      default:
+         _mesa_problem(ctx, "bad target in _mesa_tex_target_dimensions()");
+         return 0;
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetTexLevelParameteriv( GLenum target, GLint level,
+                              GLenum pname, GLint *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   const struct gl_texture_image *img = NULL;
+   GLuint dimensions;
+   GLboolean isProxy;
+   GLint maxLevels;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   /* this will catch bad target values */
+   dimensions = tex_image_dimensions(ctx, target);  /* 1, 2 or 3 */
+   if (dimensions == 0) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexLevelParameter[if]v(target)");
+      return;
+   }
+
+   switch (target) {
+   case GL_TEXTURE_1D:
+   case GL_PROXY_TEXTURE_1D:
+   case GL_TEXTURE_2D:
+   case GL_PROXY_TEXTURE_2D:
+      maxLevels = ctx->Const.MaxTextureLevels;
+      break;
+   case GL_TEXTURE_3D:
+   case GL_PROXY_TEXTURE_3D:
+      maxLevels = ctx->Const.Max3DTextureLevels;
+      break;
+   case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
+   case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
+   case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
+   case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
+   case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
+   case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
+   case GL_PROXY_TEXTURE_CUBE_MAP:
+      maxLevels = ctx->Const.MaxCubeTextureLevels;
+      break;
+   case GL_TEXTURE_RECTANGLE_NV:
+   case GL_PROXY_TEXTURE_RECTANGLE_NV:
+      maxLevels = 1;
+      break;
+   default:
+      _mesa_problem(ctx, "switch in _mesa_GetTexLevelParameter");
+      return;
+   }
+
+   if (level < 0 || level >= maxLevels) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glGetTexLevelParameter[if]v" );
+      return;
+   }
+
+   img = _mesa_select_tex_image(ctx, texUnit, target, level);
+   if (!img || !img->TexFormat) {
+      /* undefined texture image */
+      if (pname == GL_TEXTURE_COMPONENTS)
+         *params = 1;
+      else
+         *params = 0;
+      return;
+   }
+
+   isProxy = (target == GL_PROXY_TEXTURE_1D) ||
+             (target == GL_PROXY_TEXTURE_2D) ||
+             (target == GL_PROXY_TEXTURE_3D) ||
+             (target == GL_PROXY_TEXTURE_CUBE_MAP) ||
+             (target == GL_PROXY_TEXTURE_RECTANGLE_NV);
+
+   switch (pname) {
+      case GL_TEXTURE_WIDTH:
+         *params = img->Width;
+         return;
+      case GL_TEXTURE_HEIGHT:
+         *params = img->Height;
+         return;
+      case GL_TEXTURE_DEPTH:
+         *params = img->Depth;
+         return;
+      case GL_TEXTURE_INTERNAL_FORMAT:
+         *params = img->IntFormat;
+         return;
+      case GL_TEXTURE_BORDER:
+         *params = img->Border;
+         return;
+      case GL_TEXTURE_RED_SIZE:
+         if (img->Format == GL_RGB || img->Format == GL_RGBA)
+            *params = img->TexFormat->RedBits;
+         else
+            *params = 0;
+         return;
+      case GL_TEXTURE_GREEN_SIZE:
+         if (img->Format == GL_RGB || img->Format == GL_RGBA)
+            *params = img->TexFormat->GreenBits;
+         else
+            *params = 0;
+         return;
+      case GL_TEXTURE_BLUE_SIZE:
+         if (img->Format == GL_RGB || img->Format == GL_RGBA)
+            *params = img->TexFormat->BlueBits;
+         else
+            *params = 0;
+         return;
+      case GL_TEXTURE_ALPHA_SIZE:
+         if (img->Format == GL_ALPHA || img->Format == GL_LUMINANCE_ALPHA ||
+             img->Format == GL_RGBA)
+            *params = img->TexFormat->AlphaBits;
+         else
+            *params = 0;
+         return;
+      case GL_TEXTURE_INTENSITY_SIZE:
+         if (img->Format != GL_INTENSITY)
+            *params = 0;
+         else if (img->TexFormat->IntensityBits > 0)
+            *params = img->TexFormat->IntensityBits;
+         else /* intensity probably stored as rgb texture */
+            *params = MIN2(img->TexFormat->RedBits, img->TexFormat->GreenBits);
+         return;
+      case GL_TEXTURE_LUMINANCE_SIZE:
+         if (img->Format != GL_LUMINANCE &&
+             img->Format != GL_LUMINANCE_ALPHA)
+            *params = 0;
+         else if (img->TexFormat->LuminanceBits > 0)
+            *params = img->TexFormat->LuminanceBits;
+         else /* luminance probably stored as rgb texture */
+            *params = MIN2(img->TexFormat->RedBits, img->TexFormat->GreenBits);
+         return;
+      case GL_TEXTURE_INDEX_SIZE_EXT:
+         if (img->Format == GL_COLOR_INDEX)
+            *params = img->TexFormat->IndexBits;
+         else
+            *params = 0;
+         return;
+      case GL_DEPTH_BITS:
+         /* XXX this isn't in the GL_SGIX_depth_texture spec
+          * but seems appropriate.
+          */
+         if (ctx->Extensions.SGIX_depth_texture)
+            *params = img->TexFormat->DepthBits;
+         else
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glGetTexLevelParameter[if]v(pname)");
+         return;
+
+      /* GL_ARB_texture_compression */
+      case GL_TEXTURE_COMPRESSED_IMAGE_SIZE:
+         if (ctx->Extensions.ARB_texture_compression) {
+            if (img->IsCompressed && !isProxy)
+               *params = img->CompressedSize;
+            else
+               _mesa_error(ctx, GL_INVALID_OPERATION,
+                           "glGetTexLevelParameter[if]v(pname)");
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glGetTexLevelParameter[if]v(pname)");
+         }
+         return;
+      case GL_TEXTURE_COMPRESSED:
+         if (ctx->Extensions.ARB_texture_compression) {
+            *params = (GLint) img->IsCompressed;
+         }
+         else {
+            _mesa_error(ctx, GL_INVALID_ENUM,
+                        "glGetTexLevelParameter[if]v(pname)");
+         }
+         return;
+
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM,
+                     "glGetTexLevelParameter[if]v(pname)");
+   }
+}
+
+
+
+void GLAPIENTRY
+_mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   struct gl_texture_object *obj;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   obj = _mesa_select_tex_object(ctx, texUnit, target);
+   if (!obj) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexParameterfv(target)");
+      return;
+   }
+
+   switch (pname) {
+      case GL_TEXTURE_MAG_FILTER:
+	 *params = ENUM_TO_FLOAT(obj->MagFilter);
+	 return;
+      case GL_TEXTURE_MIN_FILTER:
+         *params = ENUM_TO_FLOAT(obj->MinFilter);
+         return;
+      case GL_TEXTURE_WRAP_S:
+         *params = ENUM_TO_FLOAT(obj->WrapS);
+         return;
+      case GL_TEXTURE_WRAP_T:
+         *params = ENUM_TO_FLOAT(obj->WrapT);
+         return;
+      case GL_TEXTURE_WRAP_R:
+         *params = ENUM_TO_FLOAT(obj->WrapR);
+         return;
+      case GL_TEXTURE_BORDER_COLOR:
+         params[0] = CLAMP(obj->BorderColor[0], 0.0F, 1.0F);
+         params[1] = CLAMP(obj->BorderColor[1], 0.0F, 1.0F);
+         params[2] = CLAMP(obj->BorderColor[2], 0.0F, 1.0F);
+         params[3] = CLAMP(obj->BorderColor[3], 0.0F, 1.0F);
+         return;
+      case GL_TEXTURE_RESIDENT:
+         {
+            GLboolean resident;
+            if (ctx->Driver.IsTextureResident)
+               resident = ctx->Driver.IsTextureResident(ctx, obj);
+            else
+               resident = GL_TRUE;
+            *params = ENUM_TO_FLOAT(resident);
+         }
+         return;
+      case GL_TEXTURE_PRIORITY:
+         *params = obj->Priority;
+         return;
+      case GL_TEXTURE_MIN_LOD:
+         *params = obj->MinLod;
+         return;
+      case GL_TEXTURE_MAX_LOD:
+         *params = obj->MaxLod;
+         return;
+      case GL_TEXTURE_BASE_LEVEL:
+         *params = (GLfloat) obj->BaseLevel;
+         return;
+      case GL_TEXTURE_MAX_LEVEL:
+         *params = (GLfloat) obj->MaxLevel;
+         return;
+      case GL_TEXTURE_MAX_ANISOTROPY_EXT:
+         if (ctx->Extensions.EXT_texture_filter_anisotropic) {
+            *params = obj->MaxAnisotropy;
+            return;
+         }
+         break;
+      case GL_TEXTURE_COMPARE_SGIX:
+         if (ctx->Extensions.SGIX_shadow) {
+            *params = (GLfloat) obj->CompareFlag;
+            return;
+         }
+         break;
+      case GL_TEXTURE_COMPARE_OPERATOR_SGIX:
+         if (ctx->Extensions.SGIX_shadow) {
+            *params = (GLfloat) obj->CompareOperator;
+            return;
+         }
+         break;
+      case GL_SHADOW_AMBIENT_SGIX: /* aka GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+         if (ctx->Extensions.SGIX_shadow_ambient) {
+            *params = obj->ShadowAmbient;
+            return;
+         }
+         break;
+      case GL_GENERATE_MIPMAP_SGIS:
+         if (ctx->Extensions.SGIS_generate_mipmap) {
+            *params = (GLfloat) obj->GenerateMipmap;
+            return;
+         }
+         break;
+      case GL_TEXTURE_COMPARE_MODE_ARB:
+         if (ctx->Extensions.ARB_shadow) {
+            *params = (GLfloat) obj->CompareMode;
+            return;
+         }
+         break;
+      case GL_TEXTURE_COMPARE_FUNC_ARB:
+         if (ctx->Extensions.ARB_shadow) {
+            *params = (GLfloat) obj->CompareFunc;
+            return;
+         }
+         break;
+      case GL_DEPTH_TEXTURE_MODE_ARB:
+         if (ctx->Extensions.ARB_depth_texture) {
+            *params = (GLfloat) obj->DepthMode;
+            return;
+         }
+         break;
+      case GL_TEXTURE_LOD_BIAS:
+         if (ctx->Extensions.EXT_texture_lod_bias) {
+            *params = obj->LodBias;
+            break;
+         }
+         break;
+      default:
+         ; /* silence warnings */
+   }
+   /* If we get here, pname was an unrecognized enum */
+   _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexParameterfv(pname=0x%x)",
+               pname);
+}
+
+
+void GLAPIENTRY
+_mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   struct gl_texture_object *obj;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   obj = _mesa_select_tex_object(ctx, texUnit, target);
+   if (!obj) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexParameteriv(target)");
+      return;
+   }
+
+   switch (pname) {
+      case GL_TEXTURE_MAG_FILTER:
+         *params = (GLint) obj->MagFilter;
+      case GL_TEXTURE_LOD_BIAS:
+         if (ctx->Extensions.EXT_texture_lod_bias) {
+            *params = (GLint) obj->LodBias;
+            break;
+         }
+         break;
+         return;
+      case GL_TEXTURE_MIN_FILTER:
+         *params = (GLint) obj->MinFilter;
+         return;
+      case GL_TEXTURE_WRAP_S:
+         *params = (GLint) obj->WrapS;
+         return;
+      case GL_TEXTURE_WRAP_T:
+         *params = (GLint) obj->WrapT;
+         return;
+      case GL_TEXTURE_WRAP_R:
+         *params = (GLint) obj->WrapR;
+         return;
+      case GL_TEXTURE_BORDER_COLOR:
+         {
+            GLfloat b[4];
+            b[0] = CLAMP(obj->BorderColor[0], 0.0F, 1.0F);
+            b[1] = CLAMP(obj->BorderColor[1], 0.0F, 1.0F);
+            b[2] = CLAMP(obj->BorderColor[2], 0.0F, 1.0F);
+            b[3] = CLAMP(obj->BorderColor[3], 0.0F, 1.0F);
+            params[0] = FLOAT_TO_INT(b[0]);
+            params[1] = FLOAT_TO_INT(b[1]);
+            params[2] = FLOAT_TO_INT(b[2]);
+            params[3] = FLOAT_TO_INT(b[3]);
+         }
+         return;
+      case GL_TEXTURE_RESIDENT:
+         {
+            GLboolean resident;
+            if (ctx->Driver.IsTextureResident)
+               resident = ctx->Driver.IsTextureResident(ctx, obj);
+            else
+               resident = GL_TRUE;
+            *params = (GLint) resident;
+         }
+         return;
+      case GL_TEXTURE_PRIORITY:
+         *params = FLOAT_TO_INT(obj->Priority);
+         return;
+      case GL_TEXTURE_MIN_LOD:
+         *params = (GLint) obj->MinLod;
+         return;
+      case GL_TEXTURE_MAX_LOD:
+         *params = (GLint) obj->MaxLod;
+         return;
+      case GL_TEXTURE_BASE_LEVEL:
+         *params = obj->BaseLevel;
+         return;
+      case GL_TEXTURE_MAX_LEVEL:
+         *params = obj->MaxLevel;
+         return;
+      case GL_TEXTURE_MAX_ANISOTROPY_EXT:
+         if (ctx->Extensions.EXT_texture_filter_anisotropic) {
+            *params = (GLint) obj->MaxAnisotropy;
+            return;
+         }
+         break;
+      case GL_TEXTURE_COMPARE_SGIX:
+         if (ctx->Extensions.SGIX_shadow) {
+            *params = (GLint) obj->CompareFlag;
+            return;
+         }
+         break;
+      case GL_TEXTURE_COMPARE_OPERATOR_SGIX:
+         if (ctx->Extensions.SGIX_shadow) {
+            *params = (GLint) obj->CompareOperator;
+            return;
+         }
+         break;
+      case GL_SHADOW_AMBIENT_SGIX: /* aka GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+         if (ctx->Extensions.SGIX_shadow_ambient) {
+            *params = (GLint) FLOAT_TO_INT(obj->ShadowAmbient);
+            return;
+         }
+         break;
+      case GL_GENERATE_MIPMAP_SGIS:
+         if (ctx->Extensions.SGIS_generate_mipmap) {
+            *params = (GLint) obj->GenerateMipmap;
+            return;
+         }
+         break;
+      case GL_TEXTURE_COMPARE_MODE_ARB:
+         if (ctx->Extensions.ARB_shadow) {
+            *params = (GLint) obj->CompareMode;
+            return;
+         }
+         break;
+      case GL_TEXTURE_COMPARE_FUNC_ARB:
+         if (ctx->Extensions.ARB_shadow) {
+            *params = (GLint) obj->CompareFunc;
+            return;
+         }
+         break;
+      case GL_DEPTH_TEXTURE_MODE_ARB:
+         if (ctx->Extensions.ARB_depth_texture) {
+            *params = (GLint) obj->DepthMode;
+            return;
+         }
+         break;
+      default:
+         ; /* silence warnings */
+   }
+   /* If we get here, pname was an unrecognized enum */
+   _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexParameteriv(pname=0x%x)", pname);
+}
+
+
+
+
+/**********************************************************************/
+/*                    Texture Coord Generation                        */
+/**********************************************************************/
+
+#if FEATURE_texgen
+void GLAPIENTRY
+_mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint tUnit = ctx->Texture.CurrentUnit;
+   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[tUnit];
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE&(VERBOSE_API|VERBOSE_TEXTURE))
+      _mesa_debug(ctx, "glTexGen %s %s %.1f(%s)...\n",
+                  _mesa_lookup_enum_by_nr(coord),
+                  _mesa_lookup_enum_by_nr(pname),
+                  *params,
+		  _mesa_lookup_enum_by_nr((GLenum) (GLint) *params));
+
+   switch (coord) {
+      case GL_S:
+         if (pname==GL_TEXTURE_GEN_MODE) {
+	    GLenum mode = (GLenum) (GLint) *params;
+	    GLuint bits;
+	    switch (mode) {
+	    case GL_OBJECT_LINEAR:
+	       bits = TEXGEN_OBJ_LINEAR;
+	       break;
+	    case GL_EYE_LINEAR:
+	       bits = TEXGEN_EYE_LINEAR;
+	       break;
+	    case GL_REFLECTION_MAP_NV:
+	       bits = TEXGEN_REFLECTION_MAP_NV;
+	       break;
+	    case GL_NORMAL_MAP_NV:
+	       bits = TEXGEN_NORMAL_MAP_NV;
+	       break;
+	    case GL_SPHERE_MAP:
+	       bits = TEXGEN_SPHERE_MAP;
+	       break;
+	    default:
+	       _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(param)" );
+	       return;
+	    }
+	    if (texUnit->GenModeS == mode)
+	       return;
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	    texUnit->GenModeS = mode;
+	    texUnit->_GenBitS = bits;
+	 }
+	 else if (pname==GL_OBJECT_PLANE) {
+	    if (TEST_EQ_4V(texUnit->ObjectPlaneS, params))
+		return;
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	    texUnit->ObjectPlaneS[0] = params[0];
+	    texUnit->ObjectPlaneS[1] = params[1];
+	    texUnit->ObjectPlaneS[2] = params[2];
+	    texUnit->ObjectPlaneS[3] = params[3];
+	 }
+	 else if (pname==GL_EYE_PLANE) {
+	    GLfloat tmp[4];
+
+            /* Transform plane equation by the inverse modelview matrix */
+            if (ctx->ModelviewMatrixStack.Top->flags & MAT_DIRTY_INVERSE) {
+               _math_matrix_analyse( ctx->ModelviewMatrixStack.Top );
+            }
+            _mesa_transform_vector( tmp, params, ctx->ModelviewMatrixStack.Top->inv );
+	    if (TEST_EQ_4V(texUnit->EyePlaneS, tmp))
+	       return;
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	    COPY_4FV(texUnit->EyePlaneS, tmp);
+	 }
+	 else {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(pname)" );
+	    return;
+	 }
+	 break;
+      case GL_T:
+         if (pname==GL_TEXTURE_GEN_MODE) {
+	    GLenum mode = (GLenum) (GLint) *params;
+	    GLuint bitt;
+	    switch (mode) {
+               case GL_OBJECT_LINEAR:
+                  bitt = TEXGEN_OBJ_LINEAR;
+                  break;
+               case GL_EYE_LINEAR:
+                  bitt = TEXGEN_EYE_LINEAR;
+                  break;
+               case GL_REFLECTION_MAP_NV:
+                  bitt = TEXGEN_REFLECTION_MAP_NV;
+                  break;
+               case GL_NORMAL_MAP_NV:
+                  bitt = TEXGEN_NORMAL_MAP_NV;
+                  break;
+               case GL_SPHERE_MAP:
+                  bitt = TEXGEN_SPHERE_MAP;
+                  break;
+               default:
+                  _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(param)" );
+                  return;
+	    }
+	    if (texUnit->GenModeT == mode)
+	       return;
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	    texUnit->GenModeT = mode;
+	    texUnit->_GenBitT = bitt;
+	 }
+	 else if (pname==GL_OBJECT_PLANE) {
+	    if (TEST_EQ_4V(texUnit->ObjectPlaneT, params))
+		return;
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	    texUnit->ObjectPlaneT[0] = params[0];
+	    texUnit->ObjectPlaneT[1] = params[1];
+	    texUnit->ObjectPlaneT[2] = params[2];
+	    texUnit->ObjectPlaneT[3] = params[3];
+	 }
+	 else if (pname==GL_EYE_PLANE) {
+	    GLfloat tmp[4];
+            /* Transform plane equation by the inverse modelview matrix */
+	    if (ctx->ModelviewMatrixStack.Top->flags & MAT_DIRTY_INVERSE) {
+               _math_matrix_analyse( ctx->ModelviewMatrixStack.Top );
+            }
+            _mesa_transform_vector( tmp, params, ctx->ModelviewMatrixStack.Top->inv );
+	    if (TEST_EQ_4V(texUnit->EyePlaneT, tmp))
+		return;
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	    COPY_4FV(texUnit->EyePlaneT, tmp);
+	 }
+	 else {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(pname)" );
+	    return;
+	 }
+	 break;
+      case GL_R:
+         if (pname==GL_TEXTURE_GEN_MODE) {
+	    GLenum mode = (GLenum) (GLint) *params;
+	    GLuint bitr;
+	    switch (mode) {
+	    case GL_OBJECT_LINEAR:
+	       bitr = TEXGEN_OBJ_LINEAR;
+	       break;
+	    case GL_REFLECTION_MAP_NV:
+	       bitr = TEXGEN_REFLECTION_MAP_NV;
+	       break;
+	    case GL_NORMAL_MAP_NV:
+	       bitr = TEXGEN_NORMAL_MAP_NV;
+	       break;
+	    case GL_EYE_LINEAR:
+	       bitr = TEXGEN_EYE_LINEAR;
+	       break;
+	    default:
+	       _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(param)" );
+	       return;
+	    }
+	    if (texUnit->GenModeR == mode)
+	       return;
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	    texUnit->GenModeR = mode;
+	    texUnit->_GenBitR = bitr;
+	 }
+	 else if (pname==GL_OBJECT_PLANE) {
+	    if (TEST_EQ_4V(texUnit->ObjectPlaneR, params))
+		return;
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	    texUnit->ObjectPlaneR[0] = params[0];
+	    texUnit->ObjectPlaneR[1] = params[1];
+	    texUnit->ObjectPlaneR[2] = params[2];
+	    texUnit->ObjectPlaneR[3] = params[3];
+	 }
+	 else if (pname==GL_EYE_PLANE) {
+	    GLfloat tmp[4];
+            /* Transform plane equation by the inverse modelview matrix */
+            if (ctx->ModelviewMatrixStack.Top->flags & MAT_DIRTY_INVERSE) {
+               _math_matrix_analyse( ctx->ModelviewMatrixStack.Top );
+            }
+            _mesa_transform_vector( tmp, params, ctx->ModelviewMatrixStack.Top->inv );
+	    if (TEST_EQ_4V(texUnit->EyePlaneR, tmp))
+	       return;
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	    COPY_4FV(texUnit->EyePlaneR, tmp);
+	 }
+	 else {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(pname)" );
+	    return;
+	 }
+	 break;
+      case GL_Q:
+         if (pname==GL_TEXTURE_GEN_MODE) {
+	    GLenum mode = (GLenum) (GLint) *params;
+	    GLuint bitq;
+	    switch (mode) {
+	    case GL_OBJECT_LINEAR:
+	       bitq = TEXGEN_OBJ_LINEAR;
+	       break;
+	    case GL_EYE_LINEAR:
+	       bitq = TEXGEN_EYE_LINEAR;
+	       break;
+	    default:
+	       _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(param)" );
+	       return;
+	    }
+	    if (texUnit->GenModeQ == mode)
+	       return;
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	    texUnit->GenModeQ = mode;
+	    texUnit->_GenBitQ = bitq;
+	 }
+	 else if (pname==GL_OBJECT_PLANE) {
+	    if (TEST_EQ_4V(texUnit->ObjectPlaneQ, params))
+		return;
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	    texUnit->ObjectPlaneQ[0] = params[0];
+	    texUnit->ObjectPlaneQ[1] = params[1];
+	    texUnit->ObjectPlaneQ[2] = params[2];
+	    texUnit->ObjectPlaneQ[3] = params[3];
+	 }
+	 else if (pname==GL_EYE_PLANE) {
+	    GLfloat tmp[4];
+            /* Transform plane equation by the inverse modelview matrix */
+            if (ctx->ModelviewMatrixStack.Top->flags & MAT_DIRTY_INVERSE) {
+               _math_matrix_analyse( ctx->ModelviewMatrixStack.Top );
+            }
+            _mesa_transform_vector( tmp, params, ctx->ModelviewMatrixStack.Top->inv );
+	    if (TEST_EQ_4V(texUnit->EyePlaneQ, tmp))
+	       return;
+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+	    COPY_4FV(texUnit->EyePlaneQ, tmp);
+	 }
+	 else {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(pname)" );
+	    return;
+	 }
+	 break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glTexGenfv(coord)" );
+	 return;
+   }
+
+   if (ctx->Driver.TexGen)
+      ctx->Driver.TexGen( ctx, coord, pname, params );
+}
+
+
+void GLAPIENTRY
+_mesa_TexGeniv(GLenum coord, GLenum pname, const GLint *params )
+{
+   GLfloat p[4];
+   p[0] = (GLfloat) params[0];
+   if (pname == GL_TEXTURE_GEN_MODE) {
+      p[1] = p[2] = p[3] = 0.0F;
+   }
+   else {
+      p[1] = (GLfloat) params[1];
+      p[2] = (GLfloat) params[2];
+      p[3] = (GLfloat) params[3];
+   }
+   _mesa_TexGenfv(coord, pname, p);
+}
+
+
+void GLAPIENTRY
+_mesa_TexGend(GLenum coord, GLenum pname, GLdouble param )
+{
+   GLfloat p = (GLfloat) param;
+   _mesa_TexGenfv( coord, pname, &p );
+}
+
+
+void GLAPIENTRY
+_mesa_TexGendv(GLenum coord, GLenum pname, const GLdouble *params )
+{
+   GLfloat p[4];
+   p[0] = (GLfloat) params[0];
+   if (pname == GL_TEXTURE_GEN_MODE) {
+      p[1] = p[2] = p[3] = 0.0F;
+   }
+   else {
+      p[1] = (GLfloat) params[1];
+      p[2] = (GLfloat) params[2];
+      p[3] = (GLfloat) params[3];
+   }
+   _mesa_TexGenfv( coord, pname, p );
+}
+
+
+void GLAPIENTRY
+_mesa_TexGenf( GLenum coord, GLenum pname, GLfloat param )
+{
+   _mesa_TexGenfv(coord, pname, &param);
+}
+
+
+void GLAPIENTRY
+_mesa_TexGeni( GLenum coord, GLenum pname, GLint param )
+{
+   _mesa_TexGeniv( coord, pname, &param );
+}
+
+
+
+void GLAPIENTRY
+_mesa_GetTexGendv( GLenum coord, GLenum pname, GLdouble *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint tUnit = ctx->Texture.CurrentUnit;
+   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[tUnit];
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   switch (coord) {
+      case GL_S:
+         if (pname==GL_TEXTURE_GEN_MODE) {
+            params[0] = ENUM_TO_DOUBLE(texUnit->GenModeS);
+	 }
+	 else if (pname==GL_OBJECT_PLANE) {
+            COPY_4V( params, texUnit->ObjectPlaneS );
+	 }
+	 else if (pname==GL_EYE_PLANE) {
+            COPY_4V( params, texUnit->EyePlaneS );
+	 }
+	 else {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGendv(pname)" );
+	    return;
+	 }
+	 break;
+      case GL_T:
+         if (pname==GL_TEXTURE_GEN_MODE) {
+            params[0] = ENUM_TO_DOUBLE(texUnit->GenModeT);
+	 }
+	 else if (pname==GL_OBJECT_PLANE) {
+            COPY_4V( params, texUnit->ObjectPlaneT );
+	 }
+	 else if (pname==GL_EYE_PLANE) {
+            COPY_4V( params, texUnit->EyePlaneT );
+	 }
+	 else {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGendv(pname)" );
+	    return;
+	 }
+	 break;
+      case GL_R:
+         if (pname==GL_TEXTURE_GEN_MODE) {
+            params[0] = ENUM_TO_DOUBLE(texUnit->GenModeR);
+	 }
+	 else if (pname==GL_OBJECT_PLANE) {
+            COPY_4V( params, texUnit->ObjectPlaneR );
+	 }
+	 else if (pname==GL_EYE_PLANE) {
+            COPY_4V( params, texUnit->EyePlaneR );
+	 }
+	 else {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGendv(pname)" );
+	    return;
+	 }
+	 break;
+      case GL_Q:
+         if (pname==GL_TEXTURE_GEN_MODE) {
+            params[0] = ENUM_TO_DOUBLE(texUnit->GenModeQ);
+	 }
+	 else if (pname==GL_OBJECT_PLANE) {
+            COPY_4V( params, texUnit->ObjectPlaneQ );
+	 }
+	 else if (pname==GL_EYE_PLANE) {
+            COPY_4V( params, texUnit->EyePlaneQ );
+	 }
+	 else {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGendv(pname)" );
+	    return;
+	 }
+	 break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGendv(coord)" );
+	 return;
+   }
+}
+
+
+
+void GLAPIENTRY
+_mesa_GetTexGenfv( GLenum coord, GLenum pname, GLfloat *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint tUnit = ctx->Texture.CurrentUnit;
+   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[tUnit];
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   switch (coord) {
+      case GL_S:
+         if (pname==GL_TEXTURE_GEN_MODE) {
+            params[0] = ENUM_TO_FLOAT(texUnit->GenModeS);
+	 }
+	 else if (pname==GL_OBJECT_PLANE) {
+            COPY_4V( params, texUnit->ObjectPlaneS );
+	 }
+	 else if (pname==GL_EYE_PLANE) {
+            COPY_4V( params, texUnit->EyePlaneS );
+	 }
+	 else {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGenfv(pname)" );
+	    return;
+	 }
+	 break;
+      case GL_T:
+         if (pname==GL_TEXTURE_GEN_MODE) {
+            params[0] = ENUM_TO_FLOAT(texUnit->GenModeT);
+	 }
+	 else if (pname==GL_OBJECT_PLANE) {
+            COPY_4V( params, texUnit->ObjectPlaneT );
+	 }
+	 else if (pname==GL_EYE_PLANE) {
+            COPY_4V( params, texUnit->EyePlaneT );
+	 }
+	 else {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGenfv(pname)" );
+	    return;
+	 }
+	 break;
+      case GL_R:
+         if (pname==GL_TEXTURE_GEN_MODE) {
+            params[0] = ENUM_TO_FLOAT(texUnit->GenModeR);
+	 }
+	 else if (pname==GL_OBJECT_PLANE) {
+            COPY_4V( params, texUnit->ObjectPlaneR );
+	 }
+	 else if (pname==GL_EYE_PLANE) {
+            COPY_4V( params, texUnit->EyePlaneR );
+	 }
+	 else {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGenfv(pname)" );
+	    return;
+	 }
+	 break;
+      case GL_Q:
+         if (pname==GL_TEXTURE_GEN_MODE) {
+            params[0] = ENUM_TO_FLOAT(texUnit->GenModeQ);
+	 }
+	 else if (pname==GL_OBJECT_PLANE) {
+            COPY_4V( params, texUnit->ObjectPlaneQ );
+	 }
+	 else if (pname==GL_EYE_PLANE) {
+            COPY_4V( params, texUnit->EyePlaneQ );
+	 }
+	 else {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGenfv(pname)" );
+	    return;
+	 }
+	 break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGenfv(coord)" );
+	 return;
+   }
+}
+
+
+
+void GLAPIENTRY
+_mesa_GetTexGeniv( GLenum coord, GLenum pname, GLint *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint tUnit = ctx->Texture.CurrentUnit;
+   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[tUnit];
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   switch (coord) {
+      case GL_S:
+         if (pname==GL_TEXTURE_GEN_MODE) {
+            params[0] = texUnit->GenModeS;
+	 }
+	 else if (pname==GL_OBJECT_PLANE) {
+            params[0] = (GLint) texUnit->ObjectPlaneS[0];
+            params[1] = (GLint) texUnit->ObjectPlaneS[1];
+            params[2] = (GLint) texUnit->ObjectPlaneS[2];
+            params[3] = (GLint) texUnit->ObjectPlaneS[3];
+	 }
+	 else if (pname==GL_EYE_PLANE) {
+            params[0] = (GLint) texUnit->EyePlaneS[0];
+            params[1] = (GLint) texUnit->EyePlaneS[1];
+            params[2] = (GLint) texUnit->EyePlaneS[2];
+            params[3] = (GLint) texUnit->EyePlaneS[3];
+	 }
+	 else {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGeniv(pname)" );
+	    return;
+	 }
+	 break;
+      case GL_T:
+         if (pname==GL_TEXTURE_GEN_MODE) {
+            params[0] = texUnit->GenModeT;
+	 }
+	 else if (pname==GL_OBJECT_PLANE) {
+            params[0] = (GLint) texUnit->ObjectPlaneT[0];
+            params[1] = (GLint) texUnit->ObjectPlaneT[1];
+            params[2] = (GLint) texUnit->ObjectPlaneT[2];
+            params[3] = (GLint) texUnit->ObjectPlaneT[3];
+	 }
+	 else if (pname==GL_EYE_PLANE) {
+            params[0] = (GLint) texUnit->EyePlaneT[0];
+            params[1] = (GLint) texUnit->EyePlaneT[1];
+            params[2] = (GLint) texUnit->EyePlaneT[2];
+            params[3] = (GLint) texUnit->EyePlaneT[3];
+	 }
+	 else {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGeniv(pname)" );
+	    return;
+	 }
+	 break;
+      case GL_R:
+         if (pname==GL_TEXTURE_GEN_MODE) {
+            params[0] = texUnit->GenModeR;
+	 }
+	 else if (pname==GL_OBJECT_PLANE) {
+            params[0] = (GLint) texUnit->ObjectPlaneR[0];
+            params[1] = (GLint) texUnit->ObjectPlaneR[1];
+            params[2] = (GLint) texUnit->ObjectPlaneR[2];
+            params[3] = (GLint) texUnit->ObjectPlaneR[3];
+	 }
+	 else if (pname==GL_EYE_PLANE) {
+            params[0] = (GLint) texUnit->EyePlaneR[0];
+            params[1] = (GLint) texUnit->EyePlaneR[1];
+            params[2] = (GLint) texUnit->EyePlaneR[2];
+            params[3] = (GLint) texUnit->EyePlaneR[3];
+	 }
+	 else {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGeniv(pname)" );
+	    return;
+	 }
+	 break;
+      case GL_Q:
+         if (pname==GL_TEXTURE_GEN_MODE) {
+            params[0] = texUnit->GenModeQ;
+	 }
+	 else if (pname==GL_OBJECT_PLANE) {
+            params[0] = (GLint) texUnit->ObjectPlaneQ[0];
+            params[1] = (GLint) texUnit->ObjectPlaneQ[1];
+            params[2] = (GLint) texUnit->ObjectPlaneQ[2];
+            params[3] = (GLint) texUnit->ObjectPlaneQ[3];
+	 }
+	 else if (pname==GL_EYE_PLANE) {
+            params[0] = (GLint) texUnit->EyePlaneQ[0];
+            params[1] = (GLint) texUnit->EyePlaneQ[1];
+            params[2] = (GLint) texUnit->EyePlaneQ[2];
+            params[3] = (GLint) texUnit->EyePlaneQ[3];
+         }
+	 else {
+	    _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGeniv(pname)" );
+	    return;
+	 }
+	 break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexGeniv(coord)" );
+	 return;
+   }
+}
+#endif
+
+/* GL_ARB_multitexture */
+void GLAPIENTRY
+_mesa_ActiveTextureARB( GLenum target )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   const GLuint texUnit = target - GL_TEXTURE0;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
+      _mesa_debug(ctx, "glActiveTexture %s\n",
+                  _mesa_lookup_enum_by_nr(target));
+
+   /* Cater for texture unit 0 is first, therefore use >= */
+   if (texUnit >= ctx->Const.MaxTextureUnits) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glActiveTexture(target)");
+      return;
+   }
+
+   if (ctx->Texture.CurrentUnit == texUnit)
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+
+   ctx->Texture.CurrentUnit = texUnit;
+   if (ctx->Transform.MatrixMode == GL_TEXTURE) {
+      /* update current stack pointer */
+      ctx->CurrentStack = &ctx->TextureMatrixStack[texUnit];
+   }
+
+   if (ctx->Driver.ActiveTexture) {
+      (*ctx->Driver.ActiveTexture)( ctx, (GLuint) texUnit );
+   }
+}
+
+
+/* GL_ARB_multitexture */
+void GLAPIENTRY
+_mesa_ClientActiveTextureARB( GLenum target )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint texUnit = target - GL_TEXTURE0;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (texUnit > ctx->Const.MaxTextureUnits) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glClientActiveTexture(target)");
+      return;
+   }
+
+   FLUSH_VERTICES(ctx, _NEW_ARRAY);
+   ctx->Array.ActiveTexture = texUnit;
+}
+
+
+
+/**********************************************************************/
+/*                     Pixel Texgen Extensions                        */
+/**********************************************************************/
+
+void GLAPIENTRY
+_mesa_PixelTexGenSGIX(GLenum mode)
+{
+   GLenum newRgbSource, newAlphaSource;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   switch (mode) {
+      case GL_NONE:
+         newRgbSource = GL_PIXEL_GROUP_COLOR_SGIS;
+         newAlphaSource = GL_PIXEL_GROUP_COLOR_SGIS;
+         break;
+      case GL_ALPHA:
+         newRgbSource = GL_PIXEL_GROUP_COLOR_SGIS;
+         newAlphaSource = GL_CURRENT_RASTER_COLOR;
+         break;
+      case GL_RGB:
+         newRgbSource = GL_CURRENT_RASTER_COLOR;
+         newAlphaSource = GL_PIXEL_GROUP_COLOR_SGIS;
+         break;
+      case GL_RGBA:
+         newRgbSource = GL_CURRENT_RASTER_COLOR;
+         newAlphaSource = GL_CURRENT_RASTER_COLOR;
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glPixelTexGenSGIX(mode)");
+         return;
+   }
+
+   if (newRgbSource == ctx->Pixel.FragmentRgbSource &&
+       newAlphaSource == ctx->Pixel.FragmentAlphaSource)
+      return;
+
+   FLUSH_VERTICES(ctx, _NEW_PIXEL);
+   ctx->Pixel.FragmentRgbSource = newRgbSource;
+   ctx->Pixel.FragmentAlphaSource = newAlphaSource;
+}
+
+
+void GLAPIENTRY
+_mesa_PixelTexGenParameterfSGIS(GLenum target, GLfloat value)
+{
+   _mesa_PixelTexGenParameteriSGIS(target, (GLint) value);
+}
+
+
+void GLAPIENTRY
+_mesa_PixelTexGenParameterfvSGIS(GLenum target, const GLfloat *value)
+{
+   _mesa_PixelTexGenParameteriSGIS(target, (GLint) *value);
+}
+
+
+void GLAPIENTRY
+_mesa_PixelTexGenParameteriSGIS(GLenum target, GLint value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (value != GL_CURRENT_RASTER_COLOR && value != GL_PIXEL_GROUP_COLOR_SGIS) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glPixelTexGenParameterSGIS(value)");
+      return;
+   }
+
+   switch (target) {
+   case GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS:
+      if (ctx->Pixel.FragmentRgbSource == (GLenum) value)
+	 return;
+      FLUSH_VERTICES(ctx, _NEW_PIXEL);
+      ctx->Pixel.FragmentRgbSource = (GLenum) value;
+      break;
+   case GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS:
+      if (ctx->Pixel.FragmentAlphaSource == (GLenum) value)
+	 return;
+      FLUSH_VERTICES(ctx, _NEW_PIXEL);
+      ctx->Pixel.FragmentAlphaSource = (GLenum) value;
+      break;
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM, "glPixelTexGenParameterSGIS(target)");
+      return;
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_PixelTexGenParameterivSGIS(GLenum target, const GLint *value)
+{
+  _mesa_PixelTexGenParameteriSGIS(target, *value);
+}
+
+
+void GLAPIENTRY
+_mesa_GetPixelTexGenParameterfvSGIS(GLenum target, GLfloat *value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (target == GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS) {
+      *value = (GLfloat) ctx->Pixel.FragmentRgbSource;
+   }
+   else if (target == GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS) {
+      *value = (GLfloat) ctx->Pixel.FragmentAlphaSource;
+   }
+   else {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetPixelTexGenParameterfvSGIS(target)");
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetPixelTexGenParameterivSGIS(GLenum target, GLint *value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (target == GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS) {
+      *value = (GLint) ctx->Pixel.FragmentRgbSource;
+   }
+   else if (target == GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS) {
+      *value = (GLint) ctx->Pixel.FragmentAlphaSource;
+   }
+   else {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetPixelTexGenParameterivSGIS(target)");
+   }
+}
+
+
+
+/**********************************************************************/
+/*****                    State management                        *****/
+/**********************************************************************/
+
+
+/**
+ * \note This routine refers to derived texture attribute values to
+ * compute the ENABLE_TEXMAT flags, but is only called on
+ * _NEW_TEXTURE_MATRIX.  On changes to _NEW_TEXTURE, the ENABLE_TEXMAT
+ * flags are updated by _mesa_update_textures(), below.
+ *
+ * \param ctx GL context.
+ */
+static void
+update_texture_matrices( GLcontext *ctx )
+{
+   GLuint i;
+
+   ctx->Texture._TexMatEnabled = 0;
+
+   for (i=0; i < ctx->Const.MaxTextureUnits; i++) {
+      if (ctx->TextureMatrixStack[i].Top->flags & MAT_DIRTY) {
+	 _math_matrix_analyse( ctx->TextureMatrixStack[i].Top );
+
+	 if (ctx->Texture.Unit[i]._ReallyEnabled &&
+	     ctx->TextureMatrixStack[i].Top->type != MATRIX_IDENTITY)
+	    ctx->Texture._TexMatEnabled |= ENABLE_TEXMAT(i);
+
+	 if (ctx->Driver.TextureMatrix)
+	    ctx->Driver.TextureMatrix( ctx, i, ctx->TextureMatrixStack[i].Top);
+      }
+   }
+}
+
+
+
+
+/**
+ * \note This routine refers to derived texture matrix values to
+ * compute the ENABLE_TEXMAT flags, but is only called on
+ * _NEW_TEXTURE.  On changes to _NEW_TEXTURE_MATRIX, the ENABLE_TEXMAT
+ * flags are updated by _mesa_update_texture_matrices, above.
+ *
+ * \param ctx GL context.
+ */
+static void
+update_texture_state( GLcontext *ctx )
+{
+   GLuint unit;
+
+   ctx->Texture._EnabledUnits = 0;
+   ctx->Texture._GenFlags = 0;
+   ctx->Texture._TexMatEnabled = 0;
+   ctx->Texture._TexGenEnabled = 0;
+
+   /* Update texture unit state.
+    * XXX this loop should probably be broken into separate loops for
+    * texture coord units and texture image units.
+    */
+   for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++) {
+      struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
+      GLuint enableBits;
+
+      texUnit->_Current = NULL;
+      texUnit->_ReallyEnabled = 0;
+      texUnit->_GenFlags = 0;
+
+      /* Get the bitmask of texture enables */
+      if (ctx->FragmentProgram.Enabled && ctx->FragmentProgram.Current) {
+         enableBits = ctx->FragmentProgram.Current->TexturesUsed[unit];
+      }
+      else {
+         if (!texUnit->Enabled)
+            continue;
+         enableBits = texUnit->Enabled;
+      }
+
+      /* Look for the highest-priority texture target that's enabled and
+       * complete.  That's the one we'll use for texturing.  If we're using
+       * a fragment program we're guaranteed that bitcount(enabledBits) <= 1.
+       */
+      if (enableBits & TEXTURE_CUBE_BIT) {
+         struct gl_texture_object *texObj = texUnit->CurrentCubeMap;
+         if (!texObj->Complete) {
+            _mesa_test_texobj_completeness(ctx, texObj);
+         }
+         if (texObj->Complete) {
+            texUnit->_ReallyEnabled = TEXTURE_CUBE_BIT;
+            texUnit->_Current = texObj;
+         }
+      }
+
+      if (!texUnit->_ReallyEnabled && (enableBits & TEXTURE_3D_BIT)) {
+         struct gl_texture_object *texObj = texUnit->Current3D;
+         if (!texObj->Complete) {
+            _mesa_test_texobj_completeness(ctx, texObj);
+         }
+         if (texObj->Complete) {
+            texUnit->_ReallyEnabled = TEXTURE_3D_BIT;
+            texUnit->_Current = texObj;
+         }
+      }
+
+      if (!texUnit->_ReallyEnabled && (enableBits & TEXTURE_RECT_BIT)) {
+         struct gl_texture_object *texObj = texUnit->CurrentRect;
+         if (!texObj->Complete) {
+            _mesa_test_texobj_completeness(ctx, texObj);
+         }
+         if (texObj->Complete) {
+            texUnit->_ReallyEnabled = TEXTURE_RECT_BIT;
+            texUnit->_Current = texObj;
+         }
+      }
+
+      if (!texUnit->_ReallyEnabled && (enableBits & TEXTURE_2D_BIT)) {
+         struct gl_texture_object *texObj = texUnit->Current2D;
+         if (!texObj->Complete) {
+            _mesa_test_texobj_completeness(ctx, texObj);
+         }
+         if (texObj->Complete) {
+            texUnit->_ReallyEnabled = TEXTURE_2D_BIT;
+            texUnit->_Current = texObj;
+         }
+      }
+
+      if (!texUnit->_ReallyEnabled && (enableBits & TEXTURE_1D_BIT)) {
+         struct gl_texture_object *texObj = texUnit->Current1D;
+         if (!texObj->Complete) {
+            _mesa_test_texobj_completeness(ctx, texObj);
+         }
+         if (texObj->Complete) {
+            texUnit->_ReallyEnabled = TEXTURE_1D_BIT;
+            texUnit->_Current = texObj;
+         }
+      }
+
+      if (!texUnit->_ReallyEnabled) {
+         continue;
+      }
+
+      if (texUnit->_ReallyEnabled)
+         ctx->Texture._EnabledUnits |= (1 << unit);
+
+      if (texUnit->TexGenEnabled) {
+	 if (texUnit->TexGenEnabled & S_BIT) {
+	    texUnit->_GenFlags |= texUnit->_GenBitS;
+	 }
+	 if (texUnit->TexGenEnabled & T_BIT) {
+	    texUnit->_GenFlags |= texUnit->_GenBitT;
+	 }
+	 if (texUnit->TexGenEnabled & Q_BIT) {
+	    texUnit->_GenFlags |= texUnit->_GenBitQ;
+	 }
+	 if (texUnit->TexGenEnabled & R_BIT) {
+	    texUnit->_GenFlags |= texUnit->_GenBitR;
+	 }
+
+	 ctx->Texture._TexGenEnabled |= ENABLE_TEXGEN(unit);
+	 ctx->Texture._GenFlags |= texUnit->_GenFlags;
+      }
+
+      if (ctx->TextureMatrixStack[unit].Top->type != MATRIX_IDENTITY)
+	 ctx->Texture._TexMatEnabled |= ENABLE_TEXMAT(unit);
+   }
+
+   ctx->Texture._EnabledCoordUnits = ctx->Texture._EnabledUnits;
+   /* Fragment programs may need texture coordinates but not the
+    * corresponding texture images.
+    */
+   if (ctx->FragmentProgram.Enabled && ctx->FragmentProgram.Current) {
+      ctx->Texture._EnabledCoordUnits |=
+         (ctx->FragmentProgram.Current->InputsRead >> FRAG_ATTRIB_TEX0);
+   }
+}
+
+
+void _mesa_update_texture( GLcontext *ctx, GLuint new_state )
+{
+   if (new_state & _NEW_TEXTURE_MATRIX)
+      update_texture_matrices( ctx );
+
+   if (new_state & (_NEW_TEXTURE | _NEW_PROGRAM))
+      update_texture_state( ctx );
+}
+
+/**********************************************************************/
+/*****                      Initialization                        *****/
+/**********************************************************************/
+
+/**
+ * Allocate the proxy textures for the given context.
+ * 
+ * \param ctx the context to allocate proxies for.
+ * 
+ * \return GL_TRUE on success, or GL_FALSE on failure
+ * 
+ * If run out of memory part way through the allocations, clean up and return
+ * GL_FALSE.
+ */
+static GLboolean
+alloc_proxy_textures( GLcontext *ctx )
+{
+   ctx->Texture.Proxy1D = (*ctx->Driver.NewTextureObject)(ctx, 0, GL_TEXTURE_1D);
+   if (!ctx->Texture.Proxy1D)
+      goto cleanup;
+
+   ctx->Texture.Proxy2D = (*ctx->Driver.NewTextureObject)(ctx, 0, GL_TEXTURE_2D);
+   if (!ctx->Texture.Proxy2D)
+      goto cleanup;
+
+   ctx->Texture.Proxy3D = (*ctx->Driver.NewTextureObject)(ctx, 0, GL_TEXTURE_3D);
+   if (!ctx->Texture.Proxy3D)
+      goto cleanup;
+
+   ctx->Texture.ProxyCubeMap = (*ctx->Driver.NewTextureObject)(ctx, 0, GL_TEXTURE_CUBE_MAP_ARB);
+   if (!ctx->Texture.ProxyCubeMap)
+      goto cleanup;
+
+   ctx->Texture.ProxyRect = (*ctx->Driver.NewTextureObject)(ctx, 0, GL_TEXTURE_RECTANGLE_NV);
+   if (!ctx->Texture.ProxyRect)
+      goto cleanup;
+
+   return GL_TRUE;
+
+ cleanup:
+   if (ctx->Texture.Proxy1D)
+      (ctx->Driver.DeleteTexture)(ctx, ctx->Texture.Proxy1D);
+   if (ctx->Texture.Proxy2D)
+      (ctx->Driver.DeleteTexture)(ctx, ctx->Texture.Proxy2D);
+   if (ctx->Texture.Proxy3D)
+      (ctx->Driver.DeleteTexture)(ctx, ctx->Texture.Proxy3D);
+   if (ctx->Texture.ProxyCubeMap)
+      (ctx->Driver.DeleteTexture)(ctx, ctx->Texture.ProxyCubeMap);
+   if (ctx->Texture.ProxyRect)
+      (ctx->Driver.DeleteTexture)(ctx, ctx->Texture.ProxyRect);
+   return GL_FALSE;
+}
+
+
+/**
+ * Initialize a texture unit.
+ *
+ * \param ctx GL context.
+ * \param unit texture unit number to be initialized.
+ */
+static void
+init_texture_unit( GLcontext *ctx, GLuint unit )
+{
+   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
+
+   texUnit->EnvMode = GL_MODULATE;
+   ASSIGN_4V( texUnit->EnvColor, 0.0, 0.0, 0.0, 0.0 );
+
+   texUnit->CombineModeRGB = GL_MODULATE;
+   texUnit->CombineModeA = GL_MODULATE;
+   texUnit->CombineSourceRGB[0] = GL_TEXTURE;
+   texUnit->CombineSourceRGB[1] = GL_PREVIOUS_EXT;
+   texUnit->CombineSourceRGB[2] = GL_CONSTANT_EXT;
+   texUnit->CombineSourceA[0] = GL_TEXTURE;
+   texUnit->CombineSourceA[1] = GL_PREVIOUS_EXT;
+   texUnit->CombineSourceA[2] = GL_CONSTANT_EXT;
+   texUnit->CombineOperandRGB[0] = GL_SRC_COLOR;
+   texUnit->CombineOperandRGB[1] = GL_SRC_COLOR;
+   texUnit->CombineOperandRGB[2] = GL_SRC_ALPHA;
+   texUnit->CombineOperandA[0] = GL_SRC_ALPHA;
+   texUnit->CombineOperandA[1] = GL_SRC_ALPHA;
+   texUnit->CombineOperandA[2] = GL_SRC_ALPHA;
+   texUnit->CombineScaleShiftRGB = 0;
+   texUnit->CombineScaleShiftA = 0;
+
+   texUnit->TexGenEnabled = 0;
+   texUnit->GenModeS = GL_EYE_LINEAR;
+   texUnit->GenModeT = GL_EYE_LINEAR;
+   texUnit->GenModeR = GL_EYE_LINEAR;
+   texUnit->GenModeQ = GL_EYE_LINEAR;
+   texUnit->_GenBitS = TEXGEN_EYE_LINEAR;
+   texUnit->_GenBitT = TEXGEN_EYE_LINEAR;
+   texUnit->_GenBitR = TEXGEN_EYE_LINEAR;
+   texUnit->_GenBitQ = TEXGEN_EYE_LINEAR;
+
+   /* Yes, these plane coefficients are correct! */
+   ASSIGN_4V( texUnit->ObjectPlaneS, 1.0, 0.0, 0.0, 0.0 );
+   ASSIGN_4V( texUnit->ObjectPlaneT, 0.0, 1.0, 0.0, 0.0 );
+   ASSIGN_4V( texUnit->ObjectPlaneR, 0.0, 0.0, 0.0, 0.0 );
+   ASSIGN_4V( texUnit->ObjectPlaneQ, 0.0, 0.0, 0.0, 0.0 );
+   ASSIGN_4V( texUnit->EyePlaneS, 1.0, 0.0, 0.0, 0.0 );
+   ASSIGN_4V( texUnit->EyePlaneT, 0.0, 1.0, 0.0, 0.0 );
+   ASSIGN_4V( texUnit->EyePlaneR, 0.0, 0.0, 0.0, 0.0 );
+   ASSIGN_4V( texUnit->EyePlaneQ, 0.0, 0.0, 0.0, 0.0 );
+
+   texUnit->Current1D = ctx->Shared->Default1D;
+   texUnit->Current2D = ctx->Shared->Default2D;
+   texUnit->Current3D = ctx->Shared->Default3D;
+   texUnit->CurrentCubeMap = ctx->Shared->DefaultCubeMap;
+   texUnit->CurrentRect = ctx->Shared->DefaultRect;
+}
+
+
+GLboolean _mesa_init_texture( GLcontext * ctx )
+{
+   int i;
+
+   assert(MAX_TEXTURE_LEVELS >= MAX_3D_TEXTURE_LEVELS);
+   assert(MAX_TEXTURE_LEVELS >= MAX_CUBE_TEXTURE_LEVELS);
+
+   /* Effectively bind the default textures to all texture units */
+   ctx->Shared->Default1D->RefCount += MAX_TEXTURE_UNITS;
+   ctx->Shared->Default2D->RefCount += MAX_TEXTURE_UNITS;
+   ctx->Shared->Default3D->RefCount += MAX_TEXTURE_UNITS;
+   ctx->Shared->DefaultCubeMap->RefCount += MAX_TEXTURE_UNITS;
+   ctx->Shared->DefaultRect->RefCount += MAX_TEXTURE_UNITS;
+
+   /* Texture group */
+   ctx->Texture.CurrentUnit = 0;      /* multitexture */
+   ctx->Texture._EnabledUnits = 0;
+   for (i=0; i<MAX_TEXTURE_UNITS; i++)
+      init_texture_unit( ctx, i );
+   ctx->Texture.SharedPalette = GL_FALSE;
+   _mesa_init_colortable(&ctx->Texture.Palette);
+
+   /* Allocate proxy textures */
+   if (!alloc_proxy_textures( ctx ))
+      return GL_FALSE;
+
+   return GL_TRUE;
+}
+
+void _mesa_free_texture_data( GLcontext *ctx )
+{
+   int i;
+
+   /* Free proxy texture objects */
+   (ctx->Driver.DeleteTexture)(ctx,  ctx->Texture.Proxy1D );
+   (ctx->Driver.DeleteTexture)(ctx,  ctx->Texture.Proxy2D );
+   (ctx->Driver.DeleteTexture)(ctx,  ctx->Texture.Proxy3D );
+   (ctx->Driver.DeleteTexture)(ctx,  ctx->Texture.ProxyCubeMap );
+   (ctx->Driver.DeleteTexture)(ctx,  ctx->Texture.ProxyRect );
+
+   for (i = 0; i < MAX_TEXTURE_IMAGE_UNITS; i++)
+      _mesa_free_colortable_data( &ctx->Texture.Unit[i].ColorTable );
+}
diff --git a/reactos/lib/mesa32/src/main/texstate.h b/reactos/lib/mesa32/src/main/texstate.h
new file mode 100644
index 00000000000..7cc3d2c19ce
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/texstate.h
@@ -0,0 +1,192 @@
+/**
+ * \file texstate.h
+ * Texture state management.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef TEXSTATE_H
+#define TEXSTATE_H
+
+
+#include "mtypes.h"
+
+
+extern void
+_mesa_copy_texture_state( const GLcontext *src, GLcontext *dst );
+
+extern void
+_mesa_print_texunit_state( GLcontext *ctx, GLuint unit );
+
+
+/**
+ * \name Called from API
+ */
+/*@{*/
+
+extern void GLAPIENTRY
+_mesa_GetTexEnvfv( GLenum target, GLenum pname, GLfloat *params );
+
+extern void GLAPIENTRY
+_mesa_GetTexEnviv( GLenum target, GLenum pname, GLint *params );
+
+extern void GLAPIENTRY
+_mesa_GetTexGendv( GLenum coord, GLenum pname, GLdouble *params );
+
+extern void GLAPIENTRY
+_mesa_GetTexGenfv( GLenum coord, GLenum pname, GLfloat *params );
+
+extern void GLAPIENTRY
+_mesa_GetTexGeniv( GLenum coord, GLenum pname, GLint *params );
+
+extern void GLAPIENTRY
+_mesa_GetTexLevelParameterfv( GLenum target, GLint level,
+                              GLenum pname, GLfloat *params );
+
+extern void GLAPIENTRY
+_mesa_GetTexLevelParameteriv( GLenum target, GLint level,
+                              GLenum pname, GLint *params );
+
+extern void GLAPIENTRY
+_mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params );
+
+extern void GLAPIENTRY
+_mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params );
+
+
+extern void GLAPIENTRY
+_mesa_TexEnvf( GLenum target, GLenum pname, GLfloat param );
+
+extern void GLAPIENTRY
+_mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param );
+
+extern void GLAPIENTRY
+_mesa_TexEnvi( GLenum target, GLenum pname, GLint param );
+
+extern void GLAPIENTRY
+_mesa_TexEnviv( GLenum target, GLenum pname, const GLint *param );
+
+
+extern void GLAPIENTRY
+_mesa_TexParameterfv( GLenum target, GLenum pname, const GLfloat *params );
+
+extern void GLAPIENTRY
+_mesa_TexParameterf( GLenum target, GLenum pname, GLfloat param );
+
+
+extern void GLAPIENTRY
+_mesa_TexParameteri( GLenum target, GLenum pname, GLint param );
+
+extern void GLAPIENTRY
+_mesa_TexParameteriv( GLenum target, GLenum pname, const GLint *params );
+
+
+extern void GLAPIENTRY
+_mesa_TexGend( GLenum coord, GLenum pname, GLdouble param );
+
+extern void GLAPIENTRY
+_mesa_TexGendv( GLenum coord, GLenum pname, const GLdouble *params );
+
+extern void GLAPIENTRY
+_mesa_TexGenf( GLenum coord, GLenum pname, GLfloat param );
+
+extern void GLAPIENTRY
+_mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params );
+
+extern void GLAPIENTRY
+_mesa_TexGeni( GLenum coord, GLenum pname, GLint param );
+
+extern void GLAPIENTRY
+_mesa_TexGeniv( GLenum coord, GLenum pname, const GLint *params );
+
+
+/*
+ * GL_ARB_multitexture
+ */
+extern void GLAPIENTRY
+_mesa_ActiveTextureARB( GLenum target );
+
+extern void GLAPIENTRY
+_mesa_ClientActiveTextureARB( GLenum target );
+
+
+/*
+ * Pixel Texture Extensions
+ */
+
+extern void GLAPIENTRY
+_mesa_PixelTexGenSGIX(GLenum mode);
+
+extern void GLAPIENTRY
+_mesa_PixelTexGenParameterfSGIS(GLenum target, GLfloat value);
+
+#ifdef VMS
+#define _mesa_PixelTexGenParameterfvSGIS _mesa_PixelTexGenParameterfv
+#endif
+extern void GLAPIENTRY
+_mesa_PixelTexGenParameterfvSGIS(GLenum target, const GLfloat *value);
+
+extern void GLAPIENTRY
+_mesa_PixelTexGenParameteriSGIS(GLenum target, GLint value);
+
+#ifdef VMS
+#define _mesa_PixelTexGenParameterivSGIS _mesa_PixelTexGenParameteriv
+#endif
+extern void GLAPIENTRY
+_mesa_PixelTexGenParameterivSGIS(GLenum target, const GLint *value);
+
+#ifdef VMS
+#define _mesa_GetPixelTexGenParameterfvSGIS _mesa_GetPixelTexGenParameterfv
+#endif
+extern void GLAPIENTRY
+_mesa_GetPixelTexGenParameterfvSGIS(GLenum target, GLfloat *value);
+
+#ifdef VMS
+#define _mesa_GetPixelTexGenParameterivSGIS _mesa_GetPixelTexGenParameteriv
+#endif
+extern void GLAPIENTRY
+_mesa_GetPixelTexGenParameterivSGIS(GLenum target, GLint *value);
+
+/*@}*/
+
+
+/**
+ * \name Initialization, state maintenance
+ */
+/*@{*/
+
+extern void 
+_mesa_update_texture( GLcontext *ctx, GLuint new_state );
+
+extern GLboolean
+_mesa_init_texture( GLcontext *ctx );
+
+extern void 
+_mesa_free_texture_data( GLcontext *ctx );
+
+/*@}*/
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/texstore.c b/reactos/lib/mesa32/src/main/texstore.c
new file mode 100644
index 00000000000..899201e6c4a
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/texstore.c
@@ -0,0 +1,2083 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * Authors:
+ *   Brian Paul
+ */
+
+/*
+ * The GL texture image functions in teximage.c basically just do
+ * error checking and data structure allocation.  They in turn call
+ * device driver functions which actually copy/convert/store the user's
+ * texture image data.
+ *
+ * However, most device drivers will be able to use the fallback functions
+ * in this file.  That is, most drivers will have the following bit of
+ * code:
+ *   ctx->Driver.TexImage1D = _mesa_store_teximage1d;
+ *   ctx->Driver.TexImage2D = _mesa_store_teximage2d;
+ *   ctx->Driver.TexImage3D = _mesa_store_teximage3d;
+ *   etc...
+ *
+ * Texture image processing is actually kind of complicated.  We have to do:
+ *    Format/type conversions
+ *    pixel unpacking
+ *    pixel transfer (scale, bais, lookup, convolution!, etc)
+ *
+ * These functions can handle most everything, including processing full
+ * images and sub-images.
+ */
+
+
+#include "glheader.h"
+#include "colormac.h"
+#include "context.h"
+#include "convolve.h"
+#include "image.h"
+#include "macros.h"
+#include "imports.h"
+#include "texcompress.h"
+#include "texformat.h"
+#include "teximage.h"
+#include "texstore.h"
+#include "texutil.h"
+
+
+/*
+ * Given an internal texture format enum or 1, 2, 3, 4 return the
+ * corresponding _base_ internal format:  GL_ALPHA, GL_LUMINANCE,
+ * GL_LUMANCE_ALPHA, GL_INTENSITY, GL_RGB, or GL_RGBA.  Return the
+ * number of components for the format.  Return -1 if invalid enum.
+ */
+static GLint
+components_in_intformat( GLint format )
+{
+   switch (format) {
+      case GL_ALPHA:
+      case GL_ALPHA4:
+      case GL_ALPHA8:
+      case GL_ALPHA12:
+      case GL_ALPHA16:
+         return 1;
+      case 1:
+      case GL_LUMINANCE:
+      case GL_LUMINANCE4:
+      case GL_LUMINANCE8:
+      case GL_LUMINANCE12:
+      case GL_LUMINANCE16:
+         return 1;
+      case 2:
+      case GL_LUMINANCE_ALPHA:
+      case GL_LUMINANCE4_ALPHA4:
+      case GL_LUMINANCE6_ALPHA2:
+      case GL_LUMINANCE8_ALPHA8:
+      case GL_LUMINANCE12_ALPHA4:
+      case GL_LUMINANCE12_ALPHA12:
+      case GL_LUMINANCE16_ALPHA16:
+         return 2;
+      case GL_INTENSITY:
+      case GL_INTENSITY4:
+      case GL_INTENSITY8:
+      case GL_INTENSITY12:
+      case GL_INTENSITY16:
+         return 1;
+      case 3:
+      case GL_RGB:
+      case GL_R3_G3_B2:
+      case GL_RGB4:
+      case GL_RGB5:
+      case GL_RGB8:
+      case GL_RGB10:
+      case GL_RGB12:
+      case GL_RGB16:
+         return 3;
+      case 4:
+      case GL_RGBA:
+      case GL_RGBA2:
+      case GL_RGBA4:
+      case GL_RGB5_A1:
+      case GL_RGBA8:
+      case GL_RGB10_A2:
+      case GL_RGBA12:
+      case GL_RGBA16:
+         return 4;
+      case GL_COLOR_INDEX:
+      case GL_COLOR_INDEX1_EXT:
+      case GL_COLOR_INDEX2_EXT:
+      case GL_COLOR_INDEX4_EXT:
+      case GL_COLOR_INDEX8_EXT:
+      case GL_COLOR_INDEX12_EXT:
+      case GL_COLOR_INDEX16_EXT:
+         return 1;
+      case GL_DEPTH_COMPONENT:
+      case GL_DEPTH_COMPONENT16_SGIX:
+      case GL_DEPTH_COMPONENT24_SGIX:
+      case GL_DEPTH_COMPONENT32_SGIX:
+         return 1;
+      case GL_YCBCR_MESA:
+         return 2; /* Y + (Cb or Cr) */
+      default:
+         return -1;  /* error */
+   }
+}
+
+
+/*
+ * This function is used to transfer the user's image data into a texture
+ * image buffer.  We handle both full texture images and subtexture images.
+ * We also take care of all image transfer operations here, including
+ * convolution, scale/bias, colortables, etc.
+ *
+ * The destination texel type is always GLchan.
+ * The destination texel format is one of the 6 basic types.
+ *
+ * A hardware driver may use this as a helper routine to unpack and
+ * apply pixel transfer ops into a temporary image buffer.  Then,
+ * convert the temporary image into the special hardware format.
+ *
+ * \param
+ *   dimensions - 1, 2, or 3
+ *   texDestFormat - GL_LUMINANCE, GL_INTENSITY, GL_LUMINANCE_ALPHA, GL_ALPHA,
+ *                   GL_RGB or GL_RGBA (the destination format)
+ *   texDestAddr - destination image address
+ *   srcWidth, srcHeight, srcDepth - size (in pixels) of src and dest images
+ *   dstXoffset, dstYoffset, dstZoffset - position to store the image within
+ *      the destination 3D texture
+ *   dstRowStride, dstImageStride - dest image strides in bytes
+ *   srcFormat - source image format (GL_ALPHA, GL_RED, GL_RGB, etc)
+ *   srcType - GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT_5_6_5, GL_FLOAT, etc
+ *   srcPacking - describes packing of incoming image.
+ *   transferOps - mask of pixel transfer operations
+ */
+static void
+transfer_teximage(GLcontext *ctx, GLuint dimensions,
+                  GLenum texDestFormat, GLvoid *texDestAddr,
+                  GLint srcWidth, GLint srcHeight, GLint srcDepth,
+                  GLint dstXoffset, GLint dstYoffset, GLint dstZoffset,
+                  GLint dstRowStride, GLint dstImageStride,
+                  GLenum srcFormat, GLenum srcType,
+                  const GLvoid *srcAddr,
+                  const struct gl_pixelstore_attrib *srcPacking,
+                  GLuint transferOps)
+{
+   GLint texComponents;
+
+   ASSERT(ctx);
+   ASSERT(dimensions >= 1 && dimensions <= 3);
+   ASSERT(texDestFormat == GL_LUMINANCE ||
+          texDestFormat == GL_INTENSITY ||
+          texDestFormat == GL_LUMINANCE_ALPHA ||
+          texDestFormat == GL_ALPHA ||
+          texDestFormat == GL_RGB ||
+          texDestFormat == GL_RGBA ||
+          texDestFormat == GL_COLOR_INDEX ||
+          texDestFormat == GL_DEPTH_COMPONENT);
+   ASSERT(texDestAddr);
+   ASSERT(srcWidth >= 0);
+   ASSERT(srcHeight >= 0);
+   ASSERT(srcDepth >= 0);
+   ASSERT(dstXoffset >= 0);
+   ASSERT(dstYoffset >= 0);
+   ASSERT(dstZoffset >= 0);
+   ASSERT(dstRowStride >= 0);
+   ASSERT(dstImageStride >= 0);
+   ASSERT(srcAddr);
+   ASSERT(srcPacking);
+
+   texComponents = components_in_intformat(texDestFormat);
+
+   /* try common 2D texture cases first */
+   if (!transferOps && dimensions == 2 && srcType == CHAN_TYPE) {
+
+      if (srcFormat == texDestFormat) {
+         /* This will cover the common GL_RGB, GL_RGBA, GL_ALPHA,
+          * GL_LUMINANCE_ALPHA, etc. texture formats.  Use memcpy().
+          */
+         const GLchan *src = (const GLchan *) _mesa_image_address(
+                                   srcPacking, srcAddr, srcWidth, srcHeight,
+                                   srcFormat, srcType, 0, 0, 0);
+         const GLint srcRowStride = _mesa_image_row_stride(srcPacking,
+                                               srcWidth, srcFormat, srcType);
+         const GLint widthInBytes = srcWidth * texComponents * sizeof(GLchan);
+         GLchan *dst = (GLchan *) texDestAddr
+                     + dstYoffset * (dstRowStride / sizeof(GLchan))
+                     + dstXoffset * texComponents;
+         if (srcRowStride == widthInBytes && dstRowStride == widthInBytes) {
+            MEMCPY(dst, src, srcHeight * widthInBytes);
+         }
+         else {
+            GLint i;
+            for (i = 0; i < srcHeight; i++) {
+               MEMCPY(dst, src, widthInBytes);
+               src += (srcRowStride / sizeof(GLchan));
+               dst += (dstRowStride / sizeof(GLchan));
+            }
+         }
+         return;  /* all done */
+      }
+      else if (srcFormat == GL_RGBA && texDestFormat == GL_RGB) {
+         /* commonly used by Quake */
+         const GLchan *src = (const GLchan *) _mesa_image_address(
+                                   srcPacking, srcAddr, srcWidth, srcHeight,
+                                   srcFormat, srcType, 0, 0, 0);
+         const GLint srcRowStride = _mesa_image_row_stride(srcPacking,
+                                               srcWidth, srcFormat, srcType);
+         GLchan *dst = (GLchan *) texDestAddr
+                     + dstYoffset * (dstRowStride / sizeof(GLchan))
+                     + dstXoffset * texComponents;
+         GLint i, j;
+         for (i = 0; i < srcHeight; i++) {
+            const GLchan *s = src;
+            GLchan *d = dst;
+            for (j = 0; j < srcWidth; j++) {
+               *d++ = *s++;  /*red*/
+               *d++ = *s++;  /*green*/
+               *d++ = *s++;  /*blue*/
+               s++;          /*alpha*/
+            }
+            src += (srcRowStride / sizeof(GLchan));
+            dst += (dstRowStride / sizeof(GLchan));
+         }
+         return;  /* all done */
+      }
+   }
+
+   /*
+    * General case solutions
+    */
+   if (texDestFormat == GL_COLOR_INDEX) {
+      /* color index texture */
+      const GLenum texType = CHAN_TYPE;
+      GLint img, row;
+      GLchan *dest = (GLchan *) texDestAddr
+                   + dstZoffset * (dstImageStride / sizeof(GLchan))
+                   + dstYoffset * (dstRowStride / sizeof(GLchan))
+                   + dstXoffset * texComponents;
+      for (img = 0; img < srcDepth; img++) {
+         GLchan *destRow = dest;
+         for (row = 0; row < srcHeight; row++) {
+            const GLvoid *src = _mesa_image_address(srcPacking,
+                srcAddr, srcWidth, srcHeight, srcFormat, srcType, img, row, 0);
+            _mesa_unpack_index_span(ctx, srcWidth, texType, destRow,
+                                    srcType, src, srcPacking, transferOps);
+            destRow += (dstRowStride / sizeof(GLchan));
+         }
+         dest += dstImageStride;
+      }
+   }
+   else if (texDestFormat == GL_YCBCR_MESA) {
+      /* YCbCr texture */
+      GLint img, row;
+      GLushort *dest = (GLushort *) texDestAddr
+                     + dstZoffset * (dstImageStride / sizeof(GLushort))
+                     + dstYoffset * (dstRowStride / sizeof(GLushort))
+                     + dstXoffset * texComponents;
+      ASSERT(ctx->Extensions.MESA_ycbcr_texture);
+      for (img = 0; img < srcDepth; img++) {
+         GLushort *destRow = dest;
+         for (row = 0; row < srcHeight; row++) {
+            const GLvoid *srcRow = _mesa_image_address(srcPacking,
+                                          srcAddr, srcWidth, srcHeight,
+                                          srcFormat, srcType, img, row, 0);
+            MEMCPY(destRow, srcRow, srcWidth * sizeof(GLushort));
+            destRow += (dstRowStride / sizeof(GLushort));
+         }
+         dest += dstImageStride / sizeof(GLushort);
+      }
+   }
+   else if (texDestFormat == GL_DEPTH_COMPONENT) {
+      /* Depth texture (shadow maps) */
+      GLint img, row;
+      GLubyte *dest = (GLubyte *) texDestAddr
+                    + dstZoffset * dstImageStride
+                    + dstYoffset * (dstRowStride / sizeof(GLchan))
+                    + dstXoffset * texComponents;
+      for (img = 0; img < srcDepth; img++) {
+         GLubyte *destRow = dest;
+         for (row = 0; row < srcHeight; row++) {
+            const GLvoid *src = _mesa_image_address(srcPacking,
+                srcAddr, srcWidth, srcHeight, srcFormat, srcType, img, row, 0);
+            _mesa_unpack_depth_span(ctx, srcWidth, (GLfloat *) destRow,
+                                    srcType, src, srcPacking);
+            destRow += (dstRowStride / sizeof(GLchan));
+         }
+         dest += dstImageStride;
+      }
+   }
+   else {
+      /* regular, color texture */
+      if ((dimensions == 1 && ctx->Pixel.Convolution1DEnabled) ||
+          (dimensions >= 2 && ctx->Pixel.Convolution2DEnabled) ||
+          (dimensions >= 2 && ctx->Pixel.Separable2DEnabled)) {
+         /*
+          * Fill texture image with convolution
+          */
+         GLint img, row;
+         GLint convWidth = srcWidth, convHeight = srcHeight;
+         GLfloat *tmpImage, *convImage;
+         tmpImage = (GLfloat *) MALLOC(srcWidth * srcHeight * 4 * sizeof(GLfloat));
+         if (!tmpImage) {
+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage");
+            return;
+         }
+         convImage = (GLfloat *) MALLOC(srcWidth * srcHeight * 4 * sizeof(GLfloat));
+         if (!convImage) {
+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage");
+            FREE(tmpImage);
+            return;
+         }
+
+         for (img = 0; img < srcDepth; img++) {
+            const GLfloat *srcf;
+            GLfloat *dstf = tmpImage;
+            GLchan *dest;
+
+            /* unpack and do transfer ops up to convolution */
+            for (row = 0; row < srcHeight; row++) {
+               const GLvoid *src = _mesa_image_address(srcPacking,
+                                              srcAddr, srcWidth, srcHeight,
+                                              srcFormat, srcType, img, row, 0);
+               _mesa_unpack_float_color_span(ctx, srcWidth, GL_RGBA, dstf,
+                         srcFormat, srcType, src, srcPacking,
+                         transferOps & IMAGE_PRE_CONVOLUTION_BITS,
+                         GL_TRUE);
+               dstf += srcWidth * 4;
+            }
+
+            /* convolve */
+            if (dimensions == 1) {
+               ASSERT(ctx->Pixel.Convolution1DEnabled);
+               _mesa_convolve_1d_image(ctx, &convWidth, tmpImage, convImage);
+            }
+            else {
+               if (ctx->Pixel.Convolution2DEnabled) {
+                  _mesa_convolve_2d_image(ctx, &convWidth, &convHeight,
+                                          tmpImage, convImage);
+               }
+               else {
+                  ASSERT(ctx->Pixel.Separable2DEnabled);
+                  _mesa_convolve_sep_image(ctx, &convWidth, &convHeight,
+                                           tmpImage, convImage);
+               }
+            }
+
+            /* packing and transfer ops after convolution */
+            srcf = convImage;
+            dest = (GLchan *) texDestAddr
+                 + (dstZoffset + img) * (dstImageStride / sizeof(GLchan))
+                 + dstYoffset * (dstRowStride / sizeof(GLchan));
+            for (row = 0; row < convHeight; row++) {
+               _mesa_pack_float_rgba_span(ctx, convWidth,
+                                          (const GLfloat (*)[4]) srcf,
+                                          texDestFormat, CHAN_TYPE,
+                                          dest, &_mesa_native_packing,
+                                          transferOps
+                                          & IMAGE_POST_CONVOLUTION_BITS);
+               srcf += convWidth * 4;
+               dest += (dstRowStride / sizeof(GLchan));
+            }
+         }
+
+         FREE(convImage);
+         FREE(tmpImage);
+      }
+      else {
+         /*
+          * no convolution
+          */
+         GLint img, row;
+         GLchan *dest = (GLchan *) texDestAddr
+                      + dstZoffset * (dstImageStride / sizeof(GLchan))
+                      + dstYoffset * (dstRowStride / sizeof(GLchan))
+                      + dstXoffset * texComponents;
+         for (img = 0; img < srcDepth; img++) {
+            GLchan *destRow = dest;
+            for (row = 0; row < srcHeight; row++) {
+               const GLvoid *srcRow = _mesa_image_address(srcPacking,
+                                              srcAddr, srcWidth, srcHeight,
+                                              srcFormat, srcType, img, row, 0);
+               _mesa_unpack_chan_color_span(ctx, srcWidth, texDestFormat,
+                                       destRow, srcFormat, srcType, srcRow,
+                                       srcPacking, transferOps);
+               destRow += (dstRowStride / sizeof(GLchan));
+            }
+            dest += dstImageStride / sizeof(GLchan);
+         }
+      }
+   }
+}
+
+
+
+/*
+ * Transfer a texture image from user space to <destAddr> applying all
+ * needed image transfer operations and storing the result in the format
+ * specified by <dstFormat>.  <dstFormat> may be any format from texformat.h.
+ * \param
+ *   dimensions - 1, 2 or 3
+ *   baseInternalFormat - base format of the internal texture format
+ *       specified by the user.  This is very important, see below.
+ *   dstFormat - destination image format
+ *   dstAddr - destination address
+ *   srcWidth, srcHeight, srcDepth - size of source iamge
+ *   dstX/Y/Zoffset - as specified by glTexSubImage
+ *   dstRowStride - stride between dest rows in bytes
+ *   dstImageStride - stride between dest images in bytes
+ *   srcFormat, srcType - incoming image format and data type
+ *   srcAddr - source image address
+ *   srcPacking - packing params of source image
+ *
+ * XXX this function is a bit more complicated than it should be.  If
+ * _mesa_convert_texsubimage[123]d could handle any dest/source formats
+ * or if transfer_teximage() could store in any MESA_FORMAT_* format, we
+ * could simplify things here.
+ */
+void
+_mesa_transfer_teximage(GLcontext *ctx, GLuint dimensions,
+                        GLenum baseInternalFormat,
+                        const struct gl_texture_format *dstFormat,
+                        GLvoid *dstAddr,
+                        GLint srcWidth, GLint srcHeight, GLint srcDepth,
+                        GLint dstXoffset, GLint dstYoffset, GLint dstZoffset,
+                        GLint dstRowStride, GLint dstImageStride,
+                        GLenum srcFormat, GLenum srcType,
+                        const GLvoid *srcAddr,
+                        const struct gl_pixelstore_attrib *srcPacking)
+{
+   const GLint dstRowStridePixels = dstRowStride / dstFormat->TexelBytes;
+   const GLint dstImageStridePixels = dstImageStride / dstFormat->TexelBytes;
+   GLboolean makeTemp;
+   GLuint transferOps = ctx->_ImageTransferState;
+   GLboolean freeSourceData = GL_FALSE;
+   GLint postConvWidth = srcWidth, postConvHeight = srcHeight;
+
+   assert(baseInternalFormat > 0);
+   ASSERT(baseInternalFormat == GL_LUMINANCE ||
+          baseInternalFormat == GL_INTENSITY ||
+          baseInternalFormat == GL_LUMINANCE_ALPHA ||
+          baseInternalFormat == GL_ALPHA ||
+          baseInternalFormat == GL_RGB ||
+          baseInternalFormat == GL_RGBA ||
+          baseInternalFormat == GL_YCBCR_MESA ||
+          baseInternalFormat == GL_COLOR_INDEX ||
+          baseInternalFormat == GL_DEPTH_COMPONENT);
+
+   if (transferOps & IMAGE_CONVOLUTION_BIT) {
+      _mesa_adjust_image_for_convolution(ctx, dimensions, &postConvWidth,
+                                         &postConvHeight);
+   }
+
+   /*
+    * Consider this scenario:  The user's source image is GL_RGB and the
+    * requested internal format is GL_LUMINANCE.  Now suppose the device
+    * driver doesn't support GL_LUMINANCE and instead uses RGB16 as the
+    * texture format.  In that case we still need to do an intermediate
+    * conversion to luminance format so that the incoming red channel gets
+    * replicated into the dest red, green and blue channels.  The following
+    * code takes care of that.
+    */
+   if (dstFormat->BaseFormat != baseInternalFormat) {
+      /* Allocate storage for temporary image in the baseInternalFormat */
+      const GLint texelSize = _mesa_components_in_format(baseInternalFormat)
+         * sizeof(GLchan);
+      const GLint bytes = texelSize * postConvWidth * postConvHeight *srcDepth;
+      const GLint tmpRowStride = texelSize * postConvWidth;
+      const GLint tmpImgStride = texelSize * postConvWidth * postConvHeight;
+      GLvoid *tmpImage = MALLOC(bytes);
+      if (!tmpImage)
+         return;
+      transfer_teximage(ctx, dimensions, baseInternalFormat, tmpImage,
+                        srcWidth, srcHeight, srcDepth,
+                        0, 0, 0, /* x/y/zoffset */
+                        tmpRowStride, tmpImgStride,
+                        srcFormat, srcType, srcAddr, srcPacking, transferOps);
+
+      /* this is our new source image */
+      srcWidth = postConvWidth;
+      srcHeight = postConvHeight;
+      srcFormat = baseInternalFormat;
+      srcType = CHAN_TYPE;
+      srcAddr = tmpImage;
+      srcPacking = &_mesa_native_packing;
+      freeSourceData = GL_TRUE;
+      transferOps = 0;  /* image transfer ops were completed */
+   }
+
+   /* Let the optimized tex conversion functions take a crack at the
+    * image conversion if the dest format is a h/w format.
+    */
+   if (_mesa_is_hardware_tex_format(dstFormat)) {
+      if (transferOps) {
+         makeTemp = GL_TRUE;
+      }
+      else {
+         if (dimensions == 1) {
+            makeTemp = !_mesa_convert_texsubimage1d(dstFormat->MesaFormat,
+                                                    dstXoffset,
+                                                    srcWidth,
+                                                    srcFormat, srcType,
+                                                    srcPacking, srcAddr,
+                                                    dstAddr);
+         }
+         else if (dimensions == 2) {
+            makeTemp = !_mesa_convert_texsubimage2d(dstFormat->MesaFormat,
+                                                    dstXoffset, dstYoffset,
+                                                    srcWidth, srcHeight,
+                                                    dstRowStridePixels,
+                                                    srcFormat, srcType,
+                                                    srcPacking, srcAddr,
+                                                    dstAddr);
+         }
+         else {
+            assert(dimensions == 3);
+            makeTemp = !_mesa_convert_texsubimage3d(dstFormat->MesaFormat,
+                                      dstXoffset, dstYoffset, dstZoffset,
+                                      srcWidth, srcHeight, srcDepth,
+                                      dstRowStridePixels, dstImageStridePixels,
+                                      srcFormat, srcType,
+                                      srcPacking, srcAddr, dstAddr);
+         }
+         if (!makeTemp) {
+            /* all done! */
+            if (freeSourceData)
+               FREE((void *) srcAddr);
+            return;
+         }
+      }
+   }
+   else {
+      /* software texture format */
+      makeTemp = GL_FALSE;
+   }
+
+   if (makeTemp) {
+      GLint postConvWidth = srcWidth, postConvHeight = srcHeight;
+      GLenum tmpFormat;
+      GLuint tmpComps, tmpTexelSize;
+      GLint tmpRowStride, tmpImageStride;
+      GLubyte *tmpImage;
+
+      if (transferOps & IMAGE_CONVOLUTION_BIT) {
+         _mesa_adjust_image_for_convolution(ctx, dimensions, &postConvWidth,
+                                            &postConvHeight);
+      }
+
+      tmpFormat = dstFormat->BaseFormat;
+      tmpComps = _mesa_components_in_format(tmpFormat);
+      tmpTexelSize = tmpComps * sizeof(GLchan);
+      tmpRowStride = postConvWidth * tmpTexelSize;
+      tmpImageStride = postConvWidth * postConvHeight * tmpTexelSize;
+      tmpImage = (GLubyte *) MALLOC(postConvWidth * postConvHeight *
+                                    srcDepth * tmpTexelSize);
+      if (!tmpImage) {
+         if (freeSourceData)
+            FREE((void *) srcAddr);
+         return;
+      }
+
+      transfer_teximage(ctx, dimensions, tmpFormat, tmpImage,
+                        srcWidth, srcHeight, srcDepth,
+                        0, 0, 0, /* x/y/zoffset */
+                        tmpRowStride, tmpImageStride,
+                        srcFormat, srcType, srcAddr, srcPacking, transferOps);
+
+      if (freeSourceData)
+         FREE((void *) srcAddr);
+
+      /* the temp image is our new source image */
+      srcWidth = postConvWidth;
+      srcHeight = postConvHeight;
+      srcFormat = tmpFormat;
+      srcType = CHAN_TYPE;
+      srcAddr = tmpImage;
+      srcPacking = &_mesa_native_packing;
+      freeSourceData = GL_TRUE;
+   }
+
+   if (_mesa_is_hardware_tex_format(dstFormat)) {
+      assert(makeTemp);
+      if (dimensions == 1) {
+         GLboolean b;
+         b = _mesa_convert_texsubimage1d(dstFormat->MesaFormat,
+                                         dstXoffset,
+                                         srcWidth,
+                                         srcFormat, srcType,
+                                         srcPacking, srcAddr,
+                                         dstAddr);
+         assert(b);
+         (void) b;
+      }
+      else if (dimensions == 2) {
+         GLboolean b;
+         b = _mesa_convert_texsubimage2d(dstFormat->MesaFormat,
+                                         dstXoffset, dstYoffset,
+                                         srcWidth, srcHeight,
+                                         dstRowStridePixels,
+                                         srcFormat, srcType,
+                                         srcPacking, srcAddr,
+                                         dstAddr);
+         assert(b);
+         (void) b;
+      }
+      else {
+         GLboolean b;
+         b = _mesa_convert_texsubimage3d(dstFormat->MesaFormat,
+                                      dstXoffset, dstYoffset, dstZoffset,
+                                      srcWidth, srcHeight, srcDepth,
+                                      dstRowStridePixels, dstImageStridePixels,
+                                      srcFormat, srcType,
+                                      srcPacking, srcAddr, dstAddr);
+         assert(b);
+         (void) b;
+      }
+   }
+   else {
+      /* software format */
+      assert(!makeTemp);
+      transfer_teximage(ctx, dimensions, dstFormat->BaseFormat, dstAddr,
+                        srcWidth, srcHeight, srcDepth,
+                        dstXoffset, dstYoffset, dstZoffset,
+                        dstRowStride, dstImageStride,
+                        srcFormat, srcType, srcAddr, srcPacking, transferOps);
+   }
+
+   if (freeSourceData)
+      FREE((void *) srcAddr);  /* the temp image */
+}
+
+
+
+/**
+ * Given a user's uncompressed texture image, this function takes care of
+ * pixel unpacking, pixel transfer, format conversion and compression.
+ */
+static void
+transfer_compressed_teximage(GLcontext *ctx, GLuint dimensions,
+                             GLsizei width, GLsizei height, GLsizei depth,
+                             GLenum srcFormat, GLenum srcType,
+                             const struct gl_pixelstore_attrib *unpacking,
+                             const GLvoid *source,
+                             const struct gl_texture_format *dstFormat,
+                             GLubyte *dest,
+                             GLint dstRowStride)
+{
+   GLchan *tempImage = NULL;
+   GLint srcRowStride;
+   GLenum baseFormat;
+
+   ASSERT(dimensions == 2);
+   /* TexelBytes is zero if and only if it's a compressed format */
+   ASSERT(dstFormat->TexelBytes == 0);
+
+   baseFormat = dstFormat->BaseFormat;
+
+   if (srcFormat != baseFormat || srcType != CHAN_TYPE ||
+       ctx->_ImageTransferState != 0 || unpacking->SwapBytes) {
+      /* need to convert user's image to texImage->Format, GLchan */
+      GLint comps = components_in_intformat(baseFormat);
+      GLint postConvWidth = width, postConvHeight = height;
+
+      /* XXX convolution untested */
+      if (ctx->_ImageTransferState & IMAGE_CONVOLUTION_BIT) {
+         _mesa_adjust_image_for_convolution(ctx, dimensions, &postConvWidth,
+                                            &postConvHeight);
+      }
+
+      tempImage = (GLchan*) MALLOC(width * height * comps * sizeof(GLchan));
+      if (!tempImage) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage2D");
+         return;
+      }
+      transfer_teximage(ctx, dimensions,
+                        baseFormat,             /* dest format */
+                        tempImage,              /* dst address */
+                        width, height, depth,   /* src size */
+                        0, 0, 0,                /* x/y/zoffset */
+                        comps * width,          /* dst row stride */
+                        comps * width * height, /* dst image stride */
+                        srcFormat, srcType,     /* src format, type */
+                        source, unpacking,      /* src and src packing */
+                        ctx->_ImageTransferState);
+      source = tempImage;
+      width = postConvWidth;
+      height = postConvHeight;
+      srcRowStride = width;
+   }
+   else {
+      if (unpacking->RowLength)
+         srcRowStride = unpacking->RowLength;
+      else
+         srcRowStride = width;
+   }
+
+   _mesa_compress_teximage(ctx, width, height, baseFormat,
+                           (const GLchan *) source, srcRowStride,
+                           dstFormat, dest, dstRowStride);
+   if (tempImage) {
+      FREE(tempImage);
+   }
+}
+
+
+
+/*
+ * This is the software fallback for Driver.TexImage1D()
+ * and Driver.CopyTexImage2D().
+ * The texture image type will be GLchan.
+ * The texture image format will be GL_COLOR_INDEX, GL_INTENSITY,
+ * GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_ALPHA, GL_RGB or GL_RGBA.
+ */
+void
+_mesa_store_teximage1d(GLcontext *ctx, GLenum target, GLint level,
+                       GLint internalFormat,
+                       GLint width, GLint border,
+                       GLenum format, GLenum type, const GLvoid *pixels,
+                       const struct gl_pixelstore_attrib *packing,
+                       struct gl_texture_object *texObj,
+                       struct gl_texture_image *texImage)
+{
+   GLint postConvWidth = width;
+   GLint texelBytes, sizeInBytes;
+
+   if (ctx->_ImageTransferState & IMAGE_CONVOLUTION_BIT) {
+      _mesa_adjust_image_for_convolution(ctx, 1, &postConvWidth, NULL);
+   }
+
+   /* choose the texture format */
+   assert(ctx->Driver.ChooseTextureFormat);
+   texImage->TexFormat = (*ctx->Driver.ChooseTextureFormat)(ctx,
+                                          internalFormat, format, type);
+   assert(texImage->TexFormat);
+   texImage->FetchTexel = texImage->TexFormat->FetchTexel1D;
+
+   texelBytes = texImage->TexFormat->TexelBytes;
+
+   /* allocate memory */
+   if (texImage->IsCompressed)
+      sizeInBytes = texImage->CompressedSize;
+   else
+      sizeInBytes = postConvWidth * texelBytes;
+   texImage->Data = MESA_PBUFFER_ALLOC(sizeInBytes);
+   if (!texImage->Data) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage1D");
+      return;
+   }
+
+   if (!pixels)
+      return;
+
+   /* unpack image, apply transfer ops and store in texImage->Data */
+   if (texImage->IsCompressed) {
+      GLint dstRowStride = _mesa_compressed_row_stride(texImage->IntFormat,
+                                                       width);
+      transfer_compressed_teximage(ctx, 1, width, 1, 1,
+                                   format, type, packing,
+                                   pixels, texImage->TexFormat,
+                                   (GLubyte *) texImage->Data, dstRowStride);
+   }
+   else {
+      _mesa_transfer_teximage(ctx, 1,
+                              texImage->Format, /* base format */
+                              texImage->TexFormat, texImage->Data,
+                              width, 1, 1,  /* src size */
+                              0, 0, 0,      /* dstX/Y/Zoffset */
+                              0, /* dstRowStride */
+                              0, /* dstImageStride */
+                              format, type, pixels, packing);
+   }
+
+   /* GL_SGIS_generate_mipmap */
+   if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
+      _mesa_generate_mipmap(ctx, target,
+                            &ctx->Texture.Unit[ctx->Texture.CurrentUnit],
+                            texObj);
+   }
+}
+
+
+/*
+ * This is the software fallback for Driver.TexImage2D()
+ * and Driver.CopyTexImage2D().
+ * The texture image type will be GLchan.
+ * The texture image format will be GL_COLOR_INDEX, GL_INTENSITY,
+ * GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_ALPHA, GL_RGB or GL_RGBA.
+ */
+void
+_mesa_store_teximage2d(GLcontext *ctx, GLenum target, GLint level,
+                       GLint internalFormat,
+                       GLint width, GLint height, GLint border,
+                       GLenum format, GLenum type, const void *pixels,
+                       const struct gl_pixelstore_attrib *packing,
+                       struct gl_texture_object *texObj,
+                       struct gl_texture_image *texImage)
+{
+   GLint postConvWidth = width, postConvHeight = height;
+   GLint texelBytes, sizeInBytes;
+
+   if (ctx->_ImageTransferState & IMAGE_CONVOLUTION_BIT) {
+      _mesa_adjust_image_for_convolution(ctx, 2, &postConvWidth,
+                                         &postConvHeight);
+   }
+
+   /* choose the texture format */
+   assert(ctx->Driver.ChooseTextureFormat);
+   texImage->TexFormat = (*ctx->Driver.ChooseTextureFormat)(ctx,
+                                          internalFormat, format, type);
+   assert(texImage->TexFormat);
+   texImage->FetchTexel = texImage->TexFormat->FetchTexel2D;
+
+   texelBytes = texImage->TexFormat->TexelBytes;
+
+   /* allocate memory */
+   if (texImage->IsCompressed)
+      sizeInBytes = texImage->CompressedSize;
+   else
+      sizeInBytes = postConvWidth * postConvHeight * texelBytes;
+   texImage->Data = MESA_PBUFFER_ALLOC(sizeInBytes);
+   if (!texImage->Data) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage2D");
+      return;
+   }
+
+   if (!pixels)
+      return;
+
+   /* unpack image, apply transfer ops and store in texImage->Data */
+   if (texImage->IsCompressed) {
+      GLint dstRowStride = _mesa_compressed_row_stride(texImage->IntFormat,
+                                                       width);
+      transfer_compressed_teximage(ctx, 2, width, height, 1,
+                                   format, type, packing,
+                                   pixels, texImage->TexFormat,
+                                   (GLubyte *) texImage->Data, dstRowStride);
+   }
+   else {
+      _mesa_transfer_teximage(ctx, 2,
+                              texImage->Format,
+                              texImage->TexFormat, texImage->Data,
+                              width, height, 1,  /* src size */
+                              0, 0, 0,           /* dstX/Y/Zoffset */
+                              texImage->Width * texelBytes, /* dstRowStride */
+                              0, /* dstImageStride */
+                              format, type, pixels, packing);
+   }
+
+   /* GL_SGIS_generate_mipmap */
+   if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
+      _mesa_generate_mipmap(ctx, target,
+                            &ctx->Texture.Unit[ctx->Texture.CurrentUnit],
+                            texObj);
+   }
+}
+
+
+
+/*
+ * This is the software fallback for Driver.TexImage3D()
+ * and Driver.CopyTexImage3D().
+ * The texture image type will be GLchan.
+ * The texture image format will be GL_COLOR_INDEX, GL_INTENSITY,
+ * GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_ALPHA, GL_RGB or GL_RGBA.
+ */
+void
+_mesa_store_teximage3d(GLcontext *ctx, GLenum target, GLint level,
+                       GLint internalFormat,
+                       GLint width, GLint height, GLint depth, GLint border,
+                       GLenum format, GLenum type, const void *pixels,
+                       const struct gl_pixelstore_attrib *packing,
+                       struct gl_texture_object *texObj,
+                       struct gl_texture_image *texImage)
+{
+   GLint texelBytes, sizeInBytes;
+
+   /* choose the texture format */
+   assert(ctx->Driver.ChooseTextureFormat);
+   texImage->TexFormat = (*ctx->Driver.ChooseTextureFormat)(ctx,
+                                          internalFormat, format, type);
+   assert(texImage->TexFormat);
+   texImage->FetchTexel = texImage->TexFormat->FetchTexel3D;
+
+   texelBytes = texImage->TexFormat->TexelBytes;
+
+   /* allocate memory */
+   if (texImage->IsCompressed)
+      sizeInBytes = texImage->CompressedSize;
+   else
+      sizeInBytes = width * height * depth * texelBytes;
+   texImage->Data = MESA_PBUFFER_ALLOC(sizeInBytes);
+   if (!texImage->Data) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage3D");
+      return;
+   }
+
+   if (!pixels)
+      return;
+
+   /* unpack image, apply transfer ops and store in texImage->Data */
+   if (texImage->IsCompressed) {
+      GLint dstRowStride = _mesa_compressed_row_stride(texImage->IntFormat,
+                                                       width);
+      transfer_compressed_teximage(ctx, 3, width, height, depth,
+                                   format, type, packing,
+                                   pixels, texImage->TexFormat,
+                                   (GLubyte *) texImage->Data, dstRowStride);
+   }
+   else {
+      _mesa_transfer_teximage(ctx, 3,
+                              texImage->Format,
+                              texImage->TexFormat, texImage->Data,
+                              width, height, depth, /* src size */
+                              0, 0, 0,  /* dstX/Y/Zoffset */
+                              texImage->Width * texelBytes, /* dstRowStride */
+                              texImage->Width * texImage->Height * texelBytes,
+                              format, type, pixels, packing);
+   }
+
+   /* GL_SGIS_generate_mipmap */
+   if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
+      _mesa_generate_mipmap(ctx, target,
+                            &ctx->Texture.Unit[ctx->Texture.CurrentUnit],
+                            texObj);
+   }
+}
+
+
+
+
+/*
+ * This is the software fallback for Driver.TexSubImage1D()
+ * and Driver.CopyTexSubImage1D().
+ */
+void
+_mesa_store_texsubimage1d(GLcontext *ctx, GLenum target, GLint level,
+                          GLint xoffset, GLint width,
+                          GLenum format, GLenum type, const void *pixels,
+                          const struct gl_pixelstore_attrib *packing,
+                          struct gl_texture_object *texObj,
+                          struct gl_texture_image *texImage)
+{
+   if (texImage->IsCompressed) {
+      GLint dstRowStride = _mesa_compressed_row_stride(texImage->IntFormat,
+                                                       texImage->Width);
+      GLubyte *dest = _mesa_compressed_image_address(xoffset, 0, 0,
+                                                     texImage->IntFormat,
+                                                     texImage->Width,
+                                          (GLubyte*) texImage->Data);
+      transfer_compressed_teximage(ctx, 1,             /* dimensions */
+                                   width, 1, 1,        /* size to replace */
+                                   format, type,       /* source format/type */
+                                   packing,            /* source packing */
+                                   pixels,             /* source data */
+                                   texImage->TexFormat,/* dest format */
+                                   dest, dstRowStride);
+   }
+   else {
+      _mesa_transfer_teximage(ctx, 1,
+                              texImage->Format,
+                              texImage->TexFormat, texImage->Data,
+                              width, 1, 1, /* src size */
+                              xoffset, 0, 0, /* dest offsets */
+                              0, /* dstRowStride */
+                              0, /* dstImageStride */
+                              format, type, pixels, packing);
+   }
+
+   /* GL_SGIS_generate_mipmap */
+   if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
+      _mesa_generate_mipmap(ctx, target,
+                            &ctx->Texture.Unit[ctx->Texture.CurrentUnit],
+                            texObj);
+   }
+}
+
+
+
+/*
+ * This is the software fallback for Driver.TexSubImage2D()
+ * and Driver.CopyTexSubImage2D().
+ */
+void
+_mesa_store_texsubimage2d(GLcontext *ctx, GLenum target, GLint level,
+                          GLint xoffset, GLint yoffset,
+                          GLint width, GLint height,
+                          GLenum format, GLenum type, const void *pixels,
+                          const struct gl_pixelstore_attrib *packing,
+                          struct gl_texture_object *texObj,
+                          struct gl_texture_image *texImage)
+{
+   if (texImage->IsCompressed) {
+      GLint dstRowStride = _mesa_compressed_row_stride(texImage->IntFormat,
+                                                       texImage->Width);
+      GLubyte *dest = _mesa_compressed_image_address(xoffset, yoffset, 0,
+                                                     texImage->IntFormat,
+                                                     texImage->Width,
+                                          (GLubyte*) texImage->Data);
+      transfer_compressed_teximage(ctx, 2,             /* dimensions */
+                                   width, height, 1,   /* size to replace */
+                                   format, type,       /* source format/type */
+                                   packing,            /* source packing */
+                                   pixels,             /* source data */
+                                   texImage->TexFormat,/* dest format */
+                                   dest, dstRowStride);
+   }
+   else {
+      _mesa_transfer_teximage(ctx, 2,
+                              texImage->Format,
+                              texImage->TexFormat, texImage->Data,
+                              width, height, 1, /* src size */
+                              xoffset, yoffset, 0, /* dest offsets */
+                              texImage->Width *texImage->TexFormat->TexelBytes,
+                              0, /* dstImageStride */
+                              format, type, pixels, packing);
+   }
+
+   /* GL_SGIS_generate_mipmap */
+   if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
+      _mesa_generate_mipmap(ctx, target,
+                            &ctx->Texture.Unit[ctx->Texture.CurrentUnit],
+                            texObj);
+   }
+}
+
+
+/*
+ * This is the software fallback for Driver.TexSubImage3D().
+ * and Driver.CopyTexSubImage3D().
+ */
+void
+_mesa_store_texsubimage3d(GLcontext *ctx, GLenum target, GLint level,
+                          GLint xoffset, GLint yoffset, GLint zoffset,
+                          GLint width, GLint height, GLint depth,
+                          GLenum format, GLenum type, const void *pixels,
+                          const struct gl_pixelstore_attrib *packing,
+                          struct gl_texture_object *texObj,
+                          struct gl_texture_image *texImage)
+{
+   if (texImage->IsCompressed) {
+      GLint dstRowStride = _mesa_compressed_row_stride(texImage->IntFormat,
+                                                       texImage->Width);
+      GLubyte *dest = _mesa_compressed_image_address(xoffset, yoffset, zoffset,
+                                                     texImage->IntFormat,
+                                                     texImage->Width,
+                                          (GLubyte*) texImage->Data);
+      transfer_compressed_teximage(ctx, 3,              /* dimensions */
+                                   width, height, depth,/* size to replace */
+                                   format, type,       /* source format/type */
+                                   packing,            /* source packing */
+                                   pixels,             /* source data */
+                                   texImage->TexFormat,/* dest format */
+                                   dest, dstRowStride);
+   }
+   else {
+      const GLint texelBytes = texImage->TexFormat->TexelBytes;
+      _mesa_transfer_teximage(ctx, 3,
+                           texImage->Format,
+                           texImage->TexFormat, texImage->Data,
+                           width, height, depth, /* src size */
+                           xoffset, yoffset, zoffset, /* dest offsets */
+                           texImage->Width * texelBytes,  /* dst row stride */
+                           texImage->Width * texImage->Height * texelBytes,
+                           format, type, pixels, packing);
+   }
+
+   /* GL_SGIS_generate_mipmap */
+   if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
+      _mesa_generate_mipmap(ctx, target,
+                            &ctx->Texture.Unit[ctx->Texture.CurrentUnit],
+                            texObj);
+   }
+}
+
+
+
+
+/*
+ * Fallback for Driver.CompressedTexImage1D()
+ */
+void
+_mesa_store_compressed_teximage1d(GLcontext *ctx, GLenum target, GLint level,
+                                  GLint internalFormat,
+                                  GLint width, GLint border,
+                                  GLsizei imageSize, const GLvoid *data,
+                                  struct gl_texture_object *texObj,
+                                  struct gl_texture_image *texImage)
+{
+   /* this space intentionally left blank */
+}
+
+
+
+/*
+ * Fallback for Driver.CompressedTexImage2D()
+ */
+void
+_mesa_store_compressed_teximage2d(GLcontext *ctx, GLenum target, GLint level,
+                                  GLint internalFormat,
+                                  GLint width, GLint height, GLint border,
+                                  GLsizei imageSize, const GLvoid *data,
+                                  struct gl_texture_object *texObj,
+                                  struct gl_texture_image *texImage)
+{
+   /* This is pretty simple, basically just do a memcpy without worrying
+    * about the usual image unpacking or image transfer operations.
+    */
+   ASSERT(texObj);
+   ASSERT(texImage);
+   ASSERT(texImage->Width > 0);
+   ASSERT(texImage->Height > 0);
+   ASSERT(texImage->Depth == 1);
+   ASSERT(texImage->Data == NULL); /* was freed in glCompressedTexImage2DARB */
+
+   /* choose the texture format */
+   assert(ctx->Driver.ChooseTextureFormat);
+   texImage->TexFormat = (*ctx->Driver.ChooseTextureFormat)(ctx,
+                                          internalFormat, 0, 0);
+   assert(texImage->TexFormat);
+   texImage->FetchTexel = texImage->TexFormat->FetchTexel2D;
+
+   /* allocate storage */
+   texImage->Data = MESA_PBUFFER_ALLOC(imageSize);
+   if (!texImage->Data) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage2DARB");
+      return;
+   }
+
+   /* copy the data */
+   ASSERT(texImage->CompressedSize == (GLuint) imageSize);
+   MEMCPY(texImage->Data, data, imageSize);
+}
+
+
+
+/*
+ * Fallback for Driver.CompressedTexImage3D()
+ */
+void
+_mesa_store_compressed_teximage3d(GLcontext *ctx, GLenum target, GLint level,
+                                  GLint internalFormat,
+                                  GLint width, GLint height, GLint depth,
+                                  GLint border,
+                                  GLsizei imageSize, const GLvoid *data,
+                                  struct gl_texture_object *texObj,
+                                  struct gl_texture_image *texImage)
+{
+   /* this space intentionally left blank */
+}
+
+
+
+/**
+ * Fallback for Driver.CompressedTexSubImage1D()
+ */
+void
+_mesa_store_compressed_texsubimage1d(GLcontext *ctx, GLenum target,
+                                     GLint level,
+                                     GLint xoffset, GLsizei width,
+                                     GLenum format,
+                                     GLsizei imageSize, const GLvoid *data,
+                                     struct gl_texture_object *texObj,
+                                     struct gl_texture_image *texImage)
+{
+   /* this space intentionally left blank */
+}
+
+
+/**
+ * Fallback for Driver.CompressedTexSubImage2D()
+ */
+void
+_mesa_store_compressed_texsubimage2d(GLcontext *ctx, GLenum target,
+                                     GLint level,
+                                     GLint xoffset, GLint yoffset,
+                                     GLsizei width, GLsizei height,
+                                     GLenum format,
+                                     GLsizei imageSize, const GLvoid *data,
+                                     struct gl_texture_object *texObj,
+                                     struct gl_texture_image *texImage)
+{
+   GLint bytesPerRow, destRowStride, srcRowStride;
+   GLint i, rows;
+   GLubyte *dest;
+   const GLubyte *src;
+
+   /* these should have been caught sooner */
+   ASSERT((width & 3) == 0 || width == 2 || width == 1);
+   ASSERT((height & 3) == 0 || height == 2 || height == 1);
+   ASSERT((xoffset & 3) == 0);
+   ASSERT((yoffset & 3) == 0);
+
+   srcRowStride = _mesa_compressed_row_stride(texImage->IntFormat, width);
+   src = (const GLubyte *) data;
+
+   destRowStride = _mesa_compressed_row_stride(texImage->IntFormat,
+                                               texImage->Width);
+   dest = _mesa_compressed_image_address(xoffset, yoffset, 0,
+                                         texImage->IntFormat,
+                                         texImage->Width,
+                              (GLubyte*) texImage->Data);
+
+   bytesPerRow = srcRowStride;
+   rows = height / 4;
+
+   for (i = 0; i < rows; i++) {
+      MEMCPY(dest, src, bytesPerRow);
+      dest += destRowStride;
+      src += srcRowStride;
+   }
+}
+
+
+/**
+ * Fallback for Driver.CompressedTexSubImage3D()
+ */
+void
+_mesa_store_compressed_texsubimage3d(GLcontext *ctx, GLenum target,
+                                GLint level,
+                                GLint xoffset, GLint yoffset, GLint zoffset,
+                                GLsizei width, GLsizei height, GLsizei depth,
+                                GLenum format,
+                                GLsizei imageSize, const GLvoid *data,
+                                struct gl_texture_object *texObj,
+                                struct gl_texture_image *texImage)
+{
+   /* this space intentionally left blank */
+}
+
+
+/*
+ * Average together two rows of a source image to produce a single new
+ * row in the dest image.  It's legal for the two source rows to point
+ * to the same data.  The source width must be equal to either the
+ * dest width or two times the dest width.
+ */
+static void
+do_row(const struct gl_texture_format *format, GLint srcWidth,
+       const GLvoid *srcRowA, const GLvoid *srcRowB,
+       GLint dstWidth, GLvoid *dstRow)
+{
+   const GLuint k0 = (srcWidth == dstWidth) ? 0 : 1;
+   const GLuint colStride = (srcWidth == dstWidth) ? 1 : 2;
+
+   /* This assertion is no longer valid with non-power-of-2 textures
+   assert(srcWidth == dstWidth || srcWidth == 2 * dstWidth);
+   */
+
+   switch (format->MesaFormat) {
+   case MESA_FORMAT_RGBA:
+      {
+         GLuint i, j, k;
+         const GLchan (*rowA)[4] = (const GLchan (*)[4]) srcRowA;
+         const GLchan (*rowB)[4] = (const GLchan (*)[4]) srcRowB;
+         GLchan (*dst)[4] = (GLchan (*)[4]) dstRow;
+         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+              i++, j += colStride, k += colStride) {
+            dst[i][0] = (rowA[j][0] + rowA[k][0] +
+                         rowB[j][0] + rowB[k][0]) / 4;
+            dst[i][1] = (rowA[j][1] + rowA[k][1] +
+                         rowB[j][1] + rowB[k][1]) / 4;
+            dst[i][2] = (rowA[j][2] + rowA[k][2] +
+                         rowB[j][2] + rowB[k][2]) / 4;
+            dst[i][3] = (rowA[j][3] + rowA[k][3] +
+                         rowB[j][3] + rowB[k][3]) / 4;
+         }
+      }
+      return;
+   case MESA_FORMAT_RGB:
+      {
+         GLuint i, j, k;
+         const GLchan (*rowA)[3] = (const GLchan (*)[3]) srcRowA;
+         const GLchan (*rowB)[3] = (const GLchan (*)[3]) srcRowB;
+         GLchan (*dst)[3] = (GLchan (*)[3]) dstRow;
+         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+              i++, j += colStride, k += colStride) {
+            dst[i][0] = (rowA[j][0] + rowA[k][0] +
+                         rowB[j][0] + rowB[k][0]) / 4;
+            dst[i][1] = (rowA[j][1] + rowA[k][1] +
+                         rowB[j][1] + rowB[k][1]) / 4;
+            dst[i][2] = (rowA[j][2] + rowA[k][2] +
+                         rowB[j][2] + rowB[k][2]) / 4;
+         }
+      }
+      return;
+   case MESA_FORMAT_ALPHA:
+   case MESA_FORMAT_LUMINANCE:
+   case MESA_FORMAT_INTENSITY:
+   case MESA_FORMAT_COLOR_INDEX:
+      {
+         GLuint i, j, k;
+         const GLchan *rowA = (const GLchan *) srcRowA;
+         const GLchan *rowB = (const GLchan *) srcRowB;
+         GLchan *dst = (GLchan *) dstRow;
+         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+              i++, j += colStride, k += colStride) {
+            dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) / 4;
+         }
+      }
+      return;
+   case MESA_FORMAT_LUMINANCE_ALPHA:
+      {
+         GLuint i, j, k;
+         const GLchan (*rowA)[2] = (const GLchan (*)[2]) srcRowA;
+         const GLchan (*rowB)[2] = (const GLchan (*)[2]) srcRowB;
+         GLchan (*dst)[2] = (GLchan (*)[2]) dstRow;
+         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+              i++, j += colStride, k += colStride) {
+            dst[i][0] = (rowA[j][0] + rowA[k][0] +
+                         rowB[j][0] + rowB[k][0]) / 4;
+            dst[i][1] = (rowA[j][1] + rowA[k][1] +
+                         rowB[j][1] + rowB[k][1]) / 4;
+         }
+      }
+      return;
+   case MESA_FORMAT_DEPTH_COMPONENT:
+      {
+         GLuint i, j, k;
+         const GLfloat *rowA = (const GLfloat *) srcRowA;
+         const GLfloat *rowB = (const GLfloat *) srcRowB;
+         GLfloat *dst = (GLfloat *) dstRow;
+         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+              i++, j += colStride, k += colStride) {
+            dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) * 0.25F;
+         }
+      }
+      return;
+   /* Begin hardware formats */
+   case MESA_FORMAT_RGBA8888:
+   case MESA_FORMAT_ARGB8888:
+      {
+         GLuint i, j, k;
+         const GLubyte (*rowA)[4] = (const GLubyte (*)[4]) srcRowA;
+         const GLubyte (*rowB)[4] = (const GLubyte (*)[4]) srcRowB;
+         GLubyte (*dst)[4] = (GLubyte (*)[4]) dstRow;
+         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+              i++, j += colStride, k += colStride) {
+            dst[i][0] = (rowA[j][0] + rowA[k][0] +
+                         rowB[j][0] + rowB[k][0]) / 4;
+            dst[i][1] = (rowA[j][1] + rowA[k][1] +
+                         rowB[j][1] + rowB[k][1]) / 4;
+            dst[i][2] = (rowA[j][2] + rowA[k][2] +
+                         rowB[j][2] + rowB[k][2]) / 4;
+            dst[i][3] = (rowA[j][3] + rowA[k][3] +
+                         rowB[j][3] + rowB[k][3]) / 4;
+         }
+      }
+      return;
+   case MESA_FORMAT_RGB888:
+      {
+         GLuint i, j, k;
+         const GLubyte (*rowA)[3] = (const GLubyte (*)[3]) srcRowA;
+         const GLubyte (*rowB)[3] = (const GLubyte (*)[3]) srcRowB;
+         GLubyte (*dst)[3] = (GLubyte (*)[3]) dstRow;
+         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+              i++, j += colStride, k += colStride) {
+            dst[i][0] = (rowA[j][0] + rowA[k][0] +
+                         rowB[j][0] + rowB[k][0]) / 4;
+            dst[i][1] = (rowA[j][1] + rowA[k][1] +
+                         rowB[j][1] + rowB[k][1]) / 4;
+            dst[i][2] = (rowA[j][2] + rowA[k][2] +
+                         rowB[j][2] + rowB[k][2]) / 4;
+         }
+      }
+      return;
+   case MESA_FORMAT_RGB565:
+      {
+         GLuint i, j, k;
+         const GLushort *rowA = (const GLushort *) srcRowA;
+         const GLushort *rowB = (const GLushort *) srcRowB;
+         GLushort *dst = (GLushort *) dstRow;
+         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+              i++, j += colStride, k += colStride) {
+            const GLint rowAr0 = rowA[j] & 0x1f;
+            const GLint rowAr1 = rowA[k] & 0x1f;
+            const GLint rowBr0 = rowB[j] & 0x1f;
+            const GLint rowBr1 = rowB[k] & 0x1f;
+            const GLint rowAg0 = (rowA[j] >> 5) & 0x3f;
+            const GLint rowAg1 = (rowA[k] >> 5) & 0x3f;
+            const GLint rowBg0 = (rowB[j] >> 5) & 0x3f;
+            const GLint rowBg1 = (rowB[k] >> 5) & 0x3f;
+            const GLint rowAb0 = (rowA[j] >> 11) & 0x1f;
+            const GLint rowAb1 = (rowA[k] >> 11) & 0x1f;
+            const GLint rowBb0 = (rowB[j] >> 11) & 0x1f;
+            const GLint rowBb1 = (rowB[k] >> 11) & 0x1f;
+            const GLint red   = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 4;
+            const GLint green = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 4;
+            const GLint blue  = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 4;
+            dst[i] = (blue << 11) | (green << 5) | red;
+         }
+      }
+      return;
+   case MESA_FORMAT_ARGB4444:
+      {
+         GLuint i, j, k;
+         const GLushort *rowA = (const GLushort *) srcRowA;
+         const GLushort *rowB = (const GLushort *) srcRowB;
+         GLushort *dst = (GLushort *) dstRow;
+         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+              i++, j += colStride, k += colStride) {
+            const GLint rowAr0 = rowA[j] & 0xf;
+            const GLint rowAr1 = rowA[k] & 0xf;
+            const GLint rowBr0 = rowB[j] & 0xf;
+            const GLint rowBr1 = rowB[k] & 0xf;
+            const GLint rowAg0 = (rowA[j] >> 4) & 0xf;
+            const GLint rowAg1 = (rowA[k] >> 4) & 0xf;
+            const GLint rowBg0 = (rowB[j] >> 4) & 0xf;
+            const GLint rowBg1 = (rowB[k] >> 4) & 0xf;
+            const GLint rowAb0 = (rowA[j] >> 8) & 0xf;
+            const GLint rowAb1 = (rowA[k] >> 8) & 0xf;
+            const GLint rowBb0 = (rowB[j] >> 8) & 0xf;
+            const GLint rowBb1 = (rowB[k] >> 8) & 0xf;
+            const GLint rowAa0 = (rowA[j] >> 12) & 0xf;
+            const GLint rowAa1 = (rowA[k] >> 12) & 0xf;
+            const GLint rowBa0 = (rowB[j] >> 12) & 0xf;
+            const GLint rowBa1 = (rowB[k] >> 12) & 0xf;
+            const GLint red   = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 4;
+            const GLint green = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 4;
+            const GLint blue  = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 4;
+            const GLint alpha = (rowAa0 + rowAa1 + rowBa0 + rowBa1) >> 4;
+            dst[i] = (alpha << 12) | (blue << 8) | (green << 4) | red;
+         }
+      }
+      return;
+   case MESA_FORMAT_ARGB1555:
+      {
+         GLuint i, j, k;
+         const GLushort *rowA = (const GLushort *) srcRowA;
+         const GLushort *rowB = (const GLushort *) srcRowB;
+         GLushort *dst = (GLushort *) dstRow;
+         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+              i++, j += colStride, k += colStride) {
+            const GLint rowAr0 = rowA[j] & 0x1f;
+            const GLint rowAr1 = rowA[k] & 0x1f;
+            const GLint rowBr0 = rowB[j] & 0x1f;
+            const GLint rowBr1 = rowB[k] & 0xf;
+            const GLint rowAg0 = (rowA[j] >> 5) & 0x1f;
+            const GLint rowAg1 = (rowA[k] >> 5) & 0x1f;
+            const GLint rowBg0 = (rowB[j] >> 5) & 0x1f;
+            const GLint rowBg1 = (rowB[k] >> 5) & 0x1f;
+            const GLint rowAb0 = (rowA[j] >> 10) & 0x1f;
+            const GLint rowAb1 = (rowA[k] >> 10) & 0x1f;
+            const GLint rowBb0 = (rowB[j] >> 10) & 0x1f;
+            const GLint rowBb1 = (rowB[k] >> 10) & 0x1f;
+            const GLint rowAa0 = (rowA[j] >> 15) & 0x1;
+            const GLint rowAa1 = (rowA[k] >> 15) & 0x1;
+            const GLint rowBa0 = (rowB[j] >> 15) & 0x1;
+            const GLint rowBa1 = (rowB[k] >> 15) & 0x1;
+            const GLint red   = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 4;
+            const GLint green = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 4;
+            const GLint blue  = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 4;
+            const GLint alpha = (rowAa0 + rowAa1 + rowBa0 + rowBa1) >> 4;
+            dst[i] = (alpha << 15) | (blue << 10) | (green << 5) | red;
+         }
+      }
+      return;
+   case MESA_FORMAT_AL88:
+      {
+         GLuint i, j, k;
+         const GLubyte (*rowA)[2] = (const GLubyte (*)[2]) srcRowA;
+         const GLubyte (*rowB)[2] = (const GLubyte (*)[2]) srcRowB;
+         GLubyte (*dst)[2] = (GLubyte (*)[2]) dstRow;
+         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+              i++, j += colStride, k += colStride) {
+            dst[i][0] = (rowA[j][0] + rowA[k][0] +
+                         rowB[j][0] + rowB[k][0]) >> 2;
+            dst[i][1] = (rowA[j][1] + rowA[k][1] +
+                         rowB[j][1] + rowB[k][1]) >> 2;
+         }
+      }
+      return;
+   case MESA_FORMAT_RGB332:
+      {
+         GLuint i, j, k;
+         const GLubyte *rowA = (const GLubyte *) srcRowA;
+         const GLubyte *rowB = (const GLubyte *) srcRowB;
+         GLubyte *dst = (GLubyte *) dstRow;
+         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+              i++, j += colStride, k += colStride) {
+            const GLint rowAr0 = rowA[j] & 0x3;
+            const GLint rowAr1 = rowA[k] & 0x3;
+            const GLint rowBr0 = rowB[j] & 0x3;
+            const GLint rowBr1 = rowB[k] & 0x3;
+            const GLint rowAg0 = (rowA[j] >> 2) & 0x7;
+            const GLint rowAg1 = (rowA[k] >> 2) & 0x7;
+            const GLint rowBg0 = (rowB[j] >> 2) & 0x7;
+            const GLint rowBg1 = (rowB[k] >> 2) & 0x7;
+            const GLint rowAb0 = (rowA[j] >> 5) & 0x7;
+            const GLint rowAb1 = (rowA[k] >> 5) & 0x7;
+            const GLint rowBb0 = (rowB[j] >> 5) & 0x7;
+            const GLint rowBb1 = (rowB[k] >> 5) & 0x7;
+            const GLint red   = (rowAr0 + rowAr1 + rowBr0 + rowBr1) >> 4;
+            const GLint green = (rowAg0 + rowAg1 + rowBg0 + rowBg1) >> 4;
+            const GLint blue  = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 4;
+            dst[i] = (blue << 5) | (green << 2) | red;
+         }
+      }
+      return;
+   case MESA_FORMAT_A8:
+   case MESA_FORMAT_L8:
+   case MESA_FORMAT_I8:
+   case MESA_FORMAT_CI8:
+      {
+         GLuint i, j, k;
+         const GLubyte *rowA = (const GLubyte *) srcRowA;
+         const GLubyte *rowB = (const GLubyte *) srcRowB;
+         GLubyte *dst = (GLubyte *) dstRow;
+         for (i = j = 0, k = k0; i < (GLuint) dstWidth;
+              i++, j += colStride, k += colStride) {
+            dst[i] = (rowA[j] + rowA[k] + rowB[j] + rowB[k]) >> 2;
+         }
+      }
+      return;
+   default:
+      _mesa_problem(NULL, "bad format in do_row()");
+   }
+}
+
+
+/*
+ * These functions generate a 1/2-size mipmap image from a source image.
+ * Texture borders are handled by copying or averaging the source image's
+ * border texels, depending on the scale-down factor.
+ */
+
+static void
+make_1d_mipmap(const struct gl_texture_format *format, GLint border,
+               GLint srcWidth, const GLubyte *srcPtr,
+               GLint dstWidth, GLubyte *dstPtr)
+{
+   const GLint bpt = format->TexelBytes;
+   const GLubyte *src;
+   GLubyte *dst;
+
+   /* skip the border pixel, if any */
+   src = srcPtr + border * bpt;
+   dst = dstPtr + border * bpt;
+
+   /* we just duplicate the input row, kind of hack, saves code */
+   do_row(format, srcWidth - 2 * border, src, src,
+          dstWidth - 2 * border, dst);
+
+   if (border) {
+      /* copy left-most pixel from source */
+      MEMCPY(dstPtr, srcPtr, bpt);
+      /* copy right-most pixel from source */
+      MEMCPY(dstPtr + (dstWidth - 1) * bpt,
+             srcPtr + (srcWidth - 1) * bpt,
+             bpt);
+   }
+}
+
+
+static void
+make_2d_mipmap(const struct gl_texture_format *format, GLint border,
+               GLint srcWidth, GLint srcHeight, const GLubyte *srcPtr,
+               GLint dstWidth, GLint dstHeight, GLubyte *dstPtr)
+{
+   const GLint bpt = format->TexelBytes;
+   const GLint srcWidthNB = srcWidth - 2 * border;  /* sizes w/out border */
+   const GLint dstWidthNB = dstWidth - 2 * border;
+   const GLint dstHeightNB = dstHeight - 2 * border;
+   const GLint srcRowStride = bpt * srcWidth;
+   const GLint dstRowStride = bpt * dstWidth;
+   const GLubyte *srcA, *srcB;
+   GLubyte *dst;
+   GLint row, colStride;
+
+   colStride = (srcWidth == dstWidth) ? 1 : 2;
+
+   /* Compute src and dst pointers, skipping any border */
+   srcA = srcPtr + border * ((srcWidth + 1) * bpt);
+   if (srcHeight > 1)
+      srcB = srcA + srcRowStride;
+   else
+      srcB = srcA;
+   dst = dstPtr + border * ((dstWidth + 1) * bpt);
+
+   for (row = 0; row < dstHeightNB; row++) {
+      do_row(format, srcWidthNB, srcA, srcB,
+             dstWidthNB, dst);
+      srcA += 2 * srcRowStride;
+      srcB += 2 * srcRowStride;
+      dst += dstRowStride;
+   }
+
+   /* This is ugly but probably won't be used much */
+   if (border > 0) {
+      /* fill in dest border */
+      /* lower-left border pixel */
+      MEMCPY(dstPtr, srcPtr, bpt);
+      /* lower-right border pixel */
+      MEMCPY(dstPtr + (dstWidth - 1) * bpt,
+             srcPtr + (srcWidth - 1) * bpt, bpt);
+      /* upper-left border pixel */
+      MEMCPY(dstPtr + dstWidth * (dstHeight - 1) * bpt,
+             srcPtr + srcWidth * (srcHeight - 1) * bpt, bpt);
+      /* upper-right border pixel */
+      MEMCPY(dstPtr + (dstWidth * dstHeight - 1) * bpt,
+             srcPtr + (srcWidth * srcHeight - 1) * bpt, bpt);
+      /* lower border */
+      do_row(format, srcWidthNB,
+             srcPtr + bpt,
+             srcPtr + bpt,
+             dstWidthNB, dstPtr + bpt);
+      /* upper border */
+      do_row(format, srcWidthNB,
+             srcPtr + (srcWidth * (srcHeight - 1) + 1) * bpt,
+             srcPtr + (srcWidth * (srcHeight - 1) + 1) * bpt,
+             dstWidthNB,
+             dstPtr + (dstWidth * (dstHeight - 1) + 1) * bpt);
+      /* left and right borders */
+      if (srcHeight == dstHeight) {
+         /* copy border pixel from src to dst */
+         for (row = 1; row < srcHeight; row++) {
+            MEMCPY(dstPtr + dstWidth * row * bpt,
+                   srcPtr + srcWidth * row * bpt, bpt);
+            MEMCPY(dstPtr + (dstWidth * row + dstWidth - 1) * bpt,
+                   srcPtr + (srcWidth * row + srcWidth - 1) * bpt, bpt);
+         }
+      }
+      else {
+         /* average two src pixels each dest pixel */
+         for (row = 0; row < dstHeightNB; row += 2) {
+            do_row(format, 1,
+                   srcPtr + (srcWidth * (row * 2 + 1)) * bpt,
+                   srcPtr + (srcWidth * (row * 2 + 2)) * bpt,
+                   1, dstPtr + (dstWidth * row + 1) * bpt);
+            do_row(format, 1,
+                   srcPtr + (srcWidth * (row * 2 + 1) + srcWidth - 1) * bpt,
+                   srcPtr + (srcWidth * (row * 2 + 2) + srcWidth - 1) * bpt,
+                   1, dstPtr + (dstWidth * row + 1 + dstWidth - 1) * bpt);
+         }
+      }
+   }
+}
+
+
+static void
+make_3d_mipmap(const struct gl_texture_format *format, GLint border,
+               GLint srcWidth, GLint srcHeight, GLint srcDepth,
+               const GLubyte *srcPtr,
+               GLint dstWidth, GLint dstHeight, GLint dstDepth,
+               GLubyte *dstPtr)
+{
+   const GLint bpt = format->TexelBytes;
+   const GLint srcWidthNB = srcWidth - 2 * border;  /* sizes w/out border */
+   const GLint srcDepthNB = srcDepth - 2 * border;
+   const GLint dstWidthNB = dstWidth - 2 * border;
+   const GLint dstHeightNB = dstHeight - 2 * border;
+   const GLint dstDepthNB = dstDepth - 2 * border;
+   GLvoid *tmpRowA, *tmpRowB;
+   GLint img, row;
+   GLint bytesPerSrcImage, bytesPerDstImage;
+   GLint bytesPerSrcRow, bytesPerDstRow;
+   GLint srcImageOffset, srcRowOffset;
+
+   (void) srcDepthNB; /* silence warnings */
+
+   /* Need two temporary row buffers */
+   tmpRowA = MALLOC(srcWidth * bpt);
+   if (!tmpRowA)
+      return;
+   tmpRowB = MALLOC(srcWidth * bpt);
+   if (!tmpRowB) {
+      FREE(tmpRowA);
+      return;
+   }
+
+   bytesPerSrcImage = srcWidth * srcHeight * bpt;
+   bytesPerDstImage = dstWidth * dstHeight * bpt;
+
+   bytesPerSrcRow = srcWidth * bpt;
+   bytesPerDstRow = dstWidth * bpt;
+
+   /* Offset between adjacent src images to be averaged together */
+   srcImageOffset = (srcDepth == dstDepth) ? 0 : bytesPerSrcImage;
+
+   /* Offset between adjacent src rows to be averaged together */
+   srcRowOffset = (srcHeight == dstHeight) ? 0 : srcWidth * bpt;
+
+   /*
+    * Need to average together up to 8 src pixels for each dest pixel.
+    * Break that down into 3 operations:
+    *   1. take two rows from source image and average them together.
+    *   2. take two rows from next source image and average them together.
+    *   3. take the two averaged rows and average them for the final dst row.
+    */
+
+   /*
+   _mesa_printf("mip3d %d x %d x %d  ->  %d x %d x %d\n",
+          srcWidth, srcHeight, srcDepth, dstWidth, dstHeight, dstDepth);
+   */
+
+   for (img = 0; img < dstDepthNB; img++) {
+      /* first source image pointer, skipping border */
+      const GLubyte *imgSrcA = srcPtr
+         + (bytesPerSrcImage + bytesPerSrcRow + border) * bpt * border
+         + img * (bytesPerSrcImage + srcImageOffset);
+      /* second source image pointer, skipping border */
+      const GLubyte *imgSrcB = imgSrcA + srcImageOffset;
+      /* address of the dest image, skipping border */
+      GLubyte *imgDst = dstPtr
+         + (bytesPerDstImage + bytesPerDstRow + border) * bpt * border
+         + img * bytesPerDstImage;
+
+      /* setup the four source row pointers and the dest row pointer */
+      const GLubyte *srcImgARowA = imgSrcA;
+      const GLubyte *srcImgARowB = imgSrcA + srcRowOffset;
+      const GLubyte *srcImgBRowA = imgSrcB;
+      const GLubyte *srcImgBRowB = imgSrcB + srcRowOffset;
+      GLubyte *dstImgRow = imgDst;
+
+      for (row = 0; row < dstHeightNB; row++) {
+         /* Average together two rows from first src image */
+         do_row(format, srcWidthNB, srcImgARowA, srcImgARowB,
+                srcWidthNB, tmpRowA);
+         /* Average together two rows from second src image */
+         do_row(format, srcWidthNB, srcImgBRowA, srcImgBRowB,
+                srcWidthNB, tmpRowB);
+         /* Average together the temp rows to make the final row */
+         do_row(format, srcWidthNB, tmpRowA, tmpRowB,
+                dstWidthNB, dstImgRow);
+         /* advance to next rows */
+         srcImgARowA += bytesPerSrcRow + srcRowOffset;
+         srcImgARowB += bytesPerSrcRow + srcRowOffset;
+         srcImgBRowA += bytesPerSrcRow + srcRowOffset;
+         srcImgBRowB += bytesPerSrcRow + srcRowOffset;
+         dstImgRow += bytesPerDstRow;
+      }
+   }
+
+   FREE(tmpRowA);
+   FREE(tmpRowB);
+
+   /* Luckily we can leverage the make_2d_mipmap() function here! */
+   if (border > 0) {
+      /* do front border image */
+      make_2d_mipmap(format, 1, srcWidth, srcHeight, srcPtr,
+                     dstWidth, dstHeight, dstPtr);
+      /* do back border image */
+      make_2d_mipmap(format, 1, srcWidth, srcHeight,
+                     srcPtr + bytesPerSrcImage * (srcDepth - 1),
+                     dstWidth, dstHeight,
+                     dstPtr + bytesPerDstImage * (dstDepth - 1));
+      /* do four remaining border edges that span the image slices */
+      if (srcDepth == dstDepth) {
+         /* just copy border pixels from src to dst */
+         for (img = 0; img < dstDepthNB; img++) {
+            const GLubyte *src;
+            GLubyte *dst;
+
+            /* do border along [img][row=0][col=0] */
+            src = srcPtr + (img + 1) * bytesPerSrcImage;
+            dst = dstPtr + (img + 1) * bytesPerDstImage;
+            MEMCPY(dst, src, bpt);
+
+            /* do border along [img][row=dstHeight-1][col=0] */
+            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage
+                         + (srcHeight - 1) * bytesPerSrcRow;
+            dst = dstPtr + (img + 1) * bytesPerDstImage
+                         + (dstHeight - 1) * bytesPerDstRow;
+            MEMCPY(dst, src, bpt);
+
+            /* do border along [img][row=0][col=dstWidth-1] */
+            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage
+                         + (srcWidth - 1) * bpt;
+            dst = dstPtr + (img + 1) * bytesPerDstImage
+                         + (dstWidth - 1) * bpt;
+            MEMCPY(dst, src, bpt);
+
+            /* do border along [img][row=dstHeight-1][col=dstWidth-1] */
+            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage
+                         + (bytesPerSrcImage - bpt);
+            dst = dstPtr + (img + 1) * bytesPerDstImage
+                         + (bytesPerDstImage - bpt);
+            MEMCPY(dst, src, bpt);
+         }
+      }
+      else {
+         /* average border pixels from adjacent src image pairs */
+         ASSERT(srcDepthNB == 2 * dstDepthNB);
+         for (img = 0; img < dstDepthNB; img++) {
+            const GLubyte *src;
+            GLubyte *dst;
+
+            /* do border along [img][row=0][col=0] */
+            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage;
+            dst = dstPtr + (img + 1) * bytesPerDstImage;
+            do_row(format, 1, src, src + srcImageOffset, 1, dst);
+
+            /* do border along [img][row=dstHeight-1][col=0] */
+            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage
+                         + (srcHeight - 1) * bytesPerSrcRow;
+            dst = dstPtr + (img + 1) * bytesPerDstImage
+                         + (dstHeight - 1) * bytesPerDstRow;
+            do_row(format, 1, src, src + srcImageOffset, 1, dst);
+
+            /* do border along [img][row=0][col=dstWidth-1] */
+            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage
+                         + (srcWidth - 1) * bpt;
+            dst = dstPtr + (img + 1) * bytesPerDstImage
+                         + (dstWidth - 1) * bpt;
+            do_row(format, 1, src, src + srcImageOffset, 1, dst);
+
+            /* do border along [img][row=dstHeight-1][col=dstWidth-1] */
+            src = srcPtr + (img * 2 + 1) * bytesPerSrcImage
+                         + (bytesPerSrcImage - bpt);
+            dst = dstPtr + (img + 1) * bytesPerDstImage
+                         + (bytesPerDstImage - bpt);
+            do_row(format, 1, src, src + srcImageOffset, 1, dst);
+         }
+      }
+   }
+}
+
+
+/*
+ * For GL_SGIX_generate_mipmap:
+ * Generate a complete set of mipmaps from texObj's base-level image.
+ * Stop at texObj's MaxLevel or when we get to the 1x1 texture.
+ */
+void
+_mesa_generate_mipmap(GLcontext *ctx, GLenum target,
+                      const struct gl_texture_unit *texUnit,
+                      struct gl_texture_object *texObj)
+{
+   const struct gl_texture_image *srcImage;
+   const struct gl_texture_format *convertFormat;
+   const GLubyte *srcData = NULL;
+   GLubyte *dstData = NULL;
+   GLint level, maxLevels;
+
+   ASSERT(texObj);
+   srcImage = texObj->Image[texObj->BaseLevel];
+   ASSERT(srcImage);
+
+   maxLevels = _mesa_max_texture_levels(ctx, texObj->Target);
+   ASSERT(maxLevels > 0);  /* bad target */
+
+   /* Find convertFormat - the format that do_row() will process */
+   if (srcImage->IsCompressed) {
+      /* setup for compressed textures */
+      GLuint row;
+      GLint  components, size;
+      GLchan *dst;
+
+      assert(texObj->Target == GL_TEXTURE_2D);
+
+      if (srcImage->Format == GL_RGB) {
+         convertFormat = &_mesa_texformat_rgb;
+         components = 3;
+      }
+      else if (srcImage->Format == GL_RGBA) {
+         convertFormat = &_mesa_texformat_rgba;
+         components = 4;
+      }
+      else {
+         _mesa_problem(ctx, "bad srcImage->Format in _mesa_generate_mipmaps");
+         return;
+      }
+
+      /* allocate storage for uncompressed GL_RGB or GL_RGBA images */
+      size = _mesa_bytes_per_pixel(srcImage->Format, CHAN_TYPE)
+         * srcImage->Width * srcImage->Height * srcImage->Depth + 20;
+      /* 20 extra bytes, just be safe when calling last FetchTexel */
+      srcData = (GLubyte *) MALLOC(size);
+      if (!srcData) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "generate mipmaps");
+         return;
+      }
+      dstData = (GLubyte *) MALLOC(size / 2);  /* 1/4 would probably be OK */
+      if (!dstData) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "generate mipmaps");
+         FREE((void *) srcData);
+         return;
+      }
+
+      /* decompress base image here */
+      dst = (GLchan *) srcData;
+      for (row = 0; row < srcImage->Height; row++) {
+         GLuint col;
+         for (col = 0; col < srcImage->Width; col++) {
+            (*srcImage->FetchTexel)(srcImage, col, row, 0, (GLvoid *) dst);
+            dst += components;
+         }
+      }
+   }
+   else {
+      /* uncompressed */
+      convertFormat = srcImage->TexFormat;
+   }
+
+   for (level = texObj->BaseLevel; level < texObj->MaxLevel
+           && level < maxLevels - 1; level++) {
+      /* generate image[level+1] from image[level] */
+      const struct gl_texture_image *srcImage;
+      struct gl_texture_image *dstImage;
+      GLint srcWidth, srcHeight, srcDepth;
+      GLint dstWidth, dstHeight, dstDepth;
+      GLint border, bytesPerTexel;
+
+      /* get src image parameters */
+      srcImage = _mesa_select_tex_image(ctx, texUnit, target, level);
+      ASSERT(srcImage);
+      srcWidth = srcImage->Width;
+      srcHeight = srcImage->Height;
+      srcDepth = srcImage->Depth;
+      border = srcImage->Border;
+
+      /* compute next (level+1) image size */
+      if (srcWidth - 2 * border > 1) {
+         dstWidth = (srcWidth - 2 * border) / 2 + 2 * border;
+      }
+      else {
+         dstWidth = srcWidth; /* can't go smaller */
+      }
+      if (srcHeight - 2 * border > 1) {
+         dstHeight = (srcHeight - 2 * border) / 2 + 2 * border;
+      }
+      else {
+         dstHeight = srcHeight; /* can't go smaller */
+      }
+      if (srcDepth - 2 * border > 1) {
+         dstDepth = (srcDepth - 2 * border) / 2 + 2 * border;
+      }
+      else {
+         dstDepth = srcDepth; /* can't go smaller */
+      }
+
+      if (dstWidth == srcWidth &&
+          dstHeight == srcHeight &&
+          dstDepth == srcDepth) {
+         /* all done */
+         if (srcImage->IsCompressed) {
+            FREE((void *) srcData);
+            FREE(dstData);
+         }
+         return;
+      }
+
+      /* get dest gl_texture_image */
+      dstImage = _mesa_get_tex_image(ctx, texUnit, target, level + 1);
+      if (!dstImage) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "generating mipmaps");
+         return;
+      }
+
+      /* Free old image data */
+      if (dstImage->Data)
+         MESA_PBUFFER_FREE(dstImage->Data);
+
+      /* initialize new image */
+      _mesa_init_teximage_fields(ctx, target, dstImage, dstWidth, dstHeight,
+                                 dstDepth, border, srcImage->IntFormat);
+      dstImage->DriverData = NULL;
+      dstImage->TexFormat = srcImage->TexFormat;
+      dstImage->FetchTexel = srcImage->FetchTexel;
+      ASSERT(dstImage->TexFormat);
+      ASSERT(dstImage->FetchTexel);
+
+      /* Alloc new teximage data buffer.
+       * Setup src and dest data pointers.
+       */
+      if (dstImage->IsCompressed) {
+         ASSERT(dstImage->CompressedSize > 0); /* set by init_teximage_fields*/
+         dstImage->Data = MESA_PBUFFER_ALLOC(dstImage->CompressedSize);
+         if (!dstImage->Data) {
+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "generating mipmaps");
+            return;
+         }
+         /* srcData and dstData are already set */
+         ASSERT(srcData);
+         ASSERT(dstData);
+      }
+      else {
+         bytesPerTexel = srcImage->TexFormat->TexelBytes;
+         ASSERT(dstWidth * dstHeight * dstDepth * bytesPerTexel > 0);
+         dstImage->Data = MESA_PBUFFER_ALLOC(dstWidth * dstHeight * dstDepth
+                                             * bytesPerTexel);
+         if (!dstImage->Data) {
+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "generating mipmaps");
+            return;
+         }
+         srcData = (const GLubyte *) srcImage->Data;
+         dstData = (GLubyte *) dstImage->Data;
+      }
+
+      /*
+       * We use simple 2x2 averaging to compute the next mipmap level.
+       */
+      switch (target) {
+         case GL_TEXTURE_1D:
+            make_1d_mipmap(convertFormat, border,
+                           srcWidth, srcData,
+                           dstWidth, dstData);
+            break;
+         case GL_TEXTURE_2D:
+         case GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB:
+         case GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB:
+         case GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB:
+         case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB:
+         case GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB:
+         case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB:
+            make_2d_mipmap(convertFormat, border,
+                           srcWidth, srcHeight, srcData,
+                           dstWidth, dstHeight, dstData);
+            break;
+         case GL_TEXTURE_3D:
+            make_3d_mipmap(convertFormat, border,
+                           srcWidth, srcHeight, srcDepth, srcData,
+                           dstWidth, dstHeight, dstDepth, dstData);
+            break;
+         case GL_TEXTURE_RECTANGLE_NV:
+            /* no mipmaps, do nothing */
+            break;
+         default:
+            _mesa_problem(ctx, "bad dimensions in _mesa_generate_mipmaps");
+            return;
+      }
+
+      if (dstImage->IsCompressed) {
+         GLubyte *temp;
+         /* compress image from dstData into dstImage->Data */
+         const GLenum srcFormat = convertFormat->BaseFormat;
+         GLint dstRowStride = _mesa_compressed_row_stride(srcImage->IntFormat,
+                                                          dstWidth);
+         ASSERT(srcFormat == GL_RGB || srcFormat == GL_RGBA);
+         _mesa_compress_teximage(ctx,
+                                 dstWidth, dstHeight, /* size */
+                                 srcFormat,           /* source format */
+                (const GLchan *) dstData,             /* source buffer */
+                                 dstWidth,            /* source row stride */
+                                 dstImage->TexFormat, /* dest format */
+                      (GLubyte*) dstImage->Data,      /* dest buffer */
+                                 dstRowStride );      /* dest row stride */
+
+         /* swap src and dest pointers */
+         temp = (GLubyte *) srcData;
+         srcData = dstData;
+         dstData = temp;
+      }
+
+   } /* loop over mipmap levels */
+}
diff --git a/reactos/lib/mesa32/src/main/texstore.h b/reactos/lib/mesa32/src/main/texstore.h
new file mode 100644
index 00000000000..72da2a08f96
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/texstore.h
@@ -0,0 +1,173 @@
+/**
+ * \file texstore.h
+ * Texture image storage.
+ *
+ * \author Brian Paul
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef TEXSTORE_H
+#define TEXSTORE_H
+
+
+#include "mtypes.h"
+
+
+extern void
+_mesa_transfer_teximage(GLcontext *ctx, GLuint dimensions,
+                        GLenum baseInternalFormat,
+                        const struct gl_texture_format *texDestFormat,
+                        GLvoid *texDestAddr,
+                        GLint srcWidth, GLint srcHeight, GLint srcDepth,
+                        GLint dstXoffset, GLint dstYoffset, GLint dstZoffset,
+                        GLint dstRowStride, GLint dstImageStride,
+                        GLenum srcFormat, GLenum srcType,
+                        const GLvoid *srcAddr,
+                        const struct gl_pixelstore_attrib *srcPacking);
+
+
+extern void
+_mesa_store_teximage1d(GLcontext *ctx, GLenum target, GLint level,
+                       GLint internalFormat,
+                       GLint width, GLint border,
+                       GLenum format, GLenum type, const GLvoid *pixels,
+                       const struct gl_pixelstore_attrib *packing,
+                       struct gl_texture_object *texObj,
+                       struct gl_texture_image *texImage);
+
+
+extern void
+_mesa_store_teximage2d(GLcontext *ctx, GLenum target, GLint level,
+                       GLint internalFormat,
+                       GLint width, GLint height, GLint border,
+                       GLenum format, GLenum type, const GLvoid *pixels,
+                       const struct gl_pixelstore_attrib *packing,
+                       struct gl_texture_object *texObj,
+                       struct gl_texture_image *texImage);
+
+
+extern void
+_mesa_store_teximage3d(GLcontext *ctx, GLenum target, GLint level,
+                       GLint internalFormat,
+                       GLint width, GLint height, GLint depth, GLint border,
+                       GLenum format, GLenum type, const GLvoid *pixels,
+                       const struct gl_pixelstore_attrib *packing,
+                       struct gl_texture_object *texObj,
+                       struct gl_texture_image *texImage);
+
+
+extern void
+_mesa_store_texsubimage1d(GLcontext *ctx, GLenum target, GLint level,
+                          GLint xoffset, GLint width,
+                          GLenum format, GLenum type, const GLvoid *pixels,
+                          const struct gl_pixelstore_attrib *packing,
+                          struct gl_texture_object *texObj,
+                          struct gl_texture_image *texImage);
+
+
+extern void
+_mesa_store_texsubimage2d(GLcontext *ctx, GLenum target, GLint level,
+                          GLint xoffset, GLint yoffset,
+                          GLint width, GLint height,
+                          GLenum format, GLenum type, const GLvoid *pixels,
+                          const struct gl_pixelstore_attrib *packing,
+                          struct gl_texture_object *texObj,
+                          struct gl_texture_image *texImage);
+
+
+extern void
+_mesa_store_texsubimage3d(GLcontext *ctx, GLenum target, GLint level,
+                          GLint xoffset, GLint yoffset, GLint zoffset,
+                          GLint width, GLint height, GLint depth,
+                          GLenum format, GLenum type, const GLvoid *pixels,
+                          const struct gl_pixelstore_attrib *packing,
+                          struct gl_texture_object *texObj,
+                          struct gl_texture_image *texImage);
+
+
+extern void
+_mesa_store_compressed_teximage1d(GLcontext *ctx, GLenum target, GLint level,
+                                  GLint internalFormat,
+                                  GLint width, GLint border,
+                                  GLsizei imageSize, const GLvoid *data,
+                                  struct gl_texture_object *texObj,
+                                  struct gl_texture_image *texImage);
+
+extern void
+_mesa_store_compressed_teximage2d(GLcontext *ctx, GLenum target, GLint level,
+                                  GLint internalFormat,
+                                  GLint width, GLint height, GLint border,
+                                  GLsizei imageSize, const GLvoid *data,
+                                  struct gl_texture_object *texObj,
+                                  struct gl_texture_image *texImage);
+
+extern void
+_mesa_store_compressed_teximage3d(GLcontext *ctx, GLenum target, GLint level,
+                                  GLint internalFormat,
+                                  GLint width, GLint height, GLint depth,
+                                  GLint border,
+                                  GLsizei imageSize, const GLvoid *data,
+                                  struct gl_texture_object *texObj,
+                                  struct gl_texture_image *texImage);
+
+
+extern void
+_mesa_store_compressed_texsubimage1d(GLcontext *ctx, GLenum target,
+                                     GLint level,
+                                     GLint xoffset, GLsizei width,
+                                     GLenum format,
+                                     GLsizei imageSize, const GLvoid *data,
+                                     struct gl_texture_object *texObj,
+                                     struct gl_texture_image *texImage);
+
+extern void
+_mesa_store_compressed_texsubimage2d(GLcontext *ctx, GLenum target,
+                                     GLint level,
+                                     GLint xoffset, GLint yoffset,
+                                     GLsizei width, GLsizei height,
+                                     GLenum format,
+                                     GLsizei imageSize, const GLvoid *data,
+                                     struct gl_texture_object *texObj,
+                                     struct gl_texture_image *texImage);
+
+extern void
+_mesa_store_compressed_texsubimage3d(GLcontext *ctx, GLenum target,
+                                GLint level,
+                                GLint xoffset, GLint yoffset, GLint zoffset,
+                                GLsizei width, GLsizei height, GLsizei depth,
+                                GLenum format,
+                                GLsizei imageSize, const GLvoid *data,
+                                struct gl_texture_object *texObj,
+                                struct gl_texture_image *texImage);
+
+
+extern void
+_mesa_generate_mipmap(GLcontext *ctx, GLenum target,
+                      const struct gl_texture_unit *texUnit,
+                      struct gl_texture_object *texObj);
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/texutil.c b/reactos/lib/mesa32/src/main/texutil.c
new file mode 100644
index 00000000000..cf50da813ac
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/texutil.c
@@ -0,0 +1,1035 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Gareth Hughes
+ */
+
+/*
+ * Description:
+ * Functions for texture image conversion.  This takes care of converting
+ * typical GL_RGBA/GLubyte textures into hardware-specific formats.
+ * We can handle non-standard row strides and pixel unpacking parameters.
+ */
+
+
+#include "glheader.h"
+#include "colormac.h"
+#include "context.h"
+#include "enums.h"
+#include "image.h"
+#include "imports.h"
+#include "macros.h"
+#include "mtypes.h"
+#include "texformat.h"
+#include "texutil.h"
+
+
+#define DEBUG_TEXUTIL 0
+
+
+#ifdef MESA_BIG_ENDIAN
+#define APPEND16( a, b )	( (a) << 16 | (b) )
+#else
+#define APPEND16( a, b )	( (a) | (b) << 16 )
+#endif
+
+
+struct convert_info {
+   GLint xoffset, yoffset, zoffset;	/* Subimage offset */
+   GLint width, height, depth;		/* Subimage region */
+
+   GLint dstImageWidth, dstImageHeight;	/* Dest image size */
+                                        /* Needed for subimage replacement */
+   GLenum format, type;                 /* Source (user) format and type */
+
+   const struct gl_pixelstore_attrib *unpacking;
+
+   const GLvoid *srcImage;
+   GLvoid *dstImage;
+
+   GLint index;
+};
+
+typedef GLboolean (*convert_func)( const struct convert_info *convert );
+
+/* bitvalues for convert->index */
+#define CONVERT_STRIDE_BIT	0x1
+#define CONVERT_UNPACKING_BIT	0x2
+
+
+
+/* =============================================================
+ * Convert to RGBA8888 textures:
+ */
+
+#define DST_TYPE		GLuint
+#define DST_TEXELS_PER_DWORD	1
+
+#define CONVERT_TEXEL( dst, src )					\
+	dst = PACK_COLOR_8888_LE( src[3], src[2], src[1], src[0] )
+
+#define CONVERT_DIRECT
+
+#define SRC_TEXEL_BYTES		4
+
+#define TAG(x) x##_rgba8888_direct
+#define PRESERVE_DST_TYPE
+#include "texutil_tmp.h"
+
+
+#define CONVERT_TEXEL( dst, src )					\
+	dst = PACK_COLOR_8888_LE( src[0], src[1], src[2], src[3] )
+
+#define CONVERT_TEXEL_DWORD( dst, src )		CONVERT_TEXEL( dst, src )
+
+#define SRC_TEXEL_BYTES		4
+
+#define TAG(x) x##_abgr8888_to_rgba8888
+#define PRESERVE_DST_TYPE
+#include "texutil_tmp.h"
+
+
+#define CONVERT_TEXEL( dst, src )					\
+	dst = PACK_COLOR_8888_LE( src[0], src[1], src[2], 0xff )
+
+#define CONVERT_TEXEL_DWORD( dst, src )		CONVERT_TEXEL( dst, src )
+
+#define SRC_TEXEL_BYTES		3
+
+#define TAG(x) x##_bgr888_to_rgba8888
+#include "texutil_tmp.h"
+
+
+#define CONVERT_RGBA8888( name )					\
+static GLboolean							\
+convert_##name##_rgba8888( const struct convert_info *convert )		\
+{									\
+   convert_func *tab;							\
+   GLint index = convert->index;					\
+									\
+   if ( convert->format == GL_ABGR_EXT &&				\
+	convert->type == GL_UNSIGNED_INT_8_8_8_8_REV )			\
+   {									\
+      tab = name##_tab_rgba8888_direct;					\
+   }									\
+   else if ( convert->format == GL_RGBA &&				\
+	     ( convert->type == GL_UNSIGNED_BYTE ||			\
+	       convert->type == GL_UNSIGNED_INT_8_8_8_8 ) )		\
+   {									\
+      tab = name##_tab_abgr8888_to_rgba8888;				\
+   }									\
+   else if ( convert->format == GL_RGB &&				\
+	     convert->type == GL_UNSIGNED_BYTE )			\
+   {									\
+      tab = name##_tab_bgr888_to_rgba8888;				\
+   }									\
+   else									\
+   {									\
+      /* Can't handle this source format/type combination */		\
+      return GL_FALSE;							\
+   }									\
+									\
+   return tab[index]( convert );					\
+}
+
+CONVERT_RGBA8888( texsubimage2d )
+CONVERT_RGBA8888( texsubimage3d )
+
+
+
+/* =============================================================
+ * Convert to ARGB8888 textures:
+ */
+
+#define DST_TYPE		GLuint
+#define DST_TEXELS_PER_DWORD	1
+
+#define CONVERT_TEXEL( dst, src )					\
+	dst = PACK_COLOR_8888_LE( src[3], src[2], src[1], src[0] )
+
+#define CONVERT_DIRECT
+
+#define SRC_TEXEL_BYTES		4
+
+#define TAG(x) x##_argb8888_direct
+#define PRESERVE_DST_TYPE
+#include "texutil_tmp.h"
+
+
+#define CONVERT_TEXEL( dst, src )					\
+	dst = PACK_COLOR_8888_LE( src[3], src[0], src[1], src[2] )
+
+#define CONVERT_TEXEL_DWORD( dst, src )		CONVERT_TEXEL( dst, src )
+
+#define SRC_TEXEL_BYTES		4
+
+#define TAG(x) x##_abgr8888_to_argb8888
+#define PRESERVE_DST_TYPE
+#include "texutil_tmp.h"
+
+
+#define CONVERT_TEXEL( dst, src )					\
+	dst = PACK_COLOR_8888_LE( 0xff, src[0], src[1], src[2] )
+
+#define CONVERT_TEXEL_DWORD( dst, src )		CONVERT_TEXEL( dst, src )
+
+#define SRC_TEXEL_BYTES		3
+
+#define TAG(x) x##_bgr888_to_argb8888
+#include "texutil_tmp.h"
+
+
+#define CONVERT_ARGB8888( name )					\
+static GLboolean							\
+convert_##name##_argb8888( const struct convert_info *convert )		\
+{									\
+   convert_func *tab;							\
+   GLint index = convert->index;					\
+									\
+   if ( convert->format == GL_BGRA &&					\
+	convert->type == GL_UNSIGNED_INT_8_8_8_8_REV )			\
+   {									\
+      tab = name##_tab_argb8888_direct;					\
+   }									\
+   else if ( convert->format == GL_RGBA &&				\
+	     convert->type == GL_UNSIGNED_BYTE )			\
+   {									\
+      tab = name##_tab_abgr8888_to_argb8888;				\
+   }									\
+   else if ( convert->format == GL_RGB &&				\
+	     convert->type == GL_UNSIGNED_BYTE )			\
+   {									\
+      tab = name##_tab_bgr888_to_argb8888;				\
+   }									\
+   else									\
+   {									\
+      /* Can't handle this source format/type combination */		\
+      return GL_FALSE;							\
+   }									\
+									\
+   return tab[index]( convert );					\
+}
+
+CONVERT_ARGB8888( texsubimage2d )
+CONVERT_ARGB8888( texsubimage3d )
+
+
+
+/* =============================================================
+ * Convert to RGB888 textures:
+ */
+
+static GLboolean
+convert_texsubimage2d_rgb888( const struct convert_info *convert )
+{
+   /* This is a placeholder for now...
+    */
+   return GL_FALSE;
+}
+
+static GLboolean
+convert_texsubimage3d_rgb888( const struct convert_info *convert )
+{
+   /* This is a placeholder for now...
+    */
+   return GL_FALSE;
+}
+
+
+
+/* =============================================================
+ * Convert to RGB565 textures:
+ */
+
+#define DST_TYPE		GLushort
+#define DST_TEXELS_PER_DWORD	2
+
+#define CONVERT_TEXEL( dst, src )					\
+	dst = PACK_COLOR_565_LE( src[0], src[1], src[2] )
+
+#define CONVERT_DIRECT
+
+#define SRC_TEXEL_BYTES		2
+
+#define TAG(x) x##_rgb565_direct
+#define PRESERVE_DST_TYPE
+#include "texutil_tmp.h"
+
+
+#define CONVERT_TEXEL( dst, src )					\
+	dst = PACK_COLOR_565_LE( src[0], src[1], src[2] )
+
+#define CONVERT_TEXEL_DWORD( dst, src )					\
+	dst = APPEND16( PACK_COLOR_565_LE( src[0], src[1], src[2] ),	\
+			PACK_COLOR_565_LE( src[3], src[4], src[5] ) )
+
+#define SRC_TEXEL_BYTES		3
+
+#define TAG(x) x##_bgr888_to_rgb565
+#define PRESERVE_DST_TYPE
+#include "texutil_tmp.h"
+
+
+#define CONVERT_TEXEL( dst, src )					\
+	dst = PACK_COLOR_565_LE( src[0], src[1], src[2] )
+
+#define CONVERT_TEXEL_DWORD( dst, src )					\
+	dst = APPEND16( PACK_COLOR_565_LE( src[0], src[1], src[2] ),	\
+			PACK_COLOR_565_LE( src[4], src[5], src[6] ) )
+
+#define SRC_TEXEL_BYTES		4
+
+#define TAG(x) x##_abgr8888_to_rgb565
+#include "texutil_tmp.h"
+
+
+#define CONVERT_RGB565( name )						\
+static GLboolean							\
+convert_##name##_rgb565( const struct convert_info *convert )		\
+{									\
+   convert_func *tab;							\
+   GLint index = convert->index;					\
+									\
+   if ( convert->format == GL_RGB &&					\
+	convert->type == GL_UNSIGNED_SHORT_5_6_5 )			\
+   {									\
+      tab = name##_tab_rgb565_direct;					\
+   }									\
+   else if ( convert->format == GL_RGB &&				\
+	     convert->type == GL_UNSIGNED_BYTE )			\
+   {									\
+      tab = name##_tab_bgr888_to_rgb565;				\
+   }									\
+   else if ( convert->format == GL_RGBA &&				\
+	     convert->type == GL_UNSIGNED_BYTE )			\
+   {									\
+      tab = name##_tab_abgr8888_to_rgb565;				\
+   }									\
+   else									\
+   {									\
+      /* Can't handle this source format/type combination */		\
+      return GL_FALSE;							\
+   }									\
+									\
+   return tab[index]( convert );					\
+}
+
+CONVERT_RGB565( texsubimage2d )
+CONVERT_RGB565( texsubimage3d )
+
+
+
+/* =============================================================
+ * Convert to ARGB4444 textures:
+ */
+
+#define DST_TYPE		GLushort
+#define DST_TEXELS_PER_DWORD	2
+
+#define CONVERT_TEXEL( dst, src )					\
+	dst = PACK_COLOR_4444_LE( src[3], src[0], src[1], src[2] )
+
+#define CONVERT_DIRECT
+
+#define SRC_TEXEL_BYTES		2
+
+#define TAG(x) x##_argb4444_direct
+#define PRESERVE_DST_TYPE
+#include "texutil_tmp.h"
+
+
+#define CONVERT_TEXEL( dst, src )					\
+	dst = PACK_COLOR_4444_LE( src[3], src[0], src[1], src[2] )
+
+#define CONVERT_TEXEL_DWORD( dst, src )					\
+	dst = APPEND16( PACK_COLOR_4444_LE( src[3], src[0], src[1], src[2] ),	\
+			PACK_COLOR_4444_LE( src[7], src[4], src[5], src[6] ) )
+
+#define SRC_TEXEL_BYTES		4
+
+#define TAG(x) x##_abgr8888_to_argb4444
+#include "texutil_tmp.h"
+
+
+#define CONVERT_ARGB4444( name )					\
+static GLboolean							\
+convert_##name##_argb4444( const struct convert_info *convert )		\
+{									\
+   convert_func *tab;							\
+   GLint index = convert->index;					\
+									\
+   if ( convert->format == GL_BGRA &&					\
+	convert->type == GL_UNSIGNED_SHORT_4_4_4_4_REV )		\
+   {									\
+      tab = name##_tab_argb4444_direct;					\
+   }									\
+   else if ( convert->format == GL_RGBA &&				\
+	     convert->type == GL_UNSIGNED_BYTE )			\
+   {									\
+      tab = name##_tab_abgr8888_to_argb4444;				\
+   }									\
+   else									\
+   {									\
+      /* Can't handle this source format/type combination */		\
+      return GL_FALSE;							\
+   }									\
+									\
+   return tab[index]( convert );					\
+}
+
+CONVERT_ARGB4444( texsubimage2d )
+CONVERT_ARGB4444( texsubimage3d )
+
+
+
+/* =============================================================
+ * Convert to ARGB1555 textures:
+ */
+
+#define DST_TYPE		GLushort
+#define DST_TEXELS_PER_DWORD	2
+
+#define CONVERT_TEXEL( dst, src )					\
+	dst = PACK_COLOR_1555_LE( src[3], src[0], src[1], src[2] )
+
+#define CONVERT_DIRECT
+
+#define SRC_TEXEL_BYTES		2
+
+#define TAG(x) x##_argb1555_direct
+#define PRESERVE_DST_TYPE
+#include "texutil_tmp.h"
+
+
+#ifdef MESA_BIG_ENDIAN
+
+#define CONVERT_TEXEL( dst, src )					\
+	{ const GLushort s = *(GLushort *)src;				\
+	  dst = (s >> 9) | ((s & 0x1ff) << 7); }
+
+#define CONVERT_TEXEL_DWORD( dst, src )					\
+	{ const GLuint s = ((fi_type *)src)->i;				\
+	  dst = (((s & 0xfe00fe00) >> 9) |				\
+		 ((s & 0x01ff01ff) << 7)); }
+
+#else
+
+#define CONVERT_TEXEL( dst, src )					\
+	{ const GLushort s = *(GLushort *)src;				\
+	  dst = (s >> 1) | ((s & 1) << 15); }
+
+#define CONVERT_TEXEL_DWORD( dst, src )					\
+	{ const GLuint s = ((fi_type *)src)->i;				\
+	  dst = (((s & 0xfffefffe) >> 1) |				\
+		 ((s & 0x00010001) << 15)); }
+
+#endif
+
+#define SRC_TEXEL_BYTES		2
+
+#define TAG(x) x##_rgba5551_to_argb1555
+#define PRESERVE_DST_TYPE
+#include "texutil_tmp.h"
+
+
+#define CONVERT_TEXEL( dst, src )					\
+	dst = PACK_COLOR_1555_LE( src[3], src[0], src[1], src[2] )
+
+#define CONVERT_TEXEL_DWORD( dst, src )					\
+	dst = APPEND16( PACK_COLOR_1555_LE( src[3], src[0], src[1], src[2] ),	\
+			PACK_COLOR_1555_LE( src[7], src[4], src[5], src[6] ) )
+
+#define SRC_TEXEL_BYTES		4
+
+#define TAG(x) x##_abgr8888_to_argb1555
+#include "texutil_tmp.h"
+
+
+#define CONVERT_ARGB1555( name )					\
+static GLboolean							\
+convert_##name##_argb1555( const struct convert_info *convert )		\
+{									\
+   convert_func *tab;							\
+   GLint index = convert->index;					\
+									\
+   if ( convert->format == GL_BGRA &&					\
+	convert->type == GL_UNSIGNED_SHORT_1_5_5_5_REV )		\
+   {									\
+      tab = name##_tab_argb1555_direct;					\
+   }									\
+   else if ( convert->format == GL_RGBA &&				\
+	     convert->type == GL_UNSIGNED_SHORT_5_5_5_1 )		\
+   {									\
+      tab = name##_tab_rgba5551_to_argb1555;				\
+   }									\
+   else if ( convert->format == GL_RGBA &&				\
+	     convert->type == GL_UNSIGNED_BYTE )			\
+   {									\
+      tab = name##_tab_abgr8888_to_argb1555;				\
+   }									\
+   else									\
+   {									\
+      /* Can't handle this source format/type combination */		\
+      return GL_FALSE;							\
+   }									\
+									\
+   return tab[index]( convert );					\
+}
+
+CONVERT_ARGB1555( texsubimage2d )
+CONVERT_ARGB1555( texsubimage3d )
+
+
+
+/* =============================================================
+ * AL88 textures:
+ */
+
+#define DST_TYPE		GLushort
+#define DST_TEXELS_PER_DWORD	2
+
+#define CONVERT_TEXEL( dst, src )					\
+	dst = PACK_COLOR_88_LE( src[0], src[1] )
+
+#define CONVERT_DIRECT
+
+#define SRC_TEXEL_BYTES		2
+
+#define TAG(x) x##_al88_direct
+#define PRESERVE_DST_TYPE
+#include "texutil_tmp.h"
+
+
+#define CONVERT_TEXEL( dst, src )					\
+	dst = PACK_COLOR_88_LE( src[0], 0x00 )
+
+#define CONVERT_TEXEL_DWORD( dst, src )					\
+	dst = APPEND16( PACK_COLOR_88_LE( src[0], 0x00 ),			\
+			PACK_COLOR_88_LE( src[1], 0x00 ) )
+
+#define SRC_TEXEL_BYTES		1
+
+#define TAG(x) x##_a8_to_al88
+#define PRESERVE_DST_TYPE
+#include "texutil_tmp.h"
+
+
+#define CONVERT_TEXEL( dst, src )					\
+	dst = PACK_COLOR_88_LE( 0xff, src[0] )
+
+#define CONVERT_TEXEL_DWORD( dst, src )					\
+	dst = APPEND16( PACK_COLOR_88_LE( 0xff, src[0] ),			\
+			PACK_COLOR_88_LE( 0xff, src[1] ) )
+
+#define SRC_TEXEL_BYTES		1
+
+#define TAG(x) x##_l8_to_al88
+#define PRESERVE_DST_TYPE
+#include "texutil_tmp.h"
+
+
+#define CONVERT_TEXEL( dst, src )					\
+	dst = PACK_COLOR_88_LE( src[3], src[0] )
+
+#define CONVERT_TEXEL_DWORD( dst, src )					\
+	dst = APPEND16( PACK_COLOR_88_LE( src[3], src[0] ),		\
+			PACK_COLOR_88_LE( src[7], src[4] ) )
+
+#define SRC_TEXEL_BYTES		4
+
+#define TAG(x) x##_abgr8888_to_al88
+#include "texutil_tmp.h"
+
+
+#define CONVERT_AL88( name )						\
+static GLboolean							\
+convert_##name##_al88( const struct convert_info *convert )		\
+{									\
+   convert_func *tab;							\
+   GLint index = convert->index;					\
+									\
+   if ( convert->format == GL_LUMINANCE_ALPHA &&			\
+	convert->type == GL_UNSIGNED_BYTE )				\
+   {									\
+      tab = name##_tab_al88_direct;					\
+   }									\
+   else if ( convert->format == GL_ALPHA &&				\
+	     convert->type == GL_UNSIGNED_BYTE )			\
+   {									\
+      tab = name##_tab_a8_to_al88;					\
+   }									\
+   else if ( convert->format == GL_LUMINANCE &&				\
+	     convert->type == GL_UNSIGNED_BYTE )			\
+   {									\
+      tab = name##_tab_l8_to_al88;					\
+   }									\
+   else if ( convert->format == GL_RGBA &&				\
+	     convert->type == GL_UNSIGNED_BYTE )			\
+   {									\
+      tab = name##_tab_abgr8888_to_al88;				\
+   }									\
+   else									\
+   {									\
+      /* Can't handle this source format/type combination */		\
+      return GL_FALSE;							\
+   }									\
+									\
+   return tab[index]( convert );					\
+}
+
+CONVERT_AL88( texsubimage2d )
+CONVERT_AL88( texsubimage3d )
+
+
+
+/* =============================================================
+ * Convert to RGB332 textures:
+ */
+
+static GLboolean
+convert_texsubimage2d_rgb332( const struct convert_info *convert )
+{
+   /* This is a placeholder for now...
+    */
+   return GL_FALSE;
+}
+
+static GLboolean
+convert_texsubimage3d_rgb332( const struct convert_info *convert )
+{
+   /* This is a placeholder for now...
+    */
+   return GL_FALSE;
+}
+
+
+
+/* =============================================================
+ * CI8 (and all other single-byte texel) textures:
+ */
+
+#define DST_TYPE		GLubyte
+#define DST_TEXELS_PER_DWORD	4
+
+#define CONVERT_TEXEL( dst, src )	dst = src[0]
+
+#define CONVERT_DIRECT
+
+#define SRC_TEXEL_BYTES		1
+
+#define TAG(x) x##_ci8_direct
+#include "texutil_tmp.h"
+
+
+#define CONVERT_CI8( name )						\
+static GLboolean							\
+convert_##name##_ci8( const struct convert_info *convert )		\
+{									\
+   convert_func *tab;							\
+   GLint index = convert->index;					\
+									\
+   if ( ( convert->format == GL_ALPHA ||				\
+	  convert->format == GL_LUMINANCE ||				\
+	  convert->format == GL_INTENSITY ||				\
+	  convert->format == GL_COLOR_INDEX ) &&			\
+	convert->type == GL_UNSIGNED_BYTE )				\
+   {									\
+      tab = name##_tab_ci8_direct;					\
+   }									\
+   else									\
+   {									\
+      /* Can't handle this source format/type combination */		\
+      return GL_FALSE;							\
+   }									\
+									\
+   return tab[index]( convert );					\
+}
+
+CONVERT_CI8( texsubimage2d )
+CONVERT_CI8( texsubimage3d )
+
+
+/* =============================================================
+ * convert to YCBCR textures:
+ */
+
+#define DST_TYPE		GLushort
+#define DST_TEXELS_PER_DWORD	2
+
+#define CONVERT_TEXEL( dst, src ) \
+   dst = (src[0] << 8) | src[1];
+
+#define CONVERT_DIRECT
+
+#define SRC_TEXEL_BYTES		2
+
+#define TAG(x) x##_ycbcr_direct
+#include "texutil_tmp.h"
+
+
+#define CONVERT_YCBCR( name )						\
+static GLboolean							\
+convert_##name##_ycbcr( const struct convert_info *convert )		\
+{									\
+   convert_func *tab;							\
+   GLint index = convert->index;					\
+									\
+   if (convert->format != GL_YCBCR_MESA) {				\
+      /* Can't handle this source format/type combination */		\
+      return GL_FALSE;							\
+   }      								\
+   tab = name##_tab_ycbcr_direct;					\
+									\
+   return tab[index]( convert );					\
+}
+
+CONVERT_YCBCR( texsubimage2d )
+CONVERT_YCBCR( texsubimage3d )
+
+
+/* =============================================================
+ * convert to YCBCR_REV textures:
+ */
+
+#define DST_TYPE		GLushort
+#define DST_TEXELS_PER_DWORD	2
+
+#define CONVERT_TEXEL( dst, src ) \
+   dst = (src[1] << 8) | src[0];
+
+#define CONVERT_DIRECT
+
+#define SRC_TEXEL_BYTES		2
+
+#define TAG(x) x##_ycbcr_rev_direct
+#include "texutil_tmp.h"
+
+
+#define CONVERT_YCBCR_REV( name )					\
+static GLboolean							\
+convert_##name##_ycbcr_rev( const struct convert_info *convert )	\
+{									\
+   convert_func *tab;							\
+   GLint index = convert->index;					\
+									\
+   if (convert->format != GL_YCBCR_MESA) {				\
+      /* Can't handle this source format/type combination */		\
+      return GL_FALSE;							\
+   }      								\
+   tab = name##_tab_ycbcr_rev_direct;					\
+									\
+   return tab[index]( convert );					\
+}
+
+CONVERT_YCBCR_REV( texsubimage2d )
+CONVERT_YCBCR_REV( texsubimage3d )
+
+
+
+/* =============================================================
+ * Global entry points
+ */
+
+static convert_func convert_texsubimage2d_tab[] = {
+   convert_texsubimage2d_rgba8888,
+   convert_texsubimage2d_argb8888,
+   convert_texsubimage2d_rgb888,
+   convert_texsubimage2d_rgb565,
+   convert_texsubimage2d_argb4444,
+   convert_texsubimage2d_argb1555,
+   convert_texsubimage2d_al88,
+   convert_texsubimage2d_rgb332,
+   convert_texsubimage2d_ci8,		/* These are all the same... */
+   convert_texsubimage2d_ci8,
+   convert_texsubimage2d_ci8,
+   convert_texsubimage2d_ci8,
+   convert_texsubimage2d_ycbcr,
+   convert_texsubimage2d_ycbcr_rev,
+};
+
+static convert_func convert_texsubimage3d_tab[] = {
+   convert_texsubimage3d_rgba8888,
+   convert_texsubimage3d_argb8888,
+   convert_texsubimage3d_rgb888,
+   convert_texsubimage3d_rgb565,
+   convert_texsubimage3d_argb4444,
+   convert_texsubimage3d_argb1555,
+   convert_texsubimage3d_al88,
+   convert_texsubimage3d_rgb332,
+   convert_texsubimage3d_ci8,		/* These are all the same... */
+   convert_texsubimage3d_ci8,
+   convert_texsubimage3d_ci8,
+   convert_texsubimage3d_ci8,
+   convert_texsubimage3d_ycbcr,
+   convert_texsubimage3d_ycbcr_rev,
+};
+
+
+/* See if we need to care about the pixel store attributes when we're
+ * converting the texture image.  This should be stored as
+ * unpacking->_SomeBoolean and updated when the values change, to avoid
+ * testing every time...
+ */
+static INLINE GLboolean
+convert_needs_unpacking( const struct gl_pixelstore_attrib *unpacking,
+		       GLenum format, GLenum type )
+{
+   if ( ( unpacking->Alignment == 1 ||
+	  ( unpacking->Alignment == 4 &&   /* Pick up the common Q3A case... */
+	    format == GL_RGBA && type == GL_UNSIGNED_BYTE ) ) &&
+	unpacking->RowLength == 0 &&
+	unpacking->SkipPixels == 0 &&
+	unpacking->SkipRows == 0 &&
+	unpacking->ImageHeight == 0 &&
+	unpacking->SkipImages == 0 &&
+	unpacking->SwapBytes == GL_FALSE &&
+	unpacking->LsbFirst == GL_FALSE ) {
+      return GL_FALSE;
+   } else {
+      return GL_TRUE;
+   }
+}
+
+
+GLboolean
+_mesa_convert_texsubimage1d( GLint mesaFormat,
+			     GLint xoffset,
+			     GLint width,
+			     GLenum format, GLenum type,
+			     const struct gl_pixelstore_attrib *unpacking,
+			     const GLvoid *srcImage, GLvoid *dstImage )
+{
+   struct convert_info convert;
+
+   ASSERT( unpacking );
+   ASSERT( srcImage );
+   ASSERT( dstImage );
+
+   ASSERT( mesaFormat >= MESA_FORMAT_RGBA8888 );
+   ASSERT( mesaFormat <= MESA_FORMAT_YCBCR_REV );
+
+   /* Make it easier to pass all the parameters around.
+    */
+   convert.xoffset = xoffset;
+   convert.yoffset = 0;
+   convert.width = width;
+   convert.height = 1;
+   convert.format = format;
+   convert.type = type;
+   convert.unpacking = unpacking;
+   convert.srcImage = srcImage;
+   convert.dstImage = dstImage;
+
+   convert.index = 0;
+
+   if ( convert_needs_unpacking( unpacking, format, type ) )
+      convert.index |= CONVERT_UNPACKING_BIT;
+
+   ASSERT(convert.index < 4);
+
+   return convert_texsubimage2d_tab[mesaFormat]( &convert );
+}
+
+
+/* Convert a user's 2D image into a texture image.  This basically
+ * repacks pixel data into the special texture formats used by core Mesa
+ * and the DRI drivers.  This function can do full images or subimages.
+ *
+ * We return a boolean because this function may not accept some kinds
+ * of source image formats and/or types.  For example, if the incoming
+ * format/type = GL_BGR, GL_UNSIGNED_INT this function probably won't
+ * be able to do the conversion.
+ *
+ * In that case, the incoming image should first be simplified to one of
+ * the "canonical" formats (GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA,
+ * GL_INTENSITY, GL_RGB, GL_RGBA) and types (GL_CHAN).  We can do that
+ * with the _mesa_transfer_teximage() function.  That function will also
+ * do image transfer operations such as scale/bias and convolution.
+ *
+ * \param
+ *   mesaFormat - one of the MESA_FORMAT_* values from texformat.h
+ *   xoffset, yoffset - position in dest image to put data
+ *   width, height - incoming image size, also size of dest region.
+ *   dstImageWidth - width (row stride) of dest image in pixels
+ *   format, type - incoming image format and type
+ *   unpacking - describes incoming image unpacking
+ *   srcImage - pointer to source image
+ *   destImage - pointer to dest image
+ */
+GLboolean
+_mesa_convert_texsubimage2d( GLint mesaFormat,  /* dest */
+			     GLint xoffset, GLint yoffset,
+			     GLint width, GLint height,
+			     GLint destImageWidth,
+			     GLenum format, GLenum type,  /* source */
+			     const struct gl_pixelstore_attrib *unpacking,
+			     const GLvoid *srcImage, GLvoid *dstImage )
+{
+   struct convert_info convert;
+
+   ASSERT( unpacking );
+   ASSERT( srcImage );
+   ASSERT( dstImage );
+
+   ASSERT( mesaFormat >= MESA_FORMAT_RGBA8888 );
+   ASSERT( mesaFormat <= MESA_FORMAT_YCBCR_REV );
+
+   /* Make it easier to pass all the parameters around.
+    */
+   convert.xoffset = xoffset;
+   convert.yoffset = yoffset;
+   convert.width = width;
+   convert.height = height;
+   convert.dstImageWidth = destImageWidth;
+   convert.format = format;
+   convert.type = type;
+   convert.unpacking = unpacking;
+   convert.srcImage = srcImage;
+   convert.dstImage = dstImage;
+
+   convert.index = 0;
+
+   if ( convert_needs_unpacking( unpacking, format, type ) )
+      convert.index |= CONVERT_UNPACKING_BIT;
+
+   if ( width != destImageWidth )
+      convert.index |= CONVERT_STRIDE_BIT;
+
+   return convert_texsubimage2d_tab[mesaFormat]( &convert );
+}
+
+GLboolean
+_mesa_convert_texsubimage3d( GLint mesaFormat,  /* dest */
+			     GLint xoffset, GLint yoffset, GLint zoffset,
+			     GLint width, GLint height, GLint depth,
+			     GLint dstImageWidth, GLint dstImageHeight,
+			     GLenum format, GLenum type,  /* source */
+			     const struct gl_pixelstore_attrib *unpacking,
+			     const GLvoid *srcImage, GLvoid *dstImage )
+{
+   struct convert_info convert;
+
+   ASSERT( unpacking );
+   ASSERT( srcImage );
+   ASSERT( dstImage );
+
+   ASSERT( mesaFormat >= MESA_FORMAT_RGBA8888 );
+   ASSERT( mesaFormat <= MESA_FORMAT_YCBCR_REV );
+
+   /* Make it easier to pass all the parameters around.
+    */
+   convert.xoffset = xoffset;
+   convert.yoffset = yoffset;
+   convert.zoffset = zoffset;
+   convert.width = width;
+   convert.height = height;
+   convert.depth = depth;
+   convert.dstImageWidth = dstImageWidth;
+   convert.dstImageHeight = dstImageHeight;
+   convert.format = format;
+   convert.type = type;
+   convert.unpacking = unpacking;
+   convert.srcImage = srcImage;
+   convert.dstImage = dstImage;
+
+   convert.index = 0;
+
+   if ( convert_needs_unpacking( unpacking, format, type ) )
+      convert.index |= CONVERT_UNPACKING_BIT;
+
+   if ( width != dstImageWidth || height != dstImageHeight )
+      convert.index |= CONVERT_STRIDE_BIT;
+
+   return convert_texsubimage3d_tab[mesaFormat]( &convert );
+}
+
+
+
+/* Nearest filtering only (for broken hardware that can't support
+ * all aspect ratios).  This can be made a lot faster, but I don't
+ * really care enough...
+ */
+void _mesa_rescale_teximage2d( GLuint bytesPerPixel, GLuint dstRowStride,
+			       GLint srcWidth, GLint srcHeight,
+			       GLint dstWidth, GLint dstHeight,
+			       const GLvoid *srcImage, GLvoid *dstImage )
+{
+   GLint row, col;
+
+#define INNER_LOOP( TYPE, HOP, WOP )					\
+   for ( row = 0 ; row < dstHeight ; row++ ) {				\
+      GLint srcRow = row HOP hScale;					\
+      for ( col = 0 ; col < dstWidth ; col++ ) {			\
+	 GLint srcCol = col WOP wScale;					\
+	 dst[col] = src[srcRow * srcWidth + srcCol];			\
+      }									\
+      dst = (TYPE *) ((GLubyte *) dst + dstRowStride);			\
+   }									\
+
+#define RESCALE_IMAGE( TYPE )						\
+do {									\
+   const TYPE *src = (const TYPE *)srcImage;				\
+   TYPE *dst = (TYPE *)dstImage;					\
+									\
+   if ( srcHeight <= dstHeight ) {					\
+      const GLint hScale = dstHeight / srcHeight;			\
+      if ( srcWidth <= dstWidth ) {					\
+	 const GLint wScale = dstWidth / srcWidth;			\
+	 INNER_LOOP( TYPE, /, / );					\
+      }									\
+      else {								\
+	 const GLint wScale = srcWidth / dstWidth;			\
+	 INNER_LOOP( TYPE, /, * );					\
+      }									\
+   }									\
+   else {								\
+      const GLint hScale = srcHeight / dstHeight;			\
+      if ( srcWidth <= dstWidth ) {					\
+	 const GLint wScale = dstWidth / srcWidth;			\
+	 INNER_LOOP( TYPE, *, / );					\
+      }									\
+      else {								\
+	 const GLint wScale = srcWidth / dstWidth;			\
+	 INNER_LOOP( TYPE, *, * );					\
+      }									\
+   }									\
+} while (0)
+
+   switch ( bytesPerPixel ) {
+   case 4:
+      RESCALE_IMAGE( GLuint );
+      break;
+
+   case 2:
+      RESCALE_IMAGE( GLushort );
+      break;
+
+   case 1:
+      RESCALE_IMAGE( GLubyte );
+      break;
+   default:
+      _mesa_problem(NULL,"unexpected bytes/pixel in _mesa_rescale_teximage2d");
+   }
+}
diff --git a/reactos/lib/mesa32/src/main/texutil.h b/reactos/lib/mesa32/src/main/texutil.h
new file mode 100644
index 00000000000..97e629cfb48
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/texutil.h
@@ -0,0 +1,72 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Gareth Hughes
+ */
+
+
+#ifndef TEXUTIL_H
+#define TEXUTIL_H
+
+#include "mtypes.h"
+#include "texformat.h"
+
+extern GLboolean
+_mesa_convert_texsubimage1d( GLint mesaFormat,
+			     GLint xoffset,
+			     GLint width,
+			     GLenum format, GLenum type,
+			     const struct gl_pixelstore_attrib *packing,
+			     const GLvoid *srcImage, GLvoid *dstImage );
+
+extern GLboolean
+_mesa_convert_texsubimage2d( GLint mesaFormat,
+			     GLint xoffset, GLint yoffset,
+			     GLint width, GLint height,
+			     GLint imageWidth,
+			     GLenum format, GLenum type,
+			     const struct gl_pixelstore_attrib *packing,
+			     const GLvoid *srcImage, GLvoid *dstImage );
+
+extern GLboolean
+_mesa_convert_texsubimage3d( GLint mesaFormat,
+			     GLint xoffset, GLint yoffset, GLint zoffset,
+			     GLint width, GLint height, GLint depth,
+			     GLint imageWidth, GLint imageHeight,
+			     GLenum format, GLenum type,
+			     const struct gl_pixelstore_attrib *packing,
+			     const GLvoid *srcImage, GLvoid *dstImage );
+
+/* Nearest filtering only (for broken hardware that can't support
+ * all aspect ratios).  FIXME: Make this a subimage update as well...
+ */
+extern void
+_mesa_rescale_teximage2d( GLuint bytesPerPixel, GLuint dstRowStride,
+			  GLint srcWidth, GLint srcHeight,
+			  GLint dstWidth, GLint dstHeight,
+			  const GLvoid *srcImage, GLvoid *dstImage );
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/texutil_tmp.h b/reactos/lib/mesa32/src/main/texutil_tmp.h
new file mode 100644
index 00000000000..0be341c87c3
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/texutil_tmp.h
@@ -0,0 +1,526 @@
+/**
+ * \file texutil_tmp.h
+ * Texture conversion templates.
+ *
+ * \author Gareth Hughes
+ *
+ * For 2D and 3D texture images, we generate functions for
+ *  - conversion without pixel unpacking and standard stride
+ *  - conversion without pixel unpacking and non-standard stride
+ *  - conversion with pixel unpacking and standard stride
+ *  - conversion with pixel unpacking and non-standard stride
+ *
+ * Macros which need to be defined before including this file:
+ *  - \c TAG(x) - the function name wrapper
+ *  - \c DST_TYPE - the destination texel data type (GLuint, GLushort, etc)
+ *  - \c DST_TEXELS_PER_DWORD - number of destination texels that'll fit in 4 bytes
+ *  - \c CONVERT_TEXEL - code to convert from source to destination texel
+ *  - \c CONVER_TEXEL_DWORD - if multiple texels fit in 4 bytes, this macros
+ *  will convert/store multiple texels at once
+ *  - \c CONVERT_DIRECT - if defined, just memcpy texels from source to destination
+ *  - \c SRC_TEXEL_BYTES - bytes per source texel
+ *  - \c PRESERVE_DST_TYPE - if defined, don't undefined these macros at end
+ *  
+ * \sa convert_func.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.0.2
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#define DST_TEXEL_BYTES		(4 / DST_TEXELS_PER_DWORD)
+#define DST_ROW_BYTES		(convert->width * DST_TEXEL_BYTES)
+#define DST_ROW_STRIDE		(convert->dstImageWidth * DST_TEXEL_BYTES)
+#define DST_IMG_STRIDE		(convert->dstImageWidth *		\
+				 convert->dstImageHeight * DST_TEXEL_BYTES)
+
+
+/***************************************************************/
+/** \name Doesn't require pixelstore attributes or stride
+ *
+ * \code width == dstImageWidth \endcode 
+ * and
+ * \code height == dstImageHeight \endcode
+ * if applicable.
+ */
+/*@{*/
+
+/** \sa convert_func */
+static GLboolean
+TAG(texsubimage2d)( const struct convert_info *convert )
+{
+   const GLubyte *src = (const GLubyte *)convert->srcImage;
+   GLuint *dst = (GLuint *)((GLubyte *)convert->dstImage +
+			    (convert->yoffset * convert->dstImageWidth +
+			     convert->xoffset) * DST_TEXEL_BYTES);
+
+#if DEBUG_TEXUTIL
+   _mesa_debug( NULL, __FUNCTION__ "\n" );
+#endif
+
+#ifdef CONVERT_DIRECT
+   MEMCPY( dst, src, convert->height * DST_ROW_BYTES );
+#else
+   {
+      const GLint texels = convert->width * convert->height;
+      const GLint dwords = texels / DST_TEXELS_PER_DWORD;
+      const GLint leftover = texels - dwords * DST_TEXELS_PER_DWORD;
+      GLint i;
+      for ( i = 0 ; i < dwords ; i++ ) {
+         CONVERT_TEXEL_DWORD( *dst++, src );
+         src += SRC_TEXEL_BYTES * DST_TEXELS_PER_DWORD;
+      }
+      for ( i = 0; i < leftover; i++ ) {
+         CONVERT_TEXEL( *dst++, src );
+         src += SRC_TEXEL_BYTES;
+      }
+   }
+#endif
+
+   return GL_TRUE;
+}
+
+/** \sa convert_func */
+static GLboolean
+TAG(texsubimage3d)( const struct convert_info *convert )
+{
+   const GLubyte *src = (const GLubyte *)convert->srcImage;
+   GLuint *dst = (GLuint *)((GLubyte *)convert->dstImage +
+			    ((convert->zoffset * convert->height +
+			      convert->yoffset) * convert->width +
+			     convert->xoffset) * DST_TEXEL_BYTES);
+#if DEBUG_TEXUTIL
+   _mesa_debug( NULL, __FUNCTION__ "\n" );
+#endif
+
+#ifdef CONVERT_DIRECT
+   MEMCPY( dst, src, convert->depth * convert->height * DST_ROW_BYTES );
+#else
+   {
+      const GLint texels = convert->width * convert->height * convert->depth;
+      const GLint dwords = texels / DST_TEXELS_PER_DWORD;
+      const GLint leftover = texels - dwords * DST_TEXELS_PER_DWORD;
+      GLint i;
+      for ( i = 0 ; i < dwords ; i++ ) {
+         CONVERT_TEXEL_DWORD( *dst++, src );
+         src += SRC_TEXEL_BYTES * DST_TEXELS_PER_DWORD;
+      }
+      for ( i = 0; i < leftover; i++ ) {
+         CONVERT_TEXEL( *dst++, src );
+         src += SRC_TEXEL_BYTES;
+      }
+   }
+#endif
+
+   return GL_TRUE;
+}
+
+/*@}*/
+
+
+/***************************************************************/
+/** \name Requires stride but no pixelstore attributes
+ *
+ * \code width != dstImageWidth \endcode 
+ * or
+ * \code height != dstImageHeight \endcode
+ * if applicable.
+ */
+/*@{*/
+
+/** \sa convert_func */
+static GLboolean
+TAG(texsubimage2d_stride)( const struct convert_info *convert )
+{
+   const GLubyte *src = (const GLubyte *)convert->srcImage;
+   DST_TYPE *dst = (DST_TYPE *)((GLubyte *)convert->dstImage +
+				(convert->yoffset * convert->dstImageWidth +
+				 convert->xoffset) * DST_TEXEL_BYTES);
+   GLint adjust;
+   GLint row, col;
+
+   adjust = convert->dstImageWidth - convert->width;
+
+#if DEBUG_TEXUTIL
+   _mesa_debug( NULL, __FUNCTION__ ":\n" );
+   _mesa_debug( NULL, "   x=%d y=%d w=%d h=%d s=%d\n",
+            convert->xoffset, convert->yoffset, convert->width,
+            convert->height, convert->dstImageWidth );
+   _mesa_debug( NULL, "   adjust=%d\n", adjust );
+#endif
+
+   for ( row = 0 ; row < convert->height ; row++ ) {
+      for ( col = 0 ; col < convert->width ; col++ ) {
+	 CONVERT_TEXEL( *dst++, src );
+	 src += SRC_TEXEL_BYTES;
+      }
+      dst += adjust;
+   }
+
+   return GL_TRUE;
+}
+
+/** \sa convert_func */
+static GLboolean
+TAG(texsubimage3d_stride)( const struct convert_info *convert )
+{
+   const GLubyte *src = (const GLubyte *)convert->srcImage;
+   DST_TYPE *dst = (DST_TYPE *)((GLubyte *)convert->dstImage +
+				((convert->zoffset * convert->dstImageHeight +
+				  convert->yoffset) * convert->dstImageWidth +
+				 convert->xoffset) * DST_TEXEL_BYTES);
+   GLint adjust;
+   GLint row, col, img;
+
+   adjust = convert->dstImageWidth - convert->width;
+
+#if DEBUG_TEXUTIL
+   _mesa_debug( NULL, __FUNCTION__ ":\n" );
+   _mesa_debug( NULL, "   x=%d y=%d w=%d h=%d s=%d\n",
+            convert->xoffset, convert->yoffset, convert->width,
+            convert->height, convert->dstImageWidth );
+   _mesa_debug( NULL, "   adjust=%d\n", adjust );
+#endif
+
+   for ( img = 0 ; img < convert->depth ; img++ ) {
+      for ( row = 0 ; row < convert->height ; row++ ) {
+	 for ( col = 0 ; col < convert->width ; col++ ) {
+	    CONVERT_TEXEL( *dst++, src );
+	    src += SRC_TEXEL_BYTES;
+	 }
+	 dst += adjust;
+      }
+      /* FIXME: ... */
+   }
+
+   return GL_TRUE;
+}
+
+/*@}*/
+
+
+/***************************************************************/
+/** \name Requires pixelstore attributes but no stride.
+ *
+ * \code width == dstImageWidth \endcode 
+ * and
+ * \code height == dstImageHeight \endcode
+ * if applicable.
+ */
+/*@{*/
+
+/** \sa convert_func */
+static GLboolean
+TAG(texsubimage2d_unpack)( const struct convert_info *convert )
+{
+   const GLubyte *src = (const GLubyte *)
+      _mesa_image_address( convert->unpacking, convert->srcImage,
+			   convert->width, convert->height,
+			   convert->format, convert->type, 0, 0, 0 );
+   const GLint srcRowStride =
+      _mesa_image_row_stride( convert->unpacking, convert->width,
+			      convert->format, convert->type );
+   GLint row, col;
+
+#if DEBUG_TEXUTIL
+   _mesa_debug( NULL, __FUNCTION__ "\n" );
+#endif
+
+   if (convert->width & (DST_TEXELS_PER_DWORD - 1)) {
+      /* Can't use dword conversion (i.e. when width = 1 and texels/dword = 2
+       * or width = 2 and texels/dword = 4).
+       */
+      DST_TYPE *dst = (DST_TYPE *)((GLubyte *)convert->dstImage +
+                                   (convert->yoffset * convert->width +
+                                    convert->xoffset) * DST_TEXEL_BYTES);
+      for ( row = 0 ; row < convert->height ; row++ ) {
+         const GLubyte *srcRow = src;
+         for ( col = 0; col < convert->width; col++ ) {
+            CONVERT_TEXEL(*dst, src);
+            src += SRC_TEXEL_BYTES;
+         }
+         src = srcRow + srcRowStride;
+      }
+   }
+   else {
+      /* the common case */
+      GLuint *dst = (GLuint *)((GLubyte *)convert->dstImage +
+                               (convert->yoffset * convert->width +
+                                convert->xoffset) * DST_TEXEL_BYTES);
+      for ( row = 0 ; row < convert->height ; row++ ) {
+#ifdef CONVERT_DIRECT
+         MEMCPY( dst, src, DST_ROW_STRIDE );
+         src += srcRowStride;
+         dst = (GLuint *)((GLubyte *)dst + DST_ROW_STRIDE);
+#else
+         const GLubyte *srcRow = src;
+         for ( col = convert->width / DST_TEXELS_PER_DWORD ; col ; col-- ) {
+            CONVERT_TEXEL_DWORD( *dst++, src );
+            src += SRC_TEXEL_BYTES * DST_TEXELS_PER_DWORD;
+         }
+         src = srcRow + srcRowStride;
+#endif
+      }
+   }
+
+   return GL_TRUE;
+}
+
+/** \sa convert_func */
+static GLboolean
+TAG(texsubimage3d_unpack)( const struct convert_info *convert )
+{
+   const GLubyte *src = (const GLubyte *)
+      _mesa_image_address( convert->unpacking, convert->srcImage,
+			   convert->width, convert->height,
+			   convert->format, convert->type, 0, 0, 0 );
+   const GLint srcImgStride = (const GLubyte *)
+      _mesa_image_address( convert->unpacking, convert->srcImage,
+			   convert->width, convert->height,
+			   convert->format, convert->type, 1, 0, 0 ) - src;
+   const GLint srcRowStride =
+      _mesa_image_row_stride( convert->unpacking, convert->width,
+			      convert->format, convert->type );
+   GLint row, col, img;
+
+#if DEBUG_TEXUTIL
+   _mesa_debug( NULL, __FUNCTION__ "\n" );
+#endif
+
+   if (convert->width & (DST_TEXELS_PER_DWORD - 1)) {
+      /* Can't use dword conversion (i.e. when width = 1 and texels/dword = 2
+       * or width = 2 and texels/dword = 4).
+       */
+      DST_TYPE *dst = (DST_TYPE *)((GLubyte *)convert->dstImage +
+                                   ((convert->zoffset * convert->height +
+                                     convert->yoffset) * convert->width +
+                                    convert->xoffset) * DST_TEXEL_BYTES);
+      for ( img = 0 ; img < convert->depth ; img++ ) {
+         const GLubyte *srcImage = src;
+         for ( row = 0 ; row < convert->height ; row++ ) {
+            const GLubyte *srcRow = src;
+            for ( col = 0; col < convert->width; col++ ) {
+               CONVERT_TEXEL(*dst, src);
+               src += SRC_TEXEL_BYTES;
+            }
+            src = srcRow + srcRowStride;
+         }
+         src = srcImage + srcImgStride;
+      }
+   }
+   else {
+      /* the common case */
+      GLuint *dst = (GLuint *)((GLubyte *)convert->dstImage +
+                               ((convert->zoffset * convert->height +
+                                 convert->yoffset) * convert->width +
+                                convert->xoffset) * DST_TEXEL_BYTES);
+      for ( img = 0 ; img < convert->depth ; img++ ) {
+         const GLubyte *srcImage = src;
+         for ( row = 0 ; row < convert->height ; row++ ) {
+#ifdef CONVERT_DIRECT
+            MEMCPY( dst, src, DST_ROW_STRIDE );
+            src += srcRowStride;
+            dst = (GLuint *)((GLubyte *)dst + DST_ROW_STRIDE);
+#else
+            const GLubyte *srcRow = src;
+            for ( col = convert->width / DST_TEXELS_PER_DWORD ; col ; col-- ) {
+               CONVERT_TEXEL_DWORD( *dst++, src );
+               src += SRC_TEXEL_BYTES * DST_TEXELS_PER_DWORD;
+            }
+            src = srcRow + srcRowStride;
+#endif
+         }
+         src = srcImage + srcImgStride;
+      }
+   }
+
+   return GL_TRUE;
+}
+
+/*@}*/
+
+
+/***************************************************************/
+/** \name Requires pixelstore attributes and stride.
+ *
+ * \code width != dstImageWidth \endcode 
+ * or
+ * \code height != dstImageHeight \endcode
+ * if applicable.
+ */
+/*@{*/
+
+/** \sa convert_func */
+static GLboolean
+TAG(texsubimage2d_stride_unpack)( const struct convert_info *convert )
+{
+   const GLubyte *src = (const GLubyte *)
+      _mesa_image_address( convert->unpacking, convert->srcImage,
+			   convert->width, convert->height,
+			   convert->format, convert->type, 0, 0, 0 );
+   const GLint srcRowStride =
+      _mesa_image_row_stride( convert->unpacking, convert->width,
+			      convert->format, convert->type );
+   DST_TYPE *dst = (DST_TYPE *)((GLubyte *)convert->dstImage +
+				(convert->yoffset * convert->dstImageWidth +
+				 convert->xoffset) * DST_TEXEL_BYTES);
+   GLint row;
+#ifndef CONVERT_DIRECT
+   GLint adjust = convert->dstImageWidth - convert->width;
+#endif
+
+#if DEBUG_TEXUTIL
+   _mesa_debug( NULL, __FUNCTION__ ":\n" );
+   _mesa_debug( NULL, "   x=%d y=%d w=%d h=%d s=%d\n",
+            convert->xoffset, convert->yoffset, convert->width,
+            convert->height, convert->dstImageWidth );
+#endif
+
+   for ( row = 0 ; row < convert->height ; row++ ) {
+#ifdef CONVERT_DIRECT
+      MEMCPY( dst, src, DST_ROW_BYTES );
+      src += srcRowStride;
+      dst += convert->dstImageWidth;
+#else
+      const GLubyte *srcRow = src;
+      GLint col;
+      for ( col = 0 ; col < convert->width ; col++ ) {
+	 CONVERT_TEXEL( *dst++, src );
+	 src += SRC_TEXEL_BYTES;
+      }
+      src = srcRow + srcRowStride;
+      dst += adjust;
+#endif
+   }
+
+   return GL_TRUE;
+}
+
+/** \sa convert_func */
+static GLboolean
+TAG(texsubimage3d_stride_unpack)( const struct convert_info *convert )
+{
+   const GLubyte *src = (const GLubyte *)
+      _mesa_image_address( convert->unpacking, convert->srcImage,
+			   convert->width, convert->height,
+			   convert->format, convert->type, 0, 0, 0 );
+   const GLint srcImgStride = (const GLubyte *)
+      _mesa_image_address( convert->unpacking, convert->srcImage,
+			   convert->width, convert->height,
+			   convert->format, convert->type, 1, 0, 0 ) - src;
+   const GLint srcRowStride =
+      _mesa_image_row_stride( convert->unpacking, convert->width,
+			      convert->format, convert->type );
+   DST_TYPE *dst = (DST_TYPE *)((GLubyte *)convert->dstImage +
+				((convert->zoffset * convert->dstImageHeight +
+				  convert->yoffset) * convert->dstImageWidth +
+				 convert->xoffset) * DST_TEXEL_BYTES);
+   GLint row, img;
+#ifndef CONVERT_DIRECT
+   GLint adjust = convert->dstImageWidth - convert->width;
+#endif
+
+#if DEBUG_TEXUTIL
+   _mesa_debug( NULL, __FUNCTION__ ":\n" );
+   _mesa_debug( NULL, "   x=%d y=%d w=%d h=%d s=%d\n",
+            convert->xoffset, convert->yoffset, convert->width,
+            convert->height, convert->dstImageWidth );
+#endif
+
+   for ( img = 0 ; img < convert->depth ; img++ ) {
+      const GLubyte *srcImage = src;
+      for ( row = 0 ; row < convert->height ; row++ ) {
+#ifdef CONVERT_DIRECT
+	 MEMCPY( dst, src, DST_ROW_BYTES );
+	 src += srcRowStride;
+	 dst += convert->dstImageWidth;
+#else
+	 const GLubyte *srcRow = src;
+	 GLint col;
+	 for ( col = 0 ; col < convert->width ; col++ ) {
+	    CONVERT_TEXEL( *dst++, src );
+	    src += SRC_TEXEL_BYTES;
+	 }
+	 src = srcRow + srcRowStride;
+	 dst += adjust;
+#endif
+      }
+      src = srcImage + srcImgStride;
+   }
+
+   return GL_TRUE;
+}
+
+/*@}*/
+
+
+/***********************************************************************/
+/** \name Conversion function tables
+ */
+/*@{*/
+
+/**
+ * 2D texture conversion functions table.
+ * 
+ * \sa convert_func.
+ */
+static convert_func TAG(texsubimage2d_tab)[] = {
+   TAG(texsubimage2d),
+   TAG(texsubimage2d_stride),
+   TAG(texsubimage2d_unpack),
+   TAG(texsubimage2d_stride_unpack),
+};
+
+/**
+ * 3D texture conversion functions table.
+ *
+ * \sa convert_func.
+ */
+static convert_func TAG(texsubimage3d_tab)[] = {
+   TAG(texsubimage3d),
+   TAG(texsubimage3d_stride),
+   TAG(texsubimage3d_unpack),
+   TAG(texsubimage3d_stride_unpack),
+};
+
+/*@}*/
+
+
+#ifndef PRESERVE_DST_TYPE
+#undef DST_TYPE
+#undef DST_TEXELS_PER_DWORD
+#endif
+
+#undef SRC_TEXEL_BYTES
+#undef DST_TEXEL_BYTES
+#undef DST_ROW_BYTES
+#undef DST_ROW_STRIDE
+
+#undef CONVERT_TEXEL
+#undef CONVERT_TEXEL_DWORD
+#undef CONVERT_DIRECT
+
+#undef TAG
+
+#undef PRESERVE_DST_TYPE
diff --git a/reactos/lib/mesa32/src/main/varray.c b/reactos/lib/mesa32/src/main/varray.c
new file mode 100644
index 00000000000..84c5a3bfdbc
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/varray.c
@@ -0,0 +1,989 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0.1
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "imports.h"
+#include "context.h"
+#include "enable.h"
+#include "enums.h"
+#include "dlist.h"
+#include "texstate.h"
+#include "mtypes.h"
+#include "varray.h"
+
+
+#ifndef GL_BOOLEAN
+#define GL_BOOLEAN 0x9999
+#endif
+
+
+/**
+ * Update the fields of a vertex array structure.
+ * We need to do a few special things for arrays that live in
+ * vertex buffer objects.
+ */
+static void
+update_array(GLcontext *ctx, struct gl_client_array *array,
+             GLuint dirtyFlag, GLsizei elementSize,
+             GLint size, GLenum type,
+             GLsizei stride, GLboolean normalized, const GLvoid *ptr)
+{
+   array->Size = size;
+   array->Type = type;
+   array->Stride = stride;
+   array->StrideB = stride ? stride : elementSize;
+   array->Normalized = normalized;
+   array->Ptr = (const GLubyte *) ptr;
+#if FEATURE_ARB_vertex_buffer_object
+   array->BufferObj->RefCount--;
+   /* XXX free buffer object if RefCount == 0 ? */
+   array->BufferObj = ctx->Array.ArrayBufferObj;
+   array->BufferObj->RefCount++;
+   /* Compute the index of the last array element that's inside the buffer.
+    * Later in glDrawArrays we'll check if start + count > _MaxElement to
+    * be sure we won't go out of bounds.
+    */
+   if (ctx->Array.ArrayBufferObj->Name)
+      array->_MaxElement = ((GLsizeiptrARB) ctx->Array.ArrayBufferObj->Size
+                            - (GLsizeiptrARB) array->Ptr) / array->StrideB;
+   else
+#endif
+      array->_MaxElement = 2 * 1000 * 1000 * 1000; /* just a big number */
+
+   ctx->NewState |= _NEW_ARRAY;
+   ctx->Array.NewState |= dirtyFlag;
+}
+
+
+void GLAPIENTRY
+_mesa_VertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
+{
+   GLsizei elementSize;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (size < 2 || size > 4) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexPointer(size)" );
+      return;
+   }
+   if (stride < 0) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexPointer(stride)" );
+      return;
+   }
+
+   if (MESA_VERBOSE&(VERBOSE_VARRAY|VERBOSE_API))
+      _mesa_debug(ctx, "glVertexPointer( sz %d type %s stride %d )\n", size,
+                  _mesa_lookup_enum_by_nr( type ), stride);
+
+   /* always need to check that <type> is legal */
+   switch (type) {
+      case GL_SHORT:
+         elementSize = size * sizeof(GLshort);
+         break;
+      case GL_INT:
+         elementSize = size * sizeof(GLint);
+         break;
+      case GL_FLOAT:
+         elementSize = size * sizeof(GLfloat);
+         break;
+      case GL_DOUBLE:
+         elementSize = size * sizeof(GLdouble);
+         break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glVertexPointer(type)" );
+         return;
+   }
+
+   update_array(ctx, &ctx->Array.Vertex, _NEW_ARRAY_VERTEX,
+                elementSize, size, type, stride, GL_FALSE, ptr);
+
+   if (ctx->Driver.VertexPointer)
+      ctx->Driver.VertexPointer( ctx, size, type, stride, ptr );
+}
+
+
+void GLAPIENTRY
+_mesa_NormalPointer(GLenum type, GLsizei stride, const GLvoid *ptr )
+{
+   GLsizei elementSize;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (stride < 0) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glNormalPointer(stride)" );
+      return;
+   }
+
+   if (MESA_VERBOSE&(VERBOSE_VARRAY|VERBOSE_API))
+      _mesa_debug(ctx, "glNormalPointer( type %s stride %d )\n",
+                  _mesa_lookup_enum_by_nr( type ), stride);
+
+   switch (type) {
+      case GL_BYTE:
+         elementSize = 3 * sizeof(GLbyte);
+         break;
+      case GL_SHORT:
+         elementSize = 3 * sizeof(GLshort);
+         break;
+      case GL_INT:
+         elementSize = 3 * sizeof(GLint);
+         break;
+      case GL_FLOAT:
+         elementSize = 3 * sizeof(GLfloat);
+         break;
+      case GL_DOUBLE:
+         elementSize = 3 * sizeof(GLdouble);
+         break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glNormalPointer(type)" );
+         return;
+   }
+
+   update_array(ctx, &ctx->Array.Normal, _NEW_ARRAY_NORMAL,
+                elementSize, 3, type, stride, GL_FALSE, ptr);
+
+   if (ctx->Driver.NormalPointer)
+      ctx->Driver.NormalPointer( ctx, type, stride, ptr );
+}
+
+
+void GLAPIENTRY
+_mesa_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
+{
+   GLsizei elementSize;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (size < 3 || size > 4) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glColorPointer(size)" );
+      return;
+   }
+   if (stride < 0) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glColorPointer(stride)" );
+      return;
+   }
+
+   if (MESA_VERBOSE&(VERBOSE_VARRAY|VERBOSE_API))
+      _mesa_debug(ctx, "glColorPointer( sz %d type %s stride %d )\n", size,
+                  _mesa_lookup_enum_by_nr( type ), stride);
+
+   switch (type) {
+      case GL_BYTE:
+         elementSize = size * sizeof(GLbyte);
+         break;
+      case GL_UNSIGNED_BYTE:
+         elementSize = size * sizeof(GLubyte);
+         break;
+      case GL_SHORT:
+         elementSize = size * sizeof(GLshort);
+         break;
+      case GL_UNSIGNED_SHORT:
+         elementSize = size * sizeof(GLushort);
+         break;
+      case GL_INT:
+         elementSize = size * sizeof(GLint);
+         break;
+      case GL_UNSIGNED_INT:
+         elementSize = size * sizeof(GLuint);
+         break;
+      case GL_FLOAT:
+         elementSize = size * sizeof(GLfloat);
+         break;
+      case GL_DOUBLE:
+         elementSize = size * sizeof(GLdouble);
+         break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glColorPointer(type)" );
+         return;
+   }
+
+   update_array(ctx, &ctx->Array.Color, _NEW_ARRAY_COLOR0,
+                elementSize, size, type, stride, GL_FALSE, ptr);
+
+   if (ctx->Driver.ColorPointer)
+      ctx->Driver.ColorPointer( ctx, size, type, stride, ptr );
+}
+
+
+void GLAPIENTRY
+_mesa_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr)
+{
+   GLint elementSize;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (stride < 0) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glFogCoordPointer(stride)" );
+      return;
+   }
+
+   switch (type) {
+      case GL_FLOAT:
+         elementSize = sizeof(GLfloat);
+         break;
+      case GL_DOUBLE:
+         elementSize = sizeof(GLdouble);
+         break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glFogCoordPointer(type)" );
+         return;
+   }
+
+   update_array(ctx, &ctx->Array.FogCoord, _NEW_ARRAY_FOGCOORD,
+                elementSize, 1, type, stride, GL_FALSE, ptr);
+
+   if (ctx->Driver.FogCoordPointer)
+      ctx->Driver.FogCoordPointer( ctx, type, stride, ptr );
+}
+
+
+void GLAPIENTRY
+_mesa_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr)
+{
+   GLsizei elementSize;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (stride < 0) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glIndexPointer(stride)" );
+      return;
+   }
+
+   switch (type) {
+      case GL_UNSIGNED_BYTE:
+         elementSize = sizeof(GLubyte);
+         break;
+      case GL_SHORT:
+         elementSize = sizeof(GLshort);
+         break;
+      case GL_INT:
+         elementSize = sizeof(GLint);
+         break;
+      case GL_FLOAT:
+         elementSize = sizeof(GLfloat);
+         break;
+      case GL_DOUBLE:
+         elementSize = sizeof(GLdouble);
+         break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glIndexPointer(type)" );
+         return;
+   }
+
+   update_array(ctx, &ctx->Array.Index, _NEW_ARRAY_INDEX,
+                elementSize, 1, type, stride, GL_FALSE, ptr);
+
+   if (ctx->Driver.IndexPointer)
+      ctx->Driver.IndexPointer( ctx, type, stride, ptr );
+}
+
+
+void GLAPIENTRY
+_mesa_SecondaryColorPointerEXT(GLint size, GLenum type,
+			       GLsizei stride, const GLvoid *ptr)
+{
+   GLsizei elementSize;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (size != 3 && size != 4) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glSecondaryColorPointer(size)" );
+      return;
+   }
+   if (stride < 0) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glSecondaryColorPointer(stride)" );
+      return;
+   }
+
+   if (MESA_VERBOSE&(VERBOSE_VARRAY|VERBOSE_API))
+      _mesa_debug(ctx, "glSecondaryColorPointer( sz %d type %s stride %d )\n",
+                  size, _mesa_lookup_enum_by_nr( type ), stride);
+
+   switch (type) {
+      case GL_BYTE:
+         elementSize = size * sizeof(GLbyte);
+         break;
+      case GL_UNSIGNED_BYTE:
+         elementSize = size * sizeof(GLubyte);
+         break;
+      case GL_SHORT:
+         elementSize = size * sizeof(GLshort);
+         break;
+      case GL_UNSIGNED_SHORT:
+         elementSize = size * sizeof(GLushort);
+         break;
+      case GL_INT:
+         elementSize = size * sizeof(GLint);
+         break;
+      case GL_UNSIGNED_INT:
+         elementSize = size * sizeof(GLuint);
+         break;
+      case GL_FLOAT:
+         elementSize = size * sizeof(GLfloat);
+         break;
+      case GL_DOUBLE:
+         elementSize = size * sizeof(GLdouble);
+         break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glSecondaryColorPointer(type)" );
+         return;
+   }
+
+   update_array(ctx, &ctx->Array.SecondaryColor, _NEW_ARRAY_COLOR1,
+                elementSize, size, type, stride, GL_FALSE, ptr);
+
+   if (ctx->Driver.SecondaryColorPointer)
+      ctx->Driver.SecondaryColorPointer( ctx, size, type, stride, ptr );
+}
+
+
+void GLAPIENTRY
+_mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride,
+                      const GLvoid *ptr)
+{
+   GLint elementSize;
+   GET_CURRENT_CONTEXT(ctx);
+   const GLuint unit = ctx->Array.ActiveTexture;
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (size < 1 || size > 4) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glTexCoordPointer(size)" );
+      return;
+   }
+   if (stride < 0) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glTexCoordPointer(stride)" );
+      return;
+   }
+
+   if (MESA_VERBOSE&(VERBOSE_VARRAY|VERBOSE_API))
+      _mesa_debug(ctx, "glTexCoordPointer(unit %u sz %d type %s stride %d)\n",
+                  unit, size, _mesa_lookup_enum_by_nr( type ), stride);
+
+   /* always need to check that <type> is legal */
+   switch (type) {
+      case GL_SHORT:
+         elementSize = size * sizeof(GLshort);
+         break;
+      case GL_INT:
+         elementSize = size * sizeof(GLint);
+         break;
+      case GL_FLOAT:
+         elementSize = size * sizeof(GLfloat);
+         break;
+      case GL_DOUBLE:
+         elementSize = size * sizeof(GLdouble);
+         break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glTexCoordPointer(type)" );
+         return;
+   }
+
+   update_array(ctx, &ctx->Array.TexCoord[unit], _NEW_ARRAY_TEXCOORD(unit),
+                elementSize, size, type, stride, GL_FALSE, ptr);
+
+   if (ctx->Driver.TexCoordPointer)
+      ctx->Driver.TexCoordPointer( ctx, size, type, stride, ptr );
+}
+
+
+void GLAPIENTRY
+_mesa_EdgeFlagPointer(GLsizei stride, const GLvoid *ptr)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (stride < 0) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glEdgeFlagPointer(stride)" );
+      return;
+   }
+
+   update_array(ctx, &ctx->Array.EdgeFlag, _NEW_ARRAY_EDGEFLAG,
+                sizeof(GLboolean), 1, GL_BOOLEAN, stride, GL_FALSE, ptr);
+
+   if (ctx->Driver.EdgeFlagPointer)
+      ctx->Driver.EdgeFlagPointer( ctx, stride, ptr );
+}
+
+
+#if FEATURE_NV_vertex_program
+void GLAPIENTRY
+_mesa_VertexAttribPointerNV(GLuint index, GLint size, GLenum type,
+                            GLsizei stride, const GLvoid *ptr)
+{
+   GLsizei elementSize;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (index >= VERT_ATTRIB_MAX) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glVertexAttribPointerNV(index)");
+      return;
+   }
+
+   if (size < 1 || size > 4) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glVertexAttribPointerNV(size)");
+      return;
+   }
+
+   if (stride < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glVertexAttribPointerNV(stride)");
+      return;
+   }
+
+   if (type == GL_UNSIGNED_BYTE && size != 4) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glVertexAttribPointerNV(size!=4)");
+      return;
+   }
+
+   /* check for valid 'type' and compute StrideB right away */
+   switch (type) {
+      case GL_UNSIGNED_BYTE:
+         elementSize = size * sizeof(GLubyte);
+         break;
+      case GL_SHORT:
+         elementSize = size * sizeof(GLshort);
+         break;
+      case GL_FLOAT:
+         elementSize = size * sizeof(GLfloat);
+         break;
+      case GL_DOUBLE:
+         elementSize = size * sizeof(GLdouble);
+         break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glVertexAttribPointerNV(type)" );
+         return;
+   }
+
+   update_array(ctx, &ctx->Array.VertexAttrib[index], _NEW_ARRAY_ATTRIB(index),
+                elementSize, size, type, stride, GL_FALSE, ptr);
+
+   if (ctx->Driver.VertexAttribPointer)
+      ctx->Driver.VertexAttribPointer( ctx, index, size, type, stride, ptr );
+}
+#endif
+
+
+#if FEATURE_ARB_vertex_program
+void GLAPIENTRY
+_mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,
+                             GLboolean normalized,
+                             GLsizei stride, const GLvoid *ptr)
+{
+   GLsizei elementSize;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (index >= ctx->Const.MaxVertexProgramAttribs) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glVertexAttribPointerARB(index)");
+      return;
+   }
+
+   if (size < 1 || size > 4) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glVertexAttribPointerARB(size)");
+      return;
+   }
+
+   if (stride < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glVertexAttribPointerARB(stride)");
+      return;
+   }
+
+   if (type == GL_UNSIGNED_BYTE && size != 4) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glVertexAttribPointerARB(size!=4)");
+      return;
+   }
+
+   /* check for valid 'type' and compute StrideB right away */
+   /* NOTE: more types are supported here than in the NV extension */
+   switch (type) {
+      case GL_BYTE:
+         elementSize = size * sizeof(GLbyte);
+         break;
+      case GL_UNSIGNED_BYTE:
+         elementSize = size * sizeof(GLubyte);
+         break;
+      case GL_SHORT:
+         elementSize = size * sizeof(GLshort);
+         break;
+      case GL_UNSIGNED_SHORT:
+         elementSize = size * sizeof(GLushort);
+         break;
+      case GL_INT:
+         elementSize = size * sizeof(GLint);
+         break;
+      case GL_UNSIGNED_INT:
+         elementSize = size * sizeof(GLuint);
+         break;
+      case GL_FLOAT:
+         elementSize = size * sizeof(GLfloat);
+         break;
+      case GL_DOUBLE:
+         elementSize = size * sizeof(GLdouble);
+         break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glVertexAttribPointerARB(type)" );
+         return;
+   }
+
+   update_array(ctx, &ctx->Array.VertexAttrib[index], _NEW_ARRAY_ATTRIB(index),
+                elementSize, size, type, stride, normalized, ptr);
+
+   /* XXX fix
+   if (ctx->Driver.VertexAttribPointer)
+      ctx->Driver.VertexAttribPointer( ctx, index, size, type, stride, ptr );
+   */
+}
+#endif
+
+
+void GLAPIENTRY
+_mesa_VertexPointerEXT(GLint size, GLenum type, GLsizei stride,
+                       GLsizei count, const GLvoid *ptr)
+{
+   (void) count;
+   _mesa_VertexPointer(size, type, stride, ptr);
+}
+
+
+void GLAPIENTRY
+_mesa_NormalPointerEXT(GLenum type, GLsizei stride, GLsizei count,
+                       const GLvoid *ptr)
+{
+   (void) count;
+   _mesa_NormalPointer(type, stride, ptr);
+}
+
+
+void GLAPIENTRY
+_mesa_ColorPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count,
+                      const GLvoid *ptr)
+{
+   (void) count;
+   _mesa_ColorPointer(size, type, stride, ptr);
+}
+
+
+void GLAPIENTRY
+_mesa_IndexPointerEXT(GLenum type, GLsizei stride, GLsizei count,
+                      const GLvoid *ptr)
+{
+   (void) count;
+   _mesa_IndexPointer(type, stride, ptr);
+}
+
+
+void GLAPIENTRY
+_mesa_TexCoordPointerEXT(GLint size, GLenum type, GLsizei stride,
+                         GLsizei count, const GLvoid *ptr)
+{
+   (void) count;
+   _mesa_TexCoordPointer(size, type, stride, ptr);
+}
+
+
+void GLAPIENTRY
+_mesa_EdgeFlagPointerEXT(GLsizei stride, GLsizei count, const GLboolean *ptr)
+{
+   (void) count;
+   _mesa_EdgeFlagPointer(stride, ptr);
+}
+
+
+void GLAPIENTRY
+_mesa_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLboolean tflag, cflag, nflag;  /* enable/disable flags */
+   GLint tcomps, ccomps, vcomps;   /* components per texcoord, color, vertex */
+   GLenum ctype = 0;               /* color type */
+   GLint coffset = 0, noffset = 0, voffset;/* color, normal, vertex offsets */
+   const GLint toffset = 0;        /* always zero */
+   GLint defstride;                /* default stride */
+   GLint c, f;
+
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   f = sizeof(GLfloat);
+   c = f * ((4 * sizeof(GLubyte) + (f - 1)) / f);
+
+   if (stride < 0) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glInterleavedArrays(stride)" );
+      return;
+   }
+
+   switch (format) {
+      case GL_V2F:
+         tflag = GL_FALSE;  cflag = GL_FALSE;  nflag = GL_FALSE;
+         tcomps = 0;  ccomps = 0;  vcomps = 2;
+         voffset = 0;
+         defstride = 2*f;
+         break;
+      case GL_V3F:
+         tflag = GL_FALSE;  cflag = GL_FALSE;  nflag = GL_FALSE;
+         tcomps = 0;  ccomps = 0;  vcomps = 3;
+         voffset = 0;
+         defstride = 3*f;
+         break;
+      case GL_C4UB_V2F:
+         tflag = GL_FALSE;  cflag = GL_TRUE;  nflag = GL_FALSE;
+         tcomps = 0;  ccomps = 4;  vcomps = 2;
+         ctype = GL_UNSIGNED_BYTE;
+         coffset = 0;
+         voffset = c;
+         defstride = c + 2*f;
+         break;
+      case GL_C4UB_V3F:
+         tflag = GL_FALSE;  cflag = GL_TRUE;  nflag = GL_FALSE;
+         tcomps = 0;  ccomps = 4;  vcomps = 3;
+         ctype = GL_UNSIGNED_BYTE;
+         coffset = 0;
+         voffset = c;
+         defstride = c + 3*f;
+         break;
+      case GL_C3F_V3F:
+         tflag = GL_FALSE;  cflag = GL_TRUE;  nflag = GL_FALSE;
+         tcomps = 0;  ccomps = 3;  vcomps = 3;
+         ctype = GL_FLOAT;
+         coffset = 0;
+         voffset = 3*f;
+         defstride = 6*f;
+         break;
+      case GL_N3F_V3F:
+         tflag = GL_FALSE;  cflag = GL_FALSE;  nflag = GL_TRUE;
+         tcomps = 0;  ccomps = 0;  vcomps = 3;
+         noffset = 0;
+         voffset = 3*f;
+         defstride = 6*f;
+         break;
+      case GL_C4F_N3F_V3F:
+         tflag = GL_FALSE;  cflag = GL_TRUE;  nflag = GL_TRUE;
+         tcomps = 0;  ccomps = 4;  vcomps = 3;
+         ctype = GL_FLOAT;
+         coffset = 0;
+         noffset = 4*f;
+         voffset = 7*f;
+         defstride = 10*f;
+         break;
+      case GL_T2F_V3F:
+         tflag = GL_TRUE;  cflag = GL_FALSE;  nflag = GL_FALSE;
+         tcomps = 2;  ccomps = 0;  vcomps = 3;
+         voffset = 2*f;
+         defstride = 5*f;
+         break;
+      case GL_T4F_V4F:
+         tflag = GL_TRUE;  cflag = GL_FALSE;  nflag = GL_FALSE;
+         tcomps = 4;  ccomps = 0;  vcomps = 4;
+         voffset = 4*f;
+         defstride = 8*f;
+         break;
+      case GL_T2F_C4UB_V3F:
+         tflag = GL_TRUE;  cflag = GL_TRUE;  nflag = GL_FALSE;
+         tcomps = 2;  ccomps = 4;  vcomps = 3;
+         ctype = GL_UNSIGNED_BYTE;
+         coffset = 2*f;
+         voffset = c+2*f;
+         defstride = c+5*f;
+         break;
+      case GL_T2F_C3F_V3F:
+         tflag = GL_TRUE;  cflag = GL_TRUE;  nflag = GL_FALSE;
+         tcomps = 2;  ccomps = 3;  vcomps = 3;
+         ctype = GL_FLOAT;
+         coffset = 2*f;
+         voffset = 5*f;
+         defstride = 8*f;
+         break;
+      case GL_T2F_N3F_V3F:
+         tflag = GL_TRUE;  cflag = GL_FALSE;  nflag = GL_TRUE;
+         tcomps = 2;  ccomps = 0;  vcomps = 3;
+         noffset = 2*f;
+         voffset = 5*f;
+         defstride = 8*f;
+         break;
+      case GL_T2F_C4F_N3F_V3F:
+         tflag = GL_TRUE;  cflag = GL_TRUE;  nflag = GL_TRUE;
+         tcomps = 2;  ccomps = 4;  vcomps = 3;
+         ctype = GL_FLOAT;
+         coffset = 2*f;
+         noffset = 6*f;
+         voffset = 9*f;
+         defstride = 12*f;
+         break;
+      case GL_T4F_C4F_N3F_V4F:
+         tflag = GL_TRUE;  cflag = GL_TRUE;  nflag = GL_TRUE;
+         tcomps = 4;  ccomps = 4;  vcomps = 4;
+         ctype = GL_FLOAT;
+         coffset = 4*f;
+         noffset = 8*f;
+         voffset = 11*f;
+         defstride = 15*f;
+         break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glInterleavedArrays(format)" );
+         return;
+   }
+
+   if (stride==0) {
+      stride = defstride;
+   }
+
+   _mesa_DisableClientState( GL_EDGE_FLAG_ARRAY );
+   _mesa_DisableClientState( GL_INDEX_ARRAY );
+
+   /* Texcoords */
+   if (tflag) {
+      _mesa_EnableClientState( GL_TEXTURE_COORD_ARRAY );
+      _mesa_TexCoordPointer( tcomps, GL_FLOAT, stride,
+                             (GLubyte *) pointer + toffset );
+   }
+   else {
+      _mesa_DisableClientState( GL_TEXTURE_COORD_ARRAY );
+   }
+
+   /* Color */
+   if (cflag) {
+      _mesa_EnableClientState( GL_COLOR_ARRAY );
+      _mesa_ColorPointer( ccomps, ctype, stride,
+			  (GLubyte *) pointer + coffset );
+   }
+   else {
+      _mesa_DisableClientState( GL_COLOR_ARRAY );
+   }
+
+
+   /* Normals */
+   if (nflag) {
+      _mesa_EnableClientState( GL_NORMAL_ARRAY );
+      _mesa_NormalPointer( GL_FLOAT, stride, (GLubyte *) pointer + noffset );
+   }
+   else {
+      _mesa_DisableClientState( GL_NORMAL_ARRAY );
+   }
+
+   /* Vertices */
+   _mesa_EnableClientState( GL_VERTEX_ARRAY );
+   _mesa_VertexPointer( vcomps, GL_FLOAT, stride,
+			(GLubyte *) pointer + voffset );
+}
+
+
+void GLAPIENTRY
+_mesa_LockArraysEXT(GLint first, GLsizei count)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glLockArrays %d %d\n", first, count);
+
+   if (first == 0 && count > 0 &&
+       count <= (GLint) ctx->Const.MaxArrayLockSize) {
+      ctx->Array.LockFirst = first;
+      ctx->Array.LockCount = count;
+   }
+   else {
+      ctx->Array.LockFirst = 0;
+      ctx->Array.LockCount = 0;
+   }
+
+   ctx->NewState |= _NEW_ARRAY;
+   ctx->Array.NewState |= _NEW_ARRAY_ALL;
+
+   if (ctx->Driver.LockArraysEXT)
+      ctx->Driver.LockArraysEXT( ctx, first, count );
+}
+
+
+void GLAPIENTRY
+_mesa_UnlockArraysEXT( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glUnlockArrays\n");
+
+   ctx->Array.LockFirst = 0;
+   ctx->Array.LockCount = 0;
+   ctx->NewState |= _NEW_ARRAY;
+   ctx->Array.NewState |= _NEW_ARRAY_ALL;
+
+   if (ctx->Driver.UnlockArraysEXT)
+      ctx->Driver.UnlockArraysEXT( ctx );
+}
+
+
+/* GL_EXT_multi_draw_arrays */
+/* Somebody forgot to spec the first and count parameters as const! <sigh> */
+void GLAPIENTRY
+_mesa_MultiDrawArraysEXT( GLenum mode, GLint *first,
+                          GLsizei *count, GLsizei primcount )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint i;
+
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   for (i = 0; i < primcount; i++) {
+      if (count[i] > 0) {
+         (ctx->Exec->DrawArrays)(mode, first[i], count[i]);
+      }
+   }
+}
+
+
+/* GL_EXT_multi_draw_arrays */
+void GLAPIENTRY
+_mesa_MultiDrawElementsEXT( GLenum mode, const GLsizei *count, GLenum type,
+                            const GLvoid **indices, GLsizei primcount )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint i;
+
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   for (i = 0; i < primcount; i++) {
+      if (count[i] > 0) {
+         (ctx->Exec->DrawElements)(mode, count[i], type, indices[i]);
+      }
+   }
+}
+
+
+/* GL_IBM_multimode_draw_arrays */
+void GLAPIENTRY
+_mesa_MultiModeDrawArraysIBM( const GLenum * mode, const GLint * first,
+			      const GLsizei * count,
+			      GLsizei primcount, GLint modestride )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint i;
+
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   for ( i = 0 ; i < primcount ; i++ ) {
+      if ( count[i] > 0 ) {
+         GLenum m = *((GLenum *) ((GLubyte *) mode + i * modestride));
+	 (ctx->Exec->DrawArrays)( m, first[i], count[i] );
+      }
+   }
+}
+
+
+/* GL_IBM_multimode_draw_arrays */
+void GLAPIENTRY
+_mesa_MultiModeDrawElementsIBM( const GLenum * mode, const GLsizei * count,
+				GLenum type, const GLvoid * const * indices,
+				GLsizei primcount, GLint modestride )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint i;
+
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   /* XXX not sure about ARB_vertex_buffer_object handling here */
+
+   for ( i = 0 ; i < primcount ; i++ ) {
+      if ( count[i] > 0 ) {
+         GLenum m = *((GLenum *) ((GLubyte *) mode + i * modestride));
+	 (ctx->Exec->DrawElements)( m, count[i], type, indices[i] );
+      }
+   }
+}
+
+
+/**********************************************************************/
+/*****                      Initialization                        *****/
+/**********************************************************************/
+
+void 
+_mesa_init_varray( GLcontext * ctx )
+{
+   GLuint i;
+
+   /* Vertex arrays */
+   ctx->Array.Vertex.Size = 4;
+   ctx->Array.Vertex.Type = GL_FLOAT;
+   ctx->Array.Vertex.Stride = 0;
+   ctx->Array.Vertex.StrideB = 0;
+   ctx->Array.Vertex.Ptr = NULL;
+   ctx->Array.Vertex.Enabled = GL_FALSE;
+   ctx->Array.Vertex.Flags = CA_CLIENT_DATA;
+   ctx->Array.Normal.Type = GL_FLOAT;
+   ctx->Array.Normal.Stride = 0;
+   ctx->Array.Normal.StrideB = 0;
+   ctx->Array.Normal.Ptr = NULL;
+   ctx->Array.Normal.Enabled = GL_FALSE;
+   ctx->Array.Normal.Flags = CA_CLIENT_DATA;
+   ctx->Array.Color.Size = 4;
+   ctx->Array.Color.Type = GL_FLOAT;
+   ctx->Array.Color.Stride = 0;
+   ctx->Array.Color.StrideB = 0;
+   ctx->Array.Color.Ptr = NULL;
+   ctx->Array.Color.Enabled = GL_FALSE;
+   ctx->Array.Color.Flags = CA_CLIENT_DATA;
+   ctx->Array.SecondaryColor.Size = 4;
+   ctx->Array.SecondaryColor.Type = GL_FLOAT;
+   ctx->Array.SecondaryColor.Stride = 0;
+   ctx->Array.SecondaryColor.StrideB = 0;
+   ctx->Array.SecondaryColor.Ptr = NULL;
+   ctx->Array.SecondaryColor.Enabled = GL_FALSE;
+   ctx->Array.SecondaryColor.Flags = CA_CLIENT_DATA;
+   ctx->Array.FogCoord.Size = 1;
+   ctx->Array.FogCoord.Type = GL_FLOAT;
+   ctx->Array.FogCoord.Stride = 0;
+   ctx->Array.FogCoord.StrideB = 0;
+   ctx->Array.FogCoord.Ptr = NULL;
+   ctx->Array.FogCoord.Enabled = GL_FALSE;
+   ctx->Array.FogCoord.Flags = CA_CLIENT_DATA;
+   ctx->Array.Index.Type = GL_FLOAT;
+   ctx->Array.Index.Stride = 0;
+   ctx->Array.Index.StrideB = 0;
+   ctx->Array.Index.Ptr = NULL;
+   ctx->Array.Index.Enabled = GL_FALSE;
+   ctx->Array.Index.Flags = CA_CLIENT_DATA;
+   for (i = 0; i < MAX_TEXTURE_UNITS; i++) {
+      ctx->Array.TexCoord[i].Size = 4;
+      ctx->Array.TexCoord[i].Type = GL_FLOAT;
+      ctx->Array.TexCoord[i].Stride = 0;
+      ctx->Array.TexCoord[i].StrideB = 0;
+      ctx->Array.TexCoord[i].Ptr = NULL;
+      ctx->Array.TexCoord[i].Enabled = GL_FALSE;
+      ctx->Array.TexCoord[i].Flags = CA_CLIENT_DATA;
+   }
+   ctx->Array.EdgeFlag.Stride = 0;
+   ctx->Array.EdgeFlag.StrideB = 0;
+   ctx->Array.EdgeFlag.Ptr = NULL;
+   ctx->Array.EdgeFlag.Enabled = GL_FALSE;
+   ctx->Array.EdgeFlag.Flags = CA_CLIENT_DATA;
+   ctx->Array.ActiveTexture = 0;   /* GL_ARB_multitexture */
+   for (i = 0; i < VERT_ATTRIB_MAX; i++) {
+      ctx->Array.VertexAttrib[i].Size = 4;
+      ctx->Array.VertexAttrib[i].Type = GL_FLOAT;
+      ctx->Array.VertexAttrib[i].Stride = 0;
+      ctx->Array.VertexAttrib[i].StrideB = 0;
+      ctx->Array.VertexAttrib[i].Ptr = NULL;
+      ctx->Array.VertexAttrib[i].Enabled = GL_FALSE;
+      ctx->Array.VertexAttrib[i].Flags = CA_CLIENT_DATA;
+   }
+}
diff --git a/reactos/lib/mesa32/src/main/varray.h b/reactos/lib/mesa32/src/main/varray.h
new file mode 100644
index 00000000000..3589735f684
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/varray.h
@@ -0,0 +1,160 @@
+/**
+ * \file varray.h
+ * Vertex arrays.
+ *
+ * \if subset
+ * (No-op)
+ *
+ * \endif
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef VARRAY_H
+#define VARRAY_H
+
+
+#include "mtypes.h"
+
+#if _HAVE_FULL_GL
+
+extern void GLAPIENTRY
+_mesa_VertexPointer(GLint size, GLenum type, GLsizei stride,
+                    const GLvoid *ptr);
+
+extern void GLAPIENTRY
+_mesa_UnlockArraysEXT( void );
+
+extern void GLAPIENTRY
+_mesa_LockArraysEXT(GLint first, GLsizei count);
+
+
+extern void GLAPIENTRY
+_mesa_NormalPointer(GLenum type, GLsizei stride, const GLvoid *ptr);
+
+
+extern void GLAPIENTRY
+_mesa_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr);
+
+
+extern void GLAPIENTRY
+_mesa_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr);
+
+
+extern void GLAPIENTRY
+_mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride,
+                      const GLvoid *ptr);
+
+
+extern void GLAPIENTRY
+_mesa_EdgeFlagPointer(GLsizei stride, const GLvoid *ptr);
+
+
+extern void GLAPIENTRY
+_mesa_VertexPointerEXT(GLint size, GLenum type, GLsizei stride,
+                       GLsizei count, const GLvoid *ptr);
+
+
+extern void GLAPIENTRY
+_mesa_NormalPointerEXT(GLenum type, GLsizei stride, GLsizei count,
+                       const GLvoid *ptr);
+
+
+extern void GLAPIENTRY
+_mesa_ColorPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count,
+                      const GLvoid *ptr);
+
+
+extern void GLAPIENTRY
+_mesa_IndexPointerEXT(GLenum type, GLsizei stride, GLsizei count,
+                      const GLvoid *ptr);
+
+
+extern void GLAPIENTRY
+_mesa_TexCoordPointerEXT(GLint size, GLenum type, GLsizei stride,
+                         GLsizei count, const GLvoid *ptr);
+
+
+extern void GLAPIENTRY
+_mesa_EdgeFlagPointerEXT(GLsizei stride, GLsizei count, const GLboolean *ptr);
+
+
+extern void GLAPIENTRY
+_mesa_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr);
+
+
+extern void GLAPIENTRY
+_mesa_SecondaryColorPointerEXT(GLint size, GLenum type,
+			       GLsizei stride, const GLvoid *ptr);
+
+
+extern void GLAPIENTRY
+_mesa_VertexAttribPointerNV(GLuint index, GLint size, GLenum type,
+                            GLsizei stride, const GLvoid *pointer);
+
+
+extern void GLAPIENTRY
+_mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,
+                             GLboolean normalized, GLsizei stride,
+                             const GLvoid *pointer);
+
+
+extern void GLAPIENTRY
+_mesa_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer);
+
+
+extern void GLAPIENTRY
+_mesa_MultiDrawArraysEXT( GLenum mode, GLint *first,
+                          GLsizei *count, GLsizei primcount );
+
+extern void GLAPIENTRY
+_mesa_MultiDrawElementsEXT( GLenum mode, const GLsizei *count, GLenum type,
+                            const GLvoid **indices, GLsizei primcount );
+
+
+extern void GLAPIENTRY
+_mesa_MultiModeDrawArraysIBM( const GLenum * mode, const GLint * first,
+			      const GLsizei * count,
+			      GLsizei primcount, GLint modestride );
+
+
+extern void GLAPIENTRY
+_mesa_MultiModeDrawElementsIBM( const GLenum * mode, const GLsizei * count,
+				GLenum type, const GLvoid * const * indices,
+				GLsizei primcount, GLint modestride );
+
+
+extern void
+_mesa_init_varray( GLcontext * ctx );
+
+#else
+
+/** No-op */
+#define _mesa_init_varray( c )  ((void)0)
+
+#endif
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/version.h b/reactos/lib/mesa32/src/main/version.h
new file mode 100644
index 00000000000..655ca634fd5
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/version.h
@@ -0,0 +1,52 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0.1
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef VERSION_H
+#define VERSION_H
+
+
+/* Mesa version */
+#define MESA_MAJOR 6
+#define MESA_MINOR 0
+#define MESA_PATCH 1
+#define MESA_VERSION_STRING "6.0.1"
+
+/* To make version comparison easy */
+#define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
+#define MESA_VERSION_CODE MESA_VERSION(MESA_MAJOR, MESA_MINOR, MESA_PATCH)
+
+
+/* OpenGL API version */
+#define OPENGL_MAJOR 1
+#define OPENGL_MINOR 5
+#define OPENGL_PATCH 0
+#define OPENGL_VERSION_STRING "1.5"
+
+/* To make version comparison easy */
+#define OPENGL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
+#define OPENGL_VERSION_CODE OPENGL_VERSION(OPENGL_MAJOR, OPENGL_MINOR, OPENGL_PATCH)
+
+
+#endif /* VERSION_H */
diff --git a/reactos/lib/mesa32/src/main/vsnprintf.c b/reactos/lib/mesa32/src/main/vsnprintf.c
new file mode 100644
index 00000000000..ab6c740d772
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/vsnprintf.c
@@ -0,0 +1,165 @@
+/*
+ * Revision 12: http://theos.com/~deraadt/snprintf.c
+ *
+ * Copyright (c) 1997 Theo de Raadt
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __VMS
+# include <sys/param.h>
+#endif
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <signal.h>
+#include <stdio.h>
+#if __STDC__
+#include <stdarg.h>
+#include <stdlib.h>
+#else
+#include <varargs.h>
+#endif
+#include <setjmp.h>
+#include <unistd.h>
+#include <string.h>
+
+#ifndef roundup
+#define roundup(x, y) ((((x)+((y)-1))/(y))*(y))
+#endif
+
+#ifdef __sgi
+#define size_t ssize_t
+#endif
+
+static int pgsize;
+static char *curobj;
+static int caught;
+static sigjmp_buf bail;
+
+#define EXTRABYTES	2	/* XXX: why 2? you don't want to know */
+
+static char *
+msetup(str, n)
+	char *str;
+	size_t n;
+{
+	char *e;
+
+	if (n == 0)
+		return NULL;
+	if (pgsize == 0)
+		pgsize = getpagesize();
+	curobj = (char *)malloc(n + EXTRABYTES + pgsize * 2);
+	if (curobj == NULL)
+		return NULL;
+	e = curobj + n + EXTRABYTES;
+	e = (char *)roundup((unsigned long)e, pgsize);
+	if (mprotect(e, pgsize, PROT_NONE) == -1) {
+		free(curobj);
+		curobj = NULL;
+		return NULL;
+	}
+	e = e - n - EXTRABYTES;
+	*e = '\0';
+	return (e);
+}
+
+static void
+  mcatch( int a )
+{
+	siglongjmp(bail, 1);
+}
+
+static void
+mcleanup(str, n, p)
+	char *str;
+	size_t n;
+	char *p;
+{
+	strncpy(str, p, n-1);
+	str[n-1] = '\0';
+	if (mprotect((caddr_t)(p + n + EXTRABYTES), pgsize,
+	    PROT_READ|PROT_WRITE|PROT_EXEC) == -1)
+		mprotect((caddr_t)(p + n + EXTRABYTES), pgsize,
+		    PROT_READ|PROT_WRITE);
+	free(curobj);
+}
+
+int
+#if __STDC__
+vsnprintf(char *str, size_t n, char const *fmt, va_list ap)
+#else
+vsnprintf(str, n, fmt, ap)
+	char *str;
+	size_t n;
+	char *fmt;
+	char *ap;
+#endif
+{
+	struct sigaction osa, nsa;
+	char *p;
+	int ret = n + 1;	/* if we bail, indicated we overflowed */
+
+	memset(&nsa, 0, sizeof nsa);
+	nsa.sa_handler = mcatch;
+	sigemptyset(&nsa.sa_mask);
+
+	p = msetup(str, n);
+	if (p == NULL) {
+		*str = '\0';
+		return 0;
+	}
+	if (sigsetjmp(bail, 1) == 0) {
+		if (sigaction(SIGSEGV, &nsa, &osa) == -1) {
+			mcleanup(str, n, p);
+			return (0);
+		}
+		ret = vsprintf(p, fmt, ap);
+	}
+	mcleanup(str, n, p);
+	(void) sigaction(SIGSEGV, &osa, NULL);
+	return (ret);
+}
+
+int
+#if __STDC__
+snprintf(char *str, size_t n, char const *fmt, ...)
+#else
+snprintf(str, n, fmt, va_alist)
+	char *str;
+	size_t n;
+	char *fmt;
+	va_dcl
+#endif
+{
+	va_list ap;
+#if __STDC__
+	va_start(ap, fmt);
+#else
+	va_start(ap);
+#endif
+
+	return (vsnprintf(str, n, fmt, ap));
+	va_end(ap);
+}
+
+
+
diff --git a/reactos/lib/mesa32/src/main/vtxfmt.c b/reactos/lib/mesa32/src/main/vtxfmt.c
new file mode 100644
index 00000000000..b9e3f2ef603
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/vtxfmt.c
@@ -0,0 +1,174 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ *    Gareth Hughes
+ */
+
+#include "glheader.h"
+#include "api_loopback.h"
+#include "context.h"
+#include "imports.h"
+#include "mtypes.h"
+#include "state.h"
+#include "vtxfmt.h"
+
+
+/* The neutral vertex format.  This wraps all tnl module functions,
+ * verifying that the currently-installed module is valid and then
+ * installing the function pointers in a lazy fashion.  It records the
+ * function pointers that have been swapped out, which allows a fast
+ * restoration of the neutral module in almost all cases -- a typical
+ * app might only require 4-6 functions to be modified from the neutral
+ * baseline, and only restoring these is certainly preferable to doing
+ * the entire module's 60 or so function pointers.
+ */
+
+#define PRE_LOOPBACK( FUNC )						\
+{									\
+   GET_CURRENT_CONTEXT(ctx);						\
+   struct gl_tnl_module *tnl = &(ctx->TnlModule);			\
+									\
+   ASSERT( tnl->Current );						\
+   ASSERT( tnl->SwapCount < NUM_VERTEX_FORMAT_ENTRIES );		\
+									\
+   /* Save the swapped function's dispatch entry so it can be */	\
+   /* restored later. */						\
+   tnl->Swapped[tnl->SwapCount][0] = (void *)&(ctx->Exec->FUNC);	\
+   tnl->Swapped[tnl->SwapCount][1] = (void *)TAG(FUNC);			\
+   tnl->SwapCount++;							\
+									\
+   if ( 0 )								\
+      _mesa_debug(ctx, "   swapping gl" #FUNC"...\n" );			\
+									\
+   /* Install the tnl function pointer.	*/				\
+   ctx->Exec->FUNC = tnl->Current->FUNC;				\
+}
+
+#define TAG(x) neutral_##x
+#include "vtxfmt_tmp.h"
+
+
+
+static void install_vtxfmt( struct _glapi_table *tab, GLvertexformat *vfmt )
+{
+   tab->ArrayElement = vfmt->ArrayElement;
+   tab->Color3f = vfmt->Color3f;
+   tab->Color3fv = vfmt->Color3fv;
+   tab->Color4f = vfmt->Color4f;
+   tab->Color4fv = vfmt->Color4fv;
+   tab->EdgeFlag = vfmt->EdgeFlag;
+   tab->EdgeFlagv = vfmt->EdgeFlagv;
+   tab->EvalCoord1f = vfmt->EvalCoord1f;
+   tab->EvalCoord1fv = vfmt->EvalCoord1fv;
+   tab->EvalCoord2f = vfmt->EvalCoord2f;
+   tab->EvalCoord2fv = vfmt->EvalCoord2fv;
+   tab->EvalPoint1 = vfmt->EvalPoint1;
+   tab->EvalPoint2 = vfmt->EvalPoint2;
+   tab->FogCoordfEXT = vfmt->FogCoordfEXT;
+   tab->FogCoordfvEXT = vfmt->FogCoordfvEXT;
+   tab->Indexf = vfmt->Indexf;
+   tab->Indexfv = vfmt->Indexfv;
+   tab->Materialfv = vfmt->Materialfv;
+   tab->MultiTexCoord1fARB = vfmt->MultiTexCoord1fARB;
+   tab->MultiTexCoord1fvARB = vfmt->MultiTexCoord1fvARB;
+   tab->MultiTexCoord2fARB = vfmt->MultiTexCoord2fARB;
+   tab->MultiTexCoord2fvARB = vfmt->MultiTexCoord2fvARB;
+   tab->MultiTexCoord3fARB = vfmt->MultiTexCoord3fARB;
+   tab->MultiTexCoord3fvARB = vfmt->MultiTexCoord3fvARB;
+   tab->MultiTexCoord4fARB = vfmt->MultiTexCoord4fARB;
+   tab->MultiTexCoord4fvARB = vfmt->MultiTexCoord4fvARB;
+   tab->Normal3f = vfmt->Normal3f;
+   tab->Normal3fv = vfmt->Normal3fv;
+   tab->SecondaryColor3fEXT = vfmt->SecondaryColor3fEXT;
+   tab->SecondaryColor3fvEXT = vfmt->SecondaryColor3fvEXT;
+   tab->TexCoord1f = vfmt->TexCoord1f;
+   tab->TexCoord1fv = vfmt->TexCoord1fv;
+   tab->TexCoord2f = vfmt->TexCoord2f;
+   tab->TexCoord2fv = vfmt->TexCoord2fv;
+   tab->TexCoord3f = vfmt->TexCoord3f;
+   tab->TexCoord3fv = vfmt->TexCoord3fv;
+   tab->TexCoord4f = vfmt->TexCoord4f;
+   tab->TexCoord4fv = vfmt->TexCoord4fv;
+   tab->Vertex2f = vfmt->Vertex2f;
+   tab->Vertex2fv = vfmt->Vertex2fv;
+   tab->Vertex3f = vfmt->Vertex3f;
+   tab->Vertex3fv = vfmt->Vertex3fv;
+   tab->Vertex4f = vfmt->Vertex4f;
+   tab->Vertex4fv = vfmt->Vertex4fv;
+   tab->CallList = vfmt->CallList;
+   tab->CallLists = vfmt->CallLists;
+   tab->Begin = vfmt->Begin;
+   tab->End = vfmt->End;
+   tab->VertexAttrib1fNV = vfmt->VertexAttrib1fNV;
+   tab->VertexAttrib1fvNV = vfmt->VertexAttrib1fvNV;
+   tab->VertexAttrib2fNV = vfmt->VertexAttrib2fNV;
+   tab->VertexAttrib2fvNV = vfmt->VertexAttrib2fvNV;
+   tab->VertexAttrib3fNV = vfmt->VertexAttrib3fNV;
+   tab->VertexAttrib3fvNV = vfmt->VertexAttrib3fvNV;
+   tab->VertexAttrib4fNV = vfmt->VertexAttrib4fNV;
+   tab->VertexAttrib4fvNV = vfmt->VertexAttrib4fvNV;
+   tab->Rectf = vfmt->Rectf;
+   tab->DrawArrays = vfmt->DrawArrays;
+   tab->DrawElements = vfmt->DrawElements;
+   tab->DrawRangeElements = vfmt->DrawRangeElements;
+   tab->EvalMesh1 = vfmt->EvalMesh1;
+   tab->EvalMesh2 = vfmt->EvalMesh2;
+   assert(tab->EvalMesh2);
+}
+
+
+void _mesa_init_exec_vtxfmt( GLcontext *ctx )
+{
+   install_vtxfmt( ctx->Exec, &neutral_vtxfmt );
+   ctx->TnlModule.SwapCount = 0;
+}
+
+
+void _mesa_install_exec_vtxfmt( GLcontext *ctx, GLvertexformat *vfmt )
+{
+   ctx->TnlModule.Current = vfmt;
+   _mesa_restore_exec_vtxfmt( ctx );
+}
+
+void _mesa_install_save_vtxfmt( GLcontext *ctx, GLvertexformat *vfmt )
+{
+   install_vtxfmt( ctx->Save, vfmt );
+}
+
+
+void _mesa_restore_exec_vtxfmt( GLcontext *ctx )
+{
+   struct gl_tnl_module *tnl = &(ctx->TnlModule);
+   GLuint i;
+
+   /* Restore the neutral tnl module wrapper.
+    */
+   for ( i = 0 ; i < tnl->SwapCount ; i++ ) {
+      *(void **)tnl->Swapped[i][0] = tnl->Swapped[i][1];
+   }
+
+   tnl->SwapCount = 0;
+}
diff --git a/reactos/lib/mesa32/src/main/vtxfmt.h b/reactos/lib/mesa32/src/main/vtxfmt.h
new file mode 100644
index 00000000000..310f157b5e5
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/vtxfmt.h
@@ -0,0 +1,43 @@
+/**
+ * \file vtxfmt.h
+ * 
+ * \author Keith Whitwell <keith@tungstengraphics.com>
+ * \author Gareth Hughes
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef _VTXFMT_H_
+#define _VTXFMT_H_
+
+extern void _mesa_init_exec_vtxfmt( GLcontext *ctx );
+
+extern void _mesa_install_exec_vtxfmt( GLcontext *ctx, GLvertexformat *vfmt );
+extern void _mesa_install_save_vtxfmt( GLcontext *ctx, GLvertexformat *vfmt );
+
+extern void _mesa_restore_exec_vtxfmt( GLcontext *ctx );
+
+#endif
diff --git a/reactos/lib/mesa32/src/main/vtxfmt_tmp.h b/reactos/lib/mesa32/src/main/vtxfmt_tmp.h
new file mode 100644
index 00000000000..044ec1bbaf7
--- /dev/null
+++ b/reactos/lib/mesa32/src/main/vtxfmt_tmp.h
@@ -0,0 +1,478 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Gareth Hughes
+ */
+
+#ifndef PRE_LOOPBACK
+#define PRE_LOOPBACK( FUNC )
+#endif
+
+static void GLAPIENTRY TAG(ArrayElement)( GLint i )
+{
+   PRE_LOOPBACK( ArrayElement );
+   _glapi_Dispatch->ArrayElement( i );
+}
+
+static void GLAPIENTRY TAG(Color3f)( GLfloat r, GLfloat g, GLfloat b )
+{
+   PRE_LOOPBACK( Color3f );
+   _glapi_Dispatch->Color3f( r, g, b );
+}
+
+static void GLAPIENTRY TAG(Color3fv)( const GLfloat *v )
+{
+   PRE_LOOPBACK( Color3fv );
+   _glapi_Dispatch->Color3fv( v );
+}
+
+static void GLAPIENTRY TAG(Color4f)( GLfloat r, GLfloat g, GLfloat b, GLfloat a )
+{
+   PRE_LOOPBACK( Color4f );
+   _glapi_Dispatch->Color4f( r, g, b, a );
+}
+
+static void GLAPIENTRY TAG(Color4fv)( const GLfloat *v )
+{
+   PRE_LOOPBACK( Color4fv );
+   _glapi_Dispatch->Color4fv( v );
+}
+
+static void GLAPIENTRY TAG(EdgeFlag)( GLboolean e )
+{
+   PRE_LOOPBACK( EdgeFlag );
+   _glapi_Dispatch->EdgeFlag( e );
+}
+
+static void GLAPIENTRY TAG(EdgeFlagv)( const GLboolean *v )
+{
+   PRE_LOOPBACK( EdgeFlagv );
+   _glapi_Dispatch->EdgeFlagv( v );
+}
+
+static void GLAPIENTRY TAG(EvalCoord1f)( GLfloat s )
+{
+   PRE_LOOPBACK( EvalCoord1f );
+   _glapi_Dispatch->EvalCoord1f( s );
+}
+
+static void GLAPIENTRY TAG(EvalCoord1fv)( const GLfloat *v )
+{
+   PRE_LOOPBACK( EvalCoord1fv );
+   _glapi_Dispatch->EvalCoord1fv( v );
+}
+
+static void GLAPIENTRY TAG(EvalCoord2f)( GLfloat s, GLfloat t )
+{
+   PRE_LOOPBACK( EvalCoord2f );
+   _glapi_Dispatch->EvalCoord2f( s, t );
+}
+
+static void GLAPIENTRY TAG(EvalCoord2fv)( const GLfloat *v )
+{
+   PRE_LOOPBACK( EvalCoord2fv );
+   _glapi_Dispatch->EvalCoord2fv( v );
+}
+
+static void GLAPIENTRY TAG(EvalPoint1)( GLint i )
+{
+   PRE_LOOPBACK( EvalPoint1 );
+   _glapi_Dispatch->EvalPoint1( i );
+}
+
+static void GLAPIENTRY TAG(EvalPoint2)( GLint i, GLint j )
+{
+   PRE_LOOPBACK( EvalPoint2 );
+   _glapi_Dispatch->EvalPoint2( i, j );
+}
+
+static void GLAPIENTRY TAG(FogCoordfEXT)( GLfloat f )
+{
+   PRE_LOOPBACK( FogCoordfEXT );
+   _glapi_Dispatch->FogCoordfEXT( f );
+}
+
+static void GLAPIENTRY TAG(FogCoordfvEXT)( const GLfloat *v )
+{
+   PRE_LOOPBACK( FogCoordfvEXT );
+   _glapi_Dispatch->FogCoordfvEXT( v );
+}
+
+static void GLAPIENTRY TAG(Indexf)( GLfloat f )
+{
+   PRE_LOOPBACK( Indexf );
+   _glapi_Dispatch->Indexf( f );
+}
+
+static void GLAPIENTRY TAG(Indexfv)( const GLfloat *v )
+{
+   PRE_LOOPBACK( Indexfv );
+   _glapi_Dispatch->Indexfv( v );
+}
+
+static void GLAPIENTRY TAG(Materialfv)( GLenum face, GLenum pname, const GLfloat *v )
+{
+   PRE_LOOPBACK( Materialfv );
+   _glapi_Dispatch->Materialfv( face, pname, v );
+}
+
+static void GLAPIENTRY TAG(MultiTexCoord1fARB)( GLenum target, GLfloat a )
+{
+   PRE_LOOPBACK( MultiTexCoord1fARB );
+   _glapi_Dispatch->MultiTexCoord1fARB( target, a );
+}
+
+static void GLAPIENTRY TAG(MultiTexCoord1fvARB)( GLenum target, const GLfloat *tc )
+{
+   PRE_LOOPBACK( MultiTexCoord1fvARB );
+   _glapi_Dispatch->MultiTexCoord1fvARB( target, tc );
+}
+
+static void GLAPIENTRY TAG(MultiTexCoord2fARB)( GLenum target, GLfloat s, GLfloat t )
+{
+   PRE_LOOPBACK( MultiTexCoord2fARB );
+   _glapi_Dispatch->MultiTexCoord2fARB( target, s, t );
+}
+
+static void GLAPIENTRY TAG(MultiTexCoord2fvARB)( GLenum target, const GLfloat *tc )
+{
+   PRE_LOOPBACK( MultiTexCoord2fvARB );
+   _glapi_Dispatch->MultiTexCoord2fvARB( target, tc );
+}
+
+static void GLAPIENTRY TAG(MultiTexCoord3fARB)( GLenum target, GLfloat s,
+				     GLfloat t, GLfloat r )
+{
+   PRE_LOOPBACK( MultiTexCoord3fARB );
+   _glapi_Dispatch->MultiTexCoord3fARB( target, s, t, r );
+}
+
+static void GLAPIENTRY TAG(MultiTexCoord3fvARB)( GLenum target, const GLfloat *tc )
+{
+   PRE_LOOPBACK( MultiTexCoord3fvARB );
+   _glapi_Dispatch->MultiTexCoord3fvARB( target, tc );
+}
+
+static void GLAPIENTRY TAG(MultiTexCoord4fARB)( GLenum target, GLfloat s,
+				     GLfloat t, GLfloat r, GLfloat q )
+{
+   PRE_LOOPBACK( MultiTexCoord4fARB );
+   _glapi_Dispatch->MultiTexCoord4fARB( target, s, t, r, q );
+}
+
+static void GLAPIENTRY TAG(MultiTexCoord4fvARB)( GLenum target, const GLfloat *tc )
+{
+   PRE_LOOPBACK( MultiTexCoord4fvARB );
+   _glapi_Dispatch->MultiTexCoord4fvARB( target, tc );
+}
+
+static void GLAPIENTRY TAG(Normal3f)( GLfloat x, GLfloat y, GLfloat z )
+{
+   PRE_LOOPBACK( Normal3f );
+   _glapi_Dispatch->Normal3f( x, y, z );
+}
+
+static void GLAPIENTRY TAG(Normal3fv)( const GLfloat *v )
+{
+   PRE_LOOPBACK( Normal3fv );
+   _glapi_Dispatch->Normal3fv( v );
+}
+
+static void GLAPIENTRY TAG(SecondaryColor3fEXT)( GLfloat r, GLfloat g, GLfloat b )
+{
+   PRE_LOOPBACK( SecondaryColor3fEXT );
+   _glapi_Dispatch->SecondaryColor3fEXT( r, g, b );
+}
+
+static void GLAPIENTRY TAG(SecondaryColor3fvEXT)( const GLfloat *v )
+{
+   PRE_LOOPBACK( SecondaryColor3fvEXT );
+   _glapi_Dispatch->SecondaryColor3fvEXT( v );
+}
+
+static void GLAPIENTRY TAG(TexCoord1f)( GLfloat s )
+{
+   PRE_LOOPBACK( TexCoord1f );
+   _glapi_Dispatch->TexCoord1f( s );
+}
+
+static void GLAPIENTRY TAG(TexCoord1fv)( const GLfloat *tc )
+{
+   PRE_LOOPBACK( TexCoord1fv );
+   _glapi_Dispatch->TexCoord1fv( tc );
+}
+
+static void GLAPIENTRY TAG(TexCoord2f)( GLfloat s, GLfloat t )
+{
+   PRE_LOOPBACK( TexCoord2f );
+   _glapi_Dispatch->TexCoord2f( s, t );
+}
+
+static void GLAPIENTRY TAG(TexCoord2fv)( const GLfloat *tc )
+{
+   PRE_LOOPBACK( TexCoord2fv );
+   _glapi_Dispatch->TexCoord2fv( tc );
+}
+
+static void GLAPIENTRY TAG(TexCoord3f)( GLfloat s, GLfloat t, GLfloat r )
+{
+   PRE_LOOPBACK( TexCoord3f );
+   _glapi_Dispatch->TexCoord3f( s, t, r );
+}
+
+static void GLAPIENTRY TAG(TexCoord3fv)( const GLfloat *tc )
+{
+   PRE_LOOPBACK( TexCoord3fv );
+   _glapi_Dispatch->TexCoord3fv( tc );
+}
+
+static void GLAPIENTRY TAG(TexCoord4f)( GLfloat s, GLfloat t, GLfloat r, GLfloat q )
+{
+   PRE_LOOPBACK( TexCoord4f );
+   _glapi_Dispatch->TexCoord4f( s, t, r, q );
+}
+
+static void GLAPIENTRY TAG(TexCoord4fv)( const GLfloat *tc )
+{
+   PRE_LOOPBACK( TexCoord4fv );
+   _glapi_Dispatch->TexCoord4fv( tc );
+}
+
+static void GLAPIENTRY TAG(Vertex2f)( GLfloat x, GLfloat y )
+{
+   PRE_LOOPBACK( Vertex2f );
+   _glapi_Dispatch->Vertex2f( x, y );
+}
+
+static void GLAPIENTRY TAG(Vertex2fv)( const GLfloat *v )
+{
+   PRE_LOOPBACK( Vertex2fv );
+   _glapi_Dispatch->Vertex2fv( v );
+}
+
+static void GLAPIENTRY TAG(Vertex3f)( GLfloat x, GLfloat y, GLfloat z )
+{
+   PRE_LOOPBACK( Vertex3f );
+   _glapi_Dispatch->Vertex3f( x, y, z );
+}
+
+static void GLAPIENTRY TAG(Vertex3fv)( const GLfloat *v )
+{
+   PRE_LOOPBACK( Vertex3fv );
+   _glapi_Dispatch->Vertex3fv( v );
+}
+
+static void GLAPIENTRY TAG(Vertex4f)( GLfloat x, GLfloat y, GLfloat z, GLfloat w )
+{
+   PRE_LOOPBACK( Vertex4f );
+   _glapi_Dispatch->Vertex4f( x, y, z, w );
+}
+
+static void GLAPIENTRY TAG(Vertex4fv)( const GLfloat *v )
+{
+   PRE_LOOPBACK( Vertex4fv );
+   _glapi_Dispatch->Vertex4fv( v );
+}
+
+static void GLAPIENTRY TAG(CallList)( GLuint i )
+{
+   PRE_LOOPBACK( CallList );
+   _glapi_Dispatch->CallList( i );
+}
+
+static void GLAPIENTRY TAG(CallLists)( GLsizei sz, GLenum type, const GLvoid *v )
+{
+   PRE_LOOPBACK( CallLists );
+   _glapi_Dispatch->CallLists( sz, type, v );
+}
+
+static void GLAPIENTRY TAG(Begin)( GLenum mode )
+{
+   PRE_LOOPBACK( Begin );
+   _glapi_Dispatch->Begin( mode );
+}
+
+static void GLAPIENTRY TAG(End)( void )
+{
+   PRE_LOOPBACK( End );
+   _glapi_Dispatch->End();
+}
+
+static void GLAPIENTRY TAG(Rectf)( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 )
+{
+   PRE_LOOPBACK( Rectf );
+   _glapi_Dispatch->Rectf( x1, y1, x2, y2 );
+}
+
+static void GLAPIENTRY TAG(DrawArrays)( GLenum mode, GLint start, GLsizei count )
+{
+   PRE_LOOPBACK( DrawArrays );
+   _glapi_Dispatch->DrawArrays( mode, start, count );
+}
+
+static void GLAPIENTRY TAG(DrawElements)( GLenum mode, GLsizei count, GLenum type,
+			       const GLvoid *indices )
+{
+   PRE_LOOPBACK( DrawElements );
+   _glapi_Dispatch->DrawElements( mode, count, type, indices );
+}
+
+static void GLAPIENTRY TAG(DrawRangeElements)( GLenum mode, GLuint start,
+				    GLuint end, GLsizei count,
+				    GLenum type, const GLvoid *indices )
+{
+   PRE_LOOPBACK( DrawRangeElements );
+   _glapi_Dispatch->DrawRangeElements( mode, start, end, count, type, indices );
+}
+
+static void GLAPIENTRY TAG(EvalMesh1)( GLenum mode, GLint i1, GLint i2 )
+{
+   PRE_LOOPBACK( EvalMesh1 );
+   _glapi_Dispatch->EvalMesh1( mode, i1, i2 );
+}
+
+static void GLAPIENTRY TAG(EvalMesh2)( GLenum mode, GLint i1, GLint i2,
+			    GLint j1, GLint j2 )
+{
+   PRE_LOOPBACK( EvalMesh2 );
+   _glapi_Dispatch->EvalMesh2( mode, i1, i2, j1, j2 );
+}
+
+static void GLAPIENTRY TAG(VertexAttrib1fNV)( GLuint index, GLfloat x )
+{
+   PRE_LOOPBACK( VertexAttrib1fNV );
+   _glapi_Dispatch->VertexAttrib1fNV( index, x );
+}
+
+static void GLAPIENTRY TAG(VertexAttrib1fvNV)( GLuint index, const GLfloat *v )
+{
+   PRE_LOOPBACK( VertexAttrib1fvNV );
+   _glapi_Dispatch->VertexAttrib1fvNV( index, v );
+}
+
+static void GLAPIENTRY TAG(VertexAttrib2fNV)( GLuint index, GLfloat x, GLfloat y )
+{
+   PRE_LOOPBACK( VertexAttrib2fNV );
+   _glapi_Dispatch->VertexAttrib2fNV( index, x, y );
+}
+
+static void GLAPIENTRY TAG(VertexAttrib2fvNV)( GLuint index, const GLfloat *v )
+{
+   PRE_LOOPBACK( VertexAttrib2fvNV );
+   _glapi_Dispatch->VertexAttrib2fvNV( index, v );
+}
+
+static void GLAPIENTRY TAG(VertexAttrib3fNV)( GLuint index, GLfloat x, GLfloat y, GLfloat z )
+{
+   PRE_LOOPBACK( VertexAttrib3fNV );
+   _glapi_Dispatch->VertexAttrib3fNV( index, x, y, z );
+}
+
+static void GLAPIENTRY TAG(VertexAttrib3fvNV)( GLuint index, const GLfloat *v )
+{
+   PRE_LOOPBACK( VertexAttrib3fvNV );
+   _glapi_Dispatch->VertexAttrib3fvNV( index, v );
+}
+
+static void GLAPIENTRY TAG(VertexAttrib4fNV)( GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w )
+{
+   PRE_LOOPBACK( VertexAttrib4fNV );
+   _glapi_Dispatch->VertexAttrib4fNV( index, x, y, z, w );
+}
+
+static void GLAPIENTRY TAG(VertexAttrib4fvNV)( GLuint index, const GLfloat *v )
+{
+   PRE_LOOPBACK( VertexAttrib4fvNV );
+   _glapi_Dispatch->VertexAttrib4fvNV( index, v );
+}
+
+
+static GLvertexformat TAG(vtxfmt) = {
+   TAG(ArrayElement),
+   TAG(Color3f),
+   TAG(Color3fv),
+   TAG(Color4f),
+   TAG(Color4fv),
+   TAG(EdgeFlag),
+   TAG(EdgeFlagv),
+   TAG(EvalCoord1f),
+   TAG(EvalCoord1fv),
+   TAG(EvalCoord2f),
+   TAG(EvalCoord2fv),
+   TAG(EvalPoint1),
+   TAG(EvalPoint2),
+   TAG(FogCoordfEXT),
+   TAG(FogCoordfvEXT),
+   TAG(Indexf),
+   TAG(Indexfv),
+   TAG(Materialfv),
+   TAG(MultiTexCoord1fARB),
+   TAG(MultiTexCoord1fvARB),
+   TAG(MultiTexCoord2fARB),
+   TAG(MultiTexCoord2fvARB),
+   TAG(MultiTexCoord3fARB),
+   TAG(MultiTexCoord3fvARB),
+   TAG(MultiTexCoord4fARB),
+   TAG(MultiTexCoord4fvARB),
+   TAG(Normal3f),
+   TAG(Normal3fv),
+   TAG(SecondaryColor3fEXT),
+   TAG(SecondaryColor3fvEXT),
+   TAG(TexCoord1f),
+   TAG(TexCoord1fv),
+   TAG(TexCoord2f),
+   TAG(TexCoord2fv),
+   TAG(TexCoord3f),
+   TAG(TexCoord3fv),
+   TAG(TexCoord4f),
+   TAG(TexCoord4fv),
+   TAG(Vertex2f),
+   TAG(Vertex2fv),
+   TAG(Vertex3f),
+   TAG(Vertex3fv),
+   TAG(Vertex4f),
+   TAG(Vertex4fv),
+   TAG(CallList),
+   TAG(CallLists),
+   TAG(Begin),
+   TAG(End),
+   TAG(VertexAttrib1fNV),
+   TAG(VertexAttrib1fvNV),
+   TAG(VertexAttrib2fNV),
+   TAG(VertexAttrib2fvNV),
+   TAG(VertexAttrib3fNV),
+   TAG(VertexAttrib3fvNV),
+   TAG(VertexAttrib4fNV),
+   TAG(VertexAttrib4fvNV),
+   TAG(Rectf),
+   TAG(DrawArrays),
+   TAG(DrawElements),
+   TAG(DrawRangeElements),
+   TAG(EvalMesh1),
+   TAG(EvalMesh2)
+};
+
+#undef TAG
+#undef PRE_LOOPBACK
diff --git a/reactos/lib/mesa32/src/math/m_clip_tmp.h b/reactos/lib/mesa32/src/math/m_clip_tmp.h
new file mode 100644
index 00000000000..6551798c318
--- /dev/null
+++ b/reactos/lib/mesa32/src/math/m_clip_tmp.h
@@ -0,0 +1,243 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * New (3.1) transformation code written by Keith Whitwell.
+ */
+
+
+/* KW: a clever asm implementation would nestle integer versions
+ * of the outcode calculation underneath the division.  Gcc won't
+ * do this, strangely enough, so I only do the divide in
+ * the case where the cliptest passes.  This isn't essential,
+ * and an asm implementation needn't replicate that behaviour.
+ *
+ * \param clip_vec vector of incoming clip-space coords
+ * \param proj_vec vector of resultant NDC-space projected coords
+ * \param clipMask resulting array of clip flags
+ * \param orMask bitwise-OR of clipMask values
+ * \param andMask bitwise-AND of clipMask values
+ * \return proj_vec pointer
+ */
+static GLvector4f * _XFORMAPI TAG(cliptest_points4)( GLvector4f *clip_vec,
+                                                     GLvector4f *proj_vec,
+                                                     GLubyte clipMask[],
+                                                     GLubyte *orMask,
+                                                     GLubyte *andMask )
+{
+   const GLuint stride = clip_vec->stride;
+   const GLfloat *from = (GLfloat *)clip_vec->start;
+   const GLuint count = clip_vec->count;
+   GLuint c = 0;
+   GLfloat (*vProj)[4] = (GLfloat (*)[4])proj_vec->start;
+   GLubyte tmpAndMask = *andMask;
+   GLubyte tmpOrMask = *orMask;
+   GLuint i;
+   STRIDE_LOOP {
+      const GLfloat cx = from[0];
+      const GLfloat cy = from[1];
+      const GLfloat cz = from[2];
+      const GLfloat cw = from[3];
+#if defined(macintosh) || defined(__powerpc__)
+      /* on powerpc cliptest is 17% faster in this way. */
+      GLuint mask;
+      mask = (((cw < cx) << CLIP_RIGHT_SHIFT));
+      mask |= (((cw < -cx) << CLIP_LEFT_SHIFT));
+      mask |= (((cw < cy) << CLIP_TOP_SHIFT));
+      mask |= (((cw < -cy) << CLIP_BOTTOM_SHIFT));
+      mask |= (((cw < cz) << CLIP_FAR_SHIFT));
+      mask |= (((cw < -cz) << CLIP_NEAR_SHIFT));
+#else /* !defined(macintosh)) */
+      GLubyte mask = 0;
+      if (-cx + cw < 0) mask |= CLIP_RIGHT_BIT;
+      if ( cx + cw < 0) mask |= CLIP_LEFT_BIT;
+      if (-cy + cw < 0) mask |= CLIP_TOP_BIT;
+      if ( cy + cw < 0) mask |= CLIP_BOTTOM_BIT;
+      if (-cz + cw < 0) mask |= CLIP_FAR_BIT;
+      if ( cz + cw < 0) mask |= CLIP_NEAR_BIT;
+#endif /* defined(macintosh) */
+
+      clipMask[i] = mask;
+      if (mask) {
+	 c++;
+	 tmpAndMask &= mask;
+	 tmpOrMask |= mask;
+	 vProj[i][0] = 0;
+	 vProj[i][1] = 0;
+	 vProj[i][2] = 0;
+	 vProj[i][3] = 1;
+      } else {
+	 GLfloat oow = 1.0F / cw;
+	 vProj[i][0] = cx * oow;
+	 vProj[i][1] = cy * oow;
+	 vProj[i][2] = cz * oow;
+	 vProj[i][3] = oow;
+      }
+   }
+
+   *orMask = tmpOrMask;
+   *andMask = (GLubyte) (c < count ? 0 : tmpAndMask);
+
+   proj_vec->flags |= VEC_SIZE_4;
+   proj_vec->size = 4;
+   proj_vec->count = clip_vec->count;
+   return proj_vec;
+}
+
+
+
+/*
+ * \param clip_vec vector of incoming clip-space coords
+ * \param proj_vec vector of resultant NDC-space projected coords
+ * \param clipMask resulting array of clip flags
+ * \param orMask bitwise-OR of clipMask values
+ * \param andMask bitwise-AND of clipMask values
+ * \return clip_vec pointer
+ */
+static GLvector4f * _XFORMAPI TAG(cliptest_np_points4)( GLvector4f *clip_vec,
+							GLvector4f *proj_vec,
+							GLubyte clipMask[],
+							GLubyte *orMask,
+							GLubyte *andMask )
+{
+   const GLuint stride = clip_vec->stride;
+   const GLuint count = clip_vec->count;
+   const GLfloat *from = (GLfloat *)clip_vec->start;
+   GLuint c = 0;
+   GLubyte tmpAndMask = *andMask;
+   GLubyte tmpOrMask = *orMask;
+   GLuint i;
+   STRIDE_LOOP {
+      const GLfloat cx = from[0];
+      const GLfloat cy = from[1];
+      const GLfloat cz = from[2];
+      const GLfloat cw = from[3];
+#if defined(macintosh) || defined(__powerpc__)
+      /* on powerpc cliptest is 17% faster in this way. */
+      GLuint mask;
+      mask = (((cw < cx) << CLIP_RIGHT_SHIFT));
+      mask |= (((cw < -cx) << CLIP_LEFT_SHIFT));
+      mask |= (((cw < cy) << CLIP_TOP_SHIFT));
+      mask |= (((cw < -cy) << CLIP_BOTTOM_SHIFT));
+      mask |= (((cw < cz) << CLIP_FAR_SHIFT));
+      mask |= (((cw < -cz) << CLIP_NEAR_SHIFT));
+#else /* !defined(macintosh)) */
+      GLubyte mask = 0;
+      if (-cx + cw < 0) mask |= CLIP_RIGHT_BIT;
+      if ( cx + cw < 0) mask |= CLIP_LEFT_BIT;
+      if (-cy + cw < 0) mask |= CLIP_TOP_BIT;
+      if ( cy + cw < 0) mask |= CLIP_BOTTOM_BIT;
+      if (-cz + cw < 0) mask |= CLIP_FAR_BIT;
+      if ( cz + cw < 0) mask |= CLIP_NEAR_BIT;
+#endif /* defined(macintosh) */
+
+      clipMask[i] = mask;
+      if (mask) {
+	 c++;
+	 tmpAndMask &= mask;
+	 tmpOrMask |= mask;
+      }
+   }
+
+   *orMask = tmpOrMask;
+   *andMask = (GLubyte) (c < count ? 0 : tmpAndMask);
+   return clip_vec;
+}
+
+
+static GLvector4f * _XFORMAPI TAG(cliptest_points3)( GLvector4f *clip_vec,
+                                                     GLvector4f *proj_vec,
+                                                     GLubyte clipMask[],
+                                                     GLubyte *orMask,
+                                                     GLubyte *andMask )
+{
+   const GLuint stride = clip_vec->stride;
+   const GLuint count = clip_vec->count;
+   const GLfloat *from = (GLfloat *)clip_vec->start;
+
+   GLubyte tmpOrMask = *orMask;
+   GLubyte tmpAndMask = *andMask;
+   GLuint i;
+   STRIDE_LOOP {
+      const GLfloat cx = from[0], cy = from[1], cz = from[2];
+      GLubyte mask = 0;
+      if (cx >  1.0)       mask |= CLIP_RIGHT_BIT;
+      else if (cx < -1.0)  mask |= CLIP_LEFT_BIT;
+      if (cy >  1.0)       mask |= CLIP_TOP_BIT;
+      else if (cy < -1.0)  mask |= CLIP_BOTTOM_BIT;
+      if (cz >  1.0)       mask |= CLIP_FAR_BIT;
+      else if (cz < -1.0)  mask |= CLIP_NEAR_BIT;
+      clipMask[i] = mask;
+      tmpOrMask |= mask;
+      tmpAndMask &= mask;
+   }
+
+   *orMask = tmpOrMask;
+   *andMask = tmpAndMask;
+   return clip_vec;
+}
+
+
+static GLvector4f * _XFORMAPI TAG(cliptest_points2)( GLvector4f *clip_vec,
+                                                     GLvector4f *proj_vec,
+                                                     GLubyte clipMask[],
+                                                     GLubyte *orMask,
+                                                     GLubyte *andMask )
+{
+   const GLuint stride = clip_vec->stride;
+   const GLuint count = clip_vec->count;
+   const GLfloat *from = (GLfloat *)clip_vec->start;
+
+   GLubyte tmpOrMask = *orMask;
+   GLubyte tmpAndMask = *andMask;
+   GLuint i;
+   STRIDE_LOOP {
+      const GLfloat cx = from[0], cy = from[1];
+      GLubyte mask = 0;
+      if (cx >  1.0)       mask |= CLIP_RIGHT_BIT;
+      else if (cx < -1.0)  mask |= CLIP_LEFT_BIT;
+      if (cy >  1.0)       mask |= CLIP_TOP_BIT;
+      else if (cy < -1.0)  mask |= CLIP_BOTTOM_BIT;
+      clipMask[i] = mask;
+      tmpOrMask |= mask;
+      tmpAndMask &= mask;
+   }
+
+   *orMask = tmpOrMask;
+   *andMask = tmpAndMask;
+   return clip_vec;
+}
+
+
+static void TAG(init_c_cliptest)( void )
+{
+   _mesa_clip_tab[4] = TAG(cliptest_points4);
+   _mesa_clip_tab[3] = TAG(cliptest_points3);
+   _mesa_clip_tab[2] = TAG(cliptest_points2);
+
+   _mesa_clip_np_tab[4] = TAG(cliptest_np_points4);
+   _mesa_clip_np_tab[3] = TAG(cliptest_points3);
+   _mesa_clip_np_tab[2] = TAG(cliptest_points2);
+}
diff --git a/reactos/lib/mesa32/src/math/m_copy_tmp.h b/reactos/lib/mesa32/src/math/m_copy_tmp.h
new file mode 100644
index 00000000000..a9e33511ee2
--- /dev/null
+++ b/reactos/lib/mesa32/src/math/m_copy_tmp.h
@@ -0,0 +1,86 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * New (3.1) transformation code written by Keith Whitwell.
+ */
+
+
+#define COPY_FUNC( BITS )						\
+static void TAG2(copy, BITS)( GLvector4f *to, const GLvector4f *f )	\
+{									\
+   GLfloat (*t)[4] = (GLfloat (*)[4])to->start;				\
+   GLfloat *from = f->start;						\
+   GLuint stride = f->stride;				        	\
+   GLuint count = f->count;						\
+   GLuint i;								\
+									\
+   if (BITS)								\
+      STRIDE_LOOP {							\
+	 if (BITS&1) t[i][0] = from[0];					\
+	 if (BITS&2) t[i][1] = from[1];					\
+	 if (BITS&4) t[i][2] = from[2];					\
+	 if (BITS&8) t[i][3] = from[3];					\
+      }									\
+}
+
+/* We got them all here:
+ */
+COPY_FUNC( 0x0 )		/* noop */
+COPY_FUNC( 0x1 )
+COPY_FUNC( 0x2 )
+COPY_FUNC( 0x3 )
+COPY_FUNC( 0x4 )
+COPY_FUNC( 0x5 )
+COPY_FUNC( 0x6 )
+COPY_FUNC( 0x7 )
+COPY_FUNC( 0x8 )
+COPY_FUNC( 0x9 )
+COPY_FUNC( 0xa )
+COPY_FUNC( 0xb )
+COPY_FUNC( 0xc )
+COPY_FUNC( 0xd )
+COPY_FUNC( 0xe )
+COPY_FUNC( 0xf )
+
+static void TAG2(init_copy, 0)( void )
+{
+   _mesa_copy_tab[0x0] = TAG2(copy, 0x0);
+   _mesa_copy_tab[0x1] = TAG2(copy, 0x1);
+   _mesa_copy_tab[0x2] = TAG2(copy, 0x2);
+   _mesa_copy_tab[0x3] = TAG2(copy, 0x3);
+   _mesa_copy_tab[0x4] = TAG2(copy, 0x4);
+   _mesa_copy_tab[0x5] = TAG2(copy, 0x5);
+   _mesa_copy_tab[0x6] = TAG2(copy, 0x6);
+   _mesa_copy_tab[0x7] = TAG2(copy, 0x7);
+   _mesa_copy_tab[0x8] = TAG2(copy, 0x8);
+   _mesa_copy_tab[0x9] = TAG2(copy, 0x9);
+   _mesa_copy_tab[0xa] = TAG2(copy, 0xa);
+   _mesa_copy_tab[0xb] = TAG2(copy, 0xb);
+   _mesa_copy_tab[0xc] = TAG2(copy, 0xc);
+   _mesa_copy_tab[0xd] = TAG2(copy, 0xd);
+   _mesa_copy_tab[0xe] = TAG2(copy, 0xe);
+   _mesa_copy_tab[0xf] = TAG2(copy, 0xf);
+}
diff --git a/reactos/lib/mesa32/src/math/m_debug.h b/reactos/lib/mesa32/src/math/m_debug.h
new file mode 100644
index 00000000000..6476b6de28c
--- /dev/null
+++ b/reactos/lib/mesa32/src/math/m_debug.h
@@ -0,0 +1,42 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Gareth Hughes
+ */
+
+#ifndef __M_DEBUG_H__
+#define __M_DEBUG_H__
+
+extern void _math_test_all_transform_functions( char *description );
+extern void _math_test_all_normal_transform_functions( char *description );
+extern void _math_test_all_cliptest_functions( char *description );
+
+/* Deprecated?
+ */
+extern void _math_test_all_vertex_functions( char *description );
+
+extern char *mesa_profile;
+
+#endif
diff --git a/reactos/lib/mesa32/src/math/m_debug_clip.c b/reactos/lib/mesa32/src/math/m_debug_clip.c
new file mode 100644
index 00000000000..867850c6137
--- /dev/null
+++ b/reactos/lib/mesa32/src/math/m_debug_clip.c
@@ -0,0 +1,366 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.0
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Gareth Hughes
+ */
+
+#include "glheader.h"
+#include "context.h"
+#include "macros.h"
+#include "imports.h"
+
+#include "m_matrix.h"
+#include "m_xform.h"
+
+#include "m_debug.h"
+#include "m_debug_util.h"
+
+#ifdef DEBUG  /* This code only used for debugging */
+
+static clip_func *clip_tab[2] = {
+   _mesa_clip_tab,
+   _mesa_clip_np_tab
+};
+static char *cnames[2] = {
+   "_mesa_clip_tab",
+   "_mesa_clip_np_tab"
+};
+#ifdef RUN_DEBUG_BENCHMARK
+static char *cstrings[2] = {
+   "clip, perspective divide",
+   "clip, no divide"
+};
+#endif
+
+
+/* =============================================================
+ * Reference cliptests
+ */
+
+static GLvector4f *ref_cliptest_points4( GLvector4f *clip_vec,
+					 GLvector4f *proj_vec,
+					 GLubyte clipMask[],
+					 GLubyte *orMask,
+					 GLubyte *andMask )
+{
+   const GLuint stride = clip_vec->stride;
+   const GLuint count = clip_vec->count;
+   const GLfloat *from = (GLfloat *)clip_vec->start;
+   GLuint c = 0;
+   GLfloat (*vProj)[4] = (GLfloat (*)[4])proj_vec->start;
+   GLubyte tmpAndMask = *andMask;
+   GLubyte tmpOrMask = *orMask;
+   GLuint i;
+   for ( i = 0 ; i < count ; i++, STRIDE_F(from, stride) ) {
+      const GLfloat cx = from[0];
+      const GLfloat cy = from[1];
+      const GLfloat cz = from[2];
+      const GLfloat cw = from[3];
+      GLubyte mask = 0;
+      if ( -cx + cw < 0 ) mask |= CLIP_RIGHT_BIT;
+      if (  cx + cw < 0 ) mask |= CLIP_LEFT_BIT;
+      if ( -cy + cw < 0 ) mask |= CLIP_TOP_BIT;
+      if (  cy + cw < 0 ) mask |= CLIP_BOTTOM_BIT;
+      if ( -cz + cw < 0 ) mask |= CLIP_FAR_BIT;
+      if (  cz + cw < 0 ) mask |= CLIP_NEAR_BIT;
+      clipMask[i] = mask;
+      if ( mask ) {
+	 c++;
+	 tmpAndMask &= mask;
+	 tmpOrMask |= mask;
+	 vProj[i][0] = 0;
+	 vProj[i][1] = 0;
+	 vProj[i][2] = 0;
+	 vProj[i][3] = 1;
+      } else {
+	 GLfloat oow = 1.0F / cw;
+	 vProj[i][0] = cx * oow;
+	 vProj[i][1] = cy * oow;
+	 vProj[i][2] = cz * oow;
+	 vProj[i][3] = oow;
+      }
+   }
+
+   *orMask = tmpOrMask;
+   *andMask = (GLubyte) (c < count ? 0 : tmpAndMask);
+
+   proj_vec->flags |= VEC_SIZE_4;
+   proj_vec->size = 4;
+   proj_vec->count = clip_vec->count;
+   return proj_vec;
+}
+
+/* Keep these here for now, even though we don't use them...
+ */
+static GLvector4f *ref_cliptest_points3( GLvector4f *clip_vec,
+					 GLvector4f *proj_vec,
+					 GLubyte clipMask[],
+					 GLubyte *orMask,
+					 GLubyte *andMask )
+{
+   const GLuint stride = clip_vec->stride;
+   const GLuint count = clip_vec->count;
+   const GLfloat *from = (GLfloat *)clip_vec->start;
+
+   GLubyte tmpOrMask = *orMask;
+   GLubyte tmpAndMask = *andMask;
+   GLuint i;
+   for ( i = 0 ; i < count ; i++, STRIDE_F(from, stride) ) {
+      const GLfloat cx = from[0], cy = from[1], cz = from[2];
+      GLubyte mask = 0;
+      if ( cx >  1.0 )		mask |= CLIP_RIGHT_BIT;
+      else if ( cx < -1.0 )	mask |= CLIP_LEFT_BIT;
+      if ( cy >  1.0 )		mask |= CLIP_TOP_BIT;
+      else if ( cy < -1.0 )	mask |= CLIP_BOTTOM_BIT;
+      if ( cz >  1.0 )		mask |= CLIP_FAR_BIT;
+      else if ( cz < -1.0 )	mask |= CLIP_NEAR_BIT;
+      clipMask[i] = mask;
+      tmpOrMask |= mask;
+      tmpAndMask &= mask;
+   }
+
+   *orMask = tmpOrMask;
+   *andMask = tmpAndMask;
+   return clip_vec;
+}
+
+static GLvector4f * ref_cliptest_points2( GLvector4f *clip_vec,
+					  GLvector4f *proj_vec,
+					  GLubyte clipMask[],
+					  GLubyte *orMask,
+					  GLubyte *andMask )
+{
+   const GLuint stride = clip_vec->stride;
+   const GLuint count = clip_vec->count;
+   const GLfloat *from = (GLfloat *)clip_vec->start;
+
+   GLubyte tmpOrMask = *orMask;
+   GLubyte tmpAndMask = *andMask;
+   GLuint i;
+   for ( i = 0 ; i < count ; i++, STRIDE_F(from, stride) ) {
+      const GLfloat cx = from[0], cy = from[1];
+      GLubyte mask = 0;
+      if ( cx >  1.0 )		mask |= CLIP_RIGHT_BIT;
+      else if ( cx < -1.0 )	mask |= CLIP_LEFT_BIT;
+      if ( cy >  1.0 )		mask |= CLIP_TOP_BIT;
+      else if ( cy < -1.0 )	mask |= CLIP_BOTTOM_BIT;
+      clipMask[i] = mask;
+      tmpOrMask |= mask;
+      tmpAndMask &= mask;
+   }
+
+   *orMask = tmpOrMask;
+   *andMask = tmpAndMask;
+   return clip_vec;
+}
+
+static clip_func ref_cliptest[5] = {
+   0,
+   0,
+   ref_cliptest_points2,
+   ref_cliptest_points3,
+   ref_cliptest_points4
+};
+
+
+/* =============================================================
+ * Cliptest tests
+ */
+
+static GLfloat s[TEST_COUNT][4] ALIGN16;
+static GLfloat d[TEST_COUNT][4] ALIGN16;
+static GLfloat r[TEST_COUNT][4] ALIGN16;
+
+static int test_cliptest_function( clip_func func, int np,
+				   int psize, long *cycles )
+{
+   GLvector4f source[1], dest[1], ref[1];
+   GLubyte dm[TEST_COUNT], dco, dca;
+   GLubyte rm[TEST_COUNT], rco, rca;
+   int i, j;
+#ifdef  RUN_DEBUG_BENCHMARK
+   int cycle_i;                /* the counter for the benchmarks we run */
+#endif
+
+   (void) cycles;
+
+   if ( psize > 4 ) {
+      _mesa_problem( NULL, "test_cliptest_function called with psize > 4\n" );
+      return 0;
+   }
+
+   for ( i = 0 ; i < TEST_COUNT ; i++) {
+      ASSIGN_4V( d[i], 0.0, 0.0, 0.0, 1.0 );
+      ASSIGN_4V( s[i], 0.0, 0.0, 0.0, 1.0 );
+      for ( j = 0 ; j < psize ; j++ )
+         s[i][j] = rnd();
+   }
+
+   source->data = (GLfloat(*)[4])s;
+   source->start = (GLfloat *)s;
+   source->count = TEST_COUNT;
+   source->stride = sizeof(s[0]);
+   source->size = 4;
+   source->flags = 0;
+
+   dest->data = (GLfloat(*)[4])d;
+   dest->start = (GLfloat *)d;
+   dest->count = TEST_COUNT;
+   dest->stride = sizeof(float[4]);
+   dest->size = 0;
+   dest->flags = 0;
+
+   ref->data = (GLfloat(*)[4])r;
+   ref->start = (GLfloat *)r;
+   ref->count = TEST_COUNT;
+   ref->stride = sizeof(float[4]);
+   ref->size = 0;
+   ref->flags = 0;
+
+   dco = rco = 0;
+   dca = rca = CLIP_ALL_BITS;
+
+   ref_cliptest[psize]( source, ref, rm, &rco, &rca );
+
+   if ( mesa_profile ) {
+      BEGIN_RACE( *cycles );
+      func( source, dest, dm, &dco, &dca );
+      END_RACE( *cycles );
+   }
+   else {
+      func( source, dest, dm, &dco, &dca );
+   }
+
+   if ( dco != rco ) {
+      _mesa_printf( "\n-----------------------------\n" );
+      _mesa_printf( "dco = 0x%02x   rco = 0x%02x\n", dco, rco );
+      return 0;
+   }
+   if ( dca != rca ) {
+      _mesa_printf( "\n-----------------------------\n" );
+      _mesa_printf( "dca = 0x%02x   rca = 0x%02x\n", dca, rca );
+      return 0;
+   }
+   for ( i = 0 ; i < TEST_COUNT ; i++ ) {
+      if ( dm[i] != rm[i] ) {
+	 _mesa_printf( "\n-----------------------------\n" );
+	 _mesa_printf( "(i = %i)\n", i );
+	 _mesa_printf( "dm = 0x%02x   rm = 0x%02x\n", dm[i], rm[i] );
+	 return 0;
+      }
+   }
+
+   /* Only verify output on projected points4 case.  FIXME: Do we need
+    * to test other cases?
+    */
+   if ( np || psize < 4 )
+      return 1;
+
+   for ( i = 0 ; i < TEST_COUNT ; i++ ) {
+      for ( j = 0 ; j < 4 ; j++ ) {
+         if ( significand_match( d[i][j], r[i][j] ) < REQUIRED_PRECISION ) {
+            _mesa_printf( "\n-----------------------------\n" );
+            _mesa_printf( "(i = %i, j = %i)  dm = 0x%02x   rm = 0x%02x\n",
+		    i, j, dm[i], rm[i] );
+            _mesa_printf( "%f \t %f \t [diff = %e - %i bit missed]\n",
+		    d[i][0], r[i][0], r[i][0]-d[i][0],
+		    MAX_PRECISION - significand_match( d[i][0], r[i][0] ) );
+            _mesa_printf( "%f \t %f \t [diff = %e - %i bit missed]\n",
+		    d[i][1], r[i][1], r[i][1]-d[i][1],
+		    MAX_PRECISION - significand_match( d[i][1], r[i][1] ) );
+            _mesa_printf( "%f \t %f \t [diff = %e - %i bit missed]\n",
+		    d[i][2], r[i][2], r[i][2]-d[i][2],
+		    MAX_PRECISION - significand_match( d[i][2], r[i][2] ) );
+            _mesa_printf( "%f \t %f \t [diff = %e - %i bit missed]\n",
+		    d[i][3], r[i][3], r[i][3]-d[i][3],
+		    MAX_PRECISION - significand_match( d[i][3], r[i][3] ) );
+            return 0;
+         }
+      }
+   }
+
+   return 1;
+}
+
+void _math_test_all_cliptest_functions( char *description )
+{
+   int np, psize;
+   long benchmark_tab[2][4];
+   static int first_time = 1;
+
+   if ( first_time ) {
+      first_time = 0;
+      mesa_profile = _mesa_getenv( "MESA_PROFILE" );
+   }
+
+#ifdef RUN_DEBUG_BENCHMARK
+   if ( mesa_profile ) {
+      if ( !counter_overhead ) {
+	 INIT_COUNTER();
+	 _mesa_printf( "counter overhead: %ld cycles\n\n", counter_overhead );
+      }
+      _mesa_printf( "cliptest results after hooking in %s functions:\n", description );
+   }
+#endif
+
+#ifdef RUN_DEBUG_BENCHMARK
+   if ( mesa_profile ) {
+      _mesa_printf( "\n\t" );
+      for ( psize = 2 ; psize <= 4 ; psize++ ) {
+	 _mesa_printf( " p%d\t", psize );
+      }
+      _mesa_printf( "\n--------------------------------------------------------\n\t" );
+   }
+#endif
+
+   for ( np = 0 ; np < 2 ; np++ ) {
+      for ( psize = 2 ; psize <= 4 ; psize++ ) {
+	 clip_func func = clip_tab[np][psize];
+	 long *cycles = &(benchmark_tab[np][psize-1]);
+
+	 if ( test_cliptest_function( func, np, psize, cycles ) == 0 ) {
+	    char buf[100];
+	    _mesa_sprintf( buf, "%s[%d] failed test (%s)",
+		     cnames[np], psize, description );
+	    _mesa_problem( NULL, buf );
+	 }
+#ifdef RUN_DEBUG_BENCHMARK
+	 if ( mesa_profile )
+	    _mesa_printf( " %li\t", benchmark_tab[np][psize-1] );
+#endif
+      }
+#ifdef RUN_DEBUG_BENCHMARK
+      if ( mesa_profile )
+	 _mesa_printf( " | [%s]\n\t", cstrings[np] );
+#endif
+   }
+#ifdef RUN_DEBUG_BENCHMARK
+   if ( mesa_profile )
+      _mesa_printf( "\n" );
+#endif
+}
+
+
+#endif /* DEBUG */
diff --git a/reactos/lib/mesa32/src/math/m_debug_norm.c b/reactos/lib/mesa32/src/math/m_debug_norm.c
new file mode 100644
index 00000000000..4eac6f6dc69
--- /dev/null
+++ b/reactos/lib/mesa32/src/math/m_debug_norm.c
@@ -0,0 +1,379 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Gareth Hughes
+ */
+
+#include "glheader.h"
+#include "context.h"
+#include "macros.h"
+#include "imports.h"
+
+#include "m_matrix.h"
+#include "m_xform.h"
+
+#include "m_debug.h"
+#include "m_debug_util.h"
+
+
+#ifdef DEBUG  /* This code only used for debugging */
+
+
+static int m_norm_identity[16] = {
+   ONE, NIL, NIL, NIL,
+   NIL, ONE, NIL, NIL,
+   NIL, NIL, ONE, NIL,
+   NIL, NIL, NIL, NIL
+};
+static int m_norm_general[16] = {
+   VAR, VAR, VAR, NIL,
+   VAR, VAR, VAR, NIL,
+   VAR, VAR, VAR, NIL,
+   NIL, NIL, NIL, NIL
+};
+static int m_norm_no_rot[16] = {
+   VAR, NIL, NIL, NIL,
+   NIL, VAR, NIL, NIL,
+   NIL, NIL, VAR, NIL,
+   NIL, NIL, NIL, NIL
+};
+static int *norm_templates[8] = {
+   m_norm_no_rot,
+   m_norm_no_rot,
+   m_norm_no_rot,
+   m_norm_general,
+   m_norm_general,
+   m_norm_general,
+   m_norm_identity,
+   m_norm_identity
+};
+static int norm_types[8] = {
+   NORM_TRANSFORM_NO_ROT,
+   NORM_TRANSFORM_NO_ROT | NORM_RESCALE,
+   NORM_TRANSFORM_NO_ROT | NORM_NORMALIZE,
+   NORM_TRANSFORM,
+   NORM_TRANSFORM | NORM_RESCALE,
+   NORM_TRANSFORM | NORM_NORMALIZE,
+   NORM_RESCALE,
+   NORM_NORMALIZE
+};
+static int norm_scale_types[8] = {               /*  rescale factor          */
+   NIL,                                          /*  NIL disables rescaling  */
+   VAR,
+   NIL,
+   NIL,
+   VAR,
+   NIL,
+   VAR,
+   NIL
+};
+static int norm_normalize_types[8] = {           /*  normalizing ?? (no = 0) */
+   0,
+   0,
+   1,
+   0,
+   0,
+   1,
+   0,
+   1
+};
+static char *norm_strings[8] = {
+   "NORM_TRANSFORM_NO_ROT",
+   "NORM_TRANSFORM_NO_ROT | NORM_RESCALE",
+   "NORM_TRANSFORM_NO_ROT | NORM_NORMALIZE",
+   "NORM_TRANSFORM",
+   "NORM_TRANSFORM | NORM_RESCALE",
+   "NORM_TRANSFORM | NORM_NORMALIZE",
+   "NORM_RESCALE",
+   "NORM_NORMALIZE"
+};
+
+
+/* =============================================================
+ * Reference transformations
+ */
+
+static void ref_norm_transform_rescale( const GLmatrix *mat,
+					GLfloat scale,
+					const GLvector4f *in,
+					const GLfloat *lengths,
+					GLvector4f *dest )
+{
+   GLuint i;
+   const GLfloat *s = in->start;
+   const GLfloat *m = mat->inv;
+   GLfloat (*out)[4] = (GLfloat (*)[4]) dest->start;
+
+   (void) lengths;
+
+   for ( i = 0 ; i < in->count ; i++ ) {
+      GLfloat t[3];
+
+      TRANSFORM_NORMAL( t, s, m );
+      SCALE_SCALAR_3V( out[i], scale, t );
+
+      s = (GLfloat *)((char *)s + in->stride);
+   }
+}
+
+static void ref_norm_transform_normalize( const GLmatrix *mat,
+					  GLfloat scale,
+					  const GLvector4f *in,
+					  const GLfloat *lengths,
+					  GLvector4f *dest )
+{
+   GLuint i;
+   const GLfloat *s = in->start;
+   const GLfloat *m = mat->inv;
+   GLfloat (*out)[4] = (GLfloat (*)[4]) dest->start;
+
+   for ( i = 0 ; i < in->count ; i++ ) {
+      GLfloat t[3];
+
+      TRANSFORM_NORMAL( t, s, m );
+
+      if ( !lengths ) {
+         GLfloat len = LEN_SQUARED_3FV( t );
+         if ( len > 1e-20 ) {
+	    /* Hmmm, don't know how we could test the precalculated
+	     * length case...
+	     */
+            scale = 1.0 / sqrt( len );
+	    SCALE_SCALAR_3V( out[i], scale, t );
+         } else {
+            out[i][0] = out[i][1] = out[i][2] = 0;
+         }
+      } else {
+         scale = lengths[i];;
+	 SCALE_SCALAR_3V( out[i], scale, t );
+      }
+
+      s = (GLfloat *)((char *)s + in->stride);
+   }
+}
+
+
+/* =============================================================
+ * Normal transformation tests
+ */
+
+static void init_matrix( GLfloat *m )
+{
+   m[0] = 63.0; m[4] = 43.0; m[ 8] = 29.0; m[12] = 43.0;
+   m[1] = 55.0; m[5] = 17.0; m[ 9] = 31.0; m[13] =  7.0;
+   m[2] = 44.0; m[6] =  9.0; m[10] =  7.0; m[14] =  3.0;
+   m[3] = 11.0; m[7] = 23.0; m[11] = 91.0; m[15] =  9.0;
+}
+
+
+static int test_norm_function( normal_func func, int mtype, long *cycles )
+{
+   GLvector4f source[1], dest[1], dest2[1], ref[1], ref2[1];
+   GLmatrix mat[1];
+   GLfloat s[TEST_COUNT][5], d[TEST_COUNT][4], r[TEST_COUNT][4];
+   GLfloat d2[TEST_COUNT][4], r2[TEST_COUNT][4], length[TEST_COUNT];
+   GLfloat scale;
+   GLfloat *m;
+   int i, j;
+#ifdef  RUN_DEBUG_BENCHMARK
+   int cycle_i;		/* the counter for the benchmarks we run */
+#endif
+
+   (void) cycles;
+
+   mat->m = (GLfloat *) ALIGN_MALLOC( 16 * sizeof(GLfloat), 16 );
+   mat->inv = m = mat->m;
+
+   init_matrix( m );
+
+   scale = 1.0F + rnd () * norm_scale_types[mtype];
+
+   for ( i = 0 ; i < 4 ; i++ ) {
+      for ( j = 0 ; j < 4 ; j++ ) {
+         switch ( norm_templates[mtype][i * 4 + j] ) {
+         case NIL:
+            m[j * 4 + i] = 0.0;
+            break;
+         case ONE:
+            m[j * 4 + i] = 1.0;
+            break;
+         case NEG:
+            m[j * 4 + i] = -1.0;
+            break;
+         case VAR:
+            break;
+         default:
+            abort();
+         }
+      }
+   }
+
+   for ( i = 0 ; i < TEST_COUNT ; i++ ) {
+      ASSIGN_3V( d[i],  0.0, 0.0, 0.0 );
+      ASSIGN_3V( s[i],  0.0, 0.0, 0.0 );
+      ASSIGN_3V( d2[i], 0.0, 0.0, 0.0 );
+      for ( j = 0 ; j < 3 ; j++ )
+         s[i][j] = rnd();
+      length[i] = 1 / sqrt( LEN_SQUARED_3FV( s[i] ) );
+   }
+
+   source->data = (GLfloat(*)[4]) s;
+   source->start = (GLfloat *) s;
+   source->count = TEST_COUNT;
+   source->stride = sizeof(s[0]);
+   source->flags = 0;
+
+   dest->data = d;
+   dest->start = (GLfloat *) d;
+   dest->count = TEST_COUNT;
+   dest->stride = sizeof(float[4]);
+   dest->flags = 0;
+
+   dest2->data = d2;
+   dest2->start = (GLfloat *) d2;
+   dest2->count = TEST_COUNT;
+   dest2->stride = sizeof(float[4]);
+   dest2->flags = 0;
+
+   ref->data = r;
+   ref->start = (GLfloat *) r;
+   ref->count = TEST_COUNT;
+   ref->stride = sizeof(float[4]);
+   ref->flags = 0;
+
+   ref2->data = r2;
+   ref2->start = (GLfloat *) r2;
+   ref2->count = TEST_COUNT;
+   ref2->stride = sizeof(float[4]);
+   ref2->flags = 0;
+
+   if ( norm_normalize_types[mtype] == 0 ) {
+      ref_norm_transform_rescale( mat, scale, source, NULL, ref );
+   } else {
+      ref_norm_transform_normalize( mat, scale, source, NULL, ref );
+      ref_norm_transform_normalize( mat, scale, source, length, ref2 );
+   }
+
+   if ( mesa_profile ) {
+      BEGIN_RACE( *cycles );
+      func( mat, scale, source, NULL, dest );
+      END_RACE( *cycles );
+      func( mat, scale, source, length, dest2 );
+   } else {
+      func( mat, scale, source, NULL, dest );
+      func( mat, scale, source, length, dest2 );
+   }
+
+   for ( i = 0 ; i < TEST_COUNT ; i++ ) {
+      for ( j = 0 ; j < 3 ; j++ ) {
+         if ( significand_match( d[i][j], r[i][j] ) < REQUIRED_PRECISION ) {
+            _mesa_printf( "-----------------------------\n" );
+            _mesa_printf( "(i = %i, j = %i)\n", i, j );
+            _mesa_printf( "%f \t %f \t [ratio = %e - %i bit missed]\n",
+		    d[i][0], r[i][0], r[i][0]/d[i][0],
+		    MAX_PRECISION - significand_match( d[i][0], r[i][0] ) );
+            _mesa_printf( "%f \t %f \t [ratio = %e - %i bit missed]\n",
+		    d[i][1], r[i][1], r[i][1]/d[i][1],
+		    MAX_PRECISION - significand_match( d[i][1], r[i][1] ) );
+            _mesa_printf( "%f \t %f \t [ratio = %e - %i bit missed]\n",
+		    d[i][2], r[i][2], r[i][2]/d[i][2],
+		    MAX_PRECISION - significand_match( d[i][2], r[i][2] ) );
+            return 0;
+         }
+
+         if ( norm_normalize_types[mtype] != 0 ) {
+            if ( significand_match( d2[i][j], r2[i][j] ) < REQUIRED_PRECISION ) {
+               _mesa_printf( "------------------- precalculated length case ------\n" );
+               _mesa_printf( "(i = %i, j = %i)\n", i, j );
+               _mesa_printf( "%f \t %f \t [ratio = %e - %i bit missed]\n",
+		       d2[i][0], r2[i][0], r2[i][0]/d2[i][0],
+		       MAX_PRECISION - significand_match( d2[i][0], r2[i][0] ) );
+               _mesa_printf( "%f \t %f \t [ratio = %e - %i bit missed]\n",
+		       d2[i][1], r2[i][1], r2[i][1]/d2[i][1],
+		       MAX_PRECISION - significand_match( d2[i][1], r2[i][1] ) );
+               _mesa_printf( "%f \t %f \t [ratio = %e - %i bit missed]\n",
+		       d2[i][2], r2[i][2], r2[i][2]/d2[i][2],
+		       MAX_PRECISION - significand_match( d2[i][2], r2[i][2] ) );
+               return 0;
+            }
+         }
+      }
+   }
+
+   ALIGN_FREE( mat->m );
+   return 1;
+}
+
+void _math_test_all_normal_transform_functions( char *description )
+{
+   int mtype;
+   long benchmark_tab[0xf];
+   static int first_time = 1;
+
+   if ( first_time ) {
+      first_time = 0;
+      mesa_profile = getenv( "MESA_PROFILE" );
+   }
+
+#ifdef RUN_DEBUG_BENCHMARK
+   if ( mesa_profile ) {
+      if ( !counter_overhead ) {
+	 INIT_COUNTER();
+	 _mesa_printf( "counter overhead: %ld cycles\n\n", counter_overhead );
+      }
+      _mesa_printf( "normal transform results after hooking in %s functions:\n",
+	      description );
+      _mesa_printf( "\n-------------------------------------------------------\n" );
+   }
+#endif
+
+   for ( mtype = 0 ; mtype < 8 ; mtype++ ) {
+      normal_func func = _mesa_normal_tab[norm_types[mtype]];
+      long *cycles = &benchmark_tab[mtype];
+
+      if ( test_norm_function( func, mtype, cycles ) == 0 ) {
+	 char buf[100];
+	 _mesa_sprintf( buf, "_mesa_normal_tab[0][%s] failed test (%s)",
+		  norm_strings[mtype], description );
+	 _mesa_problem( NULL, buf );
+      }
+
+#ifdef RUN_DEBUG_BENCHMARK
+      if ( mesa_profile ) {
+	 _mesa_printf( " %li\t", benchmark_tab[mtype] );
+	 _mesa_printf( " | [%s]\n", norm_strings[mtype] );
+      }
+#endif
+   }
+#ifdef RUN_DEBUG_BENCHMARK
+   if ( mesa_profile ) {
+      _mesa_printf( "\n" );
+      fflush( stdout );
+   }
+#endif
+}
+
+
+#endif /* DEBUG */
diff --git a/reactos/lib/mesa32/src/math/m_debug_util.h b/reactos/lib/mesa32/src/math/m_debug_util.h
new file mode 100644
index 00000000000..9df84301f10
--- /dev/null
+++ b/reactos/lib/mesa32/src/math/m_debug_util.h
@@ -0,0 +1,281 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Gareth Hughes
+ */
+
+#ifndef __M_DEBUG_UTIL_H__
+#define __M_DEBUG_UTIL_H__
+
+
+#ifdef DEBUG  /* This code only used for debugging */
+
+
+/* Comment this out to deactivate the cycle counter.
+ * NOTE: it works only on CPUs which know the 'rdtsc' command (586 or higher)
+ * (hope, you don't try to debug Mesa on a 386 ;)
+ */
+#if defined(__GNUC__) && \
+    ((defined(__i386__) && defined(USE_X86_ASM)) || \
+     (defined(__sparc__) && defined(USE_SPARC_ASM)))
+#define  RUN_DEBUG_BENCHMARK
+#endif
+
+#define TEST_COUNT		128	/* size of the tested vector array   */
+
+#define REQUIRED_PRECISION	10	/* allow 4 bits to miss              */
+#define MAX_PRECISION		24	/* max. precision possible           */
+
+
+#ifdef  RUN_DEBUG_BENCHMARK
+/* Overhead of profiling counter in cycles.  Automatically adjusted to
+ * your machine at run time - counter initialization should give very
+ * consistent results.
+ */
+extern long counter_overhead;
+
+/* This is the value of the environment variable MESA_PROFILE, and is
+ * used to determine if we should benchmark the functions as well as
+ * verify their correctness.
+ */
+extern char *mesa_profile;
+
+/* Modify the the number of tests if you like.
+ * We take the minimum of all results, because every error should be
+ * positive (time used by other processes, task switches etc).
+ * It is assumed that all calculations are done in the cache.
+ */
+
+#if defined(__i386__)
+
+#if 1 /* PPro, PII, PIII version */
+
+/* Profiling on the P6 architecture requires a little more work, due to
+ * the internal out-of-order execution.  We must perform a serializing
+ * 'cpuid' instruction before and after the 'rdtsc' instructions to make
+ * sure no other uops are executed when we sample the timestamp counter.
+ */
+#define  INIT_COUNTER()							\
+   do {									\
+      int cycle_i;							\
+      counter_overhead = LONG_MAX;					\
+      for ( cycle_i = 0 ; cycle_i < 8 ; cycle_i++ ) {			\
+	 long cycle_tmp1 = 0, cycle_tmp2 = 0;				\
+	 __asm__ __volatile__ ( "push %%ebx       \n"			\
+				"xor %%eax, %%eax \n"			\
+				"cpuid            \n"			\
+				"rdtsc            \n"			\
+				"mov %%eax, %0    \n"			\
+				"xor %%eax, %%eax \n"			\
+				"cpuid            \n"			\
+				"pop %%ebx        \n"			\
+				"push %%ebx       \n"			\
+				"xor %%eax, %%eax \n"			\
+				"cpuid            \n"			\
+				"rdtsc            \n"			\
+				"mov %%eax, %1    \n"			\
+				"xor %%eax, %%eax \n"			\
+				"cpuid            \n"			\
+				"pop %%ebx        \n"			\
+				: "=m" (cycle_tmp1), "=m" (cycle_tmp2)	\
+				: : "eax", "ecx", "edx" );		\
+	 if ( counter_overhead > (cycle_tmp2 - cycle_tmp1) ) {		\
+	    counter_overhead = cycle_tmp2 - cycle_tmp1;			\
+	 }								\
+      }									\
+   } while (0)
+
+#define  BEGIN_RACE(x)							\
+   x = LONG_MAX;							\
+   for ( cycle_i = 0 ; cycle_i < 10 ; cycle_i++ ) {			\
+      long cycle_tmp1 = 0, cycle_tmp2 = 0;				\
+      __asm__ __volatile__ ( "push %%ebx       \n"			\
+			     "xor %%eax, %%eax \n"			\
+			     "cpuid            \n"			\
+			     "rdtsc            \n"			\
+			     "mov %%eax, %0    \n"			\
+			     "xor %%eax, %%eax \n"			\
+			     "cpuid            \n"			\
+			     "pop %%ebx        \n"			\
+			     : "=m" (cycle_tmp1)			\
+			     : : "eax", "ecx", "edx" );
+
+#define END_RACE(x)							\
+      __asm__ __volatile__ ( "push %%ebx       \n"			\
+			     "xor %%eax, %%eax \n"			\
+			     "cpuid            \n"			\
+			     "rdtsc            \n"			\
+			     "mov %%eax, %0    \n"			\
+			     "xor %%eax, %%eax \n"			\
+			     "cpuid            \n"			\
+			     "pop %%ebx        \n"			\
+			     : "=m" (cycle_tmp2)			\
+			     : : "eax", "ecx", "edx" );			\
+      if ( x > (cycle_tmp2 - cycle_tmp1) ) {				\
+	 x = cycle_tmp2 - cycle_tmp1;					\
+      }									\
+   }									\
+   x -= counter_overhead;
+
+#else /* PPlain, PMMX version */
+
+/* To ensure accurate results, we stall the pipelines with the
+ * non-pairable 'cdq' instruction.  This ensures all the code being
+ * profiled is complete when the 'rdtsc' instruction executes.
+ */
+#define  INIT_COUNTER(x)						\
+   do {									\
+      int cycle_i;							\
+      x = LONG_MAX;							\
+      for ( cycle_i = 0 ; cycle_i < 32 ; cycle_i++ ) {			\
+	 long cycle_tmp1, cycle_tmp2, dummy;				\
+	 __asm__ ( "mov %%eax, %0" : "=a" (cycle_tmp1) );		\
+	 __asm__ ( "mov %%eax, %0" : "=a" (cycle_tmp2) );		\
+	 __asm__ ( "cdq" );						\
+	 __asm__ ( "cdq" );						\
+	 __asm__ ( "rdtsc" : "=a" (cycle_tmp1), "=d" (dummy) );		\
+	 __asm__ ( "cdq" );						\
+	 __asm__ ( "cdq" );						\
+	 __asm__ ( "rdtsc" : "=a" (cycle_tmp2), "=d" (dummy) );		\
+	 if ( x > (cycle_tmp2 - cycle_tmp1) )				\
+	    x = cycle_tmp2 - cycle_tmp1;				\
+      }									\
+   } while (0)
+
+#define  BEGIN_RACE(x)							\
+   x = LONG_MAX;							\
+   for ( cycle_i = 0 ; cycle_i < 16 ; cycle_i++ ) {			\
+      long cycle_tmp1, cycle_tmp2, dummy;				\
+      __asm__ ( "mov %%eax, %0" : "=a" (cycle_tmp1) );			\
+      __asm__ ( "mov %%eax, %0" : "=a" (cycle_tmp2) );			\
+      __asm__ ( "cdq" );						\
+      __asm__ ( "cdq" );						\
+      __asm__ ( "rdtsc" : "=a" (cycle_tmp1), "=d" (dummy) );
+
+
+#define END_RACE(x)							\
+      __asm__ ( "cdq" );						\
+      __asm__ ( "cdq" );						\
+      __asm__ ( "rdtsc" : "=a" (cycle_tmp2), "=d" (dummy) );		\
+      if ( x > (cycle_tmp2 - cycle_tmp1) )				\
+	 x = cycle_tmp2 - cycle_tmp1;					\
+   }									\
+   x -= counter_overhead;
+
+#endif
+
+#elif defined(__sparc__)
+
+#define  INIT_COUNTER()	\
+	 do { counter_overhead = 5; } while(0)
+
+#define  BEGIN_RACE(x)                                                        \
+x = LONG_MAX;                                                                 \
+for (cycle_i = 0; cycle_i <10; cycle_i++) {                                   \
+   register long cycle_tmp1 asm("l0");					      \
+   register long cycle_tmp2 asm("l1");					      \
+   /* rd %tick, %l0 */							      \
+   __asm__ __volatile__ (".word 0xa1410000" : "=r" (cycle_tmp1));  /*  save timestamp   */
+
+#define END_RACE(x)                                                           \
+   /* rd %tick, %l1 */							      \
+   __asm__ __volatile__ (".word 0xa3410000" : "=r" (cycle_tmp2));	      \
+   if (x > (cycle_tmp2-cycle_tmp1)) x = cycle_tmp2 - cycle_tmp1;              \
+}                                                                             \
+x -= counter_overhead;
+
+#else
+#error Your processor is not supported for RUN_XFORM_BENCHMARK
+#endif
+
+#else
+
+#define BEGIN_RACE(x)
+#define END_RACE(x)
+
+#endif
+
+
+/* =============================================================
+ * Helper functions
+ */
+
+static GLfloat rnd( void )
+{
+   GLfloat f = (GLfloat)rand() / (GLfloat)RAND_MAX;
+   GLfloat gran = (GLfloat)(1 << 13);
+
+   f = (GLfloat)(GLint)(f * gran) / gran;
+
+   return f * 2.0 - 1.0;
+}
+
+static int significand_match( GLfloat a, GLfloat b )
+{
+   GLfloat d = a - b;
+   int a_ex, b_ex, d_ex;
+
+   if ( d == 0.0F ) {
+      return MAX_PRECISION;   /* Exact match */
+   }
+
+   if ( a == 0.0F || b == 0.0F ) {
+      /* It would probably be better to check if the
+       * non-zero number is denormalized and return
+       * the index of the highest set bit here.
+       */
+      return 0;
+   }
+
+   frexp( a, &a_ex );
+   frexp( b, &b_ex );
+   frexp( d, &d_ex );
+
+   if ( a_ex < b_ex ) {
+      return a_ex - d_ex;
+   } else {
+      return b_ex - d_ex;
+   }
+}
+
+enum { NIL = 0, ONE = 1, NEG = -1, VAR = 2 };
+
+/* Ensure our arrays are correctly aligned.
+ */
+#if defined(__GNUC__)
+#  define ALIGN16	__attribute__ ((aligned (16)))
+#elif defined(__MSC__)
+#  define ALIGN16	__declspec(align(16)) /* GH: Does this work? */
+#elif defined(__WATCOMC__)
+#  define ALIGN16	                    /* Watcom does not support this */ 
+#else
+#  warning "ALIGN16 will not 16-byte align!\n"
+#  define ALIGN16
+#endif
+
+
+#endif /* DEBUG */
+
+#endif /* __M_DEBUG_UTIL_H__ */
diff --git a/reactos/lib/mesa32/src/math/m_debug_xform.c b/reactos/lib/mesa32/src/math/m_debug_xform.c
new file mode 100644
index 00000000000..e173d14bd5d
--- /dev/null
+++ b/reactos/lib/mesa32/src/math/m_debug_xform.c
@@ -0,0 +1,334 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * Updated for P6 architecture by Gareth Hughes.
+ */
+
+#include "glheader.h"
+#include "context.h"
+#include "macros.h"
+#include "imports.h"
+
+#include "m_matrix.h"
+#include "m_xform.h"
+
+#include "m_debug.h"
+#include "m_debug_util.h"
+
+#ifdef DEBUG  /* This code only used for debugging */
+
+
+/* Overhead of profiling counter in cycles.  Automatically adjusted to
+ * your machine at run time - counter initialization should give very
+ * consistent results.
+ */
+long counter_overhead = 0;
+
+/* This is the value of the environment variable MESA_PROFILE, and is
+ * used to determine if we should benchmark the functions as well as
+ * verify their correctness.
+ */
+char *mesa_profile = NULL;
+
+
+static int m_general[16] = {
+   VAR, VAR, VAR, VAR,
+   VAR, VAR, VAR, VAR,
+   VAR, VAR, VAR, VAR,
+   VAR, VAR, VAR, VAR
+};
+static int m_identity[16] = {
+   ONE, NIL, NIL, NIL,
+   NIL, ONE, NIL, NIL,
+   NIL, NIL, ONE, NIL,
+   NIL, NIL, NIL, ONE
+};
+static int  m_2d[16]  = {
+   VAR, VAR, NIL, VAR,
+   VAR, VAR, NIL, VAR,
+   NIL, NIL, ONE, NIL,
+   NIL, NIL, NIL, ONE
+};
+static int m_2d_no_rot[16] = {
+   VAR, NIL, NIL, VAR,
+   NIL, VAR, NIL, VAR,
+   NIL, NIL, ONE, NIL,
+   NIL, NIL, NIL, ONE
+};
+static int m_3d[16] = {
+   VAR, VAR, VAR, VAR,
+   VAR, VAR, VAR, VAR,
+   VAR, VAR, VAR, VAR,
+   NIL, NIL, NIL, ONE
+};
+static int m_3d_no_rot[16] = {
+   VAR, NIL, NIL, VAR,
+   NIL, VAR, NIL, VAR,
+   NIL, NIL, VAR, VAR,
+   NIL, NIL, NIL, ONE
+};
+static int m_perspective[16] = {
+   VAR, NIL, VAR, NIL,
+   NIL, VAR, VAR, NIL,
+   NIL, NIL, VAR, VAR,
+   NIL, NIL, NEG, NIL
+};
+static int *templates[7] = {
+   m_general,
+   m_identity,
+   m_3d_no_rot,
+   m_perspective,
+   m_2d,
+   m_2d_no_rot,
+   m_3d
+};
+static enum GLmatrixtype mtypes[7] = {
+   MATRIX_GENERAL,
+   MATRIX_IDENTITY,
+   MATRIX_3D_NO_ROT,
+   MATRIX_PERSPECTIVE,
+   MATRIX_2D,
+   MATRIX_2D_NO_ROT,
+   MATRIX_3D
+};
+static char *mstrings[7] = {
+   "MATRIX_GENERAL",
+   "MATRIX_IDENTITY",
+   "MATRIX_3D_NO_ROT",
+   "MATRIX_PERSPECTIVE",
+   "MATRIX_2D",
+   "MATRIX_2D_NO_ROT",
+   "MATRIX_3D"
+};
+
+
+/* =============================================================
+ * Reference transformations
+ */
+
+static void ref_transform( GLvector4f *dst,
+                           const GLmatrix *mat,
+                           const GLvector4f *src )
+{
+   GLuint i;
+   GLfloat *s = (GLfloat *)src->start;
+   GLfloat (*d)[4] = (GLfloat (*)[4])dst->start;
+   const GLfloat *m = mat->m;
+
+   for ( i = 0 ; i < src->count ; i++ ) {
+      TRANSFORM_POINT( d[i], m, s );
+      s = (GLfloat *)((char *)s + src->stride);
+   }
+}
+
+
+/* =============================================================
+ * Vertex transformation tests
+ */
+
+static void init_matrix( GLfloat *m )
+{
+   m[0] = 63.0; m[4] = 43.0; m[ 8] = 29.0; m[12] = 43.0;
+   m[1] = 55.0; m[5] = 17.0; m[ 9] = 31.0; m[13] =  7.0;
+   m[2] = 44.0; m[6] =  9.0; m[10] =  7.0; m[14] =  3.0;
+   m[3] = 11.0; m[7] = 23.0; m[11] = 91.0; m[15] =  9.0;
+}
+
+static GLfloat s[TEST_COUNT][4] ALIGN16;
+static GLfloat d[TEST_COUNT][4] ALIGN16;
+static GLfloat r[TEST_COUNT][4] ALIGN16;
+
+static int test_transform_function( transform_func func, int psize,
+				    int mtype, long *cycles )
+{
+   GLvector4f source[1], dest[1], ref[1];
+   GLmatrix mat[1];
+   GLfloat *m;
+   int i, j;
+#ifdef  RUN_DEBUG_BENCHMARK
+   int cycle_i;                /* the counter for the benchmarks we run */
+#endif
+
+   (void) cycles;
+
+   if ( psize > 4 ) {
+      _mesa_problem( NULL, "test_transform_function called with psize > 4\n" );
+      return 0;
+   }
+
+   mat->m = (GLfloat *) ALIGN_MALLOC( 16 * sizeof(GLfloat), 16 );
+   mat->type = mtypes[mtype];
+
+   m = mat->m;
+   ASSERT( ((GLuint)m & 15) == 0 );
+
+   init_matrix( m );
+
+   for ( i = 0 ; i < 4 ; i++ ) {
+      for ( j = 0 ; j < 4 ; j++ ) {
+         switch ( templates[mtype][i * 4 + j] ) {
+         case NIL:
+            m[j * 4 + i] = 0.0;
+            break;
+         case ONE:
+            m[j * 4 + i] = 1.0;
+            break;
+         case NEG:
+            m[j * 4 + i] = -1.0;
+            break;
+         case VAR:
+            break;
+         default:
+            abort();
+         }
+      }
+   }
+
+   for ( i = 0 ; i < TEST_COUNT ; i++) {
+      ASSIGN_4V( d[i], 0.0, 0.0, 0.0, 1.0 );
+      ASSIGN_4V( s[i], 0.0, 0.0, 0.0, 1.0 );
+      for ( j = 0 ; j < psize ; j++ )
+         s[i][j] = rnd();
+   }
+
+   source->data = (GLfloat(*)[4])s;
+   source->start = (GLfloat *)s;
+   source->count = TEST_COUNT;
+   source->stride = sizeof(s[0]);
+   source->size = 4;
+   source->flags = 0;
+
+   dest->data = (GLfloat(*)[4])d;
+   dest->start = (GLfloat *)d;
+   dest->count = TEST_COUNT;
+   dest->stride = sizeof(float[4]);
+   dest->size = 0;
+   dest->flags = 0;
+
+   ref->data = (GLfloat(*)[4])r;
+   ref->start = (GLfloat *)r;
+   ref->count = TEST_COUNT;
+   ref->stride = sizeof(float[4]);
+   ref->size = 0;
+   ref->flags = 0;
+
+   ref_transform( ref, mat, source );
+
+   if ( mesa_profile ) {
+      BEGIN_RACE( *cycles );
+      func( dest, mat->m, source );
+      END_RACE( *cycles );
+   }
+   else {
+      func( dest, mat->m, source );
+   }
+
+   for ( i = 0 ; i < TEST_COUNT ; i++ ) {
+      for ( j = 0 ; j < 4 ; j++ ) {
+         if ( significand_match( d[i][j], r[i][j] ) < REQUIRED_PRECISION ) {
+            _mesa_printf("-----------------------------\n" );
+            _mesa_printf("(i = %i, j = %i)\n", i, j );
+            _mesa_printf("%f \t %f \t [diff = %e - %i bit missed]\n",
+		    d[i][0], r[i][0], r[i][0]-d[i][0],
+		    MAX_PRECISION - significand_match( d[i][0], r[i][0] ) );
+            _mesa_printf("%f \t %f \t [diff = %e - %i bit missed]\n",
+		    d[i][1], r[i][1], r[i][1]-d[i][1],
+		    MAX_PRECISION - significand_match( d[i][1], r[i][1] ) );
+            _mesa_printf("%f \t %f \t [diff = %e - %i bit missed]\n",
+		    d[i][2], r[i][2], r[i][2]-d[i][2],
+		    MAX_PRECISION - significand_match( d[i][2], r[i][2] ) );
+            _mesa_printf("%f \t %f \t [diff = %e - %i bit missed]\n",
+		    d[i][3], r[i][3], r[i][3]-d[i][3],
+		    MAX_PRECISION - significand_match( d[i][3], r[i][3] ) );
+            return 0;
+         }
+      }
+   }
+
+   ALIGN_FREE( mat->m );
+   return 1;
+}
+
+void _math_test_all_transform_functions( char *description )
+{
+   int psize, mtype;
+   long benchmark_tab[4][7];
+   static int first_time = 1;
+
+   if ( first_time ) {
+      first_time = 0;
+      mesa_profile = getenv( "MESA_PROFILE" );
+   }
+
+#ifdef RUN_DEBUG_BENCHMARK
+   if ( mesa_profile ) {
+      if ( !counter_overhead ) {
+	 INIT_COUNTER();
+	 _mesa_printf("counter overhead: %ld cycles\n\n", counter_overhead );
+      }
+      _mesa_printf("transform results after hooking in %s functions:\n", description );
+   }
+#endif
+
+#ifdef RUN_DEBUG_BENCHMARK
+   if ( mesa_profile ) {
+      _mesa_printf("\n" );
+      for ( psize = 1 ; psize <= 4 ; psize++ ) {
+	 _mesa_printf(" p%d\t", psize );
+      }
+      _mesa_printf("\n--------------------------------------------------------\n" );
+   }
+#endif
+
+   for ( mtype = 0 ; mtype < 7 ; mtype++ ) {
+      for ( psize = 1 ; psize <= 4 ; psize++ ) {
+	 transform_func func = _mesa_transform_tab[psize][mtypes[mtype]];
+	 long *cycles = &(benchmark_tab[psize-1][mtype]);
+
+	 if ( test_transform_function( func, psize, mtype, cycles ) == 0 ) {
+	    char buf[100];
+	    _mesa_sprintf(buf, "_mesa_transform_tab[0][%d][%s] failed test (%s)",
+		     psize, mstrings[mtype], description );
+	    _mesa_problem( NULL, buf );
+	 }
+#ifdef RUN_DEBUG_BENCHMARK
+	 if ( mesa_profile )
+	    _mesa_printf(" %li\t", benchmark_tab[psize-1][mtype] );
+#endif
+      }
+#ifdef RUN_DEBUG_BENCHMARK
+      if ( mesa_profile )
+	 _mesa_printf(" | [%s]\n", mstrings[mtype] );
+#endif
+   }
+#ifdef RUN_DEBUG_BENCHMARK
+   if ( mesa_profile )
+      _mesa_printf( "\n" );
+#endif
+}
+
+
+#endif /* DEBUG */
diff --git a/reactos/lib/mesa32/src/math/m_dotprod_tmp.h b/reactos/lib/mesa32/src/math/m_dotprod_tmp.h
new file mode 100644
index 00000000000..03e65af6c1a
--- /dev/null
+++ b/reactos/lib/mesa32/src/math/m_dotprod_tmp.h
@@ -0,0 +1,102 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * New (3.1) transformation code written by Keith Whitwell.
+ */
+
+
+/* Note - respects the stride of the output vector.
+ */
+static void TAG(dotprod_vec2)( GLfloat *out,
+			       GLuint outstride,
+			       const GLvector4f *coord_vec,
+			       const GLfloat plane[4] )
+{
+   GLuint stride = coord_vec->stride;
+   GLfloat *coord = coord_vec->start;
+   GLuint count = coord_vec->count;
+
+   GLuint i;
+
+   const GLfloat plane0 = plane[0], plane1 = plane[1], plane3 = plane[3];
+
+   for (i=0;i<count;i++,STRIDE_F(coord,stride),STRIDE_F(out,outstride)) {
+      *out = (coord[0] * plane0 +
+	      coord[1] * plane1 +
+	      plane3);
+   }
+}
+
+static void TAG(dotprod_vec3)( GLfloat *out,
+			       GLuint outstride,
+			       const GLvector4f *coord_vec,
+			       const GLfloat plane[4] )
+{
+   GLuint stride = coord_vec->stride;
+   GLfloat *coord = coord_vec->start;
+   GLuint count = coord_vec->count;
+
+   GLuint i;
+
+   const GLfloat plane0 = plane[0], plane1 = plane[1], plane2 = plane[2];
+   const GLfloat plane3 = plane[3];
+
+   for (i=0;i<count;i++,STRIDE_F(coord,stride),STRIDE_F(out,outstride)) {
+      *out = (coord[0] * plane0 +
+	      coord[1] * plane1 +
+	      coord[2] * plane2 +
+	      plane3);
+   }
+}
+
+static void TAG(dotprod_vec4)( GLfloat *out,
+			       GLuint outstride,
+			       const GLvector4f *coord_vec,
+			       const GLfloat plane[4] )
+{
+   GLuint stride = coord_vec->stride;
+   GLfloat *coord = coord_vec->start;
+   GLuint count = coord_vec->count;
+   GLuint i;
+
+   const GLfloat plane0 = plane[0], plane1 = plane[1], plane2 = plane[2];
+   const GLfloat plane3 = plane[3];
+
+   for (i=0;i<count;i++,STRIDE_F(coord,stride),STRIDE_F(out,outstride)) {
+      *out = (coord[0] * plane0 +
+	      coord[1] * plane1 +
+	      coord[2] * plane2 +
+	      coord[3] * plane3);
+   }
+}
+
+
+static void TAG(init_dotprod)( void )
+{
+   _mesa_dotprod_tab[2] = TAG(dotprod_vec2);
+   _mesa_dotprod_tab[3] = TAG(dotprod_vec3);
+   _mesa_dotprod_tab[4] = TAG(dotprod_vec4);
+}
diff --git a/reactos/lib/mesa32/src/math/m_eval.c b/reactos/lib/mesa32/src/math/m_eval.c
new file mode 100644
index 00000000000..42ffd4133d3
--- /dev/null
+++ b/reactos/lib/mesa32/src/math/m_eval.c
@@ -0,0 +1,461 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * eval.c was written by
+ * Bernd Barsuhn (bdbarsuh@cip.informatik.uni-erlangen.de) and
+ * Volker Weiss (vrweiss@cip.informatik.uni-erlangen.de).
+ *
+ * My original implementation of evaluators was simplistic and didn't
+ * compute surface normal vectors properly.  Bernd and Volker applied
+ * used more sophisticated methods to get better results.
+ *
+ * Thanks guys!
+ */
+
+
+#include "glheader.h"
+#include "config.h"
+#include "m_eval.h"
+
+static GLfloat inv_tab[MAX_EVAL_ORDER];
+
+
+
+/*
+ * Horner scheme for Bezier curves
+ *
+ * Bezier curves can be computed via a Horner scheme.
+ * Horner is numerically less stable than the de Casteljau
+ * algorithm, but it is faster. For curves of degree n
+ * the complexity of Horner is O(n) and de Casteljau is O(n^2).
+ * Since stability is not important for displaying curve
+ * points I decided to use the Horner scheme.
+ *
+ * A cubic Bezier curve with control points b0, b1, b2, b3 can be
+ * written as
+ *
+ *        (([3]        [3]     )     [3]       )     [3]
+ * c(t) = (([0]*s*b0 + [1]*t*b1)*s + [2]*t^2*b2)*s + [3]*t^2*b3
+ *
+ *                                           [n]
+ * where s=1-t and the binomial coefficients [i]. These can
+ * be computed iteratively using the identity:
+ *
+ * [n]               [n  ]             [n]
+ * [i] = (n-i+1)/i * [i-1]     and     [0] = 1
+ */
+
+
+void
+_math_horner_bezier_curve(const GLfloat * cp, GLfloat * out, GLfloat t,
+			  GLuint dim, GLuint order)
+{
+   GLfloat s, powert, bincoeff;
+   GLuint i, k;
+
+   if (order >= 2) {
+      bincoeff = (GLfloat) (order - 1);
+      s = 1.0F - t;
+
+      for (k = 0; k < dim; k++)
+	 out[k] = s * cp[k] + bincoeff * t * cp[dim + k];
+
+      for (i = 2, cp += 2 * dim, powert = t * t; i < order;
+	   i++, powert *= t, cp += dim) {
+	 bincoeff *= (GLfloat) (order - i);
+	 bincoeff *= inv_tab[i];
+
+	 for (k = 0; k < dim; k++)
+	    out[k] = s * out[k] + bincoeff * powert * cp[k];
+      }
+   }
+   else {			/* order=1 -> constant curve */
+
+      for (k = 0; k < dim; k++)
+	 out[k] = cp[k];
+   }
+}
+
+/*
+ * Tensor product Bezier surfaces
+ *
+ * Again the Horner scheme is used to compute a point on a
+ * TP Bezier surface. First a control polygon for a curve
+ * on the surface in one parameter direction is computed,
+ * then the point on the curve for the other parameter
+ * direction is evaluated.
+ *
+ * To store the curve control polygon additional storage
+ * for max(uorder,vorder) points is needed in the
+ * control net cn.
+ */
+
+void
+_math_horner_bezier_surf(GLfloat * cn, GLfloat * out, GLfloat u, GLfloat v,
+			 GLuint dim, GLuint uorder, GLuint vorder)
+{
+   GLfloat *cp = cn + uorder * vorder * dim;
+   GLuint i, uinc = vorder * dim;
+
+   if (vorder > uorder) {
+      if (uorder >= 2) {
+	 GLfloat s, poweru, bincoeff;
+	 GLuint j, k;
+
+	 /* Compute the control polygon for the surface-curve in u-direction */
+	 for (j = 0; j < vorder; j++) {
+	    GLfloat *ucp = &cn[j * dim];
+
+	    /* Each control point is the point for parameter u on a */
+	    /* curve defined by the control polygons in u-direction */
+	    bincoeff = (GLfloat) (uorder - 1);
+	    s = 1.0F - u;
+
+	    for (k = 0; k < dim; k++)
+	       cp[j * dim + k] = s * ucp[k] + bincoeff * u * ucp[uinc + k];
+
+	    for (i = 2, ucp += 2 * uinc, poweru = u * u; i < uorder;
+		 i++, poweru *= u, ucp += uinc) {
+	       bincoeff *= (GLfloat) (uorder - i);
+	       bincoeff *= inv_tab[i];
+
+	       for (k = 0; k < dim; k++)
+		  cp[j * dim + k] =
+		     s * cp[j * dim + k] + bincoeff * poweru * ucp[k];
+	    }
+	 }
+
+	 /* Evaluate curve point in v */
+	 _math_horner_bezier_curve(cp, out, v, dim, vorder);
+      }
+      else			/* uorder=1 -> cn defines a curve in v */
+	 _math_horner_bezier_curve(cn, out, v, dim, vorder);
+   }
+   else {			/* vorder <= uorder */
+
+      if (vorder > 1) {
+	 GLuint i;
+
+	 /* Compute the control polygon for the surface-curve in u-direction */
+	 for (i = 0; i < uorder; i++, cn += uinc) {
+	    /* For constant i all cn[i][j] (j=0..vorder) are located */
+	    /* on consecutive memory locations, so we can use        */
+	    /* horner_bezier_curve to compute the control points     */
+
+	    _math_horner_bezier_curve(cn, &cp[i * dim], v, dim, vorder);
+	 }
+
+	 /* Evaluate curve point in u */
+	 _math_horner_bezier_curve(cp, out, u, dim, uorder);
+      }
+      else			/* vorder=1 -> cn defines a curve in u */
+	 _math_horner_bezier_curve(cn, out, u, dim, uorder);
+   }
+}
+
+/*
+ * The direct de Casteljau algorithm is used when a point on the
+ * surface and the tangent directions spanning the tangent plane
+ * should be computed (this is needed to compute normals to the
+ * surface). In this case the de Casteljau algorithm approach is
+ * nicer because a point and the partial derivatives can be computed
+ * at the same time. To get the correct tangent length du and dv
+ * must be multiplied with the (u2-u1)/uorder-1 and (v2-v1)/vorder-1.
+ * Since only the directions are needed, this scaling step is omitted.
+ *
+ * De Casteljau needs additional storage for uorder*vorder
+ * values in the control net cn.
+ */
+
+void
+_math_de_casteljau_surf(GLfloat * cn, GLfloat * out, GLfloat * du,
+			GLfloat * dv, GLfloat u, GLfloat v, GLuint dim,
+			GLuint uorder, GLuint vorder)
+{
+   GLfloat *dcn = cn + uorder * vorder * dim;
+   GLfloat us = 1.0F - u, vs = 1.0F - v;
+   GLuint h, i, j, k;
+   GLuint minorder = uorder < vorder ? uorder : vorder;
+   GLuint uinc = vorder * dim;
+   GLuint dcuinc = vorder;
+
+   /* Each component is evaluated separately to save buffer space  */
+   /* This does not drasticaly decrease the performance of the     */
+   /* algorithm. If additional storage for (uorder-1)*(vorder-1)   */
+   /* points would be available, the components could be accessed  */
+   /* in the innermost loop which could lead to less cache misses. */
+
+#define CN(I,J,K) cn[(I)*uinc+(J)*dim+(K)]
+#define DCN(I, J) dcn[(I)*dcuinc+(J)]
+   if (minorder < 3) {
+      if (uorder == vorder) {
+	 for (k = 0; k < dim; k++) {
+	    /* Derivative direction in u */
+	    du[k] = vs * (CN(1, 0, k) - CN(0, 0, k)) +
+	       v * (CN(1, 1, k) - CN(0, 1, k));
+
+	    /* Derivative direction in v */
+	    dv[k] = us * (CN(0, 1, k) - CN(0, 0, k)) +
+	       u * (CN(1, 1, k) - CN(1, 0, k));
+
+	    /* bilinear de Casteljau step */
+	    out[k] = us * (vs * CN(0, 0, k) + v * CN(0, 1, k)) +
+	       u * (vs * CN(1, 0, k) + v * CN(1, 1, k));
+	 }
+      }
+      else if (minorder == uorder) {
+	 for (k = 0; k < dim; k++) {
+	    /* bilinear de Casteljau step */
+	    DCN(1, 0) = CN(1, 0, k) - CN(0, 0, k);
+	    DCN(0, 0) = us * CN(0, 0, k) + u * CN(1, 0, k);
+
+	    for (j = 0; j < vorder - 1; j++) {
+	       /* for the derivative in u */
+	       DCN(1, j + 1) = CN(1, j + 1, k) - CN(0, j + 1, k);
+	       DCN(1, j) = vs * DCN(1, j) + v * DCN(1, j + 1);
+
+	       /* for the `point' */
+	       DCN(0, j + 1) = us * CN(0, j + 1, k) + u * CN(1, j + 1, k);
+	       DCN(0, j) = vs * DCN(0, j) + v * DCN(0, j + 1);
+	    }
+
+	    /* remaining linear de Casteljau steps until the second last step */
+	    for (h = minorder; h < vorder - 1; h++)
+	       for (j = 0; j < vorder - h; j++) {
+		  /* for the derivative in u */
+		  DCN(1, j) = vs * DCN(1, j) + v * DCN(1, j + 1);
+
+		  /* for the `point' */
+		  DCN(0, j) = vs * DCN(0, j) + v * DCN(0, j + 1);
+	       }
+
+	    /* derivative direction in v */
+	    dv[k] = DCN(0, 1) - DCN(0, 0);
+
+	    /* derivative direction in u */
+	    du[k] = vs * DCN(1, 0) + v * DCN(1, 1);
+
+	    /* last linear de Casteljau step */
+	    out[k] = vs * DCN(0, 0) + v * DCN(0, 1);
+	 }
+      }
+      else {			/* minorder == vorder */
+
+	 for (k = 0; k < dim; k++) {
+	    /* bilinear de Casteljau step */
+	    DCN(0, 1) = CN(0, 1, k) - CN(0, 0, k);
+	    DCN(0, 0) = vs * CN(0, 0, k) + v * CN(0, 1, k);
+	    for (i = 0; i < uorder - 1; i++) {
+	       /* for the derivative in v */
+	       DCN(i + 1, 1) = CN(i + 1, 1, k) - CN(i + 1, 0, k);
+	       DCN(i, 1) = us * DCN(i, 1) + u * DCN(i + 1, 1);
+
+	       /* for the `point' */
+	       DCN(i + 1, 0) = vs * CN(i + 1, 0, k) + v * CN(i + 1, 1, k);
+	       DCN(i, 0) = us * DCN(i, 0) + u * DCN(i + 1, 0);
+	    }
+
+	    /* remaining linear de Casteljau steps until the second last step */
+	    for (h = minorder; h < uorder - 1; h++)
+	       for (i = 0; i < uorder - h; i++) {
+		  /* for the derivative in v */
+		  DCN(i, 1) = us * DCN(i, 1) + u * DCN(i + 1, 1);
+
+		  /* for the `point' */
+		  DCN(i, 0) = us * DCN(i, 0) + u * DCN(i + 1, 0);
+	       }
+
+	    /* derivative direction in u */
+	    du[k] = DCN(1, 0) - DCN(0, 0);
+
+	    /* derivative direction in v */
+	    dv[k] = us * DCN(0, 1) + u * DCN(1, 1);
+
+	    /* last linear de Casteljau step */
+	    out[k] = us * DCN(0, 0) + u * DCN(1, 0);
+	 }
+      }
+   }
+   else if (uorder == vorder) {
+      for (k = 0; k < dim; k++) {
+	 /* first bilinear de Casteljau step */
+	 for (i = 0; i < uorder - 1; i++) {
+	    DCN(i, 0) = us * CN(i, 0, k) + u * CN(i + 1, 0, k);
+	    for (j = 0; j < vorder - 1; j++) {
+	       DCN(i, j + 1) = us * CN(i, j + 1, k) + u * CN(i + 1, j + 1, k);
+	       DCN(i, j) = vs * DCN(i, j) + v * DCN(i, j + 1);
+	    }
+	 }
+
+	 /* remaining bilinear de Casteljau steps until the second last step */
+	 for (h = 2; h < minorder - 1; h++)
+	    for (i = 0; i < uorder - h; i++) {
+	       DCN(i, 0) = us * DCN(i, 0) + u * DCN(i + 1, 0);
+	       for (j = 0; j < vorder - h; j++) {
+		  DCN(i, j + 1) = us * DCN(i, j + 1) + u * DCN(i + 1, j + 1);
+		  DCN(i, j) = vs * DCN(i, j) + v * DCN(i, j + 1);
+	       }
+	    }
+
+	 /* derivative direction in u */
+	 du[k] = vs * (DCN(1, 0) - DCN(0, 0)) + v * (DCN(1, 1) - DCN(0, 1));
+
+	 /* derivative direction in v */
+	 dv[k] = us * (DCN(0, 1) - DCN(0, 0)) + u * (DCN(1, 1) - DCN(1, 0));
+
+	 /* last bilinear de Casteljau step */
+	 out[k] = us * (vs * DCN(0, 0) + v * DCN(0, 1)) +
+	    u * (vs * DCN(1, 0) + v * DCN(1, 1));
+      }
+   }
+   else if (minorder == uorder) {
+      for (k = 0; k < dim; k++) {
+	 /* first bilinear de Casteljau step */
+	 for (i = 0; i < uorder - 1; i++) {
+	    DCN(i, 0) = us * CN(i, 0, k) + u * CN(i + 1, 0, k);
+	    for (j = 0; j < vorder - 1; j++) {
+	       DCN(i, j + 1) = us * CN(i, j + 1, k) + u * CN(i + 1, j + 1, k);
+	       DCN(i, j) = vs * DCN(i, j) + v * DCN(i, j + 1);
+	    }
+	 }
+
+	 /* remaining bilinear de Casteljau steps until the second last step */
+	 for (h = 2; h < minorder - 1; h++)
+	    for (i = 0; i < uorder - h; i++) {
+	       DCN(i, 0) = us * DCN(i, 0) + u * DCN(i + 1, 0);
+	       for (j = 0; j < vorder - h; j++) {
+		  DCN(i, j + 1) = us * DCN(i, j + 1) + u * DCN(i + 1, j + 1);
+		  DCN(i, j) = vs * DCN(i, j) + v * DCN(i, j + 1);
+	       }
+	    }
+
+	 /* last bilinear de Casteljau step */
+	 DCN(2, 0) = DCN(1, 0) - DCN(0, 0);
+	 DCN(0, 0) = us * DCN(0, 0) + u * DCN(1, 0);
+	 for (j = 0; j < vorder - 1; j++) {
+	    /* for the derivative in u */
+	    DCN(2, j + 1) = DCN(1, j + 1) - DCN(0, j + 1);
+	    DCN(2, j) = vs * DCN(2, j) + v * DCN(2, j + 1);
+
+	    /* for the `point' */
+	    DCN(0, j + 1) = us * DCN(0, j + 1) + u * DCN(1, j + 1);
+	    DCN(0, j) = vs * DCN(0, j) + v * DCN(0, j + 1);
+	 }
+
+	 /* remaining linear de Casteljau steps until the second last step */
+	 for (h = minorder; h < vorder - 1; h++)
+	    for (j = 0; j < vorder - h; j++) {
+	       /* for the derivative in u */
+	       DCN(2, j) = vs * DCN(2, j) + v * DCN(2, j + 1);
+
+	       /* for the `point' */
+	       DCN(0, j) = vs * DCN(0, j) + v * DCN(0, j + 1);
+	    }
+
+	 /* derivative direction in v */
+	 dv[k] = DCN(0, 1) - DCN(0, 0);
+
+	 /* derivative direction in u */
+	 du[k] = vs * DCN(2, 0) + v * DCN(2, 1);
+
+	 /* last linear de Casteljau step */
+	 out[k] = vs * DCN(0, 0) + v * DCN(0, 1);
+      }
+   }
+   else {			/* minorder == vorder */
+
+      for (k = 0; k < dim; k++) {
+	 /* first bilinear de Casteljau step */
+	 for (i = 0; i < uorder - 1; i++) {
+	    DCN(i, 0) = us * CN(i, 0, k) + u * CN(i + 1, 0, k);
+	    for (j = 0; j < vorder - 1; j++) {
+	       DCN(i, j + 1) = us * CN(i, j + 1, k) + u * CN(i + 1, j + 1, k);
+	       DCN(i, j) = vs * DCN(i, j) + v * DCN(i, j + 1);
+	    }
+	 }
+
+	 /* remaining bilinear de Casteljau steps until the second last step */
+	 for (h = 2; h < minorder - 1; h++)
+	    for (i = 0; i < uorder - h; i++) {
+	       DCN(i, 0) = us * DCN(i, 0) + u * DCN(i + 1, 0);
+	       for (j = 0; j < vorder - h; j++) {
+		  DCN(i, j + 1) = us * DCN(i, j + 1) + u * DCN(i + 1, j + 1);
+		  DCN(i, j) = vs * DCN(i, j) + v * DCN(i, j + 1);
+	       }
+	    }
+
+	 /* last bilinear de Casteljau step */
+	 DCN(0, 2) = DCN(0, 1) - DCN(0, 0);
+	 DCN(0, 0) = vs * DCN(0, 0) + v * DCN(0, 1);
+	 for (i = 0; i < uorder - 1; i++) {
+	    /* for the derivative in v */
+	    DCN(i + 1, 2) = DCN(i + 1, 1) - DCN(i + 1, 0);
+	    DCN(i, 2) = us * DCN(i, 2) + u * DCN(i + 1, 2);
+
+	    /* for the `point' */
+	    DCN(i + 1, 0) = vs * DCN(i + 1, 0) + v * DCN(i + 1, 1);
+	    DCN(i, 0) = us * DCN(i, 0) + u * DCN(i + 1, 0);
+	 }
+
+	 /* remaining linear de Casteljau steps until the second last step */
+	 for (h = minorder; h < uorder - 1; h++)
+	    for (i = 0; i < uorder - h; i++) {
+	       /* for the derivative in v */
+	       DCN(i, 2) = us * DCN(i, 2) + u * DCN(i + 1, 2);
+
+	       /* for the `point' */
+	       DCN(i, 0) = us * DCN(i, 0) + u * DCN(i + 1, 0);
+	    }
+
+	 /* derivative direction in u */
+	 du[k] = DCN(1, 0) - DCN(0, 0);
+
+	 /* derivative direction in v */
+	 dv[k] = us * DCN(0, 2) + u * DCN(1, 2);
+
+	 /* last linear de Casteljau step */
+	 out[k] = us * DCN(0, 0) + u * DCN(1, 0);
+      }
+   }
+#undef DCN
+#undef CN
+}
+
+
+/*
+ * Do one-time initialization for evaluators.
+ */
+void
+_math_init_eval(void)
+{
+   GLuint i;
+
+   /* KW: precompute 1/x for useful x.
+    */
+   for (i = 1; i < MAX_EVAL_ORDER; i++)
+      inv_tab[i] = 1.0F / i;
+}
diff --git a/reactos/lib/mesa32/src/math/m_eval.h b/reactos/lib/mesa32/src/math/m_eval.h
new file mode 100644
index 00000000000..a23cbd402e6
--- /dev/null
+++ b/reactos/lib/mesa32/src/math/m_eval.h
@@ -0,0 +1,103 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef _M_EVAL_H
+#define _M_EVAL_H
+
+#include "glheader.h"
+
+void _math_init_eval( void );
+
+
+/*
+ * Horner scheme for Bezier curves
+ *
+ * Bezier curves can be computed via a Horner scheme.
+ * Horner is numerically less stable than the de Casteljau
+ * algorithm, but it is faster. For curves of degree n
+ * the complexity of Horner is O(n) and de Casteljau is O(n^2).
+ * Since stability is not important for displaying curve
+ * points I decided to use the Horner scheme.
+ *
+ * A cubic Bezier curve with control points b0, b1, b2, b3 can be
+ * written as
+ *
+ *        (([3]        [3]     )     [3]       )     [3]
+ * c(t) = (([0]*s*b0 + [1]*t*b1)*s + [2]*t^2*b2)*s + [3]*t^2*b3
+ *
+ *                                           [n]
+ * where s=1-t and the binomial coefficients [i]. These can
+ * be computed iteratively using the identity:
+ *
+ * [n]               [n  ]             [n]
+ * [i] = (n-i+1)/i * [i-1]     and     [0] = 1
+ */
+
+
+void
+_math_horner_bezier_curve(const GLfloat *cp, GLfloat *out, GLfloat t,
+			  GLuint dim, GLuint order);
+
+
+/*
+ * Tensor product Bezier surfaces
+ *
+ * Again the Horner scheme is used to compute a point on a
+ * TP Bezier surface. First a control polygon for a curve
+ * on the surface in one parameter direction is computed,
+ * then the point on the curve for the other parameter
+ * direction is evaluated.
+ *
+ * To store the curve control polygon additional storage
+ * for max(uorder,vorder) points is needed in the
+ * control net cn.
+ */
+
+void
+_math_horner_bezier_surf(GLfloat *cn, GLfloat *out, GLfloat u, GLfloat v,
+			 GLuint dim, GLuint uorder, GLuint vorder);
+
+
+/*
+ * The direct de Casteljau algorithm is used when a point on the
+ * surface and the tangent directions spanning the tangent plane
+ * should be computed (this is needed to compute normals to the
+ * surface). In this case the de Casteljau algorithm approach is
+ * nicer because a point and the partial derivatives can be computed
+ * at the same time. To get the correct tangent length du and dv
+ * must be multiplied with the (u2-u1)/uorder-1 and (v2-v1)/vorder-1.
+ * Since only the directions are needed, this scaling step is omitted.
+ *
+ * De Casteljau needs additional storage for uorder*vorder
+ * values in the control net cn.
+ */
+
+void
+_math_de_casteljau_surf(GLfloat *cn, GLfloat *out, GLfloat *du, GLfloat *dv,
+			GLfloat u, GLfloat v, GLuint dim,
+			GLuint uorder, GLuint vorder);
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/math/m_matrix.c b/reactos/lib/mesa32/src/math/m_matrix.c
new file mode 100644
index 00000000000..7d31a41c7a0
--- /dev/null
+++ b/reactos/lib/mesa32/src/math/m_matrix.c
@@ -0,0 +1,1486 @@
+/**
+ * \file m_matrix.c
+ * Matrix operations.
+ *
+ * \note
+ * -# 4x4 transformation matrices are stored in memory in column major order.
+ * -# Points/vertices are to be thought of as column vectors.
+ * -# Transformation of a point p by a matrix M is: p' = M * p
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0.1
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "imports.h"
+#include "macros.h"
+#include "imports.h"
+
+#include "m_matrix.h"
+
+
+/**
+ * Names of the corresponding GLmatrixtype values.
+ */
+static const char *types[] = {
+   "MATRIX_GENERAL",
+   "MATRIX_IDENTITY",
+   "MATRIX_3D_NO_ROT",
+   "MATRIX_PERSPECTIVE",
+   "MATRIX_2D",
+   "MATRIX_2D_NO_ROT",
+   "MATRIX_3D"
+};
+
+
+/**
+ * Identity matrix.
+ */
+static GLfloat Identity[16] = {
+   1.0, 0.0, 0.0, 0.0,
+   0.0, 1.0, 0.0, 0.0,
+   0.0, 0.0, 1.0, 0.0,
+   0.0, 0.0, 0.0, 1.0
+};
+
+
+
+/**********************************************************************/
+/** \name Matrix multiplication */
+/*@{*/
+
+#define A(row,col)  a[(col<<2)+row]
+#define B(row,col)  b[(col<<2)+row]
+#define P(row,col)  product[(col<<2)+row]
+
+/**
+ * Perform a full 4x4 matrix multiplication.
+ *
+ * \param a matrix.
+ * \param b matrix.
+ * \param product will receive the product of \p a and \p b.
+ *
+ * \warning Is assumed that \p product != \p b. \p product == \p a is allowed.
+ *
+ * \note KW: 4*16 = 64 multiplications
+ * 
+ * \author This \c matmul was contributed by Thomas Malik
+ */
+static void matmul4( GLfloat *product, const GLfloat *a, const GLfloat *b )
+{
+   GLint i;
+   for (i = 0; i < 4; i++) {
+      const GLfloat ai0=A(i,0),  ai1=A(i,1),  ai2=A(i,2),  ai3=A(i,3);
+      P(i,0) = ai0 * B(0,0) + ai1 * B(1,0) + ai2 * B(2,0) + ai3 * B(3,0);
+      P(i,1) = ai0 * B(0,1) + ai1 * B(1,1) + ai2 * B(2,1) + ai3 * B(3,1);
+      P(i,2) = ai0 * B(0,2) + ai1 * B(1,2) + ai2 * B(2,2) + ai3 * B(3,2);
+      P(i,3) = ai0 * B(0,3) + ai1 * B(1,3) + ai2 * B(2,3) + ai3 * B(3,3);
+   }
+}
+
+/**
+ * Multiply two matrices known to occupy only the top three rows, such
+ * as typical model matrices, and orthogonal matrices.
+ *
+ * \param a matrix.
+ * \param b matrix.
+ * \param product will receive the product of \p a and \p b.
+ */
+static void matmul34( GLfloat *product, const GLfloat *a, const GLfloat *b )
+{
+   GLint i;
+   for (i = 0; i < 3; i++) {
+      const GLfloat ai0=A(i,0),  ai1=A(i,1),  ai2=A(i,2),  ai3=A(i,3);
+      P(i,0) = ai0 * B(0,0) + ai1 * B(1,0) + ai2 * B(2,0);
+      P(i,1) = ai0 * B(0,1) + ai1 * B(1,1) + ai2 * B(2,1);
+      P(i,2) = ai0 * B(0,2) + ai1 * B(1,2) + ai2 * B(2,2);
+      P(i,3) = ai0 * B(0,3) + ai1 * B(1,3) + ai2 * B(2,3) + ai3;
+   }
+   P(3,0) = 0;
+   P(3,1) = 0;
+   P(3,2) = 0;
+   P(3,3) = 1;
+}
+
+#undef A
+#undef B
+#undef P
+
+/**
+ * Multiply a matrix by an array of floats with known properties.
+ *
+ * \param mat pointer to a GLmatrix structure containing the left multiplication
+ * matrix, and that will receive the product result.
+ * \param m right multiplication matrix array.
+ * \param flags flags of the matrix \p m.
+ * 
+ * Joins both flags and marks the type and inverse as dirty.  Calls matmul34()
+ * if both matrices are 3D, or matmul4() otherwise.
+ */
+static void matrix_multf( GLmatrix *mat, const GLfloat *m, GLuint flags )
+{
+   mat->flags |= (flags | MAT_DIRTY_TYPE | MAT_DIRTY_INVERSE);
+
+   if (TEST_MAT_FLAGS(mat, MAT_FLAGS_3D))
+      matmul34( mat->m, mat->m, m );
+   else
+      matmul4( mat->m, mat->m, m );
+}
+
+/**
+ * Matrix multiplication.
+ *
+ * \param dest destination matrix.
+ * \param a left matrix.
+ * \param b right matrix.
+ * 
+ * Joins both flags and marks the type and inverse as dirty.  Calls matmul34()
+ * if both matrices are 3D, or matmul4() otherwise.
+ */
+void
+_math_matrix_mul_matrix( GLmatrix *dest, const GLmatrix *a, const GLmatrix *b )
+{
+   dest->flags = (a->flags |
+		  b->flags |
+		  MAT_DIRTY_TYPE |
+		  MAT_DIRTY_INVERSE);
+
+   if (TEST_MAT_FLAGS(dest, MAT_FLAGS_3D))
+      matmul34( dest->m, a->m, b->m );
+   else
+      matmul4( dest->m, a->m, b->m );
+}
+
+/**
+ * Matrix multiplication.
+ *
+ * \param dest left and destination matrix.
+ * \param m right matrix array.
+ * 
+ * Marks the matrix flags with general flag, and type and inverse dirty flags.
+ * Calls matmul4() for the multiplication.
+ */
+void
+_math_matrix_mul_floats( GLmatrix *dest, const GLfloat *m )
+{
+   dest->flags |= (MAT_FLAG_GENERAL |
+		   MAT_DIRTY_TYPE |
+		   MAT_DIRTY_INVERSE);
+
+   matmul4( dest->m, dest->m, m );
+}
+
+/*@}*/
+
+
+/**********************************************************************/
+/** \name Matrix output */
+/*@{*/
+
+/**
+ * Print a matrix array.
+ *
+ * \param m matrix array.
+ *
+ * Called by _math_matrix_print() to print a matrix or its inverse.
+ */
+static void print_matrix_floats( const GLfloat m[16] )
+{
+   int i;
+   for (i=0;i<4;i++) {
+      _mesa_debug(NULL,"\t%f %f %f %f\n", m[i], m[4+i], m[8+i], m[12+i] );
+   }
+}
+
+/**
+ * Dumps the contents of a GLmatrix structure.
+ * 
+ * \param m pointer to the GLmatrix structure.
+ */
+void
+_math_matrix_print( const GLmatrix *m )
+{
+   _mesa_debug(NULL, "Matrix type: %s, flags: %x\n", types[m->type], m->flags);
+   print_matrix_floats(m->m);
+   _mesa_debug(NULL, "Inverse: \n");
+   if (m->inv) {
+      GLfloat prod[16];
+      print_matrix_floats(m->inv);
+      matmul4(prod, m->m, m->inv);
+      _mesa_debug(NULL, "Mat * Inverse:\n");
+      print_matrix_floats(prod);
+   }
+   else {
+      _mesa_debug(NULL, "  - not available\n");
+   }
+}
+
+/*@}*/
+
+
+/**
+ * References an element of 4x4 matrix.
+ *
+ * \param m matrix array.
+ * \param c column of the desired element.
+ * \param r row of the desired element.
+ * 
+ * \return value of the desired element.
+ *
+ * Calculate the linear storage index of the element and references it. 
+ */
+#define MAT(m,r,c) (m)[(c)*4+(r)]
+
+
+/**********************************************************************/
+/** \name Matrix inversion */
+/*@{*/
+
+/**
+ * Swaps the values of two floating pointer variables.
+ *
+ * Used by invert_matrix_general() to swap the row pointers.
+ */
+#define SWAP_ROWS(a, b) { GLfloat *_tmp = a; (a)=(b); (b)=_tmp; }
+
+/**
+ * Compute inverse of 4x4 transformation matrix.
+ * 
+ * \param mat pointer to a GLmatrix structure. The matrix inverse will be
+ * stored in the GLmatrix::inv attribute.
+ * 
+ * \return GL_TRUE for success, GL_FALSE for failure (\p singular matrix).
+ * 
+ * \author
+ * Code contributed by Jacques Leroy jle@star.be
+ *
+ * Calculates the inverse matrix by performing the gaussian matrix reduction
+ * with partial pivoting followed by back/substitution with the loops manually
+ * unrolled.
+ */
+static GLboolean invert_matrix_general( GLmatrix *mat )
+{
+   const GLfloat *m = mat->m;
+   GLfloat *out = mat->inv;
+   GLfloat wtmp[4][8];
+   GLfloat m0, m1, m2, m3, s;
+   GLfloat *r0, *r1, *r2, *r3;
+
+   r0 = wtmp[0], r1 = wtmp[1], r2 = wtmp[2], r3 = wtmp[3];
+
+   r0[0] = MAT(m,0,0), r0[1] = MAT(m,0,1),
+   r0[2] = MAT(m,0,2), r0[3] = MAT(m,0,3),
+   r0[4] = 1.0, r0[5] = r0[6] = r0[7] = 0.0,
+
+   r1[0] = MAT(m,1,0), r1[1] = MAT(m,1,1),
+   r1[2] = MAT(m,1,2), r1[3] = MAT(m,1,3),
+   r1[5] = 1.0, r1[4] = r1[6] = r1[7] = 0.0,
+
+   r2[0] = MAT(m,2,0), r2[1] = MAT(m,2,1),
+   r2[2] = MAT(m,2,2), r2[3] = MAT(m,2,3),
+   r2[6] = 1.0, r2[4] = r2[5] = r2[7] = 0.0,
+
+   r3[0] = MAT(m,3,0), r3[1] = MAT(m,3,1),
+   r3[2] = MAT(m,3,2), r3[3] = MAT(m,3,3),
+   r3[7] = 1.0, r3[4] = r3[5] = r3[6] = 0.0;
+
+   /* choose pivot - or die */
+   if (fabs(r3[0])>fabs(r2[0])) SWAP_ROWS(r3, r2);
+   if (fabs(r2[0])>fabs(r1[0])) SWAP_ROWS(r2, r1);
+   if (fabs(r1[0])>fabs(r0[0])) SWAP_ROWS(r1, r0);
+   if (0.0 == r0[0])  return GL_FALSE;
+
+   /* eliminate first variable     */
+   m1 = r1[0]/r0[0]; m2 = r2[0]/r0[0]; m3 = r3[0]/r0[0];
+   s = r0[1]; r1[1] -= m1 * s; r2[1] -= m2 * s; r3[1] -= m3 * s;
+   s = r0[2]; r1[2] -= m1 * s; r2[2] -= m2 * s; r3[2] -= m3 * s;
+   s = r0[3]; r1[3] -= m1 * s; r2[3] -= m2 * s; r3[3] -= m3 * s;
+   s = r0[4];
+   if (s != 0.0) { r1[4] -= m1 * s; r2[4] -= m2 * s; r3[4] -= m3 * s; }
+   s = r0[5];
+   if (s != 0.0) { r1[5] -= m1 * s; r2[5] -= m2 * s; r3[5] -= m3 * s; }
+   s = r0[6];
+   if (s != 0.0) { r1[6] -= m1 * s; r2[6] -= m2 * s; r3[6] -= m3 * s; }
+   s = r0[7];
+   if (s != 0.0) { r1[7] -= m1 * s; r2[7] -= m2 * s; r3[7] -= m3 * s; }
+
+   /* choose pivot - or die */
+   if (fabs(r3[1])>fabs(r2[1])) SWAP_ROWS(r3, r2);
+   if (fabs(r2[1])>fabs(r1[1])) SWAP_ROWS(r2, r1);
+   if (0.0 == r1[1])  return GL_FALSE;
+
+   /* eliminate second variable */
+   m2 = r2[1]/r1[1]; m3 = r3[1]/r1[1];
+   r2[2] -= m2 * r1[2]; r3[2] -= m3 * r1[2];
+   r2[3] -= m2 * r1[3]; r3[3] -= m3 * r1[3];
+   s = r1[4]; if (0.0 != s) { r2[4] -= m2 * s; r3[4] -= m3 * s; }
+   s = r1[5]; if (0.0 != s) { r2[5] -= m2 * s; r3[5] -= m3 * s; }
+   s = r1[6]; if (0.0 != s) { r2[6] -= m2 * s; r3[6] -= m3 * s; }
+   s = r1[7]; if (0.0 != s) { r2[7] -= m2 * s; r3[7] -= m3 * s; }
+
+   /* choose pivot - or die */
+   if (fabs(r3[2])>fabs(r2[2])) SWAP_ROWS(r3, r2);
+   if (0.0 == r2[2])  return GL_FALSE;
+
+   /* eliminate third variable */
+   m3 = r3[2]/r2[2];
+   r3[3] -= m3 * r2[3], r3[4] -= m3 * r2[4],
+   r3[5] -= m3 * r2[5], r3[6] -= m3 * r2[6],
+   r3[7] -= m3 * r2[7];
+
+   /* last check */
+   if (0.0 == r3[3]) return GL_FALSE;
+
+   s = 1.0F/r3[3];             /* now back substitute row 3 */
+   r3[4] *= s; r3[5] *= s; r3[6] *= s; r3[7] *= s;
+
+   m2 = r2[3];                 /* now back substitute row 2 */
+   s  = 1.0F/r2[2];
+   r2[4] = s * (r2[4] - r3[4] * m2), r2[5] = s * (r2[5] - r3[5] * m2),
+   r2[6] = s * (r2[6] - r3[6] * m2), r2[7] = s * (r2[7] - r3[7] * m2);
+   m1 = r1[3];
+   r1[4] -= r3[4] * m1, r1[5] -= r3[5] * m1,
+   r1[6] -= r3[6] * m1, r1[7] -= r3[7] * m1;
+   m0 = r0[3];
+   r0[4] -= r3[4] * m0, r0[5] -= r3[5] * m0,
+   r0[6] -= r3[6] * m0, r0[7] -= r3[7] * m0;
+
+   m1 = r1[2];                 /* now back substitute row 1 */
+   s  = 1.0F/r1[1];
+   r1[4] = s * (r1[4] - r2[4] * m1), r1[5] = s * (r1[5] - r2[5] * m1),
+   r1[6] = s * (r1[6] - r2[6] * m1), r1[7] = s * (r1[7] - r2[7] * m1);
+   m0 = r0[2];
+   r0[4] -= r2[4] * m0, r0[5] -= r2[5] * m0,
+   r0[6] -= r2[6] * m0, r0[7] -= r2[7] * m0;
+
+   m0 = r0[1];                 /* now back substitute row 0 */
+   s  = 1.0F/r0[0];
+   r0[4] = s * (r0[4] - r1[4] * m0), r0[5] = s * (r0[5] - r1[5] * m0),
+   r0[6] = s * (r0[6] - r1[6] * m0), r0[7] = s * (r0[7] - r1[7] * m0);
+
+   MAT(out,0,0) = r0[4]; MAT(out,0,1) = r0[5],
+   MAT(out,0,2) = r0[6]; MAT(out,0,3) = r0[7],
+   MAT(out,1,0) = r1[4]; MAT(out,1,1) = r1[5],
+   MAT(out,1,2) = r1[6]; MAT(out,1,3) = r1[7],
+   MAT(out,2,0) = r2[4]; MAT(out,2,1) = r2[5],
+   MAT(out,2,2) = r2[6]; MAT(out,2,3) = r2[7],
+   MAT(out,3,0) = r3[4]; MAT(out,3,1) = r3[5],
+   MAT(out,3,2) = r3[6]; MAT(out,3,3) = r3[7];
+
+   return GL_TRUE;
+}
+#undef SWAP_ROWS
+
+/**
+ * Compute inverse of a general 3d transformation matrix.
+ * 
+ * \param mat pointer to a GLmatrix structure. The matrix inverse will be
+ * stored in the GLmatrix::inv attribute.
+ * 
+ * \return GL_TRUE for success, GL_FALSE for failure (\p singular matrix).
+ *
+ * \author Adapted from graphics gems II.
+ *
+ * Calculates the inverse of the upper left by first calculating its
+ * determinant and multiplying it to the symmetric adjust matrix of each
+ * element. Finally deals with the translation part by transforming the
+ * original translation vector using by the calculated submatrix inverse.
+ */
+static GLboolean invert_matrix_3d_general( GLmatrix *mat )
+{
+   const GLfloat *in = mat->m;
+   GLfloat *out = mat->inv;
+   GLfloat pos, neg, t;
+   GLfloat det;
+
+   /* Calculate the determinant of upper left 3x3 submatrix and
+    * determine if the matrix is singular.
+    */
+   pos = neg = 0.0;
+   t =  MAT(in,0,0) * MAT(in,1,1) * MAT(in,2,2);
+   if (t >= 0.0) pos += t; else neg += t;
+
+   t =  MAT(in,1,0) * MAT(in,2,1) * MAT(in,0,2);
+   if (t >= 0.0) pos += t; else neg += t;
+
+   t =  MAT(in,2,0) * MAT(in,0,1) * MAT(in,1,2);
+   if (t >= 0.0) pos += t; else neg += t;
+
+   t = -MAT(in,2,0) * MAT(in,1,1) * MAT(in,0,2);
+   if (t >= 0.0) pos += t; else neg += t;
+
+   t = -MAT(in,1,0) * MAT(in,0,1) * MAT(in,2,2);
+   if (t >= 0.0) pos += t; else neg += t;
+
+   t = -MAT(in,0,0) * MAT(in,2,1) * MAT(in,1,2);
+   if (t >= 0.0) pos += t; else neg += t;
+
+   det = pos + neg;
+
+   if (det*det < 1e-25)
+      return GL_FALSE;
+
+   det = 1.0F / det;
+   MAT(out,0,0) = (  (MAT(in,1,1)*MAT(in,2,2) - MAT(in,2,1)*MAT(in,1,2) )*det);
+   MAT(out,0,1) = (- (MAT(in,0,1)*MAT(in,2,2) - MAT(in,2,1)*MAT(in,0,2) )*det);
+   MAT(out,0,2) = (  (MAT(in,0,1)*MAT(in,1,2) - MAT(in,1,1)*MAT(in,0,2) )*det);
+   MAT(out,1,0) = (- (MAT(in,1,0)*MAT(in,2,2) - MAT(in,2,0)*MAT(in,1,2) )*det);
+   MAT(out,1,1) = (  (MAT(in,0,0)*MAT(in,2,2) - MAT(in,2,0)*MAT(in,0,2) )*det);
+   MAT(out,1,2) = (- (MAT(in,0,0)*MAT(in,1,2) - MAT(in,1,0)*MAT(in,0,2) )*det);
+   MAT(out,2,0) = (  (MAT(in,1,0)*MAT(in,2,1) - MAT(in,2,0)*MAT(in,1,1) )*det);
+   MAT(out,2,1) = (- (MAT(in,0,0)*MAT(in,2,1) - MAT(in,2,0)*MAT(in,0,1) )*det);
+   MAT(out,2,2) = (  (MAT(in,0,0)*MAT(in,1,1) - MAT(in,1,0)*MAT(in,0,1) )*det);
+
+   /* Do the translation part */
+   MAT(out,0,3) = - (MAT(in,0,3) * MAT(out,0,0) +
+		     MAT(in,1,3) * MAT(out,0,1) +
+		     MAT(in,2,3) * MAT(out,0,2) );
+   MAT(out,1,3) = - (MAT(in,0,3) * MAT(out,1,0) +
+		     MAT(in,1,3) * MAT(out,1,1) +
+		     MAT(in,2,3) * MAT(out,1,2) );
+   MAT(out,2,3) = - (MAT(in,0,3) * MAT(out,2,0) +
+		     MAT(in,1,3) * MAT(out,2,1) +
+		     MAT(in,2,3) * MAT(out,2,2) );
+
+   return GL_TRUE;
+}
+
+/**
+ * Compute inverse of a 3d transformation matrix.
+ * 
+ * \param mat pointer to a GLmatrix structure. The matrix inverse will be
+ * stored in the GLmatrix::inv attribute.
+ * 
+ * \return GL_TRUE for success, GL_FALSE for failure (\p singular matrix).
+ *
+ * If the matrix is not an angle preserving matrix then calls
+ * invert_matrix_3d_general for the actual calculation. Otherwise calculates
+ * the inverse matrix analyzing and inverting each of the scaling, rotation and
+ * translation parts.
+ */
+static GLboolean invert_matrix_3d( GLmatrix *mat )
+{
+   const GLfloat *in = mat->m;
+   GLfloat *out = mat->inv;
+
+   if (!TEST_MAT_FLAGS(mat, MAT_FLAGS_ANGLE_PRESERVING)) {
+      return invert_matrix_3d_general( mat );
+   }
+
+   if (mat->flags & MAT_FLAG_UNIFORM_SCALE) {
+      GLfloat scale = (MAT(in,0,0) * MAT(in,0,0) +
+                       MAT(in,0,1) * MAT(in,0,1) +
+                       MAT(in,0,2) * MAT(in,0,2));
+
+      if (scale == 0.0)
+         return GL_FALSE;
+
+      scale = 1.0F / scale;
+
+      /* Transpose and scale the 3 by 3 upper-left submatrix. */
+      MAT(out,0,0) = scale * MAT(in,0,0);
+      MAT(out,1,0) = scale * MAT(in,0,1);
+      MAT(out,2,0) = scale * MAT(in,0,2);
+      MAT(out,0,1) = scale * MAT(in,1,0);
+      MAT(out,1,1) = scale * MAT(in,1,1);
+      MAT(out,2,1) = scale * MAT(in,1,2);
+      MAT(out,0,2) = scale * MAT(in,2,0);
+      MAT(out,1,2) = scale * MAT(in,2,1);
+      MAT(out,2,2) = scale * MAT(in,2,2);
+   }
+   else if (mat->flags & MAT_FLAG_ROTATION) {
+      /* Transpose the 3 by 3 upper-left submatrix. */
+      MAT(out,0,0) = MAT(in,0,0);
+      MAT(out,1,0) = MAT(in,0,1);
+      MAT(out,2,0) = MAT(in,0,2);
+      MAT(out,0,1) = MAT(in,1,0);
+      MAT(out,1,1) = MAT(in,1,1);
+      MAT(out,2,1) = MAT(in,1,2);
+      MAT(out,0,2) = MAT(in,2,0);
+      MAT(out,1,2) = MAT(in,2,1);
+      MAT(out,2,2) = MAT(in,2,2);
+   }
+   else {
+      /* pure translation */
+      MEMCPY( out, Identity, sizeof(Identity) );
+      MAT(out,0,3) = - MAT(in,0,3);
+      MAT(out,1,3) = - MAT(in,1,3);
+      MAT(out,2,3) = - MAT(in,2,3);
+      return GL_TRUE;
+   }
+
+   if (mat->flags & MAT_FLAG_TRANSLATION) {
+      /* Do the translation part */
+      MAT(out,0,3) = - (MAT(in,0,3) * MAT(out,0,0) +
+			MAT(in,1,3) * MAT(out,0,1) +
+			MAT(in,2,3) * MAT(out,0,2) );
+      MAT(out,1,3) = - (MAT(in,0,3) * MAT(out,1,0) +
+			MAT(in,1,3) * MAT(out,1,1) +
+			MAT(in,2,3) * MAT(out,1,2) );
+      MAT(out,2,3) = - (MAT(in,0,3) * MAT(out,2,0) +
+			MAT(in,1,3) * MAT(out,2,1) +
+			MAT(in,2,3) * MAT(out,2,2) );
+   }
+   else {
+      MAT(out,0,3) = MAT(out,1,3) = MAT(out,2,3) = 0.0;
+   }
+
+   return GL_TRUE;
+}
+
+/**
+ * Compute inverse of an identity transformation matrix.
+ * 
+ * \param mat pointer to a GLmatrix structure. The matrix inverse will be
+ * stored in the GLmatrix::inv attribute.
+ * 
+ * \return always GL_TRUE.
+ *
+ * Simply copies Identity into GLmatrix::inv.
+ */
+static GLboolean invert_matrix_identity( GLmatrix *mat )
+{
+   MEMCPY( mat->inv, Identity, sizeof(Identity) );
+   return GL_TRUE;
+}
+
+/**
+ * Compute inverse of a no-rotation 3d transformation matrix.
+ * 
+ * \param mat pointer to a GLmatrix structure. The matrix inverse will be
+ * stored in the GLmatrix::inv attribute.
+ * 
+ * \return GL_TRUE for success, GL_FALSE for failure (\p singular matrix).
+ *
+ * Calculates the 
+ */
+static GLboolean invert_matrix_3d_no_rot( GLmatrix *mat )
+{
+   const GLfloat *in = mat->m;
+   GLfloat *out = mat->inv;
+
+   if (MAT(in,0,0) == 0 || MAT(in,1,1) == 0 || MAT(in,2,2) == 0 )
+      return GL_FALSE;
+
+   MEMCPY( out, Identity, 16 * sizeof(GLfloat) );
+   MAT(out,0,0) = 1.0F / MAT(in,0,0);
+   MAT(out,1,1) = 1.0F / MAT(in,1,1);
+   MAT(out,2,2) = 1.0F / MAT(in,2,2);
+
+   if (mat->flags & MAT_FLAG_TRANSLATION) {
+      MAT(out,0,3) = - (MAT(in,0,3) * MAT(out,0,0));
+      MAT(out,1,3) = - (MAT(in,1,3) * MAT(out,1,1));
+      MAT(out,2,3) = - (MAT(in,2,3) * MAT(out,2,2));
+   }
+
+   return GL_TRUE;
+}
+
+/**
+ * Compute inverse of a no-rotation 2d transformation matrix.
+ * 
+ * \param mat pointer to a GLmatrix structure. The matrix inverse will be
+ * stored in the GLmatrix::inv attribute.
+ * 
+ * \return GL_TRUE for success, GL_FALSE for failure (\p singular matrix).
+ *
+ * Calculates the inverse matrix by applying the inverse scaling and
+ * translation to the identity matrix.
+ */
+static GLboolean invert_matrix_2d_no_rot( GLmatrix *mat )
+{
+   const GLfloat *in = mat->m;
+   GLfloat *out = mat->inv;
+
+   if (MAT(in,0,0) == 0 || MAT(in,1,1) == 0)
+      return GL_FALSE;
+
+   MEMCPY( out, Identity, 16 * sizeof(GLfloat) );
+   MAT(out,0,0) = 1.0F / MAT(in,0,0);
+   MAT(out,1,1) = 1.0F / MAT(in,1,1);
+
+   if (mat->flags & MAT_FLAG_TRANSLATION) {
+      MAT(out,0,3) = - (MAT(in,0,3) * MAT(out,0,0));
+      MAT(out,1,3) = - (MAT(in,1,3) * MAT(out,1,1));
+   }
+
+   return GL_TRUE;
+}
+
+#if 0
+/* broken */
+static GLboolean invert_matrix_perspective( GLmatrix *mat )
+{
+   const GLfloat *in = mat->m;
+   GLfloat *out = mat->inv;
+
+   if (MAT(in,2,3) == 0)
+      return GL_FALSE;
+
+   MEMCPY( out, Identity, 16 * sizeof(GLfloat) );
+
+   MAT(out,0,0) = 1.0F / MAT(in,0,0);
+   MAT(out,1,1) = 1.0F / MAT(in,1,1);
+
+   MAT(out,0,3) = MAT(in,0,2);
+   MAT(out,1,3) = MAT(in,1,2);
+
+   MAT(out,2,2) = 0;
+   MAT(out,2,3) = -1;
+
+   MAT(out,3,2) = 1.0F / MAT(in,2,3);
+   MAT(out,3,3) = MAT(in,2,2) * MAT(out,3,2);
+
+   return GL_TRUE;
+}
+#endif
+
+/**
+ * Matrix inversion function pointer type.
+ */
+typedef GLboolean (*inv_mat_func)( GLmatrix *mat );
+
+/**
+ * Table of the matrix inversion functions according to the matrix type.
+ */
+static inv_mat_func inv_mat_tab[7] = {
+   invert_matrix_general,
+   invert_matrix_identity,
+   invert_matrix_3d_no_rot,
+#if 0
+   /* Don't use this function for now - it fails when the projection matrix
+    * is premultiplied by a translation (ala Chromium's tilesort SPU).
+    */
+   invert_matrix_perspective,
+#else
+   invert_matrix_general,
+#endif
+   invert_matrix_3d,		/* lazy! */
+   invert_matrix_2d_no_rot,
+   invert_matrix_3d
+};
+
+/**
+ * Compute inverse of a transformation matrix.
+ * 
+ * \param mat pointer to a GLmatrix structure. The matrix inverse will be
+ * stored in the GLmatrix::inv attribute.
+ * 
+ * \return GL_TRUE for success, GL_FALSE for failure (\p singular matrix).
+ *
+ * Calls the matrix inversion function in inv_mat_tab corresponding to the
+ * given matrix type.  In case of failure, updates the MAT_FLAG_SINGULAR flag,
+ * and copies the identity matrix into GLmatrix::inv.
+ */
+static GLboolean matrix_invert( GLmatrix *mat )
+{
+   if (inv_mat_tab[mat->type](mat)) {
+      mat->flags &= ~MAT_FLAG_SINGULAR;
+      return GL_TRUE;
+   } else {
+      mat->flags |= MAT_FLAG_SINGULAR;
+      MEMCPY( mat->inv, Identity, sizeof(Identity) );
+      return GL_FALSE;
+   }
+}
+
+/*@}*/
+
+
+/**********************************************************************/
+/** \name Matrix generation */
+/*@{*/
+
+/**
+ * Generate a 4x4 transformation matrix from glRotate parameters, and
+ * post-multiply the input matrix by it.
+ *
+ * \author
+ * This function was contributed by Erich Boleyn (erich@uruk.org).
+ * Optimizations contributed by Rudolf Opalla (rudi@khm.de).
+ */
+void
+_math_matrix_rotate( GLmatrix *mat,
+		     GLfloat angle, GLfloat x, GLfloat y, GLfloat z )
+{
+   GLfloat xx, yy, zz, xy, yz, zx, xs, ys, zs, one_c, s, c;
+   GLfloat m[16];
+   GLboolean optimized;
+
+   s = (GLfloat) sin( angle * DEG2RAD );
+   c = (GLfloat) cos( angle * DEG2RAD );
+
+   MEMCPY(m, Identity, sizeof(GLfloat)*16);
+   optimized = GL_FALSE;
+
+#define M(row,col)  m[col*4+row]
+
+   if (x == 0.0F) {
+      if (y == 0.0F) {
+         if (z != 0.0F) {
+            optimized = GL_TRUE;
+            /* rotate only around z-axis */
+            M(0,0) = c;
+            M(1,1) = c;
+            if (z < 0.0F) {
+               M(0,1) = s;
+               M(1,0) = -s;
+            }
+            else {
+               M(0,1) = -s;
+               M(1,0) = s;
+            }
+         }
+      }
+      else if (z == 0.0F) {
+         optimized = GL_TRUE;
+         /* rotate only around y-axis */
+         M(0,0) = c;
+         M(2,2) = c;
+         if (y < 0.0F) {
+            M(0,2) = -s;
+            M(2,0) = s;
+         }
+         else {
+            M(0,2) = s;
+            M(2,0) = -s;
+         }
+      }
+   }
+   else if (y == 0.0F) {
+      if (z == 0.0F) {
+         optimized = GL_TRUE;
+         /* rotate only around x-axis */
+         M(1,1) = c;
+         M(2,2) = c;
+         if (x < 0.0F) {
+            M(1,2) = s;
+            M(2,1) = -s;
+         }
+         else {
+            M(1,2) = -s;
+            M(2,1) = s;
+         }
+      }
+   }
+
+   if (!optimized) {
+      const GLfloat mag = SQRTF(x * x + y * y + z * z);
+
+      if (mag <= 1.0e-4) {
+         /* no rotation, leave mat as-is */
+         return;
+      }
+
+      x /= mag;
+      y /= mag;
+      z /= mag;
+
+
+      /*
+       *     Arbitrary axis rotation matrix.
+       *
+       *  This is composed of 5 matrices, Rz, Ry, T, Ry', Rz', multiplied
+       *  like so:  Rz * Ry * T * Ry' * Rz'.  T is the final rotation
+       *  (which is about the X-axis), and the two composite transforms
+       *  Ry' * Rz' and Rz * Ry are (respectively) the rotations necessary
+       *  from the arbitrary axis to the X-axis then back.  They are
+       *  all elementary rotations.
+       *
+       *  Rz' is a rotation about the Z-axis, to bring the axis vector
+       *  into the x-z plane.  Then Ry' is applied, rotating about the
+       *  Y-axis to bring the axis vector parallel with the X-axis.  The
+       *  rotation about the X-axis is then performed.  Ry and Rz are
+       *  simply the respective inverse transforms to bring the arbitrary
+       *  axis back to it's original orientation.  The first transforms
+       *  Rz' and Ry' are considered inverses, since the data from the
+       *  arbitrary axis gives you info on how to get to it, not how
+       *  to get away from it, and an inverse must be applied.
+       *
+       *  The basic calculation used is to recognize that the arbitrary
+       *  axis vector (x, y, z), since it is of unit length, actually
+       *  represents the sines and cosines of the angles to rotate the
+       *  X-axis to the same orientation, with theta being the angle about
+       *  Z and phi the angle about Y (in the order described above)
+       *  as follows:
+       *
+       *  cos ( theta ) = x / sqrt ( 1 - z^2 )
+       *  sin ( theta ) = y / sqrt ( 1 - z^2 )
+       *
+       *  cos ( phi ) = sqrt ( 1 - z^2 )
+       *  sin ( phi ) = z
+       *
+       *  Note that cos ( phi ) can further be inserted to the above
+       *  formulas:
+       *
+       *  cos ( theta ) = x / cos ( phi )
+       *  sin ( theta ) = y / sin ( phi )
+       *
+       *  ...etc.  Because of those relations and the standard trigonometric
+       *  relations, it is pssible to reduce the transforms down to what
+       *  is used below.  It may be that any primary axis chosen will give the
+       *  same results (modulo a sign convention) using thie method.
+       *
+       *  Particularly nice is to notice that all divisions that might
+       *  have caused trouble when parallel to certain planes or
+       *  axis go away with care paid to reducing the expressions.
+       *  After checking, it does perform correctly under all cases, since
+       *  in all the cases of division where the denominator would have
+       *  been zero, the numerator would have been zero as well, giving
+       *  the expected result.
+       */
+
+      xx = x * x;
+      yy = y * y;
+      zz = z * z;
+      xy = x * y;
+      yz = y * z;
+      zx = z * x;
+      xs = x * s;
+      ys = y * s;
+      zs = z * s;
+      one_c = 1.0F - c;
+
+      /* We already hold the identity-matrix so we can skip some statements */
+      M(0,0) = (one_c * xx) + c;
+      M(0,1) = (one_c * xy) - zs;
+      M(0,2) = (one_c * zx) + ys;
+/*    M(0,3) = 0.0F; */
+
+      M(1,0) = (one_c * xy) + zs;
+      M(1,1) = (one_c * yy) + c;
+      M(1,2) = (one_c * yz) - xs;
+/*    M(1,3) = 0.0F; */
+
+      M(2,0) = (one_c * zx) - ys;
+      M(2,1) = (one_c * yz) + xs;
+      M(2,2) = (one_c * zz) + c;
+/*    M(2,3) = 0.0F; */
+
+/*
+      M(3,0) = 0.0F;
+      M(3,1) = 0.0F;
+      M(3,2) = 0.0F;
+      M(3,3) = 1.0F;
+*/
+   }
+#undef M
+
+   matrix_multf( mat, m, MAT_FLAG_ROTATION );
+}
+
+/**
+ * Apply a perspective projection matrix.
+ *
+ * \param mat matrix to apply the projection.
+ * \param left left clipping plane coordinate.
+ * \param right right clipping plane coordinate.
+ * \param bottom bottom clipping plane coordinate.
+ * \param top top clipping plane coordinate.
+ * \param nearval distance to the near clipping plane.
+ * \param farval distance to the far clipping plane.
+ *
+ * Creates the projection matrix and multiplies it with \p mat, marking the
+ * MAT_FLAG_PERSPECTIVE flag.
+ */
+void
+_math_matrix_frustum( GLmatrix *mat,
+		      GLfloat left, GLfloat right,
+		      GLfloat bottom, GLfloat top,
+		      GLfloat nearval, GLfloat farval )
+{
+   GLfloat x, y, a, b, c, d;
+   GLfloat m[16];
+
+   x = (2.0F*nearval) / (right-left);
+   y = (2.0F*nearval) / (top-bottom);
+   a = (right+left) / (right-left);
+   b = (top+bottom) / (top-bottom);
+   c = -(farval+nearval) / ( farval-nearval);
+   d = -(2.0F*farval*nearval) / (farval-nearval);  /* error? */
+
+#define M(row,col)  m[col*4+row]
+   M(0,0) = x;     M(0,1) = 0.0F;  M(0,2) = a;      M(0,3) = 0.0F;
+   M(1,0) = 0.0F;  M(1,1) = y;     M(1,2) = b;      M(1,3) = 0.0F;
+   M(2,0) = 0.0F;  M(2,1) = 0.0F;  M(2,2) = c;      M(2,3) = d;
+   M(3,0) = 0.0F;  M(3,1) = 0.0F;  M(3,2) = -1.0F;  M(3,3) = 0.0F;
+#undef M
+
+   matrix_multf( mat, m, MAT_FLAG_PERSPECTIVE );
+}
+
+/**
+ * Apply an orthographic projection matrix.
+ *
+ * \param mat matrix to apply the projection.
+ * \param left left clipping plane coordinate.
+ * \param right right clipping plane coordinate.
+ * \param bottom bottom clipping plane coordinate.
+ * \param top top clipping plane coordinate.
+ * \param nearval distance to the near clipping plane.
+ * \param farval distance to the far clipping plane.
+ *
+ * Creates the projection matrix and multiplies it with \p mat, marking the
+ * MAT_FLAG_GENERAL_SCALE and MAT_FLAG_TRANSLATION flags.
+ */
+void
+_math_matrix_ortho( GLmatrix *mat,
+		    GLfloat left, GLfloat right,
+		    GLfloat bottom, GLfloat top,
+		    GLfloat nearval, GLfloat farval )
+{
+   GLfloat m[16];
+
+#define M(row,col)  m[col*4+row]
+   M(0,0) = 2.0F / (right-left);
+   M(0,1) = 0.0F;
+   M(0,2) = 0.0F;
+   M(0,3) = -(right+left) / (right-left);
+
+   M(1,0) = 0.0F;
+   M(1,1) = 2.0F / (top-bottom);
+   M(1,2) = 0.0F;
+   M(1,3) = -(top+bottom) / (top-bottom);
+
+   M(2,0) = 0.0F;
+   M(2,1) = 0.0F;
+   M(2,2) = -2.0F / (farval-nearval);
+   M(2,3) = -(farval+nearval) / (farval-nearval);
+
+   M(3,0) = 0.0F;
+   M(3,1) = 0.0F;
+   M(3,2) = 0.0F;
+   M(3,3) = 1.0F;
+#undef M
+
+   matrix_multf( mat, m, (MAT_FLAG_GENERAL_SCALE|MAT_FLAG_TRANSLATION));
+}
+
+/**
+ * Multiply a matrix with a general scaling matrix.
+ *
+ * \param mat matrix.
+ * \param x x axis scale factor.
+ * \param y y axis scale factor.
+ * \param z z axis scale factor.
+ *
+ * Multiplies in-place the elements of \p mat by the scale factors. Checks if
+ * the scales factors are roughly the same, marking the MAT_FLAG_UNIFORM_SCALE
+ * flag, or MAT_FLAG_GENERAL_SCALE. Marks the MAT_DIRTY_TYPE and
+ * MAT_DIRTY_INVERSE dirty flags.
+ */
+void
+_math_matrix_scale( GLmatrix *mat, GLfloat x, GLfloat y, GLfloat z )
+{
+   GLfloat *m = mat->m;
+   m[0] *= x;   m[4] *= y;   m[8]  *= z;
+   m[1] *= x;   m[5] *= y;   m[9]  *= z;
+   m[2] *= x;   m[6] *= y;   m[10] *= z;
+   m[3] *= x;   m[7] *= y;   m[11] *= z;
+
+   if (fabs(x - y) < 1e-8 && fabs(x - z) < 1e-8)
+      mat->flags |= MAT_FLAG_UNIFORM_SCALE;
+   else
+      mat->flags |= MAT_FLAG_GENERAL_SCALE;
+
+   mat->flags |= (MAT_DIRTY_TYPE |
+		  MAT_DIRTY_INVERSE);
+}
+
+/**
+ * Multiply a matrix with a translation matrix.
+ *
+ * \param mat matrix.
+ * \param x translation vector x coordinate.
+ * \param y translation vector y coordinate.
+ * \param z translation vector z coordinate.
+ *
+ * Adds the translation coordinates to the elements of \p mat in-place.  Marks
+ * the MAT_FLAG_TRANSLATION flag, and the MAT_DIRTY_TYPE and MAT_DIRTY_INVERSE
+ * dirty flags.
+ */
+void
+_math_matrix_translate( GLmatrix *mat, GLfloat x, GLfloat y, GLfloat z )
+{
+   GLfloat *m = mat->m;
+   m[12] = m[0] * x + m[4] * y + m[8]  * z + m[12];
+   m[13] = m[1] * x + m[5] * y + m[9]  * z + m[13];
+   m[14] = m[2] * x + m[6] * y + m[10] * z + m[14];
+   m[15] = m[3] * x + m[7] * y + m[11] * z + m[15];
+
+   mat->flags |= (MAT_FLAG_TRANSLATION |
+		  MAT_DIRTY_TYPE |
+		  MAT_DIRTY_INVERSE);
+}
+
+/**
+ * Set a matrix to the identity matrix.
+ *
+ * \param mat matrix.
+ *
+ * Copies ::Identity into \p GLmatrix::m, and into GLmatrix::inv if not NULL.
+ * Sets the matrix type to identity, and clear the dirty flags.
+ */
+void
+_math_matrix_set_identity( GLmatrix *mat )
+{
+   MEMCPY( mat->m, Identity, 16*sizeof(GLfloat) );
+
+   if (mat->inv)
+      MEMCPY( mat->inv, Identity, 16*sizeof(GLfloat) );
+
+   mat->type = MATRIX_IDENTITY;
+   mat->flags &= ~(MAT_DIRTY_FLAGS|
+		   MAT_DIRTY_TYPE|
+		   MAT_DIRTY_INVERSE);
+}
+
+/*@}*/
+
+
+/**********************************************************************/
+/** \name Matrix analysis */
+/*@{*/
+
+#define ZERO(x) (1<<x)
+#define ONE(x)  (1<<(x+16))
+
+#define MASK_NO_TRX      (ZERO(12) | ZERO(13) | ZERO(14))
+#define MASK_NO_2D_SCALE ( ONE(0)  | ONE(5))
+
+#define MASK_IDENTITY    ( ONE(0)  | ZERO(4)  | ZERO(8)  | ZERO(12) |\
+			  ZERO(1)  |  ONE(5)  | ZERO(9)  | ZERO(13) |\
+			  ZERO(2)  | ZERO(6)  |  ONE(10) | ZERO(14) |\
+			  ZERO(3)  | ZERO(7)  | ZERO(11) |  ONE(15) )
+
+#define MASK_2D_NO_ROT   (           ZERO(4)  | ZERO(8)  |           \
+			  ZERO(1)  |            ZERO(9)  |           \
+			  ZERO(2)  | ZERO(6)  |  ONE(10) | ZERO(14) |\
+			  ZERO(3)  | ZERO(7)  | ZERO(11) |  ONE(15) )
+
+#define MASK_2D          (                      ZERO(8)  |           \
+			                        ZERO(9)  |           \
+			  ZERO(2)  | ZERO(6)  |  ONE(10) | ZERO(14) |\
+			  ZERO(3)  | ZERO(7)  | ZERO(11) |  ONE(15) )
+
+
+#define MASK_3D_NO_ROT   (           ZERO(4)  | ZERO(8)  |           \
+			  ZERO(1)  |            ZERO(9)  |           \
+			  ZERO(2)  | ZERO(6)  |                      \
+			  ZERO(3)  | ZERO(7)  | ZERO(11) |  ONE(15) )
+
+#define MASK_3D          (                                           \
+			                                             \
+			                                             \
+			  ZERO(3)  | ZERO(7)  | ZERO(11) |  ONE(15) )
+
+
+#define MASK_PERSPECTIVE (           ZERO(4)  |            ZERO(12) |\
+			  ZERO(1)  |                       ZERO(13) |\
+			  ZERO(2)  | ZERO(6)  |                      \
+			  ZERO(3)  | ZERO(7)  |            ZERO(15) )
+
+#define SQ(x) ((x)*(x))
+
+/**
+ * Determine type and flags from scratch.  
+ *
+ * \param mat matrix.
+ * 
+ * This is expensive enough to only want to do it once.
+ */
+static void analyse_from_scratch( GLmatrix *mat )
+{
+   const GLfloat *m = mat->m;
+   GLuint mask = 0;
+   GLuint i;
+
+   for (i = 0 ; i < 16 ; i++) {
+      if (m[i] == 0.0) mask |= (1<<i);
+   }
+
+   if (m[0] == 1.0F) mask |= (1<<16);
+   if (m[5] == 1.0F) mask |= (1<<21);
+   if (m[10] == 1.0F) mask |= (1<<26);
+   if (m[15] == 1.0F) mask |= (1<<31);
+
+   mat->flags &= ~MAT_FLAGS_GEOMETRY;
+
+   /* Check for translation - no-one really cares
+    */
+   if ((mask & MASK_NO_TRX) != MASK_NO_TRX)
+      mat->flags |= MAT_FLAG_TRANSLATION;
+
+   /* Do the real work
+    */
+   if (mask == (GLuint) MASK_IDENTITY) {
+      mat->type = MATRIX_IDENTITY;
+   }
+   else if ((mask & MASK_2D_NO_ROT) == (GLuint) MASK_2D_NO_ROT) {
+      mat->type = MATRIX_2D_NO_ROT;
+
+      if ((mask & MASK_NO_2D_SCALE) != MASK_NO_2D_SCALE)
+	 mat->flags = MAT_FLAG_GENERAL_SCALE;
+   }
+   else if ((mask & MASK_2D) == (GLuint) MASK_2D) {
+      GLfloat mm = DOT2(m, m);
+      GLfloat m4m4 = DOT2(m+4,m+4);
+      GLfloat mm4 = DOT2(m,m+4);
+
+      mat->type = MATRIX_2D;
+
+      /* Check for scale */
+      if (SQ(mm-1) > SQ(1e-6) ||
+	  SQ(m4m4-1) > SQ(1e-6))
+	 mat->flags |= MAT_FLAG_GENERAL_SCALE;
+
+      /* Check for rotation */
+      if (SQ(mm4) > SQ(1e-6))
+	 mat->flags |= MAT_FLAG_GENERAL_3D;
+      else
+	 mat->flags |= MAT_FLAG_ROTATION;
+
+   }
+   else if ((mask & MASK_3D_NO_ROT) == (GLuint) MASK_3D_NO_ROT) {
+      mat->type = MATRIX_3D_NO_ROT;
+
+      /* Check for scale */
+      if (SQ(m[0]-m[5]) < SQ(1e-6) &&
+	  SQ(m[0]-m[10]) < SQ(1e-6)) {
+	 if (SQ(m[0]-1.0) > SQ(1e-6)) {
+	    mat->flags |= MAT_FLAG_UNIFORM_SCALE;
+         }
+      }
+      else {
+	 mat->flags |= MAT_FLAG_GENERAL_SCALE;
+      }
+   }
+   else if ((mask & MASK_3D) == (GLuint) MASK_3D) {
+      GLfloat c1 = DOT3(m,m);
+      GLfloat c2 = DOT3(m+4,m+4);
+      GLfloat c3 = DOT3(m+8,m+8);
+      GLfloat d1 = DOT3(m, m+4);
+      GLfloat cp[3];
+
+      mat->type = MATRIX_3D;
+
+      /* Check for scale */
+      if (SQ(c1-c2) < SQ(1e-6) && SQ(c1-c3) < SQ(1e-6)) {
+	 if (SQ(c1-1.0) > SQ(1e-6))
+	    mat->flags |= MAT_FLAG_UNIFORM_SCALE;
+	 /* else no scale at all */
+      }
+      else {
+	 mat->flags |= MAT_FLAG_GENERAL_SCALE;
+      }
+
+      /* Check for rotation */
+      if (SQ(d1) < SQ(1e-6)) {
+	 CROSS3( cp, m, m+4 );
+	 SUB_3V( cp, cp, (m+8) );
+	 if (LEN_SQUARED_3FV(cp) < SQ(1e-6))
+	    mat->flags |= MAT_FLAG_ROTATION;
+	 else
+	    mat->flags |= MAT_FLAG_GENERAL_3D;
+      }
+      else {
+	 mat->flags |= MAT_FLAG_GENERAL_3D; /* shear, etc */
+      }
+   }
+   else if ((mask & MASK_PERSPECTIVE) == MASK_PERSPECTIVE && m[11]==-1.0F) {
+      mat->type = MATRIX_PERSPECTIVE;
+      mat->flags |= MAT_FLAG_GENERAL;
+   }
+   else {
+      mat->type = MATRIX_GENERAL;
+      mat->flags |= MAT_FLAG_GENERAL;
+   }
+}
+
+/**
+ * Analyze a matrix given that its flags are accurate.
+ * 
+ * This is the more common operation, hopefully.
+ */
+static void analyse_from_flags( GLmatrix *mat )
+{
+   const GLfloat *m = mat->m;
+
+   if (TEST_MAT_FLAGS(mat, 0)) {
+      mat->type = MATRIX_IDENTITY;
+   }
+   else if (TEST_MAT_FLAGS(mat, (MAT_FLAG_TRANSLATION |
+				 MAT_FLAG_UNIFORM_SCALE |
+				 MAT_FLAG_GENERAL_SCALE))) {
+      if ( m[10]==1.0F && m[14]==0.0F ) {
+	 mat->type = MATRIX_2D_NO_ROT;
+      }
+      else {
+	 mat->type = MATRIX_3D_NO_ROT;
+      }
+   }
+   else if (TEST_MAT_FLAGS(mat, MAT_FLAGS_3D)) {
+      if (                                 m[ 8]==0.0F
+            &&                             m[ 9]==0.0F
+            && m[2]==0.0F && m[6]==0.0F && m[10]==1.0F && m[14]==0.0F) {
+	 mat->type = MATRIX_2D;
+      }
+      else {
+	 mat->type = MATRIX_3D;
+      }
+   }
+   else if (                 m[4]==0.0F                 && m[12]==0.0F
+            && m[1]==0.0F                               && m[13]==0.0F
+            && m[2]==0.0F && m[6]==0.0F
+            && m[3]==0.0F && m[7]==0.0F && m[11]==-1.0F && m[15]==0.0F) {
+      mat->type = MATRIX_PERSPECTIVE;
+   }
+   else {
+      mat->type = MATRIX_GENERAL;
+   }
+}
+
+/**
+ * Analyze and update a matrix.
+ *
+ * \param mat matrix.
+ *
+ * If the matrix type is dirty then calls either analyse_from_scratch() or
+ * analyse_from_flags() to determine its type, according to whether the flags
+ * are dirty or not, respectively. If the matrix has an inverse and it's dirty
+ * then calls matrix_invert(). Finally clears the dirty flags.
+ */
+void
+_math_matrix_analyse( GLmatrix *mat )
+{
+   if (mat->flags & MAT_DIRTY_TYPE) {
+      if (mat->flags & MAT_DIRTY_FLAGS)
+	 analyse_from_scratch( mat );
+      else
+	 analyse_from_flags( mat );
+   }
+
+   if (mat->inv && (mat->flags & MAT_DIRTY_INVERSE)) {
+      matrix_invert( mat );
+   }
+
+   mat->flags &= ~(MAT_DIRTY_FLAGS|
+		   MAT_DIRTY_TYPE|
+		   MAT_DIRTY_INVERSE);
+}
+
+/*@}*/
+
+
+/**********************************************************************/
+/** \name Matrix setup */
+/*@{*/
+
+/**
+ * Copy a matrix.
+ *
+ * \param to destination matrix.
+ * \param from source matrix.
+ *
+ * Copies all fields in GLmatrix, creating an inverse array if necessary.
+ */
+void
+_math_matrix_copy( GLmatrix *to, const GLmatrix *from )
+{
+   MEMCPY( to->m, from->m, sizeof(Identity) );
+   to->flags = from->flags;
+   to->type = from->type;
+
+   if (to->inv != 0) {
+      if (from->inv == 0) {
+	 matrix_invert( to );
+      }
+      else {
+	 MEMCPY(to->inv, from->inv, sizeof(GLfloat)*16);
+      }
+   }
+}
+
+/**
+ * Loads a matrix array into GLmatrix.
+ * 
+ * \param m matrix array.
+ * \param mat matrix.
+ *
+ * Copies \p m into GLmatrix::m and marks the MAT_FLAG_GENERAL and MAT_DIRTY
+ * flags.
+ */
+void
+_math_matrix_loadf( GLmatrix *mat, const GLfloat *m )
+{
+   MEMCPY( mat->m, m, 16*sizeof(GLfloat) );
+   mat->flags = (MAT_FLAG_GENERAL | MAT_DIRTY);
+}
+
+/**
+ * Matrix constructor.
+ *
+ * \param m matrix.
+ *
+ * Initialize the GLmatrix fields.
+ */
+void
+_math_matrix_ctr( GLmatrix *m )
+{
+   m->m = (GLfloat *) ALIGN_MALLOC( 16 * sizeof(GLfloat), 16 );
+   if (m->m)
+      MEMCPY( m->m, Identity, sizeof(Identity) );
+   m->inv = NULL;
+   m->type = MATRIX_IDENTITY;
+   m->flags = 0;
+}
+
+/**
+ * Matrix destructor.
+ *
+ * \param m matrix.
+ *
+ * Frees the data in a GLmatrix.
+ */
+void
+_math_matrix_dtr( GLmatrix *m )
+{
+   if (m->m) {
+      ALIGN_FREE( m->m );
+      m->m = NULL;
+   }
+   if (m->inv) {
+      ALIGN_FREE( m->inv );
+      m->inv = NULL;
+   }
+}
+
+/**
+ * Allocate a matrix inverse.
+ *
+ * \param m matrix.
+ *
+ * Allocates the matrix inverse, GLmatrix::inv, and sets it to Identity.
+ */
+void
+_math_matrix_alloc_inv( GLmatrix *m )
+{
+   if (!m->inv) {
+      m->inv = (GLfloat *) ALIGN_MALLOC( 16 * sizeof(GLfloat), 16 );
+      if (m->inv)
+         MEMCPY( m->inv, Identity, 16 * sizeof(GLfloat) );
+   }
+}
+
+/*@}*/
+
+
+/**********************************************************************/
+/** \name Matrix transpose */
+/*@{*/
+
+/**
+ * Transpose a GLfloat matrix.
+ *
+ * \param to destination array.
+ * \param from source array.
+ */
+void
+_math_transposef( GLfloat to[16], const GLfloat from[16] )
+{
+   to[0] = from[0];
+   to[1] = from[4];
+   to[2] = from[8];
+   to[3] = from[12];
+   to[4] = from[1];
+   to[5] = from[5];
+   to[6] = from[9];
+   to[7] = from[13];
+   to[8] = from[2];
+   to[9] = from[6];
+   to[10] = from[10];
+   to[11] = from[14];
+   to[12] = from[3];
+   to[13] = from[7];
+   to[14] = from[11];
+   to[15] = from[15];
+}
+
+/**
+ * Transpose a GLdouble matrix.
+ *
+ * \param to destination array.
+ * \param from source array.
+ */
+void
+_math_transposed( GLdouble to[16], const GLdouble from[16] )
+{
+   to[0] = from[0];
+   to[1] = from[4];
+   to[2] = from[8];
+   to[3] = from[12];
+   to[4] = from[1];
+   to[5] = from[5];
+   to[6] = from[9];
+   to[7] = from[13];
+   to[8] = from[2];
+   to[9] = from[6];
+   to[10] = from[10];
+   to[11] = from[14];
+   to[12] = from[3];
+   to[13] = from[7];
+   to[14] = from[11];
+   to[15] = from[15];
+}
+
+/**
+ * Transpose a GLdouble matrix and convert to GLfloat.
+ *
+ * \param to destination array.
+ * \param from source array.
+ */
+void
+_math_transposefd( GLfloat to[16], const GLdouble from[16] )
+{
+   to[0] = (GLfloat) from[0];
+   to[1] = (GLfloat) from[4];
+   to[2] = (GLfloat) from[8];
+   to[3] = (GLfloat) from[12];
+   to[4] = (GLfloat) from[1];
+   to[5] = (GLfloat) from[5];
+   to[6] = (GLfloat) from[9];
+   to[7] = (GLfloat) from[13];
+   to[8] = (GLfloat) from[2];
+   to[9] = (GLfloat) from[6];
+   to[10] = (GLfloat) from[10];
+   to[11] = (GLfloat) from[14];
+   to[12] = (GLfloat) from[3];
+   to[13] = (GLfloat) from[7];
+   to[14] = (GLfloat) from[11];
+   to[15] = (GLfloat) from[15];
+}
+
+/*@}*/
+
diff --git a/reactos/lib/mesa32/src/math/m_matrix.h b/reactos/lib/mesa32/src/math/m_matrix.h
new file mode 100644
index 00000000000..96f5649ee88
--- /dev/null
+++ b/reactos/lib/mesa32/src/math/m_matrix.h
@@ -0,0 +1,248 @@
+/**
+ * \file math/m_matrix.h
+ * Defines basic structures for matrix-handling.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef _M_MATRIX_H
+#define _M_MATRIX_H
+
+
+
+/**
+ * \name Symbolic names to some of the entries in the matrix
+ *
+ * To help out with the rework of the viewport_map as a matrix transform.
+ */
+/*@{*/
+#define MAT_SX 0
+#define MAT_SY 5
+#define MAT_SZ 10
+#define MAT_TX 12
+#define MAT_TY 13
+#define MAT_TZ 14
+/*@}*/
+
+/**
+ * \defgroup MatFlags MAT_FLAG_XXX-flags
+ *
+ * Bitmasks to indicate different kinds of 4x4 matrices in
+ * GLmatrix::flags
+ */
+/*@{*/
+
+#define MAT_FLAG_IDENTITY       0	/**< is an identity matrix flag.
+					 *   (Not actually used - the identity
+					 *   matrix is identified by the absense
+					 /   of all other flags.) */
+#define MAT_FLAG_GENERAL        0x1	/**< is a general matrix flag */
+#define MAT_FLAG_ROTATION       0x2	/**< is a rotation matrix flag */
+#define MAT_FLAG_TRANSLATION    0x4	/**< is a translation matrix flag */
+#define MAT_FLAG_UNIFORM_SCALE  0x8	/**< is an uniform scaling matrix flag */
+#define MAT_FLAG_GENERAL_SCALE  0x10	/**< is a general scaling matrix flag */
+#define MAT_FLAG_GENERAL_3D     0x20	/**< general 3D matrix flag */
+#define MAT_FLAG_PERSPECTIVE    0x40	/**< is a perspective projection matrix flag */
+#define MAT_FLAG_SINGULAR       0x80	/**< is a singular matrix flag */
+#define MAT_DIRTY_TYPE          0x100	/**< matrix type is dirty */
+#define MAT_DIRTY_FLAGS         0x200	/**< matrix flags are dirty */
+#define MAT_DIRTY_INVERSE       0x400	/**< matrix inverse is dirty */
+
+/** angle preserving matrix flags mask */
+#define MAT_FLAGS_ANGLE_PRESERVING (MAT_FLAG_ROTATION | \
+				    MAT_FLAG_TRANSLATION | \
+				    MAT_FLAG_UNIFORM_SCALE)
+
+/** length preserving matrix flags mask */
+#define MAT_FLAGS_LENGTH_PRESERVING (MAT_FLAG_ROTATION | \
+				     MAT_FLAG_TRANSLATION)
+
+/** 3D (non-perspective) matrix flags mask */
+#define MAT_FLAGS_3D (MAT_FLAG_ROTATION | \
+		      MAT_FLAG_TRANSLATION | \
+		      MAT_FLAG_UNIFORM_SCALE | \
+		      MAT_FLAG_GENERAL_SCALE | \
+		      MAT_FLAG_GENERAL_3D)
+
+/** geometry related matrix flags mask */
+#define MAT_FLAGS_GEOMETRY (MAT_FLAG_GENERAL | \
+			    MAT_FLAG_ROTATION | \
+			    MAT_FLAG_TRANSLATION | \
+			    MAT_FLAG_UNIFORM_SCALE | \
+			    MAT_FLAG_GENERAL_SCALE | \
+			    MAT_FLAG_GENERAL_3D | \
+			    MAT_FLAG_PERSPECTIVE | \
+	                    MAT_FLAG_SINGULAR)
+
+/** dirty matrix flags mask */
+#define MAT_DIRTY          (MAT_DIRTY_TYPE | \
+			    MAT_DIRTY_FLAGS | \
+			    MAT_DIRTY_INVERSE)
+
+/*@}*/
+
+
+/** 
+ * Test geometry related matrix flags.
+ * 
+ * \param mat a pointer to a GLmatrix structure.
+ * \param a flags mask.
+ *
+ * \returns non-zero if all geometry related matrix flags are contained within
+ * the mask, or zero otherwise.
+ */ 
+#define TEST_MAT_FLAGS(mat, a)  \
+    ((MAT_FLAGS_GEOMETRY & (~(a)) & ((mat)->flags) ) == 0)
+
+
+/**
+ * Different kinds of 4x4 transformation matrices.
+ */
+enum GLmatrixtype {
+	MATRIX_GENERAL,		/**< general 4x4 matrix */
+	MATRIX_IDENTITY,	/**< identity matrix */
+	MATRIX_3D_NO_ROT,	/**< orthogonal projection and others... */
+	MATRIX_PERSPECTIVE,	/**< perspective projection matrix */
+	MATRIX_2D,		/**< 2-D transformation */
+	MATRIX_2D_NO_ROT,	/**< 2-D scale & translate only */
+	MATRIX_3D		/**< 3-D transformation */
+} ;
+
+/**
+ * Matrix.
+ */
+typedef struct {
+   GLfloat *m;		/**< matrix, 16-byte aligned */
+   GLfloat *inv;	/**< optional inverse, 16-byte aligned */
+   GLuint flags;        /**< possible values determined by (of \link
+			   MatFlags MAT_FLAG_* flags\endlink) */
+   enum GLmatrixtype type;
+} GLmatrix;
+
+
+
+
+extern void
+_math_matrix_ctr( GLmatrix *m );
+
+extern void
+_math_matrix_dtr( GLmatrix *m );
+
+extern void
+_math_matrix_alloc_inv( GLmatrix *m );
+
+extern void
+_math_matrix_mul_matrix( GLmatrix *dest, const GLmatrix *a, const GLmatrix *b );
+
+extern void
+_math_matrix_mul_floats( GLmatrix *dest, const GLfloat *b );
+
+extern void
+_math_matrix_loadf( GLmatrix *mat, const GLfloat *m );
+
+extern void
+_math_matrix_translate( GLmatrix *mat, GLfloat x, GLfloat y, GLfloat z );
+
+extern void
+_math_matrix_rotate( GLmatrix *m, GLfloat angle,
+		     GLfloat x, GLfloat y, GLfloat z );
+
+extern void
+_math_matrix_scale( GLmatrix *mat, GLfloat x, GLfloat y, GLfloat z );
+
+extern void
+_math_matrix_ortho( GLmatrix *mat,
+		    GLfloat left, GLfloat right,
+		    GLfloat bottom, GLfloat top,
+		    GLfloat nearval, GLfloat farval );
+
+extern void
+_math_matrix_frustum( GLmatrix *mat,
+		      GLfloat left, GLfloat right,
+		      GLfloat bottom, GLfloat top,
+		      GLfloat nearval, GLfloat farval );
+
+extern void
+_math_matrix_set_identity( GLmatrix *dest );
+
+extern void
+_math_matrix_copy( GLmatrix *to, const GLmatrix *from );
+
+extern void
+_math_matrix_analyse( GLmatrix *mat );
+
+extern void
+_math_matrix_print( const GLmatrix *m );
+
+
+
+/**
+ * \name Related functions that don't actually operate on GLmatrix structs
+ */
+/*@{*/
+
+extern void
+_math_transposef( GLfloat to[16], const GLfloat from[16] );
+
+extern void
+_math_transposed( GLdouble to[16], const GLdouble from[16] );
+
+extern void
+_math_transposefd( GLfloat to[16], const GLdouble from[16] );
+
+
+/*
+ * Transform a point (column vector) by a matrix:   Q = M * P
+ */
+#define TRANSFORM_POINT( Q, M, P )					\
+   Q[0] = M[0] * P[0] + M[4] * P[1] + M[8] *  P[2] + M[12] * P[3];	\
+   Q[1] = M[1] * P[0] + M[5] * P[1] + M[9] *  P[2] + M[13] * P[3];	\
+   Q[2] = M[2] * P[0] + M[6] * P[1] + M[10] * P[2] + M[14] * P[3];	\
+   Q[3] = M[3] * P[0] + M[7] * P[1] + M[11] * P[2] + M[15] * P[3];
+
+
+#define TRANSFORM_POINT3( Q, M, P )				\
+   Q[0] = M[0] * P[0] + M[4] * P[1] + M[8] *  P[2] + M[12];	\
+   Q[1] = M[1] * P[0] + M[5] * P[1] + M[9] *  P[2] + M[13];	\
+   Q[2] = M[2] * P[0] + M[6] * P[1] + M[10] * P[2] + M[14];	\
+   Q[3] = M[3] * P[0] + M[7] * P[1] + M[11] * P[2] + M[15];
+
+
+/*
+ * Transform a normal (row vector) by a matrix:  [NX NY NZ] = N * MAT
+ */
+#define TRANSFORM_NORMAL( TO, N, MAT )				\
+do {								\
+   TO[0] = N[0] * MAT[0] + N[1] * MAT[1] + N[2] * MAT[2];	\
+   TO[1] = N[0] * MAT[4] + N[1] * MAT[5] + N[2] * MAT[6];	\
+   TO[2] = N[0] * MAT[8] + N[1] * MAT[9] + N[2] * MAT[10];	\
+} while (0)
+
+
+/*@}*/
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/math/m_norm_tmp.h b/reactos/lib/mesa32/src/math/m_norm_tmp.h
new file mode 100644
index 00000000000..a20cb05017d
--- /dev/null
+++ b/reactos/lib/mesa32/src/math/m_norm_tmp.h
@@ -0,0 +1,390 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * New (3.1) transformation code written by Keith Whitwell.
+ */
+
+/* Functions to tranform a vector of normals.  This includes applying
+ * the transformation matrix, rescaling and normalization.
+ */
+
+/*
+ * mat - the 4x4 transformation matrix
+ * scale - uniform scale factor of the transformation matrix (not always used)
+ * in - the source vector of normals
+ * lengths - length of each incoming normal (may be NULL) (a display list
+ *           optimization)
+ * dest - the destination vector of normals
+ */
+static void _XFORMAPI
+TAG(transform_normalize_normals)( const GLmatrix *mat,
+                                  GLfloat scale,
+                                  const GLvector4f *in,
+                                  const GLfloat *lengths,
+                                  GLvector4f *dest )
+{
+   GLfloat (*out)[4] = (GLfloat (*)[4])dest->start;
+   const GLfloat *from = in->start;
+   const GLuint stride = in->stride;
+   const GLuint count = in->count;
+   const GLfloat *m = mat->inv;
+   GLfloat m0 = m[0],  m4 = m[4],  m8 = m[8];
+   GLfloat m1 = m[1],  m5 = m[5],  m9 = m[9];
+   GLfloat m2 = m[2],  m6 = m[6],  m10 = m[10];
+   GLuint i;
+
+   if (!lengths) {
+      STRIDE_LOOP {
+	 GLfloat tx, ty, tz;
+	 {
+	    const GLfloat ux = from[0],  uy = from[1],  uz = from[2];
+	    tx = ux * m0 + uy * m1 + uz * m2;
+	    ty = ux * m4 + uy * m5 + uz * m6;
+	    tz = ux * m8 + uy * m9 + uz * m10;
+	 }
+	 {
+	    GLdouble len = tx*tx + ty*ty + tz*tz;
+	    if (len > 1e-20) {
+	       GLfloat scale = INV_SQRTF(len);
+	       out[i][0] = tx * scale;
+	       out[i][1] = ty * scale;
+	       out[i][2] = tz * scale;
+	    }
+	    else {
+	       out[i][0] = out[i][1] = out[i][2] = 0;
+	    }
+	 }
+      }
+   }
+   else {
+      if (scale != 1.0) {
+	 m0 *= scale,  m4 *= scale,  m8 *= scale;
+	 m1 *= scale,  m5 *= scale,  m9 *= scale;
+	 m2 *= scale,  m6 *= scale,  m10 *= scale;
+      }
+
+      STRIDE_LOOP {
+	 GLfloat tx, ty, tz;
+	 {
+	    const GLfloat ux = from[0],  uy = from[1],  uz = from[2];
+	    tx = ux * m0 + uy * m1 + uz * m2;
+	    ty = ux * m4 + uy * m5 + uz * m6;
+	    tz = ux * m8 + uy * m9 + uz * m10;
+	 }
+	 {
+	    GLfloat len = lengths[i];
+	    out[i][0] = tx * len;
+	    out[i][1] = ty * len;
+	    out[i][2] = tz * len;
+	 }
+      }
+   }
+   dest->count = in->count;
+}
+
+
+static void _XFORMAPI
+TAG(transform_normalize_normals_no_rot)( const GLmatrix *mat,
+                                         GLfloat scale,
+                                         const GLvector4f *in,
+                                         const GLfloat *lengths,
+                                         GLvector4f *dest )
+{
+   GLfloat (*out)[4] = (GLfloat (*)[4])dest->start;
+   const GLfloat *from = in->start;
+   const GLuint stride = in->stride;
+   const GLuint count = in->count;
+   const GLfloat *m = mat->inv;
+   GLfloat m0 = m[0];
+   GLfloat m5 = m[5];
+   GLfloat m10 = m[10];
+   GLuint i;
+
+   if (!lengths) {
+      STRIDE_LOOP {
+	 GLfloat tx, ty, tz;
+	 {
+	    const GLfloat ux = from[0],  uy = from[1],  uz = from[2];
+	    tx = ux * m0                    ;
+	    ty =           uy * m5          ;
+	    tz =                     uz * m10;
+	 }
+	 {
+	    GLdouble len = tx*tx + ty*ty + tz*tz;
+	    if (len > 1e-20) {
+	       GLfloat scale = INV_SQRTF(len);
+	       out[i][0] = tx * scale;
+	       out[i][1] = ty * scale;
+	       out[i][2] = tz * scale;
+	    }
+	    else {
+	       out[i][0] = out[i][1] = out[i][2] = 0;
+	    }
+	 }
+      }
+   }
+   else {
+      m0 *= scale;
+      m5 *= scale;
+      m10 *= scale;
+
+      STRIDE_LOOP {
+	 GLfloat tx, ty, tz;
+	 {
+	    const GLfloat ux = from[0],  uy = from[1],  uz = from[2];
+	    tx = ux * m0                    ;
+	    ty =           uy * m5          ;
+	    tz =                     uz * m10;
+	 }
+	 {
+	    GLfloat len = lengths[i];
+	    out[i][0] = tx * len;
+	    out[i][1] = ty * len;
+	    out[i][2] = tz * len;
+	 }
+      }
+   }
+   dest->count = in->count;
+}
+
+
+static void _XFORMAPI
+TAG(transform_rescale_normals_no_rot)( const GLmatrix *mat,
+                                       GLfloat scale,
+                                       const GLvector4f *in,
+                                       const GLfloat *lengths,
+                                       GLvector4f *dest )
+{
+   GLfloat (*out)[4] = (GLfloat (*)[4])dest->start;
+   const GLfloat *from = in->start;
+   const GLuint stride = in->stride;
+   const GLuint count = in->count;
+   const GLfloat *m = mat->inv;
+   const GLfloat m0 = scale*m[0];
+   const GLfloat m5 = scale*m[5];
+   const GLfloat m10 = scale*m[10];
+   GLuint i;
+
+   (void) lengths;
+
+   STRIDE_LOOP {
+      GLfloat ux = from[0],  uy = from[1],  uz = from[2];
+      out[i][0] = ux * m0;
+      out[i][1] =           uy * m5;
+      out[i][2] =                     uz * m10;
+   }
+   dest->count = in->count;
+}
+
+
+static void _XFORMAPI
+TAG(transform_rescale_normals)( const GLmatrix *mat,
+                                GLfloat scale,
+                                const GLvector4f *in,
+                                const GLfloat *lengths,
+                                GLvector4f *dest )
+{
+   GLfloat (*out)[4] = (GLfloat (*)[4])dest->start;
+   const GLfloat *from = in->start;
+   const GLuint stride = in->stride;
+   const GLuint count = in->count;
+   /* Since we are unlikely to have < 3 vertices in the buffer,
+    * it makes sense to pre-multiply by scale.
+    */
+   const GLfloat *m = mat->inv;
+   const GLfloat m0 = scale*m[0],  m4 = scale*m[4],  m8 = scale*m[8];
+   const GLfloat m1 = scale*m[1],  m5 = scale*m[5],  m9 = scale*m[9];
+   const GLfloat m2 = scale*m[2],  m6 = scale*m[6],  m10 = scale*m[10];
+   GLuint i;
+
+   (void) lengths;
+
+   STRIDE_LOOP {
+      GLfloat ux = from[0],  uy = from[1],  uz = from[2];
+      out[i][0] = ux * m0 + uy * m1 + uz * m2;
+      out[i][1] = ux * m4 + uy * m5 + uz * m6;
+      out[i][2] = ux * m8 + uy * m9 + uz * m10;
+   }
+   dest->count = in->count;
+}
+
+
+static void _XFORMAPI
+TAG(transform_normals_no_rot)( const GLmatrix *mat,
+			       GLfloat scale,
+			       const GLvector4f *in,
+			       const GLfloat *lengths,
+			       GLvector4f *dest )
+{
+   GLfloat (*out)[4] = (GLfloat (*)[4])dest->start;
+   const GLfloat *from = in->start;
+   const GLuint stride = in->stride;
+   const GLuint count = in->count;
+   const GLfloat *m = mat->inv;
+   const GLfloat m0 = m[0];
+   const GLfloat m5 = m[5];
+   const GLfloat m10 = m[10];
+   GLuint i;
+
+   (void) scale;
+   (void) lengths;
+
+   STRIDE_LOOP {
+      GLfloat ux = from[0],  uy = from[1],  uz = from[2];
+      out[i][0] = ux * m0;
+      out[i][1] =           uy * m5;
+      out[i][2] =                     uz * m10;
+   }
+   dest->count = in->count;
+}
+
+
+static void _XFORMAPI
+TAG(transform_normals)( const GLmatrix *mat,
+                        GLfloat scale,
+                        const GLvector4f *in,
+                        const GLfloat *lengths,
+                        GLvector4f *dest )
+{
+   GLfloat (*out)[4] = (GLfloat (*)[4])dest->start;
+   const GLfloat *from = in->start;
+   const GLuint stride = in->stride;
+   const GLuint count = in->count;
+   const GLfloat *m = mat->inv;
+   const GLfloat m0 = m[0],  m4 = m[4],  m8 = m[8];
+   const GLfloat m1 = m[1],  m5 = m[5],  m9 = m[9];
+   const GLfloat m2 = m[2],  m6 = m[6],  m10 = m[10];
+   GLuint i;
+
+   (void) scale;
+   (void) lengths;
+
+   STRIDE_LOOP {
+      GLfloat ux = from[0],  uy = from[1],  uz = from[2];
+      out[i][0] = ux * m0 + uy * m1 + uz * m2;
+      out[i][1] = ux * m4 + uy * m5 + uz * m6;
+      out[i][2] = ux * m8 + uy * m9 + uz * m10;
+   }
+   dest->count = in->count;
+}
+
+
+static void _XFORMAPI
+TAG(normalize_normals)( const GLmatrix *mat,
+                        GLfloat scale,
+                        const GLvector4f *in,
+                        const GLfloat *lengths,
+                        GLvector4f *dest )
+{
+   GLfloat (*out)[4] = (GLfloat (*)[4])dest->start;
+   const GLfloat *from = in->start;
+   const GLuint stride = in->stride;
+   const GLuint count = in->count;
+   GLuint i;
+
+   (void) mat;
+   (void) scale;
+
+   if (lengths) {
+      STRIDE_LOOP {
+	 const GLfloat x = from[0], y = from[1], z = from[2];
+	 GLfloat invlen = lengths[i];
+	 out[i][0] = x * invlen;
+	 out[i][1] = y * invlen;
+	 out[i][2] = z * invlen;
+      }
+   }
+   else {
+      STRIDE_LOOP {
+	 const GLfloat x = from[0], y = from[1], z = from[2];
+	 GLdouble len = x * x + y * y + z * z;
+	 if (len > 1e-50) {
+	    len = INV_SQRTF(len);
+	    out[i][0] = (GLfloat)(x * len);
+	    out[i][1] = (GLfloat)(y * len);
+	    out[i][2] = (GLfloat)(z * len);
+	 }
+	 else {
+	    out[i][0] = x;
+	    out[i][1] = y;
+	    out[i][2] = z;
+	 }
+      }
+   }
+   dest->count = in->count;
+}
+
+
+static void _XFORMAPI
+TAG(rescale_normals)( const GLmatrix *mat,
+                      GLfloat scale,
+                      const GLvector4f *in,
+                      const GLfloat *lengths,
+                      GLvector4f *dest )
+{
+   GLfloat (*out)[4] = (GLfloat (*)[4])dest->start;
+   const GLfloat *from = in->start;
+   const GLuint stride = in->stride;
+   const GLuint count = in->count;
+   GLuint i;
+
+   (void) mat;
+   (void) lengths;
+
+   STRIDE_LOOP {
+      SCALE_SCALAR_3V( out[i], scale, from );
+   }
+   dest->count = in->count;
+}
+
+
+static void _XFORMAPI
+TAG(init_c_norm_transform)( void )
+{
+   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT] =
+      TAG(transform_normals_no_rot);
+
+   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT | NORM_RESCALE] =
+      TAG(transform_rescale_normals_no_rot);
+
+   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT | NORM_NORMALIZE] =
+      TAG(transform_normalize_normals_no_rot);
+
+   _mesa_normal_tab[NORM_TRANSFORM] =
+      TAG(transform_normals);
+
+   _mesa_normal_tab[NORM_TRANSFORM | NORM_RESCALE] =
+      TAG(transform_rescale_normals);
+
+   _mesa_normal_tab[NORM_TRANSFORM | NORM_NORMALIZE] =
+      TAG(transform_normalize_normals);
+
+   _mesa_normal_tab[NORM_RESCALE] =
+      TAG(rescale_normals);
+
+   _mesa_normal_tab[NORM_NORMALIZE] =
+      TAG(normalize_normals);
+}
diff --git a/reactos/lib/mesa32/src/math/m_trans_tmp.h b/reactos/lib/mesa32/src/math/m_trans_tmp.h
new file mode 100644
index 00000000000..c1f0f767436
--- /dev/null
+++ b/reactos/lib/mesa32/src/math/m_trans_tmp.h
@@ -0,0 +1,287 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * New (3.1) transformation code written by Keith Whitwell.
+ */
+
+
+/* KW: This file also included by tnl/trans_elt.c to build code
+ *     specific to the implementation of array-elements in the
+ *     tnl module.
+ */
+
+
+#ifdef DEST_4F
+static void DEST_4F( GLfloat (*t)[4],
+		     CONST void *ptr,
+		     GLuint stride,
+		     ARGS )
+{
+   const GLubyte *f = (GLubyte *) ptr + SRC_START * stride;
+   const GLubyte *first = f;
+   GLuint i;
+
+   (void) first;
+   (void) start;
+   for (i = DST_START ; i < n ; i++, NEXT_F) {
+      CHECK {
+         NEXT_F2;
+	 if (SZ >= 1) t[i][0] = TRX_4F(f, 0);
+	 if (SZ >= 2) t[i][1] = TRX_4F(f, 1);
+	 if (SZ >= 3) t[i][2] = TRX_4F(f, 2);
+	 if (SZ == 4) t[i][3] = TRX_4F(f, 3); else t[i][3] = 1.0;
+      }
+   }
+}
+#endif
+
+
+
+#ifdef DEST_4FC
+static void DEST_4FC( GLfloat (*t)[4],
+		      CONST void *ptr,
+		      GLuint stride,
+		      ARGS )
+{
+   const GLubyte *f = (GLubyte *) ptr + SRC_START * stride;
+   const GLubyte *first = f;
+   GLuint i;
+
+   (void) first;
+   (void) start;
+   for (i = DST_START ; i < n ; i++, NEXT_F) {
+      CHECK {
+         NEXT_F2;
+	 if (SZ >= 1) t[i][0] = TRX_4FC(f, 0);
+	 if (SZ >= 2) t[i][1] = TRX_4FC(f, 1);
+	 if (SZ >= 3) t[i][2] = TRX_4FC(f, 2);
+	 if (SZ == 4) t[i][3] = TRX_4FC(f, 3); else t[i][3] = 1.0;
+      }
+   }
+}
+#endif
+
+
+#ifdef DEST_3F
+static void DEST_3F( GLfloat (*t)[3],
+		     CONST void *ptr,
+		     GLuint stride,
+		     ARGS )
+{
+   const GLubyte *f = (GLubyte *) ptr + SRC_START * stride;
+   const GLubyte *first = f;
+   GLuint i;
+   (void) first;
+   (void) start;
+   for (i = DST_START ; i < n ; i++, NEXT_F) {
+      CHECK {
+         NEXT_F2;
+	 t[i][0] = TRX_3F(f, 0);
+	 t[i][1] = TRX_3F(f, 1);
+	 t[i][2] = TRX_3F(f, 2);
+      }
+   }
+}
+#endif
+
+#ifdef DEST_1F
+static void DEST_1F( GLfloat *t,
+		     CONST void *ptr,
+		     GLuint stride,
+		     ARGS )
+{
+   const GLubyte *f = (GLubyte *) ptr + SRC_START * stride;
+   const GLubyte *first = f;
+   GLuint i;
+   (void) first;
+   (void) start;
+   for (i = DST_START ; i < n ; i++, NEXT_F) {
+      CHECK {
+         NEXT_F2;
+	 t[i] = TRX_1F(f, 0);
+      }
+   }
+}
+#endif
+
+#ifdef DEST_4UB
+static void DEST_4UB( GLubyte (*t)[4],
+                      CONST void *ptr,
+                      GLuint stride,
+                      ARGS )
+{
+   const GLubyte *f = (GLubyte *) ptr + SRC_START * stride;
+   const GLubyte *first = f;
+   GLuint i;
+   (void) start;
+   (void) first;
+   for (i = DST_START ; i < n ; i++, NEXT_F) {
+      CHECK {
+         NEXT_F2;
+	 if (SZ >= 1) TRX_UB(t[i][0], f, 0);
+	 if (SZ >= 2) TRX_UB(t[i][1], f, 1);
+	 if (SZ >= 3) TRX_UB(t[i][2], f, 2);
+	 if (SZ == 4) TRX_UB(t[i][3], f, 3); else t[i][3] = 255;
+      }
+   }
+}
+#endif
+
+
+#ifdef DEST_4US
+static void DEST_4US( GLushort (*t)[4],
+                      CONST void *ptr,
+                      GLuint stride,
+                      ARGS )
+{
+   const GLubyte *f = (GLubyte *) ((GLubyte *) ptr + SRC_START * stride);
+   const GLubyte *first = f;
+   GLuint i;
+   (void) start;
+   (void) first;
+   for (i = DST_START ; i < n ; i++, NEXT_F) {
+      CHECK {
+         NEXT_F2;
+	 if (SZ >= 1) TRX_US(t[i][0], f, 0);
+	 if (SZ >= 2) TRX_US(t[i][1], f, 1);
+	 if (SZ >= 3) TRX_US(t[i][2], f, 2);
+	 if (SZ == 4) TRX_US(t[i][3], f, 3); else t[i][3] = 65535;
+      }
+   }
+}
+#endif
+
+
+#ifdef DEST_1UB
+static void DEST_1UB( GLubyte *t,
+		      CONST void *ptr,
+		      GLuint stride,
+		      ARGS )
+{
+   const GLubyte *f = (GLubyte *) ptr + SRC_START * stride;
+   const GLubyte *first = f;
+   GLuint i;
+   (void) start;
+   (void) first;
+   for (i = DST_START ; i < n ; i++, NEXT_F) {
+      CHECK {
+         NEXT_F2;
+	  TRX_UB(t[i], f, 0);
+      }
+   }
+}
+#endif
+
+
+#ifdef DEST_1UI
+static void DEST_1UI( GLuint *t,
+		      CONST void *ptr,
+		      GLuint stride,
+		      ARGS )
+{
+   const GLubyte *f = (GLubyte *) ptr + SRC_START * stride;
+   const GLubyte *first = f;
+   GLuint i;
+   (void) start;
+   (void) first;
+
+   for (i = DST_START ; i < n ; i++, NEXT_F) {
+      CHECK {
+         NEXT_F2;
+	 t[i] = TRX_UI(f, 0);
+      }
+   }
+}
+#endif
+
+
+static void INIT(void)
+{
+#ifdef DEST_1UI
+   ASSERT(SZ == 1);
+   TAB(_1ui)[SRC_IDX] = DEST_1UI;
+#endif
+#ifdef DEST_1UB
+   ASSERT(SZ == 1);
+   TAB(_1ub)[SRC_IDX] = DEST_1UB;
+#endif
+#ifdef DEST_1F
+   ASSERT(SZ == 1);
+   TAB(_1f)[SRC_IDX] = DEST_1F;
+#endif
+#ifdef DEST_3F
+   ASSERT(SZ == 3);
+   TAB(_3f)[SRC_IDX] = DEST_3F;
+#endif
+#ifdef DEST_4UB
+   TAB(_4ub)[SZ][SRC_IDX] = DEST_4UB;
+#endif
+#ifdef DEST_4US
+   TAB(_4us)[SZ][SRC_IDX] = DEST_4US;
+#endif
+#ifdef DEST_4F
+   TAB(_4f)[SZ][SRC_IDX] = DEST_4F;
+#endif
+#ifdef DEST_4FC
+   TAB(_4fc)[SZ][SRC_IDX] = DEST_4FC;
+#endif
+
+}
+
+
+#ifdef INIT
+#undef INIT
+#endif
+#ifdef DEST_1UI
+#undef DEST_1UI
+#endif
+#ifdef DEST_1UB
+#undef DEST_1UB
+#endif
+#ifdef DEST_4UB
+#undef DEST_4UB
+#endif
+#ifdef DEST_4US
+#undef DEST_4US
+#endif
+#ifdef DEST_3F
+#undef DEST_3F
+#endif
+#ifdef DEST_4F
+#undef DEST_4F
+#endif
+#ifdef DEST_4FC
+#undef DEST_4FC
+#endif
+#ifdef DEST_1F
+#undef DEST_1F
+#endif
+#ifdef SZ
+#undef SZ
+#endif
+#ifdef TAG
+#undef TAG
+#endif
+
diff --git a/reactos/lib/mesa32/src/math/m_translate.c b/reactos/lib/mesa32/src/math/m_translate.c
new file mode 100644
index 00000000000..14beabb978d
--- /dev/null
+++ b/reactos/lib/mesa32/src/math/m_translate.c
@@ -0,0 +1,718 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * New (3.1) transformation code written by Keith Whitwell.
+ */
+
+
+#include "glheader.h"
+#include "mtypes.h"		/* GLchan hack */
+#include "colormac.h"
+
+#include "m_translate.h"
+
+
+
+typedef void (*trans_1f_func)(GLfloat *to,
+			      CONST void *ptr,
+			      GLuint stride,
+			      GLuint start,
+			      GLuint n );
+
+typedef void (*trans_1ui_func)(GLuint *to,
+			       CONST void *ptr,
+			       GLuint stride,
+			       GLuint start,
+			       GLuint n );
+
+typedef void (*trans_1ub_func)(GLubyte *to,
+			       CONST void *ptr,
+			       GLuint stride,
+			       GLuint start,
+			       GLuint n );
+
+typedef void (*trans_4ub_func)(GLubyte (*to)[4],
+                               CONST void *ptr,
+                               GLuint stride,
+                               GLuint start,
+                               GLuint n );
+
+typedef void (*trans_4us_func)(GLushort (*to)[4],
+                               CONST void *ptr,
+                               GLuint stride,
+                               GLuint start,
+                               GLuint n );
+
+typedef void (*trans_4f_func)(GLfloat (*to)[4],
+			      CONST void *ptr,
+			      GLuint stride,
+			      GLuint start,
+			      GLuint n );
+
+typedef void (*trans_3f_func)(GLfloat (*to)[3],
+			      CONST void *ptr,
+			      GLuint stride,
+			      GLuint start,
+			      GLuint n );
+
+
+
+
+#define TYPE_IDX(t) ((t) & 0xf)
+#define MAX_TYPES TYPE_IDX(GL_DOUBLE)+1      /* 0xa + 1 */
+
+
+/* This macro is used on other systems, so undefine it for this module */
+
+#undef	CHECK
+
+static trans_1f_func  _math_trans_1f_tab[MAX_TYPES];
+static trans_1ui_func _math_trans_1ui_tab[MAX_TYPES];
+static trans_1ub_func _math_trans_1ub_tab[MAX_TYPES];
+static trans_3f_func  _math_trans_3f_tab[MAX_TYPES];
+static trans_4ub_func _math_trans_4ub_tab[5][MAX_TYPES];
+static trans_4us_func _math_trans_4us_tab[5][MAX_TYPES];
+static trans_4f_func  _math_trans_4f_tab[5][MAX_TYPES];
+static trans_4f_func  _math_trans_4fc_tab[5][MAX_TYPES];
+
+
+#define PTR_ELT(ptr, elt) (((SRC *)ptr)[elt])
+
+
+#define TAB(x) _math_trans##x##_tab
+#define ARGS   GLuint start, GLuint n
+#define SRC_START  start
+#define DST_START  0
+#define STRIDE stride
+#define NEXT_F f += stride
+#define NEXT_F2
+#define CHECK
+
+
+
+
+/* GL_BYTE
+ */
+#define SRC GLbyte
+#define SRC_IDX TYPE_IDX(GL_BYTE)
+#define TRX_3F(f,n)   BYTE_TO_FLOAT( PTR_ELT(f,n) )
+#define TRX_4F(f,n)   BYTE_TO_FLOAT( PTR_ELT(f,n) )
+#define TRX_4FC(f,n)   BYTE_TO_FLOAT( PTR_ELT(f,n) )
+#define TRX_UB(ub, f,n)  ub = BYTE_TO_UBYTE( PTR_ELT(f,n) )
+#define TRX_US(ch, f,n)  ch = BYTE_TO_USHORT( PTR_ELT(f,n) )
+#define TRX_UI(f,n)  (PTR_ELT(f,n) < 0 ? 0 : (GLuint)  PTR_ELT(f,n))
+
+
+#define SZ 4
+#define INIT init_trans_4_GLbyte_raw
+#define DEST_4F trans_4_GLbyte_4f_raw
+#define DEST_4FC trans_4_GLbyte_4fc_raw
+#define DEST_4UB trans_4_GLbyte_4ub_raw
+#define DEST_4US trans_4_GLbyte_4us_raw
+#include "m_trans_tmp.h"
+
+#define SZ 3
+#define INIT init_trans_3_GLbyte_raw
+#define DEST_4F trans_3_GLbyte_4f_raw
+#define DEST_4FC trans_3_GLbyte_4fc_raw
+#define DEST_4UB trans_3_GLbyte_4ub_raw
+#define DEST_4US trans_3_GLbyte_4us_raw
+#define DEST_3F trans_3_GLbyte_3f_raw
+#include "m_trans_tmp.h"
+
+#define SZ 2
+#define INIT init_trans_2_GLbyte_raw
+#define DEST_4F trans_2_GLbyte_4f_raw
+#define DEST_4FC trans_2_GLbyte_4fc_raw
+#include "m_trans_tmp.h"
+
+#define SZ 1
+#define INIT init_trans_1_GLbyte_raw
+#define DEST_4F trans_1_GLbyte_4f_raw
+#define DEST_4FC trans_1_GLbyte_4fc_raw
+#define DEST_1UB trans_1_GLbyte_1ub_raw
+#define DEST_1UI trans_1_GLbyte_1ui_raw
+#include "m_trans_tmp.h"
+
+#undef SRC
+#undef TRX_3F
+#undef TRX_4F
+#undef TRX_4FC
+#undef TRX_UB
+#undef TRX_US
+#undef TRX_UI
+#undef SRC_IDX
+
+
+/* GL_UNSIGNED_BYTE
+ */
+#define SRC GLubyte
+#define SRC_IDX TYPE_IDX(GL_UNSIGNED_BYTE)
+#define TRX_3F(f,n)	     UBYTE_TO_FLOAT(PTR_ELT(f,n))
+#define TRX_4F(f,n)	     UBYTE_TO_FLOAT(PTR_ELT(f,n))
+#define TRX_4FC(f,n)	     UBYTE_TO_FLOAT(PTR_ELT(f,n))
+#define TRX_UB(ub, f,n)	     ub = PTR_ELT(f,n)
+#define TRX_US(us, f,n)      us = UBYTE_TO_USHORT(PTR_ELT(f,n))
+#define TRX_UI(f,n)          (GLuint)PTR_ELT(f,n)
+
+/* 4ub->4ub handled in special case below.
+ */
+#define SZ 4
+#define INIT init_trans_4_GLubyte_raw
+#define DEST_4F trans_4_GLubyte_4f_raw
+#define DEST_4FC trans_4_GLubyte_4fc_raw
+#define DEST_4US trans_4_GLubyte_4us_raw
+#include "m_trans_tmp.h"
+
+
+#define SZ 3
+#define INIT init_trans_3_GLubyte_raw
+#define DEST_4UB trans_3_GLubyte_4ub_raw
+#define DEST_4US trans_3_GLubyte_4us_raw
+#define DEST_3F trans_3_GLubyte_3f_raw
+#define DEST_4F trans_3_GLubyte_4f_raw
+#define DEST_4FC trans_3_GLubyte_4fc_raw
+#include "m_trans_tmp.h"
+
+
+#define SZ 1
+#define INIT init_trans_1_GLubyte_raw
+#define DEST_1UI trans_1_GLubyte_1ui_raw
+#define DEST_1UB trans_1_GLubyte_1ub_raw
+#include "m_trans_tmp.h"
+
+#undef SRC
+#undef SRC_IDX
+#undef TRX_3F
+#undef TRX_4F
+#undef TRX_4FC
+#undef TRX_UB
+#undef TRX_US
+#undef TRX_UI
+
+
+/* GL_SHORT
+ */
+#define SRC GLshort
+#define SRC_IDX TYPE_IDX(GL_SHORT)
+#define TRX_3F(f,n)   SHORT_TO_FLOAT( PTR_ELT(f,n) )
+#define TRX_4F(f,n)   (GLfloat)( PTR_ELT(f,n) )
+#define TRX_4FC(f,n)   (GLfloat)( PTR_ELT(f,n) )
+#define TRX_UB(ub, f,n)  ub = SHORT_TO_UBYTE(PTR_ELT(f,n))
+#define TRX_US(us, f,n)  us = SHORT_TO_USHORT(PTR_ELT(f,n))
+#define TRX_UI(f,n)  (PTR_ELT(f,n) < 0 ? 0 : (GLuint)  PTR_ELT(f,n))
+
+
+#define SZ  4
+#define INIT init_trans_4_GLshort_raw
+#define DEST_4F trans_4_GLshort_4f_raw
+#define DEST_4FC trans_4_GLshort_4fc_raw
+#define DEST_4UB trans_4_GLshort_4ub_raw
+#define DEST_4US trans_4_GLshort_4us_raw
+#include "m_trans_tmp.h"
+
+#define SZ 3
+#define INIT init_trans_3_GLshort_raw
+#define DEST_4F trans_3_GLshort_4f_raw
+#define DEST_4FC trans_3_GLshort_4fc_raw
+#define DEST_4UB trans_3_GLshort_4ub_raw
+#define DEST_4US trans_3_GLshort_4us_raw
+#define DEST_3F trans_3_GLshort_3f_raw
+#include "m_trans_tmp.h"
+
+#define SZ 2
+#define INIT init_trans_2_GLshort_raw
+#define DEST_4F trans_2_GLshort_4f_raw
+#define DEST_4FC trans_2_GLshort_4fc_raw
+#include "m_trans_tmp.h"
+
+#define SZ 1
+#define INIT init_trans_1_GLshort_raw
+#define DEST_4F trans_1_GLshort_4f_raw
+#define DEST_4FC trans_1_GLshort_4fc_raw
+#define DEST_1UB trans_1_GLshort_1ub_raw
+#define DEST_1UI trans_1_GLshort_1ui_raw
+#include "m_trans_tmp.h"
+
+
+#undef SRC
+#undef SRC_IDX
+#undef TRX_3F
+#undef TRX_4F
+#undef TRX_4FC
+#undef TRX_UB
+#undef TRX_US
+#undef TRX_UI
+
+
+/* GL_UNSIGNED_SHORT
+ */
+#define SRC GLushort
+#define SRC_IDX TYPE_IDX(GL_UNSIGNED_SHORT)
+#define TRX_3F(f,n)   USHORT_TO_FLOAT( PTR_ELT(f,n) )
+#define TRX_4F(f,n)   (GLfloat)( PTR_ELT(f,n) )
+#define TRX_4FC(f,n)   (GLfloat)( PTR_ELT(f,n) )
+#define TRX_UB(ub,f,n)  ub = (GLubyte) (PTR_ELT(f,n) >> 8)
+#define TRX_US(us,f,n)  us = (GLushort) (PTR_ELT(f,n) >> 8)
+#define TRX_UI(f,n)  (GLuint)   PTR_ELT(f,n)
+
+
+#define SZ 4
+#define INIT init_trans_4_GLushort_raw
+#define DEST_4F trans_4_GLushort_4f_raw
+#define DEST_4FC trans_4_GLushort_4fc_raw
+#define DEST_4UB trans_4_GLushort_4ub_raw
+#define DEST_4US trans_4_GLushort_4us_raw
+#include "m_trans_tmp.h"
+
+#define SZ 3
+#define INIT init_trans_3_GLushort_raw
+#define DEST_4F trans_3_GLushort_4f_raw
+#define DEST_4FC trans_3_GLushort_4fc_raw
+#define DEST_4UB trans_3_GLushort_4ub_raw
+#define DEST_4US trans_3_GLushort_4us_raw
+#define DEST_3F trans_3_GLushort_3f_raw
+#include "m_trans_tmp.h"
+
+#define SZ 2
+#define INIT init_trans_2_GLushort_raw
+#define DEST_4F trans_2_GLushort_4f_raw
+#define DEST_4FC trans_2_GLushort_4fc_raw
+#include "m_trans_tmp.h"
+
+#define SZ 1
+#define INIT init_trans_1_GLushort_raw
+#define DEST_4F trans_1_GLushort_4f_raw
+#define DEST_4FC trans_1_GLushort_4fc_raw
+#define DEST_1UB trans_1_GLushort_1ub_raw
+#define DEST_1UI trans_1_GLushort_1ui_raw
+#include "m_trans_tmp.h"
+
+#undef SRC
+#undef SRC_IDX
+#undef TRX_3F
+#undef TRX_4F
+#undef TRX_4FC
+#undef TRX_UB
+#undef TRX_US
+#undef TRX_UI
+
+
+/* GL_INT
+ */
+#define SRC GLint
+#define SRC_IDX TYPE_IDX(GL_INT)
+#define TRX_3F(f,n)   INT_TO_FLOAT( PTR_ELT(f,n) )
+#define TRX_4F(f,n)   (GLfloat)( PTR_ELT(f,n) )
+#define TRX_4FC(f,n)   (GLfloat)( PTR_ELT(f,n) )
+#define TRX_UB(ub, f,n)  ub = INT_TO_UBYTE(PTR_ELT(f,n))
+#define TRX_US(us, f,n)  us = INT_TO_USHORT(PTR_ELT(f,n))
+#define TRX_UI(f,n)  (PTR_ELT(f,n) < 0 ? 0 : (GLuint)  PTR_ELT(f,n))
+
+
+#define SZ 4
+#define INIT init_trans_4_GLint_raw
+#define DEST_4F trans_4_GLint_4f_raw
+#define DEST_4FC trans_4_GLint_4fc_raw
+#define DEST_4UB trans_4_GLint_4ub_raw
+#define DEST_4US trans_4_GLint_4us_raw
+#include "m_trans_tmp.h"
+
+#define SZ 3
+#define INIT init_trans_3_GLint_raw
+#define DEST_4F trans_3_GLint_4f_raw
+#define DEST_4FC trans_3_GLint_4fc_raw
+#define DEST_4UB trans_3_GLint_4ub_raw
+#define DEST_4US trans_3_GLint_4us_raw
+#define DEST_3F trans_3_GLint_3f_raw
+#include "m_trans_tmp.h"
+
+#define SZ 2
+#define INIT init_trans_2_GLint_raw
+#define DEST_4F trans_2_GLint_4f_raw
+#define DEST_4FC trans_2_GLint_4fc_raw
+#include "m_trans_tmp.h"
+
+#define SZ 1
+#define INIT init_trans_1_GLint_raw
+#define DEST_4F trans_1_GLint_4f_raw
+#define DEST_4FC trans_1_GLint_4fc_raw
+#define DEST_1UB trans_1_GLint_1ub_raw
+#define DEST_1UI trans_1_GLint_1ui_raw
+#include "m_trans_tmp.h"
+
+
+#undef SRC
+#undef SRC_IDX
+#undef TRX_3F
+#undef TRX_4F
+#undef TRX_4FC
+#undef TRX_UB
+#undef TRX_US
+#undef TRX_UI
+
+
+/* GL_UNSIGNED_INT
+ */
+#define SRC GLuint
+#define SRC_IDX TYPE_IDX(GL_UNSIGNED_INT)
+#define TRX_3F(f,n)   INT_TO_FLOAT( PTR_ELT(f,n) )
+#define TRX_4F(f,n)   (GLfloat)( PTR_ELT(f,n) )
+#define TRX_4FC(f,n)   (GLfloat)( PTR_ELT(f,n) )
+#define TRX_UB(ub, f,n)  ub = (GLubyte) (PTR_ELT(f,n) >> 24)
+#define TRX_US(us, f,n)  us = (GLshort) (PTR_ELT(f,n) >> 16)
+#define TRX_UI(f,n)		PTR_ELT(f,n)
+
+
+#define SZ 4
+#define INIT init_trans_4_GLuint_raw
+#define DEST_4F trans_4_GLuint_4f_raw
+#define DEST_4FC trans_4_GLuint_4fc_raw
+#define DEST_4UB trans_4_GLuint_4ub_raw
+#define DEST_4US trans_4_GLuint_4us_raw
+#include "m_trans_tmp.h"
+
+#define SZ 3
+#define INIT init_trans_3_GLuint_raw
+#define DEST_4F trans_3_GLuint_4f_raw
+#define DEST_4FC trans_3_GLuint_4fc_raw
+#define DEST_4UB trans_3_GLuint_4ub_raw
+#define DEST_4US trans_3_GLuint_4us_raw
+#define DEST_3F trans_3_GLuint_3f_raw
+#include "m_trans_tmp.h"
+
+#define SZ 2
+#define INIT init_trans_2_GLuint_raw
+#define DEST_4F trans_2_GLuint_4f_raw
+#define DEST_4FC trans_2_GLuint_4fc_raw
+#include "m_trans_tmp.h"
+
+#define SZ 1
+#define INIT init_trans_1_GLuint_raw
+#define DEST_4F trans_1_GLuint_4f_raw
+#define DEST_4FC trans_1_GLuint_4fc_raw
+#define DEST_1UB trans_1_GLuint_1ub_raw
+#define DEST_1UI trans_1_GLuint_1ui_raw
+#include "m_trans_tmp.h"
+
+#undef SRC
+#undef SRC_IDX
+#undef TRX_3F
+#undef TRX_4F
+#undef TRX_4FC
+#undef TRX_UB
+#undef TRX_US
+#undef TRX_UI
+
+
+/* GL_DOUBLE
+ */
+#define SRC GLdouble
+#define SRC_IDX TYPE_IDX(GL_DOUBLE)
+#define TRX_3F(f,n)   (GLfloat) PTR_ELT(f,n)
+#define TRX_4F(f,n)   (GLfloat) PTR_ELT(f,n)
+#define TRX_4FC(f,n)   (GLfloat) PTR_ELT(f,n)
+#define TRX_UB(ub,f,n) UNCLAMPED_FLOAT_TO_UBYTE(ub, PTR_ELT(f,n))
+#define TRX_US(us,f,n) UNCLAMPED_FLOAT_TO_USHORT(us, PTR_ELT(f,n))
+#define TRX_UI(f,n)  (GLuint) (GLint) PTR_ELT(f,n)
+#define TRX_1F(f,n)   (GLfloat) PTR_ELT(f,n)
+
+
+#define SZ 4
+#define INIT init_trans_4_GLdouble_raw
+#define DEST_4F trans_4_GLdouble_4f_raw
+#define DEST_4FC trans_4_GLdouble_4fc_raw
+#define DEST_4UB trans_4_GLdouble_4ub_raw
+#define DEST_4US trans_4_GLdouble_4us_raw
+#include "m_trans_tmp.h"
+
+#define SZ 3
+#define INIT init_trans_3_GLdouble_raw
+#define DEST_4F trans_3_GLdouble_4f_raw
+#define DEST_4FC trans_3_GLdouble_4fc_raw
+#define DEST_4UB trans_3_GLdouble_4ub_raw
+#define DEST_4US trans_3_GLdouble_4us_raw
+#define DEST_3F trans_3_GLdouble_3f_raw
+#include "m_trans_tmp.h"
+
+#define SZ 2
+#define INIT init_trans_2_GLdouble_raw
+#define DEST_4F trans_2_GLdouble_4f_raw
+#define DEST_4FC trans_2_GLdouble_4fc_raw
+#include "m_trans_tmp.h"
+
+#define SZ 1
+#define INIT init_trans_1_GLdouble_raw
+#define DEST_4F trans_1_GLdouble_4f_raw
+#define DEST_4FC trans_1_GLdouble_4fc_raw
+#define DEST_1UB trans_1_GLdouble_1ub_raw
+#define DEST_1UI trans_1_GLdouble_1ui_raw
+#define DEST_1F trans_1_GLdouble_1f_raw
+#include "m_trans_tmp.h"
+
+#undef SRC
+#undef SRC_IDX
+
+/* GL_FLOAT
+ */
+#define SRC GLfloat
+#define SRC_IDX TYPE_IDX(GL_FLOAT)
+#define SZ 4
+#define INIT init_trans_4_GLfloat_raw
+#define DEST_4UB trans_4_GLfloat_4ub_raw
+#define DEST_4US trans_4_GLfloat_4us_raw
+#define DEST_4F  trans_4_GLfloat_4f_raw
+#define DEST_4FC  trans_4_GLfloat_4fc_raw
+#include "m_trans_tmp.h"
+
+#define SZ 3
+#define INIT init_trans_3_GLfloat_raw
+#define DEST_4F  trans_3_GLfloat_4f_raw
+#define DEST_4FC  trans_3_GLfloat_4fc_raw
+#define DEST_4UB trans_3_GLfloat_4ub_raw
+#define DEST_4US trans_3_GLfloat_4us_raw
+#define DEST_3F trans_3_GLfloat_3f_raw
+#include "m_trans_tmp.h"
+
+#define SZ 2
+#define INIT init_trans_2_GLfloat_raw
+#define DEST_4F trans_2_GLfloat_4f_raw
+#define DEST_4FC trans_2_GLfloat_4fc_raw
+#include "m_trans_tmp.h"
+
+#define SZ 1
+#define INIT init_trans_1_GLfloat_raw
+#define DEST_4F  trans_1_GLfloat_4f_raw
+#define DEST_4FC  trans_1_GLfloat_4fc_raw
+#define DEST_1UB trans_1_GLfloat_1ub_raw
+#define DEST_1UI trans_1_GLfloat_1ui_raw
+#define DEST_1F trans_1_GLfloat_1f_raw
+
+#include "m_trans_tmp.h"
+
+#undef SRC
+#undef SRC_IDX
+#undef TRX_3F
+#undef TRX_4F
+#undef TRX_4FC
+#undef TRX_UB
+#undef TRX_US
+#undef TRX_UI
+
+
+static void trans_4_GLubyte_4ub_raw(GLubyte (*t)[4],
+				    CONST void *Ptr,
+				    GLuint stride,
+				    ARGS )
+{
+   const GLubyte *f = (GLubyte *) Ptr + SRC_START * stride;
+   GLuint i;
+
+   if (((((long) f | (long) stride)) & 3L) == 0L) {
+      /* Aligned.
+       */
+      for (i = DST_START ; i < n ; i++, f += stride) {
+	 COPY_4UBV( t[i], f );
+      }
+   } else {
+      for (i = DST_START ; i < n ; i++, f += stride) {
+	 t[i][0] = f[0];
+	 t[i][1] = f[1];
+	 t[i][2] = f[2];
+	 t[i][3] = f[3];
+      }
+   }
+}
+
+
+static void init_translate_raw(void)
+{
+   MEMSET( TAB(_1ui), 0, sizeof(TAB(_1ui)) );
+   MEMSET( TAB(_1ub), 0, sizeof(TAB(_1ub)) );
+   MEMSET( TAB(_3f),  0, sizeof(TAB(_3f)) );
+   MEMSET( TAB(_4ub), 0, sizeof(TAB(_4ub)) );
+   MEMSET( TAB(_4us), 0, sizeof(TAB(_4us)) );
+   MEMSET( TAB(_4f),  0, sizeof(TAB(_4f)) );
+   MEMSET( TAB(_4fc),  0, sizeof(TAB(_4fc)) );
+
+   init_trans_4_GLbyte_raw();
+   init_trans_3_GLbyte_raw();
+   init_trans_2_GLbyte_raw();
+   init_trans_1_GLbyte_raw();
+   init_trans_1_GLubyte_raw();
+   init_trans_3_GLubyte_raw();
+   init_trans_4_GLubyte_raw();
+   init_trans_4_GLshort_raw();
+   init_trans_3_GLshort_raw();
+   init_trans_2_GLshort_raw();
+   init_trans_1_GLshort_raw();
+   init_trans_4_GLushort_raw();
+   init_trans_3_GLushort_raw();
+   init_trans_2_GLushort_raw();
+   init_trans_1_GLushort_raw();
+   init_trans_4_GLint_raw();
+   init_trans_3_GLint_raw();
+   init_trans_2_GLint_raw();
+   init_trans_1_GLint_raw();
+   init_trans_4_GLuint_raw();
+   init_trans_3_GLuint_raw();
+   init_trans_2_GLuint_raw();
+   init_trans_1_GLuint_raw();
+   init_trans_4_GLdouble_raw();
+   init_trans_3_GLdouble_raw();
+   init_trans_2_GLdouble_raw();
+   init_trans_1_GLdouble_raw();
+   init_trans_4_GLfloat_raw();
+   init_trans_3_GLfloat_raw();
+   init_trans_2_GLfloat_raw();
+   init_trans_1_GLfloat_raw();
+
+   TAB(_4ub)[4][TYPE_IDX(GL_UNSIGNED_BYTE)] = trans_4_GLubyte_4ub_raw;
+}
+
+
+#undef TAB
+#ifdef CLASS
+#undef CLASS
+#endif
+#undef ARGS
+#undef CHECK
+#undef SRC_START
+#undef DST_START
+#undef NEXT_F
+#undef NEXT_F2
+
+
+
+
+
+void _math_init_translate( void )
+{
+   init_translate_raw();
+}
+
+
+
+void _math_trans_1f(GLfloat *to,
+		    CONST void *ptr,
+		    GLuint stride,
+		    GLenum type,
+		    GLuint start,
+		    GLuint n )
+{
+   _math_trans_1f_tab[TYPE_IDX(type)]( to, ptr, stride, start, n );
+}
+
+void _math_trans_1ui(GLuint *to,
+		     CONST void *ptr,
+		     GLuint stride,
+		     GLenum type,
+		     GLuint start,
+		     GLuint n )
+{
+   _math_trans_1ui_tab[TYPE_IDX(type)]( to, ptr, stride, start, n );
+}
+
+void _math_trans_1ub(GLubyte *to,
+		     CONST void *ptr,
+		     GLuint stride,
+		     GLenum type,
+		     GLuint start,
+		     GLuint n )
+{
+   _math_trans_1ub_tab[TYPE_IDX(type)]( to, ptr, stride, start, n );
+}
+
+
+void _math_trans_4ub(GLubyte (*to)[4],
+		     CONST void *ptr,
+		     GLuint stride,
+		     GLenum type,
+		     GLuint size,
+		     GLuint start,
+		     GLuint n )
+{
+   _math_trans_4ub_tab[size][TYPE_IDX(type)]( to, ptr, stride, start, n );
+}
+
+void _math_trans_4chan( GLchan (*to)[4],
+			CONST void *ptr,
+			GLuint stride,
+			GLenum type,
+			GLuint size,
+			GLuint start,
+			GLuint n )
+{
+#if CHAN_TYPE == GL_UNSIGNED_BYTE
+   _math_trans_4ub( to, ptr, stride, type, size, start, n );
+#elif CHAN_TYPE == GL_UNSIGNED_SHORT
+   _math_trans_4us( to, ptr, stride, type, size, start, n );
+#elif CHAN_TYPE == GL_FLOAT
+   _math_trans_4fc( to, ptr, stride, type, size, start, n );
+#endif
+}
+
+void _math_trans_4us(GLushort (*to)[4],
+		     CONST void *ptr,
+		     GLuint stride,
+		     GLenum type,
+		     GLuint size,
+		     GLuint start,
+		     GLuint n )
+{
+   _math_trans_4us_tab[size][TYPE_IDX(type)]( to, ptr, stride, start, n );
+}
+
+void _math_trans_4f(GLfloat (*to)[4],
+		    CONST void *ptr,
+		    GLuint stride,
+		    GLenum type,
+		    GLuint size,
+		    GLuint start,
+		    GLuint n )
+{
+   _math_trans_4f_tab[size][TYPE_IDX(type)]( to, ptr, stride, start, n );
+}
+
+void _math_trans_4fc(GLfloat (*to)[4],
+		    CONST void *ptr,
+		    GLuint stride,
+		    GLenum type,
+		    GLuint size,
+		    GLuint start,
+		    GLuint n )
+{
+   _math_trans_4fc_tab[size][TYPE_IDX(type)]( to, ptr, stride, start, n );
+}
+
+void _math_trans_3f(GLfloat (*to)[3],
+		    CONST void *ptr,
+		    GLuint stride,
+		    GLenum type,
+		    GLuint start,
+		    GLuint n )
+{
+   _math_trans_3f_tab[TYPE_IDX(type)]( to, ptr, stride, start, n );
+}
diff --git a/reactos/lib/mesa32/src/math/m_translate.h b/reactos/lib/mesa32/src/math/m_translate.h
new file mode 100644
index 00000000000..527c7063d63
--- /dev/null
+++ b/reactos/lib/mesa32/src/math/m_translate.h
@@ -0,0 +1,106 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef _M_TRANSLATE_H_
+#define _M_TRANSLATE_H_
+
+#include "config.h"
+#include "mtypes.h"		/* hack for GLchan */
+
+
+
+extern void _math_trans_1f(GLfloat *to,
+			   CONST void *ptr,
+			   GLuint stride,
+			   GLenum type,
+			   GLuint start,
+			   GLuint n );
+
+extern void _math_trans_1ui(GLuint *to,
+			    CONST void *ptr,
+			    GLuint stride,
+			    GLenum type,
+			    GLuint start,
+			    GLuint n );
+
+extern void _math_trans_1ub(GLubyte *to,
+			    CONST void *ptr,
+			    GLuint stride,
+			    GLenum type,
+			    GLuint start,
+			    GLuint n );
+
+extern void _math_trans_4ub(GLubyte (*to)[4],
+			    CONST void *ptr,
+			    GLuint stride,
+			    GLenum type,
+			    GLuint size,
+			    GLuint start,
+			    GLuint n );
+
+extern void _math_trans_4chan( GLchan (*to)[4],
+			       CONST void *ptr,
+			       GLuint stride,
+			       GLenum type,
+			       GLuint size,
+			       GLuint start,
+			       GLuint n );
+
+extern void _math_trans_4us(GLushort (*to)[4],
+			    CONST void *ptr,
+			    GLuint stride,
+			    GLenum type,
+			    GLuint size,
+			    GLuint start,
+			    GLuint n );
+
+extern void _math_trans_4f(GLfloat (*to)[4],
+			   CONST void *ptr,
+			   GLuint stride,
+			   GLenum type,
+			   GLuint size,
+			   GLuint start,
+			   GLuint n );
+
+extern void _math_trans_4fc(GLfloat (*to)[4],
+			    CONST void *ptr,
+			    GLuint stride,
+			    GLenum type,
+			    GLuint size,
+			    GLuint start,
+			    GLuint n );
+
+extern void _math_trans_3f(GLfloat (*to)[3],
+			   CONST void *ptr,
+			   GLuint stride,
+			   GLenum type,
+			   GLuint start,
+			   GLuint n );
+
+extern void _math_init_translate( void );
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/math/m_vector.c b/reactos/lib/mesa32/src/math/m_vector.c
new file mode 100644
index 00000000000..3ad81d468b2
--- /dev/null
+++ b/reactos/lib/mesa32/src/math/m_vector.c
@@ -0,0 +1,190 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * New (3.1) transformation code written by Keith Whitwell.
+ */
+
+
+#include "glheader.h"
+#include "imports.h"
+#include "macros.h"
+#include "imports.h"
+
+#include "m_vector.h"
+
+
+
+/*
+ * Given a vector [count][4] of floats, set all the [][elt] values
+ * to 0 (if elt = 0, 1, 2) or 1.0 (if elt = 3).
+ */
+void _mesa_vector4f_clean_elem( GLvector4f *vec, GLuint count, GLuint elt )
+{
+   static const GLubyte elem_bits[4] = {
+      VEC_DIRTY_0,
+      VEC_DIRTY_1,
+      VEC_DIRTY_2,
+      VEC_DIRTY_3
+   };
+   static const GLfloat clean[4] = { 0, 0, 0, 1 };
+   const GLfloat v = clean[elt];
+   GLfloat (*data)[4] = (GLfloat (*)[4])vec->start;
+   GLuint i;
+
+   for (i = 0 ; i < count ; i++)
+      data[i][elt] = v;
+
+   vec->flags &= ~elem_bits[elt];
+}
+
+static const GLubyte size_bits[5] = {
+   0,
+   VEC_SIZE_1,
+   VEC_SIZE_2,
+   VEC_SIZE_3,
+   VEC_SIZE_4,
+};
+
+
+
+/*
+ * Initialize GLvector objects.
+ * Input: v - the vector object to initialize.
+ *        flags - bitwise-OR of VEC_* flags
+ *        storage - pointer to storage for the vector's data
+ */
+
+
+void _mesa_vector4f_init( GLvector4f *v, GLuint flags, GLfloat (*storage)[4] )
+{
+   v->stride = 4 * sizeof(GLfloat);
+   v->size = 2;   /* may change: 2-4 for vertices and 1-4 for texcoords */
+   v->data = storage;
+   v->start = (GLfloat *) storage;
+   v->count = 0;
+   v->flags = size_bits[4] | flags ;
+}
+
+
+
+
+/*
+ * Initialize GLvector objects and allocate storage.
+ * Input: v - the vector object
+ *        sz - unused????
+ *        flags - bitwise-OR of VEC_* flags
+ *        count - number of elements to allocate in vector
+ *        alignment - desired memory alignment for the data (in bytes)
+ */
+
+
+void _mesa_vector4f_alloc( GLvector4f *v, GLuint flags, GLuint count,
+			GLuint alignment )
+{
+   v->stride = 4 * sizeof(GLfloat);
+   v->size = 2;
+   v->storage = ALIGN_MALLOC( count * 4 * sizeof(GLfloat), alignment );
+   v->start = (GLfloat *) v->storage;
+   v->data = (GLfloat (*)[4]) v->storage;
+   v->count = 0;
+   v->flags = size_bits[4] | flags | VEC_MALLOC ;
+}
+
+
+
+
+/*
+ * Vector deallocation.  Free whatever memory is pointed to by the
+ * vector's storage field if the VEC_MALLOC flag is set.
+ * DO NOT free the GLvector object itself, though.
+ */
+
+
+void _mesa_vector4f_free( GLvector4f *v )
+{
+   if (v->flags & VEC_MALLOC) {
+      ALIGN_FREE( v->storage );
+      v->data = NULL;
+      v->start = NULL;
+      v->storage = NULL;
+      v->flags &= ~VEC_MALLOC;
+   }
+}
+
+
+/*
+ * For debugging
+ */
+void _mesa_vector4f_print( GLvector4f *v, GLubyte *cullmask, GLboolean culling )
+{
+   GLfloat c[4] = { 0, 0, 0, 1 };
+   const char *templates[5] = {
+      "%d:\t0, 0, 0, 1\n",
+      "%d:\t%f, 0, 0, 1\n",
+      "%d:\t%f, %f, 0, 1\n",
+      "%d:\t%f, %f, %f, 1\n",
+      "%d:\t%f, %f, %f, %f\n"
+   };
+
+   const char *t = templates[v->size];
+   GLfloat *d = (GLfloat *)v->data;
+   GLuint j, i = 0, count;
+
+   _mesa_printf("data-start\n");
+   for ( ; d != v->start ; STRIDE_F(d, v->stride), i++)
+      _mesa_printf(t, i, d[0], d[1], d[2], d[3]);
+
+   _mesa_printf("start-count(%u)\n", v->count);
+   count = i + v->count;
+
+   if (culling) {
+      for ( ; i < count ; STRIDE_F(d, v->stride), i++)
+	 if (cullmask[i])
+	    _mesa_printf(t, i, d[0], d[1], d[2], d[3]);
+   }
+   else {
+      for ( ; i < count ; STRIDE_F(d, v->stride), i++)
+	 _mesa_printf(t, i, d[0], d[1], d[2], d[3]);
+   }
+
+   for (j = v->size ; j < 4; j++) {
+      if ((v->flags & (1<<j)) == 0) {
+
+	 _mesa_printf("checking col %u is clean as advertised ", j);
+
+	 for (i = 0, d = (GLfloat *) v->data ;
+	      i < count && d[j] == c[j] ;
+	      i++, STRIDE_F(d, v->stride)) {};
+
+	 if (i == count)
+	    _mesa_printf(" --> ok\n");
+	 else
+	    _mesa_printf(" --> Failed at %u ******\n", i);
+      }
+   }
+}
+
+
diff --git a/reactos/lib/mesa32/src/math/m_vector.h b/reactos/lib/mesa32/src/math/m_vector.h
new file mode 100644
index 00000000000..222b47f6e19
--- /dev/null
+++ b/reactos/lib/mesa32/src/math/m_vector.h
@@ -0,0 +1,95 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * New (3.1) transformation code written by Keith Whitwell.
+ */
+
+
+#ifndef _M_VECTOR_H_
+#define _M_VECTOR_H_
+
+#include "glheader.h"
+#include "mtypes.h"		/* hack for GLchan */
+
+
+#define VEC_DIRTY_0        0x1
+#define VEC_DIRTY_1        0x2
+#define VEC_DIRTY_2        0x4
+#define VEC_DIRTY_3        0x8
+#define VEC_MALLOC         0x10 /* storage field points to self-allocated mem*/
+#define VEC_NOT_WRITEABLE  0x40	/* writable elements to hold clipped data */
+#define VEC_BAD_STRIDE     0x100 /* matches tnl's prefered stride */
+
+
+#define VEC_SIZE_1   VEC_DIRTY_0
+#define VEC_SIZE_2   (VEC_DIRTY_0|VEC_DIRTY_1)
+#define VEC_SIZE_3   (VEC_DIRTY_0|VEC_DIRTY_1|VEC_DIRTY_2)
+#define VEC_SIZE_4   (VEC_DIRTY_0|VEC_DIRTY_1|VEC_DIRTY_2|VEC_DIRTY_3)
+
+
+
+/* Wrap all the information about vectors up in a struct.  Has
+ * additional fields compared to the other vectors to help us track of
+ * different vertex sizes, and whether we need to clean columns out
+ * because they contain non-(0,0,0,1) values.
+ *
+ * The start field is used to reserve data for copied vertices at the
+ * end of _mesa_transform_vb, and avoids the need for a multiplication in
+ * the transformation routines.
+ */
+typedef struct {
+   GLfloat (*data)[4];	/* may be malloc'd or point to client data */
+   GLfloat *start;	/* points somewhere inside of <data> */
+   GLuint count;	/* size of the vector (in elements) */
+   GLuint stride;	/* stride from one element to the next (in bytes) */
+   GLuint size;		/* 2-4 for vertices and 1-4 for texcoords */
+   GLuint flags;	/* which columns are dirty */
+   void *storage;	/* self-allocated storage */
+} GLvector4f;
+
+
+extern void _mesa_vector4f_init( GLvector4f *v, GLuint flags,
+			      GLfloat (*storage)[4] );
+extern void _mesa_vector4f_alloc( GLvector4f *v, GLuint flags,
+			       GLuint count, GLuint alignment );
+extern void _mesa_vector4f_free( GLvector4f *v );
+extern void _mesa_vector4f_print( GLvector4f *v, GLubyte *, GLboolean );
+extern void _mesa_vector4f_clean_elem( GLvector4f *vec, GLuint nr, GLuint elt );
+
+
+
+
+
+/*
+ * Given vector <v>, return a pointer (cast to <type *> to the <i>-th element.
+ *
+ * End up doing a lot of slow imuls if not careful.
+ */
+#define VEC_ELT( v, type, i ) \
+       ( (type *)  ( ((GLbyte *) ((v)->data)) + (i) * (v)->stride) )
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/math/m_xform.c b/reactos/lib/mesa32/src/math/m_xform.c
new file mode 100644
index 00000000000..8bb5e623c69
--- /dev/null
+++ b/reactos/lib/mesa32/src/math/m_xform.c
@@ -0,0 +1,219 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * Matrix/vertex/vector transformation stuff
+ *
+ *
+ * NOTES:
+ * 1. 4x4 transformation matrices are stored in memory in column major order.
+ * 2. Points/vertices are to be thought of as column vectors.
+ * 3. Transformation of a point p by a matrix M is: p' = M * p
+ */
+
+#include "glheader.h"
+#include "macros.h"
+
+#include "m_eval.h"
+#include "m_matrix.h"
+#include "m_translate.h"
+#include "m_xform.h"
+#include "mathmod.h"
+
+
+#ifdef DEBUG
+#include "m_debug.h"
+#endif
+
+#ifdef USE_X86_ASM
+#include "x86/common_x86_asm.h"
+#endif
+
+#ifdef USE_SPARC_ASM
+#include "sparc/sparc.h"
+#endif
+
+clip_func _mesa_clip_tab[5];
+clip_func _mesa_clip_np_tab[5];
+dotprod_func _mesa_dotprod_tab[5];
+vec_copy_func _mesa_copy_tab[0x10];
+normal_func _mesa_normal_tab[0xf];
+transform_func *_mesa_transform_tab[5];
+
+
+/* Raw data format used for:
+ *    - Object-to-eye transform prior to culling, although this too
+ *      could be culled under some circumstances.
+ *    - Eye-to-clip transform (via the function above).
+ *    - Cliptesting
+ *    - And everything else too, if culling happens to be disabled.
+ *
+ * GH: It's used for everything now, as clipping/culling is done
+ *     elsewhere (most often by the driver itself).
+ */
+#define TAG(x) x
+#define TAG2(x,y) x##y
+#define STRIDE_LOOP for ( i = 0 ; i < count ; i++, STRIDE_F(from, stride) )
+#define LOOP for ( i = 0 ; i < n ; i++ )
+#define ARGS
+#include "m_xform_tmp.h"
+#include "m_clip_tmp.h"
+#include "m_norm_tmp.h"
+#include "m_dotprod_tmp.h"
+#include "m_copy_tmp.h"
+#undef TAG
+#undef TAG2
+#undef LOOP
+#undef ARGS
+
+
+
+
+GLvector4f *_mesa_project_points( GLvector4f *proj_vec,
+				  const GLvector4f *clip_vec )
+{
+   const GLuint stride = clip_vec->stride;
+   const GLfloat *from = (GLfloat *)clip_vec->start;
+   const GLuint count = clip_vec->count;
+   GLfloat (*vProj)[4] = (GLfloat (*)[4])proj_vec->start;
+   GLuint i;
+
+   for (i = 0 ; i < count ; i++, STRIDE_F(from, stride))
+   {
+	 GLfloat oow = 1.0F / from[3];
+	 vProj[i][3] = oow;
+	 vProj[i][0] = from[0] * oow;
+	 vProj[i][1] = from[1] * oow;
+	 vProj[i][2] = from[2] * oow;
+   }
+
+   proj_vec->flags |= VEC_SIZE_4;
+   proj_vec->size = 3;
+   proj_vec->count = clip_vec->count;
+   return proj_vec;
+}
+
+
+
+
+
+
+/*
+ * Transform a 4-element row vector (1x4 matrix) by a 4x4 matrix.  This
+ * function is used for transforming clipping plane equations and spotlight
+ * directions.
+ * Mathematically,  u = v * m.
+ * Input:  v - input vector
+ *         m - transformation matrix
+ * Output:  u - transformed vector
+ */
+void _mesa_transform_vector( GLfloat u[4], const GLfloat v[4], const GLfloat m[16] )
+{
+   GLfloat v0=v[0], v1=v[1], v2=v[2], v3=v[3];
+#define M(row,col)  m[row + col*4]
+   u[0] = v0 * M(0,0) + v1 * M(1,0) + v2 * M(2,0) + v3 * M(3,0);
+   u[1] = v0 * M(0,1) + v1 * M(1,1) + v2 * M(2,1) + v3 * M(3,1);
+   u[2] = v0 * M(0,2) + v1 * M(1,2) + v2 * M(2,2) + v3 * M(3,2);
+   u[3] = v0 * M(0,3) + v1 * M(1,3) + v2 * M(2,3) + v3 * M(3,3);
+#undef M
+}
+
+
+/* Useful for one-off point transformations, as in clipping.
+ * Note that because the matrix isn't analysed we do too many
+ * multiplies, and that the result is always 4-clean.
+ */
+void _mesa_transform_point_sz( GLfloat Q[4], const GLfloat M[16],
+			    const GLfloat P[4], GLuint sz )
+{
+   if (Q == P)
+      return;
+
+   if (sz == 4)
+   {
+      Q[0] = M[0] * P[0] + M[4] * P[1] + M[8] *  P[2] + M[12] * P[3];
+      Q[1] = M[1] * P[0] + M[5] * P[1] + M[9] *  P[2] + M[13] * P[3];
+      Q[2] = M[2] * P[0] + M[6] * P[1] + M[10] * P[2] + M[14] * P[3];
+      Q[3] = M[3] * P[0] + M[7] * P[1] + M[11] * P[2] + M[15] * P[3];
+   }
+   else if (sz == 3)
+   {
+      Q[0] = M[0] * P[0] + M[4] * P[1] + M[8] *  P[2] + M[12];
+      Q[1] = M[1] * P[0] + M[5] * P[1] + M[9] *  P[2] + M[13];
+      Q[2] = M[2] * P[0] + M[6] * P[1] + M[10] * P[2] + M[14];
+      Q[3] = M[3] * P[0] + M[7] * P[1] + M[11] * P[2] + M[15];
+   }
+   else if (sz == 2)
+   {
+      Q[0] = M[0] * P[0] + M[4] * P[1] +                M[12];
+      Q[1] = M[1] * P[0] + M[5] * P[1] +                M[13];
+      Q[2] = M[2] * P[0] + M[6] * P[1] +                M[14];
+      Q[3] = M[3] * P[0] + M[7] * P[1] +                M[15];
+   }
+   else if (sz == 1)
+   {
+      Q[0] = M[0] * P[0] +                              M[12];
+      Q[1] = M[1] * P[0] +                              M[13];
+      Q[2] = M[2] * P[0] +                              M[14];
+      Q[3] = M[3] * P[0] +                              M[15];
+   }
+}
+
+
+/*
+ * This is called only once.  It initializes several tables with pointers
+ * to optimized transformation functions.  This is where we can test for
+ * AMD 3Dnow! capability, Intel Katmai, etc. and hook in the right code.
+ */
+void
+_math_init_transformation( void )
+{
+   init_c_transformations();
+   init_c_norm_transform();
+   init_c_cliptest();
+   init_copy0();
+   init_dotprod();
+
+#ifdef DEBUG
+   _math_test_all_transform_functions( "default" );
+   _math_test_all_normal_transform_functions( "default" );
+   _math_test_all_cliptest_functions( "default" );
+#endif
+
+#ifdef USE_X86_ASM
+   _mesa_init_all_x86_transform_asm();
+#endif
+#ifdef USE_SPARC_ASM
+   _mesa_init_all_sparc_transform_asm();
+#endif
+}
+
+void
+_math_init( void )
+{
+   _math_init_transformation();
+   _math_init_translate();
+   _math_init_eval();
+}
diff --git a/reactos/lib/mesa32/src/math/m_xform.h b/reactos/lib/mesa32/src/math/m_xform.h
new file mode 100644
index 00000000000..badc29eaf5f
--- /dev/null
+++ b/reactos/lib/mesa32/src/math/m_xform.h
@@ -0,0 +1,216 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+
+
+
+#ifndef _M_XFORM_H
+#define _M_XFORM_H
+
+
+#include "glheader.h"
+#include "config.h"
+#include "math/m_vector.h"
+#include "math/m_matrix.h"
+
+#ifdef USE_X86_ASM
+#define _XFORMAPI _ASMAPI
+#define _XFORMAPIP _ASMAPIP
+#else
+#define _XFORMAPI
+#define _XFORMAPIP *
+#endif
+
+/*
+ * Transform a point (column vector) by a matrix:   Q = M * P
+ */
+#define TRANSFORM_POINT( Q, M, P )					\
+   Q[0] = M[0] * P[0] + M[4] * P[1] + M[8] *  P[2] + M[12] * P[3];	\
+   Q[1] = M[1] * P[0] + M[5] * P[1] + M[9] *  P[2] + M[13] * P[3];	\
+   Q[2] = M[2] * P[0] + M[6] * P[1] + M[10] * P[2] + M[14] * P[3];	\
+   Q[3] = M[3] * P[0] + M[7] * P[1] + M[11] * P[2] + M[15] * P[3];
+
+
+#define TRANSFORM_POINT3( Q, M, P )				\
+   Q[0] = M[0] * P[0] + M[4] * P[1] + M[8] *  P[2] + M[12];	\
+   Q[1] = M[1] * P[0] + M[5] * P[1] + M[9] *  P[2] + M[13];	\
+   Q[2] = M[2] * P[0] + M[6] * P[1] + M[10] * P[2] + M[14];	\
+   Q[3] = M[3] * P[0] + M[7] * P[1] + M[11] * P[2] + M[15];
+
+
+/*
+ * Transform a normal (row vector) by a matrix:  [NX NY NZ] = N * MAT
+ */
+#define TRANSFORM_NORMAL( TO, N, MAT )				\
+do {								\
+   TO[0] = N[0] * MAT[0] + N[1] * MAT[1] + N[2] * MAT[2];	\
+   TO[1] = N[0] * MAT[4] + N[1] * MAT[5] + N[2] * MAT[6];	\
+   TO[2] = N[0] * MAT[8] + N[1] * MAT[9] + N[2] * MAT[10];	\
+} while (0)
+
+
+extern void _mesa_transform_vector( GLfloat u[4],
+				 CONST GLfloat v[4],
+                                 CONST GLfloat m[16] );
+
+
+extern void
+_math_init_transformation( void );
+
+
+/* KW: Clip functions now do projective divide as well.  The projected
+ * coordinates are very useful to us because they let us cull
+ * backfaces and eliminate vertices from lighting, fogging, etc
+ * calculations.  Despite the fact that this divide could be done one
+ * day in hardware, we would still have a reason to want to do it here
+ * as long as those other calculations remain in software.
+ *
+ * Clipping is a convenient place to do the divide on x86 as it should be
+ * possible to overlap with integer outcode calculations.
+ *
+ * There are two cases where we wouldn't want to do the divide in cliptest:
+ *    - When we aren't clipping.  We still might want to cull backfaces
+ *      so the divide should be done elsewhere.  This currently never
+ *      happens.
+ *
+ *    - When culling isn't likely to help us, such as when the GL culling
+ *      is disabled and we not lighting or are only lighting
+ *      one-sided.  In this situation, backface determination provides
+ *      us with no useful information.  A tricky case to detect is when
+ *      all input data is already culled, although hopefully the
+ *      application wouldn't turn on culling in such cases.
+ *
+ * We supply a buffer to hold the [x/w,y/w,z/w,1/w] values which
+ * are the result of the projection.  This is only used in the
+ * 4-vector case - in other cases, we just use the clip coordinates
+ * as the projected coordinates - they are identical.
+ *
+ * This is doubly convenient because it means the Win[] array is now
+ * of the same stride as all the others, so I can now turn map_vertices
+ * into a straight-forward matrix transformation, with asm acceleration
+ * automatically available.
+ */
+
+/* Vertex buffer clipping flags
+ */
+#define CLIP_RIGHT_SHIFT 	0
+#define CLIP_LEFT_SHIFT 	1
+#define CLIP_TOP_SHIFT  	2
+#define CLIP_BOTTOM_SHIFT       3
+#define CLIP_NEAR_SHIFT  	4
+#define CLIP_FAR_SHIFT  	5
+
+#define CLIP_RIGHT_BIT   0x01
+#define CLIP_LEFT_BIT    0x02
+#define CLIP_TOP_BIT     0x04
+#define CLIP_BOTTOM_BIT  0x08
+#define CLIP_NEAR_BIT    0x10
+#define CLIP_FAR_BIT     0x20
+#define CLIP_USER_BIT    0x40
+#define CLIP_ALL_BITS    0x3f
+
+
+typedef GLvector4f * (_XFORMAPIP clip_func)( GLvector4f *vClip,
+					     GLvector4f *vProj,
+					     GLubyte clipMask[],
+					     GLubyte *orMask,
+					     GLubyte *andMask );
+
+typedef void (*dotprod_func)( GLfloat *out,
+			      GLuint out_stride,
+			      CONST GLvector4f *coord_vec,
+			      CONST GLfloat plane[4] );
+
+typedef void (*vec_copy_func)( GLvector4f *to,
+			       CONST GLvector4f *from );
+
+
+
+/*
+ * Functions for transformation of normals in the VB.
+ */
+typedef void (_NORMAPIP normal_func)( CONST GLmatrix *mat,
+				      GLfloat scale,
+				      CONST GLvector4f *in,
+				      CONST GLfloat lengths[],
+				      GLvector4f *dest );
+
+
+/* Flags for selecting a normal transformation function.
+ */
+#define NORM_RESCALE   0x1		/* apply the scale factor */
+#define NORM_NORMALIZE 0x2		/* normalize */
+#define NORM_TRANSFORM 0x4		/* apply the transformation matrix */
+#define NORM_TRANSFORM_NO_ROT 0x8	/* apply the transformation matrix */
+
+
+
+
+/* KW: New versions of the transform function allow a mask array
+ *     specifying that individual vector transform should be skipped
+ *     when the mask byte is zero.  This is always present as a
+ *     parameter, to allow a unified interface.
+ */
+typedef void (_XFORMAPIP transform_func)( GLvector4f *to_vec,
+					  CONST GLfloat m[16],
+					  CONST GLvector4f *from_vec );
+
+
+extern GLvector4f *_mesa_project_points( GLvector4f *to,
+					 CONST GLvector4f *from );
+
+extern void _mesa_transform_bounds3( GLubyte *orMask, GLubyte *andMask,
+				     CONST GLfloat m[16],
+				     CONST GLfloat src[][3] );
+
+extern void _mesa_transform_bounds2( GLubyte *orMask, GLubyte *andMask,
+				     CONST GLfloat m[16],
+				     CONST GLfloat src[][3] );
+
+
+extern dotprod_func  _mesa_dotprod_tab[5];
+extern vec_copy_func _mesa_copy_tab[0x10];
+extern vec_copy_func _mesa_copy_clean_tab[5];
+extern clip_func     _mesa_clip_tab[5];
+extern clip_func     _mesa_clip_np_tab[5];
+extern normal_func   _mesa_normal_tab[0xf];
+
+/* Use of 2 layers of linked 1-dimensional arrays to reduce
+ * cost of lookup.
+ */
+extern transform_func *_mesa_transform_tab[5];
+
+
+extern void _mesa_transform_point_sz( GLfloat Q[4], CONST GLfloat M[16],
+				      CONST GLfloat P[4], GLuint sz );
+
+
+#define TransformRaw( to, mat, from ) \
+   ( _mesa_transform_tab[(from)->size][(mat)->type]( to, (mat)->m, from ), \
+     (to) )
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/math/m_xform_tmp.h b/reactos/lib/mesa32/src/math/m_xform_tmp.h
new file mode 100644
index 00000000000..7cf4780bd39
--- /dev/null
+++ b/reactos/lib/mesa32/src/math/m_xform_tmp.h
@@ -0,0 +1,806 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * New (3.1) transformation code written by Keith Whitwell.
+ */
+
+
+/*----------------------------------------------------------------------
+ * Begin Keith's new code
+ *
+ *----------------------------------------------------------------------
+ */
+
+/* KW: Fixed stride, now measured in bytes as is the OpenGL array stride.
+ */
+
+/* KW: These are now parameterized to produce two versions, one
+ *     which transforms all incoming points, and a second which
+ *     takes notice of a cullmask array, and only transforms
+ *     unculled vertices.
+ */
+
+/* KW: 1-vectors can sneak into the texture pipeline via the array
+ *     interface.  These functions are here because I want consistant
+ *     treatment of the vertex sizes and a lazy strategy for
+ *     cleaning unused parts of the vector, and so as not to exclude
+ *     them from the vertex array interface.
+ *
+ *     Under our current analysis of matrices, there is no way that
+ *     the product of a matrix and a 1-vector can remain a 1-vector,
+ *     with the exception of the identity transform.
+ */
+
+/* KW: No longer zero-pad outgoing vectors.  Now that external
+ *     vectors can get into the pipeline we cannot ever assume
+ *     that there is more to a vector than indicated by its
+ *     size.
+ */
+
+/* KW: Now uses clipmask and a flag to allow us to skip both/either
+ *     cliped and/or culled vertices.
+ */
+
+/* GH: Not any more -- it's easier (and faster) to just process the
+ *     entire vector.  Clipping and culling are handled further down
+ *     the pipe, most often during or after the conversion to some
+ *     driver-specific vertex format.
+ */
+
+static void _XFORMAPI
+TAG(transform_points1_general)( GLvector4f *to_vec,
+				const GLfloat m[16],
+				const GLvector4f *from_vec )
+{
+   const GLuint stride = from_vec->stride;
+   GLfloat *from = from_vec->start;
+   GLfloat (*to)[4] = (GLfloat (*)[4])to_vec->start;
+   GLuint count = from_vec->count;
+   const GLfloat m0 = m[0],  m12 = m[12];
+   const GLfloat m1 = m[1],  m13 = m[13];
+   const GLfloat m2 = m[2],  m14 = m[14];
+   const GLfloat m3 = m[3],  m15 = m[15];
+   GLuint i;
+   STRIDE_LOOP {
+      const GLfloat ox = from[0];
+      to[i][0] = m0 * ox + m12;
+      to[i][1] = m1 * ox + m13;
+      to[i][2] = m2 * ox + m14;
+      to[i][3] = m3 * ox + m15;
+   }
+   to_vec->size = 4;
+   to_vec->flags |= VEC_SIZE_4;
+   to_vec->count = from_vec->count;
+}
+
+static void _XFORMAPI
+TAG(transform_points1_identity)( GLvector4f *to_vec,
+				 const GLfloat m[16],
+				 const GLvector4f *from_vec )
+{
+   const GLuint stride = from_vec->stride;
+   GLfloat *from = from_vec->start;
+   GLuint count = from_vec->count;
+   GLfloat (*to)[4] = (GLfloat (*)[4])to_vec->start;
+   GLuint i;
+   if (to_vec == from_vec) return;
+   STRIDE_LOOP {
+      to[i][0] = from[0];
+   }
+   to_vec->size = 1;
+   to_vec->flags |= VEC_SIZE_1;
+   to_vec->count = from_vec->count;
+}
+
+static void _XFORMAPI
+TAG(transform_points1_2d)( GLvector4f *to_vec,
+			   const GLfloat m[16],
+			   const GLvector4f *from_vec )
+{
+   const GLuint stride = from_vec->stride;
+   GLfloat *from = from_vec->start;
+   GLfloat (*to)[4] = (GLfloat (*)[4])to_vec->start;
+   GLuint count = from_vec->count;
+   const GLfloat m0 = m[0], m1 = m[1];
+   const GLfloat m12 = m[12], m13 = m[13];
+   GLuint i;
+   STRIDE_LOOP {
+      const GLfloat ox = from[0];
+      to[i][0] = m0 * ox + m12;
+      to[i][1] = m1 * ox + m13;
+   }
+   to_vec->size = 2;
+   to_vec->flags |= VEC_SIZE_2;
+   to_vec->count = from_vec->count;
+}
+
+static void _XFORMAPI
+TAG(transform_points1_2d_no_rot)( GLvector4f *to_vec,
+				  const GLfloat m[16],
+				  const GLvector4f *from_vec )
+{
+   const GLuint stride = from_vec->stride;
+   GLfloat *from = from_vec->start;
+   GLfloat (*to)[4] = (GLfloat (*)[4])to_vec->start;
+   GLuint count = from_vec->count;
+   const GLfloat m0 = m[0], m12 = m[12], m13 = m[13];
+   GLuint i;
+   STRIDE_LOOP {
+      const GLfloat ox = from[0];
+      to[i][0] = m0 * ox + m12;
+      to[i][1] =           m13;
+   }
+   to_vec->size = 2;
+   to_vec->flags |= VEC_SIZE_2;
+   to_vec->count = from_vec->count;
+}
+
+static void _XFORMAPI
+TAG(transform_points1_3d)( GLvector4f *to_vec,
+			   const GLfloat m[16],
+			   const GLvector4f *from_vec )
+{
+   const GLuint stride = from_vec->stride;
+   GLfloat *from = from_vec->start;
+   GLfloat (*to)[4] = (GLfloat (*)[4])to_vec->start;
+   GLuint count = from_vec->count;
+   const GLfloat m0 = m[0], m1 = m[1], m2 = m[2];
+   const GLfloat m12 = m[12], m13 = m[13], m14 = m[14];
+   GLuint i;
+   STRIDE_LOOP {
+      const GLfloat ox = from[0];
+      to[i][0] = m0 * ox + m12;
+      to[i][1] = m1 * ox + m13;
+      to[i][2] = m2 * ox + m14;
+   }
+   to_vec->size = 3;
+   to_vec->flags |= VEC_SIZE_3;
+   to_vec->count = from_vec->count;
+}
+
+
+static void _XFORMAPI
+TAG(transform_points1_3d_no_rot)( GLvector4f *to_vec,
+				  const GLfloat m[16],
+				  const GLvector4f *from_vec )
+{
+   const GLuint stride = from_vec->stride;
+   GLfloat *from = from_vec->start;
+   GLfloat (*to)[4] = (GLfloat (*)[4])to_vec->start;
+   GLuint count = from_vec->count;
+   const GLfloat m0 = m[0];
+   const GLfloat m12 = m[12], m13 = m[13], m14 = m[14];
+   GLuint i;
+   STRIDE_LOOP {
+      const GLfloat ox = from[0];
+      to[i][0] = m0 * ox           + m12;
+      to[i][1] =                     m13;
+      to[i][2] =                     m14;
+   }
+   to_vec->size = 3;
+   to_vec->flags |= VEC_SIZE_3;
+   to_vec->count = from_vec->count;
+}
+
+static void _XFORMAPI
+TAG(transform_points1_perspective)( GLvector4f *to_vec,
+				    const GLfloat m[16],
+				    const GLvector4f *from_vec )
+{
+   const GLuint stride = from_vec->stride;
+   GLfloat *from = from_vec->start;
+   GLfloat (*to)[4] = (GLfloat (*)[4])to_vec->start;
+   GLuint count = from_vec->count;
+   const GLfloat m0 = m[0], m14 = m[14];
+   GLuint i;
+   STRIDE_LOOP {
+      const GLfloat ox = from[0];
+      to[i][0] = m0 * ox                ;
+      to[i][1] =           0            ;
+      to[i][2] =                     m14;
+      to[i][3] = 0;
+   }
+   to_vec->size = 4;
+   to_vec->flags |= VEC_SIZE_4;
+   to_vec->count = from_vec->count;
+}
+
+
+
+
+/* 2-vectors, which are a lot more relevant than 1-vectors, are
+ * present early in the geometry pipeline and throughout the
+ * texture pipeline.
+ */
+static void _XFORMAPI
+TAG(transform_points2_general)( GLvector4f *to_vec,
+				const GLfloat m[16],
+				const GLvector4f *from_vec )
+{
+   const GLuint stride = from_vec->stride;
+   GLfloat *from = from_vec->start;
+   GLfloat (*to)[4] = (GLfloat (*)[4])to_vec->start;
+   GLuint count = from_vec->count;
+   const GLfloat m0 = m[0],  m4 = m[4],  m12 = m[12];
+   const GLfloat m1 = m[1],  m5 = m[5],  m13 = m[13];
+   const GLfloat m2 = m[2],  m6 = m[6],  m14 = m[14];
+   const GLfloat m3 = m[3],  m7 = m[7],  m15 = m[15];
+   GLuint i;
+   STRIDE_LOOP {
+      const GLfloat ox = from[0], oy = from[1];
+      to[i][0] = m0 * ox + m4 * oy + m12;
+      to[i][1] = m1 * ox + m5 * oy + m13;
+      to[i][2] = m2 * ox + m6 * oy + m14;
+      to[i][3] = m3 * ox + m7 * oy + m15;
+   }
+   to_vec->size = 4;
+   to_vec->flags |= VEC_SIZE_4;
+   to_vec->count = from_vec->count;
+}
+
+static void _XFORMAPI
+TAG(transform_points2_identity)( GLvector4f *to_vec,
+				 const GLfloat m[16],
+				 const GLvector4f *from_vec )
+{
+   const GLuint stride = from_vec->stride;
+   GLfloat *from = from_vec->start;
+   GLfloat (*to)[4] = (GLfloat (*)[4])to_vec->start;
+   GLuint count = from_vec->count;
+   GLuint i;
+   if (to_vec == from_vec) return;
+   STRIDE_LOOP {
+      to[i][0] = from[0];
+      to[i][1] = from[1];
+   }
+   to_vec->size = 2;
+   to_vec->flags |= VEC_SIZE_2;
+   to_vec->count = from_vec->count;
+}
+
+static void _XFORMAPI
+TAG(transform_points2_2d)( GLvector4f *to_vec,
+			   const GLfloat m[16],
+			   const GLvector4f *from_vec )
+{
+   const GLuint stride = from_vec->stride;
+   GLfloat *from = from_vec->start;
+   GLfloat (*to)[4] = (GLfloat (*)[4])to_vec->start;
+   GLuint count = from_vec->count;
+   const GLfloat m0 = m[0], m1 = m[1], m4 = m[4], m5 = m[5];
+   const GLfloat m12 = m[12], m13 = m[13];
+   GLuint i;
+   STRIDE_LOOP {
+      const GLfloat ox = from[0], oy = from[1];
+      to[i][0] = m0 * ox + m4 * oy + m12;
+      to[i][1] = m1 * ox + m5 * oy + m13;
+   }
+   to_vec->size = 2;
+   to_vec->flags |= VEC_SIZE_2;
+   to_vec->count = from_vec->count;
+}
+
+static void _XFORMAPI
+TAG(transform_points2_2d_no_rot)( GLvector4f *to_vec,
+				  const GLfloat m[16],
+				  const GLvector4f *from_vec )
+{
+   const GLuint stride = from_vec->stride;
+   GLfloat *from = from_vec->start;
+   GLfloat (*to)[4] = (GLfloat (*)[4])to_vec->start;
+   GLuint count = from_vec->count;
+   const GLfloat m0 = m[0], m5 = m[5], m12 = m[12], m13 = m[13];
+   GLuint i;
+   STRIDE_LOOP {
+      const GLfloat ox = from[0], oy = from[1];
+      to[i][0] = m0 * ox           + m12;
+      to[i][1] =           m5 * oy + m13;
+   }
+   to_vec->size = 2;
+   to_vec->flags |= VEC_SIZE_2;
+   to_vec->count = from_vec->count;
+}
+
+static void _XFORMAPI
+TAG(transform_points2_3d)( GLvector4f *to_vec,
+			   const GLfloat m[16],
+			   const GLvector4f *from_vec )
+{
+   const GLuint stride = from_vec->stride;
+   GLfloat *from = from_vec->start;
+   GLfloat (*to)[4] = (GLfloat (*)[4])to_vec->start;
+   GLuint count = from_vec->count;
+   const GLfloat m0 = m[0], m1 = m[1], m2 = m[2], m4 = m[4], m5 = m[5];
+   const GLfloat m6 = m[6], m12 = m[12], m13 = m[13], m14 = m[14];
+   GLuint i;
+   STRIDE_LOOP {
+      const GLfloat ox = from[0], oy = from[1];
+      to[i][0] = m0 * ox + m4 * oy + m12;
+      to[i][1] = m1 * ox + m5 * oy + m13;
+      to[i][2] = m2 * ox + m6 * oy + m14;
+   }
+   to_vec->size = 3;
+   to_vec->flags |= VEC_SIZE_3;
+   to_vec->count = from_vec->count;
+}
+
+
+/* I would actually say this was a fairly important function, from
+ * a texture transformation point of view.
+ */
+static void _XFORMAPI
+TAG(transform_points2_3d_no_rot)( GLvector4f *to_vec,
+				  const GLfloat m[16],
+				  const GLvector4f *from_vec )
+{
+   const GLuint stride = from_vec->stride;
+   GLfloat *from = from_vec->start;
+   GLfloat (*to)[4] = (GLfloat (*)[4])to_vec->start;
+   GLuint count = from_vec->count;
+   const GLfloat m0 = m[0], m5 = m[5];
+   const GLfloat m12 = m[12], m13 = m[13], m14 = m[14];
+   GLuint i;
+   STRIDE_LOOP {
+      const GLfloat ox = from[0], oy = from[1];
+      to[i][0] = m0 * ox           + m12;
+      to[i][1] =           m5 * oy + m13;
+      to[i][2] =                     m14;
+   }
+   if (m14 == 0) {
+      to_vec->size = 2;
+      to_vec->flags |= VEC_SIZE_2;
+   } else {
+      to_vec->size = 3;
+      to_vec->flags |= VEC_SIZE_3;
+   }
+   to_vec->count = from_vec->count;
+}
+
+
+static void _XFORMAPI
+TAG(transform_points2_perspective)( GLvector4f *to_vec,
+				    const GLfloat m[16],
+				    const GLvector4f *from_vec )
+{
+   const GLuint stride = from_vec->stride;
+   GLfloat *from = from_vec->start;
+   GLfloat (*to)[4] = (GLfloat (*)[4])to_vec->start;
+   GLuint count = from_vec->count;
+   const GLfloat m0 = m[0], m5 = m[5], m14 = m[14];
+   GLuint i;
+   STRIDE_LOOP {
+      const GLfloat ox = from[0], oy = from[1];
+      to[i][0] = m0 * ox                ;
+      to[i][1] =           m5 * oy      ;
+      to[i][2] =                     m14;
+      to[i][3] = 0;
+   }
+   to_vec->size = 4;
+   to_vec->flags |= VEC_SIZE_4;
+   to_vec->count = from_vec->count;
+}
+
+
+
+static void _XFORMAPI
+TAG(transform_points3_general)( GLvector4f *to_vec,
+				const GLfloat m[16],
+				const GLvector4f *from_vec )
+{
+   const GLuint stride = from_vec->stride;
+   GLfloat *from = from_vec->start;
+   GLfloat (*to)[4] = (GLfloat (*)[4])to_vec->start;
+   GLuint count = from_vec->count;
+   const GLfloat m0 = m[0],  m4 = m[4],  m8 = m[8],  m12 = m[12];
+   const GLfloat m1 = m[1],  m5 = m[5],  m9 = m[9],  m13 = m[13];
+   const GLfloat m2 = m[2],  m6 = m[6],  m10 = m[10],  m14 = m[14];
+   const GLfloat m3 = m[3],  m7 = m[7],  m11 = m[11],  m15 = m[15];
+   GLuint i;
+   STRIDE_LOOP {
+      const GLfloat ox = from[0], oy = from[1], oz = from[2];
+      to[i][0] = m0 * ox + m4 * oy + m8  * oz + m12;
+      to[i][1] = m1 * ox + m5 * oy + m9  * oz + m13;
+      to[i][2] = m2 * ox + m6 * oy + m10 * oz + m14;
+      to[i][3] = m3 * ox + m7 * oy + m11 * oz + m15;
+   }
+   to_vec->size = 4;
+   to_vec->flags |= VEC_SIZE_4;
+   to_vec->count = from_vec->count;
+}
+
+static void _XFORMAPI
+TAG(transform_points3_identity)( GLvector4f *to_vec,
+				 const GLfloat m[16],
+				 const GLvector4f *from_vec )
+{
+   const GLuint stride = from_vec->stride;
+   GLfloat *from = from_vec->start;
+   GLfloat (*to)[4] = (GLfloat (*)[4])to_vec->start;
+   GLuint count = from_vec->count;
+   GLuint i;
+   if (to_vec == from_vec) return;
+   STRIDE_LOOP {
+      to[i][0] = from[0];
+      to[i][1] = from[1];
+      to[i][2] = from[2];
+   }
+   to_vec->size = 3;
+   to_vec->flags |= VEC_SIZE_3;
+   to_vec->count = from_vec->count;
+}
+
+static void _XFORMAPI
+TAG(transform_points3_2d)( GLvector4f *to_vec,
+			   const GLfloat m[16],
+			   const GLvector4f *from_vec )
+{
+   const GLuint stride = from_vec->stride;
+   GLfloat *from = from_vec->start;
+   GLfloat (*to)[4] = (GLfloat (*)[4])to_vec->start;
+   GLuint count = from_vec->count;
+   const GLfloat m0 = m[0], m1 = m[1], m4 = m[4], m5 = m[5];
+   const GLfloat m12 = m[12], m13 = m[13];
+   GLuint i;
+   STRIDE_LOOP {
+      const GLfloat ox = from[0], oy = from[1], oz = from[2];
+      to[i][0] = m0 * ox + m4 * oy            + m12       ;
+      to[i][1] = m1 * ox + m5 * oy            + m13       ;
+      to[i][2] =                   +       oz             ;
+   }
+   to_vec->size = 3;
+   to_vec->flags |= VEC_SIZE_3;
+   to_vec->count = from_vec->count;
+}
+
+static void _XFORMAPI
+TAG(transform_points3_2d_no_rot)( GLvector4f *to_vec,
+				  const GLfloat m[16],
+				  const GLvector4f *from_vec )
+{
+   const GLuint stride = from_vec->stride;
+   GLfloat *from = from_vec->start;
+   GLfloat (*to)[4] = (GLfloat (*)[4])to_vec->start;
+   GLuint count = from_vec->count;
+   const GLfloat m0 = m[0], m5 = m[5], m12 = m[12], m13 = m[13];
+   GLuint i;
+   STRIDE_LOOP {
+      const GLfloat ox = from[0], oy = from[1], oz = from[2];
+      to[i][0] = m0 * ox                      + m12       ;
+      to[i][1] =           m5 * oy            + m13       ;
+      to[i][2] =                   +       oz             ;
+   }
+   to_vec->size = 3;
+   to_vec->flags |= VEC_SIZE_3;
+   to_vec->count = from_vec->count;
+}
+
+static void _XFORMAPI
+TAG(transform_points3_3d)( GLvector4f *to_vec,
+			   const GLfloat m[16],
+			   const GLvector4f *from_vec )
+{
+   const GLuint stride = from_vec->stride;
+   GLfloat *from = from_vec->start;
+   GLfloat (*to)[4] = (GLfloat (*)[4])to_vec->start;
+   GLuint count = from_vec->count;
+   const GLfloat m0 = m[0], m1 = m[1], m2 = m[2], m4 = m[4], m5 = m[5];
+   const GLfloat m6 = m[6], m8 = m[8], m9 = m[9], m10 = m[10];
+   const GLfloat m12 = m[12], m13 = m[13], m14 = m[14];
+   GLuint i;
+   STRIDE_LOOP {
+      const GLfloat ox = from[0], oy = from[1], oz = from[2];
+      to[i][0] = m0 * ox + m4 * oy +  m8 * oz + m12       ;
+      to[i][1] = m1 * ox + m5 * oy +  m9 * oz + m13       ;
+      to[i][2] = m2 * ox + m6 * oy + m10 * oz + m14       ;
+   }
+   to_vec->size = 3;
+   to_vec->flags |= VEC_SIZE_3;
+   to_vec->count = from_vec->count;
+}
+
+/* previously known as ortho...
+ */
+static void _XFORMAPI
+TAG(transform_points3_3d_no_rot)( GLvector4f *to_vec,
+				  const GLfloat m[16],
+				  const GLvector4f *from_vec )
+{
+   const GLuint stride = from_vec->stride;
+   GLfloat *from = from_vec->start;
+   GLfloat (*to)[4] = (GLfloat (*)[4])to_vec->start;
+   GLuint count = from_vec->count;
+   const GLfloat m0 = m[0], m5 = m[5];
+   const GLfloat m10 = m[10], m12 = m[12], m13 = m[13], m14 = m[14];
+   GLuint i;
+   STRIDE_LOOP {
+      const GLfloat ox = from[0], oy = from[1], oz = from[2];
+      to[i][0] = m0 * ox                      + m12       ;
+      to[i][1] =           m5 * oy            + m13       ;
+      to[i][2] =                     m10 * oz + m14       ;
+   }
+   to_vec->size = 3;
+   to_vec->flags |= VEC_SIZE_3;
+   to_vec->count = from_vec->count;
+}
+
+static void _XFORMAPI
+TAG(transform_points3_perspective)( GLvector4f *to_vec,
+				    const GLfloat m[16],
+				    const GLvector4f *from_vec )
+{
+   const GLuint stride = from_vec->stride;
+   GLfloat *from = from_vec->start;
+   GLfloat (*to)[4] = (GLfloat (*)[4])to_vec->start;
+   GLuint count = from_vec->count;
+   const GLfloat m0 = m[0], m5 = m[5], m8 = m[8], m9 = m[9];
+   const GLfloat m10 = m[10], m14 = m[14];
+   GLuint i;
+   STRIDE_LOOP {
+      const GLfloat ox = from[0], oy = from[1], oz = from[2];
+      to[i][0] = m0 * ox           + m8  * oz       ;
+      to[i][1] =           m5 * oy + m9  * oz       ;
+      to[i][2] =                     m10 * oz + m14 ;
+      to[i][3] =                          -oz       ;
+   }
+   to_vec->size = 4;
+   to_vec->flags |= VEC_SIZE_4;
+   to_vec->count = from_vec->count;
+}
+
+
+
+static void _XFORMAPI
+TAG(transform_points4_general)( GLvector4f *to_vec,
+				const GLfloat m[16],
+				const GLvector4f *from_vec )
+{
+   const GLuint stride = from_vec->stride;
+   GLfloat *from = from_vec->start;
+   GLfloat (*to)[4] = (GLfloat (*)[4])to_vec->start;
+   GLuint count = from_vec->count;
+   const GLfloat m0 = m[0],  m4 = m[4],  m8 = m[8],  m12 = m[12];
+   const GLfloat m1 = m[1],  m5 = m[5],  m9 = m[9],  m13 = m[13];
+   const GLfloat m2 = m[2],  m6 = m[6],  m10 = m[10],  m14 = m[14];
+   const GLfloat m3 = m[3],  m7 = m[7],  m11 = m[11],  m15 = m[15];
+   GLuint i;
+   STRIDE_LOOP {
+      const GLfloat ox = from[0], oy = from[1], oz = from[2], ow = from[3];
+      to[i][0] = m0 * ox + m4 * oy + m8  * oz + m12 * ow;
+      to[i][1] = m1 * ox + m5 * oy + m9  * oz + m13 * ow;
+      to[i][2] = m2 * ox + m6 * oy + m10 * oz + m14 * ow;
+      to[i][3] = m3 * ox + m7 * oy + m11 * oz + m15 * ow;
+   }
+   to_vec->size = 4;
+   to_vec->flags |= VEC_SIZE_4;
+   to_vec->count = from_vec->count;
+}
+
+static void _XFORMAPI
+TAG(transform_points4_identity)( GLvector4f *to_vec,
+				 const GLfloat m[16],
+				 const GLvector4f *from_vec )
+{
+   const GLuint stride = from_vec->stride;
+   GLfloat *from = from_vec->start;
+   GLfloat (*to)[4] = (GLfloat (*)[4])to_vec->start;
+   GLuint count = from_vec->count;
+   GLuint i;
+   if (to_vec == from_vec) return;
+   STRIDE_LOOP {
+      to[i][0] = from[0];
+      to[i][1] = from[1];
+      to[i][2] = from[2];
+      to[i][3] = from[3];
+   }
+   to_vec->size = 4;
+   to_vec->flags |= VEC_SIZE_4;
+   to_vec->count = from_vec->count;
+}
+
+static void _XFORMAPI
+TAG(transform_points4_2d)( GLvector4f *to_vec,
+			   const GLfloat m[16],
+			   const GLvector4f *from_vec )
+{
+   const GLuint stride = from_vec->stride;
+   GLfloat *from = from_vec->start;
+   GLfloat (*to)[4] = (GLfloat (*)[4])to_vec->start;
+   GLuint count = from_vec->count;
+   const GLfloat m0 = m[0], m1 = m[1], m4 = m[4], m5 = m[5];
+   const GLfloat m12 = m[12], m13 = m[13];
+   GLuint i;
+   STRIDE_LOOP {
+      const GLfloat ox = from[0], oy = from[1], oz = from[2], ow = from[3];
+      to[i][0] = m0 * ox + m4 * oy            + m12 * ow;
+      to[i][1] = m1 * ox + m5 * oy            + m13 * ow;
+      to[i][2] =                   +       oz           ;
+      to[i][3] =                                      ow;
+   }
+   to_vec->size = 4;
+   to_vec->flags |= VEC_SIZE_4;
+   to_vec->count = from_vec->count;
+}
+
+static void _XFORMAPI
+TAG(transform_points4_2d_no_rot)( GLvector4f *to_vec,
+				  const GLfloat m[16],
+				  const GLvector4f *from_vec )
+{
+   const GLuint stride = from_vec->stride;
+   GLfloat *from = from_vec->start;
+   GLfloat (*to)[4] = (GLfloat (*)[4])to_vec->start;
+   GLuint count = from_vec->count;
+   const GLfloat m0 = m[0], m5 = m[5], m12 = m[12], m13 = m[13];
+   GLuint i;
+   STRIDE_LOOP {
+      const GLfloat ox = from[0], oy = from[1], oz = from[2], ow = from[3];
+      to[i][0] = m0 * ox                      + m12 * ow;
+      to[i][1] =           m5 * oy            + m13 * ow;
+      to[i][2] =                   +       oz           ;
+      to[i][3] =                                      ow;
+   }
+   to_vec->size = 4;
+   to_vec->flags |= VEC_SIZE_4;
+   to_vec->count = from_vec->count;
+}
+
+static void _XFORMAPI
+TAG(transform_points4_3d)( GLvector4f *to_vec,
+			   const GLfloat m[16],
+			   const GLvector4f *from_vec )
+{
+   const GLuint stride = from_vec->stride;
+   GLfloat *from = from_vec->start;
+   GLfloat (*to)[4] = (GLfloat (*)[4])to_vec->start;
+   GLuint count = from_vec->count;
+   const GLfloat m0 = m[0], m1 = m[1], m2 = m[2], m4 = m[4], m5 = m[5];
+   const GLfloat m6 = m[6], m8 = m[8], m9 = m[9], m10 = m[10];
+   const GLfloat m12 = m[12], m13 = m[13], m14 = m[14];
+   GLuint i;
+   STRIDE_LOOP {
+      const GLfloat ox = from[0], oy = from[1], oz = from[2], ow = from[3];
+      to[i][0] = m0 * ox + m4 * oy +  m8 * oz + m12 * ow;
+      to[i][1] = m1 * ox + m5 * oy +  m9 * oz + m13 * ow;
+      to[i][2] = m2 * ox + m6 * oy + m10 * oz + m14 * ow;
+      to[i][3] =                                      ow;
+   }
+   to_vec->size = 4;
+   to_vec->flags |= VEC_SIZE_4;
+   to_vec->count = from_vec->count;
+}
+
+static void _XFORMAPI
+TAG(transform_points4_3d_no_rot)( GLvector4f *to_vec,
+				  const GLfloat m[16],
+				  const GLvector4f *from_vec )
+{
+   const GLuint stride = from_vec->stride;
+   GLfloat *from = from_vec->start;
+   GLfloat (*to)[4] = (GLfloat (*)[4])to_vec->start;
+   GLuint count = from_vec->count;
+   const GLfloat m0 = m[0], m5 = m[5];
+   const GLfloat m10 = m[10], m12 = m[12], m13 = m[13], m14 = m[14];
+   GLuint i;
+   STRIDE_LOOP {
+      const GLfloat ox = from[0], oy = from[1], oz = from[2], ow = from[3];
+      to[i][0] = m0 * ox                      + m12 * ow;
+      to[i][1] =           m5 * oy            + m13 * ow;
+      to[i][2] =                     m10 * oz + m14 * ow;
+      to[i][3] =                                      ow;
+   }
+   to_vec->size = 4;
+   to_vec->flags |= VEC_SIZE_4;
+   to_vec->count = from_vec->count;
+}
+
+static void _XFORMAPI
+TAG(transform_points4_perspective)( GLvector4f *to_vec,
+				    const GLfloat m[16],
+				    const GLvector4f *from_vec )
+{
+   const GLuint stride = from_vec->stride;
+   GLfloat *from = from_vec->start;
+   GLfloat (*to)[4] = (GLfloat (*)[4])to_vec->start;
+   GLuint count = from_vec->count;
+   const GLfloat m0 = m[0], m5 = m[5], m8 = m[8], m9 = m[9];
+   const GLfloat m10 = m[10], m14 = m[14];
+   GLuint i;
+   STRIDE_LOOP {
+      const GLfloat ox = from[0], oy = from[1], oz = from[2], ow = from[3];
+      to[i][0] = m0 * ox           + m8  * oz            ;
+      to[i][1] =           m5 * oy + m9  * oz            ;
+      to[i][2] =                     m10 * oz + m14 * ow ;
+      to[i][3] =                          -oz            ;
+   }
+   to_vec->size = 4;
+   to_vec->flags |= VEC_SIZE_4;
+   to_vec->count = from_vec->count;
+}
+
+static transform_func _XFORMAPI TAG(transform_tab_1)[7];
+static transform_func _XFORMAPI TAG(transform_tab_2)[7];
+static transform_func _XFORMAPI TAG(transform_tab_3)[7];
+static transform_func _XFORMAPI TAG(transform_tab_4)[7];
+
+/* Similar functions could be called several times, with more highly
+ * optimized routines overwriting the arrays.  This only occurs during
+ * startup.
+ */
+static void _XFORMAPI TAG(init_c_transformations)( void )
+{
+#define TAG_TAB   _mesa_transform_tab
+#define TAG_TAB_1 TAG(transform_tab_1)
+#define TAG_TAB_2 TAG(transform_tab_2)
+#define TAG_TAB_3 TAG(transform_tab_3)
+#define TAG_TAB_4 TAG(transform_tab_4)
+
+   TAG_TAB[1] = TAG_TAB_1;
+   TAG_TAB[2] = TAG_TAB_2;
+   TAG_TAB[3] = TAG_TAB_3;
+   TAG_TAB[4] = TAG_TAB_4;
+
+   /* 1-D points (ie texcoords) */
+   TAG_TAB_1[MATRIX_GENERAL]     = TAG(transform_points1_general);
+   TAG_TAB_1[MATRIX_IDENTITY]    = TAG(transform_points1_identity);
+   TAG_TAB_1[MATRIX_3D_NO_ROT]   = TAG(transform_points1_3d_no_rot);
+   TAG_TAB_1[MATRIX_PERSPECTIVE] = TAG(transform_points1_perspective);
+   TAG_TAB_1[MATRIX_2D]          = TAG(transform_points1_2d);
+   TAG_TAB_1[MATRIX_2D_NO_ROT]   = TAG(transform_points1_2d_no_rot);
+   TAG_TAB_1[MATRIX_3D]          = TAG(transform_points1_3d);
+
+   /* 2-D points */
+   TAG_TAB_2[MATRIX_GENERAL]     = TAG(transform_points2_general);
+   TAG_TAB_2[MATRIX_IDENTITY]    = TAG(transform_points2_identity);
+   TAG_TAB_2[MATRIX_3D_NO_ROT]   = TAG(transform_points2_3d_no_rot);
+   TAG_TAB_2[MATRIX_PERSPECTIVE] = TAG(transform_points2_perspective);
+   TAG_TAB_2[MATRIX_2D]          = TAG(transform_points2_2d);
+   TAG_TAB_2[MATRIX_2D_NO_ROT]   = TAG(transform_points2_2d_no_rot);
+   TAG_TAB_2[MATRIX_3D]          = TAG(transform_points2_3d);
+
+   /* 3-D points */
+   TAG_TAB_3[MATRIX_GENERAL]     = TAG(transform_points3_general);
+   TAG_TAB_3[MATRIX_IDENTITY]    = TAG(transform_points3_identity);
+   TAG_TAB_3[MATRIX_3D_NO_ROT]   = TAG(transform_points3_3d_no_rot);
+   TAG_TAB_3[MATRIX_PERSPECTIVE] = TAG(transform_points3_perspective);
+   TAG_TAB_3[MATRIX_2D]          = TAG(transform_points3_2d);
+   TAG_TAB_3[MATRIX_2D_NO_ROT]   = TAG(transform_points3_2d_no_rot);
+   TAG_TAB_3[MATRIX_3D]          = TAG(transform_points3_3d);
+
+   /* 4-D points */
+   TAG_TAB_4[MATRIX_GENERAL]     = TAG(transform_points4_general);
+   TAG_TAB_4[MATRIX_IDENTITY]    = TAG(transform_points4_identity);
+   TAG_TAB_4[MATRIX_3D_NO_ROT]   = TAG(transform_points4_3d_no_rot);
+   TAG_TAB_4[MATRIX_PERSPECTIVE] = TAG(transform_points4_perspective);
+   TAG_TAB_4[MATRIX_2D]          = TAG(transform_points4_2d);
+   TAG_TAB_4[MATRIX_2D_NO_ROT]   = TAG(transform_points4_2d_no_rot);
+   TAG_TAB_4[MATRIX_3D]          = TAG(transform_points4_3d);
+
+#undef TAG_TAB
+#undef TAG_TAB_1
+#undef TAG_TAB_2
+#undef TAG_TAB_3
+#undef TAG_TAB_4
+}
diff --git a/reactos/lib/mesa32/src/math/math.dsp b/reactos/lib/mesa32/src/math/math.dsp
new file mode 100644
index 00000000000..c37bd05c950
--- /dev/null
+++ b/reactos/lib/mesa32/src/math/math.dsp
@@ -0,0 +1,180 @@
+# Microsoft Developer Studio Project File - Name="math" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=math - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "math.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "math.mak" CFG="math - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "math - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "math - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "math - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "../../../include" /I "../" /I "../main" /I "../glapi" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "math - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../" /I "../main" /I "../glapi" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "math - Win32 Release"
+# Name "math - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\m_debug_clip.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_debug_norm.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_debug_xform.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_eval.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_matrix.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_translate.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_vector.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_xform.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\m_clip_tmp.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_copy_tmp.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_debug.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_debug_util.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_dotprod_tmp.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_eval.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_matrix.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_norm_tmp.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_trans_tmp.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_translate.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_vector.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_xform.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_xform_tmp.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\mathmod.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/reactos/lib/mesa32/src/math/mathmod.h b/reactos/lib/mesa32/src/math/mathmod.h
new file mode 100644
index 00000000000..6fbaaea94bc
--- /dev/null
+++ b/reactos/lib/mesa32/src/math/mathmod.h
@@ -0,0 +1,41 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/**
+ * \mainpage Mesa Math Module
+ *
+ * This module contains math-related utility functions for transforming
+ * vertices, translating arrays of numbers from one data type to another,
+ * evaluating curved surfaces, etc.
+ */
+
+
+#ifndef _MESA_MATH_H_
+#define _MESA_MATH_H_
+
+extern void _math_init( void );
+
+#endif
diff --git a/reactos/lib/mesa32/src/sparc/clip.S b/reactos/lib/mesa32/src/sparc/clip.S
new file mode 100644
index 00000000000..fc5c677ee4a
--- /dev/null
+++ b/reactos/lib/mesa32/src/sparc/clip.S
@@ -0,0 +1,236 @@
+/*
+ * Clip testing in SPARC assembly
+ */
+
+#if defined(__sparc_v9__) && !defined(__linux__)
+#define LDPTR		ldx
+#define V4F_DATA	0x00
+#define V4F_START	0x08
+#define V4F_COUNT	0x10
+#define V4F_STRIDE	0x14
+#define V4F_SIZE	0x18
+#define V4F_FLAGS	0x1c
+#else
+#define LDPTR		ld
+#define V4F_DATA	0x00
+#define V4F_START	0x04
+#define V4F_COUNT	0x08
+#define V4F_STRIDE	0x0c
+#define V4F_SIZE	0x10
+#define V4F_FLAGS	0x14
+#endif
+
+#define VEC_SIZE_1   	1
+#define VEC_SIZE_2   	3
+#define VEC_SIZE_3   	7
+#define VEC_SIZE_4   	15
+
+	.text
+	.align		64
+
+one_dot_zero:
+	.word		0x3f800000	/* 1.0f */
+
+	/* This trick is shamelessly stolen from the x86
+	 * Mesa asm.  Very clever, and we can do it too
+	 * since we have the necessary add with carry
+	 * instructions on Sparc.
+	 */
+clip_table:
+	.byte	 0,  1,  0,  2,  4,  5,  4,  6
+	.byte	 0,  1,  0,  2,  8,  9,  8, 10
+	.byte	32, 33, 32, 34, 36, 37, 36, 38
+	.byte	32, 33, 32, 34, 40, 41, 40, 42
+	.byte	 0,  1,  0,  2,  4,  5,  4,  6
+	.byte	 0,  1,  0,  2,  8,  9,  8, 10
+	.byte	16, 17, 16, 18, 20, 21, 20, 22
+	.byte	16, 17, 16, 18, 24, 25, 24, 26
+	.byte	63, 61, 63, 62, 55, 53, 55, 54
+	.byte	63, 61, 63, 62, 59, 57, 59, 58
+	.byte	47, 45, 47, 46, 39, 37, 39, 38
+	.byte	47, 45, 47, 46, 43, 41, 43, 42
+	.byte	63, 61, 63, 62, 55, 53, 55, 54
+	.byte	63, 61, 63, 62, 59, 57, 59, 58
+	.byte	31, 29, 31, 30, 23, 21, 23, 22
+	.byte	31, 29, 31, 30, 27, 25, 27, 26
+
+/* GLvector4f *clip_vec, GLvector4f *proj_vec, 
+   GLubyte clipMask[], GLubyte *orMask, GLubyte *andMask */
+
+	.align		64
+__pc_tramp:
+	retl
+	 nop
+
+	.globl		_mesa_sparc_cliptest_points4
+_mesa_sparc_cliptest_points4:
+	save		%sp, -64, %sp
+	call		__pc_tramp
+	 sub		%o7, (. - one_dot_zero - 4), %g1
+	ld		[%g1 + 0x0], %f4
+	add		%g1, 0x4, %g1
+
+	ld		[%i0 + V4F_STRIDE], %l1
+	ld		[%i0 + V4F_COUNT], %g7
+	LDPTR		[%i0 + V4F_START], %i0
+	LDPTR		[%i1 + V4F_START], %i5
+	ldub		[%i3], %g2
+	ldub		[%i4], %g3
+	sll		%g3, 8, %g3
+	or		%g2, %g3, %g2
+
+	ld		[%i1 + V4F_FLAGS], %g3
+	or		%g3, VEC_SIZE_4, %g3
+	st		%g3, [%i1 + V4F_FLAGS]
+	mov		3, %g3
+	st		%g3, [%i1 + V4F_SIZE]
+	st		%g7, [%i1 + V4F_COUNT]
+	clr		%l2
+	clr		%l0
+
+	/* l0:	i
+	 * g7:	count
+	 * l1:	stride
+	 * l2:	c
+	 * g2:	(tmpAndMask << 8) | tmpOrMask
+	 * g1:	clip_table
+	 * i0:	from[stride][i]
+	 * i2:	clipMask
+	 * i5:	vProj[4][i]
+	 */
+
+1:	ld		[%i0 + 0x0c], %f3	! LSU	Group
+	ld		[%i0 + 0x0c], %g5	! LSU	Group
+	ld		[%i0 + 0x08], %g4	! LSU	Group
+	fdivs		%f4, %f3, %f8		! FGM
+	addcc		%g5, %g5, %g5		! IEU1	Group
+	addx		%g0, 0x0, %g3		! IEU1	Group
+	addcc		%g4, %g4, %g4		! IEU1	Group
+	addx		%g3, %g3, %g3		! IEU1	Group
+	subcc		%g5, %g4, %g0		! IEU1	Group
+	ld		[%i0 + 0x04], %g4	! LSU	Group
+	addx		%g3, %g3, %g3		! IEU1	Group
+	addcc		%g4, %g4, %g4		! IEU1	Group
+	addx		%g3, %g3, %g3		! IEU1	Group
+	subcc		%g5, %g4, %g0		! IEU1	Group
+	ld		[%i0 + 0x00], %g4	! LSU	Group
+	addx		%g3, %g3, %g3		! IEU1	Group
+	addcc		%g4, %g4, %g4		! IEU1	Group
+	addx		%g3, %g3, %g3		! IEU1	Group
+	subcc		%g5, %g4, %g0		! IEU1	Group
+	addx		%g3, %g3, %g3		! IEU1	Group
+	ldub		[%g1 + %g3], %g3	! LSU	Group
+	cmp		%g3, 0			! IEU1	Group, stall
+	be		2f			! CTI
+	 stb		%g3, [%i2]		! LSU
+	sll		%g3, 8, %g4		! IEU1	Group
+	add		%l2, 1, %l2		! IEU0
+	st		%g0, [%i5 + 0x00]	! LSU
+	or		%g4, 0xff, %g4		! IEU0	Group
+	or		%g2, %g3, %g2		! IEU1
+	st		%g0, [%i5 + 0x04]	! LSU
+	and		%g2, %g4, %g2		! IEU0	Group
+	st		%g0, [%i5 + 0x08]	! LSU
+	b		3f			! CTI
+	 st		%f4, [%i5 + 0x0c]	! LSU	Group
+2:	ld		[%i0 + 0x00], %f0	! LSU	Group
+	ld		[%i0 + 0x04], %f1	! LSU	Group
+	ld		[%i0 + 0x08], %f2	! LSU	Group
+	fmuls		%f0, %f8, %f0		! FGM
+	st		%f0, [%i5 + 0x00]	! LSU	Group
+	fmuls		%f1, %f8, %f1		! FGM
+	st		%f1, [%i5 + 0x04]	! LSU	Group
+	fmuls		%f2, %f8, %f2		! FGM
+	st		%f2, [%i5 + 0x08]	! LSU	Group
+	st		%f8, [%i5 + 0x0c]	! LSU	Group
+3:	add		%i5, 0x10, %i5		! IEU1
+	add		%l0, 1, %l0		! IEU0	Group
+	add		%i2, 1, %i2		! IEU0	Group
+	cmp		%l0, %g7		! IEU1	Group
+	bne		1b			! CTI
+	 add		%i0, %l1, %i0		! IEU0	Group
+	stb		%g2, [%i3]		! LSU
+	srl		%g2, 8, %g3		! IEU0	Group
+	cmp		%l2, %g7		! IEU1	Group
+	bl,a		1f			! CTI
+	 clr		%g3			! IEU0
+1:	stb		%g3, [%i4]		! LSU	Group
+	ret					! CTI	Group
+	 restore	%i1, 0x0, %o0
+
+	.globl		_mesa_sparc_cliptest_points4_np
+_mesa_sparc_cliptest_points4_np:
+	save		%sp, -64, %sp
+
+	call		__pc_tramp
+	 sub		%o7, (. - one_dot_zero - 4), %g1
+	add		%g1, 0x4, %g1
+
+	ld		[%i0 + V4F_STRIDE], %l1
+	ld		[%i0 + V4F_COUNT], %g7
+	LDPTR		[%i0 + V4F_START], %i0
+	LDPTR		[%i1 + V4F_START], %i5
+	ldub		[%i3], %g2
+	ldub		[%i4], %g3
+	sll		%g3, 8, %g3
+	or		%g2, %g3, %g2
+
+	ld		[%i1 + V4F_FLAGS], %g3
+	or		%g3, VEC_SIZE_4, %g3
+	st		%g3, [%i1 + V4F_FLAGS]
+	mov		3, %g3
+	st		%g3, [%i1 + V4F_SIZE]
+	st		%g7, [%i1 + V4F_COUNT]
+	clr		%l2
+	clr		%l0
+
+	/* l0:	i
+	 * g7:	count
+	 * l1:	stride
+	 * l2:	c
+	 * g2:	(tmpAndMask << 8) | tmpOrMask
+	 * g1:	clip_table
+	 * i0:	from[stride][i]
+	 * i2:	clipMask
+	 */
+
+1:	ld		[%i0 + 0x0c], %g5	! LSU	Group
+	ld		[%i0 + 0x08], %g4	! LSU	Group
+	addcc		%g5, %g5, %g5		! IEU1	Group
+	addx		%g0, 0x0, %g3		! IEU1	Group
+	addcc		%g4, %g4, %g4		! IEU1	Group
+	addx		%g3, %g3, %g3		! IEU1	Group
+	subcc		%g5, %g4, %g0		! IEU1	Group
+	ld		[%i0 + 0x04], %g4	! LSU	Group
+	addx		%g3, %g3, %g3		! IEU1	Group
+	addcc		%g4, %g4, %g4		! IEU1	Group
+	addx		%g3, %g3, %g3		! IEU1	Group
+	subcc		%g5, %g4, %g0		! IEU1	Group
+	ld		[%i0 + 0x00], %g4	! LSU	Group
+	addx		%g3, %g3, %g3		! IEU1	Group
+	addcc		%g4, %g4, %g4		! IEU1	Group
+	addx		%g3, %g3, %g3		! IEU1	Group
+	subcc		%g5, %g4, %g0		! IEU1	Group
+	addx		%g3, %g3, %g3		! IEU1	Group
+	ldub		[%g1 + %g3], %g3	! LSU	Group
+	cmp		%g3, 0			! IEU1	Group, stall
+	be		2f			! CTI
+	 stb		%g3, [%i2]		! LSU
+	sll		%g3, 8, %g4		! IEU1	Group
+	add		%l2, 1, %l2		! IEU0
+	or		%g4, 0xff, %g4		! IEU0	Group
+	or		%g2, %g3, %g2		! IEU1
+	and		%g2, %g4, %g2		! IEU0	Group
+2:	add		%l0, 1, %l0		! IEU0	Group
+	add		%i2, 1, %i2		! IEU0	Group
+	cmp		%l0, %g7		! IEU1	Group
+	bne		1b			! CTI
+	 add		%i0, %l1, %i0		! IEU0	Group
+	stb		%g2, [%i3]		! LSU
+	srl		%g2, 8, %g3		! IEU0	Group
+	cmp		%l2, %g7		! IEU1	Group
+	bl,a		1f			! CTI
+	 clr		%g3			! IEU0
+1:	stb		%g3, [%i4]		! LSU	Group
+	ret					! CTI	Group
+	 restore	%i1, 0x0, %o0
diff --git a/reactos/lib/mesa32/src/sparc/glapi_sparc.S b/reactos/lib/mesa32/src/sparc/glapi_sparc.S
new file mode 100644
index 00000000000..f3a2c696be5
--- /dev/null
+++ b/reactos/lib/mesa32/src/sparc/glapi_sparc.S
@@ -0,0 +1,19243 @@
+/* DO NOT EDIT - This file generated automatically with glsparcasm.py script */
+#include "glapioffsets.h"
+
+/* The _glapi_Dispatch symbol addresses get relocated into the
+ * sethi/or instruction sequences below at library init time.
+ */
+
+
+.text
+.align 32
+.globl __glapi_sparc_icache_flush
+__glapi_sparc_icache_flush: /* %o0 = insn_addr */
+	flush	%o0
+	retl
+	nop
+
+.data
+.align 64
+
+.globl _mesa_sparc_glapi_begin
+.type _mesa_sparc_glapi_begin,#function
+_mesa_sparc_glapi_begin:
+
+.globl glNewList
+.type glNewList,#function
+glNewList:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_NewList), %g2
+	or	%g2, %lo(8 * _gloffset_NewList), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_NewList)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glEndList
+.type glEndList,#function
+glEndList:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_EndList), %g2
+	or	%g2, %lo(8 * _gloffset_EndList), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_EndList)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCallList
+.type glCallList,#function
+glCallList:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CallList), %g2
+	or	%g2, %lo(8 * _gloffset_CallList), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CallList)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCallLists
+.type glCallLists,#function
+glCallLists:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CallLists), %g2
+	or	%g2, %lo(8 * _gloffset_CallLists), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CallLists)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glDeleteLists
+.type glDeleteLists,#function
+glDeleteLists:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_DeleteLists), %g2
+	or	%g2, %lo(8 * _gloffset_DeleteLists), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_DeleteLists)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGenLists
+.type glGenLists,#function
+glGenLists:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GenLists), %g2
+	or	%g2, %lo(8 * _gloffset_GenLists), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GenLists)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glListBase
+.type glListBase,#function
+glListBase:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ListBase), %g2
+	or	%g2, %lo(8 * _gloffset_ListBase), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ListBase)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glBegin
+.type glBegin,#function
+glBegin:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Begin), %g2
+	or	%g2, %lo(8 * _gloffset_Begin), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Begin)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glBitmap
+.type glBitmap,#function
+glBitmap:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Bitmap), %g2
+	or	%g2, %lo(8 * _gloffset_Bitmap), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Bitmap)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColor3b
+.type glColor3b,#function
+glColor3b:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Color3b), %g2
+	or	%g2, %lo(8 * _gloffset_Color3b), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Color3b)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColor3bv
+.type glColor3bv,#function
+glColor3bv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Color3bv), %g2
+	or	%g2, %lo(8 * _gloffset_Color3bv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Color3bv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColor3d
+.type glColor3d,#function
+glColor3d:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Color3d), %g2
+	or	%g2, %lo(8 * _gloffset_Color3d), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Color3d)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColor3dv
+.type glColor3dv,#function
+glColor3dv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Color3dv), %g2
+	or	%g2, %lo(8 * _gloffset_Color3dv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Color3dv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColor3f
+.type glColor3f,#function
+glColor3f:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Color3f), %g2
+	or	%g2, %lo(8 * _gloffset_Color3f), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Color3f)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColor3fv
+.type glColor3fv,#function
+glColor3fv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Color3fv), %g2
+	or	%g2, %lo(8 * _gloffset_Color3fv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Color3fv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColor3i
+.type glColor3i,#function
+glColor3i:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Color3i), %g2
+	or	%g2, %lo(8 * _gloffset_Color3i), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Color3i)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColor3iv
+.type glColor3iv,#function
+glColor3iv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Color3iv), %g2
+	or	%g2, %lo(8 * _gloffset_Color3iv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Color3iv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColor3s
+.type glColor3s,#function
+glColor3s:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Color3s), %g2
+	or	%g2, %lo(8 * _gloffset_Color3s), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Color3s)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColor3sv
+.type glColor3sv,#function
+glColor3sv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Color3sv), %g2
+	or	%g2, %lo(8 * _gloffset_Color3sv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Color3sv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColor3ub
+.type glColor3ub,#function
+glColor3ub:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Color3ub), %g2
+	or	%g2, %lo(8 * _gloffset_Color3ub), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Color3ub)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColor3ubv
+.type glColor3ubv,#function
+glColor3ubv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Color3ubv), %g2
+	or	%g2, %lo(8 * _gloffset_Color3ubv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Color3ubv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColor3ui
+.type glColor3ui,#function
+glColor3ui:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Color3ui), %g2
+	or	%g2, %lo(8 * _gloffset_Color3ui), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Color3ui)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColor3uiv
+.type glColor3uiv,#function
+glColor3uiv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Color3uiv), %g2
+	or	%g2, %lo(8 * _gloffset_Color3uiv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Color3uiv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColor3us
+.type glColor3us,#function
+glColor3us:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Color3us), %g2
+	or	%g2, %lo(8 * _gloffset_Color3us), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Color3us)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColor3usv
+.type glColor3usv,#function
+glColor3usv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Color3usv), %g2
+	or	%g2, %lo(8 * _gloffset_Color3usv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Color3usv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColor4b
+.type glColor4b,#function
+glColor4b:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Color4b), %g2
+	or	%g2, %lo(8 * _gloffset_Color4b), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Color4b)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColor4bv
+.type glColor4bv,#function
+glColor4bv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Color4bv), %g2
+	or	%g2, %lo(8 * _gloffset_Color4bv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Color4bv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColor4d
+.type glColor4d,#function
+glColor4d:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Color4d), %g2
+	or	%g2, %lo(8 * _gloffset_Color4d), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Color4d)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColor4dv
+.type glColor4dv,#function
+glColor4dv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Color4dv), %g2
+	or	%g2, %lo(8 * _gloffset_Color4dv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Color4dv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColor4f
+.type glColor4f,#function
+glColor4f:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Color4f), %g2
+	or	%g2, %lo(8 * _gloffset_Color4f), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Color4f)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColor4fv
+.type glColor4fv,#function
+glColor4fv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Color4fv), %g2
+	or	%g2, %lo(8 * _gloffset_Color4fv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Color4fv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColor4i
+.type glColor4i,#function
+glColor4i:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Color4i), %g2
+	or	%g2, %lo(8 * _gloffset_Color4i), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Color4i)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColor4iv
+.type glColor4iv,#function
+glColor4iv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Color4iv), %g2
+	or	%g2, %lo(8 * _gloffset_Color4iv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Color4iv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColor4s
+.type glColor4s,#function
+glColor4s:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Color4s), %g2
+	or	%g2, %lo(8 * _gloffset_Color4s), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Color4s)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColor4sv
+.type glColor4sv,#function
+glColor4sv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Color4sv), %g2
+	or	%g2, %lo(8 * _gloffset_Color4sv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Color4sv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColor4ub
+.type glColor4ub,#function
+glColor4ub:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Color4ub), %g2
+	or	%g2, %lo(8 * _gloffset_Color4ub), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Color4ub)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColor4ubv
+.type glColor4ubv,#function
+glColor4ubv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Color4ubv), %g2
+	or	%g2, %lo(8 * _gloffset_Color4ubv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Color4ubv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColor4ui
+.type glColor4ui,#function
+glColor4ui:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Color4ui), %g2
+	or	%g2, %lo(8 * _gloffset_Color4ui), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Color4ui)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColor4uiv
+.type glColor4uiv,#function
+glColor4uiv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Color4uiv), %g2
+	or	%g2, %lo(8 * _gloffset_Color4uiv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Color4uiv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColor4us
+.type glColor4us,#function
+glColor4us:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Color4us), %g2
+	or	%g2, %lo(8 * _gloffset_Color4us), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Color4us)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColor4usv
+.type glColor4usv,#function
+glColor4usv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Color4usv), %g2
+	or	%g2, %lo(8 * _gloffset_Color4usv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Color4usv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glEdgeFlag
+.type glEdgeFlag,#function
+glEdgeFlag:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_EdgeFlag), %g2
+	or	%g2, %lo(8 * _gloffset_EdgeFlag), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_EdgeFlag)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glEdgeFlagv
+.type glEdgeFlagv,#function
+glEdgeFlagv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_EdgeFlagv), %g2
+	or	%g2, %lo(8 * _gloffset_EdgeFlagv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_EdgeFlagv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glEnd
+.type glEnd,#function
+glEnd:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_End), %g2
+	or	%g2, %lo(8 * _gloffset_End), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_End)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glIndexd
+.type glIndexd,#function
+glIndexd:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Indexd), %g2
+	or	%g2, %lo(8 * _gloffset_Indexd), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Indexd)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glIndexdv
+.type glIndexdv,#function
+glIndexdv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Indexdv), %g2
+	or	%g2, %lo(8 * _gloffset_Indexdv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Indexdv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glIndexf
+.type glIndexf,#function
+glIndexf:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Indexf), %g2
+	or	%g2, %lo(8 * _gloffset_Indexf), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Indexf)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glIndexfv
+.type glIndexfv,#function
+glIndexfv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Indexfv), %g2
+	or	%g2, %lo(8 * _gloffset_Indexfv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Indexfv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glIndexi
+.type glIndexi,#function
+glIndexi:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Indexi), %g2
+	or	%g2, %lo(8 * _gloffset_Indexi), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Indexi)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glIndexiv
+.type glIndexiv,#function
+glIndexiv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Indexiv), %g2
+	or	%g2, %lo(8 * _gloffset_Indexiv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Indexiv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glIndexs
+.type glIndexs,#function
+glIndexs:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Indexs), %g2
+	or	%g2, %lo(8 * _gloffset_Indexs), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Indexs)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glIndexsv
+.type glIndexsv,#function
+glIndexsv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Indexsv), %g2
+	or	%g2, %lo(8 * _gloffset_Indexsv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Indexsv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glNormal3b
+.type glNormal3b,#function
+glNormal3b:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Normal3b), %g2
+	or	%g2, %lo(8 * _gloffset_Normal3b), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Normal3b)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glNormal3bv
+.type glNormal3bv,#function
+glNormal3bv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Normal3bv), %g2
+	or	%g2, %lo(8 * _gloffset_Normal3bv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Normal3bv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glNormal3d
+.type glNormal3d,#function
+glNormal3d:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Normal3d), %g2
+	or	%g2, %lo(8 * _gloffset_Normal3d), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Normal3d)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glNormal3dv
+.type glNormal3dv,#function
+glNormal3dv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Normal3dv), %g2
+	or	%g2, %lo(8 * _gloffset_Normal3dv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Normal3dv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glNormal3f
+.type glNormal3f,#function
+glNormal3f:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Normal3f), %g2
+	or	%g2, %lo(8 * _gloffset_Normal3f), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Normal3f)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glNormal3fv
+.type glNormal3fv,#function
+glNormal3fv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Normal3fv), %g2
+	or	%g2, %lo(8 * _gloffset_Normal3fv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Normal3fv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glNormal3i
+.type glNormal3i,#function
+glNormal3i:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Normal3i), %g2
+	or	%g2, %lo(8 * _gloffset_Normal3i), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Normal3i)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glNormal3iv
+.type glNormal3iv,#function
+glNormal3iv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Normal3iv), %g2
+	or	%g2, %lo(8 * _gloffset_Normal3iv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Normal3iv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glNormal3s
+.type glNormal3s,#function
+glNormal3s:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Normal3s), %g2
+	or	%g2, %lo(8 * _gloffset_Normal3s), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Normal3s)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glNormal3sv
+.type glNormal3sv,#function
+glNormal3sv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Normal3sv), %g2
+	or	%g2, %lo(8 * _gloffset_Normal3sv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Normal3sv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRasterPos2d
+.type glRasterPos2d,#function
+glRasterPos2d:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_RasterPos2d), %g2
+	or	%g2, %lo(8 * _gloffset_RasterPos2d), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_RasterPos2d)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRasterPos2dv
+.type glRasterPos2dv,#function
+glRasterPos2dv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_RasterPos2dv), %g2
+	or	%g2, %lo(8 * _gloffset_RasterPos2dv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_RasterPos2dv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRasterPos2f
+.type glRasterPos2f,#function
+glRasterPos2f:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_RasterPos2f), %g2
+	or	%g2, %lo(8 * _gloffset_RasterPos2f), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_RasterPos2f)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRasterPos2fv
+.type glRasterPos2fv,#function
+glRasterPos2fv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_RasterPos2fv), %g2
+	or	%g2, %lo(8 * _gloffset_RasterPos2fv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_RasterPos2fv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRasterPos2i
+.type glRasterPos2i,#function
+glRasterPos2i:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_RasterPos2i), %g2
+	or	%g2, %lo(8 * _gloffset_RasterPos2i), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_RasterPos2i)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRasterPos2iv
+.type glRasterPos2iv,#function
+glRasterPos2iv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_RasterPos2iv), %g2
+	or	%g2, %lo(8 * _gloffset_RasterPos2iv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_RasterPos2iv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRasterPos2s
+.type glRasterPos2s,#function
+glRasterPos2s:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_RasterPos2s), %g2
+	or	%g2, %lo(8 * _gloffset_RasterPos2s), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_RasterPos2s)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRasterPos2sv
+.type glRasterPos2sv,#function
+glRasterPos2sv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_RasterPos2sv), %g2
+	or	%g2, %lo(8 * _gloffset_RasterPos2sv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_RasterPos2sv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRasterPos3d
+.type glRasterPos3d,#function
+glRasterPos3d:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_RasterPos3d), %g2
+	or	%g2, %lo(8 * _gloffset_RasterPos3d), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_RasterPos3d)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRasterPos3dv
+.type glRasterPos3dv,#function
+glRasterPos3dv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_RasterPos3dv), %g2
+	or	%g2, %lo(8 * _gloffset_RasterPos3dv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_RasterPos3dv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRasterPos3f
+.type glRasterPos3f,#function
+glRasterPos3f:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_RasterPos3f), %g2
+	or	%g2, %lo(8 * _gloffset_RasterPos3f), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_RasterPos3f)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRasterPos3fv
+.type glRasterPos3fv,#function
+glRasterPos3fv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_RasterPos3fv), %g2
+	or	%g2, %lo(8 * _gloffset_RasterPos3fv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_RasterPos3fv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRasterPos3i
+.type glRasterPos3i,#function
+glRasterPos3i:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_RasterPos3i), %g2
+	or	%g2, %lo(8 * _gloffset_RasterPos3i), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_RasterPos3i)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRasterPos3iv
+.type glRasterPos3iv,#function
+glRasterPos3iv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_RasterPos3iv), %g2
+	or	%g2, %lo(8 * _gloffset_RasterPos3iv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_RasterPos3iv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRasterPos3s
+.type glRasterPos3s,#function
+glRasterPos3s:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_RasterPos3s), %g2
+	or	%g2, %lo(8 * _gloffset_RasterPos3s), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_RasterPos3s)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRasterPos3sv
+.type glRasterPos3sv,#function
+glRasterPos3sv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_RasterPos3sv), %g2
+	or	%g2, %lo(8 * _gloffset_RasterPos3sv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_RasterPos3sv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRasterPos4d
+.type glRasterPos4d,#function
+glRasterPos4d:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_RasterPos4d), %g2
+	or	%g2, %lo(8 * _gloffset_RasterPos4d), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_RasterPos4d)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRasterPos4dv
+.type glRasterPos4dv,#function
+glRasterPos4dv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_RasterPos4dv), %g2
+	or	%g2, %lo(8 * _gloffset_RasterPos4dv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_RasterPos4dv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRasterPos4f
+.type glRasterPos4f,#function
+glRasterPos4f:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_RasterPos4f), %g2
+	or	%g2, %lo(8 * _gloffset_RasterPos4f), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_RasterPos4f)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRasterPos4fv
+.type glRasterPos4fv,#function
+glRasterPos4fv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_RasterPos4fv), %g2
+	or	%g2, %lo(8 * _gloffset_RasterPos4fv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_RasterPos4fv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRasterPos4i
+.type glRasterPos4i,#function
+glRasterPos4i:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_RasterPos4i), %g2
+	or	%g2, %lo(8 * _gloffset_RasterPos4i), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_RasterPos4i)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRasterPos4iv
+.type glRasterPos4iv,#function
+glRasterPos4iv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_RasterPos4iv), %g2
+	or	%g2, %lo(8 * _gloffset_RasterPos4iv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_RasterPos4iv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRasterPos4s
+.type glRasterPos4s,#function
+glRasterPos4s:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_RasterPos4s), %g2
+	or	%g2, %lo(8 * _gloffset_RasterPos4s), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_RasterPos4s)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRasterPos4sv
+.type glRasterPos4sv,#function
+glRasterPos4sv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_RasterPos4sv), %g2
+	or	%g2, %lo(8 * _gloffset_RasterPos4sv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_RasterPos4sv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRectd
+.type glRectd,#function
+glRectd:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Rectd), %g2
+	or	%g2, %lo(8 * _gloffset_Rectd), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Rectd)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRectdv
+.type glRectdv,#function
+glRectdv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Rectdv), %g2
+	or	%g2, %lo(8 * _gloffset_Rectdv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Rectdv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRectf
+.type glRectf,#function
+glRectf:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Rectf), %g2
+	or	%g2, %lo(8 * _gloffset_Rectf), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Rectf)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRectfv
+.type glRectfv,#function
+glRectfv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Rectfv), %g2
+	or	%g2, %lo(8 * _gloffset_Rectfv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Rectfv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRecti
+.type glRecti,#function
+glRecti:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Recti), %g2
+	or	%g2, %lo(8 * _gloffset_Recti), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Recti)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRectiv
+.type glRectiv,#function
+glRectiv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Rectiv), %g2
+	or	%g2, %lo(8 * _gloffset_Rectiv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Rectiv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRects
+.type glRects,#function
+glRects:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Rects), %g2
+	or	%g2, %lo(8 * _gloffset_Rects), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Rects)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRectsv
+.type glRectsv,#function
+glRectsv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Rectsv), %g2
+	or	%g2, %lo(8 * _gloffset_Rectsv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Rectsv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoord1d
+.type glTexCoord1d,#function
+glTexCoord1d:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoord1d), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoord1d), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoord1d)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoord1dv
+.type glTexCoord1dv,#function
+glTexCoord1dv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoord1dv), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoord1dv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoord1dv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoord1f
+.type glTexCoord1f,#function
+glTexCoord1f:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoord1f), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoord1f), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoord1f)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoord1fv
+.type glTexCoord1fv,#function
+glTexCoord1fv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoord1fv), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoord1fv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoord1fv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoord1i
+.type glTexCoord1i,#function
+glTexCoord1i:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoord1i), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoord1i), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoord1i)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoord1iv
+.type glTexCoord1iv,#function
+glTexCoord1iv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoord1iv), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoord1iv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoord1iv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoord1s
+.type glTexCoord1s,#function
+glTexCoord1s:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoord1s), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoord1s), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoord1s)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoord1sv
+.type glTexCoord1sv,#function
+glTexCoord1sv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoord1sv), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoord1sv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoord1sv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoord2d
+.type glTexCoord2d,#function
+glTexCoord2d:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoord2d), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoord2d), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoord2d)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoord2dv
+.type glTexCoord2dv,#function
+glTexCoord2dv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoord2dv), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoord2dv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoord2dv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoord2f
+.type glTexCoord2f,#function
+glTexCoord2f:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoord2f), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoord2f), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoord2f)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoord2fv
+.type glTexCoord2fv,#function
+glTexCoord2fv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoord2fv), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoord2fv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoord2fv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoord2i
+.type glTexCoord2i,#function
+glTexCoord2i:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoord2i), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoord2i), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoord2i)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoord2iv
+.type glTexCoord2iv,#function
+glTexCoord2iv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoord2iv), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoord2iv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoord2iv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoord2s
+.type glTexCoord2s,#function
+glTexCoord2s:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoord2s), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoord2s), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoord2s)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoord2sv
+.type glTexCoord2sv,#function
+glTexCoord2sv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoord2sv), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoord2sv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoord2sv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoord3d
+.type glTexCoord3d,#function
+glTexCoord3d:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoord3d), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoord3d), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoord3d)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoord3dv
+.type glTexCoord3dv,#function
+glTexCoord3dv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoord3dv), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoord3dv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoord3dv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoord3f
+.type glTexCoord3f,#function
+glTexCoord3f:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoord3f), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoord3f), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoord3f)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoord3fv
+.type glTexCoord3fv,#function
+glTexCoord3fv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoord3fv), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoord3fv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoord3fv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoord3i
+.type glTexCoord3i,#function
+glTexCoord3i:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoord3i), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoord3i), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoord3i)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoord3iv
+.type glTexCoord3iv,#function
+glTexCoord3iv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoord3iv), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoord3iv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoord3iv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoord3s
+.type glTexCoord3s,#function
+glTexCoord3s:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoord3s), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoord3s), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoord3s)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoord3sv
+.type glTexCoord3sv,#function
+glTexCoord3sv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoord3sv), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoord3sv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoord3sv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoord4d
+.type glTexCoord4d,#function
+glTexCoord4d:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoord4d), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoord4d), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoord4d)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoord4dv
+.type glTexCoord4dv,#function
+glTexCoord4dv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoord4dv), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoord4dv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoord4dv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoord4f
+.type glTexCoord4f,#function
+glTexCoord4f:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoord4f), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoord4f), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoord4f)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoord4fv
+.type glTexCoord4fv,#function
+glTexCoord4fv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoord4fv), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoord4fv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoord4fv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoord4i
+.type glTexCoord4i,#function
+glTexCoord4i:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoord4i), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoord4i), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoord4i)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoord4iv
+.type glTexCoord4iv,#function
+glTexCoord4iv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoord4iv), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoord4iv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoord4iv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoord4s
+.type glTexCoord4s,#function
+glTexCoord4s:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoord4s), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoord4s), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoord4s)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoord4sv
+.type glTexCoord4sv,#function
+glTexCoord4sv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoord4sv), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoord4sv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoord4sv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertex2d
+.type glVertex2d,#function
+glVertex2d:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Vertex2d), %g2
+	or	%g2, %lo(8 * _gloffset_Vertex2d), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Vertex2d)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertex2dv
+.type glVertex2dv,#function
+glVertex2dv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Vertex2dv), %g2
+	or	%g2, %lo(8 * _gloffset_Vertex2dv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Vertex2dv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertex2f
+.type glVertex2f,#function
+glVertex2f:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Vertex2f), %g2
+	or	%g2, %lo(8 * _gloffset_Vertex2f), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Vertex2f)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertex2fv
+.type glVertex2fv,#function
+glVertex2fv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Vertex2fv), %g2
+	or	%g2, %lo(8 * _gloffset_Vertex2fv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Vertex2fv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertex2i
+.type glVertex2i,#function
+glVertex2i:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Vertex2i), %g2
+	or	%g2, %lo(8 * _gloffset_Vertex2i), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Vertex2i)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertex2iv
+.type glVertex2iv,#function
+glVertex2iv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Vertex2iv), %g2
+	or	%g2, %lo(8 * _gloffset_Vertex2iv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Vertex2iv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertex2s
+.type glVertex2s,#function
+glVertex2s:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Vertex2s), %g2
+	or	%g2, %lo(8 * _gloffset_Vertex2s), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Vertex2s)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertex2sv
+.type glVertex2sv,#function
+glVertex2sv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Vertex2sv), %g2
+	or	%g2, %lo(8 * _gloffset_Vertex2sv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Vertex2sv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertex3d
+.type glVertex3d,#function
+glVertex3d:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Vertex3d), %g2
+	or	%g2, %lo(8 * _gloffset_Vertex3d), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Vertex3d)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertex3dv
+.type glVertex3dv,#function
+glVertex3dv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Vertex3dv), %g2
+	or	%g2, %lo(8 * _gloffset_Vertex3dv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Vertex3dv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertex3f
+.type glVertex3f,#function
+glVertex3f:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Vertex3f), %g2
+	or	%g2, %lo(8 * _gloffset_Vertex3f), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Vertex3f)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertex3fv
+.type glVertex3fv,#function
+glVertex3fv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Vertex3fv), %g2
+	or	%g2, %lo(8 * _gloffset_Vertex3fv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Vertex3fv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertex3i
+.type glVertex3i,#function
+glVertex3i:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Vertex3i), %g2
+	or	%g2, %lo(8 * _gloffset_Vertex3i), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Vertex3i)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertex3iv
+.type glVertex3iv,#function
+glVertex3iv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Vertex3iv), %g2
+	or	%g2, %lo(8 * _gloffset_Vertex3iv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Vertex3iv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertex3s
+.type glVertex3s,#function
+glVertex3s:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Vertex3s), %g2
+	or	%g2, %lo(8 * _gloffset_Vertex3s), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Vertex3s)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertex3sv
+.type glVertex3sv,#function
+glVertex3sv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Vertex3sv), %g2
+	or	%g2, %lo(8 * _gloffset_Vertex3sv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Vertex3sv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertex4d
+.type glVertex4d,#function
+glVertex4d:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Vertex4d), %g2
+	or	%g2, %lo(8 * _gloffset_Vertex4d), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Vertex4d)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertex4dv
+.type glVertex4dv,#function
+glVertex4dv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Vertex4dv), %g2
+	or	%g2, %lo(8 * _gloffset_Vertex4dv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Vertex4dv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertex4f
+.type glVertex4f,#function
+glVertex4f:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Vertex4f), %g2
+	or	%g2, %lo(8 * _gloffset_Vertex4f), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Vertex4f)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertex4fv
+.type glVertex4fv,#function
+glVertex4fv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Vertex4fv), %g2
+	or	%g2, %lo(8 * _gloffset_Vertex4fv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Vertex4fv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertex4i
+.type glVertex4i,#function
+glVertex4i:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Vertex4i), %g2
+	or	%g2, %lo(8 * _gloffset_Vertex4i), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Vertex4i)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertex4iv
+.type glVertex4iv,#function
+glVertex4iv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Vertex4iv), %g2
+	or	%g2, %lo(8 * _gloffset_Vertex4iv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Vertex4iv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertex4s
+.type glVertex4s,#function
+glVertex4s:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Vertex4s), %g2
+	or	%g2, %lo(8 * _gloffset_Vertex4s), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Vertex4s)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertex4sv
+.type glVertex4sv,#function
+glVertex4sv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Vertex4sv), %g2
+	or	%g2, %lo(8 * _gloffset_Vertex4sv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Vertex4sv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glClipPlane
+.type glClipPlane,#function
+glClipPlane:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ClipPlane), %g2
+	or	%g2, %lo(8 * _gloffset_ClipPlane), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ClipPlane)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColorMaterial
+.type glColorMaterial,#function
+glColorMaterial:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ColorMaterial), %g2
+	or	%g2, %lo(8 * _gloffset_ColorMaterial), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ColorMaterial)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCullFace
+.type glCullFace,#function
+glCullFace:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CullFace), %g2
+	or	%g2, %lo(8 * _gloffset_CullFace), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CullFace)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFogf
+.type glFogf,#function
+glFogf:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Fogf), %g2
+	or	%g2, %lo(8 * _gloffset_Fogf), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Fogf)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFogfv
+.type glFogfv,#function
+glFogfv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Fogfv), %g2
+	or	%g2, %lo(8 * _gloffset_Fogfv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Fogfv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFogi
+.type glFogi,#function
+glFogi:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Fogi), %g2
+	or	%g2, %lo(8 * _gloffset_Fogi), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Fogi)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFogiv
+.type glFogiv,#function
+glFogiv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Fogiv), %g2
+	or	%g2, %lo(8 * _gloffset_Fogiv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Fogiv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFrontFace
+.type glFrontFace,#function
+glFrontFace:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_FrontFace), %g2
+	or	%g2, %lo(8 * _gloffset_FrontFace), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_FrontFace)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glHint
+.type glHint,#function
+glHint:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Hint), %g2
+	or	%g2, %lo(8 * _gloffset_Hint), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Hint)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glLightf
+.type glLightf,#function
+glLightf:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Lightf), %g2
+	or	%g2, %lo(8 * _gloffset_Lightf), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Lightf)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glLightfv
+.type glLightfv,#function
+glLightfv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Lightfv), %g2
+	or	%g2, %lo(8 * _gloffset_Lightfv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Lightfv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glLighti
+.type glLighti,#function
+glLighti:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Lighti), %g2
+	or	%g2, %lo(8 * _gloffset_Lighti), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Lighti)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glLightiv
+.type glLightiv,#function
+glLightiv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Lightiv), %g2
+	or	%g2, %lo(8 * _gloffset_Lightiv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Lightiv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glLightModelf
+.type glLightModelf,#function
+glLightModelf:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_LightModelf), %g2
+	or	%g2, %lo(8 * _gloffset_LightModelf), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_LightModelf)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glLightModelfv
+.type glLightModelfv,#function
+glLightModelfv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_LightModelfv), %g2
+	or	%g2, %lo(8 * _gloffset_LightModelfv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_LightModelfv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glLightModeli
+.type glLightModeli,#function
+glLightModeli:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_LightModeli), %g2
+	or	%g2, %lo(8 * _gloffset_LightModeli), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_LightModeli)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glLightModeliv
+.type glLightModeliv,#function
+glLightModeliv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_LightModeliv), %g2
+	or	%g2, %lo(8 * _gloffset_LightModeliv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_LightModeliv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glLineStipple
+.type glLineStipple,#function
+glLineStipple:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_LineStipple), %g2
+	or	%g2, %lo(8 * _gloffset_LineStipple), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_LineStipple)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glLineWidth
+.type glLineWidth,#function
+glLineWidth:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_LineWidth), %g2
+	or	%g2, %lo(8 * _gloffset_LineWidth), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_LineWidth)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMaterialf
+.type glMaterialf,#function
+glMaterialf:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Materialf), %g2
+	or	%g2, %lo(8 * _gloffset_Materialf), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Materialf)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMaterialfv
+.type glMaterialfv,#function
+glMaterialfv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Materialfv), %g2
+	or	%g2, %lo(8 * _gloffset_Materialfv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Materialfv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMateriali
+.type glMateriali,#function
+glMateriali:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Materiali), %g2
+	or	%g2, %lo(8 * _gloffset_Materiali), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Materiali)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMaterialiv
+.type glMaterialiv,#function
+glMaterialiv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Materialiv), %g2
+	or	%g2, %lo(8 * _gloffset_Materialiv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Materialiv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPointSize
+.type glPointSize,#function
+glPointSize:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PointSize), %g2
+	or	%g2, %lo(8 * _gloffset_PointSize), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PointSize)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPolygonMode
+.type glPolygonMode,#function
+glPolygonMode:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PolygonMode), %g2
+	or	%g2, %lo(8 * _gloffset_PolygonMode), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PolygonMode)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPolygonStipple
+.type glPolygonStipple,#function
+glPolygonStipple:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PolygonStipple), %g2
+	or	%g2, %lo(8 * _gloffset_PolygonStipple), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PolygonStipple)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glScissor
+.type glScissor,#function
+glScissor:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Scissor), %g2
+	or	%g2, %lo(8 * _gloffset_Scissor), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Scissor)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glShadeModel
+.type glShadeModel,#function
+glShadeModel:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ShadeModel), %g2
+	or	%g2, %lo(8 * _gloffset_ShadeModel), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ShadeModel)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexParameterf
+.type glTexParameterf,#function
+glTexParameterf:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexParameterf), %g2
+	or	%g2, %lo(8 * _gloffset_TexParameterf), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexParameterf)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexParameterfv
+.type glTexParameterfv,#function
+glTexParameterfv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexParameterfv), %g2
+	or	%g2, %lo(8 * _gloffset_TexParameterfv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexParameterfv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexParameteri
+.type glTexParameteri,#function
+glTexParameteri:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexParameteri), %g2
+	or	%g2, %lo(8 * _gloffset_TexParameteri), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexParameteri)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexParameteriv
+.type glTexParameteriv,#function
+glTexParameteriv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexParameteriv), %g2
+	or	%g2, %lo(8 * _gloffset_TexParameteriv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexParameteriv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexImage1D
+.type glTexImage1D,#function
+glTexImage1D:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexImage1D), %g2
+	or	%g2, %lo(8 * _gloffset_TexImage1D), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexImage1D)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexImage2D
+.type glTexImage2D,#function
+glTexImage2D:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexImage2D), %g2
+	or	%g2, %lo(8 * _gloffset_TexImage2D), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexImage2D)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexEnvf
+.type glTexEnvf,#function
+glTexEnvf:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexEnvf), %g2
+	or	%g2, %lo(8 * _gloffset_TexEnvf), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexEnvf)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexEnvfv
+.type glTexEnvfv,#function
+glTexEnvfv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexEnvfv), %g2
+	or	%g2, %lo(8 * _gloffset_TexEnvfv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexEnvfv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexEnvi
+.type glTexEnvi,#function
+glTexEnvi:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexEnvi), %g2
+	or	%g2, %lo(8 * _gloffset_TexEnvi), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexEnvi)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexEnviv
+.type glTexEnviv,#function
+glTexEnviv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexEnviv), %g2
+	or	%g2, %lo(8 * _gloffset_TexEnviv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexEnviv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexGend
+.type glTexGend,#function
+glTexGend:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexGend), %g2
+	or	%g2, %lo(8 * _gloffset_TexGend), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexGend)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexGendv
+.type glTexGendv,#function
+glTexGendv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexGendv), %g2
+	or	%g2, %lo(8 * _gloffset_TexGendv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexGendv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexGenf
+.type glTexGenf,#function
+glTexGenf:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexGenf), %g2
+	or	%g2, %lo(8 * _gloffset_TexGenf), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexGenf)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexGenfv
+.type glTexGenfv,#function
+glTexGenfv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexGenfv), %g2
+	or	%g2, %lo(8 * _gloffset_TexGenfv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexGenfv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexGeni
+.type glTexGeni,#function
+glTexGeni:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexGeni), %g2
+	or	%g2, %lo(8 * _gloffset_TexGeni), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexGeni)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexGeniv
+.type glTexGeniv,#function
+glTexGeniv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexGeniv), %g2
+	or	%g2, %lo(8 * _gloffset_TexGeniv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexGeniv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFeedbackBuffer
+.type glFeedbackBuffer,#function
+glFeedbackBuffer:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_FeedbackBuffer), %g2
+	or	%g2, %lo(8 * _gloffset_FeedbackBuffer), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_FeedbackBuffer)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSelectBuffer
+.type glSelectBuffer,#function
+glSelectBuffer:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SelectBuffer), %g2
+	or	%g2, %lo(8 * _gloffset_SelectBuffer), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SelectBuffer)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRenderMode
+.type glRenderMode,#function
+glRenderMode:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_RenderMode), %g2
+	or	%g2, %lo(8 * _gloffset_RenderMode), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_RenderMode)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glInitNames
+.type glInitNames,#function
+glInitNames:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_InitNames), %g2
+	or	%g2, %lo(8 * _gloffset_InitNames), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_InitNames)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glLoadName
+.type glLoadName,#function
+glLoadName:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_LoadName), %g2
+	or	%g2, %lo(8 * _gloffset_LoadName), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_LoadName)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPassThrough
+.type glPassThrough,#function
+glPassThrough:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PassThrough), %g2
+	or	%g2, %lo(8 * _gloffset_PassThrough), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PassThrough)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPopName
+.type glPopName,#function
+glPopName:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PopName), %g2
+	or	%g2, %lo(8 * _gloffset_PopName), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PopName)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPushName
+.type glPushName,#function
+glPushName:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PushName), %g2
+	or	%g2, %lo(8 * _gloffset_PushName), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PushName)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glDrawBuffer
+.type glDrawBuffer,#function
+glDrawBuffer:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_DrawBuffer), %g2
+	or	%g2, %lo(8 * _gloffset_DrawBuffer), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_DrawBuffer)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glClear
+.type glClear,#function
+glClear:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Clear), %g2
+	or	%g2, %lo(8 * _gloffset_Clear), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Clear)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glClearAccum
+.type glClearAccum,#function
+glClearAccum:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ClearAccum), %g2
+	or	%g2, %lo(8 * _gloffset_ClearAccum), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ClearAccum)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glClearIndex
+.type glClearIndex,#function
+glClearIndex:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ClearIndex), %g2
+	or	%g2, %lo(8 * _gloffset_ClearIndex), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ClearIndex)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glClearColor
+.type glClearColor,#function
+glClearColor:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ClearColor), %g2
+	or	%g2, %lo(8 * _gloffset_ClearColor), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ClearColor)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glClearStencil
+.type glClearStencil,#function
+glClearStencil:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ClearStencil), %g2
+	or	%g2, %lo(8 * _gloffset_ClearStencil), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ClearStencil)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glClearDepth
+.type glClearDepth,#function
+glClearDepth:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ClearDepth), %g2
+	or	%g2, %lo(8 * _gloffset_ClearDepth), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ClearDepth)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glStencilMask
+.type glStencilMask,#function
+glStencilMask:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_StencilMask), %g2
+	or	%g2, %lo(8 * _gloffset_StencilMask), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_StencilMask)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColorMask
+.type glColorMask,#function
+glColorMask:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ColorMask), %g2
+	or	%g2, %lo(8 * _gloffset_ColorMask), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ColorMask)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glDepthMask
+.type glDepthMask,#function
+glDepthMask:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_DepthMask), %g2
+	or	%g2, %lo(8 * _gloffset_DepthMask), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_DepthMask)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glIndexMask
+.type glIndexMask,#function
+glIndexMask:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_IndexMask), %g2
+	or	%g2, %lo(8 * _gloffset_IndexMask), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_IndexMask)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glAccum
+.type glAccum,#function
+glAccum:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Accum), %g2
+	or	%g2, %lo(8 * _gloffset_Accum), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Accum)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glDisable
+.type glDisable,#function
+glDisable:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Disable), %g2
+	or	%g2, %lo(8 * _gloffset_Disable), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Disable)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glEnable
+.type glEnable,#function
+glEnable:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Enable), %g2
+	or	%g2, %lo(8 * _gloffset_Enable), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Enable)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFinish
+.type glFinish,#function
+glFinish:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Finish), %g2
+	or	%g2, %lo(8 * _gloffset_Finish), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Finish)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFlush
+.type glFlush,#function
+glFlush:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Flush), %g2
+	or	%g2, %lo(8 * _gloffset_Flush), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Flush)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPopAttrib
+.type glPopAttrib,#function
+glPopAttrib:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PopAttrib), %g2
+	or	%g2, %lo(8 * _gloffset_PopAttrib), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PopAttrib)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPushAttrib
+.type glPushAttrib,#function
+glPushAttrib:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PushAttrib), %g2
+	or	%g2, %lo(8 * _gloffset_PushAttrib), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PushAttrib)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMap1d
+.type glMap1d,#function
+glMap1d:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Map1d), %g2
+	or	%g2, %lo(8 * _gloffset_Map1d), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Map1d)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMap1f
+.type glMap1f,#function
+glMap1f:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Map1f), %g2
+	or	%g2, %lo(8 * _gloffset_Map1f), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Map1f)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMap2d
+.type glMap2d,#function
+glMap2d:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Map2d), %g2
+	or	%g2, %lo(8 * _gloffset_Map2d), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Map2d)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMap2f
+.type glMap2f,#function
+glMap2f:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Map2f), %g2
+	or	%g2, %lo(8 * _gloffset_Map2f), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Map2f)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMapGrid1d
+.type glMapGrid1d,#function
+glMapGrid1d:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MapGrid1d), %g2
+	or	%g2, %lo(8 * _gloffset_MapGrid1d), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MapGrid1d)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMapGrid1f
+.type glMapGrid1f,#function
+glMapGrid1f:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MapGrid1f), %g2
+	or	%g2, %lo(8 * _gloffset_MapGrid1f), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MapGrid1f)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMapGrid2d
+.type glMapGrid2d,#function
+glMapGrid2d:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MapGrid2d), %g2
+	or	%g2, %lo(8 * _gloffset_MapGrid2d), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MapGrid2d)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMapGrid2f
+.type glMapGrid2f,#function
+glMapGrid2f:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MapGrid2f), %g2
+	or	%g2, %lo(8 * _gloffset_MapGrid2f), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MapGrid2f)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glEvalCoord1d
+.type glEvalCoord1d,#function
+glEvalCoord1d:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_EvalCoord1d), %g2
+	or	%g2, %lo(8 * _gloffset_EvalCoord1d), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_EvalCoord1d)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glEvalCoord1dv
+.type glEvalCoord1dv,#function
+glEvalCoord1dv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_EvalCoord1dv), %g2
+	or	%g2, %lo(8 * _gloffset_EvalCoord1dv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_EvalCoord1dv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glEvalCoord1f
+.type glEvalCoord1f,#function
+glEvalCoord1f:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_EvalCoord1f), %g2
+	or	%g2, %lo(8 * _gloffset_EvalCoord1f), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_EvalCoord1f)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glEvalCoord1fv
+.type glEvalCoord1fv,#function
+glEvalCoord1fv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_EvalCoord1fv), %g2
+	or	%g2, %lo(8 * _gloffset_EvalCoord1fv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_EvalCoord1fv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glEvalCoord2d
+.type glEvalCoord2d,#function
+glEvalCoord2d:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_EvalCoord2d), %g2
+	or	%g2, %lo(8 * _gloffset_EvalCoord2d), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_EvalCoord2d)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glEvalCoord2dv
+.type glEvalCoord2dv,#function
+glEvalCoord2dv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_EvalCoord2dv), %g2
+	or	%g2, %lo(8 * _gloffset_EvalCoord2dv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_EvalCoord2dv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glEvalCoord2f
+.type glEvalCoord2f,#function
+glEvalCoord2f:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_EvalCoord2f), %g2
+	or	%g2, %lo(8 * _gloffset_EvalCoord2f), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_EvalCoord2f)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glEvalCoord2fv
+.type glEvalCoord2fv,#function
+glEvalCoord2fv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_EvalCoord2fv), %g2
+	or	%g2, %lo(8 * _gloffset_EvalCoord2fv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_EvalCoord2fv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glEvalMesh1
+.type glEvalMesh1,#function
+glEvalMesh1:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_EvalMesh1), %g2
+	or	%g2, %lo(8 * _gloffset_EvalMesh1), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_EvalMesh1)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glEvalPoint1
+.type glEvalPoint1,#function
+glEvalPoint1:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_EvalPoint1), %g2
+	or	%g2, %lo(8 * _gloffset_EvalPoint1), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_EvalPoint1)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glEvalMesh2
+.type glEvalMesh2,#function
+glEvalMesh2:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_EvalMesh2), %g2
+	or	%g2, %lo(8 * _gloffset_EvalMesh2), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_EvalMesh2)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glEvalPoint2
+.type glEvalPoint2,#function
+glEvalPoint2:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_EvalPoint2), %g2
+	or	%g2, %lo(8 * _gloffset_EvalPoint2), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_EvalPoint2)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glAlphaFunc
+.type glAlphaFunc,#function
+glAlphaFunc:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_AlphaFunc), %g2
+	or	%g2, %lo(8 * _gloffset_AlphaFunc), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_AlphaFunc)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glBlendFunc
+.type glBlendFunc,#function
+glBlendFunc:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_BlendFunc), %g2
+	or	%g2, %lo(8 * _gloffset_BlendFunc), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_BlendFunc)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glLogicOp
+.type glLogicOp,#function
+glLogicOp:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_LogicOp), %g2
+	or	%g2, %lo(8 * _gloffset_LogicOp), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_LogicOp)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glStencilFunc
+.type glStencilFunc,#function
+glStencilFunc:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_StencilFunc), %g2
+	or	%g2, %lo(8 * _gloffset_StencilFunc), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_StencilFunc)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glStencilOp
+.type glStencilOp,#function
+glStencilOp:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_StencilOp), %g2
+	or	%g2, %lo(8 * _gloffset_StencilOp), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_StencilOp)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glDepthFunc
+.type glDepthFunc,#function
+glDepthFunc:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_DepthFunc), %g2
+	or	%g2, %lo(8 * _gloffset_DepthFunc), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_DepthFunc)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPixelZoom
+.type glPixelZoom,#function
+glPixelZoom:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PixelZoom), %g2
+	or	%g2, %lo(8 * _gloffset_PixelZoom), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PixelZoom)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPixelTransferf
+.type glPixelTransferf,#function
+glPixelTransferf:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PixelTransferf), %g2
+	or	%g2, %lo(8 * _gloffset_PixelTransferf), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PixelTransferf)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPixelTransferi
+.type glPixelTransferi,#function
+glPixelTransferi:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PixelTransferi), %g2
+	or	%g2, %lo(8 * _gloffset_PixelTransferi), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PixelTransferi)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPixelStoref
+.type glPixelStoref,#function
+glPixelStoref:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PixelStoref), %g2
+	or	%g2, %lo(8 * _gloffset_PixelStoref), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PixelStoref)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPixelStorei
+.type glPixelStorei,#function
+glPixelStorei:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PixelStorei), %g2
+	or	%g2, %lo(8 * _gloffset_PixelStorei), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PixelStorei)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPixelMapfv
+.type glPixelMapfv,#function
+glPixelMapfv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PixelMapfv), %g2
+	or	%g2, %lo(8 * _gloffset_PixelMapfv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PixelMapfv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPixelMapuiv
+.type glPixelMapuiv,#function
+glPixelMapuiv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PixelMapuiv), %g2
+	or	%g2, %lo(8 * _gloffset_PixelMapuiv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PixelMapuiv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPixelMapusv
+.type glPixelMapusv,#function
+glPixelMapusv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PixelMapusv), %g2
+	or	%g2, %lo(8 * _gloffset_PixelMapusv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PixelMapusv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glReadBuffer
+.type glReadBuffer,#function
+glReadBuffer:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ReadBuffer), %g2
+	or	%g2, %lo(8 * _gloffset_ReadBuffer), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ReadBuffer)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCopyPixels
+.type glCopyPixels,#function
+glCopyPixels:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CopyPixels), %g2
+	or	%g2, %lo(8 * _gloffset_CopyPixels), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CopyPixels)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glReadPixels
+.type glReadPixels,#function
+glReadPixels:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ReadPixels), %g2
+	or	%g2, %lo(8 * _gloffset_ReadPixels), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ReadPixels)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glDrawPixels
+.type glDrawPixels,#function
+glDrawPixels:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_DrawPixels), %g2
+	or	%g2, %lo(8 * _gloffset_DrawPixels), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_DrawPixels)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetBooleanv
+.type glGetBooleanv,#function
+glGetBooleanv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetBooleanv), %g2
+	or	%g2, %lo(8 * _gloffset_GetBooleanv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetBooleanv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetClipPlane
+.type glGetClipPlane,#function
+glGetClipPlane:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetClipPlane), %g2
+	or	%g2, %lo(8 * _gloffset_GetClipPlane), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetClipPlane)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetDoublev
+.type glGetDoublev,#function
+glGetDoublev:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetDoublev), %g2
+	or	%g2, %lo(8 * _gloffset_GetDoublev), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetDoublev)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetError
+.type glGetError,#function
+glGetError:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetError), %g2
+	or	%g2, %lo(8 * _gloffset_GetError), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetError)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetFloatv
+.type glGetFloatv,#function
+glGetFloatv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetFloatv), %g2
+	or	%g2, %lo(8 * _gloffset_GetFloatv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetFloatv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetIntegerv
+.type glGetIntegerv,#function
+glGetIntegerv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetIntegerv), %g2
+	or	%g2, %lo(8 * _gloffset_GetIntegerv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetIntegerv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetLightfv
+.type glGetLightfv,#function
+glGetLightfv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetLightfv), %g2
+	or	%g2, %lo(8 * _gloffset_GetLightfv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetLightfv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetLightiv
+.type glGetLightiv,#function
+glGetLightiv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetLightiv), %g2
+	or	%g2, %lo(8 * _gloffset_GetLightiv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetLightiv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetMapdv
+.type glGetMapdv,#function
+glGetMapdv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetMapdv), %g2
+	or	%g2, %lo(8 * _gloffset_GetMapdv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetMapdv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetMapfv
+.type glGetMapfv,#function
+glGetMapfv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetMapfv), %g2
+	or	%g2, %lo(8 * _gloffset_GetMapfv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetMapfv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetMapiv
+.type glGetMapiv,#function
+glGetMapiv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetMapiv), %g2
+	or	%g2, %lo(8 * _gloffset_GetMapiv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetMapiv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetMaterialfv
+.type glGetMaterialfv,#function
+glGetMaterialfv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetMaterialfv), %g2
+	or	%g2, %lo(8 * _gloffset_GetMaterialfv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetMaterialfv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetMaterialiv
+.type glGetMaterialiv,#function
+glGetMaterialiv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetMaterialiv), %g2
+	or	%g2, %lo(8 * _gloffset_GetMaterialiv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetMaterialiv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetPixelMapfv
+.type glGetPixelMapfv,#function
+glGetPixelMapfv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetPixelMapfv), %g2
+	or	%g2, %lo(8 * _gloffset_GetPixelMapfv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetPixelMapfv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetPixelMapuiv
+.type glGetPixelMapuiv,#function
+glGetPixelMapuiv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetPixelMapuiv), %g2
+	or	%g2, %lo(8 * _gloffset_GetPixelMapuiv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetPixelMapuiv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetPixelMapusv
+.type glGetPixelMapusv,#function
+glGetPixelMapusv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetPixelMapusv), %g2
+	or	%g2, %lo(8 * _gloffset_GetPixelMapusv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetPixelMapusv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetPolygonStipple
+.type glGetPolygonStipple,#function
+glGetPolygonStipple:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetPolygonStipple), %g2
+	or	%g2, %lo(8 * _gloffset_GetPolygonStipple), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetPolygonStipple)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetString
+.type glGetString,#function
+glGetString:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetString), %g2
+	or	%g2, %lo(8 * _gloffset_GetString), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetString)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetTexEnvfv
+.type glGetTexEnvfv,#function
+glGetTexEnvfv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetTexEnvfv), %g2
+	or	%g2, %lo(8 * _gloffset_GetTexEnvfv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetTexEnvfv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetTexEnviv
+.type glGetTexEnviv,#function
+glGetTexEnviv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetTexEnviv), %g2
+	or	%g2, %lo(8 * _gloffset_GetTexEnviv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetTexEnviv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetTexGendv
+.type glGetTexGendv,#function
+glGetTexGendv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetTexGendv), %g2
+	or	%g2, %lo(8 * _gloffset_GetTexGendv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetTexGendv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetTexGenfv
+.type glGetTexGenfv,#function
+glGetTexGenfv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetTexGenfv), %g2
+	or	%g2, %lo(8 * _gloffset_GetTexGenfv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetTexGenfv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetTexGeniv
+.type glGetTexGeniv,#function
+glGetTexGeniv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetTexGeniv), %g2
+	or	%g2, %lo(8 * _gloffset_GetTexGeniv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetTexGeniv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetTexImage
+.type glGetTexImage,#function
+glGetTexImage:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetTexImage), %g2
+	or	%g2, %lo(8 * _gloffset_GetTexImage), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetTexImage)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetTexParameterfv
+.type glGetTexParameterfv,#function
+glGetTexParameterfv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetTexParameterfv), %g2
+	or	%g2, %lo(8 * _gloffset_GetTexParameterfv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetTexParameterfv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetTexParameteriv
+.type glGetTexParameteriv,#function
+glGetTexParameteriv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetTexParameteriv), %g2
+	or	%g2, %lo(8 * _gloffset_GetTexParameteriv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetTexParameteriv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetTexLevelParameterfv
+.type glGetTexLevelParameterfv,#function
+glGetTexLevelParameterfv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetTexLevelParameterfv), %g2
+	or	%g2, %lo(8 * _gloffset_GetTexLevelParameterfv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetTexLevelParameterfv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetTexLevelParameteriv
+.type glGetTexLevelParameteriv,#function
+glGetTexLevelParameteriv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetTexLevelParameteriv), %g2
+	or	%g2, %lo(8 * _gloffset_GetTexLevelParameteriv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetTexLevelParameteriv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glIsEnabled
+.type glIsEnabled,#function
+glIsEnabled:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_IsEnabled), %g2
+	or	%g2, %lo(8 * _gloffset_IsEnabled), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_IsEnabled)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glIsList
+.type glIsList,#function
+glIsList:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_IsList), %g2
+	or	%g2, %lo(8 * _gloffset_IsList), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_IsList)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glDepthRange
+.type glDepthRange,#function
+glDepthRange:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_DepthRange), %g2
+	or	%g2, %lo(8 * _gloffset_DepthRange), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_DepthRange)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFrustum
+.type glFrustum,#function
+glFrustum:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Frustum), %g2
+	or	%g2, %lo(8 * _gloffset_Frustum), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Frustum)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glLoadIdentity
+.type glLoadIdentity,#function
+glLoadIdentity:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_LoadIdentity), %g2
+	or	%g2, %lo(8 * _gloffset_LoadIdentity), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_LoadIdentity)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glLoadMatrixf
+.type glLoadMatrixf,#function
+glLoadMatrixf:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_LoadMatrixf), %g2
+	or	%g2, %lo(8 * _gloffset_LoadMatrixf), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_LoadMatrixf)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glLoadMatrixd
+.type glLoadMatrixd,#function
+glLoadMatrixd:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_LoadMatrixd), %g2
+	or	%g2, %lo(8 * _gloffset_LoadMatrixd), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_LoadMatrixd)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMatrixMode
+.type glMatrixMode,#function
+glMatrixMode:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MatrixMode), %g2
+	or	%g2, %lo(8 * _gloffset_MatrixMode), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MatrixMode)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultMatrixf
+.type glMultMatrixf,#function
+glMultMatrixf:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultMatrixf), %g2
+	or	%g2, %lo(8 * _gloffset_MultMatrixf), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultMatrixf)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultMatrixd
+.type glMultMatrixd,#function
+glMultMatrixd:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultMatrixd), %g2
+	or	%g2, %lo(8 * _gloffset_MultMatrixd), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultMatrixd)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glOrtho
+.type glOrtho,#function
+glOrtho:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Ortho), %g2
+	or	%g2, %lo(8 * _gloffset_Ortho), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Ortho)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPopMatrix
+.type glPopMatrix,#function
+glPopMatrix:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PopMatrix), %g2
+	or	%g2, %lo(8 * _gloffset_PopMatrix), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PopMatrix)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPushMatrix
+.type glPushMatrix,#function
+glPushMatrix:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PushMatrix), %g2
+	or	%g2, %lo(8 * _gloffset_PushMatrix), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PushMatrix)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRotated
+.type glRotated,#function
+glRotated:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Rotated), %g2
+	or	%g2, %lo(8 * _gloffset_Rotated), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Rotated)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRotatef
+.type glRotatef,#function
+glRotatef:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Rotatef), %g2
+	or	%g2, %lo(8 * _gloffset_Rotatef), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Rotatef)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glScaled
+.type glScaled,#function
+glScaled:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Scaled), %g2
+	or	%g2, %lo(8 * _gloffset_Scaled), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Scaled)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glScalef
+.type glScalef,#function
+glScalef:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Scalef), %g2
+	or	%g2, %lo(8 * _gloffset_Scalef), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Scalef)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTranslated
+.type glTranslated,#function
+glTranslated:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Translated), %g2
+	or	%g2, %lo(8 * _gloffset_Translated), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Translated)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTranslatef
+.type glTranslatef,#function
+glTranslatef:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Translatef), %g2
+	or	%g2, %lo(8 * _gloffset_Translatef), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Translatef)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glViewport
+.type glViewport,#function
+glViewport:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Viewport), %g2
+	or	%g2, %lo(8 * _gloffset_Viewport), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Viewport)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glArrayElement
+.type glArrayElement,#function
+glArrayElement:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ArrayElement), %g2
+	or	%g2, %lo(8 * _gloffset_ArrayElement), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ArrayElement)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColorPointer
+.type glColorPointer,#function
+glColorPointer:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ColorPointer), %g2
+	or	%g2, %lo(8 * _gloffset_ColorPointer), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ColorPointer)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glDisableClientState
+.type glDisableClientState,#function
+glDisableClientState:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_DisableClientState), %g2
+	or	%g2, %lo(8 * _gloffset_DisableClientState), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_DisableClientState)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glDrawArrays
+.type glDrawArrays,#function
+glDrawArrays:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_DrawArrays), %g2
+	or	%g2, %lo(8 * _gloffset_DrawArrays), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_DrawArrays)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glDrawElements
+.type glDrawElements,#function
+glDrawElements:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_DrawElements), %g2
+	or	%g2, %lo(8 * _gloffset_DrawElements), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_DrawElements)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glEdgeFlagPointer
+.type glEdgeFlagPointer,#function
+glEdgeFlagPointer:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_EdgeFlagPointer), %g2
+	or	%g2, %lo(8 * _gloffset_EdgeFlagPointer), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_EdgeFlagPointer)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glEnableClientState
+.type glEnableClientState,#function
+glEnableClientState:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_EnableClientState), %g2
+	or	%g2, %lo(8 * _gloffset_EnableClientState), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_EnableClientState)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetPointerv
+.type glGetPointerv,#function
+glGetPointerv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetPointerv), %g2
+	or	%g2, %lo(8 * _gloffset_GetPointerv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetPointerv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glIndexPointer
+.type glIndexPointer,#function
+glIndexPointer:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_IndexPointer), %g2
+	or	%g2, %lo(8 * _gloffset_IndexPointer), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_IndexPointer)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glInterleavedArrays
+.type glInterleavedArrays,#function
+glInterleavedArrays:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_InterleavedArrays), %g2
+	or	%g2, %lo(8 * _gloffset_InterleavedArrays), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_InterleavedArrays)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glNormalPointer
+.type glNormalPointer,#function
+glNormalPointer:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_NormalPointer), %g2
+	or	%g2, %lo(8 * _gloffset_NormalPointer), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_NormalPointer)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoordPointer
+.type glTexCoordPointer,#function
+glTexCoordPointer:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoordPointer), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoordPointer), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoordPointer)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexPointer
+.type glVertexPointer,#function
+glVertexPointer:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexPointer), %g2
+	or	%g2, %lo(8 * _gloffset_VertexPointer), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexPointer)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPolygonOffset
+.type glPolygonOffset,#function
+glPolygonOffset:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PolygonOffset), %g2
+	or	%g2, %lo(8 * _gloffset_PolygonOffset), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PolygonOffset)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCopyTexImage1D
+.type glCopyTexImage1D,#function
+glCopyTexImage1D:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CopyTexImage1D), %g2
+	or	%g2, %lo(8 * _gloffset_CopyTexImage1D), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CopyTexImage1D)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCopyTexImage2D
+.type glCopyTexImage2D,#function
+glCopyTexImage2D:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CopyTexImage2D), %g2
+	or	%g2, %lo(8 * _gloffset_CopyTexImage2D), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CopyTexImage2D)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCopyTexSubImage1D
+.type glCopyTexSubImage1D,#function
+glCopyTexSubImage1D:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CopyTexSubImage1D), %g2
+	or	%g2, %lo(8 * _gloffset_CopyTexSubImage1D), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CopyTexSubImage1D)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCopyTexSubImage2D
+.type glCopyTexSubImage2D,#function
+glCopyTexSubImage2D:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CopyTexSubImage2D), %g2
+	or	%g2, %lo(8 * _gloffset_CopyTexSubImage2D), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CopyTexSubImage2D)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexSubImage1D
+.type glTexSubImage1D,#function
+glTexSubImage1D:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexSubImage1D), %g2
+	or	%g2, %lo(8 * _gloffset_TexSubImage1D), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexSubImage1D)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexSubImage2D
+.type glTexSubImage2D,#function
+glTexSubImage2D:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexSubImage2D), %g2
+	or	%g2, %lo(8 * _gloffset_TexSubImage2D), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexSubImage2D)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glAreTexturesResident
+.type glAreTexturesResident,#function
+glAreTexturesResident:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_AreTexturesResident), %g2
+	or	%g2, %lo(8 * _gloffset_AreTexturesResident), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_AreTexturesResident)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glBindTexture
+.type glBindTexture,#function
+glBindTexture:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_BindTexture), %g2
+	or	%g2, %lo(8 * _gloffset_BindTexture), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_BindTexture)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glDeleteTextures
+.type glDeleteTextures,#function
+glDeleteTextures:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_DeleteTextures), %g2
+	or	%g2, %lo(8 * _gloffset_DeleteTextures), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_DeleteTextures)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGenTextures
+.type glGenTextures,#function
+glGenTextures:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GenTextures), %g2
+	or	%g2, %lo(8 * _gloffset_GenTextures), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GenTextures)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glIsTexture
+.type glIsTexture,#function
+glIsTexture:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_IsTexture), %g2
+	or	%g2, %lo(8 * _gloffset_IsTexture), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_IsTexture)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPrioritizeTextures
+.type glPrioritizeTextures,#function
+glPrioritizeTextures:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PrioritizeTextures), %g2
+	or	%g2, %lo(8 * _gloffset_PrioritizeTextures), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PrioritizeTextures)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glIndexub
+.type glIndexub,#function
+glIndexub:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Indexub), %g2
+	or	%g2, %lo(8 * _gloffset_Indexub), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Indexub)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glIndexubv
+.type glIndexubv,#function
+glIndexubv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Indexubv), %g2
+	or	%g2, %lo(8 * _gloffset_Indexubv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Indexubv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPopClientAttrib
+.type glPopClientAttrib,#function
+glPopClientAttrib:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PopClientAttrib), %g2
+	or	%g2, %lo(8 * _gloffset_PopClientAttrib), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PopClientAttrib)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPushClientAttrib
+.type glPushClientAttrib,#function
+glPushClientAttrib:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PushClientAttrib), %g2
+	or	%g2, %lo(8 * _gloffset_PushClientAttrib), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PushClientAttrib)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glBlendColor
+.type glBlendColor,#function
+glBlendColor:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_BlendColor), %g2
+	or	%g2, %lo(8 * _gloffset_BlendColor), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_BlendColor)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glBlendEquation
+.type glBlendEquation,#function
+glBlendEquation:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_BlendEquation), %g2
+	or	%g2, %lo(8 * _gloffset_BlendEquation), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_BlendEquation)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glDrawRangeElements
+.type glDrawRangeElements,#function
+glDrawRangeElements:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_DrawRangeElements), %g2
+	or	%g2, %lo(8 * _gloffset_DrawRangeElements), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_DrawRangeElements)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColorTable
+.type glColorTable,#function
+glColorTable:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ColorTable), %g2
+	or	%g2, %lo(8 * _gloffset_ColorTable), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ColorTable)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColorTableParameterfv
+.type glColorTableParameterfv,#function
+glColorTableParameterfv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ColorTableParameterfv), %g2
+	or	%g2, %lo(8 * _gloffset_ColorTableParameterfv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ColorTableParameterfv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColorTableParameteriv
+.type glColorTableParameteriv,#function
+glColorTableParameteriv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ColorTableParameteriv), %g2
+	or	%g2, %lo(8 * _gloffset_ColorTableParameteriv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ColorTableParameteriv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCopyColorTable
+.type glCopyColorTable,#function
+glCopyColorTable:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CopyColorTable), %g2
+	or	%g2, %lo(8 * _gloffset_CopyColorTable), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CopyColorTable)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetColorTable
+.type glGetColorTable,#function
+glGetColorTable:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetColorTable), %g2
+	or	%g2, %lo(8 * _gloffset_GetColorTable), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetColorTable)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetColorTableParameterfv
+.type glGetColorTableParameterfv,#function
+glGetColorTableParameterfv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetColorTableParameterfv), %g2
+	or	%g2, %lo(8 * _gloffset_GetColorTableParameterfv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetColorTableParameterfv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetColorTableParameteriv
+.type glGetColorTableParameteriv,#function
+glGetColorTableParameteriv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetColorTableParameteriv), %g2
+	or	%g2, %lo(8 * _gloffset_GetColorTableParameteriv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetColorTableParameteriv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColorSubTable
+.type glColorSubTable,#function
+glColorSubTable:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ColorSubTable), %g2
+	or	%g2, %lo(8 * _gloffset_ColorSubTable), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ColorSubTable)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCopyColorSubTable
+.type glCopyColorSubTable,#function
+glCopyColorSubTable:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CopyColorSubTable), %g2
+	or	%g2, %lo(8 * _gloffset_CopyColorSubTable), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CopyColorSubTable)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glConvolutionFilter1D
+.type glConvolutionFilter1D,#function
+glConvolutionFilter1D:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ConvolutionFilter1D), %g2
+	or	%g2, %lo(8 * _gloffset_ConvolutionFilter1D), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ConvolutionFilter1D)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glConvolutionFilter2D
+.type glConvolutionFilter2D,#function
+glConvolutionFilter2D:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ConvolutionFilter2D), %g2
+	or	%g2, %lo(8 * _gloffset_ConvolutionFilter2D), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ConvolutionFilter2D)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glConvolutionParameterf
+.type glConvolutionParameterf,#function
+glConvolutionParameterf:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ConvolutionParameterf), %g2
+	or	%g2, %lo(8 * _gloffset_ConvolutionParameterf), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ConvolutionParameterf)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glConvolutionParameterfv
+.type glConvolutionParameterfv,#function
+glConvolutionParameterfv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ConvolutionParameterfv), %g2
+	or	%g2, %lo(8 * _gloffset_ConvolutionParameterfv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ConvolutionParameterfv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glConvolutionParameteri
+.type glConvolutionParameteri,#function
+glConvolutionParameteri:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ConvolutionParameteri), %g2
+	or	%g2, %lo(8 * _gloffset_ConvolutionParameteri), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ConvolutionParameteri)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glConvolutionParameteriv
+.type glConvolutionParameteriv,#function
+glConvolutionParameteriv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ConvolutionParameteriv), %g2
+	or	%g2, %lo(8 * _gloffset_ConvolutionParameteriv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ConvolutionParameteriv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCopyConvolutionFilter1D
+.type glCopyConvolutionFilter1D,#function
+glCopyConvolutionFilter1D:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CopyConvolutionFilter1D), %g2
+	or	%g2, %lo(8 * _gloffset_CopyConvolutionFilter1D), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CopyConvolutionFilter1D)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCopyConvolutionFilter2D
+.type glCopyConvolutionFilter2D,#function
+glCopyConvolutionFilter2D:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CopyConvolutionFilter2D), %g2
+	or	%g2, %lo(8 * _gloffset_CopyConvolutionFilter2D), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CopyConvolutionFilter2D)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetConvolutionFilter
+.type glGetConvolutionFilter,#function
+glGetConvolutionFilter:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetConvolutionFilter), %g2
+	or	%g2, %lo(8 * _gloffset_GetConvolutionFilter), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetConvolutionFilter)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetConvolutionParameterfv
+.type glGetConvolutionParameterfv,#function
+glGetConvolutionParameterfv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetConvolutionParameterfv), %g2
+	or	%g2, %lo(8 * _gloffset_GetConvolutionParameterfv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetConvolutionParameterfv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetConvolutionParameteriv
+.type glGetConvolutionParameteriv,#function
+glGetConvolutionParameteriv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetConvolutionParameteriv), %g2
+	or	%g2, %lo(8 * _gloffset_GetConvolutionParameteriv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetConvolutionParameteriv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetSeparableFilter
+.type glGetSeparableFilter,#function
+glGetSeparableFilter:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetSeparableFilter), %g2
+	or	%g2, %lo(8 * _gloffset_GetSeparableFilter), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetSeparableFilter)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSeparableFilter2D
+.type glSeparableFilter2D,#function
+glSeparableFilter2D:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SeparableFilter2D), %g2
+	or	%g2, %lo(8 * _gloffset_SeparableFilter2D), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SeparableFilter2D)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetHistogram
+.type glGetHistogram,#function
+glGetHistogram:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetHistogram), %g2
+	or	%g2, %lo(8 * _gloffset_GetHistogram), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetHistogram)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetHistogramParameterfv
+.type glGetHistogramParameterfv,#function
+glGetHistogramParameterfv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetHistogramParameterfv), %g2
+	or	%g2, %lo(8 * _gloffset_GetHistogramParameterfv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetHistogramParameterfv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetHistogramParameteriv
+.type glGetHistogramParameteriv,#function
+glGetHistogramParameteriv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetHistogramParameteriv), %g2
+	or	%g2, %lo(8 * _gloffset_GetHistogramParameteriv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetHistogramParameteriv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetMinmax
+.type glGetMinmax,#function
+glGetMinmax:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetMinmax), %g2
+	or	%g2, %lo(8 * _gloffset_GetMinmax), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetMinmax)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetMinmaxParameterfv
+.type glGetMinmaxParameterfv,#function
+glGetMinmaxParameterfv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetMinmaxParameterfv), %g2
+	or	%g2, %lo(8 * _gloffset_GetMinmaxParameterfv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetMinmaxParameterfv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetMinmaxParameteriv
+.type glGetMinmaxParameteriv,#function
+glGetMinmaxParameteriv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetMinmaxParameteriv), %g2
+	or	%g2, %lo(8 * _gloffset_GetMinmaxParameteriv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetMinmaxParameteriv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glHistogram
+.type glHistogram,#function
+glHistogram:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Histogram), %g2
+	or	%g2, %lo(8 * _gloffset_Histogram), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Histogram)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMinmax
+.type glMinmax,#function
+glMinmax:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Minmax), %g2
+	or	%g2, %lo(8 * _gloffset_Minmax), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Minmax)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glResetHistogram
+.type glResetHistogram,#function
+glResetHistogram:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ResetHistogram), %g2
+	or	%g2, %lo(8 * _gloffset_ResetHistogram), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ResetHistogram)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glResetMinmax
+.type glResetMinmax,#function
+glResetMinmax:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ResetMinmax), %g2
+	or	%g2, %lo(8 * _gloffset_ResetMinmax), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ResetMinmax)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexImage3D
+.type glTexImage3D,#function
+glTexImage3D:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexImage3D), %g2
+	or	%g2, %lo(8 * _gloffset_TexImage3D), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexImage3D)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexSubImage3D
+.type glTexSubImage3D,#function
+glTexSubImage3D:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexSubImage3D), %g2
+	or	%g2, %lo(8 * _gloffset_TexSubImage3D), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexSubImage3D)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCopyTexSubImage3D
+.type glCopyTexSubImage3D,#function
+glCopyTexSubImage3D:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CopyTexSubImage3D), %g2
+	or	%g2, %lo(8 * _gloffset_CopyTexSubImage3D), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CopyTexSubImage3D)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glActiveTextureARB
+.type glActiveTextureARB,#function
+glActiveTextureARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ActiveTextureARB), %g2
+	or	%g2, %lo(8 * _gloffset_ActiveTextureARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ActiveTextureARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glClientActiveTextureARB
+.type glClientActiveTextureARB,#function
+glClientActiveTextureARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ClientActiveTextureARB), %g2
+	or	%g2, %lo(8 * _gloffset_ClientActiveTextureARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ClientActiveTextureARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord1dARB
+.type glMultiTexCoord1dARB,#function
+glMultiTexCoord1dARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord1dARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord1dARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord1dARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord1dvARB
+.type glMultiTexCoord1dvARB,#function
+glMultiTexCoord1dvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord1dvARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord1dvARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord1dvARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord1fARB
+.type glMultiTexCoord1fARB,#function
+glMultiTexCoord1fARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord1fARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord1fARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord1fARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord1fvARB
+.type glMultiTexCoord1fvARB,#function
+glMultiTexCoord1fvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord1fvARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord1fvARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord1fvARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord1iARB
+.type glMultiTexCoord1iARB,#function
+glMultiTexCoord1iARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord1iARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord1iARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord1iARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord1ivARB
+.type glMultiTexCoord1ivARB,#function
+glMultiTexCoord1ivARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord1ivARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord1ivARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord1ivARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord1sARB
+.type glMultiTexCoord1sARB,#function
+glMultiTexCoord1sARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord1sARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord1sARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord1sARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord1svARB
+.type glMultiTexCoord1svARB,#function
+glMultiTexCoord1svARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord1svARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord1svARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord1svARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord2dARB
+.type glMultiTexCoord2dARB,#function
+glMultiTexCoord2dARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord2dARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord2dARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord2dARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord2dvARB
+.type glMultiTexCoord2dvARB,#function
+glMultiTexCoord2dvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord2dvARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord2dvARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord2dvARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord2fARB
+.type glMultiTexCoord2fARB,#function
+glMultiTexCoord2fARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord2fARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord2fARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord2fARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord2fvARB
+.type glMultiTexCoord2fvARB,#function
+glMultiTexCoord2fvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord2fvARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord2fvARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord2fvARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord2iARB
+.type glMultiTexCoord2iARB,#function
+glMultiTexCoord2iARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord2iARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord2iARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord2iARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord2ivARB
+.type glMultiTexCoord2ivARB,#function
+glMultiTexCoord2ivARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord2ivARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord2ivARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord2ivARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord2sARB
+.type glMultiTexCoord2sARB,#function
+glMultiTexCoord2sARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord2sARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord2sARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord2sARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord2svARB
+.type glMultiTexCoord2svARB,#function
+glMultiTexCoord2svARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord2svARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord2svARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord2svARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord3dARB
+.type glMultiTexCoord3dARB,#function
+glMultiTexCoord3dARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord3dARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord3dARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord3dARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord3dvARB
+.type glMultiTexCoord3dvARB,#function
+glMultiTexCoord3dvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord3dvARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord3dvARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord3dvARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord3fARB
+.type glMultiTexCoord3fARB,#function
+glMultiTexCoord3fARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord3fARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord3fARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord3fARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord3fvARB
+.type glMultiTexCoord3fvARB,#function
+glMultiTexCoord3fvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord3fvARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord3fvARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord3fvARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord3iARB
+.type glMultiTexCoord3iARB,#function
+glMultiTexCoord3iARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord3iARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord3iARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord3iARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord3ivARB
+.type glMultiTexCoord3ivARB,#function
+glMultiTexCoord3ivARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord3ivARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord3ivARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord3ivARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord3sARB
+.type glMultiTexCoord3sARB,#function
+glMultiTexCoord3sARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord3sARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord3sARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord3sARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord3svARB
+.type glMultiTexCoord3svARB,#function
+glMultiTexCoord3svARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord3svARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord3svARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord3svARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord4dARB
+.type glMultiTexCoord4dARB,#function
+glMultiTexCoord4dARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord4dARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord4dARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord4dARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord4dvARB
+.type glMultiTexCoord4dvARB,#function
+glMultiTexCoord4dvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord4dvARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord4dvARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord4dvARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord4fARB
+.type glMultiTexCoord4fARB,#function
+glMultiTexCoord4fARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord4fARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord4fARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord4fARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord4fvARB
+.type glMultiTexCoord4fvARB,#function
+glMultiTexCoord4fvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord4fvARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord4fvARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord4fvARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord4iARB
+.type glMultiTexCoord4iARB,#function
+glMultiTexCoord4iARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord4iARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord4iARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord4iARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord4ivARB
+.type glMultiTexCoord4ivARB,#function
+glMultiTexCoord4ivARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord4ivARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord4ivARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord4ivARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord4sARB
+.type glMultiTexCoord4sARB,#function
+glMultiTexCoord4sARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord4sARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord4sARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord4sARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord4svARB
+.type glMultiTexCoord4svARB,#function
+glMultiTexCoord4svARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord4svARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord4svARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord4svARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glLoadTransposeMatrixfARB
+.type glLoadTransposeMatrixfARB,#function
+glLoadTransposeMatrixfARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_LoadTransposeMatrixfARB), %g2
+	or	%g2, %lo(8 * _gloffset_LoadTransposeMatrixfARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_LoadTransposeMatrixfARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glLoadTransposeMatrixdARB
+.type glLoadTransposeMatrixdARB,#function
+glLoadTransposeMatrixdARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_LoadTransposeMatrixdARB), %g2
+	or	%g2, %lo(8 * _gloffset_LoadTransposeMatrixdARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_LoadTransposeMatrixdARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultTransposeMatrixfARB
+.type glMultTransposeMatrixfARB,#function
+glMultTransposeMatrixfARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultTransposeMatrixfARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultTransposeMatrixfARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultTransposeMatrixfARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultTransposeMatrixdARB
+.type glMultTransposeMatrixdARB,#function
+glMultTransposeMatrixdARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultTransposeMatrixdARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultTransposeMatrixdARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultTransposeMatrixdARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSampleCoverageARB
+.type glSampleCoverageARB,#function
+glSampleCoverageARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SampleCoverageARB), %g2
+	or	%g2, %lo(8 * _gloffset_SampleCoverageARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SampleCoverageARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl gl__unused413
+.type gl__unused413,#function
+gl__unused413:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset___unused413), %g2
+	or	%g2, %lo(8 * _gloffset___unused413), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset___unused413)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCompressedTexImage3DARB
+.type glCompressedTexImage3DARB,#function
+glCompressedTexImage3DARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CompressedTexImage3DARB), %g2
+	or	%g2, %lo(8 * _gloffset_CompressedTexImage3DARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CompressedTexImage3DARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCompressedTexImage2DARB
+.type glCompressedTexImage2DARB,#function
+glCompressedTexImage2DARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CompressedTexImage2DARB), %g2
+	or	%g2, %lo(8 * _gloffset_CompressedTexImage2DARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CompressedTexImage2DARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCompressedTexImage1DARB
+.type glCompressedTexImage1DARB,#function
+glCompressedTexImage1DARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CompressedTexImage1DARB), %g2
+	or	%g2, %lo(8 * _gloffset_CompressedTexImage1DARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CompressedTexImage1DARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCompressedTexSubImage3DARB
+.type glCompressedTexSubImage3DARB,#function
+glCompressedTexSubImage3DARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CompressedTexSubImage3DARB), %g2
+	or	%g2, %lo(8 * _gloffset_CompressedTexSubImage3DARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CompressedTexSubImage3DARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCompressedTexSubImage2DARB
+.type glCompressedTexSubImage2DARB,#function
+glCompressedTexSubImage2DARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CompressedTexSubImage2DARB), %g2
+	or	%g2, %lo(8 * _gloffset_CompressedTexSubImage2DARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CompressedTexSubImage2DARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCompressedTexSubImage1DARB
+.type glCompressedTexSubImage1DARB,#function
+glCompressedTexSubImage1DARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CompressedTexSubImage1DARB), %g2
+	or	%g2, %lo(8 * _gloffset_CompressedTexSubImage1DARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CompressedTexSubImage1DARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetCompressedTexImageARB
+.type glGetCompressedTexImageARB,#function
+glGetCompressedTexImageARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetCompressedTexImageARB), %g2
+	or	%g2, %lo(8 * _gloffset_GetCompressedTexImageARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetCompressedTexImageARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glActiveTexture
+.type glActiveTexture,#function
+glActiveTexture:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ActiveTextureARB), %g2
+	or	%g2, %lo(8 * _gloffset_ActiveTextureARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ActiveTextureARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glClientActiveTexture
+.type glClientActiveTexture,#function
+glClientActiveTexture:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ClientActiveTextureARB), %g2
+	or	%g2, %lo(8 * _gloffset_ClientActiveTextureARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ClientActiveTextureARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord1d
+.type glMultiTexCoord1d,#function
+glMultiTexCoord1d:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord1dARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord1dARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord1dARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord1dv
+.type glMultiTexCoord1dv,#function
+glMultiTexCoord1dv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord1dvARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord1dvARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord1dvARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord1f
+.type glMultiTexCoord1f,#function
+glMultiTexCoord1f:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord1fARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord1fARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord1fARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord1fv
+.type glMultiTexCoord1fv,#function
+glMultiTexCoord1fv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord1fvARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord1fvARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord1fvARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord1i
+.type glMultiTexCoord1i,#function
+glMultiTexCoord1i:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord1iARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord1iARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord1iARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord1iv
+.type glMultiTexCoord1iv,#function
+glMultiTexCoord1iv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord1ivARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord1ivARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord1ivARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord1s
+.type glMultiTexCoord1s,#function
+glMultiTexCoord1s:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord1sARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord1sARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord1sARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord1sv
+.type glMultiTexCoord1sv,#function
+glMultiTexCoord1sv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord1svARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord1svARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord1svARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord2d
+.type glMultiTexCoord2d,#function
+glMultiTexCoord2d:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord2dARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord2dARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord2dARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord2dv
+.type glMultiTexCoord2dv,#function
+glMultiTexCoord2dv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord2dvARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord2dvARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord2dvARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord2f
+.type glMultiTexCoord2f,#function
+glMultiTexCoord2f:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord2fARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord2fARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord2fARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord2fv
+.type glMultiTexCoord2fv,#function
+glMultiTexCoord2fv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord2fvARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord2fvARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord2fvARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord2i
+.type glMultiTexCoord2i,#function
+glMultiTexCoord2i:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord2iARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord2iARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord2iARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord2iv
+.type glMultiTexCoord2iv,#function
+glMultiTexCoord2iv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord2ivARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord2ivARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord2ivARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord2s
+.type glMultiTexCoord2s,#function
+glMultiTexCoord2s:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord2sARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord2sARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord2sARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord2sv
+.type glMultiTexCoord2sv,#function
+glMultiTexCoord2sv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord2svARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord2svARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord2svARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord3d
+.type glMultiTexCoord3d,#function
+glMultiTexCoord3d:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord3dARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord3dARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord3dARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord3dv
+.type glMultiTexCoord3dv,#function
+glMultiTexCoord3dv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord3dvARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord3dvARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord3dvARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord3f
+.type glMultiTexCoord3f,#function
+glMultiTexCoord3f:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord3fARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord3fARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord3fARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord3fv
+.type glMultiTexCoord3fv,#function
+glMultiTexCoord3fv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord3fvARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord3fvARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord3fvARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord3i
+.type glMultiTexCoord3i,#function
+glMultiTexCoord3i:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord3iARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord3iARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord3iARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord3iv
+.type glMultiTexCoord3iv,#function
+glMultiTexCoord3iv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord3ivARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord3ivARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord3ivARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord3s
+.type glMultiTexCoord3s,#function
+glMultiTexCoord3s:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord3sARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord3sARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord3sARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord3sv
+.type glMultiTexCoord3sv,#function
+glMultiTexCoord3sv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord3svARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord3svARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord3svARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord4d
+.type glMultiTexCoord4d,#function
+glMultiTexCoord4d:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord4dARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord4dARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord4dARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord4dv
+.type glMultiTexCoord4dv,#function
+glMultiTexCoord4dv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord4dvARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord4dvARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord4dvARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord4f
+.type glMultiTexCoord4f,#function
+glMultiTexCoord4f:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord4fARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord4fARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord4fARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord4fv
+.type glMultiTexCoord4fv,#function
+glMultiTexCoord4fv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord4fvARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord4fvARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord4fvARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord4i
+.type glMultiTexCoord4i,#function
+glMultiTexCoord4i:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord4iARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord4iARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord4iARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord4iv
+.type glMultiTexCoord4iv,#function
+glMultiTexCoord4iv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord4ivARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord4ivARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord4ivARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord4s
+.type glMultiTexCoord4s,#function
+glMultiTexCoord4s:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord4sARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord4sARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord4sARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiTexCoord4sv
+.type glMultiTexCoord4sv,#function
+glMultiTexCoord4sv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiTexCoord4svARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultiTexCoord4svARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiTexCoord4svARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glLoadTransposeMatrixf
+.type glLoadTransposeMatrixf,#function
+glLoadTransposeMatrixf:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_LoadTransposeMatrixfARB), %g2
+	or	%g2, %lo(8 * _gloffset_LoadTransposeMatrixfARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_LoadTransposeMatrixfARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glLoadTransposeMatrixd
+.type glLoadTransposeMatrixd,#function
+glLoadTransposeMatrixd:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_LoadTransposeMatrixdARB), %g2
+	or	%g2, %lo(8 * _gloffset_LoadTransposeMatrixdARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_LoadTransposeMatrixdARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultTransposeMatrixf
+.type glMultTransposeMatrixf,#function
+glMultTransposeMatrixf:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultTransposeMatrixfARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultTransposeMatrixfARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultTransposeMatrixfARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultTransposeMatrixd
+.type glMultTransposeMatrixd,#function
+glMultTransposeMatrixd:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultTransposeMatrixdARB), %g2
+	or	%g2, %lo(8 * _gloffset_MultTransposeMatrixdARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultTransposeMatrixdARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSampleCoverage
+.type glSampleCoverage,#function
+glSampleCoverage:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SampleCoverageARB), %g2
+	or	%g2, %lo(8 * _gloffset_SampleCoverageARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SampleCoverageARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCompressedTexImage3D
+.type glCompressedTexImage3D,#function
+glCompressedTexImage3D:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CompressedTexImage3DARB), %g2
+	or	%g2, %lo(8 * _gloffset_CompressedTexImage3DARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CompressedTexImage3DARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCompressedTexImage2D
+.type glCompressedTexImage2D,#function
+glCompressedTexImage2D:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CompressedTexImage2DARB), %g2
+	or	%g2, %lo(8 * _gloffset_CompressedTexImage2DARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CompressedTexImage2DARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCompressedTexImage1D
+.type glCompressedTexImage1D,#function
+glCompressedTexImage1D:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CompressedTexImage1DARB), %g2
+	or	%g2, %lo(8 * _gloffset_CompressedTexImage1DARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CompressedTexImage1DARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCompressedTexSubImage3D
+.type glCompressedTexSubImage3D,#function
+glCompressedTexSubImage3D:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CompressedTexSubImage3DARB), %g2
+	or	%g2, %lo(8 * _gloffset_CompressedTexSubImage3DARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CompressedTexSubImage3DARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCompressedTexSubImage2D
+.type glCompressedTexSubImage2D,#function
+glCompressedTexSubImage2D:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CompressedTexSubImage2DARB), %g2
+	or	%g2, %lo(8 * _gloffset_CompressedTexSubImage2DARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CompressedTexSubImage2DARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCompressedTexSubImage1D
+.type glCompressedTexSubImage1D,#function
+glCompressedTexSubImage1D:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CompressedTexSubImage1DARB), %g2
+	or	%g2, %lo(8 * _gloffset_CompressedTexSubImage1DARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CompressedTexSubImage1DARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetCompressedTexImage
+.type glGetCompressedTexImage,#function
+glGetCompressedTexImage:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetCompressedTexImageARB), %g2
+	or	%g2, %lo(8 * _gloffset_GetCompressedTexImageARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetCompressedTexImageARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glBlendColorEXT
+.type glBlendColorEXT,#function
+glBlendColorEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_BlendColor), %g2
+	or	%g2, %lo(8 * _gloffset_BlendColor), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_BlendColor)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPolygonOffsetEXT
+.type glPolygonOffsetEXT,#function
+glPolygonOffsetEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PolygonOffsetEXT), %g2
+	or	%g2, %lo(8 * _gloffset_PolygonOffsetEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PolygonOffsetEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexImage3DEXT
+.type glTexImage3DEXT,#function
+glTexImage3DEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexImage3D), %g2
+	or	%g2, %lo(8 * _gloffset_TexImage3D), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexImage3D)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexSubImage3DEXT
+.type glTexSubImage3DEXT,#function
+glTexSubImage3DEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexSubImage3D), %g2
+	or	%g2, %lo(8 * _gloffset_TexSubImage3D), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexSubImage3D)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetTexFilterFuncSGIS
+.type glGetTexFilterFuncSGIS,#function
+glGetTexFilterFuncSGIS:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetTexFilterFuncSGIS), %g2
+	or	%g2, %lo(8 * _gloffset_GetTexFilterFuncSGIS), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetTexFilterFuncSGIS)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexFilterFuncSGIS
+.type glTexFilterFuncSGIS,#function
+glTexFilterFuncSGIS:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexFilterFuncSGIS), %g2
+	or	%g2, %lo(8 * _gloffset_TexFilterFuncSGIS), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexFilterFuncSGIS)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexSubImage1DEXT
+.type glTexSubImage1DEXT,#function
+glTexSubImage1DEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexSubImage1D), %g2
+	or	%g2, %lo(8 * _gloffset_TexSubImage1D), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexSubImage1D)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexSubImage2DEXT
+.type glTexSubImage2DEXT,#function
+glTexSubImage2DEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexSubImage2D), %g2
+	or	%g2, %lo(8 * _gloffset_TexSubImage2D), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexSubImage2D)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCopyTexImage1DEXT
+.type glCopyTexImage1DEXT,#function
+glCopyTexImage1DEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CopyTexImage1D), %g2
+	or	%g2, %lo(8 * _gloffset_CopyTexImage1D), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CopyTexImage1D)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCopyTexImage2DEXT
+.type glCopyTexImage2DEXT,#function
+glCopyTexImage2DEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CopyTexImage2D), %g2
+	or	%g2, %lo(8 * _gloffset_CopyTexImage2D), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CopyTexImage2D)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCopyTexSubImage1DEXT
+.type glCopyTexSubImage1DEXT,#function
+glCopyTexSubImage1DEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CopyTexSubImage1D), %g2
+	or	%g2, %lo(8 * _gloffset_CopyTexSubImage1D), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CopyTexSubImage1D)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCopyTexSubImage2DEXT
+.type glCopyTexSubImage2DEXT,#function
+glCopyTexSubImage2DEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CopyTexSubImage2D), %g2
+	or	%g2, %lo(8 * _gloffset_CopyTexSubImage2D), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CopyTexSubImage2D)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCopyTexSubImage3DEXT
+.type glCopyTexSubImage3DEXT,#function
+glCopyTexSubImage3DEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CopyTexSubImage3D), %g2
+	or	%g2, %lo(8 * _gloffset_CopyTexSubImage3D), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CopyTexSubImage3D)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetHistogramEXT
+.type glGetHistogramEXT,#function
+glGetHistogramEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetHistogramEXT), %g2
+	or	%g2, %lo(8 * _gloffset_GetHistogramEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetHistogramEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetHistogramParameterfvEXT
+.type glGetHistogramParameterfvEXT,#function
+glGetHistogramParameterfvEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetHistogramParameterfvEXT), %g2
+	or	%g2, %lo(8 * _gloffset_GetHistogramParameterfvEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetHistogramParameterfvEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetHistogramParameterivEXT
+.type glGetHistogramParameterivEXT,#function
+glGetHistogramParameterivEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetHistogramParameterivEXT), %g2
+	or	%g2, %lo(8 * _gloffset_GetHistogramParameterivEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetHistogramParameterivEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetMinmaxEXT
+.type glGetMinmaxEXT,#function
+glGetMinmaxEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetMinmaxEXT), %g2
+	or	%g2, %lo(8 * _gloffset_GetMinmaxEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetMinmaxEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetMinmaxParameterfvEXT
+.type glGetMinmaxParameterfvEXT,#function
+glGetMinmaxParameterfvEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetMinmaxParameterfvEXT), %g2
+	or	%g2, %lo(8 * _gloffset_GetMinmaxParameterfvEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetMinmaxParameterfvEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetMinmaxParameterivEXT
+.type glGetMinmaxParameterivEXT,#function
+glGetMinmaxParameterivEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetMinmaxParameterivEXT), %g2
+	or	%g2, %lo(8 * _gloffset_GetMinmaxParameterivEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetMinmaxParameterivEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glHistogramEXT
+.type glHistogramEXT,#function
+glHistogramEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Histogram), %g2
+	or	%g2, %lo(8 * _gloffset_Histogram), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Histogram)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMinmaxEXT
+.type glMinmaxEXT,#function
+glMinmaxEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_Minmax), %g2
+	or	%g2, %lo(8 * _gloffset_Minmax), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_Minmax)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glResetHistogramEXT
+.type glResetHistogramEXT,#function
+glResetHistogramEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ResetHistogram), %g2
+	or	%g2, %lo(8 * _gloffset_ResetHistogram), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ResetHistogram)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glResetMinmaxEXT
+.type glResetMinmaxEXT,#function
+glResetMinmaxEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ResetMinmax), %g2
+	or	%g2, %lo(8 * _gloffset_ResetMinmax), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ResetMinmax)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glConvolutionFilter1DEXT
+.type glConvolutionFilter1DEXT,#function
+glConvolutionFilter1DEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ConvolutionFilter1D), %g2
+	or	%g2, %lo(8 * _gloffset_ConvolutionFilter1D), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ConvolutionFilter1D)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glConvolutionFilter2DEXT
+.type glConvolutionFilter2DEXT,#function
+glConvolutionFilter2DEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ConvolutionFilter2D), %g2
+	or	%g2, %lo(8 * _gloffset_ConvolutionFilter2D), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ConvolutionFilter2D)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glConvolutionParameterfEXT
+.type glConvolutionParameterfEXT,#function
+glConvolutionParameterfEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ConvolutionParameterf), %g2
+	or	%g2, %lo(8 * _gloffset_ConvolutionParameterf), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ConvolutionParameterf)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glConvolutionParameterfvEXT
+.type glConvolutionParameterfvEXT,#function
+glConvolutionParameterfvEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ConvolutionParameterfv), %g2
+	or	%g2, %lo(8 * _gloffset_ConvolutionParameterfv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ConvolutionParameterfv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glConvolutionParameteriEXT
+.type glConvolutionParameteriEXT,#function
+glConvolutionParameteriEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ConvolutionParameteri), %g2
+	or	%g2, %lo(8 * _gloffset_ConvolutionParameteri), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ConvolutionParameteri)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glConvolutionParameterivEXT
+.type glConvolutionParameterivEXT,#function
+glConvolutionParameterivEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ConvolutionParameteriv), %g2
+	or	%g2, %lo(8 * _gloffset_ConvolutionParameteriv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ConvolutionParameteriv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCopyConvolutionFilter1DEXT
+.type glCopyConvolutionFilter1DEXT,#function
+glCopyConvolutionFilter1DEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CopyConvolutionFilter1D), %g2
+	or	%g2, %lo(8 * _gloffset_CopyConvolutionFilter1D), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CopyConvolutionFilter1D)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCopyConvolutionFilter2DEXT
+.type glCopyConvolutionFilter2DEXT,#function
+glCopyConvolutionFilter2DEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CopyConvolutionFilter2D), %g2
+	or	%g2, %lo(8 * _gloffset_CopyConvolutionFilter2D), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CopyConvolutionFilter2D)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetConvolutionFilterEXT
+.type glGetConvolutionFilterEXT,#function
+glGetConvolutionFilterEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetConvolutionFilterEXT), %g2
+	or	%g2, %lo(8 * _gloffset_GetConvolutionFilterEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetConvolutionFilterEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetConvolutionParameterfvEXT
+.type glGetConvolutionParameterfvEXT,#function
+glGetConvolutionParameterfvEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetConvolutionParameterfvEXT), %g2
+	or	%g2, %lo(8 * _gloffset_GetConvolutionParameterfvEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetConvolutionParameterfvEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetConvolutionParameterivEXT
+.type glGetConvolutionParameterivEXT,#function
+glGetConvolutionParameterivEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetConvolutionParameterivEXT), %g2
+	or	%g2, %lo(8 * _gloffset_GetConvolutionParameterivEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetConvolutionParameterivEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetSeparableFilterEXT
+.type glGetSeparableFilterEXT,#function
+glGetSeparableFilterEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetSeparableFilterEXT), %g2
+	or	%g2, %lo(8 * _gloffset_GetSeparableFilterEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetSeparableFilterEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSeparableFilter2DEXT
+.type glSeparableFilter2DEXT,#function
+glSeparableFilter2DEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SeparableFilter2D), %g2
+	or	%g2, %lo(8 * _gloffset_SeparableFilter2D), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SeparableFilter2D)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColorTableSGI
+.type glColorTableSGI,#function
+glColorTableSGI:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ColorTable), %g2
+	or	%g2, %lo(8 * _gloffset_ColorTable), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ColorTable)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColorTableParameterfvSGI
+.type glColorTableParameterfvSGI,#function
+glColorTableParameterfvSGI:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ColorTableParameterfv), %g2
+	or	%g2, %lo(8 * _gloffset_ColorTableParameterfv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ColorTableParameterfv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColorTableParameterivSGI
+.type glColorTableParameterivSGI,#function
+glColorTableParameterivSGI:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ColorTableParameteriv), %g2
+	or	%g2, %lo(8 * _gloffset_ColorTableParameteriv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ColorTableParameteriv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCopyColorTableSGI
+.type glCopyColorTableSGI,#function
+glCopyColorTableSGI:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CopyColorTable), %g2
+	or	%g2, %lo(8 * _gloffset_CopyColorTable), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CopyColorTable)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetColorTableSGI
+.type glGetColorTableSGI,#function
+glGetColorTableSGI:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetColorTableSGI), %g2
+	or	%g2, %lo(8 * _gloffset_GetColorTableSGI), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetColorTableSGI)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetColorTableParameterfvSGI
+.type glGetColorTableParameterfvSGI,#function
+glGetColorTableParameterfvSGI:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetColorTableParameterfvSGI), %g2
+	or	%g2, %lo(8 * _gloffset_GetColorTableParameterfvSGI), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetColorTableParameterfvSGI)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetColorTableParameterivSGI
+.type glGetColorTableParameterivSGI,#function
+glGetColorTableParameterivSGI:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetColorTableParameterivSGI), %g2
+	or	%g2, %lo(8 * _gloffset_GetColorTableParameterivSGI), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetColorTableParameterivSGI)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPixelTexGenSGIX
+.type glPixelTexGenSGIX,#function
+glPixelTexGenSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PixelTexGenSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_PixelTexGenSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PixelTexGenSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPixelTexGenParameteriSGIS
+.type glPixelTexGenParameteriSGIS,#function
+glPixelTexGenParameteriSGIS:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PixelTexGenParameteriSGIS), %g2
+	or	%g2, %lo(8 * _gloffset_PixelTexGenParameteriSGIS), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PixelTexGenParameteriSGIS)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPixelTexGenParameterivSGIS
+.type glPixelTexGenParameterivSGIS,#function
+glPixelTexGenParameterivSGIS:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PixelTexGenParameterivSGIS), %g2
+	or	%g2, %lo(8 * _gloffset_PixelTexGenParameterivSGIS), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PixelTexGenParameterivSGIS)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPixelTexGenParameterfSGIS
+.type glPixelTexGenParameterfSGIS,#function
+glPixelTexGenParameterfSGIS:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PixelTexGenParameterfSGIS), %g2
+	or	%g2, %lo(8 * _gloffset_PixelTexGenParameterfSGIS), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PixelTexGenParameterfSGIS)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPixelTexGenParameterfvSGIS
+.type glPixelTexGenParameterfvSGIS,#function
+glPixelTexGenParameterfvSGIS:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PixelTexGenParameterfvSGIS), %g2
+	or	%g2, %lo(8 * _gloffset_PixelTexGenParameterfvSGIS), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PixelTexGenParameterfvSGIS)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetPixelTexGenParameterivSGIS
+.type glGetPixelTexGenParameterivSGIS,#function
+glGetPixelTexGenParameterivSGIS:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetPixelTexGenParameterivSGIS), %g2
+	or	%g2, %lo(8 * _gloffset_GetPixelTexGenParameterivSGIS), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetPixelTexGenParameterivSGIS)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetPixelTexGenParameterfvSGIS
+.type glGetPixelTexGenParameterfvSGIS,#function
+glGetPixelTexGenParameterfvSGIS:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetPixelTexGenParameterfvSGIS), %g2
+	or	%g2, %lo(8 * _gloffset_GetPixelTexGenParameterfvSGIS), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetPixelTexGenParameterfvSGIS)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexImage4DSGIS
+.type glTexImage4DSGIS,#function
+glTexImage4DSGIS:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexImage4DSGIS), %g2
+	or	%g2, %lo(8 * _gloffset_TexImage4DSGIS), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexImage4DSGIS)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexSubImage4DSGIS
+.type glTexSubImage4DSGIS,#function
+glTexSubImage4DSGIS:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexSubImage4DSGIS), %g2
+	or	%g2, %lo(8 * _gloffset_TexSubImage4DSGIS), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexSubImage4DSGIS)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glAreTexturesResidentEXT
+.type glAreTexturesResidentEXT,#function
+glAreTexturesResidentEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_AreTexturesResidentEXT), %g2
+	or	%g2, %lo(8 * _gloffset_AreTexturesResidentEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_AreTexturesResidentEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glBindTextureEXT
+.type glBindTextureEXT,#function
+glBindTextureEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_BindTexture), %g2
+	or	%g2, %lo(8 * _gloffset_BindTexture), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_BindTexture)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glDeleteTexturesEXT
+.type glDeleteTexturesEXT,#function
+glDeleteTexturesEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_DeleteTextures), %g2
+	or	%g2, %lo(8 * _gloffset_DeleteTextures), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_DeleteTextures)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGenTexturesEXT
+.type glGenTexturesEXT,#function
+glGenTexturesEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GenTexturesEXT), %g2
+	or	%g2, %lo(8 * _gloffset_GenTexturesEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GenTexturesEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glIsTextureEXT
+.type glIsTextureEXT,#function
+glIsTextureEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_IsTextureEXT), %g2
+	or	%g2, %lo(8 * _gloffset_IsTextureEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_IsTextureEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPrioritizeTexturesEXT
+.type glPrioritizeTexturesEXT,#function
+glPrioritizeTexturesEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PrioritizeTextures), %g2
+	or	%g2, %lo(8 * _gloffset_PrioritizeTextures), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PrioritizeTextures)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glDetailTexFuncSGIS
+.type glDetailTexFuncSGIS,#function
+glDetailTexFuncSGIS:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_DetailTexFuncSGIS), %g2
+	or	%g2, %lo(8 * _gloffset_DetailTexFuncSGIS), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_DetailTexFuncSGIS)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetDetailTexFuncSGIS
+.type glGetDetailTexFuncSGIS,#function
+glGetDetailTexFuncSGIS:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetDetailTexFuncSGIS), %g2
+	or	%g2, %lo(8 * _gloffset_GetDetailTexFuncSGIS), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetDetailTexFuncSGIS)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSharpenTexFuncSGIS
+.type glSharpenTexFuncSGIS,#function
+glSharpenTexFuncSGIS:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SharpenTexFuncSGIS), %g2
+	or	%g2, %lo(8 * _gloffset_SharpenTexFuncSGIS), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SharpenTexFuncSGIS)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetSharpenTexFuncSGIS
+.type glGetSharpenTexFuncSGIS,#function
+glGetSharpenTexFuncSGIS:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetSharpenTexFuncSGIS), %g2
+	or	%g2, %lo(8 * _gloffset_GetSharpenTexFuncSGIS), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetSharpenTexFuncSGIS)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSampleMaskSGIS
+.type glSampleMaskSGIS,#function
+glSampleMaskSGIS:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SampleMaskSGIS), %g2
+	or	%g2, %lo(8 * _gloffset_SampleMaskSGIS), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SampleMaskSGIS)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSamplePatternSGIS
+.type glSamplePatternSGIS,#function
+glSamplePatternSGIS:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SamplePatternSGIS), %g2
+	or	%g2, %lo(8 * _gloffset_SamplePatternSGIS), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SamplePatternSGIS)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glArrayElementEXT
+.type glArrayElementEXT,#function
+glArrayElementEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ArrayElement), %g2
+	or	%g2, %lo(8 * _gloffset_ArrayElement), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ArrayElement)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColorPointerEXT
+.type glColorPointerEXT,#function
+glColorPointerEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ColorPointerEXT), %g2
+	or	%g2, %lo(8 * _gloffset_ColorPointerEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ColorPointerEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glDrawArraysEXT
+.type glDrawArraysEXT,#function
+glDrawArraysEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_DrawArrays), %g2
+	or	%g2, %lo(8 * _gloffset_DrawArrays), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_DrawArrays)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glEdgeFlagPointerEXT
+.type glEdgeFlagPointerEXT,#function
+glEdgeFlagPointerEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_EdgeFlagPointerEXT), %g2
+	or	%g2, %lo(8 * _gloffset_EdgeFlagPointerEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_EdgeFlagPointerEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetPointervEXT
+.type glGetPointervEXT,#function
+glGetPointervEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetPointerv), %g2
+	or	%g2, %lo(8 * _gloffset_GetPointerv), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetPointerv)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glIndexPointerEXT
+.type glIndexPointerEXT,#function
+glIndexPointerEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_IndexPointerEXT), %g2
+	or	%g2, %lo(8 * _gloffset_IndexPointerEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_IndexPointerEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glNormalPointerEXT
+.type glNormalPointerEXT,#function
+glNormalPointerEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_NormalPointerEXT), %g2
+	or	%g2, %lo(8 * _gloffset_NormalPointerEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_NormalPointerEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTexCoordPointerEXT
+.type glTexCoordPointerEXT,#function
+glTexCoordPointerEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TexCoordPointerEXT), %g2
+	or	%g2, %lo(8 * _gloffset_TexCoordPointerEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TexCoordPointerEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexPointerEXT
+.type glVertexPointerEXT,#function
+glVertexPointerEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexPointerEXT), %g2
+	or	%g2, %lo(8 * _gloffset_VertexPointerEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexPointerEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glBlendEquationEXT
+.type glBlendEquationEXT,#function
+glBlendEquationEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_BlendEquation), %g2
+	or	%g2, %lo(8 * _gloffset_BlendEquation), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_BlendEquation)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSpriteParameterfSGIX
+.type glSpriteParameterfSGIX,#function
+glSpriteParameterfSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SpriteParameterfSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_SpriteParameterfSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SpriteParameterfSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSpriteParameterfvSGIX
+.type glSpriteParameterfvSGIX,#function
+glSpriteParameterfvSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SpriteParameterfvSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_SpriteParameterfvSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SpriteParameterfvSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSpriteParameteriSGIX
+.type glSpriteParameteriSGIX,#function
+glSpriteParameteriSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SpriteParameteriSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_SpriteParameteriSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SpriteParameteriSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSpriteParameterivSGIX
+.type glSpriteParameterivSGIX,#function
+glSpriteParameterivSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SpriteParameterivSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_SpriteParameterivSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SpriteParameterivSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPointParameterfEXT
+.type glPointParameterfEXT,#function
+glPointParameterfEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PointParameterfEXT), %g2
+	or	%g2, %lo(8 * _gloffset_PointParameterfEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PointParameterfEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPointParameterfvEXT
+.type glPointParameterfvEXT,#function
+glPointParameterfvEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PointParameterfvEXT), %g2
+	or	%g2, %lo(8 * _gloffset_PointParameterfvEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PointParameterfvEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPointParameterfARB
+.type glPointParameterfARB,#function
+glPointParameterfARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PointParameterfEXT), %g2
+	or	%g2, %lo(8 * _gloffset_PointParameterfEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PointParameterfEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPointParameterfvARB
+.type glPointParameterfvARB,#function
+glPointParameterfvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PointParameterfvEXT), %g2
+	or	%g2, %lo(8 * _gloffset_PointParameterfvEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PointParameterfvEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPointParameterfSGIS
+.type glPointParameterfSGIS,#function
+glPointParameterfSGIS:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PointParameterfEXT), %g2
+	or	%g2, %lo(8 * _gloffset_PointParameterfEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PointParameterfEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPointParameterfvSGIS
+.type glPointParameterfvSGIS,#function
+glPointParameterfvSGIS:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PointParameterfvEXT), %g2
+	or	%g2, %lo(8 * _gloffset_PointParameterfvEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PointParameterfvEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetInstrumentsSGIX
+.type glGetInstrumentsSGIX,#function
+glGetInstrumentsSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetInstrumentsSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_GetInstrumentsSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetInstrumentsSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glInstrumentsBufferSGIX
+.type glInstrumentsBufferSGIX,#function
+glInstrumentsBufferSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_InstrumentsBufferSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_InstrumentsBufferSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_InstrumentsBufferSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPollInstrumentsSGIX
+.type glPollInstrumentsSGIX,#function
+glPollInstrumentsSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PollInstrumentsSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_PollInstrumentsSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PollInstrumentsSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glReadInstrumentsSGIX
+.type glReadInstrumentsSGIX,#function
+glReadInstrumentsSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ReadInstrumentsSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_ReadInstrumentsSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ReadInstrumentsSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glStartInstrumentsSGIX
+.type glStartInstrumentsSGIX,#function
+glStartInstrumentsSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_StartInstrumentsSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_StartInstrumentsSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_StartInstrumentsSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glStopInstrumentsSGIX
+.type glStopInstrumentsSGIX,#function
+glStopInstrumentsSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_StopInstrumentsSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_StopInstrumentsSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_StopInstrumentsSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFrameZoomSGIX
+.type glFrameZoomSGIX,#function
+glFrameZoomSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_FrameZoomSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_FrameZoomSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_FrameZoomSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTagSampleBufferSGIX
+.type glTagSampleBufferSGIX,#function
+glTagSampleBufferSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TagSampleBufferSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_TagSampleBufferSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TagSampleBufferSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glReferencePlaneSGIX
+.type glReferencePlaneSGIX,#function
+glReferencePlaneSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ReferencePlaneSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_ReferencePlaneSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ReferencePlaneSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFlushRasterSGIX
+.type glFlushRasterSGIX,#function
+glFlushRasterSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_FlushRasterSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_FlushRasterSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_FlushRasterSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColorSubTableEXT
+.type glColorSubTableEXT,#function
+glColorSubTableEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ColorSubTable), %g2
+	or	%g2, %lo(8 * _gloffset_ColorSubTable), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ColorSubTable)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCopyColorSubTableEXT
+.type glCopyColorSubTableEXT,#function
+glCopyColorSubTableEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CopyColorSubTable), %g2
+	or	%g2, %lo(8 * _gloffset_CopyColorSubTable), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CopyColorSubTable)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glHintPGI
+.type glHintPGI,#function
+glHintPGI:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_HintPGI), %g2
+	or	%g2, %lo(8 * _gloffset_HintPGI), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_HintPGI)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glColorTableEXT
+.type glColorTableEXT,#function
+glColorTableEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ColorTable), %g2
+	or	%g2, %lo(8 * _gloffset_ColorTable), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ColorTable)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetColorTableEXT
+.type glGetColorTableEXT,#function
+glGetColorTableEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetColorTableEXT), %g2
+	or	%g2, %lo(8 * _gloffset_GetColorTableEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetColorTableEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetColorTableParameterivEXT
+.type glGetColorTableParameterivEXT,#function
+glGetColorTableParameterivEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetColorTableParameterivEXT), %g2
+	or	%g2, %lo(8 * _gloffset_GetColorTableParameterivEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetColorTableParameterivEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetColorTableParameterfvEXT
+.type glGetColorTableParameterfvEXT,#function
+glGetColorTableParameterfvEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetColorTableParameterfvEXT), %g2
+	or	%g2, %lo(8 * _gloffset_GetColorTableParameterfvEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetColorTableParameterfvEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetListParameterfvSGIX
+.type glGetListParameterfvSGIX,#function
+glGetListParameterfvSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetListParameterfvSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_GetListParameterfvSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetListParameterfvSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetListParameterivSGIX
+.type glGetListParameterivSGIX,#function
+glGetListParameterivSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetListParameterivSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_GetListParameterivSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetListParameterivSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glListParameterfSGIX
+.type glListParameterfSGIX,#function
+glListParameterfSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ListParameterfSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_ListParameterfSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ListParameterfSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glListParameterfvSGIX
+.type glListParameterfvSGIX,#function
+glListParameterfvSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ListParameterfvSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_ListParameterfvSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ListParameterfvSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glListParameteriSGIX
+.type glListParameteriSGIX,#function
+glListParameteriSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ListParameteriSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_ListParameteriSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ListParameteriSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glListParameterivSGIX
+.type glListParameterivSGIX,#function
+glListParameterivSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ListParameterivSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_ListParameterivSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ListParameterivSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glIndexMaterialEXT
+.type glIndexMaterialEXT,#function
+glIndexMaterialEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_IndexMaterialEXT), %g2
+	or	%g2, %lo(8 * _gloffset_IndexMaterialEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_IndexMaterialEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glIndexFuncEXT
+.type glIndexFuncEXT,#function
+glIndexFuncEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_IndexFuncEXT), %g2
+	or	%g2, %lo(8 * _gloffset_IndexFuncEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_IndexFuncEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glLockArraysEXT
+.type glLockArraysEXT,#function
+glLockArraysEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_LockArraysEXT), %g2
+	or	%g2, %lo(8 * _gloffset_LockArraysEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_LockArraysEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glUnlockArraysEXT
+.type glUnlockArraysEXT,#function
+glUnlockArraysEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_UnlockArraysEXT), %g2
+	or	%g2, %lo(8 * _gloffset_UnlockArraysEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_UnlockArraysEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCullParameterdvEXT
+.type glCullParameterdvEXT,#function
+glCullParameterdvEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CullParameterdvEXT), %g2
+	or	%g2, %lo(8 * _gloffset_CullParameterdvEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CullParameterdvEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCullParameterfvEXT
+.type glCullParameterfvEXT,#function
+glCullParameterfvEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CullParameterfvEXT), %g2
+	or	%g2, %lo(8 * _gloffset_CullParameterfvEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CullParameterfvEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFragmentColorMaterialSGIX
+.type glFragmentColorMaterialSGIX,#function
+glFragmentColorMaterialSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_FragmentColorMaterialSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_FragmentColorMaterialSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_FragmentColorMaterialSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFragmentLightfSGIX
+.type glFragmentLightfSGIX,#function
+glFragmentLightfSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_FragmentLightfSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_FragmentLightfSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_FragmentLightfSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFragmentLightfvSGIX
+.type glFragmentLightfvSGIX,#function
+glFragmentLightfvSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_FragmentLightfvSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_FragmentLightfvSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_FragmentLightfvSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFragmentLightiSGIX
+.type glFragmentLightiSGIX,#function
+glFragmentLightiSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_FragmentLightiSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_FragmentLightiSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_FragmentLightiSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFragmentLightivSGIX
+.type glFragmentLightivSGIX,#function
+glFragmentLightivSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_FragmentLightivSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_FragmentLightivSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_FragmentLightivSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFragmentLightModelfSGIX
+.type glFragmentLightModelfSGIX,#function
+glFragmentLightModelfSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_FragmentLightModelfSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_FragmentLightModelfSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_FragmentLightModelfSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFragmentLightModelfvSGIX
+.type glFragmentLightModelfvSGIX,#function
+glFragmentLightModelfvSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_FragmentLightModelfvSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_FragmentLightModelfvSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_FragmentLightModelfvSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFragmentLightModeliSGIX
+.type glFragmentLightModeliSGIX,#function
+glFragmentLightModeliSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_FragmentLightModeliSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_FragmentLightModeliSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_FragmentLightModeliSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFragmentLightModelivSGIX
+.type glFragmentLightModelivSGIX,#function
+glFragmentLightModelivSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_FragmentLightModelivSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_FragmentLightModelivSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_FragmentLightModelivSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFragmentMaterialfSGIX
+.type glFragmentMaterialfSGIX,#function
+glFragmentMaterialfSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_FragmentMaterialfSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_FragmentMaterialfSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_FragmentMaterialfSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFragmentMaterialfvSGIX
+.type glFragmentMaterialfvSGIX,#function
+glFragmentMaterialfvSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_FragmentMaterialfvSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_FragmentMaterialfvSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_FragmentMaterialfvSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFragmentMaterialiSGIX
+.type glFragmentMaterialiSGIX,#function
+glFragmentMaterialiSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_FragmentMaterialiSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_FragmentMaterialiSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_FragmentMaterialiSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFragmentMaterialivSGIX
+.type glFragmentMaterialivSGIX,#function
+glFragmentMaterialivSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_FragmentMaterialivSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_FragmentMaterialivSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_FragmentMaterialivSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetFragmentLightfvSGIX
+.type glGetFragmentLightfvSGIX,#function
+glGetFragmentLightfvSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetFragmentLightfvSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_GetFragmentLightfvSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetFragmentLightfvSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetFragmentLightivSGIX
+.type glGetFragmentLightivSGIX,#function
+glGetFragmentLightivSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetFragmentLightivSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_GetFragmentLightivSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetFragmentLightivSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetFragmentMaterialfvSGIX
+.type glGetFragmentMaterialfvSGIX,#function
+glGetFragmentMaterialfvSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetFragmentMaterialfvSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_GetFragmentMaterialfvSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetFragmentMaterialfvSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetFragmentMaterialivSGIX
+.type glGetFragmentMaterialivSGIX,#function
+glGetFragmentMaterialivSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetFragmentMaterialivSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_GetFragmentMaterialivSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetFragmentMaterialivSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glLightEnviSGIX
+.type glLightEnviSGIX,#function
+glLightEnviSGIX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_LightEnviSGIX), %g2
+	or	%g2, %lo(8 * _gloffset_LightEnviSGIX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_LightEnviSGIX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glDrawRangeElementsEXT
+.type glDrawRangeElementsEXT,#function
+glDrawRangeElementsEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_DrawRangeElements), %g2
+	or	%g2, %lo(8 * _gloffset_DrawRangeElements), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_DrawRangeElements)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColor3bEXT
+.type glSecondaryColor3bEXT,#function
+glSecondaryColor3bEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColor3bEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColor3bEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColor3bEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColor3bvEXT
+.type glSecondaryColor3bvEXT,#function
+glSecondaryColor3bvEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColor3bvEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColor3bvEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColor3bvEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColor3dEXT
+.type glSecondaryColor3dEXT,#function
+glSecondaryColor3dEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColor3dEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColor3dEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColor3dEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColor3dvEXT
+.type glSecondaryColor3dvEXT,#function
+glSecondaryColor3dvEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColor3dvEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColor3dvEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColor3dvEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColor3fEXT
+.type glSecondaryColor3fEXT,#function
+glSecondaryColor3fEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColor3fEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColor3fEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColor3fEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColor3fvEXT
+.type glSecondaryColor3fvEXT,#function
+glSecondaryColor3fvEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColor3fvEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColor3fvEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColor3fvEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColor3iEXT
+.type glSecondaryColor3iEXT,#function
+glSecondaryColor3iEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColor3iEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColor3iEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColor3iEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColor3ivEXT
+.type glSecondaryColor3ivEXT,#function
+glSecondaryColor3ivEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColor3ivEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColor3ivEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColor3ivEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColor3sEXT
+.type glSecondaryColor3sEXT,#function
+glSecondaryColor3sEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColor3sEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColor3sEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColor3sEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColor3svEXT
+.type glSecondaryColor3svEXT,#function
+glSecondaryColor3svEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColor3svEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColor3svEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColor3svEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColor3ubEXT
+.type glSecondaryColor3ubEXT,#function
+glSecondaryColor3ubEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColor3ubEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColor3ubEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColor3ubEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColor3ubvEXT
+.type glSecondaryColor3ubvEXT,#function
+glSecondaryColor3ubvEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColor3ubvEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColor3ubvEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColor3ubvEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColor3uiEXT
+.type glSecondaryColor3uiEXT,#function
+glSecondaryColor3uiEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColor3uiEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColor3uiEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColor3uiEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColor3uivEXT
+.type glSecondaryColor3uivEXT,#function
+glSecondaryColor3uivEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColor3uivEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColor3uivEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColor3uivEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColor3usEXT
+.type glSecondaryColor3usEXT,#function
+glSecondaryColor3usEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColor3usEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColor3usEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColor3usEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColor3usvEXT
+.type glSecondaryColor3usvEXT,#function
+glSecondaryColor3usvEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColor3usvEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColor3usvEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColor3usvEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColorPointerEXT
+.type glSecondaryColorPointerEXT,#function
+glSecondaryColorPointerEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColorPointerEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColorPointerEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColorPointerEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiDrawArraysEXT
+.type glMultiDrawArraysEXT,#function
+glMultiDrawArraysEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiDrawArraysEXT), %g2
+	or	%g2, %lo(8 * _gloffset_MultiDrawArraysEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiDrawArraysEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiDrawElementsEXT
+.type glMultiDrawElementsEXT,#function
+glMultiDrawElementsEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiDrawElementsEXT), %g2
+	or	%g2, %lo(8 * _gloffset_MultiDrawElementsEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiDrawElementsEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFogCoordfEXT
+.type glFogCoordfEXT,#function
+glFogCoordfEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_FogCoordfEXT), %g2
+	or	%g2, %lo(8 * _gloffset_FogCoordfEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_FogCoordfEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFogCoordfvEXT
+.type glFogCoordfvEXT,#function
+glFogCoordfvEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_FogCoordfvEXT), %g2
+	or	%g2, %lo(8 * _gloffset_FogCoordfvEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_FogCoordfvEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFogCoorddEXT
+.type glFogCoorddEXT,#function
+glFogCoorddEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_FogCoorddEXT), %g2
+	or	%g2, %lo(8 * _gloffset_FogCoorddEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_FogCoorddEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFogCoorddvEXT
+.type glFogCoorddvEXT,#function
+glFogCoorddvEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_FogCoorddvEXT), %g2
+	or	%g2, %lo(8 * _gloffset_FogCoorddvEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_FogCoorddvEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFogCoordPointerEXT
+.type glFogCoordPointerEXT,#function
+glFogCoordPointerEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_FogCoordPointerEXT), %g2
+	or	%g2, %lo(8 * _gloffset_FogCoordPointerEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_FogCoordPointerEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glBlendFuncSeparateEXT
+.type glBlendFuncSeparateEXT,#function
+glBlendFuncSeparateEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_BlendFuncSeparateEXT), %g2
+	or	%g2, %lo(8 * _gloffset_BlendFuncSeparateEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_BlendFuncSeparateEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glBlendFuncSeparateINGR
+.type glBlendFuncSeparateINGR,#function
+glBlendFuncSeparateINGR:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_BlendFuncSeparateEXT), %g2
+	or	%g2, %lo(8 * _gloffset_BlendFuncSeparateEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_BlendFuncSeparateEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexWeightfEXT
+.type glVertexWeightfEXT,#function
+glVertexWeightfEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexWeightfEXT), %g2
+	or	%g2, %lo(8 * _gloffset_VertexWeightfEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexWeightfEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexWeightfvEXT
+.type glVertexWeightfvEXT,#function
+glVertexWeightfvEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexWeightfvEXT), %g2
+	or	%g2, %lo(8 * _gloffset_VertexWeightfvEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexWeightfvEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexWeightPointerEXT
+.type glVertexWeightPointerEXT,#function
+glVertexWeightPointerEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexWeightPointerEXT), %g2
+	or	%g2, %lo(8 * _gloffset_VertexWeightPointerEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexWeightPointerEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFlushVertexArrayRangeNV
+.type glFlushVertexArrayRangeNV,#function
+glFlushVertexArrayRangeNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_FlushVertexArrayRangeNV), %g2
+	or	%g2, %lo(8 * _gloffset_FlushVertexArrayRangeNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_FlushVertexArrayRangeNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexArrayRangeNV
+.type glVertexArrayRangeNV,#function
+glVertexArrayRangeNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexArrayRangeNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexArrayRangeNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexArrayRangeNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCombinerParameterfvNV
+.type glCombinerParameterfvNV,#function
+glCombinerParameterfvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CombinerParameterfvNV), %g2
+	or	%g2, %lo(8 * _gloffset_CombinerParameterfvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CombinerParameterfvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCombinerParameterfNV
+.type glCombinerParameterfNV,#function
+glCombinerParameterfNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CombinerParameterfNV), %g2
+	or	%g2, %lo(8 * _gloffset_CombinerParameterfNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CombinerParameterfNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCombinerParameterivNV
+.type glCombinerParameterivNV,#function
+glCombinerParameterivNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CombinerParameterivNV), %g2
+	or	%g2, %lo(8 * _gloffset_CombinerParameterivNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CombinerParameterivNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCombinerParameteriNV
+.type glCombinerParameteriNV,#function
+glCombinerParameteriNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CombinerParameteriNV), %g2
+	or	%g2, %lo(8 * _gloffset_CombinerParameteriNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CombinerParameteriNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCombinerInputNV
+.type glCombinerInputNV,#function
+glCombinerInputNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CombinerInputNV), %g2
+	or	%g2, %lo(8 * _gloffset_CombinerInputNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CombinerInputNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glCombinerOutputNV
+.type glCombinerOutputNV,#function
+glCombinerOutputNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_CombinerOutputNV), %g2
+	or	%g2, %lo(8 * _gloffset_CombinerOutputNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_CombinerOutputNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFinalCombinerInputNV
+.type glFinalCombinerInputNV,#function
+glFinalCombinerInputNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_FinalCombinerInputNV), %g2
+	or	%g2, %lo(8 * _gloffset_FinalCombinerInputNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_FinalCombinerInputNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetCombinerInputParameterfvNV
+.type glGetCombinerInputParameterfvNV,#function
+glGetCombinerInputParameterfvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetCombinerInputParameterfvNV), %g2
+	or	%g2, %lo(8 * _gloffset_GetCombinerInputParameterfvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetCombinerInputParameterfvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetCombinerInputParameterivNV
+.type glGetCombinerInputParameterivNV,#function
+glGetCombinerInputParameterivNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetCombinerInputParameterivNV), %g2
+	or	%g2, %lo(8 * _gloffset_GetCombinerInputParameterivNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetCombinerInputParameterivNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetCombinerOutputParameterfvNV
+.type glGetCombinerOutputParameterfvNV,#function
+glGetCombinerOutputParameterfvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetCombinerOutputParameterfvNV), %g2
+	or	%g2, %lo(8 * _gloffset_GetCombinerOutputParameterfvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetCombinerOutputParameterfvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetCombinerOutputParameterivNV
+.type glGetCombinerOutputParameterivNV,#function
+glGetCombinerOutputParameterivNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetCombinerOutputParameterivNV), %g2
+	or	%g2, %lo(8 * _gloffset_GetCombinerOutputParameterivNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetCombinerOutputParameterivNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetFinalCombinerInputParameterfvNV
+.type glGetFinalCombinerInputParameterfvNV,#function
+glGetFinalCombinerInputParameterfvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetFinalCombinerInputParameterfvNV), %g2
+	or	%g2, %lo(8 * _gloffset_GetFinalCombinerInputParameterfvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetFinalCombinerInputParameterfvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetFinalCombinerInputParameterivNV
+.type glGetFinalCombinerInputParameterivNV,#function
+glGetFinalCombinerInputParameterivNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetFinalCombinerInputParameterivNV), %g2
+	or	%g2, %lo(8 * _gloffset_GetFinalCombinerInputParameterivNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetFinalCombinerInputParameterivNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glResizeBuffersMESA
+.type glResizeBuffersMESA,#function
+glResizeBuffersMESA:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ResizeBuffersMESA), %g2
+	or	%g2, %lo(8 * _gloffset_ResizeBuffersMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ResizeBuffersMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos2dMESA
+.type glWindowPos2dMESA,#function
+glWindowPos2dMESA:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos2dMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos2dMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos2dMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos2dvMESA
+.type glWindowPos2dvMESA,#function
+glWindowPos2dvMESA:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos2dvMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos2dvMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos2dvMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos2fMESA
+.type glWindowPos2fMESA,#function
+glWindowPos2fMESA:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos2fMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos2fMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos2fMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos2fvMESA
+.type glWindowPos2fvMESA,#function
+glWindowPos2fvMESA:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos2fvMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos2fvMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos2fvMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos2iMESA
+.type glWindowPos2iMESA,#function
+glWindowPos2iMESA:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos2iMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos2iMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos2iMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos2ivMESA
+.type glWindowPos2ivMESA,#function
+glWindowPos2ivMESA:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos2ivMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos2ivMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos2ivMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos2sMESA
+.type glWindowPos2sMESA,#function
+glWindowPos2sMESA:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos2sMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos2sMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos2sMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos2svMESA
+.type glWindowPos2svMESA,#function
+glWindowPos2svMESA:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos2svMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos2svMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos2svMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos3dMESA
+.type glWindowPos3dMESA,#function
+glWindowPos3dMESA:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos3dMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos3dMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos3dMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos3dvMESA
+.type glWindowPos3dvMESA,#function
+glWindowPos3dvMESA:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos3dvMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos3dvMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos3dvMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos3fMESA
+.type glWindowPos3fMESA,#function
+glWindowPos3fMESA:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos3fMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos3fMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos3fMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos3fvMESA
+.type glWindowPos3fvMESA,#function
+glWindowPos3fvMESA:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos3fvMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos3fvMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos3fvMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos3iMESA
+.type glWindowPos3iMESA,#function
+glWindowPos3iMESA:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos3iMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos3iMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos3iMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos3ivMESA
+.type glWindowPos3ivMESA,#function
+glWindowPos3ivMESA:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos3ivMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos3ivMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos3ivMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos3sMESA
+.type glWindowPos3sMESA,#function
+glWindowPos3sMESA:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos3sMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos3sMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos3sMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos3svMESA
+.type glWindowPos3svMESA,#function
+glWindowPos3svMESA:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos3svMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos3svMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos3svMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos4dMESA
+.type glWindowPos4dMESA,#function
+glWindowPos4dMESA:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos4dMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos4dMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos4dMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos4dvMESA
+.type glWindowPos4dvMESA,#function
+glWindowPos4dvMESA:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos4dvMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos4dvMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos4dvMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos4fMESA
+.type glWindowPos4fMESA,#function
+glWindowPos4fMESA:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos4fMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos4fMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos4fMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos4fvMESA
+.type glWindowPos4fvMESA,#function
+glWindowPos4fvMESA:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos4fvMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos4fvMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos4fvMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos4iMESA
+.type glWindowPos4iMESA,#function
+glWindowPos4iMESA:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos4iMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos4iMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos4iMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos4ivMESA
+.type glWindowPos4ivMESA,#function
+glWindowPos4ivMESA:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos4ivMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos4ivMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos4ivMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos4sMESA
+.type glWindowPos4sMESA,#function
+glWindowPos4sMESA:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos4sMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos4sMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos4sMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos4svMESA
+.type glWindowPos4svMESA,#function
+glWindowPos4svMESA:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos4svMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos4svMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos4svMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiModeDrawArraysIBM
+.type glMultiModeDrawArraysIBM,#function
+glMultiModeDrawArraysIBM:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiModeDrawArraysIBM), %g2
+	or	%g2, %lo(8 * _gloffset_MultiModeDrawArraysIBM), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiModeDrawArraysIBM)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiModeDrawElementsIBM
+.type glMultiModeDrawElementsIBM,#function
+glMultiModeDrawElementsIBM:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiModeDrawElementsIBM), %g2
+	or	%g2, %lo(8 * _gloffset_MultiModeDrawElementsIBM), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiModeDrawElementsIBM)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTbufferMask3DFX
+.type glTbufferMask3DFX,#function
+glTbufferMask3DFX:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TbufferMask3DFX), %g2
+	or	%g2, %lo(8 * _gloffset_TbufferMask3DFX), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TbufferMask3DFX)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSampleMaskEXT
+.type glSampleMaskEXT,#function
+glSampleMaskEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SampleMaskSGIS), %g2
+	or	%g2, %lo(8 * _gloffset_SampleMaskSGIS), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SampleMaskSGIS)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSamplePatternEXT
+.type glSamplePatternEXT,#function
+glSamplePatternEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SamplePatternSGIS), %g2
+	or	%g2, %lo(8 * _gloffset_SamplePatternSGIS), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SamplePatternSGIS)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos2dARB
+.type glWindowPos2dARB,#function
+glWindowPos2dARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos2dMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos2dMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos2dMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos2fARB
+.type glWindowPos2fARB,#function
+glWindowPos2fARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos2fMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos2fMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos2fMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos2iARB
+.type glWindowPos2iARB,#function
+glWindowPos2iARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos2iMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos2iMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos2iMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos2sARB
+.type glWindowPos2sARB,#function
+glWindowPos2sARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos2sMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos2sMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos2sMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos2dvARB
+.type glWindowPos2dvARB,#function
+glWindowPos2dvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos2dvMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos2dvMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos2dvMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos2fvARB
+.type glWindowPos2fvARB,#function
+glWindowPos2fvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos2fvMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos2fvMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos2fvMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos2ivARB
+.type glWindowPos2ivARB,#function
+glWindowPos2ivARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos2ivMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos2ivMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos2ivMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos2svARB
+.type glWindowPos2svARB,#function
+glWindowPos2svARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos2svMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos2svMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos2svMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos3dARB
+.type glWindowPos3dARB,#function
+glWindowPos3dARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos3dMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos3dMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos3dMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos3fARB
+.type glWindowPos3fARB,#function
+glWindowPos3fARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos3fMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos3fMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos3fMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos3iARB
+.type glWindowPos3iARB,#function
+glWindowPos3iARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos3iMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos3iMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos3iMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos3sARB
+.type glWindowPos3sARB,#function
+glWindowPos3sARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos3sMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos3sMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos3sMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos3dvARB
+.type glWindowPos3dvARB,#function
+glWindowPos3dvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos3dvMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos3dvMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos3dvMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos3fvARB
+.type glWindowPos3fvARB,#function
+glWindowPos3fvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos3fvMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos3fvMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos3fvMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos3ivARB
+.type glWindowPos3ivARB,#function
+glWindowPos3ivARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos3ivMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos3ivMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos3ivMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos3svARB
+.type glWindowPos3svARB,#function
+glWindowPos3svARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos3svMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos3svMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos3svMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glAreProgramsResidentNV
+.type glAreProgramsResidentNV,#function
+glAreProgramsResidentNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_AreProgramsResidentNV), %g2
+	or	%g2, %lo(8 * _gloffset_AreProgramsResidentNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_AreProgramsResidentNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glBindProgramNV
+.type glBindProgramNV,#function
+glBindProgramNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_BindProgramNV), %g2
+	or	%g2, %lo(8 * _gloffset_BindProgramNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_BindProgramNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glDeleteProgramsNV
+.type glDeleteProgramsNV,#function
+glDeleteProgramsNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_DeleteProgramsNV), %g2
+	or	%g2, %lo(8 * _gloffset_DeleteProgramsNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_DeleteProgramsNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glExecuteProgramNV
+.type glExecuteProgramNV,#function
+glExecuteProgramNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ExecuteProgramNV), %g2
+	or	%g2, %lo(8 * _gloffset_ExecuteProgramNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ExecuteProgramNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGenProgramsNV
+.type glGenProgramsNV,#function
+glGenProgramsNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GenProgramsNV), %g2
+	or	%g2, %lo(8 * _gloffset_GenProgramsNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GenProgramsNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetProgramParameterdvNV
+.type glGetProgramParameterdvNV,#function
+glGetProgramParameterdvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetProgramParameterdvNV), %g2
+	or	%g2, %lo(8 * _gloffset_GetProgramParameterdvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetProgramParameterdvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetProgramParameterfvNV
+.type glGetProgramParameterfvNV,#function
+glGetProgramParameterfvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetProgramParameterfvNV), %g2
+	or	%g2, %lo(8 * _gloffset_GetProgramParameterfvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetProgramParameterfvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetProgramivNV
+.type glGetProgramivNV,#function
+glGetProgramivNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetProgramivNV), %g2
+	or	%g2, %lo(8 * _gloffset_GetProgramivNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetProgramivNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetProgramStringNV
+.type glGetProgramStringNV,#function
+glGetProgramStringNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetProgramStringNV), %g2
+	or	%g2, %lo(8 * _gloffset_GetProgramStringNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetProgramStringNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetTrackMatrixivNV
+.type glGetTrackMatrixivNV,#function
+glGetTrackMatrixivNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetTrackMatrixivNV), %g2
+	or	%g2, %lo(8 * _gloffset_GetTrackMatrixivNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetTrackMatrixivNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetVertexAttribdvNV
+.type glGetVertexAttribdvNV,#function
+glGetVertexAttribdvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetVertexAttribdvNV), %g2
+	or	%g2, %lo(8 * _gloffset_GetVertexAttribdvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetVertexAttribdvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetVertexAttribfvNV
+.type glGetVertexAttribfvNV,#function
+glGetVertexAttribfvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetVertexAttribfvNV), %g2
+	or	%g2, %lo(8 * _gloffset_GetVertexAttribfvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetVertexAttribfvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetVertexAttribivNV
+.type glGetVertexAttribivNV,#function
+glGetVertexAttribivNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetVertexAttribivNV), %g2
+	or	%g2, %lo(8 * _gloffset_GetVertexAttribivNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetVertexAttribivNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetVertexAttribPointervNV
+.type glGetVertexAttribPointervNV,#function
+glGetVertexAttribPointervNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetVertexAttribPointervNV), %g2
+	or	%g2, %lo(8 * _gloffset_GetVertexAttribPointervNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetVertexAttribPointervNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glIsProgramNV
+.type glIsProgramNV,#function
+glIsProgramNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_IsProgramNV), %g2
+	or	%g2, %lo(8 * _gloffset_IsProgramNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_IsProgramNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glLoadProgramNV
+.type glLoadProgramNV,#function
+glLoadProgramNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_LoadProgramNV), %g2
+	or	%g2, %lo(8 * _gloffset_LoadProgramNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_LoadProgramNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glProgramParameter4dNV
+.type glProgramParameter4dNV,#function
+glProgramParameter4dNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ProgramParameter4dNV), %g2
+	or	%g2, %lo(8 * _gloffset_ProgramParameter4dNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ProgramParameter4dNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glProgramParameter4dvNV
+.type glProgramParameter4dvNV,#function
+glProgramParameter4dvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ProgramParameter4dvNV), %g2
+	or	%g2, %lo(8 * _gloffset_ProgramParameter4dvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ProgramParameter4dvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glProgramParameter4fNV
+.type glProgramParameter4fNV,#function
+glProgramParameter4fNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ProgramParameter4fNV), %g2
+	or	%g2, %lo(8 * _gloffset_ProgramParameter4fNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ProgramParameter4fNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glProgramParameter4fvNV
+.type glProgramParameter4fvNV,#function
+glProgramParameter4fvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ProgramParameter4fvNV), %g2
+	or	%g2, %lo(8 * _gloffset_ProgramParameter4fvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ProgramParameter4fvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glProgramParameters4dvNV
+.type glProgramParameters4dvNV,#function
+glProgramParameters4dvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ProgramParameters4dvNV), %g2
+	or	%g2, %lo(8 * _gloffset_ProgramParameters4dvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ProgramParameters4dvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glProgramParameters4fvNV
+.type glProgramParameters4fvNV,#function
+glProgramParameters4fvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ProgramParameters4fvNV), %g2
+	or	%g2, %lo(8 * _gloffset_ProgramParameters4fvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ProgramParameters4fvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glRequestResidentProgramsNV
+.type glRequestResidentProgramsNV,#function
+glRequestResidentProgramsNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_RequestResidentProgramsNV), %g2
+	or	%g2, %lo(8 * _gloffset_RequestResidentProgramsNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_RequestResidentProgramsNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTrackMatrixNV
+.type glTrackMatrixNV,#function
+glTrackMatrixNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TrackMatrixNV), %g2
+	or	%g2, %lo(8 * _gloffset_TrackMatrixNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TrackMatrixNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttribPointerNV
+.type glVertexAttribPointerNV,#function
+glVertexAttribPointerNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttribPointerNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttribPointerNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttribPointerNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib1dNV
+.type glVertexAttrib1dNV,#function
+glVertexAttrib1dNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib1dNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib1dNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib1dNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib1dvNV
+.type glVertexAttrib1dvNV,#function
+glVertexAttrib1dvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib1dvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib1dvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib1dvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib1fNV
+.type glVertexAttrib1fNV,#function
+glVertexAttrib1fNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib1fNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib1fNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib1fNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib1fvNV
+.type glVertexAttrib1fvNV,#function
+glVertexAttrib1fvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib1fvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib1fvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib1fvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib1sNV
+.type glVertexAttrib1sNV,#function
+glVertexAttrib1sNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib1sNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib1sNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib1sNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib1svNV
+.type glVertexAttrib1svNV,#function
+glVertexAttrib1svNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib1svNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib1svNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib1svNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib2dNV
+.type glVertexAttrib2dNV,#function
+glVertexAttrib2dNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib2dNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib2dNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib2dNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib2dvNV
+.type glVertexAttrib2dvNV,#function
+glVertexAttrib2dvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib2dvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib2dvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib2dvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib2fNV
+.type glVertexAttrib2fNV,#function
+glVertexAttrib2fNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib2fNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib2fNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib2fNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib2fvNV
+.type glVertexAttrib2fvNV,#function
+glVertexAttrib2fvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib2fvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib2fvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib2fvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib2sNV
+.type glVertexAttrib2sNV,#function
+glVertexAttrib2sNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib2sNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib2sNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib2sNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib2svNV
+.type glVertexAttrib2svNV,#function
+glVertexAttrib2svNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib2svNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib2svNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib2svNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib3dNV
+.type glVertexAttrib3dNV,#function
+glVertexAttrib3dNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib3dNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib3dNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib3dNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib3dvNV
+.type glVertexAttrib3dvNV,#function
+glVertexAttrib3dvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib3dvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib3dvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib3dvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib3fNV
+.type glVertexAttrib3fNV,#function
+glVertexAttrib3fNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib3fNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib3fNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib3fNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib3fvNV
+.type glVertexAttrib3fvNV,#function
+glVertexAttrib3fvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib3fvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib3fvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib3fvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib3sNV
+.type glVertexAttrib3sNV,#function
+glVertexAttrib3sNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib3sNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib3sNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib3sNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib3svNV
+.type glVertexAttrib3svNV,#function
+glVertexAttrib3svNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib3svNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib3svNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib3svNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib4dNV
+.type glVertexAttrib4dNV,#function
+glVertexAttrib4dNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib4dNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4dNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4dNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib4dvNV
+.type glVertexAttrib4dvNV,#function
+glVertexAttrib4dvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib4dvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4dvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4dvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib4fNV
+.type glVertexAttrib4fNV,#function
+glVertexAttrib4fNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib4fNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4fNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4fNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib4fvNV
+.type glVertexAttrib4fvNV,#function
+glVertexAttrib4fvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib4fvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4fvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4fvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib4sNV
+.type glVertexAttrib4sNV,#function
+glVertexAttrib4sNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib4sNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4sNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4sNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib4svNV
+.type glVertexAttrib4svNV,#function
+glVertexAttrib4svNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib4svNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4svNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4svNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib4ubNV
+.type glVertexAttrib4ubNV,#function
+glVertexAttrib4ubNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib4ubNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4ubNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4ubNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib4ubvNV
+.type glVertexAttrib4ubvNV,#function
+glVertexAttrib4ubvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib4ubvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4ubvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4ubvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttribs1dvNV
+.type glVertexAttribs1dvNV,#function
+glVertexAttribs1dvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttribs1dvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttribs1dvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttribs1dvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttribs1fvNV
+.type glVertexAttribs1fvNV,#function
+glVertexAttribs1fvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttribs1fvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttribs1fvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttribs1fvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttribs1svNV
+.type glVertexAttribs1svNV,#function
+glVertexAttribs1svNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttribs1svNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttribs1svNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttribs1svNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttribs2dvNV
+.type glVertexAttribs2dvNV,#function
+glVertexAttribs2dvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttribs2dvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttribs2dvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttribs2dvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttribs2fvNV
+.type glVertexAttribs2fvNV,#function
+glVertexAttribs2fvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttribs2fvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttribs2fvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttribs2fvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttribs2svNV
+.type glVertexAttribs2svNV,#function
+glVertexAttribs2svNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttribs2svNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttribs2svNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttribs2svNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttribs3dvNV
+.type glVertexAttribs3dvNV,#function
+glVertexAttribs3dvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttribs3dvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttribs3dvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttribs3dvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttribs3fvNV
+.type glVertexAttribs3fvNV,#function
+glVertexAttribs3fvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttribs3fvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttribs3fvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttribs3fvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttribs3svNV
+.type glVertexAttribs3svNV,#function
+glVertexAttribs3svNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttribs3svNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttribs3svNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttribs3svNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttribs4dvNV
+.type glVertexAttribs4dvNV,#function
+glVertexAttribs4dvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttribs4dvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttribs4dvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttribs4dvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttribs4fvNV
+.type glVertexAttribs4fvNV,#function
+glVertexAttribs4fvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttribs4fvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttribs4fvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttribs4fvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttribs4svNV
+.type glVertexAttribs4svNV,#function
+glVertexAttribs4svNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttribs4svNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttribs4svNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttribs4svNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttribs4ubvNV
+.type glVertexAttribs4ubvNV,#function
+glVertexAttribs4ubvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttribs4ubvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttribs4ubvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttribs4ubvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPointParameteriNV
+.type glPointParameteriNV,#function
+glPointParameteriNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PointParameteriNV), %g2
+	or	%g2, %lo(8 * _gloffset_PointParameteriNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PointParameteriNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPointParameterivNV
+.type glPointParameterivNV,#function
+glPointParameterivNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PointParameterivNV), %g2
+	or	%g2, %lo(8 * _gloffset_PointParameterivNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PointParameterivNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glBlendFuncSeparate
+.type glBlendFuncSeparate,#function
+glBlendFuncSeparate:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_BlendFuncSeparateEXT), %g2
+	or	%g2, %lo(8 * _gloffset_BlendFuncSeparateEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_BlendFuncSeparateEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFogCoordf
+.type glFogCoordf,#function
+glFogCoordf:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_FogCoordfEXT), %g2
+	or	%g2, %lo(8 * _gloffset_FogCoordfEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_FogCoordfEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFogCoordfv
+.type glFogCoordfv,#function
+glFogCoordfv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_FogCoordfvEXT), %g2
+	or	%g2, %lo(8 * _gloffset_FogCoordfvEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_FogCoordfvEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFogCoordd
+.type glFogCoordd,#function
+glFogCoordd:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_FogCoorddEXT), %g2
+	or	%g2, %lo(8 * _gloffset_FogCoorddEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_FogCoorddEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFogCoorddv
+.type glFogCoorddv,#function
+glFogCoorddv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_FogCoorddvEXT), %g2
+	or	%g2, %lo(8 * _gloffset_FogCoorddvEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_FogCoorddvEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFogCoordPointer
+.type glFogCoordPointer,#function
+glFogCoordPointer:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_FogCoordPointerEXT), %g2
+	or	%g2, %lo(8 * _gloffset_FogCoordPointerEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_FogCoordPointerEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiDrawArrays
+.type glMultiDrawArrays,#function
+glMultiDrawArrays:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiDrawArraysEXT), %g2
+	or	%g2, %lo(8 * _gloffset_MultiDrawArraysEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiDrawArraysEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMultiDrawElements
+.type glMultiDrawElements,#function
+glMultiDrawElements:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MultiDrawElementsEXT), %g2
+	or	%g2, %lo(8 * _gloffset_MultiDrawElementsEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MultiDrawElementsEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPointParameterf
+.type glPointParameterf,#function
+glPointParameterf:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PointParameterfEXT), %g2
+	or	%g2, %lo(8 * _gloffset_PointParameterfEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PointParameterfEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPointParameterfv
+.type glPointParameterfv,#function
+glPointParameterfv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PointParameterfvEXT), %g2
+	or	%g2, %lo(8 * _gloffset_PointParameterfvEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PointParameterfvEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPointParameteri
+.type glPointParameteri,#function
+glPointParameteri:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PointParameteriNV), %g2
+	or	%g2, %lo(8 * _gloffset_PointParameteriNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PointParameteriNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glPointParameteriv
+.type glPointParameteriv,#function
+glPointParameteriv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_PointParameterivNV), %g2
+	or	%g2, %lo(8 * _gloffset_PointParameterivNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_PointParameterivNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColor3b
+.type glSecondaryColor3b,#function
+glSecondaryColor3b:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColor3bEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColor3bEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColor3bEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColor3bv
+.type glSecondaryColor3bv,#function
+glSecondaryColor3bv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColor3bvEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColor3bvEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColor3bvEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColor3d
+.type glSecondaryColor3d,#function
+glSecondaryColor3d:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColor3dEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColor3dEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColor3dEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColor3dv
+.type glSecondaryColor3dv,#function
+glSecondaryColor3dv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColor3dvEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColor3dvEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColor3dvEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColor3f
+.type glSecondaryColor3f,#function
+glSecondaryColor3f:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColor3fEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColor3fEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColor3fEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColor3fv
+.type glSecondaryColor3fv,#function
+glSecondaryColor3fv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColor3fvEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColor3fvEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColor3fvEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColor3i
+.type glSecondaryColor3i,#function
+glSecondaryColor3i:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColor3iEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColor3iEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColor3iEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColor3iv
+.type glSecondaryColor3iv,#function
+glSecondaryColor3iv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColor3ivEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColor3ivEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColor3ivEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColor3s
+.type glSecondaryColor3s,#function
+glSecondaryColor3s:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColor3sEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColor3sEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColor3sEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColor3sv
+.type glSecondaryColor3sv,#function
+glSecondaryColor3sv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColor3svEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColor3svEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColor3svEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColor3ub
+.type glSecondaryColor3ub,#function
+glSecondaryColor3ub:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColor3ubEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColor3ubEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColor3ubEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColor3ubv
+.type glSecondaryColor3ubv,#function
+glSecondaryColor3ubv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColor3ubvEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColor3ubvEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColor3ubvEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColor3ui
+.type glSecondaryColor3ui,#function
+glSecondaryColor3ui:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColor3uiEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColor3uiEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColor3uiEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColor3uiv
+.type glSecondaryColor3uiv,#function
+glSecondaryColor3uiv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColor3uivEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColor3uivEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColor3uivEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColor3us
+.type glSecondaryColor3us,#function
+glSecondaryColor3us:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColor3usEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColor3usEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColor3usEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColor3usv
+.type glSecondaryColor3usv,#function
+glSecondaryColor3usv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColor3usvEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColor3usvEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColor3usvEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSecondaryColorPointer
+.type glSecondaryColorPointer,#function
+glSecondaryColorPointer:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SecondaryColorPointerEXT), %g2
+	or	%g2, %lo(8 * _gloffset_SecondaryColorPointerEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SecondaryColorPointerEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos2d
+.type glWindowPos2d,#function
+glWindowPos2d:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos2dMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos2dMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos2dMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos2dv
+.type glWindowPos2dv,#function
+glWindowPos2dv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos2dvMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos2dvMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos2dvMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos2f
+.type glWindowPos2f,#function
+glWindowPos2f:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos2fMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos2fMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos2fMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos2fv
+.type glWindowPos2fv,#function
+glWindowPos2fv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos2fvMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos2fvMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos2fvMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos2i
+.type glWindowPos2i,#function
+glWindowPos2i:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos2iMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos2iMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos2iMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos2iv
+.type glWindowPos2iv,#function
+glWindowPos2iv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos2ivMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos2ivMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos2ivMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos2s
+.type glWindowPos2s,#function
+glWindowPos2s:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos2sMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos2sMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos2sMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos2sv
+.type glWindowPos2sv,#function
+glWindowPos2sv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos2svMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos2svMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos2svMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos3d
+.type glWindowPos3d,#function
+glWindowPos3d:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos3dMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos3dMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos3dMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos3dv
+.type glWindowPos3dv,#function
+glWindowPos3dv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos3dvMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos3dvMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos3dvMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos3f
+.type glWindowPos3f,#function
+glWindowPos3f:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos3fMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos3fMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos3fMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos3fv
+.type glWindowPos3fv,#function
+glWindowPos3fv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos3fvMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos3fvMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos3fvMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos3i
+.type glWindowPos3i,#function
+glWindowPos3i:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos3iMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos3iMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos3iMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos3iv
+.type glWindowPos3iv,#function
+glWindowPos3iv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos3ivMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos3ivMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos3ivMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos3s
+.type glWindowPos3s,#function
+glWindowPos3s:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos3sMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos3sMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos3sMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glWindowPos3sv
+.type glWindowPos3sv,#function
+glWindowPos3sv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_WindowPos3svMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos3svMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos3svMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glActiveStencilFaceEXT
+.type glActiveStencilFaceEXT,#function
+glActiveStencilFaceEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ActiveStencilFaceEXT), %g2
+	or	%g2, %lo(8 * _gloffset_ActiveStencilFaceEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ActiveStencilFaceEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glDeleteFencesNV
+.type glDeleteFencesNV,#function
+glDeleteFencesNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_DeleteFencesNV), %g2
+	or	%g2, %lo(8 * _gloffset_DeleteFencesNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_DeleteFencesNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGenFencesNV
+.type glGenFencesNV,#function
+glGenFencesNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GenFencesNV), %g2
+	or	%g2, %lo(8 * _gloffset_GenFencesNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GenFencesNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glIsFenceNV
+.type glIsFenceNV,#function
+glIsFenceNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_IsFenceNV), %g2
+	or	%g2, %lo(8 * _gloffset_IsFenceNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_IsFenceNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTestFenceNV
+.type glTestFenceNV,#function
+glTestFenceNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TestFenceNV), %g2
+	or	%g2, %lo(8 * _gloffset_TestFenceNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TestFenceNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetFenceivNV
+.type glGetFenceivNV,#function
+glGetFenceivNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetFenceivNV), %g2
+	or	%g2, %lo(8 * _gloffset_GetFenceivNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetFenceivNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFinishFenceNV
+.type glFinishFenceNV,#function
+glFinishFenceNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_FinishFenceNV), %g2
+	or	%g2, %lo(8 * _gloffset_FinishFenceNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_FinishFenceNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSetFenceNV
+.type glSetFenceNV,#function
+glSetFenceNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SetFenceNV), %g2
+	or	%g2, %lo(8 * _gloffset_SetFenceNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SetFenceNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib1sARB
+.type glVertexAttrib1sARB,#function
+glVertexAttrib1sARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib1sNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib1sNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib1sNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib1fARB
+.type glVertexAttrib1fARB,#function
+glVertexAttrib1fARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib1fNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib1fNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib1fNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib1dARB
+.type glVertexAttrib1dARB,#function
+glVertexAttrib1dARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib1dNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib1dNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib1dNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib2sARB
+.type glVertexAttrib2sARB,#function
+glVertexAttrib2sARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib2sNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib2sNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib2sNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib2fARB
+.type glVertexAttrib2fARB,#function
+glVertexAttrib2fARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib2fNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib2fNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib2fNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib2dARB
+.type glVertexAttrib2dARB,#function
+glVertexAttrib2dARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib2dNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib2dNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib2dNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib3sARB
+.type glVertexAttrib3sARB,#function
+glVertexAttrib3sARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib3sNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib3sNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib3sNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib3fARB
+.type glVertexAttrib3fARB,#function
+glVertexAttrib3fARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib3fNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib3fNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib3fNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib3dARB
+.type glVertexAttrib3dARB,#function
+glVertexAttrib3dARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib3dNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib3dNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib3dNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib4sARB
+.type glVertexAttrib4sARB,#function
+glVertexAttrib4sARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib4sNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4sNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4sNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib4fARB
+.type glVertexAttrib4fARB,#function
+glVertexAttrib4fARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib4fNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4fNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4fNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib4dARB
+.type glVertexAttrib4dARB,#function
+glVertexAttrib4dARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib4dNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4dNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4dNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib4NubARB
+.type glVertexAttrib4NubARB,#function
+glVertexAttrib4NubARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib4ubNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4ubNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4ubNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib1svARB
+.type glVertexAttrib1svARB,#function
+glVertexAttrib1svARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib1svNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib1svNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib1svNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib1fvARB
+.type glVertexAttrib1fvARB,#function
+glVertexAttrib1fvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib1fvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib1fvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib1fvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib1dvARB
+.type glVertexAttrib1dvARB,#function
+glVertexAttrib1dvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib1dvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib1dvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib1dvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib2svARB
+.type glVertexAttrib2svARB,#function
+glVertexAttrib2svARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib2svNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib2svNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib2svNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib2fvARB
+.type glVertexAttrib2fvARB,#function
+glVertexAttrib2fvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib2fvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib2fvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib2fvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib2dvARB
+.type glVertexAttrib2dvARB,#function
+glVertexAttrib2dvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib2dvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib2dvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib2dvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib3svARB
+.type glVertexAttrib3svARB,#function
+glVertexAttrib3svARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib3svNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib3svNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib3svNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib3fvARB
+.type glVertexAttrib3fvARB,#function
+glVertexAttrib3fvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib3fvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib3fvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib3fvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib3dvARB
+.type glVertexAttrib3dvARB,#function
+glVertexAttrib3dvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib3dvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib3dvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib3dvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib4bvARB
+.type glVertexAttrib4bvARB,#function
+glVertexAttrib4bvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib4bvARB), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4bvARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4bvARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib4svARB
+.type glVertexAttrib4svARB,#function
+glVertexAttrib4svARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib4svNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4svNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4svNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib4ivARB
+.type glVertexAttrib4ivARB,#function
+glVertexAttrib4ivARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib4ivARB), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4ivARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4ivARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib4ubvARB
+.type glVertexAttrib4ubvARB,#function
+glVertexAttrib4ubvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib4ubvARB), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4ubvARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4ubvARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib4usvARB
+.type glVertexAttrib4usvARB,#function
+glVertexAttrib4usvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib4usvARB), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4usvARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4usvARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib4uivARB
+.type glVertexAttrib4uivARB,#function
+glVertexAttrib4uivARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib4uivARB), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4uivARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4uivARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib4fvARB
+.type glVertexAttrib4fvARB,#function
+glVertexAttrib4fvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib4fvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4fvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4fvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib4dvARB
+.type glVertexAttrib4dvARB,#function
+glVertexAttrib4dvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib4dvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4dvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4dvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib4NbvARB
+.type glVertexAttrib4NbvARB,#function
+glVertexAttrib4NbvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib4NbvARB), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4NbvARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4NbvARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib4NsvARB
+.type glVertexAttrib4NsvARB,#function
+glVertexAttrib4NsvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib4NsvARB), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4NsvARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4NsvARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib4NivARB
+.type glVertexAttrib4NivARB,#function
+glVertexAttrib4NivARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib4NivARB), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4NivARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4NivARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib4NubvARB
+.type glVertexAttrib4NubvARB,#function
+glVertexAttrib4NubvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib4ubvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4ubvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4ubvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib4NusvARB
+.type glVertexAttrib4NusvARB,#function
+glVertexAttrib4NusvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib4NusvARB), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4NusvARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4NusvARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib4NuivARB
+.type glVertexAttrib4NuivARB,#function
+glVertexAttrib4NuivARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib4NuivARB), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4NuivARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4NuivARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttribPointerARB
+.type glVertexAttribPointerARB,#function
+glVertexAttribPointerARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttribPointerARB), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttribPointerARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttribPointerARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glEnableVertexAttribArrayARB
+.type glEnableVertexAttribArrayARB,#function
+glEnableVertexAttribArrayARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_EnableVertexAttribArrayARB), %g2
+	or	%g2, %lo(8 * _gloffset_EnableVertexAttribArrayARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_EnableVertexAttribArrayARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glDisableVertexAttribArrayARB
+.type glDisableVertexAttribArrayARB,#function
+glDisableVertexAttribArrayARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_DisableVertexAttribArrayARB), %g2
+	or	%g2, %lo(8 * _gloffset_DisableVertexAttribArrayARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_DisableVertexAttribArrayARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glProgramStringARB
+.type glProgramStringARB,#function
+glProgramStringARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ProgramStringARB), %g2
+	or	%g2, %lo(8 * _gloffset_ProgramStringARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ProgramStringARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glBindProgramARB
+.type glBindProgramARB,#function
+glBindProgramARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_BindProgramNV), %g2
+	or	%g2, %lo(8 * _gloffset_BindProgramNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_BindProgramNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glDeleteProgramsARB
+.type glDeleteProgramsARB,#function
+glDeleteProgramsARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_DeleteProgramsNV), %g2
+	or	%g2, %lo(8 * _gloffset_DeleteProgramsNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_DeleteProgramsNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGenProgramsARB
+.type glGenProgramsARB,#function
+glGenProgramsARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GenProgramsNV), %g2
+	or	%g2, %lo(8 * _gloffset_GenProgramsNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GenProgramsNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glIsProgramARB
+.type glIsProgramARB,#function
+glIsProgramARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_IsProgramNV), %g2
+	or	%g2, %lo(8 * _gloffset_IsProgramNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_IsProgramNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glProgramEnvParameter4dARB
+.type glProgramEnvParameter4dARB,#function
+glProgramEnvParameter4dARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ProgramEnvParameter4dARB), %g2
+	or	%g2, %lo(8 * _gloffset_ProgramEnvParameter4dARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ProgramEnvParameter4dARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glProgramEnvParameter4dvARB
+.type glProgramEnvParameter4dvARB,#function
+glProgramEnvParameter4dvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ProgramEnvParameter4dvARB), %g2
+	or	%g2, %lo(8 * _gloffset_ProgramEnvParameter4dvARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ProgramEnvParameter4dvARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glProgramEnvParameter4fARB
+.type glProgramEnvParameter4fARB,#function
+glProgramEnvParameter4fARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ProgramEnvParameter4fARB), %g2
+	or	%g2, %lo(8 * _gloffset_ProgramEnvParameter4fARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ProgramEnvParameter4fARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glProgramEnvParameter4fvARB
+.type glProgramEnvParameter4fvARB,#function
+glProgramEnvParameter4fvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ProgramEnvParameter4fvARB), %g2
+	or	%g2, %lo(8 * _gloffset_ProgramEnvParameter4fvARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ProgramEnvParameter4fvARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glProgramLocalParameter4dARB
+.type glProgramLocalParameter4dARB,#function
+glProgramLocalParameter4dARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ProgramLocalParameter4dARB), %g2
+	or	%g2, %lo(8 * _gloffset_ProgramLocalParameter4dARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ProgramLocalParameter4dARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glProgramLocalParameter4dvARB
+.type glProgramLocalParameter4dvARB,#function
+glProgramLocalParameter4dvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ProgramLocalParameter4dvARB), %g2
+	or	%g2, %lo(8 * _gloffset_ProgramLocalParameter4dvARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ProgramLocalParameter4dvARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glProgramLocalParameter4fARB
+.type glProgramLocalParameter4fARB,#function
+glProgramLocalParameter4fARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ProgramLocalParameter4fARB), %g2
+	or	%g2, %lo(8 * _gloffset_ProgramLocalParameter4fARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ProgramLocalParameter4fARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glProgramLocalParameter4fvARB
+.type glProgramLocalParameter4fvARB,#function
+glProgramLocalParameter4fvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ProgramLocalParameter4fvARB), %g2
+	or	%g2, %lo(8 * _gloffset_ProgramLocalParameter4fvARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ProgramLocalParameter4fvARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetProgramEnvParameterdvARB
+.type glGetProgramEnvParameterdvARB,#function
+glGetProgramEnvParameterdvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetProgramEnvParameterdvARB), %g2
+	or	%g2, %lo(8 * _gloffset_GetProgramEnvParameterdvARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetProgramEnvParameterdvARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetProgramEnvParameterfvARB
+.type glGetProgramEnvParameterfvARB,#function
+glGetProgramEnvParameterfvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetProgramEnvParameterfvARB), %g2
+	or	%g2, %lo(8 * _gloffset_GetProgramEnvParameterfvARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetProgramEnvParameterfvARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetProgramLocalParameterdvARB
+.type glGetProgramLocalParameterdvARB,#function
+glGetProgramLocalParameterdvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetProgramLocalParameterdvARB), %g2
+	or	%g2, %lo(8 * _gloffset_GetProgramLocalParameterdvARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetProgramLocalParameterdvARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetProgramLocalParameterfvARB
+.type glGetProgramLocalParameterfvARB,#function
+glGetProgramLocalParameterfvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetProgramLocalParameterfvARB), %g2
+	or	%g2, %lo(8 * _gloffset_GetProgramLocalParameterfvARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetProgramLocalParameterfvARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetProgramivARB
+.type glGetProgramivARB,#function
+glGetProgramivARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetProgramivARB), %g2
+	or	%g2, %lo(8 * _gloffset_GetProgramivARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetProgramivARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetProgramStringARB
+.type glGetProgramStringARB,#function
+glGetProgramStringARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetProgramStringARB), %g2
+	or	%g2, %lo(8 * _gloffset_GetProgramStringARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetProgramStringARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetVertexAttribdvARB
+.type glGetVertexAttribdvARB,#function
+glGetVertexAttribdvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetVertexAttribdvNV), %g2
+	or	%g2, %lo(8 * _gloffset_GetVertexAttribdvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetVertexAttribdvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetVertexAttribfvARB
+.type glGetVertexAttribfvARB,#function
+glGetVertexAttribfvARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetVertexAttribfvNV), %g2
+	or	%g2, %lo(8 * _gloffset_GetVertexAttribfvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetVertexAttribfvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetVertexAttribivARB
+.type glGetVertexAttribivARB,#function
+glGetVertexAttribivARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetVertexAttribivNV), %g2
+	or	%g2, %lo(8 * _gloffset_GetVertexAttribivNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetVertexAttribivNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetVertexAttribPointervARB
+.type glGetVertexAttribPointervARB,#function
+glGetVertexAttribPointervARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetVertexAttribPointervNV), %g2
+	or	%g2, %lo(8 * _gloffset_GetVertexAttribPointervNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetVertexAttribPointervNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glProgramNamedParameter4fNV
+.type glProgramNamedParameter4fNV,#function
+glProgramNamedParameter4fNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ProgramNamedParameter4fNV), %g2
+	or	%g2, %lo(8 * _gloffset_ProgramNamedParameter4fNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ProgramNamedParameter4fNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glProgramNamedParameter4dNV
+.type glProgramNamedParameter4dNV,#function
+glProgramNamedParameter4dNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ProgramNamedParameter4dNV), %g2
+	or	%g2, %lo(8 * _gloffset_ProgramNamedParameter4dNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ProgramNamedParameter4dNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glProgramNamedParameter4fvNV
+.type glProgramNamedParameter4fvNV,#function
+glProgramNamedParameter4fvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ProgramNamedParameter4fvNV), %g2
+	or	%g2, %lo(8 * _gloffset_ProgramNamedParameter4fvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ProgramNamedParameter4fvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glProgramNamedParameter4dvNV
+.type glProgramNamedParameter4dvNV,#function
+glProgramNamedParameter4dvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_ProgramNamedParameter4dvNV), %g2
+	or	%g2, %lo(8 * _gloffset_ProgramNamedParameter4dvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_ProgramNamedParameter4dvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetProgramNamedParameterfvNV
+.type glGetProgramNamedParameterfvNV,#function
+glGetProgramNamedParameterfvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetProgramNamedParameterfvNV), %g2
+	or	%g2, %lo(8 * _gloffset_GetProgramNamedParameterfvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetProgramNamedParameterfvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetProgramNamedParameterdvNV
+.type glGetProgramNamedParameterdvNV,#function
+glGetProgramNamedParameterdvNV:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetProgramNamedParameterdvNV), %g2
+	or	%g2, %lo(8 * _gloffset_GetProgramNamedParameterdvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetProgramNamedParameterdvNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glBindBufferARB
+.type glBindBufferARB,#function
+glBindBufferARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_BindBufferARB), %g2
+	or	%g2, %lo(8 * _gloffset_BindBufferARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_BindBufferARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glBufferDataARB
+.type glBufferDataARB,#function
+glBufferDataARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_BufferDataARB), %g2
+	or	%g2, %lo(8 * _gloffset_BufferDataARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_BufferDataARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glBufferSubDataARB
+.type glBufferSubDataARB,#function
+glBufferSubDataARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_BufferSubDataARB), %g2
+	or	%g2, %lo(8 * _gloffset_BufferSubDataARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_BufferSubDataARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glDeleteBuffersARB
+.type glDeleteBuffersARB,#function
+glDeleteBuffersARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_DeleteBuffersARB), %g2
+	or	%g2, %lo(8 * _gloffset_DeleteBuffersARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_DeleteBuffersARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGenBuffersARB
+.type glGenBuffersARB,#function
+glGenBuffersARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GenBuffersARB), %g2
+	or	%g2, %lo(8 * _gloffset_GenBuffersARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GenBuffersARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetBufferParameterivARB
+.type glGetBufferParameterivARB,#function
+glGetBufferParameterivARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetBufferParameterivARB), %g2
+	or	%g2, %lo(8 * _gloffset_GetBufferParameterivARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetBufferParameterivARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetBufferPointervARB
+.type glGetBufferPointervARB,#function
+glGetBufferPointervARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetBufferPointervARB), %g2
+	or	%g2, %lo(8 * _gloffset_GetBufferPointervARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetBufferPointervARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetBufferSubDataARB
+.type glGetBufferSubDataARB,#function
+glGetBufferSubDataARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetBufferSubDataARB), %g2
+	or	%g2, %lo(8 * _gloffset_GetBufferSubDataARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetBufferSubDataARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glIsBufferARB
+.type glIsBufferARB,#function
+glIsBufferARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_IsBufferARB), %g2
+	or	%g2, %lo(8 * _gloffset_IsBufferARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_IsBufferARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMapBufferARB
+.type glMapBufferARB,#function
+glMapBufferARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MapBufferARB), %g2
+	or	%g2, %lo(8 * _gloffset_MapBufferARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MapBufferARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glUnmapBufferARB
+.type glUnmapBufferARB,#function
+glUnmapBufferARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_UnmapBufferARB), %g2
+	or	%g2, %lo(8 * _gloffset_UnmapBufferARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_UnmapBufferARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glDepthBoundsEXT
+.type glDepthBoundsEXT,#function
+glDepthBoundsEXT:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_DepthBoundsEXT), %g2
+	or	%g2, %lo(8 * _gloffset_DepthBoundsEXT), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_DepthBoundsEXT)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGenQueriesARB
+.type glGenQueriesARB,#function
+glGenQueriesARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GenQueriesARB), %g2
+	or	%g2, %lo(8 * _gloffset_GenQueriesARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GenQueriesARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glDeleteQueriesARB
+.type glDeleteQueriesARB,#function
+glDeleteQueriesARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_DeleteQueriesARB), %g2
+	or	%g2, %lo(8 * _gloffset_DeleteQueriesARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_DeleteQueriesARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glIsQueryARB
+.type glIsQueryARB,#function
+glIsQueryARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_IsQueryARB), %g2
+	or	%g2, %lo(8 * _gloffset_IsQueryARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_IsQueryARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glBeginQueryARB
+.type glBeginQueryARB,#function
+glBeginQueryARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_BeginQueryARB), %g2
+	or	%g2, %lo(8 * _gloffset_BeginQueryARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_BeginQueryARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glEndQueryARB
+.type glEndQueryARB,#function
+glEndQueryARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_EndQueryARB), %g2
+	or	%g2, %lo(8 * _gloffset_EndQueryARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_EndQueryARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetQueryivARB
+.type glGetQueryivARB,#function
+glGetQueryivARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetQueryivARB), %g2
+	or	%g2, %lo(8 * _gloffset_GetQueryivARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetQueryivARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetQueryObjectivARB
+.type glGetQueryObjectivARB,#function
+glGetQueryObjectivARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetQueryObjectivARB), %g2
+	or	%g2, %lo(8 * _gloffset_GetQueryObjectivARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetQueryObjectivARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetQueryObjectuivARB
+.type glGetQueryObjectuivARB,#function
+glGetQueryObjectuivARB:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetQueryObjectuivARB), %g2
+	or	%g2, %lo(8 * _gloffset_GetQueryObjectuivARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetQueryObjectuivARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glBindBuffer
+.type glBindBuffer,#function
+glBindBuffer:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_BindBufferARB), %g2
+	or	%g2, %lo(8 * _gloffset_BindBufferARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_BindBufferARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glBufferData
+.type glBufferData,#function
+glBufferData:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_BufferDataARB), %g2
+	or	%g2, %lo(8 * _gloffset_BufferDataARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_BufferDataARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glBufferSubData
+.type glBufferSubData,#function
+glBufferSubData:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_BufferSubDataARB), %g2
+	or	%g2, %lo(8 * _gloffset_BufferSubDataARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_BufferSubDataARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glDeleteBuffers
+.type glDeleteBuffers,#function
+glDeleteBuffers:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_DeleteBuffersARB), %g2
+	or	%g2, %lo(8 * _gloffset_DeleteBuffersARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_DeleteBuffersARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGenBuffers
+.type glGenBuffers,#function
+glGenBuffers:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GenBuffersARB), %g2
+	or	%g2, %lo(8 * _gloffset_GenBuffersARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GenBuffersARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetBufferParameteriv
+.type glGetBufferParameteriv,#function
+glGetBufferParameteriv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetBufferParameterivARB), %g2
+	or	%g2, %lo(8 * _gloffset_GetBufferParameterivARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetBufferParameterivARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetBufferPointerv
+.type glGetBufferPointerv,#function
+glGetBufferPointerv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetBufferPointervARB), %g2
+	or	%g2, %lo(8 * _gloffset_GetBufferPointervARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetBufferPointervARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetBufferSubData
+.type glGetBufferSubData,#function
+glGetBufferSubData:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetBufferSubDataARB), %g2
+	or	%g2, %lo(8 * _gloffset_GetBufferSubDataARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetBufferSubDataARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glIsBuffer
+.type glIsBuffer,#function
+glIsBuffer:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_IsBufferARB), %g2
+	or	%g2, %lo(8 * _gloffset_IsBufferARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_IsBufferARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glMapBuffer
+.type glMapBuffer,#function
+glMapBuffer:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_MapBufferARB), %g2
+	or	%g2, %lo(8 * _gloffset_MapBufferARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_MapBufferARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glUnmapBuffer
+.type glUnmapBuffer,#function
+glUnmapBuffer:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_UnmapBufferARB), %g2
+	or	%g2, %lo(8 * _gloffset_UnmapBufferARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_UnmapBufferARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGenQueries
+.type glGenQueries,#function
+glGenQueries:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GenQueriesARB), %g2
+	or	%g2, %lo(8 * _gloffset_GenQueriesARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GenQueriesARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glDeleteQueries
+.type glDeleteQueries,#function
+glDeleteQueries:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_DeleteQueriesARB), %g2
+	or	%g2, %lo(8 * _gloffset_DeleteQueriesARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_DeleteQueriesARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glIsQuery
+.type glIsQuery,#function
+glIsQuery:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_IsQueryARB), %g2
+	or	%g2, %lo(8 * _gloffset_IsQueryARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_IsQueryARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glBeginQuery
+.type glBeginQuery,#function
+glBeginQuery:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_BeginQueryARB), %g2
+	or	%g2, %lo(8 * _gloffset_BeginQueryARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_BeginQueryARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glEndQuery
+.type glEndQuery,#function
+glEndQuery:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_EndQueryARB), %g2
+	or	%g2, %lo(8 * _gloffset_EndQueryARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_EndQueryARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetQueryiv
+.type glGetQueryiv,#function
+glGetQueryiv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetQueryivARB), %g2
+	or	%g2, %lo(8 * _gloffset_GetQueryivARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetQueryivARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetQueryObjectiv
+.type glGetQueryObjectiv,#function
+glGetQueryObjectiv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetQueryObjectivARB), %g2
+	or	%g2, %lo(8 * _gloffset_GetQueryObjectivARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetQueryObjectivARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetQueryObjectuiv
+.type glGetQueryObjectuiv,#function
+glGetQueryObjectuiv:
+#if defined(__sparc_v9__) && !defined(__linux__)
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetQueryObjectuivARB), %g2
+	or	%g2, %lo(8 * _gloffset_GetQueryObjectuivARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetQueryObjectuivARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+	 nop
+
+.globl _mesa_sparc_glapi_end
+.type _mesa_sparc_glapi_end,#function
+_mesa_sparc_glapi_end:
+
diff --git a/reactos/lib/mesa32/src/sparc/norm.S b/reactos/lib/mesa32/src/sparc/norm.S
new file mode 100644
index 00000000000..72ff7a63a10
--- /dev/null
+++ b/reactos/lib/mesa32/src/sparc/norm.S
@@ -0,0 +1,603 @@
+/* $Id: norm.S,v 1.1 2004/07/16 22:12:38 blight Exp $ */
+
+#include "sparc_matrix.h"
+
+	.text
+
+#if defined(__sparc_v9__) && !defined(__linux__)
+#define STACK_VAR_OFF	(2047 + (8 * 16))
+#else
+#define STACK_VAR_OFF	(4 * 16)
+#endif
+
+	/* Newton-Raphson approximation turns out to be slower
+	 * (and less accurate) than direct fsqrts/fdivs.
+	 */
+#define ONE_DOT_ZERO	0x3f800000
+
+	.globl	_mesa_sparc_transform_normalize_normals
+_mesa_sparc_transform_normalize_normals:
+	/* o0=mat o1=scale o2=in o3=lengths o4=dest */
+
+	sethi	%hi(ONE_DOT_ZERO), %g2
+	sub	%sp, 16, %sp
+	st	%g2, [%sp + STACK_VAR_OFF+0x0]
+	st	%o1, [%sp + STACK_VAR_OFF+0x4]
+	ld	[%sp + STACK_VAR_OFF+0x0], %f12	! f12 = 1.0f
+	ld	[%sp + STACK_VAR_OFF+0x4], %f15	! f15 = scale
+	add	%sp, 16, %sp
+
+	LDPTR	[%o0 + MAT_INV], %o0		! o0 = mat->inv
+	LDPTR	[%o2 + V4F_START], %o5		! o5 = 'from' in->start
+	ld	[%o2 + V4F_COUNT], %g1		! g1 = in->count
+	ld	[%o2 + V4F_STRIDE], %g2		! g2 = in->stride
+	LDPTR	[%o4 + V4F_START], %g3		! g3 = 'out' dest->start
+
+	LDMATRIX_0_1_2_4_5_6_8_9_10(%o0)
+
+	/* dest->count = in->count */
+	st	%g1, [%o4 + V4F_COUNT]
+
+	cmp	%g1, 1
+	bl	7f
+	 cmp	%o3, 0
+	bne	4f
+	 clr	%o4				! 'i' for STRIDE_LOOP
+
+1:	/* LENGTHS == NULL */
+	ld	[%o5 + 0x00], %f0		! ux = from[0]
+	ld	[%o5 + 0x04], %f1		! uy = from[1]
+	ld	[%o5 + 0x08], %f2		! uz = from[2]
+	add	%o5, %g2, %o5			! STRIDE_F(from, stride)
+	add	%o4, 1, %o4			! i++
+
+	/* tx (f3) = (ux * m0) + (uy * m1) + (uz * m2)
+	 * ty (f5) = (ux * m4) + (uy * m5) + (uz * m6)
+	 * tz (f7) = (ux * m8) + (uy * m9) + (uz * m10)
+	 */
+	fmuls	%f0, M0, %f3			! FGM	Group
+	fmuls	%f1, M1, %f4			! FGM	Group
+	fmuls	%f0, M4, %f5			! FGM	Group
+	fmuls	%f1, M5, %f6			! FGM	Group
+	fmuls	%f0, M8, %f7			! FGM	Group	f3 available
+	fmuls	%f1, M9, %f8			! FGM	Group	f4 available
+	fadds	%f3, %f4, %f3			! FGA
+	fmuls	%f2, M2, %f10			! FGM	Group	f5 available
+	fmuls	%f2, M6, %f0			! FGM	Group	f6 available
+	fadds	%f5, %f6, %f5			! FGA
+	fmuls	%f2, M10, %f4			! FGM	Group	f7 available
+	fadds	%f7, %f8, %f7			! FGA	Group	f8,f3 available
+	fadds	%f3, %f10, %f3			! FGA	Group	f10 available
+	fadds	%f5, %f0, %f5			! FGA	Group	stall f0,f5 available
+	fadds	%f7, %f4, %f7			! FGA	Group	stall f4,f7 available
+
+	/* f3=tx, f5=ty, f7=tz */
+
+	/* len (f6) = (tx * tx) + (ty * ty) + (tz * tz) */
+	fmuls	%f3, %f3, %f6			! FGM	Group	f3 available
+	fmuls	%f5, %f5, %f8			! FGM	Group	f5 available
+	fmuls	%f7, %f7, %f10			! FGM	Group	f7 available
+	fadds	%f6, %f8, %f6			! FGA	Group	2cyc stall f6,f8 available
+	fadds	%f6, %f10, %f6			! FGA	Group	4cyc stall f6,f10 available
+
+	/* scale (f6) = 1.0 / sqrt(len) */
+	fsqrts	%f6, %f6			! FDIV  20 cycles
+	fdivs	%f12, %f6, %f6			! FDIV	14 cycles
+
+	fmuls	%f3, %f6, %f3
+	st	%f3, [%g3 + 0x00]		! out[i][0] = tx * scale
+	fmuls	%f5, %f6, %f5
+	st	%f5, [%g3 + 0x04]		! out[i][1] = ty * scale
+	fmuls	%f7, %f6, %f7
+	st	%f7, [%g3 + 0x08]		! out[i][2] = tz * scale
+
+	cmp	%o4, %g1			! continue if (i < count)
+	bl	1b
+	 add	%g3, 0x0c, %g3			! advance out vector pointer
+
+	ba	7f
+	 nop
+
+4:	/* LENGTHS != NULL */
+	fmuls	M0, %f15, M0
+	fmuls	M1, %f15, M1
+	fmuls	M2, %f15, M2
+	fmuls	M4, %f15, M4
+	fmuls	M5, %f15, M5
+	fmuls	M6, %f15, M6
+	fmuls	M8, %f15, M8
+	fmuls	M9, %f15, M9
+	fmuls	M10, %f15, M10
+
+5:
+	ld	[%o5 + 0x00], %f0		! ux = from[0]
+	ld	[%o5 + 0x04], %f1		! uy = from[1]
+	ld	[%o5 + 0x08], %f2		! uz = from[2]
+	add	%o5, %g2, %o5			! STRIDE_F(from, stride)
+	add	%o4, 1, %o4			! i++
+
+	/* tx (f3) = (ux * m0) + (uy * m1) + (uz * m2)
+	 * ty (f5) = (ux * m4) + (uy * m5) + (uz * m6)
+	 * tz (f7) = (ux * m8) + (uy * m9) + (uz * m10)
+	 */
+	fmuls	%f0, M0, %f3			! FGM	Group
+	fmuls	%f1, M1, %f4			! FGM	Group
+	fmuls	%f0, M4, %f5			! FGM	Group
+	fmuls	%f1, M5, %f6			! FGM	Group
+	fmuls	%f0, M8, %f7			! FGM	Group	f3 available
+	fmuls	%f1, M9, %f8			! FGM	Group	f4 available
+	fadds	%f3, %f4, %f3			! FGA
+	fmuls	%f2, M2, %f10			! FGM	Group	f5 available
+	fmuls	%f2, M6, %f0			! FGM	Group	f6 available
+	fadds	%f5, %f6, %f5			! FGA
+	fmuls	%f2, M10, %f4			! FGM	Group	f7 available
+	fadds	%f7, %f8, %f7			! FGA	Group	f8,f3 available
+	fadds	%f3, %f10, %f3			! FGA	Group	f10 available
+	ld	[%o3], %f13			! LSU
+	fadds	%f5, %f0, %f5			! FGA	Group	stall f0,f5 available
+	add	%o3, 4, %o3			! IEU0
+	fadds	%f7, %f4, %f7			! FGA	Group	stall f4,f7 available
+
+	/* f3=tx, f5=ty, f7=tz, f13=lengths[i] */
+
+	fmuls	%f3, %f13, %f3
+	st	%f3, [%g3 + 0x00]		! out[i][0] = tx * len
+	fmuls	%f5, %f13, %f5
+	st	%f5, [%g3 + 0x04]		! out[i][1] = ty * len
+	fmuls	%f7, %f13, %f7
+	st	%f7, [%g3 + 0x08]		! out[i][2] = tz * len
+
+	cmp	%o4, %g1			! continue if (i < count)
+	bl	5b
+	 add	%g3, 0x0c, %g3			! advance out vector pointer
+
+7:	retl
+	 nop
+	
+	.globl	_mesa_sparc_transform_normalize_normals_no_rot
+_mesa_sparc_transform_normalize_normals_no_rot:
+	/* o0=mat o1=scale o2=in o3=lengths o4=dest */
+
+	sethi	%hi(ONE_DOT_ZERO), %g2
+	sub	%sp, 16, %sp
+	st	%g2, [%sp + STACK_VAR_OFF+0x0]
+	st	%o1, [%sp + STACK_VAR_OFF+0x4]
+	ld	[%sp + STACK_VAR_OFF+0x0], %f12	! f12 = 1.0f
+	ld	[%sp + STACK_VAR_OFF+0x4], %f15	! f15 = scale
+	add	%sp, 16, %sp
+
+	LDPTR	[%o0 + MAT_INV], %o0		! o0 = mat->inv
+	LDPTR	[%o2 + V4F_START], %o5		! o5 = 'from' in->start
+	ld	[%o2 + V4F_COUNT], %g1		! g1 = in->count
+	ld	[%o2 + V4F_STRIDE], %g2		! g2 = in->stride
+	LDPTR	[%o4 + V4F_START], %g3		! g3 = 'out' dest->start
+
+	LDMATRIX_0_5_10(%o0)
+
+	/* dest->count = in->count */
+	st	%g1, [%o4 + V4F_COUNT]
+
+	cmp	%g1, 1
+	bl	7f
+	 cmp	%o3, 0
+	bne	4f
+	 clr	%o4				! 'i' for STRIDE_LOOP
+
+1:	/* LENGTHS == NULL */
+	ld	[%o5 + 0x00], %f0		! ux = from[0]
+	ld	[%o5 + 0x04], %f1		! uy = from[1]
+	ld	[%o5 + 0x08], %f2		! uz = from[2]
+	add	%o5, %g2, %o5			! STRIDE_F(from, stride)
+	add	%o4, 1, %o4			! i++
+
+	/* tx (f3) = (ux * m0)
+	 * ty (f5) = (uy * m5)
+	 * tz (f7) = (uz * m10)
+	 */
+	fmuls	%f0, M0, %f3			! FGM	Group
+	fmuls	%f1, M5, %f5			! FGM	Group
+	fmuls	%f2, M10, %f7			! FGM	Group
+
+	/* f3=tx, f5=ty, f7=tz */
+
+	/* len (f6) = (tx * tx) + (ty * ty) + (tz * tz) */
+	fmuls	%f3, %f3, %f6			! FGM	Group	stall, f3 available
+	fmuls	%f5, %f5, %f8			! FGM	Group	f5 available
+	fmuls	%f7, %f7, %f10			! FGM	Group	f7 available
+	fadds	%f6, %f8, %f6			! FGA	Group	2cyc stall f6,f8 available
+	fadds	%f6, %f10, %f6			! FGA	Group	4cyc stall f6,f10 available
+
+	/* scale (f6) = 1.0 / sqrt(len) */
+	fsqrts	%f6, %f6			! FDIV  20 cycles
+	fdivs	%f12, %f6, %f6			! FDIV	14 cycles
+
+	fmuls	%f3, %f6, %f3
+	st	%f3, [%g3 + 0x00]		! out[i][0] = tx * scale
+	fmuls	%f5, %f6, %f5
+	st	%f5, [%g3 + 0x04]		! out[i][1] = ty * scale
+	fmuls	%f7, %f6, %f7
+	st	%f7, [%g3 + 0x08]		! out[i][2] = tz * scale
+
+	cmp	%o4, %g1			! continue if (i < count)
+	bl	1b
+	 add	%g3, 0x0c, %g3			! advance out vector pointer
+
+	ba	7f
+	 nop
+
+4:	/* LENGTHS != NULL */
+	fmuls	M0, %f15, M0
+	fmuls	M5, %f15, M5
+	fmuls	M10, %f15, M10
+
+5:
+	ld	[%o5 + 0x00], %f0		! ux = from[0]
+	ld	[%o5 + 0x04], %f1		! uy = from[1]
+	ld	[%o5 + 0x08], %f2		! uz = from[2]
+	add	%o5, %g2, %o5			! STRIDE_F(from, stride)
+	add	%o4, 1, %o4			! i++
+
+	/* tx (f3) = (ux * m0)
+	 * ty (f5) = (uy * m5)
+	 * tz (f7) = (uz * m10)
+	 */
+	fmuls	%f0, M0, %f3			! FGM	Group
+	ld	[%o3], %f13			! LSU
+	fmuls	%f1, M5, %f5			! FGM	Group
+	add	%o3, 4, %o3			! IEU0
+	fmuls	%f2, M10, %f7			! FGM	Group
+
+	/* f3=tx, f5=ty, f7=tz, f13=lengths[i] */
+
+	fmuls	%f3, %f13, %f3
+	st	%f3, [%g3 + 0x00]		! out[i][0] = tx * len
+	fmuls	%f5, %f13, %f5
+	st	%f5, [%g3 + 0x04]		! out[i][1] = ty * len
+	fmuls	%f7, %f13, %f7
+	st	%f7, [%g3 + 0x08]		! out[i][2] = tz * len
+
+	cmp	%o4, %g1			! continue if (i < count)
+	bl	5b
+	 add	%g3, 0x0c, %g3			! advance out vector pointer
+
+7:	retl
+	 nop
+
+	.globl	_mesa_sparc_transform_rescale_normals_no_rot
+_mesa_sparc_transform_rescale_normals_no_rot:
+	/* o0=mat o1=scale o2=in o3=lengths o4=dest */
+	sub	%sp, 16, %sp
+	st	%o1, [%sp + STACK_VAR_OFF+0x0]
+	ld	[%sp + STACK_VAR_OFF+0x0], %f15	! f15 = scale
+	add	%sp, 16, %sp
+
+	LDPTR	[%o0 + MAT_INV], %o0		! o0 = mat->inv
+	LDPTR	[%o2 + V4F_START], %o5		! o5 = 'from' in->start
+	ld	[%o2 + V4F_COUNT], %g1		! g1 = in->count
+	ld	[%o2 + V4F_STRIDE], %g2		! g2 = in->stride
+	LDPTR	[%o4 + V4F_START], %g3		! g3 = 'out' dest->start
+
+	LDMATRIX_0_5_10(%o0)
+
+	/* dest->count = in->count */
+	st	%g1, [%o4 + V4F_COUNT]
+
+	cmp	%g1, 1
+	bl	7f
+	 clr	%o4				! 'i' for STRIDE_LOOP
+
+	fmuls	M0, %f15, M0
+	fmuls	M5, %f15, M5
+	fmuls	M10, %f15, M10
+
+1:	ld	[%o5 + 0x00], %f0		! ux = from[0]
+	ld	[%o5 + 0x04], %f1		! uy = from[1]
+	ld	[%o5 + 0x08], %f2		! uz = from[2]
+	add	%o5, %g2, %o5			! STRIDE_F(from, stride)
+	add	%o4, 1, %o4			! i++
+
+	/* tx (f3) = (ux * m0)
+	 * ty (f5) = (uy * m5)
+	 * tz (f7) = (uz * m10)
+	 */
+	fmuls	%f0, M0, %f3			! FGM	Group
+	st	%f3, [%g3 + 0x00]		! LSU
+	fmuls	%f1, M5, %f5			! FGM	Group
+	st	%f5, [%g3 + 0x04]		! LSU
+	fmuls	%f2, M10, %f7			! FGM	Group
+	st	%f7, [%g3 + 0x08]		! LSU
+
+	cmp	%o4, %g1			! continue if (i < count)
+	bl	1b
+	 add	%g3, 0x0c, %g3			! advance out vector pointer
+
+7:	retl
+	 nop
+
+	.globl	_mesa_sparc_transform_rescale_normals
+_mesa_sparc_transform_rescale_normals:
+	/* o0=mat o1=scale o2=in o3=lengths o4=dest */
+	sub	%sp, 16, %sp
+	st	%o1, [%sp + STACK_VAR_OFF+0x0]
+	ld	[%sp + STACK_VAR_OFF+0x0], %f15	! f15 = scale
+	add	%sp, 16, %sp
+
+	LDPTR	[%o0 + MAT_INV], %o0		! o0 = mat->inv
+	LDPTR	[%o2 + V4F_START], %o5		! o5 = 'from' in->start
+	ld	[%o2 + V4F_COUNT], %g1		! g1 = in->count
+	ld	[%o2 + V4F_STRIDE], %g2		! g2 = in->stride
+	LDPTR	[%o4 + V4F_START], %g3		! g3 = 'out' dest->start
+
+	LDMATRIX_0_1_2_4_5_6_8_9_10(%o0)
+
+	/* dest->count = in->count */
+	st	%g1, [%o4 + V4F_COUNT]
+
+	cmp	%g1, 1
+	bl	7f
+	 clr	%o4				! 'i' for STRIDE_LOOP
+
+	fmuls	M0, %f15, M0
+	fmuls	M1, %f15, M1
+	fmuls	M2, %f15, M2
+	fmuls	M4, %f15, M4
+	fmuls	M5, %f15, M5
+	fmuls	M6, %f15, M6
+	fmuls	M8, %f15, M8
+	fmuls	M9, %f15, M9
+	fmuls	M10, %f15, M10
+
+1:	ld	[%o5 + 0x00], %f0		! ux = from[0]
+	ld	[%o5 + 0x04], %f1		! uy = from[1]
+	ld	[%o5 + 0x08], %f2		! uz = from[2]
+	add	%o5, %g2, %o5			! STRIDE_F(from, stride)
+	add	%o4, 1, %o4			! i++
+
+	fmuls	%f0, M0, %f3			! FGM	Group
+	fmuls	%f1, M1, %f4			! FGM	Group
+	fmuls	%f0, M4, %f5			! FGM	Group
+	fmuls	%f1, M5, %f6			! FGM	Group
+	fmuls	%f0, M8, %f7			! FGM	Group	f3 available
+	fmuls	%f1, M9, %f8			! FGM	Group	f4 available
+	fadds	%f3, %f4, %f3			! FGA
+	fmuls	%f2, M2, %f10			! FGM	Group	f5 available
+	fmuls	%f2, M6, %f0			! FGM	Group	f6 available
+	fadds	%f5, %f6, %f5			! FGA
+	fmuls	%f2, M10, %f4			! FGM	Group	f7 available
+	fadds	%f7, %f8, %f7			! FGA	Group	f8,f3 available
+	fadds	%f3, %f10, %f3			! FGA	Group	f10 available
+	st	%f3, [%g3 + 0x00]		! LSU
+	fadds	%f5, %f0, %f5			! FGA	Group	stall f0,f5 available
+	st	%f5, [%g3 + 0x04]		! LSU
+	fadds	%f7, %f4, %f7			! FGA	Group	stall f4,f7 available
+	st	%f7, [%g3 + 0x08]		! LSU
+
+	cmp	%o4, %g1			! continue if (i < count)
+	bl	1b
+	 add	%g3, 0x0c, %g3			! advance out vector pointer
+
+7:	retl
+	 nop
+
+	.globl	_mesa_sparc_transform_normals_no_rot
+_mesa_sparc_transform_normals_no_rot:
+	/* o0=mat o1=scale o2=in o3=lengths o4=dest */
+	LDPTR	[%o0 + MAT_INV], %o0		! o0 = mat->inv
+	LDPTR	[%o2 + V4F_START], %o5		! o5 = 'from' in->start
+	ld	[%o2 + V4F_COUNT], %g1		! g1 = in->count
+	ld	[%o2 + V4F_STRIDE], %g2		! g2 = in->stride
+	LDPTR	[%o4 + V4F_START], %g3		! g3 = 'out' dest->start
+
+	LDMATRIX_0_5_10(%o0)
+
+	/* dest->count = in->count */
+	st	%g1, [%o4 + V4F_COUNT]
+
+	cmp	%g1, 1
+	bl	7f
+	 clr	%o4				! 'i' for STRIDE_LOOP
+
+1:	ld	[%o5 + 0x00], %f0		! ux = from[0]
+	ld	[%o5 + 0x04], %f1		! uy = from[1]
+	ld	[%o5 + 0x08], %f2		! uz = from[2]
+	add	%o5, %g2, %o5			! STRIDE_F(from, stride)
+	add	%o4, 1, %o4			! i++
+
+	/* tx (f3) = (ux * m0)
+	 * ty (f5) = (uy * m5)
+	 * tz (f7) = (uz * m10)
+	 */
+	fmuls	%f0, M0, %f3			! FGM	Group
+	st	%f3, [%g3 + 0x00]		! LSU
+	fmuls	%f1, M5, %f5			! FGM	Group
+	st	%f5, [%g3 + 0x04]		! LSU
+	fmuls	%f2, M10, %f7			! FGM	Group
+	st	%f7, [%g3 + 0x08]		! LSU
+
+	cmp	%o4, %g1			! continue if (i < count)
+	bl	1b
+	 add	%g3, 0x0c, %g3			! advance out vector pointer
+
+7:	retl
+	 nop
+
+	.globl	_mesa_sparc_transform_normals
+_mesa_sparc_transform_normals:
+	/* o0=mat o1=scale o2=in o3=lengths o4=dest */
+	LDPTR	[%o0 + MAT_INV], %o0		! o0 = mat->inv
+	LDPTR	[%o2 + V4F_START], %o5		! o5 = 'from' in->start
+	ld	[%o2 + V4F_COUNT], %g1		! g1 = in->count
+	ld	[%o2 + V4F_STRIDE], %g2		! g2 = in->stride
+	LDPTR	[%o4 + V4F_START], %g3		! g3 = 'out' dest->start
+
+	LDMATRIX_0_1_2_4_5_6_8_9_10(%o0)
+
+	/* dest->count = in->count */
+	st	%g1, [%o4 + V4F_COUNT]
+
+	cmp	%g1, 1
+	bl	7f
+	 clr	%o4				! 'i' for STRIDE_LOOP
+
+1:	ld	[%o5 + 0x00], %f0		! ux = from[0]
+	ld	[%o5 + 0x04], %f1		! uy = from[1]
+	ld	[%o5 + 0x08], %f2		! uz = from[2]
+	add	%o5, %g2, %o5			! STRIDE_F(from, stride)
+	add	%o4, 1, %o4			! i++
+
+	fmuls	%f0, M0, %f3			! FGM	Group
+	fmuls	%f1, M1, %f4			! FGM	Group
+	fmuls	%f0, M4, %f5			! FGM	Group
+	fmuls	%f1, M5, %f6			! FGM	Group
+	fmuls	%f0, M8, %f7			! FGM	Group	f3 available
+	fmuls	%f1, M9, %f8			! FGM	Group	f4 available
+	fadds	%f3, %f4, %f3			! FGA
+	fmuls	%f2, M2, %f10			! FGM	Group	f5 available
+	fmuls	%f2, M6, %f0			! FGM	Group	f6 available
+	fadds	%f5, %f6, %f5			! FGA
+	fmuls	%f2, M10, %f4			! FGM	Group	f7 available
+	fadds	%f7, %f8, %f7			! FGA	Group	f8,f3 available
+	fadds	%f3, %f10, %f3			! FGA	Group	f10 available
+	st	%f3, [%g3 + 0x00]		! LSU
+	fadds	%f5, %f0, %f5			! FGA	Group	stall f0,f5 available
+	st	%f5, [%g3 + 0x04]		! LSU
+	fadds	%f7, %f4, %f7			! FGA	Group	stall f4,f7 available
+	st	%f7, [%g3 + 0x08]		! LSU
+
+	cmp	%o4, %g1			! continue if (i < count)
+	bl	1b
+	 add	%g3, 0x0c, %g3			! advance out vector pointer
+
+7:	retl
+	 nop
+
+	.globl	_mesa_sparc_normalize_normals
+_mesa_sparc_normalize_normals:
+	/* o0=mat o1=scale o2=in o3=lengths o4=dest */
+
+	sethi	%hi(ONE_DOT_ZERO), %g2
+	sub	%sp, 16, %sp
+	st	%g2, [%sp + STACK_VAR_OFF+0x0]
+	ld	[%sp + STACK_VAR_OFF+0x0], %f12	! f12 = 1.0f
+	add	%sp, 16, %sp
+
+	LDPTR	[%o2 + V4F_START], %o5		! o5 = 'from' in->start
+	ld	[%o2 + V4F_COUNT], %g1		! g1 = in->count
+	ld	[%o2 + V4F_STRIDE], %g2		! g2 = in->stride
+	LDPTR	[%o4 + V4F_START], %g3		! g3 = 'out' dest->start
+
+	/* dest->count = in->count */
+	st	%g1, [%o4 + V4F_COUNT]
+
+	cmp	%g1, 1
+	bl	7f
+	 cmp	%o3, 0
+	bne	4f
+	 clr	%o4				! 'i' for STRIDE_LOOP
+
+1:	/* LENGTHS == NULL */
+	ld	[%o5 + 0x00], %f3		! ux = from[0]
+	ld	[%o5 + 0x04], %f5		! uy = from[1]
+	ld	[%o5 + 0x08], %f7		! uz = from[2]
+	add	%o5, %g2, %o5			! STRIDE_F(from, stride)
+	add	%o4, 1, %o4			! i++
+
+	/* f3=tx, f5=ty, f7=tz */
+
+	/* len (f6) = (tx * tx) + (ty * ty) + (tz * tz) */
+	fmuls	%f3, %f3, %f6			! FGM	Group	f3 available
+	fmuls	%f5, %f5, %f8			! FGM	Group	f5 available
+	fmuls	%f7, %f7, %f10			! FGM	Group	f7 available
+	fadds	%f6, %f8, %f6			! FGA	Group	2cyc stall f6,f8 available
+	fadds	%f6, %f10, %f6			! FGA	Group	4cyc stall f6,f10 available
+
+	/* scale (f6) = 1.0 / sqrt(len) */
+	fsqrts	%f6, %f6			! FDIV  20 cycles
+	fdivs	%f12, %f6, %f6			! FDIV	14 cycles
+
+	fmuls	%f3, %f6, %f3
+	st	%f3, [%g3 + 0x00]		! out[i][0] = tx * scale
+	fmuls	%f5, %f6, %f5
+	st	%f5, [%g3 + 0x04]		! out[i][1] = ty * scale
+	fmuls	%f7, %f6, %f7
+	st	%f7, [%g3 + 0x08]		! out[i][2] = tz * scale
+
+	cmp	%o4, %g1			! continue if (i < count)
+	bl	1b
+	 add	%g3, 0x0c, %g3			! advance out vector pointer
+
+	ba	7f
+	 nop
+
+4:	/* LENGTHS != NULL */
+
+5:
+	ld	[%o5 + 0x00], %f3		! ux = from[0]
+	ld	[%o5 + 0x04], %f5		! uy = from[1]
+	ld	[%o5 + 0x08], %f7		! uz = from[2]
+	add	%o5, %g2, %o5			! STRIDE_F(from, stride)
+	add	%o4, 1, %o4			! i++
+
+	ld	[%o3], %f13			! LSU
+	add	%o3, 4, %o3			! IEU0
+
+	/* f3=tx, f5=ty, f7=tz, f13=lengths[i] */
+
+	fmuls	%f3, %f13, %f3
+	st	%f3, [%g3 + 0x00]		! out[i][0] = tx * len
+	fmuls	%f5, %f13, %f5
+	st	%f5, [%g3 + 0x04]		! out[i][1] = ty * len
+	fmuls	%f7, %f13, %f7
+	st	%f7, [%g3 + 0x08]		! out[i][2] = tz * len
+
+	cmp	%o4, %g1			! continue if (i < count)
+	bl	5b
+	 add	%g3, 0x0c, %g3			! advance out vector pointer
+
+7:	retl
+	 nop
+
+	.globl	_mesa_sparc_rescale_normals
+_mesa_sparc_rescale_normals:
+	/* o0=mat o1=scale o2=in o3=lengths o4=dest */
+
+	sethi	%hi(ONE_DOT_ZERO), %g2
+	sub	%sp, 16, %sp
+	st	%o1, [%sp + STACK_VAR_OFF+0x0]
+	ld	[%sp + STACK_VAR_OFF+0x0], %f15	! f15 = scale
+	add	%sp, 16, %sp
+
+	LDPTR	[%o2 + V4F_START], %o5		! o5 = 'from' in->start
+	ld	[%o2 + V4F_COUNT], %g1		! g1 = in->count
+	ld	[%o2 + V4F_STRIDE], %g2		! g2 = in->stride
+	LDPTR	[%o4 + V4F_START], %g3		! g3 = 'out' dest->start
+
+	/* dest->count = in->count */
+	st	%g1, [%o4 + V4F_COUNT]
+
+	cmp	%g1, 1
+	bl	7f
+	 clr	%o4				! 'i' for STRIDE_LOOP
+
+1:
+	ld	[%o5 + 0x00], %f3		! ux = from[0]
+	ld	[%o5 + 0x04], %f5		! uy = from[1]
+	ld	[%o5 + 0x08], %f7		! uz = from[2]
+	add	%o5, %g2, %o5			! STRIDE_F(from, stride)
+	add	%o4, 1, %o4			! i++
+
+	/* f3=tx, f5=ty, f7=tz */
+
+	fmuls	%f3, %f15, %f3
+	st	%f3, [%g3 + 0x00]		! out[i][0] = tx * scale
+	fmuls	%f5, %f15, %f5
+	st	%f5, [%g3 + 0x04]		! out[i][1] = ty * scale
+	fmuls	%f7, %f15, %f7
+	st	%f7, [%g3 + 0x08]		! out[i][2] = tz * scale
+
+	cmp	%o4, %g1			! continue if (i < count)
+	bl	1b
+	 add	%g3, 0x0c, %g3			! advance out vector pointer
+
+7:	retl
+	 nop
diff --git a/reactos/lib/mesa32/src/sparc/sparc.c b/reactos/lib/mesa32/src/sparc/sparc.c
new file mode 100644
index 00000000000..550c33856b0
--- /dev/null
+++ b/reactos/lib/mesa32/src/sparc/sparc.c
@@ -0,0 +1,187 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ * 
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * Sparc assembly code by David S. Miller
+ */
+
+
+#ifdef USE_SPARC_ASM
+
+#include "context.h"
+#include "math/m_xform.h"
+#include "tnl/t_context.h"
+#include "sparc.h"
+
+#ifdef DEBUG
+#include "math/m_debug.h"
+#endif
+
+#define XFORM_ARGS 	GLvector4f *to_vec, 		\
+			const GLfloat m[16], 		\
+			const GLvector4f *from_vec
+
+#define DECLARE_XFORM_GROUP(pfx, sz)					   \
+ extern void _mesa_##pfx##_transform_points##sz##_general(XFORM_ARGS);     \
+ extern void _mesa_##pfx##_transform_points##sz##_identity(XFORM_ARGS);    \
+ extern void _mesa_##pfx##_transform_points##sz##_3d_no_rot(XFORM_ARGS);   \
+ extern void _mesa_##pfx##_transform_points##sz##_perspective(XFORM_ARGS); \
+ extern void _mesa_##pfx##_transform_points##sz##_2d(XFORM_ARGS);          \
+ extern void _mesa_##pfx##_transform_points##sz##_2d_no_rot(XFORM_ARGS);   \
+ extern void _mesa_##pfx##_transform_points##sz##_3d(XFORM_ARGS);
+
+#define ASSIGN_XFORM_GROUP(pfx, sz)					\
+   _mesa_transform_tab[sz][MATRIX_GENERAL] =				\
+      _mesa_##pfx##_transform_points##sz##_general;			\
+   _mesa_transform_tab[sz][MATRIX_IDENTITY] =				\
+      _mesa_##pfx##_transform_points##sz##_identity;			\
+   _mesa_transform_tab[sz][MATRIX_3D_NO_ROT] =				\
+      _mesa_##pfx##_transform_points##sz##_3d_no_rot;			\
+   _mesa_transform_tab[sz][MATRIX_PERSPECTIVE] =			\
+      _mesa_##pfx##_transform_points##sz##_perspective;			\
+   _mesa_transform_tab[sz][MATRIX_2D] =					\
+      _mesa_##pfx##_transform_points##sz##_2d;				\
+   _mesa_transform_tab[sz][MATRIX_2D_NO_ROT] =				\
+      _mesa_##pfx##_transform_points##sz##_2d_no_rot;			\
+   _mesa_transform_tab[sz][MATRIX_3D] =					\
+      _mesa_##pfx##_transform_points##sz##_3d;
+
+
+#ifdef USE_SPARC_ASM
+DECLARE_XFORM_GROUP(sparc, 1)
+DECLARE_XFORM_GROUP(sparc, 2)
+DECLARE_XFORM_GROUP(sparc, 3)
+DECLARE_XFORM_GROUP(sparc, 4)
+
+extern GLvector4f  *_mesa_sparc_cliptest_points4(GLvector4f *clip_vec,
+						 GLvector4f *proj_vec,
+						 GLubyte clipMask[],
+						 GLubyte *orMask,
+						 GLubyte *andMask);
+
+extern GLvector4f  *_mesa_sparc_cliptest_points4_np(GLvector4f *clip_vec,
+						    GLvector4f *proj_vec,
+						    GLubyte clipMask[],
+						    GLubyte *orMask,
+						    GLubyte *andMask);
+
+#define NORM_ARGS	const GLmatrix *mat,				\
+			GLfloat scale,					\
+			const GLvector3f *in,				\
+			const GLfloat *lengths,				\
+			GLvector3f *dest
+
+extern void _mesa_sparc_transform_normalize_normals(NORM_ARGS);
+extern void _mesa_sparc_transform_normalize_normals_no_rot(NORM_ARGS);
+extern void _mesa_sparc_transform_rescale_normals_no_rot(NORM_ARGS);
+extern void _mesa_sparc_transform_rescale_normals(NORM_ARGS);
+extern void _mesa_sparc_transform_normals_no_rot(NORM_ARGS);
+extern void _mesa_sparc_transform_normals(NORM_ARGS);
+extern void _mesa_sparc_normalize_normals(NORM_ARGS);
+extern void _mesa_sparc_rescale_normals(NORM_ARGS);
+
+#endif
+
+void _mesa_init_all_sparc_transform_asm(void)
+{
+#ifdef USE_SPARC_ASM
+   ASSIGN_XFORM_GROUP(sparc, 1)
+   ASSIGN_XFORM_GROUP(sparc, 2)
+   ASSIGN_XFORM_GROUP(sparc, 3)
+   ASSIGN_XFORM_GROUP(sparc, 4)
+
+#if 0
+   /* Disabled for now.  See Mesa bug report # 544665.  Evidently these
+    * functions are using SPARC registers that shouldn't be touched.
+    */
+   _mesa_clip_tab[4] = _mesa_sparc_cliptest_points4;
+   _mesa_clip_np_tab[4] = _mesa_sparc_cliptest_points4_np;
+#endif
+#if 0
+   /* disable these too.  See bug 673938 */
+   _mesa_normal_tab[NORM_TRANSFORM | NORM_NORMALIZE] =
+	   _mesa_sparc_transform_normalize_normals;
+   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT | NORM_NORMALIZE] =
+	   _mesa_sparc_transform_normalize_normals_no_rot;
+   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT | NORM_RESCALE] =
+	   _mesa_sparc_transform_rescale_normals_no_rot;
+   _mesa_normal_tab[NORM_TRANSFORM | NORM_RESCALE] =
+	   _mesa_sparc_transform_rescale_normals;
+   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT] =
+	   _mesa_sparc_transform_normals_no_rot;
+   _mesa_normal_tab[NORM_TRANSFORM] =
+	   _mesa_sparc_transform_normals;
+   _mesa_normal_tab[NORM_NORMALIZE] =
+	   _mesa_sparc_normalize_normals;
+   _mesa_normal_tab[NORM_RESCALE] =
+	   _mesa_sparc_rescale_normals;
+#endif
+
+#ifdef DEBUG
+   _math_test_all_transform_functions("sparc");
+   _math_test_all_cliptest_functions("sparc");
+   _math_test_all_normal_transform_functions("sparc");
+#endif
+
+#endif
+}
+
+extern unsigned int _mesa_sparc_glapi_begin;
+extern unsigned int _mesa_sparc_glapi_end;
+extern void __glapi_sparc_icache_flush(unsigned int *);
+
+#endif /* USE_SPARC_ASM */
+
+
+void _mesa_init_sparc_glapi_relocs(void)
+{
+#ifdef USE_SPARC_ASM
+	unsigned int *insn_ptr, *end_ptr;
+	unsigned long disp_addr;
+
+	insn_ptr = &_mesa_sparc_glapi_begin;
+	end_ptr = &_mesa_sparc_glapi_end;
+	disp_addr = (unsigned long) &_glapi_Dispatch;
+
+	while (insn_ptr < end_ptr) {
+#if defined(__sparc_v9__) && !defined(__linux__)
+		insn_ptr[0] |= (disp_addr >> (32 + 10));
+		insn_ptr[1] |= ((disp_addr & 0xffffffff) >> 10);
+		__glapi_sparc_icache_flush(&insn_ptr[0]);
+		insn_ptr[2] |= ((disp_addr >> 32) & ((1 << 10) - 1));
+		insn_ptr[3] |= (disp_addr & ((1 << 10) - 1));
+		__glapi_sparc_icache_flush(&insn_ptr[2]);
+		insn_ptr += 11;
+#else
+		insn_ptr[0] |= (disp_addr >> 10);
+		insn_ptr[1] |= (disp_addr & ((1 << 10) - 1));
+		__glapi_sparc_icache_flush(&insn_ptr[0]);
+		insn_ptr += 5;
+#endif
+	}
+#endif /* USE_SPARC_ASM */
+}
+
+
+
diff --git a/reactos/lib/mesa32/src/sparc/sparc.h b/reactos/lib/mesa32/src/sparc/sparc.h
new file mode 100644
index 00000000000..790477c0a31
--- /dev/null
+++ b/reactos/lib/mesa32/src/sparc/sparc.h
@@ -0,0 +1,38 @@
+/* $Id: sparc.h,v 1.1 2004/07/16 22:12:38 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.1
+ * 
+ * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * Sparc assembly code by David S. Miller
+ */
+
+
+#ifndef SPARC_H
+#define SPARC_H
+
+extern void _mesa_init_all_sparc_transform_asm(void);
+extern void _mesa_init_sparc_glapi_relocs(void);
+
+#endif /* !(SPARC_H) */
diff --git a/reactos/lib/mesa32/src/sparc/sparc_matrix.h b/reactos/lib/mesa32/src/sparc/sparc_matrix.h
new file mode 100644
index 00000000000..5a70cafdb9e
--- /dev/null
+++ b/reactos/lib/mesa32/src/sparc/sparc_matrix.h
@@ -0,0 +1,170 @@
+/*
+ * SPARC assembly matrix code.
+ */
+
+#ifndef _SPARC_MATRIX_H
+#define _SPARC_MATRIX_H
+
+#if defined(__sparc_v9__) && !defined(__linux__)
+#define LDPTR		ldx
+#define MAT_M		0x00
+#define MAT_INV		0x08
+#define V4F_DATA	0x00
+#define V4F_START	0x08
+#define V4F_COUNT	0x10
+#define V4F_STRIDE	0x14
+#define V4F_SIZE	0x18
+#define V4F_FLAGS	0x1c
+#else
+#define LDPTR		ld
+#define MAT_M		0x00
+#define MAT_INV		0x04
+#define V4F_DATA	0x00
+#define V4F_START	0x04
+#define V4F_COUNT	0x08
+#define V4F_STRIDE	0x0c
+#define V4F_SIZE	0x10
+#define V4F_FLAGS	0x14
+#endif
+
+#define VEC_SIZE_1   	1
+#define VEC_SIZE_2   	3
+#define VEC_SIZE_3   	7
+#define VEC_SIZE_4   	15
+
+#define M0		%f16
+#define M1		%f17
+#define M2		%f18
+#define M3		%f19
+#define M4		%f20
+#define M5		%f21
+#define M6		%f22
+#define M7		%f23
+#define M8		%f24
+#define M9		%f25
+#define M10		%f26
+#define M11		%f27
+#define M12		%f28
+#define M13		%f29
+#define M14		%f30
+#define M15		%f31
+
+#define LDMATRIX_0_1_2_3_12_13_14_15(BASE)	\
+	ldd	[BASE + ( 0 * 0x4)], M0;	\
+	ldd	[BASE + ( 2 * 0x4)], M2;	\
+	ldd	[BASE + (12 * 0x4)], M12;	\
+	ldd	[BASE + (14 * 0x4)], M14
+
+#define LDMATRIX_0_1_12_13(BASE)		\
+	ldd	[BASE + ( 0 * 0x4)], M0;	\
+	ldd	[BASE + (12 * 0x4)], M12
+
+#define LDMATRIX_0_12_13(BASE)			\
+	ld	[BASE + ( 0 * 0x4)], M0;	\
+	ldd	[BASE + (12 * 0x4)], M12
+
+#define LDMATRIX_0_1_2_12_13_14(BASE)		\
+	ldd	[BASE + ( 0 * 0x4)], M0;	\
+	ld	[BASE + ( 2 * 0x4)], M2;	\
+	ldd	[BASE + (12 * 0x4)], M12;	\
+	ld	[BASE + (14 * 0x4)], M14
+
+#define LDMATRIX_0_12_13_14(BASE)		\
+	ld	[BASE + ( 0 * 0x4)], M0;	\
+	ldd	[BASE + (12 * 0x4)], M12;	\
+	ld	[BASE + (14 * 0x4)], M14
+
+#define LDMATRIX_0_14(BASE)			\
+	ld	[BASE + ( 0 * 0x4)], M0;	\
+	ld	[BASE + (14 * 0x4)], M14
+
+#define LDMATRIX_0_1_2_3_4_5_6_7_12_13_14_15(BASE) \
+	ldd	[BASE + ( 0 * 0x4)], M0;	\
+	ldd	[BASE + ( 2 * 0x4)], M2;	\
+	ldd	[BASE + ( 4 * 0x4)], M4;	\
+	ldd	[BASE + ( 6 * 0x4)], M6;	\
+	ldd	[BASE + (12 * 0x4)], M12;	\
+	ldd	[BASE + (14 * 0x4)], M14
+
+#define LDMATRIX_0_5_12_13(BASE) 		\
+	ld	[BASE + ( 0 * 0x4)], M0;	\
+	ld	[BASE + ( 5 * 0x4)], M5;	\
+	ldd	[BASE + (12 * 0x4)], M12
+
+#define LDMATRIX_0_1_2_3_4_5_6_12_13_14(BASE)	\
+	ldd	[BASE + ( 0 * 0x4)], M0;	\
+	ldd	[BASE + ( 2 * 0x4)], M2;	\
+	ldd	[BASE + ( 4 * 0x4)], M4;	\
+	ld	[BASE + ( 6 * 0x4)], M6;	\
+	ldd	[BASE + (12 * 0x4)], M12;	\
+	ld	[BASE + (14 * 0x4)], M14
+
+#define LDMATRIX_0_5_12_13_14(BASE)		\
+	ld	[BASE + ( 0 * 0x4)], M0;	\
+	ld	[BASE + ( 5 * 0x4)], M5;	\
+	ldd	[BASE + (12 * 0x4)], M12;	\
+	ld	[BASE + (14 * 0x4)], M14
+
+#define LDMATRIX_0_5_14(BASE)			\
+	ld	[BASE + ( 0 * 0x4)], M0;	\
+	ld	[BASE + ( 5 * 0x4)], M5;	\
+	ld	[BASE + (14 * 0x4)], M14
+
+#define LDMATRIX_0_1_2_3_4_5_6_7_8_9_10_11_12_13_14_15(BASE) \
+	ldd	[BASE + ( 0 * 0x4)], M0;	\
+	ldd	[BASE + ( 2 * 0x4)], M2;	\
+	ldd	[BASE + ( 4 * 0x4)], M4;	\
+	ldd	[BASE + ( 6 * 0x4)], M6;	\
+	ldd	[BASE + ( 8 * 0x4)], M8;	\
+	ldd	[BASE + (10 * 0x4)], M10;	\
+	ldd	[BASE + (12 * 0x4)], M12;	\
+	ldd	[BASE + (14 * 0x4)], M14
+
+#define LDMATRIX_0_1_4_5_12_13(BASE) 		\
+	ldd	[BASE + ( 0 * 0x4)], M0;	\
+	ldd	[BASE + ( 4 * 0x4)], M4;	\
+	ldd	[BASE + (12 * 0x4)], M12
+
+#define LDMATRIX_0_5_12_13(BASE) 		\
+	ld	[BASE + ( 0 * 0x4)], M0;	\
+	ld	[BASE + ( 5 * 0x4)], M5;	\
+	ldd	[BASE + (12 * 0x4)], M12
+
+#define LDMATRIX_0_1_2_4_5_6_8_9_10(BASE) \
+	ldd	[BASE + ( 0 * 0x4)], M0;	\
+	ld	[BASE + ( 2 * 0x4)], M2;	\
+	ldd	[BASE + ( 4 * 0x4)], M4;	\
+	ld	[BASE + ( 6 * 0x4)], M6;	\
+	ldd	[BASE + ( 8 * 0x4)], M8;	\
+	ld	[BASE + (10 * 0x4)], M10
+
+#define LDMATRIX_0_1_2_4_5_6_8_9_10_12_13_14(BASE) \
+	ldd	[BASE + ( 0 * 0x4)], M0;	\
+	ld	[BASE + ( 2 * 0x4)], M2;	\
+	ldd	[BASE + ( 4 * 0x4)], M4;	\
+	ld	[BASE + ( 6 * 0x4)], M6;	\
+	ldd	[BASE + ( 8 * 0x4)], M8;	\
+	ld	[BASE + (10 * 0x4)], M10;	\
+	ldd	[BASE + (12 * 0x4)], M12;	\
+	ld	[BASE + (14 * 0x4)], M14
+
+#define LDMATRIX_0_5_10(BASE) 			\
+	ld	[BASE + ( 0 * 0x4)], M0;	\
+	ld	[BASE + ( 5 * 0x4)], M5;	\
+	ld	[BASE + (10 * 0x4)], M10;	\
+
+#define LDMATRIX_0_5_10_12_13_14(BASE) 		\
+	ld	[BASE + ( 0 * 0x4)], M0;	\
+	ld	[BASE + ( 5 * 0x4)], M5;	\
+	ld	[BASE + (10 * 0x4)], M10;	\
+	ldd	[BASE + (12 * 0x4)], M12;	\
+	ld	[BASE + (14 * 0x4)], M14
+
+#define LDMATRIX_0_5_8_9_10_14(BASE) 		\
+	ld	[BASE + ( 0 * 0x4)], M0;	\
+	ld	[BASE + ( 5 * 0x4)], M5;	\
+	ldd	[BASE + ( 8 * 0x4)], M8;	\
+	ld	[BASE + (10 * 0x4)], M10;	\
+	ld	[BASE + (14 * 0x4)], M14
+
+#endif /* !(_SPARC_MATRIX_H) */
diff --git a/reactos/lib/mesa32/src/sparc/xform.S b/reactos/lib/mesa32/src/sparc/xform.S
new file mode 100644
index 00000000000..0905507ac3d
--- /dev/null
+++ b/reactos/lib/mesa32/src/sparc/xform.S
@@ -0,0 +1,1387 @@
+/* $Id: xform.S,v 1.1 2004/07/16 22:12:38 blight Exp $ */
+
+	/* TODO
+	 *
+	 * 1) It would be nice if load/store double could be used
+	 *    at least for the matrix parts.  I think for the matrices
+	 *    it is safe, but for the vertices it probably is not due to
+	 *    things like glInterleavedArrays etc.
+	 *
+	 *    UPDATE: Trying this now in sparc_matrix.h -DaveM_990624
+	 *
+	 * 2) One extremely slick trick would be if we could enclose
+	 *    groups of xform calls on the same vertices such that
+	 *    we just load the matrix into f16-->f31 before the calls
+	 *    and then we would not have to do them here.  This may be
+	 *    tricky and not much of a gain though.
+	 */
+
+#include "sparc_matrix.h"
+
+	.text
+	.align	64
+
+__set_v4f_1:
+	ld	[%o0 + V4F_FLAGS], %g2
+	mov	1, %g1
+	st	%g1, [%o0 + V4F_SIZE]
+	or	%g2, VEC_SIZE_1, %g2
+	retl
+	 st	%g2, [%o0 + V4F_FLAGS]
+__set_v4f_2:
+	ld	[%o0 + V4F_FLAGS], %g2
+	mov	2, %g1
+	st	%g1, [%o0 + V4F_SIZE]
+	or	%g2, VEC_SIZE_2, %g2
+	retl
+	 st	%g2, [%o0 + V4F_FLAGS]
+__set_v4f_3:
+	ld	[%o0 + V4F_FLAGS], %g2
+	mov	3, %g1
+	st	%g1, [%o0 + V4F_SIZE]
+	or	%g2, VEC_SIZE_3, %g2
+	retl
+	 st	%g2, [%o0 + V4F_FLAGS]
+__set_v4f_4:
+	ld	[%o0 + V4F_FLAGS], %g2
+	mov	4, %g1
+	st	%g1, [%o0 + V4F_SIZE]
+	or	%g2, VEC_SIZE_4, %g2
+	retl
+	 st	%g2, [%o0 + V4F_FLAGS]
+
+	/* First the raw versions. */
+
+	.globl	_mesa_sparc_transform_points1_general
+_mesa_sparc_transform_points1_general:
+	ld	[%o2 + V4F_STRIDE], %o5
+	LDPTR	[%o2 + V4F_START], %g1
+	LDPTR	[%o0 + V4F_START], %g2
+	ld	[%o2 + V4F_COUNT], %g3
+
+	LDMATRIX_0_1_2_3_12_13_14_15(%o1)
+
+	cmp	%g3, 1
+	st	%g3, [%o0 + V4F_COUNT]
+	bl	3f
+	 clr	%o1
+
+	be	2f
+	 andn	%g3, 1, %o2
+
+1:	ld	[%g1 + 0x00], %f0	! LSU	Group
+	add	%g1, %o5, %g1		! IEU0
+	ld	[%g1 + 0x00], %f8	! LSU	Group
+	add	%o1, 2, %o1		! IEU0
+	add	%g1, %o5, %g1		! IEU1
+	fmuls	%f0, M0, %f1		! FGM	Group	1-cycle stall on %f0
+	fmuls	%f0, M1, %f2		! FGM	Group
+	fmuls	%f0, M2, %f3		! FGM	Group
+	fmuls	%f0, M3, %f4		! FGM	Group
+	fmuls	%f8, M0, %f9		! FGM	Group	f1 available
+	fadds	%f1, M12, %f1		! FGA
+	st	%f1, [%g2 + 0x00]	! LSU
+	fmuls	%f8, M1, %f10		! FGM	Group	f2 available
+	fadds	%f2, M13, %f2		! FGA
+	st	%f2, [%g2 + 0x04]	! LSU
+	fmuls	%f8, M2, %f11		! FGM	Group	f3 available
+	fadds	%f3, M14, %f3		! FGA
+	st	%f3, [%g2 + 0x08]	! LSU
+	fmuls	%f8, M3, %f12		! FGM	Group	f4 available
+	fadds	%f4, M15, %f4		! FGA
+	st	%f4, [%g2 + 0x0c]	! LSU
+	fadds	%f9, M12, %f9		! FGA	Group	f9 available
+	st	%f9, [%g2 + 0x10]	! LSU
+	fadds	%f10, M13, %f10		! FGA	Group	f10 available
+	st	%f10, [%g2 + 0x14]	! LSU
+	fadds	%f11, M14, %f11		! FGA	Group	f11 available
+	st	%f11, [%g2 + 0x18]	! LSU
+	fadds	%f12, M15, %f12		! FGA	Group	f12 available
+	st	%f12, [%g2 + 0x1c]	! LSU
+	cmp	%o1, %o2		! IEU1
+	bne	1b			! CTI
+	 add	%g2, 0x20, %g2		! IEU0	Group
+
+	cmp	%o1, %g3
+	be	3f
+	 nop
+
+2:	ld	[%g1 + 0x00], %f0	! LSU	Group
+	fmuls	%f0, M0, %f1		! FGM	Group	1-cycle stall on %f0
+	fmuls	%f0, M1, %f2		! FGM	Group
+	fmuls	%f0, M2, %f3		! FGM	Group
+	fmuls	%f0, M3, %f4		! FGM	Group
+	fadds	%f1, M12, %f1		! FGA	Group
+	st	%f1, [%g2 + 0x00]	! LSU
+	fadds	%f2, M13, %f2		! FGA	Group
+	st	%f2, [%g2 + 0x04]	! LSU
+	fadds	%f3, M14, %f3		! FGA	Group
+	st	%f3, [%g2 + 0x08]	! LSU
+	fadds	%f4, M15, %f4		! FGA	Group
+	st	%f4, [%g2 + 0x0c]	! LSU
+
+3:
+	ba	__set_v4f_4
+	 nop
+
+	.globl	_mesa_sparc_transform_points1_identity
+_mesa_sparc_transform_points1_identity:
+	cmp	%o0, %o2
+	be	4f
+	 ld	[%o2 + V4F_STRIDE], %o5
+	LDPTR	[%o2 + V4F_START], %g1
+	LDPTR	[%o0 + V4F_START], %g2
+	ld	[%o2 + V4F_COUNT], %g3
+
+	cmp	%g3, 1
+	st	%g3, [%o0 + V4F_COUNT]
+	bl	3f
+	 clr	%o1
+
+	be	2f
+	 andn	%g3, 1, %o2
+
+1:	ld	[%g1 + 0x00], %f0	! LSU	Group
+	add	%g1, %o5, %g1		! IEU0
+	ld	[%g1 + 0x00], %f1	! LSU	Group
+	add	%o1, 2, %o1		! IEU0
+	add	%g1, %o5, %g1		! IEU1
+	st	%f0, [%g2 + 0x00]	! LSU	Group
+	cmp	%o1, %o2		! IEU1
+	st	%f1, [%g2 + 0x10]	! LSU	Group
+	bne	1b			! CTI
+	 add	%g2, 0x20, %g2		! IEU0
+
+	cmp	%o1, %g3
+	be	3f
+	 nop
+
+2:	ld	[%g1 + 0x00], %f0
+	addx	%g0, %g0, %g0
+	st	%f0, [%g2 + 0x00]
+
+3:
+	ba	__set_v4f_1
+	 nop
+
+4:	retl
+	 nop
+
+	.globl	_mesa_sparc_transform_points1_2d
+_mesa_sparc_transform_points1_2d:
+	ld	[%o2 + V4F_STRIDE], %o5
+	LDPTR	[%o2 + V4F_START], %g1
+	LDPTR	[%o0 + V4F_START], %g2
+	ld	[%o2 + V4F_COUNT], %g3
+
+	LDMATRIX_0_1_12_13(%o1)
+
+	cmp	%g3, 1
+	st	%g3, [%o0 + V4F_COUNT]
+	bl	3f
+	 clr	%o1
+
+	be	2f
+	 andn	%g3, 1, %o2
+
+1:	ld	[%g1 + 0x00], %f0	! LSU	Group
+	add	%g1, %o5, %g1		! IEU0
+	ld	[%g1 + 0x00], %f8	! LSU	Group
+	add	%o1, 2, %o1		! IEU0
+	add	%g1, %o5, %g1		! IEU1
+	fmuls	%f0, M0, %f1		! FGM	Group
+	fmuls	%f0, M1, %f2		! FGM	Group
+	fmuls	%f8, M0, %f9		! FGM	Group
+	fmuls	%f8, M1, %f10		! FGM	Group
+	fadds	%f1, M12, %f3		! FGA	Group	f1 available
+	st	%f3, [%g2 + 0x00]	! LSU
+	fadds	%f2, M13, %f4		! FGA	Group	f2 available
+	st	%f4, [%g2 + 0x04]	! LSU
+	fadds	%f9, M12, %f11		! FGA	Group	f9 available
+	st	%f11, [%g2 + 0x10]	! LSU
+	fadds	%f10, M13, %f12		! FGA	Group	f10 available
+	st	%f12, [%g2 + 0x14]	! LSU
+	cmp	%o1, %o2		! IEU1
+	bne	1b			! CTI
+	 add	%g2, 0x20, %g2		! IEU0	Group
+
+	cmp	%o1, %g3
+	be	3f
+	 nop
+
+2:	ld	[%g1 + 0x00], %f0
+	fmuls	%f0, M0, %f1
+	fmuls	%f0, M1, %f2
+	fadds	%f1, M12, %f3
+	st	%f3, [%g2 + 0x00]
+	fadds	%f2, M13, %f4
+	st	%f4, [%g2 + 0x04]
+
+3:
+	ba	__set_v4f_2
+	 nop
+
+	.globl	_mesa_sparc_transform_points1_2d_no_rot
+_mesa_sparc_transform_points1_2d_no_rot:
+	ld	[%o2 + V4F_STRIDE], %o5
+	LDPTR	[%o2 + V4F_START], %g1
+	LDPTR	[%o0 + V4F_START], %g2
+	ld	[%o2 + V4F_COUNT], %g3
+
+	LDMATRIX_0_12_13(%o1)
+
+	cmp	%g3, 1
+	st	%g3, [%o0 + V4F_COUNT]
+	bl	3f
+	 clr	%o1
+
+	be	2f
+	 andn	%g3, 1, %o2
+
+1:	ld	[%g1 + 0x00], %f0	! LSU	Group
+	add	%g1, %o5, %g1		! IEU0
+	ld	[%g1 + 0x00], %f4	! LSU	Group
+	add	%o1, 2, %o1		! IEU0
+	add	%g1, %o5, %g1		! IEU1
+	fmuls	%f0, M0, %f1		! FGM	Group
+	fmuls	%f4, M0, %f5		! FGM	Group
+	fadds	%f1, M12, %f3		! FGA	Group, 2 cycle stall, f1 available
+	st	%f3, [%g2 + 0x00]	! LSU
+	st	M13, [%g2 + 0x04]	! LSU	Group, f5 available
+	fadds	%f5, M12, %f6		! FGA
+	st	%f6, [%g2 + 0x10]	! LSU	Group
+	st	M13, [%g2 + 0x14]	! LSU	Group
+	cmp	%o1, %o2		! IEU1
+	bne	1b			! CTI
+	 add	%g2, 0x20, %g2		! IEU0	Group
+
+	cmp	%o1, %g3
+	be	3f
+	 nop
+
+2:	ld	[%g1 + 0x00], %f0
+	fmuls	%f0, M0, %f1
+	fadds	%f1, M12, %f3
+	st	%f3, [%g2 + 0x00]
+	st	M13, [%g2 + 0x04]
+
+3:
+	ba	__set_v4f_2
+	 nop
+
+	.globl	_mesa_sparc_transform_points1_3d
+_mesa_sparc_transform_points1_3d:
+	ld	[%o2 + V4F_STRIDE], %o5
+	LDPTR	[%o2 + V4F_START], %g1
+	LDPTR	[%o0 + V4F_START], %g2
+	ld	[%o2 + V4F_COUNT], %g3
+
+	LDMATRIX_0_1_2_12_13_14(%o1)
+
+	cmp	%g3, 1
+	st	%g3, [%o0 + V4F_COUNT]
+	bl	3f
+	 clr	%o1
+
+	be	2f
+	 andn	%g3, 1, %o2
+
+1:	ld	[%g1 + 0x00], %f0	! LSU	Group
+	add	%g1, %o5, %g1		! IEU0
+	ld	[%g1 + 0x00], %f4	! LSU	Group
+	add	%o1, 2, %o1		! IEU0
+	add	%g1, %o5, %g1		! IEU1
+	fmuls	%f0, M0, %f1		! FGM	Group
+	fmuls	%f0, M1, %f2		! FGM	Group
+	fmuls	%f0, M2, %f3		! FGM	Group
+	fmuls	%f4, M0, %f5		! FGM	Group
+	fadds	%f1, M12, %f1		! FGA	Group, f1 available
+	st	%f1, [%g2 + 0x00]	! LSU
+	fmuls	%f4, M1, %f6		! FGM
+	fadds	%f2, M13, %f2		! FGA	Group, f2 available
+	st	%f2, [%g2 + 0x04]	! LSU
+	fmuls	%f4, M2, %f7		! FGM
+	fadds	%f3, M14, %f3		! FGA	Group, f3 available
+	st	%f3, [%g2 + 0x08]	! LSU
+	fadds	%f5, M12, %f5		! FGA	Group, f5 available
+	st	%f5, [%g2 + 0x10]	! LSU
+	fadds	%f6, M13, %f6		! FGA	Group, f6 available
+	st	%f6, [%g2 + 0x14]	! LSU
+	fadds	%f7, M14, %f7		! FGA	Group, f7 available
+	st	%f7, [%g2 + 0x18]	! LSU
+	cmp	%o1, %o2		! IEU1
+	bne	1b			! CTI
+	 add	%g2, 0x20, %g2		! IEU0	Group
+
+	cmp	%o1, %g3
+	be	3f
+	 nop
+
+2:	ld	[%g1 + 0x00], %f0
+	fmuls	%f0, M0, %f1
+	fmuls	%f0, M1, %f2
+	fmuls	%f0, M2, %f3
+	fadds	%f1, M12, %f1
+	st	%f1, [%g2 + 0x00]
+	fadds	%f2, M13, %f2
+	st	%f2, [%g2 + 0x04]
+	fadds	%f3, M14, %f3
+	st	%f3, [%g2 + 0x08]
+
+3:
+	ba	__set_v4f_3
+	 nop
+
+	.globl	_mesa_sparc_transform_points1_3d_no_rot
+_mesa_sparc_transform_points1_3d_no_rot:
+	ld	[%o2 + V4F_STRIDE], %o5
+	LDPTR	[%o2 + V4F_START], %g1
+	LDPTR	[%o0 + V4F_START], %g2
+	ld	[%o2 + V4F_COUNT], %g3
+
+	LDMATRIX_0_12_13_14(%o1)
+
+	cmp	%g3, 1
+	st	%g3, [%o0 + V4F_COUNT]
+	bl	3f
+	 clr	%o1
+
+	be	2f
+	 andn	%g3, 1, %o2
+
+1:	ld	[%g1 + 0x00], %f0	! LSU	Group
+	add	%g1, %o5, %g1		! IEU0
+	ld	[%g1 + 0x00], %f2	! LSU	Group
+	add	%o1, 2, %o1		! IEU0
+	add	%g1, %o5, %g1		! IEU1
+	fmuls	%f0, M0, %f1		! FGM	Group
+	fmuls	%f2, M0, %f3		! FGM	Group
+	fadds	%f1, M12, %f1		! FGA	Group, 2 cycle stall, f1 available
+	st	%f1, [%g2 + 0x00]	! LSU
+	fadds	%f3, M12, %f3		! FGA	Group, f3 available
+	st	M13, [%g2 + 0x04]	! LSU
+	st	M14, [%g2 + 0x08]	! LSU	Group
+	st	%f3, [%g2 + 0x10]	! LSU	Group
+	st	M13, [%g2 + 0x14]	! LSU	Group
+	st	M14, [%g2 + 0x18]	! LSU	Group
+	cmp	%o1, %o2		! IEU1
+	bne	1b			! CTI
+	 add	%g2, 0x20, %g2		! IEU0	Group
+
+	cmp	%o1, %g3
+	be	3f
+	 nop
+
+2:	ld	[%g1 + 0x00], %f0
+	fmuls	%f0, M0, %f1
+	fadds	%f1, M12, %f1
+	st	%f1, [%g2 + 0x00]
+	st	M13, [%g2 + 0x04]
+	st	M14, [%g2 + 0x08]
+
+3:
+	ba	__set_v4f_3
+	 nop
+
+	.globl	_mesa_sparc_transform_points1_perspective
+_mesa_sparc_transform_points1_perspective:
+	ld	[%o2 + V4F_STRIDE], %o5
+	LDPTR	[%o2 + V4F_START], %g1
+	LDPTR	[%o0 + V4F_START], %g2
+	ld	[%o2 + V4F_COUNT], %g3
+
+	LDMATRIX_0_14(%o1)
+
+	cmp	%g3, 1
+	st	%g3, [%o0 + V4F_COUNT]
+	bl	3f
+	 clr	%o1
+
+	be	2f
+	 andn	%g3, 1, %o2
+
+1:	ld	[%g1 + 0x00], %f0	! LSU	Group
+	add	%g1, %o5, %g1		! IEU0
+	ld	[%g1 + 0x00], %f2	! LSU	Group
+	add	%o1, 2, %o1		! IEU0
+	add	%g1, %o5, %g1		! IEU1
+	fmuls	%f0, M0, %f1		! FGM	Group
+	st	%f1, [%g2 + 0x00]	! LSU
+	fmuls	%f2, M0, %f3		! FGM	Group
+	st	%g0, [%g2 + 0x04]	! LSU
+	st	M14, [%g2 + 0x08]	! LSU	Group
+	st	%g0, [%g2 + 0x0c]	! LSU	Group
+	st	%f3, [%g2 + 0x10]	! LSU	Group
+	st	%g0, [%g2 + 0x14]	! LSU	Group
+	st	M14, [%g2 + 0x18]	! LSU	Group
+	st	%g0, [%g2 + 0x1c]	! LSU	Group
+	cmp	%o1, %o2		! IEU1
+	bne	1b			! CTI
+	 add	%g2, 0x20, %g2		! IEU0	Group
+
+	cmp	%o1, %g3
+	be	3f
+	 nop
+
+2:	ld	[%g1 + 0x00], %f0
+	fmuls	%f0, M0, %f1
+	st	%f1, [%g2 + 0x00]
+	st	%g0, [%g2 + 0x04]
+	st	M14, [%g2 + 0x08]
+	st	%g0, [%g2 + 0x0c]
+
+3:
+	ba	__set_v4f_4
+	 nop
+
+	.globl	_mesa_sparc_transform_points2_general
+_mesa_sparc_transform_points2_general:
+	ld	[%o2 + V4F_STRIDE], %o5
+	LDPTR	[%o2 + V4F_START], %g1
+	LDPTR	[%o0 + V4F_START], %g2
+	ld	[%o2 + V4F_COUNT], %g3
+
+	LDMATRIX_0_1_2_3_4_5_6_7_12_13_14_15(%o1)
+
+	cmp	%g3, 0
+	st	%g3, [%o0 + V4F_COUNT]
+	be	2f
+	 clr	%o1
+
+1:	ld	[%g1 + 0x00], %f0	! LSU	Group
+	ld	[%g1 + 0x04], %f1	! LSU	Group
+	add	%o1, 1, %o1		! IEU0
+	add	%g1, %o5, %g1		! IEU1
+	fmuls	%f0, M0, %f2		! FGM	Group
+	fmuls	%f0, M1, %f3		! FGM	Group
+	fmuls	%f0, M2, %f4		! FGM	Group
+	fmuls	%f0, M3, %f5		! FGM	Group
+	fadds	%f2, M12, %f2		! FGA	Group	f2 available
+	fmuls	%f1, M4, %f6		! FGM
+	fadds	%f3, M13, %f3		! FGA	Group	f3 available
+	fmuls	%f1, M5, %f7		! FGM
+	fadds	%f4, M14, %f4		! FGA	Group	f4 available
+	fmuls	%f1, M6, %f8		! FGM
+	fadds	%f5, M15, %f5		! FGA	Group	f5 available
+	fmuls	%f1, M7, %f9		! FGM
+	fadds	%f2, %f6, %f2		! FGA	Group	f6 available
+	st	%f2, [%g2 + 0x00]	! LSU
+	fadds	%f3, %f7, %f3		! FGA	Group	f7 available
+	st	%f3, [%g2 + 0x04]	! LSU
+	fadds	%f4, %f8, %f4		! FGA	Group	f8 available
+	st	%f4, [%g2 + 0x08]	! LSU
+	fadds	%f5, %f9, %f5		! FGA	Group	f9 available
+	st	%f5, [%g2 + 0x0c]	! LSU
+	cmp	%o1, %g3		! IEU1
+	bne	1b			! CTI
+	 add	%g2, 0x10, %g2		! IEU0	Group
+2:
+	ba	__set_v4f_4
+	 nop
+
+	.globl	_mesa_sparc_transform_points2_identity
+_mesa_sparc_transform_points2_identity:
+	cmp	%o2, %o0
+	be	3f
+	 ld	[%o2 + V4F_STRIDE], %o5
+	LDPTR	[%o2 + V4F_START], %g1
+	LDPTR	[%o0 + V4F_START], %g2
+	ld	[%o2 + V4F_COUNT], %g3
+
+	cmp	%g3, 0
+	st	%g3, [%o0 + V4F_COUNT]
+	be	2f
+	 clr	%o1
+
+1:	ld	[%g1 + 0x00], %f0	! LSU	Group
+	add	%o1, 1, %o1		! IEU0
+	ld	[%g1 + 0x04], %f1	! LSU	Group
+	add	%g1, %o5, %g1		! IEU0
+	cmp	%o1, %g3		! IEU1
+	st	%f0, [%g2 + 0x00]	! LSU	Group
+	st	%f1, [%g2 + 0x04]	! LSU	Group
+	bne	1b			! CTI
+	 add	%g2, 0x10, %g2		! IEU0
+2:
+	ba	__set_v4f_2
+	 nop
+
+3:	retl
+	 nop
+
+	.globl	_mesa_sparc_transform_points2_2d
+_mesa_sparc_transform_points2_2d:
+	ld	[%o2 + V4F_STRIDE], %o5
+	LDPTR	[%o2 + V4F_START], %g1
+	LDPTR	[%o0 + V4F_START], %g2
+	ld	[%o2 + V4F_COUNT], %g3
+
+	LDMATRIX_0_1_4_5_12_13(%o1)
+
+	cmp	%g3, 1
+	st	%g3, [%o0 + V4F_COUNT]
+	bl	3f
+	 clr	%o1
+
+	be	2f
+	 andn	%g3, 1, %o2
+
+1:	ld	[%g1 + 0x00], %f0	! LSU	Group
+	ld	[%g1 + 0x04], %f1	! LSU	Group
+	add	%o1, 2, %o1		! IEU0
+	add	%g1, %o5, %g1		! IEU1
+	fmuls	%f0, M0, %f2		! FGM
+	ld	[%g1 + 0x00], %f8	! LSU	Group
+	fmuls	%f0, M1, %f3		! FGM
+	ld	[%g1 + 0x04], %f9	! LSU	Group
+	fmuls	%f1, M4, %f6		! FGM
+	fmuls	%f1, M5, %f7		! FGM	Group
+	add	%g1, %o5, %g1		! IEU0
+	fmuls	%f8, M0, %f10		! FGM	Group	f2 available
+	fadds	%f2, M12, %f2		! FGA
+	fmuls	%f8, M1, %f11		! FGM	Group	f3 available
+	fadds	%f3, M13, %f3		! FGA
+	fmuls	%f9, M4, %f12		! FGM	Group
+	fmuls	%f9, M5, %f13		! FGM	Group
+	fadds	%f10, M12, %f10		! FGA	Group	f2, f10 available
+	fadds	%f2, %f6, %f2		! FGA	Group	f3, f11 available
+	st	%f2, [%g2 + 0x00]	! LSU
+	fadds	%f11, M13, %f11		! FGA	Group	f12 available
+	fadds	%f3, %f7, %f3		! FGA	Group	f13 available
+	st	%f3, [%g2 + 0x04]	! LSU
+	fadds	%f10, %f12, %f10	! FGA	Group	f10 available
+	st	%f10, [%g2 + 0x10]	! LSU
+	fadds	%f11, %f13, %f11	! FGA	Group	f11 available
+	st	%f11, [%g2 + 0x14]	! LSU
+	cmp	%o1, %o2		! IEU1
+	bne	1b			! CTI
+	 add	%g2, 0x20, %g2		! IEU0	Group
+
+	cmp	%o1, %g3
+	be	3f
+	 nop
+
+2:	ld	[%g1 + 0x00], %f0	! LSU	Group
+	ld	[%g1 + 0x04], %f1	! LSU	Group
+	fmuls	%f0, M0, %f2		! FGM	Group
+	fmuls	%f0, M1, %f3		! FGM	Group
+	fmuls	%f1, M4, %f6		! FGM	Group
+	fmuls	%f1, M5, %f7		! FGM	Group
+	fadds	%f2, M12, %f2		! FGA	Group	f2 available
+	fadds	%f3, M13, %f3		! FGA	Group	f3 available
+	fadds	%f2, %f6, %f2		! FGA	Group	2 cycle stall, f2 available
+	st	%f2, [%g2 + 0x00]	! LSU
+	fadds	%f3, %f7, %f3		! FGA	Group	f3 available
+	st	%f3, [%g2 + 0x04]	! LSU
+
+3:
+	ba	__set_v4f_2
+	 nop
+
+	.globl	_mesa_sparc_transform_points2_2d_no_rot
+_mesa_sparc_transform_points2_2d_no_rot:
+	ld	[%o2 + V4F_STRIDE], %o5
+	LDPTR	[%o2 + V4F_START], %g1
+	LDPTR	[%o0 + V4F_START], %g2
+	ld	[%o2 + V4F_COUNT], %g3
+
+	LDMATRIX_0_5_12_13(%o1)
+
+	cmp	%g3, 1
+	st	%g3, [%o0 + V4F_COUNT]
+	bl	3f
+	 clr	%o1
+
+	be	2f
+	 andn	%g3, 1, %o2
+
+1:	ld	[%g1 + 0x00], %f0	! LSU	Group
+	ld	[%g1 + 0x04], %f1	! LSU	Group
+	add	%o1, 2, %o1		! IEU0
+	add	%g1, %o5, %g1		! IEU1
+	ld	[%g1 + 0x00], %f4	! LSU	Group
+	fmuls	%f0, M0, %f2		! FGM
+	ld	[%g1 + 0x04], %f5	! LSU	Group
+	fmuls	%f1, M5, %f3		! FGM
+	fmuls	%f4, M0, %f6		! FGM	Group
+	add	%g1, %o5, %g1		! IEU0
+	fmuls	%f5, M5, %f7		! FGM	Group
+	fadds	%f2, M12, %f2		! FGA	Group	f2 available
+	st	%f2, [%g2 + 0x00]	! LSU
+	fadds	%f3, M13, %f3		! FGA	Group	f3 available
+	st	%f3, [%g2 + 0x04]	! LSU
+	fadds	%f6, M12, %f6		! FGA	Group	f6 available
+	st	%f6, [%g2 + 0x10]	! LSU
+	fadds	%f7, M13, %f7		! FGA	Group	f7 available
+	st	%f7, [%g2 + 0x14]	! LSU
+	cmp	%o1, %o2		! IEU1
+	bne	1b			! CTI
+	 add	%g2, 0x20, %g2		! IEU0	Group
+
+	cmp	%o1, %g3
+	be	3f
+	 nop
+
+2:	ld	[%g1 + 0x00], %f0	! LSU	Group
+	ld	[%g1 + 0x04], %f1	! LSU	Group
+	fmuls	%f0, M0, %f2		! FGM	Group
+	fmuls	%f1, M5, %f3		! FGM	Group
+	fadds	%f2, M12, %f2		! FGA	Group, 2 cycle stall, f2 available
+	st	%f2, [%g2 + 0x00]	! LSU
+	fadds	%f3, M13, %f3		! FGA	Group	f3 available
+	st	%f3, [%g2 + 0x04]	! LSU
+
+3:
+	ba	__set_v4f_2
+	 nop
+
+	/* orig: 12 cycles */
+	.globl	_mesa_sparc_transform_points2_3d
+_mesa_sparc_transform_points2_3d:
+	ld	[%o2 + V4F_STRIDE], %o5
+	ld	[%o2 + V4F_START], %g1
+	ld	[%o0 + V4F_START], %g2
+	ld	[%o2 + V4F_COUNT], %g3
+
+	LDMATRIX_0_1_2_3_4_5_6_12_13_14(%o1)
+
+	cmp	%g3, 1
+	st	%g3, [%o0 + V4F_COUNT]
+	bl	3f
+	 clr	%o1
+
+	be	2f
+	 andn	%g3, 1, %o2
+
+1:	ld	[%g1 + 0x00], %f0	! LSU	Group
+	ld	[%g1 + 0x04], %f1	! LSU	Group
+	add	%o1, 2, %o1		! IEU0
+	add	%g1, %o5, %g1		! IEU1
+	ld	[%g1 + 0x00], %f9	! LSU	Group
+	fmuls	%f0, M0, %f2		! FGM
+	ld	[%g1 + 0x04], %f10	! LSU	Group
+	fmuls	%f0, M1, %f3		! FGM
+	fmuls	%f0, M2, %f4		! FGM	Group
+	add	%g1, %o5, %g1		! IEU0
+	fmuls	%f1, M4, %f6		! FGM	Group
+	fmuls	%f1, M5, %f7		! FGM	Group	f2 available
+	fadds	%f2, M12, %f2		! FGA
+	fmuls	%f1, M6, %f8		! FGM	Group	f3 available
+	fadds	%f3, M13, %f3		! FGA
+	fmuls	%f9, M0, %f11		! FGM	Group	f4 available
+	fadds	%f4, M14, %f4		! FGA
+	fmuls	%f9, M1, %f12		! FGM	Group	f6 available
+	fmuls	%f9, M2, %f13		! FGM	Group	f2, f7 available
+	fadds	%f2, %f6, %f2		! FGA
+	st	%f2, [%g2 + 0x00]	! LSU
+	fmuls	%f10, M4, %f14		! FGM	Group	f3, f8 available
+	fadds	%f3, %f7, %f3		! FGA
+	st	%f3, [%g2 + 0x04]	! LSU
+	fmuls	%f10, M5, %f15		! FGM	Group	f4, f11 available
+	fadds	%f11, M12, %f11		! FGA
+	fmuls	%f10, M6, %f0		! FGM	Group	f12 available
+	fadds	%f12, M13, %f12		! FGA
+	fadds	%f13, M14, %f13		! FGA	Group	f13 available
+	fadds	%f4, %f8, %f4		! FGA	Group	f14 available
+	st	%f4, [%g2 + 0x08]	! LSU
+	fadds	%f11, %f14, %f11	! FGA	Group	f15, f11 available
+	st	%f11, [%g2 + 0x10]	! LSU
+	fadds	%f12, %f15, %f12	! FGA	Group	f0, f12 available
+	st	%f12, [%g2 + 0x14]	! LSU
+	fadds	%f13, %f0, %f13		! FGA	Group	f13 available
+	st	%f13, [%g2 + 0x18]	! LSU
+
+	cmp	%o1, %o2		! IEU1
+	bne	1b			! CTI
+	 add	%g2, 0x20, %g2		! IEU0	Group
+
+	cmp	%o1, %g3
+	be	3f
+	 nop
+
+2:	ld	[%g1 + 0x00], %f0	! LSU	Group
+	ld	[%g1 + 0x04], %f1	! LSU	Group
+	fmuls	%f0, M0, %f2		! FGM	Group
+	fmuls	%f0, M1, %f3		! FGM	Group
+	fmuls	%f0, M2, %f4		! FGM	Group
+	fmuls	%f1, M4, %f6		! FGM	Group
+	fmuls	%f1, M5, %f7		! FGM	Group	f2 available
+	fadds	%f2, M12, %f2		! FGA
+	fmuls	%f1, M6, %f8		! FGM	Group	f3 available
+	fadds	%f3, M13, %f3		! FGA
+	fadds	%f4, M14, %f4		! FGA	Group	f4 available
+	fadds	%f2, %f6, %f2		! FGA	Group	stall, f2, f6, f7 available
+	st	%f2, [%g2 + 0x00]	! LSU
+	fadds	%f3, %f7, %f3		! FGA	Group	f3, f8 available
+	st	%f3, [%g2 + 0x04]	! LSU
+	fadds	%f4, %f8, %f4		! FGA	Group	f4 available
+	st	%f4, [%g2 + 0x08]	! LSU
+
+3:
+	ba	__set_v4f_3
+	 nop
+
+	.globl	_mesa_sparc_transform_points2_3d_no_rot
+_mesa_sparc_transform_points2_3d_no_rot:
+	ld	[%o2 + V4F_STRIDE], %o5
+	LDPTR	[%o2 + V4F_START], %g1
+	LDPTR	[%o0 + V4F_START], %g2
+	ld	[%o2 + V4F_COUNT], %g3
+
+	LDMATRIX_0_5_12_13_14(%o1)
+
+	cmp	%g3, 1
+	st	%g3, [%o0 + V4F_COUNT]
+	bl	3f
+	 clr	%o3
+
+	be	2f
+	 andn	%g3, 1, %o2
+
+1:	ld	[%g1 + 0x00], %f0	! LSU	Group
+	ld	[%g1 + 0x04], %f1	! LSU	Group
+	add	%o3, 2, %o3		! IEU0
+	add	%g1, %o5, %g1		! IEU1
+	ld	[%g1 + 0x00], %f4	! LSU	Group
+	fmuls	%f0, M0, %f2		! FGM
+	ld	[%g1 + 0x04], %f5	! LSU	Group
+	fmuls	%f1, M5, %f3		! FGM
+	fmuls	%f4, M0, %f6		! FGM	Group
+	add	%g1, %o5, %g1		! IEU0
+	fmuls	%f5, M5, %f7		! FGM	Group
+	fadds	%f2, M12, %f2		! FGA	Group	f2 available
+	st	%f2, [%g2 + 0x00]	! LSU
+	fadds	%f3, M13, %f3		! FGA	Group	f3 available
+	st	%f3, [%g2 + 0x04]	! LSU
+	fadds	%f6, M12, %f6		! FGA	Group	f6 available
+	st	M14, [%g2 + 0x08]	! LSU
+	fadds	%f7, M13, %f7		! FGA	Group	f7 available
+	st	%f6, [%g2 + 0x10]	! LSU
+	st	%f7, [%g2 + 0x14]	! LSU	Group
+	st	M14, [%g2 + 0x18]	! LSU	Group
+	cmp	%o3, %o2		! IEU1
+	bne	1b			! CTI
+	 add	%g2, 0x20, %g2		! IEU0	Group
+
+	cmp	%o3, %g3
+	be	3f
+	 nop
+
+2:	ld	[%g1 + 0x00], %f0	! LSU	Group
+	ld	[%g1 + 0x04], %f1	! LSU	Group
+	fmuls	%f0, M0, %f2		! FGM	Group
+	fmuls	%f1, M5, %f3		! FGM	Group
+	fadds	%f2, M12, %f2		! FGA	Group, 2 cycle stall, f2 available
+	st	%f2, [%g2 + 0x00]	! LSU
+	fadds	%f3, M13, %f3		! FGA	Group	f3 available
+	st	%f3, [%g2 + 0x04]	! LSU
+	st	M14, [%g2 + 0x08]	! LSU	Group
+
+3:	ld	[%o1 + (14 * 0x4)], %g3
+	cmp	%g3, 0
+	bne	__set_v4f_3
+	 nop
+	ba	__set_v4f_2
+	 nop
+
+	.globl	_mesa_sparc_transform_points2_perspective
+_mesa_sparc_transform_points2_perspective:
+	ld	[%o2 + V4F_STRIDE], %o5
+	LDPTR	[%o2 + V4F_START], %g1
+	LDPTR	[%o0 + V4F_START], %g2
+	ld	[%o2 + V4F_COUNT], %g3
+
+	LDMATRIX_0_5_14(%o1)
+
+	cmp	%g3, 0
+	st	%g3, [%o0 + V4F_COUNT]
+	be	2f
+	 clr	%o1
+
+1:	ld	[%g1 + 0x00], %f0
+	ld	[%g1 + 0x04], %f1
+	add	%o1, 1, %o1
+	add	%g1, %o5, %g1
+	fmuls	%f0, M0, %f2
+	st	%f2, [%g2 + 0x00]
+	fmuls	%f1, M5, %f3
+	st	%f3, [%g2 + 0x04]
+	st	M14, [%g2 + 0x08]
+	st	%g0, [%g2 + 0x0c]
+	cmp	%o1, %g3
+	bne	1b
+	 add	%g2, 0x10, %g2
+2:
+	ba	__set_v4f_4
+	 nop
+
+	.globl	_mesa_sparc_transform_points3_general
+_mesa_sparc_transform_points3_general:
+	ld	[%o2 + V4F_STRIDE], %o5
+	LDPTR	[%o2 + V4F_START], %g1
+	LDPTR	[%o0 + V4F_START], %g2
+	ld	[%o2 + V4F_COUNT], %g3
+
+	LDMATRIX_0_1_2_3_4_5_6_7_8_9_10_11_12_13_14_15(%o1)
+
+	cmp	%g3, 0
+	st	%g3, [%o0 + V4F_COUNT]
+	be	2f
+	 clr	%o1
+
+1:	ld	[%g1 + 0x00], %f0	! LSU	Group
+	ld	[%g1 + 0x04], %f1	! LSU	Group
+	ld	[%g1 + 0x08], %f2	! LSU	Group
+	add	%o1, 1, %o1		! IEU0
+	add	%g1, %o5, %g1		! IEU1
+	fmuls	%f0, M0, %f3		! FGM
+	fmuls	%f1, M4, %f7		! FGM	Group
+	fmuls	%f0, M1, %f4		! FGM	Group
+	fmuls	%f1, M5, %f8		! FGM	Group
+	fmuls	%f0, M2, %f5		! FGM	Group	f3 available
+	fmuls	%f1, M6, %f9		! FGM	Group	f7 available
+	fadds	%f3, %f7, %f3		! FGA
+	fmuls	%f0, M3, %f6		! FGM	Group	f4 available
+	fmuls	%f1, M7, %f10		! FGM	Group	f8 available
+	fadds	%f4, %f8, %f4		! FGA
+	fmuls	%f2, M8, %f7		! FGM	Group	f5 available
+	fmuls	%f2, M9, %f8		! FGM	Group	f9,f3 available
+	fadds	%f5, %f9, %f5		! FGA
+	fmuls	%f2, M10, %f9		! FGM	Group	f6 available
+	fadds	%f6, %f10, %f6		! FGA	Group	f10,f4 available
+	fmuls	%f2, M11, %f10		! FGM
+	fadds	%f3, M12, %f3		! FGA	Group	f7 available
+	fadds	%f4, M13, %f4		! FGA	Group	f8,f5 available
+	fadds	%f5, M14, %f5		! FGA	Group	f9 available
+	fadds	%f6, M15, %f6		! FGA	Group	f10,f6 available
+	fadds	%f3, %f7, %f3		! FGA	Group	f3 available
+	st	%f3, [%g2 + 0x00]	! LSU
+	fadds	%f4, %f8, %f4		! FGA	Group	f4 available
+	st	%f4, [%g2 + 0x04]	! LSU
+	fadds	%f5, %f9, %f5		! FGA	Group	f5 available
+	st	%f5, [%g2 + 0x08]	! LSU
+	fadds	%f6, %f10, %f6		! FGA	Group	f6 available
+	st	%f6, [%g2 + 0x0c]	! LSU
+	cmp	%o1, %g3		! IEU1
+	bne	1b			! CTI
+	 add	%g2, 0x10, %g2		! IEU0	Group
+2:
+	ba	__set_v4f_4
+	 nop
+
+	.globl	_mesa_sparc_transform_points3_identity
+_mesa_sparc_transform_points3_identity:
+	ld	[%o2 + V4F_STRIDE], %o5
+	LDPTR	[%o2 + V4F_START], %g1
+	LDPTR	[%o0 + V4F_START], %g2
+	ld	[%o2 + V4F_COUNT], %g3
+
+	cmp	%g3, 0
+	st	%g3, [%o0 + V4F_COUNT]
+	be	2f
+	 clr	%o1
+
+1:	ld	[%g1 + 0x00], %f0
+	ld	[%g1 + 0x04], %f1
+	ld	[%g1 + 0x08], %f2
+	add	%o1, 1, %o1
+	add	%g1, %o5, %g1
+	cmp	%o1, %g3
+	st	%f0, [%g2 + 0x00]
+	st	%f1, [%g2 + 0x04]
+	st	%f2, [%g2 + 0x08]
+	bne	1b
+	 add	%g2, 0x10, %g2
+2:
+	ba	__set_v4f_3
+	 nop
+
+	.globl	_mesa_sparc_transform_points3_2d
+_mesa_sparc_transform_points3_2d:
+	ld	[%o2 + V4F_STRIDE], %o5
+	LDPTR	[%o2 + V4F_START], %g1
+	LDPTR	[%o0 + V4F_START], %g2
+	ld	[%o2 + V4F_COUNT], %g3
+
+	LDMATRIX_0_1_4_5_12_13(%o1)
+
+	cmp	%g3, 0
+	st	%g3, [%o0 + V4F_COUNT]
+	be	2f
+	 clr	%o1
+
+1:	ld	[%g1 + 0x00], %f0	! LSU	Group
+	ld	[%g1 + 0x04], %f1	! LSU	Group
+	ld	[%g1 + 0x08], %f2	! LSU	Group
+	add	%o1, 1, %o1		! IEU0
+	add	%g1, %o5, %g1		! IEU1
+	fmuls	%f0, M0, %f3		! FGM
+	fmuls	%f0, M1, %f4		! FGM	Group
+	fmuls	%f1, M4, %f6		! FGM	Group
+	fmuls	%f1, M5, %f7		! FGM	Group
+	fadds	%f3, M12, %f3		! FGA	Group	f3 available
+	fadds	%f4, M13, %f4		! FGA	Group	f4 available
+	fadds	%f3, %f6, %f3		! FGA	Group	f6 available
+	st	%f3, [%g2 + 0x00]	! LSU
+	fadds	%f4, %f7, %f4		! FGA	Group	f7 available
+	st	%f4, [%g2 + 0x04]	! LSU
+	st	%f2, [%g2 + 0x08]	! LSU	Group
+	cmp	%o1, %g3		! IEU1
+	bne	1b			! CTI
+	 add	%g2, 0x10, %g2		! IEU0	Group
+2:
+	ba	__set_v4f_3
+	 nop
+
+	.globl	_mesa_sparc_transform_points3_2d_no_rot
+_mesa_sparc_transform_points3_2d_no_rot:
+	ld	[%o2 + V4F_STRIDE], %o5
+	LDPTR	[%o2 + V4F_START], %g1
+	LDPTR	[%o0 + V4F_START], %g2
+	ld	[%o2 + V4F_COUNT], %g3
+
+	LDMATRIX_0_5_12_13(%o1)
+
+	cmp	%g3, 0
+	st	%g3, [%o0 + V4F_COUNT]
+	be	2f
+	 clr	%o1
+
+1:	ld	[%g1 + 0x00], %f0	! LSU	Group
+	ld	[%g1 + 0x04], %f1	! LSU	Group
+	ld	[%g1 + 0x08], %f2	! LSU	Group
+	add	%o1, 1, %o1		! IEU0
+	add	%g1, %o5, %g1		! IEU1
+	fmuls	%f0, M0, %f3		! FGM
+	fmuls	%f1, M5, %f4		! FGM	Group
+	st	%f2, [%g2 + 0x08]	! LSU
+	fadds	%f3, M12, %f3		! FGA	Group
+	st	%f3, [%g2 + 0x00]	! LSU
+	fadds	%f4, M13, %f4		! FGA	Group
+	st	%f4, [%g2 + 0x04]	! LSU
+	cmp	%o1, %g3		! IEU1
+	bne	1b			! CTI
+	 add	%g2, 0x10, %g2		! IEU0	Group
+2:
+	ba	__set_v4f_3
+	 nop
+
+	.globl	_mesa_sparc_transform_points3_3d
+_mesa_sparc_transform_points3_3d:
+	ld	[%o2 + V4F_STRIDE], %o5
+	LDPTR	[%o2 + V4F_START], %g1
+	LDPTR	[%o0 + V4F_START], %g2
+	ld	[%o2 + V4F_COUNT], %g3
+
+	LDMATRIX_0_1_2_4_5_6_8_9_10_12_13_14(%o1)
+
+	cmp	%g3, 0
+	st	%g3, [%o0 + V4F_COUNT]
+	be	2f
+	 clr	%o1
+
+1:	ld	[%g1 + 0x00], %f0	! LSU	Group
+	ld	[%g1 + 0x04], %f1	! LSU	Group
+	ld	[%g1 + 0x08], %f2	! LSU	Group
+	add	%o1, 1, %o1		! IEU0
+	add	%g1, %o5, %g1		! IEU1
+	fmuls	%f0, M0, %f3		! FGM
+	fmuls	%f1, M4, %f6		! FGM	Group
+	fmuls	%f0, M1, %f4		! FGM	Group
+	fmuls	%f1, M5, %f7		! FGM	Group
+	fmuls	%f0, M2, %f5		! FGM	Group	f3 available
+	fmuls	%f1, M6, %f8		! FGM	Group	f6 available
+	fadds	%f3, %f6, %f3		! FGA
+	fmuls	%f2, M8, %f9		! FGM	Group	f4 available
+	fmuls	%f2, M9, %f10		! FGM	Group	f7 available
+	fadds	%f4, %f7, %f4		! FGA
+	fmuls	%f2, M10, %f11		! FGM	Group	f5 available
+	fadds	%f5, %f8, %f5		! FGA	Group	f8, f3 available
+	fadds	%f3, %f9, %f3		! FGA	Group	f9 available
+	fadds	%f4, %f10, %f4		! FGA	Group	f10, f4 available
+	fadds	%f5, %f11, %f5		! FGA	Group	stall, f11, f5 available
+	fadds	%f3, M12, %f3		! FGA	Group	f3 available
+	st	%f3, [%g2 + 0x00]	! LSU
+	fadds	%f4, M13, %f4		! FGA	Group	f4 available
+	st	%f4, [%g2 + 0x04]	! LSU
+	fadds	%f5, M14, %f5		! FGA	Group	f5 available
+	st	%f5, [%g2 + 0x08]	! LSU
+	cmp	%o1, %g3		! IEU1
+	bne	1b			! CTI
+	 add	%g2, 0x10, %g2		! IEU0	Group
+2:
+	ba	__set_v4f_3
+	 nop
+
+	.globl	_mesa_sparc_transform_points3_3d_no_rot
+_mesa_sparc_transform_points3_3d_no_rot:
+	ld	[%o2 + V4F_STRIDE], %o5
+	LDPTR	[%o2 + V4F_START], %g1
+	LDPTR	[%o0 + V4F_START], %g2
+	ld	[%o2 + V4F_COUNT], %g3
+
+	LDMATRIX_0_5_10_12_13_14(%o1)
+
+	cmp	%g3, 0
+	st	%g3, [%o0 + V4F_COUNT]
+	be	2f
+	 clr	%o1
+
+1:	ld	[%g1 + 0x00], %f0	! LSU	Group
+	ld	[%g1 + 0x04], %f1	! LSU	Group
+	ld	[%g1 + 0x08], %f2	! LSU	Group
+	add	%o1, 1, %o1		! IEU0
+	add	%g1, %o5, %g1		! IEU1
+	cmp	%o1, %g3		! IEU1	Group
+	fmuls	%f0, M0, %f3		! FGM
+	fmuls	%f1, M5, %f4		! FGM	Group
+	fmuls	%f2, M10, %f5		! FGM	Group
+	fadds	%f3, M12, %f3		! FGA	Group, stall, f3 available
+	st	%f3, [%g2 + 0x00]	! LSU
+	fadds	%f4, M13, %f4		! FGA	Group, f4 available
+	st	%f4, [%g2 + 0x04]	! LSU
+	fadds	%f5, M14, %f5		! FGA	Group, f5 available
+	st	%f5, [%g2 + 0x08]	! LEU
+	bne	1b			! CTI
+	 add	%g2, 0x10, %g2		! IEU0	Group
+2:
+	ba	__set_v4f_3
+	 nop
+
+	.globl	_mesa_sparc_transform_points3_perspective
+_mesa_sparc_transform_points3_perspective:
+	ld	[%o2 + V4F_STRIDE], %o5
+	LDPTR	[%o2 + V4F_START], %g1
+	LDPTR	[%o0 + V4F_START], %g2
+	ld	[%o2 + V4F_COUNT], %g3
+
+	LDMATRIX_0_5_8_9_10_14(%o1)
+
+	cmp	%g3, 0
+	st	%g3, [%o0 + V4F_COUNT]
+	be	2f
+	 clr	%o1
+
+1:	ld	[%g1 + 0x00], %f0	! LSU	Group
+	ld	[%g1 + 0x04], %f1	! LSU	Group
+	ld	[%g1 + 0x08], %f2	! LSU	Group
+	add	%o1, 1, %o1		! IEU0
+	add	%g1, %o5, %g1		! IEU1
+	fmuls	%f0, M0, %f3		! FGM
+	fmuls	%f2, M8, %f6		! FGM	Group
+	fmuls	%f1, M5, %f4		! FGM	Group
+	fmuls	%f2, M9, %f7		! FGM	Group
+	fmuls	%f2, M10, %f5		! FGM	Group	f3 available
+	fadds	%f3, %f6, %f3		! FGA	Group	f6 available
+	st	%f3, [%g2 + 0x00]	! LSU
+	fadds	%f4, %f7, %f4		! FGA	Group	stall, f4, f7 available
+	st	%f4, [%g2 + 0x04]	! LSU
+	fadds	%f5, M14, %f5		! FGA	Group
+	st	%f5, [%g2 + 0x08]	! LSU
+	fnegs	%f2, %f6		! FGA	Group
+	st	%f6, [%g2 + 0x0c]	! LSU
+	cmp	%o1, %g3		! IEU1
+	bne	1b			! CTI
+	 add	%g2, 0x10, %g2		! IEU0	Group
+2:
+	ba	__set_v4f_4
+	 nop
+
+	.globl	_mesa_sparc_transform_points4_general
+_mesa_sparc_transform_points4_general:
+	ld	[%o2 + V4F_STRIDE], %o5
+	LDPTR	[%o2 + V4F_START], %g1
+	LDPTR	[%o0 + V4F_START], %g2
+	ld	[%o2 + V4F_COUNT], %g3
+
+	LDMATRIX_0_1_2_3_4_5_6_7_8_9_10_11_12_13_14_15(%o1)
+
+	cmp	%g3, 0
+	st	%g3, [%o0 + V4F_COUNT]
+	be	2f
+	 clr	%o1
+
+1:	ld	[%g1 + 0x00], %f0	! LSU	Group
+	ld	[%g1 + 0x04], %f1	! LSU	Group
+	ld	[%g1 + 0x08], %f2	! LSU	Group
+	ld	[%g1 + 0x0c], %f3	! LSU	Group
+	add	%o1, 1, %o1		! IEU0
+	add	%g1, %o5, %g1		! IEU1
+	fmuls	%f0, M0, %f4		! FGM	Group
+	fmuls	%f1, M4, %f8		! FGM	Group
+	fmuls	%f0, M1, %f5		! FGM	Group
+	fmuls	%f1, M5, %f9		! FGM	Group
+	fmuls	%f0, M2, %f6		! FGM	Group	f4 available
+	fmuls	%f1, M6, %f10		! FGM	Group	f8 available
+	fadds	%f4, %f8, %f4		! FGA
+	fmuls	%f0, M3, %f7		! FGM	Group	f5 available
+	fmuls	%f1, M7, %f11		! FGM	Group	f9 available
+	fadds	%f5, %f9, %f5		! FGA
+	fmuls	%f2, M8, %f12		! FGM	Group	f6 available
+	fmuls	%f2, M9, %f13		! FGM	Group	f10, f4 available
+	fadds	%f6, %f10, %f6		! FGA
+	fmuls	%f2, M10, %f14		! FGM	Group	f7 available
+	fmuls	%f2, M11, %f15		! FGM	Group	f11, f5 available
+	fadds	%f7, %f11, %f7		! FGA
+	fmuls	%f3, M12, %f8		! FGM	Group	f12 available
+	fadds	%f4, %f12, %f4		! FGA
+	fmuls	%f3, M13, %f9		! FGM	Group	f13, f6 available
+	fadds	%f5, %f13, %f5		! FGA
+	fmuls	%f3, M14, %f10		! FGM	Group	f14 available
+	fadds	%f6, %f14, %f6		! FGA
+	fmuls	%f3, M15, %f11		! FGM	Group	f15, f7 available
+	fadds	%f7, %f15, %f7		! FGA
+	fadds	%f4, %f8, %f4		! FGA	Group	f8, f4 available
+	st	%f4, [%g2 + 0x00]	! LSU
+	fadds	%f5, %f9, %f5		! FGA	Group	f9, f5 available
+	st	%f5, [%g2 + 0x04]	! LSU
+	fadds	%f6, %f10, %f6		! FGA	Group	f10, f6 available
+	st	%f6, [%g2 + 0x08]	! LSU
+	fadds	%f7, %f11, %f7		! FGA	Group	f11, f7 available
+	st	%f7, [%g2 + 0x0c]	! LSU
+	cmp	%o1, %g3		! IEU1
+	bne	1b			! CTI
+	 add	%g2, 0x10, %g2		! IEU0	Group
+2:
+	ba	__set_v4f_4
+	 nop
+
+	.globl	_mesa_sparc_transform_points4_identity
+_mesa_sparc_transform_points4_identity:
+	ld	[%o2 + V4F_STRIDE], %o5
+	LDPTR	[%o2 + V4F_START], %g1
+	LDPTR	[%o0 + V4F_START], %g2
+	ld	[%o2 + V4F_COUNT], %g3
+
+	cmp	%g3, 0
+	st	%g3, [%o0 + V4F_COUNT]
+	be	2f
+	 clr	%o1
+
+1:	ld	[%g1 + 0x00], %f0
+	ld	[%g1 + 0x04], %f1
+	ld	[%g1 + 0x08], %f2
+	add	%o1, 1, %o1
+	ld	[%g1 + 0x0c], %f3
+	add	%g1, %o5, %g1
+	st	%f0, [%g2 + 0x00]
+	st	%f1, [%g2 + 0x04]
+	st	%f2, [%g2 + 0x08]
+	cmp	%o1, %g3
+	st	%f3, [%g2 + 0x0c]
+	bne	1b
+	 add	%g2, 0x10, %g2
+2:
+	ba	__set_v4f_4
+	 nop
+
+	.globl	_mesa_sparc_transform_points4_2d
+_mesa_sparc_transform_points4_2d:
+	ld	[%o2 + V4F_STRIDE], %o5
+	LDPTR	[%o2 + V4F_START], %g1
+	LDPTR	[%o0 + V4F_START], %g2
+	ld	[%o2 + V4F_COUNT], %g3
+
+	LDMATRIX_0_1_4_5_12_13(%o1)
+
+	cmp	%g3, 0
+	st	%g3, [%o0 + V4F_COUNT]
+	be	2f
+	 clr	%o1
+
+1:	ld	[%g1 + 0x00], %f0	! LSU	Group
+	ld	[%g1 + 0x04], %f1	! LSU	Group
+	ld	[%g1 + 0x08], %f2	! LSU	Group
+	ld	[%g1 + 0x0c], %f3	! LSU	Group
+	add	%o1, 1, %o1		! IEU0
+	add	%g1, %o5, %g1		! IEU1
+	fmuls	%f0, M0, %f4		! FGM
+	fmuls	%f1, M4, %f8		! FGM	Group
+	fmuls	%f0, M1, %f5		! FGM	Group
+	fmuls	%f1, M5, %f9		! FGM	Group	f4 available
+	fmuls	%f3, M12, %f12		! FGM	Group
+	fmuls	%f3, M13, %f13		! FGM	Group	f8 available
+	fadds	%f4, %f8, %f4		! FGA
+	fadds	%f5, %f9, %f5		! FGA	Group	stall, f5, f9 available
+	fadds	%f4, %f12, %f4		! FGA	Group	2 cycle stall, f4, f12, f13 avail
+	st	%f4, [%g2 + 0x00]	! LSU
+	fadds	%f5, %f13, %f5		! FGA	Group	f5 available
+	st	%f5, [%g2 + 0x04]	! LSU
+	st	%f2, [%g2 + 0x08]	! LSU	Group
+	st	%f3, [%g2 + 0x0c]	! LSU	Group
+	cmp	%o1, %g3		! IEU1
+	bne	1b			! CTI
+	 add	%g2, 0x10, %g2		! IEU0	Group
+2:
+	ba	__set_v4f_4
+	 nop
+
+	.globl	_mesa_sparc_transform_points4_2d_no_rot
+_mesa_sparc_transform_points4_2d_no_rot:
+	ld	[%o2 + V4F_STRIDE], %o5
+	LDPTR	[%o2 + V4F_START], %g1
+	LDPTR	[%o0 + V4F_START], %g2
+	ld	[%o2 + V4F_COUNT], %g3
+
+	LDMATRIX_0_1_4_5_12_13(%o1)
+
+	cmp	%g3, 0
+	st	%g3, [%o0 + V4F_COUNT]
+	be	2f
+	 clr	%o1
+
+1:	ld	[%g1 + 0x00], %f0
+	ld	[%g1 + 0x04], %f1
+	ld	[%g1 + 0x08], %f2
+	ld	[%g1 + 0x0c], %f3
+	add	%o1, 1, %o1
+	add	%g1, %o5, %g1
+	fmuls	%f0, M0, %f4
+	fmuls	%f3, M12, %f8
+	fmuls	%f1, M5, %f5
+	fmuls	%f3, M13, %f9
+	fadds	%f4, %f8, %f4
+	st	%f4, [%g2 + 0x00]
+	fadds	%f5, %f9, %f5
+	st	%f5, [%g2 + 0x04]
+	st	%f2, [%g2 + 0x08]
+	st	%f3, [%g2 + 0x0c]
+	cmp	%o1, %g3
+	bne	1b
+	 add	%g2, 0x10, %g2
+2:
+	ba	__set_v4f_4
+	 nop
+
+	.globl	_mesa_sparc_transform_points4_3d
+_mesa_sparc_transform_points4_3d:
+	ld	[%o2 + V4F_STRIDE], %o5
+	LDPTR	[%o2 + V4F_START], %g1
+	LDPTR	[%o0 + V4F_START], %g2
+	ld	[%o2 + V4F_COUNT], %g3
+
+	LDMATRIX_0_1_2_4_5_6_8_9_10_12_13_14(%o1)
+
+	cmp	%g3, 0
+	st	%g3, [%o0 + V4F_COUNT]
+	be	2f
+	 clr	%o1
+
+1:	ld	[%g1 + 0x00], %f0	! LSU	Group
+	ld	[%g1 + 0x04], %f1	! LSU	Group
+	ld	[%g1 + 0x08], %f2	! LSU	Group
+	ld	[%g1 + 0x0c], %f3	! LSU	Group
+	add	%o1, 1, %o1		! IEU0
+	add	%g1, %o5, %g1		! IEU1
+	fmuls	%f0, M0, %f4		! FGM
+	fmuls	%f1, M4, %f7		! FGM	Group
+	fmuls	%f0, M1, %f5		! FGM	Group
+	fmuls	%f1, M5, %f8		! FGM	Group
+	fmuls	%f0, M2, %f6		! FGM	Group	f4 available
+	fmuls	%f1, M6, %f9		! FGM	Group	f7 available
+	fadds	%f4, %f7, %f4		! FGA
+	fmuls	%f2, M8, %f10		! FGM	Group	f5 available
+	fmuls	%f2, M9, %f11		! FGM	Group	f8 available
+	fadds	%f5, %f8, %f5		! FGA
+	fmuls	%f2, M10, %f12		! FGM	Group	f6 available
+	fmuls	%f3, M12, %f13		! FGM	Group	f9, f4 available
+	fadds	%f6, %f9, %f6		! FGA
+	fmuls	%f3, M13, %f14		! FGM	Group	f10 available
+	fadds	%f4, %f10, %f4		! FGA
+	fmuls	%f3, M14, %f15		! FGM	Group	f11, f5 available
+	fadds	%f5, %f11, %f5		! FGA
+	fadds	%f6, %f12, %f6		! FGA	Group	stall, f12, f13, f6 available
+	fadds	%f4, %f13, %f4		! FGA	Group	f14, f4 available
+	st	%f4, [%g2 + 0x00]	! LSU
+	fadds	%f5, %f14, %f5		! FGA	Group	f15, f5 available
+	st	%f5, [%g2 + 0x04]	! LSU
+	fadds	%f6, %f15, %f6		! FGA	Group	f6 available
+	st	%f6, [%g2 + 0x08]	! LSU
+	st	%f3, [%g2 + 0x0c]	! LSU	Group
+	cmp	%o1, %g3		! IEU1
+	bne	1b			! CTI
+	 add	%g2, 0x10, %g2		! IEU0	Group
+2:
+	ba	__set_v4f_4
+	 nop
+
+	.globl	_mesa_sparc_transform_points4_3d_no_rot
+_mesa_sparc_transform_points4_3d_no_rot:
+	ld	[%o2 + V4F_STRIDE], %o5
+	LDPTR	[%o2 + V4F_START], %g1
+	LDPTR	[%o0 + V4F_START], %g2
+	ld	[%o2 + V4F_COUNT], %g3
+
+	LDMATRIX_0_5_10_12_13_14(%o1)
+
+	cmp	%g3, 0
+	st	%g3, [%o0 + V4F_COUNT]
+	be	2f
+	 clr	%o1
+
+1:	ld	[%g1 + 0x00], %f0	! LSU	Group
+	ld	[%g1 + 0x04], %f1	! LSU	Group
+	ld	[%g1 + 0x08], %f2	! LSU	Group
+	ld	[%g1 + 0x0c], %f3	! LSU	Group
+	add	%o1, 1, %o1		! IEU0
+	add	%g1, %o5, %g1		! IEU1
+	fmuls	%f0, M0, %f4		! FGM
+	fmuls	%f3, M12, %f7		! FGM	Group
+	fmuls	%f1, M5, %f5		! FGM	Group
+	fmuls	%f3, M13, %f8		! FGM	Group
+	fmuls	%f2, M10, %f6		! FGM	Group	f4 available
+	fmuls	%f3, M14, %f9		! FGM	Group	f7 available
+	fadds	%f4, %f7, %f4		! FGA
+	st	%f4, [%g2 + 0x00]	! LSU
+	fadds	%f5, %f8, %f5		! FGA	Group	stall, f5, f8 available
+	st	%f5, [%g2 + 0x04]	! LSU
+	fadds	%f6, %f9, %f6		! FGA	Group	stall, f6, f9 available
+	st	%f6, [%g2 + 0x08]	! LSU
+	st	%f3, [%g2 + 0x0c]	! LSU	Group
+	cmp	%o1, %g3		! IEU1
+	bne	1b			! CTI
+	 add	%g2, 0x10, %g2		! IEU0	Group
+2:
+	ba	__set_v4f_4
+	 nop
+
+	.globl	_mesa_sparc_transform_points4_perspective
+_mesa_sparc_transform_points4_perspective:
+	ld	[%o2 + V4F_STRIDE], %o5
+	LDPTR	[%o2 + V4F_START], %g1
+	LDPTR	[%o0 + V4F_START], %g2
+	ld	[%o2 + V4F_COUNT], %g3
+
+	LDMATRIX_0_5_8_9_10_14(%o1)
+
+	cmp	%g3, 0
+	st	%g3, [%o0 + V4F_COUNT]
+	be	2f
+	 clr	%o1
+
+1:	ld	[%g1 + 0x00], %f0	! LSU	Group
+	ld	[%g1 + 0x04], %f1	! LSU	Group
+	ld	[%g1 + 0x08], %f2	! LSU	Group
+	ld	[%g1 + 0x0c], %f3	! LSU	Group
+	add	%o1, 1, %o1		! IEU0
+	add	%g1, %o5, %g1		! IEU1
+	fmuls	%f0, M0, %f4		! FGM
+	fmuls	%f2, M8, %f7		! FGM	Group
+	fmuls	%f1, M5, %f5		! FGM	Group
+	fmuls	%f2, M9, %f8		! FGM	Group
+	fmuls	%f2, M10, %f6		! FGM	Group	f4 available
+	fmuls	%f3, M14, %f9		! FGM	Group	f7 available
+	fadds	%f4, %f7, %f4		! FGA
+	st	%f4, [%g2 + 0x00]	! LSU
+	fadds	%f5, %f8, %f5		! FGA	Group	stall, f5, f8 available
+	st	%f5, [%g2 + 0x04]	! LSU
+	fadds	%f6, %f9, %f6		! FGA	Group	stall, f6, f9 available
+	st	%f6, [%g2 + 0x08]	! LSU
+	fnegs	%f2, %f7		! FGA	Group
+	st	%f7, [%g2 + 0x0c]	! LSU
+	cmp	%o1, %g3		! IEU1
+	bne	1b			! CTI
+	 add	%g2, 0x10, %g2		! IEU0	Group
+2:
+	ba	__set_v4f_4
+	 nop
diff --git a/reactos/lib/mesa32/src/swrast/s_aaline.c b/reactos/lib/mesa32/src/swrast/s_aaline.c
new file mode 100644
index 00000000000..e7dc29e6bc7
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_aaline.c
@@ -0,0 +1,554 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.0.3
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "imports.h"
+#include "macros.h"
+#include "swrast/s_aaline.h"
+#include "swrast/s_context.h"
+#include "swrast/s_span.h"
+#include "swrast/swrast.h"
+#include "mtypes.h"
+
+
+#define SUB_PIXEL 4
+
+
+/*
+ * Info about the AA line we're rendering
+ */
+struct LineInfo
+{
+   GLfloat x0, y0;        /* start */
+   GLfloat x1, y1;        /* end */
+   GLfloat dx, dy;        /* direction vector */
+   GLfloat len;           /* length */
+   GLfloat halfWidth;     /* half of line width */
+   GLfloat xAdj, yAdj;    /* X and Y adjustment for quad corners around line */
+   /* for coverage computation */
+   GLfloat qx0, qy0;      /* quad vertices */
+   GLfloat qx1, qy1;
+   GLfloat qx2, qy2;
+   GLfloat qx3, qy3;
+   GLfloat ex0, ey0;      /* quad edge vectors */
+   GLfloat ex1, ey1;
+   GLfloat ex2, ey2;
+   GLfloat ex3, ey3;
+
+   /* DO_Z */
+   GLfloat zPlane[4];
+   /* DO_FOG */
+   GLfloat fPlane[4];
+   /* DO_RGBA */
+   GLfloat rPlane[4], gPlane[4], bPlane[4], aPlane[4];
+   /* DO_INDEX */
+   GLfloat iPlane[4];
+   /* DO_SPEC */
+   GLfloat srPlane[4], sgPlane[4], sbPlane[4];
+   /* DO_TEX or DO_MULTITEX */
+   GLfloat sPlane[MAX_TEXTURE_COORD_UNITS][4];
+   GLfloat tPlane[MAX_TEXTURE_COORD_UNITS][4];
+   GLfloat uPlane[MAX_TEXTURE_COORD_UNITS][4];
+   GLfloat vPlane[MAX_TEXTURE_COORD_UNITS][4];
+   GLfloat lambda[MAX_TEXTURE_COORD_UNITS];
+   GLfloat texWidth[MAX_TEXTURE_COORD_UNITS];
+   GLfloat texHeight[MAX_TEXTURE_COORD_UNITS];
+
+   struct sw_span span;
+};
+
+
+
+/*
+ * Compute the equation of a plane used to interpolate line fragment data
+ * such as color, Z, texture coords, etc.
+ * Input: (x0, y0) and (x1,y1) are the endpoints of the line.
+ *        z0, and z1 are the end point values to interpolate.
+ * Output:  plane - the plane equation.
+ *
+ * Note: we don't really have enough parameters to specify a plane.
+ * We take the endpoints of the line and compute a plane such that
+ * the cross product of the line vector and the plane normal is
+ * parallel to the projection plane.
+ */
+static void
+compute_plane(GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1,
+              GLfloat z0, GLfloat z1, GLfloat plane[4])
+{
+#if 0
+   /* original */
+   const GLfloat px = x1 - x0;
+   const GLfloat py = y1 - y0;
+   const GLfloat pz = z1 - z0;
+   const GLfloat qx = -py;
+   const GLfloat qy = px;
+   const GLfloat qz = 0;
+   const GLfloat a = py * qz - pz * qy;
+   const GLfloat b = pz * qx - px * qz;
+   const GLfloat c = px * qy - py * qx;
+   const GLfloat d = -(a * x0 + b * y0 + c * z0);
+   plane[0] = a;
+   plane[1] = b;
+   plane[2] = c;
+   plane[3] = d;
+#else
+   /* simplified */
+   const GLfloat px = x1 - x0;
+   const GLfloat py = y1 - y0;
+   const GLfloat pz = z0 - z1;
+   const GLfloat a = pz * px;
+   const GLfloat b = pz * py;
+   const GLfloat c = px * px + py * py;
+   const GLfloat d = -(a * x0 + b * y0 + c * z0);
+   if (a == 0.0 && b == 0.0 && c == 0.0 && d == 0.0) {
+      plane[0] = 0.0;
+      plane[1] = 0.0;
+      plane[2] = 1.0;
+      plane[3] = 0.0;
+   }
+   else {
+      plane[0] = a;
+      plane[1] = b;
+      plane[2] = c;
+      plane[3] = d;
+   }
+#endif
+}
+
+
+static INLINE void
+constant_plane(GLfloat value, GLfloat plane[4])
+{
+   plane[0] = 0.0;
+   plane[1] = 0.0;
+   plane[2] = -1.0;
+   plane[3] = value;
+}
+
+
+static INLINE GLfloat
+solve_plane(GLfloat x, GLfloat y, const GLfloat plane[4])
+{
+   const GLfloat z = (plane[3] + plane[0] * x + plane[1] * y) / -plane[2];
+   return z;
+}
+
+#define SOLVE_PLANE(X, Y, PLANE) \
+   ((PLANE[3] + PLANE[0] * (X) + PLANE[1] * (Y)) / -PLANE[2])
+
+
+/*
+ * Return 1 / solve_plane().
+ */
+static INLINE GLfloat
+solve_plane_recip(GLfloat x, GLfloat y, const GLfloat plane[4])
+{
+   const GLfloat denom = plane[3] + plane[0] * x + plane[1] * y;
+   if (denom == 0.0)
+      return 0.0;
+   else
+      return -plane[2] / denom;
+}
+
+
+/*
+ * Solve plane and return clamped GLchan value.
+ */
+static INLINE GLchan
+solve_plane_chan(GLfloat x, GLfloat y, const GLfloat plane[4])
+{
+   const GLfloat z = (plane[3] + plane[0] * x + plane[1] * y) / -plane[2];
+#if CHAN_TYPE == GL_FLOAT
+   return CLAMP(z, 0.0F, CHAN_MAXF);
+#else
+   if (z < 0)
+      return 0;
+   else if (z > CHAN_MAX)
+      return CHAN_MAX;
+   return (GLchan) IROUND_POS(z);
+#endif
+}
+
+
+/*
+ * Compute mipmap level of detail.
+ */
+static INLINE GLfloat
+compute_lambda(const GLfloat sPlane[4], const GLfloat tPlane[4],
+               GLfloat invQ, GLfloat width, GLfloat height)
+{
+   GLfloat dudx = sPlane[0] / sPlane[2] * invQ * width;
+   GLfloat dudy = sPlane[1] / sPlane[2] * invQ * width;
+   GLfloat dvdx = tPlane[0] / tPlane[2] * invQ * height;
+   GLfloat dvdy = tPlane[1] / tPlane[2] * invQ * height;
+   GLfloat r1 = dudx * dudx + dudy * dudy;
+   GLfloat r2 = dvdx * dvdx + dvdy * dvdy;
+   GLfloat rho2 = r1 + r2;
+   /* return log base 2 of rho */
+   if (rho2 == 0.0F)
+      return 0.0;
+   else
+      return (GLfloat) (log(rho2) * 1.442695 * 0.5);/* 1.442695 = 1/log(2) */
+}
+
+
+
+
+/*
+ * Fill in the samples[] array with the (x,y) subpixel positions of
+ * xSamples * ySamples sample positions.
+ * Note that the four corner samples are put into the first four
+ * positions of the array.  This allows us to optimize for the common
+ * case of all samples being inside the polygon.
+ */
+static void
+make_sample_table(GLint xSamples, GLint ySamples, GLfloat samples[][2])
+{
+   const GLfloat dx = 1.0F / (GLfloat) xSamples;
+   const GLfloat dy = 1.0F / (GLfloat) ySamples;
+   GLint x, y;
+   GLint i;
+
+   i = 4;
+   for (x = 0; x < xSamples; x++) {
+      for (y = 0; y < ySamples; y++) {
+         GLint j;
+         if (x == 0 && y == 0) {
+            /* lower left */
+            j = 0;
+         }
+         else if (x == xSamples - 1 && y == 0) {
+            /* lower right */
+            j = 1;
+         }
+         else if (x == 0 && y == ySamples - 1) {
+            /* upper left */
+            j = 2;
+         }
+         else if (x == xSamples - 1 && y == ySamples - 1) {
+            /* upper right */
+            j = 3;
+         }
+         else {
+            j = i++;
+         }
+         samples[j][0] = x * dx + 0.5F * dx;
+         samples[j][1] = y * dy + 0.5F * dy;
+      }
+   }
+}
+
+
+
+/*
+ * Compute how much of the given pixel's area is inside the rectangle
+ * defined by vertices v0, v1, v2, v3.
+ * Vertices MUST be specified in counter-clockwise order.
+ * Return:  coverage in [0, 1].
+ */
+static GLfloat
+compute_coveragef(const struct LineInfo *info,
+                  GLint winx, GLint winy)
+{
+   static GLfloat samples[SUB_PIXEL * SUB_PIXEL][2];
+   static GLboolean haveSamples = GL_FALSE;
+   const GLfloat x = (GLfloat) winx;
+   const GLfloat y = (GLfloat) winy;
+   GLint stop = 4, i;
+   GLfloat insideCount = SUB_PIXEL * SUB_PIXEL;
+
+   if (!haveSamples) {
+      make_sample_table(SUB_PIXEL, SUB_PIXEL, samples);
+      haveSamples = GL_TRUE;
+   }
+
+#if 0 /*DEBUG*/
+   {
+      const GLfloat area = dx0 * dy1 - dx1 * dy0;
+      assert(area >= 0.0);
+   }
+#endif
+
+   for (i = 0; i < stop; i++) {
+      const GLfloat sx = x + samples[i][0];
+      const GLfloat sy = y + samples[i][1];
+      const GLfloat fx0 = sx - info->qx0;
+      const GLfloat fy0 = sy - info->qy0;
+      const GLfloat fx1 = sx - info->qx1;
+      const GLfloat fy1 = sy - info->qy1;
+      const GLfloat fx2 = sx - info->qx2;
+      const GLfloat fy2 = sy - info->qy2;
+      const GLfloat fx3 = sx - info->qx3;
+      const GLfloat fy3 = sy - info->qy3;
+      /* cross product determines if sample is inside or outside each edge */
+      GLfloat cross0 = (info->ex0 * fy0 - info->ey0 * fx0);
+      GLfloat cross1 = (info->ex1 * fy1 - info->ey1 * fx1);
+      GLfloat cross2 = (info->ex2 * fy2 - info->ey2 * fx2);
+      GLfloat cross3 = (info->ex3 * fy3 - info->ey3 * fx3);
+      /* Check if the sample is exactly on an edge.  If so, let cross be a
+       * positive or negative value depending on the direction of the edge.
+       */
+      if (cross0 == 0.0F)
+         cross0 = info->ex0 + info->ey0;
+      if (cross1 == 0.0F)
+         cross1 = info->ex1 + info->ey1;
+      if (cross2 == 0.0F)
+         cross2 = info->ex2 + info->ey2;
+      if (cross3 == 0.0F)
+         cross3 = info->ex3 + info->ey3;
+      if (cross0 < 0.0F || cross1 < 0.0F || cross2 < 0.0F || cross3 < 0.0F) {
+         /* point is outside quadrilateral */
+         insideCount -= 1.0F;
+         stop = SUB_PIXEL * SUB_PIXEL;
+      }
+   }
+   if (stop == 4)
+      return 1.0F;
+   else
+      return insideCount * (1.0F / (SUB_PIXEL * SUB_PIXEL));
+}
+
+
+/**
+ * Compute coverage value for color index mode.
+ * XXX this may not be quite correct.
+ * \return coverage in [0,15].
+ */
+static GLfloat
+compute_coveragei(const struct LineInfo *info,
+                  GLint winx, GLint winy)
+{
+   return compute_coveragef(info, winx, winy) * 15.0F;
+}
+
+
+
+typedef void (*plot_func)(GLcontext *ctx, struct LineInfo *line,
+                          int ix, int iy);
+                         
+
+
+/*
+ * Draw an AA line segment (called many times per line when stippling)
+ */
+static void
+segment(GLcontext *ctx,
+        struct LineInfo *line,
+        plot_func plot,
+        GLfloat t0, GLfloat t1)
+{
+   const GLfloat absDx = (line->dx < 0.0F) ? -line->dx : line->dx;
+   const GLfloat absDy = (line->dy < 0.0F) ? -line->dy : line->dy;
+   /* compute the actual segment's endpoints */
+   const GLfloat x0 = line->x0 + t0 * line->dx;
+   const GLfloat y0 = line->y0 + t0 * line->dy;
+   const GLfloat x1 = line->x0 + t1 * line->dx;
+   const GLfloat y1 = line->y0 + t1 * line->dy;
+
+   /* compute vertices of the line-aligned quadrilateral */
+   line->qx0 = x0 - line->yAdj;
+   line->qy0 = y0 + line->xAdj;
+   line->qx1 = x0 + line->yAdj;
+   line->qy1 = y0 - line->xAdj;
+   line->qx2 = x1 + line->yAdj;
+   line->qy2 = y1 - line->xAdj;
+   line->qx3 = x1 - line->yAdj;
+   line->qy3 = y1 + line->xAdj;
+   /* compute the quad's edge vectors (for coverage calc) */
+   line->ex0 = line->qx1 - line->qx0;
+   line->ey0 = line->qy1 - line->qy0;
+   line->ex1 = line->qx2 - line->qx1;
+   line->ey1 = line->qy2 - line->qy1;
+   line->ex2 = line->qx3 - line->qx2;
+   line->ey2 = line->qy3 - line->qy2;
+   line->ex3 = line->qx0 - line->qx3;
+   line->ey3 = line->qy0 - line->qy3;
+
+   if (absDx > absDy) {
+      /* X-major line */
+      GLfloat dydx = line->dy / line->dx;
+      GLfloat xLeft, xRight, yBot, yTop;
+      GLint ix, ixRight;
+      if (x0 < x1) {
+         xLeft = x0 - line->halfWidth;
+         xRight = x1 + line->halfWidth;
+         if (line->dy >= 0.0) {
+            yBot = y0 - 3.0F * line->halfWidth;
+            yTop = y0 + line->halfWidth;
+         }
+         else {
+            yBot = y0 - line->halfWidth;
+            yTop = y0 + 3.0F * line->halfWidth;
+         }
+      }
+      else {
+         xLeft = x1 - line->halfWidth;
+         xRight = x0 + line->halfWidth;
+         if (line->dy <= 0.0) {
+            yBot = y1 - 3.0F * line->halfWidth;
+            yTop = y1 + line->halfWidth;
+         }
+         else {
+            yBot = y1 - line->halfWidth;
+            yTop = y1 + 3.0F * line->halfWidth;
+         }
+      }
+
+      /* scan along the line, left-to-right */
+      ixRight = (GLint) (xRight + 1.0F);
+
+      /*printf("avg span height: %g\n", yTop - yBot);*/
+      for (ix = (GLint) xLeft; ix < ixRight; ix++) {
+         const GLint iyBot = (GLint) yBot;
+         const GLint iyTop = (GLint) (yTop + 1.0F);
+         GLint iy;
+         /* scan across the line, bottom-to-top */
+         for (iy = iyBot; iy < iyTop; iy++) {
+            (*plot)(ctx, line, ix, iy);
+         }
+         yBot += dydx;
+         yTop += dydx;
+      }
+   }
+   else {
+      /* Y-major line */
+      GLfloat dxdy = line->dx / line->dy;
+      GLfloat yBot, yTop, xLeft, xRight;
+      GLint iy, iyTop;
+      if (y0 < y1) {
+         yBot = y0 - line->halfWidth;
+         yTop = y1 + line->halfWidth;
+         if (line->dx >= 0.0) {
+            xLeft = x0 - 3.0F * line->halfWidth;
+            xRight = x0 + line->halfWidth;
+         }
+         else {
+            xLeft = x0 - line->halfWidth;
+            xRight = x0 + 3.0F * line->halfWidth;
+         }
+      }
+      else {
+         yBot = y1 - line->halfWidth;
+         yTop = y0 + line->halfWidth;
+         if (line->dx <= 0.0) {
+            xLeft = x1 - 3.0F * line->halfWidth;
+            xRight = x1 + line->halfWidth;
+         }
+         else {
+            xLeft = x1 - line->halfWidth;
+            xRight = x1 + 3.0F * line->halfWidth;
+         }
+      }
+
+      /* scan along the line, bottom-to-top */
+      iyTop = (GLint) (yTop + 1.0F);
+
+      /*printf("avg span width: %g\n", xRight - xLeft);*/
+      for (iy = (GLint) yBot; iy < iyTop; iy++) {
+         const GLint ixLeft = (GLint) xLeft;
+         const GLint ixRight = (GLint) (xRight + 1.0F);
+         GLint ix;
+         /* scan across the line, left-to-right */
+         for (ix = ixLeft; ix < ixRight; ix++) {
+            (*plot)(ctx, line, ix, iy);
+         }
+         xLeft += dxdy;
+         xRight += dxdy;
+      }
+   }
+}
+
+
+#define NAME(x) aa_ci_##x
+#define DO_Z
+#define DO_FOG
+#define DO_INDEX
+#include "s_aalinetemp.h"
+
+
+#define NAME(x) aa_rgba_##x
+#define DO_Z
+#define DO_FOG
+#define DO_RGBA
+#include "s_aalinetemp.h"
+
+
+#define NAME(x)  aa_tex_rgba_##x
+#define DO_Z
+#define DO_FOG
+#define DO_RGBA
+#define DO_TEX
+#include "s_aalinetemp.h"
+
+
+#define NAME(x)  aa_multitex_rgba_##x
+#define DO_Z
+#define DO_FOG
+#define DO_RGBA
+#define DO_MULTITEX
+#include "s_aalinetemp.h"
+
+
+#define NAME(x)  aa_multitex_spec_##x
+#define DO_Z
+#define DO_FOG
+#define DO_RGBA
+#define DO_MULTITEX
+#define DO_SPEC
+#include "s_aalinetemp.h"
+
+
+
+void
+_swrast_choose_aa_line_function(GLcontext *ctx)
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+
+   ASSERT(ctx->Line.SmoothFlag);
+
+   if (ctx->Visual.rgbMode) {
+      /* RGBA */
+      if (ctx->Texture._EnabledCoordUnits != 0) {
+         if (ctx->Texture._EnabledCoordUnits > 1) {
+            /* Multitextured! */
+            if (ctx->Light.Model.ColorControl==GL_SEPARATE_SPECULAR_COLOR || 
+                ctx->Fog.ColorSumEnabled)
+               swrast->Line = aa_multitex_spec_line;
+            else
+               swrast->Line = aa_multitex_rgba_line;
+         }
+         else {
+            swrast->Line = aa_tex_rgba_line;
+         }
+      }
+      else {
+         swrast->Line = aa_rgba_line;
+      }
+   }
+   else {
+      /* Color Index */
+      swrast->Line = aa_ci_line;
+   }
+}
diff --git a/reactos/lib/mesa32/src/swrast/s_aaline.h b/reactos/lib/mesa32/src/swrast/s_aaline.h
new file mode 100644
index 00000000000..41e7e5fd4d4
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_aaline.h
@@ -0,0 +1,39 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef S_AALINE_H
+#define S_AALINE_H
+
+
+#include "mtypes.h"
+#include "swrast.h"
+
+
+extern void
+_swrast_choose_aa_line_function(GLcontext *ctx);
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/swrast/s_aalinetemp.h b/reactos/lib/mesa32/src/swrast/s_aalinetemp.h
new file mode 100644
index 00000000000..c69e4c19efc
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_aalinetemp.h
@@ -0,0 +1,317 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0.1
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * Antialiased line template.
+ */
+
+
+/*
+ * Function to render each fragment in the AA line.
+ */
+static void
+NAME(plot)(GLcontext *ctx, struct LineInfo *line, int ix, int iy)
+{
+   const GLfloat fx = (GLfloat) ix;
+   const GLfloat fy = (GLfloat) iy;
+#ifdef DO_INDEX
+   const GLfloat coverage = compute_coveragei(line, ix, iy);
+#else
+   const GLfloat coverage = compute_coveragef(line, ix, iy);
+#endif
+   const GLuint i = line->span.end;
+
+   if (coverage == 0.0)
+      return;
+
+   line->span.end++;
+   line->span.array->coverage[i] = coverage;
+   line->span.array->x[i] = ix;
+   line->span.array->y[i] = iy;
+
+   /*
+    * Compute Z, color, texture coords, fog for the fragment by
+    * solving the plane equations at (ix,iy).
+    */
+#ifdef DO_Z
+   line->span.array->z[i] = (GLdepth) IROUND(solve_plane(fx, fy, line->zPlane));
+#endif
+#ifdef DO_FOG
+   line->span.array->fog[i] = solve_plane(fx, fy, line->fPlane);
+#endif
+#ifdef DO_RGBA
+   line->span.array->rgba[i][RCOMP] = solve_plane_chan(fx, fy, line->rPlane);
+   line->span.array->rgba[i][GCOMP] = solve_plane_chan(fx, fy, line->gPlane);
+   line->span.array->rgba[i][BCOMP] = solve_plane_chan(fx, fy, line->bPlane);
+   line->span.array->rgba[i][ACOMP] = solve_plane_chan(fx, fy, line->aPlane);
+#endif
+#ifdef DO_INDEX
+   line->span.array->index[i] = (GLint) solve_plane(fx, fy, line->iPlane);
+#endif
+#ifdef DO_SPEC
+   line->span.array->spec[i][RCOMP] = solve_plane_chan(fx, fy, line->srPlane);
+   line->span.array->spec[i][GCOMP] = solve_plane_chan(fx, fy, line->sgPlane);
+   line->span.array->spec[i][BCOMP] = solve_plane_chan(fx, fy, line->sbPlane);
+#endif
+#ifdef DO_TEX
+   {
+      const GLfloat invQ = solve_plane_recip(fx, fy, line->vPlane[0]);
+      line->span.array->texcoords[0][i][0] = solve_plane(fx, fy, line->sPlane[0]) * invQ;
+      line->span.array->texcoords[0][i][1] = solve_plane(fx, fy, line->tPlane[0]) * invQ;
+      line->span.array->texcoords[0][i][2] = solve_plane(fx, fy, line->uPlane[0]) * invQ;
+      line->span.array->lambda[0][i] = compute_lambda(line->sPlane[0], line->tPlane[0], invQ,
+                                          line->texWidth[0], line->texHeight[0]);
+   }
+#elif defined(DO_MULTITEX)
+   {
+      GLuint unit;
+      for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++) {
+         if (ctx->Texture.Unit[unit]._ReallyEnabled) {
+            const GLfloat invQ = solve_plane_recip(fx, fy, line->vPlane[unit]);
+            line->span.array->texcoords[unit][i][0] = solve_plane(fx, fy, line->sPlane[unit]) * invQ;
+            line->span.array->texcoords[unit][i][1] = solve_plane(fx, fy, line->tPlane[unit]) * invQ;
+            line->span.array->texcoords[unit][i][2] = solve_plane(fx, fy, line->uPlane[unit]) * invQ;
+            line->span.array->lambda[unit][i] = compute_lambda(line->sPlane[unit],
+                                               line->tPlane[unit], invQ,
+                                               line->texWidth[unit], line->texHeight[unit]);
+         }
+      }
+   }
+#endif
+
+   if (line->span.end == MAX_WIDTH) {
+#if defined(DO_TEX) || defined(DO_MULTITEX)
+      _swrast_write_texture_span(ctx, &(line->span));
+#elif defined(DO_RGBA)
+      _swrast_write_rgba_span(ctx, &(line->span));
+#else
+      _swrast_write_index_span(ctx, &(line->span));
+#endif
+      line->span.end = 0; /* reset counter */
+   }
+}
+
+
+
+/*
+ * Line setup
+ */
+static void
+NAME(line)(GLcontext *ctx, const SWvertex *v0, const SWvertex *v1)
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   GLfloat tStart, tEnd;   /* segment start, end along line length */
+   GLboolean inSegment;
+   GLint iLen, i;
+
+   /* Init the LineInfo struct */
+   struct LineInfo line;
+   line.x0 = v0->win[0];
+   line.y0 = v0->win[1];
+   line.x1 = v1->win[0];
+   line.y1 = v1->win[1];
+   line.dx = line.x1 - line.x0;
+   line.dy = line.y1 - line.y0;
+   line.len = SQRTF(line.dx * line.dx + line.dy * line.dy);
+   line.halfWidth = 0.5F * ctx->Line.Width;
+
+   if (line.len == 0.0 || IS_INF_OR_NAN(line.len))
+      return;
+
+   INIT_SPAN(line.span, GL_LINE, 0, 0, SPAN_XY | SPAN_COVERAGE);
+
+   line.xAdj = line.dx / line.len * line.halfWidth;
+   line.yAdj = line.dy / line.len * line.halfWidth;
+
+#ifdef DO_Z
+   line.span.arrayMask |= SPAN_Z;
+   compute_plane(line.x0, line.y0, line.x1, line.y1,
+                 v0->win[2], v1->win[2], line.zPlane);
+#endif
+#ifdef DO_FOG
+   line.span.arrayMask |= SPAN_FOG;
+   compute_plane(line.x0, line.y0, line.x1, line.y1,
+                 v0->fog, v1->fog, line.fPlane);
+#endif
+#ifdef DO_RGBA
+   line.span.arrayMask |= SPAN_RGBA;
+   if (ctx->Light.ShadeModel == GL_SMOOTH) {
+      compute_plane(line.x0, line.y0, line.x1, line.y1,
+                    v0->color[RCOMP], v1->color[RCOMP], line.rPlane);
+      compute_plane(line.x0, line.y0, line.x1, line.y1,
+                    v0->color[GCOMP], v1->color[GCOMP], line.gPlane);
+      compute_plane(line.x0, line.y0, line.x1, line.y1,
+                    v0->color[BCOMP], v1->color[BCOMP], line.bPlane);
+      compute_plane(line.x0, line.y0, line.x1, line.y1,
+                    v0->color[ACOMP], v1->color[ACOMP], line.aPlane);
+   }
+   else {
+      constant_plane(v1->color[RCOMP], line.rPlane);
+      constant_plane(v1->color[GCOMP], line.gPlane);
+      constant_plane(v1->color[BCOMP], line.bPlane);
+      constant_plane(v1->color[ACOMP], line.aPlane);
+   }
+#endif
+#ifdef DO_SPEC
+   line.span.arrayMask |= SPAN_SPEC;
+   if (ctx->Light.ShadeModel == GL_SMOOTH) {
+      compute_plane(line.x0, line.y0, line.x1, line.y1,
+                    v0->specular[RCOMP], v1->specular[RCOMP], line.srPlane);
+      compute_plane(line.x0, line.y0, line.x1, line.y1,
+                    v0->specular[GCOMP], v1->specular[GCOMP], line.sgPlane);
+      compute_plane(line.x0, line.y0, line.x1, line.y1,
+                    v0->specular[BCOMP], v1->specular[BCOMP], line.sbPlane);
+   }
+   else {
+      constant_plane(v1->specular[RCOMP], line.srPlane);
+      constant_plane(v1->specular[GCOMP], line.sgPlane);
+      constant_plane(v1->specular[BCOMP], line.sbPlane);
+   }
+#endif
+#ifdef DO_INDEX
+   line.span.arrayMask |= SPAN_INDEX;
+   if (ctx->Light.ShadeModel == GL_SMOOTH) {
+      compute_plane(line.x0, line.y0, line.x1, line.y1,
+                    (GLfloat) v0->index, (GLfloat) v1->index, line.iPlane);
+   }
+   else {
+      constant_plane((GLfloat) v1->index, line.iPlane);
+   }
+#endif
+#ifdef DO_TEX
+   {
+      const struct gl_texture_object *obj = ctx->Texture.Unit[0]._Current;
+      const struct gl_texture_image *texImage = obj->Image[obj->BaseLevel];
+      const GLfloat invW0 = v0->win[3];
+      const GLfloat invW1 = v1->win[3];
+      const GLfloat s0 = v0->texcoord[0][0] * invW0;
+      const GLfloat s1 = v1->texcoord[0][0] * invW1;
+      const GLfloat t0 = v0->texcoord[0][1] * invW0;
+      const GLfloat t1 = v1->texcoord[0][1] * invW0;
+      const GLfloat r0 = v0->texcoord[0][2] * invW0;
+      const GLfloat r1 = v1->texcoord[0][2] * invW0;
+      const GLfloat q0 = v0->texcoord[0][3] * invW0;
+      const GLfloat q1 = v1->texcoord[0][3] * invW0;
+      line.span.arrayMask |= (SPAN_TEXTURE | SPAN_LAMBDA);
+      compute_plane(line.x0, line.y0, line.x1, line.y1, s0, s1, line.sPlane[0]);
+      compute_plane(line.x0, line.y0, line.x1, line.y1, t0, t1, line.tPlane[0]);
+      compute_plane(line.x0, line.y0, line.x1, line.y1, r0, r1, line.uPlane[0]);
+      compute_plane(line.x0, line.y0, line.x1, line.y1, q0, q1, line.vPlane[0]);
+      line.texWidth[0] = (GLfloat) texImage->Width;
+      line.texHeight[0] = (GLfloat) texImage->Height;
+   }
+#elif defined(DO_MULTITEX)
+   {
+      GLuint u;
+      line.span.arrayMask |= (SPAN_TEXTURE | SPAN_LAMBDA);
+      for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {
+         if (ctx->Texture.Unit[u]._ReallyEnabled) {
+            const struct gl_texture_object *obj = ctx->Texture.Unit[u]._Current;
+            const struct gl_texture_image *texImage = obj->Image[obj->BaseLevel];
+            const GLfloat invW0 = v0->win[3];
+            const GLfloat invW1 = v1->win[3];
+            const GLfloat s0 = v0->texcoord[u][0] * invW0;
+            const GLfloat s1 = v1->texcoord[u][0] * invW1;
+            const GLfloat t0 = v0->texcoord[u][1] * invW0;
+            const GLfloat t1 = v1->texcoord[u][1] * invW0;
+            const GLfloat r0 = v0->texcoord[u][2] * invW0;
+            const GLfloat r1 = v1->texcoord[u][2] * invW0;
+            const GLfloat q0 = v0->texcoord[u][3] * invW0;
+            const GLfloat q1 = v1->texcoord[u][3] * invW0;
+            compute_plane(line.x0, line.y0, line.x1, line.y1, s0, s1, line.sPlane[u]);
+            compute_plane(line.x0, line.y0, line.x1, line.y1, t0, t1, line.tPlane[u]);
+            compute_plane(line.x0, line.y0, line.x1, line.y1, r0, r1, line.uPlane[u]);
+            compute_plane(line.x0, line.y0, line.x1, line.y1, q0, q1, line.vPlane[u]);
+            line.texWidth[u]  = (GLfloat) texImage->Width;
+            line.texHeight[u] = (GLfloat) texImage->Height;
+         }
+      }
+   }
+#endif
+
+   tStart = tEnd = 0.0;
+   inSegment = GL_FALSE;
+   iLen = (GLint) line.len;
+
+   if (ctx->Line.StippleFlag) {
+      for (i = 0; i < iLen; i++) {
+         const GLuint bit = (swrast->StippleCounter / ctx->Line.StippleFactor) & 0xf;
+         if ((1 << bit) & ctx->Line.StipplePattern) {
+            /* stipple bit is on */
+            const GLfloat t = (GLfloat) i / (GLfloat) line.len;
+            if (!inSegment) {
+               /* start new segment */
+               inSegment = GL_TRUE;
+               tStart = t;
+            }
+            else {
+               /* still in the segment, extend it */
+               tEnd = t;
+            }
+         }
+         else {
+            /* stipple bit is off */
+            if (inSegment && (tEnd > tStart)) {
+               /* draw the segment */
+               segment(ctx, &line, NAME(plot), tStart, tEnd);
+               inSegment = GL_FALSE;
+            }
+            else {
+               /* still between segments, do nothing */
+            }
+         }
+         swrast->StippleCounter++;
+      }
+
+      if (inSegment) {
+         /* draw the final segment of the line */
+         segment(ctx, &line, NAME(plot), tStart, 1.0F);
+      }
+   }
+   else {
+      /* non-stippled */
+      segment(ctx, &line, NAME(plot), 0.0, 1.0);
+   }
+
+#if defined(DO_TEX) || defined(DO_MULTITEX)
+   _swrast_write_texture_span(ctx, &(line.span));
+#elif defined(DO_RGBA)
+   _swrast_write_rgba_span(ctx, &(line.span));
+#else
+   _swrast_write_index_span(ctx, &(line.span));
+#endif
+}
+
+
+
+
+#undef DO_Z
+#undef DO_FOG
+#undef DO_RGBA
+#undef DO_INDEX
+#undef DO_SPEC
+#undef DO_TEX
+#undef DO_MULTITEX
+#undef NAME
diff --git a/reactos/lib/mesa32/src/swrast/s_aatriangle.c b/reactos/lib/mesa32/src/swrast/s_aatriangle.c
new file mode 100644
index 00000000000..1bcaa95d330
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_aatriangle.c
@@ -0,0 +1,495 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * Antialiased Triangle rasterizers
+ */
+
+
+#include "glheader.h"
+#include "context.h"
+#include "colormac.h"
+#include "context.h"
+#include "macros.h"
+#include "imports.h"
+#include "nvfragprog.h"
+#include "s_aatriangle.h"
+#include "s_context.h"
+#include "s_span.h"
+
+
+/*
+ * Compute coefficients of a plane using the X,Y coords of the v0, v1, v2
+ * vertices and the given Z values.
+ * A point (x,y,z) lies on plane iff a*x+b*y+c*z+d = 0.
+ */
+static INLINE void
+compute_plane(const GLfloat v0[], const GLfloat v1[], const GLfloat v2[],
+              GLfloat z0, GLfloat z1, GLfloat z2, GLfloat plane[4])
+{
+   const GLfloat px = v1[0] - v0[0];
+   const GLfloat py = v1[1] - v0[1];
+   const GLfloat pz = z1 - z0;
+
+   const GLfloat qx = v2[0] - v0[0];
+   const GLfloat qy = v2[1] - v0[1];
+   const GLfloat qz = z2 - z0;
+
+   /* Crossproduct "(a,b,c):= dv1 x dv2" is orthogonal to plane. */
+   const GLfloat a = py * qz - pz * qy;
+   const GLfloat b = pz * qx - px * qz;
+   const GLfloat c = px * qy - py * qx;
+   /* Point on the plane = "r*(a,b,c) + w", with fixed "r" depending
+      on the distance of plane from origin and arbitrary "w" parallel
+      to the plane. */
+   /* The scalar product "(r*(a,b,c)+w)*(a,b,c)" is "r*(a^2+b^2+c^2)",
+      which is equal to "-d" below. */
+   const GLfloat d = -(a * v0[0] + b * v0[1] + c * z0);
+
+   plane[0] = a;
+   plane[1] = b;
+   plane[2] = c;
+   plane[3] = d;
+}
+
+
+/*
+ * Compute coefficients of a plane with a constant Z value.
+ */
+static INLINE void
+constant_plane(GLfloat value, GLfloat plane[4])
+{
+   plane[0] = 0.0;
+   plane[1] = 0.0;
+   plane[2] = -1.0;
+   plane[3] = value;
+}
+
+#define CONSTANT_PLANE(VALUE, PLANE)	\
+do {					\
+   PLANE[0] = 0.0F;			\
+   PLANE[1] = 0.0F;			\
+   PLANE[2] = -1.0F;			\
+   PLANE[3] = VALUE;			\
+} while (0)
+
+
+
+/*
+ * Solve plane equation for Z at (X,Y).
+ */
+static INLINE GLfloat
+solve_plane(GLfloat x, GLfloat y, const GLfloat plane[4])
+{
+   ASSERT(plane[2] != 0.0F);
+   return (plane[3] + plane[0] * x + plane[1] * y) / -plane[2];
+}
+
+
+#define SOLVE_PLANE(X, Y, PLANE) \
+   ((PLANE[3] + PLANE[0] * (X) + PLANE[1] * (Y)) / -PLANE[2])
+
+
+/*
+ * Return 1 / solve_plane().
+ */
+static INLINE GLfloat
+solve_plane_recip(GLfloat x, GLfloat y, const GLfloat plane[4])
+{
+   const GLfloat denom = plane[3] + plane[0] * x + plane[1] * y;
+   if (denom == 0.0F)
+      return 0.0F;
+   else
+      return -plane[2] / denom;
+}
+
+
+/*
+ * Solve plane and return clamped GLchan value.
+ */
+static INLINE GLchan
+solve_plane_chan(GLfloat x, GLfloat y, const GLfloat plane[4])
+{
+   const GLfloat z = (plane[3] + plane[0] * x + plane[1] * y) / -plane[2];
+#if CHAN_TYPE == GL_FLOAT
+   return CLAMP(z, 0.0F, CHAN_MAXF);
+#else
+   if (z < 0)
+      return 0;
+   else if (z > CHAN_MAX)
+      return CHAN_MAX;
+   return (GLchan) IROUND_POS(z);
+#endif
+}
+
+
+
+/*
+ * Compute how much (area) of the given pixel is inside the triangle.
+ * Vertices MUST be specified in counter-clockwise order.
+ * Return:  coverage in [0, 1].
+ */
+static GLfloat
+compute_coveragef(const GLfloat v0[3], const GLfloat v1[3],
+                  const GLfloat v2[3], GLint winx, GLint winy)
+{
+   /* Given a position [0,3]x[0,3] return the sub-pixel sample position.
+    * Contributed by Ray Tice.
+    *
+    * Jitter sample positions -
+    * - average should be .5 in x & y for each column
+    * - each of the 16 rows and columns should be used once
+    * - the rectangle formed by the first four points
+    *   should contain the other points
+    * - the distrubition should be fairly even in any given direction
+    *
+    * The pattern drawn below isn't optimal, but it's better than a regular
+    * grid.  In the drawing, the center of each subpixel is surrounded by
+    * four dots.  The "x" marks the jittered position relative to the
+    * subpixel center.
+    */
+#define POS(a, b) (0.5+a*4+b)/16
+   static const GLfloat samples[16][2] = {
+      /* start with the four corners */
+      { POS(0, 2), POS(0, 0) },
+      { POS(3, 3), POS(0, 2) },
+      { POS(0, 0), POS(3, 1) },
+      { POS(3, 1), POS(3, 3) },
+      /* continue with interior samples */
+      { POS(1, 1), POS(0, 1) },
+      { POS(2, 0), POS(0, 3) },
+      { POS(0, 3), POS(1, 3) },
+      { POS(1, 2), POS(1, 0) },
+      { POS(2, 3), POS(1, 2) },
+      { POS(3, 2), POS(1, 1) },
+      { POS(0, 1), POS(2, 2) },
+      { POS(1, 0), POS(2, 1) },
+      { POS(2, 1), POS(2, 3) },
+      { POS(3, 0), POS(2, 0) },
+      { POS(1, 3), POS(3, 0) },
+      { POS(2, 2), POS(3, 2) }
+   };
+
+   const GLfloat x = (GLfloat) winx;
+   const GLfloat y = (GLfloat) winy;
+   const GLfloat dx0 = v1[0] - v0[0];
+   const GLfloat dy0 = v1[1] - v0[1];
+   const GLfloat dx1 = v2[0] - v1[0];
+   const GLfloat dy1 = v2[1] - v1[1];
+   const GLfloat dx2 = v0[0] - v2[0];
+   const GLfloat dy2 = v0[1] - v2[1];
+   GLint stop = 4, i;
+   GLfloat insideCount = 16.0F;
+
+#ifdef DEBUG
+   {
+      const GLfloat area = dx0 * dy1 - dx1 * dy0;
+      ASSERT(area >= 0.0);
+   }
+#endif
+
+   for (i = 0; i < stop; i++) {
+      const GLfloat sx = x + samples[i][0];
+      const GLfloat sy = y + samples[i][1];
+      /* cross product determines if sample is inside or outside each edge */
+      GLfloat cross = (dx0 * (sy - v0[1]) - dy0 * (sx - v0[0]));
+      /* Check if the sample is exactly on an edge.  If so, let cross be a
+       * positive or negative value depending on the direction of the edge.
+       */
+      if (cross == 0.0F)
+         cross = dx0 + dy0;
+      if (cross < 0.0F) {
+         /* sample point is outside first edge */
+         insideCount -= 1.0F;
+         stop = 16;
+      }
+      else {
+         /* sample point is inside first edge */
+         cross = (dx1 * (sy - v1[1]) - dy1 * (sx - v1[0]));
+         if (cross == 0.0F)
+            cross = dx1 + dy1;
+         if (cross < 0.0F) {
+            /* sample point is outside second edge */
+            insideCount -= 1.0F;
+            stop = 16;
+         }
+         else {
+            /* sample point is inside first and second edges */
+            cross = (dx2 * (sy - v2[1]) -  dy2 * (sx - v2[0]));
+            if (cross == 0.0F)
+               cross = dx2 + dy2;
+            if (cross < 0.0F) {
+               /* sample point is outside third edge */
+               insideCount -= 1.0F;
+               stop = 16;
+            }
+         }
+      }
+   }
+   if (stop == 4)
+      return 1.0F;
+   else
+      return insideCount * (1.0F / 16.0F);
+}
+
+
+
+/*
+ * Compute how much (area) of the given pixel is inside the triangle.
+ * Vertices MUST be specified in counter-clockwise order.
+ * Return:  coverage in [0, 15].
+ */
+static GLint
+compute_coveragei(const GLfloat v0[3], const GLfloat v1[3],
+                  const GLfloat v2[3], GLint winx, GLint winy)
+{
+   /* NOTE: 15 samples instead of 16. */
+   static const GLfloat samples[15][2] = {
+      /* start with the four corners */
+      { POS(0, 2), POS(0, 0) },
+      { POS(3, 3), POS(0, 2) },
+      { POS(0, 0), POS(3, 1) },
+      { POS(3, 1), POS(3, 3) },
+      /* continue with interior samples */
+      { POS(1, 1), POS(0, 1) },
+      { POS(2, 0), POS(0, 3) },
+      { POS(0, 3), POS(1, 3) },
+      { POS(1, 2), POS(1, 0) },
+      { POS(2, 3), POS(1, 2) },
+      { POS(3, 2), POS(1, 1) },
+      { POS(0, 1), POS(2, 2) },
+      { POS(1, 0), POS(2, 1) },
+      { POS(2, 1), POS(2, 3) },
+      { POS(3, 0), POS(2, 0) },
+      { POS(1, 3), POS(3, 0) }
+   };
+   const GLfloat x = (GLfloat) winx;
+   const GLfloat y = (GLfloat) winy;
+   const GLfloat dx0 = v1[0] - v0[0];
+   const GLfloat dy0 = v1[1] - v0[1];
+   const GLfloat dx1 = v2[0] - v1[0];
+   const GLfloat dy1 = v2[1] - v1[1];
+   const GLfloat dx2 = v0[0] - v2[0];
+   const GLfloat dy2 = v0[1] - v2[1];
+   GLint stop = 4, i;
+   GLint insideCount = 15;
+
+#ifdef DEBUG
+   {
+      const GLfloat area = dx0 * dy1 - dx1 * dy0;
+      ASSERT(area >= 0.0);
+   }
+#endif
+
+   for (i = 0; i < stop; i++) {
+      const GLfloat sx = x + samples[i][0];
+      const GLfloat sy = y + samples[i][1];
+      const GLfloat fx0 = sx - v0[0];
+      const GLfloat fy0 = sy - v0[1];
+      const GLfloat fx1 = sx - v1[0];
+      const GLfloat fy1 = sy - v1[1];
+      const GLfloat fx2 = sx - v2[0];
+      const GLfloat fy2 = sy - v2[1];
+      /* cross product determines if sample is inside or outside each edge */
+      GLfloat cross0 = (dx0 * fy0 - dy0 * fx0);
+      GLfloat cross1 = (dx1 * fy1 - dy1 * fx1);
+      GLfloat cross2 = (dx2 * fy2 - dy2 * fx2);
+      /* Check if the sample is exactly on an edge.  If so, let cross be a
+       * positive or negative value depending on the direction of the edge.
+       */
+      if (cross0 == 0.0F)
+         cross0 = dx0 + dy0;
+      if (cross1 == 0.0F)
+         cross1 = dx1 + dy1;
+      if (cross2 == 0.0F)
+         cross2 = dx2 + dy2;
+      if (cross0 < 0.0F || cross1 < 0.0F || cross2 < 0.0F) {
+         /* point is outside triangle */
+         insideCount--;
+         stop = 15;
+      }
+   }
+   if (stop == 4)
+      return 15;
+   else
+      return insideCount;
+}
+
+
+
+static void
+rgba_aa_tri(GLcontext *ctx,
+	    const SWvertex *v0,
+	    const SWvertex *v1,
+	    const SWvertex *v2)
+{
+#define DO_Z
+#define DO_FOG
+#define DO_RGBA
+#include "s_aatritemp.h"
+}
+
+
+static void
+index_aa_tri(GLcontext *ctx,
+	     const SWvertex *v0,
+	     const SWvertex *v1,
+	     const SWvertex *v2)
+{
+#define DO_Z
+#define DO_FOG
+#define DO_INDEX
+#include "s_aatritemp.h"
+}
+
+
+/*
+ * Compute mipmap level of detail.
+ * XXX we should really include the R coordinate in this computation
+ * in order to do 3-D texture mipmapping.
+ */
+static INLINE GLfloat
+compute_lambda(const GLfloat sPlane[4], const GLfloat tPlane[4],
+               const GLfloat qPlane[4], GLfloat cx, GLfloat cy,
+               GLfloat invQ, GLfloat texWidth, GLfloat texHeight)
+{
+   const GLfloat s = solve_plane(cx, cy, sPlane);
+   const GLfloat t = solve_plane(cx, cy, tPlane);
+   const GLfloat invQ_x1 = solve_plane_recip(cx+1.0F, cy, qPlane);
+   const GLfloat invQ_y1 = solve_plane_recip(cx, cy+1.0F, qPlane);
+   const GLfloat s_x1 = s - sPlane[0] / sPlane[2];
+   const GLfloat s_y1 = s - sPlane[1] / sPlane[2];
+   const GLfloat t_x1 = t - tPlane[0] / tPlane[2];
+   const GLfloat t_y1 = t - tPlane[1] / tPlane[2];
+   GLfloat dsdx = s_x1 * invQ_x1 - s * invQ;
+   GLfloat dsdy = s_y1 * invQ_y1 - s * invQ;
+   GLfloat dtdx = t_x1 * invQ_x1 - t * invQ;
+   GLfloat dtdy = t_y1 * invQ_y1 - t * invQ;
+   GLfloat maxU, maxV, rho, lambda;
+   dsdx = FABSF(dsdx);
+   dsdy = FABSF(dsdy);
+   dtdx = FABSF(dtdx);
+   dtdy = FABSF(dtdy);
+   maxU = MAX2(dsdx, dsdy) * texWidth;
+   maxV = MAX2(dtdx, dtdy) * texHeight;
+   rho = MAX2(maxU, maxV);
+   lambda = LOG2(rho);
+   return lambda;
+}
+
+
+static void
+tex_aa_tri(GLcontext *ctx,
+	   const SWvertex *v0,
+	   const SWvertex *v1,
+	   const SWvertex *v2)
+{
+#define DO_Z
+#define DO_FOG
+#define DO_RGBA
+#define DO_TEX
+#include "s_aatritemp.h"
+}
+
+
+static void
+spec_tex_aa_tri(GLcontext *ctx,
+		const SWvertex *v0,
+		const SWvertex *v1,
+		const SWvertex *v2)
+{
+#define DO_Z
+#define DO_FOG
+#define DO_RGBA
+#define DO_TEX
+#define DO_SPEC
+#include "s_aatritemp.h"
+}
+
+
+static void
+multitex_aa_tri(GLcontext *ctx,
+		const SWvertex *v0,
+		const SWvertex *v1,
+		const SWvertex *v2)
+{
+#define DO_Z
+#define DO_FOG
+#define DO_RGBA
+#define DO_MULTITEX
+#include "s_aatritemp.h"
+}
+
+static void
+spec_multitex_aa_tri(GLcontext *ctx,
+		     const SWvertex *v0,
+		     const SWvertex *v1,
+		     const SWvertex *v2)
+{
+#define DO_Z
+#define DO_FOG
+#define DO_RGBA
+#define DO_MULTITEX
+#define DO_SPEC
+#include "s_aatritemp.h"
+}
+
+
+/*
+ * Examine GL state and set swrast->Triangle to an
+ * appropriate antialiased triangle rasterizer function.
+ */
+void
+_swrast_set_aa_triangle_function(GLcontext *ctx)
+{
+   ASSERT(ctx->Polygon.SmoothFlag);
+
+   if (ctx->Texture._EnabledCoordUnits != 0) {
+      if (NEED_SECONDARY_COLOR(ctx)) {
+         if (ctx->Texture._EnabledCoordUnits > 1) {
+            SWRAST_CONTEXT(ctx)->Triangle = spec_multitex_aa_tri;
+         }
+         else {
+            SWRAST_CONTEXT(ctx)->Triangle = spec_tex_aa_tri;
+         }
+      }
+      else {
+         if (ctx->Texture._EnabledCoordUnits > 1) {
+            SWRAST_CONTEXT(ctx)->Triangle = multitex_aa_tri;
+         }
+         else {
+            SWRAST_CONTEXT(ctx)->Triangle = tex_aa_tri;
+         }
+      }
+   }
+   else if (ctx->Visual.rgbMode) {
+      SWRAST_CONTEXT(ctx)->Triangle = rgba_aa_tri;
+   }
+   else {
+      SWRAST_CONTEXT(ctx)->Triangle = index_aa_tri;
+   }
+
+   ASSERT(SWRAST_CONTEXT(ctx)->Triangle);
+}
diff --git a/reactos/lib/mesa32/src/swrast/s_aatriangle.h b/reactos/lib/mesa32/src/swrast/s_aatriangle.h
new file mode 100644
index 00000000000..ebb828eb19f
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_aatriangle.h
@@ -0,0 +1,39 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef S_AATRIANGLE_H
+#define S_AATRIANGLE_H
+
+
+#include "mtypes.h"
+#include "swrast.h"
+
+
+extern void
+_swrast_set_aa_triangle_function(GLcontext *ctx);
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/swrast/s_aatritemp.h b/reactos/lib/mesa32/src/swrast/s_aatritemp.h
new file mode 100644
index 00000000000..c57e0beaf63
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_aatritemp.h
@@ -0,0 +1,554 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * Antialiased Triangle Rasterizer Template
+ *
+ * This file is #include'd to generate custom AA triangle rasterizers.
+ * NOTE: this code hasn't been optimized yet.  That'll come after it
+ * works correctly.
+ *
+ * The following macros may be defined to indicate what auxillary information
+ * must be copmuted across the triangle:
+ *    DO_Z         - if defined, compute Z values
+ *    DO_RGBA      - if defined, compute RGBA values
+ *    DO_INDEX     - if defined, compute color index values
+ *    DO_SPEC      - if defined, compute specular RGB values
+ *    DO_TEX       - if defined, compute unit 0 STRQ texcoords
+ *    DO_MULTITEX  - if defined, compute all unit's STRQ texcoords
+ */
+
+/*void triangle( GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint pv )*/
+{
+   const GLfloat *p0 = v0->win;
+   const GLfloat *p1 = v1->win;
+   const GLfloat *p2 = v2->win;
+   const SWvertex *vMin, *vMid, *vMax;
+   GLint iyMin, iyMax;
+   GLfloat yMin, yMax;
+   GLboolean ltor;
+   GLfloat majDx, majDy;  /* major (i.e. long) edge dx and dy */
+   
+   struct sw_span span;
+   
+#ifdef DO_Z
+   GLfloat zPlane[4];
+#endif
+#ifdef DO_FOG
+   GLfloat fogPlane[4];
+#else
+   GLfloat *fog = NULL;
+#endif
+#ifdef DO_RGBA
+   GLfloat rPlane[4], gPlane[4], bPlane[4], aPlane[4];
+#endif
+#ifdef DO_INDEX
+   GLfloat iPlane[4];
+#endif
+#ifdef DO_SPEC
+   GLfloat srPlane[4], sgPlane[4], sbPlane[4];
+#endif
+#ifdef DO_TEX
+   GLfloat sPlane[4], tPlane[4], uPlane[4], vPlane[4];
+   GLfloat texWidth, texHeight;
+#elif defined(DO_MULTITEX)
+   GLfloat sPlane[MAX_TEXTURE_COORD_UNITS][4];  /* texture S */
+   GLfloat tPlane[MAX_TEXTURE_COORD_UNITS][4];  /* texture T */
+   GLfloat uPlane[MAX_TEXTURE_COORD_UNITS][4];  /* texture R */
+   GLfloat vPlane[MAX_TEXTURE_COORD_UNITS][4];  /* texture Q */
+   GLfloat texWidth[MAX_TEXTURE_COORD_UNITS];
+   GLfloat texHeight[MAX_TEXTURE_COORD_UNITS];
+#endif
+   GLfloat bf = SWRAST_CONTEXT(ctx)->_BackfaceSign;
+   
+   
+   INIT_SPAN(span, GL_POLYGON, 0, 0, SPAN_COVERAGE);
+
+   /* determine bottom to top order of vertices */
+   {
+      GLfloat y0 = v0->win[1];
+      GLfloat y1 = v1->win[1];
+      GLfloat y2 = v2->win[1];
+      if (y0 <= y1) {
+	 if (y1 <= y2) {
+	    vMin = v0;   vMid = v1;   vMax = v2;   /* y0<=y1<=y2 */
+	 }
+	 else if (y2 <= y0) {
+	    vMin = v2;   vMid = v0;   vMax = v1;   /* y2<=y0<=y1 */
+	 }
+	 else {
+	    vMin = v0;   vMid = v2;   vMax = v1;  bf = -bf; /* y0<=y2<=y1 */
+	 }
+      }
+      else {
+	 if (y0 <= y2) {
+	    vMin = v1;   vMid = v0;   vMax = v2;  bf = -bf; /* y1<=y0<=y2 */
+	 }
+	 else if (y2 <= y1) {
+	    vMin = v2;   vMid = v1;   vMax = v0;  bf = -bf; /* y2<=y1<=y0 */
+	 }
+	 else {
+	    vMin = v1;   vMid = v2;   vMax = v0;   /* y1<=y2<=y0 */
+	 }
+      }
+   }
+
+   majDx = vMax->win[0] - vMin->win[0];
+   majDy = vMax->win[1] - vMin->win[1];
+
+   {
+      const GLfloat botDx = vMid->win[0] - vMin->win[0];
+      const GLfloat botDy = vMid->win[1] - vMin->win[1];
+      const GLfloat area = majDx * botDy - botDx * majDy;
+      /* Do backface culling */
+      if (area * bf < 0 || area == 0 || IS_INF_OR_NAN(area))
+	 return;
+      ltor = (GLboolean) (area < 0.0F);
+   }
+
+#ifndef DO_OCCLUSION_TEST
+   ctx->OcclusionResult = GL_TRUE;
+#endif
+
+   /* Plane equation setup:
+    * We evaluate plane equations at window (x,y) coordinates in order
+    * to compute color, Z, fog, texcoords, etc.  This isn't terribly
+    * efficient but it's easy and reliable.
+    */
+#ifdef DO_Z
+   compute_plane(p0, p1, p2, p0[2], p1[2], p2[2], zPlane);
+   span.arrayMask |= SPAN_Z;
+#endif
+#ifdef DO_FOG
+   compute_plane(p0, p1, p2, v0->fog, v1->fog, v2->fog, fogPlane);
+   span.arrayMask |= SPAN_FOG;
+#endif
+#ifdef DO_RGBA
+   if (ctx->Light.ShadeModel == GL_SMOOTH) {
+      compute_plane(p0, p1, p2, v0->color[RCOMP], v1->color[RCOMP], v2->color[RCOMP], rPlane);
+      compute_plane(p0, p1, p2, v0->color[GCOMP], v1->color[GCOMP], v2->color[GCOMP], gPlane);
+      compute_plane(p0, p1, p2, v0->color[BCOMP], v1->color[BCOMP], v2->color[BCOMP], bPlane);
+      compute_plane(p0, p1, p2, v0->color[ACOMP], v1->color[ACOMP], v2->color[ACOMP], aPlane);
+   }
+   else {
+      constant_plane(v2->color[RCOMP], rPlane);
+      constant_plane(v2->color[GCOMP], gPlane);
+      constant_plane(v2->color[BCOMP], bPlane);
+      constant_plane(v2->color[ACOMP], aPlane);
+   }
+   span.arrayMask |= SPAN_RGBA;
+#endif
+#ifdef DO_INDEX
+   if (ctx->Light.ShadeModel == GL_SMOOTH) {
+      compute_plane(p0, p1, p2, (GLfloat) v0->index,
+                    v1->index, v2->index, iPlane);
+   }
+   else {
+      constant_plane(v2->index, iPlane);
+   }
+   span.arrayMask |= SPAN_INDEX;
+#endif
+#ifdef DO_SPEC
+   if (ctx->Light.ShadeModel == GL_SMOOTH) {
+      compute_plane(p0, p1, p2, v0->specular[RCOMP], v1->specular[RCOMP], v2->specular[RCOMP], srPlane);
+      compute_plane(p0, p1, p2, v0->specular[GCOMP], v1->specular[GCOMP], v2->specular[GCOMP], sgPlane);
+      compute_plane(p0, p1, p2, v0->specular[BCOMP], v1->specular[BCOMP], v2->specular[BCOMP], sbPlane);
+   }
+   else {
+      constant_plane(v2->specular[RCOMP], srPlane);
+      constant_plane(v2->specular[GCOMP], sgPlane);
+      constant_plane(v2->specular[BCOMP], sbPlane);
+   }
+   span.arrayMask |= SPAN_SPEC;
+#endif
+#ifdef DO_TEX
+   {
+      const struct gl_texture_object *obj = ctx->Texture.Unit[0]._Current;
+      const struct gl_texture_image *texImage = obj->Image[obj->BaseLevel];
+      const GLfloat invW0 = v0->win[3];
+      const GLfloat invW1 = v1->win[3];
+      const GLfloat invW2 = v2->win[3];
+      const GLfloat s0 = v0->texcoord[0][0] * invW0;
+      const GLfloat s1 = v1->texcoord[0][0] * invW1;
+      const GLfloat s2 = v2->texcoord[0][0] * invW2;
+      const GLfloat t0 = v0->texcoord[0][1] * invW0;
+      const GLfloat t1 = v1->texcoord[0][1] * invW1;
+      const GLfloat t2 = v2->texcoord[0][1] * invW2;
+      const GLfloat r0 = v0->texcoord[0][2] * invW0;
+      const GLfloat r1 = v1->texcoord[0][2] * invW1;
+      const GLfloat r2 = v2->texcoord[0][2] * invW2;
+      const GLfloat q0 = v0->texcoord[0][3] * invW0;
+      const GLfloat q1 = v1->texcoord[0][3] * invW1;
+      const GLfloat q2 = v2->texcoord[0][3] * invW2;
+      compute_plane(p0, p1, p2, s0, s1, s2, sPlane);
+      compute_plane(p0, p1, p2, t0, t1, t2, tPlane);
+      compute_plane(p0, p1, p2, r0, r1, r2, uPlane);
+      compute_plane(p0, p1, p2, q0, q1, q2, vPlane);
+      texWidth = (GLfloat) texImage->Width;
+      texHeight = (GLfloat) texImage->Height;
+   }
+   span.arrayMask |= (SPAN_TEXTURE | SPAN_LAMBDA);
+#elif defined(DO_MULTITEX)
+   {
+      GLuint u;
+      for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {
+         if (ctx->Texture.Unit[u]._ReallyEnabled) {
+            const struct gl_texture_object *obj = ctx->Texture.Unit[u]._Current;
+            const struct gl_texture_image *texImage = obj->Image[obj->BaseLevel];
+            const GLfloat invW0 = v0->win[3];
+            const GLfloat invW1 = v1->win[3];
+            const GLfloat invW2 = v2->win[3];
+            const GLfloat s0 = v0->texcoord[u][0] * invW0;
+            const GLfloat s1 = v1->texcoord[u][0] * invW1;
+            const GLfloat s2 = v2->texcoord[u][0] * invW2;
+            const GLfloat t0 = v0->texcoord[u][1] * invW0;
+            const GLfloat t1 = v1->texcoord[u][1] * invW1;
+            const GLfloat t2 = v2->texcoord[u][1] * invW2;
+            const GLfloat r0 = v0->texcoord[u][2] * invW0;
+            const GLfloat r1 = v1->texcoord[u][2] * invW1;
+            const GLfloat r2 = v2->texcoord[u][2] * invW2;
+            const GLfloat q0 = v0->texcoord[u][3] * invW0;
+            const GLfloat q1 = v1->texcoord[u][3] * invW1;
+            const GLfloat q2 = v2->texcoord[u][3] * invW2;
+            compute_plane(p0, p1, p2, s0, s1, s2, sPlane[u]);
+            compute_plane(p0, p1, p2, t0, t1, t2, tPlane[u]);
+            compute_plane(p0, p1, p2, r0, r1, r2, uPlane[u]);
+            compute_plane(p0, p1, p2, q0, q1, q2, vPlane[u]);
+            texWidth[u]  = (GLfloat) texImage->Width;
+            texHeight[u] = (GLfloat) texImage->Height;
+         }
+      }
+   }
+   span.arrayMask |= (SPAN_TEXTURE | SPAN_LAMBDA);
+#endif
+
+   /* Begin bottom-to-top scan over the triangle.
+    * The long edge will either be on the left or right side of the
+    * triangle.  We always scan from the long edge toward the shorter
+    * edges, stopping when we find that coverage = 0.  If the long edge
+    * is on the left we scan left-to-right.  Else, we scan right-to-left.
+    */
+   yMin = vMin->win[1];
+   yMax = vMax->win[1];
+   iyMin = (GLint) yMin;
+   iyMax = (GLint) yMax + 1;
+
+   if (ltor) {
+      /* scan left to right */
+      const GLfloat *pMin = vMin->win;
+      const GLfloat *pMid = vMid->win;
+      const GLfloat *pMax = vMax->win;
+      const GLfloat dxdy = majDx / majDy;
+      const GLfloat xAdj = dxdy < 0.0F ? -dxdy : 0.0F;
+      GLfloat x = pMin[0] - (yMin - iyMin) * dxdy;
+      GLint iy;
+      for (iy = iyMin; iy < iyMax; iy++, x += dxdy) {
+         GLint ix, startX = (GLint) (x - xAdj);
+         GLuint count;
+         GLfloat coverage = 0.0F;
+
+         /* skip over fragments with zero coverage */
+         while (startX < MAX_WIDTH) {
+            coverage = compute_coveragef(pMin, pMid, pMax, startX, iy);
+            if (coverage > 0.0F)
+               break;
+            startX++;
+         }
+
+         /* enter interior of triangle */
+         ix = startX;
+         count = 0;
+         while (coverage > 0.0F) {
+            /* (cx,cy) = center of fragment */
+            const GLfloat cx = ix + 0.5F, cy = iy + 0.5F;
+            struct span_arrays *array = span.array;
+#ifdef DO_INDEX
+            array->coverage[count] = (GLfloat) compute_coveragei(pMin, pMid, pMax, ix, iy);
+#else
+            array->coverage[count] = coverage;
+#endif
+#ifdef DO_Z
+            array->z[count] = (GLdepth) IROUND(solve_plane(cx, cy, zPlane));
+#endif
+#ifdef DO_FOG
+	    array->fog[count] = solve_plane(cx, cy, fogPlane);
+#endif
+#ifdef DO_RGBA
+            array->rgba[count][RCOMP] = solve_plane_chan(cx, cy, rPlane);
+            array->rgba[count][GCOMP] = solve_plane_chan(cx, cy, gPlane);
+            array->rgba[count][BCOMP] = solve_plane_chan(cx, cy, bPlane);
+            array->rgba[count][ACOMP] = solve_plane_chan(cx, cy, aPlane);
+#endif
+#ifdef DO_INDEX
+            array->index[count] = (GLint) solve_plane(cx, cy, iPlane);
+#endif
+#ifdef DO_SPEC
+            array->spec[count][RCOMP] = solve_plane_chan(cx, cy, srPlane);
+            array->spec[count][GCOMP] = solve_plane_chan(cx, cy, sgPlane);
+            array->spec[count][BCOMP] = solve_plane_chan(cx, cy, sbPlane);
+#endif
+#ifdef DO_TEX
+            {
+               const GLfloat invQ = solve_plane_recip(cx, cy, vPlane);
+               array->texcoords[0][count][0] = solve_plane(cx, cy, sPlane) * invQ;
+               array->texcoords[0][count][1] = solve_plane(cx, cy, tPlane) * invQ;
+               array->texcoords[0][count][2] = solve_plane(cx, cy, uPlane) * invQ;
+               array->lambda[0][count] = compute_lambda(sPlane, tPlane, vPlane,
+                                                      cx, cy, invQ,
+                                                      texWidth, texHeight);
+            }
+#elif defined(DO_MULTITEX)
+            {
+               GLuint unit;
+               for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++) {
+                  if (ctx->Texture.Unit[unit]._ReallyEnabled) {
+                     GLfloat invQ = solve_plane_recip(cx, cy, vPlane[unit]);
+                     array->texcoords[unit][count][0] = solve_plane(cx, cy, sPlane[unit]) * invQ;
+                     array->texcoords[unit][count][1] = solve_plane(cx, cy, tPlane[unit]) * invQ;
+                     array->texcoords[unit][count][2] = solve_plane(cx, cy, uPlane[unit]) * invQ;
+                     array->lambda[unit][count] = compute_lambda(sPlane[unit],
+                                      tPlane[unit], vPlane[unit], cx, cy, invQ,
+                                      texWidth[unit], texHeight[unit]);
+                  }
+               }
+            }
+#endif
+            ix++;
+            count++;
+            coverage = compute_coveragef(pMin, pMid, pMax, ix, iy);
+         }
+         
+         if (ix <= startX)
+            continue;
+         
+         span.x = startX;
+         span.y = iy;
+         span.end = (GLuint) ix - (GLuint) startX;
+         ASSERT(span.interpMask == 0);
+#if defined(DO_MULTITEX) || defined(DO_TEX)
+         _swrast_write_texture_span(ctx, &span);
+#elif defined(DO_RGBA)
+         _swrast_write_rgba_span(ctx, &span);
+#elif defined(DO_INDEX)
+         _swrast_write_index_span(ctx, &span);
+#endif
+      }
+   }
+   else {
+      /* scan right to left */
+      const GLfloat *pMin = vMin->win;
+      const GLfloat *pMid = vMid->win;
+      const GLfloat *pMax = vMax->win;
+      const GLfloat dxdy = majDx / majDy;
+      const GLfloat xAdj = dxdy > 0 ? dxdy : 0.0F;
+      GLfloat x = pMin[0] - (yMin - iyMin) * dxdy;
+      GLint iy;
+      for (iy = iyMin; iy < iyMax; iy++, x += dxdy) {
+         GLint ix, left, startX = (GLint) (x + xAdj);
+         GLuint count, n;
+         GLfloat coverage = 0.0F;
+         
+         /* make sure we're not past the window edge */
+         if (startX >= ctx->DrawBuffer->_Xmax) {
+            startX = ctx->DrawBuffer->_Xmax - 1;
+         }
+
+         /* skip fragments with zero coverage */
+         while (startX >= 0) {
+            coverage = compute_coveragef(pMin, pMax, pMid, startX, iy);
+            if (coverage > 0.0F)
+               break;
+            startX--;
+         }
+         
+         /* enter interior of triangle */
+         ix = startX;
+         count = 0;
+         while (coverage > 0.0F) {
+            /* (cx,cy) = center of fragment */
+            const GLfloat cx = ix + 0.5F, cy = iy + 0.5F;
+            struct span_arrays *array = span.array;
+#ifdef DO_INDEX
+            array->coverage[ix] = (GLfloat) compute_coveragei(pMin, pMax, pMid, ix, iy);
+#else
+            array->coverage[ix] = coverage;
+#endif
+#ifdef DO_Z
+            array->z[ix] = (GLdepth) IROUND(solve_plane(cx, cy, zPlane));
+#endif
+#ifdef DO_FOG
+            array->fog[ix] = solve_plane(cx, cy, fogPlane);
+#endif
+#ifdef DO_RGBA
+            array->rgba[ix][RCOMP] = solve_plane_chan(cx, cy, rPlane);
+            array->rgba[ix][GCOMP] = solve_plane_chan(cx, cy, gPlane);
+            array->rgba[ix][BCOMP] = solve_plane_chan(cx, cy, bPlane);
+            array->rgba[ix][ACOMP] = solve_plane_chan(cx, cy, aPlane);
+#endif
+#ifdef DO_INDEX
+            array->index[ix] = (GLint) solve_plane(cx, cy, iPlane);
+#endif
+#ifdef DO_SPEC
+            array->spec[ix][RCOMP] = solve_plane_chan(cx, cy, srPlane);
+            array->spec[ix][GCOMP] = solve_plane_chan(cx, cy, sgPlane);
+            array->spec[ix][BCOMP] = solve_plane_chan(cx, cy, sbPlane);
+#endif
+#ifdef DO_TEX
+            {
+               const GLfloat invQ = solve_plane_recip(cx, cy, vPlane);
+               array->texcoords[0][ix][0] = solve_plane(cx, cy, sPlane) * invQ;
+               array->texcoords[0][ix][1] = solve_plane(cx, cy, tPlane) * invQ;
+               array->texcoords[0][ix][2] = solve_plane(cx, cy, uPlane) * invQ;
+               array->lambda[0][ix] = compute_lambda(sPlane, tPlane, vPlane,
+                                          cx, cy, invQ, texWidth, texHeight);
+            }
+#elif defined(DO_MULTITEX)
+            {
+               GLuint unit;
+               for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++) {
+                  if (ctx->Texture.Unit[unit]._ReallyEnabled) {
+                     GLfloat invQ = solve_plane_recip(cx, cy, vPlane[unit]);
+                     array->texcoords[unit][ix][0] = solve_plane(cx, cy, sPlane[unit]) * invQ;
+                     array->texcoords[unit][ix][1] = solve_plane(cx, cy, tPlane[unit]) * invQ;
+                     array->texcoords[unit][ix][2] = solve_plane(cx, cy, uPlane[unit]) * invQ;
+                     array->lambda[unit][ix] = compute_lambda(sPlane[unit],
+                                                            tPlane[unit],
+                                                            vPlane[unit],
+                                                            cx, cy, invQ,
+                                                            texWidth[unit],
+                                                            texHeight[unit]);
+                  }
+               }
+            }
+#endif
+            ix--;
+            count++;
+            coverage = compute_coveragef(pMin, pMax, pMid, ix, iy);
+         }
+         
+         if (startX <= ix)
+            continue;
+
+         n = (GLuint) startX - (GLuint) ix;
+
+         left = ix + 1;
+
+         /* shift all values to the left */
+         /* XXX this is temporary */
+         {
+            struct span_arrays *array = span.array;
+            GLint j;
+            for (j = 0; j < (GLint) n; j++) {
+#ifdef DO_RGBA
+               COPY_CHAN4(array->rgba[j], array->rgba[j + left]);
+#endif
+#ifdef DO_SPEC
+               COPY_CHAN4(array->spec[j], array->spec[j + left]);
+#endif
+#ifdef DO_INDEX
+               array->index[j] = array->index[j + left];
+#endif
+#ifdef DO_Z
+               array->z[j] = array->z[j + left];
+#endif
+#ifdef DO_FOG
+               array->fog[j] = array->fog[j + left];
+#endif
+#ifdef DO_TEX
+               COPY_4V(array->texcoords[0][j], array->texcoords[0][j + left]);
+#endif
+#if defined(DO_MULTITEX) || defined(DO_TEX)
+               array->lambda[0][j] = array->lambda[0][j + left];
+#endif
+               array->coverage[j] = array->coverage[j + left];
+            }
+         }
+#ifdef DO_MULTITEX
+         /* shift texcoords */
+         {
+            struct span_arrays *array = span.array;
+            GLuint unit;
+            for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++) {
+               if (ctx->Texture.Unit[unit]._ReallyEnabled) {
+                  GLint j;
+                  for (j = 0; j < (GLint) n; j++) {
+		     array->texcoords[unit][j][0] = array->texcoords[unit][j + left][0];
+                     array->texcoords[unit][j][1] = array->texcoords[unit][j + left][1];
+                     array->texcoords[unit][j][2] = array->texcoords[unit][j + left][2];
+                     array->lambda[unit][j] = array->lambda[unit][j + left];
+                  }
+               }
+            }
+         }
+#endif
+
+         span.x = left;
+         span.y = iy;
+         span.end = n;
+         ASSERT(span.interpMask == 0);
+#if defined(DO_MULTITEX) || defined(DO_TEX)
+         _swrast_write_texture_span(ctx, &span);
+#elif defined(DO_RGBA)
+         _swrast_write_rgba_span(ctx, &span);
+#elif defined(DO_INDEX)
+         _swrast_write_index_span(ctx, &span);
+#endif
+      }
+   }
+}
+
+
+#ifdef DO_Z
+#undef DO_Z
+#endif
+
+#ifdef DO_FOG
+#undef DO_FOG
+#endif
+
+#ifdef DO_RGBA
+#undef DO_RGBA
+#endif
+
+#ifdef DO_INDEX
+#undef DO_INDEX
+#endif
+
+#ifdef DO_SPEC
+#undef DO_SPEC
+#endif
+
+#ifdef DO_TEX
+#undef DO_TEX
+#endif
+
+#ifdef DO_MULTITEX
+#undef DO_MULTITEX
+#endif
+
+#ifdef DO_OCCLUSION_TEST
+#undef DO_OCCLUSION_TEST
+#endif
diff --git a/reactos/lib/mesa32/src/swrast/s_accum.c b/reactos/lib/mesa32/src/swrast/s_accum.c
new file mode 100644
index 00000000000..aa2d6b413bf
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_accum.c
@@ -0,0 +1,527 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "context.h"
+#include "macros.h"
+#include "imports.h"
+
+#include "s_accum.h"
+#include "s_alphabuf.h"
+#include "s_context.h"
+#include "s_masking.h"
+#include "s_span.h"
+
+
+/*
+ * Accumulation buffer notes
+ *
+ * Normally, accumulation buffer values are GLshorts with values in
+ * [-32767, 32767] which represent floating point colors in [-1, 1],
+ * as suggested by the OpenGL specification.
+ *
+ * We optimize for the common case used for full-scene antialiasing:
+ *    // start with accum buffer cleared to zero
+ *    glAccum(GL_LOAD, w);   // or GL_ACCUM the first image
+ *    glAccum(GL_ACCUM, w);
+ *    ...
+ *    glAccum(GL_ACCUM, w);
+ *    glAccum(GL_RETURN, 1.0);
+ * That is, we start with an empty accumulation buffer and accumulate
+ * n images, each with weight w = 1/n.
+ * In this scenario, we can simply store unscaled integer values in
+ * the accum buffer instead of scaled integers.  We'll also keep track
+ * of the w value so when we do GL_RETURN we simply divide the accumulated
+ * values by n (=1/w).
+ * This lets us avoid _many_ int->float->int conversions.
+ */
+
+
+#if CHAN_BITS == 8 && ACCUM_BITS < 32
+#define USE_OPTIMIZED_ACCUM   /* enable the optimization */
+#endif
+
+
+void
+_swrast_alloc_accum_buffer( GLframebuffer *buffer )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint n;
+
+   if (buffer->Accum) {
+      MESA_PBUFFER_FREE( buffer->Accum );
+      buffer->Accum = NULL;
+   }
+
+   /* allocate accumulation buffer if not already present */
+   n = buffer->Width * buffer->Height * 4 * sizeof(GLaccum);
+   buffer->Accum = (GLaccum *) MESA_PBUFFER_ALLOC( n );
+   if (!buffer->Accum) {
+      /* unable to setup accumulation buffer */
+      _mesa_error( NULL, GL_OUT_OF_MEMORY, "glAccum" );
+   }
+
+   if (ctx) {
+      SWcontext *swrast = SWRAST_CONTEXT(ctx);
+      /* XXX these fields should probably be in the GLframebuffer */
+#ifdef USE_OPTIMIZED_ACCUM
+      swrast->_IntegerAccumMode = GL_TRUE;
+#else
+      swrast->_IntegerAccumMode = GL_FALSE;
+#endif
+      swrast->_IntegerAccumScaler = 0.0;
+   }
+}
+
+
+/*
+ * This is called when we fall out of optimized/unscaled accum buffer mode.
+ * That is, we convert each unscaled accum buffer value into a scaled value
+ * representing the range[-1, 1].
+ */
+static void rescale_accum( GLcontext *ctx )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   const GLuint n = ctx->DrawBuffer->Width * ctx->DrawBuffer->Height * 4;
+   const GLfloat s = swrast->_IntegerAccumScaler * (32767.0F / CHAN_MAXF);
+   GLaccum *accum = ctx->DrawBuffer->Accum;
+   GLuint i;
+
+   assert(swrast->_IntegerAccumMode);
+   assert(accum);
+
+   for (i = 0; i < n; i++) {
+      accum[i] = (GLaccum) (accum[i] * s);
+   }
+
+   swrast->_IntegerAccumMode = GL_FALSE;
+}
+
+
+
+
+
+
+/*
+ * Clear the accumulation Buffer.
+ */
+void
+_swarst_clear_accum_buffer( GLcontext *ctx )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   GLuint buffersize;
+   GLfloat acc_scale;
+
+   if (ctx->Visual.accumRedBits==0) {
+      /* No accumulation buffer! */
+      return;
+   }
+
+   if (sizeof(GLaccum)==1) {
+      acc_scale = 127.0;
+   }
+   else if (sizeof(GLaccum)==2) {
+      acc_scale = 32767.0;
+   }
+   else {
+      acc_scale = 1.0F;
+   }
+
+   /* number of pixels */
+   buffersize = ctx->DrawBuffer->Width * ctx->DrawBuffer->Height;
+
+   if (!ctx->DrawBuffer->Accum) {
+      /* try to alloc accumulation buffer */
+      ctx->DrawBuffer->Accum = (GLaccum *)
+	                   MALLOC( buffersize * 4 * sizeof(GLaccum) );
+   }
+
+   if (ctx->DrawBuffer->Accum) {
+      if (ctx->Scissor.Enabled) {
+	 /* Limit clear to scissor box */
+	 const GLaccum r = (GLaccum) (ctx->Accum.ClearColor[0] * acc_scale);
+	 const GLaccum g = (GLaccum) (ctx->Accum.ClearColor[1] * acc_scale);
+	 const GLaccum b = (GLaccum) (ctx->Accum.ClearColor[2] * acc_scale);
+	 const GLaccum a = (GLaccum) (ctx->Accum.ClearColor[3] * acc_scale);
+	 GLint i, j;
+         GLint width, height;
+         GLaccum *row;
+         /* size of region to clear */
+         width = 4 * (ctx->DrawBuffer->_Xmax - ctx->DrawBuffer->_Xmin);
+         height = ctx->DrawBuffer->_Ymax - ctx->DrawBuffer->_Ymin;
+         /* ptr to first element to clear */
+         row = ctx->DrawBuffer->Accum
+               + 4 * (ctx->DrawBuffer->_Ymin * ctx->DrawBuffer->Width
+                      + ctx->DrawBuffer->_Xmin);
+         for (j=0;j<height;j++) {
+            for (i=0;i<width;i+=4) {
+               row[i+0] = r;
+               row[i+1] = g;
+               row[i+2] = b;
+               row[i+3] = a;
+	    }
+            row += 4 * ctx->DrawBuffer->Width;
+	 }
+      }
+      else {
+	 /* clear whole buffer */
+	 if (ctx->Accum.ClearColor[0]==0.0 &&
+	     ctx->Accum.ClearColor[1]==0.0 &&
+	     ctx->Accum.ClearColor[2]==0.0 &&
+	     ctx->Accum.ClearColor[3]==0.0) {
+	    /* Black */
+	    _mesa_bzero( ctx->DrawBuffer->Accum,
+                         buffersize * 4 * sizeof(GLaccum) );
+	 }
+	 else {
+	    /* Not black */
+	    const GLaccum r = (GLaccum) (ctx->Accum.ClearColor[0] * acc_scale);
+	    const GLaccum g = (GLaccum) (ctx->Accum.ClearColor[1] * acc_scale);
+	    const GLaccum b = (GLaccum) (ctx->Accum.ClearColor[2] * acc_scale);
+	    const GLaccum a = (GLaccum) (ctx->Accum.ClearColor[3] * acc_scale);
+	    GLaccum *acc = ctx->DrawBuffer->Accum;
+	    GLuint i;
+	    for (i=0;i<buffersize;i++) {
+	       *acc++ = r;
+	       *acc++ = g;
+	       *acc++ = b;
+	       *acc++ = a;
+	    }
+	 }
+      }
+
+      /* update optimized accum state vars */
+      if (ctx->Accum.ClearColor[0] == 0.0 && ctx->Accum.ClearColor[1] == 0.0 &&
+          ctx->Accum.ClearColor[2] == 0.0 && ctx->Accum.ClearColor[3] == 0.0) {
+#ifdef USE_OPTIMIZED_ACCUM
+         swrast->_IntegerAccumMode = GL_TRUE;
+#else
+         swrast->_IntegerAccumMode = GL_FALSE;
+#endif
+         swrast->_IntegerAccumScaler = 0.0;  /* denotes empty accum buffer */
+      }
+      else {
+         swrast->_IntegerAccumMode = GL_FALSE;
+      }
+   }
+}
+
+
+void
+_swrast_Accum( GLcontext *ctx, GLenum op, GLfloat value,
+	       GLint xpos, GLint ypos,
+	       GLint width, GLint height )
+
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   GLuint width4;
+   GLfloat acc_scale;
+   GLchan rgba[MAX_WIDTH][4];
+   const GLuint colorMask = *((GLuint *) &ctx->Color.ColorMask);
+
+
+   if (SWRAST_CONTEXT(ctx)->NewState)
+      _swrast_validate_derived( ctx );
+
+   if (!ctx->DrawBuffer->Accum) {
+      _mesa_warning(ctx,
+		    "Calling glAccum() without an accumulation "
+		    "buffer (low memory?)");
+      return;
+   }
+
+   if (sizeof(GLaccum)==1) {
+      acc_scale = 127.0;
+   }
+   else if (sizeof(GLaccum)==2) {
+      acc_scale = 32767.0;
+   }
+   else {
+      acc_scale = 1.0F;
+   }
+
+   width4 = 4 * width;
+
+   switch (op) {
+      case GL_ADD:
+         if (value != 0.0F) {
+	    const GLaccum val = (GLaccum) (value * acc_scale);
+	    GLint j;
+            /* Leave optimized accum buffer mode */
+            if (swrast->_IntegerAccumMode)
+               rescale_accum(ctx);
+	    for (j = 0; j < height; j++) {
+	       GLaccum *acc = ctx->DrawBuffer->Accum + ypos * width4 + 4*xpos;
+               GLuint i;
+	       for (i = 0; i < width4; i++) {
+                  acc[i] += val;
+	       }
+	       ypos++;
+	    }
+	 }
+	 break;
+
+      case GL_MULT:
+         if (value != 1.0F) {
+	    GLint j;
+            /* Leave optimized accum buffer mode */
+            if (swrast->_IntegerAccumMode)
+               rescale_accum(ctx);
+	    for (j = 0; j < height; j++) {
+	       GLaccum *acc = ctx->DrawBuffer->Accum + ypos * width4 + 4 * xpos;
+               GLuint i;
+	       for (i = 0; i < width4; i++) {
+                  acc[i] = (GLaccum) ( (GLfloat) acc[i] * value );
+	       }
+	       ypos++;
+	    }
+	 }
+	 break;
+
+      case GL_ACCUM:
+         if (value == 0.0F)
+            return;
+
+         _swrast_use_read_buffer(ctx);
+
+         /* May have to leave optimized accum buffer mode */
+         if (swrast->_IntegerAccumScaler == 0.0 && value > 0.0 && value <= 1.0)
+            swrast->_IntegerAccumScaler = value;
+         if (swrast->_IntegerAccumMode && value != swrast->_IntegerAccumScaler)
+            rescale_accum(ctx);
+
+         RENDER_START(swrast,ctx);
+
+         if (swrast->_IntegerAccumMode) {
+            /* simply add integer color values into accum buffer */
+            GLint j;
+            GLaccum *acc = ctx->DrawBuffer->Accum + ypos * width4 + xpos * 4;
+            assert(swrast->_IntegerAccumScaler > 0.0);
+            assert(swrast->_IntegerAccumScaler <= 1.0);
+            for (j = 0; j < height; j++) {
+
+               GLint i, i4;
+               _swrast_read_rgba_span(ctx, ctx->DrawBuffer, width, xpos, ypos, rgba);
+               for (i = i4 = 0; i < width; i++, i4+=4) {
+                  acc[i4+0] += rgba[i][RCOMP];
+                  acc[i4+1] += rgba[i][GCOMP];
+                  acc[i4+2] += rgba[i][BCOMP];
+                  acc[i4+3] += rgba[i][ACOMP];
+               }
+               acc += width4;
+               ypos++;
+            }
+         }
+         else {
+            /* scaled integer (or float) accum buffer */
+            const GLfloat rscale = value * acc_scale / CHAN_MAXF;
+            const GLfloat gscale = value * acc_scale / CHAN_MAXF;
+            const GLfloat bscale = value * acc_scale / CHAN_MAXF;
+            const GLfloat ascale = value * acc_scale / CHAN_MAXF;
+            GLint j;
+            for (j=0;j<height;j++) {
+               GLaccum *acc = ctx->DrawBuffer->Accum + ypos * width4 + xpos * 4;
+               GLint i;
+               _swrast_read_rgba_span(ctx, ctx->DrawBuffer, width, xpos, ypos, rgba);
+               for (i=0;i<width;i++) {
+                  acc[0] += (GLaccum) ( (GLfloat) rgba[i][RCOMP] * rscale );
+                  acc[1] += (GLaccum) ( (GLfloat) rgba[i][GCOMP] * gscale );
+                  acc[2] += (GLaccum) ( (GLfloat) rgba[i][BCOMP] * bscale );
+                  acc[3] += (GLaccum) ( (GLfloat) rgba[i][ACOMP] * ascale );
+                  acc += 4;
+               }
+               ypos++;
+            }
+         }
+         /* restore read buffer = draw buffer (the default) */
+         _swrast_use_draw_buffer(ctx);
+
+         RENDER_FINISH(swrast,ctx);
+	 break;
+
+      case GL_LOAD:
+         _swrast_use_read_buffer(ctx);
+
+         /* This is a change to go into optimized accum buffer mode */
+         if (value > 0.0 && value <= 1.0) {
+#ifdef USE_OPTIMIZED_ACCUM
+            swrast->_IntegerAccumMode = GL_TRUE;
+#else
+            swrast->_IntegerAccumMode = GL_FALSE;
+#endif
+            swrast->_IntegerAccumScaler = value;
+         }
+         else {
+            swrast->_IntegerAccumMode = GL_FALSE;
+            swrast->_IntegerAccumScaler = 0.0;
+         }
+
+         RENDER_START(swrast,ctx);
+         if (swrast->_IntegerAccumMode) {
+            /* just copy values into accum buffer */
+            GLint j;
+            GLaccum *acc = ctx->DrawBuffer->Accum + ypos * width4 + xpos * 4;
+            assert(swrast->_IntegerAccumScaler > 0.0);
+            assert(swrast->_IntegerAccumScaler <= 1.0);
+            for (j = 0; j < height; j++) {
+               GLint i, i4;
+               _swrast_read_rgba_span(ctx, ctx->DrawBuffer, width, xpos, ypos, rgba);
+               for (i = i4 = 0; i < width; i++, i4 += 4) {
+                  acc[i4+0] = rgba[i][RCOMP];
+                  acc[i4+1] = rgba[i][GCOMP];
+                  acc[i4+2] = rgba[i][BCOMP];
+                  acc[i4+3] = rgba[i][ACOMP];
+               }
+               acc += width4;
+               ypos++;
+            }
+         }
+         else {
+            /* scaled integer (or float) accum buffer */
+            const GLfloat rscale = value * acc_scale / CHAN_MAXF;
+            const GLfloat gscale = value * acc_scale / CHAN_MAXF;
+            const GLfloat bscale = value * acc_scale / CHAN_MAXF;
+            const GLfloat ascale = value * acc_scale / CHAN_MAXF;
+#if 0
+            const GLfloat d = 3.0 / acc_scale;  /* XXX what's this? */
+#endif
+            GLint i, j;
+            for (j = 0; j < height; j++) {
+               GLaccum *acc = ctx->DrawBuffer->Accum + ypos * width4 + xpos * 4;
+               _swrast_read_rgba_span(ctx, ctx->DrawBuffer, width, xpos, ypos, rgba);
+               for (i=0;i<width;i++) {
+#if 0
+                  *acc++ = (GLaccum) ((GLfloat) rgba[i][RCOMP] * rscale + d);
+                  *acc++ = (GLaccum) ((GLfloat) rgba[i][GCOMP] * gscale + d);
+                  *acc++ = (GLaccum) ((GLfloat) rgba[i][BCOMP] * bscale + d);
+                  *acc++ = (GLaccum) ((GLfloat) rgba[i][ACOMP] * ascale + d);
+#else
+                  *acc++ = (GLaccum) ((GLfloat) rgba[i][RCOMP] * rscale);
+                  *acc++ = (GLaccum) ((GLfloat) rgba[i][GCOMP] * gscale);
+                  *acc++ = (GLaccum) ((GLfloat) rgba[i][BCOMP] * bscale);
+                  *acc++ = (GLaccum) ((GLfloat) rgba[i][ACOMP] * ascale);
+#endif
+               }
+               ypos++;
+            }
+         }
+
+         /* restore read buffer = draw buffer (the default) */
+         _swrast_use_draw_buffer(ctx);
+
+         RENDER_FINISH(swrast,ctx);
+	 break;
+
+      case GL_RETURN:
+         /* May have to leave optimized accum buffer mode */
+         if (swrast->_IntegerAccumMode && value != 1.0)
+            rescale_accum(ctx);
+
+         RENDER_START(swrast,ctx);
+#ifdef USE_OPTIMIZED_ACCUM
+         if (swrast->_IntegerAccumMode && swrast->_IntegerAccumScaler > 0) {
+            /* build lookup table to avoid many floating point multiplies */
+            static GLchan multTable[32768];
+            static GLfloat prevMult = 0.0;
+            const GLfloat mult = swrast->_IntegerAccumScaler;
+            const GLint max = MIN2((GLint) (256 / mult), 32767);
+            GLint j;
+            if (mult != prevMult) {
+               for (j = 0; j < max; j++)
+                  multTable[j] = IROUND((GLfloat) j * mult);
+               prevMult = mult;
+            }
+
+            assert(swrast->_IntegerAccumScaler > 0.0);
+            assert(swrast->_IntegerAccumScaler <= 1.0);
+            for (j = 0; j < height; j++) {
+               const GLaccum *acc = ctx->DrawBuffer->Accum + ypos * width4 + xpos*4;
+               GLint i, i4;
+               for (i = i4 = 0; i < width; i++, i4 += 4) {
+                  ASSERT(acc[i4+0] < max);
+                  ASSERT(acc[i4+1] < max);
+                  ASSERT(acc[i4+2] < max);
+                  ASSERT(acc[i4+3] < max);
+                  rgba[i][RCOMP] = multTable[acc[i4+0]];
+                  rgba[i][GCOMP] = multTable[acc[i4+1]];
+                  rgba[i][BCOMP] = multTable[acc[i4+2]];
+                  rgba[i][ACOMP] = multTable[acc[i4+3]];
+               }
+               if (colorMask != 0xffffffff) {
+                  _swrast_mask_rgba_array( ctx, width, xpos, ypos, rgba );
+               }
+               (*swrast->Driver.WriteRGBASpan)( ctx, width, xpos, ypos,
+                                             (const GLchan (*)[4])rgba, NULL );
+               if (ctx->DrawBuffer->UseSoftwareAlphaBuffers
+                   && ctx->Color.ColorMask[ACOMP]) {
+                  _swrast_write_alpha_span(ctx, width, xpos, ypos,
+                                         (CONST GLchan (*)[4]) rgba, NULL);
+               }
+               ypos++;
+            }
+         }
+         else
+#endif /* USE_OPTIMIZED_ACCUM */
+         {
+            /* scaled integer (or float) accum buffer */
+            const GLfloat rscale = value / acc_scale * CHAN_MAXF;
+            const GLfloat gscale = value / acc_scale * CHAN_MAXF;
+            const GLfloat bscale = value / acc_scale * CHAN_MAXF;
+            const GLfloat ascale = value / acc_scale * CHAN_MAXF;
+            GLint i, j;
+            for (j=0;j<height;j++) {
+               const GLaccum *acc = ctx->DrawBuffer->Accum + ypos * width4 + xpos*4;
+               for (i=0;i<width;i++) {
+                  GLint r = IROUND( (GLfloat) (acc[0]) * rscale );
+                  GLint g = IROUND( (GLfloat) (acc[1]) * gscale );
+                  GLint b = IROUND( (GLfloat) (acc[2]) * bscale );
+                  GLint a = IROUND( (GLfloat) (acc[3]) * ascale );
+                  acc += 4;
+                  rgba[i][RCOMP] = CLAMP( r, 0, CHAN_MAX );
+                  rgba[i][GCOMP] = CLAMP( g, 0, CHAN_MAX );
+                  rgba[i][BCOMP] = CLAMP( b, 0, CHAN_MAX );
+                  rgba[i][ACOMP] = CLAMP( a, 0, CHAN_MAX );
+               }
+               if (colorMask != 0xffffffff) {
+                  _swrast_mask_rgba_array( ctx, width, xpos, ypos, rgba );
+               }
+               (*swrast->Driver.WriteRGBASpan)( ctx, width, xpos, ypos,
+                                             (const GLchan (*)[4])rgba, NULL );
+               if (ctx->DrawBuffer->UseSoftwareAlphaBuffers
+                   && ctx->Color.ColorMask[ACOMP]) {
+                  _swrast_write_alpha_span(ctx, width, xpos, ypos,
+                                         (CONST GLchan (*)[4]) rgba, NULL);
+               }
+               ypos++;
+            }
+	 }
+         RENDER_FINISH(swrast,ctx);
+	 break;
+
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glAccum" );
+   }
+}
diff --git a/reactos/lib/mesa32/src/swrast/s_accum.h b/reactos/lib/mesa32/src/swrast/s_accum.h
new file mode 100644
index 00000000000..eba85aa1ea8
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_accum.h
@@ -0,0 +1,43 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.0.2
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef S_ACCUM_H
+#define S_ACCUM_H
+
+
+#include "mtypes.h"
+#include "swrast.h"
+
+
+extern void
+_swrast_alloc_accum_buffer( GLframebuffer *buffer );
+
+
+extern void
+_swarst_clear_accum_buffer( GLcontext *ctx );
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/swrast/s_alpha.c b/reactos/lib/mesa32/src/swrast/s_alpha.c
new file mode 100644
index 00000000000..55c1e6a58f8
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_alpha.c
@@ -0,0 +1,224 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file swrast/s_alpha.c
+ * \brief Functions to apply alpha test.
+ */
+
+#include "glheader.h"
+#include "context.h"
+#include "colormac.h"
+#include "macros.h"
+
+#include "s_alpha.h"
+#include "s_context.h"
+
+
+/**
+ * \fn GLint _swrast_alpha_test( const GLcontext *ctx, struct sw_span *span )
+ * \brief Apply the alpha test to a span of pixels.
+ * \return
+ *      - "0" = all pixels in the span failed the alpha test.
+ *      - "1" = one or more pixels passed the alpha test.
+ */
+GLint
+_swrast_alpha_test( const GLcontext *ctx, struct sw_span *span )
+{
+   const GLchan (*rgba)[4] = (const GLchan (*)[4]) span->array->rgba;
+   GLchan ref;
+   const GLuint n = span->end;
+   GLubyte *mask = span->array->mask;
+   GLuint i;
+
+   CLAMPED_FLOAT_TO_CHAN(ref, ctx->Color.AlphaRef);
+
+   if (span->arrayMask & SPAN_RGBA) {
+      /* Use the array values */
+      switch (ctx->Color.AlphaFunc) {
+         case GL_LESS:
+            for (i = 0; i < n; i++)
+               mask[i] &= (rgba[i][ACOMP] < ref);
+            break;
+         case GL_LEQUAL:
+            for (i = 0; i < n; i++)
+               mask[i] &= (rgba[i][ACOMP] <= ref);
+            break;
+         case GL_GEQUAL:
+            for (i = 0; i < n; i++)
+               mask[i] &= (rgba[i][ACOMP] >= ref);
+            break;
+         case GL_GREATER:
+            for (i = 0; i < n; i++)
+               mask[i] &= (rgba[i][ACOMP] > ref);
+            break;
+         case GL_NOTEQUAL:
+            for (i = 0; i < n; i++)
+               mask[i] &= (rgba[i][ACOMP] != ref);
+            break;
+         case GL_EQUAL:
+            for (i = 0; i < n; i++)
+               mask[i] &= (rgba[i][ACOMP] == ref);
+            break;
+         case GL_ALWAYS:
+            /* do nothing */
+            return 1;
+         case GL_NEVER:
+            /* caller should check for zero! */
+            span->writeAll = GL_FALSE;
+            return 0;
+         default:
+            _mesa_problem( ctx, "Invalid alpha test in _swrast_alpha_test" );
+            return 0;
+      }
+   }
+   else {
+      /* Use the interpolation values */
+#if CHAN_TYPE == GL_FLOAT
+      const GLfloat alphaStep = span->alphaStep;
+      GLfloat alpha = span->alpha;
+      ASSERT(span->interpMask & SPAN_RGBA);
+      switch (ctx->Color.AlphaFunc) {
+         case GL_LESS:
+            for (i = 0; i < n; i++) {
+               mask[i] &= (alpha < ref);
+               alpha += alphaStep;
+            }
+            break;
+         case GL_LEQUAL:
+            for (i = 0; i < n; i++) {
+               mask[i] &= (alpha <= ref);
+               alpha += alphaStep;
+            }
+            break;
+         case GL_GEQUAL:
+            for (i = 0; i < n; i++) {
+               mask[i] &= (alpha >= ref);
+               alpha += alphaStep;
+            }
+            break;
+         case GL_GREATER:
+            for (i = 0; i < n; i++) {
+               mask[i] &= (alpha > ref);
+               alpha += alphaStep;
+            }
+            break;
+         case GL_NOTEQUAL:
+            for (i = 0; i < n; i++) {
+               mask[i] &= (alpha != ref);
+               alpha += alphaStep;
+            }
+            break;
+         case GL_EQUAL:
+            for (i = 0; i < n; i++) {
+               mask[i] &= (alpha == ref);
+               alpha += alphaStep;
+            }
+            break;
+         case GL_ALWAYS:
+            /* do nothing */
+            return 1;
+         case GL_NEVER:
+            /* caller should check for zero! */
+            span->writeAll = GL_FALSE;
+            return 0;
+         default:
+            _mesa_problem( ctx, "Invalid alpha test in gl_alpha_test" );
+            return 0;
+      }
+#else
+      /* 8 or 16-bit channel interpolation */
+      const GLfixed alphaStep = span->alphaStep;
+      GLfixed alpha = span->alpha;
+      ASSERT(span->interpMask & SPAN_RGBA);
+      switch (ctx->Color.AlphaFunc) {
+         case GL_LESS:
+            for (i = 0; i < n; i++) {
+               mask[i] &= (FixedToChan(alpha) < ref);
+               alpha += alphaStep;
+            }
+            break;
+         case GL_LEQUAL:
+            for (i = 0; i < n; i++) {
+               mask[i] &= (FixedToChan(alpha) <= ref);
+               alpha += alphaStep;
+            }
+            break;
+         case GL_GEQUAL:
+            for (i = 0; i < n; i++) {
+               mask[i] &= (FixedToChan(alpha) >= ref);
+               alpha += alphaStep;
+            }
+            break;
+         case GL_GREATER:
+            for (i = 0; i < n; i++) {
+               mask[i] &= (FixedToChan(alpha) > ref);
+               alpha += alphaStep;
+            }
+            break;
+         case GL_NOTEQUAL:
+            for (i = 0; i < n; i++) {
+               mask[i] &= (FixedToChan(alpha) != ref);
+               alpha += alphaStep;
+            }
+            break;
+         case GL_EQUAL:
+            for (i = 0; i < n; i++) {
+               mask[i] &= (FixedToChan(alpha) == ref);
+               alpha += alphaStep;
+            }
+            break;
+         case GL_ALWAYS:
+            /* do nothing */
+            return 1;
+         case GL_NEVER:
+            /* caller should check for zero! */
+            span->writeAll = GL_FALSE;
+            return 0;
+         default:
+            _mesa_problem( ctx, "Invalid alpha test in gl_alpha_test" );
+            return 0;
+      }
+#endif /* CHAN_TYPE */
+   }
+
+#if 0
+   /* XXXX This causes conformance failures!!!! */
+   while ((span->start <= span->end)  &&
+          (mask[span->start] == 0))
+     span->start ++;
+
+   while ((span->end >= span->start)  &&
+          (mask[span->end] == 0))
+     span->end --;
+#endif
+
+   span->writeAll = GL_FALSE;
+
+   if (span->start >= span->end)
+     return 0;
+   else
+     return 1;
+}
diff --git a/reactos/lib/mesa32/src/swrast/s_alpha.h b/reactos/lib/mesa32/src/swrast/s_alpha.h
new file mode 100644
index 00000000000..add0f74c453
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_alpha.h
@@ -0,0 +1,39 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef S_ALPHA_H
+#define S_ALPHA_H
+
+
+#include "mtypes.h"
+#include "s_context.h"
+
+
+extern GLint
+_swrast_alpha_test( const GLcontext *ctx, struct sw_span *span );
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/swrast/s_alphabuf.c b/reactos/lib/mesa32/src/swrast/s_alphabuf.c
new file mode 100644
index 00000000000..c74ab45a44c
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_alphabuf.c
@@ -0,0 +1,337 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.0.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * Software alpha planes.  Many frame buffers don't have alpha bits so
+ * we simulate them in software.
+ */
+
+
+#include "glheader.h"
+#include "colormac.h"
+#include "context.h"
+#include "imports.h"
+
+#include "s_context.h"
+#include "s_alphabuf.h"
+
+
+/*
+ * Allocate a new front and back alpha buffer.
+ */
+void
+_swrast_alloc_alpha_buffers( GLframebuffer *buffer )
+{
+   const GLint bytes = buffer->Width * buffer->Height * sizeof(GLchan);
+
+   ASSERT(buffer->UseSoftwareAlphaBuffers);
+
+   if (buffer->FrontLeftAlpha) {
+      MESA_PBUFFER_FREE( buffer->FrontLeftAlpha );
+   }
+   buffer->FrontLeftAlpha = MESA_PBUFFER_ALLOC( bytes );
+   if (!buffer->FrontLeftAlpha) {
+      /* out of memory */
+      _mesa_error( NULL, GL_OUT_OF_MEMORY,
+                   "Couldn't allocate front-left alpha buffer" );
+   }
+
+   if (buffer->Visual.doubleBufferMode) {
+      if (buffer->BackLeftAlpha) {
+         MESA_PBUFFER_FREE( buffer->BackLeftAlpha );
+      }
+      buffer->BackLeftAlpha = MESA_PBUFFER_ALLOC( bytes );
+      if (!buffer->BackLeftAlpha) {
+         /* out of memory */
+         _mesa_error( NULL, GL_OUT_OF_MEMORY,
+                      "Couldn't allocate back-left alpha buffer" );
+      }
+   }
+
+   if (buffer->Visual.stereoMode) {
+      if (buffer->FrontRightAlpha) {
+         MESA_PBUFFER_FREE( buffer->FrontRightAlpha );
+      }
+      buffer->FrontRightAlpha = MESA_PBUFFER_ALLOC( bytes );
+      if (!buffer->FrontRightAlpha) {
+         /* out of memory */
+         _mesa_error( NULL, GL_OUT_OF_MEMORY,
+                      "Couldn't allocate front-right alpha buffer" );
+      }
+
+      if (buffer->Visual.doubleBufferMode) {
+         if (buffer->BackRightAlpha) {
+            MESA_PBUFFER_FREE( buffer->BackRightAlpha );
+         }
+         buffer->BackRightAlpha = MESA_PBUFFER_ALLOC( bytes );
+         if (!buffer->BackRightAlpha) {
+            /* out of memory */
+            _mesa_error( NULL, GL_OUT_OF_MEMORY,
+                         "Couldn't allocate back-right alpha buffer" );
+         }
+      }
+   }
+}
+
+
+/*
+ * Clear all the alpha buffers
+ */
+void
+_swrast_clear_alpha_buffers( GLcontext *ctx )
+{
+   GLchan aclear;
+   GLuint bufferBit;
+
+   CLAMPED_FLOAT_TO_CHAN(aclear, ctx->Color.ClearColor[3]);
+
+   ASSERT(ctx->DrawBuffer->UseSoftwareAlphaBuffers);
+   ASSERT(ctx->Color.ColorMask[ACOMP]);
+
+   /* loop over four possible alpha buffers */
+   for (bufferBit = 1; bufferBit <= 8; bufferBit = bufferBit << 1) {
+      if (bufferBit & ctx->Color._DrawDestMask) {
+         GLchan *buffer;
+         if (bufferBit == FRONT_LEFT_BIT) {
+            buffer = (GLchan *) ctx->DrawBuffer->FrontLeftAlpha;
+         }
+         else if (bufferBit == FRONT_RIGHT_BIT) {
+            buffer = (GLchan *) ctx->DrawBuffer->FrontRightAlpha;
+         }
+         else if (bufferBit == BACK_LEFT_BIT) {
+            buffer = (GLchan *) ctx->DrawBuffer->BackLeftAlpha;
+         }
+         else {
+            buffer = (GLchan *) ctx->DrawBuffer->BackRightAlpha;
+         }
+
+         if (ctx->Scissor.Enabled) {
+            /* clear scissor region */
+            GLint j;
+            GLint rowLen = ctx->DrawBuffer->_Xmax - ctx->DrawBuffer->_Xmin;
+            GLint rows = ctx->DrawBuffer->_Ymax - ctx->DrawBuffer->_Ymin;
+            GLint width = ctx->DrawBuffer->Width;
+            GLchan *aptr = buffer
+                          + ctx->DrawBuffer->_Ymin * ctx->DrawBuffer->Width
+                          + ctx->DrawBuffer->_Xmin;
+            for (j = 0; j < rows; j++) {
+#if CHAN_BITS == 8
+               MEMSET( aptr, aclear, rowLen );
+#elif CHAN_BITS == 16
+               MEMSET16( aptr, aclear, rowLen );
+#else
+               GLint i;
+               for (i = 0; i < rowLen; i++) {
+                  aptr[i] = aclear;
+               }
+#endif
+               aptr += width;
+            }
+         }
+         else {
+            /* clear whole buffer */
+            GLuint pixels = ctx->DrawBuffer->Width * ctx->DrawBuffer->Height;
+#if CHAN_BITS == 8
+            MEMSET(buffer, aclear, pixels);
+#elif CHAN_BITS == 16
+            MEMSET16(buffer, aclear, pixels);
+#else
+            GLuint i;
+            for (i = 0; i < pixels; i++) {
+               buffer[i] = aclear;
+            }
+#endif
+         }
+      }
+   }
+}
+
+
+
+static INLINE
+GLchan *get_alpha_buffer( GLcontext *ctx )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+
+   switch (swrast->CurrentBuffer) {
+   case FRONT_LEFT_BIT:
+      return (GLchan *) ctx->DrawBuffer->FrontLeftAlpha;
+      break;
+   case BACK_LEFT_BIT:
+      return (GLchan *) ctx->DrawBuffer->BackLeftAlpha;
+      break;
+   case FRONT_RIGHT_BIT:
+      return (GLchan *) ctx->DrawBuffer->FrontRightAlpha;
+      break;
+   case BACK_RIGHT_BIT:
+      return (GLchan *) ctx->DrawBuffer->BackRightAlpha;
+      break;
+   default:
+      _mesa_problem(ctx, "Bad CurrentBuffer in get_alpha_buffer()");
+      return (GLchan *) ctx->DrawBuffer->FrontLeftAlpha;
+   }
+}
+
+
+void
+_swrast_write_alpha_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
+                        CONST GLchan rgba[][4], const GLubyte mask[] )
+{
+   GLchan *buffer, *aptr;
+   GLuint i;
+
+   buffer = get_alpha_buffer(ctx);
+   aptr = buffer + y * ctx->DrawBuffer->Width + x;
+
+   if (mask) {
+      for (i=0;i<n;i++) {
+         if (mask[i]) {
+            *aptr = rgba[i][ACOMP];
+         }
+         aptr++;
+      }
+   }
+   else {
+      for (i=0;i<n;i++) {
+         *aptr++ = rgba[i][ACOMP];
+      }
+   }
+}
+
+
+void
+_swrast_write_mono_alpha_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
+                             GLchan alpha, const GLubyte mask[] )
+{
+   GLchan *buffer, *aptr;
+   GLuint i;
+
+   buffer = get_alpha_buffer(ctx);
+   aptr = buffer + y * ctx->DrawBuffer->Width + x;
+
+   if (mask) {
+      for (i=0;i<n;i++) {
+         if (mask[i]) {
+            *aptr = alpha;
+         }
+         aptr++;
+      }
+   }
+   else {
+      for (i=0;i<n;i++) {
+         *aptr++ = alpha;
+      }
+   }
+}
+
+
+void
+_swrast_write_alpha_pixels( GLcontext *ctx,
+                          GLuint n, const GLint x[], const GLint y[],
+                          CONST GLchan rgba[][4], const GLubyte mask[] )
+{
+   GLchan *buffer;
+   GLuint i;
+
+   buffer = get_alpha_buffer(ctx);
+
+   if (mask) {
+      for (i=0;i<n;i++) {
+         if (mask[i]) {
+            GLchan *aptr = buffer + y[i] * ctx->DrawBuffer->Width + x[i];
+            *aptr = rgba[i][ACOMP];
+         }
+      }
+   }
+   else {
+      for (i=0;i<n;i++) {
+         GLchan *aptr = buffer + y[i] * ctx->DrawBuffer->Width + x[i];
+         *aptr = rgba[i][ACOMP];
+      }
+   }
+}
+
+
+void
+_swrast_write_mono_alpha_pixels( GLcontext *ctx,
+                               GLuint n, const GLint x[], const GLint y[],
+                               GLchan alpha, const GLubyte mask[] )
+{
+   GLchan *buffer;
+   GLuint i;
+
+   buffer = get_alpha_buffer(ctx);
+
+   if (mask) {
+      for (i=0;i<n;i++) {
+         if (mask[i]) {
+            GLchan *aptr = buffer + y[i] * ctx->DrawBuffer->Width + x[i];
+            *aptr = alpha;
+         }
+      }
+   }
+   else {
+      for (i=0;i<n;i++) {
+         GLchan *aptr = buffer + y[i] * ctx->DrawBuffer->Width + x[i];
+         *aptr = alpha;
+      }
+   }
+}
+
+
+
+void
+_swrast_read_alpha_span( GLcontext *ctx,
+                       GLuint n, GLint x, GLint y, GLchan rgba[][4] )
+{
+   const GLchan *buffer, *aptr;
+   GLuint i;
+
+   buffer = get_alpha_buffer(ctx);
+   aptr = buffer + y * ctx->DrawBuffer->Width + x;
+
+   for (i = 0; i < n; i++)
+      rgba[i][ACOMP] = *aptr++;
+}
+
+
+void
+_swrast_read_alpha_pixels( GLcontext *ctx,
+                         GLuint n, const GLint x[], const GLint y[],
+                         GLchan rgba[][4], const GLubyte mask[] )
+{
+   const GLchan *buffer;
+   GLuint i;
+
+   buffer = get_alpha_buffer(ctx);
+
+   for (i = 0; i < n; i++) {
+      if (mask[i]) {
+         const GLchan *aptr = buffer + y[i] * ctx->DrawBuffer->Width + x[i];
+         rgba[i][ACOMP] = *aptr;
+      }
+   }
+}
diff --git a/reactos/lib/mesa32/src/swrast/s_alphabuf.h b/reactos/lib/mesa32/src/swrast/s_alphabuf.h
new file mode 100644
index 00000000000..f09bb91adbe
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_alphabuf.h
@@ -0,0 +1,80 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.0.2
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef S_ALPHABUF_H
+#define S_ALPHABUF_H
+
+
+#include "mtypes.h"
+#include "swrast.h"
+
+
+extern void
+_swrast_alloc_alpha_buffers( GLframebuffer *buffer );
+
+
+extern void
+_swrast_clear_alpha_buffers( GLcontext *ctx );
+
+
+extern void
+_swrast_write_alpha_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
+                        CONST GLchan rgba[][4], const GLubyte mask[] );
+
+
+extern void
+_swrast_write_mono_alpha_span( GLcontext *ctx,
+                             GLuint n, GLint x, GLint y,
+                             GLchan alpha, const GLubyte mask[] );
+
+
+
+extern void
+_swrast_write_alpha_pixels( GLcontext* ctx,
+                          GLuint n, const GLint x[], const GLint y[],
+                          CONST GLchan rgba[][4],
+                          const GLubyte mask[] );
+
+
+extern void
+_swrast_write_mono_alpha_pixels( GLcontext* ctx,
+                               GLuint n, const GLint x[],
+                               const GLint y[], GLchan alpha,
+                               const GLubyte mask[] );
+
+
+extern void
+_swrast_read_alpha_span( GLcontext* ctx,
+                       GLuint n, GLint x, GLint y, GLchan rgba[][4] );
+
+
+extern void
+_swrast_read_alpha_pixels( GLcontext* ctx,
+                         GLuint n, const GLint x[], const GLint y[],
+                         GLchan rgba[][4], const GLubyte mask[] );
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/swrast/s_bitmap.c b/reactos/lib/mesa32/src/swrast/s_bitmap.c
new file mode 100644
index 00000000000..aeacba88eac
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_bitmap.c
@@ -0,0 +1,256 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file swrast/s_bitmap.c
+ * \brief glBitmap rendering.
+ * \author Brian Paul
+ */
+
+#include "glheader.h"
+#include "image.h"
+#include "macros.h"
+#include "pixel.h"
+
+#include "s_context.h"
+#include "s_span.h"
+
+
+
+/*
+ * Render a bitmap.
+ */
+void
+_swrast_Bitmap( GLcontext *ctx, GLint px, GLint py,
+		GLsizei width, GLsizei height,
+		const struct gl_pixelstore_attrib *unpack,
+		const GLubyte *bitmap )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   GLint row, col;
+   GLuint count = 0;
+   struct sw_span span;
+
+   ASSERT(ctx->RenderMode == GL_RENDER);
+   ASSERT(bitmap);
+
+   RENDER_START(swrast,ctx);
+
+   if (SWRAST_CONTEXT(ctx)->NewState)
+      _swrast_validate_derived( ctx );
+
+   INIT_SPAN(span, GL_BITMAP, width, 0, SPAN_XY);
+
+   if (ctx->Visual.rgbMode) {
+      span.interpMask |= SPAN_RGBA;
+      span.red   = FloatToFixed(ctx->Current.RasterColor[0] * CHAN_MAXF);
+      span.green = FloatToFixed(ctx->Current.RasterColor[1] * CHAN_MAXF);
+      span.blue  = FloatToFixed(ctx->Current.RasterColor[2] * CHAN_MAXF);
+      span.alpha = FloatToFixed(ctx->Current.RasterColor[3] * CHAN_MAXF);
+      span.redStep = span.greenStep = span.blueStep = span.alphaStep = 0;
+   }
+   else {
+      span.interpMask |= SPAN_INDEX;
+      span.index = FloatToFixed(ctx->Current.RasterIndex);
+      span.indexStep = 0;
+   }
+
+   if (ctx->Depth.Test)
+      _swrast_span_default_z(ctx, &span);
+   if (ctx->Fog.Enabled)
+      _swrast_span_default_fog(ctx, &span);
+   if (ctx->Texture._EnabledCoordUnits)
+      _swrast_span_default_texcoords(ctx, &span);
+
+   for (row = 0; row < height; row++, span.y++) {
+      const GLubyte *src = (const GLubyte *) _mesa_image_address( unpack,
+                 bitmap, width, height, GL_COLOR_INDEX, GL_BITMAP, 0, row, 0 );
+
+      if (unpack->LsbFirst) {
+         /* Lsb first */
+         GLubyte mask = 1U << (unpack->SkipPixels & 0x7);
+         for (col = 0; col < width; col++) {
+            if (*src & mask) {
+               span.array->x[count] = px + col;
+               span.array->y[count] = py + row;
+               count++;
+            }
+            if (mask == 128U) {
+               src++;
+               mask = 1U;
+            }
+            else {
+               mask = mask << 1;
+            }
+         }
+
+         /* get ready for next row */
+         if (mask != 1)
+            src++;
+      }
+      else {
+         /* Msb first */
+         GLubyte mask = 128U >> (unpack->SkipPixels & 0x7);
+         for (col = 0; col < width; col++) {
+            if (*src & mask) {
+               span.array->x[count] = px + col;
+               span.array->y[count] = py + row;
+               count++;
+            }
+            if (mask == 1U) {
+               src++;
+               mask = 128U;
+            }
+            else {
+               mask = mask >> 1;
+            }
+         }
+
+         /* get ready for next row */
+         if (mask != 128)
+            src++;
+      }
+
+      if (count + width >= MAX_WIDTH || row + 1 == height) {
+         /* flush the span */
+         span.end = count;
+         if (ctx->Visual.rgbMode)
+            _swrast_write_rgba_span(ctx, &span);
+         else
+            _swrast_write_index_span(ctx, &span);
+         span.end = 0;
+         count = 0;
+      }
+   }
+
+   RENDER_FINISH(swrast,ctx);
+}
+
+
+#if 0
+/*
+ * XXX this is another way to implement Bitmap.  Use horizontal runs of
+ * fragments, initializing the mask array to indicate which fragmens to
+ * draw or skip.
+ */
+void
+_swrast_Bitmap( GLcontext *ctx, GLint px, GLint py,
+		GLsizei width, GLsizei height,
+		const struct gl_pixelstore_attrib *unpack,
+		const GLubyte *bitmap )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   GLint row, col;
+   struct sw_span span;
+
+   ASSERT(ctx->RenderMode == GL_RENDER);
+   ASSERT(bitmap);
+
+   RENDER_START(swrast,ctx);
+
+   if (SWRAST_CONTEXT(ctx)->NewState)
+      _swrast_validate_derived( ctx );
+
+   INIT_SPAN(span, GL_BITMAP, width, 0, SPAN_MASK);
+
+   /*span.arrayMask |= SPAN_MASK;*/  /* we'll init span.mask[] */
+   span.x = px;
+   span.y = py;
+   /*span.end = width;*/
+   if (ctx->Visual.rgbMode) {
+      span.interpMask |= SPAN_RGBA;
+      span.red   = FloatToFixed(ctx->Current.RasterColor[0] * CHAN_MAXF);
+      span.green = FloatToFixed(ctx->Current.RasterColor[1] * CHAN_MAXF);
+      span.blue  = FloatToFixed(ctx->Current.RasterColor[2] * CHAN_MAXF);
+      span.alpha = FloatToFixed(ctx->Current.RasterColor[3] * CHAN_MAXF);
+      span.redStep = span.greenStep = span.blueStep = span.alphaStep = 0;
+   }
+   else {
+      span.interpMask |= SPAN_INDEX;
+      span.index = FloatToFixed(ctx->Current.RasterIndex);
+      span.indexStep = 0;
+   }
+
+   if (ctx->Depth.Test)
+      _swrast_span_default_z(ctx, &span);
+   if (ctx->Fog.Enabled)
+      _swrast_span_default_fog(ctx, &span);
+   if (ctx->Texture._EnabledCoordUnits)
+      _swrast_span_default_texcoords(ctx, &span);
+
+   for (row=0; row<height; row++, span.y++) {
+      const GLubyte *src = (const GLubyte *) _mesa_image_address( unpack,
+                 bitmap, width, height, GL_COLOR_INDEX, GL_BITMAP, 0, row, 0 );
+
+      if (unpack->LsbFirst) {
+         /* Lsb first */
+         GLubyte mask = 1U << (unpack->SkipPixels & 0x7);
+         for (col=0; col<width; col++) {
+            span.array->mask[col] = (*src & mask) ? GL_TRUE : GL_FALSE;
+            if (mask == 128U) {
+               src++;
+               mask = 1U;
+            }
+            else {
+               mask = mask << 1;
+            }
+         }
+
+         if (ctx->Visual.rgbMode)
+            _swrast_write_rgba_span(ctx, &span);
+         else
+	    _swrast_write_index_span(ctx, &span);
+
+         /* get ready for next row */
+         if (mask != 1)
+            src++;
+      }
+      else {
+         /* Msb first */
+         GLubyte mask = 128U >> (unpack->SkipPixels & 0x7);
+         for (col=0; col<width; col++) {
+            span.array->mask[col] = (*src & mask) ? GL_TRUE : GL_FALSE;
+            if (mask == 1U) {
+               src++;
+               mask = 128U;
+            }
+            else {
+               mask = mask >> 1;
+            }
+         }
+
+         if (ctx->Visual.rgbMode)
+            _swrast_write_rgba_span(ctx, &span);
+         else
+            _swrast_write_index_span(ctx, &span);
+
+         /* get ready for next row */
+         if (mask != 128)
+            src++;
+      }
+   }
+
+   RENDER_FINISH(swrast,ctx);
+}
+#endif
diff --git a/reactos/lib/mesa32/src/swrast/s_blend.c b/reactos/lib/mesa32/src/swrast/s_blend.c
new file mode 100644
index 00000000000..9f550223ee3
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_blend.c
@@ -0,0 +1,812 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * Regarding GL_NV_blend_square:
+ *
+ * Portions of this software may use or implement intellectual
+ * property owned and licensed by NVIDIA Corporation. NVIDIA disclaims
+ * any and all warranties with respect to such intellectual property,
+ * including any use thereof or modifications thereto.
+ */
+
+
+#include "glheader.h"
+#include "context.h"
+#include "colormac.h"
+#include "macros.h"
+
+#include "s_alphabuf.h"
+#include "s_blend.h"
+#include "s_context.h"
+#include "s_span.h"
+
+
+#if defined(USE_MMX_ASM)
+#include "x86/mmx.h"
+#include "x86/common_x86_asm.h"
+#define _BLENDAPI _ASMAPI
+#else
+#define _BLENDAPI
+#endif
+
+
+/*
+ * Special case for glBlendFunc(GL_ZERO, GL_ONE)
+ */
+static void _BLENDAPI
+blend_noop( GLcontext *ctx, GLuint n, const GLubyte mask[],
+            GLchan rgba[][4], CONST GLchan dest[][4] )
+{
+   GLuint i;
+   ASSERT(ctx->Color.BlendEquation==GL_FUNC_ADD_EXT);
+   ASSERT(ctx->Color.BlendSrcRGB==GL_ZERO);
+   ASSERT(ctx->Color.BlendDstRGB==GL_ONE);
+   (void) ctx;
+
+   for (i = 0; i < n; i++) {
+      if (mask[i]) {
+         COPY_CHAN4( rgba[i], dest[i] );
+      }
+   }
+}
+
+
+/*
+ * Special case for glBlendFunc(GL_ONE, GL_ZERO)
+ */
+static void _BLENDAPI
+blend_replace( GLcontext *ctx, GLuint n, const GLubyte mask[],
+               GLchan rgba[][4], CONST GLchan dest[][4] )
+{
+   ASSERT(ctx->Color.BlendEquation==GL_FUNC_ADD_EXT);
+   ASSERT(ctx->Color.BlendSrcRGB==GL_ONE);
+   ASSERT(ctx->Color.BlendDstRGB==GL_ZERO);
+   (void) ctx;
+   (void) n;
+   (void) mask;
+   (void) rgba;
+   (void) dest;
+}
+
+
+/*
+ * Common transparency blending mode.
+ */
+static void _BLENDAPI
+blend_transparency( GLcontext *ctx, GLuint n, const GLubyte mask[],
+                    GLchan rgba[][4], CONST GLchan dest[][4] )
+{
+   GLuint i;
+   ASSERT(ctx->Color.BlendEquation==GL_FUNC_ADD_EXT);
+   ASSERT(ctx->Color.BlendSrcRGB==GL_SRC_ALPHA);
+   ASSERT(ctx->Color.BlendDstRGB==GL_ONE_MINUS_SRC_ALPHA);
+   (void) ctx;
+
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+         const GLchan t = rgba[i][ACOMP];  /* t in [0, CHAN_MAX] */
+         if (t == 0) {
+            /* 0% alpha */
+            rgba[i][RCOMP] = dest[i][RCOMP];
+            rgba[i][GCOMP] = dest[i][GCOMP];
+            rgba[i][BCOMP] = dest[i][BCOMP];
+            rgba[i][ACOMP] = dest[i][ACOMP];
+         }
+         else if (t == CHAN_MAX) {
+            /* 100% alpha, no-op */
+         }
+         else {
+#if 0
+            /* This is pretty close, but Glean complains */
+            const GLint s = CHAN_MAX - t;
+            const GLint r = (rgba[i][RCOMP] * t + dest[i][RCOMP] * s + 1) >> 8;
+            const GLint g = (rgba[i][GCOMP] * t + dest[i][GCOMP] * s + 1) >> 8;
+            const GLint b = (rgba[i][BCOMP] * t + dest[i][BCOMP] * s + 1) >> 8;
+            const GLint a = (rgba[i][ACOMP] * t + dest[i][ACOMP] * s + 1) >> 8;
+#elif 0
+            /* This is slower but satisfies Glean */
+            const GLint s = CHAN_MAX - t;
+            const GLint r = (rgba[i][RCOMP] * t + dest[i][RCOMP] * s) / 255;
+            const GLint g = (rgba[i][GCOMP] * t + dest[i][GCOMP] * s) / 255;
+            const GLint b = (rgba[i][BCOMP] * t + dest[i][BCOMP] * s) / 255;
+            const GLint a = (rgba[i][ACOMP] * t + dest[i][ACOMP] * s) / 255;
+#else
+#if CHAN_BITS == 8
+            /* This satisfies Glean and should be reasonably fast */
+            /* Contributed by Nathan Hand */
+#if 0
+#define DIV255(X)  (((X) << 8) + (X) + 256) >> 16
+#else
+	    GLint temp;
+#define DIV255(X)  (temp = (X), ((temp << 8) + temp + 256) >> 16)
+#endif
+            const GLint r = DIV255((rgba[i][RCOMP] - dest[i][RCOMP]) * t) + dest[i][RCOMP];
+            const GLint g = DIV255((rgba[i][GCOMP] - dest[i][GCOMP]) * t) + dest[i][GCOMP];
+            const GLint b = DIV255((rgba[i][BCOMP] - dest[i][BCOMP]) * t) + dest[i][BCOMP];
+            const GLint a = DIV255((rgba[i][ACOMP] - dest[i][ACOMP]) * t) + dest[i][ACOMP]; 
+
+#undef DIV255
+#elif CHAN_BITS == 16
+            const GLfloat tt = (GLfloat) t / CHAN_MAXF;
+            const GLint r = (GLint) ((rgba[i][RCOMP] - dest[i][RCOMP]) * tt + dest[i][RCOMP]);
+            const GLint g = (GLint) ((rgba[i][GCOMP] - dest[i][GCOMP]) * tt + dest[i][GCOMP]);
+            const GLint b = (GLint) ((rgba[i][BCOMP] - dest[i][BCOMP]) * tt + dest[i][BCOMP]);
+            const GLint a = (GLint) ((rgba[i][ACOMP] - dest[i][ACOMP]) * tt + dest[i][ACOMP]);
+#else /* CHAN_BITS == 32 */
+            const GLfloat tt = (GLfloat) t / CHAN_MAXF;
+            const GLfloat r = (rgba[i][RCOMP] - dest[i][RCOMP]) * tt + dest[i][RCOMP];
+            const GLfloat g = (rgba[i][GCOMP] - dest[i][GCOMP]) * tt + dest[i][GCOMP];
+            const GLfloat b = (rgba[i][BCOMP] - dest[i][BCOMP]) * tt + dest[i][BCOMP];
+            const GLfloat a = CLAMP( rgba[i][ACOMP], 0.0F, CHAN_MAXF ) * t +
+                              CLAMP( dest[i][ACOMP], 0.0F, CHAN_MAXF ) * (1.0F - t);
+#endif
+#endif
+            ASSERT(r <= CHAN_MAX);
+            ASSERT(g <= CHAN_MAX);
+            ASSERT(b <= CHAN_MAX);
+            ASSERT(a <= CHAN_MAX);
+            rgba[i][RCOMP] = (GLchan) r;
+            rgba[i][GCOMP] = (GLchan) g;
+            rgba[i][BCOMP] = (GLchan) b;
+            rgba[i][ACOMP] = (GLchan) a;
+         }
+      }
+   }
+}
+
+
+
+/*
+ * Add src and dest.
+ */
+static void _BLENDAPI
+blend_add( GLcontext *ctx, GLuint n, const GLubyte mask[],
+           GLchan rgba[][4], CONST GLchan dest[][4] )
+{
+   GLuint i;
+   ASSERT(ctx->Color.BlendEquation==GL_FUNC_ADD_EXT);
+   ASSERT(ctx->Color.BlendSrcRGB==GL_ONE);
+   ASSERT(ctx->Color.BlendDstRGB==GL_ONE);
+   (void) ctx;
+
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+#if CHAN_TYPE == GL_FLOAT
+         /* don't RGB clamp to max */
+         GLfloat a = CLAMP(rgba[i][ACOMP], 0.0F, CHAN_MAXF) + dest[i][ACOMP];
+         rgba[i][RCOMP] += dest[i][RCOMP];
+         rgba[i][GCOMP] += dest[i][GCOMP];
+         rgba[i][BCOMP] += dest[i][BCOMP];
+         rgba[i][ACOMP] = (GLchan) MIN2( a, CHAN_MAXF );
+#else
+         GLint r = rgba[i][RCOMP] + dest[i][RCOMP];
+         GLint g = rgba[i][GCOMP] + dest[i][GCOMP];
+         GLint b = rgba[i][BCOMP] + dest[i][BCOMP];
+         GLint a = rgba[i][ACOMP] + dest[i][ACOMP];
+         rgba[i][RCOMP] = (GLchan) MIN2( r, CHAN_MAX );
+         rgba[i][GCOMP] = (GLchan) MIN2( g, CHAN_MAX );
+         rgba[i][BCOMP] = (GLchan) MIN2( b, CHAN_MAX );
+         rgba[i][ACOMP] = (GLchan) MIN2( a, CHAN_MAX );
+#endif
+      }
+   }
+}
+
+
+
+/*
+ * Blend min function  (for GL_EXT_blend_minmax)
+ */
+static void _BLENDAPI
+blend_min( GLcontext *ctx, GLuint n, const GLubyte mask[],
+           GLchan rgba[][4], CONST GLchan dest[][4] )
+{
+   GLuint i;
+   ASSERT(ctx->Color.BlendEquation==GL_MIN_EXT);
+   (void) ctx;
+
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+         rgba[i][RCOMP] = (GLchan) MIN2( rgba[i][RCOMP], dest[i][RCOMP] );
+         rgba[i][GCOMP] = (GLchan) MIN2( rgba[i][GCOMP], dest[i][GCOMP] );
+         rgba[i][BCOMP] = (GLchan) MIN2( rgba[i][BCOMP], dest[i][BCOMP] );
+#if CHAN_TYPE == GL_FLOAT
+         rgba[i][ACOMP] = (GLchan) MIN2(CLAMP(rgba[i][ACOMP], 0.0F, CHAN_MAXF),
+                                        dest[i][ACOMP]);
+#else
+         rgba[i][ACOMP] = (GLchan) MIN2( rgba[i][ACOMP], dest[i][ACOMP] );
+#endif
+      }
+   }
+}
+
+
+
+/*
+ * Blend max function  (for GL_EXT_blend_minmax)
+ */
+static void _BLENDAPI
+blend_max( GLcontext *ctx, GLuint n, const GLubyte mask[],
+           GLchan rgba[][4], CONST GLchan dest[][4] )
+{
+   GLuint i;
+   ASSERT(ctx->Color.BlendEquation==GL_MAX_EXT);
+   (void) ctx;
+
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+         rgba[i][RCOMP] = (GLchan) MAX2( rgba[i][RCOMP], dest[i][RCOMP] );
+         rgba[i][GCOMP] = (GLchan) MAX2( rgba[i][GCOMP], dest[i][GCOMP] );
+         rgba[i][BCOMP] = (GLchan) MAX2( rgba[i][BCOMP], dest[i][BCOMP] );
+#if CHAN_TYPE == GL_FLOAT
+         rgba[i][ACOMP] = (GLchan) MAX2(CLAMP(rgba[i][ACOMP], 0.0F, CHAN_MAXF),
+                                        dest[i][ACOMP]);
+#else
+         rgba[i][ACOMP] = (GLchan) MAX2( rgba[i][ACOMP], dest[i][ACOMP] );
+#endif
+      }
+   }
+}
+
+
+
+/*
+ * Modulate:  result = src * dest
+ */
+static void _BLENDAPI
+blend_modulate( GLcontext *ctx, GLuint n, const GLubyte mask[],
+                GLchan rgba[][4], CONST GLchan dest[][4] )
+{
+   GLuint i;
+   (void) ctx;
+
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+#if CHAN_TYPE == GL_FLOAT
+         rgba[i][RCOMP] = rgba[i][RCOMP] * dest[i][RCOMP];
+         rgba[i][GCOMP] = rgba[i][GCOMP] * dest[i][GCOMP];
+         rgba[i][BCOMP] = rgba[i][BCOMP] * dest[i][BCOMP];
+         rgba[i][ACOMP] = rgba[i][ACOMP] * dest[i][ACOMP];
+#elif CHAN_TYPE == GL_UNSIGNED_SHORT
+         GLint r = (rgba[i][RCOMP] * dest[i][RCOMP] + 65535) >> 16;
+         GLint g = (rgba[i][GCOMP] * dest[i][GCOMP] + 65535) >> 16;
+         GLint b = (rgba[i][BCOMP] * dest[i][BCOMP] + 65535) >> 16;
+         GLint a = (rgba[i][ACOMP] * dest[i][ACOMP] + 65535) >> 16;
+         rgba[i][RCOMP] = (GLchan) r;
+         rgba[i][GCOMP] = (GLchan) g;
+         rgba[i][BCOMP] = (GLchan) b;
+         rgba[i][ACOMP] = (GLchan) a;
+#else
+         GLint r = (rgba[i][RCOMP] * dest[i][RCOMP] + 255) >> 8;
+         GLint g = (rgba[i][GCOMP] * dest[i][GCOMP] + 255) >> 8;
+         GLint b = (rgba[i][BCOMP] * dest[i][BCOMP] + 255) >> 8;
+         GLint a = (rgba[i][ACOMP] * dest[i][ACOMP] + 255) >> 8;
+         rgba[i][RCOMP] = (GLchan) r;
+         rgba[i][GCOMP] = (GLchan) g;
+         rgba[i][BCOMP] = (GLchan) b;
+         rgba[i][ACOMP] = (GLchan) a;
+#endif
+      }
+   }
+}
+
+
+
+/*
+ * General case blend pixels.
+ * Input:  n - number of pixels
+ *         mask - the usual write mask
+ * In/Out:  rgba - the incoming and modified pixels
+ * Input:  dest - the pixels from the dest color buffer
+ */
+static void _BLENDAPI
+blend_general( GLcontext *ctx, GLuint n, const GLubyte mask[],
+               GLchan rgba[][4], CONST GLchan dest[][4] )
+{
+   const GLfloat rscale = 1.0F / CHAN_MAXF;
+   const GLfloat gscale = 1.0F / CHAN_MAXF;
+   const GLfloat bscale = 1.0F / CHAN_MAXF;
+   const GLfloat ascale = 1.0F / CHAN_MAXF;
+   GLuint i;
+
+   for (i=0;i<n;i++) {
+      if (mask[i]) {
+#if CHAN_TYPE == GL_FLOAT
+         GLfloat Rs, Gs, Bs, As;  /* Source colors */
+         GLfloat Rd, Gd, Bd, Ad;  /* Dest colors */
+#else
+         GLint Rs, Gs, Bs, As;  /* Source colors */
+         GLint Rd, Gd, Bd, Ad;  /* Dest colors */
+#endif
+         GLfloat sR, sG, sB, sA;  /* Source scaling */
+         GLfloat dR, dG, dB, dA;  /* Dest scaling */
+         GLfloat r, g, b, a;      /* result color */
+
+         /* Incoming/source Color */
+         Rs = rgba[i][RCOMP];
+         Gs = rgba[i][GCOMP];
+         Bs = rgba[i][BCOMP];
+         As = rgba[i][ACOMP];
+#if CHAN_TYPE == GL_FLOAT
+         /* clamp */
+         Rs = MIN2(Rs, CHAN_MAXF);
+         Gs = MIN2(Gs, CHAN_MAXF);
+         Bs = MIN2(Bs, CHAN_MAXF);
+         As = MIN2(As, CHAN_MAXF);
+#endif
+
+         /* Frame buffer/dest color */
+         Rd = dest[i][RCOMP];
+         Gd = dest[i][GCOMP];
+         Bd = dest[i][BCOMP];
+         Ad = dest[i][ACOMP];
+#if CHAN_TYPE == GL_FLOAT
+         /* clamp */
+         Rd = MIN2(Rd, CHAN_MAXF);
+         Gd = MIN2(Gd, CHAN_MAXF);
+         Bd = MIN2(Bd, CHAN_MAXF);
+         Ad = MIN2(Ad, CHAN_MAXF);
+#endif
+
+         /* Source RGB factor */
+         switch (ctx->Color.BlendSrcRGB) {
+            case GL_ZERO:
+               sR = sG = sB = 0.0F;
+               break;
+            case GL_ONE:
+               sR = sG = sB = 1.0F;
+               break;
+            case GL_DST_COLOR:
+               sR = (GLfloat) Rd * rscale;
+               sG = (GLfloat) Gd * gscale;
+               sB = (GLfloat) Bd * bscale;
+               break;
+            case GL_ONE_MINUS_DST_COLOR:
+               sR = 1.0F - (GLfloat) Rd * rscale;
+               sG = 1.0F - (GLfloat) Gd * gscale;
+               sB = 1.0F - (GLfloat) Bd * bscale;
+               break;
+            case GL_SRC_ALPHA:
+               sR = sG = sB = (GLfloat) As * ascale;
+               break;
+            case GL_ONE_MINUS_SRC_ALPHA:
+               sR = sG = sB = 1.0F - (GLfloat) As * ascale;
+               break;
+            case GL_DST_ALPHA:
+               sR = sG = sB = (GLfloat) Ad * ascale;
+               break;
+            case GL_ONE_MINUS_DST_ALPHA:
+               sR = sG = sB = 1.0F - (GLfloat) Ad * ascale;
+               break;
+            case GL_SRC_ALPHA_SATURATE:
+               if (As < CHAN_MAX - Ad) {
+                  sR = sG = sB = (GLfloat) As * ascale;
+               }
+               else {
+                  sR = sG = sB = 1.0F - (GLfloat) Ad * ascale;
+               }
+               break;
+            case GL_CONSTANT_COLOR:
+               sR = ctx->Color.BlendColor[0];
+               sG = ctx->Color.BlendColor[1];
+               sB = ctx->Color.BlendColor[2];
+               break;
+            case GL_ONE_MINUS_CONSTANT_COLOR:
+               sR = 1.0F - ctx->Color.BlendColor[0];
+               sG = 1.0F - ctx->Color.BlendColor[1];
+               sB = 1.0F - ctx->Color.BlendColor[2];
+               break;
+            case GL_CONSTANT_ALPHA:
+               sR = sG = sB = ctx->Color.BlendColor[3];
+               break;
+            case GL_ONE_MINUS_CONSTANT_ALPHA:
+               sR = sG = sB = 1.0F - ctx->Color.BlendColor[3];
+               break;
+            case GL_SRC_COLOR: /* GL_NV_blend_square */
+               sR = (GLfloat) Rs * rscale;
+               sG = (GLfloat) Gs * gscale;
+               sB = (GLfloat) Bs * bscale;
+               break;
+            case GL_ONE_MINUS_SRC_COLOR: /* GL_NV_blend_square */
+               sR = 1.0F - (GLfloat) Rs * rscale;
+               sG = 1.0F - (GLfloat) Gs * gscale;
+               sB = 1.0F - (GLfloat) Bs * bscale;
+               break;
+            default:
+               /* this should never happen */
+               _mesa_problem(ctx, "Bad blend source RGB factor in do_blend");
+               return;
+         }
+
+         /* Source Alpha factor */
+         switch (ctx->Color.BlendSrcA) {
+            case GL_ZERO:
+               sA = 0.0F;
+               break;
+            case GL_ONE:
+               sA = 1.0F;
+               break;
+            case GL_DST_COLOR:
+               sA = (GLfloat) Ad * ascale;
+               break;
+            case GL_ONE_MINUS_DST_COLOR:
+               sA = 1.0F - (GLfloat) Ad * ascale;
+               break;
+            case GL_SRC_ALPHA:
+               sA = (GLfloat) As * ascale;
+               break;
+            case GL_ONE_MINUS_SRC_ALPHA:
+               sA = 1.0F - (GLfloat) As * ascale;
+               break;
+            case GL_DST_ALPHA:
+               sA =(GLfloat) Ad * ascale;
+               break;
+            case GL_ONE_MINUS_DST_ALPHA:
+               sA = 1.0F - (GLfloat) Ad * ascale;
+               break;
+            case GL_SRC_ALPHA_SATURATE:
+               sA = 1.0;
+               break;
+            case GL_CONSTANT_COLOR:
+               sA = ctx->Color.BlendColor[3];
+               break;
+            case GL_ONE_MINUS_CONSTANT_COLOR:
+               sA = 1.0F - ctx->Color.BlendColor[3];
+               break;
+            case GL_CONSTANT_ALPHA:
+               sA = ctx->Color.BlendColor[3];
+               break;
+            case GL_ONE_MINUS_CONSTANT_ALPHA:
+               sA = 1.0F - ctx->Color.BlendColor[3];
+               break;
+            case GL_SRC_COLOR: /* GL_NV_blend_square */
+               sA = (GLfloat) As * ascale;
+               break;
+            case GL_ONE_MINUS_SRC_COLOR: /* GL_NV_blend_square */
+               sA = 1.0F - (GLfloat) As * ascale;
+               break;
+            default:
+               /* this should never happen */
+               sA = 0.0F;
+               _mesa_problem(ctx, "Bad blend source A factor in do_blend");
+         }
+
+         /* Dest RGB factor */
+         switch (ctx->Color.BlendDstRGB) {
+            case GL_ZERO:
+               dR = dG = dB = 0.0F;
+               break;
+            case GL_ONE:
+               dR = dG = dB = 1.0F;
+               break;
+            case GL_SRC_COLOR:
+               dR = (GLfloat) Rs * rscale;
+               dG = (GLfloat) Gs * gscale;
+               dB = (GLfloat) Bs * bscale;
+               break;
+            case GL_ONE_MINUS_SRC_COLOR:
+               dR = 1.0F - (GLfloat) Rs * rscale;
+               dG = 1.0F - (GLfloat) Gs * gscale;
+               dB = 1.0F - (GLfloat) Bs * bscale;
+               break;
+            case GL_SRC_ALPHA:
+               dR = dG = dB = (GLfloat) As * ascale;
+               break;
+            case GL_ONE_MINUS_SRC_ALPHA:
+               dR = dG = dB = 1.0F - (GLfloat) As * ascale;
+               break;
+            case GL_DST_ALPHA:
+               dR = dG = dB = (GLfloat) Ad * ascale;
+               break;
+            case GL_ONE_MINUS_DST_ALPHA:
+               dR = dG = dB = 1.0F - (GLfloat) Ad * ascale;
+               break;
+            case GL_CONSTANT_COLOR:
+               dR = ctx->Color.BlendColor[0];
+               dG = ctx->Color.BlendColor[1];
+               dB = ctx->Color.BlendColor[2];
+               break;
+            case GL_ONE_MINUS_CONSTANT_COLOR:
+               dR = 1.0F - ctx->Color.BlendColor[0];
+               dG = 1.0F - ctx->Color.BlendColor[1];
+               dB = 1.0F - ctx->Color.BlendColor[2];
+               break;
+            case GL_CONSTANT_ALPHA:
+               dR = dG = dB = ctx->Color.BlendColor[3];
+               break;
+            case GL_ONE_MINUS_CONSTANT_ALPHA:
+               dR = dG = dB = 1.0F - ctx->Color.BlendColor[3];
+               break;
+            case GL_DST_COLOR: /* GL_NV_blend_square */
+               dR = (GLfloat) Rd * rscale;
+               dG = (GLfloat) Gd * gscale;
+               dB = (GLfloat) Bd * bscale;
+               break;
+            case GL_ONE_MINUS_DST_COLOR: /* GL_NV_blend_square */
+               dR = 1.0F - (GLfloat) Rd * rscale;
+               dG = 1.0F - (GLfloat) Gd * gscale;
+               dB = 1.0F - (GLfloat) Bd * bscale;
+               break;
+            default:
+               /* this should never happen */
+               dR = dG = dB = 0.0F;
+               _mesa_problem(ctx, "Bad blend dest RGB factor in do_blend");
+         }
+
+         /* Dest Alpha factor */
+         switch (ctx->Color.BlendDstA) {
+            case GL_ZERO:
+               dA = 0.0F;
+               break;
+            case GL_ONE:
+               dA = 1.0F;
+               break;
+            case GL_SRC_COLOR:
+               dA = (GLfloat) As * ascale;
+               break;
+            case GL_ONE_MINUS_SRC_COLOR:
+               dA = 1.0F - (GLfloat) As * ascale;
+               break;
+            case GL_SRC_ALPHA:
+               dA = (GLfloat) As * ascale;
+               break;
+            case GL_ONE_MINUS_SRC_ALPHA:
+               dA = 1.0F - (GLfloat) As * ascale;
+               break;
+            case GL_DST_ALPHA:
+               dA = (GLfloat) Ad * ascale;
+               break;
+            case GL_ONE_MINUS_DST_ALPHA:
+               dA = 1.0F - (GLfloat) Ad * ascale;
+               break;
+            case GL_CONSTANT_COLOR:
+               dA = ctx->Color.BlendColor[3];
+               break;
+            case GL_ONE_MINUS_CONSTANT_COLOR:
+               dA = 1.0F - ctx->Color.BlendColor[3];
+               break;
+            case GL_CONSTANT_ALPHA:
+               dA = ctx->Color.BlendColor[3];
+               break;
+            case GL_ONE_MINUS_CONSTANT_ALPHA:
+               dA = 1.0F - ctx->Color.BlendColor[3];
+               break;
+            case GL_DST_COLOR: /* GL_NV_blend_square */
+               dA = (GLfloat) Ad * ascale;
+               break;
+            case GL_ONE_MINUS_DST_COLOR: /* GL_NV_blend_square */
+               dA = 1.0F - (GLfloat) Ad * ascale;
+               break;
+            default:
+               /* this should never happen */
+               dA = 0.0F;
+               _mesa_problem(ctx, "Bad blend dest A factor in do_blend");
+               return;
+         }
+
+         /* Due to round-off problems we have to clamp against zero. */
+         /* Optimization: we don't have to do this for all src & dst factors */
+         if (dA < 0.0F)  dA = 0.0F;
+         if (dR < 0.0F)  dR = 0.0F;
+         if (dG < 0.0F)  dG = 0.0F;
+         if (dB < 0.0F)  dB = 0.0F;
+         if (sA < 0.0F)  sA = 0.0F;
+         if (sR < 0.0F)  sR = 0.0F;
+         if (sG < 0.0F)  sG = 0.0F;
+         if (sB < 0.0F)  sB = 0.0F;
+
+         ASSERT( sR <= 1.0 );
+         ASSERT( sG <= 1.0 );
+         ASSERT( sB <= 1.0 );
+         ASSERT( sA <= 1.0 );
+         ASSERT( dR <= 1.0 );
+         ASSERT( dG <= 1.0 );
+         ASSERT( dB <= 1.0 );
+         ASSERT( dA <= 1.0 );
+
+         /* compute blended color */
+#if CHAN_TYPE == GL_FLOAT
+         if (ctx->Color.BlendEquation==GL_FUNC_ADD_EXT) {
+            r = Rs * sR + Rd * dR;
+            g = Gs * sG + Gd * dG;
+            b = Bs * sB + Bd * dB;
+            a = As * sA + Ad * dA;
+         }
+         else if (ctx->Color.BlendEquation==GL_FUNC_SUBTRACT_EXT) {
+            r = Rs * sR - Rd * dR;
+            g = Gs * sG - Gd * dG;
+            b = Bs * sB - Bd * dB;
+            a = As * sA - Ad * dA;
+         }
+         else if (ctx->Color.BlendEquation==GL_FUNC_REVERSE_SUBTRACT_EXT) {
+            r = Rd * dR - Rs * sR;
+            g = Gd * dG - Gs * sG;
+            b = Bd * dB - Bs * sB;
+            a = Ad * dA - As * sA;
+         }
+         else {
+            /* should never get here */
+            r = g = b = a = 0.0F;  /* silence uninitialized var warning */
+            _mesa_problem(ctx, "unexpected BlendEquation in blend_general()");
+         }
+
+         /* final clamping */
+         rgba[i][RCOMP] = MAX2( r, 0.0F );
+         rgba[i][GCOMP] = MAX2( g, 0.0F );
+         rgba[i][BCOMP] = MAX2( b, 0.0F );
+         rgba[i][ACOMP] = CLAMP( a, 0.0F, CHAN_MAXF );
+#else
+         if (ctx->Color.BlendEquation==GL_FUNC_ADD_EXT) {
+            r = Rs * sR + Rd * dR + 0.5F;
+            g = Gs * sG + Gd * dG + 0.5F;
+            b = Bs * sB + Bd * dB + 0.5F;
+            a = As * sA + Ad * dA + 0.5F;
+         }
+         else if (ctx->Color.BlendEquation==GL_FUNC_SUBTRACT_EXT) {
+            r = Rs * sR - Rd * dR + 0.5F;
+            g = Gs * sG - Gd * dG + 0.5F;
+            b = Bs * sB - Bd * dB + 0.5F;
+            a = As * sA - Ad * dA + 0.5F;
+         }
+         else if (ctx->Color.BlendEquation==GL_FUNC_REVERSE_SUBTRACT_EXT) {
+            r = Rd * dR - Rs * sR + 0.5F;
+            g = Gd * dG - Gs * sG + 0.5F;
+            b = Bd * dB - Bs * sB + 0.5F;
+            a = Ad * dA - As * sA + 0.5F;
+         }
+         else {
+            /* should never get here */
+            r = g = b = a = 0.0F;  /* silence uninitialized var warning */
+            _mesa_problem(ctx, "unexpected BlendEquation in blend_general()");
+         }
+
+         /* final clamping */
+         rgba[i][RCOMP] = (GLchan) (GLint) CLAMP( r, 0.0F, CHAN_MAXF );
+         rgba[i][GCOMP] = (GLchan) (GLint) CLAMP( g, 0.0F, CHAN_MAXF );
+         rgba[i][BCOMP] = (GLchan) (GLint) CLAMP( b, 0.0F, CHAN_MAXF );
+         rgba[i][ACOMP] = (GLchan) (GLint) CLAMP( a, 0.0F, CHAN_MAXF );
+#endif
+      }
+   }
+}
+
+
+/*
+ * Analyze current blending parameters to pick fastest blending function.
+ * Result: the ctx->Color.BlendFunc pointer is updated.
+ */
+void _swrast_choose_blend_func( GLcontext *ctx )
+{
+   const GLenum eq = ctx->Color.BlendEquation;
+   const GLenum srcRGB = ctx->Color.BlendSrcRGB;
+   const GLenum dstRGB = ctx->Color.BlendDstRGB;
+   const GLenum srcA = ctx->Color.BlendSrcA;
+   const GLenum dstA = ctx->Color.BlendDstA;
+
+   if (eq==GL_MIN_EXT) {
+      /* Note: GL_MIN ignores the blending weight factors */
+#if defined(USE_MMX_ASM)
+      if ( cpu_has_mmx ) {
+         SWRAST_CONTEXT(ctx)->BlendFunc = _mesa_mmx_blend_min;
+      }
+      else
+#endif
+         SWRAST_CONTEXT(ctx)->BlendFunc = blend_min;
+   }
+   else if (eq==GL_MAX_EXT) {
+      /* Note: GL_MAX ignores the blending weight factors */
+#if defined(USE_MMX_ASM)
+      if ( cpu_has_mmx ) {
+         SWRAST_CONTEXT(ctx)->BlendFunc = _mesa_mmx_blend_max;
+      }
+      else
+#endif
+         SWRAST_CONTEXT(ctx)->BlendFunc = blend_max;
+   }
+   else if (srcRGB != srcA || dstRGB != dstA) {
+      SWRAST_CONTEXT(ctx)->BlendFunc = blend_general;
+   }
+   else if (eq==GL_FUNC_ADD_EXT && srcRGB==GL_SRC_ALPHA
+            && dstRGB==GL_ONE_MINUS_SRC_ALPHA) {
+#if defined(USE_MMX_ASM)
+      if ( cpu_has_mmx ) {
+         SWRAST_CONTEXT(ctx)->BlendFunc = _mesa_mmx_blend_transparency;
+      }
+      else
+#endif
+	 SWRAST_CONTEXT(ctx)->BlendFunc = blend_transparency;
+   }
+   else if (eq==GL_FUNC_ADD_EXT && srcRGB==GL_ONE && dstRGB==GL_ONE) {
+#if defined(USE_MMX_ASM)
+      if ( cpu_has_mmx ) {
+         SWRAST_CONTEXT(ctx)->BlendFunc = _mesa_mmx_blend_add;
+      }
+      else
+#endif
+         SWRAST_CONTEXT(ctx)->BlendFunc = blend_add;
+   }
+   else if (((eq==GL_FUNC_ADD_EXT || eq==GL_FUNC_REVERSE_SUBTRACT_EXT)
+	     && (srcRGB==GL_ZERO && dstRGB==GL_SRC_COLOR))
+	    ||
+	    ((eq==GL_FUNC_ADD_EXT || eq==GL_FUNC_SUBTRACT_EXT)
+	     && (srcRGB==GL_DST_COLOR && dstRGB==GL_ZERO))) {
+#if defined(USE_MMX_ASM)
+      if ( cpu_has_mmx ) {
+         SWRAST_CONTEXT(ctx)->BlendFunc = _mesa_mmx_blend_modulate;
+      }
+      else
+#endif
+         SWRAST_CONTEXT(ctx)->BlendFunc = blend_modulate;
+   }
+   else if (eq==GL_FUNC_ADD_EXT && srcRGB == GL_ZERO && dstRGB == GL_ONE) {
+      SWRAST_CONTEXT(ctx)->BlendFunc = blend_noop;
+   }
+   else if (eq==GL_FUNC_ADD_EXT && srcRGB == GL_ONE && dstRGB == GL_ZERO) {
+      SWRAST_CONTEXT(ctx)->BlendFunc = blend_replace;
+   }
+   else {
+      SWRAST_CONTEXT(ctx)->BlendFunc = blend_general;
+   }
+}
+
+
+
+/*
+ * Apply the blending operator to a span of pixels.
+ * We can handle horizontal runs of pixels (spans) or arrays of x/y
+ * pixel coordinates.
+ */
+void
+_swrast_blend_span( GLcontext *ctx, const struct sw_span *span,
+                  GLchan rgba[][4] )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   GLchan framebuffer[MAX_WIDTH][4];
+
+   ASSERT(span->end <= MAX_WIDTH);
+   ASSERT(span->arrayMask & SPAN_RGBA);
+   ASSERT(!ctx->Color._LogicOpEnabled);
+
+   /* Read span of current frame buffer pixels */
+   if (span->arrayMask & SPAN_XY) {
+      /* array of x/y pixel coords */
+      (*swrast->Driver.ReadRGBAPixels)( ctx, span->end,
+                                        span->array->x, span->array->y,
+                                        framebuffer, span->array->mask );
+      if (swrast->_RasterMask & ALPHABUF_BIT) {
+         _swrast_read_alpha_pixels( ctx, span->end,
+                                  span->array->x, span->array->y,
+                                  framebuffer, span->array->mask );
+      }
+   }
+   else {
+      /* horizontal run of pixels */
+      _swrast_read_rgba_span( ctx, ctx->DrawBuffer, span->end,
+                            span->x, span->y, framebuffer );
+   }
+
+   SWRAST_CONTEXT(ctx)->BlendFunc( ctx, span->end, span->array->mask, rgba,
+				   (const GLchan (*)[4]) framebuffer );
+}
diff --git a/reactos/lib/mesa32/src/swrast/s_blend.h b/reactos/lib/mesa32/src/swrast/s_blend.h
new file mode 100644
index 00000000000..11bf378e319
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_blend.h
@@ -0,0 +1,45 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef S_BLEND_H
+#define S_BLEND_H
+
+
+#include "mtypes.h"
+#include "s_context.h"
+
+
+
+extern void
+_swrast_blend_span( GLcontext *ctx, const struct sw_span *span,
+                  GLchan rgba[][4] );
+
+
+extern void
+_swrast_choose_blend_func( GLcontext *ctx );
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/swrast/s_buffers.c b/reactos/lib/mesa32/src/swrast/s_buffers.c
new file mode 100644
index 00000000000..22aee6c91d2
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_buffers.c
@@ -0,0 +1,287 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "colormac.h"
+#include "macros.h"
+#include "imports.h"
+
+#include "s_accum.h"
+#include "s_alphabuf.h"
+#include "s_context.h"
+#include "s_depth.h"
+#include "s_masking.h"
+#include "s_stencil.h"
+
+
+
+
+/*
+ * Clear the color buffer when glColorMask or glIndexMask is in effect.
+ */
+static void
+clear_color_buffer_with_masking( GLcontext *ctx )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   const GLint x = ctx->DrawBuffer->_Xmin;
+   const GLint y = ctx->DrawBuffer->_Ymin;
+   const GLint height = ctx->DrawBuffer->_Ymax - ctx->DrawBuffer->_Ymin;
+   const GLint width  = ctx->DrawBuffer->_Xmax - ctx->DrawBuffer->_Xmin;
+
+   if (ctx->Visual.rgbMode) {
+      /* RGBA mode */
+      GLchan clearColor[4];
+      GLint i;
+      CLAMPED_FLOAT_TO_CHAN(clearColor[RCOMP], ctx->Color.ClearColor[0]);
+      CLAMPED_FLOAT_TO_CHAN(clearColor[GCOMP], ctx->Color.ClearColor[1]);
+      CLAMPED_FLOAT_TO_CHAN(clearColor[BCOMP], ctx->Color.ClearColor[2]);
+      CLAMPED_FLOAT_TO_CHAN(clearColor[ACOMP], ctx->Color.ClearColor[3]);
+      for (i = 0; i < height; i++) {
+         GLchan rgba[MAX_WIDTH][4];
+         GLint j;
+         for (j = 0; j < width; j++) {
+            COPY_CHAN4(rgba[j], clearColor);
+         }
+         _swrast_mask_rgba_array( ctx, width, x, y + i, rgba );
+         (*swrast->Driver.WriteRGBASpan)( ctx, width, x, y + i,
+                                          (CONST GLchan (*)[4]) rgba, NULL );
+      }
+   }
+   else {
+      /* Color index mode */
+      GLuint span[MAX_WIDTH];
+      GLubyte mask[MAX_WIDTH];
+      GLint i, j;
+      MEMSET( mask, 1, width );
+      for (i=0;i<height;i++) {
+         for (j=0;j<width;j++) {
+            span[j] = ctx->Color.ClearIndex;
+         }
+         _swrast_mask_index_array( ctx, width, x, y + i, span );
+         (*swrast->Driver.WriteCI32Span)( ctx, width, x, y + i, span, mask );
+      }
+   }
+}
+
+
+
+/*
+ * Clear a color buffer without index/channel masking.
+ */
+static void
+clear_color_buffer(GLcontext *ctx)
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   const GLint x = ctx->DrawBuffer->_Xmin;
+   const GLint y = ctx->DrawBuffer->_Ymin;
+   const GLint height = ctx->DrawBuffer->_Ymax - ctx->DrawBuffer->_Ymin;
+   const GLint width  = ctx->DrawBuffer->_Xmax - ctx->DrawBuffer->_Xmin;
+
+   if (ctx->Visual.rgbMode) {
+      /* RGBA mode */
+      GLchan clearColor[4];
+      GLint i;
+
+      CLAMPED_FLOAT_TO_CHAN(clearColor[RCOMP], ctx->Color.ClearColor[0]);
+      CLAMPED_FLOAT_TO_CHAN(clearColor[GCOMP], ctx->Color.ClearColor[1]);
+      CLAMPED_FLOAT_TO_CHAN(clearColor[BCOMP], ctx->Color.ClearColor[2]);
+      CLAMPED_FLOAT_TO_CHAN(clearColor[ACOMP], ctx->Color.ClearColor[3]);
+
+      ASSERT(*((GLuint *) &ctx->Color.ColorMask) == 0xffffffff);
+      ASSERT(swrast->Driver.WriteRGBASpan);
+
+      for (i = 0; i < height; i++) {
+         (*swrast->Driver.WriteMonoRGBASpan)( ctx, width, x, y + i,
+                                              clearColor, NULL );
+      }
+   }
+   else {
+      /* Color index mode */
+      GLint i;
+      ASSERT((ctx->Color.IndexMask & ((1 << ctx->Visual.indexBits) - 1))
+             == (GLuint) ((1 << ctx->Visual.indexBits) - 1));
+      ASSERT(swrast->Driver.WriteMonoCISpan);
+      for (i = 0; i < height; i++) {
+         (*swrast->Driver.WriteMonoCISpan)( ctx, width, x, y + i,
+                                            ctx->Color.ClearIndex, NULL);
+      }
+   }
+}
+
+
+
+/*
+ * Clear the front/back/left/right color buffers.
+ * This function is usually only called if we need to clear the
+ * buffers with masking.
+ */
+static void
+clear_color_buffers(GLcontext *ctx)
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   const GLuint colorMask = *((GLuint *) &ctx->Color.ColorMask);
+   GLuint bufferBit;
+
+   /* loop over four possible dest color buffers */
+   for (bufferBit = 1; bufferBit <= 8; bufferBit = bufferBit << 1) {
+      if (bufferBit & ctx->Color._DrawDestMask) {
+         (*swrast->Driver.SetBuffer)(ctx, ctx->DrawBuffer, bufferBit);
+
+         if (colorMask != 0xffffffff) {
+            clear_color_buffer_with_masking(ctx);
+         }
+         else {
+            clear_color_buffer(ctx);
+         }
+      }
+   }
+
+   /* restore default read/draw buffer */
+   _swrast_use_draw_buffer(ctx);
+}
+
+
+
+void
+_swrast_Clear( GLcontext *ctx, GLbitfield mask,
+	       GLboolean all,
+	       GLint x, GLint y, GLint width, GLint height )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+#ifdef DEBUG
+   {
+      GLbitfield legalBits = DD_FRONT_LEFT_BIT |
+	 DD_FRONT_RIGHT_BIT |
+	 DD_BACK_LEFT_BIT |
+	 DD_BACK_RIGHT_BIT |
+	 DD_DEPTH_BIT |
+	 DD_STENCIL_BIT |
+	 DD_ACCUM_BIT;
+      assert((mask & (~legalBits)) == 0);
+   }
+#endif
+
+   RENDER_START(swrast,ctx);
+
+   /* do software clearing here */
+   if (mask) {
+      if (mask & ctx->Color._DrawDestMask)   clear_color_buffers(ctx);
+      if (mask & GL_DEPTH_BUFFER_BIT)    _swrast_clear_depth_buffer(ctx);
+      if (mask & GL_ACCUM_BUFFER_BIT)    _swarst_clear_accum_buffer(ctx);
+      if (mask & GL_STENCIL_BUFFER_BIT)  _swrast_clear_stencil_buffer(ctx);
+   }
+
+   /* clear software-based alpha buffer(s) */
+   if ( (mask & GL_COLOR_BUFFER_BIT)
+	&& ctx->DrawBuffer->UseSoftwareAlphaBuffers
+	&& ctx->Color.ColorMask[ACOMP]) {
+      _swrast_clear_alpha_buffers( ctx );
+   }
+
+   RENDER_FINISH(swrast,ctx);
+}
+
+
+void
+_swrast_alloc_buffers( GLframebuffer *buffer )
+{
+   /* Reallocate other buffers if needed. */
+   if (buffer->UseSoftwareDepthBuffer) {
+      _swrast_alloc_depth_buffer( buffer );
+   }
+   if (buffer->UseSoftwareStencilBuffer) {
+      _swrast_alloc_stencil_buffer( buffer );
+   }
+   if (buffer->UseSoftwareAccumBuffer) {
+      _swrast_alloc_accum_buffer( buffer );
+   }
+   if (buffer->UseSoftwareAlphaBuffers) {
+      _swrast_alloc_alpha_buffers( buffer );
+   }
+}
+
+
+/*
+ * Fallback for ctx->Driver.DrawBuffer()
+ */
+void
+_swrast_DrawBuffer( GLcontext *ctx, GLenum mode )
+{
+   _swrast_use_draw_buffer(ctx);
+}
+
+
+/*
+ * Setup things so that we read/write spans from the user-designated
+ * read buffer (set via glReadPixels).  We usually just have to call
+ * this for glReadPixels, glCopyPixels, etc.
+ */
+void
+_swrast_use_read_buffer( GLcontext *ctx )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+
+   /* Do this so the software-emulated alpha plane span functions work! */
+   swrast->CurrentBuffer = ctx->Pixel._ReadSrcMask;
+   /* Tell the device driver where to read/write spans */
+   (*swrast->Driver.SetBuffer)( ctx, ctx->ReadBuffer, swrast->CurrentBuffer );
+}
+
+
+/*
+ * Setup things so that we read/write spans from the default draw buffer.
+ * This is the usual mode that Mesa's software rasterizer operates in.
+ */
+void
+_swrast_use_draw_buffer( GLcontext *ctx )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+
+   /* The user can specify rendering to zero, one, two, or four color
+    * buffers simultaneously with glDrawBuffer()!
+    * We don't expect the span/point/line/triangle functions to deal with
+    * that mess so we'll iterate over the multiple buffers as needed.
+    * But usually we only render to one color buffer at a time.
+    * We set ctx->Color._DriverDrawBuffer to that buffer and tell the
+    * device driver to use that buffer.
+    * Look in s_span.c's multi_write_rgba_span() function to see how
+    * we loop over multiple color buffers when needed.
+    */
+
+   if (ctx->Color._DrawDestMask & FRONT_LEFT_BIT)
+      swrast->CurrentBuffer = FRONT_LEFT_BIT;
+   else if (ctx->Color._DrawDestMask & BACK_LEFT_BIT)
+      swrast->CurrentBuffer = BACK_LEFT_BIT;
+   else if (ctx->Color._DrawDestMask & FRONT_RIGHT_BIT)
+      swrast->CurrentBuffer = FRONT_RIGHT_BIT;
+   else if (ctx->Color._DrawDestMask & BACK_RIGHT_BIT)
+      swrast->CurrentBuffer = BACK_RIGHT_BIT;
+   else
+      /* glDrawBuffer(GL_NONE) */
+      swrast->CurrentBuffer = FRONT_LEFT_BIT; /* we always have this buffer */
+
+   (*swrast->Driver.SetBuffer)( ctx, ctx->DrawBuffer, swrast->CurrentBuffer );
+}
diff --git a/reactos/lib/mesa32/src/swrast/s_context.c b/reactos/lib/mesa32/src/swrast/s_context.c
new file mode 100644
index 00000000000..c69d4cfd5d4
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_context.c
@@ -0,0 +1,683 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ *    Brian Paul
+ */
+
+#include "imports.h"
+#include "context.h"
+#include "mtypes.h"
+#include "texobj.h"
+#include "nvfragprog.h"
+
+#include "swrast.h"
+#include "s_blend.h"
+#include "s_context.h"
+#include "s_lines.h"
+#include "s_points.h"
+#include "s_span.h"
+#include "s_triangle.h"
+#include "s_texture.h"
+
+
+/*
+ * Recompute the value of swrast->_RasterMask, etc. according to
+ * the current context.
+ */
+static void
+_swrast_update_rasterflags( GLcontext *ctx )
+{
+   GLuint RasterMask = 0;
+
+   if (ctx->Color.AlphaEnabled)           RasterMask |= ALPHATEST_BIT;
+   if (ctx->Color.BlendEnabled)           RasterMask |= BLEND_BIT;
+   if (ctx->Depth.Test)                   RasterMask |= DEPTH_BIT;
+   if (ctx->Fog.Enabled)                  RasterMask |= FOG_BIT;
+   if (ctx->Scissor.Enabled)              RasterMask |= CLIP_BIT;
+   if (ctx->Stencil.Enabled)              RasterMask |= STENCIL_BIT;
+   if (ctx->Visual.rgbMode) {
+      const GLuint colorMask = *((GLuint *) &ctx->Color.ColorMask);
+      if (colorMask != 0xffffffff)        RasterMask |= MASKING_BIT;
+      if (ctx->Color._LogicOpEnabled)     RasterMask |= LOGIC_OP_BIT;
+      if (ctx->Texture._EnabledUnits)     RasterMask |= TEXTURE_BIT;
+   }
+   else {
+      if (ctx->Color.IndexMask != 0xffffffff) RasterMask |= MASKING_BIT;
+      if (ctx->Color.IndexLogicOpEnabled)     RasterMask |= LOGIC_OP_BIT;
+   }
+
+   if (ctx->DrawBuffer->UseSoftwareAlphaBuffers
+       && ctx->Color.ColorMask[ACOMP]
+       && ctx->Color.DrawBuffer != GL_NONE)
+      RasterMask |= ALPHABUF_BIT;
+
+   if (   ctx->Viewport.X < 0
+       || ctx->Viewport.X + ctx->Viewport.Width > (GLint) ctx->DrawBuffer->Width
+       || ctx->Viewport.Y < 0
+       || ctx->Viewport.Y + ctx->Viewport.Height > (GLint) ctx->DrawBuffer->Height) {
+      RasterMask |= CLIP_BIT;
+   }
+
+   if (ctx->Depth.OcclusionTest || ctx->Occlusion.Active)
+      RasterMask |= OCCLUSION_BIT;
+
+
+   /* If we're not drawing to exactly one color buffer set the
+    * MULTI_DRAW_BIT flag.  Also set it if we're drawing to no
+    * buffers or the RGBA or CI mask disables all writes.
+    */
+   if (ctx->Color._DrawDestMask != FRONT_LEFT_BIT &&
+       ctx->Color._DrawDestMask != BACK_LEFT_BIT &&
+       ctx->Color._DrawDestMask != FRONT_RIGHT_BIT &&
+       ctx->Color._DrawDestMask != BACK_RIGHT_BIT) {
+      /* more than one color buffer designated for writing (or zero buffers) */
+      RasterMask |= MULTI_DRAW_BIT;
+   }
+   else if (ctx->Visual.rgbMode && *((GLuint *) ctx->Color.ColorMask) == 0) {
+      RasterMask |= MULTI_DRAW_BIT; /* all RGBA channels disabled */
+   }
+   else if (!ctx->Visual.rgbMode && ctx->Color.IndexMask==0) {
+      RasterMask |= MULTI_DRAW_BIT; /* all color index bits disabled */
+   }
+
+   if (ctx->FragmentProgram.Enabled) {
+      RasterMask |= FRAGPROG_BIT;
+   }
+
+   SWRAST_CONTEXT(ctx)->_RasterMask = RasterMask;
+}
+
+
+static void
+_swrast_update_polygon( GLcontext *ctx )
+{
+   GLfloat backface_sign = 1;
+
+   if (ctx->Polygon.CullFlag) {
+      backface_sign = 1;
+      switch(ctx->Polygon.CullFaceMode) {
+      case GL_BACK:
+	 if(ctx->Polygon.FrontFace==GL_CCW)
+	    backface_sign = -1;
+	 break;
+      case GL_FRONT:
+	 if(ctx->Polygon.FrontFace!=GL_CCW)
+	    backface_sign = -1;
+	 break;
+      default:
+      case GL_FRONT_AND_BACK:
+	 backface_sign = 0;
+	 break;
+      }
+   }
+   else {
+      backface_sign = 0;
+   }
+
+   SWRAST_CONTEXT(ctx)->_BackfaceSign = backface_sign;
+}
+
+
+static void
+_swrast_update_hint( GLcontext *ctx )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   swrast->_PreferPixelFog = (!swrast->AllowVertexFog ||
+			      (ctx->Hint.Fog == GL_NICEST &&
+			       swrast->AllowPixelFog));
+}
+
+
+/*
+ * Update the swrast->_AnyTextureCombine flag.
+ */
+static void
+_swrast_update_texture_env( GLcontext *ctx )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   GLuint i;
+   swrast->_AnyTextureCombine = GL_FALSE;
+   for (i = 0; i < ctx->Const.MaxTextureUnits; i++) {
+      if (ctx->Texture.Unit[i].EnvMode == GL_COMBINE_EXT ||
+          ctx->Texture.Unit[i].EnvMode == GL_COMBINE4_NV) {
+         swrast->_AnyTextureCombine = GL_TRUE;
+         return;
+      }
+   }
+}
+
+
+#define _SWRAST_NEW_DERIVED (_SWRAST_NEW_RASTERMASK |	\
+			     _NEW_TEXTURE |		\
+			     _NEW_HINT |		\
+			     _NEW_POLYGON )
+
+/* State referenced by _swrast_choose_triangle, _swrast_choose_line.
+ */
+#define _SWRAST_NEW_TRIANGLE (_SWRAST_NEW_DERIVED |		\
+			      _NEW_RENDERMODE|			\
+                              _NEW_POLYGON|			\
+                              _NEW_DEPTH|			\
+                              _NEW_STENCIL|			\
+                              _NEW_COLOR|			\
+                              _NEW_TEXTURE|			\
+                              _SWRAST_NEW_RASTERMASK|		\
+                              _NEW_LIGHT|			\
+                              _NEW_FOG |			\
+			      _DD_NEW_SEPARATE_SPECULAR)
+
+#define _SWRAST_NEW_LINE (_SWRAST_NEW_DERIVED |		\
+			  _NEW_RENDERMODE|		\
+                          _NEW_LINE|			\
+                          _NEW_TEXTURE|			\
+                          _NEW_LIGHT|			\
+                          _NEW_FOG|			\
+                          _NEW_DEPTH |			\
+                          _DD_NEW_SEPARATE_SPECULAR)
+
+#define _SWRAST_NEW_POINT (_SWRAST_NEW_DERIVED |	\
+			   _NEW_RENDERMODE |		\
+			   _NEW_POINT |			\
+			   _NEW_TEXTURE |		\
+			   _NEW_LIGHT |			\
+			   _NEW_FOG |			\
+                           _DD_NEW_SEPARATE_SPECULAR)
+
+#define _SWRAST_NEW_TEXTURE_SAMPLE_FUNC _NEW_TEXTURE
+
+#define _SWRAST_NEW_TEXTURE_ENV_MODE _NEW_TEXTURE
+
+#define _SWRAST_NEW_BLEND_FUNC _NEW_COLOR
+
+
+
+/* Stub for swrast->Triangle to select a true triangle function
+ * after a state change.
+ */
+static void
+_swrast_validate_triangle( GLcontext *ctx,
+			   const SWvertex *v0,
+                           const SWvertex *v1,
+                           const SWvertex *v2 )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+
+   _swrast_validate_derived( ctx );
+   swrast->choose_triangle( ctx );
+
+   if (ctx->Texture._EnabledUnits == 0
+       && NEED_SECONDARY_COLOR(ctx)
+       && !ctx->FragmentProgram.Enabled) {
+      /* separate specular color, but no texture */
+      swrast->SpecTriangle = swrast->Triangle;
+      swrast->Triangle = _swrast_add_spec_terms_triangle;
+   }
+
+   swrast->Triangle( ctx, v0, v1, v2 );
+}
+
+static void
+_swrast_validate_line( GLcontext *ctx, const SWvertex *v0, const SWvertex *v1 )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+
+   _swrast_validate_derived( ctx );
+   swrast->choose_line( ctx );
+
+   if (ctx->Texture._EnabledUnits == 0
+       && NEED_SECONDARY_COLOR(ctx)
+       && !ctx->FragmentProgram.Enabled) {
+      swrast->SpecLine = swrast->Line;
+      swrast->Line = _swrast_add_spec_terms_line;
+   }
+
+
+   swrast->Line( ctx, v0, v1 );
+}
+
+static void
+_swrast_validate_point( GLcontext *ctx, const SWvertex *v0 )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+
+   _swrast_validate_derived( ctx );
+   swrast->choose_point( ctx );
+
+   if (ctx->Texture._EnabledUnits == 0
+       && NEED_SECONDARY_COLOR(ctx)
+       && !ctx->FragmentProgram.Enabled) {
+      swrast->SpecPoint = swrast->Point;
+      swrast->Point = _swrast_add_spec_terms_point;
+   }
+
+   swrast->Point( ctx, v0 );
+}
+
+
+static void _ASMAPI
+_swrast_validate_blend_func( GLcontext *ctx, GLuint n,
+			     const GLubyte mask[],
+			     GLchan src[][4],
+			     CONST GLchan dst[][4] )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+
+   _swrast_validate_derived( ctx );
+   _swrast_choose_blend_func( ctx );
+
+   swrast->BlendFunc( ctx, n, mask, src, dst );
+}
+
+
+static void
+_swrast_validate_texture_sample( GLcontext *ctx, GLuint texUnit,
+				 const struct gl_texture_object *tObj,
+				 GLuint n, const GLfloat texcoords[][4],
+				 const GLfloat lambda[], GLchan rgba[][4] )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+
+   _swrast_validate_derived( ctx );
+
+   /* Compute min/mag filter threshold */
+   if (tObj->MinFilter != tObj->MagFilter) {
+      if (tObj->MagFilter == GL_LINEAR
+          && (tObj->MinFilter == GL_NEAREST_MIPMAP_NEAREST ||
+              tObj->MinFilter == GL_NEAREST_MIPMAP_LINEAR)) {
+         swrast->_MinMagThresh[texUnit] = 0.5F;
+      }
+      else {
+         swrast->_MinMagThresh[texUnit] = 0.0F;
+      }
+   }
+
+   swrast->TextureSample[texUnit] =
+      _swrast_choose_texture_sample_func( ctx, tObj );
+
+   swrast->TextureSample[texUnit]( ctx, texUnit, tObj, n, texcoords,
+                                   lambda, rgba );
+}
+
+
+static void
+_swrast_sleep( GLcontext *ctx, GLuint new_state )
+{
+}
+
+
+static void
+_swrast_invalidate_state( GLcontext *ctx, GLuint new_state )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   GLuint i;
+
+   swrast->NewState |= new_state;
+
+   /* After 10 statechanges without any swrast functions being called,
+    * put the module to sleep.
+    */
+   if (++swrast->StateChanges > 10) {
+      swrast->InvalidateState = _swrast_sleep;
+      swrast->NewState = ~0;
+      new_state = ~0;
+   }
+
+   if (new_state & swrast->invalidate_triangle)
+      swrast->Triangle = _swrast_validate_triangle;
+
+   if (new_state & swrast->invalidate_line)
+      swrast->Line = _swrast_validate_line;
+
+   if (new_state & swrast->invalidate_point)
+      swrast->Point = _swrast_validate_point;
+
+   if (new_state & _SWRAST_NEW_BLEND_FUNC)
+      swrast->BlendFunc = _swrast_validate_blend_func;
+
+   if (new_state & _SWRAST_NEW_TEXTURE_SAMPLE_FUNC)
+      for (i = 0 ; i < ctx->Const.MaxTextureUnits ; i++)
+	 swrast->TextureSample[i] = _swrast_validate_texture_sample;
+
+   if (ctx->Visual.rgbMode) {
+      ASSERT(swrast->Driver.WriteRGBASpan);
+      ASSERT(swrast->Driver.WriteRGBSpan);
+      ASSERT(swrast->Driver.WriteMonoRGBASpan);
+      ASSERT(swrast->Driver.WriteRGBAPixels);
+      ASSERT(swrast->Driver.WriteMonoRGBAPixels);
+      ASSERT(swrast->Driver.ReadRGBASpan);
+      ASSERT(swrast->Driver.ReadRGBAPixels);
+   }
+   else {
+      ASSERT(swrast->Driver.WriteCI32Span);
+      ASSERT(swrast->Driver.WriteCI8Span);
+      ASSERT(swrast->Driver.WriteMonoCISpan);
+      ASSERT(swrast->Driver.WriteCI32Pixels);
+      ASSERT(swrast->Driver.WriteMonoCIPixels);
+      ASSERT(swrast->Driver.ReadCI32Span);
+      ASSERT(swrast->Driver.ReadCI32Pixels);
+   }
+}
+
+
+void
+_swrast_validate_derived( GLcontext *ctx )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+
+   if (swrast->NewState) {
+      if (swrast->NewState & _SWRAST_NEW_RASTERMASK)
+ 	 _swrast_update_rasterflags( ctx );
+
+      if (swrast->NewState & _NEW_POLYGON)
+	 _swrast_update_polygon( ctx );
+
+      if (swrast->NewState & _NEW_HINT)
+	 _swrast_update_hint( ctx );
+
+      if (swrast->NewState & _SWRAST_NEW_TEXTURE_ENV_MODE)
+	 _swrast_update_texture_env( ctx );
+
+      swrast->NewState = 0;
+      swrast->StateChanges = 0;
+      swrast->InvalidateState = _swrast_invalidate_state;
+   }
+}
+
+#define SWRAST_DEBUG 0
+
+/* Public entrypoints:  See also s_accum.c, s_bitmap.c, etc.
+ */
+void
+_swrast_Quad( GLcontext *ctx,
+	      const SWvertex *v0, const SWvertex *v1,
+              const SWvertex *v2, const SWvertex *v3 )
+{
+   if (SWRAST_DEBUG) {
+      _mesa_debug(ctx, "_swrast_Quad\n");
+      _swrast_print_vertex( ctx, v0 );
+      _swrast_print_vertex( ctx, v1 );
+      _swrast_print_vertex( ctx, v2 );
+      _swrast_print_vertex( ctx, v3 );
+   }
+   SWRAST_CONTEXT(ctx)->Triangle( ctx, v0, v1, v3 );
+   SWRAST_CONTEXT(ctx)->Triangle( ctx, v1, v2, v3 );
+}
+
+void
+_swrast_Triangle( GLcontext *ctx, const SWvertex *v0,
+                  const SWvertex *v1, const SWvertex *v2 )
+{
+   if (SWRAST_DEBUG) {
+      _mesa_debug(ctx, "_swrast_Triangle\n");
+      _swrast_print_vertex( ctx, v0 );
+      _swrast_print_vertex( ctx, v1 );
+      _swrast_print_vertex( ctx, v2 );
+   }
+   SWRAST_CONTEXT(ctx)->Triangle( ctx, v0, v1, v2 );
+}
+
+void
+_swrast_Line( GLcontext *ctx, const SWvertex *v0, const SWvertex *v1 )
+{
+   if (SWRAST_DEBUG) {
+      _mesa_debug(ctx, "_swrast_Line\n");
+      _swrast_print_vertex( ctx, v0 );
+      _swrast_print_vertex( ctx, v1 );
+   }
+   SWRAST_CONTEXT(ctx)->Line( ctx, v0, v1 );
+}
+
+void
+_swrast_Point( GLcontext *ctx, const SWvertex *v0 )
+{
+   if (SWRAST_DEBUG) {
+      _mesa_debug(ctx, "_swrast_Point\n");
+      _swrast_print_vertex( ctx, v0 );
+   }
+   SWRAST_CONTEXT(ctx)->Point( ctx, v0 );
+}
+
+void
+_swrast_InvalidateState( GLcontext *ctx, GLuint new_state )
+{
+   if (SWRAST_DEBUG) {
+      _mesa_debug(ctx, "_swrast_InvalidateState\n");
+   }
+   SWRAST_CONTEXT(ctx)->InvalidateState( ctx, new_state );
+}
+
+void
+_swrast_ResetLineStipple( GLcontext *ctx )
+{
+   if (SWRAST_DEBUG) {
+      _mesa_debug(ctx, "_swrast_ResetLineStipple\n");
+   }
+   SWRAST_CONTEXT(ctx)->StippleCounter = 0;
+}
+
+void
+_swrast_allow_vertex_fog( GLcontext *ctx, GLboolean value )
+{
+   if (SWRAST_DEBUG) {
+      _mesa_debug(ctx, "_swrast_allow_vertex_fog %d\n", value);
+   }
+   SWRAST_CONTEXT(ctx)->InvalidateState( ctx, _NEW_HINT );
+   SWRAST_CONTEXT(ctx)->AllowVertexFog = value;
+}
+
+void
+_swrast_allow_pixel_fog( GLcontext *ctx, GLboolean value )
+{
+   if (SWRAST_DEBUG) {
+      _mesa_debug(ctx, "_swrast_allow_pixel_fog %d\n", value);
+   }
+   SWRAST_CONTEXT(ctx)->InvalidateState( ctx, _NEW_HINT );
+   SWRAST_CONTEXT(ctx)->AllowPixelFog = value;
+}
+
+
+GLboolean
+_swrast_CreateContext( GLcontext *ctx )
+{
+   GLuint i;
+   SWcontext *swrast = (SWcontext *)CALLOC(sizeof(SWcontext));
+
+   if (SWRAST_DEBUG) {
+      _mesa_debug(ctx, "_swrast_CreateContext\n");
+   }
+
+   if (!swrast)
+      return GL_FALSE;
+
+   swrast->NewState = ~0;
+
+   swrast->choose_point = _swrast_choose_point;
+   swrast->choose_line = _swrast_choose_line;
+   swrast->choose_triangle = _swrast_choose_triangle;
+
+   swrast->invalidate_point = _SWRAST_NEW_POINT;
+   swrast->invalidate_line = _SWRAST_NEW_LINE;
+   swrast->invalidate_triangle = _SWRAST_NEW_TRIANGLE;
+
+   swrast->Point = _swrast_validate_point;
+   swrast->Line = _swrast_validate_line;
+   swrast->Triangle = _swrast_validate_triangle;
+   swrast->InvalidateState = _swrast_sleep;
+   swrast->BlendFunc = _swrast_validate_blend_func;
+
+   swrast->AllowVertexFog = GL_TRUE;
+   swrast->AllowPixelFog = GL_TRUE;
+
+   if (ctx->Visual.doubleBufferMode)
+      swrast->CurrentBuffer = BACK_LEFT_BIT;
+   else
+      swrast->CurrentBuffer = FRONT_LEFT_BIT;
+
+   /* Optimized Accum buffer */
+   swrast->_IntegerAccumMode = GL_TRUE;
+   swrast->_IntegerAccumScaler = 0.0;
+
+   for (i = 0; i < MAX_TEXTURE_IMAGE_UNITS; i++)
+      swrast->TextureSample[i] = _swrast_validate_texture_sample;
+
+   swrast->SpanArrays = MALLOC_STRUCT(span_arrays);
+   if (!swrast->SpanArrays) {
+      FREE(swrast);
+      return GL_FALSE;
+   }
+
+   /* init point span buffer */
+   swrast->PointSpan.primitive = GL_POINT;
+   swrast->PointSpan.start = 0;
+   swrast->PointSpan.end = 0;
+   swrast->PointSpan.facing = 0;
+   swrast->PointSpan.array = swrast->SpanArrays;
+
+   assert(ctx->Const.MaxTextureUnits > 0);
+   assert(ctx->Const.MaxTextureUnits <= MAX_TEXTURE_UNITS);
+
+   swrast->TexelBuffer = (GLchan *) MALLOC(ctx->Const.MaxTextureUnits *
+                                           MAX_WIDTH * 4 * sizeof(GLchan));
+   if (!swrast->TexelBuffer) {
+      FREE(swrast->SpanArrays);
+      FREE(swrast);
+      return GL_FALSE;
+   }
+
+   ctx->swrast_context = swrast;
+
+   return GL_TRUE;
+}
+
+void
+_swrast_DestroyContext( GLcontext *ctx )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+
+   if (SWRAST_DEBUG) {
+      _mesa_debug(ctx, "_swrast_DestroyContext\n");
+   }
+
+   FREE( swrast->SpanArrays );
+   FREE( swrast->TexelBuffer );
+   FREE( swrast );
+
+   ctx->swrast_context = 0;
+}
+
+
+struct swrast_device_driver *
+_swrast_GetDeviceDriverReference( GLcontext *ctx )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   return &swrast->Driver;
+}
+
+void
+_swrast_flush( GLcontext *ctx )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   /* flush any pending fragments from rendering points */
+   if (swrast->PointSpan.end > 0) {
+      if (ctx->Visual.rgbMode) {
+         if (ctx->Texture._EnabledCoordUnits)
+            _swrast_write_texture_span(ctx, &(swrast->PointSpan));
+         else
+            _swrast_write_rgba_span(ctx, &(swrast->PointSpan));
+      }
+      else {
+         _swrast_write_index_span(ctx, &(swrast->PointSpan));
+      }
+      swrast->PointSpan.end = 0;
+   }
+}
+
+void
+_swrast_render_primitive( GLcontext *ctx, GLenum prim )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   if (swrast->Primitive == GL_POINTS && prim != GL_POINTS) {
+      _swrast_flush(ctx);
+   }
+   swrast->Primitive = prim;
+}
+
+
+void
+_swrast_render_start( GLcontext *ctx )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   if (swrast->Driver.SpanRenderStart)
+      swrast->Driver.SpanRenderStart( ctx );
+   swrast->PointSpan.end = 0;
+}
+ 
+void
+_swrast_render_finish( GLcontext *ctx )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   if (swrast->Driver.SpanRenderFinish)
+      swrast->Driver.SpanRenderFinish( ctx );
+
+   _swrast_flush(ctx);
+}
+
+
+#define SWRAST_DEBUG_VERTICES 0
+
+void
+_swrast_print_vertex( GLcontext *ctx, const SWvertex *v )
+{
+   GLuint i;
+
+   if (SWRAST_DEBUG_VERTICES) {
+      _mesa_debug(ctx, "win %f %f %f %f\n",
+                  v->win[0], v->win[1], v->win[2], v->win[3]);
+
+      for (i = 0 ; i < ctx->Const.MaxTextureUnits ; i++)
+	 if (ctx->Texture.Unit[i]._ReallyEnabled)
+	    _mesa_debug(ctx, "texcoord[%d] %f %f %f %f\n", i,
+                        v->texcoord[i][0], v->texcoord[i][1],
+                        v->texcoord[i][2], v->texcoord[i][3]);
+
+#if CHAN_TYPE == GL_FLOAT
+      _mesa_debug(ctx, "color %f %f %f %f\n",
+                  v->color[0], v->color[1], v->color[2], v->color[3]);
+      _mesa_debug(ctx, "spec %f %f %f %f\n",
+                  v->specular[0], v->specular[1],
+                  v->specular[2], v->specular[3]);
+#else
+      _mesa_debug(ctx, "color %d %d %d %d\n",
+                  v->color[0], v->color[1], v->color[2], v->color[3]);
+      _mesa_debug(ctx, "spec %d %d %d %d\n",
+                  v->specular[0], v->specular[1],
+                  v->specular[2], v->specular[3]);
+#endif
+      _mesa_debug(ctx, "fog %f\n", v->fog);
+      _mesa_debug(ctx, "index %d\n", v->index);
+      _mesa_debug(ctx, "pointsize %f\n", v->pointSize);
+      _mesa_debug(ctx, "\n");
+   }
+}
diff --git a/reactos/lib/mesa32/src/swrast/s_context.h b/reactos/lib/mesa32/src/swrast/s_context.h
new file mode 100644
index 00000000000..6dc8b13b0e7
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_context.h
@@ -0,0 +1,383 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/**
+ * \file swrast/s_context.h
+ * \brief Software rasterization context and private types.
+ * \author Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+#ifndef S_CONTEXT_H
+#define S_CONTEXT_H
+
+#include "mtypes.h"
+#include "swrast.h"
+
+
+/**
+ * \defgroup SpanFlags SPAN_XXX-flags
+ * Bitmasks to indicate which span_arrays need to be computed
+ * (sw_span::interpMask) or have already been filled
+ * (sw_span::arrayMask)
+ */
+/*@{*/
+#define SPAN_RGBA         0x001
+#define SPAN_SPEC         0x002
+#define SPAN_INDEX        0x004
+#define SPAN_Z            0x008
+#define SPAN_FOG          0x010
+#define SPAN_TEXTURE      0x020
+#define SPAN_INT_TEXTURE  0x040
+#define SPAN_LAMBDA       0x080
+#define SPAN_COVERAGE     0x100
+#define SPAN_FLAT         0x200  /**< flat shading? */
+/** sw_span::arrayMask only - for span_arrays::x, span_arrays::y */
+#define SPAN_XY           0x400
+#define SPAN_MASK         0x800  /**< sw_span::arrayMask only */
+/*@}*/
+
+
+/**
+ * \struct span_arrays 
+ * \brief Arrays of fragment values.
+ *
+ * These will either be computed from the x/xStep values above or
+ * filled in by glDraw/CopyPixels, etc.
+ * These arrays are separated out of sw_span to conserve memory.
+ */
+struct span_arrays {
+   GLchan  rgb[MAX_WIDTH][3];
+   GLchan  rgba[MAX_WIDTH][4];
+   GLuint  index[MAX_WIDTH];
+   GLchan  spec[MAX_WIDTH][4]; /* specular color */
+   GLint   x[MAX_WIDTH];  /**< X/Y used for point/line rendering only */
+   GLint   y[MAX_WIDTH];  /**< X/Y used for point/line rendering only */
+   GLdepth z[MAX_WIDTH];
+   GLfloat fog[MAX_WIDTH];
+   GLfloat texcoords[MAX_TEXTURE_COORD_UNITS][MAX_WIDTH][4];
+   GLfloat lambda[MAX_TEXTURE_COORD_UNITS][MAX_WIDTH];
+   GLfloat coverage[MAX_WIDTH];
+
+   /** This mask indicates if fragment is alive or culled */
+   GLubyte mask[MAX_WIDTH];
+};
+
+
+/**
+ * \struct sw_span
+ * \brief Contains data for either a horizontal line or a set of
+ * pixels that are passed through a pipeline of functions before being
+ * drawn.
+ *
+ * The sw_span structure describes the colors, Z, fogcoord, texcoords,
+ * etc for either a horizontal run or an array of independent pixels.
+ * We can either specify a base/step to indicate interpolated values, or
+ * fill in arrays of values.  The interpMask and arrayMask bitfields
+ * indicate which are active.
+ *
+ * With this structure it's easy to hand-off span rasterization to
+ * subroutines instead of doing it all inline in the triangle functions
+ * like we used to do.
+ * It also cleans up the local variable namespace a great deal.
+ *
+ * It would be interesting to experiment with multiprocessor rasterization
+ * with this structure.  The triangle rasterizer could simply emit a
+ * stream of these structures which would be consumed by one or more
+ * span-processing threads which could run in parallel.
+ */
+struct sw_span {
+   GLint x, y;
+
+   /** Only need to process pixels between start <= i < end */
+   /** At this time, start is always zero. */
+   GLuint start, end;
+
+   /** This flag indicates that mask[] array is effectively filled with ones */
+   GLboolean writeAll;
+
+   /** either GL_POLYGON, GL_LINE, GL_POLYGON, GL_BITMAP */
+   GLenum primitive;
+
+   /** 0 = front-facing span, 1 = back-facing span (for two-sided stencil) */
+   GLuint facing;
+
+   /**
+    * This bitmask (of  \link SpanFlags SPAN_* flags\endlink) indicates
+    * which of the x/xStep variables are relevant.
+    */
+   GLuint interpMask;
+
+   /* For horizontal spans, step is the partial derivative wrt X.
+    * For lines, step is the delta from one fragment to the next.
+    */
+#if CHAN_TYPE == GL_FLOAT
+   GLfloat red, redStep;
+   GLfloat green, greenStep;
+   GLfloat blue, blueStep;
+   GLfloat alpha, alphaStep;
+   GLfloat specRed, specRedStep;
+   GLfloat specGreen, specGreenStep;
+   GLfloat specBlue, specBlueStep;
+#else /* CHAN_TYPE == GL_UNSIGNED_BYTE or GL_UNSIGNED_SHORT */
+   GLfixed red, redStep;
+   GLfixed green, greenStep;
+   GLfixed blue, blueStep;
+   GLfixed alpha, alphaStep;
+   GLfixed specRed, specRedStep;
+   GLfixed specGreen, specGreenStep;
+   GLfixed specBlue, specBlueStep;
+#endif
+   GLfixed index, indexStep;
+   GLfixed z, zStep;
+   GLfloat fog, fogStep;
+   GLfloat tex[MAX_TEXTURE_COORD_UNITS][4];  /* s, t, r, q */
+   GLfloat texStepX[MAX_TEXTURE_COORD_UNITS][4];
+   GLfloat texStepY[MAX_TEXTURE_COORD_UNITS][4];
+   GLfixed intTex[2], intTexStep[2];  /* s, t only */
+
+   /* partial derivatives wrt X and Y. */
+   GLfloat dzdx, dzdy;
+   GLfloat w, dwdx, dwdy;
+   GLfloat drdx, drdy;
+   GLfloat dgdx, dgdy;
+   GLfloat dbdx, dbdy;
+   GLfloat dadx, dady;
+   GLfloat dsrdx, dsrdy;
+   GLfloat dsgdx, dsgdy;
+   GLfloat dsbdx, dsbdy;
+   GLfloat dfogdx, dfogdy;
+
+   /**
+    * This bitmask (of \link SpanFlags SPAN_* flags\endlink) indicates
+    * which of the fragment arrays in the span_arrays struct are relevant.
+    */
+   GLuint arrayMask;
+
+   /**
+    * We store the arrays of fragment values in a separate struct so
+    * that we can allocate sw_span structs on the stack without using
+    * a lot of memory.  The span_arrays struct is about 400KB while the
+    * sw_span struct is only about 512 bytes.
+    */
+   struct span_arrays *array;
+};
+
+
+#define INIT_SPAN(S, PRIMITIVE, END, INTERP_MASK, ARRAY_MASK)	\
+do {								\
+   (S).primitive = (PRIMITIVE);					\
+   (S).interpMask = (INTERP_MASK);				\
+   (S).arrayMask = (ARRAY_MASK);				\
+   (S).start = 0;						\
+   (S).end = (END);						\
+   (S).facing = 0;						\
+   (S).array = SWRAST_CONTEXT(ctx)->SpanArrays;			\
+} while (0)
+
+
+typedef void (*texture_sample_func)(GLcontext *ctx, GLuint texUnit,
+                                    const struct gl_texture_object *tObj,
+                                    GLuint n, const GLfloat texcoords[][4],
+                                    const GLfloat lambda[], GLchan rgba[][4]);
+
+typedef void (_ASMAPIP blend_func)( GLcontext *ctx, GLuint n,
+                                    const GLubyte mask[],
+                                    GLchan src[][4], CONST GLchan dst[][4] );
+
+typedef void (*swrast_point_func)( GLcontext *ctx, const SWvertex *);
+
+typedef void (*swrast_line_func)( GLcontext *ctx,
+                                  const SWvertex *, const SWvertex *);
+
+typedef void (*swrast_tri_func)( GLcontext *ctx, const SWvertex *,
+                                 const SWvertex *, const SWvertex *);
+
+
+/** \defgroup Bitmasks
+ * Bitmasks to indicate which rasterization options are enabled
+ * (RasterMask)
+ */
+/*@{*/
+#define ALPHATEST_BIT		0x001	/**< Alpha-test pixels */
+#define BLEND_BIT		0x002	/**< Blend pixels */
+#define DEPTH_BIT		0x004	/**< Depth-test pixels */
+#define FOG_BIT			0x008	/**< Fog pixels */
+#define LOGIC_OP_BIT		0x010	/**< Apply logic op in software */
+#define CLIP_BIT		0x020	/**< Scissor or window clip pixels */
+#define STENCIL_BIT		0x040	/**< Stencil pixels */
+#define MASKING_BIT		0x080	/**< Do glColorMask or glIndexMask */
+#define ALPHABUF_BIT		0x100	/**< Using software alpha buffer */
+#define MULTI_DRAW_BIT		0x400	/**< Write to more than one color- */
+                                        /**< buffer or no buffers. */
+#define OCCLUSION_BIT           0x800   /**< GL_HP_occlusion_test enabled */
+#define TEXTURE_BIT		0x1000	/**< Texturing really enabled */
+#define FRAGPROG_BIT            0x2000  /**< Fragment program enabled */
+/*@}*/
+
+#define _SWRAST_NEW_RASTERMASK (_NEW_BUFFERS|	\
+			        _NEW_SCISSOR|	\
+			        _NEW_COLOR|	\
+			        _NEW_DEPTH|	\
+			        _NEW_FOG|	\
+                                _NEW_PROGRAM|   \
+			        _NEW_STENCIL|	\
+			        _NEW_TEXTURE|	\
+			        _NEW_VIEWPORT|	\
+			        _NEW_DEPTH)
+
+
+/**
+ * \struct SWcontext
+ * \brief SWContext?
+ */
+typedef struct
+{
+   /** Driver interface:
+    */
+   struct swrast_device_driver Driver;
+
+   /** Configuration mechanisms to make software rasterizer match
+    * characteristics of the hardware rasterizer (if present):
+    */
+   GLboolean AllowVertexFog;
+   GLboolean AllowPixelFog;
+
+   /** Derived values, invalidated on statechanges, updated from
+    * _swrast_validate_derived():
+    */
+   GLuint _RasterMask;
+   GLfloat _MinMagThresh[MAX_TEXTURE_IMAGE_UNITS];
+   GLfloat _BackfaceSign;
+   GLboolean _PreferPixelFog;
+   GLboolean _AnyTextureCombine;
+
+   /* Accum buffer temporaries.
+    */
+   GLboolean _IntegerAccumMode;	/**< Storing unscaled integers? */
+   GLfloat _IntegerAccumScaler;	/**< Implicit scale factor */
+
+
+   /* Working values:
+    */
+   GLuint StippleCounter;    /**< Line stipple counter */
+   GLuint NewState;
+   GLuint StateChanges;
+   GLenum Primitive;    /* current primitive being drawn (ala glBegin) */
+   GLuint CurrentBuffer; /* exactly one of FRONT_LEFT_BIT, BACK_LEFT_BIT, etc*/
+
+   /** Mechanism to allow driver (like X11) to register further
+    * software rasterization routines.
+    */
+   /*@{*/
+   void (*choose_point)( GLcontext * );
+   void (*choose_line)( GLcontext * );
+   void (*choose_triangle)( GLcontext * );
+
+   GLuint invalidate_point;
+   GLuint invalidate_line;
+   GLuint invalidate_triangle;
+   /*@}*/
+
+   /** Function pointers for dispatch behind public entrypoints. */
+   /*@{*/
+   void (*InvalidateState)( GLcontext *ctx, GLuint new_state );
+
+   swrast_point_func Point;
+   swrast_line_func Line;
+   swrast_tri_func Triangle;
+   /*@}*/
+
+   /**
+    * Placeholders for when separate specular (or secondary color) is
+    * enabled but texturing is not.
+    */
+   /*@{*/
+   swrast_point_func SpecPoint;
+   swrast_line_func SpecLine;
+   swrast_tri_func SpecTriangle;
+   /*@}*/
+
+   /**
+    * Typically, we'll allocate a sw_span structure as a local variable
+    * and set its 'array' pointer to point to this object.  The reason is
+    * this object is big and causes problems when allocated on the stack
+    * on some systems.
+    */
+   struct span_arrays *SpanArrays;
+
+   /**
+    * Used to buffer N GL_POINTS, instead of rendering one by one.
+    */
+   struct sw_span PointSpan;
+
+   /** Internal hooks, kept uptodate by the same mechanism as above.
+    */
+   blend_func BlendFunc;
+   texture_sample_func TextureSample[MAX_TEXTURE_IMAGE_UNITS];
+
+   /** Buffer for saving the sampled texture colors.
+    * Needed for GL_ARB_texture_env_crossbar implementation.
+    */
+   GLchan *TexelBuffer;
+
+} SWcontext;
+
+
+extern void
+_swrast_validate_derived( GLcontext *ctx );
+
+
+#define SWRAST_CONTEXT(ctx) ((SWcontext *)ctx->swrast_context)
+
+#define RENDER_START(SWctx, GLctx)			\
+   do {							\
+      if ((SWctx)->Driver.SpanRenderStart) {		\
+         (*(SWctx)->Driver.SpanRenderStart)(GLctx);	\
+      }							\
+   } while (0)
+
+#define RENDER_FINISH(SWctx, GLctx)			\
+   do {							\
+      if ((SWctx)->Driver.SpanRenderFinish) {		\
+         (*(SWctx)->Driver.SpanRenderFinish)(GLctx);	\
+      }							\
+   } while (0)
+
+
+
+/*
+ * XXX these macros are just bandages for now in order to make
+ * CHAN_BITS==32 compile cleanly.
+ * These should probably go elsewhere at some point.
+ */
+#if CHAN_TYPE == GL_FLOAT
+#define ChanToFixed(X)  (X)
+#define FixedToChan(X)  (X)
+#else
+#define ChanToFixed(X)  IntToFixed(X)
+#define FixedToChan(X)  FixedToInt(X)
+#endif
+
+#endif
diff --git a/reactos/lib/mesa32/src/swrast/s_copypix.c b/reactos/lib/mesa32/src/swrast/s_copypix.c
new file mode 100644
index 00000000000..0692adfbff9
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_copypix.c
@@ -0,0 +1,846 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "context.h"
+#include "convolve.h"
+#include "histogram.h"
+#include "macros.h"
+#include "imports.h"
+#include "pixel.h"
+
+#include "s_context.h"
+#include "s_depth.h"
+#include "s_pixeltex.h"
+#include "s_span.h"
+#include "s_stencil.h"
+#include "s_texture.h"
+#include "s_zoom.h"
+
+
+
+/*
+ * Determine if there's overlap in an image copy.
+ * This test also compensates for the fact that copies are done from
+ * bottom to top and overlaps can sometimes be handled correctly
+ * without making a temporary image copy.
+ */
+static GLboolean
+regions_overlap(GLint srcx, GLint srcy,
+                GLint dstx, GLint dsty,
+                GLint width, GLint height,
+                GLfloat zoomX, GLfloat zoomY)
+{
+   if (zoomX == 1.0 && zoomY == 1.0) {
+      /* no zoom */
+      if (srcx >= dstx + width || (srcx + width <= dstx)) {
+         return GL_FALSE;
+      }
+      else if (srcy < dsty) { /* this is OK */
+         return GL_FALSE;
+      }
+      else if (srcy > dsty + height) {
+         return GL_FALSE;
+      }
+      else {
+         return GL_TRUE;
+      }
+   }
+   else {
+      /* add one pixel of slop when zooming, just to be safe */
+      if ((srcx > dstx + (width * zoomX) + 1) || (srcx + width + 1 < dstx)) {
+         return GL_FALSE;
+      }
+      else if ((srcy < dsty) && (srcy + height < dsty + (height * zoomY))) {
+         return GL_FALSE;
+      }
+      else if ((srcy > dsty) && (srcy + height > dsty + (height * zoomY))) {
+         return GL_FALSE;
+      }
+      else {
+         return GL_TRUE;
+      }
+   }
+}
+
+
+
+/*
+ * RGBA copypixels with convolution.
+ */
+static void
+copy_conv_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
+                      GLint width, GLint height, GLint destx, GLint desty)
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   GLboolean quick_draw;
+   GLint row;
+   GLboolean changeBuffer;
+   const GLboolean zoom = ctx->Pixel.ZoomX != 1.0F || ctx->Pixel.ZoomY != 1.0F;
+   const GLuint transferOps = ctx->_ImageTransferState;
+   GLfloat *dest, *tmpImage, *convImage;
+   struct sw_span span;
+
+   INIT_SPAN(span, GL_BITMAP, 0, 0, SPAN_RGBA);
+
+   if (ctx->Depth.Test)
+      _swrast_span_default_z(ctx, &span);
+   if (ctx->Fog.Enabled)
+      _swrast_span_default_fog(ctx, &span);
+
+
+   if (SWRAST_CONTEXT(ctx)->_RasterMask == 0
+       && !zoom
+       && destx >= 0
+       && destx + width <= (GLint) ctx->DrawBuffer->Width) {
+      quick_draw = GL_TRUE;
+   }
+   else {
+      quick_draw = GL_FALSE;
+   }
+
+   /* If read and draw buffer are different we must do buffer switching */
+   changeBuffer = ctx->Pixel.ReadBuffer != ctx->Color.DrawBuffer
+               || ctx->DrawBuffer != ctx->ReadBuffer;
+
+
+   /* allocate space for GLfloat image */
+   tmpImage = (GLfloat *) MALLOC(width * height * 4 * sizeof(GLfloat));
+   if (!tmpImage) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyPixels");
+      return;
+   }
+   convImage = (GLfloat *) MALLOC(width * height * 4 * sizeof(GLfloat));
+   if (!convImage) {
+      FREE(tmpImage);
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyPixels");
+      return;
+   }
+
+   dest = tmpImage;
+
+   if (changeBuffer) {
+      /* choose the read buffer */
+      _swrast_use_read_buffer(ctx);
+   }
+
+   /* read source image */
+   dest = tmpImage;
+   for (row = 0; row < height; row++) {
+      GLchan rgba[MAX_WIDTH][4];
+      GLint i;
+      _swrast_read_rgba_span(ctx, ctx->ReadBuffer, width, srcx, srcy + row, rgba);
+      /* convert GLchan to GLfloat */
+      for (i = 0; i < width; i++) {
+         *dest++ = (GLfloat) rgba[i][RCOMP] * (1.0F / CHAN_MAXF);
+         *dest++ = (GLfloat) rgba[i][GCOMP] * (1.0F / CHAN_MAXF);
+         *dest++ = (GLfloat) rgba[i][BCOMP] * (1.0F / CHAN_MAXF);
+         *dest++ = (GLfloat) rgba[i][ACOMP] * (1.0F / CHAN_MAXF);
+      }
+   }
+
+   if (changeBuffer) {
+      /* restore default src/dst buffer */
+      _swrast_use_draw_buffer(ctx);
+   }
+
+   /* do image transfer ops up until convolution */
+   for (row = 0; row < height; row++) {
+      GLfloat (*rgba)[4] = (GLfloat (*)[4]) (tmpImage + row * width * 4);
+
+      /* scale & bias */
+      if (transferOps & IMAGE_SCALE_BIAS_BIT) {
+         _mesa_scale_and_bias_rgba(ctx, width, rgba,
+                                   ctx->Pixel.RedScale, ctx->Pixel.GreenScale,
+                                   ctx->Pixel.BlueScale, ctx->Pixel.AlphaScale,
+                                   ctx->Pixel.RedBias, ctx->Pixel.GreenBias,
+                                   ctx->Pixel.BlueBias, ctx->Pixel.AlphaBias);
+      }
+      /* color map lookup */
+      if (transferOps & IMAGE_MAP_COLOR_BIT) {
+         _mesa_map_rgba(ctx, width, rgba);
+      }
+      /* GL_COLOR_TABLE lookup */
+      if (transferOps & IMAGE_COLOR_TABLE_BIT) {
+         _mesa_lookup_rgba(&ctx->ColorTable, width, rgba);
+      }
+   }
+
+   /* do convolution */
+   if (ctx->Pixel.Convolution2DEnabled) {
+      _mesa_convolve_2d_image(ctx, &width, &height, tmpImage, convImage);
+   }
+   else {
+      ASSERT(ctx->Pixel.Separable2DEnabled);
+      _mesa_convolve_sep_image(ctx, &width, &height, tmpImage, convImage);
+   }
+   FREE(tmpImage);
+
+   /* do remaining image transfer ops */
+   for (row = 0; row < height; row++) {
+      GLfloat (*rgba)[4] = (GLfloat (*)[4]) (convImage + row * width * 4);
+
+      /* GL_POST_CONVOLUTION_COLOR_TABLE lookup */
+      if (transferOps & IMAGE_POST_CONVOLUTION_COLOR_TABLE_BIT) {
+         _mesa_lookup_rgba(&ctx->PostConvolutionColorTable, width, rgba);
+      }
+      /* color matrix */
+      if (transferOps & IMAGE_COLOR_MATRIX_BIT) {
+         _mesa_transform_rgba(ctx, width, rgba);
+      }
+      /* GL_POST_COLOR_MATRIX_COLOR_TABLE lookup */
+      if (transferOps & IMAGE_POST_COLOR_MATRIX_COLOR_TABLE_BIT) {
+         _mesa_lookup_rgba(&ctx->PostColorMatrixColorTable, width, rgba);
+      }
+      /* update histogram count */
+      if (transferOps & IMAGE_HISTOGRAM_BIT) {
+         _mesa_update_histogram(ctx, width, (CONST GLfloat (*)[4]) rgba);
+      }
+      /* update min/max */
+      if (transferOps & IMAGE_MIN_MAX_BIT) {
+         _mesa_update_minmax(ctx, width, (CONST GLfloat (*)[4]) rgba);
+      }
+   }
+
+   for (row = 0; row < height; row++) {
+      const GLfloat *src = convImage + row * width * 4;
+      GLint i, dy;
+
+      /* clamp to [0,1] and convert float back to chan */
+      for (i = 0; i < width; i++) {
+         GLint r = (GLint) (src[i * 4 + RCOMP] * CHAN_MAXF);
+         GLint g = (GLint) (src[i * 4 + GCOMP] * CHAN_MAXF);
+         GLint b = (GLint) (src[i * 4 + BCOMP] * CHAN_MAXF);
+         GLint a = (GLint) (src[i * 4 + ACOMP] * CHAN_MAXF);
+         span.array->rgba[i][RCOMP] = (GLchan) CLAMP(r, 0, CHAN_MAX);
+         span.array->rgba[i][GCOMP] = (GLchan) CLAMP(g, 0, CHAN_MAX);
+         span.array->rgba[i][BCOMP] = (GLchan) CLAMP(b, 0, CHAN_MAX);
+         span.array->rgba[i][ACOMP] = (GLchan) CLAMP(a, 0, CHAN_MAX);
+      }
+
+      if (ctx->Pixel.PixelTextureEnabled && ctx->Texture._EnabledUnits) {
+         span.end = width;
+         _swrast_pixel_texture(ctx, &span);
+      }
+
+      /* write row to framebuffer */
+
+      dy = desty + row;
+      if (quick_draw && dy >= 0 && dy < (GLint) ctx->DrawBuffer->Height) {
+         (*swrast->Driver.WriteRGBASpan)( ctx, width, destx, dy,
+		       (const GLchan (*)[4])span.array->rgba, NULL );
+      }
+      else if (zoom) {
+         span.x = destx;
+         span.y = dy;
+         span.end = width;
+         _swrast_write_zoomed_rgba_span(ctx, &span, 
+                                     (CONST GLchan (*)[4])span.array->rgba,
+                                     desty, 0);
+      }
+      else {
+         span.x = destx;
+         span.y = dy;
+         span.end = width;
+         _swrast_write_rgba_span(ctx, &span);
+      }
+   }
+
+   FREE(convImage);
+}
+
+
+/*
+ * RGBA copypixels
+ */
+static void
+copy_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
+                 GLint width, GLint height, GLint destx, GLint desty)
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   GLchan *tmpImage,*p;
+   GLboolean quick_draw;
+   GLint sy, dy, stepy, j;
+   GLboolean changeBuffer;
+   const GLboolean zoom = ctx->Pixel.ZoomX != 1.0F || ctx->Pixel.ZoomY != 1.0F;
+   GLint overlapping;
+   const GLuint transferOps = ctx->_ImageTransferState;
+   struct sw_span span;
+
+   INIT_SPAN(span, GL_BITMAP, 0, 0, SPAN_RGBA);
+
+   if (ctx->Pixel.Convolution2DEnabled || ctx->Pixel.Separable2DEnabled) {
+      copy_conv_rgba_pixels(ctx, srcx, srcy, width, height, destx, desty);
+      return;
+   }
+
+   /* Determine if copy should be done bottom-to-top or top-to-bottom */
+   if (srcy < desty) {
+      /* top-down  max-to-min */
+      sy = srcy + height - 1;
+      dy = desty + height - 1;
+      stepy = -1;
+   }
+   else {
+      /* bottom-up  min-to-max */
+      sy = srcy;
+      dy = desty;
+      stepy = 1;
+   }
+
+   if (ctx->DrawBuffer == ctx->ReadBuffer) {
+      overlapping = regions_overlap(srcx, srcy, destx, desty, width, height,
+                                    ctx->Pixel.ZoomX, ctx->Pixel.ZoomY);
+   }
+   else {
+      overlapping = GL_FALSE;
+   }
+
+   if (ctx->Depth.Test)
+      _swrast_span_default_z(ctx, &span);
+   if (ctx->Fog.Enabled)
+      _swrast_span_default_fog(ctx, &span);
+
+   if (SWRAST_CONTEXT(ctx)->_RasterMask == 0
+       && !zoom
+       && destx >= 0
+       && destx + width <= (GLint) ctx->DrawBuffer->Width) {
+      quick_draw = GL_TRUE;
+   }
+   else {
+      quick_draw = GL_FALSE;
+   }
+
+   /* If read and draw buffer are different we must do buffer switching */
+   changeBuffer = ctx->Pixel.ReadBuffer != ctx->Color.DrawBuffer
+                  || ctx->DrawBuffer != ctx->ReadBuffer;
+
+   if (overlapping) {
+      GLint ssy = sy;
+      tmpImage = (GLchan *) MALLOC(width * height * sizeof(GLchan) * 4);
+      if (!tmpImage) {
+         _mesa_error( ctx, GL_OUT_OF_MEMORY, "glCopyPixels" );
+         return;
+      }
+      /* setup source */
+      if (changeBuffer)
+         _swrast_use_read_buffer(ctx);
+      /* read the source image */
+      p = tmpImage;
+      for (j = 0; j < height; j++, ssy += stepy) {
+         _swrast_read_rgba_span( ctx, ctx->ReadBuffer, width, srcx, ssy,
+                            (GLchan (*)[4]) p );
+         p += width * 4;
+      }
+      p = tmpImage;
+      /* restore dest */
+      if (changeBuffer) {
+         _swrast_use_draw_buffer(ctx);
+         changeBuffer = GL_FALSE;
+      }
+   }
+   else {
+      tmpImage = NULL;  /* silence compiler warnings */
+      p = NULL;
+   }
+
+   for (j = 0; j < height; j++, sy += stepy, dy += stepy) {
+      /* Get source pixels */
+      if (overlapping) {
+         /* get from buffered image */
+         ASSERT(width < MAX_WIDTH);
+         MEMCPY(span.array->rgba, p, width * sizeof(GLchan) * 4);
+         p += width * 4;
+      }
+      else {
+         /* get from framebuffer */
+         if (changeBuffer)
+            _swrast_use_read_buffer(ctx);
+         ASSERT(width < MAX_WIDTH);
+         _swrast_read_rgba_span( ctx, ctx->ReadBuffer, width, srcx, sy,
+                               span.array->rgba );
+         if (changeBuffer)
+            _swrast_use_draw_buffer(ctx);
+      }
+
+      if (transferOps) {
+         const GLfloat scale = (1.0F / CHAN_MAXF);
+         GLint k;
+         DEFMARRAY(GLfloat, rgbaFloat, MAX_WIDTH, 4);  /* mac 32k limitation */
+         CHECKARRAY(rgbaFloat, return);
+
+         /* convert chan to float */
+         for (k = 0; k < width; k++) {
+            rgbaFloat[k][RCOMP] = (GLfloat) span.array->rgba[k][RCOMP] * scale;
+            rgbaFloat[k][GCOMP] = (GLfloat) span.array->rgba[k][GCOMP] * scale;
+            rgbaFloat[k][BCOMP] = (GLfloat) span.array->rgba[k][BCOMP] * scale;
+            rgbaFloat[k][ACOMP] = (GLfloat) span.array->rgba[k][ACOMP] * scale;
+         }
+         /* scale & bias */
+         if (transferOps & IMAGE_SCALE_BIAS_BIT) {
+            _mesa_scale_and_bias_rgba(ctx, width, rgbaFloat,
+                                   ctx->Pixel.RedScale, ctx->Pixel.GreenScale,
+                                   ctx->Pixel.BlueScale, ctx->Pixel.AlphaScale,
+                                   ctx->Pixel.RedBias, ctx->Pixel.GreenBias,
+                                   ctx->Pixel.BlueBias, ctx->Pixel.AlphaBias);
+         }
+         /* color map lookup */
+         if (transferOps & IMAGE_MAP_COLOR_BIT) {
+            _mesa_map_rgba(ctx, width, rgbaFloat);
+         }
+         /* GL_COLOR_TABLE lookup */
+         if (transferOps & IMAGE_COLOR_TABLE_BIT) {
+            _mesa_lookup_rgba(&ctx->ColorTable, width, rgbaFloat);
+         }
+         /* convolution */
+         if (transferOps & IMAGE_CONVOLUTION_BIT) {
+            _mesa_problem(ctx, "Convolution should not be enabled in copy_rgba_pixels()");
+            return;
+         }
+         /* GL_POST_CONVOLUTION_RED/GREEN/BLUE/ALPHA_SCALE/BIAS */
+         if (transferOps & IMAGE_POST_CONVOLUTION_SCALE_BIAS) {
+            _mesa_scale_and_bias_rgba(ctx, width, rgbaFloat,
+                                      ctx->Pixel.PostConvolutionScale[RCOMP],
+                                      ctx->Pixel.PostConvolutionScale[GCOMP],
+                                      ctx->Pixel.PostConvolutionScale[BCOMP],
+                                      ctx->Pixel.PostConvolutionScale[ACOMP],
+                                      ctx->Pixel.PostConvolutionBias[RCOMP],
+                                      ctx->Pixel.PostConvolutionBias[GCOMP],
+                                      ctx->Pixel.PostConvolutionBias[BCOMP],
+                                      ctx->Pixel.PostConvolutionBias[ACOMP]);
+         }
+         /* GL_POST_CONVOLUTION_COLOR_TABLE lookup */
+         if (transferOps & IMAGE_POST_CONVOLUTION_COLOR_TABLE_BIT) {
+            _mesa_lookup_rgba(&ctx->PostConvolutionColorTable, width, rgbaFloat);
+         }
+         /* color matrix */
+         if (transferOps & IMAGE_COLOR_MATRIX_BIT) {
+            _mesa_transform_rgba(ctx, width, rgbaFloat);
+         }
+         /* GL_POST_COLOR_MATRIX_COLOR_TABLE lookup */
+         if (transferOps & IMAGE_POST_COLOR_MATRIX_COLOR_TABLE_BIT) {
+            _mesa_lookup_rgba(&ctx->PostColorMatrixColorTable, width, rgbaFloat);
+         }
+         /* update histogram count */
+         if (transferOps & IMAGE_HISTOGRAM_BIT) {
+            _mesa_update_histogram(ctx, width, (CONST GLfloat (*)[4]) rgbaFloat);
+         }
+         /* update min/max */
+         if (transferOps & IMAGE_MIN_MAX_BIT) {
+            _mesa_update_minmax(ctx, width, (CONST GLfloat (*)[4]) rgbaFloat);
+         }
+         /* clamp to [0,1] and convert float back to chan */
+         for (k = 0; k < width; k++) {
+            GLint r = (GLint) (rgbaFloat[k][RCOMP] * CHAN_MAXF);
+            GLint g = (GLint) (rgbaFloat[k][GCOMP] * CHAN_MAXF);
+            GLint b = (GLint) (rgbaFloat[k][BCOMP] * CHAN_MAXF);
+            GLint a = (GLint) (rgbaFloat[k][ACOMP] * CHAN_MAXF);
+            span.array->rgba[k][RCOMP] = (GLchan) CLAMP(r, 0, CHAN_MAX);
+            span.array->rgba[k][GCOMP] = (GLchan) CLAMP(g, 0, CHAN_MAX);
+            span.array->rgba[k][BCOMP] = (GLchan) CLAMP(b, 0, CHAN_MAX);
+            span.array->rgba[k][ACOMP] = (GLchan) CLAMP(a, 0, CHAN_MAX);
+         }
+         UNDEFARRAY(rgbaFloat);  /* mac 32k limitation */
+      }
+
+      if (ctx->Pixel.PixelTextureEnabled && ctx->Texture._EnabledUnits) {
+         span.end = width;
+         _swrast_pixel_texture(ctx, &span);
+      }
+
+      /* Write color span */
+      if (quick_draw && dy >= 0 && dy < (GLint) ctx->DrawBuffer->Height) {
+         (*swrast->Driver.WriteRGBASpan)( ctx, width, destx, dy,
+                                 (const GLchan (*)[4])span.array->rgba, NULL );
+      }
+      else if (zoom) {
+         span.x = destx;
+         span.y = dy;
+         span.end = width;
+         _swrast_write_zoomed_rgba_span(ctx, &span,
+                                     (CONST GLchan (*)[4]) span.array->rgba,
+                                     desty, 0);
+      }
+      else {
+         span.x = destx;
+         span.y = dy;
+         span.end = width;
+         _swrast_write_rgba_span(ctx, &span);
+      }
+   }
+
+   if (overlapping)
+      FREE(tmpImage);
+}
+
+
+static void
+copy_ci_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
+                GLint width, GLint height,
+                GLint destx, GLint desty )
+{
+   GLuint *tmpImage,*p;
+   GLint sy, dy, stepy;
+   GLint j;
+   GLboolean changeBuffer;
+   const GLboolean zoom = ctx->Pixel.ZoomX != 1.0F || ctx->Pixel.ZoomY != 1.0F;
+   const GLboolean shift_or_offset = ctx->Pixel.IndexShift || ctx->Pixel.IndexOffset;
+   GLint overlapping;
+   struct sw_span span;
+
+   INIT_SPAN(span, GL_BITMAP, 0, 0, SPAN_INDEX);
+
+   /* Determine if copy should be bottom-to-top or top-to-bottom */
+   if (srcy<desty) {
+      /* top-down  max-to-min */
+      sy = srcy + height - 1;
+      dy = desty + height - 1;
+      stepy = -1;
+   }
+   else {
+      /* bottom-up  min-to-max */
+      sy = srcy;
+      dy = desty;
+      stepy = 1;
+   }
+
+   if (ctx->DrawBuffer == ctx->ReadBuffer) {
+      overlapping = regions_overlap(srcx, srcy, destx, desty, width, height,
+                                    ctx->Pixel.ZoomX, ctx->Pixel.ZoomY);
+   }
+   else {
+      overlapping = GL_FALSE;
+   }
+
+   if (ctx->Depth.Test)
+      _swrast_span_default_z(ctx, &span);
+   if (ctx->Fog.Enabled)
+      _swrast_span_default_fog(ctx, &span);
+
+   /* If read and draw buffer are different we must do buffer switching */
+   changeBuffer = ctx->Pixel.ReadBuffer != ctx->Color.DrawBuffer
+               || ctx->DrawBuffer != ctx->ReadBuffer;
+
+   if (overlapping) {
+      GLint ssy = sy;
+      tmpImage = (GLuint *) MALLOC(width * height * sizeof(GLuint));
+      if (!tmpImage) {
+         _mesa_error( ctx, GL_OUT_OF_MEMORY, "glCopyPixels" );
+         return;
+      }
+      /* setup source */
+      if (changeBuffer)
+         _swrast_use_read_buffer(ctx);
+      /* read the image */
+      p = tmpImage;
+      for (j = 0; j < height; j++, ssy += stepy) {
+         _swrast_read_index_span( ctx, ctx->ReadBuffer, width, srcx, ssy, p );
+         p += width;
+      }
+      p = tmpImage;
+      /* restore to draw buffer */
+      if (changeBuffer) {
+         _swrast_use_draw_buffer(ctx);
+         changeBuffer = GL_FALSE;
+      }
+   }
+   else {
+      tmpImage = NULL;  /* silence compiler warning */
+      p = NULL;
+   }
+
+   for (j = 0; j < height; j++, sy += stepy, dy += stepy) {
+      /* Get color indexes */
+      if (overlapping) {
+         MEMCPY(span.array->index, p, width * sizeof(GLuint));
+         p += width;
+      }
+      else {
+         if (changeBuffer)
+            _swrast_use_read_buffer(ctx);
+         _swrast_read_index_span( ctx, ctx->ReadBuffer, width, srcx, sy,
+                                span.array->index );
+         if (changeBuffer)
+            _swrast_use_draw_buffer(ctx);
+      }
+
+      /* Apply shift, offset, look-up table */
+      if (shift_or_offset) {
+         _mesa_shift_and_offset_ci( ctx, width, span.array->index );
+      }
+      if (ctx->Pixel.MapColorFlag) {
+         _mesa_map_ci( ctx, width, span.array->index );
+      }
+
+      /* write color indexes */
+      span.x = destx;
+      span.y = dy;
+      span.end = width;
+      if (zoom)
+         _swrast_write_zoomed_index_span(ctx, &span, desty, 0);
+      else
+         _swrast_write_index_span(ctx, &span);
+   }
+
+   if (overlapping)
+      FREE(tmpImage);
+}
+
+
+
+/*
+ * TODO: Optimize!!!!
+ */
+static void
+copy_depth_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
+                   GLint width, GLint height,
+                   GLint destx, GLint desty )
+{
+   GLfloat *p, *tmpImage;
+   GLint sy, dy, stepy;
+   GLint i, j;
+   const GLboolean zoom = ctx->Pixel.ZoomX != 1.0F || ctx->Pixel.ZoomY != 1.0F;
+   GLint overlapping;
+   struct sw_span span;
+
+   INIT_SPAN(span, GL_BITMAP, 0, 0, SPAN_Z);
+
+   if (!ctx->Visual.depthBits) {
+      _mesa_error( ctx, GL_INVALID_OPERATION, "glCopyPixels" );
+      return;
+   }
+
+   /* Determine if copy should be bottom-to-top or top-to-bottom */
+   if (srcy<desty) {
+      /* top-down  max-to-min */
+      sy = srcy + height - 1;
+      dy = desty + height - 1;
+      stepy = -1;
+   }
+   else {
+      /* bottom-up  min-to-max */
+      sy = srcy;
+      dy = desty;
+      stepy = 1;
+   }
+
+   if (ctx->DrawBuffer == ctx->ReadBuffer) {
+      overlapping = regions_overlap(srcx, srcy, destx, desty, width, height,
+                                    ctx->Pixel.ZoomX, ctx->Pixel.ZoomY);
+   }
+   else {
+      overlapping = GL_FALSE;
+   }
+
+   _swrast_span_default_color(ctx, &span);
+   if (ctx->Fog.Enabled)
+      _swrast_span_default_fog(ctx, &span);
+
+   if (overlapping) {
+      GLint ssy = sy;
+      tmpImage = (GLfloat *) MALLOC(width * height * sizeof(GLfloat));
+      if (!tmpImage) {
+         _mesa_error( ctx, GL_OUT_OF_MEMORY, "glCopyPixels" );
+         return;
+      }
+      p = tmpImage;
+      for (j = 0; j < height; j++, ssy += stepy) {
+         _swrast_read_depth_span_float(ctx, width, srcx, ssy, p);
+         p += width;
+      }
+      p = tmpImage;
+   }
+   else {
+      tmpImage = NULL;  /* silence compiler warning */
+      p = NULL;
+   }
+
+   for (j = 0; j < height; j++, sy += stepy, dy += stepy) {
+      GLfloat depth[MAX_WIDTH];
+
+      /* get depth values */
+      if (overlapping) {
+         MEMCPY(depth, p, width * sizeof(GLfloat));
+         p += width;
+      }
+      else {
+         _swrast_read_depth_span_float(ctx, width, srcx, sy, depth);
+      }
+
+      /* apply scale and bias */
+      for (i = 0; i < width; i++) {
+         GLfloat d = depth[i] * ctx->Pixel.DepthScale + ctx->Pixel.DepthBias;
+         span.array->z[i] = (GLdepth) (CLAMP(d, 0.0F, 1.0F) * ctx->DepthMax);
+      }
+
+      /* write depth values */
+      span.x = destx;
+      span.y = dy;
+      span.end = width;
+      if (ctx->Visual.rgbMode) {
+         if (zoom)
+            _swrast_write_zoomed_rgba_span( ctx, &span, 
+                            (const GLchan (*)[4])span.array->rgba, desty, 0 );
+         else
+            _swrast_write_rgba_span(ctx, &span);
+      }
+      else {
+         if (zoom)
+            _swrast_write_zoomed_index_span( ctx, &span, desty, 0 );
+         else
+            _swrast_write_index_span(ctx, &span);
+      }
+   }
+
+   if (overlapping)
+      FREE(tmpImage);
+}
+
+
+
+static void
+copy_stencil_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
+                     GLint width, GLint height,
+                     GLint destx, GLint desty )
+{
+   GLint sy, dy, stepy;
+   GLint j;
+   GLstencil *p, *tmpImage;
+   const GLboolean zoom = ctx->Pixel.ZoomX != 1.0F || ctx->Pixel.ZoomY != 1.0F;
+   const GLboolean shift_or_offset = ctx->Pixel.IndexShift || ctx->Pixel.IndexOffset;
+   GLint overlapping;
+
+   if (!ctx->Visual.stencilBits) {
+      _mesa_error( ctx, GL_INVALID_OPERATION, "glCopyPixels" );
+      return;
+   }
+
+   /* Determine if copy should be bottom-to-top or top-to-bottom */
+   if (srcy < desty) {
+      /* top-down  max-to-min */
+      sy = srcy + height - 1;
+      dy = desty + height - 1;
+      stepy = -1;
+   }
+   else {
+      /* bottom-up  min-to-max */
+      sy = srcy;
+      dy = desty;
+      stepy = 1;
+   }
+
+   if (ctx->DrawBuffer == ctx->ReadBuffer) {
+      overlapping = regions_overlap(srcx, srcy, destx, desty, width, height,
+                                    ctx->Pixel.ZoomX, ctx->Pixel.ZoomY);
+   }
+   else {
+      overlapping = GL_FALSE;
+   }
+
+   if (overlapping) {
+      GLint ssy = sy;
+      tmpImage = (GLstencil *) MALLOC(width * height * sizeof(GLstencil));
+      if (!tmpImage) {
+         _mesa_error( ctx, GL_OUT_OF_MEMORY, "glCopyPixels" );
+         return;
+      }
+      p = tmpImage;
+      for (j = 0; j < height; j++, ssy += stepy) {
+         _swrast_read_stencil_span( ctx, width, srcx, ssy, p );
+         p += width;
+      }
+      p = tmpImage;
+   }
+   else {
+      tmpImage = NULL;  /* silence compiler warning */
+      p = NULL;
+   }
+
+   for (j = 0; j < height; j++, sy += stepy, dy += stepy) {
+      GLstencil stencil[MAX_WIDTH];
+
+      /* Get stencil values */
+      if (overlapping) {
+         MEMCPY(stencil, p, width * sizeof(GLstencil));
+         p += width;
+      }
+      else {
+         _swrast_read_stencil_span( ctx, width, srcx, sy, stencil );
+      }
+
+      /* Apply shift, offset, look-up table */
+      if (shift_or_offset) {
+         _mesa_shift_and_offset_stencil( ctx, width, stencil );
+      }
+      if (ctx->Pixel.MapStencilFlag) {
+         _mesa_map_stencil( ctx, width, stencil );
+      }
+
+      /* Write stencil values */
+      if (zoom) {
+         _swrast_write_zoomed_stencil_span( ctx, width, destx, dy,
+                                          stencil, desty, 0 );
+      }
+      else {
+         _swrast_write_stencil_span( ctx, width, destx, dy, stencil );
+      }
+   }
+
+   if (overlapping)
+      FREE(tmpImage);
+}
+
+
+
+void
+_swrast_CopyPixels( GLcontext *ctx,
+		    GLint srcx, GLint srcy, GLsizei width, GLsizei height,
+		    GLint destx, GLint desty,
+		    GLenum type )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   RENDER_START(swrast,ctx);
+      
+   if (swrast->NewState)
+      _swrast_validate_derived( ctx );
+
+   if (type == GL_COLOR && ctx->Visual.rgbMode) {
+      copy_rgba_pixels( ctx, srcx, srcy, width, height, destx, desty );
+   }
+   else if (type == GL_COLOR && !ctx->Visual.rgbMode) {
+      copy_ci_pixels( ctx, srcx, srcy, width, height, destx, desty );
+   }
+   else if (type == GL_DEPTH) {
+      copy_depth_pixels( ctx, srcx, srcy, width, height, destx, desty );
+   }
+   else if (type == GL_STENCIL) {
+      copy_stencil_pixels( ctx, srcx, srcy, width, height, destx, desty );
+   }
+   else {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glCopyPixels" );
+   }
+
+   RENDER_FINISH(swrast,ctx);
+}
diff --git a/reactos/lib/mesa32/src/swrast/s_depth.c b/reactos/lib/mesa32/src/swrast/s_depth.c
new file mode 100644
index 00000000000..fc242be2aab
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_depth.c
@@ -0,0 +1,1777 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "context.h"
+#include "macros.h"
+#include "imports.h"
+
+#include "s_depth.h"
+#include "s_context.h"
+
+
+/**
+ * Return address of depth buffer value for given window coord.
+ */
+GLvoid *
+_swrast_zbuffer_address(GLcontext *ctx, GLint x, GLint y)
+{
+   if (ctx->Visual.depthBits <= 16)
+      return (GLushort *) ctx->DrawBuffer->DepthBuffer
+         + ctx->DrawBuffer->Width * y + x;
+   else
+      return (GLuint *) ctx->DrawBuffer->DepthBuffer
+         + ctx->DrawBuffer->Width * y + x;
+}
+
+
+#define Z_ADDRESS16( CTX, X, Y )				\
+            ( ((GLushort *) (CTX)->DrawBuffer->DepthBuffer)	\
+              + (CTX)->DrawBuffer->Width * (Y) + (X) )
+
+#define Z_ADDRESS32( CTX, X, Y )				\
+            ( ((GLuint *) (CTX)->DrawBuffer->DepthBuffer)	\
+              + (CTX)->DrawBuffer->Width * (Y) + (X) )
+
+
+
+/**********************************************************************/
+/*****                   Depth Testing Functions                  *****/
+/**********************************************************************/
+
+
+/*
+ * Do depth test for an array of fragments.  This is used both for
+ * software and hardware Z buffers.
+ * Input:  zbuffer - array of z values in the zbuffer
+ *         z - array of fragment z values
+ * Return:  number of fragments which pass the test.
+ */
+static GLuint
+depth_test_span16( GLcontext *ctx, GLuint n,
+                   GLushort zbuffer[], const GLdepth z[], GLubyte mask[] )
+{
+   GLuint passed = 0;
+
+   /* switch cases ordered from most frequent to less frequent */
+   switch (ctx->Depth.Func) {
+      case GL_LESS:
+         if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  if (z[i] < zbuffer[i]) {
+		     /* pass */
+		     zbuffer[i] = z[i];
+		     passed++;
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  if (z[i] < zbuffer[i]) {
+		     /* pass */
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_LEQUAL:
+	 if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] <= zbuffer[i]) {
+		     zbuffer[i] = z[i];
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] <= zbuffer[i]) {
+		     /* pass */
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_GEQUAL:
+	 if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] >= zbuffer[i]) {
+		     zbuffer[i] = z[i];
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] >= zbuffer[i]) {
+		     /* pass */
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_GREATER:
+	 if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] > zbuffer[i]) {
+		     zbuffer[i] = z[i];
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] > zbuffer[i]) {
+		     /* pass */
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_NOTEQUAL:
+	 if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] != zbuffer[i]) {
+		     zbuffer[i] = z[i];
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] != zbuffer[i]) {
+		     /* pass */
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_EQUAL:
+	 if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] == zbuffer[i]) {
+		     zbuffer[i] = z[i];
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] == zbuffer[i]) {
+		     /* pass */
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_ALWAYS:
+	 if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  zbuffer[i] = z[i];
+		  passed++;
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer or mask */
+	    passed = n;
+	 }
+	 break;
+      case GL_NEVER:
+         _mesa_bzero(mask, n * sizeof(GLubyte));
+	 break;
+      default:
+         _mesa_problem(ctx, "Bad depth func in depth_test_span16");
+   }
+
+   return passed;
+}
+
+
+static GLuint
+depth_test_span32( GLcontext *ctx, GLuint n,
+                   GLuint zbuffer[], const GLdepth z[], GLubyte mask[] )
+{
+   GLuint passed = 0;
+
+   /* switch cases ordered from most frequent to less frequent */
+   switch (ctx->Depth.Func) {
+      case GL_LESS:
+         if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  if (z[i] < zbuffer[i]) {
+		     /* pass */
+		     zbuffer[i] = z[i];
+		     passed++;
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  if (z[i] < zbuffer[i]) {
+		     /* pass */
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_LEQUAL:
+	 if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] <= zbuffer[i]) {
+		     zbuffer[i] = z[i];
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] <= zbuffer[i]) {
+		     /* pass */
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_GEQUAL:
+	 if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] >= zbuffer[i]) {
+		     zbuffer[i] = z[i];
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] >= zbuffer[i]) {
+		     /* pass */
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_GREATER:
+	 if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] > zbuffer[i]) {
+		     zbuffer[i] = z[i];
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] > zbuffer[i]) {
+		     /* pass */
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_NOTEQUAL:
+	 if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] != zbuffer[i]) {
+		     zbuffer[i] = z[i];
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] != zbuffer[i]) {
+		     /* pass */
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_EQUAL:
+	 if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] == zbuffer[i]) {
+		     zbuffer[i] = z[i];
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  if (z[i] == zbuffer[i]) {
+		     /* pass */
+		     passed++;
+		  }
+		  else {
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_ALWAYS:
+	 if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  zbuffer[i] = z[i];
+		  passed++;
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer or mask */
+	    passed = n;
+	 }
+	 break;
+      case GL_NEVER:
+         _mesa_bzero(mask, n * sizeof(GLubyte));
+	 break;
+      default:
+         _mesa_problem(ctx, "Bad depth func in depth_test_span32");
+   }
+
+   return passed;
+}
+
+
+
+/*
+ * Apply depth test to span of fragments.  Hardware or software z buffer.
+ */
+static GLuint
+depth_test_span( GLcontext *ctx, struct sw_span *span)
+{
+   const GLint x = span->x;
+   const GLint y = span->y;
+   const GLuint n = span->end;
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+
+   ASSERT((span->arrayMask & SPAN_XY) == 0);
+   ASSERT(span->arrayMask & SPAN_Z);
+   
+   if (swrast->Driver.ReadDepthSpan) {
+      /* hardware-based depth buffer */
+      GLdepth zbuffer[MAX_WIDTH];
+      GLuint passed;
+      (*swrast->Driver.ReadDepthSpan)(ctx, n, x, y, zbuffer);
+      passed = depth_test_span32(ctx, n, zbuffer, span->array->z,
+                                 span->array->mask);
+      ASSERT(swrast->Driver.WriteDepthSpan);
+      (*swrast->Driver.WriteDepthSpan)(ctx, n, x, y, zbuffer,
+                                       span->array->mask);
+      if (passed < n)
+         span->writeAll = GL_FALSE;
+      return passed;
+   }
+   else {
+      GLuint passed;
+      /* software depth buffer */
+      if (ctx->Visual.depthBits <= 16) {
+         GLushort *zptr = (GLushort *) Z_ADDRESS16(ctx, x, y);
+         passed = depth_test_span16(ctx, n, zptr, span->array->z, span->array->mask);
+      }
+      else {
+         GLuint *zptr = (GLuint *) Z_ADDRESS32(ctx, x, y);
+         passed = depth_test_span32(ctx, n, zptr, span->array->z, span->array->mask);
+      }
+#if 1
+      if (passed < span->end) {
+         span->writeAll = GL_FALSE;
+      }
+#else
+      /* this causes a glDrawPixels(GL_DEPTH_COMPONENT) conformance failure */
+      if (passed < span->end) {
+	  span->writeAll = GL_FALSE;
+	  if (passed == 0) {
+	      span->end = 0;
+	      return 0;
+	  }
+	  while (span->end > 0  &&  span->mask[span->end - 1] == 0)
+	      span->end --;
+      }
+#endif
+      return passed;
+   }
+}
+
+
+
+
+/*
+ * Do depth testing for an array of fragments using software Z buffer.
+ */
+static void
+software_depth_test_pixels16( GLcontext *ctx, GLuint n,
+                              const GLint x[], const GLint y[],
+                              const GLdepth z[], GLubyte mask[] )
+{
+   /* switch cases ordered from most frequent to less frequent */
+   switch (ctx->Depth.Func) {
+      case GL_LESS:
+         if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  GLushort *zptr = Z_ADDRESS16(ctx,x[i],y[i]);
+		  if (z[i] < *zptr) {
+		     /* pass */
+		     *zptr = z[i];
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  GLushort *zptr = Z_ADDRESS16(ctx,x[i],y[i]);
+		  if (z[i] < *zptr) {
+		     /* pass */
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_LEQUAL:
+         if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  GLushort *zptr = Z_ADDRESS16(ctx,x[i],y[i]);
+		  if (z[i] <= *zptr) {
+		     /* pass */
+		     *zptr = z[i];
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  GLushort *zptr = Z_ADDRESS16(ctx,x[i],y[i]);
+		  if (z[i] <= *zptr) {
+		     /* pass */
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_GEQUAL:
+         if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  GLushort *zptr = Z_ADDRESS16(ctx,x[i],y[i]);
+		  if (z[i] >= *zptr) {
+		     /* pass */
+		     *zptr = z[i];
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  GLushort *zptr = Z_ADDRESS16(ctx,x[i],y[i]);
+		  if (z[i] >= *zptr) {
+		     /* pass */
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_GREATER:
+         if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  GLushort *zptr = Z_ADDRESS16(ctx,x[i],y[i]);
+		  if (z[i] > *zptr) {
+		     /* pass */
+		     *zptr = z[i];
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  GLushort *zptr = Z_ADDRESS16(ctx,x[i],y[i]);
+		  if (z[i] > *zptr) {
+		     /* pass */
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_NOTEQUAL:
+         if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  GLushort *zptr = Z_ADDRESS16(ctx,x[i],y[i]);
+		  if (z[i] != *zptr) {
+		     /* pass */
+		     *zptr = z[i];
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  GLushort *zptr = Z_ADDRESS16(ctx,x[i],y[i]);
+		  if (z[i] != *zptr) {
+		     /* pass */
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_EQUAL:
+         if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  GLushort *zptr = Z_ADDRESS16(ctx,x[i],y[i]);
+		  if (z[i] == *zptr) {
+		     /* pass */
+		     *zptr = z[i];
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  GLushort *zptr = Z_ADDRESS16(ctx,x[i],y[i]);
+		  if (z[i] == *zptr) {
+		     /* pass */
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_ALWAYS:
+	 if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  GLushort *zptr = Z_ADDRESS16(ctx,x[i],y[i]);
+		  *zptr = z[i];
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer or mask */
+	 }
+	 break;
+      case GL_NEVER:
+	 /* depth test never passes */
+         _mesa_bzero(mask, n * sizeof(GLubyte));
+	 break;
+      default:
+         _mesa_problem(ctx, "Bad depth func in software_depth_test_pixels");
+   }
+}
+
+
+
+/*
+ * Do depth testing for an array of fragments using software Z buffer.
+ */
+static void
+software_depth_test_pixels32( GLcontext *ctx, GLuint n,
+                              const GLint x[], const GLint y[],
+                              const GLdepth z[], GLubyte mask[] )
+{
+   /* switch cases ordered from most frequent to less frequent */
+   switch (ctx->Depth.Func) {
+      case GL_LESS:
+         if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  GLuint *zptr = Z_ADDRESS32(ctx,x[i],y[i]);
+		  if (z[i] < *zptr) {
+		     /* pass */
+		     *zptr = z[i];
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  GLuint *zptr = Z_ADDRESS32(ctx,x[i],y[i]);
+		  if (z[i] < *zptr) {
+		     /* pass */
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_LEQUAL:
+         if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  GLuint *zptr = Z_ADDRESS32(ctx,x[i],y[i]);
+		  if (z[i] <= *zptr) {
+		     /* pass */
+		     *zptr = z[i];
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  GLuint *zptr = Z_ADDRESS32(ctx,x[i],y[i]);
+		  if (z[i] <= *zptr) {
+		     /* pass */
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_GEQUAL:
+         if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  GLuint *zptr = Z_ADDRESS32(ctx,x[i],y[i]);
+		  if (z[i] >= *zptr) {
+		     /* pass */
+		     *zptr = z[i];
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  GLuint *zptr = Z_ADDRESS32(ctx,x[i],y[i]);
+		  if (z[i] >= *zptr) {
+		     /* pass */
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_GREATER:
+         if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  GLuint *zptr = Z_ADDRESS32(ctx,x[i],y[i]);
+		  if (z[i] > *zptr) {
+		     /* pass */
+		     *zptr = z[i];
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  GLuint *zptr = Z_ADDRESS32(ctx,x[i],y[i]);
+		  if (z[i] > *zptr) {
+		     /* pass */
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_NOTEQUAL:
+         if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  GLuint *zptr = Z_ADDRESS32(ctx,x[i],y[i]);
+		  if (z[i] != *zptr) {
+		     /* pass */
+		     *zptr = z[i];
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  GLuint *zptr = Z_ADDRESS32(ctx,x[i],y[i]);
+		  if (z[i] != *zptr) {
+		     /* pass */
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_EQUAL:
+         if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  GLuint *zptr = Z_ADDRESS32(ctx,x[i],y[i]);
+		  if (z[i] == *zptr) {
+		     /* pass */
+		     *zptr = z[i];
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  GLuint *zptr = Z_ADDRESS32(ctx,x[i],y[i]);
+		  if (z[i] == *zptr) {
+		     /* pass */
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_ALWAYS:
+	 if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  GLuint *zptr = Z_ADDRESS32(ctx,x[i],y[i]);
+		  *zptr = z[i];
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer or mask */
+	 }
+	 break;
+      case GL_NEVER:
+	 /* depth test never passes */
+         _mesa_bzero(mask, n * sizeof(GLubyte));
+	 break;
+      default:
+         _mesa_problem(ctx, "Bad depth func in software_depth_test_pixels");
+   }
+}
+
+
+
+/*
+ * Do depth testing for an array of pixels using hardware Z buffer.
+ * Input/output:  zbuffer - array of depth values from Z buffer
+ * Input:  z - array of fragment z values.
+ */
+static void
+hardware_depth_test_pixels( GLcontext *ctx, GLuint n, GLdepth zbuffer[],
+                            const GLdepth z[], GLubyte mask[] )
+{
+   /* switch cases ordered from most frequent to less frequent */
+   switch (ctx->Depth.Func) {
+      case GL_LESS:
+         if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  if (z[i] < zbuffer[i]) {
+		     /* pass */
+		     zbuffer[i] = z[i];
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  if (z[i] < zbuffer[i]) {
+		     /* pass */
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_LEQUAL:
+         if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  if (z[i] <= zbuffer[i]) {
+		     /* pass */
+		     zbuffer[i] = z[i];
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  if (z[i] <= zbuffer[i]) {
+		     /* pass */
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_GEQUAL:
+         if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  if (z[i] >= zbuffer[i]) {
+		     /* pass */
+		     zbuffer[i] = z[i];
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  if (z[i] >= zbuffer[i]) {
+		     /* pass */
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_GREATER:
+         if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  if (z[i] > zbuffer[i]) {
+		     /* pass */
+		     zbuffer[i] = z[i];
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  if (z[i] > zbuffer[i]) {
+		     /* pass */
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_NOTEQUAL:
+         if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  if (z[i] != zbuffer[i]) {
+		     /* pass */
+		     zbuffer[i] = z[i];
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  if (z[i] != zbuffer[i]) {
+		     /* pass */
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_EQUAL:
+         if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  if (z[i] == zbuffer[i]) {
+		     /* pass */
+		     zbuffer[i] = z[i];
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  if (z[i] == zbuffer[i]) {
+		     /* pass */
+		  }
+		  else {
+		     /* fail */
+		     mask[i] = 0;
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_ALWAYS:
+	 if (ctx->Depth.Mask) {
+	    /* Update Z buffer */
+            GLuint i;
+	    for (i=0; i<n; i++) {
+	       if (mask[i]) {
+		  zbuffer[i] = z[i];
+	       }
+	    }
+	 }
+	 else {
+	    /* Don't update Z buffer or mask */
+	 }
+	 break;
+      case GL_NEVER:
+	 /* depth test never passes */
+         _mesa_bzero(mask, n * sizeof(GLubyte));
+	 break;
+      default:
+         _mesa_problem(ctx, "Bad depth func in hardware_depth_test_pixels");
+   }
+}
+
+
+
+static GLuint
+depth_test_pixels( GLcontext *ctx, struct sw_span *span )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   const GLuint n = span->end;
+   const GLint *x = span->array->x;
+   const GLint *y = span->array->y;
+   const GLdepth *z = span->array->z;
+   GLubyte *mask = span->array->mask;
+
+   if (swrast->Driver.ReadDepthPixels) {
+      /* read depth values from hardware Z buffer */
+      GLdepth zbuffer[MAX_WIDTH];
+      (*swrast->Driver.ReadDepthPixels)(ctx, n, x, y, zbuffer);
+
+      hardware_depth_test_pixels( ctx, n, zbuffer, z, mask );
+
+      /* update hardware Z buffer with new values */
+      assert(swrast->Driver.WriteDepthPixels);
+      (*swrast->Driver.WriteDepthPixels)(ctx, n, x, y, zbuffer, mask );
+   }
+   else {
+      /* software depth testing */
+      if (ctx->Visual.depthBits <= 16)
+         software_depth_test_pixels16(ctx, n, x, y, z, mask);
+      else
+         software_depth_test_pixels32(ctx, n, x, y, z, mask);
+   }
+   return n; /* not really correct, but OK */
+}
+
+
+/**
+ * Apply depth (Z) buffer testing to the span.
+ * \return approx number of pixels that passed (only zero is reliable)
+ */
+GLuint
+_swrast_depth_test_span( GLcontext *ctx, struct sw_span *span)
+{
+   if (span->arrayMask & SPAN_XY)
+      return depth_test_pixels(ctx, span);
+   else
+      return depth_test_span(ctx, span);
+}
+
+
+/**
+ * GL_EXT_depth_bounds_test extension.
+ * Discard fragments depending on whether the corresponding Z-buffer
+ * values are outside the depth bounds test range.
+ * Note: we test the Z buffer values, not the fragment Z values!
+ * \return GL_TRUE if any fragments pass, GL_FALSE if no fragments pass
+ */
+GLboolean
+_swrast_depth_bounds_test( GLcontext *ctx, struct sw_span *span )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   GLdepth zMin = (GLdepth) (ctx->Depth.BoundsMin * ctx->DepthMaxF + 0.5F);
+   GLdepth zMax = (GLdepth) (ctx->Depth.BoundsMax * ctx->DepthMaxF + 0.5F);
+   GLubyte *mask = span->array->mask;
+   GLuint i;
+   GLboolean anyPass = GL_FALSE;
+
+   if (swrast->Driver.ReadDepthPixels) {
+      /* read depth values from hardware Z buffer */
+      GLdepth zbuffer[MAX_WIDTH];
+      ASSERT(span->end <= MAX_WIDTH);
+      if (span->arrayMask & SPAN_XY)
+         (*swrast->Driver.ReadDepthPixels)(ctx, span->end, span->array->x,
+                                           span->array->y, zbuffer);
+      else
+         (*swrast->Driver.ReadDepthSpan)(ctx, span->end, span->x, span->y,
+                                         zbuffer);
+      for (i = 0; i < span->end; i++) {
+         if (mask[i]) {
+            if (zbuffer[i] < zMin || zbuffer[i] > zMax)
+               mask[i] = GL_FALSE;
+            else
+               anyPass = GL_TRUE;
+         }
+      }
+   }
+   else {
+      /* software Z buffer */
+      if (span->arrayMask & SPAN_XY) {
+         if (ctx->Visual.depthBits <= 16) {
+            /* 16 bits / Z */
+            for (i = 0; i < span->end; i++) {
+               if (mask[i]) {
+                  const GLushort *zPtr = Z_ADDRESS16(ctx, span->array->x[i],
+                                                     span->array->y[i]);
+                  if (*zPtr < zMin || *zPtr > zMax)
+                     mask[i] = GL_FALSE;
+                  else
+                     anyPass = GL_TRUE;
+               }
+            }
+         }
+         else {
+            /* 32 bits / Z */
+            for (i = 0; i < span->end; i++) {
+               if (mask[i]) {
+                  const GLuint *zPtr = Z_ADDRESS32(ctx, span->array->x[i],
+                                                   span->array->y[i]);
+                  if (*zPtr < zMin || *zPtr > zMax)
+                     mask[i] = GL_FALSE;
+                  else
+                     anyPass = GL_TRUE;
+               }
+            }
+         }
+      }
+      else {
+         if (ctx->Visual.depthBits <= 16) {
+            /* 16 bits / Z */
+            const GLushort *zPtr = Z_ADDRESS16(ctx, span->x, span->y);
+            for (i = 0; i < span->end; i++) {
+               if (mask[i]) {
+                  if (zPtr[i] < zMin || zPtr[i] > zMax)
+                     mask[i] = GL_FALSE;
+                  else
+                     anyPass = GL_TRUE;
+               }
+            }
+         }
+         else {
+            /* 32 bits / Z */
+            const GLuint *zPtr = Z_ADDRESS32(ctx, span->x, span->y);
+            for (i = 0; i < span->end; i++) {
+               if (mask[i]) {
+                  if (zPtr[i] < zMin || zPtr[i] > zMax)
+                     mask[i] = GL_FALSE;
+                  else
+                     anyPass = GL_TRUE;
+               }
+            }
+         }
+      }
+   }
+   return anyPass;
+}
+
+
+
+/**********************************************************************/
+/*****                      Read Depth Buffer                     *****/
+/**********************************************************************/
+
+
+/**
+ * Read a span of depth values from the depth buffer.
+ * This function does clipping before calling the device driver function.
+ */
+void
+_swrast_read_depth_span( GLcontext *ctx,
+                       GLint n, GLint x, GLint y, GLdepth depth[] )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+
+   if (y < 0 || y >= (GLint) ctx->DrawBuffer->Height ||
+       x + (GLint) n <= 0 || x >= (GLint) ctx->DrawBuffer->Width) {
+      /* span is completely outside framebuffer */
+      GLint i;
+      for (i = 0; i < n; i++)
+         depth[i] = 0;
+      return;
+   }
+
+   if (x < 0) {
+      GLint dx = -x;
+      GLint i;
+      for (i = 0; i < dx; i++)
+         depth[i] = 0;
+      x = 0;
+      n -= dx;
+      depth += dx;
+   }
+   if (x + n > (GLint) ctx->DrawBuffer->Width) {
+      GLint dx = x + n - (GLint) ctx->DrawBuffer->Width;
+      GLint i;
+      for (i = 0; i < dx; i++)
+         depth[n - i - 1] = 0;
+      n -= dx;
+   }
+   if (n <= 0) {
+      return;
+   }
+
+   if (ctx->DrawBuffer->DepthBuffer) {
+      /* read from software depth buffer */
+      if (ctx->Visual.depthBits <= 16) {
+         const GLushort *zptr = Z_ADDRESS16( ctx, x, y );
+         GLint i;
+         for (i = 0; i < n; i++) {
+            depth[i] = zptr[i];
+         }
+      }
+      else {
+         const GLuint *zptr = Z_ADDRESS32( ctx, x, y );
+         GLint i;
+         for (i = 0; i < n; i++) {
+            depth[i] = zptr[i];
+         }
+      }
+   }
+   else if (swrast->Driver.ReadDepthSpan) {
+      /* read from hardware depth buffer */
+      (*swrast->Driver.ReadDepthSpan)( ctx, n, x, y, depth );
+   }
+   else {
+      /* no depth buffer */
+      _mesa_bzero(depth, n * sizeof(GLfloat));
+   }
+
+}
+
+
+
+
+/**
+ * Return a span of depth values from the depth buffer as floats in [0,1].
+ * This is used for both hardware and software depth buffers.
+ * Input:  n - how many pixels
+ *         x,y - location of first pixel
+ * Output:  depth - the array of depth values
+ */
+void
+_swrast_read_depth_span_float( GLcontext *ctx,
+                             GLint n, GLint x, GLint y, GLfloat depth[] )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   const GLfloat scale = 1.0F / ctx->DepthMaxF;
+
+   if (y < 0 || y >= (GLint) ctx->DrawBuffer->Height ||
+       x + (GLint) n <= 0 || x >= (GLint) ctx->DrawBuffer->Width) {
+      /* span is completely outside framebuffer */
+      GLint i;
+      for (i = 0; i < n; i++)
+         depth[i] = 0.0F;
+      return;
+   }
+
+   if (x < 0) {
+      GLint dx = -x;
+      GLint i;
+      for (i = 0; i < dx; i++)
+         depth[i] = 0.0F;
+      n -= dx;
+      x = 0;
+   }
+   if (x + n > (GLint) ctx->DrawBuffer->Width) {
+      GLint dx = x + n - (GLint) ctx->DrawBuffer->Width;
+      GLint i;
+      for (i = 0; i < dx; i++)
+         depth[n - i - 1] = 0.0F;
+      n -= dx;
+   }
+   if (n <= 0) {
+      return;
+   }
+
+   if (ctx->DrawBuffer->DepthBuffer) {
+      /* read from software depth buffer */
+      if (ctx->Visual.depthBits <= 16) {
+         const GLushort *zptr = Z_ADDRESS16( ctx, x, y );
+         GLint i;
+         for (i = 0; i < n; i++) {
+            depth[i] = (GLfloat) zptr[i] * scale;
+         }
+      }
+      else {
+         const GLuint *zptr = Z_ADDRESS32( ctx, x, y );
+         GLint i;
+         for (i = 0; i < n; i++) {
+            depth[i] = (GLfloat) zptr[i] * scale;
+         }
+      }
+   }
+   else if (swrast->Driver.ReadDepthSpan) {
+      /* read from hardware depth buffer */
+      GLdepth d[MAX_WIDTH];
+      GLint i;
+      assert(n <= MAX_WIDTH);
+      (*swrast->Driver.ReadDepthSpan)( ctx, n, x, y, d );
+      for (i = 0; i < n; i++) {
+	 depth[i] = d[i] * scale;
+      }
+   }
+   else {
+      /* no depth buffer */
+      _mesa_bzero(depth, n * sizeof(GLfloat));
+   }
+}
+
+
+
+/**********************************************************************/
+/*****                Allocate and Clear Depth Buffer             *****/
+/**********************************************************************/
+
+
+
+/**
+ * Allocate a new depth buffer.  If there's already a depth buffer allocated
+ * it will be free()'d.  The new depth buffer will be uniniitalized.
+ * This function is only called through Driver.alloc_depth_buffer.
+ */
+void
+_swrast_alloc_depth_buffer( GLframebuffer *buffer )
+{
+   GLint bytesPerValue;
+
+   ASSERT(buffer->UseSoftwareDepthBuffer);
+
+   /* deallocate current depth buffer if present */
+   if (buffer->DepthBuffer) {
+      MESA_PBUFFER_FREE(buffer->DepthBuffer);
+      buffer->DepthBuffer = NULL;
+   }
+
+   /* allocate new depth buffer, but don't initialize it */
+   if (buffer->Visual.depthBits <= 16)
+      bytesPerValue = sizeof(GLushort);
+   else
+      bytesPerValue = sizeof(GLuint);
+
+   buffer->DepthBuffer = MESA_PBUFFER_ALLOC(buffer->Width * buffer->Height
+                                            * bytesPerValue);
+
+   if (!buffer->DepthBuffer) {
+      /* out of memory */
+      GET_CURRENT_CONTEXT(ctx);
+      if (ctx) {
+         ctx->Depth.Test = GL_FALSE;
+         ctx->NewState |= _NEW_DEPTH;
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "Couldn't allocate depth buffer");
+      }
+   }
+}
+
+
+/**
+ * Clear the depth buffer.  If the depth buffer doesn't exist yet we'll
+ * allocate it now.
+ * This function is only called through Driver.clear_depth_buffer.
+ */
+void
+_swrast_clear_depth_buffer( GLcontext *ctx )
+{
+   if (ctx->Visual.depthBits == 0
+       || !ctx->DrawBuffer->DepthBuffer
+       || !ctx->Depth.Mask) {
+      /* no depth buffer, or writing to it is disabled */
+      return;
+   }
+
+   /* The loops in this function have been written so the IRIX 5.3
+    * C compiler can unroll them.  Hopefully other compilers can too!
+    */
+
+   if (ctx->Scissor.Enabled) {
+      /* only clear scissor region */
+      if (ctx->Visual.depthBits <= 16) {
+         const GLushort clearValue = (GLushort) (ctx->Depth.Clear * ctx->DepthMax);
+         const GLint rows = ctx->DrawBuffer->_Ymax - ctx->DrawBuffer->_Ymin;
+         const GLint cols = ctx->DrawBuffer->_Xmax - ctx->DrawBuffer->_Xmin;
+         const GLint rowStride = ctx->DrawBuffer->Width;
+         GLushort *dRow = (GLushort *) ctx->DrawBuffer->DepthBuffer
+            + ctx->DrawBuffer->_Ymin * rowStride + ctx->DrawBuffer->_Xmin;
+         GLint i, j;
+         for (i = 0; i < rows; i++) {
+            for (j = 0; j < cols; j++) {
+               dRow[j] = clearValue;
+            }
+            dRow += rowStride;
+         }
+      }
+      else {
+         const GLuint clearValue = (GLuint) (ctx->Depth.Clear * ctx->DepthMax);
+         const GLint rows = ctx->DrawBuffer->_Ymax - ctx->DrawBuffer->_Ymin;
+         const GLint cols = ctx->DrawBuffer->_Xmax - ctx->DrawBuffer->_Xmin;
+         const GLint rowStride = ctx->DrawBuffer->Width;
+         GLuint *dRow = (GLuint *) ctx->DrawBuffer->DepthBuffer
+            + ctx->DrawBuffer->_Ymin * rowStride + ctx->DrawBuffer->_Xmin;
+         GLint i, j;
+         for (i = 0; i < rows; i++) {
+            for (j = 0; j < cols; j++) {
+               dRow[j] = clearValue;
+            }
+            dRow += rowStride;
+         }
+      }
+   }
+   else {
+      /* clear whole buffer */
+      if (ctx->Visual.depthBits <= 16) {
+         const GLushort clearValue = (GLushort) (ctx->Depth.Clear * ctx->DepthMax);
+         if ((clearValue & 0xff) == (clearValue >> 8)) {
+            if (clearValue == 0) {
+               _mesa_bzero(ctx->DrawBuffer->DepthBuffer,
+                     2*ctx->DrawBuffer->Width*ctx->DrawBuffer->Height);
+            }
+            else {
+               /* lower and upper bytes of clear_value are same, use MEMSET */
+               MEMSET( ctx->DrawBuffer->DepthBuffer, clearValue & 0xff,
+                       2 * ctx->DrawBuffer->Width * ctx->DrawBuffer->Height);
+            }
+         }
+         else {
+            GLushort *d = (GLushort *) ctx->DrawBuffer->DepthBuffer;
+            GLint n = ctx->DrawBuffer->Width * ctx->DrawBuffer->Height;
+            while (n >= 16) {
+               d[0] = clearValue;    d[1] = clearValue;
+               d[2] = clearValue;    d[3] = clearValue;
+               d[4] = clearValue;    d[5] = clearValue;
+               d[6] = clearValue;    d[7] = clearValue;
+               d[8] = clearValue;    d[9] = clearValue;
+               d[10] = clearValue;   d[11] = clearValue;
+               d[12] = clearValue;   d[13] = clearValue;
+               d[14] = clearValue;   d[15] = clearValue;
+               d += 16;
+               n -= 16;
+            }
+            while (n > 0) {
+               *d++ = clearValue;
+               n--;
+            }
+         }
+      }
+      else {
+         /* >16 bit depth buffer */
+         const GLuint clearValue = (GLuint) (ctx->Depth.Clear * ctx->DepthMax);
+         if (clearValue == 0) {
+            _mesa_bzero(ctx->DrawBuffer->DepthBuffer,
+                ctx->DrawBuffer->Width*ctx->DrawBuffer->Height*sizeof(GLuint));
+         }
+         else {
+            GLint n = ctx->DrawBuffer->Width * ctx->DrawBuffer->Height;
+            GLuint *d = (GLuint *) ctx->DrawBuffer->DepthBuffer;
+            while (n >= 16) {
+               d[0] = clearValue;    d[1] = clearValue;
+               d[2] = clearValue;    d[3] = clearValue;
+               d[4] = clearValue;    d[5] = clearValue;
+               d[6] = clearValue;    d[7] = clearValue;
+               d[8] = clearValue;    d[9] = clearValue;
+               d[10] = clearValue;   d[11] = clearValue;
+               d[12] = clearValue;   d[13] = clearValue;
+               d[14] = clearValue;   d[15] = clearValue;
+               d += 16;
+               n -= 16;
+            }
+            while (n > 0) {
+               *d++ = clearValue;
+               n--;
+            }
+         }
+      }
+   }
+}
diff --git a/reactos/lib/mesa32/src/swrast/s_depth.h b/reactos/lib/mesa32/src/swrast/s_depth.h
new file mode 100644
index 00000000000..b972a84c56f
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_depth.h
@@ -0,0 +1,64 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef S_DEPTH_H
+#define S_DEPTH_H
+
+
+#include "mtypes.h"
+#include "s_context.h"
+
+
+extern GLvoid *
+_swrast_zbuffer_address(GLcontext *ctx, GLint x, GLint y);
+
+
+extern GLuint
+_swrast_depth_test_span( GLcontext *ctx, struct sw_span *span);
+
+
+extern GLboolean
+_swrast_depth_bounds_test( GLcontext *ctx, struct sw_span *span );
+
+
+extern void
+_swrast_read_depth_span( GLcontext *ctx,
+                       GLint n, GLint x, GLint y, GLdepth depth[] );
+
+
+extern void
+_swrast_read_depth_span_float( GLcontext *ctx, GLint n, GLint x, GLint y,
+                             GLfloat depth[] );
+
+
+extern void
+_swrast_alloc_depth_buffer( GLframebuffer *buffer );
+
+
+extern void
+_swrast_clear_depth_buffer( GLcontext *ctx );
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/swrast/s_drawpix.c b/reactos/lib/mesa32/src/swrast/s_drawpix.c
new file mode 100644
index 00000000000..5d4093f32c0
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_drawpix.c
@@ -0,0 +1,999 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "context.h"
+#include "convolve.h"
+#include "image.h"
+#include "macros.h"
+#include "imports.h"
+#include "pixel.h"
+
+#include "s_context.h"
+#include "s_drawpix.h"
+#include "s_pixeltex.h"
+#include "s_span.h"
+#include "s_stencil.h"
+#include "s_zoom.h"
+
+
+
+/*
+ * Given the dest position, size and skipPixels and skipRows values
+ * for a glDrawPixels command, perform clipping of the image bounds
+ * so the result lies withing the context's buffer bounds.
+ * Return:  GL_TRUE if image is ready for drawing
+ *          GL_FALSE if image was completely clipped away (draw nothing)
+ */
+GLboolean
+_swrast_clip_pixelrect(const GLcontext *ctx,
+                     GLint *destX, GLint *destY,
+                     GLsizei *width, GLsizei *height,
+                     GLint *skipPixels, GLint *skipRows)
+{
+   const GLframebuffer *buffer = ctx->DrawBuffer;
+
+   /* left clipping */
+   if (*destX < buffer->_Xmin) {
+      *skipPixels += (buffer->_Xmin - *destX);
+      *width -= (buffer->_Xmin - *destX);
+      *destX = buffer->_Xmin;
+   }
+   /* right clipping */
+   if (*destX + *width > buffer->_Xmax)
+      *width -= (*destX + *width - buffer->_Xmax);
+
+   if (*width <= 0)
+      return GL_FALSE;
+
+   /* bottom clipping */
+   if (*destY < buffer->_Ymin) {
+      *skipRows += (buffer->_Ymin - *destY);
+      *height -= (buffer->_Ymin - *destY);
+      *destY = buffer->_Ymin;
+   }
+   /* top clipping */
+   if (*destY + *height > buffer->_Ymax)
+      *height -= (*destY + *height - buffer->_Ymax);
+
+   if (*height <= 0)
+      return GL_TRUE;
+
+   return GL_TRUE;
+}
+
+
+
+/*
+ * Try to do a fast and simple RGB(a) glDrawPixels.
+ * Return:  GL_TRUE if success, GL_FALSE if slow path must be used instead
+ */
+static GLboolean
+fast_draw_pixels(GLcontext *ctx, GLint x, GLint y,
+                 GLsizei width, GLsizei height,
+                 GLenum format, GLenum type, const GLvoid *pixels)
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   const struct gl_pixelstore_attrib *unpack = &ctx->Unpack;
+   struct sw_span span;
+
+   INIT_SPAN(span, GL_BITMAP, 0, 0, SPAN_RGBA);
+
+   if (!ctx->Current.RasterPosValid) {
+      return GL_TRUE;      /* no-op */
+   }
+
+   if (ctx->Depth.Test)
+      _swrast_span_default_z(ctx, &span);
+   if (ctx->Fog.Enabled)
+      _swrast_span_default_fog(ctx, &span);
+   if (ctx->Texture._EnabledCoordUnits)
+      _swrast_span_default_texcoords(ctx, &span);
+
+   if ((SWRAST_CONTEXT(ctx)->_RasterMask & ~CLIP_BIT) == 0
+       && ctx->Texture._EnabledCoordUnits == 0
+       && unpack->Alignment == 1
+       && !unpack->SwapBytes
+       && !unpack->LsbFirst) {
+
+      GLint destX = x;
+      GLint destY = y;
+      GLint drawWidth = width;           /* actual width drawn */
+      GLint drawHeight = height;         /* actual height drawn */
+      GLint skipPixels = unpack->SkipPixels;
+      GLint skipRows = unpack->SkipRows;
+      GLint rowLength;
+      GLint zoomY0 = 0;
+
+      if (unpack->RowLength > 0)
+         rowLength = unpack->RowLength;
+      else
+         rowLength = width;
+
+      /* If we're not using pixel zoom then do all clipping calculations
+       * now.  Otherwise, we'll let the _swrast_write_zoomed_*_span() functions
+       * handle the clipping.
+       */
+      if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==1.0F) {
+         /* horizontal clipping */
+         if (destX < ctx->DrawBuffer->_Xmin) {
+            skipPixels += (ctx->DrawBuffer->_Xmin - destX);
+            drawWidth  -= (ctx->DrawBuffer->_Xmin - destX);
+            destX = ctx->DrawBuffer->_Xmin;
+         }
+         if (destX + drawWidth > ctx->DrawBuffer->_Xmax)
+            drawWidth -= (destX + drawWidth - ctx->DrawBuffer->_Xmax);
+         if (drawWidth <= 0)
+            return GL_TRUE;
+
+         /* vertical clipping */
+         if (destY < ctx->DrawBuffer->_Ymin) {
+            skipRows   += (ctx->DrawBuffer->_Ymin - destY);
+            drawHeight -= (ctx->DrawBuffer->_Ymin - destY);
+            destY = ctx->DrawBuffer->_Ymin;
+         }
+         if (destY + drawHeight > ctx->DrawBuffer->_Ymax)
+            drawHeight -= (destY + drawHeight - ctx->DrawBuffer->_Ymax);
+         if (drawHeight <= 0)
+            return GL_TRUE;
+      }
+      else if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==-1.0F) {
+         /* upside-down image */
+         /* horizontal clipping */
+         if (destX < ctx->DrawBuffer->_Xmin) {
+            skipPixels += (ctx->DrawBuffer->_Xmin - destX);
+            drawWidth  -= (ctx->DrawBuffer->_Xmin - destX);
+            destX = ctx->DrawBuffer->_Xmin;
+         }
+         if (destX + drawWidth > ctx->DrawBuffer->_Xmax)
+            drawWidth -= (destX + drawWidth - ctx->DrawBuffer->_Xmax);
+         if (drawWidth <= 0)
+            return GL_TRUE;
+
+         /* vertical clipping */
+         if (destY > ctx->DrawBuffer->_Ymax) {
+            skipRows   += (destY - ctx->DrawBuffer->_Ymax);
+            drawHeight -= (destY - ctx->DrawBuffer->_Ymax);
+            destY = ctx->DrawBuffer->_Ymax;
+         }
+         if (destY - drawHeight < ctx->DrawBuffer->_Ymin)
+            drawHeight -= (ctx->DrawBuffer->_Ymin - (destY - drawHeight));
+         if (drawHeight <= 0)
+            return GL_TRUE;
+      }
+      else {
+         if (drawWidth > MAX_WIDTH)
+            return GL_FALSE; /* fall back to general case path */
+
+         /* save Y value of first row */
+         zoomY0 = IROUND(ctx->Current.RasterPos[1]);
+      }
+
+
+      /*
+       * Ready to draw!
+       * The window region at (destX, destY) of size (drawWidth, drawHeight)
+       * will be written to.
+       * We'll take pixel data from buffer pointed to by "pixels" but we'll
+       * skip "skipRows" rows and skip "skipPixels" pixels/row.
+       */
+
+      if (format == GL_RGBA && type == CHAN_TYPE
+          && ctx->_ImageTransferState==0) {
+         if (ctx->Visual.rgbMode) {
+            GLchan *src = (GLchan *) pixels
+               + (skipRows * rowLength + skipPixels) * 4;
+            if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==1.0F) {
+               /* no zooming */
+               GLint row;
+               for (row=0; row<drawHeight; row++) {
+                  (*swrast->Driver.WriteRGBASpan)(ctx, drawWidth, destX, destY,
+                                              (CONST GLchan (*)[4]) src, NULL);
+                  src += rowLength * 4;
+                  destY++;
+               }
+            }
+            else if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==-1.0F) {
+               /* upside-down */
+               GLint row;
+               for (row=0; row<drawHeight; row++) {
+                  destY--;
+                  (*swrast->Driver.WriteRGBASpan)(ctx, drawWidth, destX, destY,
+                                              (CONST GLchan (*)[4]) src, NULL);
+                  src += rowLength * 4;
+               }
+            }
+            else {
+               /* with zooming */
+               GLint row;
+               for (row=0; row<drawHeight; row++) {
+                  span.x = destX;
+                  span.y = destY;
+                  span.end = drawWidth;
+                  _swrast_write_zoomed_rgba_span(ctx, &span,
+                                        (CONST GLchan (*)[4]) src, zoomY0, 0);
+                  src += rowLength * 4;
+                  destY++;
+               }
+            }
+         }
+         return GL_TRUE;
+      }
+      else if (format == GL_RGB && type == CHAN_TYPE
+               && ctx->_ImageTransferState == 0) {
+         if (ctx->Visual.rgbMode) {
+            GLchan *src = (GLchan *) pixels
+               + (skipRows * rowLength + skipPixels) * 3;
+            if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==1.0F) {
+               GLint row;
+               for (row=0; row<drawHeight; row++) {
+                  (*swrast->Driver.WriteRGBSpan)(ctx, drawWidth, destX, destY,
+                                              (CONST GLchan (*)[3]) src, NULL);
+                  src += rowLength * 3;
+                  destY++;
+               }
+            }
+            else if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==-1.0F) {
+               /* upside-down */
+               GLint row;
+               for (row=0; row<drawHeight; row++) {
+                  destY--;
+                  (*swrast->Driver.WriteRGBSpan)(ctx, drawWidth, destX, destY,
+                                              (CONST GLchan (*)[3]) src, NULL);
+                  src += rowLength * 3;
+               }
+            }
+            else {
+               /* with zooming */
+               GLint row;
+               for (row=0; row<drawHeight; row++) {
+                  span.x = destX;
+                  span.y = destY;
+                  span.end = drawWidth;
+                  _swrast_write_zoomed_rgb_span(ctx, &span, 
+                                         (CONST GLchan (*)[3]) src, zoomY0, 0);
+                  src += rowLength * 3;
+                  destY++;
+               }
+            }
+         }
+         return GL_TRUE;
+      }
+      else if (format == GL_LUMINANCE && type == CHAN_TYPE
+               && ctx->_ImageTransferState==0) {
+         if (ctx->Visual.rgbMode) {
+            GLchan *src = (GLchan *) pixels
+               + (skipRows * rowLength + skipPixels);
+            if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==1.0F) {
+               /* no zooming */
+               GLint row;
+               ASSERT(drawWidth < MAX_WIDTH);
+               for (row=0; row<drawHeight; row++) {
+                  GLint i;
+		  for (i=0;i<drawWidth;i++) {
+                     span.array->rgb[i][0] = src[i];
+                     span.array->rgb[i][1] = src[i];
+                     span.array->rgb[i][2] = src[i];
+		  }
+                  (*swrast->Driver.WriteRGBSpan)(ctx, drawWidth, destX, destY,
+                                  (CONST GLchan (*)[3]) span.array->rgb, NULL);
+                  src += rowLength;
+                  destY++;
+               }
+            }
+            else if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==-1.0F) {
+               /* upside-down */
+               GLint row;
+               ASSERT(drawWidth < MAX_WIDTH);
+               for (row=0; row<drawHeight; row++) {
+                  GLint i;
+                  for (i=0;i<drawWidth;i++) {
+                     span.array->rgb[i][0] = src[i];
+                     span.array->rgb[i][1] = src[i];
+                     span.array->rgb[i][2] = src[i];
+                  }
+                  destY--;
+                  (*swrast->Driver.WriteRGBSpan)(ctx, drawWidth, destX, destY,
+                                  (CONST GLchan (*)[3]) span.array->rgb, NULL);
+                  src += rowLength;
+               }
+            }
+            else {
+               /* with zooming */
+               GLint row;
+               ASSERT(drawWidth < MAX_WIDTH);
+               for (row=0; row<drawHeight; row++) {
+                  GLint i;
+		  for (i=0;i<drawWidth;i++) {
+                     span.array->rgb[i][0] = src[i];
+                     span.array->rgb[i][1] = src[i];
+                     span.array->rgb[i][2] = src[i];
+		  }
+                  span.x = destX;
+                  span.y = destY;
+                  span.end = drawWidth;
+                  _swrast_write_zoomed_rgb_span(ctx, &span,
+                             (CONST GLchan (*)[3]) span.array->rgb, zoomY0, 0);
+                  src += rowLength;
+                  destY++;
+               }
+            }
+         }
+         return GL_TRUE;
+      }
+      else if (format == GL_LUMINANCE_ALPHA && type == CHAN_TYPE
+               && ctx->_ImageTransferState == 0) {
+         if (ctx->Visual.rgbMode) {
+            GLchan *src = (GLchan *) pixels
+               + (skipRows * rowLength + skipPixels)*2;
+            if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==1.0F) {
+               /* no zooming */
+               GLint row;
+               ASSERT(drawWidth < MAX_WIDTH);
+               for (row=0; row<drawHeight; row++) {
+                  GLint i;
+                  GLchan *ptr = src;
+		  for (i=0;i<drawWidth;i++) {
+                     span.array->rgba[i][0] = *ptr;
+                     span.array->rgba[i][1] = *ptr;
+                     span.array->rgba[i][2] = *ptr++;
+                     span.array->rgba[i][3] = *ptr++;
+		  }
+                  (*swrast->Driver.WriteRGBASpan)(ctx, drawWidth, destX, destY,
+                                 (CONST GLchan (*)[4]) span.array->rgba, NULL);
+                  src += rowLength*2;
+                  destY++;
+               }
+            }
+            else if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==-1.0F) {
+               /* upside-down */
+               GLint row;
+               ASSERT(drawWidth < MAX_WIDTH);
+               for (row=0; row<drawHeight; row++) {
+                  GLint i;
+                  GLchan *ptr = src;
+                  for (i=0;i<drawWidth;i++) {
+                     span.array->rgba[i][0] = *ptr;
+                     span.array->rgba[i][1] = *ptr;
+                     span.array->rgba[i][2] = *ptr++;
+                     span.array->rgba[i][3] = *ptr++;
+                  }
+                  destY--;
+                  (*swrast->Driver.WriteRGBASpan)(ctx, drawWidth, destX, destY,
+                                 (CONST GLchan (*)[4]) span.array->rgba, NULL);
+                  src += rowLength*2;
+               }
+            }
+            else {
+               /* with zooming */
+               GLint row;
+               ASSERT(drawWidth < MAX_WIDTH);
+               for (row=0; row<drawHeight; row++) {
+                  GLchan *ptr = src;
+                  GLint i;
+		  for (i=0;i<drawWidth;i++) {
+                     span.array->rgba[i][0] = *ptr;
+                     span.array->rgba[i][1] = *ptr;
+                     span.array->rgba[i][2] = *ptr++;
+                     span.array->rgba[i][3] = *ptr++;
+		  }
+                  span.x = destX;
+                  span.y = destY;
+                  span.end = drawWidth;
+                  _swrast_write_zoomed_rgba_span(ctx, &span,
+                            (CONST GLchan (*)[4]) span.array->rgba, zoomY0, 0);
+                  src += rowLength*2;
+                  destY++;
+               }
+            }
+         }
+         return GL_TRUE;
+      }
+      else if (format==GL_COLOR_INDEX && type==GL_UNSIGNED_BYTE) {
+         GLubyte *src = (GLubyte *) pixels + skipRows * rowLength + skipPixels;
+         if (ctx->Visual.rgbMode) {
+            /* convert CI data to RGBA */
+            if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==1.0F) {
+               /* no zooming */
+               GLint row;
+               for (row=0; row<drawHeight; row++) {
+                  ASSERT(drawWidth < MAX_WIDTH);
+                  _mesa_map_ci8_to_rgba(ctx, drawWidth, src, span.array->rgba);
+                  (*swrast->Driver.WriteRGBASpan)(ctx, drawWidth, destX, destY,
+                                 (const GLchan (*)[4]) span.array->rgba, NULL);
+                  src += rowLength;
+                  destY++;
+               }
+               return GL_TRUE;
+            }
+            else if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==-1.0F) {
+               /* upside-down */
+               GLint row;
+               for (row=0; row<drawHeight; row++) {
+                  ASSERT(drawWidth < MAX_WIDTH);
+                  _mesa_map_ci8_to_rgba(ctx, drawWidth, src, span.array->rgba);
+                  destY--;
+                  (*swrast->Driver.WriteRGBASpan)(ctx, drawWidth, destX, destY,
+                                 (CONST GLchan (*)[4]) span.array->rgba, NULL);
+                  src += rowLength;
+               }
+               return GL_TRUE;
+            }
+            else {
+               /* with zooming */
+               GLint row;
+               for (row=0; row<drawHeight; row++) {
+                  ASSERT(drawWidth < MAX_WIDTH);
+                  _mesa_map_ci8_to_rgba(ctx, drawWidth, src, span.array->rgba);
+                  span.x = destX;
+                  span.y = destY;
+                  span.end = drawWidth;
+                  _swrast_write_zoomed_rgba_span(ctx, &span,
+                            (CONST GLchan (*)[4]) span.array->rgba, zoomY0, 0);
+                  src += rowLength;
+                  destY++;
+               }
+               return GL_TRUE;
+            }
+         }
+         else if (ctx->_ImageTransferState==0) {
+            /* write CI data to CI frame buffer */
+            GLint row;
+            if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==1.0F) {
+               /* no zooming */
+               for (row=0; row<drawHeight; row++) {
+                  (*swrast->Driver.WriteCI8Span)(ctx, drawWidth, destX, destY,
+                                              src, NULL);
+                  src += rowLength;
+                  destY++;
+               }
+               return GL_TRUE;
+            }
+            else {
+               /* with zooming */
+               return GL_FALSE;
+            }
+         }
+      }
+      else {
+         /* can't handle this pixel format and/or data type here */
+         return GL_FALSE;
+      }
+   }
+
+   /* can't do a simple draw, have to use slow path */
+   return GL_FALSE;
+}
+
+
+
+/*
+ * Draw color index image.
+ */
+static void
+draw_index_pixels( GLcontext *ctx, GLint x, GLint y,
+                   GLsizei width, GLsizei height,
+                   GLenum type, const GLvoid *pixels )
+{
+   const GLboolean zoom = ctx->Pixel.ZoomX!=1.0 || ctx->Pixel.ZoomY!=1.0;
+   GLint row, skipPixels;
+   struct sw_span span;
+
+   INIT_SPAN(span, GL_BITMAP, 0, 0, SPAN_INDEX);
+
+   if (ctx->Depth.Test)
+      _swrast_span_default_z(ctx, &span);
+   if (ctx->Fog.Enabled)
+      _swrast_span_default_fog(ctx, &span);
+
+   /*
+    * General solution
+    */
+   skipPixels = 0;
+   while (skipPixels < width) {
+      const GLint spanX = x + (zoom ? 0 : skipPixels);
+      GLint spanY = y;
+      const GLint spanEnd = (width - skipPixels > MAX_WIDTH)
+                          ? MAX_WIDTH : (width - skipPixels);
+      ASSERT(spanEnd <= MAX_WIDTH);
+      for (row = 0; row < height; row++, span.y++) {
+         const GLvoid *source = _mesa_image_address(&ctx->Unpack, pixels,
+                                                    width, height,
+                                                    GL_COLOR_INDEX, type,
+                                                    0, row, skipPixels);
+         _mesa_unpack_index_span(ctx, span.end, GL_UNSIGNED_INT,
+                                 span.array->index, type, source, &ctx->Unpack,
+                                 ctx->_ImageTransferState);
+
+         /* These may get changed during writing/clipping */
+         span.x = spanX;
+         span.y = spanY;
+         span.end = spanEnd;
+         
+         if (zoom)
+            _swrast_write_zoomed_index_span(ctx, &span, y, skipPixels);
+         else
+            _swrast_write_index_span(ctx, &span);
+      }
+      skipPixels += spanEnd;
+   }
+}
+
+
+
+/*
+ * Draw stencil image.
+ */
+static void
+draw_stencil_pixels( GLcontext *ctx, GLint x, GLint y,
+                     GLsizei width, GLsizei height,
+                     GLenum type, const GLvoid *pixels )
+{
+   const GLboolean zoom = ctx->Pixel.ZoomX!=1.0 || ctx->Pixel.ZoomY!=1.0;
+   const GLint desty = y;
+   GLint row, skipPixels;
+
+   if (type != GL_BYTE &&
+       type != GL_UNSIGNED_BYTE &&
+       type != GL_SHORT &&
+       type != GL_UNSIGNED_SHORT &&
+       type != GL_INT &&
+       type != GL_UNSIGNED_INT &&
+       type != GL_FLOAT &&
+       type != GL_BITMAP) {
+      _mesa_error( ctx, GL_INVALID_ENUM, "glDrawPixels(stencil type)");
+      return;
+   }
+
+   if (ctx->Visual.stencilBits == 0) {
+      _mesa_error( ctx, GL_INVALID_OPERATION, "glDrawPixels(no stencil buffer)");
+      return;
+   }
+
+   /* if width > MAX_WIDTH, have to process image in chunks */
+   skipPixels = 0;
+   while (skipPixels < width) {
+      const GLint spanX = x;
+      GLint spanY = y;
+      const GLint spanWidth = (width - skipPixels > MAX_WIDTH)
+                            ? MAX_WIDTH : (width - skipPixels);
+
+      for (row = 0; row < height; row++, spanY++) {
+         GLstencil values[MAX_WIDTH];
+         GLenum destType = (sizeof(GLstencil) == sizeof(GLubyte))
+                         ? GL_UNSIGNED_BYTE : GL_UNSIGNED_SHORT;
+         const GLvoid *source = _mesa_image_address(&ctx->Unpack, pixels,
+                                                    width, height,
+                                                    GL_COLOR_INDEX, type,
+                                                    0, row, skipPixels);
+         _mesa_unpack_index_span(ctx, spanWidth, destType, values,
+                                 type, source, &ctx->Unpack,
+                                 ctx->_ImageTransferState);
+         if (ctx->_ImageTransferState & IMAGE_SHIFT_OFFSET_BIT) {
+            _mesa_shift_and_offset_stencil(ctx, spanWidth, values);
+         }
+         if (ctx->Pixel.MapStencilFlag) {
+            _mesa_map_stencil(ctx, spanWidth, values);
+         }
+
+         if (zoom) {
+            _swrast_write_zoomed_stencil_span(ctx, (GLuint) spanWidth,
+                                            spanX, spanY, values, desty, 0);
+         }
+         else {
+            _swrast_write_stencil_span(ctx, (GLuint) spanWidth,
+                                     spanX, spanY, values);
+         }
+      }
+      skipPixels += spanWidth;
+   }
+}
+
+
+/*
+ * Draw depth image.
+ */
+static void
+draw_depth_pixels( GLcontext *ctx, GLint x, GLint y,
+                   GLsizei width, GLsizei height,
+                   GLenum type, const GLvoid *pixels )
+{
+   const GLboolean bias_or_scale = ctx->Pixel.DepthBias!=0.0 || ctx->Pixel.DepthScale!=1.0;
+   const GLboolean zoom = ctx->Pixel.ZoomX != 1.0 || ctx->Pixel.ZoomY != 1.0;
+   const GLint desty = y;
+   struct sw_span span;
+
+   INIT_SPAN(span, GL_BITMAP, 0, 0, SPAN_Z);
+
+   if (type != GL_BYTE
+       && type != GL_UNSIGNED_BYTE
+       && type != GL_SHORT
+       && type != GL_UNSIGNED_SHORT
+       && type != GL_INT
+       && type != GL_UNSIGNED_INT
+       && type != GL_FLOAT) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glDrawPixels(type)");
+      return;
+   }
+
+   _swrast_span_default_color(ctx, &span);
+
+   if (ctx->Fog.Enabled)
+      _swrast_span_default_fog(ctx, &span);
+   if (ctx->Texture._EnabledCoordUnits)
+      _swrast_span_default_texcoords(ctx, &span);
+
+   if (type == GL_UNSIGNED_SHORT && ctx->Visual.depthBits == 16
+       && !bias_or_scale && !zoom && ctx->Visual.rgbMode
+       && width < MAX_WIDTH) {
+      /* Special case: directly write 16-bit depth values */
+      GLint row;
+      span.x = x;
+      span.y = y;
+      span.end = width;
+      for (row = 0; row < height; row++, span.y++) {
+         const GLushort *zptr = (const GLushort *)
+            _mesa_image_address(&ctx->Unpack, pixels, width, height,
+                                GL_DEPTH_COMPONENT, type, 0, row, 0);
+         GLint i;
+         for (i = 0; i < width; i++)
+            span.array->z[i] = zptr[i];
+         _swrast_write_rgba_span(ctx, &span);
+      }
+   }
+   else if (type == GL_UNSIGNED_INT && ctx->Visual.depthBits == 32
+            && !bias_or_scale && !zoom && ctx->Visual.rgbMode
+            && width < MAX_WIDTH) {
+      /* Special case: directly write 32-bit depth values */
+      GLint row;
+      span.x = x;
+      span.y = y;
+      span.end = width;
+      for (row = 0; row < height; row++, span.y++) {
+         const GLuint *zptr = (const GLuint *)
+            _mesa_image_address(&ctx->Unpack, pixels, width, height,
+                                GL_DEPTH_COMPONENT, type, 0, row, 0);
+         MEMCPY(span.array->z, zptr, width * sizeof(GLdepth));
+         _swrast_write_rgba_span(ctx, &span);
+      }
+   }
+   else {
+      /* General case */
+      GLint row, skipPixels = 0;
+
+      /* in case width > MAX_WIDTH do the copy in chunks */
+      while (skipPixels < width) {
+         const GLint spanX = x + (zoom ? 0 : skipPixels);
+         GLint spanY = y;
+         const GLint spanEnd = (width - skipPixels > MAX_WIDTH)
+                             ? MAX_WIDTH : (width - skipPixels);
+         ASSERT(span.end <= MAX_WIDTH);
+         for (row = 0; row < height; row++, spanY++) {
+            GLfloat floatSpan[MAX_WIDTH];
+            const GLvoid *src = _mesa_image_address(&ctx->Unpack,
+                                                    pixels, width, height,
+                                                    GL_DEPTH_COMPONENT, type,
+                                                    0, row, skipPixels);
+
+            /* Set these for each row since the _swrast_write_* function may
+             * change them while clipping.
+             */
+            span.x = spanX;
+            span.y = spanY;
+            span.end = spanEnd;
+
+            _mesa_unpack_depth_span(ctx, span.end, floatSpan, type,
+                                    src, &ctx->Unpack);
+            /* clamp depth values to [0,1] and convert from floats to ints */
+            {
+               const GLfloat zs = ctx->DepthMaxF;
+               GLuint i;
+               for (i = 0; i < span.end; i++) {
+                  span.array->z[i] = (GLdepth) (floatSpan[i] * zs + 0.5F);
+               }
+            }
+            if (zoom) {
+               _swrast_write_zoomed_depth_span(ctx, &span, desty, skipPixels);
+            }
+            else if (ctx->Visual.rgbMode) {
+               _swrast_write_rgba_span(ctx, &span);
+            }
+            else {
+               _swrast_write_index_span(ctx, &span);
+            }
+         }
+         skipPixels += spanEnd;
+      }
+   }
+}
+
+
+
+/*
+ * Draw RGBA image.
+ */
+static void
+draw_rgba_pixels( GLcontext *ctx, GLint x, GLint y,
+                  GLsizei width, GLsizei height,
+                  GLenum format, GLenum type, const GLvoid *pixels )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   const struct gl_pixelstore_attrib *unpack = &ctx->Unpack;
+   const GLboolean zoom = ctx->Pixel.ZoomX!=1.0 || ctx->Pixel.ZoomY!=1.0;
+   const GLint desty = y;
+   GLboolean quickDraw;
+   GLfloat *convImage = NULL;
+   GLuint transferOps = ctx->_ImageTransferState;
+   struct sw_span span;
+
+   INIT_SPAN(span, GL_BITMAP, 0, 0, SPAN_RGBA);
+
+   if (!_mesa_is_legal_format_and_type(format, type)) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glDrawPixels(format or type)");
+      return;
+   }
+
+   /* Try an optimized glDrawPixels first */
+   if (fast_draw_pixels(ctx, x, y, width, height, format, type, pixels))
+      return;
+
+   if (ctx->Depth.Test)
+      _swrast_span_default_z(ctx, &span);
+   if (ctx->Fog.Enabled)
+      _swrast_span_default_fog(ctx, &span);
+   if (ctx->Texture._EnabledCoordUnits)
+      _swrast_span_default_texcoords(ctx, &span);
+
+   if (SWRAST_CONTEXT(ctx)->_RasterMask == 0 && !zoom && x >= 0 && y >= 0
+       && x + width <= (GLint) ctx->DrawBuffer->Width
+       && y + height <= (GLint) ctx->DrawBuffer->Height) {
+      quickDraw = GL_TRUE;
+   }
+   else {
+      quickDraw = GL_FALSE;
+   }
+
+   if (ctx->Pixel.Convolution2DEnabled || ctx->Pixel.Separable2DEnabled) {
+      /* Convolution has to be handled specially.  We'll create an
+       * intermediate image, applying all pixel transfer operations
+       * up to convolution.  Then we'll convolve the image.  Then
+       * we'll proceed with the rest of the transfer operations and
+       * rasterize the image.
+       */
+      GLint row;
+      GLfloat *dest, *tmpImage;
+
+      tmpImage = (GLfloat *) MALLOC(width * height * 4 * sizeof(GLfloat));
+      if (!tmpImage) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glDrawPixels");
+         return;
+      }
+      convImage = (GLfloat *) MALLOC(width * height * 4 * sizeof(GLfloat));
+      if (!convImage) {
+         FREE(tmpImage);
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glDrawPixels");
+         return;
+      }
+
+      /* Unpack the image and apply transfer ops up to convolution */
+      dest = tmpImage;
+      for (row = 0; row < height; row++) {
+         const GLvoid *source = _mesa_image_address(unpack,
+                  pixels, width, height, format, type, 0, row, 0);
+         _mesa_unpack_float_color_span(ctx, width, GL_RGBA, (GLfloat *) dest,
+                                      format, type, source, unpack,
+                                      transferOps & IMAGE_PRE_CONVOLUTION_BITS,
+                                      GL_FALSE);
+         dest += width * 4;
+      }
+
+      /* do convolution */
+      if (ctx->Pixel.Convolution2DEnabled) {
+         _mesa_convolve_2d_image(ctx, &width, &height, tmpImage, convImage);
+      }
+      else {
+         ASSERT(ctx->Pixel.Separable2DEnabled);
+         _mesa_convolve_sep_image(ctx, &width, &height, tmpImage, convImage);
+      }
+      FREE(tmpImage);
+
+      /* continue transfer ops and draw the convolved image */
+      unpack = &_mesa_native_packing;
+      pixels = convImage;
+      format = GL_RGBA;
+      type = GL_FLOAT;
+      transferOps &= IMAGE_POST_CONVOLUTION_BITS;
+   }
+
+   /*
+    * General solution
+    */
+   {
+      const GLuint interpMask = span.interpMask;
+      const GLuint arrayMask = span.arrayMask;
+      GLint row, skipPixels = 0;
+
+      /* if the span is wider than MAX_WIDTH we have to do it in chunks */
+      while (skipPixels < width) {
+         const GLint spanX = x + (zoom ? 0 : skipPixels);
+         GLint spanY = y;
+         const GLint spanEnd = (width - skipPixels > MAX_WIDTH)
+                             ? MAX_WIDTH : (width - skipPixels);
+         ASSERT(span.end <= MAX_WIDTH);
+
+         for (row = 0; row < height; row++, spanY++) {
+            const GLvoid *source = _mesa_image_address(unpack,
+                     pixels, width, height, format, type, 0, row, skipPixels);
+
+            /* Set these for each row since the _swrast_write_* function may
+             * change them while clipping.
+             */
+            span.x = spanX;
+            span.y = spanY;
+            span.end = spanEnd;
+            span.arrayMask = arrayMask;
+            span.interpMask = interpMask;
+
+            _mesa_unpack_chan_color_span(ctx, span.end, GL_RGBA,
+                                         (GLchan *) span.array->rgba,
+                                         format, type, source, unpack,
+                                         transferOps);
+
+            if ((ctx->Pixel.MinMaxEnabled && ctx->MinMax.Sink) ||
+                (ctx->Pixel.HistogramEnabled && ctx->Histogram.Sink))
+               continue;
+
+            if (ctx->Pixel.PixelTextureEnabled && ctx->Texture._EnabledUnits) {
+               _swrast_pixel_texture(ctx, &span);
+            }
+
+            /* draw the span */
+            if (quickDraw) {
+               (*swrast->Driver.WriteRGBASpan)(ctx, span.end, span.x, span.y,
+                                 (CONST GLchan (*)[4]) span.array->rgba, NULL);
+            }
+            else if (zoom) {
+               _swrast_write_zoomed_rgba_span(ctx, &span,
+                    (CONST GLchan (*)[4]) span.array->rgba, desty, skipPixels);
+            }
+            else {
+               _swrast_write_rgba_span(ctx, &span);
+            }
+         }
+
+         skipPixels += spanEnd;
+      }
+   }
+
+   if (convImage) {
+      FREE(convImage);
+   }
+}
+
+
+
+/*
+ * Execute glDrawPixels
+ */
+void
+_swrast_DrawPixels( GLcontext *ctx,
+		    GLint x, GLint y,
+		    GLsizei width, GLsizei height,
+		    GLenum format, GLenum type,
+		    const struct gl_pixelstore_attrib *unpack,
+		    const GLvoid *pixels )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   (void) unpack;
+
+   if (swrast->NewState)
+      _swrast_validate_derived( ctx );
+
+   RENDER_START(swrast,ctx);
+
+   switch (format) {
+   case GL_STENCIL_INDEX:
+      draw_stencil_pixels( ctx, x, y, width, height, type, pixels );
+      break;
+   case GL_DEPTH_COMPONENT:
+      draw_depth_pixels( ctx, x, y, width, height, type, pixels );
+      break;
+   case GL_COLOR_INDEX:
+      if (ctx->Visual.rgbMode)
+	 draw_rgba_pixels(ctx, x,y, width, height, format, type, pixels);
+      else
+	 draw_index_pixels(ctx, x, y, width, height, type, pixels);
+      break;
+   case GL_RED:
+   case GL_GREEN:
+   case GL_BLUE:
+   case GL_ALPHA:
+   case GL_LUMINANCE:
+   case GL_LUMINANCE_ALPHA:
+   case GL_RGB:
+   case GL_BGR:
+   case GL_RGBA:
+   case GL_BGRA:
+   case GL_ABGR_EXT:
+      draw_rgba_pixels(ctx, x, y, width, height, format, type, pixels);
+      break;
+   default:
+      _mesa_error( ctx, GL_INVALID_ENUM, "glDrawPixels(format)" );
+   }
+
+   RENDER_FINISH(swrast,ctx);
+}
+
+
+
+#if 0  /* experimental */
+/*
+ * Execute glDrawDepthPixelsMESA().
+ */
+void
+_swrast_DrawDepthPixelsMESA( GLcontext *ctx,
+                             GLint x, GLint y,
+                             GLsizei width, GLsizei height,
+                             GLenum colorFormat, GLenum colorType,
+                             const GLvoid *colors,
+                             GLenum depthType, const GLvoid *depths,
+                             const struct gl_pixelstore_attrib *unpack )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   (void) unpack;
+
+   if (swrast->NewState)
+      _swrast_validate_derived( ctx );
+
+   RENDER_START(swrast,ctx);
+
+   switch (colorFormat) {
+   case GL_COLOR_INDEX:
+      if (ctx->Visual.rgbMode)
+	 draw_rgba_pixels(ctx, x,y, width, height, colorFormat, colorType, colors);
+      else
+	 draw_index_pixels(ctx, x, y, width, height, colorType, colors);
+      break;
+   case GL_RED:
+   case GL_GREEN:
+   case GL_BLUE:
+   case GL_ALPHA:
+   case GL_LUMINANCE:
+   case GL_LUMINANCE_ALPHA:
+   case GL_RGB:
+   case GL_BGR:
+   case GL_RGBA:
+   case GL_BGRA:
+   case GL_ABGR_EXT:
+      draw_rgba_pixels(ctx, x, y, width, height, colorFormat, colorType, colors);
+      break;
+   default:
+      _mesa_error( ctx, GL_INVALID_ENUM,
+                   "glDrawDepthPixelsMESA(colorFormat)" );
+   }
+
+   RENDER_FINISH(swrast,ctx);
+}
+#endif
diff --git a/reactos/lib/mesa32/src/swrast/s_drawpix.h b/reactos/lib/mesa32/src/swrast/s_drawpix.h
new file mode 100644
index 00000000000..605a293daea
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_drawpix.h
@@ -0,0 +1,41 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef S_DRAWPIXELS_H
+#define S_DRAWPIXELS_H
+
+
+#include "mtypes.h"
+#include "swrast.h"
+
+
+extern GLboolean
+_swrast_clip_pixelrect(const GLcontext *ctx,
+                     GLint *destX, GLint *destY,
+                     GLsizei *width, GLsizei *height,
+                     GLint *skipPixels, GLint *skipRows);
+
+#endif
diff --git a/reactos/lib/mesa32/src/swrast/s_feedback.c b/reactos/lib/mesa32/src/swrast/s_feedback.c
new file mode 100644
index 00000000000..2ebaaff3c19
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_feedback.c
@@ -0,0 +1,165 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "glheader.h"
+#include "colormac.h"
+#include "context.h"
+#include "enums.h"
+#include "feedback.h"
+#include "macros.h"
+
+#include "s_context.h"
+#include "s_feedback.h"
+#include "s_triangle.h"
+
+
+#define FB_3D		0x01
+#define FB_4D		0x02
+#define FB_INDEX	0x04
+#define FB_COLOR	0x08
+#define FB_TEXTURE	0X10
+
+
+
+
+static void feedback_vertex( GLcontext *ctx,
+                             const SWvertex *v, const SWvertex *pv )
+{
+   const GLuint texUnit = 0;  /* See section 5.3 of 1.2.1 spec */
+   GLfloat win[4];
+   GLfloat color[4];
+   GLfloat tc[4];
+   GLuint index;
+
+   win[0] = v->win[0];
+   win[1] = v->win[1];
+   win[2] = v->win[2] / ctx->DepthMaxF;
+   win[3] = 1.0F / v->win[3];
+
+   color[0] = CHAN_TO_FLOAT(pv->color[0]);
+   color[1] = CHAN_TO_FLOAT(pv->color[1]);
+   color[2] = CHAN_TO_FLOAT(pv->color[2]);
+   color[3] = CHAN_TO_FLOAT(pv->color[3]);
+
+   if (v->texcoord[texUnit][3] != 1.0 &&
+       v->texcoord[texUnit][3] != 0.0) {
+      GLfloat invq = 1.0F / v->texcoord[texUnit][3];
+      tc[0] = v->texcoord[texUnit][0] * invq;
+      tc[1] = v->texcoord[texUnit][1] * invq;
+      tc[2] = v->texcoord[texUnit][2] * invq;
+      tc[3] = v->texcoord[texUnit][3];
+   }
+   else {
+      COPY_4V(tc, v->texcoord[texUnit]);
+   }
+
+   index = v->index;
+
+   _mesa_feedback_vertex( ctx, win, color, (GLfloat)index, tc );
+}
+
+
+/*
+ * Put triangle in feedback buffer.
+ */
+void _swrast_feedback_triangle( GLcontext *ctx,
+                           const SWvertex *v0,
+                           const SWvertex *v1,
+			   const SWvertex *v2)
+{
+   if (_swrast_culltriangle( ctx, v0, v1, v2 )) {
+      FEEDBACK_TOKEN( ctx, (GLfloat) (GLint) GL_POLYGON_TOKEN );
+      FEEDBACK_TOKEN( ctx, (GLfloat) 3 );        /* three vertices */
+
+      if (ctx->Light.ShadeModel == GL_SMOOTH) {
+	 feedback_vertex( ctx, v0, v0 );
+	 feedback_vertex( ctx, v1, v1 );
+	 feedback_vertex( ctx, v2, v2 );
+      } else {
+	 feedback_vertex( ctx, v0, v2 );
+	 feedback_vertex( ctx, v1, v2 );
+	 feedback_vertex( ctx, v2, v2 );
+      }
+   }
+}
+
+
+void _swrast_feedback_line( GLcontext *ctx, const SWvertex *v0, const SWvertex *v1 )
+{
+   GLenum token = GL_LINE_TOKEN;
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+
+   if (swrast->StippleCounter==0)
+      token = GL_LINE_RESET_TOKEN;
+
+   FEEDBACK_TOKEN( ctx, (GLfloat) (GLint) token );
+
+   if (ctx->Light.ShadeModel == GL_SMOOTH) {
+      feedback_vertex( ctx, v0, v0 );
+      feedback_vertex( ctx, v1, v1 );
+   } else {
+      feedback_vertex( ctx, v0, v1 );
+      feedback_vertex( ctx, v1, v1 );
+   }
+
+   swrast->StippleCounter++;
+}
+
+
+void _swrast_feedback_point( GLcontext *ctx, const SWvertex *v )
+{
+   FEEDBACK_TOKEN( ctx, (GLfloat) (GLint) GL_POINT_TOKEN );
+   feedback_vertex( ctx, v, v );
+}
+
+
+void _swrast_select_triangle( GLcontext *ctx,
+                         const SWvertex *v0,
+                         const SWvertex *v1,
+			 const SWvertex *v2)
+{
+   if (_swrast_culltriangle( ctx, v0, v1, v2 )) {
+      const GLfloat zs = 1.0F / ctx->DepthMaxF;
+
+      _mesa_update_hitflag( ctx, v0->win[2] * zs );
+      _mesa_update_hitflag( ctx, v1->win[2] * zs );
+      _mesa_update_hitflag( ctx, v2->win[2] * zs );
+   }
+}
+
+
+void _swrast_select_line( GLcontext *ctx, const SWvertex *v0, const SWvertex *v1 )
+{
+   const GLfloat zs = 1.0F / ctx->DepthMaxF;
+   _mesa_update_hitflag( ctx, v0->win[2] * zs );
+   _mesa_update_hitflag( ctx, v1->win[2] * zs );
+}
+
+
+void _swrast_select_point( GLcontext *ctx, const SWvertex *v )
+{
+   const GLfloat zs = 1.0F / ctx->DepthMaxF;
+   _mesa_update_hitflag( ctx, v->win[2] * zs );
+}
diff --git a/reactos/lib/mesa32/src/swrast/s_feedback.h b/reactos/lib/mesa32/src/swrast/s_feedback.h
new file mode 100644
index 00000000000..73f45c10be5
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_feedback.h
@@ -0,0 +1,51 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef S_FEEDBACK_H
+#define S_FEEDBACK_H
+
+
+#include "mtypes.h"
+#include "swrast.h"
+
+
+extern void _swrast_feedback_point( GLcontext *ctx, const SWvertex *v );
+
+extern void _swrast_feedback_line( GLcontext *ctx,
+                              const SWvertex *v1, const SWvertex *v2 );
+
+extern void _swrast_feedback_triangle( GLcontext *ctx, const SWvertex *v0,
+                                  const SWvertex *v1, const SWvertex *v2 );
+
+extern void _swrast_select_point( GLcontext *ctx, const SWvertex *v );
+
+extern void _swrast_select_line( GLcontext *ctx,
+                            const SWvertex *v1, const SWvertex *v2 );
+
+extern void _swrast_select_triangle( GLcontext *ctx, const SWvertex *v0,
+                                const SWvertex *v1, const SWvertex *v2 );
+
+#endif
diff --git a/reactos/lib/mesa32/src/swrast/s_fog.c b/reactos/lib/mesa32/src/swrast/s_fog.c
new file mode 100644
index 00000000000..da06e3f3543
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_fog.c
@@ -0,0 +1,313 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "colormac.h"
+#include "context.h"
+#include "macros.h"
+
+#include "s_context.h"
+#include "s_fog.h"
+#include "s_span.h"
+
+
+
+
+/**
+ * Used to convert current raster distance to a fog factor in [0,1].
+ */
+GLfloat
+_swrast_z_to_fogfactor(GLcontext *ctx, GLfloat z)
+{
+   GLfloat d, f;
+
+   switch (ctx->Fog.Mode) {
+   case GL_LINEAR:
+      if (ctx->Fog.Start == ctx->Fog.End)
+         d = 1.0F;
+      else
+         d = 1.0F / (ctx->Fog.End - ctx->Fog.Start);
+      f = (ctx->Fog.End - z) * d;
+      return CLAMP(f, 0.0F, 1.0F);
+   case GL_EXP:
+      d = ctx->Fog.Density;
+      f = (GLfloat) exp(-d * z);
+      return f;
+   case GL_EXP2:
+      d = ctx->Fog.Density;
+      f = (GLfloat) exp(-(d * d * z * z));
+      return f;
+   default:
+      _mesa_problem(ctx, "Bad fog mode in _swrast_z_to_fogfactor");
+      return 0.0; 
+   }
+}
+
+
+
+/**
+ * Calculate fog factors (in [0,1]) from window z values
+ * Input:  n - number of pixels
+ *         z - array of integer depth values
+ *         red, green, blue, alpha - pixel colors
+ * Output:  red, green, blue, alpha - fogged pixel colors
+ *
+ * Use lookup table & interpolation?
+ */
+static void
+compute_fog_factors_from_z( const GLcontext *ctx,
+                            GLuint n,
+                            const GLdepth z[],
+                            GLfloat fogFact[] )
+{
+   const GLfloat *proj = ctx->ProjectionMatrixStack.Top->m;
+   const GLboolean ortho = (proj[15] != 0.0F);
+   const GLfloat p10 = proj[10];
+   const GLfloat p14 = proj[14];
+   const GLfloat tz = ctx->Viewport._WindowMap.m[MAT_TZ];
+   GLfloat szInv;
+   GLuint i;
+
+   if (ctx->Viewport._WindowMap.m[MAT_SZ] == 0.0)
+      szInv = 1.0F;
+   else
+      szInv = 1.0F / ctx->Viewport._WindowMap.m[MAT_SZ];
+
+   /*
+    * Note: to compute eyeZ from the ndcZ we have to solve the following:
+    *
+    *        p[10] * eyeZ + p[14] * eyeW
+    * ndcZ = ---------------------------
+    *        p[11] * eyeZ + p[15] * eyeW
+    *
+    * Thus:
+    *
+    *        p[14] * eyeW - p[15] * eyeW * ndcZ
+    * eyeZ = ----------------------------------
+    *             p[11] * ndcZ - p[10]
+    *
+    * If we note:
+    *    a) if using an orthographic projection, p[11] = 0 and p[15] = 1.
+    *    b) if using a perspective projection, p[11] = -1 and p[15] = 0.
+    *    c) we assume eyeW = 1 (not always true- glVertex4)
+    *
+    * Then we can simplify the calculation of eyeZ quite a bit.  We do
+    * separate calculations for the orthographic and perspective cases below.
+    * Note that we drop a negative sign or two since they don't matter.
+    */
+
+   switch (ctx->Fog.Mode) {
+      case GL_LINEAR:
+         {
+            GLfloat fogEnd = ctx->Fog.End;
+            GLfloat fogScale;
+            if (ctx->Fog.Start == ctx->Fog.End)
+               fogScale = 1.0;
+            else
+               fogScale = 1.0F / (ctx->Fog.End - ctx->Fog.Start);
+            if (ortho) {
+               for (i=0;i<n;i++) {
+                  GLfloat ndcz = ((GLfloat) z[i] - tz) * szInv;
+                  GLfloat eyez = (ndcz - p14) / p10;
+                  GLfloat f;
+                  if (eyez < 0.0)
+                     eyez = -eyez;
+                  f = (fogEnd - eyez) * fogScale;
+                  fogFact[i] = CLAMP(f, 0.0F, 1.0F);
+               }
+            }
+            else {
+               /* perspective */
+               for (i=0;i<n;i++) {
+                  GLfloat ndcz = ((GLfloat) z[i] - tz) * szInv;
+                  GLfloat eyez = p14 / (ndcz + p10);
+                  GLfloat f;
+                  if (eyez < 0.0)
+                     eyez = -eyez;
+                  f = (fogEnd - eyez) * fogScale;
+                  fogFact[i] = CLAMP(f, 0.0F, 1.0F);
+               }
+            }
+         }
+	 break;
+      case GL_EXP:
+         if (ortho) {
+            for (i=0;i<n;i++) {
+               GLfloat ndcz = ((GLfloat) z[i] - tz) * szInv;
+               GLfloat eyez = (ndcz - p14) / p10;
+               if (eyez < 0.0)
+                  eyez = -eyez;
+               fogFact[i] = (GLfloat) exp( -ctx->Fog.Density * eyez );
+            }
+         }
+         else {
+            /* perspective */
+            for (i=0;i<n;i++) {
+               GLfloat ndcz = ((GLfloat) z[i] - tz) * szInv;
+               GLfloat eyez = p14 / (ndcz + p10);
+               if (eyez < 0.0)
+                  eyez = -eyez;
+               fogFact[i] = (GLfloat) exp( -ctx->Fog.Density * eyez );
+            }
+         }
+	 break;
+      case GL_EXP2:
+         {
+            GLfloat negDensitySquared = -ctx->Fog.Density * ctx->Fog.Density;
+            if (ortho) {
+               for (i=0;i<n;i++) {
+                  GLfloat ndcz = ((GLfloat) z[i] - tz) * szInv;
+                  GLfloat eyez = (ndcz - p14) / p10;
+                  GLfloat tmp = negDensitySquared * eyez * eyez;
+#if defined(__alpha__) || defined(__alpha)
+                  /* XXX this underflow check may be needed for other systems*/
+                  if (tmp < FLT_MIN_10_EXP)
+                     tmp = FLT_MIN_10_EXP;
+#endif
+                  fogFact[i] = (GLfloat) exp( tmp );
+               }
+            }
+            else {
+               /* perspective */
+               for (i=0;i<n;i++) {
+                  GLfloat ndcz = ((GLfloat) z[i] - tz) * szInv;
+                  GLfloat eyez = p14 / (ndcz + p10);
+                  GLfloat tmp = negDensitySquared * eyez * eyez;
+#if defined(__alpha__) || defined(__alpha)
+                  /* XXX this underflow check may be needed for other systems*/
+                  if (tmp < FLT_MIN_10_EXP)
+                     tmp = FLT_MIN_10_EXP;
+#endif
+                  fogFact[i] = (GLfloat) exp( tmp );
+               }
+            }
+         }
+	 break;
+      default:
+         _mesa_problem(ctx, "Bad fog mode in compute_fog_factors_from_z");
+         return;
+   }
+}
+
+
+
+/**
+ * Apply fog to a span of RGBA pixels.
+ * The fog factors are either in the span->array->fog or stored as base/step.
+ * These are fog _factors_, not fog coords.  Fog coords were converted to
+ * fog factors per vertex.
+ */
+void
+_swrast_fog_rgba_span( const GLcontext *ctx, struct sw_span *span )
+{
+   const SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   const GLuint n = span->end;
+   GLchan (*rgba)[4] = (GLchan (*)[4]) span->array->rgba;
+   GLchan rFog, gFog, bFog;
+
+   ASSERT(ctx->Fog.Enabled);
+   ASSERT((span->interpMask | span->arrayMask) & SPAN_FOG);
+   ASSERT(span->arrayMask & SPAN_RGBA);
+
+   UNCLAMPED_FLOAT_TO_CHAN(rFog, ctx->Fog.Color[RCOMP]);
+   UNCLAMPED_FLOAT_TO_CHAN(gFog, ctx->Fog.Color[GCOMP]);
+   UNCLAMPED_FLOAT_TO_CHAN(bFog, ctx->Fog.Color[BCOMP]);
+
+   if (swrast->_PreferPixelFog) {
+      /* compute fog factor from each fragment's Z value */
+      if ((span->interpMask & SPAN_Z) && (span->arrayMask & SPAN_Z) == 0)
+         _swrast_span_interpolate_z(ctx, span);
+      compute_fog_factors_from_z(ctx, n, span->array->z, span->array->fog);
+      span->arrayMask |= SPAN_FOG;
+   }
+
+   if (span->arrayMask & SPAN_FOG) {
+      /* use fog array in span */
+      GLuint i;
+      for (i = 0; i < n; i++) {
+         const GLfloat fog = span->array->fog[i];
+         const GLfloat oneMinusFog = 1.0F - fog;
+         rgba[i][RCOMP] = (GLchan) (fog * rgba[i][RCOMP] + oneMinusFog * rFog);
+         rgba[i][GCOMP] = (GLchan) (fog * rgba[i][GCOMP] + oneMinusFog * gFog);
+         rgba[i][BCOMP] = (GLchan) (fog * rgba[i][BCOMP] + oneMinusFog * bFog);
+      }
+   }
+   else {
+      /* interpolate fog factors */
+      GLfloat fog = span->fog, dFog = span->fogStep;
+      GLuint i;
+      for (i = 0; i < n; i++) {
+         const GLfloat oneMinusFog = 1.0F - fog;
+         rgba[i][RCOMP] = (GLchan) (fog * rgba[i][RCOMP] + oneMinusFog * rFog);
+         rgba[i][GCOMP] = (GLchan) (fog * rgba[i][GCOMP] + oneMinusFog * gFog);
+         rgba[i][BCOMP] = (GLchan) (fog * rgba[i][BCOMP] + oneMinusFog * bFog);
+         fog += dFog;
+      }
+   }
+}
+
+
+/**
+ * As above, but color index mode.
+ */
+void
+_swrast_fog_ci_span( const GLcontext *ctx, struct sw_span *span )
+{
+   const SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   const GLuint n = span->end;
+   GLuint *index = span->array->index;
+
+   ASSERT(ctx->Fog.Enabled);
+   ASSERT(span->arrayMask & SPAN_INDEX);
+   ASSERT((span->interpMask | span->arrayMask) & SPAN_FOG);
+
+   if (swrast->_PreferPixelFog) {
+      /* compute fog factor from each fragment's Z value */
+      if ((span->interpMask & SPAN_Z) && (span->arrayMask & SPAN_Z) == 0)
+         _swrast_span_interpolate_z(ctx, span);
+      compute_fog_factors_from_z(ctx, n, span->array->z, span->array->fog);
+      span->arrayMask |= SPAN_FOG;
+   }
+
+   if (span->arrayMask & SPAN_FOG) {
+      const GLuint idx = (GLuint) ctx->Fog.Index;
+      GLuint i;
+      for (i = 0; i < n; i++) {
+         const GLfloat f = CLAMP(span->array->fog[i], 0.0F, 1.0F);
+         index[i] = (GLuint) ((GLfloat) index[i] + (1.0F - f) * idx);
+      }
+   }
+   else {
+      GLfloat fog = span->fog, dFog = span->fogStep;
+      const GLuint idx = (GLuint) ctx->Fog.Index;
+      GLuint i;
+      for (i = 0; i < n; i++) {
+         const GLfloat f = CLAMP(fog, 0.0F, 1.0F);
+         index[i] = (GLuint) ((GLfloat) index[i] + (1.0F - f) * idx);
+         fog += dFog;
+      }
+   }
+}
diff --git a/reactos/lib/mesa32/src/swrast/s_fog.h b/reactos/lib/mesa32/src/swrast/s_fog.h
new file mode 100644
index 00000000000..f5744b1d952
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_fog.h
@@ -0,0 +1,45 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef S_FOG_H
+#define S_FOG_H
+
+
+#include "mtypes.h"
+#include "swrast.h"
+
+
+extern GLfloat
+_swrast_z_to_fogfactor(GLcontext *ctx, GLfloat z);
+
+extern void
+_swrast_fog_rgba_span( const GLcontext *ctx, struct sw_span *span );
+
+extern void
+_swrast_fog_ci_span( const GLcontext *ctx, struct sw_span *span );
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/swrast/s_imaging.c b/reactos/lib/mesa32/src/swrast/s_imaging.c
new file mode 100644
index 00000000000..b9c413687b1
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_imaging.c
@@ -0,0 +1,155 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/* KW:  Moved these here to remove knowledge of swrast from core mesa.
+ * Should probably pull the entire software implementation of these
+ * extensions into either swrast or a sister module.  
+ */
+
+#include "s_context.h"
+#include "s_span.h"
+
+void
+_swrast_CopyColorTable( GLcontext *ctx, 
+			GLenum target, GLenum internalformat,
+			GLint x, GLint y, GLsizei width)
+{
+   GLchan data[MAX_WIDTH][4];
+
+   /* Select buffer to read from */
+   _swrast_use_read_buffer(ctx);
+
+   if (width > MAX_WIDTH)
+      width = MAX_WIDTH;
+
+   /* read the data from framebuffer */
+   _swrast_read_rgba_span( ctx, ctx->ReadBuffer, width, x, y, data );
+
+   /* Restore reading from draw buffer (the default) */
+   _swrast_use_draw_buffer(ctx);
+
+   glColorTable(target, internalformat, width, GL_RGBA, CHAN_TYPE, data);
+}
+
+void
+_swrast_CopyColorSubTable( GLcontext *ctx,GLenum target, GLsizei start,
+			   GLint x, GLint y, GLsizei width)
+{
+   GLchan data[MAX_WIDTH][4];
+
+   /* Select buffer to read from */
+   _swrast_use_read_buffer(ctx);
+
+   if (width > MAX_WIDTH)
+      width = MAX_WIDTH;
+
+   /* read the data from framebuffer */
+   _swrast_read_rgba_span( ctx, ctx->ReadBuffer, width, x, y, data );
+
+   /* Restore reading from draw buffer (the default) */
+   _swrast_use_draw_buffer(ctx);
+
+   glColorSubTable(target, start, width, GL_RGBA, CHAN_TYPE, data);
+}
+
+
+void
+_swrast_CopyConvolutionFilter1D(GLcontext *ctx, GLenum target, 
+				GLenum internalFormat, 
+				GLint x, GLint y, GLsizei width)
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   GLchan rgba[MAX_CONVOLUTION_WIDTH][4];
+
+   /* Select buffer to read from */
+   _swrast_use_read_buffer(ctx);
+
+   RENDER_START( swrast, ctx );
+
+   /* read the data from framebuffer */
+   _swrast_read_rgba_span( ctx, ctx->ReadBuffer, width, x, y,
+				(GLchan (*)[4]) rgba );
+   
+   RENDER_FINISH( swrast, ctx );
+
+   /* Restore reading from draw buffer (the default) */
+   _swrast_use_draw_buffer(ctx);
+
+   /* store as convolution filter */
+   glConvolutionFilter1D(target, internalFormat, width,
+			 GL_RGBA, CHAN_TYPE, rgba);
+}
+
+
+void
+_swrast_CopyConvolutionFilter2D(GLcontext *ctx, GLenum target, 
+				GLenum internalFormat, 
+				GLint x, GLint y, GLsizei width, GLsizei height)
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   struct gl_pixelstore_attrib packSave;
+   GLchan rgba[MAX_CONVOLUTION_HEIGHT][MAX_CONVOLUTION_WIDTH][4];
+   GLint i;
+
+   /* Select buffer to read from */
+   _swrast_use_read_buffer(ctx);
+
+   RENDER_START(swrast,ctx);
+   
+   /* read pixels from framebuffer */
+   for (i = 0; i < height; i++) {
+      _swrast_read_rgba_span( ctx, ctx->ReadBuffer, width, x, y + i,
+				(GLchan (*)[4]) rgba[i] );
+   }
+
+   RENDER_FINISH(swrast,ctx);
+
+   /* Restore reading from draw buffer (the default) */
+   _swrast_use_draw_buffer(ctx);
+
+   /*
+    * HACK: save & restore context state so we can store this as a
+    * convolution filter via the GL api.  Doesn't call any callbacks
+    * hanging off ctx->Unpack statechanges.
+    */
+
+   packSave = ctx->Unpack;  /* save pixel packing params */
+
+   ctx->Unpack.Alignment = 1;
+   ctx->Unpack.RowLength = MAX_CONVOLUTION_WIDTH;
+   ctx->Unpack.SkipPixels = 0;
+   ctx->Unpack.SkipRows = 0;
+   ctx->Unpack.ImageHeight = 0;
+   ctx->Unpack.SkipImages = 0;
+   ctx->Unpack.SwapBytes = GL_FALSE;
+   ctx->Unpack.LsbFirst = GL_FALSE;
+   ctx->NewState |= _NEW_PACKUNPACK;
+
+   glConvolutionFilter2D(target, internalFormat, width, height,
+			 GL_RGBA, CHAN_TYPE, rgba);
+
+   ctx->Unpack = packSave;  /* restore pixel packing params */
+   ctx->NewState |= _NEW_PACKUNPACK; 
+}
diff --git a/reactos/lib/mesa32/src/swrast/s_lines.c b/reactos/lib/mesa32/src/swrast/s_lines.c
new file mode 100644
index 00000000000..4d9fe589206
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_lines.c
@@ -0,0 +1,342 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "context.h"
+#include "colormac.h"
+#include "macros.h"
+#include "nvfragprog.h"
+#include "s_aaline.h"
+#include "s_context.h"
+#include "s_depth.h"
+#include "s_feedback.h"
+#include "s_lines.h"
+#include "s_span.h"
+
+
+/*
+ * Init the mask[] array to implement a line stipple.
+ */
+static void
+compute_stipple_mask( GLcontext *ctx, GLuint len, GLubyte mask[] )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   GLuint i;
+
+   for (i = 0; i < len; i++) {
+      GLuint bit = (swrast->StippleCounter / ctx->Line.StippleFactor) & 0xf;
+      if ((1 << bit) & ctx->Line.StipplePattern) {
+         mask[i] = GL_TRUE;
+      }
+      else {
+         mask[i] = GL_FALSE;
+      }
+      swrast->StippleCounter++;
+   }
+}
+
+
+/*
+ * To draw a wide line we can simply redraw the span N times, side by side.
+ */
+static void
+draw_wide_line( GLcontext *ctx, struct sw_span *span, GLboolean xMajor )
+{
+   GLint width, start;
+
+   ASSERT(span->end < MAX_WIDTH);
+
+   width = (GLint) CLAMP( ctx->Line.Width, MIN_LINE_WIDTH, MAX_LINE_WIDTH );
+
+   if (width & 1)
+      start = width / 2;
+   else
+      start = width / 2 - 1;
+
+   if (xMajor) {
+      GLint *y = span->array->y;
+      GLuint i;
+      GLint w;
+      for (w = 0; w < width; w++) {
+         if (w == 0) {
+            for (i = 0; i < span->end; i++)
+               y[i] -= start;
+         }
+         else {
+            for (i = 0; i < span->end; i++)
+               y[i]++;
+         }
+         if ((span->interpMask | span->arrayMask) & SPAN_TEXTURE)
+            _swrast_write_texture_span(ctx, span);
+         else if ((span->interpMask | span->arrayMask) & SPAN_RGBA)
+            _swrast_write_rgba_span(ctx, span);
+         else
+            _swrast_write_index_span(ctx, span);
+      }
+   }
+   else {
+      GLint *x = span->array->x;
+      GLuint i;
+      GLint w;
+      for (w = 0; w < width; w++) {
+         if (w == 0) {
+            for (i = 0; i < span->end; i++)
+               x[i] -= start;
+         }
+         else {
+            for (i = 0; i < span->end; i++)
+               x[i]++;
+         }
+         if ((span->interpMask | span->arrayMask) & SPAN_TEXTURE)
+            _swrast_write_texture_span(ctx, span);
+         else if ((span->interpMask | span->arrayMask) & SPAN_RGBA)
+            _swrast_write_rgba_span(ctx, span);
+         else
+            _swrast_write_index_span(ctx, span);
+      }
+   }
+}
+
+
+
+/**********************************************************************/
+/*****                    Rasterization                           *****/
+/**********************************************************************/
+
+/* Simple color index line (no stipple, width=1, no Z, no fog, no tex)*/
+#define NAME simple_ci_line
+#define INTERP_INDEX
+#define RENDER_SPAN(span) _swrast_write_index_span(ctx, &span)
+#include "s_linetemp.h"
+
+/* Simple RGBA index line (no stipple, width=1, no Z, no fog, no tex)*/
+#define NAME simple_rgba_line
+#define INTERP_RGBA
+#define RENDER_SPAN(span) _swrast_write_rgba_span(ctx, &span);
+#include "s_linetemp.h"
+
+
+/* Z, fog, wide, stipple color index line */
+#define NAME general_ci_line
+#define INTERP_INDEX
+#define INTERP_Z
+#define INTERP_FOG
+#define RENDER_SPAN(span)					\
+   if (ctx->Line.StippleFlag) {					\
+      span.arrayMask |= SPAN_MASK;				\
+      compute_stipple_mask(ctx, span.end, span.array->mask);    \
+   }								\
+   if (ctx->Line.Width > 1.0) {					\
+      draw_wide_line(ctx, &span, (GLboolean)(dx > dy));		\
+   }								\
+   else {							\
+      _swrast_write_index_span(ctx, &span);			\
+   }
+#include "s_linetemp.h"
+
+
+/* Z, fog, wide, stipple RGBA line */
+#define NAME general_rgba_line
+#define INTERP_RGBA
+#define INTERP_Z
+#define INTERP_FOG
+#define RENDER_SPAN(span)					\
+   if (ctx->Line.StippleFlag) {					\
+      span.arrayMask |= SPAN_MASK;				\
+      compute_stipple_mask(ctx, span.end, span.array->mask);	\
+   }								\
+   if (ctx->Line.Width > 1.0) {					\
+      draw_wide_line(ctx, &span, (GLboolean)(dx > dy));		\
+   }								\
+   else {							\
+      _swrast_write_rgba_span(ctx, &span);			\
+   }
+#include "s_linetemp.h"
+
+
+/* Single-texture line, w/ fog, Z, specular, etc. */
+#define NAME textured_line
+#define INTERP_RGBA
+#define INTERP_Z
+#define INTERP_FOG
+#define INTERP_TEX
+#define RENDER_SPAN(span)					\
+   if (ctx->Line.StippleFlag) {					\
+      span.arrayMask |= SPAN_MASK;				\
+      compute_stipple_mask(ctx, span.end, span.array->mask);	\
+   }								\
+   if (ctx->Line.Width > 1.0) {					\
+      draw_wide_line(ctx, &span, (GLboolean)(dx > dy));		\
+   }								\
+   else {							\
+      _swrast_write_texture_span(ctx, &span);			\
+   }
+#include "s_linetemp.h"
+
+
+/* Multi-texture or separate specular line, w/ fog, Z, specular, etc. */
+#define NAME multitextured_line
+#define INTERP_RGBA
+#define INTERP_SPEC
+#define INTERP_Z
+#define INTERP_FOG
+#define INTERP_MULTITEX
+#define RENDER_SPAN(span)					\
+   if (ctx->Line.StippleFlag) {					\
+      span.arrayMask |= SPAN_MASK;				\
+      compute_stipple_mask(ctx, span.end, span.array->mask);	\
+   }								\
+   if (ctx->Line.Width > 1.0) {					\
+      draw_wide_line(ctx, &span, (GLboolean)(dx > dy));		\
+   }								\
+   else {							\
+      _swrast_write_texture_span(ctx, &span);			\
+   }
+#include "s_linetemp.h"
+
+
+
+void
+_swrast_add_spec_terms_line( GLcontext *ctx,
+                             const SWvertex *v0,
+                             const SWvertex *v1 )
+{
+   SWvertex *ncv0 = (SWvertex *)v0;
+   SWvertex *ncv1 = (SWvertex *)v1;
+   GLchan c[2][4];
+   COPY_CHAN4( c[0], ncv0->color );
+   COPY_CHAN4( c[1], ncv1->color );
+   ACC_3V( ncv0->color, ncv0->specular );
+   ACC_3V( ncv1->color, ncv1->specular );
+   SWRAST_CONTEXT(ctx)->SpecLine( ctx, ncv0, ncv1 );
+   COPY_CHAN4( ncv0->color, c[0] );
+   COPY_CHAN4( ncv1->color, c[1] );
+}
+
+
+#ifdef DEBUG
+extern void
+_mesa_print_line_function(GLcontext *ctx);  /* silence compiler warning */
+void
+_mesa_print_line_function(GLcontext *ctx)
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+
+   _mesa_printf("Line Func == ");
+   if (swrast->Line == simple_ci_line)
+      _mesa_printf("simple_ci_line\n");
+   else if (swrast->Line == simple_rgba_line)
+      _mesa_printf("simple_rgba_line\n");
+   else if (swrast->Line == general_ci_line)
+      _mesa_printf("general_ci_line\n");
+   else if (swrast->Line == general_rgba_line)
+      _mesa_printf("general_rgba_line\n");
+   else if (swrast->Line == textured_line)
+      _mesa_printf("textured_line\n");
+   else if (swrast->Line == multitextured_line)
+      _mesa_printf("multitextured_line\n");
+   else
+      _mesa_printf("Driver func %p\n", (void *) swrast->Line);
+}
+#endif
+
+
+
+#ifdef DEBUG
+
+/* record the current line function name */
+static const char *lineFuncName = NULL;
+
+#define USE(lineFunc)                   \
+do {                                    \
+    lineFuncName = #lineFunc;           \
+    /*_mesa_printf("%s\n", lineFuncName);*/   \
+    swrast->Line = lineFunc;            \
+} while (0)
+
+#else
+
+#define USE(lineFunc)  swrast->Line = lineFunc
+
+#endif
+
+
+
+/*
+ * Determine which line drawing function to use given the current
+ * rendering context.
+ *
+ * Please update the summary flag _SWRAST_NEW_LINE if you add or remove
+ * tests to this code.
+ */
+void
+_swrast_choose_line( GLcontext *ctx )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   const GLboolean rgbmode = ctx->Visual.rgbMode;
+
+   if (ctx->RenderMode == GL_RENDER) {
+      if (ctx->Line.SmoothFlag) {
+         /* antialiased lines */
+         _swrast_choose_aa_line_function(ctx);
+         ASSERT(swrast->Line);
+      }
+      else if (ctx->Texture._EnabledCoordUnits) {
+         /* textured lines */
+         if (ctx->Texture._EnabledCoordUnits > 0x1
+             || NEED_SECONDARY_COLOR(ctx)) {
+            /* multi-texture and/or separate specular color */
+            USE(multitextured_line);
+         }
+         else {
+            USE(textured_line);
+         }
+      }
+      else if (ctx->Depth.Test || ctx->Fog.Enabled || ctx->Line.Width != 1.0
+               || ctx->Line.StippleFlag) {
+         /* no texture, but Z, fog, width>1, stipple, etc. */
+         if (rgbmode)
+            USE(general_rgba_line);
+         else
+            USE(general_ci_line);
+      }
+      else {
+         /* simplest lines */
+         if (rgbmode)
+            USE(simple_rgba_line);
+         else
+            USE(simple_ci_line);
+      }
+   }
+   else if (ctx->RenderMode == GL_FEEDBACK) {
+      USE(_swrast_feedback_line);
+   }
+   else {
+      ASSERT(ctx->RenderMode == GL_SELECT);
+      USE(_swrast_select_line);
+   }
+
+   /*_mesa_print_line_function(ctx);*/
+}
diff --git a/reactos/lib/mesa32/src/swrast/s_lines.h b/reactos/lib/mesa32/src/swrast/s_lines.h
new file mode 100644
index 00000000000..5372b99b915
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_lines.h
@@ -0,0 +1,41 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef S_LINES_H
+#define S_LINES_H
+
+#include "mtypes.h"
+
+void
+_swrast_choose_line( GLcontext *ctx );
+
+void
+_swrast_add_spec_terms_line( GLcontext *ctx,
+			     const SWvertex *v0,
+			     const SWvertex *v1 );
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/swrast/s_linetemp.h b/reactos/lib/mesa32/src/swrast/s_linetemp.h
new file mode 100644
index 00000000000..77c985455dc
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_linetemp.h
@@ -0,0 +1,447 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * Line Rasterizer Template
+ *
+ * This file is #include'd to generate custom line rasterizers.
+ *
+ * The following macros may be defined to indicate what auxillary information
+ * must be interplated along the line:
+ *    INTERP_Z        - if defined, interpolate Z values
+ *    INTERP_FOG      - if defined, interpolate FOG values
+ *    INTERP_RGBA     - if defined, interpolate RGBA values
+ *    INTERP_SPEC     - if defined, interpolate specular RGB values
+ *    INTERP_INDEX    - if defined, interpolate color index values
+ *    INTERP_TEX      - if defined, interpolate unit 0 texcoords
+ *    INTERP_MULTITEX - if defined, interpolate multi-texcoords
+ *
+ * When one can directly address pixels in the color buffer the following
+ * macros can be defined and used to directly compute pixel addresses during
+ * rasterization (see pixelPtr):
+ *    PIXEL_TYPE          - the datatype of a pixel (GLubyte, GLushort, GLuint)
+ *    BYTES_PER_ROW       - number of bytes per row in the color buffer
+ *    PIXEL_ADDRESS(X,Y)  - returns the address of pixel at (X,Y) where
+ *                          Y==0 at bottom of screen and increases upward.
+ *
+ * Similarly, for direct depth buffer access, this type is used for depth
+ * buffer addressing:
+ *    DEPTH_TYPE          - either GLushort or GLuint
+ *
+ * Optionally, one may provide one-time setup code
+ *    SETUP_CODE    - code which is to be executed once per line
+ *
+ * To actually "plot" each pixel the PLOT macro must be defined...
+ *    PLOT(X,Y) - code to plot a pixel.  Example:
+ *                if (Z < *zPtr) {
+ *                   *zPtr = Z;
+ *                   color = pack_rgb( FixedToInt(r0), FixedToInt(g0),
+ *                                     FixedToInt(b0) );
+ *                   put_pixel( X, Y, color );
+ *                }
+ *
+ * This code was designed for the origin to be in the lower-left corner.
+ *
+ */
+
+
+static void
+NAME( GLcontext *ctx, const SWvertex *vert0, const SWvertex *vert1 )
+{
+   struct sw_span span;
+   GLuint interpFlags = 0;
+   GLint x0 = (GLint) vert0->win[0];
+   GLint x1 = (GLint) vert1->win[0];
+   GLint y0 = (GLint) vert0->win[1];
+   GLint y1 = (GLint) vert1->win[1];
+   GLint dx, dy;
+   GLint numPixels;
+   GLint xstep, ystep;
+#if defined(DEPTH_TYPE)
+   const GLint depthBits = ctx->Visual.depthBits;
+   const GLint fixedToDepthShift = depthBits <= 16 ? FIXED_SHIFT : 0;
+#define FixedToDepth(F)  ((F) >> fixedToDepthShift)
+   GLint zPtrXstep, zPtrYstep;
+   DEPTH_TYPE *zPtr;
+#elif defined(INTERP_Z)
+   const GLint depthBits = ctx->Visual.depthBits;
+#endif
+#ifdef PIXEL_ADDRESS
+   PIXEL_TYPE *pixelPtr;
+   GLint pixelXstep, pixelYstep;
+#endif
+
+#ifdef SETUP_CODE
+   SETUP_CODE
+#endif
+
+   /* Cull primitives with malformed coordinates.
+    */
+   {
+      GLfloat tmp = vert0->win[0] + vert0->win[1]
+                  + vert1->win[0] + vert1->win[1];
+      if (IS_INF_OR_NAN(tmp))
+	 return;
+   }
+
+   /*
+   printf("%s():\n", __FUNCTION__);
+   printf(" (%f, %f, %f) -> (%f, %f, %f)\n",
+          vert0->win[0], vert0->win[1], vert0->win[2],
+          vert1->win[0], vert1->win[1], vert1->win[2]);
+   printf(" (%d, %d, %d) -> (%d, %d, %d)\n",
+          vert0->color[0], vert0->color[1], vert0->color[2], 
+          vert1->color[0], vert1->color[1], vert1->color[2]);
+   printf(" (%d, %d, %d) -> (%d, %d, %d)\n",
+          vert0->specular[0], vert0->specular[1], vert0->specular[2], 
+          vert1->specular[0], vert1->specular[1], vert1->specular[2]);
+   */
+
+/*
+ * Despite being clipped to the view volume, the line's window coordinates
+ * may just lie outside the window bounds.  That is, if the legal window
+ * coordinates are [0,W-1][0,H-1], it's possible for x==W and/or y==H.
+ * This quick and dirty code nudges the endpoints inside the window if
+ * necessary.
+ */
+#ifdef CLIP_HACK
+   {
+      GLint w = ctx->DrawBuffer->Width;
+      GLint h = ctx->DrawBuffer->Height;
+      if ((x0==w) | (x1==w)) {
+         if ((x0==w) & (x1==w))
+           return;
+         x0 -= x0==w;
+         x1 -= x1==w;
+      }
+      if ((y0==h) | (y1==h)) {
+         if ((y0==h) & (y1==h))
+           return;
+         y0 -= y0==h;
+         y1 -= y1==h;
+      }
+   }
+#endif
+
+   dx = x1 - x0;
+   dy = y1 - y0;
+   if (dx == 0 && dy == 0)
+      return;
+
+#ifdef DEPTH_TYPE
+   zPtr = (DEPTH_TYPE *) _swrast_zbuffer_address(ctx, x0, y0);
+#endif
+#ifdef PIXEL_ADDRESS
+   pixelPtr = (PIXEL_TYPE *) PIXEL_ADDRESS(x0,y0);
+#endif
+
+   if (dx<0) {
+      dx = -dx;   /* make positive */
+      xstep = -1;
+#ifdef DEPTH_TYPE
+      zPtrXstep = -((GLint)sizeof(DEPTH_TYPE));
+#endif
+#ifdef PIXEL_ADDRESS
+      pixelXstep = -((GLint)sizeof(PIXEL_TYPE));
+#endif
+   }
+   else {
+      xstep = 1;
+#ifdef DEPTH_TYPE
+      zPtrXstep = ((GLint)sizeof(DEPTH_TYPE));
+#endif
+#ifdef PIXEL_ADDRESS
+      pixelXstep = ((GLint)sizeof(PIXEL_TYPE));
+#endif
+   }
+
+   if (dy<0) {
+      dy = -dy;   /* make positive */
+      ystep = -1;
+#ifdef DEPTH_TYPE
+      zPtrYstep = -((GLint) (ctx->DrawBuffer->Width * sizeof(DEPTH_TYPE)));
+#endif
+#ifdef PIXEL_ADDRESS
+      pixelYstep = BYTES_PER_ROW;
+#endif
+   }
+   else {
+      ystep = 1;
+#ifdef DEPTH_TYPE
+      zPtrYstep = (GLint) (ctx->DrawBuffer->Width * sizeof(DEPTH_TYPE));
+#endif
+#ifdef PIXEL_ADDRESS
+      pixelYstep = -(BYTES_PER_ROW);
+#endif
+   }
+
+   ASSERT(dx >= 0);
+   ASSERT(dy >= 0);
+
+   numPixels = MAX2(dx, dy);
+
+   /*
+    * Span setup: compute start and step values for all interpolated values.
+    */
+#ifdef INTERP_RGBA
+   interpFlags |= SPAN_RGBA;
+   if (ctx->Light.ShadeModel == GL_SMOOTH) {
+      span.red   = ChanToFixed(vert0->color[0]);
+      span.green = ChanToFixed(vert0->color[1]);
+      span.blue  = ChanToFixed(vert0->color[2]);
+      span.alpha = ChanToFixed(vert0->color[3]);
+      span.redStep   = (ChanToFixed(vert1->color[0]) - span.red  ) / numPixels;
+      span.greenStep = (ChanToFixed(vert1->color[1]) - span.green) / numPixels;
+      span.blueStep  = (ChanToFixed(vert1->color[2]) - span.blue ) / numPixels;
+      span.alphaStep = (ChanToFixed(vert1->color[3]) - span.alpha) / numPixels;
+   }
+   else {
+      span.red   = ChanToFixed(vert1->color[0]);
+      span.green = ChanToFixed(vert1->color[1]);
+      span.blue  = ChanToFixed(vert1->color[2]);
+      span.alpha = ChanToFixed(vert1->color[3]);
+      span.redStep   = 0;
+      span.greenStep = 0;
+      span.blueStep  = 0;
+      span.alphaStep = 0;
+   }
+#endif
+#ifdef INTERP_SPEC
+   interpFlags |= SPAN_SPEC;
+   if (ctx->Light.ShadeModel == GL_SMOOTH) {
+      span.specRed       = ChanToFixed(vert0->specular[0]);
+      span.specGreen     = ChanToFixed(vert0->specular[1]);
+      span.specBlue      = ChanToFixed(vert0->specular[2]);
+      span.specRedStep   = (ChanToFixed(vert1->specular[0]) - span.specRed) / numPixels;
+      span.specGreenStep = (ChanToFixed(vert1->specular[1]) - span.specBlue) / numPixels;
+      span.specBlueStep  = (ChanToFixed(vert1->specular[2]) - span.specGreen) / numPixels;
+   }
+   else {
+      span.specRed       = ChanToFixed(vert1->specular[0]);
+      span.specGreen     = ChanToFixed(vert1->specular[1]);
+      span.specBlue      = ChanToFixed(vert1->specular[2]);
+      span.specRedStep   = 0;
+      span.specGreenStep = 0;
+      span.specBlueStep  = 0;
+   }
+#endif
+#ifdef INTERP_INDEX
+   interpFlags |= SPAN_INDEX;
+   if (ctx->Light.ShadeModel == GL_SMOOTH) {
+      span.index = FloatToFixed(vert0->index);
+      span.indexStep = FloatToFixed(vert1->index - vert0->index) / numPixels;
+   }
+   else {
+      span.index = FloatToFixed(vert1->index);
+      span.indexStep = 0;
+   }
+#endif
+#if defined(INTERP_Z) || defined(DEPTH_TYPE)
+   interpFlags |= SPAN_Z;
+   {
+      if (depthBits <= 16) {
+         span.z = FloatToFixed(vert0->win[2]) + FIXED_HALF;
+         span.zStep = FloatToFixed(vert1->win[2] - vert0->win[2]) / numPixels;
+      }
+      else {
+         /* don't use fixed point */
+         span.z = (GLint) vert0->win[2];
+         span.zStep = (GLint) ((vert1->win[2] - vert0->win[2]) / numPixels);
+      }
+   }
+#endif
+#ifdef INTERP_FOG
+   interpFlags |= SPAN_FOG;
+   span.fog = vert0->fog;
+   span.fogStep = (vert1->fog - vert0->fog) / numPixels;
+#endif
+#ifdef INTERP_TEX
+   interpFlags |= SPAN_TEXTURE;
+   {
+      const GLfloat invw0 = vert0->win[3];
+      const GLfloat invw1 = vert1->win[3];
+      const GLfloat invLen = 1.0F / numPixels;
+      GLfloat ds, dt, dr, dq;
+      span.tex[0][0] = invw0 * vert0->texcoord[0][0];
+      span.tex[0][1] = invw0 * vert0->texcoord[0][1];
+      span.tex[0][2] = invw0 * vert0->texcoord[0][2];
+      span.tex[0][3] = invw0 * vert0->texcoord[0][3];
+      ds = (invw1 * vert1->texcoord[0][0]) - span.tex[0][0];
+      dt = (invw1 * vert1->texcoord[0][1]) - span.tex[0][1];
+      dr = (invw1 * vert1->texcoord[0][2]) - span.tex[0][2];
+      dq = (invw1 * vert1->texcoord[0][3]) - span.tex[0][3];
+      span.texStepX[0][0] = ds * invLen;
+      span.texStepX[0][1] = dt * invLen;
+      span.texStepX[0][2] = dr * invLen;
+      span.texStepX[0][3] = dq * invLen;
+      span.texStepY[0][0] = 0.0F;
+      span.texStepY[0][1] = 0.0F;
+      span.texStepY[0][2] = 0.0F;
+      span.texStepY[0][3] = 0.0F;
+   }
+#endif
+#ifdef INTERP_MULTITEX
+   interpFlags |= SPAN_TEXTURE;
+   {
+      const GLfloat invLen = 1.0F / numPixels;
+      GLuint u;
+      for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {
+         if (ctx->Texture.Unit[u]._ReallyEnabled) {
+            const GLfloat invw0 = vert0->win[3];
+            const GLfloat invw1 = vert1->win[3];
+            GLfloat ds, dt, dr, dq;
+            span.tex[u][0] = invw0 * vert0->texcoord[u][0];
+            span.tex[u][1] = invw0 * vert0->texcoord[u][1];
+            span.tex[u][2] = invw0 * vert0->texcoord[u][2];
+            span.tex[u][3] = invw0 * vert0->texcoord[u][3];
+            ds = (invw1 * vert1->texcoord[u][0]) - span.tex[u][0];
+            dt = (invw1 * vert1->texcoord[u][1]) - span.tex[u][1];
+            dr = (invw1 * vert1->texcoord[u][2]) - span.tex[u][2];
+            dq = (invw1 * vert1->texcoord[u][3]) - span.tex[u][3];
+            span.texStepX[u][0] = ds * invLen;
+            span.texStepX[u][1] = dt * invLen;
+            span.texStepX[u][2] = dr * invLen;
+            span.texStepX[u][3] = dq * invLen;
+            span.texStepY[u][0] = 0.0F;
+            span.texStepY[u][1] = 0.0F;
+            span.texStepY[u][2] = 0.0F;
+            span.texStepY[u][3] = 0.0F;
+	 }
+      }
+   }
+#endif
+
+   INIT_SPAN(span, GL_LINE, numPixels, interpFlags, SPAN_XY);
+
+   /*
+    * Draw
+    */
+
+   if (dx > dy) {
+      /*** X-major line ***/
+      GLint i;
+      GLint errorInc = dy+dy;
+      GLint error = errorInc-dx;
+      GLint errorDec = error-dx;
+
+      for (i = 0; i < dx; i++) {
+#ifdef DEPTH_TYPE
+         GLdepth Z = FixedToDepth(span.z);
+#endif
+#ifdef PLOT
+         PLOT( x0, y0 );
+#else
+         span.array->x[i] = x0;
+         span.array->y[i] = y0;
+#endif
+         x0 += xstep;
+#ifdef DEPTH_TYPE
+         zPtr = (DEPTH_TYPE *) ((GLubyte*) zPtr + zPtrXstep);
+         span.z += span.zStep;
+#endif
+#ifdef PIXEL_ADDRESS
+         pixelPtr = (PIXEL_TYPE*) ((GLubyte*) pixelPtr + pixelXstep);
+#endif
+         if (error<0) {
+            error += errorInc;
+         }
+         else {
+            error += errorDec;
+            y0 += ystep;
+#ifdef DEPTH_TYPE
+            zPtr = (DEPTH_TYPE *) ((GLubyte*) zPtr + zPtrYstep);
+#endif
+#ifdef PIXEL_ADDRESS
+            pixelPtr = (PIXEL_TYPE*) ((GLubyte*) pixelPtr + pixelYstep);
+#endif
+         }
+      }
+   }
+   else {
+      /*** Y-major line ***/
+      GLint i;
+      GLint errorInc = dx+dx;
+      GLint error = errorInc-dy;
+      GLint errorDec = error-dy;
+
+      for (i=0;i<dy;i++) {
+#ifdef DEPTH_TYPE
+         GLdepth Z = FixedToDepth(span.z);
+#endif
+#ifdef PLOT
+         PLOT( x0, y0 );
+#else
+         span.array->x[i] = x0;
+         span.array->y[i] = y0;
+#endif
+         y0 += ystep;
+#ifdef DEPTH_TYPE
+         zPtr = (DEPTH_TYPE *) ((GLubyte*) zPtr + zPtrYstep);
+         span.z += span.zStep;
+#endif
+#ifdef PIXEL_ADDRESS
+         pixelPtr = (PIXEL_TYPE*) ((GLubyte*) pixelPtr + pixelYstep);
+#endif
+         if (error<0) {
+            error += errorInc;
+         }
+         else {
+            error += errorDec;
+            x0 += xstep;
+#ifdef DEPTH_TYPE
+            zPtr = (DEPTH_TYPE *) ((GLubyte*) zPtr + zPtrXstep);
+#endif
+#ifdef PIXEL_ADDRESS
+            pixelPtr = (PIXEL_TYPE*) ((GLubyte*) pixelPtr + pixelXstep);
+#endif
+         }
+      }
+   }
+
+#ifdef RENDER_SPAN
+   RENDER_SPAN( span );
+#endif
+
+}
+
+
+#undef NAME
+#undef INTERP_Z
+#undef INTERP_FOG
+#undef INTERP_RGBA
+#undef INTERP_SPEC
+#undef INTERP_TEX
+#undef INTERP_MULTITEX
+#undef INTERP_INDEX
+#undef PIXEL_ADDRESS
+#undef PIXEL_TYPE
+#undef DEPTH_TYPE
+#undef BYTES_PER_ROW
+#undef SETUP_CODE
+#undef PLOT
+#undef CLIP_HACK
+#undef FixedToDepth
+#undef RENDER_SPAN
diff --git a/reactos/lib/mesa32/src/swrast/s_logic.c b/reactos/lib/mesa32/src/swrast/s_logic.c
new file mode 100644
index 00000000000..ad27cb7b625
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_logic.c
@@ -0,0 +1,497 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "context.h"
+#include "imports.h"
+#include "macros.h"
+
+#include "s_alphabuf.h"
+#include "s_context.h"
+#include "s_logic.h"
+#include "s_span.h"
+
+
+
+/*
+ * Apply logic op to array of CI pixels.
+ */
+static void
+index_logicop( GLcontext *ctx, GLuint n, GLuint index[], const GLuint dest[],
+               const GLubyte mask[] )
+{
+   GLuint i;
+   switch (ctx->Color.LogicOp) {
+      case GL_CLEAR:
+         for (i=0;i<n;i++) {
+	    if (mask[i]) {
+	       index[i] = 0;
+	    }
+	 }
+	 break;
+      case GL_SET:
+         for (i=0;i<n;i++) {
+	    if (mask[i]) {
+	       index[i] = ~0;
+	    }
+	 }
+	 break;
+      case GL_COPY:
+	 /* do nothing */
+	 break;
+      case GL_COPY_INVERTED:
+         for (i=0;i<n;i++) {
+	    if (mask[i]) {
+	       index[i] = ~index[i];
+	    }
+	 }
+	 break;
+      case GL_NOOP:
+         for (i=0;i<n;i++) {
+	    if (mask[i]) {
+	       index[i] = dest[i];
+	    }
+	 }
+	 break;
+      case GL_INVERT:
+         for (i=0;i<n;i++) {
+	    if (mask[i]) {
+	       index[i] = ~dest[i];
+	    }
+	 }
+	 break;
+      case GL_AND:
+         for (i=0;i<n;i++) {
+	    if (mask[i]) {
+	       index[i] &= dest[i];
+	    }
+	 }
+	 break;
+      case GL_NAND:
+         for (i=0;i<n;i++) {
+	    if (mask[i]) {
+	       index[i] = ~(index[i] & dest[i]);
+	    }
+	 }
+	 break;
+      case GL_OR:
+         for (i=0;i<n;i++) {
+	    if (mask[i]) {
+	       index[i] |= dest[i];
+	    }
+	 }
+	 break;
+      case GL_NOR:
+         for (i=0;i<n;i++) {
+	    if (mask[i]) {
+	       index[i] = ~(index[i] | dest[i]);
+	    }
+	 }
+	 break;
+      case GL_XOR:
+         for (i=0;i<n;i++) {
+	    if (mask[i]) {
+	       index[i] ^= dest[i];
+	    }
+	 }
+	 break;
+      case GL_EQUIV:
+         for (i=0;i<n;i++) {
+	    if (mask[i]) {
+	       index[i] = ~(index[i] ^ dest[i]);
+	    }
+	 }
+	 break;
+      case GL_AND_REVERSE:
+         for (i=0;i<n;i++) {
+	    if (mask[i]) {
+	       index[i] = index[i] & ~dest[i];
+	    }
+	 }
+	 break;
+      case GL_AND_INVERTED:
+         for (i=0;i<n;i++) {
+	    if (mask[i]) {
+	       index[i] = ~index[i] & dest[i];
+	    }
+	 }
+	 break;
+      case GL_OR_REVERSE:
+         for (i=0;i<n;i++) {
+	    if (mask[i]) {
+	       index[i] = index[i] | ~dest[i];
+	    }
+	 }
+	 break;
+      case GL_OR_INVERTED:
+         for (i=0;i<n;i++) {
+	    if (mask[i]) {
+	       index[i] = ~index[i] | dest[i];
+	    }
+	 }
+	 break;
+      default:
+	 _mesa_problem(ctx, "bad mode in index_logic()");
+   }
+}
+
+
+
+/*
+ * Apply the current logic operator to a span of CI pixels.  This is only
+ * used if the device driver can't do logic ops.
+ */
+void
+_swrast_logicop_ci_span( GLcontext *ctx, const struct sw_span *span,
+                       GLuint index[] )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   GLuint dest[MAX_WIDTH];
+
+   ASSERT(span->end < MAX_WIDTH);
+
+   /* Read dest values from frame buffer */
+   if (span->arrayMask & SPAN_XY) {
+      (*swrast->Driver.ReadCI32Pixels)( ctx, span->end,
+                                        span->array->x, span->array->y,
+                                        dest, span->array->mask );
+   }
+   else {
+      (*swrast->Driver.ReadCI32Span)( ctx, span->end, span->x, span->y, dest );
+   }
+
+   index_logicop( ctx, span->end, index, dest, span->array->mask );
+}
+
+
+
+/*
+ * Apply logic operator to rgba pixels.
+ * Input:  ctx - the context
+ *         n - number of pixels
+ *         mask - pixel mask array
+ * In/Out:  src - incoming pixels which will be modified
+ * Input:  dest - frame buffer values
+ *
+ * Note:  Since the R, G, B, and A channels are all treated the same we
+ * process them as 4-byte GLuints instead of four GLubytes.
+ */
+static void
+rgba_logicop_ui( const GLcontext *ctx, GLuint n, const GLubyte mask[],
+                 GLuint src[], const GLuint dest[] )
+{
+   GLuint i;
+   switch (ctx->Color.LogicOp) {
+      case GL_CLEAR:
+         for (i=0;i<n;i++) {
+            if (mask[i]) {
+               src[i] = 0;
+            }
+         }
+         break;
+      case GL_SET:
+         for (i=0;i<n;i++) {
+            if (mask[i]) {
+               src[i] = ~0;
+            }
+         }
+         break;
+      case GL_COPY:
+         /* do nothing */
+         break;
+      case GL_COPY_INVERTED:
+         for (i=0;i<n;i++) {
+            if (mask[i]) {
+               src[i] = ~src[i];
+            }
+         }
+         break;
+      case GL_NOOP:
+         for (i=0;i<n;i++) {
+            if (mask[i]) {
+               src[i] = dest[i];
+            }
+         }
+         break;
+      case GL_INVERT:
+         for (i=0;i<n;i++) {
+            if (mask[i]) {
+               src[i] = ~dest[i];
+            }
+         }
+         break;
+      case GL_AND:
+         for (i=0;i<n;i++) {
+            if (mask[i]) {
+               src[i] &= dest[i];
+            }
+         }
+         break;
+      case GL_NAND:
+         for (i=0;i<n;i++) {
+            if (mask[i]) {
+               src[i] = ~(src[i] & dest[i]);
+            }
+         }
+         break;
+      case GL_OR:
+         for (i=0;i<n;i++) {
+            if (mask[i]) {
+               src[i]|= dest[i];
+            }
+         }
+         break;
+      case GL_NOR:
+         for (i=0;i<n;i++) {
+            if (mask[i]) {
+               src[i] = ~(src[i] | dest[i]);
+            }
+         }
+         break;
+      case GL_XOR:
+         for (i=0;i<n;i++) {
+            if (mask[i]) {
+               src[i] ^= dest[i];
+            }
+         }
+         break;
+      case GL_EQUIV:
+         for (i=0;i<n;i++) {
+            if (mask[i]) {
+               src[i] = ~(src[i] ^ dest[i]);
+            }
+         }
+         break;
+      case GL_AND_REVERSE:
+         for (i=0;i<n;i++) {
+            if (mask[i]) {
+               src[i] = src[i] & ~dest[i];
+            }
+         }
+         break;
+      case GL_AND_INVERTED:
+         for (i=0;i<n;i++) {
+            if (mask[i]) {
+               src[i] = ~src[i] & dest[i];
+            }
+         }
+         break;
+      case GL_OR_REVERSE:
+         for (i=0;i<n;i++) {
+            if (mask[i]) {
+               src[i] = src[i] | ~dest[i];
+            }
+         }
+         break;
+      case GL_OR_INVERTED:
+         for (i=0;i<n;i++) {
+            if (mask[i]) {
+               src[i] = ~src[i] | dest[i];
+            }
+         }
+         break;
+      default:
+         /* should never happen */
+         _mesa_problem(ctx, "Bad function in rgba_logicop");
+   }
+}
+
+
+/*
+ * As above, but operate on GLchan values
+ * Note: need to pass n = numPixels * 4.
+ */
+static void
+rgba_logicop_chan( const GLcontext *ctx, GLuint n, const GLubyte mask[],
+                   GLchan srcPtr[], const GLchan destPtr[] )
+{
+#if CHAN_TYPE == GL_FLOAT
+   GLuint *src = (GLuint *) srcPtr;
+   const GLuint *dest = (const GLuint *) destPtr;
+   GLuint i;
+   ASSERT(sizeof(GLfloat) == sizeof(GLuint));
+#else
+   GLchan *src = srcPtr;
+   const GLchan *dest = destPtr;
+   GLuint i;
+#endif
+
+   switch (ctx->Color.LogicOp) {
+      case GL_CLEAR:
+         for (i=0;i<n;i++) {
+            if (mask[i]) {
+               src[i] = 0;
+            }
+         }
+         break;
+      case GL_SET:
+         for (i=0;i<n;i++) {
+            if (mask[i]) {
+               src[i] = ~0;
+            }
+         }
+         break;
+      case GL_COPY:
+         /* do nothing */
+         break;
+      case GL_COPY_INVERTED:
+         for (i=0;i<n;i++) {
+            if (mask[i]) {
+               src[i] = ~src[i];
+            }
+         }
+         break;
+      case GL_NOOP:
+         for (i=0;i<n;i++) {
+            if (mask[i]) {
+               src[i] = dest[i];
+            }
+         }
+         break;
+      case GL_INVERT:
+         for (i=0;i<n;i++) {
+            if (mask[i]) {
+               src[i] = ~dest[i];
+            }
+         }
+         break;
+      case GL_AND:
+         for (i=0;i<n;i++) {
+            if (mask[i]) {
+               src[i] &= dest[i];
+            }
+         }
+         break;
+      case GL_NAND:
+         for (i=0;i<n;i++) {
+            if (mask[i]) {
+               src[i] = ~(src[i] & dest[i]);
+            }
+         }
+         break;
+      case GL_OR:
+         for (i=0;i<n;i++) {
+            if (mask[i]) {
+               src[i]|= dest[i];
+            }
+         }
+         break;
+      case GL_NOR:
+         for (i=0;i<n;i++) {
+            if (mask[i]) {
+               src[i] = ~(src[i] | dest[i]);
+            }
+         }
+         break;
+      case GL_XOR:
+         for (i=0;i<n;i++) {
+            if (mask[i]) {
+               src[i] ^= dest[i];
+            }
+         }
+         break;
+      case GL_EQUIV:
+         for (i=0;i<n;i++) {
+            if (mask[i]) {
+               src[i] = ~(src[i] ^ dest[i]);
+            }
+         }
+         break;
+      case GL_AND_REVERSE:
+         for (i=0;i<n;i++) {
+            if (mask[i]) {
+               src[i] = src[i] & ~dest[i];
+            }
+         }
+         break;
+      case GL_AND_INVERTED:
+         for (i=0;i<n;i++) {
+            if (mask[i]) {
+               src[i] = ~src[i] & dest[i];
+            }
+         }
+         break;
+      case GL_OR_REVERSE:
+         for (i=0;i<n;i++) {
+            if (mask[i]) {
+               src[i] = src[i] | ~dest[i];
+            }
+         }
+         break;
+      case GL_OR_INVERTED:
+         for (i=0;i<n;i++) {
+            if (mask[i]) {
+               src[i] = ~src[i] | dest[i];
+            }
+         }
+         break;
+      default:
+         /* should never happen */
+         _mesa_problem(ctx, "Bad function in rgba_logicop");
+   }
+}
+
+
+
+/*
+ * Apply the current logic operator to a span of RGBA pixels.
+ * We can handle horizontal runs of pixels (spans) or arrays of x/y
+ * pixel coordinates.
+ */
+void
+_swrast_logicop_rgba_span( GLcontext *ctx, const struct sw_span *span,
+                         GLchan rgba[][4] )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   GLchan dest[MAX_WIDTH][4];
+
+   ASSERT(span->end < MAX_WIDTH);
+   ASSERT(span->arrayMask & SPAN_RGBA);
+
+   if (span->arrayMask & SPAN_XY) {
+      (*swrast->Driver.ReadRGBAPixels)(ctx, span->end,
+                                       span->array->x, span->array->y,
+                                       dest, span->array->mask);
+      if (SWRAST_CONTEXT(ctx)->_RasterMask & ALPHABUF_BIT) {
+         _swrast_read_alpha_pixels(ctx, span->end,
+                                 span->array->x, span->array->y,
+                                 dest, span->array->mask);
+      }
+   }
+   else {
+      _swrast_read_rgba_span(ctx, ctx->DrawBuffer, span->end,
+                           span->x, span->y, dest);
+   }
+
+   if (sizeof(GLchan) * 4 == sizeof(GLuint)) {
+      rgba_logicop_ui(ctx, span->end, span->array->mask,
+                      (GLuint *) rgba, (const GLuint *) dest);
+   }
+   else {
+      rgba_logicop_chan(ctx, 4 * span->end, span->array->mask,
+                        (GLchan *) rgba, (const GLchan *) dest);
+   }
+}
diff --git a/reactos/lib/mesa32/src/swrast/s_logic.h b/reactos/lib/mesa32/src/swrast/s_logic.h
new file mode 100644
index 00000000000..19ec9c3246f
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_logic.h
@@ -0,0 +1,45 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef S_LOGIC_H
+#define S_LOGIC_H
+
+
+#include "mtypes.h"
+#include "swrast.h"
+
+
+extern void
+_swrast_logicop_ci_span( GLcontext *ctx, const struct sw_span *span,
+                       GLuint index[] );
+
+
+extern void
+_swrast_logicop_rgba_span( GLcontext *ctx, const struct sw_span *span,
+                         GLchan rgba[][4] );
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/swrast/s_masking.c b/reactos/lib/mesa32/src/swrast/s_masking.c
new file mode 100644
index 00000000000..3badb86007e
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_masking.c
@@ -0,0 +1,191 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * Implement the effect of glColorMask and glIndexMask in software.
+ */
+
+
+#include "glheader.h"
+#include "enums.h"
+#include "macros.h"
+
+#include "s_alphabuf.h"
+#include "s_context.h"
+#include "s_masking.h"
+#include "s_span.h"
+
+
+
+void
+_swrast_mask_rgba_span( GLcontext *ctx, const struct sw_span *span,
+                     GLchan rgba[][4] )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   GLchan dest[MAX_WIDTH][4];
+#if CHAN_BITS == 8
+   GLuint srcMask = *((GLuint*)ctx->Color.ColorMask);
+   GLuint dstMask = ~srcMask;
+   GLuint *rgba32 = (GLuint *) rgba;
+   GLuint *dest32 = (GLuint *) dest;
+#else
+   const GLboolean rMask = ctx->Color.ColorMask[RCOMP];
+   const GLboolean gMask = ctx->Color.ColorMask[GCOMP];
+   const GLboolean bMask = ctx->Color.ColorMask[BCOMP];
+   const GLboolean aMask = ctx->Color.ColorMask[ACOMP];
+#endif
+   const GLuint n = span->end;
+   GLuint i;
+
+   ASSERT(n < MAX_WIDTH);
+   ASSERT(span->arrayMask & SPAN_RGBA);
+
+   if (span->arrayMask & SPAN_XY) {
+      (*swrast->Driver.ReadRGBAPixels)(ctx, n, span->array->x, span->array->y,
+                                       dest, span->array->mask);
+      if (SWRAST_CONTEXT(ctx)->_RasterMask & ALPHABUF_BIT) {
+         _swrast_read_alpha_pixels(ctx, n, span->array->x, span->array->y,
+                                 dest, span->array->mask);
+      }
+   }
+   else {
+      _swrast_read_rgba_span(ctx, ctx->DrawBuffer, n, span->x, span->y, dest);
+   }
+
+#if CHAN_BITS == 8
+   for (i = 0; i < n; i++) {
+      rgba32[i] = (rgba32[i] & srcMask) | (dest32[i] & dstMask);
+   }
+#else
+   for (i = 0; i < n; i++) {
+      if (!rMask)  rgba[i][RCOMP] = dest[i][RCOMP];
+      if (!gMask)  rgba[i][GCOMP] = dest[i][GCOMP];
+      if (!bMask)  rgba[i][BCOMP] = dest[i][BCOMP];
+      if (!aMask)  rgba[i][ACOMP] = dest[i][ACOMP];
+   }
+#endif
+}
+
+
+
+
+/*
+ * Apply glColorMask to a span of RGBA pixels.
+ */
+void
+_swrast_mask_rgba_array( GLcontext *ctx,
+                       GLuint n, GLint x, GLint y, GLchan rgba[][4] )
+{
+   GLchan dest[MAX_WIDTH][4];
+   GLuint i;
+
+#if CHAN_BITS == 8
+
+   GLuint srcMask = *((GLuint*)ctx->Color.ColorMask);
+   GLuint dstMask = ~srcMask;
+   GLuint *rgba32 = (GLuint *) rgba;
+   GLuint *dest32 = (GLuint *) dest;
+
+   _swrast_read_rgba_span( ctx, ctx->DrawBuffer, n, x, y, dest );
+   for (i = 0; i < n; i++) {
+      rgba32[i] = (rgba32[i] & srcMask) | (dest32[i] & dstMask);
+   }
+
+#else
+
+   const GLint rMask = ctx->Color.ColorMask[RCOMP];
+   const GLint gMask = ctx->Color.ColorMask[GCOMP];
+   const GLint bMask = ctx->Color.ColorMask[BCOMP];
+   const GLint aMask = ctx->Color.ColorMask[ACOMP];
+
+   _swrast_read_rgba_span( ctx, ctx->DrawBuffer, n, x, y, dest );
+   for (i = 0; i < n; i++) {
+      if (!rMask)  rgba[i][RCOMP] = dest[i][RCOMP];
+      if (!gMask)  rgba[i][GCOMP] = dest[i][GCOMP];
+      if (!bMask)  rgba[i][BCOMP] = dest[i][BCOMP];
+      if (!aMask)  rgba[i][ACOMP] = dest[i][ACOMP];
+   }
+
+#endif
+}
+
+
+
+void
+_swrast_mask_index_span( GLcontext *ctx, const struct sw_span *span,
+                       GLuint index[] )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   const GLuint msrc = ctx->Color.IndexMask;
+   const GLuint mdest = ~msrc;
+   GLuint fbindexes[MAX_WIDTH];
+   GLuint i;
+
+   ASSERT(span->arrayMask & SPAN_INDEX);
+   ASSERT(span->end < MAX_WIDTH);
+
+   if (span->arrayMask & SPAN_XY) {
+
+      (*swrast->Driver.ReadCI32Pixels)(ctx, span->end, span->array->x,
+                                       span->array->y, fbindexes,
+                                       span->array->mask);
+
+      for (i = 0; i < span->end; i++) {
+         index[i] = (index[i] & msrc) | (fbindexes[i] & mdest);
+      }
+   }
+   else {
+      _swrast_read_index_span(ctx, ctx->DrawBuffer, span->end, span->x, span->y,
+                            fbindexes );
+
+      for (i = 0; i < span->end; i++) {
+         index[i] = (index[i] & msrc) | (fbindexes[i] & mdest);
+      }
+   }
+}
+
+
+
+/*
+ * Apply glIndexMask to a span of CI pixels.
+ */
+void
+_swrast_mask_index_array( GLcontext *ctx,
+                        GLuint n, GLint x, GLint y, GLuint index[] )
+{
+   GLuint i;
+   GLuint fbindexes[MAX_WIDTH];
+   GLuint msrc, mdest;
+
+   _swrast_read_index_span( ctx, ctx->DrawBuffer, n, x, y, fbindexes );
+
+   msrc = ctx->Color.IndexMask;
+   mdest = ~msrc;
+
+   for (i=0;i<n;i++) {
+      index[i] = (index[i] & msrc) | (fbindexes[i] & mdest);
+   }
+}
diff --git a/reactos/lib/mesa32/src/swrast/s_masking.h b/reactos/lib/mesa32/src/swrast/s_masking.h
new file mode 100644
index 00000000000..965e9f21809
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_masking.h
@@ -0,0 +1,61 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef S_MASKING_H
+#define S_MASKING_H
+
+
+#include "mtypes.h"
+#include "swrast.h"
+
+
+/*
+ * Implement glColorMask for a span of RGBA pixels.
+ */
+extern void
+_swrast_mask_rgba_span( GLcontext *ctx, const struct sw_span *span,
+                      GLchan rgba[][4] );
+
+
+extern void
+_swrast_mask_rgba_array( GLcontext *ctx, GLuint n, GLint x, GLint y,
+                       GLchan rgba[][4] );
+
+
+/*
+ * Implement glIndexMask for a span of CI pixels.
+ */
+extern void
+_swrast_mask_index_span( GLcontext *ctx, const struct sw_span *span,
+                       GLuint index[] );
+
+
+extern void
+_swrast_mask_index_array( GLcontext *ctx,
+                        GLuint n, GLint x, GLint y, GLuint index[] );
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/swrast/s_nvfragprog.c b/reactos/lib/mesa32/src/swrast/s_nvfragprog.c
new file mode 100644
index 00000000000..3124c89fc1c
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_nvfragprog.c
@@ -0,0 +1,1382 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * Regarding GL_NV_fragment_program:
+ *
+ * Portions of this software may use or implement intellectual
+ * property owned and licensed by NVIDIA Corporation. NVIDIA disclaims
+ * any and all warranties with respect to such intellectual property,
+ * including any use thereof or modifications thereto.
+ */
+
+#include "glheader.h"
+#include "colormac.h"
+#include "context.h"
+#include "nvfragprog.h"
+#include "macros.h"
+#include "program.h"
+
+#include "s_nvfragprog.h"
+#include "s_span.h"
+#include "s_texture.h"
+
+
+/* if 1, print some debugging info */
+#define DEBUG_FRAG 0
+
+/**
+ * Fetch a texel.
+ */
+static void
+fetch_texel( GLcontext *ctx, const GLfloat texcoord[4], GLfloat lambda,
+             GLuint unit, GLfloat color[4] )
+{
+   GLchan rgba[4];
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+
+   swrast->TextureSample[unit](ctx, unit, ctx->Texture.Unit[unit]._Current,
+                               1, (const GLfloat (*)[4]) texcoord,
+                               &lambda, &rgba);
+   color[0] = CHAN_TO_FLOAT(rgba[0]);
+   color[1] = CHAN_TO_FLOAT(rgba[1]);
+   color[2] = CHAN_TO_FLOAT(rgba[2]);
+   color[3] = CHAN_TO_FLOAT(rgba[3]);
+}
+
+
+/**
+ * Fetch a texel with the given partial derivatives to compute a level
+ * of detail in the mipmap.
+ */
+static void
+fetch_texel_deriv( GLcontext *ctx, const GLfloat texcoord[4],
+                   const GLfloat texdx[4], const GLfloat texdy[4],
+                   GLuint unit, GLfloat color[4] )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   const struct gl_texture_object *texObj = ctx->Texture.Unit[unit]._Current;
+   const struct gl_texture_image *texImg = texObj->Image[texObj->BaseLevel];
+   const GLfloat texW = (GLfloat) texImg->WidthScale;
+   const GLfloat texH = (GLfloat) texImg->HeightScale;
+   GLchan rgba[4];
+
+   GLfloat lambda = _swrast_compute_lambda(texdx[0], texdy[0], /* ds/dx, ds/dy */
+                                         texdx[1], texdy[1], /* dt/dx, dt/dy */
+                                         texdx[3], texdy[2], /* dq/dx, dq/dy */
+                                         texW, texH,
+                                         texcoord[0], texcoord[1], texcoord[3],
+                                         1.0F / texcoord[3]);
+
+   swrast->TextureSample[unit](ctx, unit, ctx->Texture.Unit[unit]._Current,
+                               1, (const GLfloat (*)[4]) texcoord,
+                               &lambda, &rgba);
+   color[0] = CHAN_TO_FLOAT(rgba[0]);
+   color[1] = CHAN_TO_FLOAT(rgba[1]);
+   color[2] = CHAN_TO_FLOAT(rgba[2]);
+   color[3] = CHAN_TO_FLOAT(rgba[3]);
+}
+
+
+/**
+ * Return a pointer to the 4-element float vector specified by the given
+ * source register.
+ */
+static INLINE const GLfloat *
+get_register_pointer( GLcontext *ctx,
+                      const struct fp_src_register *source,
+                      const struct fp_machine *machine,
+                      const struct fragment_program *program )
+{
+   const GLfloat *src;
+   switch (source->File) {
+      case PROGRAM_TEMPORARY:
+         ASSERT(source->Index < MAX_NV_FRAGMENT_PROGRAM_TEMPS);
+         src = machine->Temporaries[source->Index];
+         break;
+      case PROGRAM_INPUT:
+         ASSERT(source->Index < MAX_NV_FRAGMENT_PROGRAM_INPUTS);
+         src = machine->Inputs[source->Index];
+         break;
+      case PROGRAM_LOCAL_PARAM:
+         ASSERT(source->Index < MAX_PROGRAM_LOCAL_PARAMS);
+         src = program->Base.LocalParams[source->Index];
+         break;
+      case PROGRAM_ENV_PARAM:
+         ASSERT(source->Index < MAX_NV_FRAGMENT_PROGRAM_PARAMS);
+         src = ctx->FragmentProgram.Parameters[source->Index];
+         break;
+
+      case PROGRAM_STATE_VAR:
+			/* Fallthrough */
+
+      case PROGRAM_NAMED_PARAM:
+         ASSERT(source->Index < (GLint) program->Parameters->NumParameters);
+         src = program->Parameters->Parameters[source->Index].Values;
+         break;
+      default:
+         _mesa_problem(ctx, "Invalid input register file in fetch_vector4");
+         src = NULL;
+   }
+   return src;
+}
+
+
+/**
+ * Fetch a 4-element float vector from the given source register.
+ * Apply swizzling and negating as needed.
+ */
+static void
+fetch_vector4( GLcontext *ctx,
+               const struct fp_src_register *source,
+               const struct fp_machine *machine,
+               const struct fragment_program *program,
+               GLfloat result[4] )
+{
+   const GLfloat *src = get_register_pointer(ctx, source, machine, program);
+   ASSERT(src);
+
+   result[0] = src[source->Swizzle[0]];
+   result[1] = src[source->Swizzle[1]];
+   result[2] = src[source->Swizzle[2]];
+   result[3] = src[source->Swizzle[3]];
+
+   if (source->NegateBase) {
+      result[0] = -result[0];
+      result[1] = -result[1];
+      result[2] = -result[2];
+      result[3] = -result[3];
+   }
+   if (source->Abs) {
+      result[0] = FABSF(result[0]);
+      result[1] = FABSF(result[1]);
+      result[2] = FABSF(result[2]);
+      result[3] = FABSF(result[3]);
+   }
+   if (source->NegateAbs) {
+      result[0] = -result[0];
+      result[1] = -result[1];
+      result[2] = -result[2];
+      result[3] = -result[3];
+   }
+}
+
+
+/**
+ * Fetch the derivative with respect to X for the given register.
+ * \return GL_TRUE if it was easily computed or GL_FALSE if we
+ * need to execute another instance of the program (ugh)!
+ */
+static GLboolean
+fetch_vector4_deriv( GLcontext *ctx,
+                     const struct fp_src_register *source,
+                     const struct sw_span *span,
+                     char xOrY, GLint column, GLfloat result[4] )
+{
+   GLfloat src[4];
+
+   ASSERT(xOrY == 'X' || xOrY == 'Y');
+
+   switch (source->Index) {
+   case FRAG_ATTRIB_WPOS:
+      if (xOrY == 'X') {
+         src[0] = 1.0;
+         src[1] = 0.0;
+         src[2] = span->dzdx / ctx->DepthMaxF;
+         src[3] = span->dwdx;
+      }
+      else {
+         src[0] = 0.0;
+         src[1] = 1.0;
+         src[2] = span->dzdy / ctx->DepthMaxF;
+         src[3] = span->dwdy;
+      }
+      break;
+   case FRAG_ATTRIB_COL0:
+      if (xOrY == 'X') {
+         src[0] = span->drdx * (1.0F / CHAN_MAXF);
+         src[1] = span->dgdx * (1.0F / CHAN_MAXF);
+         src[2] = span->dbdx * (1.0F / CHAN_MAXF);
+         src[3] = span->dadx * (1.0F / CHAN_MAXF);
+      }
+      else {
+         src[0] = span->drdy * (1.0F / CHAN_MAXF);
+         src[1] = span->dgdy * (1.0F / CHAN_MAXF);
+         src[2] = span->dbdy * (1.0F / CHAN_MAXF);
+         src[3] = span->dady * (1.0F / CHAN_MAXF);
+      }
+      break;
+   case FRAG_ATTRIB_COL1:
+      if (xOrY == 'X') {
+         src[0] = span->dsrdx * (1.0F / CHAN_MAXF);
+         src[1] = span->dsgdx * (1.0F / CHAN_MAXF);
+         src[2] = span->dsbdx * (1.0F / CHAN_MAXF);
+         src[3] = 0.0; /* XXX need this */
+      }
+      else {
+         src[0] = span->dsrdy * (1.0F / CHAN_MAXF);
+         src[1] = span->dsgdy * (1.0F / CHAN_MAXF);
+         src[2] = span->dsbdy * (1.0F / CHAN_MAXF);
+         src[3] = 0.0; /* XXX need this */
+      }
+      break;
+   case FRAG_ATTRIB_FOGC:
+      if (xOrY == 'X') {
+         src[0] = span->dfogdx;
+         src[1] = 0.0;
+         src[2] = 0.0;
+         src[3] = 0.0;
+      }
+      else {
+         src[0] = span->dfogdy;
+         src[1] = 0.0;
+         src[2] = 0.0;
+         src[3] = 0.0;
+      }
+      break;
+   case FRAG_ATTRIB_TEX0:
+   case FRAG_ATTRIB_TEX1:
+   case FRAG_ATTRIB_TEX2:
+   case FRAG_ATTRIB_TEX3:
+   case FRAG_ATTRIB_TEX4:
+   case FRAG_ATTRIB_TEX5:
+   case FRAG_ATTRIB_TEX6:
+   case FRAG_ATTRIB_TEX7:
+      if (xOrY == 'X') {
+         const GLuint u = source->Index - FRAG_ATTRIB_TEX0;
+         /* this is a little tricky - I think I've got it right */
+         const GLfloat invQ = 1.0f / (span->tex[u][3]
+                                      + span->texStepX[u][3] * column);
+         src[0] = span->texStepX[u][0] * invQ;
+         src[1] = span->texStepX[u][1] * invQ;
+         src[2] = span->texStepX[u][2] * invQ;
+         src[3] = span->texStepX[u][3] * invQ;
+      }
+      else {
+         const GLuint u = source->Index - FRAG_ATTRIB_TEX0;
+         /* Tricky, as above, but in Y direction */
+         const GLfloat invQ = 1.0f / (span->tex[u][3] + span->texStepY[u][3]);
+         src[0] = span->texStepY[u][0] * invQ;
+         src[1] = span->texStepY[u][1] * invQ;
+         src[2] = span->texStepY[u][2] * invQ;
+         src[3] = span->texStepY[u][3] * invQ;
+      }
+      break;
+   default:
+      return GL_FALSE;
+   }
+
+   result[0] = src[source->Swizzle[0]];
+   result[1] = src[source->Swizzle[1]];
+   result[2] = src[source->Swizzle[2]];
+   result[3] = src[source->Swizzle[3]];
+
+   if (source->NegateBase) {
+      result[0] = -result[0];
+      result[1] = -result[1];
+      result[2] = -result[2];
+      result[3] = -result[3];
+   }
+   if (source->Abs) {
+      result[0] = FABSF(result[0]);
+      result[1] = FABSF(result[1]);
+      result[2] = FABSF(result[2]);
+      result[3] = FABSF(result[3]);
+   }
+   if (source->NegateAbs) {
+      result[0] = -result[0];
+      result[1] = -result[1];
+      result[2] = -result[2];
+      result[3] = -result[3];
+   }
+   return GL_TRUE;
+}
+
+
+/**
+ * As above, but only return result[0] element.
+ */
+static void
+fetch_vector1( GLcontext *ctx,
+               const struct fp_src_register *source,
+               const struct fp_machine *machine,
+               const struct fragment_program *program,
+               GLfloat result[4] )
+{
+   const GLfloat *src = get_register_pointer(ctx, source, machine, program);
+   ASSERT(src);
+
+   result[0] = src[source->Swizzle[0]];
+
+   if (source->NegateBase) {
+      result[0] = -result[0];
+   }
+   if (source->Abs) {
+      result[0] = FABSF(result[0]);
+   }
+   if (source->NegateAbs) {
+      result[0] = -result[0];
+   }
+}
+
+
+/*
+ * Test value against zero and return GT, LT, EQ or UN if NaN.
+ */
+static INLINE GLuint
+generate_cc( float value )
+{
+   if (value != value)
+      return COND_UN;  /* NaN */
+   if (value > 0.0F)
+      return COND_GT;
+   if (value < 0.0F)
+      return COND_LT;
+   return COND_EQ;
+}
+
+/*
+ * Test if the ccMaskRule is satisfied by the given condition code.
+ * Used to mask destination writes according to the current condition codee.
+ */
+static INLINE GLboolean
+test_cc(GLuint condCode, GLuint ccMaskRule)
+{
+   switch (ccMaskRule) {
+   case COND_EQ: return (condCode == COND_EQ);
+   case COND_NE: return (condCode != COND_EQ);
+   case COND_LT: return (condCode == COND_LT);
+   case COND_GE: return (condCode == COND_GT || condCode == COND_EQ);
+   case COND_LE: return (condCode == COND_LT || condCode == COND_EQ);
+   case COND_GT: return (condCode == COND_GT);
+   case COND_TR: return GL_TRUE;
+   case COND_FL: return GL_FALSE;
+   default:      return GL_TRUE;
+   }
+}
+
+
+/**
+ * Store 4 floats into a register.  Observe the instructions saturate and
+ * set-condition-code flags.
+ */
+static void
+store_vector4( const struct fp_instruction *inst,
+               struct fp_machine *machine,
+               const GLfloat value[4] )
+{
+   const struct fp_dst_register *dest = &(inst->DstReg);
+   const GLboolean clamp = inst->Saturate;
+   const GLboolean updateCC = inst->UpdateCondRegister;
+   GLfloat *dstReg;
+   GLfloat clampedValue[4];
+   const GLboolean *writeMask = dest->WriteMask;
+   GLboolean condWriteMask[4];
+
+   switch (dest->File) {
+      case PROGRAM_OUTPUT:
+         dstReg = machine->Outputs[dest->Index];
+         break;
+      case PROGRAM_TEMPORARY:
+         dstReg = machine->Temporaries[dest->Index];
+         break;
+      default:
+         _mesa_problem(NULL, "bad register file in store_vector4(fp)");
+         return;
+   }
+
+#if DEBUG_FRAG
+   if (value[0] > 1.0e10 ||
+       IS_INF_OR_NAN(value[0]) ||
+       IS_INF_OR_NAN(value[1]) ||
+       IS_INF_OR_NAN(value[2]) ||
+       IS_INF_OR_NAN(value[3])  )
+      printf("store %g %g %g %g\n", value[0], value[1], value[2], value[3]);
+#endif
+
+   if (clamp) {
+      clampedValue[0] = CLAMP(value[0], 0.0F, 1.0F);
+      clampedValue[1] = CLAMP(value[1], 0.0F, 1.0F);
+      clampedValue[2] = CLAMP(value[2], 0.0F, 1.0F);
+      clampedValue[3] = CLAMP(value[3], 0.0F, 1.0F);
+      value = clampedValue;
+   }
+
+   if (dest->CondMask != COND_TR) {
+      condWriteMask[0] = writeMask[0]
+         && test_cc(machine->CondCodes[dest->CondSwizzle[0]], dest->CondMask);
+      condWriteMask[1] = writeMask[1]
+         && test_cc(machine->CondCodes[dest->CondSwizzle[1]], dest->CondMask);
+      condWriteMask[2] = writeMask[2]
+         && test_cc(machine->CondCodes[dest->CondSwizzle[2]], dest->CondMask);
+      condWriteMask[3] = writeMask[3]
+         && test_cc(machine->CondCodes[dest->CondSwizzle[3]], dest->CondMask);
+      writeMask = condWriteMask;
+   }
+
+   if (writeMask[0]) {
+      dstReg[0] = value[0];
+      if (updateCC)
+         machine->CondCodes[0] = generate_cc(value[0]);
+   }
+   if (writeMask[1]) {
+      dstReg[1] = value[1];
+      if (updateCC)
+         machine->CondCodes[1] = generate_cc(value[1]);
+   }
+   if (writeMask[2]) {
+      dstReg[2] = value[2];
+      if (updateCC)
+         machine->CondCodes[2] = generate_cc(value[2]);
+   }
+   if (writeMask[3]) {
+      dstReg[3] = value[3];
+      if (updateCC)
+         machine->CondCodes[3] = generate_cc(value[3]);
+   }
+}
+
+
+/**
+ * Initialize a new machine state instance from an existing one, adding
+ * the partial derivatives onto the input registers.
+ * Used to implement DDX and DDY instructions in non-trivial cases.
+ */
+static void
+init_machine_deriv( GLcontext *ctx,
+                    const struct fp_machine *machine,
+                    const struct fragment_program *program,
+                    const struct sw_span *span, char xOrY,
+                    struct fp_machine *dMachine )
+{
+   GLuint u;
+
+   ASSERT(xOrY == 'X' || xOrY == 'Y');
+
+   /* copy existing machine */
+   _mesa_memcpy(dMachine, machine, sizeof(struct fp_machine));
+
+   /* Clear temporary registers */
+   _mesa_bzero( (void*) machine->Temporaries,
+               MAX_NV_FRAGMENT_PROGRAM_TEMPS * 4 * sizeof(GLfloat));
+
+   /* Add derivatives */
+   if (program->InputsRead & (1 << FRAG_ATTRIB_WPOS)) {
+      GLfloat *wpos = (GLfloat*) machine->Inputs[FRAG_ATTRIB_WPOS];
+      if (xOrY == 'X') {
+         wpos[0] += 1.0F;
+         wpos[1] += 0.0F;
+         wpos[2] += span->dzdx;
+         wpos[3] += span->dwdx;
+      }
+      else {
+         wpos[0] += 0.0F;
+         wpos[1] += 1.0F;
+         wpos[2] += span->dzdy;
+         wpos[3] += span->dwdy;
+      }
+   }
+   if (program->InputsRead & (1 << FRAG_ATTRIB_COL0)) {
+      GLfloat *col0 = (GLfloat*) machine->Inputs[FRAG_ATTRIB_COL0];
+      if (xOrY == 'X') {
+         col0[0] += span->drdx * (1.0F / CHAN_MAXF);
+         col0[1] += span->dgdx * (1.0F / CHAN_MAXF);
+         col0[2] += span->dbdx * (1.0F / CHAN_MAXF);
+         col0[3] += span->dadx * (1.0F / CHAN_MAXF);
+      }
+      else {
+         col0[0] += span->drdy * (1.0F / CHAN_MAXF);
+         col0[1] += span->dgdy * (1.0F / CHAN_MAXF);
+         col0[2] += span->dbdy * (1.0F / CHAN_MAXF);
+         col0[3] += span->dady * (1.0F / CHAN_MAXF);
+      }
+   }
+   if (program->InputsRead & (1 << FRAG_ATTRIB_COL1)) {
+      GLfloat *col1 = (GLfloat*) machine->Inputs[FRAG_ATTRIB_COL1];
+      if (xOrY == 'X') {
+         col1[0] += span->dsrdx * (1.0F / CHAN_MAXF);
+         col1[1] += span->dsgdx * (1.0F / CHAN_MAXF);
+         col1[2] += span->dsbdx * (1.0F / CHAN_MAXF);
+         col1[3] += 0.0; /*XXX fix */
+      }
+      else {
+         col1[0] += span->dsrdy * (1.0F / CHAN_MAXF);
+         col1[1] += span->dsgdy * (1.0F / CHAN_MAXF);
+         col1[2] += span->dsbdy * (1.0F / CHAN_MAXF);
+         col1[3] += 0.0; /*XXX fix */
+      }
+   }
+   if (program->InputsRead & (1 << FRAG_ATTRIB_FOGC)) {
+      GLfloat *fogc = (GLfloat*) machine->Inputs[FRAG_ATTRIB_FOGC];
+      if (xOrY == 'X') {
+         fogc[0] += span->dfogdx;
+      }
+      else {
+         fogc[0] += span->dfogdy;
+      }
+   }
+   for (u = 0; u < ctx->Const.MaxTextureCoordUnits; u++) {
+      if (program->InputsRead & (1 << (FRAG_ATTRIB_TEX0 + u))) {
+         GLfloat *tex = (GLfloat*) machine->Inputs[FRAG_ATTRIB_TEX0 + u];
+         /* XXX perspective-correct interpolation */
+         if (xOrY == 'X') {
+            tex[0] += span->texStepX[u][0];
+            tex[1] += span->texStepX[u][1];
+            tex[2] += span->texStepX[u][2];
+            tex[3] += span->texStepX[u][3];
+         }
+         else {
+            tex[0] += span->texStepY[u][0];
+            tex[1] += span->texStepY[u][1];
+            tex[2] += span->texStepY[u][2];
+            tex[3] += span->texStepY[u][3];
+         }
+      }
+   }
+
+   /* init condition codes */
+   dMachine->CondCodes[0] = COND_EQ;
+   dMachine->CondCodes[1] = COND_EQ;
+   dMachine->CondCodes[2] = COND_EQ;
+   dMachine->CondCodes[3] = COND_EQ;
+}
+
+
+/**
+ * Execute the given vertex program.
+ * NOTE: we do everything in single-precision floating point; we don't
+ * currently observe the single/half/fixed-precision qualifiers.
+ * \param ctx - rendering context
+ * \param program - the fragment program to execute
+ * \param machine - machine state (register file)
+ * \param maxInst - max number of instructions to execute
+ * \return GL_TRUE if program completed or GL_FALSE if program executed KIL.
+ */
+static GLboolean
+execute_program( GLcontext *ctx,
+                 const struct fragment_program *program, GLuint maxInst,
+                 struct fp_machine *machine, const struct sw_span *span,
+                 GLuint column )
+{
+   GLuint pc;
+
+#if DEBUG_FRAG
+   printf("execute fragment program --------------------\n");
+#endif
+
+   /* XXX: This should go someplace else, but it is safe here (and slow!) 
+    *        - karl
+    */
+   _mesa_load_state_parameters(ctx, program->Parameters); 
+
+   for (pc = 0; pc < maxInst; pc++) {
+      const struct fp_instruction *inst = program->Instructions + pc;
+
+      if (ctx->FragmentProgram.CallbackEnabled &&
+          ctx->FragmentProgram.Callback) {
+         ctx->FragmentProgram.CurrentPosition = inst->StringPos;
+         ctx->FragmentProgram.Callback(program->Base.Target,
+                                       ctx->FragmentProgram.CallbackData);
+      }
+
+      switch (inst->Opcode) {
+         case FP_OPCODE_ABS:
+            {
+               GLfloat a[4], result[4];
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
+               result[0] = FABSF(a[0]);
+               result[1] = FABSF(a[1]);
+               result[2] = FABSF(a[2]);
+               result[3] = FABSF(a[3]);
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_ADD:
+            {
+               GLfloat a[4], b[4], result[4];
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
+               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
+               result[0] = a[0] + b[0];
+               result[1] = a[1] + b[1];
+               result[2] = a[2] + b[2];
+               result[3] = a[3] + b[3];
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_CMP:
+            {
+               GLfloat a[4], b[4], c[4], result[4];
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
+               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
+               fetch_vector4( ctx, &inst->SrcReg[2], machine, program, c );
+               result[0] = a[0] < 0.0F ? b[0] : c[0];
+               result[1] = a[1] < 0.0F ? b[1] : c[1];
+               result[2] = a[2] < 0.0F ? b[2] : c[2];
+               result[3] = a[3] < 0.0F ? b[3] : c[3];
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_COS:
+            {
+               GLfloat a[4], result[4];
+               fetch_vector1( ctx, &inst->SrcReg[0], machine, program, a );
+               result[0] = result[1] = result[2] = result[3] = (GLfloat)_mesa_cos(a[0]);
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_DDX: /* Partial derivative with respect to X */
+            {
+               GLfloat a[4], aNext[4], result[4];
+               struct fp_machine dMachine;
+               if (!fetch_vector4_deriv(ctx, &inst->SrcReg[0], span, 'X',
+                                        column, result)) {
+                  /* This is tricky.  Make a copy of the current machine state,
+                   * increment the input registers by the dx or dy partial
+                   * derivatives, then re-execute the program up to the
+                   * preceeding instruction, then fetch the source register.
+                   * Finally, find the difference in the register values for
+                   * the original and derivative runs.
+                   */
+                  fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a);
+                  init_machine_deriv(ctx, machine, program, span,
+                                     'X', &dMachine);
+                  execute_program(ctx, program, pc, &dMachine, span, column);
+                  fetch_vector4( ctx, &inst->SrcReg[0], &dMachine, program, aNext );
+                  result[0] = aNext[0] - a[0];
+                  result[1] = aNext[1] - a[1];
+                  result[2] = aNext[2] - a[2];
+                  result[3] = aNext[3] - a[3];
+               }
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_DDY: /* Partial derivative with respect to Y */
+            {
+               GLfloat a[4], aNext[4], result[4];
+               struct fp_machine dMachine;
+               if (!fetch_vector4_deriv(ctx, &inst->SrcReg[0], span, 'Y',
+                                        column, result)) {
+                  init_machine_deriv(ctx, machine, program, span,
+                                     'Y', &dMachine);
+                  fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a);
+                  execute_program(ctx, program, pc, &dMachine, span, column);
+                  fetch_vector4( ctx, &inst->SrcReg[0], &dMachine, program, aNext );
+                  result[0] = aNext[0] - a[0];
+                  result[1] = aNext[1] - a[1];
+                  result[2] = aNext[2] - a[2];
+                  result[3] = aNext[3] - a[3];
+               }
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_DP3:
+            {
+               GLfloat a[4], b[4], result[4];
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
+               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
+               result[0] = result[1] = result[2] = result[3] = 
+                  a[0] * b[0] + a[1] * b[1] + a[2] * b[2];
+               store_vector4( inst, machine, result );
+#if DEBUG_FRAG
+               printf("DP3 %g = (%g %g %g) . (%g %g %g)\n",
+                      result[0], a[0], a[1], a[2], b[0], b[1], b[2]);
+#endif
+            }
+            break;
+         case FP_OPCODE_DP4:
+            {
+               GLfloat a[4], b[4], result[4];
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
+               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
+               result[0] = result[1] = result[2] = result[3] = 
+                  a[0] * b[0] + a[1] * b[1] + a[2] * b[2] + a[3] * b[3];
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_DPH:
+            {
+               GLfloat a[4], b[4], result[4];
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
+               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
+               result[0] = result[1] = result[2] = result[3] = 
+                  a[0] * b[0] + a[1] * b[1] + a[2] * b[2] + b[3];
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_DST: /* Distance vector */
+            {
+               GLfloat a[4], b[4], result[4];
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
+               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
+               result[0] = 1.0F;
+               result[1] = a[1] * b[1];
+               result[2] = a[2];
+               result[3] = b[3];
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_EX2: /* Exponential base 2 */
+            {
+               GLfloat a[4], result[4];
+               fetch_vector1( ctx, &inst->SrcReg[0], machine, program, a );
+               result[0] = result[1] = result[2] = result[3] =
+                  (GLfloat) _mesa_pow(2.0, a[0]);
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_FLR:
+            {
+               GLfloat a[4], result[4];
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
+               result[0] = FLOORF(a[0]);
+               result[1] = FLOORF(a[1]);
+               result[2] = FLOORF(a[2]);
+               result[3] = FLOORF(a[3]);
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_FRC:
+            {
+               GLfloat a[4], result[4];
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
+               result[0] = a[0] - FLOORF(a[0]);
+               result[1] = a[1] - FLOORF(a[1]);
+               result[2] = a[2] - FLOORF(a[2]);
+               result[3] = a[3] - FLOORF(a[3]);
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_KIL_NV: /* NV_f_p only */
+            {
+               const GLuint *swizzle = inst->DstReg.CondSwizzle;
+               const GLuint condMask = inst->DstReg.CondMask;
+               if (test_cc(machine->CondCodes[swizzle[0]], condMask) ||
+                   test_cc(machine->CondCodes[swizzle[1]], condMask) ||
+                   test_cc(machine->CondCodes[swizzle[2]], condMask) ||
+                   test_cc(machine->CondCodes[swizzle[3]], condMask)) {
+                  return GL_FALSE;
+               }
+            }
+            break;
+         case FP_OPCODE_KIL: /* ARB_f_p only */
+            {
+               GLfloat a[4];
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
+               if (a[0] < 0.0F || a[1] < 0.0F || a[2] < 0.0F || a[3] < 0.0F) {
+                  return GL_FALSE;
+               }
+            }
+            break;
+         case FP_OPCODE_LG2:  /* log base 2 */
+            {
+               GLfloat a[4], result[4];
+               fetch_vector1( ctx, &inst->SrcReg[0], machine, program, a );
+               result[0] = result[1] = result[2] = result[3]
+                  = LOG2(a[0]);
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_LIT:
+            {
+               GLfloat a[4], result[4];
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
+               if (a[0] < 0.0F)
+                  a[0] = 0.0F;
+               if (a[1] < 0.0F)
+                  a[1] = 0.0F;
+               result[0] = 1.0F;
+               result[1] = a[0];
+               result[2] = (a[0] > 0.0F) ? (GLfloat) exp(a[3] * log(a[1])) : 0.0F;
+               result[3] = 1.0F;
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_LRP:
+            {
+               GLfloat a[4], b[4], c[4], result[4];
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
+               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
+               fetch_vector4( ctx, &inst->SrcReg[2], machine, program, c );
+               result[0] = a[0] * b[0] + (1.0F - a[0]) * c[0];
+               result[1] = a[1] * b[1] + (1.0F - a[1]) * c[1];
+               result[2] = a[2] * b[2] + (1.0F - a[2]) * c[2];
+               result[3] = a[3] * b[3] + (1.0F - a[3]) * c[3];
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_MAD:
+            {
+               GLfloat a[4], b[4], c[4], result[4];
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
+               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
+               fetch_vector4( ctx, &inst->SrcReg[2], machine, program, c );
+               result[0] = a[0] * b[0] + c[0];
+               result[1] = a[1] * b[1] + c[1];
+               result[2] = a[2] * b[2] + c[2];
+               result[3] = a[3] * b[3] + c[3];
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_MAX:
+            {
+               GLfloat a[4], b[4], result[4];
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
+               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
+               result[0] = MAX2(a[0], b[0]);
+               result[1] = MAX2(a[1], b[1]);
+               result[2] = MAX2(a[2], b[2]);
+               result[3] = MAX2(a[3], b[3]);
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_MIN:
+            {
+               GLfloat a[4], b[4], result[4];
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
+               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
+               result[0] = MIN2(a[0], b[0]);
+               result[1] = MIN2(a[1], b[1]);
+               result[2] = MIN2(a[2], b[2]);
+               result[3] = MIN2(a[3], b[3]);
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_MOV:
+            {
+               GLfloat result[4];
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, result );
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_MUL:
+            {
+               GLfloat a[4], b[4], result[4];
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
+               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
+               result[0] = a[0] * b[0];
+               result[1] = a[1] * b[1];
+               result[2] = a[2] * b[2];
+               result[3] = a[3] * b[3];
+               store_vector4( inst, machine, result );
+#if DEBUG_FRAG
+               printf("MUL (%g %g %g %g) = (%g %g %g %g) * (%g %g %g %g)\n",
+                      result[0], result[1], result[2], result[3], 
+                      a[0], a[1], a[2], a[3],
+                      b[0], b[1], b[2], b[3]);
+#endif
+            }
+            break;
+         case FP_OPCODE_PK2H: /* pack two 16-bit floats in one 32-bit float */
+            {
+               GLfloat a[4], result[4];
+               GLhalfNV hx, hy;
+               GLuint *rawResult = (GLuint *) result;
+               GLuint twoHalves;
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
+               hx = _mesa_float_to_half(a[0]);
+               hy = _mesa_float_to_half(a[1]);
+               twoHalves = hx | (hy << 16);
+               rawResult[0] = rawResult[1] = rawResult[2] = rawResult[3]
+                  = twoHalves;
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_PK2US: /* pack two GLushorts into one 32-bit float */
+            {
+               GLfloat a[4], result[4];
+               GLuint usx, usy, *rawResult = (GLuint *) result;
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
+               a[0] = CLAMP(a[0], 0.0F, 1.0F);
+               a[1] = CLAMP(a[1], 0.0F, 1.0F);
+               usx = IROUND(a[0] * 65535.0F);
+               usy = IROUND(a[1] * 65535.0F);
+               rawResult[0] = rawResult[1] = rawResult[2] = rawResult[3]
+                  = usx | (usy << 16);
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_PK4B: /* pack four GLbytes into one 32-bit float */
+            {
+               GLfloat a[4], result[4];
+               GLuint ubx, uby, ubz, ubw, *rawResult = (GLuint *) result;
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
+               a[0] = CLAMP(a[0], -128.0F / 127.0F, 1.0F);
+               a[1] = CLAMP(a[1], -128.0F / 127.0F, 1.0F);
+               a[2] = CLAMP(a[2], -128.0F / 127.0F, 1.0F);
+               a[3] = CLAMP(a[3], -128.0F / 127.0F, 1.0F);
+               ubx = IROUND(127.0F * a[0] + 128.0F);
+               uby = IROUND(127.0F * a[1] + 128.0F);
+               ubz = IROUND(127.0F * a[2] + 128.0F);
+               ubw = IROUND(127.0F * a[3] + 128.0F);
+               rawResult[0] = rawResult[1] = rawResult[2] = rawResult[3]
+                  = ubx | (uby << 8) | (ubz << 16) | (ubw << 24);
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_PK4UB: /* pack four GLubytes into one 32-bit float */
+            {
+               GLfloat a[4], result[4];
+               GLuint ubx, uby, ubz, ubw, *rawResult = (GLuint *) result;
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
+               a[0] = CLAMP(a[0], 0.0F, 1.0F);
+               a[1] = CLAMP(a[1], 0.0F, 1.0F);
+               a[2] = CLAMP(a[2], 0.0F, 1.0F);
+               a[3] = CLAMP(a[3], 0.0F, 1.0F);
+               ubx = IROUND(255.0F * a[0]);
+               uby = IROUND(255.0F * a[1]);
+               ubz = IROUND(255.0F * a[2]);
+               ubw = IROUND(255.0F * a[3]);
+               rawResult[0] = rawResult[1] = rawResult[2] = rawResult[3]
+                  = ubx | (uby << 8) | (ubz << 16) | (ubw << 24);
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_POW:
+            {
+               GLfloat a[4], b[4], result[4];
+               fetch_vector1( ctx, &inst->SrcReg[0], machine, program, a );
+               fetch_vector1( ctx, &inst->SrcReg[1], machine, program, b );
+               result[0] = result[1] = result[2] = result[3]
+                  = (GLfloat)_mesa_pow(a[0], b[0]);
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_RCP:
+            {
+               GLfloat a[4], result[4];
+               fetch_vector1( ctx, &inst->SrcReg[0], machine, program, a );
+#if DEBUG_FRAG
+               if (a[0] == 0)
+                  printf("RCP(0)\n");
+               else if (IS_INF_OR_NAN(a[0]))
+                  printf("RCP(inf)\n");
+#endif
+               result[0] = result[1] = result[2] = result[3]
+                  = 1.0F / a[0];
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_RFL:
+            {
+               GLfloat axis[4], dir[4], result[4], tmp[4];
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, axis );
+               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, dir );
+               tmp[3] = axis[0] * axis[0]
+                      + axis[1] * axis[1]
+                      + axis[2] * axis[2];
+               tmp[0] = (2.0F * (axis[0] * dir[0] +
+                                 axis[1] * dir[1] +
+                                 axis[2] * dir[2])) / tmp[3];
+               result[0] = tmp[0] * axis[0] - dir[0];
+               result[1] = tmp[0] * axis[1] - dir[1];
+               result[2] = tmp[0] * axis[2] - dir[2];
+               /* result[3] is never written! XXX enforce in parser! */
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_RSQ: /* 1 / sqrt() */
+            {
+               GLfloat a[4], result[4];
+               fetch_vector1( ctx, &inst->SrcReg[0], machine, program, a );
+               result[0] = result[1] = result[2] = result[3] = INV_SQRTF(a[0]);
+               store_vector4( inst, machine, result );
+#if DEBUG_FRAG
+               printf("RSQ %g = 1/sqrt(%g)\n", result[0], a[0]);
+#endif
+            }
+            break;
+         case FP_OPCODE_SCS: /* sine and cos */
+            {
+               GLfloat a[4], result[4];
+               fetch_vector1( ctx, &inst->SrcReg[0], machine, program, a );
+               result[0] = (GLfloat)cos(a[0]);
+               result[1] = (GLfloat)sin(a[0]);
+               result[2] = 0.0;  /* undefined! */
+               result[3] = 0.0;  /* undefined! */
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_SEQ: /* set on equal */
+            {
+               GLfloat a[4], b[4], result[4];
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
+               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
+               result[0] = (a[0] == b[0]) ? 1.0F : 0.0F;
+               result[1] = (a[1] == b[1]) ? 1.0F : 0.0F;
+               result[2] = (a[2] == b[2]) ? 1.0F : 0.0F;
+               result[3] = (a[3] == b[3]) ? 1.0F : 0.0F;
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_SFL: /* set false, operands ignored */
+            {
+               static const GLfloat result[4] = { 0.0F, 0.0F, 0.0F, 0.0F };
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_SGE: /* set on greater or equal */
+            {
+               GLfloat a[4], b[4], result[4];
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
+               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
+               result[0] = (a[0] >= b[0]) ? 1.0F : 0.0F;
+               result[1] = (a[1] >= b[1]) ? 1.0F : 0.0F;
+               result[2] = (a[2] >= b[2]) ? 1.0F : 0.0F;
+               result[3] = (a[3] >= b[3]) ? 1.0F : 0.0F;
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_SGT: /* set on greater */
+            {
+               GLfloat a[4], b[4], result[4];
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
+               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
+               result[0] = (a[0] > b[0]) ? 1.0F : 0.0F;
+               result[1] = (a[1] > b[1]) ? 1.0F : 0.0F;
+               result[2] = (a[2] > b[2]) ? 1.0F : 0.0F;
+               result[3] = (a[3] > b[3]) ? 1.0F : 0.0F;
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_SIN:
+            {
+               GLfloat a[4], result[4];
+               fetch_vector1( ctx, &inst->SrcReg[0], machine, program, a );
+               result[0] = result[1] = result[2] = 
+		       result[3] = (GLfloat)_mesa_sin(a[0]);
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_SLE: /* set on less or equal */
+            {
+               GLfloat a[4], b[4], result[4];
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
+               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
+               result[0] = (a[0] <= b[0]) ? 1.0F : 0.0F;
+               result[1] = (a[1] <= b[1]) ? 1.0F : 0.0F;
+               result[2] = (a[2] <= b[2]) ? 1.0F : 0.0F;
+               result[3] = (a[3] <= b[3]) ? 1.0F : 0.0F;
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_SLT: /* set on less */
+            {
+               GLfloat a[4], b[4], result[4];
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
+               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
+               result[0] = (a[0] < b[0]) ? 1.0F : 0.0F;
+               result[1] = (a[1] < b[1]) ? 1.0F : 0.0F;
+               result[2] = (a[2] < b[2]) ? 1.0F : 0.0F;
+               result[3] = (a[3] < b[3]) ? 1.0F : 0.0F;
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_SNE: /* set on not equal */
+            {
+               GLfloat a[4], b[4], result[4];
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
+               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
+               result[0] = (a[0] != b[0]) ? 1.0F : 0.0F;
+               result[1] = (a[1] != b[1]) ? 1.0F : 0.0F;
+               result[2] = (a[2] != b[2]) ? 1.0F : 0.0F;
+               result[3] = (a[3] != b[3]) ? 1.0F : 0.0F;
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_STR: /* set true, operands ignored */
+            {
+               static const GLfloat result[4] = { 1.0F, 1.0F, 1.0F, 1.0F };
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_SUB:
+            {
+               GLfloat a[4], b[4], result[4];
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
+               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
+               result[0] = a[0] - b[0];
+               result[1] = a[1] - b[1];
+               result[2] = a[2] - b[2];
+               result[3] = a[3] - b[3];
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_SWZ:
+            {
+               const struct fp_src_register *source = &inst->SrcReg[0];
+               const GLfloat *src = get_register_pointer(ctx, source,
+                                                         machine, program);
+               GLfloat result[4];
+               GLuint i;
+
+               /* do extended swizzling here */
+               for (i = 0; i < 3; i++) {
+                  if (source->Swizzle[i] == SWIZZLE_ZERO)
+                     result[i] = 0.0;
+                  else if (source->Swizzle[i] == SWIZZLE_ONE)
+                     result[i] = -1.0;
+                  else
+                     result[i] = -src[source->Swizzle[i]];
+                  if (source->NegateBase)
+                     result[i] = -result[i];
+               }
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_TEX:
+            /* Texel lookup */
+            {
+               GLfloat texcoord[4], color[4];
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, texcoord );
+               /* XXX: Undo perspective divide from interpolate_texcoords() */
+               fetch_texel( ctx, texcoord,
+                            span->array->lambda[inst->TexSrcUnit][column],
+                            inst->TexSrcUnit, color );
+               store_vector4( inst, machine, color );
+            }
+            break;
+         case FP_OPCODE_TXB:
+            /* Texel lookup with LOD bias */
+            {
+               GLfloat texcoord[4], color[4], bias, lambda;
+
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, texcoord );
+               /* texcoord[3] is the bias to add to lambda */
+               bias = ctx->Texture.Unit[inst->TexSrcUnit].LodBias
+                    + ctx->Texture.Unit[inst->TexSrcUnit]._Current->LodBias
+                    + texcoord[3];
+               lambda = span->array->lambda[inst->TexSrcUnit][column] + bias;
+               fetch_texel( ctx, texcoord, lambda,
+                            inst->TexSrcUnit, color );
+               store_vector4( inst, machine, color );
+            }
+            break;
+         case FP_OPCODE_TXD:
+            /* Texture lookup w/ partial derivatives for LOD */
+            {
+               GLfloat texcoord[4], dtdx[4], dtdy[4], color[4];
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, texcoord );
+               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, dtdx );
+               fetch_vector4( ctx, &inst->SrcReg[2], machine, program, dtdy );
+               fetch_texel_deriv( ctx, texcoord, dtdx, dtdy, inst->TexSrcUnit,
+                                  color );
+               store_vector4( inst, machine, color );
+            }
+            break;
+         case FP_OPCODE_TXP:
+            /* Texture lookup w/ perspective divide */
+            {
+               GLfloat texcoord[4], color[4];
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, texcoord );
+               /* Already did perspective divide in interpolate_texcoords() */
+               fetch_texel( ctx, texcoord,
+                            span->array->lambda[inst->TexSrcUnit][column],
+                            inst->TexSrcUnit, color );
+               store_vector4( inst, machine, color );
+            }
+            break;
+         case FP_OPCODE_UP2H: /* unpack two 16-bit floats */
+            {
+               GLfloat a[4], result[4];
+               const GLuint *rawBits = (const GLuint *) a;
+               GLhalfNV hx, hy;
+               fetch_vector1( ctx, &inst->SrcReg[0], machine, program, a );
+               hx = rawBits[0] & 0xffff;
+               hy = rawBits[0] >> 16;
+               result[0] = result[2] = _mesa_half_to_float(hx);
+               result[1] = result[3] = _mesa_half_to_float(hy);
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_UP2US: /* unpack two GLushorts */
+            {
+               GLfloat a[4], result[4];
+               const GLuint *rawBits = (const GLuint *) a;
+               GLushort usx, usy;
+               fetch_vector1( ctx, &inst->SrcReg[0], machine, program, a );
+               usx = rawBits[0] & 0xffff;
+               usy = rawBits[0] >> 16;
+               result[0] = result[2] = usx * (1.0f / 65535.0f);
+               result[1] = result[3] = usy * (1.0f / 65535.0f);
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_UP4B: /* unpack four GLbytes */
+            {
+               GLfloat a[4], result[4];
+               const GLuint *rawBits = (const GLuint *) a;
+               fetch_vector1( ctx, &inst->SrcReg[0], machine, program, a );
+               result[0] = (((rawBits[0] >>  0) & 0xff) - 128) / 127.0F;
+               result[1] = (((rawBits[0] >>  8) & 0xff) - 128) / 127.0F;
+               result[2] = (((rawBits[0] >> 16) & 0xff) - 128) / 127.0F;
+               result[3] = (((rawBits[0] >> 24) & 0xff) - 128) / 127.0F;
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_UP4UB: /* unpack four GLubytes */
+            {
+               GLfloat a[4], result[4];
+               const GLuint *rawBits = (const GLuint *) a;
+               fetch_vector1( ctx, &inst->SrcReg[0], machine, program, a );
+               result[0] = ((rawBits[0] >>  0) & 0xff) / 255.0F;
+               result[1] = ((rawBits[0] >>  8) & 0xff) / 255.0F;
+               result[2] = ((rawBits[0] >> 16) & 0xff) / 255.0F;
+               result[3] = ((rawBits[0] >> 24) & 0xff) / 255.0F;
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_XPD: /* cross product */
+            {
+               GLfloat a[4], b[4], result[4];
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
+               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
+               result[0] = a[1] * b[2] - a[2] * b[1];
+               result[1] = a[2] * b[0] - a[0] * b[2];
+               result[2] = a[0] * b[1] - a[1] * b[0];
+               result[3] = 1.0;
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_X2D: /* 2-D matrix transform */
+            {
+               GLfloat a[4], b[4], c[4], result[4];
+               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
+               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
+               fetch_vector4( ctx, &inst->SrcReg[2], machine, program, c );
+               result[0] = a[0] + b[0] * c[0] + b[1] * c[1];
+               result[1] = a[1] + b[0] * c[2] + b[1] * c[3];
+               result[2] = a[2] + b[0] * c[0] + b[1] * c[1];
+               result[3] = a[3] + b[0] * c[2] + b[1] * c[3];
+               store_vector4( inst, machine, result );
+            }
+            break;
+         case FP_OPCODE_END:
+            return GL_TRUE;
+         default:
+            _mesa_problem(ctx, "Bad opcode %d in _mesa_exec_fragment_program",
+                          inst->Opcode);
+            return GL_TRUE; /* return value doesn't matter */
+      }
+   }
+   return GL_TRUE;
+}
+
+
+static void
+init_machine( GLcontext *ctx, struct fp_machine *machine,
+              const struct fragment_program *program,
+              const struct sw_span *span, GLuint col )
+{
+   GLuint inputsRead = program->InputsRead;
+   GLuint u;
+
+   if (ctx->FragmentProgram.CallbackEnabled)
+      inputsRead = ~0;
+
+   /* Clear temporary registers */
+   _mesa_bzero(machine->Temporaries,
+               MAX_NV_FRAGMENT_PROGRAM_TEMPS * 4 * sizeof(GLfloat));
+
+   /* Load input registers */
+   if (inputsRead & (1 << FRAG_ATTRIB_WPOS)) {
+      GLfloat *wpos = machine->Inputs[FRAG_ATTRIB_WPOS];
+      wpos[0] = (GLfloat) span->x + col;
+      wpos[1] = (GLfloat) span->y;
+      wpos[2] = (GLfloat) span->array->z[col] / ctx->DepthMaxF;
+      wpos[3] = span->w + col * span->dwdx;
+   }
+   if (inputsRead & (1 << FRAG_ATTRIB_COL0)) {
+      GLfloat *col0 = machine->Inputs[FRAG_ATTRIB_COL0];
+      col0[0] = CHAN_TO_FLOAT(span->array->rgba[col][RCOMP]);
+      col0[1] = CHAN_TO_FLOAT(span->array->rgba[col][GCOMP]);
+      col0[2] = CHAN_TO_FLOAT(span->array->rgba[col][BCOMP]);
+      col0[3] = CHAN_TO_FLOAT(span->array->rgba[col][ACOMP]);
+   }
+   if (inputsRead & (1 << FRAG_ATTRIB_COL1)) {
+      GLfloat *col1 = machine->Inputs[FRAG_ATTRIB_COL1];
+      col1[0] = CHAN_TO_FLOAT(span->array->spec[col][RCOMP]);
+      col1[1] = CHAN_TO_FLOAT(span->array->spec[col][GCOMP]);
+      col1[2] = CHAN_TO_FLOAT(span->array->spec[col][BCOMP]);
+      col1[3] = CHAN_TO_FLOAT(span->array->spec[col][ACOMP]);
+   }
+   if (inputsRead & (1 << FRAG_ATTRIB_FOGC)) {
+      GLfloat *fogc = machine->Inputs[FRAG_ATTRIB_FOGC];
+      fogc[0] = span->array->fog[col];
+      fogc[1] = 0.0F;
+      fogc[2] = 0.0F;
+      fogc[3] = 0.0F;
+   }
+   for (u = 0; u < ctx->Const.MaxTextureCoordUnits; u++) {
+      if (inputsRead & (1 << (FRAG_ATTRIB_TEX0 + u))) {
+         GLfloat *tex = machine->Inputs[FRAG_ATTRIB_TEX0 + u];
+         /*ASSERT(ctx->Texture._EnabledCoordUnits & (1 << u));*/
+         COPY_4V(tex, span->array->texcoords[u][col]);
+         /*ASSERT(tex[0] != 0 || tex[1] != 0 || tex[2] != 0);*/
+      }
+   }
+
+   /* init condition codes */
+   machine->CondCodes[0] = COND_EQ;
+   machine->CondCodes[1] = COND_EQ;
+   machine->CondCodes[2] = COND_EQ;
+   machine->CondCodes[3] = COND_EQ;
+}
+
+
+void
+_swrast_exec_nv_fragment_program( GLcontext *ctx, struct sw_span *span )
+{
+   const struct fragment_program *program = ctx->FragmentProgram.Current;
+   GLuint i;
+
+   ctx->_CurrentProgram = GL_FRAGMENT_PROGRAM_ARB; /* or NV, doesn't matter */
+
+   for (i = 0; i < span->end; i++) {
+      if (span->array->mask[i]) {
+         init_machine(ctx, &ctx->FragmentProgram.Machine,
+                      ctx->FragmentProgram.Current, span, i);
+
+         if (!execute_program(ctx, program, ~0,
+                              &ctx->FragmentProgram.Machine, span, i)) {
+            span->array->mask[i] = GL_FALSE;  /* killed fragment */
+         }
+
+         /* Store output registers */
+         {
+            const GLfloat *colOut
+               = ctx->FragmentProgram.Machine.Outputs[FRAG_OUTPUT_COLR];
+            UNCLAMPED_FLOAT_TO_CHAN(span->array->rgba[i][RCOMP], colOut[0]);
+            UNCLAMPED_FLOAT_TO_CHAN(span->array->rgba[i][GCOMP], colOut[1]);
+            UNCLAMPED_FLOAT_TO_CHAN(span->array->rgba[i][BCOMP], colOut[2]);
+            UNCLAMPED_FLOAT_TO_CHAN(span->array->rgba[i][ACOMP], colOut[3]);
+         }
+         /* depth value */
+         if (program->OutputsWritten & (1 << FRAG_OUTPUT_DEPR))
+            span->array->z[i] = IROUND(ctx->FragmentProgram.Machine.Outputs[FRAG_OUTPUT_DEPR][0] * ctx->DepthMaxF);
+      }
+   }
+
+   ctx->_CurrentProgram = 0;
+}
+
diff --git a/reactos/lib/mesa32/src/swrast/s_nvfragprog.h b/reactos/lib/mesa32/src/swrast/s_nvfragprog.h
new file mode 100644
index 00000000000..749acbc0599
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_nvfragprog.h
@@ -0,0 +1,38 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef S_NVFRAGPROG_H
+#define S_NVFRAGPROG_H
+
+
+#include "s_context.h"
+
+
+extern void
+_swrast_exec_nv_fragment_program( GLcontext *ctx, struct sw_span *span );
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/swrast/s_pixeltex.c b/reactos/lib/mesa32/src/swrast/s_pixeltex.c
new file mode 100644
index 00000000000..776a38c9153
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_pixeltex.c
@@ -0,0 +1,117 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * This file implements both the GL_SGIX_pixel_texture and
+ * GL_SIGS_pixel_texture extensions. Luckily, they pretty much
+ * overlap in functionality so we use the same state variables
+ * and execution code for both.
+ */
+
+
+#include "glheader.h"
+#include "colormac.h"
+#include "imports.h"
+
+#include "s_context.h"
+#include "s_pixeltex.h"
+#include "s_texture.h"
+
+
+/*
+ * Convert RGBA values into strq texture coordinates.
+ */
+static void
+pixeltexgen(GLcontext *ctx, GLuint n, const GLchan rgba[][4],
+            GLfloat texcoord[][4])
+{
+   if (ctx->Pixel.FragmentRgbSource == GL_CURRENT_RASTER_COLOR) {
+      GLuint i;
+      for (i = 0; i < n; i++) {
+         texcoord[i][0] = ctx->Current.RasterColor[RCOMP];
+         texcoord[i][1] = ctx->Current.RasterColor[GCOMP];
+         texcoord[i][2] = ctx->Current.RasterColor[BCOMP];
+      }
+   }
+   else {
+      GLuint i;
+      ASSERT(ctx->Pixel.FragmentRgbSource == GL_PIXEL_GROUP_COLOR_SGIS);
+      for (i = 0; i < n; i++) {
+         texcoord[i][0] = CHAN_TO_FLOAT(rgba[i][RCOMP]);
+         texcoord[i][1] = CHAN_TO_FLOAT(rgba[i][GCOMP]);
+         texcoord[i][2] = CHAN_TO_FLOAT(rgba[i][BCOMP]);
+      }
+   }
+
+   if (ctx->Pixel.FragmentAlphaSource == GL_CURRENT_RASTER_COLOR) {
+      GLuint i;
+      for (i = 0; i < n; i++) {
+         texcoord[i][3] = ctx->Current.RasterColor[ACOMP];
+      }
+   }
+   else {
+      GLuint i;
+      ASSERT(ctx->Pixel.FragmentAlphaSource == GL_PIXEL_GROUP_COLOR_SGIS);
+      for (i = 0; i < n; i++) {
+         texcoord[i][3] = CHAN_TO_FLOAT(rgba[i][ACOMP]);
+      }
+   }
+}
+
+
+
+/*
+ * Used by glDraw/CopyPixels: the incoming image colors are treated
+ * as texture coordinates.  Use those coords to texture the image.
+ * This is for GL_SGIS_pixel_texture / GL_SGIX_pixel_texture.
+ */
+void
+_swrast_pixel_texture(GLcontext *ctx, struct sw_span *span)
+{
+   GLuint unit;
+
+   ASSERT(!(span->arrayMask & SPAN_TEXTURE));
+   span->arrayMask |= SPAN_TEXTURE;
+
+   /* convert colors into texture coordinates */
+   pixeltexgen( ctx, span->end,
+                (const GLchan (*)[4]) span->array->rgba,
+                span->array->texcoords[0] );
+
+   /* copy the new texture units for all enabled units */
+   for (unit = 1; unit < ctx->Const.MaxTextureUnits; unit++) {
+      if (ctx->Texture.Unit[unit]._ReallyEnabled) {
+         MEMCPY( span->array->texcoords[unit], span->array->texcoords[0],
+                 span->end * 4 * sizeof(GLfloat) );
+      }
+   }
+
+   /* apply texture mapping */
+   _swrast_texture_span( ctx, span );
+
+   /* this is a work-around to be fixed by initializing again span */
+   span->arrayMask &= ~SPAN_TEXTURE;
+}
diff --git a/reactos/lib/mesa32/src/swrast/s_pixeltex.h b/reactos/lib/mesa32/src/swrast/s_pixeltex.h
new file mode 100644
index 00000000000..6ef7a44df1e
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_pixeltex.h
@@ -0,0 +1,38 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef S_PIXELTEX_H
+#define S_PIXELTEX_H
+
+#include "mtypes.h"
+#include "swrast.h"
+
+
+extern void
+_swrast_pixel_texture(GLcontext *ctx, struct sw_span *span);
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/swrast/s_points.c b/reactos/lib/mesa32/src/swrast/s_points.c
new file mode 100644
index 00000000000..096f8aa804b
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_points.c
@@ -0,0 +1,275 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "colormac.h"
+#include "context.h"
+#include "macros.h"
+#include "texstate.h"
+#include "s_context.h"
+#include "s_feedback.h"
+#include "s_points.h"
+#include "s_span.h"
+
+
+
+#define RGBA       0x1
+#define INDEX      0x2
+#define SMOOTH     0x4
+#define TEXTURE    0x8
+#define SPECULAR  0x10
+#define LARGE     0x20
+#define ATTENUATE 0x40
+#define SPRITE    0x80
+
+
+/*
+ * CI points with size == 1.0
+ */
+#define FLAGS (INDEX)
+#define NAME size1_ci_point
+#include "s_pointtemp.h"
+
+
+/*
+ * General CI points.
+ */
+#define FLAGS (INDEX | LARGE)
+#define NAME general_ci_point
+#include "s_pointtemp.h"
+
+
+/*
+ * Antialiased CI points.
+ */
+#define FLAGS (INDEX | SMOOTH)
+#define NAME antialiased_ci_point
+#include "s_pointtemp.h"
+
+
+/*
+ * Distance attenuated, general CI points.
+ */
+#define FLAGS (INDEX | ATTENUATE)
+#define NAME atten_general_ci_point
+#include "s_pointtemp.h"
+
+
+/*
+ * RGBA points with size == 1.0
+ */
+#define FLAGS (RGBA)
+#define NAME size1_rgba_point
+#include "s_pointtemp.h"
+
+
+/*
+ * General RGBA points.
+ */
+#define FLAGS (RGBA | LARGE)
+#define NAME general_rgba_point
+#include "s_pointtemp.h"
+
+
+/*
+ * Antialiased RGBA points.
+ */
+#define FLAGS (RGBA | SMOOTH)
+#define NAME antialiased_rgba_point
+#include "s_pointtemp.h"
+
+
+/*
+ * Textured RGBA points.
+ */
+#define FLAGS (RGBA | LARGE | TEXTURE | SPECULAR)
+#define NAME textured_rgba_point
+#include "s_pointtemp.h"
+
+
+/*
+ * Antialiased points with texture mapping.
+ */
+#define FLAGS (RGBA | SMOOTH | TEXTURE | SPECULAR)
+#define NAME antialiased_tex_rgba_point
+#include "s_pointtemp.h"
+
+
+/*
+ * Distance attenuated, general RGBA points.
+ */
+#define FLAGS (RGBA | ATTENUATE)
+#define NAME atten_general_rgba_point
+#include "s_pointtemp.h"
+
+
+/*
+ * Distance attenuated, textured RGBA points.
+ */
+#define FLAGS (RGBA | ATTENUATE | TEXTURE | SPECULAR)
+#define NAME atten_textured_rgba_point
+#include "s_pointtemp.h"
+
+
+/*
+ * Distance attenuated, antialiased points with or without texture mapping.
+ */
+#define FLAGS (RGBA | ATTENUATE | TEXTURE | SMOOTH)
+#define NAME atten_antialiased_rgba_point
+#include "s_pointtemp.h"
+
+
+/*
+ * Sprite (textured point)
+ */
+#define FLAGS (RGBA | SPRITE)
+#define NAME sprite_point
+#include "s_pointtemp.h"
+
+
+#define FLAGS (RGBA | ATTENUATE | SPRITE)
+#define NAME atten_sprite_point
+#include "s_pointtemp.h"
+
+
+
+void _swrast_add_spec_terms_point( GLcontext *ctx,
+				   const SWvertex *v0 )
+{
+   SWvertex *ncv0 = (SWvertex *)v0;
+   GLchan c[1][4];
+   COPY_CHAN4( c[0], ncv0->color );
+   ACC_3V( ncv0->color, ncv0->specular );
+   SWRAST_CONTEXT(ctx)->SpecPoint( ctx, ncv0 );
+   COPY_CHAN4( ncv0->color, c[0] );
+}
+
+
+
+/* record the current point function name */
+#ifdef DEBUG
+
+static const char *pntFuncName = NULL;
+
+#define USE(pntFunc)                   \
+do {                                   \
+    pntFuncName = #pntFunc;            \
+    /*printf("%s\n", pntFuncName);*/   \
+    swrast->Point = pntFunc;           \
+} while (0)
+
+#else
+
+#define USE(pntFunc)  swrast->Point = pntFunc
+
+#endif
+
+
+/*
+ * Examine the current context to determine which point drawing function
+ * should be used.
+ */
+void
+_swrast_choose_point( GLcontext *ctx )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   GLboolean rgbMode = ctx->Visual.rgbMode;
+
+   if (ctx->RenderMode==GL_RENDER) {
+      if (ctx->Point.PointSprite) {
+         /* GL_ARB_point_sprite / GL_NV_point_sprite */
+         /* XXX this might not be good enough */
+         if (ctx->Point._Attenuated)
+            USE(atten_sprite_point);
+         else
+            USE(sprite_point);
+      }
+      else if (ctx->Point.SmoothFlag) {
+         /* Smooth points */
+         if (rgbMode) {
+            if (ctx->Point._Attenuated || ctx->VertexProgram.PointSizeEnabled) {
+               USE(atten_antialiased_rgba_point);
+            }
+            else if (ctx->Texture._EnabledCoordUnits) {
+               USE(antialiased_tex_rgba_point);
+            }
+            else {
+               USE(antialiased_rgba_point);
+            }
+         }
+         else {
+            USE(antialiased_ci_point);
+         }
+      }
+      else if (ctx->Point._Attenuated || ctx->VertexProgram.PointSizeEnabled) {
+         if (rgbMode) {
+            if (ctx->Texture._EnabledCoordUnits) {
+               if (ctx->Point.SmoothFlag) {
+                  USE(atten_antialiased_rgba_point);
+               }
+               else {
+                  USE(atten_textured_rgba_point);
+               }
+            }
+            else {
+               USE(atten_general_rgba_point);
+            }
+         }
+         else {
+            /* ci, atten */
+            USE(atten_general_ci_point);
+         }
+      }
+      else if (ctx->Texture._EnabledCoordUnits && rgbMode) {
+         /* textured */
+         USE(textured_rgba_point);
+      }
+      else if (ctx->Point.Size != 1.0) {
+         /* large points */
+         if (rgbMode) {
+            USE(general_rgba_point);
+         }
+         else {
+            USE(general_ci_point);
+         }
+      }
+      else {
+         /* single pixel points */
+         if (rgbMode) {
+            USE(size1_rgba_point);
+         }
+         else {
+            USE(size1_ci_point);
+         }
+      }
+   }
+   else if (ctx->RenderMode==GL_FEEDBACK) {
+      USE(_swrast_feedback_point);
+   }
+   else {
+      /* GL_SELECT mode */
+      USE(_swrast_select_point);
+   }
+}
diff --git a/reactos/lib/mesa32/src/swrast/s_points.h b/reactos/lib/mesa32/src/swrast/s_points.h
new file mode 100644
index 00000000000..40b442e951f
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_points.h
@@ -0,0 +1,39 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef S_POINTS_H
+#define S_POINTS_H
+
+#include "mtypes.h"
+
+extern void
+_swrast_choose_point( GLcontext *ctx );
+
+extern void
+_swrast_add_spec_terms_point( GLcontext *ctx,
+			      const SWvertex *v0 );
+
+#endif
diff --git a/reactos/lib/mesa32/src/swrast/s_pointtemp.h b/reactos/lib/mesa32/src/swrast/s_pointtemp.h
new file mode 100644
index 00000000000..b6349053c1d
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_pointtemp.h
@@ -0,0 +1,384 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0.1
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * Regarding GL_NV_point_sprite:
+ *
+ * Portions of this software may use or implement intellectual
+ * property owned and licensed by NVIDIA Corporation. NVIDIA disclaims
+ * any and all warranties with respect to such intellectual property,
+ * including any use thereof or modifications thereto.
+ */
+
+
+/*
+ * Point rendering template code.
+ *
+ * Set FLAGS = bitwise-OR of the following tokens:
+ *
+ *   RGBA = do rgba instead of color index
+ *   SMOOTH = do antialiasing
+ *   TEXTURE = do texture coords
+ *   SPECULAR = do separate specular color
+ *   LARGE = do points with diameter > 1 pixel
+ *   ATTENUATE = compute point size attenuation
+ *   SPRITE = GL_ARB_point_sprite / GL_NV_point_sprite
+ *
+ * Notes: LARGE and ATTENUATE are exclusive of each other.
+ *        TEXTURE requires RGBA
+ *        SPECULAR requires TEXTURE
+ */
+
+
+/*
+ * NOTES on antialiased point rasterization:
+ *
+ * Let d = distance of fragment center from vertex.
+ * if d < rmin2 then
+ *    fragment has 100% coverage
+ * else if d > rmax2 then
+ *    fragment has 0% coverage
+ * else
+ *    fragment has % coverage = (d - rmin2) / (rmax2 - rmin2)
+ */
+
+
+
+static void
+NAME ( GLcontext *ctx, const SWvertex *vert )
+{
+#if FLAGS & (ATTENUATE | LARGE | SMOOTH | SPRITE)
+   GLfloat size;
+#endif
+#if FLAGS & RGBA
+#if (FLAGS & ATTENUATE) && (FLAGS & SMOOTH)
+   GLfloat alphaAtten;
+#endif
+   const GLchan red   = vert->color[0];
+   const GLchan green = vert->color[1];
+   const GLchan blue  = vert->color[2];
+   const GLchan alpha = vert->color[3];
+#endif
+#if FLAGS & SPECULAR
+   const GLchan specRed   = vert->specular[0];
+   const GLchan specGreen = vert->specular[1];
+   const GLchan specBlue  = vert->specular[2];
+#endif
+#if FLAGS & INDEX
+   const GLuint colorIndex = (GLuint) vert->index;
+#endif
+#if FLAGS & TEXTURE
+   GLfloat texcoord[MAX_TEXTURE_COORD_UNITS][4];
+   GLuint u;
+#endif
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   struct sw_span *span = &(swrast->PointSpan);
+
+   /* Cull primitives with malformed coordinates.
+    */
+   {
+      float tmp = vert->win[0] + vert->win[1];
+      if (IS_INF_OR_NAN(tmp))
+	 return;
+   }
+
+   /*
+    * Span init
+    */
+   span->interpMask = SPAN_FOG;
+   span->arrayMask = SPAN_XY | SPAN_Z;
+   span->fog = vert->fog;
+   span->fogStep = 0.0;
+#if FLAGS & RGBA
+   span->arrayMask |= SPAN_RGBA;
+#endif
+#if FLAGS & SPECULAR
+   span->arrayMask |= SPAN_SPEC;
+#endif
+#if FLAGS & INDEX
+   span->arrayMask |= SPAN_INDEX;
+#endif
+#if FLAGS & TEXTURE
+   span->arrayMask |= SPAN_TEXTURE;
+   for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {
+      if (ctx->Texture.Unit[u]._ReallyEnabled) {
+         const GLfloat q = vert->texcoord[u][3];
+         const GLfloat invQ = (q == 0.0F || q == 1.0F) ? 1.0F : (1.0F / q);
+         texcoord[u][0] = vert->texcoord[u][0] * invQ;
+         texcoord[u][1] = vert->texcoord[u][1] * invQ;
+         texcoord[u][2] = vert->texcoord[u][2] * invQ;
+         texcoord[u][3] = q;
+      }
+   }
+#endif
+#if FLAGS & SMOOTH
+   span->arrayMask |= SPAN_COVERAGE;
+#endif
+#if FLAGS & SPRITE
+   span->arrayMask |= SPAN_TEXTURE;
+#endif
+
+#if FLAGS & ATTENUATE
+   if (vert->pointSize >= ctx->Point.Threshold) {
+      size = MIN2(vert->pointSize, ctx->Point.MaxSize);
+#if (FLAGS & RGBA) && (FLAGS & SMOOTH)
+      alphaAtten = 1.0F;
+#endif
+   }
+   else {
+#if (FLAGS & RGBA) && (FLAGS & SMOOTH)
+      GLfloat dsize = vert->pointSize / ctx->Point.Threshold;
+      alphaAtten = dsize * dsize;
+#endif
+      size = MAX2(ctx->Point.Threshold, ctx->Point.MinSize);
+   }
+#elif FLAGS & (LARGE | SMOOTH | SPRITE)
+   size = ctx->Point._Size;
+#endif
+
+#if FLAGS & (ATTENUATE | LARGE | SMOOTH | SPRITE)
+   /*
+    * Multi-pixel points
+    */
+   {{
+      GLint x, y;
+      const GLfloat radius = 0.5F * size;
+      const GLint z = (GLint) (vert->win[2] + 0.5F);
+      GLuint count;
+#if FLAGS & SMOOTH
+      const GLfloat rmin = radius - 0.7071F;  /* 0.7071 = sqrt(2)/2 */
+      const GLfloat rmax = radius + 0.7071F;
+      const GLfloat rmin2 = MAX2(0.0F, rmin * rmin);
+      const GLfloat rmax2 = rmax * rmax;
+      const GLfloat cscale = 1.0F / (rmax2 - rmin2);
+      const GLint xmin = (GLint) (vert->win[0] - radius);
+      const GLint xmax = (GLint) (vert->win[0] + radius);
+      const GLint ymin = (GLint) (vert->win[1] - radius);
+      const GLint ymax = (GLint) (vert->win[1] + radius);
+#else
+      /* non-smooth */
+      GLint xmin, xmax, ymin, ymax;
+      GLint iSize = (GLint) (size + 0.5F);
+      GLint iRadius;
+      iSize = MAX2(1, iSize);
+      iRadius = iSize / 2;
+      if (iSize & 1) {
+         /* odd size */
+         xmin = (GLint) (vert->win[0] - iRadius);
+         xmax = (GLint) (vert->win[0] + iRadius);
+         ymin = (GLint) (vert->win[1] - iRadius);
+         ymax = (GLint) (vert->win[1] + iRadius);
+      }
+      else {
+         /* even size */
+         xmin = (GLint) vert->win[0] - iRadius + 1;
+         xmax = xmin + iSize - 1;
+         ymin = (GLint) vert->win[1] - iRadius + 1;
+         ymax = ymin + iSize - 1;
+      }
+#endif /*SMOOTH*/
+
+      /* check if we need to flush */
+      if (span->end + (xmax-xmin+1) * (ymax-ymin+1) >= MAX_WIDTH ||
+          (swrast->_RasterMask & (BLEND_BIT | LOGIC_OP_BIT | MASKING_BIT))) {
+#if FLAGS & (TEXTURE | SPRITE)
+         if (ctx->Texture._EnabledUnits)
+            _swrast_write_texture_span(ctx, span);
+         else
+            _swrast_write_rgba_span(ctx, span);
+#elif FLAGS & RGBA
+         _swrast_write_rgba_span(ctx, span);
+#else
+         _swrast_write_index_span(ctx, span);
+#endif
+         span->end = 0;
+      }
+
+      /*
+       * OK, generate fragments
+       */
+      count = span->end;
+      (void) radius;
+      for (y = ymin; y <= ymax; y++) {
+         for (x = xmin; x <= xmax; x++) {
+#if FLAGS & (SPRITE | TEXTURE)
+            GLuint u;
+#endif
+
+#if FLAGS & RGBA
+            span->array->rgba[count][RCOMP] = red;
+            span->array->rgba[count][GCOMP] = green;
+            span->array->rgba[count][BCOMP] = blue;
+            span->array->rgba[count][ACOMP] = alpha;
+#endif
+#if FLAGS & SPECULAR
+            span->array->spec[count][RCOMP] = specRed;
+            span->array->spec[count][GCOMP] = specGreen;
+            span->array->spec[count][BCOMP] = specBlue;
+#endif
+#if FLAGS & INDEX
+            span->array->index[count] = colorIndex;
+#endif
+#if FLAGS & TEXTURE
+            for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {
+               if (ctx->Texture.Unit[u]._ReallyEnabled) {
+                  COPY_4V(span->array->texcoords[u][count], texcoord[u]);
+               }
+            }
+#endif
+
+#if FLAGS & SMOOTH
+            /* compute coverage */
+            {
+               const GLfloat dx = x - vert->win[0] + 0.5F;
+               const GLfloat dy = y - vert->win[1] + 0.5F;
+               const GLfloat dist2 = dx * dx + dy * dy;
+               if (dist2 < rmax2) {
+                  if (dist2 >= rmin2) {
+                     /* compute partial coverage */
+                     span->array->coverage[count] = 1.0F - (dist2 - rmin2) * cscale;
+#if FLAGS & INDEX
+                     /* coverage in [0,15] */
+                     span->array->coverage[count] *= 15.0;
+#endif
+                  }
+                  else {
+                     /* full coverage */
+                     span->array->coverage[count] = 1.0F;
+                  }
+
+                  span->array->x[count] = x;
+                  span->array->y[count] = y;
+                  span->array->z[count] = z;
+
+#if (FLAGS & ATTENUATE) && (FLAGS & RGBA)
+                  span->array->rgba[count][ACOMP] = (GLchan) (alpha * alphaAtten);
+#elif FLAGS & RGBA
+                  span->array->rgba[count][ACOMP] = alpha;
+#endif /*ATTENUATE*/
+                  count++;
+               } /*if*/
+            }
+
+#else /*SMOOTH*/
+
+            /* not smooth (square points) */
+            span->array->x[count] = x;
+            span->array->y[count] = y;
+            span->array->z[count] = z;
+
+#if FLAGS & SPRITE
+            for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {
+               if (ctx->Texture.Unit[u]._ReallyEnabled) {
+                  if (ctx->Point.CoordReplace[u]) {
+                     GLfloat s = 0.5F + (x + 0.5F - vert->win[0]) / size;
+                     GLfloat t = 0.5F - (y + 0.5F - vert->win[1]) / size;
+                     span->array->texcoords[u][count][0] = s;
+                     span->array->texcoords[u][count][1] = t;
+                     span->array->texcoords[u][count][3] = 1.0F;
+                     if (ctx->Point.SpriteRMode == GL_ZERO)
+                        span->array->texcoords[u][count][2] = 0.0F;
+                     else if (ctx->Point.SpriteRMode == GL_S)
+                        span->array->texcoords[u][count][2] = vert->texcoord[u][0];
+                     else /* GL_R */
+                        span->array->texcoords[u][count][2] = vert->texcoord[u][2];
+                  }
+                  else {
+                     COPY_4V(span->array->texcoords[u][count], vert->texcoord[u]);
+                  }
+               }
+            }
+#endif /*SPRITE*/
+
+            count++;  /* square point */
+
+#endif /*SMOOTH*/
+
+	 } /*for x*/
+      } /*for y*/
+      span->end = count;
+   }}
+
+#else /* LARGE | ATTENUATE | SMOOTH | SPRITE */
+
+   /*
+    * Single-pixel points
+    */
+   {{
+      GLuint count;
+
+      /* check if we need to flush */
+      if (span->end >= MAX_WIDTH ||
+          (swrast->_RasterMask & (BLEND_BIT | LOGIC_OP_BIT | MASKING_BIT))) {
+#if FLAGS & (TEXTURE | SPRITE)
+         if (ctx->Texture._EnabledUnits)
+            _swrast_write_texture_span(ctx, span);
+         else
+            _swrast_write_rgba_span(ctx, span);
+#elif FLAGS & RGBA
+         _swrast_write_rgba_span(ctx, span);
+#else
+         _swrast_write_index_span(ctx, span);
+#endif
+         span->end = 0;
+      }
+
+      count = span->end;
+
+#if FLAGS & RGBA
+      span->array->rgba[count][RCOMP] = red;
+      span->array->rgba[count][GCOMP] = green;
+      span->array->rgba[count][BCOMP] = blue;
+      span->array->rgba[count][ACOMP] = alpha;
+#endif
+#if FLAGS & SPECULAR
+      span->array->spec[count][RCOMP] = specRed;
+      span->array->spec[count][GCOMP] = specGreen;
+      span->array->spec[count][BCOMP] = specBlue;
+#endif
+#if FLAGS & INDEX
+      span->array->index[count] = colorIndex;
+#endif
+#if FLAGS & TEXTURE
+      for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {
+         if (ctx->Texture.Unit[u]._ReallyEnabled) {
+            COPY_4V(span->array->texcoords[u][count], texcoord[u]);
+         }
+      }
+#endif
+
+      span->array->x[count] = (GLint) vert->win[0];
+      span->array->y[count] = (GLint) vert->win[1];
+      span->array->z[count] = (GLint) (vert->win[2] + 0.5F);
+      span->end = count + 1;
+   }}
+
+#endif /* LARGE || ATTENUATE || SMOOTH */
+
+   ASSERT(span->end <= MAX_WIDTH);
+}
+
+
+#undef FLAGS
+#undef NAME
diff --git a/reactos/lib/mesa32/src/swrast/s_readpix.c b/reactos/lib/mesa32/src/swrast/s_readpix.c
new file mode 100644
index 00000000000..f2b91e05282
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_readpix.c
@@ -0,0 +1,535 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "colormac.h"
+#include "convolve.h"
+#include "context.h"
+#include "feedback.h"
+#include "image.h"
+#include "macros.h"
+#include "imports.h"
+#include "pixel.h"
+
+#include "s_alphabuf.h"
+#include "s_context.h"
+#include "s_depth.h"
+#include "s_span.h"
+#include "s_stencil.h"
+
+
+
+/*
+ * Read a block of color index pixels.
+ */
+static void
+read_index_pixels( GLcontext *ctx,
+                   GLint x, GLint y,
+                   GLsizei width, GLsizei height,
+                   GLenum type, GLvoid *pixels,
+                   const struct gl_pixelstore_attrib *packing )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   GLint i, readWidth;
+
+   /* error checking */
+   if (ctx->Visual.rgbMode) {
+      _mesa_error( ctx, GL_INVALID_OPERATION, "glReadPixels" );
+      return;
+   }
+
+   if (type != GL_BYTE &&
+       type != GL_UNSIGNED_BYTE &&
+       type != GL_SHORT &&
+       type != GL_UNSIGNED_SHORT &&
+       type != GL_INT &&
+       type != GL_UNSIGNED_INT &&
+       type != GL_FLOAT) {
+      _mesa_error( ctx, GL_INVALID_OPERATION, "glReadPixels(index type)");
+      return;
+   }
+
+   _swrast_use_read_buffer(ctx);
+
+   readWidth = (width > MAX_WIDTH) ? MAX_WIDTH : width;
+
+   /* process image row by row */
+   for (i = 0; i < height; i++) {
+      GLuint index[MAX_WIDTH];
+      GLvoid *dest;
+
+      (*swrast->Driver.ReadCI32Span)(ctx, readWidth, x, y + i, index);
+
+      dest = _mesa_image_address(packing, pixels, width, height,
+                                 GL_COLOR_INDEX, type, 0, i, 0);
+
+      _mesa_pack_index_span(ctx, readWidth, type, dest, index,
+                            &ctx->Pack, ctx->_ImageTransferState);
+   }
+
+   _swrast_use_draw_buffer(ctx);
+}
+
+
+
+static void
+read_depth_pixels( GLcontext *ctx,
+                   GLint x, GLint y,
+                   GLsizei width, GLsizei height,
+                   GLenum type, GLvoid *pixels,
+                   const struct gl_pixelstore_attrib *packing )
+{
+   GLint readWidth;
+   GLboolean bias_or_scale;
+
+   /* Error checking */
+   if (ctx->Visual.depthBits <= 0) {
+      /* No depth buffer */
+      _mesa_error( ctx, GL_INVALID_OPERATION, "glReadPixels" );
+      return;
+   }
+
+   readWidth = (width > MAX_WIDTH) ? MAX_WIDTH : width;
+
+   if (type != GL_BYTE &&
+       type != GL_UNSIGNED_BYTE &&
+       type != GL_SHORT &&
+       type != GL_UNSIGNED_SHORT &&
+       type != GL_INT &&
+       type != GL_UNSIGNED_INT &&
+       type != GL_FLOAT) {
+      _mesa_error( ctx, GL_INVALID_OPERATION, "glReadPixels(depth type)");
+      return;
+   }
+
+   bias_or_scale = ctx->Pixel.DepthBias!=0.0 || ctx->Pixel.DepthScale!=1.0;
+
+   if (type==GL_UNSIGNED_SHORT && ctx->Visual.depthBits == 16
+       && !bias_or_scale && !packing->SwapBytes) {
+      /* Special case: directly read 16-bit unsigned depth values. */
+      GLint j;
+      for (j=0;j<height;j++,y++) {
+         GLdepth depth[MAX_WIDTH];
+         GLushort *dst = (GLushort*) _mesa_image_address( packing, pixels,
+                         width, height, GL_DEPTH_COMPONENT, type, 0, j, 0 );
+         GLint i;
+         _swrast_read_depth_span(ctx, width, x, y, depth);
+         for (i = 0; i < width; i++)
+            dst[i] = depth[i];
+      }
+   }
+   else if (type==GL_UNSIGNED_INT && ctx->Visual.depthBits == 32
+            && !bias_or_scale && !packing->SwapBytes) {
+      /* Special case: directly read 32-bit unsigned depth values. */
+      GLint j;
+      for (j=0;j<height;j++,y++) {
+         GLdepth *dst = (GLdepth *) _mesa_image_address( packing, pixels,
+                         width, height, GL_DEPTH_COMPONENT, type, 0, j, 0 );
+         _swrast_read_depth_span(ctx, width, x, y, dst);
+      }
+   }
+   else {
+      /* General case (slower) */
+      GLint j;
+      for (j=0;j<height;j++,y++) {
+         GLfloat depth[MAX_WIDTH];
+         GLvoid *dest;
+
+         _swrast_read_depth_span_float(ctx, readWidth, x, y, depth);
+
+         dest = _mesa_image_address(packing, pixels, width, height,
+                                    GL_DEPTH_COMPONENT, type, 0, j, 0);
+
+         _mesa_pack_depth_span(ctx, readWidth, (GLdepth *) dest, type,
+                               depth, &ctx->Pack);
+      }
+   }
+}
+
+
+
+static void
+read_stencil_pixels( GLcontext *ctx,
+                     GLint x, GLint y,
+                     GLsizei width, GLsizei height,
+                     GLenum type, GLvoid *pixels,
+                     const struct gl_pixelstore_attrib *packing )
+{
+   GLint j, readWidth;
+
+   if (type != GL_BYTE &&
+       type != GL_UNSIGNED_BYTE &&
+       type != GL_SHORT &&
+       type != GL_UNSIGNED_SHORT &&
+       type != GL_INT &&
+       type != GL_UNSIGNED_INT &&
+       type != GL_FLOAT &&
+       type != GL_BITMAP) {
+      _mesa_error( ctx, GL_INVALID_OPERATION, "glReadPixels(stencil type)");
+      return;
+   }
+
+   readWidth = (width > MAX_WIDTH) ? MAX_WIDTH : width;
+
+   if (ctx->Visual.stencilBits <= 0) {
+      /* No stencil buffer */
+      _mesa_error( ctx, GL_INVALID_OPERATION, "glReadPixels" );
+      return;
+   }
+
+   /* process image row by row */
+   for (j=0;j<height;j++,y++) {
+      GLvoid *dest;
+      GLstencil stencil[MAX_WIDTH];
+
+      _swrast_read_stencil_span(ctx, readWidth, x, y, stencil);
+
+      dest = _mesa_image_address(packing, pixels, width, height,
+                                 GL_STENCIL_INDEX, type, 0, j, 0);
+
+      _mesa_pack_stencil_span(ctx, readWidth, type, dest, stencil, &ctx->Pack);
+   }
+}
+
+
+
+/*
+ * Optimized glReadPixels for particular pixel formats:
+ *   GL_UNSIGNED_BYTE, GL_RGBA
+ * when pixel scaling, biasing and mapping are disabled.
+ */
+static GLboolean
+read_fast_rgba_pixels( GLcontext *ctx,
+                       GLint x, GLint y,
+                       GLsizei width, GLsizei height,
+                       GLenum format, GLenum type,
+                       GLvoid *pixels,
+                       const struct gl_pixelstore_attrib *packing )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   /* can't do scale, bias, mapping, etc */
+   if (ctx->_ImageTransferState)
+       return GL_FALSE;
+
+   /* can't do fancy pixel packing */
+   if (packing->Alignment != 1 || packing->SwapBytes || packing->LsbFirst)
+      return GL_FALSE;
+
+   {
+      GLint srcX = x;
+      GLint srcY = y;
+      GLint readWidth = width;           /* actual width read */
+      GLint readHeight = height;         /* actual height read */
+      GLint skipPixels = packing->SkipPixels;
+      GLint skipRows = packing->SkipRows;
+      GLint rowLength;
+
+      if (packing->RowLength > 0)
+         rowLength = packing->RowLength;
+      else
+         rowLength = width;
+
+      /* horizontal clipping */
+      if (srcX < 0) {
+         skipPixels -= srcX;
+         readWidth += srcX;
+         srcX = 0;
+      }
+      if (srcX + readWidth > (GLint) ctx->ReadBuffer->Width)
+         readWidth -= (srcX + readWidth - (GLint) ctx->ReadBuffer->Width);
+      if (readWidth <= 0)
+         return GL_TRUE;
+
+      /* vertical clipping */
+      if (srcY < 0) {
+         skipRows -= srcY;
+         readHeight += srcY;
+         srcY = 0;
+      }
+      if (srcY + readHeight > (GLint) ctx->ReadBuffer->Height)
+         readHeight -= (srcY + readHeight - (GLint) ctx->ReadBuffer->Height);
+      if (readHeight <= 0)
+         return GL_TRUE;
+
+      /*
+       * Ready to read!
+       * The window region at (destX, destY) of size (readWidth, readHeight)
+       * will be read back.
+       * We'll write pixel data to buffer pointed to by "pixels" but we'll
+       * skip "skipRows" rows and skip "skipPixels" pixels/row.
+       */
+#if CHAN_BITS == 8
+      if (format == GL_RGBA && type == GL_UNSIGNED_BYTE) {
+#elif CHAN_BITS == 16
+      if (format == GL_RGBA && type == GL_UNSIGNED_SHORT) {
+#else
+      if (0) {
+#endif
+         GLchan *dest = (GLchan *) pixels
+                      + (skipRows * rowLength + skipPixels) * 4;
+         GLint row;
+
+         if (packing->Invert) {
+            /* start at top and go down */
+            dest += (readHeight - 1) * rowLength * 4;
+            rowLength = -rowLength;
+         }
+
+         for (row=0; row<readHeight; row++) {
+            (*swrast->Driver.ReadRGBASpan)(ctx, readWidth, srcX, srcY,
+                                        (GLchan (*)[4]) dest);
+            if (ctx->DrawBuffer->UseSoftwareAlphaBuffers) {
+               _swrast_read_alpha_span(ctx, readWidth, srcX, srcY,
+                                     (GLchan (*)[4]) dest);
+            }
+            dest += rowLength * 4;
+            srcY++;
+         }
+         return GL_TRUE;
+      }
+      else {
+         /* can't do this format/type combination */
+         return GL_FALSE;
+      }
+   }
+}
+
+
+
+/*
+ * Read R, G, B, A, RGB, L, or LA pixels.
+ */
+static void
+read_rgba_pixels( GLcontext *ctx,
+                  GLint x, GLint y,
+                  GLsizei width, GLsizei height,
+                  GLenum format, GLenum type, GLvoid *pixels,
+                  const struct gl_pixelstore_attrib *packing )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   GLint readWidth;
+
+   _swrast_use_read_buffer(ctx);
+
+   /* Try optimized path first */
+   if (read_fast_rgba_pixels( ctx, x, y, width, height,
+                              format, type, pixels, packing )) {
+
+      _swrast_use_draw_buffer(ctx);
+      return; /* done! */
+   }
+
+   readWidth = (width > MAX_WIDTH) ? MAX_WIDTH : width;
+
+   /* do error checking on pixel type, format was already checked by caller */
+   switch (type) {
+      case GL_UNSIGNED_BYTE:
+      case GL_BYTE:
+      case GL_UNSIGNED_SHORT:
+      case GL_SHORT:
+      case GL_UNSIGNED_INT:
+      case GL_INT:
+      case GL_FLOAT:
+      case GL_UNSIGNED_BYTE_3_3_2:
+      case GL_UNSIGNED_BYTE_2_3_3_REV:
+      case GL_UNSIGNED_SHORT_5_6_5:
+      case GL_UNSIGNED_SHORT_5_6_5_REV:
+      case GL_UNSIGNED_SHORT_4_4_4_4:
+      case GL_UNSIGNED_SHORT_4_4_4_4_REV:
+      case GL_UNSIGNED_SHORT_5_5_5_1:
+      case GL_UNSIGNED_SHORT_1_5_5_5_REV:
+      case GL_UNSIGNED_INT_8_8_8_8:
+      case GL_UNSIGNED_INT_8_8_8_8_REV:
+      case GL_UNSIGNED_INT_10_10_10_2:
+      case GL_UNSIGNED_INT_2_10_10_10_REV:
+         /* valid pixel type */
+         break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glReadPixels(type)" );
+         return;
+   }
+
+   if (!_mesa_is_legal_format_and_type(format, type) ||
+       format == GL_INTENSITY) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glReadPixels(format or type)");
+      return;
+   }
+
+   if (ctx->Pixel.Convolution2DEnabled || ctx->Pixel.Separable2DEnabled) {
+      const GLuint transferOps = ctx->_ImageTransferState;
+      GLfloat *dest, *src, *tmpImage, *convImage;
+      GLint row;
+
+      tmpImage = (GLfloat *) MALLOC(width * height * 4 * sizeof(GLfloat));
+      if (!tmpImage) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glReadPixels");
+         return;
+      }
+      convImage = (GLfloat *) MALLOC(width * height * 4 * sizeof(GLfloat));
+      if (!convImage) {
+         FREE(tmpImage);
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glReadPixels");
+         return;
+      }
+
+      /* read full RGBA, FLOAT image */
+      dest = tmpImage;
+      for (row = 0; row < height; row++, y++) {
+         GLchan rgba[MAX_WIDTH][4];
+         if (ctx->Visual.rgbMode) {
+            _swrast_read_rgba_span(ctx, ctx->ReadBuffer, readWidth, x, y, rgba);
+         }
+         else {
+            GLuint index[MAX_WIDTH];
+            (*swrast->Driver.ReadCI32Span)(ctx, readWidth, x, y, index);
+            if (ctx->Pixel.IndexShift != 0 || ctx->Pixel.IndexOffset !=0 ) {
+               _mesa_map_ci(ctx, readWidth, index);
+            }
+            _mesa_map_ci_to_rgba_chan(ctx, readWidth, index, rgba);
+         }
+         _mesa_pack_rgba_span(ctx, readWidth, (const GLchan (*)[4]) rgba,
+                              GL_RGBA, GL_FLOAT, dest, &_mesa_native_packing,
+                              transferOps & IMAGE_PRE_CONVOLUTION_BITS);
+         dest += width * 4;
+      }
+
+      /* do convolution */
+      if (ctx->Pixel.Convolution2DEnabled) {
+         _mesa_convolve_2d_image(ctx, &readWidth, &height, tmpImage, convImage);
+      }
+      else {
+         ASSERT(ctx->Pixel.Separable2DEnabled);
+         _mesa_convolve_sep_image(ctx, &readWidth, &height, tmpImage, convImage);
+      }
+      FREE(tmpImage);
+
+      /* finish transfer ops and pack the resulting image */
+      src = convImage;
+      for (row = 0; row < height; row++) {
+         GLvoid *dest;
+         dest = _mesa_image_address(packing, pixels, readWidth, height,
+                                    format, type, 0, row, 0);
+         _mesa_pack_float_rgba_span(ctx, readWidth,
+                                    (const GLfloat (*)[4]) src,
+                                    format, type, dest, packing,
+                                    transferOps & IMAGE_POST_CONVOLUTION_BITS);
+         src += readWidth * 4;
+      }
+   }
+   else {
+      /* no convolution */
+      GLint row;
+      for (row = 0; row < height; row++, y++) {
+         GLchan rgba[MAX_WIDTH][4];
+         GLvoid *dst;
+         if (ctx->Visual.rgbMode) {
+            _swrast_read_rgba_span(ctx, ctx->ReadBuffer, readWidth, x, y, rgba);
+         }
+         else {
+            GLuint index[MAX_WIDTH];
+            (*swrast->Driver.ReadCI32Span)(ctx, readWidth, x, y, index);
+            if (ctx->Pixel.IndexShift != 0 || ctx->Pixel.IndexOffset != 0) {
+               _mesa_map_ci(ctx, readWidth, index);
+            }
+            _mesa_map_ci_to_rgba_chan(ctx, readWidth, index, rgba);
+         }
+         dst = _mesa_image_address(packing, pixels, width, height,
+                                   format, type, 0, row, 0);
+         if (ctx->Visual.redBits < CHAN_BITS ||
+             ctx->Visual.greenBits < CHAN_BITS ||
+             ctx->Visual.blueBits < CHAN_BITS) {
+            /* Requantize the color values into floating point and go from
+             * there.  This fixes conformance failures with 16-bit color
+             * buffers, for example.
+             */
+            DEFMARRAY(GLfloat, rgbaf, MAX_WIDTH, 4);  /* mac 32k limitation */
+            CHECKARRAY(rgbaf, return);  /* mac 32k limitation */
+            _mesa_chan_to_float_span(ctx, readWidth,
+                                     (CONST GLchan (*)[4]) rgba, rgbaf);
+            _mesa_pack_float_rgba_span(ctx, readWidth,
+                                       (CONST GLfloat (*)[4]) rgbaf,
+                                       format, type, dst, packing,
+                                       ctx->_ImageTransferState);
+            UNDEFARRAY(rgbaf);  /* mac 32k limitation */
+         }
+         else {
+            /* GLubytes are fine */
+            _mesa_pack_rgba_span(ctx, readWidth, (CONST GLchan (*)[4]) rgba,
+                                 format, type, dst, packing,
+                                 ctx->_ImageTransferState);
+         }
+      }
+   }
+
+   _swrast_use_draw_buffer(ctx);
+}
+
+
+
+void
+_swrast_ReadPixels( GLcontext *ctx,
+		    GLint x, GLint y, GLsizei width, GLsizei height,
+		    GLenum format, GLenum type,
+		    const struct gl_pixelstore_attrib *pack,
+		    GLvoid *pixels )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   (void) pack;
+
+   if (swrast->NewState)
+      _swrast_validate_derived( ctx );
+
+   RENDER_START(swrast,ctx);
+
+   switch (format) {
+      case GL_COLOR_INDEX:
+         read_index_pixels(ctx, x, y, width, height, type, pixels, &ctx->Pack);
+	 break;
+      case GL_STENCIL_INDEX:
+	 read_stencil_pixels(ctx, x,y, width,height, type, pixels, &ctx->Pack);
+         break;
+      case GL_DEPTH_COMPONENT:
+	 read_depth_pixels(ctx, x, y, width, height, type, pixels, &ctx->Pack);
+	 break;
+      case GL_RED:
+      case GL_GREEN:
+      case GL_BLUE:
+      case GL_ALPHA:
+      case GL_RGB:
+      case GL_LUMINANCE:
+      case GL_LUMINANCE_ALPHA:
+      case GL_RGBA:
+      case GL_BGR:
+      case GL_BGRA:
+      case GL_ABGR_EXT:
+         read_rgba_pixels(ctx, x, y, width, height,
+                          format, type, pixels, &ctx->Pack);
+	 break;
+      default:
+	 _mesa_error( ctx, GL_INVALID_ENUM, "glReadPixels(format)" );
+   }
+
+   RENDER_FINISH(swrast,ctx);
+}
diff --git a/reactos/lib/mesa32/src/swrast/s_span.c b/reactos/lib/mesa32/src/swrast/s_span.c
new file mode 100644
index 00000000000..118cec47e37
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_span.c
@@ -0,0 +1,1520 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/**
+ * \file swrast/s_span.c
+ * \brief Span processing functions used by all rasterization functions.
+ * This is where all the per-fragment tests are performed
+ * \author Brian Paul
+ */
+
+#include "glheader.h"
+#include "colormac.h"
+#include "context.h"
+#include "macros.h"
+#include "imports.h"
+
+#include "s_alpha.h"
+#include "s_alphabuf.h"
+#include "s_blend.h"
+#include "s_context.h"
+#include "s_depth.h"
+#include "s_fog.h"
+#include "s_logic.h"
+#include "s_masking.h"
+#include "s_nvfragprog.h"
+#include "s_span.h"
+#include "s_stencil.h"
+#include "s_texture.h"
+
+
+/**
+ * Init span's Z interpolation values to the RasterPos Z.
+ * Used during setup for glDraw/CopyPixels.
+ */
+void
+_swrast_span_default_z( GLcontext *ctx, struct sw_span *span )
+{
+   if (ctx->Visual.depthBits <= 16)
+      span->z = FloatToFixed(ctx->Current.RasterPos[2] * ctx->DepthMax + 0.5F);
+   else
+      span->z = (GLint) (ctx->Current.RasterPos[2] * ctx->DepthMax + 0.5F);
+   span->zStep = 0;
+   span->interpMask |= SPAN_Z;
+}
+
+
+/**
+ * Init span's fog interpolation values to the RasterPos fog.
+ * Used during setup for glDraw/CopyPixels.
+ */
+void
+_swrast_span_default_fog( GLcontext *ctx, struct sw_span *span )
+{
+   span->fog = _swrast_z_to_fogfactor(ctx, ctx->Current.RasterDistance);
+   span->fogStep = span->dfogdx = span->dfogdy = 0.0F;
+   span->interpMask |= SPAN_FOG;
+}
+
+
+/**
+ * Init span's color or index interpolation values to the RasterPos color.
+ * Used during setup for glDraw/CopyPixels.
+ */
+void
+_swrast_span_default_color( GLcontext *ctx, struct sw_span *span )
+{
+   if (ctx->Visual.rgbMode) {
+      GLchan r, g, b, a;
+      UNCLAMPED_FLOAT_TO_CHAN(r, ctx->Current.RasterColor[0]);
+      UNCLAMPED_FLOAT_TO_CHAN(g, ctx->Current.RasterColor[1]);
+      UNCLAMPED_FLOAT_TO_CHAN(b, ctx->Current.RasterColor[2]);
+      UNCLAMPED_FLOAT_TO_CHAN(a, ctx->Current.RasterColor[3]);
+#if CHAN_TYPE == GL_FLOAT
+      span->red = r;
+      span->green = g;
+      span->blue = b;
+      span->alpha = a;
+#else
+      span->red   = IntToFixed(r);
+      span->green = IntToFixed(g);
+      span->blue  = IntToFixed(b);
+      span->alpha = IntToFixed(a);
+#endif
+      span->redStep = 0;
+      span->greenStep = 0;
+      span->blueStep = 0;
+      span->alphaStep = 0;
+      span->interpMask |= SPAN_RGBA;
+   }
+   else {
+      span->index = FloatToFixed(ctx->Current.RasterIndex);
+      span->indexStep = 0;
+      span->interpMask |= SPAN_INDEX;
+   }
+}
+
+
+/**
+ * Init span's texcoord interpolation values to the RasterPos texcoords.
+ * Used during setup for glDraw/CopyPixels.
+ */
+void
+_swrast_span_default_texcoords( GLcontext *ctx, struct sw_span *span )
+{
+   GLuint i;
+   for (i = 0; i < ctx->Const.MaxTextureUnits; i++) {
+      COPY_4V(span->tex[i], ctx->Current.RasterTexCoords[i]);
+      ASSIGN_4V(span->texStepX[i], 0.0F, 0.0F, 0.0F, 0.0F);
+      ASSIGN_4V(span->texStepY[i], 0.0F, 0.0F, 0.0F, 0.0F);
+   }
+   span->interpMask |= SPAN_TEXTURE;
+}
+
+
+/* Fill in the span.color.rgba array from the interpolation values */
+static void
+interpolate_colors(GLcontext *ctx, struct sw_span *span)
+{
+   const GLuint n = span->end;
+   GLchan (*rgba)[4] = span->array->rgba;
+   GLuint i;
+
+   ASSERT((span->interpMask & SPAN_RGBA)  &&
+	  !(span->arrayMask & SPAN_RGBA));
+
+   if (span->interpMask & SPAN_FLAT) {
+      /* constant color */
+      GLchan color[4];
+      color[RCOMP] = FixedToChan(span->red);
+      color[GCOMP] = FixedToChan(span->green);
+      color[BCOMP] = FixedToChan(span->blue);
+      color[ACOMP] = FixedToChan(span->alpha);
+      for (i = 0; i < n; i++) {
+         COPY_CHAN4(span->array->rgba[i], color);
+      }
+   }
+   else {
+      /* interpolate */
+#if CHAN_TYPE == GL_FLOAT
+      GLfloat r = span->red;
+      GLfloat g = span->green;
+      GLfloat b = span->blue;
+      GLfloat a = span->alpha;
+      const GLfloat dr = span->redStep;
+      const GLfloat dg = span->greenStep;
+      const GLfloat db = span->blueStep;
+      const GLfloat da = span->alphaStep;
+#else
+      GLfixed r = span->red;
+      GLfixed g = span->green;
+      GLfixed b = span->blue;
+      GLfixed a = span->alpha;
+      const GLint dr = span->redStep;
+      const GLint dg = span->greenStep;
+      const GLint db = span->blueStep;
+      const GLint da = span->alphaStep;
+#endif
+      for (i = 0; i < n; i++) {
+         rgba[i][RCOMP] = FixedToChan(r);
+         rgba[i][GCOMP] = FixedToChan(g);
+         rgba[i][BCOMP] = FixedToChan(b);
+         rgba[i][ACOMP] = FixedToChan(a);
+         r += dr;
+         g += dg;
+         b += db;
+         a += da;
+      }
+   }
+   span->arrayMask |= SPAN_RGBA;
+}
+
+
+/* Fill in the span.color.index array from the interpolation values */
+static void
+interpolate_indexes(GLcontext *ctx, struct sw_span *span)
+{
+   GLfixed index = span->index;
+   const GLint indexStep = span->indexStep;
+   const GLuint n = span->end;
+   GLuint *indexes = span->array->index;
+   GLuint i;
+   ASSERT((span->interpMask & SPAN_INDEX)  &&
+	  !(span->arrayMask & SPAN_INDEX));
+
+   if ((span->interpMask & SPAN_FLAT) || (indexStep == 0)) {
+      /* constant color */
+      index = FixedToInt(index);
+      for (i = 0; i < n; i++) {
+         indexes[i] = index;
+      }
+   }
+   else {
+      /* interpolate */
+      for (i = 0; i < n; i++) {
+         indexes[i] = FixedToInt(index);
+         index += indexStep;
+      }
+   }
+   span->arrayMask |= SPAN_INDEX;
+}
+
+
+/* Fill in the span.->array->spec array from the interpolation values */
+static void
+interpolate_specular(GLcontext *ctx, struct sw_span *span)
+{
+   if (span->interpMask & SPAN_FLAT) {
+      /* constant color */
+      const GLchan r = FixedToChan(span->specRed);
+      const GLchan g = FixedToChan(span->specGreen);
+      const GLchan b = FixedToChan(span->specBlue);
+      GLuint i;
+      for (i = 0; i < span->end; i++) {
+         span->array->spec[i][RCOMP] = r;
+         span->array->spec[i][GCOMP] = g;
+         span->array->spec[i][BCOMP] = b;
+      }
+   }
+   else {
+      /* interpolate */
+#if CHAN_TYPE == GL_FLOAT
+      GLfloat r = span->specRed;
+      GLfloat g = span->specGreen;
+      GLfloat b = span->specBlue;
+#else
+      GLfixed r = span->specRed;
+      GLfixed g = span->specGreen;
+      GLfixed b = span->specBlue;
+#endif
+      GLuint i;
+      for (i = 0; i < span->end; i++) {
+         span->array->spec[i][RCOMP] = FixedToChan(r);
+         span->array->spec[i][GCOMP] = FixedToChan(g);
+         span->array->spec[i][BCOMP] = FixedToChan(b);
+         r += span->specRedStep;
+         g += span->specGreenStep;
+         b += span->specBlueStep;
+      }
+   }
+   span->arrayMask |= SPAN_SPEC;
+}
+
+
+/* Fill in the span.zArray array from the interpolation values */
+void
+_swrast_span_interpolate_z( const GLcontext *ctx, struct sw_span *span )
+{
+   const GLuint n = span->end;
+   GLuint i;
+
+   ASSERT((span->interpMask & SPAN_Z)  &&
+	  !(span->arrayMask & SPAN_Z));
+
+   if (ctx->Visual.depthBits <= 16) {
+      GLfixed zval = span->z;
+      GLdepth *z = span->array->z; 
+      for (i = 0; i < n; i++) {
+         z[i] = FixedToInt(zval);
+         zval += span->zStep;
+      }
+   }
+   else {
+      /* Deep Z buffer, no fixed->int shift */
+      GLfixed zval = span->z;
+      GLdepth *z = span->array->z;
+      for (i = 0; i < n; i++) {
+         z[i] = zval;
+         zval += span->zStep;
+      }
+   }
+   span->arrayMask |= SPAN_Z;
+}
+
+
+/*
+ * This the ideal solution, as given in the OpenGL spec.
+ */
+#if 0
+static GLfloat
+compute_lambda(GLfloat dsdx, GLfloat dsdy, GLfloat dtdx, GLfloat dtdy,
+               GLfloat dqdx, GLfloat dqdy, GLfloat texW, GLfloat texH,
+               GLfloat s, GLfloat t, GLfloat q, GLfloat invQ)
+{
+   GLfloat dudx = texW * ((s + dsdx) / (q + dqdx) - s * invQ);
+   GLfloat dvdx = texH * ((t + dtdx) / (q + dqdx) - t * invQ);
+   GLfloat dudy = texW * ((s + dsdy) / (q + dqdy) - s * invQ);
+   GLfloat dvdy = texH * ((t + dtdy) / (q + dqdy) - t * invQ);
+   GLfloat x = SQRTF(dudx * dudx + dvdx * dvdx);
+   GLfloat y = SQRTF(dudy * dudy + dvdy * dvdy);
+   GLfloat rho = MAX2(x, y);
+   GLfloat lambda = LOG2(rho);
+   return lambda;
+}
+#endif
+
+
+/*
+ * This is a faster approximation
+ */
+GLfloat
+_swrast_compute_lambda(GLfloat dsdx, GLfloat dsdy, GLfloat dtdx, GLfloat dtdy,
+                     GLfloat dqdx, GLfloat dqdy, GLfloat texW, GLfloat texH,
+                     GLfloat s, GLfloat t, GLfloat q, GLfloat invQ)
+{
+   GLfloat dsdx2 = (s + dsdx) / (q + dqdx) - s * invQ;
+   GLfloat dtdx2 = (t + dtdx) / (q + dqdx) - t * invQ;
+   GLfloat dsdy2 = (s + dsdy) / (q + dqdy) - s * invQ;
+   GLfloat dtdy2 = (t + dtdy) / (q + dqdy) - t * invQ;
+   GLfloat maxU, maxV, rho, lambda;
+   dsdx2 = FABSF(dsdx2);
+   dsdy2 = FABSF(dsdy2);
+   dtdx2 = FABSF(dtdx2);
+   dtdy2 = FABSF(dtdy2);
+   maxU = MAX2(dsdx2, dsdy2) * texW;
+   maxV = MAX2(dtdx2, dtdy2) * texH;
+   rho = MAX2(maxU, maxV);
+   lambda = LOG2(rho);
+   return lambda;
+}
+
+/*
+ * Fill in the span.texcoords array from the interpolation values.
+ * XXX We could optimize here for the case when dq = 0.  That would
+ * usually be the case when using an orthographic projection.
+ */
+static void
+interpolate_texcoords(GLcontext *ctx, struct sw_span *span)
+{
+   ASSERT(span->interpMask & SPAN_TEXTURE);
+   ASSERT(!(span->arrayMask & SPAN_TEXTURE));
+
+   if (ctx->Texture._EnabledCoordUnits > 1) {
+      /* multitexture */
+      GLuint u;
+      span->arrayMask |= SPAN_TEXTURE;
+      for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {
+         if (ctx->Texture._EnabledCoordUnits & (1 << u)) {
+            const struct gl_texture_object *obj =ctx->Texture.Unit[u]._Current;
+            GLfloat texW, texH;
+            GLboolean needLambda;
+            if (obj) {
+               const struct gl_texture_image *img = obj->Image[obj->BaseLevel];
+               needLambda = (obj->MinFilter != obj->MagFilter)
+                  || ctx->FragmentProgram.Enabled;
+               texW = img->WidthScale;
+               texH = img->HeightScale;
+            }
+            else {
+               texW = 1.0;
+               texH = 1.0;
+               needLambda = GL_FALSE;
+            }
+            if (needLambda) {
+               GLfloat (*texcoord)[4] = span->array->texcoords[u];
+               GLfloat *lambda = span->array->lambda[u];
+               const GLfloat dsdx = span->texStepX[u][0];
+               const GLfloat dsdy = span->texStepY[u][0];
+               const GLfloat dtdx = span->texStepX[u][1];
+               const GLfloat dtdy = span->texStepY[u][1];
+               const GLfloat drdx = span->texStepX[u][2];
+               const GLfloat dqdx = span->texStepX[u][3];
+               const GLfloat dqdy = span->texStepY[u][3];
+               GLfloat s = span->tex[u][0];
+               GLfloat t = span->tex[u][1];
+               GLfloat r = span->tex[u][2];
+               GLfloat q = span->tex[u][3];
+               GLuint i;
+               for (i = 0; i < span->end; i++) {
+                  const GLfloat invQ = (q == 0.0F) ? 1.0F : (1.0F / q);
+                  texcoord[i][0] = s * invQ;
+                  texcoord[i][1] = t * invQ;
+                  texcoord[i][2] = r * invQ;
+                  texcoord[i][3] = q;
+                  lambda[i] = _swrast_compute_lambda(dsdx, dsdy, dtdx, dtdy,
+                                                   dqdx, dqdy, texW, texH,
+                                                   s, t, q, invQ);
+                  s += dsdx;
+                  t += dtdx;
+                  r += drdx;
+                  q += dqdx;
+               }
+               span->arrayMask |= SPAN_LAMBDA;
+            }
+            else {
+               GLfloat (*texcoord)[4] = span->array->texcoords[u];
+               GLfloat *lambda = span->array->lambda[u];
+               const GLfloat dsdx = span->texStepX[u][0];
+               const GLfloat dtdx = span->texStepX[u][1];
+               const GLfloat drdx = span->texStepX[u][2];
+               const GLfloat dqdx = span->texStepX[u][3];
+               GLfloat s = span->tex[u][0];
+               GLfloat t = span->tex[u][1];
+               GLfloat r = span->tex[u][2];
+               GLfloat q = span->tex[u][3];
+               GLuint i;
+               if (dqdx == 0.0) {
+                  /* Ortho projection or polygon's parallel to window X axis */
+                  const GLfloat invQ = (q == 0.0F) ? 1.0F : (1.0F / q);
+                  for (i = 0; i < span->end; i++) {
+                     texcoord[i][0] = s * invQ;
+                     texcoord[i][1] = t * invQ;
+                     texcoord[i][2] = r * invQ;
+                     texcoord[i][3] = q;
+                     lambda[i] = 0.0;
+                     s += dsdx;
+                     t += dtdx;
+                     r += drdx;
+                  }
+               }
+               else {
+                  for (i = 0; i < span->end; i++) {
+                     const GLfloat invQ = (q == 0.0F) ? 1.0F : (1.0F / q);
+                     texcoord[i][0] = s * invQ;
+                     texcoord[i][1] = t * invQ;
+                     texcoord[i][2] = r * invQ;
+                     texcoord[i][3] = q;
+                     lambda[i] = 0.0;
+                     s += dsdx;
+                     t += dtdx;
+                     r += drdx;
+                     q += dqdx;
+                  }
+               }
+            } /* lambda */
+         } /* if */
+      } /* for */
+   }
+   else {
+      /* single texture */
+      const struct gl_texture_object *obj = ctx->Texture.Unit[0]._Current;
+      GLfloat texW, texH;
+      GLboolean needLambda;
+      if (obj) {
+         const struct gl_texture_image *img = obj->Image[obj->BaseLevel];
+         needLambda = (obj->MinFilter != obj->MagFilter)
+            || ctx->FragmentProgram.Enabled;
+         texW = (GLfloat) img->WidthScale;
+         texH = (GLfloat) img->HeightScale;
+      }
+      else {
+         needLambda = GL_FALSE;
+         texW = texH = 1.0;
+      }
+      span->arrayMask |= SPAN_TEXTURE;
+      if (needLambda) {
+         /* just texture unit 0, with lambda */
+         GLfloat (*texcoord)[4] = span->array->texcoords[0];
+         GLfloat *lambda = span->array->lambda[0];
+         const GLfloat dsdx = span->texStepX[0][0];
+         const GLfloat dsdy = span->texStepY[0][0];
+         const GLfloat dtdx = span->texStepX[0][1];
+         const GLfloat dtdy = span->texStepY[0][1];
+         const GLfloat drdx = span->texStepX[0][2];
+         const GLfloat dqdx = span->texStepX[0][3];
+         const GLfloat dqdy = span->texStepY[0][3];
+         GLfloat s = span->tex[0][0];
+         GLfloat t = span->tex[0][1];
+         GLfloat r = span->tex[0][2];
+         GLfloat q = span->tex[0][3];
+         GLuint i;
+         for (i = 0; i < span->end; i++) {
+            const GLfloat invQ = (q == 0.0F) ? 1.0F : (1.0F / q);
+            lambda[i] = _swrast_compute_lambda(dsdx, dsdy, dtdx, dtdy,
+                                             dqdx, dqdy, texW, texH,
+                                             s, t, q, invQ);
+            texcoord[i][0] = s * invQ;
+            texcoord[i][1] = t * invQ;
+            texcoord[i][2] = r * invQ;
+            texcoord[i][3] = q;
+            s += dsdx;
+            t += dtdx;
+            r += drdx;
+            q += dqdx;
+         }
+         span->arrayMask |= SPAN_LAMBDA;
+      }
+      else {
+         /* just texture 0, without lambda */
+         GLfloat (*texcoord)[4] = span->array->texcoords[0];
+         const GLfloat dsdx = span->texStepX[0][0];
+         const GLfloat dtdx = span->texStepX[0][1];
+         const GLfloat drdx = span->texStepX[0][2];
+         const GLfloat dqdx = span->texStepX[0][3];
+         GLfloat s = span->tex[0][0];
+         GLfloat t = span->tex[0][1];
+         GLfloat r = span->tex[0][2];
+         GLfloat q = span->tex[0][3];
+         GLuint i;
+         if (dqdx == 0.0) {
+            /* Ortho projection or polygon's parallel to window X axis */
+            const GLfloat invQ = (q == 0.0F) ? 1.0F : (1.0F / q);
+            for (i = 0; i < span->end; i++) {
+               texcoord[i][0] = s * invQ;
+               texcoord[i][1] = t * invQ;
+               texcoord[i][2] = r * invQ;
+               texcoord[i][3] = q;
+               s += dsdx;
+               t += dtdx;
+               r += drdx;
+            }
+         }
+         else {
+            for (i = 0; i < span->end; i++) {
+               const GLfloat invQ = (q == 0.0F) ? 1.0F : (1.0F / q);
+               texcoord[i][0] = s * invQ;
+               texcoord[i][1] = t * invQ;
+               texcoord[i][2] = r * invQ;
+               texcoord[i][3] = q;
+               s += dsdx;
+               t += dtdx;
+               r += drdx;
+               q += dqdx;
+            }
+         }
+      }
+   }
+}
+
+
+/**
+ * Apply the current polygon stipple pattern to a span of pixels.
+ */
+static void
+stipple_polygon_span( GLcontext *ctx, struct sw_span *span )
+{
+   const GLuint highbit = 0x80000000;
+   const GLuint stipple = ctx->PolygonStipple[span->y % 32];
+   GLubyte *mask = span->array->mask;
+   GLuint i, m;
+
+   ASSERT(ctx->Polygon.StippleFlag);
+   ASSERT((span->arrayMask & SPAN_XY) == 0);
+
+   m = highbit >> (GLuint) (span->x % 32);
+
+   for (i = 0; i < span->end; i++) {
+      if ((m & stipple) == 0) {
+	 mask[i] = 0;
+      }
+      m = m >> 1;
+      if (m == 0) {
+         m = highbit;
+      }
+   }
+   span->writeAll = GL_FALSE;
+}
+
+
+/**
+ * Clip a pixel span to the current buffer/window boundaries:
+ * DrawBuffer->_Xmin, _Xmax, _Ymin, _Ymax.  This will accomplish
+ * window clipping and scissoring.
+ * Return:   GL_TRUE   some pixels still visible
+ *           GL_FALSE  nothing visible
+ */
+static GLuint
+clip_span( GLcontext *ctx, struct sw_span *span )
+{
+   const GLint xmin = ctx->DrawBuffer->_Xmin;
+   const GLint xmax = ctx->DrawBuffer->_Xmax;
+   const GLint ymin = ctx->DrawBuffer->_Ymin;
+   const GLint ymax = ctx->DrawBuffer->_Ymax;
+
+   if (span->arrayMask & SPAN_XY) {
+      /* arrays of x/y pixel coords */
+      const GLint *x = span->array->x;
+      const GLint *y = span->array->y;
+      const GLint n = span->end;
+      GLubyte *mask = span->array->mask;
+      GLint i;
+      if (span->arrayMask & SPAN_MASK) {
+         /* note: using & intead of && to reduce branches */
+         for (i = 0; i < n; i++) {
+            mask[i] &= (x[i] >= xmin) & (x[i] < xmax)
+                     & (y[i] >= ymin) & (y[i] < ymax);
+         }
+      }
+      else {
+         /* note: using & intead of && to reduce branches */
+         for (i = 0; i < n; i++) {
+            mask[i] = (x[i] >= xmin) & (x[i] < xmax)
+                    & (y[i] >= ymin) & (y[i] < ymax);
+         }
+      }
+      return GL_TRUE;  /* some pixels visible */
+   }
+   else {
+      /* horizontal span of pixels */
+      const GLint x = span->x;
+      const GLint y = span->y;
+      const GLint n = span->end;
+
+      /* Trivial rejection tests */
+      if (y < ymin || y >= ymax || x + n <= xmin || x >= xmax) {
+         span->end = 0;
+         return GL_FALSE;  /* all pixels clipped */
+      }
+
+      /* Clip to the left */
+      if (x < xmin) {
+         ASSERT(x + n > xmin);
+         span->writeAll = GL_FALSE;
+         _mesa_bzero(span->array->mask, (xmin - x) * sizeof(GLubyte));
+      }
+
+      /* Clip to right */
+      if (x + n > xmax) {
+         ASSERT(x < xmax);
+         span->end = xmax - x;
+      }
+
+      return GL_TRUE;  /* some pixels visible */
+   }
+}
+
+
+
+/**
+ * Draw to more than one color buffer (or none).
+ */
+static void
+multi_write_index_span( GLcontext *ctx, struct sw_span *span )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   GLuint bufferBit;
+
+   /* loop over four possible dest color buffers */
+   for (bufferBit = 1; bufferBit <= 8; bufferBit <<= 1) {
+      if (bufferBit & ctx->Color._DrawDestMask) {
+         GLuint indexTmp[MAX_WIDTH];
+         ASSERT(span->end < MAX_WIDTH);
+
+         /* Set the current read/draw buffer */
+         swrast->CurrentBuffer = bufferBit;
+         (*swrast->Driver.SetBuffer)(ctx, ctx->DrawBuffer, bufferBit);
+
+         /* make copy of incoming indexes */
+         MEMCPY( indexTmp, span->array->index, span->end * sizeof(GLuint) );
+
+         if (ctx->Color.IndexLogicOpEnabled) {
+            _swrast_logicop_ci_span(ctx, span, indexTmp);
+         }
+
+         if (ctx->Color.IndexMask != 0xffffffff) {
+            _swrast_mask_index_span(ctx, span, indexTmp);
+         }
+
+         if (span->arrayMask & SPAN_XY) {
+            /* array of pixel coords */
+            (*swrast->Driver.WriteCI32Pixels)(ctx, span->end,
+                                              span->array->x, span->array->y,
+                                              indexTmp, span->array->mask);
+         }
+         else {
+            /* horizontal run of pixels */
+            (*swrast->Driver.WriteCI32Span)(ctx, span->end, span->x, span->y,
+                                            indexTmp, span->array->mask);
+         }
+      }
+   }
+
+   /* restore default dest buffer */
+   _swrast_use_draw_buffer(ctx);
+}
+
+
+/**
+ * Draw to more than one RGBA color buffer (or none).
+ * All fragment operations, up to (but not) blending/logicop should
+ * have been done first.
+ */
+static void
+multi_write_rgba_span( GLcontext *ctx, struct sw_span *span )
+{
+   const GLuint colorMask = *((GLuint *) ctx->Color.ColorMask);
+   GLuint bufferBit;
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+
+   ASSERT(colorMask != 0x0);
+
+   if (ctx->Color.DrawBuffer == GL_NONE)
+      return;
+
+   /* loop over four possible dest color buffers */
+   for (bufferBit = 1; bufferBit <= 8; bufferBit <<= 1) {
+      if (bufferBit & ctx->Color._DrawDestMask) {
+         GLchan rgbaTmp[MAX_WIDTH][4];
+         ASSERT(span->end < MAX_WIDTH);
+
+         /* Set the current read/draw buffer */
+         swrast->CurrentBuffer = bufferBit;
+         (*swrast->Driver.SetBuffer)(ctx, ctx->DrawBuffer, bufferBit);
+
+         /* make copy of incoming colors */
+         MEMCPY( rgbaTmp, span->array->rgba, 4 * span->end * sizeof(GLchan) );
+
+         if (ctx->Color._LogicOpEnabled) {
+            _swrast_logicop_rgba_span(ctx, span, rgbaTmp);
+         }
+         else if (ctx->Color.BlendEnabled) {
+            _swrast_blend_span(ctx, span, rgbaTmp);
+         }
+
+         if (colorMask != 0xffffffff) {
+            _swrast_mask_rgba_span(ctx, span, rgbaTmp);
+         }
+
+         if (span->arrayMask & SPAN_XY) {
+            /* array of pixel coords */
+            (*swrast->Driver.WriteRGBAPixels)(ctx, span->end,
+                                              span->array->x, span->array->y,
+                                              (const GLchan (*)[4]) rgbaTmp,
+                                              span->array->mask);
+            if (SWRAST_CONTEXT(ctx)->_RasterMask & ALPHABUF_BIT) {
+               _swrast_write_alpha_pixels(ctx, span->end,
+                                        span->array->x, span->array->y,
+                                        (const GLchan (*)[4]) rgbaTmp,
+                                        span->array->mask);
+            }
+         }
+         else {
+            /* horizontal run of pixels */
+            (*swrast->Driver.WriteRGBASpan)(ctx, span->end, span->x, span->y,
+                                            (const GLchan (*)[4]) rgbaTmp,
+                                            span->array->mask);
+            if (swrast->_RasterMask & ALPHABUF_BIT) {
+               _swrast_write_alpha_span(ctx, span->end, span->x, span->y,
+                                      (const GLchan (*)[4]) rgbaTmp,
+                                      span->array->mask);
+            }
+         }
+      }
+   }
+
+   /* restore default dest buffer */
+   _swrast_use_draw_buffer(ctx);
+}
+
+
+
+/**
+ * This function may modify any of the array values in the span.
+ * span->interpMask and span->arrayMask may be changed but will be restored
+ * to their original values before returning.
+ */
+void
+_swrast_write_index_span( GLcontext *ctx, struct sw_span *span)
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   const GLuint origInterpMask = span->interpMask;
+   const GLuint origArrayMask = span->arrayMask;
+
+   ASSERT(span->end <= MAX_WIDTH);
+   ASSERT(span->primitive == GL_POINT  ||  span->primitive == GL_LINE ||
+	  span->primitive == GL_POLYGON  ||  span->primitive == GL_BITMAP);
+   ASSERT((span->interpMask | span->arrayMask) & SPAN_INDEX);
+   ASSERT((span->interpMask & span->arrayMask) == 0);
+
+   if (span->arrayMask & SPAN_MASK) {
+      /* mask was initialized by caller, probably glBitmap */
+      span->writeAll = GL_FALSE;
+   }
+   else {
+      MEMSET(span->array->mask, 1, span->end);
+      span->writeAll = GL_TRUE;
+   }
+
+   /* Clipping */
+   if ((swrast->_RasterMask & CLIP_BIT) || (span->primitive != GL_POLYGON)) {
+      if (!clip_span(ctx, span)) {
+         return;
+      }
+   }
+
+   /* Depth bounds test */
+   if (ctx->Depth.BoundsTest && ctx->Visual.depthBits > 0) {
+      if (!_swrast_depth_bounds_test(ctx, span)) {
+         return;
+      }
+   }
+
+#ifdef DEBUG
+   if (span->arrayMask & SPAN_XY) {
+      GLuint i;
+      for (i = 0; i < span->end; i++) {
+         if (span->array->mask[i]) {
+            assert(span->array->x[i] >= ctx->DrawBuffer->_Xmin);
+            assert(span->array->x[i] < ctx->DrawBuffer->_Xmax);
+            assert(span->array->y[i] >= ctx->DrawBuffer->_Ymin);
+            assert(span->array->y[i] < ctx->DrawBuffer->_Ymax);
+         }
+      }
+   }
+#endif
+
+   /* Polygon Stippling */
+   if (ctx->Polygon.StippleFlag && span->primitive == GL_POLYGON) {
+      stipple_polygon_span(ctx, span);
+   }
+
+   /* Depth test and stencil */
+   if (ctx->Depth.Test || ctx->Stencil.Enabled) {
+      if (span->interpMask & SPAN_Z)
+         _swrast_span_interpolate_z(ctx, span);
+
+      if (ctx->Stencil.Enabled) {
+         if (!_swrast_stencil_and_ztest_span(ctx, span)) {
+            span->arrayMask = origArrayMask;
+            return;
+         }
+      }
+      else {
+         ASSERT(ctx->Depth.Test);
+         if (!_swrast_depth_test_span(ctx, span)) {
+            span->arrayMask = origArrayMask;
+            return;
+         }
+      }
+   }
+
+   /* if we get here, something passed the depth test */
+   ctx->OcclusionResult = GL_TRUE;
+
+#if FEATURE_ARB_occlusion_query
+   if (ctx->Occlusion.Active) {
+      GLuint i;
+      for (i = 0; i < span->end; i++)
+         ctx->Occlusion.PassedCounter += span->array->mask[i];
+   }
+#endif
+
+   /* we have to wait until after occlusion to do this test */
+   if (ctx->Color.DrawBuffer == GL_NONE || ctx->Color.IndexMask == 0) {
+      /* write no pixels */
+      span->arrayMask = origArrayMask;
+      return;
+   }
+
+   /* Interpolate the color indexes if needed */
+   if (span->interpMask & SPAN_INDEX) {
+      interpolate_indexes(ctx, span);
+      /* clear the bit - this allows the WriteMonoCISpan optimization below */
+      span->interpMask &= ~SPAN_INDEX;
+   }
+
+   /* Fog */
+   if (ctx->Fog.Enabled) {
+      _swrast_fog_ci_span(ctx, span);
+   }
+
+   /* Antialias coverage application */
+   if (span->arrayMask & SPAN_COVERAGE) {
+      GLuint i;
+      GLuint *index = span->array->index;
+      GLfloat *coverage = span->array->coverage;
+      for (i = 0; i < span->end; i++) {
+         ASSERT(coverage[i] < 16);
+         index[i] = (index[i] & ~0xf) | ((GLuint) coverage[i]);
+      }
+   }
+
+   if (swrast->_RasterMask & MULTI_DRAW_BIT) {
+      /* draw to zero or two or more buffers */
+      multi_write_index_span(ctx, span);
+   }
+   else {
+      /* normal situation: draw to exactly one buffer */
+      if (ctx->Color.IndexLogicOpEnabled) {
+         _swrast_logicop_ci_span(ctx, span, span->array->index);
+      }
+
+      if (ctx->Color.IndexMask != 0xffffffff) {
+         _swrast_mask_index_span(ctx, span, span->array->index);
+      }
+
+      /* write pixels */
+      if (span->arrayMask & SPAN_XY) {
+         /* array of pixel coords */
+         if ((span->interpMask & SPAN_INDEX) && span->indexStep == 0) {
+            /* all pixels have same color index */
+            (*swrast->Driver.WriteMonoCIPixels)(ctx, span->end,
+                                                span->array->x, span->array->y,
+                                                FixedToInt(span->index),
+                                                span->array->mask);
+         }
+         else {
+            (*swrast->Driver.WriteCI32Pixels)(ctx, span->end, span->array->x,
+                                              span->array->y, span->array->index,
+                                              span->array->mask );
+         }
+      }
+      else {
+         /* horizontal run of pixels */
+         if ((span->interpMask & SPAN_INDEX) && span->indexStep == 0) {
+            /* all pixels have same color index */
+            (*swrast->Driver.WriteMonoCISpan)(ctx, span->end, span->x, span->y,
+                                              FixedToInt(span->index),
+                                              span->array->mask);
+         }
+         else {
+            (*swrast->Driver.WriteCI32Span)(ctx, span->end, span->x, span->y,
+                                            span->array->index,
+                                            span->array->mask);
+         }
+      }
+   }
+
+   span->interpMask = origInterpMask;
+   span->arrayMask = origArrayMask;
+}
+
+
+/**
+ * This function may modify any of the array values in the span.
+ * span->interpMask and span->arrayMask may be changed but will be restored
+ * to their original values before returning.
+ */
+void
+_swrast_write_rgba_span( GLcontext *ctx, struct sw_span *span)
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   const GLuint colorMask = *((GLuint *) ctx->Color.ColorMask);
+   const GLuint origInterpMask = span->interpMask;
+   const GLuint origArrayMask = span->arrayMask;
+   GLboolean monoColor;
+
+   ASSERT(span->end <= MAX_WIDTH);
+   ASSERT(span->primitive == GL_POINT  ||  span->primitive == GL_LINE ||
+	  span->primitive == GL_POLYGON  ||  span->primitive == GL_BITMAP);
+   ASSERT((span->interpMask & span->arrayMask) == 0);
+   ASSERT((span->interpMask | span->arrayMask) & SPAN_RGBA);
+#ifdef DEBUG
+   if (ctx->Fog.Enabled)
+      ASSERT((span->interpMask | span->arrayMask) & SPAN_FOG);
+   if (ctx->Depth.Test)
+      ASSERT((span->interpMask | span->arrayMask) & SPAN_Z);
+#endif
+
+   if (span->arrayMask & SPAN_MASK) {
+      /* mask was initialized by caller, probably glBitmap */
+      span->writeAll = GL_FALSE;
+   }
+   else {
+      MEMSET(span->array->mask, 1, span->end);
+      span->writeAll = GL_TRUE;
+   }
+
+   /* Determine if we have mono-chromatic colors */
+   monoColor = (span->interpMask & SPAN_RGBA) &&
+      span->redStep == 0 && span->greenStep == 0 &&
+      span->blueStep == 0 && span->alphaStep == 0;
+
+   /* Clipping */
+   if ((swrast->_RasterMask & CLIP_BIT) || (span->primitive != GL_POLYGON)) {
+      if (!clip_span(ctx, span)) {
+         return;
+      }
+   }
+
+   /* Depth bounds test */
+   if (ctx->Depth.BoundsTest && ctx->Visual.depthBits > 0) {
+      if (!_swrast_depth_bounds_test(ctx, span)) {
+         return;
+      }
+   }
+
+#ifdef DEBUG
+   if (span->arrayMask & SPAN_XY) {
+      GLuint i;
+      for (i = 0; i < span->end; i++) {
+         if (span->array->mask[i]) {
+            assert(span->array->x[i] >= ctx->DrawBuffer->_Xmin);
+            assert(span->array->x[i] < ctx->DrawBuffer->_Xmax);
+            assert(span->array->y[i] >= ctx->DrawBuffer->_Ymin);
+            assert(span->array->y[i] < ctx->DrawBuffer->_Ymax);
+         }
+      }
+   }
+#endif
+
+   /* Polygon Stippling */
+   if (ctx->Polygon.StippleFlag && span->primitive == GL_POLYGON) {
+      stipple_polygon_span(ctx, span);
+   }
+
+   /* Fragment program */
+   if (ctx->FragmentProgram.Enabled) {
+      /* Now we may need to interpolate the colors */
+      if ((span->interpMask & SPAN_RGBA) &&
+          (span->arrayMask & SPAN_RGBA) == 0) {
+         interpolate_colors(ctx, span);
+         span->interpMask &= ~SPAN_RGBA;
+      }
+      if (span->interpMask & SPAN_SPEC) {
+         interpolate_specular(ctx, span);
+      }
+      _swrast_exec_nv_fragment_program(ctx, span);
+      monoColor = GL_FALSE;
+   }
+
+   /* Do the alpha test */
+   if (ctx->Color.AlphaEnabled) {
+      if (!_swrast_alpha_test(ctx, span)) {
+         span->interpMask = origInterpMask;
+         span->arrayMask = origArrayMask;
+	 return;
+      }
+   }
+
+   /* Stencil and Z testing */
+   if (ctx->Stencil.Enabled || ctx->Depth.Test) {
+      if (span->interpMask & SPAN_Z)
+         _swrast_span_interpolate_z(ctx, span);
+
+      if (ctx->Stencil.Enabled) {
+         if (!_swrast_stencil_and_ztest_span(ctx, span)) {
+            span->interpMask = origInterpMask;
+            span->arrayMask = origArrayMask;
+            return;
+         }
+      }
+      else {
+         ASSERT(ctx->Depth.Test);
+         ASSERT(span->arrayMask & SPAN_Z);
+         /* regular depth testing */
+         if (!_swrast_depth_test_span(ctx, span)) {
+            span->interpMask = origInterpMask;
+            span->arrayMask = origArrayMask;
+            return;
+         }
+      }
+   }
+
+   /* if we get here, something passed the depth test */
+   ctx->OcclusionResult = GL_TRUE;
+
+#if FEATURE_ARB_occlusion_query
+   if (ctx->Occlusion.Active) {
+      GLuint i;
+      for (i = 0; i < span->end; i++)
+         ctx->Occlusion.PassedCounter += span->array->mask[i];
+   }
+#endif
+
+   /* can't abort span-writing until after occlusion testing */
+   if (colorMask == 0x0) {
+      span->interpMask = origInterpMask;
+      span->arrayMask = origArrayMask;
+      return;
+   }
+
+   /* Now we may need to interpolate the colors */
+   if ((span->interpMask & SPAN_RGBA) && (span->arrayMask & SPAN_RGBA) == 0) {
+      interpolate_colors(ctx, span);
+      /* clear the bit - this allows the WriteMonoCISpan optimization below */
+      span->interpMask &= ~SPAN_RGBA;
+   }
+
+   /* Fog */
+   if (ctx->Fog.Enabled) {
+      _swrast_fog_rgba_span(ctx, span);
+      monoColor = GL_FALSE;
+   }
+
+   /* Antialias coverage application */
+   if (span->arrayMask & SPAN_COVERAGE) {
+      GLchan (*rgba)[4] = span->array->rgba;
+      GLfloat *coverage = span->array->coverage;
+      GLuint i;
+      for (i = 0; i < span->end; i++) {
+         rgba[i][ACOMP] = (GLchan) (rgba[i][ACOMP] * coverage[i]);
+      }
+      monoColor = GL_FALSE;
+   }
+
+   if (swrast->_RasterMask & MULTI_DRAW_BIT) {
+      multi_write_rgba_span(ctx, span);
+   }
+   else {
+      /* normal: write to exactly one buffer */
+      if (ctx->Color._LogicOpEnabled) {
+         _swrast_logicop_rgba_span(ctx, span, span->array->rgba);
+         monoColor = GL_FALSE;
+      }
+      else if (ctx->Color.BlendEnabled) {
+         _swrast_blend_span(ctx, span, span->array->rgba);
+         monoColor = GL_FALSE;
+      }
+
+      /* Color component masking */
+      if (colorMask != 0xffffffff) {
+         _swrast_mask_rgba_span(ctx, span, span->array->rgba);
+         monoColor = GL_FALSE;
+      }
+
+      /* write pixels */
+      if (span->arrayMask & SPAN_XY) {
+         /* array of pixel coords */
+         /* XXX test for mono color */
+         (*swrast->Driver.WriteRGBAPixels)(ctx, span->end, span->array->x,
+             span->array->y, (const GLchan (*)[4]) span->array->rgba, span->array->mask);
+         if (SWRAST_CONTEXT(ctx)->_RasterMask & ALPHABUF_BIT) {
+            _swrast_write_alpha_pixels(ctx, span->end,
+                                     span->array->x, span->array->y,
+                                     (const GLchan (*)[4]) span->array->rgba,
+                                     span->array->mask);
+         }
+      }
+      else {
+         /* horizontal run of pixels */
+         if (monoColor) {
+            /* all pixels have same color */
+            GLchan color[4];
+            color[RCOMP] = FixedToChan(span->red);
+            color[GCOMP] = FixedToChan(span->green);
+            color[BCOMP] = FixedToChan(span->blue);
+            color[ACOMP] = FixedToChan(span->alpha);
+            (*swrast->Driver.WriteMonoRGBASpan)(ctx, span->end, span->x,
+                                                span->y, color, span->array->mask);
+            if (swrast->_RasterMask & ALPHABUF_BIT) {
+               _swrast_write_mono_alpha_span(ctx, span->end, span->x, span->y,
+                      color[ACOMP],
+                      span->writeAll ? ((const GLubyte *) NULL) : span->array->mask);
+            }
+         }
+         else {
+            /* each pixel is a different color */
+            (*swrast->Driver.WriteRGBASpan)(ctx, span->end, span->x, span->y,
+                      (const GLchan (*)[4]) span->array->rgba,
+                      span->writeAll ? ((const GLubyte *) NULL) : span->array->mask);
+            if (swrast->_RasterMask & ALPHABUF_BIT) {
+               _swrast_write_alpha_span(ctx, span->end, span->x, span->y,
+                      (const GLchan (*)[4]) span->array->rgba,
+                      span->writeAll ? ((const GLubyte *) NULL) : span->array->mask);
+            }
+         }
+      }
+   }
+
+   span->interpMask = origInterpMask;
+   span->arrayMask = origArrayMask;
+}
+
+
+/**
+ * Add specular color to base color.  This is used only when
+ * GL_LIGHT_MODEL_COLOR_CONTROL = GL_SEPARATE_SPECULAR_COLOR.
+ */
+static void
+add_colors(GLuint n, GLchan rgba[][4], GLchan specular[][4] )
+{
+   GLuint i;
+   for (i = 0; i < n; i++) {
+#if CHAN_TYPE == GL_FLOAT
+      /* no clamping */
+      rgba[i][RCOMP] += specular[i][RCOMP];
+      rgba[i][GCOMP] += specular[i][GCOMP];
+      rgba[i][BCOMP] += specular[i][BCOMP];
+#else
+      GLint r = rgba[i][RCOMP] + specular[i][RCOMP];
+      GLint g = rgba[i][GCOMP] + specular[i][GCOMP];
+      GLint b = rgba[i][BCOMP] + specular[i][BCOMP];
+      rgba[i][RCOMP] = (GLchan) MIN2(r, CHAN_MAX);
+      rgba[i][GCOMP] = (GLchan) MIN2(g, CHAN_MAX);
+      rgba[i][BCOMP] = (GLchan) MIN2(b, CHAN_MAX);
+#endif
+   }
+}
+
+
+/**
+ * This function may modify any of the array values in the span.
+ * span->interpMask and span->arrayMask may be changed but will be restored
+ * to their original values before returning.
+ */
+void
+_swrast_write_texture_span( GLcontext *ctx, struct sw_span *span)
+{
+   const GLuint colorMask = *((GLuint *) ctx->Color.ColorMask);
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   const GLuint origInterpMask = span->interpMask;
+   const GLuint origArrayMask = span->arrayMask;
+
+   ASSERT(span->primitive == GL_POINT  ||  span->primitive == GL_LINE ||
+	  span->primitive == GL_POLYGON  ||  span->primitive == GL_BITMAP);
+   ASSERT(span->end <= MAX_WIDTH);
+   ASSERT((span->interpMask & span->arrayMask) == 0);
+   ASSERT(ctx->Texture._EnabledCoordUnits || ctx->FragmentProgram.Enabled);
+
+   /*
+   printf("%s()  interp 0x%x  array 0x%x\n", __FUNCTION__, span->interpMask, span->arrayMask);
+   */
+
+   if (span->arrayMask & SPAN_MASK) {
+      /* mask was initialized by caller, probably glBitmap */
+      span->writeAll = GL_FALSE;
+   }
+   else {
+      MEMSET(span->array->mask, 1, span->end);
+      span->writeAll = GL_TRUE;
+   }
+
+   /* Clipping */
+   if ((swrast->_RasterMask & CLIP_BIT) || (span->primitive != GL_POLYGON)) {
+      if (!clip_span(ctx, span)) {
+	 return;
+      }
+   }
+
+#ifdef DEBUG
+   if (span->arrayMask & SPAN_XY) {
+      GLuint i;
+      for (i = 0; i < span->end; i++) {
+         if (span->array->mask[i]) {
+            assert(span->array->x[i] >= ctx->DrawBuffer->_Xmin);
+            assert(span->array->x[i] < ctx->DrawBuffer->_Xmax);
+            assert(span->array->y[i] >= ctx->DrawBuffer->_Ymin);
+            assert(span->array->y[i] < ctx->DrawBuffer->_Ymax);
+         }
+      }
+   }
+#endif
+
+   /* Polygon Stippling */
+   if (ctx->Polygon.StippleFlag && span->primitive == GL_POLYGON) {
+      stipple_polygon_span(ctx, span);
+   }
+
+   /* Need texture coordinates now */
+   if ((span->interpMask & SPAN_TEXTURE)
+       && (span->arrayMask & SPAN_TEXTURE) == 0)
+      interpolate_texcoords(ctx, span);
+
+   /* Texture with alpha test */
+   if (ctx->Color.AlphaEnabled) {
+
+      /* Now we need the rgba array, fill it in if needed */
+      if ((span->interpMask & SPAN_RGBA) && (span->arrayMask & SPAN_RGBA) == 0)
+         interpolate_colors(ctx, span);
+
+      if (span->interpMask & SPAN_SPEC) {
+         interpolate_specular(ctx, span);
+      }
+
+      /* Texturing without alpha is done after depth-testing which
+       * gives a potential speed-up.
+       */
+      if (ctx->FragmentProgram.Enabled)
+         _swrast_exec_nv_fragment_program( ctx, span );
+      else
+         _swrast_texture_span( ctx, span );
+
+      /* Do the alpha test */
+      if (!_swrast_alpha_test(ctx, span)) {
+         span->arrayMask = origArrayMask;
+	 return;
+      }
+   }
+
+   /* Stencil and Z testing */
+   if (ctx->Stencil.Enabled || ctx->Depth.Test) {
+      if (span->interpMask & SPAN_Z)
+         _swrast_span_interpolate_z(ctx, span);
+
+      if (ctx->Stencil.Enabled) {
+         if (!_swrast_stencil_and_ztest_span(ctx, span)) {
+            span->interpMask = origInterpMask;
+            span->arrayMask = origArrayMask;
+            return;
+         }
+      }
+      else {
+         ASSERT(ctx->Depth.Test);
+         ASSERT(span->arrayMask & SPAN_Z);
+         /* regular depth testing */
+         if (!_swrast_depth_test_span(ctx, span)) {
+            span->interpMask = origInterpMask;
+            span->arrayMask = origArrayMask;
+            return;
+         }
+      }
+   }
+
+   /* if we get here, some fragments passed the depth test */
+   ctx->OcclusionResult = GL_TRUE;
+
+#if FEATURE_ARB_occlusion_query
+   if (ctx->Occlusion.Active) {
+      GLuint i;
+      for (i = 0; i < span->end; i++)
+         ctx->Occlusion.PassedCounter += span->array->mask[i];
+   }
+#endif
+
+   /* We had to wait until now to check for glColorMask(F,F,F,F) because of
+    * the occlusion test.
+    */
+   if (colorMask == 0x0) {
+      span->interpMask = origInterpMask;
+      span->arrayMask = origArrayMask;
+      return;
+   }
+
+   /* Texture without alpha test */
+   if (!ctx->Color.AlphaEnabled) {
+
+      /* Now we need the rgba array, fill it in if needed */
+      if ((span->interpMask & SPAN_RGBA) && (span->arrayMask & SPAN_RGBA) == 0)
+         interpolate_colors(ctx, span);
+
+      if (span->interpMask & SPAN_SPEC) {
+         interpolate_specular(ctx, span);
+      }
+
+      if (ctx->FragmentProgram.Enabled)
+         _swrast_exec_nv_fragment_program( ctx, span );
+      else
+         _swrast_texture_span( ctx, span );
+   }
+
+   ASSERT(span->arrayMask & SPAN_RGBA);
+
+   /* Add base and specular colors */
+   if (ctx->Fog.ColorSumEnabled ||
+       (ctx->Light.Enabled &&
+        ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR)) {
+      if (span->interpMask & SPAN_SPEC) {
+         interpolate_specular(ctx, span);
+      }
+      ASSERT(span->arrayMask & SPAN_SPEC);
+      add_colors( span->end, span->array->rgba, span->array->spec );
+   }
+
+   /* Fog */
+   if (ctx->Fog.Enabled) {
+      _swrast_fog_rgba_span(ctx, span);
+   }
+
+   /* Antialias coverage application */
+   if (span->arrayMask & SPAN_COVERAGE) {
+      GLchan (*rgba)[4] = span->array->rgba;
+      GLfloat *coverage = span->array->coverage;
+      GLuint i;
+      for (i = 0; i < span->end; i++) {
+         rgba[i][ACOMP] = (GLchan) (rgba[i][ACOMP] * coverage[i]);
+      }
+   }
+
+   if (swrast->_RasterMask & MULTI_DRAW_BIT) {
+      multi_write_rgba_span(ctx, span);
+   }
+   else {
+      /* normal: write to exactly one buffer */
+      if (ctx->Color._LogicOpEnabled) {
+         _swrast_logicop_rgba_span(ctx, span, span->array->rgba);
+      }
+      else if (ctx->Color.BlendEnabled) {
+         _swrast_blend_span(ctx, span, span->array->rgba);
+      }
+
+      /* Color component masking */
+      if (colorMask != 0xffffffff) {
+         _swrast_mask_rgba_span(ctx, span, span->array->rgba);
+      }
+
+      /* write pixels */
+      if (span->arrayMask & SPAN_XY) {
+         /* array of pixel coords */
+         (*swrast->Driver.WriteRGBAPixels)(ctx, span->end, span->array->x,
+             span->array->y, (const GLchan (*)[4]) span->array->rgba, span->array->mask);
+         if (SWRAST_CONTEXT(ctx)->_RasterMask & ALPHABUF_BIT) {
+            _swrast_write_alpha_pixels(ctx, span->end,
+                                     span->array->x, span->array->y,
+                                     (const GLchan (*)[4]) span->array->rgba,
+                                     span->array->mask);
+         }
+      }
+      else {
+         /* horizontal run of pixels */
+         (*swrast->Driver.WriteRGBASpan)(ctx, span->end, span->x, span->y,
+                                       (const GLchan (*)[4]) span->array->rgba,
+                                       span->writeAll ? NULL : span->array->mask);
+         if (swrast->_RasterMask & ALPHABUF_BIT) {
+            _swrast_write_alpha_span(ctx, span->end, span->x, span->y,
+                                   (const GLchan (*)[4]) span->array->rgba,
+                                   span->writeAll ? NULL : span->array->mask);
+         }
+      }
+   }
+
+   span->interpMask = origInterpMask;
+   span->arrayMask = origArrayMask;
+}
+
+
+
+/**
+ * Read RGBA pixels from frame buffer.  Clipping will be done to prevent
+ * reading ouside the buffer's boundaries.
+ */
+void
+_swrast_read_rgba_span( GLcontext *ctx, GLframebuffer *buffer,
+                      GLuint n, GLint x, GLint y, GLchan rgba[][4] )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   const GLint bufWidth = (GLint) buffer->Width;
+   const GLint bufHeight = (GLint) buffer->Height;
+
+   if (y < 0 || y >= bufHeight || x + (GLint) n < 0 || x >= bufWidth) {
+      /* completely above, below, or right */
+      /* XXX maybe leave undefined? */
+      _mesa_bzero(rgba, 4 * n * sizeof(GLchan));
+   }
+   else {
+      GLint skip, length;
+      if (x < 0) {
+         /* left edge clippping */
+         skip = -x;
+         length = (GLint) n - skip;
+         if (length < 0) {
+            /* completely left of window */
+            return;
+         }
+         if (length > bufWidth) {
+            length = bufWidth;
+         }
+      }
+      else if ((GLint) (x + n) > bufWidth) {
+         /* right edge clipping */
+         skip = 0;
+         length = bufWidth - x;
+         if (length < 0) {
+            /* completely to right of window */
+            return;
+         }
+      }
+      else {
+         /* no clipping */
+         skip = 0;
+         length = (GLint) n;
+      }
+
+      (*swrast->Driver.ReadRGBASpan)( ctx, length, x + skip, y, rgba + skip );
+      if (buffer->UseSoftwareAlphaBuffers) {
+         _swrast_read_alpha_span(ctx, length, x + skip, y, rgba + skip);
+      }
+   }
+}
+
+
+/**
+ * Read CI pixels from frame buffer.  Clipping will be done to prevent
+ * reading ouside the buffer's boundaries.
+ */
+void
+_swrast_read_index_span( GLcontext *ctx, GLframebuffer *buffer,
+                       GLuint n, GLint x, GLint y, GLuint indx[] )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   const GLint bufWidth = (GLint) buffer->Width;
+   const GLint bufHeight = (GLint) buffer->Height;
+
+   if (y < 0 || y >= bufHeight || x + (GLint) n < 0 || x >= bufWidth) {
+      /* completely above, below, or right */
+      _mesa_bzero(indx, n * sizeof(GLuint));
+   }
+   else {
+      GLint skip, length;
+      if (x < 0) {
+         /* left edge clippping */
+         skip = -x;
+         length = (GLint) n - skip;
+         if (length < 0) {
+            /* completely left of window */
+            return;
+         }
+         if (length > bufWidth) {
+            length = bufWidth;
+         }
+      }
+      else if ((GLint) (x + n) > bufWidth) {
+         /* right edge clipping */
+         skip = 0;
+         length = bufWidth - x;
+         if (length < 0) {
+            /* completely to right of window */
+            return;
+         }
+      }
+      else {
+         /* no clipping */
+         skip = 0;
+         length = (GLint) n;
+      }
+
+      (*swrast->Driver.ReadCI32Span)( ctx, length, skip + x, y, indx + skip );
+   }
+}
diff --git a/reactos/lib/mesa32/src/swrast/s_span.h b/reactos/lib/mesa32/src/swrast/s_span.h
new file mode 100644
index 00000000000..ee78a0e8e04
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_span.h
@@ -0,0 +1,75 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef S_SPAN_H
+#define S_SPAN_H
+
+
+#include "mtypes.h"
+#include "swrast.h"
+
+
+extern void
+_swrast_span_default_z( GLcontext *ctx, struct sw_span *span );
+
+extern void
+_swrast_span_interpolate_z( const GLcontext *ctx, struct sw_span *span );
+
+extern void
+_swrast_span_default_fog( GLcontext *ctx, struct sw_span *span );
+
+extern void
+_swrast_span_default_color( GLcontext *ctx, struct sw_span *span );
+
+extern void
+_swrast_span_default_texcoords( GLcontext *ctx, struct sw_span *span );
+
+extern GLfloat
+_swrast_compute_lambda(GLfloat dsdx, GLfloat dsdy, GLfloat dtdx, GLfloat dtdy,
+                     GLfloat dqdx, GLfloat dqdy, GLfloat texW, GLfloat texH,
+                     GLfloat s, GLfloat t, GLfloat q, GLfloat invQ);
+
+extern void
+_swrast_write_index_span( GLcontext *ctx, struct sw_span *span);
+
+
+extern void
+_swrast_write_rgba_span( GLcontext *ctx, struct sw_span *span);
+
+
+extern void
+_swrast_write_texture_span( GLcontext *ctx, struct sw_span *span);
+
+
+extern void
+_swrast_read_rgba_span( GLcontext *ctx, GLframebuffer *buffer,
+                      GLuint n, GLint x, GLint y, GLchan rgba[][4] );
+
+extern void
+_swrast_read_index_span( GLcontext *ctx, GLframebuffer *buffer,
+                       GLuint n, GLint x, GLint y, GLuint indx[] );
+
+#endif
diff --git a/reactos/lib/mesa32/src/swrast/s_spantemp.h b/reactos/lib/mesa32/src/swrast/s_spantemp.h
new file mode 100644
index 00000000000..95d9358a16d
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_spantemp.h
@@ -0,0 +1,376 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * Templates for the span/pixel-array write/read functions called via
+ * swrast.  This is intended for memory-based framebuffers (like OSMesa).
+ *
+ * Define the following macros before including this file:
+ *   NAME(PREFIX)  to generate the function name
+ *   SPAN_VARS  to declare any local variables
+ *   INIT_PIXEL_PTR(P, X, Y)  to initialize a pointer to a pixel
+ *   INC_PIXEL_PTR(P)  to increment a pixel pointer by one pixel
+ *   STORE_RGB_PIXEL(P, X, Y, R, G, B)  to store RGB values in  pixel P
+ *   STORE_RGBA_PIXEL(P, X, Y, R, G, B, A)  to store RGBA values in pixel P
+ *   FETCH_RGBA_PIXEL(R, G, B, A, P)  to fetch RGBA values from pixel P
+ *
+ * Note that in the above STORE_RGBx_PIXEL macros, we also pass in the (X,Y)
+ * coordinates for the pixels to be stored, which enables dithering in 8-bit
+ * and 15/16-bit display modes. Most undithered modes or 24/32-bit display
+ * modes will simply ignore the passed in (X,Y) values.
+ *
+ * For color index mode:
+ *   STORE_CI_PIXEL(P, CI)  to store a color index in pixel P
+ *   FETCH_CI_PIXEL(CI, P)  to fetch a pixel index from pixel P
+ */
+
+
+#ifdef STORE_RGBA_PIXEL
+
+static void
+NAME(write_rgba_span)( const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                       CONST GLchan rgba[][4], const GLubyte mask[] )
+{
+#ifdef SPAN_VARS
+   SPAN_VARS
+#endif
+   GLuint i;
+   INIT_PIXEL_PTR(pixel, x, y);
+   if (mask) {
+      for (i = 0; i < n; i++) {
+         if (mask[i]) {
+            STORE_RGBA_PIXEL(pixel, x+i, y, rgba[i][RCOMP], rgba[i][GCOMP],
+                             rgba[i][BCOMP], rgba[i][ACOMP]);
+         }
+         INC_PIXEL_PTR(pixel);
+      }
+   }
+   else {
+      for (i = 0; i < n; i++) {
+         STORE_RGBA_PIXEL(pixel, x+i, y, rgba[i][RCOMP], rgba[i][GCOMP],
+                          rgba[i][BCOMP], rgba[i][ACOMP]);
+         INC_PIXEL_PTR(pixel);
+      }
+   }
+}
+
+static void
+NAME(write_rgb_span)( const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                      CONST GLchan rgb[][3], const GLubyte mask[] )
+{
+#ifdef SPAN_VARS
+   SPAN_VARS
+#endif
+   GLuint i;
+   INIT_PIXEL_PTR(pixel, x, y);
+   if (mask) {
+      for (i = 0; i < n; i++) {
+         if (mask[i]) {
+            STORE_RGB_PIXEL(pixel, x+i, y, rgb[i][RCOMP], rgb[i][GCOMP],
+                            rgb[i][BCOMP]);
+         }
+         INC_PIXEL_PTR(pixel);
+      }
+   }
+   else {
+      for (i = 0; i < n; i++) {
+         STORE_RGB_PIXEL(pixel, x+i, y, rgb[i][RCOMP], rgb[i][GCOMP],
+                         rgb[i][BCOMP]);
+         INC_PIXEL_PTR(pixel);
+      }
+   }
+}
+
+static void
+NAME(write_monorgba_span)( const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                           const GLchan color[4], const GLubyte mask[] )
+{
+#ifdef SPAN_VARS
+   SPAN_VARS
+#endif
+   GLuint i;
+   INIT_PIXEL_PTR(pixel, x, y);
+   if (mask) {
+      for (i = 0; i < n; i++) {
+         if (mask[i]) {
+            STORE_RGBA_PIXEL(pixel, x+i, y, color[RCOMP], color[GCOMP],
+                             color[BCOMP], color[ACOMP]);
+         }
+         INC_PIXEL_PTR(pixel);
+      }
+   }
+   else {
+      for (i = 0; i < n; i++) {
+         STORE_RGBA_PIXEL(pixel, x+i, y, color[RCOMP], color[GCOMP],
+                          color[BCOMP], color[ACOMP]);
+         INC_PIXEL_PTR(pixel);
+      }
+   }
+}
+
+static void
+NAME(write_rgba_pixels)( const GLcontext *ctx, GLuint n,
+                         const GLint x[], const GLint y[],
+                         CONST GLchan rgba[][4], const GLubyte mask[] )
+{
+#ifdef SPAN_VARS
+   SPAN_VARS
+#endif
+   GLuint i;
+   ASSERT(mask);
+   for (i = 0; i < n; i++) {
+      if (mask[i]) {
+         INIT_PIXEL_PTR(pixel, x[i], y[i]);
+         STORE_RGBA_PIXEL(pixel, x[i], y[i], rgba[i][RCOMP], rgba[i][GCOMP],
+                          rgba[i][BCOMP], rgba[i][ACOMP]);
+      }
+   }
+}
+
+static void
+NAME(write_monorgba_pixels)( const GLcontext *ctx,
+                             GLuint n, const GLint x[], const GLint y[],
+                             const GLchan color[4], const GLubyte mask[] )
+{
+#ifdef SPAN_VARS
+   SPAN_VARS
+#endif
+   GLuint i;
+   ASSERT(mask);
+   for (i = 0; i < n; i++) {
+      if (mask[i]) {
+         INIT_PIXEL_PTR(pixel, x[i], y[i]);
+         STORE_RGBA_PIXEL(pixel, x[i], y[i], color[RCOMP], color[GCOMP],
+                          color[BCOMP], color[ACOMP]);
+      }
+   }
+}
+
+static void
+NAME(read_rgba_span)( const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                      GLchan rgba[][4] )
+{
+#ifdef SPAN_VARS
+   SPAN_VARS
+#endif
+   GLuint i;
+   INIT_PIXEL_PTR(pixel, x, y);
+   for (i = 0; i < n; i++) {
+      FETCH_RGBA_PIXEL(rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP],
+                       rgba[i][ACOMP], pixel);
+      INC_PIXEL_PTR(pixel);
+   }
+}
+
+static void
+NAME(read_rgba_pixels)( const GLcontext *ctx,
+                        GLuint n, const GLint x[], const GLint y[],
+                        GLchan rgba[][4], const GLubyte mask[] )
+{
+#ifdef SPAN_VARS
+   SPAN_VARS
+#endif
+   GLuint i;
+   ASSERT(mask);
+   for (i = 0; i < n; i++) {
+      if (mask[i]) {
+         INIT_PIXEL_PTR(pixel, x[i], y[i]);
+         FETCH_RGBA_PIXEL(rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP],
+                          rgba[i][ACOMP], pixel);
+      }
+   }
+}
+
+
+#endif /* STORE_RGBA_PIXEL */
+
+
+
+#ifdef STORE_CI_PIXEL
+
+static void
+NAME(write_index32_span)( const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                          const GLuint index[], const GLubyte mask[] )
+{
+#ifdef SPAN_VARS
+   SPAN_VARS
+#endif
+   GLuint i;
+   INIT_PIXEL_PTR(pixel, x, y);
+   if (mask) {
+      for (i = 0; i < n; i++) {
+         if (mask[i]) {
+            STORE_CI_PIXEL(pixel, index[i]);
+         }
+         INC_PIXEL_PTR(pixel);
+      }
+   }
+   else {
+      for (i = 0; i < n; i++) {
+         STORE_CI_PIXEL(pixel, index[i]);
+         INC_PIXEL_PTR(pixel);
+      }
+   }
+}
+
+
+static void
+NAME(write_index8_span)( const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                         const GLubyte index[], const GLubyte mask[] )
+{
+#ifdef SPAN_VARS
+   SPAN_VARS
+#endif
+   GLuint i;
+   INIT_PIXEL_PTR(pixel, x, y);
+   if (mask) {
+      for (i = 0; i < n; i++) {
+         if (mask[i]) {
+            STORE_CI_PIXEL(pixel, index[i]);
+         }
+         INC_PIXEL_PTR(pixel);
+      }
+   }
+   else {
+      for (i = 0; i < n; i++) {
+         STORE_CI_PIXEL(pixel, index[i]);
+         INC_PIXEL_PTR(pixel);
+      }
+   }
+}
+
+
+static void
+NAME(write_monoindex_span)( const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                            GLuint colorIndex, const GLubyte mask[] )
+{
+#ifdef SPAN_VARS
+   SPAN_VARS
+#endif
+   GLuint i;
+   INIT_PIXEL_PTR(pixel, x, y);
+   if (mask) {
+      for (i = 0; i < n; i++) {
+         if (mask[i]) {
+            STORE_CI_PIXEL(pixel, colorIndex);
+         }
+         INC_PIXEL_PTR(pixel);
+      }
+   }      
+   else {
+      for (i = 0; i < n; i++) {
+         STORE_CI_PIXEL(pixel, colorIndex);
+         INC_PIXEL_PTR(pixel);
+      }
+   }      
+}
+
+
+static void
+NAME(write_index_pixels)( const GLcontext *ctx,
+                          GLuint n, const GLint x[], const GLint y[],
+                          const GLuint index[], const GLubyte mask[] )
+{
+#ifdef SPAN_VARS
+   SPAN_VARS
+#endif
+   GLuint i;
+   ASSERT(mask);
+   for (i = 0; i < n; i++) {
+      if (mask[i]) {
+         INIT_PIXEL_PTR(pixel, x[i], y[i]);
+         STORE_CI_PIXEL(pixel, index[i]);
+      }
+   }
+}
+
+
+static void
+NAME(write_monoindex_pixels)( const GLcontext *ctx,
+                              GLuint n, const GLint x[], const GLint y[],
+                              GLuint colorIndex, const GLubyte mask[] )
+{
+#ifdef SPAN_VARS
+   SPAN_VARS
+#endif
+   GLuint i;
+   ASSERT(mask);
+   for (i = 0; i < n; i++) {
+      if (mask[i]) {
+         INIT_PIXEL_PTR(pixel, x[i], y[i]);
+         STORE_CI_PIXEL(pixel, colorIndex);
+      }
+   }
+}
+
+
+static void
+NAME(read_index_span)( const GLcontext *ctx,
+                       GLuint n, GLint x, GLint y, GLuint index[] )
+{
+#ifdef SPAN_VARS
+   SPAN_VARS
+#endif
+   GLuint i;
+   INIT_PIXEL_PTR(pixel, x, y);
+   for (i = 0; i < n; i++) {
+      FETCH_CI_PIXEL(index[i], pixel);
+      INC_PIXEL_PTR(pixel);
+   }
+}
+
+
+static void
+NAME(read_index_pixels)( const GLcontext *ctx,
+                         GLuint n, const GLint x[], const GLint y[],
+                         GLuint index[], const GLubyte mask[] )
+{
+#ifdef SPAN_VARS
+   SPAN_VARS
+#endif
+   GLuint i;
+   ASSERT(mask);
+   for (i = 0; i < n; i++) {
+      if (mask[i] ) {
+         INIT_PIXEL_PTR(pixel, x[i], y[i]);
+         FETCH_CI_PIXEL(index[i], pixel);
+      }
+   }
+}
+
+#endif /* STORE_CI_PIXEL */
+
+
+
+#undef NAME
+#undef SPAN_VARS
+#undef INIT_PIXEL_PTR
+#undef INC_PIXEL_PTR
+#undef STORE_RGB_PIXEL
+#undef STORE_RGBA_PIXEL
+#undef FETCH_RGBA_PIXEL
+#undef STORE_CI_PIXEL
+#undef FETCH_CI_PIXEL
diff --git a/reactos/lib/mesa32/src/swrast/s_stencil.c b/reactos/lib/mesa32/src/swrast/s_stencil.c
new file mode 100644
index 00000000000..73bddc32fb8
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_stencil.c
@@ -0,0 +1,1326 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "context.h"
+#include "macros.h"
+#include "imports.h"
+
+#include "s_context.h"
+#include "s_depth.h"
+#include "s_stencil.h"
+
+
+
+/* Stencil Logic:
+
+IF stencil test fails THEN
+   Apply fail-op to stencil value
+   Don't write the pixel (RGBA,Z)
+ELSE
+   IF doing depth test && depth test fails THEN
+      Apply zfail-op to stencil value
+      Write RGBA and Z to appropriate buffers
+   ELSE
+      Apply zpass-op to stencil value
+ENDIF
+
+*/
+
+
+/*
+ * Return the address of a stencil buffer value given the window coords:
+ */
+#define STENCIL_ADDRESS(X,Y)  \
+       (ctx->DrawBuffer->Stencil + ctx->DrawBuffer->Width * (Y) + (X))
+
+
+
+/**
+ * Apply the given stencil operator to the array of stencil values.
+ * Don't touch stencil[i] if mask[i] is zero.
+ * Input:  n - size of stencil array
+ *         oper - the stencil buffer operator
+ *         face - 0 or 1 for front or back face operation
+ *         stencil - array of stencil values
+ *         mask - array [n] of flag:  1=apply operator, 0=don't apply operator
+ * Output:  stencil - modified values
+ */
+static void
+apply_stencil_op( const GLcontext *ctx, GLenum oper, GLuint face,
+                  GLuint n, GLstencil stencil[], const GLubyte mask[] )
+{
+   const GLstencil ref = ctx->Stencil.Ref[face];
+   const GLstencil wrtmask = ctx->Stencil.WriteMask[face];
+   const GLstencil invmask = (GLstencil) (~wrtmask);
+   GLuint i;
+
+   switch (oper) {
+      case GL_KEEP:
+         /* do nothing */
+         break;
+      case GL_ZERO:
+	 if (invmask==0) {
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  stencil[i] = 0;
+	       }
+	    }
+	 }
+	 else {
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  stencil[i] = (GLstencil) (stencil[i] & invmask);
+	       }
+	    }
+	 }
+	 break;
+      case GL_REPLACE:
+	 if (invmask==0) {
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+                  stencil[i] = ref;
+	       }
+	    }
+	 }
+	 else {
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  GLstencil s = stencil[i];
+		  stencil[i] = (GLstencil) ((invmask & s ) | (wrtmask & ref));
+	       }
+	    }
+	 }
+	 break;
+      case GL_INCR:
+	 if (invmask==0) {
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  GLstencil s = stencil[i];
+		  if (s < STENCIL_MAX) {
+		     stencil[i] = (GLstencil) (s+1);
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  /* VERIFY logic of adding 1 to a write-masked value */
+		  GLstencil s = stencil[i];
+		  if (s < STENCIL_MAX) {
+		     stencil[i] = (GLstencil) ((invmask & s) | (wrtmask & (s+1)));
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_DECR:
+	 if (invmask==0) {
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  GLstencil s = stencil[i];
+		  if (s>0) {
+		     stencil[i] = (GLstencil) (s-1);
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  /* VERIFY logic of subtracting 1 to a write-masked value */
+		  GLstencil s = stencil[i];
+		  if (s>0) {
+		     stencil[i] = (GLstencil) ((invmask & s) | (wrtmask & (s-1)));
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_INCR_WRAP_EXT:
+	 if (invmask==0) {
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+                  stencil[i]++;
+	       }
+	    }
+	 }
+	 else {
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+                  GLstencil s = stencil[i];
+                  stencil[i] = (GLstencil) ((invmask & s) | (wrtmask & (s+1)));
+	       }
+	    }
+	 }
+	 break;
+      case GL_DECR_WRAP_EXT:
+	 if (invmask==0) {
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  stencil[i]--;
+	       }
+	    }
+	 }
+	 else {
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+                  GLstencil s = stencil[i];
+                  stencil[i] = (GLstencil) ((invmask & s) | (wrtmask & (s-1)));
+	       }
+	    }
+	 }
+	 break;
+      case GL_INVERT:
+	 if (invmask==0) {
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  GLstencil s = stencil[i];
+		  stencil[i] = (GLstencil) ~s;
+	       }
+	    }
+	 }
+	 else {
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+		  GLstencil s = stencil[i];
+		  stencil[i] = (GLstencil) ((invmask & s) | (wrtmask & ~s));
+	       }
+	    }
+	 }
+	 break;
+      default:
+         _mesa_problem(ctx, "Bad stencil op in apply_stencil_op");
+   }
+}
+
+
+
+
+/**
+ * Apply stencil test to an array of stencil values (before depth buffering).
+ * Input:  face - 0 or 1 for front or back-face polygons
+ *         n - number of pixels in the array
+ *         stencil - array of [n] stencil values
+ *         mask - array [n] of flag:  0=skip the pixel, 1=stencil the pixel
+ * Output:  mask - pixels which fail the stencil test will have their
+ *                 mask flag set to 0.
+ *          stencil - updated stencil values (where the test passed)
+ * Return:  GL_FALSE = all pixels failed, GL_TRUE = zero or more pixels passed.
+ */
+static GLboolean
+do_stencil_test( GLcontext *ctx, GLuint face, GLuint n, GLstencil stencil[],
+                 GLubyte mask[] )
+{
+   GLubyte fail[MAX_WIDTH];
+   GLboolean allfail = GL_FALSE;
+   GLuint i;
+   GLstencil r, s;
+   const GLuint valueMask = ctx->Stencil.ValueMask[face];
+
+   ASSERT(n <= MAX_WIDTH);
+
+   /*
+    * Perform stencil test.  The results of this operation are stored
+    * in the fail[] array:
+    *   IF fail[i] is non-zero THEN
+    *       the stencil fail operator is to be applied
+    *   ELSE
+    *       the stencil fail operator is not to be applied
+    *   ENDIF
+    */
+   switch (ctx->Stencil.Function[face]) {
+      case GL_NEVER:
+         /* never pass; always fail */
+         for (i=0;i<n;i++) {
+	    if (mask[i]) {
+	       mask[i] = 0;
+	       fail[i] = 1;
+	    }
+	    else {
+	       fail[i] = 0;
+	    }
+	 }
+	 allfail = GL_TRUE;
+	 break;
+      case GL_LESS:
+	 r = (GLstencil) (ctx->Stencil.Ref[face] & valueMask);
+	 for (i=0;i<n;i++) {
+	    if (mask[i]) {
+	       s = (GLstencil) (stencil[i] & valueMask);
+	       if (r < s) {
+		  /* passed */
+		  fail[i] = 0;
+	       }
+	       else {
+		  fail[i] = 1;
+		  mask[i] = 0;
+	       }
+	    }
+	    else {
+	       fail[i] = 0;
+	    }
+	 }
+	 break;
+      case GL_LEQUAL:
+	 r = (GLstencil) (ctx->Stencil.Ref[face] & valueMask);
+	 for (i=0;i<n;i++) {
+	    if (mask[i]) {
+	       s = (GLstencil) (stencil[i] & valueMask);
+	       if (r <= s) {
+		  /* pass */
+		  fail[i] = 0;
+	       }
+	       else {
+		  fail[i] = 1;
+		  mask[i] = 0;
+	       }
+	    }
+	    else {
+	       fail[i] = 0;
+	    }
+	 }
+	 break;
+      case GL_GREATER:
+	 r = (GLstencil) (ctx->Stencil.Ref[face] & valueMask);
+	 for (i=0;i<n;i++) {
+	    if (mask[i]) {
+	       s = (GLstencil) (stencil[i] & valueMask);
+	       if (r > s) {
+		  /* passed */
+		  fail[i] = 0;
+	       }
+	       else {
+		  fail[i] = 1;
+		  mask[i] = 0;
+	       }
+	    }
+	    else {
+	       fail[i] = 0;
+	    }
+	 }
+	 break;
+      case GL_GEQUAL:
+	 r = (GLstencil) (ctx->Stencil.Ref[face] & valueMask);
+	 for (i=0;i<n;i++) {
+	    if (mask[i]) {
+	       s = (GLstencil) (stencil[i] & valueMask);
+	       if (r >= s) {
+		  /* passed */
+		  fail[i] = 0;
+	       }
+	       else {
+		  fail[i] = 1;
+		  mask[i] = 0;
+	       }
+	    }
+	    else {
+	       fail[i] = 0;
+	    }
+	 }
+	 break;
+      case GL_EQUAL:
+	 r = (GLstencil) (ctx->Stencil.Ref[face] & valueMask);
+	 for (i=0;i<n;i++) {
+	    if (mask[i]) {
+	       s = (GLstencil) (stencil[i] & valueMask);
+	       if (r == s) {
+		  /* passed */
+		  fail[i] = 0;
+	       }
+	       else {
+		  fail[i] = 1;
+		  mask[i] = 0;
+	       }
+	    }
+	    else {
+	       fail[i] = 0;
+	    }
+	 }
+	 break;
+      case GL_NOTEQUAL:
+	 r = (GLstencil) (ctx->Stencil.Ref[face] & valueMask);
+	 for (i=0;i<n;i++) {
+	    if (mask[i]) {
+	       s = (GLstencil) (stencil[i] & valueMask);
+	       if (r != s) {
+		  /* passed */
+		  fail[i] = 0;
+	       }
+	       else {
+		  fail[i] = 1;
+		  mask[i] = 0;
+	       }
+	    }
+	    else {
+	       fail[i] = 0;
+	    }
+	 }
+	 break;
+      case GL_ALWAYS:
+	 /* always pass */
+	 for (i=0;i<n;i++) {
+	    fail[i] = 0;
+	 }
+	 break;
+      default:
+         _mesa_problem(ctx, "Bad stencil func in gl_stencil_span");
+         return 0;
+   }
+
+   if (ctx->Stencil.FailFunc[face] != GL_KEEP) {
+      apply_stencil_op( ctx, ctx->Stencil.FailFunc[face], face, n, stencil, fail );
+   }
+
+   return !allfail;
+}
+
+
+
+/**
+ * Apply stencil and depth testing to the span of pixels.
+ * Both software and hardware stencil buffers are acceptable.
+ * Input:  n - number of pixels in the span
+ *         x, y - location of leftmost pixel in span
+ *         z - array [n] of z values
+ *         mask - array [n] of flags  (1=test this pixel, 0=skip the pixel)
+ * Output:  mask - array [n] of flags (1=stencil and depth test passed)
+ * Return: GL_FALSE - all fragments failed the testing
+ *         GL_TRUE - one or more fragments passed the testing
+ *
+ */
+static GLboolean
+stencil_and_ztest_span(GLcontext *ctx, struct sw_span *span, GLuint face)
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   GLstencil stencilRow[MAX_WIDTH];
+   GLstencil *stencil;
+   const GLuint n = span->end;
+   const GLint x = span->x;
+   const GLint y = span->y;
+   GLubyte *mask = span->array->mask;
+
+   ASSERT((span->arrayMask & SPAN_XY) == 0);
+   ASSERT(ctx->Stencil.Enabled);
+   ASSERT(n <= MAX_WIDTH);
+#ifdef DEBUG
+   if (ctx->Depth.Test) {
+      ASSERT(span->arrayMask & SPAN_Z);
+   }
+#endif
+   
+   /* Get initial stencil values */
+   if (swrast->Driver.WriteStencilSpan) {
+      /* Get stencil values from the hardware stencil buffer */
+      ASSERT(swrast->Driver.ReadStencilSpan);
+      (*swrast->Driver.ReadStencilSpan)(ctx, n, x, y, stencilRow);
+      stencil = stencilRow;
+   }
+   else {
+      /* Get pointer into software stencil buffer */
+      stencil = STENCIL_ADDRESS(x, y);
+   }
+   
+   /*
+    * Apply the stencil test to the fragments.
+    * failMask[i] is 1 if the stencil test failed.
+    */
+   if (do_stencil_test( ctx, face, n, stencil, mask ) == GL_FALSE) {
+      /* all fragments failed the stencil test, we're done. */
+      span->writeAll = GL_FALSE;
+      return GL_FALSE;
+   }
+
+   /*
+    * Some fragments passed the stencil test, apply depth test to them
+    * and apply Zpass and Zfail stencil ops.
+    */
+   if (ctx->Depth.Test == GL_FALSE) {
+      /*
+       * No depth buffer, just apply zpass stencil function to active pixels.
+       */
+      apply_stencil_op( ctx, ctx->Stencil.ZPassFunc[face], face, n, stencil, mask );
+   }
+   else {
+      /*
+       * Perform depth buffering, then apply zpass or zfail stencil function.
+       */
+      GLubyte passmask[MAX_WIDTH], failmask[MAX_WIDTH], oldmask[MAX_WIDTH];
+      GLuint i;
+
+      /* save the current mask bits */
+      MEMCPY(oldmask, mask, n * sizeof(GLubyte));
+
+      /* apply the depth test */
+      _swrast_depth_test_span(ctx, span);
+
+      /* Set the stencil pass/fail flags according to result of depth testing.
+       * if oldmask[i] == 0 then
+       *    Don't touch the stencil value
+       * else if oldmask[i] and newmask[i] then
+       *    Depth test passed
+       * else
+       *    assert(oldmask[i] && !newmask[i])
+       *    Depth test failed
+       * endif
+       */
+      for (i=0;i<n;i++) {
+         ASSERT(mask[i] == 0 || mask[i] == 1);
+         passmask[i] = oldmask[i] & mask[i];
+         failmask[i] = oldmask[i] & (mask[i] ^ 1);
+      }
+
+      /* apply the pass and fail operations */
+      if (ctx->Stencil.ZFailFunc[face] != GL_KEEP) {
+         apply_stencil_op( ctx, ctx->Stencil.ZFailFunc[face], face,
+                           n, stencil, failmask );
+      }
+      if (ctx->Stencil.ZPassFunc[face] != GL_KEEP) {
+         apply_stencil_op( ctx, ctx->Stencil.ZPassFunc[face], face,
+                           n, stencil, passmask );
+      }
+   }
+
+   /*
+    * Write updated stencil values back into hardware stencil buffer.
+    */
+   if (swrast->Driver.WriteStencilSpan) {
+      ASSERT(stencil == stencilRow);
+      (swrast->Driver.WriteStencilSpan)(ctx, n, x, y, stencil, mask );
+   }
+   
+   span->writeAll = GL_FALSE;
+   
+   return GL_TRUE;  /* one or more fragments passed both tests */
+}
+
+
+
+
+/**
+ * Apply the given stencil operator for each pixel in the array whose
+ * mask flag is set.
+ * \note  This is for software stencil buffers only.
+ * Input:  n - number of pixels in the span
+ *         x, y - array of [n] pixels
+ *         operator - the stencil buffer operator
+ *         mask - array [n] of flag:  1=apply operator, 0=don't apply operator
+ */
+static void
+apply_stencil_op_to_pixels( const GLcontext *ctx,
+                            GLuint n, const GLint x[], const GLint y[],
+                            GLenum oper, GLuint face, const GLubyte mask[] )
+{
+   const GLstencil ref = ctx->Stencil.Ref[face];
+   const GLstencil wrtmask = ctx->Stencil.WriteMask[face];
+   const GLstencil invmask = (GLstencil) (~wrtmask);
+   GLuint i;
+
+   ASSERT(!SWRAST_CONTEXT(ctx)->Driver.WriteStencilSpan);  /* software stencil buffer only! */
+
+   switch (oper) {
+      case GL_KEEP:
+         /* do nothing */
+         break;
+      case GL_ZERO:
+	 if (invmask==0) {
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );
+                  *sptr = 0;
+	       }
+	    }
+	 }
+	 else {
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );
+		  *sptr = (GLstencil) (invmask & *sptr);
+	       }
+	    }
+	 }
+	 break;
+      case GL_REPLACE:
+	 if (invmask==0) {
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );
+                  *sptr = ref;
+	       }
+	    }
+	 }
+	 else {
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );
+		  *sptr = (GLstencil) ((invmask & *sptr ) | (wrtmask & ref));
+	       }
+	    }
+	 }
+	 break;
+      case GL_INCR:
+	 if (invmask==0) {
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );
+		  if (*sptr < STENCIL_MAX) {
+		     *sptr = (GLstencil) (*sptr + 1);
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );
+		  if (*sptr < STENCIL_MAX) {
+		     *sptr = (GLstencil) ((invmask & *sptr) | (wrtmask & (*sptr+1)));
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_DECR:
+	 if (invmask==0) {
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );
+		  if (*sptr>0) {
+		     *sptr = (GLstencil) (*sptr - 1);
+		  }
+	       }
+	    }
+	 }
+	 else {
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );
+		  if (*sptr>0) {
+		     *sptr = (GLstencil) ((invmask & *sptr) | (wrtmask & (*sptr-1)));
+		  }
+	       }
+	    }
+	 }
+	 break;
+      case GL_INCR_WRAP_EXT:
+	 if (invmask==0) {
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );
+                  *sptr = (GLstencil) (*sptr + 1);
+	       }
+	    }
+	 }
+	 else {
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );
+                  *sptr = (GLstencil) ((invmask & *sptr) | (wrtmask & (*sptr+1)));
+	       }
+	    }
+	 }
+	 break;
+      case GL_DECR_WRAP_EXT:
+	 if (invmask==0) {
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );
+                  *sptr = (GLstencil) (*sptr - 1);
+	       }
+	    }
+	 }
+	 else {
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );
+                  *sptr = (GLstencil) ((invmask & *sptr) | (wrtmask & (*sptr-1)));
+	       }
+	    }
+	 }
+	 break;
+      case GL_INVERT:
+	 if (invmask==0) {
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );
+                  *sptr = (GLstencil) (~*sptr);
+	       }
+	    }
+	 }
+	 else {
+	    for (i=0;i<n;i++) {
+	       if (mask[i]) {
+                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );
+                  *sptr = (GLstencil) ((invmask & *sptr) | (wrtmask & ~*sptr));
+	       }
+	    }
+	 }
+	 break;
+      default:
+         _mesa_problem(ctx, "Bad stencilop in apply_stencil_op_to_pixels");
+   }
+}
+
+
+
+/**
+ * Apply stencil test to an array of pixels before depth buffering.
+ *
+ * \note Used for software stencil buffer only.
+ * Input:  n - number of pixels in the span
+ *         x, y - array of [n] pixels to stencil
+ *         mask - array [n] of flag:  0=skip the pixel, 1=stencil the pixel
+ * Output:  mask - pixels which fail the stencil test will have their
+ *                 mask flag set to 0.
+ * \return  GL_FALSE = all pixels failed, GL_TRUE = zero or more pixels passed.
+ */
+static GLboolean
+stencil_test_pixels( GLcontext *ctx, GLuint face, GLuint n,
+                     const GLint x[], const GLint y[], GLubyte mask[] )
+{
+   GLubyte fail[MAX_WIDTH];
+   GLstencil r, s;
+   GLuint i;
+   GLboolean allfail = GL_FALSE;
+   const GLuint valueMask = ctx->Stencil.ValueMask[face];
+
+  /* software stencil buffer only! */
+   ASSERT(ctx->DrawBuffer->UseSoftwareStencilBuffer);
+   ASSERT(!SWRAST_CONTEXT(ctx)->Driver.ReadStencilSpan);
+   ASSERT(!SWRAST_CONTEXT(ctx)->Driver.WriteStencilSpan);
+
+   /*
+    * Perform stencil test.  The results of this operation are stored
+    * in the fail[] array:
+    *   IF fail[i] is non-zero THEN
+    *       the stencil fail operator is to be applied
+    *   ELSE
+    *       the stencil fail operator is not to be applied
+    *   ENDIF
+    */
+
+   switch (ctx->Stencil.Function[face]) {
+      case GL_NEVER:
+         /* always fail */
+         for (i=0;i<n;i++) {
+	    if (mask[i]) {
+	       mask[i] = 0;
+	       fail[i] = 1;
+	    }
+	    else {
+	       fail[i] = 0;
+	    }
+	 }
+	 allfail = GL_TRUE;
+	 break;
+      case GL_LESS:
+	 r = (GLstencil) (ctx->Stencil.Ref[face] & valueMask);
+	 for (i=0;i<n;i++) {
+	    if (mask[i]) {
+               GLstencil *sptr = STENCIL_ADDRESS(x[i],y[i]);
+	       s = (GLstencil) (*sptr & valueMask);
+	       if (r < s) {
+		  /* passed */
+		  fail[i] = 0;
+	       }
+	       else {
+		  fail[i] = 1;
+		  mask[i] = 0;
+	       }
+	    }
+	    else {
+	       fail[i] = 0;
+	    }
+	 }
+	 break;
+      case GL_LEQUAL:
+	 r = (GLstencil) (ctx->Stencil.Ref[face] & valueMask);
+	 for (i=0;i<n;i++) {
+	    if (mask[i]) {
+               GLstencil *sptr = STENCIL_ADDRESS(x[i],y[i]);
+	       s = (GLstencil) (*sptr & valueMask);
+	       if (r <= s) {
+		  /* pass */
+		  fail[i] = 0;
+	       }
+	       else {
+		  fail[i] = 1;
+		  mask[i] = 0;
+	       }
+	    }
+	    else {
+	       fail[i] = 0;
+	    }
+	 }
+	 break;
+      case GL_GREATER:
+	 r = (GLstencil) (ctx->Stencil.Ref[face] & valueMask);
+	 for (i=0;i<n;i++) {
+	    if (mask[i]) {
+               GLstencil *sptr = STENCIL_ADDRESS(x[i],y[i]);
+	       s = (GLstencil) (*sptr & valueMask);
+	       if (r > s) {
+		  /* passed */
+		  fail[i] = 0;
+	       }
+	       else {
+		  fail[i] = 1;
+		  mask[i] = 0;
+	       }
+	    }
+	    else {
+	       fail[i] = 0;
+	    }
+	 }
+	 break;
+      case GL_GEQUAL:
+	 r = (GLstencil) (ctx->Stencil.Ref[face] & valueMask);
+	 for (i=0;i<n;i++) {
+	    if (mask[i]) {
+               GLstencil *sptr = STENCIL_ADDRESS(x[i],y[i]);
+	       s = (GLstencil) (*sptr & valueMask);
+	       if (r >= s) {
+		  /* passed */
+		  fail[i] = 0;
+	       }
+	       else {
+		  fail[i] = 1;
+		  mask[i] = 0;
+	       }
+	    }
+	    else {
+	       fail[i] = 0;
+	    }
+	 }
+	 break;
+      case GL_EQUAL:
+	 r = (GLstencil) (ctx->Stencil.Ref[face] & valueMask);
+	 for (i=0;i<n;i++) {
+	    if (mask[i]) {
+               GLstencil *sptr = STENCIL_ADDRESS(x[i],y[i]);
+	       s = (GLstencil) (*sptr & valueMask);
+	       if (r == s) {
+		  /* passed */
+		  fail[i] = 0;
+	       }
+	       else {
+		  fail[i] = 1;
+		  mask[i] = 0;
+	       }
+	    }
+	    else {
+	       fail[i] = 0;
+	    }
+	 }
+	 break;
+      case GL_NOTEQUAL:
+	 r = (GLstencil) (ctx->Stencil.Ref[face] & valueMask);
+	 for (i=0;i<n;i++) {
+	    if (mask[i]) {
+               GLstencil *sptr = STENCIL_ADDRESS(x[i],y[i]);
+	       s = (GLstencil) (*sptr & valueMask);
+	       if (r != s) {
+		  /* passed */
+		  fail[i] = 0;
+	       }
+	       else {
+		  fail[i] = 1;
+		  mask[i] = 0;
+	       }
+	    }
+	    else {
+	       fail[i] = 0;
+	    }
+	 }
+	 break;
+      case GL_ALWAYS:
+	 /* always pass */
+	 for (i=0;i<n;i++) {
+	    fail[i] = 0;
+	 }
+	 break;
+      default:
+         _mesa_problem(ctx, "Bad stencil func in gl_stencil_pixels");
+         return 0;
+   }
+
+   if (ctx->Stencil.FailFunc[face] != GL_KEEP) {
+      apply_stencil_op_to_pixels( ctx, n, x, y, ctx->Stencil.FailFunc[face],
+                                  face, fail );
+   }
+
+   return !allfail;
+}
+
+
+
+
+/**
+ * Apply stencil and depth testing to an array of pixels.
+ * This is used both for software and hardware stencil buffers.
+ *
+ * The comments in this function are a bit sparse but the code is
+ * almost identical to stencil_and_ztest_span(), which is well
+ * commented.
+ *
+ * Input:  n - number of pixels in the array
+ *         x, y - array of [n] pixel positions
+ *         z - array [n] of z values
+ *         mask - array [n] of flags  (1=test this pixel, 0=skip the pixel)
+ * Output: mask - array [n] of flags (1=stencil and depth test passed)
+ * Return: GL_FALSE - all fragments failed the testing
+ *         GL_TRUE - one or more fragments passed the testing
+ */
+static GLboolean
+stencil_and_ztest_pixels( GLcontext *ctx, struct sw_span *span, GLuint face )
+{
+   const GLuint n = span->end;
+   const GLint *x = span->array->x;
+   const GLint *y = span->array->y;
+   GLubyte *mask = span->array->mask;
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+
+   ASSERT(span->arrayMask & SPAN_XY);
+   ASSERT(ctx->Stencil.Enabled);
+   ASSERT(n <= MAX_WIDTH);
+
+   if (swrast->Driver.WriteStencilPixels) {
+      /*** Hardware stencil buffer ***/
+      GLstencil stencil[MAX_WIDTH];
+      GLubyte origMask[MAX_WIDTH];
+
+      ASSERT(!ctx->DrawBuffer->UseSoftwareStencilBuffer);
+      ASSERT(swrast->Driver.ReadStencilPixels);
+      (*swrast->Driver.ReadStencilPixels)(ctx, n, x, y, stencil);
+
+      MEMCPY(origMask, mask, n * sizeof(GLubyte));
+
+      (void) do_stencil_test(ctx, face, n, stencil, mask);
+
+      if (ctx->Depth.Test == GL_FALSE) {
+         apply_stencil_op(ctx, ctx->Stencil.ZPassFunc[face], face,
+                          n, stencil, mask);
+      }
+      else {
+         _swrast_depth_test_span(ctx, span);
+
+         if (ctx->Stencil.ZFailFunc[face] != GL_KEEP) {
+            GLubyte failmask[MAX_WIDTH];
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               ASSERT(mask[i] == 0 || mask[i] == 1);
+               failmask[i] = origMask[i] & (mask[i] ^ 1);
+            }
+            apply_stencil_op(ctx, ctx->Stencil.ZFailFunc[face], face,
+                             n, stencil, failmask);
+         }
+         if (ctx->Stencil.ZPassFunc[face] != GL_KEEP) {
+            GLubyte passmask[MAX_WIDTH];
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               ASSERT(mask[i] == 0 || mask[i] == 1);
+               passmask[i] = origMask[i] & mask[i];
+            }
+            apply_stencil_op(ctx, ctx->Stencil.ZPassFunc[face], face,
+                             n, stencil, passmask);
+         }
+      }
+
+      /* Write updated stencil values into hardware stencil buffer */
+      (swrast->Driver.WriteStencilPixels)(ctx, n, x, y, stencil, origMask);
+
+      return GL_TRUE;
+   }
+   else {
+      /*** Software stencil buffer ***/
+
+      ASSERT(ctx->DrawBuffer->UseSoftwareStencilBuffer);
+
+      if (stencil_test_pixels(ctx, face, n, x, y, mask) == GL_FALSE) {
+         /* all fragments failed the stencil test, we're done. */
+         return GL_FALSE;
+      }
+
+      if (ctx->Depth.Test==GL_FALSE) {
+         apply_stencil_op_to_pixels(ctx, n, x, y,
+                                    ctx->Stencil.ZPassFunc[face], face, mask);
+      }
+      else {
+         GLubyte passmask[MAX_WIDTH], failmask[MAX_WIDTH], oldmask[MAX_WIDTH];
+         GLuint i;
+
+         MEMCPY(oldmask, mask, n * sizeof(GLubyte));
+
+         _swrast_depth_test_span(ctx, span);
+
+         for (i=0;i<n;i++) {
+            ASSERT(mask[i] == 0 || mask[i] == 1);
+            passmask[i] = oldmask[i] & mask[i];
+            failmask[i] = oldmask[i] & (mask[i] ^ 1);
+         }
+
+         if (ctx->Stencil.ZFailFunc[face] != GL_KEEP) {
+            apply_stencil_op_to_pixels(ctx, n, x, y,
+                                       ctx->Stencil.ZFailFunc[face],
+                                       face, failmask);
+         }
+         if (ctx->Stencil.ZPassFunc[face] != GL_KEEP) {
+            apply_stencil_op_to_pixels(ctx, n, x, y,
+                                       ctx->Stencil.ZPassFunc[face],
+                                       face, passmask);
+         }
+      }
+
+      return GL_TRUE;  /* one or more fragments passed both tests */
+   }
+}
+
+
+/**
+ * /return GL_TRUE = one or more fragments passed,
+ * GL_FALSE = all fragments failed.
+ */
+GLboolean
+_swrast_stencil_and_ztest_span(GLcontext *ctx, struct sw_span *span)
+{
+   /* span->facing can only be non-zero if using two-sided stencil */
+   ASSERT(ctx->Stencil.TestTwoSide || span->facing == 0);
+   if (span->arrayMask & SPAN_XY)
+      return stencil_and_ztest_pixels(ctx, span, span->facing);
+   else
+      return stencil_and_ztest_span(ctx, span, span->facing);
+}
+
+
+/**
+ * Return a span of stencil values from the stencil buffer.
+ * Used for glRead/CopyPixels
+ * Input:  n - how many pixels
+ *         x,y - location of first pixel
+ * Output:  stencil - the array of stencil values
+ */
+void
+_swrast_read_stencil_span( GLcontext *ctx,
+                         GLint n, GLint x, GLint y, GLstencil stencil[] )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   const GLint bufWidth = (GLint) ctx->DrawBuffer->Width;
+   const GLint bufHeight = (GLint) ctx->DrawBuffer->Height;
+
+   if (y < 0 || y >= bufHeight || x + n <= 0 || x >= bufWidth) {
+      /* span is completely outside framebuffer */
+      return; /* undefined values OK */
+   }
+
+   if (x < 0) {
+      GLint dx = -x;
+      x = 0;
+      n -= dx;
+      stencil += dx;
+   }
+   if (x + n > bufWidth) {
+      GLint dx = x + n - bufWidth;
+      n -= dx;
+   }
+   if (n <= 0) {
+      return;
+   }
+
+
+   ASSERT(n >= 0);
+   if (swrast->Driver.ReadStencilSpan) {
+      (*swrast->Driver.ReadStencilSpan)( ctx, (GLuint) n, x, y, stencil );
+   }
+   else if (ctx->DrawBuffer->Stencil) {
+      const GLstencil *s = STENCIL_ADDRESS( x, y );
+#if STENCIL_BITS == 8
+      MEMCPY( stencil, s, n * sizeof(GLstencil) );
+#else
+      GLuint i;
+      for (i=0;i<n;i++)
+         stencil[i] = s[i];
+#endif
+   }
+}
+
+
+
+/**
+ * Write a span of stencil values to the stencil buffer.
+ * Used for glDraw/CopyPixels
+ * Input:  n - how many pixels
+ *         x, y - location of first pixel
+ *         stencil - the array of stencil values
+ */
+void
+_swrast_write_stencil_span( GLcontext *ctx, GLint n, GLint x, GLint y,
+                          const GLstencil stencil[] )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   const GLstencil *ssrc = stencil;
+   const GLint bufWidth = (GLint) ctx->DrawBuffer->Width;
+   const GLint bufHeight = (GLint) ctx->DrawBuffer->Height;
+
+   if (y < 0 || y >= bufHeight || x + n <= 0 || x >= bufWidth) {
+      /* span is completely outside framebuffer */
+      return; /* undefined values OK */
+   }
+
+   if (x < 0) {
+      GLint dx = -x;
+      x = 0;
+      n -= dx;
+      ssrc += dx;
+   }
+   if (x + n > bufWidth) {
+      GLint dx = x + n - bufWidth;
+      n -= dx;
+   }
+   if (n <= 0) {
+      return;
+   }
+
+   if (swrast->Driver.WriteStencilSpan) {
+      (*swrast->Driver.WriteStencilSpan)( ctx, n, x, y, ssrc, NULL );
+   }
+   else if (ctx->DrawBuffer->Stencil) {
+      GLstencil *s = STENCIL_ADDRESS( x, y );
+#if STENCIL_BITS == 8
+      MEMCPY( s, ssrc, n * sizeof(GLstencil) );
+#else
+      GLuint i;
+      for (i=0;i<n;i++)
+         s[i] = ssrc[i];
+#endif
+   }
+}
+
+
+
+/**
+ * Allocate a new stencil buffer.  If there's an old one it will be
+ * deallocated first.  The new stencil buffer will be uninitialized.
+ */
+void
+_swrast_alloc_stencil_buffer( GLframebuffer *buffer )
+{
+   /* deallocate current stencil buffer if present */
+   if (buffer->Stencil) {
+      MESA_PBUFFER_FREE(buffer->Stencil);
+      buffer->Stencil = NULL;
+   }
+
+   /* allocate new stencil buffer */
+   buffer->Stencil = (GLstencil *)
+      MESA_PBUFFER_ALLOC(buffer->Width * buffer->Height * sizeof(GLstencil));
+   if (!buffer->Stencil) {
+      /* out of memory */
+      _mesa_error( NULL, GL_OUT_OF_MEMORY, "_swrast_alloc_stencil_buffer" );
+   }
+}
+
+
+
+/**
+ * Clear the software (malloc'd) stencil buffer.
+ */
+static void
+clear_software_stencil_buffer( GLcontext *ctx )
+{
+   if (ctx->Visual.stencilBits==0 || !ctx->DrawBuffer->Stencil) {
+      /* no stencil buffer */
+      return;
+   }
+
+   if (ctx->Scissor.Enabled) {
+      /* clear scissor region only */
+      const GLint width = ctx->DrawBuffer->_Xmax - ctx->DrawBuffer->_Xmin;
+      if (ctx->Stencil.WriteMask[0] != STENCIL_MAX) {
+         /* must apply mask to the clear */
+         GLint y;
+         for (y = ctx->DrawBuffer->_Ymin; y < ctx->DrawBuffer->_Ymax; y++) {
+            const GLstencil mask = ctx->Stencil.WriteMask[0];
+            const GLstencil invMask = ~mask;
+            const GLstencil clearVal = (ctx->Stencil.Clear & mask);
+            GLstencil *stencil = STENCIL_ADDRESS( ctx->DrawBuffer->_Xmin, y );
+            GLint i;
+            for (i = 0; i < width; i++) {
+               stencil[i] = (stencil[i] & invMask) | clearVal;
+            }
+         }
+      }
+      else {
+         /* no masking */
+         GLint y;
+         for (y = ctx->DrawBuffer->_Ymin; y < ctx->DrawBuffer->_Ymax; y++) {
+            GLstencil *stencil = STENCIL_ADDRESS( ctx->DrawBuffer->_Xmin, y );
+#if STENCIL_BITS==8
+            MEMSET( stencil, ctx->Stencil.Clear, width * sizeof(GLstencil) );
+#else
+            GLint i;
+            for (i = 0; i < width; i++)
+               stencil[x] = ctx->Stencil.Clear;
+#endif
+         }
+      }
+   }
+   else {
+      /* clear whole stencil buffer */
+      if (ctx->Stencil.WriteMask[0] != STENCIL_MAX) {
+         /* must apply mask to the clear */
+         const GLuint n = ctx->DrawBuffer->Width * ctx->DrawBuffer->Height;
+         GLstencil *stencil = ctx->DrawBuffer->Stencil;
+         const GLstencil mask = ctx->Stencil.WriteMask[0];
+         const GLstencil invMask = ~mask;
+         const GLstencil clearVal = (ctx->Stencil.Clear & mask);
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            stencil[i] = (stencil[i] & invMask) | clearVal;
+         }
+      }
+      else {
+         /* clear whole buffer without masking */
+         const GLuint n = ctx->DrawBuffer->Width * ctx->DrawBuffer->Height;
+         GLstencil *stencil = ctx->DrawBuffer->Stencil;
+
+#if STENCIL_BITS==8
+         MEMSET(stencil, ctx->Stencil.Clear, n * sizeof(GLstencil) );
+#else
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            stencil[i] = ctx->Stencil.Clear;
+         }
+#endif
+      }
+   }
+}
+
+
+
+/**
+ * Clear the hardware (in graphics card) stencil buffer.
+ * This is done with the Driver.WriteStencilSpan() and Driver.ReadStencilSpan()
+ * functions.
+ * Actually, if there is a hardware stencil buffer it really should have
+ * been cleared in Driver.Clear()!  However, if the hardware does not
+ * support scissored clears or masked clears (i.e. glStencilMask) then
+ * we have to use the span-based functions.
+ */
+static void
+clear_hardware_stencil_buffer( GLcontext *ctx )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   ASSERT(swrast->Driver.WriteStencilSpan);
+   ASSERT(swrast->Driver.ReadStencilSpan);
+
+   if (ctx->Scissor.Enabled) {
+      /* clear scissor region only */
+      const GLint x = ctx->DrawBuffer->_Xmin;
+      const GLint width = ctx->DrawBuffer->_Xmax - ctx->DrawBuffer->_Xmin;
+      if (ctx->Stencil.WriteMask[0] != STENCIL_MAX) {
+         /* must apply mask to the clear */
+         GLint y;
+         for (y = ctx->DrawBuffer->_Ymin; y < ctx->DrawBuffer->_Ymax; y++) {
+            const GLstencil mask = ctx->Stencil.WriteMask[0];
+            const GLstencil invMask = ~mask;
+            const GLstencil clearVal = (ctx->Stencil.Clear & mask);
+            GLstencil stencil[MAX_WIDTH];
+            GLint i;
+            (*swrast->Driver.ReadStencilSpan)(ctx, width, x, y, stencil);
+            for (i = 0; i < width; i++) {
+               stencil[i] = (stencil[i] & invMask) | clearVal;
+            }
+            (*swrast->Driver.WriteStencilSpan)(ctx, width, x, y, stencil, NULL);
+         }
+      }
+      else {
+         /* no masking */
+         GLstencil stencil[MAX_WIDTH];
+         GLint y, i;
+         for (i = 0; i < width; i++) {
+            stencil[i] = ctx->Stencil.Clear;
+         }
+         for (y = ctx->DrawBuffer->_Ymin; y < ctx->DrawBuffer->_Ymax; y++) {
+            (*swrast->Driver.WriteStencilSpan)(ctx, width, x, y, stencil, NULL);
+         }
+      }
+   }
+   else {
+      /* clear whole stencil buffer */
+      if (ctx->Stencil.WriteMask[0] != STENCIL_MAX) {
+         /* must apply mask to the clear */
+         const GLstencil mask = ctx->Stencil.WriteMask[0];
+         const GLstencil invMask = ~mask;
+         const GLstencil clearVal = (ctx->Stencil.Clear & mask);
+         const GLint width = ctx->DrawBuffer->Width;
+         const GLint height = ctx->DrawBuffer->Height;
+         const GLint x = ctx->DrawBuffer->_Xmin;
+         GLint y;
+         for (y = 0; y < height; y++) {
+            GLstencil stencil[MAX_WIDTH];
+            GLint i;
+            (*swrast->Driver.ReadStencilSpan)(ctx, width, x, y, stencil);
+            for (i = 0; i < width; i++) {
+               stencil[i] = (stencil[i] & invMask) | clearVal;
+            }
+            (*swrast->Driver.WriteStencilSpan)(ctx, width, x, y, stencil, NULL);
+         }
+      }
+      else {
+         /* clear whole buffer without masking */
+         const GLint width = ctx->DrawBuffer->Width;
+         const GLint height = ctx->DrawBuffer->Height;
+         const GLint x = ctx->DrawBuffer->_Xmin;
+         GLstencil stencil[MAX_WIDTH];
+         GLint y, i;
+         for (i = 0; i < width; i++) {
+            stencil[i] = ctx->Stencil.Clear;
+         }
+         for (y = 0; y < height; y++) {
+            (*swrast->Driver.WriteStencilSpan)(ctx, width, x, y, stencil, NULL);
+         }
+      }
+   }
+}
+
+
+
+/**
+ * Clear the stencil buffer (hardware or software).
+ */
+void
+_swrast_clear_stencil_buffer( GLcontext *ctx )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   if (swrast->Driver.WriteStencilSpan) {
+      ASSERT(swrast->Driver.ReadStencilSpan);
+      clear_hardware_stencil_buffer(ctx);
+   }
+   else {
+      clear_software_stencil_buffer(ctx);
+   }
+}
diff --git a/reactos/lib/mesa32/src/swrast/s_stencil.h b/reactos/lib/mesa32/src/swrast/s_stencil.h
new file mode 100644
index 00000000000..655f1dc3cf8
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_stencil.h
@@ -0,0 +1,59 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef S_STENCIL_H
+#define S_STENCIL_H
+
+
+#include "mtypes.h"
+#include "swrast.h"
+
+
+
+extern GLboolean
+_swrast_stencil_and_ztest_span(GLcontext *ctx, struct sw_span *span);
+
+
+
+extern void
+_swrast_read_stencil_span( GLcontext *ctx, GLint n, GLint x, GLint y,
+                         GLstencil stencil[] );
+
+
+extern void
+_swrast_write_stencil_span( GLcontext *ctx, GLint n, GLint x, GLint y,
+                          const GLstencil stencil[] );
+
+
+extern void
+_swrast_alloc_stencil_buffer( GLframebuffer *buffer );
+
+
+extern void
+_swrast_clear_stencil_buffer( GLcontext *ctx );
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/swrast/s_texstore.c b/reactos/lib/mesa32/src/swrast/s_texstore.c
new file mode 100644
index 00000000000..edf75f61f5e
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_texstore.c
@@ -0,0 +1,429 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * Authors:
+ *   Brian Paul
+ */
+
+
+/*
+ * The functions in this file are mostly related to software texture fallbacks.
+ * This includes texture image transfer/packing and texel fetching.
+ * Hardware drivers will likely override most of this.
+ */
+
+
+
+#include "glheader.h"
+#include "imports.h"
+#include "colormac.h"
+#include "context.h"
+#include "convolve.h"
+#include "image.h"
+#include "macros.h"
+#include "texformat.h"
+#include "teximage.h"
+#include "texstore.h"
+
+#include "s_context.h"
+#include "s_depth.h"
+#include "s_span.h"
+
+/*
+ * Read an RGBA image from the frame buffer.
+ * This is used by glCopyTex[Sub]Image[12]D().
+ * Input:  ctx - the context
+ *         x, y - lower left corner
+ *         width, height - size of region to read
+ * Return: pointer to block of GL_RGBA, GLchan data.
+ */
+static GLchan *
+read_color_image( GLcontext *ctx, GLint x, GLint y,
+                  GLsizei width, GLsizei height )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   GLint stride, i;
+   GLchan *image, *dst;
+
+   image = (GLchan *) MALLOC(width * height * 4 * sizeof(GLchan));
+   if (!image)
+      return NULL;
+
+   /* Select buffer to read from */
+   _swrast_use_read_buffer(ctx);
+
+   RENDER_START(swrast,ctx);
+
+   dst = image;
+   stride = width * 4;
+   for (i = 0; i < height; i++) {
+      _swrast_read_rgba_span( ctx, ctx->ReadBuffer, width, x, y + i,
+                         (GLchan (*)[4]) dst );
+      dst += stride;
+   }
+
+   RENDER_FINISH(swrast,ctx);
+
+   /* Read from draw buffer (the default) */
+   _swrast_use_draw_buffer(ctx);
+
+   return image;
+}
+
+
+/*
+ * As above, but read data from depth buffer.
+ */
+static GLfloat *
+read_depth_image( GLcontext *ctx, GLint x, GLint y,
+                  GLsizei width, GLsizei height )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   GLfloat *image, *dst;
+   GLint i;
+
+   image = (GLfloat *) MALLOC(width * height * sizeof(GLfloat));
+   if (!image)
+      return NULL;
+
+   RENDER_START(swrast,ctx);
+
+   dst = image;
+   for (i = 0; i < height; i++) {
+      _swrast_read_depth_span_float(ctx, width, x, y + i, dst);
+      dst += width;
+   }
+
+   RENDER_FINISH(swrast,ctx);
+
+   return image;
+}
+
+
+
+static GLboolean
+is_depth_format(GLenum format)
+{
+   switch (format) {
+      case GL_DEPTH_COMPONENT:
+      case GL_DEPTH_COMPONENT16_SGIX:
+      case GL_DEPTH_COMPONENT24_SGIX:
+      case GL_DEPTH_COMPONENT32_SGIX:
+         return GL_TRUE;
+      default:
+         return GL_FALSE;
+   }
+}
+
+
+/*
+ * Fallback for Driver.CopyTexImage1D().
+ */
+void
+_swrast_copy_teximage1d( GLcontext *ctx, GLenum target, GLint level,
+                         GLenum internalFormat,
+                         GLint x, GLint y, GLsizei width, GLint border )
+{
+   struct gl_texture_unit *texUnit;
+   struct gl_texture_object *texObj;
+   struct gl_texture_image *texImage;
+
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texObj = _mesa_select_tex_object(ctx, texUnit, target);
+   ASSERT(texObj);
+   texImage = _mesa_select_tex_image(ctx, texUnit, target, level);
+   ASSERT(texImage);
+
+   ASSERT(ctx->Driver.TexImage1D);
+
+   if (is_depth_format(internalFormat)) {
+      /* read depth image from framebuffer */
+      GLfloat *image = read_depth_image(ctx, x, y, width, 1);
+      if (!image) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyTexImage1D");
+         return;
+      }
+
+      /* call glTexImage1D to redefine the texture */
+      (*ctx->Driver.TexImage1D)(ctx, target, level, internalFormat,
+                                width, border,
+                                GL_DEPTH_COMPONENT, GL_FLOAT, image,
+                                &_mesa_native_packing, texObj, texImage);
+      FREE(image);
+   }
+   else {
+      /* read RGBA image from framebuffer */
+      GLchan *image = read_color_image(ctx, x, y, width, 1);
+      if (!image) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyTexImage1D");
+         return;
+      }
+
+      /* call glTexImage1D to redefine the texture */
+      (*ctx->Driver.TexImage1D)(ctx, target, level, internalFormat,
+                                width, border,
+                                GL_RGBA, CHAN_TYPE, image,
+                                &_mesa_native_packing, texObj, texImage);
+      FREE(image);
+   }
+
+   /* GL_SGIS_generate_mipmap */
+   if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
+      _mesa_generate_mipmap(ctx, target, texUnit, texObj);
+   }
+}
+
+
+/*
+ * Fallback for Driver.CopyTexImage2D().
+ */
+void
+_swrast_copy_teximage2d( GLcontext *ctx, GLenum target, GLint level,
+                         GLenum internalFormat,
+                         GLint x, GLint y, GLsizei width, GLsizei height,
+                         GLint border )
+{
+   struct gl_texture_unit *texUnit;
+   struct gl_texture_object *texObj;
+   struct gl_texture_image *texImage;
+
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texObj = _mesa_select_tex_object(ctx, texUnit, target);
+   ASSERT(texObj);
+   texImage = _mesa_select_tex_image(ctx, texUnit, target, level);
+   ASSERT(texImage);
+
+   ASSERT(ctx->Driver.TexImage2D);
+
+   if (is_depth_format(internalFormat)) {
+      /* read depth image from framebuffer */
+      GLfloat *image = read_depth_image(ctx, x, y, width, height);
+      if (!image) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyTexImage2D");
+         return;
+      }
+
+      /* call glTexImage2D to redefine the texture */
+      (*ctx->Driver.TexImage2D)(ctx, target, level, internalFormat,
+                                width, height, border,
+                                GL_DEPTH_COMPONENT, GL_FLOAT, image,
+                                &_mesa_native_packing, texObj, texImage);
+      FREE(image);
+   }
+   else {
+      /* read RGBA image from framebuffer */
+      GLchan *image = read_color_image(ctx, x, y, width, height);
+      if (!image) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyTexImage2D");
+         return;
+      }
+
+      /* call glTexImage2D to redefine the texture */
+      (*ctx->Driver.TexImage2D)(ctx, target, level, internalFormat,
+                                width, height, border,
+                                GL_RGBA, CHAN_TYPE, image,
+                                &_mesa_native_packing, texObj, texImage);
+      FREE(image);
+   }
+
+   /* GL_SGIS_generate_mipmap */
+   if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
+      _mesa_generate_mipmap(ctx, target, texUnit, texObj);
+   }
+}
+
+
+/*
+ * Fallback for Driver.CopyTexSubImage1D().
+ */
+void
+_swrast_copy_texsubimage1d( GLcontext *ctx, GLenum target, GLint level,
+                            GLint xoffset, GLint x, GLint y, GLsizei width )
+{
+   struct gl_texture_unit *texUnit;
+   struct gl_texture_object *texObj;
+   struct gl_texture_image *texImage;
+
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texObj = _mesa_select_tex_object(ctx, texUnit, target);
+   ASSERT(texObj);
+   texImage = _mesa_select_tex_image(ctx, texUnit, target, level);
+   ASSERT(texImage);
+
+   ASSERT(ctx->Driver.TexImage1D);
+
+   if (texImage->Format == GL_DEPTH_COMPONENT) {
+      /* read depth image from framebuffer */
+      GLfloat *image = read_depth_image(ctx, x, y, width, 1);
+      if (!image) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyTexSubImage1D");
+         return;
+      }
+
+      /* call glTexSubImage1D to redefine the texture */
+      (*ctx->Driver.TexSubImage1D)(ctx, target, level, xoffset, width,
+                                   GL_DEPTH_COMPONENT, GL_FLOAT, image,
+                                   &_mesa_native_packing, texObj, texImage);
+      FREE(image);
+   }
+   else {
+      /* read RGBA image from framebuffer */
+      GLchan *image = read_color_image(ctx, x, y, width, 1);
+      if (!image) {
+         _mesa_error( ctx, GL_OUT_OF_MEMORY, "glCopyTexSubImage1D" );
+         return;
+      }
+
+      /* now call glTexSubImage1D to do the real work */
+      (*ctx->Driver.TexSubImage1D)(ctx, target, level, xoffset, width,
+                                   GL_RGBA, CHAN_TYPE, image,
+                                   &_mesa_native_packing, texObj, texImage);
+      FREE(image);
+   }
+
+   /* GL_SGIS_generate_mipmap */
+   if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
+      _mesa_generate_mipmap(ctx, target, texUnit, texObj);
+   }
+}
+
+
+/*
+ * Fallback for Driver.CopyTexSubImage2D().
+ */
+void
+_swrast_copy_texsubimage2d( GLcontext *ctx,
+                            GLenum target, GLint level,
+                            GLint xoffset, GLint yoffset,
+                            GLint x, GLint y, GLsizei width, GLsizei height )
+{
+   struct gl_texture_unit *texUnit;
+   struct gl_texture_object *texObj;
+   struct gl_texture_image *texImage;
+
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texObj = _mesa_select_tex_object(ctx, texUnit, target);
+   ASSERT(texObj);
+   texImage = _mesa_select_tex_image(ctx, texUnit, target, level);
+   ASSERT(texImage);
+
+   ASSERT(ctx->Driver.TexImage2D);
+
+   if (texImage->Format == GL_DEPTH_COMPONENT) {
+      /* read depth image from framebuffer */
+      GLfloat *image = read_depth_image(ctx, x, y, width, height);
+      if (!image) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyTexSubImage2D");
+         return;
+      }
+
+      /* call glTexImage1D to redefine the texture */
+      (*ctx->Driver.TexSubImage2D)(ctx, target, level,
+                                   xoffset, yoffset, width, height,
+                                   GL_DEPTH_COMPONENT, GL_FLOAT, image,
+                                   &_mesa_native_packing, texObj, texImage);
+      FREE(image);
+   }
+   else {
+      /* read RGBA image from framebuffer */
+      GLchan *image = read_color_image(ctx, x, y, width, height);
+      if (!image) {
+         _mesa_error( ctx, GL_OUT_OF_MEMORY, "glCopyTexSubImage2D" );
+         return;
+      }
+
+      /* now call glTexSubImage2D to do the real work */
+      (*ctx->Driver.TexSubImage2D)(ctx, target, level,
+                                   xoffset, yoffset, width, height,
+                                   GL_RGBA, CHAN_TYPE, image,
+                                   &_mesa_native_packing, texObj, texImage);
+      FREE(image);
+   }
+
+   /* GL_SGIS_generate_mipmap */
+   if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
+      _mesa_generate_mipmap(ctx, target, texUnit, texObj);
+   }
+}
+
+
+/*
+ * Fallback for Driver.CopyTexSubImage3D().
+ */
+void
+_swrast_copy_texsubimage3d( GLcontext *ctx,
+                            GLenum target, GLint level,
+                            GLint xoffset, GLint yoffset, GLint zoffset,
+                            GLint x, GLint y, GLsizei width, GLsizei height )
+{
+   struct gl_texture_unit *texUnit;
+   struct gl_texture_object *texObj;
+   struct gl_texture_image *texImage;
+
+   texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
+   texObj = _mesa_select_tex_object(ctx, texUnit, target);
+   ASSERT(texObj);
+   texImage = _mesa_select_tex_image(ctx, texUnit, target, level);
+   ASSERT(texImage);
+
+   ASSERT(ctx->Driver.TexImage3D);
+
+   if (texImage->Format == GL_DEPTH_COMPONENT) {
+      /* read depth image from framebuffer */
+      GLfloat *image = read_depth_image(ctx, x, y, width, height);
+      if (!image) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyTexSubImage3D");
+         return;
+      }
+
+      /* call glTexImage1D to redefine the texture */
+      (*ctx->Driver.TexSubImage3D)(ctx, target, level,
+                                   xoffset, yoffset, zoffset, width, height, 1,
+                                   GL_DEPTH_COMPONENT, GL_FLOAT, image,
+                                   &_mesa_native_packing, texObj, texImage);
+      FREE(image);
+   }
+   else {
+      /* read RGBA image from framebuffer */
+      GLchan *image = read_color_image(ctx, x, y, width, height);
+      if (!image) {
+         _mesa_error( ctx, GL_OUT_OF_MEMORY, "glCopyTexSubImage3D" );
+         return;
+      }
+
+      /* now call glTexSubImage3D to do the real work */
+      (*ctx->Driver.TexSubImage3D)(ctx, target, level,
+                                   xoffset, yoffset, zoffset, width, height, 1,
+                                   GL_RGBA, CHAN_TYPE, image,
+                                   &_mesa_native_packing, texObj, texImage);
+      FREE(image);
+   }
+
+   /* GL_SGIS_generate_mipmap */
+   if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
+      _mesa_generate_mipmap(ctx, target, texUnit, texObj);
+   }
+}
diff --git a/reactos/lib/mesa32/src/swrast/s_texture.c b/reactos/lib/mesa32/src/swrast/s_texture.c
new file mode 100644
index 00000000000..2342179a4e6
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_texture.c
@@ -0,0 +1,4292 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "context.h"
+#include "colormac.h"
+#include "macros.h"
+#include "imports.h"
+#include "texformat.h"
+#include "teximage.h"
+
+#include "s_context.h"
+#include "s_texture.h"
+
+
+/*
+ * These values are used in the fixed-point arithmetic used
+ * for linear filtering.
+ */
+#define WEIGHT_SCALE 65536.0F
+#define WEIGHT_SHIFT 16
+
+
+/*
+ * Compute the remainder of a divided by b, but be careful with
+ * negative values so that GL_REPEAT mode works right.
+ */
+static INLINE GLint
+repeat_remainder(GLint a, GLint b)
+{
+   if (a >= 0)
+      return a % b;
+   else
+      return (a + 1) % b + b - 1;
+}
+
+
+/*
+ * Used to compute texel locations for linear sampling.
+ * Input:
+ *    wrapMode = GL_REPEAT, GL_CLAMP, GL_CLAMP_TO_EDGE, GL_CLAMP_TO_BORDER
+ *    S = texcoord in [0,1]
+ *    SIZE = width (or height or depth) of texture
+ * Output:
+ *    U = texcoord in [0, width]
+ *    I0, I1 = two nearest texel indexes
+ */
+#define COMPUTE_LINEAR_TEXEL_LOCATIONS(wrapMode, S, U, SIZE, I0, I1)	\
+{									\
+   if (wrapMode == GL_REPEAT) {						\
+      U = S * SIZE - 0.5F;						\
+      if (tObj->_IsPowerOfTwo) {					\
+         I0 = IFLOOR(U) & (SIZE - 1);					\
+         I1 = (I0 + 1) & (SIZE - 1);					\
+      }									\
+      else {								\
+         I0 = repeat_remainder(IFLOOR(U), SIZE);			\
+         I1 = repeat_remainder(I0 + 1, SIZE);				\
+      }									\
+   }									\
+   else if (wrapMode == GL_CLAMP_TO_EDGE) {				\
+      if (S <= 0.0F)							\
+         U = 0.0F;							\
+      else if (S >= 1.0F)						\
+         U = (GLfloat) SIZE;						\
+      else								\
+         U = S * SIZE;							\
+      U -= 0.5F;							\
+      I0 = IFLOOR(U);							\
+      I1 = I0 + 1;							\
+      if (I0 < 0)							\
+         I0 = 0;							\
+      if (I1 >= (GLint) SIZE)						\
+         I1 = SIZE - 1;							\
+   }									\
+   else if (wrapMode == GL_CLAMP_TO_BORDER) {				\
+      const GLfloat min = -1.0F / (2.0F * SIZE);			\
+      const GLfloat max = 1.0F - min;					\
+      if (S <= min)							\
+         U = min * SIZE;						\
+      else if (S >= max)						\
+         U = max * SIZE;						\
+      else								\
+         U = S * SIZE;							\
+      U -= 0.5F;							\
+      I0 = IFLOOR(U);							\
+      I1 = I0 + 1;							\
+   }									\
+   else if (wrapMode == GL_MIRRORED_REPEAT) {				\
+      const GLint flr = IFLOOR(S);					\
+      if (flr & 1)							\
+         U = 1.0F - (S - (GLfloat) flr);	/* flr is odd */	\
+      else								\
+         U = S - (GLfloat) flr;		/* flr is even */		\
+      U = (U * SIZE) - 0.5F;						\
+      I0 = IFLOOR(U);							\
+      I1 = I0 + 1;							\
+      if (I0 < 0)							\
+         I0 = 0;							\
+      if (I1 >= (GLint) SIZE)						\
+         I1 = SIZE - 1;							\
+   }									\
+   else if (wrapMode == GL_MIRROR_CLAMP_EXT) {				\
+      U = (GLfloat) fabs(S);						\
+      if (U >= 1.0F)							\
+         U = (GLfloat) SIZE;						\
+      else								\
+         U *= SIZE;							\
+      U -= 0.5F;							\
+      I0 = IFLOOR(U);							\
+      I1 = I0 + 1;							\
+   }									\
+   else if (wrapMode == GL_MIRROR_CLAMP_TO_EDGE_EXT) {			\
+      U = (GLfloat) fabs(S);						\
+      if (U >= 1.0F)							\
+         U = (GLfloat) SIZE;						\
+      else								\
+         U *= SIZE;							\
+      U -= 0.5F;							\
+      I0 = IFLOOR(U);							\
+      I1 = I0 + 1;							\
+      if (I0 < 0)							\
+         I0 = 0;							\
+      if (I1 >= (GLint) SIZE)						\
+         I1 = SIZE - 1;							\
+   }									\
+   else if (wrapMode == GL_MIRROR_CLAMP_TO_BORDER_EXT) {		\
+      const GLfloat min = -1.0F / (2.0F * SIZE);			\
+      const GLfloat max = 1.0F - min;					\
+      U = (GLfloat) fabs(S);						\
+      if (U <= min)							\
+         U = min * SIZE;						\
+      else if (U >= max)						\
+         U = max * SIZE;						\
+      else								\
+         U *= SIZE;							\
+      U -= 0.5F;							\
+      I0 = IFLOOR(U);							\
+      I1 = I0 + 1;							\
+   }									\
+   else {								\
+      ASSERT(wrapMode == GL_CLAMP);					\
+      if (S <= 0.0F)							\
+         U = 0.0F;							\
+      else if (S >= 1.0F)						\
+         U = (GLfloat) SIZE;						\
+      else								\
+         U = S * SIZE;							\
+      U -= 0.5F;							\
+      I0 = IFLOOR(U);							\
+      I1 = I0 + 1;							\
+   }									\
+}
+
+
+/*
+ * Used to compute texel location for nearest sampling.
+ */
+#define COMPUTE_NEAREST_TEXEL_LOCATION(wrapMode, S, SIZE, I)		\
+{									\
+   if (wrapMode == GL_REPEAT) {						\
+      /* s limited to [0,1) */						\
+      /* i limited to [0,size-1] */					\
+      I = IFLOOR(S * SIZE);						\
+      if (tObj->_IsPowerOfTwo)						\
+         I &= (SIZE - 1);						\
+      else								\
+         I = repeat_remainder(I, SIZE);					\
+   }									\
+   else if (wrapMode == GL_CLAMP_TO_EDGE) {				\
+      /* s limited to [min,max] */					\
+      /* i limited to [0, size-1] */					\
+      const GLfloat min = 1.0F / (2.0F * SIZE);				\
+      const GLfloat max = 1.0F - min;					\
+      if (S < min)							\
+         I = 0;								\
+      else if (S > max)							\
+         I = SIZE - 1;							\
+      else								\
+         I = IFLOOR(S * SIZE);						\
+   }									\
+   else if (wrapMode == GL_CLAMP_TO_BORDER) {				\
+      /* s limited to [min,max] */					\
+      /* i limited to [-1, size] */					\
+      const GLfloat min = -1.0F / (2.0F * SIZE);			\
+      const GLfloat max = 1.0F - min;					\
+      if (S <= min)							\
+         I = -1;							\
+      else if (S >= max)						\
+         I = SIZE;							\
+      else								\
+         I = IFLOOR(S * SIZE);						\
+   }									\
+   else if (wrapMode == GL_MIRRORED_REPEAT) {				\
+      const GLfloat min = 1.0F / (2.0F * SIZE);				\
+      const GLfloat max = 1.0F - min;					\
+      const GLint flr = IFLOOR(S);					\
+      GLfloat u;							\
+      if (flr & 1)							\
+         u = 1.0F - (S - (GLfloat) flr);	/* flr is odd */	\
+      else								\
+         u = S - (GLfloat) flr;		/* flr is even */		\
+      if (u < min)							\
+         I = 0;								\
+      else if (u > max)							\
+         I = SIZE - 1;							\
+      else								\
+         I = IFLOOR(u * SIZE);						\
+   }									\
+   else if (wrapMode == GL_MIRROR_CLAMP_EXT) {				\
+      /* s limited to [0,1] */						\
+      /* i limited to [0,size-1] */					\
+      const GLfloat u = (GLfloat) fabs(S);				\
+      if (u <= 0.0F)							\
+         I = 0;								\
+      else if (u >= 1.0F)						\
+         I = SIZE - 1;							\
+      else								\
+         I = IFLOOR(u * SIZE);						\
+   }									\
+   else if (wrapMode == GL_MIRROR_CLAMP_TO_EDGE_EXT) {			\
+      /* s limited to [min,max] */					\
+      /* i limited to [0, size-1] */					\
+      const GLfloat min = 1.0F / (2.0F * SIZE);				\
+      const GLfloat max = 1.0F - min;					\
+      const GLfloat u = (GLfloat) fabs(S);				\
+      if (u < min)							\
+         I = 0;								\
+      else if (u > max)							\
+         I = SIZE - 1;							\
+      else								\
+         I = IFLOOR(u * SIZE);						\
+   }									\
+   else if (wrapMode == GL_MIRROR_CLAMP_TO_BORDER_EXT) {		\
+      /* s limited to [min,max] */					\
+      /* i limited to [0, size-1] */					\
+      const GLfloat min = -1.0F / (2.0F * SIZE);			\
+      const GLfloat max = 1.0F - min;					\
+      const GLfloat u = (GLfloat) fabs(S);				\
+      if (u < min)							\
+         I = -1;							\
+      else if (u > max)							\
+         I = SIZE;							\
+      else								\
+         I = IFLOOR(u * SIZE);						\
+   }									\
+   else {								\
+      ASSERT(wrapMode == GL_CLAMP);					\
+      /* s limited to [0,1] */						\
+      /* i limited to [0,size-1] */					\
+      if (S <= 0.0F)							\
+         I = 0;								\
+      else if (S >= 1.0F)						\
+         I = SIZE - 1;							\
+      else								\
+         I = IFLOOR(S * SIZE);						\
+   }									\
+}
+
+
+/* Power of two image sizes only */
+#define COMPUTE_LINEAR_REPEAT_TEXEL_LOCATION(S, U, SIZE, I0, I1)	\
+{									\
+   U = S * SIZE - 0.5F;							\
+   I0 = IFLOOR(U) & (SIZE - 1);						\
+   I1 = (I0 + 1) & (SIZE - 1);						\
+}
+
+
+/*
+ * Compute linear mipmap levels for given lambda.
+ */
+#define COMPUTE_LINEAR_MIPMAP_LEVEL(tObj, lambda, level)	\
+{								\
+   if (lambda < 0.0F)						\
+      level = tObj->BaseLevel;					\
+   else if (lambda > tObj->_MaxLambda)				\
+      level = (GLint) (tObj->BaseLevel + tObj->_MaxLambda);	\
+   else								\
+      level = (GLint) (tObj->BaseLevel + lambda);		\
+}
+
+
+/*
+ * Compute nearest mipmap level for given lambda.
+ */
+#define COMPUTE_NEAREST_MIPMAP_LEVEL(tObj, lambda, level)	\
+{								\
+   GLfloat l;							\
+   if (lambda <= 0.5F)						\
+      l = 0.0F;							\
+   else if (lambda > tObj->_MaxLambda + 0.4999F)		\
+      l = tObj->_MaxLambda + 0.4999F;				\
+   else								\
+      l = lambda;						\
+   level = (GLint) (tObj->BaseLevel + l + 0.5F);		\
+   if (level > tObj->_MaxLevel)					\
+      level = tObj->_MaxLevel;					\
+}
+
+
+
+/*
+ * Note, the FRAC macro has to work perfectly.  Otherwise you'll sometimes
+ * see 1-pixel bands of improperly weighted linear-sampled texels.  The
+ * tests/texwrap.c demo is a good test.
+ * Also note, FRAC(x) doesn't truly return the fractional part of x for x < 0.
+ * Instead, if x < 0 then FRAC(x) = 1 - true_frac(x).
+ */
+#define FRAC(f)  ((f) - IFLOOR(f))
+
+
+
+/*
+ * Bitflags for texture border color sampling.
+ */
+#define I0BIT   1
+#define I1BIT   2
+#define J0BIT   4
+#define J1BIT   8
+#define K0BIT  16
+#define K1BIT  32
+
+
+/*
+ * Do the lookup for GL_SGI_texture_color_table.
+ */
+void
+_swrast_texture_table_lookup(const struct gl_color_table *table,
+                             GLuint n, GLchan rgba[][4])
+{
+   if (!table->Table || table->Size == 0)
+      return;
+
+   switch (table->Format) {
+      case GL_INTENSITY:
+         /* replace RGBA with I */
+         if (table->FloatTable) {
+            const GLfloat scale = (GLfloat) (table->Size - 1) / CHAN_MAXF;
+            const GLfloat *lut = (const GLfloat *) table->Table;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               GLint j = IROUND((GLfloat) rgba[i][RCOMP] * scale);
+               GLchan c;
+               CLAMPED_FLOAT_TO_CHAN(c, lut[j]);
+               rgba[i][RCOMP] = rgba[i][GCOMP] =
+                  rgba[i][BCOMP] = rgba[i][ACOMP] = c;
+            }
+         }
+         else {
+#if CHAN_TYPE == GL_UNSIGNED_BYTE
+            if (table->Size == 256) {
+               /* common case */
+               const GLchan *lut = (const GLchan *) table->Table;
+               GLuint i;
+               for (i = 0; i < n; i++) {
+                  const GLchan c = lut[rgba[i][RCOMP]];
+                  rgba[i][RCOMP] = rgba[i][GCOMP] =
+                     rgba[i][BCOMP] = rgba[i][ACOMP] = c;
+               }
+            }
+            else
+#endif
+            {
+               const GLfloat scale = (GLfloat) (table->Size - 1) / CHAN_MAXF;
+               const GLchan *lut = (const GLchan *) table->Table;
+               GLuint i;
+               for (i = 0; i < n; i++) {
+                  GLint j = IROUND((GLfloat) rgba[i][RCOMP] * scale);
+                  rgba[i][RCOMP] = rgba[i][GCOMP] =
+                     rgba[i][BCOMP] = rgba[i][ACOMP] = lut[j];
+               }
+            }
+         }
+         break;
+      case GL_LUMINANCE:
+         /* replace RGB with L */
+         if (table->FloatTable) {
+            const GLfloat scale = (GLfloat) (table->Size - 1) / CHAN_MAXF;
+            const GLfloat *lut = (const GLfloat *) table->Table;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               GLint j = IROUND((GLfloat) rgba[i][RCOMP] * scale);
+               GLchan c;
+               CLAMPED_FLOAT_TO_CHAN(c, lut[j]);
+               rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = c;
+            }
+         }
+         else {
+#if CHAN_TYPE == GL_UNSIGNED_BYTE
+            if (table->Size == 256) {
+               /* common case */
+               const GLchan *lut = (const GLchan *) table->Table;
+               GLuint i;
+               for (i = 0; i < n; i++) {
+                  const GLchan c = lut[rgba[i][RCOMP]];
+                  rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = c;
+               }
+            }
+            else
+#endif
+            {
+               const GLfloat scale = (GLfloat) (table->Size - 1) / CHAN_MAXF;
+               const GLchan *lut = (const GLchan *) table->Table;
+               GLuint i;
+               for (i = 0; i < n; i++) {
+                  GLint j = IROUND((GLfloat) rgba[i][RCOMP] * scale);
+                  rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = lut[j];
+               }
+            }
+         }
+         break;
+      case GL_ALPHA:
+         /* replace A with A */
+         if (table->FloatTable) {
+            const GLfloat scale = (GLfloat) (table->Size - 1) / CHAN_MAXF;
+            const GLfloat *lut = (const GLfloat *) table->Table;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               GLint j = IROUND((GLfloat) rgba[i][ACOMP] * scale);
+               GLchan c;
+               CLAMPED_FLOAT_TO_CHAN(c, lut[j]);
+               rgba[i][ACOMP] = c;
+            }
+         }
+         else {
+#if CHAN_TYPE == GL_UNSIGNED_BYTE
+            if (table->Size == 256) {
+               /* common case */
+               const GLchan *lut = (const GLchan *) table->Table;
+               GLuint i;
+               for (i = 0; i < n; i++) {
+                  rgba[i][ACOMP] = lut[rgba[i][ACOMP]];
+               }
+            }
+            else
+#endif
+            {
+               const GLfloat scale = (GLfloat) (table->Size - 1) / CHAN_MAXF;
+               const GLchan *lut = (const GLchan *) table->Table;
+               GLuint i;
+               for (i = 0; i < n; i++) {
+                  GLint j = IROUND((GLfloat) rgba[i][ACOMP] * scale);
+                  rgba[i][ACOMP] = lut[j];
+               }
+            }
+         }
+         break;
+      case GL_LUMINANCE_ALPHA:
+         /* replace RGBA with LLLA */
+         if (table->FloatTable) {
+            const GLfloat scale = (GLfloat) (table->Size - 1) / CHAN_MAXF;
+            const GLfloat *lut = (const GLfloat *) table->Table;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               GLint jL = IROUND((GLfloat) rgba[i][RCOMP] * scale);
+               GLint jA = IROUND((GLfloat) rgba[i][ACOMP] * scale);
+               GLchan luminance, alpha;
+               CLAMPED_FLOAT_TO_CHAN(luminance, lut[jL * 2 + 0]);
+               CLAMPED_FLOAT_TO_CHAN(alpha, lut[jA * 2 + 1]);
+               rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = luminance;
+               rgba[i][ACOMP] = alpha;;
+            }
+         }
+         else {
+#if CHAN_TYPE == GL_UNSIGNED_BYTE
+            if (table->Size == 256) {
+               /* common case */
+               const GLchan *lut = (const GLchan *) table->Table;
+               GLuint i;
+               for (i = 0; i < n; i++) {
+                  GLchan l = lut[rgba[i][RCOMP] * 2 + 0];
+                  GLchan a = lut[rgba[i][ACOMP] * 2 + 1];;
+                  rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = l;
+                  rgba[i][ACOMP] = a;
+               }
+            }
+            else
+#endif
+            {
+               const GLfloat scale = (GLfloat) (table->Size - 1) / CHAN_MAXF;
+               const GLchan *lut = (const GLchan *) table->Table;
+               GLuint i;
+               for (i = 0; i < n; i++) {
+                  GLint jL = IROUND((GLfloat) rgba[i][RCOMP] * scale);
+                  GLint jA = IROUND((GLfloat) rgba[i][ACOMP] * scale);
+                  GLchan luminance = lut[jL * 2 + 0];
+                  GLchan alpha     = lut[jA * 2 + 1];
+                  rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = luminance;
+                  rgba[i][ACOMP] = alpha;
+               }
+            }
+         }
+         break;
+      case GL_RGB:
+         /* replace RGB with RGB */
+         if (table->FloatTable) {
+            const GLfloat scale = (GLfloat) (table->Size - 1) / CHAN_MAXF;
+            const GLfloat *lut = (const GLfloat *) table->Table;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               GLint jR = IROUND((GLfloat) rgba[i][RCOMP] * scale);
+               GLint jG = IROUND((GLfloat) rgba[i][GCOMP] * scale);
+               GLint jB = IROUND((GLfloat) rgba[i][BCOMP] * scale);
+               CLAMPED_FLOAT_TO_CHAN(rgba[i][RCOMP], lut[jR * 3 + 0]);
+               CLAMPED_FLOAT_TO_CHAN(rgba[i][GCOMP], lut[jG * 3 + 1]);
+               CLAMPED_FLOAT_TO_CHAN(rgba[i][BCOMP], lut[jB * 3 + 2]);
+            }
+         }
+         else {
+#if CHAN_TYPE == GL_UNSIGNED_BYTE
+            if (table->Size == 256) {
+               /* common case */
+               const GLchan *lut = (const GLchan *) table->Table;
+               GLuint i;
+               for (i = 0; i < n; i++) {
+                  rgba[i][RCOMP] = lut[rgba[i][RCOMP] * 3 + 0];
+                  rgba[i][GCOMP] = lut[rgba[i][GCOMP] * 3 + 1];
+                  rgba[i][BCOMP] = lut[rgba[i][BCOMP] * 3 + 2];
+               }
+            }
+            else
+#endif
+            {
+               const GLfloat scale = (GLfloat) (table->Size - 1) / CHAN_MAXF;
+               const GLchan *lut = (const GLchan *) table->Table;
+               GLuint i;
+               for (i = 0; i < n; i++) {
+                  GLint jR = IROUND((GLfloat) rgba[i][RCOMP] * scale);
+                  GLint jG = IROUND((GLfloat) rgba[i][GCOMP] * scale);
+                  GLint jB = IROUND((GLfloat) rgba[i][BCOMP] * scale);
+                  rgba[i][RCOMP] = lut[jR * 3 + 0];
+                  rgba[i][GCOMP] = lut[jG * 3 + 1];
+                  rgba[i][BCOMP] = lut[jB * 3 + 2];
+               }
+            }
+         }
+         break;
+      case GL_RGBA:
+         /* replace RGBA with RGBA */
+         if (table->FloatTable) {
+            const GLfloat scale = (GLfloat) (table->Size - 1) / CHAN_MAXF;
+            const GLfloat *lut = (const GLfloat *) table->Table;
+            GLuint i;
+            for (i = 0; i < n; i++) {
+               GLint jR = IROUND((GLfloat) rgba[i][RCOMP] * scale);
+               GLint jG = IROUND((GLfloat) rgba[i][GCOMP] * scale);
+               GLint jB = IROUND((GLfloat) rgba[i][BCOMP] * scale);
+               GLint jA = IROUND((GLfloat) rgba[i][ACOMP] * scale);
+               CLAMPED_FLOAT_TO_CHAN(rgba[i][RCOMP], lut[jR * 4 + 0]);
+               CLAMPED_FLOAT_TO_CHAN(rgba[i][GCOMP], lut[jG * 4 + 1]);
+               CLAMPED_FLOAT_TO_CHAN(rgba[i][BCOMP], lut[jB * 4 + 2]);
+               CLAMPED_FLOAT_TO_CHAN(rgba[i][ACOMP], lut[jA * 4 + 3]);
+            }
+         }
+         else {
+#if CHAN_TYPE == GL_UNSIGNED_BYTE
+            if (table->Size == 256) {
+               /* common case */
+               const GLchan *lut = (const GLchan *) table->Table;
+               GLuint i;
+               for (i = 0; i < n; i++) {
+                  rgba[i][RCOMP] = lut[rgba[i][RCOMP] * 4 + 0];
+                  rgba[i][GCOMP] = lut[rgba[i][GCOMP] * 4 + 1];
+                  rgba[i][BCOMP] = lut[rgba[i][BCOMP] * 4 + 2];
+                  rgba[i][ACOMP] = lut[rgba[i][ACOMP] * 4 + 3];
+               }
+            }
+            else
+#endif
+            {
+               const GLfloat scale = (GLfloat) (table->Size - 1) / CHAN_MAXF;
+               const GLfloat *lut = (const GLfloat *) table->Table;
+               GLuint i;
+               for (i = 0; i < n; i++) {
+                  GLint jR = IROUND((GLfloat) rgba[i][RCOMP] * scale);
+                  GLint jG = IROUND((GLfloat) rgba[i][GCOMP] * scale);
+                  GLint jB = IROUND((GLfloat) rgba[i][BCOMP] * scale);
+                  GLint jA = IROUND((GLfloat) rgba[i][ACOMP] * scale);
+                  CLAMPED_FLOAT_TO_CHAN(rgba[i][RCOMP], lut[jR * 4 + 0]);
+                  CLAMPED_FLOAT_TO_CHAN(rgba[i][GCOMP], lut[jG * 4 + 1]);
+                  CLAMPED_FLOAT_TO_CHAN(rgba[i][BCOMP], lut[jB * 4 + 2]);
+                  CLAMPED_FLOAT_TO_CHAN(rgba[i][ACOMP], lut[jA * 4 + 3]);
+               }
+            }
+         }
+         break;
+      default:
+         _mesa_problem(NULL, "Bad format in _swrast_texture_table_lookup");
+         return;
+   }
+}
+
+
+
+/*
+ * Get texture palette entry.
+ */
+static void
+palette_sample(const GLcontext *ctx,
+               const struct gl_texture_object *tObj,
+               GLint index, GLchan rgba[4] )
+{
+   const GLchan *palette;
+   GLenum format;
+
+   if (ctx->Texture.SharedPalette) {
+      ASSERT(!ctx->Texture.Palette.FloatTable);
+      palette = (const GLchan *) ctx->Texture.Palette.Table;
+      format = ctx->Texture.Palette.Format;
+   }
+   else {
+      ASSERT(!tObj->Palette.FloatTable);
+      palette = (const GLchan *) tObj->Palette.Table;
+      format = tObj->Palette.Format;
+   }
+
+   switch (format) {
+      case GL_ALPHA:
+         rgba[ACOMP] = palette[index];
+         return;
+      case GL_LUMINANCE:
+      case GL_INTENSITY:
+         rgba[RCOMP] = palette[index];
+         return;
+      case GL_LUMINANCE_ALPHA:
+         rgba[RCOMP] = palette[(index << 1) + 0];
+         rgba[ACOMP] = palette[(index << 1) + 1];
+         return;
+      case GL_RGB:
+         rgba[RCOMP] = palette[index * 3 + 0];
+         rgba[GCOMP] = palette[index * 3 + 1];
+         rgba[BCOMP] = palette[index * 3 + 2];
+         return;
+      case GL_RGBA:
+         rgba[RCOMP] = palette[(index << 2) + 0];
+         rgba[GCOMP] = palette[(index << 2) + 1];
+         rgba[BCOMP] = palette[(index << 2) + 2];
+         rgba[ACOMP] = palette[(index << 2) + 3];
+         return;
+      default:
+         _mesa_problem(ctx, "Bad palette format in palette_sample");
+   }
+}
+
+
+/*
+ * The lambda[] array values are always monotonic.  Either the whole span
+ * will be minified, magnified, or split between the two.  This function
+ * determines the subranges in [0, n-1] that are to be minified or magnified.
+ */
+static INLINE void
+compute_min_mag_ranges( GLfloat minMagThresh, GLuint n, const GLfloat lambda[],
+                        GLuint *minStart, GLuint *minEnd,
+                        GLuint *magStart, GLuint *magEnd )
+{
+   ASSERT(lambda != NULL);
+#if 0
+   /* Verify that lambda[] is monotonous.
+    * We can't really use this because the inaccuracy in the LOG2 function
+    * causes this test to fail, yet the resulting texturing is correct.
+    */
+   if (n > 1) {
+      GLuint i;
+      printf("lambda delta = %g\n", lambda[0] - lambda[n-1]);
+      if (lambda[0] >= lambda[n-1]) { /* decreasing */
+         for (i = 0; i < n - 1; i++) {
+            ASSERT((GLint) (lambda[i] * 10) >= (GLint) (lambda[i+1] * 10));
+         }
+      }
+      else { /* increasing */
+         for (i = 0; i < n - 1; i++) {
+            ASSERT((GLint) (lambda[i] * 10) <= (GLint) (lambda[i+1] * 10));
+         }
+      }
+   }
+#endif /* DEBUG */
+
+   /* since lambda is monotonous-array use this check first */
+   if (lambda[0] <= minMagThresh && lambda[n-1] <= minMagThresh) {
+      /* magnification for whole span */
+      *magStart = 0;
+      *magEnd = n;
+      *minStart = *minEnd = 0;
+   }
+   else if (lambda[0] > minMagThresh && lambda[n-1] > minMagThresh) {
+      /* minification for whole span */
+      *minStart = 0;
+      *minEnd = n;
+      *magStart = *magEnd = 0;
+   }
+   else {
+      /* a mix of minification and magnification */
+      GLuint i;
+      if (lambda[0] > minMagThresh) {
+         /* start with minification */
+         for (i = 1; i < n; i++) {
+            if (lambda[i] <= minMagThresh)
+               break;
+         }
+         *minStart = 0;
+         *minEnd = i;
+         *magStart = i;
+         *magEnd = n;
+      }
+      else {
+         /* start with magnification */
+         for (i = 1; i < n; i++) {
+            if (lambda[i] > minMagThresh)
+               break;
+         }
+         *magStart = 0;
+         *magEnd = i;
+         *minStart = i;
+         *minEnd = n;
+      }
+   }
+
+#if 0
+   /* Verify the min/mag Start/End values
+    * We don't use this either (see above)
+    */
+   {
+      GLint i;
+      for (i = 0; i < n; i++) {
+         if (lambda[i] > minMagThresh) {
+            /* minification */
+            ASSERT(i >= *minStart);
+            ASSERT(i < *minEnd);
+         }
+         else {
+            /* magnification */
+            ASSERT(i >= *magStart);
+            ASSERT(i < *magEnd);
+         }
+      }
+   }
+#endif
+}
+
+
+/**********************************************************************/
+/*                    1-D Texture Sampling Functions                  */
+/**********************************************************************/
+
+/*
+ * Return the texture sample for coordinate (s) using GL_NEAREST filter.
+ */
+static void
+sample_1d_nearest(GLcontext *ctx,
+                  const struct gl_texture_object *tObj,
+                  const struct gl_texture_image *img,
+                  const GLfloat texcoord[4], GLchan rgba[4])
+{
+   const GLint width = img->Width2;  /* without border, power of two */
+   GLint i;
+
+   COMPUTE_NEAREST_TEXEL_LOCATION(tObj->WrapS, texcoord[0], width, i);
+
+   /* skip over the border, if any */
+   i += img->Border;
+
+   if (i < 0 || i >= (GLint) img->Width) {
+      /* Need this test for GL_CLAMP_TO_BORDER mode */
+      COPY_CHAN4(rgba, tObj->_BorderChan);
+   }
+   else {
+      (*img->FetchTexel)(img, i, 0, 0, (GLvoid *) rgba);
+      if (img->Format == GL_COLOR_INDEX) {
+         palette_sample(ctx, tObj, rgba[0], rgba);
+      }
+   }
+}
+
+
+
+/*
+ * Return the texture sample for coordinate (s) using GL_LINEAR filter.
+ */
+static void
+sample_1d_linear(GLcontext *ctx,
+                 const struct gl_texture_object *tObj,
+                 const struct gl_texture_image *img,
+                 const GLfloat texcoord[4], GLchan rgba[4])
+{
+   const GLint width = img->Width2;
+   GLint i0, i1;
+   GLfloat u;
+   GLuint useBorderColor;
+
+   COMPUTE_LINEAR_TEXEL_LOCATIONS(tObj->WrapS, texcoord[0], u, width, i0, i1);
+
+   useBorderColor = 0;
+   if (img->Border) {
+      i0 += img->Border;
+      i1 += img->Border;
+   }
+   else {
+      if (i0 < 0 || i0 >= width)   useBorderColor |= I0BIT;
+      if (i1 < 0 || i1 >= width)   useBorderColor |= I1BIT;
+   }
+
+   {
+      const GLfloat a = FRAC(u);
+
+#if CHAN_TYPE == GL_FLOAT || CHAN_TYPE == GL_UNSIGNED_SHORT
+      const GLfloat w0 = (1.0F-a);
+      const GLfloat w1 =       a ;
+#else /* CHAN_BITS == 8 */
+      /* compute sample weights in fixed point in [0,WEIGHT_SCALE] */
+      const GLint w0 = IROUND_POS((1.0F - a) * WEIGHT_SCALE);
+      const GLint w1 = IROUND_POS(        a  * WEIGHT_SCALE);
+#endif
+      GLchan t0[4], t1[4];  /* texels */
+
+      if (useBorderColor & I0BIT) {
+         COPY_CHAN4(t0, tObj->_BorderChan);
+      }
+      else {
+         (*img->FetchTexel)(img, i0, 0, 0, (GLvoid *) t0);
+         if (img->Format == GL_COLOR_INDEX) {
+            palette_sample(ctx, tObj, t0[0], t0);
+         }
+      }
+      if (useBorderColor & I1BIT) {
+         COPY_CHAN4(t1, tObj->_BorderChan);
+      }
+      else {
+         (*img->FetchTexel)(img, i1, 0, 0, (GLvoid *) t1);
+         if (img->Format == GL_COLOR_INDEX) {
+            palette_sample(ctx, tObj, t1[0], t1);
+         }
+      }
+
+#if CHAN_TYPE == GL_FLOAT
+      rgba[0] = w0 * t0[0] + w1 * t1[0];
+      rgba[1] = w0 * t0[1] + w1 * t1[1];
+      rgba[2] = w0 * t0[2] + w1 * t1[2];
+      rgba[3] = w0 * t0[3] + w1 * t1[3];
+#elif CHAN_TYPE == GL_UNSIGNED_SHORT
+      rgba[0] = (GLchan) (w0 * t0[0] + w1 * t1[0] + 0.5);
+      rgba[1] = (GLchan) (w0 * t0[1] + w1 * t1[1] + 0.5);
+      rgba[2] = (GLchan) (w0 * t0[2] + w1 * t1[2] + 0.5);
+      rgba[3] = (GLchan) (w0 * t0[3] + w1 * t1[3] + 0.5);
+#else /* CHAN_BITS == 8 */
+      rgba[0] = (GLchan) ((w0 * t0[0] + w1 * t1[0]) >> WEIGHT_SHIFT);
+      rgba[1] = (GLchan) ((w0 * t0[1] + w1 * t1[1]) >> WEIGHT_SHIFT);
+      rgba[2] = (GLchan) ((w0 * t0[2] + w1 * t1[2]) >> WEIGHT_SHIFT);
+      rgba[3] = (GLchan) ((w0 * t0[3] + w1 * t1[3]) >> WEIGHT_SHIFT);
+#endif
+
+   }
+}
+
+
+static void
+sample_1d_nearest_mipmap_nearest(GLcontext *ctx,
+                                 const struct gl_texture_object *tObj,
+                                 GLuint n, const GLfloat texcoord[][4],
+                                 const GLfloat lambda[], GLchan rgba[][4])
+{
+   GLuint i;
+   ASSERT(lambda != NULL);
+   for (i = 0; i < n; i++) {
+      GLint level;
+      COMPUTE_NEAREST_MIPMAP_LEVEL(tObj, lambda[i], level);
+      sample_1d_nearest(ctx, tObj, tObj->Image[level], texcoord[i], rgba[i]);
+   }
+}
+
+
+static void
+sample_1d_linear_mipmap_nearest(GLcontext *ctx,
+                                const struct gl_texture_object *tObj,
+                                GLuint n, const GLfloat texcoord[][4],
+                                const GLfloat lambda[], GLchan rgba[][4])
+{
+   GLuint i;
+   ASSERT(lambda != NULL);
+   for (i = 0; i < n; i++) {
+      GLint level;
+      COMPUTE_NEAREST_MIPMAP_LEVEL(tObj, lambda[i], level);
+      sample_1d_linear(ctx, tObj, tObj->Image[level], texcoord[i], rgba[i]);
+   }
+}
+
+
+
+/*
+ * This is really just needed in order to prevent warnings with some compilers.
+ */
+#if CHAN_TYPE == GL_FLOAT
+#define CHAN_CAST
+#else
+#define CHAN_CAST (GLchan) (GLint)
+#endif
+
+
+static void
+sample_1d_nearest_mipmap_linear(GLcontext *ctx,
+                                const struct gl_texture_object *tObj,
+                                GLuint n, const GLfloat texcoord[][4],
+                                const GLfloat lambda[], GLchan rgba[][4])
+{
+   GLuint i;
+   ASSERT(lambda != NULL);
+   for (i = 0; i < n; i++) {
+      GLint level;
+      COMPUTE_LINEAR_MIPMAP_LEVEL(tObj, lambda[i], level);
+      if (level >= tObj->_MaxLevel) {
+         sample_1d_nearest(ctx, tObj, tObj->Image[tObj->_MaxLevel],
+                           texcoord[i], rgba[i]);
+      }
+      else {
+         GLchan t0[4], t1[4];
+         const GLfloat f = FRAC(lambda[i]);
+         sample_1d_nearest(ctx, tObj, tObj->Image[level  ], texcoord[i], t0);
+         sample_1d_nearest(ctx, tObj, tObj->Image[level+1], texcoord[i], t1);
+         rgba[i][RCOMP] = CHAN_CAST ((1.0F-f) * t0[RCOMP] + f * t1[RCOMP]);
+         rgba[i][GCOMP] = CHAN_CAST ((1.0F-f) * t0[GCOMP] + f * t1[GCOMP]);
+         rgba[i][BCOMP] = CHAN_CAST ((1.0F-f) * t0[BCOMP] + f * t1[BCOMP]);
+         rgba[i][ACOMP] = CHAN_CAST ((1.0F-f) * t0[ACOMP] + f * t1[ACOMP]);
+      }
+   }
+}
+
+
+
+static void
+sample_1d_linear_mipmap_linear(GLcontext *ctx,
+                               const struct gl_texture_object *tObj,
+                               GLuint n, const GLfloat texcoord[][4],
+                               const GLfloat lambda[], GLchan rgba[][4])
+{
+   GLuint i;
+   ASSERT(lambda != NULL);
+   for (i = 0; i < n; i++) {
+      GLint level;
+      COMPUTE_LINEAR_MIPMAP_LEVEL(tObj, lambda[i], level);
+      if (level >= tObj->_MaxLevel) {
+         sample_1d_linear(ctx, tObj, tObj->Image[tObj->_MaxLevel],
+                          texcoord[i], rgba[i]);
+      }
+      else {
+         GLchan t0[4], t1[4];
+         const GLfloat f = FRAC(lambda[i]);
+         sample_1d_linear(ctx, tObj, tObj->Image[level  ], texcoord[i], t0);
+         sample_1d_linear(ctx, tObj, tObj->Image[level+1], texcoord[i], t1);
+         rgba[i][RCOMP] = CHAN_CAST ((1.0F-f) * t0[RCOMP] + f * t1[RCOMP]);
+         rgba[i][GCOMP] = CHAN_CAST ((1.0F-f) * t0[GCOMP] + f * t1[GCOMP]);
+         rgba[i][BCOMP] = CHAN_CAST ((1.0F-f) * t0[BCOMP] + f * t1[BCOMP]);
+         rgba[i][ACOMP] = CHAN_CAST ((1.0F-f) * t0[ACOMP] + f * t1[ACOMP]);
+      }
+   }
+}
+
+
+
+static void
+sample_nearest_1d( GLcontext *ctx, GLuint texUnit,
+                   const struct gl_texture_object *tObj, GLuint n,
+                   const GLfloat texcoords[][4], const GLfloat lambda[],
+                   GLchan rgba[][4] )
+{
+   GLuint i;
+   struct gl_texture_image *image = tObj->Image[tObj->BaseLevel];
+   (void) lambda;
+   for (i=0;i<n;i++) {
+      sample_1d_nearest(ctx, tObj, image, texcoords[i], rgba[i]);
+   }
+}
+
+
+
+static void
+sample_linear_1d( GLcontext *ctx, GLuint texUnit,
+                  const struct gl_texture_object *tObj, GLuint n,
+                  const GLfloat texcoords[][4], const GLfloat lambda[],
+                  GLchan rgba[][4] )
+{
+   GLuint i;
+   struct gl_texture_image *image = tObj->Image[tObj->BaseLevel];
+   (void) lambda;
+   for (i=0;i<n;i++) {
+      sample_1d_linear(ctx, tObj, image, texcoords[i], rgba[i]);
+   }
+}
+
+
+/*
+ * Given an (s) texture coordinate and lambda (level of detail) value,
+ * return a texture sample.
+ *
+ */
+static void
+sample_lambda_1d( GLcontext *ctx, GLuint texUnit,
+                  const struct gl_texture_object *tObj, GLuint n,
+                  const GLfloat texcoords[][4],
+                  const GLfloat lambda[], GLchan rgba[][4] )
+{
+   GLuint minStart, minEnd;  /* texels with minification */
+   GLuint magStart, magEnd;  /* texels with magnification */
+   GLuint i;
+
+   ASSERT(lambda != NULL);
+   compute_min_mag_ranges(SWRAST_CONTEXT(ctx)->_MinMagThresh[texUnit],
+                          n, lambda, &minStart, &minEnd, &magStart, &magEnd);
+
+   if (minStart < minEnd) {
+      /* do the minified texels */
+      const GLuint m = minEnd - minStart;
+      switch (tObj->MinFilter) {
+      case GL_NEAREST:
+         for (i = minStart; i < minEnd; i++)
+            sample_1d_nearest(ctx, tObj, tObj->Image[tObj->BaseLevel],
+                              texcoords[i], rgba[i]);
+         break;
+      case GL_LINEAR:
+         for (i = minStart; i < minEnd; i++)
+            sample_1d_linear(ctx, tObj, tObj->Image[tObj->BaseLevel],
+                             texcoords[i], rgba[i]);
+         break;
+      case GL_NEAREST_MIPMAP_NEAREST:
+         sample_1d_nearest_mipmap_nearest(ctx, tObj, m, texcoords + minStart,
+                                          lambda + minStart, rgba + minStart);
+         break;
+      case GL_LINEAR_MIPMAP_NEAREST:
+         sample_1d_linear_mipmap_nearest(ctx, tObj, m, texcoords + minStart,
+                                         lambda + minStart, rgba + minStart);
+         break;
+      case GL_NEAREST_MIPMAP_LINEAR:
+         sample_1d_nearest_mipmap_linear(ctx, tObj, m, texcoords + minStart,
+                                         lambda + minStart, rgba + minStart);
+         break;
+      case GL_LINEAR_MIPMAP_LINEAR:
+         sample_1d_linear_mipmap_linear(ctx, tObj, m, texcoords + minStart,
+                                        lambda + minStart, rgba + minStart);
+         break;
+      default:
+         _mesa_problem(ctx, "Bad min filter in sample_1d_texture");
+         return;
+      }
+   }
+
+   if (magStart < magEnd) {
+      /* do the magnified texels */
+      switch (tObj->MagFilter) {
+      case GL_NEAREST:
+         for (i = magStart; i < magEnd; i++)
+            sample_1d_nearest(ctx, tObj, tObj->Image[tObj->BaseLevel],
+                              texcoords[i], rgba[i]);
+         break;
+      case GL_LINEAR:
+         for (i = magStart; i < magEnd; i++)
+            sample_1d_linear(ctx, tObj, tObj->Image[tObj->BaseLevel],
+                             texcoords[i], rgba[i]);
+         break;
+      default:
+         _mesa_problem(ctx, "Bad mag filter in sample_1d_texture");
+         return;
+      }
+   }
+}
+
+
+/**********************************************************************/
+/*                    2-D Texture Sampling Functions                  */
+/**********************************************************************/
+
+
+/*
+ * Return the texture sample for coordinate (s,t) using GL_NEAREST filter.
+ */
+static INLINE void
+sample_2d_nearest(GLcontext *ctx,
+                  const struct gl_texture_object *tObj,
+                  const struct gl_texture_image *img,
+                  const GLfloat texcoord[4],
+                  GLchan rgba[])
+{
+   const GLint width = img->Width2;    /* without border, power of two */
+   const GLint height = img->Height2;  /* without border, power of two */
+   GLint i, j;
+
+   COMPUTE_NEAREST_TEXEL_LOCATION(tObj->WrapS, texcoord[0], width,  i);
+   COMPUTE_NEAREST_TEXEL_LOCATION(tObj->WrapT, texcoord[1], height, j);
+
+   /* skip over the border, if any */
+   i += img->Border;
+   j += img->Border;
+
+   if (i < 0 || i >= (GLint) img->Width || j < 0 || j >= (GLint) img->Height) {
+      /* Need this test for GL_CLAMP_TO_BORDER mode */
+      COPY_CHAN4(rgba, tObj->_BorderChan);
+   }
+   else {
+      (*img->FetchTexel)(img, i, j, 0, (GLvoid *) rgba);
+      if (img->Format == GL_COLOR_INDEX) {
+         palette_sample(ctx, tObj, rgba[0], rgba);
+      }
+   }
+}
+
+
+
+/*
+ * Return the texture sample for coordinate (s,t) using GL_LINEAR filter.
+ * New sampling code contributed by Lynn Quam <quam@ai.sri.com>.
+ */
+static INLINE void
+sample_2d_linear(GLcontext *ctx,
+                 const struct gl_texture_object *tObj,
+                 const struct gl_texture_image *img,
+                 const GLfloat texcoord[4],
+                 GLchan rgba[])
+{
+   const GLint width = img->Width2;
+   const GLint height = img->Height2;
+   GLint i0, j0, i1, j1;
+   GLuint useBorderColor;
+   GLfloat u, v;
+
+   COMPUTE_LINEAR_TEXEL_LOCATIONS(tObj->WrapS, texcoord[0], u, width,  i0, i1);
+   COMPUTE_LINEAR_TEXEL_LOCATIONS(tObj->WrapT, texcoord[1], v, height, j0, j1);
+
+   useBorderColor = 0;
+   if (img->Border) {
+      i0 += img->Border;
+      i1 += img->Border;
+      j0 += img->Border;
+      j1 += img->Border;
+   }
+   else {
+      if (i0 < 0 || i0 >= width)   useBorderColor |= I0BIT;
+      if (i1 < 0 || i1 >= width)   useBorderColor |= I1BIT;
+      if (j0 < 0 || j0 >= height)  useBorderColor |= J0BIT;
+      if (j1 < 0 || j1 >= height)  useBorderColor |= J1BIT;
+   }
+
+   {
+      const GLfloat a = FRAC(u);
+      const GLfloat b = FRAC(v);
+
+#if CHAN_TYPE == GL_FLOAT || CHAN_TYPE == GL_UNSIGNED_SHORT
+      const GLfloat w00 = (1.0F-a) * (1.0F-b);
+      const GLfloat w10 =       a  * (1.0F-b);
+      const GLfloat w01 = (1.0F-a) *       b ;
+      const GLfloat w11 =       a  *       b ;
+#else /* CHAN_BITS == 8 */
+      /* compute sample weights in fixed point in [0,WEIGHT_SCALE] */
+      const GLint w00 = IROUND_POS((1.0F-a) * (1.0F-b) * WEIGHT_SCALE);
+      const GLint w10 = IROUND_POS(      a  * (1.0F-b) * WEIGHT_SCALE);
+      const GLint w01 = IROUND_POS((1.0F-a) *       b  * WEIGHT_SCALE);
+      const GLint w11 = IROUND_POS(      a  *       b  * WEIGHT_SCALE);
+#endif
+      GLchan t00[4];
+      GLchan t10[4];
+      GLchan t01[4];
+      GLchan t11[4];
+
+      if (useBorderColor & (I0BIT | J0BIT)) {
+         COPY_CHAN4(t00, tObj->_BorderChan);
+      }
+      else {
+         (*img->FetchTexel)(img, i0, j0, 0, (GLvoid *) t00);
+         if (img->Format == GL_COLOR_INDEX) {
+            palette_sample(ctx, tObj, t00[0], t00);
+         }
+      }
+      if (useBorderColor & (I1BIT | J0BIT)) {
+         COPY_CHAN4(t10, tObj->_BorderChan);
+      }
+      else {
+         (*img->FetchTexel)(img, i1, j0, 0, (GLvoid *) t10);
+         if (img->Format == GL_COLOR_INDEX) {
+            palette_sample(ctx, tObj, t10[0], t10);
+         }
+      }
+      if (useBorderColor & (I0BIT | J1BIT)) {
+         COPY_CHAN4(t01, tObj->_BorderChan);
+      }
+      else {
+         (*img->FetchTexel)(img, i0, j1, 0, (GLvoid *) t01);
+         if (img->Format == GL_COLOR_INDEX) {
+            palette_sample(ctx, tObj, t01[0], t01);
+         }
+      }
+      if (useBorderColor & (I1BIT | J1BIT)) {
+         COPY_CHAN4(t11, tObj->_BorderChan);
+      }
+      else {
+         (*img->FetchTexel)(img, i1, j1, 0, (GLvoid *) t11);
+         if (img->Format == GL_COLOR_INDEX) {
+            palette_sample(ctx, tObj, t11[0], t11);
+         }
+      }
+#if CHAN_TYPE == GL_FLOAT
+      rgba[0] = w00 * t00[0] + w10 * t10[0] + w01 * t01[0] + w11 * t11[0];
+      rgba[1] = w00 * t00[1] + w10 * t10[1] + w01 * t01[1] + w11 * t11[1];
+      rgba[2] = w00 * t00[2] + w10 * t10[2] + w01 * t01[2] + w11 * t11[2];
+      rgba[3] = w00 * t00[3] + w10 * t10[3] + w01 * t01[3] + w11 * t11[3];
+#elif CHAN_TYPE == GL_UNSIGNED_SHORT
+      rgba[0] = (GLchan) (w00 * t00[0] + w10 * t10[0] +
+                          w01 * t01[0] + w11 * t11[0] + 0.5);
+      rgba[1] = (GLchan) (w00 * t00[1] + w10 * t10[1] +
+                          w01 * t01[1] + w11 * t11[1] + 0.5);
+      rgba[2] = (GLchan) (w00 * t00[2] + w10 * t10[2] +
+                          w01 * t01[2] + w11 * t11[2] + 0.5);
+      rgba[3] = (GLchan) (w00 * t00[3] + w10 * t10[3] +
+                          w01 * t01[3] + w11 * t11[3] + 0.5);
+#else /* CHAN_BITS == 8 */
+      rgba[0] = (GLchan) ((w00 * t00[0] + w10 * t10[0] +
+                           w01 * t01[0] + w11 * t11[0]) >> WEIGHT_SHIFT);
+      rgba[1] = (GLchan) ((w00 * t00[1] + w10 * t10[1] +
+                           w01 * t01[1] + w11 * t11[1]) >> WEIGHT_SHIFT);
+      rgba[2] = (GLchan) ((w00 * t00[2] + w10 * t10[2] +
+                           w01 * t01[2] + w11 * t11[2]) >> WEIGHT_SHIFT);
+      rgba[3] = (GLchan) ((w00 * t00[3] + w10 * t10[3] +
+                           w01 * t01[3] + w11 * t11[3]) >> WEIGHT_SHIFT);
+#endif
+
+   }
+
+}
+
+
+/*
+ * As above, but we know WRAP_S == REPEAT and WRAP_T == REPEAT
+ * and we're not using a paletted texture.
+ */
+static INLINE void
+sample_2d_linear_repeat(GLcontext *ctx,
+                        const struct gl_texture_object *tObj,
+                        const struct gl_texture_image *img,
+                        const GLfloat texcoord[4],
+                        GLchan rgba[])
+{
+   const GLint width = img->Width2;
+   const GLint height = img->Height2;
+   GLint i0, j0, i1, j1;
+   GLfloat u, v;
+
+   ASSERT(tObj->WrapS == GL_REPEAT);
+   ASSERT(tObj->WrapT == GL_REPEAT);
+   ASSERT(img->Border == 0);
+   ASSERT(img->Format != GL_COLOR_INDEX);
+   ASSERT(img->_IsPowerOfTwo);
+
+   COMPUTE_LINEAR_REPEAT_TEXEL_LOCATION(texcoord[0], u, width,  i0, i1);
+   COMPUTE_LINEAR_REPEAT_TEXEL_LOCATION(texcoord[1], v, height, j0, j1);
+
+   {
+      const GLfloat a = FRAC(u);
+      const GLfloat b = FRAC(v);
+
+#if CHAN_TYPE == GL_FLOAT || CHAN_TYPE == GL_UNSIGNED_SHORT
+      const GLfloat w00 = (1.0F-a) * (1.0F-b);
+      const GLfloat w10 =       a  * (1.0F-b);
+      const GLfloat w01 = (1.0F-a) *       b ;
+      const GLfloat w11 =       a  *       b ;
+#else /* CHAN_BITS == 8 */
+      /* compute sample weights in fixed point in [0,WEIGHT_SCALE] */
+      const GLint w00 = IROUND_POS((1.0F-a) * (1.0F-b) * WEIGHT_SCALE);
+      const GLint w10 = IROUND_POS(      a  * (1.0F-b) * WEIGHT_SCALE);
+      const GLint w01 = IROUND_POS((1.0F-a) *       b  * WEIGHT_SCALE);
+      const GLint w11 = IROUND_POS(      a  *       b  * WEIGHT_SCALE);
+#endif
+      GLchan t00[4];
+      GLchan t10[4];
+      GLchan t01[4];
+      GLchan t11[4];
+
+      (*img->FetchTexel)(img, i0, j0, 0, (GLvoid *) t00);
+      (*img->FetchTexel)(img, i1, j0, 0, (GLvoid *) t10);
+      (*img->FetchTexel)(img, i0, j1, 0, (GLvoid *) t01);
+      (*img->FetchTexel)(img, i1, j1, 0, (GLvoid *) t11);
+
+#if CHAN_TYPE == GL_FLOAT
+      rgba[0] = w00 * t00[0] + w10 * t10[0] + w01 * t01[0] + w11 * t11[0];
+      rgba[1] = w00 * t00[1] + w10 * t10[1] + w01 * t01[1] + w11 * t11[1];
+      rgba[2] = w00 * t00[2] + w10 * t10[2] + w01 * t01[2] + w11 * t11[2];
+      rgba[3] = w00 * t00[3] + w10 * t10[3] + w01 * t01[3] + w11 * t11[3];
+#elif CHAN_TYPE == GL_UNSIGNED_SHORT
+      rgba[0] = (GLchan) (w00 * t00[0] + w10 * t10[0] +
+                          w01 * t01[0] + w11 * t11[0] + 0.5);
+      rgba[1] = (GLchan) (w00 * t00[1] + w10 * t10[1] +
+                          w01 * t01[1] + w11 * t11[1] + 0.5);
+      rgba[2] = (GLchan) (w00 * t00[2] + w10 * t10[2] +
+                          w01 * t01[2] + w11 * t11[2] + 0.5);
+      rgba[3] = (GLchan) (w00 * t00[3] + w10 * t10[3] +
+                          w01 * t01[3] + w11 * t11[3] + 0.5);
+#else /* CHAN_BITS == 8 */
+      rgba[0] = (GLchan) ((w00 * t00[0] + w10 * t10[0] +
+                           w01 * t01[0] + w11 * t11[0]) >> WEIGHT_SHIFT);
+      rgba[1] = (GLchan) ((w00 * t00[1] + w10 * t10[1] +
+                           w01 * t01[1] + w11 * t11[1]) >> WEIGHT_SHIFT);
+      rgba[2] = (GLchan) ((w00 * t00[2] + w10 * t10[2] +
+                           w01 * t01[2] + w11 * t11[2]) >> WEIGHT_SHIFT);
+      rgba[3] = (GLchan) ((w00 * t00[3] + w10 * t10[3] +
+                           w01 * t01[3] + w11 * t11[3]) >> WEIGHT_SHIFT);
+#endif
+
+   }
+
+}
+
+
+
+static void
+sample_2d_nearest_mipmap_nearest(GLcontext *ctx,
+                                 const struct gl_texture_object *tObj,
+                                 GLuint n, const GLfloat texcoord[][4],
+                                 const GLfloat lambda[], GLchan rgba[][4])
+{
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      GLint level;
+      COMPUTE_NEAREST_MIPMAP_LEVEL(tObj, lambda[i], level);
+      sample_2d_nearest(ctx, tObj, tObj->Image[level], texcoord[i], rgba[i]);
+   }
+}
+
+
+
+static void
+sample_2d_linear_mipmap_nearest(GLcontext *ctx,
+                                const struct gl_texture_object *tObj,
+                                GLuint n, const GLfloat texcoord[][4],
+                                const GLfloat lambda[], GLchan rgba[][4])
+{
+   GLuint i;
+   ASSERT(lambda != NULL);
+   for (i = 0; i < n; i++) {
+      GLint level;
+      COMPUTE_NEAREST_MIPMAP_LEVEL(tObj, lambda[i], level);
+      sample_2d_linear(ctx, tObj, tObj->Image[level], texcoord[i], rgba[i]);
+   }
+}
+
+
+
+static void
+sample_2d_nearest_mipmap_linear(GLcontext *ctx,
+                                const struct gl_texture_object *tObj,
+                                GLuint n, const GLfloat texcoord[][4],
+                                const GLfloat lambda[], GLchan rgba[][4])
+{
+   GLuint i;
+   ASSERT(lambda != NULL);
+   for (i = 0; i < n; i++) {
+      GLint level;
+      COMPUTE_LINEAR_MIPMAP_LEVEL(tObj, lambda[i], level);
+      if (level >= tObj->_MaxLevel) {
+         sample_2d_nearest(ctx, tObj, tObj->Image[tObj->_MaxLevel],
+                           texcoord[i], rgba[i]);
+      }
+      else {
+         GLchan t0[4], t1[4];  /* texels */
+         const GLfloat f = FRAC(lambda[i]);
+         sample_2d_nearest(ctx, tObj, tObj->Image[level  ], texcoord[i], t0);
+         sample_2d_nearest(ctx, tObj, tObj->Image[level+1], texcoord[i], t1);
+         rgba[i][RCOMP] = CHAN_CAST ((1.0F-f) * t0[RCOMP] + f * t1[RCOMP]);
+         rgba[i][GCOMP] = CHAN_CAST ((1.0F-f) * t0[GCOMP] + f * t1[GCOMP]);
+         rgba[i][BCOMP] = CHAN_CAST ((1.0F-f) * t0[BCOMP] + f * t1[BCOMP]);
+         rgba[i][ACOMP] = CHAN_CAST ((1.0F-f) * t0[ACOMP] + f * t1[ACOMP]);
+      }
+   }
+}
+
+
+
+/* Trilinear filtering */
+static void
+sample_2d_linear_mipmap_linear( GLcontext *ctx,
+                                const struct gl_texture_object *tObj,
+                                GLuint n, const GLfloat texcoord[][4],
+                                const GLfloat lambda[], GLchan rgba[][4] )
+{
+   GLuint i;
+   ASSERT(lambda != NULL);
+   for (i = 0; i < n; i++) {
+      GLint level;
+      COMPUTE_LINEAR_MIPMAP_LEVEL(tObj, lambda[i], level);
+      if (level >= tObj->_MaxLevel) {
+         sample_2d_linear(ctx, tObj, tObj->Image[tObj->_MaxLevel],
+                          texcoord[i], rgba[i]);
+      }
+      else {
+         GLchan t0[4], t1[4];  /* texels */
+         const GLfloat f = FRAC(lambda[i]);
+         sample_2d_linear(ctx, tObj, tObj->Image[level  ], texcoord[i], t0);
+         sample_2d_linear(ctx, tObj, tObj->Image[level+1], texcoord[i], t1);
+         rgba[i][RCOMP] = CHAN_CAST ((1.0F-f) * t0[RCOMP] + f * t1[RCOMP]);
+         rgba[i][GCOMP] = CHAN_CAST ((1.0F-f) * t0[GCOMP] + f * t1[GCOMP]);
+         rgba[i][BCOMP] = CHAN_CAST ((1.0F-f) * t0[BCOMP] + f * t1[BCOMP]);
+         rgba[i][ACOMP] = CHAN_CAST ((1.0F-f) * t0[ACOMP] + f * t1[ACOMP]);
+      }
+   }
+}
+
+
+static void
+sample_2d_linear_mipmap_linear_repeat( GLcontext *ctx,
+                                       const struct gl_texture_object *tObj,
+                                       GLuint n, const GLfloat texcoord[][4],
+                                       const GLfloat lambda[], GLchan rgba[][4] )
+{
+   GLuint i;
+   ASSERT(lambda != NULL);
+   ASSERT(tObj->WrapS == GL_REPEAT);
+   ASSERT(tObj->WrapT == GL_REPEAT);
+   ASSERT(tObj->_IsPowerOfTwo);
+   for (i = 0; i < n; i++) {
+      GLint level;
+      COMPUTE_LINEAR_MIPMAP_LEVEL(tObj, lambda[i], level);
+      if (level >= tObj->_MaxLevel) {
+         sample_2d_linear_repeat(ctx, tObj, tObj->Image[tObj->_MaxLevel],
+                                 texcoord[i], rgba[i]);
+      }
+      else {
+         GLchan t0[4], t1[4];  /* texels */
+         const GLfloat f = FRAC(lambda[i]);
+         sample_2d_linear_repeat(ctx, tObj, tObj->Image[level  ], texcoord[i], t0);
+         sample_2d_linear_repeat(ctx, tObj, tObj->Image[level+1], texcoord[i], t1);
+         rgba[i][RCOMP] = CHAN_CAST ((1.0F-f) * t0[RCOMP] + f * t1[RCOMP]);
+         rgba[i][GCOMP] = CHAN_CAST ((1.0F-f) * t0[GCOMP] + f * t1[GCOMP]);
+         rgba[i][BCOMP] = CHAN_CAST ((1.0F-f) * t0[BCOMP] + f * t1[BCOMP]);
+         rgba[i][ACOMP] = CHAN_CAST ((1.0F-f) * t0[ACOMP] + f * t1[ACOMP]);
+      }
+   }
+}
+
+
+static void
+sample_nearest_2d( GLcontext *ctx, GLuint texUnit,
+                   const struct gl_texture_object *tObj, GLuint n,
+                   const GLfloat texcoords[][4],
+                   const GLfloat lambda[], GLchan rgba[][4] )
+{
+   GLuint i;
+   struct gl_texture_image *image = tObj->Image[tObj->BaseLevel];
+   (void) lambda;
+   for (i=0;i<n;i++) {
+      sample_2d_nearest(ctx, tObj, image, texcoords[i], rgba[i]);
+   }
+}
+
+
+
+static void
+sample_linear_2d( GLcontext *ctx, GLuint texUnit,
+                  const struct gl_texture_object *tObj, GLuint n,
+                  const GLfloat texcoords[][4],
+                  const GLfloat lambda[], GLchan rgba[][4] )
+{
+   GLuint i;
+   struct gl_texture_image *image = tObj->Image[tObj->BaseLevel];
+   (void) lambda;
+   for (i=0;i<n;i++) {
+      sample_2d_linear(ctx, tObj, image, texcoords[i], rgba[i]);
+   }
+}
+
+
+/*
+ * Optimized 2-D texture sampling:
+ *    S and T wrap mode == GL_REPEAT
+ *    GL_NEAREST min/mag filter
+ *    No border, 
+ *    RowStride == Width,
+ *    Format = GL_RGB
+ */
+static void
+opt_sample_rgb_2d( GLcontext *ctx, GLuint texUnit,
+                   const struct gl_texture_object *tObj,
+                   GLuint n, const GLfloat texcoords[][4],
+                   const GLfloat lambda[], GLchan rgba[][4] )
+{
+   const struct gl_texture_image *img = tObj->Image[tObj->BaseLevel];
+   const GLfloat width = (GLfloat) img->Width;
+   const GLfloat height = (GLfloat) img->Height;
+   const GLint colMask = img->Width - 1;
+   const GLint rowMask = img->Height - 1;
+   const GLint shift = img->WidthLog2;
+   GLuint k;
+   (void) lambda;
+   ASSERT(tObj->WrapS==GL_REPEAT);
+   ASSERT(tObj->WrapT==GL_REPEAT);
+   ASSERT(img->Border==0);
+   ASSERT(img->Format==GL_RGB);
+   ASSERT(img->_IsPowerOfTwo);
+
+   for (k=0; k<n; k++) {
+      GLint i = IFLOOR(texcoords[k][0] * width) & colMask;
+      GLint j = IFLOOR(texcoords[k][1] * height) & rowMask;
+      GLint pos = (j << shift) | i;
+      GLchan *texel = ((GLchan *) img->Data) + 3*pos;
+      rgba[k][RCOMP] = texel[0];
+      rgba[k][GCOMP] = texel[1];
+      rgba[k][BCOMP] = texel[2];
+   }
+}
+
+
+/*
+ * Optimized 2-D texture sampling:
+ *    S and T wrap mode == GL_REPEAT
+ *    GL_NEAREST min/mag filter
+ *    No border
+ *    RowStride == Width,
+ *    Format = GL_RGBA
+ */
+static void
+opt_sample_rgba_2d( GLcontext *ctx, GLuint texUnit,
+                    const struct gl_texture_object *tObj,
+                    GLuint n, const GLfloat texcoords[][4],
+                    const GLfloat lambda[], GLchan rgba[][4] )
+{
+   const struct gl_texture_image *img = tObj->Image[tObj->BaseLevel];
+   const GLfloat width = (GLfloat) img->Width;
+   const GLfloat height = (GLfloat) img->Height;
+   const GLint colMask = img->Width - 1;
+   const GLint rowMask = img->Height - 1;
+   const GLint shift = img->WidthLog2;
+   GLuint i;
+   (void) lambda;
+   ASSERT(tObj->WrapS==GL_REPEAT);
+   ASSERT(tObj->WrapT==GL_REPEAT);
+   ASSERT(img->Border==0);
+   ASSERT(img->Format==GL_RGBA);
+   ASSERT(img->_IsPowerOfTwo);
+
+   for (i = 0; i < n; i++) {
+      const GLint col = IFLOOR(texcoords[i][0] * width) & colMask;
+      const GLint row = IFLOOR(texcoords[i][1] * height) & rowMask;
+      const GLint pos = (row << shift) | col;
+      const GLchan *texel = ((GLchan *) img->Data) + (pos << 2);    /* pos*4 */
+      COPY_CHAN4(rgba[i], texel);
+   }
+}
+
+
+/*
+ * Given an array of texture coordinate and lambda (level of detail)
+ * values, return an array of texture sample.
+ */
+static void
+sample_lambda_2d( GLcontext *ctx, GLuint texUnit,
+                  const struct gl_texture_object *tObj,
+                  GLuint n, const GLfloat texcoords[][4],
+                  const GLfloat lambda[], GLchan rgba[][4] )
+{
+   const struct gl_texture_image *tImg = tObj->Image[tObj->BaseLevel];
+   GLuint minStart, minEnd;  /* texels with minification */
+   GLuint magStart, magEnd;  /* texels with magnification */
+
+   const GLboolean repeatNoBorderPOT = (tObj->WrapS == GL_REPEAT)
+      && (tObj->WrapT == GL_REPEAT)
+      && (tImg->Border == 0 && (tImg->Width == tImg->RowStride))
+      && (tImg->Format != GL_COLOR_INDEX)
+      && tImg->_IsPowerOfTwo;
+
+   ASSERT(lambda != NULL);
+   compute_min_mag_ranges(SWRAST_CONTEXT(ctx)->_MinMagThresh[texUnit],
+                          n, lambda, &minStart, &minEnd, &magStart, &magEnd);
+
+   if (minStart < minEnd) {
+      /* do the minified texels */
+      const GLuint m = minEnd - minStart;
+      switch (tObj->MinFilter) {
+      case GL_NEAREST:
+         if (repeatNoBorderPOT) {
+            switch (tImg->Format) {
+            case GL_RGB:
+               opt_sample_rgb_2d(ctx, texUnit, tObj, m, texcoords + minStart,
+                                 NULL, rgba + minStart);
+               break;
+            case GL_RGBA:
+	       opt_sample_rgba_2d(ctx, texUnit, tObj, m, texcoords + minStart,
+                                  NULL, rgba + minStart);
+               break;
+            default:
+               sample_nearest_2d(ctx, texUnit, tObj, m, texcoords + minStart,
+                                 NULL, rgba + minStart );
+            }
+         }
+         else {
+            sample_nearest_2d(ctx, texUnit, tObj, m, texcoords + minStart,
+                              NULL, rgba + minStart);
+         }
+         break;
+      case GL_LINEAR:
+	 sample_linear_2d(ctx, texUnit, tObj, m, texcoords + minStart,
+			  NULL, rgba + minStart);
+         break;
+      case GL_NEAREST_MIPMAP_NEAREST:
+         sample_2d_nearest_mipmap_nearest(ctx, tObj, m,
+                                          texcoords + minStart,
+                                          lambda + minStart, rgba + minStart);
+         break;
+      case GL_LINEAR_MIPMAP_NEAREST:
+         sample_2d_linear_mipmap_nearest(ctx, tObj, m, texcoords + minStart,
+                                         lambda + minStart, rgba + minStart);
+         break;
+      case GL_NEAREST_MIPMAP_LINEAR:
+         sample_2d_nearest_mipmap_linear(ctx, tObj, m, texcoords + minStart,
+                                         lambda + minStart, rgba + minStart);
+         break;
+      case GL_LINEAR_MIPMAP_LINEAR:
+         if (repeatNoBorderPOT)
+            sample_2d_linear_mipmap_linear_repeat(ctx, tObj, m,
+                  texcoords + minStart, lambda + minStart, rgba + minStart);
+         else
+            sample_2d_linear_mipmap_linear(ctx, tObj, m, texcoords + minStart,
+                                        lambda + minStart, rgba + minStart);
+         break;
+      default:
+         _mesa_problem(ctx, "Bad min filter in sample_2d_texture");
+         return;
+      }
+   }
+
+   if (magStart < magEnd) {
+      /* do the magnified texels */
+      const GLuint m = magEnd - magStart;
+
+      switch (tObj->MagFilter) {
+      case GL_NEAREST:
+         if (repeatNoBorderPOT) {
+            switch (tImg->Format) {
+            case GL_RGB:
+               opt_sample_rgb_2d(ctx, texUnit, tObj, m, texcoords + magStart,
+                                 NULL, rgba + magStart);
+               break;
+            case GL_RGBA:
+	       opt_sample_rgba_2d(ctx, texUnit, tObj, m, texcoords + magStart,
+                                  NULL, rgba + magStart);
+               break;
+            default:
+               sample_nearest_2d(ctx, texUnit, tObj, m, texcoords + magStart,
+                                 NULL, rgba + magStart );
+            }
+         }
+         else {
+            sample_nearest_2d(ctx, texUnit, tObj, m, texcoords + magStart,
+                              NULL, rgba + magStart);
+         }
+         break;
+      case GL_LINEAR:
+	 sample_linear_2d(ctx, texUnit, tObj, m, texcoords + magStart,
+			  NULL, rgba + magStart);
+         break;
+      default:
+         _mesa_problem(ctx, "Bad mag filter in sample_lambda_2d");
+      }
+   }
+}
+
+
+
+/**********************************************************************/
+/*                    3-D Texture Sampling Functions                  */
+/**********************************************************************/
+
+/*
+ * Return the texture sample for coordinate (s,t,r) using GL_NEAREST filter.
+ */
+static void
+sample_3d_nearest(GLcontext *ctx,
+                  const struct gl_texture_object *tObj,
+                  const struct gl_texture_image *img,
+                  const GLfloat texcoord[4],
+                  GLchan rgba[4])
+{
+   const GLint width = img->Width2;     /* without border, power of two */
+   const GLint height = img->Height2;   /* without border, power of two */
+   const GLint depth = img->Depth2;     /* without border, power of two */
+   GLint i, j, k;
+
+   COMPUTE_NEAREST_TEXEL_LOCATION(tObj->WrapS, texcoord[0], width,  i);
+   COMPUTE_NEAREST_TEXEL_LOCATION(tObj->WrapT, texcoord[1], height, j);
+   COMPUTE_NEAREST_TEXEL_LOCATION(tObj->WrapR, texcoord[2], depth,  k);
+
+   if (i < 0 || i >= (GLint) img->Width ||
+       j < 0 || j >= (GLint) img->Height ||
+       k < 0 || k >= (GLint) img->Depth) {
+      /* Need this test for GL_CLAMP_TO_BORDER mode */
+      COPY_CHAN4(rgba, tObj->_BorderChan);
+   }
+   else {
+      (*img->FetchTexel)(img, i, j, k, (GLvoid *) rgba);
+      if (img->Format == GL_COLOR_INDEX) {
+         palette_sample(ctx, tObj, rgba[0], rgba);
+      }
+   }
+}
+
+
+
+/*
+ * Return the texture sample for coordinate (s,t,r) using GL_LINEAR filter.
+ */
+static void
+sample_3d_linear(GLcontext *ctx,
+                 const struct gl_texture_object *tObj,
+                 const struct gl_texture_image *img,
+                 const GLfloat texcoord[4],
+                 GLchan rgba[4])
+{
+   const GLint width = img->Width2;
+   const GLint height = img->Height2;
+   const GLint depth = img->Depth2;
+   GLint i0, j0, k0, i1, j1, k1;
+   GLuint useBorderColor;
+   GLfloat u, v, w;
+
+   COMPUTE_LINEAR_TEXEL_LOCATIONS(tObj->WrapS, texcoord[0], u, width,  i0, i1);
+   COMPUTE_LINEAR_TEXEL_LOCATIONS(tObj->WrapT, texcoord[1], v, height, j0, j1);
+   COMPUTE_LINEAR_TEXEL_LOCATIONS(tObj->WrapR, texcoord[2], w, depth,  k0, k1);
+
+   useBorderColor = 0;
+   if (img->Border) {
+      i0 += img->Border;
+      i1 += img->Border;
+      j0 += img->Border;
+      j1 += img->Border;
+      k0 += img->Border;
+      k1 += img->Border;
+   }
+   else {
+      /* check if sampling texture border color */
+      if (i0 < 0 || i0 >= width)   useBorderColor |= I0BIT;
+      if (i1 < 0 || i1 >= width)   useBorderColor |= I1BIT;
+      if (j0 < 0 || j0 >= height)  useBorderColor |= J0BIT;
+      if (j1 < 0 || j1 >= height)  useBorderColor |= J1BIT;
+      if (k0 < 0 || k0 >= depth)   useBorderColor |= K0BIT;
+      if (k1 < 0 || k1 >= depth)   useBorderColor |= K1BIT;
+   }
+
+   {
+      const GLfloat a = FRAC(u);
+      const GLfloat b = FRAC(v);
+      const GLfloat c = FRAC(w);
+
+#if CHAN_TYPE == GL_FLOAT || CHAN_TYPE == GL_UNSIGNED_SHORT
+      /* compute sample weights in fixed point in [0,WEIGHT_SCALE] */
+      GLfloat w000 = (1.0F-a) * (1.0F-b) * (1.0F-c);
+      GLfloat w100 =       a  * (1.0F-b) * (1.0F-c);
+      GLfloat w010 = (1.0F-a) *       b  * (1.0F-c);
+      GLfloat w110 =       a  *       b  * (1.0F-c);
+      GLfloat w001 = (1.0F-a) * (1.0F-b) *       c ;
+      GLfloat w101 =       a  * (1.0F-b) *       c ;
+      GLfloat w011 = (1.0F-a) *       b  *       c ;
+      GLfloat w111 =       a  *       b  *       c ;
+#else /* CHAN_BITS == 8 */
+      /* compute sample weights in fixed point in [0,WEIGHT_SCALE] */
+      GLint w000 = IROUND_POS((1.0F-a) * (1.0F-b) * (1.0F-c) * WEIGHT_SCALE);
+      GLint w100 = IROUND_POS(      a  * (1.0F-b) * (1.0F-c) * WEIGHT_SCALE);
+      GLint w010 = IROUND_POS((1.0F-a) *       b  * (1.0F-c) * WEIGHT_SCALE);
+      GLint w110 = IROUND_POS(      a  *       b  * (1.0F-c) * WEIGHT_SCALE);
+      GLint w001 = IROUND_POS((1.0F-a) * (1.0F-b) *       c  * WEIGHT_SCALE);
+      GLint w101 = IROUND_POS(      a  * (1.0F-b) *       c  * WEIGHT_SCALE);
+      GLint w011 = IROUND_POS((1.0F-a) *       b  *       c  * WEIGHT_SCALE);
+      GLint w111 = IROUND_POS(      a  *       b  *       c  * WEIGHT_SCALE);
+#endif
+
+      GLchan t000[4], t010[4], t001[4], t011[4];
+      GLchan t100[4], t110[4], t101[4], t111[4];
+
+      if (useBorderColor & (I0BIT | J0BIT | K0BIT)) {
+         COPY_CHAN4(t000, tObj->_BorderChan);
+      }
+      else {
+         (*img->FetchTexel)(img, i0, j0, k0, (GLvoid *) t000);
+         if (img->Format == GL_COLOR_INDEX) {
+            palette_sample(ctx, tObj, t000[0], t000);
+         }
+      }
+      if (useBorderColor & (I1BIT | J0BIT | K0BIT)) {
+         COPY_CHAN4(t100, tObj->_BorderChan);
+      }
+      else {
+         (*img->FetchTexel)(img, i1, j0, k0, (GLvoid *) t100);
+         if (img->Format == GL_COLOR_INDEX) {
+            palette_sample(ctx, tObj, t100[0], t100);
+         }
+      }
+      if (useBorderColor & (I0BIT | J1BIT | K0BIT)) {
+         COPY_CHAN4(t010, tObj->_BorderChan);
+      }
+      else {
+         (*img->FetchTexel)(img, i0, j1, k0, (GLvoid *) t010);
+         if (img->Format == GL_COLOR_INDEX) {
+            palette_sample(ctx, tObj, t010[0], t010);
+         }
+      }
+      if (useBorderColor & (I1BIT | J1BIT | K0BIT)) {
+         COPY_CHAN4(t110, tObj->_BorderChan);
+      }
+      else {
+         (*img->FetchTexel)(img, i1, j1, k0, (GLvoid *) t110);
+         if (img->Format == GL_COLOR_INDEX) {
+            palette_sample(ctx, tObj, t110[0], t110);
+         }
+      }
+
+      if (useBorderColor & (I0BIT | J0BIT | K1BIT)) {
+         COPY_CHAN4(t001, tObj->_BorderChan);
+      }
+      else {
+         (*img->FetchTexel)(img, i0, j0, k1, (GLvoid *) t001);
+         if (img->Format == GL_COLOR_INDEX) {
+            palette_sample(ctx, tObj, t001[0], t001);
+         }
+      }
+      if (useBorderColor & (I1BIT | J0BIT | K1BIT)) {
+         COPY_CHAN4(t101, tObj->_BorderChan);
+      }
+      else {
+         (*img->FetchTexel)(img, i1, j0, k1, (GLvoid *) t101);
+         if (img->Format == GL_COLOR_INDEX) {
+            palette_sample(ctx, tObj, t101[0], t101);
+         }
+      }
+      if (useBorderColor & (I0BIT | J1BIT | K1BIT)) {
+         COPY_CHAN4(t011, tObj->_BorderChan);
+      }
+      else {
+         (*img->FetchTexel)(img, i0, j1, k1, (GLvoid *) t011);
+         if (img->Format == GL_COLOR_INDEX) {
+            palette_sample(ctx, tObj, t011[0], t011);
+         }
+      }
+      if (useBorderColor & (I1BIT | J1BIT | K1BIT)) {
+         COPY_CHAN4(t111, tObj->_BorderChan);
+      }
+      else {
+         (*img->FetchTexel)(img, i1, j1, k1, (GLvoid *) t111);
+         if (img->Format == GL_COLOR_INDEX) {
+            palette_sample(ctx, tObj, t111[0], t111);
+         }
+      }
+
+#if CHAN_TYPE == GL_FLOAT
+      rgba[0] = w000*t000[0] + w010*t010[0] + w001*t001[0] + w011*t011[0] +
+                w100*t100[0] + w110*t110[0] + w101*t101[0] + w111*t111[0];
+      rgba[1] = w000*t000[1] + w010*t010[1] + w001*t001[1] + w011*t011[1] +
+                w100*t100[1] + w110*t110[1] + w101*t101[1] + w111*t111[1];
+      rgba[2] = w000*t000[2] + w010*t010[2] + w001*t001[2] + w011*t011[2] +
+                w100*t100[2] + w110*t110[2] + w101*t101[2] + w111*t111[2];
+      rgba[3] = w000*t000[3] + w010*t010[3] + w001*t001[3] + w011*t011[3] +
+                w100*t100[3] + w110*t110[3] + w101*t101[3] + w111*t111[3];
+#elif CHAN_TYPE == GL_UNSIGNED_SHORT
+      rgba[0] = (GLchan) (w000*t000[0] + w010*t010[0] +
+                          w001*t001[0] + w011*t011[0] +
+                          w100*t100[0] + w110*t110[0] +
+                          w101*t101[0] + w111*t111[0] + 0.5);
+      rgba[1] = (GLchan) (w000*t000[1] + w010*t010[1] +
+                          w001*t001[1] + w011*t011[1] +
+                          w100*t100[1] + w110*t110[1] +
+                          w101*t101[1] + w111*t111[1] + 0.5);
+      rgba[2] = (GLchan) (w000*t000[2] + w010*t010[2] +
+                          w001*t001[2] + w011*t011[2] +
+                          w100*t100[2] + w110*t110[2] +
+                          w101*t101[2] + w111*t111[2] + 0.5);
+      rgba[3] = (GLchan) (w000*t000[3] + w010*t010[3] +
+                          w001*t001[3] + w011*t011[3] +
+                          w100*t100[3] + w110*t110[3] +
+                          w101*t101[3] + w111*t111[3] + 0.5);
+#else /* CHAN_BITS == 8 */
+      rgba[0] = (GLchan) (
+                 (w000*t000[0] + w010*t010[0] + w001*t001[0] + w011*t011[0] +
+                  w100*t100[0] + w110*t110[0] + w101*t101[0] + w111*t111[0] )
+                 >> WEIGHT_SHIFT);
+      rgba[1] = (GLchan) (
+                 (w000*t000[1] + w010*t010[1] + w001*t001[1] + w011*t011[1] +
+                  w100*t100[1] + w110*t110[1] + w101*t101[1] + w111*t111[1] )
+                 >> WEIGHT_SHIFT);
+      rgba[2] = (GLchan) (
+                 (w000*t000[2] + w010*t010[2] + w001*t001[2] + w011*t011[2] +
+                  w100*t100[2] + w110*t110[2] + w101*t101[2] + w111*t111[2] )
+                 >> WEIGHT_SHIFT);
+      rgba[3] = (GLchan) (
+                 (w000*t000[3] + w010*t010[3] + w001*t001[3] + w011*t011[3] +
+                  w100*t100[3] + w110*t110[3] + w101*t101[3] + w111*t111[3] )
+                 >> WEIGHT_SHIFT);
+#endif
+
+   }
+}
+
+
+
+static void
+sample_3d_nearest_mipmap_nearest(GLcontext *ctx,
+                                 const struct gl_texture_object *tObj,
+                                 GLuint n, const GLfloat texcoord[][4],
+                                 const GLfloat lambda[], GLchan rgba[][4] )
+{
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      GLint level;
+      COMPUTE_NEAREST_MIPMAP_LEVEL(tObj, lambda[i], level);
+      sample_3d_nearest(ctx, tObj, tObj->Image[level], texcoord[i], rgba[i]);
+   }
+}
+
+
+static void
+sample_3d_linear_mipmap_nearest(GLcontext *ctx,
+                                const struct gl_texture_object *tObj,
+                                GLuint n, const GLfloat texcoord[][4],
+                                const GLfloat lambda[], GLchan rgba[][4])
+{
+   GLuint i;
+   ASSERT(lambda != NULL);
+   for (i = 0; i < n; i++) {
+      GLint level;
+      COMPUTE_NEAREST_MIPMAP_LEVEL(tObj, lambda[i], level);
+      sample_3d_linear(ctx, tObj, tObj->Image[level], texcoord[i], rgba[i]);
+   }
+}
+
+
+static void
+sample_3d_nearest_mipmap_linear(GLcontext *ctx,
+                                const struct gl_texture_object *tObj,
+                                GLuint n, const GLfloat texcoord[][4],
+                                const GLfloat lambda[], GLchan rgba[][4])
+{
+   GLuint i;
+   ASSERT(lambda != NULL);
+   for (i = 0; i < n; i++) {
+      GLint level;
+      COMPUTE_LINEAR_MIPMAP_LEVEL(tObj, lambda[i], level);
+      if (level >= tObj->_MaxLevel) {
+         sample_3d_nearest(ctx, tObj, tObj->Image[tObj->_MaxLevel],
+                           texcoord[i], rgba[i]);
+      }
+      else {
+         GLchan t0[4], t1[4];  /* texels */
+         const GLfloat f = FRAC(lambda[i]);
+         sample_3d_nearest(ctx, tObj, tObj->Image[level  ], texcoord[i], t0);
+         sample_3d_nearest(ctx, tObj, tObj->Image[level+1], texcoord[i], t1);
+         rgba[i][RCOMP] = CHAN_CAST ((1.0F-f) * t0[RCOMP] + f * t1[RCOMP]);
+         rgba[i][GCOMP] = CHAN_CAST ((1.0F-f) * t0[GCOMP] + f * t1[GCOMP]);
+         rgba[i][BCOMP] = CHAN_CAST ((1.0F-f) * t0[BCOMP] + f * t1[BCOMP]);
+         rgba[i][ACOMP] = CHAN_CAST ((1.0F-f) * t0[ACOMP] + f * t1[ACOMP]);
+      }
+   }
+}
+
+
+static void
+sample_3d_linear_mipmap_linear(GLcontext *ctx,
+                               const struct gl_texture_object *tObj,
+                               GLuint n, const GLfloat texcoord[][4],
+                               const GLfloat lambda[], GLchan rgba[][4])
+{
+   GLuint i;
+   ASSERT(lambda != NULL);
+   for (i = 0; i < n; i++) {
+      GLint level;
+      COMPUTE_LINEAR_MIPMAP_LEVEL(tObj, lambda[i], level);
+      if (level >= tObj->_MaxLevel) {
+         sample_3d_linear(ctx, tObj, tObj->Image[tObj->_MaxLevel],
+                          texcoord[i], rgba[i]);
+      }
+      else {
+         GLchan t0[4], t1[4];  /* texels */
+         const GLfloat f = FRAC(lambda[i]);
+         sample_3d_linear(ctx, tObj, tObj->Image[level  ], texcoord[i], t0);
+         sample_3d_linear(ctx, tObj, tObj->Image[level+1], texcoord[i], t1);
+         rgba[i][RCOMP] = CHAN_CAST ((1.0F-f) * t0[RCOMP] + f * t1[RCOMP]);
+         rgba[i][GCOMP] = CHAN_CAST ((1.0F-f) * t0[GCOMP] + f * t1[GCOMP]);
+         rgba[i][BCOMP] = CHAN_CAST ((1.0F-f) * t0[BCOMP] + f * t1[BCOMP]);
+         rgba[i][ACOMP] = CHAN_CAST ((1.0F-f) * t0[ACOMP] + f * t1[ACOMP]);
+      }
+   }
+}
+
+
+static void
+sample_nearest_3d(GLcontext *ctx, GLuint texUnit,
+                  const struct gl_texture_object *tObj, GLuint n,
+                  const GLfloat texcoords[][4], const GLfloat lambda[],
+                  GLchan rgba[][4])
+{
+   GLuint i;
+   struct gl_texture_image *image = tObj->Image[tObj->BaseLevel];
+   (void) lambda;
+   for (i=0;i<n;i++) {
+      sample_3d_nearest(ctx, tObj, image, texcoords[i], rgba[i]);
+   }
+}
+
+
+
+static void
+sample_linear_3d( GLcontext *ctx, GLuint texUnit,
+                  const struct gl_texture_object *tObj, GLuint n,
+                  const GLfloat texcoords[][4],
+		  const GLfloat lambda[], GLchan rgba[][4] )
+{
+   GLuint i;
+   struct gl_texture_image *image = tObj->Image[tObj->BaseLevel];
+   (void) lambda;
+   for (i=0;i<n;i++) {
+      sample_3d_linear(ctx, tObj, image, texcoords[i], rgba[i]);
+   }
+}
+
+
+/*
+ * Given an (s,t,r) texture coordinate and lambda (level of detail) value,
+ * return a texture sample.
+ */
+static void
+sample_lambda_3d( GLcontext *ctx, GLuint texUnit,
+                  const struct gl_texture_object *tObj, GLuint n,
+                  const GLfloat texcoords[][4], const GLfloat lambda[],
+                  GLchan rgba[][4] )
+{
+   GLuint minStart, minEnd;  /* texels with minification */
+   GLuint magStart, magEnd;  /* texels with magnification */
+   GLuint i;
+
+   ASSERT(lambda != NULL);
+   compute_min_mag_ranges(SWRAST_CONTEXT(ctx)->_MinMagThresh[texUnit],
+                          n, lambda, &minStart, &minEnd, &magStart, &magEnd);
+
+   if (minStart < minEnd) {
+      /* do the minified texels */
+      GLuint m = minEnd - minStart;
+      switch (tObj->MinFilter) {
+      case GL_NEAREST:
+         for (i = minStart; i < minEnd; i++)
+            sample_3d_nearest(ctx, tObj, tObj->Image[tObj->BaseLevel],
+                              texcoords[i], rgba[i]);
+         break;
+      case GL_LINEAR:
+         for (i = minStart; i < minEnd; i++)
+            sample_3d_linear(ctx, tObj, tObj->Image[tObj->BaseLevel],
+                             texcoords[i], rgba[i]);
+         break;
+      case GL_NEAREST_MIPMAP_NEAREST:
+         sample_3d_nearest_mipmap_nearest(ctx, tObj, m, texcoords + minStart,
+                                          lambda + minStart, rgba + minStart);
+         break;
+      case GL_LINEAR_MIPMAP_NEAREST:
+         sample_3d_linear_mipmap_nearest(ctx, tObj, m, texcoords + minStart,
+                                         lambda + minStart, rgba + minStart);
+         break;
+      case GL_NEAREST_MIPMAP_LINEAR:
+         sample_3d_nearest_mipmap_linear(ctx, tObj, m, texcoords + minStart,
+                                         lambda + minStart, rgba + minStart);
+         break;
+      case GL_LINEAR_MIPMAP_LINEAR:
+         sample_3d_linear_mipmap_linear(ctx, tObj, m, texcoords + minStart,
+                                        lambda + minStart, rgba + minStart);
+         break;
+      default:
+         _mesa_problem(ctx, "Bad min filter in sample_3d_texture");
+         return;
+      }
+   }
+
+   if (magStart < magEnd) {
+      /* do the magnified texels */
+      switch (tObj->MagFilter) {
+      case GL_NEAREST:
+         for (i = magStart; i < magEnd; i++)
+            sample_3d_nearest(ctx, tObj, tObj->Image[tObj->BaseLevel],
+                              texcoords[i], rgba[i]);
+         break;
+      case GL_LINEAR:
+         for (i = magStart; i < magEnd; i++)
+            sample_3d_linear(ctx, tObj, tObj->Image[tObj->BaseLevel],
+                             texcoords[i], rgba[i]);
+         break;
+      default:
+         _mesa_problem(ctx, "Bad mag filter in sample_3d_texture");
+         return;
+      }
+   }
+}
+
+
+/**********************************************************************/
+/*                Texture Cube Map Sampling Functions                 */
+/**********************************************************************/
+
+/*
+ * Choose one of six sides of a texture cube map given the texture
+ * coord (rx,ry,rz).  Return pointer to corresponding array of texture
+ * images.
+ */
+static const struct gl_texture_image **
+choose_cube_face(const struct gl_texture_object *texObj,
+                 const GLfloat texcoord[4], GLfloat newCoord[4])
+{
+/*
+      major axis
+      direction     target                             sc     tc    ma
+      ----------    -------------------------------    ---    ---   ---
+       +rx          TEXTURE_CUBE_MAP_POSITIVE_X_EXT    -rz    -ry   rx
+       -rx          TEXTURE_CUBE_MAP_NEGATIVE_X_EXT    +rz    -ry   rx
+       +ry          TEXTURE_CUBE_MAP_POSITIVE_Y_EXT    +rx    +rz   ry
+       -ry          TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT    +rx    -rz   ry
+       +rz          TEXTURE_CUBE_MAP_POSITIVE_Z_EXT    +rx    -ry   rz
+       -rz          TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT    -rx    -ry   rz
+*/
+   const GLfloat rx = texcoord[0];
+   const GLfloat ry = texcoord[1];
+   const GLfloat rz = texcoord[2];
+   const struct gl_texture_image **imgArray;
+   const GLfloat arx = FABSF(rx),   ary = FABSF(ry),   arz = FABSF(rz);
+   GLfloat sc, tc, ma;
+
+   if (arx > ary && arx > arz) {
+      if (rx >= 0.0F) {
+         imgArray = (const struct gl_texture_image **) texObj->Image;
+         sc = -rz;
+         tc = -ry;
+         ma = arx;
+      }
+      else {
+         imgArray = (const struct gl_texture_image **) texObj->NegX;
+         sc = rz;
+         tc = -ry;
+         ma = arx;
+      }
+   }
+   else if (ary > arx && ary > arz) {
+      if (ry >= 0.0F) {
+         imgArray = (const struct gl_texture_image **) texObj->PosY;
+         sc = rx;
+         tc = rz;
+         ma = ary;
+      }
+      else {
+         imgArray = (const struct gl_texture_image **) texObj->NegY;
+         sc = rx;
+         tc = -rz;
+         ma = ary;
+      }
+   }
+   else {
+      if (rz > 0.0F) {
+         imgArray = (const struct gl_texture_image **) texObj->PosZ;
+         sc = rx;
+         tc = -ry;
+         ma = arz;
+      }
+      else {
+         imgArray = (const struct gl_texture_image **) texObj->NegZ;
+         sc = -rx;
+         tc = -ry;
+         ma = arz;
+      }
+   }
+
+   newCoord[0] = ( sc / ma + 1.0F ) * 0.5F;
+   newCoord[1] = ( tc / ma + 1.0F ) * 0.5F;
+   return imgArray;
+}
+
+
+static void
+sample_nearest_cube(GLcontext *ctx, GLuint texUnit,
+		    const struct gl_texture_object *tObj, GLuint n,
+                    const GLfloat texcoords[][4], const GLfloat lambda[],
+                    GLchan rgba[][4])
+{
+   GLuint i;
+   (void) lambda;
+   for (i = 0; i < n; i++) {
+      const struct gl_texture_image **images;
+      GLfloat newCoord[4];
+      images = choose_cube_face(tObj, texcoords[i], newCoord);
+      sample_2d_nearest(ctx, tObj, images[tObj->BaseLevel],
+                        newCoord, rgba[i]);
+   }
+}
+
+
+static void
+sample_linear_cube(GLcontext *ctx, GLuint texUnit,
+		   const struct gl_texture_object *tObj, GLuint n,
+                   const GLfloat texcoords[][4],
+		   const GLfloat lambda[], GLchan rgba[][4])
+{
+   GLuint i;
+   (void) lambda;
+   for (i = 0; i < n; i++) {
+      const struct gl_texture_image **images;
+      GLfloat newCoord[4];
+      images = choose_cube_face(tObj, texcoords[i], newCoord);
+      sample_2d_linear(ctx, tObj, images[tObj->BaseLevel],
+                       newCoord, rgba[i]);
+   }
+}
+
+
+static void
+sample_cube_nearest_mipmap_nearest(GLcontext *ctx, GLuint texUnit,
+                                   const struct gl_texture_object *tObj,
+                                   GLuint n, const GLfloat texcoord[][4],
+                                   const GLfloat lambda[], GLchan rgba[][4])
+{
+   GLuint i;
+   ASSERT(lambda != NULL);
+   for (i = 0; i < n; i++) {
+      const struct gl_texture_image **images;
+      GLfloat newCoord[4];
+      GLint level;
+      COMPUTE_NEAREST_MIPMAP_LEVEL(tObj, lambda[i], level);
+      images = choose_cube_face(tObj, texcoord[i], newCoord);
+      sample_2d_nearest(ctx, tObj, images[level], newCoord, rgba[i]);
+   }
+}
+
+
+static void
+sample_cube_linear_mipmap_nearest(GLcontext *ctx, GLuint texUnit,
+                                  const struct gl_texture_object *tObj,
+                                  GLuint n, const GLfloat texcoord[][4],
+                                  const GLfloat lambda[], GLchan rgba[][4])
+{
+   GLuint i;
+   ASSERT(lambda != NULL);
+   for (i = 0; i < n; i++) {
+      const struct gl_texture_image **images;
+      GLfloat newCoord[4];
+      GLint level;
+      COMPUTE_NEAREST_MIPMAP_LEVEL(tObj, lambda[i], level);
+      images = choose_cube_face(tObj, texcoord[i], newCoord);
+      sample_2d_linear(ctx, tObj, images[level], newCoord, rgba[i]);
+   }
+}
+
+
+static void
+sample_cube_nearest_mipmap_linear(GLcontext *ctx, GLuint texUnit,
+                                  const struct gl_texture_object *tObj,
+                                  GLuint n, const GLfloat texcoord[][4],
+                                  const GLfloat lambda[], GLchan rgba[][4])
+{
+   GLuint i;
+   ASSERT(lambda != NULL);
+   for (i = 0; i < n; i++) {
+      const struct gl_texture_image **images;
+      GLfloat newCoord[4];
+      GLint level;
+      COMPUTE_LINEAR_MIPMAP_LEVEL(tObj, lambda[i], level);
+      images = choose_cube_face(tObj, texcoord[i], newCoord);
+      if (level >= tObj->_MaxLevel) {
+         sample_2d_nearest(ctx, tObj, images[tObj->_MaxLevel],
+                           newCoord, rgba[i]);
+      }
+      else {
+         GLchan t0[4], t1[4];  /* texels */
+         const GLfloat f = FRAC(lambda[i]);
+         sample_2d_nearest(ctx, tObj, images[level  ], newCoord, t0);
+         sample_2d_nearest(ctx, tObj, images[level+1], newCoord, t1);
+         rgba[i][RCOMP] = CHAN_CAST ((1.0F-f) * t0[RCOMP] + f * t1[RCOMP]);
+         rgba[i][GCOMP] = CHAN_CAST ((1.0F-f) * t0[GCOMP] + f * t1[GCOMP]);
+         rgba[i][BCOMP] = CHAN_CAST ((1.0F-f) * t0[BCOMP] + f * t1[BCOMP]);
+         rgba[i][ACOMP] = CHAN_CAST ((1.0F-f) * t0[ACOMP] + f * t1[ACOMP]);
+      }
+   }
+}
+
+
+static void
+sample_cube_linear_mipmap_linear(GLcontext *ctx, GLuint texUnit,
+                                 const struct gl_texture_object *tObj,
+                                 GLuint n, const GLfloat texcoord[][4],
+                                 const GLfloat lambda[], GLchan rgba[][4])
+{
+   GLuint i;
+   ASSERT(lambda != NULL);
+   for (i = 0; i < n; i++) {
+      const struct gl_texture_image **images;
+      GLfloat newCoord[4];
+      GLint level;
+      COMPUTE_LINEAR_MIPMAP_LEVEL(tObj, lambda[i], level);
+      images = choose_cube_face(tObj, texcoord[i], newCoord);
+      if (level >= tObj->_MaxLevel) {
+         sample_2d_linear(ctx, tObj, images[tObj->_MaxLevel],
+                          newCoord, rgba[i]);
+      }
+      else {
+         GLchan t0[4], t1[4];
+         const GLfloat f = FRAC(lambda[i]);
+         sample_2d_linear(ctx, tObj, images[level  ], newCoord, t0);
+         sample_2d_linear(ctx, tObj, images[level+1], newCoord, t1);
+         rgba[i][RCOMP] = CHAN_CAST ((1.0F-f) * t0[RCOMP] + f * t1[RCOMP]);
+         rgba[i][GCOMP] = CHAN_CAST ((1.0F-f) * t0[GCOMP] + f * t1[GCOMP]);
+         rgba[i][BCOMP] = CHAN_CAST ((1.0F-f) * t0[BCOMP] + f * t1[BCOMP]);
+         rgba[i][ACOMP] = CHAN_CAST ((1.0F-f) * t0[ACOMP] + f * t1[ACOMP]);
+      }
+   }
+}
+
+
+static void
+sample_lambda_cube( GLcontext *ctx, GLuint texUnit,
+		    const struct gl_texture_object *tObj, GLuint n,
+		    const GLfloat texcoords[][4], const GLfloat lambda[],
+		    GLchan rgba[][4])
+{
+   GLuint minStart, minEnd;  /* texels with minification */
+   GLuint magStart, magEnd;  /* texels with magnification */
+
+   ASSERT(lambda != NULL);
+   compute_min_mag_ranges(SWRAST_CONTEXT(ctx)->_MinMagThresh[texUnit],
+                          n, lambda, &minStart, &minEnd, &magStart, &magEnd);
+
+   if (minStart < minEnd) {
+      /* do the minified texels */
+      const GLuint m = minEnd - minStart;
+      switch (tObj->MinFilter) {
+      case GL_NEAREST:
+         sample_nearest_cube(ctx, texUnit, tObj, m, texcoords + minStart,
+                             lambda + minStart, rgba + minStart);
+         break;
+      case GL_LINEAR:
+         sample_linear_cube(ctx, texUnit, tObj, m, texcoords + minStart,
+                            lambda + minStart, rgba + minStart);
+         break;
+      case GL_NEAREST_MIPMAP_NEAREST:
+         sample_cube_nearest_mipmap_nearest(ctx, texUnit, tObj, m,
+                                            texcoords + minStart,
+                                           lambda + minStart, rgba + minStart);
+         break;
+      case GL_LINEAR_MIPMAP_NEAREST:
+         sample_cube_linear_mipmap_nearest(ctx, texUnit, tObj, m,
+                                           texcoords + minStart,
+                                           lambda + minStart, rgba + minStart);
+         break;
+      case GL_NEAREST_MIPMAP_LINEAR:
+         sample_cube_nearest_mipmap_linear(ctx, texUnit, tObj, m,
+                                           texcoords + minStart,
+                                           lambda + minStart, rgba + minStart);
+         break;
+      case GL_LINEAR_MIPMAP_LINEAR:
+         sample_cube_linear_mipmap_linear(ctx, texUnit, tObj, m,
+                                          texcoords + minStart,
+                                          lambda + minStart, rgba + minStart);
+         break;
+      default:
+         _mesa_problem(ctx, "Bad min filter in sample_lambda_cube");
+      }
+   }
+
+   if (magStart < magEnd) {
+      /* do the magnified texels */
+      const GLuint m = magEnd - magStart;
+      switch (tObj->MagFilter) {
+      case GL_NEAREST:
+         sample_nearest_cube(ctx, texUnit, tObj, m, texcoords + magStart,
+                             lambda + magStart, rgba + magStart);
+         break;
+      case GL_LINEAR:
+         sample_linear_cube(ctx, texUnit, tObj, m, texcoords + magStart,
+                            lambda + magStart, rgba + magStart);
+         break;
+      default:
+         _mesa_problem(ctx, "Bad mag filter in sample_lambda_cube");
+      }
+   }
+}
+
+
+/**********************************************************************/
+/*               Texture Rectangle Sampling Functions                 */
+/**********************************************************************/
+
+static void
+sample_nearest_rect(GLcontext *ctx, GLuint texUnit,
+		    const struct gl_texture_object *tObj, GLuint n,
+                    const GLfloat texcoords[][4], const GLfloat lambda[],
+                    GLchan rgba[][4])
+{
+   const struct gl_texture_image *img = tObj->Image[0];
+   const GLfloat width = (GLfloat) img->Width;
+   const GLfloat height = (GLfloat) img->Height;
+   const GLint width_minus_1 = img->Width - 1;
+   const GLint height_minus_1 = img->Height - 1;
+   GLuint i;
+
+   (void) texUnit;
+   (void) lambda;
+
+   ASSERT(tObj->WrapS == GL_CLAMP ||
+          tObj->WrapS == GL_CLAMP_TO_EDGE ||
+          tObj->WrapS == GL_CLAMP_TO_BORDER);
+   ASSERT(tObj->WrapT == GL_CLAMP ||
+          tObj->WrapT == GL_CLAMP_TO_EDGE ||
+          tObj->WrapT == GL_CLAMP_TO_BORDER);
+   ASSERT(img->Format != GL_COLOR_INDEX);
+
+   /* XXX move Wrap mode tests outside of loops for common cases */
+   for (i = 0; i < n; i++) {
+      GLint row, col;
+      /* NOTE: we DO NOT use [0, 1] texture coordinates! */
+      if (tObj->WrapS == GL_CLAMP) {
+         col = IFLOOR( CLAMP(texcoords[i][0], 0.0F, width) );
+      }
+      else if (tObj->WrapS == GL_CLAMP_TO_EDGE) {
+         col = IFLOOR( CLAMP(texcoords[i][0], 0.5F, width - 0.5F) );
+      }
+      else {
+         col = IFLOOR( CLAMP(texcoords[i][0], -0.5F, width + 0.5F) );
+      }
+      if (tObj->WrapT == GL_CLAMP) {
+         row = IFLOOR( CLAMP(texcoords[i][1], 0.0F, height) );
+      }
+      else if (tObj->WrapT == GL_CLAMP_TO_EDGE) {
+         row = IFLOOR( CLAMP(texcoords[i][1], 0.5F, height - 0.5F) );
+      }
+      else {
+         row = IFLOOR( CLAMP(texcoords[i][1], -0.5F, height + 0.5F) );
+      }
+
+      col = CLAMP(col, 0, width_minus_1);
+      row = CLAMP(row, 0, height_minus_1);
+
+      (*img->FetchTexel)(img, col, row, 0, (GLvoid *) rgba[i]);
+   }
+}
+
+
+static void
+sample_linear_rect(GLcontext *ctx, GLuint texUnit,
+		   const struct gl_texture_object *tObj, GLuint n,
+                   const GLfloat texcoords[][4],
+		   const GLfloat lambda[], GLchan rgba[][4])
+{
+   const struct gl_texture_image *img = tObj->Image[0];
+   const GLfloat width = (GLfloat) img->Width;
+   const GLfloat height = (GLfloat) img->Height;
+   const GLint width_minus_1 = img->Width - 1;
+   const GLint height_minus_1 = img->Height - 1;
+   GLuint i;
+
+   (void) texUnit;
+   (void) lambda;
+
+   ASSERT(tObj->WrapS == GL_CLAMP ||
+          tObj->WrapS == GL_CLAMP_TO_EDGE ||
+          tObj->WrapS == GL_CLAMP_TO_BORDER);
+   ASSERT(tObj->WrapT == GL_CLAMP ||
+          tObj->WrapT == GL_CLAMP_TO_EDGE ||
+          tObj->WrapT == GL_CLAMP_TO_BORDER);
+   ASSERT(img->Format != GL_COLOR_INDEX);
+
+   /* XXX lots of opportunity for optimization in this loop */
+   for (i = 0; i < n; i++) {
+      GLfloat frow, fcol;
+      GLint row0, col0, row1, col1;
+      GLchan t00[4], t01[4], t10[4], t11[4];
+      GLfloat a, b, w00, w01, w10, w11;
+
+      /* NOTE: we DO NOT use [0, 1] texture coordinates! */
+      if (tObj->WrapS == GL_CLAMP) {
+         fcol = CLAMP(texcoords[i][0], 0.0F, width);
+      }
+      else if (tObj->WrapS == GL_CLAMP_TO_EDGE) {
+         fcol = CLAMP(texcoords[i][0], 0.5F, width - 0.5F);
+      }
+      else {
+         fcol = CLAMP(texcoords[i][0], -0.5F, width + 0.5F);
+      }
+      if (tObj->WrapT == GL_CLAMP) {
+         frow = CLAMP(texcoords[i][1], 0.0F, height);
+      }
+      else if (tObj->WrapT == GL_CLAMP_TO_EDGE) {
+         frow = CLAMP(texcoords[i][1], 0.5F, height - 0.5F);
+      }
+      else {
+         frow = CLAMP(texcoords[i][1], -0.5F, height + 0.5F);
+      }
+
+      /* compute integer rows/columns */
+      col0 = IFLOOR(fcol);
+      col1 = col0 + 1;
+      col0 = CLAMP(col0, 0, width_minus_1);
+      col1 = CLAMP(col1, 0, width_minus_1);
+      row0 = IFLOOR(frow);
+      row1 = row0 + 1;
+      row0 = CLAMP(row0, 0, height_minus_1);
+      row1 = CLAMP(row1, 0, height_minus_1);
+
+      /* get four texel samples */
+      (*img->FetchTexel)(img, col0, row0, 0, (GLvoid *) t00);
+      (*img->FetchTexel)(img, col1, row0, 0, (GLvoid *) t10);
+      (*img->FetchTexel)(img, col0, row1, 0, (GLvoid *) t01);
+      (*img->FetchTexel)(img, col1, row1, 0, (GLvoid *) t11);
+
+      /* compute sample weights */
+      a = FRAC(fcol);
+      b = FRAC(frow);
+      w00 = (1.0F-a) * (1.0F-b);
+      w10 =       a  * (1.0F-b);
+      w01 = (1.0F-a) *       b ;
+      w11 =       a  *       b ;
+
+      /* compute weighted average of samples */
+      rgba[i][0] = 
+	  (GLchan) (w00 * t00[0] + w10 * t10[0] + w01 * t01[0] + w11 * t11[0]);
+      rgba[i][1] = 
+	  (GLchan) (w00 * t00[1] + w10 * t10[1] + w01 * t01[1] + w11 * t11[1]);
+      rgba[i][2] = 
+	  (GLchan) (w00 * t00[2] + w10 * t10[2] + w01 * t01[2] + w11 * t11[2]);
+      rgba[i][3] = 
+	  (GLchan) (w00 * t00[3] + w10 * t10[3] + w01 * t01[3] + w11 * t11[3]);
+   }
+}
+
+
+static void
+sample_lambda_rect( GLcontext *ctx, GLuint texUnit,
+		    const struct gl_texture_object *tObj, GLuint n,
+		    const GLfloat texcoords[][4], const GLfloat lambda[],
+		    GLchan rgba[][4])
+{
+   GLuint minStart, minEnd, magStart, magEnd;
+
+   /* We only need lambda to decide between minification and magnification.
+    * There is no mipmapping with rectangular textures.
+    */
+   compute_min_mag_ranges(SWRAST_CONTEXT(ctx)->_MinMagThresh[texUnit],
+                          n, lambda, &minStart, &minEnd, &magStart, &magEnd);
+
+   if (minStart < minEnd) {
+      if (tObj->MinFilter == GL_NEAREST) {
+         sample_nearest_rect( ctx, texUnit, tObj, minEnd - minStart,
+                              texcoords + minStart, NULL, rgba + minStart);
+      }
+      else {
+         sample_linear_rect( ctx, texUnit, tObj, minEnd - minStart,
+                             texcoords + minStart, NULL, rgba + minStart);
+      }
+   }
+   if (magStart < magEnd) {
+      if (tObj->MagFilter == GL_NEAREST) {
+         sample_nearest_rect( ctx, texUnit, tObj, magEnd - magStart,
+                              texcoords + magStart, NULL, rgba + magStart);
+      }
+      else {
+         sample_linear_rect( ctx, texUnit, tObj, magEnd - magStart,
+                             texcoords + magStart, NULL, rgba + magStart);
+      }
+   }
+}
+
+
+
+/*
+ * Sample a shadow/depth texture.
+ */
+static void
+sample_depth_texture( GLcontext *ctx, GLuint unit,
+                      const struct gl_texture_object *tObj, GLuint n,
+                      const GLfloat texcoords[][4], const GLfloat lambda[],
+                      GLchan texel[][4] )
+{
+   const GLint baseLevel = tObj->BaseLevel;
+   const struct gl_texture_image *texImage = tObj->Image[baseLevel];
+   const GLuint width = texImage->Width;
+   const GLuint height = texImage->Height;
+   GLchan ambient;
+   GLenum function;
+   GLchan result;
+
+   (void) unit;
+
+   ASSERT(tObj->Image[tObj->BaseLevel]->Format == GL_DEPTH_COMPONENT);
+   ASSERT(tObj->Target == GL_TEXTURE_1D ||
+          tObj->Target == GL_TEXTURE_2D ||
+          tObj->Target == GL_TEXTURE_RECTANGLE_NV);
+
+   UNCLAMPED_FLOAT_TO_CHAN(ambient, tObj->ShadowAmbient);
+
+   /* XXXX if tObj->MinFilter != tObj->MagFilter, we're ignoring lambda */
+
+   /* XXX this could be precomputed and saved in the texture object */
+   if (tObj->CompareFlag) {
+      /* GL_SGIX_shadow */
+      if (tObj->CompareOperator == GL_TEXTURE_LEQUAL_R_SGIX) {
+         function = GL_LEQUAL;
+      }
+      else {
+         ASSERT(tObj->CompareOperator == GL_TEXTURE_GEQUAL_R_SGIX);
+         function = GL_GEQUAL;
+      }
+   }
+   else if (tObj->CompareMode == GL_COMPARE_R_TO_TEXTURE_ARB) {
+      /* GL_ARB_shadow */
+      function = tObj->CompareFunc;
+   }
+   else {
+      function = GL_NONE;  /* pass depth through as grayscale */
+   }
+
+   if (tObj->MagFilter == GL_NEAREST) {
+      GLuint i;
+      for (i = 0; i < n; i++) {
+         GLfloat depthSample;
+         GLint col, row;
+         /* XXX fix for texture rectangle! */
+         COMPUTE_NEAREST_TEXEL_LOCATION(tObj->WrapS, texcoords[i][0], width, col);
+         COMPUTE_NEAREST_TEXEL_LOCATION(tObj->WrapT, texcoords[i][1], height, row);
+         depthSample = *((const GLfloat *) texImage->Data + row * width + col);
+
+         switch (function) {
+         case GL_LEQUAL:
+            result = (texcoords[i][2] <= depthSample) ? CHAN_MAX : ambient;
+            break;
+         case GL_GEQUAL:
+            result = (texcoords[i][2] >= depthSample) ? CHAN_MAX : ambient;
+            break;
+         case GL_LESS:
+            result = (texcoords[i][2] < depthSample) ? CHAN_MAX : ambient;
+            break;
+         case GL_GREATER:
+            result = (texcoords[i][2] > depthSample) ? CHAN_MAX : ambient;
+            break;
+         case GL_EQUAL:
+            result = (texcoords[i][2] == depthSample) ? CHAN_MAX : ambient;
+            break;
+         case GL_NOTEQUAL:
+            result = (texcoords[i][2] != depthSample) ? CHAN_MAX : ambient;
+            break;
+         case GL_ALWAYS:
+            result = CHAN_MAX;
+            break;
+         case GL_NEVER:
+            result = ambient;
+            break;
+         case GL_NONE:
+            CLAMPED_FLOAT_TO_CHAN(result, depthSample);
+            break;
+         default:
+            _mesa_problem(ctx, "Bad compare func in sample_depth_texture");
+            return;
+         }
+
+         switch (tObj->DepthMode) {
+         case GL_LUMINANCE:
+            texel[i][RCOMP] = result;
+            texel[i][GCOMP] = result;
+            texel[i][BCOMP] = result;
+            texel[i][ACOMP] = CHAN_MAX;
+            break;
+         case GL_INTENSITY:
+            texel[i][RCOMP] = result;
+            texel[i][GCOMP] = result;
+            texel[i][BCOMP] = result;
+            texel[i][ACOMP] = result;
+            break;
+         case GL_ALPHA:
+            texel[i][RCOMP] = 0;
+            texel[i][GCOMP] = 0;
+            texel[i][BCOMP] = 0;
+            texel[i][ACOMP] = result;
+            break;
+         default:
+            _mesa_problem(ctx, "Bad depth texture mode");
+         }
+      }
+   }
+   else {
+      GLuint i;
+      ASSERT(tObj->MagFilter == GL_LINEAR);
+      for (i = 0; i < n; i++) {
+         GLfloat depth00, depth01, depth10, depth11;
+         GLint i0, i1, j0, j1;
+         GLfloat u, v;
+         GLuint useBorderTexel;
+
+         /* XXX fix for texture rectangle! */
+         COMPUTE_LINEAR_TEXEL_LOCATIONS(tObj->WrapS, texcoords[i][0], u, width, i0, i1);
+         COMPUTE_LINEAR_TEXEL_LOCATIONS(tObj->WrapT, texcoords[i][1], v, height,j0, j1);
+
+         useBorderTexel = 0;
+         if (texImage->Border) {
+            i0 += texImage->Border;
+            i1 += texImage->Border;
+            j0 += texImage->Border;
+            j1 += texImage->Border;
+         }
+         else {
+            if (i0 < 0 || i0 >= (GLint) width)   useBorderTexel |= I0BIT;
+            if (i1 < 0 || i1 >= (GLint) width)   useBorderTexel |= I1BIT;
+            if (j0 < 0 || j0 >= (GLint) height)  useBorderTexel |= J0BIT;
+            if (j1 < 0 || j1 >= (GLint) height)  useBorderTexel |= J1BIT;
+         }
+
+         /* get four depth samples from the texture */
+         if (useBorderTexel & (I0BIT | J0BIT)) {
+            depth00 = 1.0;
+         }
+         else {
+            depth00 = *((const GLfloat *) texImage->Data + j0 * width + i0);
+         }
+         if (useBorderTexel & (I1BIT | J0BIT)) {
+            depth10 = 1.0;
+         }
+         else {
+            depth10 = *((const GLfloat *) texImage->Data + j0 * width + i1);
+         }
+         if (useBorderTexel & (I0BIT | J1BIT)) {
+            depth01 = 1.0;
+         }
+         else {
+            depth01 = *((const GLfloat *) texImage->Data + j1 * width + i0);
+         }
+         if (useBorderTexel & (I1BIT | J1BIT)) {
+            depth11 = 1.0;
+         }
+         else {
+            depth11 = *((const GLfloat *) texImage->Data + j1 * width + i1);
+         }
+
+         if (0) {
+            /* compute a single weighted depth sample and do one comparison */
+            const GLfloat a = FRAC(u + 1.0F);
+            const GLfloat b = FRAC(v + 1.0F);
+            const GLfloat w00 = (1.0F - a) * (1.0F - b);
+            const GLfloat w10 = (       a) * (1.0F - b);
+            const GLfloat w01 = (1.0F - a) * (       b);
+            const GLfloat w11 = (       a) * (       b);
+            const GLfloat depthSample = w00 * depth00 + w10 * depth10
+                                      + w01 * depth01 + w11 * depth11;
+            if ((depthSample <= texcoords[i][2] && function == GL_LEQUAL) ||
+                (depthSample >= texcoords[i][2] && function == GL_GEQUAL)) {
+               result  = ambient;
+            }
+            else {
+               result = CHAN_MAX;
+            }
+         }
+         else {
+            /* Do four depth/R comparisons and compute a weighted result.
+             * If this touches on somebody's I.P., I'll remove this code
+             * upon request.
+             */
+            const GLfloat d = (CHAN_MAXF - (GLfloat) ambient) * 0.25F;
+            GLfloat luminance = CHAN_MAXF;
+
+            switch (function) {
+            case GL_LEQUAL:
+               if (depth00 <= texcoords[i][2])  luminance -= d;
+               if (depth01 <= texcoords[i][2])  luminance -= d;
+               if (depth10 <= texcoords[i][2])  luminance -= d;
+               if (depth11 <= texcoords[i][2])  luminance -= d;
+               result = (GLchan) luminance;
+               break;
+            case GL_GEQUAL:
+               if (depth00 >= texcoords[i][2])  luminance -= d;
+               if (depth01 >= texcoords[i][2])  luminance -= d;
+               if (depth10 >= texcoords[i][2])  luminance -= d;
+               if (depth11 >= texcoords[i][2])  luminance -= d;
+               result = (GLchan) luminance;
+               break;
+            case GL_LESS:
+               if (depth00 < texcoords[i][2])  luminance -= d;
+               if (depth01 < texcoords[i][2])  luminance -= d;
+               if (depth10 < texcoords[i][2])  luminance -= d;
+               if (depth11 < texcoords[i][2])  luminance -= d;
+               result = (GLchan) luminance;
+               break;
+            case GL_GREATER:
+               if (depth00 > texcoords[i][2])  luminance -= d;
+               if (depth01 > texcoords[i][2])  luminance -= d;
+               if (depth10 > texcoords[i][2])  luminance -= d;
+               if (depth11 > texcoords[i][2])  luminance -= d;
+               result = (GLchan) luminance;
+               break;
+            case GL_EQUAL:
+               if (depth00 == texcoords[i][2])  luminance -= d;
+               if (depth01 == texcoords[i][2])  luminance -= d;
+               if (depth10 == texcoords[i][2])  luminance -= d;
+               if (depth11 == texcoords[i][2])  luminance -= d;
+               result = (GLchan) luminance;
+               break;
+            case GL_NOTEQUAL:
+               if (depth00 != texcoords[i][2])  luminance -= d;
+               if (depth01 != texcoords[i][2])  luminance -= d;
+               if (depth10 != texcoords[i][2])  luminance -= d;
+               if (depth11 != texcoords[i][2])  luminance -= d;
+               result = (GLchan) luminance;
+               break;
+            case GL_ALWAYS:
+               result = 0;
+               break;
+            case GL_NEVER:
+               result = CHAN_MAX;
+               break;
+            case GL_NONE:
+               /* ordinary bilinear filtering */
+               {
+                  const GLfloat a = FRAC(u + 1.0F);
+                  const GLfloat b = FRAC(v + 1.0F);
+                  const GLfloat w00 = (1.0F - a) * (1.0F - b);
+                  const GLfloat w10 = (       a) * (1.0F - b);
+                  const GLfloat w01 = (1.0F - a) * (       b);
+                  const GLfloat w11 = (       a) * (       b);
+                  const GLfloat depthSample = w00 * depth00 + w10 * depth10
+                                            + w01 * depth01 + w11 * depth11;
+                  CLAMPED_FLOAT_TO_CHAN(result, depthSample);
+               }
+               break;
+            default:
+               _mesa_problem(ctx, "Bad compare func in sample_depth_texture");
+               return;
+            }
+         }
+
+         switch (tObj->DepthMode) {
+         case GL_LUMINANCE:
+            texel[i][RCOMP] = result;
+            texel[i][GCOMP] = result;
+            texel[i][BCOMP] = result;
+            texel[i][ACOMP] = CHAN_MAX;
+            break;
+         case GL_INTENSITY:
+            texel[i][RCOMP] = result;
+            texel[i][GCOMP] = result;
+            texel[i][BCOMP] = result;
+            texel[i][ACOMP] = result;
+            break;
+         case GL_ALPHA:
+            texel[i][RCOMP] = 0;
+            texel[i][GCOMP] = 0;
+            texel[i][BCOMP] = 0;
+            texel[i][ACOMP] = result;
+            break;
+         default:
+            _mesa_problem(ctx, "Bad depth texture mode");
+         }
+      }  /* for */
+   }  /* if filter */
+}
+
+
+#if 0
+/*
+ * Experimental depth texture sampling function.
+ */
+static void
+sample_depth_texture2(const GLcontext *ctx,
+                     const struct gl_texture_unit *texUnit,
+                     GLuint n, const GLfloat texcoords[][4],
+                     GLchan texel[][4])
+{
+   const struct gl_texture_object *texObj = texUnit->_Current;
+   const GLint baseLevel = texObj->BaseLevel;
+   const struct gl_texture_image *texImage = texObj->Image[baseLevel];
+   const GLuint width = texImage->Width;
+   const GLuint height = texImage->Height;
+   GLchan ambient;
+   GLboolean lequal, gequal;
+
+   if (texObj->Target != GL_TEXTURE_2D) {
+      _mesa_problem(ctx, "only 2-D depth textures supported at this time");
+      return;
+   }
+
+   if (texObj->MinFilter != texObj->MagFilter) {
+      _mesa_problem(ctx, "mipmapped depth textures not supported at this time");
+      return;
+   }
+
+   /* XXX the GL_SGIX_shadow extension spec doesn't say what to do if
+    * GL_TEXTURE_COMPARE_SGIX == GL_TRUE but the current texture object
+    * isn't a depth texture.
+    */
+   if (texImage->Format != GL_DEPTH_COMPONENT) {
+      _mesa_problem(ctx,"GL_TEXTURE_COMPARE_SGIX enabled with non-depth texture");
+      return;
+   }
+
+   UNCLAMPED_FLOAT_TO_CHAN(ambient, tObj->ShadowAmbient);
+
+   if (texObj->CompareOperator == GL_TEXTURE_LEQUAL_R_SGIX) {
+      lequal = GL_TRUE;
+      gequal = GL_FALSE;
+   }
+   else {
+      lequal = GL_FALSE;
+      gequal = GL_TRUE;
+   }
+
+   {
+      GLuint i;
+      for (i = 0; i < n; i++) {
+         const GLint K = 3;
+         GLint col, row, ii, jj, imin, imax, jmin, jmax, samples, count;
+         GLfloat w;
+         GLchan lum;
+         COMPUTE_NEAREST_TEXEL_LOCATION(texObj->WrapS, texcoords[i][0],
+					width, col);
+         COMPUTE_NEAREST_TEXEL_LOCATION(texObj->WrapT, texcoords[i][1],
+					height, row);
+
+         imin = col - K;
+         imax = col + K;
+         jmin = row - K;
+         jmax = row + K;
+
+         if (imin < 0)  imin = 0;
+         if (imax >= width)  imax = width - 1;
+         if (jmin < 0)  jmin = 0;
+         if (jmax >= height) jmax = height - 1;
+
+         samples = (imax - imin + 1) * (jmax - jmin + 1);
+         count = 0;
+         for (jj = jmin; jj <= jmax; jj++) {
+            for (ii = imin; ii <= imax; ii++) {
+               GLfloat depthSample = *((const GLfloat *) texImage->Data
+                                       + jj * width + ii);
+               if ((depthSample <= r[i] && lequal) ||
+                   (depthSample >= r[i] && gequal)) {
+                  count++;
+               }
+            }
+         }
+
+         w = (GLfloat) count / (GLfloat) samples;
+         w = CHAN_MAXF - w * (CHAN_MAXF - (GLfloat) ambient);
+         lum = (GLint) w;
+
+         texel[i][RCOMP] = lum;
+         texel[i][GCOMP] = lum;
+         texel[i][BCOMP] = lum;
+         texel[i][ACOMP] = CHAN_MAX;
+      }
+   }
+}
+#endif
+
+
+/**
+ * We use this function when a texture object is in an "incomplete" state.
+ * When a fragment program attempts to sample an incomplete texture we
+ * return black.
+ * Note: frag progs don't observe texture enable/disable flags.
+ */
+static void
+null_sample_func( GLcontext *ctx, GLuint texUnit,
+		  const struct gl_texture_object *tObj, GLuint n,
+		  const GLfloat texcoords[][4], const GLfloat lambda[],
+		  GLchan rgba[][4])
+{
+   (void) ctx;
+   (void) texUnit;
+   (void) tObj;
+   (void) texcoords;
+   (void) lambda;
+   _mesa_bzero(rgba, n * 4 * sizeof(GLchan));
+}
+
+
+
+/**
+ * Setup the texture sampling function for this texture object.
+ */
+texture_sample_func
+_swrast_choose_texture_sample_func( GLcontext *ctx,
+				    const struct gl_texture_object *t )
+{
+   const GLboolean needLambda = (GLboolean) (t->MinFilter != t->MagFilter);
+   const GLenum format = t->Image[t->BaseLevel]->Format;
+
+   if (!t->Complete) {
+      return &null_sample_func;
+   }
+
+   switch (t->Target) {
+   case GL_TEXTURE_1D:
+      if (format == GL_DEPTH_COMPONENT) {
+         return &sample_depth_texture;
+      }
+      else if (needLambda) {
+         return &sample_lambda_1d;
+      }
+      else if (t->MinFilter == GL_LINEAR) {
+         return &sample_linear_1d;
+      }
+      else {
+         ASSERT(t->MinFilter == GL_NEAREST);
+         return &sample_nearest_1d;
+      }
+      break;
+   case GL_TEXTURE_2D:
+      if (format == GL_DEPTH_COMPONENT) {
+         return &sample_depth_texture;
+      }
+      else if (needLambda) {
+         return &sample_lambda_2d;
+      }
+      else if (t->MinFilter == GL_LINEAR) {
+         return &sample_linear_2d;
+      }
+      else {
+         GLint baseLevel = t->BaseLevel;
+         ASSERT(t->MinFilter == GL_NEAREST);
+         if (t->WrapS == GL_REPEAT &&
+             t->WrapT == GL_REPEAT &&
+             t->_IsPowerOfTwo &&
+             t->Image[baseLevel]->Border == 0 &&
+             t->Image[baseLevel]->TexFormat->MesaFormat == MESA_FORMAT_RGB) {
+            return &opt_sample_rgb_2d;
+         }
+         else if (t->WrapS == GL_REPEAT &&
+                  t->WrapT == GL_REPEAT &&
+                  t->_IsPowerOfTwo &&
+                  t->Image[baseLevel]->Border == 0 &&
+                  t->Image[baseLevel]->TexFormat->MesaFormat == MESA_FORMAT_RGBA) {
+            return &opt_sample_rgba_2d;
+         }
+         else {
+            return &sample_nearest_2d;
+         }
+      }
+      break;
+   case GL_TEXTURE_3D:
+      if (needLambda) {
+         return &sample_lambda_3d;
+      }
+      else if (t->MinFilter == GL_LINEAR) {
+         return &sample_linear_3d;
+      }
+      else {
+         ASSERT(t->MinFilter == GL_NEAREST);
+         return &sample_nearest_3d;
+      }
+      break;
+   case GL_TEXTURE_CUBE_MAP:
+      if (needLambda) {
+         return &sample_lambda_cube;
+      }
+      else if (t->MinFilter == GL_LINEAR) {
+         return &sample_linear_cube;
+      }
+      else {
+         ASSERT(t->MinFilter == GL_NEAREST);
+         return &sample_nearest_cube;
+      }
+      break;
+   case GL_TEXTURE_RECTANGLE_NV:
+      if (needLambda) {
+         return &sample_lambda_rect;
+      }
+      else if (t->MinFilter == GL_LINEAR) {
+         return &sample_linear_rect;
+      }
+      else {
+         ASSERT(t->MinFilter == GL_NEAREST);
+         return &sample_nearest_rect;
+      }
+      break;
+   default:
+      _mesa_problem(ctx,
+                    "invalid target in _swrast_choose_texture_sample_func");
+      return &null_sample_func;
+   }
+}
+
+
+#define PROD(A,B)   ( (GLuint)(A) * ((GLuint)(B)+1) )
+#define S_PROD(A,B) ( (GLint)(A) * ((GLint)(B)+1) )
+
+
+/**
+ * Do texture application for GL_ARB/EXT_texture_env_combine.
+ * This function also supports GL_{EXT,ARB}_texture_env_dot3 and
+ * GL_ATI_texture_env_combine3
+ *
+ * \param ctx          rendering context
+ * \param textureUnit  the texture unit to apply
+ * \param n            number of fragments to process (span width)
+ * \param primary_rgba incoming fragment color array
+ * \param texelBuffer  pointer to texel colors for all texture units
+ * 
+ * \param rgba         incoming colors, which get modified here
+ */
+static INLINE void
+texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
+                 CONST GLchan (*primary_rgba)[4],
+                 CONST GLchan *texelBuffer,
+                 GLchan (*rgba)[4] )
+{
+   const struct gl_texture_unit *textureUnit = &(ctx->Texture.Unit[unit]);
+   const GLchan (*argRGB [3])[4];
+   const GLchan (*argA [3])[4];
+   const GLuint RGBshift = textureUnit->CombineScaleShiftRGB;
+   const GLuint Ashift   = textureUnit->CombineScaleShiftA;
+#if CHAN_TYPE == GL_FLOAT
+   const GLchan RGBmult = (GLfloat) (1 << RGBshift);
+   const GLchan Amult = (GLfloat) (1 << Ashift);
+   static const GLchan one[4] = { 1.0, 1.0, 1.0, 1.0 };
+   static const GLchan zero[4] = { 0.0, 0.0, 0.0, 0.0 };
+#else
+   const GLint half = (CHAN_MAX + 1) / 2;
+   static const GLchan one[4] = { CHAN_MAX, CHAN_MAX, CHAN_MAX, CHAN_MAX };
+   static const GLchan zero[4] = { 0, 0, 0, 0 };
+#endif
+   GLuint i, j;
+   GLuint numColorArgs;
+   GLuint numAlphaArgs;
+
+   /* GLchan ccolor[3][4]; */
+   DEFMNARRAY(GLchan, ccolor, 3, 3 * MAX_WIDTH, 4);  /* mac 32k limitation */
+   CHECKARRAY(ccolor, return);  /* mac 32k limitation */
+
+   ASSERT(ctx->Extensions.EXT_texture_env_combine ||
+          ctx->Extensions.ARB_texture_env_combine);
+   ASSERT(SWRAST_CONTEXT(ctx)->_AnyTextureCombine);
+
+
+   /*
+   printf("modeRGB 0x%x  modeA 0x%x  srcRGB1 0x%x  srcA1 0x%x  srcRGB2 0x%x  srcA2 0x%x\n",
+          textureUnit->CombineModeRGB,
+          textureUnit->CombineModeA,
+          textureUnit->CombineSourceRGB[0],
+          textureUnit->CombineSourceA[0],
+          textureUnit->CombineSourceRGB[1],
+          textureUnit->CombineSourceA[1]);
+   */
+
+   /*
+    * Do operand setup for up to 3 operands.  Loop over the terms.
+    */
+   switch (textureUnit->CombineModeRGB) {
+      case GL_REPLACE:
+	 numColorArgs = 1;
+	 break;
+      case GL_MODULATE:
+      case GL_ADD:
+      case GL_ADD_SIGNED:
+      case GL_SUBTRACT:
+      case GL_DOT3_RGB:
+      case GL_DOT3_RGBA:
+      case GL_DOT3_RGB_EXT:
+      case GL_DOT3_RGBA_EXT:
+	 numColorArgs = 2;
+	 break;
+      case GL_INTERPOLATE:
+      case GL_MODULATE_ADD_ATI:
+      case GL_MODULATE_SIGNED_ADD_ATI:
+      case GL_MODULATE_SUBTRACT_ATI:
+	 numColorArgs = 3;
+	 break;
+      default:
+	 numColorArgs = 0;
+	 ASSERT(0);
+	 break;
+   }
+
+   switch (textureUnit->CombineModeA) {
+      case GL_REPLACE:
+	 numAlphaArgs = 1;
+	 break;
+      case GL_MODULATE:
+      case GL_ADD:
+      case GL_ADD_SIGNED:
+      case GL_SUBTRACT:
+	 numAlphaArgs = 2;
+	 break;
+      case GL_INTERPOLATE:
+      case GL_MODULATE_ADD_ATI:
+      case GL_MODULATE_SIGNED_ADD_ATI:
+      case GL_MODULATE_SUBTRACT_ATI:
+	 numAlphaArgs = 3;
+	 break;
+      default:
+	 numAlphaArgs = 0;
+	 ASSERT(0);
+	 break;
+   }
+
+   for (j = 0; j < numColorArgs; j++) {
+      const GLenum srcRGB = textureUnit->CombineSourceRGB[j];
+
+
+      switch (srcRGB) {
+         case GL_TEXTURE:
+            argRGB[j] = (const GLchan (*)[4])
+               (texelBuffer + unit * (n * 4 * sizeof(GLchan)));
+            break;
+         case GL_PRIMARY_COLOR:
+            argRGB[j] = primary_rgba;
+            break;
+         case GL_PREVIOUS:
+            argRGB[j] = (const GLchan (*)[4]) rgba;
+            break;
+         case GL_CONSTANT:
+            {
+               GLchan (*c)[4] = ccolor[j];
+               GLchan red, green, blue, alpha;
+               UNCLAMPED_FLOAT_TO_CHAN(red,   textureUnit->EnvColor[0]);
+               UNCLAMPED_FLOAT_TO_CHAN(green, textureUnit->EnvColor[1]);
+               UNCLAMPED_FLOAT_TO_CHAN(blue,  textureUnit->EnvColor[2]);
+               UNCLAMPED_FLOAT_TO_CHAN(alpha, textureUnit->EnvColor[3]);
+               for (i = 0; i < n; i++) {
+                  c[i][RCOMP] = red;
+                  c[i][GCOMP] = green;
+                  c[i][BCOMP] = blue;
+                  c[i][ACOMP] = alpha;
+               }
+               argRGB[j] = (const GLchan (*)[4]) ccolor[j];
+            }
+            break;
+	 /* GL_ATI_texture_env_combine3 allows GL_ZERO & GL_ONE as sources.
+	  */
+	 case GL_ZERO:
+            argRGB[j] = & zero;
+            break;
+	 case GL_ONE:
+            argRGB[j] = & one;
+            break;
+         default:
+            /* ARB_texture_env_crossbar source */
+            {
+               const GLuint srcUnit = srcRGB - GL_TEXTURE0;
+               ASSERT(srcUnit < ctx->Const.MaxTextureUnits);
+               if (!ctx->Texture.Unit[srcUnit]._ReallyEnabled)
+                  return;
+               argRGB[j] = (const GLchan (*)[4])
+                  (texelBuffer + srcUnit * (n * 4 * sizeof(GLchan)));
+            }
+      }
+
+      if (textureUnit->CombineOperandRGB[j] != GL_SRC_COLOR) {
+         const GLchan (*src)[4] = argRGB[j];
+         GLchan (*dst)[4] = ccolor[j];
+
+         /* point to new arg[j] storage */
+         argRGB[j] = (const GLchan (*)[4]) ccolor[j];
+
+         if (textureUnit->CombineOperandRGB[j] == GL_ONE_MINUS_SRC_COLOR) {
+            for (i = 0; i < n; i++) {
+               dst[i][RCOMP] = CHAN_MAX - src[i][RCOMP];
+               dst[i][GCOMP] = CHAN_MAX - src[i][GCOMP];
+               dst[i][BCOMP] = CHAN_MAX - src[i][BCOMP];
+            }
+         }
+         else if (textureUnit->CombineOperandRGB[j] == GL_SRC_ALPHA) {
+            for (i = 0; i < n; i++) {
+               dst[i][RCOMP] = src[i][ACOMP];
+               dst[i][GCOMP] = src[i][ACOMP];
+               dst[i][BCOMP] = src[i][ACOMP];
+            }
+         }
+         else {
+            ASSERT(textureUnit->CombineOperandRGB[j] ==GL_ONE_MINUS_SRC_ALPHA);
+            for (i = 0; i < n; i++) {
+               dst[i][RCOMP] = CHAN_MAX - src[i][ACOMP];
+               dst[i][GCOMP] = CHAN_MAX - src[i][ACOMP];
+               dst[i][BCOMP] = CHAN_MAX - src[i][ACOMP];
+            }
+         }
+      }
+   }
+
+
+   for (j = 0; j < numAlphaArgs; j++) {
+      const GLenum srcA = textureUnit->CombineSourceA[j];
+
+      switch (srcA) {
+         case GL_TEXTURE:
+            argA[j] = (const GLchan (*)[4])
+               (texelBuffer + unit * (n * 4 * sizeof(GLchan)));
+            break;
+         case GL_PRIMARY_COLOR:
+            argA[j] = primary_rgba;
+            break;
+         case GL_PREVIOUS:
+            argA[j] = (const GLchan (*)[4]) rgba;
+            break;
+         case GL_CONSTANT:
+            {
+               GLchan alpha, (*c)[4] = ccolor[j];
+               UNCLAMPED_FLOAT_TO_CHAN(alpha, textureUnit->EnvColor[3]);
+               for (i = 0; i < n; i++)
+                  c[i][ACOMP] = alpha;
+               argA[j] = (const GLchan (*)[4]) ccolor[j];
+            }
+            break;
+	 /* GL_ATI_texture_env_combine3 allows GL_ZERO & GL_ONE as sources.
+	  */
+	 case GL_ZERO:
+            argA[j] = & zero;
+            break;
+	 case GL_ONE:
+            argA[j] = & one;
+            break;
+         default:
+            /* ARB_texture_env_crossbar source */
+            {
+               const GLuint srcUnit = srcA - GL_TEXTURE0;
+               ASSERT(srcUnit < ctx->Const.MaxTextureUnits);
+               if (!ctx->Texture.Unit[srcUnit]._ReallyEnabled)
+                  return;
+               argA[j] = (const GLchan (*)[4])
+                  (texelBuffer + srcUnit * (n * 4 * sizeof(GLchan)));
+            }
+      }
+
+      if (textureUnit->CombineOperandA[j] == GL_ONE_MINUS_SRC_ALPHA) {
+         const GLchan (*src)[4] = argA[j];
+         GLchan (*dst)[4] = ccolor[j];
+         argA[j] = (const GLchan (*)[4]) ccolor[j];
+         for (i = 0; i < n; i++) {
+            dst[i][ACOMP] = CHAN_MAX - src[i][ACOMP];
+         }
+      }
+   }
+
+   /*
+    * Do the texture combine.
+    */
+   switch (textureUnit->CombineModeRGB) {
+      case GL_REPLACE:
+         {
+            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argRGB[0];
+            if (RGBshift) {
+               for (i = 0; i < n; i++) {
+#if CHAN_TYPE == GL_FLOAT
+                  rgba[i][RCOMP] = arg0[i][RCOMP] * RGBmult;
+                  rgba[i][GCOMP] = arg0[i][GCOMP] * RGBmult;
+                  rgba[i][BCOMP] = arg0[i][BCOMP] * RGBmult;
+#else
+                  GLuint r = (GLuint) arg0[i][RCOMP] << RGBshift;
+                  GLuint g = (GLuint) arg0[i][GCOMP] << RGBshift;
+                  GLuint b = (GLuint) arg0[i][BCOMP] << RGBshift;
+                  rgba[i][RCOMP] = MIN2(r, CHAN_MAX);
+                  rgba[i][GCOMP] = MIN2(g, CHAN_MAX);
+                  rgba[i][BCOMP] = MIN2(b, CHAN_MAX);
+#endif
+               }
+            }
+            else {
+               for (i = 0; i < n; i++) {
+                  rgba[i][RCOMP] = arg0[i][RCOMP];
+                  rgba[i][GCOMP] = arg0[i][GCOMP];
+                  rgba[i][BCOMP] = arg0[i][BCOMP];
+               }
+            }
+         }
+         break;
+      case GL_MODULATE:
+         {
+            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argRGB[0];
+            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argRGB[1];
+#if CHAN_TYPE != GL_FLOAT
+            const GLint shift = CHAN_BITS - RGBshift;
+#endif
+            for (i = 0; i < n; i++) {
+#if CHAN_TYPE == GL_FLOAT
+               rgba[i][RCOMP] = arg0[i][RCOMP] * arg1[i][RCOMP] * RGBmult;
+               rgba[i][GCOMP] = arg0[i][GCOMP] * arg1[i][GCOMP] * RGBmult;
+               rgba[i][BCOMP] = arg0[i][BCOMP] * arg1[i][BCOMP] * RGBmult;
+#else
+               GLuint r = PROD(arg0[i][RCOMP], arg1[i][RCOMP]) >> shift;
+               GLuint g = PROD(arg0[i][GCOMP], arg1[i][GCOMP]) >> shift;
+               GLuint b = PROD(arg0[i][BCOMP], arg1[i][BCOMP]) >> shift;
+               rgba[i][RCOMP] = (GLchan) MIN2(r, CHAN_MAX);
+               rgba[i][GCOMP] = (GLchan) MIN2(g, CHAN_MAX);
+               rgba[i][BCOMP] = (GLchan) MIN2(b, CHAN_MAX);
+#endif
+            }
+         }
+         break;
+      case GL_ADD:
+         {
+            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argRGB[0];
+            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argRGB[1];
+            for (i = 0; i < n; i++) {
+#if CHAN_TYPE == GL_FLOAT
+               rgba[i][RCOMP] = (arg0[i][RCOMP] + arg1[i][RCOMP]) * RGBmult;
+               rgba[i][GCOMP] = (arg0[i][GCOMP] + arg1[i][GCOMP]) * RGBmult;
+               rgba[i][BCOMP] = (arg0[i][BCOMP] + arg1[i][BCOMP]) * RGBmult;
+#else
+               GLint r = ((GLint) arg0[i][RCOMP] + (GLint) arg1[i][RCOMP]) << RGBshift;
+               GLint g = ((GLint) arg0[i][GCOMP] + (GLint) arg1[i][GCOMP]) << RGBshift;
+               GLint b = ((GLint) arg0[i][BCOMP] + (GLint) arg1[i][BCOMP]) << RGBshift;
+               rgba[i][RCOMP] = (GLchan) MIN2(r, CHAN_MAX);
+               rgba[i][GCOMP] = (GLchan) MIN2(g, CHAN_MAX);
+               rgba[i][BCOMP] = (GLchan) MIN2(b, CHAN_MAX);
+#endif
+            }
+         }
+         break;
+      case GL_ADD_SIGNED:
+         {
+            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argRGB[0];
+            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argRGB[1];
+            for (i = 0; i < n; i++) {
+#if CHAN_TYPE == GL_FLOAT
+               rgba[i][RCOMP] = (arg0[i][RCOMP] + arg1[i][RCOMP] - 0.5) * RGBmult;
+               rgba[i][GCOMP] = (arg0[i][GCOMP] + arg1[i][GCOMP] - 0.5) * RGBmult;
+               rgba[i][BCOMP] = (arg0[i][BCOMP] + arg1[i][BCOMP] - 0.5) * RGBmult;
+#else
+               GLint r = (GLint) arg0[i][RCOMP] + (GLint) arg1[i][RCOMP] -half;
+               GLint g = (GLint) arg0[i][GCOMP] + (GLint) arg1[i][GCOMP] -half;
+               GLint b = (GLint) arg0[i][BCOMP] + (GLint) arg1[i][BCOMP] -half;
+               r = (r < 0) ? 0 : r << RGBshift;
+               g = (g < 0) ? 0 : g << RGBshift;
+               b = (b < 0) ? 0 : b << RGBshift;
+               rgba[i][RCOMP] = (GLchan) MIN2(r, CHAN_MAX);
+               rgba[i][GCOMP] = (GLchan) MIN2(g, CHAN_MAX);
+               rgba[i][BCOMP] = (GLchan) MIN2(b, CHAN_MAX);
+#endif
+            }
+         }
+         break;
+      case GL_INTERPOLATE:
+         {
+            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argRGB[0];
+            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argRGB[1];
+            const GLchan (*arg2)[4] = (const GLchan (*)[4]) argRGB[2];
+#if CHAN_TYPE != GL_FLOAT
+            const GLint shift = CHAN_BITS - RGBshift;
+#endif
+            for (i = 0; i < n; i++) {
+#if CHAN_TYPE == GL_FLOAT
+               rgba[i][RCOMP] = (arg0[i][RCOMP] * arg2[i][RCOMP] +
+                      arg1[i][RCOMP] * (CHAN_MAXF - arg2[i][RCOMP])) * RGBmult;
+               rgba[i][GCOMP] = (arg0[i][GCOMP] * arg2[i][GCOMP] +
+                      arg1[i][GCOMP] * (CHAN_MAXF - arg2[i][GCOMP])) * RGBmult;
+               rgba[i][BCOMP] = (arg0[i][BCOMP] * arg2[i][BCOMP] +
+                      arg1[i][BCOMP] * (CHAN_MAXF - arg2[i][BCOMP])) * RGBmult;
+#else
+               GLuint r = (PROD(arg0[i][RCOMP], arg2[i][RCOMP])
+                           + PROD(arg1[i][RCOMP], CHAN_MAX - arg2[i][RCOMP]))
+                              >> shift;
+               GLuint g = (PROD(arg0[i][GCOMP], arg2[i][GCOMP])
+                           + PROD(arg1[i][GCOMP], CHAN_MAX - arg2[i][GCOMP]))
+                              >> shift;
+               GLuint b = (PROD(arg0[i][BCOMP], arg2[i][BCOMP])
+                           + PROD(arg1[i][BCOMP], CHAN_MAX - arg2[i][BCOMP]))
+                              >> shift;
+               rgba[i][RCOMP] = (GLchan) MIN2(r, CHAN_MAX);
+               rgba[i][GCOMP] = (GLchan) MIN2(g, CHAN_MAX);
+               rgba[i][BCOMP] = (GLchan) MIN2(b, CHAN_MAX);
+#endif
+            }
+         }
+         break;
+      case GL_SUBTRACT:
+         {
+            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argRGB[0];
+            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argRGB[1];
+            for (i = 0; i < n; i++) {
+#if CHAN_TYPE == GL_FLOAT
+               rgba[i][RCOMP] = (arg0[i][RCOMP] - arg1[i][RCOMP]) * RGBmult;
+               rgba[i][GCOMP] = (arg0[i][GCOMP] - arg1[i][GCOMP]) * RGBmult;
+               rgba[i][BCOMP] = (arg0[i][BCOMP] - arg1[i][BCOMP]) * RGBmult;
+#else
+               GLint r = ((GLint) arg0[i][RCOMP] - (GLint) arg1[i][RCOMP]) << RGBshift;
+               GLint g = ((GLint) arg0[i][GCOMP] - (GLint) arg1[i][GCOMP]) << RGBshift;
+               GLint b = ((GLint) arg0[i][BCOMP] - (GLint) arg1[i][BCOMP]) << RGBshift;
+               rgba[i][RCOMP] = (GLchan) CLAMP(r, 0, CHAN_MAX);
+               rgba[i][GCOMP] = (GLchan) CLAMP(g, 0, CHAN_MAX);
+               rgba[i][BCOMP] = (GLchan) CLAMP(b, 0, CHAN_MAX);
+#endif
+            }
+         }
+         break;
+      case GL_DOT3_RGB_EXT:
+      case GL_DOT3_RGBA_EXT:
+         {
+            /* Do not scale the result by 1 2 or 4 */
+            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argRGB[0];
+            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argRGB[1];
+            for (i = 0; i < n; i++) {
+#if CHAN_TYPE == GL_FLOAT
+               GLchan dot = ((arg0[i][RCOMP]-0.5F) * (arg1[i][RCOMP]-0.5F) +
+                             (arg0[i][GCOMP]-0.5F) * (arg1[i][GCOMP]-0.5F) +
+                             (arg0[i][BCOMP]-0.5F) * (arg1[i][BCOMP]-0.5F))
+                            * 4.0F;
+               dot = CLAMP(dot, 0.0F, CHAN_MAXF);
+#else
+               GLint dot = (S_PROD((GLint)arg0[i][RCOMP] - half,
+				   (GLint)arg1[i][RCOMP] - half) +
+			    S_PROD((GLint)arg0[i][GCOMP] - half,
+				   (GLint)arg1[i][GCOMP] - half) +
+			    S_PROD((GLint)arg0[i][BCOMP] - half,
+				   (GLint)arg1[i][BCOMP] - half)) >> 6;
+               dot = CLAMP(dot, 0, CHAN_MAX);
+#endif
+               rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = (GLchan) dot;
+            }
+         }
+         break;
+      case GL_DOT3_RGB:
+      case GL_DOT3_RGBA:
+         {
+            /* DO scale the result by 1 2 or 4 */
+            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argRGB[0];
+            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argRGB[1];
+            for (i = 0; i < n; i++) {
+#if CHAN_TYPE == GL_FLOAT
+               GLchan dot = ((arg0[i][RCOMP]-0.5F) * (arg1[i][RCOMP]-0.5F) +
+                             (arg0[i][GCOMP]-0.5F) * (arg1[i][GCOMP]-0.5F) +
+                             (arg0[i][BCOMP]-0.5F) * (arg1[i][BCOMP]-0.5F))
+                            * 4.0F * RGBmult;
+               dot = CLAMP(dot, 0.0, CHAN_MAXF);
+#else
+               GLint dot = (S_PROD((GLint)arg0[i][RCOMP] - half,
+				   (GLint)arg1[i][RCOMP] - half) +
+			    S_PROD((GLint)arg0[i][GCOMP] - half,
+				   (GLint)arg1[i][GCOMP] - half) +
+			    S_PROD((GLint)arg0[i][BCOMP] - half,
+				   (GLint)arg1[i][BCOMP] - half)) >> 6;
+               dot <<= RGBshift;
+               dot = CLAMP(dot, 0, CHAN_MAX);
+#endif
+               rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = (GLchan) dot;
+            }
+         }
+         break;
+      case GL_MODULATE_ADD_ATI:
+         {
+            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argRGB[0];
+            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argRGB[1];
+            const GLchan (*arg2)[4] = (const GLchan (*)[4]) argRGB[2];
+#if CHAN_TYPE != GL_FLOAT
+            const GLint shift = CHAN_BITS - RGBshift;
+#endif
+            for (i = 0; i < n; i++) {
+#if CHAN_TYPE == GL_FLOAT
+               rgba[i][RCOMP] = ((arg0[i][RCOMP] * arg2[i][RCOMP]) + arg1[i][RCOMP]) * RGBmult;
+               rgba[i][GCOMP] = ((arg0[i][GCOMP] * arg2[i][GCOMP]) + arg1[i][GCOMP]) * RGBmult;
+               rgba[i][BCOMP] = ((arg0[i][BCOMP] * arg2[i][BCOMP]) + arg1[i][BCOMP]) * RGBmult;
+#else
+               GLuint r = (PROD(arg0[i][RCOMP], arg2[i][RCOMP])
+                           + ((GLuint) arg1[i][RCOMP] << CHAN_BITS)) >> shift;
+               GLuint g = (PROD(arg0[i][GCOMP], arg2[i][GCOMP])
+                           + ((GLuint) arg1[i][GCOMP] << CHAN_BITS)) >> shift;
+               GLuint b = (PROD(arg0[i][BCOMP], arg2[i][BCOMP])
+                           + ((GLuint) arg1[i][BCOMP] << CHAN_BITS)) >> shift;
+               rgba[i][RCOMP] = (GLchan) MIN2(r, CHAN_MAX);
+               rgba[i][GCOMP] = (GLchan) MIN2(g, CHAN_MAX);
+               rgba[i][BCOMP] = (GLchan) MIN2(b, CHAN_MAX);
+#endif
+            }
+	 }
+         break;
+      case GL_MODULATE_SIGNED_ADD_ATI:
+         {
+            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argRGB[0];
+            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argRGB[1];
+            const GLchan (*arg2)[4] = (const GLchan (*)[4]) argRGB[2];
+#if CHAN_TYPE != GL_FLOAT
+            const GLint shift = CHAN_BITS - RGBshift;
+#endif
+            for (i = 0; i < n; i++) {
+#if CHAN_TYPE == GL_FLOAT
+               rgba[i][RCOMP] = ((arg0[i][RCOMP] * arg2[i][RCOMP]) + arg1[i][RCOMP] - 0.5) * RGBmult;
+               rgba[i][GCOMP] = ((arg0[i][GCOMP] * arg2[i][GCOMP]) + arg1[i][GCOMP] - 0.5) * RGBmult;
+               rgba[i][BCOMP] = ((arg0[i][BCOMP] * arg2[i][BCOMP]) + arg1[i][BCOMP] - 0.5) * RGBmult;
+#else
+               GLint r = (S_PROD(arg0[i][RCOMP], arg2[i][RCOMP])
+			  + (((GLint) arg1[i][RCOMP] - half) << CHAN_BITS))
+		    >> shift;
+               GLint g = (S_PROD(arg0[i][GCOMP], arg2[i][GCOMP])
+			  + (((GLint) arg1[i][GCOMP] - half) << CHAN_BITS))
+		    >> shift;
+               GLint b = (S_PROD(arg0[i][BCOMP], arg2[i][BCOMP])
+			  + (((GLint) arg1[i][BCOMP] - half) << CHAN_BITS))
+		    >> shift;
+               rgba[i][RCOMP] = (GLchan) CLAMP(r, 0, CHAN_MAX);
+               rgba[i][GCOMP] = (GLchan) CLAMP(g, 0, CHAN_MAX);
+               rgba[i][BCOMP] = (GLchan) CLAMP(b, 0, CHAN_MAX);
+#endif
+            }
+	 }
+         break;
+      case GL_MODULATE_SUBTRACT_ATI:
+         {
+            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argRGB[0];
+            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argRGB[1];
+            const GLchan (*arg2)[4] = (const GLchan (*)[4]) argRGB[2];
+#if CHAN_TYPE != GL_FLOAT
+            const GLint shift = CHAN_BITS - RGBshift;
+#endif
+            for (i = 0; i < n; i++) {
+#if CHAN_TYPE == GL_FLOAT
+               rgba[i][RCOMP] = ((arg0[i][RCOMP] * arg2[i][RCOMP]) - arg1[i][RCOMP]) * RGBmult;
+               rgba[i][GCOMP] = ((arg0[i][GCOMP] * arg2[i][GCOMP]) - arg1[i][GCOMP]) * RGBmult;
+               rgba[i][BCOMP] = ((arg0[i][BCOMP] * arg2[i][BCOMP]) - arg1[i][BCOMP]) * RGBmult;
+#else
+               GLint r = (S_PROD(arg0[i][RCOMP], arg2[i][RCOMP])
+			  - ((GLint) arg1[i][RCOMP] << CHAN_BITS))
+		    >> shift;
+               GLint g = (S_PROD(arg0[i][GCOMP], arg2[i][GCOMP])
+			  - ((GLint) arg1[i][GCOMP] << CHAN_BITS))
+		    >> shift;
+               GLint b = (S_PROD(arg0[i][BCOMP], arg2[i][BCOMP])
+			  - ((GLint) arg1[i][BCOMP] << CHAN_BITS))
+		    >> shift;
+               rgba[i][RCOMP] = (GLchan) CLAMP(r, 0, CHAN_MAX);
+               rgba[i][GCOMP] = (GLchan) CLAMP(g, 0, CHAN_MAX);
+               rgba[i][BCOMP] = (GLchan) CLAMP(b, 0, CHAN_MAX);
+#endif
+            }
+	 }
+         break;
+      default:
+         _mesa_problem(ctx, "invalid combine mode");
+   }
+
+   switch (textureUnit->CombineModeA) {
+      case GL_REPLACE:
+         {
+            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argA[0];
+            if (Ashift) {
+               for (i = 0; i < n; i++) {
+#if CHAN_TYPE == GL_FLOAT
+                  GLchan a = arg0[i][ACOMP] * Amult;
+#else
+                  GLuint a = (GLuint) arg0[i][ACOMP] << Ashift;
+#endif
+                  rgba[i][ACOMP] = (GLchan) MIN2(a, CHAN_MAX);
+               }
+            }
+            else {
+               for (i = 0; i < n; i++) {
+                  rgba[i][ACOMP] = arg0[i][ACOMP];
+               }
+            }
+         }
+         break;
+      case GL_MODULATE:
+         {
+            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argA[0];
+            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argA[1];
+#if CHAN_TYPE != GL_FLOAT
+            const GLint shift = CHAN_BITS - Ashift;
+#endif
+            for (i = 0; i < n; i++) {
+#if CHAN_TYPE == GL_FLOAT
+               rgba[i][ACOMP] = arg0[i][ACOMP] * arg1[i][ACOMP] * Amult;
+#else
+               GLuint a = (PROD(arg0[i][ACOMP], arg1[i][ACOMP]) >> shift);
+               rgba[i][ACOMP] = (GLchan) MIN2(a, CHAN_MAX);
+#endif
+            }
+         }
+         break;
+      case GL_ADD:
+         {
+            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argA[0];
+            const GLchan  (*arg1)[4] = (const GLchan (*)[4]) argA[1];
+            for (i = 0; i < n; i++) {
+#if CHAN_TYPE == GL_FLOAT
+               rgba[i][ACOMP] = (arg0[i][ACOMP] + arg1[i][ACOMP]) * Amult;
+#else
+               GLint a = ((GLint) arg0[i][ACOMP] + arg1[i][ACOMP]) << Ashift;
+               rgba[i][ACOMP] = (GLchan) MIN2(a, CHAN_MAX);
+#endif
+            }
+         }
+         break;
+      case GL_ADD_SIGNED:
+         {
+            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argA[0];
+            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argA[1];
+            for (i = 0; i < n; i++) {
+#if CHAN_TYPE == GL_FLOAT
+               rgba[i][ACOMP] = (arg0[i][ACOMP] + arg1[i][ACOMP] - 0.5F) * Amult;
+#else
+               GLint a = (GLint) arg0[i][ACOMP] + (GLint) arg1[i][ACOMP] -half;
+               a = (a < 0) ? 0 : a << Ashift;
+               rgba[i][ACOMP] = (GLchan) MIN2(a, CHAN_MAX);
+#endif
+            }
+         }
+         break;
+      case GL_INTERPOLATE:
+         {
+            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argA[0];
+            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argA[1];
+            const GLchan (*arg2)[4] = (const GLchan (*)[4]) argA[2];
+#if CHAN_TYPE != GL_FLOAT
+            const GLint shift = CHAN_BITS - Ashift;
+#endif
+            for (i=0; i<n; i++) {
+#if CHAN_TYPE == GL_FLOAT
+               rgba[i][ACOMP] = (arg0[i][ACOMP] * arg2[i][ACOMP] +
+                                 arg1[i][ACOMP] * (CHAN_MAXF - arg2[i][ACOMP]))
+                                * Amult;
+#else
+               GLuint a = (PROD(arg0[i][ACOMP], arg2[i][ACOMP])
+                           + PROD(arg1[i][ACOMP], CHAN_MAX - arg2[i][ACOMP]))
+                              >> shift;
+               rgba[i][ACOMP] = (GLchan) MIN2(a, CHAN_MAX);
+#endif
+            }
+         }
+         break;
+      case GL_SUBTRACT:
+         {
+            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argA[0];
+            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argA[1];
+            for (i = 0; i < n; i++) {
+#if CHAN_TYPE == GL_FLOAT
+               rgba[i][ACOMP] = (arg0[i][ACOMP] - arg1[i][ACOMP]) * Amult;
+#else
+               GLint a = ((GLint) arg0[i][ACOMP] - (GLint) arg1[i][ACOMP]) << Ashift;
+               rgba[i][ACOMP] = (GLchan) CLAMP(a, 0, CHAN_MAX);
+#endif
+            }
+         }
+         break;
+      case GL_MODULATE_ADD_ATI:
+         {
+            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argA[0];
+            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argA[1];
+            const GLchan (*arg2)[4] = (const GLchan (*)[4]) argA[2];
+#if CHAN_TYPE != GL_FLOAT
+            const GLint shift = CHAN_BITS - Ashift;
+#endif
+            for (i = 0; i < n; i++) {
+#if CHAN_TYPE == GL_FLOAT
+               rgba[i][ACOMP] = ((arg0[i][ACOMP] * arg2[i][ACOMP]) + arg1[i][ACOMP]) * Amult;
+#else
+               GLint a = (PROD(arg0[i][ACOMP], arg2[i][ACOMP])
+			   + ((GLuint) arg1[i][ACOMP] << CHAN_BITS))
+		    >> shift;
+               rgba[i][ACOMP] = (GLchan) CLAMP(a, 0, CHAN_MAX);
+#endif
+            }
+         }
+         break;
+      case GL_MODULATE_SIGNED_ADD_ATI:
+         {
+            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argA[0];
+            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argA[1];
+            const GLchan (*arg2)[4] = (const GLchan (*)[4]) argA[2];
+#if CHAN_TYPE != GL_FLOAT
+            const GLint shift = CHAN_BITS - Ashift;
+#endif
+            for (i = 0; i < n; i++) {
+#if CHAN_TYPE == GL_FLOAT
+               rgba[i][ACOMP] = ((arg0[i][ACOMP] * arg2[i][ACOMP]) + arg1[i][ACOMP] - 0.5F) * Amult;
+#else
+               GLint a = (S_PROD(arg0[i][ACOMP], arg2[i][ACOMP])
+			  + (((GLint) arg1[i][ACOMP] - half) << CHAN_BITS))
+		    >> shift;
+               rgba[i][ACOMP] = (GLchan) CLAMP(a, 0, CHAN_MAX);
+#endif
+            }
+         }
+         break;
+      case GL_MODULATE_SUBTRACT_ATI:
+         {
+            const GLchan (*arg0)[4] = (const GLchan (*)[4]) argA[0];
+            const GLchan (*arg1)[4] = (const GLchan (*)[4]) argA[1];
+            const GLchan (*arg2)[4] = (const GLchan (*)[4]) argA[2];
+#if CHAN_TYPE != GL_FLOAT
+            const GLint shift = CHAN_BITS - Ashift;
+#endif
+            for (i = 0; i < n; i++) {
+#if CHAN_TYPE == GL_FLOAT
+               rgba[i][ACOMP] = ((arg0[i][ACOMP] * arg2[i][ACOMP]) - arg1[i][ACOMP]) * Amult;
+#else
+               GLint a = (S_PROD(arg0[i][ACOMP], arg2[i][ACOMP]) 
+			  - ((GLint) arg1[i][ACOMP] << CHAN_BITS))
+		    >> shift;
+               rgba[i][ACOMP] = (GLchan) CLAMP(a, 0, CHAN_MAX);
+#endif
+            }
+         }
+         break;
+      default:
+         _mesa_problem(ctx, "invalid combine mode");
+   }
+
+   /* Fix the alpha component for GL_DOT3_RGBA_EXT/ARB combining.
+    * This is kind of a kludge.  It would have been better if the spec
+    * were written such that the GL_COMBINE_ALPHA value could be set to
+    * GL_DOT3.
+    */
+   if (textureUnit->CombineModeRGB == GL_DOT3_RGBA_EXT ||
+       textureUnit->CombineModeRGB == GL_DOT3_RGBA) {
+      for (i = 0; i < n; i++) {
+	 rgba[i][ACOMP] = rgba[i][RCOMP];
+      }
+   }
+   UNDEFARRAY(ccolor);  /* mac 32k limitation */
+}
+#undef PROD
+
+
+/**
+ * Implement NVIDIA's GL_NV_texture_env_combine4 extension when
+ * texUnit->EnvMode == GL_COMBINE4_NV.
+ */
+static INLINE void
+texture_combine4( const GLcontext *ctx, GLuint unit, GLuint n,
+                  CONST GLchan (*primary_rgba)[4],
+                  CONST GLchan *texelBuffer,
+                  GLchan (*rgba)[4] )
+{
+}
+
+
+
+/**
+ * Apply a conventional OpenGL texture env mode (REPLACE, ADD, BLEND,
+ * MODULATE, or DECAL) to an array of fragments.
+ * Input:  textureUnit - pointer to texture unit to apply
+ *         format - base internal texture format
+ *         n - number of fragments
+ *         primary_rgba - primary colors (may alias rgba for single texture)
+ *         texels - array of texel colors
+ * InOut:  rgba - incoming fragment colors modified by texel colors
+ *                according to the texture environment mode.
+ */
+static void
+texture_apply( const GLcontext *ctx,
+               const struct gl_texture_unit *texUnit,
+               GLuint n,
+               CONST GLchan primary_rgba[][4], CONST GLchan texel[][4],
+               GLchan rgba[][4] )
+{
+   GLint baseLevel;
+   GLuint i;
+   GLint Rc, Gc, Bc, Ac;
+   GLenum format;
+
+   ASSERT(texUnit);
+   ASSERT(texUnit->_Current);
+
+   baseLevel = texUnit->_Current->BaseLevel;
+   ASSERT(texUnit->_Current->Image[baseLevel]);
+
+   format = texUnit->_Current->Image[baseLevel]->Format;
+
+   if (format == GL_COLOR_INDEX || format == GL_YCBCR_MESA) {
+      format = GL_RGBA;  /* a bit of a hack */
+   }
+   else if (format == GL_DEPTH_COMPONENT) {
+      format = texUnit->_Current->DepthMode;
+   }
+
+   switch (texUnit->EnvMode) {
+      case GL_REPLACE:
+	 switch (format) {
+	    case GL_ALPHA:
+	       for (i=0;i<n;i++) {
+		  /* Cv = Cf */
+                  /* Av = At */
+                  rgba[i][ACOMP] = texel[i][ACOMP];
+	       }
+	       break;
+	    case GL_LUMINANCE:
+	       for (i=0;i<n;i++) {
+		  /* Cv = Lt */
+                  GLchan Lt = texel[i][RCOMP];
+                  rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = Lt;
+                  /* Av = Af */
+	       }
+	       break;
+	    case GL_LUMINANCE_ALPHA:
+	       for (i=0;i<n;i++) {
+                  GLchan Lt = texel[i][RCOMP];
+		  /* Cv = Lt */
+		  rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = Lt;
+		  /* Av = At */
+		  rgba[i][ACOMP] = texel[i][ACOMP];
+	       }
+	       break;
+	    case GL_INTENSITY:
+	       for (i=0;i<n;i++) {
+		  /* Cv = It */
+                  GLchan It = texel[i][RCOMP];
+                  rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = It;
+                  /* Av = It */
+                  rgba[i][ACOMP] = It;
+	       }
+	       break;
+	    case GL_RGB:
+	       for (i=0;i<n;i++) {
+		  /* Cv = Ct */
+		  rgba[i][RCOMP] = texel[i][RCOMP];
+		  rgba[i][GCOMP] = texel[i][GCOMP];
+		  rgba[i][BCOMP] = texel[i][BCOMP];
+		  /* Av = Af */
+	       }
+	       break;
+	    case GL_RGBA:
+	       for (i=0;i<n;i++) {
+		  /* Cv = Ct */
+		  rgba[i][RCOMP] = texel[i][RCOMP];
+		  rgba[i][GCOMP] = texel[i][GCOMP];
+		  rgba[i][BCOMP] = texel[i][BCOMP];
+		  /* Av = At */
+		  rgba[i][ACOMP] = texel[i][ACOMP];
+	       }
+	       break;
+            default:
+               _mesa_problem(ctx, "Bad format (GL_REPLACE) in texture_apply");
+               return;
+	 }
+	 break;
+
+      case GL_MODULATE:
+         switch (format) {
+	    case GL_ALPHA:
+	       for (i=0;i<n;i++) {
+		  /* Cv = Cf */
+		  /* Av = AfAt */
+		  rgba[i][ACOMP] = CHAN_PRODUCT( rgba[i][ACOMP], texel[i][ACOMP] );
+	       }
+	       break;
+	    case GL_LUMINANCE:
+	       for (i=0;i<n;i++) {
+		  /* Cv = LtCf */
+                  GLchan Lt = texel[i][RCOMP];
+		  rgba[i][RCOMP] = CHAN_PRODUCT( rgba[i][RCOMP], Lt );
+		  rgba[i][GCOMP] = CHAN_PRODUCT( rgba[i][GCOMP], Lt );
+		  rgba[i][BCOMP] = CHAN_PRODUCT( rgba[i][BCOMP], Lt );
+		  /* Av = Af */
+	       }
+	       break;
+	    case GL_LUMINANCE_ALPHA:
+	       for (i=0;i<n;i++) {
+		  /* Cv = CfLt */
+                  GLchan Lt = texel[i][RCOMP];
+		  rgba[i][RCOMP] = CHAN_PRODUCT( rgba[i][RCOMP], Lt );
+		  rgba[i][GCOMP] = CHAN_PRODUCT( rgba[i][GCOMP], Lt );
+		  rgba[i][BCOMP] = CHAN_PRODUCT( rgba[i][BCOMP], Lt );
+		  /* Av = AfAt */
+		  rgba[i][ACOMP] = CHAN_PRODUCT( rgba[i][ACOMP], texel[i][ACOMP] );
+	       }
+	       break;
+	    case GL_INTENSITY:
+	       for (i=0;i<n;i++) {
+		  /* Cv = CfIt */
+                  GLchan It = texel[i][RCOMP];
+		  rgba[i][RCOMP] = CHAN_PRODUCT( rgba[i][RCOMP], It );
+		  rgba[i][GCOMP] = CHAN_PRODUCT( rgba[i][GCOMP], It );
+		  rgba[i][BCOMP] = CHAN_PRODUCT( rgba[i][BCOMP], It );
+		  /* Av = AfIt */
+		  rgba[i][ACOMP] = CHAN_PRODUCT( rgba[i][ACOMP], It );
+	       }
+	       break;
+	    case GL_RGB:
+	       for (i=0;i<n;i++) {
+		  /* Cv = CfCt */
+		  rgba[i][RCOMP] = CHAN_PRODUCT( rgba[i][RCOMP], texel[i][RCOMP] );
+		  rgba[i][GCOMP] = CHAN_PRODUCT( rgba[i][GCOMP], texel[i][GCOMP] );
+		  rgba[i][BCOMP] = CHAN_PRODUCT( rgba[i][BCOMP], texel[i][BCOMP] );
+		  /* Av = Af */
+	       }
+	       break;
+	    case GL_RGBA:
+	       for (i=0;i<n;i++) {
+		  /* Cv = CfCt */
+		  rgba[i][RCOMP] = CHAN_PRODUCT( rgba[i][RCOMP], texel[i][RCOMP] );
+		  rgba[i][GCOMP] = CHAN_PRODUCT( rgba[i][GCOMP], texel[i][GCOMP] );
+		  rgba[i][BCOMP] = CHAN_PRODUCT( rgba[i][BCOMP], texel[i][BCOMP] );
+		  /* Av = AfAt */
+		  rgba[i][ACOMP] = CHAN_PRODUCT( rgba[i][ACOMP], texel[i][ACOMP] );
+	       }
+	       break;
+            default:
+               _mesa_problem(ctx, "Bad format (GL_MODULATE) in texture_apply");
+               return;
+	 }
+	 break;
+
+      case GL_DECAL:
+         switch (format) {
+            case GL_ALPHA:
+            case GL_LUMINANCE:
+            case GL_LUMINANCE_ALPHA:
+            case GL_INTENSITY:
+               /* undefined */
+               break;
+	    case GL_RGB:
+	       for (i=0;i<n;i++) {
+		  /* Cv = Ct */
+		  rgba[i][RCOMP] = texel[i][RCOMP];
+		  rgba[i][GCOMP] = texel[i][GCOMP];
+		  rgba[i][BCOMP] = texel[i][BCOMP];
+		  /* Av = Af */
+	       }
+	       break;
+	    case GL_RGBA:
+	       for (i=0;i<n;i++) {
+		  /* Cv = Cf(1-At) + CtAt */
+		  GLint t = texel[i][ACOMP], s = CHAN_MAX - t;
+		  rgba[i][RCOMP] = CHAN_PRODUCT(rgba[i][RCOMP], s) + CHAN_PRODUCT(texel[i][RCOMP],t);
+		  rgba[i][GCOMP] = CHAN_PRODUCT(rgba[i][GCOMP], s) + CHAN_PRODUCT(texel[i][GCOMP],t);
+		  rgba[i][BCOMP] = CHAN_PRODUCT(rgba[i][BCOMP], s) + CHAN_PRODUCT(texel[i][BCOMP],t);
+		  /* Av = Af */
+	       }
+	       break;
+            default:
+               _mesa_problem(ctx, "Bad format (GL_DECAL) in texture_apply");
+               return;
+	 }
+	 break;
+
+      case GL_BLEND:
+         Rc = (GLint) (texUnit->EnvColor[0] * CHAN_MAXF);
+         Gc = (GLint) (texUnit->EnvColor[1] * CHAN_MAXF);
+         Bc = (GLint) (texUnit->EnvColor[2] * CHAN_MAXF);
+         Ac = (GLint) (texUnit->EnvColor[3] * CHAN_MAXF);
+	 switch (format) {
+	    case GL_ALPHA:
+	       for (i=0;i<n;i++) {
+		  /* Cv = Cf */
+		  /* Av = AfAt */
+                  rgba[i][ACOMP] = CHAN_PRODUCT(rgba[i][ACOMP], texel[i][ACOMP]);
+	       }
+	       break;
+            case GL_LUMINANCE:
+	       for (i=0;i<n;i++) {
+		  /* Cv = Cf(1-Lt) + CcLt */
+		  GLchan Lt = texel[i][RCOMP], s = CHAN_MAX - Lt;
+		  rgba[i][RCOMP] = CHAN_PRODUCT(rgba[i][RCOMP], s) + CHAN_PRODUCT(Rc, Lt);
+		  rgba[i][GCOMP] = CHAN_PRODUCT(rgba[i][GCOMP], s) + CHAN_PRODUCT(Gc, Lt);
+		  rgba[i][BCOMP] = CHAN_PRODUCT(rgba[i][BCOMP], s) + CHAN_PRODUCT(Bc, Lt);
+		  /* Av = Af */
+	       }
+	       break;
+	    case GL_LUMINANCE_ALPHA:
+	       for (i=0;i<n;i++) {
+		  /* Cv = Cf(1-Lt) + CcLt */
+		  GLchan Lt = texel[i][RCOMP], s = CHAN_MAX - Lt;
+		  rgba[i][RCOMP] = CHAN_PRODUCT(rgba[i][RCOMP], s) + CHAN_PRODUCT(Rc, Lt);
+		  rgba[i][GCOMP] = CHAN_PRODUCT(rgba[i][GCOMP], s) + CHAN_PRODUCT(Gc, Lt);
+		  rgba[i][BCOMP] = CHAN_PRODUCT(rgba[i][BCOMP], s) + CHAN_PRODUCT(Bc, Lt);
+		  /* Av = AfAt */
+		  rgba[i][ACOMP] = CHAN_PRODUCT(rgba[i][ACOMP],texel[i][ACOMP]);
+	       }
+	       break;
+            case GL_INTENSITY:
+	       for (i=0;i<n;i++) {
+		  /* Cv = Cf(1-It) + CcLt */
+		  GLchan It = texel[i][RCOMP], s = CHAN_MAX - It;
+		  rgba[i][RCOMP] = CHAN_PRODUCT(rgba[i][RCOMP], s) + CHAN_PRODUCT(Rc, It);
+		  rgba[i][GCOMP] = CHAN_PRODUCT(rgba[i][GCOMP], s) + CHAN_PRODUCT(Gc, It);
+		  rgba[i][BCOMP] = CHAN_PRODUCT(rgba[i][BCOMP], s) + CHAN_PRODUCT(Bc, It);
+                  /* Av = Af(1-It) + Ac*It */
+                  rgba[i][ACOMP] = CHAN_PRODUCT(rgba[i][ACOMP], s) + CHAN_PRODUCT(Ac, It);
+               }
+               break;
+	    case GL_RGB:
+	       for (i=0;i<n;i++) {
+		  /* Cv = Cf(1-Ct) + CcCt */
+		  rgba[i][RCOMP] = CHAN_PRODUCT(rgba[i][RCOMP], (CHAN_MAX-texel[i][RCOMP])) + CHAN_PRODUCT(Rc,texel[i][RCOMP]);
+		  rgba[i][GCOMP] = CHAN_PRODUCT(rgba[i][GCOMP], (CHAN_MAX-texel[i][GCOMP])) + CHAN_PRODUCT(Gc,texel[i][GCOMP]);
+		  rgba[i][BCOMP] = CHAN_PRODUCT(rgba[i][BCOMP], (CHAN_MAX-texel[i][BCOMP])) + CHAN_PRODUCT(Bc,texel[i][BCOMP]);
+		  /* Av = Af */
+	       }
+	       break;
+	    case GL_RGBA:
+	       for (i=0;i<n;i++) {
+		  /* Cv = Cf(1-Ct) + CcCt */
+		  rgba[i][RCOMP] = CHAN_PRODUCT(rgba[i][RCOMP], (CHAN_MAX-texel[i][RCOMP])) + CHAN_PRODUCT(Rc,texel[i][RCOMP]);
+		  rgba[i][GCOMP] = CHAN_PRODUCT(rgba[i][GCOMP], (CHAN_MAX-texel[i][GCOMP])) + CHAN_PRODUCT(Gc,texel[i][GCOMP]);
+		  rgba[i][BCOMP] = CHAN_PRODUCT(rgba[i][BCOMP], (CHAN_MAX-texel[i][BCOMP])) + CHAN_PRODUCT(Bc,texel[i][BCOMP]);
+		  /* Av = AfAt */
+		  rgba[i][ACOMP] = CHAN_PRODUCT(rgba[i][ACOMP],texel[i][ACOMP]);
+	       }
+	       break;
+            default:
+               _mesa_problem(ctx, "Bad format (GL_BLEND) in texture_apply");
+               return;
+	 }
+	 break;
+
+     /* XXX don't clamp results if GLchan is float??? */
+
+      case GL_ADD:  /* GL_EXT_texture_add_env */
+         switch (format) {
+            case GL_ALPHA:
+               for (i=0;i<n;i++) {
+                  /* Rv = Rf */
+                  /* Gv = Gf */
+                  /* Bv = Bf */
+                  rgba[i][ACOMP] = CHAN_PRODUCT(rgba[i][ACOMP], texel[i][ACOMP]);
+               }
+               break;
+            case GL_LUMINANCE:
+               for (i=0;i<n;i++) {
+                  GLuint Lt = texel[i][RCOMP];
+                  GLuint r = rgba[i][RCOMP] + Lt;
+                  GLuint g = rgba[i][GCOMP] + Lt;
+                  GLuint b = rgba[i][BCOMP] + Lt;
+                  rgba[i][RCOMP] = MIN2(r, CHAN_MAX);
+                  rgba[i][GCOMP] = MIN2(g, CHAN_MAX);
+                  rgba[i][BCOMP] = MIN2(b, CHAN_MAX);
+                  /* Av = Af */
+               }
+               break;
+            case GL_LUMINANCE_ALPHA:
+               for (i=0;i<n;i++) {
+                  GLuint Lt = texel[i][RCOMP];
+                  GLuint r = rgba[i][RCOMP] + Lt;
+                  GLuint g = rgba[i][GCOMP] + Lt;
+                  GLuint b = rgba[i][BCOMP] + Lt;
+                  rgba[i][RCOMP] = MIN2(r, CHAN_MAX);
+                  rgba[i][GCOMP] = MIN2(g, CHAN_MAX);
+                  rgba[i][BCOMP] = MIN2(b, CHAN_MAX);
+                  rgba[i][ACOMP] = CHAN_PRODUCT(rgba[i][ACOMP], texel[i][ACOMP]);
+               }
+               break;
+            case GL_INTENSITY:
+               for (i=0;i<n;i++) {
+                  GLchan It = texel[i][RCOMP];
+                  GLuint r = rgba[i][RCOMP] + It;
+                  GLuint g = rgba[i][GCOMP] + It;
+                  GLuint b = rgba[i][BCOMP] + It;
+                  GLuint a = rgba[i][ACOMP] + It;
+                  rgba[i][RCOMP] = MIN2(r, CHAN_MAX);
+                  rgba[i][GCOMP] = MIN2(g, CHAN_MAX);
+                  rgba[i][BCOMP] = MIN2(b, CHAN_MAX);
+                  rgba[i][ACOMP] = MIN2(a, CHAN_MAX);
+               }
+               break;
+	    case GL_RGB:
+	       for (i=0;i<n;i++) {
+                  GLuint r = rgba[i][RCOMP] + texel[i][RCOMP];
+                  GLuint g = rgba[i][GCOMP] + texel[i][GCOMP];
+                  GLuint b = rgba[i][BCOMP] + texel[i][BCOMP];
+		  rgba[i][RCOMP] = MIN2(r, CHAN_MAX);
+		  rgba[i][GCOMP] = MIN2(g, CHAN_MAX);
+		  rgba[i][BCOMP] = MIN2(b, CHAN_MAX);
+		  /* Av = Af */
+	       }
+	       break;
+	    case GL_RGBA:
+	       for (i=0;i<n;i++) {
+                  GLuint r = rgba[i][RCOMP] + texel[i][RCOMP];
+                  GLuint g = rgba[i][GCOMP] + texel[i][GCOMP];
+                  GLuint b = rgba[i][BCOMP] + texel[i][BCOMP];
+		  rgba[i][RCOMP] = MIN2(r, CHAN_MAX);
+		  rgba[i][GCOMP] = MIN2(g, CHAN_MAX);
+		  rgba[i][BCOMP] = MIN2(b, CHAN_MAX);
+                  rgba[i][ACOMP] = CHAN_PRODUCT(rgba[i][ACOMP], texel[i][ACOMP]);
+               }
+               break;
+            default:
+               _mesa_problem(ctx, "Bad format (GL_ADD) in texture_apply");
+               return;
+	 }
+	 break;
+
+      default:
+         _mesa_problem(ctx, "Bad env mode in texture_apply");
+         return;
+   }
+}
+
+
+
+/**
+ * Apply texture mapping to a span of fragments.
+ */
+void
+_swrast_texture_span( GLcontext *ctx, struct sw_span *span )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   GLchan primary_rgba[MAX_WIDTH][4];
+   GLuint unit;
+
+   ASSERT(span->end < MAX_WIDTH);
+   ASSERT(span->arrayMask & SPAN_TEXTURE);
+
+   /*
+    * Save copy of the incoming fragment colors (the GL_PRIMARY_COLOR)
+    */
+   if (swrast->_AnyTextureCombine)
+      MEMCPY(primary_rgba, span->array->rgba, 4 * span->end * sizeof(GLchan));
+
+   /*
+    * Must do all texture sampling before combining in order to
+    * accomodate GL_ARB_texture_env_crossbar.
+    */
+   for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++) {
+      if (ctx->Texture.Unit[unit]._ReallyEnabled) {
+         const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
+         const struct gl_texture_object *curObj = texUnit->_Current;
+         GLfloat *lambda = span->array->lambda[unit];
+         GLchan (*texels)[4] = (GLchan (*)[4])
+            (swrast->TexelBuffer + unit * (span->end * 4 * sizeof(GLchan)));
+
+         /* adjust texture lod (lambda) */
+         if (span->arrayMask & SPAN_LAMBDA) {
+            if (texUnit->LodBias + curObj->LodBias != 0.0F) {
+               /* apply LOD bias, but don't clamp yet */
+               const GLfloat bias = CLAMP(texUnit->LodBias + curObj->LodBias,
+                                          -ctx->Const.MaxTextureLodBias,
+                                          ctx->Const.MaxTextureLodBias);
+               GLuint i;
+               for (i = 0; i < span->end; i++) {
+                  lambda[i] += bias;
+               }
+            }
+
+            if (curObj->MinLod != -1000.0 || curObj->MaxLod != 1000.0) {
+               /* apply LOD clamping to lambda */
+               const GLfloat min = curObj->MinLod;
+               const GLfloat max = curObj->MaxLod;
+               GLuint i;
+               for (i = 0; i < span->end; i++) {
+                  GLfloat l = lambda[i];
+                  lambda[i] = CLAMP(l, min, max);
+               }
+            }
+         }
+
+         /* Sample the texture (span->end fragments) */
+         swrast->TextureSample[unit]( ctx, unit, texUnit->_Current, span->end,
+                         (const GLfloat (*)[4]) span->array->texcoords[unit],
+                         lambda, texels );
+
+         /* GL_SGI_texture_color_table */
+         if (texUnit->ColorTableEnabled) {
+            _swrast_texture_table_lookup(&texUnit->ColorTable, span->end, texels);
+         }
+      }
+   }
+
+   /*
+    * OK, now apply the texture (aka texture combine/blend).
+    * We modify the span->color.rgba values.
+    */
+   for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++) {
+      if (ctx->Texture.Unit[unit]._ReallyEnabled) {
+         const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
+         if (texUnit->EnvMode == GL_COMBINE) {
+            /* GL_ARB/EXT_texture_env_combine */
+            texture_combine( ctx, unit, span->end,
+                             (CONST GLchan (*)[4]) primary_rgba,
+                             swrast->TexelBuffer,
+                             span->array->rgba );
+         }
+         else if (texUnit->EnvMode == GL_COMBINE4_NV) {
+            /* GL_NV_texture_env_combine4 */
+            texture_combine4( ctx, unit, span->end,
+                              (CONST GLchan (*)[4]) primary_rgba,
+                              swrast->TexelBuffer,
+                              span->array->rgba );
+         }
+         else {
+            /* conventional texture blend */
+            const GLchan (*texels)[4] = (const GLchan (*)[4])
+               (swrast->TexelBuffer + unit *
+                (span->end * 4 * sizeof(GLchan)));
+            texture_apply( ctx, texUnit, span->end,
+                           (CONST GLchan (*)[4]) primary_rgba, texels,
+                           span->array->rgba );
+         }
+      }
+   }
+}
diff --git a/reactos/lib/mesa32/src/swrast/s_texture.h b/reactos/lib/mesa32/src/swrast/s_texture.h
new file mode 100644
index 00000000000..b0c16083da1
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_texture.h
@@ -0,0 +1,47 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef S_TEXTURE_H
+#define S_TEXTURE_H
+
+
+#include "mtypes.h"
+#include "swrast.h"
+
+
+extern void
+_swrast_texture_table_lookup( const struct gl_color_table *table,
+                              GLuint n, GLchan rgba[][4] );
+
+extern texture_sample_func
+_swrast_choose_texture_sample_func( GLcontext *ctx,
+				    const struct gl_texture_object *tObj );
+
+
+extern void
+_swrast_texture_span( GLcontext *ctx, struct sw_span *span );
+
+#endif
diff --git a/reactos/lib/mesa32/src/swrast/s_triangle.c b/reactos/lib/mesa32/src/swrast/s_triangle.c
new file mode 100644
index 00000000000..02adcf80d59
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_triangle.c
@@ -0,0 +1,1155 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * When the device driver doesn't implement triangle rasterization it
+ * can hook in _swrast_Triangle, which eventually calls one of these
+ * functions to draw triangles.
+ */
+
+#include "glheader.h"
+#include "context.h"
+#include "colormac.h"
+#include "imports.h"
+#include "macros.h"
+#include "texformat.h"
+#include "teximage.h"
+#include "texstate.h"
+
+#include "s_aatriangle.h"
+#include "s_context.h"
+#include "s_depth.h"
+#include "s_feedback.h"
+#include "s_span.h"
+#include "s_triangle.h"
+
+
+/*
+ * Just used for feedback mode.
+ */
+GLboolean _swrast_culltriangle( GLcontext *ctx,
+			    const SWvertex *v0,
+			    const SWvertex *v1,
+			    const SWvertex *v2 )
+{
+   GLfloat ex = v1->win[0] - v0->win[0];
+   GLfloat ey = v1->win[1] - v0->win[1];
+   GLfloat fx = v2->win[0] - v0->win[0];
+   GLfloat fy = v2->win[1] - v0->win[1];
+   GLfloat c = ex*fy-ey*fx;
+
+   if (c * SWRAST_CONTEXT(ctx)->_BackfaceSign > 0)
+      return 0;
+
+   return 1;
+}
+
+
+
+/*
+ * Render a flat-shaded color index triangle.
+ */
+#define NAME flat_ci_triangle
+#define INTERP_Z 1
+#define INTERP_FOG 1
+#define SETUP_CODE			\
+   span.interpMask |= SPAN_INDEX;	\
+   span.index = FloatToFixed(v2->index);\
+   span.indexStep = 0;
+#define RENDER_SPAN( span )  _swrast_write_index_span(ctx, &span);
+#include "s_tritemp.h"
+
+
+
+/*
+ * Render a smooth-shaded color index triangle.
+ */
+#define NAME smooth_ci_triangle
+#define INTERP_Z 1
+#define INTERP_FOG 1
+#define INTERP_INDEX 1
+#define RENDER_SPAN( span )  _swrast_write_index_span(ctx, &span);
+#include "s_tritemp.h"
+
+
+
+/*
+ * Render a flat-shaded RGBA triangle.
+ */
+#define NAME flat_rgba_triangle
+#define INTERP_Z 1
+#define INTERP_FOG 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define SETUP_CODE				\
+   ASSERT(ctx->Texture._EnabledCoordUnits == 0);\
+   ASSERT(ctx->Light.ShadeModel==GL_FLAT);	\
+   span.interpMask |= SPAN_RGBA;		\
+   span.red = ChanToFixed(v2->color[0]);	\
+   span.green = ChanToFixed(v2->color[1]);	\
+   span.blue = ChanToFixed(v2->color[2]);	\
+   span.alpha = ChanToFixed(v2->color[3]);	\
+   span.redStep = 0;				\
+   span.greenStep = 0;				\
+   span.blueStep = 0;				\
+   span.alphaStep = 0;
+#define RENDER_SPAN( span )  _swrast_write_rgba_span(ctx, &span);
+#include "s_tritemp.h"
+
+
+
+/*
+ * Render a smooth-shaded RGBA triangle.
+ */
+#define NAME smooth_rgba_triangle
+#define INTERP_Z 1
+#define INTERP_FOG 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define INTERP_RGB 1
+#define INTERP_ALPHA 1
+#define SETUP_CODE				\
+   {						\
+      /* texturing must be off */		\
+      ASSERT(ctx->Texture._EnabledCoordUnits == 0);	\
+      ASSERT(ctx->Light.ShadeModel==GL_SMOOTH);	\
+   }
+#define RENDER_SPAN( span )  _swrast_write_rgba_span(ctx, &span);
+#include "s_tritemp.h"
+
+
+
+/*
+ * Render an RGB, GL_DECAL, textured triangle.
+ * Interpolate S,T only w/out mipmapping or perspective correction.
+ *
+ * No fog.
+ */
+#define NAME simple_textured_triangle
+#define INTERP_INT_TEX 1
+#define S_SCALE twidth
+#define T_SCALE theight
+
+#define SETUP_CODE							\
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);                             \
+   struct gl_texture_object *obj = ctx->Texture.Unit[0].Current2D;	\
+   const GLint b = obj->BaseLevel;					\
+   const GLfloat twidth = (GLfloat) obj->Image[b]->Width;		\
+   const GLfloat theight = (GLfloat) obj->Image[b]->Height;		\
+   const GLint twidth_log2 = obj->Image[b]->WidthLog2;			\
+   const GLchan *texture = (const GLchan *) obj->Image[b]->Data;	\
+   const GLint smask = obj->Image[b]->Width - 1;			\
+   const GLint tmask = obj->Image[b]->Height - 1;			\
+   if (!texture) {							\
+      /* this shouldn't happen */					\
+      return;								\
+   }
+
+#define RENDER_SPAN( span  )						\
+   GLuint i;								\
+   span.intTex[0] -= FIXED_HALF; /* off-by-one error? */		\
+   span.intTex[1] -= FIXED_HALF;					\
+   for (i = 0; i < span.end; i++) {					\
+      GLint s = FixedToInt(span.intTex[0]) & smask;			\
+      GLint t = FixedToInt(span.intTex[1]) & tmask;			\
+      GLint pos = (t << twidth_log2) + s;				\
+      pos = pos + pos + pos;  /* multiply by 3 */			\
+      span.array->rgb[i][RCOMP] = texture[pos];				\
+      span.array->rgb[i][GCOMP] = texture[pos+1];			\
+      span.array->rgb[i][BCOMP] = texture[pos+2];			\
+      span.intTex[0] += span.intTexStep[0];				\
+      span.intTex[1] += span.intTexStep[1];				\
+   }									\
+   (*swrast->Driver.WriteRGBSpan)(ctx, span.end, span.x, span.y,	\
+                                  (CONST GLchan (*)[3]) span.array->rgb,\
+                                  NULL );
+#include "s_tritemp.h"
+
+
+
+/*
+ * Render an RGB, GL_DECAL, textured triangle.
+ * Interpolate S,T, GL_LESS depth test, w/out mipmapping or
+ * perspective correction.
+ *
+ * No fog.
+ */
+#define NAME simple_z_textured_triangle
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define INTERP_INT_TEX 1
+#define S_SCALE twidth
+#define T_SCALE theight
+
+#define SETUP_CODE							\
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);                             \
+   struct gl_texture_object *obj = ctx->Texture.Unit[0].Current2D;	\
+   const GLint b = obj->BaseLevel;					\
+   const GLfloat twidth = (GLfloat) obj->Image[b]->Width;		\
+   const GLfloat theight = (GLfloat) obj->Image[b]->Height;		\
+   const GLint twidth_log2 = obj->Image[b]->WidthLog2;			\
+   const GLchan *texture = (const GLchan *) obj->Image[b]->Data;	\
+   const GLint smask = obj->Image[b]->Width - 1;			\
+   const GLint tmask = obj->Image[b]->Height - 1;			\
+   if (!texture) {							\
+      /* this shouldn't happen */					\
+      return;								\
+   }
+
+#define RENDER_SPAN( span )						\
+   GLuint i;				    				\
+   span.intTex[0] -= FIXED_HALF; /* off-by-one error? */		\
+   span.intTex[1] -= FIXED_HALF;					\
+   for (i = 0; i < span.end; i++) {					\
+      const GLdepth z = FixedToDepth(span.z);				\
+      if (z < zRow[i]) {						\
+         GLint s = FixedToInt(span.intTex[0]) & smask;			\
+         GLint t = FixedToInt(span.intTex[1]) & tmask;			\
+         GLint pos = (t << twidth_log2) + s;				\
+         pos = pos + pos + pos;  /* multiply by 3 */			\
+         span.array->rgb[i][RCOMP] = texture[pos];			\
+         span.array->rgb[i][GCOMP] = texture[pos+1];			\
+         span.array->rgb[i][BCOMP] = texture[pos+2];			\
+         zRow[i] = z;							\
+         span.array->mask[i] = 1;					\
+      }									\
+      else {								\
+         span.array->mask[i] = 0;					\
+      }									\
+      span.intTex[0] += span.intTexStep[0];				\
+      span.intTex[1] += span.intTexStep[1];				\
+      span.z += span.zStep;						\
+   }									\
+   (*swrast->Driver.WriteRGBSpan)(ctx, span.end, span.x, span.y,	\
+                                  (CONST GLchan (*)[3]) span.array->rgb,\
+                                  span.array->mask );
+#include "s_tritemp.h"
+
+
+
+#if CHAN_TYPE != GL_FLOAT
+
+struct affine_info
+{
+   GLenum filter;
+   GLenum format;
+   GLenum envmode;
+   GLint smask, tmask;
+   GLint twidth_log2;
+   const GLchan *texture;
+   GLfixed er, eg, eb, ea;
+   GLint tbytesline, tsize;
+};
+
+
+/* This function can handle GL_NEAREST or GL_LINEAR sampling of 2D RGB or RGBA
+ * textures with GL_REPLACE, GL_MODULATE, GL_BLEND, GL_DECAL or GL_ADD
+ * texture env modes.
+ */
+static INLINE void
+affine_span(GLcontext *ctx, struct sw_span *span,
+            struct affine_info *info)
+{
+   GLchan sample[4];  /* the filtered texture sample */
+
+   /* Instead of defining a function for each mode, a test is done
+    * between the outer and inner loops. This is to reduce code size
+    * and complexity. Observe that an optimizing compiler kills
+    * unused variables (for instance tf,sf,ti,si in case of GL_NEAREST).
+    */
+
+#define NEAREST_RGB			\
+   sample[RCOMP] = tex00[RCOMP];	\
+   sample[GCOMP] = tex00[GCOMP];	\
+   sample[BCOMP] = tex00[BCOMP];	\
+   sample[ACOMP] = CHAN_MAX
+
+#define LINEAR_RGB							\
+   sample[RCOMP] = (ti * (si * tex00[0] + sf * tex01[0]) +		\
+             tf * (si * tex10[0] + sf * tex11[0])) >> 2 * FIXED_SHIFT;	\
+   sample[GCOMP] = (ti * (si * tex00[1] + sf * tex01[1]) +		\
+             tf * (si * tex10[1] + sf * tex11[1])) >> 2 * FIXED_SHIFT;	\
+   sample[BCOMP] = (ti * (si * tex00[2] + sf * tex01[2]) +		\
+             tf * (si * tex10[2] + sf * tex11[2])) >> 2 * FIXED_SHIFT;	\
+   sample[ACOMP] = CHAN_MAX
+
+#define NEAREST_RGBA  COPY_CHAN4(sample, tex00)
+
+#define LINEAR_RGBA							\
+   sample[RCOMP] = (ti * (si * tex00[0] + sf * tex01[0]) +		\
+               tf * (si * tex10[0] + sf * tex11[0])) >> 2 * FIXED_SHIFT;\
+   sample[GCOMP] = (ti * (si * tex00[1] + sf * tex01[1]) +		\
+               tf * (si * tex10[1] + sf * tex11[1])) >> 2 * FIXED_SHIFT;\
+   sample[BCOMP] = (ti * (si * tex00[2] + sf * tex01[2]) +		\
+               tf * (si * tex10[2] + sf * tex11[2])) >> 2 * FIXED_SHIFT;\
+   sample[ACOMP] = (ti * (si * tex00[3] + sf * tex01[3]) +		\
+               tf * (si * tex10[3] + sf * tex11[3])) >> 2 * FIXED_SHIFT
+
+#define MODULATE							  \
+   dest[RCOMP] = span->red   * (sample[RCOMP] + 1u) >> (FIXED_SHIFT + 8); \
+   dest[GCOMP] = span->green * (sample[GCOMP] + 1u) >> (FIXED_SHIFT + 8); \
+   dest[BCOMP] = span->blue  * (sample[BCOMP] + 1u) >> (FIXED_SHIFT + 8); \
+   dest[ACOMP] = span->alpha * (sample[ACOMP] + 1u) >> (FIXED_SHIFT + 8)
+
+#define DECAL								\
+   dest[RCOMP] = ((CHAN_MAX - sample[ACOMP]) * span->red +		\
+               ((sample[ACOMP] + 1) * sample[RCOMP] << FIXED_SHIFT))	\
+               >> (FIXED_SHIFT + 8);					\
+   dest[GCOMP] = ((CHAN_MAX - sample[ACOMP]) * span->green +		\
+               ((sample[ACOMP] + 1) * sample[GCOMP] << FIXED_SHIFT))	\
+               >> (FIXED_SHIFT + 8);					\
+   dest[BCOMP] = ((CHAN_MAX - sample[ACOMP]) * span->blue +		\
+               ((sample[ACOMP] + 1) * sample[BCOMP] << FIXED_SHIFT))	\
+               >> (FIXED_SHIFT + 8);					\
+   dest[ACOMP] = FixedToInt(span->alpha)
+
+#define BLEND								\
+   dest[RCOMP] = ((CHAN_MAX - sample[RCOMP]) * span->red		\
+               + (sample[RCOMP] + 1) * info->er) >> (FIXED_SHIFT + 8);	\
+   dest[GCOMP] = ((CHAN_MAX - sample[GCOMP]) * span->green		\
+               + (sample[GCOMP] + 1) * info->eg) >> (FIXED_SHIFT + 8);	\
+   dest[BCOMP] = ((CHAN_MAX - sample[BCOMP]) * span->blue		\
+               + (sample[BCOMP] + 1) * info->eb) >> (FIXED_SHIFT + 8);	\
+   dest[ACOMP] = span->alpha * (sample[ACOMP] + 1) >> (FIXED_SHIFT + 8)
+
+#define REPLACE  COPY_CHAN4(dest, sample)
+
+#define ADD								\
+   {									\
+      GLint rSum = FixedToInt(span->red)   + (GLint) sample[RCOMP];	\
+      GLint gSum = FixedToInt(span->green) + (GLint) sample[GCOMP];	\
+      GLint bSum = FixedToInt(span->blue)  + (GLint) sample[BCOMP];	\
+      dest[RCOMP] = MIN2(rSum, CHAN_MAX);				\
+      dest[GCOMP] = MIN2(gSum, CHAN_MAX);				\
+      dest[BCOMP] = MIN2(bSum, CHAN_MAX);				\
+      dest[ACOMP] = span->alpha * (sample[ACOMP] + 1) >> (FIXED_SHIFT + 8); \
+  }
+
+/* shortcuts */
+
+#define NEAREST_RGB_REPLACE		\
+   NEAREST_RGB;				\
+   dest[0] = sample[0];			\
+   dest[1] = sample[1];			\
+   dest[2] = sample[2];			\
+   dest[3] = FixedToInt(span->alpha);
+
+#define NEAREST_RGBA_REPLACE  COPY_CHAN4(dest, tex00)
+
+#define SPAN_NEAREST(DO_TEX,COMP)					\
+	for (i = 0; i < span->end; i++) {				\
+           /* Isn't it necessary to use FixedFloor below?? */		\
+           GLint s = FixedToInt(span->intTex[0]) & info->smask;		\
+           GLint t = FixedToInt(span->intTex[1]) & info->tmask;		\
+           GLint pos = (t << info->twidth_log2) + s;			\
+           const GLchan *tex00 = info->texture + COMP * pos;		\
+           DO_TEX;							\
+           span->red += span->redStep;					\
+	   span->green += span->greenStep;				\
+           span->blue += span->blueStep;				\
+	   span->alpha += span->alphaStep;				\
+	   span->intTex[0] += span->intTexStep[0];			\
+	   span->intTex[1] += span->intTexStep[1];			\
+           dest += 4;							\
+	}
+
+#define SPAN_LINEAR(DO_TEX,COMP)					\
+	for (i = 0; i < span->end; i++) {				\
+           /* Isn't it necessary to use FixedFloor below?? */		\
+           GLint s = FixedToInt(span->intTex[0]) & info->smask;		\
+           GLint t = FixedToInt(span->intTex[1]) & info->tmask;		\
+           GLfixed sf = span->intTex[0] & FIXED_FRAC_MASK;		\
+           GLfixed tf = span->intTex[1] & FIXED_FRAC_MASK;		\
+           GLfixed si = FIXED_FRAC_MASK - sf;				\
+           GLfixed ti = FIXED_FRAC_MASK - tf;				\
+           GLint pos = (t << info->twidth_log2) + s;			\
+           const GLchan *tex00 = info->texture + COMP * pos;		\
+           const GLchan *tex10 = tex00 + info->tbytesline;		\
+           const GLchan *tex01 = tex00 + COMP;				\
+           const GLchan *tex11 = tex10 + COMP;				\
+           (void) ti;							\
+           (void) si;							\
+           if (t == info->tmask) {					\
+              tex10 -= info->tsize;					\
+              tex11 -= info->tsize;					\
+           }								\
+           if (s == info->smask) {					\
+              tex01 -= info->tbytesline;				\
+              tex11 -= info->tbytesline;				\
+           }								\
+           DO_TEX;							\
+           span->red += span->redStep;					\
+	   span->green += span->greenStep;				\
+           span->blue += span->blueStep;				\
+	   span->alpha += span->alphaStep;				\
+	   span->intTex[0] += span->intTexStep[0];			\
+	   span->intTex[1] += span->intTexStep[1];			\
+           dest += 4;							\
+	}
+
+
+   GLuint i;
+   GLchan *dest = span->array->rgba[0];
+
+   span->intTex[0] -= FIXED_HALF;
+   span->intTex[1] -= FIXED_HALF;
+   switch (info->filter) {
+   case GL_NEAREST:
+      switch (info->format) {
+      case GL_RGB:
+         switch (info->envmode) {
+         case GL_MODULATE:
+            SPAN_NEAREST(NEAREST_RGB;MODULATE,3);
+            break;
+         case GL_DECAL:
+         case GL_REPLACE:
+            SPAN_NEAREST(NEAREST_RGB_REPLACE,3);
+            break;
+         case GL_BLEND:
+            SPAN_NEAREST(NEAREST_RGB;BLEND,3);
+            break;
+         case GL_ADD:
+            SPAN_NEAREST(NEAREST_RGB;ADD,3);
+            break;
+         default:
+            _mesa_problem(ctx, "bad tex env mode in SPAN_LINEAR");
+            return;
+         }
+         break;
+      case GL_RGBA:
+         switch(info->envmode) {
+         case GL_MODULATE:
+            SPAN_NEAREST(NEAREST_RGBA;MODULATE,4);
+            break;
+         case GL_DECAL:
+            SPAN_NEAREST(NEAREST_RGBA;DECAL,4);
+            break;
+         case GL_BLEND:
+            SPAN_NEAREST(NEAREST_RGBA;BLEND,4);
+            break;
+         case GL_ADD:
+            SPAN_NEAREST(NEAREST_RGBA;ADD,4);
+            break;
+         case GL_REPLACE:
+            SPAN_NEAREST(NEAREST_RGBA_REPLACE,4);
+            break;
+         default:
+            _mesa_problem(ctx, "bad tex env mode (2) in SPAN_LINEAR");
+            return;
+         }
+         break;
+      }
+      break;
+
+   case GL_LINEAR:
+      span->intTex[0] -= FIXED_HALF;
+      span->intTex[1] -= FIXED_HALF;
+      switch (info->format) {
+      case GL_RGB:
+         switch (info->envmode) {
+         case GL_MODULATE:
+            SPAN_LINEAR(LINEAR_RGB;MODULATE,3);
+            break;
+         case GL_DECAL:
+         case GL_REPLACE:
+            SPAN_LINEAR(LINEAR_RGB;REPLACE,3);
+            break;
+         case GL_BLEND:
+            SPAN_LINEAR(LINEAR_RGB;BLEND,3);
+            break;
+         case GL_ADD:
+            SPAN_LINEAR(LINEAR_RGB;ADD,3);
+            break;
+         default:
+            _mesa_problem(ctx, "bad tex env mode (3) in SPAN_LINEAR");
+            return;
+         }
+         break;
+      case GL_RGBA:
+         switch (info->envmode) {
+         case GL_MODULATE:
+            SPAN_LINEAR(LINEAR_RGBA;MODULATE,4);
+            break;
+         case GL_DECAL:
+            SPAN_LINEAR(LINEAR_RGBA;DECAL,4);
+            break;
+         case GL_BLEND:
+            SPAN_LINEAR(LINEAR_RGBA;BLEND,4);
+            break;
+         case GL_ADD:
+            SPAN_LINEAR(LINEAR_RGBA;ADD,4);
+            break;
+         case GL_REPLACE:
+            SPAN_LINEAR(LINEAR_RGBA;REPLACE,4);
+            break;
+         default:
+            _mesa_problem(ctx, "bad tex env mode (4) in SPAN_LINEAR");
+            return;
+         }
+         break;
+      }
+      break;
+   }
+   span->interpMask &= ~SPAN_RGBA;
+   ASSERT(span->arrayMask & SPAN_RGBA);
+   _swrast_write_rgba_span(ctx, span);
+
+#undef SPAN_NEAREST
+#undef SPAN_LINEAR
+}
+
+
+
+/*
+ * Render an RGB/RGBA textured triangle without perspective correction.
+ */
+#define NAME affine_textured_triangle
+#define INTERP_Z 1
+#define INTERP_FOG 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define INTERP_RGB 1
+#define INTERP_ALPHA 1
+#define INTERP_INT_TEX 1
+#define S_SCALE twidth
+#define T_SCALE theight
+
+#define SETUP_CODE							\
+   struct affine_info info;						\
+   struct gl_texture_unit *unit = ctx->Texture.Unit+0;			\
+   struct gl_texture_object *obj = unit->Current2D;			\
+   const GLint b = obj->BaseLevel;					\
+   const GLfloat twidth = (GLfloat) obj->Image[b]->Width;		\
+   const GLfloat theight = (GLfloat) obj->Image[b]->Height;		\
+   info.texture = (const GLchan *) obj->Image[b]->Data;			\
+   info.twidth_log2 = obj->Image[b]->WidthLog2;				\
+   info.smask = obj->Image[b]->Width - 1;				\
+   info.tmask = obj->Image[b]->Height - 1;				\
+   info.format = obj->Image[b]->Format;					\
+   info.filter = obj->MinFilter;					\
+   info.envmode = unit->EnvMode;					\
+   span.arrayMask |= SPAN_RGBA;						\
+									\
+   if (info.envmode == GL_BLEND) {					\
+      /* potential off-by-one error here? (1.0f -> 2048 -> 0) */	\
+      info.er = FloatToFixed(unit->EnvColor[RCOMP] * CHAN_MAXF);	\
+      info.eg = FloatToFixed(unit->EnvColor[GCOMP] * CHAN_MAXF);	\
+      info.eb = FloatToFixed(unit->EnvColor[BCOMP] * CHAN_MAXF);	\
+      info.ea = FloatToFixed(unit->EnvColor[ACOMP] * CHAN_MAXF);	\
+   }									\
+   if (!info.texture) {							\
+      /* this shouldn't happen */					\
+      return;								\
+   }									\
+									\
+   switch (info.format) {						\
+   case GL_ALPHA:							\
+   case GL_LUMINANCE:							\
+   case GL_INTENSITY:							\
+      info.tbytesline = obj->Image[b]->Width;				\
+      break;								\
+   case GL_LUMINANCE_ALPHA:						\
+      info.tbytesline = obj->Image[b]->Width * 2;			\
+      break;								\
+   case GL_RGB:								\
+      info.tbytesline = obj->Image[b]->Width * 3;			\
+      break;								\
+   case GL_RGBA:							\
+      info.tbytesline = obj->Image[b]->Width * 4;			\
+      break;								\
+   default:								\
+      _mesa_problem(NULL, "Bad texture format in affine_texture_triangle");\
+      return;								\
+   }									\
+   info.tsize = obj->Image[b]->Height * info.tbytesline;
+
+#define RENDER_SPAN( span )   affine_span(ctx, &span, &info);
+
+#include "s_tritemp.h"
+
+
+
+struct persp_info
+{
+   GLenum filter;
+   GLenum format;
+   GLenum envmode;
+   GLint smask, tmask;
+   GLint twidth_log2;
+   const GLchan *texture;
+   GLfixed er, eg, eb, ea;   /* texture env color */
+   GLint tbytesline, tsize;
+};
+
+
+static INLINE void
+fast_persp_span(GLcontext *ctx, struct sw_span *span,
+		struct persp_info *info)
+{
+   GLchan sample[4];  /* the filtered texture sample */
+
+  /* Instead of defining a function for each mode, a test is done
+   * between the outer and inner loops. This is to reduce code size
+   * and complexity. Observe that an optimizing compiler kills
+   * unused variables (for instance tf,sf,ti,si in case of GL_NEAREST).
+   */
+#define SPAN_NEAREST(DO_TEX,COMP)					\
+	for (i = 0; i < span->end; i++) {				\
+           GLdouble invQ = tex_coord[2] ?				\
+                                 (1.0 / tex_coord[2]) : 1.0;            \
+           GLfloat s_tmp = (GLfloat) (tex_coord[0] * invQ);		\
+           GLfloat t_tmp = (GLfloat) (tex_coord[1] * invQ);		\
+           GLint s = IFLOOR(s_tmp) & info->smask;	        	\
+           GLint t = IFLOOR(t_tmp) & info->tmask;	        	\
+           GLint pos = (t << info->twidth_log2) + s;			\
+           const GLchan *tex00 = info->texture + COMP * pos;		\
+           DO_TEX;							\
+           span->red += span->redStep;					\
+	   span->green += span->greenStep;				\
+           span->blue += span->blueStep;				\
+	   span->alpha += span->alphaStep;				\
+	   tex_coord[0] += tex_step[0];					\
+	   tex_coord[1] += tex_step[1];					\
+	   tex_coord[2] += tex_step[2];					\
+           dest += 4;							\
+	}
+
+#define SPAN_LINEAR(DO_TEX,COMP)					\
+	for (i = 0; i < span->end; i++) {				\
+           GLdouble invQ = tex_coord[2] ?				\
+                                 (1.0 / tex_coord[2]) : 1.0;            \
+           GLfloat s_tmp = (GLfloat) (tex_coord[0] * invQ);		\
+           GLfloat t_tmp = (GLfloat) (tex_coord[1] * invQ);		\
+           GLfixed s_fix = FloatToFixed(s_tmp) - FIXED_HALF;		\
+           GLfixed t_fix = FloatToFixed(t_tmp) - FIXED_HALF;        	\
+           GLint s = FixedToInt(FixedFloor(s_fix)) & info->smask;	\
+           GLint t = FixedToInt(FixedFloor(t_fix)) & info->tmask;	\
+           GLfixed sf = s_fix & FIXED_FRAC_MASK;			\
+           GLfixed tf = t_fix & FIXED_FRAC_MASK;			\
+           GLfixed si = FIXED_FRAC_MASK - sf;				\
+           GLfixed ti = FIXED_FRAC_MASK - tf;				\
+           GLint pos = (t << info->twidth_log2) + s;			\
+           const GLchan *tex00 = info->texture + COMP * pos;		\
+           const GLchan *tex10 = tex00 + info->tbytesline;		\
+           const GLchan *tex01 = tex00 + COMP;				\
+           const GLchan *tex11 = tex10 + COMP;				\
+           (void) ti;							\
+           (void) si;							\
+           if (t == info->tmask) {					\
+              tex10 -= info->tsize;					\
+              tex11 -= info->tsize;					\
+           }								\
+           if (s == info->smask) {					\
+              tex01 -= info->tbytesline;				\
+              tex11 -= info->tbytesline;				\
+           }								\
+           DO_TEX;							\
+           span->red   += span->redStep;				\
+	   span->green += span->greenStep;				\
+           span->blue  += span->blueStep;				\
+	   span->alpha += span->alphaStep;				\
+	   tex_coord[0] += tex_step[0];					\
+	   tex_coord[1] += tex_step[1];					\
+	   tex_coord[2] += tex_step[2];					\
+           dest += 4;							\
+	}
+
+   GLuint i;
+   GLfloat tex_coord[3], tex_step[3];
+   GLchan *dest = span->array->rgba[0];
+
+   tex_coord[0] = span->tex[0][0]  * (info->smask + 1);
+   tex_step[0] = span->texStepX[0][0] * (info->smask + 1);
+   tex_coord[1] = span->tex[0][1] * (info->tmask + 1);
+   tex_step[1] = span->texStepX[0][1] * (info->tmask + 1);
+   /* span->tex[0][2] only if 3D-texturing, here only 2D */
+   tex_coord[2] = span->tex[0][3];
+   tex_step[2] = span->texStepX[0][3];
+
+   switch (info->filter) {
+   case GL_NEAREST:
+      switch (info->format) {
+      case GL_RGB:
+         switch (info->envmode) {
+         case GL_MODULATE:
+            SPAN_NEAREST(NEAREST_RGB;MODULATE,3);
+            break;
+         case GL_DECAL:
+         case GL_REPLACE:
+            SPAN_NEAREST(NEAREST_RGB_REPLACE,3);
+            break;
+         case GL_BLEND:
+            SPAN_NEAREST(NEAREST_RGB;BLEND,3);
+            break;
+         case GL_ADD:
+            SPAN_NEAREST(NEAREST_RGB;ADD,3);
+            break;
+         default:
+            _mesa_problem(ctx, "bad tex env mode (5) in SPAN_LINEAR");
+            return;
+         }
+         break;
+      case GL_RGBA:
+         switch(info->envmode) {
+         case GL_MODULATE:
+            SPAN_NEAREST(NEAREST_RGBA;MODULATE,4);
+            break;
+         case GL_DECAL:
+            SPAN_NEAREST(NEAREST_RGBA;DECAL,4);
+            break;
+         case GL_BLEND:
+            SPAN_NEAREST(NEAREST_RGBA;BLEND,4);
+            break;
+         case GL_ADD:
+            SPAN_NEAREST(NEAREST_RGBA;ADD,4);
+            break;
+         case GL_REPLACE:
+            SPAN_NEAREST(NEAREST_RGBA_REPLACE,4);
+            break;
+         default:
+            _mesa_problem(ctx, "bad tex env mode (6) in SPAN_LINEAR");
+            return;
+         }
+         break;
+      }
+      break;
+
+   case GL_LINEAR:
+      switch (info->format) {
+      case GL_RGB:
+         switch (info->envmode) {
+         case GL_MODULATE:
+            SPAN_LINEAR(LINEAR_RGB;MODULATE,3);
+            break;
+         case GL_DECAL:
+         case GL_REPLACE:
+            SPAN_LINEAR(LINEAR_RGB;REPLACE,3);
+            break;
+         case GL_BLEND:
+            SPAN_LINEAR(LINEAR_RGB;BLEND,3);
+            break;
+         case GL_ADD:
+            SPAN_LINEAR(LINEAR_RGB;ADD,3);
+            break;
+         default:
+            _mesa_problem(ctx, "bad tex env mode (7) in SPAN_LINEAR");
+            return;
+         }
+         break;
+      case GL_RGBA:
+         switch (info->envmode) {
+         case GL_MODULATE:
+            SPAN_LINEAR(LINEAR_RGBA;MODULATE,4);
+            break;
+         case GL_DECAL:
+            SPAN_LINEAR(LINEAR_RGBA;DECAL,4);
+            break;
+         case GL_BLEND:
+            SPAN_LINEAR(LINEAR_RGBA;BLEND,4);
+            break;
+         case GL_ADD:
+            SPAN_LINEAR(LINEAR_RGBA;ADD,4);
+            break;
+         case GL_REPLACE:
+            SPAN_LINEAR(LINEAR_RGBA;REPLACE,4);
+            break;
+         default:
+            _mesa_problem(ctx, "bad tex env mode (8) in SPAN_LINEAR");
+            return;
+         }
+         break;
+      }
+      break;
+   }
+   
+   ASSERT(span->arrayMask & SPAN_RGBA);
+   _swrast_write_rgba_span(ctx, span);
+
+#undef SPAN_NEAREST
+#undef SPAN_LINEAR
+}
+
+
+/*
+ * Render an perspective corrected RGB/RGBA textured triangle.
+ * The Q (aka V in Mesa) coordinate must be zero such that the divide
+ * by interpolated Q/W comes out right.
+ *
+ */
+#define NAME persp_textured_triangle
+#define INTERP_Z 1
+#define INTERP_FOG 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define INTERP_RGB 1
+#define INTERP_ALPHA 1
+#define INTERP_TEX 1
+
+#define SETUP_CODE							\
+   struct persp_info info;						\
+   const struct gl_texture_unit *unit = ctx->Texture.Unit+0;		\
+   const struct gl_texture_object *obj = unit->Current2D;		\
+   const GLint b = obj->BaseLevel;					\
+   info.texture = (const GLchan *) obj->Image[b]->Data;			\
+   info.twidth_log2 = obj->Image[b]->WidthLog2;				\
+   info.smask = obj->Image[b]->Width - 1;				\
+   info.tmask = obj->Image[b]->Height - 1;				\
+   info.format = obj->Image[b]->Format;					\
+   info.filter = obj->MinFilter;					\
+   info.envmode = unit->EnvMode;					\
+									\
+   if (info.envmode == GL_BLEND) {					\
+      /* potential off-by-one error here? (1.0f -> 2048 -> 0) */	\
+      info.er = FloatToFixed(unit->EnvColor[RCOMP] * CHAN_MAXF);	\
+      info.eg = FloatToFixed(unit->EnvColor[GCOMP] * CHAN_MAXF);	\
+      info.eb = FloatToFixed(unit->EnvColor[BCOMP] * CHAN_MAXF);	\
+      info.ea = FloatToFixed(unit->EnvColor[ACOMP] * CHAN_MAXF);	\
+   }									\
+   if (!info.texture) {							\
+      /* this shouldn't happen */					\
+      return;								\
+   }									\
+									\
+   switch (info.format) {						\
+   case GL_ALPHA:							\
+   case GL_LUMINANCE:							\
+   case GL_INTENSITY:							\
+      info.tbytesline = obj->Image[b]->Width;				\
+      break;								\
+   case GL_LUMINANCE_ALPHA:						\
+      info.tbytesline = obj->Image[b]->Width * 2;			\
+      break;								\
+   case GL_RGB:								\
+      info.tbytesline = obj->Image[b]->Width * 3;			\
+      break;								\
+   case GL_RGBA:							\
+      info.tbytesline = obj->Image[b]->Width * 4;			\
+      break;								\
+   default:								\
+      _mesa_problem(NULL, "Bad texture format in persp_textured_triangle");\
+      return;								\
+   }									\
+   info.tsize = obj->Image[b]->Height * info.tbytesline;
+
+#define RENDER_SPAN( span )			\
+   span.interpMask &= ~SPAN_RGBA;		\
+   span.arrayMask |= SPAN_RGBA;			\
+   fast_persp_span(ctx, &span, &info);
+
+#include "s_tritemp.h"
+
+
+#endif /* CHAN_BITS != GL_FLOAT */
+
+                
+
+
+/*
+ * Render a smooth-shaded, textured, RGBA triangle.
+ * Interpolate S,T,R with perspective correction, w/out mipmapping.
+ */
+#define NAME general_textured_triangle
+#define INTERP_Z 1
+#define INTERP_W 1
+#define INTERP_FOG 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define INTERP_RGB 1
+#define INTERP_SPEC 1
+#define INTERP_ALPHA 1
+#define INTERP_TEX 1
+#define RENDER_SPAN( span )   _swrast_write_texture_span(ctx, &span);
+#include "s_tritemp.h"
+
+
+
+/*
+ * This is the big one!
+ * Interpolate Z, RGB, Alpha, specular, fog, and N sets of texture coordinates.
+ * Yup, it's slow.
+ */
+#define NAME multitextured_triangle
+#define INTERP_Z 1
+#define INTERP_W 1
+#define INTERP_FOG 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define INTERP_RGB 1
+#define INTERP_ALPHA 1
+#define INTERP_SPEC 1
+#define INTERP_MULTITEX 1
+#define RENDER_SPAN( span )   _swrast_write_texture_span(ctx, &span);
+#include "s_tritemp.h"
+
+
+
+/*
+ * Special tri function for occlusion testing
+ */
+#define NAME occlusion_zless_triangle
+#define DO_OCCLUSION_TEST
+#define INTERP_Z 1
+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
+#define SETUP_CODE						\
+   if (ctx->OcclusionResult && !ctx->Occlusion.Active) {	\
+      return;							\
+   }
+#define RENDER_SPAN( span )				\
+   GLuint i;						\
+   for (i = 0; i < span.end; i++) {			\
+      GLdepth z = FixedToDepth(span.z);			\
+      if (z < zRow[i]) {				\
+         ctx->OcclusionResult = GL_TRUE;		\
+         ctx->Occlusion.PassedCounter++;		\
+      }							\
+      span.z += span.zStep;				\
+   }
+#include "s_tritemp.h"
+
+
+
+static void
+nodraw_triangle( GLcontext *ctx,
+                 const SWvertex *v0,
+                 const SWvertex *v1,
+                 const SWvertex *v2 )
+{
+   (void) (ctx && v0 && v1 && v2);
+}
+
+
+/*
+ * This is used when separate specular color is enabled, but not
+ * texturing.  We add the specular color to the primary color,
+ * draw the triangle, then restore the original primary color.
+ * Inefficient, but seldom needed.
+ */
+void _swrast_add_spec_terms_triangle( GLcontext *ctx,
+				      const SWvertex *v0,
+				      const SWvertex *v1,
+				      const SWvertex *v2 )
+{
+   SWvertex *ncv0 = (SWvertex *)v0; /* drop const qualifier */
+   SWvertex *ncv1 = (SWvertex *)v1;
+   SWvertex *ncv2 = (SWvertex *)v2;
+#if CHAN_TYPE == GL_FLOAT
+   GLfloat rSum, gSum, bSum;
+#else
+   GLint rSum, gSum, bSum;
+#endif
+   GLchan c[3][4];
+   /* save original colors */
+   COPY_CHAN4( c[0], ncv0->color );
+   COPY_CHAN4( c[1], ncv1->color );
+   COPY_CHAN4( c[2], ncv2->color );
+   /* sum v0 */
+   rSum = ncv0->color[0] + ncv0->specular[0];
+   gSum = ncv0->color[1] + ncv0->specular[1];
+   bSum = ncv0->color[2] + ncv0->specular[2];
+   ncv0->color[0] = MIN2(rSum, CHAN_MAX);
+   ncv0->color[1] = MIN2(gSum, CHAN_MAX);
+   ncv0->color[2] = MIN2(bSum, CHAN_MAX);
+   /* sum v1 */
+   rSum = ncv1->color[0] + ncv1->specular[0];
+   gSum = ncv1->color[1] + ncv1->specular[1];
+   bSum = ncv1->color[2] + ncv1->specular[2];
+   ncv1->color[0] = MIN2(rSum, CHAN_MAX);
+   ncv1->color[1] = MIN2(gSum, CHAN_MAX);
+   ncv1->color[2] = MIN2(bSum, CHAN_MAX);
+   /* sum v2 */
+   rSum = ncv2->color[0] + ncv2->specular[0];
+   gSum = ncv2->color[1] + ncv2->specular[1];
+   bSum = ncv2->color[2] + ncv2->specular[2];
+   ncv2->color[0] = MIN2(rSum, CHAN_MAX);
+   ncv2->color[1] = MIN2(gSum, CHAN_MAX);
+   ncv2->color[2] = MIN2(bSum, CHAN_MAX);
+   /* draw */
+   SWRAST_CONTEXT(ctx)->SpecTriangle( ctx, ncv0, ncv1, ncv2 );
+   /* restore original colors */
+   COPY_CHAN4( ncv0->color, c[0] );
+   COPY_CHAN4( ncv1->color, c[1] );
+   COPY_CHAN4( ncv2->color, c[2] );
+}
+
+
+
+#ifdef DEBUG
+
+/* record the current triangle function name */
+const char *_mesa_triFuncName = NULL;
+
+#define USE(triFunc)				\
+do {						\
+    _mesa_triFuncName = #triFunc;		\
+    /*printf("%s\n", _mesa_triFuncName);*/	\
+    swrast->Triangle = triFunc;			\
+} while (0)
+
+#else
+
+#define USE(triFunc)  swrast->Triangle = triFunc;
+
+#endif
+
+
+
+
+/*
+ * Determine which triangle rendering function to use given the current
+ * rendering context.
+ *
+ * Please update the summary flag _SWRAST_NEW_TRIANGLE if you add or
+ * remove tests to this code.
+ */
+void
+_swrast_choose_triangle( GLcontext *ctx )
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   const GLboolean rgbmode = ctx->Visual.rgbMode;
+
+   if (ctx->Polygon.CullFlag &&
+       ctx->Polygon.CullFaceMode == GL_FRONT_AND_BACK) {
+      USE(nodraw_triangle);
+      return;
+   }
+
+   if (ctx->RenderMode==GL_RENDER) {
+
+      if (ctx->Polygon.SmoothFlag) {
+         _swrast_set_aa_triangle_function(ctx);
+         ASSERT(swrast->Triangle);
+         return;
+      }
+
+      /* special case for occlusion testing */
+      if ((ctx->Depth.OcclusionTest || ctx->Occlusion.Active) &&
+          ctx->Depth.Test &&
+          ctx->Depth.Mask == GL_FALSE &&
+          ctx->Depth.Func == GL_LESS &&
+          !ctx->Stencil.Enabled) {
+         if ((rgbmode &&
+              ctx->Color.ColorMask[0] == 0 &&
+              ctx->Color.ColorMask[1] == 0 &&
+              ctx->Color.ColorMask[2] == 0 &&
+              ctx->Color.ColorMask[3] == 0)
+             ||
+             (!rgbmode && ctx->Color.IndexMask == 0)) {
+            USE(occlusion_zless_triangle);
+            return;
+         }
+      }
+
+      if (ctx->Texture._EnabledCoordUnits || ctx->FragmentProgram.Enabled) {
+         /* Ugh, we do a _lot_ of tests to pick the best textured tri func */
+	 const struct gl_texture_object *texObj2D;
+         const struct gl_texture_image *texImg;
+         GLenum minFilter, magFilter, envMode;
+         GLint format;
+         texObj2D = ctx->Texture.Unit[0].Current2D;
+         texImg = texObj2D ? texObj2D->Image[texObj2D->BaseLevel] : NULL;
+         format = texImg ? texImg->TexFormat->MesaFormat : -1;
+         minFilter = texObj2D ? texObj2D->MinFilter : (GLenum) 0;
+         magFilter = texObj2D ? texObj2D->MagFilter : (GLenum) 0;
+         envMode = ctx->Texture.Unit[0].EnvMode;
+
+         /* First see if we can use an optimized 2-D texture function */
+         if (ctx->Texture._EnabledCoordUnits == 1
+             && !ctx->FragmentProgram.Enabled
+             && ctx->Texture.Unit[0]._ReallyEnabled == TEXTURE_2D_BIT
+             && texObj2D->WrapS==GL_REPEAT
+	     && texObj2D->WrapT==GL_REPEAT
+             && texObj2D->_IsPowerOfTwo
+             && texImg->Border==0
+             && texImg->Width == texImg->RowStride
+             && (format == MESA_FORMAT_RGB || format == MESA_FORMAT_RGBA)
+	     && minFilter == magFilter
+	     && ctx->Light.Model.ColorControl == GL_SINGLE_COLOR
+	     && ctx->Texture.Unit[0].EnvMode != GL_COMBINE_EXT) {
+	    if (ctx->Hint.PerspectiveCorrection==GL_FASTEST) {
+	       if (minFilter == GL_NEAREST
+		   && format == MESA_FORMAT_RGB
+		   && (envMode == GL_REPLACE || envMode == GL_DECAL)
+		   && ((swrast->_RasterMask == (DEPTH_BIT | TEXTURE_BIT)
+			&& ctx->Depth.Func == GL_LESS
+			&& ctx->Depth.Mask == GL_TRUE)
+		       || swrast->_RasterMask == TEXTURE_BIT)
+		   && ctx->Polygon.StippleFlag == GL_FALSE) {
+		  if (swrast->_RasterMask == (DEPTH_BIT | TEXTURE_BIT)) {
+		     USE(simple_z_textured_triangle);
+		  }
+		  else {
+		     USE(simple_textured_triangle);
+		  }
+	       }
+	       else {
+#if (CHAN_BITS == 16 || CHAN_BITS == 32)
+                  USE(general_textured_triangle);
+#else
+                  USE(affine_textured_triangle);
+#endif
+	       }
+	    }
+	    else {
+#if (CHAN_BITS == 16 || CHAN_BITS == 32)
+               USE(general_textured_triangle);
+#else
+               USE(persp_textured_triangle);
+#endif
+	    }
+	 }
+         else {
+            /* general case textured triangles */
+            if (ctx->Texture._EnabledCoordUnits > 1) {
+               USE(multitextured_triangle);
+            }
+            else {
+               USE(general_textured_triangle);
+            }
+         }
+      }
+      else {
+         ASSERT(!ctx->Texture._EnabledCoordUnits);
+	 if (ctx->Light.ShadeModel==GL_SMOOTH) {
+	    /* smooth shaded, no texturing, stippled or some raster ops */
+            if (rgbmode) {
+	       USE(smooth_rgba_triangle);
+            }
+            else {
+               USE(smooth_ci_triangle);
+            }
+	 }
+	 else {
+	    /* flat shaded, no texturing, stippled or some raster ops */
+            if (rgbmode) {
+	       USE(flat_rgba_triangle);
+            }
+            else {
+               USE(flat_ci_triangle);
+            }
+	 }
+      }
+   }
+   else if (ctx->RenderMode==GL_FEEDBACK) {
+      USE(_swrast_feedback_triangle);
+   }
+   else {
+      /* GL_SELECT mode */
+      USE(_swrast_select_triangle);
+   }
+}
diff --git a/reactos/lib/mesa32/src/swrast/s_triangle.h b/reactos/lib/mesa32/src/swrast/s_triangle.h
new file mode 100644
index 00000000000..0de812500c5
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_triangle.h
@@ -0,0 +1,51 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef S_TRIANGLES_H
+#define S_TRIANGLES_H
+
+
+#include "mtypes.h"
+#include "swrast.h"
+
+
+extern GLboolean
+_swrast_culltriangle( GLcontext *ctx,
+                     const SWvertex *v0,
+                     const SWvertex *v1,
+                     const SWvertex *v2);
+
+extern void
+_swrast_choose_triangle( GLcontext *ctx );
+
+extern void
+_swrast_add_spec_terms_triangle( GLcontext *ctx,
+				 const SWvertex *v0,
+				 const SWvertex *v1,
+				 const SWvertex *v2 );
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/swrast/s_trispan.h b/reactos/lib/mesa32/src/swrast/s_trispan.h
new file mode 100644
index 00000000000..15207e863e3
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_trispan.h
@@ -0,0 +1,31 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef S_TRISPAN_H
+#define S_TRISPAN_H
+
+
+#endif /* S_TRISPAN_H */
diff --git a/reactos/lib/mesa32/src/swrast/s_tritemp.h b/reactos/lib/mesa32/src/swrast/s_tritemp.h
new file mode 100644
index 00000000000..d7571f53485
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_tritemp.h
@@ -0,0 +1,1183 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * Triangle Rasterizer Template
+ *
+ * This file is #include'd to generate custom triangle rasterizers.
+ *
+ * The following macros may be defined to indicate what auxillary information
+ * must be interplated across the triangle:
+ *    INTERP_Z        - if defined, interpolate Z values
+ *    INTERP_FOG      - if defined, interpolate fog values
+ *    INTERP_RGB      - if defined, interpolate RGB values
+ *    INTERP_ALPHA    - if defined, interpolate Alpha values (req's INTERP_RGB)
+ *    INTERP_SPEC     - if defined, interpolate specular RGB values
+ *    INTERP_INDEX    - if defined, interpolate color index values
+ *    INTERP_INT_TEX  - if defined, interpolate integer ST texcoords
+ *                         (fast, simple 2-D texture mapping)
+ *    INTERP_TEX      - if defined, interpolate set 0 float STRQ texcoords
+ *                         NOTE:  OpenGL STRQ = Mesa STUV (R was taken for red)
+ *    INTERP_MULTITEX - if defined, interpolate N units of STRQ texcoords
+ *
+ * When one can directly address pixels in the color buffer the following
+ * macros can be defined and used to compute pixel addresses during
+ * rasterization (see pRow):
+ *    PIXEL_TYPE          - the datatype of a pixel (GLubyte, GLushort, GLuint)
+ *    BYTES_PER_ROW       - number of bytes per row in the color buffer
+ *    PIXEL_ADDRESS(X,Y)  - returns the address of pixel at (X,Y) where
+ *                          Y==0 at bottom of screen and increases upward.
+ *
+ * Similarly, for direct depth buffer access, this type is used for depth
+ * buffer addressing:
+ *    DEPTH_TYPE          - either GLushort or GLuint
+ *
+ * Optionally, one may provide one-time setup code per triangle:
+ *    SETUP_CODE    - code which is to be executed once per triangle
+ *    CLEANUP_CODE    - code to execute at end of triangle
+ *
+ * The following macro MUST be defined:
+ *    RENDER_SPAN(span) - code to write a span of pixels.
+ *
+ * This code was designed for the origin to be in the lower-left corner.
+ *
+ * Inspired by triangle rasterizer code written by Allen Akin.  Thanks Allen!
+ */
+
+
+/*
+ * ColorTemp is used for intermediate color values.
+ */
+#if CHAN_TYPE == GL_FLOAT
+#define ColorTemp GLfloat
+#else
+#define ColorTemp GLint  /* same as GLfixed */
+#endif
+
+/*
+ * Either loop over all texture units, or just use unit zero.
+ */
+#ifdef INTERP_MULTITEX
+#define TEX_UNIT_LOOP(CODE)					\
+   {								\
+      GLuint u;							\
+      for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {	\
+         if (ctx->Texture._EnabledCoordUnits & (1 << u)) {	\
+            CODE						\
+         }							\
+      }								\
+   }
+#define INTERP_TEX
+#elif defined(INTERP_TEX)
+#define TEX_UNIT_LOOP(CODE)					\
+   {								\
+      const GLuint u = 0;					\
+      CODE							\
+   }
+#endif
+
+
+static void NAME(GLcontext *ctx, const SWvertex *v0,
+                                 const SWvertex *v1,
+                                 const SWvertex *v2 )
+{
+   typedef struct {
+        const SWvertex *v0, *v1;   /* Y(v0) < Y(v1) */
+        GLfloat dx;	/* X(v1) - X(v0) */
+        GLfloat dy;	/* Y(v1) - Y(v0) */
+        GLfixed fdxdy;	/* dx/dy in fixed-point */
+        GLfixed fsx;	/* first sample point x coord */
+        GLfixed fsy;
+        GLfloat adjy;	/* adjust from v[0]->fy to fsy, scaled */
+        GLint lines;	/* number of lines to be sampled on this edge */
+        GLfixed fx0;	/* fixed pt X of lower endpoint */
+   } EdgeT;
+
+#ifdef INTERP_Z
+   const GLint depthBits = ctx->Visual.depthBits;
+   const GLint fixedToDepthShift = depthBits <= 16 ? FIXED_SHIFT : 0;
+   const GLfloat maxDepth = ctx->DepthMaxF;
+#define FixedToDepth(F)  ((F) >> fixedToDepthShift)
+#endif
+   EdgeT eMaj, eTop, eBot;
+   GLfloat oneOverArea;
+   const SWvertex *vMin, *vMid, *vMax;  /* Y(vMin)<=Y(vMid)<=Y(vMax) */
+   GLfloat bf = SWRAST_CONTEXT(ctx)->_BackfaceSign;
+   const GLint snapMask = ~((FIXED_ONE / (1 << SUB_PIXEL_BITS)) - 1); /* for x/y coord snapping */
+   GLfixed vMin_fx, vMin_fy, vMid_fx, vMid_fy, vMax_fx, vMax_fy;
+
+   struct sw_span span;
+
+   INIT_SPAN(span, GL_POLYGON, 0, 0, 0);
+
+#ifdef INTERP_Z
+   (void) fixedToDepthShift;
+#endif
+
+   /*
+   printf("%s()\n", __FUNCTION__);
+   printf("  %g, %g, %g\n", v0->win[0], v0->win[1], v0->win[2]);
+   printf("  %g, %g, %g\n", v1->win[0], v1->win[1], v1->win[2]);
+   printf("  %g, %g, %g\n", v2->win[0], v2->win[1], v2->win[2]);
+   */
+
+   /* Compute fixed point x,y coords w/ half-pixel offsets and snapping.
+    * And find the order of the 3 vertices along the Y axis.
+    */
+   {
+      const GLfixed fy0 = FloatToFixed(v0->win[1] - 0.5F) & snapMask;
+      const GLfixed fy1 = FloatToFixed(v1->win[1] - 0.5F) & snapMask;
+      const GLfixed fy2 = FloatToFixed(v2->win[1] - 0.5F) & snapMask;
+
+      if (fy0 <= fy1) {
+         if (fy1 <= fy2) {
+            /* y0 <= y1 <= y2 */
+            vMin = v0;   vMid = v1;   vMax = v2;
+            vMin_fy = fy0;  vMid_fy = fy1;  vMax_fy = fy2;
+         }
+         else if (fy2 <= fy0) {
+            /* y2 <= y0 <= y1 */
+            vMin = v2;   vMid = v0;   vMax = v1;
+            vMin_fy = fy2;  vMid_fy = fy0;  vMax_fy = fy1;
+         }
+         else {
+            /* y0 <= y2 <= y1 */
+            vMin = v0;   vMid = v2;   vMax = v1;
+            vMin_fy = fy0;  vMid_fy = fy2;  vMax_fy = fy1;
+            bf = -bf;
+         }
+      }
+      else {
+         if (fy0 <= fy2) {
+            /* y1 <= y0 <= y2 */
+            vMin = v1;   vMid = v0;   vMax = v2;
+            vMin_fy = fy1;  vMid_fy = fy0;  vMax_fy = fy2;
+            bf = -bf;
+         }
+         else if (fy2 <= fy1) {
+            /* y2 <= y1 <= y0 */
+            vMin = v2;   vMid = v1;   vMax = v0;
+            vMin_fy = fy2;  vMid_fy = fy1;  vMax_fy = fy0;
+            bf = -bf;
+         }
+         else {
+            /* y1 <= y2 <= y0 */
+            vMin = v1;   vMid = v2;   vMax = v0;
+            vMin_fy = fy1;  vMid_fy = fy2;  vMax_fy = fy0;
+         }
+      }
+
+      /* fixed point X coords */
+      vMin_fx = FloatToFixed(vMin->win[0] + 0.5F) & snapMask;
+      vMid_fx = FloatToFixed(vMid->win[0] + 0.5F) & snapMask;
+      vMax_fx = FloatToFixed(vMax->win[0] + 0.5F) & snapMask;
+   }
+
+   /* vertex/edge relationship */
+   eMaj.v0 = vMin;   eMaj.v1 = vMax;   /*TODO: .v1's not needed */
+   eTop.v0 = vMid;   eTop.v1 = vMax;
+   eBot.v0 = vMin;   eBot.v1 = vMid;
+
+   /* compute deltas for each edge:  vertex[upper] - vertex[lower] */
+   eMaj.dx = FixedToFloat(vMax_fx - vMin_fx);
+   eMaj.dy = FixedToFloat(vMax_fy - vMin_fy);
+   eTop.dx = FixedToFloat(vMax_fx - vMid_fx);
+   eTop.dy = FixedToFloat(vMax_fy - vMid_fy);
+   eBot.dx = FixedToFloat(vMid_fx - vMin_fx);
+   eBot.dy = FixedToFloat(vMid_fy - vMin_fy);
+
+   /* compute area, oneOverArea and perform backface culling */
+   {
+      const GLfloat area = eMaj.dx * eBot.dy - eBot.dx * eMaj.dy;
+
+      /* Do backface culling */
+      if (area * bf < 0.0)
+         return;
+
+      if (IS_INF_OR_NAN(area) || area == 0.0F)
+         return;
+
+      oneOverArea = 1.0F / area;
+   }
+
+#ifndef DO_OCCLUSION_TEST
+   ctx->OcclusionResult = GL_TRUE;
+#endif
+   span.facing = ctx->_Facing; /* for 2-sided stencil test */
+
+   /* Edge setup.  For a triangle strip these could be reused... */
+   {
+      eMaj.fsy = FixedCeil(vMin_fy);
+      eMaj.lines = FixedToInt(FixedCeil(vMax_fy - eMaj.fsy));
+      if (eMaj.lines > 0) {
+         GLfloat dxdy = eMaj.dx / eMaj.dy;
+         eMaj.fdxdy = SignedFloatToFixed(dxdy);
+         eMaj.adjy = (GLfloat) (eMaj.fsy - vMin_fy);  /* SCALED! */
+         eMaj.fx0 = vMin_fx;
+         eMaj.fsx = eMaj.fx0 + (GLfixed) (eMaj.adjy * dxdy);
+      }
+      else {
+         return;  /*CULLED*/
+      }
+
+      eTop.fsy = FixedCeil(vMid_fy);
+      eTop.lines = FixedToInt(FixedCeil(vMax_fy - eTop.fsy));
+      if (eTop.lines > 0) {
+         GLfloat dxdy = eTop.dx / eTop.dy;
+         eTop.fdxdy = SignedFloatToFixed(dxdy);
+         eTop.adjy = (GLfloat) (eTop.fsy - vMid_fy); /* SCALED! */
+         eTop.fx0 = vMid_fx;
+         eTop.fsx = eTop.fx0 + (GLfixed) (eTop.adjy * dxdy);
+      }
+
+      eBot.fsy = FixedCeil(vMin_fy);
+      eBot.lines = FixedToInt(FixedCeil(vMid_fy - eBot.fsy));
+      if (eBot.lines > 0) {
+         GLfloat dxdy = eBot.dx / eBot.dy;
+         eBot.fdxdy = SignedFloatToFixed(dxdy);
+         eBot.adjy = (GLfloat) (eBot.fsy - vMin_fy);  /* SCALED! */
+         eBot.fx0 = vMin_fx;
+         eBot.fsx = eBot.fx0 + (GLfixed) (eBot.adjy * dxdy);
+      }
+   }
+
+   /*
+    * Conceptually, we view a triangle as two subtriangles
+    * separated by a perfectly horizontal line.  The edge that is
+    * intersected by this line is one with maximal absolute dy; we
+    * call it a ``major'' edge.  The other two edges are the
+    * ``top'' edge (for the upper subtriangle) and the ``bottom''
+    * edge (for the lower subtriangle).  If either of these two
+    * edges is horizontal or very close to horizontal, the
+    * corresponding subtriangle might cover zero sample points;
+    * we take care to handle such cases, for performance as well
+    * as correctness.
+    *
+    * By stepping rasterization parameters along the major edge,
+    * we can avoid recomputing them at the discontinuity where
+    * the top and bottom edges meet.  However, this forces us to
+    * be able to scan both left-to-right and right-to-left.
+    * Also, we must determine whether the major edge is at the
+    * left or right side of the triangle.  We do this by
+    * computing the magnitude of the cross-product of the major
+    * and top edges.  Since this magnitude depends on the sine of
+    * the angle between the two edges, its sign tells us whether
+    * we turn to the left or to the right when travelling along
+    * the major edge to the top edge, and from this we infer
+    * whether the major edge is on the left or the right.
+    *
+    * Serendipitously, this cross-product magnitude is also a
+    * value we need to compute the iteration parameter
+    * derivatives for the triangle, and it can be used to perform
+    * backface culling because its sign tells us whether the
+    * triangle is clockwise or counterclockwise.  In this code we
+    * refer to it as ``area'' because it's also proportional to
+    * the pixel area of the triangle.
+    */
+
+   {
+      GLint scan_from_left_to_right;  /* true if scanning left-to-right */
+#ifdef INTERP_INDEX
+      GLfloat didx, didy;
+#endif
+
+      /*
+       * Execute user-supplied setup code
+       */
+#ifdef SETUP_CODE
+      SETUP_CODE
+#endif
+
+      scan_from_left_to_right = (oneOverArea < 0.0F);
+
+
+      /* compute d?/dx and d?/dy derivatives */
+#ifdef INTERP_Z
+      span.interpMask |= SPAN_Z;
+      {
+         GLfloat eMaj_dz = vMax->win[2] - vMin->win[2];
+         GLfloat eBot_dz = vMid->win[2] - vMin->win[2];
+         span.dzdx = oneOverArea * (eMaj_dz * eBot.dy - eMaj.dy * eBot_dz);
+         if (span.dzdx > maxDepth || span.dzdx < -maxDepth) {
+            /* probably a sliver triangle */
+            span.dzdx = 0.0;
+            span.dzdy = 0.0;
+         }
+         else {
+            span.dzdy = oneOverArea * (eMaj.dx * eBot_dz - eMaj_dz * eBot.dx);
+         }
+         if (depthBits <= 16)
+            span.zStep = SignedFloatToFixed(span.dzdx);
+         else
+            span.zStep = (GLint) span.dzdx;
+      }
+#endif
+#ifdef INTERP_W
+      {
+         const GLfloat eMaj_dw = vMax->win[3] - vMin->win[3];
+         const GLfloat eBot_dw = vMid->win[3] - vMin->win[3];
+         span.dwdx = oneOverArea * (eMaj_dw * eBot.dy - eMaj.dy * eBot_dw);
+         span.dwdy = oneOverArea * (eMaj.dx * eBot_dw - eMaj_dw * eBot.dx);
+      }
+#endif
+#ifdef INTERP_FOG
+      span.interpMask |= SPAN_FOG;
+      {
+         const GLfloat eMaj_dfog = vMax->fog - vMin->fog;
+         const GLfloat eBot_dfog = vMid->fog - vMin->fog;
+         span.dfogdx = oneOverArea * (eMaj_dfog * eBot.dy - eMaj.dy * eBot_dfog);
+         span.dfogdy = oneOverArea * (eMaj.dx * eBot_dfog - eMaj_dfog * eBot.dx);
+         span.fogStep = span.dfogdx;
+      }
+#endif
+#ifdef INTERP_RGB
+      span.interpMask |= SPAN_RGBA;
+      if (ctx->Light.ShadeModel == GL_SMOOTH) {
+         GLfloat eMaj_dr = (GLfloat) ((ColorTemp) vMax->color[RCOMP] - vMin->color[RCOMP]);
+         GLfloat eBot_dr = (GLfloat) ((ColorTemp) vMid->color[RCOMP] - vMin->color[RCOMP]);
+         GLfloat eMaj_dg = (GLfloat) ((ColorTemp) vMax->color[GCOMP] - vMin->color[GCOMP]);
+         GLfloat eBot_dg = (GLfloat) ((ColorTemp) vMid->color[GCOMP] - vMin->color[GCOMP]);
+         GLfloat eMaj_db = (GLfloat) ((ColorTemp) vMax->color[BCOMP] - vMin->color[BCOMP]);
+         GLfloat eBot_db = (GLfloat) ((ColorTemp) vMid->color[BCOMP] - vMin->color[BCOMP]);
+#  ifdef INTERP_ALPHA
+         GLfloat eMaj_da = (GLfloat) ((ColorTemp) vMax->color[ACOMP] - vMin->color[ACOMP]);
+         GLfloat eBot_da = (GLfloat) ((ColorTemp) vMid->color[ACOMP] - vMin->color[ACOMP]);
+#  endif
+         span.drdx = oneOverArea * (eMaj_dr * eBot.dy - eMaj.dy * eBot_dr);
+         span.drdy = oneOverArea * (eMaj.dx * eBot_dr - eMaj_dr * eBot.dx);
+         span.dgdx = oneOverArea * (eMaj_dg * eBot.dy - eMaj.dy * eBot_dg);
+         span.dgdy = oneOverArea * (eMaj.dx * eBot_dg - eMaj_dg * eBot.dx);
+         span.dbdx = oneOverArea * (eMaj_db * eBot.dy - eMaj.dy * eBot_db);
+         span.dbdy = oneOverArea * (eMaj.dx * eBot_db - eMaj_db * eBot.dx);
+#  if CHAN_TYPE == GL_FLOAT
+         span.redStep   = span.drdx;
+         span.greenStep = span.dgdx;
+         span.blueStep  = span.dbdx;
+#  else
+         span.redStep   = SignedFloatToFixed(span.drdx);
+         span.greenStep = SignedFloatToFixed(span.dgdx);
+         span.blueStep  = SignedFloatToFixed(span.dbdx);
+#  endif /* GL_FLOAT */
+#  ifdef INTERP_ALPHA
+         span.dadx = oneOverArea * (eMaj_da * eBot.dy - eMaj.dy * eBot_da);
+         span.dady = oneOverArea * (eMaj.dx * eBot_da - eMaj_da * eBot.dx);
+#    if CHAN_TYPE == GL_FLOAT
+         span.alphaStep = span.dadx;
+#    else
+         span.alphaStep = SignedFloatToFixed(span.dadx);
+#    endif /* GL_FLOAT */
+#  endif /* INTERP_ALPHA */
+      }
+      else {
+         ASSERT (ctx->Light.ShadeModel == GL_FLAT);
+         span.interpMask |= SPAN_FLAT;
+         span.drdx = span.drdy = 0.0F;
+         span.dgdx = span.dgdy = 0.0F;
+         span.dbdx = span.dbdy = 0.0F;
+#    if CHAN_TYPE == GL_FLOAT
+	 span.redStep   = 0.0F;
+	 span.greenStep = 0.0F;
+	 span.blueStep  = 0.0F;
+#    else
+	 span.redStep   = 0;
+	 span.greenStep = 0;
+	 span.blueStep  = 0;
+#    endif /* GL_FLOAT */
+#  ifdef INTERP_ALPHA
+         span.dadx = span.dady = 0.0F;
+#    if CHAN_TYPE == GL_FLOAT
+	 span.alphaStep = 0.0F;
+#    else
+	 span.alphaStep = 0;
+#    endif /* GL_FLOAT */
+#  endif
+      }
+#endif /* INTERP_RGB */
+#ifdef INTERP_SPEC
+      span.interpMask |= SPAN_SPEC;
+      if (ctx->Light.ShadeModel == GL_SMOOTH) {
+         GLfloat eMaj_dsr = (GLfloat) ((ColorTemp) vMax->specular[RCOMP] - vMin->specular[RCOMP]);
+         GLfloat eBot_dsr = (GLfloat) ((ColorTemp) vMid->specular[RCOMP] - vMin->specular[RCOMP]);
+         GLfloat eMaj_dsg = (GLfloat) ((ColorTemp) vMax->specular[GCOMP] - vMin->specular[GCOMP]);
+         GLfloat eBot_dsg = (GLfloat) ((ColorTemp) vMid->specular[GCOMP] - vMin->specular[GCOMP]);
+         GLfloat eMaj_dsb = (GLfloat) ((ColorTemp) vMax->specular[BCOMP] - vMin->specular[BCOMP]);
+         GLfloat eBot_dsb = (GLfloat) ((ColorTemp) vMid->specular[BCOMP] - vMin->specular[BCOMP]);
+         span.dsrdx = oneOverArea * (eMaj_dsr * eBot.dy - eMaj.dy * eBot_dsr);
+         span.dsrdy = oneOverArea * (eMaj.dx * eBot_dsr - eMaj_dsr * eBot.dx);
+         span.dsgdx = oneOverArea * (eMaj_dsg * eBot.dy - eMaj.dy * eBot_dsg);
+         span.dsgdy = oneOverArea * (eMaj.dx * eBot_dsg - eMaj_dsg * eBot.dx);
+         span.dsbdx = oneOverArea * (eMaj_dsb * eBot.dy - eMaj.dy * eBot_dsb);
+         span.dsbdy = oneOverArea * (eMaj.dx * eBot_dsb - eMaj_dsb * eBot.dx);
+#  if CHAN_TYPE == GL_FLOAT
+         span.specRedStep   = span.dsrdx;
+         span.specGreenStep = span.dsgdx;
+         span.specBlueStep  = span.dsbdx;
+#  else
+         span.specRedStep   = SignedFloatToFixed(span.dsrdx);
+         span.specGreenStep = SignedFloatToFixed(span.dsgdx);
+         span.specBlueStep  = SignedFloatToFixed(span.dsbdx);
+#  endif
+      }
+      else {
+         span.dsrdx = span.dsrdy = 0.0F;
+         span.dsgdx = span.dsgdy = 0.0F;
+         span.dsbdx = span.dsbdy = 0.0F;
+#  if CHAN_TYPE == GL_FLOAT
+	 span.specRedStep   = 0.0F;
+	 span.specGreenStep = 0.0F;
+	 span.specBlueStep  = 0.0F;
+#  else
+	 span.specRedStep   = 0;
+	 span.specGreenStep = 0;
+	 span.specBlueStep  = 0;
+#  endif
+      }
+#endif /* INTERP_SPEC */
+#ifdef INTERP_INDEX
+      span.interpMask |= SPAN_INDEX;
+      if (ctx->Light.ShadeModel == GL_SMOOTH) {
+         GLfloat eMaj_di = vMax->index - vMin->index;
+         GLfloat eBot_di = vMid->index - vMin->index;
+         didx = oneOverArea * (eMaj_di * eBot.dy - eMaj.dy * eBot_di);
+         didy = oneOverArea * (eMaj.dx * eBot_di - eMaj_di * eBot.dx);
+         span.indexStep = SignedFloatToFixed(didx);
+      }
+      else {
+         span.interpMask |= SPAN_FLAT;
+         didx = didy = 0.0F;
+         span.indexStep = 0;
+      }
+#endif
+#ifdef INTERP_INT_TEX
+      span.interpMask |= SPAN_INT_TEXTURE;
+      {
+         GLfloat eMaj_ds = (vMax->texcoord[0][0] - vMin->texcoord[0][0]) * S_SCALE;
+         GLfloat eBot_ds = (vMid->texcoord[0][0] - vMin->texcoord[0][0]) * S_SCALE;
+         GLfloat eMaj_dt = (vMax->texcoord[0][1] - vMin->texcoord[0][1]) * T_SCALE;
+         GLfloat eBot_dt = (vMid->texcoord[0][1] - vMin->texcoord[0][1]) * T_SCALE;
+         span.texStepX[0][0] = oneOverArea * (eMaj_ds * eBot.dy - eMaj.dy * eBot_ds);
+         span.texStepY[0][0] = oneOverArea * (eMaj.dx * eBot_ds - eMaj_ds * eBot.dx);
+         span.texStepX[0][1] = oneOverArea * (eMaj_dt * eBot.dy - eMaj.dy * eBot_dt);
+         span.texStepY[0][1] = oneOverArea * (eMaj.dx * eBot_dt - eMaj_dt * eBot.dx);
+         span.intTexStep[0] = SignedFloatToFixed(span.texStepX[0][0]);
+         span.intTexStep[1] = SignedFloatToFixed(span.texStepX[0][1]);
+      }
+#endif
+#ifdef INTERP_TEX
+      span.interpMask |= SPAN_TEXTURE;
+      {
+         /* win[3] is 1/W */
+         const GLfloat wMax = vMax->win[3], wMin = vMin->win[3], wMid = vMid->win[3];
+         TEX_UNIT_LOOP(
+            GLfloat eMaj_ds = vMax->texcoord[u][0] * wMax - vMin->texcoord[u][0] * wMin;
+            GLfloat eBot_ds = vMid->texcoord[u][0] * wMid - vMin->texcoord[u][0] * wMin;
+            GLfloat eMaj_dt = vMax->texcoord[u][1] * wMax - vMin->texcoord[u][1] * wMin;
+            GLfloat eBot_dt = vMid->texcoord[u][1] * wMid - vMin->texcoord[u][1] * wMin;
+            GLfloat eMaj_du = vMax->texcoord[u][2] * wMax - vMin->texcoord[u][2] * wMin;
+            GLfloat eBot_du = vMid->texcoord[u][2] * wMid - vMin->texcoord[u][2] * wMin;
+            GLfloat eMaj_dv = vMax->texcoord[u][3] * wMax - vMin->texcoord[u][3] * wMin;
+            GLfloat eBot_dv = vMid->texcoord[u][3] * wMid - vMin->texcoord[u][3] * wMin;
+            span.texStepX[u][0] = oneOverArea * (eMaj_ds * eBot.dy - eMaj.dy * eBot_ds);
+            span.texStepY[u][0] = oneOverArea * (eMaj.dx * eBot_ds - eMaj_ds * eBot.dx);
+            span.texStepX[u][1] = oneOverArea * (eMaj_dt * eBot.dy - eMaj.dy * eBot_dt);
+            span.texStepY[u][1] = oneOverArea * (eMaj.dx * eBot_dt - eMaj_dt * eBot.dx);
+            span.texStepX[u][2] = oneOverArea * (eMaj_du * eBot.dy - eMaj.dy * eBot_du);
+            span.texStepY[u][2] = oneOverArea * (eMaj.dx * eBot_du - eMaj_du * eBot.dx);
+            span.texStepX[u][3] = oneOverArea * (eMaj_dv * eBot.dy - eMaj.dy * eBot_dv);
+            span.texStepY[u][3] = oneOverArea * (eMaj.dx * eBot_dv - eMaj_dv * eBot.dx);
+         )
+      }
+#endif
+
+      /*
+       * We always sample at pixel centers.  However, we avoid
+       * explicit half-pixel offsets in this code by incorporating
+       * the proper offset in each of x and y during the
+       * transformation to window coordinates.
+       *
+       * We also apply the usual rasterization rules to prevent
+       * cracks and overlaps.  A pixel is considered inside a
+       * subtriangle if it meets all of four conditions: it is on or
+       * to the right of the left edge, strictly to the left of the
+       * right edge, on or below the top edge, and strictly above
+       * the bottom edge.  (Some edges may be degenerate.)
+       *
+       * The following discussion assumes left-to-right scanning
+       * (that is, the major edge is on the left); the right-to-left
+       * case is a straightforward variation.
+       *
+       * We start by finding the half-integral y coordinate that is
+       * at or below the top of the triangle.  This gives us the
+       * first scan line that could possibly contain pixels that are
+       * inside the triangle.
+       *
+       * Next we creep down the major edge until we reach that y,
+       * and compute the corresponding x coordinate on the edge.
+       * Then we find the half-integral x that lies on or just
+       * inside the edge.  This is the first pixel that might lie in
+       * the interior of the triangle.  (We won't know for sure
+       * until we check the other edges.)
+       *
+       * As we rasterize the triangle, we'll step down the major
+       * edge.  For each step in y, we'll move an integer number
+       * of steps in x.  There are two possible x step sizes, which
+       * we'll call the ``inner'' step (guaranteed to land on the
+       * edge or inside it) and the ``outer'' step (guaranteed to
+       * land on the edge or outside it).  The inner and outer steps
+       * differ by one.  During rasterization we maintain an error
+       * term that indicates our distance from the true edge, and
+       * select either the inner step or the outer step, whichever
+       * gets us to the first pixel that falls inside the triangle.
+       *
+       * All parameters (z, red, etc.) as well as the buffer
+       * addresses for color and z have inner and outer step values,
+       * so that we can increment them appropriately.  This method
+       * eliminates the need to adjust parameters by creeping a
+       * sub-pixel amount into the triangle at each scanline.
+       */
+
+      {
+         int subTriangle;
+         GLfixed fx;
+         GLfixed fxLeftEdge = 0, fxRightEdge = 0;
+         GLfixed fdxLeftEdge = 0, fdxRightEdge = 0;
+         GLfixed fdxOuter;
+         int idxOuter;
+         float dxOuter;
+         GLfixed fError = 0, fdError = 0;
+         float adjx, adjy;
+         GLfixed fy;
+#ifdef PIXEL_ADDRESS
+         PIXEL_TYPE *pRow = NULL;
+         int dPRowOuter = 0, dPRowInner;  /* offset in bytes */
+#endif
+#ifdef INTERP_Z
+#  ifdef DEPTH_TYPE
+         DEPTH_TYPE *zRow = NULL;
+         int dZRowOuter = 0, dZRowInner;  /* offset in bytes */
+#  endif
+         GLfixed zLeft = 0, fdzOuter = 0, fdzInner;
+#endif
+#ifdef INTERP_W
+         GLfloat wLeft = 0, dwOuter = 0, dwInner;
+#endif
+#ifdef INTERP_FOG
+         GLfloat fogLeft = 0, dfogOuter = 0, dfogInner;
+#endif
+#ifdef INTERP_RGB
+         ColorTemp rLeft = 0, fdrOuter = 0, fdrInner;
+         ColorTemp gLeft = 0, fdgOuter = 0, fdgInner;
+         ColorTemp bLeft = 0, fdbOuter = 0, fdbInner;
+#endif
+#ifdef INTERP_ALPHA
+         ColorTemp aLeft = 0, fdaOuter = 0, fdaInner;
+#endif
+#ifdef INTERP_SPEC
+         ColorTemp srLeft=0, dsrOuter=0, dsrInner;
+         ColorTemp sgLeft=0, dsgOuter=0, dsgInner;
+         ColorTemp sbLeft=0, dsbOuter=0, dsbInner;
+#endif
+#ifdef INTERP_INDEX
+         GLfixed iLeft=0, diOuter=0, diInner;
+#endif
+#ifdef INTERP_INT_TEX
+         GLfixed sLeft=0, dsOuter=0, dsInner;
+         GLfixed tLeft=0, dtOuter=0, dtInner;
+#endif
+#ifdef INTERP_TEX
+         GLfloat sLeft[MAX_TEXTURE_COORD_UNITS];
+         GLfloat tLeft[MAX_TEXTURE_COORD_UNITS];
+         GLfloat uLeft[MAX_TEXTURE_COORD_UNITS];
+         GLfloat vLeft[MAX_TEXTURE_COORD_UNITS];
+         GLfloat dsOuter[MAX_TEXTURE_COORD_UNITS], dsInner[MAX_TEXTURE_COORD_UNITS];
+         GLfloat dtOuter[MAX_TEXTURE_COORD_UNITS], dtInner[MAX_TEXTURE_COORD_UNITS];
+         GLfloat duOuter[MAX_TEXTURE_COORD_UNITS], duInner[MAX_TEXTURE_COORD_UNITS];
+         GLfloat dvOuter[MAX_TEXTURE_COORD_UNITS], dvInner[MAX_TEXTURE_COORD_UNITS];
+#endif
+
+         for (subTriangle=0; subTriangle<=1; subTriangle++) {
+            EdgeT *eLeft, *eRight;
+            int setupLeft, setupRight;
+            int lines;
+
+            if (subTriangle==0) {
+               /* bottom half */
+               if (scan_from_left_to_right) {
+                  eLeft = &eMaj;
+                  eRight = &eBot;
+                  lines = eRight->lines;
+                  setupLeft = 1;
+                  setupRight = 1;
+               }
+               else {
+                  eLeft = &eBot;
+                  eRight = &eMaj;
+                  lines = eLeft->lines;
+                  setupLeft = 1;
+                  setupRight = 1;
+               }
+            }
+            else {
+               /* top half */
+               if (scan_from_left_to_right) {
+                  eLeft = &eMaj;
+                  eRight = &eTop;
+                  lines = eRight->lines;
+                  setupLeft = 0;
+                  setupRight = 1;
+               }
+               else {
+                  eLeft = &eTop;
+                  eRight = &eMaj;
+                  lines = eLeft->lines;
+                  setupLeft = 1;
+                  setupRight = 0;
+               }
+               if (lines == 0)
+                  return;
+            }
+
+            if (setupLeft && eLeft->lines > 0) {
+               const SWvertex *vLower;
+               GLfixed fsx = eLeft->fsx;
+               fx = FixedCeil(fsx);
+               fError = fx - fsx - FIXED_ONE;
+               fxLeftEdge = fsx - FIXED_EPSILON;
+               fdxLeftEdge = eLeft->fdxdy;
+               fdxOuter = FixedFloor(fdxLeftEdge - FIXED_EPSILON);
+               fdError = fdxOuter - fdxLeftEdge + FIXED_ONE;
+               idxOuter = FixedToInt(fdxOuter);
+               dxOuter = (float) idxOuter;
+               (void) dxOuter;
+
+               fy = eLeft->fsy;
+               span.y = FixedToInt(fy);
+
+               adjx = (float)(fx - eLeft->fx0);  /* SCALED! */
+               adjy = eLeft->adjy;		 /* SCALED! */
+#ifndef __IBMCPP__
+               (void) adjx;  /* silence compiler warnings */
+               (void) adjy;  /* silence compiler warnings */
+#endif
+               vLower = eLeft->v0;
+#ifndef __IBMCPP__
+               (void) vLower;  /* silence compiler warnings */
+#endif
+
+#ifdef PIXEL_ADDRESS
+               {
+                  pRow = (PIXEL_TYPE *) PIXEL_ADDRESS(FixedToInt(fxLeftEdge), span.y);
+                  dPRowOuter = -((int)BYTES_PER_ROW) + idxOuter * sizeof(PIXEL_TYPE);
+                  /* negative because Y=0 at bottom and increases upward */
+               }
+#endif
+               /*
+                * Now we need the set of parameter (z, color, etc.) values at
+                * the point (fx, fy).  This gives us properly-sampled parameter
+                * values that we can step from pixel to pixel.  Furthermore,
+                * although we might have intermediate results that overflow
+                * the normal parameter range when we step temporarily outside
+                * the triangle, we shouldn't overflow or underflow for any
+                * pixel that's actually inside the triangle.
+                */
+
+#ifdef INTERP_Z
+               {
+                  GLfloat z0 = vLower->win[2];
+                  if (depthBits <= 16) {
+                     /* interpolate fixed-pt values */
+                     GLfloat tmp = (z0 * FIXED_SCALE + span.dzdx * adjx + span.dzdy * adjy) + FIXED_HALF;
+                     if (tmp < MAX_GLUINT / 2)
+                        zLeft = (GLfixed) tmp;
+                     else
+                        zLeft = MAX_GLUINT / 2;
+                     fdzOuter = SignedFloatToFixed(span.dzdy + dxOuter * span.dzdx);
+                  }
+                  else {
+                     /* interpolate depth values exactly */
+                     zLeft = (GLint) (z0 + span.dzdx * FixedToFloat(adjx) + span.dzdy * FixedToFloat(adjy));
+                     fdzOuter = (GLint) (span.dzdy + dxOuter * span.dzdx);
+                  }
+#  ifdef DEPTH_TYPE
+                  zRow = (DEPTH_TYPE *)
+                    _swrast_zbuffer_address(ctx, FixedToInt(fxLeftEdge), span.y);
+                  dZRowOuter = (ctx->DrawBuffer->Width + idxOuter) * sizeof(DEPTH_TYPE);
+#  endif
+               }
+#endif
+#ifdef INTERP_W
+               wLeft = vLower->win[3] + (span.dwdx * adjx + span.dwdy * adjy) * (1.0F/FIXED_SCALE);
+               dwOuter = span.dwdy + dxOuter * span.dwdx;
+#endif
+#ifdef INTERP_FOG
+               fogLeft = vLower->fog + (span.dfogdx * adjx + span.dfogdy * adjy) * (1.0F/FIXED_SCALE);
+               dfogOuter = span.dfogdy + dxOuter * span.dfogdx;
+#endif
+#ifdef INTERP_RGB
+               if (ctx->Light.ShadeModel == GL_SMOOTH) {
+#  if CHAN_TYPE == GL_FLOAT
+                  rLeft = vLower->color[RCOMP] + (span.drdx * adjx + span.drdy * adjy) * (1.0F / FIXED_SCALE);
+                  gLeft = vLower->color[GCOMP] + (span.dgdx * adjx + span.dgdy * adjy) * (1.0F / FIXED_SCALE);
+                  bLeft = vLower->color[BCOMP] + (span.dbdx * adjx + span.dbdy * adjy) * (1.0F / FIXED_SCALE);
+                  fdrOuter = span.drdy + dxOuter * span.drdx;
+                  fdgOuter = span.dgdy + dxOuter * span.dgdx;
+                  fdbOuter = span.dbdy + dxOuter * span.dbdx;
+#  else
+                  rLeft = (GLint)(ChanToFixed(vLower->color[RCOMP]) + span.drdx * adjx + span.drdy * adjy) + FIXED_HALF;
+                  gLeft = (GLint)(ChanToFixed(vLower->color[GCOMP]) + span.dgdx * adjx + span.dgdy * adjy) + FIXED_HALF;
+                  bLeft = (GLint)(ChanToFixed(vLower->color[BCOMP]) + span.dbdx * adjx + span.dbdy * adjy) + FIXED_HALF;
+                  fdrOuter = SignedFloatToFixed(span.drdy + dxOuter * span.drdx);
+                  fdgOuter = SignedFloatToFixed(span.dgdy + dxOuter * span.dgdx);
+                  fdbOuter = SignedFloatToFixed(span.dbdy + dxOuter * span.dbdx);
+#  endif
+#  ifdef INTERP_ALPHA
+#    if CHAN_TYPE == GL_FLOAT
+                  aLeft = vLower->color[ACOMP] + (span.dadx * adjx + span.dady * adjy) * (1.0F / FIXED_SCALE);
+                  fdaOuter = span.dady + dxOuter * span.dadx;
+#    else
+                  aLeft = (GLint)(ChanToFixed(vLower->color[ACOMP]) + span.dadx * adjx + span.dady * adjy) + FIXED_HALF;
+                  fdaOuter = SignedFloatToFixed(span.dady + dxOuter * span.dadx);
+#    endif
+#  endif
+               }
+               else {
+                  ASSERT (ctx->Light.ShadeModel == GL_FLAT);
+#  if CHAN_TYPE == GL_FLOAT
+                  rLeft = v2->color[RCOMP];
+                  gLeft = v2->color[GCOMP];
+                  bLeft = v2->color[BCOMP];
+                  fdrOuter = fdgOuter = fdbOuter = 0.0F;
+#  else
+                  rLeft = ChanToFixed(v2->color[RCOMP]);
+                  gLeft = ChanToFixed(v2->color[GCOMP]);
+                  bLeft = ChanToFixed(v2->color[BCOMP]);
+                  fdrOuter = fdgOuter = fdbOuter = 0;
+#  endif
+#  ifdef INTERP_ALPHA
+#    if CHAN_TYPE == GL_FLOAT
+                  aLeft = v2->color[ACOMP];
+                  fdaOuter = 0.0F;
+#    else
+                  aLeft = ChanToFixed(v2->color[ACOMP]);
+                  fdaOuter = 0;
+#    endif
+#  endif
+               }
+#endif
+
+#ifdef INTERP_SPEC
+               if (ctx->Light.ShadeModel == GL_SMOOTH) {
+#  if CHAN_TYPE == GL_FLOAT
+                  srLeft = vLower->specular[RCOMP] + (span.dsrdx * adjx + span.dsrdy * adjy) * (1.0F / FIXED_SCALE);
+                  sgLeft = vLower->specular[GCOMP] + (span.dsgdx * adjx + span.dsgdy * adjy) * (1.0F / FIXED_SCALE);
+                  sbLeft = vLower->specular[BCOMP] + (span.dsbdx * adjx + span.dsbdy * adjy) * (1.0F / FIXED_SCALE);
+                  dsrOuter = span.dsrdy + dxOuter * span.dsrdx;
+                  dsgOuter = span.dsgdy + dxOuter * span.dsgdx;
+                  dsbOuter = span.dsbdy + dxOuter * span.dsbdx;
+#  else
+                  srLeft = (GLfixed) (ChanToFixed(vLower->specular[RCOMP]) + span.dsrdx * adjx + span.dsrdy * adjy) + FIXED_HALF;
+                  sgLeft = (GLfixed) (ChanToFixed(vLower->specular[GCOMP]) + span.dsgdx * adjx + span.dsgdy * adjy) + FIXED_HALF;
+                  sbLeft = (GLfixed) (ChanToFixed(vLower->specular[BCOMP]) + span.dsbdx * adjx + span.dsbdy * adjy) + FIXED_HALF;
+                  dsrOuter = SignedFloatToFixed(span.dsrdy + dxOuter * span.dsrdx);
+                  dsgOuter = SignedFloatToFixed(span.dsgdy + dxOuter * span.dsgdx);
+                  dsbOuter = SignedFloatToFixed(span.dsbdy + dxOuter * span.dsbdx);
+#  endif
+               }
+               else {
+#if  CHAN_TYPE == GL_FLOAT
+                  srLeft = v2->specular[RCOMP];
+                  sgLeft = v2->specular[GCOMP];
+                  sbLeft = v2->specular[BCOMP];
+                  dsrOuter = dsgOuter = dsbOuter = 0.0F;
+#  else
+                  srLeft = ChanToFixed(v2->specular[RCOMP]);
+                  sgLeft = ChanToFixed(v2->specular[GCOMP]);
+                  sbLeft = ChanToFixed(v2->specular[BCOMP]);
+                  dsrOuter = dsgOuter = dsbOuter = 0;
+#  endif
+               }
+#endif
+
+#ifdef INTERP_INDEX
+               if (ctx->Light.ShadeModel == GL_SMOOTH) {
+                  iLeft = (GLfixed)(vLower->index * FIXED_SCALE
+                                 + didx * adjx + didy * adjy) + FIXED_HALF;
+                  diOuter = SignedFloatToFixed(didy + dxOuter * didx);
+               }
+               else {
+                  iLeft = FloatToFixed(v2->index);
+                  diOuter = 0;
+               }
+#endif
+#ifdef INTERP_INT_TEX
+               {
+                  GLfloat s0, t0;
+                  s0 = vLower->texcoord[0][0] * S_SCALE;
+                  sLeft = (GLfixed)(s0 * FIXED_SCALE + span.texStepX[0][0] * adjx
+                                 + span.texStepY[0][0] * adjy) + FIXED_HALF;
+                  dsOuter = SignedFloatToFixed(span.texStepY[0][0] + dxOuter * span.texStepX[0][0]);
+
+                  t0 = vLower->texcoord[0][1] * T_SCALE;
+                  tLeft = (GLfixed)(t0 * FIXED_SCALE + span.texStepX[0][1] * adjx
+                                 + span.texStepY[0][1] * adjy) + FIXED_HALF;
+                  dtOuter = SignedFloatToFixed(span.texStepY[0][1] + dxOuter * span.texStepX[0][1]);
+               }
+#endif
+#ifdef INTERP_TEX
+               TEX_UNIT_LOOP(
+                  const GLfloat invW = vLower->win[3];
+                  const GLfloat s0 = vLower->texcoord[u][0] * invW;
+                  const GLfloat t0 = vLower->texcoord[u][1] * invW;
+                  const GLfloat u0 = vLower->texcoord[u][2] * invW;
+                  const GLfloat v0 = vLower->texcoord[u][3] * invW;
+                  sLeft[u] = s0 + (span.texStepX[u][0] * adjx + span.texStepY[u][0] * adjy) * (1.0F/FIXED_SCALE);
+                  tLeft[u] = t0 + (span.texStepX[u][1] * adjx + span.texStepY[u][1] * adjy) * (1.0F/FIXED_SCALE);
+                  uLeft[u] = u0 + (span.texStepX[u][2] * adjx + span.texStepY[u][2] * adjy) * (1.0F/FIXED_SCALE);
+                  vLeft[u] = v0 + (span.texStepX[u][3] * adjx + span.texStepY[u][3] * adjy) * (1.0F/FIXED_SCALE);
+                  dsOuter[u] = span.texStepY[u][0] + dxOuter * span.texStepX[u][0];
+                  dtOuter[u] = span.texStepY[u][1] + dxOuter * span.texStepX[u][1];
+                  duOuter[u] = span.texStepY[u][2] + dxOuter * span.texStepX[u][2];
+                  dvOuter[u] = span.texStepY[u][3] + dxOuter * span.texStepX[u][3];
+               )
+#endif
+            } /*if setupLeft*/
+
+
+            if (setupRight && eRight->lines>0) {
+               fxRightEdge = eRight->fsx - FIXED_EPSILON;
+               fdxRightEdge = eRight->fdxdy;
+            }
+
+            if (lines==0) {
+               continue;
+            }
+
+
+            /* Rasterize setup */
+#ifdef PIXEL_ADDRESS
+            dPRowInner = dPRowOuter + sizeof(PIXEL_TYPE);
+#endif
+#ifdef INTERP_Z
+#  ifdef DEPTH_TYPE
+            dZRowInner = dZRowOuter + sizeof(DEPTH_TYPE);
+#  endif
+            fdzInner = fdzOuter + span.zStep;
+#endif
+#ifdef INTERP_W
+            dwInner = dwOuter + span.dwdx;
+#endif
+#ifdef INTERP_FOG
+            dfogInner = dfogOuter + span.dfogdx;
+#endif
+#if defined(INTERP_RGB)
+            fdrInner = fdrOuter + span.redStep;
+            fdgInner = fdgOuter + span.greenStep;
+            fdbInner = fdbOuter + span.blueStep;
+#endif
+#if defined(INTERP_ALPHA)
+            fdaInner = fdaOuter + span.alphaStep;
+#endif
+#if defined(INTERP_SPEC)
+            dsrInner = dsrOuter + span.specRedStep;
+            dsgInner = dsgOuter + span.specGreenStep;
+            dsbInner = dsbOuter + span.specBlueStep;
+#endif
+#ifdef INTERP_INDEX
+            diInner = diOuter + span.indexStep;
+#endif
+#ifdef INTERP_INT_TEX
+            dsInner = dsOuter + span.intTexStep[0];
+            dtInner = dtOuter + span.intTexStep[1];
+#endif
+#ifdef INTERP_TEX
+            TEX_UNIT_LOOP(
+               dsInner[u] = dsOuter[u] + span.texStepX[u][0];
+               dtInner[u] = dtOuter[u] + span.texStepX[u][1];
+               duInner[u] = duOuter[u] + span.texStepX[u][2];
+               dvInner[u] = dvOuter[u] + span.texStepX[u][3];
+            )
+#endif
+
+            while (lines > 0) {
+               /* initialize the span interpolants to the leftmost value */
+               /* ff = fixed-pt fragment */
+               const GLint right = FixedToInt(fxRightEdge);
+
+               span.x = FixedToInt(fxLeftEdge);
+
+               if (right <= span.x)
+                  span.end = 0;
+               else
+                  span.end = right - span.x;
+
+#ifdef INTERP_Z
+               span.z = zLeft;
+#endif
+#ifdef INTERP_W
+               span.w = wLeft;
+#endif
+#ifdef INTERP_FOG
+               span.fog = fogLeft;
+#endif
+#if defined(INTERP_RGB)
+               span.red = rLeft;
+               span.green = gLeft;
+               span.blue = bLeft;
+#endif
+#if defined(INTERP_ALPHA)
+               span.alpha = aLeft;
+#endif
+#if defined(INTERP_SPEC)
+               span.specRed = srLeft;
+               span.specGreen = sgLeft;
+               span.specBlue = sbLeft;
+#endif
+#ifdef INTERP_INDEX
+               span.index = iLeft;
+#endif
+#ifdef INTERP_INT_TEX
+               span.intTex[0] = sLeft;
+               span.intTex[1] = tLeft;
+#endif
+
+#ifdef INTERP_TEX
+               TEX_UNIT_LOOP(
+                  span.tex[u][0] = sLeft[u];
+                  span.tex[u][1] = tLeft[u];
+                  span.tex[u][2] = uLeft[u];
+                  span.tex[u][3] = vLeft[u];
+               )
+#endif
+
+#ifdef INTERP_RGB
+               {
+                  /* need this to accomodate round-off errors */
+                  const GLint len = right - span.x - 1;
+                  GLfixed ffrend = span.red + len * span.redStep;
+                  GLfixed ffgend = span.green + len * span.greenStep;
+                  GLfixed ffbend = span.blue + len * span.blueStep;
+                  if (ffrend < 0) {
+                     span.red -= ffrend;
+                     if (span.red < 0)
+                        span.red = 0;
+                  }
+                  if (ffgend < 0) {
+                     span.green -= ffgend;
+                     if (span.green < 0)
+                        span.green = 0;
+                  }
+                  if (ffbend < 0) {
+                     span.blue -= ffbend;
+                     if (span.blue < 0)
+                        span.blue = 0;
+                  }
+               }
+#endif
+#ifdef INTERP_ALPHA
+               {
+                  const GLint len = right - span.x - 1;
+                  GLfixed ffaend = span.alpha + len * span.alphaStep;
+                  if (ffaend < 0) {
+                     span.alpha -= ffaend;
+                     if (span.alpha < 0)
+                        span.alpha = 0;
+                  }
+               }
+#endif
+#ifdef INTERP_SPEC
+               {
+                  /* need this to accomodate round-off errors */
+                  const GLint len = right - span.x - 1;
+                  GLfixed ffsrend = span.specRed + len * span.specRedStep;
+                  GLfixed ffsgend = span.specGreen + len * span.specGreenStep;
+                  GLfixed ffsbend = span.specBlue + len * span.specBlueStep;
+                  if (ffsrend < 0) {
+                     span.specRed -= ffsrend;
+                     if (span.specRed < 0)
+                        span.specRed = 0;
+                  }
+                  if (ffsgend < 0) {
+                     span.specGreen -= ffsgend;
+                     if (span.specGreen < 0)
+                        span.specGreen = 0;
+                  }
+                  if (ffsbend < 0) {
+                     span.specBlue -= ffsbend;
+                     if (span.specBlue < 0)
+                        span.specBlue = 0;
+                  }
+               }
+#endif
+#ifdef INTERP_INDEX
+               if (span.index < 0)  span.index = 0;
+#endif
+
+               /* This is where we actually generate fragments */
+               if (span.end > 0) {
+                  RENDER_SPAN( span );
+               }
+
+               /*
+                * Advance to the next scan line.  Compute the
+                * new edge coordinates, and adjust the
+                * pixel-center x coordinate so that it stays
+                * on or inside the major edge.
+                */
+               (span.y)++;
+               lines--;
+
+               fxLeftEdge += fdxLeftEdge;
+               fxRightEdge += fdxRightEdge;
+
+
+               fError += fdError;
+               if (fError >= 0) {
+                  fError -= FIXED_ONE;
+#ifdef PIXEL_ADDRESS
+                  pRow = (PIXEL_TYPE *) ((GLubyte *) pRow + dPRowOuter);
+#endif
+#ifdef INTERP_Z
+#  ifdef DEPTH_TYPE
+                  zRow = (DEPTH_TYPE *) ((GLubyte *) zRow + dZRowOuter);
+#  endif
+                  zLeft += fdzOuter;
+#endif
+#ifdef INTERP_W
+                  wLeft += dwOuter;
+#endif
+#ifdef INTERP_FOG
+                  fogLeft += dfogOuter;
+#endif
+#if defined(INTERP_RGB)
+                  rLeft += fdrOuter;
+                  gLeft += fdgOuter;
+                  bLeft += fdbOuter;
+#endif
+#if defined(INTERP_ALPHA)
+                  aLeft += fdaOuter;
+#endif
+#if defined(INTERP_SPEC)
+                  srLeft += dsrOuter;
+                  sgLeft += dsgOuter;
+                  sbLeft += dsbOuter;
+#endif
+#ifdef INTERP_INDEX
+                  iLeft += diOuter;
+#endif
+#ifdef INTERP_INT_TEX
+                  sLeft += dsOuter;
+                  tLeft += dtOuter;
+#endif
+#ifdef INTERP_TEX
+                  TEX_UNIT_LOOP(
+                     sLeft[u] += dsOuter[u];
+                     tLeft[u] += dtOuter[u];
+                     uLeft[u] += duOuter[u];
+                     vLeft[u] += dvOuter[u];
+                  )
+#endif
+               }
+               else {
+#ifdef PIXEL_ADDRESS
+                  pRow = (PIXEL_TYPE *) ((GLubyte *) pRow + dPRowInner);
+#endif
+#ifdef INTERP_Z
+#  ifdef DEPTH_TYPE
+                  zRow = (DEPTH_TYPE *) ((GLubyte *) zRow + dZRowInner);
+#  endif
+                  zLeft += fdzInner;
+#endif
+#ifdef INTERP_W
+                  wLeft += dwInner;
+#endif
+#ifdef INTERP_FOG
+                  fogLeft += dfogInner;
+#endif
+#if defined(INTERP_RGB)
+                  rLeft += fdrInner;
+                  gLeft += fdgInner;
+                  bLeft += fdbInner;
+#endif
+#if defined(INTERP_ALPHA)
+                  aLeft += fdaInner;
+#endif
+#if defined(INTERP_SPEC)
+                  srLeft += dsrInner;
+                  sgLeft += dsgInner;
+                  sbLeft += dsbInner;
+#endif
+#ifdef INTERP_INDEX
+                  iLeft += diInner;
+#endif
+#ifdef INTERP_INT_TEX
+                  sLeft += dsInner;
+                  tLeft += dtInner;
+#endif
+#ifdef INTERP_TEX
+                  TEX_UNIT_LOOP(
+                     sLeft[u] += dsInner[u];
+                     tLeft[u] += dtInner[u];
+                     uLeft[u] += duInner[u];
+                     vLeft[u] += dvInner[u];
+                  )
+#endif
+               }
+            } /*while lines>0*/
+
+         } /* for subTriangle */
+
+      }
+#ifdef CLEANUP_CODE
+      CLEANUP_CODE
+#endif
+   }
+}
+
+#undef SETUP_CODE
+#undef CLEANUP_CODE
+#undef RENDER_SPAN
+
+#undef PIXEL_TYPE
+#undef BYTES_PER_ROW
+#undef PIXEL_ADDRESS
+
+#undef INTERP_Z
+#undef INTERP_W
+#undef INTERP_FOG
+#undef INTERP_RGB
+#undef INTERP_ALPHA
+#undef INTERP_SPEC
+#undef INTERP_INDEX
+#undef INTERP_INT_TEX
+#undef INTERP_TEX
+#undef INTERP_MULTITEX
+#undef TEX_UNIT_LOOP
+
+#undef S_SCALE
+#undef T_SCALE
+
+#undef FixedToDepth
+
+#undef DO_OCCLUSION_TEST
+#undef NAME
diff --git a/reactos/lib/mesa32/src/swrast/s_zoom.c b/reactos/lib/mesa32/src/swrast/s_zoom.c
new file mode 100644
index 00000000000..b67a2970109
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_zoom.c
@@ -0,0 +1,428 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "glheader.h"
+#include "macros.h"
+#include "imports.h"
+#include "colormac.h"
+
+#include "s_context.h"
+#include "s_span.h"
+#include "s_stencil.h"
+#include "s_zoom.h"
+
+
+/*
+ * Helper function called from _swrast_write_zoomed_rgba/rgb/index_span().
+ */
+static void
+zoom_span( GLcontext *ctx, const struct sw_span *span,
+           const GLvoid *src, GLint y0, GLenum format, GLint skipPixels )
+{
+   GLint r0, r1, row;
+   GLint c0, c1, skipCol;
+   GLint i, j;
+   const GLuint maxWidth = MIN2( ctx->DrawBuffer->Width, MAX_WIDTH );
+   struct sw_span zoomed;
+   struct span_arrays zoomed_arrays;  /* this is big! */
+
+   /* no pixel arrays! must be horizontal spans. */
+   ASSERT((span->arrayMask & SPAN_XY) == 0);
+   ASSERT(span->primitive == GL_BITMAP);
+
+   INIT_SPAN(zoomed, GL_BITMAP, 0, 0, 0);
+   zoomed.array = &zoomed_arrays;
+
+   /* copy fog interp info */
+   zoomed.fog = span->fog;
+   zoomed.fogStep = span->fogStep;
+   /* XXX copy texcoord info? */
+
+   if (format == GL_RGBA || format == GL_RGB) {
+      /* copy Z info */
+      zoomed.z = span->z;
+      zoomed.zStep = span->zStep;
+      /* we'll generate an array of colorss */
+      zoomed.interpMask = span->interpMask & ~SPAN_RGBA;
+      zoomed.arrayMask |= SPAN_RGBA;
+   }
+   else if (format == GL_COLOR_INDEX) {
+      /* copy Z info */
+      zoomed.z = span->z;
+      zoomed.zStep = span->zStep;
+      /* we'll generate an array of color indexes */
+      zoomed.interpMask = span->interpMask & ~SPAN_INDEX;
+      zoomed.arrayMask |= SPAN_INDEX;
+   }
+   else {
+      assert(format == GL_DEPTH_COMPONENT);
+      /* Copy color info */
+      zoomed.red = span->red;
+      zoomed.green = span->green;
+      zoomed.blue = span->blue;
+      zoomed.alpha = span->alpha;
+      zoomed.redStep = span->redStep;
+      zoomed.greenStep = span->greenStep;
+      zoomed.blueStep = span->blueStep;
+      zoomed.alphaStep = span->alphaStep;
+      /* we'll generate an array of depth values */
+      zoomed.interpMask = span->interpMask & ~SPAN_Z;
+      zoomed.arrayMask |= SPAN_Z;
+   }
+
+   /*
+    * Compute which columns to draw: [c0, c1)
+    */
+   c0 = (GLint) (span->x + skipPixels * ctx->Pixel.ZoomX);
+   c1 = (GLint) (span->x + (skipPixels + span->end) * ctx->Pixel.ZoomX);
+   if (c0 == c1) {
+      return;
+   }
+   else if (c1 < c0) {
+      /* swap */
+      GLint ctmp = c1;
+      c1 = c0;
+      c0 = ctmp;
+   }
+   if (c0 < 0) {
+      zoomed.x = 0;
+      zoomed.start = 0;
+      zoomed.end = c1;
+      skipCol = -c0;
+   }
+   else {
+      zoomed.x = c0;
+      zoomed.start = 0;
+      zoomed.end = c1 - c0;
+      skipCol = 0;
+   }
+   if (zoomed.end > maxWidth)
+      zoomed.end = maxWidth;
+
+   /*
+    * Compute which rows to draw: [r0, r1)
+    */
+   row = span->y - y0;
+   r0 = y0 + (GLint) (row * ctx->Pixel.ZoomY);
+   r1 = y0 + (GLint) ((row+1) * ctx->Pixel.ZoomY);
+   if (r0 == r1) {
+      return;
+   }
+   else if (r1 < r0) {
+      /* swap */
+      GLint rtmp = r1;
+      r1 = r0;
+      r0 = rtmp;
+   }
+
+   ASSERT(r0 < r1);
+   ASSERT(c0 < c1);
+
+   /*
+    * Trivial clip rejection testing.
+    */
+   if (r1 < 0) /* below window */
+      return;
+   if (r0 >= (GLint) ctx->DrawBuffer->Height) /* above window */
+      return;
+   if (c1 < 0) /* left of window */
+      return;
+   if (c0 >= (GLint) ctx->DrawBuffer->Width) /* right of window */
+      return;
+
+   /* zoom the span horizontally */
+   if (format == GL_RGBA) {
+      const GLchan (*rgba)[4] = (const GLchan (*)[4]) src;
+      if (ctx->Pixel.ZoomX == -1.0F) {
+         /* common case */
+         for (j = (GLint) zoomed.start; j < (GLint) zoomed.end; j++) {
+            i = span->end - (j + skipCol) - 1;
+            COPY_CHAN4(zoomed.array->rgba[j], rgba[i]);
+         }
+      }
+      else {
+         /* general solution */
+         const GLfloat xscale = 1.0F / ctx->Pixel.ZoomX;
+         for (j = (GLint) zoomed.start; j < (GLint) zoomed.end; j++) {
+            i = (GLint) ((j + skipCol) * xscale);
+            if (ctx->Pixel.ZoomX < 0.0) {
+               ASSERT(i <= 0);
+               i = span->end + i - 1;
+            }
+            ASSERT(i >= 0);
+            ASSERT(i < (GLint)  span->end);
+            COPY_CHAN4(zoomed.array->rgba[j], rgba[i]);
+         }
+      }
+   }
+   else if (format == GL_RGB) {
+      const GLchan (*rgb)[3] = (const GLchan (*)[3]) src;
+      if (ctx->Pixel.ZoomX == -1.0F) {
+         /* common case */
+         for (j = (GLint) zoomed.start; j < (GLint) zoomed.end; j++) {
+            i = span->end - (j + skipCol) - 1;
+            zoomed.array->rgba[j][0] = rgb[i][0];
+            zoomed.array->rgba[j][1] = rgb[i][1];
+            zoomed.array->rgba[j][2] = rgb[i][2];
+            zoomed.array->rgba[j][3] = CHAN_MAX;
+         }
+      }
+      else {
+         /* general solution */
+         const GLfloat xscale = 1.0F / ctx->Pixel.ZoomX;
+         for (j = (GLint) zoomed.start; j < (GLint) zoomed.end; j++) {
+            i = (GLint) ((j + skipCol) * xscale);
+            if (ctx->Pixel.ZoomX < 0.0) {
+               ASSERT(i <= 0);
+               i = span->end + i - 1;
+            }
+            ASSERT(i >= 0);
+            ASSERT(i < (GLint) span->end);
+            zoomed.array->rgba[j][0] = rgb[i][0];
+            zoomed.array->rgba[j][1] = rgb[i][1];
+            zoomed.array->rgba[j][2] = rgb[i][2];
+            zoomed.array->rgba[j][3] = CHAN_MAX;
+         }
+      }
+   }
+   else if (format == GL_COLOR_INDEX) {
+      const GLuint *indexes = (const GLuint *) src;
+      if (ctx->Pixel.ZoomX == -1.0F) {
+         /* common case */
+         for (j = (GLint) zoomed.start; j < (GLint) zoomed.end; j++) {
+            i = span->end - (j + skipCol) - 1;
+            zoomed.array->index[j] = indexes[i];
+         }
+      }
+      else {
+         /* general solution */
+         const GLfloat xscale = 1.0F / ctx->Pixel.ZoomX;
+         for (j = (GLint) zoomed.start; j < (GLint) zoomed.end; j++) {
+            i = (GLint) ((j + skipCol) * xscale);
+            if (ctx->Pixel.ZoomX < 0.0) {
+               ASSERT(i <= 0);
+               i = span->end + i - 1;
+            }
+            ASSERT(i >= 0);
+            ASSERT(i < (GLint) span->end);
+            zoomed.array->index[j] = indexes[i];
+         }
+      }
+   }
+   else {
+      const GLdepth *zValues = (const GLuint *) src;
+      assert(format == GL_DEPTH_COMPONENT);
+      if (ctx->Pixel.ZoomX == -1.0F) {
+         /* common case */
+         for (j = (GLint) zoomed.start; j < (GLint) zoomed.end; j++) {
+            i = span->end - (j + skipCol) - 1;
+            zoomed.array->z[j] = zValues[i];
+         }
+      }
+      else {
+         /* general solution */
+         const GLfloat xscale = 1.0F / ctx->Pixel.ZoomX;
+         for (j = (GLint) zoomed.start; j < (GLint) zoomed.end; j++) {
+            i = (GLint) ((j + skipCol) * xscale);
+            if (ctx->Pixel.ZoomX < 0.0) {
+               ASSERT(i <= 0);
+               i = span->end + i - 1;
+            }
+            ASSERT(i >= 0);
+            ASSERT(i < (GLint) span->end);
+            zoomed.array->z[j] = zValues[i];
+         }
+      }
+      /* Now, fall into either the RGB or COLOR_INDEX path below */
+      if (ctx->Visual.rgbMode)
+         format = GL_RGBA;
+      else
+         format = GL_COLOR_INDEX;
+   }
+
+
+   /* write the span in rows [r0, r1) */
+   if (format == GL_RGBA || format == GL_RGB) {
+      /* Writing the span may modify the colors, so make a backup now if we're
+       * going to call _swrast_write_zoomed_span() more than once.
+       * Also, clipping may change the span end value, so store it as well.
+       */
+      GLchan rgbaSave[MAX_WIDTH][4];
+      const GLint end = zoomed.end; /* save */
+      if (r1 - r0 > 1) {
+         MEMCPY(rgbaSave, zoomed.array->rgba, zoomed.end * 4 * sizeof(GLchan));
+      }
+      for (zoomed.y = r0; zoomed.y < r1; zoomed.y++) {
+         _swrast_write_rgba_span(ctx, &zoomed);
+         zoomed.end = end;  /* restore */
+         if (r1 - r0 > 1) {
+            /* restore the colors */
+            MEMCPY(zoomed.array->rgba, rgbaSave, zoomed.end*4 * sizeof(GLchan));
+         }
+      }
+   }
+   else if (format == GL_COLOR_INDEX) {
+      GLuint indexSave[MAX_WIDTH];
+      const GLint end = zoomed.end; /* save */
+      if (r1 - r0 > 1) {
+         MEMCPY(indexSave, zoomed.array->index, zoomed.end * sizeof(GLuint));
+      }
+      for (zoomed.y = r0; zoomed.y < r1; zoomed.y++) {
+         _swrast_write_index_span(ctx, &zoomed);
+         zoomed.end = end;  /* restore */
+         if (r1 - r0 > 1) {
+            /* restore the colors */
+            MEMCPY(zoomed.array->index, indexSave, zoomed.end * sizeof(GLuint));
+         }
+      }
+   }
+}
+
+
+void
+_swrast_write_zoomed_rgba_span( GLcontext *ctx, const struct sw_span *span,
+                              CONST GLchan rgba[][4], GLint y0,
+                              GLint skipPixels )
+{
+   zoom_span(ctx, span, (const GLvoid *) rgba, y0, GL_RGBA, skipPixels);
+}
+
+
+void
+_swrast_write_zoomed_rgb_span( GLcontext *ctx, const struct sw_span *span,
+                             CONST GLchan rgb[][3], GLint y0,
+                             GLint skipPixels )
+{
+   zoom_span(ctx, span, (const GLvoid *) rgb, y0, GL_RGB, skipPixels);
+}
+
+
+void
+_swrast_write_zoomed_index_span( GLcontext *ctx, const struct sw_span *span,
+                               GLint y0, GLint skipPixels )
+{
+   zoom_span(ctx, span, (const GLvoid *) span->array->index, y0,
+             GL_COLOR_INDEX, skipPixels);
+}
+
+
+void
+_swrast_write_zoomed_depth_span( GLcontext *ctx, const struct sw_span *span,
+                                 GLint y0, GLint skipPixels )
+{
+   zoom_span(ctx, span, (const GLvoid *) span->array->z, y0,
+             GL_DEPTH_COMPONENT, skipPixels);
+}
+
+
+/*
+ * As above, but write stencil values.
+ */
+void
+_swrast_write_zoomed_stencil_span( GLcontext *ctx,
+                                 GLuint n, GLint x, GLint y,
+                                 const GLstencil stencil[], GLint y0,
+                                 GLint skipPixels )
+{
+   GLint m;
+   GLint r0, r1, row, r;
+   GLint i, j, skipcol;
+   GLstencil zstencil[MAX_WIDTH];  /* zoomed stencil values */
+   GLint maxwidth = MIN2( ctx->DrawBuffer->Width, MAX_WIDTH );
+
+   (void) skipPixels;  /* XXX this shouldn't be ignored */
+
+   /* compute width of output row */
+   m = (GLint) FABSF( n * ctx->Pixel.ZoomX );
+   if (m==0) {
+      return;
+   }
+   if (ctx->Pixel.ZoomX<0.0) {
+      /* adjust x coordinate for left/right mirroring */
+      x = x - m;
+   }
+
+   /* compute which rows to draw */
+   row = y - y0;
+   r0 = y0 + (GLint) (row * ctx->Pixel.ZoomY);
+   r1 = y0 + (GLint) ((row+1) * ctx->Pixel.ZoomY);
+   if (r0==r1) {
+      return;
+   }
+   else if (r1<r0) {
+      GLint rtmp = r1;
+      r1 = r0;
+      r0 = rtmp;
+   }
+
+   /* return early if r0...r1 is above or below window */
+   if (r0<0 && r1<0) {
+      /* below window */
+      return;
+   }
+   if (r0 >= (GLint) ctx->DrawBuffer->Height &&
+       r1 >= (GLint) ctx->DrawBuffer->Height) {
+      /* above window */
+      return;
+   }
+
+   /* check if left edge is outside window */
+   skipcol = 0;
+   if (x<0) {
+      skipcol = -x;
+      m += x;
+   }
+   /* make sure span isn't too long or short */
+   if (m>maxwidth) {
+      m = maxwidth;
+   }
+   else if (m<=0) {
+      return;
+   }
+
+   ASSERT( m <= MAX_WIDTH );
+
+   /* zoom the span horizontally */
+   if (ctx->Pixel.ZoomX==-1.0F) {
+      /* n==m */
+      for (j=0;j<m;j++) {
+         i = n - (j+skipcol) - 1;
+         zstencil[j] = stencil[i];
+      }
+   }
+   else {
+      GLfloat xscale = 1.0F / ctx->Pixel.ZoomX;
+      for (j=0;j<m;j++) {
+         i = (GLint) ((j+skipcol) * xscale);
+         if (i<0)  i = n + i - 1;
+         zstencil[j] = stencil[i];
+      }
+   }
+
+   /* write the span */
+   for (r=r0; r<r1; r++) {
+      _swrast_write_stencil_span( ctx, m, x+skipcol, r, zstencil );
+   }
+}
diff --git a/reactos/lib/mesa32/src/swrast/s_zoom.h b/reactos/lib/mesa32/src/swrast/s_zoom.h
new file mode 100644
index 00000000000..aa9a891eb7f
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/s_zoom.h
@@ -0,0 +1,54 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef S_ZOOM_H
+#define S_ZOOM_H
+
+#include "mtypes.h"
+#include "swrast.h"
+
+extern void
+_swrast_write_zoomed_rgba_span( GLcontext *ctx, const struct sw_span *span,
+                                CONST GLchan rgb[][4], GLint y0,
+                                GLint skipPixels );
+
+extern void
+_swrast_write_zoomed_rgb_span( GLcontext *ctx, const struct sw_span *span,
+                               CONST GLchan rgb[][3], GLint y0,
+                               GLint skipPixels );
+
+extern void
+_swrast_write_zoomed_index_span( GLcontext *ctx, const struct sw_span *span,
+                                 GLint y0, GLint skipPixels );
+
+extern void
+_swrast_write_zoomed_depth_span( GLcontext *ctx, const struct sw_span *span,
+                                 GLint y0, GLint skipPixels );
+
+extern void
+_swrast_write_zoomed_stencil_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
+                                   const GLstencil stencil[], GLint y0,
+                                   GLint skipPixels );
+
+#endif
diff --git a/reactos/lib/mesa32/src/swrast/swrast.dsp b/reactos/lib/mesa32/src/swrast/swrast.dsp
new file mode 100644
index 00000000000..c2f4e256b91
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/swrast.dsp
@@ -0,0 +1,324 @@
+# Microsoft Developer Studio Project File - Name="swrast" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=swrast - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "swrast.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "swrast.mak" CFG="swrast - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "swrast - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "swrast - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "swrast - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "../../../include" /I "../" /I "../main" /I "../glapi" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "swrast - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../" /I "../main" /I "../glapi" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "swrast - Win32 Release"
+# Name "swrast - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\s_aaline.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_aatriangle.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_accum.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_alpha.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_alphabuf.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_bitmap.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_blend.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_buffers.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_context.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_copypix.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_depth.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_drawpix.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_feedback.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_fog.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_imaging.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_lines.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_logic.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_masking.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_nvfragprog.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_pixeltex.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_points.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_readpix.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_span.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_stencil.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_texstore.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_texture.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_triangle.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_zoom.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\s_aaline.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_aalinetemp.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_aatriangle.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_aatritemp.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_accum.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_alpha.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_alphabuf.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_blend.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_context.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_depth.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_drawpix.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_feedback.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_fog.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_lines.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_linetemp.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_logic.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_masking.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_nvfragprog.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_pixeltex.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_points.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_pointtemp.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_span.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_spantemp.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_stencil.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_texture.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_triangle.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_trispan.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_tritemp.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_zoom.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\swrast.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/reactos/lib/mesa32/src/swrast/swrast.h b/reactos/lib/mesa32/src/swrast/swrast.h
new file mode 100644
index 00000000000..e09afffe4ed
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast/swrast.h
@@ -0,0 +1,458 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+/**
+ * \file swrast/swrast.h
+ * \brief Public interface to the software rasterization functions.
+ * \author Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+#ifndef SWRAST_H
+#define SWRAST_H
+
+#include "mtypes.h"
+
+/**
+ * \struct SWvertex
+ * \brief Data-structure to handle vertices in the software rasterizer.
+ * 
+ * The software rasterizer now uses this format for vertices.  Thus a
+ * 'RasterSetup' stage or other translation is required between the
+ * tnl module and the swrast rasterization functions.  This serves to
+ * isolate the swrast module from the internals of the tnl module, and
+ * improve its usefulness as a fallback mechanism for hardware
+ * drivers.
+ *
+ * Full software drivers:
+ *   - Register the rastersetup and triangle functions from
+ *     utils/software_helper.
+ *   - On statechange, update the rasterization pointers in that module.
+ *
+ * Rasterization hardware drivers:
+ *   - Keep native rastersetup.
+ *   - Implement native twoside,offset and unfilled triangle setup.
+ *   - Implement a translator from native vertices to swrast vertices.
+ *   - On partial fallback (mix of accelerated and unaccelerated
+ *   prims), call a pass-through function which translates native
+ *   vertices to SWvertices and calls the appropriate swrast function.
+ *   - On total fallback (vertex format insufficient for state or all
+ *     primitives unaccelerated), hook in swrast_setup instead.
+ */
+typedef struct {
+   /** win[0], win[1] are the screen-coords of SWvertex. win[2] is the
+    * z-coord. what is win[3]? */
+   GLfloat win[4];
+   GLfloat texcoord[MAX_TEXTURE_COORD_UNITS][4];
+   GLchan color[4];
+   GLchan specular[4];
+   GLfloat fog;
+   GLfloat index;
+   GLfloat pointSize;
+} SWvertex;
+
+
+struct swrast_device_driver;
+
+
+/* These are the public-access functions exported from swrast.
+ */
+extern void
+_swrast_alloc_buffers( GLframebuffer *buffer );
+
+extern void
+_swrast_use_read_buffer( GLcontext *ctx );
+
+extern void
+_swrast_use_draw_buffer( GLcontext *ctx );
+
+extern GLboolean
+_swrast_CreateContext( GLcontext *ctx );
+
+extern void
+_swrast_DestroyContext( GLcontext *ctx );
+
+/* Get a (non-const) reference to the device driver struct for swrast.
+ */
+extern struct swrast_device_driver *
+_swrast_GetDeviceDriverReference( GLcontext *ctx );
+
+extern void
+_swrast_Bitmap( GLcontext *ctx,
+		GLint px, GLint py,
+		GLsizei width, GLsizei height,
+		const struct gl_pixelstore_attrib *unpack,
+		const GLubyte *bitmap );
+
+extern void
+_swrast_CopyPixels( GLcontext *ctx,
+		    GLint srcx, GLint srcy,
+		    GLint destx, GLint desty,
+		    GLsizei width, GLsizei height,
+		    GLenum type );
+
+extern void
+_swrast_DrawPixels( GLcontext *ctx,
+		    GLint x, GLint y,
+		    GLsizei width, GLsizei height,
+		    GLenum format, GLenum type,
+		    const struct gl_pixelstore_attrib *unpack,
+		    const GLvoid *pixels );
+
+extern void
+_swrast_ReadPixels( GLcontext *ctx,
+		    GLint x, GLint y, GLsizei width, GLsizei height,
+		    GLenum format, GLenum type,
+		    const struct gl_pixelstore_attrib *unpack,
+		    GLvoid *pixels );
+
+extern void
+_swrast_Clear( GLcontext *ctx, GLbitfield mask, GLboolean all,
+	       GLint x, GLint y, GLint width, GLint height );
+
+extern void
+_swrast_Accum( GLcontext *ctx, GLenum op,
+	       GLfloat value, GLint xpos, GLint ypos,
+	       GLint width, GLint height );
+
+
+extern void
+_swrast_DrawBuffer( GLcontext *ctx, GLenum mode );
+
+
+/* Reset the stipple counter
+ */
+extern void
+_swrast_ResetLineStipple( GLcontext *ctx );
+
+/* These will always render the correct point/line/triangle for the
+ * current state.
+ *
+ * For flatshaded primitives, the provoking vertex is the final one.
+ */
+extern void
+_swrast_Point( GLcontext *ctx, const SWvertex *v );
+
+extern void
+_swrast_Line( GLcontext *ctx, const SWvertex *v0, const SWvertex *v1 );
+
+extern void
+_swrast_Triangle( GLcontext *ctx, const SWvertex *v0,
+                  const SWvertex *v1, const SWvertex *v2 );
+
+extern void
+_swrast_Quad( GLcontext *ctx,
+              const SWvertex *v0, const SWvertex *v1,
+	      const SWvertex *v2,  const SWvertex *v3);
+
+extern void
+_swrast_flush( GLcontext *ctx );
+
+extern void
+_swrast_render_primitive( GLcontext *ctx, GLenum mode );
+
+extern void
+_swrast_render_start( GLcontext *ctx );
+
+extern void
+_swrast_render_finish( GLcontext *ctx );
+
+/* Tell the software rasterizer about core state changes.
+ */
+extern void
+_swrast_InvalidateState( GLcontext *ctx, GLuint new_state );
+
+/* Configure software rasterizer to match hardware rasterizer characteristics:
+ */
+extern void
+_swrast_allow_vertex_fog( GLcontext *ctx, GLboolean value );
+
+extern void
+_swrast_allow_pixel_fog( GLcontext *ctx, GLboolean value );
+
+/* Debug:
+ */
+extern void
+_swrast_print_vertex( GLcontext *ctx, const SWvertex *v );
+
+
+/*
+ * Imaging fallbacks (a better solution should be found, perhaps
+ * moving all the imaging fallback code to a new module) 
+ */
+extern void
+_swrast_CopyConvolutionFilter2D(GLcontext *ctx, GLenum target, 
+				GLenum internalFormat, 
+				GLint x, GLint y, GLsizei width, 
+				GLsizei height);
+extern void
+_swrast_CopyConvolutionFilter1D(GLcontext *ctx, GLenum target, 
+				GLenum internalFormat, 
+				GLint x, GLint y, GLsizei width);
+extern void
+_swrast_CopyColorSubTable( GLcontext *ctx,GLenum target, GLsizei start,
+			   GLint x, GLint y, GLsizei width);
+extern void
+_swrast_CopyColorTable( GLcontext *ctx, 
+			GLenum target, GLenum internalformat,
+			GLint x, GLint y, GLsizei width);
+
+
+/*
+ * Texture fallbacks.  Could also live in a new module
+ * with the rest of the texture store fallbacks?
+ */
+extern void
+_swrast_copy_teximage1d(GLcontext *ctx, GLenum target, GLint level,
+                        GLenum internalFormat,
+                        GLint x, GLint y, GLsizei width, GLint border);
+
+extern void
+_swrast_copy_teximage2d(GLcontext *ctx, GLenum target, GLint level,
+                        GLenum internalFormat,
+                        GLint x, GLint y, GLsizei width, GLsizei height,
+                        GLint border);
+
+
+extern void
+_swrast_copy_texsubimage1d(GLcontext *ctx, GLenum target, GLint level,
+                           GLint xoffset, GLint x, GLint y, GLsizei width);
+
+extern void
+_swrast_copy_texsubimage2d(GLcontext *ctx,
+                           GLenum target, GLint level,
+                           GLint xoffset, GLint yoffset,
+                           GLint x, GLint y, GLsizei width, GLsizei height);
+
+extern void
+_swrast_copy_texsubimage3d(GLcontext *ctx,
+                           GLenum target, GLint level,
+                           GLint xoffset, GLint yoffset, GLint zoffset,
+                           GLint x, GLint y, GLsizei width, GLsizei height);
+
+
+
+/* The driver interface for the software rasterizer.
+ * Unless otherwise noted, all functions are mandatory.  
+ */
+struct swrast_device_driver {
+
+   void (*SetBuffer)( GLcontext *ctx, GLframebuffer *buffer, GLuint bufferBit);
+   /*
+    * Specifies the current buffer for span/pixel writing/reading.
+    * buffer indicates which window to write to / read from.  Normally,
+    * this'll be the buffer currently bound to the context, but it doesn't
+    * have to be!
+    * bufferBit indicates which color buffer, one of:
+    *    FRONT_LEFT_BIT - this buffer always exists
+    *    BACK_LEFT_BIT - when double buffering
+    *    FRONT_RIGHT_BIT - when using stereo
+    *    BACK_RIGHT_BIT - when using stereo and double buffering
+    *    AUXn_BIT - if aux buffers are implemented
+    */
+
+
+   /***
+    *** Functions for synchronizing access to the framebuffer:
+    ***/
+
+   void (*SpanRenderStart)(GLcontext *ctx);
+   void (*SpanRenderFinish)(GLcontext *ctx);
+   /* OPTIONAL.
+    *
+    * Called before and after all rendering operations, including DrawPixels,
+    * ReadPixels, Bitmap, span functions, and CopyTexImage, etc commands.
+    * These are a suitable place for grabbing/releasing hardware locks.
+    *
+    * NOTE: The swrast triangle/line/point routines *DO NOT* call
+    * these functions.  Locking in that case must be organized by the
+    * driver by other mechanisms.
+    */
+
+   /***
+    *** Functions for writing pixels to the frame buffer:
+    ***/
+
+   void (*WriteRGBASpan)( const GLcontext *ctx,
+                          GLuint n, GLint x, GLint y,
+                          CONST GLchan rgba[][4], const GLubyte mask[] );
+   void (*WriteRGBSpan)( const GLcontext *ctx,
+                         GLuint n, GLint x, GLint y,
+                         CONST GLchan rgb[][3], const GLubyte mask[] );
+   /* Write a horizontal run of RGBA or RGB pixels.
+    * If mask is NULL, draw all pixels.
+    * If mask is not null, only draw pixel [i] when mask [i] is true.
+    */
+
+   void (*WriteMonoRGBASpan)( const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                              const GLchan color[4], const GLubyte mask[] );
+   /* Write a horizontal run of RGBA pixels all with the same color.
+    * If mask is NULL, draw all pixels.
+    * If mask is not null, only draw pixel [i] when mask [i] is true.
+    */
+
+   void (*WriteRGBAPixels)( const GLcontext *ctx,
+                            GLuint n, const GLint x[], const GLint y[],
+                            CONST GLchan rgba[][4], const GLubyte mask[] );
+   /* Write array of RGBA pixels at random locations.
+    */
+
+   void (*WriteMonoRGBAPixels)( const GLcontext *ctx,
+                                GLuint n, const GLint x[], const GLint y[],
+                                const GLchan color[4], const GLubyte mask[] );
+   /* Write an array of mono-RGBA pixels at random locations.
+    */
+
+   void (*WriteCI32Span)( const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                          const GLuint index[], const GLubyte mask[] );
+   void (*WriteCI8Span)( const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                         const GLubyte index[], const GLubyte mask[] );
+   /* Write a horizontal run of CI pixels.  One function is for 32bpp
+    * indexes and the other for 8bpp pixels (the common case).  You mus
+    * implement both for color index mode.
+    * If mask is NULL, draw all pixels.
+    * If mask is not null, only draw pixel [i] when mask [i] is true.
+    */
+
+   void (*WriteMonoCISpan)( const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                            GLuint colorIndex, const GLubyte mask[] );
+   /* Write a horizontal run of color index pixels using the color index
+    * last specified by the Index() function.
+    * If mask is NULL, draw all pixels.
+    * If mask is not null, only draw pixel [i] when mask [i] is true.
+    */
+
+   void (*WriteCI32Pixels)( const GLcontext *ctx,
+                            GLuint n, const GLint x[], const GLint y[],
+                            const GLuint index[], const GLubyte mask[] );
+   /*
+    * Write a random array of CI pixels.
+    */
+
+   void (*WriteMonoCIPixels)( const GLcontext *ctx,
+                              GLuint n, const GLint x[], const GLint y[],
+                              GLuint colorIndex, const GLubyte mask[] );
+   /* Write a random array of color index pixels using the color index
+    * last specified by the Index() function.
+    */
+
+
+   /***
+    *** Functions to read pixels from frame buffer:
+    ***/
+
+   void (*ReadCI32Span)( const GLcontext *ctx,
+                         GLuint n, GLint x, GLint y, GLuint index[] );
+   /* Read a horizontal run of color index pixels.
+    */
+
+   void (*ReadRGBASpan)( const GLcontext *ctx, GLuint n, GLint x, GLint y,
+                         GLchan rgba[][4] );
+   /* Read a horizontal run of RGBA pixels.
+    */
+
+   void (*ReadCI32Pixels)( const GLcontext *ctx,
+                           GLuint n, const GLint x[], const GLint y[],
+                           GLuint indx[], const GLubyte mask[] );
+   /* Read a random array of CI pixels.
+    */
+
+   void (*ReadRGBAPixels)( const GLcontext *ctx,
+                           GLuint n, const GLint x[], const GLint y[],
+                           GLchan rgba[][4], const GLubyte mask[] );
+   /* Read a random array of RGBA pixels.
+    */
+
+
+
+   /***
+    *** For supporting hardware Z buffers:
+    *** Either ALL or NONE of these functions must be implemented!
+    *** NOTE that Each depth value is a 32-bit GLuint.  If the depth
+    *** buffer is less than 32 bits deep then the extra upperbits are zero.
+    ***/
+
+   void (*WriteDepthSpan)( GLcontext *ctx, GLuint n, GLint x, GLint y,
+                           const GLdepth depth[], const GLubyte mask[] );
+   /* Write a horizontal span of values into the depth buffer.  Only write
+    * depth[i] value if mask[i] is nonzero.
+    */
+
+   void (*ReadDepthSpan)( GLcontext *ctx, GLuint n, GLint x, GLint y,
+                          GLdepth depth[] );
+   /* Read a horizontal span of values from the depth buffer.
+    */
+
+
+   void (*WriteDepthPixels)( GLcontext *ctx, GLuint n,
+                             const GLint x[], const GLint y[],
+                             const GLdepth depth[], const GLubyte mask[] );
+   /* Write an array of randomly positioned depth values into the
+    * depth buffer.  Only write depth[i] value if mask[i] is nonzero.
+    */
+
+   void (*ReadDepthPixels)( GLcontext *ctx, GLuint n,
+                            const GLint x[], const GLint y[],
+                            GLdepth depth[] );
+   /* Read an array of randomly positioned depth values from the depth buffer.
+    */
+
+
+
+   /***
+    *** For supporting hardware stencil buffers:
+    *** Either ALL or NONE of these functions must be implemented!
+    ***/
+
+   void (*WriteStencilSpan)( GLcontext *ctx, GLuint n, GLint x, GLint y,
+                             const GLstencil stencil[], const GLubyte mask[] );
+   /* Write a horizontal span of stencil values into the stencil buffer.
+    * If mask is NULL, write all stencil values.
+    * Else, only write stencil[i] if mask[i] is non-zero.
+    */
+
+   void (*ReadStencilSpan)( GLcontext *ctx, GLuint n, GLint x, GLint y,
+                            GLstencil stencil[] );
+   /* Read a horizontal span of stencil values from the stencil buffer.
+    */
+
+   void (*WriteStencilPixels)( GLcontext *ctx, GLuint n,
+                               const GLint x[], const GLint y[],
+                               const GLstencil stencil[],
+                               const GLubyte mask[] );
+   /* Write an array of stencil values into the stencil buffer.
+    * If mask is NULL, write all stencil values.
+    * Else, only write stencil[i] if mask[i] is non-zero.
+    */
+
+   void (*ReadStencilPixels)( GLcontext *ctx, GLuint n,
+                              const GLint x[], const GLint y[],
+                              GLstencil stencil[] );
+   /* Read an array of stencil values from the stencil buffer.
+    */
+};
+
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/swrast_setup/ss_context.c b/reactos/lib/mesa32/src/swrast_setup/ss_context.c
new file mode 100644
index 00000000000..b9b76eaa4da
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast_setup/ss_context.c
@@ -0,0 +1,250 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0.1
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+#include "glheader.h"
+#include "imports.h"
+#include "colormac.h"
+#include "ss_context.h"
+#include "ss_triangle.h"
+#include "swrast_setup.h"
+#include "tnl/tnl.h"
+#include "tnl/t_context.h"
+#include "tnl/t_pipeline.h"
+#include "tnl/t_vertex.h"
+
+/* Need to check lighting state and vertex program state to know
+ * if two-sided lighting is in effect.
+ */
+#define _SWSETUP_NEW_RENDERINDEX (_NEW_POLYGON|_NEW_LIGHT|_NEW_PROGRAM)
+
+
+GLboolean
+_swsetup_CreateContext( GLcontext *ctx )
+{
+   SScontext *swsetup = (SScontext *)CALLOC(sizeof(SScontext));
+
+   if (!swsetup)
+      return GL_FALSE;
+
+   ctx->swsetup_context = swsetup;
+
+   swsetup->NewState = ~0;
+   _swsetup_trifuncs_init( ctx );
+
+   _tnl_init_vertices( ctx, ctx->Const.MaxArrayLockSize + 12, 
+		       sizeof(SWvertex) );
+
+
+   return GL_TRUE;
+}
+
+void
+_swsetup_DestroyContext( GLcontext *ctx )
+{
+   SScontext *swsetup = SWSETUP_CONTEXT(ctx);
+
+   if (swsetup) {
+      FREE(swsetup);
+      ctx->swsetup_context = 0;
+   }
+
+   _tnl_free_vertices( ctx );
+}
+
+static void
+_swsetup_RenderPrimitive( GLcontext *ctx, GLenum mode )
+{
+   SWSETUP_CONTEXT(ctx)->render_prim = mode;
+   _swrast_render_primitive( ctx, mode );
+}
+
+#define SWZ ((SWvertex *)0)
+#define SWOffset(MEMBER) (((char *)&(SWZ->MEMBER)) - ((char *)SWZ))
+
+#define EMIT_ATTR( ATTR, STYLE, MEMBER )	\
+do {						\
+   map[e].attrib = (ATTR);			\
+   map[e].format = (STYLE);			\
+   map[e].offset = SWOffset(MEMBER);	       	\
+   e++;						\
+} while (0)
+
+
+/*
+ * We patch this function into tnl->Driver.Render.Start.
+ * It's called when we start rendering a vertex buffer.
+ */
+static void
+_swsetup_RenderStart( GLcontext *ctx )
+{
+   SScontext *swsetup = SWSETUP_CONTEXT(ctx);
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct vertex_buffer *VB = &tnl->vb;
+   GLuint new_state = swsetup->NewState;
+
+   if (new_state & _SWSETUP_NEW_RENDERINDEX) {
+      _swsetup_choose_trifuncs( ctx );
+   }
+
+   swsetup->NewState = 0;
+
+   _swrast_render_start( ctx );
+
+   /* Important:
+    */
+   VB->AttribPtr[VERT_ATTRIB_POS] = VB->NdcPtr;
+
+
+   if (tnl->render_inputs != swsetup->last_index) {
+      GLuint index = tnl->render_inputs;
+      struct tnl_attr_map map[_TNL_ATTRIB_MAX];
+      int i, e = 0;
+
+      EMIT_ATTR( _TNL_ATTRIB_POS, EMIT_4F_VIEWPORT, win );
+   
+      if (index & _TNL_BIT_COLOR0)
+	 EMIT_ATTR( _TNL_ATTRIB_COLOR0, EMIT_4CHAN_4F_RGBA, color );
+
+      if (index & _TNL_BIT_COLOR1)
+	 EMIT_ATTR( _TNL_ATTRIB_COLOR1, EMIT_4CHAN_4F_RGBA, specular);
+
+      if (index & _TNL_BIT_FOG) 
+	 EMIT_ATTR( _TNL_ATTRIB_FOG, EMIT_1F, fog);
+	 
+      if (index & _TNL_BITS_TEX_ANY) {
+	 for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++) {
+	    if (index & _TNL_BIT_TEX(i)) {
+	       EMIT_ATTR( _TNL_ATTRIB_TEX0+i, EMIT_4F, texcoord[i] );
+	    }
+	 }
+      }
+      
+      if (index & _TNL_BIT_INDEX) 
+	 EMIT_ATTR( _TNL_ATTRIB_INDEX, EMIT_1F, index );
+ 
+      if (index & _TNL_BIT_POINTSIZE)
+	 EMIT_ATTR( _TNL_ATTRIB_POINTSIZE, EMIT_1F, pointSize );
+   
+      _tnl_install_attrs( ctx, map, e,
+			  ctx->Viewport._WindowMap.m,
+			  sizeof(SWvertex) ); 
+      
+      swsetup->last_index = index;
+   }
+
+}
+
+/*
+ * We patch this function into tnl->Driver.Render.Finish.
+ * It's called when we finish rendering a vertex buffer.
+ */
+static void
+_swsetup_RenderFinish( GLcontext *ctx )
+{
+   _swrast_render_finish( ctx );
+}
+
+void
+_swsetup_InvalidateState( GLcontext *ctx, GLuint new_state )
+{
+   SScontext *swsetup = SWSETUP_CONTEXT(ctx);
+   swsetup->NewState |= new_state;
+   _tnl_invalidate_vertex_state( ctx, new_state );
+}
+
+
+void
+_swsetup_Wakeup( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   SScontext *swsetup = SWSETUP_CONTEXT(ctx);
+
+   tnl->Driver.Render.Start = _swsetup_RenderStart;
+   tnl->Driver.Render.Finish = _swsetup_RenderFinish;
+   tnl->Driver.Render.PrimitiveNotify = _swsetup_RenderPrimitive;
+   tnl->Driver.Render.Interp = _tnl_interp;
+   tnl->Driver.Render.CopyPV = _tnl_copy_pv;
+   tnl->Driver.Render.ClippedPolygon = _tnl_RenderClippedPolygon; /* new */
+   tnl->Driver.Render.ClippedLine = _tnl_RenderClippedLine; /* new */
+   /* points */
+   /* line */
+   /* triangle */
+   /* quad */
+   tnl->Driver.Render.PrimTabVerts = _tnl_render_tab_verts;
+   tnl->Driver.Render.PrimTabElts = _tnl_render_tab_elts;
+   tnl->Driver.Render.ResetLineStipple = _swrast_ResetLineStipple;
+   tnl->Driver.Render.BuildVertices = _tnl_build_vertices;
+   tnl->Driver.Render.Multipass = 0;
+
+   _tnl_invalidate_vertices( ctx, ~0 );
+   _tnl_need_projected_coords( ctx, GL_TRUE );
+   _swsetup_InvalidateState( ctx, ~0 );
+
+   swsetup->verts = (SWvertex *)tnl->clipspace.vertex_buf;
+   swsetup->last_index = 0;
+}
+
+
+
+
+
+/* Populate a swrast SWvertex from an attrib-style vertex.
+ */
+void 
+_swsetup_Translate( GLcontext *ctx, const void *vertex, SWvertex *dest )
+{
+   const GLfloat *m = ctx->Viewport._WindowMap.m;
+   GLfloat tmp[4];
+   GLuint i;
+
+   _tnl_get_attr( ctx, vertex, _TNL_ATTRIB_POS, tmp );
+
+   dest->win[0] = m[0]  * tmp[0] + m[12];
+   dest->win[1] = m[5]  * tmp[1] + m[13];
+   dest->win[2] = m[10] * tmp[2] + m[14];
+   dest->win[3] =         tmp[3];
+
+
+   for (i = 0 ; i < ctx->Const.MaxTextureUnits ; i++)
+      _tnl_get_attr( ctx, vertex, _TNL_ATTRIB_TEX0+i, dest->texcoord[i] );
+	  
+   _tnl_get_attr( ctx, vertex, _TNL_ATTRIB_COLOR0, tmp );
+   UNCLAMPED_FLOAT_TO_RGBA_CHAN( dest->color, tmp );
+
+   _tnl_get_attr( ctx, vertex, _TNL_ATTRIB_COLOR1, tmp );
+   UNCLAMPED_FLOAT_TO_RGBA_CHAN( dest->specular, tmp );
+
+   _tnl_get_attr( ctx, vertex, _TNL_ATTRIB_FOG, tmp );
+   dest->fog = tmp[0];
+
+   _tnl_get_attr( ctx, vertex, _TNL_ATTRIB_INDEX, tmp );
+   dest->index = (GLuint) tmp[0];
+
+   _tnl_get_attr( ctx, vertex, _TNL_ATTRIB_POINTSIZE, tmp );
+   dest->pointSize = tmp[0];
+}
+
diff --git a/reactos/lib/mesa32/src/swrast_setup/ss_context.h b/reactos/lib/mesa32/src/swrast_setup/ss_context.h
new file mode 100644
index 00000000000..2c6e4faf3da
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast_setup/ss_context.h
@@ -0,0 +1,45 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+#ifndef SS_CONTEXT_H
+#define SS_CONTEXT_H
+
+#include "mtypes.h"
+#include "swrast/swrast.h"
+#include "swrast_setup.h"
+
+typedef struct {
+   GLuint NewState;
+   GLenum render_prim;
+   GLuint last_index;
+   SWvertex *verts;
+} SScontext;
+
+#define SWSETUP_CONTEXT(ctx) ((SScontext *)ctx->swsetup_context)
+
+#endif
diff --git a/reactos/lib/mesa32/src/swrast_setup/ss_triangle.c b/reactos/lib/mesa32/src/swrast_setup/ss_triangle.c
new file mode 100644
index 00000000000..88ae07f5397
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast_setup/ss_triangle.c
@@ -0,0 +1,314 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+#include "glheader.h"
+#include "colormac.h"
+#include "macros.h"
+#include "mtypes.h"
+
+#include "tnl/t_context.h"
+
+#include "ss_triangle.h"
+#include "ss_context.h"
+
+#define SS_RGBA_BIT         0x1
+#define SS_OFFSET_BIT	    0x2
+#define SS_TWOSIDE_BIT	    0x4
+#define SS_UNFILLED_BIT	    0x8
+#define SS_MAX_TRIFUNC      0x10
+
+static triangle_func tri_tab[SS_MAX_TRIFUNC];
+static quad_func     quad_tab[SS_MAX_TRIFUNC];
+
+
+static void _swsetup_render_line_tri( GLcontext *ctx,
+				      GLuint e0, GLuint e1, GLuint e2,
+                                      GLuint facing )
+{
+   SScontext *swsetup = SWSETUP_CONTEXT(ctx);
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+   GLubyte *ef = VB->EdgeFlag;
+   SWvertex *verts = swsetup->verts;
+   SWvertex *v0 = &verts[e0];
+   SWvertex *v1 = &verts[e1];
+   SWvertex *v2 = &verts[e2];
+   GLchan c[2][4];
+   GLchan s[2][4];
+   GLuint i[2];
+
+   /* cull testing */
+   if (ctx->Polygon.CullFlag) {
+      if (facing == 1 && ctx->Polygon.CullFaceMode != GL_FRONT)
+         return;
+      if (facing == 0 && ctx->Polygon.CullFaceMode != GL_BACK)
+         return;
+   }
+
+   if (ctx->Light.ShadeModel == GL_FLAT) {
+      COPY_CHAN4(c[0], v0->color);
+      COPY_CHAN4(c[1], v1->color);
+      COPY_CHAN4(s[0], v0->specular);
+      COPY_CHAN4(s[1], v1->specular);
+      i[0] = v0->index;
+      i[1] = v1->index;
+
+      COPY_CHAN4(v0->color, v2->color);
+      COPY_CHAN4(v1->color, v2->color);
+      COPY_CHAN4(v0->specular, v2->specular);
+      COPY_CHAN4(v1->specular, v2->specular);
+      v0->index = v2->index;
+      v1->index = v2->index;
+   }
+
+   if (swsetup->render_prim == GL_POLYGON) {
+      if (ef[e2]) _swrast_Line( ctx, v2, v0 );
+      if (ef[e0]) _swrast_Line( ctx, v0, v1 );
+      if (ef[e1]) _swrast_Line( ctx, v1, v2 );
+   } else {
+      if (ef[e0]) _swrast_Line( ctx, v0, v1 );
+      if (ef[e1]) _swrast_Line( ctx, v1, v2 );
+      if (ef[e2]) _swrast_Line( ctx, v2, v0 );
+   }
+
+   if (ctx->Light.ShadeModel == GL_FLAT) {
+      COPY_CHAN4(v0->color, c[0]);
+      COPY_CHAN4(v1->color, c[1]);
+      COPY_CHAN4(v0->specular, s[0]);
+      COPY_CHAN4(v1->specular, s[1]);
+      v0->index = i[0];
+      v1->index = i[1];
+   }
+}
+
+static void _swsetup_render_point_tri( GLcontext *ctx,
+				       GLuint e0, GLuint e1, GLuint e2,
+                                       GLuint facing )
+{
+   SScontext *swsetup = SWSETUP_CONTEXT(ctx);
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+   GLubyte *ef = VB->EdgeFlag;
+   SWvertex *verts = swsetup->verts;
+   SWvertex *v0 = &verts[e0];
+   SWvertex *v1 = &verts[e1];
+   SWvertex *v2 = &verts[e2];
+   GLchan c[2][4];
+   GLchan s[2][4];
+   GLuint i[2];
+
+   /* cull testing */
+   if (ctx->Polygon.CullFlag) {
+      if (facing == 1 && ctx->Polygon.CullFaceMode != GL_FRONT)
+         return;
+      if (facing == 0 && ctx->Polygon.CullFaceMode != GL_BACK)
+         return;
+   }
+
+   if (ctx->Light.ShadeModel == GL_FLAT) {
+      /* save colors/indexes for v0, v1 vertices */
+      COPY_CHAN4(c[0], v0->color);
+      COPY_CHAN4(c[1], v1->color);
+      COPY_CHAN4(s[0], v0->specular);
+      COPY_CHAN4(s[1], v1->specular);
+      i[0] = v0->index;
+      i[1] = v1->index;
+
+      /* copy v2 color/indexes to v0, v1 indexes */
+      COPY_CHAN4(v0->color, v2->color);
+      COPY_CHAN4(v1->color, v2->color);
+      COPY_CHAN4(v0->specular, v2->specular);
+      COPY_CHAN4(v1->specular, v2->specular);
+      v0->index = v2->index;
+      v1->index = v2->index;
+   }
+
+   if (ef[e0]) _swrast_Point( ctx, v0 );
+   if (ef[e1]) _swrast_Point( ctx, v1 );
+   if (ef[e2]) _swrast_Point( ctx, v2 );
+
+   if (ctx->Light.ShadeModel == GL_FLAT) {
+      /* restore v0, v1 colores/indexes */
+      COPY_CHAN4(v0->color, c[0]);
+      COPY_CHAN4(v1->color, c[1]);
+      COPY_CHAN4(v0->specular, s[0]);
+      COPY_CHAN4(v1->specular, s[1]);
+      v0->index = i[0];
+      v1->index = i[1];
+   }
+   _swrast_flush(ctx);
+}
+
+#define SS_COLOR(a,b) UNCLAMPED_FLOAT_TO_RGBA_CHAN(a,b)
+#define SS_SPEC(a,b) UNCLAMPED_FLOAT_TO_RGB_CHAN(a,b)
+#define SS_IND(a,b) (a = b)
+
+#define IND (0)
+#define TAG(x) x
+#include "ss_tritmp.h"
+
+#define IND (SS_OFFSET_BIT)
+#define TAG(x) x##_offset
+#include "ss_tritmp.h"
+
+#define IND (SS_TWOSIDE_BIT)
+#define TAG(x) x##_twoside
+#include "ss_tritmp.h"
+
+#define IND (SS_OFFSET_BIT|SS_TWOSIDE_BIT)
+#define TAG(x) x##_offset_twoside
+#include "ss_tritmp.h"
+
+#define IND (SS_UNFILLED_BIT)
+#define TAG(x) x##_unfilled
+#include "ss_tritmp.h"
+
+#define IND (SS_OFFSET_BIT|SS_UNFILLED_BIT)
+#define TAG(x) x##_offset_unfilled
+#include "ss_tritmp.h"
+
+#define IND (SS_TWOSIDE_BIT|SS_UNFILLED_BIT)
+#define TAG(x) x##_twoside_unfilled
+#include "ss_tritmp.h"
+
+#define IND (SS_OFFSET_BIT|SS_TWOSIDE_BIT|SS_UNFILLED_BIT)
+#define TAG(x) x##_offset_twoside_unfilled
+#include "ss_tritmp.h"
+
+#define IND (0|SS_RGBA_BIT)
+#define TAG(x) x##_rgba
+#include "ss_tritmp.h"
+
+#define IND (SS_OFFSET_BIT|SS_RGBA_BIT)
+#define TAG(x) x##_offset_rgba
+#include "ss_tritmp.h"
+
+#define IND (SS_TWOSIDE_BIT|SS_RGBA_BIT)
+#define TAG(x) x##_twoside_rgba
+#include "ss_tritmp.h"
+
+#define IND (SS_OFFSET_BIT|SS_TWOSIDE_BIT|SS_RGBA_BIT)
+#define TAG(x) x##_offset_twoside_rgba
+#include "ss_tritmp.h"
+
+#define IND (SS_UNFILLED_BIT|SS_RGBA_BIT)
+#define TAG(x) x##_unfilled_rgba
+#include "ss_tritmp.h"
+
+#define IND (SS_OFFSET_BIT|SS_UNFILLED_BIT|SS_RGBA_BIT)
+#define TAG(x) x##_offset_unfilled_rgba
+#include "ss_tritmp.h"
+
+#define IND (SS_TWOSIDE_BIT|SS_UNFILLED_BIT|SS_RGBA_BIT)
+#define TAG(x) x##_twoside_unfilled_rgba
+#include "ss_tritmp.h"
+
+#define IND (SS_OFFSET_BIT|SS_TWOSIDE_BIT|SS_UNFILLED_BIT|SS_RGBA_BIT)
+#define TAG(x) x##_offset_twoside_unfilled_rgba
+#include "ss_tritmp.h"
+
+
+void _swsetup_trifuncs_init( GLcontext *ctx )
+{
+   (void) ctx;
+
+   init();
+   init_offset();
+   init_twoside();
+   init_offset_twoside();
+   init_unfilled();
+   init_offset_unfilled();
+   init_twoside_unfilled();
+   init_offset_twoside_unfilled();
+
+   init_rgba();
+   init_offset_rgba();
+   init_twoside_rgba();
+   init_offset_twoside_rgba();
+   init_unfilled_rgba();
+   init_offset_unfilled_rgba();
+   init_twoside_unfilled_rgba();
+   init_offset_twoside_unfilled_rgba();
+}
+
+
+static void swsetup_points( GLcontext *ctx, GLuint first, GLuint last )
+{
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+   SWvertex *verts = SWSETUP_CONTEXT(ctx)->verts;
+   GLuint i;
+
+   if (VB->Elts) {
+      for (i = first; i < last; i++)
+	 if (VB->ClipMask[VB->Elts[i]] == 0)
+	    _swrast_Point( ctx, &verts[VB->Elts[i]] );
+   }
+   else {
+      for (i = first; i < last; i++)
+	 if (VB->ClipMask[i] == 0)
+	    _swrast_Point( ctx, &verts[i] );
+   }
+}
+
+static void swsetup_line( GLcontext *ctx, GLuint v0, GLuint v1 )
+{
+   SWvertex *verts = SWSETUP_CONTEXT(ctx)->verts;
+   _swrast_Line( ctx, &verts[v0], &verts[v1] );
+}
+
+
+
+void _swsetup_choose_trifuncs( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   GLuint ind = 0;
+
+   if (ctx->Polygon.OffsetPoint ||
+       ctx->Polygon.OffsetLine ||
+       ctx->Polygon.OffsetFill)
+      ind |= SS_OFFSET_BIT;
+
+   if ((ctx->Light.Enabled && ctx->Light.Model.TwoSide) ||
+       (ctx->VertexProgram.Enabled && ctx->VertexProgram.TwoSideEnabled))
+      ind |= SS_TWOSIDE_BIT;
+
+   /* We piggyback the two-sided stencil front/back determination on the
+    * unfilled triangle path.
+    */
+   if (ctx->Polygon.FrontMode != GL_FILL ||
+       ctx->Polygon.BackMode != GL_FILL ||
+       (ctx->Stencil.Enabled && ctx->Stencil.TestTwoSide))
+      ind |= SS_UNFILLED_BIT;
+
+   if (ctx->Visual.rgbMode)
+      ind |= SS_RGBA_BIT;
+
+   tnl->Driver.Render.Triangle = tri_tab[ind];
+   tnl->Driver.Render.Quad = quad_tab[ind];
+   tnl->Driver.Render.Line = swsetup_line;
+   tnl->Driver.Render.Points = swsetup_points;
+
+   ctx->_Facing = 0;
+}
diff --git a/reactos/lib/mesa32/src/swrast_setup/ss_triangle.h b/reactos/lib/mesa32/src/swrast_setup/ss_triangle.h
new file mode 100644
index 00000000000..78833269e6e
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast_setup/ss_triangle.h
@@ -0,0 +1,39 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+#ifndef SS_TRIANGLE_H
+#define SS_TRIANGLE_H
+
+#include "mtypes.h"
+#include "ss_context.h"
+
+
+void _swsetup_trifuncs_init( GLcontext *ctx );
+void _swsetup_choose_trifuncs( GLcontext *ctx );
+
+#endif
diff --git a/reactos/lib/mesa32/src/swrast_setup/ss_tritmp.h b/reactos/lib/mesa32/src/swrast_setup/ss_tritmp.h
new file mode 100644
index 00000000000..cc02a992ee4
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast_setup/ss_tritmp.h
@@ -0,0 +1,209 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.0
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+
+static void TAG(triangle)(GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 )
+{
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+   SWvertex *verts = SWSETUP_CONTEXT(ctx)->verts;
+   SWvertex *v[3];
+   GLfloat z[3];
+   GLfloat offset;
+   GLenum mode = GL_FILL;
+   GLuint facing = 0;
+   GLchan saved_color[3][4];
+   GLchan saved_spec[3][4];
+   GLuint saved_index[3];
+
+   v[0] = &verts[e0];
+   v[1] = &verts[e1];
+   v[2] = &verts[e2];
+
+
+   if (IND & (SS_TWOSIDE_BIT | SS_OFFSET_BIT | SS_UNFILLED_BIT))
+   {
+      GLfloat ex = v[0]->win[0] - v[2]->win[0];
+      GLfloat ey = v[0]->win[1] - v[2]->win[1];
+      GLfloat fx = v[1]->win[0] - v[2]->win[0];
+      GLfloat fy = v[1]->win[1] - v[2]->win[1];
+      GLfloat cc  = ex*fy - ey*fx;
+
+      if (IND & (SS_TWOSIDE_BIT | SS_UNFILLED_BIT))
+      {
+	 facing = (cc < 0.0) ^ ctx->Polygon._FrontBit;
+         if (ctx->Stencil.TestTwoSide)
+            ctx->_Facing = facing; /* for 2-sided stencil test */
+
+	 if (IND & SS_UNFILLED_BIT)
+	    mode = facing ? ctx->Polygon.BackMode : ctx->Polygon.FrontMode;
+
+	 if (facing == 1) {
+	    if (IND & SS_TWOSIDE_BIT) {
+	       if (IND & SS_RGBA_BIT) {
+		  GLfloat (*vbcolor)[4] = VB->ColorPtr[1]->data;
+
+		  COPY_CHAN4(saved_color[0], v[0]->color);
+		  COPY_CHAN4(saved_color[1], v[1]->color);
+		  COPY_CHAN4(saved_color[2], v[2]->color);
+
+		  SS_COLOR(v[0]->color, vbcolor[e0]);
+		  SS_COLOR(v[1]->color, vbcolor[e1]);
+		  SS_COLOR(v[2]->color, vbcolor[e2]);
+
+		  if (VB->SecondaryColorPtr[1]) {
+		     GLfloat (*vbspec)[4] = VB->SecondaryColorPtr[1]->data;
+
+		     COPY_CHAN4(saved_spec[0], v[0]->specular);
+		     COPY_CHAN4(saved_spec[1], v[1]->specular);
+		     COPY_CHAN4(saved_spec[2], v[2]->specular);
+
+		     SS_SPEC(v[0]->specular, vbspec[e0]);
+		     SS_SPEC(v[1]->specular, vbspec[e1]);
+		     SS_SPEC(v[2]->specular, vbspec[e2]);
+		  }
+	       } else {
+		  GLfloat *vbindex = (GLfloat *)VB->IndexPtr[1]->data;
+		  saved_index[0] = v[0]->index;
+		  saved_index[1] = v[1]->index;
+		  saved_index[2] = v[2]->index;
+		  
+		  SS_IND(v[0]->index, (GLuint) vbindex[e0]);
+		  SS_IND(v[1]->index, (GLuint) vbindex[e1]);
+		  SS_IND(v[2]->index, (GLuint) vbindex[e2]);
+	       }
+	    }
+	 }
+      }
+
+      if (IND & SS_OFFSET_BIT)
+      {
+	 offset = ctx->Polygon.OffsetUnits;
+	 z[0] = v[0]->win[2];
+	 z[1] = v[1]->win[2];
+	 z[2] = v[2]->win[2];
+	 if (cc * cc > 1e-16) {
+	    GLfloat ez = z[0] - z[2];
+	    GLfloat fz = z[1] - z[2];
+	    GLfloat a = ey*fz - ez*fy;
+	    GLfloat b = ez*fx - ex*fz;
+	    GLfloat ic = 1.0F / cc;
+	    GLfloat ac = a * ic;
+	    GLfloat bc = b * ic;
+	    if (ac < 0.0F) ac = -ac;
+	    if (bc < 0.0F) bc = -bc;
+	    offset += MAX2(ac, bc) * ctx->Polygon.OffsetFactor;
+	 }
+         offset *= ctx->MRD;
+         /*printf("offset %g\n", offset);*/
+      }
+   }
+
+   if (mode == GL_POINT) {
+      if ((IND & SS_OFFSET_BIT) && ctx->Polygon.OffsetPoint) {
+	 v[0]->win[2] += offset;
+	 v[1]->win[2] += offset;
+	 v[2]->win[2] += offset;
+      }
+      _swsetup_render_point_tri( ctx, e0, e1, e2, facing );
+   } else if (mode == GL_LINE) {
+      if ((IND & SS_OFFSET_BIT) && ctx->Polygon.OffsetLine) {
+	 v[0]->win[2] += offset;
+	 v[1]->win[2] += offset;
+	 v[2]->win[2] += offset;
+      }
+      _swsetup_render_line_tri( ctx, e0, e1, e2, facing );
+   } else {
+      if ((IND & SS_OFFSET_BIT) && ctx->Polygon.OffsetFill) {
+	 v[0]->win[2] += offset;
+	 v[1]->win[2] += offset;
+	 v[2]->win[2] += offset;
+      }
+      _swrast_Triangle( ctx, v[0], v[1], v[2] );
+   }
+
+   if (IND & SS_OFFSET_BIT) {
+      v[0]->win[2] = z[0];
+      v[1]->win[2] = z[1];
+      v[2]->win[2] = z[2];
+   }
+
+   if (IND & SS_TWOSIDE_BIT) {
+      if (facing == 1) {
+	 if (IND & SS_RGBA_BIT) {
+	    COPY_CHAN4(v[0]->color, saved_color[0]);
+	    COPY_CHAN4(v[1]->color, saved_color[1]);
+	    COPY_CHAN4(v[2]->color, saved_color[2]);
+	    if (VB->SecondaryColorPtr[1]) {
+	       COPY_CHAN4(v[0]->specular, saved_spec[0]);
+	       COPY_CHAN4(v[1]->specular, saved_spec[1]);
+	       COPY_CHAN4(v[2]->specular, saved_spec[2]);
+	    }
+	 } else {
+	    v[0]->index = saved_index[0];
+	    v[1]->index = saved_index[1];
+	    v[2]->index = saved_index[2];
+	 }
+      }
+   }
+}
+
+
+
+/* Need to fixup edgeflags when decomposing to triangles:
+ */
+static void TAG(quadfunc)( GLcontext *ctx, GLuint v0,
+		       GLuint v1, GLuint v2, GLuint v3 )
+{
+   if (IND & SS_UNFILLED_BIT) {
+      struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+      GLubyte ef1 = VB->EdgeFlag[v1];
+      GLubyte ef3 = VB->EdgeFlag[v3];
+      VB->EdgeFlag[v1] = 0;
+      TAG(triangle)( ctx, v0, v1, v3 );
+      VB->EdgeFlag[v1] = ef1;
+      VB->EdgeFlag[v3] = 0;
+      TAG(triangle)( ctx, v1, v2, v3 );
+      VB->EdgeFlag[v3] = ef3;
+   } else {
+      TAG(triangle)( ctx, v0, v1, v3 );
+      TAG(triangle)( ctx, v1, v2, v3 );
+   }
+}
+
+
+
+
+static void TAG(init)( void )
+{
+   tri_tab[IND] = TAG(triangle);
+   quad_tab[IND] = TAG(quadfunc);
+}
+
+
+#undef IND
+#undef TAG
diff --git a/reactos/lib/mesa32/src/swrast_setup/ss_vb.h b/reactos/lib/mesa32/src/swrast_setup/ss_vb.h
new file mode 100644
index 00000000000..6ea0cb1a704
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast_setup/ss_vb.h
@@ -0,0 +1,38 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+#ifndef SS_VB_H
+#define SS_VB_H
+
+#include "mtypes.h"
+#include "swrast_setup.h"
+
+void _swsetup_vb_init( GLcontext *ctx );
+void _swsetup_choose_rastersetup_func( GLcontext *ctx );
+
+#endif
diff --git a/reactos/lib/mesa32/src/swrast_setup/swrast_setup.dsp b/reactos/lib/mesa32/src/swrast_setup/swrast_setup.dsp
new file mode 100644
index 00000000000..feb8bd663b9
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast_setup/swrast_setup.dsp
@@ -0,0 +1,124 @@
+# Microsoft Developer Studio Project File - Name="swrast_setup" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=swrast_setup - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "swrast_setup.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "swrast_setup.mak" CFG="swrast_setup - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "swrast_setup - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "swrast_setup - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "swrast_setup - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "../../../include" /I "../" /I "../main" /I "../glapi" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "swrast_setup - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../" /I "../main" /I "../glapi" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "swrast_setup - Win32 Release"
+# Name "swrast_setup - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\ss_context.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ss_triangle.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\ss_context.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ss_triangle.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ss_tritmp.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ss_vb.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ss_vbtmp.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\swrast_setup.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/reactos/lib/mesa32/src/swrast_setup/swrast_setup.h b/reactos/lib/mesa32/src/swrast_setup/swrast_setup.h
new file mode 100644
index 00000000000..5dcbe2675b4
--- /dev/null
+++ b/reactos/lib/mesa32/src/swrast_setup/swrast_setup.h
@@ -0,0 +1,61 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+/* Public interface to the swrast_setup module.  This module provides
+ * an implementation of the driver interface to t_vb_render.c, and uses
+ * the software rasterizer (swrast) to perform actual rasterization.
+ *
+ * The internals of the implementation are private, but can be hooked
+ * into tnl at any time (except between RenderStart/RenderEnd) by
+ * calling _swsetup_Wakeup(). 
+ */
+
+#ifndef SWRAST_SETUP_H
+#define SWRAST_SETUP_H
+
+#include "swrast/swrast.h"
+
+extern GLboolean
+_swsetup_CreateContext( GLcontext *ctx );
+
+extern void
+_swsetup_DestroyContext( GLcontext *ctx );
+
+extern void
+_swsetup_InvalidateState( GLcontext *ctx, GLuint new_state );
+
+extern void
+_swsetup_Wakeup( GLcontext *ctx );
+
+/* Helper function to translate a hardware vertex (as understood by
+ * the tnl/t_vertex.c code) to a swrast vertex.
+ */
+extern void 
+_swsetup_Translate( GLcontext *ctx, const void *vertex, SWvertex *dest );
+
+#endif
diff --git a/reactos/lib/mesa32/src/tnl/t_array_api.c b/reactos/lib/mesa32/src/tnl/t_array_api.c
new file mode 100644
index 00000000000..0815c13df71
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl/t_array_api.c
@@ -0,0 +1,441 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0.1
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file t_array_api.c
+ * \brief Vertex array API functions (glDrawArrays, etc)
+ * \author Keith Whitwell
+ */
+
+#include "glheader.h"
+#include "api_validate.h"
+#include "context.h"
+#include "imports.h"
+#include "macros.h"
+#include "mtypes.h"
+#include "state.h"
+
+#include "array_cache/acache.h"
+
+#include "t_array_api.h"
+#include "t_array_import.h"
+#include "t_save_api.h"
+#include "t_context.h"
+#include "t_pipeline.h"
+
+static void fallback_drawarrays( GLcontext *ctx, GLenum mode, GLint start,
+				 GLsizei count )
+{
+   GLint i;
+
+   assert(!ctx->CompileFlag);
+   assert(ctx->Driver.CurrentExecPrimitive == GL_POLYGON+1);
+
+   _glapi_Dispatch->Begin(mode);
+   for (i = 0; i < count; i++) 
+      _glapi_Dispatch->ArrayElement( start + i );
+   _glapi_Dispatch->End();
+}
+
+
+static void fallback_drawelements( GLcontext *ctx, GLenum mode, GLsizei count,
+				   const GLuint *indices)
+{
+   GLint i;
+
+   assert(!ctx->CompileFlag);
+   assert(ctx->Driver.CurrentExecPrimitive == GL_POLYGON+1);
+
+   /* Here, indices will already reflect the buffer object if active */
+
+   _glapi_Dispatch->Begin(mode);
+   for (i = 0 ; i < count ; i++) {
+      _glapi_Dispatch->ArrayElement( indices[i] );
+   }
+   _glapi_Dispatch->End();
+}
+
+
+/* Note this function no longer takes a 'start' value, the range is
+ * assumed to start at zero.  The old trick of subtracting 'start'
+ * from each index won't work if the indices are not in writeable
+ * memory.
+ */
+static void _tnl_draw_range_elements( GLcontext *ctx, GLenum mode,
+				      GLuint max_index,
+				      GLsizei index_count, GLuint *indices )
+
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct tnl_prim prim;
+   FLUSH_CURRENT( ctx, 0 );
+   
+   if (tnl->pipeline.build_state_changes)
+      _tnl_validate_pipeline( ctx );
+
+   _tnl_vb_bind_arrays( ctx, 0, max_index );
+
+   tnl->vb.Primitive = &prim;
+   tnl->vb.Primitive[0].mode = mode | PRIM_BEGIN | PRIM_END;
+   tnl->vb.Primitive[0].start = 0;
+   tnl->vb.Primitive[0].count = index_count;
+   tnl->vb.PrimitiveCount = 1;
+
+   tnl->vb.Elts = (GLuint *)indices;
+
+   if (ctx->Array.LockCount)
+      tnl->Driver.RunPipeline( ctx );
+   else {
+      /* The lower 16 bits represent the conventional arrays while the
+       * upper 16 bits represent the generic arrays.  OR those bits
+       * together to indicate which vertex attribs are in effect.
+       */
+      GLuint enabledArrays = ctx->Array._Enabled | (ctx->Array._Enabled >> 16);
+      /* Note that arrays may have changed before/after execution.
+       */
+      tnl->pipeline.run_input_changes |= enabledArrays & 0xffff;
+      tnl->Driver.RunPipeline( ctx );
+      tnl->pipeline.run_input_changes |= enabledArrays & 0xffff;
+   }
+}
+
+
+
+/**
+ * Called via the GL API dispatcher.
+ */
+void GLAPIENTRY
+_tnl_DrawArrays(GLenum mode, GLint start, GLsizei count)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   GLuint thresh = (ctx->Driver.NeedFlush & FLUSH_STORED_VERTICES) ? 30 : 10;
+   GLuint enabledArrays;
+   
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(NULL, "_tnl_DrawArrays %d %d\n", start, count); 
+   
+   /* Check arguments, etc.
+    */
+   if (!_mesa_validate_DrawArrays( ctx, mode, start, count ))
+      return;
+
+   if (tnl->pipeline.build_state_changes)
+      _tnl_validate_pipeline( ctx );
+
+   assert(!ctx->CompileFlag);
+
+   if (!ctx->Array.LockCount && (GLuint) count < thresh) {
+      /* Small primitives: attempt to share a vb (at the expense of
+       * using the immediate interface).
+      */
+      fallback_drawarrays( ctx, mode, start, count );
+   } 
+   else if (start >= (GLint) ctx->Array.LockFirst &&
+	    start + count <= (GLint)(ctx->Array.LockFirst + ctx->Array.LockCount)) {
+      
+      struct tnl_prim prim;
+
+      /* Locked primitives which can fit in a single vertex buffer:
+       */
+      FLUSH_CURRENT( ctx, 0 );
+
+      /* Locked drawarrays.  Reuse any previously transformed data.
+       */
+      _tnl_vb_bind_arrays( ctx, ctx->Array.LockFirst, 
+			   ctx->Array.LockFirst + ctx->Array.LockCount );
+
+      tnl->vb.Primitive = &prim;
+      tnl->vb.Primitive[0].mode = mode | PRIM_BEGIN | PRIM_END;
+      tnl->vb.Primitive[0].start = start;
+      tnl->vb.Primitive[0].count = count;
+      tnl->vb.PrimitiveCount = 1;
+
+      tnl->Driver.RunPipeline( ctx );
+   } 
+   else {
+      int bufsz = 256;		/* Use a small buffer for cache goodness */
+      int j, nr;
+      int minimum, modulo, skip;
+
+      /* Large primitives requiring decomposition to multiple vertex
+       * buffers:
+       */
+      switch (mode) {
+      case GL_POINTS:
+	 minimum = 0;
+	 modulo = 1;
+	 skip = 0;
+	 break;
+      case GL_LINES:
+	 minimum = 1;
+	 modulo = 2;
+	 skip = 1;
+	 break;
+      case GL_LINE_STRIP:
+	 minimum = 1;
+	 modulo = 1;
+	 skip = 0;
+	 break;
+      case GL_TRIANGLES:
+	 minimum = 2;
+	 modulo = 3;
+	 skip = 2;
+	 break;
+      case GL_TRIANGLE_STRIP:
+	 minimum = 2;
+	 modulo = 1;
+	 skip = 0;
+	 break;
+      case GL_QUADS:
+	 minimum = 3;
+	 modulo = 4;
+	 skip = 3;
+	 break;
+      case GL_QUAD_STRIP:
+	 minimum = 3;
+	 modulo = 2;
+	 skip = 0;
+	 break;
+      case GL_LINE_LOOP:
+      case GL_TRIANGLE_FAN:
+      case GL_POLYGON:
+      default:
+	 /* Primitives requiring a copied vertex (fan-like primitives)
+	  * must use the slow path if they cannot fit in a single
+	  * vertex buffer.  
+	  */
+	 if (count <= (GLint) ctx->Const.MaxArrayLockSize) {
+	    bufsz = ctx->Const.MaxArrayLockSize;
+	    minimum = 0;
+	    modulo = 1;
+	    skip = 0;
+	 }
+	 else {
+	    fallback_drawarrays( ctx, mode, start, count );
+	    return;
+	 }
+      }
+
+      FLUSH_CURRENT( ctx, 0 );
+
+      bufsz -= bufsz % modulo;
+      bufsz -= minimum;
+      count += start;
+
+      for (j = start + minimum ; j < count ; j += nr + skip ) {
+
+	 struct tnl_prim prim;
+
+	 nr = MIN2( bufsz, count - j );
+
+         /* XXX is the last parameter a count or index into the array??? */
+	 _tnl_vb_bind_arrays( ctx, j - minimum, j + nr );
+
+	 tnl->vb.Primitive = &prim;
+	 tnl->vb.Primitive[0].mode = mode;
+
+	 if (j == start + minimum)
+	    tnl->vb.Primitive[0].mode |= PRIM_BEGIN;
+
+	 if (j + nr + skip >= count)
+	    tnl->vb.Primitive[0].mode |= PRIM_END;
+
+	 tnl->vb.Primitive[0].start = 0;
+	 tnl->vb.Primitive[0].count = nr + minimum;
+	 tnl->vb.PrimitiveCount = 1;
+
+         /* The lower 16 bits represent the conventional arrays while the
+          * upper 16 bits represent the generic arrays.  OR those bits
+          * together to indicate which vertex attribs are in effect.
+          */
+         enabledArrays = ctx->Array._Enabled | (ctx->Array._Enabled >> 16);
+         /* Note that arrays may have changed before/after execution.
+          */
+	 tnl->pipeline.run_input_changes |= enabledArrays;
+	 tnl->Driver.RunPipeline( ctx );
+	 tnl->pipeline.run_input_changes |= enabledArrays;
+      }
+   }
+}
+
+
+/**
+ * Called via the GL API dispatcher.
+ */
+void GLAPIENTRY
+_tnl_DrawRangeElements(GLenum mode,
+		       GLuint start, GLuint end,
+		       GLsizei count, GLenum type, const GLvoid *indices)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint *ui_indices;
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(NULL, "_tnl_DrawRangeElements %d %d %d\n", start, end, count); 
+
+   if (ctx->Array.ElementArrayBufferObj->Name) {
+      /* use indices in the buffer object */
+      if (!ctx->Array.ElementArrayBufferObj->Data) {
+         _mesa_warning(ctx,
+                       "DrawRangeElements with empty vertex elements buffer!");
+         return;
+      }
+      /* actual address is the sum of pointers */
+      indices = (const GLvoid *)
+         ADD_POINTERS(ctx->Array.ElementArrayBufferObj->Data,
+                      (const GLubyte *) indices);
+   }
+
+   /* Check arguments, etc.
+    */
+   if (!_mesa_validate_DrawRangeElements( ctx, mode, start, end, count,
+                                          type, indices ))
+      return;
+
+   ui_indices = (GLuint *)_ac_import_elements( ctx, GL_UNSIGNED_INT,
+					       count, type, indices );
+
+
+   assert(!ctx->CompileFlag);
+
+   if (ctx->Array.LockCount) {
+      /* Are the arrays already locked?  If so we currently have to look
+       * at the whole locked range.
+       */
+
+      if (start == 0 && ctx->Array.LockFirst == 0 && 
+	  end < (ctx->Array.LockFirst + ctx->Array.LockCount))
+	 _tnl_draw_range_elements( ctx, mode,
+				   ctx->Array.LockCount,
+				   count, ui_indices );
+      else {
+	 fallback_drawelements( ctx, mode, count, ui_indices );
+      }
+   }
+   else if (start == 0 && end < ctx->Const.MaxArrayLockSize) {
+      /* The arrays aren't locked but we can still fit them inside a
+       * single vertexbuffer.
+       */
+      _tnl_draw_range_elements( ctx, mode, end + 1, count, ui_indices );
+   }
+   else {
+      /* Range is too big to optimize:
+       */
+      fallback_drawelements( ctx, mode, count, ui_indices );
+   }
+}
+
+
+
+/**
+ * Called via the GL API dispatcher.
+ */
+void GLAPIENTRY
+_tnl_DrawElements(GLenum mode, GLsizei count, GLenum type,
+		  const GLvoid *indices)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint *ui_indices;
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(NULL, "_tnl_DrawElements %d\n", count); 
+
+   /* Check arguments, etc. */
+   if (!_mesa_validate_DrawElements( ctx, mode, count, type, indices ))
+      return;
+
+   if (ctx->Array.ElementArrayBufferObj->Name) {
+      /* actual address is the sum of pointers */
+      indices = (const GLvoid *)
+         ADD_POINTERS(ctx->Array.ElementArrayBufferObj->Data,
+                      (const GLubyte *) indices);
+   }
+
+   ui_indices = (GLuint *)_ac_import_elements( ctx, GL_UNSIGNED_INT,
+					       count, type, indices );
+
+   assert(!ctx->CompileFlag);
+
+   if (ctx->Array.LockCount) {
+      if (ctx->Array.LockFirst == 0)
+	 _tnl_draw_range_elements( ctx, mode,
+				   ctx->Array.LockCount,
+				   count, ui_indices );
+      else
+	 fallback_drawelements( ctx, mode, count, ui_indices );
+   }
+   else {
+      /* Scan the index list and see if we can use the locked path anyway.
+       */
+      GLuint max_elt = 0;
+      GLint i;
+
+      for (i = 0 ; i < count ; i++)
+	 if (ui_indices[i] > max_elt)
+            max_elt = ui_indices[i];
+
+      if (max_elt < ctx->Const.MaxArrayLockSize && /* can we use it? */
+	  max_elt < (GLuint) count) 	           /* do we want to use it? */
+	 _tnl_draw_range_elements( ctx, mode, max_elt+1, count, ui_indices );
+      else
+	 fallback_drawelements( ctx, mode, count, ui_indices );
+   }
+}
+
+
+/**
+ * Initialize context's vertex array fields.  Called during T 'n L context
+ * creation.
+ */
+void _tnl_array_init( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct tnl_vertex_arrays *tmp = &tnl->array_inputs;
+   GLvertexformat *vfmt = &(TNL_CONTEXT(ctx)->exec_vtxfmt);
+   GLuint i;
+
+   vfmt->DrawArrays = _tnl_DrawArrays;
+   vfmt->DrawElements = _tnl_DrawElements;
+   vfmt->DrawRangeElements = _tnl_DrawRangeElements;
+
+   /* Setup vector pointers that will be used to bind arrays to VB's.
+    */
+   _mesa_vector4f_init( &tmp->Obj, 0, 0 );
+   _mesa_vector4f_init( &tmp->Normal, 0, 0 );   
+   _mesa_vector4f_init( &tmp->FogCoord, 0, 0 );
+   _mesa_vector4f_init( &tmp->Index, 0, 0 );
+
+   for (i = 0; i < ctx->Const.MaxTextureUnits; i++)
+      _mesa_vector4f_init( &tmp->TexCoord[i], 0, 0);
+}
+
+
+/**
+ * Destroy the context's vertex array stuff.
+ * Called during T 'n L context destruction.
+ */
+void _tnl_array_destroy( GLcontext *ctx )
+{
+}
diff --git a/reactos/lib/mesa32/src/tnl/t_array_api.h b/reactos/lib/mesa32/src/tnl/t_array_api.h
new file mode 100644
index 00000000000..61d1f696b00
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl/t_array_api.h
@@ -0,0 +1,46 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef _T_VARRAY_H
+#define _T_VARRAY_H
+
+#include "mtypes.h"
+#include "t_context.h"
+
+
+extern void GLAPIENTRY _tnl_DrawArrays(GLenum mode, GLint first, GLsizei count);
+
+extern void GLAPIENTRY _tnl_DrawElements(GLenum mode, GLsizei count, GLenum type,
+			      const GLvoid *indices);
+
+extern void GLAPIENTRY _tnl_DrawRangeElements(GLenum mode, GLuint start,
+				   GLuint end, GLsizei count, GLenum type,
+				   const GLvoid *indices);
+
+
+extern void _tnl_array_init( GLcontext *ctx );
+extern void _tnl_array_destroy( GLcontext *ctx );
+
+#endif
diff --git a/reactos/lib/mesa32/src/tnl/t_array_import.c b/reactos/lib/mesa32/src/tnl/t_array_import.c
new file mode 100644
index 00000000000..7baeefe81e2
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl/t_array_import.c
@@ -0,0 +1,360 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+#include "glheader.h"
+#include "context.h"
+#include "macros.h"
+#include "imports.h"
+#include "state.h"
+#include "mtypes.h"
+
+#include "array_cache/acache.h"
+#include "math/m_translate.h"
+
+#include "t_array_import.h"
+#include "t_context.h"
+
+
+static void _tnl_import_vertex( GLcontext *ctx,
+				GLboolean writeable,
+				GLboolean stride )
+{
+   struct gl_client_array *tmp;
+   GLboolean is_writeable = 0;
+   struct tnl_vertex_arrays *inputs = &TNL_CONTEXT(ctx)->array_inputs;
+   const GLubyte *data;
+
+   tmp = _ac_import_vertex(ctx,
+			   GL_FLOAT,
+			   stride ? 4*sizeof(GLfloat) : 0,
+			   0,
+			   writeable,
+			   &is_writeable);
+
+   data = tmp->Ptr;
+   inputs->Obj.data = (GLfloat (*)[4]) data;
+   inputs->Obj.start = (GLfloat *) data;
+   inputs->Obj.stride = tmp->StrideB;
+   inputs->Obj.size = tmp->Size;
+}
+
+static void _tnl_import_normal( GLcontext *ctx,
+				GLboolean writeable,
+				GLboolean stride )
+{
+   struct gl_client_array *tmp;
+   GLboolean is_writeable = 0;
+   struct tnl_vertex_arrays *inputs = &TNL_CONTEXT(ctx)->array_inputs;
+   const GLubyte *data;
+
+   tmp = _ac_import_normal(ctx, GL_FLOAT,
+			   stride ? 3*sizeof(GLfloat) : 0, writeable,
+			   &is_writeable);
+
+   data = tmp->Ptr;
+   inputs->Normal.data = (GLfloat (*)[4]) data;
+   inputs->Normal.start = (GLfloat *) data;
+   inputs->Normal.stride = tmp->StrideB;
+   inputs->Normal.size = 3;
+}
+
+
+static void _tnl_import_color( GLcontext *ctx,
+			       GLboolean writeable,
+			       GLboolean stride )
+{
+   struct gl_client_array *tmp;
+   GLboolean is_writeable = 0;
+   struct tnl_vertex_arrays *inputs = &TNL_CONTEXT(ctx)->array_inputs;
+   const GLubyte *data;
+
+   tmp = _ac_import_color(ctx,
+			  GL_FLOAT,
+			  stride ? 4*sizeof(GLfloat) : 0,
+			  4,
+			  writeable,
+			  &is_writeable);
+
+   data = tmp->Ptr;
+   inputs->Color.data = (GLfloat (*)[4]) data;
+   inputs->Color.start = (GLfloat *) data;
+   inputs->Color.stride = tmp->StrideB;
+   inputs->Color.size = tmp->Size;
+}
+
+
+static void _tnl_import_secondarycolor( GLcontext *ctx,
+					GLboolean writeable,
+					GLboolean stride )
+{
+   struct gl_client_array *tmp;
+   GLboolean is_writeable = 0;
+   struct tnl_vertex_arrays *inputs = &TNL_CONTEXT(ctx)->array_inputs;
+   const GLubyte *data;
+
+   tmp = _ac_import_secondarycolor(ctx, 
+				   GL_FLOAT,
+				   stride ? 4*sizeof(GLfloat) : 0,
+				   4,
+				   writeable,
+				   &is_writeable);
+
+   data = tmp->Ptr;
+   inputs->SecondaryColor.data = (GLfloat (*)[4]) data;
+   inputs->SecondaryColor.start = (GLfloat *) data;
+   inputs->SecondaryColor.stride = tmp->StrideB;
+   inputs->SecondaryColor.size = tmp->Size;
+}
+
+static void _tnl_import_fogcoord( GLcontext *ctx,
+				  GLboolean writeable,
+				  GLboolean stride )
+{
+   struct tnl_vertex_arrays *inputs = &TNL_CONTEXT(ctx)->array_inputs;
+   struct gl_client_array *tmp;
+   GLboolean is_writeable = 0;
+   const GLubyte *data;
+
+   tmp = _ac_import_fogcoord(ctx, GL_FLOAT,
+			     stride ? sizeof(GLfloat) : 0, writeable,
+			     &is_writeable);
+
+   data = tmp->Ptr;
+   inputs->FogCoord.data = (GLfloat (*)[4]) data;
+   inputs->FogCoord.start = (GLfloat *) data;
+   inputs->FogCoord.stride = tmp->StrideB;
+}
+
+static void _tnl_import_index( GLcontext *ctx,
+			       GLboolean writeable,
+			       GLboolean stride )
+{
+   struct tnl_vertex_arrays *inputs = &TNL_CONTEXT(ctx)->array_inputs;
+   struct gl_client_array *tmp;
+   GLboolean is_writeable = 0;
+   const GLubyte *data;
+
+   tmp = _ac_import_index(ctx, GL_FLOAT,
+			  stride ? sizeof(GLfloat) : 0, writeable,
+			  &is_writeable);
+
+   data = tmp->Ptr;
+   inputs->Index.data = (GLfloat (*)[4]) data;
+   inputs->Index.start = (GLfloat *) data;
+   inputs->Index.stride = tmp->StrideB;
+}
+
+
+static void _tnl_import_texcoord( GLcontext *ctx,
+				  GLuint unit,
+				  GLboolean writeable,
+				  GLboolean stride )
+{
+   struct tnl_vertex_arrays *inputs = &TNL_CONTEXT(ctx)->array_inputs;
+   struct gl_client_array *tmp;
+   GLboolean is_writeable = 0;
+   const GLubyte *data;
+
+   tmp = _ac_import_texcoord(ctx, unit, GL_FLOAT,
+			     stride ? 4 * sizeof(GLfloat) : 0,
+			     0,
+			     writeable,
+			     &is_writeable);
+
+   data = tmp->Ptr;
+   inputs->TexCoord[unit].data = (GLfloat (*)[4]) data;
+   inputs->TexCoord[unit].start = (GLfloat *) data;
+   inputs->TexCoord[unit].stride = tmp->StrideB;
+   inputs->TexCoord[unit].size = tmp->Size;
+}
+
+
+static void _tnl_import_edgeflag( GLcontext *ctx,
+				  GLboolean writeable,
+				  GLboolean stride )
+{
+   struct tnl_vertex_arrays *inputs = &TNL_CONTEXT(ctx)->array_inputs;
+   struct gl_client_array *tmp;
+   GLboolean is_writeable = 0;
+   const GLubyte *data;
+
+   tmp = _ac_import_edgeflag(ctx, GL_UNSIGNED_BYTE,
+			     sizeof(GLubyte),
+			     0,
+			     &is_writeable);
+
+   data = tmp->Ptr;
+   inputs->EdgeFlag = (GLubyte *) data;
+}
+
+
+
+static void _tnl_import_attrib( GLcontext *ctx,
+                                GLuint index,
+                                GLboolean writeable,
+                                GLboolean stride )
+{
+   struct tnl_vertex_arrays *inputs = &TNL_CONTEXT(ctx)->array_inputs;
+   struct gl_client_array *tmp;
+   GLboolean is_writeable = 0;
+   const GLubyte *data;
+
+   tmp = _ac_import_attrib(ctx, index, GL_FLOAT,
+                           stride ? 4 * sizeof(GLfloat) : 0,
+                           4,  /* want GLfloat[4] */
+                           writeable,
+                           &is_writeable);
+
+   data = tmp->Ptr;
+   inputs->Attribs[index].data = (GLfloat (*)[4]) data;
+   inputs->Attribs[index].start = (GLfloat *) data;
+   inputs->Attribs[index].stride = tmp->StrideB;
+   inputs->Attribs[index].size = tmp->Size;
+}
+
+
+
+
+void _tnl_vb_bind_arrays( GLcontext *ctx, GLint start, GLint end)
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct vertex_buffer *VB = &tnl->vb;
+   GLuint inputs = tnl->pipeline.inputs;
+   struct tnl_vertex_arrays *tmp = &tnl->array_inputs;
+   GLuint i, index;
+
+   VB->Count = end - start;
+   VB->Elts = NULL;
+
+   _ac_import_range( ctx, start, end );
+
+   /* When vertex program mode is enabled, the generic vertex program
+    * attribute arrays have priority over the conventional attributes.
+    * Try to use them now.
+    */
+   for (index = 0; index < VERT_ATTRIB_MAX; index++) {
+      /* When vertex program mode is enabled, the generic vertex attribute
+       * arrays have priority over the conventional vertex arrays.
+       */
+      if (ctx->VertexProgram.Enabled
+          && ctx->Array.VertexAttrib[index].Enabled) {
+         /* Use generic attribute array */
+         _tnl_import_attrib( ctx, index, GL_FALSE, GL_TRUE );
+         VB->AttribPtr[index] = &tmp->Attribs[index];
+      }
+      /* use conventional arrays... */
+      else if (index == VERT_ATTRIB_POS) {
+         if (inputs & _TNL_BIT_POS) {
+            _tnl_import_vertex( ctx, 0, 0 );
+            tmp->Obj.count = VB->Count;
+            VB->AttribPtr[_TNL_ATTRIB_POS] = &tmp->Obj;
+         }
+      }
+      else if (index == VERT_ATTRIB_NORMAL) {
+         if (inputs & _TNL_BIT_NORMAL) {
+            _tnl_import_normal( ctx, 0, 0 );
+            tmp->Normal.count = VB->Count;
+            VB->AttribPtr[_TNL_ATTRIB_NORMAL] = &tmp->Normal;
+         }
+      }
+      else if (index == VERT_ATTRIB_COLOR0) {
+         if (inputs & _TNL_BIT_COLOR0) {
+            _tnl_import_color( ctx, 0, 0 );
+            tmp->Color.count = VB->Count;
+            VB->AttribPtr[_TNL_ATTRIB_COLOR0] = &tmp->Color;
+         }
+      }
+      else if (index == VERT_ATTRIB_COLOR1) {
+         if (inputs & _TNL_BIT_COLOR1) {
+            _tnl_import_secondarycolor( ctx, 0, 0 );
+            tmp->SecondaryColor.count = VB->Count;
+            VB->AttribPtr[_TNL_ATTRIB_COLOR1] = &tmp->SecondaryColor;
+         }
+      }
+      else if (index == VERT_ATTRIB_FOG) {
+         if (inputs & _TNL_BIT_FOG) {
+            _tnl_import_fogcoord( ctx, 0, 0 );
+            tmp->FogCoord.count = VB->Count;
+            VB->AttribPtr[_TNL_ATTRIB_FOG] = &tmp->FogCoord;
+         }
+      }
+      else if (index >= VERT_ATTRIB_TEX0 && index <= VERT_ATTRIB_TEX7) {
+         if (inputs & _TNL_BITS_TEX_ANY) {
+            for (i = 0; i < ctx->Const.MaxTextureUnits; i++) {
+               if (inputs & _TNL_BIT_TEX(i)) {
+                  _tnl_import_texcoord( ctx, i, GL_FALSE, GL_FALSE );
+                  tmp->TexCoord[i].count = VB->Count;
+                  VB->AttribPtr[_TNL_ATTRIB_TEX0 + i] = &tmp->TexCoord[i];
+               }
+            }
+         }
+      }
+   }
+
+   /* odd-ball vertex attributes */
+   if (inputs & _TNL_BIT_INDEX) {
+      _tnl_import_index( ctx, 0, 0 );
+      tmp->Index.count = VB->Count;
+      VB->AttribPtr[_TNL_ATTRIB_INDEX] = &tmp->Index;
+   }
+
+   if (inputs & _TNL_BIT_EDGEFLAG) {
+      _tnl_import_edgeflag( ctx, GL_TRUE, sizeof(GLboolean) );
+      VB->EdgeFlag = (GLboolean *) tmp->EdgeFlag;
+   }
+
+   /* These are constant & can be precalculated:
+    */
+   if (inputs & _TNL_BITS_MAT_ANY) {
+      for (i = _TNL_ATTRIB_MAT_FRONT_AMBIENT; i < _TNL_ATTRIB_INDEX; i++) {
+	 tmp->Attribs[i].count = VB->Count;
+	 tmp->Attribs[i].data = (GLfloat (*)[4]) tnl->vtx.current[i];
+	 tmp->Attribs[i].start = tnl->vtx.current[i];
+	 tmp->Attribs[i].size = 4; 
+	 tmp->Attribs[i].stride = 0;
+	 VB->AttribPtr[i] = &tmp->Attribs[i];
+      }      
+   }
+
+
+   /* Legacy pointers -- remove one day.
+    */
+   VB->ObjPtr = VB->AttribPtr[_TNL_ATTRIB_POS];
+   VB->NormalPtr = VB->AttribPtr[_TNL_ATTRIB_NORMAL];
+   VB->ColorPtr[0] = VB->AttribPtr[_TNL_ATTRIB_COLOR0];
+   VB->ColorPtr[1] = 0;
+   VB->IndexPtr[0] = VB->AttribPtr[_TNL_ATTRIB_INDEX];
+   VB->IndexPtr[1] = 0;
+   VB->SecondaryColorPtr[0] = VB->AttribPtr[_TNL_ATTRIB_COLOR1];
+   VB->SecondaryColorPtr[1] = 0;
+   VB->FogCoordPtr = VB->AttribPtr[_TNL_ATTRIB_FOG];
+
+   for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) {
+      VB->TexCoordPtr[i] = VB->AttribPtr[_TNL_ATTRIB_TEX0 + i];
+   }
+
+}
diff --git a/reactos/lib/mesa32/src/tnl/t_array_import.h b/reactos/lib/mesa32/src/tnl/t_array_import.h
new file mode 100644
index 00000000000..39b77641d53
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl/t_array_import.h
@@ -0,0 +1,36 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef _T_ARRAY_IMPORT_H
+#define _T_ARRAY_IMPORT_H
+
+#include "mtypes.h"
+#include "t_context.h"
+
+extern void _tnl_vb_bind_arrays( GLcontext *ctx, GLint start, GLint end );
+
+extern void _tnl_array_import_init( GLcontext *ctx );
+
+#endif
diff --git a/reactos/lib/mesa32/src/tnl/t_context.c b/reactos/lib/mesa32/src/tnl/t_context.c
new file mode 100644
index 00000000000..ec5f88cd96c
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl/t_context.c
@@ -0,0 +1,261 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+
+#include "api_arrayelt.h"
+#include "glheader.h"
+#include "imports.h"
+#include "context.h"
+#include "macros.h"
+#include "mtypes.h"
+#include "dlist.h"
+#include "light.h"
+#include "vtxfmt.h"
+#include "nvfragprog.h"
+
+#include "t_context.h"
+#include "t_array_api.h"
+#include "t_vtx_api.h"
+#include "t_save_api.h"
+#include "t_pipeline.h"
+#include "tnl.h"
+
+
+
+void
+_tnl_MakeCurrent( GLcontext *ctx,
+		  GLframebuffer *drawBuffer,
+		  GLframebuffer *readBuffer )
+{
+}
+
+
+static void
+install_driver_callbacks( GLcontext *ctx )
+{
+   ctx->Driver.NewList = _tnl_NewList;
+   ctx->Driver.EndList = _tnl_EndList;
+   ctx->Driver.FlushVertices = _tnl_FlushVertices;
+   ctx->Driver.SaveFlushVertices = _tnl_SaveFlushVertices;
+   ctx->Driver.MakeCurrent = _tnl_MakeCurrent;
+   ctx->Driver.BeginCallList = _tnl_BeginCallList;
+   ctx->Driver.EndCallList = _tnl_EndCallList;
+}
+
+
+
+GLboolean
+_tnl_CreateContext( GLcontext *ctx )
+{
+   TNLcontext *tnl;
+
+   /* Create the TNLcontext structure
+    */
+   ctx->swtnl_context = tnl = (TNLcontext *) CALLOC( sizeof(TNLcontext) );
+
+   if (!tnl) {
+      return GL_FALSE;
+   }
+
+   /* Initialize the VB.
+    */
+   tnl->vb.Size = ctx->Const.MaxArrayLockSize + MAX_CLIPPED_VERTICES;
+
+
+   /* Initialize tnl state and tnl->vtxfmt.
+    */
+   _tnl_save_init( ctx );
+   _tnl_array_init( ctx );
+   _tnl_vtx_init( ctx );
+   _tnl_install_pipeline( ctx, _tnl_default_pipeline );
+
+   /* Initialize the arrayelt helper
+    */
+   if (!_ae_create_context( ctx ))
+      return GL_FALSE;
+
+
+   tnl->NeedNdcCoords = GL_TRUE;
+   tnl->LoopbackDListCassettes = GL_FALSE;
+   tnl->CalcDListNormalLengths = GL_TRUE;
+
+   /* Hook our functions into exec and compile dispatch tables.
+    */
+   _mesa_install_exec_vtxfmt( ctx, &tnl->exec_vtxfmt );
+
+
+   /* Set a few default values in the driver struct.
+    */
+   install_driver_callbacks(ctx);
+   ctx->Driver.NeedFlush = 0;
+   ctx->Driver.CurrentExecPrimitive = PRIM_OUTSIDE_BEGIN_END;
+   ctx->Driver.CurrentSavePrimitive = PRIM_UNKNOWN;
+
+   tnl->Driver.Render.PrimTabElts = _tnl_render_tab_elts;
+   tnl->Driver.Render.PrimTabVerts = _tnl_render_tab_verts;
+   tnl->Driver.NotifyMaterialChange = _mesa_validate_all_lighting_tables;
+   
+   return GL_TRUE;
+}
+
+
+void
+_tnl_DestroyContext( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+
+   _tnl_array_destroy( ctx );
+   _tnl_vtx_destroy( ctx );
+   _tnl_save_destroy( ctx );
+   _tnl_destroy_pipeline( ctx );
+   _ae_destroy_context( ctx );
+
+   FREE(tnl);
+   ctx->swtnl_context = 0;
+}
+
+
+void
+_tnl_InvalidateState( GLcontext *ctx, GLuint new_state )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+
+   if (new_state & _NEW_ARRAY) {
+      tnl->pipeline.run_input_changes |= ctx->Array.NewState; /* overkill */
+   }
+
+   _ae_invalidate_state(ctx, new_state);
+
+   tnl->pipeline.run_state_changes |= new_state;
+   tnl->pipeline.build_state_changes |= (new_state &
+					 tnl->pipeline.build_state_trigger);
+
+   tnl->vtx.eval.new_state |= new_state;
+
+   /* Calculate tnl->render_inputs:
+    */
+   if (ctx->Visual.rgbMode) {
+      tnl->render_inputs = (_TNL_BIT_POS|
+			    _TNL_BIT_COLOR0|
+			    (ctx->Texture._EnabledCoordUnits << _TNL_ATTRIB_TEX0));
+
+      if (NEED_SECONDARY_COLOR(ctx))
+	 tnl->render_inputs |= _TNL_BIT_COLOR1;
+   }
+   else {
+      tnl->render_inputs |= (_TNL_BIT_POS|_TNL_BIT_INDEX);
+   }
+    
+   if (ctx->Fog.Enabled)
+      tnl->render_inputs |= _TNL_BIT_FOG;
+
+   if (ctx->Polygon.FrontMode != GL_FILL || 
+       ctx->Polygon.BackMode != GL_FILL)
+      tnl->render_inputs |= _TNL_BIT_EDGEFLAG;
+
+   if (ctx->RenderMode == GL_FEEDBACK)
+      tnl->render_inputs |= _TNL_BIT_TEX0;
+
+   if (ctx->Point._Attenuated ||
+       (ctx->VertexProgram.Enabled && ctx->VertexProgram.PointSizeEnabled))
+      tnl->render_inputs |= _TNL_BIT_POINTSIZE;
+}
+
+
+void
+_tnl_wakeup_exec( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+
+   install_driver_callbacks(ctx);
+   ctx->Driver.NeedFlush |= FLUSH_UPDATE_CURRENT;
+
+   /* Hook our functions into exec and compile dispatch tables.
+    */
+   _mesa_install_exec_vtxfmt( ctx, &tnl->exec_vtxfmt );
+
+   /* Call all appropriate driver callbacks to revive state.
+    */
+   _tnl_MakeCurrent( ctx, ctx->DrawBuffer, ctx->ReadBuffer );
+
+   /* Assume we haven't been getting state updates either:
+    */
+   _tnl_InvalidateState( ctx, ~0 );
+   tnl->pipeline.run_input_changes = ~0;
+
+   if (ctx->Light.ColorMaterialEnabled) {
+      _mesa_update_color_material( ctx, 
+				   ctx->Current.Attrib[VERT_ATTRIB_COLOR0] );
+   }
+}
+
+
+void
+_tnl_wakeup_save_exec( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+
+   _tnl_wakeup_exec( ctx );
+   _mesa_install_save_vtxfmt( ctx, &tnl->save_vtxfmt );
+}
+
+
+/**
+ * Drivers call this function to tell the TCL module whether or not
+ * it wants Normalized Device Coords (NDC) computed.  I.e. whether
+ * we should "Divide-by-W".  Software renders will want that.
+ */
+void
+_tnl_need_projected_coords( GLcontext *ctx, GLboolean mode )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   if (tnl->NeedNdcCoords != mode) {
+      tnl->NeedNdcCoords = mode;
+      _tnl_InvalidateState( ctx, _NEW_PROJECTION );
+   }
+}
+
+void
+_tnl_need_dlist_loopback( GLcontext *ctx, GLboolean mode )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   tnl->LoopbackDListCassettes = mode;
+}
+
+void
+_tnl_need_dlist_norm_lengths( GLcontext *ctx, GLboolean mode )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   tnl->CalcDListNormalLengths = mode;
+}
+
+void
+_tnl_isolate_materials( GLcontext *ctx, GLboolean mode )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   tnl->IsolateMaterials = mode;
+}
diff --git a/reactos/lib/mesa32/src/tnl/t_context.h b/reactos/lib/mesa32/src/tnl/t_context.h
new file mode 100644
index 00000000000..a9d36d24882
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl/t_context.h
@@ -0,0 +1,734 @@
+/*
+ * mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file t_context.h
+ * \brief TnL module datatypes and definitions.
+ * \author Keith Whitwell
+ */
+
+
+/**
+ * \mainpage The TNL-module
+ *
+ * TNL stands for "transform and lighting", i.e. this module implements
+ * a pipeline that receives as input a buffer of vertices and does all
+ * necessary transformations (rotations, clipping, vertex shader etc.)
+ * and passes then the output to the rasterizer.
+ *
+ * The tnl_pipeline contains the array of all stages, which should be
+ * applied. Each stage is a black-box, which is described by an
+ * tnl_pipeline_stage. The function ::_tnl_run_pipeline applies all the
+ * stages to the vertex_buffer TNLcontext::vb, where the vertex data
+ * is stored. The last stage in the pipeline is the rasterizer.
+ *
+ * The initial vertex_buffer data may either come from an ::immediate
+ * structure or client vertex_arrays or display lists:
+ *
+ *
+ * - The ::immediate structure records all the GL commands issued between
+ * glBegin and glEnd.  \n
+ * The structure accumulates data, until it is either full or it is
+ * flushed (usually by a state change). Before starting then the pipeline,
+ * the collected vertex data in ::immediate has to be pushed into
+ * TNLcontext::vb.
+ * This happens in ::_tnl_vb_bind_immediate. The pipeline is then run by
+ * calling tnl_device_driver::RunPipeline = ::_tnl_run_pipeline, which
+ * is stored in TNLcontext::Driver.   \n
+ * An ::immediate does (for performance reasons) usually not finish with a
+ * glEnd, and hence it also does not need to start with a glBegin.
+ * This means that the last vertices of one ::immediate may need to be
+ * saved for the next one.
+ *
+ *
+ * - NOT SURE ABOUT THIS: The vertex_arrays structure is used to handle
+ * glDrawArrays etc.  \n
+ * Here, the data of the vertex_arrays is copied by ::_tnl_vb_bind_arrays
+ * into TNLcontext::vb, so that the pipeline can be started.
+ */
+
+
+#ifndef _T_CONTEXT_H
+#define _T_CONTEXT_H
+
+#include "glheader.h"
+#include "mtypes.h"
+
+#include "math/m_matrix.h"
+#include "math/m_vector.h"
+#include "math/m_xform.h"
+
+
+#define MAX_PIPELINE_STAGES     30
+
+
+/*
+ * Note: The first attributes match the VERT_ATTRIB_* definitions
+ * in mtypes.h.  However, the tnl module has additional attributes
+ * for materials, color indexes, edge flags, etc.
+ */
+/* Note: These are currently being used to define both inputs and
+ * outputs from the tnl pipeline.  A better solution (which would also
+ * releive the congestion to slightly prolong the life of the bitmask
+ * below) is to have the fixed function pipeline populate a set of
+ * arrays named after those produced by the vertex program stage, and
+ * have the rest the mesa backend work on those.
+ */
+enum {
+	_TNL_ATTRIB_POS = 0,
+	_TNL_ATTRIB_WEIGHT = 1,
+	_TNL_ATTRIB_NORMAL = 2,
+	_TNL_ATTRIB_COLOR0 = 3,
+	_TNL_ATTRIB_COLOR1 = 4,
+	_TNL_ATTRIB_FOG = 5,
+	_TNL_ATTRIB_SIX = 6,
+	_TNL_ATTRIB_SEVEN = 7,
+	_TNL_ATTRIB_TEX0 = 8,
+	_TNL_ATTRIB_TEX1 = 9,
+	_TNL_ATTRIB_TEX2 = 10,
+	_TNL_ATTRIB_TEX3 = 11,
+	_TNL_ATTRIB_TEX4 = 12,
+	_TNL_ATTRIB_TEX5 = 13,
+	_TNL_ATTRIB_TEX6 = 14,
+	_TNL_ATTRIB_TEX7 = 15,
+	_TNL_ATTRIB_MAT_FRONT_AMBIENT = 16,
+	_TNL_ATTRIB_MAT_BACK_AMBIENT = 17,
+	_TNL_ATTRIB_MAT_FRONT_DIFFUSE = 18,
+	_TNL_ATTRIB_MAT_BACK_DIFFUSE = 19,
+	_TNL_ATTRIB_MAT_FRONT_SPECULAR = 20,
+	_TNL_ATTRIB_MAT_BACK_SPECULAR = 21,
+	_TNL_ATTRIB_MAT_FRONT_EMISSION = 22,
+	_TNL_ATTRIB_MAT_BACK_EMISSION = 23,
+	_TNL_ATTRIB_MAT_FRONT_SHININESS = 24,
+	_TNL_ATTRIB_MAT_BACK_SHININESS = 25,
+	_TNL_ATTRIB_MAT_FRONT_INDEXES = 26,
+	_TNL_ATTRIB_MAT_BACK_INDEXES = 27, 
+	_TNL_ATTRIB_INDEX = 28,        
+	_TNL_ATTRIB_EDGEFLAG = 29,     
+	_TNL_ATTRIB_POINTSIZE = 30,
+	_TNL_ATTRIB_MAX = 31
+} ;
+
+/* Will probably have to revise this scheme fairly shortly, eg. by
+ * compacting all the MAT flags down to one bit, or by using two
+ * dwords to store the flags.
+ */
+#define _TNL_BIT_POS                 (1<<0)
+#define _TNL_BIT_WEIGHT              (1<<1)
+#define _TNL_BIT_NORMAL              (1<<2)
+#define _TNL_BIT_COLOR0              (1<<3)
+#define _TNL_BIT_COLOR1              (1<<4)
+#define _TNL_BIT_FOG                 (1<<5)
+#define _TNL_BIT_SIX                 (1<<6)
+#define _TNL_BIT_SEVEN               (1<<7)
+#define _TNL_BIT_TEX0                (1<<8)
+#define _TNL_BIT_TEX1                (1<<9)
+#define _TNL_BIT_TEX2                (1<<10)
+#define _TNL_BIT_TEX3                (1<<11)
+#define _TNL_BIT_TEX4                (1<<12)
+#define _TNL_BIT_TEX5                (1<<13)
+#define _TNL_BIT_TEX6                (1<<14)
+#define _TNL_BIT_TEX7                (1<<15)
+#define _TNL_BIT_MAT_FRONT_AMBIENT   (1<<16)
+#define _TNL_BIT_MAT_BACK_AMBIENT    (1<<17)
+#define _TNL_BIT_MAT_FRONT_DIFFUSE   (1<<18)
+#define _TNL_BIT_MAT_BACK_DIFFUSE    (1<<19)
+#define _TNL_BIT_MAT_FRONT_SPECULAR  (1<<20)
+#define _TNL_BIT_MAT_BACK_SPECULAR   (1<<21)
+#define _TNL_BIT_MAT_FRONT_EMISSION  (1<<22)
+#define _TNL_BIT_MAT_BACK_EMISSION   (1<<23)
+#define _TNL_BIT_MAT_FRONT_SHININESS (1<<24)
+#define _TNL_BIT_MAT_BACK_SHININESS  (1<<25)
+#define _TNL_BIT_MAT_FRONT_INDEXES   (1<<26)
+#define _TNL_BIT_MAT_BACK_INDEXES    (1<<27)
+#define _TNL_BIT_INDEX               (1<<28)
+#define _TNL_BIT_EDGEFLAG            (1<<29)
+#define _TNL_BIT_POINTSIZE           (1<<30)
+
+#define _TNL_BIT_TEX(u)  (1 << (_TNL_ATTRIB_TEX0 + (u)))
+
+
+
+#define _TNL_BITS_MAT_ANY  (_TNL_BIT_MAT_FRONT_AMBIENT   | 	\
+			    _TNL_BIT_MAT_BACK_AMBIENT    | 	\
+			    _TNL_BIT_MAT_FRONT_DIFFUSE   | 	\
+			    _TNL_BIT_MAT_BACK_DIFFUSE    | 	\
+			    _TNL_BIT_MAT_FRONT_SPECULAR  | 	\
+			    _TNL_BIT_MAT_BACK_SPECULAR   | 	\
+			    _TNL_BIT_MAT_FRONT_EMISSION  | 	\
+			    _TNL_BIT_MAT_BACK_EMISSION   | 	\
+			    _TNL_BIT_MAT_FRONT_SHININESS | 	\
+			    _TNL_BIT_MAT_BACK_SHININESS  | 	\
+			    _TNL_BIT_MAT_FRONT_INDEXES   | 	\
+			    _TNL_BIT_MAT_BACK_INDEXES)
+
+
+#define _TNL_BITS_TEX_ANY  (_TNL_BIT_TEX0 |	\
+                            _TNL_BIT_TEX1 |	\
+                            _TNL_BIT_TEX2 |	\
+                            _TNL_BIT_TEX3 |	\
+                            _TNL_BIT_TEX4 |	\
+                            _TNL_BIT_TEX5 |	\
+                            _TNL_BIT_TEX6 |	\
+                            _TNL_BIT_TEX7)
+
+
+#define _TNL_BITS_PROG_ANY   (_TNL_BIT_POS    |		\
+			      _TNL_BIT_WEIGHT |		\
+			      _TNL_BIT_NORMAL |		\
+			      _TNL_BIT_COLOR0 |		\
+			      _TNL_BIT_COLOR1 |		\
+			      _TNL_BIT_FOG    |		\
+			      _TNL_BIT_SIX    |		\
+			      _TNL_BIT_SEVEN  |		\
+			      _TNL_BITS_TEX_ANY)
+
+
+
+#define PRIM_BEGIN     0x10
+#define PRIM_END       0x20
+#define PRIM_WEAK      0x40
+#define PRIM_MODE_MASK 0x0f
+
+/* 
+ */
+struct tnl_prim {
+   GLuint mode;
+   GLuint start;
+   GLuint count;
+};
+
+
+
+struct tnl_eval1_map {
+   struct gl_1d_map *map;
+   GLuint sz;
+};
+
+struct tnl_eval2_map {
+   struct gl_2d_map *map;
+   GLuint sz;
+};
+
+struct tnl_eval {
+   GLuint new_state;
+   struct tnl_eval1_map map1[_TNL_ATTRIB_INDEX + 1];
+   struct tnl_eval2_map map2[_TNL_ATTRIB_INDEX + 1];
+};
+
+
+#define TNL_MAX_PRIM 16
+#define TNL_MAX_COPIED_VERTS 3
+
+struct tnl_copied_vtx {
+   GLfloat buffer[_TNL_ATTRIB_MAX * 4 * TNL_MAX_COPIED_VERTS];
+   GLuint nr;
+};
+
+#define VERT_BUFFER_SIZE 2048	/* 8kbytes */
+
+typedef void (*attrfv_func)( const GLfloat * );
+
+/* The assembly of vertices in immediate mode is separated from
+ * display list compilation.  This allows a simpler immediate mode
+ * treatment and a display list compiler better suited to
+ * hardware-acceleration.
+ */
+struct tnl_vtx {
+   GLfloat buffer[VERT_BUFFER_SIZE];
+   GLubyte attrsz[_TNL_ATTRIB_MAX];
+   GLuint vertex_size;
+   struct tnl_prim prim[TNL_MAX_PRIM];
+   GLuint prim_count;
+   GLfloat *vbptr;		      /* cursor, points into buffer */
+   GLfloat vertex[_TNL_ATTRIB_MAX*4]; /* current vertex */
+   GLfloat *attrptr[_TNL_ATTRIB_MAX]; /* points into vertex */
+   GLfloat *current[_TNL_ATTRIB_MAX]; /* points into ctx->Current, etc */
+   GLuint counter, initial_counter;
+   struct tnl_copied_vtx copied;
+   attrfv_func tabfv[_TNL_ATTRIB_MAX][4];
+   struct tnl_eval eval;
+   GLboolean *edgeflag_tmp;
+   GLboolean have_materials;
+};
+
+
+
+
+/* For display lists, this structure holds a run of vertices of the
+ * same format, and a strictly well-formed set of begin/end pairs,
+ * starting on the first vertex and ending at the last.  Vertex
+ * copying on buffer breaks is precomputed according to these
+ * primitives, though there are situations where the copying will need
+ * correction at execute-time, perhaps by replaying the list as
+ * immediate mode commands.
+ *
+ * On executing this list, the 'current' values may be updated with
+ * the values of the final vertex, and often no fixup of the start of
+ * the vertex list is required.
+ *
+ * Eval and other commands that don't fit into these vertex lists are
+ * compiled using the fallback opcode mechanism provided by dlist.c.
+ */
+struct tnl_vertex_list {
+   GLubyte attrsz[_TNL_ATTRIB_MAX];
+   GLuint vertex_size;
+
+   GLfloat *buffer;
+   GLuint count;
+   GLuint wrap_count;		/* number of copied vertices at start */
+   GLboolean have_materials;	/* bit of a hack - quick check for materials */
+   GLboolean dangling_attr_ref;	/* current attr implicitly referenced 
+				   outside the list */
+
+   GLfloat *normal_lengths;
+   struct tnl_prim *prim;
+   GLuint prim_count;
+
+   struct tnl_vertex_store *vertex_store;
+   struct tnl_primitive_store *prim_store;
+};
+
+/* These buffers should be a reasonable size to support upload to
+ * hardware?  Maybe drivers should stitch them back together, or
+ * specify a desired size?
+ */
+#define SAVE_BUFFER_SIZE (16*1024)
+#define SAVE_PRIM_SIZE   128
+
+/* Storage to be shared among several vertex_lists.
+ */
+struct tnl_vertex_store {
+   GLfloat buffer[SAVE_BUFFER_SIZE];
+   GLuint used;
+   GLuint refcount;
+};
+
+struct tnl_primitive_store {
+   struct tnl_prim buffer[SAVE_PRIM_SIZE];
+   GLuint used;
+   GLuint refcount;
+};
+
+
+struct tnl_save {
+   GLubyte attrsz[_TNL_ATTRIB_MAX];
+   GLuint vertex_size;
+
+   GLfloat *buffer;
+   GLuint count;
+   GLuint wrap_count;
+
+   struct tnl_prim *prim;
+   GLuint prim_count, prim_max;
+
+   struct tnl_vertex_store *vertex_store;
+   struct tnl_primitive_store *prim_store;
+
+   GLfloat *vbptr;		   /* cursor, points into buffer */
+   GLfloat vertex[_TNL_ATTRIB_MAX*4];	   /* current values */
+   GLfloat *attrptr[_TNL_ATTRIB_MAX];
+   GLuint counter, initial_counter;
+   GLboolean dangling_attr_ref;
+   GLboolean have_materials;
+
+   GLuint opcode_vertex_list;
+
+   struct tnl_copied_vtx copied;
+
+   GLfloat *current[_TNL_ATTRIB_MAX]; /* points into ctx->ListState */
+   GLubyte *currentsz[_TNL_ATTRIB_MAX];
+
+   void (*tabfv[_TNL_ATTRIB_MAX][4])( const GLfloat * );
+};
+
+
+
+
+
+
+
+struct tnl_vertex_arrays
+{
+   /* Conventional vertex attribute arrays */
+   GLvector4f  Obj;
+   GLvector4f  Normal;
+   GLvector4f  Color;
+   GLvector4f  SecondaryColor;
+   GLvector4f  FogCoord;
+   GLvector4f  TexCoord[MAX_TEXTURE_COORD_UNITS];
+   GLvector4f  Index;
+
+   GLubyte     *EdgeFlag;
+   GLuint      *Elt;
+
+   /* These attributes don't alias with the conventional attributes.
+    * The GL_NV_vertex_program extension defines 16 extra sets of vertex
+    * arrays which have precedent over the conventional arrays when enabled.
+    */
+   GLvector4f  Attribs[_TNL_ATTRIB_MAX];
+};
+
+
+/**
+ * Contains the current state of a running pipeline.
+ */
+struct vertex_buffer
+{
+   /* Constant over life of the vertex_buffer.
+    */
+   GLuint      Size;
+
+   /* Constant over the pipeline.
+    */
+   GLuint      Count;		              /* for everything except Elts */
+
+   /* Pointers to current data.
+    */
+   GLuint      *Elts;		                
+   GLvector4f  *ObjPtr;		                /* _TNL_BIT_POS */
+   GLvector4f  *EyePtr;		                /* _TNL_BIT_POS */
+   GLvector4f  *ClipPtr;	                /* _TNL_BIT_POS */
+   GLvector4f  *NdcPtr;                         /* _TNL_BIT_POS */
+   GLubyte     ClipOrMask;	                /* _TNL_BIT_POS */
+   GLubyte     *ClipMask;		        /* _TNL_BIT_POS */
+   GLvector4f  *NormalPtr;	                /* _TNL_BIT_NORMAL */
+   GLfloat     *NormalLengthPtr;	        /* _TNL_BIT_NORMAL */
+   GLboolean   *EdgeFlag;	                /* _TNL_BIT_EDGEFLAG */
+   GLvector4f  *TexCoordPtr[MAX_TEXTURE_COORD_UNITS]; /* VERT_TEX_0..n */
+   GLvector4f  *IndexPtr[2];	                /* _TNL_BIT_INDEX */
+   GLvector4f  *ColorPtr[2];	                /* _TNL_BIT_COLOR0 */
+   GLvector4f  *SecondaryColorPtr[2];           /* _TNL_BIT_COLOR1 */
+   GLvector4f  *PointSizePtr;	                /* _TNL_BIT_POS */
+   GLvector4f  *FogCoordPtr;	                /* _TNL_BIT_FOG */
+
+   struct tnl_prim  *Primitive;	              
+   GLuint      PrimitiveCount;	      
+
+   /* Inputs to the vertex program stage */
+   GLvector4f *AttribPtr[_TNL_ATTRIB_MAX];      /* GL_NV_vertex_program */
+
+   GLuint LastClipped;
+   /* Private data from _tnl_render_stage that has no business being
+    * in this struct.
+    */
+
+};
+
+
+
+/** Describes an individual operation on the pipeline.
+ */
+struct tnl_pipeline_stage {
+   const char *name;
+   GLuint check_state;		/* All state referenced in check() --
+				 * When is the pipeline_stage struct
+				 * itself invalidated?  Must be
+				 * constant.
+				 */
+
+   /* Usually constant or set by the 'check' callback:
+    */
+   GLuint run_state;		/* All state referenced in run() --
+				 * When is the cached output of the
+				 * stage invalidated?
+				 */
+
+   GLboolean active;		/* True if runnable in current state */
+   GLuint inputs;		/* VERT_* inputs to the stage */
+   GLuint outputs;		/* VERT_* outputs of the stage */
+
+   /* Set in _tnl_run_pipeline():
+    */
+   GLuint changed_inputs;	/* Generated value -- inputs to the
+				 * stage that have changed since last
+				 * call to 'run'.
+				 */
+
+
+   /* Private data for the pipeline stage:
+    */
+   void *privatePtr;
+
+   /* Free private data.  May not be null.
+    */
+   void (*destroy)( struct tnl_pipeline_stage * );
+
+   /* Called from _tnl_validate_pipeline().  Must update all fields in
+    * the pipeline_stage struct for the current state.
+    */
+   void (*check)( GLcontext *ctx, struct tnl_pipeline_stage * );
+
+   /* Called from _tnl_run_pipeline().  The stage.changed_inputs value
+    * encodes all inputs to thee struct which have changed.  If
+    * non-zero, recompute all affected outputs of the stage, otherwise
+    * execute any 'sideeffects' of the stage.
+    *
+    * Return value: GL_TRUE - keep going
+    *               GL_FALSE - finished pipeline
+    */
+   GLboolean (*run)( GLcontext *ctx, struct tnl_pipeline_stage * );
+};
+
+/** Contains the array of all pipeline stages.
+ * The default values are defined at the end of t_pipeline.c */
+struct tnl_pipeline {
+   GLuint build_state_trigger;	  /**< state changes which require build */
+   GLuint build_state_changes;    /**< state changes since last build */
+   GLuint run_state_changes;	  /**< state changes since last run */
+   GLuint run_input_changes;	  /**< VERT_* changes since last run */
+   GLuint inputs;		  /**< VERT_* inputs to pipeline */
+   /** This array has to end with a NULL-pointer. */
+   struct tnl_pipeline_stage stages[MAX_PIPELINE_STAGES+1];
+   GLuint nr_stages;
+};
+
+struct tnl_clipspace_attr;
+
+typedef void (*extract_func)( const struct tnl_clipspace_attr *a, GLfloat *out, 
+			      const GLubyte *v );
+
+typedef void (*insert_func)( const struct tnl_clipspace_attr *a, GLubyte *v, 
+			     const GLfloat *in );
+
+
+struct tnl_clipspace_attr {
+   int attrib;
+   int vertoffset;
+   int vertattrsize;
+   GLubyte *inputptr;
+   int inputstride;
+   insert_func *insert;
+   insert_func emit;
+   extract_func extract;
+   const GLfloat *vp;
+};
+
+
+
+typedef void (*points_func)( GLcontext *ctx, GLuint first, GLuint last );
+typedef void (*line_func)( GLcontext *ctx, GLuint v1, GLuint v2 );
+typedef void (*triangle_func)( GLcontext *ctx,
+                               GLuint v1, GLuint v2, GLuint v3 );
+typedef void (*quad_func)( GLcontext *ctx, GLuint v1, GLuint v2,
+                           GLuint v3, GLuint v4 );
+typedef void (*render_func)( GLcontext *ctx, GLuint start, GLuint count,
+			     GLuint flags );
+typedef void (*interp_func)( GLcontext *ctx,
+			     GLfloat t, GLuint dst, GLuint out, GLuint in,
+			     GLboolean force_boundary );
+typedef void (*copy_pv_func)( GLcontext *ctx, GLuint dst, GLuint src );
+typedef void (*setup_func)( GLcontext *ctx,
+			    GLuint start, GLuint end,
+			    GLuint new_inputs);
+
+
+
+
+struct tnl_clipspace {
+   GLboolean need_extras;
+   
+   GLuint new_inputs;
+
+   GLubyte *vertex_buf;
+   GLuint vertex_size;
+   GLuint max_vertex_size;
+
+   struct tnl_clipspace_attr attr[_TNL_ATTRIB_MAX];
+   GLuint attr_count;
+
+   void (*emit)( GLcontext *ctx, GLuint start, GLuint end, void *dest );
+   interp_func interp;
+   copy_pv_func copy_pv;
+};
+
+
+struct tnl_device_driver {
+   /***
+    *** TNL Pipeline
+    ***/
+
+   void (*RunPipeline)(GLcontext *ctx);
+   /* Replaces PipelineStart/PipelineFinish -- intended to allow
+    * drivers to wrap _tnl_run_pipeline() with code to validate state
+    * and grab/release hardware locks.  
+    */
+
+   void (*NotifyMaterialChange)(GLcontext *ctx);
+   /* Alert tnl-aware drivers of changes to material.
+    */
+
+   GLboolean (*NotifyBegin)(GLcontext *ctx, GLenum p);
+   /* Allow drivers to hook in optimized begin/end engines.
+    * Return value:  GL_TRUE - driver handled the begin
+    *                GL_FALSE - driver didn't handle the begin
+    */
+
+   /***
+    *** Rendering -- These functions called only from t_vb_render.c
+    ***/
+   struct {
+      void (*Start)(GLcontext *ctx);
+      void (*Finish)(GLcontext *ctx);
+      /* Called before and after all rendering operations, including DrawPixels,
+       * ReadPixels, Bitmap, span functions, and CopyTexImage, etc commands.
+       * These are a suitable place for grabbing/releasing hardware locks.
+       */
+
+      void (*PrimitiveNotify)(GLcontext *ctx, GLenum mode);
+      /* Called between RenderStart() and RenderFinish() to indicate the
+       * type of primitive we're about to draw.  Mode will be one of the
+       * modes accepted by glBegin().
+       */
+
+      interp_func Interp;
+      /* The interp function is called by the clipping routines when we need
+       * to generate an interpolated vertex.  All pertinant vertex ancilliary
+       * data should be computed by interpolating between the 'in' and 'out'
+       * vertices.
+       */
+
+      copy_pv_func CopyPV;
+      /* The copy function is used to make a copy of a vertex.  All pertinant
+       * vertex attributes should be copied.
+       */
+
+      void (*ClippedPolygon)( GLcontext *ctx, const GLuint *elts, GLuint n );
+      /* Render a polygon with <n> vertices whose indexes are in the <elts>
+       * array.
+       */
+
+      void (*ClippedLine)( GLcontext *ctx, GLuint v0, GLuint v1 );
+      /* Render a line between the two vertices given by indexes v0 and v1. */
+
+      points_func           Points; /* must now respect vb->elts */
+      line_func             Line;
+      triangle_func         Triangle;
+      quad_func             Quad;
+      /* These functions are called in order to render points, lines,
+       * triangles and quads.  These are only called via the T&L module.
+       */
+
+      render_func          *PrimTabVerts;
+      render_func          *PrimTabElts;
+      /* Render whole unclipped primitives (points, lines, linestrips,
+       * lineloops, etc).  The tables are indexed by the GL enum of the
+       * primitive to be rendered.  RenderTabVerts is used for non-indexed
+       * arrays of vertices.  RenderTabElts is used for indexed arrays of
+       * vertices.
+       */
+
+      void (*ResetLineStipple)( GLcontext *ctx );
+      /* Reset the hardware's line stipple counter.
+       */
+
+      setup_func BuildVertices;
+      /* This function is called whenever new vertices are required for
+       * rendering.  The vertices in question are those n such that start
+       * <= n < end.  The new_inputs parameter indicates those fields of
+       * the vertex which need to be updated, if only a partial repair of
+       * the vertex is required.
+       *
+       * This function is called only from _tnl_render_stage in tnl/t_render.c.
+       */
+      
+
+      GLboolean (*Multipass)( GLcontext *ctx, GLuint passno );
+      /* Driver may request additional render passes by returning GL_TRUE
+       * when this function is called.  This function will be called
+       * after the first pass, and passes will be made until the function
+       * returns GL_FALSE.  If no function is registered, only one pass
+       * is made.
+       *
+       * This function will be first invoked with passno == 1.
+       */
+   } Render;
+};
+   
+
+typedef struct {
+
+   /* Driver interface.
+    */
+   struct tnl_device_driver Driver;
+
+   /* Execute:
+    */
+   struct tnl_vtx vtx;
+   
+   /* Compile:
+    */
+   struct tnl_save save;
+
+   /* Pipeline
+    */
+   struct tnl_pipeline pipeline;
+   struct vertex_buffer vb;
+
+   /* GLvectors for binding to vb:
+    */
+   struct tnl_vertex_arrays vtx_inputs;
+   struct tnl_vertex_arrays save_inputs;
+   struct tnl_vertex_arrays current;
+   struct tnl_vertex_arrays array_inputs;
+
+
+   /* Clipspace/ndc/window vertex managment:
+    */
+   struct tnl_clipspace clipspace;
+
+
+   /* Probably need a better configuration mechanism:
+    */
+   GLboolean NeedNdcCoords;
+   GLboolean LoopbackDListCassettes;
+   GLboolean CalcDListNormalLengths;
+   GLboolean IsolateMaterials;
+
+   /* 
+    */
+   GLuint render_inputs;
+
+
+   GLvertexformat exec_vtxfmt;
+   GLvertexformat save_vtxfmt;
+
+} TNLcontext;
+
+
+
+#define TNL_CONTEXT(ctx) ((TNLcontext *)(ctx->swtnl_context))
+
+
+#define TYPE_IDX(t) ((t) & 0xf)
+#define MAX_TYPES TYPE_IDX(GL_DOUBLE)+1      /* 0xa + 1 */
+
+extern void _tnl_MakeCurrent( GLcontext *ctx,
+			      GLframebuffer *drawBuffer,
+			      GLframebuffer *readBuffer );
+
+
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/tnl/t_pipeline.c b/reactos/lib/mesa32/src/tnl/t_pipeline.c
new file mode 100644
index 00000000000..37ec84a06f4
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl/t_pipeline.c
@@ -0,0 +1,216 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+#include "glheader.h"
+#include "context.h"
+#include "imports.h"
+#include "state.h"
+#include "mtypes.h"
+
+#include "math/m_translate.h"
+#include "math/m_xform.h"
+
+#include "t_context.h"
+#include "t_pipeline.h"
+
+
+void _tnl_install_pipeline( GLcontext *ctx,
+			    const struct tnl_pipeline_stage **stages )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct tnl_pipeline *pipe = &tnl->pipeline;
+   GLuint i;
+
+   ASSERT(pipe->nr_stages == 0);
+
+   pipe->run_state_changes = ~0;
+   pipe->run_input_changes = ~0;
+   pipe->build_state_changes = ~0;
+   pipe->build_state_trigger = 0;
+   pipe->inputs = 0;
+
+   /* Create a writeable copy of each stage.
+    */
+   for (i = 0 ; i < MAX_PIPELINE_STAGES && stages[i] ; i++) {
+      MEMCPY( &pipe->stages[i], stages[i], sizeof( **stages ));
+      pipe->build_state_trigger |= pipe->stages[i].check_state;
+   }
+
+   MEMSET( &pipe->stages[i], 0, sizeof( **stages ));
+
+   pipe->nr_stages = i;
+}
+
+void _tnl_destroy_pipeline( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   GLuint i;
+
+   for (i = 0 ; i < tnl->pipeline.nr_stages ; i++)
+      tnl->pipeline.stages[i].destroy( &tnl->pipeline.stages[i] );
+
+   tnl->pipeline.nr_stages = 0;
+}
+
+/* TODO: merge validate with run.
+ */
+void _tnl_validate_pipeline( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct tnl_pipeline *pipe = &tnl->pipeline;
+   struct tnl_pipeline_stage *s = pipe->stages;
+   GLuint newstate = pipe->build_state_changes;
+   GLuint generated = 0;
+   GLuint changed_inputs = 0;
+
+   pipe->inputs = 0;
+   pipe->build_state_changes = 0;
+
+   for ( ; s->check ; s++) {
+
+      s->changed_inputs |= s->inputs & changed_inputs;
+
+      if (s->check_state & newstate) {
+	 if (s->active) {
+	    GLuint old_outputs = s->outputs;
+	    s->check(ctx, s);
+	    if (!s->active)
+	       changed_inputs |= old_outputs;
+	 }
+	 else
+	    s->check(ctx, s);
+      }
+
+      if (s->active) {
+	 pipe->inputs |= s->inputs & ~generated;
+	 generated |= s->outputs;
+      }
+   }
+}
+
+
+
+void _tnl_run_pipeline( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct tnl_pipeline *pipe = &tnl->pipeline;
+   struct tnl_pipeline_stage *s = pipe->stages;
+   GLuint changed_state = pipe->run_state_changes;
+   GLuint changed_inputs = pipe->run_input_changes;
+   GLboolean running = GL_TRUE;
+#ifdef HAVE_FAST_MATH
+   unsigned short __tmp;
+#endif
+
+   if (!tnl->vb.Count)
+      return;
+
+   pipe->run_state_changes = 0;
+   pipe->run_input_changes = 0;
+
+   /* Done elsewhere.
+    */
+   ASSERT(pipe->build_state_changes == 0);
+
+#ifdef HAVE_FAST_MATH
+   START_FAST_MATH(__tmp);
+#endif
+
+   /* If something changes in the pipeline, tag all subsequent stages
+    * using this value for recalculation.  Inactive stages have their
+    * state and inputs examined to try to keep cached data alive over
+    * state-changes.
+    */
+   for ( ; s->run ; s++) {
+      s->changed_inputs |= s->inputs & changed_inputs;
+
+      if (s->run_state & changed_state)
+	 s->changed_inputs = s->inputs;
+
+      if (s->active && running) {
+	 if (s->changed_inputs)
+	    changed_inputs |= s->outputs;
+
+	 running = s->run( ctx, s );
+
+	 s->changed_inputs = 0;
+      }
+   }
+
+#ifdef HAVE_FAST_MATH
+   END_FAST_MATH(__tmp);
+#endif
+}
+
+
+
+/* The default pipeline.  This is useful for software rasterizers, and
+ * simple hardware rasterizers.  For customization, I don't recommend
+ * tampering with the internals of these stages in the way that
+ * drivers did in Mesa 3.4.  These stages are basically black boxes,
+ * and should be left intact.
+ *
+ * To customize the pipeline, consider:
+ *
+ * - removing redundant stages (making sure that the software rasterizer
+ *   can cope with this on fallback paths).  An example is fog
+ *   coordinate generation, which is not required in the FX driver.
+ *
+ * - replacing general-purpose machine-independent stages with
+ *   general-purpose machine-specific stages.  There is no example of
+ *   this to date, though it must be borne in mind that all subsequent
+ *   stages that reference the output of the new stage must cope with
+ *   any machine-specific data introduced.  This may not be easy
+ *   unless there are no such stages (ie the new stage is the last in
+ *   the pipe).
+ *
+ * - inserting optimized (but specialized) stages ahead of the
+ *   general-purpose fallback implementation.  For example, the old
+ *   fastpath mechanism, which only works when the VB->Elts input is
+ *   available, can be duplicated by placing the fastpath stage at the
+ *   head of this pipeline.  Such specialized stages are currently
+ *   constrained to have no outputs (ie. they must either finish the *
+ *   pipeline by returning GL_FALSE from run(), or do nothing).
+ *
+ * Some work can be done to lift some of the restrictions in the final
+ * case, if it becomes necessary to do so.
+ */
+const struct tnl_pipeline_stage *_tnl_default_pipeline[] = {
+   &_tnl_vertex_transform_stage,
+   &_tnl_normal_transform_stage,
+   &_tnl_lighting_stage,
+   &_tnl_fog_coordinate_stage,
+   &_tnl_texgen_stage,
+   &_tnl_texture_transform_stage,
+   &_tnl_point_attenuation_stage,
+#if FEATURE_NV_vertex_program
+   &_tnl_vertex_program_stage,
+#endif
+   &_tnl_render_stage,
+   0
+};
diff --git a/reactos/lib/mesa32/src/tnl/t_pipeline.h b/reactos/lib/mesa32/src/tnl/t_pipeline.h
new file mode 100644
index 00000000000..02128ea8fd3
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl/t_pipeline.h
@@ -0,0 +1,75 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+
+
+#ifndef _T_PIPELINE_H_
+#define _T_PIPELINE_H_
+
+#include "mtypes.h"
+#include "t_context.h"
+
+extern void _tnl_run_pipeline( GLcontext *ctx );
+
+extern void _tnl_validate_pipeline( GLcontext *ctx );
+
+extern void _tnl_destroy_pipeline( GLcontext *ctx );
+
+extern void _tnl_install_pipeline( GLcontext *ctx,
+				   const struct tnl_pipeline_stage **stages );
+
+
+/* These are implemented in the t_vb_*.c files:
+ */
+extern const struct tnl_pipeline_stage _tnl_vertex_transform_stage;
+extern const struct tnl_pipeline_stage _tnl_normal_transform_stage;
+extern const struct tnl_pipeline_stage _tnl_lighting_stage;
+extern const struct tnl_pipeline_stage _tnl_fog_coordinate_stage;
+extern const struct tnl_pipeline_stage _tnl_texgen_stage;
+extern const struct tnl_pipeline_stage _tnl_texture_transform_stage;
+extern const struct tnl_pipeline_stage _tnl_point_attenuation_stage;
+extern const struct tnl_pipeline_stage _tnl_vertex_program_stage;
+extern const struct tnl_pipeline_stage _tnl_render_stage;
+
+/* Shorthand to plug in the default pipeline:
+ */
+extern const struct tnl_pipeline_stage *_tnl_default_pipeline[];
+
+
+/* Convenience routines provided by t_vb_render.c:
+ */
+extern render_func _tnl_render_tab_elts[];
+extern render_func _tnl_render_tab_verts[];
+
+extern void _tnl_RenderClippedPolygon( GLcontext *ctx, 
+				       const GLuint *elts, GLuint n );
+
+extern void _tnl_RenderClippedLine( GLcontext *ctx, GLuint ii, GLuint jj );
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/tnl/t_save_api.c b/reactos/lib/mesa32/src/tnl/t_save_api.c
new file mode 100644
index 00000000000..a6e7ffd2cba
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl/t_save_api.c
@@ -0,0 +1,1587 @@
+/* $XFree86$ */
+/**************************************************************************
+
+Copyright 2002 Tungsten Graphics Inc., Cedar Park, Texas.
+
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+TUNGSTEN GRAPHICS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+
+
+/* Display list compiler attempts to store lists of vertices with the
+ * same vertex layout.  Additionally it attempts to minimize the need
+ * for execute-time fixup of these vertex lists, allowing them to be
+ * cached on hardware.
+ *
+ * There are still some circumstances where this can be thwarted, for
+ * example by building a list that consists of one very long primitive
+ * (eg Begin(Triangles), 1000 vertices, End), and calling that list
+ * from inside a different begin/end object (Begin(Lines), CallList,
+ * End).  
+ *
+ * In that case the code will have to replay the list as individual
+ * commands through the Exec dispatch table, or fix up the copied
+ * vertices at execute-time.
+ *
+ * The other case where fixup is required is when a vertex attribute
+ * is introduced in the middle of a primitive.  Eg:
+ *  Begin(Lines)
+ *  TexCoord1f()           Vertex2f()
+ *  TexCoord1f() Color3f() Vertex2f()
+ *  End()
+ *
+ *  If the current value of Color isn't known at compile-time, this
+ *  primitive will require fixup.
+ *
+ *
+ * The list compiler currently doesn't attempt to compile lists
+ * containing EvalCoord or EvalPoint commands.  On encountering one of
+ * these, compilation falls back to opcodes.  
+ *
+ * This could be improved to fallback only when a mix of EvalCoord and
+ * Vertex commands are issued within a single primitive.
+ */
+
+
+#include "glheader.h"
+#include "context.h"
+#include "dlist.h"
+#include "enums.h"
+#include "macros.h"
+#include "api_validate.h"
+#include "api_arrayelt.h"
+#include "vtxfmt.h"
+#include "t_save_api.h"
+
+/*
+ * NOTE: Old 'parity' issue is gone, but copying can still be
+ * wrong-footed on replay.
+ */
+static GLuint _save_copy_vertices( GLcontext *ctx, 
+				   const struct tnl_vertex_list *node )
+{
+   TNLcontext *tnl = TNL_CONTEXT( ctx );
+   const struct tnl_prim *prim = &node->prim[node->prim_count-1];
+   GLuint nr = prim->count;
+   GLuint sz = tnl->save.vertex_size;
+   const GLfloat *src = node->buffer + prim->start * sz;
+   GLfloat *dst = tnl->save.copied.buffer;
+   GLuint ovf, i;
+
+   if (prim->mode & PRIM_END)
+      return 0;
+	 
+   switch( prim->mode & PRIM_MODE_MASK )
+   {
+   case GL_POINTS:
+      return 0;
+   case GL_LINES:
+      ovf = nr&1;
+      for (i = 0 ; i < ovf ; i++)
+	 _mesa_memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz*sizeof(GLfloat) );
+      return i;
+   case GL_TRIANGLES:
+      ovf = nr%3;
+      for (i = 0 ; i < ovf ; i++)
+	 _mesa_memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz*sizeof(GLfloat) );
+      return i;
+   case GL_QUADS:
+      ovf = nr&3;
+      for (i = 0 ; i < ovf ; i++)
+	 _mesa_memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz*sizeof(GLfloat) );
+      return i;
+   case GL_LINE_STRIP:
+      if (nr == 0) 
+	 return 0;
+      else {
+	 _mesa_memcpy( dst, src+(nr-1)*sz, sz*sizeof(GLfloat) );
+	 return 1;
+      }
+   case GL_LINE_LOOP:
+   case GL_TRIANGLE_FAN:
+   case GL_POLYGON:
+      if (nr == 0) 
+	 return 0;
+      else if (nr == 1) {
+	 _mesa_memcpy( dst, src+0, sz*sizeof(GLfloat) );
+	 return 1;
+      } else {
+	 _mesa_memcpy( dst, src+0, sz*sizeof(GLfloat) );
+	 _mesa_memcpy( dst+sz, src+(nr-1)*sz, sz*sizeof(GLfloat) );
+	 return 2;
+      }
+   case GL_TRIANGLE_STRIP:
+   case GL_QUAD_STRIP:
+      switch (nr) {
+      case 0: ovf = 0; break;
+      case 1: ovf = 1; break;
+      default: ovf = 2 + (nr&1); break;
+      }
+      for (i = 0 ; i < ovf ; i++)
+	 _mesa_memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz*sizeof(GLfloat) );
+      return i;
+   default:
+      assert(0);
+      return 0;
+   }
+}
+
+
+static void
+build_normal_lengths( struct tnl_vertex_list *node )
+{
+   GLuint i;
+   GLfloat *len;
+   GLfloat *n = node->buffer;
+   GLuint stride = node->vertex_size;
+   GLuint count = node->count;
+
+   len = node->normal_lengths = (GLfloat *) MALLOC( count * sizeof(GLfloat) );
+   if (!len)
+      return;
+
+   /* Find the normal of the first vertex:
+    */
+   for (i = 0 ; i < _TNL_ATTRIB_NORMAL ; i++) 
+      n += node->attrsz[i];
+
+   for (i = 0 ; i < count ; i++, n += stride) {
+      len[i] = LEN_3FV( n );
+      if (len[i] > 0.0F) len[i] = 1.0F / len[i];
+   } 
+}
+
+static struct tnl_vertex_store *alloc_vertex_store( GLcontext *ctx )
+{
+   struct tnl_vertex_store *store = MALLOC_STRUCT(tnl_vertex_store);
+   store->used = 0;
+   store->refcount = 1;
+   return store;
+}
+
+static struct tnl_primitive_store *alloc_prim_store( GLcontext *ctx )
+{
+   struct tnl_primitive_store *store = MALLOC_STRUCT(tnl_primitive_store);
+   store->used = 0;
+   store->refcount = 1;
+   return store;
+}
+
+static void _save_reset_counters( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+
+   tnl->save.prim = tnl->save.prim_store->buffer + tnl->save.prim_store->used;
+   tnl->save.buffer = (tnl->save.vertex_store->buffer + 
+		       tnl->save.vertex_store->used);
+
+   if (tnl->save.vertex_size)
+      tnl->save.initial_counter = ((SAVE_BUFFER_SIZE - 
+				    tnl->save.vertex_store->used) / 
+				   tnl->save.vertex_size);
+   else
+      tnl->save.initial_counter = 0;
+
+   if (tnl->save.initial_counter > ctx->Const.MaxArrayLockSize )
+      tnl->save.initial_counter = ctx->Const.MaxArrayLockSize;
+
+   tnl->save.counter = tnl->save.initial_counter;
+   tnl->save.prim_count = 0;
+   tnl->save.prim_max = SAVE_PRIM_SIZE - tnl->save.prim_store->used;
+   tnl->save.copied.nr = 0;
+   tnl->save.dangling_attr_ref = 0;
+}
+
+
+/* Insert the active immediate struct onto the display list currently
+ * being built.
+ */
+static void _save_compile_vertex_list( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct tnl_vertex_list *node;
+
+   /* Allocate space for this structure in the display list currently
+    * being compiled.
+    */
+   node = (struct tnl_vertex_list *)
+      _mesa_alloc_instruction(ctx, tnl->save.opcode_vertex_list, sizeof(*node));
+
+   if (!node)
+      return;
+
+   /* Duplicate our template, increment refcounts to the storage structs:
+    */
+   _mesa_memcpy(node->attrsz, tnl->save.attrsz, sizeof(node->attrsz));
+   node->vertex_size = tnl->save.vertex_size;
+   node->buffer = tnl->save.buffer;
+   node->wrap_count = tnl->save.copied.nr;
+   node->count = tnl->save.initial_counter - tnl->save.counter;
+   node->prim = tnl->save.prim;
+   node->prim_count = tnl->save.prim_count;
+   node->vertex_store = tnl->save.vertex_store;
+   node->prim_store = tnl->save.prim_store;
+   node->dangling_attr_ref = tnl->save.dangling_attr_ref;
+   node->normal_lengths = 0;
+
+   node->vertex_store->refcount++;
+   node->prim_store->refcount++;
+
+   assert(node->attrsz[_TNL_ATTRIB_POS] != 0 ||
+	  node->count == 0);
+
+   /* Maybe calculate normal lengths:
+    */
+   if (tnl->CalcDListNormalLengths && 
+       node->attrsz[_TNL_ATTRIB_NORMAL] == 3 &&
+       !node->dangling_attr_ref)
+      build_normal_lengths( node );
+
+   tnl->save.vertex_store->used += tnl->save.vertex_size * node->count;
+   tnl->save.prim_store->used += node->prim_count;
+
+   /* Decide whether the storage structs are full, or can be used for
+    * the next vertex lists as well.
+    */
+   if (tnl->save.vertex_store->used > 
+       SAVE_BUFFER_SIZE - 16 * (tnl->save.vertex_size + 4)) {
+
+      tnl->save.vertex_store->refcount--; 
+      assert(tnl->save.vertex_store->refcount != 0);
+      tnl->save.vertex_store = alloc_vertex_store( ctx );
+      tnl->save.vbptr = tnl->save.vertex_store->buffer;
+   } 
+
+   if (tnl->save.prim_store->used > SAVE_PRIM_SIZE - 6) {
+      tnl->save.prim_store->refcount--; 
+      assert(tnl->save.prim_store->refcount != 0);
+      tnl->save.prim_store = alloc_prim_store( ctx );
+   } 
+
+   /* Reset our structures for the next run of vertices:
+    */
+   _save_reset_counters( ctx );
+
+   /* Copy duplicated vertices 
+    */
+   tnl->save.copied.nr = _save_copy_vertices( ctx, node );
+
+
+   /* Deal with GL_COMPILE_AND_EXECUTE:
+    */
+   if (ctx->ExecuteFlag) {
+      _tnl_playback_vertex_list( ctx, (void *) node );
+   }
+}
+
+
+/* TODO -- If no new vertices have been stored, don't bother saving
+ * it.
+ */
+static void _save_wrap_buffers( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   GLint i = tnl->save.prim_count - 1;
+   GLenum mode;
+
+   assert(i < (GLint) tnl->save.prim_max);
+   assert(i >= 0);
+
+   /* Close off in-progress primitive.
+    */
+   tnl->save.prim[i].count = ((tnl->save.initial_counter - tnl->save.counter) - 
+			     tnl->save.prim[i].start);
+   mode = tnl->save.prim[i].mode & ~(PRIM_BEGIN|PRIM_END);
+   
+   /* store the copied vertices, and allocate a new list.
+    */
+   _save_compile_vertex_list( ctx );
+
+   /* Restart interrupted primitive
+    */
+   tnl->save.prim[0].mode = mode;
+   tnl->save.prim[0].start = 0;
+   tnl->save.prim[0].count = 0;
+   tnl->save.prim_count = 1;
+}
+
+
+
+/* Called only when buffers are wrapped as the result of filling the
+ * vertex_store struct.  
+ */
+static void _save_wrap_filled_vertex( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   GLfloat *data = tnl->save.copied.buffer;
+   GLuint i;
+
+   /* Emit a glEnd to close off the last vertex list.
+    */
+   _save_wrap_buffers( ctx );
+   
+    /* Copy stored stored vertices to start of new list.
+    */
+   assert(tnl->save.counter > tnl->save.copied.nr);
+
+   for (i = 0 ; i < tnl->save.copied.nr ; i++) {
+      _mesa_memcpy( tnl->save.vbptr, data, tnl->save.vertex_size * sizeof(GLfloat));
+      data += tnl->save.vertex_size;
+      tnl->save.vbptr += tnl->save.vertex_size;
+      tnl->save.counter--;
+   }
+}
+
+
+static void _save_copy_to_current( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx); 
+   GLuint i;
+
+   for (i = _TNL_ATTRIB_POS+1 ; i <= _TNL_ATTRIB_INDEX ; i++) {
+      if (tnl->save.attrsz[i]) {
+	 tnl->save.currentsz[i][0] = tnl->save.attrsz[i];
+	 ASSIGN_4V(tnl->save.current[i], 0, 0, 0, 1);
+	 COPY_SZ_4V(tnl->save.current[i], 
+		    tnl->save.attrsz[i], 
+		    tnl->save.attrptr[i]);
+      }
+   }
+
+   /* Edgeflag requires special treatment:
+    */
+   if (tnl->save.attrsz[_TNL_ATTRIB_EDGEFLAG]) {
+      ctx->ListState.ActiveEdgeFlag = 1;
+      ctx->ListState.CurrentEdgeFlag = 
+	 (tnl->save.attrptr[_TNL_ATTRIB_EDGEFLAG][0] == 1.0);
+   }
+}
+
+
+static void _save_copy_from_current( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx); 
+   GLint i;
+
+   for (i = _TNL_ATTRIB_POS+1 ; i <= _TNL_ATTRIB_INDEX ; i++) 
+      switch (tnl->save.attrsz[i]) {
+      case 4: tnl->save.attrptr[i][3] = tnl->save.current[i][3];
+      case 3: tnl->save.attrptr[i][2] = tnl->save.current[i][2];
+      case 2: tnl->save.attrptr[i][1] = tnl->save.current[i][1];
+      case 1: tnl->save.attrptr[i][0] = tnl->save.current[i][0];
+      case 0: break;
+      }
+
+   /* Edgeflag requires special treatment:
+    */
+   if (tnl->save.attrsz[_TNL_ATTRIB_EDGEFLAG]) 
+      tnl->save.attrptr[_TNL_ATTRIB_EDGEFLAG][0] = 
+	 (GLfloat)ctx->ListState.CurrentEdgeFlag;
+}
+
+
+
+
+/* Flush existing data, set new attrib size, replay copied vertices.
+ */ 
+static void _save_upgrade_vertex( GLcontext *ctx, 
+				 GLuint attr,
+				 GLuint newsz )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   GLuint oldsz;
+   GLuint i;
+   GLfloat *tmp;
+
+   /* Store the current run of vertices, and emit a GL_END.  Emit a
+    * BEGIN in the new buffer.
+    */
+   if (tnl->save.initial_counter != tnl->save.counter) 
+      _save_wrap_buffers( ctx );
+   else
+      assert( tnl->save.copied.nr == 0 );
+
+   /* Do a COPY_TO_CURRENT to ensure back-copying works for the case
+    * when the attribute already exists in the vertex and is having
+    * its size increased.  
+    */
+   _save_copy_to_current( ctx );
+
+   /* Fix up sizes:
+    */
+   oldsz = tnl->save.attrsz[attr];
+   tnl->save.attrsz[attr] = newsz;
+
+   tnl->save.vertex_size += newsz - oldsz;
+   tnl->save.counter = ((SAVE_BUFFER_SIZE - tnl->save.vertex_store->used) / 
+			tnl->save.vertex_size);
+   if (tnl->save.counter > ctx->Const.MaxArrayLockSize )
+      tnl->save.counter = ctx->Const.MaxArrayLockSize;
+   tnl->save.initial_counter = tnl->save.counter;
+
+
+   /* Recalculate all the attrptr[] values:
+    */
+   for (i = 0, tmp = tnl->save.vertex ; i < _TNL_ATTRIB_MAX ; i++) {
+      if (tnl->save.attrsz[i]) {
+	 tnl->save.attrptr[i] = tmp;
+	 tmp += tnl->save.attrsz[i];
+      }
+      else 
+	 tnl->save.attrptr[i] = 0; /* will not be dereferenced. */
+   }
+
+   /* Copy from current to repopulate the vertex with correct values.
+    */
+   _save_copy_from_current( ctx );
+
+
+   /* Replay stored vertices to translate them to new format here.
+    *
+    * If there are copied vertices and the new (upgraded) attribute
+    * has not been defined before, this list is somewhat degenerate,
+    * and will need fixup at runtime.
+    */
+   if (tnl->save.copied.nr)
+   {
+      GLfloat *data = tnl->save.copied.buffer;
+      GLfloat *dest = tnl->save.buffer;
+      GLuint j;
+
+      /* Need to note this and fix up at runtime (or loopback):
+       */
+      if (tnl->save.currentsz[attr] == 0) {
+	 assert(oldsz == 0);
+	 tnl->save.dangling_attr_ref = GL_TRUE;
+	 _mesa_debug(0, "_save_upgrade_vertex: dangling reference attr %d\n", 
+                     attr); 
+
+#if 0
+	 /* The current strategy is to punt these degenerate cases
+	  * through _tnl_loopback_vertex_list(), a lower-performance
+	  * option.  To minimize the impact of this, artificially
+	  * reduce the size of this vertex_list.
+	  */
+	 if (t->save.counter > 10) {
+	    t->save.initial_counter = 10;
+	    t->save.counter = 10;
+	 }
+#endif
+      }
+
+      for (i = 0 ; i < tnl->save.copied.nr ; i++) {
+	 for (j = 0 ; j < _TNL_ATTRIB_MAX ; j++) {
+	    if (tnl->save.attrsz[j]) {
+	       if (j == attr) {
+		  ASSIGN_4V( dest, 0, 0, 0, 1 );
+		  COPY_SZ_4V( dest, oldsz, data );
+		  data += oldsz;
+		  dest += newsz;
+	       }
+	       else {
+		  GLint sz = tnl->save.attrsz[j];
+		  COPY_SZ_4V( dest, sz, data );
+		  data += sz;
+		  dest += sz;
+	       }
+	    }
+	 }
+      }
+
+      tnl->save.vbptr = dest;
+      tnl->save.counter -= tnl->save.copied.nr;
+   }
+}
+
+
+
+
+/* Helper function for 'CHOOSE' macro.  Do what's necessary when an
+ * entrypoint is called for the first time.
+ */
+static void do_choose( GLuint attr, GLuint sz, 
+		       void (*attr_func)( const GLfloat *),
+		       void (*choose1)( const GLfloat *),
+		       void (*choose2)( const GLfloat *),
+		       void (*choose3)( const GLfloat *),
+		       void (*choose4)( const GLfloat *),
+		       const GLfloat *v )
+{ 
+   GET_CURRENT_CONTEXT( ctx ); 
+   TNLcontext *tnl = TNL_CONTEXT(ctx); 
+   static GLfloat id[4] = { 0, 0, 0, 1 };
+   int i;
+
+   if (tnl->save.attrsz[attr] < sz) {
+      /* New size is larger.  Need to flush existing vertices and get
+       * an enlarged vertex format.
+       */
+      _save_upgrade_vertex( ctx, attr, sz );
+   }
+   else {
+      /* New size is equal or smaller - just need to fill in some
+       * zeros.
+       */
+      for (i = sz ; i <= tnl->save.attrsz[attr] ; i++)
+	 tnl->save.attrptr[attr][i-1] = id[i-1];
+   }
+
+   /* Reset any active pointers for this attribute 
+    */
+   tnl->save.tabfv[attr][0] = choose1;
+   tnl->save.tabfv[attr][1] = choose2;
+   tnl->save.tabfv[attr][2] = choose3;
+   tnl->save.tabfv[attr][3] = choose4;
+
+   /* Update the secondary dispatch table with the new function
+    */
+   tnl->save.tabfv[attr][sz-1] = attr_func;
+
+   (*attr_func)(v);
+}
+
+
+
+/* Only one size for each attribute may be active at once.  Eg. if
+ * Color3f is installed/active, then Color4f may not be, even if the
+ * vertex actually contains 4 color coordinates.  This is because the
+ * 3f version won't otherwise set color[3] to 1.0 -- this is the job
+ * of the chooser function when switching between Color4f and Color3f.
+ */
+#define ATTRFV( ATTR, N )					\
+static void save_choose_##ATTR##_##N( const GLfloat *v );	\
+								\
+static void save_attrib_##ATTR##_##N( const GLfloat *v )	\
+{								\
+   GET_CURRENT_CONTEXT( ctx );					\
+   TNLcontext *tnl = TNL_CONTEXT(ctx);				\
+								\
+   if ((ATTR) == 0) {						\
+      GLuint i;							\
+								\
+      if (N>0) tnl->save.vbptr[0] = v[0];			\
+      if (N>1) tnl->save.vbptr[1] = v[1];			\
+      if (N>2) tnl->save.vbptr[2] = v[2];			\
+      if (N>3) tnl->save.vbptr[3] = v[3];			\
+								\
+      for (i = N; i < tnl->save.vertex_size; i++)		\
+	 tnl->save.vbptr[i] = tnl->save.vertex[i];		\
+								\
+      tnl->save.vbptr += tnl->save.vertex_size;			\
+								\
+      if (--tnl->save.counter == 0)				\
+	 _save_wrap_filled_vertex( ctx );			\
+   }								\
+   else {							\
+      GLfloat *dest = tnl->save.attrptr[ATTR];			\
+      if (N>0) dest[0] = v[0];					\
+      if (N>1) dest[1] = v[1];					\
+      if (N>2) dest[2] = v[2];					\
+      if (N>3) dest[3] = v[3];					\
+   }								\
+}
+
+#define CHOOSE( ATTR, N )					\
+static void save_choose_##ATTR##_##N( const GLfloat *v )	\
+{								\
+   do_choose(ATTR, N,						\
+	     save_attrib_##ATTR##_##N,				\
+	     save_choose_##ATTR##_1,				\
+	     save_choose_##ATTR##_2,				\
+	     save_choose_##ATTR##_3,				\
+	     save_choose_##ATTR##_4,				\
+	     v );						\
+}
+
+#define INIT(ATTR)					\
+static void save_init_##ATTR( TNLcontext *tnl )		\
+{							\
+   tnl->save.tabfv[ATTR][0] = save_choose_##ATTR##_1;	\
+   tnl->save.tabfv[ATTR][1] = save_choose_##ATTR##_2;	\
+   tnl->save.tabfv[ATTR][2] = save_choose_##ATTR##_3;	\
+   tnl->save.tabfv[ATTR][3] = save_choose_##ATTR##_4;	\
+}
+   
+#define ATTRS( ATTRIB )				\
+   ATTRFV( ATTRIB, 1 )				\
+   ATTRFV( ATTRIB, 2 )				\
+   ATTRFV( ATTRIB, 3 )				\
+   ATTRFV( ATTRIB, 4 )				\
+   CHOOSE( ATTRIB, 1 )				\
+   CHOOSE( ATTRIB, 2 )				\
+   CHOOSE( ATTRIB, 3 )				\
+   CHOOSE( ATTRIB, 4 )				\
+   INIT( ATTRIB )				\
+
+
+/* Generate a lot of functions.  These are the actual worker
+ * functions, which are equivalent to those generated via codegen
+ * elsewhere.
+ */
+ATTRS( 0 )
+ATTRS( 1 )
+ATTRS( 2 )
+ATTRS( 3 )
+ATTRS( 4 )
+ATTRS( 5 )
+ATTRS( 6 )
+ATTRS( 7 )
+ATTRS( 8 )
+ATTRS( 9 )
+ATTRS( 10 )
+ATTRS( 11 )
+ATTRS( 12 )
+ATTRS( 13 )
+ATTRS( 14 )
+ATTRS( 15 )
+
+
+static void _save_reset_vertex( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   GLuint i;
+
+   save_init_0( tnl );
+   save_init_1( tnl );
+   save_init_2( tnl );
+   save_init_3( tnl );
+   save_init_4( tnl );
+   save_init_5( tnl );
+   save_init_6( tnl );
+   save_init_7( tnl );
+   save_init_8( tnl );
+   save_init_9( tnl );
+   save_init_10( tnl );
+   save_init_11( tnl );
+   save_init_12( tnl );
+   save_init_13( tnl );
+   save_init_14( tnl );
+   save_init_15( tnl );
+      
+   for (i = 0 ; i < _TNL_ATTRIB_MAX ; i++)
+      tnl->save.attrsz[i] = 0;
+      
+   tnl->save.vertex_size = 0;
+   tnl->save.have_materials = 0;
+
+   _save_reset_counters( ctx ); 
+}
+
+
+
+/* Cope with aliasing of classic Vertex, Normal, etc. and the fan-out
+ * of glMultTexCoord and glProgramParamterNV by routing all these
+ * through a second level dispatch table.
+ */
+#define DISPATCH_ATTRFV( ATTR, COUNT, P )	\
+do {						\
+   GET_CURRENT_CONTEXT( ctx ); 			\
+   TNLcontext *tnl = TNL_CONTEXT(ctx); 		\
+   tnl->save.tabfv[ATTR][COUNT-1]( P );		\
+} while (0)
+
+#define DISPATCH_ATTR1FV( ATTR, V ) DISPATCH_ATTRFV( ATTR, 1, V )
+#define DISPATCH_ATTR2FV( ATTR, V ) DISPATCH_ATTRFV( ATTR, 2, V )
+#define DISPATCH_ATTR3FV( ATTR, V ) DISPATCH_ATTRFV( ATTR, 3, V )
+#define DISPATCH_ATTR4FV( ATTR, V ) DISPATCH_ATTRFV( ATTR, 4, V )
+
+#define DISPATCH_ATTR1F( ATTR, S ) DISPATCH_ATTRFV( ATTR, 1, &(S) )
+
+#define DISPATCH_ATTR2F( ATTR, S,T ) 		\
+do { 						\
+   GLfloat v[2]; 				\
+   v[0] = S; v[1] = T;				\
+   DISPATCH_ATTR2FV( ATTR, v );			\
+} while (0)
+#define DISPATCH_ATTR3F( ATTR, S,T,R ) 		\
+do { 						\
+   GLfloat v[3]; 				\
+   v[0] = S; v[1] = T; v[2] = R;		\
+   DISPATCH_ATTR3FV( ATTR, v );			\
+} while (0)
+#define DISPATCH_ATTR4F( ATTR, S,T,R,Q )	\
+do { 						\
+   GLfloat v[4]; 				\
+   v[0] = S; v[1] = T; v[2] = R; v[3] = Q;	\
+   DISPATCH_ATTR4FV( ATTR, v );			\
+} while (0)
+
+
+static void enum_error( void )
+{
+   GET_CURRENT_CONTEXT( ctx );
+   _mesa_compile_error( ctx, GL_INVALID_ENUM, "glVertexAttrib" );
+}
+
+static void GLAPIENTRY _save_Vertex2f( GLfloat x, GLfloat y )
+{
+   DISPATCH_ATTR2F( _TNL_ATTRIB_POS, x, y );
+}
+
+static void GLAPIENTRY _save_Vertex2fv( const GLfloat *v )
+{
+   DISPATCH_ATTR2FV( _TNL_ATTRIB_POS, v );
+}
+
+static void GLAPIENTRY _save_Vertex3f( GLfloat x, GLfloat y, GLfloat z )
+{
+   DISPATCH_ATTR3F( _TNL_ATTRIB_POS, x, y, z );
+}
+
+static void GLAPIENTRY _save_Vertex3fv( const GLfloat *v )
+{
+   DISPATCH_ATTR3FV( _TNL_ATTRIB_POS, v );
+}
+
+static void GLAPIENTRY _save_Vertex4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w )
+{
+   DISPATCH_ATTR4F( _TNL_ATTRIB_POS, x, y, z, w );
+}
+
+static void GLAPIENTRY _save_Vertex4fv( const GLfloat *v )
+{
+   DISPATCH_ATTR4FV( _TNL_ATTRIB_POS, v );
+}
+
+static void GLAPIENTRY _save_TexCoord1f( GLfloat x )
+{
+   DISPATCH_ATTR1F( _TNL_ATTRIB_TEX0, x );
+}
+
+static void GLAPIENTRY _save_TexCoord1fv( const GLfloat *v )
+{
+   DISPATCH_ATTR1FV( _TNL_ATTRIB_TEX0, v );
+}
+
+static void GLAPIENTRY _save_TexCoord2f( GLfloat x, GLfloat y )
+{
+   DISPATCH_ATTR2F( _TNL_ATTRIB_TEX0, x, y );
+}
+
+static void GLAPIENTRY _save_TexCoord2fv( const GLfloat *v )
+{
+   DISPATCH_ATTR2FV( _TNL_ATTRIB_TEX0, v );
+}
+
+static void GLAPIENTRY _save_TexCoord3f( GLfloat x, GLfloat y, GLfloat z )
+{
+   DISPATCH_ATTR3F( _TNL_ATTRIB_TEX0, x, y, z );
+}
+
+static void GLAPIENTRY _save_TexCoord3fv( const GLfloat *v )
+{
+   DISPATCH_ATTR3FV( _TNL_ATTRIB_TEX0, v );
+}
+
+static void GLAPIENTRY _save_TexCoord4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w )
+{
+   DISPATCH_ATTR4F( _TNL_ATTRIB_TEX0, x, y, z, w );
+}
+
+static void GLAPIENTRY _save_TexCoord4fv( const GLfloat *v )
+{
+   DISPATCH_ATTR4FV( _TNL_ATTRIB_TEX0, v );
+}
+
+static void GLAPIENTRY _save_Normal3f( GLfloat x, GLfloat y, GLfloat z )
+{
+   DISPATCH_ATTR3F( _TNL_ATTRIB_NORMAL, x, y, z );
+}
+
+static void GLAPIENTRY _save_Normal3fv( const GLfloat *v )
+{
+   DISPATCH_ATTR3FV( _TNL_ATTRIB_NORMAL, v );
+}
+
+static void GLAPIENTRY _save_FogCoordfEXT( GLfloat x )
+{
+   DISPATCH_ATTR1F( _TNL_ATTRIB_FOG, x );
+}
+
+static void GLAPIENTRY _save_FogCoordfvEXT( const GLfloat *v )
+{
+   DISPATCH_ATTR1FV( _TNL_ATTRIB_FOG, v );
+}
+
+static void GLAPIENTRY _save_Color3f( GLfloat x, GLfloat y, GLfloat z )
+{
+   DISPATCH_ATTR3F( _TNL_ATTRIB_COLOR0, x, y, z );
+}
+
+static void GLAPIENTRY _save_Color3fv( const GLfloat *v )
+{
+   DISPATCH_ATTR3FV( _TNL_ATTRIB_COLOR0, v );
+}
+
+static void GLAPIENTRY _save_Color4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w )
+{
+   DISPATCH_ATTR4F( _TNL_ATTRIB_COLOR0, x, y, z, w );
+}
+
+static void GLAPIENTRY _save_Color4fv( const GLfloat *v )
+{
+   DISPATCH_ATTR4FV( _TNL_ATTRIB_COLOR0, v );
+}
+
+static void GLAPIENTRY _save_SecondaryColor3fEXT( GLfloat x, GLfloat y, GLfloat z )
+{
+   DISPATCH_ATTR3F( _TNL_ATTRIB_COLOR1, x, y, z );
+}
+
+static void GLAPIENTRY _save_SecondaryColor3fvEXT( const GLfloat *v )
+{
+   DISPATCH_ATTR3FV( _TNL_ATTRIB_COLOR1, v );
+}
+
+static void GLAPIENTRY _save_MultiTexCoord1f( GLenum target, GLfloat x  )
+{
+   GLuint attr = (target & 0x7) + _TNL_ATTRIB_TEX0;
+   DISPATCH_ATTR1F( attr, x );
+}
+
+static void GLAPIENTRY _save_MultiTexCoord1fv( GLenum target, const GLfloat *v )
+{
+   GLuint attr = (target & 0x7) + _TNL_ATTRIB_TEX0;
+   DISPATCH_ATTR1FV( attr, v );
+}
+
+static void GLAPIENTRY _save_MultiTexCoord2f( GLenum target, GLfloat x, GLfloat y )
+{
+   GLuint attr = (target & 0x7) + _TNL_ATTRIB_TEX0;
+   DISPATCH_ATTR2F( attr, x, y );
+}
+
+static void GLAPIENTRY _save_MultiTexCoord2fv( GLenum target, const GLfloat *v )
+{
+   GLuint attr = (target & 0x7) + _TNL_ATTRIB_TEX0;
+   DISPATCH_ATTR2FV( attr, v );
+}
+
+static void GLAPIENTRY _save_MultiTexCoord3f( GLenum target, GLfloat x, GLfloat y,
+				    GLfloat z)
+{
+   GLuint attr = (target & 0x7) + _TNL_ATTRIB_TEX0;
+   DISPATCH_ATTR3F( attr, x, y, z );
+}
+
+static void GLAPIENTRY _save_MultiTexCoord3fv( GLenum target, const GLfloat *v )
+{
+   GLuint attr = (target & 0x7) + _TNL_ATTRIB_TEX0;
+   DISPATCH_ATTR3FV( attr, v );
+}
+
+static void GLAPIENTRY _save_MultiTexCoord4f( GLenum target, GLfloat x, GLfloat y,
+				    GLfloat z, GLfloat w )
+{
+   GLuint attr = (target & 0x7) + _TNL_ATTRIB_TEX0;
+   DISPATCH_ATTR4F( attr, x, y, z, w );
+}
+
+static void GLAPIENTRY _save_MultiTexCoord4fv( GLenum target, const GLfloat *v )
+{
+   GLuint attr = (target & 0x7) + _TNL_ATTRIB_TEX0;
+   DISPATCH_ATTR4FV( attr, v );
+}
+
+static void GLAPIENTRY _save_VertexAttrib1fNV( GLuint index, GLfloat x )
+{
+   if (index < VERT_ATTRIB_MAX)
+      DISPATCH_ATTR1F( index, x );
+   else
+      enum_error(); 
+}
+
+static void GLAPIENTRY _save_VertexAttrib1fvNV( GLuint index, const GLfloat *v )
+{
+   if (index < VERT_ATTRIB_MAX)
+      DISPATCH_ATTR1FV( index, v );
+   else
+      enum_error();
+}
+
+static void GLAPIENTRY _save_VertexAttrib2fNV( GLuint index, GLfloat x, GLfloat y )
+{
+   if (index < VERT_ATTRIB_MAX)
+      DISPATCH_ATTR2F( index, x, y );
+   else
+      enum_error();
+}
+
+static void GLAPIENTRY _save_VertexAttrib2fvNV( GLuint index, const GLfloat *v )
+{
+   if (index < VERT_ATTRIB_MAX)
+      DISPATCH_ATTR2FV( index, v );
+   else
+      enum_error();
+}
+
+static void GLAPIENTRY _save_VertexAttrib3fNV( GLuint index, GLfloat x, GLfloat y, 
+				  GLfloat z )
+{
+   if (index < VERT_ATTRIB_MAX)
+      DISPATCH_ATTR3F( index, x, y, z );
+   else
+      enum_error();
+}
+
+static void GLAPIENTRY _save_VertexAttrib3fvNV( GLuint index, const GLfloat *v )
+{
+   if (index < VERT_ATTRIB_MAX)
+      DISPATCH_ATTR3FV( index, v );
+   else
+      enum_error();
+}
+
+static void GLAPIENTRY _save_VertexAttrib4fNV( GLuint index, GLfloat x, GLfloat y,
+				  GLfloat z, GLfloat w )
+{
+   if (index < VERT_ATTRIB_MAX)
+      DISPATCH_ATTR4F( index, x, y, z, w );
+   else
+      enum_error();
+}
+
+static void GLAPIENTRY _save_VertexAttrib4fvNV( GLuint index, const GLfloat *v )
+{
+   if (index < VERT_ATTRIB_MAX)
+      DISPATCH_ATTR4FV( index, v );
+   else
+      enum_error();
+}
+
+
+/* Materials:  
+ * 
+ * These are treated as per-vertex attributes, at indices above where
+ * the NV_vertex_program leaves off.  There are a lot of good things
+ * about treating materials this way.  
+ *
+ * However: I don't want to double the number of generated functions
+ * just to cope with this, so I unroll the 'C' varients of CHOOSE and
+ * ATTRF into this function, and dispense with codegen and
+ * second-level dispatch.
+ *
+ * There is no aliasing of material attributes with other entrypoints.
+ */
+#define MAT_ATTR( A, N, params )			\
+do {							\
+   if (tnl->save.attrsz[A] < N) {			\
+      _save_upgrade_vertex( ctx, A, N );		\
+      tnl->save.have_materials = GL_TRUE;               \
+   }							\
+							\
+   {							\
+      GLfloat *dest = tnl->save.attrptr[A];	      	\
+      if (N>0) dest[0] = params[0];			\
+      if (N>1) dest[1] = params[1];			\
+      if (N>2) dest[2] = params[2];			\
+      if (N>3) dest[3] = params[3];			\
+   }							\
+} while (0)
+
+
+#define MAT( ATTR, N, face, params )			\
+do {							\
+   if (face != GL_BACK)					\
+      MAT_ATTR( ATTR, N, params ); /* front */		\
+   if (face != GL_FRONT)				\
+      MAT_ATTR( ATTR + 1, N, params ); /* back */	\
+} while (0)
+
+
+/* NOTE: Have to remove/deal-with colormaterial crossovers, probably
+ * later on - in the meantime just store everything.  
+ */
+static void GLAPIENTRY _save_Materialfv( GLenum face, GLenum pname, 
+			       const GLfloat *params )
+{
+   GET_CURRENT_CONTEXT( ctx ); 
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+
+   switch (pname) {
+   case GL_EMISSION:
+      MAT( _TNL_ATTRIB_MAT_FRONT_EMISSION, 4, face, params );
+      break;
+   case GL_AMBIENT:
+      MAT( _TNL_ATTRIB_MAT_FRONT_AMBIENT, 4, face, params );
+      break;
+   case GL_DIFFUSE:
+      MAT( _TNL_ATTRIB_MAT_FRONT_DIFFUSE, 4, face, params );
+      break;
+   case GL_SPECULAR:
+      MAT( _TNL_ATTRIB_MAT_FRONT_SPECULAR, 4, face, params );
+      break;
+   case GL_SHININESS:
+      MAT( _TNL_ATTRIB_MAT_FRONT_SHININESS, 1, face, params );
+      break;
+   case GL_COLOR_INDEXES:
+      MAT( _TNL_ATTRIB_MAT_FRONT_INDEXES, 3, face, params );
+      break;
+   case GL_AMBIENT_AND_DIFFUSE:
+      MAT( _TNL_ATTRIB_MAT_FRONT_AMBIENT, 4, face, params );
+      MAT( _TNL_ATTRIB_MAT_FRONT_DIFFUSE, 4, face, params );
+      break;
+   default:
+      _mesa_compile_error( ctx, GL_INVALID_ENUM, "glMaterialfv" );
+      return;
+   }
+}
+
+
+#define IDX_ATTR( A, IDX )				\
+do {							\
+   GET_CURRENT_CONTEXT( ctx );				\
+   TNLcontext *tnl = TNL_CONTEXT(ctx);			\
+							\
+   if (tnl->save.attrsz[A] < 1) {			\
+      _save_upgrade_vertex( ctx, A, 1 );		\
+   }							\
+							\
+   {							\
+      GLfloat *dest = tnl->save.attrptr[A];		\
+      dest[0] = IDX;				\
+   }							\
+} while (0)
+
+
+static void GLAPIENTRY _save_EdgeFlag( GLboolean b )
+{
+   IDX_ATTR( _TNL_ATTRIB_EDGEFLAG, (GLfloat)b );
+}
+
+static void GLAPIENTRY _save_EdgeFlagv( const GLboolean *v )
+{
+   IDX_ATTR( _TNL_ATTRIB_EDGEFLAG, (GLfloat)(v[0]) );
+}
+
+static void GLAPIENTRY _save_Indexf( GLfloat f )
+{
+   IDX_ATTR( _TNL_ATTRIB_INDEX, f );
+}
+
+static void GLAPIENTRY _save_Indexfv( const GLfloat *f )
+{
+   IDX_ATTR( _TNL_ATTRIB_INDEX, f[0] );
+}
+
+
+
+
+/* Cope with EvalCoord/CallList called within a begin/end object:
+ *     -- Flush current buffer
+ *     -- Fallback to opcodes for the rest of the begin/end object.
+ */
+#define FALLBACK(ctx) 							\
+do {									\
+   TNLcontext *tnl = TNL_CONTEXT(ctx);					\
+									\
+   /*fprintf(stderr, "fallback %s inside begin/end\n", __FUNCTION__);*/	\
+									\
+   if (tnl->save.initial_counter != tnl->save.counter ||		\
+       tnl->save.prim_count) 						\
+      _save_compile_vertex_list( ctx );					\
+									\
+   _save_copy_to_current( ctx );					\
+   _save_reset_vertex( ctx );						\
+   _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );	\
+   ctx->Driver.SaveNeedFlush = 0;					\
+} while (0)
+
+static void GLAPIENTRY _save_EvalCoord1f( GLfloat u )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FALLBACK(ctx);
+   ctx->Save->EvalCoord1f( u );
+}
+
+static void GLAPIENTRY _save_EvalCoord1fv( const GLfloat *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FALLBACK(ctx);
+   ctx->Save->EvalCoord1fv( v );
+}
+
+static void GLAPIENTRY _save_EvalCoord2f( GLfloat u, GLfloat v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FALLBACK(ctx);
+   ctx->Save->EvalCoord2f( u, v );
+}
+
+static void GLAPIENTRY _save_EvalCoord2fv( const GLfloat *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FALLBACK(ctx);
+   ctx->Save->EvalCoord2fv( v );
+}
+
+static void GLAPIENTRY _save_EvalPoint1( GLint i )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FALLBACK(ctx);
+   ctx->Save->EvalPoint1( i );
+}
+
+static void GLAPIENTRY _save_EvalPoint2( GLint i, GLint j )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FALLBACK(ctx);
+   ctx->Save->EvalPoint2( i, j );
+}
+
+static void GLAPIENTRY _save_CallList( GLuint l )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FALLBACK(ctx);
+   ctx->Save->CallList( l );
+}
+
+static void GLAPIENTRY _save_CallLists( GLsizei n, GLenum type, const GLvoid *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   FALLBACK(ctx);
+   ctx->Save->CallLists( n, type, v );
+}
+
+
+
+
+/* This begin is hooked into ...  Updating of
+ * ctx->Driver.CurrentSavePrimitive is already taken care of.
+ */
+static GLboolean _save_NotifyBegin( GLcontext *ctx, GLenum mode )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx); 
+
+   if (1) {
+      GLuint i = tnl->save.prim_count++;
+
+      assert(i < tnl->save.prim_max);
+      tnl->save.prim[i].mode = mode | PRIM_BEGIN;
+      tnl->save.prim[i].start = tnl->save.initial_counter - tnl->save.counter;
+      tnl->save.prim[i].count = 0;   
+
+      _mesa_install_save_vtxfmt( ctx, &tnl->save_vtxfmt );      
+      ctx->Driver.SaveNeedFlush = 1;
+      return GL_TRUE;
+   }
+   else 
+      return GL_FALSE;
+}
+
+
+
+static void GLAPIENTRY _save_End( void )
+{
+   GET_CURRENT_CONTEXT( ctx ); 
+   TNLcontext *tnl = TNL_CONTEXT(ctx); 
+   GLint i = tnl->save.prim_count - 1;
+
+   ctx->Driver.CurrentSavePrimitive = PRIM_OUTSIDE_BEGIN_END;
+   tnl->save.prim[i].mode |= PRIM_END;
+   tnl->save.prim[i].count = ((tnl->save.initial_counter - tnl->save.counter) - 
+			      tnl->save.prim[i].start);
+
+   if (i == (GLint) tnl->save.prim_max - 1) {
+      _save_compile_vertex_list( ctx );
+      assert(tnl->save.copied.nr == 0);
+   }
+
+   /* Swap out this vertex format while outside begin/end.  Any color,
+    * etc. received between here and the next begin will be compiled
+    * as opcodes.
+    */   
+   _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );
+}
+
+
+/* These are all errors as this vtxfmt is only installed inside
+ * begin/end pairs.
+ */
+static void GLAPIENTRY _save_DrawElements(GLenum mode, GLsizei count, GLenum type,
+			       const GLvoid *indices)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glDrawElements" );
+}
+
+
+static void GLAPIENTRY _save_DrawRangeElements(GLenum mode,
+				    GLuint start, GLuint end,
+				    GLsizei count, GLenum type,
+				    const GLvoid *indices)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glDrawRangeElements" );
+}
+
+static void GLAPIENTRY _save_DrawArrays(GLenum mode, GLint start, GLsizei count)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glDrawArrays" );
+}
+
+static void GLAPIENTRY _save_Rectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glRectf" );
+}
+
+static void GLAPIENTRY _save_EvalMesh1( GLenum mode, GLint i1, GLint i2 )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glEvalMesh1" );
+}
+
+static void GLAPIENTRY _save_EvalMesh2( GLenum mode, GLint i1, GLint i2,
+				  GLint j1, GLint j2 )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glEvalMesh2" );
+}
+
+static void GLAPIENTRY _save_Begin( GLenum mode )
+{
+   GET_CURRENT_CONTEXT( ctx );
+   _mesa_compile_error( ctx, GL_INVALID_OPERATION, "Recursive glBegin" );
+}
+
+
+/* Unlike the functions above, these are to be hooked into the vtxfmt
+ * maintained in ctx->ListState, active when the list is known or
+ * suspected to be outside any begin/end primitive.
+ */
+static void GLAPIENTRY _save_OBE_Rectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _save_NotifyBegin( ctx, GL_QUADS | PRIM_WEAK );
+   _glapi_Dispatch->Vertex2f( x1, y1 );
+   _glapi_Dispatch->Vertex2f( x2, y1 );
+   _glapi_Dispatch->Vertex2f( x2, y2 );
+   _glapi_Dispatch->Vertex2f( x1, y2 );
+   _glapi_Dispatch->End();
+}
+
+
+static void GLAPIENTRY _save_OBE_DrawArrays(GLenum mode, GLint start, GLsizei count)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint i;
+
+   if (!_mesa_validate_DrawArrays( ctx, mode, start, count ))
+      return;
+
+   _save_NotifyBegin( ctx, mode | PRIM_WEAK );
+   for (i = 0; i < count; i++)
+      _glapi_Dispatch->ArrayElement(start + i);
+   _glapi_Dispatch->End();
+}
+
+
+static void GLAPIENTRY _save_OBE_DrawElements(GLenum mode, GLsizei count, GLenum type,
+				   const GLvoid *indices)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint i;
+
+   if (!_mesa_validate_DrawElements( ctx, mode, count, type, indices ))
+      return;
+
+   _save_NotifyBegin( ctx, mode | PRIM_WEAK );
+
+   switch (type) {
+   case GL_UNSIGNED_BYTE:
+      for (i = 0 ; i < count ; i++)
+	 _glapi_Dispatch->ArrayElement( ((GLubyte *)indices)[i] );
+      break;
+   case GL_UNSIGNED_SHORT:
+      for (i = 0 ; i < count ; i++)
+	 _glapi_Dispatch->ArrayElement( ((GLushort *)indices)[i] );
+      break;
+   case GL_UNSIGNED_INT:
+      for (i = 0 ; i < count ; i++)
+	 _glapi_Dispatch->ArrayElement( ((GLuint *)indices)[i] );
+      break;
+   default:
+      _mesa_error( ctx, GL_INVALID_ENUM, "glDrawElements(type)" );
+      break;
+   }
+
+   _glapi_Dispatch->End();
+}
+
+static void GLAPIENTRY _save_OBE_DrawRangeElements(GLenum mode,
+					GLuint start, GLuint end,
+					GLsizei count, GLenum type,
+					const GLvoid *indices)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (_mesa_validate_DrawRangeElements( ctx, mode,
+					 start, end,
+					 count, type, indices ))
+      _save_OBE_DrawElements( mode, count, type, indices );
+}
+
+
+
+
+
+static void _save_vtxfmt_init( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   GLvertexformat *vfmt = &tnl->save_vtxfmt;
+
+   vfmt->ArrayElement = _ae_loopback_array_elt;	        /* generic helper */
+   vfmt->Begin = _save_Begin;
+   vfmt->Color3f = _save_Color3f;
+   vfmt->Color3fv = _save_Color3fv;
+   vfmt->Color4f = _save_Color4f;
+   vfmt->Color4fv = _save_Color4fv;
+   vfmt->EdgeFlag = _save_EdgeFlag;
+   vfmt->EdgeFlagv = _save_EdgeFlagv;
+   vfmt->End = _save_End;
+   vfmt->FogCoordfEXT = _save_FogCoordfEXT;
+   vfmt->FogCoordfvEXT = _save_FogCoordfvEXT;
+   vfmt->Indexf = _save_Indexf;
+   vfmt->Indexfv = _save_Indexfv;
+   vfmt->Materialfv = _save_Materialfv;
+   vfmt->MultiTexCoord1fARB = _save_MultiTexCoord1f;
+   vfmt->MultiTexCoord1fvARB = _save_MultiTexCoord1fv;
+   vfmt->MultiTexCoord2fARB = _save_MultiTexCoord2f;
+   vfmt->MultiTexCoord2fvARB = _save_MultiTexCoord2fv;
+   vfmt->MultiTexCoord3fARB = _save_MultiTexCoord3f;
+   vfmt->MultiTexCoord3fvARB = _save_MultiTexCoord3fv;
+   vfmt->MultiTexCoord4fARB = _save_MultiTexCoord4f;
+   vfmt->MultiTexCoord4fvARB = _save_MultiTexCoord4fv;
+   vfmt->Normal3f = _save_Normal3f;
+   vfmt->Normal3fv = _save_Normal3fv;
+   vfmt->SecondaryColor3fEXT = _save_SecondaryColor3fEXT;
+   vfmt->SecondaryColor3fvEXT = _save_SecondaryColor3fvEXT;
+   vfmt->TexCoord1f = _save_TexCoord1f;
+   vfmt->TexCoord1fv = _save_TexCoord1fv;
+   vfmt->TexCoord2f = _save_TexCoord2f;
+   vfmt->TexCoord2fv = _save_TexCoord2fv;
+   vfmt->TexCoord3f = _save_TexCoord3f;
+   vfmt->TexCoord3fv = _save_TexCoord3fv;
+   vfmt->TexCoord4f = _save_TexCoord4f;
+   vfmt->TexCoord4fv = _save_TexCoord4fv;
+   vfmt->Vertex2f = _save_Vertex2f;
+   vfmt->Vertex2fv = _save_Vertex2fv;
+   vfmt->Vertex3f = _save_Vertex3f;
+   vfmt->Vertex3fv = _save_Vertex3fv;
+   vfmt->Vertex4f = _save_Vertex4f;
+   vfmt->Vertex4fv = _save_Vertex4fv;
+   vfmt->VertexAttrib1fNV = _save_VertexAttrib1fNV;
+   vfmt->VertexAttrib1fvNV = _save_VertexAttrib1fvNV;
+   vfmt->VertexAttrib2fNV = _save_VertexAttrib2fNV;
+   vfmt->VertexAttrib2fvNV = _save_VertexAttrib2fvNV;
+   vfmt->VertexAttrib3fNV = _save_VertexAttrib3fNV;
+   vfmt->VertexAttrib3fvNV = _save_VertexAttrib3fvNV;
+   vfmt->VertexAttrib4fNV = _save_VertexAttrib4fNV;
+   vfmt->VertexAttrib4fvNV = _save_VertexAttrib4fvNV;
+   
+   /* This will all require us to fallback to saving the list as opcodes:
+    */ 
+   vfmt->CallList = _save_CallList; /* inside begin/end */
+   vfmt->CallLists = _save_CallLists; /* inside begin/end */
+   vfmt->EvalCoord1f = _save_EvalCoord1f;
+   vfmt->EvalCoord1fv = _save_EvalCoord1fv;
+   vfmt->EvalCoord2f = _save_EvalCoord2f;
+   vfmt->EvalCoord2fv = _save_EvalCoord2fv;
+   vfmt->EvalPoint1 = _save_EvalPoint1;
+   vfmt->EvalPoint2 = _save_EvalPoint2;
+
+   /* These are all errors as we at least know we are in some sort of
+    * begin/end pair:
+    */
+   vfmt->EvalMesh1 = _save_EvalMesh1;	
+   vfmt->EvalMesh2 = _save_EvalMesh2;
+   vfmt->Begin = _save_Begin;
+   vfmt->Rectf = _save_Rectf;
+   vfmt->DrawArrays = _save_DrawArrays;
+   vfmt->DrawElements = _save_DrawElements;
+   vfmt->DrawRangeElements = _save_DrawRangeElements;
+
+}
+
+
+void _tnl_SaveFlushVertices( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+
+   /* Noop when we are actually active:
+    */
+   if (ctx->Driver.CurrentSavePrimitive == PRIM_INSIDE_UNKNOWN_PRIM ||
+       ctx->Driver.CurrentSavePrimitive <= GL_POLYGON)
+      return;
+
+   if (tnl->save.initial_counter != tnl->save.counter ||
+       tnl->save.prim_count) 
+      _save_compile_vertex_list( ctx );
+   
+   _save_copy_to_current( ctx );
+   _save_reset_vertex( ctx );
+   ctx->Driver.SaveNeedFlush = 0;
+}
+
+void _tnl_NewList( GLcontext *ctx, GLuint list, GLenum mode )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+
+   if (!tnl->save.prim_store)
+      tnl->save.prim_store = alloc_prim_store( ctx );
+
+   if (!tnl->save.vertex_store) {
+      tnl->save.vertex_store = alloc_vertex_store( ctx );
+      tnl->save.vbptr = tnl->save.vertex_store->buffer;
+   }
+   
+   _save_reset_vertex( ctx );
+   ctx->Driver.SaveNeedFlush = 0;
+}
+
+void _tnl_EndList( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   assert(tnl->save.vertex_size == 0);
+}
+ 
+void _tnl_BeginCallList( GLcontext *ctx, GLuint list )
+{
+}
+
+void _tnl_EndCallList( GLcontext *ctx )
+{
+}
+
+
+static void _tnl_destroy_vertex_list( GLcontext *ctx, void *data )
+{
+   struct tnl_vertex_list *node = (struct tnl_vertex_list *)data;
+
+   if ( --node->vertex_store->refcount == 0 )
+      FREE( node->vertex_store );
+
+   if ( --node->prim_store->refcount == 0 )
+      FREE( node->prim_store );
+
+   if ( node->normal_lengths )
+      FREE( node->normal_lengths );
+}
+
+
+static void _tnl_print_vertex_list( GLcontext *ctx, void *data )
+{
+   struct tnl_vertex_list *node = (struct tnl_vertex_list *)data;
+   GLuint i;
+
+   _mesa_debug(0, "TNL-VERTEX-LIST, %u vertices %d primitives, %d vertsize\n",
+               node->count,
+	       node->prim_count,
+	       node->vertex_size);
+
+   for (i = 0 ; i < node->prim_count ; i++) {
+      struct tnl_prim *prim = &node->prim[i];
+      _mesa_debug(0, "   prim %d: %s %d..%d %s %s\n",
+		  i, 
+		  _mesa_lookup_enum_by_nr(prim->mode & PRIM_MODE_MASK),
+		  prim->start, 
+		  prim->start + prim->count,
+		  (prim->mode & PRIM_BEGIN) ? "BEGIN" : "(wrap)",
+		  (prim->mode & PRIM_END) ? "END" : "(wrap)");
+   }
+}
+
+
+static void _save_current_init( GLcontext *ctx ) 
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   GLint i;
+
+   for (i = 0; i < _TNL_ATTRIB_MAT_FRONT_AMBIENT; i++) {
+      ASSERT(i < VERT_ATTRIB_MAX);
+      tnl->save.currentsz[i] = &ctx->ListState.ActiveAttribSize[i];
+      tnl->save.current[i] = ctx->ListState.CurrentAttrib[i];
+   }
+
+   for (i = _TNL_ATTRIB_MAT_FRONT_AMBIENT; i < _TNL_ATTRIB_INDEX; i++) {
+      const GLuint j = i - _TNL_ATTRIB_MAT_FRONT_AMBIENT;
+      ASSERT(j < MAT_ATTRIB_MAX);
+      tnl->save.currentsz[i] = &ctx->ListState.ActiveMaterialSize[j];
+      tnl->save.current[i] = ctx->ListState.CurrentMaterial[j];
+   }
+
+   tnl->save.currentsz[_TNL_ATTRIB_INDEX] = &ctx->ListState.ActiveIndex;
+   tnl->save.current[_TNL_ATTRIB_INDEX] = &ctx->ListState.CurrentIndex;
+
+   /* Current edgeflag is handled individually */
+}
+
+/**
+ * Initialize the display list compiler
+ */
+void _tnl_save_init( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct tnl_vertex_arrays *tmp = &tnl->save_inputs;
+   GLuint i;
+
+
+   for (i = 0; i < _TNL_ATTRIB_MAX; i++)
+      _mesa_vector4f_init( &tmp->Attribs[i], 0, 0);
+
+   tnl->save.opcode_vertex_list =
+      _mesa_alloc_opcode( ctx,
+			  sizeof(struct tnl_vertex_list),
+			  _tnl_playback_vertex_list,
+			  _tnl_destroy_vertex_list,
+			  _tnl_print_vertex_list );
+
+   ctx->Driver.NotifySaveBegin = _save_NotifyBegin;
+
+   _save_vtxfmt_init( ctx );
+   _save_current_init( ctx );
+
+   /* Hook our array functions into the outside-begin-end vtxfmt in 
+    * ctx->ListState.
+    */
+   ctx->ListState.ListVtxfmt.Rectf = _save_OBE_Rectf;
+   ctx->ListState.ListVtxfmt.DrawArrays = _save_OBE_DrawArrays;
+   ctx->ListState.ListVtxfmt.DrawElements = _save_OBE_DrawElements;
+   ctx->ListState.ListVtxfmt.DrawRangeElements = _save_OBE_DrawRangeElements;
+   _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );
+}
+
+
+/**
+ * Deallocate the immediate-mode buffer for the given context, if
+ * its reference count goes to zero.
+ */
+void _tnl_save_destroy( GLcontext *ctx )
+{
+}
diff --git a/reactos/lib/mesa32/src/tnl/t_save_api.h b/reactos/lib/mesa32/src/tnl/t_save_api.h
new file mode 100644
index 00000000000..eec2d685b00
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl/t_save_api.h
@@ -0,0 +1,58 @@
+/* $XFree86$ */
+/**************************************************************************
+
+Copyright 2002 Tungsten Graphics Inc., Cedar Park, Texas.
+
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+TUNGSTEN GRAPHICS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Keith Whitwell <keith@tungstengraphics.com>
+ *
+ */
+
+#ifndef __T_SAVE_API_H__
+#define __T_SAVE_API_H__
+
+#include "t_context.h"
+
+extern GLboolean _tnl_weak_begin( GLcontext *ctx, GLenum mode );
+
+extern void _tnl_EndList( GLcontext *ctx );
+extern void _tnl_NewList( GLcontext *ctx, GLuint list, GLenum mode );
+
+extern void _tnl_EndCallList( GLcontext *ctx );
+extern void _tnl_BeginCallList( GLcontext *ctx, GLuint list );
+
+extern void _tnl_SaveFlushVertices( GLcontext *ctx );
+
+extern void _tnl_save_init( GLcontext *ctx );
+extern void _tnl_save_destroy( GLcontext *ctx );
+
+extern void _tnl_loopback_vertex_list( GLcontext *ctx,
+				       const struct tnl_vertex_list *list );
+
+extern void _tnl_playback_vertex_list( GLcontext *ctx, void *data );
+
+#endif
diff --git a/reactos/lib/mesa32/src/tnl/t_save_loopback.c b/reactos/lib/mesa32/src/tnl/t_save_loopback.c
new file mode 100644
index 00000000000..088b73609a6
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl/t_save_loopback.c
@@ -0,0 +1,305 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/* Author:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+#include "glheader.h"
+#include "context.h"
+#include "enums.h"
+#include "glapi.h"
+#include "imports.h"
+#include "macros.h"
+#include "mtypes.h"
+#include "t_context.h"
+#include "t_save_api.h"
+
+/* If someone compiles a display list like:
+ *      glBegin(Triangles)
+ *      glVertex() 
+ *      ... lots of vertices ...
+ *      glEnd()
+ *
+ * or: 
+ *      glDrawArrays(...)
+ * 
+ * and then tries to execute it like this:
+ *
+ *      glBegin(Lines)
+ *      glCallList()
+ *      glEnd()
+ *
+ * it will wind up in here, as the vertex copying used when wrapping
+ * buffers in list compilation (Triangles) won't be right for how the
+ * list is being executed (as Lines). 
+ *
+ * This could be avoided by not compiling as vertex_lists until after
+ * the first glEnd() has been seen.  However, that would miss an
+ * important category of display lists, for the sake of a degenerate
+ * usage. 
+ *
+ * Further, replaying degenerately-called lists in this fashion is
+ * probably still faster than the replay using opcodes.
+ */
+
+typedef void (*attr_func)( GLcontext *ctx, GLint target, const GLfloat * );
+
+
+/* Wrapper functions in case glVertexAttrib*fvNV doesn't exist */
+static void VertexAttrib1fvNV(GLcontext *ctx, GLint target, const GLfloat *v)
+{
+   ctx->Exec->VertexAttrib1fvNV(target, v);
+}
+
+static void VertexAttrib2fvNV(GLcontext *ctx, GLint target, const GLfloat *v)
+{
+   ctx->Exec->VertexAttrib2fvNV(target, v);
+}
+
+static void VertexAttrib3fvNV(GLcontext *ctx, GLint target, const GLfloat *v)
+{
+   ctx->Exec->VertexAttrib3fvNV(target, v);
+}
+
+static void VertexAttrib4fvNV(GLcontext *ctx, GLint target, const GLfloat *v)
+{
+   ctx->Exec->VertexAttrib4fvNV(target, v);
+}
+
+static attr_func vert_attrfunc[4] = {
+   VertexAttrib1fvNV,
+   VertexAttrib2fvNV,
+   VertexAttrib3fvNV,
+   VertexAttrib4fvNV
+};
+
+
+static void mat_attr1fv( GLcontext *ctx, GLint target, const GLfloat *v )
+{
+   switch (target) {
+   case _TNL_ATTRIB_MAT_FRONT_SHININESS:
+      ctx->Exec->Materialfv( GL_FRONT, GL_SHININESS, v );
+      break;
+   case _TNL_ATTRIB_MAT_BACK_SHININESS:
+      ctx->Exec->Materialfv( GL_BACK, GL_SHININESS, v );
+      break;
+   }
+}
+
+
+static void mat_attr3fv( GLcontext *ctx, GLint target, const GLfloat *v )
+{
+   switch (target) {
+   case _TNL_ATTRIB_MAT_FRONT_INDEXES:
+      ctx->Exec->Materialfv( GL_FRONT, GL_COLOR_INDEXES, v );
+      break;
+   case _TNL_ATTRIB_MAT_BACK_INDEXES:
+      ctx->Exec->Materialfv( GL_BACK, GL_COLOR_INDEXES, v );
+      break;
+   }
+}
+
+
+static void mat_attr4fv( GLcontext *ctx, GLint target, const GLfloat *v )
+{
+   switch (target) {
+   case _TNL_ATTRIB_MAT_FRONT_EMISSION:
+      ctx->Exec->Materialfv( GL_FRONT, GL_EMISSION, v );
+      break;
+   case _TNL_ATTRIB_MAT_BACK_EMISSION:
+      ctx->Exec->Materialfv( GL_BACK, GL_EMISSION, v );
+      break;
+   case _TNL_ATTRIB_MAT_FRONT_AMBIENT:
+      ctx->Exec->Materialfv( GL_FRONT, GL_AMBIENT, v );
+      break;
+   case _TNL_ATTRIB_MAT_BACK_AMBIENT:
+      ctx->Exec->Materialfv( GL_BACK, GL_AMBIENT, v );
+      break;
+   case _TNL_ATTRIB_MAT_FRONT_DIFFUSE:
+      ctx->Exec->Materialfv( GL_FRONT, GL_DIFFUSE, v );
+      break;
+   case _TNL_ATTRIB_MAT_BACK_DIFFUSE:
+      ctx->Exec->Materialfv( GL_BACK, GL_DIFFUSE, v );
+      break;
+   case _TNL_ATTRIB_MAT_FRONT_SPECULAR:
+      ctx->Exec->Materialfv( GL_FRONT, GL_SPECULAR, v );
+      break;
+   case _TNL_ATTRIB_MAT_BACK_SPECULAR:
+      ctx->Exec->Materialfv( GL_BACK, GL_SPECULAR, v );
+      break;
+   }
+}
+
+
+static attr_func mat_attrfunc[4] = {
+   mat_attr1fv,
+   0,
+   mat_attr3fv,
+   mat_attr4fv
+};
+
+
+static void index_attr1fv(GLcontext *ctx, GLint target, const GLfloat *v)
+{
+   ctx->Exec->Indexf(v[0]);
+}
+
+static void edgeflag_attr1fv(GLcontext *ctx, GLint target, const GLfloat *v)
+{
+   ctx->Exec->EdgeFlag((GLboolean)(v[0] == 1.0));
+}
+
+struct loopback_attr {
+   GLint target;
+   GLint sz;
+   attr_func func;
+};
+
+/* Don't emit ends and begins on wrapped primitives.  Don't replay
+ * wrapped vertices.  If we get here, it's probably because the the
+ * precalculated wrapping is wrong.
+ */
+static void loopback_prim( GLcontext *ctx,
+			   const struct tnl_vertex_list *list, GLuint i,
+			   const struct loopback_attr *la, GLuint nr )
+{
+   struct tnl_prim *prim = &list->prim[i];
+   GLint begin = prim->start;
+   GLint end = begin + prim->count;
+   GLfloat *data;
+   GLint j;
+   GLuint k;
+
+   if (prim->mode & PRIM_BEGIN) {
+      glBegin( prim->mode & PRIM_MODE_MASK );
+   }
+   else {
+      assert(i == 0);
+      assert(begin == 0);
+      begin += list->wrap_count;
+   }
+
+   data = list->buffer + begin * list->vertex_size;
+
+   for (j = begin ; j < end ; j++) {
+      GLfloat *tmp = data + la[0].sz;
+
+      for (k = 1 ; k < nr ; k++) {
+	 la[k].func( ctx, la[k].target, tmp );
+	 tmp += la[k].sz;
+      }
+	 
+      /* Fire the vertex
+       */
+      la[0].func( ctx, VERT_ATTRIB_POS, data );
+      data = tmp;
+   }
+
+   if (prim->mode & PRIM_END) {
+      glEnd();
+   }
+   else {
+      assert (i == list->prim_count-1);
+   }
+}
+
+/* Primitives generated by DrawArrays/DrawElements/Rectf may be
+ * caught here.  If there is no primitive in progress, execute them
+ * normally, otherwise need to track and discard the generated
+ * primitives.
+ */
+static void loopback_weak_prim( GLcontext *ctx,
+				const struct tnl_vertex_list *list, GLuint i,
+				const struct loopback_attr *la, GLuint nr )
+{
+   if (ctx->Driver.CurrentExecPrimitive == PRIM_OUTSIDE_BEGIN_END) 
+      loopback_prim( ctx, list, i, la, nr );
+   else {
+      struct tnl_prim *prim = &list->prim[i];
+
+      /* Use the prim_weak flag to ensure that if this primitive
+       * wraps, we don't mistake future vertex_lists for part of the
+       * surrounding primitive.
+       *
+       * While this flag is set, we are simply disposing of data
+       * generated by an operation now known to be a noop.
+       */
+      if (prim->mode & PRIM_BEGIN)
+	 ctx->Driver.CurrentExecPrimitive |= PRIM_WEAK;
+      if (prim->mode & PRIM_END)
+	 ctx->Driver.CurrentExecPrimitive &= ~PRIM_WEAK;
+   }
+}
+
+
+
+void _tnl_loopback_vertex_list( GLcontext *ctx,
+                                const struct tnl_vertex_list *list )
+{
+   struct loopback_attr la[_TNL_ATTRIB_MAX];
+   GLuint i, nr = 0;
+
+   for (i = 0 ; i <= _TNL_ATTRIB_TEX7 ; i++) {
+      if (list->attrsz[i]) {
+	 la[nr].target = i;
+	 la[nr].sz = list->attrsz[i];
+	 la[nr].func = vert_attrfunc[list->attrsz[i]-1];
+	 nr++;
+      }
+   }
+
+   for (i = _TNL_ATTRIB_MAT_FRONT_AMBIENT ; 
+	i <= _TNL_ATTRIB_MAT_BACK_INDEXES ; 
+	i++) {
+      if (list->attrsz[i]) {
+	 la[nr].target = i;
+	 la[nr].sz = list->attrsz[i];
+	 la[nr].func = mat_attrfunc[list->attrsz[i]-1];
+	 nr++;
+      }
+   }
+
+   if (list->attrsz[_TNL_ATTRIB_EDGEFLAG]) {
+      la[nr].target = _TNL_ATTRIB_EDGEFLAG;
+      la[nr].sz = list->attrsz[_TNL_ATTRIB_EDGEFLAG];
+      la[nr].func = edgeflag_attr1fv;
+      nr++;
+   }
+
+   if (list->attrsz[_TNL_ATTRIB_INDEX]) {
+      la[nr].target = _TNL_ATTRIB_INDEX;
+      la[nr].sz = list->attrsz[_TNL_ATTRIB_INDEX];
+      la[nr].func = index_attr1fv;
+      nr++;
+   }
+
+   for (i = 0 ; i < list->prim_count ; i++) {
+      if (list->prim[i].mode & PRIM_WEAK)
+	 loopback_weak_prim( ctx, list, i, la, nr );
+      else
+	 loopback_prim( ctx, list, i, la, nr );
+   }
+}
diff --git a/reactos/lib/mesa32/src/tnl/t_save_playback.c b/reactos/lib/mesa32/src/tnl/t_save_playback.c
new file mode 100644
index 00000000000..8d353b3f7b4
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl/t_save_playback.c
@@ -0,0 +1,217 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/* Author:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+#include "glheader.h"
+#include "context.h"
+#include "imports.h"
+#include "mtypes.h"
+#include "macros.h"
+#include "light.h"
+#include "state.h"
+#include "t_pipeline.h"
+#include "t_save_api.h"
+#include "t_vtx_api.h"
+
+static GLint get_size( const GLfloat *f )
+{
+   if (f[3] != 1.0) return 4;
+   if (f[2] != 0.0) return 3;
+   return 2;
+}
+
+
+/* Some nasty stuff still hanging on here.  
+ *
+ * TODO - remove VB->ColorPtr, etc and just use the AttrPtr's.
+ */
+static void _tnl_bind_vertex_list( GLcontext *ctx,
+                                   const struct tnl_vertex_list *node )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct vertex_buffer *VB = &tnl->vb;
+   struct tnl_vertex_arrays *tmp = &tnl->save_inputs;
+   GLfloat *data = node->buffer;
+   GLuint attr, i;
+
+   /* Setup constant data in the VB.
+    */
+   VB->Count = node->count;
+   VB->Primitive = node->prim;
+   VB->PrimitiveCount = node->prim_count;
+   VB->Elts = NULL;
+   VB->NormalLengthPtr = node->normal_lengths;
+
+   for (attr = 0; attr <= _TNL_ATTRIB_INDEX; attr++) {
+      if (node->attrsz[attr]) {
+	 tmp->Attribs[attr].count = node->count;
+	 tmp->Attribs[attr].data = (GLfloat (*)[4]) data;
+	 tmp->Attribs[attr].start = data;
+	 tmp->Attribs[attr].size = node->attrsz[attr];
+	 tmp->Attribs[attr].stride = node->vertex_size * sizeof(GLfloat);
+	 VB->AttribPtr[attr] = &tmp->Attribs[attr];
+	 data += node->attrsz[attr];
+      }
+      else {
+	 tmp->Attribs[attr].count = node->count;
+	 tmp->Attribs[attr].data = (GLfloat (*)[4]) tnl->vtx.current[attr];
+	 tmp->Attribs[attr].start = tnl->vtx.current[attr];
+	 tmp->Attribs[attr].size = get_size( tnl->vtx.current[attr] );
+	 tmp->Attribs[attr].stride = 0;
+	 VB->AttribPtr[attr] = &tmp->Attribs[attr];
+      }
+   }
+
+   
+   /* Copy edgeflag to a contiguous array
+    */
+   if (ctx->Polygon.FrontMode != GL_FILL || ctx->Polygon.BackMode != GL_FILL) {
+      if (node->attrsz[_TNL_ATTRIB_EDGEFLAG]) {
+	 VB->EdgeFlag = _tnl_translate_edgeflag( ctx, data, 
+						 node->count,
+						 node->vertex_size );
+	 data++;
+      }
+      else 
+	 VB->EdgeFlag = _tnl_import_current_edgeflag( ctx, node->count );
+   }
+
+   /* Legacy pointers -- remove one day.
+    */
+   VB->ObjPtr = VB->AttribPtr[_TNL_ATTRIB_POS];
+   VB->NormalPtr = VB->AttribPtr[_TNL_ATTRIB_NORMAL];
+   VB->ColorPtr[0] = VB->AttribPtr[_TNL_ATTRIB_COLOR0];
+   VB->ColorPtr[1] = 0;
+   VB->IndexPtr[0] = VB->AttribPtr[_TNL_ATTRIB_INDEX];
+   VB->IndexPtr[1] = 0;
+   VB->SecondaryColorPtr[0] = VB->AttribPtr[_TNL_ATTRIB_COLOR1];
+   VB->SecondaryColorPtr[1] = 0;
+   VB->FogCoordPtr = VB->AttribPtr[_TNL_ATTRIB_FOG];
+
+   for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) {
+      VB->TexCoordPtr[i] = VB->AttribPtr[_TNL_ATTRIB_TEX0 + i];
+   }
+}
+
+static void _playback_copy_to_current( GLcontext *ctx,
+				       const struct tnl_vertex_list *node )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx); 
+   const GLfloat *data;
+   GLuint i;
+
+   if (node->count)
+      data = node->buffer + (node->count-1) * node->vertex_size;
+   else
+      data = node->buffer;
+
+   for (i = _TNL_ATTRIB_POS+1 ; i <= _TNL_ATTRIB_INDEX ; i++) {
+      if (node->attrsz[i]) {
+	 ASSIGN_4V(tnl->vtx.current[i], 0, 0, 0, 1);
+	 COPY_SZ_4V(tnl->vtx.current[i], node->attrsz[i], data);
+	 data += node->attrsz[i];
+      }
+   }
+
+   /* Edgeflag requires special treatment:
+    */
+   if (node->attrsz[_TNL_ATTRIB_EDGEFLAG]) {
+      ctx->Current.EdgeFlag = (data[0] == 1.0);
+   }
+
+   /* Colormaterial -- this kindof sucks.
+    */
+   if (ctx->Light.ColorMaterialEnabled) {
+      _mesa_update_color_material(ctx, ctx->Current.Attrib[VERT_ATTRIB_COLOR0]);
+   }
+
+   if (node->have_materials) {
+      tnl->Driver.NotifyMaterialChange( ctx );
+   }
+
+   /* CurrentExecPrimitive
+    */
+   if (node->prim_count) {
+      GLenum mode = node->prim[node->prim_count - 1].mode;
+      if (mode & PRIM_END)
+	 ctx->Driver.CurrentExecPrimitive = PRIM_OUTSIDE_BEGIN_END;
+      else
+	 ctx->Driver.CurrentExecPrimitive = (mode & PRIM_MODE_MASK);
+   }
+}
+
+
+/**
+ * Execute the buffer and save copied verts.
+ */
+void _tnl_playback_vertex_list( GLcontext *ctx, void *data )
+{
+   const struct tnl_vertex_list *node = (const struct tnl_vertex_list *) data;
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+
+   FLUSH_CURRENT(ctx, 0);
+
+   if (node->prim_count > 0 && node->count > 0) {
+
+      if (ctx->Driver.CurrentExecPrimitive != PRIM_OUTSIDE_BEGIN_END &&
+	       (node->prim[0].mode & PRIM_BEGIN)) {
+
+	 /* Degenerate case: list is called inside begin/end pair and
+	  * includes operations such as glBegin or glDrawArrays.
+	  */
+	 _mesa_error( ctx, GL_INVALID_OPERATION, "displaylist recursive begin");
+	 _tnl_loopback_vertex_list( ctx, node );
+	 return;
+      }
+      else if (tnl->LoopbackDListCassettes ||
+	       node->dangling_attr_ref) {
+	 /* Degenerate case: list references current data and would
+	  * require fixup.  Take the easier option & loop it back.
+	  */
+	 _tnl_loopback_vertex_list( ctx, node );
+	 return;
+      }
+      
+      if (ctx->NewState)
+	 _mesa_update_state( ctx );
+
+      if (tnl->pipeline.build_state_changes)
+	 _tnl_validate_pipeline( ctx );
+
+      _tnl_bind_vertex_list( ctx, node );
+
+      /* Invalidate all stored data before and after run:
+       */
+      tnl->pipeline.run_input_changes |= tnl->pipeline.inputs;
+      tnl->Driver.RunPipeline( ctx );
+      tnl->pipeline.run_input_changes |= tnl->pipeline.inputs;
+   }
+
+   /* Copy to current?
+    */
+   _playback_copy_to_current( ctx, node );
+}
diff --git a/reactos/lib/mesa32/src/tnl/t_vb_cliptmp.h b/reactos/lib/mesa32/src/tnl/t_vb_cliptmp.h
new file mode 100644
index 00000000000..47a3142e441
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl/t_vb_cliptmp.h
@@ -0,0 +1,270 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+
+#define CLIP_DOTPROD(K, A, B, C, D) X(K)*A + Y(K)*B + Z(K)*C + W(K)*D
+
+#define POLY_CLIP( PLANE, A, B, C, D )					\
+do {									\
+   if (mask & PLANE) {							\
+      GLuint idxPrev = inlist[0];					\
+      GLfloat dpPrev = CLIP_DOTPROD(idxPrev, A, B, C, D );		\
+      GLuint outcount = 0;						\
+      GLuint i;								\
+									\
+      inlist[n] = inlist[0]; /* prevent rotation of vertices */		\
+      for (i = 1; i <= n; i++) {					\
+	 GLuint idx = inlist[i];					\
+	 GLfloat dp = CLIP_DOTPROD(idx, A, B, C, D );			\
+									\
+         clipmask[idxPrev] |= PLANE;					\
+	 if (!IS_NEGATIVE(dpPrev)) {					\
+	    outlist[outcount++] = idxPrev;				\
+ 	    clipmask[idxPrev] &= ~PLANE;				\
+	 }								\
+									\
+	 if (DIFFERENT_SIGNS(dp, dpPrev)) {				\
+            GLuint newvert = VB->LastClipped++;				\
+            VB->ClipMask[newvert] = 0;					\
+            outlist[outcount++] = newvert;				\
+	    if (IS_NEGATIVE(dp)) {					\
+	       /* Going out of bounds.  Avoid division by zero as we	\
+		* know dp != dpPrev from DIFFERENT_SIGNS, above.	\
+		*/							\
+	       GLfloat t = dp / (dp - dpPrev);				\
+               INTERP_4F( t, coord[newvert], coord[idx], coord[idxPrev]); \
+      	       interp( ctx, t, newvert, idx, idxPrev, GL_TRUE );	\
+	    } else {							\
+	       /* Coming back in.					\
+		*/							\
+	       GLfloat t = dpPrev / (dpPrev - dp);			\
+               INTERP_4F( t, coord[newvert], coord[idxPrev], coord[idx]); \
+	       interp( ctx, t, newvert, idxPrev, idx, GL_FALSE );	\
+	    }								\
+	 }								\
+									\
+	 idxPrev = idx;							\
+	 dpPrev = dp;							\
+      }									\
+									\
+      if (outcount < 3)							\
+	 return;							\
+									\
+      {									\
+	 GLuint *tmp = inlist;						\
+	 inlist = outlist;						\
+	 outlist = tmp;							\
+	 n = outcount;							\
+      }									\
+   }									\
+} while (0)
+
+
+#define LINE_CLIP(PLANE, A, B, C, D )					\
+do {									\
+   if (mask & PLANE) {							\
+      GLfloat dpI = CLIP_DOTPROD( ii, A, B, C, D );			\
+      GLfloat dpJ = CLIP_DOTPROD( jj, A, B, C, D );			\
+									\
+      if (DIFFERENT_SIGNS(dpI, dpJ)) {					\
+         GLuint newvert = VB->LastClipped++;				\
+         VB->ClipMask[newvert] = 0;					\
+	 if (IS_NEGATIVE(dpJ)) {					\
+	    GLfloat t = dpI / (dpI - dpJ);				\
+            VB->ClipMask[jj] |= PLANE;					\
+            INTERP_4F( t, coord[newvert], coord[ii], coord[jj] );	\
+	    interp( ctx, t, newvert, ii, jj, GL_FALSE );		\
+            jj = newvert;						\
+	 } else {							\
+  	    GLfloat t = dpJ / (dpJ - dpI);				\
+            VB->ClipMask[ii] |= PLANE;					\
+            INTERP_4F( t, coord[newvert], coord[jj], coord[ii] );	\
+	    interp( ctx, t, newvert, jj, ii, GL_FALSE );		\
+            ii = newvert;						\
+	 }								\
+      }									\
+      else if (IS_NEGATIVE(dpI))					\
+	 return;							\
+  }									\
+} while (0)
+
+
+
+/* Clip a line against the viewport and user clip planes.
+ */
+static INLINE void
+TAG(clip_line)( GLcontext *ctx, GLuint i, GLuint j, GLubyte mask )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct vertex_buffer *VB = &tnl->vb;
+   interp_func interp = tnl->Driver.Render.Interp;
+   GLfloat (*coord)[4] = VB->ClipPtr->data;
+   GLuint ii = i, jj = j, p;
+
+   VB->LastClipped = VB->Count;
+
+   if (mask & 0x3f) {
+      LINE_CLIP( CLIP_RIGHT_BIT,  -1,  0,  0, 1 );
+      LINE_CLIP( CLIP_LEFT_BIT,    1,  0,  0, 1 );
+      LINE_CLIP( CLIP_TOP_BIT,     0, -1,  0, 1 );
+      LINE_CLIP( CLIP_BOTTOM_BIT,  0,  1,  0, 1 );
+      LINE_CLIP( CLIP_FAR_BIT,     0,  0, -1, 1 );
+      LINE_CLIP( CLIP_NEAR_BIT,    0,  0,  1, 1 );
+   }
+
+   if (mask & CLIP_USER_BIT) {
+      for (p=0;p<MAX_CLIP_PLANES;p++) {
+	 if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {
+            const GLfloat a = ctx->Transform._ClipUserPlane[p][0];
+            const GLfloat b = ctx->Transform._ClipUserPlane[p][1];
+            const GLfloat c = ctx->Transform._ClipUserPlane[p][2];
+            const GLfloat d = ctx->Transform._ClipUserPlane[p][3];
+	    LINE_CLIP( CLIP_USER_BIT, a, b, c, d );
+	 }
+      }
+   }
+
+   if ((ctx->_TriangleCaps & DD_FLATSHADE) && j != jj)
+      tnl->Driver.Render.CopyPV( ctx, jj, j );
+
+   tnl->Driver.Render.ClippedLine( ctx, ii, jj );
+}
+
+
+/* Clip a triangle against the viewport and user clip planes.
+ */
+static INLINE void
+TAG(clip_tri)( GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLubyte mask )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct vertex_buffer *VB = &tnl->vb;
+   interp_func interp = tnl->Driver.Render.Interp;
+   GLfloat (*coord)[4] = VB->ClipPtr->data;
+   GLuint pv = v2;
+   GLuint vlist[2][MAX_CLIPPED_VERTICES];
+   GLuint *inlist = vlist[0], *outlist = vlist[1];
+   GLuint p;
+   GLubyte *clipmask = VB->ClipMask;
+   GLuint n = 3;
+
+   ASSIGN_3V(inlist, v2, v0, v1 ); /* pv rotated to slot zero */
+
+   VB->LastClipped = VB->Count;
+
+   if (mask & 0x3f) {
+      POLY_CLIP( CLIP_RIGHT_BIT,  -1,  0,  0, 1 );
+      POLY_CLIP( CLIP_LEFT_BIT,    1,  0,  0, 1 );
+      POLY_CLIP( CLIP_TOP_BIT,     0, -1,  0, 1 );
+      POLY_CLIP( CLIP_BOTTOM_BIT,  0,  1,  0, 1 );
+      POLY_CLIP( CLIP_FAR_BIT,     0,  0, -1, 1 );
+      POLY_CLIP( CLIP_NEAR_BIT,    0,  0,  1, 1 );
+   }
+
+   if (mask & CLIP_USER_BIT) {
+      for (p=0;p<MAX_CLIP_PLANES;p++) {
+         if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {
+            const GLfloat a = ctx->Transform._ClipUserPlane[p][0];
+            const GLfloat b = ctx->Transform._ClipUserPlane[p][1];
+            const GLfloat c = ctx->Transform._ClipUserPlane[p][2];
+            const GLfloat d = ctx->Transform._ClipUserPlane[p][3];
+            POLY_CLIP( CLIP_USER_BIT, a, b, c, d );
+         }
+      }
+   }
+
+   if (ctx->_TriangleCaps & DD_FLATSHADE) {
+      if (pv != inlist[0]) {
+	 ASSERT( inlist[0] >= VB->Count );
+	 tnl->Driver.Render.CopyPV( ctx, inlist[0], pv );
+      }
+   }
+
+   tnl->Driver.Render.ClippedPolygon( ctx, inlist, n );
+}
+
+
+/* Clip a quad against the viewport and user clip planes.
+ */
+static INLINE void
+TAG(clip_quad)( GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3,
+                GLubyte mask )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct vertex_buffer *VB = &tnl->vb;
+   interp_func interp = tnl->Driver.Render.Interp;
+   GLfloat (*coord)[4] = VB->ClipPtr->data;
+   GLuint pv = v3;
+   GLuint vlist[2][MAX_CLIPPED_VERTICES];
+   GLuint *inlist = vlist[0], *outlist = vlist[1];
+   GLuint p;
+   GLubyte *clipmask = VB->ClipMask;
+   GLuint n = 4;
+
+   ASSIGN_4V(inlist, v3, v0, v1, v2 ); /* pv rotated to slot zero */
+
+   VB->LastClipped = VB->Count;
+
+   if (mask & 0x3f) {
+      POLY_CLIP( CLIP_RIGHT_BIT,  -1,  0,  0, 1 );
+      POLY_CLIP( CLIP_LEFT_BIT,    1,  0,  0, 1 );
+      POLY_CLIP( CLIP_TOP_BIT,     0, -1,  0, 1 );
+      POLY_CLIP( CLIP_BOTTOM_BIT,  0,  1,  0, 1 );
+      POLY_CLIP( CLIP_FAR_BIT,     0,  0, -1, 1 );
+      POLY_CLIP( CLIP_NEAR_BIT,    0,  0,  1, 1 );
+   }
+
+   if (mask & CLIP_USER_BIT) {
+      for (p=0;p<MAX_CLIP_PLANES;p++) {
+	 if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {
+            const GLfloat a = ctx->Transform._ClipUserPlane[p][0];
+            const GLfloat b = ctx->Transform._ClipUserPlane[p][1];
+            const GLfloat c = ctx->Transform._ClipUserPlane[p][2];
+            const GLfloat d = ctx->Transform._ClipUserPlane[p][3];
+	    POLY_CLIP( CLIP_USER_BIT, a, b, c, d );
+	 }
+      }
+   }
+
+   if (ctx->_TriangleCaps & DD_FLATSHADE) {
+      if (pv != inlist[0]) {
+	 ASSERT( inlist[0] >= VB->Count );
+	 tnl->Driver.Render.CopyPV( ctx, inlist[0], pv );
+      }
+   }
+
+   tnl->Driver.Render.ClippedPolygon( ctx, inlist, n );
+}
+
+#undef W
+#undef Z
+#undef Y
+#undef X
+#undef SIZE
+#undef TAG
+#undef POLY_CLIP
+#undef LINE_CLIP
diff --git a/reactos/lib/mesa32/src/tnl/t_vb_fog.c b/reactos/lib/mesa32/src/tnl/t_vb_fog.c
new file mode 100644
index 00000000000..bbbf54baac9
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl/t_vb_fog.c
@@ -0,0 +1,254 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+
+#include "glheader.h"
+#include "colormac.h"
+#include "context.h"
+#include "macros.h"
+#include "imports.h"
+#include "mtypes.h"
+
+#include "math/m_xform.h"
+
+#include "t_context.h"
+#include "t_pipeline.h"
+
+
+struct fog_stage_data {
+   GLvector4f fogcoord;		/* has actual storage allocated */
+   GLvector4f input;		/* points into VB->EyePtr Z values */
+};
+
+#define FOG_STAGE_DATA(stage) ((struct fog_stage_data *)stage->privatePtr)
+
+#define FOG_EXP_TABLE_SIZE 256
+#define FOG_MAX (10.0)
+#define EXP_FOG_MAX .0006595
+#define FOG_INCR (FOG_MAX/FOG_EXP_TABLE_SIZE)
+static GLfloat exp_table[FOG_EXP_TABLE_SIZE];
+static GLfloat inited = 0;
+
+#if 1
+#define NEG_EXP( result, narg )						\
+do {									\
+   GLfloat f = (GLfloat) (narg * (1.0/FOG_INCR));			\
+   GLint k = (GLint) f;							\
+   if (k > FOG_EXP_TABLE_SIZE-2) 					\
+      result = (GLfloat) EXP_FOG_MAX;					\
+   else									\
+      result = exp_table[k] + (f-k)*(exp_table[k+1]-exp_table[k]);	\
+} while (0)
+#else
+#define NEG_EXP( result, narg )					\
+do {								\
+   result = exp(-narg);						\
+} while (0)
+#endif
+
+
+static void init_static_data( void )
+{
+   GLfloat f = 0.0F;
+   GLint i = 0;
+   for ( ; i < FOG_EXP_TABLE_SIZE ; i++, f += FOG_INCR) {
+      exp_table[i] = (GLfloat) exp(-f);
+   }
+   inited = 1;
+}
+
+
+static void make_win_fog_coords( GLcontext *ctx, GLvector4f *out,
+				 const GLvector4f *in )
+{
+   GLfloat end  = ctx->Fog.End;
+   GLfloat *v = in->start;
+   GLuint stride = in->stride;
+   GLuint n = in->count;
+   GLfloat (*data)[4] = out->data;
+   GLfloat d;
+   GLuint i;
+
+   out->count = in->count;
+
+   switch (ctx->Fog.Mode) {
+   case GL_LINEAR:
+      if (ctx->Fog.Start == ctx->Fog.End)
+         d = 1.0F;
+      else
+         d = 1.0F / (ctx->Fog.End - ctx->Fog.Start);
+      for ( i = 0 ; i < n ; i++, STRIDE_F(v, stride)) {
+         GLfloat f = (end - FABSF(*v)) * d;
+	 data[i][0] = CLAMP(f, 0.0F, 1.0F);
+      }
+      break;
+   case GL_EXP:
+      d = ctx->Fog.Density;
+      for ( i = 0 ; i < n ; i++, STRIDE_F(v,stride))
+         NEG_EXP( data[i][0], d * FABSF(*v) );
+      break;
+   case GL_EXP2:
+      d = ctx->Fog.Density*ctx->Fog.Density;
+      for ( i = 0 ; i < n ; i++, STRIDE_F(v, stride)) {
+         GLfloat z = *v;
+         NEG_EXP( data[i][0], d * z * z );
+      }
+      break;
+   default:
+      _mesa_problem(ctx, "Bad fog mode in make_fog_coord");
+      return;
+   }
+}
+
+
+static GLboolean run_fog_stage( GLcontext *ctx,
+				struct tnl_pipeline_stage *stage )
+{
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+   struct fog_stage_data *store = FOG_STAGE_DATA(stage);
+   GLvector4f *input;
+
+   if (stage->changed_inputs == 0)
+      return GL_TRUE;
+
+   if (ctx->Fog.FogCoordinateSource == GL_FRAGMENT_DEPTH_EXT) {
+      /* fog computed from Z depth */
+      /* source = VB->ObjPtr or VB->EyePtr coords */
+      /* dest = VB->FogCoordPtr = fog stage private storage */
+      VB->FogCoordPtr = &store->fogcoord;
+
+      if (!ctx->_NeedEyeCoords) {
+	 const GLfloat *m = ctx->ModelviewMatrixStack.Top->m;
+	 GLfloat plane[4];
+
+	 /* Use this to store calculated eye z values:
+	  */
+	 input = &store->fogcoord;
+
+	 plane[0] = m[2];
+	 plane[1] = m[6];
+	 plane[2] = m[10];
+	 plane[3] = m[14];
+
+	 /* Full eye coords weren't required, just calculate the
+	  * eye Z values.
+	  */
+	 _mesa_dotprod_tab[VB->ObjPtr->size]( (GLfloat *) input->data,
+					      4 * sizeof(GLfloat),
+					      VB->ObjPtr, plane );
+
+	 input->count = VB->ObjPtr->count;
+      }
+      else {
+	 input = &store->input;
+
+	 if (VB->EyePtr->size < 2)
+	    _mesa_vector4f_clean_elem( VB->EyePtr, VB->Count, 2 );
+
+	 input->data = (GLfloat (*)[4]) &(VB->EyePtr->data[0][2]);
+	 input->start = VB->EyePtr->start+2;
+	 input->stride = VB->EyePtr->stride;
+	 input->count = VB->EyePtr->count;
+      }
+   }
+   else {
+      /* use glFogCoord() coordinates */
+      /* source = VB->FogCoordPtr */
+      input = VB->FogCoordPtr;
+      /* dest = fog stage private storage */
+      VB->FogCoordPtr = &store->fogcoord;
+   }
+
+   make_win_fog_coords( ctx, VB->FogCoordPtr, input );
+
+   VB->AttribPtr[_TNL_ATTRIB_FOG] = VB->FogCoordPtr;
+   return GL_TRUE;
+}
+
+
+static void check_fog_stage( GLcontext *ctx, struct tnl_pipeline_stage *stage )
+{
+   stage->active = ctx->Fog.Enabled && !ctx->VertexProgram.Enabled;
+
+   if (ctx->Fog.FogCoordinateSource == GL_FRAGMENT_DEPTH_EXT)
+      stage->inputs = _TNL_BIT_POS;
+   else
+      stage->inputs = _TNL_BIT_FOG;
+}
+
+
+/* Called the first time stage->run() is invoked.
+ */
+static GLboolean alloc_fog_data( GLcontext *ctx,
+				 struct tnl_pipeline_stage *stage )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct fog_stage_data *store;
+   stage->privatePtr = MALLOC(sizeof(*store));
+   store = FOG_STAGE_DATA(stage);
+   if (!store)
+      return GL_FALSE;
+
+   _mesa_vector4f_alloc( &store->fogcoord, 0, tnl->vb.Size, 32 );
+   _mesa_vector4f_init( &store->input, 0, 0 );
+
+   if (!inited)
+      init_static_data();
+
+   /* Now run the stage.
+    */
+   stage->run = run_fog_stage;
+   return stage->run( ctx, stage );
+}
+
+
+static void free_fog_data( struct tnl_pipeline_stage *stage )
+{
+   struct fog_stage_data *store = FOG_STAGE_DATA(stage);
+   if (store) {
+      _mesa_vector4f_free( &store->fogcoord );
+      FREE( store );
+      stage->privatePtr = NULL;
+   }
+}
+
+
+const struct tnl_pipeline_stage _tnl_fog_coordinate_stage =
+{
+   "build fog coordinates",	/* name */
+   _NEW_FOG|_NEW_PROGRAM,	/* check_state */
+   _NEW_FOG,			/* run_state */
+   GL_FALSE,			/* active? */
+   0,				/* inputs */
+   _TNL_BIT_FOG,		/* outputs */
+   0,				/* changed_inputs */
+   NULL,			/* private_data */
+   free_fog_data,		/* dtr */
+   check_fog_stage,		/* check */
+   alloc_fog_data		/* run -- initially set to init. */
+};
diff --git a/reactos/lib/mesa32/src/tnl/t_vb_light.c b/reactos/lib/mesa32/src/tnl/t_vb_light.c
new file mode 100644
index 00000000000..1d260fafb20
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl/t_vb_light.c
@@ -0,0 +1,367 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+
+#include "glheader.h"
+#include "colormac.h"
+#include "light.h"
+#include "macros.h"
+#include "imports.h"
+#include "simple_list.h"
+#include "mtypes.h"
+
+#include "math/m_translate.h"
+
+#include "t_context.h"
+#include "t_pipeline.h"
+
+#define LIGHT_TWOSIDE       0x1
+#define LIGHT_MATERIAL      0x2
+#define MAX_LIGHT_FUNC      0x4
+
+typedef void (*light_func)( GLcontext *ctx,
+			    struct vertex_buffer *VB,
+			    struct tnl_pipeline_stage *stage,
+			    GLvector4f *input );
+
+struct material_cursor {
+   const GLfloat *ptr;
+   GLuint stride;
+   GLfloat *current;
+};
+
+struct light_stage_data {
+   GLvector4f Input;
+   GLvector4f LitColor[2];
+   GLvector4f LitSecondary[2];
+   GLvector4f LitIndex[2];
+   light_func *light_func_tab;
+
+   struct material_cursor mat[MAT_ATTRIB_MAX];
+   GLuint mat_count;
+   GLuint mat_bitmask;
+};
+
+
+#define LIGHT_STAGE_DATA(stage) ((struct light_stage_data *)(stage->privatePtr))
+
+
+
+/* In the case of colormaterial, the effected material attributes
+ * should already have been bound to point to the incoming color data,
+ * prior to running the pipeline.
+ */
+static void update_materials( GLcontext *ctx,
+			      struct light_stage_data *store )
+{
+   GLuint i;
+
+   for (i = 0 ; i < store->mat_count ; i++) {
+      COPY_4V(store->mat[i].current, store->mat[i].ptr);
+      STRIDE_F(store->mat[i].ptr, store->mat[i].stride);
+   }
+      
+   _mesa_update_material( ctx, store->mat_bitmask );
+   _mesa_validate_all_lighting_tables( ctx );
+}
+
+static GLuint prepare_materials( GLcontext *ctx,
+				 struct vertex_buffer *VB,
+				 struct light_stage_data *store )
+{
+   GLuint i;
+   
+   store->mat_count = 0;
+   store->mat_bitmask = 0;
+
+   /* If ColorMaterial enabled, overwrite affected AttrPtr's with
+    * the color pointer.  This could be done earlier.
+    */
+   if (ctx->Light.ColorMaterialEnabled) {
+      GLuint bitmask = ctx->Light.ColorMaterialBitmask;
+      for (i = 0 ; i < MAT_ATTRIB_MAX ; i++)
+	 if (bitmask & (1<<i))
+	    VB->AttribPtr[_TNL_ATTRIB_MAT_FRONT_AMBIENT + i] = VB->ColorPtr[0];
+   }
+
+   for (i = _TNL_ATTRIB_MAT_FRONT_AMBIENT ; i < _TNL_ATTRIB_INDEX ; i++) {
+      if (VB->AttribPtr[i]->stride) {
+	 GLuint j = store->mat_count++;
+	 GLuint attr = i - _TNL_ATTRIB_MAT_FRONT_AMBIENT;
+	 store->mat[j].ptr = VB->AttribPtr[i]->start;
+	 store->mat[j].stride = VB->AttribPtr[i]->stride;
+	 store->mat[j].current = ctx->Light.Material.Attrib[attr];
+	 store->mat_bitmask |= (1<<attr);
+      }
+   }
+   
+
+   /* FIXME: Is this already done?
+    */
+   _mesa_update_material( ctx, ~0 );
+   _mesa_validate_all_lighting_tables( ctx );
+
+   return store->mat_count;
+}
+
+/* Tables for all the shading functions.
+ */
+static light_func _tnl_light_tab[MAX_LIGHT_FUNC];
+static light_func _tnl_light_fast_tab[MAX_LIGHT_FUNC];
+static light_func _tnl_light_fast_single_tab[MAX_LIGHT_FUNC];
+static light_func _tnl_light_spec_tab[MAX_LIGHT_FUNC];
+static light_func _tnl_light_ci_tab[MAX_LIGHT_FUNC];
+
+#define TAG(x)           x
+#define IDX              (0)
+#include "t_vb_lighttmp.h"
+
+#define TAG(x)           x##_twoside
+#define IDX              (LIGHT_TWOSIDE)
+#include "t_vb_lighttmp.h"
+
+#define TAG(x)           x##_material
+#define IDX              (LIGHT_MATERIAL)
+#include "t_vb_lighttmp.h"
+
+#define TAG(x)           x##_twoside_material
+#define IDX              (LIGHT_TWOSIDE|LIGHT_MATERIAL)
+#include "t_vb_lighttmp.h"
+
+
+static void init_lighting( void )
+{
+   static int done;
+
+   if (!done) {
+      init_light_tab();
+      init_light_tab_twoside();
+      init_light_tab_material();
+      init_light_tab_twoside_material();
+      done = 1;
+   }
+}
+
+
+static GLboolean run_lighting( GLcontext *ctx, 
+			       struct tnl_pipeline_stage *stage )
+{
+   struct light_stage_data *store = LIGHT_STAGE_DATA(stage);
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct vertex_buffer *VB = &tnl->vb;
+   GLvector4f *input = ctx->_NeedEyeCoords ? VB->EyePtr : VB->ObjPtr;
+   GLuint idx;
+
+   /* Make sure we can talk about position x,y and z:
+    */
+   if (stage->changed_inputs & _TNL_BIT_POS) {
+      if (input->size <= 2 && input == VB->ObjPtr) {
+
+	 _math_trans_4f( store->Input.data,
+			 VB->ObjPtr->data,
+			 VB->ObjPtr->stride,
+			 GL_FLOAT,
+			 VB->ObjPtr->size,
+			 0,
+			 VB->Count );
+
+	 if (input->size <= 2) {
+	    /* Clean z.
+	     */
+	    _mesa_vector4f_clean_elem(&store->Input, VB->Count, 2);
+	 }
+	 
+	 if (input->size <= 1) {
+	    /* Clean y.
+	     */
+	    _mesa_vector4f_clean_elem(&store->Input, VB->Count, 1);
+	 }
+
+	 input = &store->Input;
+      }
+   }
+   
+   idx = 0;
+
+   if (prepare_materials( ctx, VB, store ))
+      idx |= LIGHT_MATERIAL;
+
+   if (ctx->Light.Model.TwoSide)
+      idx |= LIGHT_TWOSIDE;
+
+   /* The individual functions know about replaying side-effects
+    * vs. full re-execution. 
+    */
+   store->light_func_tab[idx]( ctx, VB, stage, input );
+
+   VB->AttribPtr[_TNL_ATTRIB_COLOR0] = VB->ColorPtr[0];
+   VB->AttribPtr[_TNL_ATTRIB_COLOR1] = VB->SecondaryColorPtr[0];
+   VB->AttribPtr[_TNL_ATTRIB_INDEX] = VB->IndexPtr[0];
+
+   return GL_TRUE;
+}
+
+
+/* Called in place of do_lighting when the light table may have changed.
+ */
+static GLboolean run_validate_lighting( GLcontext *ctx,
+					struct tnl_pipeline_stage *stage )
+{
+   light_func *tab;
+
+   if (ctx->Visual.rgbMode) {
+      if (ctx->Light._NeedVertices) {
+	 if (ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR)
+	    tab = _tnl_light_spec_tab;
+	 else
+	    tab = _tnl_light_tab;
+      }
+      else {
+	 if (ctx->Light.EnabledList.next == ctx->Light.EnabledList.prev)
+	    tab = _tnl_light_fast_single_tab;
+	 else
+	    tab = _tnl_light_fast_tab;
+      }
+   }
+   else
+      tab = _tnl_light_ci_tab;
+
+
+   LIGHT_STAGE_DATA(stage)->light_func_tab = tab;
+
+   /* This and the above should only be done on _NEW_LIGHT:
+    */
+   TNL_CONTEXT(ctx)->Driver.NotifyMaterialChange( ctx );
+
+   /* Now run the stage...
+    */
+   stage->run = run_lighting;
+   return stage->run( ctx, stage );
+}
+
+
+
+/* Called the first time stage->run is called.  In effect, don't
+ * allocate data until the first time the stage is run.
+ */
+static GLboolean run_init_lighting( GLcontext *ctx,
+				    struct tnl_pipeline_stage *stage )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct light_stage_data *store;
+   GLuint size = tnl->vb.Size;
+
+   stage->privatePtr = MALLOC(sizeof(*store));
+   store = LIGHT_STAGE_DATA(stage);
+   if (!store)
+      return GL_FALSE;
+
+   /* Do onetime init.
+    */
+   init_lighting();
+
+   _mesa_vector4f_alloc( &store->Input, 0, size, 32 );
+   _mesa_vector4f_alloc( &store->LitColor[0], 0, size, 32 );
+   _mesa_vector4f_alloc( &store->LitColor[1], 0, size, 32 );
+   _mesa_vector4f_alloc( &store->LitSecondary[0], 0, size, 32 );
+   _mesa_vector4f_alloc( &store->LitSecondary[1], 0, size, 32 );
+   _mesa_vector4f_alloc( &store->LitIndex[0], 0, size, 32 );
+   _mesa_vector4f_alloc( &store->LitIndex[1], 0, size, 32 );
+
+   store->LitColor[0].size = 4;
+   store->LitColor[1].size = 4;
+   store->LitSecondary[0].size = 3;
+   store->LitSecondary[1].size = 3;
+
+   store->LitIndex[0].size = 1;
+   store->LitIndex[0].stride = sizeof(GLfloat);
+   store->LitIndex[1].size = 1;
+   store->LitIndex[1].stride = sizeof(GLfloat);
+
+   /* Now validate the stage derived data...
+    */
+   stage->run = run_validate_lighting;
+   return stage->run( ctx, stage );
+}
+
+
+
+/*
+ * Check if lighting is enabled.  If so, configure the pipeline stage's
+ * type, inputs, and outputs.
+ */
+static void check_lighting( GLcontext *ctx, struct tnl_pipeline_stage *stage )
+{
+   stage->active = ctx->Light.Enabled && !ctx->VertexProgram.Enabled;
+   if (stage->active) {
+      if (stage->privatePtr)
+	 stage->run = run_validate_lighting;
+      stage->inputs = _TNL_BIT_NORMAL|_TNL_BITS_MAT_ANY;
+      if (ctx->Light._NeedVertices)
+	 stage->inputs |= _TNL_BIT_POS; 
+      if (ctx->Light.ColorMaterialEnabled)
+	 stage->inputs |= _TNL_BIT_COLOR0;
+
+      stage->outputs = _TNL_BIT_COLOR0;
+      if (ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR)
+	 stage->outputs |= _TNL_BIT_COLOR1;
+   }
+}
+
+
+static void dtr( struct tnl_pipeline_stage *stage )
+{
+   struct light_stage_data *store = LIGHT_STAGE_DATA(stage);
+
+   if (store) {
+      _mesa_vector4f_free( &store->Input );
+      _mesa_vector4f_free( &store->LitColor[0] );
+      _mesa_vector4f_free( &store->LitColor[1] );
+      _mesa_vector4f_free( &store->LitSecondary[0] );
+      _mesa_vector4f_free( &store->LitSecondary[1] );
+      _mesa_vector4f_free( &store->LitIndex[0] );
+      _mesa_vector4f_free( &store->LitIndex[1] );
+      FREE( store );
+      stage->privatePtr = 0;
+   }
+}
+
+const struct tnl_pipeline_stage _tnl_lighting_stage =
+{
+   "lighting",			/* name */
+   _NEW_LIGHT|_NEW_PROGRAM,			/* recheck */
+   _NEW_LIGHT|_NEW_MODELVIEW,	/* recalc -- modelview dependency
+				 * otherwise not captured by inputs
+				 * (which may be _TNL_BIT_POS) */
+   GL_FALSE,			/* active? */
+   0,				/* inputs */
+   0,				/* outputs */
+   0,				/* changed_inputs */
+   NULL,			/* private_data */
+   dtr,				/* destroy */
+   check_lighting,		/* check */
+   run_init_lighting		/* run -- initially set to ctr */
+};
diff --git a/reactos/lib/mesa32/src/tnl/t_vb_lighttmp.h b/reactos/lib/mesa32/src/tnl/t_vb_lighttmp.h
new file mode 100644
index 00000000000..cd7988518b0
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl/t_vb_lighttmp.h
@@ -0,0 +1,817 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *
+ * Authors:
+ *    Brian Paul
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+
+#if (IDX & LIGHT_TWOSIDE)
+#  define NR_SIDES 2
+#else
+#  define NR_SIDES 1
+#endif
+
+
+/* define TRACE to trace lighting code */
+/* #define TRACE 1 */
+
+/*
+ * ctx is the current context
+ * VB is the vertex buffer
+ * stage is the lighting stage-private data
+ * input is the vector of eye or object-space vertex coordinates
+ */
+static void TAG(light_rgba_spec)( GLcontext *ctx,
+				  struct vertex_buffer *VB,
+				  struct tnl_pipeline_stage *stage,
+				  GLvector4f *input )
+{
+   struct light_stage_data *store = LIGHT_STAGE_DATA(stage);
+   GLfloat (*base)[3] = ctx->Light._BaseColor;
+   GLfloat sumA[2];
+   GLuint j;
+
+   const GLuint vstride = input->stride;
+   const GLfloat *vertex = (GLfloat *)input->data;
+   const GLuint nstride = VB->NormalPtr->stride;
+   const GLfloat *normal = (GLfloat *)VB->NormalPtr->data;
+
+   GLfloat (*Fcolor)[4] = (GLfloat (*)[4]) store->LitColor[0].data;
+   GLfloat (*Fspec)[4] = (GLfloat (*)[4]) store->LitSecondary[0].data;
+#if IDX & LIGHT_TWOSIDE
+   GLfloat (*Bcolor)[4] = (GLfloat (*)[4]) store->LitColor[1].data;
+   GLfloat (*Bspec)[4] = (GLfloat (*)[4]) store->LitSecondary[1].data;
+#endif
+
+   const GLuint nr = VB->Count;
+
+   (void) nstride;
+   (void) vstride;
+
+#ifdef TRACE
+   fprintf(stderr, "%s\n", __FUNCTION__ );
+#endif
+
+   VB->ColorPtr[0] = &store->LitColor[0];
+   VB->SecondaryColorPtr[0] = &store->LitSecondary[0];
+   sumA[0] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE][3];
+
+#if IDX & LIGHT_TWOSIDE
+   VB->ColorPtr[1] = &store->LitColor[1];
+   VB->SecondaryColorPtr[1] = &store->LitSecondary[1];
+   sumA[1] = ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_DIFFUSE][3];
+#endif
+
+   /* Side-effects done, can we finish now?
+    */
+   if (stage->changed_inputs == 0)
+      return;
+
+   for (j = 0; j < nr; j++,STRIDE_F(vertex,vstride),STRIDE_F(normal,nstride)) {
+      GLfloat sum[2][3], spec[2][3];
+      struct gl_light *light;
+
+#if IDX & LIGHT_MATERIAL
+      update_materials( ctx, store );
+      sumA[0] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE][3];
+#if IDX & LIGHT_TWOSIDE
+      sumA[1] = ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_DIFFUSE][3];
+#endif
+#endif
+
+      COPY_3V(sum[0], base[0]);
+      ZERO_3V(spec[0]);
+
+#if IDX & LIGHT_TWOSIDE
+      COPY_3V(sum[1], base[1]);
+      ZERO_3V(spec[1]);
+#endif
+
+      /* Add contribution from each enabled light source */
+      foreach (light, &ctx->Light.EnabledList) {
+	 GLfloat n_dot_h;
+	 GLfloat correction;
+	 GLint side;
+	 GLfloat contrib[3];
+	 GLfloat attenuation;
+	 GLfloat VP[3];  /* unit vector from vertex to light */
+	 GLfloat n_dot_VP;       /* n dot VP */
+	 GLfloat *h;
+
+	 /* compute VP and attenuation */
+	 if (!(light->_Flags & LIGHT_POSITIONAL)) {
+	    /* directional light */
+	    COPY_3V(VP, light->_VP_inf_norm);
+	    attenuation = light->_VP_inf_spot_attenuation;
+	 }
+	 else {
+	    GLfloat d;     /* distance from vertex to light */
+
+	    SUB_3V(VP, light->_Position, vertex);
+
+	    d = (GLfloat) LEN_3FV( VP );
+
+	    if (d > 1e-6) {
+	       GLfloat invd = 1.0F / d;
+	       SELF_SCALE_SCALAR_3V(VP, invd);
+	    }
+
+	    attenuation = 1.0F / (light->ConstantAttenuation + d *
+				  (light->LinearAttenuation + d *
+				   light->QuadraticAttenuation));
+
+	    /* spotlight attenuation */
+	    if (light->_Flags & LIGHT_SPOT) {
+	       GLfloat PV_dot_dir = - DOT3(VP, light->_NormDirection);
+
+	       if (PV_dot_dir<light->_CosCutoff) {
+		  continue; /* this light makes no contribution */
+	       }
+	       else {
+		  GLdouble x = PV_dot_dir * (EXP_TABLE_SIZE-1);
+		  GLint k = (GLint) x;
+		  GLfloat spot = (GLfloat) (light->_SpotExpTable[k][0]
+				    + (x-k)*light->_SpotExpTable[k][1]);
+		  attenuation *= spot;
+	       }
+	    }
+	 }
+
+	 if (attenuation < 1e-3)
+	    continue;		/* this light makes no contribution */
+
+	 /* Compute dot product or normal and vector from V to light pos */
+	 n_dot_VP = DOT3( normal, VP );
+
+	 /* Which side gets the diffuse & specular terms? */
+	 if (n_dot_VP < 0.0F) {
+	    ACC_SCALE_SCALAR_3V(sum[0], attenuation, light->_MatAmbient[0]);
+#if IDX & LIGHT_TWOSIDE
+	    side = 1;
+	    correction = -1;
+	    n_dot_VP = -n_dot_VP;
+#else
+            continue;
+#endif
+	 }
+         else {
+#if IDX & LIGHT_TWOSIDE
+            ACC_SCALE_SCALAR_3V( sum[1], attenuation, light->_MatAmbient[1]);
+#endif
+	    side = 0;
+	    correction = 1;
+	 }
+
+	 /* diffuse term */
+	 COPY_3V(contrib, light->_MatAmbient[side]);
+	 ACC_SCALE_SCALAR_3V(contrib, n_dot_VP, light->_MatDiffuse[side]);
+	 ACC_SCALE_SCALAR_3V(sum[side], attenuation, contrib );
+
+	 /* specular term - cannibalize VP... */
+	 if (ctx->Light.Model.LocalViewer) {
+	    GLfloat v[3];
+	    COPY_3V(v, vertex);
+	    NORMALIZE_3FV(v);
+	    SUB_3V(VP, VP, v);                /* h = VP + VPe */
+	    h = VP;
+	    NORMALIZE_3FV(h);
+	 }
+	 else if (light->_Flags & LIGHT_POSITIONAL) {
+	    h = VP;
+	    ACC_3V(h, ctx->_EyeZDir);
+	    NORMALIZE_3FV(h);
+	 }
+         else {
+	    h = light->_h_inf_norm;
+	 }
+
+	 n_dot_h = correction * DOT3(normal, h);
+
+	 if (n_dot_h > 0.0F) {
+	    GLfloat spec_coef;
+	    struct gl_shine_tab *tab = ctx->_ShineTable[side];
+	    GET_SHINE_TAB_ENTRY( tab, n_dot_h, spec_coef );
+
+	    if (spec_coef > 1.0e-10) {
+	       spec_coef *= attenuation;
+	       ACC_SCALE_SCALAR_3V( spec[side], spec_coef,
+				    light->_MatSpecular[side]);
+	    }
+	 }
+      } /*loop over lights*/
+
+      COPY_3V( Fcolor[j], sum[0] );
+      COPY_3V( Fspec[j], spec[0] );
+      Fcolor[j][3] = sumA[0];
+
+#if IDX & LIGHT_TWOSIDE
+      COPY_3V( Bcolor[j], sum[1] );
+      COPY_3V( Bspec[j], spec[1] );
+      Bcolor[j][3] = sumA[1];
+#endif
+   }
+}
+
+
+static void TAG(light_rgba)( GLcontext *ctx,
+			     struct vertex_buffer *VB,
+			     struct tnl_pipeline_stage *stage,
+			     GLvector4f *input )
+{
+   struct light_stage_data *store = LIGHT_STAGE_DATA(stage);
+   GLuint j;
+
+   GLfloat (*base)[3] = ctx->Light._BaseColor;
+   GLfloat sumA[2];
+
+   const GLuint vstride = input->stride;
+   const GLfloat *vertex = (GLfloat *) input->data;
+   const GLuint nstride = VB->NormalPtr->stride;
+   const GLfloat *normal = (GLfloat *)VB->NormalPtr->data;
+
+   GLfloat (*Fcolor)[4] = (GLfloat (*)[4]) store->LitColor[0].data;
+   GLfloat (*Bcolor)[4] = (GLfloat (*)[4]) store->LitColor[1].data;
+   GLfloat (*color[2])[4];
+
+   const GLuint nr = VB->Count;
+
+#ifdef TRACE
+   fprintf(stderr, "%s\n", __FUNCTION__ );
+#endif
+
+   (void) nstride;
+   (void) vstride;
+
+   color[0] = Fcolor;
+   color[1] = Bcolor;
+
+   VB->ColorPtr[0] = &store->LitColor[0];
+   sumA[0] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE][3];
+
+#if IDX & LIGHT_TWOSIDE
+   VB->ColorPtr[1] = &store->LitColor[1];
+   sumA[1] = ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_DIFFUSE][3];
+#endif
+
+   if (stage->changed_inputs == 0)
+      return;
+
+   for (j = 0; j < nr; j++,STRIDE_F(vertex,vstride),STRIDE_F(normal,nstride)) {
+      GLfloat sum[2][3];
+      struct gl_light *light;
+
+      if ( IDX & LIGHT_MATERIAL ) {
+	 update_materials( ctx, store );
+	 sumA[0] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE][3];
+#if IDX & LIGHT_TWOSIDE
+         sumA[1] = ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_DIFFUSE][3];
+#endif
+      }
+
+      COPY_3V(sum[0], base[0]);
+
+      if ( IDX & LIGHT_TWOSIDE )
+	 COPY_3V(sum[1], base[1]);
+
+      /* Add contribution from each enabled light source */
+      foreach (light, &ctx->Light.EnabledList) {
+
+	 GLfloat n_dot_h;
+	 GLfloat correction;
+	 GLint side;
+	 GLfloat contrib[3];
+	 GLfloat attenuation = 1.0;
+	 GLfloat VP[3];          /* unit vector from vertex to light */
+	 GLfloat n_dot_VP;       /* n dot VP */
+	 GLfloat *h;
+
+	 /* compute VP and attenuation */
+	 if (!(light->_Flags & LIGHT_POSITIONAL)) {
+	    /* directional light */
+	    COPY_3V(VP, light->_VP_inf_norm);
+	    attenuation = light->_VP_inf_spot_attenuation;
+	 }
+	 else {
+	    GLfloat d;     /* distance from vertex to light */
+
+
+	    SUB_3V(VP, light->_Position, vertex);
+
+	    d = (GLfloat) LEN_3FV( VP );
+
+	    if ( d > 1e-6) {
+	       GLfloat invd = 1.0F / d;
+	       SELF_SCALE_SCALAR_3V(VP, invd);
+	    }
+
+            attenuation = 1.0F / (light->ConstantAttenuation + d *
+                                  (light->LinearAttenuation + d *
+                                   light->QuadraticAttenuation));
+
+	    /* spotlight attenuation */
+	    if (light->_Flags & LIGHT_SPOT) {
+	       GLfloat PV_dot_dir = - DOT3(VP, light->_NormDirection);
+
+	       if (PV_dot_dir<light->_CosCutoff) {
+		  continue; /* this light makes no contribution */
+	       }
+	       else {
+		  GLdouble x = PV_dot_dir * (EXP_TABLE_SIZE-1);
+		  GLint k = (GLint) x;
+		  GLfloat spot = (GLfloat) (light->_SpotExpTable[k][0]
+				  + (x-k)*light->_SpotExpTable[k][1]);
+		  attenuation *= spot;
+	       }
+	    }
+	 }
+
+	 if (attenuation < 1e-3)
+	    continue;		/* this light makes no contribution */
+
+	 /* Compute dot product or normal and vector from V to light pos */
+	 n_dot_VP = DOT3( normal, VP );
+
+	 /* which side are we lighting? */
+	 if (n_dot_VP < 0.0F) {
+	    ACC_SCALE_SCALAR_3V(sum[0], attenuation, light->_MatAmbient[0]);
+#if IDX & LIGHT_TWOSIDE
+	    side = 1;
+	    correction = -1;
+	    n_dot_VP = -n_dot_VP;
+#else
+            continue;
+#endif
+	 }
+         else {
+#if IDX & LIGHT_TWOSIDE
+            ACC_SCALE_SCALAR_3V( sum[1], attenuation, light->_MatAmbient[1]);
+#endif
+	    side = 0;
+	    correction = 1;
+	 }
+
+	 COPY_3V(contrib, light->_MatAmbient[side]);
+
+	 /* diffuse term */
+	 ACC_SCALE_SCALAR_3V(contrib, n_dot_VP, light->_MatDiffuse[side]);
+
+	 /* specular term - cannibalize VP... */
+	 {
+	    if (ctx->Light.Model.LocalViewer) {
+	       GLfloat v[3];
+	       COPY_3V(v, vertex);
+	       NORMALIZE_3FV(v);
+	       SUB_3V(VP, VP, v);                /* h = VP + VPe */
+	       h = VP;
+	       NORMALIZE_3FV(h);
+	    }
+	    else if (light->_Flags & LIGHT_POSITIONAL) {
+	       h = VP;
+	       ACC_3V(h, ctx->_EyeZDir);
+	       NORMALIZE_3FV(h);
+	    }
+            else {
+	       h = light->_h_inf_norm;
+	    }
+
+	    n_dot_h = correction * DOT3(normal, h);
+
+	    if (n_dot_h > 0.0F)
+	    {
+	       GLfloat spec_coef;
+	       struct gl_shine_tab *tab = ctx->_ShineTable[side];
+
+	       GET_SHINE_TAB_ENTRY( tab, n_dot_h, spec_coef );
+
+	       ACC_SCALE_SCALAR_3V( contrib, spec_coef,
+				    light->_MatSpecular[side]);
+	    }
+	 }
+
+	 ACC_SCALE_SCALAR_3V( sum[side], attenuation, contrib );
+      }
+
+      COPY_3V( Fcolor[j], sum[0] );
+      Fcolor[j][3] = sumA[0];
+
+#if IDX & LIGHT_TWOSIDE
+      COPY_3V( Bcolor[j], sum[1] );
+      Bcolor[j][3] = sumA[1];
+#endif
+   }
+}
+
+
+
+
+/* As below, but with just a single light.
+ */
+static void TAG(light_fast_rgba_single)( GLcontext *ctx,
+					 struct vertex_buffer *VB,
+					 struct tnl_pipeline_stage *stage,
+					 GLvector4f *input )
+
+{
+   struct light_stage_data *store = LIGHT_STAGE_DATA(stage);
+   const GLuint nstride = VB->NormalPtr->stride;
+   const GLfloat *normal = (GLfloat *)VB->NormalPtr->data;
+   GLfloat (*Fcolor)[4] = (GLfloat (*)[4]) store->LitColor[0].data;
+#if IDX & LIGHT_TWOSIDE
+   GLfloat (*Bcolor)[4] = (GLfloat (*)[4]) store->LitColor[1].data;
+#endif
+   const struct gl_light *light = ctx->Light.EnabledList.next;
+   GLuint j = 0;
+   GLfloat base[2][4];
+   const GLuint nr = VB->Count;
+
+#ifdef TRACE
+   fprintf(stderr, "%s\n", __FUNCTION__ );
+#endif
+
+   (void) input;		/* doesn't refer to Eye or Obj */
+   (void) nr;
+   (void) nstride;
+
+   VB->ColorPtr[0] = &store->LitColor[0];
+#if IDX & LIGHT_TWOSIDE
+   VB->ColorPtr[1] = &store->LitColor[1];
+#endif
+
+   if (stage->changed_inputs == 0)
+      return;
+
+   for (j = 0; j < nr; j++, STRIDE_F(normal,nstride)) {
+
+      GLfloat n_dot_VP;
+
+      if ( IDX & LIGHT_MATERIAL )
+	 update_materials( ctx, store );
+
+      /* No attenuation, so incoporate _MatAmbient into base color.
+       */
+      if ( j == 0 || (IDX & LIGHT_MATERIAL) ) {
+	 COPY_3V(base[0], light->_MatAmbient[0]);
+	 ACC_3V(base[0], ctx->Light._BaseColor[0] );
+	 base[0][3] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE][3];
+
+#if IDX & LIGHT_TWOSIDE
+         COPY_3V(base[1], light->_MatAmbient[1]);
+         ACC_3V(base[1], ctx->Light._BaseColor[1]);
+         base[1][3] = ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_DIFFUSE][3];
+#endif
+      }
+
+      n_dot_VP = DOT3(normal, light->_VP_inf_norm);
+
+      if (n_dot_VP < 0.0F) {
+#if IDX & LIGHT_TWOSIDE
+         GLfloat n_dot_h = -DOT3(normal, light->_h_inf_norm);
+         GLfloat sum[3];
+         COPY_3V(sum, base[1]);
+         ACC_SCALE_SCALAR_3V(sum, -n_dot_VP, light->_MatDiffuse[1]);
+         if (n_dot_h > 0.0F) {
+            GLfloat spec;
+            GET_SHINE_TAB_ENTRY( ctx->_ShineTable[1], n_dot_h, spec );
+            ACC_SCALE_SCALAR_3V(sum, spec, light->_MatSpecular[1]);
+         }
+         COPY_3V(Bcolor[j], sum );
+         Bcolor[j][3] = base[1][3];
+#endif
+	 COPY_4FV(Fcolor[j], base[0]);
+      }
+      else {
+	 GLfloat n_dot_h = DOT3(normal, light->_h_inf_norm);
+	 GLfloat sum[3];
+	 COPY_3V(sum, base[0]);
+	 ACC_SCALE_SCALAR_3V(sum, n_dot_VP, light->_MatDiffuse[0]);
+	 if (n_dot_h > 0.0F) {
+	    GLfloat spec;
+	    GET_SHINE_TAB_ENTRY( ctx->_ShineTable[0], n_dot_h, spec );
+	    ACC_SCALE_SCALAR_3V(sum, spec, light->_MatSpecular[0]);
+
+	 }
+	 COPY_3V(Fcolor[j], sum );
+	 Fcolor[j][3] = base[0][3];
+#if IDX & LIGHT_TWOSIDE
+         COPY_4FV(Bcolor[j], base[1]);
+#endif
+      }
+   }
+}
+
+
+/* Light infinite lights
+ */
+static void TAG(light_fast_rgba)( GLcontext *ctx,
+				  struct vertex_buffer *VB,
+				  struct tnl_pipeline_stage *stage,
+				  GLvector4f *input )
+{
+   struct light_stage_data *store = LIGHT_STAGE_DATA(stage);
+   GLfloat sumA[2];
+   const GLuint nstride = VB->NormalPtr->stride;
+   const GLfloat *normal = (GLfloat *)VB->NormalPtr->data;
+   GLfloat (*Fcolor)[4] = (GLfloat (*)[4]) store->LitColor[0].data;
+#if IDX & LIGHT_TWOSIDE
+   GLfloat (*Bcolor)[4] = (GLfloat (*)[4]) store->LitColor[1].data;
+#endif
+   GLuint j = 0;
+   const GLuint nr = VB->Count;
+   const struct gl_light *light;
+
+#ifdef TRACE
+   fprintf(stderr, "%s %d\n", __FUNCTION__, nr );
+#endif
+
+   (void) input;
+   (void) nr;
+   (void) nstride;
+
+   sumA[0] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE][3];
+   sumA[1] = ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_DIFFUSE][3];
+
+   VB->ColorPtr[0] = &store->LitColor[0];
+#if IDX & LIGHT_TWOSIDE
+   VB->ColorPtr[1] = &store->LitColor[1];
+#endif
+
+   if (stage->changed_inputs == 0)
+      return;
+
+   for (j = 0; j < nr; j++, STRIDE_F(normal,nstride)) {
+
+      GLfloat sum[2][3];
+
+      if ( IDX & LIGHT_MATERIAL ) {
+	 update_materials( ctx, store );
+
+	 sumA[0] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE][3];
+#if IDX & LIGHT_TWOSIDE
+         sumA[1] = ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_DIFFUSE][3];
+#endif
+      }
+
+
+      COPY_3V(sum[0], ctx->Light._BaseColor[0]);
+#if IDX & LIGHT_TWOSIDE
+      COPY_3V(sum[1], ctx->Light._BaseColor[1]);
+#endif
+
+      foreach (light, &ctx->Light.EnabledList) {
+	 GLfloat n_dot_h, n_dot_VP, spec;
+
+	 ACC_3V(sum[0], light->_MatAmbient[0]);
+#if IDX & LIGHT_TWOSIDE
+         ACC_3V(sum[1], light->_MatAmbient[1]);
+#endif
+
+	 n_dot_VP = DOT3(normal, light->_VP_inf_norm);
+
+	 if (n_dot_VP > 0.0F) {
+	    ACC_SCALE_SCALAR_3V(sum[0], n_dot_VP, light->_MatDiffuse[0]);
+	    n_dot_h = DOT3(normal, light->_h_inf_norm);
+	    if (n_dot_h > 0.0F) {
+	       struct gl_shine_tab *tab = ctx->_ShineTable[0];
+	       GET_SHINE_TAB_ENTRY( tab, n_dot_h, spec );
+	       ACC_SCALE_SCALAR_3V( sum[0], spec, light->_MatSpecular[0]);
+	    }
+	 }
+#if IDX & LIGHT_TWOSIDE
+         else {
+	    ACC_SCALE_SCALAR_3V(sum[1], -n_dot_VP, light->_MatDiffuse[1]);
+	    n_dot_h = -DOT3(normal, light->_h_inf_norm);
+	    if (n_dot_h > 0.0F) {
+	       struct gl_shine_tab *tab = ctx->_ShineTable[1];
+	       GET_SHINE_TAB_ENTRY( tab, n_dot_h, spec );
+	       ACC_SCALE_SCALAR_3V( sum[1], spec, light->_MatSpecular[1]);
+	    }
+	 }
+#endif
+      }
+
+      COPY_3V( Fcolor[j], sum[0] );
+      Fcolor[j][3] = sumA[0];
+
+#if IDX & LIGHT_TWOSIDE
+      COPY_3V( Bcolor[j], sum[1] );
+      Bcolor[j][3] = sumA[1];
+#endif
+   }
+}
+
+
+
+
+
+/*
+ * Use current lighting/material settings to compute the color indexes
+ * for an array of vertices.
+ * Input:  n - number of vertices to light
+ *         side - 0=use front material, 1=use back material
+ *         vertex - array of [n] vertex position in eye coordinates
+ *         normal - array of [n] surface normal vector
+ * Output:  indexResult - resulting array of [n] color indexes
+ */
+static void TAG(light_ci)( GLcontext *ctx,
+			   struct vertex_buffer *VB,
+			   struct tnl_pipeline_stage *stage,
+			   GLvector4f *input )
+{
+   struct light_stage_data *store = LIGHT_STAGE_DATA(stage);
+   GLuint j;
+   const GLuint vstride = input->stride;
+   const GLfloat *vertex = (GLfloat *) input->data;
+   const GLuint nstride = VB->NormalPtr->stride;
+   const GLfloat *normal = (GLfloat *)VB->NormalPtr->data;
+   GLfloat *indexResult[2];
+   const GLuint nr = VB->Count;
+
+#ifdef TRACE
+   fprintf(stderr, "%s\n", __FUNCTION__ );
+#endif
+
+   (void) nstride;
+   (void) vstride;
+
+   VB->IndexPtr[0] = &store->LitIndex[0];
+#if IDX & LIGHT_TWOSIDE
+   VB->IndexPtr[1] = &store->LitIndex[1];
+#endif
+
+   if (stage->changed_inputs == 0)
+      return;
+
+   indexResult[0] = (GLfloat *)VB->IndexPtr[0]->data;
+#if IDX & LIGHT_TWOSIDE
+   indexResult[1] = (GLfloat *)VB->IndexPtr[1]->data;
+#endif
+
+   /* loop over vertices */
+   for (j=0; j<nr; j++,STRIDE_F(vertex,vstride),STRIDE_F(normal, nstride)) {
+      GLfloat diffuse[2], specular[2];
+      GLuint side = 0;
+      struct gl_light *light;
+
+      if ( IDX & LIGHT_MATERIAL )
+	 update_materials( ctx, store );
+
+      diffuse[0] = specular[0] = 0.0F;
+
+      if ( IDX & LIGHT_TWOSIDE ) {
+	 diffuse[1] = specular[1] = 0.0F;
+      }
+
+      /* Accumulate diffuse and specular from each light source */
+      foreach (light, &ctx->Light.EnabledList) {
+
+	 GLfloat attenuation = 1.0F;
+	 GLfloat VP[3];  /* unit vector from vertex to light */
+	 GLfloat n_dot_VP;  /* dot product of l and n */
+	 GLfloat *h, n_dot_h, correction = 1.0;
+
+	 /* compute l and attenuation */
+	 if (!(light->_Flags & LIGHT_POSITIONAL)) {
+	    /* directional light */
+	    COPY_3V(VP, light->_VP_inf_norm);
+	 }
+	 else {
+	    GLfloat d;     /* distance from vertex to light */
+
+	    SUB_3V(VP, light->_Position, vertex);
+
+	    d = (GLfloat) LEN_3FV( VP );
+	    if ( d > 1e-6) {
+	       GLfloat invd = 1.0F / d;
+	       SELF_SCALE_SCALAR_3V(VP, invd);
+	    }
+
+	    attenuation = 1.0F / (light->ConstantAttenuation + d *
+				  (light->LinearAttenuation + d *
+				   light->QuadraticAttenuation));
+
+	    /* spotlight attenuation */
+	    if (light->_Flags & LIGHT_SPOT) {
+	       GLfloat PV_dot_dir = - DOT3(VP, light->_NormDirection);
+	       if (PV_dot_dir < light->_CosCutoff) {
+		  continue; /* this light makes no contribution */
+	       }
+	       else {
+		  GLdouble x = PV_dot_dir * (EXP_TABLE_SIZE-1);
+		  GLint k = (GLint) x;
+		  GLfloat spot = (GLfloat) (light->_SpotExpTable[k][0]
+				  + (x-k)*light->_SpotExpTable[k][1]);
+		  attenuation *= spot;
+	       }
+	    }
+	 }
+
+	 if (attenuation < 1e-3)
+	    continue;		/* this light makes no contribution */
+
+	 n_dot_VP = DOT3( normal, VP );
+
+	 /* which side are we lighting? */
+	 if (n_dot_VP < 0.0F) {
+#if IDX & LIGHT_TWOSIDE
+	    side = 1;
+	    correction = -1;
+	    n_dot_VP = -n_dot_VP;
+#else
+            continue;
+#endif
+	 }
+
+	 /* accumulate diffuse term */
+	 diffuse[side] += n_dot_VP * light->_dli * attenuation;
+
+	 /* specular term */
+	 if (ctx->Light.Model.LocalViewer) {
+	    GLfloat v[3];
+	    COPY_3V(v, vertex);
+	    NORMALIZE_3FV(v);
+	    SUB_3V(VP, VP, v);                /* h = VP + VPe */
+	    h = VP;
+	    NORMALIZE_3FV(h);
+	 }
+	 else if (light->_Flags & LIGHT_POSITIONAL) {
+	    h = VP;
+            /* Strangely, disabling this addition fixes a conformance
+             * problem.  If this code is enabled, l_sed.c fails.
+             */
+	    /*ACC_3V(h, ctx->_EyeZDir);*/
+	    NORMALIZE_3FV(h);
+	 }
+         else {
+	    h = light->_h_inf_norm;
+	 }
+
+	 n_dot_h = correction * DOT3(normal, h);
+	 if (n_dot_h > 0.0F) {
+	    GLfloat spec_coef;
+	    struct gl_shine_tab *tab = ctx->_ShineTable[side];
+	    GET_SHINE_TAB_ENTRY( tab, n_dot_h, spec_coef);
+	    specular[side] += spec_coef * light->_sli * attenuation;
+	 }
+      } /*loop over lights*/
+
+      /* Now compute final color index */
+      for (side = 0 ; side < NR_SIDES ; side++) {
+	 const GLfloat *ind = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_INDEXES + side];
+	 GLfloat index;
+
+	 if (specular[side] > 1.0F) {
+	    index = ind[MAT_INDEX_SPECULAR];
+	 }
+	 else {
+	    GLfloat d_a = ind[MAT_INDEX_DIFFUSE] - ind[MAT_INDEX_AMBIENT];
+	    GLfloat s_a = ind[MAT_INDEX_SPECULAR] - ind[MAT_INDEX_AMBIENT];
+	    index = (ind[MAT_INDEX_AMBIENT]
+		     + diffuse[side] * (1.0F-specular[side]) * d_a
+		     + specular[side] * s_a);
+	    if (index > ind[MAT_INDEX_SPECULAR]) {
+	       index = ind[MAT_INDEX_SPECULAR];
+	    }
+	 }
+	 indexResult[side][j] = index;
+      }
+   } /*for vertex*/
+}
+
+
+
+static void TAG(init_light_tab)( void )
+{
+   _tnl_light_tab[IDX] = TAG(light_rgba);
+   _tnl_light_fast_tab[IDX] = TAG(light_fast_rgba);
+   _tnl_light_fast_single_tab[IDX] = TAG(light_fast_rgba_single);
+   _tnl_light_spec_tab[IDX] = TAG(light_rgba_spec);
+   _tnl_light_ci_tab[IDX] = TAG(light_ci);
+}
+
+
+#undef TAG
+#undef IDX
+#undef NR_SIDES
diff --git a/reactos/lib/mesa32/src/tnl/t_vb_normals.c b/reactos/lib/mesa32/src/tnl/t_vb_normals.c
new file mode 100644
index 00000000000..22473136534
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl/t_vb_normals.c
@@ -0,0 +1,201 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+
+#include "glheader.h"
+#include "colormac.h"
+#include "context.h"
+#include "macros.h"
+#include "imports.h"
+#include "mtypes.h"
+
+#include "math/m_xform.h"
+
+#include "t_context.h"
+#include "t_pipeline.h"
+
+
+
+struct normal_stage_data {
+   normal_func NormalTransform;
+   GLvector4f normal;
+};
+
+#define NORMAL_STAGE_DATA(stage) ((struct normal_stage_data *)stage->privatePtr)
+
+
+
+
+static GLboolean run_normal_stage( GLcontext *ctx,
+				   struct tnl_pipeline_stage *stage )
+{
+   struct normal_stage_data *store = NORMAL_STAGE_DATA(stage);
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+
+   ASSERT(store->NormalTransform);
+
+   if (stage->changed_inputs) {
+      /* We can only use the display list's saved normal lengths if we've
+       * got a transformation matrix with uniform scaling.
+       */
+      const GLfloat *lengths;
+      if (ctx->ModelviewMatrixStack.Top->flags & MAT_FLAG_GENERAL_SCALE)
+         lengths = NULL;
+      else
+         lengths = VB->NormalLengthPtr;
+
+      store->NormalTransform( ctx->ModelviewMatrixStack.Top,
+			      ctx->_ModelViewInvScale,
+			      VB->NormalPtr,  /* input normals */
+			      lengths,
+			      &store->normal ); /* resulting normals */
+   }
+
+   VB->NormalPtr = &store->normal;
+   VB->AttribPtr[_TNL_ATTRIB_NORMAL] = VB->NormalPtr;
+
+   VB->NormalLengthPtr = 0;	/* no longer valid */
+   return GL_TRUE;
+}
+
+
+static GLboolean run_validate_normal_stage( GLcontext *ctx,
+					    struct tnl_pipeline_stage *stage )
+{
+   struct normal_stage_data *store = NORMAL_STAGE_DATA(stage);
+
+
+   if (ctx->_NeedEyeCoords) {
+      GLuint transform = NORM_TRANSFORM_NO_ROT;
+
+      if (ctx->ModelviewMatrixStack.Top->flags & (MAT_FLAG_GENERAL |
+				  MAT_FLAG_ROTATION |
+				  MAT_FLAG_GENERAL_3D |
+				  MAT_FLAG_PERSPECTIVE))
+	 transform = NORM_TRANSFORM;
+
+
+      if (ctx->Transform.Normalize) {
+	 store->NormalTransform = _mesa_normal_tab[transform | NORM_NORMALIZE];
+      }
+      else if (ctx->Transform.RescaleNormals &&
+	       ctx->_ModelViewInvScale != 1.0) {
+	 store->NormalTransform = _mesa_normal_tab[transform | NORM_RESCALE];
+      }
+      else {
+	 store->NormalTransform = _mesa_normal_tab[transform];
+      }
+   }
+   else {
+      if (ctx->Transform.Normalize) {
+	 store->NormalTransform = _mesa_normal_tab[NORM_NORMALIZE];
+      }
+      else if (!ctx->Transform.RescaleNormals &&
+	       ctx->_ModelViewInvScale != 1.0) {
+	 store->NormalTransform = _mesa_normal_tab[NORM_RESCALE];
+      }
+      else {
+	 store->NormalTransform = 0;
+      }
+   }
+
+   if (store->NormalTransform) {
+      stage->run = run_normal_stage;
+      return stage->run( ctx, stage );
+   } else {
+      stage->active = GL_FALSE;	/* !!! */
+      return GL_TRUE;
+   }
+}
+
+
+static void check_normal_transform( GLcontext *ctx,
+				    struct tnl_pipeline_stage *stage )
+{
+   stage->active = !ctx->VertexProgram.Enabled &&
+      (ctx->Light.Enabled || (ctx->Texture._GenFlags & TEXGEN_NEED_NORMALS));
+
+   /* Don't clobber the initialize function:
+    */
+   if (stage->privatePtr)
+      stage->run = run_validate_normal_stage;
+}
+
+
+static GLboolean alloc_normal_data( GLcontext *ctx,
+				 struct tnl_pipeline_stage *stage )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct normal_stage_data *store;
+   stage->privatePtr = MALLOC(sizeof(*store));
+   store = NORMAL_STAGE_DATA(stage);
+   if (!store)
+      return GL_FALSE;
+
+   _mesa_vector4f_alloc( &store->normal, 0, tnl->vb.Size, 32 );
+
+   /* Now run the stage.
+    */
+   stage->run = run_validate_normal_stage;
+   return stage->run( ctx, stage );
+}
+
+
+
+static void free_normal_data( struct tnl_pipeline_stage *stage )
+{
+   struct normal_stage_data *store = NORMAL_STAGE_DATA(stage);
+   if (store) {
+      _mesa_vector4f_free( &store->normal );
+      FREE( store );
+      stage->privatePtr = NULL;
+   }
+}
+
+#define _TNL_NEW_NORMAL_TRANSFORM        (_NEW_MODELVIEW| \
+					  _NEW_TRANSFORM| \
+					  _NEW_PROGRAM| \
+                                          _MESA_NEW_NEED_NORMALS| \
+                                          _MESA_NEW_NEED_EYE_COORDS)
+
+
+
+const struct tnl_pipeline_stage _tnl_normal_transform_stage =
+{
+   "normal transform",		/* name */
+   _TNL_NEW_NORMAL_TRANSFORM,	/* re-check */
+   _TNL_NEW_NORMAL_TRANSFORM,	/* re-run */
+   GL_FALSE,			/* active? */
+   _TNL_BIT_NORMAL,		/* inputs */
+   _TNL_BIT_NORMAL,		/* outputs */
+   0,				/* changed_inputs */
+   NULL,			/* private data */
+   free_normal_data,		/* destructor */
+   check_normal_transform,	/* check */
+   alloc_normal_data		/* run -- initially set to alloc */
+};
diff --git a/reactos/lib/mesa32/src/tnl/t_vb_points.c b/reactos/lib/mesa32/src/tnl/t_vb_points.c
new file mode 100644
index 00000000000..19908864793
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl/t_vb_points.c
@@ -0,0 +1,124 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Brian Paul
+ */
+
+#include "mtypes.h"
+#include "imports.h"
+#include "t_context.h"
+#include "t_pipeline.h"
+
+
+struct point_stage_data {
+   GLvector4f PointSize;
+};
+
+#define POINT_STAGE_DATA(stage) ((struct point_stage_data *)stage->privatePtr)
+
+
+/*
+ * Compute attenuated point sizes
+ */
+static GLboolean run_point_stage( GLcontext *ctx,
+				  struct tnl_pipeline_stage *stage )
+{
+   struct point_stage_data *store = POINT_STAGE_DATA(stage);
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+   const GLfloat (*eye)[4] = (const GLfloat (*)[4]) VB->EyePtr->data;
+   const GLfloat p0 = ctx->Point.Params[0];
+   const GLfloat p1 = ctx->Point.Params[1];
+   const GLfloat p2 = ctx->Point.Params[2];
+   const GLfloat pointSize = ctx->Point._Size;
+   GLfloat (*size)[4] = store->PointSize.data;
+   GLuint i;
+
+   if (stage->changed_inputs) {
+      /* XXX do threshold and min/max clamping here? */
+      for (i = 0; i < VB->Count; i++) {
+	 const GLfloat dist = -eye[i][2];
+	 /* GLfloat dist = SQRTF(pos[0]*pos[0]+pos[1]*pos[1]+pos[2]*pos[2]);*/
+	 size[i][0] = pointSize / (p0 + dist * (p1 + dist * p2));
+      }
+   }
+
+   VB->PointSizePtr = &store->PointSize;
+   VB->AttribPtr[_TNL_ATTRIB_POINTSIZE] = &store->PointSize;
+
+   return GL_TRUE;
+}
+
+
+/* If point size attenuation is on we'll compute the point size for
+ * each vertex in a special pipeline stage.
+ */
+static void check_point_size( GLcontext *ctx, struct tnl_pipeline_stage *d )
+{
+   d->active = ctx->Point._Attenuated && !ctx->VertexProgram.Enabled;
+}
+
+static GLboolean alloc_point_data( GLcontext *ctx,
+				   struct tnl_pipeline_stage *stage )
+{
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+   struct point_stage_data *store;
+   stage->privatePtr = MALLOC(sizeof(*store));
+   store = POINT_STAGE_DATA(stage);
+   if (!store)
+      return GL_FALSE;
+
+   _mesa_vector4f_alloc( &store->PointSize, 0, VB->Size, 32 );
+
+   /* Now run the stage.
+    */
+   stage->run = run_point_stage;
+   return stage->run( ctx, stage );
+}
+
+
+static void free_point_data( struct tnl_pipeline_stage *stage )
+{
+   struct point_stage_data *store = POINT_STAGE_DATA(stage);
+   if (store) {
+      _mesa_vector4f_free( &store->PointSize );
+      FREE( store );
+      stage->privatePtr = 0;
+   }
+}
+
+const struct tnl_pipeline_stage _tnl_point_attenuation_stage =
+{
+   "point size attenuation",	/* name */
+   _NEW_POINT|_NEW_PROGRAM,	/* check_state */
+   _NEW_POINT,			/* run_state */
+   GL_FALSE,			/* active */
+   _TNL_BIT_POS,		/* inputs */
+   _TNL_BIT_POS,		/* outputs */
+   0,				/* changed_inputs (temporary value) */
+   NULL,			/* stage private data */
+   free_point_data,		/* destructor */
+   check_point_size,		/* check */
+   alloc_point_data		/* run -- initially set to alloc data */
+};
diff --git a/reactos/lib/mesa32/src/tnl/t_vb_program.c b/reactos/lib/mesa32/src/tnl/t_vb_program.c
new file mode 100644
index 00000000000..62141ad1247
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl/t_vb_program.c
@@ -0,0 +1,365 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/**
+ * \file tnl/t_vb_program.c
+ * \brief Pipeline stage for executing NVIDIA vertex programs.
+ * \author Brian Paul,  Keith Whitwell
+ */
+
+
+#include "glheader.h"
+#include "api_noop.h"
+#include "colormac.h"
+#include "context.h"
+#include "dlist.h"
+#include "hash.h"
+#include "light.h"
+#include "macros.h"
+#include "imports.h"
+#include "simple_list.h"
+#include "mtypes.h"
+#include "nvvertprog.h"
+#include "nvvertexec.h"
+#include "nvprogram.h"
+
+#include "math/m_translate.h"
+
+#include "t_context.h"
+#include "t_pipeline.h"
+
+
+/**
+ * \warning These values _MUST_ match the values in the OutputRegisters[]
+ * array in vpparse.c!!!
+ */
+#define VERT_RESULT_HPOS 0
+#define VERT_RESULT_COL0 1
+#define VERT_RESULT_COL1 2
+#define VERT_RESULT_BFC0 3
+#define VERT_RESULT_BFC1 4
+#define VERT_RESULT_FOGC 5
+#define VERT_RESULT_PSIZ 6
+#define VERT_RESULT_TEX0 7
+#define VERT_RESULT_TEX1 8
+#define VERT_RESULT_TEX2 9
+#define VERT_RESULT_TEX3 10
+#define VERT_RESULT_TEX4 11
+#define VERT_RESULT_TEX5 12
+#define VERT_RESULT_TEX6 13
+#define VERT_RESULT_TEX7 14
+
+
+/*!
+ * Private storage for the vertex program pipeline stage.
+ */
+struct vp_stage_data {
+   /** The results of running the vertex program go into these arrays. */
+   GLvector4f attribs[15];
+
+   GLvector4f ndcCoords;              /**< normalized device coords */
+   GLubyte *clipmask;                 /**< clip flags */
+   GLubyte ormask, andmask;           /**< for clipping */
+};
+
+
+#define VP_STAGE_DATA(stage) ((struct vp_stage_data *)(stage->privatePtr))
+
+
+/**
+ * This function executes vertex programs
+ */
+static GLboolean run_vp( GLcontext *ctx, struct tnl_pipeline_stage *stage )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct vp_stage_data *store = VP_STAGE_DATA(stage);
+   struct vertex_buffer *VB = &tnl->vb;
+   struct vertex_program *program = ctx->VertexProgram.Current;
+   GLuint i;
+
+   _mesa_init_tracked_matrices(ctx); /* load registers with matrices */
+   _mesa_init_vp_registers(ctx);     /* init temp and result regs */
+
+   for (i = 0; i < VB->Count; i++) {
+      GLuint attr;
+
+#if 0
+      printf("Input  %d: %f, %f, %f, %f\n", i,
+             VB->AttribPtr[0]->data[i][0],
+             VB->AttribPtr[0]->data[i][1],
+             VB->AttribPtr[0]->data[i][2],
+             VB->AttribPtr[0]->data[i][3]);
+      printf("   color: %f, %f, %f, %f\n",
+             VB->AttribPtr[3]->data[i][0],
+             VB->AttribPtr[3]->data[i][1],
+             VB->AttribPtr[3]->data[i][2],
+             VB->AttribPtr[3]->data[i][3]);
+      printf("  normal: %f, %f, %f, %f\n",
+             VB->AttribPtr[2]->data[i][0],
+             VB->AttribPtr[2]->data[i][1],
+             VB->AttribPtr[2]->data[i][2],
+             VB->AttribPtr[2]->data[i][3]);
+#endif
+
+      /* the vertex array case */
+      for (attr = 0; attr < VERT_ATTRIB_MAX; attr++) {
+	 if (program->InputsRead & (1 << attr)) {
+	    const GLubyte *ptr = (const GLubyte*) VB->AttribPtr[attr]->data;
+	    const GLuint size = VB->AttribPtr[attr]->size;
+	    const GLuint stride = VB->AttribPtr[attr]->stride;
+	    const GLfloat *data = (GLfloat *) (ptr + stride * i);
+	    ASSIGN_4V(ctx->VertexProgram.Inputs[attr], 0, 0, 0, 1);
+	    COPY_SZ_4V(ctx->VertexProgram.Inputs[attr], size, data);
+	 }
+      }
+
+      /* execute the program */
+      ASSERT(program);
+      _mesa_exec_vertex_program(ctx, program);
+
+      /* Fixup fog an point size results if needed */
+      if (ctx->Fog.Enabled &&
+          (program->OutputsWritten & (1 << VERT_RESULT_FOGC)) == 0) {
+         ctx->VertexProgram.Outputs[VERT_RESULT_FOGC][0] = 1.0;
+      }
+
+      if (ctx->VertexProgram.PointSizeEnabled &&
+          (program->OutputsWritten & (1 << VERT_RESULT_PSIZ)) == 0) {
+         ctx->VertexProgram.Outputs[VERT_RESULT_PSIZ][0] = ctx->Point.Size;
+      }
+
+      /* copy the output registers into the VB->attribs arrays */
+      /* XXX (optimize) could use a conditional and smaller loop limit here */
+      for (attr = 0; attr < 15; attr++) {
+         COPY_4V(store->attribs[attr].data[i],
+                 ctx->VertexProgram.Outputs[attr]);
+      }
+   }
+
+   /* Setup the VB pointers so that the next pipeline stages get
+    * their data from the right place (the program output arrays).
+    */
+   VB->ClipPtr = &store->attribs[VERT_RESULT_HPOS];
+   VB->ClipPtr->size = 4;
+   VB->ClipPtr->count = VB->Count;
+   VB->ColorPtr[0] = &store->attribs[VERT_RESULT_COL0];
+   VB->ColorPtr[1] = &store->attribs[VERT_RESULT_BFC0];
+   VB->SecondaryColorPtr[0] = &store->attribs[VERT_RESULT_COL1];
+   VB->SecondaryColorPtr[1] = &store->attribs[VERT_RESULT_BFC1];
+   VB->FogCoordPtr = &store->attribs[VERT_RESULT_FOGC];
+   VB->PointSizePtr = &store->attribs[VERT_RESULT_PSIZ];
+
+   VB->AttribPtr[VERT_ATTRIB_COLOR0] = VB->ColorPtr[0];
+   VB->AttribPtr[VERT_ATTRIB_COLOR1] = VB->SecondaryColorPtr[0];
+   VB->AttribPtr[VERT_ATTRIB_FOG] = VB->FogCoordPtr;
+   VB->AttribPtr[_TNL_ATTRIB_POINTSIZE] = &store->attribs[VERT_RESULT_PSIZ];
+
+   for (i = 0; i < ctx->Const.MaxTextureUnits; i++) {
+      VB->AttribPtr[VERT_ATTRIB_TEX0+i] = VB->TexCoordPtr[i] = 
+	 &store->attribs[VERT_RESULT_TEX0 + i];
+   }
+
+
+
+   /* Cliptest and perspective divide.  Clip functions must clear
+    * the clipmask.
+    */
+   store->ormask = 0;
+   store->andmask = CLIP_ALL_BITS;
+
+   if (tnl->NeedNdcCoords) {
+      VB->NdcPtr =
+         _mesa_clip_tab[VB->ClipPtr->size]( VB->ClipPtr,
+                                            &store->ndcCoords,
+                                            store->clipmask,
+                                            &store->ormask,
+                                            &store->andmask );
+   }
+   else {
+      VB->NdcPtr = 0;
+      _mesa_clip_np_tab[VB->ClipPtr->size]( VB->ClipPtr,
+                                            0,
+                                            store->clipmask,
+                                            &store->ormask,
+                                            &store->andmask );
+   }
+
+   if (store->andmask)  /* All vertices are outside the frustum */
+      return GL_FALSE;
+
+
+   /* This is where we'd do clip testing against the user-defined
+    * clipping planes, but they're not supported by vertex programs.
+    */
+
+   VB->ClipOrMask = store->ormask;
+   VB->ClipMask = store->clipmask;
+
+   return GL_TRUE;
+}
+
+
+/**
+ * This function validates stuff.
+ */
+static GLboolean run_validate_program( GLcontext *ctx,
+					struct tnl_pipeline_stage *stage )
+{
+#if 000
+   /* XXX do we need any validation for vertex programs? */
+   GLuint ind = 0;
+   light_func *tab;
+
+   if (ctx->Visual.rgbMode) {
+      if (ctx->Light._NeedVertices) {
+	 if (ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR)
+	    tab = _tnl_light_spec_tab;
+	 else
+	    tab = _tnl_light_tab;
+      }
+      else {
+	 if (ctx->Light.EnabledList.next == ctx->Light.EnabledList.prev)
+	    tab = _tnl_light_fast_single_tab;
+	 else
+	    tab = _tnl_light_fast_tab;
+      }
+   }
+   else
+      tab = _tnl_light_ci_tab;
+
+   if (ctx->Light.ColorMaterialEnabled)
+      ind |= LIGHT_COLORMATERIAL;
+
+   if (ctx->Light.Model.TwoSide)
+      ind |= LIGHT_TWOSIDE;
+
+   VP_STAGE_DATA(stage)->light_func_tab = &tab[ind];
+
+   /* This and the above should only be done on _NEW_LIGHT:
+    */
+   _mesa_validate_all_lighting_tables( ctx );
+#endif
+
+   /* Now run the stage...
+    */
+   stage->run = run_vp;
+   return stage->run( ctx, stage );
+}
+
+
+
+/**
+ * Called the first time stage->run is called.  In effect, don't
+ * allocate data until the first time the stage is run.
+ */
+static GLboolean run_init_vp( GLcontext *ctx,
+                              struct tnl_pipeline_stage *stage )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct vertex_buffer *VB = &(tnl->vb);
+   struct vp_stage_data *store;
+   const GLuint size = VB->Size;
+   GLuint i;
+
+   stage->privatePtr = MALLOC(sizeof(*store));
+   store = VP_STAGE_DATA(stage);
+   if (!store)
+      return GL_FALSE;
+
+   /* Allocate arrays of vertex output values */
+   for (i = 0; i < 15; i++) {
+      _mesa_vector4f_alloc( &store->attribs[i], 0, size, 32 );
+      store->attribs[i].size = 4;
+   }
+
+   /* a few other misc allocations */
+   _mesa_vector4f_alloc( &store->ndcCoords, 0, size, 32 );
+   store->clipmask = (GLubyte *) ALIGN_MALLOC(sizeof(GLubyte)*size, 32 );
+
+   /* Now validate the stage derived data...
+    */
+   stage->run = run_validate_program;
+   return stage->run( ctx, stage );
+}
+
+
+
+/**
+ * Check if vertex program mode is enabled. 
+ * If so, configure the pipeline stage's type, inputs, and outputs.
+ */
+static void check_vp( GLcontext *ctx, struct tnl_pipeline_stage *stage )
+{
+   stage->active = ctx->VertexProgram.Enabled;
+
+   if (stage->active) {
+      /* Set stage->inputs equal to the bitmask of vertex attributes
+       * which the program needs for inputs.
+       */
+      stage->inputs = ctx->VertexProgram.Current->InputsRead;
+   }
+}
+
+
+/**
+ * Destructor for this pipeline stage.
+ */
+static void dtr( struct tnl_pipeline_stage *stage )
+{
+   struct vp_stage_data *store = VP_STAGE_DATA(stage);
+
+   if (store) {
+      GLuint i;
+
+      /* free the vertex program result arrays */
+      for (i = 0; i < 15; i++)
+         _mesa_vector4f_free( &store->attribs[i] );
+
+      /* free misc arrays */
+      _mesa_vector4f_free( &store->ndcCoords );
+      ALIGN_FREE( store->clipmask );
+
+      FREE( store );
+      stage->privatePtr = 0;
+   }
+}
+
+/**
+ * Public description of this pipeline stage.
+ */
+const struct tnl_pipeline_stage _tnl_vertex_program_stage =
+{
+   "vertex-program",
+   _NEW_ALL,	/*XXX FIX */	/* recheck */
+   _NEW_ALL,	/*XXX FIX */    /* recalc */
+   GL_FALSE,			/* active */
+   0,				/* inputs - calculated on the fly */
+   _TNL_BITS_PROG_ANY,		/* outputs -- could calculate */
+   0,				/* changed_inputs */
+   NULL,			/* private_data */
+   dtr,				/* destroy */
+   check_vp,			/* check */
+   run_init_vp			/* run -- initially set to ctr */
+};
diff --git a/reactos/lib/mesa32/src/tnl/t_vb_render.c b/reactos/lib/mesa32/src/tnl/t_vb_render.c
new file mode 100644
index 00000000000..1c501689683
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl/t_vb_render.c
@@ -0,0 +1,377 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+
+/*
+ * Render whole vertex buffers, including projection of vertices from
+ * clip space and clipping of primitives.
+ *
+ * This file makes calls to project vertices and to the point, line
+ * and triangle rasterizers via the function pointers:
+ *
+ *    context->Driver.Render.*
+ *
+ */
+
+
+#include "glheader.h"
+#include "context.h"
+#include "enums.h"
+#include "macros.h"
+#include "imports.h"
+#include "mtypes.h"
+#include "nvfragprog.h"
+#include "math/m_matrix.h"
+#include "math/m_xform.h"
+
+#include "t_pipeline.h"
+
+
+
+/**********************************************************************/
+/*                        Clip single primitives                      */
+/**********************************************************************/
+
+
+#define W(i) coord[i][3]
+#define Z(i) coord[i][2]
+#define Y(i) coord[i][1]
+#define X(i) coord[i][0]
+#define SIZE 4
+#define TAG(x) x##_4
+#include "t_vb_cliptmp.h"
+
+
+
+/**********************************************************************/
+/*              Clip and render whole begin/end objects               */
+/**********************************************************************/
+
+#define NEED_EDGEFLAG_SETUP (ctx->Polygon.FrontMode != GL_FILL || ctx->Polygon.BackMode != GL_FILL)
+#define EDGEFLAG_GET(idx) VB->EdgeFlag[idx]
+#define EDGEFLAG_SET(idx, val) VB->EdgeFlag[idx] = val
+
+
+/* Vertices, with the possibility of clipping.
+ */
+#define RENDER_POINTS( start, count ) \
+   tnl->Driver.Render.Points( ctx, start, count )
+
+#define RENDER_LINE( v1, v2 )			\
+do {						\
+   GLubyte c1 = mask[v1], c2 = mask[v2];	\
+   GLubyte ormask = c1|c2;			\
+   if (!ormask)					\
+      LineFunc( ctx, v1, v2 );			\
+   else if (!(c1 & c2 & 0x3f))			\
+      clip_line_4( ctx, v1, v2, ormask );	\
+} while (0)
+
+#define RENDER_TRI( v1, v2, v3 )			\
+do {							\
+   GLubyte c1 = mask[v1], c2 = mask[v2], c3 = mask[v3];	\
+   GLubyte ormask = c1|c2|c3;				\
+   if (!ormask)						\
+      TriangleFunc( ctx, v1, v2, v3 );			\
+   else if (!(c1 & c2 & c3 & 0x3f)) 			\
+      clip_tri_4( ctx, v1, v2, v3, ormask );    	\
+} while (0)
+
+#define RENDER_QUAD( v1, v2, v3, v4 )			\
+do {							\
+   GLubyte c1 = mask[v1], c2 = mask[v2];		\
+   GLubyte c3 = mask[v3], c4 = mask[v4];		\
+   GLubyte ormask = c1|c2|c3|c4;			\
+   if (!ormask)						\
+      QuadFunc( ctx, v1, v2, v3, v4 );			\
+   else if (!(c1 & c2 & c3 & c4 & 0x3f)) 		\
+      clip_quad_4( ctx, v1, v2, v3, v4, ormask );	\
+} while (0)
+
+
+#define LOCAL_VARS						\
+   TNLcontext *tnl = TNL_CONTEXT(ctx);				\
+   struct vertex_buffer *VB = &tnl->vb;				\
+   const GLuint * const elt = VB->Elts;				\
+   const GLubyte *mask = VB->ClipMask;				\
+   const GLuint sz = VB->ClipPtr->size;				\
+   const line_func LineFunc = tnl->Driver.Render.Line;		\
+   const triangle_func TriangleFunc = tnl->Driver.Render.Triangle;	\
+   const quad_func QuadFunc = tnl->Driver.Render.Quad;		\
+   const GLboolean stipple = ctx->Line.StippleFlag;		\
+   (void) (LineFunc && TriangleFunc && QuadFunc);		\
+   (void) elt; (void) mask; (void) sz; (void) stipple;
+
+#define TAG(x) clip_##x##_verts
+#define INIT(x) tnl->Driver.Render.PrimitiveNotify( ctx, x )
+#define RESET_STIPPLE if (stipple) tnl->Driver.Render.ResetLineStipple( ctx )
+#define RESET_OCCLUSION ctx->OcclusionResult = GL_TRUE
+#define PRESERVE_VB_DEFS
+#include "t_vb_rendertmp.h"
+
+
+
+/* Elts, with the possibility of clipping.
+ */
+#undef ELT
+#undef TAG
+#define ELT(x) elt[x]
+#define TAG(x) clip_##x##_elts
+#include "t_vb_rendertmp.h"
+
+/* TODO: do this for all primitives, verts and elts:
+ */
+static void clip_elt_triangles( GLcontext *ctx,
+				GLuint start,
+				GLuint count,
+				GLuint flags )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   render_func render_tris = tnl->Driver.Render.PrimTabElts[GL_TRIANGLES];
+   struct vertex_buffer *VB = &tnl->vb;
+   const GLuint * const elt = VB->Elts;
+   GLubyte *mask = VB->ClipMask;
+   GLuint last = count-2;
+   GLuint j;
+   (void) flags;
+
+   tnl->Driver.Render.PrimitiveNotify( ctx, GL_TRIANGLES );
+
+   for (j=start; j < last; j+=3 ) {
+      GLubyte c1 = mask[elt[j]];
+      GLubyte c2 = mask[elt[j+1]];
+      GLubyte c3 = mask[elt[j+2]];
+      GLubyte ormask = c1|c2|c3;
+      if (ormask) {
+	 if (start < j)
+	    render_tris( ctx, start, j, 0 );
+	 if (!(c1&c2&c3&0x3f))
+	    clip_tri_4( ctx, elt[j], elt[j+1], elt[j+2], ormask );
+	 start = j+3;
+      }
+   }
+
+   if (start < j)
+      render_tris( ctx, start, j, 0 );
+}
+
+/**********************************************************************/
+/*                  Render whole begin/end objects                    */
+/**********************************************************************/
+
+#define NEED_EDGEFLAG_SETUP (ctx->Polygon.FrontMode != GL_FILL || ctx->Polygon.BackMode != GL_FILL)
+#define EDGEFLAG_GET(idx) VB->EdgeFlag[idx]
+#define EDGEFLAG_SET(idx, val) VB->EdgeFlag[idx] = val
+
+
+/* Vertices, no clipping.
+ */
+#define RENDER_POINTS( start, count ) \
+   tnl->Driver.Render.Points( ctx, start, count )
+
+#define RENDER_LINE( v1, v2 ) \
+   LineFunc( ctx, v1, v2 )
+
+#define RENDER_TRI( v1, v2, v3 ) \
+   TriangleFunc( ctx, v1, v2, v3 )
+
+#define RENDER_QUAD( v1, v2, v3, v4 ) \
+   QuadFunc( ctx, v1, v2, v3, v4 )
+
+#define TAG(x) _tnl_##x##_verts
+
+#define LOCAL_VARS						\
+   TNLcontext *tnl = TNL_CONTEXT(ctx);				\
+   struct vertex_buffer *VB = &tnl->vb;				\
+   const GLuint * const elt = VB->Elts;				\
+   const line_func LineFunc = tnl->Driver.Render.Line;		\
+   const triangle_func TriangleFunc = tnl->Driver.Render.Triangle;	\
+   const quad_func QuadFunc = tnl->Driver.Render.Quad;		\
+   const GLboolean stipple = ctx->Line.StippleFlag;		\
+   (void) (LineFunc && TriangleFunc && QuadFunc);		\
+   (void) elt; (void) stipple
+
+#define RESET_STIPPLE if (stipple) tnl->Driver.Render.ResetLineStipple( ctx )
+#define RESET_OCCLUSION ctx->OcclusionResult = GL_TRUE
+#define INIT(x) tnl->Driver.Render.PrimitiveNotify( ctx, x )
+#define RENDER_TAB_QUALIFIER
+#define PRESERVE_VB_DEFS
+#include "t_vb_rendertmp.h"
+
+
+/* Elts, no clipping.
+ */
+#undef ELT
+#define TAG(x) _tnl_##x##_elts
+#define ELT(x) elt[x]
+#include "t_vb_rendertmp.h"
+
+
+/**********************************************************************/
+/*              Helper functions for drivers                  */
+/**********************************************************************/
+
+void _tnl_RenderClippedPolygon( GLcontext *ctx, const GLuint *elts, GLuint n )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct vertex_buffer *VB = &tnl->vb;
+   GLuint *tmp = VB->Elts;
+
+   VB->Elts = (GLuint *)elts;
+   tnl->Driver.Render.PrimTabElts[GL_POLYGON]( ctx, 0, n, PRIM_BEGIN|PRIM_END );
+   VB->Elts = tmp;
+}
+
+void _tnl_RenderClippedLine( GLcontext *ctx, GLuint ii, GLuint jj )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   tnl->Driver.Render.Line( ctx, ii, jj );
+}
+
+
+
+/**********************************************************************/
+/*              Clip and render whole vertex buffers                  */
+/**********************************************************************/
+
+
+static GLboolean run_render( GLcontext *ctx,
+			     struct tnl_pipeline_stage *stage )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct vertex_buffer *VB = &tnl->vb;
+   GLuint new_inputs = stage->changed_inputs;
+   render_func *tab;
+   GLint pass = 0;
+
+   /* Allow the drivers to lock before projected verts are built so
+    * that window coordinates are guarenteed not to change before
+    * rendering.
+    */
+   ASSERT(tnl->Driver.Render.Start);
+
+   tnl->Driver.Render.Start( ctx );
+
+   ASSERT(tnl->Driver.Render.BuildVertices);
+   ASSERT(tnl->Driver.Render.PrimitiveNotify);
+   ASSERT(tnl->Driver.Render.Points);
+   ASSERT(tnl->Driver.Render.Line);
+   ASSERT(tnl->Driver.Render.Triangle);
+   ASSERT(tnl->Driver.Render.Quad);
+   ASSERT(tnl->Driver.Render.ResetLineStipple);
+   ASSERT(tnl->Driver.Render.Interp);
+   ASSERT(tnl->Driver.Render.CopyPV);
+   ASSERT(tnl->Driver.Render.ClippedLine);
+   ASSERT(tnl->Driver.Render.ClippedPolygon);
+   ASSERT(tnl->Driver.Render.Finish);
+
+   tnl->Driver.Render.BuildVertices( ctx, 0, VB->Count, new_inputs );
+
+   if (VB->ClipOrMask) {
+      tab = VB->Elts ? clip_render_tab_elts : clip_render_tab_verts;
+      clip_render_tab_elts[GL_TRIANGLES] = clip_elt_triangles;
+   }
+   else {
+      tab = (VB->Elts ? 
+	     tnl->Driver.Render.PrimTabElts : 
+	     tnl->Driver.Render.PrimTabVerts);
+   }
+
+   do
+   {
+      GLuint i;
+
+      for (i = 0 ; i < VB->PrimitiveCount ; i++)
+      {
+	 GLuint prim = VB->Primitive[i].mode;
+	 GLuint start = VB->Primitive[i].start;
+	 GLuint length = VB->Primitive[i].count;
+
+	 assert((prim & PRIM_MODE_MASK) < GL_POLYGON+1);
+
+	 if (MESA_VERBOSE & VERBOSE_PRIMS) 
+	    _mesa_debug(NULL, "MESA prim %s %d..%d\n", 
+			_mesa_lookup_enum_by_nr(prim & PRIM_MODE_MASK), 
+			start, start+length);
+
+	 if (length)
+	    tab[prim & PRIM_MODE_MASK]( ctx, start, start + length, prim );
+      }
+   } while (tnl->Driver.Render.Multipass &&
+	    tnl->Driver.Render.Multipass( ctx, ++pass ));
+
+   tnl->Driver.Render.Finish( ctx );
+
+   return GL_FALSE;		/* finished the pipe */
+}
+
+
+/**********************************************************************/
+/*                          Render pipeline stage                     */
+/**********************************************************************/
+
+
+
+/* Quite a bit of work involved in finding out the inputs for the
+ * render stage.
+ */
+static void check_render( GLcontext *ctx, struct tnl_pipeline_stage *stage )
+{
+   stage->inputs = TNL_CONTEXT(ctx)->render_inputs;
+}
+
+
+
+
+static void dtr( struct tnl_pipeline_stage *stage )
+{
+}
+
+
+const struct tnl_pipeline_stage _tnl_render_stage =
+{
+   "render",			/* name */
+   (_NEW_BUFFERS |
+    _DD_NEW_SEPARATE_SPECULAR |
+    _DD_NEW_FLATSHADE |
+    _NEW_TEXTURE|
+    _NEW_LIGHT|
+    _NEW_POINT|
+    _NEW_FOG|
+    _DD_NEW_TRI_UNFILLED |
+    _NEW_RENDERMODE),		/* re-check (new inputs, interp function) */
+   0,				/* re-run (always runs) */
+   GL_TRUE,			/* active? */
+   0,				/* inputs (set in check_render) */
+   0,				/* outputs */
+   0,				/* changed_inputs */
+   NULL,			/* private data */
+   dtr,				/* destructor */
+   check_render,		/* check */
+   run_render			/* run */
+};
diff --git a/reactos/lib/mesa32/src/tnl/t_vb_rendertmp.h b/reactos/lib/mesa32/src/tnl/t_vb_rendertmp.h
new file mode 100644
index 00000000000..3db94bc0934
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl/t_vb_rendertmp.h
@@ -0,0 +1,440 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+
+#ifndef POSTFIX
+#define POSTFIX
+#endif
+
+#ifndef INIT
+#define INIT(x)
+#endif
+
+#ifndef NEED_EDGEFLAG_SETUP
+#define NEED_EDGEFLAG_SETUP 0
+#define EDGEFLAG_GET(a) 0
+#define EDGEFLAG_SET(a,b) (void)b
+#endif
+
+#ifndef RESET_STIPPLE
+#define RESET_STIPPLE
+#endif
+
+#ifndef RESET_OCCLUSION
+#define RESET_OCCLUSION
+#endif
+
+#ifndef TEST_PRIM_END
+#define TEST_PRIM_END(flags) (flags & PRIM_END)
+#define TEST_PRIM_BEGIN(flags) (flags & PRIM_BEGIN)
+#endif
+
+#ifndef ELT
+#define ELT(x) x
+#endif
+
+#ifndef RENDER_TAB_QUALIFIER
+#define RENDER_TAB_QUALIFIER static
+#endif
+
+static void TAG(render_points)( GLcontext *ctx,
+				GLuint start,
+				GLuint count,
+				GLuint flags )
+{
+   LOCAL_VARS;
+   (void) flags;
+
+   RESET_OCCLUSION;
+   INIT(GL_POINTS);
+   RENDER_POINTS( start, count );
+   POSTFIX;
+}
+
+static void TAG(render_lines)( GLcontext *ctx,
+			       GLuint start,
+			       GLuint count,
+			       GLuint flags )
+{
+   GLuint j;
+   LOCAL_VARS;
+   (void) flags;
+
+   RESET_OCCLUSION;
+   INIT(GL_LINES);
+   for (j=start+1; j<count; j+=2 ) {
+      RESET_STIPPLE;
+      RENDER_LINE( ELT(j-1), ELT(j) );
+   }
+   POSTFIX;
+}
+
+
+static void TAG(render_line_strip)( GLcontext *ctx,
+				    GLuint start,
+				    GLuint count,
+				    GLuint flags )
+{
+   GLuint j;
+   LOCAL_VARS;
+   (void) flags;
+
+   RESET_OCCLUSION;
+   INIT(GL_LINE_STRIP);
+
+   if (TEST_PRIM_BEGIN(flags)) {
+      RESET_STIPPLE;
+   }
+
+   for (j=start+1; j<count; j++ )
+      RENDER_LINE( ELT(j-1), ELT(j) );
+
+   POSTFIX;
+}
+
+
+static void TAG(render_line_loop)( GLcontext *ctx,
+				   GLuint start,
+				   GLuint count,
+				   GLuint flags )
+{
+   GLuint i;
+   LOCAL_VARS;
+
+   (void) flags;
+
+   RESET_OCCLUSION;
+   INIT(GL_LINE_LOOP);
+
+   if (start+1 < count) {
+      if (TEST_PRIM_BEGIN(flags)) {
+	 RESET_STIPPLE;
+	 RENDER_LINE( ELT(start), ELT(start+1) );
+      }
+
+      for ( i = start+2 ; i < count ; i++) {
+	 RENDER_LINE( ELT(i-1), ELT(i) );
+      }
+
+      if ( TEST_PRIM_END(flags)) {
+	 RENDER_LINE( ELT(count-1), ELT(start) );
+      }
+   }
+
+   POSTFIX;
+}
+
+
+static void TAG(render_triangles)( GLcontext *ctx,
+				   GLuint start,
+				   GLuint count,
+				   GLuint flags )
+{
+   GLuint j;
+   LOCAL_VARS;
+   (void) flags;
+
+   INIT(GL_TRIANGLES);
+   if (NEED_EDGEFLAG_SETUP) {
+      for (j=start+2; j<count; j+=3) {
+	 /* Leave the edgeflags as supplied by the user.
+	  */
+	 RESET_STIPPLE;
+	 RENDER_TRI( ELT(j-2), ELT(j-1), ELT(j) );
+      }
+   } else {
+      for (j=start+2; j<count; j+=3) {
+	 RENDER_TRI( ELT(j-2), ELT(j-1), ELT(j) );
+      }
+   }
+   POSTFIX;
+}
+
+
+
+static void TAG(render_tri_strip)( GLcontext *ctx,
+				   GLuint start,
+				   GLuint count,
+				   GLuint flags )
+{
+   GLuint j;
+   GLuint parity = 0;
+   LOCAL_VARS;
+
+   INIT(GL_TRIANGLE_STRIP);
+   if (NEED_EDGEFLAG_SETUP) {
+      for (j=start+2;j<count;j++,parity^=1) {
+	 GLuint ej2 = ELT(j-2+parity);
+	 GLuint ej1 = ELT(j-1-parity);
+	 GLuint ej = ELT(j);
+	 GLboolean ef2 = EDGEFLAG_GET( ej2 );
+	 GLboolean ef1 = EDGEFLAG_GET( ej1 );
+	 GLboolean ef = EDGEFLAG_GET( ej );
+	 if (TEST_PRIM_BEGIN(flags)) {
+	    RESET_STIPPLE;
+	 }
+	 EDGEFLAG_SET( ej2, GL_TRUE );
+	 EDGEFLAG_SET( ej1, GL_TRUE );
+	 EDGEFLAG_SET( ej, GL_TRUE );
+	 RENDER_TRI( ej2, ej1, ej );
+	 EDGEFLAG_SET( ej2, ef2 );
+	 EDGEFLAG_SET( ej1, ef1 );
+	 EDGEFLAG_SET( ej, ef );
+      }
+   } else {
+      for (j=start+2; j<count ; j++, parity^=1) {
+	 RENDER_TRI( ELT(j-2+parity), ELT(j-1-parity), ELT(j) );
+      }
+   }
+   POSTFIX;
+}
+
+
+static void TAG(render_tri_fan)( GLcontext *ctx,
+				 GLuint start,
+				 GLuint count,
+				 GLuint flags )
+{
+   GLuint j;
+   LOCAL_VARS;
+   (void) flags;
+
+   INIT(GL_TRIANGLE_FAN);
+   if (NEED_EDGEFLAG_SETUP) {
+      for (j=start+2;j<count;j++) {
+	 /* For trifans, all edges are boundary.
+	  */
+	 GLuint ejs = ELT(start);
+	 GLuint ej1 = ELT(j-1);
+	 GLuint ej = ELT(j);
+	 GLboolean efs = EDGEFLAG_GET( ejs );
+	 GLboolean ef1 = EDGEFLAG_GET( ej1 );
+	 GLboolean ef = EDGEFLAG_GET( ej );
+	 if (TEST_PRIM_BEGIN(flags)) {
+	    RESET_STIPPLE;
+	 }
+	 EDGEFLAG_SET( ejs, GL_TRUE );
+	 EDGEFLAG_SET( ej1, GL_TRUE );
+	 EDGEFLAG_SET( ej, GL_TRUE );
+	 RENDER_TRI( ejs, ej1, ej);
+	 EDGEFLAG_SET( ejs, efs );
+	 EDGEFLAG_SET( ej1, ef1 );
+	 EDGEFLAG_SET( ej, ef );
+      }
+   } else {
+      for (j=start+2;j<count;j++) {
+	 RENDER_TRI( ELT(start), ELT(j-1), ELT(j) );
+      }
+   }
+
+   POSTFIX;
+}
+
+
+static void TAG(render_poly)( GLcontext *ctx,
+			      GLuint start,
+			      GLuint count,
+			      GLuint flags )
+{
+   GLuint j = start+2;
+   LOCAL_VARS;
+   (void) flags;
+
+   INIT(GL_POLYGON);
+   if (NEED_EDGEFLAG_SETUP) {
+      GLboolean efstart = EDGEFLAG_GET( ELT(start) );
+      GLboolean efcount = EDGEFLAG_GET( ELT(count-1) );
+
+      /* If the primitive does not begin here, the first edge
+       * is non-boundary.
+       */
+      if (!TEST_PRIM_BEGIN(flags))
+	 EDGEFLAG_SET( ELT(start), GL_FALSE );
+      else {
+	 RESET_STIPPLE;
+      }
+
+      /* If the primitive does not end here, the final edge is
+       * non-boundary.
+       */
+      if (!TEST_PRIM_END(flags))
+	 EDGEFLAG_SET( ELT(count-1), GL_FALSE );
+
+      /* Draw the first triangles (possibly zero)
+       */
+      if (j+1<count) {
+	 GLboolean ef = EDGEFLAG_GET( ELT(j) );
+	 EDGEFLAG_SET( ELT(j), GL_FALSE );
+	 RENDER_TRI( ELT(j-1), ELT(j), ELT(start) );
+	 EDGEFLAG_SET( ELT(j), ef );
+	 j++;
+
+	 /* Don't render the first edge again:
+	  */
+	 EDGEFLAG_SET( ELT(start), GL_FALSE );
+
+	 for (;j+1<count;j++) {
+	    GLboolean efj = EDGEFLAG_GET( ELT(j) );
+	    EDGEFLAG_SET( ELT(j), GL_FALSE );
+	    RENDER_TRI( ELT(j-1), ELT(j), ELT(start) );
+	    EDGEFLAG_SET( ELT(j), efj );
+	 }
+      }
+
+      /* Draw the last or only triangle
+       */
+      if (j < count)
+	 RENDER_TRI( ELT(j-1), ELT(j), ELT(start) );
+
+      /* Restore the first and last edgeflags:
+       */
+      EDGEFLAG_SET( ELT(count-1), efcount );
+      EDGEFLAG_SET( ELT(start), efstart );
+
+   }
+   else {
+      for (j=start+2;j<count;j++) {
+	 RENDER_TRI( ELT(j-1), ELT(j), ELT(start) );
+      }
+   }
+   POSTFIX;
+}
+
+static void TAG(render_quads)( GLcontext *ctx,
+			       GLuint start,
+			       GLuint count,
+			       GLuint flags )
+{
+   GLuint j;
+   LOCAL_VARS;
+   (void) flags;
+
+   INIT(GL_QUADS);
+   if (NEED_EDGEFLAG_SETUP) {
+      for (j=start+3; j<count; j+=4) {
+	 /* Use user-specified edgeflags for quads.
+	  */
+	 RESET_STIPPLE;
+	 RENDER_QUAD( ELT(j-3), ELT(j-2), ELT(j-1), ELT(j) );
+      }
+   } else {
+      for (j=start+3; j<count; j+=4) {
+	 RENDER_QUAD( ELT(j-3), ELT(j-2), ELT(j-1), ELT(j) );
+      }
+   }
+   POSTFIX;
+}
+
+static void TAG(render_quad_strip)( GLcontext *ctx,
+				    GLuint start,
+				    GLuint count,
+				    GLuint flags )
+{
+   GLuint j;
+   LOCAL_VARS;
+   (void) flags;
+
+   INIT(GL_QUAD_STRIP);
+   if (NEED_EDGEFLAG_SETUP) {
+      for (j=start+3;j<count;j+=2) {
+	 /* All edges are boundary.  Set edgeflags to 1, draw the
+	  * quad, and restore them to the original values.
+	  */
+	 GLboolean ef3 = EDGEFLAG_GET( ELT(j-3) );
+	 GLboolean ef2 = EDGEFLAG_GET( ELT(j-2) );
+	 GLboolean ef1 = EDGEFLAG_GET( ELT(j-1) );
+	 GLboolean ef = EDGEFLAG_GET( ELT(j) );
+	 if (TEST_PRIM_BEGIN(flags)) {
+	    RESET_STIPPLE;
+	 }
+	 EDGEFLAG_SET( ELT(j-3), GL_TRUE );
+	 EDGEFLAG_SET( ELT(j-2), GL_TRUE );
+	 EDGEFLAG_SET( ELT(j-1), GL_TRUE );
+	 EDGEFLAG_SET( ELT(j), GL_TRUE );
+	 RENDER_QUAD( ELT(j-1), ELT(j-3), ELT(j-2), ELT(j) );
+	 EDGEFLAG_SET( ELT(j-3), ef3 );
+	 EDGEFLAG_SET( ELT(j-2), ef2 );
+	 EDGEFLAG_SET( ELT(j-1), ef1 );
+	 EDGEFLAG_SET( ELT(j), ef );
+      }
+   } else {
+      for (j=start+3;j<count;j+=2) {
+	 RENDER_QUAD( ELT(j-1), ELT(j-3), ELT(j-2), ELT(j) );
+      }
+   }
+   POSTFIX;
+}
+
+static void TAG(render_noop)( GLcontext *ctx,
+			      GLuint start,
+			      GLuint count,
+			      GLuint flags )
+{
+   (void)(ctx && start && count && flags);
+}
+
+RENDER_TAB_QUALIFIER void (*TAG(render_tab)[GL_POLYGON+2])(GLcontext *,
+							   GLuint,
+							   GLuint,
+							   GLuint) =
+{
+   TAG(render_points),
+   TAG(render_lines),
+   TAG(render_line_loop),
+   TAG(render_line_strip),
+   TAG(render_triangles),
+   TAG(render_tri_strip),
+   TAG(render_tri_fan),
+   TAG(render_quads),
+   TAG(render_quad_strip),
+   TAG(render_poly),
+   TAG(render_noop),
+};
+
+
+
+#ifndef PRESERVE_VB_DEFS
+#undef RENDER_TRI
+#undef RENDER_QUAD
+#undef RENDER_LINE
+#undef RENDER_POINTS
+#undef LOCAL_VARS
+#undef INIT
+#undef POSTFIX
+#undef RESET_STIPPLE
+#undef DBG
+#undef ELT
+#undef RENDER_TAB_QUALIFIER
+#endif
+
+#ifndef PRESERVE_TAG
+#undef TAG
+#endif
+
+#undef PRESERVE_VB_DEFS
+#undef PRESERVE_TAG
diff --git a/reactos/lib/mesa32/src/tnl/t_vb_texgen.c b/reactos/lib/mesa32/src/tnl/t_vb_texgen.c
new file mode 100644
index 00000000000..64d569a0192
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl/t_vb_texgen.c
@@ -0,0 +1,691 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Brian Paul
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+/*
+ * Regarding GL_NV_texgen_reflection:
+ *
+ * Portions of this software may use or implement intellectual
+ * property owned and licensed by NVIDIA Corporation. NVIDIA disclaims
+ * any and all warranties with respect to such intellectual property,
+ * including any use thereof or modifications thereto.
+ */
+
+#include "glheader.h"
+#include "colormac.h"
+#include "context.h"
+#include "macros.h"
+#include "imports.h"
+#include "mtypes.h"
+
+#include "math/m_xform.h"
+
+#include "t_context.h"
+#include "t_pipeline.h"
+
+
+/***********************************************************************
+ * Automatic texture coordinate generation (texgen) code.
+ */
+
+
+struct texgen_stage_data;
+
+typedef void (*texgen_func)( GLcontext *ctx,
+			     struct texgen_stage_data *store,
+			     GLuint unit);
+
+
+struct texgen_stage_data {
+
+   /* Per-texunit derived state.
+    */
+   GLuint TexgenSize[MAX_TEXTURE_COORD_UNITS];
+   GLuint TexgenHoles[MAX_TEXTURE_COORD_UNITS];
+   texgen_func TexgenFunc[MAX_TEXTURE_COORD_UNITS];
+
+   /* Temporary values used in texgen.
+    */
+   GLfloat (*tmp_f)[3];
+   GLfloat *tmp_m;
+
+   /* Buffered outputs of the stage.
+    */
+   GLvector4f texcoord[MAX_TEXTURE_COORD_UNITS];
+};
+
+
+#define TEXGEN_STAGE_DATA(stage) ((struct texgen_stage_data *)stage->privatePtr)
+
+
+
+static GLuint all_bits[5] = {
+   0,
+   VEC_SIZE_1,
+   VEC_SIZE_2,
+   VEC_SIZE_3,
+   VEC_SIZE_4,
+};
+
+#define VEC_SIZE_FLAGS (VEC_SIZE_1|VEC_SIZE_2|VEC_SIZE_3|VEC_SIZE_4)
+
+#define TEXGEN_NEED_M            (TEXGEN_SPHERE_MAP)
+#define TEXGEN_NEED_F            (TEXGEN_SPHERE_MAP        | \
+				  TEXGEN_REFLECTION_MAP_NV)
+
+
+
+static void build_m3( GLfloat f[][3], GLfloat m[],
+		      const GLvector4f *normal,
+		      const GLvector4f *eye )
+{
+   GLuint stride = eye->stride;
+   GLfloat *coord = (GLfloat *)eye->start;
+   GLuint count = eye->count;
+   const GLfloat *norm = normal->start;
+   GLuint i;
+
+   for (i=0;i<count;i++,STRIDE_F(coord,stride),STRIDE_F(norm,normal->stride)) {
+      GLfloat u[3], two_nu, fx, fy, fz;
+      COPY_3V( u, coord );
+      NORMALIZE_3FV( u );
+      two_nu = 2.0F * DOT3(norm,u);
+      fx = f[i][0] = u[0] - norm[0] * two_nu;
+      fy = f[i][1] = u[1] - norm[1] * two_nu;
+      fz = f[i][2] = u[2] - norm[2] * two_nu;
+      m[i] = fx * fx + fy * fy + (fz + 1.0F) * (fz + 1.0F);
+      if (m[i] != 0.0F) {
+	 m[i] = 0.5F * _mesa_inv_sqrtf(m[i]);
+      }
+   }
+}
+
+
+
+static void build_m2( GLfloat f[][3], GLfloat m[],
+		      const GLvector4f *normal,
+		      const GLvector4f *eye )
+{
+   GLuint stride = eye->stride;
+   GLfloat *coord = eye->start;
+   GLuint count = eye->count;
+
+   GLfloat *norm = normal->start;
+   GLuint i;
+
+   for (i=0;i<count;i++,STRIDE_F(coord,stride),STRIDE_F(norm,normal->stride)) {
+      GLfloat u[3], two_nu, fx, fy, fz;
+      COPY_2V( u, coord );
+      u[2] = 0;
+      NORMALIZE_3FV( u );
+      two_nu = 2.0F * DOT3(norm,u);
+      fx = f[i][0] = u[0] - norm[0] * two_nu;
+      fy = f[i][1] = u[1] - norm[1] * two_nu;
+      fz = f[i][2] = u[2] - norm[2] * two_nu;
+      m[i] = fx * fx + fy * fy + (fz + 1.0F) * (fz + 1.0F);
+      if (m[i] != 0.0F) {
+	 m[i] = 0.5F * _mesa_inv_sqrtf(m[i]);
+      }
+   }
+}
+
+
+
+typedef void (*build_m_func)( GLfloat f[][3],
+			      GLfloat m[],
+			      const GLvector4f *normal,
+			      const GLvector4f *eye );
+
+
+static build_m_func build_m_tab[5] = {
+   0,
+   0,
+   build_m2,
+   build_m3,
+   build_m3
+};
+
+
+/* This is unusual in that we respect the stride of the output vector
+ * (f).  This allows us to pass in either a texcoord vector4f, or a
+ * temporary vector3f.
+ */
+static void build_f3( GLfloat *f,
+		      GLuint fstride,
+		      const GLvector4f *normal,
+		      const GLvector4f *eye )
+{
+   GLuint stride = eye->stride;
+   GLfloat *coord = eye->start;
+   GLuint count = eye->count;
+
+   GLfloat *norm = normal->start;
+   GLuint i;
+
+   for (i=0;i<count;i++) {
+      GLfloat u[3], two_nu;
+      COPY_3V( u, coord );
+      NORMALIZE_3FV( u );
+      two_nu = 2.0F * DOT3(norm,u);
+      f[0] = u[0] - norm[0] * two_nu;
+      f[1] = u[1] - norm[1] * two_nu;
+      f[2] = u[2] - norm[2] * two_nu;
+      STRIDE_F(coord,stride);
+      STRIDE_F(f,fstride);
+      STRIDE_F(norm, normal->stride);
+   }
+}
+
+
+static void build_f2( GLfloat *f,
+		      GLuint fstride,
+		      const GLvector4f *normal,
+		      const GLvector4f *eye )
+{
+   GLuint stride = eye->stride;
+   GLfloat *coord = eye->start;
+   GLuint count = eye->count;
+   GLfloat *norm = normal->start;
+   GLuint i;
+
+   for (i=0;i<count;i++) {
+
+      GLfloat u[3], two_nu;
+      COPY_2V( u, coord );
+      u[2] = 0;
+      NORMALIZE_3FV( u );
+      two_nu = 2.0F * DOT3(norm,u);
+      f[0] = u[0] - norm[0] * two_nu;
+      f[1] = u[1] - norm[1] * two_nu;
+      f[2] = u[2] - norm[2] * two_nu;
+
+      STRIDE_F(coord,stride);
+      STRIDE_F(f,fstride);
+      STRIDE_F(norm, normal->stride);
+   }
+}
+
+typedef void (*build_f_func)( GLfloat *f,
+			      GLuint fstride,
+			      const GLvector4f *normal_vec,
+			      const GLvector4f *eye );
+
+
+
+/* Just treat 4-vectors as 3-vectors.
+ */
+static build_f_func build_f_tab[5] = {
+   0,
+   0,
+   build_f2,
+   build_f3,
+   build_f3
+};
+
+
+/* Special case texgen functions.
+ */
+static void texgen_reflection_map_nv( GLcontext *ctx,
+				      struct texgen_stage_data *store,
+				      GLuint unit )
+{
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+   GLvector4f *in = VB->TexCoordPtr[unit];
+   GLvector4f *out = &store->texcoord[unit];
+
+   build_f_tab[VB->EyePtr->size]( out->start,
+				  out->stride,
+				  VB->NormalPtr,
+				  VB->EyePtr );
+
+   if (in) {
+      out->flags |= (in->flags & VEC_SIZE_FLAGS) | VEC_SIZE_3;
+      out->count = in->count;
+      out->size = MAX2(in->size, 3);
+      if (in->size == 4)
+	 _mesa_copy_tab[0x8]( out, in );
+   }
+   else {
+      out->flags |= VEC_SIZE_3;
+      out->size = 3;
+      out->count = in->count;
+   }
+
+}
+
+
+
+static void texgen_normal_map_nv( GLcontext *ctx,
+				  struct texgen_stage_data *store,
+				  GLuint unit )
+{
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+   GLvector4f *in = VB->TexCoordPtr[unit];
+   GLvector4f *out = &store->texcoord[unit];
+   GLvector4f *normal = VB->NormalPtr;
+   GLfloat (*texcoord)[4] = (GLfloat (*)[4])out->start;
+   GLuint count = VB->Count;
+   GLuint i;
+   const GLfloat *norm = normal->start;
+
+   for (i=0;i<count;i++, STRIDE_F(norm, normal->stride)) {
+      texcoord[i][0] = norm[0];
+      texcoord[i][1] = norm[1];
+      texcoord[i][2] = norm[2];
+   }
+
+
+   if (in) {
+      out->flags |= (in->flags & VEC_SIZE_FLAGS) | VEC_SIZE_3;
+      out->count = in->count;
+      out->size = MAX2(in->size, 3);
+      if (in->size == 4)
+	 _mesa_copy_tab[0x8]( out, in );
+   }
+   else {
+      out->flags |= VEC_SIZE_3;
+      out->size = 3;
+      out->count = in->count;
+   }
+}
+
+
+static void texgen_sphere_map( GLcontext *ctx,
+			       struct texgen_stage_data *store,
+			       GLuint unit )
+{
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+   GLvector4f *in = VB->TexCoordPtr[unit];
+   GLvector4f *out = &store->texcoord[unit];
+   GLfloat (*texcoord)[4] = (GLfloat (*)[4]) out->start;
+   GLuint count = VB->Count;
+   GLuint i;
+   GLfloat (*f)[3] = store->tmp_f;
+   GLfloat *m = store->tmp_m;
+
+   (build_m_tab[VB->EyePtr->size])( store->tmp_f,
+				    store->tmp_m,
+				    VB->NormalPtr,
+				    VB->EyePtr );
+
+   for (i=0;i<count;i++) {
+      texcoord[i][0] = f[i][0] * m[i] + 0.5F;
+      texcoord[i][1] = f[i][1] * m[i] + 0.5F;
+   }
+
+   if (in) {
+      out->size = MAX2(in->size,2);
+      out->count = in->count;
+      out->flags |= (in->flags & VEC_SIZE_FLAGS) | VEC_SIZE_2;
+      if (in->size > 2)
+	 _mesa_copy_tab[all_bits[in->size] & ~0x3]( out, in );
+   } else {
+      out->size = 2;
+      out->flags |= VEC_SIZE_2;
+      out->count = in->count;
+   }
+}
+
+
+
+static void texgen( GLcontext *ctx,
+		    struct texgen_stage_data *store,
+		    GLuint unit )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct vertex_buffer *VB = &tnl->vb;
+   GLvector4f *in = VB->TexCoordPtr[unit];
+   GLvector4f *out = &store->texcoord[unit];
+   const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
+   const GLvector4f *obj = VB->ObjPtr;
+   const GLvector4f *eye = VB->EyePtr;
+   const GLvector4f *normal = VB->NormalPtr;
+   const GLfloat *m = store->tmp_m;
+   const GLuint count = VB->Count;
+   GLfloat (*texcoord)[4] = (GLfloat (*)[4])out->data;
+   GLfloat (*f)[3] = store->tmp_f;
+   GLuint holes = 0;
+
+   if (texUnit->_GenFlags & TEXGEN_NEED_M) {
+      build_m_tab[eye->size]( store->tmp_f, store->tmp_m, normal, eye );
+   } else if (texUnit->_GenFlags & TEXGEN_NEED_F) {
+      build_f_tab[eye->size]( (GLfloat *)store->tmp_f, 3, normal, eye );
+   }
+
+   if (!in) {
+      ASSERT(0);
+      in = out;
+      in->count = VB->Count;
+
+      out->size = store->TexgenSize[unit];
+      out->flags |= texUnit->TexGenEnabled;
+      out->count = VB->Count;
+      holes = store->TexgenHoles[unit];
+   }
+   else {
+      GLuint copy = (all_bits[in->size] & ~texUnit->TexGenEnabled);
+      if (copy)
+	 _mesa_copy_tab[copy]( out, in );
+
+      out->size = MAX2(in->size, store->TexgenSize[unit]);
+      out->flags |= (in->flags & VEC_SIZE_FLAGS) | texUnit->TexGenEnabled;
+      out->count = in->count;
+
+      holes = ~all_bits[in->size] & store->TexgenHoles[unit];
+   }
+
+   if (holes) {
+      if (holes & VEC_DIRTY_3) _mesa_vector4f_clean_elem(out, count, 3);
+      if (holes & VEC_DIRTY_2) _mesa_vector4f_clean_elem(out, count, 2);
+      if (holes & VEC_DIRTY_1) _mesa_vector4f_clean_elem(out, count, 1);
+      if (holes & VEC_DIRTY_0) _mesa_vector4f_clean_elem(out, count, 0);
+   }
+
+   if (texUnit->TexGenEnabled & S_BIT) {
+      GLuint i;
+      switch (texUnit->GenModeS) {
+      case GL_OBJECT_LINEAR:
+	 _mesa_dotprod_tab[obj->size]( (GLfloat *)out->data,
+				       sizeof(out->data[0]), obj,
+				       texUnit->ObjectPlaneS );
+	 break;
+      case GL_EYE_LINEAR:
+	 _mesa_dotprod_tab[eye->size]( (GLfloat *)out->data,
+				       sizeof(out->data[0]), eye,
+				       texUnit->EyePlaneS );
+	 break;
+      case GL_SPHERE_MAP:
+         for (i = 0; i < count; i++)
+            texcoord[i][0] = f[i][0] * m[i] + 0.5F;
+	 break;
+      case GL_REFLECTION_MAP_NV:
+	 for (i=0;i<count;i++)
+	     texcoord[i][0] = f[i][0];
+	 break;
+      case GL_NORMAL_MAP_NV: {
+	 const GLfloat *norm = normal->start;
+	 for (i=0;i<count;i++, STRIDE_F(norm, normal->stride)) {
+	     texcoord[i][0] = norm[0];
+	 }
+	 break;
+      }
+      default:
+	 _mesa_problem(ctx, "Bad S texgen");
+      }
+   }
+
+   if (texUnit->TexGenEnabled & T_BIT) {
+      GLuint i;
+      switch (texUnit->GenModeT) {
+      case GL_OBJECT_LINEAR:
+	 _mesa_dotprod_tab[obj->size]( &(out->data[0][1]),
+				       sizeof(out->data[0]), obj,
+				       texUnit->ObjectPlaneT );
+	 break;
+      case GL_EYE_LINEAR:
+	 _mesa_dotprod_tab[eye->size]( &(out->data[0][1]),
+				       sizeof(out->data[0]), eye,
+				       texUnit->EyePlaneT );
+	 break;
+      case GL_SPHERE_MAP:
+         for (i = 0; i < count; i++)
+            texcoord[i][1] = f[i][1] * m[i] + 0.5F;
+	 break;
+      case GL_REFLECTION_MAP_NV:
+	 for (i=0;i<count;i++)
+	     texcoord[i][1] = f[i][1];
+	 break;
+      case GL_NORMAL_MAP_NV: {
+	 const GLfloat *norm = normal->start;
+	 for (i=0;i<count;i++, STRIDE_F(norm, normal->stride)) {
+	     texcoord[i][1] = norm[1];
+	 }
+	 break;
+      }
+      default:
+	 _mesa_problem(ctx, "Bad T texgen");
+      }
+   }
+
+   if (texUnit->TexGenEnabled & R_BIT) {
+      GLuint i;
+      switch (texUnit->GenModeR) {
+      case GL_OBJECT_LINEAR:
+	 _mesa_dotprod_tab[obj->size]( &(out->data[0][2]),
+				       sizeof(out->data[0]), obj,
+				       texUnit->ObjectPlaneR );
+	 break;
+      case GL_EYE_LINEAR:
+	 _mesa_dotprod_tab[eye->size]( &(out->data[0][2]),
+				       sizeof(out->data[0]), eye,
+				       texUnit->EyePlaneR );
+	 break;
+      case GL_REFLECTION_MAP_NV:
+	 for (i=0;i<count;i++)
+	     texcoord[i][2] = f[i][2];
+	 break;
+      case GL_NORMAL_MAP_NV: {
+	 const GLfloat *norm = normal->start;
+	 for (i=0;i<count;i++,STRIDE_F(norm, normal->stride)) {
+	     texcoord[i][2] = norm[2];
+	 }
+	 break;
+      }
+      default:
+	 _mesa_problem(ctx, "Bad R texgen");
+      }
+   }
+
+   if (texUnit->TexGenEnabled & Q_BIT) {
+      switch (texUnit->GenModeQ) {
+      case GL_OBJECT_LINEAR:
+	 _mesa_dotprod_tab[obj->size]( &(out->data[0][3]),
+				       sizeof(out->data[0]), obj,
+				       texUnit->ObjectPlaneQ );
+	 break;
+      case GL_EYE_LINEAR:
+	 _mesa_dotprod_tab[eye->size]( &(out->data[0][3]),
+				       sizeof(out->data[0]), eye,
+				       texUnit->EyePlaneQ );
+	 break;
+      default:
+	 _mesa_problem(ctx, "Bad Q texgen");
+      }
+   }
+}
+
+
+
+static GLboolean run_texgen_stage( GLcontext *ctx,
+				   struct tnl_pipeline_stage *stage )
+{
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+   struct texgen_stage_data *store = TEXGEN_STAGE_DATA( stage );
+   GLuint i;
+
+   for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++)
+      if (ctx->Texture._TexGenEnabled & ENABLE_TEXGEN(i)) {
+	 if (stage->changed_inputs & (_TNL_BIT_POS | _TNL_BIT_NORMAL | _TNL_BIT_TEX(i)))
+	    store->TexgenFunc[i]( ctx, store, i );
+
+	 VB->AttribPtr[VERT_ATTRIB_TEX0+i] = 
+	    VB->TexCoordPtr[i] = &store->texcoord[i];
+      }
+
+   return GL_TRUE;
+}
+
+
+
+
+static GLboolean run_validate_texgen_stage( GLcontext *ctx,
+					    struct tnl_pipeline_stage *stage )
+{
+   struct texgen_stage_data *store = TEXGEN_STAGE_DATA(stage);
+   GLuint i;
+
+   for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++) {
+      struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i];
+
+      if (texUnit->TexGenEnabled) {
+	 GLuint sz;
+
+	 if (texUnit->TexGenEnabled & Q_BIT)
+	    sz = 4;
+	 else if (texUnit->TexGenEnabled & R_BIT)
+	    sz = 3;
+	 else if (texUnit->TexGenEnabled & T_BIT)
+	    sz = 2;
+	 else
+	    sz = 1;
+
+	 store->TexgenSize[i] = sz;
+	 store->TexgenHoles[i] = (all_bits[sz] & ~texUnit->TexGenEnabled);
+	 store->TexgenFunc[i] = texgen; /* general solution */
+
+         /* look for special texgen cases */
+	 if (texUnit->TexGenEnabled == (S_BIT|T_BIT|R_BIT)) {
+	    if (texUnit->_GenFlags == TEXGEN_REFLECTION_MAP_NV) {
+	       store->TexgenFunc[i] = texgen_reflection_map_nv;
+	    }
+	    else if (texUnit->_GenFlags == TEXGEN_NORMAL_MAP_NV) {
+	       store->TexgenFunc[i] = texgen_normal_map_nv;
+	    }
+	 }
+	 else if (texUnit->TexGenEnabled == (S_BIT|T_BIT) &&
+		  texUnit->_GenFlags == TEXGEN_SPHERE_MAP) {
+	    store->TexgenFunc[i] = texgen_sphere_map;
+	 }
+      }
+   }
+
+   stage->run = run_texgen_stage;
+   return stage->run( ctx, stage );
+}
+
+
+static void check_texgen( GLcontext *ctx, struct tnl_pipeline_stage *stage )
+{
+   GLuint i;
+   stage->active = 0;
+
+   if (ctx->Texture._TexGenEnabled && !ctx->VertexProgram.Enabled) {
+      GLuint inputs = 0;
+      GLuint outputs = 0;
+
+      if (ctx->Texture._GenFlags & (TEXGEN_OBJ_LINEAR | TEXGEN_NEED_EYE_COORD))
+	 inputs |= _TNL_BIT_POS;
+
+      if (ctx->Texture._GenFlags & TEXGEN_NEED_NORMALS)
+	 inputs |= _TNL_BIT_NORMAL;
+
+      for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++)
+	 if (ctx->Texture._TexGenEnabled & ENABLE_TEXGEN(i))
+	 {
+	    outputs |= _TNL_BIT_TEX(i);
+
+	    /* Need the original input in case it contains a Q coord:
+	     * (sigh)
+	     */
+	    inputs |= _TNL_BIT_TEX(i);
+
+	    /* Something for Feedback? */
+	 }
+
+      if (stage->privatePtr)
+	 stage->run = run_validate_texgen_stage;
+      stage->active = 1;
+      stage->inputs = inputs;
+      stage->outputs = outputs;
+   }
+}
+
+
+
+
+/* Called the first time stage->run() is invoked.
+ */
+static GLboolean alloc_texgen_data( GLcontext *ctx,
+				    struct tnl_pipeline_stage *stage )
+{
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+   struct texgen_stage_data *store;
+   GLuint i;
+
+   stage->privatePtr = CALLOC(sizeof(*store));
+   store = TEXGEN_STAGE_DATA(stage);
+   if (!store)
+      return GL_FALSE;
+
+   for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++)
+      _mesa_vector4f_alloc( &store->texcoord[i], 0, VB->Size, 32 );
+
+   store->tmp_f = (GLfloat (*)[3]) MALLOC(VB->Size * sizeof(GLfloat) * 3);
+   store->tmp_m = (GLfloat *) MALLOC(VB->Size * sizeof(GLfloat));
+
+   /* Now validate and run the stage.
+    */
+   stage->run = run_validate_texgen_stage;
+   return stage->run( ctx, stage );
+}
+
+
+static void free_texgen_data( struct tnl_pipeline_stage *stage )
+
+{
+   struct texgen_stage_data *store = TEXGEN_STAGE_DATA(stage);
+   GLuint i;
+
+   if (store) {
+      for (i = 0 ; i < MAX_TEXTURE_COORD_UNITS ; i++)
+	 if (store->texcoord[i].data)
+	    _mesa_vector4f_free( &store->texcoord[i] );
+
+
+      if (store->tmp_f) FREE( store->tmp_f );
+      if (store->tmp_m) FREE( store->tmp_m );
+      FREE( store );
+      stage->privatePtr = NULL;
+   }
+}
+
+
+
+const struct tnl_pipeline_stage _tnl_texgen_stage =
+{
+   "texgen",			/* name */
+   _NEW_TEXTURE|_NEW_PROGRAM,	/* when to call check() */
+   _NEW_TEXTURE,		/* when to invalidate stored data */
+   GL_FALSE,			/* active? */
+   0,				/* inputs */
+   0,				/* outputs */
+   0,				/* changed_inputs */
+   NULL,			/* private data */
+   free_texgen_data,		/* destructor */
+   check_texgen,		/* check */
+   alloc_texgen_data		/* run -- initially set to alloc data */
+};
diff --git a/reactos/lib/mesa32/src/tnl/t_vb_texmat.c b/reactos/lib/mesa32/src/tnl/t_vb_texmat.c
new file mode 100644
index 00000000000..221dd582800
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl/t_vb_texmat.c
@@ -0,0 +1,150 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+
+#include "glheader.h"
+#include "colormac.h"
+#include "context.h"
+#include "macros.h"
+#include "imports.h"
+#include "mtypes.h"
+
+#include "math/m_xform.h"
+
+#include "t_context.h"
+#include "t_pipeline.h"
+
+/* Is there any real benefit seperating texmat from texgen?  It means
+ * we need two lots of intermediate storage.  Any changes to
+ * _NEW_TEXTURE will invalidate both sets -- it's only on changes to
+ * *only* _NEW_TEXTURE_MATRIX that texgen survives but texmat doesn't.
+ *
+ * However, the seperation of this code from the complex texgen stuff
+ * is very appealing.
+ */
+struct texmat_stage_data {
+   GLvector4f texcoord[MAX_TEXTURE_COORD_UNITS];
+};
+
+#define TEXMAT_STAGE_DATA(stage) ((struct texmat_stage_data *)stage->privatePtr)
+
+static void check_texmat( GLcontext *ctx, struct tnl_pipeline_stage *stage )
+{
+   GLuint i;
+   stage->active = 0;
+
+   if (ctx->Texture._TexMatEnabled && !ctx->VertexProgram.Enabled) {
+      GLuint flags = 0;
+
+      for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++)
+	 if (ctx->Texture._TexMatEnabled & ENABLE_TEXMAT(i))
+	    flags |= _TNL_BIT_TEX(i);
+
+      stage->active = 1;
+      stage->inputs = flags;
+      stage->outputs = flags;
+   }
+}
+
+static GLboolean run_texmat_stage( GLcontext *ctx,
+				   struct tnl_pipeline_stage *stage )
+{
+   struct texmat_stage_data *store = TEXMAT_STAGE_DATA(stage);
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+   GLuint i;
+
+   /* ENABLE_TEXMAT implies that the texture matrix is not the
+    * identity, so we don't have to check that here.
+    */
+   for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++)
+      if (ctx->Texture._TexMatEnabled & ENABLE_TEXMAT(i)) {
+	 if (stage->changed_inputs & _TNL_BIT_TEX(i))
+	    (void) TransformRaw( &store->texcoord[i],
+                                 ctx->TextureMatrixStack[i].Top,
+				 VB->TexCoordPtr[i]);
+
+	 VB->AttribPtr[VERT_ATTRIB_TEX0+i] = 
+	    VB->TexCoordPtr[i] = &store->texcoord[i];
+      }
+   return GL_TRUE;
+}
+
+
+/* Called the first time stage->run() is invoked.
+ */
+static GLboolean alloc_texmat_data( GLcontext *ctx,
+				    struct tnl_pipeline_stage *stage )
+{
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+   struct texmat_stage_data *store;
+   GLuint i;
+
+   stage->privatePtr = CALLOC(sizeof(*store));
+   store = TEXMAT_STAGE_DATA(stage);
+   if (!store)
+      return GL_FALSE;
+
+   for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++)
+      _mesa_vector4f_alloc( &store->texcoord[i], 0, VB->Size, 32 );
+
+   /* Now run the stage.
+    */
+   stage->run = run_texmat_stage;
+   return stage->run( ctx, stage );
+}
+
+
+static void free_texmat_data( struct tnl_pipeline_stage *stage )
+{
+   struct texmat_stage_data *store = TEXMAT_STAGE_DATA(stage);
+   GLuint i;
+
+   if (store) {
+      for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++)
+	 if (store->texcoord[i].data)
+	    _mesa_vector4f_free( &store->texcoord[i] );
+      FREE( store );
+      stage->privatePtr = 0;
+   }
+}
+
+
+
+const struct tnl_pipeline_stage _tnl_texture_transform_stage =
+{
+   "texture transform",			/* name */
+   _NEW_TEXTURE|_NEW_TEXTURE_MATRIX|_NEW_PROGRAM,	/* check_state */
+   _NEW_TEXTURE|_NEW_TEXTURE_MATRIX,	/* run_state */
+   GL_FALSE,				/* active? */
+   0,					/* inputs */
+   0,					/* outputs */
+   0,					/* changed_inputs */
+   NULL,				/* private data */
+   free_texmat_data,			/* destructor */
+   check_texmat,			/* check */
+   alloc_texmat_data,			/* run -- initially set to init */
+};
diff --git a/reactos/lib/mesa32/src/tnl/t_vb_vertex.c b/reactos/lib/mesa32/src/tnl/t_vb_vertex.c
new file mode 100644
index 00000000000..63dc653245d
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl/t_vb_vertex.c
@@ -0,0 +1,303 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.0
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+
+#include "glheader.h"
+#include "colormac.h"
+#include "context.h"
+#include "macros.h"
+#include "imports.h"
+#include "mtypes.h"
+
+#include "math/m_xform.h"
+
+#include "t_context.h"
+#include "t_pipeline.h"
+
+
+
+struct vertex_stage_data {
+   GLvector4f eye;
+   GLvector4f clip;
+   GLvector4f proj;
+   GLubyte *clipmask;
+   GLubyte ormask;
+   GLubyte andmask;
+
+
+   /* Need these because it's difficult to replay the sideeffects
+    * analytically.
+    */
+   GLvector4f *save_eyeptr;
+   GLvector4f *save_clipptr;
+   GLvector4f *save_ndcptr;
+};
+
+#define VERTEX_STAGE_DATA(stage) ((struct vertex_stage_data *)stage->privatePtr)
+
+
+
+
+/* This function implements cliptesting for user-defined clip planes.
+ * The clipping of primitives to these planes is implemented in
+ * t_render_clip.h.
+ */
+#define USER_CLIPTEST(NAME, SZ)					\
+static void NAME( GLcontext *ctx,				\
+		  GLvector4f *clip,				\
+		  GLubyte *clipmask,				\
+		  GLubyte *clipormask,				\
+		  GLubyte *clipandmask )			\
+{								\
+   GLuint p;							\
+								\
+   for (p = 0; p < ctx->Const.MaxClipPlanes; p++)		\
+      if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {	\
+	 GLuint nr, i;						\
+	 const GLfloat a = ctx->Transform._ClipUserPlane[p][0];	\
+	 const GLfloat b = ctx->Transform._ClipUserPlane[p][1];	\
+	 const GLfloat c = ctx->Transform._ClipUserPlane[p][2];	\
+	 const GLfloat d = ctx->Transform._ClipUserPlane[p][3];	\
+         GLfloat *coord = (GLfloat *)clip->data;		\
+         GLuint stride = clip->stride;				\
+         GLuint count = clip->count;				\
+								\
+	 for (nr = 0, i = 0 ; i < count ; i++) {		\
+	    GLfloat dp = coord[0] * a + coord[1] * b;		\
+	    if (SZ > 2) dp += coord[2] * c;			\
+	    if (SZ > 3) dp += coord[3] * d; else dp += d;	\
+								\
+	    if (dp < 0) {					\
+	       nr++;						\
+	       clipmask[i] |= CLIP_USER_BIT;			\
+	    }							\
+								\
+	    STRIDE_F(coord, stride);				\
+	 }							\
+								\
+	 if (nr > 0) {						\
+	    *clipormask |= CLIP_USER_BIT;			\
+	    if (nr == count) {					\
+	       *clipandmask |= CLIP_USER_BIT;			\
+	       return;						\
+	    }							\
+	 }							\
+      }								\
+}
+
+
+USER_CLIPTEST(userclip2, 2)
+USER_CLIPTEST(userclip3, 3)
+USER_CLIPTEST(userclip4, 4)
+
+static void (*(usercliptab[5]))( GLcontext *,
+				 GLvector4f *, GLubyte *,
+				 GLubyte *, GLubyte * ) =
+{
+   0,
+   0,
+   userclip2,
+   userclip3,
+   userclip4
+};
+
+
+
+static GLboolean run_vertex_stage( GLcontext *ctx,
+				   struct tnl_pipeline_stage *stage )
+{
+   struct vertex_stage_data *store = (struct vertex_stage_data *)stage->privatePtr;
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct vertex_buffer *VB = &tnl->vb;
+
+   ASSERT(!ctx->VertexProgram.Enabled);
+
+   if (stage->changed_inputs) {
+
+      if (ctx->_NeedEyeCoords) {
+	 /* Separate modelview transformation:
+	  * Use combined ModelProject to avoid some depth artifacts
+	  */
+	 if (ctx->ModelviewMatrixStack.Top->type == MATRIX_IDENTITY)
+	    VB->EyePtr = VB->ObjPtr;
+	 else
+	    VB->EyePtr = TransformRaw( &store->eye,
+                                       ctx->ModelviewMatrixStack.Top,
+				       VB->ObjPtr);
+      }
+
+      VB->ClipPtr = TransformRaw( &store->clip,
+				  &ctx->_ModelProjectMatrix,
+				  VB->ObjPtr );
+
+      /* Drivers expect this to be clean to element 4...
+       */
+      switch (VB->ClipPtr->size) {
+      case 1:			
+	 /* impossible */
+      case 2:
+	 _mesa_vector4f_clean_elem( VB->ClipPtr, VB->Count, 2 );
+      case 3:
+	 _mesa_vector4f_clean_elem( VB->ClipPtr, VB->Count, 3 );
+      case 4:
+	 break;
+      }
+
+      /* Cliptest and perspective divide.  Clip functions must clear
+       * the clipmask.
+       */
+      store->ormask = 0;
+      store->andmask = CLIP_ALL_BITS;
+
+      if (tnl->NeedNdcCoords) {
+	 VB->NdcPtr =
+	    _mesa_clip_tab[VB->ClipPtr->size]( VB->ClipPtr,
+                                               &store->proj,
+                                               store->clipmask,
+                                               &store->ormask,
+                                               &store->andmask );
+      }
+      else {
+	 VB->NdcPtr = 0;
+	 _mesa_clip_np_tab[VB->ClipPtr->size]( VB->ClipPtr,
+                                               0,
+                                               store->clipmask,
+                                               &store->ormask,
+                                               &store->andmask );
+      }
+
+      if (store->andmask)
+	 return GL_FALSE;
+
+
+      /* Test userclip planes.  This contributes to VB->ClipMask, so
+       * is essentially required to be in this stage.
+       */
+      if (ctx->Transform.ClipPlanesEnabled) {
+	 usercliptab[VB->ClipPtr->size]( ctx,
+					 VB->ClipPtr,
+					 store->clipmask,
+					 &store->ormask,
+					 &store->andmask );
+
+	 if (store->andmask)
+	    return GL_FALSE;
+      }
+
+      VB->ClipOrMask = store->ormask;
+      VB->ClipMask = store->clipmask;
+
+      store->save_eyeptr = VB->EyePtr;
+      store->save_clipptr = VB->ClipPtr;
+      store->save_ndcptr = VB->NdcPtr;
+   }
+   else {
+      /* Replay the sideeffects.
+       */
+      VB->EyePtr = store->save_eyeptr;
+      VB->ClipPtr = store->save_clipptr;
+      VB->NdcPtr = store->save_ndcptr;
+      VB->ClipMask = store->clipmask;
+      VB->ClipOrMask = store->ormask;
+      if (store->andmask)
+	 return GL_FALSE;
+   }
+
+   return GL_TRUE;
+}
+
+
+static void check_vertex( GLcontext *ctx, struct tnl_pipeline_stage *stage )
+{
+   stage->active = !ctx->VertexProgram.Enabled;
+}
+
+static GLboolean init_vertex_stage( GLcontext *ctx,
+				    struct tnl_pipeline_stage *stage )
+{
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+   struct vertex_stage_data *store;
+   GLuint size = VB->Size;
+
+   stage->privatePtr = CALLOC(sizeof(*store));
+   store = VERTEX_STAGE_DATA(stage);
+   if (!store)
+      return GL_FALSE;
+
+   _mesa_vector4f_alloc( &store->eye, 0, size, 32 );
+   _mesa_vector4f_alloc( &store->clip, 0, size, 32 );
+   _mesa_vector4f_alloc( &store->proj, 0, size, 32 );
+
+   store->clipmask = (GLubyte *) ALIGN_MALLOC(sizeof(GLubyte)*size, 32 );
+
+   if (!store->clipmask ||
+       !store->eye.data ||
+       !store->clip.data ||
+       !store->proj.data)
+      return GL_FALSE;
+
+   /* Now run the stage.
+    */
+   stage->run = run_vertex_stage;
+   return stage->run( ctx, stage );
+}
+
+static void dtr( struct tnl_pipeline_stage *stage )
+{
+   struct vertex_stage_data *store = VERTEX_STAGE_DATA(stage);
+
+   if (store) {
+      _mesa_vector4f_free( &store->eye );
+      _mesa_vector4f_free( &store->clip );
+      _mesa_vector4f_free( &store->proj );
+      ALIGN_FREE( store->clipmask );
+      FREE(store);
+      stage->privatePtr = NULL;
+      stage->run = init_vertex_stage;
+   }
+}
+
+
+const struct tnl_pipeline_stage _tnl_vertex_transform_stage =
+{
+   "modelview/project/cliptest/divide",
+   _NEW_PROGRAM,                /* check_state: only care about vertex prog */
+   _MESA_NEW_NEED_EYE_COORDS |  /* run_state: when to invalidate / re-run */
+   _NEW_MODELVIEW|
+   _NEW_PROJECTION|
+   _NEW_PROGRAM|
+   _NEW_TRANSFORM,
+   GL_TRUE,			/* active */
+   _TNL_BIT_POS,		/* inputs */
+   _TNL_BIT_POS,		/* outputs */
+   0,				/* changed_inputs */
+   NULL,			/* private data */
+   dtr,				/* destructor */
+   check_vertex,		/* check */
+   init_vertex_stage		/* run -- initially set to init */
+};
diff --git a/reactos/lib/mesa32/src/tnl/t_vertex.c b/reactos/lib/mesa32/src/tnl/t_vertex.c
new file mode 100644
index 00000000000..91330e0c812
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl/t_vertex.c
@@ -0,0 +1,1066 @@
+/*
+ * Copyright 2003 Tungsten Graphics, inc.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * on the rights to use, copy, modify, merge, publish, distribute, sub
+ * license, and/or sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+ * TUNGSTEN GRAPHICS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keithw@tungstengraphics.com>
+ */
+
+#include "glheader.h"
+#include "context.h"
+#include "colormac.h"
+
+#include "t_context.h"
+#include "t_vertex.h"
+
+
+/* Build and manage clipspace/ndc/window vertices.
+ *
+ * Another new mechanism designed and crying out for codegen.  Before
+ * that, it would be very interesting to investigate the merger of
+ * these vertices and those built in t_vtx_*.
+ */
+
+
+
+
+#define GET_VERTEX_STATE(ctx)  &(TNL_CONTEXT(ctx)->clipspace)
+
+static void insert_4f_viewport_4( const struct tnl_clipspace_attr *a, GLubyte *v,
+				const GLfloat *in )
+{
+   GLfloat *out = (GLfloat *)v;
+   const GLfloat * const vp = a->vp;
+   
+   out[0] = vp[0] * in[0] + vp[12];
+   out[1] = vp[5] * in[1] + vp[13];
+   out[2] = vp[10] * in[2] + vp[14];
+   out[3] = in[3];
+}
+
+static void insert_4f_viewport_3( const struct tnl_clipspace_attr *a, GLubyte *v,
+				const GLfloat *in )
+{
+   GLfloat *out = (GLfloat *)v;
+   const GLfloat * const vp = a->vp;
+   
+   out[0] = vp[0] * in[0] + vp[12];
+   out[1] = vp[5] * in[1] + vp[13];
+   out[2] = vp[10] * in[2] + vp[14];
+   out[3] = 1;
+}
+
+static void insert_4f_viewport_2( const struct tnl_clipspace_attr *a, GLubyte *v,
+				const GLfloat *in )
+{
+   GLfloat *out = (GLfloat *)v;
+   const GLfloat * const vp = a->vp;
+   
+   out[0] = vp[0] * in[0] + vp[12];
+   out[1] = vp[5] * in[1] + vp[13];
+   out[2] = vp[14];
+   out[3] = 1;
+}
+
+static void insert_4f_viewport_1( const struct tnl_clipspace_attr *a, GLubyte *v,
+				const GLfloat *in )
+{
+   GLfloat *out = (GLfloat *)v;
+   const GLfloat * const vp = a->vp;
+   
+   out[0] = vp[0] * in[0] + vp[12];
+   out[1] = vp[13];
+   out[2] = vp[14];
+   out[3] = 1;
+}
+
+static void insert_3f_viewport_3( const struct tnl_clipspace_attr *a, GLubyte *v,
+				const GLfloat *in )
+{
+   GLfloat *out = (GLfloat *)v;
+   const GLfloat * const vp = a->vp;
+   
+   out[0] = vp[0] * in[0] + vp[12];
+   out[1] = vp[5] * in[1] + vp[13];
+   out[2] = vp[10] * in[2] + vp[14];
+}
+
+static void insert_3f_viewport_2( const struct tnl_clipspace_attr *a, GLubyte *v,
+				const GLfloat *in )
+{
+   GLfloat *out = (GLfloat *)v;
+   const GLfloat * const vp = a->vp;
+   
+   out[0] = vp[0] * in[0] + vp[12];
+   out[1] = vp[5] * in[1] + vp[13];
+   out[2] = vp[10] * in[2] + vp[14];
+}
+
+static void insert_3f_viewport_1( const struct tnl_clipspace_attr *a, GLubyte *v,
+				const GLfloat *in )
+{
+   GLfloat *out = (GLfloat *)v;
+   const GLfloat * const vp = a->vp;
+   
+   out[0] = vp[0] * in[0] + vp[12];
+   out[1] = vp[13];
+   out[2] = vp[14];
+}
+
+static void insert_2f_viewport_2( const struct tnl_clipspace_attr *a, GLubyte *v,
+				const GLfloat *in )
+{
+   GLfloat *out = (GLfloat *)v;
+   const GLfloat * const vp = a->vp;
+   
+   out[0] = vp[0] * in[0] + vp[12];
+   out[1] = vp[5] * in[1] + vp[13];
+}
+
+static void insert_2f_viewport_1( const struct tnl_clipspace_attr *a, GLubyte *v,
+				const GLfloat *in )
+{
+   GLfloat *out = (GLfloat *)v;
+   const GLfloat * const vp = a->vp;
+   
+   out[0] = vp[0] * in[0] + vp[12];
+   out[1] = vp[13];
+}
+
+
+static void insert_4f_4( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+{
+   GLfloat *out = (GLfloat *)(v);
+   
+   out[0] = in[0];
+   out[1] = in[1];
+   out[2] = in[2];
+   out[3] = in[3];
+}
+
+static void insert_4f_3( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+{
+   GLfloat *out = (GLfloat *)(v);
+   
+   out[0] = in[0];
+   out[1] = in[1];
+   out[2] = in[2];
+   out[3] = 1;
+}
+
+static void insert_4f_2( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+{
+   GLfloat *out = (GLfloat *)(v);
+   
+   out[0] = in[0];
+   out[1] = in[1];
+   out[2] = 0;
+   out[3] = 1;
+}
+
+static void insert_4f_1( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+{
+   GLfloat *out = (GLfloat *)(v);
+   
+   out[0] = in[0];
+   out[1] = 0;
+   out[2] = 0;
+   out[3] = 1;
+}
+
+static void insert_3f_xyw_4( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+{
+   GLfloat *out = (GLfloat *)(v);
+   
+   out[0] = in[0];
+   out[1] = in[1];
+   out[2] = in[3];
+}
+
+static void insert_3f_xyw_err( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+{
+   abort();
+}
+
+static void insert_3f_3( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+{
+   GLfloat *out = (GLfloat *)(v);
+   
+   out[0] = in[0];
+   out[1] = in[1];
+   out[2] = in[2];
+}
+
+static void insert_3f_2( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+{
+   GLfloat *out = (GLfloat *)(v);
+   
+   out[0] = in[0];
+   out[1] = in[1];
+   out[2] = 0;
+}
+
+static void insert_3f_1( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+{
+   GLfloat *out = (GLfloat *)(v);
+   
+   out[0] = in[0];
+   out[1] = 0;
+   out[2] = 0;
+}
+
+
+static void insert_2f_2( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+{
+   GLfloat *out = (GLfloat *)(v);
+   
+   out[0] = in[0];
+   out[1] = in[1];
+}
+
+static void insert_2f_1( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+{
+   GLfloat *out = (GLfloat *)(v);
+   
+   out[0] = in[0];
+   out[1] = 0;
+}
+
+static void insert_1f_1( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+{
+   GLfloat *out = (GLfloat *)(v);
+   
+   out[0] = in[0];
+}
+
+static void insert_4chan_4f_rgba_4( const struct tnl_clipspace_attr *a, GLubyte *v, 
+				  const GLfloat *in )
+{
+   GLchan *c = (GLchan *)v;
+   UNCLAMPED_FLOAT_TO_CHAN(c[0], in[0]); 
+   UNCLAMPED_FLOAT_TO_CHAN(c[1], in[1]); 
+   UNCLAMPED_FLOAT_TO_CHAN(c[2], in[2]); 
+   UNCLAMPED_FLOAT_TO_CHAN(c[3], in[3]);
+}
+
+static void insert_4chan_4f_rgba_3( const struct tnl_clipspace_attr *a, GLubyte *v, 
+				  const GLfloat *in )
+{
+   GLchan *c = (GLchan *)v;
+   UNCLAMPED_FLOAT_TO_CHAN(c[0], in[0]); 
+   UNCLAMPED_FLOAT_TO_CHAN(c[1], in[1]); 
+   UNCLAMPED_FLOAT_TO_CHAN(c[2], in[2]); 
+   c[3] = CHAN_MAX;
+}
+
+static void insert_4chan_4f_rgba_2( const struct tnl_clipspace_attr *a, GLubyte *v, 
+				  const GLfloat *in )
+{
+   GLchan *c = (GLchan *)v;
+   UNCLAMPED_FLOAT_TO_CHAN(c[0], in[0]); 
+   UNCLAMPED_FLOAT_TO_CHAN(c[1], in[1]); 
+   c[2] = 0;
+   c[3] = CHAN_MAX;
+}
+
+static void insert_4chan_4f_rgba_1( const struct tnl_clipspace_attr *a, GLubyte *v, 
+				  const GLfloat *in )
+{
+   GLchan *c = (GLchan *)v;
+   UNCLAMPED_FLOAT_TO_CHAN(c[0], in[0]); 
+   c[1] = 0;
+   c[2] = 0;
+   c[3] = CHAN_MAX;
+}
+
+static void insert_4ub_4f_rgba_4( const struct tnl_clipspace_attr *a, GLubyte *v, 
+				const GLfloat *in )
+{
+   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[0]);
+   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[1]);
+   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[2]);
+   UNCLAMPED_FLOAT_TO_UBYTE(v[3], in[3]);
+}
+
+static void insert_4ub_4f_rgba_3( const struct tnl_clipspace_attr *a, GLubyte *v, 
+				const GLfloat *in )
+{
+   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[0]);
+   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[1]);
+   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[2]);
+   v[3] = 0xff;
+}
+
+static void insert_4ub_4f_rgba_2( const struct tnl_clipspace_attr *a, GLubyte *v, 
+				const GLfloat *in )
+{
+   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[0]);
+   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[1]);
+   v[2] = 0;
+   v[3] = 0xff;
+}
+
+static void insert_4ub_4f_rgba_1( const struct tnl_clipspace_attr *a, GLubyte *v, 
+				const GLfloat *in )
+{
+   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[0]);
+   v[1] = 0;
+   v[2] = 0;
+   v[3] = 0xff;
+}
+
+static void insert_4ub_4f_bgra_4( const struct tnl_clipspace_attr *a, GLubyte *v, 
+				const GLfloat *in )
+{
+   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[0]);
+   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[1]);
+   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[2]);
+   UNCLAMPED_FLOAT_TO_UBYTE(v[3], in[3]);
+}
+
+static void insert_4ub_4f_bgra_3( const struct tnl_clipspace_attr *a, GLubyte *v, 
+				const GLfloat *in )
+{
+   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[0]);
+   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[1]);
+   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[2]);
+   v[3] = 0xff;
+}
+
+static void insert_4ub_4f_bgra_2( const struct tnl_clipspace_attr *a, GLubyte *v, 
+				const GLfloat *in )
+{
+   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[0]);
+   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[1]);
+   v[0] = 0;
+   v[3] = 0xff;
+}
+
+static void insert_4ub_4f_bgra_1( const struct tnl_clipspace_attr *a, GLubyte *v, 
+				const GLfloat *in )
+{
+   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[0]);
+   v[1] = 0;
+   v[0] = 0;
+   v[3] = 0xff;
+}
+
+static void insert_3ub_3f_rgb_3( const struct tnl_clipspace_attr *a, GLubyte *v, 
+			       const GLfloat *in )
+{
+   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[0]);
+   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[1]);
+   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[2]);
+}
+
+static void insert_3ub_3f_rgb_2( const struct tnl_clipspace_attr *a, GLubyte *v, 
+			       const GLfloat *in )
+{
+   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[0]);
+   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[1]);
+   v[2] = 0;
+}
+
+static void insert_3ub_3f_rgb_1( const struct tnl_clipspace_attr *a, GLubyte *v, 
+			       const GLfloat *in )
+{
+   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[0]);
+   v[1] = 0;
+   v[2] = 0;
+}
+
+static void insert_3ub_3f_bgr_3( const struct tnl_clipspace_attr *a, GLubyte *v, 
+				 const GLfloat *in )
+{
+   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[0]);
+   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[1]);
+   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[2]);
+}
+
+static void insert_3ub_3f_bgr_2( const struct tnl_clipspace_attr *a, GLubyte *v, 
+				 const GLfloat *in )
+{
+   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[0]);
+   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[1]);
+   v[0] = 0;
+}
+
+static void insert_3ub_3f_bgr_1( const struct tnl_clipspace_attr *a, GLubyte *v, 
+				 const GLfloat *in )
+{
+   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[0]);
+   v[1] = 0;
+   v[0] = 0;
+}
+
+
+static void insert_1ub_1f_1( const struct tnl_clipspace_attr *a, GLubyte *v, 
+			   const GLfloat *in )
+{
+   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[0]);
+}
+
+
+/***********************************************************************
+ * Functions to perform the reverse operations to the above, for
+ * swrast translation and clip-interpolation.
+ * 
+ * Currently always extracts a full 4 floats.
+ */
+
+static void extract_4f_viewport( const struct tnl_clipspace_attr *a, GLfloat *out, 
+				 const GLubyte *v )
+{
+   const GLfloat *in = (const GLfloat *)v;
+   const GLfloat * const vp = a->vp;
+   
+   /* Although included for completeness, the position coordinate is
+    * usually handled differently during clipping.
+    */
+   out[0] = (in[0] - vp[12]) / vp[0];
+   out[1] = (in[1] - vp[13]) / vp[5];
+   out[2] = (in[2] - vp[14]) / vp[10];
+   out[3] = in[3];
+}
+
+static void extract_3f_viewport( const struct tnl_clipspace_attr *a, GLfloat *out, 
+				 const GLubyte *v )
+{
+   const GLfloat *in = (const GLfloat *)v;
+   const GLfloat * const vp = a->vp;
+   
+   out[0] = (in[0] - vp[12]) / vp[0];
+   out[1] = (in[1] - vp[13]) / vp[5];
+   out[2] = (in[2] - vp[14]) / vp[10];
+   out[3] = 1;
+}
+
+
+static void extract_2f_viewport( const struct tnl_clipspace_attr *a, GLfloat *out, 
+				 const GLubyte *v )
+{
+   const GLfloat *in = (const GLfloat *)v;
+   const GLfloat * const vp = a->vp;
+   
+   out[0] = (in[0] - vp[12]) / vp[0];
+   out[1] = (in[1] - vp[13]) / vp[5];
+   out[2] = 0;
+   out[3] = 1;
+}
+
+
+static void extract_4f( const struct tnl_clipspace_attr *a, GLfloat *out, const GLubyte *v  )
+{
+   const GLfloat *in = (const GLfloat *)v;
+   
+   out[0] = in[0];
+   out[1] = in[1];
+   out[2] = in[2];
+   out[3] = in[3];
+}
+
+static void extract_3f_xyw( const struct tnl_clipspace_attr *a, GLfloat *out, const GLubyte *v )
+{
+   const GLfloat *in = (const GLfloat *)v;
+   
+   out[0] = in[0];
+   out[1] = in[1];
+   out[2] = 0;
+   out[3] = in[2];
+}
+
+
+static void extract_3f( const struct tnl_clipspace_attr *a, GLfloat *out, const GLubyte *v )
+{
+   const GLfloat *in = (const GLfloat *)v;
+   
+   out[0] = in[0];
+   out[1] = in[1];
+   out[2] = in[2];
+   out[3] = 1;
+}
+
+
+static void extract_2f( const struct tnl_clipspace_attr *a, GLfloat *out, const GLubyte *v )
+{
+   const GLfloat *in = (const GLfloat *)v;
+   
+   out[0] = in[0];
+   out[1] = in[1];
+   out[2] = 0;
+   out[3] = 1;
+}
+
+static void extract_1f( const struct tnl_clipspace_attr *a, GLfloat *out, const GLubyte *v )
+{
+   const GLfloat *in = (const GLfloat *)v;
+   
+   out[0] = in[0];
+   out[1] = 0;
+   out[2] = 0;
+   out[3] = 1;
+}
+
+static void extract_4chan_4f_rgba( const struct tnl_clipspace_attr *a, GLfloat *out, 
+				 const GLubyte *v )
+{
+   GLchan *c = (GLchan *)v;
+
+   out[0] = CHAN_TO_FLOAT(c[0]);
+   out[1] = CHAN_TO_FLOAT(c[1]);
+   out[2] = CHAN_TO_FLOAT(c[2]);
+   out[3] = CHAN_TO_FLOAT(c[3]);
+}
+
+static void extract_4ub_4f_rgba( const struct tnl_clipspace_attr *a, GLfloat *out, 
+				 const GLubyte *v )
+{
+   out[0] = UBYTE_TO_FLOAT(v[0]);
+   out[1] = UBYTE_TO_FLOAT(v[1]);
+   out[2] = UBYTE_TO_FLOAT(v[2]);
+   out[3] = UBYTE_TO_FLOAT(v[3]);
+}
+
+static void extract_4ub_4f_bgra( const struct tnl_clipspace_attr *a, GLfloat *out, 
+				 const GLubyte *v )
+{
+   out[2] = UBYTE_TO_FLOAT(v[0]);
+   out[1] = UBYTE_TO_FLOAT(v[1]);
+   out[0] = UBYTE_TO_FLOAT(v[2]);
+   out[3] = UBYTE_TO_FLOAT(v[3]);
+}
+
+static void extract_3ub_3f_rgb( const struct tnl_clipspace_attr *a, GLfloat *out, 
+				const GLubyte *v )
+{
+   out[0] = UBYTE_TO_FLOAT(v[0]);
+   out[1] = UBYTE_TO_FLOAT(v[1]);
+   out[2] = UBYTE_TO_FLOAT(v[2]);
+   out[3] = 1;
+}
+
+static void extract_3ub_3f_bgr( const struct tnl_clipspace_attr *a, GLfloat *out, 
+				const GLubyte *v )
+{
+   out[2] = UBYTE_TO_FLOAT(v[0]);
+   out[1] = UBYTE_TO_FLOAT(v[1]);
+   out[0] = UBYTE_TO_FLOAT(v[2]);
+   out[3] = 1;
+}
+
+static void extract_1ub_1f( const struct tnl_clipspace_attr *a, GLfloat *out, const GLubyte *v )
+{
+   out[0] = UBYTE_TO_FLOAT(v[0]);
+   out[1] = 0;
+   out[2] = 0;
+   out[3] = 1;
+}
+
+
+struct {
+   const char *name;
+   extract_func extract;
+   insert_func insert[4];
+   GLuint attrsize;
+} format_info[EMIT_MAX] = {
+
+   { "1f",
+     extract_1f,
+     { insert_1f_1, insert_1f_1, insert_1f_1, insert_1f_1 },
+     sizeof(GLfloat) },
+
+   { "2f",
+     extract_2f,
+     { insert_2f_1, insert_2f_2, insert_2f_2, insert_2f_2 },
+     2 * sizeof(GLfloat) },
+
+   { "3f",
+     extract_3f,
+     { insert_3f_1, insert_3f_2, insert_3f_3, insert_3f_3 },
+     3 * sizeof(GLfloat) },
+
+   { "4f",
+     extract_4f,
+     { insert_4f_1, insert_4f_2, insert_4f_3, insert_4f_4 },
+     4 * sizeof(GLfloat) },
+
+   { "2f_viewport",
+     extract_2f_viewport,
+     { insert_2f_viewport_1, insert_2f_viewport_2, insert_2f_viewport_2,
+       insert_2f_viewport_2 },
+     2 * sizeof(GLfloat) },
+
+   { "3f_viewport",
+     extract_3f_viewport,
+     { insert_3f_viewport_1, insert_3f_viewport_2, insert_3f_viewport_3,
+       insert_3f_viewport_3 },
+     3 * sizeof(GLfloat) },
+
+   { "4f_viewport",
+     extract_4f_viewport,
+     { insert_4f_viewport_1, insert_4f_viewport_2, insert_4f_viewport_3,
+       insert_4f_viewport_4 }, 
+     4 * sizeof(GLfloat) },
+
+   { "3f_xyw",
+     extract_3f_xyw,
+     { insert_3f_xyw_err, insert_3f_xyw_err, insert_3f_xyw_err, 
+       insert_3f_xyw_4 },
+     3 * sizeof(GLfloat) },
+
+   { "1ub_1f",
+     extract_1ub_1f,
+     { insert_1ub_1f_1, insert_1ub_1f_1, insert_1ub_1f_1, insert_1ub_1f_1 },
+     sizeof(GLubyte) },
+
+   { "3ub_3f_rgb",
+     extract_3ub_3f_rgb,
+     { insert_3ub_3f_rgb_1, insert_3ub_3f_rgb_2, insert_3ub_3f_rgb_3,
+       insert_3ub_3f_rgb_3 },
+     3 * sizeof(GLubyte) },
+
+   { "3ub_3f_bgr",
+     extract_3ub_3f_bgr,
+     { insert_3ub_3f_bgr_1, insert_3ub_3f_bgr_2, insert_3ub_3f_bgr_3,
+       insert_3ub_3f_bgr_3 },
+     3 * sizeof(GLubyte) },
+
+   { "4ub_4f_rgba",
+     extract_4ub_4f_rgba,
+     { insert_4ub_4f_rgba_1, insert_4ub_4f_rgba_2, insert_4ub_4f_rgba_3, 
+       insert_4ub_4f_rgba_4 },
+     4 * sizeof(GLubyte) },
+
+   { "4ub_4f_bgra",
+     extract_4ub_4f_bgra,
+     { insert_4ub_4f_bgra_1, insert_4ub_4f_bgra_2, insert_4ub_4f_bgra_3,
+       insert_4ub_4f_bgra_4 },
+     4 * sizeof(GLubyte) },
+
+   { "4chan_4f_rgba",
+     extract_4chan_4f_rgba,
+     { insert_4chan_4f_rgba_1, insert_4chan_4f_rgba_2, insert_4chan_4f_rgba_3,
+       insert_4chan_4f_rgba_4 },
+     4 * sizeof(GLchan) }
+
+};
+     
+
+/***********************************************************************
+ * Generic (non-codegen) functions for whole vertices or groups of
+ * vertices
+ */
+
+static void generic_emit( GLcontext *ctx,
+			  GLuint start, GLuint end,
+			  void *dest )
+{
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
+   struct tnl_clipspace_attr *a = vtx->attr;
+   GLubyte *v = (GLubyte *)dest;
+   GLuint i, j;
+   GLuint count = vtx->attr_count;
+   GLuint stride;
+
+   for (j = 0; j < count; j++) {
+      GLvector4f *vptr = VB->AttribPtr[a[j].attrib];
+      a[j].inputstride = vptr->stride;
+      a[j].inputptr = ((GLubyte *)vptr->data) + start * vptr->stride;
+      a[j].emit = a[j].insert[vptr->size - 1];
+   }
+
+   end -= start;
+   stride = vtx->vertex_size;
+
+   for (i = 0 ; i < end ; i++, v += stride) {
+      for (j = 0; j < count; j++) {
+	 GLfloat *in = (GLfloat *)a[j].inputptr;
+	 a[j].inputptr += a[j].inputstride;
+	 a[j].emit( &a[j], v + a[j].vertoffset, in );
+      }
+   }
+}
+
+
+static void generic_interp( GLcontext *ctx,
+			    GLfloat t,
+			    GLuint edst, GLuint eout, GLuint ein,
+			    GLboolean force_boundary )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct vertex_buffer *VB = &tnl->vb;
+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
+   GLubyte *vin  = vtx->vertex_buf + ein  * vtx->vertex_size;
+   GLubyte *vout = vtx->vertex_buf + eout * vtx->vertex_size;
+   GLubyte *vdst = vtx->vertex_buf + edst * vtx->vertex_size;
+   const struct tnl_clipspace_attr *a = vtx->attr;
+   int attr_count = vtx->attr_count;
+   int j;
+
+   if (tnl->NeedNdcCoords) {
+      const GLfloat *dstclip = VB->ClipPtr->data[edst];
+      if (dstclip[3] != 0.0) {
+	 const GLfloat w = 1.0f / dstclip[3];
+	 GLfloat pos[4];
+
+	 pos[0] = dstclip[0] * w;
+	 pos[1] = dstclip[1] * w;
+	 pos[2] = dstclip[2] * w;
+	 pos[3] = w;
+
+	 a[0].insert[4-1]( &a[0], vdst, pos );
+      }
+   }
+   else {
+      a[0].insert[4-1]( &a[0], vdst, VB->ClipPtr->data[edst] );
+   }
+
+
+   for (j = 1; j < attr_count; j++) {
+      GLfloat fin[4], fout[4], fdst[4];
+	 
+      a[j].extract( &a[j], fin, vin + a[j].vertoffset );
+      a[j].extract( &a[j], fout, vout + a[j].vertoffset );
+
+      INTERP_F( t, fdst[3], fout[3], fin[3] );
+      INTERP_F( t, fdst[2], fout[2], fin[2] );
+      INTERP_F( t, fdst[1], fout[1], fin[1] );
+      INTERP_F( t, fdst[0], fout[0], fin[0] );
+
+      a[j].insert[4-1]( &a[j], vdst + a[j].vertoffset, fdst );
+   }
+}
+
+
+/* Extract color attributes from one vertex and insert them into
+ * another.  (Shortcircuit extract/insert with memcpy).
+ */
+static void generic_copy_pv( GLcontext *ctx, GLuint edst, GLuint esrc )
+{
+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
+   GLubyte *vsrc = vtx->vertex_buf + esrc * vtx->vertex_size;
+   GLubyte *vdst = vtx->vertex_buf + edst * vtx->vertex_size;
+   const struct tnl_clipspace_attr *a = vtx->attr;
+   int attr_count = vtx->attr_count;
+   int j;
+
+   for (j = 0; j < attr_count; j++) {
+      if (a[j].attrib == VERT_ATTRIB_COLOR0 ||
+	  a[j].attrib == VERT_ATTRIB_COLOR1) {
+
+	 _mesa_memcpy( vdst + a[j].vertoffset,
+                       vsrc + a[j].vertoffset,
+                       a[j].vertattrsize );
+      }
+   }
+}
+
+
+/* Helper functions for hardware which doesn't put back colors and/or
+ * edgeflags into vertices.
+ */
+static void generic_interp_extras( GLcontext *ctx,
+				   GLfloat t,
+				   GLuint dst, GLuint out, GLuint in,
+				   GLboolean force_boundary )
+{
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+
+   if (VB->ColorPtr[1]) {
+      assert(VB->ColorPtr[1]->stride == 4 * sizeof(GLfloat));
+
+      INTERP_4F( t,
+		 VB->ColorPtr[1]->data[dst],
+		 VB->ColorPtr[1]->data[out],
+		 VB->ColorPtr[1]->data[in] );
+
+      if (VB->SecondaryColorPtr[1]) {
+	 INTERP_3F( t,
+		    VB->SecondaryColorPtr[1]->data[dst],
+		    VB->SecondaryColorPtr[1]->data[out],
+		    VB->SecondaryColorPtr[1]->data[in] );
+      }
+   }
+   else if (VB->IndexPtr[1]) {
+      VB->IndexPtr[1]->data[dst][0] = LINTERP( t,
+					       VB->IndexPtr[1]->data[out][0],
+					       VB->IndexPtr[1]->data[in][0] );
+   }
+
+   if (VB->EdgeFlag) {
+      VB->EdgeFlag[dst] = VB->EdgeFlag[out] || force_boundary;
+   }
+
+   generic_interp(ctx, t, dst, out, in, force_boundary);
+}
+
+static void generic_copy_pv_extras( GLcontext *ctx, 
+				    GLuint dst, GLuint src )
+{
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+
+   if (VB->ColorPtr[1]) {
+      COPY_4FV( VB->ColorPtr[1]->data[dst], 
+		VB->ColorPtr[1]->data[src] );
+
+      if (VB->SecondaryColorPtr[1]) {
+	 COPY_4FV( VB->SecondaryColorPtr[1]->data[dst], 
+		   VB->SecondaryColorPtr[1]->data[src] );
+      }
+   }
+   else if (VB->IndexPtr[1]) {
+      VB->IndexPtr[1]->data[dst][0] = VB->IndexPtr[1]->data[src][0];
+   }
+
+   generic_copy_pv(ctx, dst, src);
+}
+
+
+
+
+
+
+/***********************************************************************
+ * Build codegen functions or return generic ones:
+ */
+
+
+static void choose_emit_func( GLcontext *ctx,
+			      GLuint start, GLuint end,
+			      void *dest )
+{
+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
+   vtx->emit = generic_emit;
+   vtx->emit( ctx, start, end, dest );
+}
+
+
+static void choose_interp_func( GLcontext *ctx,
+				GLfloat t,
+				GLuint edst, GLuint eout, GLuint ein,
+				GLboolean force_boundary )
+{
+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
+
+   if (vtx->need_extras && 
+       (ctx->_TriangleCaps & (DD_TRI_LIGHT_TWOSIDE|DD_TRI_UNFILLED))) {
+      vtx->interp = generic_interp_extras;
+   } else {
+      vtx->interp = generic_interp;
+   }
+
+   vtx->interp( ctx, t, edst, eout, ein, force_boundary );
+}
+
+
+static void choose_copy_pv_func(  GLcontext *ctx, GLuint edst, GLuint esrc )
+{
+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
+
+   if (vtx->need_extras && 
+       (ctx->_TriangleCaps & (DD_TRI_LIGHT_TWOSIDE|DD_TRI_UNFILLED))) {
+      vtx->copy_pv = generic_copy_pv_extras;
+   } else {
+      vtx->copy_pv = generic_copy_pv;
+   }
+
+   vtx->copy_pv( ctx, edst, esrc );
+}
+
+
+/***********************************************************************
+ * Public entrypoints, mostly dispatch to the above:
+ */
+
+
+/* Interpolate between two vertices to produce a third:
+ */
+void _tnl_interp( GLcontext *ctx,
+		  GLfloat t,
+		  GLuint edst, GLuint eout, GLuint ein,
+		  GLboolean force_boundary )
+{
+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
+   vtx->interp( ctx, t, edst, eout, ein, force_boundary );
+}
+
+/* Copy colors from one vertex to another:
+ */
+void _tnl_copy_pv(  GLcontext *ctx, GLuint edst, GLuint esrc )
+{
+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
+   vtx->copy_pv( ctx, edst, esrc );
+}
+
+
+/* Extract a named attribute from a hardware vertex.  Will have to
+ * reverse any viewport transformation, swizzling or other conversions
+ * which may have been applied:
+ */
+void _tnl_get_attr( GLcontext *ctx, const void *vin,
+			      GLenum attr, GLfloat *dest )
+{
+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
+   const struct tnl_clipspace_attr *a = vtx->attr;
+   int attr_count = vtx->attr_count;
+   int j;
+
+   for (j = 0; j < attr_count; j++) {
+      if (a[j].attrib == (int)attr) {
+	 a[j].extract( &a[j], dest, (GLubyte *)vin + a[j].vertoffset );
+	 return;
+      }
+   }
+
+   /* Else return the value from ctx->Current
+    */
+   _mesa_memcpy( dest, ctx->Current.Attrib[attr], 4*sizeof(GLfloat));
+}
+
+void *_tnl_get_vertex( GLcontext *ctx, GLuint nr )
+{
+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
+
+   return vtx->vertex_buf + nr * vtx->vertex_size;
+}
+
+void _tnl_invalidate_vertex_state( GLcontext *ctx, GLuint new_state )
+{
+   if (new_state & (_DD_NEW_TRI_LIGHT_TWOSIDE|_DD_NEW_TRI_UNFILLED) ) {
+      struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
+      vtx->new_inputs = ~0;
+      vtx->interp = choose_interp_func;
+      vtx->copy_pv = choose_copy_pv_func;
+   }
+}
+
+
+GLuint _tnl_install_attrs( GLcontext *ctx, const struct tnl_attr_map *map,
+			   GLuint nr, const GLfloat *vp, 
+			   GLuint unpacked_size )
+{
+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
+   int offset = 0;
+   GLuint i;
+
+   assert(nr < _TNL_ATTRIB_MAX);
+   assert(nr == 0 || map[0].attrib == VERT_ATTRIB_POS);
+
+   vtx->attr_count = nr;
+   vtx->emit = choose_emit_func;
+   vtx->interp = choose_interp_func;
+   vtx->copy_pv = choose_copy_pv_func;
+   vtx->new_inputs = ~0;
+
+   for (i = 0; i < nr; i++) {
+      GLuint format = map[i].format;
+      vtx->attr[i].attrib = map[i].attrib;
+      vtx->attr[i].vp = vp;
+      vtx->attr[i].insert = format_info[format].insert;
+      vtx->attr[i].extract = format_info[format].extract;
+      vtx->attr[i].vertattrsize = format_info[format].attrsize;
+
+      if (unpacked_size) 
+	 vtx->attr[i].vertoffset = map[i].offset;
+      else
+	 vtx->attr[i].vertoffset = offset;
+
+/*       fprintf(stderr, "%d: %s offset %d\n", i, */
+/* 	      format_info[format].name, vtx->attr[i].vertoffset); */
+
+      offset += format_info[format].attrsize;
+   }
+
+   if (unpacked_size)
+      vtx->vertex_size = unpacked_size;
+   else
+      vtx->vertex_size = offset;
+
+   assert(vtx->vertex_size <= vtx->max_vertex_size);
+   
+   return vtx->vertex_size;
+}
+
+
+
+void _tnl_invalidate_vertices( GLcontext *ctx, GLuint newinputs )
+{
+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
+   vtx->new_inputs |= newinputs;
+}
+
+
+
+void _tnl_build_vertices( GLcontext *ctx,
+		       GLuint start,
+		       GLuint count,
+		       GLuint newinputs )
+{
+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
+   GLuint stride = vtx->vertex_size;
+   GLubyte *v = ((GLubyte *)vtx->vertex_buf + (start*stride));
+
+   newinputs |= vtx->new_inputs;
+   vtx->new_inputs = 0;
+
+   if (newinputs)
+      vtx->emit( ctx, start, count, v );
+}
+
+
+void *_tnl_emit_vertices_to_buffer( GLcontext *ctx,
+				   GLuint start,
+				   GLuint count,
+				   void *dest )
+{
+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
+   vtx->emit( ctx, start, count, dest );
+   return (void *)((GLubyte *)dest + vtx->vertex_size * (count - start));
+}
+
+
+void _tnl_init_vertices( GLcontext *ctx, 
+			GLuint vb_size,
+			GLuint max_vertex_size )
+{
+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);  
+
+   _tnl_install_attrs( ctx, 0, 0, 0, 0 );
+
+   vtx->need_extras = GL_TRUE;
+   if (max_vertex_size > vtx->max_vertex_size) {
+      _tnl_free_vertices( ctx );
+      vtx->max_vertex_size = max_vertex_size;
+      vtx->vertex_buf = (GLubyte *)ALIGN_CALLOC(vb_size * max_vertex_size, 32 );
+   }
+}
+
+
+void _tnl_free_vertices( GLcontext *ctx )
+{
+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
+   if (vtx->vertex_buf) {
+      ALIGN_FREE(vtx->vertex_buf);
+      vtx->vertex_buf = 0;
+   }
+}
diff --git a/reactos/lib/mesa32/src/tnl/t_vertex.h b/reactos/lib/mesa32/src/tnl/t_vertex.h
new file mode 100644
index 00000000000..10d67631c57
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl/t_vertex.h
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2003 Tungsten Graphics, inc.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * on the rights to use, copy, modify, merge, publish, distribute, sub
+ * license, and/or sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+ * TUNGSTEN GRAPHICS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keithw@tungstengraphics.com>
+ */
+
+#ifndef _TNL_VERTEX_H
+#define _TNL_VERTEX_H
+
+/* New mechanism to specify hardware vertices so that tnl can build
+ * and manipulate them directly.  
+ */
+
+
+/* It will probably be necessary to allow drivers to specify new
+ * emit-styles to cover all the wierd and wacky things out there.
+ */
+enum tnl_attr_format {
+   EMIT_1F,
+   EMIT_2F,
+   EMIT_3F,
+   EMIT_4F,
+   EMIT_2F_VIEWPORT,		/* do viewport transform and emit */
+   EMIT_3F_VIEWPORT,		/* do viewport transform and emit */
+   EMIT_4F_VIEWPORT,		/* do viewport transform and emit */
+   EMIT_3F_XYW,			/* for projective texture */
+   EMIT_1UB_1F,			/* for fog coordinate */
+   EMIT_3UB_3F_BGR,		/* for specular color */
+   EMIT_3UB_3F_RGB,		/* for specular color */
+   EMIT_4UB_4F_BGRA,		/* for color */
+   EMIT_4UB_4F_RGBA,		/* for color */
+   EMIT_4CHAN_4F_RGBA,		/* for swrast color */
+   EMIT_MAX
+};
+
+struct tnl_attr_map {
+   GLuint attrib;			/* _TNL_ATTRIB_ enum */
+   enum tnl_attr_format format;
+   GLuint offset;
+};
+   
+
+
+/* Interpolate between two vertices to produce a third:
+ */
+extern void _tnl_interp( GLcontext *ctx,
+			 GLfloat t,
+			 GLuint edst, GLuint eout, GLuint ein,
+			 GLboolean force_boundary );
+
+/* Copy colors from one vertex to another:
+ */
+extern void _tnl_copy_pv(  GLcontext *ctx, GLuint edst, GLuint esrc );
+
+
+/* Extract a named attribute from a hardware vertex.  Will have to
+ * reverse any viewport transformation, swizzling or other conversions
+ * which may have been applied:
+ */
+extern void _tnl_get_attr( GLcontext *ctx, const void *vertex, GLenum attrib,
+			   GLfloat *dest );
+
+extern void *_tnl_get_vertex( GLcontext *ctx, GLuint nr );
+
+
+/*
+ */
+extern GLuint _tnl_install_attrs( GLcontext *ctx,
+				  const struct tnl_attr_map *map,
+				  GLuint nr, const GLfloat *vp,
+				  GLuint unpacked_size );
+
+
+
+
+
+extern void _tnl_free_vertices( GLcontext *ctx );
+
+extern void _tnl_init_vertices( GLcontext *ctx, 
+				GLuint vb_size,
+				GLuint max_vertex_size );
+
+extern void *_tnl_emit_vertices_to_buffer( GLcontext *ctx,
+					   GLuint start,
+					   GLuint count,
+					   void *dest );
+
+extern void _tnl_build_vertices( GLcontext *ctx,
+				 GLuint start,
+				 GLuint count,
+				 GLuint newinputs );
+
+extern void _tnl_invalidate_vertices( GLcontext *ctx, GLuint newinputs );
+
+extern void _tnl_invalidate_vertex_state( GLcontext *ctx, GLuint new_state );
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/tnl/t_vtx_api.c b/reactos/lib/mesa32/src/tnl/t_vtx_api.c
new file mode 100644
index 00000000000..a9a1c5bd5f8
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl/t_vtx_api.c
@@ -0,0 +1,1194 @@
+/* $XFree86$ */
+/**************************************************************************
+
+Copyright 2002 Tungsten Graphics Inc., Cedar Park, Texas.
+
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+TUNGSTEN GRAPHICS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+#include "glheader.h"
+#include "context.h"
+#include "macros.h"
+#include "vtxfmt.h"
+#include "dlist.h"
+#include "state.h"
+#include "light.h"
+#include "api_arrayelt.h"
+#include "api_noop.h"
+#include "t_vtx_api.h"
+
+
+static void init_attrfv( TNLcontext *tnl );
+
+
+/* Close off the last primitive, execute the buffer, restart the
+ * primitive.  
+ */
+static void _tnl_wrap_buffers( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   
+
+   if (tnl->vtx.prim_count == 0) {
+      tnl->vtx.copied.nr = 0;
+      tnl->vtx.counter = tnl->vtx.initial_counter;
+      tnl->vtx.vbptr = tnl->vtx.buffer;
+   }
+   else {
+      GLuint last_prim = tnl->vtx.prim[tnl->vtx.prim_count-1].mode;
+      GLuint last_count = tnl->vtx.prim[tnl->vtx.prim_count-1].count;
+
+      if (ctx->Driver.CurrentExecPrimitive != GL_POLYGON+1) {
+	 GLint i = tnl->vtx.prim_count - 1;
+	 assert(i >= 0);
+	 tnl->vtx.prim[i].count = ((tnl->vtx.initial_counter - 
+				    tnl->vtx.counter) - 
+				   tnl->vtx.prim[i].start);
+      }
+
+      /* Execute the buffer and save copied vertices.
+       */
+      if (tnl->vtx.counter != tnl->vtx.initial_counter)
+	 _tnl_flush_vtx( ctx );
+      else {
+	 tnl->vtx.prim_count = 0;
+	 tnl->vtx.copied.nr = 0;
+      }
+
+      /* Emit a glBegin to start the new list.
+       */
+      assert(tnl->vtx.prim_count == 0);
+
+      if (ctx->Driver.CurrentExecPrimitive != GL_POLYGON+1) {
+	 tnl->vtx.prim[0].mode = ctx->Driver.CurrentExecPrimitive;
+	 tnl->vtx.prim[0].start = 0;
+	 tnl->vtx.prim[0].count = 0;
+	 tnl->vtx.prim_count++;
+      
+	 if (tnl->vtx.copied.nr == last_count)
+	    tnl->vtx.prim[0].mode |= last_prim & PRIM_BEGIN;
+      }
+   }
+}
+
+
+static void _tnl_wrap_filled_vertex( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   GLfloat *data = tnl->vtx.copied.buffer;
+   GLuint i;
+
+   /* Run pipeline on current vertices, copy wrapped vertices
+    * to tnl->copied.
+    */
+   _tnl_wrap_buffers( ctx );
+   
+   /* Copy stored stored vertices to start of new list. 
+    */
+   assert(tnl->vtx.counter > tnl->vtx.copied.nr);
+
+   for (i = 0 ; i < tnl->vtx.copied.nr ; i++) {
+      _mesa_memcpy( tnl->vtx.vbptr, data, 
+		    tnl->vtx.vertex_size * sizeof(GLfloat));
+      tnl->vtx.vbptr += tnl->vtx.vertex_size;
+      data += tnl->vtx.vertex_size;
+      tnl->vtx.counter--;
+   }
+
+   tnl->vtx.copied.nr = 0;
+}
+
+
+/*
+ * Copy the active vertex's values to the ctx->Current fields.
+ */
+static void _tnl_copy_to_current( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx); 
+   GLuint i;
+
+   for (i = _TNL_ATTRIB_POS+1 ; i <= _TNL_ATTRIB_INDEX ; i++)
+      if (tnl->vtx.attrsz[i]) {
+         /* Note: the tnl->vtx.current[i] pointers points to
+          * the ctx->Current fields.  The first 16 or so, anyway.
+          */
+	 ASSIGN_4V( tnl->vtx.current[i], 0, 0, 0, 1 );
+	 COPY_SZ_4V(tnl->vtx.current[i], 
+		    tnl->vtx.attrsz[i], 
+		    tnl->vtx.attrptr[i]);
+      }
+
+   /* Edgeflag requires special treatment:
+    */
+   if (tnl->vtx.attrsz[_TNL_ATTRIB_EDGEFLAG]) 
+      ctx->Current.EdgeFlag = 
+	 (tnl->vtx.attrptr[_TNL_ATTRIB_EDGEFLAG][0] == 1.0);
+
+
+   /* Colormaterial -- this kindof sucks.
+    */
+   if (ctx->Light.ColorMaterialEnabled) {
+      _mesa_update_color_material(ctx, ctx->Current.Attrib[VERT_ATTRIB_COLOR0]);
+   }
+
+   if (tnl->vtx.have_materials) {
+      tnl->Driver.NotifyMaterialChange( ctx );
+   }
+         
+   ctx->Driver.NeedFlush &= ~FLUSH_UPDATE_CURRENT;
+}
+
+
+static void _tnl_copy_from_current( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx); 
+   GLint i;
+
+   for (i = _TNL_ATTRIB_POS+1 ; i <= _TNL_ATTRIB_INDEX ; i++) 
+      switch (tnl->vtx.attrsz[i]) {
+      case 4: tnl->vtx.attrptr[i][3] = tnl->vtx.current[i][3];
+      case 3: tnl->vtx.attrptr[i][2] = tnl->vtx.current[i][2];
+      case 2: tnl->vtx.attrptr[i][1] = tnl->vtx.current[i][1];
+      case 1: tnl->vtx.attrptr[i][0] = tnl->vtx.current[i][0];
+	 break;
+      }
+
+   /* Edgeflag requires special treatment:
+    */
+   if (tnl->vtx.attrsz[_TNL_ATTRIB_EDGEFLAG]) 
+      tnl->vtx.attrptr[_TNL_ATTRIB_EDGEFLAG][0] = 
+	 (GLfloat)ctx->Current.EdgeFlag;
+
+
+   ctx->Driver.NeedFlush |= FLUSH_UPDATE_CURRENT;
+}
+
+
+/* Flush existing data, set new attrib size, replay copied vertices.
+ */ 
+static void _tnl_wrap_upgrade_vertex( GLcontext *ctx, 
+				      GLuint attr,
+				      GLuint newsz )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx); 
+   GLuint oldsz;
+   GLuint i;
+   GLfloat *tmp;
+   GLint lastcount = tnl->vtx.initial_counter - tnl->vtx.counter;
+
+
+   /* Run pipeline on current vertices, copy wrapped vertices
+    * to tnl->vtx.copied.
+    */
+   _tnl_wrap_buffers( ctx );
+
+
+   /* Do a COPY_TO_CURRENT to ensure back-copying works for the case
+    * when the attribute already exists in the vertex and is having
+    * its size increased.  
+    */
+   _tnl_copy_to_current( ctx );
+
+
+   /* Heuristic: Attempt to isolate attributes received outside
+    * begin/end so that they don't bloat the vertices.
+    */
+   if (ctx->Driver.CurrentExecPrimitive == PRIM_OUTSIDE_BEGIN_END &&
+       tnl->vtx.attrsz[attr] == 0 
+       && lastcount > 8
+      ) {
+      init_attrfv( tnl );
+   }
+
+   /* Fix up sizes:
+    */
+   oldsz = tnl->vtx.attrsz[attr];
+   tnl->vtx.attrsz[attr] = newsz;
+
+   tnl->vtx.vertex_size += newsz - oldsz;
+   tnl->vtx.counter = MIN2( VERT_BUFFER_SIZE / tnl->vtx.vertex_size,
+			    ctx->Const.MaxArrayLockSize );
+   tnl->vtx.initial_counter = tnl->vtx.counter;
+   tnl->vtx.vbptr = tnl->vtx.buffer;
+
+
+   /* Recalculate all the attrptr[] values
+    */
+   for (i = 0, tmp = tnl->vtx.vertex ; i < _TNL_ATTRIB_MAX ; i++) {
+      if (tnl->vtx.attrsz[i]) {
+	 tnl->vtx.attrptr[i] = tmp;
+	 tmp += tnl->vtx.attrsz[i];
+      }
+      else 
+	 tnl->vtx.attrptr[i] = 0; /* will not be dereferenced */
+   }
+
+   /* Copy from current to repopulate the vertex with correct values.
+    */
+   _tnl_copy_from_current( ctx );
+
+   /* Replay stored vertices to translate them
+    * to new format here.
+    *
+    * -- No need to replay - just copy piecewise
+    */
+   if (tnl->vtx.copied.nr)
+   {
+      GLfloat *data = tnl->vtx.copied.buffer;
+      GLfloat *dest = tnl->vtx.buffer;
+      GLuint j;
+
+      for (i = 0 ; i < tnl->vtx.copied.nr ; i++) {
+	 for (j = 0 ; j < _TNL_ATTRIB_MAX ; j++) {
+	    if (tnl->vtx.attrsz[j]) {
+	       if (j == attr) {
+		  COPY_SZ_4V( dest, newsz, tnl->vtx.current[j] );
+		  COPY_SZ_4V( dest, oldsz, data );
+		  data += oldsz;
+		  dest += newsz;
+	       }
+	       else {
+		  GLuint sz = tnl->vtx.attrsz[j];
+		  COPY_SZ_4V( dest, sz, data );
+		  dest += sz;
+		  data += sz;
+	       }
+	    }
+	 }
+      }
+
+      tnl->vtx.vbptr = dest;
+      tnl->vtx.counter -= tnl->vtx.copied.nr;
+      tnl->vtx.copied.nr = 0;
+   }
+}
+
+
+static void _tnl_fixup_vertex( GLcontext *ctx, GLuint attr, GLuint sz )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   static const GLfloat id[4] = { 0, 0, 0, 1 };
+   int i;
+
+   if (tnl->vtx.attrsz[attr] < sz) {
+      /* New size is larger.  Need to flush existing vertices and get
+       * an enlarged vertex format.
+       */
+      _tnl_wrap_upgrade_vertex( ctx, attr, sz );
+   }
+   else if (tnl->vtx.attrsz[attr] > sz) {
+      /* New size is smaller - just need to fill in some
+       * zeros.  Don't need to flush or wrap.
+       */
+      for (i = sz ; i <= tnl->vtx.attrsz[attr] ; i++)
+	 tnl->vtx.attrptr[attr][i-1] = id[i-1];
+   }
+}
+
+
+
+
+/* Helper function for 'CHOOSE' macro.  Do what's necessary when an
+ * entrypoint is called for the first time.
+ */
+static void do_choose( GLuint attr, GLuint sz, 
+			void (*fallback_attr_func)( const GLfloat *),
+			void (*choose1)( const GLfloat *),
+			void (*choose2)( const GLfloat *),
+			void (*choose3)( const GLfloat *),
+			void (*choose4)( const GLfloat *),
+			const GLfloat *v )
+{ 
+   GET_CURRENT_CONTEXT( ctx ); 
+   TNLcontext *tnl = TNL_CONTEXT(ctx); 
+
+   if (tnl->vtx.attrsz[attr] != sz)
+      _tnl_fixup_vertex( ctx, attr, sz );
+ 
+   /* Does this belong here?  Necessitates resetting vtxfmt on each
+    * flush (otherwise flags won't get reset afterwards).
+    */
+   if (attr == 0)
+      ctx->Driver.NeedFlush |= FLUSH_STORED_VERTICES;
+   else
+      ctx->Driver.NeedFlush |= FLUSH_UPDATE_CURRENT;
+
+   /* Reset any active pointers for this attribute 
+    */
+   tnl->vtx.tabfv[attr][0] = choose1;
+   tnl->vtx.tabfv[attr][1] = choose2;
+   tnl->vtx.tabfv[attr][2] = choose3;
+   tnl->vtx.tabfv[attr][3] = choose4;
+
+   /* Update the secondary dispatch table with the new function
+    */
+   tnl->vtx.tabfv[attr][sz-1] = fallback_attr_func;
+
+   (*fallback_attr_func)(v);
+}
+
+
+/* Versions of all the entrypoints for situations where codegen isn't
+ * available.  
+ *
+ * Note: Only one size for each attribute may be active at once.
+ * Eg. if Color3f is installed/active, then Color4f may not be, even
+ * if the vertex actually contains 4 color coordinates.  This is
+ * because the 3f version won't otherwise set color[3] to 1.0 -- this
+ * is the job of the chooser function when switching between Color4f
+ * and Color3f.
+ */
+#define ATTRFV( ATTR, N )				\
+static void choose_##ATTR##_##N( const GLfloat *v );	\
+							\
+static void attrib_##ATTR##_##N( const GLfloat *v )	\
+{							\
+   GET_CURRENT_CONTEXT( ctx );				\
+   TNLcontext *tnl = TNL_CONTEXT(ctx);			\
+							\
+   if ((ATTR) == 0) {					\
+      GLuint i;						\
+							\
+      if (N>0) tnl->vtx.vbptr[0] = v[0];		\
+      if (N>1) tnl->vtx.vbptr[1] = v[1];		\
+      if (N>2) tnl->vtx.vbptr[2] = v[2];		\
+      if (N>3) tnl->vtx.vbptr[3] = v[3];		\
+							\
+      for (i = N; i < tnl->vtx.vertex_size; i++)	\
+	 tnl->vtx.vbptr[i] = tnl->vtx.vertex[i];	\
+							\
+      tnl->vtx.vbptr += tnl->vtx.vertex_size;		\
+							\
+      if (--tnl->vtx.counter == 0)			\
+	 _tnl_wrap_filled_vertex( ctx );		\
+   }							\
+   else {						\
+      GLfloat *dest = tnl->vtx.attrptr[ATTR];		\
+      if (N>0) dest[0] = v[0];				\
+      if (N>1) dest[1] = v[1];				\
+      if (N>2) dest[2] = v[2];				\
+      if (N>3) dest[3] = v[3];				\
+   }							\
+}
+
+#define CHOOSE( ATTR, N )				\
+static void choose_##ATTR##_##N( const GLfloat *v )	\
+{							\
+   do_choose(ATTR, N,					\
+	     attrib_##ATTR##_##N,			\
+	     choose_##ATTR##_1,				\
+	     choose_##ATTR##_2,				\
+	     choose_##ATTR##_3,				\
+	     choose_##ATTR##_4,				\
+	     v );					\
+}
+
+#define INIT(ATTR)					\
+static void init_##ATTR( TNLcontext *tnl )		\
+{							\
+   tnl->vtx.tabfv[ATTR][0] = choose_##ATTR##_1;		\
+   tnl->vtx.tabfv[ATTR][1] = choose_##ATTR##_2;		\
+   tnl->vtx.tabfv[ATTR][2] = choose_##ATTR##_3; 	\
+   tnl->vtx.tabfv[ATTR][3] = choose_##ATTR##_4;		\
+}
+   
+
+#define ATTRS( ATTRIB )				\
+   ATTRFV( ATTRIB, 1 )				\
+   ATTRFV( ATTRIB, 2 )				\
+   ATTRFV( ATTRIB, 3 )				\
+   ATTRFV( ATTRIB, 4 )				\
+   CHOOSE( ATTRIB, 1 )				\
+   CHOOSE( ATTRIB, 2 )				\
+   CHOOSE( ATTRIB, 3 )				\
+   CHOOSE( ATTRIB, 4 )				\
+   INIT( ATTRIB )				\
+
+
+/* Generate a lot of functions.  These are the actual worker
+ * functions, which are equivalent to those generated via codegen
+ * elsewhere.
+ */
+ATTRS( 0 )
+ATTRS( 1 )
+ATTRS( 2 )
+ATTRS( 3 )
+ATTRS( 4 )
+ATTRS( 5 )
+ATTRS( 6 )
+ATTRS( 7 )
+ATTRS( 8 )
+ATTRS( 9 )
+ATTRS( 10 )
+ATTRS( 11 )
+ATTRS( 12 )
+ATTRS( 13 )
+ATTRS( 14 )
+ATTRS( 15 )
+
+static void init_attrfv( TNLcontext *tnl )
+{   
+   if (tnl->vtx.vertex_size) {
+      GLuint i;
+      
+      init_0( tnl );
+      init_1( tnl );
+      init_2( tnl );
+      init_3( tnl );
+      init_4( tnl );
+      init_5( tnl );
+      init_6( tnl );
+      init_7( tnl );
+      init_8( tnl );
+      init_9( tnl );
+      init_10( tnl );
+      init_11( tnl );
+      init_12( tnl );
+      init_13( tnl );
+      init_14( tnl );
+      init_15( tnl );
+
+      for (i = 0 ; i < _TNL_ATTRIB_MAX ; i++) 
+	 tnl->vtx.attrsz[i] = 0;
+
+      tnl->vtx.vertex_size = 0;
+      tnl->vtx.have_materials = 0;
+   }
+}
+
+/* These can be made efficient with codegen.  Further, by adding more
+ * logic to do_choose(), the double-dispatch for legacy entrypoints
+ * like glVertex3f() can be removed.
+ */
+#define DISPATCH_ATTRFV( ATTR, COUNT, P )	\
+do {						\
+   GET_CURRENT_CONTEXT( ctx ); 			\
+   TNLcontext *tnl = TNL_CONTEXT(ctx); 		\
+   tnl->vtx.tabfv[ATTR][COUNT-1]( P );		\
+} while (0)
+
+#define DISPATCH_ATTR1FV( ATTR, V ) DISPATCH_ATTRFV( ATTR, 1, V )
+#define DISPATCH_ATTR2FV( ATTR, V ) DISPATCH_ATTRFV( ATTR, 2, V )
+#define DISPATCH_ATTR3FV( ATTR, V ) DISPATCH_ATTRFV( ATTR, 3, V )
+#define DISPATCH_ATTR4FV( ATTR, V ) DISPATCH_ATTRFV( ATTR, 4, V )
+
+#define DISPATCH_ATTR1F( ATTR, S ) DISPATCH_ATTRFV( ATTR, 1, &(S) )
+
+#define DISPATCH_ATTR2F( ATTR, S,T ) 		\
+do { 						\
+   GLfloat v[2]; 				\
+   v[0] = S; v[1] = T;				\
+   DISPATCH_ATTR2FV( ATTR, v );			\
+} while (0)
+#define DISPATCH_ATTR3F( ATTR, S,T,R ) 		\
+do { 						\
+   GLfloat v[3]; 				\
+   v[0] = S; v[1] = T; v[2] = R;		\
+   DISPATCH_ATTR3FV( ATTR, v );			\
+} while (0)
+#define DISPATCH_ATTR4F( ATTR, S,T,R,Q )	\
+do { 						\
+   GLfloat v[4]; 				\
+   v[0] = S; v[1] = T; v[2] = R; v[3] = Q;	\
+   DISPATCH_ATTR4FV( ATTR, v );			\
+} while (0)
+
+
+static void enum_error( void )
+{
+   GET_CURRENT_CONTEXT( ctx );
+   _mesa_error( ctx, GL_INVALID_ENUM, "glVertexAttrib" );
+}
+
+static void GLAPIENTRY _tnl_Vertex2f( GLfloat x, GLfloat y )
+{
+   DISPATCH_ATTR2F( _TNL_ATTRIB_POS, x, y );
+}
+
+static void GLAPIENTRY _tnl_Vertex2fv( const GLfloat *v )
+{
+   DISPATCH_ATTR2FV( _TNL_ATTRIB_POS, v );
+}
+
+static void GLAPIENTRY _tnl_Vertex3f( GLfloat x, GLfloat y, GLfloat z )
+{
+   DISPATCH_ATTR3F( _TNL_ATTRIB_POS, x, y, z );
+}
+
+static void GLAPIENTRY _tnl_Vertex3fv( const GLfloat *v )
+{
+   DISPATCH_ATTR3FV( _TNL_ATTRIB_POS, v );
+}
+
+static void GLAPIENTRY _tnl_Vertex4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w )
+{
+   DISPATCH_ATTR4F( _TNL_ATTRIB_POS, x, y, z, w );
+}
+
+static void GLAPIENTRY _tnl_Vertex4fv( const GLfloat *v )
+{
+   DISPATCH_ATTR4FV( _TNL_ATTRIB_POS, v );
+}
+
+static void GLAPIENTRY _tnl_TexCoord1f( GLfloat x )
+{
+   DISPATCH_ATTR1F( _TNL_ATTRIB_TEX0, x );
+}
+
+static void GLAPIENTRY _tnl_TexCoord1fv( const GLfloat *v )
+{
+   DISPATCH_ATTR1FV( _TNL_ATTRIB_TEX0, v );
+}
+
+static void GLAPIENTRY _tnl_TexCoord2f( GLfloat x, GLfloat y )
+{
+   DISPATCH_ATTR2F( _TNL_ATTRIB_TEX0, x, y );
+}
+
+static void GLAPIENTRY _tnl_TexCoord2fv( const GLfloat *v )
+{
+   DISPATCH_ATTR2FV( _TNL_ATTRIB_TEX0, v );
+}
+
+static void GLAPIENTRY _tnl_TexCoord3f( GLfloat x, GLfloat y, GLfloat z )
+{
+   DISPATCH_ATTR3F( _TNL_ATTRIB_TEX0, x, y, z );
+}
+
+static void GLAPIENTRY _tnl_TexCoord3fv( const GLfloat *v )
+{
+   DISPATCH_ATTR3FV( _TNL_ATTRIB_TEX0, v );
+}
+
+static void GLAPIENTRY _tnl_TexCoord4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w )
+{
+   DISPATCH_ATTR4F( _TNL_ATTRIB_TEX0, x, y, z, w );
+}
+
+static void GLAPIENTRY _tnl_TexCoord4fv( const GLfloat *v )
+{
+   DISPATCH_ATTR4FV( _TNL_ATTRIB_TEX0, v );
+}
+
+static void GLAPIENTRY _tnl_Normal3f( GLfloat x, GLfloat y, GLfloat z )
+{
+   DISPATCH_ATTR3F( _TNL_ATTRIB_NORMAL, x, y, z );
+}
+
+static void GLAPIENTRY _tnl_Normal3fv( const GLfloat *v )
+{
+   DISPATCH_ATTR3FV( _TNL_ATTRIB_NORMAL, v );
+}
+
+static void GLAPIENTRY _tnl_FogCoordfEXT( GLfloat x )
+{
+   DISPATCH_ATTR1F( _TNL_ATTRIB_FOG, x );
+}
+
+static void GLAPIENTRY _tnl_FogCoordfvEXT( const GLfloat *v )
+{
+   DISPATCH_ATTR1FV( _TNL_ATTRIB_FOG, v );
+}
+
+static void GLAPIENTRY _tnl_Color3f( GLfloat x, GLfloat y, GLfloat z )
+{
+   DISPATCH_ATTR3F( _TNL_ATTRIB_COLOR0, x, y, z );
+}
+
+static void GLAPIENTRY _tnl_Color3fv( const GLfloat *v )
+{
+   DISPATCH_ATTR3FV( _TNL_ATTRIB_COLOR0, v );
+}
+
+static void GLAPIENTRY _tnl_Color4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w )
+{
+   DISPATCH_ATTR4F( _TNL_ATTRIB_COLOR0, x, y, z, w );
+}
+
+static void GLAPIENTRY _tnl_Color4fv( const GLfloat *v )
+{
+   DISPATCH_ATTR4FV( _TNL_ATTRIB_COLOR0, v );
+}
+
+static void GLAPIENTRY _tnl_SecondaryColor3fEXT( GLfloat x, GLfloat y, GLfloat z )
+{
+   DISPATCH_ATTR3F( _TNL_ATTRIB_COLOR1, x, y, z );
+}
+
+static void GLAPIENTRY _tnl_SecondaryColor3fvEXT( const GLfloat *v )
+{
+   DISPATCH_ATTR3FV( _TNL_ATTRIB_COLOR1, v );
+}
+
+static void GLAPIENTRY _tnl_MultiTexCoord1f( GLenum target, GLfloat x  )
+{
+   GLuint attr = (target & 0x7) + _TNL_ATTRIB_TEX0;
+   DISPATCH_ATTR1F( attr, x );
+}
+
+static void GLAPIENTRY _tnl_MultiTexCoord1fv( GLenum target, const GLfloat *v )
+{
+   GLuint attr = (target & 0x7) + _TNL_ATTRIB_TEX0;
+   DISPATCH_ATTR1FV( attr, v );
+}
+
+static void GLAPIENTRY _tnl_MultiTexCoord2f( GLenum target, GLfloat x, GLfloat y )
+{
+   GLuint attr = (target & 0x7) + _TNL_ATTRIB_TEX0;
+   DISPATCH_ATTR2F( attr, x, y );
+}
+
+static void GLAPIENTRY _tnl_MultiTexCoord2fv( GLenum target, const GLfloat *v )
+{
+   GLuint attr = (target & 0x7) + _TNL_ATTRIB_TEX0;
+   DISPATCH_ATTR2FV( attr, v );
+}
+
+static void GLAPIENTRY _tnl_MultiTexCoord3f( GLenum target, GLfloat x, GLfloat y,
+				    GLfloat z)
+{
+   GLuint attr = (target & 0x7) + _TNL_ATTRIB_TEX0;
+   DISPATCH_ATTR3F( attr, x, y, z );
+}
+
+static void GLAPIENTRY _tnl_MultiTexCoord3fv( GLenum target, const GLfloat *v )
+{
+   GLuint attr = (target & 0x7) + _TNL_ATTRIB_TEX0;
+   DISPATCH_ATTR3FV( attr, v );
+}
+
+static void GLAPIENTRY _tnl_MultiTexCoord4f( GLenum target, GLfloat x, GLfloat y,
+				    GLfloat z, GLfloat w )
+{
+   GLuint attr = (target & 0x7) + _TNL_ATTRIB_TEX0;
+   DISPATCH_ATTR4F( attr, x, y, z, w );
+}
+
+static void GLAPIENTRY _tnl_MultiTexCoord4fv( GLenum target, const GLfloat *v )
+{
+   GLuint attr = (target & 0x7) + _TNL_ATTRIB_TEX0;
+   DISPATCH_ATTR4FV( attr, v );
+}
+
+static void GLAPIENTRY _tnl_VertexAttrib1fNV( GLuint index, GLfloat x )
+{
+   if (index < VERT_ATTRIB_MAX)
+      DISPATCH_ATTR1F( index, x );
+   else
+      enum_error(); 
+}
+
+static void GLAPIENTRY _tnl_VertexAttrib1fvNV( GLuint index, const GLfloat *v )
+{
+   if (index < VERT_ATTRIB_MAX)
+      DISPATCH_ATTR1FV( index, v );
+   else
+      enum_error();
+}
+
+static void GLAPIENTRY _tnl_VertexAttrib2fNV( GLuint index, GLfloat x, GLfloat y )
+{
+   if (index < VERT_ATTRIB_MAX)
+      DISPATCH_ATTR2F( index, x, y );
+   else
+      enum_error();
+}
+
+static void GLAPIENTRY _tnl_VertexAttrib2fvNV( GLuint index, const GLfloat *v )
+{
+   if (index < VERT_ATTRIB_MAX)
+      DISPATCH_ATTR2FV( index, v );
+   else
+      enum_error();
+}
+
+static void GLAPIENTRY _tnl_VertexAttrib3fNV( GLuint index, GLfloat x, GLfloat y, 
+				  GLfloat z )
+{
+   if (index < VERT_ATTRIB_MAX)
+      DISPATCH_ATTR3F( index, x, y, z );
+   else
+      enum_error();
+}
+
+static void GLAPIENTRY _tnl_VertexAttrib3fvNV( GLuint index, const GLfloat *v )
+{
+   if (index < VERT_ATTRIB_MAX)
+      DISPATCH_ATTR3FV( index, v );
+   else
+      enum_error();
+}
+
+static void GLAPIENTRY _tnl_VertexAttrib4fNV( GLuint index, GLfloat x, GLfloat y,
+				  GLfloat z, GLfloat w )
+{
+   if (index < VERT_ATTRIB_MAX)
+      DISPATCH_ATTR4F( index, x, y, z, w );
+   else
+      enum_error();
+}
+
+static void GLAPIENTRY _tnl_VertexAttrib4fvNV( GLuint index, const GLfloat *v )
+{
+   if (index < VERT_ATTRIB_MAX)
+      DISPATCH_ATTR4FV( index, v );
+   else
+      enum_error();
+}
+
+
+/* Materials:  
+ * 
+ * These are treated as per-vertex attributes, at indices above where
+ * the NV_vertex_program leaves off.  There are a lot of good things
+ * about treating materials this way.  
+ *
+ * However: I don't want to double the number of generated functions
+ * just to cope with this, so I unroll the 'C' varients of CHOOSE and
+ * ATTRF into this function, and dispense with codegen and
+ * second-level dispatch.
+ *
+ * There is no aliasing of material attributes with other entrypoints.
+ */
+#define MAT_ATTR( A, N, params )			\
+do {							\
+   if (tnl->vtx.attrsz[A] != N) {			\
+      _tnl_fixup_vertex( ctx, A, N );			\
+      tnl->vtx.have_materials = GL_TRUE;		\
+   }							\
+							\
+   {							\
+      GLfloat *dest = tnl->vtx.attrptr[A];		\
+      if (N>0) dest[0] = params[0];			\
+      if (N>1) dest[1] = params[1];			\
+      if (N>2) dest[2] = params[2];			\
+      if (N>3) dest[3] = params[3];			\
+      ctx->Driver.NeedFlush |= FLUSH_UPDATE_CURRENT;	\
+   }							\
+} while (0)
+
+
+#define MAT( ATTR, N, face, params )			\
+do {							\
+   if (face != GL_BACK)					\
+      MAT_ATTR( ATTR, N, params ); /* front */		\
+   if (face != GL_FRONT)				\
+      MAT_ATTR( ATTR + 1, N, params ); /* back */	\
+} while (0)
+
+
+/* NOTE: Have to remove/deal-with colormaterial crossovers, probably
+ * later on - in the meantime just store everything.  
+ */
+static void GLAPIENTRY _tnl_Materialfv( GLenum face, GLenum pname, 
+			       const GLfloat *params )
+{
+   GET_CURRENT_CONTEXT( ctx ); 
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+
+   switch (face) {
+   case GL_FRONT:
+   case GL_BACK:
+   case GL_FRONT_AND_BACK:
+      break;
+      
+   default:
+      _mesa_error( ctx, GL_INVALID_ENUM, "glMaterialfv" );
+      return;
+   }
+
+   switch (pname) {
+   case GL_EMISSION:
+      MAT( _TNL_ATTRIB_MAT_FRONT_EMISSION, 4, face, params );
+      break;
+   case GL_AMBIENT:
+      MAT( _TNL_ATTRIB_MAT_FRONT_AMBIENT, 4, face, params );
+      break;
+   case GL_DIFFUSE:
+      MAT( _TNL_ATTRIB_MAT_FRONT_DIFFUSE, 4, face, params );
+      break;
+   case GL_SPECULAR:
+      MAT( _TNL_ATTRIB_MAT_FRONT_SPECULAR, 4, face, params );
+      break;
+   case GL_SHININESS:
+      MAT( _TNL_ATTRIB_MAT_FRONT_SHININESS, 1, face, params );
+      break;
+   case GL_COLOR_INDEXES:
+      MAT( _TNL_ATTRIB_MAT_FRONT_INDEXES, 3, face, params );
+      break;
+   case GL_AMBIENT_AND_DIFFUSE:
+      MAT( _TNL_ATTRIB_MAT_FRONT_AMBIENT, 4, face, params );
+      MAT( _TNL_ATTRIB_MAT_FRONT_DIFFUSE, 4, face, params );
+      break;
+   default:
+      _mesa_error( ctx, GL_INVALID_ENUM, "glMaterialfv" );
+      return;
+   }
+}
+
+
+#define IDX_ATTR( A, IDX )				\
+do {							\
+   GET_CURRENT_CONTEXT( ctx );				\
+   TNLcontext *tnl = TNL_CONTEXT(ctx);			\
+							\
+   if (tnl->vtx.attrsz[A] != 1) {			\
+      _tnl_fixup_vertex( ctx, A, 1 );			\
+   }							\
+							\
+   {							\
+      GLfloat *dest = tnl->vtx.attrptr[A];		\
+      dest[0] = IDX;				\
+      ctx->Driver.NeedFlush |= FLUSH_UPDATE_CURRENT;	\
+   }							\
+} while (0)
+
+
+static void GLAPIENTRY _tnl_EdgeFlag( GLboolean b )
+{
+   IDX_ATTR( _TNL_ATTRIB_EDGEFLAG, (GLfloat)b );
+}
+
+static void GLAPIENTRY _tnl_EdgeFlagv( const GLboolean *v )
+{
+   IDX_ATTR( _TNL_ATTRIB_EDGEFLAG, (GLfloat)v[0] );
+}
+
+static void GLAPIENTRY _tnl_Indexf( GLfloat f )
+{
+   IDX_ATTR( _TNL_ATTRIB_INDEX, f );
+}
+
+static void GLAPIENTRY _tnl_Indexfv( const GLfloat *v )
+{
+   IDX_ATTR( _TNL_ATTRIB_INDEX, v[0] );
+}
+
+/* Eval
+ */
+static void GLAPIENTRY _tnl_EvalCoord1f( GLfloat u )
+{
+   GET_CURRENT_CONTEXT( ctx );
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+
+   /* TODO: use a CHOOSE() function for this: */
+   {
+      GLint i;
+      if (tnl->vtx.eval.new_state) 
+	 _tnl_update_eval( ctx );
+
+      for (i = 0 ; i <= _TNL_ATTRIB_INDEX ; i++) {
+	 if (tnl->vtx.eval.map1[i].map) 
+	    if (tnl->vtx.attrsz[i] < tnl->vtx.eval.map1[i].sz)
+	       _tnl_fixup_vertex( ctx, i, tnl->vtx.eval.map1[i].sz );
+      }
+   }
+
+
+   _mesa_memcpy( tnl->vtx.copied.buffer, tnl->vtx.vertex, 
+                 tnl->vtx.vertex_size * sizeof(GLfloat));
+
+   _tnl_do_EvalCoord1f( ctx, u );
+
+   _mesa_memcpy( tnl->vtx.vertex, tnl->vtx.copied.buffer,
+                 tnl->vtx.vertex_size * sizeof(GLfloat));
+}
+
+static void GLAPIENTRY _tnl_EvalCoord2f( GLfloat u, GLfloat v )
+{
+   GET_CURRENT_CONTEXT( ctx );
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+
+   /* TODO: use a CHOOSE() function for this: */
+   {
+      GLint i;
+      if (tnl->vtx.eval.new_state) 
+	 _tnl_update_eval( ctx );
+
+      for (i = 0 ; i <= _TNL_ATTRIB_INDEX ; i++) {
+	 if (tnl->vtx.eval.map2[i].map) 
+	    if (tnl->vtx.attrsz[i] < tnl->vtx.eval.map2[i].sz)
+	       _tnl_fixup_vertex( ctx, i, tnl->vtx.eval.map2[i].sz );
+      }
+
+      if (ctx->Eval.AutoNormal) 
+	 if (tnl->vtx.attrsz[_TNL_ATTRIB_NORMAL] < 3)
+	    _tnl_fixup_vertex( ctx, _TNL_ATTRIB_NORMAL, 3 );
+   }
+
+   _mesa_memcpy( tnl->vtx.copied.buffer, tnl->vtx.vertex, 
+                 tnl->vtx.vertex_size * sizeof(GLfloat));
+
+   _tnl_do_EvalCoord2f( ctx, u, v );
+
+   _mesa_memcpy( tnl->vtx.vertex, tnl->vtx.copied.buffer, 
+                 tnl->vtx.vertex_size * sizeof(GLfloat));
+}
+
+static void GLAPIENTRY _tnl_EvalCoord1fv( const GLfloat *u )
+{
+   _tnl_EvalCoord1f( u[0] );
+}
+
+static void GLAPIENTRY _tnl_EvalCoord2fv( const GLfloat *u )
+{
+   _tnl_EvalCoord2f( u[0], u[1] );
+}
+
+static void GLAPIENTRY _tnl_EvalPoint1( GLint i )
+{
+   GET_CURRENT_CONTEXT( ctx );
+   GLfloat du = ((ctx->Eval.MapGrid1u2 - ctx->Eval.MapGrid1u1) /
+		 (GLfloat) ctx->Eval.MapGrid1un);
+   GLfloat u = i * du + ctx->Eval.MapGrid1u1;
+
+   _tnl_EvalCoord1f( u );
+}
+
+
+static void GLAPIENTRY _tnl_EvalPoint2( GLint i, GLint j )
+{
+   GET_CURRENT_CONTEXT( ctx );
+   GLfloat du = ((ctx->Eval.MapGrid2u2 - ctx->Eval.MapGrid2u1) / 
+		 (GLfloat) ctx->Eval.MapGrid2un);
+   GLfloat dv = ((ctx->Eval.MapGrid2v2 - ctx->Eval.MapGrid2v1) / 
+		 (GLfloat) ctx->Eval.MapGrid2vn);
+   GLfloat u = i * du + ctx->Eval.MapGrid2u1;
+   GLfloat v = j * dv + ctx->Eval.MapGrid2v1;
+
+   _tnl_EvalCoord2f( u, v );
+}
+
+
+/* Build a list of primitives on the fly.  Keep
+ * ctx->Driver.CurrentExecPrimitive uptodate as well.
+ */
+static void GLAPIENTRY _tnl_Begin( GLenum mode )
+{
+   GET_CURRENT_CONTEXT( ctx ); 
+
+   if ((ctx->VertexProgram.Enabled
+        && !ctx->VertexProgram.Current->Instructions) ||
+       (ctx->FragmentProgram.Enabled
+        && !ctx->FragmentProgram.Current->Instructions)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glBegin (invalid vertex/fragment program)");
+      return;
+   }
+
+   if (ctx->Driver.CurrentExecPrimitive == GL_POLYGON+1) {
+      TNLcontext *tnl = TNL_CONTEXT(ctx); 
+      int i;
+
+      if (ctx->NewState) {
+	 _mesa_update_state( ctx );
+	 if (!(tnl->Driver.NotifyBegin && tnl->Driver.NotifyBegin( ctx, mode )))
+	     ctx->Exec->Begin(mode);
+	 return;
+      }
+
+      /* Heuristic: attempt to isolate attributes occuring outside
+       * begin/end pairs.
+       */
+      if (tnl->vtx.vertex_size && !tnl->vtx.attrsz[0]) 
+	 _tnl_FlushVertices( ctx, ~0 );
+
+      i = tnl->vtx.prim_count++;
+      tnl->vtx.prim[i].mode = mode | PRIM_BEGIN;
+      tnl->vtx.prim[i].start = tnl->vtx.initial_counter - tnl->vtx.counter;
+      tnl->vtx.prim[i].count = 0;
+
+      ctx->Driver.CurrentExecPrimitive = mode;
+   }
+   else 
+      _mesa_error( ctx, GL_INVALID_OPERATION, "glBegin" );
+      
+}
+
+static void GLAPIENTRY _tnl_End( void )
+{
+   GET_CURRENT_CONTEXT( ctx ); 
+
+   if (ctx->Driver.CurrentExecPrimitive != GL_POLYGON+1) {
+      TNLcontext *tnl = TNL_CONTEXT(ctx); 
+      int idx = tnl->vtx.initial_counter - tnl->vtx.counter;
+      int i = tnl->vtx.prim_count - 1;
+
+      tnl->vtx.prim[i].mode |= PRIM_END; 
+      tnl->vtx.prim[i].count = idx - tnl->vtx.prim[i].start;
+
+      ctx->Driver.CurrentExecPrimitive = GL_POLYGON+1;
+
+      /* Two choices which effect the way vertex attributes are
+       * carried over (or not) between adjacent primitives.
+       */
+#if 0
+      if (tnl->vtx.prim_count == TNL_MAX_PRIM) 
+	 _tnl_FlushVertices( ctx, ~0 );
+#else
+      if (tnl->vtx.prim_count == TNL_MAX_PRIM)
+	 _tnl_flush_vtx( ctx );	
+#endif
+
+   }
+   else 
+      _mesa_error( ctx, GL_INVALID_OPERATION, "glEnd" );
+}
+
+
+static void _tnl_exec_vtxfmt_init( GLcontext *ctx )
+{
+   GLvertexformat *vfmt = &(TNL_CONTEXT(ctx)->exec_vtxfmt);
+   vfmt->ArrayElement = _ae_loopback_array_elt;	        /* generic helper */
+   vfmt->Begin = _tnl_Begin;
+   vfmt->CallList = _mesa_CallList;
+   vfmt->CallLists = _mesa_CallLists;
+   vfmt->Color3f = _tnl_Color3f;
+   vfmt->Color3fv = _tnl_Color3fv;
+   vfmt->Color4f = _tnl_Color4f;
+   vfmt->Color4fv = _tnl_Color4fv;
+   vfmt->EdgeFlag = _tnl_EdgeFlag;
+   vfmt->EdgeFlagv = _tnl_EdgeFlagv;
+   vfmt->End = _tnl_End;
+   vfmt->EvalCoord1f = _tnl_EvalCoord1f;
+   vfmt->EvalCoord1fv = _tnl_EvalCoord1fv;
+   vfmt->EvalCoord2f = _tnl_EvalCoord2f;
+   vfmt->EvalCoord2fv = _tnl_EvalCoord2fv;
+   vfmt->EvalPoint1 = _tnl_EvalPoint1;
+   vfmt->EvalPoint2 = _tnl_EvalPoint2;
+   vfmt->FogCoordfEXT = _tnl_FogCoordfEXT;
+   vfmt->FogCoordfvEXT = _tnl_FogCoordfvEXT;
+   vfmt->Indexf = _tnl_Indexf;
+   vfmt->Indexfv = _tnl_Indexfv;
+   vfmt->Materialfv = _tnl_Materialfv;
+   vfmt->MultiTexCoord1fARB = _tnl_MultiTexCoord1f;
+   vfmt->MultiTexCoord1fvARB = _tnl_MultiTexCoord1fv;
+   vfmt->MultiTexCoord2fARB = _tnl_MultiTexCoord2f;
+   vfmt->MultiTexCoord2fvARB = _tnl_MultiTexCoord2fv;
+   vfmt->MultiTexCoord3fARB = _tnl_MultiTexCoord3f;
+   vfmt->MultiTexCoord3fvARB = _tnl_MultiTexCoord3fv;
+   vfmt->MultiTexCoord4fARB = _tnl_MultiTexCoord4f;
+   vfmt->MultiTexCoord4fvARB = _tnl_MultiTexCoord4fv;
+   vfmt->Normal3f = _tnl_Normal3f;
+   vfmt->Normal3fv = _tnl_Normal3fv;
+   vfmt->SecondaryColor3fEXT = _tnl_SecondaryColor3fEXT;
+   vfmt->SecondaryColor3fvEXT = _tnl_SecondaryColor3fvEXT;
+   vfmt->TexCoord1f = _tnl_TexCoord1f;
+   vfmt->TexCoord1fv = _tnl_TexCoord1fv;
+   vfmt->TexCoord2f = _tnl_TexCoord2f;
+   vfmt->TexCoord2fv = _tnl_TexCoord2fv;
+   vfmt->TexCoord3f = _tnl_TexCoord3f;
+   vfmt->TexCoord3fv = _tnl_TexCoord3fv;
+   vfmt->TexCoord4f = _tnl_TexCoord4f;
+   vfmt->TexCoord4fv = _tnl_TexCoord4fv;
+   vfmt->Vertex2f = _tnl_Vertex2f;
+   vfmt->Vertex2fv = _tnl_Vertex2fv;
+   vfmt->Vertex3f = _tnl_Vertex3f;
+   vfmt->Vertex3fv = _tnl_Vertex3fv;
+   vfmt->Vertex4f = _tnl_Vertex4f;
+   vfmt->Vertex4fv = _tnl_Vertex4fv;
+   vfmt->VertexAttrib1fNV = _tnl_VertexAttrib1fNV;
+   vfmt->VertexAttrib1fvNV = _tnl_VertexAttrib1fvNV;
+   vfmt->VertexAttrib2fNV = _tnl_VertexAttrib2fNV;
+   vfmt->VertexAttrib2fvNV = _tnl_VertexAttrib2fvNV;
+   vfmt->VertexAttrib3fNV = _tnl_VertexAttrib3fNV;
+   vfmt->VertexAttrib3fvNV = _tnl_VertexAttrib3fvNV;
+   vfmt->VertexAttrib4fNV = _tnl_VertexAttrib4fNV;
+   vfmt->VertexAttrib4fvNV = _tnl_VertexAttrib4fvNV;
+
+   vfmt->Rectf = _mesa_noop_Rectf;
+   vfmt->EvalMesh1 = _mesa_noop_EvalMesh1;
+   vfmt->EvalMesh2 = _mesa_noop_EvalMesh2;
+}
+
+
+
+void _tnl_FlushVertices( GLcontext *ctx, GLuint flags )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+
+   if (ctx->Driver.CurrentExecPrimitive != PRIM_OUTSIDE_BEGIN_END)
+      return;
+
+   if (tnl->vtx.counter != tnl->vtx.initial_counter) {
+      _tnl_flush_vtx( ctx );
+   }
+
+   {
+      _tnl_copy_to_current( ctx );
+
+      /* reset attrfv table
+       */
+      init_attrfv( tnl );
+      flags |= FLUSH_UPDATE_CURRENT;
+   }
+
+   ctx->Driver.NeedFlush = 0;
+}
+
+
+static void _tnl_current_init( GLcontext *ctx ) 
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   GLint i;
+
+   /* setup the pointers for the typical 16 vertex attributes */
+   for (i = 0; i < VERT_ATTRIB_MAX; i++) 
+      tnl->vtx.current[i] = ctx->Current.Attrib[i];
+
+   /* setup pointers for the 12 material attributes */
+   for (i = 0; i < MAT_ATTRIB_MAX; i++)
+      tnl->vtx.current[_TNL_ATTRIB_MAT_FRONT_AMBIENT + i] = 
+	 ctx->Light.Material.Attrib[i];
+
+   tnl->vtx.current[_TNL_ATTRIB_INDEX] = &ctx->Current.Index;
+}
+
+
+void _tnl_vtx_init( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx); 
+   struct tnl_vertex_arrays *tmp = &tnl->vtx_inputs;
+   GLuint i;
+
+   for (i = 0; i < _TNL_ATTRIB_INDEX; i++)
+      _mesa_vector4f_init( &tmp->Attribs[i], 0, 0);
+
+   _tnl_current_init( ctx );
+   _tnl_exec_vtxfmt_init( ctx );
+
+   _mesa_install_exec_vtxfmt( ctx, &tnl->exec_vtxfmt );
+   tnl->vtx.vertex_size = 1; init_attrfv( tnl );
+}
+
+
+
+void _tnl_vtx_destroy( GLcontext *ctx )
+{
+}
+
diff --git a/reactos/lib/mesa32/src/tnl/t_vtx_api.h b/reactos/lib/mesa32/src/tnl/t_vtx_api.h
new file mode 100644
index 00000000000..25003202132
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl/t_vtx_api.h
@@ -0,0 +1,58 @@
+/* $XFree86$ */
+/**************************************************************************
+
+Copyright 2002 Tungsten Graphics Inc., Cedar Park, Texas.
+
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+TUNGSTEN GRAPHICS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Keith Whitwell <keith@tungstengraphics.com>
+ *
+ */
+
+#ifndef __T_VTX_API_H__
+#define __T_VTX_API_H__
+
+#include "t_context.h"
+
+extern void _tnl_vtx_init( GLcontext *ctx );
+extern void _tnl_vtx_destroy( GLcontext *ctx );
+
+extern void _tnl_FlushVertices( GLcontext *ctx, GLuint flags );
+extern void _tnl_flush_vtx( GLcontext *ctx );
+
+extern void _tnl_do_EvalCoord2f( GLcontext* ctx, GLfloat u, GLfloat v );
+extern void _tnl_do_EvalCoord1f(GLcontext* ctx, GLfloat u);
+extern void _tnl_update_eval( GLcontext *ctx );
+
+extern GLboolean *_tnl_translate_edgeflag( GLcontext *ctx, 
+					   const GLfloat *data, 
+					   GLuint count,
+					   GLuint stride );
+
+extern GLboolean *_tnl_import_current_edgeflag( GLcontext *ctx,
+						GLuint count );
+
+#endif
diff --git a/reactos/lib/mesa32/src/tnl/t_vtx_eval.c b/reactos/lib/mesa32/src/tnl/t_vtx_eval.c
new file mode 100644
index 00000000000..0878827cd97
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl/t_vtx_eval.c
@@ -0,0 +1,253 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+#include "glheader.h"
+#include "api_eval.h"
+#include "context.h"
+#include "macros.h"
+#include "math/m_eval.h"
+#include "t_vtx_api.h"
+
+
+static void clear_active_eval1( TNLcontext *tnl, GLuint attr ) 
+{
+   tnl->vtx.eval.map1[attr].map = 0;
+}
+
+static void clear_active_eval2( TNLcontext *tnl, GLuint attr ) 
+{
+   tnl->vtx.eval.map2[attr].map = 0;
+}
+
+static void set_active_eval1( TNLcontext *tnl, GLuint attr, GLuint dim, 
+			      struct gl_1d_map *map )
+{
+   if (!tnl->vtx.eval.map1[attr].map) {
+      tnl->vtx.eval.map1[attr].map = map;
+      tnl->vtx.eval.map1[attr].sz = dim;
+   }
+} 
+
+static void set_active_eval2( TNLcontext *tnl, GLuint attr, GLuint dim, 
+			      struct gl_2d_map *map )
+{
+   if (!tnl->vtx.eval.map2[attr].map) {
+      tnl->vtx.eval.map2[attr].map = map;
+      tnl->vtx.eval.map2[attr].sz = dim;
+   }
+} 
+
+void _tnl_update_eval( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   GLuint attr;
+
+   /* Vertex program maps have priority over conventional attribs */
+
+   for (attr = 0; attr < VERT_ATTRIB_MAX; attr++) {
+      clear_active_eval1( tnl, attr );
+      clear_active_eval2( tnl, attr );
+   }
+
+   if (ctx->VertexProgram.Enabled) {
+      for (attr = 0; attr < VERT_ATTRIB_MAX; attr++) {
+	 if (ctx->Eval.Map1Attrib[attr]) 
+	    set_active_eval1( tnl, attr, 4, &ctx->EvalMap.Map1Attrib[attr] );
+
+	 if (ctx->Eval.Map2Attrib[attr]) 
+	    set_active_eval2( tnl, attr, 4, &ctx->EvalMap.Map2Attrib[attr] );
+      }
+   }
+
+   if (ctx->Eval.Map1Color4) 
+      set_active_eval1( tnl, VERT_ATTRIB_COLOR0, 4, &ctx->EvalMap.Map1Color4 );
+      
+   if (ctx->Eval.Map2Color4) 
+      set_active_eval2( tnl, VERT_ATTRIB_COLOR0, 4, &ctx->EvalMap.Map2Color4 );
+
+   if (ctx->Eval.Map1TextureCoord4) 
+      set_active_eval1( tnl, VERT_ATTRIB_TEX0, 4, &ctx->EvalMap.Map1Texture4 );
+   else if (ctx->Eval.Map1TextureCoord3) 
+      set_active_eval1( tnl, VERT_ATTRIB_TEX0, 3, &ctx->EvalMap.Map1Texture3 );
+   else if (ctx->Eval.Map1TextureCoord2) 
+      set_active_eval1( tnl, VERT_ATTRIB_TEX0, 2, &ctx->EvalMap.Map1Texture2 );
+   else if (ctx->Eval.Map1TextureCoord1) 
+      set_active_eval1( tnl, VERT_ATTRIB_TEX0, 1, &ctx->EvalMap.Map1Texture1 );
+
+   if (ctx->Eval.Map2TextureCoord4) 
+      set_active_eval2( tnl, VERT_ATTRIB_TEX0, 4, &ctx->EvalMap.Map2Texture4 );
+   else if (ctx->Eval.Map2TextureCoord3) 
+      set_active_eval2( tnl, VERT_ATTRIB_TEX0, 3, &ctx->EvalMap.Map2Texture3 );
+   else if (ctx->Eval.Map2TextureCoord2) 
+      set_active_eval2( tnl, VERT_ATTRIB_TEX0, 2, &ctx->EvalMap.Map2Texture2 );
+   else if (ctx->Eval.Map2TextureCoord1) 
+      set_active_eval2( tnl, VERT_ATTRIB_TEX0, 1, &ctx->EvalMap.Map2Texture1 );
+
+   if (ctx->Eval.Map1Normal) 
+      set_active_eval1( tnl, VERT_ATTRIB_NORMAL, 3, &ctx->EvalMap.Map1Normal );
+
+   if (ctx->Eval.Map2Normal) 
+      set_active_eval2( tnl, VERT_ATTRIB_NORMAL, 3, &ctx->EvalMap.Map2Normal );
+
+   if (ctx->Eval.Map1Vertex4) 
+      set_active_eval1( tnl, VERT_ATTRIB_POS, 4, &ctx->EvalMap.Map1Vertex4 );
+   else if (ctx->Eval.Map1Vertex3) 
+      set_active_eval1( tnl, VERT_ATTRIB_POS, 3, &ctx->EvalMap.Map1Vertex3 );
+
+   if (ctx->Eval.Map2Vertex4) 
+      set_active_eval2( tnl, VERT_ATTRIB_POS, 4, &ctx->EvalMap.Map2Vertex4 );
+   else if (ctx->Eval.Map2Vertex3) 
+      set_active_eval2( tnl, VERT_ATTRIB_POS, 3, &ctx->EvalMap.Map2Vertex3 );
+
+   tnl->vtx.eval.new_state = 0;
+}
+
+
+
+void _tnl_do_EvalCoord1f(GLcontext* ctx, GLfloat u)
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   GLuint attr;
+
+   for (attr = 1; attr <= _TNL_ATTRIB_INDEX; attr++) {
+      struct gl_1d_map *map = tnl->vtx.eval.map1[attr].map;
+      if (map) {
+	 GLfloat uu = (u - map->u1) * map->du;
+	 GLfloat data[4];
+
+	 ASSIGN_4V(data, 0, 0, 0, 1);
+
+	 _math_horner_bezier_curve(map->Points, data, uu, 
+				   tnl->vtx.eval.map1[attr].sz, 
+				   map->Order);
+
+	 COPY_SZ_4V( tnl->vtx.attrptr[attr],
+		     tnl->vtx.attrsz[attr],
+		     data );
+      }
+   }
+
+   /** Vertex -- EvalCoord1f is a noop if this map not enabled:
+    **/
+   if (tnl->vtx.eval.map1[0].map) {
+      struct gl_1d_map *map = tnl->vtx.eval.map1[0].map;
+      GLfloat uu = (u - map->u1) * map->du;
+      GLfloat vertex[4];
+
+      ASSIGN_4V(vertex, 0, 0, 0, 1);
+
+      _math_horner_bezier_curve(map->Points, vertex, uu, 
+				tnl->vtx.eval.map1[0].sz, 
+				map->Order);
+
+      if (tnl->vtx.eval.map1[0].sz == 4) 
+	 glVertex4fv( vertex );
+      else
+	 glVertex3fv( vertex ); 
+   }
+}
+
+
+
+void _tnl_do_EvalCoord2f( GLcontext* ctx, GLfloat u, GLfloat v )
+{   
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   GLuint attr;
+
+   for (attr = 1; attr <= _TNL_ATTRIB_INDEX; attr++) {
+      struct gl_2d_map *map = tnl->vtx.eval.map2[attr].map;
+      if (map) {
+	 GLfloat uu = (u - map->u1) * map->du;
+	 GLfloat vv = (v - map->v1) * map->dv;
+	 GLfloat data[4];
+
+	 ASSIGN_4V(data, 0, 0, 0, 1);
+
+	 _math_horner_bezier_surf(map->Points, 
+				  data, 
+				  uu, vv, 
+				  tnl->vtx.eval.map2[attr].sz, 
+				  map->Uorder, map->Vorder);
+
+	 COPY_SZ_4V( tnl->vtx.attrptr[attr],
+		     tnl->vtx.attrsz[attr],
+		     data );
+      }
+   }
+
+   /** Vertex -- EvalCoord2f is a noop if this map not enabled:
+    **/
+   if (tnl->vtx.eval.map2[0].map) {
+      struct gl_2d_map *map = tnl->vtx.eval.map2[0].map;
+      GLfloat uu = (u - map->u1) * map->du;
+      GLfloat vv = (v - map->v1) * map->dv;
+      GLfloat vertex[4];
+
+      ASSIGN_4V(vertex, 0, 0, 0, 1);
+
+      if (ctx->Eval.AutoNormal) {
+	 GLfloat normal[4];
+         GLfloat du[4], dv[4];
+
+         _math_de_casteljau_surf(map->Points, vertex, du, dv, uu, vv, 
+				 tnl->vtx.eval.map2[0].sz,
+				 map->Uorder, map->Vorder);
+
+	 if (tnl->vtx.eval.map2[0].sz == 4) {
+	    du[0] = du[0]*vertex[3] - du[3]*vertex[0];
+	    du[1] = du[1]*vertex[3] - du[3]*vertex[1];
+	    du[2] = du[2]*vertex[3] - du[3]*vertex[2];
+	 
+	    dv[0] = dv[0]*vertex[3] - dv[3]*vertex[0];
+	    dv[1] = dv[1]*vertex[3] - dv[3]*vertex[1];
+	    dv[2] = dv[2]*vertex[3] - dv[3]*vertex[2];
+	 }
+
+
+         CROSS3(normal, du, dv);
+         NORMALIZE_3FV(normal);
+	 normal[3] = 1.0;
+
+	 COPY_SZ_4V( tnl->vtx.attrptr[_TNL_ATTRIB_NORMAL],
+		     tnl->vtx.attrsz[_TNL_ATTRIB_NORMAL],
+		     normal );
+
+      }
+      else {
+         _math_horner_bezier_surf(map->Points, vertex, uu, vv, 
+				  tnl->vtx.eval.map2[0].sz,
+				  map->Uorder, map->Vorder);
+      }
+
+      if (tnl->vtx.attrsz[0] == 4) 
+	 glVertex4fv( vertex );
+      else
+	 glVertex3fv( vertex ); 
+   }
+}
+
+
diff --git a/reactos/lib/mesa32/src/tnl/t_vtx_exec.c b/reactos/lib/mesa32/src/tnl/t_vtx_exec.c
new file mode 100644
index 00000000000..4a36ed917f9
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl/t_vtx_exec.c
@@ -0,0 +1,289 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+#include "glheader.h"
+#include "api_eval.h"
+#include "context.h"
+#include "enums.h"
+#include "state.h"
+#include "macros.h"
+#include "math/m_eval.h"
+#include "t_vtx_api.h"
+#include "t_pipeline.h"
+
+
+static void _tnl_print_vtx( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   GLuint count = tnl->vtx.initial_counter - tnl->vtx.counter;
+   GLuint i;
+
+   _mesa_debug(ctx, "_tnl_print_vtx: %u vertices %d primitives, %d vertsize\n",
+               count,
+	       tnl->vtx.prim_count,
+	       tnl->vtx.vertex_size);
+
+   for (i = 0 ; i < tnl->vtx.prim_count ; i++) {
+      struct tnl_prim *prim = &tnl->vtx.prim[i];
+      _mesa_debug(0, "   prim %d: %s %d..%d %s %s\n",
+		  i, 
+		  _mesa_lookup_enum_by_nr(prim->mode & PRIM_MODE_MASK),
+		  prim->start, 
+		  prim->start + prim->count,
+		  (prim->mode & PRIM_BEGIN) ? "BEGIN" : "(wrap)",
+		  (prim->mode & PRIM_END) ? "END" : "(wrap)");
+   }
+}
+
+GLboolean *_tnl_translate_edgeflag( GLcontext *ctx, const GLfloat *data,
+				    GLuint count, GLuint stride )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   GLboolean *ef = tnl->vtx.edgeflag_tmp;
+   GLuint i;
+
+   if (!ef) 
+      ef = tnl->vtx.edgeflag_tmp = (GLboolean *) MALLOC( tnl->vb.Size );
+   
+   for (i = 0 ; i < count ; i++, data += stride)
+      ef[i] = (data[0] == 1.0);
+
+   return ef;
+}
+
+
+GLboolean *_tnl_import_current_edgeflag( GLcontext *ctx,
+					 GLuint count )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   GLboolean *ef = tnl->vtx.edgeflag_tmp;
+   GLboolean tmp = ctx->Current.EdgeFlag;
+   GLuint i;
+
+   if (!ef) 
+      ef = tnl->vtx.edgeflag_tmp = (GLboolean *) MALLOC( tnl->vb.Size );
+
+   for (i = 0 ; i < count ; i++)
+      ef[i] = tmp;
+
+   return ef;
+}
+
+static GLint get_size( const GLfloat *f )
+{
+   if (f[3] != 1.0) return 4;
+   if (f[2] != 0.0) return 3;
+   return 2;
+}
+
+/* Some nasty stuff still hanging on here.  
+ *
+ * TODO - remove VB->NormalPtr, etc and just use the AttrPtr's.
+ */
+static void _tnl_vb_bind_vtx( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct vertex_buffer *VB = &tnl->vb;
+   struct tnl_vertex_arrays *tmp = &tnl->vtx_inputs;
+   GLfloat *data = tnl->vtx.buffer;
+   GLuint count = tnl->vtx.initial_counter - tnl->vtx.counter;
+   GLuint attr, i;
+
+   if (0) fprintf(stderr, "_tnl_vb_bind_vtx(): %d verts %d vertsize\n",
+		  count, tnl->vtx.vertex_size);
+
+
+   /* Setup constant data in the VB.
+    */
+   VB->Count = count;
+   VB->Primitive = tnl->vtx.prim;
+   VB->PrimitiveCount = tnl->vtx.prim_count;
+   VB->Elts = NULL;
+   VB->NormalLengthPtr = NULL;
+
+   for (attr = 0; attr <= _TNL_ATTRIB_INDEX ; attr++) {
+      if (tnl->vtx.attrsz[attr]) {
+	 tmp->Attribs[attr].count = count;
+	 tmp->Attribs[attr].data = (GLfloat (*)[4]) data;
+	 tmp->Attribs[attr].start = data;
+	 tmp->Attribs[attr].size = tnl->vtx.attrsz[attr];
+	 tmp->Attribs[attr].stride = tnl->vtx.vertex_size * sizeof(GLfloat);
+	 VB->AttribPtr[attr] = &tmp->Attribs[attr];
+	 data += tnl->vtx.attrsz[attr];
+      }
+      else {
+/* 	 VB->AttribPtr[attr] = &tnl->current.Attribs[attr]; */
+
+
+	 tmp->Attribs[attr].count = count;
+	 tmp->Attribs[attr].data = (GLfloat (*)[4]) tnl->vtx.current[attr];
+	 tmp->Attribs[attr].start = tnl->vtx.current[attr];
+	 tmp->Attribs[attr].size = get_size( tnl->vtx.current[attr] );
+	 tmp->Attribs[attr].stride = 0;
+	 VB->AttribPtr[attr] = &tmp->Attribs[attr];
+      }
+   }
+
+   
+   /* Copy and translate EdgeFlag to a contiguous array of GLbooleans
+    */
+   if (ctx->Polygon.FrontMode != GL_FILL || ctx->Polygon.BackMode != GL_FILL) {
+      if (tnl->vtx.attrsz[_TNL_ATTRIB_EDGEFLAG]) {
+	 VB->EdgeFlag = _tnl_translate_edgeflag( ctx, data, count,
+						 tnl->vtx.vertex_size );
+	 data++;
+      }
+      else 
+	 VB->EdgeFlag = _tnl_import_current_edgeflag( ctx, count );
+   }
+
+   /* Legacy pointers -- remove one day.
+    */
+   VB->ObjPtr = VB->AttribPtr[_TNL_ATTRIB_POS];
+   VB->NormalPtr = VB->AttribPtr[_TNL_ATTRIB_NORMAL];
+   VB->ColorPtr[0] = VB->AttribPtr[_TNL_ATTRIB_COLOR0];
+   VB->ColorPtr[1] = 0;
+   VB->IndexPtr[0] = VB->AttribPtr[_TNL_ATTRIB_INDEX];
+   VB->IndexPtr[1] = 0;
+   VB->SecondaryColorPtr[0] = VB->AttribPtr[_TNL_ATTRIB_COLOR1];
+   VB->SecondaryColorPtr[1] = 0;
+   VB->FogCoordPtr = VB->AttribPtr[_TNL_ATTRIB_FOG];
+
+   for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) {
+      VB->TexCoordPtr[i] = VB->AttribPtr[_TNL_ATTRIB_TEX0 + i];
+   }
+}
+
+
+/*
+ * NOTE: Need to have calculated primitives by this point -- do it on the fly.
+ * NOTE: Old 'parity' issue is gone.
+ */
+static GLuint _tnl_copy_vertices( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT( ctx );
+   GLuint nr = tnl->vtx.prim[tnl->vtx.prim_count-1].count;
+   GLuint ovf, i;
+   GLuint sz = tnl->vtx.vertex_size;
+   GLfloat *dst = tnl->vtx.copied.buffer;
+   GLfloat *src = (tnl->vtx.buffer + 
+		   tnl->vtx.prim[tnl->vtx.prim_count-1].start * 
+		   tnl->vtx.vertex_size);
+
+
+   switch( ctx->Driver.CurrentExecPrimitive )
+   {
+   case GL_POINTS:
+      return 0;
+   case GL_LINES:
+      ovf = nr&1;
+      for (i = 0 ; i < ovf ; i++)
+	 _mesa_memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz * sizeof(GLfloat) );
+      return i;
+   case GL_TRIANGLES:
+      ovf = nr%3;
+      for (i = 0 ; i < ovf ; i++)
+	 _mesa_memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz * sizeof(GLfloat) );
+      return i;
+   case GL_QUADS:
+      ovf = nr&3;
+      for (i = 0 ; i < ovf ; i++)
+	 _mesa_memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz * sizeof(GLfloat) );
+      return i;
+   case GL_LINE_STRIP:
+      if (nr == 0) 
+	 return 0;
+      else {
+	 _mesa_memcpy( dst, src+(nr-1)*sz, sz * sizeof(GLfloat) );
+	 return 1;
+      }
+   case GL_LINE_LOOP:
+   case GL_TRIANGLE_FAN:
+   case GL_POLYGON:
+      if (nr == 0) 
+	 return 0;
+      else if (nr == 1) {
+	 _mesa_memcpy( dst, src+0, sz * sizeof(GLfloat) );
+	 return 1;
+      } else {
+	 _mesa_memcpy( dst, src+0, sz * sizeof(GLfloat) );
+	 _mesa_memcpy( dst+sz, src+(nr-1)*sz, sz * sizeof(GLfloat) );
+	 return 2;
+      }
+   case GL_TRIANGLE_STRIP:
+   case GL_QUAD_STRIP:
+      switch (nr) {
+      case 0: ovf = 0; break;
+      case 1: ovf = 1; break;
+      default: ovf = 2 + (nr&1); break;
+      }
+      for (i = 0 ; i < ovf ; i++)
+	 _mesa_memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz * sizeof(GLfloat) );
+      return i;
+   case GL_POLYGON+1:
+      return 0;
+   default:
+      assert(0);
+      return 0;
+   }
+}
+
+
+/**
+ * Execute the buffer and save copied verts.
+ */
+void _tnl_flush_vtx( GLcontext *ctx )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+
+   if (0)
+      _tnl_print_vtx( ctx );
+
+   if (tnl->vtx.prim_count && 
+       tnl->vtx.counter != tnl->vtx.initial_counter) {
+
+      tnl->vtx.copied.nr = _tnl_copy_vertices( ctx ); 
+
+      if (ctx->NewState)
+	 _mesa_update_state( ctx );
+      
+      if (tnl->pipeline.build_state_changes)
+	 _tnl_validate_pipeline( ctx );
+
+      _tnl_vb_bind_vtx( ctx );
+
+      /* Invalidate all stored data before and after run:
+       */
+      tnl->pipeline.run_input_changes |= tnl->pipeline.inputs;
+      tnl->Driver.RunPipeline( ctx );
+      tnl->pipeline.run_input_changes |= tnl->pipeline.inputs;
+   }
+
+   tnl->vtx.prim_count = 0;
+   tnl->vtx.counter = tnl->vtx.initial_counter;
+   tnl->vtx.vbptr = tnl->vtx.buffer;
+}
diff --git a/reactos/lib/mesa32/src/tnl/tnl.dsp b/reactos/lib/mesa32/src/tnl/tnl.dsp
new file mode 100644
index 00000000000..3e291339af1
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl/tnl.dsp
@@ -0,0 +1,212 @@
+# Microsoft Developer Studio Project File - Name="tnl" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=tnl - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "tnl.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "tnl.mak" CFG="tnl - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "tnl - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "tnl - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "tnl - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "../../../include" /I "../" /I "../main" /I "../glapi" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "tnl - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../" /I "../main" /I "../glapi" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "tnl - Win32 Release"
+# Name "tnl - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\t_array_api.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\t_array_import.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\t_context.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\t_pipeline.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\t_save_api.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\t_save_loopback.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\t_save_playback.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\t_vb_fog.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\t_vb_light.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\t_vb_normals.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\t_vb_points.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\t_vb_program.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\t_vb_render.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\t_vb_texgen.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\t_vb_texmat.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\t_vb_vertex.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\t_vertex.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\t_vtx_api.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\t_vtx_eval.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\t_vtx_exec.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\t_array_api.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\t_array_import.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\t_context.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\t_pipeline.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\t_save_api.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\t_vb_cliptmp.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\t_vb_lighttmp.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\t_vb_rendertmp.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\t_vtx_api.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\tnl.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/reactos/lib/mesa32/src/tnl/tnl.h b/reactos/lib/mesa32/src/tnl/tnl.h
new file mode 100644
index 00000000000..9a2241d8fce
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl/tnl.h
@@ -0,0 +1,78 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+#ifndef _TNL_H
+#define _TNL_H
+
+#include "mtypes.h"
+
+
+
+/* These are the public-access functions exported from tnl.  (A few
+ * more are currently hooked into dispatch directly by the module
+ * itself.)
+ */
+extern GLboolean
+_tnl_CreateContext( GLcontext *ctx );
+
+extern void
+_tnl_DestroyContext( GLcontext *ctx );
+
+extern void
+_tnl_InvalidateState( GLcontext *ctx, GLuint new_state );
+
+/* Functions to revive the tnl module after being unhooked from
+ * dispatch and/or driver callbacks.
+ */
+
+/* Restore just the ctx->Exec table:
+ */
+extern void
+_tnl_wakeup_exec( GLcontext *ctx );
+
+/* Restore both ctx->Exec and ctx->Save:
+ */
+extern void
+_tnl_wakeup_save_exec( GLcontext *ctx );
+
+/* Driver configuration options:
+ */
+extern void
+_tnl_need_projected_coords( GLcontext *ctx, GLboolean flag );
+
+extern void
+_tnl_need_dlist_loopback( GLcontext *ctx, GLboolean flag );
+
+extern void
+_tnl_need_dlist_norm_lengths( GLcontext *ctx, GLboolean flag );
+
+extern void
+_tnl_isolate_materials( GLcontext *ctx, GLboolean flag );
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/tnl_dd/imm/NOTES.imm b/reactos/lib/mesa32/src/tnl_dd/imm/NOTES.imm
new file mode 100644
index 00000000000..9b2bd65e4bf
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl_dd/imm/NOTES.imm
@@ -0,0 +1,112 @@
+
+NOTE:
+
+These files are incomplete.  They do not yet form a working
+implementation of hte concepts discused below.
+
+
+OVERVIEW
+
+The t_dd_imm_* files form a set of templates to produce driver -
+specific software tnl modules for a small subset of transformation and
+lighting states.
+
+The approach is quite different to the large vertex buffers of the
+src/tnl module, and is based around a cache of four recent vertices
+and a 'current' vertex which is updated directly from the Color,
+Normal, Texcoord, SecondaryColor and Fog entrypoints.
+
+The current vertex is actually a composite of the ctx->Current values
+and a partial hardware vertex maintained where the hardware values
+differ from those in ctx->Current.  For example, clamped color values
+are kept in the hardware vertex, while texcoords remain in
+ctx->Current.
+
+A crude diagram:
+
+       		+--------------+	+-------------------+
+		| ctx->Current |	| Current-HW-vertex |
+		+--------------+	+-------------------+
+		       \       	       	       	  /
+		       	\      			 /
+			 \     			/
+			  \    		       /
+			   ---------   --------
+			       	   |   |      
+			       	   v   v     
+	+--------+   +--------+  +--------+  +--------+ 
+	| vert-0 |   | vert-1 |  | vert-2 |  | vert-3 |		       	 
+	+--------+   +--------+  +--------+  +--------+		       	 
+				     |
+				     |
+				     v
+				     
+				    DMA
+
+
+Here values from ctx->Current and current-HW-vertex are merged to
+build vert-2, which is then dumped to hardware (DMA).  A state machine
+determines which vertex is built in turn, and how the vertices are
+used to present primitives to hardware.  These actions all occur
+during a call to Vertex{234}f{v}.
+
+Each vert-n includes clip coordinates and a clipmask in addition to
+the hardware (window) coordinates.  This information allows clipping
+to take place directly on these vertices, if need be.
+
+t_dd_imm_capi.h
+	
+	Color{34}{fub}{v}() implementations.  These update both
+	ctx->Current (unclamped float colors) and current-HW-vertex
+	with hardware-specific color values (typically unsigned
+	bytes).
+
+	When lighting is enabled, the functions from src/api_noop.c
+	should be used, which just update ctx->Current.  (The
+	current-hw-vertex colors are produced from lighting, which is
+	keyed to Normal3f).
+
+t_dd_imm_vb.c
+
+	Support functions for clipping and fallback.  See
+	t_dd_imm_primtmp.h.
+
+t_dd_imm_napi.c
+t_dd_imm_napi.h
+
+	Versions of Normal3f{v} to perform lighting with one or more
+	infinite lights.  Updates ctx->Current.Normal and the current
+	HW colors.
+
+	When lighting is disabled, use the functions from api_noop.c
+	instead.
+
+
+t_dd_imm_primtmp.h
+
+	State machine to control emission of vertices and primitives
+	to hardware.  Called indirectly from Vertex{234}f{v}.  Capable
+	of supporting hardware strip and fan primitives, and of
+	decomposing to discreet primitives for clipping or fallback,
+	or where the native primitive is unavailable.
+
+t_dd_imm_tapi.h
+
+	Implementations of TexCoord{v} and MultiTexCoord4f{v}ARB to
+	fire a callback when transitioning to projective texture.
+	Most drivers will need to change vertex format at this point,
+	some may need to enable a software rasterization fallback.
+
+t_dd_imm_vapi.h
+
+	Implementations of Vertex{234}f{v}.  These perform
+	transformation and cliptesting on their arguments, then jump
+	into the state machine implemented in primtmp.h.
+
+t_dd_imm_vertex.h
+
+	Support functions for building and clip-interpolating hardware
+	vertices.  Called from primtmp.h.
+
+
+Keith Whitwell, June 2001.
\ No newline at end of file
diff --git a/reactos/lib/mesa32/src/tnl_dd/imm/t_dd_imm_capi.h b/reactos/lib/mesa32/src/tnl_dd/imm/t_dd_imm_capi.h
new file mode 100644
index 00000000000..77f3a4ab497
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl_dd/imm/t_dd_imm_capi.h
@@ -0,0 +1,419 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+/* Template for immediate mode color functions.
+ *
+ * FIXME: Floating-point color versions of these...
+ */
+
+
+static void TAG(Color3f)( GLfloat r, GLfloat g, GLfloat b )
+{
+   GET_CURRENT;
+#ifdef COLOR_IS_FLOAT
+   CURRENT_COLOR( RCOMP ) = CLAMP(r, 0.0f, 1.0f);
+   CURRENT_COLOR( GCOMP ) = CLAMP(g, 0.0f, 1.0f);
+   CURRENT_COLOR( BCOMP ) = CLAMP(b, 0.0f, 1.0f);
+   CURRENT_COLOR( ACOMP ) = 1.0f;
+#else
+   UNCLAMPED_FLOAT_TO_UBYTE( CURRENT_COLOR( RCOMP ), r );
+   UNCLAMPED_FLOAT_TO_UBYTE( CURRENT_COLOR( GCOMP ), g );
+   UNCLAMPED_FLOAT_TO_UBYTE( CURRENT_COLOR( BCOMP ), b );
+   CURRENT_COLOR( ACOMP ) = 255;
+#endif
+}
+
+static void TAG(Color3fv)( const GLfloat *v )
+{
+   GET_CURRENT;
+#ifdef COLOR_IS_FLOAT
+   CURRENT_COLOR( RCOMP ) = CLAMP(v[0], 0.0f, 1.0f);
+   CURRENT_COLOR( GCOMP ) = CLAMP(v[1], 0.0f, 1.0f);
+   CURRENT_COLOR( BCOMP ) = CLAMP(v[2], 0.0f, 1.0f);
+   CURRENT_COLOR( ACOMP ) = 1.0f;
+#else
+   UNCLAMPED_FLOAT_TO_UBYTE( CURRENT_COLOR( RCOMP ), v[0] );
+   UNCLAMPED_FLOAT_TO_UBYTE( CURRENT_COLOR( GCOMP ), v[1] );
+   UNCLAMPED_FLOAT_TO_UBYTE( CURRENT_COLOR( BCOMP ), v[2] );
+   CURRENT_COLOR( ACOMP ) = 255;
+#endif
+}
+
+static void TAG(Color3ub)( GLubyte r, GLubyte g, GLubyte b )
+{
+   GET_CURRENT;
+#ifdef COLOR_IS_FLOAT
+   CURRENT_COLOR( RCOMP ) = UBYTE_TO_FLOAT( r );
+   CURRENT_COLOR( GCOMP ) = UBYTE_TO_FLOAT( g );
+   CURRENT_COLOR( BCOMP ) = UBYTE_TO_FLOAT( b );
+   CURRENT_COLOR( ACOMP ) = 1.0f;
+#else
+   CURRENT_COLOR( RCOMP ) = r;
+   CURRENT_COLOR( GCOMP ) = g;
+   CURRENT_COLOR( BCOMP ) = b;
+   CURRENT_COLOR( ACOMP ) = 255;
+#endif
+}
+
+static void TAG(Color3ubv)( const GLubyte *v )
+{
+   GET_CURRENT;
+#ifdef COLOR_IS_FLOAT
+   CURRENT_COLOR( RCOMP ) = UBYTE_TO_FLOAT( v[0] );
+   CURRENT_COLOR( GCOMP ) = UBYTE_TO_FLOAT( v[1] );
+   CURRENT_COLOR( BCOMP ) = UBYTE_TO_FLOAT( v[2] );
+   CURRENT_COLOR( ACOMP ) = 1.0f;
+#else
+   CURRENT_COLOR( RCOMP ) = v[0];
+   CURRENT_COLOR( GCOMP ) = v[1];
+   CURRENT_COLOR( BCOMP ) = v[2];
+   CURRENT_COLOR( ACOMP ) = 255;
+#endif
+}
+
+static void TAG(Color4f)( GLfloat r, GLfloat g, GLfloat b, GLfloat a )
+{
+   GET_CURRENT;
+#ifdef COLOR_IS_FLOAT
+   CURRENT_COLOR( RCOMP ) = CLAMP(r, 0.0f, 1.0f);
+   CURRENT_COLOR( GCOMP ) = CLAMP(g, 0.0f, 1.0f);
+   CURRENT_COLOR( BCOMP ) = CLAMP(b, 0.0f, 1.0f);
+   CURRENT_COLOR( ACOMP ) = CLAMP(a, 0.0f, 1.0f);
+#else
+   UNCLAMPED_FLOAT_TO_UBYTE( CURRENT_COLOR( RCOMP ), r );
+   UNCLAMPED_FLOAT_TO_UBYTE( CURRENT_COLOR( GCOMP ), g );
+   UNCLAMPED_FLOAT_TO_UBYTE( CURRENT_COLOR( BCOMP ), b );
+   UNCLAMPED_FLOAT_TO_UBYTE( CURRENT_COLOR( ACOMP ), a );
+#endif
+}
+
+static void TAG(Color4fv)( const GLfloat *v )
+{
+   GET_CURRENT;
+#ifdef COLOR_IS_FLOAT
+   CURRENT_COLOR( RCOMP ) = CLAMP(v[0], 0.0f, 1.0f);
+   CURRENT_COLOR( GCOMP ) = CLAMP(v[1], 0.0f, 1.0f);
+   CURRENT_COLOR( BCOMP ) = CLAMP(v[2], 0.0f, 1.0f);
+   CURRENT_COLOR( ACOMP ) = CLAMP(v[3], 0.0f, 1.0f);
+#else
+   UNCLAMPED_FLOAT_TO_UBYTE( CURRENT_COLOR( RCOMP ), v[0] );
+   UNCLAMPED_FLOAT_TO_UBYTE( CURRENT_COLOR( GCOMP ), v[1] );
+   UNCLAMPED_FLOAT_TO_UBYTE( CURRENT_COLOR( BCOMP ), v[2] );
+   UNCLAMPED_FLOAT_TO_UBYTE( CURRENT_COLOR( ACOMP ), v[3] );
+#endif
+}
+
+static void TAG(Color4ub)( GLubyte r, GLubyte g, GLubyte b, GLubyte a )
+{
+   GET_CURRENT;
+#ifdef COLOR_IS_FLOAT
+   CURRENT_COLOR( RCOMP ) = UBYTE_TO_FLOAT( r );
+   CURRENT_COLOR( GCOMP ) = UBYTE_TO_FLOAT( g );
+   CURRENT_COLOR( BCOMP ) = UBYTE_TO_FLOAT( b );
+   CURRENT_COLOR( ACOMP ) = UBYTE_TO_FLOAT( a );
+#else
+   CURRENT_COLOR( RCOMP ) = r;
+   CURRENT_COLOR( GCOMP ) = g;
+   CURRENT_COLOR( BCOMP ) = b;
+   CURRENT_COLOR( ACOMP ) = a;
+#endif
+}
+
+static void TAG(Color4ubv)( const GLubyte *v )
+{
+   GET_CURRENT;
+#ifdef COLOR_IS_FLOAT
+   CURRENT_COLOR( RCOMP ) = UBYTE_TO_FLOAT( v[0] );
+   CURRENT_COLOR( GCOMP ) = UBYTE_TO_FLOAT( v[1] );
+   CURRENT_COLOR( BCOMP ) = UBYTE_TO_FLOAT( v[2] );
+   CURRENT_COLOR( ACOMP ) = UBYTE_TO_FLOAT( v[3] );
+#else
+   CURRENT_COLOR( RCOMP ) = v[0];
+   CURRENT_COLOR( GCOMP ) = v[1];
+   CURRENT_COLOR( BCOMP ) = v[2];
+   CURRENT_COLOR( ACOMP ) = v[3];
+#endif
+}
+
+
+static void TAG(ColorMaterial3f)( GLfloat r, GLfloat g, GLfloat b )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat *color = ctx->Current.Color;
+
+   color[0] = r;
+   color[1] = g;
+   color[2] = b;
+   color[3] = 1.0;
+
+   _mesa_update_color_material( ctx, color );
+   RECALC_BASE_COLOR( ctx );
+}
+
+static void TAG(ColorMaterial3fv)( const GLfloat *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat *color = ctx->Current.Color;
+
+   color[0] = v[0];
+   color[1] = v[1];
+   color[2] = v[2];
+   color[3] = 1.0;
+
+   _mesa_update_color_material( ctx, color );
+   RECALC_BASE_COLOR( ctx );
+}
+
+static void TAG(ColorMaterial3ub)( GLubyte r, GLubyte g, GLubyte b )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat *color = ctx->Current.Color;
+
+   color[0] = UBYTE_TO_FLOAT( r );
+   color[1] = UBYTE_TO_FLOAT( g );
+   color[2] = UBYTE_TO_FLOAT( b );
+   color[3] = 1.0;
+
+   _mesa_update_color_material( ctx, color );
+   RECALC_BASE_COLOR( ctx );
+}
+
+static void TAG(ColorMaterial3ubv)( const GLubyte *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat *color = ctx->Current.Color;
+
+   color[0] = UBYTE_TO_FLOAT( v[0] );
+   color[1] = UBYTE_TO_FLOAT( v[1] );
+   color[2] = UBYTE_TO_FLOAT( v[2] );
+   color[3] = 1.0;
+
+   _mesa_update_color_material( ctx, color );
+   RECALC_BASE_COLOR( ctx );
+}
+
+static void TAG(ColorMaterial4f)( GLfloat r, GLfloat g, GLfloat b, GLfloat a )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat *color = ctx->Current.Color;
+
+   color[0] = r;
+   color[1] = g;
+   color[2] = b;
+   color[3] = a;
+
+   _mesa_update_color_material( ctx, color );
+   RECALC_BASE_COLOR( ctx );
+}
+
+static void TAG(ColorMaterial4fv)( const GLfloat *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat *color = ctx->Current.Color;
+
+   color[0] = v[0];
+   color[1] = v[1];
+   color[2] = v[2];
+   color[3] = v[3];
+
+   _mesa_update_color_material( ctx, color );
+   RECALC_BASE_COLOR( ctx );
+}
+
+static void TAG(ColorMaterial4ub)( GLubyte r, GLubyte g, GLubyte b, GLubyte a )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat *color = ctx->Current.Color;
+
+   color[0] = UBYTE_TO_FLOAT( r );
+   color[1] = UBYTE_TO_FLOAT( g );
+   color[2] = UBYTE_TO_FLOAT( b );
+   color[3] = UBYTE_TO_FLOAT( a );
+
+   _mesa_update_color_material( ctx, color );
+   RECALC_BASE_COLOR( ctx );
+}
+
+static void TAG(ColorMaterial4ubv)( const GLubyte *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLfloat *color = ctx->Current.Color;
+
+   color[0] = UBYTE_TO_FLOAT( v[0] );
+   color[1] = UBYTE_TO_FLOAT( v[1] );
+   color[2] = UBYTE_TO_FLOAT( v[2] );
+   color[3] = UBYTE_TO_FLOAT( v[3] );
+
+   _mesa_update_color_material( ctx, color );
+   RECALC_BASE_COLOR( ctx );
+}
+
+
+
+
+
+/* =============================================================
+ * Color chooser functions:
+ */
+
+static void TAG(choose_Color3f)( GLfloat r, GLfloat g, GLfloat b )
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   if ( ctx->Light.Enabled ) {
+      if ( ctx->Light.ColorMaterialEnabled ) {
+	 ctx->Exec->Color3f = TAG(ColorMaterial3f);
+      } else {
+	 ctx->Exec->Color3f = _mesa_noop_Color3f;
+      }
+   } else {
+      ctx->Exec->Color3f = TAG(Color3f);
+   }
+   glColor3f( r, g, b );
+}
+
+static void TAG(choose_Color3fv)( const GLfloat *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   if ( ctx->Light.Enabled ) {
+      if ( ctx->Light.ColorMaterialEnabled ) {
+	 ctx->Exec->Color3fv = TAG(ColorMaterial3fv);
+      } else {
+	 ctx->Exec->Color3fv = _mesa_noop_Color3fv;
+      }
+   } else {
+      ctx->Exec->Color3fv = TAG(Color3fv);
+   }
+   glColor3fv( v );
+}
+
+static void TAG(choose_Color3ub)( GLubyte r, GLubyte g, GLubyte b )
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   if ( ctx->Light.Enabled ) {
+      if ( ctx->Light.ColorMaterialEnabled ) {
+	 ctx->Exec->Color3ub = TAG(ColorMaterial3ub);
+      } else {
+	 ctx->Exec->Color3ub = _mesa_noop_Color3ub;
+      }
+   } else {
+      ctx->Exec->Color3ub = TAG(Color3ub);
+   }
+   glColor3ub( r, g, b );
+}
+
+static void TAG(choose_Color3ubv)( const GLubyte *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   if ( ctx->Light.Enabled ) {
+      if ( ctx->Light.ColorMaterialEnabled ) {
+	 ctx->Exec->Color3ubv = TAG(ColorMaterial3ubv);
+      } else {
+	 ctx->Exec->Color3ubv = _mesa_noop_Color3ubv;
+      }
+   } else {
+      ctx->Exec->Color3ubv = TAG(Color3ubv);
+   }
+   glColor3ubv( v );
+}
+
+static void TAG(choose_Color4f)( GLfloat r, GLfloat g, GLfloat b, GLfloat a )
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   if ( ctx->Light.Enabled ) {
+      if ( ctx->Light.ColorMaterialEnabled ) {
+	 ctx->Exec->Color4f = TAG(ColorMaterial4f);
+      } else {
+	 ctx->Exec->Color4f = _mesa_noop_Color4f;
+      }
+   } else {
+      ctx->Exec->Color4f = TAG(Color4f);
+   }
+   glColor4f( r, g, b, a );
+}
+
+static void TAG(choose_Color4fv)( const GLfloat *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   if ( ctx->Light.Enabled ) {
+      if ( ctx->Light.ColorMaterialEnabled ) {
+	 ctx->Exec->Color4fv = TAG(ColorMaterial4fv);
+      } else {
+	 ctx->Exec->Color4fv = _mesa_noop_Color4fv;
+      }
+   } else {
+      ctx->Exec->Color4fv = TAG(Color4fv);
+   }
+   glColor4fv( v );
+}
+
+static void TAG(choose_Color4ub)( GLubyte r, GLubyte g, GLubyte b, GLubyte a )
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   if ( ctx->Light.Enabled ) {
+      if ( ctx->Light.ColorMaterialEnabled ) {
+	 ctx->Exec->Color4ub = TAG(ColorMaterial4ub);
+      } else {
+	 ctx->Exec->Color4ub = _mesa_noop_Color4ub;
+      }
+   } else {
+      ctx->Exec->Color4ub = TAG(Color4ub);
+   }
+   glColor4ub( r, g, b, a );
+}
+
+static void TAG(choose_Color4ubv)( const GLubyte *v )
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   if ( ctx->Light.Enabled ) {
+      if ( ctx->Light.ColorMaterialEnabled ) {
+	 ctx->Exec->Color4ubv = TAG(ColorMaterial4ubv);
+      } else {
+	 ctx->Exec->Color4ubv = _mesa_noop_Color4ubv;
+      }
+   } else {
+      ctx->Exec->Color4ubv = TAG(Color4ubv);
+   }
+   glColor4ubv( v );
+}
+
+
+
+#undef GET_CURRENT
+#undef CURRENT_COLOR
+#undef CURRENT_SPECULAR
+#undef COLOR_IS_FLOAT
+#undef RECALC_BASE_COLOR
+#undef TAG
diff --git a/reactos/lib/mesa32/src/tnl_dd/imm/t_dd_imm_napi.h b/reactos/lib/mesa32/src/tnl_dd/imm/t_dd_imm_napi.h
new file mode 100644
index 00000000000..9844f615ffe
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl_dd/imm/t_dd_imm_napi.h
@@ -0,0 +1,226 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Gareth Hughes <gareth@valinux.com>
+ *    Keith Whitwell <keith_whitwell@yahoo.com>
+ */
+
+/* Template for immediate mode normal functions.  Optimize for infinite
+ * lights when doing software lighting.
+ */
+
+static void TAG(Normal3f_single)( GLfloat x, GLfloat y, GLfloat z )
+{
+   GET_CURRENT_VERTEX;
+   const struct gl_light *light = ctx->Light.EnabledList.prev;
+   GLfloat n_dot_h, n_dot_VP, spec, sum[3];
+   GLfloat *normal = ctx->Current.Normal;
+   GLfloat scale = 1.0;
+
+   ASSIGN_3V( normal, x, y, z );
+   COPY_3V( sum, BASE_COLOR );
+
+   if ( IND & NORM_RESCALE ) {
+      scale = ctx->_ModelViewInvScale;
+   } else if ( IND & NORM_NORMALIZE ) {
+      scale = LEN_3FV( normal );
+      if ( scale != 0.0 ) scale = 1.0 / scale;
+   }
+
+   n_dot_VP = DOT3( normal, light->_VP_inf_norm ) * scale;
+   if ( n_dot_VP > 0.0F ) {
+      ACC_SCALE_SCALAR_3V( sum, n_dot_VP, light->_MatDiffuse[0] );
+      n_dot_h = DOT3( normal, light->_h_inf_norm ) * scale;
+      if ( n_dot_h > 0.0F ) {
+	 GET_SHINE_TAB_ENTRY( ctx->_ShineTable[0], n_dot_h, spec );
+	 ACC_SCALE_SCALAR_3V( sum, spec, light->_MatSpecular[0] );
+      }
+   }
+
+#ifdef LIT_COLOR_IS_FLOAT
+   LIT_COLOR ( RCOMP ) = CLAMP(sum[0], 0.0f, 0.1f);
+   LIT_COLOR ( GCOMP ) = CLAMP(sum[1], 0.0f, 0.1f);
+   LIT_COLOR ( BCOMP ) = CLAMP(sum[2], 0.0f, 0.1f);
+#else
+   UNCLAMPED_FLOAT_TO_UBYTE( LIT_COLOR( RCOMP ), sum[0] );
+   UNCLAMPED_FLOAT_TO_UBYTE( LIT_COLOR( GCOMP ), sum[1] );
+   UNCLAMPED_FLOAT_TO_UBYTE( LIT_COLOR( BCOMP ), sum[2] );
+#endif
+   LIT_COLOR( ACOMP ) = LIT_ALPHA;
+}
+
+static void TAG(Normal3fv_single)( const GLfloat *normal )
+{
+   GET_CURRENT_VERTEX;
+   const struct gl_light *light = ctx->Light.EnabledList.prev;
+   GLfloat n_dot_h, n_dot_VP, spec, sum[3];
+   GLfloat scale = 1.0;
+
+   COPY_3V( ctx->Current.Normal, normal );
+   COPY_3V( sum, BASE_COLOR );
+
+   if ( IND & NORM_RESCALE ) {
+      scale = ctx->_ModelViewInvScale;
+   } else if ( IND & NORM_NORMALIZE ) {
+      scale = LEN_3FV( normal );
+      if ( scale != 0.0 ) scale = 1.0 / scale;
+   }
+
+   n_dot_VP = DOT3( normal, light->_VP_inf_norm ) * scale;
+   if ( n_dot_VP > 0.0F ) {
+      ACC_SCALE_SCALAR_3V( sum, n_dot_VP, light->_MatDiffuse[0] );
+      n_dot_h = DOT3( normal, light->_h_inf_norm ) * scale;
+      if ( n_dot_h > 0.0F ) {
+	 GET_SHINE_TAB_ENTRY( ctx->_ShineTable[0], n_dot_h, spec );
+	 ACC_SCALE_SCALAR_3V( sum, spec, light->_MatSpecular[0] );
+      }
+   }
+
+#ifdef LIT_COLOR_IS_FLOAT
+   LIT_COLOR ( RCOMP ) = CLAMP(sum[0], 0.0f, 0.1f);
+   LIT_COLOR ( GCOMP ) = CLAMP(sum[1], 0.0f, 0.1f);
+   LIT_COLOR ( BCOMP ) = CLAMP(sum[2], 0.0f, 0.1f);
+#else
+   UNCLAMPED_FLOAT_TO_UBYTE( LIT_COLOR( RCOMP ), sum[0] );
+   UNCLAMPED_FLOAT_TO_UBYTE( LIT_COLOR( GCOMP ), sum[1] );
+   UNCLAMPED_FLOAT_TO_UBYTE( LIT_COLOR( BCOMP ), sum[2] );
+#endif
+   LIT_COLOR( ACOMP ) = LIT_ALPHA;
+}
+
+
+static void TAG(Normal3f_multi)( GLfloat x, GLfloat y, GLfloat z )
+{
+   GET_CURRENT_VERTEX;
+   struct gl_light *light;
+   GLfloat n_dot_h, n_dot_VP, spec, sum[3], tmp[3];
+   GLfloat *normal;
+
+   ASSIGN_3V( ctx->Current.Normal, x, y, z );
+   COPY_3V( sum, BASE_COLOR );
+
+   if ( IND & NORM_RESCALE ) {
+      normal = tmp;
+      ASSIGN_3V( normal, x, y, z );
+      SELF_SCALE_SCALAR_3V( normal, ctx->_ModelViewInvScale );
+   } else if ( IND & NORM_NORMALIZE ) {
+      normal = tmp;
+      ASSIGN_3V( normal, x, y, z );
+      NORMALIZE_3FV( normal );
+   } else {
+      normal = ctx->Current.Normal;
+   }
+
+   foreach ( light, &ctx->Light.EnabledList ) {
+      n_dot_VP = DOT3( normal, light->_VP_inf_norm );
+      if ( n_dot_VP > 0.0F ) {
+	 ACC_SCALE_SCALAR_3V( sum, n_dot_VP, light->_MatDiffuse[0] );
+	 n_dot_h = DOT3( normal, light->_h_inf_norm );
+	 if ( n_dot_h > 0.0F ) {
+	    GET_SHINE_TAB_ENTRY( ctx->_ShineTable[0], n_dot_h, spec );
+	    ACC_SCALE_SCALAR_3V( sum, spec, light->_MatSpecular[0] );
+	 }
+      }
+   }
+
+#ifdef LIT_COLOR_IS_FLOAT
+   LIT_COLOR ( RCOMP ) = CLAMP(sum[0], 0.0f, 0.1f);
+   LIT_COLOR ( GCOMP ) = CLAMP(sum[1], 0.0f, 0.1f);
+   LIT_COLOR ( BCOMP ) = CLAMP(sum[2], 0.0f, 0.1f);
+#else
+   UNCLAMPED_FLOAT_TO_UBYTE( LIT_COLOR( RCOMP ), sum[0] );
+   UNCLAMPED_FLOAT_TO_UBYTE( LIT_COLOR( GCOMP ), sum[1] );
+   UNCLAMPED_FLOAT_TO_UBYTE( LIT_COLOR( BCOMP ), sum[2] );
+#endif
+   LIT_COLOR( ACOMP ) = LIT_ALPHA;
+}
+
+static void TAG(Normal3fv_multi)( const GLfloat *n )
+{
+   GET_CURRENT_VERTEX;
+   struct gl_light *light;
+   GLfloat n_dot_h, n_dot_VP, spec, sum[3], tmp[3];
+   GLfloat *normal;
+
+   COPY_3V( ctx->Current.Normal, n );
+   COPY_3V( sum, BASE_COLOR );
+
+   if ( IND & NORM_RESCALE ) {
+      normal = tmp;
+      COPY_3V( normal, n );
+      SELF_SCALE_SCALAR_3V( normal, ctx->_ModelViewInvScale );
+   } else if ( IND & NORM_NORMALIZE ) {
+      normal = tmp;
+      COPY_3V( normal, n );
+      NORMALIZE_3FV( normal );
+   } else {
+      normal = ctx->Current.Normal;
+   }
+
+   foreach ( light, &ctx->Light.EnabledList ) {
+      n_dot_VP = DOT3( normal, light->_VP_inf_norm );
+      if ( n_dot_VP > 0.0F ) {
+	 ACC_SCALE_SCALAR_3V( sum, n_dot_VP, light->_MatDiffuse[0] );
+	 n_dot_h = DOT3( normal, light->_h_inf_norm );
+	 if ( n_dot_h > 0.0F ) {
+	    GET_SHINE_TAB_ENTRY( ctx->_ShineTable[0], n_dot_h, spec );
+	    ACC_SCALE_SCALAR_3V( sum, spec, light->_MatSpecular[0] );
+	 }
+      }
+   }
+
+#ifdef LIT_COLOR_IS_FLOAT
+   LIT_COLOR ( RCOMP ) = CLAMP(sum[0], 0.0f, 0.1f);
+   LIT_COLOR ( GCOMP ) = CLAMP(sum[1], 0.0f, 0.1f);
+   LIT_COLOR ( BCOMP ) = CLAMP(sum[2], 0.0f, 0.1f);
+#else
+   UNCLAMPED_FLOAT_TO_UBYTE( LIT_COLOR( RCOMP ), sum[0] );
+   UNCLAMPED_FLOAT_TO_UBYTE( LIT_COLOR( GCOMP ), sum[1] );
+   UNCLAMPED_FLOAT_TO_UBYTE( LIT_COLOR( BCOMP ), sum[2] );
+#endif
+   LIT_COLOR( ACOMP ) = LIT_ALPHA;
+}
+
+
+
+static void TAG(init_norm)( void )
+{
+   norm_tab[IND].normal3f_single = TAG(Normal3f_single);
+   norm_tab[IND].normal3fv_single = TAG(Normal3fv_single);
+   norm_tab[IND].normal3f_multi = TAG(Normal3f_multi);
+   norm_tab[IND].normal3fv_multi = TAG(Normal3fv_multi);
+}
+
+
+
+#ifndef PRESERVE_NORMAL_DEFS
+#undef GET_CURRENT
+#undef GET_CURRENT_VERTEX
+#undef LIT_COLOR
+#undef LIT_COLOR_IS_FLOAT
+#endif
+#undef PRESERVE_NORMAL_DEFS
+#undef IND
+#undef TAG
diff --git a/reactos/lib/mesa32/src/tnl_dd/imm/t_dd_imm_primtmp.h b/reactos/lib/mesa32/src/tnl_dd/imm/t_dd_imm_primtmp.h
new file mode 100644
index 00000000000..97dca3fd421
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl_dd/imm/t_dd_imm_primtmp.h
@@ -0,0 +1,570 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keithw@valinux.com>
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+/* Template for immediate mode vertices. 
+ *
+ * Probably instantiate once for each vertex format used:
+ *   - TINY_VERTICES
+ *   - TEX0_VERTICES
+ *   - TEX1_VERTICES
+ *   - PTEX_VERTICES
+ *
+ * Have to handle TEX->PTEX transition somehow.
+ */
+
+#define DBG 0
+
+
+
+/* =============================================================
+ * GL_POINTS
+ */
+
+static void TAG(flush_point_0)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   if ( !v0->mask ) {
+      LOCAL_VARS;
+      DRAW_POINT( v0 );
+   }
+}
+
+
+/* =============================================================
+ * GL_LINES
+ */
+
+static void TAG(flush_line_1)( GLcontext *ctx, TNL_VERTEX *v0 );
+
+static void TAG(flush_line_0)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+   FLUSH_VERTEX = TAG(flush_line_1);
+   ACTIVE_VERTEX = IMM_VERTICES( 1 );
+}
+
+static void TAG(flush_line_1)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+   TNL_VERTEX *v1 = v0 - 1;
+   ACTIVE_VERTEX = IMM_VERTICES( 0 );
+   FLUSH_VERTEX = TAG(flush_line_0);
+   if (FALLBACK_OR_CLIPPING) 
+      CLIP_OR_DRAW_LINE( ctx, v1, v0 ); 
+   else
+      DRAW_LINE( ctx, v1, v0 ); 
+}
+
+
+/* =============================================================
+ * GL_LINE_LOOP
+ */
+
+static void TAG(flush_line_loop_2)( GLcontext *ctx, TNL_VERTEX *v0 );
+static void TAG(flush_line_loop_1)( GLcontext *ctx, TNL_VERTEX *v0 );
+
+static void TAG(flush_line_loop_0)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+
+   ACTIVE_VERTEX = v0 + 1;
+   FLUSH_VERTEX = TAG(flush_line_loop_1);
+}
+
+#define DRAW_LINELOOP_LINE( a, b )			\
+   if (!HAVE_LINE_STRIP || FALLBACK_OR_CLIPPING) {	\
+      CLIP_OR_DRAW_LINE( ctx, a, b );			\
+   } else if (EXTEND_PRIM( 1 )) {			\
+      EMIT_VERTEX( b );					\
+   } else {						\
+      BEGIN_PRIM( GL_LINE_STRIP, 2 ); 			\
+      EMIT_VERTEX( a );					\
+      EMIT_VERTEX( b );      				\
+   }
+
+static void TAG(flush_line_loop_1)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+   TNL_VERTEX *v1 = v0 - 1;
+   ACTIVE_VERTEX = v1;
+   FLUSH_VERTEX = TAG(flush_line_loop_2);
+   DRAW_LINELOOP_LINE( v1, v0 );
+}
+
+static void TAG(flush_line_loop_2)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+   TNL_VERTEX *v1 = v0 + 1;
+   ACTIVE_VERTEX = v1;
+   FLUSH_VERTEX = TAG(flush_line_loop_1);
+   DRAW_LINELOOP_LINE( v1, v0 );
+}
+
+static void TAG(end_line_loop)( GLcontext *ctx )
+{
+   LOCAL_VARS;
+
+   if ( FLUSH_VERTEX != TAG(flush_line_loop_0) ) {
+      TNL_VERTEX *v1 = ACTIVE_VERTEX;
+      TNL_VERTEX *v0 = IMM_VERTICES( 0 );
+      DRAW_LINELOOP_LINE( v1, v0 );
+   }
+}
+
+
+
+/* =============================================================
+ * GL_LINE_STRIP
+ */
+
+static void TAG(flush_line_strip_2)( GLcontext *ctx, TNL_VERTEX *v0 );
+static void TAG(flush_line_strip_1)( GLcontext *ctx, TNL_VERTEX *v0 );
+
+static void TAG(flush_line_strip_0)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+
+   ACTIVE_VERTEX = v0 + 1;
+   FLUSH_VERTEX = TAG(flush_line_strip_0b);
+}
+
+
+static void TAG(flush_line_strip_1)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+   TNL_VERTEX *v1 = v0 - 1;
+
+   ACTIVE_VERTEX = v1;
+   FLUSH_VERTEX = TAG(flush_line_strip_2);
+
+   if (!HAVE_LINE_STRIP || FALLBACK_OR_CLIPPING)
+      CLIP_OR_DRAW_LINE( ctx, v1, v0 );
+   else if (EXTEND_PRIM( 1 )) {
+      EMIT_VERTEX( v0 );
+   } else {
+      BEGIN_PRIM( GL_LINE_STRIP, 2 ); 
+      EMIT_VERTEX( v1 );
+      EMIT_VERTEX( v0 );      
+   }      
+}
+
+static void TAG(flush_line_strip_2)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+   TNL_VERTEX *v1 = v0 + 1;
+
+   ACTIVE_VERTEX = v1;
+   FLUSH_VERTEX = TAG(flush_line_strip_1);
+
+   if (!HAVE_LINE_STRIP || FALLBACK_OR_CLIPPING)
+      CLIP_OR_DRAW_LINE( ctx, v1, v0 );
+   else if (EXTEND_PRIM( 1 )) {
+      EMIT_VERTEX( v0 );
+   } else {
+      BEGIN_PRIM( GL_LINE_STRIP, 2 ); 
+      EMIT_VERTEX( v1 );
+      EMIT_VERTEX( v0 );      
+   }      
+}
+
+
+
+/* =============================================================
+ * GL_TRIANGLES
+ */
+
+static void TAG(flush_triangle_2)( GLcontext *ctx, TNL_VERTEX *v0 );
+static void TAG(flush_triangle_1)( GLcontext *ctx, TNL_VERTEX *v0 );
+
+static void TAG(flush_triangle_0)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+
+   if ( DBG ) fprintf( stderr, __FUNCTION__ "\n" );
+
+   ACTIVE_VERTEX = v0 + 1;
+   FLUSH_VERTEX = TAG(flush_triangle_1);
+   BEGIN_PRIM( GL_TRIANGLES, 0 );
+}
+
+static void TAG(flush_triangle_1)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+
+   if ( DBG ) fprintf( stderr, __FUNCTION__ "\n" );
+
+   ACTIVE_VERTEX = v0 + 1;
+   FLUSH_VERTEX = TAG(flush_triangle_2);
+}
+
+static void TAG(flush_triangle_2)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+   TNL_VERTEX *v2 = v0 - 2;
+   TNL_VERTEX *v1 = v0 - 1;
+
+   if ( DBG ) fprintf( stderr, __FUNCTION__ "\n" );
+
+   ACTIVE_VERTEX = v2;
+   FLUSH_VERTEX = TAG(flush_triangle_0);
+
+   /* nothing gained by trying to emit as hw primitives -- that
+    * happens normally in this case.  
+    */
+   if (FALLBACK_OR_CLIPPING)
+      CLIP_OR_DRAW_TRI( ctx, v2, v1, v0 );
+   else
+      DRAW_TRI( ctx, v2, v1, v0 );
+}
+
+
+
+
+/* =============================================================
+ * GL_TRIANGLE_STRIP
+ */
+
+static void TAG(flush_tri_strip_3)( GLcontext *ctx, TNL_VERTEX *v0 );
+static void TAG(flush_tri_strip_2)( GLcontext *ctx, TNL_VERTEX *v0 );
+static void TAG(flush_tri_strip_1)( GLcontext *ctx, TNL_VERTEX *v0 );
+
+static void TAG(flush_tri_strip_0)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+   ACTIVE_VERTEX = IMM_VERTICES( 1 );
+   FLUSH_VERTEX = TAG(flush_tri_strip_1);
+}
+
+static void TAG(flush_tri_strip_1)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+   ACTIVE_VERTEX = IMM_VERTICES( 2 );
+   FLUSH_VERTEX = TAG(flush_tri_strip_2);
+}
+
+#define DO_TRISTRIP_TRI( vert0, vert1 )				\
+   if (!HAVE_TRI_STRIP || FALLBACK_OR_CLIPPING) {	\
+      TNL_VERTEX *v2 = IMM_VERTICES( vert0 );			\
+      TNL_VERTEX *v1 = IMM_VERTICES( vert1 );			\
+      TAG(draw_tri)( ctx, v2, v1, v0 );				\
+   } else if (EXTEND_PRIM( 1 )) {				\
+      EMIT_VERTEX( v0 );					\
+   } else {							\
+      TNL_VERTEX *v2 = IMM_VERTICES( vert0 );			\
+      TNL_VERTEX *v1 = IMM_VERTICES( vert1 );			\
+      BEGIN_PRIM( GL_TRIANGLE_STRIP, 3 ); 			\
+      EMIT_VERTEX( v2 );					\
+      EMIT_VERTEX( v1 );      					\
+      EMIT_VERTEX( v0 );      					\
+   }      
+
+static void TAG(flush_tri_strip_2)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+   FLUSH_VERTEX = TAG(flush_tri_strip_3);
+   ACTIVE_VERTEX = IMM_VERTICES( 3 );
+   DO_TRISTRIP_TRI( 0, 1 );
+}
+
+static void TAG(flush_tri_strip_3)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+   FLUSH_VERTEX = TAG(flush_tri_strip_4);
+   ACTIVE_VERTEX = IMM_VERTICES( 0 );
+   DO_TRISTRIP_TRI( 1, 2 );
+}
+
+static void TAG(flush_tri_strip_4)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+   FLUSH_VERTEX = TAG(flush_tri_strip_5);
+   ACTIVE_VERTEX = IMM_VERTICES( 1 );
+   DO_TRISTRIP_TRI( 2, 3 );
+}
+
+static void TAG(flush_tri_strip_5)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+   FLUSH_VERTEX = TAG(flush_tri_strip_2);
+   ACTIVE_VERTEX = IMM_VERTICES( 2 );
+   DO_TRISTRIP_TRI( 0, 3 );
+}
+
+
+
+/* =============================================================
+ * GL_TRIANGLE_FAN
+ */
+
+static void TAG(flush_tri_fan_2)( GLcontext *ctx, TNL_VERTEX *v0 );
+static void TAG(flush_tri_fan_1)( GLcontext *ctx, TNL_VERTEX *v0 );
+
+static void TAG(flush_tri_fan_0)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+
+   ACTIVE_VERTEX = v0 + 1;
+   FLUSH_VERTEX = TAG(flush_tri_fan_1);
+}
+
+static void TAG(flush_tri_fan_1)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+
+   ACTIVE_VERTEX = v0 + 1;
+   FLUSH_VERTEX = TAG(flush_tri_fan_2);
+}
+
+#define DO_TRIFAN_TRI( vert0, vert1 )				\
+   if (!HAVE_TRI_FAN || FALLBACK_OR_CLIPPING) {	\
+      TNL_VERTEX *v2 = IMM_VERTICES( vert0 );			\
+      TNL_VERTEX *v1 = IMM_VERTICES( vert1 );			\
+      TAG(draw_tri)( ctx, v2, v1, v0 );				\
+   } else if (EXTEND_PRIM( 1 )) {				\
+      EMIT_VERTEX( v0 );					\
+   } else {							\
+      TNL_VERTEX *v2 = IMM_VERTICES( vert0 );			\
+      TNL_VERTEX *v1 = IMM_VERTICES( vert1 );			\
+      BEGIN_PRIM( GL_TRIANGLE_FAN, 3 ); 			\
+      EMIT_VERTEX( v2 );					\
+      EMIT_VERTEX( v1 );      					\
+      EMIT_VERTEX( v0 );      					\
+   }      
+
+static void TAG(flush_tri_fan_2)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+   ACTIVE_VERTEX = IMM_VERTICES( 1 );
+   FLUSH_VERTEX = TAG(flush_tri_fan_3 );
+   DO_TRIFAN_TRI( 0, 1 );
+}
+
+static void TAG(flush_tri_fan_3)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+   ACTIVE_VERTEX = IMM_VERTICES( 2 );
+   FLUSH_VERTEX = TAG(flush_tri_fan_2 );
+   DO_TRIFAN_TRI( 0, 2 );
+}
+
+
+
+/* =============================================================
+ * GL_QUADS
+ */
+
+static void TAG(flush_quad_3)( GLcontext *ctx, TNL_VERTEX *v0 );
+static void TAG(flush_quad_2)( GLcontext *ctx, TNL_VERTEX *v0 );
+static void TAG(flush_quad_1)( GLcontext *ctx, TNL_VERTEX *v0 );
+
+static void TAG(flush_quad_0)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+   IMM_VERTEX( v0 ) = v0 + 1;
+   FLUSH_VERTEX = TAG(flush_quad_1);
+}
+
+static void TAG(flush_quad_1)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+   IMM_VERTEX( v0 ) = v0 + 1;
+   FLUSH_VERTEX = TAG(flush_quad_2);
+}
+
+static void TAG(flush_quad_2)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+   IMM_VERTEX( v0 ) = v0 + 1;
+   FLUSH_VERTEX = TAG(flush_quad_3);
+}
+
+static void TAG(flush_quad_3)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+   TNL_VERTEX *v3 = v0 - 3;
+   TNL_VERTEX *v2 = v0 - 2;
+   TNL_VERTEX *v1 = v0 - 1;
+
+   IMM_VERTEX( v0 ) = v3;
+   FLUSH_VERTEX = TAG(flush_quad_0);
+
+   if (!HAVE_HW_QUADS || FALLBACK_OR_CLIPPING) {
+      CLIP_OR_DRAW_TRI( ctx, v3, v2, v0 );
+      CLIP_OR_DRAW_TRI( ctx, v2, v1, v0 );
+   } else {
+      EXTEND_PRIM_NF( GL_QUADS, 4 );
+      EMIT_VERTEX( v3 );
+      EMIT_VERTEX( v2 );
+      EMIT_VERTEX( v1 );      
+      EMIT_VERTEX( v0 );      
+   }
+}
+
+
+
+/* =============================================================
+ * GL_QUAD_STRIP
+ */
+
+static void TAG(flush_quad_strip_3)( GLcontext *ctx, TNL_VERTEX *v0 );
+static void TAG(flush_quad_strip_2)( GLcontext *ctx, TNL_VERTEX *v0 );
+static void TAG(flush_quad_strip_1)( GLcontext *ctx, TNL_VERTEX *v0 );
+
+static void TAG(flush_quad_strip_0)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+
+   IMM_VERTEX( v3 ) = v0;
+   IMM_VERTEX( v0 ) = v0 + 1;
+   FLUSH_VERTEX = TAG(flush_quad_strip_1);
+}
+
+static void TAG(flush_quad_strip_1)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+
+   IMM_VERTEX( v2 ) = v0;
+   IMM_VERTEX( v0 ) = v0 + 1;
+   FLUSH_VERTEX = TAG(flush_quad_strip_2);
+}
+
+static void TAG(flush_quad_strip_2)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+
+   IMM_VERTEX( v1 ) = v0;
+   IMM_VERTEX( v0 ) = v0 + 1;
+   FLUSH_VERTEX = TAG(flush_quad_strip_3);
+}
+
+static void TAG(flush_quad_strip_3)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+   TNL_VERTEX *v3 = IMM_VERTEX( v3 );
+   TNL_VERTEX *v2 = IMM_VERTEX( v2 );
+   TNL_VERTEX *v1 = IMM_VERTEX( v1 );
+
+   IMM_VERTEX( v0 ) = v3;
+   IMM_VERTEX( v2 ) = v0;
+   IMM_VERTEX( v3 ) = v1;
+   FLUSH_VERTEX = TAG(flush_quad_strip_2);
+
+   if (FALLBACK_OR_CLIPPING) {
+      CLIP_OR_DRAW_TRI( ctx, v3, v2, v0 );
+      CLIP_OR_DRAW_TRI( ctx, v2, v1, v0 );
+   } else {
+      DRAW_TRI( ctx, v3, v2, v0 );
+      DRAW_TRI( ctx, v2, v1, v0 );
+   }
+}
+
+
+
+/* =============================================================
+ * GL_POLYGON
+ */
+
+static void TAG(flush_poly_2)( GLcontext *ctx, TNL_VERTEX *v0 );
+static void TAG(flush_poly_1)( GLcontext *ctx, TNL_VERTEX *v0 );
+
+static void TAG(flush_poly_0)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+   ACTIVE_VERTEX = IMM_VERTICES( 1 );
+   FLUSH_VERTEX = TAG(flush_poly_1);
+}
+
+static void TAG(flush_poly_1)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+   ACTIVE_VERTEX = IMM_VERTICES( 2 );
+   FLUSH_VERTEX = TAG(flush_poly_2);
+}
+
+#define DO_POLY_TRI( vert0, vert1 )				\
+   if (!HAVE_POLYGONS || FALLBACK_OR_CLIPPING) {	\
+      TNL_VERTEX *v2 = IMM_VERTICES( vert0 );			\
+      TNL_VERTEX *v1 = IMM_VERTICES( vert1 );			\
+      TAG(draw_tri)( ctx, v1, v0, v2 );				\
+   } else if (EXTEND_PRIM( 1 )) {				\
+      EMIT_VERTEX( v0 );					\
+   } else {							\
+      TNL_VERTEX *v2 = IMM_VERTICES( vert0 );			\
+      TNL_VERTEX *v1 = IMM_VERTICES( vert1 );			\
+      BEGIN_PRIM( GL_POLYGON, 3 );				\
+      EMIT_VERTEX( v2 );					\
+      EMIT_VERTEX( v1 );					\
+      EMIT_VERTEX( v0 );					\
+   }      
+
+static void TAG(flush_poly_2)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+   ACTIVE_VERTEX = IMM_VERTICES( 1 );
+   FLUSH_VERTEX = TAG(flush_poly_3);
+   DO_POLY_TRI( 0, 1 );
+}
+
+static void TAG(flush_poly_3)( GLcontext *ctx, TNL_VERTEX *v0 )
+{
+   LOCAL_VARS;
+   ACTIVE_VERTEX = IMM_VERTICES( 2 );
+   FLUSH_VERTEX = TAG(flush_poly_2);
+   DO_POLY_TRI( 0, 2 );
+}
+
+
+void (*TAG(flush_tab)[GL_POLYGON+1])( GLcontext *, TNL_VERTEX * ) =
+{
+   TAG(flush_point),
+   TAG(flush_line_0),
+   TAG(flush_line_loop_0),
+   TAG(flush_line_strip_0),
+   TAG(flush_triangle_0),
+   TAG(flush_tri_strip_0),
+   TAG(flush_tri_fan_0),
+   TAG(flush_quad_0),
+   TAG(flush_quad_strip_0),
+   TAG(flush_poly_0),
+};
+
+
+#ifndef PRESERVE_PRIM_DEFS
+#undef LOCAL_VARS
+#undef GET_INTERP_FUNC
+#undef IMM_VERTEX
+#undef IMM_VERTICES
+#undef FLUSH_VERTEX
+#endif
+#undef PRESERVE_PRIM_DEFS
+#undef EXTEND_PRIM
+#undef EMIT_VERTEX
+#undef EMIT_VERTEX_TRI
+#undef EMIT_VERTEX_LINE
+#undef EMIT_VERTEX_POINT
+#undef TAG
diff --git a/reactos/lib/mesa32/src/tnl_dd/imm/t_dd_imm_tapi.h b/reactos/lib/mesa32/src/tnl_dd/imm/t_dd_imm_tapi.h
new file mode 100644
index 00000000000..b82a9abebff
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl_dd/imm/t_dd_imm_tapi.h
@@ -0,0 +1,75 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Gareth Hughes <gareth@valinux.com>
+ *    Keith Whitwell <keith_whitwell@yahoo.com>
+ */
+
+/* Template for immediate mode texture coordinate functions.
+ */
+
+#ifndef DO_PROJ_TEX
+#error "Need to define DO_PROJ_TEX"
+#endif
+
+
+/* =============================================================
+ * Notify on calls to texture4f, to allow switch to projected texture
+ * vertex format:
+ */
+
+static void TAG(TexCoord4f)( GLfloat s, GLfloat t, GLfloat r, GLfloat q )
+{
+   GET_CURRENT;
+   DO_PROJ_TEX;
+   TEXCOORD4( s, t, r, q );
+}
+
+static void TAG(TexCoord4fv)( const GLfloat *v )
+{
+   GET_CURRENT;
+   DO_PROJ_TEX;
+   TEXCOORD4( v[0], v[1], v[2], v[3] );
+}
+
+static void TAG(MultiTexCoord4fARB)( GLenum target, GLfloat s,
+				     GLfloat t, GLfloat r, GLfloat q )
+{
+   GET_CURRENT;
+   DO_PROJ_TEX;
+   MULTI_TEXCOORD4( unit, s, t, r, q );
+}
+
+static void TAG(MultiTexCoord4fvARB)( GLenum target, const GLfloat *v )
+{
+   GET_CURRENT;
+   DO_PROJ_TEX;
+   MULTI_TEXCOORD4( unit, v[0], v[1], v[2], v[3] );
+}
+
+
+
+#undef DO_PROJ_TEX
+#undef TAG
diff --git a/reactos/lib/mesa32/src/tnl_dd/imm/t_dd_imm_vapi.h b/reactos/lib/mesa32/src/tnl_dd/imm/t_dd_imm_vapi.h
new file mode 100644
index 00000000000..95e93b1c839
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl_dd/imm/t_dd_imm_vapi.h
@@ -0,0 +1,159 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Gareth Hughes <gareth@valinux.com>
+ *    Keith Whitwell <keithw@valinux.com>
+ */
+
+/* Template for immediate mode vertex functions.
+ */
+
+#define DBG 0
+
+#define VERTEX( ox, oy, oz, ow )
+do {
+   GET_CURRENT_VERTEX;
+   GLfloat w;
+   GLuint mask;
+   const GLfloat * const m = ctx->_ModelProjectMatrix.m;
+
+   if (DO_FULL_MATRIX) {
+      VERTEX_CLIP(0) = m[0] * ox + m[4] * oy + m[8]  * oz + m[12] * ow;
+      VERTEX_CLIP(1) = m[1] * ox + m[5] * oy + m[9]  * oz + m[13] * ow;
+      VERTEX_CLIP(2) = m[2] * ox + m[6] * oy + m[10] * oz + m[14] * ow;
+      VERTEX_CLIP(3) = m[3] * ox + m[7] * oy + m[11] * oz + m[15] * ow;
+      w = VERTEX_CLIP(3);
+   }
+   else if (DO_NOROT_MATRIX) {
+      VERTEX_CLIP(0) = m[0] * ox                          + m[12] * ow;
+      VERTEX_CLIP(1) =             m[5] * oy              + m[13] * ow;
+      VERTEX_CLIP(2) =                         m[10] * oz + m[14] * ow;
+      VERTEX_CLIP(3) =                                              ow;
+      w = ow;
+   } 
+   else {
+      ASSERT (DO_IDENTITY_MATRIX);
+      VERTEX_CLIP(0) = ox;
+      VERTEX_CLIP(1) = oy;
+      VERTEX_CLIP(2) = oz;
+      VERTEX_CLIP(3) = ow;
+      w = ow;
+   }
+
+   mask = 0;
+   if (DO_CLIP_TEST) {
+      if ( VERTEX_CLIP(0) >  w ) mask |= CLIP_RIGHT_BIT;
+      if ( VERTEX_CLIP(0) < -w ) mask |= CLIP_LEFT_BIT;
+      if ( VERTEX_CLIP(1) >  w ) mask |= CLIP_TOP_BIT;
+      if ( VERTEX_CLIP(1) < -w ) mask |= CLIP_BOTTOM_BIT;
+      if ( VERTEX_CLIP(2) >  w ) mask |= CLIP_FAR_BIT;
+      if ( VERTEX_CLIP(2) < -w ) mask |= CLIP_NEAR_BIT;
+      VERTEX_MASK(v) = mask;
+   }
+
+   if (!mask) {
+      if (HAVE_VERTEX_WIN) {
+	 if (!HAVE_HW_VIEWPORT) {
+	    const GLfloat *s = GET_VIEWPORT_MATRIX();
+	    if (HAVE_W && HAVE_HW_DIVIDE) {
+	       VERTEX_WIN( 0 ) = s[0]  * VERTEX_CLIP( 0 ) + s[12];
+	       VERTEX_WIN( 1 ) = s[5]  * VERTEX_CLIP( 1 ) + s[13];
+	       VERTEX_WIN( 2 ) = s[10] * VERTEX_CLIP( 2 ) + s[14];
+	       VERTEX_WIN( 3 ) = w;
+	    }
+	    else {
+	       const GLfloat oow = 1.0/w; /* possibly opt away */
+	       VERTEX_WIN( 0 ) = s[0]  * VERTEX_CLIP( 0 ) * oow + s[12];
+	       VERTEX_WIN( 1 ) = s[5]  * VERTEX_CLIP( 1 ) * oow + s[13];
+	       VERTEX_WIN( 2 ) = s[10] * VERTEX_CLIP( 2 ) * oow + s[14];
+	       if (HAVE_W)
+		  VERTEX_WIN( 3 ) = oow;
+	    }
+	 }
+	 else if (HAVE_W && HAVE_HW_DIVIDE) {
+	    if (!VERTEX_WIN_IS_VERTEX_CLIP) {
+	       VERTEX_WIN( 0 ) = VERTEX_CLIP( 0 );
+	       VERTEX_WIN( 1 ) = VERTEX_CLIP( 1 );
+	       VERTEX_WIN( 2 ) = VERTEX_CLIP( 2 );
+	       VERTEX_WIN( 3 ) = w;
+	    }
+	 }
+	 else {
+	    const GLfloat oow = 1.0/w; /* possibly opt away */
+	    VERTEX_WIN( 0 ) = VERTEX_CLIP( 0 ) * oow;
+	    VERTEX_WIN( 1 ) = VERTEX_CLIP( 1 ) * oow;
+	    VERTEX_WIN( 2 ) = VERTEX_CLIP( 2 ) * oow;
+	    if (HAVE_W)
+	       VERTEX_WIN( 3 ) = oow;
+	 }
+      }
+   } else if (!FALLBACK_OR_CLIPPING) {
+      SET_CLIPPING();		/* transition to clipping */
+   }
+
+   COPY_VERTEX_FROM_CURRENT;
+   BUILD_PRIM_FROM_VERTEX;
+}
+
+/* Let the compiler optimize away the constant operations:
+ */
+static void VTAG(Vertex2f)( GLfloat ox, GLfloat oy )
+{
+   /* Cliptest on clip[2] could also be eliminated...
+    */
+   VERTEX( ox, oy, 0, 1 );
+}
+
+static void VTAG(Vertex2fv)( const GLfloat *obj )
+{
+   /* Cliptest on clip[2] could also be eliminated...
+    */
+   VERTEX( obj[0], obj[1], 0, 1 );
+}
+
+static void VTAG(Vertex3f)( GLfloat ox, GLfloat oy, GLfloat oz )
+{
+   VERTEX( ox, oy, oz, 1 );
+}
+
+static void VTAG(Vertex3fv)( const GLfloat *obj )
+{
+   VERTEX( obj[0], obj[1], obj[2], 1 );
+}
+
+static void VTAG(Vertex4f)( GLfloat ox, GLfloat oy, GLfloat oz, GLfloat ow )
+{
+   VERTEX( ox, oy, oz, ow );
+}
+
+static void VTAG(Vertex4fv)( const GLfloat *obj )
+{
+   VERTEX( obj[0], obj[1], obj[2], obj[3] );
+}
+
+
+#undef DO_FULL_MATRIX
+#undef VTAG
+#undef VERTEX
diff --git a/reactos/lib/mesa32/src/tnl_dd/imm/t_dd_imm_vb.c b/reactos/lib/mesa32/src/tnl_dd/imm/t_dd_imm_vb.c
new file mode 100644
index 00000000000..0c4462f556f
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl_dd/imm/t_dd_imm_vb.c
@@ -0,0 +1,204 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith_whitwell@yahoo.com>
+ */
+
+/* Template to build clipping routines to support t_dd_imm_primtmp.h.
+ *
+ * The TAG(draw_line) and TAG(draw_triangle) routines are called in
+ * clipping and fallback scenarios, and when the native hardware
+ * primitive (eg polygons) is unavailable.
+ */
+
+
+#define CLIP_DOTPROD(K, A, B, C, D)		\
+   (CLIP_X(K)*A + CLIP_Y(K)*B + 	\
+    CLIP_Z(K)*C + CLIP_W(K)*D)
+
+#define POLY_CLIP( PLANE, A, B, C, D )					\
+do {									\
+   if (mask & PLANE) {							\
+      TNL_VERTEX **indata = inlist[in];					\
+      TNL_VERTEX **outdata = inlist[in ^= 1];				\
+      TNL_VERTEX *J = indata[0];					\
+      GLfloat dpJ = CLIP_DOTPROD(J, A, B, C, D );			\
+      GLuint outcount = 0;						\
+      GLuint i;								\
+									\
+      indata[n] = indata[0]; /* prevent rotation of vertices */		\
+      for (i = 1; i <= n; i++) {					\
+	 TNL_VERTEX *I = indata[i];					\
+	 GLfloat dpI = CLIP_DOTPROD(idx, A, B, C, D );			\
+									\
+	 if (!NEGATIVE(dpPrev)) {					\
+	    outdata[outcount++] = J;					\
+	 }								\
+									\
+	 if (DIFFERENT_SIGNS(dpI, dpJ)) {				\
+            TNL_VERTEX *O = verts++;					\
+            outdata[outcount++] = O;					\
+	    if (NEGATIVE(dpI)) {					\
+	       /* Going out of bounds.  Avoid division by zero as we	\
+		* know dp != dpPrev from DIFFERENT_SIGNS, above.	\
+		*/							\
+	       GLfloat t = dpI / (dpI - dpJ);				\
+      	       INTERP( ctx, t, O, I, J );				\
+	    } else {							\
+	       /* Coming back in.					\
+		*/							\
+	       GLfloat t = dpJ / (dpJ - dpI);				\
+	       INTERP( ctx, t, O, J, I );				\
+	    }								\
+	 }								\
+									\
+	 J = I;								\
+	 dpJ = dpI;							\
+      }									\
+									\
+      if (outcount < 3)							\
+	 return;							\
+									\
+      nr = outcount;							\
+   }									\
+} while (0)
+
+
+#define LINE_CLIP(PLANE, A, B, C, D )			\
+do {							\
+   if (mask & PLANE) {					\
+      GLfloat dpI = CLIP_DOTPROD( I, A, B, C, D );	\
+      GLfloat dpJ = CLIP_DOTPROD( J, A, B, C, D );	\
+							\
+      if (DIFFERENT_SIGNS(dpI, dpJ)) {			\
+         TNL_VERTEX *O = verts++;			\
+	 if (NEGATIVE(dpJ)) {				\
+	    GLfloat t = dpI / (dpI - dpJ);		\
+	    INTERP( ctx, t, O, I, J );	\
+            J = O;					\
+	 } else {					\
+  	    GLfloat t = dpJ / (dpJ - dpI);		\
+	    INTERP( ctx, t, O, J, I );	\
+            I = O;					\
+	 }						\
+      }							\
+      else if (NEGATIVE(dpI))				\
+	 return;					\
+  }							\
+} while (0)
+
+
+
+/* Clip a line against the viewport and user clip planes.
+ */
+static void TAG(clip_draw_line)( GLcontext *ctx,
+				 TNL_VERTEX *I,
+				 TNL_VERTEX *J,
+				 GLuint mask )
+{
+   LOCAL_VARS;
+   GET_INTERP_FUNC;
+   TNL_VERTEX tmp[MAX_CLIPPED_VERTICES];
+   TNL_VERTEX *verts = tmp;
+   TNL_VERTEX *pv = J;
+
+   LINE_CLIP( CLIP_RIGHT_BIT,  -1,  0,  0, 1 );
+   LINE_CLIP( CLIP_LEFT_BIT,    1,  0,  0, 1 );
+   LINE_CLIP( CLIP_TOP_BIT,     0, -1,  0, 1 );
+   LINE_CLIP( CLIP_BOTTOM_BIT,  0,  1,  0, 1 );
+   LINE_CLIP( CLIP_FAR_BIT,     0,  0, -1, 1 );
+   LINE_CLIP( CLIP_NEAR_BIT,    0,  0,  1, 1 );
+
+   if ((ctx->_TriangleCaps & DD_FLATSHADE) && J != pv)
+      COPY_PV( ctx, J, pv );
+
+   DRAW_LINE( I, J );
+}
+
+
+/* Clip a triangle against the viewport and user clip planes.
+ */
+static void TAG(clip_draw_triangle)( GLcontext *ctx,
+				     TNL_VERTEX *v0,
+				     TNL_VERTEX *v1,
+				     TNL_VERTEX *v2,
+				     GLuint mask )
+{
+   LOCAL_VARS;
+   GET_INTERP_FUNC;
+   TNL_VERTEX tmp[MAX_CLIPPED_VERTICES];
+   TNL_VERTEX *verts = tmp;
+   TNL_VERTEX *(inlist[2][MAX_CLIPPED_VERTICES]);
+   TNL_VERTEX **out;
+   GLuint in = 0;
+   GLuint n = 3;
+   GLuint i;
+
+   ASSIGN_3V(inlist, v2, v0, v1 ); /* pv rotated to slot zero */
+
+   POLY_CLIP( CLIP_RIGHT_BIT,  -1,  0,  0, 1 );
+   POLY_CLIP( CLIP_LEFT_BIT,    1,  0,  0, 1 );
+   POLY_CLIP( CLIP_TOP_BIT,     0, -1,  0, 1 );
+   POLY_CLIP( CLIP_BOTTOM_BIT,  0,  1,  0, 1 );
+   POLY_CLIP( CLIP_FAR_BIT,     0,  0, -1, 1 );
+   POLY_CLIP( CLIP_NEAR_BIT,    0,  0,  1, 1 );
+
+   if ((ctx->_TriangleCaps & DD_FLATSHADE) && v2 != inlist[0]) 
+      COPY_PV( ctx, inlist[0], v2 );
+
+   out = inlist[in];
+   DRAW_POLYGON( out, n );
+}
+
+
+static __inline void TAG(draw_triangle)( GLcontext *ctx,
+					 TNL_VERTEX *v0,
+					 TNL_VERTEX *v1,
+					 TNL_VERTEX *v2 )
+{
+   LOCAL_VARS;
+   GLubyte ormask = (v0->mask | v1->mask | v2->mask);
+
+   if ( !ormask ) {
+      DRAW_TRI( v0, v1, v2 );
+   } else if ( !(v0->mask & v1->mask & v2->mask) ) {
+      TAG(clip_draw_triangle)( ctx, v0, v1, v2, ormask );
+   }
+}
+
+static __inline void TAG(draw_line)( GLcontext *ctx,
+				     TNL_VERTEX *v0,
+				     TNL_VERTEX *v1 )
+{
+   LOCAL_VARS;
+   GLubyte ormask = (v0->mask | v1->mask);
+
+   if ( !ormask ) {
+      DRAW_LINE( v0, v1 );
+   } else if ( !(v0->mask & v1->mask) ) {
+      TAG(clip_draw_line)( ctx, v0, v1, ormask );
+   }
+}
+
diff --git a/reactos/lib/mesa32/src/tnl_dd/imm/t_dd_imm_vbtmp.h b/reactos/lib/mesa32/src/tnl_dd/imm/t_dd_imm_vbtmp.h
new file mode 100644
index 00000000000..2f76553cff9
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl_dd/imm/t_dd_imm_vbtmp.h
@@ -0,0 +1,268 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith_whitwell@yahoo.com>
+ */
+
+/* Template to build support for t_dd_imm_* tnl module using vertices
+ * as defined in t_dd_vertex.h.
+ *
+ * See t_dd_vbtmp.h for definitions of arguments to this file.
+ * Unfortunately it seems necessary to duplicate a lot of that code.
+ */
+
+#ifndef LOCALVARS
+#define LOCALVARS
+#endif
+
+
+
+/* COPY_VERTEX_FROM_CURRENT in t_dd_imm_vapi.c
+ */
+static void TAG(emit_vfmt)( GLcontext *ctx, VERTEX *v )
+{
+   LOCALVARS
+      ;
+
+   /* This template assumes (like t_dd_vbtmp.h) that color is ubyte.
+    */
+   if (DO_TEX0 || DO_TEX1 || !HAVE_TINY_VERTICES)
+   {
+      const GLubyte *col = GET_HARDWARE_COLOR();
+      if (HAVE_RGBA_COLOR) {
+	 v->v.ui[4] = *(GLuint *)&col;
+      } else {
+	 v->v.color.blue  = col[2];
+	 v->v.color.green = col[1];
+	 v->v.color.red   = col[0];
+	 v->v.color.alpha = col[3];
+      }
+   }
+   else {
+      if (HAVE_RGBA_COLOR) {
+	 v->v.ui[3] = *(GLuint *)col;
+      }
+      else {
+	 v->tv.color.blue  = col[2];
+	 v->tv.color.green = col[1];
+	 v->tv.color.red   = col[0];
+	 v->tv.color.alpha = col[3];
+      }
+   }
+
+   if (DO_TEX0) {
+      GLfloat *tc = ctx->Current.Texture[0];
+      v->v.u0 = tc[0];
+      v->v.v0 = tc[1];
+      if (DO_PTEX) {
+	 if (HAVE_PTEX_VERTICES) {
+	    v->pv.q0 = tc[3];
+	 } 
+	 else {
+	    float rhw = 1.0 / tc[3];
+	    v->v.w *= tc[3];
+	    v->v.u0 *= rhw;
+	    v->v.v0 *= rhw;
+	 } 
+      } 
+   }
+   if (DO_TEX1) {
+      GLfloat *tc = ctx->Current.Texture[1];
+      if (DO_PTEX) {
+	 v->pv.u1 = tc[0];
+	 v->pv.v1 = tc[1];
+	 v->pv.q1 = tc[3];
+      } 
+      else {
+	 v->v.u1 = tc[0];
+	 v->v.v1 = tc[1];
+      }
+   } 
+   else if (DO_PTEX) {
+      *(GLuint *)&v->pv.q1 = 0;	/* avoid culling on radeon */
+   }
+   if (DO_TEX2) {
+      GLfloat *tc = ctx->Current.Texture[2];
+      if (DO_PTEX) {
+	 v->pv.u2 = tc[0];
+	 v->pv.v2 = tc[1];
+	 v->pv.q2 = tc[3];
+      } 
+      else {
+	 v->v.u2 = tc[0];
+	 v->v.v2 = tc[1];
+      }
+   } 
+   if (DO_TEX3) {
+      GLfloat *tc = ctx->Current.Texture[3];
+      if (DO_PTEX) {
+	 v->pv.u3 = tc[0];
+	 v->pv.v3 = tc[1];
+	 v->pv.q3 = tc[3];
+      } 
+      else {
+	 v->v.u3 = tc[0];
+	 v->v.v3 = tc[1];
+      }
+   } 
+}
+
+
+
+
+static void TAG(interp)( GLcontext *ctx,
+			 GLfloat t,
+			 TNL_VERTEX *dst,
+			 TNL_VERTEX *in,
+			 TNL_VERTEX *out )
+{
+   LOCALVARS
+   const GLfloat *s = GET_VIEWPORT_MAT();
+   GLfloat w;
+
+   (void)s;
+
+   if (HAVE_HW_DIVIDE) {
+      VIEWPORT_X( dst->v.v.x, dst->clip[0] );
+      VIEWPORT_Y( dst->v.v.y, dst->clip[1] );
+      VIEWPORT_Z( dst->v.v.z, dst->clip[2] );
+      w = dstclip[3];
+   }
+   else {
+      w = 1.0 / dst->clip[3];
+      VIEWPORT_X( dst->v.v.x, dst->clip[0] * w );
+      VIEWPORT_Y( dst->v.v.y, dst->clip[1] * w );
+      VIEWPORT_Z( dst->v.v.z, dst->clip[2] * w );
+   }
+
+   if (HAVE_HW_DIVIDE || DO_TEX0) {
+
+      dst->v.v.w = w;
+
+      INTERP_UB( t, dst->v.ub4[4][0], out->v.ub4[4][0], in->v.ub4[4][0] );
+      INTERP_UB( t, dst->v.ub4[4][1], out->v.ub4[4][1], in->v.ub4[4][1] );
+      INTERP_UB( t, dst->v.ub4[4][2], out->v.ub4[4][2], in->v.ub4[4][2] );
+      INTERP_UB( t, dst->v.ub4[4][3], out->v.ub4[4][3], in->v.ub4[4][3] );
+
+      if (DO_TEX0) {
+	 if (DO_PTEX) {
+	    if (HAVE_PTEX_VERTICES) {
+	       INTERP_F( t, dst->v.pv.u0, out->v.pv.u0, in->v.pv.u0 );
+	       INTERP_F( t, dst->v.pv.v0, out->v.pv.v0, in->v.pv.v0 );
+	       INTERP_F( t, dst->v.pv.q0, out->v.pv.q0, in->v.pv.q0 );
+	    } else {
+	       GLfloat wout = out->clip[3]; /* projected clip */
+	       GLfloat win = in->clip[3]; /* projected clip */
+	       GLfloat qout = out->v.pv.w / wout;
+	       GLfloat qin = in->v.pv.w / win;
+	       GLfloat qdst, rqdst;
+
+	       ASSERT( !HAVE_HW_DIVIDE ); /* assert win, wout projected clip */
+
+	       INTERP_F( t, dst->v.v.u0, out->v.v.u0 * qout, in->v.v.u0 * qin );
+	       INTERP_F( t, dst->v.v.v0, out->v.v.v0 * qout, in->v.v.v0 * qin );
+	       INTERP_F( t, qdst, qout, qin );
+
+	       rqdst = 1.0 / qdst;
+	       dst->v.v.u0 *= rqdst;
+	       dst->v.v.v0 *= rqdst;
+	       dst->v.v.w *= rqdst;
+	    }
+	 }
+	 else {
+	    INTERP_F( t, dst->v.v.u0, out->v.v.u0, in->v.v.u0 );
+	    INTERP_F( t, dst->v.v.v0, out->v.v.v0, in->v.v.v0 );
+	 }
+      }
+      if (DO_TEX1) {
+	 if (DO_PTEX) {
+	    INTERP_F( t, dst->v.pv.u1, out->v.pv.u1, in->v.pv.u1 );
+	    INTERP_F( t, dst->v.pv.v1, out->v.pv.v1, in->v.pv.v1 );
+	    INTERP_F( t, dst->v.pv.q1, out->v.pv.q1, in->v.pv.q1 );
+	 } else {
+	    INTERP_F( t, dst->v.v.u1, out->v.v.u1, in->v.v.u1 );
+	    INTERP_F( t, dst->v.v.v1, out->v.v.v1, in->v.v.v1 );
+	 }
+      }
+      else if (DO_PTEX) {
+	 dst->v.pv.q0 = 0.0;	/* must be a valid float on radeon */
+      }
+      if (DO_TEX2) {
+	 if (DO_PTEX) {
+	    INTERP_F( t, dst->v.pv.u2, out->v.pv.u2, in->v.pv.u2 );
+	    INTERP_F( t, dst->v.pv.v2, out->v.pv.v2, in->v.pv.v2 );
+	    INTERP_F( t, dst->v.pv.q2, out->v.pv.q2, in->v.pv.q2 );
+	 } else {
+	    INTERP_F( t, dst->v.v.u2, out->v.v.u2, in->v.v.u2 );
+	    INTERP_F( t, dst->v.v.v2, out->v.v.v2, in->v.v.v2 );
+	 }
+      }
+      if (DO_TEX3) {
+	 if (DO_PTEX) {
+	    INTERP_F( t, dst->v.pv.u3, out->v.pv.u3, in->v.pv.u3 );
+	    INTERP_F( t, dst->v.pv.v3, out->v.pv.v3, in->v.pv.v3 );
+	    INTERP_F( t, dst->v.pv.q3, out->v.pv.q3, in->v.pv.q3 );
+	 } else {
+	    INTERP_F( t, dst->v.v.u3, out->v.v.u3, in->v.v.u3 );
+	    INTERP_F( t, dst->v.v.v3, out->v.v.v3, in->v.v.v3 );
+	 }
+      }
+   } else {
+      /* 4-dword vertex.  Color is in v[3] and there is no oow coordinate.
+       */
+      INTERP_UB( t, dst->v.ub4[3][0], out->v.ub4[3][0], in->v.ub4[3][0] );
+      INTERP_UB( t, dst->v.ub4[3][1], out->v.ub4[3][1], in->v.ub4[3][1] );
+      INTERP_UB( t, dst->v.ub4[3][2], out->v.ub4[3][2], in->v.ub4[3][2] );
+      INTERP_UB( t, dst->v.ub4[3][3], out->v.ub4[3][3], in->v.ub4[3][3] );
+   }
+}
+
+
+static __inline void TAG(copy_pv)( GLcontext *ctx,
+				   TNL_VERTEX *dst, 
+				   TNL_VERTEX *src )
+{
+   if (DO_TEX0 || DO_TEX1 || !HAVE_TINY_VERTICES) {
+      dst->v.v.ui[4] = src->v.v.ui[4];
+   }
+   else {
+      dst->v.v.ui[3] = src->v.v.ui[3];
+   }
+}
+
+
+
+static void TAG(init)( void )
+{
+   setup_tab[IND].emit = TAG(emit_vfmt);
+   setup_tab[IND].interp = TAG(interp_vfmt);
+}
+
+
+#undef IND
+#undef TAG
+
+
+
diff --git a/reactos/lib/mesa32/src/tnl_dd/t_dd.c b/reactos/lib/mesa32/src/tnl_dd/t_dd.c
new file mode 100644
index 00000000000..731da5c320d
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl_dd/t_dd.c
@@ -0,0 +1,58 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+static void copy_pv_rgba4_spec5( GLcontext *ctx, GLuint edst, GLuint esrc )
+{
+   i810ContextPtr imesa = I810_CONTEXT( ctx );
+   GLubyte *i810verts = (GLubyte *)imesa->verts;
+   GLuint shift = imesa->vertex_stride_shift;
+   i810Vertex *dst = (i810Vertex *)(i810verts + (edst << shift));
+   i810Vertex *src = (i810Vertex *)(i810verts + (esrc << shift));
+   dst->ui[4] = src->ui[4];
+   dst->ui[5] = src->ui[5];
+}
+
+static void copy_pv_rgba4( GLcontext *ctx, GLuint edst, GLuint esrc )
+{
+   i810ContextPtr imesa = I810_CONTEXT( ctx );
+   GLubyte *i810verts = (GLubyte *)imesa->verts;
+   GLuint shift = imesa->vertex_stride_shift;
+   i810Vertex *dst = (i810Vertex *)(i810verts + (edst << shift));
+   i810Vertex *src = (i810Vertex *)(i810verts + (esrc << shift));
+   dst->ui[4] = src->ui[4];
+}
+
+static void copy_pv_rgba3( GLcontext *ctx, GLuint edst, GLuint esrc )
+{
+   i810ContextPtr imesa = I810_CONTEXT( ctx );
+   GLubyte *i810verts = (GLubyte *)imesa->verts;
+   GLuint shift = imesa->vertex_stride_shift;
+   i810Vertex *dst = (i810Vertex *)(i810verts + (edst << shift));
+   i810Vertex *src = (i810Vertex *)(i810verts + (esrc << shift));
+   dst->ui[3] = src->ui[3];
+}
diff --git a/reactos/lib/mesa32/src/tnl_dd/t_dd_dmatmp.h b/reactos/lib/mesa32/src/tnl_dd/t_dd_dmatmp.h
new file mode 100644
index 00000000000..e8681dcd034
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl_dd/t_dd_dmatmp.h
@@ -0,0 +1,1234 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+
+/* Template for render stages which build and emit vertices directly
+ * to fixed-size dma buffers.  Useful for rendering strips and other
+ * native primitives where clipping and per-vertex tweaks such as
+ * those in t_dd_tritmp.h are not required.
+ *
+ * Produces code for both inline triangles and indexed triangles.
+ * Where various primitive types are unaccelerated by hardware, the
+ * code attempts to fallback to other primitive types (quadstrips to
+ * tristrips, lineloops to linestrips), or to indexed vertices.
+ * Ultimately, a FALLBACK() macro is invoked if there is no way to
+ * render the primitive natively.
+ */
+
+#if !defined(HAVE_TRIANGLES)
+#error "must have at least triangles to use render template"
+#endif
+
+#if !HAVE_ELTS
+#define ELTS_VARS(buf)
+#define ALLOC_ELTS(nr) 0
+#define EMIT_ELT( offset, elt )
+#define EMIT_TWO_ELTS( offset, elt0, elt1 )
+#define INCR_ELTS( nr )
+#define ELT_INIT(prim)
+#define GET_CURRENT_VB_MAX_ELTS() 0
+#define GET_SUBSEQUENT_VB_MAX_ELTS() 0
+#define RELEASE_ELT_VERTS()
+#define EMIT_INDEXED_VERTS( ctx, start, count )
+#endif
+
+#ifndef EMIT_TWO_ELTS
+#define EMIT_TWO_ELTS( offset, elt0, elt1 )	\
+do { 						\
+   EMIT_ELT( offset, elt0 ); 			\
+   EMIT_ELT( offset+1, elt1 ); 			\
+} while (0)
+#endif
+
+
+/**********************************************************************/
+/*                  Render whole begin/end objects                    */
+/**********************************************************************/
+
+
+
+
+#if (HAVE_ELTS)
+static void *TAG(emit_elts)( GLcontext *ctx, GLuint *elts, GLuint nr,
+			     void *buf)
+{
+   GLint i;
+   LOCAL_VARS;
+   ELTS_VARS(buf);
+
+   for ( i = 0 ; i+1 < nr ; i+=2, elts += 2 ) {
+      EMIT_TWO_ELTS( 0, elts[0], elts[1] );
+      INCR_ELTS( 2 );
+   }
+   
+   if (i < nr) {
+      EMIT_ELT( 0, elts[0] );
+      INCR_ELTS( 1 );
+   }
+
+   return (void *)ELTPTR;
+}
+#endif
+
+static __inline void *TAG(emit_verts)( GLcontext *ctx, GLuint start, 
+				     GLuint count, void *buf )
+{
+   return EMIT_VERTS(ctx, start, count, buf);
+}
+
+/***********************************************************************
+ *                    Render non-indexed primitives.
+ ***********************************************************************/
+
+static void TAG(render_points_verts)( GLcontext *ctx,
+				      GLuint start,
+				      GLuint count,
+				      GLuint flags )
+{
+   if (HAVE_POINTS) {
+      LOCAL_VARS;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_VERTS();
+      int currentsz;
+      GLuint j, nr;
+
+      INIT( GL_POINTS );
+
+      currentsz = GET_CURRENT_VB_MAX_VERTS();
+      if (currentsz < 8)
+	 currentsz = dmasz;
+
+      for (j = start; j < count; j += nr ) {
+	 nr = MIN2( currentsz, count - j );
+	 TAG(emit_verts)( ctx, j, nr, ALLOC_VERTS(nr) );
+	 currentsz = dmasz;
+      }
+
+   } else {
+      fprintf(stderr, "%s - cannot draw primitive\n", __FUNCTION__);
+      return;
+   }
+}
+
+static void TAG(render_lines_verts)( GLcontext *ctx,
+				     GLuint start,
+				     GLuint count,
+				     GLuint flags )
+{
+   if (HAVE_LINES) {
+      LOCAL_VARS;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_VERTS();
+      int currentsz;
+      GLuint j, nr;
+
+      INIT( GL_LINES );
+
+      /* Emit whole number of lines in total and in each buffer:
+       */
+      count -= (count-start) & 1;
+      currentsz = GET_CURRENT_VB_MAX_VERTS();
+      currentsz -= currentsz & 1;
+      dmasz -= dmasz & 1;
+
+      if (currentsz < 8)
+	 currentsz = dmasz;
+
+      for (j = start; j < count; j += nr ) {
+	 nr = MIN2( currentsz, count - j );
+	 TAG(emit_verts)( ctx, j, nr, ALLOC_VERTS(nr) );
+	 currentsz = dmasz;
+      }
+
+   } else {
+      fprintf(stderr, "%s - cannot draw primitive\n", __FUNCTION__);
+      return;
+   }
+}
+
+
+static void TAG(render_line_strip_verts)( GLcontext *ctx,
+					  GLuint start,
+					  GLuint count,
+					  GLuint flags )
+{
+   if (HAVE_LINE_STRIPS) {
+      LOCAL_VARS;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_VERTS();
+      int currentsz;
+      GLuint j, nr;
+
+      INIT( GL_LINE_STRIP );
+
+      currentsz = GET_CURRENT_VB_MAX_VERTS();
+      if (currentsz < 8)
+	 currentsz = dmasz;
+
+      for (j = start; j + 1 < count; j += nr - 1 ) {
+	 nr = MIN2( currentsz, count - j );
+	 TAG(emit_verts)( ctx, j, nr, ALLOC_VERTS(nr) );
+	 currentsz = dmasz;
+      }
+ 
+      FLUSH();
+
+   } else {
+      fprintf(stderr, "%s - cannot draw primitive\n", __FUNCTION__);
+      return;
+   }
+}
+
+
+static void TAG(render_line_loop_verts)( GLcontext *ctx,
+					 GLuint start,
+					 GLuint count,
+					 GLuint flags )
+{
+   if (HAVE_LINE_STRIPS) {
+      LOCAL_VARS;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_VERTS();
+      int currentsz;
+      GLuint j, nr;
+
+      INIT( GL_LINE_STRIP );
+
+      if (flags & PRIM_BEGIN)
+	 j = start;
+      else
+	 j = start + 1;
+
+      /* Ensure last vertex won't wrap buffers:
+       */
+      currentsz = GET_CURRENT_VB_MAX_VERTS();
+      currentsz--;
+      dmasz--;
+
+      if (currentsz < 8) {
+	 currentsz = dmasz;
+      }
+
+      if (j + 1 < count) {
+	 for ( ; j + 1 < count; j += nr - 1 ) {
+	    nr = MIN2( currentsz, count - j );
+
+	    if (j + nr >= count &&
+		start < count - 1 && 
+		(flags & PRIM_END)) 
+	    {
+	       void *tmp;
+	       tmp = ALLOC_VERTS(nr+1);
+	       tmp = TAG(emit_verts)( ctx, j, nr, tmp );
+	       tmp = TAG(emit_verts)( ctx, start, 1, tmp );
+	    }
+	    else {
+	       TAG(emit_verts)( ctx, j, nr, ALLOC_VERTS(nr) );
+	       currentsz = dmasz;
+	    }
+	 }
+
+      }
+      else if (start + 1 < count && (flags & PRIM_END)) {
+	 void *tmp;
+	 tmp = ALLOC_VERTS(2);
+	 tmp = TAG(emit_verts)( ctx, start+1, 1, tmp );
+	 tmp = TAG(emit_verts)( ctx, start, 1, tmp );
+      }
+
+      FLUSH();
+
+   } else {
+      fprintf(stderr, "%s - cannot draw primitive\n", __FUNCTION__);
+      return;
+   }
+}
+
+
+static void TAG(render_triangles_verts)( GLcontext *ctx,
+					 GLuint start,
+					 GLuint count,
+					 GLuint flags )
+{
+   LOCAL_VARS;
+   int dmasz = (GET_SUBSEQUENT_VB_MAX_VERTS()/3) * 3;
+   int currentsz;
+   GLuint j, nr;
+
+   INIT(GL_TRIANGLES);
+
+   currentsz = (GET_CURRENT_VB_MAX_VERTS()/3) * 3;
+
+   /* Emit whole number of tris in total.  dmasz is already a multiple
+    * of 3.
+    */
+   count -= (count-start)%3;
+
+   if (currentsz < 8)
+      currentsz = dmasz;
+
+   for (j = start; j < count; j += nr) {
+      nr = MIN2( currentsz, count - j );
+      TAG(emit_verts)( ctx, j, nr, ALLOC_VERTS(nr) );
+      currentsz = dmasz;
+   }
+}
+
+
+
+static void TAG(render_tri_strip_verts)( GLcontext *ctx,
+					 GLuint start,
+					 GLuint count,
+					 GLuint flags )
+{
+   if (HAVE_TRI_STRIPS) {
+      LOCAL_VARS;
+      GLuint j, nr;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_VERTS();
+      int currentsz;
+
+      INIT(GL_TRIANGLE_STRIP);
+
+      currentsz = GET_CURRENT_VB_MAX_VERTS();
+
+      if (currentsz < 8) {
+	 currentsz = dmasz;
+      }
+
+      /* From here on emit even numbers of tris when wrapping over buffers:
+       */
+      dmasz -= (dmasz & 1);
+      currentsz -= (currentsz & 1);
+
+      for (j = start ; j + 2 < count; j += nr - 2 ) {
+	 nr = MIN2( currentsz, count - j );
+	 TAG(emit_verts)( ctx, j, nr, ALLOC_VERTS(nr) );
+	 currentsz = dmasz;
+      }
+
+      FLUSH();
+
+   } else {
+      fprintf(stderr, "%s - cannot draw primitive\n", __FUNCTION__);
+      return;
+   }
+}
+
+static void TAG(render_tri_fan_verts)( GLcontext *ctx,
+				       GLuint start,
+				       GLuint count,
+				       GLuint flags )
+{
+   if (HAVE_TRI_FANS) {
+      LOCAL_VARS;
+      GLuint j, nr;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_VERTS();
+      int currentsz;
+
+      INIT(GL_TRIANGLE_FAN);
+
+      currentsz = GET_CURRENT_VB_MAX_VERTS();
+      if (currentsz < 8) {
+	 currentsz = dmasz;
+      }
+
+      for (j = start + 1 ; j + 1 < count; j += nr - 2 ) {
+	 void *tmp;
+	 nr = MIN2( currentsz, count - j + 1 );
+	 tmp = ALLOC_VERTS( nr );
+	 tmp = TAG(emit_verts)( ctx, start, 1, tmp );
+	 tmp = TAG(emit_verts)( ctx, j, nr - 1, tmp );
+	 currentsz = dmasz;
+      }
+
+      FLUSH();
+   }
+   else {
+      /* Could write code to emit these as indexed vertices (for the
+       * g400, for instance).
+       */
+      fprintf(stderr, "%s - cannot draw primitive\n", __FUNCTION__);
+      return;
+   }
+}
+
+
+static void TAG(render_poly_verts)( GLcontext *ctx,
+				    GLuint start,
+				    GLuint count,
+				    GLuint flags )
+{
+   if (HAVE_POLYGONS) {
+      LOCAL_VARS;
+      GLuint j, nr;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_VERTS();
+      int currentsz;
+
+      INIT(GL_POLYGON);
+
+      currentsz = GET_CURRENT_VB_MAX_VERTS();
+      if (currentsz < 8) {
+	 currentsz = dmasz;
+      }
+
+      for (j = start + 1 ; j + 1 < count ; j += nr - 2 ) {
+	 void *tmp;
+	 nr = MIN2( currentsz, count - j + 1 );
+	 tmp = ALLOC_VERTS( nr );
+	 tmp = TAG(emit_verts)( ctx, start, 1, tmp );
+	 tmp = TAG(emit_verts)( ctx, j, nr - 1, tmp );
+	 currentsz = dmasz;
+      }
+
+      FLUSH();
+   }
+   else if (HAVE_TRI_FANS && !(ctx->_TriangleCaps & DD_FLATSHADE)) {
+      TAG(render_tri_fan_verts)( ctx, start, count, flags );
+   } else {
+      fprintf(stderr, "%s - cannot draw primitive\n", __FUNCTION__);
+      return;
+   }
+}
+
+static void TAG(render_quad_strip_verts)( GLcontext *ctx,
+					  GLuint start,
+					  GLuint count,
+					  GLuint flags )
+{
+   GLuint j, nr;
+
+   if (HAVE_QUAD_STRIPS) {
+      LOCAL_VARS;
+      GLuint j, nr;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_VERTS();
+      int currentsz;
+
+      INIT(GL_QUAD_STRIP);
+
+      currentsz = GET_CURRENT_VB_MAX_VERTS();
+      if (currentsz < 8) {
+	 currentsz = dmasz;
+      }
+
+      dmasz -= (dmasz & 2);
+      currentsz -= (currentsz & 2);
+
+      for (j = start ; j + 3 < count; j += nr - 2 ) {
+	 nr = MIN2( currentsz, count - j );
+	 TAG(emit_verts)( ctx, j, nr, ALLOC_VERTS(nr) );
+	 currentsz = dmasz;
+      }
+
+      FLUSH();
+
+   } else if (HAVE_TRI_STRIPS && (ctx->_TriangleCaps & DD_FLATSHADE)) {
+      if (HAVE_ELTS) {
+	 LOCAL_VARS;
+	 int dmasz = GET_SUBSEQUENT_VB_MAX_ELTS();
+	 int currentsz;
+	 GLuint j, nr;
+
+         EMIT_INDEXED_VERTS( ctx, start, count );
+
+	 /* Simulate flat-shaded quadstrips using indexed vertices:
+	  */
+	 ELT_INIT( GL_TRIANGLES );
+
+	 currentsz = GET_CURRENT_VB_MAX_ELTS();
+
+	 /* Emit whole number of quads in total, and in each buffer.
+	  */
+	 dmasz -= dmasz & 1;
+	 count -= (count-start) & 1;
+	 currentsz -= currentsz & 1;
+
+	 if (currentsz < 12)
+	    currentsz = dmasz;
+
+	 currentsz = currentsz/6*2;
+	 dmasz = dmasz/6*2;
+
+	 for (j = start; j + 3 < count; j += nr - 2 ) {
+	    nr = MIN2( currentsz, count - j );
+	    if (nr >= 4) {
+	       GLint quads = (nr/2)-1;
+	       GLint i;
+	       ELTS_VARS( ALLOC_ELTS( quads*6 ) );
+
+	       for ( i = j-start ; i < j-start+quads*2 ; i+=2 ) {
+		  EMIT_TWO_ELTS( 0, (i+0), (i+1) );
+		  EMIT_TWO_ELTS( 2, (i+2), (i+1) );
+		  EMIT_TWO_ELTS( 4, (i+3), (i+2) );
+		  INCR_ELTS( 6 );
+	       }
+
+	       FLUSH();
+	    }
+	    currentsz = dmasz;
+	 }
+
+	 RELEASE_ELT_VERTS();
+	 FLUSH();
+      }
+      else {
+	 /* Vertices won't fit in a single buffer or elts not available,
+	  * VERT_FALLBACK.
+	  */
+	 fprintf(stderr, "%s - cannot draw primitive\n", __FUNCTION__);
+	 return;
+      }
+   }
+   else if (HAVE_TRI_STRIPS) {
+      LOCAL_VARS;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_VERTS();
+      int currentsz;
+
+      /* Emit smooth-shaded quadstrips as tristrips:
+       */
+      FLUSH();
+      INIT( GL_TRIANGLE_STRIP );
+
+      /* Emit whole number of quads in total, and in each buffer.
+       */
+      dmasz -= dmasz & 1;
+      currentsz = GET_CURRENT_VB_MAX_VERTS();
+      currentsz -= currentsz & 1;
+      count -= (count-start) & 1;
+
+      if (currentsz < 8) {
+	 currentsz = dmasz;
+      }
+
+      for (j = start; j + 3 < count; j += nr - 2 ) {
+	 nr = MIN2( currentsz, count - j );
+	 TAG(emit_verts)( ctx, j, nr, ALLOC_VERTS(nr) );
+	 currentsz = dmasz;
+      }
+
+      FLUSH();
+
+   } else {
+      fprintf(stderr, "%s - cannot draw primitive\n", __FUNCTION__);
+      return;
+   }
+}
+
+
+static void TAG(render_quads_verts)( GLcontext *ctx,
+				     GLuint start,
+				     GLuint count,
+				     GLuint flags )
+{
+   if (HAVE_QUADS) {
+      LOCAL_VARS;
+      int dmasz = (GET_SUBSEQUENT_VB_MAX_VERTS()/4) * 4;
+      int currentsz;
+      GLuint j, nr;
+
+      INIT(GL_QUADS);
+
+      /* Emit whole number of quads in total.  dmasz is already a multiple
+       * of 4.
+       */
+      count -= (count-start)%4;
+
+      currentsz = (GET_CURRENT_VB_MAX_VERTS()/4) * 4;
+      if (currentsz < 8)
+         currentsz = dmasz;
+
+      for (j = start; j < count; j += nr) {
+         nr = MIN2( currentsz, count - j );
+         TAG(emit_verts)( ctx, j, nr, ALLOC_VERTS(nr) );
+         currentsz = dmasz;
+      }
+
+
+   } else if (HAVE_ELTS) {
+      /* Hardware doesn't have a quad primitive type -- try to
+       * simulate it using indexed vertices and the triangle
+       * primitive:
+       */
+      LOCAL_VARS;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_ELTS();
+      int currentsz;
+      GLuint j, nr;
+
+      EMIT_INDEXED_VERTS( ctx, start, count );
+
+      FLUSH();
+      ELT_INIT( GL_TRIANGLES );
+      currentsz = GET_CURRENT_VB_MAX_ELTS();
+
+      /* Emit whole number of quads in total, and in each buffer.
+       */
+      dmasz -= dmasz & 3;
+      count -= (count-start) & 3;
+      currentsz -= currentsz & 3;
+
+      /* Adjust for rendering as triangles:
+       */
+      currentsz = currentsz/6*4;
+      dmasz = dmasz/6*4;
+
+      if (currentsz < 8)
+	 currentsz = dmasz;
+
+      for (j = start; j < count; j += nr ) {
+	 nr = MIN2( currentsz, count - j );
+	 if (nr >= 4) {
+	    GLint quads = nr/4;
+	    GLint i;
+	    ELTS_VARS( ALLOC_ELTS( quads*6 ) );
+
+	    for ( i = j-start ; i < j-start+quads*4 ; i+=4 ) {
+	       EMIT_TWO_ELTS( 0, (i+0), (i+1) );
+	       EMIT_TWO_ELTS( 2, (i+3), (i+1) );
+	       EMIT_TWO_ELTS( 4, (i+2), (i+3) );
+	       INCR_ELTS( 6 );
+	    }
+
+	    FLUSH();
+	 }
+	 currentsz = dmasz;
+      }
+
+      RELEASE_ELT_VERTS();
+   }
+   else {
+      /* Vertices won't fit in a single buffer, fallback.
+       */
+      fprintf(stderr, "%s - cannot draw primitive\n", __FUNCTION__);
+      return;
+   }
+}
+
+static void TAG(render_noop)( GLcontext *ctx,
+			      GLuint start,
+			      GLuint count,
+			      GLuint flags )
+{
+}
+
+
+
+
+static render_func TAG(render_tab_verts)[GL_POLYGON+2] =
+{
+   TAG(render_points_verts),
+   TAG(render_lines_verts),
+   TAG(render_line_loop_verts),
+   TAG(render_line_strip_verts),
+   TAG(render_triangles_verts),
+   TAG(render_tri_strip_verts),
+   TAG(render_tri_fan_verts),
+   TAG(render_quads_verts),
+   TAG(render_quad_strip_verts),
+   TAG(render_poly_verts),
+   TAG(render_noop),
+};
+
+
+/****************************************************************************
+ *                 Render elts using hardware indexed verts                 *
+ ****************************************************************************/
+
+#if (HAVE_ELTS)
+static void TAG(render_points_elts)( GLcontext *ctx,
+				     GLuint start,
+				     GLuint count,
+				     GLuint flags )
+{
+   if (HAVE_POINTS) {
+      LOCAL_VARS;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_ELTS();
+      int currentsz;
+      GLuint *elts = TNL_CONTEXT(ctx)->vb.Elts;
+      GLuint j, nr;
+
+      ELT_INIT( GL_POINTS );
+
+      currentsz = GET_CURRENT_VB_MAX_ELTS();
+      if (currentsz < 8)
+	 currentsz = dmasz;
+
+      for (j = start; j < count; j += nr ) {
+	 nr = MIN2( currentsz, count - j );
+	 TAG(emit_elts)( ctx, elts+j, nr, ALLOC_ELTS(nr) );
+	 FLUSH();
+	 currentsz = dmasz;
+      }
+   } else {
+      fprintf(stderr, "%s - cannot draw primitive\n", __FUNCTION__);
+      return;
+   }
+}
+
+
+
+static void TAG(render_lines_elts)( GLcontext *ctx,
+				    GLuint start,
+				    GLuint count,
+				    GLuint flags )
+{
+   if (HAVE_LINES) {
+      LOCAL_VARS;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_ELTS();
+      int currentsz;
+      GLuint *elts = TNL_CONTEXT(ctx)->vb.Elts;
+      GLuint j, nr;
+
+      ELT_INIT( GL_LINES );
+
+      /* Emit whole number of lines in total and in each buffer:
+       */
+      count -= (count-start) & 1;
+      currentsz -= currentsz & 1;
+      dmasz -= dmasz & 1;
+
+      currentsz = GET_CURRENT_VB_MAX_ELTS();
+      if (currentsz < 8)
+	 currentsz = dmasz;
+
+      for (j = start; j < count; j += nr ) {
+	 nr = MIN2( currentsz, count - j );
+	 TAG(emit_elts)( ctx, elts+j, nr, ALLOC_ELTS(nr) );
+	 FLUSH();
+	 currentsz = dmasz;
+      }
+   } else {
+      fprintf(stderr, "%s - cannot draw primitive\n", __FUNCTION__);
+      return;
+   }
+}
+
+
+static void TAG(render_line_strip_elts)( GLcontext *ctx,
+					 GLuint start,
+					 GLuint count,
+					 GLuint flags )
+{
+   if (HAVE_LINE_STRIPS) {
+      LOCAL_VARS;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_ELTS();
+      int currentsz;
+      GLuint *elts = TNL_CONTEXT(ctx)->vb.Elts;
+      GLuint j, nr;
+
+      FLUSH(); /* always a new primitive */
+      ELT_INIT( GL_LINE_STRIP );
+
+      currentsz = GET_CURRENT_VB_MAX_ELTS();
+      if (currentsz < 8)
+	 currentsz = dmasz;
+
+      for (j = start; j + 1 < count; j += nr - 1 ) {
+	 nr = MIN2( currentsz, count - j );
+	 TAG(emit_elts)( ctx, elts+j, nr, ALLOC_ELTS(nr) );
+	 FLUSH();
+	 currentsz = dmasz;
+      }
+   } else {
+      /* TODO: Try to emit as indexed lines.
+       */
+      fprintf(stderr, "%s - cannot draw primitive\n", __FUNCTION__);
+      return;
+   }
+}
+
+
+static void TAG(render_line_loop_elts)( GLcontext *ctx,
+					GLuint start,
+					GLuint count,
+					GLuint flags )
+{
+   if (HAVE_LINE_STRIPS) {
+      LOCAL_VARS;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_ELTS();
+      int currentsz;
+      GLuint *elts = TNL_CONTEXT(ctx)->vb.Elts;
+      GLuint j, nr;
+
+      FLUSH();
+      ELT_INIT( GL_LINE_STRIP );
+
+      if (flags & PRIM_BEGIN)
+	 j = start;
+      else
+	 j = start + 1;
+
+      currentsz = GET_CURRENT_VB_MAX_ELTS();
+      if (currentsz < 8) {
+	 currentsz = dmasz;
+      }
+
+      /* Ensure last vertex doesn't wrap:
+       */
+      currentsz--;
+      dmasz--;
+
+      if (j + 1 < count) {
+	 for ( ; j + 1 < count; j += nr - 1 ) {
+	    nr = MIN2( currentsz, count - j );
+
+	    if (j + nr >= count &&
+		start < count - 1 && 
+		(flags & PRIM_END)) 
+	    {
+	       void *tmp;
+	       tmp = ALLOC_ELTS(nr+1);
+	       tmp = TAG(emit_elts)( ctx, elts+j, nr, tmp );
+	       tmp = TAG(emit_elts)( ctx, elts+start, 1, tmp );
+	    }
+	    else {
+	       TAG(emit_elts)( ctx, elts+j, nr, ALLOC_ELTS(nr) );
+	       currentsz = dmasz;
+	    }
+	 }
+
+      }
+      else if (start + 1 < count && (flags & PRIM_END)) {
+	 void *tmp;
+	 tmp = ALLOC_ELTS(2);
+	 tmp = TAG(emit_elts)( ctx, elts+start+1, 1, tmp );
+	 tmp = TAG(emit_elts)( ctx, elts+start, 1, tmp );
+      }
+
+      FLUSH();
+   } else {
+      /* TODO: Try to emit as indexed lines */
+      fprintf(stderr, "%s - cannot draw primitive\n", __FUNCTION__);
+      return;
+   }
+}
+
+
+/* For verts, we still eliminate the copy from main memory to dma
+ * buffers.  For elts, this is probably no better (worse?) than the
+ * standard path.
+ */
+static void TAG(render_triangles_elts)( GLcontext *ctx,
+					GLuint start,
+					GLuint count,
+					GLuint flags )
+{
+   LOCAL_VARS;
+   GLuint *elts = TNL_CONTEXT(ctx)->vb.Elts;
+   int dmasz = GET_SUBSEQUENT_VB_MAX_ELTS()/3*3;
+   int currentsz;
+   GLuint j, nr;
+
+   FLUSH();
+   ELT_INIT( GL_TRIANGLES );
+
+   currentsz = GET_CURRENT_VB_MAX_ELTS();
+
+   /* Emit whole number of tris in total.  dmasz is already a multiple
+    * of 3.
+    */
+   count -= (count-start)%3;
+   currentsz -= currentsz%3;
+   if (currentsz < 8)
+      currentsz = dmasz;
+
+   for (j = start; j < count; j += nr) {
+      nr = MIN2( currentsz, count - j );
+      TAG(emit_elts)( ctx, elts+j, nr, ALLOC_ELTS(nr) );
+      FLUSH();
+      currentsz = dmasz;
+   }
+}
+
+
+
+static void TAG(render_tri_strip_elts)( GLcontext *ctx,
+					GLuint start,
+					GLuint count,
+					GLuint flags )
+{
+   if (HAVE_TRI_STRIPS) {
+      LOCAL_VARS;
+      GLuint j, nr;
+      GLuint *elts = TNL_CONTEXT(ctx)->vb.Elts;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_ELTS();
+      int currentsz;
+
+      FLUSH();
+      ELT_INIT( GL_TRIANGLE_STRIP );
+
+      currentsz = GET_CURRENT_VB_MAX_ELTS();
+      if (currentsz < 8) {
+	 currentsz = dmasz;
+      }
+
+      /* Keep the same winding over multiple buffers:
+       */
+      dmasz -= (dmasz & 1);
+      currentsz -= (currentsz & 1);
+
+      for (j = start ; j + 2 < count; j += nr - 2 ) {
+	 nr = MIN2( currentsz, count - j );
+	 TAG(emit_elts)( ctx, elts+j, nr, ALLOC_ELTS(nr) );
+	 FLUSH();
+	 currentsz = dmasz;
+      }
+   } else {
+      /* TODO: try to emit as indexed triangles */
+      fprintf(stderr, "%s - cannot draw primitive\n", __FUNCTION__);
+      return;
+   }
+}
+
+static void TAG(render_tri_fan_elts)( GLcontext *ctx,
+				      GLuint start,
+				      GLuint count,
+				      GLuint flags )
+{
+   if (HAVE_TRI_FANS) {
+      LOCAL_VARS;
+      GLuint *elts = TNL_CONTEXT(ctx)->vb.Elts;
+      GLuint j, nr;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_ELTS();
+      int currentsz;
+
+      FLUSH();
+      ELT_INIT( GL_TRIANGLE_FAN );
+
+      currentsz = GET_CURRENT_VB_MAX_ELTS();
+      if (currentsz < 8) {
+	 currentsz = dmasz;
+      }
+
+      for (j = start + 1 ; j + 1 < count; j += nr - 2 ) {
+	 void *tmp;
+	 nr = MIN2( currentsz, count - j + 1 );
+	 tmp = ALLOC_ELTS( nr );
+	 tmp = TAG(emit_elts)( ctx, elts+start, 1, tmp );
+	 tmp = TAG(emit_elts)( ctx, elts+j, nr - 1, tmp );
+	 FLUSH();
+	 currentsz = dmasz;
+      }
+   } else {
+      /* TODO: try to emit as indexed triangles */
+      fprintf(stderr, "%s - cannot draw primitive\n", __FUNCTION__);
+      return;
+   }
+}
+
+
+static void TAG(render_poly_elts)( GLcontext *ctx,
+				   GLuint start,
+				   GLuint count,
+				   GLuint flags )
+{
+   if (HAVE_POLYGONS) {
+      LOCAL_VARS;
+      GLuint *elts = TNL_CONTEXT(ctx)->vb.Elts;
+      GLuint j, nr;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_ELTS();
+      int currentsz;
+
+      FLUSH();
+      ELT_INIT( GL_POLYGON );
+
+      currentsz = GET_CURRENT_VB_MAX_ELTS();
+      if (currentsz < 8) {
+	 currentsz = dmasz;
+      }
+
+      for (j = start + 1 ; j + 1 < count; j += nr - 2 ) {
+	 void *tmp;
+	 nr = MIN2( currentsz, count - j + 1 );
+	 tmp = ALLOC_ELTS( nr );
+	 tmp = TAG(emit_elts)( ctx, elts+start, 1, tmp );
+	 tmp = TAG(emit_elts)( ctx, elts+j, nr - 1, tmp );
+	 FLUSH();
+	 currentsz = dmasz;
+      }
+   } else if (HAVE_TRI_FANS && !(ctx->_TriangleCaps & DD_FLATSHADE)) {
+      TAG(render_tri_fan_verts)( ctx, start, count, flags );
+   } else {
+      fprintf(stderr, "%s - cannot draw primitive\n", __FUNCTION__);
+      return;
+   }
+}
+
+static void TAG(render_quad_strip_elts)( GLcontext *ctx,
+					 GLuint start,
+					 GLuint count,
+					 GLuint flags )
+{
+   if (HAVE_QUAD_STRIPS && 0) {
+   }
+   else if (HAVE_TRI_STRIPS) {
+      LOCAL_VARS;
+      GLuint *elts = TNL_CONTEXT(ctx)->vb.Elts;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_ELTS();
+      int currentsz;
+      GLuint j, nr;
+
+      FLUSH();
+      currentsz = GET_CURRENT_VB_MAX_ELTS();
+
+      /* Emit whole number of quads in total, and in each buffer.
+       */
+      dmasz -= dmasz & 1;
+      count -= (count-start) & 1;
+      currentsz -= currentsz & 1;
+
+      if (currentsz < 12)
+	 currentsz = dmasz;
+
+      if (ctx->_TriangleCaps & DD_FLATSHADE) {
+	 ELT_INIT( GL_TRIANGLES );
+
+	 currentsz = currentsz/6*2;
+	 dmasz = dmasz/6*2;
+
+	 for (j = start; j + 3 < count; j += nr - 2 ) {
+	    nr = MIN2( currentsz, count - j );
+
+	    if (nr >= 4)
+	    {
+	       GLint i;
+	       GLint quads = (nr/2)-1;
+	       void *buf = ALLOC_ELTS( quads*6 );
+	       ELTS_VARS( buf );
+
+	       for ( i = j-start ; i < j-start+quads ; i++, elts += 2 ) {
+		  EMIT_TWO_ELTS( 0, elts[0], elts[1] );
+		  EMIT_TWO_ELTS( 2, elts[2], elts[1] );
+		  EMIT_TWO_ELTS( 4, elts[3], elts[2] );
+		  INCR_ELTS( 6 );
+	       }
+
+	       FLUSH();
+	    }
+
+	    currentsz = dmasz;
+	 }
+      }
+      else {
+	 ELT_INIT( GL_TRIANGLE_STRIP );
+
+	 for (j = start; j + 3 < count; j += nr - 2 ) {
+	    nr = MIN2( currentsz, count - j );
+	    TAG(emit_elts)( ctx, elts+j, nr, ALLOC_ELTS(nr) );
+	    FLUSH();
+	    currentsz = dmasz;
+	 }
+      }
+   }
+}
+
+
+static void TAG(render_quads_elts)( GLcontext *ctx,
+				    GLuint start,
+				    GLuint count,
+				    GLuint flags )
+{
+   if (HAVE_QUADS) {
+      LOCAL_VARS;
+      GLuint *elts = TNL_CONTEXT(ctx)->vb.Elts;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_ELTS()/4*4;
+      int currentsz;
+      GLuint j, nr;
+
+      FLUSH();
+      ELT_INIT( GL_TRIANGLES );
+
+      currentsz = GET_CURRENT_VB_MAX_ELTS()/4*4;
+
+      count -= (count-start)%4;
+
+      if (currentsz < 8)
+	 currentsz = dmasz;
+
+      for (j = start; j < count; j += nr) {
+	 nr = MIN2( currentsz, count - j );
+	 TAG(emit_elts)( ctx, elts+j, nr, ALLOC_ELTS(nr) );
+	 FLUSH();
+	 currentsz = dmasz;
+      }
+   } else {
+      LOCAL_VARS;
+      GLuint *elts = TNL_CONTEXT(ctx)->vb.Elts;
+      int dmasz = GET_SUBSEQUENT_VB_MAX_ELTS();
+      int currentsz;
+      GLuint j, nr;
+
+      ELT_INIT( GL_TRIANGLES );
+      currentsz = GET_CURRENT_VB_MAX_ELTS();
+
+      /* Emit whole number of quads in total, and in each buffer.
+       */
+      dmasz -= dmasz & 3;
+      count -= (count-start) & 3;
+      currentsz -= currentsz & 3;
+
+      /* Adjust for rendering as triangles:
+       */
+      currentsz = currentsz/6*4;
+      dmasz = dmasz/6*4;
+
+      if (currentsz < 8)
+	 currentsz = dmasz;
+
+      for (j = start; j + 3 < count; j += nr - 2 ) {
+	 nr = MIN2( currentsz, count - j );
+
+	 if (nr >= 4)
+	 {
+	    GLint quads = nr/4;
+	    GLint i;
+	    void *buf = ALLOC_ELTS( quads * 6 );
+	    ELTS_VARS(buf);
+
+	    for ( i = j-start ; i < j-start+quads ; i++, elts += 4 ) {
+	       EMIT_TWO_ELTS( 0, elts[0], elts[1] );
+	       EMIT_TWO_ELTS( 2, elts[3], elts[1] );
+	       EMIT_TWO_ELTS( 4, elts[2], elts[3] );
+	       INCR_ELTS( 6 );
+	    }
+
+	    FLUSH();
+	 }
+
+	 currentsz = dmasz;
+      }
+   }
+}
+
+
+
+static render_func TAG(render_tab_elts)[GL_POLYGON+2] =
+{
+   TAG(render_points_elts),
+   TAG(render_lines_elts),
+   TAG(render_line_loop_elts),
+   TAG(render_line_strip_elts),
+   TAG(render_triangles_elts),
+   TAG(render_tri_strip_elts),
+   TAG(render_tri_fan_elts),
+   TAG(render_quads_elts),
+   TAG(render_quad_strip_elts),
+   TAG(render_poly_elts),
+   TAG(render_noop),
+};
+
+
+
+#endif
+
+
+
+
+
+
+/* Prevent fallbacks later on.
+ */
+static GLboolean TAG(validate_render)( GLcontext *ctx,
+				       struct vertex_buffer *VB )
+{
+   GLint i;
+
+   if (VB->ClipOrMask)
+      return GL_FALSE;
+
+   if (VB->Elts && !HAVE_ELTS)
+      return GL_FALSE;
+
+   for (i = 0 ; i < VB->PrimitiveCount ; i++) {
+      GLuint prim = VB->Primitive[i].mode;
+      GLuint count = VB->Primitive[i].count;
+      GLboolean ok = GL_FALSE;
+
+      if (!count)
+	 continue;
+
+      switch (prim & PRIM_MODE_MASK) {
+      case GL_POINTS:
+	 ok = HAVE_POINTS;
+	 break;
+      case GL_LINES:
+	 ok = HAVE_LINES && !ctx->Line.StippleFlag;
+	 break;
+      case GL_LINE_STRIP:
+	 ok = HAVE_LINE_STRIPS && !ctx->Line.StippleFlag;
+	 break;
+      case GL_LINE_LOOP:
+	 ok = HAVE_LINE_STRIPS && !ctx->Line.StippleFlag;
+	 break;
+      case GL_TRIANGLES:
+	 ok = HAVE_TRIANGLES;
+	 break;
+      case GL_TRIANGLE_STRIP:
+	 ok = HAVE_TRI_STRIPS;
+	 break;
+      case GL_TRIANGLE_FAN:
+	 ok = HAVE_TRI_FANS;
+	 break;
+      case GL_POLYGON:
+	 if (HAVE_POLYGONS) {
+	    ok = GL_TRUE;
+	 }
+	 else 
+	    ok =  (HAVE_TRI_FANS && !(ctx->_TriangleCaps & DD_FLATSHADE));
+	 break;
+      case GL_QUAD_STRIP:
+	 if (VB->Elts) {
+	    ok = HAVE_TRI_STRIPS;
+	 }
+	 else if (HAVE_QUAD_STRIPS) {
+	    ok = GL_TRUE;
+	 } else if (HAVE_TRI_STRIPS && (ctx->_TriangleCaps & DD_FLATSHADE)) {
+	    if (HAVE_ELTS) {
+	       ok = count < GET_SUBSEQUENT_VB_MAX_ELTS();
+	    }
+	    else {
+	       ok = GL_FALSE;
+	    }
+	 }
+	 else 
+	    ok = HAVE_TRI_STRIPS;
+	 break;
+      case GL_QUADS:
+	 if (HAVE_QUADS) {
+	    ok = GL_TRUE;
+	 } else if (HAVE_ELTS) {
+	    ok = count < GET_SUBSEQUENT_VB_MAX_ELTS();
+	 }
+	 else {
+	    ok = GL_FALSE;
+	 }
+	 break;
+      default:
+	 break;
+      }
+      
+      if (!ok) return GL_FALSE;
+   }
+
+   return GL_TRUE;
+}
+
diff --git a/reactos/lib/mesa32/src/tnl_dd/t_dd_dmatmp2.h b/reactos/lib/mesa32/src/tnl_dd/t_dd_dmatmp2.h
new file mode 100644
index 00000000000..46a35de06a9
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl_dd/t_dd_dmatmp2.h
@@ -0,0 +1,914 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.0.3
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+
+/* Template for render stages which build and emit vertices directly
+ * to fixed-size dma buffers.  Useful for rendering strips and other
+ * native primitives where clipping and per-vertex tweaks such as
+ * those in t_dd_tritmp.h are not required.
+ *
+ */
+
+#if !HAVE_TRIANGLES || !HAVE_POINTS || !HAVE_LINES
+#error "must have points, lines & triangles to use render template"
+#endif
+
+#if !HAVE_TRI_STRIPS || !HAVE_TRI_FANS
+#error "must have tri strip and fans to use render template"
+#endif
+
+#if !HAVE_LINE_STRIPS
+#error "must have line strips to use render template"
+#endif
+
+#if !HAVE_POLYGONS
+#error "must have polygons to use render template"
+#endif
+
+#if !HAVE_ELTS
+#error "must have elts to use render template"
+#endif
+
+
+#ifndef EMIT_TWO_ELTS
+#define EMIT_TWO_ELTS( dest, offset, elt0, elt1 )	\
+do { 						\
+   (dest)[offset] = (elt0); 			\
+   (dest)[offset+1] = (elt1); 			\
+} while (0)
+#endif
+
+
+/**********************************************************************/
+/*                  Render whole begin/end objects                    */
+/**********************************************************************/
+
+
+static ELT_TYPE *TAG(emit_elts)( GLcontext *ctx, 
+			    ELT_TYPE *dest,
+			    GLuint *elts, GLuint nr )
+{
+   GLint i;
+   LOCAL_VARS;
+
+   for ( i = 0 ; i+1 < nr ; i+=2, elts += 2 ) {
+      EMIT_TWO_ELTS( dest, 0, elts[0], elts[1] );
+      dest += 2;
+   }
+   if (i < nr) {
+      EMIT_ELT( dest, 0, elts[0] );
+      dest += 1;
+   }
+   
+   return dest;
+}
+
+static ELT_TYPE *TAG(emit_consecutive_elts)( GLcontext *ctx, 
+					ELT_TYPE *dest,
+					GLuint start, GLuint nr )
+{
+   GLint i;
+   LOCAL_VARS;
+
+   for ( i = 0 ; i+1 < nr ; i+=2, start += 2 ) {
+      EMIT_TWO_ELTS( dest, 0, start, start+1 );
+      dest += 2;
+   }
+   if (i < nr) {
+      EMIT_ELT( dest, 0, start );
+      dest += 1;
+   }
+
+   return dest;
+}
+
+/***********************************************************************
+ *                    Render non-indexed primitives.
+ ***********************************************************************/
+
+
+
+static void TAG(render_points_verts)( GLcontext *ctx,
+				      GLuint start,
+				      GLuint count,
+				      GLuint flags )
+{
+   if (start < count) {
+      LOCAL_VARS;
+      if (0) fprintf(stderr, "%s\n", __FUNCTION__);
+      EMIT_PRIM( ctx, GL_POINTS, HW_POINTS, start, count );
+   }
+}
+
+static void TAG(render_lines_verts)( GLcontext *ctx,
+				     GLuint start,
+				     GLuint count,
+				     GLuint flags )
+{
+   LOCAL_VARS;
+   if (0) fprintf(stderr, "%s\n", __FUNCTION__);
+   count -= (count-start) & 1;
+
+   if (start+1 >= count)
+      return;
+
+   if ((flags & PRIM_BEGIN) && ctx->Line.StippleFlag) {
+      RESET_STIPPLE();
+      AUTO_STIPPLE( GL_TRUE );
+   }
+      
+   EMIT_PRIM( ctx, GL_LINES, HW_LINES, start, count );
+
+   if ((flags & PRIM_END) && ctx->Line.StippleFlag)
+      AUTO_STIPPLE( GL_FALSE );
+}
+
+
+static void TAG(render_line_strip_verts)( GLcontext *ctx,
+					  GLuint start,
+					  GLuint count,
+					  GLuint flags )
+{
+   LOCAL_VARS;
+   if (0) fprintf(stderr, "%s\n", __FUNCTION__);
+
+   if (start+1 >= count)
+      return;
+
+   if ((flags & PRIM_BEGIN) && ctx->Line.StippleFlag)
+      RESET_STIPPLE();
+
+
+   if (PREFER_DISCRETE_ELT_PRIM( count-start, HW_LINES ))
+   {   
+      int dmasz = GET_MAX_HW_ELTS();
+      GLuint j, nr;
+
+      ELT_INIT( GL_LINES, HW_LINES );
+
+      /* Emit whole number of lines in each full buffer.
+       */
+      dmasz = dmasz/2;
+
+
+      for (j = start; j + 1 < count; j += nr - 1 ) {
+	 ELT_TYPE *dest;
+	 GLint i;
+
+	 nr = MIN2( dmasz, count - j );
+	 dest = ALLOC_ELTS( (nr-1)*2 );
+	    
+	 for ( i = j ; i+1 < j+nr ; i+=1 ) {
+	    EMIT_TWO_ELTS( dest, 0, (i+0), (i+1) );
+	    dest += 2;
+	 }
+
+	 CLOSE_ELTS();
+      }
+   }
+   else
+      EMIT_PRIM( ctx, GL_LINE_STRIP, HW_LINE_STRIP, start, count );
+}
+
+
+static void TAG(render_line_loop_verts)( GLcontext *ctx,
+					 GLuint start,
+					 GLuint count,
+					 GLuint flags )
+{
+   LOCAL_VARS;
+   GLuint j, nr;
+   if (0) fprintf(stderr, "%s\n", __FUNCTION__);
+
+   if (flags & PRIM_BEGIN) {
+      j = start;
+      if (ctx->Line.StippleFlag)
+	 RESET_STIPPLE( );
+   }
+   else
+      j = start + 1;
+
+   if (flags & PRIM_END) {
+
+      if (start+1 >= count)
+	 return;
+
+      if (PREFER_DISCRETE_ELT_PRIM( count-start, HW_LINES )) {
+	 int dmasz = GET_MAX_HW_ELTS();
+
+	 ELT_INIT( GL_LINES, HW_LINES );
+
+	 /* Emit whole number of lines in each full buffer.
+	  */
+	 dmasz = dmasz/2;
+
+	 /* Ensure last vertex doesn't wrap:
+	  */
+	 dmasz--;
+
+	 for (; j + 1 < count;  ) {
+	    GLint i;
+	    ELT_TYPE *dest;
+
+	    nr = MIN2( dmasz, count - j );
+	    dest = ALLOC_ELTS( nr*2 );	/* allocs room for 1 more line */
+
+	    for ( i = 0 ; i < nr - 1 ; i+=1 ) {
+	       EMIT_TWO_ELTS( dest, 0, (j+i), (j+i+1) );
+	       dest += 2;
+	    }
+
+	    j += nr - 1;
+
+	    /* Emit 1 more line into space alloced above */
+	    if (j + 1 >= count) {
+ 	       EMIT_TWO_ELTS( dest, 0, (j), (start) ); 
+ 	       dest += 2; 
+ 	    }
+ 
+	    CLOSE_ELTS();
+	 }
+      }
+      else
+      {
+	 int dmasz = GET_MAX_HW_ELTS() - 1;
+
+	 ELT_INIT( GL_LINE_STRIP, HW_LINE_STRIP );
+
+	 for ( ; j + 1 < count;  ) {
+	    nr = MIN2( dmasz, count - j );
+	    if (j + nr < count) {
+	       ELT_TYPE *dest = ALLOC_ELTS( nr );
+	       dest = TAG(emit_consecutive_elts)( ctx, dest, j, nr );
+	       j += nr - 1;
+	       CLOSE_ELTS();
+	    }
+	    else if (nr) {
+	       ELT_TYPE *dest = ALLOC_ELTS( nr + 1 );
+	       dest = TAG(emit_consecutive_elts)( ctx, dest, j, nr );
+	       dest = TAG(emit_consecutive_elts)( ctx, dest, start, 1 );
+	       j += nr;
+	       CLOSE_ELTS();
+	    }
+	 }   
+      }
+   } else {
+      TAG(render_line_strip_verts)( ctx, j, count, flags );
+   }
+}
+
+
+static void TAG(render_triangles_verts)( GLcontext *ctx,
+					 GLuint start,
+					 GLuint count,
+					 GLuint flags )
+{
+   LOCAL_VARS;
+   if (0) fprintf(stderr, "%s\n", __FUNCTION__);
+
+   count -= (count-start)%3;
+
+   if (start+2 >= count) {
+      return;
+   }
+
+   /* need a PREFER_DISCRETE_ELT_PRIM here too..
+    */
+   EMIT_PRIM( ctx, GL_TRIANGLES, HW_TRIANGLES, start, count );
+}
+
+
+
+static void TAG(render_tri_strip_verts)( GLcontext *ctx,
+					 GLuint start,
+					 GLuint count,
+					 GLuint flags )
+{
+   LOCAL_VARS;
+   if (0) fprintf(stderr, "%s\n", __FUNCTION__);
+
+   if (start + 2 >= count)
+      return;
+
+   if (PREFER_DISCRETE_ELT_PRIM( count-start, HW_TRIANGLES ))
+   {   
+      int dmasz = GET_MAX_HW_ELTS();
+      int parity = 0;
+      GLuint j, nr;
+
+      ELT_INIT( GL_TRIANGLES, HW_TRIANGLES );
+
+      /* Emit even number of tris in each full buffer.
+       */
+      dmasz = dmasz/3;
+      dmasz -= dmasz & 1;
+
+      for (j = start; j + 2 < count; j += nr - 2 ) {
+	 ELT_TYPE *dest;
+	 GLint i;
+
+	 nr = MIN2( dmasz, count - j );
+	 dest = ALLOC_ELTS( (nr-2)*3 );
+	    
+	 for ( i = j ; i+2 < j+nr ; i++, parity^=1 ) {
+	    EMIT_ELT( dest, 0, (i+0+parity) );
+	    EMIT_ELT( dest, 1, (i+1-parity) );
+	    EMIT_ELT( dest, 2, (i+2) );
+	    dest += 3;
+	 }
+
+	 CLOSE_ELTS();
+      }
+   }
+   else
+      EMIT_PRIM( ctx, GL_TRIANGLE_STRIP, HW_TRIANGLE_STRIP_0, start, count );
+}
+
+static void TAG(render_tri_fan_verts)( GLcontext *ctx,
+				       GLuint start,
+				       GLuint count,
+				       GLuint flags )
+{
+   LOCAL_VARS;
+   if (0) fprintf(stderr, "%s\n", __FUNCTION__);
+
+   if (start+2 >= count) 
+      return;
+
+   if (PREFER_DISCRETE_ELT_PRIM( count-start, HW_TRIANGLES ))
+   {   
+      int dmasz = GET_MAX_HW_ELTS();
+      GLuint j, nr;
+
+      ELT_INIT( GL_TRIANGLES, HW_TRIANGLES );
+
+      dmasz = dmasz/3;
+
+      for (j = start + 1; j + 1 < count; j += nr - 1 ) {
+	 ELT_TYPE *dest;
+	 GLint i;
+
+	 nr = MIN2( dmasz, count - j );
+	 dest = ALLOC_ELTS( (nr-1)*3 );
+	    
+	 for ( i = j ; i+1 < j+nr ; i++ ) {
+	    EMIT_ELT( dest, 0, (start) );
+	    EMIT_ELT( dest, 1, (i) );
+	    EMIT_ELT( dest, 2, (i+1) );
+	    dest += 3;
+	 }
+	 
+	 CLOSE_ELTS();
+      }
+   }
+   else {
+      EMIT_PRIM( ctx, GL_TRIANGLE_FAN, HW_TRIANGLE_FAN, start, count );
+   }
+}
+
+
+static void TAG(render_poly_verts)( GLcontext *ctx,
+				    GLuint start,
+				    GLuint count,
+				    GLuint flags )
+{
+   LOCAL_VARS;
+   if (0) fprintf(stderr, "%s\n", __FUNCTION__);
+
+   if (start+2 >= count) 
+      return;
+
+   EMIT_PRIM( ctx, GL_POLYGON, HW_POLYGON, start, count );
+}
+
+static void TAG(render_quad_strip_verts)( GLcontext *ctx,
+					  GLuint start,
+					  GLuint count,
+					  GLuint flags )
+{
+   LOCAL_VARS;
+   if (0) fprintf(stderr, "%s\n", __FUNCTION__);
+
+   count -= (count-start) & 1;
+
+   if (start+3 >= count) 
+      return;
+
+   if (HAVE_QUAD_STRIPS) {
+      EMIT_PRIM( ctx, GL_QUAD_STRIP, HW_QUAD_STRIP, start, count );
+   } 
+   else if (ctx->_TriangleCaps & DD_FLATSHADE) {
+      LOCAL_VARS;
+      int dmasz = GET_MAX_HW_ELTS();
+      GLuint j, nr;
+
+      ELT_INIT( GL_TRIANGLES, HW_TRIANGLES );
+
+      /* Emit whole number of quads in total, and in each buffer.
+       */
+      dmasz = (dmasz/6)*2;
+
+      for (j = start; j + 3 < count; j += nr - 2 ) {
+	 ELT_TYPE *dest;
+	 GLint quads, i;
+
+	 nr = MIN2( dmasz, count - j );
+	 quads = (nr/2)-1;
+	 dest = ALLOC_ELTS( quads*6 );
+	    
+	 for ( i = j ; i < j+quads*2 ; i+=2 ) {
+	    EMIT_TWO_ELTS( dest, 0, (i+0), (i+1) );
+	    EMIT_TWO_ELTS( dest, 2, (i+2), (i+1) );
+	    EMIT_TWO_ELTS( dest, 4, (i+3), (i+2) );
+	    dest += 6;
+	 }
+
+	 CLOSE_ELTS();
+      }
+   }
+   else {
+      EMIT_PRIM( ctx, GL_TRIANGLE_STRIP, HW_TRIANGLE_STRIP_0, start, count );
+   }
+}
+
+
+static void TAG(render_quads_verts)( GLcontext *ctx,
+				     GLuint start,
+				     GLuint count,
+				     GLuint flags )
+{
+   LOCAL_VARS;
+   if (0) fprintf(stderr, "%s\n", __FUNCTION__);
+   count -= (count-start)%4;
+
+   if (start+3 >= count) 
+      return;
+
+   if (HAVE_QUADS) {
+      EMIT_PRIM( ctx, HW_QUADS, GL_QUADS, start, count );
+   } 
+   else {
+      /* Hardware doesn't have a quad primitive type -- simulate it
+       * using indexed vertices and the triangle primitive: 
+       */
+      LOCAL_VARS;
+      int dmasz = GET_MAX_HW_ELTS();
+      GLuint j, nr;
+
+      ELT_INIT( GL_TRIANGLES, HW_TRIANGLES );
+
+      /* Adjust for rendering as triangles:
+       */
+      dmasz = (dmasz/6)*4;
+
+      for (j = start; j < count; j += nr ) {
+	 ELT_TYPE *dest;
+	 GLint quads, i;
+
+	 nr = MIN2( dmasz, count - j );
+	 quads = nr/4;
+	 dest = ALLOC_ELTS( quads*6 );
+
+	 for ( i = j ; i < j+quads*4 ; i+=4 ) {
+	    EMIT_TWO_ELTS( dest, 0, (i+0), (i+1) );
+	    EMIT_TWO_ELTS( dest, 2, (i+3), (i+1) );
+	    EMIT_TWO_ELTS( dest, 4, (i+2), (i+3) );
+	    dest += 6;
+	 }
+
+	 CLOSE_ELTS();
+      }
+   }
+}
+
+static void TAG(render_noop)( GLcontext *ctx,
+			      GLuint start,
+			      GLuint count,
+			      GLuint flags )
+{
+}
+
+
+
+
+static render_func TAG(render_tab_verts)[GL_POLYGON+2] =
+{
+   TAG(render_points_verts),
+   TAG(render_lines_verts),
+   TAG(render_line_loop_verts),
+   TAG(render_line_strip_verts),
+   TAG(render_triangles_verts),
+   TAG(render_tri_strip_verts),
+   TAG(render_tri_fan_verts),
+   TAG(render_quads_verts),
+   TAG(render_quad_strip_verts),
+   TAG(render_poly_verts),
+   TAG(render_noop),
+};
+
+
+/****************************************************************************
+ *                 Render elts using hardware indexed verts                 *
+ ****************************************************************************/
+
+static void TAG(render_points_elts)( GLcontext *ctx,
+				     GLuint start,
+				     GLuint count,
+				     GLuint flags )
+{
+   LOCAL_VARS;
+   int dmasz = GET_MAX_HW_ELTS();
+   GLuint *elts = GET_MESA_ELTS();
+   GLuint j, nr;
+   ELT_TYPE *dest;
+
+   ELT_INIT( GL_POINTS, HW_POINTS );
+
+   for (j = start; j < count; j += nr ) {
+      nr = MIN2( dmasz, count - j );
+      dest = ALLOC_ELTS( nr );
+      dest = TAG(emit_elts)( ctx, dest, elts+j, nr );
+      CLOSE_ELTS();
+   }
+}
+
+
+
+static void TAG(render_lines_elts)( GLcontext *ctx,
+				    GLuint start,
+				    GLuint count,
+				    GLuint flags )
+{
+   LOCAL_VARS;
+   int dmasz = GET_MAX_HW_ELTS();
+   GLuint *elts = GET_MESA_ELTS();
+   GLuint j, nr;
+   ELT_TYPE *dest;
+
+   if (start+1 >= count)
+      return;
+
+   if ((flags & PRIM_BEGIN) && ctx->Line.StippleFlag) {
+      RESET_STIPPLE();
+      AUTO_STIPPLE( GL_TRUE );
+   }
+
+   ELT_INIT( GL_LINES, HW_LINES );
+
+   /* Emit whole number of lines in total and in each buffer:
+    */
+   count -= (count-start) & 1;
+   dmasz -= dmasz & 1;
+
+   for (j = start; j < count; j += nr ) {
+      nr = MIN2( dmasz, count - j );
+      dest = ALLOC_ELTS( nr );
+      dest = TAG(emit_elts)( ctx, dest, elts+j, nr );
+      CLOSE_ELTS();
+   }
+
+   if ((flags & PRIM_END) && ctx->Line.StippleFlag)
+      AUTO_STIPPLE( GL_FALSE );
+}
+
+
+static void TAG(render_line_strip_elts)( GLcontext *ctx,
+					 GLuint start,
+					 GLuint count,
+					 GLuint flags )
+{
+   LOCAL_VARS;
+   int dmasz = GET_MAX_HW_ELTS();
+   GLuint *elts = GET_MESA_ELTS();
+   GLuint j, nr;
+   ELT_TYPE *dest;
+
+   if (start+1 >= count)
+      return;
+
+   ELT_INIT( GL_LINE_STRIP, HW_LINE_STRIP );
+
+   if ((flags & PRIM_BEGIN) && ctx->Line.StippleFlag)
+      RESET_STIPPLE();
+
+   for (j = start; j + 1 < count; j += nr - 1 ) {
+      nr = MIN2( dmasz, count - j );
+      dest = ALLOC_ELTS( nr );
+      dest = TAG(emit_elts)( ctx, dest, elts+j, nr );
+      CLOSE_ELTS();
+   }
+}
+
+
+static void TAG(render_line_loop_elts)( GLcontext *ctx,
+					GLuint start,
+					GLuint count,
+					GLuint flags )
+{
+   LOCAL_VARS;
+   int dmasz = GET_MAX_HW_ELTS();
+   GLuint *elts = GET_MESA_ELTS();
+   GLuint j, nr;
+   ELT_TYPE *dest;
+
+   if (0) fprintf(stderr, "%s\n", __FUNCTION__);
+
+   if (flags & PRIM_BEGIN)
+      j = start;
+   else
+      j = start + 1;
+
+   
+   if (flags & PRIM_END) {
+      if (start+1 >= count)
+	 return;
+   } 
+   else {
+      if (j+1 >= count)
+	 return;
+   }
+
+   ELT_INIT( GL_LINE_STRIP, HW_LINE_STRIP );
+
+   if ((flags & PRIM_BEGIN) && ctx->Line.StippleFlag)
+      RESET_STIPPLE();
+
+   
+   /* Ensure last vertex doesn't wrap:
+    */
+   dmasz--;
+
+   for ( ; j + 1 < count; ) {
+      nr = MIN2( dmasz, count - j );
+      dest = ALLOC_ELTS( nr+1 );	/* Reserve possible space for last elt */
+      dest = TAG(emit_elts)( ctx, dest, elts+j, nr );
+      j += nr - 1;
+      if (j + 1 >= count && (flags & PRIM_END)) {
+	 dest = TAG(emit_elts)( ctx, dest, elts+start, 1 );
+      }
+      CLOSE_ELTS();
+   }
+}
+
+
+static void TAG(render_triangles_elts)( GLcontext *ctx,
+					GLuint start,
+					GLuint count,
+					GLuint flags )
+{
+   LOCAL_VARS;
+   GLuint *elts = GET_MESA_ELTS();
+   int dmasz = GET_MAX_HW_ELTS()/3*3;
+   GLuint j, nr;
+   ELT_TYPE *dest;
+
+   if (start+2 >= count)
+      return;
+
+   ELT_INIT( GL_TRIANGLES, HW_TRIANGLES );
+
+
+   /* Emit whole number of tris in total.  dmasz is already a multiple
+    * of 3.
+    */
+   count -= (count-start)%3;
+
+   for (j = start; j < count; j += nr) {
+      nr = MIN2( dmasz, count - j );
+      dest = ALLOC_ELTS( nr );
+      dest = TAG(emit_elts)( ctx, dest, elts+j, nr );
+      CLOSE_ELTS();
+   }
+}
+
+
+
+static void TAG(render_tri_strip_elts)( GLcontext *ctx,
+					GLuint start,
+					GLuint count,
+					GLuint flags )
+{
+   LOCAL_VARS;
+   GLuint j, nr;
+   GLuint *elts = GET_MESA_ELTS();
+   int dmasz = GET_MAX_HW_ELTS();
+   ELT_TYPE *dest;
+
+   if (start+2 >= count)
+      return;
+
+   ELT_INIT( GL_TRIANGLE_STRIP, HW_TRIANGLE_STRIP_0 );
+
+   /* Keep the same winding over multiple buffers:
+    */
+   dmasz -= (dmasz & 1);
+
+   for (j = start ; j + 2 < count; j += nr - 2 ) {
+      nr = MIN2( dmasz, count - j );
+
+      dest = ALLOC_ELTS( nr );
+      dest = TAG(emit_elts)( ctx, dest, elts+j, nr );
+      CLOSE_ELTS();
+   }
+}
+
+static void TAG(render_tri_fan_elts)( GLcontext *ctx,
+				      GLuint start,
+				      GLuint count,
+				      GLuint flags )
+{
+   LOCAL_VARS;
+   GLuint *elts = GET_MESA_ELTS();
+   GLuint j, nr;
+   int dmasz = GET_MAX_HW_ELTS();
+   ELT_TYPE *dest;
+
+   if (start+2 >= count)
+      return;
+
+   ELT_INIT( GL_TRIANGLE_FAN, HW_TRIANGLE_FAN );
+
+   for (j = start + 1 ; j + 1 < count; j += nr - 1 ) {
+      nr = MIN2( dmasz, count - j + 1 );
+      dest = ALLOC_ELTS( nr );
+      dest = TAG(emit_elts)( ctx, dest, elts+start, 1 );
+      dest = TAG(emit_elts)( ctx, dest, elts+j, nr - 1 );
+      CLOSE_ELTS();
+   }
+}
+
+
+static void TAG(render_poly_elts)( GLcontext *ctx,
+				   GLuint start,
+				   GLuint count,
+				   GLuint flags )
+{
+   LOCAL_VARS;
+   GLuint *elts = GET_MESA_ELTS();
+   GLuint j, nr;
+   int dmasz = GET_MAX_HW_ELTS();
+   ELT_TYPE *dest;
+
+   if (start+2 >= count)
+      return;
+
+   ELT_INIT( GL_POLYGON, HW_POLYGON );
+
+   for (j = start + 1 ; j + 1 < count ; j += nr - 1 ) {
+      nr = MIN2( dmasz, count - j + 1 );
+      dest = ALLOC_ELTS( nr );
+      dest = TAG(emit_elts)( ctx, dest, elts+start, 1 );
+      dest = TAG(emit_elts)( ctx, dest, elts+j, nr - 1 );
+      CLOSE_ELTS();
+   }
+}
+
+static void TAG(render_quad_strip_elts)( GLcontext *ctx,
+					 GLuint start,
+					 GLuint count,
+					 GLuint flags )
+{
+   if (start+3 >= count)
+      return;
+
+   if (HAVE_QUAD_STRIPS && 0) {
+   }
+   else {
+      LOCAL_VARS;
+      GLuint *elts = GET_MESA_ELTS();
+      int dmasz = GET_MAX_HW_ELTS();
+      GLuint j, nr;
+      ELT_TYPE *dest;
+
+      /* Emit whole number of quads in total, and in each buffer.
+       */
+      dmasz -= dmasz & 1;
+      count -= (count-start) & 1;
+
+      if (ctx->_TriangleCaps & DD_FLATSHADE) {
+	 ELT_INIT( GL_TRIANGLES, HW_TRIANGLES );
+
+	 dmasz = dmasz/6*2;
+
+	 for (j = start; j + 3 < count; j += nr - 2 ) {
+	    nr = MIN2( dmasz, count - j );
+
+	    if (nr >= 4)
+	    {
+	       GLint quads = (nr/2)-1;
+	       ELT_TYPE *dest = ALLOC_ELTS( quads*6 );
+	       GLint i;
+
+	       for ( i = j-start ; i < j-start+quads ; i++, elts += 2 ) {
+		  EMIT_TWO_ELTS( dest, 0, elts[0], elts[1] );
+		  EMIT_TWO_ELTS( dest, 2, elts[2], elts[1] );
+		  EMIT_TWO_ELTS( dest, 4, elts[3], elts[2] );
+		  dest += 6;
+	       }
+
+	       CLOSE_ELTS();
+	    }
+	 }
+      }
+      else {
+	 ELT_INIT( GL_TRIANGLE_STRIP, HW_TRIANGLE_STRIP_0 );
+
+	 for (j = start; j + 3 < count; j += nr - 2 ) {
+	    nr = MIN2( dmasz, count - j );
+	    dest = ALLOC_ELTS( nr );
+	    dest = TAG(emit_elts)( ctx, dest, elts+j, nr );
+	    CLOSE_ELTS();
+	 }
+      }
+   }
+}
+
+
+static void TAG(render_quads_elts)( GLcontext *ctx,
+				    GLuint start,
+				    GLuint count,
+				    GLuint flags )
+{
+   if (start+3 >= count)
+      return;
+
+   if (HAVE_QUADS && 0) {
+   } else {
+      LOCAL_VARS;
+      GLuint *elts = GET_MESA_ELTS();
+      int dmasz = GET_MAX_HW_ELTS();
+      GLuint j, nr;
+
+      ELT_INIT( GL_TRIANGLES, HW_TRIANGLES );
+
+      /* Emit whole number of quads in total, and in each buffer.
+       */
+      dmasz -= dmasz & 3;
+      count -= (count-start) & 3;
+
+      /* Adjust for rendering as triangles:
+       */
+      dmasz = dmasz/6*4;
+
+      for (j = start; j + 3 < count; j += nr ) {
+	 nr = MIN2( dmasz, count - j );
+
+	 {
+	    GLint quads = nr/4;
+	    ELT_TYPE *dest = ALLOC_ELTS( quads * 6 );
+	    GLint i;
+
+	    for ( i = j-start ; i < j-start+quads ; i++, elts += 4 ) {
+	       EMIT_TWO_ELTS( dest, 0, elts[0], elts[1] );
+	       EMIT_TWO_ELTS( dest, 2, elts[3], elts[1] );
+	       EMIT_TWO_ELTS( dest, 4, elts[2], elts[3] );
+	       dest += 6;
+	    }
+
+	    CLOSE_ELTS();
+	 }
+      }
+   }
+}
+
+
+
+static render_func TAG(render_tab_elts)[GL_POLYGON+2] =
+{
+   TAG(render_points_elts),
+   TAG(render_lines_elts),
+   TAG(render_line_loop_elts),
+   TAG(render_line_strip_elts),
+   TAG(render_triangles_elts),
+   TAG(render_tri_strip_elts),
+   TAG(render_tri_fan_elts),
+   TAG(render_quads_elts),
+   TAG(render_quad_strip_elts),
+   TAG(render_poly_elts),
+   TAG(render_noop),
+};
diff --git a/reactos/lib/mesa32/src/tnl_dd/t_dd_rendertmp.h b/reactos/lib/mesa32/src/tnl_dd/t_dd_rendertmp.h
new file mode 100644
index 00000000000..b9f030195d5
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl_dd/t_dd_rendertmp.h
@@ -0,0 +1,434 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+
+#ifndef POSTFIX
+#define POSTFIX
+#endif
+
+#ifndef INIT
+#define INIT(x)
+#endif
+
+#ifndef NEED_EDGEFLAG_SETUP
+#define NEED_EDGEFLAG_SETUP 0
+#define EDGEFLAG_GET(a) 0
+#define EDGEFLAG_SET(a,b) (void)b
+#endif
+
+#ifndef RESET_STIPPLE
+#define RESET_STIPPLE
+#endif
+
+#ifndef RESET_OCCLUSION
+#define RESET_OCCLUSION
+#endif
+
+#ifndef TEST_PRIM_END
+#define TEST_PRIM_END(flags) (flags & PRIM_END)
+#define TEST_PRIM_BEGIN(flags) (flags & PRIM_BEGIN)
+#define TEST_PRIM_PARITY(flags) (flags & PRIM_PARITY)
+#endif
+
+#ifndef ELT
+#define ELT(x) x
+#endif
+
+#ifndef RENDER_TAB_QUALIFIER
+#define RENDER_TAB_QUALIFIER static
+#endif
+
+static void TAG(render_points)( GLcontext *ctx,
+				GLuint start,
+				GLuint count,
+				GLuint flags )
+{
+   LOCAL_VARS;
+   (void) flags;
+
+   RESET_OCCLUSION;
+   INIT(GL_POINTS);
+   RENDER_POINTS( start, count );
+   POSTFIX;
+}
+
+static void TAG(render_lines)( GLcontext *ctx,
+			       GLuint start,
+			       GLuint count,
+			       GLuint flags )
+{
+   GLuint j;
+   LOCAL_VARS;
+   (void) flags;
+
+   RESET_OCCLUSION;
+   INIT(GL_LINES);
+   for (j=start+1; j<count; j+=2 ) {
+      RENDER_LINE( ELT(j-1), ELT(j) );
+      RESET_STIPPLE;
+   }
+   POSTFIX;
+}
+
+
+static void TAG(render_line_strip)( GLcontext *ctx,
+				    GLuint start,
+				    GLuint count,
+				    GLuint flags )
+{
+   GLuint j;
+   LOCAL_VARS;
+   (void) flags;
+
+   RESET_OCCLUSION;
+   INIT(GL_LINE_STRIP);
+
+   for (j=start+1; j<count; j++ )
+      RENDER_LINE( ELT(j-1), ELT(j) );
+
+   if (TEST_PRIM_END(flags))
+      RESET_STIPPLE;
+
+   POSTFIX;
+}
+
+
+static void TAG(render_line_loop)( GLcontext *ctx,
+				   GLuint start,
+				   GLuint count,
+				   GLuint flags )
+{
+   GLuint i;
+   LOCAL_VARS;
+
+   (void) flags;
+
+   RESET_OCCLUSION;
+   INIT(GL_LINE_LOOP);
+
+   if (start+1 < count) {
+      if (TEST_PRIM_BEGIN(flags)) {
+	 RENDER_LINE( ELT(start), ELT(start+1) );
+      }
+
+      for ( i = start+2 ; i < count ; i++) {
+	 RENDER_LINE( ELT(i-1), ELT(i) );
+      }
+
+      if ( TEST_PRIM_END(flags)) {
+	 RENDER_LINE( ELT(count-1), ELT(start) );
+	 RESET_STIPPLE;
+      }
+   }
+
+   POSTFIX;
+}
+
+
+static void TAG(render_triangles)( GLcontext *ctx,
+				   GLuint start,
+				   GLuint count,
+				   GLuint flags )
+{
+   GLuint j;
+   LOCAL_VARS;
+   (void) flags;
+
+   INIT(GL_TRIANGLES);
+   if (NEED_EDGEFLAG_SETUP) {
+      for (j=start+2; j<count; j+=3) {
+	 /* Leave the edgeflags as supplied by the user.
+	  */
+	 RENDER_TRI( ELT(j-2), ELT(j-1), ELT(j) );
+	 RESET_STIPPLE;
+      }
+   } else {
+      for (j=start+2; j<count; j+=3) {
+	 RENDER_TRI( ELT(j-2), ELT(j-1), ELT(j) );
+      }
+   }
+   POSTFIX;
+}
+
+
+
+static void TAG(render_tri_strip)( GLcontext *ctx,
+				   GLuint start,
+				   GLuint count,
+				   GLuint flags )
+{
+   GLuint j;
+   GLuint parity = 0;
+   LOCAL_VARS;
+
+   INIT(GL_TRIANGLE_STRIP);
+   if (NEED_EDGEFLAG_SETUP) {
+      for (j=start+2;j<count;j++,parity^=1) {
+	 GLuint ej2 = ELT(j-2+parity);
+	 GLuint ej1 = ELT(j-1-parity);
+	 GLuint ej = ELT(j);
+	 GLboolean ef2 = EDGEFLAG_GET( ej2 );
+	 GLboolean ef1 = EDGEFLAG_GET( ej1 );
+	 GLboolean ef = EDGEFLAG_GET( ej );
+	 EDGEFLAG_SET( ej2, GL_TRUE );
+	 EDGEFLAG_SET( ej1, GL_TRUE );
+	 EDGEFLAG_SET( ej, GL_TRUE );
+	 RENDER_TRI( ej2, ej1, ej );
+	 EDGEFLAG_SET( ej2, ef2 );
+	 EDGEFLAG_SET( ej1, ef1 );
+	 EDGEFLAG_SET( ej, ef );
+	 RESET_STIPPLE;
+      }
+   } else {
+      for (j=start+2; j<count ; j++, parity^=1) {
+	 RENDER_TRI( ELT(j-2+parity), ELT(j-1-parity), ELT(j) );
+      }
+   }
+   POSTFIX;
+}
+
+
+static void TAG(render_tri_fan)( GLcontext *ctx,
+				 GLuint start,
+				 GLuint count,
+				 GLuint flags )
+{
+   GLuint j;
+   LOCAL_VARS;
+   (void) flags;
+
+   INIT(GL_TRIANGLE_FAN);
+   if (NEED_EDGEFLAG_SETUP) {
+      for (j=start+2;j<count;j++) {
+	 /* For trifans, all edges are boundary.
+	  */
+	 GLuint ejs = ELT(start);
+	 GLuint ej1 = ELT(j-1);
+	 GLuint ej = ELT(j);
+	 GLboolean efs = EDGEFLAG_GET( ejs );
+	 GLboolean ef1 = EDGEFLAG_GET( ej1 );
+	 GLboolean ef = EDGEFLAG_GET( ej );
+	 EDGEFLAG_SET( ejs, GL_TRUE );
+	 EDGEFLAG_SET( ej1, GL_TRUE );
+	 EDGEFLAG_SET( ej, GL_TRUE );
+	 RENDER_TRI( ejs, ej1, ej);
+	 EDGEFLAG_SET( ejs, efs );
+	 EDGEFLAG_SET( ej1, ef1 );
+	 EDGEFLAG_SET( ej, ef );
+	 RESET_STIPPLE;
+      }
+   } else {
+      for (j=start+2;j<count;j++) {
+	 RENDER_TRI( ELT(start), ELT(j-1), ELT(j) );
+      }
+   }
+
+   POSTFIX;
+}
+
+
+static void TAG(render_poly)( GLcontext *ctx,
+			      GLuint start,
+			      GLuint count,
+			      GLuint flags )
+{
+   GLuint j = start+2;
+   LOCAL_VARS;
+   (void) flags;
+
+   INIT(GL_POLYGON);
+   if (NEED_EDGEFLAG_SETUP) {
+      GLboolean efstart = EDGEFLAG_GET( ELT(start) );
+      GLboolean efcount = EDGEFLAG_GET( ELT(count-1) );
+
+      /* If the primitive does not begin here, the first edge
+       * is non-boundary.
+       */
+      if (!TEST_PRIM_BEGIN(flags))
+	 EDGEFLAG_SET( ELT(start), GL_FALSE );
+
+      /* If the primitive does not end here, the final edge is
+       * non-boundary.
+       */
+      if (!TEST_PRIM_END(flags))
+	 EDGEFLAG_SET( ELT(count-1), GL_FALSE );
+
+      /* Draw the first triangles (possibly zero)
+       */
+      if (j<count-1) {
+	 GLboolean ef = EDGEFLAG_GET( ELT(j) );
+	 EDGEFLAG_SET( ELT(j), GL_FALSE );
+	 RENDER_TRI( ELT(j-1), ELT(j), ELT(start) );
+	 EDGEFLAG_SET( ELT(j), ef );
+	 j++;
+
+	 /* Don't render the first edge again:
+	  */
+	 EDGEFLAG_SET( ELT(start), GL_FALSE );
+
+	 for (;j<count-1;j++) {
+	    GLboolean efj = EDGEFLAG_GET( ELT(j) );
+	    EDGEFLAG_SET( ELT(j), GL_FALSE );
+	    RENDER_TRI( ELT(j-1), ELT(j), ELT(start) );
+	    EDGEFLAG_SET( ELT(j), efj );
+	 }
+      }
+
+      /* Draw the last or only triangle
+       */
+      if (j < count)
+	 RENDER_TRI( ELT(j-1), ELT(j), ELT(start) );
+
+      /* Restore the first and last edgeflags:
+       */
+      EDGEFLAG_SET( ELT(count-1), efcount );
+      EDGEFLAG_SET( ELT(start), efstart );
+
+      if (TEST_PRIM_END(flags)) {
+	 RESET_STIPPLE;
+      }
+   }
+   else {
+      for (j=start+2;j<count;j++) {
+	 RENDER_TRI( ELT(j-1), ELT(j), ELT(start) );
+      }
+   }
+   POSTFIX;
+}
+
+static void TAG(render_quads)( GLcontext *ctx,
+			       GLuint start,
+			       GLuint count,
+			       GLuint flags )
+{
+   GLuint j;
+   LOCAL_VARS;
+   (void) flags;
+
+   INIT(GL_QUADS);
+   if (NEED_EDGEFLAG_SETUP) {
+      for (j=start+3; j<count; j+=4) {
+	 /* Use user-specified edgeflags for quads.
+	  */
+	 RENDER_QUAD( ELT(j-3), ELT(j-2), ELT(j-1), ELT(j) );
+	 RESET_STIPPLE;
+      }
+   } else {
+      for (j=start+3; j<count; j+=4) {
+	 RENDER_QUAD( ELT(j-3), ELT(j-2), ELT(j-1), ELT(j) );
+      }
+   }
+   POSTFIX;
+}
+
+static void TAG(render_quad_strip)( GLcontext *ctx,
+				    GLuint start,
+				    GLuint count,
+				    GLuint flags )
+{
+   GLuint j;
+   LOCAL_VARS;
+   (void) flags;
+
+   INIT(GL_QUAD_STRIP);
+   if (NEED_EDGEFLAG_SETUP) {
+      for (j=start+3;j<count;j+=2) {
+	 /* All edges are boundary.  Set edgeflags to 1, draw the
+	  * quad, and restore them to the original values.
+	  */
+	 GLboolean ef3 = EDGEFLAG_GET( ELT(j-3) );
+	 GLboolean ef2 = EDGEFLAG_GET( ELT(j-2) );
+	 GLboolean ef1 = EDGEFLAG_GET( ELT(j-1) );
+	 GLboolean ef = EDGEFLAG_GET( ELT(j) );
+	 EDGEFLAG_SET( ELT(j-3), GL_TRUE );
+	 EDGEFLAG_SET( ELT(j-2), GL_TRUE );
+	 EDGEFLAG_SET( ELT(j-1), GL_TRUE );
+	 EDGEFLAG_SET( ELT(j), GL_TRUE );
+	 RENDER_QUAD( ELT(j-1), ELT(j-3), ELT(j-2), ELT(j) );
+	 EDGEFLAG_SET( ELT(j-3), ef3 );
+	 EDGEFLAG_SET( ELT(j-2), ef2 );
+	 EDGEFLAG_SET( ELT(j-1), ef1 );
+	 EDGEFLAG_SET( ELT(j), ef );
+	 RESET_STIPPLE;
+      }
+   } else {
+      for (j=start+3;j<count;j+=2) {
+	 RENDER_QUAD( ELT(j-1), ELT(j-3), ELT(j-2), ELT(j) );
+      }
+   }
+   POSTFIX;
+}
+
+static void TAG(render_noop)( GLcontext *ctx,
+			      GLuint start,
+			      GLuint count,
+			      GLuint flags )
+{
+   (void)(ctx && start && count && flags);
+}
+
+RENDER_TAB_QUALIFIER void (*TAG(render_tab)[GL_POLYGON+2])(GLcontext *,
+							   GLuint,
+							   GLuint,
+							   GLuint) =
+{
+   TAG(render_points),
+   TAG(render_lines),
+   TAG(render_line_loop),
+   TAG(render_line_strip),
+   TAG(render_triangles),
+   TAG(render_tri_strip),
+   TAG(render_tri_fan),
+   TAG(render_quads),
+   TAG(render_quad_strip),
+   TAG(render_poly),
+   TAG(render_noop),
+};
+
+
+
+#ifndef PRESERVE_VB_DEFS
+#undef RENDER_TRI
+#undef RENDER_QUAD
+#undef RENDER_LINE
+#undef RENDER_POINTS
+#undef LOCAL_VARS
+#undef INIT
+#undef POSTFIX
+#undef RESET_STIPPLE
+#undef DBG
+#undef ELT
+#undef RENDER_TAB_QUALIFIER
+#endif
+
+#ifndef PRESERVE_TAG
+#undef TAG
+#endif
+
+#undef PRESERVE_VB_DEFS
+#undef PRESERVE_TAG
diff --git a/reactos/lib/mesa32/src/tnl_dd/t_dd_triemit.h b/reactos/lib/mesa32/src/tnl_dd/t_dd_triemit.h
new file mode 100644
index 00000000000..2f5bcee7ec4
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl_dd/t_dd_triemit.h
@@ -0,0 +1,157 @@
+#ifndef DO_DEBUG_VERTS
+#define DO_DEBUG_VERTS 0
+#endif 
+
+#ifndef PRINT_VERTEX
+#define PRINT_VERTEX(x) 
+#endif
+
+#if defined(USE_X86_ASM)
+#define COPY_DWORDS( j, vb, vertsize, v )				\
+do {									\
+	int __tmp;							\
+	__asm__ __volatile__( "rep ; movsl"				\
+			      : "=%c" (j), "=D" (vb), "=S" (__tmp)	\
+			      : "0" (vertsize),				\
+			        "D" ((long)vb),				\
+			        "S" ((long)v) );			\
+} while (0)
+#else
+#define COPY_DWORDS( j, vb, vertsize, v )				\
+do {									\
+   for ( j = 0 ; j < vertsize ; j++ )					\
+      vb[j] = ((GLuint *)v)[j];						\
+   vb += vertsize;							\
+} while (0)
+#endif
+
+
+
+#if HAVE_QUADS
+static __inline void TAG(quad)( CTX_ARG,
+				VERTEX *v0,
+				VERTEX *v1,
+				VERTEX *v2,
+				VERTEX *v3 )
+{
+   GLuint vertsize = GET_VERTEX_DWORDS();
+   GLuint *vb = (GLuint *)ALLOC_VERTS( 4, vertsize);
+   GLuint j;
+
+   if (DO_DEBUG_VERTS) {
+      fprintf(stderr, "%s\n", __FUNCTION__);
+      PRINT_VERTEX(v0);
+      PRINT_VERTEX(v1);
+      PRINT_VERTEX(v2);
+      PRINT_VERTEX(v3);
+   }
+      
+   COPY_DWORDS( j, vb, vertsize, v0 );
+   COPY_DWORDS( j, vb, vertsize, v1 );
+   COPY_DWORDS( j, vb, vertsize, v2 );
+   COPY_DWORDS( j, vb, vertsize, v3 );
+}
+#else
+static __inline void TAG(quad)( CTX_ARG,
+				VERTEX *v0,
+				VERTEX *v1,
+				VERTEX *v2,
+				VERTEX *v3 )
+{
+   GLuint vertsize = GET_VERTEX_DWORDS();
+   GLuint *vb = (GLuint *)ALLOC_VERTS(  6, vertsize);
+   GLuint j;
+
+   if (DO_DEBUG_VERTS) {
+      fprintf(stderr, "%s\n", __FUNCTION__);
+      PRINT_VERTEX(v0);
+      PRINT_VERTEX(v1);
+      PRINT_VERTEX(v2);
+      PRINT_VERTEX(v3);
+   }
+ 
+   COPY_DWORDS( j, vb, vertsize, v0 );
+   COPY_DWORDS( j, vb, vertsize, v1 );
+   COPY_DWORDS( j, vb, vertsize, v3 );
+   COPY_DWORDS( j, vb, vertsize, v1 );
+   COPY_DWORDS( j, vb, vertsize, v2 );
+   COPY_DWORDS( j, vb, vertsize, v3 );
+}
+#endif
+
+
+static __inline void TAG(triangle)( CTX_ARG,
+				    VERTEX *v0,
+				    VERTEX *v1,
+				    VERTEX *v2 )
+{
+   GLuint vertsize = GET_VERTEX_DWORDS();
+   GLuint *vb = (GLuint *)ALLOC_VERTS( 3, vertsize);
+   GLuint j;
+
+   if (DO_DEBUG_VERTS) {
+      fprintf(stderr, "%s\n", __FUNCTION__);
+      PRINT_VERTEX(v0);
+      PRINT_VERTEX(v1);
+      PRINT_VERTEX(v2);
+   }
+
+   COPY_DWORDS( j, vb, vertsize, v0 );
+   COPY_DWORDS( j, vb, vertsize, v1 );
+   COPY_DWORDS( j, vb, vertsize, v2 );
+}
+
+
+#if HAVE_LINES
+static __inline void TAG(line)( CTX_ARG,
+				VERTEX *v0,
+				VERTEX *v1 )
+{
+   GLuint vertsize = GET_VERTEX_DWORDS();
+   GLuint *vb = (GLuint *)ALLOC_VERTS( 2, vertsize);
+   GLuint j;
+
+   COPY_DWORDS( j, vb, vertsize, v0 );
+   COPY_DWORDS( j, vb, vertsize, v1 );
+}
+#endif
+
+#if HAVE_POINTS
+static __inline void TAG(point)( CTX_ARG,
+				 VERTEX *v0 )
+{
+   GLuint vertsize = GET_VERTEX_DWORDS();
+   GLuint *vb = (GLuint *)ALLOC_VERTS( 1, vertsize);
+   int j;
+
+   COPY_DWORDS( j, vb, vertsize, v0 );
+}
+#endif
+
+
+static void TAG(fast_clipped_poly)( GLcontext *ctx, const GLuint *elts,
+				    GLuint n )
+{
+   LOCAL_VARS
+   GLuint vertsize = GET_VERTEX_DWORDS();
+   GLuint *vb = (GLuint *)ALLOC_VERTS( (n-2) * 3, vertsize );
+   const GLuint *start = (const GLuint *)VERT(elts[0]);
+   int i,j;
+
+   if (DO_DEBUG_VERTS) {
+      fprintf(stderr, "%s\n", __FUNCTION__);
+      PRINT_VERTEX(VERT(elts[0]));
+      PRINT_VERTEX(VERT(elts[1]));
+   }
+
+   for (i = 2 ; i < n ; i++) {
+      if (DO_DEBUG_VERTS) {
+	 PRINT_VERTEX(VERT(elts[i]));
+      }
+
+      COPY_DWORDS( j, vb, vertsize, VERT(elts[i-1]) );
+      COPY_DWORDS( j, vb, vertsize, VERT(elts[i]) );
+      COPY_DWORDS( j, vb, vertsize, start );
+   }
+}
+
diff --git a/reactos/lib/mesa32/src/tnl_dd/t_dd_tritmp.h b/reactos/lib/mesa32/src/tnl_dd/t_dd_tritmp.h
new file mode 100644
index 00000000000..b26347b77eb
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl_dd/t_dd_tritmp.h
@@ -0,0 +1,743 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+
+/* Template for building functions to plug into the driver interface
+ * of t_vb_render.c:
+ *     ctx->Driver.QuadFunc
+ *     ctx->Driver.TriangleFunc
+ *     ctx->Driver.LineFunc
+ *     ctx->Driver.PointsFunc
+ *
+ * DO_TWOSIDE:   Plug back-color values from the VB into backfacing triangles,
+ *               and restore vertices afterwards.
+ * DO_OFFSET:    Calculate offset for triangles and adjust vertices.  Restore
+ *               vertices after rendering.
+ * DO_FLAT:      For hardware without native flatshading, copy provoking colors
+ *               into the other vertices.  Restore after rendering.
+ * DO_UNFILLED:  Decompose triangles to lines and points where appropriate.
+ *
+ * HAVE_RGBA: Vertices have rgba values (otherwise index values).
+ * HAVE_SPEC: Vertices have secondary rgba values.
+ *
+ * VERT_X(v): Alias for vertex x value.
+ * VERT_Y(v): Alias for vertex y value.
+ * VERT_Z(v): Alias for vertex z value.
+ * DEPTH_SCALE: Scale for offset.
+ *
+ * VERTEX: Hardware vertex type.
+ * GET_VERTEX(n): Retreive vertex with index n.
+ * AREA_IS_CCW(a): Return true if triangle with signed area a is ccw.
+ *
+ * VERT_SET_RGBA: Assign vertex rgba from VB color.
+ * VERT_COPY_RGBA: Copy vertex rgba another vertex.
+ * VERT_SAVE_RGBA: Save vertex rgba to a local variable.
+ * VERT_RESTORE_RGBA: Restore vertex rgba from a local variable.
+ *   --> Similar for IND and SPEC.
+ *
+ * LOCAL_VARS(n): (At least) define local vars for save/restore rgba.
+ *
+ */
+
+#if HAVE_RGBA
+#define VERT_SET_IND( v, c ) (void) c
+#define VERT_COPY_IND( v0, v1 )
+#define VERT_SAVE_IND( idx )
+#define VERT_RESTORE_IND( idx )
+#if HAVE_BACK_COLORS
+#define VERT_SET_RGBA( v, c )
+#endif
+#else
+#define VERT_SET_RGBA( v, c ) (void) c
+#define VERT_COPY_RGBA( v0, v1 )
+#define VERT_SAVE_RGBA( idx )
+#define VERT_RESTORE_RGBA( idx )
+#if HAVE_BACK_COLORS
+#define VERT_SET_IND( v, c )
+#endif
+#endif
+
+#if !HAVE_SPEC
+#define VERT_SET_SPEC( v, c ) (void) c
+#define VERT_COPY_SPEC( v0, v1 )
+#define VERT_SAVE_SPEC( idx )
+#define VERT_RESTORE_SPEC( idx )
+#if HAVE_BACK_COLORS
+#define VERT_COPY_SPEC1( v )
+#endif
+#else
+#if HAVE_BACK_COLORS
+#define VERT_SET_SPEC( v, c )
+#endif
+#endif
+
+#if !HAVE_BACK_COLORS
+#define VERT_COPY_SPEC1( v )
+#define VERT_COPY_IND1( v )
+#define VERT_COPY_RGBA1( v )
+#endif
+
+#ifndef INSANE_VERTICES
+#define VERT_SET_Z(v,val) VERT_Z(v) = val
+#define VERT_Z_ADD(v,val) VERT_Z(v) += val
+#endif
+
+#if DO_TRI
+static void TAG(triangle)( GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 )
+{
+   struct vertex_buffer *VB = &TNL_CONTEXT( ctx )->vb;
+   VERTEX *v[3];
+   GLfloat offset;
+   GLfloat z[3];
+   GLenum mode = GL_FILL;
+   GLuint facing;
+   LOCAL_VARS(3);
+
+/*     fprintf(stderr, "%s\n", __FUNCTION__); */
+
+   v[0] = (VERTEX *)GET_VERTEX(e0);
+   v[1] = (VERTEX *)GET_VERTEX(e1);
+   v[2] = (VERTEX *)GET_VERTEX(e2);
+
+   if (DO_TWOSIDE || DO_OFFSET || DO_UNFILLED)
+   {
+      GLfloat ex = VERT_X(v[0]) - VERT_X(v[2]);
+      GLfloat ey = VERT_Y(v[0]) - VERT_Y(v[2]);
+      GLfloat fx = VERT_X(v[1]) - VERT_X(v[2]);
+      GLfloat fy = VERT_Y(v[1]) - VERT_Y(v[2]);
+      GLfloat cc = ex*fy - ey*fx;
+
+      if (DO_TWOSIDE || DO_UNFILLED)
+      {
+	 facing = AREA_IS_CCW( cc ) ^ ctx->Polygon._FrontBit;
+
+	 if (DO_UNFILLED) {
+	    if (facing) {
+	       mode = ctx->Polygon.BackMode;
+	       if (ctx->Polygon.CullFlag &&
+		   ctx->Polygon.CullFaceMode != GL_FRONT) {
+		  return;
+	       }
+	    } else {
+	       mode = ctx->Polygon.FrontMode;
+	       if (ctx->Polygon.CullFlag &&
+		   ctx->Polygon.CullFaceMode != GL_BACK) {
+		  return;
+	       }
+	    }
+	 }
+
+	 if (DO_TWOSIDE && facing == 1)
+	 {
+	    if (HAVE_RGBA) {
+	       if (HAVE_BACK_COLORS) {
+		  if (!DO_FLAT) {
+		     VERT_SAVE_RGBA( 0 );
+		     VERT_SAVE_RGBA( 1 );
+		     VERT_COPY_RGBA1( v[0] );
+		     VERT_COPY_RGBA1( v[1] );
+		  }
+		  VERT_SAVE_RGBA( 2 );
+		  VERT_COPY_RGBA1( v[2] );
+		  if (HAVE_SPEC) {
+		     if (!DO_FLAT) {
+			VERT_SAVE_SPEC( 0 );
+			VERT_SAVE_SPEC( 1 );
+			VERT_COPY_SPEC1( v[0] );
+			VERT_COPY_SPEC1( v[1] );
+		     }
+		     VERT_SAVE_SPEC( 2 );
+		     VERT_COPY_SPEC1( v[2] );
+		  }
+	       }
+	       else {
+		  GLfloat (*vbcolor)[4] = VB->ColorPtr[1]->data;
+		  ASSERT(VB->ColorPtr[1]->stride == 4*sizeof(GLfloat));
+		  (void) vbcolor;
+
+		  if (!DO_FLAT) {
+		     VERT_SAVE_RGBA( 0 );
+		     VERT_SAVE_RGBA( 1 );
+		     VERT_SET_RGBA( v[0], vbcolor[e0] );
+		     VERT_SET_RGBA( v[1], vbcolor[e1] );
+		  }
+		  VERT_SAVE_RGBA( 2 );
+		  VERT_SET_RGBA( v[2], vbcolor[e2] );
+
+		  if (HAVE_SPEC && VB->SecondaryColorPtr[1]) {
+		     GLfloat (*vbspec)[4] = VB->SecondaryColorPtr[1]->data;
+
+		     if (!DO_FLAT) {
+			VERT_SAVE_SPEC( 0 );
+			VERT_SAVE_SPEC( 1 );
+			VERT_SET_SPEC( v[0], vbspec[e0] );
+			VERT_SET_SPEC( v[1], vbspec[e1] );
+		     }
+		     VERT_SAVE_SPEC( 2 );
+		     VERT_SET_SPEC( v[2], vbspec[e2] );
+		  }
+	       }
+	    }
+	    else {
+	       GLfloat (*vbindex) = (GLfloat *)VB->IndexPtr[1]->data;
+	       if (!DO_FLAT) {
+		  VERT_SAVE_IND( 0 );
+		  VERT_SAVE_IND( 1 );
+		  VERT_SET_IND( v[0], vbindex[e0] );
+		  VERT_SET_IND( v[1], vbindex[e1] );
+	       }
+	       VERT_SAVE_IND( 2 );
+	       VERT_SET_IND( v[2], vbindex[e2] );
+	    }
+	 }
+      }
+
+
+      if (DO_OFFSET)
+      {
+	 offset = ctx->Polygon.OffsetUnits * DEPTH_SCALE;
+	 z[0] = VERT_Z(v[0]);
+	 z[1] = VERT_Z(v[1]);
+	 z[2] = VERT_Z(v[2]);
+	 if (cc * cc > 1e-16) {
+	    GLfloat ic	= 1.0 / cc;
+	    GLfloat ez	= z[0] - z[2];
+	    GLfloat fz	= z[1] - z[2];
+	    GLfloat a	= ey*fz - ez*fy;
+	    GLfloat b	= ez*fx - ex*fz;
+	    GLfloat ac	= a * ic;
+	    GLfloat bc	= b * ic;
+	    if ( ac < 0.0f ) ac = -ac;
+	    if ( bc < 0.0f ) bc = -bc;
+	    offset += MAX2( ac, bc ) * ctx->Polygon.OffsetFactor;
+	 }
+	 offset *= ctx->MRD;
+      }
+   }
+
+   if (DO_FLAT) {
+      if (HAVE_RGBA) {
+	 VERT_SAVE_RGBA( 0 );
+	 VERT_SAVE_RGBA( 1 );
+	 VERT_COPY_RGBA( v[0], v[2] );
+	 VERT_COPY_RGBA( v[1], v[2] );
+	 if (HAVE_SPEC && VB->SecondaryColorPtr[0]) {
+	    VERT_SAVE_SPEC( 0 );
+	    VERT_SAVE_SPEC( 1 );
+	    VERT_COPY_SPEC( v[0], v[2] );
+	    VERT_COPY_SPEC( v[1], v[2] );
+	 }
+      }
+      else {
+	 VERT_SAVE_IND( 0 );
+	 VERT_SAVE_IND( 1 );
+	 VERT_COPY_IND( v[0], v[2] );
+	 VERT_COPY_IND( v[1], v[2] );
+      }
+   }
+
+   if (mode == GL_POINT) {
+      if (DO_OFFSET && ctx->Polygon.OffsetPoint) {
+	 VERT_Z_ADD(v[0], offset);
+	 VERT_Z_ADD(v[1], offset);
+	 VERT_Z_ADD(v[2], offset);
+      }
+      UNFILLED_TRI( ctx, GL_POINT, e0, e1, e2 );
+   } else if (mode == GL_LINE) {
+      if (DO_OFFSET && ctx->Polygon.OffsetLine) {
+	 VERT_Z_ADD(v[0], offset);
+	 VERT_Z_ADD(v[1], offset);
+	 VERT_Z_ADD(v[2], offset);
+      }
+      UNFILLED_TRI( ctx, GL_LINE, e0, e1, e2 );
+   } else {
+      if (DO_OFFSET && ctx->Polygon.OffsetFill) {
+	 VERT_Z_ADD(v[0], offset);
+	 VERT_Z_ADD(v[1], offset);
+	 VERT_Z_ADD(v[2], offset);
+      }
+      if (DO_UNFILLED)
+	 RASTERIZE( GL_TRIANGLES );
+      TRI( v[0], v[1], v[2] );
+   }
+
+   if (DO_OFFSET)
+   {
+      VERT_SET_Z(v[0], z[0]);
+      VERT_SET_Z(v[1], z[1]);
+      VERT_SET_Z(v[2], z[2]);
+   }
+
+   if (DO_TWOSIDE && facing == 1)
+   {
+      if (HAVE_RGBA) {
+	 if (!DO_FLAT) {
+	    VERT_RESTORE_RGBA( 0 );
+	    VERT_RESTORE_RGBA( 1 );
+	 }
+	 VERT_RESTORE_RGBA( 2 );
+	 if (HAVE_SPEC) {
+	    if (!DO_FLAT) {
+	       VERT_RESTORE_SPEC( 0 );
+	       VERT_RESTORE_SPEC( 1 );
+	    }
+	    VERT_RESTORE_SPEC( 2 );
+	 }
+      }
+      else {
+	 if (!DO_FLAT) {
+	    VERT_RESTORE_IND( 0 );
+	    VERT_RESTORE_IND( 1 );
+	 }
+	 VERT_RESTORE_IND( 2 );
+      }
+   }
+
+
+   if (DO_FLAT) {
+      if (HAVE_RGBA) {
+	 VERT_RESTORE_RGBA( 0 );
+	 VERT_RESTORE_RGBA( 1 );
+	 if (HAVE_SPEC && VB->SecondaryColorPtr[0]) {
+	    VERT_RESTORE_SPEC( 0 );
+	    VERT_RESTORE_SPEC( 1 );
+	 }
+      }
+      else {
+	 VERT_RESTORE_IND( 0 );
+	 VERT_RESTORE_IND( 1 );
+      }
+   }
+}
+#endif
+
+#if DO_QUAD
+#if DO_FULL_QUAD
+static void TAG(quad)( GLcontext *ctx,
+		       GLuint e0, GLuint e1, GLuint e2, GLuint e3 )
+{
+   struct vertex_buffer *VB = &TNL_CONTEXT( ctx )->vb;
+   VERTEX *v[4];
+   GLfloat offset;
+   GLfloat z[4];
+   GLenum mode = GL_FILL;
+   GLuint facing;
+   LOCAL_VARS(4);
+
+   v[0] = (VERTEX *)GET_VERTEX(e0);
+   v[1] = (VERTEX *)GET_VERTEX(e1);
+   v[2] = (VERTEX *)GET_VERTEX(e2);
+   v[3] = (VERTEX *)GET_VERTEX(e3);
+
+   if (DO_TWOSIDE || DO_OFFSET || DO_UNFILLED)
+   {
+      GLfloat ex = VERT_X(v[2]) - VERT_X(v[0]);
+      GLfloat ey = VERT_Y(v[2]) - VERT_Y(v[0]);
+      GLfloat fx = VERT_X(v[3]) - VERT_X(v[1]);
+      GLfloat fy = VERT_Y(v[3]) - VERT_Y(v[1]);
+      GLfloat cc = ex*fy - ey*fx;
+
+      if (DO_TWOSIDE || DO_UNFILLED)
+      {
+	 facing = AREA_IS_CCW( cc ) ^ ctx->Polygon._FrontBit;
+
+	 if (DO_UNFILLED) {
+	    if (facing) {
+	       mode = ctx->Polygon.BackMode;
+	       if (ctx->Polygon.CullFlag &&
+		   ctx->Polygon.CullFaceMode != GL_FRONT) {
+		  return;
+	       }
+	    } else {
+	       mode = ctx->Polygon.FrontMode;
+	       if (ctx->Polygon.CullFlag &&
+		   ctx->Polygon.CullFaceMode != GL_BACK) {
+		  return;
+	       }
+	    }
+	 }
+
+	 if (DO_TWOSIDE && facing == 1)
+	 {
+	    if (HAVE_RGBA) {
+	       GLfloat (*vbcolor)[4] = VB->ColorPtr[1]->data;
+	       (void)vbcolor;
+
+	       if (HAVE_BACK_COLORS) {
+                  if (!DO_FLAT) {
+                     VERT_SAVE_RGBA( 0 );
+                     VERT_SAVE_RGBA( 1 );
+                     VERT_SAVE_RGBA( 2 );
+		     VERT_COPY_RGBA1( v[0] );
+		     VERT_COPY_RGBA1( v[1] );
+		     VERT_COPY_RGBA1( v[2] );
+		  }
+		  VERT_SAVE_RGBA( 3 );
+		  VERT_COPY_RGBA1( v[3] );
+		  if (HAVE_SPEC) {
+                     if (!DO_FLAT) {
+                        VERT_SAVE_SPEC( 0 );
+                        VERT_SAVE_SPEC( 1 );
+                        VERT_SAVE_SPEC( 2 );
+			VERT_COPY_SPEC1( v[0] );
+			VERT_COPY_SPEC1( v[1] );
+			VERT_COPY_SPEC1( v[2] );
+		     }
+		     VERT_SAVE_SPEC( 3 );
+		     VERT_COPY_SPEC1( v[3] );
+		  }
+	       }
+	       else {
+	          if (!DO_FLAT) {
+		     VERT_SAVE_RGBA( 0 );
+		     VERT_SAVE_RGBA( 1 );
+		     VERT_SAVE_RGBA( 2 );
+		     VERT_SET_RGBA( v[0], vbcolor[e0] );
+		     VERT_SET_RGBA( v[1], vbcolor[e1] );
+		     VERT_SET_RGBA( v[2], vbcolor[e2] );
+	          }
+	          VERT_SAVE_RGBA( 3 );
+	          VERT_SET_RGBA( v[3], vbcolor[e3] );
+
+	          if (HAVE_SPEC && VB->SecondaryColorPtr[1]) {
+		     GLfloat (*vbspec)[4] = VB->SecondaryColorPtr[1]->data;
+		     ASSERT(VB->SecondaryColorPtr[1]->stride==4*sizeof(GLfloat));
+
+		     if (!DO_FLAT) {
+		        VERT_SAVE_SPEC( 0 );
+		        VERT_SAVE_SPEC( 1 );
+		        VERT_SAVE_SPEC( 2 );
+		        VERT_SET_SPEC( v[0], vbspec[e0] );
+		        VERT_SET_SPEC( v[1], vbspec[e1] );
+		        VERT_SET_SPEC( v[2], vbspec[e2] );
+		     }
+		     VERT_SAVE_SPEC( 3 );
+		     VERT_SET_SPEC( v[3], vbspec[e3] );
+	          }
+	       }
+	    }
+	    else {
+	       GLfloat *vbindex = (GLfloat *)VB->IndexPtr[1]->data;
+	       if (!DO_FLAT) {
+		  VERT_SAVE_IND( 0 );
+		  VERT_SAVE_IND( 1 );
+		  VERT_SAVE_IND( 2 );
+		  VERT_SET_IND( v[0], vbindex[e0] );
+		  VERT_SET_IND( v[1], vbindex[e1] );
+		  VERT_SET_IND( v[2], vbindex[e2] );
+	       }
+	       VERT_SAVE_IND( 3 );
+	       VERT_SET_IND( v[3], vbindex[e3] );
+	    }
+	 }
+      }
+
+
+      if (DO_OFFSET)
+      {
+	 offset = ctx->Polygon.OffsetUnits * DEPTH_SCALE;
+	 z[0] = VERT_Z(v[0]);
+	 z[1] = VERT_Z(v[1]);
+	 z[2] = VERT_Z(v[2]);
+	 z[3] = VERT_Z(v[3]);
+	 if (cc * cc > 1e-16) {
+	    GLfloat ez = z[2] - z[0];
+	    GLfloat fz = z[3] - z[1];
+	    GLfloat a	= ey*fz - ez*fy;
+	    GLfloat b	= ez*fx - ex*fz;
+	    GLfloat ic	= 1.0 / cc;
+	    GLfloat ac	= a * ic;
+	    GLfloat bc	= b * ic;
+	    if ( ac < 0.0f ) ac = -ac;
+	    if ( bc < 0.0f ) bc = -bc;
+	    offset += MAX2( ac, bc ) * ctx->Polygon.OffsetFactor;
+	 }
+	 offset *= ctx->MRD;
+      }
+   }
+
+   if (DO_FLAT) {
+      if (HAVE_RGBA) {
+	 VERT_SAVE_RGBA( 0 );
+	 VERT_SAVE_RGBA( 1 );
+	 VERT_SAVE_RGBA( 2 );
+	 VERT_COPY_RGBA( v[0], v[3] );
+	 VERT_COPY_RGBA( v[1], v[3] );
+	 VERT_COPY_RGBA( v[2], v[3] );
+	 if (HAVE_SPEC && VB->SecondaryColorPtr[0]) {
+	    VERT_SAVE_SPEC( 0 );
+	    VERT_SAVE_SPEC( 1 );
+	    VERT_SAVE_SPEC( 2 );
+	    VERT_COPY_SPEC( v[0], v[3] );
+	    VERT_COPY_SPEC( v[1], v[3] );
+	    VERT_COPY_SPEC( v[2], v[3] );
+	 }
+      }
+      else {
+	 VERT_SAVE_IND( 0 );
+	 VERT_SAVE_IND( 1 );
+	 VERT_SAVE_IND( 2 );
+	 VERT_COPY_IND( v[0], v[3] );
+	 VERT_COPY_IND( v[1], v[3] );
+	 VERT_COPY_IND( v[2], v[3] );
+      }
+   }
+
+   if (mode == GL_POINT) {
+      if (( DO_OFFSET) && ctx->Polygon.OffsetPoint) {
+	 VERT_Z_ADD(v[0], offset);
+	 VERT_Z_ADD(v[1], offset);
+	 VERT_Z_ADD(v[2], offset);
+	 VERT_Z_ADD(v[3], offset);
+      }
+      UNFILLED_QUAD( ctx, GL_POINT, e0, e1, e2, e3 );
+   } else if (mode == GL_LINE) {
+      if (DO_OFFSET && ctx->Polygon.OffsetLine) {
+	 VERT_Z_ADD(v[0], offset);
+	 VERT_Z_ADD(v[1], offset);
+	 VERT_Z_ADD(v[2], offset);
+	 VERT_Z_ADD(v[3], offset);
+      }
+      UNFILLED_QUAD( ctx, GL_LINE, e0, e1, e2, e3 );
+   } else {
+      if (DO_OFFSET && ctx->Polygon.OffsetFill) {
+	 VERT_Z_ADD(v[0], offset);
+	 VERT_Z_ADD(v[1], offset);
+	 VERT_Z_ADD(v[2], offset);
+	 VERT_Z_ADD(v[3], offset);
+      }
+      RASTERIZE( GL_TRIANGLES );
+      QUAD( (v[0]), (v[1]), (v[2]), (v[3]) );
+   }
+
+   if (DO_OFFSET)
+   {
+      VERT_SET_Z(v[0], z[0]);
+      VERT_SET_Z(v[1], z[1]);
+      VERT_SET_Z(v[2], z[2]);
+      VERT_SET_Z(v[3], z[3]);
+   }
+
+   if (DO_TWOSIDE && facing == 1)
+   {
+      if (HAVE_RGBA) {
+	 if (!DO_FLAT) {
+	    VERT_RESTORE_RGBA( 0 );
+	    VERT_RESTORE_RGBA( 1 );
+	    VERT_RESTORE_RGBA( 2 );
+	 }
+	 VERT_RESTORE_RGBA( 3 );
+	 if (HAVE_SPEC) {
+	    if (!DO_FLAT) {
+	       VERT_RESTORE_SPEC( 0 );
+	       VERT_RESTORE_SPEC( 1 );
+	       VERT_RESTORE_SPEC( 2 );
+	    }
+	    VERT_RESTORE_SPEC( 3 );
+	 }
+      }
+      else {
+	 if (!DO_FLAT) {
+	    VERT_RESTORE_IND( 0 );
+	    VERT_RESTORE_IND( 1 );
+	    VERT_RESTORE_IND( 2 );
+	 }
+	 VERT_RESTORE_IND( 3 );
+      }
+   }
+
+
+   if (DO_FLAT) {
+      if (HAVE_RGBA) {
+	 VERT_RESTORE_RGBA( 0 );
+	 VERT_RESTORE_RGBA( 1 );
+	 VERT_RESTORE_RGBA( 2 );
+	 if (HAVE_SPEC && VB->SecondaryColorPtr[0]) {
+	    VERT_RESTORE_SPEC( 0 );
+	    VERT_RESTORE_SPEC( 1 );
+	    VERT_RESTORE_SPEC( 2 );
+	 }
+      }
+      else {
+	 VERT_RESTORE_IND( 0 );
+	 VERT_RESTORE_IND( 1 );
+	 VERT_RESTORE_IND( 2 );
+      }
+   }
+}
+#else
+static void TAG(quad)( GLcontext *ctx, GLuint e0,
+		       GLuint e1, GLuint e2, GLuint e3 )
+{
+   if (DO_UNFILLED) {
+      struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+      GLubyte ef1 = VB->EdgeFlag[e1];
+      GLubyte ef3 = VB->EdgeFlag[e3];
+      VB->EdgeFlag[e1] = 0;
+      TAG(triangle)( ctx, e0, e1, e3 );
+      VB->EdgeFlag[e1] = ef1;
+      VB->EdgeFlag[e3] = 0;
+      TAG(triangle)( ctx, e1, e2, e3 );
+      VB->EdgeFlag[e3] = ef3;
+   } else {
+      TAG(triangle)( ctx, e0, e1, e3 );
+      TAG(triangle)( ctx, e1, e2, e3 );
+   }
+}
+#endif
+#endif
+
+#if DO_LINE
+static void TAG(line)( GLcontext *ctx, GLuint e0, GLuint e1 )
+{
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+   VERTEX *v[2];
+   LOCAL_VARS(2);
+
+   v[0] = (VERTEX *)GET_VERTEX(e0);
+   v[1] = (VERTEX *)GET_VERTEX(e1);
+
+   if (DO_FLAT) {
+      if (HAVE_RGBA) {
+	 VERT_SAVE_RGBA( 0 );
+	 VERT_COPY_RGBA( v[0], v[1] );
+	 if (HAVE_SPEC && VB->SecondaryColorPtr[0]) {
+	    VERT_SAVE_SPEC( 0 );
+	    VERT_COPY_SPEC( v[0], v[1] );
+	 }
+      }
+      else {
+	 VERT_SAVE_IND( 0 );
+	 VERT_COPY_IND( v[0], v[1] );
+      }
+   }
+
+   LINE( v[0], v[1] );
+
+   if (DO_FLAT) {
+      if (HAVE_RGBA) {
+	 VERT_RESTORE_RGBA( 0 );
+
+	 if (HAVE_SPEC && VB->SecondaryColorPtr[0]) {
+	    VERT_RESTORE_SPEC( 0 );
+	 }
+      }
+      else {
+	 VERT_RESTORE_IND( 0 );
+      }
+   }
+}
+#endif
+
+#if DO_POINTS
+static void TAG(points)( GLcontext *ctx, GLuint first, GLuint last )
+{
+   struct vertex_buffer *VB = &TNL_CONTEXT( ctx )->vb;
+   int i;
+   LOCAL_VARS(1);
+
+   if (VB->Elts == 0) {
+      for ( i = first ; i < last ; i++ ) {
+	 if ( VB->ClipMask[i] == 0 ) {
+	    VERTEX *v = (VERTEX *)GET_VERTEX(i);
+	    POINT( v );
+	 }
+      }
+   } else {
+      for ( i = first ; i < last ; i++ ) {
+	 GLuint e = VB->Elts[i];
+	 if ( VB->ClipMask[e] == 0 ) {
+	    VERTEX *v = (VERTEX *)GET_VERTEX(e);
+	    POINT( v );
+	 }
+      }
+   }
+}
+#endif
+
+static void TAG(init)( void )
+{
+#if DO_QUAD
+   TAB[IND].quad = TAG(quad);
+#endif
+#if DO_TRI
+   TAB[IND].triangle = TAG(triangle);
+#endif
+#if DO_LINE
+   TAB[IND].line = TAG(line);
+#endif
+#if DO_POINTS
+   TAB[IND].points = TAG(points);
+#endif
+}
+
+#undef IND
+#undef TAG
+
+#if HAVE_RGBA
+#undef VERT_SET_IND
+#undef VERT_COPY_IND
+#undef VERT_SAVE_IND
+#undef VERT_RESTORE_IND
+#if HAVE_BACK_COLORS
+#undef VERT_SET_RGBA
+#endif
+#else
+#undef VERT_SET_RGBA
+#undef VERT_COPY_RGBA
+#undef VERT_SAVE_RGBA
+#undef VERT_RESTORE_RGBA
+#if HAVE_BACK_COLORS
+#undef VERT_SET_IND
+#endif
+#endif
+
+#if !HAVE_SPEC
+#undef VERT_SET_SPEC
+#undef VERT_COPY_SPEC
+#undef VERT_SAVE_SPEC
+#undef VERT_RESTORE_SPEC
+#if HAVE_BACK_COLORS
+#undef VERT_COPY_SPEC1
+#endif
+#else
+#if HAVE_BACK_COLORS
+#undef VERT_SET_SPEC
+#endif
+#endif
+
+#if !HAVE_BACK_COLORS
+#undef VERT_COPY_SPEC1
+#undef VERT_COPY_IND1
+#undef VERT_COPY_RGBA1
+#endif
+
+#ifndef INSANE_VERTICES
+#undef VERT_SET_Z
+#undef VERT_Z_ADD
+#endif
diff --git a/reactos/lib/mesa32/src/tnl_dd/t_dd_unfilled.h b/reactos/lib/mesa32/src/tnl_dd/t_dd_unfilled.h
new file mode 100644
index 00000000000..46415ea5f68
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl_dd/t_dd_unfilled.h
@@ -0,0 +1,212 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+#if HAVE_RGBA
+#define VERT_SET_IND( v, c )
+#define VERT_COPY_IND( v0, v1 )
+#define VERT_SAVE_IND( idx )
+#define VERT_RESTORE_IND( idx )
+#endif
+
+#if !HAVE_SPEC
+#define VERT_SET_SPEC( v, c )
+#define VERT_COPY_SPEC( v0, v1 )
+#define VERT_SAVE_SPEC( idx )
+#define VERT_RESTORE_SPEC( idx )
+#endif
+
+static void TAG(unfilled_tri)( GLcontext *ctx,
+			       GLenum mode,
+			       GLuint e0, GLuint e1, GLuint e2 )
+{
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+   GLubyte *ef = VB->EdgeFlag;
+   VERTEX *v[3];
+   LOCAL_VARS(3);
+
+   v[0] = (VERTEX *)GET_VERTEX(e0);
+   v[1] = (VERTEX *)GET_VERTEX(e1);
+   v[2] = (VERTEX *)GET_VERTEX(e2);
+
+   if ((ctx->_TriangleCaps & DD_FLATSHADE) && HAVE_HW_FLATSHADE) {
+      if (HAVE_RGBA) {
+	 VERT_SAVE_RGBA(0);
+	 VERT_SAVE_RGBA(1);
+	 VERT_COPY_RGBA(v[0], v[2]);
+	 VERT_COPY_RGBA(v[1], v[2]);
+
+	 if (HAVE_SPEC) {
+	    VERT_SAVE_SPEC(0);
+	    VERT_SAVE_SPEC(1);
+	    VERT_COPY_SPEC(v[0], v[2]);
+	    VERT_COPY_SPEC(v[1], v[2]);
+	 }
+      } else {
+	 VERT_SAVE_IND(0);
+	 VERT_SAVE_IND(1);
+	 VERT_COPY_IND(v[0], v[2]);
+	 VERT_COPY_IND(v[1], v[2]);
+      }
+   }
+
+/*     fprintf(stderr, "%s %s %d %d %d\n", __FUNCTION__, */
+/*  	   _mesa_lookup_enum_by_nr( mode ), */
+/*  	   ef[e0], ef[e1], ef[e2]); */
+
+   if (mode == GL_POINT) {
+      RASTERIZE(GL_POINTS);
+      if (ef[e0]) POINT( v[0] );
+      if (ef[e1]) POINT( v[1] );
+      if (ef[e2]) POINT( v[2] );
+   }
+   else {
+      RASTERIZE(GL_LINES);
+      if (RENDER_PRIMITIVE == GL_POLYGON) {
+	 if (ef[e2]) LINE( v[2], v[0] );
+	 if (ef[e0]) LINE( v[0], v[1] );
+	 if (ef[e1]) LINE( v[1], v[2] );
+      }
+      else {
+	 if (ef[e0]) LINE( v[0], v[1] );
+	 if (ef[e1]) LINE( v[1], v[2] );
+	 if (ef[e2]) LINE( v[2], v[0] );
+      }
+   }
+
+   if ((ctx->_TriangleCaps & DD_FLATSHADE) && HAVE_HW_FLATSHADE) {
+      if (HAVE_RGBA) {
+	 VERT_RESTORE_RGBA(0);
+	 VERT_RESTORE_RGBA(1);
+
+	 if (HAVE_SPEC) {
+	    VERT_RESTORE_SPEC(0);
+	    VERT_RESTORE_SPEC(1);
+	 }
+      } else {
+	 VERT_RESTORE_IND(0);
+	 VERT_RESTORE_IND(1);
+      }
+   }
+}
+
+
+static void TAG(unfilled_quad)( GLcontext *ctx,
+				GLenum mode,
+				GLuint e0, GLuint e1,
+				GLuint e2, GLuint e3 )
+{
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+   GLubyte *ef = VB->EdgeFlag;
+   VERTEX *v[4];
+   LOCAL_VARS(4);
+
+   v[0] = (VERTEX *)GET_VERTEX(e0);
+   v[1] = (VERTEX *)GET_VERTEX(e1);
+   v[2] = (VERTEX *)GET_VERTEX(e2);
+   v[3] = (VERTEX *)GET_VERTEX(e3);
+
+   /* Hardware flatshading breaks down here.  If the hardware doesn't
+    * support flatshading, this will already have been done:
+    */
+   if ((ctx->_TriangleCaps & DD_FLATSHADE) && HAVE_HW_FLATSHADE) {
+      if (HAVE_RGBA) {
+	 VERT_SAVE_RGBA(0);
+	 VERT_SAVE_RGBA(1);
+	 VERT_SAVE_RGBA(2);
+	 VERT_COPY_RGBA(v[0], v[3]);
+	 VERT_COPY_RGBA(v[1], v[3]);
+	 VERT_COPY_RGBA(v[2], v[3]);
+
+	 if (HAVE_SPEC) {
+	    VERT_SAVE_SPEC(0);
+	    VERT_SAVE_SPEC(1);
+	    VERT_SAVE_SPEC(2);
+	    VERT_COPY_SPEC(v[0], v[3]);
+	    VERT_COPY_SPEC(v[1], v[3]);
+	    VERT_COPY_SPEC(v[2], v[3]);
+	 }
+      } else {
+	 VERT_SAVE_IND(0);
+	 VERT_SAVE_IND(1);
+	 VERT_SAVE_IND(2);
+	 VERT_COPY_IND(v[0], v[3]);
+	 VERT_COPY_IND(v[1], v[3]);
+	 VERT_COPY_IND(v[2], v[3]);
+      }
+   }
+
+   if (mode == GL_POINT) {
+      RASTERIZE(GL_POINTS);
+      if (ef[e0]) POINT( v[0] );
+      if (ef[e1]) POINT( v[1] );
+      if (ef[e2]) POINT( v[2] );
+      if (ef[e3]) POINT( v[3] );
+   }
+   else {
+      RASTERIZE(GL_LINES);
+      if (ef[e0]) LINE( v[0], v[1] );
+      if (ef[e1]) LINE( v[1], v[2] );
+      if (ef[e2]) LINE( v[2], v[3] );
+      if (ef[e3]) LINE( v[3], v[0] );
+   }
+
+   if ((ctx->_TriangleCaps & DD_FLATSHADE) && HAVE_HW_FLATSHADE) {
+      if (HAVE_RGBA) {
+	 VERT_RESTORE_RGBA(0);
+	 VERT_RESTORE_RGBA(1);
+	 VERT_RESTORE_RGBA(2);
+
+	 if (HAVE_SPEC) {
+	    VERT_RESTORE_SPEC(0);
+	    VERT_RESTORE_SPEC(1);
+	    VERT_RESTORE_SPEC(2);
+	 }
+      } else {
+	 VERT_RESTORE_IND(0);
+	 VERT_RESTORE_IND(1);
+	 VERT_RESTORE_IND(2);
+      }
+   }
+}
+
+
+#if HAVE_RGBA
+#undef VERT_SET_IND
+#undef VERT_COPY_IND
+#undef VERT_SAVE_IND
+#undef VERT_RESTORE_IND
+#endif
+
+#if !HAVE_SPEC
+#undef VERT_SET_SPEC
+#undef VERT_COPY_SPEC
+#undef VERT_SAVE_SPEC
+#undef VERT_RESTORE_SPEC
+#endif
+
+#undef TAG
diff --git a/reactos/lib/mesa32/src/tnl_dd/t_dd_vb.c b/reactos/lib/mesa32/src/tnl_dd/t_dd_vb.c
new file mode 100644
index 00000000000..edd78f7acfc
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl_dd/t_dd_vb.c
@@ -0,0 +1,344 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+#include "math/m_translate.h"
+
+#if (HAVE_HW_VIEWPORT)
+#define UNVIEWPORT_VARS
+#define UNVIEWPORT_X(x) x
+#define UNVIEWPORT_Y(x) x
+#define UNVIEWPORT_Z(x) x
+#endif
+
+#ifndef LOCALVARS
+#define LOCALVARS
+#endif
+
+#ifndef CHECK_HW_DIVIDE
+#define CHECK_HW_DIVIDE 1
+#endif
+
+/* These don't need to be duplicated, but there's currently nowhere
+ * really convenient to put them.  Need to build some actual .o files in
+ * this directory?
+ */
+static void copy_pv_rgba4_spec5( GLcontext *ctx, GLuint edst, GLuint esrc )
+{
+   LOCALVARS   
+   GLubyte *verts = GET_VERTEX_STORE();
+   GLuint size = GET_VERTEX_SIZE();
+   GLuint *dst = (GLuint *)(verts + (edst * size));
+   GLuint *src = (GLuint *)(verts + (esrc * size));
+   dst[4] = src[4];
+   dst[5] = src[5];
+}
+
+static void copy_pv_rgba4( GLcontext *ctx, GLuint edst, GLuint esrc )
+{
+   LOCALVARS
+   GLubyte *verts = GET_VERTEX_STORE();
+   GLuint size = GET_VERTEX_SIZE();
+   GLuint *dst = (GLuint *)(verts + (edst * size));
+   GLuint *src = (GLuint *)(verts + (esrc * size));
+   dst[4] = src[4];
+}
+
+static void copy_pv_rgba3( GLcontext *ctx, GLuint edst, GLuint esrc )
+{
+   LOCALVARS
+   GLubyte *verts = GET_VERTEX_STORE();
+   GLuint size = GET_VERTEX_SIZE();
+   GLuint *dst = (GLuint *)(verts + (edst * size));
+   GLuint *src = (GLuint *)(verts + (esrc * size));
+   dst[3] = src[3];
+}
+
+
+void TAG(translate_vertex)(GLcontext *ctx,
+			   const VERTEX *src,
+			   SWvertex *dst)
+{
+   LOCALVARS
+   GLuint format = GET_VERTEX_FORMAT();
+   GLfloat *s = ctx->Viewport._WindowMap.m;
+   UNVIEWPORT_VARS;
+
+   if (format == TINY_VERTEX_FORMAT) {
+      if (HAVE_HW_VIEWPORT) {
+	 dst->win[0] = s[0]  * src->v.x + s[12];
+	 dst->win[1] = s[5]  * src->v.y + s[13];
+	 dst->win[2] = s[10] * src->v.z + s[14];
+	 dst->win[3] = 1.0;
+      } else {
+	 dst->win[0] = UNVIEWPORT_X( src->v.x );
+	 dst->win[1] = UNVIEWPORT_Y( src->v.y );
+	 dst->win[2] = UNVIEWPORT_Z( src->v.z );
+	 dst->win[3] = 1.0;
+      }
+
+      dst->color[0] = src->tv.color.red;
+      dst->color[1] = src->tv.color.green;
+      dst->color[2] = src->tv.color.blue;
+      dst->color[3] = src->tv.color.alpha;
+   }
+   else {
+      if (HAVE_HW_VIEWPORT) {
+	 if (HAVE_HW_DIVIDE && CHECK_HW_DIVIDE) {
+	    GLfloat oow = 1.0 / src->v.w;
+	    dst->win[0] = s[0]  * src->v.x * oow + s[12];
+	    dst->win[1] = s[5]  * src->v.y * oow + s[13];
+	    dst->win[2] = s[10] * src->v.z * oow + s[14];
+	    dst->win[3] = oow;
+	 } else {
+	    dst->win[0] = s[0]  * src->v.x + s[12];
+	    dst->win[1] = s[5]  * src->v.y + s[13];
+	    dst->win[2] = s[10] * src->v.z + s[14];
+	    dst->win[3] = src->v.w;
+	 }
+      } else {
+	 dst->win[0] = UNVIEWPORT_X( src->v.x );
+	 dst->win[1] = UNVIEWPORT_Y( src->v.y );
+	 dst->win[2] = UNVIEWPORT_Z( src->v.z );
+	 dst->win[3] = src->v.w;
+      }
+
+      dst->color[0] = src->v.color.red;
+      dst->color[1] = src->v.color.green;
+      dst->color[2] = src->v.color.blue;
+      dst->color[3] = src->v.color.alpha;
+
+      dst->specular[0] = src->v.specular.red;
+      dst->specular[1] = src->v.specular.green;
+      dst->specular[2] = src->v.specular.blue;
+
+      dst->fog = src->v.specular.alpha/255.0;
+
+      if (HAVE_PTEX_VERTICES &&
+	  ((HAVE_TEX2_VERTICES && format == PROJ_TEX3_VERTEX_FORMAT) ||
+	   (format == PROJ_TEX1_VERTEX_FORMAT))) {
+
+	 dst->texcoord[0][0] = src->pv.u0;
+	 dst->texcoord[0][1] = src->pv.v0;
+	 dst->texcoord[0][3] = src->pv.q0;
+
+	 dst->texcoord[1][0] = src->pv.u1;
+	 dst->texcoord[1][1] = src->pv.v1;
+	 dst->texcoord[1][3] = src->pv.q1;
+
+	 if (HAVE_TEX2_VERTICES) {
+	    dst->texcoord[2][0] = src->pv.u2;
+	    dst->texcoord[2][1] = src->pv.v2;
+	    dst->texcoord[2][3] = src->pv.q2;
+	 }
+
+	 if (HAVE_TEX3_VERTICES) {
+	    dst->texcoord[3][0] = src->pv.u3;
+	    dst->texcoord[3][1] = src->pv.v3;
+	    dst->texcoord[3][3] = src->pv.q3;
+	 }
+      }
+      else {
+	 dst->texcoord[0][0] = src->v.u0;
+	 dst->texcoord[0][1] = src->v.v0;
+	 dst->texcoord[0][3] = 1.0;
+
+	 dst->texcoord[1][0] = src->v.u1;
+	 dst->texcoord[1][1] = src->v.v1;
+	 dst->texcoord[1][3] = 1.0;
+
+	 if (HAVE_TEX2_VERTICES) {
+	    dst->texcoord[2][0] = src->v.u2;
+	    dst->texcoord[2][1] = src->v.v2;
+	    dst->texcoord[2][3] = 1.0;
+	 }
+
+	 if (HAVE_TEX3_VERTICES) {
+	    dst->texcoord[3][0] = src->v.u3;
+	    dst->texcoord[3][1] = src->v.v3;
+	    dst->texcoord[3][3] = 1.0;
+	 }
+      }
+   }
+
+   dst->pointSize = ctx->Point._Size;
+}
+
+
+
+void TAG(print_vertex)( GLcontext *ctx, const VERTEX *v )
+{
+   LOCALVARS
+   GLuint format = GET_VERTEX_FORMAT();
+
+   fprintf(stderr, "(%x) ", format);
+
+   switch (format) {
+#if HAVE_TINY_VERTICES
+   case TINY_VERTEX_FORMAT:
+      fprintf(stderr, "xyz %.4f,%.4f,%.4f rgba %x:%x:%x:%x\n",
+	      v->v.x, v->v.y, v->v.z,
+	      v->tv.color.red,
+	      v->tv.color.green,
+	      v->tv.color.blue,
+	      v->tv.color.alpha);
+      break;
+#endif
+#if HAVE_NOTEX_VERTICES
+   case NOTEX_VERTEX_FORMAT:
+      fprintf(stderr, "xyzw %.4f,%.4f,%.4f,%.4f rgba %x:%x:%x:%x spec %x:%x:%x:%x\n",
+	      v->v.x, v->v.y, v->v.z, v->v.w,
+	      v->v.color.red,
+	      v->v.color.green,
+	      v->v.color.blue,
+	      v->v.color.alpha,
+	      v->v.specular.red,
+	      v->v.specular.green,
+	      v->v.specular.blue,
+	      v->v.specular.alpha);
+      break;
+#endif
+#if HAVE_TEX0_VERTICES
+   case TEX0_VERTEX_FORMAT:
+      fprintf(stderr, "xyzw %.4f,%.4f,%.4f,%.4f rgba %x:%x:%x:%x st %.4f,%.4f\n",
+	      v->v.x, v->v.y, v->v.z, v->v.w,
+	      v->v.color.red,
+	      v->v.color.green,
+	      v->v.color.blue,
+	      v->v.color.alpha,
+	      v->v.u0,
+	      v->v.v0);
+      break;
+#endif
+#if HAVE_TEX1_VERTICES
+   case TEX1_VERTEX_FORMAT:
+      fprintf(stderr, "xyzw %.4f,%.4f,%.4f,%.4f rgba %x:%x:%x:%x st %.4f,%.4f st %.4f,%.4f\n",
+	      v->v.x, v->v.y, v->v.z, v->v.w,
+	      v->v.color.red,
+	      v->v.color.green,
+	      v->v.color.blue,
+	      v->v.color.alpha,
+	      v->v.u0,
+	      v->v.v0,
+	      v->v.u1,
+	      v->v.u2);
+      break;
+#endif
+#if HAVE_PTEX_VERTICES
+   case PROJ_TEX1_VERTEX_FORMAT:
+      fprintf(stderr, "xyzw %.4f,%.4f,%.4f,%.4f rgba %x:%x:%x:%x stq %.4f,%.4f,%.4f stq %.4f,%.4f,%.4f\n",
+	      v->v.x, v->v.y, v->v.z, v->v.w,
+	      v->v.color.red,
+	      v->v.color.green,
+	      v->v.color.blue,
+	      v->v.color.alpha,
+	      v->pv.u0,
+	      v->pv.v0,
+	      v->pv.q0,
+	      v->pv.u1,
+	      v->pv.v1,
+	      v->pv.q1);
+      break;
+#endif      
+   default:
+      fprintf(stderr, "???\n");
+      break;
+   }
+
+   fprintf(stderr, "\n");
+}
+
+
+
+/* Interpolate the elements of the VB not included in typical hardware
+ * vertices.  
+ *
+ * NOTE: All these arrays are guarenteed by tnl to be writeable and
+ * have good stride.
+ */
+#ifndef INTERP_QUALIFIER 
+#define INTERP_QUALIFIER static
+#endif
+
+#define GET_COLOR(ptr, idx) ((ptr)->data[idx])
+
+
+INTERP_QUALIFIER void TAG(interp_extras)( GLcontext *ctx,
+					  GLfloat t,
+					  GLuint dst, GLuint out, GLuint in,
+					  GLboolean force_boundary )
+{
+   LOCALVARS
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+
+   if (VB->ColorPtr[1]) {
+      assert(VB->ColorPtr[1]->stride == 4 * sizeof(GLfloat));
+
+      INTERP_4F( t,
+		    GET_COLOR(VB->ColorPtr[1], dst),
+		    GET_COLOR(VB->ColorPtr[1], out),
+		    GET_COLOR(VB->ColorPtr[1], in) );
+
+      if (VB->SecondaryColorPtr[1]) {
+	 INTERP_3F( t,
+		       GET_COLOR(VB->SecondaryColorPtr[1], dst),
+		       GET_COLOR(VB->SecondaryColorPtr[1], out),
+		       GET_COLOR(VB->SecondaryColorPtr[1], in) );
+      }
+   }
+
+   if (VB->EdgeFlag) {
+      VB->EdgeFlag[dst] = VB->EdgeFlag[out] || force_boundary;
+   }
+
+   INTERP_VERTEX(ctx, t, dst, out, in, force_boundary);
+}
+
+INTERP_QUALIFIER void TAG(copy_pv_extras)( GLcontext *ctx, 
+					   GLuint dst, GLuint src )
+{
+   LOCALVARS
+      struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+
+   if (VB->ColorPtr[1]) {
+      COPY_4FV( GET_COLOR(VB->ColorPtr[1], dst), 
+		GET_COLOR(VB->ColorPtr[1], src) );
+
+      if (VB->SecondaryColorPtr[1]) {
+	 COPY_4FV( GET_COLOR(VB->SecondaryColorPtr[1], dst), 
+		   GET_COLOR(VB->SecondaryColorPtr[1], src) );
+      }
+   }
+
+   COPY_PV_VERTEX(ctx, dst, src);
+}
+
+
+#undef INTERP_QUALIFIER
+#undef GET_COLOR
+
+#undef IND
+#undef TAG
diff --git a/reactos/lib/mesa32/src/tnl_dd/t_dd_vbtmp.h b/reactos/lib/mesa32/src/tnl_dd/t_dd_vbtmp.h
new file mode 100644
index 00000000000..f4b710dfcc3
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl_dd/t_dd_vbtmp.h
@@ -0,0 +1,665 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.0.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+
+/* Unlike the other templates here, this assumes quite a bit about the
+ * underlying hardware.  Specifically it assumes a d3d-like vertex
+ * format, with a layout more or less constrained to look like the
+ * following:
+ *
+ * union {
+ *    struct {
+ *        float x, y, z, w;
+ *        struct { char r, g, b, a; } color;
+ *        struct { char r, g, b, fog; } spec;
+ *        float u0, v0;
+ *        float u1, v1;
+ *        float u2, v2;
+ *        float u3, v3;
+ *    } v;
+ *    struct {
+ *        float x, y, z, w;
+ *        struct { char r, g, b, a; } color;
+ *        struct { char r, g, b, fog; } spec;
+ *        float u0, v0, q0;
+ *        float u1, v1, q1;
+ *        float u2, v2, q2;
+ *        float u3, v3, q3;
+ *    } pv;
+ *    struct {
+ *        float x, y, z;
+ *        struct { char r, g, b, a; } color;
+ *    } tv;
+ *    float f[16];
+ *    unsigned int ui[16];
+ *    unsigned char ub4[4][16];
+ * }
+ *
+ 
+ * VERTEX:   hw vertex type as above
+ * VERTEX_COLOR: hw color struct type in VERTEX
+ *
+ * DO_XYZW:  Emit xyz and maybe w coordinates.
+ * DO_RGBA:  Emit color.
+ * DO_SPEC:  Emit specular color.
+ * DO_FOG:   Emit fog coordinate in specular alpha.
+ * DO_TEX0:  Emit tex0 u,v coordinates.
+ * DO_TEX1:  Emit tex1 u,v coordinates.
+ * DO_TEX2:  Emit tex2 u,v coordinates.
+ * DO_TEX3:  Emit tex3 u,v coordinates.
+ * DO_PTEX:  Emit tex0,1,2,3 q coordinates where possible.
+ *
+ * HAVE_RGBA_COLOR: Hardware takes color in rgba order (else bgra).
+ *
+ * HAVE_HW_VIEWPORT:  Hardware performs viewport transform.
+ * HAVE_HW_DIVIDE:  Hardware performs perspective divide.
+ *
+ * HAVE_TINY_VERTICES:  Hardware understands v.tv format.
+ * HAVE_PTEX_VERTICES:  Hardware understands v.pv format.
+ * HAVE_NOTEX_VERTICES:  Hardware understands v.v format with texcount 0.
+ *
+ * Additionally, this template assumes it is emitting *transformed*
+ * vertices; the modifications to emit untransformed vertices (ie. to
+ * t&l hardware) are probably too great to cooexist with the code
+ * already in this file.
+ *
+ * NOTE: The PTEX vertex format always includes TEX0 and TEX1, even if
+ * only TEX0 is enabled, in order to maintain a vertex size which is
+ * an exact number of quadwords.
+ */
+
+#if (HAVE_HW_VIEWPORT)
+#define VIEWPORT_X(dst,x) dst = x
+#define VIEWPORT_Y(dst,y) dst = y
+#define VIEWPORT_Z(dst,z) dst = z
+#else
+#define VIEWPORT_X(dst,x) dst = s[0]  * x + s[12]
+#define VIEWPORT_Y(dst,y) dst = s[5]  * y + s[13]
+#define VIEWPORT_Z(dst,z) dst = s[10] * z + s[14]
+#endif
+
+#if (HAVE_HW_DIVIDE && !HAVE_PTEX_VERTICES)
+#error "can't cope with this combination" 
+#endif 
+
+#ifndef LOCALVARS
+#define LOCALVARS
+#endif
+
+#ifndef CHECK_HW_DIVIDE
+#define CHECK_HW_DIVIDE 1
+#endif
+
+#if (HAVE_HW_DIVIDE || DO_SPEC || DO_TEX0 || DO_FOG || !HAVE_TINY_VERTICES)
+
+static void TAG(emit)( GLcontext *ctx,
+		       GLuint start, GLuint end,
+		       void *dest,
+		       GLuint stride )
+{
+   LOCALVARS
+      struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+   GLfloat (*tc0)[4], (*tc1)[4], (*fog)[4];
+   GLfloat (*tc2)[4], (*tc3)[4];
+   GLfloat (*col)[4], (*spec)[4];
+   GLuint tc0_stride, tc1_stride, col_stride, spec_stride, fog_stride;
+   GLuint tc2_stride, tc3_stride;
+   GLuint tc0_size, tc1_size;
+   GLuint tc2_size, tc3_size;
+   GLfloat (*coord)[4];
+   GLuint coord_stride;
+   VERTEX *v = (VERTEX *)dest;
+   const GLfloat *s = GET_VIEWPORT_MAT();
+   const GLubyte *mask = VB->ClipMask;
+   int i;
+
+/*     fprintf(stderr, "%s(big) importable %d %d..%d\n",  */
+/*  	   __FUNCTION__, VB->importable_data, start, end); */
+
+   if (HAVE_HW_VIEWPORT && HAVE_HW_DIVIDE && CHECK_HW_DIVIDE) {
+      (void) s;
+      coord = VB->ClipPtr->data;
+      coord_stride = VB->ClipPtr->stride;
+   }
+   else {
+      coord = VB->NdcPtr->data;
+      coord_stride = VB->NdcPtr->stride;
+   }
+
+   if (DO_TEX3) {
+      const GLuint t3 = GET_TEXSOURCE(3);
+      tc3 = VB->TexCoordPtr[t3]->data;
+      tc3_stride = VB->TexCoordPtr[t3]->stride;
+      if (DO_PTEX)
+	 tc3_size = VB->TexCoordPtr[t3]->size;
+   }
+
+   if (DO_TEX2) {
+      const GLuint t2 = GET_TEXSOURCE(2);
+      tc2 = VB->TexCoordPtr[t2]->data;
+      tc2_stride = VB->TexCoordPtr[t2]->stride;
+      if (DO_PTEX)
+	 tc2_size = VB->TexCoordPtr[t2]->size;
+   }
+
+   if (DO_TEX1) {
+      const GLuint t1 = GET_TEXSOURCE(1);
+      tc1 = VB->TexCoordPtr[t1]->data;
+      tc1_stride = VB->TexCoordPtr[t1]->stride;
+      if (DO_PTEX)
+	 tc1_size = VB->TexCoordPtr[t1]->size;
+   }
+
+   if (DO_TEX0) {
+      const GLuint t0 = GET_TEXSOURCE(0);
+      tc0_stride = VB->TexCoordPtr[t0]->stride;
+      tc0 = VB->TexCoordPtr[t0]->data;
+      if (DO_PTEX) 
+	 tc0_size = VB->TexCoordPtr[t0]->size;
+   }
+
+   if (DO_RGBA) {
+      col_stride = VB->ColorPtr[0]->stride;
+      col = VB->ColorPtr[0]->data;
+   }
+
+   if (DO_SPEC) {
+      if (VB->SecondaryColorPtr[0]) {
+	 spec_stride = VB->SecondaryColorPtr[0]->stride;
+	 spec = VB->SecondaryColorPtr[0]->data;
+      } else {
+	 spec = (GLfloat (*)[4])ctx->Current.Attrib[VERT_ATTRIB_COLOR1];
+	 spec_stride = 0;
+      }
+   }
+
+   if (DO_FOG) {
+      if (VB->FogCoordPtr) {
+	 fog = VB->FogCoordPtr->data;
+	 fog_stride = VB->FogCoordPtr->stride;
+      }
+      else {
+	 static GLfloat tmp[4] = {0, 0, 0, 0};
+	 fog = &tmp;
+	 fog_stride = 0;
+      }
+   }
+
+   /* May have nonstandard strides:
+    */
+   if (start) {
+      STRIDE_4F(coord, start * coord_stride);
+      if (DO_TEX0)
+	 STRIDE_4F(tc0, start * tc0_stride);
+      if (DO_TEX1) 
+	 STRIDE_4F(tc1, start * tc1_stride);
+      if (DO_TEX2) 
+	 STRIDE_4F(tc2, start * tc2_stride);
+      if (DO_TEX3) 
+	 STRIDE_4F(tc3, start * tc3_stride);
+      if (DO_RGBA) 
+	 STRIDE_4F(col, start * col_stride);
+      if (DO_SPEC)
+	 STRIDE_4F(spec, start * spec_stride);
+      if (DO_FOG)
+	 STRIDE_4F(fog, start * fog_stride);
+   }
+
+   for (i=start; i < end; i++, v = (VERTEX *)((GLubyte *)v + stride)) {
+      if (DO_XYZW) {
+	 if (HAVE_HW_VIEWPORT || mask[i] == 0) {
+	    VIEWPORT_X(v->v.x, coord[0][0]);
+	    VIEWPORT_Y(v->v.y, coord[0][1]);
+	    VIEWPORT_Z(v->v.z, coord[0][2]);
+	    v->v.w = coord[0][3];
+	 }
+	 STRIDE_4F(coord, coord_stride);
+      }
+      if (DO_RGBA) {
+	 UNCLAMPED_FLOAT_TO_UBYTE(v->v.color.red, col[0][0]);
+	 UNCLAMPED_FLOAT_TO_UBYTE(v->v.color.green, col[0][1]);
+	 UNCLAMPED_FLOAT_TO_UBYTE(v->v.color.blue, col[0][2]);
+	 UNCLAMPED_FLOAT_TO_UBYTE(v->v.color.alpha, col[0][3]);
+	 STRIDE_4F(col, col_stride);
+      }
+      if (DO_SPEC) {
+	 UNCLAMPED_FLOAT_TO_UBYTE(v->v.specular.red, spec[0][0]);
+	 UNCLAMPED_FLOAT_TO_UBYTE(v->v.specular.green, spec[0][1]);
+	 UNCLAMPED_FLOAT_TO_UBYTE(v->v.specular.blue, spec[0][2]);
+	 STRIDE_4F(spec, spec_stride);
+      }
+      if (DO_FOG) {
+	 UNCLAMPED_FLOAT_TO_UBYTE(v->v.specular.alpha, fog[0][0]);
+	 STRIDE_4F(fog, fog_stride);
+      }
+      if (DO_TEX0) {
+	 v->v.u0 = tc0[0][0];
+	 v->v.v0 = tc0[0][1];
+	 if (DO_PTEX) {
+	    if (HAVE_PTEX_VERTICES) {
+	       if (tc0_size == 4) 
+		  v->pv.q0 = tc0[0][3];
+	       else
+		  v->pv.q0 = 1.0;
+	    } 
+	    else if (tc0_size == 4) {
+	       float rhw = 1.0 / tc0[0][3];
+	       v->v.w *= tc0[0][3];
+	       v->v.u0 *= rhw;
+	       v->v.v0 *= rhw;
+	    } 
+	 } 
+	 STRIDE_4F(tc0, tc0_stride);
+      }
+      if (DO_TEX1) {
+	 if (DO_PTEX) {
+	    v->pv.u1 = tc1[0][0];
+	    v->pv.v1 = tc1[0][1];
+	    if (tc1_size == 4) 
+	       v->pv.q1 = tc1[0][3];
+	    else
+	       v->pv.q1 = 1.0;
+	 } 
+	 else {
+	    v->v.u1 = tc1[0][0];
+	    v->v.v1 = tc1[0][1];
+	 }
+	 STRIDE_4F(tc1, tc1_stride);
+      } 
+      else if (DO_PTEX) {
+	 *(GLuint *)&v->pv.q1 = 0;	/* avoid culling on radeon */
+      }
+      if (DO_TEX2) {
+	 if (DO_PTEX) {
+	    v->pv.u2 = tc2[0][0];
+	    v->pv.v2 = tc2[0][1];
+	    if (tc2_size == 4) 
+	       v->pv.q2 = tc2[0][3];
+	    else
+	       v->pv.q2 = 1.0;
+	 } 
+	 else {
+	    v->v.u2 = tc2[0][0];
+	    v->v.v2 = tc2[0][1];
+	 }
+	 STRIDE_4F(tc2, tc2_stride);
+      } 
+      if (DO_TEX3) {
+	 if (DO_PTEX) {
+	    v->pv.u3 = tc3[0][0];
+	    v->pv.v3 = tc3[0][1];
+	    if (tc3_size == 4) 
+	       v->pv.q3 = tc3[0][3];
+	    else
+	       v->pv.q3 = 1.0;
+	 } 
+	 else {
+	    v->v.u3 = tc3[0][0];
+	    v->v.v3 = tc3[0][1];
+	 }
+	 STRIDE_4F(tc3, tc3_stride);
+      } 
+   }
+
+}
+#else
+
+#if HAVE_HW_DIVIDE
+#error "cannot use tiny vertices with hw perspective divide"
+#endif
+
+static void TAG(emit)( GLcontext *ctx, GLuint start, GLuint end,
+		       void *dest, GLuint stride )
+{
+   LOCALVARS
+      struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+   GLfloat (*col)[4];
+   GLuint col_stride;
+   GLfloat (*coord)[4] = VB->NdcPtr->data;
+   GLuint coord_stride = VB->NdcPtr->stride;
+   GLfloat *v = (GLfloat *)dest;
+   const GLubyte *mask = VB->ClipMask;
+   const GLfloat *s = GET_VIEWPORT_MAT();
+   int i;
+
+   (void) s;
+
+   ASSERT(stride == 4);
+
+   col = VB->ColorPtr[0]->data;
+   col_stride = VB->ColorPtr[0]->stride;
+
+/*     fprintf(stderr, "%s(small) importable %x\n",  */
+/*  	   __FUNCTION__, VB->importable_data); */
+
+   /* Pack what's left into a 4-dword vertex.  Color is in a different
+    * place, and there is no 'w' coordinate.
+    */
+   if (start) {
+      STRIDE_4F(coord, start * coord_stride);
+      STRIDE_4F(col, start * col_stride);
+   }
+
+   for (i=start; i < end; i++, v+=4) {
+      if (DO_XYZW) {
+	 if (HAVE_HW_VIEWPORT || mask[i] == 0) {
+	    VIEWPORT_X(v[0], coord[0][0]);
+	    VIEWPORT_Y(v[1], coord[0][1]);
+	    VIEWPORT_Z(v[2], coord[0][2]);
+	 }
+	 STRIDE_4F( coord, coord_stride );
+      }
+      if (DO_RGBA) {
+	 VERTEX_COLOR *c = (VERTEX_COLOR *)&v[3];
+	 UNCLAMPED_FLOAT_TO_UBYTE(c->red, col[0][0]);
+	 UNCLAMPED_FLOAT_TO_UBYTE(c->green, col[0][1]);
+	 UNCLAMPED_FLOAT_TO_UBYTE(c->blue, col[0][2]);
+	 UNCLAMPED_FLOAT_TO_UBYTE(c->alpha, col[0][3]);
+	 STRIDE_4F( col, col_stride );
+      }
+/*  	 fprintf(stderr, "vert %d: %.2f %.2f %.2f %x\n",  */
+/*  		 i, v[0], v[1], v[2], *(int *)&v[3]); */
+   }
+}
+
+#endif /* emit */
+
+#if (DO_XYZW) && (DO_RGBA)
+
+
+#if (HAVE_PTEX_VERTICES)
+static GLboolean TAG(check_tex_sizes)( GLcontext *ctx )
+{
+   LOCALVARS
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+
+   /* Force 'missing' texcoords to something valid.
+    */
+   if (DO_TEX3 && VB->TexCoordPtr[2] == 0)
+      VB->TexCoordPtr[2] = VB->TexCoordPtr[3];
+
+   if (DO_TEX2 && VB->TexCoordPtr[1] == 0)
+      VB->TexCoordPtr[1] = VB->TexCoordPtr[2];
+
+   if (DO_TEX1 && VB->TexCoordPtr[0] == 0)
+      VB->TexCoordPtr[0] = VB->TexCoordPtr[1];
+
+   if (DO_PTEX)
+      return GL_TRUE;
+   
+   if ((DO_TEX3 && VB->TexCoordPtr[GET_TEXSOURCE(3)]->size == 4) ||
+       (DO_TEX2 && VB->TexCoordPtr[GET_TEXSOURCE(2)]->size == 4) ||
+       (DO_TEX1 && VB->TexCoordPtr[GET_TEXSOURCE(1)]->size == 4) ||
+       (DO_TEX0 && VB->TexCoordPtr[GET_TEXSOURCE(0)]->size == 4))
+      return GL_FALSE;
+
+   return GL_TRUE;
+}
+#else
+static GLboolean TAG(check_tex_sizes)( GLcontext *ctx )
+{
+   LOCALVARS
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+
+   /* Force 'missing' texcoords to something valid.
+    */
+   if (DO_TEX3 && VB->TexCoordPtr[2] == 0)
+      VB->TexCoordPtr[2] = VB->TexCoordPtr[3];
+
+   if (DO_TEX2 && VB->TexCoordPtr[1] == 0)
+      VB->TexCoordPtr[1] = VB->TexCoordPtr[2];
+
+   if (DO_TEX1 && VB->TexCoordPtr[0] == 0)
+      VB->TexCoordPtr[0] = VB->TexCoordPtr[1];
+
+   if (DO_PTEX)
+      return GL_TRUE;
+
+   /* No hardware support for projective texture.  Can fake it for
+    * TEX0 only.
+    */
+   if ((DO_TEX3 && VB->TexCoordPtr[GET_TEXSOURCE(3)]->size == 4) ||
+       (DO_TEX2 && VB->TexCoordPtr[GET_TEXSOURCE(2)]->size == 4) ||
+       (DO_TEX1 && VB->TexCoordPtr[GET_TEXSOURCE(1)]->size == 4)) {
+      PTEX_FALLBACK();
+      return GL_FALSE;
+   }
+
+   if (DO_TEX0 && VB->TexCoordPtr[GET_TEXSOURCE(0)]->size == 4) {
+      if (DO_TEX1 || DO_TEX2 || DO_TEX3) {
+	 PTEX_FALLBACK();
+      }
+      return GL_FALSE;
+   }
+
+   return GL_TRUE;
+}
+#endif /* ptex */
+
+
+static void TAG(interp)( GLcontext *ctx,
+			 GLfloat t,
+			 GLuint edst, GLuint eout, GLuint ein,
+			 GLboolean force_boundary )
+{
+   LOCALVARS
+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+   GLubyte *ddverts = GET_VERTEX_STORE();
+   GLuint size = GET_VERTEX_SIZE();
+   const GLfloat *dstclip = VB->ClipPtr->data[edst];
+   GLfloat w;
+   const GLfloat *s = GET_VIEWPORT_MAT();
+
+   VERTEX *dst = (VERTEX *)(ddverts + (edst * size));
+   VERTEX *in  = (VERTEX *)(ddverts + (ein * size));
+   VERTEX *out = (VERTEX *)(ddverts + (eout * size));
+
+   (void)s;
+
+   if (HAVE_HW_DIVIDE && CHECK_HW_DIVIDE) {
+      VIEWPORT_X( dst->v.x, dstclip[0] );
+      VIEWPORT_Y( dst->v.y, dstclip[1] );
+      VIEWPORT_Z( dst->v.z, dstclip[2] );
+      w = dstclip[3];
+   }
+   else {
+      w = 1.0 / dstclip[3];
+      VIEWPORT_X( dst->v.x, dstclip[0] * w );
+      VIEWPORT_Y( dst->v.y, dstclip[1] * w );
+      VIEWPORT_Z( dst->v.z, dstclip[2] * w );
+   }
+
+   if ((HAVE_HW_DIVIDE && CHECK_HW_DIVIDE) || 
+       DO_FOG || DO_SPEC || DO_TEX0 || DO_TEX1 ||
+       DO_TEX2 || DO_TEX3 || !HAVE_TINY_VERTICES) {
+
+      dst->v.w = w;
+
+      INTERP_UB( t, dst->ub4[4][0], out->ub4[4][0], in->ub4[4][0] );
+      INTERP_UB( t, dst->ub4[4][1], out->ub4[4][1], in->ub4[4][1] );
+      INTERP_UB( t, dst->ub4[4][2], out->ub4[4][2], in->ub4[4][2] );
+      INTERP_UB( t, dst->ub4[4][3], out->ub4[4][3], in->ub4[4][3] );
+
+      if (DO_SPEC) {
+	 INTERP_UB( t, dst->v.specular.red,   out->v.specular.red,   in->v.specular.red );
+	 INTERP_UB( t, dst->v.specular.green, out->v.specular.green, in->v.specular.green );
+	 INTERP_UB( t, dst->v.specular.blue,  out->v.specular.blue,  in->v.specular.blue );
+      }
+      if (DO_FOG) {
+	 INTERP_UB( t, dst->v.specular.alpha, out->v.specular.alpha, in->v.specular.alpha );
+      }
+      if (DO_TEX0) {
+	 if (DO_PTEX) {
+	    if (HAVE_PTEX_VERTICES) {
+	       INTERP_F( t, dst->pv.u0, out->pv.u0, in->pv.u0 );
+	       INTERP_F( t, dst->pv.v0, out->pv.v0, in->pv.v0 );
+	       INTERP_F( t, dst->pv.q0, out->pv.q0, in->pv.q0 );
+	    } else {
+	       GLfloat wout = VB->NdcPtr->data[eout][3];
+	       GLfloat win = VB->NdcPtr->data[ein][3];
+	       GLfloat qout = out->pv.w / wout;
+	       GLfloat qin = in->pv.w / win;
+	       GLfloat qdst, rqdst;
+
+	       ASSERT( !HAVE_HW_DIVIDE );
+
+	       INTERP_F( t, dst->v.u0, out->v.u0 * qout, in->v.u0 * qin );
+	       INTERP_F( t, dst->v.v0, out->v.v0 * qout, in->v.v0 * qin );
+	       INTERP_F( t, qdst, qout, qin );
+
+	       rqdst = 1.0 / qdst;
+	       dst->v.u0 *= rqdst;
+	       dst->v.v0 *= rqdst;
+	       dst->v.w *= rqdst;
+	    }
+	 }
+	 else {
+	    INTERP_F( t, dst->v.u0, out->v.u0, in->v.u0 );
+	    INTERP_F( t, dst->v.v0, out->v.v0, in->v.v0 );
+	 }
+      }
+      if (DO_TEX1) {
+	 if (DO_PTEX) {
+	    INTERP_F( t, dst->pv.u1, out->pv.u1, in->pv.u1 );
+	    INTERP_F( t, dst->pv.v1, out->pv.v1, in->pv.v1 );
+	    INTERP_F( t, dst->pv.q1, out->pv.q1, in->pv.q1 );
+	 } else {
+	    INTERP_F( t, dst->v.u1, out->v.u1, in->v.u1 );
+	    INTERP_F( t, dst->v.v1, out->v.v1, in->v.v1 );
+	 }
+      }
+      else if (DO_PTEX) {
+	 dst->pv.q1 = 0.0;	/* must be a valid float on radeon */
+      }
+      if (DO_TEX2) {
+	 if (DO_PTEX) {
+	    INTERP_F( t, dst->pv.u2, out->pv.u2, in->pv.u2 );
+	    INTERP_F( t, dst->pv.v2, out->pv.v2, in->pv.v2 );
+	    INTERP_F( t, dst->pv.q2, out->pv.q2, in->pv.q2 );
+	 } else {
+	    INTERP_F( t, dst->v.u2, out->v.u2, in->v.u2 );
+	    INTERP_F( t, dst->v.v2, out->v.v2, in->v.v2 );
+	 }
+      }
+      if (DO_TEX3) {
+	 if (DO_PTEX) {
+	    INTERP_F( t, dst->pv.u3, out->pv.u3, in->pv.u3 );
+	    INTERP_F( t, dst->pv.v3, out->pv.v3, in->pv.v3 );
+	    INTERP_F( t, dst->pv.q3, out->pv.q3, in->pv.q3 );
+	 } else {
+	    INTERP_F( t, dst->v.u3, out->v.u3, in->v.u3 );
+	    INTERP_F( t, dst->v.v3, out->v.v3, in->v.v3 );
+	 }
+      }
+   } else {
+      /* 4-dword vertex.  Color is in v[3] and there is no oow coordinate.
+       */
+      INTERP_UB( t, dst->ub4[3][0], out->ub4[3][0], in->ub4[3][0] );
+      INTERP_UB( t, dst->ub4[3][1], out->ub4[3][1], in->ub4[3][1] );
+      INTERP_UB( t, dst->ub4[3][2], out->ub4[3][2], in->ub4[3][2] );
+      INTERP_UB( t, dst->ub4[3][3], out->ub4[3][3], in->ub4[3][3] );
+   }
+}
+
+#endif /* rgba && xyzw */
+
+
+static void TAG(init)( void )
+{
+   setup_tab[IND].emit = TAG(emit);
+
+#if (DO_XYZW && DO_RGBA)
+   setup_tab[IND].check_tex_sizes = TAG(check_tex_sizes);
+   setup_tab[IND].interp = TAG(interp);
+#endif
+
+   if (DO_SPEC)
+      setup_tab[IND].copy_pv = copy_pv_rgba4_spec5;
+   else if (HAVE_HW_DIVIDE || DO_SPEC || DO_FOG || DO_TEX0 || DO_TEX1 ||
+	    DO_TEX2 || DO_TEX3 || !HAVE_TINY_VERTICES)
+      setup_tab[IND].copy_pv = copy_pv_rgba4;
+   else
+      setup_tab[IND].copy_pv = copy_pv_rgba3;
+
+   if (DO_TEX3) {
+      if (DO_PTEX) {
+	 ASSERT(HAVE_PTEX_VERTICES);
+	 setup_tab[IND].vertex_format = PROJ_TEX3_VERTEX_FORMAT;
+	 setup_tab[IND].vertex_size = 18;
+      }
+      else {
+	 setup_tab[IND].vertex_format = TEX3_VERTEX_FORMAT;
+	 setup_tab[IND].vertex_size = 14;
+      }
+   }
+   else if (DO_TEX2) {
+      if (DO_PTEX) {
+	 ASSERT(HAVE_PTEX_VERTICES);
+	 setup_tab[IND].vertex_format = PROJ_TEX3_VERTEX_FORMAT;
+	 setup_tab[IND].vertex_size = 18;
+      }
+      else {
+	 setup_tab[IND].vertex_format = TEX2_VERTEX_FORMAT;
+	 setup_tab[IND].vertex_size = 12;
+      }
+   }
+   else if (DO_TEX1) {
+      if (DO_PTEX) {
+	 ASSERT(HAVE_PTEX_VERTICES);
+	 setup_tab[IND].vertex_format = PROJ_TEX1_VERTEX_FORMAT;
+	 setup_tab[IND].vertex_size = 12;
+      }
+      else {
+	 setup_tab[IND].vertex_format = TEX1_VERTEX_FORMAT;
+	 setup_tab[IND].vertex_size = 10;
+      }
+   }
+   else if (DO_TEX0) {
+      if (DO_PTEX && HAVE_PTEX_VERTICES) {
+	 setup_tab[IND].vertex_format = PROJ_TEX1_VERTEX_FORMAT;
+	 setup_tab[IND].vertex_size = 12;
+      } else {
+	 setup_tab[IND].vertex_format = TEX0_VERTEX_FORMAT;
+	 setup_tab[IND].vertex_size = 8;
+      }
+   }
+   else if (!HAVE_HW_DIVIDE && !DO_SPEC && !DO_FOG && HAVE_TINY_VERTICES) {
+      setup_tab[IND].vertex_format = TINY_VERTEX_FORMAT;
+      setup_tab[IND].vertex_size = 4;
+   } else if (HAVE_NOTEX_VERTICES) {
+      setup_tab[IND].vertex_format = NOTEX_VERTEX_FORMAT;
+      setup_tab[IND].vertex_size = 6;
+   } else {
+      setup_tab[IND].vertex_format = TEX0_VERTEX_FORMAT;
+      setup_tab[IND].vertex_size = 8;
+   }
+}
+
+
+#undef IND
+#undef TAG
diff --git a/reactos/lib/mesa32/src/tnl_dd/t_dd_vertex.h b/reactos/lib/mesa32/src/tnl_dd/t_dd_vertex.h
new file mode 100644
index 00000000000..d45dd09fbd7
--- /dev/null
+++ b/reactos/lib/mesa32/src/tnl_dd/t_dd_vertex.h
@@ -0,0 +1,78 @@
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  4.0.3
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+typedef struct {
+   GLfloat x, y, z, w;
+} TAG(_coord_t);
+
+#ifdef COLOR_IS_RGBA
+typedef struct {
+#if defined(BYTE_ORDER) && defined(BIG_ENDIAN) && BYTE_ORDER == BIG_ENDIAN
+   GLubyte alpha, blue, green, red;
+#else
+   GLubyte red, green, blue, alpha;
+#endif
+} TAG(_color_t);
+#else
+typedef struct {
+#if defined(BYTE_ORDER) && defined(BIG_ENDIAN) && BYTE_ORDER == BIG_ENDIAN
+   GLubyte alpha, red, green, blue;
+#else
+   GLubyte blue, green, red, alpha;
+#endif
+} TAG(_color_t);
+#endif
+
+typedef union {
+   struct {
+      GLfloat x, y, z, w;
+      TAG(_color_t) color;
+      TAG(_color_t) specular;
+      GLfloat u0, v0;
+      GLfloat u1, v1;
+      GLfloat u2, v2;
+      GLfloat u3, v3;
+   } v;
+   struct {
+      GLfloat x, y, z, w;
+      TAG(_color_t) color;
+      TAG(_color_t) specular;
+      GLfloat u0, v0, q0;
+      GLfloat u1, v1, q1;
+      GLfloat u2, v2, q2;
+      GLfloat u3, v3, q3;
+   } pv;
+   struct {
+      GLfloat x, y, z;
+      TAG(_color_t) color;
+   } tv;
+   GLfloat f[24];
+   GLuint  ui[24];
+   GLubyte ub4[24][4];
+} TAG(Vertex), *TAG(VertexPtr);
+
diff --git a/reactos/lib/mesa32/src/x86/3dnow.c b/reactos/lib/mesa32/src/x86/3dnow.c
new file mode 100644
index 00000000000..c5e2608079a
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/3dnow.c
@@ -0,0 +1,92 @@
+/* $Id: 3dnow.c,v 1.1 2004/07/16 22:12:42 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.0.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * 3DNow! optimizations contributed by
+ * Holger Waechtler <holger@akaflieg.extern.tu-berlin.de>
+ */
+
+#include "glheader.h"
+#include "context.h"
+#include "math/m_xform.h"
+#include "tnl/t_context.h"
+
+#include "3dnow.h"
+#include "common_x86_macros.h"
+
+#ifdef DEBUG
+#include "math/m_debug.h"
+#endif
+
+
+#ifdef USE_3DNOW_ASM
+DECLARE_XFORM_GROUP( 3dnow, 2 )
+DECLARE_XFORM_GROUP( 3dnow, 3 )
+DECLARE_XFORM_GROUP( 3dnow, 4 )
+
+DECLARE_NORM_GROUP( 3dnow )
+
+
+extern void _ASMAPI
+_mesa_v16_3dnow_general_xform( GLfloat *first_vert,
+			       const GLfloat *m,
+			       const GLfloat *src,
+			       GLuint src_stride,
+			       GLuint count );
+
+extern void _ASMAPI
+_mesa_3dnow_project_vertices( GLfloat *first,
+			      GLfloat *last,
+			      const GLfloat *m,
+			      GLuint stride );
+
+extern void _ASMAPI
+_mesa_3dnow_project_clipped_vertices( GLfloat *first,
+				      GLfloat *last,
+				      const GLfloat *m,
+				      GLuint stride,
+				      const GLubyte *clipmask );
+#endif
+
+
+void _mesa_init_3dnow_transform_asm( void )
+{
+#ifdef USE_3DNOW_ASM
+   ASSIGN_XFORM_GROUP( 3dnow, 2 );
+   ASSIGN_XFORM_GROUP( 3dnow, 3 );
+   ASSIGN_XFORM_GROUP( 3dnow, 4 );
+
+   /* There's a bug somewhere in the 3dnow_normal.S file that causes
+    * bad shading.  Disable for now.
+   ASSIGN_NORM_GROUP( 3dnow );
+   */
+
+#ifdef DEBUG
+   _math_test_all_transform_functions( "3DNow!" );
+   _math_test_all_normal_transform_functions( "3DNow!" );
+#endif
+#endif
+}
diff --git a/reactos/lib/mesa32/src/x86/3dnow.h b/reactos/lib/mesa32/src/x86/3dnow.h
new file mode 100644
index 00000000000..7f89a22ba84
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/3dnow.h
@@ -0,0 +1,39 @@
+/* $Id: 3dnow.h,v 1.1 2004/07/16 22:12:42 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * 3DNow! optimizations contributed by
+ * Holger Waechtler <holger@akaflieg.extern.tu-berlin.de>
+ */
+
+#ifndef __3DNOW_H__
+#define __3DNOW_H__
+
+#include "math/m_xform.h"
+
+void _mesa_init_3dnow_transform_asm( void );
+
+#endif
diff --git a/reactos/lib/mesa32/src/x86/3dnow_normal.S b/reactos/lib/mesa32/src/x86/3dnow_normal.S
new file mode 100644
index 00000000000..233511e76e1
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/3dnow_normal.S
@@ -0,0 +1,836 @@
+/* $Id: 3dnow_normal.S,v 1.1 2004/07/16 22:12:42 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * 3Dnow assembly code by Holger Waechtler
+ */
+
+#include "matypes.h"
+#include "norm_args.h"
+
+        SEG_TEXT
+
+#define M(i)    REGOFF(i * 4, ECX)
+#define STRIDE  REGOFF(12, ESI)
+
+
+ALIGNTEXT16
+GLOBL GLNAME(_mesa_3dnow_transform_normalize_normals)
+GLNAME(_mesa_3dnow_transform_normalize_normals):
+
+ #define FRAME_OFFSET 12
+
+    PUSH_L     ( EDI )
+    PUSH_L     ( ESI )
+    PUSH_L     ( EBP )
+
+    MOV_L      ( ARG_LENGTHS, EDI )
+    MOV_L      ( ARG_IN, ESI )
+    MOV_L      ( ARG_DEST, EAX )
+    MOV_L      ( REGOFF(V4F_COUNT, ESI), EBP ) /*  dest->count = in->count   */
+    MOV_L      ( EBP, REGOFF(V4F_COUNT, EAX) )
+    MOV_L      ( REGOFF(V4F_START, ESI), EDX ) /*  in->start    */
+    MOV_L      ( REGOFF(V4F_START, EAX), EAX ) /*  dest->start  */
+    MOV_L      ( ARG_MAT, ECX )
+    MOV_L      ( REGOFF(MATRIX_INV, ECX), ECX ) /*  mat->inv     */
+
+    CMP_L      ( CONST(0), EBP )        /*   count > 0 ??  */
+    JE         ( LLBL (G3TN_end) )
+
+    MOV_L      ( REGOFF (V4F_COUNT, ESI), EBP )
+    FEMMS
+
+    PUSH_L     ( EBP )
+    PUSH_L     ( EAX )
+    PUSH_L     ( EDX )                  /*  save counter & pointer for   */
+                                        /*  the normalize pass           */
+ #undef  FRAME_OFFSET
+ #define FRAME_OFFSET 24
+
+    MOVQ       ( M(0), MM3 )            /*  m1              | m0         */
+    MOVQ       ( M(4), MM4 )            /*  m5              | m4         */
+
+    MOVD       ( M(2), MM5 )            /*                  | m2         */
+    PUNPCKLDQ  ( M(6), MM5 )            /*  m6              | m2         */
+
+    MOVQ       ( M(8), MM6 )            /*  m9              | m8         */
+    MOVQ       ( M(10), MM7 )           /*                  | m10        */
+
+    CMP_L      ( CONST(0), EDI )        /*  lengths == 0 ?                 */
+    JNE        ( LLBL (G3TN_scale_end ) )
+
+    MOVD       ( ARG_SCALE, MM0 )       /*               | scale           */
+    PUNPCKLDQ  ( MM0, MM0 )             /* scale         | scale           */
+
+    PFMUL      ( MM0, MM3 )             /* scale * m1    | scale * m0      */
+    PFMUL      ( MM0, MM4 )             /* scale * m5    | scale * m4      */
+    PFMUL      ( MM0, MM5 )             /* scale * m6    | scale * m2      */
+    PFMUL      ( MM0, MM6 )             /* scale * m9    | scale * m8      */
+    PFMUL      ( MM0, MM7 )             /*               | scale * m10     */
+
+ALIGNTEXT32
+LLBL (G3TN_scale_end):
+LLBL (G3TN_transform):
+    MOVQ       ( REGIND (EDX), MM0 )    /*  x1              | x0         */
+    MOVD       ( REGOFF (8, EDX), MM2 ) /*                  | x2         */
+
+    MOVQ       ( MM0, MM1 )             /*  x1              | x0           */
+    PUNPCKLDQ  ( MM2, MM2 )             /*  x2              | x2           */
+
+    PFMUL      ( MM3, MM0 )             /*  x1*m1           | x0*m0        */
+    ADD_L      ( CONST(16), EAX )       /*  next r                         */
+
+    PREFETCHW  ( REGIND(EAX) )
+
+    PFMUL      ( MM4, MM1 )             /*  x1*m5           | x0*m4        */
+    PFACC      ( MM1, MM0 )             /*  x0*m4+x1*m5     | x0*m0+x1*m1  */
+
+    PFMUL      ( MM5, MM2 )             /*  x2*m6           | x2*m2        */
+    PFADD      ( MM2, MM0 )             /* x0*m4+x1*m5+x2*m6| x0*m0+...+x2**/
+
+    MOVQ       ( REGIND (EDX), MM1 )    /*  x1           | x0              */
+    MOVQ       ( MM0, REGOFF(-16, EAX) ) /* write r0, r1                   */
+
+    PFMUL      ( MM6, MM1 )             /* x1*m9         | x0*m8           */
+    MOVD       ( REGOFF (8, EDX), MM2 ) /*               | x2              */
+
+    PFMUL      ( MM7, MM2 )             /*               | x2*m10          */
+    PFACC      ( MM1, MM1 )             /*  *not used*   | x0*m8+x1*m9     */
+
+    PFADD      ( MM2, MM1 )             /*  *not used*   | x0*m8+x1*m9+x2*m*/
+    ADD_L      ( STRIDE, EDX )          /*  next normal                    */
+
+    PREFETCH   ( REGIND(EDX) )
+
+    MOVD       ( MM1, REGOFF(-8, EAX) ) /*  write r2                       */
+    DEC_L      ( EBP )                  /*  decrement normal counter       */
+    JA         ( LLBL (G3TN_transform) )
+
+
+    POP_L      ( EDX )                  /*  end of transform ---           */
+    POP_L      ( EAX )                  /*    now normalizing ...          */
+    POP_L      ( EBP )
+
+    CMP_L      ( CONST(0), EDI )        /*  lengths == 0 ?                 */
+    JE         ( LLBL (G3TN_norm ) )    /*  calculate lengths              */
+
+
+ALIGNTEXT32
+LLBL (G3TN_norm_w_lengths):
+
+    PREFETCHW  ( REGOFF(12,EAX) )
+
+    MOVQ       ( REGIND(EAX), MM0 )     /*  x1              | x0           */
+    MOVD       ( REGOFF(8, EAX), MM1 )  /*                  | x2           */
+
+    MOVD       ( REGIND (EDI), MM3 )    /*                  | length (x)   */
+    PFMUL      ( MM3, MM1 )             /*                  | x2 (normalize*/
+
+    PUNPCKLDQ  ( MM3, MM3 )             /*  length (x)      | length (x)   */
+    PFMUL      ( MM3, MM0 )             /*  x1 (normalized) | x0 (normalize*/
+
+    ADD_L      ( STRIDE, EDX )          /*  next normal                    */
+    ADD_L      ( CONST(4), EDI )        /*  next length                    */
+
+    PREFETCH   ( REGIND(EDI) )
+
+    MOVQ       ( MM0, REGIND(EAX) )     /*  write new x0, x1               */
+    MOVD       ( MM1, REGOFF(8, EAX) )  /*  write new x2                   */
+
+    ADD_L      ( CONST(16), EAX )       /*  next r                         */
+    DEC_L      ( EBP )                  /*  decrement normal counter       */
+
+    JA         ( LLBL (G3TN_norm_w_lengths) )
+    JMP        ( LLBL (G3TN_exit_3dnow) )
+
+ALIGNTEXT32
+LLBL (G3TN_norm):
+
+    PREFETCHW  ( REGIND(EAX) )
+
+    MOVQ       ( REGIND (EAX), MM0 )    /*  x1             | x0           */
+    MOVD       ( REGOFF(8, EAX), MM1 )  /*                 | x2           */
+
+    MOVQ       ( MM0, MM3 )             /*  x1              | x0           */
+    MOVQ       ( MM1, MM4 )             /*                  | x2           */
+
+    PFMUL      ( MM0, MM3 )             /*  x1*x1           | x0*x0        */
+    ADD_L      ( CONST(16), EAX )       /*  next r                         */
+
+    PFMUL      ( MM1, MM4 )             /*                  | x2*x2        */
+    PFADD      ( MM4, MM3 )             /*                  | x0*x0+x2*x2  */
+
+    PFACC      ( MM3, MM3 )             /* **not used**    | x0*x0+x1*x1+x2**/
+    PFRSQRT    ( MM3, MM5 )             /*  1/sqrt (x0*x0+x1*x1+x2*x2)     */
+
+    MOVQ       ( MM5, MM4 )
+    PUNPCKLDQ  ( MM3, MM3 )
+
+    DEC_L      ( EBP )                  /*  decrement normal counter       */
+    PFMUL      ( MM5, MM5 )
+
+    PFRSQIT1   ( MM3, MM5 )
+    PFRCPIT2   ( MM4, MM5 )
+
+    PFMUL      ( MM5, MM0 )             /*  x1 (normalized) | x0 (normalize*/
+
+    MOVQ       ( MM0, REGOFF(-16, EAX) ) /*  write new x0, x1              */
+    PFMUL      ( MM5, MM1 )             /*                 | x2 (normalize*/
+
+    MOVD       ( MM1, REGOFF(-8, EAX) ) /*  write new x2                  */
+    JA         ( LLBL (G3TN_norm) )
+
+LLBL (G3TN_exit_3dnow):
+    FEMMS
+
+LLBL (G3TN_end):
+    POP_L      ( EBP )
+    POP_L      ( ESI )
+    POP_L      ( EDI )
+    RET
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME(_mesa_3dnow_transform_normalize_normals_no_rot)
+GLNAME(_mesa_3dnow_transform_normalize_normals_no_rot):
+
+ #undef FRAME_OFFSET
+ #define FRAME_OFFSET 12
+
+    PUSH_L     ( EDI )
+    PUSH_L     ( ESI )
+    PUSH_L     ( EBP )
+
+    MOV_L      ( ARG_LENGTHS, EDI )
+    MOV_L      ( ARG_IN, ESI )
+    MOV_L      ( ARG_DEST, EAX )
+    MOV_L      ( REGOFF(V4F_COUNT, ESI), EBP ) /*  dest->count = in->count   */
+    MOV_L      ( EBP, REGOFF(V4F_COUNT, EAX) )
+    MOV_L      ( ARG_MAT, ECX )
+    MOV_L      ( REGOFF(V4F_START, EAX), EAX ) /*  dest->start  */
+    MOV_L      ( REGOFF(MATRIX_INV, ECX), ECX ) /*  mat->inv     */
+    MOV_L      ( REGOFF(V4F_START, ESI), EDX ) /*  in->start    */
+
+    CMP_L      ( CONST(0), EBP ) /*   count > 0 ??  */
+    JE         ( LLBL (G3TNNR_end) )
+
+    FEMMS
+
+    MOVD       ( M(0), MM0 )            /*               | m0                 */
+    PUNPCKLDQ  ( M(5), MM0 )            /* m5            | m0                 */
+
+    MOVD       ( M(10), MM2 )           /*               | m10                */
+    PUNPCKLDQ  ( MM2, MM2 )             /* m10           | m10                */
+
+    CMP_L      ( CONST(0), EDI )        /*  lengths == 0 ?                    */
+    JNE        ( LLBL (G3TNNR_scale_end ) )
+
+    MOVD       ( ARG_SCALE, MM7 )       /*               | scale              */
+    PUNPCKLDQ  ( MM7, MM7 )             /* scale         | scale              */
+
+    PFMUL      ( MM7, MM0 )             /* scale * m5    | scale * m0         */
+    PFMUL      ( MM7, MM2 )             /* scale * m10   | scale * m10        */
+
+ALIGNTEXT32
+LLBL (G3TNNR_scale_end):
+    CMP_L      ( CONST(0), EDI )        /* lengths == 0 ?                     */
+    JE         ( LLBL (G3TNNR_norm) )   /* need to calculate lengths          */
+
+    MOVD       ( REGIND(EDI), MM3 )     /*                 | length (x)       */
+
+
+ALIGNTEXT32
+LLBL (G3TNNR_norm_w_lengths):           /* use precalculated lengths          */
+
+    PREFETCHW  ( REGIND(EAX) )
+
+    MOVQ       ( REGIND(EDX), MM6 )     /* x1            | x0                 */
+    MOVD       ( REGOFF(8, EDX), MM7 )  /*               | x2                 */
+
+    PFMUL      ( MM0, MM6 )             /* x1*m5         | x0*m0              */
+    ADD_L      ( STRIDE, EDX )          /* next normal                        */
+
+    PREFETCH   ( REGIND(EDX) )
+
+    PFMUL      ( MM2, MM7 )             /*               | x2*m10             */
+    ADD_L      ( CONST(16), EAX )       /* next r                             */
+
+    PFMUL      ( MM3, MM7 )             /*               | x2 (normalized)  */
+    PUNPCKLDQ  ( MM3, MM3 )             /* length (x)    | length (x)       */
+
+    ADD_L      ( CONST(4), EDI )        /* next length                        */
+    PFMUL      ( MM3, MM6 )             /* x1 (normalized) | x0 (normalized)  */
+
+    DEC_L      ( EBP )                  /* decrement normal counter           */
+    MOVQ       ( MM6, REGOFF(-16, EAX) ) /* write r0, r1                      */
+
+    MOVD       ( MM7, REGOFF(-8, EAX) ) /* write r2                           */
+    MOVD       ( REGIND(EDI), MM3 )     /*                 | length (x)       */
+
+    JA         ( LLBL (G3TNNR_norm_w_lengths) )
+    JMP        ( LLBL (G3TNNR_exit_3dnow) )
+
+ALIGNTEXT32
+LLBL (G3TNNR_norm):                     /* need to calculate lengths          */
+
+    PREFETCHW  ( REGIND(EAX) )
+
+    MOVQ       ( REGIND(EDX), MM6 )     /* x1              | x0               */
+    MOVD       ( REGOFF(8, EDX), MM7 )  /*                 | x2               */
+
+    PFMUL      ( MM0, MM6 )             /* x1*m5           | x0*m0            */
+    ADD_L      ( CONST(16), EAX )       /* next r                             */
+
+    PFMUL      ( MM2, MM7 )             /*                 | x2*m10           */
+    MOVQ       ( MM6, MM3 )             /* x1 (transformed)| x0 (transformed) */
+
+    MOVQ       ( MM7, MM4 )             /*                 | x2 (transformed) */
+    PFMUL      ( MM6, MM3 )             /* x1*x1           | x0*x0            */
+
+
+    PFMUL      ( MM7, MM4 )             /*                 | x2*x2            */
+    PFACC      ( MM3, MM3 )             /* **not used**    | x0*x0+x1*x1      */
+
+    PFADD      ( MM4, MM3 )             /*                 | x0*x0+x1*x1+x2*x2*/
+    ADD_L      ( STRIDE, EDX )          /* next normal            */
+
+    PREFETCH   ( REGIND(EDX) )
+
+    PFRSQRT    ( MM3, MM5 )             /* 1/sqrt (x0*x0+x1*x1+x2*x2)         */
+    MOVQ       ( MM5, MM4 )
+
+    PUNPCKLDQ  ( MM3, MM3 )
+    PFMUL      ( MM5, MM5 )
+
+    PFRSQIT1   ( MM3, MM5 )
+    DEC_L      ( EBP )                  /* decrement normal counter           */
+
+    PFRCPIT2   ( MM4, MM5 )
+    PFMUL      ( MM5, MM6 )             /* x1 (normalized) | x0 (normalized)  */
+
+    MOVQ       ( MM6, REGOFF(-16, EAX) ) /* write r0, r1                      */
+    PFMUL      ( MM5, MM7 )             /*                 | x2 (normalized)  */
+
+    MOVD       ( MM7, REGOFF(-8, EAX) ) /* write r2                           */
+    JA         ( LLBL (G3TNNR_norm) )
+
+
+LLBL (G3TNNR_exit_3dnow):
+    FEMMS
+
+LLBL (G3TNNR_end):
+    POP_L      ( EBP )
+    POP_L      ( ESI )
+    POP_L      ( EDI )
+    RET
+
+
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME(_mesa_3dnow_transform_rescale_normals_no_rot)
+GLNAME(_mesa_3dnow_transform_rescale_normals_no_rot):
+
+ #undef FRAME_OFFSET
+ #define FRAME_OFFSET 12
+
+    PUSH_L     ( EDI )
+    PUSH_L     ( ESI )
+    PUSH_L     ( EBP )
+
+    MOV_L      ( ARG_IN, EAX )
+    MOV_L      ( ARG_DEST, EDX )
+    MOV_L      ( REGOFF(V4F_COUNT, EAX), EBP ) /*  dest->count = in->count   */
+    MOV_L      ( EBP, REGOFF(V4F_COUNT, EDX) )
+    MOV_L      ( ARG_IN, ESI )
+    MOV_L      ( ARG_MAT, ECX )
+    MOV_L      ( REGOFF(MATRIX_INV, ECX), ECX ) /*  mat->inv     */
+    MOV_L      ( REGOFF(V4F_START, EDX), EAX ) /*  dest->start  */
+    MOV_L      ( REGOFF(V4F_START, ESI), EDX ) /*  in->start    */
+
+    CMP_L      ( CONST(0), EBP )
+    JE         ( LLBL (G3TRNR_end) )
+
+    FEMMS
+
+    MOVD       ( ARG_SCALE, MM6 )       /*               | scale              */
+    PUNPCKLDQ  ( MM6, MM6 )             /* scale         | scale              */
+
+    MOVD       ( REGIND(ECX), MM0 )     /*               | m0                 */
+    PUNPCKLDQ  ( REGOFF(20, ECX), MM0 ) /* m5            | m0                 */
+
+    PFMUL      ( MM6, MM0 )             /* scale*m5      | scale*m0           */
+    MOVD       ( REGOFF(40, ECX), MM2 ) /*               | m10                */
+
+    PFMUL      ( MM6, MM2 )             /*               | scale*m10          */
+
+ALIGNTEXT32
+LLBL (G3TRNR_rescale):
+
+    PREFETCHW  ( REGIND(EAX) )
+	
+    MOVQ       ( REGIND(EDX), MM4 )     /* x1            | x0                 */
+    MOVD       ( REGOFF(8, EDX), MM5 )  /*               | x2                 */
+	
+    PFMUL      ( MM0, MM4 )             /* x1*m5         | x0*m0              */
+    ADD_L      ( STRIDE, EDX )          /* next normal                        */
+
+    PREFETCH   ( REGIND(EDX) )
+
+    PFMUL      ( MM2, MM5 )             /*               | x2*m10             */
+    ADD_L      ( CONST(16), EAX )       /* next r                             */
+
+    DEC_L      ( EBP )                  /* decrement normal counter           */
+    MOVQ       ( MM4, REGOFF(-16, EAX) ) /* write r0, r1                      */
+
+    MOVD       ( MM5, REGOFF(-8, EAX) ) /* write r2                           */
+    JA         ( LLBL (G3TRNR_rescale) ) /* cnt > 0 ? -> process next normal  */
+
+    FEMMS
+
+LLBL (G3TRNR_end):
+    POP_L      ( EBP )
+    POP_L      ( ESI )
+    POP_L      ( EDI )
+    RET
+
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME(_mesa_3dnow_transform_rescale_normals)
+GLNAME(_mesa_3dnow_transform_rescale_normals):
+
+ #undef  FRAME_OFFSET
+ #define FRAME_OFFSET 8
+
+    PUSH_L     ( EDI )
+    PUSH_L     ( ESI )
+
+    MOV_L      ( ARG_IN, ESI )
+    MOV_L      ( ARG_DEST, EAX )
+    MOV_L      ( ARG_MAT, ECX )
+    MOV_L      ( REGOFF(V4F_COUNT, ESI), EDI ) /*  dest->count = in->count   */
+    MOV_L      ( EDI, REGOFF(V4F_COUNT, EAX) )
+    MOV_L      ( REGOFF(V4F_START, EAX), EAX ) /*  dest->start  */
+    MOV_L      ( REGOFF(V4F_START, ESI), EDX ) /*  in->start    */
+    MOV_L      ( REGOFF(MATRIX_INV, ECX), ECX ) /*  mat->inv     */
+
+    CMP_L      ( CONST(0), EDI )
+    JE         ( LLBL (G3TR_end) )
+
+    FEMMS
+
+    MOVQ       ( REGIND(ECX), MM3 )     /* m1            | m0                 */
+
+    MOVQ       ( REGOFF(16,ECX), MM4 )  /* m5            | m4                 */
+    MOVD       ( ARG_SCALE, MM0 )       /* scale       */
+
+    MOVD       ( REGOFF(8,ECX), MM5 )   /*               | m2                 */
+    PUNPCKLDQ  ( MM0, MM0 )             /* scale         | scale              */
+
+    PUNPCKLDQ  ( REGOFF(24, ECX), MM5 )
+    PFMUL      ( MM0, MM3 )             /* scale*m1      | scale*m0           */
+
+    MOVQ       ( REGOFF(32, ECX), MM6 ) /* m9            | m8*/
+    PFMUL      ( MM0, MM4 )             /* scale*m5      | scale*m4           */
+
+    MOVD       ( REGOFF(40, ECX), MM7 ) /*               | m10                */
+    PFMUL      ( MM0, MM5 )             /* scale*m6      | scale*m2           */
+
+    PFMUL      ( MM0, MM6 )             /* scale*m9      | scale*m8           */
+
+    PFMUL      ( MM0, MM7 )             /*               | scale*m10          */
+
+ALIGNTEXT32
+LLBL (G3TR_rescale):
+
+    PREFETCHW  ( REGIND(EAX) )
+
+    MOVQ       ( REGIND(EDX), MM0 )     /* x1            | x0                 */
+    MOVD       ( REGOFF(8, EDX), MM2 )  /*               | x2                 */
+
+    MOVQ       ( MM0, MM1 )             /* x1            | x0                 */
+    PUNPCKLDQ  ( MM2, MM2 )             /* x2            | x2                 */
+
+    PFMUL      ( MM3, MM0 )             /* x1*m1         | x0*m0              */
+    ADD_L      ( CONST(16), EAX )       /* next r                             */
+
+    PFMUL      ( MM4, MM1 )             /* x1*m5         | x0*m4              */
+    PFACC      ( MM1, MM0 )             /* x0*m4+x1*m5   | x0*m0+x1*m1        */
+
+    MOVQ       ( REGIND(EDX), MM1 )     /* x1            | x0                 */
+
+    PFMUL      ( MM5, MM2 )             /* x2*m6         | x2*m2              */
+    PFADD      ( MM2, MM0 )             /* x0*m4...+x2*m6| x0*m0+x1*m1+x2*m2  */
+
+    MOVD       ( REGOFF(8, EDX), MM2 )  /*               | x2                 */
+    ADD_L      ( STRIDE, EDX )          /* next normal                    */
+
+    PREFETCH   ( REGIND(EDX) )
+
+    MOVQ       ( MM0, REGOFF(-16, EAX) ) /* write r0, r1                      */
+    PFMUL      ( MM6, MM1 )             /* x1*m9         | x0*m8              */
+
+    PFMUL      ( MM7, MM2 )             /*               | x2*m10             */
+    PFACC      ( MM1, MM1 )             /* *not used*    | x0*m8+x1*m9        */
+
+    PFADD      ( MM2, MM1 )             /* *not used*    | x0*m8+x1*m9+x2*m10 */
+    MOVD       ( MM1, REGOFF(-8, EAX) ) /* write r2                           */
+
+    DEC_L      ( EDI )                  /* decrement normal counter           */
+    JA         ( LLBL (G3TR_rescale) )
+
+    FEMMS
+
+LLBL (G3TR_end):
+    POP_L       ( ESI )
+    POP_L       ( EDI )
+    RET
+
+
+
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME(_mesa_3dnow_transform_normals_no_rot)
+GLNAME(_mesa_3dnow_transform_normals_no_rot):
+
+ #undef  FRAME_OFFSET
+ #define FRAME_OFFSET 8
+
+    PUSH_L     ( EDI )
+    PUSH_L     ( ESI )
+
+    MOV_L      ( ARG_IN, ESI )
+    MOV_L      ( ARG_DEST, EAX )
+    MOV_L      ( ARG_MAT, ECX )
+    MOV_L      ( REGOFF(V4F_COUNT, ESI), EDI ) /*  dest->count = in->count   */
+    MOV_L      ( EDI, REGOFF(V4F_COUNT, EAX) )
+    MOV_L      ( REGOFF(V4F_START, EAX), EAX ) /*  dest->start  */
+    MOV_L      ( REGOFF(V4F_START, ESI), EDX ) /*  in->start    */
+    MOV_L      ( REGOFF(MATRIX_INV, ECX), ECX ) /*  mat->inv     */
+
+    CMP_L      ( CONST(0), EDI )
+    JE         ( LLBL (G3TNR_end) )
+
+    FEMMS
+
+    MOVD       ( REGIND(ECX), MM0 )     /*               | m0                 */
+    PUNPCKLDQ  ( REGOFF(20, ECX), MM0 ) /* m5            | m0                 */
+
+    MOVD       ( REGOFF(40, ECX), MM2 ) /*               | m10                */
+    PUNPCKLDQ  ( MM2, MM2 )             /* m10           | m10                */
+
+ALIGNTEXT32
+LLBL (G3TNR_transform):
+
+    PREFETCHW  ( REGIND(EAX) )
+
+    MOVQ       ( REGIND(EDX), MM4 )     /* x1            | x0                 */
+    MOVD       ( REGOFF(8, EDX), MM5 )  /*               | x2                 */
+
+    PFMUL      ( MM0, MM4 )             /* x1*m5         | x0*m0              */
+    ADD_L      ( STRIDE, EDX)           /* next normal      */
+
+    PREFETCH   ( REGIND(EDX) )
+
+    PFMUL      ( MM2, MM5 )             /*               | x2*m10             */
+    ADD_L      ( CONST(16), EAX )       /* next r                             */
+
+    DEC_L      ( EDI )                  /* decrement normal counter           */
+    MOVQ       ( MM4, REGOFF(-16, EAX) ) /* write r0, r1                      */
+
+    MOVD       ( MM5, REGOFF(-8, EAX) ) /* write r2                           */
+    JA         ( LLBL (G3TNR_transform) )
+
+    FEMMS
+
+LLBL (G3TNR_end):
+    POP_L       ( ESI )
+    POP_L       ( EDI )
+    RET
+
+
+
+
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME(_mesa_3dnow_transform_normals)
+GLNAME(_mesa_3dnow_transform_normals):
+
+ #undef  FRAME_OFFSET
+ #define FRAME_OFFSET 8
+
+    PUSH_L     ( EDI )
+    PUSH_L     ( ESI )
+
+    MOV_L      ( ARG_IN, ESI )
+    MOV_L      ( ARG_DEST, EAX )
+    MOV_L      ( ARG_MAT, ECX )
+    MOV_L      ( REGOFF(V4F_COUNT, ESI), EDI ) /*  dest->count = in->count   */
+    MOV_L      ( EDI, REGOFF(V4F_COUNT, EAX) )
+    MOV_L      ( REGOFF(V4F_START, EAX), EAX ) /*  dest->start  */
+    MOV_L      ( REGOFF(V4F_START, ESI), EDX ) /*  in->start    */
+    MOV_L      ( REGOFF(MATRIX_INV, ECX), ECX ) /*  mat->inv     */
+
+    CMP_L      ( CONST(0), EDI )        /* count > 0 ??                       */
+    JE         ( LLBL (G3T_end) )
+
+    FEMMS
+
+    MOVQ       ( REGIND(ECX), MM3 )     /* m1            | m0                 */
+    MOVQ       ( REGOFF(16, ECX), MM4 ) /* m5            | m4                 */
+
+    MOVD       ( REGOFF(8, ECX), MM5 )  /*               | m2                 */
+    PUNPCKLDQ  ( REGOFF(24, ECX), MM5 ) /* m6            | m2                 */
+
+    MOVQ       ( REGOFF(32, ECX), MM6 ) /* m9            | m8                 */
+    MOVD       ( REGOFF(40, ECX), MM7 ) /*               | m10                */
+
+ALIGNTEXT32
+LLBL (G3T_transform):
+
+    PREFETCHW  ( REGIND(EAX) )
+
+    MOVQ       ( REGIND(EDX), MM0 )     /* x1            | x0                 */
+    MOVD       ( REGOFF(8, EDX), MM2 )  /*               | x2                 */
+
+    MOVQ       ( MM0, MM1 )             /* x1            | x0                 */
+    PUNPCKLDQ  ( MM2, MM2 )             /* x2            | x2                 */
+
+    PFMUL      ( MM3, MM0 )             /* x1*m1         | x0*m0              */
+    ADD_L      ( CONST(16), EAX )       /* next r                             */
+
+    PFMUL      ( MM4, MM1 )             /* x1*m5         | x0*m4              */
+    PFACC      ( MM1, MM0 )             /* x0*m4+x1*m5   | x0*m0+x1*m1        */
+
+    PFMUL      ( MM5, MM2 )             /* x2*m6         | x2*m2              */
+    PFADD      ( MM2, MM0 )             /* x0*m4...+x2*m6| x0*m0+x1*m1+x2*m2  */
+
+    MOVQ       ( REGIND(EDX), MM1 )     /* x1            | x0                 */
+    MOVQ       ( MM0, REGOFF(-16, EAX) ) /* write r0, r1                      */
+
+    PFMUL      ( MM6, MM1 )             /* x1*m9         | x0*m8              */
+    MOVD       ( REGOFF(8, EDX), MM2 )  /*               | x2                 */
+
+    PFMUL      ( MM7, MM2 )             /*               | x2*m10             */
+    ADD_L      ( STRIDE, EDX )          /* next normal               */
+
+    PREFETCH   ( REGIND(EDX) )
+
+    PFACC      ( MM1, MM1 )             /* *not used*    | x0*m8+x1*m9        */
+    PFADD      ( MM2, MM1 )             /* *not used*    | x0*m8+x1*m9+x2*m10 */
+
+    MOVD       ( MM1, REGOFF(-8, EAX) ) /* write r2                           */
+    DEC_L      ( EDI )                  /* decrement normal counter           */
+
+    JA         ( LLBL (G3T_transform) )
+
+    FEMMS
+
+LLBL (G3T_end):
+    POP_L  ( ESI )
+    POP_L  ( EDI )
+    RET
+
+
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME(_mesa_3dnow_normalize_normals)
+GLNAME(_mesa_3dnow_normalize_normals):
+
+ #undef  FRAME_OFFSET
+ #define FRAME_OFFSET 12
+
+    PUSH_L     ( EDI )
+    PUSH_L     ( ESI )
+    PUSH_L     ( EBP )
+
+    MOV_L      ( ARG_IN, ESI )
+    MOV_L      ( ARG_DEST, EAX )
+    MOV_L      ( REGOFF(V4F_COUNT, ESI), EBP ) /*  dest->count = in->count   */
+    MOV_L      ( EBP, REGOFF(V4F_COUNT, EAX) )
+    MOV_L      ( REGOFF(V4F_START, EAX), EAX ) /*  dest->start  */
+    MOV_L      ( REGOFF(V4F_START, ESI), ECX ) /*  in->start    */
+    MOV_L      ( ARG_LENGTHS, EDX )
+
+    CMP_L      ( CONST(0), EBP ) /* count > 0 ?? */
+    JE         ( LLBL (G3N_end) )
+
+    FEMMS
+
+    CMP_L      ( CONST(0), EDX )        /* lengths == 0 ?                     */
+    JE         ( LLBL (G3N_norm2) )     /* calculate lengths                  */
+
+ALIGNTEXT32
+LLBL (G3N_norm1):                       /* use precalculated lengths          */
+
+    PREFETCH   ( REGIND(EAX) )
+
+    MOVQ       ( REGIND(ECX), MM0 )     /* x1              | x0               */
+    MOVD       ( REGOFF(8, ECX), MM1 )  /*                 | x2               */
+
+    MOVD       ( REGIND(EDX), MM3 )     /*                 | length (x)       */
+    PFMUL      ( MM3, MM1 )             /*                 | x2 (normalized)  */
+
+    PUNPCKLDQ  ( MM3, MM3 )             /* length (x)      | length (x)       */
+    ADD_L      ( STRIDE, ECX )          /* next normal            */
+
+    PREFETCH   ( REGIND(ECX) )
+
+    PFMUL      ( MM3, MM0 )             /* x1 (normalized) | x0 (normalized)  */
+    MOVQ       ( MM0, REGIND(EAX) )     /* write new x0, x1                   */
+
+    MOVD       ( MM1, REGOFF(8, EAX) )  /* write new x2                       */
+    ADD_L      ( CONST(16), EAX )       /* next r                             */
+
+    ADD_L      ( CONST(4), EDX )        /* next length                        */
+    DEC_L      ( EBP )                  /* decrement normal counter           */
+
+    JA         ( LLBL (G3N_norm1) )
+
+    JMP        ( LLBL (G3N_end1) )
+
+ALIGNTEXT32
+LLBL (G3N_norm2):                       /* need to calculate lengths          */
+
+    PREFETCHW  ( REGIND(EAX) )
+
+    PREFETCH   ( REGIND(ECX) )
+
+    MOVQ       ( REGIND(ECX), MM0 )     /* x1              | x0               */
+    MOVD       ( REGOFF(8, ECX), MM1 )  /*                 | x2               */
+
+    MOVQ       ( MM0, MM3 )             /* x1              | x0               */
+    ADD_L      ( STRIDE, ECX )          /* next normal    */
+
+    PFMUL      ( MM0, MM3 )             /* x1*x1           | x0*x0            */
+    MOVQ       ( MM1, MM4 )             /*                 | x2               */
+
+    ADD_L      ( CONST(16), EAX )       /* next r                             */
+    PFMUL      ( MM1, MM4 )             /*                 | x2*x2            */
+
+    PFADD      ( MM4, MM3 )             /*                 | x0*x0+x2*x2      */
+    PFACC      ( MM3, MM3 )             /* x0*x0+...+x2*x2 | x0*x0+x1*x1+x2*x2*/
+
+    PFRSQRT    ( MM3, MM5 )             /* 1/sqrt (x0*x0+x1*x1+x2*x2)         */
+    MOVQ       ( MM5, MM4 )
+
+    PUNPCKLDQ  ( MM3, MM3 )
+    PFMUL      ( MM5, MM5 )
+
+    PFRSQIT1   ( MM3, MM5 )
+    DEC_L      ( EBP )                  /* decrement normal counter           */
+
+    PFRCPIT2   ( MM4, MM5 )
+
+    PFMUL      ( MM5, MM0 )             /* x1 (normalized) | x0 (normalized)  */
+    MOVQ       ( MM0, REGOFF(-16, EAX) ) /* write new x0, x1                  */
+
+    PFMUL      ( MM5, MM1 )             /*                 | x2 (normalized)  */
+    MOVD       ( MM1, REGOFF(-8, EAX) ) /* write new x2                       */
+
+    JA         ( LLBL (G3N_norm2) )
+
+LLBL (G3N_end1):
+    FEMMS
+
+LLBL (G3N_end):
+    POP_L      ( EBP )
+    POP_L      ( ESI )
+    POP_L      ( EDI )
+    RET
+
+
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME(_mesa_3dnow_rescale_normals)
+GLNAME(_mesa_3dnow_rescale_normals):
+
+ #undef  FRAME_OFFSET
+ #define FRAME_OFFSET 8
+    PUSH_L     ( EDI )
+    PUSH_L     ( ESI )
+
+    MOV_L      ( ARG_IN, ESI )
+    MOV_L      ( ARG_DEST, EAX )
+    MOV_L      ( REGOFF(V4F_COUNT, ESI), EDX ) /*  dest->count = in->count   */
+    MOV_L      ( EDX, REGOFF(V4F_COUNT, EAX) )
+    MOV_L      ( REGOFF(V4F_START, EAX), EAX ) /*  dest->start  */
+    MOV_L      ( REGOFF(V4F_START, ESI), ECX ) /*  in->start    */
+
+    CMP_L      ( CONST(0), EDX )
+    JE         ( LLBL (G3R_end) )
+
+    FEMMS
+
+    MOVD       ( ARG_SCALE, MM0 )       /* scale                              */
+    PUNPCKLDQ  ( MM0, MM0 )
+
+ALIGNTEXT32
+LLBL (G3R_rescale):
+
+    PREFETCHW  ( REGIND(EAX) )
+
+    MOVQ       ( REGIND(ECX), MM1 )     /* x1            | x0                 */
+    MOVD       ( REGOFF(8, ECX), MM2 )  /*               | x2                 */
+
+    PFMUL      ( MM0, MM1 )             /* x1*scale      | x0*scale           */
+    ADD_L      ( STRIDE, ECX )          /* next normal                  */
+
+    PREFETCH   ( REGIND(ECX) )
+
+    PFMUL      ( MM0, MM2 )             /*               | x2*scale           */
+    ADD_L      ( CONST(16), EAX )       /* next r                             */
+
+    MOVQ       ( MM1, REGOFF(-16, EAX) ) /* write r0, r1                      */
+    MOVD       ( MM2, REGOFF(-8, EAX) ) /* write r2                           */
+
+    DEC_L      ( EDX )                  /* decrement normal counter           */
+    JA         ( LLBL (G3R_rescale) )
+
+    FEMMS
+
+LLBL (G3R_end):
+    POP_L      ( ESI )
+    POP_L      ( EDI )
+    RET
diff --git a/reactos/lib/mesa32/src/x86/3dnow_xform1.S b/reactos/lib/mesa32/src/x86/3dnow_xform1.S
new file mode 100644
index 00000000000..036b62369de
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/3dnow_xform1.S
@@ -0,0 +1,423 @@
+/* $Id: 3dnow_xform1.S,v 1.1 2004/07/16 22:12:42 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "matypes.h"
+#include "xform_args.h"
+
+    SEG_TEXT
+
+#define FRAME_OFFSET	4
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_3dnow_transform_points1_general )
+GLNAME( _mesa_3dnow_transform_points1_general ):
+
+    PUSH_L    ( ESI )
+
+    MOV_L     ( ARG_DEST, ECX )
+    MOV_L     ( ARG_MATRIX, ESI )
+    MOV_L     ( ARG_SOURCE, EAX )
+    MOV_L     ( CONST(4), REGOFF(V4F_SIZE, ECX) )
+    OR_B      ( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, ECX) )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )
+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )
+
+    PUSH_L    ( EDI )
+
+    MOV_L     ( REGOFF(4, ECX), EDX )
+    MOV_L     ( ESI, ECX )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )
+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )
+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )
+
+    TEST_L    ( ESI, ESI )
+    JZ        ( LLBL( G3TPGR_3 ) )
+
+    MOVQ      ( REGIND(ECX), MM0 )	/* m01             | m00             */
+    MOVQ      ( REGOFF(8, ECX), MM1 )	/* m03             | m02             */
+
+    MOVQ      ( REGOFF(48, ECX), MM2 )	/* m31             | m30             */
+    MOVQ      ( REGOFF(56, ECX), MM3 )	/* m33             | m32             */
+
+ALIGNTEXT16
+LLBL( G3TPGR_2 ):
+
+    MOVD      ( REGIND(EAX), MM4 )	/*                 | x0              */
+    PUNPCKLDQ ( MM4, MM4 )		/* x0              | x0              */
+
+    MOVQ      ( MM4, MM5 )		/* x0              | x0              */
+    PFMUL     ( MM0, MM4 )		/* x0*m01          | x0*m00          */
+
+    PFMUL     ( MM1, MM5 )		/* x0*m03          | x0*m02          */
+    PFADD     ( MM2, MM4 )		/* x0*m01+m31      | x0*m00+m30      */
+
+    PFADD     ( MM3, MM5 )		/* x0*m03+m33      | x0*m02+m32      */
+    MOVQ      ( MM4, REGIND(EDX) )	/* write r1, r0                      */
+
+    MOVQ      ( MM5, REGOFF(8, EDX) )	/* write r3, r2                      */
+    ADD_L     ( EDI, EAX )		/* next vertex                       */
+
+    ADD_L     ( CONST(16), EDX )	/* next r                            */
+    DEC_L     ( ESI )			/* decrement vertex counter          */
+
+    JNZ       ( LLBL( G3TPGR_2 ) )	/* cnt > 0 ? -> process next vertex  */
+
+LLBL( G3TPGR_3 ):
+
+    FEMMS
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_3dnow_transform_points1_identity )
+GLNAME( _mesa_3dnow_transform_points1_identity ):
+
+    PUSH_L    ( ESI )
+
+    MOV_L     ( ARG_DEST, ECX )
+    MOV_L     ( ARG_MATRIX, ESI )
+    MOV_L     ( ARG_SOURCE, EAX )
+    MOV_L     ( CONST(1), REGOFF(V4F_SIZE, ECX) )
+    OR_B      ( CONST(VEC_SIZE_1), REGOFF(V4F_FLAGS, ECX) )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )
+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )
+
+    PUSH_L    ( EDI )
+
+    MOV_L     ( REGOFF(4, ECX), EDX )
+    MOV_L     ( ESI, ECX )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )
+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )
+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )
+
+    TEST_L    ( ESI, ESI )
+    JZ        ( LLBL( G3TPIR_4) )
+
+ALIGNTEXT16
+LLBL( G3TPIR_3 ):
+
+    MOVD      ( REGIND(EAX), MM0 )	/*                 | x0              */
+    ADD_L     ( EDI, EAX )		/* next vertex                       */
+
+    MOVD      ( MM0, REGIND(EDX) )	/*                 | r0              */
+    ADD_L     ( CONST(16), EDX )	/* next r                            */
+
+    DEC_L     ( ESI )			/* decrement vertex counter          */
+    JNZ       ( LLBL( G3TPIR_3 ) )	/* cnt > 0 ? -> process next vertex  */
+
+LLBL( G3TPIR_4 ):
+
+    FEMMS
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_3dnow_transform_points1_3d_no_rot )
+GLNAME( _mesa_3dnow_transform_points1_3d_no_rot ):
+
+    PUSH_L    ( ESI )
+
+    MOV_L     ( ARG_DEST, ECX )
+    MOV_L     ( ARG_MATRIX, ESI )
+    MOV_L     ( ARG_SOURCE, EAX )
+    MOV_L     ( CONST(3), REGOFF(V4F_SIZE, ECX) )
+    OR_B      ( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, ECX) )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )
+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )
+
+    PUSH_L    ( EDI )
+
+    MOV_L     ( REGOFF(4, ECX), EDX )
+    MOV_L     ( ESI, ECX )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )
+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )
+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )
+
+    TEST_L    ( ESI, ESI )
+    JZ        ( LLBL( G3TP3NRR_3 ) )
+
+    MOVD      ( REGIND(ECX), MM0 )	/*                 | m00             */
+    MOVQ      ( REGOFF(48, ECX), MM2 )	/* m31             | m30             */
+
+    MOVD      ( REGOFF(56, ECX), MM3 )	/*                 | m32             */
+
+ALIGNTEXT16
+LLBL( G3TP3NRR_2 ):
+
+    MOVD      ( REGIND(EAX), MM4 )	/*                 | x0              */
+    PFMUL     ( MM0, MM4 )		/*                 | x0*m00          */
+
+    PFADD     ( MM2, MM4 )		/* m31             | x0*m00+m30      */
+    MOVQ      ( MM4, REGIND(EDX) )	/* write r1, r0                      */
+
+    MOVD      ( MM3, REGOFF(8, EDX) )	/* write r2                          */
+    ADD_L     ( EDI, EAX )		/* next vertex                       */
+
+    ADD_L     ( CONST(16), EDX )	/* next r                            */
+    DEC_L     ( ESI )			/* decrement vertex counter          */
+
+    JNZ       ( LLBL( G3TP3NRR_2 ) )	/* cnt > 0 ? -> process next vertex  */
+
+LLBL( G3TP3NRR_3 ):
+
+    FEMMS
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_3dnow_transform_points1_perspective )
+GLNAME( _mesa_3dnow_transform_points1_perspective ):
+
+    PUSH_L    ( ESI )
+
+    MOV_L     ( ARG_DEST, ECX )
+    MOV_L     ( ARG_MATRIX, ESI )
+    MOV_L     ( ARG_SOURCE, EAX )
+    MOV_L     ( CONST(4), REGOFF(V4F_SIZE, ECX) )
+    OR_B      ( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, ECX) )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )
+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )
+
+    PUSH_L    ( EDI )
+
+    MOV_L     ( REGOFF(4, ECX), EDX )
+    MOV_L     ( ESI, ECX )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )
+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )
+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )
+
+    TEST_L    ( ESI, ESI )
+    JZ        ( LLBL( G3TPPR_3 ) )
+
+    MOVD      ( REGIND(ECX), MM0 )	/*                 | m00             */
+    MOVD      ( REGOFF(56, ECX), MM3 )	/*                 | m32             */
+
+ALIGNTEXT16
+LLBL( G3TPPR_2 ):
+
+    MOVD      ( REGIND(EAX), MM4 )	/* 0               | x0              */
+    PFMUL     ( MM0, MM4 )		/* 0               | x0*m00          */
+
+    MOVQ      ( MM4, REGIND(EDX) )	/* write r1, r0                      */
+    MOVQ      ( MM3, REGOFF(8, EDX) )	/* write r2  (=m32), r3 (=0)         */
+
+    ADD_L     ( EDI, EAX )		/* next vertex                       */
+    ADD_L     ( CONST(16), EDX )	/* next r                            */
+
+    DEC_L     ( ESI )			/* decrement vertex counter          */
+    JNZ       ( LLBL( G3TPPR_2 ) )	/* cnt > 0 ? -> process next vertex  */
+
+LLBL( G3TPPR_3 ):
+
+    FEMMS
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_3dnow_transform_points1_2d )
+GLNAME( _mesa_3dnow_transform_points1_2d ):
+
+    PUSH_L    ( ESI )
+
+    MOV_L     ( ARG_DEST, ECX )
+    MOV_L     ( ARG_MATRIX, ESI )
+    MOV_L     ( ARG_SOURCE, EAX )
+    MOV_L     ( CONST(2), REGOFF(V4F_SIZE, ECX) )
+    OR_B      ( CONST(VEC_SIZE_2), REGOFF(V4F_FLAGS, ECX) )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )
+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )
+
+    PUSH_L    ( EDI )
+
+    MOV_L     ( REGOFF(4, ECX), EDX )
+    MOV_L     ( ESI, ECX )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )
+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )
+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )
+
+    TEST_L    ( ESI, ESI )
+    JZ        ( LLBL( G3TP2R_3 ) )
+
+    MOVQ      ( REGIND(ECX), MM0 )	/* m01             | m00             */
+    MOVQ      ( REGOFF(48, ECX), MM2 )	/* m31             | m30             */
+
+ALIGNTEXT16
+LLBL( G3TP2R_2 ):
+
+    MOVD      ( REGIND(EAX), MM4 )	/*                 | x0              */
+    PUNPCKLDQ ( MM4, MM4 )		/* x0              | x0              */
+
+    PFMUL     ( MM0, MM4 )		/* x0*m01          | x0*m00          */
+    PFADD     ( MM2, MM4 )		/* x0*m01+m31      | x0*m00+m30      */
+
+    MOVQ      ( MM4, REGIND(EDX) )	/* write r1, r0                      */
+    ADD_L     ( EDI, EAX )		/* next vertex                       */
+
+    ADD_L     ( CONST(16), EDX )	/* next r                            */
+    DEC_L     ( ESI )			/* decrement vertex counter          */
+
+    JNZ       ( LLBL( G3TP2R_2 ) )	/* cnt > 0 ? -> process next vertex  */
+
+LLBL( G3TP2R_3 ):
+
+    FEMMS
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_3dnow_transform_points1_2d_no_rot )
+GLNAME( _mesa_3dnow_transform_points1_2d_no_rot ):
+
+    PUSH_L    ( ESI )
+
+    MOV_L     ( ARG_DEST, ECX )
+    MOV_L     ( ARG_MATRIX, ESI )
+    MOV_L     ( ARG_SOURCE, EAX )
+    MOV_L     ( CONST(2), REGOFF(V4F_SIZE, ECX) )
+    OR_B      ( CONST(VEC_SIZE_2), REGOFF(V4F_FLAGS, ECX) )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )
+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )
+
+    PUSH_L    ( EDI )
+
+    MOV_L     ( REGOFF(4, ECX), EDX )
+    MOV_L     ( ESI, ECX )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )
+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )
+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )
+
+    TEST_L    ( ESI, ESI )
+    JZ        ( LLBL( G3TP2NRR_3 ) )
+
+    MOVD      ( REGIND(ECX), MM0 )	/*                 | m00             */
+    MOVQ      ( REGOFF(48, ECX), MM2 )	/* m31             | m30             */
+
+ALIGNTEXT16
+LLBL( G3TP2NRR_2 ):
+
+    MOVD      ( REGIND(EAX), MM4 )	/*                 | x0              */
+    ADD_L     ( EDI, EAX )		/* next vertex                       */
+
+    PFMUL     ( MM0, MM4 )		/*                 | x0*m00          */
+    PFADD     ( MM2, MM4 )		/* m31             | x0*m00+m30      */
+
+    MOVQ      ( MM4, REGIND(EDX) )	/* write r1, r0                      */
+    ADD_L     ( CONST(16), EDX )	/* next r                            */
+
+    DEC_L     ( ESI )			/* decrement vertex counter          */
+    JNZ       ( LLBL( G3TP2NRR_2 ) )	/* cnt > 0 ? -> process next vertex  */
+
+LLBL( G3TP2NRR_3 ):
+
+    FEMMS
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_3dnow_transform_points1_3d )
+GLNAME( _mesa_3dnow_transform_points1_3d ):
+
+    PUSH_L    ( ESI )
+
+    MOV_L     ( ARG_DEST, ECX )
+    MOV_L     ( ARG_MATRIX, ESI )
+    MOV_L     ( ARG_SOURCE, EAX )
+    MOV_L     ( CONST(3), REGOFF(V4F_SIZE, ECX) )
+    OR_B      ( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, ECX) )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )
+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )
+
+    PUSH_L    ( EDI )
+
+    MOV_L     ( REGOFF(4, ECX), EDX )
+    MOV_L     ( ESI, ECX )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )
+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )
+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )
+
+    TEST_L    ( ESI, ESI )
+    JZ        ( LLBL( G3TP3R_3 ) )
+
+    MOVQ      ( REGIND(ECX), MM0 )	/* m01             | m00             */
+    MOVD      ( REGOFF(8, ECX), MM1 )	/*                 | m02             */
+
+    MOVQ      ( REGOFF(48, ECX), MM2 )	/* m31             | m30             */
+    MOVD      ( REGOFF(56, ECX), MM3 )	/*                 | m32             */
+
+ALIGNTEXT16
+LLBL( G3TP3R_2 ):
+
+    MOVD      ( REGIND(EAX), MM4 )	/*                 | x0              */
+    PUNPCKLDQ ( MM4, MM4 )		/* x0              | x0              */
+
+    MOVQ      ( MM4, MM5 )		/*                 | x0              */
+    PFMUL     ( MM0, MM4 )		/* x0*m01          | x0*m00          */
+
+    PFMUL     ( MM1, MM5 )		/*                 | x0*m02          */
+    PFADD     ( MM2, MM4 )		/* x0*m01+m31      | x0*m00+m30      */
+
+    PFADD     ( MM3, MM5 )		/*                 | x0*m02+m32      */
+    MOVQ      ( MM4, REGIND(EDX) )	/* write r1, r0                      */
+
+    MOVD      ( MM5, REGOFF(8, EDX) )	/* write r2                          */
+    ADD_L     ( EDI, EAX )		/* next vertex                       */
+
+    ADD_L     ( CONST(16), EDX )	/* next r                            */
+    DEC_L     ( ESI )			/* decrement vertex counter          */
+
+    JNZ       ( LLBL( G3TP3R_2 ) )	/* cnt > 0 ? -> process next vertex  */
+
+LLBL( G3TP3R_3 ):
+
+    FEMMS
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
diff --git a/reactos/lib/mesa32/src/x86/3dnow_xform2.S b/reactos/lib/mesa32/src/x86/3dnow_xform2.S
new file mode 100644
index 00000000000..79e3a4fe49d
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/3dnow_xform2.S
@@ -0,0 +1,464 @@
+/* $Id: 3dnow_xform2.S,v 1.1 2004/07/16 22:12:42 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "matypes.h"
+#include "xform_args.h"
+
+    SEG_TEXT
+
+#define FRAME_OFFSET	4
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_3dnow_transform_points2_general )
+GLNAME( _mesa_3dnow_transform_points2_general ):
+
+    PUSH_L    ( ESI )
+
+    MOV_L     ( ARG_DEST, ECX )
+    MOV_L     ( ARG_MATRIX, ESI )
+    MOV_L     ( ARG_SOURCE, EAX )
+    MOV_L     ( CONST(4), REGOFF(V4F_SIZE, ECX) )
+    OR_B      ( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, ECX) )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )
+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )
+
+    PUSH_L    ( EDI )
+
+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )
+    MOV_L     ( ESI, ECX )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )
+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )
+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )
+
+    TEST_L    ( ESI, ESI )
+    JZ        ( LLBL( G3TPGR_3 ) )
+
+    MOVD      ( REGIND(ECX), MM0 )	/*                 | m00             */
+    PUNPCKLDQ ( REGOFF(16, ECX), MM0 )	/* m10             | m00             */
+
+    MOVD      ( REGOFF(4, ECX), MM1 )	/*                 | m01             */
+    PUNPCKLDQ ( REGOFF(20, ECX), MM1 )	/* m11             | m01             */
+
+    MOVD      ( REGOFF(8, ECX), MM2 )	/*                 | m02             */
+    PUNPCKLDQ ( REGOFF(24, ECX), MM2 )	/* m12             | m02             */
+
+    MOVD      ( REGOFF(12, ECX), MM3 )	/*                 | m03             */
+    PUNPCKLDQ ( REGOFF(28, ECX), MM3 )	/* m13             | m03             */
+
+    MOVQ      ( REGOFF(48, ECX), MM4 )	/* m31             | m30             */
+    MOVQ      ( REGOFF(56, ECX), MM5 )	/* m33             | m32             */
+
+ALIGNTEXT16
+LLBL( G3TPGR_2 ):
+
+    MOVQ      ( REGIND(EAX), MM6 )	/* x1              | x0              */
+    MOVQ      ( MM6, MM7 )		/* x1              | x0              */
+
+    PFMUL     ( MM0, MM6 )		/* x1*m10          | x0*m00          */
+    PFMUL     ( MM1, MM7 )		/* x1*m11          | x0*m01          */
+
+    PFACC     ( MM7, MM6 )		/* x0*m01+x1*m11   | x0*x00+x1*m10   */
+    PFADD     ( MM4, MM6 )		/* x0*...*m11+m31  | x0*...*m10+m30  */
+
+    MOVQ      ( MM6, REGIND(EDX) )	/* write r1, r0                      */
+    MOVQ      ( REGIND(EAX), MM6 )	/* x1              | x0              */
+
+    MOVQ      ( MM6, MM7 )		/* x1              | x0              */
+    PFMUL     ( MM2, MM6 )		/* x1*m12          | x0*m02          */
+
+    PFMUL     ( MM3, MM7 )		/* x1*m13          | x0*m03          */
+    ADD_L     ( EDI, EAX )		/* next vertex                       */
+
+    PFACC     ( MM7, MM6 )		/* x0*m03+x1*m13   | x0*x02+x1*m12   */
+    PFADD     ( MM5, MM6 )		/* x0*...*m13+m33  | x0*...*m12+m32  */
+
+    MOVQ      ( MM6, REGOFF(8, EDX) )	/* write r3, r2                      */
+    ADD_L     ( CONST(16), EDX )	/* next r                            */
+
+    DEC_L     ( ESI )			/* decrement vertex counter          */
+    JNZ       ( LLBL( G3TPGR_2 ) )	/* cnt > 0 ? -> process next vertex  */
+
+LLBL( G3TPGR_3 ):
+
+    FEMMS
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_3dnow_transform_points2_perspective )
+GLNAME( _mesa_3dnow_transform_points2_perspective ):
+
+    PUSH_L    ( ESI )
+
+    MOV_L     ( ARG_DEST, ECX )
+    MOV_L     ( ARG_MATRIX, ESI )
+    MOV_L     ( ARG_SOURCE, EAX )
+    MOV_L     ( CONST(4), REGOFF(V4F_SIZE, ECX) )
+    OR_B      ( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, ECX) )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )
+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )
+
+    PUSH_L    ( EDI )
+
+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )
+    MOV_L     ( ESI, ECX )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )
+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )
+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )
+
+    TEST_L    ( ESI, ESI )
+    JZ        ( LLBL( G3TPPR_3 ) )
+
+    MOVD      ( REGIND(ECX), MM0 )	/*                 | m00             */
+    PUNPCKLDQ ( REGOFF(20, ECX), MM0 )	/* m11             | m00             */
+
+    MOVD      ( REGOFF(56, ECX), MM3 )	/*                 | m32             */
+
+ALIGNTEXT16
+LLBL( G3TPPR_2 ):
+
+    MOVQ      ( REGIND(EAX), MM4 )	/* x1              | x0              */
+    PFMUL     ( MM0, MM4 )		/* x1*m11          | x0*m00          */
+
+    MOVQ      ( MM4, REGIND(EDX) )	/* write r1, r0                      */
+    MOVQ      ( MM3, REGOFF(8, EDX) )	/* write r2  (=m32), r3 (=0)         */
+
+    ADD_L     ( EDI, EAX )		/* next vertex                       */
+    ADD_L     ( CONST(16), EDX )	/* next r                            */
+
+    DEC_L     ( ESI )			/* decrement vertex counter          */
+    JNZ       ( LLBL( G3TPPR_2 ) )	/* cnt > 0 ? -> process next vertex  */
+
+LLBL( G3TPPR_3 ):
+
+    FEMMS
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_3dnow_transform_points2_3d )
+GLNAME( _mesa_3dnow_transform_points2_3d ):
+
+    PUSH_L    ( ESI )
+
+    MOV_L     ( ARG_DEST, ECX )
+    MOV_L     ( ARG_MATRIX, ESI )
+    MOV_L     ( ARG_SOURCE, EAX )
+    MOV_L     ( CONST(3), REGOFF(V4F_SIZE, ECX) )
+    OR_B      ( CONST(VEC_SIZE_3 ), REGOFF(V4F_FLAGS, ECX) )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )
+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )
+
+    PUSH_L    ( EDI )
+
+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )
+    MOV_L     ( ESI, ECX )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )
+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )
+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )
+
+    TEST_L    ( ESI, ESI )
+    JZ        ( LLBL( G3TP3R_3 ) )
+
+    MOVD      ( REGIND(ECX), MM0 )	/*                 | m00             */
+    PUNPCKLDQ ( REGOFF(16, ECX), MM0 )	/* m10             | m00             */
+
+    MOVD      ( REGOFF(4, ECX), MM1 )	/*                 | m01             */
+    PUNPCKLDQ ( REGOFF(20, ECX), MM1 )	/* m11             | m01             */
+
+    MOVD      ( REGOFF(8, ECX), MM2 )	/*                 | m02             */
+    PUNPCKLDQ ( REGOFF(24, ECX), MM2 )	/* m12             | m02             */
+
+    MOVQ      ( REGOFF(48, ECX), MM4 )	/* m31             | m30             */
+    MOVD      ( REGOFF(56, ECX), MM5 )	/*                 | m32             */
+
+ALIGNTEXT16
+LLBL( G3TP3R_2 ):
+
+    MOVQ      ( REGIND(EAX), MM6 )	/* x1              | x0              */
+    MOVQ      ( MM6, MM7 )		/* x1              | x0              */
+
+    PFMUL     ( MM0, MM6 )		/* x1*m10          | x0*m00          */
+    PFMUL     ( MM1, MM7 )		/* x1*m11          | x0*m01          */
+
+    PFACC     ( MM7, MM6 )		/* x0*m01+x1*m11   | x0*x00+x1*m10   */
+    PFADD     ( MM4, MM6 )		/* x0*...*m11+m31  | x0*...*m10+m30  */
+
+    MOVQ      ( MM6, REGIND(EDX) )	/* write r1, r0                      */
+    MOVQ      ( REGIND(EAX), MM6 )	/* x1              | x0              */
+
+    MOVQ      ( MM6, MM7 )		/* x1              | x0              */
+    PFMUL     ( MM2, MM6 )		/* x1*m12          | x0*m02          */
+
+    PFACC     ( MM7, MM6 )		/* ***trash***     | x0*x02+x1*m12   */
+    PFADD     ( MM5, MM6 )		/* ***trash***     | x0*...*m12+m32  */
+
+    MOVD      ( MM6, REGOFF(8, EDX) )	/* write r2                          */
+    ADD_L     ( EDI, EAX )		/* next vertex                       */
+
+    ADD_L     ( CONST(16), EDX )	/* next r                            */
+    DEC_L     ( ESI )			/* decrement vertex counter          */
+
+    JNZ       ( LLBL( G3TP3R_2 ) )	/* cnt > 0 ? -> process next vertex  */
+
+LLBL( G3TP3R_3 ):
+
+    FEMMS
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_3dnow_transform_points2_3d_no_rot )
+GLNAME( _mesa_3dnow_transform_points2_3d_no_rot ):
+
+    PUSH_L    ( ESI )
+
+    MOV_L     ( ARG_DEST, ECX )
+    MOV_L     ( ARG_MATRIX, ESI )
+    MOV_L     ( ARG_SOURCE, EAX )
+    MOV_L     ( CONST(3), REGOFF(V4F_SIZE, ECX) )
+    OR_B      ( CONST(VEC_SIZE_3 ), REGOFF(V4F_FLAGS, ECX) )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )
+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )
+
+    PUSH_L    ( EDI )
+
+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )
+    MOV_L     ( ESI, ECX )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )
+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )
+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )
+
+    TEST_L    ( ESI, ESI )
+    JZ        ( LLBL( G3TP3NRR_3 ) )
+
+    MOVD      ( REGIND(ECX), MM0 )	/*                 | m00             */
+    PUNPCKLDQ ( REGOFF(20, ECX), MM0 )	/* m11             | m00             */
+
+    MOVQ      ( REGOFF(48, ECX), MM2 )	/* m31             | m30             */
+    MOVD      ( REGOFF(56, ECX), MM3 )	/*                 | m32             */
+
+ALIGNTEXT16
+LLBL( G3TP3NRR_2 ):
+
+    MOVQ      ( REGIND(EAX), MM4 )	/* x1              | x0              */
+    PFMUL     ( MM0, MM4 )		/* x1*m11          | x0*m00          */
+
+    PFADD     ( MM2, MM4 )		/* x1*m11+m31      | x0*m00+m30      */
+    MOVQ      ( MM4, REGIND(EDX) )	/* write r1, r0                      */
+
+    MOVD      ( MM3, REGOFF(8, EDX) )	/* write r2                          */
+    ADD_L     ( EDI, EAX )		/* next vertex                       */
+
+    ADD_L     ( CONST(16), EDX )	/* next r                            */
+    DEC_L     ( ESI )			/* decrement vertex counter          */
+
+    JNZ       ( LLBL( G3TP3NRR_2 ) )	/* cnt > 0 ? -> process next vertex  */
+
+LLBL( G3TP3NRR_3 ):
+
+    FEMMS
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_3dnow_transform_points2_2d )
+GLNAME( _mesa_3dnow_transform_points2_2d ):
+
+    PUSH_L    ( ESI )
+
+    MOV_L     ( ARG_DEST, ECX )
+    MOV_L     ( ARG_MATRIX, ESI )
+    MOV_L     ( ARG_SOURCE, EAX )
+    MOV_L     ( CONST(2), REGOFF(V4F_SIZE, ECX) )
+    OR_B      ( CONST(VEC_SIZE_2), REGOFF(V4F_FLAGS, ECX) )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )
+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )
+
+    PUSH_L    ( EDI )
+
+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )
+    MOV_L     ( ESI, ECX )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )
+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )
+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )
+
+    TEST_L    ( ESI, ESI )
+    JZ        ( LLBL( G3TP2R_3 ) )
+
+    MOVQ      ( REGIND(ECX), MM0 )	/* m01             | m00             */
+    MOVQ      ( REGOFF(16, ECX), MM1 )	/* m11             | m10             */
+
+    MOVQ      ( REGOFF(48, ECX), MM2 )	/* m31             | m30             */
+
+ALIGNTEXT16
+LLBL( G3TP2R_2 ):
+
+    MOVD      ( REGIND(EAX), MM4 )	/*                 | x0              */
+    MOVD      ( REGOFF(4, EAX), MM5 )	/*                 | x1              */
+
+    PUNPCKLDQ ( MM4, MM4 )		/* x0              | x0              */
+    ADD_L     ( EDI, EAX )		/* next vertex                       */
+
+    PFMUL     ( MM0, MM4 )		/* x0*m01          | x0*m00          */
+    PUNPCKLDQ ( MM5, MM5 )		/* x1              | x1              */
+
+    PFMUL     ( MM1, MM5 )		/* x1*m11          | x1*m10          */
+    PFADD     ( MM2, MM4 )		/* x...x1*m11+31   | x0*..*m10+m30   */
+
+    PFADD     ( MM5, MM4 )		/* x0*m01+x1*m11   | x0*m00+x1*m10   */
+    MOVQ      ( MM4, REGIND(EDX) )	/* write r1, r0                      */
+
+    ADD_L     ( CONST(16), EDX )	/* next r                            */
+    DEC_L     ( ESI )			/* decrement vertex counter          */
+
+    JNZ       ( LLBL( G3TP2R_2 ) )	/* cnt > 0 ? -> process next vertex  */
+
+LLBL( G3TP2R_3 ):
+
+    FEMMS
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_3dnow_transform_points2_2d_no_rot )
+GLNAME( _mesa_3dnow_transform_points2_2d_no_rot ):
+
+    PUSH_L    ( ESI )
+
+    MOV_L     ( ARG_DEST, ECX )
+    MOV_L     ( ARG_MATRIX, ESI )
+    MOV_L     ( ARG_SOURCE, EAX )
+    MOV_L     ( CONST(2), REGOFF(V4F_SIZE, ECX) )
+    OR_B      ( CONST(VEC_SIZE_2), REGOFF(V4F_FLAGS, ECX) )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )
+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )
+
+    PUSH_L    ( EDI )
+
+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )
+    MOV_L     ( ESI, ECX )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )
+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )
+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )
+
+    TEST_L    ( ESI, ESI )
+    JZ        ( LLBL( G3TP2NRR_3 ) )
+
+    MOVD      ( REGIND(ECX), MM0 )	/*                 | m00             */
+    PUNPCKLDQ ( REGOFF(20, ECX), MM0 )	/* m11             | m00             */
+
+    MOVQ      ( REGOFF(48, ECX), MM2 )	/* m31             | m30             */
+
+ALIGNTEXT16
+LLBL( G3TP2NRR_2 ):
+
+    MOVQ      ( REGIND(EAX), MM4 )	/* x1              | x0              */
+    ADD_L     ( EDI, EAX )		/* next vertex                       */
+
+    PFMUL     ( MM0, MM4 )		/* x1*m11          | x0*m00          */
+    PFADD     ( MM2, MM4 )		/* m31             | x0*m00+m30      */
+
+    MOVQ      ( MM4, REGIND(EDX) )	/* write r1, r0                      */
+    ADD_L     ( CONST(16), EDX )	/* next r                            */
+
+    DEC_L     ( ESI )			/* decrement vertex counter          */
+    JNZ       ( LLBL( G3TP2NRR_2 ) )	/* cnt > 0 ? -> process next vertex  */
+
+LLBL( G3TP2NRR_3 ):
+
+    FEMMS
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_3dnow_transform_points2_identity )
+GLNAME( _mesa_3dnow_transform_points2_identity ):
+
+    PUSH_L    ( ESI )
+
+    MOV_L     ( ARG_DEST, ECX )
+    MOV_L     ( ARG_MATRIX, ESI )
+    MOV_L     ( ARG_SOURCE, EAX )
+    MOV_L     ( CONST(2), REGOFF(V4F_SIZE, ECX) )
+    OR_B      ( CONST(VEC_SIZE_2), REGOFF(V4F_FLAGS, ECX) )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )
+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )
+
+    PUSH_L    ( EDI )
+
+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )
+    MOV_L     ( ESI, ECX )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )
+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )
+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )
+
+    TEST_L    ( ESI, ESI )
+    JZ        ( LLBL( G3TPIR_3 ) )
+
+ALIGNTEXT16
+LLBL( G3TPIR_3 ):
+
+    MOVQ      ( REGIND(EAX), MM0 )	/* x1              | x0              */
+    ADD_L     ( EDI, EAX )		/* next vertex                       */
+
+    MOVQ      ( MM0, REGIND(EDX) )	/* r1              | r0              */
+    ADD_L     ( CONST(16), EDX )	/* next r                            */
+
+    DEC_L     ( ESI )			/* decrement vertex counter          */
+    JNZ       ( LLBL( G3TPIR_3 ) )	/* cnt > 0 ? -> process next vertex  */
+
+LLBL( G3TPIR_4 ):
+
+    FEMMS
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
diff --git a/reactos/lib/mesa32/src/x86/3dnow_xform3.S b/reactos/lib/mesa32/src/x86/3dnow_xform3.S
new file mode 100644
index 00000000000..49b78e0c340
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/3dnow_xform3.S
@@ -0,0 +1,548 @@
+/* $Id: 3dnow_xform3.S,v 1.1 2004/07/16 22:12:42 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "matypes.h"
+#include "xform_args.h"
+
+    SEG_TEXT
+
+#define FRAME_OFFSET	4
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_3dnow_transform_points3_general )
+GLNAME( _mesa_3dnow_transform_points3_general ):
+
+    PUSH_L    ( ESI )
+
+    MOV_L     ( ARG_DEST, ECX )
+    MOV_L     ( ARG_MATRIX, ESI )
+    MOV_L     ( ARG_SOURCE, EAX )
+    MOV_L     ( CONST(4), REGOFF(V4F_SIZE, ECX) )
+    OR_B      ( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, ECX) )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )
+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )
+
+    PUSH_L    ( EDI )
+
+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )
+    MOV_L     ( ESI, ECX )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )
+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )
+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )
+
+    TEST_L    ( ESI, ESI )
+    JZ        ( LLBL( G3TPGR_2 ) )
+
+    PREFETCHW ( REGIND(EDX) )
+
+ALIGNTEXT16
+LLBL( G3TPGR_1 ):
+
+    PREFETCHW ( REGOFF(32, EDX) )	/* prefetch 2 vertices ahead         */
+
+    MOVQ      ( REGIND(EAX), MM0 )	/* x1              | x0              */
+    MOVD      ( REGOFF(8, EAX), MM2 )	/*                 | x2              */
+
+    ADD_L     ( EDI, EAX )		/* next vertex                       */
+    PREFETCH  ( REGIND(EAX) )
+
+    MOVQ      ( MM0, MM1 )		/* x1              | x0              */
+    PUNPCKLDQ ( MM2, MM2 )		/* x2              | x2              */
+
+    PUNPCKLDQ ( MM0, MM0 )		/* x0              | x0              */
+    MOVQ      ( MM2, MM5 )		/* x2              | x2              */
+
+    PUNPCKHDQ ( MM1, MM1 )		/* x1              | x1              */
+    PFMUL     ( REGOFF(32, ECX), MM2 )	/* x2*m9           | x2*m8           */
+
+    MOVQ      ( MM0, MM3 )		/* x0              | x0              */
+    PFMUL     ( REGOFF(40, ECX), MM5 )	/* x2*m11          | x2*m10          */
+
+    MOVQ      ( MM1, MM4 )		/* x1              | x1              */
+    PFMUL     ( REGIND(ECX), MM0 )	/* x0*m1           | x0*m0           */
+
+    PFADD     ( REGOFF(48, ECX), MM2 )	/* x2*m9+m13       | x2*m8+m12       */
+    PFMUL     ( REGOFF(16, ECX), MM1 )	/* x1*m5           | x1*m4           */
+
+    PFADD     ( REGOFF(56, ECX), MM5 )	/* x2*m11+m15      | x2*m10+m14      */
+    PFADD     ( MM0, MM1 )		/* x0*m1+x1*m5     | x0*m0+x1*m4     */
+
+    PFMUL     ( REGOFF(8, ECX), MM3 )	/* x0*m3           | x0*m2           */
+    PFADD     ( MM1, MM2 )		/* r1              | r0              */
+
+    PFMUL     ( REGOFF(24, ECX), MM4 )	/* x1*m7           | x1*m6           */
+    ADD_L     ( CONST(16), EDX )	/* next output vertex                */
+
+    PFADD     ( MM3, MM4 )		/* x0*m3+x1*m7     | x0*m2+x1*m6     */
+    MOVQ      ( MM2, REGOFF(-16, EDX) )	/* write r0, r1                      */
+
+    PFADD     ( MM4, MM5 )		/* r3              | r2              */
+    MOVQ      ( MM5, REGOFF(-8, EDX) )	/* write r2, r3                      */
+
+    DEC_L     ( ESI )			/* decrement vertex counter          */
+    JNZ       ( LLBL( G3TPGR_1 ) )	/* cnt > 0 ? -> process next vertex  */
+
+LLBL( G3TPGR_2 ):
+
+    FEMMS
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_3dnow_transform_points3_perspective )
+GLNAME( _mesa_3dnow_transform_points3_perspective ):
+
+    PUSH_L    ( ESI )
+
+    MOV_L     ( ARG_DEST, ECX )
+    MOV_L     ( ARG_MATRIX, ESI )
+    MOV_L     ( ARG_SOURCE, EAX )
+    MOV_L     ( CONST(4), REGOFF(V4F_SIZE, ECX) )
+    OR_B      ( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, ECX) )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )
+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )
+
+    PUSH_L    ( EDI )
+
+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )
+    MOV_L     ( ESI, ECX )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )
+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )
+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )
+
+    TEST_L    ( ESI, ESI )
+    JZ        ( LLBL( G3TPPR_2 ) )
+
+    PREFETCH  ( REGIND(EAX) )
+    PREFETCHW ( REGIND(EDX) )
+
+    MOVD      ( REGIND(ECX), MM0 )	/*                 | m00             */
+    PUNPCKLDQ ( REGOFF(20, ECX), MM0 )	/* m11             | m00             */
+
+    MOVQ      ( REGOFF(32, ECX), MM1 )	/* m21             | m20             */
+    MOVD      ( REGOFF(40, ECX), MM2 )	/*                 | m22             */
+
+    MOVD      ( REGOFF(56, ECX), MM3 )	/*                 | m32             */
+
+ALIGNTEXT16
+LLBL( G3TPPR_1 ):
+
+    PREFETCHW ( REGOFF(32, EDX) )	/* prefetch 2 vertices ahead         */
+
+    MOVD      ( REGOFF(8, EAX), MM5 )	/*                 | x2              */
+    MOVQ      ( REGIND(EAX), MM4 )	/* x1              | x0              */
+
+    ADD_L     ( EDI, EAX )		/* next vertex                       */
+    PREFETCH  ( REGIND(EAX) )
+
+    PXOR      ( MM7, MM7 )		/* 0               | 0               */
+    MOVQ      ( MM5, MM6 )		/*                 | x2              */
+
+    PFMUL     ( MM0, MM4 )		/* x1*m11          | x0*m00          */
+    PFSUB     ( MM5, MM7 )		/*                 | -x2             */
+
+    PFMUL     ( MM2, MM6 )		/*                 | x2*m22          */
+    PUNPCKLDQ ( MM5, MM5 )		/* x2              | x2              */
+
+    ADD_L     ( CONST(16), EDX )	/* next r                            */
+    PFMUL     ( MM1, MM5 )		/* x2*m21          | x2*m20          */
+
+    PFADD     ( MM3, MM6 )		/*                 | x2*m22+m32      */
+    PFADD     ( MM4, MM5 )		/* x1*m11+x2*m21   | x0*m00+x2*m20   */
+
+    MOVQ      ( MM5, REGOFF(-16, EDX) )	/* write r0, r1                      */
+    MOVD      ( MM6, REGOFF(-8, EDX) )	/* write r2                          */
+
+    MOVD      ( MM7, REGOFF(-4, EDX) )	/* write r3                          */
+
+    DEC_L     ( ESI )			/* decrement vertex counter          */
+    JNZ       ( LLBL( G3TPPR_1 ) )	/* cnt > 0 ? -> process next vertex  */
+
+LLBL( G3TPPR_2 ):
+
+    FEMMS
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_3dnow_transform_points3_3d )
+GLNAME( _mesa_3dnow_transform_points3_3d ):
+
+    PUSH_L    ( ESI )
+
+    MOV_L     ( ARG_DEST, ECX )
+    MOV_L     ( ARG_MATRIX, ESI )
+    MOV_L     ( ARG_SOURCE, EAX )
+    MOV_L     ( CONST(3), REGOFF(V4F_SIZE, ECX) )
+    OR_B      ( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, ECX) )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )
+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )
+
+    PUSH_L    ( EDI )
+
+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )
+    MOV_L     ( ESI, ECX )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )
+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )
+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )
+
+    TEST_L    ( ESI, ESI )
+    JZ        ( LLBL( G3TP3R_2 ) )
+
+    PREFETCH  ( REGIND(EAX) )
+    PREFETCH  ( REGIND(EDX) )
+
+    MOVD      ( REGOFF(8, ECX), MM7 )	/*                 | m2              */
+    PUNPCKLDQ ( REGOFF(24, ECX), MM7 )	/* m6              | m2              */
+
+
+ALIGNTEXT16
+LLBL( G3TP3R_1 ):
+
+    PREFETCHW ( REGOFF(32, EDX) )	/* prefetch 2 vertices ahead         */
+
+    MOVQ      ( REGIND(EAX), MM0 )	/* x1              | x0              */
+    MOVD      ( REGOFF(8, EAX), MM1 )	/*                 | x2              */
+
+    ADD_L     ( EDI, EAX )		/* next vertex                       */
+    PREFETCH  ( REGIND(EAX) )
+
+    MOVQ      ( MM0, MM2 )		/* x1              | x0              */
+    ADD_L     ( CONST(16), EDX )	/* next r                            */
+
+    PUNPCKLDQ ( MM2, MM2 )		/* x0              | x0              */
+    MOVQ      ( MM0, MM3 )		/* x1              | x0              */
+
+    PFMUL     ( REGIND(ECX), MM2 )	/* x0*m1           | x0*m0           */
+    PUNPCKHDQ ( MM3, MM3 )		/* x1              | x1              */
+
+    MOVQ      ( MM1, MM4 )		/*                 | x2              */
+    PFMUL     ( REGOFF(16, ECX), MM3 )	/* x1*m5           | x1*m4           */
+
+    PUNPCKLDQ ( MM4, MM4 )		/* x2              | x2              */
+    PFADD     ( MM2, MM3 )		/* x0*m1+x1*m5     | x0*m0+x1*m4     */
+
+    PFMUL     ( REGOFF(32, ECX), MM4 )	/* x2*m9           | x2*m8           */
+    PFADD     ( REGOFF(48, ECX), MM3 )	/* x0*m1+...+m11   | x0*m0+x1*m4+m12 */
+
+    PFMUL     ( MM7, MM0 )		/* x1*m6           | x0*m2           */
+    PFADD     ( MM4, MM3 )		/* r1              | r0              */
+
+    PFMUL     ( REGOFF(40, ECX), MM1 )	/*                 | x2*m10          */
+    PUNPCKLDQ ( REGOFF(56, ECX), MM1 )	/* m14             | x2*m10          */
+
+    PFACC     ( MM0, MM1 )
+
+    MOVQ      ( MM3, REGOFF(-16, EDX) )	/* write r0, r1                      */
+    PFACC     ( MM1, MM1 )		/*                 | r2              */
+
+    MOVD      ( MM1, REGOFF(-8, EDX) )	/* write r2                          */
+
+    DEC_L     ( ESI )			/* decrement vertex counter          */
+    JNZ       ( LLBL( G3TP3R_1 ) )	/* cnt > 0 ? -> process next vertex  */
+
+LLBL( G3TP3R_2 ):
+
+    FEMMS
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_3dnow_transform_points3_3d_no_rot )
+GLNAME( _mesa_3dnow_transform_points3_3d_no_rot ):
+
+    PUSH_L    ( ESI )
+
+    MOV_L     ( ARG_DEST, ECX )
+    MOV_L     ( ARG_MATRIX, ESI )
+    MOV_L     ( ARG_SOURCE, EAX )
+    MOV_L     ( CONST(3), REGOFF(V4F_SIZE, ECX) )
+    OR_B      ( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, ECX) )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )
+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )
+
+    PUSH_L    ( EDI )
+
+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )
+    MOV_L     ( ESI, ECX )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )
+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )
+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )
+
+    TEST_L    ( ESI, ESI )
+    JZ        ( LLBL( G3TP3NRR_2 ) )
+
+    PREFETCH  ( REGIND(EAX) )
+    PREFETCHW ( REGIND(EDX) )
+
+    MOVD      ( REGIND(ECX), MM0 )	/*                 | m00             */
+    PUNPCKLDQ ( REGOFF(20, ECX), MM0 )	/* m11             | m00             */
+
+    MOVD      ( REGOFF(40, ECX), MM2 )	/*                 | m22             */
+    PUNPCKLDQ ( MM2, MM2 )		/* m22             | m22             */
+
+    MOVQ      ( REGOFF(48, ECX), MM1 )	/* m31             | m30             */
+    MOVD      ( REGOFF(56, ECX), MM3 )	/*                 | m32             */
+
+    PUNPCKLDQ ( MM3, MM3 )		/* m32             | m32             */
+
+
+ALIGNTEXT16
+LLBL( G3TP3NRR_1 ):
+
+    PREFETCHW ( REGOFF(32, EDX) )	/* prefetch 2 vertices ahead         */
+
+    MOVQ      ( REGIND(EAX), MM4 )	/* x1              | x0              */
+    MOVD      ( REGOFF(8, EAX), MM5 )	/*                 | x2              */
+
+    ADD_L     ( EDI, EAX )		/* next vertex                       */
+    PREFETCHW ( REGIND(EAX) )
+	
+    PFMUL     ( MM0, MM4 )		/* x1*m11          | x0*m00          */
+
+    PFADD     ( MM1, MM4 )		/* x1*m11+m31      | x0*m00+m30      */
+    PFMUL     ( MM2, MM5 )		/*                 | x2*m22          */
+
+    PFADD     ( MM3, MM5 )		/*                 | x2*m22+m32      */
+    MOVQ      ( MM4, REGIND(EDX) )	/* write r0, r1                      */
+
+    ADD_L     ( CONST(16), EDX )	/* next r                            */
+    DEC_L     ( ESI )			/* decrement vertex counter          */
+
+    MOVD      ( MM5, REGOFF(-8, EDX) )	/* write r2                          */
+    JNZ       ( LLBL( G3TP3NRR_1 ) )	/* cnt > 0 ? -> process next vertex  */
+
+LLBL( G3TP3NRR_2 ):
+
+    FEMMS
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_3dnow_transform_points3_2d )
+GLNAME( _mesa_3dnow_transform_points3_2d ):
+
+    PUSH_L    ( ESI )
+
+    MOV_L     ( ARG_DEST, ECX )
+    MOV_L     ( ARG_MATRIX, ESI )
+    MOV_L     ( ARG_SOURCE, EAX )
+    MOV_L     ( CONST(3), REGOFF(V4F_SIZE, ECX) )
+    OR_B      ( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, ECX) )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )
+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )
+
+    PUSH_L    ( EDI )
+
+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )
+    MOV_L     ( ESI, ECX )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )
+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )
+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )
+
+    TEST_L    ( ESI, ESI )
+    JZ        ( LLBL( G3TP2R_3) )
+
+    PREFETCH  ( REGIND(EAX) )
+    PREFETCHW ( REGIND(EDX) )
+
+    MOVD      ( REGIND(ECX), MM0 )	/*                 | m00             */
+    PUNPCKLDQ ( REGOFF(16, ECX), MM0 )	/* m10             | m00             */
+
+    MOVD      ( REGOFF(4, ECX), MM1 )	/*                 | m01             */
+    PUNPCKLDQ ( REGOFF(20, ECX), MM1 )	/* m11             | m01             */
+
+    MOVQ      ( REGOFF(48, ECX), MM2 )	/* m31             | m30             */
+
+ALIGNTEXT16
+LLBL( G3TP2R_2 ):
+
+    PREFETCHW ( REGOFF(32, EDX) )	/* prefetch 2 vertices ahead         */
+
+    MOVQ      ( REGIND(EAX), MM3 )	/* x1              | x0              */
+    MOVD      ( REGOFF(8, EAX), MM5 )	/*                 | x2              */
+
+    ADD_L     ( EDI, EAX )		/* next vertex                       */
+    PREFETCH  ( REGIND(EAX) )
+
+    MOVQ      ( MM3, MM4 )		/* x1              | x0              */
+    PFMUL     ( MM0, MM3 )		/* x1*m10          | x0*m00          */
+
+    ADD_L     ( CONST(16), EDX )	/* next r                            */
+    PFMUL     ( MM1, MM4 )		/* x1*m11          | x0*m01          */
+
+    PFACC     ( MM4, MM3 )		/* x0*m00+x1*m10   | x0*m01+x1*m11   */
+    MOVD      ( MM5, REGOFF(-8, EDX) )	/* write r2 (=x2)                    */
+
+    PFADD     ( MM2, MM3 )		/* x0*...*m10+m30  | x0*...*m11+m31  */
+    MOVQ      ( MM3, REGOFF(-16, EDX) )	/* write r0, r1                      */
+
+    DEC_L     ( ESI )			/* decrement vertex counter          */
+    JNZ       ( LLBL( G3TP2R_2 ) )	/* cnt > 0 ? -> process next vertex  */
+
+LLBL( G3TP2R_3 ):
+
+    FEMMS
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_3dnow_transform_points3_2d_no_rot )
+GLNAME( _mesa_3dnow_transform_points3_2d_no_rot ):
+
+    PUSH_L    ( ESI )
+
+    MOV_L     ( ARG_DEST, ECX )
+    MOV_L     ( ARG_MATRIX, ESI )
+    MOV_L     ( ARG_SOURCE, EAX )
+    MOV_L     ( CONST(3), REGOFF(V4F_SIZE, ECX) )
+    OR_B      ( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, ECX) )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )
+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )
+
+    PUSH_L    ( EDI )
+
+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )
+    MOV_L     ( ESI, ECX )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )
+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )
+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )
+
+    TEST_L    ( ESI, ESI )
+    JZ        ( LLBL( G3TP2NRR_2 ) )
+
+    PREFETCH  ( REGIND(EAX) )
+    PREFETCHW ( REGIND(EDX) )
+
+    MOVD      ( REGIND(ECX), MM0 )	/*                 | m00             */
+    PUNPCKLDQ ( REGOFF(20, ECX), MM0 )	/* m11             | m00             */
+
+    MOVQ      ( REGOFF(48, ECX), MM1 )	/* m31             | m30             */
+
+
+ALIGNTEXT16
+LLBL( G3TP2NRR_1 ):
+
+    PREFETCHW ( REGOFF(32, EDX) )	/* prefetch 2 vertices ahead         */
+
+    MOVQ      ( REGIND(EAX), MM4 )	/* x1              | x0              */
+    MOVD      ( REGOFF(8, EAX), MM5 )	/*                 | x2              */
+
+    ADD_L     ( EDI, EAX )		/* next vertex                       */
+    PREFETCH  ( REGIND(EAX) )
+
+    PFMUL     ( MM0, MM4 )		/* x1*m11          | x0*m00          */
+    ADD_L     ( CONST(16), EDX )	/* next r                            */
+
+    PFADD     ( MM1, MM4 )		/* x1*m11+m31      | x0*m00+m30      */
+
+    MOVQ      ( MM4, REGOFF(-16, EDX) )	/* write r0, r1                      */
+    MOVD      ( MM5, REGOFF(-8, EDX) )	/* write r2 (=x2)                    */
+
+    DEC_L     ( ESI )			/* decrement vertex counter          */
+    JNZ       ( LLBL( G3TP2NRR_1 ) )	/* cnt > 0 ? -> process next vertex  */
+
+LLBL( G3TP2NRR_2 ):
+
+    FEMMS
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_3dnow_transform_points3_identity )
+GLNAME( _mesa_3dnow_transform_points3_identity ):
+
+    PUSH_L    ( ESI )
+
+    MOV_L     ( ARG_DEST, ECX )
+    MOV_L     ( ARG_MATRIX, ESI )
+    MOV_L     ( ARG_SOURCE, EAX )
+    MOV_L     ( CONST(3), REGOFF(V4F_SIZE, ECX) )
+    OR_B      ( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, ECX) )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )
+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )
+
+    PUSH_L    ( EDI )
+
+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )
+    MOV_L     ( ESI, ECX )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )
+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )
+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )
+
+    TEST_L    ( ESI, ESI )
+    JZ        ( LLBL( G3TPIR_2 ) )
+
+    PREFETCHW ( REGIND(EDX) )
+
+ALIGNTEXT16
+LLBL( G3TPIR_1 ):
+
+    PREFETCHW ( REGOFF(32, EDX) )
+
+    MOVQ      ( REGIND(EAX), MM0 )	/* x1              | x0              */
+    MOVD      ( REGOFF(8, EAX), MM1 )	/*                 | x2              */
+
+    ADD_L     ( EDI, EAX )		/* next vertex                       */
+    ADD_L     ( CONST(16), EDX )	/* next r                            */
+
+    DEC_L     ( ESI )			/* decrement vertex counter          */
+    MOVQ      ( MM0, REGOFF(-16, EDX) )	/* r1              | r0              */
+
+    MOVD      ( MM1, REGOFF(-8, EDX) )	/*                 | r2              */
+    JNZ       ( LLBL( G3TPIR_1 ) )	/* cnt > 0 ? -> process next vertex  */
+
+LLBL( G3TPIR_2 ):
+
+    FEMMS
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
diff --git a/reactos/lib/mesa32/src/x86/3dnow_xform4.S b/reactos/lib/mesa32/src/x86/3dnow_xform4.S
new file mode 100644
index 00000000000..3553c2049de
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/3dnow_xform4.S
@@ -0,0 +1,557 @@
+/* $Id: 3dnow_xform4.S,v 1.1 2004/07/16 22:12:42 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "matypes.h"
+#include "xform_args.h"
+
+    SEG_TEXT
+
+#define FRAME_OFFSET	4
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_3dnow_transform_points4_general )
+GLNAME( _mesa_3dnow_transform_points4_general ):
+
+    PUSH_L    ( ESI )
+
+    MOV_L     ( ARG_DEST, ECX )
+    MOV_L     ( ARG_MATRIX, ESI )
+    MOV_L     ( ARG_SOURCE, EAX )
+    MOV_L     ( CONST(4), REGOFF(V4F_SIZE, ECX) )
+    OR_B      ( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, ECX) )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )
+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )
+
+    PUSH_L    ( EDI )
+
+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )
+    MOV_L     ( ESI, ECX )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )
+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )
+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )
+
+    TEST_L    ( ESI, ESI )
+    JZ        ( LLBL( G3TPGR_2 ) )
+
+    PREFETCHW ( REGIND(EDX) )
+
+ALIGNTEXT16
+LLBL( G3TPGR_1 ):
+
+    PREFETCHW ( REGOFF(32, EDX) )	/* prefetch 2 vertices ahead         */
+
+    MOVQ      ( REGIND(EAX), MM0 )	/* x1            | x0                */
+    MOVQ      ( REGOFF(8, EAX), MM4 )	/* x3            | x2                */
+	
+    ADD_L     ( EDI, EAX )		/* next vertex                       */
+    PREFETCH  ( REGIND(EAX) )
+	
+    MOVQ      ( MM0, MM2 )		/* x1              | x0              */
+    MOVQ      ( MM4, MM6 )		/* x3              | x2              */
+
+    PUNPCKLDQ ( MM0, MM0 )		/* x0              | x0              */
+    PUNPCKHDQ ( MM2, MM2 )		/* x1              | x1              */
+
+    MOVQ      ( MM0, MM1 )		/* x0              | x0              */
+    ADD_L     ( CONST(16), EDX )	/* next r                            */
+
+    PFMUL     ( REGIND(ECX), MM0 )	/* x0*m1           | x0*m0           */
+    MOVQ      ( MM2, MM3 )		/* x1              | x1              */
+
+    PFMUL     ( REGOFF(8, ECX), MM1 )	/* x0*m3           | x0*m2           */
+    PUNPCKLDQ ( MM4, MM4 )		/* x2              | x2              */
+
+    PFMUL     ( REGOFF(16, ECX), MM2 )	/* x1*m5           | x1*m4           */
+    MOVQ      ( MM4, MM5 )		/* x2              | x2              */
+
+    PFMUL     ( REGOFF(24, ECX), MM3 )	/* x1*m7           | x1*m6           */
+    PUNPCKHDQ ( MM6, MM6 )		/* x3              | x3              */
+
+    PFMUL     ( REGOFF(32, ECX), MM4 )	/* x2*m9           | x2*m8           */
+    MOVQ      ( MM6, MM7 )		/* x3              | x3              */
+
+    PFMUL     ( REGOFF(40, ECX), MM5 )	/* x2*m11          | x2*m10          */
+    PFADD     ( MM0, MM2 )
+
+    PFMUL     ( REGOFF(48, ECX), MM6 )	/* x3*m13          | x3*m12          */
+    PFADD     ( MM1, MM3 )
+
+    PFMUL     ( REGOFF(56, ECX), MM7 )	/* x3*m15          | x3*m14          */
+    PFADD     ( MM4, MM6 )
+
+    PFADD     ( MM5, MM7 )
+    PFADD     ( MM2, MM6 )
+
+    PFADD     ( MM3, MM7 )
+    MOVQ      ( MM6, REGOFF(-16, EDX) )
+
+    MOVQ      ( MM7, REGOFF(-8, EDX) )
+
+    DEC_L     ( ESI )			/* decrement vertex counter          */
+    JNZ       ( LLBL( G3TPGR_1 ) )	/* cnt > 0 ? -> process next vertex  */
+
+LLBL( G3TPGR_2 ):
+
+    FEMMS
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_3dnow_transform_points4_perspective )
+GLNAME( _mesa_3dnow_transform_points4_perspective ):
+
+    PUSH_L    ( ESI )
+
+    MOV_L     ( ARG_DEST, ECX )
+    MOV_L     ( ARG_MATRIX, ESI )
+    MOV_L     ( ARG_SOURCE, EAX )
+    MOV_L     ( CONST(4), REGOFF(V4F_SIZE, ECX) )
+    OR_B      ( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, ECX) )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )
+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )
+
+    PUSH_L    ( EDI )
+
+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )
+    MOV_L     ( ESI, ECX )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )
+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )
+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )
+
+    TEST_L    ( ESI, ESI )
+    JZ        ( LLBL( G3TPPR_2 ) )
+
+    PREFETCH  ( REGIND(EAX) )
+    PREFETCHW ( REGIND(EDX) )
+
+    MOVD      ( REGIND(ECX), MM0 )	/*                 | m00             */
+    PUNPCKLDQ ( REGOFF(20, ECX), MM0 )	/* m11             | m00             */
+
+    MOVD      ( REGOFF(40, ECX), MM1 )	/*                 | m22             */
+    PUNPCKLDQ ( REGOFF(56, ECX), MM1 )	/* m32             | m22             */
+
+    MOVQ      ( REGOFF(32, ECX), MM2 )	/* m21             | m20             */
+    PXOR      ( MM7, MM7 )		/* 0               | 0               */
+
+ALIGNTEXT16
+LLBL( G3TPPR_1 ):
+
+    PREFETCHW ( REGOFF(32, EDX) )	/* prefetch 2 vertices ahead         */
+
+    MOVQ      ( REGIND(EAX), MM4 )	/* x1              | x0              */
+    MOVQ      ( REGOFF(8, EAX), MM5 )	/* x3              | x2              */
+    MOVD      ( REGOFF(8, EAX), MM3 )	/*                 | x2              */
+
+    ADD_L     ( EDI, EAX )		/* next vertex                       */
+    PREFETCH  ( REGOFF(32, EAX) )	/* hopefully stride is zero          */
+
+    MOVQ      ( MM5, MM6 )		/* x3              | x2              */
+    PFMUL     ( MM0, MM4 )		/* x1*m11          | x0*m00          */
+
+    PUNPCKLDQ ( MM5, MM5 )		/* x2              | x2              */
+    ADD_L     ( CONST(16), EDX )	/* next r                            */
+
+    PFMUL     ( MM2, MM5 )		/* x2*m21          | x2*m20          */
+    PFSUBR    ( MM7, MM3 )		/*                 | -x2             */
+
+    PFMUL     ( MM1, MM6 )		/* x3*m32          | x2*m22          */
+    PFADD     ( MM4, MM5 )		/* x1*m11+x2*m21   | x0*m00+x2*m20   */
+
+    PFACC     ( MM3, MM6 )		/* -x2             | x2*m22+x3*m32   */
+    MOVQ      ( MM5, REGOFF(-16, EDX) )	/* write r0, r1                      */
+
+    MOVQ      ( MM6, REGOFF(-8, EDX) )	/* write r2, r3                      */
+    DEC_L     ( ESI )			/* decrement vertex counter          */
+
+    JNZ       ( LLBL( G3TPPR_1 ) )	/* cnt > 0 ? -> process next vertex  */
+
+LLBL( G3TPPR_2 ):
+
+    FEMMS
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_3dnow_transform_points4_3d )
+GLNAME( _mesa_3dnow_transform_points4_3d ):
+
+    PUSH_L    ( ESI )
+
+    MOV_L     ( ARG_DEST, ECX )
+    MOV_L     ( ARG_MATRIX, ESI )
+    MOV_L     ( ARG_SOURCE, EAX )
+    MOV_L     ( CONST(4), REGOFF(V4F_SIZE, ECX) )
+    OR_B      ( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, ECX) )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )
+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )
+
+    PUSH_L    ( EDI )
+
+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )
+    MOV_L     ( ESI, ECX )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )
+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )
+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )
+
+    TEST_L    ( ESI, ESI )
+    JZ        ( LLBL( G3TP3R_2 ) )
+
+    MOVD      ( REGOFF(8, ECX), MM6 )	/*                 | m2              */
+    PUNPCKLDQ ( REGOFF(24, ECX), MM6 )	/* m6              | m2              */
+
+    MOVD      ( REGOFF(40, ECX), MM7 )	/*                 | m10             */
+    PUNPCKLDQ ( REGOFF(56, ECX), MM7 )	/* m14             | m10             */
+
+ALIGNTEXT16
+LLBL( G3TP3R_1 ):
+
+    PREFETCHW ( REGOFF(32, EDX) )	/* prefetch 2 vertices ahead         */
+    PREFETCH  ( REGOFF(32, EAX) )	/* hopefully array is tightly packed */
+
+    MOVQ      ( REGIND(EAX), MM2 )	/* x1              | x0              */
+    MOVQ      ( REGOFF(8, EAX), MM3 )	/* x3              | x2              */
+
+    MOVQ      ( MM2, MM0 )		/* x1              | x0              */
+    MOVQ      ( MM3, MM4 )		/* x3              | x2              */
+
+    MOVQ      ( MM0, MM1 )		/* x1              | x0              */
+    MOVQ      ( MM4, MM5 )		/* x3              | x2              */
+
+    PUNPCKLDQ ( MM0, MM0 )		/* x0              | x0              */
+    PUNPCKHDQ ( MM1, MM1 )		/* x1              | x1              */
+
+    PFMUL     ( REGIND(ECX), MM0 )	/* x0*m1           | x0*m0           */
+    PUNPCKLDQ ( MM3, MM3 )		/* x2              | x2              */
+
+    PFMUL     ( REGOFF(16, ECX), MM1 )	/* x1*m5           | x1*m4           */
+    PUNPCKHDQ ( MM4, MM4 )		/* x3              | x3              */
+
+    PFMUL     ( MM6, MM2 )		/* x1*m6           | x0*m2           */
+    PFADD     ( MM0, MM1 )		/* x0*m1+x1*m5     | x0*m0+x1*m4     */
+
+    PFMUL     ( REGOFF(32, ECX), MM3 )	/* x2*m9           | x2*m8           */
+    ADD_L     ( CONST(16), EDX )	/* next r                            */
+
+    PFMUL     ( REGOFF(48, ECX), MM4 )	/* x3*m13          | x3*m12          */
+    PFADD     ( MM1, MM3 )		/* x0*m1+..+x2*m9  | x0*m0+...+x2*m8 */
+
+    PFMUL     ( MM7, MM5 )		/* x3*m14          | x2*m10          */
+    PFADD     ( MM3, MM4 )		/* r1              | r0              */
+
+    PFACC     ( MM2, MM5 )		/* x0*m2+x1*m6     | x2*m10+x3*m14   */
+    MOVD      ( REGOFF(12, EAX), MM0 )	/*                 | x3              */
+
+    ADD_L     ( EDI, EAX )		/* next vertex                       */
+    PFACC     ( MM0, MM5 )		/* r3              | r2              */
+
+    MOVQ      ( MM4, REGOFF(-16, EDX) )	/* write r0, r1                      */
+    MOVQ      ( MM5, REGOFF(-8, EDX) )	/* write r2, r3                      */
+
+    DEC_L     ( ESI )			/* decrement vertex counter          */
+    JNZ       ( LLBL( G3TP3R_1 ) )	/* cnt > 0 ? -> process next vertex  */
+
+LLBL( G3TP3R_2 ):
+
+    FEMMS
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_3dnow_transform_points4_3d_no_rot )
+GLNAME( _mesa_3dnow_transform_points4_3d_no_rot ):
+
+    PUSH_L    ( ESI )
+    MOV_L     ( ARG_DEST, ECX )
+    MOV_L     ( ARG_MATRIX, ESI )
+    MOV_L     ( ARG_SOURCE, EAX )
+    MOV_L     ( CONST(4), REGOFF(V4F_SIZE, ECX) )
+    OR_B      ( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, ECX) )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )
+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )
+
+    PUSH_L    ( EDI )
+
+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )
+    MOV_L     ( ESI, ECX )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )
+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )
+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )
+
+    TEST_L    ( ESI, ESI )
+    JZ        ( LLBL( G3TP3NRR_2 ) )
+
+    MOVD      ( REGIND(ECX), MM0 )	/*                 | m00             */
+    PUNPCKLDQ ( REGOFF(20, ECX), MM0 )	/* m11             | m00             */
+
+    MOVD      ( REGOFF(40, ECX), MM2 )	/*                 | m22             */
+    PUNPCKLDQ ( REGOFF(56, ECX), MM2 )	/* m32             | m22             */
+
+    MOVQ      ( REGOFF(48, ECX), MM1 )	/* m31             | m30             */
+
+ALIGNTEXT16
+LLBL( G3TP3NRR_1 ):
+
+    PREFETCHW ( REGOFF(32, EDX) )	/* prefetch 2 vertices ahead         */
+
+    MOVQ      ( REGIND(EAX), MM4 )	/* x1              | x0              */
+    MOVQ      ( REGOFF(8, EAX), MM5 )	/* x3              | x2              */
+    MOVD      ( REGOFF(12, EAX), MM7 )	/*                 | x3              */
+
+    ADD_L     ( EDI, EAX )		/* next vertex                       */
+    PREFETCH  ( REGOFF(32, EAX) )	/* hopefully stride is zero          */
+
+    MOVQ      ( MM5, MM6 )		/* x3              | x2              */
+    PFMUL     ( MM0, MM4 )		/* x1*m11          | x0*m00          */
+
+    PUNPCKHDQ ( MM6, MM6 )		/* x3              | x3              */
+    PFMUL     ( MM2, MM5 )		/* x3*m32          | x2*m22          */
+
+    PFMUL     ( MM1, MM6 )		/* x3*m31          | x3*m30          */
+    PFACC     ( MM7, MM5 )		/* x3              | x2*m22+x3*m32   */
+
+    PFADD     ( MM6, MM4 )		/* x1*m11+x3*m31   | x0*m00+x3*m30   */
+    ADD_L     ( CONST(16), EDX )	/* next r                            */
+
+    MOVQ      ( MM4, REGOFF(-16, EDX) )	/* write r0, r1                      */
+    MOVQ      ( MM5, REGOFF(-8, EDX) )	/* write r2, r3                      */
+
+    DEC_L     ( ESI )			/* decrement vertex counter          */
+    JNZ       ( LLBL( G3TP3NRR_1 ) )	/* cnt > 0 ? -> process next vertex  */
+
+LLBL( G3TP3NRR_2 ):
+
+    FEMMS
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_3dnow_transform_points4_2d )
+GLNAME( _mesa_3dnow_transform_points4_2d ):
+
+    PUSH_L    ( ESI )
+
+    MOV_L     ( ARG_DEST, ECX )
+    MOV_L     ( ARG_MATRIX, ESI )
+    MOV_L     ( ARG_SOURCE, EAX )
+    MOV_L     ( CONST(4), REGOFF(V4F_SIZE, ECX) )
+    OR_B      ( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, ECX) )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )
+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )
+
+    PUSH_L    ( EDI )
+
+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )
+    MOV_L     ( ESI, ECX )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )
+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )
+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )
+
+    TEST_L    ( ESI, ESI )
+    JZ        ( LLBL( G3TP2R_2 ) )
+
+    MOVD      ( REGIND(ECX), MM0 )	/*                 | m00             */
+    PUNPCKLDQ ( REGOFF(16, ECX), MM0 )	/* m10             | m00             */
+
+    MOVD      ( REGOFF(4, ECX), MM1 )	/*                 | m01             */
+    PUNPCKLDQ ( REGOFF(20, ECX), MM1 )	/* m11             | m01             */
+
+    MOVQ      ( REGOFF(48, ECX), MM2 )	/* m31             | m30             */
+
+ALIGNTEXT16
+LLBL( G3TP2R_1 ):
+
+    PREFETCHW ( REGOFF(32, EDX) )       /* prefetch 2 vertices ahead         */
+
+    MOVQ      ( REGIND(EAX), MM3 )	/* x1              | x0              */
+    MOVQ      ( REGOFF(8, EAX), MM5 )	/* x3              | x2              */
+
+    ADD_L     ( EDI, EAX )		/* next vertex                       */
+    PREFETCH  ( REGIND(EAX) )
+
+    MOVQ      ( MM3, MM4 )		/* x1              | x0              */
+    MOVQ      ( MM5, MM6 )		/* x3              | x2              */
+
+    PFMUL     ( MM1, MM4 )		/* x1*m11          | x0*m01          */
+    PUNPCKHDQ ( MM6, MM6 )		/* x3              | x3              */
+
+    PFMUL     ( MM0, MM3 )		/* x1*m10          | x0*m00          */
+    ADD_L     ( CONST(16), EDX )	/* next r                            */
+
+    PFACC     ( MM4, MM3 )		/* x0*m01+x1*m11   | x0*m00+x1*m10   */
+    PFMUL     ( MM2, MM6 )		/* x3*m31          | x3*m30          */
+
+    PFADD     ( MM6, MM3 )		/* r1              | r0              */
+    MOVQ      ( MM5, REGOFF(-8, EDX) )	/* write r2, r3                      */
+
+    MOVQ      ( MM3, REGOFF(-16, EDX) )	/* write r0, r1                      */
+
+    DEC_L     ( ESI )			/* decrement vertex counter          */
+    JNZ       ( LLBL( G3TP2R_1 ) )	/* cnt > 0 ? -> process next vertex  */
+
+LLBL( G3TP2R_2 ):
+
+    FEMMS
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_3dnow_transform_points4_2d_no_rot )
+GLNAME( _mesa_3dnow_transform_points4_2d_no_rot ):
+
+    PUSH_L    ( ESI )
+
+    MOV_L     ( ARG_DEST, ECX )
+    MOV_L     ( ARG_MATRIX, ESI )
+    MOV_L     ( ARG_SOURCE, EAX )
+    MOV_L     ( CONST(4), REGOFF(V4F_SIZE, ECX) )
+    OR_B      ( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, ECX) )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )
+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )
+
+    PUSH_L    ( EDI )
+
+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )
+    MOV_L     ( ESI, ECX )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )
+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )
+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )
+
+    TEST_L    ( ESI, ESI )
+    JZ        ( LLBL( G3TP2NRR_3 ) )
+
+    MOVD      ( REGIND(ECX), MM0 )	/*                 | m00             */
+    PUNPCKLDQ ( REGOFF(20, ECX), MM0 )	/* m11             | m00             */
+
+    MOVQ      ( REGOFF(48, ECX), MM1 )	/* m31             | m30             */
+
+ALIGNTEXT16
+LLBL( G3TP2NRR_2 ):
+
+    PREFETCHW ( REGOFF(32, EDX) )	/* prefetch 2 vertices ahead         */
+
+    MOVQ      ( REGIND(EAX), MM4 )	/* x1              | x0              */
+    MOVQ      ( REGOFF(8, EAX), MM5 )	/* x3              | x2              */
+
+    ADD_L     ( EDI, EAX )		/* next vertex                       */
+    PREFETCH  ( REGIND(EAX) )
+
+    PFMUL     ( MM0, MM4 )		/* x1*m11          | x0*m00          */
+    MOVQ      ( MM5, MM6 )		/* x3              | x2              */
+
+    ADD_L     ( CONST(16), EDX )	/* next r                            */
+    PUNPCKHDQ ( MM6, MM6 )		/* x3              | x3              */
+
+    PFMUL     ( MM1, MM6 )		/* x3*m31          | x3*m30          */
+    PFADD     ( MM4, MM6 )		/* x1*m11+x3*m31   | x0*m00+x3*m30   */
+
+    MOVQ      ( MM6, REGOFF(-16, EDX) )	/* write r0, r1                      */
+    MOVQ      ( MM5, REGOFF(-8, EDX) )	/* write r2, r3                      */
+
+    DEC_L     ( ESI )			/* decrement vertex counter          */
+
+    JNZ       ( LLBL( G3TP2NRR_2 ) )	/* cnt > 0 ? -> process next vertex  */
+
+LLBL( G3TP2NRR_3 ):
+
+    FEMMS
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_3dnow_transform_points4_identity )
+GLNAME( _mesa_3dnow_transform_points4_identity ):
+
+    PUSH_L    ( ESI )
+
+    MOV_L     ( ARG_DEST, ECX )
+    MOV_L     ( ARG_MATRIX, ESI )
+    MOV_L     ( ARG_SOURCE, EAX )
+    MOV_L     ( CONST(4), REGOFF(V4F_SIZE, ECX) )
+    OR_B      ( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, ECX) )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )
+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )
+
+    PUSH_L    ( EDI )
+
+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )
+    MOV_L     ( ESI, ECX )
+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )
+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )
+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )
+
+    TEST_L    ( ESI, ESI )
+    JZ        ( LLBL( G3TPIR_2 ) )
+
+ALIGNTEXT16
+LLBL( G3TPIR_1 ):
+
+    PREFETCHW ( REGOFF(32, EDX) )       /* prefetch 2 vertices ahead         */
+	
+    MOVQ      ( REGIND(EAX), MM0 )	/* x1              | x0              */
+    MOVQ      ( REGOFF(8, EAX), MM1 )	/* x3              | x2              */
+
+    ADD_L     ( EDI, EAX )		/* next vertex                       */
+    PREFETCH  ( REGIND(EAX) )
+
+    ADD_L     ( CONST(16), EDX )	/* next r                            */
+    MOVQ      ( MM0, REGOFF(-16, EDX) )	/* r1              | r0              */
+
+    MOVQ      ( MM1, REGOFF(-8, EDX) )	/* r3              | r2              */
+
+    DEC_L     ( ESI )			/* decrement vertex counter          */
+    JNZ       ( LLBL( G3TPIR_1 ) )	/* cnt > 0 ? -> process next vertex  */
+
+LLBL( G3TPIR_2 ):
+
+    FEMMS
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
diff --git a/reactos/lib/mesa32/src/x86/assyntax.h b/reactos/lib/mesa32/src/x86/assyntax.h
new file mode 100644
index 00000000000..f37bde3a7d1
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/assyntax.h
@@ -0,0 +1,1715 @@
+
+#ifndef __ASSYNTAX_H__
+#define __ASSYNTAX_H__
+
+/*
+ * Copyright 1992 Vrije Universiteit, The Netherlands
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose and without fee is hereby granted, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of the Vrije Universiteit not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  The Vrije Universiteit makes no
+ * representations about the suitability of this software for any purpose.
+ * It is provided "as is" without express or implied warranty.
+ *
+ * The Vrije Universiteit DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
+ * IN NO EVENT SHALL The Vrije Universiteit BE LIABLE FOR ANY SPECIAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*
+ * assyntax.h
+ *
+ * Select the syntax appropriate to the 386 assembler being used
+ * To add support for more assemblers add more columns to the CHOICE
+ * macro.  Note that register names must also have uppercase names
+ * to avoid macro recursion. e.g., #define ah %ah recurses!
+ *
+ * NB 1.  Some of the macros for certain assemblers imply that the code is to
+ *	  run in protected mode!!  Caveat emptor.
+ *
+ * NB 2.  486 specific instructions are not included.  This is to discourage
+ *	  their accidental use in code that is intended to run on 386 and 486
+ *	  systems.
+ *
+ * Supported assemblers:
+ *
+ * (a) AT&T SysVr4 as(1):	define ATT_ASSEMBLER
+ * (b) GNU Assembler gas:	define GNU_ASSEMBLER (default)
+ * (c) Amsterdam Compiler kit:	define ACK_ASSEMBLER
+ * (d) The Netwide Assembler:	define NASM_ASSEMBLER
+ * (e) Microsoft Assembler:	define MASM_ASSEMBLER (UNTESTED!)
+ *
+ * The following naming conventions have been used to identify the various
+ * data types:
+ *		_SR = segment register version
+ *	Integer:
+ *		_Q = quadword	= 64 bits
+ *		_L = long	= 32 bits
+ *		_W = short	= 16 bits
+ *		_B = byte	=  8 bits
+ *	Floating-point:
+ *		_X = m80real	= 80 bits
+ *		_D = double	= 64 bits
+ *		_S = single	= 32 bits
+ *
+ * Author: Gregory J. Sharp, Sept 1992
+ *         Vrije Universiteit, Amsterdam, The Netherlands
+ *
+ *         [support for Intel syntax added by Josh Vanderhoof, 1999]
+ */
+
+#if !(defined(NASM_ASSEMBLER) || defined(MASM_ASSEMBLER))
+
+/* Default to ATT_ASSEMBLER when SVR4 or SYSV are defined */
+#if (defined(SVR4) || defined(SYSV)) && !defined(GNU_ASSEMBLER)
+#define ATT_ASSEMBLER
+#endif
+
+#if !defined(ATT_ASSEMBLER) && !defined(GNU_ASSEMBLER) && !defined(ACK_ASSEMBLER)
+#define GNU_ASSEMBLER
+#endif
+
+#if (defined(__STDC__) && !defined(UNIXCPP)) || (defined (sun) && defined (i386) && defined (SVR4) && defined (__STDC__) && !defined (__GNUC__))
+#define CONCAT(x, y)		x ## y
+#define CONCAT3(x, y, z)	x ## y ## z
+#else
+#define CONCAT(x, y)		x/**/y
+#define CONCAT3(x, y, z)	x/**/y/**/z
+#endif
+
+#ifdef ACK_ASSEMBLER
+
+/* Assume we write code for 32-bit protected mode! */
+
+/* Redefine register names for GAS & AT&T assemblers */
+#define AL		al
+#define AH		ah
+#define AX		ax
+#define EAX		ax
+#define BL		bl
+#define BH		bh
+#define BX		bx
+#define EBX		bx
+#define CL		cl
+#define CH		ch
+#define CX		cx
+#define ECX		cx
+#define DL		dl
+#define DH		dh
+#define DX		dx
+#define EDX		dx
+#define BP		bp
+#define EBP		bp
+#define SI		si
+#define ESI		si
+#define DI		di
+#define EDI		di
+#define SP		sp
+#define ESP		sp
+#define CS		cs
+#define SS		ss
+#define DS		ds
+#define ES		es
+#define FS		fs
+#define GS		gs
+/* Control Registers */
+#define CR0		cr0
+#define CR1		cr1
+#define CR2		cr2
+#define CR3		cr3
+/* Debug Registers */
+#define DR0		dr0
+#define DR1		dr1
+#define DR2		dr2
+#define DR3		dr3
+#define DR4		dr4
+#define DR5		dr5
+#define DR6		dr6
+#define DR7		dr7
+/* Floating-point Stack */
+#define ST		st
+
+#define AS_BEGIN	.sect .text; .sect .rom; .sect .data; .sect .bss; .sect .text
+
+
+#define _WTOG		o16	/* word toggle for _W instructions */
+#define _LTOG			/* long toggle for _L instructions */
+#define ADDR_TOGGLE	a16
+#define OPSZ_TOGGLE	o16
+#define USE16		.use16
+#define USE32		.use32
+
+#define CHOICE(a,b,c)	c
+
+#else /* AT&T or GAS */
+
+/* Redefine register names for GAS & AT&T assemblers */
+#define AL		%al
+#define AH		%ah
+#define AX		%ax
+#define EAX		%eax
+#define BL		%bl
+#define BH		%bh
+#define BX		%bx
+#define EBX		%ebx
+#define CL		%cl
+#define CH		%ch
+#define CX		%cx
+#define ECX		%ecx
+#define DL		%dl
+#define DH		%dh
+#define DX		%dx
+#define EDX		%edx
+#define BP		%bp
+#define EBP		%ebp
+#define SI		%si
+#define ESI		%esi
+#define DI		%di
+#define EDI		%edi
+#define SP		%sp
+#define ESP		%esp
+#define CS		%cs
+#define SS		%ss
+#define DS		%ds
+#define ES		%es
+#define FS		%fs
+#define GS		%gs
+/* Control Registers */
+#define CR0		%cr0
+#define CR1		%cr1
+#define CR2		%cr2
+#define CR3		%cr3
+/* Debug Registers */
+#define DR0		%db0
+#define DR1		%db1
+#define DR2		%db2
+#define DR3		%db3
+#define DR4		%db4
+#define DR5		%db5
+#define DR6		%db6
+#define DR7		%db7
+/* Floating-point Stack */
+#define _STX0		%st(0)
+#define _STX1		%st(1)
+#define _STX2		%st(2)
+#define _STX3		%st(3)
+#define _STX4		%st(4)
+#define _STX5		%st(5)
+#define _STX6		%st(6)
+#define _STX7		%st(7)
+#define ST(x)		CONCAT(_STX,x)
+#ifdef GNU_ASSEMBLER
+#define ST0		%st(0)
+#else
+#define ST0		%st
+#endif
+/* MMX Registers */
+#define MM0		%mm0
+#define MM1		%mm1
+#define MM2		%mm2
+#define MM3		%mm3
+#define MM4		%mm4
+#define MM5		%mm5
+#define MM6		%mm6
+#define MM7		%mm7
+/* SSE Registers */
+#define XMM0		%xmm0
+#define XMM1		%xmm1
+#define XMM2		%xmm2
+#define XMM3		%xmm3
+#define XMM4		%xmm4
+#define XMM5		%xmm5
+#define XMM6		%xmm6
+#define XMM7		%xmm7
+
+#define AS_BEGIN
+#define USE16
+#define USE32
+
+#ifdef GNU_ASSEMBLER
+
+#define ADDR_TOGGLE	aword
+#define OPSZ_TOGGLE	word
+
+#define CHOICE(a,b,c)	b
+
+#else
+/*
+ * AT&T ASSEMBLER SYNTAX
+ * *********************
+ */
+#define CHOICE(a,b,c)	a
+
+#define ADDR_TOGGLE	addr16
+#define OPSZ_TOGGLE	data16
+
+#endif /* GNU_ASSEMBLER */
+#endif /* ACK_ASSEMBLER */
+
+
+#if defined(__QNX__) || defined(Lynx) || (defined(SYSV) || defined(SVR4)) && !defined(ACK_ASSEMBLER) || defined(__ELF__) || defined(__GNU__) || defined(__GNUC__) && !defined(__DJGPP__) && !defined(__MINGW32__)
+#define GLNAME(a)	a
+#else
+#define GLNAME(a)	CONCAT(_,a)
+#endif
+
+
+	/****************************************/
+	/*					*/
+	/*	Select the various choices	*/
+	/*					*/
+	/****************************************/
+
+
+/* Redefine assembler directives */
+/*********************************/
+#define GLOBL		CHOICE(.globl, .globl, .extern)
+#define GLOBAL		GLOBL
+#define EXTERN		GLOBL
+/*
+#define ALIGNTEXT32	CHOICE(.align 32, .align ARG2(5,0x90), .align 32)
+*/
+#define ALIGNTEXT32	CHOICE(.align 32, .balign 32, .align 32)
+#define ALIGNTEXT16	CHOICE(.align 16, .balign 16, .align 16)
+#define ALIGNTEXT8	CHOICE(.align 8, .balign 8, .align 8)
+#define ALIGNTEXT4	CHOICE(.align 4, .balign 4, .align 4)
+#define ALIGNTEXT2	CHOICE(.align 2, .balign 2, .align 2)
+/* ALIGNTEXT4ifNOP is the same as ALIGNTEXT4, but only if the space is
+ * guaranteed to be filled with NOPs.  Otherwise it does nothing.
+ */
+#define ALIGNTEXT32ifNOP	CHOICE(.align 32, .balign ARG2(32,0x90), /*can't do it*/)
+#define ALIGNTEXT16ifNOP	CHOICE(.align 16, .balign ARG2(16,0x90), /*can't do it*/)
+#define ALIGNTEXT8ifNOP	CHOICE(.align 8, .balign ARG2(8,0x90), /*can't do it*/)
+#define ALIGNTEXT4ifNOP	CHOICE(.align 4, .balign ARG2(4,0x90), /*can't do it*/)
+#define ALIGNDATA32	CHOICE(.align 32, .balign ARG2(32,0x0), .align 32)
+#define ALIGNDATA16	CHOICE(.align 16, .balign ARG2(16,0x0), .align 16)
+#define ALIGNDATA8	CHOICE(.align 8, .balign ARG2(8,0x0), .align 8)
+#define ALIGNDATA4	CHOICE(.align 4, .balign ARG2(4,0x0), .align 4)
+#define ALIGNDATA2	CHOICE(.align 2, .balign ARG2(2,0x0), .align 2)
+#define FILE(s)		CHOICE(.file s, .file s, .file s)
+#define STRING(s)	CHOICE(.string s, .asciz s, .asciz s)
+#define D_LONG		CHOICE(.long, .long, .data4)
+#define D_WORD		CHOICE(.value, .short, .data2)
+#define D_BYTE		CHOICE(.byte, .byte, .data1)
+#define SPACE		CHOICE(.comm, .space, .space)
+#define COMM		CHOICE(.comm, .comm, .comm)
+#define SEG_DATA	CHOICE(.data, .data, .sect .data)
+#define SEG_TEXT	CHOICE(.text, .text, .sect .text)
+#define SEG_BSS		CHOICE(.bss, .bss, .sect .bss)
+
+#ifdef GNU_ASSEMBLER
+#define D_SPACE(n)	. = . + n
+#else
+#define D_SPACE(n)	.space n
+#endif
+
+/* Addressing Modes */
+/* Immediate Mode */
+#define ADDR(a)		CHOICE(CONCAT($,a), $a, a)
+#define CONST(a)	CHOICE(CONCAT($,a), $a, a)
+
+/* Indirect Mode */
+#define CONTENT(a)	CHOICE(a, a, (a))	 /* take contents of variable */
+#define REGIND(a)	CHOICE((a), (a), (a))	 /* Register a indirect */
+/* Register b indirect plus displacement a */
+#define REGOFF(a, b)	CHOICE(a(b), a(b), a(b))
+/* Reg indirect Base + Index + Displacement  - this is mainly for 16-bit mode
+ * which has no scaling
+ */
+#define REGBID(b,i,d)	CHOICE(d(b,i), d(b,i), d(b)(i))
+/* Reg indirect Base + (Index * Scale) */
+#define REGBIS(b,i,s)	CHOICE((b,i,s), (b,i,s), (b)(i*s))
+/* Reg indirect Base + (Index * Scale) + Displacement */
+#define REGBISD(b,i,s,d) CHOICE(d(b,i,s), d(b,i,s), d(b)(i*s))
+/* Displaced Scaled Index: */
+#define REGDIS(d,i,s)	CHOICE(d(,i,s), d(,i,s), d(i * s))
+/* Indexed Base: */
+#define REGBI(b,i)	CHOICE((b,i), (b,i), (b)(i))
+/* Displaced Base: */
+#define REGDB(d,b)	CHOICE(d(b), d(b), d(b))
+/* Variable indirect: */
+#define VARINDIRECT(var) CHOICE(*var, *var, (var))
+/* Use register contents as jump/call target: */
+#define CODEPTR(reg)	CHOICE(*reg, *reg, reg)
+
+/* For expressions requiring bracketing
+ * eg. (CRT0_PM | CRT_EM)
+ */
+
+#define EXPR(a)		CHOICE([a], (a), [a])
+#define ENOT(a)		CHOICE(0!a, ~a, ~a)
+#define EMUL(a,b)	CHOICE(a\*b, a*b, a*b)
+#define EDIV(a,b)	CHOICE(a\/b, a/b, a/b)
+
+/*
+ * We have to beat the problem of commas within arguments to choice.
+ * eg. choice (add a,b, add b,a) will get argument mismatch.  Luckily ANSI
+ * and other known cpp definitions evaluate arguments before substitution
+ * so the following works.
+ */
+#define ARG2(a, b)	a,b
+#define ARG3(a,b,c)	a,b,c
+
+/* Redefine assembler commands */
+#define AAA		CHOICE(aaa, aaa, aaa)
+#define AAD		CHOICE(aad, aad, aad)
+#define AAM		CHOICE(aam, aam, aam)
+#define AAS		CHOICE(aas, aas, aas)
+#define ADC_L(a, b)	CHOICE(adcl ARG2(a,b), adcl ARG2(a,b), _LTOG adc ARG2(b,a))
+#define ADC_W(a, b)	CHOICE(adcw ARG2(a,b), adcw ARG2(a,b), _WTOG adc ARG2(b,a))
+#define ADC_B(a, b)	CHOICE(adcb ARG2(a,b), adcb ARG2(a,b), adcb ARG2(b,a))
+#define ADD_L(a, b)	CHOICE(addl ARG2(a,b), addl ARG2(a,b), _LTOG add ARG2(b,a))
+#define ADD_W(a, b)	CHOICE(addw ARG2(a,b), addw ARG2(a,b), _WTOG add ARG2(b,a))
+#define ADD_B(a, b)	CHOICE(addb ARG2(a,b), addb ARG2(a,b), addb ARG2(b,a))
+#define AND_L(a, b)	CHOICE(andl ARG2(a,b), andl ARG2(a,b), _LTOG and ARG2(b,a))
+#define AND_W(a, b)	CHOICE(andw ARG2(a,b), andw ARG2(a,b), _WTOG and ARG2(b,a))
+#define AND_B(a, b)	CHOICE(andb ARG2(a,b), andb ARG2(a,b), andb ARG2(b,a))
+#define ARPL(a,b)	CHOICE(arpl ARG2(a,b), arpl ARG2(a,b), arpl ARG2(b,a))
+#define BOUND_L(a, b)	CHOICE(boundl ARG2(a,b), boundl ARG2(b,a), _LTOG bound ARG2(b,a))
+#define BOUND_W(a, b)	CHOICE(boundw ARG2(a,b), boundw ARG2(b,a), _WTOG bound ARG2(b,a))
+#define BSF_L(a, b)	CHOICE(bsfl ARG2(a,b), bsfl ARG2(a,b), _LTOG bsf ARG2(b,a))
+#define BSF_W(a, b)	CHOICE(bsfw ARG2(a,b), bsfw ARG2(a,b), _WTOG bsf ARG2(b,a))
+#define BSR_L(a, b)	CHOICE(bsrl ARG2(a,b), bsrl ARG2(a,b), _LTOG bsr ARG2(b,a))
+#define BSR_W(a, b)	CHOICE(bsrw ARG2(a,b), bsrw ARG2(a,b), _WTOG bsr ARG2(b,a))
+#define BT_L(a, b)	CHOICE(btl ARG2(a,b), btl ARG2(a,b), _LTOG bt ARG2(b,a))
+#define BT_W(a, b)	CHOICE(btw ARG2(a,b), btw ARG2(a,b), _WTOG bt ARG2(b,a))
+#define BTC_L(a, b)	CHOICE(btcl ARG2(a,b), btcl ARG2(a,b), _LTOG btc ARG2(b,a))
+#define BTC_W(a, b)	CHOICE(btcw ARG2(a,b), btcw ARG2(a,b), _WTOG btc ARG2(b,a))
+#define BTR_L(a, b)	CHOICE(btrl ARG2(a,b), btrl ARG2(a,b), _LTOG btr ARG2(b,a))
+#define BTR_W(a, b)	CHOICE(btrw ARG2(a,b), btrw ARG2(a,b), _WTOG btr ARG2(b,a))
+#define BTS_L(a, b)	CHOICE(btsl ARG2(a,b), btsl ARG2(a,b), _LTOG bts ARG2(b,a))
+#define BTS_W(a, b)	CHOICE(btsw ARG2(a,b), btsw ARG2(a,b), _WTOG bts ARG2(b,a))
+#define CALL(a)		CHOICE(call a, call a, call a)
+#define CALLF(s,a)	CHOICE(lcall ARG2(s,a), lcall ARG2(s,a), callf s:a)
+#define CBW		CHOICE(cbtw, cbw, cbw)
+#define CWDE		CHOICE(cwtd, cwde, cwde)
+#define CLC		CHOICE(clc, clc, clc)
+#define CLD		CHOICE(cld, cld, cld)
+#define CLI		CHOICE(cli, cli, cli)
+#define CLTS		CHOICE(clts, clts, clts)
+#define CMC		CHOICE(cmc, cmc, cmc)
+#define CMP_L(a, b)	CHOICE(cmpl ARG2(a,b), cmpl ARG2(a,b), _LTOG cmp ARG2(b,a))
+#define CMP_W(a, b)	CHOICE(cmpw ARG2(a,b), cmpw ARG2(a,b), _WTOG cmp ARG2(b,a))
+#define CMP_B(a, b)	CHOICE(cmpb ARG2(a,b), cmpb ARG2(a,b), cmpb ARG2(b,a))
+#define CMPS_L		CHOICE(cmpsl, cmpsl, _LTOG cmps)
+#define CMPS_W		CHOICE(cmpsw, cmpsw, _WTOG cmps)
+#define CMPS_B		CHOICE(cmpsb, cmpsb, cmpsb)
+#define CWD		CHOICE(cwtl, cwd, cwd)
+#define CDQ		CHOICE(cltd, cdq, cdq)
+#define DAA		CHOICE(daa, daa, daa)
+#define DAS		CHOICE(das, das, das)
+#define DEC_L(a)	CHOICE(decl a, decl a, _LTOG dec a)
+#define DEC_W(a)	CHOICE(decw a, decw a, _WTOG dec a)
+#define DEC_B(a)	CHOICE(decb a, decb a, decb a)
+#define DIV_L(a)	CHOICE(divl a, divl a, div a)
+#define DIV_W(a)	CHOICE(divw a, divw a, div a)
+#define DIV_B(a)	CHOICE(divb a, divb a, divb a)
+#define ENTER(a,b)	CHOICE(enter ARG2(a,b), enter ARG2(a,b), enter ARG2(b,a))
+#define HLT		CHOICE(hlt, hlt, hlt)
+#define IDIV_L(a)	CHOICE(idivl a, idivl a, _LTOG idiv a)
+#define IDIV_W(a)	CHOICE(idivw a, idivw a, _WTOG idiv a)
+#define IDIV_B(a)	CHOICE(idivb a, idivb a, idivb a)
+/* More forms than this for imul!! */
+#define IMUL_L(a, b)	CHOICE(imull ARG2(a,b), imull ARG2(a,b), _LTOG imul ARG2(b,a))
+#define IMUL_W(a, b)	CHOICE(imulw ARG2(a,b), imulw ARG2(a,b), _WTOG imul ARG2(b,a))
+#define IMUL_B(a)	CHOICE(imulb a, imulb a, imulb a)
+#define IN_L		CHOICE(inl (DX), inl ARG2(DX,EAX), _LTOG in DX)
+#define IN_W		CHOICE(inw (DX), inw ARG2(DX,AX), _WTOG in DX)
+#define IN_B		CHOICE(inb (DX), inb ARG2(DX,AL), inb DX)
+/* Please AS code writer: use the following ONLY, if you refer to ports<256
+ * directly, but not in IN1_W(DX), for instance, even if IN1_ looks nicer
+ */
+#if defined (sun)
+#define IN1_L(a)	CHOICE(inl (a), inl ARG2(a,EAX), _LTOG in a)
+#define IN1_W(a)	CHOICE(inw (a), inw ARG2(a,AX), _WTOG in a)
+#define IN1_B(a)	CHOICE(inb (a), inb ARG2(a,AL), inb a)
+#else
+#define IN1_L(a)	CHOICE(inl a, inl ARG2(a,EAX), _LTOG in a)
+#define IN1_W(a)	CHOICE(inw a, inw ARG2(a,AX), _WTOG in a)
+#define IN1_B(a)	CHOICE(inb a, inb ARG2(a,AL), inb a)
+#endif
+#define INC_L(a)	CHOICE(incl a, incl a, _LTOG inc a)
+#define INC_W(a)	CHOICE(incw a, incw a, _WTOG inc a)
+#define INC_B(a)	CHOICE(incb a, incb a, incb a)
+#define INS_L		CHOICE(insl, insl, _LTOG ins)
+#define INS_W		CHOICE(insw, insw, _WTOG ins)
+#define INS_B		CHOICE(insb, insb, insb)
+#define INT(a)		CHOICE(int a, int a, int a)
+#define INT3		CHOICE(int CONST(3), int3, int CONST(3))
+#define INTO		CHOICE(into, into, into)
+#define IRET		CHOICE(iret, iret, iret)
+#define IRETD		CHOICE(iret, iret, iretd)
+#define JA(a)		CHOICE(ja a, ja a, ja a)
+#define JAE(a)		CHOICE(jae a, jae a, jae a)
+#define JB(a)		CHOICE(jb a, jb a, jb a)
+#define JBE(a)		CHOICE(jbe a, jbe a, jbe a)
+#define JC(a)		CHOICE(jc a, jc a, jc a)
+#define JE(a)		CHOICE(je a, je a, je a)
+#define JG(a)		CHOICE(jg a, jg a, jg a)
+#define JGE(a)		CHOICE(jge a, jge a, jge a)
+#define JL(a)		CHOICE(jl a, jl a, jl a)
+#define JLE(a)		CHOICE(jle a, jle a, jle a)
+#define JNA(a)		CHOICE(jna a, jna a, jna a)
+#define JNAE(a)		CHOICE(jnae a, jnae a, jnae a)
+#define JNB(a)		CHOICE(jnb a, jnb a, jnb a)
+#define JNBE(a)		CHOICE(jnbe a, jnbe a, jnbe a)
+#define JNC(a)		CHOICE(jnc a, jnc a, jnc a)
+#define JNE(a)		CHOICE(jne a, jne a, jne a)
+#define JNG(a)		CHOICE(jng a, jng a, jng a)
+#define JNGE(a)		CHOICE(jnge a, jnge a, jnge a)
+#define JNL(a)		CHOICE(jnl a, jnl a, jnl a)
+#define JNLE(a)		CHOICE(jnle a, jnle a, jnle a)
+#define JNO(a)		CHOICE(jno a, jno a, jno a)
+#define JNP(a)		CHOICE(jnp a, jnp a, jnp a)
+#define JNS(a)		CHOICE(jns a, jns a, jns a)
+#define JNZ(a)		CHOICE(jnz a, jnz a, jnz a)
+#define JO(a)		CHOICE(jo a, jo a, jo a)
+#define JP(a)		CHOICE(jp a, jp a, jp a)
+#define JPE(a)		CHOICE(jpe a, jpe a, jpe a)
+#define JPO(a)		CHOICE(jpo a, jpo a, jpo a)
+#define JS(a)		CHOICE(js a, js a, js a)
+#define JZ(a)		CHOICE(jz a, jz a, jz a)
+#define JMP(a)		CHOICE(jmp a, jmp a, jmp a)
+#define JMPF(s,a)	CHOICE(ljmp ARG2(s,a), ljmp ARG2(s,a), jmpf s:a)
+#define LAHF		CHOICE(lahf, lahf, lahf)
+#if !defined(_REAL_MODE) && !defined(_V86_MODE)
+#define LAR(a, b)	CHOICE(lar ARG2(a, b), lar ARG2(a, b), lar ARG2(b, a))
+#endif
+#define LEA_L(a, b)	CHOICE(leal ARG2(a,b), leal ARG2(a,b), _LTOG lea ARG2(b,a))
+#define LEA_W(a, b)	CHOICE(leaw ARG2(a,b), leaw ARG2(a,b), _WTOG lea ARG2(b,a))
+#define LEAVE		CHOICE(leave, leave, leave)
+#define LGDT(a)		CHOICE(lgdt a, lgdt a, lgdt a)
+#define LIDT(a)		CHOICE(lidt a, lidt a, lidt a)
+#define LDS(a, b)	CHOICE(ldsl ARG2(a,b), lds ARG2(a,b), lds ARG2(b,a))
+#define LES(a, b)	CHOICE(lesl ARG2(a,b), les ARG2(a,b), les ARG2(b,a))
+#define LFS(a, b)	CHOICE(lfsl ARG2(a,b), lfs ARG2(a,b), lfs ARG2(b,a))
+#define LGS(a, b)	CHOICE(lgsl ARG2(a,b), lgs ARG2(a,b), lgs ARG2(b,a))
+#define LSS(a, b)	CHOICE(lssl ARG2(a,b), lss ARG2(a,b), lss ARG2(b,a))
+#define LLDT(a)		CHOICE(lldt a, lldt a, lldt a)
+#define LMSW(a)		CHOICE(lmsw a, lmsw a, lmsw a)
+#define LOCK		CHOICE(lock, lock, lock)
+#define LODS_L		CHOICE(lodsl, lodsl, _LTOG lods)
+#define LODS_W		CHOICE(lodsw, lodsw, _WTOG lods)
+#define LODS_B		CHOICE(lodsb, lodsb, lodsb)
+#define LOOP(a)		CHOICE(loop a, loop a, loop a)
+#define LOOPE(a)	CHOICE(loope a, loope a, loope a)
+#define LOOPZ(a)	CHOICE(loopz a, loopz a, loopz a)
+#define LOOPNE(a)	CHOICE(loopne a, loopne a, loopne a)
+#define LOOPNZ(a)	CHOICE(loopnz a, loopnz a, loopnz a)
+#if !defined(_REAL_MODE) && !defined(_V86_MODE)
+#define LSL(a, b)	CHOICE(lsl ARG2(a,b), lsl ARG2(a,b), lsl ARG2(b,a))
+#endif
+#define LTR(a)		CHOICE(ltr a, ltr a, ltr a)
+#define MOV_SR(a, b)	CHOICE(movw ARG2(a,b), mov ARG2(a,b), mov ARG2(b,a))
+#define MOV_L(a, b)	CHOICE(movl ARG2(a,b), movl ARG2(a,b), _LTOG mov ARG2(b,a))
+#define MOV_W(a, b)	CHOICE(movw ARG2(a,b), movw ARG2(a,b), _WTOG mov ARG2(b,a))
+#define MOV_B(a, b)	CHOICE(movb ARG2(a,b), movb ARG2(a,b), movb ARG2(b,a))
+#define MOVS_L		CHOICE(movsl, movsl, _LTOG movs)
+#define MOVS_W		CHOICE(movsw, movsw, _WTOG movs)
+#define MOVS_B		CHOICE(movsb, movsb, movsb)
+#define MOVSX_BL(a, b)	CHOICE(movsbl ARG2(a,b), movsbl ARG2(a,b), movsx ARG2(b,a))
+#define MOVSX_BW(a, b)	CHOICE(movsbw ARG2(a,b), movsbw ARG2(a,b), movsx ARG2(b,a))
+#define MOVSX_WL(a, b)	CHOICE(movswl ARG2(a,b), movswl ARG2(a,b), movsx ARG2(b,a))
+#define MOVZX_BL(a, b)	CHOICE(movzbl ARG2(a,b), movzbl ARG2(a,b), movzx ARG2(b,a))
+#define MOVZX_BW(a, b)	CHOICE(movzbw ARG2(a,b), movzbw ARG2(a,b), movzx ARG2(b,a))
+#define MOVZX_WL(a, b)	CHOICE(movzwl ARG2(a,b), movzwl ARG2(a,b), movzx ARG2(b,a))
+#define MUL_L(a)	CHOICE(mull a, mull a, _LTOG mul a)
+#define MUL_W(a)	CHOICE(mulw a, mulw a, _WTOG mul a)
+#define MUL_B(a)	CHOICE(mulb a, mulb a, mulb a)
+#define NEG_L(a)	CHOICE(negl a, negl a, _LTOG neg a)
+#define NEG_W(a)	CHOICE(negw a, negw a, _WTOG neg a)
+#define NEG_B(a)	CHOICE(negb a, negb a, negb a)
+#define NOP		CHOICE(nop, nop, nop)
+#define NOT_L(a)	CHOICE(notl a, notl a, _LTOG not a)
+#define NOT_W(a)	CHOICE(notw a, notw a, _WTOG not a)
+#define NOT_B(a)	CHOICE(notb a, notb a, notb a)
+#define OR_L(a,b)	CHOICE(orl ARG2(a,b), orl ARG2(a,b), _LTOG or ARG2(b,a))
+#define OR_W(a,b)	CHOICE(orw ARG2(a,b), orw ARG2(a,b), _WTOG or ARG2(b,a))
+#define OR_B(a,b)	CHOICE(orb ARG2(a,b), orb ARG2(a,b), orb ARG2(b,a))
+#define OUT_L		CHOICE(outl (DX), outl ARG2(EAX,DX), _LTOG out DX)
+#define OUT_W		CHOICE(outw (DX), outw ARG2(AX,DX), _WTOG out DX)
+#define OUT_B		CHOICE(outb (DX), outb ARG2(AL,DX), outb DX)
+/* Please AS code writer: use the following ONLY, if you refer to ports<256
+ * directly, but not in OUT1_W(DX), for instance, even if OUT1_ looks nicer
+ */
+#define OUT1_L(a)	CHOICE(outl (a), outl ARG2(EAX,a), _LTOG out a)
+#define OUT1_W(a)	CHOICE(outw (a), outw ARG2(AX,a), _WTOG out a)
+#define OUT1_B(a)	CHOICE(outb (a), outb ARG2(AL,a), outb a)
+#define OUTS_L		CHOICE(outsl, outsl, _LTOG outs)
+#define OUTS_W		CHOICE(outsw, outsw, _WTOG outs)
+#define OUTS_B		CHOICE(outsb, outsb, outsb)
+#define POP_SR(a)	CHOICE(pop a, pop a, pop a)
+#define POP_L(a)	CHOICE(popl a, popl a, _LTOG pop a)
+#define POP_W(a)	CHOICE(popw a, popw a, _WTOG pop a)
+#define POPA_L		CHOICE(popal, popal, _LTOG popa)
+#define POPA_W		CHOICE(popaw, popaw, _WTOG popa)
+#define POPF_L		CHOICE(popfl, popfl, _LTOG popf)
+#define POPF_W		CHOICE(popfw, popfw, _WTOG popf)
+#define PUSH_SR(a)	CHOICE(push a, push a, push a)
+#define PUSH_L(a)	CHOICE(pushl a, pushl a, _LTOG push a)
+#define PUSH_W(a)	CHOICE(pushw a, pushw a, _WTOG push a)
+#define PUSH_B(a)	CHOICE(push a, pushb a, push a)
+#define PUSHA_L		CHOICE(pushal, pushal, _LTOG pusha)
+#define PUSHA_W		CHOICE(pushaw, pushaw, _WTOG pusha)
+#define PUSHF_L		CHOICE(pushfl, pushfl, _LTOG pushf)
+#define PUSHF_W		CHOICE(pushfw, pushfw, _WTOG pushf)
+#define RCL_L(a, b)	CHOICE(rcll ARG2(a,b), rcll ARG2(a,b), _LTOG rcl ARG2(b,a))
+#define RCL_W(a, b)	CHOICE(rclw ARG2(a,b), rclw ARG2(a,b), _WTOG rcl ARG2(b,a))
+#define RCL_B(a, b)	CHOICE(rclb ARG2(a,b), rclb ARG2(a,b), rclb ARG2(b,a))
+#define RCR_L(a, b)	CHOICE(rcrl ARG2(a,b), rcrl ARG2(a,b), _LTOG rcr ARG2(b,a))
+#define RCR_W(a, b)	CHOICE(rcrw ARG2(a,b), rcrw ARG2(a,b), _WTOG rcr ARG2(b,a))
+#define RCR_B(a, b)	CHOICE(rcrb ARG2(a,b), rcrb ARG2(a,b), rcrb ARG2(b,a))
+#define ROL_L(a, b)	CHOICE(roll ARG2(a,b), roll ARG2(a,b), _LTOG rol ARG2(b,a))
+#define ROL_W(a, b)	CHOICE(rolw ARG2(a,b), rolw ARG2(a,b), _WTOG rol ARG2(b,a))
+#define ROL_B(a, b)	CHOICE(rolb ARG2(a,b), rolb ARG2(a,b), rolb ARG2(b,a))
+#define ROR_L(a, b)	CHOICE(rorl ARG2(a,b), rorl ARG2(a,b), _LTOG ror ARG2(b,a))
+#define ROR_W(a, b)	CHOICE(rorw ARG2(a,b), rorw ARG2(a,b), _WTOG ror ARG2(b,a))
+#define ROR_B(a, b)	CHOICE(rorb ARG2(a,b), rorb ARG2(a,b), rorb ARG2(b,a))
+#define REP		CHOICE(rep ;, rep ;, repe)
+#define REPE		CHOICE(repz ;, repe ;, repe)
+#define REPNE		CHOICE(repnz ;, repne ;, repne)
+#define REPNZ		REPNE
+#define REPZ		REPE
+#define RET		CHOICE(ret, ret, ret)
+#define SAHF		CHOICE(sahf, sahf, sahf)
+#define SAL_L(a, b)	CHOICE(sall ARG2(a,b), sall ARG2(a,b), _LTOG sal ARG2(b,a))
+#define SAL_W(a, b)	CHOICE(salw ARG2(a,b), salw ARG2(a,b), _WTOG sal ARG2(b,a))
+#define SAL_B(a, b)	CHOICE(salb ARG2(a,b), salb ARG2(a,b), salb ARG2(b,a))
+#define SAR_L(a, b)	CHOICE(sarl ARG2(a,b), sarl ARG2(a,b), _LTOG sar ARG2(b,a))
+#define SAR_W(a, b)	CHOICE(sarw ARG2(a,b), sarw ARG2(a,b), _WTOG sar ARG2(b,a))
+#define SAR_B(a, b)	CHOICE(sarb ARG2(a,b), sarb ARG2(a,b), sarb ARG2(b,a))
+#define SBB_L(a, b)	CHOICE(sbbl ARG2(a,b), sbbl ARG2(a,b), _LTOG sbb ARG2(b,a))
+#define SBB_W(a, b)	CHOICE(sbbw ARG2(a,b), sbbw ARG2(a,b), _WTOG sbb ARG2(b,a))
+#define SBB_B(a, b)	CHOICE(sbbb ARG2(a,b), sbbb ARG2(a,b), sbbb ARG2(b,a))
+#define SCAS_L		CHOICE(scasl, scasl, _LTOG scas)
+#define SCAS_W		CHOICE(scasw, scasw, _WTOG scas)
+#define SCAS_B		CHOICE(scasb, scasb, scasb)
+#define SETA(a)		CHOICE(seta a, seta a, seta a)
+#define SETAE(a)	CHOICE(setae a, setae a, setae a)
+#define SETB(a)		CHOICE(setb a, setb a, setb a)
+#define SETBE(a)	CHOICE(setbe a, setbe a, setbe a)
+#define SETC(a)		CHOICE(setc a, setb a, setb a)
+#define SETE(a)		CHOICE(sete a, sete a, sete a)
+#define SETG(a)		CHOICE(setg a, setg a, setg a)
+#define SETGE(a)	CHOICE(setge a, setge a, setge a)
+#define SETL(a)		CHOICE(setl a, setl a, setl a)
+#define SETLE(a)	CHOICE(setle a, setle a, setle a)
+#define SETNA(a)	CHOICE(setna a, setna a, setna a)
+#define SETNAE(a)	CHOICE(setnae a, setnae a, setnae a)
+#define SETNB(a)	CHOICE(setnb a, setnb a, setnb a)
+#define SETNBE(a)	CHOICE(setnbe a, setnbe a, setnbe a)
+#define SETNC(a)	CHOICE(setnc a, setnb a, setnb a)
+#define SETNE(a)	CHOICE(setne a, setne a, setne a)
+#define SETNG(a)	CHOICE(setng a, setng a, setng a)
+#define SETNGE(a)	CHOICE(setnge a, setnge a, setnge a)
+#define SETNL(a)	CHOICE(setnl a, setnl a, setnl a)
+#define SETNLE(a)	CHOICE(setnle a, setnle a, setnle a)
+#define SETNO(a)	CHOICE(setno a, setno a, setno a)
+#define SETNP(a)	CHOICE(setnp a, setnp a, setnp a)
+#define SETNS(a)	CHOICE(setns a, setns a, setna a)
+#define SETNZ(a)	CHOICE(setnz a, setnz a, setnz a)
+#define SETO(a)		CHOICE(seto a, seto a, seto a)
+#define SETP(a)		CHOICE(setp a, setp a, setp a)
+#define SETPE(a)	CHOICE(setpe a, setpe a, setpe a)
+#define SETPO(a)	CHOICE(setpo a, setpo a, setpo a)
+#define SETS(a)		CHOICE(sets a, sets a, seta a)
+#define SETZ(a)		CHOICE(setz a, setz a, setz a)
+#define SGDT(a)		CHOICE(sgdt a, sgdt a, sgdt a)
+#define SIDT(a)		CHOICE(sidt a, sidt a, sidt a)
+#define SHL_L(a, b)	CHOICE(shll ARG2(a,b), shll ARG2(a,b), _LTOG shl ARG2(b,a))
+#define SHL_W(a, b)	CHOICE(shlw ARG2(a,b), shlw ARG2(a,b), _WTOG shl ARG2(b,a))
+#define SHL_B(a, b)	CHOICE(shlb ARG2(a,b), shlb ARG2(a,b), shlb ARG2(b,a))
+#define SHLD_L(a,b,c)	CHOICE(shldl ARG3(a,b,c), shldl ARG3(a,b,c), _LTOG shld ARG3(c,b,a))
+#define SHLD2_L(a,b)	CHOICE(shldl ARG2(a,b), shldl ARG3(CL,a,b), _LTOG shld ARG3(b,a,CL))
+#define SHLD_W(a,b,c)	CHOICE(shldw ARG3(a,b,c), shldw ARG3(a,b,c), _WTOG shld ARG3(c,b,a))
+#define SHLD2_W(a,b)	CHOICE(shldw ARG2(a,b), shldw ARG3(CL,a,b), _WTOG shld ARG3(b,a,CL))
+#define SHR_L(a, b)	CHOICE(shrl ARG2(a,b), shrl ARG2(a,b), _LTOG shr ARG2(b,a))
+#define SHR_W(a, b)	CHOICE(shrw ARG2(a,b), shrw ARG2(a,b), _WTOG shr ARG2(b,a))
+#define SHR_B(a, b)	CHOICE(shrb ARG2(a,b), shrb ARG2(a,b), shrb ARG2(b,a))
+#define SHRD_L(a,b,c)	CHOICE(shrdl ARG3(a,b,c), shrdl ARG3(a,b,c), _LTOG shrd ARG3(c,b,a))
+#define SHRD2_L(a,b)	CHOICE(shrdl ARG2(a,b), shrdl ARG3(CL,a,b), _LTOG shrd ARG3(b,a,CL))
+#define SHRD_W(a,b,c)	CHOICE(shrdw ARG3(a,b,c), shrdw ARG3(a,b,c), _WTOG shrd ARG3(c,b,a))
+#define SHRD2_W(a,b)	CHOICE(shrdw ARG2(a,b), shrdw ARG3(CL,a,b), _WTOG shrd ARG3(b,a,CL))
+#define SLDT(a)		CHOICE(sldt a, sldt a, sldt a)
+#define SMSW(a)		CHOICE(smsw a, smsw a, smsw a)
+#define STC		CHOICE(stc, stc, stc)
+#define STD		CHOICE(std, std, std)
+#define STI		CHOICE(sti, sti, sti)
+#define STOS_L		CHOICE(stosl, stosl, _LTOG stos)
+#define STOS_W		CHOICE(stosw, stosw, _WTOG stos)
+#define STOS_B		CHOICE(stosb, stosb, stosb)
+#define STR(a)		CHOICE(str a, str a, str a)
+#define SUB_L(a, b)	CHOICE(subl ARG2(a,b), subl ARG2(a,b), _LTOG sub ARG2(b,a))
+#define SUB_W(a, b)	CHOICE(subw ARG2(a,b), subw ARG2(a,b), _WTOG sub ARG2(b,a))
+#define SUB_B(a, b)	CHOICE(subb ARG2(a,b), subb ARG2(a,b), subb ARG2(b,a))
+#define TEST_L(a, b)	CHOICE(testl ARG2(a,b), testl ARG2(a,b), _LTOG test ARG2(b,a))
+#define TEST_W(a, b)	CHOICE(testw ARG2(a,b), testw ARG2(a,b), _WTOG test ARG2(b,a))
+#define TEST_B(a, b)	CHOICE(testb ARG2(a,b), testb ARG2(a,b), testb ARG2(b,a))
+#define VERR(a)		CHOICE(verr a, verr a, verr a)
+#define VERW(a)		CHOICE(verw a, verw a, verw a)
+#define WAIT		CHOICE(wait, wait, wait)
+#define XCHG_L(a, b)	CHOICE(xchgl ARG2(a,b), xchgl ARG2(a,b), _LTOG xchg ARG2(b,a))
+#define XCHG_W(a, b)	CHOICE(xchgw ARG2(a,b), xchgw ARG2(a,b), _WTOG xchg ARG2(b,a))
+#define XCHG_B(a, b)	CHOICE(xchgb ARG2(a,b), xchgb ARG2(a,b), xchgb ARG2(b,a))
+#define XLAT		CHOICE(xlat, xlat, xlat)
+#define XOR_L(a, b)	CHOICE(xorl ARG2(a,b), xorl ARG2(a,b), _LTOG xor ARG2(b,a))
+#define XOR_W(a, b)	CHOICE(xorw ARG2(a,b), xorw ARG2(a,b), _WTOG xor ARG2(b,a))
+#define XOR_B(a, b)	CHOICE(xorb ARG2(a,b), xorb ARG2(a,b), xorb ARG2(b,a))
+
+
+/* Floating Point Instructions */
+#define F2XM1		CHOICE(f2xm1, f2xm1, f2xm1)
+#define FABS		CHOICE(fabs, fabs, fabs)
+#define FADD_D(a)	CHOICE(faddl a, faddl a, faddd a)
+#define FADD_S(a)	CHOICE(fadds a, fadds a, fadds a)
+#define FADD2(a, b)	CHOICE(fadd ARG2(a,b), fadd ARG2(a,b), fadd ARG2(b,a))
+#define FADDP(a, b)	CHOICE(faddp ARG2(a,b), faddp ARG2(a,b), faddp ARG2(b,a))
+#define FIADD_L(a)	CHOICE(fiaddl a, fiaddl a, fiaddl a)
+#define FIADD_W(a)	CHOICE(fiadd a, fiadds a, fiadds a)
+#define FBLD(a)		CHOICE(fbld a, fbld a, fbld a)
+#define FBSTP(a)	CHOICE(fbstp a, fbstp a, fbstp a)
+#define FCHS		CHOICE(fchs, fchs, fchs)
+#define FCLEX		CHOICE(fclex, wait; fnclex, wait; fclex)
+#define FNCLEX		CHOICE(fnclex, fnclex, fclex)
+#define FCOM(a)		CHOICE(fcom a, fcom a, fcom a)
+#define FCOM_D(a)	CHOICE(fcoml a, fcoml a, fcomd a)
+#define FCOM_S(a)	CHOICE(fcoms a, fcoms a, fcoms a)
+#define FCOMP(a)	CHOICE(fcomp a, fcomp a, fcomp a)
+#define FCOMP_D(a)	CHOICE(fcompl a, fcompl a, fcompd a)
+#define FCOMP_S(a)	CHOICE(fcomps a, fcomps a, fcomps a)
+#define FCOMPP		CHOICE(fcompp, fcompp, fcompp)
+#define FCOS		CHOICE(fcos, fcos, fcos)
+#define FDECSTP		CHOICE(fdecstp, fdecstp, fdecstp)
+#define FDIV_D(a)	CHOICE(fdivl a, fdivl a, fdivd a)
+#define FDIV_S(a)	CHOICE(fdivs a, fdivs a, fdivs a)
+#define FDIV2(a, b)	CHOICE(fdiv ARG2(a,b), fdiv ARG2(a,b), fdiv ARG2(b,a))
+#define FDIVP(a, b)	CHOICE(fdivp ARG2(a,b), fdivp ARG2(a,b), fdivp ARG2(b,a))
+#define FIDIV_L(a)	CHOICE(fidivl a, fidivl a, fidivl a)
+#define FIDIV_W(a)	CHOICE(fidiv a, fidivs a, fidivs a)
+#define FDIVR_D(a)	CHOICE(fdivrl a, fdivrl a, fdivrd a)
+#define FDIVR_S(a)	CHOICE(fdivrs a, fdivrs a, fdivrs a)
+#define FDIVR2(a, b)	CHOICE(fdivr ARG2(a,b), fdivr ARG2(a,b), fdivr ARG2(b,a))
+#define FDIVRP(a, b)	CHOICE(fdivrp ARG2(a,b), fdivrp ARG2(a,b), fdivrp ARG2(b,a))
+#define FIDIVR_L(a)	CHOICE(fidivrl a, fidivrl a, fidivrl a)
+#define FIDIVR_W(a)	CHOICE(fidivr a, fidivrs a, fidivrs a)
+#define FFREE(a)	CHOICE(ffree a, ffree a, ffree a)
+#define FICOM_L(a)	CHOICE(ficoml a, ficoml a, ficoml a)
+#define FICOM_W(a)	CHOICE(ficom a, ficoms a, ficoms a)
+#define FICOMP_L(a)	CHOICE(ficompl a, ficompl a, ficompl a)
+#define FICOMP_W(a)	CHOICE(ficomp a, ficomps a, ficomps a)
+#define FILD_Q(a)	CHOICE(fildll a, fildq a, fildq a)
+#define FILD_L(a)	CHOICE(fildl a, fildl a, fildl a)
+#define FILD_W(a)	CHOICE(fild a, filds a, filds a)
+#define FINCSTP		CHOICE(fincstp, fincstp, fincstp)
+#define FINIT		CHOICE(finit, wait; fninit, wait; finit)
+#define FNINIT		CHOICE(fninit, fninit, finit)
+#define FIST_L(a)	CHOICE(fistl a, fistl a, fistl a)
+#define FIST_W(a)	CHOICE(fist a, fists a, fists a)
+#define FISTP_Q(a)	CHOICE(fistpll a, fistpq a, fistpq a)
+#define FISTP_L(a)	CHOICE(fistpl a, fistpl a, fistpl a)
+#define FISTP_W(a)	CHOICE(fistp a, fistps a, fistps a)
+#define FLD_X(a)	CHOICE(fldt a, fldt a, fldx a) /* 80 bit data type! */
+#define FLD_D(a)	CHOICE(fldl a, fldl a, fldd a)
+#define FLD_S(a)	CHOICE(flds a, flds a, flds a)
+#define FLD1		CHOICE(fld1, fld1, fld1)
+#define FLDL2T		CHOICE(fldl2t, fldl2t, fldl2t)
+#define FLDL2E		CHOICE(fldl2e, fldl2e, fldl2e)
+#define FLDPI		CHOICE(fldpi, fldpi, fldpi)
+#define FLDLG2		CHOICE(fldlg2, fldlg2, fldlg2)
+#define FLDLN2		CHOICE(fldln2, fldln2, fldln2)
+#define FLDZ		CHOICE(fldz, fldz, fldz)
+#define FLDCW(a)	CHOICE(fldcw a, fldcw a, fldcw a)
+#define FLDENV(a)	CHOICE(fldenv a, fldenv a, fldenv a)
+#define FMUL_S(a)	CHOICE(fmuls a, fmuls a, fmuls a)
+#define FMUL_D(a)	CHOICE(fmull a, fmull a, fmuld a)
+#define FMUL2(a, b)	CHOICE(fmul ARG2(a,b), fmul ARG2(a,b), fmul ARG2(b,a))
+#define FMULP(a, b)	CHOICE(fmulp ARG2(a,b), fmulp ARG2(a,b), fmulp ARG2(b,a))
+#define FIMUL_L(a)	CHOICE(fimull a, fimull a, fimull a)
+#define FIMUL_W(a)	CHOICE(fimul a, fimuls a, fimuls a)
+#define FNOP		CHOICE(fnop, fnop, fnop)
+#define FPATAN		CHOICE(fpatan, fpatan, fpatan)
+#define FPREM		CHOICE(fprem, fprem, fprem)
+#define FPREM1		CHOICE(fprem1, fprem1, fprem1)
+#define FPTAN		CHOICE(fptan, fptan, fptan)
+#define FRNDINT		CHOICE(frndint, frndint, frndint)
+#define FRSTOR(a)	CHOICE(frstor a, frstor a, frstor a)
+#define FSAVE(a)	CHOICE(fsave a, wait; fnsave a, wait; fsave a)
+#define FNSAVE(a)	CHOICE(fnsave a, fnsave a, fsave a)
+#define FSCALE		CHOICE(fscale, fscale, fscale)
+#define FSIN		CHOICE(fsin, fsin, fsin)
+#define FSINCOS		CHOICE(fsincos, fsincos, fsincos)
+#define FSQRT		CHOICE(fsqrt, fsqrt, fsqrt)
+#define FST_D(a)	CHOICE(fstl a, fstl a, fstd a)
+#define FST_S(a)	CHOICE(fsts a, fsts a, fsts a)
+#define FSTP_X(a)	CHOICE(fstpt a, fstpt a, fstpx a)
+#define FSTP_D(a)	CHOICE(fstpl a, fstpl a, fstpd a)
+#define FSTP_S(a)	CHOICE(fstps a, fstps a, fstps a)
+#define FSTP(a)		CHOICE(fstp a, fstp a, fstp a)
+#define FSTCW(a)	CHOICE(fstcw a, wait; fnstcw a, wait; fstcw a)
+#define FNSTCW(a)	CHOICE(fnstcw a, fnstcw a, fstcw a)
+#define FSTENV(a)	CHOICE(fstenv a, wait; fnstenv a, fstenv a)
+#define FNSTENV(a)	CHOICE(fnstenv a, fnstenv a, fstenv a)
+#define FSTSW(a)	CHOICE(fstsw a, wait; fnstsw a, wait; fstsw a)
+#define FNSTSW(a)	CHOICE(fnstsw a, fnstsw a, fstsw a)
+#define FSUB_S(a)	CHOICE(fsubs a, fsubs a, fsubs a)
+#define FSUB_D(a)	CHOICE(fsubl a, fsubl a, fsubd a)
+#define FSUB2(a, b)	CHOICE(fsub ARG2(a,b), fsub ARG2(a,b), fsub ARG2(b,a))
+#define FSUBP(a, b)	CHOICE(fsubp ARG2(a,b), fsubp ARG2(a,b), fsubp ARG2(b,a))
+#define FISUB_L(a)	CHOICE(fisubl a, fisubl a, fisubl a)
+#define FISUB_W(a)	CHOICE(fisub a, fisubs a, fisubs a)
+#define FSUBR_S(a)	CHOICE(fsubrs a, fsubrs a, fsubrs a)
+#define FSUBR_D(a)	CHOICE(fsubrl a, fsubrl a, fsubrd a)
+#define FSUBR2(a, b)	CHOICE(fsubr ARG2(a,b), fsubr ARG2(a,b), fsubr ARG2(b,a))
+#define FSUBRP(a, b)	CHOICE(fsubrp ARG2(a,b), fsubrp ARG2(a,b), fsubrp ARG2(b,a))
+#define FISUBR_L(a)	CHOICE(fisubrl a, fisubrl a, fisubrl a)
+#define FISUBR_W(a)	CHOICE(fisubr a, fisubrs a, fisubrs a)
+#define FTST		CHOICE(ftst, ftst, ftst)
+#define FUCOM(a)	CHOICE(fucom a, fucom a, fucom a)
+#define FUCOMP(a)	CHOICE(fucomp a, fucomp a, fucomp a)
+#define FUCOMPP		CHOICE(fucompp, fucompp, fucompp)
+#define FWAIT		CHOICE(wait, wait, wait)
+#define FXAM		CHOICE(fxam, fxam, fxam)
+#define FXCH(a)		CHOICE(fxch a, fxch a, fxch a)
+#define FXTRACT		CHOICE(fxtract, fxtract, fxtract)
+#define FYL2X		CHOICE(fyl2x, fyl2x, fyl2x)
+#define FYL2XP1		CHOICE(fyl2xp1, fyl2xp1, fyl2xp1)
+
+/* New instructions */
+#define CPUID		CHOICE(D_BYTE ARG2(15, 162), cpuid, D_BYTE ARG2(15, 162))
+#define RDTSC		CHOICE(D_BYTE ARG2(15, 49), rdtsc, D_BYTE ARG2(15, 49))
+
+#else /* NASM_ASSEMBLER || MASM_ASSEMBLER is defined */
+
+	/****************************************/
+	/*					*/
+	/*	Intel style assemblers.		*/
+	/*	(NASM and MASM)			*/
+	/*					*/
+	/****************************************/
+
+#define P_EAX		EAX
+#define L_EAX		EAX
+#define W_AX		AX
+#define B_AH		AH
+#define B_AL		AL
+
+#define P_EBX		EBX
+#define L_EBX		EBX
+#define W_BX		BX
+#define B_BH		BH
+#define B_BL		BL
+
+#define P_ECX		ECX
+#define L_ECX		ECX
+#define W_CX		CX
+#define B_CH		CH
+#define B_CL		CL
+
+#define P_EDX		EDX
+#define L_EDX		EDX
+#define W_DX		DX
+#define B_DH		DH
+#define B_DL		DL
+
+#define P_EBP		EBP
+#define L_EBP		EBP
+#define W_BP		BP
+
+#define P_ESI		ESI
+#define L_ESI		ESI
+#define W_SI		SI
+
+#define P_EDI		EDI
+#define L_EDI		EDI
+#define W_DI		DI
+
+#define P_ESP		ESP
+#define L_ESP		ESP
+#define W_SP		SP
+
+#define W_CS		CS
+#define W_SS		SS
+#define W_DS		DS
+#define W_ES		ES
+#define W_FS		FS
+#define W_GS		GS
+
+#define X_ST		ST
+#define D_ST		ST
+#define L_ST		ST
+
+#define P_MM0		mm0
+#define P_MM1		mm1
+#define P_MM2		mm2
+#define P_MM3		mm3
+#define P_MM4		mm4
+#define P_MM5		mm5
+#define P_MM6		mm6
+#define P_MM7		mm7
+
+#define P_XMM0		xmm0
+#define P_XMM1		xmm1
+#define P_XMM2		xmm2
+#define P_XMM3		xmm3
+#define P_XMM4		xmm4
+#define P_XMM5		xmm5
+#define P_XMM6		xmm6
+#define P_XMM7		xmm7
+
+#define CONCAT(x, y)		x ## y
+#define CONCAT3(x, y, z)	x ## y ## z
+
+#if defined(NASM_ASSEMBLER)
+
+#define ST(n)		st ## n
+#define ST0		st0
+
+#define TBYTE_PTR	tword
+#define QWORD_PTR	qword
+#define DWORD_PTR	dword
+#define WORD_PTR	word
+#define BYTE_PTR	byte
+
+#define OFFSET
+
+#define GLOBL			GLOBAL
+#define ALIGNTEXT32		ALIGN 32
+#define ALIGNTEXT16		ALIGN 16
+#define ALIGNTEXT8		ALIGN 8
+#define ALIGNTEXT4		ALIGN 4
+#define ALIGNTEXT2		ALIGN 2
+#define ALIGNTEXT32ifNOP	ALIGN 32
+#define ALIGNTEXT16ifNOP	ALIGN 16
+#define ALIGNTEXT8ifNOP		ALIGN 8
+#define ALIGNTEXT4ifNOP		ALIGN 4
+#define ALIGNDATA32		ALIGN 32
+#define ALIGNDATA16		ALIGN 16
+#define ALIGNDATA8		ALIGN 8
+#define ALIGNDATA4		ALIGN 4
+#define ALIGNDATA2		ALIGN 2
+#define FILE(s)
+#define STRING(s)	db s
+#define D_LONG		dd
+#define D_WORD		dw
+#define D_BYTE		db
+/* #define SPACE */
+/* #define COMM */
+#if defined(__WATCOMC__)
+SECTION _TEXT public align=16 class=CODE use32 flat
+SECTION _DATA public align=16 class=DATA use32 flat
+#define SEG_TEXT	SECTION _TEXT
+#define SEG_DATA	SECTION _DATA
+#define SEG_BSS		SECTION .bss
+#else
+#define SEG_DATA	SECTION .data
+#define SEG_TEXT	SECTION .text
+#define SEG_BSS		SECTION .bss
+#endif
+
+#define D_SPACE(n)	db n REP 0
+
+#define AS_BEGIN
+
+/* Jcc's should be handled better than this... */
+#define NEAR		near
+
+#else /* MASM */
+
+#define TBYTE_PTR	tbyte ptr
+#define QWORD_PTR	qword ptr
+#define DWORD_PTR	dword ptr
+#define WORD_PTR	word ptr
+#define BYTE_PTR	byte ptr
+
+#define OFFSET		offset
+
+#define GLOBL			GLOBAL
+#define ALIGNTEXT32		ALIGN 32
+#define ALIGNTEXT16		ALIGN 16
+#define ALIGNTEXT8		ALIGN 8
+#define ALIGNTEXT4		ALIGN 4
+#define ALIGNTEXT2		ALIGN 2
+#define ALIGNTEXT32ifNOP	ALIGN 32
+#define ALIGNTEXT16ifNOP	ALIGN 16
+#define ALIGNTEXT8ifNOP		ALIGN 8
+#define ALIGNTEXT4ifNOP		ALIGN 4
+#define ALIGNDATA32		ALIGN 32
+#define ALIGNDATA16		ALIGN 16
+#define ALIGNDATA8		ALIGN 8
+#define ALIGNDATA4		ALIGN 4
+#define ALIGNDATA2		ALIGN 2
+#define FILE(s)
+#define STRING(s)	db s
+#define D_LONG		dd
+#define D_WORD		dw
+#define D_BYTE		db
+/* #define SPACE */
+/* #define COMM */
+#define SEG_DATA	.DATA
+#define SEG_TEXT	.CODE
+#define SEG_BSS		.DATA
+
+#define D_SPACE(n)	db n REP 0
+
+#define AS_BEGIN
+
+#define NEAR
+
+#endif
+
+#if defined(Lynx) || (defined(SYSV) || defined(SVR4)) \
+ || (defined(__linux__) || defined(__OS2ELF__)) && defined(__ELF__) \
+ || defined(__FreeBSD__) && __FreeBSD__ >= 3
+#define GLNAME(a)	a
+#else
+#define GLNAME(a)	CONCAT(_, a)
+#endif
+
+/*
+ *	Addressing Modes
+ */
+
+/* Immediate Mode */
+#define P_ADDR(a)		OFFSET a
+#define X_ADDR(a)		OFFSET a
+#define D_ADDR(a)		OFFSET a
+#define L_ADDR(a)		OFFSET a
+#define W_ADDR(a)		OFFSET a
+#define B_ADDR(a)		OFFSET a
+
+#define P_CONST(a)		a
+#define X_CONST(a)		a
+#define D_CONST(a)		a
+#define L_CONST(a)		a
+#define W_CONST(a)		a
+#define B_CONST(a)		a
+
+/* Indirect Mode */
+#ifdef NASM_ASSEMBLER
+#define P_CONTENT(a)		[a]
+#define X_CONTENT(a)		TBYTE_PTR [a]
+#define D_CONTENT(a)		QWORD_PTR [a]
+#define L_CONTENT(a)		DWORD_PTR [a]
+#define W_CONTENT(a)		WORD_PTR [a]
+#define B_CONTENT(a)		BYTE_PTR [a]
+#else
+#define P_CONTENT(a)		a
+#define X_CONTENT(a)		TBYTE_PTR a
+#define D_CONTENT(a)		QWORD_PTR a
+#define L_CONTENT(a)		DWORD_PTR a
+#define W_CONTENT(a)		WORD_PTR a
+#define B_CONTENT(a)		BYTE_PTR a
+#endif
+
+/* Register a indirect */
+#define P_REGIND(a)		[a]
+#define X_REGIND(a)		TBYTE_PTR [a]
+#define D_REGIND(a)		QWORD_PTR [a]
+#define L_REGIND(a)		DWORD_PTR [a]
+#define W_REGIND(a)		WORD_PTR [a]
+#define B_REGIND(a)		BYTE_PTR [a]
+
+/* Register b indirect plus displacement a */
+#define P_REGOFF(a, b)		[b + a]
+#define X_REGOFF(a, b)		TBYTE_PTR [b + a]
+#define D_REGOFF(a, b)		QWORD_PTR [b + a]
+#define L_REGOFF(a, b)		DWORD_PTR [b + a]
+#define W_REGOFF(a, b)		WORD_PTR [b + a]
+#define B_REGOFF(a, b)		BYTE_PTR [b + a]
+
+/* Reg indirect Base + Index + Displacement  - this is mainly for 16-bit mode
+ * which has no scaling
+ */
+#define P_REGBID(b, i, d)	[b + i + d]
+#define X_REGBID(b, i, d)	TBYTE_PTR [b + i + d]
+#define D_REGBID(b, i, d)	QWORD_PTR [b + i + d]
+#define L_REGBID(b, i, d)	DWORD_PTR [b + i + d]
+#define W_REGBID(b, i, d)	WORD_PTR [b + i + d]
+#define B_REGBID(b, i, d)	BYTE_PTR [b + i + d]
+
+/* Reg indirect Base + (Index * Scale) */
+#define P_REGBIS(b, i, s)	[b + i * s]
+#define X_REGBIS(b, i, s)	TBYTE_PTR [b + i * s]
+#define D_REGBIS(b, i, s)	QWORD_PTR [b + i * s]
+#define L_REGBIS(b, i, s)	DWORD_PTR [b + i * s]
+#define W_REGBIS(b, i, s)	WORD_PTR [b + i * s]
+#define B_REGBIS(b, i, s)	BYTE_PTR [b + i * s]
+
+/* Reg indirect Base + (Index * Scale) + Displacement */
+#define P_REGBISD(b, i, s, d)	[b + i * s + d]
+#define X_REGBISD(b, i, s, d)	TBYTE_PTR [b + i * s + d]
+#define D_REGBISD(b, i, s, d)	QWORD_PTR [b + i * s + d]
+#define L_REGBISD(b, i, s, d)	DWORD_PTR [b + i * s + d]
+#define W_REGBISD(b, i, s, d)	WORD_PTR [b + i * s + d]
+#define B_REGBISD(b, i, s, d)	BYTE_PTR [b + i * s + d]
+
+/* Displaced Scaled Index: */
+#define P_REGDIS(d, i, s)	[i * s + d]
+#define X_REGDIS(d, i, s)	TBYTE_PTR [i * s + d]
+#define D_REGDIS(d, i, s)	QWORD_PTR [i * s + d]
+#define L_REGDIS(d, i, s)	DWORD_PTR [i * s + d]
+#define W_REGDIS(d, i, s)	WORD_PTR [i * s + d]
+#define B_REGDIS(d, i, s)	BYTE_PTR [i * s + d]
+
+/* Indexed Base: */
+#define P_REGBI(b, i)		[b + i]
+#define X_REGBI(b, i)		TBYTE_PTR [b + i]
+#define D_REGBI(b, i)		QWORD_PTR [b + i]
+#define L_REGBI(b, i)		DWORD_PTR [b + i]
+#define W_REGBI(b, i)		WORD_PTR [b + i]
+#define B_REGBI(b, i)		BYTE_PTR [b + i]
+
+/* Displaced Base: */
+#define P_REGDB(d, b)		[b + d]
+#define X_REGDB(d, b)		TBYTE_PTR [b + d]
+#define D_REGDB(d, b)		QWORD_PTR [b + d]
+#define L_REGDB(d, b)		DWORD_PTR [b + d]
+#define W_REGDB(d, b)		WORD_PTR [b + d]
+#define B_REGDB(d, b)		BYTE_PTR [b + d]
+
+/* Variable indirect: */
+#define VARINDIRECT(var)	[var]
+
+/* Use register contents as jump/call target: */
+#define CODEPTR(reg)		P_(reg)
+
+/*
+ * Redefine assembler commands
+ */
+
+#define P_(a)			P_ ## a
+#define X_(a)			X_ ## a
+#define D_(a)			D_ ## a
+#define SR_(a)			W_ ## a
+#define S_(a)			L_ ## a
+#define L_(a)			L_ ## a
+#define W_(a)			W_ ## a
+#define B_(a)			B_ ## a
+
+#define AAA			aaa
+#define AAD			aad
+#define AAM			aam
+#define AAS			aas
+#define ADC_L(a, b)		adc L_(b), L_(a)
+#define ADC_W(a, b)		adc W_(b), W_(a)
+#define ADC_B(a, b)		adc B_(b), B_(a)
+#define ADD_L(a, b)		add L_(b), L_(a)
+#define ADD_W(a, b)		add W_(b), W_(a)
+#define ADD_B(a, b)		add B_(b), B_(a)
+#define AND_L(a, b)		and L_(b), L_(a)
+#define AND_W(a, b)		and W_(b), W_(a)
+#define AND_B(a, b)		and B_(b), B_(a)
+#define ARPL(a,b)		arpl W_(b), a
+#define BOUND_L(a, b)		bound L_(b), L_(a)
+#define BOUND_W(a, b)		bound W_(b), W_(a)
+#define BSF_L(a, b)		bsf L_(b), L_(a)
+#define BSF_W(a, b)		bsf W_(b), W_(a)
+#define BSR_L(a, b)		bsr L_(b), L_(a)
+#define BSR_W(a, b)		bsr W_(b), W_(a)
+#define BT_L(a, b)		bt L_(b), L_(a)
+#define BT_W(a, b)		bt W_(b), W_(a)
+#define BTC_L(a, b)		btc L_(b), L_(a)
+#define BTC_W(a, b)		btc W_(b), W_(a)
+#define BTR_L(a, b)		btr L_(b), L_(a)
+#define BTR_W(a, b)		btr W_(b), W_(a)
+#define BTS_L(a, b)		bts L_(b), L_(a)
+#define BTS_W(a, b)		bts W_(b), W_(a)
+#define CALL(a)			call a
+#define CALLF(s,a)		call far s:a
+#define CBW			cbw
+#define CWDE			cwde
+#define CLC			clc
+#define CLD			cld
+#define CLI			cli
+#define CLTS			clts
+#define CMC			cmc
+#define CMP_L(a, b)		cmp L_(b), L_(a)
+#define CMP_W(a, b)		cmp W_(b), W_(a)
+#define CMP_B(a, b)		cmp B_(b), B_(a)
+#define CMPS_L			cmpsd
+#define CMPS_W			cmpsw
+#define CMPS_B			cmpsb
+#define CPUID			cpuid
+#define CWD			cwd
+#define CDQ			cdq
+#define DAA			daa
+#define DAS			das
+#define DEC_L(a)		dec L_(a)
+#define DEC_W(a)		dec W_(a)
+#define DEC_B(a)		dec B_(a)
+#define DIV_L(a)		div L_(a)
+#define DIV_W(a)		div W_(a)
+#define DIV_B(a)		div B_(a)
+#define ENTER(a,b)		enter b, a
+#define HLT			hlt
+#define IDIV_L(a)		idiv L_(a)
+#define IDIV_W(a)		idiv W_(a)
+#define IDIV_B(a)		idiv B_(a)
+#define IMUL_L(a, b)		imul L_(b), L_(a)
+#define IMUL_W(a, b)		imul W_(b), W_(a)
+#define IMUL_B(a)		imul B_(a)
+#define IN_L			in EAX, DX
+#define IN_W			in AX, DX
+#define IN_B			in AL, DX
+#define IN1_L(a)		in1 L_(a)
+#define IN1_W(a)		in1 W_(a)
+#define IN1_B(a)		in1 B_(a)
+#define INC_L(a)		inc L_(a)
+#define INC_W(a)		inc W_(a)
+#define INC_B(a)		inc B_(a)
+#define INS_L			ins
+#define INS_W			ins
+#define INS_B			ins
+#define INT(a)			int B_(a)
+#define INT3			int3
+#define INTO			into
+#define IRET			iret
+#define IRETD			iretd
+#define JA(a)			ja NEAR a
+#define JAE(a)			jae NEAR a
+#define JB(a)			jb NEAR a
+#define JBE(a)			jbe NEAR a
+#define JC(a)			jc NEAR a
+#define JE(a)			je NEAR a
+#define JG(a)			jg NEAR a
+#define JGE(a)			jge NEAR a
+#define JL(a)			jl NEAR a
+#define JLE(a)			jle NEAR a
+#define JNA(a)			jna NEAR a
+#define JNAE(a)			jnae NEAR a
+#define JNB(a)			jnb NEAR a
+#define JNBE(a)			jnbe NEAR a
+#define JNC(a)			jnc NEAR a
+#define JNE(a)			jne NEAR a
+#define JNG(a)			jng NEAR a
+#define JNGE(a)			jnge NEAR a
+#define JNL(a)			jnl NEAR a
+#define JNLE(a)			jnle NEAR a
+#define JNO(a)			jno NEAR a
+#define JNP(a)			jnp NEAR a
+#define JNS(a)			jns NEAR a
+#define JNZ(a)			jnz NEAR a
+#define JO(a)			jo NEAR a
+#define JP(a)			jp NEAR a
+#define JPE(a)			jpe NEAR a
+#define JPO(a)			jpo NEAR a
+#define JS(a)			js NEAR a
+#define JZ(a)			jz NEAR a
+#define JMP(a)			jmp a
+#define JMPF(s,a)		jmp far s:a
+#define LAHF			lahf
+#define LAR(a, b)		lar b, a
+#define LEA_L(a, b)		lea P_(b), P_(a)
+#define LEA_W(a, b)		lea P_(b), P_(a)
+#define LEAVE			leave
+#define LGDT(a)			lgdt a
+#define LIDT(a)			lidt a
+#define LDS(a, b)		lds b, a
+#define LES(a, b)		les b, a
+#define LFS(a, b)		lfs b, a
+#define LGS(a, b)		lgs b, a
+#define LSS(a, b)		lss b, a
+#define LLDT(a)			lldt a
+#define LMSW(a)			lmsw a
+#define LOCK			lock
+#define LODS_L			lodsd
+#define LODS_W			lodsw
+#define LODS_B			lodsb
+#define LOOP(a)			loop a
+#define LOOPE(a)		loope a
+#define LOOPZ(a)		loopz a
+#define LOOPNE(a)		loopne a
+#define LOOPNZ(a)		loopnz a
+#define LSL(a, b)		lsl b, a
+#define LTR(a)			ltr a
+#define MOV_SR(a, b)		mov SR_(b), SR_(a)
+#define MOV_L(a, b)		mov L_(b), L_(a)
+#define MOV_W(a, b)		mov W_(b), W_(a)
+#define MOV_B(a, b)		mov B_(b), B_(a)
+#define MOVS_L			movsd
+#define MOVS_W			movsw
+#define MOVS_B			movsb
+#define MOVSX_BL(a, b)		movsx B_(b), B_(a)
+#define MOVSX_BW(a, b)		movsx B_(b), B_(a)
+#define MOVSX_WL(a, b)		movsx W_(b), W_(a)
+#define MOVZX_BL(a, b)		movzx B_(b), B_(a)
+#define MOVZX_BW(a, b)		movzx B_(b), B_(a)
+#define MOVZX_WL(a, b)		movzx W_(b), W_(a)
+#define MUL_L(a)		mul L_(a)
+#define MUL_W(a)		mul W_(a)
+#define MUL_B(a)		mul B_(a)
+#define NEG_L(a)		neg L_(a)
+#define NEG_W(a)		neg W_(a)
+#define NEG_B(a)		neg B_(a)
+#define NOP			nop
+#define NOT_L(a)		not L_(a)
+#define NOT_W(a)		not W_(a)
+#define NOT_B(a)		not B_(a)
+#define OR_L(a,b)		or L_(b), L_(a)
+#define OR_W(a,b)		or W_(b), W_(a)
+#define OR_B(a,b)		or B_(b), B_(a)
+#define OUT_L			out DX, EAX
+#define OUT_W			out DX, AX
+#define OUT_B			out DX, AL
+#define OUT1_L(a)		out1 L_(a)
+#define OUT1_W(a)		out1 W_(a)
+#define OUT1_B(a)		out1 B_(a)
+#define OUTS_L			outsd
+#define OUTS_W			outsw
+#define OUTS_B			outsb
+#define POP_SR(a)		pop SR_(a)
+#define POP_L(a)		pop L_(a)
+#define POP_W(a)		pop W_(a)
+#define POPA_L			popad
+#define POPA_W			popa
+#define POPF_L			popfd
+#define POPF_W			popf
+#define PUSH_SR(a)		push SR_(a)
+#define PUSH_L(a)		push L_(a)
+#define PUSH_W(a)		push W_(a)
+#define PUSH_B(a)		push B_(a)
+#define PUSHA_L			pushad
+#define PUSHA_W			pusha
+#define PUSHF_L			pushfd
+#define PUSHF_W			pushf
+#define RCL_L(a, b)		rcl L_(b), L_(a)
+#define RCL_W(a, b)		rcl W_(b), W_(a)
+#define RCL_B(a, b)		rcl B_(b), B_(a)
+#define RCR_L(a, b)		rcr L_(b), L_(a)
+#define RCR_W(a, b)		rcr W_(b), W_(a)
+#define RCR_B(a, b)		rcr B_(b), B_(a)
+#define RDTSC			rdtsc
+#define ROL_L(a, b)		rol L_(b), L_(a)
+#define ROL_W(a, b)		rol W_(b), W_(a)
+#define ROL_B(a, b)		rol B_(b), B_(a)
+#define ROR_L(a, b)		ror L_(b), L_(a)
+#define ROR_W(a, b)		ror W_(b), W_(a)
+#define ROR_B(a, b)		ror B_(b), B_(a)
+#define REP			rep
+#define REPE			repe
+#define REPNE			repne
+#define REPNZ			REPNE
+#define REPZ			REPE
+#define RET			ret
+#define SAHF			sahf
+#define SAL_L(a, b)		sal L_(b), L_(a)
+#define SAL_W(a, b)		sal W_(b), W_(a)
+#define SAL_B(a, b)		sal B_(b), B_(a)
+#define SAR_L(a, b)		sar L_(b), L_(a)
+#define SAR_W(a, b)		sar W_(b), W_(a)
+#define SAR_B(a, b)		sar B_(b), B_(a)
+#define SBB_L(a, b)		sbb L_(b), L_(a)
+#define SBB_W(a, b)		sbb W_(b), W_(a)
+#define SBB_B(a, b)		sbb B_(b), B_(a)
+#define SCAS_L			scas
+#define SCAS_W			scas
+#define SCAS_B			scas
+#define SETA(a)			seta a
+#define SETAE(a)		setae a
+#define SETB(a)			setb a
+#define SETBE(a)		setbe a
+#define SETC(a)			setc a
+#define SETE(a)			sete a
+#define SETG(a)			setg a
+#define SETGE(a)		setge a
+#define SETL(a)			setl a
+#define SETLE(a)		setle a
+#define SETNA(a)		setna a
+#define SETNAE(a)		setnae a
+#define SETNB(a)		setnb a
+#define SETNBE(a)		setnbe a
+#define SETNC(a)		setnc a
+#define SETNE(a)		setne a
+#define SETNG(a)		setng a
+#define SETNGE(a)		setnge a
+#define SETNL(a)		setnl a
+#define SETNLE(a)		setnle a
+#define SETNO(a)		setno a
+#define SETNP(a)		setnp a
+#define SETNS(a)		setns a
+#define SETNZ(a)		setnz a
+#define SETO(a)			seto a
+#define SETP(a)			setp a
+#define SETPE(a)		setpe a
+#define SETPO(a)		setpo a
+#define SETS(a)			sets a
+#define SETZ(a)			setz a
+#define SGDT(a)			sgdt a
+#define SIDT(a)			sidt a
+#define SHL_L(a, b)		shl L_(b), B_(a)
+#define SHL_W(a, b)		shl W_(b), B_(a)
+#define SHL_B(a, b)		shl B_(b), B_(a)
+#define SHLD_L(a,b,c)		shld
+#define SHLD2_L(a,b)		shld L_(b), L_(a)
+#define SHLD_W(a,b,c)		shld
+#define SHLD2_W(a,b)		shld W_(b), W_(a)
+#define SHR_L(a, b)		shr L_(b), B_(a)
+#define SHR_W(a, b)		shr W_(b), B_(a)
+#define SHR_B(a, b)		shr B_(b), B_(a)
+#define SHRD_L(a,b,c)		shrd
+#define SHRD2_L(a,b)		shrd L_(b), L_(a)
+#define SHRD_W(a,b,c)		shrd
+#define SHRD2_W(a,b)		shrd W_(b), W_(a)
+#define SLDT(a)			sldt a
+#define SMSW(a)			smsw a
+#define STC			stc
+#define STD			std
+#define STI			sti
+#define STOS_L			stosd
+#define STOS_W			stosw
+#define STOS_B			stosb
+#define STR(a)			str a
+#define SUB_L(a, b)		sub L_(b), L_(a)
+#define SUB_W(a, b)		sub W_(b), W_(a)
+#define SUB_B(a, b)		sub B_(b), B_(a)
+#define TEST_L(a, b)		test L_(b), L_(a)
+#define TEST_W(a, b)		test W_(b), W_(a)
+#define TEST_B(a, b)		test B_(b), B_(a)
+#define VERR(a)			verr a
+#define VERW(a)			verw a
+#define WAIT			wait
+#define XCHG_L(a, b)		xchg L_(b), L_(a)
+#define XCHG_W(a, b)		xchg W_(b), W_(a)
+#define XCHG_B(a, b)		xchg B_(b), B_(a)
+#define XLAT			xlat
+#define XOR_L(a, b)		xor L_(b), L_(a)
+#define XOR_W(a, b)		xor W_(b), W_(a)
+#define XOR_B(a, b)		xor B_(b), B_(a)
+
+
+/* Floating Point Instructions */
+#define F2XM1			f2xm1
+#define FABS			fabs
+#define FADD_D(a)		fadd D_(a)
+#define FADD_S(a)		fadd S_(a)
+#define FADD2(a, b)		fadd b, a
+#define FADDP(a, b)		faddp b, a
+#define FIADD_L(a)		fiadd L_(a)
+#define FIADD_W(a)		fiadd W_(a)
+#define FBLD(a)			fbld a
+#define FBSTP(a)		fbstp a
+#define FCHS			fchs
+#define FCLEX			fclex
+#define FNCLEX			fnclex
+#define FCOM(a)			fcom a
+#define FCOM_D(a)		fcom D_(a)
+#define FCOM_S(a)		fcom S_(a)
+#define FCOMP(a)		fcomp a
+#define FCOMP_D(a)		fcomp D_(a)
+#define FCOMP_S(a)		fcomp S_(a)
+#define FCOMPP			fcompp
+#define FCOS			fcos
+#define FDECSTP			fdecstp
+#define FDIV_D(a)		fdiv D_(a)
+#define FDIV_S(a)		fdiv S_(a)
+#define FDIV2(a, b)		fdiv b, a
+#define FDIVP(a, b)		fdivp b, a
+#define FIDIV_L(a)		fidiv L_(a)
+#define FIDIV_W(a)		fidiv W_(a)
+#define FDIVR_D(a)		fdivr D_(a)
+#define FDIVR_S(a)		fdivr S_(a)
+#define FDIVR2(a, b)		fdivr b, a
+#define FDIVRP(a, b)		fdivrp b, a
+#define FIDIVR_L(a)		fidivr L_(a)
+#define FIDIVR_W(a)		fidivr W_(a)
+#define FFREE(a)		ffree a
+#define FICOM_L(a)		ficom L_(a)
+#define FICOM_W(a)		ficom W_(a)
+#define FICOMP_L(a)		ficomp L_(a)
+#define FICOMP_W(a)		ficomp W_(a)
+#define FILD_Q(a)		fild D_(a)
+#define FILD_L(a)		fild L_(a)
+#define FILD_W(a)		fild W_(a)
+#define FINCSTP			fincstp
+#define FINIT			finit
+#define FNINIT			fninit
+#define FIST_L(a)		fist L_(a)
+#define FIST_W(a)		fist W_(a)
+#define FISTP_Q(a)		fistp D_(a)
+#define FISTP_L(a)		fistp L_(a)
+#define FISTP_W(a)		fistp W_(a)
+#define FLD_X(a)		fld X_(a)
+#define FLD_D(a)		fld D_(a)
+#define FLD_S(a)		fld S_(a)
+#define FLD1			fld1
+#define FLDL2T			fldl2t
+#define FLDL2E			fldl2e
+#define FLDPI			fldpi
+#define FLDLG2			fldlg2
+#define FLDLN2			fldln2
+#define FLDZ			fldz
+#define FLDCW(a)		fldcw a
+#define FLDENV(a)		fldenv a
+#define FMUL_S(a)		fmul S_(a)
+#define FMUL_D(a)		fmul D_(a)
+#define FMUL2(a, b)		fmul b, a
+#define FMULP(a, b)		fmulp b, a
+#define FIMUL_L(a)		fimul L_(a)
+#define FIMUL_W(a)		fimul W_(a)
+#define FNOP			fnop
+#define FPATAN			fpatan
+#define FPREM			fprem
+#define FPREM1			fprem1
+#define FPTAN			fptan
+#define FRNDINT			frndint
+#define FRSTOR(a)		frstor a
+#define FSAVE(a)		fsave a
+#define FNSAVE(a)		fnsave a
+#define FSCALE			fscale
+#define FSIN			fsin
+#define FSINCOS			fsincos
+#define FSQRT			fsqrt
+#define FST_D(a)		fst D_(a)
+#define FST_S(a)		fst S_(a)
+#define FSTP_X(a)		fstp X_(a)
+#define FSTP_D(a)		fstp D_(a)
+#define FSTP_S(a)		fstp S_(a)
+#define FSTP(a)			fstp a
+#define FSTCW(a)		fstcw a
+#define FNSTCW(a)		fnstcw a
+#define FSTENV(a)		fstenv a
+#define FNSTENV(a)		fnstenv a
+#define FSTSW(a)		fstsw a
+#define FNSTSW(a)		fnstsw a
+#define FSUB_S(a)		fsub S_(a)
+#define FSUB_D(a)		fsub D_(a)
+#define FSUB2(a, b)		fsub b, a
+#define FSUBP(a, b)		fsubp b, a
+#define FISUB_L(a)		fisub L_(a)
+#define FISUB_W(a)		fisub W_(a)
+#define FSUBR_S(a)		fsubr S_(a)
+#define FSUBR_D(a)		fsubr D_(a)
+#define FSUBR2(a, b)		fsubr b, a
+#define FSUBRP(a, b)		fsubrp b, a
+#define FISUBR_L(a)		fisubr L_(a)
+#define FISUBR_W(a)		fisubr W_(a)
+#define FTST			ftst
+#define FUCOM(a)		fucom a
+#define FUCOMP(a)		fucomp a
+#define FUCOMPP			fucompp
+#define FWAIT			fwait
+#define FXAM			fxam
+#define FXCH(a)			fxch a
+#define FXTRACT			fxtract
+#define FYL2X			fyl2x
+#define FYL2XP1			fyl2xp1
+
+#endif /* NASM_ASSEMBLER, MASM_ASSEMBLER */
+
+	/****************************************/
+	/*					*/
+	/*	Extensions to x86 insn set -	*/
+	/*	MMX, 3DNow!			*/
+	/*					*/
+	/****************************************/
+
+#if defined(NASM_ASSEMBLER) || defined(MASM_ASSEMBLER)
+#define P_ARG1(a)		P_ ## a
+#define P_ARG2(a, b)		P_ ## b, P_ ## a
+#define P_ARG3(a, b, c)		P_ ## c, P_ ## b, P_ ## a
+#else
+#define P_ARG1(a)		a
+#define P_ARG2(a, b)		a, b
+#define P_ARG3(a, b, c)		a, b, c
+#endif
+
+/* MMX */
+#define MOVD(a, b)		movd P_ARG2(a, b)
+#define MOVQ(a, b)		movq P_ARG2(a, b)
+
+#define PADDB(a, b)		paddb P_ARG2(a, b)
+#define PADDW(a, b)		paddw P_ARG2(a, b)
+#define PADDD(a, b)		paddd P_ARG2(a, b)
+
+#define PADDSB(a, b)		paddsb P_ARG2(a, b)
+#define PADDSW(a, b)		paddsw P_ARG2(a, b)
+
+#define PADDUSB(a, b)		paddusb P_ARG2(a, b)
+#define PADDUSW(a, b)		paddusw P_ARG2(a, b)
+
+#define PSUBB(a, b)		psubb P_ARG2(a, b)
+#define PSUBW(a, b)		psubw P_ARG2(a, b)
+#define PSUBD(a, b)		psubd P_ARG2(a, b)
+
+#define PSUBSB(a, b)		psubsb P_ARG2(a, b)
+#define PSUBSW(a, b)		psubsw P_ARG2(a, b)
+
+#define PSUBUSB(a, b)		psubusb P_ARG2(a, b)
+#define PSUBUSW(a, b)		psubusw P_ARG2(a, b)
+
+#define PCMPEQB(a, b)		pcmpeqb P_ARG2(a, b)
+#define PCMPEQW(a, b)		pcmpeqw P_ARG2(a, b)
+#define PCMPEQD(a, b)		pcmpeqd P_ARG2(a, b)
+
+#define PCMPGTB(a, b)		pcmpgtb P_ARG2(a, b)
+#define PCMPGTW(a, b)		pcmpgtw P_ARG2(a, b)
+#define PCMPGTD(a, b)		pcmpgtd P_ARG2(a, b)
+
+#define PMULHW(a, b)		pmulhw P_ARG2(a, b)
+#define PMULLW(a, b)		pmullw P_ARG2(a, b)
+
+#define PMADDWD(a, b)		pmaddwd P_ARG2(a, b)
+
+#define PAND(a, b)		pand P_ARG2(a, b)
+
+#define PANDN(a, b)		pandn P_ARG2(a, b)
+
+#define POR(a, b)		por P_ARG2(a, b)
+
+#define PXOR(a, b)		pxor P_ARG2(a, b)
+
+#define PSRAW(a, b)		psraw P_ARG2(a, b)
+#define PSRAD(a, b)		psrad P_ARG2(a, b)
+
+#define PSRLW(a, b)		psrlw P_ARG2(a, b)
+#define PSRLD(a, b)		psrld P_ARG2(a, b)
+#define PSRLQ(a, b)		psrlq P_ARG2(a, b)
+
+#define PSLLW(a, b)		psllw P_ARG2(a, b)
+#define PSLLD(a, b)		pslld P_ARG2(a, b)
+#define PSLLQ(a, b)		psllq P_ARG2(a, b)
+
+#define PACKSSWB(a, b)		packsswb P_ARG2(a, b)
+#define PACKSSDW(a, b)		packssdw P_ARG2(a, b)
+#define PACKUSWB(a, b)		packuswb P_ARG2(a, b)
+
+#define PUNPCKHBW(a, b)		punpckhbw P_ARG2(a, b)
+#define PUNPCKHWD(a, b)		punpckhwd P_ARG2(a, b)
+#define PUNPCKHDQ(a, b)		punpckhdq P_ARG2(a, b)
+#define PUNPCKLBW(a, b)		punpcklbw P_ARG2(a, b)
+#define PUNPCKLWD(a, b)		punpcklwd P_ARG2(a, b)
+#define PUNPCKLDQ(a, b)		punpckldq P_ARG2(a, b)
+
+#define EMMS			emms
+
+/* AMD 3DNow! */
+#define PAVGUSB(a, b)		pavgusb P_ARG2(a, b)
+#define PFADD(a, b)		pfadd P_ARG2(a, b)
+#define PFSUB(a, b)		pfsub P_ARG2(a, b)
+#define PFSUBR(a, b)		pfsubr P_ARG2(a, b)
+#define PFACC(a, b)		pfacc P_ARG2(a, b)
+#define PFCMPGE(a, b)		pfcmpge P_ARG2(a, b)
+#define PFCMPGT(a, b)		pfcmpgt P_ARG2(a, b)
+#define PFCMPEQ(a, b)		pfcmpeq P_ARG2(a, b)
+#define PFMIN(a, b)		pfmin P_ARG2(a, b)
+#define PFMAX(a, b)		pfmax P_ARG2(a, b)
+#define PI2FD(a, b)		pi2fd P_ARG2(a, b)
+#define PF2ID(a, b)		pf2id P_ARG2(a, b)
+#define PFRCP(a, b)		pfrcp P_ARG2(a, b)
+#define PFRSQRT(a, b)		pfrsqrt P_ARG2(a, b)
+#define PFMUL(a, b)		pfmul P_ARG2(a, b)
+#define PFRCPIT1(a, b)		pfrcpit1 P_ARG2(a, b)
+#define PFRSQIT1(a, b)		pfrsqit1 P_ARG2(a, b)
+#define PFRCPIT2(a, b)		pfrcpit2 P_ARG2(a, b)
+#define PMULHRW(a, b)		pmulhrw P_ARG2(a, b)
+
+#define FEMMS			femms
+#define PREFETCH(a)		prefetch P_ARG1(a)
+#define PREFETCHW(a)		prefetchw P_ARG1(a)
+
+/* Intel SSE */
+#define ADDPS(a, b)		addps P_ARG2(a, b)
+#define ADDSS(a, b)		addss P_ARG2(a, b)
+#define ANDNPS(a, b)		andnps P_ARG2(a, b)
+#define ANDPS(a, b)		andps P_ARG2(a, b)
+/* NASM only knows the pseudo ops for these.
+#define CMPPS(a, b, c)		cmpps P_ARG3(a, b, c)
+#define CMPSS(a, b, c)		cmpss P_ARG3(a, b, c)
+*/
+#define CMPEQPS(a, b)		cmpeqps P_ARG2(a, b)
+#define CMPLTPS(a, b)		cmpltps P_ARG2(a, b)
+#define CMPLEPS(a, b)		cmpleps P_ARG2(a, b)
+#define CMPUNORDPS(a, b)	cmpunordps P_ARG2(a, b)
+#define CMPNEQPS(a, b)		cmpneqps P_ARG2(a, b)
+#define CMPNLTPS(a, b)		cmpnltps P_ARG2(a, b)
+#define CMPNLEPS(a, b)		cmpnleps P_ARG2(a, b)
+#define CMPORDPS(a, b)		cmpordps P_ARG2(a, b)
+#define CMPEQSS(a, b)		cmpeqss P_ARG2(a, b)
+#define CMPLTSS(a, b)		cmpltss P_ARG2(a, b)
+#define CMPLESS(a, b)		cmpless P_ARG2(a, b)
+#define CMPUNORDSS(a, b)	cmpunordss P_ARG2(a, b)
+#define CMPNEQSS(a, b)		cmpneqss P_ARG2(a, b)
+#define CMPNLTSS(a, b)		cmpnltss P_ARG2(a, b)
+#define CMPNLESS(a, b)		cmpnless P_ARG2(a, b)
+#define CMPORDSS(a, b)		cmpordss P_ARG2(a, b)
+#define COMISS(a, b)		comiss P_ARG2(a, b)
+#define CVTPI2PS(a, b)		cvtpi2ps P_ARG2(a, b)
+#define CVTPS2PI(a, b)		cvtps2pi P_ARG2(a, b)
+#define CVTSI2SS(a, b)		cvtsi2ss P_ARG2(a, b)
+#define CVTSS2SI(a, b)		cvtss2si P_ARG2(a, b)
+#define CVTTPS2PI(a, b)		cvttps2pi P_ARG2(a, b)
+#define CVTTSS2SI(a, b)		cvttss2si P_ARG2(a, b)
+#define DIVPS(a, b)		divps P_ARG2(a, b)
+#define DIVSS(a, b)		divss P_ARG2(a, b)
+#define FXRSTOR(a)		fxrstor P_ARG1(a)
+#define FXSAVE(a)		fxsave P_ARG1(a)
+#define LDMXCSR(a)		ldmxcsr P_ARG1(a)
+#define MAXPS(a, b)		maxps P_ARG2(a, b)
+#define MAXSS(a, b)		maxss P_ARG2(a, b)
+#define MINPS(a, b)		minps P_ARG2(a, b)
+#define MINSS(a, b)		minss P_ARG2(a, b)
+#define MOVAPS(a, b)		movaps P_ARG2(a, b)
+#define MOVHLPS(a, b)		movhlps P_ARG2(a, b)
+#define MOVHPS(a, b)		movhps P_ARG2(a, b)
+#define MOVLHPS(a, b)		movlhps P_ARG2(a, b)
+#define MOVLPS(a, b)		movlps P_ARG2(a, b)
+#define MOVMSKPS(a, b)		movmskps P_ARG2(a, b)
+#define MOVNTPS(a, b)		movntps P_ARG2(a, b)
+#define MOVNTQ(a, b)		movntq P_ARG2(a, b)
+#define MOVSS(a, b)		movss P_ARG2(a, b)
+#define MOVUPS(a, b)		movups P_ARG2(a, b)
+#define MULPS(a, b)		mulps P_ARG2(a, b)
+#define MULSS(a, b)		mulss P_ARG2(a, b)
+#define ORPS(a, b)		orps P_ARG2(a, b)
+#define RCPPS(a, b)		rcpps P_ARG2(a, b)
+#define RCPSS(a, b)		rcpss P_ARG2(a, b)
+#define RSQRTPS(a, b)		rsqrtps P_ARG2(a, b)
+#define RSQRTSS(a, b)		rsqrtss P_ARG2(a, b)
+#define SHUFPS(a, b, c)		shufps P_ARG3(a, b, c)
+#define SQRTPS(a, b)		sqrtps P_ARG2(a, b)
+#define SQRTSS(a, b)		sqrtss P_ARG2(a, b)
+#define STMXCSR(a)		stmxcsr P_ARG1(a)
+#define SUBPS(a, b)		subps P_ARG2(a, b)
+#define UCOMISS(a, b)		ucomiss P_ARG2(a, b)
+#define UNPCKHPS(a, b)		unpckhps P_ARG2(a, b)
+#define UNPCKLPS(a, b)		unpcklps P_ARG2(a, b)
+#define XORPS(a, b)		xorps P_ARG2(a, b)
+
+#define PREFETCHNTA(a)		prefetchnta P_ARG1(a)
+#define PREFETCHT0(a)		prefetcht0 P_ARG1(a)
+#define PREFETCHT1(a)		prefetcht1 P_ARG1(a)
+#define PREFETCHT2(a)		prefetcht2 P_ARG1(a)
+#define SFENCE			sfence
+
+/* Added by BrianP for FreeBSD (per David Dawes) */
+#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER) && !defined(__bsdi__)
+#define LLBL(a)		CONCAT(.L,a)
+#define LLBL2(a,b)	CONCAT3(.L,a,b)
+#else
+#define LLBL(a)		a
+#define LLBL2(a,b)	CONCAT(a,b)
+#endif
+
+/* Segment overrides */
+#define SEGCS		D_BYTE	46
+#define SEGDS		D_BYTE	62
+#define SEGES		D_BYTE	38
+#define SEGFS		D_BYTE	100
+#define SEGGS		D_BYTE	101
+
+/* Temporary labels: valid until next non-local label */
+#ifdef NASM_ASSEMBLER
+#define TLBL(a)		CONCAT(.,a)
+#else
+#define TLBL(a)		CONCAT(a,$)
+#endif
+
+#endif /* __ASSYNTAX_H__ */
diff --git a/reactos/lib/mesa32/src/x86/clip_args.h b/reactos/lib/mesa32/src/x86/clip_args.h
new file mode 100644
index 00000000000..645f5b3ba82
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/clip_args.h
@@ -0,0 +1,60 @@
+/* $Id: clip_args.h,v 1.1 2004/07/16 22:12:42 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * Clip test function interface for assembly code.  Simply define
+ * FRAME_OFFSET to the number of bytes pushed onto the stack before
+ * using the ARG_* argument macros.
+ *
+ * Gareth Hughes
+ */
+
+#ifndef __CLIP_ARGS_H__
+#define __CLIP_ARGS_H__
+
+/*
+ * Offsets for clip_func arguments
+ *
+ * typedef GLvector4f *(*clip_func)( GLvector4f *clip_vec,
+ *	                             GLvector4f *proj_vec,
+ *	                             GLubyte clipMask[],
+ *	                             GLubyte *orMask,
+ *	                             GLubyte *andMask );
+ */
+
+#define OFFSET_SOURCE	4
+#define OFFSET_DEST	8
+#define OFFSET_CLIP	12
+#define OFFSET_OR	16
+#define OFFSET_AND	20
+
+#define ARG_SOURCE	REGOFF(FRAME_OFFSET+OFFSET_SOURCE, ESP)
+#define ARG_DEST	REGOFF(FRAME_OFFSET+OFFSET_DEST, ESP)
+#define ARG_CLIP	REGOFF(FRAME_OFFSET+OFFSET_CLIP, ESP)
+#define ARG_OR		REGOFF(FRAME_OFFSET+OFFSET_OR, ESP)
+#define ARG_AND		REGOFF(FRAME_OFFSET+OFFSET_AND, ESP)
+
+#endif
diff --git a/reactos/lib/mesa32/src/x86/common_x86.c b/reactos/lib/mesa32/src/x86/common_x86.c
new file mode 100644
index 00000000000..a8daada8496
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/common_x86.c
@@ -0,0 +1,366 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0.1
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * Check CPU capabilities & initialize optimized funtions for this particular
+ * processor.
+ *
+ * Written by Holger Waechtler <holger@akaflieg.extern.tu-berlin.de>
+ * Changed by Andre Werthmann <wertmann@cs.uni-potsdam.de> for using the
+ * new Katmai functions.
+ */
+
+/* XXX these includes should probably go into imports.h or glheader.h */
+#if defined(USE_SSE_ASM) && defined(__linux__)
+#include <signal.h>
+#endif
+#if defined(USE_SSE_ASM) && defined(__FreeBSD__)
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#endif
+
+#include "common_x86_asm.h"
+#include "imports.h"
+
+
+int _mesa_x86_cpu_features = 0;
+
+/* No reason for this to be public.
+ */
+extern GLuint	_ASMAPI _mesa_x86_has_cpuid(void);
+extern void	_ASMAPI _mesa_x86_cpuid(GLuint op, GLuint *reg_eax, GLuint *reg_ebx, GLuint *reg_ecx, GLuint *reg_edx);
+extern GLuint	_ASMAPI _mesa_x86_cpuid_eax(GLuint op);
+extern GLuint	_ASMAPI _mesa_x86_cpuid_ebx(GLuint op);
+extern GLuint	_ASMAPI _mesa_x86_cpuid_ecx(GLuint op);
+extern GLuint	_ASMAPI _mesa_x86_cpuid_edx(GLuint op);
+
+static void message( const char *msg )
+{
+   GLboolean debug;
+#ifdef DEBUG
+   debug = GL_TRUE;
+#else
+   if ( _mesa_getenv( "MESA_DEBUG" ) ) {
+      debug = GL_TRUE;
+   } else {
+      debug = GL_FALSE;
+   }
+#endif
+   if ( debug ) {
+      fprintf( stderr, "%s", msg );
+   }
+}
+
+#if defined(USE_SSE_ASM)
+/*
+ * We must verify that the Streaming SIMD Extensions are truly supported
+ * on this processor before we go ahead and hook out the optimized code.
+ * Unfortunately, the CPUID bit isn't enough, as the OS must set the
+ * OSFXSR bit in CR4 if it supports the extended FPU save and restore
+ * required to use SSE.  Unfortunately, we can't just go ahead and read
+ * this register, as only the kernel can do that.  Similarly, we must
+ * verify that the OSXMMEXCPT bit in CR4 has been set by the OS,
+ * signifying that it supports unmasked SIMD FPU exceptions.  If we take
+ * an unmasked exception and the OS doesn't correctly support them, the
+ * best we'll get is a SIGILL and the worst we'll get is an infinite
+ * loop in the signal delivery from the kernel as we can't interact with
+ * the SIMD FPU state to clear the exception bits.  Either way, this is
+ * not good.
+ */
+
+extern void _mesa_test_os_sse_support( void );
+extern void _mesa_test_os_sse_exception_support( void );
+
+#if defined(__linux__) && defined(_POSIX_SOURCE) && defined(X86_FXSR_MAGIC)
+static void sigill_handler( int signal, struct sigcontext sc )
+{
+   message( "SIGILL, " );
+
+   /* Both the "xorps %%xmm0,%%xmm0" and "divps %xmm0,%%xmm1"
+    * instructions are 3 bytes long.  We must increment the instruction
+    * pointer manually to avoid repeated execution of the offending
+    * instruction.
+    *
+    * If the SIGILL is caused by a divide-by-zero when unmasked
+    * exceptions aren't supported, the SIMD FPU status and control
+    * word will be restored at the end of the test, so we don't need
+    * to worry about doing it here.  Besides, we may not be able to...
+    */
+   sc.eip += 3;
+
+   _mesa_x86_cpu_features &= ~(X86_FEATURE_XMM);
+}
+
+static void sigfpe_handler( int signal, struct sigcontext sc )
+{
+   message( "SIGFPE, " );
+
+   if ( sc.fpstate->magic != 0xffff ) {
+      /* Our signal context has the extended FPU state, so reset the
+       * divide-by-zero exception mask and clear the divide-by-zero
+       * exception bit.
+       */
+      sc.fpstate->mxcsr |= 0x00000200;
+      sc.fpstate->mxcsr &= 0xfffffffb;
+   } else {
+      /* If we ever get here, we're completely hosed.
+       */
+      message( "\n\n" );
+      _mesa_problem( NULL, "SSE enabling test failed badly!" );
+   }
+}
+#endif /* __linux__ && _POSIX_SOURCE && X86_FXSR_MAGIC */
+
+/* If we're running on a processor that can do SSE, let's see if we
+ * are allowed to or not.  This will catch 2.4.0 or later kernels that
+ * haven't been configured for a Pentium III but are running on one,
+ * and RedHat patched 2.2 kernels that have broken exception handling
+ * support for user space apps that do SSE.
+ *
+ * GH: Isn't this just awful?
+ */
+static void check_os_sse_support( void )
+{
+#if defined(__linux__)
+#if defined(_POSIX_SOURCE) && defined(X86_FXSR_MAGIC)
+   struct sigaction saved_sigill;
+   struct sigaction saved_sigfpe;
+
+   /* Save the original signal handlers.
+    */
+   sigaction( SIGILL, NULL, &saved_sigill );
+   sigaction( SIGFPE, NULL, &saved_sigfpe );
+
+   signal( SIGILL, (void (*)(int))sigill_handler );
+   signal( SIGFPE, (void (*)(int))sigfpe_handler );
+
+   /* Emulate test for OSFXSR in CR4.  The OS will set this bit if it
+    * supports the extended FPU save and restore required for SSE.  If
+    * we execute an SSE instruction on a PIII and get a SIGILL, the OS
+    * doesn't support Streaming SIMD Exceptions, even if the processor
+    * does.
+    */
+   if ( cpu_has_xmm ) {
+      message( "Testing OS support for SSE... " );
+
+      _mesa_test_os_sse_support();
+
+      if ( cpu_has_xmm ) {
+	 message( "yes.\n" );
+      } else {
+	 message( "no!\n" );
+      }
+   }
+
+   /* Emulate test for OSXMMEXCPT in CR4.  The OS will set this bit if
+    * it supports unmasked SIMD FPU exceptions.  If we unmask the
+    * exceptions, do a SIMD divide-by-zero and get a SIGILL, the OS
+    * doesn't support unmasked SIMD FPU exceptions.  If we get a SIGFPE
+    * as expected, we're okay but we need to clean up after it.
+    *
+    * Are we being too stringent in our requirement that the OS support
+    * unmasked exceptions?  Certain RedHat 2.2 kernels enable SSE by
+    * setting CR4.OSFXSR but don't support unmasked exceptions.  Win98
+    * doesn't even support them.  We at least know the user-space SSE
+    * support is good in kernels that do support unmasked exceptions,
+    * and therefore to be safe I'm going to leave this test in here.
+    */
+   if ( cpu_has_xmm ) {
+      message( "Testing OS support for SSE unmasked exceptions... " );
+
+      _mesa_test_os_sse_exception_support();
+
+      if ( cpu_has_xmm ) {
+	 message( "yes.\n" );
+      } else {
+	 message( "no!\n" );
+      }
+   }
+
+   /* Restore the original signal handlers.
+    */
+   sigaction( SIGILL, &saved_sigill, NULL );
+   sigaction( SIGFPE, &saved_sigfpe, NULL );
+
+   /* If we've gotten to here and the XMM CPUID bit is still set, we're
+    * safe to go ahead and hook out the SSE code throughout Mesa.
+    */
+   if ( cpu_has_xmm ) {
+      message( "Tests of OS support for SSE passed.\n" );
+   } else {
+      message( "Tests of OS support for SSE failed!\n" );
+   }
+#else
+   /* We can't use POSIX signal handling to test the availability of
+    * SSE, so we disable it by default.
+    */
+   message( "Cannot test OS support for SSE, disabling to be safe.\n" );
+   _mesa_x86_cpu_features &= ~(X86_FEATURE_XMM);
+#endif /* _POSIX_SOURCE && X86_FXSR_MAGIC */
+#elif defined(__FreeBSD__)
+   {
+      int ret, len, enabled;
+      len = sizeof(enabled);
+      ret = sysctlbyname("hw.instruction_sse", &enabled, &len, NULL, 0);
+      if (ret || !enabled)
+         _mesa_x86_cpu_features &= ~(X86_FEATURE_XMM);
+   }
+#else
+   /* Do nothing on other platforms for now.
+    */
+   message( "Not testing OS support for SSE, leaving enabled.\n" );
+#endif /* __linux__ */
+}
+
+#endif /* USE_SSE_ASM */
+
+
+void _mesa_init_all_x86_transform_asm( void )
+{
+   (void) message; /* silence warning */
+#ifdef USE_X86_ASM
+   _mesa_x86_cpu_features = 0;
+
+   if (!_mesa_x86_has_cpuid()) {
+       message("CPUID not detected");
+   }
+   else {
+       GLuint cpu_features;
+       GLuint cpu_ext_features;
+       GLuint cpu_ext_info;
+       char cpu_vendor[13];
+       GLuint result;
+
+       /* get vendor name */
+       _mesa_x86_cpuid(0, &result, (GLuint *)(cpu_vendor + 0), (GLuint *)(cpu_vendor + 8), (GLuint *)(cpu_vendor + 4));
+       cpu_vendor[12] = '\0';
+
+       message("cpu vendor: ");
+       message(cpu_vendor);
+       message("\n");
+
+       /* get cpu features */
+       cpu_features = _mesa_x86_cpuid_edx(1);
+
+       if (cpu_features & X86_CPU_FPU)
+	   _mesa_x86_cpu_features |= X86_FEATURE_FPU;
+       if (cpu_features & X86_CPU_CMOV)
+	   _mesa_x86_cpu_features |= X86_FEATURE_CMOV;
+
+#ifdef USE_MMX_ASM
+       if (cpu_features & X86_CPU_MMX)
+	   _mesa_x86_cpu_features |= X86_FEATURE_MMX;
+#endif
+
+#ifdef USE_SSE_ASM
+       if (cpu_features & X86_CPU_XMM)
+	   _mesa_x86_cpu_features |= X86_FEATURE_XMM;
+       if (cpu_features & X86_CPU_XMM2)
+	   _mesa_x86_cpu_features |= X86_FEATURE_XMM2;
+#endif
+
+       /* query extended cpu features */
+       if ((cpu_ext_info = _mesa_x86_cpuid_eax(0x80000000)) > 0x80000000) {
+	   if (cpu_ext_info >= 0x80000001) {
+
+	       cpu_ext_features = _mesa_x86_cpuid_edx(0x80000001);
+
+	       if (cpu_features & X86_CPU_MMX) {
+
+#ifdef USE_3DNOW_ASM
+		   if (cpu_ext_features & X86_CPUEXT_3DNOW)
+		       _mesa_x86_cpu_features |= X86_FEATURE_3DNOW;
+		   if (cpu_ext_features & X86_CPUEXT_3DNOW_EXT)
+		       _mesa_x86_cpu_features |= X86_FEATURE_3DNOWEXT;
+#endif
+
+#ifdef USE_MMX_ASM
+		   if (cpu_ext_features & X86_CPUEXT_MMX_EXT)
+		       _mesa_x86_cpu_features |= X86_FEATURE_MMXEXT;
+#endif
+	       }
+	   }
+
+	   /* query cpu name */
+	   if (cpu_ext_info >= 0x80000002) {
+	       GLuint ofs;
+	       char cpu_name[49];
+	       for (ofs = 0; ofs < 3; ofs++)
+		   _mesa_x86_cpuid(0x80000002+ofs, (GLuint *)(cpu_name + (16*ofs)+0), (GLuint *)(cpu_name + (16*ofs)+4), (GLuint *)(cpu_name + (16*ofs)+8), (GLuint *)(cpu_name + (16*ofs)+12));
+	       cpu_name[48] = '\0'; /* the name should be NULL terminated, but just to be sure */
+
+	       message("cpu name: ");
+	       message(cpu_name);
+	       message("\n");
+	   }
+       }
+
+   }
+   
+   if ( _mesa_getenv( "MESA_NO_ASM" ) ) {
+      _mesa_x86_cpu_features = 0;
+   }
+
+   if ( _mesa_x86_cpu_features ) {
+      _mesa_init_x86_transform_asm();
+   }
+
+#ifdef USE_MMX_ASM
+   if ( cpu_has_mmx ) {
+      if ( _mesa_getenv( "MESA_NO_MMX" ) == 0 ) {
+         message( "MMX cpu detected.\n" );
+      } else {
+         _mesa_x86_cpu_features &= ~(X86_FEATURE_MMX);
+      }
+   }
+#endif
+
+#ifdef USE_3DNOW_ASM
+   if ( cpu_has_3dnow ) {
+      if ( _mesa_getenv( "MESA_NO_3DNOW" ) == 0 ) {
+         message( "3DNow! cpu detected.\n" );
+         _mesa_init_3dnow_transform_asm();
+      } else {
+         _mesa_x86_cpu_features &= ~(X86_FEATURE_3DNOW);
+      }
+   }
+#endif
+
+#ifdef USE_SSE_ASM
+   if ( cpu_has_xmm && _mesa_getenv( "MESA_FORCE_SSE" ) == 0 ) {
+      check_os_sse_support();
+   }
+   if ( cpu_has_xmm ) {
+      if (_mesa_getenv( "MESA_NO_SSE" ) == 0 ) {
+         message( "SSE cpu detected.\n" );
+         _mesa_init_sse_transform_asm();
+      } else {
+          message( "SSE cpu detected, but switched off by user.\n" );
+         _mesa_x86_cpu_features &= ~(X86_FEATURE_XMM);
+      }
+   }
+#endif
+#endif
+}
+
diff --git a/reactos/lib/mesa32/src/x86/common_x86_asm.S b/reactos/lib/mesa32/src/x86/common_x86_asm.S
new file mode 100644
index 00000000000..69103bcfd7a
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/common_x86_asm.S
@@ -0,0 +1,203 @@
+/* $Id: common_x86_asm.S,v 1.1 2004/07/16 22:12:42 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * Check extended CPU capabilities.  Now justs returns the raw CPUID
+ * feature information, allowing the higher level code to interpret the
+ * results.
+ *
+ * Written by Holger Waechtler <holger@akaflieg.extern.tu-berlin.de>
+ *
+ * Cleaned up and simplified by Gareth Hughes <gareth@valinux.com>
+ *
+ */
+
+/*
+ * NOTE: Avoid using spaces in between '(' ')' and arguments, especially
+ * with macros like CONST, LLBL that expand to CONCAT(...).  Putting spaces
+ * in there will break the build on some platforms.
+ */
+
+#include "matypes.h"
+#include "common_x86_features.h"
+
+	SEG_TEXT
+
+ALIGNTEXT4
+GLOBL GLNAME(_mesa_x86_has_cpuid)
+GLNAME(_mesa_x86_has_cpuid):
+
+	/* Test for the CPUID command.  If the ID Flag bit in EFLAGS
+	 * (bit 21) is writable, the CPUID command is present */
+	PUSHF_L
+	POP_L	(EAX)
+	MOV_L	(EAX, ECX)
+	XOR_L	(CONST(0x00200000), EAX)
+	PUSH_L	(EAX)
+	POPF_L
+	PUSHF_L
+	POP_L	(EAX)
+
+	/* Verify the ID Flag bit has been written. */
+	CMP_L	(ECX, EAX)
+	SETNE	(AL)
+	XOR_L	(CONST(0xff), EAX)
+
+	RET
+
+
+ALIGNTEXT4
+GLOBL GLNAME(_mesa_x86_cpuid)
+GLNAME(_mesa_x86_cpuid):
+
+	MOV_L	(REGOFF(4, ESP), EAX)		/* cpuid op */
+	PUSH_L	(EDI)
+	PUSH_L	(EBX)
+
+	CPUID
+
+	MOV_L	(REGOFF(16, ESP), EDI)	/* *eax */
+	MOV_L	(EAX, REGIND(EDI))
+	MOV_L	(REGOFF(20, ESP), EDI)	/* *ebx */
+	MOV_L	(EBX, REGIND(EDI))
+	MOV_L	(REGOFF(24, ESP), EDI)	/* *ecx */
+	MOV_L	(ECX, REGIND(EDI))
+	MOV_L	(REGOFF(28, ESP), EDI)	/* *edx */
+	MOV_L	(EDX, REGIND(EDI))
+
+	POP_L	(EBX)
+	POP_L	(EDI)
+	RET
+
+ALIGNTEXT4
+GLOBL GLNAME(_mesa_x86_cpuid_eax)
+GLNAME(_mesa_x86_cpuid_eax):
+
+	MOV_L	(REGOFF(4, ESP), EAX)		/* cpuid op */
+	PUSH_L	(EBX)
+
+	CPUID
+
+	POP_L	(EBX)
+	RET
+
+ALIGNTEXT4
+GLOBL GLNAME(_mesa_x86_cpuid_ebx)
+GLNAME(_mesa_x86_cpuid_ebx):
+
+	MOV_L	(REGOFF(4, ESP), EAX)		/* cpuid op */
+	PUSH_L	(EBX)
+
+	CPUID
+	MOV_L	(EBX, EAX)			/* return EBX */
+
+	POP_L	(EBX)
+	RET
+
+ALIGNTEXT4
+GLOBL GLNAME(_mesa_x86_cpuid_ecx)
+GLNAME(_mesa_x86_cpuid_ecx):
+
+	MOV_L	(REGOFF(4, ESP), EAX)		/* cpuid op */
+	PUSH_L	(EBX)
+
+	CPUID
+	MOV_L	(ECX, EAX)			/* return ECX */
+
+	POP_L	(EBX)
+	RET
+
+ALIGNTEXT4
+GLOBL GLNAME(_mesa_x86_cpuid_edx)
+GLNAME(_mesa_x86_cpuid_edx):
+
+	MOV_L	(REGOFF(4, ESP), EAX)		/* cpuid op */
+	PUSH_L	(EBX)
+
+	CPUID
+	MOV_L	(EDX, EAX)			/* return EDX */
+
+	POP_L	(EBX)
+	RET
+
+#ifdef USE_SSE_ASM
+/* Execute an SSE instruction to see if the operating system correctly
+ * supports SSE.  A signal handler for SIGILL should have been set
+ * before calling this function, otherwise this could kill the client
+ * application.
+ */
+ALIGNTEXT4
+GLOBL GLNAME( _mesa_test_os_sse_support )
+GLNAME( _mesa_test_os_sse_support ):
+
+	XORPS	( XMM0, XMM0 )
+
+	RET
+
+
+/* Perform an SSE divide-by-zero to see if the operating system
+ * correctly supports unmasked SIMD FPU exceptions.  Signal handlers for
+ * SIGILL and SIGFPE should have been set before calling this function,
+ * otherwise this could kill the client application.
+ */
+ALIGNTEXT4
+GLOBL GLNAME( _mesa_test_os_sse_exception_support )
+GLNAME( _mesa_test_os_sse_exception_support ):
+
+	PUSH_L	( EBP )
+	MOV_L	( ESP, EBP )
+	SUB_L	( CONST( 8 ), ESP )
+
+	/* Save the original MXCSR register value.
+	 */
+	STMXCSR	( REGOFF( -4, EBP ) )
+
+	/* Unmask the divide-by-zero exception and perform one.
+	 */
+	STMXCSR	( REGOFF( -8, EBP ) )
+	AND_L	( CONST( 0xfffffdff ), REGOFF( -8, EBP ) )
+	LDMXCSR	( REGOFF( -8, EBP ) )
+
+	XORPS	( XMM0, XMM0 )
+
+	PUSH_L	( CONST( 0x3f800000 ) )
+	PUSH_L	( CONST( 0x3f800000 ) )
+	PUSH_L	( CONST( 0x3f800000 ) )
+	PUSH_L	( CONST( 0x3f800000 ) )
+
+	MOVUPS	( REGIND( ESP ), XMM1 )
+
+	DIVPS	( XMM0, XMM1 )
+
+	/* Restore the original MXCSR register value.
+	 */
+	LDMXCSR	( REGOFF( -4, EBP ) )
+
+	LEAVE
+	RET
+
+#endif
+
diff --git a/reactos/lib/mesa32/src/x86/common_x86_asm.h b/reactos/lib/mesa32/src/x86/common_x86_asm.h
new file mode 100644
index 00000000000..31abc53638e
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/common_x86_asm.h
@@ -0,0 +1,64 @@
+/* $Id: common_x86_asm.h,v 1.1 2004/07/16 22:12:42 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * Check CPU capabilities & initialize optimized funtions for this particular
+ * processor.
+ *
+ * Written by Holger Waechtler <holger@akaflieg.extern.tu-berlin.de>
+ * Changed by Andre Werthmann <wertmann@cs.uni-potsdam.de> for using the
+ * new Katmai functions
+ *
+ * Reimplemented by Gareth Hughes in a more
+ * future-proof manner, based on code in the Linux kernel.
+ */
+
+#ifndef __COMMON_X86_ASM_H__
+#define __COMMON_X86_ASM_H__
+
+/* Do not reference mtypes.h from this file.
+ */
+#include "common_x86_features.h"
+
+#ifdef HAVE_CONFIG_H
+#include "conf.h"
+#endif
+
+#ifdef USE_X86_ASM
+#include "x86.h"
+#ifdef USE_3DNOW_ASM
+#include "3dnow.h"
+#endif
+#ifdef USE_SSE_ASM
+#include "sse.h"
+#endif
+#endif
+
+extern int _mesa_x86_cpu_features;
+
+extern void _mesa_init_all_x86_transform_asm( void );
+
+#endif
diff --git a/reactos/lib/mesa32/src/x86/common_x86_features.h b/reactos/lib/mesa32/src/x86/common_x86_features.h
new file mode 100644
index 00000000000..611e50f40a9
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/common_x86_features.h
@@ -0,0 +1,68 @@
+/* $Id: common_x86_features.h,v 1.1 2004/07/16 22:12:42 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * x86 CPUID feature information.  The raw data is returned by
+ * _mesa_identify_x86_cpu_features() and interpreted with the cpu_has_*
+ * helper macros.
+ *
+ * Gareth Hughes
+ */
+
+#ifndef __COMMON_X86_FEATURES_H__
+#define __COMMON_X86_FEATURES_H__
+
+#define X86_FEATURE_FPU		(1<<0)
+#define X86_FEATURE_CMOV	(1<<1)
+#define X86_FEATURE_MMXEXT	(1<<2)
+#define X86_FEATURE_MMX		(1<<3)
+#define X86_FEATURE_FXSR	(1<<4)
+#define X86_FEATURE_XMM		(1<<5)
+#define X86_FEATURE_XMM2	(1<<6)
+#define X86_FEATURE_3DNOWEXT	(1<<7)
+#define X86_FEATURE_3DNOW	(1<<8)
+
+/* standard X86 CPU features */
+#define X86_CPU_FPU		(1<<0)
+#define X86_CPU_CMOV		(1<<15)
+#define X86_CPU_MMX		(1<<23)
+#define X86_CPU_XMM		(1<<25)
+#define X86_CPU_XMM2		(1<<26)
+
+/* extended X86 CPU features */
+#define X86_CPUEXT_MMX_EXT	(1<<22)
+#define X86_CPUEXT_3DNOW_EXT	(1<<30)
+#define X86_CPUEXT_3DNOW	(1<<31)
+
+#define cpu_has_mmx		(_mesa_x86_cpu_features & X86_FEATURE_MMX)
+#define cpu_has_mmxext		(_mesa_x86_cpu_features & X86_FEATURE_MMXEXT)
+#define cpu_has_xmm		(_mesa_x86_cpu_features & X86_FEATURE_XMM)
+#define cpu_has_xmm2		(_mesa_x86_cpu_features & X86_FEATURE_XMM2)
+#define cpu_has_3dnow		(_mesa_x86_cpu_features & X86_FEATURE_3DNOW)
+#define cpu_has_3dnowext	(_mesa_x86_cpu_features & X86_FEATURE_3DNOWEXT)
+
+#endif
+
diff --git a/reactos/lib/mesa32/src/x86/common_x86_macros.h b/reactos/lib/mesa32/src/x86/common_x86_macros.h
new file mode 100644
index 00000000000..c6d5246066c
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/common_x86_macros.h
@@ -0,0 +1,107 @@
+/* $Id: common_x86_macros.h,v 1.1 2004/07/16 22:12:42 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Gareth Hughes
+ */
+
+#ifndef __COMMON_X86_MACROS_H__
+#define __COMMON_X86_MACROS_H__
+
+
+/* =============================================================
+ * Transformation function declarations:
+ */
+
+#define XFORM_ARGS	GLvector4f *to_vec,				\
+			const GLfloat m[16],				\
+			const GLvector4f *from_vec
+
+#define DECLARE_XFORM_GROUP( pfx, sz ) \
+extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_general( XFORM_ARGS );		\
+extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_identity( XFORM_ARGS );	\
+extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_3d_no_rot( XFORM_ARGS );	\
+extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_perspective( XFORM_ARGS );	\
+extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_2d( XFORM_ARGS );		\
+extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_2d_no_rot( XFORM_ARGS );	\
+extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_3d( XFORM_ARGS );
+
+#define ASSIGN_XFORM_GROUP( pfx, sz )					\
+   _mesa_transform_tab[sz][MATRIX_GENERAL] =				\
+      _mesa_##pfx##_transform_points##sz##_general;			\
+   _mesa_transform_tab[sz][MATRIX_IDENTITY] =				\
+      _mesa_##pfx##_transform_points##sz##_identity;			\
+   _mesa_transform_tab[sz][MATRIX_3D_NO_ROT] =				\
+      _mesa_##pfx##_transform_points##sz##_3d_no_rot;			\
+   _mesa_transform_tab[sz][MATRIX_PERSPECTIVE] =			\
+      _mesa_##pfx##_transform_points##sz##_perspective;			\
+   _mesa_transform_tab[sz][MATRIX_2D] =					\
+      _mesa_##pfx##_transform_points##sz##_2d;				\
+   _mesa_transform_tab[sz][MATRIX_2D_NO_ROT] =				\
+      _mesa_##pfx##_transform_points##sz##_2d_no_rot;			\
+   _mesa_transform_tab[sz][MATRIX_3D] =					\
+      _mesa_##pfx##_transform_points##sz##_3d;
+
+
+/* =============================================================
+ * Normal transformation function declarations:
+ */
+
+#define NORM_ARGS	const GLmatrix *mat,				\
+			GLfloat scale,					\
+			const GLvector4f *in,				\
+			const GLfloat *lengths,				\
+			GLvector4f *dest
+
+#define DECLARE_NORM_GROUP( pfx ) \
+extern void _ASMAPI _mesa_##pfx##_rescale_normals( NORM_ARGS );				\
+extern void _ASMAPI _mesa_##pfx##_normalize_normals( NORM_ARGS );			\
+extern void _ASMAPI _mesa_##pfx##_transform_normals( NORM_ARGS );			\
+extern void _ASMAPI _mesa_##pfx##_transform_normals_no_rot( NORM_ARGS );		\
+extern void _ASMAPI _mesa_##pfx##_transform_rescale_normals( NORM_ARGS );		\
+extern void _ASMAPI _mesa_##pfx##_transform_rescale_normals_no_rot( NORM_ARGS );	\
+extern void _ASMAPI _mesa_##pfx##_transform_normalize_normals( NORM_ARGS );		\
+extern void _ASMAPI _mesa_##pfx##_transform_normalize_normals_no_rot( NORM_ARGS );
+
+#define ASSIGN_NORM_GROUP( pfx )					\
+   _mesa_normal_tab[NORM_RESCALE] =					\
+      _mesa_##pfx##_rescale_normals;					\
+   _mesa_normal_tab[NORM_NORMALIZE] =					\
+      _mesa_##pfx##_normalize_normals;					\
+   _mesa_normal_tab[NORM_TRANSFORM] =					\
+      _mesa_##pfx##_transform_normals;					\
+   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT] =				\
+      _mesa_##pfx##_transform_normals_no_rot;				\
+   _mesa_normal_tab[NORM_TRANSFORM | NORM_RESCALE] =			\
+      _mesa_##pfx##_transform_rescale_normals;				\
+   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT | NORM_RESCALE] =		\
+      _mesa_##pfx##_transform_rescale_normals_no_rot;			\
+   _mesa_normal_tab[NORM_TRANSFORM | NORM_NORMALIZE] =			\
+      _mesa_##pfx##_transform_normalize_normals;			\
+   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT | NORM_NORMALIZE] =		\
+      _mesa_##pfx##_transform_normalize_normals_no_rot;
+
+
+#endif
diff --git a/reactos/lib/mesa32/src/x86/gen_matypes.c b/reactos/lib/mesa32/src/x86/gen_matypes.c
new file mode 100644
index 00000000000..30642e4b12d
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/gen_matypes.c
@@ -0,0 +1,251 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Gareth Hughes
+ */
+
+/*
+ * This generates an asm version of mtypes.h (called matypes.h), so that
+ * Mesa's x86 assembly code can access the internal structures easily.
+ * This will be particularly useful when developing new x86 asm code for
+ * Mesa, including lighting, clipping, texture image conversion etc.
+ */
+
+#include "main/glheader.h"
+#include "main/mtypes.h"
+#include "tnl/t_context.h"
+
+
+#undef offsetof
+#define offsetof( type, member ) ((size_t) &((type *)0)->member)
+
+
+#define OFFSET_HEADER( x )						\
+do {									\
+   printf( "\n" );							\
+   printf( "\n" );							\
+   printf( "/* ====================================================="	\
+	   "========\n" );						\
+   printf( " * Offsets for %s\n", x );					\
+   printf( " */\n" );							\
+   printf( "\n" );							\
+} while (0)
+
+#define DEFINE_HEADER( x )						\
+do {									\
+   printf( "\n" );							\
+   printf( "/*\n" );							\
+   printf( " * Flags for %s\n", x );					\
+   printf( " */\n" );							\
+   printf( "\n" );							\
+} while (0)
+
+#if defined(__BEOS__)
+#define OFFSET( s, t, m )						\
+   printf( "#define %s\t%ld\n", s, offsetof( t, m ) );
+#else
+#define OFFSET( s, t, m )						\
+   printf( "#define %s\t%d\n", s, offsetof( t, m ) );
+#endif
+
+#if defined(__BEOS__)
+#define SIZEOF( s, t )							\
+   printf( "#define %s\t%ld\n", s, sizeof(t) );
+#else
+#define SIZEOF( s, t )							\
+   printf( "#define %s\t%d\n", s, sizeof(t) );
+#endif
+
+#define DEFINE( s, d )							\
+   printf( "#define %s\t0x%x\n", s, d );
+
+
+
+int main( int argc, char **argv )
+{
+   printf( "/*\n" );
+   printf( " * This file is automatically generated from the Mesa internal type\n" );
+   printf( " * definitions.  Do not edit directly.\n" );
+   printf( " */\n" );
+   printf( "\n" );
+   printf( "#ifndef __ASM_TYPES_H__\n" );
+   printf( "#define __ASM_TYPES_H__\n" );
+   printf( "\n" );
+   printf( "#include \"assyntax.h\"\n" );
+
+
+   /* GLcontext offsets:
+    */
+   OFFSET_HEADER( "GLcontext" );
+
+   OFFSET( "CTX_DRIVER_CTX              ", GLcontext, DriverCtx );
+   printf( "\n" );
+   OFFSET( "CTX_LIGHT_ENABLED           ", GLcontext, Light.Enabled );
+   OFFSET( "CTX_LIGHT_SHADE_MODEL       ", GLcontext, Light.ShadeModel );
+   OFFSET( "CTX_LIGHT_COLOR_MAT_FACE    ", GLcontext, Light.ColorMaterialFace );
+   OFFSET( "CTX_LIGHT_COLOR_MAT_MODE    ", GLcontext, Light.ColorMaterialMode );
+   OFFSET( "CTX_LIGHT_COLOR_MAT_MASK    ", GLcontext, Light.ColorMaterialBitmask );
+   OFFSET( "CTX_LIGHT_COLOR_MAT_ENABLED ", GLcontext, Light.ColorMaterialEnabled );
+   OFFSET( "CTX_LIGHT_ENABLED_LIST      ", GLcontext, Light.EnabledList );
+   OFFSET( "CTX_LIGHT_NEED_VERTS        ", GLcontext, Light._NeedVertices );
+   OFFSET( "CTX_LIGHT_FLAGS             ", GLcontext, Light._Flags );
+   OFFSET( "CTX_LIGHT_BASE_COLOR        ", GLcontext, Light._BaseColor );
+
+
+   /* struct vertex_buffer offsets:
+    */
+   OFFSET_HEADER( "struct vertex_buffer" );
+
+   OFFSET( "VB_SIZE                ", struct vertex_buffer, Size );
+   OFFSET( "VB_COUNT               ", struct vertex_buffer, Count );
+   printf( "\n" );
+   OFFSET( "VB_ELTS                ", struct vertex_buffer, Elts );
+   OFFSET( "VB_OBJ_PTR             ", struct vertex_buffer, ObjPtr );
+   OFFSET( "VB_EYE_PTR             ", struct vertex_buffer, EyePtr );
+   OFFSET( "VB_CLIP_PTR            ", struct vertex_buffer, ClipPtr );
+   OFFSET( "VB_PROJ_CLIP_PTR       ", struct vertex_buffer, NdcPtr );
+   OFFSET( "VB_CLIP_OR_MASK        ", struct vertex_buffer, ClipOrMask );
+   OFFSET( "VB_CLIP_MASK           ", struct vertex_buffer, ClipMask );
+   OFFSET( "VB_NORMAL_PTR          ", struct vertex_buffer, NormalPtr );
+   OFFSET( "VB_EDGE_FLAG           ", struct vertex_buffer, EdgeFlag );
+   OFFSET( "VB_TEX0_COORD_PTR      ", struct vertex_buffer, TexCoordPtr[0] );
+   OFFSET( "VB_TEX1_COORD_PTR      ", struct vertex_buffer, TexCoordPtr[1] );
+   OFFSET( "VB_TEX2_COORD_PTR      ", struct vertex_buffer, TexCoordPtr[2] );
+   OFFSET( "VB_TEX3_COORD_PTR      ", struct vertex_buffer, TexCoordPtr[3] );
+   OFFSET( "VB_INDEX_PTR           ", struct vertex_buffer, IndexPtr );
+   OFFSET( "VB_COLOR_PTR           ", struct vertex_buffer, ColorPtr );
+   OFFSET( "VB_SECONDARY_COLOR_PTR ", struct vertex_buffer, SecondaryColorPtr );
+   OFFSET( "VB_FOG_COORD_PTR       ", struct vertex_buffer, FogCoordPtr );
+   OFFSET( "VB_POINT_SIZE_PTR      ", struct vertex_buffer, PointSizePtr );
+   OFFSET( "VB_PRIMITIVE           ", struct vertex_buffer, Primitive );
+   printf( "\n" );
+   OFFSET( "VB_LAST_CLIPPED        ", struct vertex_buffer, LastClipped );
+
+   DEFINE_HEADER( "struct vertex_buffer" );
+
+   /* XXX use new labels here someday after vertex proram is done */
+   DEFINE( "VERT_BIT_OBJ           ", VERT_BIT_POS );
+   DEFINE( "VERT_BIT_NORM          ", VERT_BIT_NORMAL );
+   DEFINE( "VERT_BIT_RGBA          ", VERT_BIT_COLOR0 );
+   DEFINE( "VERT_BIT_SPEC_RGB      ", VERT_BIT_COLOR1 );
+   DEFINE( "VERT_BIT_FOG_COORD     ", VERT_BIT_FOG );
+   DEFINE( "VERT_BIT_TEX0          ", VERT_BIT_TEX0 );
+   DEFINE( "VERT_BIT_TEX1          ", VERT_BIT_TEX1 );
+   DEFINE( "VERT_BIT_TEX2          ", VERT_BIT_TEX2 );
+   DEFINE( "VERT_BIT_TEX3          ", VERT_BIT_TEX3 );
+
+
+   /* GLvector4f offsets:
+    */
+   OFFSET_HEADER( "GLvector4f" );
+
+   OFFSET( "V4F_DATA          ", GLvector4f, data );
+   OFFSET( "V4F_START         ", GLvector4f, start );
+   OFFSET( "V4F_COUNT         ", GLvector4f, count );
+   OFFSET( "V4F_STRIDE        ", GLvector4f, stride );
+   OFFSET( "V4F_SIZE          ", GLvector4f, size );
+   OFFSET( "V4F_FLAGS         ", GLvector4f, flags );
+
+   DEFINE_HEADER( "GLvector4f" );
+
+   DEFINE( "VEC_MALLOC        ", VEC_MALLOC );
+   DEFINE( "VEC_NOT_WRITEABLE ", VEC_NOT_WRITEABLE );
+   DEFINE( "VEC_BAD_STRIDE    ", VEC_BAD_STRIDE );
+   printf( "\n" );
+   DEFINE( "VEC_SIZE_1        ", VEC_SIZE_1 );
+   DEFINE( "VEC_SIZE_2        ", VEC_SIZE_2 );
+   DEFINE( "VEC_SIZE_3        ", VEC_SIZE_3 );
+   DEFINE( "VEC_SIZE_4        ", VEC_SIZE_4 );
+
+
+   /* GLmatrix offsets:
+    */
+   OFFSET_HEADER( "GLmatrix" );
+
+   OFFSET( "MATRIX_DATA   ", GLmatrix, m );
+   OFFSET( "MATRIX_INV    ", GLmatrix, inv );
+   OFFSET( "MATRIX_FLAGS  ", GLmatrix, flags );
+   OFFSET( "MATRIX_TYPE   ", GLmatrix, type );
+
+
+   /* struct gl_light offsets:
+    */
+   OFFSET_HEADER( "struct gl_light" );
+
+   OFFSET( "LIGHT_NEXT              ", struct gl_light, next );
+   OFFSET( "LIGHT_PREV              ", struct gl_light, prev );
+   printf( "\n" );
+   OFFSET( "LIGHT_AMBIENT           ", struct gl_light, Ambient );
+   OFFSET( "LIGHT_DIFFUSE           ", struct gl_light, Diffuse );
+   OFFSET( "LIGHT_SPECULAR          ", struct gl_light, Specular );
+   OFFSET( "LIGHT_EYE_POSITION      ", struct gl_light, EyePosition );
+   OFFSET( "LIGHT_EYE_DIRECTION     ", struct gl_light, EyeDirection );
+   OFFSET( "LIGHT_SPOT_EXPONENT     ", struct gl_light, SpotExponent );
+   OFFSET( "LIGHT_SPOT_CUTOFF       ", struct gl_light, SpotCutoff );
+   OFFSET( "LIGHT_COS_CUTOFF        ", struct gl_light, _CosCutoff );
+   OFFSET( "LIGHT_CONST_ATTEN       ", struct gl_light, ConstantAttenuation );
+   OFFSET( "LIGHT_LINEAR_ATTEN      ", struct gl_light, LinearAttenuation );
+   OFFSET( "LIGHT_QUADRATIC_ATTEN   ", struct gl_light, QuadraticAttenuation );
+   OFFSET( "LIGHT_ENABLED           ", struct gl_light, Enabled );
+   printf( "\n" );
+   OFFSET( "LIGHT_FLAGS             ", struct gl_light, _Flags );
+   printf( "\n" );
+   OFFSET( "LIGHT_POSITION          ", struct gl_light, _Position );
+   OFFSET( "LIGHT_VP_INF_NORM       ", struct gl_light, _VP_inf_norm );
+   OFFSET( "LIGHT_H_INF_NORM        ", struct gl_light, _h_inf_norm );
+   OFFSET( "LIGHT_NORM_DIRECTION    ", struct gl_light, _NormDirection );
+   OFFSET( "LIGHT_VP_INF_SPOT_ATTEN ", struct gl_light, _VP_inf_spot_attenuation );
+   printf( "\n" );
+   OFFSET( "LIGHT_SPOT_EXP_TABLE    ", struct gl_light, _SpotExpTable );
+   OFFSET( "LIGHT_MAT_AMBIENT       ", struct gl_light, _MatAmbient );
+   OFFSET( "LIGHT_MAT_DIFFUSE       ", struct gl_light, _MatDiffuse );
+   OFFSET( "LIGHT_MAT_SPECULAR      ", struct gl_light, _MatSpecular );
+   printf( "\n" );
+   SIZEOF( "SIZEOF_GL_LIGHT         ", struct gl_light );
+
+   DEFINE_HEADER( "struct gl_light" );
+
+   DEFINE( "LIGHT_SPOT              ", LIGHT_SPOT );
+   DEFINE( "LIGHT_LOCAL_VIEWER      ", LIGHT_LOCAL_VIEWER );
+   DEFINE( "LIGHT_POSITIONAL        ", LIGHT_POSITIONAL );
+   printf( "\n" );
+   DEFINE( "LIGHT_NEED_VERTICES     ", LIGHT_NEED_VERTICES );
+
+
+   /* struct gl_lightmodel offsets:
+    */
+   OFFSET_HEADER( "struct gl_lightmodel" );
+
+   OFFSET( "LIGHT_MODEL_AMBIENT       ", struct gl_lightmodel, Ambient );
+   OFFSET( "LIGHT_MODEL_LOCAL_VIEWER  ", struct gl_lightmodel, LocalViewer );
+   OFFSET( "LIGHT_MODEL_TWO_SIDE      ", struct gl_lightmodel, TwoSide );
+   OFFSET( "LIGHT_MODEL_COLOR_CONTROL ", struct gl_lightmodel, ColorControl );
+
+
+   printf( "\n" );
+   printf( "\n" );
+   printf( "#endif /* __ASM_TYPES_H__ */\n" );
+
+   return 0;
+}
diff --git a/reactos/lib/mesa32/src/x86/glapi_x86.S b/reactos/lib/mesa32/src/x86/glapi_x86.S
new file mode 100644
index 00000000000..2348f5435f4
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/glapi_x86.S
@@ -0,0 +1,5522 @@
+/* DO NOT EDIT - This file generated automatically with glx86asm.py script */
+#include "assyntax.h"
+#include "glapioffsets.h"
+
+#ifndef __WIN32__
+
+#if defined(STDCALL_API)
+# if defined(USE_MGL_NAMESPACE)
+#  define GL_PREFIX(n,n2) GLNAME(CONCAT(mgl,n2))
+# else
+#  define GL_PREFIX(n,n2) GLNAME(CONCAT(gl,n2))
+# endif
+#elif defined(USE_MGL_NAMESPACE)
+# define GL_PREFIX(n,n2) GLNAME(CONCAT(mgl,n))
+#else
+# define GL_PREFIX(n,n2) GLNAME(CONCAT(gl,n))
+#endif
+
+#define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX))
+
+#if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__)
+#define GLOBL_FN(x) GLOBL x ; .type x,@function
+#else
+#define GLOBL_FN(x) GLOBL x
+#endif
+
+SEG_TEXT
+
+EXTERN GLNAME(_glapi_Dispatch)
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(NewList,NewList@8))
+GL_PREFIX(NewList,NewList@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_NewList))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(EndList,EndList@0))
+GL_PREFIX(EndList,EndList@0):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_EndList))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CallList,CallList@4))
+GL_PREFIX(CallList,CallList@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CallList))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CallLists,CallLists@12))
+GL_PREFIX(CallLists,CallLists@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CallLists))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(DeleteLists,DeleteLists@8))
+GL_PREFIX(DeleteLists,DeleteLists@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_DeleteLists))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GenLists,GenLists@4))
+GL_PREFIX(GenLists,GenLists@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GenLists))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ListBase,ListBase@4))
+GL_PREFIX(ListBase,ListBase@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ListBase))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Begin,Begin@4))
+GL_PREFIX(Begin,Begin@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Begin))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Bitmap,Bitmap@28))
+GL_PREFIX(Bitmap,Bitmap@28):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Bitmap))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color3b,Color3b@12))
+GL_PREFIX(Color3b,Color3b@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Color3b))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color3bv,Color3bv@4))
+GL_PREFIX(Color3bv,Color3bv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Color3bv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color3d,Color3d@24))
+GL_PREFIX(Color3d,Color3d@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Color3d))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color3dv,Color3dv@4))
+GL_PREFIX(Color3dv,Color3dv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Color3dv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color3f,Color3f@12))
+GL_PREFIX(Color3f,Color3f@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Color3f))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color3fv,Color3fv@4))
+GL_PREFIX(Color3fv,Color3fv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Color3fv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color3i,Color3i@12))
+GL_PREFIX(Color3i,Color3i@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Color3i))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color3iv,Color3iv@4))
+GL_PREFIX(Color3iv,Color3iv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Color3iv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color3s,Color3s@12))
+GL_PREFIX(Color3s,Color3s@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Color3s))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color3sv,Color3sv@4))
+GL_PREFIX(Color3sv,Color3sv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Color3sv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color3ub,Color3ub@12))
+GL_PREFIX(Color3ub,Color3ub@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Color3ub))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color3ubv,Color3ubv@4))
+GL_PREFIX(Color3ubv,Color3ubv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Color3ubv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color3ui,Color3ui@12))
+GL_PREFIX(Color3ui,Color3ui@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Color3ui))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color3uiv,Color3uiv@4))
+GL_PREFIX(Color3uiv,Color3uiv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Color3uiv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color3us,Color3us@12))
+GL_PREFIX(Color3us,Color3us@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Color3us))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color3usv,Color3usv@4))
+GL_PREFIX(Color3usv,Color3usv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Color3usv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color4b,Color4b@16))
+GL_PREFIX(Color4b,Color4b@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Color4b))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color4bv,Color4bv@4))
+GL_PREFIX(Color4bv,Color4bv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Color4bv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color4d,Color4d@32))
+GL_PREFIX(Color4d,Color4d@32):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Color4d))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color4dv,Color4dv@4))
+GL_PREFIX(Color4dv,Color4dv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Color4dv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color4f,Color4f@16))
+GL_PREFIX(Color4f,Color4f@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Color4f))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color4fv,Color4fv@4))
+GL_PREFIX(Color4fv,Color4fv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Color4fv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color4i,Color4i@16))
+GL_PREFIX(Color4i,Color4i@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Color4i))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color4iv,Color4iv@4))
+GL_PREFIX(Color4iv,Color4iv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Color4iv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color4s,Color4s@16))
+GL_PREFIX(Color4s,Color4s@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Color4s))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color4sv,Color4sv@4))
+GL_PREFIX(Color4sv,Color4sv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Color4sv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color4ub,Color4ub@16))
+GL_PREFIX(Color4ub,Color4ub@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Color4ub))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color4ubv,Color4ubv@4))
+GL_PREFIX(Color4ubv,Color4ubv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Color4ubv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color4ui,Color4ui@16))
+GL_PREFIX(Color4ui,Color4ui@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Color4ui))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color4uiv,Color4uiv@4))
+GL_PREFIX(Color4uiv,Color4uiv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Color4uiv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color4us,Color4us@16))
+GL_PREFIX(Color4us,Color4us@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Color4us))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Color4usv,Color4usv@4))
+GL_PREFIX(Color4usv,Color4usv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Color4usv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(EdgeFlag,EdgeFlag@4))
+GL_PREFIX(EdgeFlag,EdgeFlag@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_EdgeFlag))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(EdgeFlagv,EdgeFlagv@4))
+GL_PREFIX(EdgeFlagv,EdgeFlagv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_EdgeFlagv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(End,End@0))
+GL_PREFIX(End,End@0):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_End))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Indexd,Indexd@8))
+GL_PREFIX(Indexd,Indexd@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Indexd))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Indexdv,Indexdv@4))
+GL_PREFIX(Indexdv,Indexdv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Indexdv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Indexf,Indexf@4))
+GL_PREFIX(Indexf,Indexf@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Indexf))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Indexfv,Indexfv@4))
+GL_PREFIX(Indexfv,Indexfv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Indexfv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Indexi,Indexi@4))
+GL_PREFIX(Indexi,Indexi@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Indexi))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Indexiv,Indexiv@4))
+GL_PREFIX(Indexiv,Indexiv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Indexiv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Indexs,Indexs@4))
+GL_PREFIX(Indexs,Indexs@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Indexs))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Indexsv,Indexsv@4))
+GL_PREFIX(Indexsv,Indexsv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Indexsv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Normal3b,Normal3b@12))
+GL_PREFIX(Normal3b,Normal3b@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Normal3b))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Normal3bv,Normal3bv@4))
+GL_PREFIX(Normal3bv,Normal3bv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Normal3bv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Normal3d,Normal3d@24))
+GL_PREFIX(Normal3d,Normal3d@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Normal3d))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Normal3dv,Normal3dv@4))
+GL_PREFIX(Normal3dv,Normal3dv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Normal3dv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Normal3f,Normal3f@12))
+GL_PREFIX(Normal3f,Normal3f@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Normal3f))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Normal3fv,Normal3fv@4))
+GL_PREFIX(Normal3fv,Normal3fv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Normal3fv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Normal3i,Normal3i@12))
+GL_PREFIX(Normal3i,Normal3i@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Normal3i))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Normal3iv,Normal3iv@4))
+GL_PREFIX(Normal3iv,Normal3iv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Normal3iv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Normal3s,Normal3s@12))
+GL_PREFIX(Normal3s,Normal3s@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Normal3s))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Normal3sv,Normal3sv@4))
+GL_PREFIX(Normal3sv,Normal3sv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Normal3sv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(RasterPos2d,RasterPos2d@16))
+GL_PREFIX(RasterPos2d,RasterPos2d@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_RasterPos2d))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(RasterPos2dv,RasterPos2dv@4))
+GL_PREFIX(RasterPos2dv,RasterPos2dv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_RasterPos2dv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(RasterPos2f,RasterPos2f@8))
+GL_PREFIX(RasterPos2f,RasterPos2f@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_RasterPos2f))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(RasterPos2fv,RasterPos2fv@4))
+GL_PREFIX(RasterPos2fv,RasterPos2fv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_RasterPos2fv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(RasterPos2i,RasterPos2i@8))
+GL_PREFIX(RasterPos2i,RasterPos2i@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_RasterPos2i))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(RasterPos2iv,RasterPos2iv@4))
+GL_PREFIX(RasterPos2iv,RasterPos2iv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_RasterPos2iv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(RasterPos2s,RasterPos2s@8))
+GL_PREFIX(RasterPos2s,RasterPos2s@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_RasterPos2s))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(RasterPos2sv,RasterPos2sv@4))
+GL_PREFIX(RasterPos2sv,RasterPos2sv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_RasterPos2sv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(RasterPos3d,RasterPos3d@24))
+GL_PREFIX(RasterPos3d,RasterPos3d@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_RasterPos3d))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(RasterPos3dv,RasterPos3dv@4))
+GL_PREFIX(RasterPos3dv,RasterPos3dv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_RasterPos3dv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(RasterPos3f,RasterPos3f@12))
+GL_PREFIX(RasterPos3f,RasterPos3f@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_RasterPos3f))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(RasterPos3fv,RasterPos3fv@4))
+GL_PREFIX(RasterPos3fv,RasterPos3fv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_RasterPos3fv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(RasterPos3i,RasterPos3i@12))
+GL_PREFIX(RasterPos3i,RasterPos3i@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_RasterPos3i))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(RasterPos3iv,RasterPos3iv@4))
+GL_PREFIX(RasterPos3iv,RasterPos3iv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_RasterPos3iv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(RasterPos3s,RasterPos3s@12))
+GL_PREFIX(RasterPos3s,RasterPos3s@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_RasterPos3s))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(RasterPos3sv,RasterPos3sv@4))
+GL_PREFIX(RasterPos3sv,RasterPos3sv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_RasterPos3sv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(RasterPos4d,RasterPos4d@32))
+GL_PREFIX(RasterPos4d,RasterPos4d@32):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_RasterPos4d))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(RasterPos4dv,RasterPos4dv@4))
+GL_PREFIX(RasterPos4dv,RasterPos4dv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_RasterPos4dv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(RasterPos4f,RasterPos4f@16))
+GL_PREFIX(RasterPos4f,RasterPos4f@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_RasterPos4f))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(RasterPos4fv,RasterPos4fv@4))
+GL_PREFIX(RasterPos4fv,RasterPos4fv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_RasterPos4fv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(RasterPos4i,RasterPos4i@16))
+GL_PREFIX(RasterPos4i,RasterPos4i@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_RasterPos4i))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(RasterPos4iv,RasterPos4iv@4))
+GL_PREFIX(RasterPos4iv,RasterPos4iv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_RasterPos4iv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(RasterPos4s,RasterPos4s@16))
+GL_PREFIX(RasterPos4s,RasterPos4s@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_RasterPos4s))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(RasterPos4sv,RasterPos4sv@4))
+GL_PREFIX(RasterPos4sv,RasterPos4sv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_RasterPos4sv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Rectd,Rectd@32))
+GL_PREFIX(Rectd,Rectd@32):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Rectd))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Rectdv,Rectdv@8))
+GL_PREFIX(Rectdv,Rectdv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Rectdv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Rectf,Rectf@16))
+GL_PREFIX(Rectf,Rectf@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Rectf))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Rectfv,Rectfv@8))
+GL_PREFIX(Rectfv,Rectfv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Rectfv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Recti,Recti@16))
+GL_PREFIX(Recti,Recti@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Recti))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Rectiv,Rectiv@8))
+GL_PREFIX(Rectiv,Rectiv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Rectiv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Rects,Rects@16))
+GL_PREFIX(Rects,Rects@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Rects))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Rectsv,Rectsv@8))
+GL_PREFIX(Rectsv,Rectsv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Rectsv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoord1d,TexCoord1d@8))
+GL_PREFIX(TexCoord1d,TexCoord1d@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoord1d))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoord1dv,TexCoord1dv@4))
+GL_PREFIX(TexCoord1dv,TexCoord1dv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoord1dv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoord1f,TexCoord1f@4))
+GL_PREFIX(TexCoord1f,TexCoord1f@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoord1f))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoord1fv,TexCoord1fv@4))
+GL_PREFIX(TexCoord1fv,TexCoord1fv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoord1fv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoord1i,TexCoord1i@4))
+GL_PREFIX(TexCoord1i,TexCoord1i@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoord1i))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoord1iv,TexCoord1iv@4))
+GL_PREFIX(TexCoord1iv,TexCoord1iv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoord1iv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoord1s,TexCoord1s@4))
+GL_PREFIX(TexCoord1s,TexCoord1s@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoord1s))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoord1sv,TexCoord1sv@4))
+GL_PREFIX(TexCoord1sv,TexCoord1sv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoord1sv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoord2d,TexCoord2d@16))
+GL_PREFIX(TexCoord2d,TexCoord2d@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoord2d))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoord2dv,TexCoord2dv@4))
+GL_PREFIX(TexCoord2dv,TexCoord2dv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoord2dv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoord2f,TexCoord2f@8))
+GL_PREFIX(TexCoord2f,TexCoord2f@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoord2f))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoord2fv,TexCoord2fv@4))
+GL_PREFIX(TexCoord2fv,TexCoord2fv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoord2fv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoord2i,TexCoord2i@8))
+GL_PREFIX(TexCoord2i,TexCoord2i@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoord2i))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoord2iv,TexCoord2iv@4))
+GL_PREFIX(TexCoord2iv,TexCoord2iv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoord2iv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoord2s,TexCoord2s@8))
+GL_PREFIX(TexCoord2s,TexCoord2s@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoord2s))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoord2sv,TexCoord2sv@4))
+GL_PREFIX(TexCoord2sv,TexCoord2sv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoord2sv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoord3d,TexCoord3d@24))
+GL_PREFIX(TexCoord3d,TexCoord3d@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoord3d))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoord3dv,TexCoord3dv@4))
+GL_PREFIX(TexCoord3dv,TexCoord3dv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoord3dv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoord3f,TexCoord3f@12))
+GL_PREFIX(TexCoord3f,TexCoord3f@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoord3f))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoord3fv,TexCoord3fv@4))
+GL_PREFIX(TexCoord3fv,TexCoord3fv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoord3fv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoord3i,TexCoord3i@12))
+GL_PREFIX(TexCoord3i,TexCoord3i@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoord3i))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoord3iv,TexCoord3iv@4))
+GL_PREFIX(TexCoord3iv,TexCoord3iv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoord3iv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoord3s,TexCoord3s@12))
+GL_PREFIX(TexCoord3s,TexCoord3s@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoord3s))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoord3sv,TexCoord3sv@4))
+GL_PREFIX(TexCoord3sv,TexCoord3sv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoord3sv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoord4d,TexCoord4d@32))
+GL_PREFIX(TexCoord4d,TexCoord4d@32):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoord4d))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoord4dv,TexCoord4dv@4))
+GL_PREFIX(TexCoord4dv,TexCoord4dv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoord4dv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoord4f,TexCoord4f@16))
+GL_PREFIX(TexCoord4f,TexCoord4f@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoord4f))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoord4fv,TexCoord4fv@4))
+GL_PREFIX(TexCoord4fv,TexCoord4fv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoord4fv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoord4i,TexCoord4i@16))
+GL_PREFIX(TexCoord4i,TexCoord4i@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoord4i))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoord4iv,TexCoord4iv@4))
+GL_PREFIX(TexCoord4iv,TexCoord4iv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoord4iv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoord4s,TexCoord4s@16))
+GL_PREFIX(TexCoord4s,TexCoord4s@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoord4s))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoord4sv,TexCoord4sv@4))
+GL_PREFIX(TexCoord4sv,TexCoord4sv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoord4sv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Vertex2d,Vertex2d@16))
+GL_PREFIX(Vertex2d,Vertex2d@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Vertex2d))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Vertex2dv,Vertex2dv@4))
+GL_PREFIX(Vertex2dv,Vertex2dv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Vertex2dv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Vertex2f,Vertex2f@8))
+GL_PREFIX(Vertex2f,Vertex2f@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Vertex2f))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Vertex2fv,Vertex2fv@4))
+GL_PREFIX(Vertex2fv,Vertex2fv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Vertex2fv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Vertex2i,Vertex2i@8))
+GL_PREFIX(Vertex2i,Vertex2i@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Vertex2i))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Vertex2iv,Vertex2iv@4))
+GL_PREFIX(Vertex2iv,Vertex2iv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Vertex2iv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Vertex2s,Vertex2s@8))
+GL_PREFIX(Vertex2s,Vertex2s@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Vertex2s))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Vertex2sv,Vertex2sv@4))
+GL_PREFIX(Vertex2sv,Vertex2sv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Vertex2sv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Vertex3d,Vertex3d@24))
+GL_PREFIX(Vertex3d,Vertex3d@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Vertex3d))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Vertex3dv,Vertex3dv@4))
+GL_PREFIX(Vertex3dv,Vertex3dv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Vertex3dv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Vertex3f,Vertex3f@12))
+GL_PREFIX(Vertex3f,Vertex3f@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Vertex3f))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Vertex3fv,Vertex3fv@4))
+GL_PREFIX(Vertex3fv,Vertex3fv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Vertex3fv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Vertex3i,Vertex3i@12))
+GL_PREFIX(Vertex3i,Vertex3i@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Vertex3i))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Vertex3iv,Vertex3iv@4))
+GL_PREFIX(Vertex3iv,Vertex3iv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Vertex3iv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Vertex3s,Vertex3s@12))
+GL_PREFIX(Vertex3s,Vertex3s@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Vertex3s))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Vertex3sv,Vertex3sv@4))
+GL_PREFIX(Vertex3sv,Vertex3sv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Vertex3sv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Vertex4d,Vertex4d@32))
+GL_PREFIX(Vertex4d,Vertex4d@32):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Vertex4d))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Vertex4dv,Vertex4dv@4))
+GL_PREFIX(Vertex4dv,Vertex4dv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Vertex4dv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Vertex4f,Vertex4f@16))
+GL_PREFIX(Vertex4f,Vertex4f@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Vertex4f))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Vertex4fv,Vertex4fv@4))
+GL_PREFIX(Vertex4fv,Vertex4fv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Vertex4fv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Vertex4i,Vertex4i@16))
+GL_PREFIX(Vertex4i,Vertex4i@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Vertex4i))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Vertex4iv,Vertex4iv@4))
+GL_PREFIX(Vertex4iv,Vertex4iv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Vertex4iv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Vertex4s,Vertex4s@16))
+GL_PREFIX(Vertex4s,Vertex4s@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Vertex4s))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Vertex4sv,Vertex4sv@4))
+GL_PREFIX(Vertex4sv,Vertex4sv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Vertex4sv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ClipPlane,ClipPlane@8))
+GL_PREFIX(ClipPlane,ClipPlane@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ClipPlane))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ColorMaterial,ColorMaterial@8))
+GL_PREFIX(ColorMaterial,ColorMaterial@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ColorMaterial))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CullFace,CullFace@4))
+GL_PREFIX(CullFace,CullFace@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CullFace))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Fogf,Fogf@8))
+GL_PREFIX(Fogf,Fogf@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Fogf))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Fogfv,Fogfv@8))
+GL_PREFIX(Fogfv,Fogfv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Fogfv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Fogi,Fogi@8))
+GL_PREFIX(Fogi,Fogi@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Fogi))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Fogiv,Fogiv@8))
+GL_PREFIX(Fogiv,Fogiv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Fogiv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FrontFace,FrontFace@4))
+GL_PREFIX(FrontFace,FrontFace@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_FrontFace))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Hint,Hint@8))
+GL_PREFIX(Hint,Hint@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Hint))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Lightf,Lightf@12))
+GL_PREFIX(Lightf,Lightf@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Lightf))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Lightfv,Lightfv@12))
+GL_PREFIX(Lightfv,Lightfv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Lightfv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Lighti,Lighti@12))
+GL_PREFIX(Lighti,Lighti@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Lighti))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Lightiv,Lightiv@12))
+GL_PREFIX(Lightiv,Lightiv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Lightiv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(LightModelf,LightModelf@8))
+GL_PREFIX(LightModelf,LightModelf@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_LightModelf))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(LightModelfv,LightModelfv@8))
+GL_PREFIX(LightModelfv,LightModelfv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_LightModelfv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(LightModeli,LightModeli@8))
+GL_PREFIX(LightModeli,LightModeli@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_LightModeli))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(LightModeliv,LightModeliv@8))
+GL_PREFIX(LightModeliv,LightModeliv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_LightModeliv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(LineStipple,LineStipple@8))
+GL_PREFIX(LineStipple,LineStipple@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_LineStipple))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(LineWidth,LineWidth@4))
+GL_PREFIX(LineWidth,LineWidth@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_LineWidth))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Materialf,Materialf@12))
+GL_PREFIX(Materialf,Materialf@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Materialf))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Materialfv,Materialfv@12))
+GL_PREFIX(Materialfv,Materialfv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Materialfv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Materiali,Materiali@12))
+GL_PREFIX(Materiali,Materiali@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Materiali))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Materialiv,Materialiv@12))
+GL_PREFIX(Materialiv,Materialiv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Materialiv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PointSize,PointSize@4))
+GL_PREFIX(PointSize,PointSize@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PointSize))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PolygonMode,PolygonMode@8))
+GL_PREFIX(PolygonMode,PolygonMode@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PolygonMode))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PolygonStipple,PolygonStipple@4))
+GL_PREFIX(PolygonStipple,PolygonStipple@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PolygonStipple))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Scissor,Scissor@16))
+GL_PREFIX(Scissor,Scissor@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Scissor))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ShadeModel,ShadeModel@4))
+GL_PREFIX(ShadeModel,ShadeModel@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ShadeModel))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexParameterf,TexParameterf@12))
+GL_PREFIX(TexParameterf,TexParameterf@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexParameterf))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexParameterfv,TexParameterfv@12))
+GL_PREFIX(TexParameterfv,TexParameterfv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexParameterfv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexParameteri,TexParameteri@12))
+GL_PREFIX(TexParameteri,TexParameteri@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexParameteri))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexParameteriv,TexParameteriv@12))
+GL_PREFIX(TexParameteriv,TexParameteriv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexParameteriv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexImage1D,TexImage1D@32))
+GL_PREFIX(TexImage1D,TexImage1D@32):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexImage1D))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexImage2D,TexImage2D@36))
+GL_PREFIX(TexImage2D,TexImage2D@36):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexImage2D))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexEnvf,TexEnvf@12))
+GL_PREFIX(TexEnvf,TexEnvf@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexEnvf))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexEnvfv,TexEnvfv@12))
+GL_PREFIX(TexEnvfv,TexEnvfv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexEnvfv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexEnvi,TexEnvi@12))
+GL_PREFIX(TexEnvi,TexEnvi@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexEnvi))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexEnviv,TexEnviv@12))
+GL_PREFIX(TexEnviv,TexEnviv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexEnviv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexGend,TexGend@16))
+GL_PREFIX(TexGend,TexGend@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexGend))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexGendv,TexGendv@12))
+GL_PREFIX(TexGendv,TexGendv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexGendv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexGenf,TexGenf@12))
+GL_PREFIX(TexGenf,TexGenf@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexGenf))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexGenfv,TexGenfv@12))
+GL_PREFIX(TexGenfv,TexGenfv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexGenfv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexGeni,TexGeni@12))
+GL_PREFIX(TexGeni,TexGeni@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexGeni))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexGeniv,TexGeniv@12))
+GL_PREFIX(TexGeniv,TexGeniv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexGeniv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FeedbackBuffer,FeedbackBuffer@12))
+GL_PREFIX(FeedbackBuffer,FeedbackBuffer@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_FeedbackBuffer))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SelectBuffer,SelectBuffer@8))
+GL_PREFIX(SelectBuffer,SelectBuffer@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SelectBuffer))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(RenderMode,RenderMode@4))
+GL_PREFIX(RenderMode,RenderMode@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_RenderMode))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(InitNames,InitNames@0))
+GL_PREFIX(InitNames,InitNames@0):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_InitNames))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(LoadName,LoadName@4))
+GL_PREFIX(LoadName,LoadName@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_LoadName))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PassThrough,PassThrough@4))
+GL_PREFIX(PassThrough,PassThrough@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PassThrough))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PopName,PopName@0))
+GL_PREFIX(PopName,PopName@0):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PopName))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PushName,PushName@4))
+GL_PREFIX(PushName,PushName@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PushName))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(DrawBuffer,DrawBuffer@4))
+GL_PREFIX(DrawBuffer,DrawBuffer@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_DrawBuffer))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Clear,Clear@4))
+GL_PREFIX(Clear,Clear@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Clear))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ClearAccum,ClearAccum@16))
+GL_PREFIX(ClearAccum,ClearAccum@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ClearAccum))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ClearIndex,ClearIndex@4))
+GL_PREFIX(ClearIndex,ClearIndex@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ClearIndex))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ClearColor,ClearColor@16))
+GL_PREFIX(ClearColor,ClearColor@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ClearColor))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ClearStencil,ClearStencil@4))
+GL_PREFIX(ClearStencil,ClearStencil@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ClearStencil))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ClearDepth,ClearDepth@8))
+GL_PREFIX(ClearDepth,ClearDepth@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ClearDepth))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(StencilMask,StencilMask@4))
+GL_PREFIX(StencilMask,StencilMask@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_StencilMask))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ColorMask,ColorMask@16))
+GL_PREFIX(ColorMask,ColorMask@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ColorMask))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(DepthMask,DepthMask@4))
+GL_PREFIX(DepthMask,DepthMask@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_DepthMask))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(IndexMask,IndexMask@4))
+GL_PREFIX(IndexMask,IndexMask@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_IndexMask))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Accum,Accum@8))
+GL_PREFIX(Accum,Accum@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Accum))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Disable,Disable@4))
+GL_PREFIX(Disable,Disable@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Disable))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Enable,Enable@4))
+GL_PREFIX(Enable,Enable@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Enable))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Finish,Finish@0))
+GL_PREFIX(Finish,Finish@0):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Finish))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Flush,Flush@0))
+GL_PREFIX(Flush,Flush@0):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Flush))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PopAttrib,PopAttrib@0))
+GL_PREFIX(PopAttrib,PopAttrib@0):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PopAttrib))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PushAttrib,PushAttrib@4))
+GL_PREFIX(PushAttrib,PushAttrib@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PushAttrib))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Map1d,Map1d@32))
+GL_PREFIX(Map1d,Map1d@32):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Map1d))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Map1f,Map1f@24))
+GL_PREFIX(Map1f,Map1f@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Map1f))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Map2d,Map2d@56))
+GL_PREFIX(Map2d,Map2d@56):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Map2d))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Map2f,Map2f@40))
+GL_PREFIX(Map2f,Map2f@40):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Map2f))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MapGrid1d,MapGrid1d@20))
+GL_PREFIX(MapGrid1d,MapGrid1d@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MapGrid1d))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MapGrid1f,MapGrid1f@12))
+GL_PREFIX(MapGrid1f,MapGrid1f@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MapGrid1f))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MapGrid2d,MapGrid2d@40))
+GL_PREFIX(MapGrid2d,MapGrid2d@40):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MapGrid2d))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MapGrid2f,MapGrid2f@24))
+GL_PREFIX(MapGrid2f,MapGrid2f@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MapGrid2f))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(EvalCoord1d,EvalCoord1d@8))
+GL_PREFIX(EvalCoord1d,EvalCoord1d@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_EvalCoord1d))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(EvalCoord1dv,EvalCoord1dv@4))
+GL_PREFIX(EvalCoord1dv,EvalCoord1dv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_EvalCoord1dv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(EvalCoord1f,EvalCoord1f@4))
+GL_PREFIX(EvalCoord1f,EvalCoord1f@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_EvalCoord1f))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(EvalCoord1fv,EvalCoord1fv@4))
+GL_PREFIX(EvalCoord1fv,EvalCoord1fv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_EvalCoord1fv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(EvalCoord2d,EvalCoord2d@16))
+GL_PREFIX(EvalCoord2d,EvalCoord2d@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_EvalCoord2d))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(EvalCoord2dv,EvalCoord2dv@4))
+GL_PREFIX(EvalCoord2dv,EvalCoord2dv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_EvalCoord2dv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(EvalCoord2f,EvalCoord2f@8))
+GL_PREFIX(EvalCoord2f,EvalCoord2f@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_EvalCoord2f))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(EvalCoord2fv,EvalCoord2fv@4))
+GL_PREFIX(EvalCoord2fv,EvalCoord2fv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_EvalCoord2fv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(EvalMesh1,EvalMesh1@12))
+GL_PREFIX(EvalMesh1,EvalMesh1@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_EvalMesh1))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(EvalPoint1,EvalPoint1@4))
+GL_PREFIX(EvalPoint1,EvalPoint1@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_EvalPoint1))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(EvalMesh2,EvalMesh2@20))
+GL_PREFIX(EvalMesh2,EvalMesh2@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_EvalMesh2))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(EvalPoint2,EvalPoint2@8))
+GL_PREFIX(EvalPoint2,EvalPoint2@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_EvalPoint2))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(AlphaFunc,AlphaFunc@8))
+GL_PREFIX(AlphaFunc,AlphaFunc@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_AlphaFunc))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(BlendFunc,BlendFunc@8))
+GL_PREFIX(BlendFunc,BlendFunc@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_BlendFunc))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(LogicOp,LogicOp@4))
+GL_PREFIX(LogicOp,LogicOp@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_LogicOp))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(StencilFunc,StencilFunc@12))
+GL_PREFIX(StencilFunc,StencilFunc@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_StencilFunc))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(StencilOp,StencilOp@12))
+GL_PREFIX(StencilOp,StencilOp@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_StencilOp))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(DepthFunc,DepthFunc@4))
+GL_PREFIX(DepthFunc,DepthFunc@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_DepthFunc))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PixelZoom,PixelZoom@8))
+GL_PREFIX(PixelZoom,PixelZoom@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PixelZoom))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PixelTransferf,PixelTransferf@8))
+GL_PREFIX(PixelTransferf,PixelTransferf@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PixelTransferf))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PixelTransferi,PixelTransferi@8))
+GL_PREFIX(PixelTransferi,PixelTransferi@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PixelTransferi))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PixelStoref,PixelStoref@8))
+GL_PREFIX(PixelStoref,PixelStoref@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PixelStoref))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PixelStorei,PixelStorei@8))
+GL_PREFIX(PixelStorei,PixelStorei@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PixelStorei))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PixelMapfv,PixelMapfv@12))
+GL_PREFIX(PixelMapfv,PixelMapfv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PixelMapfv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PixelMapuiv,PixelMapuiv@12))
+GL_PREFIX(PixelMapuiv,PixelMapuiv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PixelMapuiv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PixelMapusv,PixelMapusv@12))
+GL_PREFIX(PixelMapusv,PixelMapusv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PixelMapusv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ReadBuffer,ReadBuffer@4))
+GL_PREFIX(ReadBuffer,ReadBuffer@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ReadBuffer))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CopyPixels,CopyPixels@20))
+GL_PREFIX(CopyPixels,CopyPixels@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CopyPixels))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ReadPixels,ReadPixels@28))
+GL_PREFIX(ReadPixels,ReadPixels@28):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ReadPixels))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(DrawPixels,DrawPixels@20))
+GL_PREFIX(DrawPixels,DrawPixels@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_DrawPixels))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetBooleanv,GetBooleanv@8))
+GL_PREFIX(GetBooleanv,GetBooleanv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetBooleanv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetClipPlane,GetClipPlane@8))
+GL_PREFIX(GetClipPlane,GetClipPlane@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetClipPlane))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetDoublev,GetDoublev@8))
+GL_PREFIX(GetDoublev,GetDoublev@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetDoublev))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetError,GetError@0))
+GL_PREFIX(GetError,GetError@0):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetError))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetFloatv,GetFloatv@8))
+GL_PREFIX(GetFloatv,GetFloatv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetFloatv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetIntegerv,GetIntegerv@8))
+GL_PREFIX(GetIntegerv,GetIntegerv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetIntegerv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetLightfv,GetLightfv@12))
+GL_PREFIX(GetLightfv,GetLightfv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetLightfv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetLightiv,GetLightiv@12))
+GL_PREFIX(GetLightiv,GetLightiv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetLightiv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetMapdv,GetMapdv@12))
+GL_PREFIX(GetMapdv,GetMapdv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetMapdv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetMapfv,GetMapfv@12))
+GL_PREFIX(GetMapfv,GetMapfv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetMapfv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetMapiv,GetMapiv@12))
+GL_PREFIX(GetMapiv,GetMapiv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetMapiv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetMaterialfv,GetMaterialfv@12))
+GL_PREFIX(GetMaterialfv,GetMaterialfv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetMaterialfv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetMaterialiv,GetMaterialiv@12))
+GL_PREFIX(GetMaterialiv,GetMaterialiv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetMaterialiv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetPixelMapfv,GetPixelMapfv@8))
+GL_PREFIX(GetPixelMapfv,GetPixelMapfv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetPixelMapfv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetPixelMapuiv,GetPixelMapuiv@8))
+GL_PREFIX(GetPixelMapuiv,GetPixelMapuiv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetPixelMapuiv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetPixelMapusv,GetPixelMapusv@8))
+GL_PREFIX(GetPixelMapusv,GetPixelMapusv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetPixelMapusv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetPolygonStipple,GetPolygonStipple@4))
+GL_PREFIX(GetPolygonStipple,GetPolygonStipple@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetPolygonStipple))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetString,GetString@4))
+GL_PREFIX(GetString,GetString@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetString))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetTexEnvfv,GetTexEnvfv@12))
+GL_PREFIX(GetTexEnvfv,GetTexEnvfv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetTexEnvfv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetTexEnviv,GetTexEnviv@12))
+GL_PREFIX(GetTexEnviv,GetTexEnviv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetTexEnviv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetTexGendv,GetTexGendv@12))
+GL_PREFIX(GetTexGendv,GetTexGendv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetTexGendv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetTexGenfv,GetTexGenfv@12))
+GL_PREFIX(GetTexGenfv,GetTexGenfv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetTexGenfv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetTexGeniv,GetTexGeniv@12))
+GL_PREFIX(GetTexGeniv,GetTexGeniv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetTexGeniv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetTexImage,GetTexImage@20))
+GL_PREFIX(GetTexImage,GetTexImage@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetTexImage))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetTexParameterfv,GetTexParameterfv@12))
+GL_PREFIX(GetTexParameterfv,GetTexParameterfv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetTexParameterfv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetTexParameteriv,GetTexParameteriv@12))
+GL_PREFIX(GetTexParameteriv,GetTexParameteriv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetTexParameteriv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetTexLevelParameterfv,GetTexLevelParameterfv@16))
+GL_PREFIX(GetTexLevelParameterfv,GetTexLevelParameterfv@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetTexLevelParameterfv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetTexLevelParameteriv,GetTexLevelParameteriv@16))
+GL_PREFIX(GetTexLevelParameteriv,GetTexLevelParameteriv@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetTexLevelParameteriv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(IsEnabled,IsEnabled@4))
+GL_PREFIX(IsEnabled,IsEnabled@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_IsEnabled))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(IsList,IsList@4))
+GL_PREFIX(IsList,IsList@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_IsList))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(DepthRange,DepthRange@16))
+GL_PREFIX(DepthRange,DepthRange@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_DepthRange))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Frustum,Frustum@48))
+GL_PREFIX(Frustum,Frustum@48):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Frustum))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(LoadIdentity,LoadIdentity@0))
+GL_PREFIX(LoadIdentity,LoadIdentity@0):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_LoadIdentity))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(LoadMatrixf,LoadMatrixf@4))
+GL_PREFIX(LoadMatrixf,LoadMatrixf@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_LoadMatrixf))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(LoadMatrixd,LoadMatrixd@4))
+GL_PREFIX(LoadMatrixd,LoadMatrixd@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_LoadMatrixd))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MatrixMode,MatrixMode@4))
+GL_PREFIX(MatrixMode,MatrixMode@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MatrixMode))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultMatrixf,MultMatrixf@4))
+GL_PREFIX(MultMatrixf,MultMatrixf@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultMatrixf))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultMatrixd,MultMatrixd@4))
+GL_PREFIX(MultMatrixd,MultMatrixd@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultMatrixd))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Ortho,Ortho@48))
+GL_PREFIX(Ortho,Ortho@48):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Ortho))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PopMatrix,PopMatrix@0))
+GL_PREFIX(PopMatrix,PopMatrix@0):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PopMatrix))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PushMatrix,PushMatrix@0))
+GL_PREFIX(PushMatrix,PushMatrix@0):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PushMatrix))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Rotated,Rotated@32))
+GL_PREFIX(Rotated,Rotated@32):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Rotated))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Rotatef,Rotatef@16))
+GL_PREFIX(Rotatef,Rotatef@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Rotatef))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Scaled,Scaled@24))
+GL_PREFIX(Scaled,Scaled@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Scaled))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Scalef,Scalef@12))
+GL_PREFIX(Scalef,Scalef@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Scalef))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Translated,Translated@24))
+GL_PREFIX(Translated,Translated@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Translated))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Translatef,Translatef@12))
+GL_PREFIX(Translatef,Translatef@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Translatef))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Viewport,Viewport@16))
+GL_PREFIX(Viewport,Viewport@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Viewport))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ArrayElement,ArrayElement@4))
+GL_PREFIX(ArrayElement,ArrayElement@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ArrayElement))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ColorPointer,ColorPointer@16))
+GL_PREFIX(ColorPointer,ColorPointer@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ColorPointer))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(DisableClientState,DisableClientState@4))
+GL_PREFIX(DisableClientState,DisableClientState@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_DisableClientState))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(DrawArrays,DrawArrays@12))
+GL_PREFIX(DrawArrays,DrawArrays@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_DrawArrays))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(DrawElements,DrawElements@16))
+GL_PREFIX(DrawElements,DrawElements@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_DrawElements))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(EdgeFlagPointer,EdgeFlagPointer@8))
+GL_PREFIX(EdgeFlagPointer,EdgeFlagPointer@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_EdgeFlagPointer))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(EnableClientState,EnableClientState@4))
+GL_PREFIX(EnableClientState,EnableClientState@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_EnableClientState))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetPointerv,GetPointerv@8))
+GL_PREFIX(GetPointerv,GetPointerv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetPointerv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(IndexPointer,IndexPointer@12))
+GL_PREFIX(IndexPointer,IndexPointer@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_IndexPointer))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(InterleavedArrays,InterleavedArrays@12))
+GL_PREFIX(InterleavedArrays,InterleavedArrays@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_InterleavedArrays))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(NormalPointer,NormalPointer@12))
+GL_PREFIX(NormalPointer,NormalPointer@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_NormalPointer))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoordPointer,TexCoordPointer@16))
+GL_PREFIX(TexCoordPointer,TexCoordPointer@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoordPointer))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexPointer,VertexPointer@16))
+GL_PREFIX(VertexPointer,VertexPointer@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexPointer))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PolygonOffset,PolygonOffset@8))
+GL_PREFIX(PolygonOffset,PolygonOffset@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PolygonOffset))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CopyTexImage1D,CopyTexImage1D@28))
+GL_PREFIX(CopyTexImage1D,CopyTexImage1D@28):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CopyTexImage1D))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CopyTexImage2D,CopyTexImage2D@32))
+GL_PREFIX(CopyTexImage2D,CopyTexImage2D@32):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CopyTexImage2D))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CopyTexSubImage1D,CopyTexSubImage1D@24))
+GL_PREFIX(CopyTexSubImage1D,CopyTexSubImage1D@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CopyTexSubImage1D))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CopyTexSubImage2D,CopyTexSubImage2D@32))
+GL_PREFIX(CopyTexSubImage2D,CopyTexSubImage2D@32):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CopyTexSubImage2D))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexSubImage1D,TexSubImage1D@28))
+GL_PREFIX(TexSubImage1D,TexSubImage1D@28):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexSubImage1D))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexSubImage2D,TexSubImage2D@36))
+GL_PREFIX(TexSubImage2D,TexSubImage2D@36):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexSubImage2D))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(AreTexturesResident,AreTexturesResident@12))
+GL_PREFIX(AreTexturesResident,AreTexturesResident@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_AreTexturesResident))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(BindTexture,BindTexture@8))
+GL_PREFIX(BindTexture,BindTexture@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_BindTexture))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(DeleteTextures,DeleteTextures@8))
+GL_PREFIX(DeleteTextures,DeleteTextures@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_DeleteTextures))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GenTextures,GenTextures@8))
+GL_PREFIX(GenTextures,GenTextures@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GenTextures))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(IsTexture,IsTexture@4))
+GL_PREFIX(IsTexture,IsTexture@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_IsTexture))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PrioritizeTextures,PrioritizeTextures@12))
+GL_PREFIX(PrioritizeTextures,PrioritizeTextures@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PrioritizeTextures))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Indexub,Indexub@4))
+GL_PREFIX(Indexub,Indexub@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Indexub))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Indexubv,Indexubv@4))
+GL_PREFIX(Indexubv,Indexubv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Indexubv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PopClientAttrib,PopClientAttrib@0))
+GL_PREFIX(PopClientAttrib,PopClientAttrib@0):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PopClientAttrib))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PushClientAttrib,PushClientAttrib@4))
+GL_PREFIX(PushClientAttrib,PushClientAttrib@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PushClientAttrib))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(BlendColor,BlendColor@16))
+GL_PREFIX(BlendColor,BlendColor@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_BlendColor))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(BlendEquation,BlendEquation@4))
+GL_PREFIX(BlendEquation,BlendEquation@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_BlendEquation))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(DrawRangeElements,DrawRangeElements@24))
+GL_PREFIX(DrawRangeElements,DrawRangeElements@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_DrawRangeElements))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ColorTable,ColorTable@24))
+GL_PREFIX(ColorTable,ColorTable@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ColorTable))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ColorTableParameterfv,ColorTableParameterfv@12))
+GL_PREFIX(ColorTableParameterfv,ColorTableParameterfv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ColorTableParameterfv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ColorTableParameteriv,ColorTableParameteriv@12))
+GL_PREFIX(ColorTableParameteriv,ColorTableParameteriv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ColorTableParameteriv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CopyColorTable,CopyColorTable@20))
+GL_PREFIX(CopyColorTable,CopyColorTable@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CopyColorTable))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetColorTable,GetColorTable@16))
+GL_PREFIX(GetColorTable,GetColorTable@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetColorTable))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetColorTableParameterfv,GetColorTableParameterfv@12))
+GL_PREFIX(GetColorTableParameterfv,GetColorTableParameterfv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetColorTableParameterfv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetColorTableParameteriv,GetColorTableParameteriv@12))
+GL_PREFIX(GetColorTableParameteriv,GetColorTableParameteriv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetColorTableParameteriv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ColorSubTable,ColorSubTable@24))
+GL_PREFIX(ColorSubTable,ColorSubTable@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ColorSubTable))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CopyColorSubTable,CopyColorSubTable@20))
+GL_PREFIX(CopyColorSubTable,CopyColorSubTable@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CopyColorSubTable))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ConvolutionFilter1D,ConvolutionFilter1D@24))
+GL_PREFIX(ConvolutionFilter1D,ConvolutionFilter1D@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ConvolutionFilter1D))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ConvolutionFilter2D,ConvolutionFilter2D@28))
+GL_PREFIX(ConvolutionFilter2D,ConvolutionFilter2D@28):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ConvolutionFilter2D))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ConvolutionParameterf,ConvolutionParameterf@12))
+GL_PREFIX(ConvolutionParameterf,ConvolutionParameterf@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ConvolutionParameterf))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ConvolutionParameterfv,ConvolutionParameterfv@12))
+GL_PREFIX(ConvolutionParameterfv,ConvolutionParameterfv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ConvolutionParameterfv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ConvolutionParameteri,ConvolutionParameteri@12))
+GL_PREFIX(ConvolutionParameteri,ConvolutionParameteri@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ConvolutionParameteri))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ConvolutionParameteriv,ConvolutionParameteriv@12))
+GL_PREFIX(ConvolutionParameteriv,ConvolutionParameteriv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ConvolutionParameteriv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CopyConvolutionFilter1D,CopyConvolutionFilter1D@20))
+GL_PREFIX(CopyConvolutionFilter1D,CopyConvolutionFilter1D@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CopyConvolutionFilter1D))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CopyConvolutionFilter2D,CopyConvolutionFilter2D@24))
+GL_PREFIX(CopyConvolutionFilter2D,CopyConvolutionFilter2D@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CopyConvolutionFilter2D))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetConvolutionFilter,GetConvolutionFilter@16))
+GL_PREFIX(GetConvolutionFilter,GetConvolutionFilter@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetConvolutionFilter))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetConvolutionParameterfv,GetConvolutionParameterfv@12))
+GL_PREFIX(GetConvolutionParameterfv,GetConvolutionParameterfv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetConvolutionParameterfv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetConvolutionParameteriv,GetConvolutionParameteriv@12))
+GL_PREFIX(GetConvolutionParameteriv,GetConvolutionParameteriv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetConvolutionParameteriv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetSeparableFilter,GetSeparableFilter@24))
+GL_PREFIX(GetSeparableFilter,GetSeparableFilter@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetSeparableFilter))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SeparableFilter2D,SeparableFilter2D@32))
+GL_PREFIX(SeparableFilter2D,SeparableFilter2D@32):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SeparableFilter2D))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetHistogram,GetHistogram@20))
+GL_PREFIX(GetHistogram,GetHistogram@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetHistogram))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetHistogramParameterfv,GetHistogramParameterfv@12))
+GL_PREFIX(GetHistogramParameterfv,GetHistogramParameterfv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetHistogramParameterfv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetHistogramParameteriv,GetHistogramParameteriv@12))
+GL_PREFIX(GetHistogramParameteriv,GetHistogramParameteriv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetHistogramParameteriv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetMinmax,GetMinmax@20))
+GL_PREFIX(GetMinmax,GetMinmax@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetMinmax))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetMinmaxParameterfv,GetMinmaxParameterfv@12))
+GL_PREFIX(GetMinmaxParameterfv,GetMinmaxParameterfv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetMinmaxParameterfv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetMinmaxParameteriv,GetMinmaxParameteriv@12))
+GL_PREFIX(GetMinmaxParameteriv,GetMinmaxParameteriv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetMinmaxParameteriv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Histogram,Histogram@16))
+GL_PREFIX(Histogram,Histogram@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Histogram))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(Minmax,Minmax@12))
+GL_PREFIX(Minmax,Minmax@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Minmax))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ResetHistogram,ResetHistogram@4))
+GL_PREFIX(ResetHistogram,ResetHistogram@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ResetHistogram))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ResetMinmax,ResetMinmax@4))
+GL_PREFIX(ResetMinmax,ResetMinmax@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ResetMinmax))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexImage3D,TexImage3D@40))
+GL_PREFIX(TexImage3D,TexImage3D@40):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexImage3D))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexSubImage3D,TexSubImage3D@44))
+GL_PREFIX(TexSubImage3D,TexSubImage3D@44):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexSubImage3D))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CopyTexSubImage3D,CopyTexSubImage3D@36))
+GL_PREFIX(CopyTexSubImage3D,CopyTexSubImage3D@36):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CopyTexSubImage3D))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ActiveTextureARB,ActiveTextureARB@4))
+GL_PREFIX(ActiveTextureARB,ActiveTextureARB@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ActiveTextureARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ClientActiveTextureARB,ClientActiveTextureARB@4))
+GL_PREFIX(ClientActiveTextureARB,ClientActiveTextureARB@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ClientActiveTextureARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord1dARB,MultiTexCoord1dARB@12))
+GL_PREFIX(MultiTexCoord1dARB,MultiTexCoord1dARB@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord1dARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord1dvARB,MultiTexCoord1dvARB@8))
+GL_PREFIX(MultiTexCoord1dvARB,MultiTexCoord1dvARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord1dvARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord1fARB,MultiTexCoord1fARB@8))
+GL_PREFIX(MultiTexCoord1fARB,MultiTexCoord1fARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord1fARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord1fvARB,MultiTexCoord1fvARB@8))
+GL_PREFIX(MultiTexCoord1fvARB,MultiTexCoord1fvARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord1fvARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord1iARB,MultiTexCoord1iARB@8))
+GL_PREFIX(MultiTexCoord1iARB,MultiTexCoord1iARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord1iARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord1ivARB,MultiTexCoord1ivARB@8))
+GL_PREFIX(MultiTexCoord1ivARB,MultiTexCoord1ivARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord1ivARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord1sARB,MultiTexCoord1sARB@8))
+GL_PREFIX(MultiTexCoord1sARB,MultiTexCoord1sARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord1sARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord1svARB,MultiTexCoord1svARB@8))
+GL_PREFIX(MultiTexCoord1svARB,MultiTexCoord1svARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord1svARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord2dARB,MultiTexCoord2dARB@20))
+GL_PREFIX(MultiTexCoord2dARB,MultiTexCoord2dARB@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord2dARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord2dvARB,MultiTexCoord2dvARB@8))
+GL_PREFIX(MultiTexCoord2dvARB,MultiTexCoord2dvARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord2dvARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord2fARB,MultiTexCoord2fARB@12))
+GL_PREFIX(MultiTexCoord2fARB,MultiTexCoord2fARB@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord2fARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord2fvARB,MultiTexCoord2fvARB@8))
+GL_PREFIX(MultiTexCoord2fvARB,MultiTexCoord2fvARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord2fvARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord2iARB,MultiTexCoord2iARB@12))
+GL_PREFIX(MultiTexCoord2iARB,MultiTexCoord2iARB@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord2iARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord2ivARB,MultiTexCoord2ivARB@8))
+GL_PREFIX(MultiTexCoord2ivARB,MultiTexCoord2ivARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord2ivARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord2sARB,MultiTexCoord2sARB@12))
+GL_PREFIX(MultiTexCoord2sARB,MultiTexCoord2sARB@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord2sARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord2svARB,MultiTexCoord2svARB@8))
+GL_PREFIX(MultiTexCoord2svARB,MultiTexCoord2svARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord2svARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord3dARB,MultiTexCoord3dARB@28))
+GL_PREFIX(MultiTexCoord3dARB,MultiTexCoord3dARB@28):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord3dARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord3dvARB,MultiTexCoord3dvARB@8))
+GL_PREFIX(MultiTexCoord3dvARB,MultiTexCoord3dvARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord3dvARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord3fARB,MultiTexCoord3fARB@16))
+GL_PREFIX(MultiTexCoord3fARB,MultiTexCoord3fARB@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord3fARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord3fvARB,MultiTexCoord3fvARB@8))
+GL_PREFIX(MultiTexCoord3fvARB,MultiTexCoord3fvARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord3fvARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord3iARB,MultiTexCoord3iARB@16))
+GL_PREFIX(MultiTexCoord3iARB,MultiTexCoord3iARB@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord3iARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord3ivARB,MultiTexCoord3ivARB@8))
+GL_PREFIX(MultiTexCoord3ivARB,MultiTexCoord3ivARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord3ivARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord3sARB,MultiTexCoord3sARB@16))
+GL_PREFIX(MultiTexCoord3sARB,MultiTexCoord3sARB@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord3sARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord3svARB,MultiTexCoord3svARB@8))
+GL_PREFIX(MultiTexCoord3svARB,MultiTexCoord3svARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord3svARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord4dARB,MultiTexCoord4dARB@36))
+GL_PREFIX(MultiTexCoord4dARB,MultiTexCoord4dARB@36):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord4dARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord4dvARB,MultiTexCoord4dvARB@8))
+GL_PREFIX(MultiTexCoord4dvARB,MultiTexCoord4dvARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord4dvARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord4fARB,MultiTexCoord4fARB@20))
+GL_PREFIX(MultiTexCoord4fARB,MultiTexCoord4fARB@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord4fARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord4fvARB,MultiTexCoord4fvARB@8))
+GL_PREFIX(MultiTexCoord4fvARB,MultiTexCoord4fvARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord4fvARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord4iARB,MultiTexCoord4iARB@20))
+GL_PREFIX(MultiTexCoord4iARB,MultiTexCoord4iARB@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord4iARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord4ivARB,MultiTexCoord4ivARB@8))
+GL_PREFIX(MultiTexCoord4ivARB,MultiTexCoord4ivARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord4ivARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord4sARB,MultiTexCoord4sARB@20))
+GL_PREFIX(MultiTexCoord4sARB,MultiTexCoord4sARB@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord4sARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord4svARB,MultiTexCoord4svARB@8))
+GL_PREFIX(MultiTexCoord4svARB,MultiTexCoord4svARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord4svARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(LoadTransposeMatrixfARB,LoadTransposeMatrixfARB@4))
+GL_PREFIX(LoadTransposeMatrixfARB,LoadTransposeMatrixfARB@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_LoadTransposeMatrixfARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(LoadTransposeMatrixdARB,LoadTransposeMatrixdARB@4))
+GL_PREFIX(LoadTransposeMatrixdARB,LoadTransposeMatrixdARB@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_LoadTransposeMatrixdARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultTransposeMatrixfARB,MultTransposeMatrixfARB@4))
+GL_PREFIX(MultTransposeMatrixfARB,MultTransposeMatrixfARB@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultTransposeMatrixfARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultTransposeMatrixdARB,MultTransposeMatrixdARB@4))
+GL_PREFIX(MultTransposeMatrixdARB,MultTransposeMatrixdARB@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultTransposeMatrixdARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SampleCoverageARB,SampleCoverageARB@8))
+GL_PREFIX(SampleCoverageARB,SampleCoverageARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SampleCoverageARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(__unused413,__unused413@0))
+GL_PREFIX(__unused413,__unused413@0):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset___unused413))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CompressedTexImage3DARB,CompressedTexImage3DARB@36))
+GL_PREFIX(CompressedTexImage3DARB,CompressedTexImage3DARB@36):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CompressedTexImage3DARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CompressedTexImage2DARB,CompressedTexImage2DARB@32))
+GL_PREFIX(CompressedTexImage2DARB,CompressedTexImage2DARB@32):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CompressedTexImage2DARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CompressedTexImage1DARB,CompressedTexImage1DARB@28))
+GL_PREFIX(CompressedTexImage1DARB,CompressedTexImage1DARB@28):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CompressedTexImage1DARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CompressedTexSubImage3DARB,CompressedTexSubImage3DARB@44))
+GL_PREFIX(CompressedTexSubImage3DARB,CompressedTexSubImage3DARB@44):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CompressedTexSubImage3DARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CompressedTexSubImage2DARB,CompressedTexSubImage2DARB@36))
+GL_PREFIX(CompressedTexSubImage2DARB,CompressedTexSubImage2DARB@36):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CompressedTexSubImage2DARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CompressedTexSubImage1DARB,CompressedTexSubImage1DARB@28))
+GL_PREFIX(CompressedTexSubImage1DARB,CompressedTexSubImage1DARB@28):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CompressedTexSubImage1DARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetCompressedTexImageARB,GetCompressedTexImageARB@12))
+GL_PREFIX(GetCompressedTexImageARB,GetCompressedTexImageARB@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetCompressedTexImageARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ActiveTexture,ActiveTexture@4))
+GL_PREFIX(ActiveTexture,ActiveTexture@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ActiveTextureARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ClientActiveTexture,ClientActiveTexture@4))
+GL_PREFIX(ClientActiveTexture,ClientActiveTexture@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ClientActiveTextureARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord1d,MultiTexCoord1d@12))
+GL_PREFIX(MultiTexCoord1d,MultiTexCoord1d@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord1dARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord1dv,MultiTexCoord1dv@8))
+GL_PREFIX(MultiTexCoord1dv,MultiTexCoord1dv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord1dvARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord1f,MultiTexCoord1f@8))
+GL_PREFIX(MultiTexCoord1f,MultiTexCoord1f@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord1fARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord1fv,MultiTexCoord1fv@8))
+GL_PREFIX(MultiTexCoord1fv,MultiTexCoord1fv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord1fvARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord1i,MultiTexCoord1i@8))
+GL_PREFIX(MultiTexCoord1i,MultiTexCoord1i@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord1iARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord1iv,MultiTexCoord1iv@8))
+GL_PREFIX(MultiTexCoord1iv,MultiTexCoord1iv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord1ivARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord1s,MultiTexCoord1s@8))
+GL_PREFIX(MultiTexCoord1s,MultiTexCoord1s@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord1sARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord1sv,MultiTexCoord1sv@8))
+GL_PREFIX(MultiTexCoord1sv,MultiTexCoord1sv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord1svARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord2d,MultiTexCoord2d@20))
+GL_PREFIX(MultiTexCoord2d,MultiTexCoord2d@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord2dARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord2dv,MultiTexCoord2dv@8))
+GL_PREFIX(MultiTexCoord2dv,MultiTexCoord2dv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord2dvARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord2f,MultiTexCoord2f@12))
+GL_PREFIX(MultiTexCoord2f,MultiTexCoord2f@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord2fARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord2fv,MultiTexCoord2fv@8))
+GL_PREFIX(MultiTexCoord2fv,MultiTexCoord2fv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord2fvARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord2i,MultiTexCoord2i@12))
+GL_PREFIX(MultiTexCoord2i,MultiTexCoord2i@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord2iARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord2iv,MultiTexCoord2iv@8))
+GL_PREFIX(MultiTexCoord2iv,MultiTexCoord2iv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord2ivARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord2s,MultiTexCoord2s@12))
+GL_PREFIX(MultiTexCoord2s,MultiTexCoord2s@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord2sARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord2sv,MultiTexCoord2sv@8))
+GL_PREFIX(MultiTexCoord2sv,MultiTexCoord2sv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord2svARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord3d,MultiTexCoord3d@28))
+GL_PREFIX(MultiTexCoord3d,MultiTexCoord3d@28):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord3dARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord3dv,MultiTexCoord3dv@8))
+GL_PREFIX(MultiTexCoord3dv,MultiTexCoord3dv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord3dvARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord3f,MultiTexCoord3f@16))
+GL_PREFIX(MultiTexCoord3f,MultiTexCoord3f@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord3fARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord3fv,MultiTexCoord3fv@8))
+GL_PREFIX(MultiTexCoord3fv,MultiTexCoord3fv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord3fvARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord3i,MultiTexCoord3i@16))
+GL_PREFIX(MultiTexCoord3i,MultiTexCoord3i@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord3iARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord3iv,MultiTexCoord3iv@8))
+GL_PREFIX(MultiTexCoord3iv,MultiTexCoord3iv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord3ivARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord3s,MultiTexCoord3s@16))
+GL_PREFIX(MultiTexCoord3s,MultiTexCoord3s@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord3sARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord3sv,MultiTexCoord3sv@8))
+GL_PREFIX(MultiTexCoord3sv,MultiTexCoord3sv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord3svARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord4d,MultiTexCoord4d@36))
+GL_PREFIX(MultiTexCoord4d,MultiTexCoord4d@36):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord4dARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord4dv,MultiTexCoord4dv@8))
+GL_PREFIX(MultiTexCoord4dv,MultiTexCoord4dv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord4dvARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord4f,MultiTexCoord4f@20))
+GL_PREFIX(MultiTexCoord4f,MultiTexCoord4f@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord4fARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord4fv,MultiTexCoord4fv@8))
+GL_PREFIX(MultiTexCoord4fv,MultiTexCoord4fv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord4fvARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord4i,MultiTexCoord4i@20))
+GL_PREFIX(MultiTexCoord4i,MultiTexCoord4i@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord4iARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord4iv,MultiTexCoord4iv@8))
+GL_PREFIX(MultiTexCoord4iv,MultiTexCoord4iv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord4ivARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord4s,MultiTexCoord4s@20))
+GL_PREFIX(MultiTexCoord4s,MultiTexCoord4s@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord4sARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiTexCoord4sv,MultiTexCoord4sv@8))
+GL_PREFIX(MultiTexCoord4sv,MultiTexCoord4sv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiTexCoord4svARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(LoadTransposeMatrixf,LoadTransposeMatrixf@4))
+GL_PREFIX(LoadTransposeMatrixf,LoadTransposeMatrixf@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_LoadTransposeMatrixfARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(LoadTransposeMatrixd,LoadTransposeMatrixd@4))
+GL_PREFIX(LoadTransposeMatrixd,LoadTransposeMatrixd@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_LoadTransposeMatrixdARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultTransposeMatrixf,MultTransposeMatrixf@4))
+GL_PREFIX(MultTransposeMatrixf,MultTransposeMatrixf@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultTransposeMatrixfARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultTransposeMatrixd,MultTransposeMatrixd@4))
+GL_PREFIX(MultTransposeMatrixd,MultTransposeMatrixd@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultTransposeMatrixdARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SampleCoverage,SampleCoverage@8))
+GL_PREFIX(SampleCoverage,SampleCoverage@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SampleCoverageARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CompressedTexImage3D,CompressedTexImage3D@36))
+GL_PREFIX(CompressedTexImage3D,CompressedTexImage3D@36):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CompressedTexImage3DARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CompressedTexImage2D,CompressedTexImage2D@32))
+GL_PREFIX(CompressedTexImage2D,CompressedTexImage2D@32):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CompressedTexImage2DARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CompressedTexImage1D,CompressedTexImage1D@28))
+GL_PREFIX(CompressedTexImage1D,CompressedTexImage1D@28):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CompressedTexImage1DARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CompressedTexSubImage3D,CompressedTexSubImage3D@44))
+GL_PREFIX(CompressedTexSubImage3D,CompressedTexSubImage3D@44):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CompressedTexSubImage3DARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CompressedTexSubImage2D,CompressedTexSubImage2D@36))
+GL_PREFIX(CompressedTexSubImage2D,CompressedTexSubImage2D@36):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CompressedTexSubImage2DARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CompressedTexSubImage1D,CompressedTexSubImage1D@28))
+GL_PREFIX(CompressedTexSubImage1D,CompressedTexSubImage1D@28):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CompressedTexSubImage1DARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetCompressedTexImage,GetCompressedTexImage@12))
+GL_PREFIX(GetCompressedTexImage,GetCompressedTexImage@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetCompressedTexImageARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(BlendColorEXT,BlendColorEXT@16))
+GL_PREFIX(BlendColorEXT,BlendColorEXT@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_BlendColor))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PolygonOffsetEXT,PolygonOffsetEXT@8))
+GL_PREFIX(PolygonOffsetEXT,PolygonOffsetEXT@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PolygonOffsetEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexImage3DEXT,TexImage3DEXT@40))
+GL_PREFIX(TexImage3DEXT,TexImage3DEXT@40):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexImage3D))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexSubImage3DEXT,TexSubImage3DEXT@44))
+GL_PREFIX(TexSubImage3DEXT,TexSubImage3DEXT@44):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexSubImage3D))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetTexFilterFuncSGIS,GetTexFilterFuncSGIS@12))
+GL_PREFIX(GetTexFilterFuncSGIS,GetTexFilterFuncSGIS@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetTexFilterFuncSGIS))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexFilterFuncSGIS,TexFilterFuncSGIS@16))
+GL_PREFIX(TexFilterFuncSGIS,TexFilterFuncSGIS@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexFilterFuncSGIS))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexSubImage1DEXT,TexSubImage1DEXT@28))
+GL_PREFIX(TexSubImage1DEXT,TexSubImage1DEXT@28):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexSubImage1D))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexSubImage2DEXT,TexSubImage2DEXT@36))
+GL_PREFIX(TexSubImage2DEXT,TexSubImage2DEXT@36):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexSubImage2D))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CopyTexImage1DEXT,CopyTexImage1DEXT@28))
+GL_PREFIX(CopyTexImage1DEXT,CopyTexImage1DEXT@28):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CopyTexImage1D))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CopyTexImage2DEXT,CopyTexImage2DEXT@32))
+GL_PREFIX(CopyTexImage2DEXT,CopyTexImage2DEXT@32):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CopyTexImage2D))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CopyTexSubImage1DEXT,CopyTexSubImage1DEXT@24))
+GL_PREFIX(CopyTexSubImage1DEXT,CopyTexSubImage1DEXT@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CopyTexSubImage1D))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CopyTexSubImage2DEXT,CopyTexSubImage2DEXT@32))
+GL_PREFIX(CopyTexSubImage2DEXT,CopyTexSubImage2DEXT@32):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CopyTexSubImage2D))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CopyTexSubImage3DEXT,CopyTexSubImage3DEXT@36))
+GL_PREFIX(CopyTexSubImage3DEXT,CopyTexSubImage3DEXT@36):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CopyTexSubImage3D))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetHistogramEXT,GetHistogramEXT@20))
+GL_PREFIX(GetHistogramEXT,GetHistogramEXT@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetHistogramEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetHistogramParameterfvEXT,GetHistogramParameterfvEXT@12))
+GL_PREFIX(GetHistogramParameterfvEXT,GetHistogramParameterfvEXT@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetHistogramParameterfvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetHistogramParameterivEXT,GetHistogramParameterivEXT@12))
+GL_PREFIX(GetHistogramParameterivEXT,GetHistogramParameterivEXT@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetHistogramParameterivEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetMinmaxEXT,GetMinmaxEXT@20))
+GL_PREFIX(GetMinmaxEXT,GetMinmaxEXT@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetMinmaxEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetMinmaxParameterfvEXT,GetMinmaxParameterfvEXT@12))
+GL_PREFIX(GetMinmaxParameterfvEXT,GetMinmaxParameterfvEXT@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetMinmaxParameterfvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetMinmaxParameterivEXT,GetMinmaxParameterivEXT@12))
+GL_PREFIX(GetMinmaxParameterivEXT,GetMinmaxParameterivEXT@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetMinmaxParameterivEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(HistogramEXT,HistogramEXT@16))
+GL_PREFIX(HistogramEXT,HistogramEXT@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Histogram))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MinmaxEXT,MinmaxEXT@12))
+GL_PREFIX(MinmaxEXT,MinmaxEXT@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_Minmax))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ResetHistogramEXT,ResetHistogramEXT@4))
+GL_PREFIX(ResetHistogramEXT,ResetHistogramEXT@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ResetHistogram))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ResetMinmaxEXT,ResetMinmaxEXT@4))
+GL_PREFIX(ResetMinmaxEXT,ResetMinmaxEXT@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ResetMinmax))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ConvolutionFilter1DEXT,ConvolutionFilter1DEXT@24))
+GL_PREFIX(ConvolutionFilter1DEXT,ConvolutionFilter1DEXT@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ConvolutionFilter1D))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ConvolutionFilter2DEXT,ConvolutionFilter2DEXT@28))
+GL_PREFIX(ConvolutionFilter2DEXT,ConvolutionFilter2DEXT@28):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ConvolutionFilter2D))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ConvolutionParameterfEXT,ConvolutionParameterfEXT@12))
+GL_PREFIX(ConvolutionParameterfEXT,ConvolutionParameterfEXT@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ConvolutionParameterf))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ConvolutionParameterfvEXT,ConvolutionParameterfvEXT@12))
+GL_PREFIX(ConvolutionParameterfvEXT,ConvolutionParameterfvEXT@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ConvolutionParameterfv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ConvolutionParameteriEXT,ConvolutionParameteriEXT@12))
+GL_PREFIX(ConvolutionParameteriEXT,ConvolutionParameteriEXT@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ConvolutionParameteri))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ConvolutionParameterivEXT,ConvolutionParameterivEXT@12))
+GL_PREFIX(ConvolutionParameterivEXT,ConvolutionParameterivEXT@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ConvolutionParameteriv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CopyConvolutionFilter1DEXT,CopyConvolutionFilter1DEXT@20))
+GL_PREFIX(CopyConvolutionFilter1DEXT,CopyConvolutionFilter1DEXT@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CopyConvolutionFilter1D))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CopyConvolutionFilter2DEXT,CopyConvolutionFilter2DEXT@24))
+GL_PREFIX(CopyConvolutionFilter2DEXT,CopyConvolutionFilter2DEXT@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CopyConvolutionFilter2D))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetConvolutionFilterEXT,GetConvolutionFilterEXT@16))
+GL_PREFIX(GetConvolutionFilterEXT,GetConvolutionFilterEXT@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetConvolutionFilterEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetConvolutionParameterfvEXT,GetConvolutionParameterfvEXT@12))
+GL_PREFIX(GetConvolutionParameterfvEXT,GetConvolutionParameterfvEXT@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetConvolutionParameterfvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetConvolutionParameterivEXT,GetConvolutionParameterivEXT@12))
+GL_PREFIX(GetConvolutionParameterivEXT,GetConvolutionParameterivEXT@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetConvolutionParameterivEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetSeparableFilterEXT,GetSeparableFilterEXT@24))
+GL_PREFIX(GetSeparableFilterEXT,GetSeparableFilterEXT@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetSeparableFilterEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SeparableFilter2DEXT,SeparableFilter2DEXT@32))
+GL_PREFIX(SeparableFilter2DEXT,SeparableFilter2DEXT@32):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SeparableFilter2D))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ColorTableSGI,ColorTableSGI@24))
+GL_PREFIX(ColorTableSGI,ColorTableSGI@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ColorTable))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ColorTableParameterfvSGI,ColorTableParameterfvSGI@12))
+GL_PREFIX(ColorTableParameterfvSGI,ColorTableParameterfvSGI@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ColorTableParameterfv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ColorTableParameterivSGI,ColorTableParameterivSGI@12))
+GL_PREFIX(ColorTableParameterivSGI,ColorTableParameterivSGI@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ColorTableParameteriv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CopyColorTableSGI,CopyColorTableSGI@20))
+GL_PREFIX(CopyColorTableSGI,CopyColorTableSGI@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CopyColorTable))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetColorTableSGI,GetColorTableSGI@16))
+GL_PREFIX(GetColorTableSGI,GetColorTableSGI@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetColorTableSGI))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetColorTableParameterfvSGI,GetColorTableParameterfvSGI@12))
+GL_PREFIX(GetColorTableParameterfvSGI,GetColorTableParameterfvSGI@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetColorTableParameterfvSGI))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetColorTableParameterivSGI,GetColorTableParameterivSGI@12))
+GL_PREFIX(GetColorTableParameterivSGI,GetColorTableParameterivSGI@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetColorTableParameterivSGI))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PixelTexGenSGIX,PixelTexGenSGIX@4))
+GL_PREFIX(PixelTexGenSGIX,PixelTexGenSGIX@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PixelTexGenSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PixelTexGenParameteriSGIS,PixelTexGenParameteriSGIS@8))
+GL_PREFIX(PixelTexGenParameteriSGIS,PixelTexGenParameteriSGIS@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PixelTexGenParameteriSGIS))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PixelTexGenParameterivSGIS,PixelTexGenParameterivSGIS@8))
+GL_PREFIX(PixelTexGenParameterivSGIS,PixelTexGenParameterivSGIS@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PixelTexGenParameterivSGIS))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PixelTexGenParameterfSGIS,PixelTexGenParameterfSGIS@8))
+GL_PREFIX(PixelTexGenParameterfSGIS,PixelTexGenParameterfSGIS@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PixelTexGenParameterfSGIS))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PixelTexGenParameterfvSGIS,PixelTexGenParameterfvSGIS@8))
+GL_PREFIX(PixelTexGenParameterfvSGIS,PixelTexGenParameterfvSGIS@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PixelTexGenParameterfvSGIS))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetPixelTexGenParameterivSGIS,GetPixelTexGenParameterivSGIS@8))
+GL_PREFIX(GetPixelTexGenParameterivSGIS,GetPixelTexGenParameterivSGIS@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetPixelTexGenParameterivSGIS))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetPixelTexGenParameterfvSGIS,GetPixelTexGenParameterfvSGIS@8))
+GL_PREFIX(GetPixelTexGenParameterfvSGIS,GetPixelTexGenParameterfvSGIS@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetPixelTexGenParameterfvSGIS))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexImage4DSGIS,TexImage4DSGIS@44))
+GL_PREFIX(TexImage4DSGIS,TexImage4DSGIS@44):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexImage4DSGIS))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexSubImage4DSGIS,TexSubImage4DSGIS@52))
+GL_PREFIX(TexSubImage4DSGIS,TexSubImage4DSGIS@52):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexSubImage4DSGIS))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(AreTexturesResidentEXT,AreTexturesResidentEXT@12))
+GL_PREFIX(AreTexturesResidentEXT,AreTexturesResidentEXT@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_AreTexturesResidentEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(BindTextureEXT,BindTextureEXT@8))
+GL_PREFIX(BindTextureEXT,BindTextureEXT@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_BindTexture))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(DeleteTexturesEXT,DeleteTexturesEXT@8))
+GL_PREFIX(DeleteTexturesEXT,DeleteTexturesEXT@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_DeleteTextures))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GenTexturesEXT,GenTexturesEXT@8))
+GL_PREFIX(GenTexturesEXT,GenTexturesEXT@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GenTexturesEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(IsTextureEXT,IsTextureEXT@4))
+GL_PREFIX(IsTextureEXT,IsTextureEXT@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_IsTextureEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PrioritizeTexturesEXT,PrioritizeTexturesEXT@12))
+GL_PREFIX(PrioritizeTexturesEXT,PrioritizeTexturesEXT@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PrioritizeTextures))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(DetailTexFuncSGIS,DetailTexFuncSGIS@12))
+GL_PREFIX(DetailTexFuncSGIS,DetailTexFuncSGIS@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_DetailTexFuncSGIS))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetDetailTexFuncSGIS,GetDetailTexFuncSGIS@8))
+GL_PREFIX(GetDetailTexFuncSGIS,GetDetailTexFuncSGIS@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetDetailTexFuncSGIS))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SharpenTexFuncSGIS,SharpenTexFuncSGIS@12))
+GL_PREFIX(SharpenTexFuncSGIS,SharpenTexFuncSGIS@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SharpenTexFuncSGIS))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetSharpenTexFuncSGIS,GetSharpenTexFuncSGIS@8))
+GL_PREFIX(GetSharpenTexFuncSGIS,GetSharpenTexFuncSGIS@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetSharpenTexFuncSGIS))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SampleMaskSGIS,SampleMaskSGIS@8))
+GL_PREFIX(SampleMaskSGIS,SampleMaskSGIS@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SampleMaskSGIS))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SamplePatternSGIS,SamplePatternSGIS@4))
+GL_PREFIX(SamplePatternSGIS,SamplePatternSGIS@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SamplePatternSGIS))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ArrayElementEXT,ArrayElementEXT@4))
+GL_PREFIX(ArrayElementEXT,ArrayElementEXT@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ArrayElement))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ColorPointerEXT,ColorPointerEXT@20))
+GL_PREFIX(ColorPointerEXT,ColorPointerEXT@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ColorPointerEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(DrawArraysEXT,DrawArraysEXT@12))
+GL_PREFIX(DrawArraysEXT,DrawArraysEXT@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_DrawArrays))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(EdgeFlagPointerEXT,EdgeFlagPointerEXT@12))
+GL_PREFIX(EdgeFlagPointerEXT,EdgeFlagPointerEXT@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_EdgeFlagPointerEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetPointervEXT,GetPointervEXT@8))
+GL_PREFIX(GetPointervEXT,GetPointervEXT@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetPointerv))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(IndexPointerEXT,IndexPointerEXT@16))
+GL_PREFIX(IndexPointerEXT,IndexPointerEXT@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_IndexPointerEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(NormalPointerEXT,NormalPointerEXT@16))
+GL_PREFIX(NormalPointerEXT,NormalPointerEXT@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_NormalPointerEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TexCoordPointerEXT,TexCoordPointerEXT@20))
+GL_PREFIX(TexCoordPointerEXT,TexCoordPointerEXT@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TexCoordPointerEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexPointerEXT,VertexPointerEXT@20))
+GL_PREFIX(VertexPointerEXT,VertexPointerEXT@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexPointerEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(BlendEquationEXT,BlendEquationEXT@4))
+GL_PREFIX(BlendEquationEXT,BlendEquationEXT@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_BlendEquation))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SpriteParameterfSGIX,SpriteParameterfSGIX@8))
+GL_PREFIX(SpriteParameterfSGIX,SpriteParameterfSGIX@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SpriteParameterfSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SpriteParameterfvSGIX,SpriteParameterfvSGIX@8))
+GL_PREFIX(SpriteParameterfvSGIX,SpriteParameterfvSGIX@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SpriteParameterfvSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SpriteParameteriSGIX,SpriteParameteriSGIX@8))
+GL_PREFIX(SpriteParameteriSGIX,SpriteParameteriSGIX@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SpriteParameteriSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SpriteParameterivSGIX,SpriteParameterivSGIX@8))
+GL_PREFIX(SpriteParameterivSGIX,SpriteParameterivSGIX@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SpriteParameterivSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PointParameterfEXT,PointParameterfEXT@8))
+GL_PREFIX(PointParameterfEXT,PointParameterfEXT@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PointParameterfEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PointParameterfvEXT,PointParameterfvEXT@8))
+GL_PREFIX(PointParameterfvEXT,PointParameterfvEXT@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PointParameterfvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PointParameterfARB,PointParameterfARB@8))
+GL_PREFIX(PointParameterfARB,PointParameterfARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PointParameterfEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PointParameterfvARB,PointParameterfvARB@8))
+GL_PREFIX(PointParameterfvARB,PointParameterfvARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PointParameterfvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PointParameterfSGIS,PointParameterfSGIS@8))
+GL_PREFIX(PointParameterfSGIS,PointParameterfSGIS@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PointParameterfEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PointParameterfvSGIS,PointParameterfvSGIS@8))
+GL_PREFIX(PointParameterfvSGIS,PointParameterfvSGIS@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PointParameterfvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetInstrumentsSGIX,GetInstrumentsSGIX@0))
+GL_PREFIX(GetInstrumentsSGIX,GetInstrumentsSGIX@0):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetInstrumentsSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(InstrumentsBufferSGIX,InstrumentsBufferSGIX@8))
+GL_PREFIX(InstrumentsBufferSGIX,InstrumentsBufferSGIX@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_InstrumentsBufferSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PollInstrumentsSGIX,PollInstrumentsSGIX@4))
+GL_PREFIX(PollInstrumentsSGIX,PollInstrumentsSGIX@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PollInstrumentsSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ReadInstrumentsSGIX,ReadInstrumentsSGIX@4))
+GL_PREFIX(ReadInstrumentsSGIX,ReadInstrumentsSGIX@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ReadInstrumentsSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(StartInstrumentsSGIX,StartInstrumentsSGIX@0))
+GL_PREFIX(StartInstrumentsSGIX,StartInstrumentsSGIX@0):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_StartInstrumentsSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(StopInstrumentsSGIX,StopInstrumentsSGIX@4))
+GL_PREFIX(StopInstrumentsSGIX,StopInstrumentsSGIX@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_StopInstrumentsSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FrameZoomSGIX,FrameZoomSGIX@4))
+GL_PREFIX(FrameZoomSGIX,FrameZoomSGIX@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_FrameZoomSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TagSampleBufferSGIX,TagSampleBufferSGIX@0))
+GL_PREFIX(TagSampleBufferSGIX,TagSampleBufferSGIX@0):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TagSampleBufferSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ReferencePlaneSGIX,ReferencePlaneSGIX@4))
+GL_PREFIX(ReferencePlaneSGIX,ReferencePlaneSGIX@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ReferencePlaneSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FlushRasterSGIX,FlushRasterSGIX@0))
+GL_PREFIX(FlushRasterSGIX,FlushRasterSGIX@0):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_FlushRasterSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ColorSubTableEXT,ColorSubTableEXT@24))
+GL_PREFIX(ColorSubTableEXT,ColorSubTableEXT@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ColorSubTable))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CopyColorSubTableEXT,CopyColorSubTableEXT@20))
+GL_PREFIX(CopyColorSubTableEXT,CopyColorSubTableEXT@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CopyColorSubTable))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(HintPGI,HintPGI@8))
+GL_PREFIX(HintPGI,HintPGI@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_HintPGI))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ColorTableEXT,ColorTableEXT@24))
+GL_PREFIX(ColorTableEXT,ColorTableEXT@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ColorTable))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetColorTableEXT,GetColorTableEXT@16))
+GL_PREFIX(GetColorTableEXT,GetColorTableEXT@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetColorTableEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetColorTableParameterivEXT,GetColorTableParameterivEXT@12))
+GL_PREFIX(GetColorTableParameterivEXT,GetColorTableParameterivEXT@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetColorTableParameterivEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetColorTableParameterfvEXT,GetColorTableParameterfvEXT@12))
+GL_PREFIX(GetColorTableParameterfvEXT,GetColorTableParameterfvEXT@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetColorTableParameterfvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetListParameterfvSGIX,GetListParameterfvSGIX@12))
+GL_PREFIX(GetListParameterfvSGIX,GetListParameterfvSGIX@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetListParameterfvSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetListParameterivSGIX,GetListParameterivSGIX@12))
+GL_PREFIX(GetListParameterivSGIX,GetListParameterivSGIX@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetListParameterivSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ListParameterfSGIX,ListParameterfSGIX@12))
+GL_PREFIX(ListParameterfSGIX,ListParameterfSGIX@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ListParameterfSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ListParameterfvSGIX,ListParameterfvSGIX@12))
+GL_PREFIX(ListParameterfvSGIX,ListParameterfvSGIX@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ListParameterfvSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ListParameteriSGIX,ListParameteriSGIX@12))
+GL_PREFIX(ListParameteriSGIX,ListParameteriSGIX@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ListParameteriSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ListParameterivSGIX,ListParameterivSGIX@12))
+GL_PREFIX(ListParameterivSGIX,ListParameterivSGIX@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ListParameterivSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(IndexMaterialEXT,IndexMaterialEXT@8))
+GL_PREFIX(IndexMaterialEXT,IndexMaterialEXT@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_IndexMaterialEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(IndexFuncEXT,IndexFuncEXT@8))
+GL_PREFIX(IndexFuncEXT,IndexFuncEXT@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_IndexFuncEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(LockArraysEXT,LockArraysEXT@8))
+GL_PREFIX(LockArraysEXT,LockArraysEXT@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_LockArraysEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(UnlockArraysEXT,UnlockArraysEXT@0))
+GL_PREFIX(UnlockArraysEXT,UnlockArraysEXT@0):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_UnlockArraysEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CullParameterdvEXT,CullParameterdvEXT@8))
+GL_PREFIX(CullParameterdvEXT,CullParameterdvEXT@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CullParameterdvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CullParameterfvEXT,CullParameterfvEXT@8))
+GL_PREFIX(CullParameterfvEXT,CullParameterfvEXT@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CullParameterfvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FragmentColorMaterialSGIX,FragmentColorMaterialSGIX@8))
+GL_PREFIX(FragmentColorMaterialSGIX,FragmentColorMaterialSGIX@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_FragmentColorMaterialSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FragmentLightfSGIX,FragmentLightfSGIX@12))
+GL_PREFIX(FragmentLightfSGIX,FragmentLightfSGIX@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_FragmentLightfSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FragmentLightfvSGIX,FragmentLightfvSGIX@12))
+GL_PREFIX(FragmentLightfvSGIX,FragmentLightfvSGIX@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_FragmentLightfvSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FragmentLightiSGIX,FragmentLightiSGIX@12))
+GL_PREFIX(FragmentLightiSGIX,FragmentLightiSGIX@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_FragmentLightiSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FragmentLightivSGIX,FragmentLightivSGIX@12))
+GL_PREFIX(FragmentLightivSGIX,FragmentLightivSGIX@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_FragmentLightivSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FragmentLightModelfSGIX,FragmentLightModelfSGIX@8))
+GL_PREFIX(FragmentLightModelfSGIX,FragmentLightModelfSGIX@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_FragmentLightModelfSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FragmentLightModelfvSGIX,FragmentLightModelfvSGIX@8))
+GL_PREFIX(FragmentLightModelfvSGIX,FragmentLightModelfvSGIX@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_FragmentLightModelfvSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FragmentLightModeliSGIX,FragmentLightModeliSGIX@8))
+GL_PREFIX(FragmentLightModeliSGIX,FragmentLightModeliSGIX@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_FragmentLightModeliSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FragmentLightModelivSGIX,FragmentLightModelivSGIX@8))
+GL_PREFIX(FragmentLightModelivSGIX,FragmentLightModelivSGIX@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_FragmentLightModelivSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FragmentMaterialfSGIX,FragmentMaterialfSGIX@12))
+GL_PREFIX(FragmentMaterialfSGIX,FragmentMaterialfSGIX@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_FragmentMaterialfSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FragmentMaterialfvSGIX,FragmentMaterialfvSGIX@12))
+GL_PREFIX(FragmentMaterialfvSGIX,FragmentMaterialfvSGIX@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_FragmentMaterialfvSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FragmentMaterialiSGIX,FragmentMaterialiSGIX@12))
+GL_PREFIX(FragmentMaterialiSGIX,FragmentMaterialiSGIX@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_FragmentMaterialiSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FragmentMaterialivSGIX,FragmentMaterialivSGIX@12))
+GL_PREFIX(FragmentMaterialivSGIX,FragmentMaterialivSGIX@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_FragmentMaterialivSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetFragmentLightfvSGIX,GetFragmentLightfvSGIX@12))
+GL_PREFIX(GetFragmentLightfvSGIX,GetFragmentLightfvSGIX@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetFragmentLightfvSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetFragmentLightivSGIX,GetFragmentLightivSGIX@12))
+GL_PREFIX(GetFragmentLightivSGIX,GetFragmentLightivSGIX@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetFragmentLightivSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetFragmentMaterialfvSGIX,GetFragmentMaterialfvSGIX@12))
+GL_PREFIX(GetFragmentMaterialfvSGIX,GetFragmentMaterialfvSGIX@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetFragmentMaterialfvSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetFragmentMaterialivSGIX,GetFragmentMaterialivSGIX@12))
+GL_PREFIX(GetFragmentMaterialivSGIX,GetFragmentMaterialivSGIX@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetFragmentMaterialivSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(LightEnviSGIX,LightEnviSGIX@8))
+GL_PREFIX(LightEnviSGIX,LightEnviSGIX@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_LightEnviSGIX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(DrawRangeElementsEXT,DrawRangeElementsEXT@24))
+GL_PREFIX(DrawRangeElementsEXT,DrawRangeElementsEXT@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_DrawRangeElements))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3bEXT,SecondaryColor3bEXT@12))
+GL_PREFIX(SecondaryColor3bEXT,SecondaryColor3bEXT@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColor3bEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3bvEXT,SecondaryColor3bvEXT@4))
+GL_PREFIX(SecondaryColor3bvEXT,SecondaryColor3bvEXT@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColor3bvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3dEXT,SecondaryColor3dEXT@24))
+GL_PREFIX(SecondaryColor3dEXT,SecondaryColor3dEXT@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColor3dEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3dvEXT,SecondaryColor3dvEXT@4))
+GL_PREFIX(SecondaryColor3dvEXT,SecondaryColor3dvEXT@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColor3dvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3fEXT,SecondaryColor3fEXT@12))
+GL_PREFIX(SecondaryColor3fEXT,SecondaryColor3fEXT@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColor3fEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3fvEXT,SecondaryColor3fvEXT@4))
+GL_PREFIX(SecondaryColor3fvEXT,SecondaryColor3fvEXT@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColor3fvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3iEXT,SecondaryColor3iEXT@12))
+GL_PREFIX(SecondaryColor3iEXT,SecondaryColor3iEXT@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColor3iEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3ivEXT,SecondaryColor3ivEXT@4))
+GL_PREFIX(SecondaryColor3ivEXT,SecondaryColor3ivEXT@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColor3ivEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3sEXT,SecondaryColor3sEXT@12))
+GL_PREFIX(SecondaryColor3sEXT,SecondaryColor3sEXT@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColor3sEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3svEXT,SecondaryColor3svEXT@4))
+GL_PREFIX(SecondaryColor3svEXT,SecondaryColor3svEXT@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColor3svEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3ubEXT,SecondaryColor3ubEXT@12))
+GL_PREFIX(SecondaryColor3ubEXT,SecondaryColor3ubEXT@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColor3ubEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3ubvEXT,SecondaryColor3ubvEXT@4))
+GL_PREFIX(SecondaryColor3ubvEXT,SecondaryColor3ubvEXT@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColor3ubvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3uiEXT,SecondaryColor3uiEXT@12))
+GL_PREFIX(SecondaryColor3uiEXT,SecondaryColor3uiEXT@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColor3uiEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3uivEXT,SecondaryColor3uivEXT@4))
+GL_PREFIX(SecondaryColor3uivEXT,SecondaryColor3uivEXT@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColor3uivEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3usEXT,SecondaryColor3usEXT@12))
+GL_PREFIX(SecondaryColor3usEXT,SecondaryColor3usEXT@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColor3usEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3usvEXT,SecondaryColor3usvEXT@4))
+GL_PREFIX(SecondaryColor3usvEXT,SecondaryColor3usvEXT@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColor3usvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColorPointerEXT,SecondaryColorPointerEXT@16))
+GL_PREFIX(SecondaryColorPointerEXT,SecondaryColorPointerEXT@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColorPointerEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiDrawArraysEXT,MultiDrawArraysEXT@16))
+GL_PREFIX(MultiDrawArraysEXT,MultiDrawArraysEXT@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiDrawArraysEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiDrawElementsEXT,MultiDrawElementsEXT@20))
+GL_PREFIX(MultiDrawElementsEXT,MultiDrawElementsEXT@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiDrawElementsEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FogCoordfEXT,FogCoordfEXT@4))
+GL_PREFIX(FogCoordfEXT,FogCoordfEXT@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_FogCoordfEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FogCoordfvEXT,FogCoordfvEXT@4))
+GL_PREFIX(FogCoordfvEXT,FogCoordfvEXT@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_FogCoordfvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FogCoorddEXT,FogCoorddEXT@8))
+GL_PREFIX(FogCoorddEXT,FogCoorddEXT@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_FogCoorddEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FogCoorddvEXT,FogCoorddvEXT@4))
+GL_PREFIX(FogCoorddvEXT,FogCoorddvEXT@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_FogCoorddvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FogCoordPointerEXT,FogCoordPointerEXT@12))
+GL_PREFIX(FogCoordPointerEXT,FogCoordPointerEXT@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_FogCoordPointerEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(BlendFuncSeparateEXT,BlendFuncSeparateEXT@16))
+GL_PREFIX(BlendFuncSeparateEXT,BlendFuncSeparateEXT@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_BlendFuncSeparateEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(BlendFuncSeparateINGR,BlendFuncSeparateINGR@16))
+GL_PREFIX(BlendFuncSeparateINGR,BlendFuncSeparateINGR@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_BlendFuncSeparateEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexWeightfEXT,VertexWeightfEXT@4))
+GL_PREFIX(VertexWeightfEXT,VertexWeightfEXT@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexWeightfEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexWeightfvEXT,VertexWeightfvEXT@4))
+GL_PREFIX(VertexWeightfvEXT,VertexWeightfvEXT@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexWeightfvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexWeightPointerEXT,VertexWeightPointerEXT@16))
+GL_PREFIX(VertexWeightPointerEXT,VertexWeightPointerEXT@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexWeightPointerEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FlushVertexArrayRangeNV,FlushVertexArrayRangeNV@0))
+GL_PREFIX(FlushVertexArrayRangeNV,FlushVertexArrayRangeNV@0):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_FlushVertexArrayRangeNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexArrayRangeNV,VertexArrayRangeNV@8))
+GL_PREFIX(VertexArrayRangeNV,VertexArrayRangeNV@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexArrayRangeNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CombinerParameterfvNV,CombinerParameterfvNV@8))
+GL_PREFIX(CombinerParameterfvNV,CombinerParameterfvNV@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CombinerParameterfvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CombinerParameterfNV,CombinerParameterfNV@8))
+GL_PREFIX(CombinerParameterfNV,CombinerParameterfNV@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CombinerParameterfNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CombinerParameterivNV,CombinerParameterivNV@8))
+GL_PREFIX(CombinerParameterivNV,CombinerParameterivNV@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CombinerParameterivNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CombinerParameteriNV,CombinerParameteriNV@8))
+GL_PREFIX(CombinerParameteriNV,CombinerParameteriNV@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CombinerParameteriNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CombinerInputNV,CombinerInputNV@24))
+GL_PREFIX(CombinerInputNV,CombinerInputNV@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CombinerInputNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(CombinerOutputNV,CombinerOutputNV@40))
+GL_PREFIX(CombinerOutputNV,CombinerOutputNV@40):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_CombinerOutputNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FinalCombinerInputNV,FinalCombinerInputNV@16))
+GL_PREFIX(FinalCombinerInputNV,FinalCombinerInputNV@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_FinalCombinerInputNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetCombinerInputParameterfvNV,GetCombinerInputParameterfvNV@20))
+GL_PREFIX(GetCombinerInputParameterfvNV,GetCombinerInputParameterfvNV@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetCombinerInputParameterfvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetCombinerInputParameterivNV,GetCombinerInputParameterivNV@20))
+GL_PREFIX(GetCombinerInputParameterivNV,GetCombinerInputParameterivNV@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetCombinerInputParameterivNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetCombinerOutputParameterfvNV,GetCombinerOutputParameterfvNV@16))
+GL_PREFIX(GetCombinerOutputParameterfvNV,GetCombinerOutputParameterfvNV@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetCombinerOutputParameterfvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetCombinerOutputParameterivNV,GetCombinerOutputParameterivNV@16))
+GL_PREFIX(GetCombinerOutputParameterivNV,GetCombinerOutputParameterivNV@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetCombinerOutputParameterivNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetFinalCombinerInputParameterfvNV,GetFinalCombinerInputParameterfvNV@12))
+GL_PREFIX(GetFinalCombinerInputParameterfvNV,GetFinalCombinerInputParameterfvNV@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetFinalCombinerInputParameterfvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetFinalCombinerInputParameterivNV,GetFinalCombinerInputParameterivNV@12))
+GL_PREFIX(GetFinalCombinerInputParameterivNV,GetFinalCombinerInputParameterivNV@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetFinalCombinerInputParameterivNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ResizeBuffersMESA,ResizeBuffersMESA@0))
+GL_PREFIX(ResizeBuffersMESA,ResizeBuffersMESA@0):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ResizeBuffersMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos2dMESA,WindowPos2dMESA@16))
+GL_PREFIX(WindowPos2dMESA,WindowPos2dMESA@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos2dMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos2dvMESA,WindowPos2dvMESA@4))
+GL_PREFIX(WindowPos2dvMESA,WindowPos2dvMESA@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos2dvMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos2fMESA,WindowPos2fMESA@8))
+GL_PREFIX(WindowPos2fMESA,WindowPos2fMESA@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos2fMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos2fvMESA,WindowPos2fvMESA@4))
+GL_PREFIX(WindowPos2fvMESA,WindowPos2fvMESA@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos2fvMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos2iMESA,WindowPos2iMESA@8))
+GL_PREFIX(WindowPos2iMESA,WindowPos2iMESA@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos2iMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos2ivMESA,WindowPos2ivMESA@4))
+GL_PREFIX(WindowPos2ivMESA,WindowPos2ivMESA@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos2ivMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos2sMESA,WindowPos2sMESA@8))
+GL_PREFIX(WindowPos2sMESA,WindowPos2sMESA@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos2sMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos2svMESA,WindowPos2svMESA@4))
+GL_PREFIX(WindowPos2svMESA,WindowPos2svMESA@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos2svMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos3dMESA,WindowPos3dMESA@24))
+GL_PREFIX(WindowPos3dMESA,WindowPos3dMESA@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos3dMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos3dvMESA,WindowPos3dvMESA@4))
+GL_PREFIX(WindowPos3dvMESA,WindowPos3dvMESA@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos3dvMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos3fMESA,WindowPos3fMESA@12))
+GL_PREFIX(WindowPos3fMESA,WindowPos3fMESA@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos3fMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos3fvMESA,WindowPos3fvMESA@4))
+GL_PREFIX(WindowPos3fvMESA,WindowPos3fvMESA@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos3fvMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos3iMESA,WindowPos3iMESA@12))
+GL_PREFIX(WindowPos3iMESA,WindowPos3iMESA@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos3iMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos3ivMESA,WindowPos3ivMESA@4))
+GL_PREFIX(WindowPos3ivMESA,WindowPos3ivMESA@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos3ivMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos3sMESA,WindowPos3sMESA@12))
+GL_PREFIX(WindowPos3sMESA,WindowPos3sMESA@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos3sMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos3svMESA,WindowPos3svMESA@4))
+GL_PREFIX(WindowPos3svMESA,WindowPos3svMESA@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos3svMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos4dMESA,WindowPos4dMESA@32))
+GL_PREFIX(WindowPos4dMESA,WindowPos4dMESA@32):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos4dMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos4dvMESA,WindowPos4dvMESA@4))
+GL_PREFIX(WindowPos4dvMESA,WindowPos4dvMESA@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos4dvMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos4fMESA,WindowPos4fMESA@16))
+GL_PREFIX(WindowPos4fMESA,WindowPos4fMESA@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos4fMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos4fvMESA,WindowPos4fvMESA@4))
+GL_PREFIX(WindowPos4fvMESA,WindowPos4fvMESA@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos4fvMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos4iMESA,WindowPos4iMESA@16))
+GL_PREFIX(WindowPos4iMESA,WindowPos4iMESA@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos4iMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos4ivMESA,WindowPos4ivMESA@4))
+GL_PREFIX(WindowPos4ivMESA,WindowPos4ivMESA@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos4ivMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos4sMESA,WindowPos4sMESA@16))
+GL_PREFIX(WindowPos4sMESA,WindowPos4sMESA@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos4sMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos4svMESA,WindowPos4svMESA@4))
+GL_PREFIX(WindowPos4svMESA,WindowPos4svMESA@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos4svMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiModeDrawArraysIBM,MultiModeDrawArraysIBM@20))
+GL_PREFIX(MultiModeDrawArraysIBM,MultiModeDrawArraysIBM@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiModeDrawArraysIBM))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiModeDrawElementsIBM,MultiModeDrawElementsIBM@24))
+GL_PREFIX(MultiModeDrawElementsIBM,MultiModeDrawElementsIBM@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiModeDrawElementsIBM))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TbufferMask3DFX,TbufferMask3DFX@4))
+GL_PREFIX(TbufferMask3DFX,TbufferMask3DFX@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TbufferMask3DFX))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SampleMaskEXT,SampleMaskEXT@8))
+GL_PREFIX(SampleMaskEXT,SampleMaskEXT@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SampleMaskSGIS))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SamplePatternEXT,SamplePatternEXT@4))
+GL_PREFIX(SamplePatternEXT,SamplePatternEXT@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SamplePatternSGIS))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos2dARB,WindowPos2dARB@16))
+GL_PREFIX(WindowPos2dARB,WindowPos2dARB@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos2dMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos2fARB,WindowPos2fARB@8))
+GL_PREFIX(WindowPos2fARB,WindowPos2fARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos2fMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos2iARB,WindowPos2iARB@8))
+GL_PREFIX(WindowPos2iARB,WindowPos2iARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos2iMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos2sARB,WindowPos2sARB@8))
+GL_PREFIX(WindowPos2sARB,WindowPos2sARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos2sMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos2dvARB,WindowPos2dvARB@4))
+GL_PREFIX(WindowPos2dvARB,WindowPos2dvARB@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos2dvMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos2fvARB,WindowPos2fvARB@4))
+GL_PREFIX(WindowPos2fvARB,WindowPos2fvARB@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos2fvMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos2ivARB,WindowPos2ivARB@4))
+GL_PREFIX(WindowPos2ivARB,WindowPos2ivARB@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos2ivMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos2svARB,WindowPos2svARB@4))
+GL_PREFIX(WindowPos2svARB,WindowPos2svARB@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos2svMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos3dARB,WindowPos3dARB@24))
+GL_PREFIX(WindowPos3dARB,WindowPos3dARB@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos3dMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos3fARB,WindowPos3fARB@12))
+GL_PREFIX(WindowPos3fARB,WindowPos3fARB@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos3fMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos3iARB,WindowPos3iARB@12))
+GL_PREFIX(WindowPos3iARB,WindowPos3iARB@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos3iMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos3sARB,WindowPos3sARB@12))
+GL_PREFIX(WindowPos3sARB,WindowPos3sARB@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos3sMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos3dvARB,WindowPos3dvARB@4))
+GL_PREFIX(WindowPos3dvARB,WindowPos3dvARB@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos3dvMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos3fvARB,WindowPos3fvARB@4))
+GL_PREFIX(WindowPos3fvARB,WindowPos3fvARB@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos3fvMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos3ivARB,WindowPos3ivARB@4))
+GL_PREFIX(WindowPos3ivARB,WindowPos3ivARB@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos3ivMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos3svARB,WindowPos3svARB@4))
+GL_PREFIX(WindowPos3svARB,WindowPos3svARB@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos3svMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(AreProgramsResidentNV,AreProgramsResidentNV@12))
+GL_PREFIX(AreProgramsResidentNV,AreProgramsResidentNV@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_AreProgramsResidentNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(BindProgramNV,BindProgramNV@8))
+GL_PREFIX(BindProgramNV,BindProgramNV@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_BindProgramNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(DeleteProgramsNV,DeleteProgramsNV@8))
+GL_PREFIX(DeleteProgramsNV,DeleteProgramsNV@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_DeleteProgramsNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ExecuteProgramNV,ExecuteProgramNV@12))
+GL_PREFIX(ExecuteProgramNV,ExecuteProgramNV@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ExecuteProgramNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GenProgramsNV,GenProgramsNV@8))
+GL_PREFIX(GenProgramsNV,GenProgramsNV@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GenProgramsNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetProgramParameterdvNV,GetProgramParameterdvNV@16))
+GL_PREFIX(GetProgramParameterdvNV,GetProgramParameterdvNV@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetProgramParameterdvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetProgramParameterfvNV,GetProgramParameterfvNV@16))
+GL_PREFIX(GetProgramParameterfvNV,GetProgramParameterfvNV@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetProgramParameterfvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetProgramivNV,GetProgramivNV@12))
+GL_PREFIX(GetProgramivNV,GetProgramivNV@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetProgramivNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetProgramStringNV,GetProgramStringNV@12))
+GL_PREFIX(GetProgramStringNV,GetProgramStringNV@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetProgramStringNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetTrackMatrixivNV,GetTrackMatrixivNV@16))
+GL_PREFIX(GetTrackMatrixivNV,GetTrackMatrixivNV@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetTrackMatrixivNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetVertexAttribdvNV,GetVertexAttribdvNV@12))
+GL_PREFIX(GetVertexAttribdvNV,GetVertexAttribdvNV@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetVertexAttribdvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetVertexAttribfvNV,GetVertexAttribfvNV@12))
+GL_PREFIX(GetVertexAttribfvNV,GetVertexAttribfvNV@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetVertexAttribfvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetVertexAttribivNV,GetVertexAttribivNV@12))
+GL_PREFIX(GetVertexAttribivNV,GetVertexAttribivNV@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetVertexAttribivNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetVertexAttribPointervNV,GetVertexAttribPointervNV@12))
+GL_PREFIX(GetVertexAttribPointervNV,GetVertexAttribPointervNV@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetVertexAttribPointervNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(IsProgramNV,IsProgramNV@4))
+GL_PREFIX(IsProgramNV,IsProgramNV@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_IsProgramNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(LoadProgramNV,LoadProgramNV@16))
+GL_PREFIX(LoadProgramNV,LoadProgramNV@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_LoadProgramNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ProgramParameter4dNV,ProgramParameter4dNV@40))
+GL_PREFIX(ProgramParameter4dNV,ProgramParameter4dNV@40):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ProgramParameter4dNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ProgramParameter4dvNV,ProgramParameter4dvNV@12))
+GL_PREFIX(ProgramParameter4dvNV,ProgramParameter4dvNV@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ProgramParameter4dvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ProgramParameter4fNV,ProgramParameter4fNV@24))
+GL_PREFIX(ProgramParameter4fNV,ProgramParameter4fNV@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ProgramParameter4fNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ProgramParameter4fvNV,ProgramParameter4fvNV@12))
+GL_PREFIX(ProgramParameter4fvNV,ProgramParameter4fvNV@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ProgramParameter4fvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ProgramParameters4dvNV,ProgramParameters4dvNV@16))
+GL_PREFIX(ProgramParameters4dvNV,ProgramParameters4dvNV@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ProgramParameters4dvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ProgramParameters4fvNV,ProgramParameters4fvNV@16))
+GL_PREFIX(ProgramParameters4fvNV,ProgramParameters4fvNV@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ProgramParameters4fvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(RequestResidentProgramsNV,RequestResidentProgramsNV@8))
+GL_PREFIX(RequestResidentProgramsNV,RequestResidentProgramsNV@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_RequestResidentProgramsNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TrackMatrixNV,TrackMatrixNV@16))
+GL_PREFIX(TrackMatrixNV,TrackMatrixNV@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TrackMatrixNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttribPointerNV,VertexAttribPointerNV@20))
+GL_PREFIX(VertexAttribPointerNV,VertexAttribPointerNV@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttribPointerNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib1dNV,VertexAttrib1dNV@12))
+GL_PREFIX(VertexAttrib1dNV,VertexAttrib1dNV@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib1dNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib1dvNV,VertexAttrib1dvNV@8))
+GL_PREFIX(VertexAttrib1dvNV,VertexAttrib1dvNV@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib1dvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib1fNV,VertexAttrib1fNV@8))
+GL_PREFIX(VertexAttrib1fNV,VertexAttrib1fNV@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib1fNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib1fvNV,VertexAttrib1fvNV@8))
+GL_PREFIX(VertexAttrib1fvNV,VertexAttrib1fvNV@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib1fvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib1sNV,VertexAttrib1sNV@8))
+GL_PREFIX(VertexAttrib1sNV,VertexAttrib1sNV@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib1sNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib1svNV,VertexAttrib1svNV@8))
+GL_PREFIX(VertexAttrib1svNV,VertexAttrib1svNV@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib1svNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib2dNV,VertexAttrib2dNV@20))
+GL_PREFIX(VertexAttrib2dNV,VertexAttrib2dNV@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib2dNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib2dvNV,VertexAttrib2dvNV@8))
+GL_PREFIX(VertexAttrib2dvNV,VertexAttrib2dvNV@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib2dvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib2fNV,VertexAttrib2fNV@12))
+GL_PREFIX(VertexAttrib2fNV,VertexAttrib2fNV@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib2fNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib2fvNV,VertexAttrib2fvNV@8))
+GL_PREFIX(VertexAttrib2fvNV,VertexAttrib2fvNV@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib2fvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib2sNV,VertexAttrib2sNV@12))
+GL_PREFIX(VertexAttrib2sNV,VertexAttrib2sNV@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib2sNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib2svNV,VertexAttrib2svNV@8))
+GL_PREFIX(VertexAttrib2svNV,VertexAttrib2svNV@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib2svNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib3dNV,VertexAttrib3dNV@28))
+GL_PREFIX(VertexAttrib3dNV,VertexAttrib3dNV@28):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib3dNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib3dvNV,VertexAttrib3dvNV@8))
+GL_PREFIX(VertexAttrib3dvNV,VertexAttrib3dvNV@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib3dvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib3fNV,VertexAttrib3fNV@16))
+GL_PREFIX(VertexAttrib3fNV,VertexAttrib3fNV@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib3fNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib3fvNV,VertexAttrib3fvNV@8))
+GL_PREFIX(VertexAttrib3fvNV,VertexAttrib3fvNV@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib3fvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib3sNV,VertexAttrib3sNV@16))
+GL_PREFIX(VertexAttrib3sNV,VertexAttrib3sNV@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib3sNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib3svNV,VertexAttrib3svNV@8))
+GL_PREFIX(VertexAttrib3svNV,VertexAttrib3svNV@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib3svNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib4dNV,VertexAttrib4dNV@36))
+GL_PREFIX(VertexAttrib4dNV,VertexAttrib4dNV@36):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4dNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib4dvNV,VertexAttrib4dvNV@8))
+GL_PREFIX(VertexAttrib4dvNV,VertexAttrib4dvNV@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4dvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib4fNV,VertexAttrib4fNV@20))
+GL_PREFIX(VertexAttrib4fNV,VertexAttrib4fNV@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4fNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib4fvNV,VertexAttrib4fvNV@8))
+GL_PREFIX(VertexAttrib4fvNV,VertexAttrib4fvNV@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4fvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib4sNV,VertexAttrib4sNV@20))
+GL_PREFIX(VertexAttrib4sNV,VertexAttrib4sNV@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4sNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib4svNV,VertexAttrib4svNV@8))
+GL_PREFIX(VertexAttrib4svNV,VertexAttrib4svNV@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4svNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib4ubNV,VertexAttrib4ubNV@20))
+GL_PREFIX(VertexAttrib4ubNV,VertexAttrib4ubNV@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4ubNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib4ubvNV,VertexAttrib4ubvNV@8))
+GL_PREFIX(VertexAttrib4ubvNV,VertexAttrib4ubvNV@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4ubvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttribs1dvNV,VertexAttribs1dvNV@12))
+GL_PREFIX(VertexAttribs1dvNV,VertexAttribs1dvNV@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttribs1dvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttribs1fvNV,VertexAttribs1fvNV@12))
+GL_PREFIX(VertexAttribs1fvNV,VertexAttribs1fvNV@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttribs1fvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttribs1svNV,VertexAttribs1svNV@12))
+GL_PREFIX(VertexAttribs1svNV,VertexAttribs1svNV@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttribs1svNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttribs2dvNV,VertexAttribs2dvNV@12))
+GL_PREFIX(VertexAttribs2dvNV,VertexAttribs2dvNV@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttribs2dvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttribs2fvNV,VertexAttribs2fvNV@12))
+GL_PREFIX(VertexAttribs2fvNV,VertexAttribs2fvNV@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttribs2fvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttribs2svNV,VertexAttribs2svNV@12))
+GL_PREFIX(VertexAttribs2svNV,VertexAttribs2svNV@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttribs2svNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttribs3dvNV,VertexAttribs3dvNV@12))
+GL_PREFIX(VertexAttribs3dvNV,VertexAttribs3dvNV@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttribs3dvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttribs3fvNV,VertexAttribs3fvNV@12))
+GL_PREFIX(VertexAttribs3fvNV,VertexAttribs3fvNV@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttribs3fvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttribs3svNV,VertexAttribs3svNV@12))
+GL_PREFIX(VertexAttribs3svNV,VertexAttribs3svNV@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttribs3svNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttribs4dvNV,VertexAttribs4dvNV@12))
+GL_PREFIX(VertexAttribs4dvNV,VertexAttribs4dvNV@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttribs4dvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttribs4fvNV,VertexAttribs4fvNV@12))
+GL_PREFIX(VertexAttribs4fvNV,VertexAttribs4fvNV@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttribs4fvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttribs4svNV,VertexAttribs4svNV@12))
+GL_PREFIX(VertexAttribs4svNV,VertexAttribs4svNV@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttribs4svNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttribs4ubvNV,VertexAttribs4ubvNV@12))
+GL_PREFIX(VertexAttribs4ubvNV,VertexAttribs4ubvNV@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttribs4ubvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PointParameteriNV,PointParameteriNV@8))
+GL_PREFIX(PointParameteriNV,PointParameteriNV@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PointParameteriNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PointParameterivNV,PointParameterivNV@8))
+GL_PREFIX(PointParameterivNV,PointParameterivNV@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PointParameterivNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(BlendFuncSeparate,BlendFuncSeparate@16))
+GL_PREFIX(BlendFuncSeparate,BlendFuncSeparate@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_BlendFuncSeparateEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FogCoordf,FogCoordf@4))
+GL_PREFIX(FogCoordf,FogCoordf@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_FogCoordfEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FogCoordfv,FogCoordfv@4))
+GL_PREFIX(FogCoordfv,FogCoordfv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_FogCoordfvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FogCoordd,FogCoordd@8))
+GL_PREFIX(FogCoordd,FogCoordd@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_FogCoorddEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FogCoorddv,FogCoorddv@4))
+GL_PREFIX(FogCoorddv,FogCoorddv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_FogCoorddvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FogCoordPointer,FogCoordPointer@12))
+GL_PREFIX(FogCoordPointer,FogCoordPointer@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_FogCoordPointerEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiDrawArrays,MultiDrawArrays@16))
+GL_PREFIX(MultiDrawArrays,MultiDrawArrays@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiDrawArraysEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiDrawElements,MultiDrawElements@20))
+GL_PREFIX(MultiDrawElements,MultiDrawElements@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MultiDrawElementsEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PointParameterf,PointParameterf@8))
+GL_PREFIX(PointParameterf,PointParameterf@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PointParameterfEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PointParameterfv,PointParameterfv@8))
+GL_PREFIX(PointParameterfv,PointParameterfv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PointParameterfvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PointParameteri,PointParameteri@8))
+GL_PREFIX(PointParameteri,PointParameteri@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PointParameteriNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(PointParameteriv,PointParameteriv@8))
+GL_PREFIX(PointParameteriv,PointParameteriv@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_PointParameterivNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3b,SecondaryColor3b@12))
+GL_PREFIX(SecondaryColor3b,SecondaryColor3b@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColor3bEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3bv,SecondaryColor3bv@4))
+GL_PREFIX(SecondaryColor3bv,SecondaryColor3bv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColor3bvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3d,SecondaryColor3d@24))
+GL_PREFIX(SecondaryColor3d,SecondaryColor3d@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColor3dEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3dv,SecondaryColor3dv@4))
+GL_PREFIX(SecondaryColor3dv,SecondaryColor3dv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColor3dvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3f,SecondaryColor3f@12))
+GL_PREFIX(SecondaryColor3f,SecondaryColor3f@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColor3fEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3fv,SecondaryColor3fv@4))
+GL_PREFIX(SecondaryColor3fv,SecondaryColor3fv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColor3fvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3i,SecondaryColor3i@12))
+GL_PREFIX(SecondaryColor3i,SecondaryColor3i@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColor3iEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3iv,SecondaryColor3iv@4))
+GL_PREFIX(SecondaryColor3iv,SecondaryColor3iv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColor3ivEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3s,SecondaryColor3s@12))
+GL_PREFIX(SecondaryColor3s,SecondaryColor3s@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColor3sEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3sv,SecondaryColor3sv@4))
+GL_PREFIX(SecondaryColor3sv,SecondaryColor3sv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColor3svEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3ub,SecondaryColor3ub@12))
+GL_PREFIX(SecondaryColor3ub,SecondaryColor3ub@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColor3ubEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3ubv,SecondaryColor3ubv@4))
+GL_PREFIX(SecondaryColor3ubv,SecondaryColor3ubv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColor3ubvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3ui,SecondaryColor3ui@12))
+GL_PREFIX(SecondaryColor3ui,SecondaryColor3ui@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColor3uiEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3uiv,SecondaryColor3uiv@4))
+GL_PREFIX(SecondaryColor3uiv,SecondaryColor3uiv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColor3uivEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3us,SecondaryColor3us@12))
+GL_PREFIX(SecondaryColor3us,SecondaryColor3us@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColor3usEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3usv,SecondaryColor3usv@4))
+GL_PREFIX(SecondaryColor3usv,SecondaryColor3usv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColor3usvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColorPointer,SecondaryColorPointer@16))
+GL_PREFIX(SecondaryColorPointer,SecondaryColorPointer@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SecondaryColorPointerEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos2d,WindowPos2d@16))
+GL_PREFIX(WindowPos2d,WindowPos2d@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos2dMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos2dv,WindowPos2dv@4))
+GL_PREFIX(WindowPos2dv,WindowPos2dv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos2dvMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos2f,WindowPos2f@8))
+GL_PREFIX(WindowPos2f,WindowPos2f@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos2fMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos2fv,WindowPos2fv@4))
+GL_PREFIX(WindowPos2fv,WindowPos2fv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos2fvMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos2i,WindowPos2i@8))
+GL_PREFIX(WindowPos2i,WindowPos2i@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos2iMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos2iv,WindowPos2iv@4))
+GL_PREFIX(WindowPos2iv,WindowPos2iv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos2ivMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos2s,WindowPos2s@8))
+GL_PREFIX(WindowPos2s,WindowPos2s@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos2sMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos2sv,WindowPos2sv@4))
+GL_PREFIX(WindowPos2sv,WindowPos2sv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos2svMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos3d,WindowPos3d@24))
+GL_PREFIX(WindowPos3d,WindowPos3d@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos3dMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos3dv,WindowPos3dv@4))
+GL_PREFIX(WindowPos3dv,WindowPos3dv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos3dvMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos3f,WindowPos3f@12))
+GL_PREFIX(WindowPos3f,WindowPos3f@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos3fMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos3fv,WindowPos3fv@4))
+GL_PREFIX(WindowPos3fv,WindowPos3fv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos3fvMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos3i,WindowPos3i@12))
+GL_PREFIX(WindowPos3i,WindowPos3i@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos3iMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos3iv,WindowPos3iv@4))
+GL_PREFIX(WindowPos3iv,WindowPos3iv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos3ivMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos3s,WindowPos3s@12))
+GL_PREFIX(WindowPos3s,WindowPos3s@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos3sMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(WindowPos3sv,WindowPos3sv@4))
+GL_PREFIX(WindowPos3sv,WindowPos3sv@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_WindowPos3svMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ActiveStencilFaceEXT,ActiveStencilFaceEXT@4))
+GL_PREFIX(ActiveStencilFaceEXT,ActiveStencilFaceEXT@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ActiveStencilFaceEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(DeleteFencesNV,DeleteFencesNV@8))
+GL_PREFIX(DeleteFencesNV,DeleteFencesNV@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_DeleteFencesNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GenFencesNV,GenFencesNV@8))
+GL_PREFIX(GenFencesNV,GenFencesNV@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GenFencesNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(IsFenceNV,IsFenceNV@4))
+GL_PREFIX(IsFenceNV,IsFenceNV@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_IsFenceNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TestFenceNV,TestFenceNV@4))
+GL_PREFIX(TestFenceNV,TestFenceNV@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TestFenceNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetFenceivNV,GetFenceivNV@12))
+GL_PREFIX(GetFenceivNV,GetFenceivNV@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetFenceivNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FinishFenceNV,FinishFenceNV@4))
+GL_PREFIX(FinishFenceNV,FinishFenceNV@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_FinishFenceNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SetFenceNV,SetFenceNV@8))
+GL_PREFIX(SetFenceNV,SetFenceNV@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SetFenceNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib1sARB,VertexAttrib1sARB@8))
+GL_PREFIX(VertexAttrib1sARB,VertexAttrib1sARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib1sNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib1fARB,VertexAttrib1fARB@8))
+GL_PREFIX(VertexAttrib1fARB,VertexAttrib1fARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib1fNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib1dARB,VertexAttrib1dARB@12))
+GL_PREFIX(VertexAttrib1dARB,VertexAttrib1dARB@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib1dNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib2sARB,VertexAttrib2sARB@12))
+GL_PREFIX(VertexAttrib2sARB,VertexAttrib2sARB@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib2sNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib2fARB,VertexAttrib2fARB@12))
+GL_PREFIX(VertexAttrib2fARB,VertexAttrib2fARB@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib2fNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib2dARB,VertexAttrib2dARB@20))
+GL_PREFIX(VertexAttrib2dARB,VertexAttrib2dARB@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib2dNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib3sARB,VertexAttrib3sARB@16))
+GL_PREFIX(VertexAttrib3sARB,VertexAttrib3sARB@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib3sNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib3fARB,VertexAttrib3fARB@16))
+GL_PREFIX(VertexAttrib3fARB,VertexAttrib3fARB@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib3fNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib3dARB,VertexAttrib3dARB@28))
+GL_PREFIX(VertexAttrib3dARB,VertexAttrib3dARB@28):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib3dNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib4sARB,VertexAttrib4sARB@20))
+GL_PREFIX(VertexAttrib4sARB,VertexAttrib4sARB@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4sNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib4fARB,VertexAttrib4fARB@20))
+GL_PREFIX(VertexAttrib4fARB,VertexAttrib4fARB@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4fNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib4dARB,VertexAttrib4dARB@36))
+GL_PREFIX(VertexAttrib4dARB,VertexAttrib4dARB@36):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4dNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib4NubARB,VertexAttrib4NubARB@20))
+GL_PREFIX(VertexAttrib4NubARB,VertexAttrib4NubARB@20):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4ubNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib1svARB,VertexAttrib1svARB@8))
+GL_PREFIX(VertexAttrib1svARB,VertexAttrib1svARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib1svNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib1fvARB,VertexAttrib1fvARB@8))
+GL_PREFIX(VertexAttrib1fvARB,VertexAttrib1fvARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib1fvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib1dvARB,VertexAttrib1dvARB@8))
+GL_PREFIX(VertexAttrib1dvARB,VertexAttrib1dvARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib1dvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib2svARB,VertexAttrib2svARB@8))
+GL_PREFIX(VertexAttrib2svARB,VertexAttrib2svARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib2svNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib2fvARB,VertexAttrib2fvARB@8))
+GL_PREFIX(VertexAttrib2fvARB,VertexAttrib2fvARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib2fvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib2dvARB,VertexAttrib2dvARB@8))
+GL_PREFIX(VertexAttrib2dvARB,VertexAttrib2dvARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib2dvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib3svARB,VertexAttrib3svARB@8))
+GL_PREFIX(VertexAttrib3svARB,VertexAttrib3svARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib3svNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib3fvARB,VertexAttrib3fvARB@8))
+GL_PREFIX(VertexAttrib3fvARB,VertexAttrib3fvARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib3fvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib3dvARB,VertexAttrib3dvARB@8))
+GL_PREFIX(VertexAttrib3dvARB,VertexAttrib3dvARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib3dvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib4bvARB,VertexAttrib4bvARB@8))
+GL_PREFIX(VertexAttrib4bvARB,VertexAttrib4bvARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4bvARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib4svARB,VertexAttrib4svARB@8))
+GL_PREFIX(VertexAttrib4svARB,VertexAttrib4svARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4svNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib4ivARB,VertexAttrib4ivARB@8))
+GL_PREFIX(VertexAttrib4ivARB,VertexAttrib4ivARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4ivARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib4ubvARB,VertexAttrib4ubvARB@8))
+GL_PREFIX(VertexAttrib4ubvARB,VertexAttrib4ubvARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4ubvARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib4usvARB,VertexAttrib4usvARB@8))
+GL_PREFIX(VertexAttrib4usvARB,VertexAttrib4usvARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4usvARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib4uivARB,VertexAttrib4uivARB@8))
+GL_PREFIX(VertexAttrib4uivARB,VertexAttrib4uivARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4uivARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib4fvARB,VertexAttrib4fvARB@8))
+GL_PREFIX(VertexAttrib4fvARB,VertexAttrib4fvARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4fvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib4dvARB,VertexAttrib4dvARB@8))
+GL_PREFIX(VertexAttrib4dvARB,VertexAttrib4dvARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4dvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib4NbvARB,VertexAttrib4NbvARB@8))
+GL_PREFIX(VertexAttrib4NbvARB,VertexAttrib4NbvARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4NbvARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib4NsvARB,VertexAttrib4NsvARB@8))
+GL_PREFIX(VertexAttrib4NsvARB,VertexAttrib4NsvARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4NsvARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib4NivARB,VertexAttrib4NivARB@8))
+GL_PREFIX(VertexAttrib4NivARB,VertexAttrib4NivARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4NivARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib4NubvARB,VertexAttrib4NubvARB@8))
+GL_PREFIX(VertexAttrib4NubvARB,VertexAttrib4NubvARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4ubvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib4NusvARB,VertexAttrib4NusvARB@8))
+GL_PREFIX(VertexAttrib4NusvARB,VertexAttrib4NusvARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4NusvARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib4NuivARB,VertexAttrib4NuivARB@8))
+GL_PREFIX(VertexAttrib4NuivARB,VertexAttrib4NuivARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4NuivARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttribPointerARB,VertexAttribPointerARB@24))
+GL_PREFIX(VertexAttribPointerARB,VertexAttribPointerARB@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttribPointerARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(EnableVertexAttribArrayARB,EnableVertexAttribArrayARB@4))
+GL_PREFIX(EnableVertexAttribArrayARB,EnableVertexAttribArrayARB@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_EnableVertexAttribArrayARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(DisableVertexAttribArrayARB,DisableVertexAttribArrayARB@4))
+GL_PREFIX(DisableVertexAttribArrayARB,DisableVertexAttribArrayARB@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_DisableVertexAttribArrayARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ProgramStringARB,ProgramStringARB@16))
+GL_PREFIX(ProgramStringARB,ProgramStringARB@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ProgramStringARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(BindProgramARB,BindProgramARB@8))
+GL_PREFIX(BindProgramARB,BindProgramARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_BindProgramNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(DeleteProgramsARB,DeleteProgramsARB@8))
+GL_PREFIX(DeleteProgramsARB,DeleteProgramsARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_DeleteProgramsNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GenProgramsARB,GenProgramsARB@8))
+GL_PREFIX(GenProgramsARB,GenProgramsARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GenProgramsNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(IsProgramARB,IsProgramARB@4))
+GL_PREFIX(IsProgramARB,IsProgramARB@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_IsProgramNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ProgramEnvParameter4dARB,ProgramEnvParameter4dARB@40))
+GL_PREFIX(ProgramEnvParameter4dARB,ProgramEnvParameter4dARB@40):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ProgramEnvParameter4dARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ProgramEnvParameter4dvARB,ProgramEnvParameter4dvARB@12))
+GL_PREFIX(ProgramEnvParameter4dvARB,ProgramEnvParameter4dvARB@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ProgramEnvParameter4dvARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ProgramEnvParameter4fARB,ProgramEnvParameter4fARB@24))
+GL_PREFIX(ProgramEnvParameter4fARB,ProgramEnvParameter4fARB@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ProgramEnvParameter4fARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ProgramEnvParameter4fvARB,ProgramEnvParameter4fvARB@12))
+GL_PREFIX(ProgramEnvParameter4fvARB,ProgramEnvParameter4fvARB@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ProgramEnvParameter4fvARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ProgramLocalParameter4dARB,ProgramLocalParameter4dARB@40))
+GL_PREFIX(ProgramLocalParameter4dARB,ProgramLocalParameter4dARB@40):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ProgramLocalParameter4dARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ProgramLocalParameter4dvARB,ProgramLocalParameter4dvARB@12))
+GL_PREFIX(ProgramLocalParameter4dvARB,ProgramLocalParameter4dvARB@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ProgramLocalParameter4dvARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ProgramLocalParameter4fARB,ProgramLocalParameter4fARB@24))
+GL_PREFIX(ProgramLocalParameter4fARB,ProgramLocalParameter4fARB@24):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ProgramLocalParameter4fARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ProgramLocalParameter4fvARB,ProgramLocalParameter4fvARB@12))
+GL_PREFIX(ProgramLocalParameter4fvARB,ProgramLocalParameter4fvARB@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ProgramLocalParameter4fvARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetProgramEnvParameterdvARB,GetProgramEnvParameterdvARB@12))
+GL_PREFIX(GetProgramEnvParameterdvARB,GetProgramEnvParameterdvARB@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetProgramEnvParameterdvARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetProgramEnvParameterfvARB,GetProgramEnvParameterfvARB@12))
+GL_PREFIX(GetProgramEnvParameterfvARB,GetProgramEnvParameterfvARB@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetProgramEnvParameterfvARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetProgramLocalParameterdvARB,GetProgramLocalParameterdvARB@12))
+GL_PREFIX(GetProgramLocalParameterdvARB,GetProgramLocalParameterdvARB@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetProgramLocalParameterdvARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetProgramLocalParameterfvARB,GetProgramLocalParameterfvARB@12))
+GL_PREFIX(GetProgramLocalParameterfvARB,GetProgramLocalParameterfvARB@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetProgramLocalParameterfvARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetProgramivARB,GetProgramivARB@12))
+GL_PREFIX(GetProgramivARB,GetProgramivARB@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetProgramivARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetProgramStringARB,GetProgramStringARB@12))
+GL_PREFIX(GetProgramStringARB,GetProgramStringARB@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetProgramStringARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetVertexAttribdvARB,GetVertexAttribdvARB@12))
+GL_PREFIX(GetVertexAttribdvARB,GetVertexAttribdvARB@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetVertexAttribdvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetVertexAttribfvARB,GetVertexAttribfvARB@12))
+GL_PREFIX(GetVertexAttribfvARB,GetVertexAttribfvARB@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetVertexAttribfvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetVertexAttribivARB,GetVertexAttribivARB@12))
+GL_PREFIX(GetVertexAttribivARB,GetVertexAttribivARB@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetVertexAttribivNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetVertexAttribPointervARB,GetVertexAttribPointervARB@12))
+GL_PREFIX(GetVertexAttribPointervARB,GetVertexAttribPointervARB@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetVertexAttribPointervNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ProgramNamedParameter4fNV,ProgramNamedParameter4fNV@28))
+GL_PREFIX(ProgramNamedParameter4fNV,ProgramNamedParameter4fNV@28):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ProgramNamedParameter4fNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ProgramNamedParameter4dNV,ProgramNamedParameter4dNV@44))
+GL_PREFIX(ProgramNamedParameter4dNV,ProgramNamedParameter4dNV@44):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ProgramNamedParameter4dNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ProgramNamedParameter4fvNV,ProgramNamedParameter4fvNV@16))
+GL_PREFIX(ProgramNamedParameter4fvNV,ProgramNamedParameter4fvNV@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ProgramNamedParameter4fvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ProgramNamedParameter4dvNV,ProgramNamedParameter4dvNV@16))
+GL_PREFIX(ProgramNamedParameter4dvNV,ProgramNamedParameter4dvNV@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_ProgramNamedParameter4dvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetProgramNamedParameterfvNV,GetProgramNamedParameterfvNV@16))
+GL_PREFIX(GetProgramNamedParameterfvNV,GetProgramNamedParameterfvNV@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetProgramNamedParameterfvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetProgramNamedParameterdvNV,GetProgramNamedParameterdvNV@16))
+GL_PREFIX(GetProgramNamedParameterdvNV,GetProgramNamedParameterdvNV@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetProgramNamedParameterdvNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(BindBufferARB,BindBufferARB@8))
+GL_PREFIX(BindBufferARB,BindBufferARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_BindBufferARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(BufferDataARB,BufferDataARB@16))
+GL_PREFIX(BufferDataARB,BufferDataARB@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_BufferDataARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(BufferSubDataARB,BufferSubDataARB@16))
+GL_PREFIX(BufferSubDataARB,BufferSubDataARB@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_BufferSubDataARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(DeleteBuffersARB,DeleteBuffersARB@8))
+GL_PREFIX(DeleteBuffersARB,DeleteBuffersARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_DeleteBuffersARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GenBuffersARB,GenBuffersARB@8))
+GL_PREFIX(GenBuffersARB,GenBuffersARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GenBuffersARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetBufferParameterivARB,GetBufferParameterivARB@12))
+GL_PREFIX(GetBufferParameterivARB,GetBufferParameterivARB@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetBufferParameterivARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetBufferPointervARB,GetBufferPointervARB@12))
+GL_PREFIX(GetBufferPointervARB,GetBufferPointervARB@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetBufferPointervARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetBufferSubDataARB,GetBufferSubDataARB@16))
+GL_PREFIX(GetBufferSubDataARB,GetBufferSubDataARB@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetBufferSubDataARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(IsBufferARB,IsBufferARB@4))
+GL_PREFIX(IsBufferARB,IsBufferARB@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_IsBufferARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MapBufferARB,MapBufferARB@8))
+GL_PREFIX(MapBufferARB,MapBufferARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MapBufferARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(UnmapBufferARB,UnmapBufferARB@4))
+GL_PREFIX(UnmapBufferARB,UnmapBufferARB@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_UnmapBufferARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(DepthBoundsEXT,DepthBoundsEXT@16))
+GL_PREFIX(DepthBoundsEXT,DepthBoundsEXT@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_DepthBoundsEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GenQueriesARB,GenQueriesARB@8))
+GL_PREFIX(GenQueriesARB,GenQueriesARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GenQueriesARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(DeleteQueriesARB,DeleteQueriesARB@8))
+GL_PREFIX(DeleteQueriesARB,DeleteQueriesARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_DeleteQueriesARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(IsQueryARB,IsQueryARB@4))
+GL_PREFIX(IsQueryARB,IsQueryARB@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_IsQueryARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(BeginQueryARB,BeginQueryARB@8))
+GL_PREFIX(BeginQueryARB,BeginQueryARB@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_BeginQueryARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(EndQueryARB,EndQueryARB@4))
+GL_PREFIX(EndQueryARB,EndQueryARB@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_EndQueryARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetQueryivARB,GetQueryivARB@12))
+GL_PREFIX(GetQueryivARB,GetQueryivARB@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetQueryivARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetQueryObjectivARB,GetQueryObjectivARB@12))
+GL_PREFIX(GetQueryObjectivARB,GetQueryObjectivARB@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetQueryObjectivARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetQueryObjectuivARB,GetQueryObjectuivARB@12))
+GL_PREFIX(GetQueryObjectuivARB,GetQueryObjectuivARB@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetQueryObjectuivARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(BindBuffer,BindBuffer@8))
+GL_PREFIX(BindBuffer,BindBuffer@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_BindBufferARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(BufferData,BufferData@16))
+GL_PREFIX(BufferData,BufferData@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_BufferDataARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(BufferSubData,BufferSubData@16))
+GL_PREFIX(BufferSubData,BufferSubData@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_BufferSubDataARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(DeleteBuffers,DeleteBuffers@8))
+GL_PREFIX(DeleteBuffers,DeleteBuffers@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_DeleteBuffersARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GenBuffers,GenBuffers@8))
+GL_PREFIX(GenBuffers,GenBuffers@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GenBuffersARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetBufferParameteriv,GetBufferParameteriv@12))
+GL_PREFIX(GetBufferParameteriv,GetBufferParameteriv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetBufferParameterivARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetBufferPointerv,GetBufferPointerv@12))
+GL_PREFIX(GetBufferPointerv,GetBufferPointerv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetBufferPointervARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetBufferSubData,GetBufferSubData@16))
+GL_PREFIX(GetBufferSubData,GetBufferSubData@16):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetBufferSubDataARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(IsBuffer,IsBuffer@4))
+GL_PREFIX(IsBuffer,IsBuffer@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_IsBufferARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MapBuffer,MapBuffer@8))
+GL_PREFIX(MapBuffer,MapBuffer@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_MapBufferARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(UnmapBuffer,UnmapBuffer@4))
+GL_PREFIX(UnmapBuffer,UnmapBuffer@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_UnmapBufferARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GenQueries,GenQueries@8))
+GL_PREFIX(GenQueries,GenQueries@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GenQueriesARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(DeleteQueries,DeleteQueries@8))
+GL_PREFIX(DeleteQueries,DeleteQueries@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_DeleteQueriesARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(IsQuery,IsQuery@4))
+GL_PREFIX(IsQuery,IsQuery@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_IsQueryARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(BeginQuery,BeginQuery@8))
+GL_PREFIX(BeginQuery,BeginQuery@8):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_BeginQueryARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(EndQuery,EndQuery@4))
+GL_PREFIX(EndQuery,EndQuery@4):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_EndQueryARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetQueryiv,GetQueryiv@12))
+GL_PREFIX(GetQueryiv,GetQueryiv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetQueryivARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetQueryObjectiv,GetQueryObjectiv@12))
+GL_PREFIX(GetQueryObjectiv,GetQueryObjectiv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetQueryObjectivARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetQueryObjectuiv,GetQueryObjectuiv@12))
+GL_PREFIX(GetQueryObjectuiv,GetQueryObjectuiv@12):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetQueryObjectuivARB))
+
+
+#endif  /* __WIN32__ */
diff --git a/reactos/lib/mesa32/src/x86/matypes.h b/reactos/lib/mesa32/src/x86/matypes.h
new file mode 100644
index 00000000000..0dd76804003
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/matypes.h
@@ -0,0 +1,165 @@
+/*
+ * This file is automatically generated from the Mesa internal type
+ * definitions.  Do not edit directly.
+ */
+
+#ifndef __ASM_TYPES_H__
+#define __ASM_TYPES_H__
+
+#include "assyntax.h"
+
+
+/* =============================================================
+ * Offsets for GLcontext
+ */
+
+#define CTX_DRIVER_CTX              	844
+
+#define CTX_LIGHT_ENABLED           	38176
+#define CTX_LIGHT_SHADE_MODEL       	38180
+#define CTX_LIGHT_COLOR_MAT_FACE    	38184
+#define CTX_LIGHT_COLOR_MAT_MODE    	38188
+#define CTX_LIGHT_COLOR_MAT_MASK    	38192
+#define CTX_LIGHT_COLOR_MAT_ENABLED 	38196
+#define CTX_LIGHT_ENABLED_LIST      	38200
+#define CTX_LIGHT_NEED_VERTS        	42557
+#define CTX_LIGHT_FLAGS             	42560
+#define CTX_LIGHT_BASE_COLOR        	42564
+
+
+/* =============================================================
+ * Offsets for struct vertex_buffer
+ */
+
+#define VB_SIZE                	0
+#define VB_COUNT               	4
+
+#define VB_ELTS                	8
+#define VB_OBJ_PTR             	12
+#define VB_EYE_PTR             	16
+#define VB_CLIP_PTR            	20
+#define VB_PROJ_CLIP_PTR       	24
+#define VB_CLIP_OR_MASK        	28
+#define VB_CLIP_MASK           	32
+#define VB_NORMAL_PTR          	36
+#define VB_EDGE_FLAG           	44
+#define VB_TEX0_COORD_PTR      	48
+#define VB_TEX1_COORD_PTR      	52
+#define VB_TEX2_COORD_PTR      	56
+#define VB_TEX3_COORD_PTR      	60
+#define VB_INDEX_PTR           	80
+#define VB_COLOR_PTR           	88
+#define VB_SECONDARY_COLOR_PTR 	96
+#define VB_FOG_COORD_PTR       	108
+#define VB_POINT_SIZE_PTR      	104
+#define VB_PRIMITIVE           	112
+
+#define VB_LAST_CLIPPED        	244
+
+/*
+ * Flags for struct vertex_buffer
+ */
+
+#define VERT_BIT_OBJ           	0x1
+#define VERT_BIT_NORM          	0x4
+#define VERT_BIT_RGBA          	0x8
+#define VERT_BIT_SPEC_RGB      	0x10
+#define VERT_BIT_FOG_COORD     	0x20
+#define VERT_BIT_TEX0          	0x100
+#define VERT_BIT_TEX1          	0x200
+#define VERT_BIT_TEX2          	0x400
+#define VERT_BIT_TEX3          	0x800
+
+
+/* =============================================================
+ * Offsets for GLvector4f
+ */
+
+#define V4F_DATA          	0
+#define V4F_START         	4
+#define V4F_COUNT         	8
+#define V4F_STRIDE        	12
+#define V4F_SIZE          	16
+#define V4F_FLAGS         	20
+
+/*
+ * Flags for GLvector4f
+ */
+
+#define VEC_MALLOC        	0x10
+#define VEC_NOT_WRITEABLE 	0x40
+#define VEC_BAD_STRIDE    	0x100
+
+#define VEC_SIZE_1        	0x1
+#define VEC_SIZE_2        	0x3
+#define VEC_SIZE_3        	0x7
+#define VEC_SIZE_4        	0xf
+
+
+/* =============================================================
+ * Offsets for GLmatrix
+ */
+
+#define MATRIX_DATA   	0
+#define MATRIX_INV    	4
+#define MATRIX_FLAGS  	8
+#define MATRIX_TYPE   	12
+
+
+/* =============================================================
+ * Offsets for struct gl_light
+ */
+
+#define LIGHT_NEXT              	0
+#define LIGHT_PREV              	4
+
+#define LIGHT_AMBIENT           	8
+#define LIGHT_DIFFUSE           	24
+#define LIGHT_SPECULAR          	40
+#define LIGHT_EYE_POSITION      	56
+#define LIGHT_EYE_DIRECTION     	72
+#define LIGHT_SPOT_EXPONENT     	88
+#define LIGHT_SPOT_CUTOFF       	92
+#define LIGHT_COS_CUTOFF        	96
+#define LIGHT_CONST_ATTEN       	100
+#define LIGHT_LINEAR_ATTEN      	104
+#define LIGHT_QUADRATIC_ATTEN   	108
+#define LIGHT_ENABLED           	112
+
+#define LIGHT_FLAGS             	116
+
+#define LIGHT_POSITION          	120
+#define LIGHT_VP_INF_NORM       	136
+#define LIGHT_H_INF_NORM        	148
+#define LIGHT_NORM_DIRECTION    	160
+#define LIGHT_VP_INF_SPOT_ATTEN 	176
+
+#define LIGHT_SPOT_EXP_TABLE    	180
+#define LIGHT_MAT_AMBIENT       	4276
+#define LIGHT_MAT_DIFFUSE       	4300
+#define LIGHT_MAT_SPECULAR      	4324
+
+#define SIZEOF_GL_LIGHT         	4356
+
+/*
+ * Flags for struct gl_light
+ */
+
+#define LIGHT_SPOT              	0x1
+#define LIGHT_LOCAL_VIEWER      	0x2
+#define LIGHT_POSITIONAL        	0x4
+
+#define LIGHT_NEED_VERTICES     	0x6
+
+
+/* =============================================================
+ * Offsets for struct gl_lightmodel
+ */
+
+#define LIGHT_MODEL_AMBIENT       	0
+#define LIGHT_MODEL_LOCAL_VIEWER  	16
+#define LIGHT_MODEL_TWO_SIDE      	17
+#define LIGHT_MODEL_COLOR_CONTROL 	20
+
+
+#endif /* __ASM_TYPES_H__ */
diff --git a/reactos/lib/mesa32/src/x86/mmx.h b/reactos/lib/mesa32/src/x86/mmx.h
new file mode 100644
index 00000000000..2d595be4f51
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/mmx.h
@@ -0,0 +1,51 @@
+/* $Id: mmx.h,v 1.1 2004/07/16 22:12:43 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef ASM_MMX_H
+#define ASM_MMX_H
+
+extern void _ASMAPI
+_mesa_mmx_blend_transparency( GLcontext *ctx, GLuint n, const GLubyte mask[],
+                              GLubyte rgba[][4], const GLubyte dest[][4] );
+
+extern void _ASMAPI
+_mesa_mmx_blend_add( GLcontext *ctx, GLuint n, const GLubyte mask[],
+                     GLubyte rgba[][4], const GLubyte dest[][4] );
+
+extern void _ASMAPI
+_mesa_mmx_blend_min( GLcontext *ctx, GLuint n, const GLubyte mask[],
+                     GLubyte rgba[][4], const GLubyte dest[][4] );
+
+extern void _ASMAPI
+_mesa_mmx_blend_max( GLcontext *ctx, GLuint n, const GLubyte mask[],
+                     GLubyte rgba[][4], const GLubyte dest[][4] );
+
+extern void _ASMAPI
+_mesa_mmx_blend_modulate( GLcontext *ctx, GLuint n, const GLubyte mask[],
+                          GLubyte rgba[][4], const GLubyte dest[][4] );
+
+#endif
diff --git a/reactos/lib/mesa32/src/x86/mmx_blend.S b/reactos/lib/mesa32/src/x86/mmx_blend.S
new file mode 100644
index 00000000000..d049aa12bee
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/mmx_blend.S
@@ -0,0 +1,363 @@
+/*
+ * Written by José Fonseca <j_r_fonseca@yahoo.co.uk>
+ */
+
+#include "matypes.h"
+
+
+/* integer multiplication - alpha plus one
+ *
+ * makes the following approximation to the division (Sree)
+ *
+ *   rgb*a/255 ~= (rgb*(a+1)) >> 256
+ *
+ * which is the fastest method that satisfies the following OpenGL criteria
+ *
+ *   0*0 = 0 and 255*255 = 255
+ *
+ * note that MX1 is a register with 0xffffffffffffffff constant which can be easily obtained making
+ *
+ *   PCMPEQW    ( MX1, MX1 )
+ */
+#define GMB_MULT_AP1( MP1, MA1, MP2, MA2, MX1 ) \
+    PSUBW      ( MX1, MA1 )			/*   a1 + 1  |   a1 + 1  |   a1 + 1  |   a1 + 1  */	;\
+    PMULLW     ( MP1, MA1 )			/*                  t1 = p1*a1                   */	;\
+													;\
+TWO(PSUBW      ( MX1, MA2 ))			/*   a2 + 1  |   a2 + 1  |   a2 + 1  |   a2 + 1  */	;\
+TWO(PMULLW     ( MP2, MA2 ))			/*                  t2 = p2*a2                   */	;\
+													;\
+    PSRLW      ( CONST(8), MA1 )		/*               t1 >> 8 ~= t1/255               */	;\
+TWO(PSRLW      ( CONST(8), MA2 ))		/*               t2 >> 8 ~= t2/255               */	
+
+
+/* integer multiplication - geometric series
+ *
+ * takes the geometric series approximation to the division
+ *
+ *   t/255 = (t >> 8) + (t >> 16) + (t >> 24) ..
+ *
+ * in this case just the first two terms to fit in 16bit arithmetic
+ *
+ *   t/255 ~= (t + (t >> 8)) >> 8
+ *
+ * note that just by itself it doesn't satisfies the OpenGL criteria, as 255*255 = 254, 
+ * so the special case a = 255 must be accounted or roundoff must be used
+ */
+#define GMB_MULT_GS( MP1, MA1, MP2, MA2 ) \
+    PMULLW     ( MP1, MA1 )			/*                  t1 = p1*a1                   */	;\
+TWO(PMULLW     ( MP2, MA2 ))			/*                  t2 = p2*a2                   */	;\
+													;\
+    MOVQ       ( MA1, MP1 )										;\
+    PSRLW      ( CONST(8), MA1 )		/*                    t1 >> 8                    */	;\
+													;\
+TWO(MOVQ       ( MA2, MP2 ))										;\
+TWO(PSRLW      ( CONST(8), MA2 ))		/*                    t2 >> 8                    */	;\
+													;\
+    PADDW      ( MP1, MA1 )			/*        t1 + (t1 >> 8) ~= (t1/255) << 8        */	;\
+    PSRLW      ( CONST(8), MA1 )		/*    sa1    |    sb1    |    sg1    |    sr1    */	;\
+													;\
+TWO(PADDW      ( MP2, MA2 ))			/*        t2 + (t2 >> 8) ~= (t2/255) << 8        */	;\
+TWO(PSRLW      ( CONST(8), MA2 ))		/*    sa2    |    sb2    |    sg2    |    sr2    */
+
+
+/* integer multiplication - geometric series plus rounding
+ *
+ * when using a geometric series division instead of truncating the result 
+ * use roundoff in the approximation (Jim Blinn)
+ *
+ *   t = rgb*a + 0x80
+ *
+ * achieving the exact results
+ *
+ * note that M80 is register with the 0x0080008000800080 constant
+ */
+#define GMB_MULT_GSR( MP1, MA1, MP2, MA2, M80 ) \
+    PMULLW     ( MP1, MA1 )			/*                  t1 = p1*a1                   */	;\
+    PADDW      ( M80, MA1 )			/*                 t1 += 0x80                    */	;\
+													;\
+TWO(PMULLW     ( MP2, MA2 ))			/*                  t2 = p2*a2                   */	;\
+TWO(PADDW      ( M80, MA2 ))			/*                 t2 += 0x80                    */	;\
+													;\
+    MOVQ       ( MA1, MP1 )										;\
+    PSRLW      ( CONST(8), MA1 )		/*                    t1 >> 8                    */	;\
+													;\
+TWO(MOVQ       ( MA2, MP2 ))										;\
+TWO(PSRLW      ( CONST(8), MA2 ))		/*                    t2 >> 8                    */	;\
+													;\
+    PADDW      ( MP1, MA1 )			/*        t1 + (t1 >> 8) ~= (t1/255) << 8        */	;\
+    PSRLW      ( CONST(8), MA1 )		/*    sa1    |    sb1    |    sg1    |    sr1    */	;\
+													;\
+TWO(PADDW      ( MP2, MA2 ))			/*        t2 + (t2 >> 8) ~= (t2/255) << 8        */	;\
+TWO(PSRLW      ( CONST(8), MA2 ))		/*    sa2    |    sb2    |    sg2    |    sr2    */
+
+
+/* linear interpolation - geometric series 
+ */
+#define GMB_LERP_GS( MP1, MQ1, MA1, MP2, MQ2, MA2) \
+    PSUBW      ( MQ1, MP1 )                     /* pa1 - qa1 | pb1 - qb1 | pg1 - qg1 | pr1 - qr1 */	;\
+    PSLLW      ( CONST(8), MQ1 )		/*                    q1 << 8                    */	;\
+    PMULLW     ( MP1, MA1 )			/*              t1 = (q1 - p1)*pa1               */	;\
+													;\
+TWO(PSUBW      ( MQ2, MP2 ))                    /* pa2 - qa2 | pb2 - qb2 | pg2 - qg2 | pr2 - qr2 */	;\
+TWO(PSLLW      ( CONST(8), MQ2 ))		/*                    q2 << 8                    */	;\
+TWO(PMULLW     ( MP2, MA2 ))			/*              t2 = (q2 - p2)*pa2               */	;\
+													;\
+    MOVQ       ( MA1, MP1 )										;\
+    PSRLW      ( CONST(8), MA1 )		/*                    t1 >> 8                    */	;\
+													;\
+TWO(MOVQ       ( MA2, MP2 ))										;\
+TWO(PSRLW      ( CONST(8), MA2 ))		/*                    t2 >> 8                    */	;\
+													;\
+    PADDW      ( MP1, MA1 )			/*        t1 + (t1 >> 8) ~= (t1/255) << 8        */	;\
+TWO(PADDW      ( MP2, MA2 ))			/*        t2 + (t2 >> 8) ~= (t2/255) << 8        */	;\
+													;\
+    PADDW      ( MQ1, MA1 )			/*              (t1/255 + q1) << 8               */	;\
+TWO(PADDW      ( MQ2, MA2 ))			/*              (t2/255 + q2) << 8               */	;\
+													;\
+    PSRLW      ( CONST(8), MA1 )		/*    sa1    |    sb1    |    sg1    |    sr1    */	;\
+TWO(PSRLW      ( CONST(8), MA2 ))		/*    sa2    |    sb2    |    sg2    |    sr2    */
+
+
+/* linear interpolation - geometric series with roundoff
+ *
+ * this is a generalization of Blinn's formula to signed arithmetic
+ *
+ * note that M80 is a register with the 0x0080008000800080 constant
+ */
+#define GMB_LERP_GSR( MP1, MQ1, MA1, MP2, MQ2, MA2, M80) \
+    PSUBW      ( MQ1, MP1 )                     /* pa1 - qa1 | pb1 - qb1 | pg1 - qg1 | pr1 - qr1 */	;\
+    PSLLW      ( CONST(8), MQ1 )		/*                    q1 << 8                    */	;\
+    PMULLW     ( MP1, MA1 )			/*              t1 = (q1 - p1)*pa1               */	;\
+													;\
+TWO(PSUBW      ( MQ2, MP2 ))                    /* pa2 - qa2 | pb2 - qb2 | pg2 - qg2 | pr2 - qr2 */	;\
+TWO(PSLLW      ( CONST(8), MQ2 ))		/*                    q2 << 8                    */	;\
+TWO(PMULLW     ( MP2, MA2 ))			/*              t2 = (q2 - p2)*pa2               */	;\
+													;\
+    PSRLW      ( CONST(15), MP1 )		/*                 q1 > p1 ? 1 : 0               */	;\
+TWO(PSRLW      ( CONST(15), MP2 ))		/*                 q2 > q2 ? 1 : 0               */	;\
+													;\
+    PSLLW      ( CONST(8), MP1 )		/*             q1 > p1 ? 0x100 : 0               */	;\
+TWO(PSLLW      ( CONST(8), MP2 ))		/*             q2 > q2 ? 0x100 : 0               */	;\
+													;\
+    PSUBW      ( MP1, MA1 )			/*                  t1 -=? 0x100                 */	;\
+TWO(PSUBW      ( MP2, MA2 ))			/*                  t2 -=? 0x100                 */	;\
+ 													;\
+    PADDW      ( M80, MA1 )			/*                 t1 += 0x80                    */	;\
+TWO(PADDW      ( M80, MA2 ))			/*                 t2 += 0x80                    */	;\
+													;\
+    MOVQ       ( MA1, MP1 )										;\
+    PSRLW      ( CONST(8), MA1 )		/*                    t1 >> 8                    */	;\
+													;\
+TWO(MOVQ       ( MA2, MP2 ))										;\
+TWO(PSRLW      ( CONST(8), MA2 ))		/*                    t2 >> 8                    */	;\
+													;\
+    PADDW      ( MP1, MA1 )			/*        t1 + (t1 >> 8) ~= (t1/255) << 8        */	;\
+TWO(PADDW      ( MP2, MA2 ))			/*        t2 + (t2 >> 8) ~= (t2/255) << 8        */	;\
+													;\
+    PADDW      ( MQ1, MA1 )			/*              (t1/255 + q1) << 8               */	;\
+TWO(PADDW      ( MQ2, MA2 ))			/*              (t2/255 + q2) << 8               */	;\
+													;\
+    PSRLW      ( CONST(8), MA1 )		/*    sa1    |    sb1    |    sg1    |    sr1    */	;\
+TWO(PSRLW      ( CONST(8), MA2 ))		/*    sa2    |    sb2    |    sg2    |    sr2    */
+
+
+/* linear interpolation - geometric series with correction
+ *
+ * instead of the roundoff this adds a small correction to satisfy the OpenGL criteria
+ *
+ *   t/255 ~= (t + (t >> 8) + (t >> 15)) >> 8
+ *
+ * note that although is faster than rounding off it doesn't give always the exact results
+ */
+#define GMB_LERP_GSC( MP1, MQ1, MA1, MP2, MQ2, MA2) \
+    PSUBW      ( MQ1, MP1 )                     /* pa1 - qa1 | pb1 - qb1 | pg1 - qg1 | pr1 - qr1 */	;\
+    PSLLW      ( CONST(8), MQ1 )		/*                    q1 << 8                    */	;\
+    PMULLW     ( MP1, MA1 )			/*              t1 = (q1 - p1)*pa1               */	;\
+													;\
+TWO(PSUBW      ( MQ2, MP2 ))                    /* pa2 - qa2 | pb2 - qb2 | pg2 - qg2 | pr2 - qr2 */	;\
+TWO(PSLLW      ( CONST(8), MQ2 ))		/*                    q2 << 8                    */	;\
+TWO(PMULLW     ( MP2, MA2 ))			/*              t2 = (q2 - p2)*pa2               */	;\
+													;\
+    MOVQ       ( MA1, MP1 )										;\
+    PSRLW      ( CONST(8), MA1 )		/*                    t1 >> 8                    */	;\
+													;\
+TWO(MOVQ       ( MA2, MP2 ))										;\
+TWO(PSRLW      ( CONST(8), MA2 ))		/*                    t2 >> 8                    */	;\
+													;\
+    PADDW      ( MA1, MP1 )			/*        t1 + (t1 >> 8) ~= (t1/255) << 8        */	;\
+    PSRLW      ( CONST(7), MA1 )		/*                    t1 >> 15                   */	;\
+													;\
+TWO(PADDW      ( MA2, MP2 ))			/*        t2 + (t2 >> 8) ~= (t2/255) << 8        */	;\
+TWO(PSRLW      ( CONST(7), MA2 ))		/*                    t2 >> 15                   */	;\
+													;\
+    PADDW      ( MP1, MA1 )			/*  t1 + (t1 >> 8) + (t1 >>15) ~= (t1/255) << 8  */	;\
+TWO(PADDW      ( MP2, MA2 ))			/*  t2 + (t2 >> 8) + (t2 >>15) ~= (t2/255) << 8  */	;\
+													;\
+    PADDW      ( MQ1, MA1 )			/*              (t1/255 + q1) << 8               */	;\
+TWO(PADDW      ( MQ2, MA2 ))			/*              (t2/255 + q2) << 8               */	;\
+													;\
+    PSRLW      ( CONST(8), MA1 )		/*    sa1    |    sb1    |    sg1    |    sr1    */	;\
+TWO(PSRLW      ( CONST(8), MA2 ))		/*    sa2    |    sb2    |    sg2    |    sr2    */
+
+
+/* common blending setup code
+ *
+ * note that M00 is a register with 0x0000000000000000 constant which can be easily obtained making
+ *
+ *   PXOR      ( M00, M00 )
+ */
+#define GMB_LOAD(rgba, dest, MPP, MQQ) \
+ONE(MOVD       ( REGIND(rgba), MPP ))		/*     |     |     |     | qa1 | qb1 | qg1 | qr1 */	;\
+ONE(MOVD       ( REGIND(dest), MQQ ))		/*     |     |     |     | pa1 | pb1 | pg1 | pr1 */	;\
+													;\
+TWO(MOVQ       ( REGIND(rgba), MPP ))		/* qa2 | qb2 | qg2 | qr2 | qa1 | qb1 | qg1 | qr1 */	;\
+TWO(MOVQ       ( REGIND(dest), MQQ ))		/* pa2 | pb2 | pg2 | pr2 | pa1 | pb1 | pg1 | pr1 */
+
+#define GMB_UNPACK(MP1, MQ1, MP2, MQ2, M00) \
+TWO(MOVQ       ( MP1, MP2 ))										;\
+TWO(MOVQ       ( MQ1, MQ2 ))										;\
+													;\
+    PUNPCKLBW  ( M00, MQ1 )			/*    qa1    |    qb1    |    qg1    |    qr1    */	;\
+TWO(PUNPCKHBW  ( M00, MQ2 ))                    /*    qa2    |    qb2    |    qg2    |    qr2    */	;\
+    PUNPCKLBW  ( M00, MP1 )			/*    pa1    |    pb1    |    pg1    |    pr1    */	;\
+TWO(PUNPCKHBW  ( M00, MP2 ))                    /*    pa2    |    pb2    |    pg2    |    pr2    */
+
+#define GMB_ALPHA(MP1, MA1, MP2, MA2) \
+    MOVQ       ( MP1, MA1 )										;\
+TWO(MOVQ       ( MP2, MA2 ))										;\
+													;\
+    PUNPCKHWD  ( MA1, MA1 )			/*    pa1    |    pa1    |           |           */	;\
+TWO(PUNPCKHWD  ( MA2, MA2 ))			/*    pa2    |    pa2    |           |           */	;\
+    PUNPCKHDQ  ( MA1, MA1 )                     /*    pa1    |    pa1    |    pa1    |    pa1    */	;\
+TWO(PUNPCKHDQ  ( MA2, MA2 ))                    /*    pa2    |    pa2    |    pa2    |    pa2    */
+
+#define GMB_PACK( MS1, MS2 ) \
+    PACKUSWB   ( MS2, MS1 )			/* sa2 | sb2 | sg2 | sr2 | sa1 | sb1 | sg1 | sr1 */	;\
+
+#define GMB_STORE(rgba, MSS ) \
+ONE(MOVD       ( MSS, REGIND(rgba) ))		/*     |     |     |     | sa1 | sb1 | sg1 | sr1 */	;\
+TWO(MOVQ       ( MSS, REGIND(rgba) ))		/* sa2 | sb2 | sg2 | sr2 | sa1 | sb1 | sg1 | sr1 */
+
+
+    SEG_DATA
+
+ALIGNDATA8
+const_0080:
+    D_LONG 0x00800080, 0x00800080
+
+const_80:
+    D_LONG 0x80808080, 0x80808080
+
+    SEG_TEXT
+
+
+/* Blend transparency function
+ */
+
+#define TAG(x) CONCAT(x,_transparency)
+#define LLTAG(x) LLBL2(x,_transparency)
+
+#define INIT \
+    PXOR       ( MM0, MM0 )			/*   0x0000  |   0x0000  |   0x0000  |   0x0000  */
+
+#define MAIN( rgba, dest ) \
+    GMB_LOAD( rgba, dest, MM1, MM2 )									;\
+    GMB_UNPACK( MM1, MM2, MM4, MM5, MM0 )								;\
+    GMB_ALPHA( MM1, MM3, MM4, MM6 )									;\
+    GMB_LERP_GSC( MM1, MM2, MM3, MM4, MM5, MM6 )							;\
+    GMB_PACK( MM3, MM6 )										;\
+    GMB_STORE( rgba, MM3 )
+
+#include "mmx_blendtmp.h"
+
+
+/* Blend add function
+ *
+ * FIXME: Add some loop unrolling here...
+ */
+
+#define TAG(x) CONCAT(x,_add)
+#define LLTAG(x) LLBL2(x,_add)
+
+#define INIT
+
+#define MAIN( rgba, dest ) \
+ONE(MOVD       ( REGIND(rgba), MM1 ))		/*     |     |     |     | qa1 | qb1 | qg1 | qr1 */	;\
+ONE(MOVD       ( REGIND(dest), MM2 ))		/*     |     |     |     | pa1 | pb1 | pg1 | pr1 */	;\
+ONE(PADDUSB    ( MM2, MM1 ))										;\
+ONE(MOVD       ( MM1, REGIND(rgba) ))		/*     |     |     |     | sa1 | sb1 | sg1 | sr1 */	;\
+													;\
+TWO(MOVQ       ( REGIND(rgba), MM1 ))		/* qa2 | qb2 | qg2 | qr2 | qa1 | qb1 | qg1 | qr1 */	;\
+TWO(PADDUSB    ( REGIND(dest), MM1 ))		/* sa2 | sb2 | sg2 | sr2 | sa1 | sb1 | sg1 | sr1 */	;\
+TWO(MOVQ       ( MM1, REGIND(rgba) ))
+
+#include "mmx_blendtmp.h"
+
+
+/* Blend min function
+ */
+
+#define TAG(x) CONCAT(x,_min)
+#define LLTAG(x) LLBL2(x,_min)
+
+#define INIT \
+    MOVQ       ( CONTENT(const_80), MM7 )	/* 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80*/
+
+#define MAIN( rgba, dest ) \
+    GMB_LOAD( rgba, dest, MM1, MM2 )									;\
+    MOVQ       ( MM1, MM3 )										;\
+    MOVQ       ( MM2, MM4 )										;\
+    PXOR       ( MM7, MM3 )			/*              unsigned -> signed               */	;\
+    PXOR       ( MM7, MM4 )			/*              unsigned -> signed               */	;\
+    PCMPGTB    ( MM3, MM4 )			/*                 q > p ? 0xff : 0x00           */	;\
+    PAND       ( MM4, MM1 )			/*                 q > p ? p : 0                 */	;\
+    PANDN      ( MM2, MM4 )			/*                 q > p ? 0 : q                 */	;\
+    POR        ( MM1, MM4 )			/*                 q > p ? p : q                 */	;\
+    GMB_STORE( rgba, MM4 )
+
+#include "mmx_blendtmp.h"
+
+
+/* Blend max function
+ */
+
+#define TAG(x) CONCAT(x,_max)
+#define LLTAG(x) LLBL2(x,_max)
+
+#define INIT \
+    MOVQ       ( CONTENT(const_80), MM7 )	/* 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80*/
+
+#define MAIN( rgba, dest ) \
+    GMB_LOAD( rgba, dest, MM1, MM2 )									;\
+    MOVQ       ( MM1, MM3 )										;\
+    MOVQ       ( MM2, MM4 )										;\
+    PXOR       ( MM7, MM3 )			/*              unsigned -> signed               */	;\
+    PXOR       ( MM7, MM4 )			/*              unsigned -> signed               */	;\
+    PCMPGTB    ( MM3, MM4 )			/*                 q > p ? 0xff : 0x00           */	;\
+    PAND       ( MM4, MM2 )			/*                 q > p ? q : 0                 */	;\
+    PANDN      ( MM1, MM4 )			/*                 q > p ? 0 : p                 */	;\
+    POR        ( MM2, MM4 )			/*                 q > p ? p : q                 */	;\
+    GMB_STORE( rgba, MM4 )
+
+#include "mmx_blendtmp.h"
+
+
+/* Blend modulate function
+ */
+
+#define TAG(x) CONCAT(x,_modulate)
+#define LLTAG(x) LLBL2(x,_modulate)
+
+#define INIT \
+    PXOR       ( MM0, MM0 )			/*   0x0000  |   0x0000  |   0x0000  |   0x0000  */	;\
+    MOVQ       ( CONTENT(const_0080), MM7 )	/*   0x0080  |   0x0080  |   0x0080  |   0x0080  */
+
+#define MAIN( rgba, dest ) \
+    GMB_LOAD( rgba, dest, MM1, MM2 )									;\
+    GMB_UNPACK( MM1, MM2, MM4, MM5, MM0 )								;\
+    GMB_MULT_GSR( MM1, MM2, MM4, MM5, MM7 )								;\
+    GMB_PACK( MM2, MM5 )										;\
+    GMB_STORE( rgba, MM2 )
+
+#include "mmx_blendtmp.h"
+
diff --git a/reactos/lib/mesa32/src/x86/mmx_blendtmp.h b/reactos/lib/mesa32/src/x86/mmx_blendtmp.h
new file mode 100644
index 00000000000..5d22f288a03
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/mmx_blendtmp.h
@@ -0,0 +1,114 @@
+/*
+ * Written by José Fonseca <j_r_fonseca@yahoo.co.uk>
+ */
+
+
+/*
+ * void _mesa_mmx_blend( GLcontext *ctx,
+ *                       GLuint n, 
+ *                       const GLubyte mask[],
+ *                       GLchan rgba[][4], 
+ *                       CONST GLchan dest[][4] )
+ * 
+ */
+ALIGNTEXT16
+GLOBL GLNAME( TAG(_mesa_mmx_blend) )
+
+GLNAME( TAG(_mesa_mmx_blend) ):
+
+    PUSH_L     ( EBP )
+    MOV_L      ( ESP, EBP )
+    PUSH_L     ( ESI )
+    PUSH_L     ( EDI )
+    PUSH_L     ( EBX )
+
+    MOV_L      ( REGOFF(12, EBP), ECX )		/* n */
+    CMP_L      ( CONST(0), ECX)
+    JE         ( LLTAG(GMB_return) )
+
+    MOV_L      ( REGOFF(16, EBP), EBX )		/* mask */
+    MOV_L      ( REGOFF(20, EBP), EDI )         /* rgba */
+    MOV_L      ( REGOFF(24, EBP), ESI )         /* dest */
+
+    INIT
+    
+    TEST_L     ( CONST(4), EDI )		/* align rgba on an 8-byte boundary */
+    JZ         ( LLTAG(GMB_align_end) )
+
+    CMP_B      ( CONST(0), REGIND(EBX) )	/* *mask == 0 */
+    JE         ( LLTAG(GMB_align_continue) )
+
+    /* runin */
+#define ONE(x)	x
+#define TWO(x)  
+    MAIN       ( EDI, ESI )
+#undef ONE
+#undef TWO
+
+LLTAG(GMB_align_continue):
+
+    DEC_L      ( ECX )				/* n -= 1 */
+    INC_L      ( EBX )		                /* mask += 1 */
+    ADD_L      ( CONST(4), EDI )		/* rgba += 1 */
+    ADD_L      ( CONST(4), ESI )		/* dest += 1 */ 
+
+LLTAG(GMB_align_end):
+
+    CMP_L      ( CONST(2), ECX)
+    JB         ( LLTAG(GMB_loop_end) )
+
+ALIGNTEXT16
+LLTAG(GMB_loop_begin):
+
+    CMP_W      ( CONST(0), REGIND(EBX) )	/* *mask == 0 && *(mask + 1) == 0 */
+    JE         ( LLTAG(GMB_loop_continue) )
+
+    /* main loop */
+#define ONE(x)
+#define TWO(x)	x
+    MAIN       ( EDI, ESI )
+#undef ONE
+#undef TWO
+
+LLTAG(GMB_loop_continue):
+
+    DEC_L      ( ECX )
+    DEC_L      ( ECX )				/* n -= 2 */
+    ADD_L      ( CONST(2), EBX )		/* mask += 2 */
+    ADD_L      ( CONST(8), EDI )		/* rgba += 2 */
+    ADD_L      ( CONST(8), ESI )		/* dest += 2 */ 
+    CMP_L      ( CONST(2), ECX )
+    JAE        ( LLTAG(GMB_loop_begin) )
+
+LLTAG(GMB_loop_end):
+
+    CMP_L      ( CONST(1), ECX )
+    JB         ( LLTAG(GMB_done) )
+
+    CMP_B      ( CONST(0), REGIND(EBX) )	/* *mask == 0 */
+    JE         ( LLTAG(GMB_done) )
+
+    /* runout */
+#define ONE(x)	x
+#define TWO(x)
+    MAIN       ( EDI, ESI )
+#undef ONE
+#undef TWO
+
+LLTAG(GMB_done):
+
+    EMMS
+
+LLTAG(GMB_return):
+
+    POP_L      ( EBX )
+    POP_L      ( EDI )
+    POP_L      ( ESI )
+    MOV_L      ( EBP, ESP )
+    POP_L      ( EBP )
+    RET
+
+#undef TAG
+#undef LLTAG
+#undef INIT
+#undef MAIN
diff --git a/reactos/lib/mesa32/src/x86/norm_args.h b/reactos/lib/mesa32/src/x86/norm_args.h
new file mode 100644
index 00000000000..1d9a605e34b
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/norm_args.h
@@ -0,0 +1,58 @@
+/* $Id: norm_args.h,v 1.1 2004/07/16 22:12:43 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * Normal transform function interface for assembly code.  Simply define
+ * FRAME_OFFSET to the number of bytes pushed onto the stack before
+ * using the ARG_* argument macros.
+ *
+ * Gareth Hughes
+ */
+
+#ifndef __NORM_ARGS_H__
+#define __NORM_ARGS_H__
+
+/* Offsets for normal_func arguments
+ *
+ * typedef void (*normal_func)( CONST GLmatrix *mat,
+ *                              GLfloat scale,
+ *                              CONST GLvector4f *in,
+ *                              CONST GLfloat lengths[],
+ *                              GLvector4f *dest );
+ */
+#define OFFSET_MAT	4
+#define OFFSET_SCALE	8
+#define OFFSET_IN	12
+#define OFFSET_LENGTHS	16
+#define OFFSET_DEST	20
+
+#define ARG_MAT         REGOFF(FRAME_OFFSET+OFFSET_MAT, ESP)
+#define ARG_SCALE       REGOFF(FRAME_OFFSET+OFFSET_SCALE, ESP)
+#define ARG_IN          REGOFF(FRAME_OFFSET+OFFSET_IN, ESP)
+#define ARG_LENGTHS     REGOFF(FRAME_OFFSET+OFFSET_LENGTHS, ESP)
+#define ARG_DEST        REGOFF(FRAME_OFFSET+OFFSET_DEST, ESP)
+
+#endif
diff --git a/reactos/lib/mesa32/src/x86/sse.c b/reactos/lib/mesa32/src/x86/sse.c
new file mode 100644
index 00000000000..45852c4e1c0
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/sse.c
@@ -0,0 +1,123 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * PentiumIII-SIMD (SSE) optimizations contributed by
+ * Andre Werthmann <wertmann@cs.uni-potsdam.de>
+ */
+
+#include "glheader.h"
+#include "context.h"
+#include "math/m_xform.h"
+#include "tnl/t_context.h"
+
+#include "sse.h"
+#include "common_x86_macros.h"
+
+#ifdef DEBUG
+#include "math/m_debug.h"
+#endif
+
+
+#ifdef USE_SSE_ASM
+DECLARE_XFORM_GROUP( sse, 2 )
+DECLARE_XFORM_GROUP( sse, 3 )
+
+#if 1
+/* Some functions are not written in SSE-assembly, because the fpu ones are faster */
+extern void _ASMAPI _mesa_sse_transform_normals_no_rot( NORM_ARGS );
+extern void _ASMAPI _mesa_sse_transform_rescale_normals( NORM_ARGS );
+extern void _ASMAPI _mesa_sse_transform_rescale_normals_no_rot( NORM_ARGS );
+
+extern void _ASMAPI _mesa_sse_transform_points4_general( XFORM_ARGS );
+extern void _ASMAPI _mesa_sse_transform_points4_3d( XFORM_ARGS );
+/* XXX this function segfaults, see below */
+extern void _ASMAPI _mesa_sse_transform_points4_identity( XFORM_ARGS );
+/* XXX this one works, see below */
+extern void _ASMAPI _mesa_x86_transform_points4_identity( XFORM_ARGS );
+#else
+DECLARE_NORM_GROUP( sse )
+#endif
+
+
+extern void _ASMAPI
+_mesa_v16_sse_general_xform( GLfloat *first_vert,
+			     const GLfloat *m,
+			     const GLfloat *src,
+			     GLuint src_stride,
+			     GLuint count );
+
+extern void _ASMAPI
+_mesa_sse_project_vertices( GLfloat *first,
+			    GLfloat *last,
+			    const GLfloat *m,
+			    GLuint stride );
+
+extern void _ASMAPI
+_mesa_sse_project_clipped_vertices( GLfloat *first,
+				    GLfloat *last,
+				    const GLfloat *m,
+				    GLuint stride,
+				    const GLubyte *clipmask );
+#endif
+
+
+void _mesa_init_sse_transform_asm( void )
+{
+#ifdef USE_SSE_ASM
+   ASSIGN_XFORM_GROUP( sse, 2 );
+   ASSIGN_XFORM_GROUP( sse, 3 );
+
+#if 1
+   /* TODO: Finish these off.
+    */
+   _mesa_transform_tab[4][MATRIX_GENERAL] =
+      _mesa_sse_transform_points4_general;
+   _mesa_transform_tab[4][MATRIX_3D] =
+      _mesa_sse_transform_points4_3d;
+   /* XXX NOTE: _mesa_sse_transform_points4_identity segfaults with the
+      conformance tests, so use the x86 version.
+   */
+   _mesa_transform_tab[4][MATRIX_IDENTITY] =
+      _mesa_x86_transform_points4_identity;/*_mesa_sse_transform_points4_identity;*/
+
+   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT] =
+      _mesa_sse_transform_normals_no_rot;
+   _mesa_normal_tab[NORM_TRANSFORM | NORM_RESCALE] =
+      _mesa_sse_transform_rescale_normals;
+   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT | NORM_RESCALE] =
+      _mesa_sse_transform_rescale_normals_no_rot;
+#else
+   ASSIGN_XFORM_GROUP( sse, 4 );
+
+   ASSIGN_NORM_GROUP( sse );
+#endif
+
+#ifdef DEBUG
+   _math_test_all_transform_functions( "SSE" );
+   _math_test_all_normal_transform_functions( "SSE" );
+#endif
+#endif
+}
+
diff --git a/reactos/lib/mesa32/src/x86/sse.h b/reactos/lib/mesa32/src/x86/sse.h
new file mode 100644
index 00000000000..46a6e4c4136
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/sse.h
@@ -0,0 +1,39 @@
+/* $Id: sse.h,v 1.1 2004/07/16 22:12:43 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * PentiumIII-SIMD (SSE) optimizations contributed by
+ * Andre Werthmann <wertmann@cs.uni-potsdam.de>
+ */
+
+#ifndef __SSE_H__
+#define __SSE_H__
+
+#include "math/m_xform.h"
+
+void _mesa_init_sse_transform_asm( void );
+
+#endif
diff --git a/reactos/lib/mesa32/src/x86/sse_normal.S b/reactos/lib/mesa32/src/x86/sse_normal.S
new file mode 100644
index 00000000000..168475ae1e0
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/sse_normal.S
@@ -0,0 +1,252 @@
+/* $Id: sse_normal.S,v 1.1 2004/07/16 22:12:43 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/** TODO:
+  * - insert PREFETCH instructions to avoid cache-misses !
+  * - some more optimizations are possible...
+  * - for 40-50% more performance in the SSE-functions, the
+  *   data (trans-matrix, src_vert, dst_vert) needs to be 16byte aligned !
+  */
+
+#include "matypes.h"
+#include "norm_args.h"
+
+   SEG_TEXT
+
+#define M(i)    REGOFF(i * 4, EDX)
+#define S(i)	REGOFF(i * 4, ESI)
+#define D(i)	REGOFF(i * 4, EDI)
+#define STRIDE  REGOFF(12, ESI)
+
+
+ALIGNTEXT16
+GLOBL GLNAME(_mesa_sse_transform_rescale_normals_no_rot)
+GLNAME(_mesa_sse_transform_rescale_normals_no_rot):
+
+#define FRAME_OFFSET 8
+	PUSH_L  ( ESI )
+	PUSH_L  ( EDI )
+
+	MOV_L	( ARG_IN, ESI )				/* ptr to source GLvector3f */
+	MOV_L	( ARG_DEST, EDI )			/* ptr to dest GLvector3f */
+
+	MOV_L	( ARG_MAT, EDX )			/* ptr to matrix */
+	MOV_L	( REGOFF(MATRIX_INV, EDX), EDX)		/* matrix->inv */
+
+	MOV_L	( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */
+
+	TEST_L	( ECX, ECX )
+	JZ( LLBL(K_G3TRNNRR_finish) )			/* count was zero; go to finish */
+
+	MOV_L	( STRIDE, EAX )				/* stride */
+	MOV_L	( ECX, REGOFF(V4F_COUNT, EDI) )		/* set dest-count */
+
+	IMUL_L( CONST(16), ECX )			/* count *= 16 */
+	MOV_L( REGOFF(V4F_START, ESI), ESI )		/* ptr to first source vertex */
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI )		/* ptr to first dest vertex */
+	ADD_L( EDI, ECX ) 				/* count += dest ptr */
+
+ALIGNTEXT32
+	MOVSS	( M(0), XMM1 )				/* m0 */
+	MOVSS	( M(5), XMM2 )				/* m5 */
+	UNPCKLPS( XMM2, XMM1 )				/* m5 | m0 */
+	MOVSS	( ARG_SCALE, XMM0 )			/* scale */
+	SHUFPS	( CONST(0x0), XMM0, XMM0 )		/* scale | scale */
+	MULPS	( XMM0, XMM1 )				/* m5*scale | m0*scale */
+	MULSS	( M(10), XMM0 )				/* m10*scale */
+
+ALIGNTEXT32
+LLBL(K_G3TRNNRR_top):
+	MOVLPS	( S(0), XMM2 )				/* uy | ux */
+	MULPS	( XMM1, XMM2 )				/* uy*m5*scale | ux*m0*scale */
+	MOVLPS	( XMM2, D(0) )				/* ->D(1) | D(0) */
+
+	MOVSS	( S(2), XMM2 )				/* uz */
+	MULSS	( XMM0, XMM2 )				/* uz*m10*scale */
+	MOVSS	( XMM2, D(2) )				/* ->D(2) */
+
+LLBL(K_G3TRNNRR_skip):
+	ADD_L	( CONST(16), EDI )
+	ADD_L	( EAX, ESI )
+	CMP_L	( ECX, EDI )
+	JNE	( LLBL(K_G3TRNNRR_top) )
+
+LLBL(K_G3TRNNRR_finish):
+	POP_L	( EDI )
+	POP_L	( ESI )
+	RET
+#undef FRAME_OFFSET
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME(_mesa_sse_transform_rescale_normals)
+GLNAME(_mesa_sse_transform_rescale_normals):
+
+#define FRAME_OFFSET 8
+	PUSH_L  ( ESI )
+	PUSH_L  ( EDI )
+
+	MOV_L	( ARG_IN, ESI )				/* ptr to source GLvector3f */
+	MOV_L	( ARG_DEST, EDI )			/* ptr to dest GLvector3f */
+
+	MOV_L	( ARG_MAT, EDX )			/* ptr to matrix */
+	MOV_L	( REGOFF(MATRIX_INV, EDX), EDX)		/* matrix->inv */
+
+	MOV_L	( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */
+
+	TEST_L	( ECX, ECX )
+	JZ( LLBL(K_G3TRNR_finish) )			/* count was zero; go to finish */
+
+	MOV_L	( STRIDE, EAX )				/* stride */
+	MOV_L	( ECX, REGOFF(V4F_COUNT, EDI) )		/* set dest-count */
+
+	IMUL_L( CONST(16), ECX )			/* count *= 16 */
+	MOV_L( REGOFF(V4F_START, ESI), ESI )		/* ptr to first source vertex */
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI )		/* ptr to first dest vertex */
+	ADD_L( EDI, ECX ) 				/* count += dest ptr */
+
+ALIGNTEXT32
+	MOVSS	( M(0), XMM0 )				/* m0 */
+	MOVSS	( M(4), XMM1 )				/* m4 */
+	UNPCKLPS( XMM1, XMM0 )				/* m4 | m0 */
+
+	MOVSS	( ARG_SCALE, XMM4 )			/* scale */
+	SHUFPS	( CONST(0x0), XMM4, XMM4 )		/* scale | scale */
+
+	MULPS	( XMM4, XMM0 )				/* m4*scale | m0*scale */
+	MOVSS	( M(1), XMM1 )				/* m1 */
+	MOVSS	( M(5), XMM2 )				/* m5 */
+	UNPCKLPS( XMM2, XMM1 )				/* m5 | m1 */
+	MULPS	( XMM4, XMM1 )				/* m5*scale | m1*scale */
+	MOVSS	( M(2), XMM2 )				/* m2 */
+	MOVSS	( M(6), XMM3 )				/* m6 */
+	UNPCKLPS( XMM3, XMM2 )				/* m6 | m2 */
+	MULPS	( XMM4, XMM2 )				/* m6*scale | m2*scale */
+
+	MOVSS	( M(8), XMM6 )				/* m8 */
+	MULSS	( ARG_SCALE, XMM6 )			/* m8*scale */
+	MOVSS	( M(9), XMM7 )				/* m9 */
+	MULSS	( ARG_SCALE, XMM7 )			/* m9*scale */
+
+ALIGNTEXT32
+LLBL(K_G3TRNR_top):
+	MOVSS	( S(0), XMM3 )				/* ux */
+	SHUFPS	( CONST(0x0), XMM3, XMM3 )		/* ux | ux */
+	MULPS	( XMM0, XMM3 )				/* ux*m4 | ux*m0 */
+	MOVSS	( S(1), XMM4 )				/* uy */
+	SHUFPS	( CONST(0x0), XMM4, XMM4 )		/* uy | uy */
+	MULPS	( XMM1, XMM4 )				/* uy*m5 | uy*m1 */
+	MOVSS	( S(2), XMM5 )				/* uz */
+	SHUFPS	( CONST(0x0), XMM5, XMM5 )		/* uz | uz */
+	MULPS	( XMM2, XMM5 )				/* uz*m6 | uz*m2 */
+
+	ADDPS	( XMM4, XMM3 )
+	ADDPS	( XMM5, XMM3 )
+	MOVLPS	( XMM3, D(0) )
+
+	MOVSS	( M(10), XMM3 )				/* m10 */
+	MULSS	( ARG_SCALE, XMM3 )			/* m10*scale */
+	MULSS	( S(2), XMM3 )				/* m10*scale*uz */
+	MOVSS	( S(1), XMM4 )				/* uy */
+	MULSS	( XMM7, XMM4 )				/* uy*m9*scale */
+	MOVSS	( S(0), XMM5 )				/* ux */
+	MULSS	( XMM6, XMM5 )				/* ux*m8*scale */
+
+	ADDSS	( XMM4, XMM3 )
+	ADDSS	( XMM5, XMM3 )
+	MOVSS	( XMM3, D(2) )
+
+LLBL(K_G3TRNR_skip):
+	ADD_L	( CONST(16), EDI )
+	ADD_L	( EAX, ESI )
+	CMP_L	( ECX, EDI )
+	JNE	( LLBL(K_G3TRNR_top) )
+
+LLBL(K_G3TRNR_finish):
+	POP_L	( EDI )
+	POP_L	( ESI )
+	RET
+#undef FRAME_OFFSET
+
+
+ALIGNTEXT16
+GLOBL GLNAME(_mesa_sse_transform_normals_no_rot)
+GLNAME(_mesa_sse_transform_normals_no_rot):
+
+#define FRAME_OFFSET 8
+	PUSH_L  ( ESI )
+	PUSH_L  ( EDI )
+
+	MOV_L	( ARG_IN, ESI )				/* ptr to source GLvector3f */
+	MOV_L	( ARG_DEST, EDI )			/* ptr to dest GLvector3f */
+
+	MOV_L	( ARG_MAT, EDX )			/* ptr to matrix */
+	MOV_L	( REGOFF(MATRIX_INV, EDX), EDX)		/* matrix->inv */
+
+	MOV_L	( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */
+
+	TEST_L	( ECX, ECX )
+	JZ( LLBL(K_G3TNNRR_finish) )			/* count was zero; go to finish */
+
+	MOV_L	( STRIDE, EAX )				/* stride */
+	MOV_L	( ECX, REGOFF(V4F_COUNT, EDI) )		/* set dest-count */
+
+	IMUL_L( CONST(16), ECX )			/* count *= 16 */
+	MOV_L( REGOFF(V4F_START, ESI), ESI )		/* ptr to first source vertex */
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI )		/* ptr to first dest vertex */
+	ADD_L( EDI, ECX ) 				/* count += dest ptr */
+
+ALIGNTEXT32
+	MOVSS( M(0), XMM0 )				/* m0 */
+	MOVSS( M(5), XMM1 )				/* m5 */
+	UNPCKLPS( XMM1, XMM0 )				/* m5 | m0 */
+	MOVSS( M(10), XMM1 )				/* m10 */
+
+ALIGNTEXT32
+LLBL(K_G3TNNRR_top):
+	MOVLPS( S(0), XMM2 )				/* uy | ux */
+	MULPS( XMM0, XMM2 )				/* uy*m5 | ux*m0 */
+	MOVLPS( XMM2, D(0) )
+
+	MOVSS( S(2), XMM2 )				/* uz */
+	MULSS( XMM1, XMM2 )				/* uz*m10 */
+	MOVSS( XMM2, D(2) )
+
+LLBL(K_G3TNNRR_skip):
+	ADD_L	( CONST(16), EDI )
+	ADD_L	( EAX, ESI )
+	CMP_L	( ECX, EDI )
+	JNE	( LLBL(K_G3TNNRR_top) )
+
+LLBL(K_G3TNNRR_finish):
+	POP_L	( EDI )
+	POP_L	( ESI )
+	RET
+#undef FRAME_OFFSET
diff --git a/reactos/lib/mesa32/src/x86/sse_xform1.S b/reactos/lib/mesa32/src/x86/sse_xform1.S
new file mode 100644
index 00000000000..98c79a35408
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/sse_xform1.S
@@ -0,0 +1,433 @@
+/* $Id: sse_xform1.S,v 1.1 2004/07/16 22:12:43 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/** TODO:
+  * - insert PREFETCH instructions to avoid cache-misses !
+  * - some more optimizations are possible...
+  * - for 40-50% more performance in the SSE-functions, the
+  *   data (trans-matrix, src_vert, dst_vert) needs to be 16byte aligned !
+  */
+
+#include "matypes.h"
+#include "xform_args.h"
+
+   SEG_TEXT
+
+#define S(i) 	REGOFF(i * 4, ESI)
+#define D(i) 	REGOFF(i * 4, EDI)
+#define M(i) 	REGOFF(i * 4, EDX)
+
+
+ALIGNTEXT4
+GLOBL GLNAME(_mesa_sse_transform_points1_general)
+GLNAME( _mesa_sse_transform_points1_general ):
+
+#define FRAME_OFFSET 8
+    PUSH_L    ( ESI )
+    PUSH_L    ( EDI )
+
+    MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */
+    MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */
+
+    MOV_L( ARG_MATRIX, EDX ) 			/* ptr to matrix */
+    MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */
+
+    CMP_L( CONST(0), ECX )			/* count == 0 ? */
+    JE( LLBL(K_GTP1GR_finish) )			/* yes -> nothing to do. */
+
+    MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */
+    OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */
+
+    MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */
+    MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */
+
+    SHL_L( CONST(4), ECX ) 			/* count *= 16 */
+    MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */
+
+    MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */
+    ADD_L( EDI, ECX ) 				/* count += dest ptr */
+
+
+ALIGNTEXT32
+    MOVAPS( M(0), XMM0 )			/* m3  | m2  | m1  | m0  */
+    MOVAPS( M(12), XMM1 )			/* m15 | m14 | m13 | m12 */
+
+ALIGNTEXT32
+LLBL(K_GTP1GR_top):
+    MOVSS( S(0), XMM2 )				/* ox */
+    SHUFPS( CONST(0x0), XMM2, XMM2 )		/* ox | ox | ox | ox */
+    MULPS( XMM0, XMM2 )				/* ox*m3 | ox*m2 | ox*m1 | ox*m0 */
+    ADDPS( XMM1, XMM2 )				/* + | + | + | + */
+    MOVUPS( XMM2, D(0) )
+
+LLBL(K_GTP1GR_skip):
+    ADD_L     ( CONST(16), EDI )
+    ADD_L     ( EAX, ESI )
+    CMP_L     ( ECX, EDI )
+    JNE       ( LLBL(K_GTP1GR_top) )
+
+LLBL(K_GTP1GR_finish):
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
+#undef FRAME_OFFSET
+
+
+
+ALIGNTEXT4
+GLOBL GLNAME(_mesa_sse_transform_points1_identity)
+GLNAME( _mesa_sse_transform_points1_identity ):
+
+#define FRAME_OFFSET 8
+    PUSH_L    ( ESI )
+    PUSH_L    ( EDI )
+
+    MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */
+    MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */
+
+    MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */
+
+    TEST_L( ECX, ECX)
+    JZ( LLBL(K_GTP1IR_finish) ) 		/* count was zero; go to finish */
+
+    MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */
+    OR_L( CONST(VEC_SIZE_1), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */
+
+    MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */
+    MOV_L( CONST(1), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */
+
+    SHL_L( CONST(4), ECX ) 			/* count *= 16 */
+    MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */
+
+    MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */
+    ADD_L( EDI, ECX ) 				/* count += dest ptr */
+
+    CMP_L( ESI, EDI )
+    JE( LLBL(K_GTP1IR_finish) )
+
+
+ALIGNTEXT32
+LLBL(K_GTP1IR_top):
+    MOV_L( S(0), EDX )
+    MOV_L( EDX, D(0) )
+
+LLBL(K_GTP1IR_skip):
+    ADD_L     ( CONST(16), EDI )
+    ADD_L     ( EAX, ESI )
+    CMP_L     ( ECX, EDI )
+    JNE       ( LLBL(K_GTP1IR_top) )
+
+LLBL(K_GTP1IR_finish):
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
+#undef FRAME_OFFSET
+
+
+
+ALIGNTEXT4
+GLOBL GLNAME(_mesa_sse_transform_points1_3d_no_rot)
+GLNAME(_mesa_sse_transform_points1_3d_no_rot):
+
+#define FRAME_OFFSET 8
+    PUSH_L( ESI )
+    PUSH_L( EDI )
+
+    MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI )	/* ptr to source GLvector4f */
+    MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */
+
+    MOV_L( ARG_MATRIX, EDX ) 			/* ptr to matrix */
+    MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */
+
+    TEST_L( ECX, ECX)
+    JZ( LLBL(K_GTP13DNRR_finish) ) 		/* count was zero; go to finish */
+
+    MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */
+    OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */
+
+    MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */
+    MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */
+
+    SHL_L( CONST(4), ECX ) 			/* count *= 16 */
+    MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */
+
+    MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */
+    ADD_L( EDI, ECX ) 				/* count += dest ptr */
+
+
+ALIGNTEXT32
+    MOVSS( M(0), XMM0 )				/* m0 */
+    MOVSS( M(12), XMM1 )			/* m12 */
+    MOVSS( M(13), XMM2 )			/* m13 */
+    MOVSS( M(14), XMM3 )			/* m14 */
+
+ALIGNTEXT32
+LLBL(K_GTP13DNRR_top):
+    MOVSS( S(0), XMM4 )				/* ox */
+    MULSS( XMM0, XMM4 )				/* ox*m0 */
+    ADDSS( XMM1, XMM4 )				/* ox*m0+m12 */
+    MOVSS( XMM4, D(0) )
+
+    MOVSS( XMM2, D(1) )
+    MOVSS( XMM3, D(2) )
+
+LLBL(K_GTP13DNRR_skip):
+    ADD_L    ( CONST(16), EDI )
+    ADD_L    ( EAX, ESI )
+    CMP_L    ( ECX, EDI )
+    JNE      ( LLBL(K_GTP13DNRR_top) )
+
+LLBL(K_GTP13DNRR_finish):
+    POP_L    ( EDI )
+    POP_L    ( ESI )
+    RET
+#undef FRAME_OFFSET
+
+
+
+ALIGNTEXT4
+GLOBL GLNAME(_mesa_sse_transform_points1_perspective)
+GLNAME(_mesa_sse_transform_points1_perspective):
+
+#define FRAME_OFFSET 8
+    PUSH_L   ( ESI )
+    PUSH_L   ( EDI )
+
+    MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */
+    MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */
+
+    MOV_L( ARG_MATRIX, EDX ) 			/* ptr to matrix */
+    MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */
+
+    TEST_L( ECX, ECX)
+    JZ( LLBL(K_GTP13PR_finish) )		/* count was zero; go to finish */
+
+    MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */
+    OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */
+
+    MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */
+    MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */
+
+    SHL_L( CONST(4), ECX ) 			/* count *= 16 */
+    MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */
+
+    MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */
+    ADD_L( EDI, ECX ) 				/* count += dest ptr */
+
+
+ALIGNTEXT32
+    XORPS( XMM0, XMM0 )				/* 0 | 0 | 0 | 0 */
+    MOVSS( M(0), XMM1 )				/* m0 */
+    MOVSS( M(14), XMM2 )			/* m14 */
+
+ALIGNTEXT32
+LLBL(K_GTP13PR_top):
+    MOVSS( S(0), XMM3 )				/* ox */
+    MULSS( XMM1, XMM3 )				/* ox*m0 */
+    MOVSS( XMM3, D(0) )				/* ox*m0->D(0) */
+    MOVSS( XMM2, D(2) )				/* m14->D(2) */
+
+    MOVSS( XMM0, D(1) )
+    MOVSS( XMM0, D(3) )
+
+LLBL(K_GTP13PR_skip):
+    ADD_L( CONST(16), EDI )
+    ADD_L( EAX, ESI )
+    CMP_L( ECX, EDI )
+    JNE( LLBL(K_GTP13PR_top) )
+
+LLBL(K_GTP13PR_finish):
+    POP_L    ( EDI )
+    POP_L    ( ESI )
+    RET
+#undef FRAME_OFFSET
+
+
+ALIGNTEXT4
+GLOBL GLNAME(_mesa_sse_transform_points1_2d)
+GLNAME(_mesa_sse_transform_points1_2d):
+
+#define FRAME_OFFSET 8
+    PUSH_L( ESI )
+    PUSH_L( EDI )
+
+    MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */
+    MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */
+
+    MOV_L( ARG_MATRIX, EDX ) 			/* ptr to matrix */
+    MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */
+
+    TEST_L( ECX, ECX)
+    JZ( LLBL(K_GTP13P2DR_finish) ) 		/* count was zero; go to finish */
+
+    MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */
+    OR_L( CONST(VEC_SIZE_2), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */
+
+    MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */
+    MOV_L( CONST(2), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */
+
+    SHL_L( CONST(4), ECX ) 			/* count *= 16 */
+    MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */
+
+    MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */
+    ADD_L( EDI, ECX ) 				/* count += dest ptr */
+
+ALIGNTEXT32
+    MOVLPS( M(0), XMM0 )			/* m1  | m0  */
+    MOVLPS( M(12), XMM1 )			/* m13 | m12 */
+
+ALIGNTEXT32
+LLBL(K_GTP13P2DR_top):
+    MOVSS( S(0), XMM2 )				/* ox */
+    SHUFPS( CONST(0x0), XMM2, XMM2 )		/* ox | ox | ox | ox */
+    MULPS( XMM0, XMM2 )				/* - | - | ox*m1 | ox*m0 */
+    ADDPS( XMM1, XMM2 )				/* - | - | ox*m1+m13 | ox*m0+m12 */
+    MOVLPS( XMM2, D(0) )
+
+LLBL(K_GTP13P2DR_skip):
+    ADD_L    ( CONST(16), EDI )
+    ADD_L    ( EAX, ESI )
+    CMP_L    ( ECX, EDI )
+    JNE      ( LLBL(K_GTP13P2DR_top) )
+
+LLBL(K_GTP13P2DR_finish):
+    POP_L    ( EDI )
+    POP_L    ( ESI )
+    RET
+#undef FRAME_OFFSET
+
+
+ALIGNTEXT4
+GLOBL GLNAME(_mesa_sse_transform_points1_2d_no_rot)
+GLNAME(_mesa_sse_transform_points1_2d_no_rot):
+
+#define FRAME_OFFSET 8
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+
+	MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */
+	MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */
+
+	MOV_L( ARG_MATRIX, EDX ) 		/* ptr to matrix */
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */
+
+	TEST_L( ECX, ECX)
+	JZ( LLBL(K_GTP13P2DNRR_finish) ) 	/* count was zero; go to finish */
+
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */
+	OR_L( CONST(VEC_SIZE_2), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */
+
+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */
+	MOV_L( CONST(2), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */
+
+	SHL_L( CONST(4), ECX ) 			/* count *= 16 */
+	MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */
+	ADD_L( EDI, ECX ) 			/* count += dest ptr */
+
+ALIGNTEXT32
+	MOVSS( M(0), XMM0 )			/* m0 */
+	MOVSS( M(12), XMM1 )			/* m12 */
+	MOVSS( M(13), XMM2 )			/* m13 */
+
+ALIGNTEXT32
+LLBL(K_GTP13P2DNRR_top):
+	MOVSS( S(0), XMM3 )			/* ox */
+	MULSS( XMM0, XMM3 )			/* ox*m0 */
+	ADDSS( XMM1, XMM3 )			/* ox*m0+m12 */
+	MOVSS( XMM3, D(0) )
+	MOVSS( XMM2, D(1) )
+
+LLBL(K_GTP13P2DNRR_skip):
+	ADD_L( CONST(16), EDI )
+	ADD_L( EAX, ESI )
+	CMP_L( ECX, EDI )
+	JNE( LLBL(K_GTP13P2DNRR_top) )
+
+LLBL(K_GTP13P2DNRR_finish):
+	POP_L( EDI )
+	POP_L( ESI )
+	RET
+#undef FRAME_OFFSET
+
+
+
+ALIGNTEXT4
+GLOBL GLNAME(_mesa_sse_transform_points1_3d)
+GLNAME(_mesa_sse_transform_points1_3d):
+
+#define FRAME_OFFSET 8
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+
+	MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */
+	MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */
+
+	MOV_L( ARG_MATRIX, EDX ) 		/* ptr to matrix */
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */
+
+	TEST_L( ECX, ECX)
+	JZ( LLBL(K_GTP13P3DR_finish) ) 	/* count was zero; go to finish */
+
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */
+	OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */
+
+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */
+	MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */
+
+	SHL_L( CONST(4), ECX ) 			/* count *= 16 */
+	MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */
+	ADD_L( EDI, ECX ) 			/* count += dest ptr */
+
+
+ALIGNTEXT32
+	MOVAPS( M(0), XMM0 )			/* m3  | m2  | m1  |  m0 */
+	MOVAPS( M(12), XMM1 )			/* m15 | m14 | m13 | m12 */
+
+ALIGNTEXT32
+LLBL(K_GTP13P3DR_top):
+	MOVSS( S(0), XMM2 )			/* ox */
+	SHUFPS( CONST(0x0), XMM2, XMM2 )	/* ox | ox | ox | ox */
+	MULPS( XMM0, XMM2 )			/* ox*m3 | ox*m2 | ox*m1 | ox*m0 */
+	ADDPS( XMM1, XMM2 )			/* +m15  | +m14  | +m13  | +m12  */
+	MOVLPS( XMM2, D(0) )			/*   -   |   -   | ->D(1)| ->D(0)*/
+	UNPCKHPS( XMM2, XMM2 )			/* ox*m3+m15 | ox*m3+m15 | ox*m2+m14 | ox*m2+m14 */
+	MOVSS( XMM2, D(2) )
+
+LLBL(K_GTP13P3DR_skip):
+	ADD_L( CONST(16), EDI )
+	ADD_L( EAX, ESI )
+	CMP_L( ECX, EDI )
+	JNE( LLBL(K_GTP13P3DR_top) )
+
+LLBL(K_GTP13P3DR_finish):
+	POP_L( EDI )
+	POP_L( ESI )
+	RET
+#undef FRAME_OFFSET
diff --git a/reactos/lib/mesa32/src/x86/sse_xform2.S b/reactos/lib/mesa32/src/x86/sse_xform2.S
new file mode 100644
index 00000000000..e4559936b1d
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/sse_xform2.S
@@ -0,0 +1,452 @@
+/* $Id: sse_xform2.S,v 1.1 2004/07/16 22:12:43 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/** TODO:
+  * - insert PREFETCH instructions to avoid cache-misses !
+  * - some more optimizations are possible...
+  * - for 40-50% more performance in the SSE-functions, the
+  *   data (trans-matrix, src_vert, dst_vert) needs to be 16byte aligned !
+  */
+
+#include "matypes.h"
+#include "xform_args.h"
+
+   SEG_TEXT
+
+#define S(i) 	REGOFF(i * 4, ESI)
+#define D(i) 	REGOFF(i * 4, EDI)
+#define M(i) 	REGOFF(i * 4, EDX)
+
+
+ALIGNTEXT4
+GLOBL GLNAME(_mesa_sse_transform_points2_general)
+GLNAME( _mesa_sse_transform_points2_general ):
+
+#define FRAME_OFFSET 8
+    PUSH_L    ( ESI )
+    PUSH_L    ( EDI )
+
+    MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */
+    MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */
+
+    MOV_L( ARG_MATRIX, EDX ) 			/* ptr to matrix */
+    MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */
+
+    TEST_L( ECX, ECX )
+    JZ( LLBL(K_GTP2GR_finish) )			/* count was zero; go to finish */
+
+    MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */
+    OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */
+
+    MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */
+    MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */
+
+    SHL_L( CONST(4), ECX ) 			/* count *= 16 */
+    MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */
+
+    MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */
+    ADD_L( EDI, ECX ) 				/* count += dest ptr */
+
+ALIGNTEXT32
+    MOVAPS( M(0), XMM0 )			/* m3  | m2  | m1  | m0 */
+    MOVAPS( M(4), XMM1 )			/* m7  | m6  | m5  | m4 */
+    MOVAPS( M(12), XMM2 )			/* m15 | m14 | m13 | m12 */
+
+ALIGNTEXT32
+LLBL(K_GTP2GR_top):
+    MOVSS( S(0), XMM3 )				/* ox */
+    SHUFPS( CONST(0x0), XMM3, XMM3 )		/* ox | ox | ox | ox */
+    MULPS( XMM0, XMM3 )				/* ox*m3 | ox*m2 | ox*m1 | ox*m0 */
+    MOVSS( S(1), XMM4 )				/* oy */
+    SHUFPS( CONST(0x0), XMM4, XMM4 )		/* oy | oy | oy | oy */
+    MULPS( XMM1, XMM4 )				/* oy*m7 | oy*m6 | oy*m5 | oy*m4 */
+
+    ADDPS( XMM4, XMM3 )
+    ADDPS( XMM2, XMM3 )
+    MOVAPS( XMM3, D(0) )
+
+LLBL(K_GTP2GR_skip):
+    ADD_L     ( CONST(16), EDI )
+    ADD_L     ( EAX, ESI )
+    CMP_L     ( ECX, EDI )
+    JNE       ( LLBL(K_GTP2GR_top) )
+
+LLBL(K_GTP2GR_finish):
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
+#undef FRAME_OFFSET
+
+
+ALIGNTEXT4
+GLOBL GLNAME(_mesa_sse_transform_points2_identity)
+GLNAME( _mesa_sse_transform_points2_identity ):
+
+#define FRAME_OFFSET 8
+    PUSH_L    ( ESI )
+    PUSH_L    ( EDI )
+
+    MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) /* ptr to source GLvector4f */
+    MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */
+
+    MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */
+
+    TEST_L( ECX, ECX)
+    JZ( LLBL(K_GTP2IR_finish) )			/* count was zero; go to finish */
+
+    MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */
+    OR_L( CONST(VEC_SIZE_2), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */
+
+    MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */
+    MOV_L( CONST(2), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */
+
+    SHL_L( CONST(4), ECX ) 			/* count *= 16 */
+    MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */
+
+    MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */
+    ADD_L( EDI, ECX ) 				/* count += dest ptr */
+
+    CMP_L( ESI, EDI )
+    JE( LLBL(K_GTP2IR_finish) )
+
+
+ALIGNTEXT32
+LLBL(K_GTP2IR_top):
+    MOV_L     ( S(0), EDX )
+    MOV_L     ( EDX, D(0) )
+    MOV_L     ( S(1), EDX )
+    MOV_L     ( EDX, D(1) )
+
+LLBL(K_GTP2IR_skip):
+    ADD_L     ( CONST(16), EDI )
+    ADD_L     ( EAX, ESI )
+    CMP_L     ( ECX, EDI )
+    JNE       ( LLBL(K_GTP2IR_top) )
+
+LLBL(K_GTP2IR_finish):
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
+#undef FRAME_OFFSET
+
+
+ALIGNTEXT4
+GLOBL GLNAME(_mesa_sse_transform_points2_3d_no_rot)
+GLNAME(_mesa_sse_transform_points2_3d_no_rot):
+
+#define FRAME_OFFSET 8
+    PUSH_L( ESI )
+    PUSH_L( EDI )
+
+    MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */
+    MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */
+
+    MOV_L( ARG_MATRIX, EDX ) 			/* ptr to matrix */
+    MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */
+
+    TEST_L( ECX, ECX)
+    JZ( LLBL(K_GTP23DNRR_finish) ) 		/* count was zero; go to finish */
+
+    MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */
+    OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */
+
+    MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */
+    MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */
+
+    SHL_L( CONST(4), ECX ) 			/* count *= 16 */
+    MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */
+
+    MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */
+    ADD_L( EDI, ECX ) 				/* count += dest ptr */
+
+
+ALIGNTEXT32
+    MOVSS    ( M(0), XMM1 )			/* - | - |  -  | m0  */
+    MOVSS    ( M(5), XMM2 )			/* - | - |  -  | m5  */
+    UNPCKLPS ( XMM2, XMM1 )			/* - | - | m5  | m0  */
+    MOVLPS   ( M(12), XMM2 )			/* - | - | m13 | m12 */
+    MOVSS    ( M(14), XMM3 )			/* - | - |  -  | m14 */
+
+ALIGNTEXT32
+LLBL(K_GTP23DNRR_top):
+    MOVLPS   ( S(0), XMM0 )			/* - | - |  oy   | ox */
+    MULPS    ( XMM1, XMM0 )			/* - | - | oy*m5 | ox*m0 */
+    ADDPS    ( XMM2, XMM0 )			/* - | - | +m13  | +m12 */
+    MOVLPS   ( XMM0, D(0) )			/* -> D(1) | -> D(0) */
+
+    MOVSS    ( XMM3, D(2) )			/* -> D(2) */
+
+LLBL(K_GTP23DNRR_skip):
+    ADD_L    ( CONST(16), EDI )
+    ADD_L    ( EAX, ESI )
+    CMP_L    ( ECX, EDI )
+    JNE      ( LLBL(K_GTP23DNRR_top) )
+
+LLBL(K_GTP23DNRR_finish):
+    POP_L    ( EDI )
+    POP_L    ( ESI )
+    RET
+#undef FRAME_OFFSET
+
+
+ALIGNTEXT4
+GLOBL GLNAME(_mesa_sse_transform_points2_perspective)
+GLNAME(_mesa_sse_transform_points2_perspective):
+
+#define FRAME_OFFSET 8
+    PUSH_L   ( ESI )
+    PUSH_L   ( EDI )
+
+    MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI )	/* ptr to source GLvector4f */
+    MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */
+
+    MOV_L( ARG_MATRIX, EDX ) 			/* ptr to matrix */
+    MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */
+
+    TEST_L( ECX, ECX)
+    JZ( LLBL(K_GTP23PR_finish) )		/* count was zero; go to finish */
+
+    MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */
+    OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */
+
+    MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */
+    MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */
+
+    SHL_L( CONST(4), ECX ) 			/* count *= 16 */
+    MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */
+
+    MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */
+    ADD_L( EDI, ECX ) 				/* count += dest ptr */
+
+ALIGNTEXT32
+    MOVSS    ( M(0), XMM1 )			/* -  | -  |  -  | m0  */
+    MOVSS    ( M(5), XMM2 )			/* -  | -  |  -  | m5  */
+    UNPCKLPS ( XMM2, XMM1 )			/* -  | -  | m5  | m0  */
+    MOVSS    ( M(14), XMM3 )			/* m14 */
+    XORPS    ( XMM0, XMM0 )			/* 0 | 0 | 0 | 0 */
+
+ALIGNTEXT32
+LLBL(K_GTP23PR_top):
+    MOVLPS( S(0), XMM4 )			/* oy | ox */
+    MULPS( XMM1, XMM4 )				/* oy*m5 | ox*m0 */
+    MOVLPS( XMM4, D(0) )			/* ->D(1) | ->D(0) */
+    MOVSS( XMM3, D(2) )				/* ->D(2) */
+    MOVSS( XMM0, D(3) )				/* ->D(3) */
+
+LLBL(K_GTP23PR_skip):
+    ADD_L( CONST(16), EDI )
+    ADD_L( EAX, ESI )
+    CMP_L( ECX, EDI )
+    JNE( LLBL(K_GTP23PR_top) )
+
+LLBL(K_GTP23PR_finish):
+    POP_L    ( EDI )
+    POP_L    ( ESI )
+    RET
+#undef FRAME_OFFSET
+
+
+
+ALIGNTEXT4
+GLOBL GLNAME(_mesa_sse_transform_points2_2d)
+GLNAME(_mesa_sse_transform_points2_2d):
+
+#define FRAME_OFFSET 8
+    PUSH_L( ESI )
+    PUSH_L( EDI )
+
+    MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */
+    MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */
+
+    MOV_L( ARG_MATRIX, EDX ) 			/* ptr to matrix */
+    MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */
+
+    TEST_L( ECX, ECX)
+    JZ( LLBL(K_GTP23P2DR_finish) ) 		/* count was zero; go to finish */
+
+    MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */
+    OR_L( CONST(VEC_SIZE_2), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */
+
+    MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */
+    MOV_L( CONST(2), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */
+
+    SHL_L( CONST(4), ECX ) 			/* count *= 16 */
+    MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */
+
+    MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */
+    ADD_L( EDI, ECX ) 				/* count += dest ptr */
+
+ALIGNTEXT32
+    MOVLPS( M(0), XMM0 )			/* m1  | m0 */
+    MOVLPS( M(4), XMM1 )			/* m5  | m4 */
+    MOVLPS( M(12), XMM2 )			/* m13 | m12 */
+
+ALIGNTEXT32
+LLBL(K_GTP23P2DR_top):
+    MOVSS( S(0), XMM3 )				/* ox */
+    SHUFPS( CONST(0x0), XMM3, XMM3 )		/* ox | ox */
+    MULPS( XMM0, XMM3 )				/* ox*m1 | ox*m0 */
+
+    MOVSS( S(1), XMM4 )				/* oy */
+    SHUFPS( CONST(0x0), XMM4, XMM4 )		/* oy | oy */
+    MULPS( XMM1, XMM4 )				/* oy*m5 | oy*m4 */
+
+    ADDPS( XMM4, XMM3 )
+    ADDPS( XMM2, XMM3 )
+    MOVLPS( XMM3, D(0) )			/* ->D(1) | ->D(0) */
+
+LLBL(K_GTP23P2DR_skip):
+    ADD_L    ( CONST(16), EDI )
+    ADD_L    ( EAX, ESI )
+    CMP_L    ( ECX, EDI )
+    JNE      ( LLBL(K_GTP23P2DR_top) )
+
+LLBL(K_GTP23P2DR_finish):
+    POP_L    ( EDI )
+    POP_L    ( ESI )
+    RET
+#undef FRAME_OFFSET
+
+
+
+ALIGNTEXT4
+GLOBL GLNAME(_mesa_sse_transform_points2_2d_no_rot)
+GLNAME(_mesa_sse_transform_points2_2d_no_rot):
+
+#define FRAME_OFFSET 8
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+
+	MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */
+	MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */
+
+	MOV_L( ARG_MATRIX, EDX ) 		/* ptr to matrix */
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */
+
+	TEST_L( ECX, ECX)
+	JZ( LLBL(K_GTP23P2DNRR_finish) ) 	/* count was zero; go to finish */
+
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */
+	OR_L( CONST(VEC_SIZE_2), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */
+
+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */
+	MOV_L( CONST(2), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */
+
+	SHL_L( CONST(4), ECX ) 			/* count *= 16 */
+	MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */
+	ADD_L( EDI, ECX ) 			/* count += dest ptr */
+
+ALIGNTEXT32
+	MOVSS    ( M(0), XMM1 )			/* m0 */
+	MOVSS    ( M(5), XMM2 )			/* m5 */
+	UNPCKLPS ( XMM2, XMM1 )			/* m5 | m0 */
+	MOVLPS   ( M(12), XMM2 )		/* m13 | m12 */
+
+ALIGNTEXT32
+LLBL(K_GTP23P2DNRR_top):
+	MOVLPS( S(0), XMM0 )			/* oy | ox */
+	MULPS( XMM1, XMM0 )			/* oy*m5 | ox*m0 */
+	ADDPS( XMM2, XMM0 )			/* +m13 | +m12 */
+	MOVLPS( XMM0, D(0) )			/* ->D(1) | ->D(0) */
+
+LLBL(K_GTP23P2DNRR_skip):
+	ADD_L( CONST(16), EDI )
+	ADD_L( EAX, ESI )
+	CMP_L( ECX, EDI )
+	JNE( LLBL(K_GTP23P2DNRR_top) )
+
+LLBL(K_GTP23P2DNRR_finish):
+	POP_L( EDI )
+	POP_L( ESI )
+	RET
+#undef FRAME_OFFSET
+
+
+
+ALIGNTEXT4
+GLOBL GLNAME(_mesa_sse_transform_points2_3d)
+GLNAME(_mesa_sse_transform_points2_3d):
+
+#define FRAME_OFFSET 8
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+
+	MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */
+	MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */
+
+	MOV_L( ARG_MATRIX, EDX ) 		/* ptr to matrix */
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */
+
+	TEST_L( ECX, ECX)
+	JZ( LLBL(K_GTP23P3DR_finish) ) 	/* count was zero; go to finish */
+
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */
+	OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */
+
+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */
+	MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */
+
+	SHL_L( CONST(4), ECX ) 			/* count *= 16 */
+	MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */
+	ADD_L( EDI, ECX ) 			/* count += dest ptr */
+
+ALIGNTEXT32
+	MOVAPS( M(0), XMM0 )			/* m2  | m1  | m0 */
+	MOVAPS( M(4), XMM1 )			/* m6  | m5  | m4 */
+	MOVAPS( M(12), XMM2 )			/* m14 | m13 | m12 */
+
+ALIGNTEXT32
+LLBL(K_GTP23P3DR_top):
+	MOVSS( S(0), XMM3 )			/* ox */
+	SHUFPS( CONST(0x0), XMM3, XMM3 )	/* ox | ox | ox */
+	MULPS( XMM0, XMM3 )			/* ox*m2 | ox*m1 | ox*m0 */
+
+	MOVSS( S(1), XMM4 )			/* oy */
+	SHUFPS( CONST(0x0), XMM4, XMM4 )	/* oy | oy | oy */
+	MULPS( XMM1, XMM4 )			/* oy*m6 | oy*m5 | oy*m4 */
+
+	ADDPS( XMM4, XMM3 )
+	ADDPS( XMM2, XMM3 )
+
+	MOVLPS( XMM3, D(0) )			/* ->D(1) | ->D(0) */
+	UNPCKHPS( XMM3, XMM3 )
+	MOVSS( XMM3, D(2) )			/* ->D(2) */
+
+LLBL(K_GTP23P3DR_skip):
+	ADD_L( CONST(16), EDI )
+	ADD_L( EAX, ESI )
+	CMP_L( ECX, EDI )
+	JNE( LLBL(K_GTP23P3DR_top) )
+
+LLBL(K_GTP23P3DR_finish):
+	POP_L( EDI )
+	POP_L( ESI )
+	RET
+#undef FRAME_OFFSET
diff --git a/reactos/lib/mesa32/src/x86/sse_xform3.S b/reactos/lib/mesa32/src/x86/sse_xform3.S
new file mode 100644
index 00000000000..b250f8b9562
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/sse_xform3.S
@@ -0,0 +1,498 @@
+/* $Id: sse_xform3.S,v 1.1 2004/07/16 22:12:43 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/** TODO:
+  * - insert PREFETCH instructions to avoid cache-misses !
+  * - some more optimizations are possible...
+  * - for 40-50% more performance in the SSE-functions, the
+  *   data (trans-matrix, src_vert, dst_vert) needs to be 16byte aligned !
+  */
+
+#include "matypes.h"
+#include "xform_args.h"
+
+   SEG_TEXT
+
+#define S(i) 	REGOFF(i * 4, ESI)
+#define D(i) 	REGOFF(i * 4, EDI)
+#define M(i) 	REGOFF(i * 4, EDX)
+
+
+ALIGNTEXT4
+GLOBL GLNAME(_mesa_sse_transform_points3_general)
+GLNAME( _mesa_sse_transform_points3_general ):
+
+#define FRAME_OFFSET 8
+    PUSH_L    ( ESI )
+    PUSH_L    ( EDI )
+
+    MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */
+    MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */
+
+    MOV_L( ARG_MATRIX, EDX ) 			/* ptr to matrix */
+    MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */
+
+    CMP_L     ( CONST(0), ECX )			/* count == 0 ? */
+    JE        ( LLBL(K_GTPGR_finish) )		/* yes -> nothing to do. */
+
+    MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */
+    OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */
+
+    MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */
+    MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */
+
+    SHL_L( CONST(4), ECX ) 			/* count *= 16 */
+    MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */
+
+    MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */
+    ADD_L( EDI, ECX ) 				/* count += dest ptr */
+
+
+ALIGNTEXT32
+    MOVAPS    ( REGOFF(0, EDX), XMM0 )	/* m0  | m1  | m2  | m3 */
+    MOVAPS    ( REGOFF(16, EDX), XMM1 )	/* m4  | m5  | m6  | m7 */
+    MOVAPS    ( REGOFF(32, EDX), XMM2 )	/* m8  | m9  | m10 | m11 */
+    MOVAPS    ( REGOFF(48, EDX), XMM3 )	/* m12 | m13 | m14 | m15 */
+
+
+ALIGNTEXT32
+LLBL(K_GTPGR_top):
+    MOVSS     ( REGOFF(0, ESI), XMM4 )		/*    |    |    | ox */
+    SHUFPS    ( CONST(0x0), XMM4, XMM4 )	/* ox | ox | ox | ox */
+    MOVSS     ( REGOFF(4, ESI), XMM5 )		/*    |    |    | oy */
+    SHUFPS    ( CONST(0x0), XMM5, XMM5 )	/* oy | oy | oy | oy */
+    MOVSS     ( REGOFF(8, ESI), XMM6 )		/*    |    |    | oz */
+    SHUFPS    ( CONST(0x0), XMM6, XMM6 )	/* oz | oz | oz | oz */
+
+    MULPS     ( XMM0, XMM4 )		/* m3*ox  | m2*ox  | m1*ox | m0*ox */
+    MULPS     ( XMM1, XMM5 )		/* m7*oy  | m6*oy  | m5*oy | m4*oy */
+    MULPS     ( XMM2, XMM6 )		/* m11*oz | m10*oz | m9*oz | m8*oz */
+
+    ADDPS     ( XMM5, XMM4 )
+    ADDPS     ( XMM6, XMM4 )
+    ADDPS     ( XMM3, XMM4 )
+
+    MOVAPS    ( XMM4, REGOFF(0, EDI) )
+
+LLBL(K_GTPGR_skip):
+    ADD_L     ( CONST(16), EDI )
+    ADD_L     ( EAX, ESI )
+    CMP_L     ( ECX, EDI )
+    JNE       ( LLBL(K_GTPGR_top) )
+
+LLBL(K_GTPGR_finish):
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
+#undef FRAME_OFFSET
+
+
+ALIGNTEXT4
+GLOBL GLNAME(_mesa_sse_transform_points3_identity)
+GLNAME( _mesa_sse_transform_points3_identity ):
+
+#define FRAME_OFFSET 8
+    PUSH_L    ( ESI )
+    PUSH_L    ( EDI )
+
+    MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */
+    MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */
+
+    MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */
+
+    TEST_L( ECX, ECX)
+    JZ( LLBL(K_GTPIR_finish) ) 			/* count was zero; go to finish */
+
+    MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */
+    OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */
+
+    MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */
+    MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */
+
+    SHL_L( CONST(4), ECX ) 			/* count *= 16 */
+    MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */
+
+    MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */
+    ADD_L( EDI, ECX ) 				/* count += dest ptr */
+
+    CMP_L( ESI, EDI )
+    JE( LLBL(K_GTPIR_finish) )
+
+
+ALIGNTEXT32
+LLBL(K_GTPIR_top):
+    MOVLPS    ( S(0), XMM0 )
+    MOVLPS    ( XMM0, D(0) )
+    MOVSS     ( S(2), XMM0 )
+    MOVSS     ( XMM0, D(2) )
+
+LLBL(K_GTPIR_skip):
+    ADD_L     ( CONST(16), EDI )
+    ADD_L     ( EAX, ESI )
+    CMP_L     ( ECX, EDI )
+    JNE       ( LLBL(K_GTPIR_top) )
+
+LLBL(K_GTPIR_finish):
+    POP_L     ( EDI )
+    POP_L     ( ESI )
+    RET
+#undef FRAME_OFFSET
+
+
+
+
+ALIGNTEXT4
+GLOBL GLNAME(_mesa_sse_transform_points3_3d_no_rot)
+GLNAME(_mesa_sse_transform_points3_3d_no_rot):
+
+#define FRAME_OFFSET 8
+    PUSH_L( ESI )
+    PUSH_L( EDI )
+
+    MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */
+    MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */
+
+
+    MOV_L( ARG_MATRIX, EDX ) 			/* ptr to matrix */
+    MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */
+
+    TEST_L( ECX, ECX)
+    JZ( LLBL(K_GTP3DNRR_finish) ) 		/* count was zero; go to finish */
+
+    MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */
+    OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */
+
+    MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */
+    MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */
+
+    SHL_L( CONST(4), ECX ) 			/* count *= 16 */
+    MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */
+
+    MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */
+    ADD_L( EDI, ECX ) 				/* count += dest ptr */
+
+
+ALIGNTEXT32
+    MOVSS    ( M(0), XMM1 )			/* - | - |  -  | m0  */
+    MOVSS    ( M(5), XMM2 )			/* - | - |  -  | m5  */
+    UNPCKLPS ( XMM2, XMM1 )			/* - | - | m5  | m0  */
+    MOVLPS   ( M(12), XMM2 )			/* - | - | m13 | m12 */
+    MOVSS    ( M(10), XMM3 )			/* - | - |  -  | m10 */
+    MOVSS    ( M(14), XMM4 )			/* - | - |  -  | m14 */
+
+ALIGNTEXT32
+LLBL(K_GTP3DNRR_top):
+
+    MOVLPS   ( S(0), XMM0 )			/* - | - |  s1   | s0 */
+    MULPS    ( XMM1, XMM0 )			/* - | - | s1*m5 | s0*m0 */
+    ADDPS    ( XMM2, XMM0 )			/* - | - | +m13  | +m12 */
+    MOVLPS   ( XMM0, D(0) )			/* -> D(1) | -> D(0) */
+
+    MOVSS    ( S(2), XMM0 )			/* sz */
+    MULSS    ( XMM3, XMM0 )			/* sz*m10 */
+    ADDSS    ( XMM4, XMM0 )			/* +m14 */
+    MOVSS    ( XMM0, D(2) )			/* -> D(2) */
+
+LLBL(K_GTP3DNRR_skip):
+    ADD_L    ( CONST(16), EDI )
+    ADD_L    ( EAX, ESI )
+    CMP_L    ( ECX, EDI )
+    JNE      ( LLBL(K_GTP3DNRR_top) )
+
+LLBL(K_GTP3DNRR_finish):
+    POP_L    ( EDI )
+    POP_L    ( ESI )
+    RET
+#undef FRAME_OFFSET
+
+
+
+ALIGNTEXT4
+GLOBL GLNAME(_mesa_sse_transform_points3_perspective)
+GLNAME(_mesa_sse_transform_points3_perspective):
+
+#define FRAME_OFFSET 8
+    PUSH_L   ( ESI )
+    PUSH_L   ( EDI )
+
+    MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */
+    MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */
+
+    MOV_L( ARG_MATRIX, EDX ) 			/* ptr to matrix */
+    MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */
+
+    TEST_L( ECX, ECX)
+    JZ( LLBL(K_GTP3PR_finish) )			/* count was zero; go to finish */
+
+    MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */
+    OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */
+
+    MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */
+    MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */
+
+    SHL_L( CONST(4), ECX ) 			/* count *= 16 */
+    MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */
+
+    MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */
+    ADD_L( EDI, ECX ) 				/* count += dest ptr */
+
+ALIGNTEXT32
+    MOVSS    ( M(0), XMM1 )			/* -  | -  |  -  | m0  */
+    MOVSS    ( M(5), XMM2 )			/* -  | -  |  -  | m5  */
+    UNPCKLPS ( XMM2, XMM1 )			/* -  | -  | m5  | m0  */
+    MOVLPS   ( M(8), XMM2 )			/* -  | -  | m9  | m8  */
+    MOVSS    ( M(10), XMM3 )			/* m10 */
+    MOVSS    ( M(14), XMM4 )			/* m14 */
+    XORPS    ( XMM6, XMM6 )			/* 0 */
+
+ALIGNTEXT32
+LLBL(K_GTP3PR_top):
+    MOVLPS   ( S(0), XMM0 )			/* oy | ox */
+    MULPS    ( XMM1, XMM0 )			/* oy*m5 | ox*m0 */
+    MOVSS    ( S(2), XMM5 )			/* oz */
+    SHUFPS   ( CONST(0x0), XMM5, XMM5 )		/* oz | oz */
+    MULPS    ( XMM2, XMM5 )			/* oz*m9 | oz*m8 */
+    ADDPS    ( XMM5, XMM0 )			/* +oy*m5 | +ox*m0 */
+    MOVLPS   ( XMM0, D(0) )			/* ->D(1) | ->D(0) */
+
+    MOVSS    ( S(2), XMM0 )			/* oz */
+    MULSS    ( XMM3, XMM0 )			/* oz*m10 */
+    ADDSS    ( XMM4, XMM0 )			/* +m14 */
+    MOVSS    ( XMM0, D(2) )			/* ->D(2) */
+
+    MOVSS    ( S(2), XMM0 )			/* oz */
+    MOVSS    ( XMM6, XMM5 )			/* 0 */
+    SUBPS    ( XMM0, XMM5 )			/* -oz */
+    MOVSS    ( XMM5, D(3) )			/* ->D(3) */
+
+LLBL(K_GTP3PR_skip):
+    ADD_L( CONST(16), EDI )
+    ADD_L( EAX, ESI )
+    CMP_L( ECX, EDI )
+    JNE( LLBL(K_GTP3PR_top) )
+
+LLBL(K_GTP3PR_finish):
+    POP_L    ( EDI )
+    POP_L    ( ESI )
+    RET
+#undef FRAME_OFFSET
+
+
+
+ALIGNTEXT4
+GLOBL GLNAME(_mesa_sse_transform_points3_2d)
+GLNAME(_mesa_sse_transform_points3_2d):
+
+#define FRAME_OFFSET 8
+    PUSH_L( ESI )
+    PUSH_L( EDI )
+
+    MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */
+    MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */
+
+    MOV_L( ARG_MATRIX, EDX ) 			/* ptr to matrix */
+    MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */
+
+    TEST_L( ECX, ECX)
+    JZ( LLBL(K_GTP3P2DR_finish) ) 		/* count was zero; go to finish */
+
+    MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */
+    OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */
+
+    MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */
+    MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */
+
+    SHL_L( CONST(4), ECX ) 			/* count *= 16 */
+    MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */
+
+    MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */
+    ADD_L( EDI, ECX ) 				/* count += dest ptr */
+
+ALIGNTEXT32
+    MOVLPS( M(0), XMM0 )			/* m1  | m0 */
+    MOVLPS( M(4), XMM1 )			/* m5  | m4 */
+    MOVLPS( M(12), XMM2 )			/* m13 | m12 */
+
+ALIGNTEXT32
+LLBL(K_GTP3P2DR_top):
+    MOVSS    ( S(0), XMM3 )			/* ox */
+    SHUFPS   ( CONST(0x0), XMM3, XMM3 )		/* ox | ox */
+    MULPS    ( XMM0, XMM3 )			/* ox*m1 | ox*m0 */
+    MOVSS    ( S(1), XMM4 )			/* oy */
+    SHUFPS   ( CONST(0x0), XMM4, XMM4 )		/* oy | oy */
+    MULPS    ( XMM1, XMM4 )			/* oy*m5 | oy*m4 */
+
+    ADDPS    ( XMM4, XMM3 )
+    ADDPS    ( XMM2, XMM3 )
+    MOVLPS   ( XMM3, D(0) )
+
+    MOVSS    ( S(2), XMM3 )
+    MOVSS    ( XMM3, D(2) )
+
+LLBL(K_GTP3P2DR_skip):
+    ADD_L    ( CONST(16), EDI )
+    ADD_L    ( EAX, ESI )
+    CMP_L    ( ECX, EDI )
+    JNE      ( LLBL(K_GTP3P2DR_top) )
+
+LLBL(K_GTP3P2DR_finish):
+    POP_L    ( EDI )
+    POP_L    ( ESI )
+    RET
+#undef FRAME_OFFSET
+
+
+
+ALIGNTEXT4
+GLOBL GLNAME(_mesa_sse_transform_points3_2d_no_rot)
+GLNAME(_mesa_sse_transform_points3_2d_no_rot):
+
+#define FRAME_OFFSET 8
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+
+	MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */
+	MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */
+
+	MOV_L( ARG_MATRIX, EDX ) 		/* ptr to matrix */
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */
+
+	TEST_L( ECX, ECX)
+	JZ( LLBL(K_GTP3P2DNRR_finish) ) 	/* count was zero; go to finish */
+
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */
+	OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */
+
+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */
+	MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */
+
+	SHL_L( CONST(4), ECX ) 			/* count *= 16 */
+	MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */
+	ADD_L( EDI, ECX ) 			/* count += dest ptr */
+
+ALIGNTEXT32
+	MOVSS    ( M(0), XMM1 )			/* m0 */
+	MOVSS    ( M(5), XMM2 )			/* m5 */
+	UNPCKLPS ( XMM2, XMM1 )			/* m5 | m0 */
+	MOVLPS   ( M(12), XMM2 )		/* m13 | m12 */
+
+ALIGNTEXT32
+LLBL(K_GTP3P2DNRR_top):
+	MOVLPS( S(0), XMM0 )			/* oy | ox */
+	MULPS( XMM1, XMM0 )			/* oy*m5 | ox*m0 */
+	ADDPS( XMM2, XMM0 )			/* +m13 | +m12 */
+	MOVLPS( XMM0, D(0) )			/* ->D(1) | ->D(0) */
+
+	MOVSS( S(2), XMM0 )
+	MOVSS( XMM0, D(2) )
+
+LLBL(K_GTP3P2DNRR_skip):
+	ADD_L( CONST(16), EDI )
+	ADD_L( EAX, ESI )
+	CMP_L( ECX, EDI )
+	JNE( LLBL(K_GTP3P2DNRR_top) )
+
+LLBL(K_GTP3P2DNRR_finish):
+	POP_L( EDI )
+	POP_L( ESI )
+	RET
+#undef FRAME_OFFSET
+
+
+
+
+ALIGNTEXT4
+GLOBL GLNAME(_mesa_sse_transform_points3_3d)
+GLNAME(_mesa_sse_transform_points3_3d):
+
+#define FRAME_OFFSET 8
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+
+	MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */
+	MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */
+
+
+	MOV_L( ARG_MATRIX, EDX ) 		/* ptr to matrix */
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */
+
+	TEST_L( ECX, ECX)
+	JZ( LLBL(K_GTP3P3DR_finish) ) 	/* count was zero; go to finish */
+
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */
+	OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */
+
+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */
+	MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */
+
+	SHL_L( CONST(4), ECX ) 			/* count *= 16 */
+	MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */
+	ADD_L( EDI, ECX ) 			/* count += dest ptr */
+
+
+ALIGNTEXT32
+	MOVAPS( M(0), XMM0 )			/* m2  | m1  | m0 */
+	MOVAPS( M(4), XMM1 )			/* m6  | m5  | m4 */
+	MOVAPS( M(8), XMM2 )			/* m10 | m9  | m8 */
+	MOVAPS( M(12), XMM3 )			/* m14 | m13 | m12 */
+
+ALIGNTEXT32
+LLBL(K_GTP3P3DR_top):
+	MOVSS( S(0), XMM4 )
+	SHUFPS( CONST(0x0), XMM4, XMM4 )	/* ox | ox | ox */
+	MULPS( XMM0, XMM4 )			/* ox*m2 | ox*m1 | ox*m0 */
+
+	MOVSS( S(1), XMM5 )
+	SHUFPS( CONST(0x0), XMM5, XMM5 )	/* oy | oy | oy */
+	MULPS( XMM1, XMM5 )			/* oy*m6 | oy*m5 | oy*m4 */
+
+	MOVSS( S(2), XMM6 )
+	SHUFPS( CONST(0x0), XMM6, XMM6 )	/* oz | oz | oz */
+	MULPS( XMM2, XMM6 )			/* oz*m10 | oz*m9 | oz*m8 */
+
+	ADDPS( XMM5, XMM4 )			/* + | + | + */
+	ADDPS( XMM6, XMM4 )			/* + | + | + */
+	ADDPS( XMM3, XMM4 )			/* + | + | + */
+
+	MOVLPS( XMM4, D(0) )			/* => D(1) | => D(0) */
+	UNPCKHPS( XMM4, XMM4 )
+	MOVSS( XMM4, D(2) )
+
+LLBL(K_GTP3P3DR_skip):
+	ADD_L( CONST(16), EDI )
+	ADD_L( EAX, ESI )
+	CMP_L( ECX, EDI )
+	JNE( LLBL(K_GTP3P3DR_top) )
+
+LLBL(K_GTP3P3DR_finish):
+	POP_L( EDI )
+	POP_L( ESI )
+	RET
+#undef FRAME_OFFSET
diff --git a/reactos/lib/mesa32/src/x86/sse_xform4.S b/reactos/lib/mesa32/src/x86/sse_xform4.S
new file mode 100644
index 00000000000..58cb30bf441
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/sse_xform4.S
@@ -0,0 +1,226 @@
+/* $Id: sse_xform4.S,v 1.1 2004/07/16 22:12:43 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "matypes.h"
+#include "xform_args.h"
+
+	SEG_TEXT
+
+#define FRAME_OFFSET	8
+
+#define SRC(i)		REGOFF(i * 4, ESI)
+#define DST(i)		REGOFF(i * 4, EDI)
+#define MAT(i)		REGOFF(i * 4, EDX)
+
+#define SELECT(r0, r1, r2, r3)	CONST( r0 * 64 + r1 * 16 + r2 * 4 + r3 )
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_sse_transform_points4_general )
+GLNAME( _mesa_sse_transform_points4_general ):
+
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+
+	MOV_L( ARG_SOURCE, ESI )
+	MOV_L( ARG_DEST, EDI )
+
+	MOV_L( ARG_MATRIX, EDX )
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )
+
+	TEST_L( ECX, ECX )			/* verify non-zero count */
+	JE( LLBL( sse_general_done ) )
+
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )	/* stride */
+	OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) /* set dest flags */
+
+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )	/* set dest count */
+	MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) )/* set dest size */
+
+	MOV_L( REGOFF(V4F_START, ESI), ESI )	/* ptr to first source vertex */
+	MOV_L( REGOFF(V4F_START, EDI), EDI )	/* ptr to first dest vertex */
+
+	PREFETCHT0( REGIND(ESI) )
+
+	MOVAPS( MAT(0), XMM4 )			/* m3  | m2  | m1  | m0  */
+	MOVAPS( MAT(4), XMM5 )			/* m7  | m6  | m5  | m4  */
+	MOVAPS( MAT(8), XMM6 )			/* m11 | m10 | m9  | m8  */
+	MOVAPS( MAT(12), XMM7 )			/* m15 | m14 | m13 | m12 */
+
+ALIGNTEXT16
+LLBL( sse_general_loop ):
+
+	MOVSS( SRC(0), XMM0 )			/* ox */
+	SHUFPS( CONST(0x0), XMM0, XMM0 )	/* ox | ox | ox | ox */
+	MULPS( XMM4, XMM0 )			/* ox*m3 | ox*m2 | ox*m1 | ox*m0 */
+
+	MOVSS( SRC(1), XMM1 )			/* oy */
+	SHUFPS( CONST(0x0), XMM1, XMM1 )	/* oy | oy | oy | oy */
+	MULPS( XMM5, XMM1 )			/* oy*m7 | oy*m6 | oy*m5 | oy*m4 */
+
+	MOVSS( SRC(2), XMM2 )			/* oz */
+	SHUFPS( CONST(0x0), XMM2, XMM2 )	/* oz | oz | oz | oz */
+	MULPS( XMM6, XMM2 )			/* oz*m11 | oz*m10 | oz*m9 | oz*m8 */
+
+	MOVSS( SRC(3), XMM3 )			/* ow */
+	SHUFPS( CONST(0x0), XMM3, XMM3 )	/* ow | ow | ow | ow */
+	MULPS( XMM7, XMM3 )			/* ow*m15 | ow*m14 | ow*m13 | ow*m12 */
+
+	ADDPS( XMM1, XMM0 )			/* ox*m3+oy*m7 | ... */
+	ADDPS( XMM2, XMM0 )			/* ox*m3+oy*m7+oz*m11 | ... */
+	ADDPS( XMM3, XMM0 )			/* ox*m3+oy*m7+oz*m11+ow*m15 | ... */
+	MOVAPS( XMM0, DST(0) )			/* ->D(3) | ->D(2) | ->D(1) | ->D(0) */
+
+	ADD_L( CONST(16), EDI )
+	ADD_L( EAX, ESI )
+
+	DEC_L( ECX )
+	JNZ( LLBL( sse_general_loop ) )
+
+LLBL( sse_general_done ):
+
+	POP_L( EDI )
+	POP_L( ESI )
+	RET
+
+
+
+
+ALIGNTEXT4
+GLOBL GLNAME( _mesa_sse_transform_points4_3d )
+GLNAME( _mesa_sse_transform_points4_3d ):
+
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+
+	MOV_L( ARG_SOURCE, ESI )		/* ptr to source GLvector4f */
+	MOV_L( ARG_DEST, EDI )			/* ptr to dest GLvector4f */
+
+	MOV_L( ARG_MATRIX, EDX )		/* ptr to matrix */
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )	/* source count */
+
+	TEST_L( ECX, ECX)
+	JZ( LLBL(K_GTP43P3DR_finish) )		/* count was zero; go to finish */
+
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )	/* stride */
+	OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) ) /* set dest flags */
+
+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )	/* set dest count */
+	MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) )/* set dest size */
+
+	SHL_L( CONST(4), ECX )			/* count *= 16 */
+	MOV_L( REGOFF(V4F_START, ESI), ESI )	/* ptr to first source vertex */
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI )	/* ptr to first dest vertex */
+	ADD_L( EDI, ECX )			/* count += dest ptr */
+
+	MOVAPS( MAT(0), XMM0 )			/* m3  | m2  | m1  |  m0 */
+	MOVAPS( MAT(4), XMM1 )			/* m7  | m6  | m5  |  m4 */
+	MOVAPS( MAT(8), XMM2 )			/* m11 | m10 | m9  |  m8 */
+	MOVAPS( MAT(12), XMM3 )			/* m15 | m14 | m13 | m12 */
+
+ALIGNTEXT32
+LLBL( K_GTP43P3DR_top ):
+	MOVSS( SRC(0), XMM4 )			/* ox */
+	SHUFPS( CONST(0x0), XMM4, XMM4 )	/* ox | ox | ox | ox */
+	MULPS( XMM0, XMM4 )			/* ox*m3 | ox*m2 | ox*m1 | ox*m0 */
+
+	MOVSS( SRC(1), XMM5 )			/* oy */
+	SHUFPS( CONST(0x0), XMM5, XMM5 )	/* oy | oy | oy | oy */
+	MULPS( XMM1, XMM5 )			/* oy*m7 | oy*m6 | oy*m5 | oy*m4 */
+
+	MOVSS( SRC(2), XMM6 )			/* oz */
+	SHUFPS( CONST(0x0), XMM6, XMM6 )	/* oz | oz | oz | oz */
+	MULPS( XMM2, XMM6 )			/* oz*m11 | oz*m10 | oz*m9 | oz*m8 */
+
+	MOVSS( SRC(3), XMM7 )			/* ow */
+	SHUFPS( CONST(0x0), XMM7, XMM7 )	/* ow | ow | ow | ow */
+	MULPS( XMM3, XMM7 )			/* ow*m15 | ow*m14 | ow*m13 | ow*m12 */
+
+	ADDPS( XMM5, XMM4 )			/* ox*m3+oy*m7 | ... */
+	ADDPS( XMM6, XMM4 )			/* ox*m3+oy*m7+oz*m11 | ... */
+	ADDPS( XMM7, XMM4 )			/* ox*m3+oy*m7+oz*m11+ow*m15 | ... */
+	MOVAPS( XMM4, DST(0) )			/* ->D(3) | ->D(2) | ->D(1) | ->D(0) */
+
+	MOVSS( SRC(3), XMM4 )			/* ow */
+	MOVSS( XMM4, DST(3) )			/* ->D(3) */
+
+LLBL( K_GTP43P3DR_skip ):
+	ADD_L( CONST(16), EDI )
+	ADD_L( EAX, ESI )
+	CMP_L( ECX, EDI )
+	JNE( LLBL(K_GTP43P3DR_top) )
+
+LLBL( K_GTP43P3DR_finish ):
+	POP_L( EDI )
+	POP_L( ESI )
+	RET
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_sse_transform_points4_identity )
+GLNAME( _mesa_sse_transform_points4_identity ):
+
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+
+	MOV_L( ARG_SOURCE, ESI )
+	MOV_L( ARG_DEST, EDI )
+
+	MOV_L( ARG_MATRIX, EDX )
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )
+
+	TEST_L( ECX, ECX )			/* verify non-zero count */
+	JE( LLBL( sse_identity_done ) )
+
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )	/* stride */
+	OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) /* set dest flags */
+
+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )	/* set dest count */
+	MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) )/* set dest size */
+
+	MOV_L( REGOFF(V4F_START, ESI), ESI )	/* ptr to first source vertex */
+	MOV_L( REGOFF(V4F_START, EDI), EDI )	/* ptr to first dest vertex */
+
+ALIGNTEXT16
+LLBL( sse_identity_loop ):
+
+	PREFETCHNTA( REGOFF(32, ESI) )
+
+	MOVAPS( REGIND(ESI), XMM0 )
+	ADD_L( EAX, ESI )
+
+	MOVAPS( XMM0, REGIND(EDI) )
+	ADD_L( CONST(16), EDI )
+
+	DEC_L( ECX )
+	JNZ( LLBL( sse_identity_loop ) )
+
+LLBL( sse_identity_done ):
+
+	POP_L( EDI )
+	POP_L( ESI )
+	RET
diff --git a/reactos/lib/mesa32/src/x86/x86.c b/reactos/lib/mesa32/src/x86/x86.c
new file mode 100644
index 00000000000..7f58d47c016
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/x86.c
@@ -0,0 +1,96 @@
+/* $Id: x86.c,v 1.1 2004/07/16 22:12:43 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * Intel x86 assembly code by Josh Vanderhoof
+ */
+
+#include "glheader.h"
+#include "context.h"
+#include "math/m_xform.h"
+#include "tnl/t_context.h"
+
+#include "x86.h"
+#include "common_x86_macros.h"
+
+#ifdef DEBUG
+#include "math/m_debug.h"
+#endif
+
+
+#ifdef USE_X86_ASM
+DECLARE_XFORM_GROUP( x86, 2 )
+DECLARE_XFORM_GROUP( x86, 3 )
+DECLARE_XFORM_GROUP( x86, 4 )
+
+
+extern GLvector4f * _ASMAPI
+_mesa_x86_cliptest_points4( GLvector4f *clip_vec,
+			    GLvector4f *proj_vec,
+			    GLubyte clipMask[],
+			    GLubyte *orMask,
+			    GLubyte *andMask );
+
+extern GLvector4f * _ASMAPI
+_mesa_x86_cliptest_points4_np( GLvector4f *clip_vec,
+			       GLvector4f *proj_vec,
+			       GLubyte clipMask[],
+			       GLubyte *orMask,
+			       GLubyte *andMask );
+
+extern void _ASMAPI
+_mesa_v16_x86_cliptest_points4( GLfloat *first_vert,
+				GLfloat *last_vert,
+				GLubyte *or_mask,
+				GLubyte *and_mask,
+				GLubyte *clip_mask );
+
+extern void _ASMAPI
+_mesa_v16_x86_general_xform( GLfloat *dest,
+			     const GLfloat *m,
+			     const GLfloat *src,
+			     GLuint src_stride,
+			     GLuint count );
+#endif
+
+
+void _mesa_init_x86_transform_asm( void )
+{
+#ifdef USE_X86_ASM
+   ASSIGN_XFORM_GROUP( x86, 2 );
+   ASSIGN_XFORM_GROUP( x86, 3 );
+   ASSIGN_XFORM_GROUP( x86, 4 );
+
+   _mesa_clip_tab[4] = _mesa_x86_cliptest_points4;
+   _mesa_clip_np_tab[4] = _mesa_x86_cliptest_points4_np;
+
+#ifdef DEBUG
+   _math_test_all_transform_functions( "x86" );
+   _math_test_all_cliptest_functions( "x86" );
+#endif
+#endif
+}
+
diff --git a/reactos/lib/mesa32/src/x86/x86.h b/reactos/lib/mesa32/src/x86/x86.h
new file mode 100644
index 00000000000..ddbef4b70e6
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/x86.h
@@ -0,0 +1,36 @@
+/* $Id: x86.h,v 1.1 2004/07/16 22:12:43 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * Intel x86 assembly code by Josh Vanderhoof
+ */
+
+#ifndef __X86_H__
+#define __X86_H__
+
+extern void _mesa_init_x86_transform_asm( void );
+
+#endif
diff --git a/reactos/lib/mesa32/src/x86/x86_cliptest.S b/reactos/lib/mesa32/src/x86/x86_cliptest.S
new file mode 100644
index 00000000000..eb0a04d3725
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/x86_cliptest.S
@@ -0,0 +1,401 @@
+/* $Id: x86_cliptest.S,v 1.1 2004/07/16 22:12:43 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * NOTE: Avoid using spaces in between '(' ')' and arguments, especially
+ * with macros like CONST, LLBL that expand to CONCAT(...).  Putting spaces
+ * in there will break the build on some platforms.
+ */
+
+#include "matypes.h"
+#include "clip_args.h"
+
+#define SRC0		REGOFF(0, ESI)
+#define SRC1		REGOFF(4, ESI)
+#define SRC2		REGOFF(8, ESI)
+#define SRC3		REGOFF(12, ESI)
+#define DST0		REGOFF(0, EDI)
+#define DST1		REGOFF(4, EDI)
+#define DST2		REGOFF(8, EDI)
+#define DST3		REGOFF(12, EDI)
+#define MAT0		REGOFF(0, EDX)
+#define MAT1		REGOFF(4, EDX)
+#define MAT2		REGOFF(8, EDX)
+#define MAT3		REGOFF(12, EDX)
+
+
+/*
+ * Table for clip test.
+ *
+ * 	bit6 = SRC3 < 0
+ * 	bit5 = SRC2 < 0
+ * 	bit4 = abs(S(2)) > abs(S(3))
+ * 	bit3 = SRC1 < 0
+ * 	bit2 = abs(S(1)) > abs(S(3))
+ * 	bit1 = SRC0 < 0
+ * 	bit0 = abs(S(0)) > abs(S(3))
+ */
+
+	SEG_DATA
+
+clip_table:
+	D_BYTE 0x00, 0x01, 0x00, 0x02, 0x04, 0x05, 0x04, 0x06
+	D_BYTE 0x00, 0x01, 0x00, 0x02, 0x08, 0x09, 0x08, 0x0a
+	D_BYTE 0x20, 0x21, 0x20, 0x22, 0x24, 0x25, 0x24, 0x26
+	D_BYTE 0x20, 0x21, 0x20, 0x22, 0x28, 0x29, 0x28, 0x2a
+	D_BYTE 0x00, 0x01, 0x00, 0x02, 0x04, 0x05, 0x04, 0x06
+	D_BYTE 0x00, 0x01, 0x00, 0x02, 0x08, 0x09, 0x08, 0x0a
+	D_BYTE 0x10, 0x11, 0x10, 0x12, 0x14, 0x15, 0x14, 0x16
+	D_BYTE 0x10, 0x11, 0x10, 0x12, 0x18, 0x19, 0x18, 0x1a
+	D_BYTE 0x3f, 0x3d, 0x3f, 0x3e, 0x37, 0x35, 0x37, 0x36
+	D_BYTE 0x3f, 0x3d, 0x3f, 0x3e, 0x3b, 0x39, 0x3b, 0x3a
+	D_BYTE 0x2f, 0x2d, 0x2f, 0x2e, 0x27, 0x25, 0x27, 0x26
+	D_BYTE 0x2f, 0x2d, 0x2f, 0x2e, 0x2b, 0x29, 0x2b, 0x2a
+	D_BYTE 0x3f, 0x3d, 0x3f, 0x3e, 0x37, 0x35, 0x37, 0x36
+	D_BYTE 0x3f, 0x3d, 0x3f, 0x3e, 0x3b, 0x39, 0x3b, 0x3a
+	D_BYTE 0x1f, 0x1d, 0x1f, 0x1e, 0x17, 0x15, 0x17, 0x16
+	D_BYTE 0x1f, 0x1d, 0x1f, 0x1e, 0x1b, 0x19, 0x1b, 0x1a
+
+
+	SEG_TEXT
+
+/*
+ * _mesa_x86_cliptest_points4
+ *
+ *   AL:  ormask
+ *   AH:  andmask
+ *   EBX: temp0
+ *   ECX: temp1
+ *   EDX: clipmask[]
+ *   ESI: clip[]
+ *   EDI: proj[]
+ *   EBP: temp2
+ */
+
+#if defined(__ELF__) && defined(__PIC__) && defined(GNU_ASSEMBLER) && !defined(ELFPIC)
+#define ELFPIC
+#endif
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_x86_cliptest_points4 )
+GLNAME( _mesa_x86_cliptest_points4 ):
+
+#ifdef ELFPIC
+#define FRAME_OFFSET 20
+#else
+#define FRAME_OFFSET 16
+#endif
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+	PUSH_L( EBP )
+	PUSH_L( EBX )
+
+#ifdef ELFPIC
+	/* store pointer to clip_table on stack */
+	CALL( LLBL(ctp4_get_eip) )
+	ADD_L( CONST(_GLOBAL_OFFSET_TABLE_), EBX )
+	MOV_L( REGOFF(clip_table@GOT, EBX), EBX )
+	PUSH_L( EBX )
+	JMP( LLBL(ctp4_clip_table_ready) )
+
+LLBL(ctp4_get_eip):
+	/* store eip in ebx */
+	MOV_L( REGIND(ESP), EBX )
+	RET
+
+LLBL(ctp4_clip_table_ready):
+#endif
+
+	MOV_L( ARG_SOURCE, ESI )
+	MOV_L( ARG_DEST, EDI )
+
+	MOV_L( ARG_CLIP, EDX )
+	MOV_L( ARG_OR, EBX )
+
+	MOV_L( ARG_AND, EBP )
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )
+
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )
+	MOV_L( REGOFF(V4F_START, ESI), ESI )
+
+	OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) )
+	MOV_L( EAX, ARG_SOURCE )	/* put stride in ARG_SOURCE */
+
+	MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) )
+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI )
+	ADD_L( EDX, ECX )
+
+	MOV_L( ECX, ARG_CLIP )		/* put clipmask + count in ARG_CLIP */
+	CMP_L( ECX, EDX )
+
+	MOV_B( REGIND(EBX), AL )
+	MOV_B( REGIND(EBP), AH )
+
+	JZ( LLBL(ctp4_finish) )
+
+ALIGNTEXT16
+LLBL(ctp4_top):
+
+	FLD1				/* F3 */
+	FDIV_S( SRC3 )		/* GH: don't care about div-by-zero */
+
+	MOV_L( SRC3, EBP )
+	MOV_L( SRC2, EBX )
+
+	XOR_L( ECX, ECX )
+	ADD_L( EBP, EBP )	/* ebp = abs(S(3))*2 ; carry = sign of S(3) */
+
+	ADC_L( ECX, ECX )
+	ADD_L( EBX, EBX )	/* ebx = abs(S(2))*2 ; carry = sign of S(2) */
+
+	ADC_L( ECX, ECX )
+	CMP_L( EBX, EBP )	/* carry = abs(S(2))*2 > abs(S(3))*2 */
+
+	ADC_L( ECX, ECX )
+	MOV_L( SRC1, EBX )
+
+	ADD_L( EBX, EBX )	/* ebx = abs(S(1))*2 ; carry = sign of S(1) */
+
+	ADC_L( ECX, ECX )
+	CMP_L( EBX, EBP )	/* carry = abs(S(1))*2 > abs(S(3))*2 */
+
+	ADC_L( ECX, ECX )
+	MOV_L( SRC0, EBX )
+
+	ADD_L( EBX, EBX )	/* ebx = abs(S(0))*2 ; carry = sign of S(0) */
+
+	ADC_L( ECX, ECX )
+	CMP_L( EBX, EBP )	/* carry = abs(S(0))*2 > abs(S(3))*2 */
+
+	ADC_L( ECX, ECX )
+
+#ifdef ELFPIC
+	MOV_L( REGIND(ESP), EBP )	/* clip_table */
+
+	MOV_B( REGBI(EBP, ECX), CL )
+#else
+	MOV_B( REGOFF(clip_table,ECX), CL )
+#endif
+
+	OR_B( CL, AL )
+	AND_B( CL, AH )
+
+	TEST_B( CL, CL )
+	MOV_B( CL, REGIND(EDX) )
+
+	JZ( LLBL(ctp4_proj) )
+
+LLBL(ctp4_noproj):
+
+	FSTP( ST(0) )			/* */
+
+	MOV_L( CONST(0), DST0 )
+	MOV_L( CONST(0), DST1 )
+	MOV_L( CONST(0), DST2 )
+	MOV_L( CONST(0x3f800000), DST3 )
+
+	JMP( LLBL(ctp4_next) )
+
+LLBL(ctp4_proj):
+
+	FLD_S( SRC0 )			/* F0 F3 */
+	FMUL2( ST(1), ST0 )
+
+	FLD_S( SRC1 )			/* F1 F0 F3 */
+	FMUL2( ST(2), ST0 )
+
+	FLD_S( SRC2 )			/* F2 F1 F0 F3 */
+	FMUL2( ST(3), ST0 )
+
+	FXCH( ST(2) )			/* F0 F1 F2 F3 */
+	FSTP_S( DST0 )		/* F1 F2 F3 */
+	FSTP_S( DST1 )		/* F2 F3 */
+	FSTP_S( DST2 )		/* F3 */
+	FSTP_S( DST3 )		/* */
+
+LLBL(ctp4_next):
+
+	INC_L( EDX )
+	ADD_L( CONST(16), EDI )
+
+	ADD_L( ARG_SOURCE, ESI )
+	CMP_L( EDX, ARG_CLIP )
+
+	JNZ( LLBL(ctp4_top) )
+
+	MOV_L( ARG_OR, ECX )
+	MOV_L( ARG_AND, EDX )
+
+	MOV_B( AL, REGIND(ECX) )
+	MOV_B( AH, REGIND(EDX) )
+
+LLBL(ctp4_finish):
+
+	MOV_L( ARG_DEST, EAX )
+#ifdef ELFPIC
+	POP_L( ESI )			/* discard ptr to clip_table */
+#endif
+	POP_L( EBX )
+	POP_L( EBP )
+	POP_L( EDI )
+	POP_L( ESI )
+
+	RET
+
+
+
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_x86_cliptest_points4_np )
+GLNAME( _mesa_x86_cliptest_points4_np ):
+
+#ifdef ELFPIC
+#define FRAME_OFFSET 20
+#else
+#define FRAME_OFFSET 16
+#endif
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+	PUSH_L( EBP )
+	PUSH_L( EBX )
+
+#ifdef ELFPIC
+	/* store pointer to clip_table on stack */
+	CALL( LLBL(ctp4_np_get_eip) )
+	ADD_L( CONST(_GLOBAL_OFFSET_TABLE_), EBX )
+	MOV_L( REGOFF(clip_table@GOT, EBX), EBX )
+	PUSH_L( EBX )
+	JMP( LLBL(ctp4_np_clip_table_ready) )
+
+LLBL(ctp4_np_get_eip):
+	/* store eip in ebx */
+	MOV_L( REGIND(ESP), EBX )
+	RET
+
+LLBL(ctp4_np_clip_table_ready):
+#endif
+
+	MOV_L( ARG_SOURCE, ESI )
+	/* slot */
+
+	MOV_L( ARG_CLIP, EDX )
+	MOV_L( ARG_OR, EBX )
+
+	MOV_L( ARG_AND, EBP )
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )
+
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )
+	MOV_L( REGOFF(V4F_START, ESI), ESI )
+
+	MOV_L( EAX, ARG_DEST )   	/* put stride in ARG_DEST */
+	ADD_L( EDX, ECX )
+
+	MOV_L( ECX, EDI )		/* put clipmask + count in EDI */
+	CMP_L( ECX, EDX )
+
+	MOV_B( REGIND(EBX), AL )
+	MOV_B( REGIND(EBP), AH )
+
+	JZ( LLBL(ctp4_np_finish) )
+
+ALIGNTEXT16
+LLBL(ctp4_np_top):
+
+	MOV_L( SRC3, EBP )
+	MOV_L( SRC2, EBX )
+
+	XOR_L( ECX, ECX )
+	ADD_L( EBP, EBP )	/* ebp = abs(S(3))*2 ; carry = sign of S(3) */
+
+	ADC_L( ECX, ECX )
+	ADD_L( EBX, EBX )	/* ebx = abs(S(2))*2 ; carry = sign of S(2) */
+
+	ADC_L( ECX, ECX )
+	CMP_L( EBX, EBP )	/* carry = abs(S(2))*2 > abs(S(3))*2 */
+
+	ADC_L( ECX, ECX )
+	MOV_L( SRC1, EBX )
+
+	ADD_L( EBX, EBX )	/* ebx = abs(S(1))*2 ; carry = sign of S(1) */
+
+	ADC_L( ECX, ECX )
+	CMP_L( EBX, EBP )	/* carry = abs(S(1))*2 > abs(S(3))*2 */
+
+	ADC_L( ECX, ECX )
+	MOV_L( SRC0, EBX )
+
+	ADD_L( EBX, EBX )	/* ebx = abs(S(0))*2 ; carry = sign of S(0) */
+
+	ADC_L( ECX, ECX )
+	CMP_L( EBX, EBP )	/* carry = abs(S(0))*2 > abs(S(3))*2 */
+
+	ADC_L( ECX, ECX )
+
+#ifdef ELFPIC
+	MOV_L( REGIND(ESP), EBP )	/* clip_table */
+
+	MOV_B( REGBI(EBP, ECX), CL )
+#else
+	MOV_B( REGOFF(clip_table,ECX), CL )
+#endif
+
+	OR_B( CL, AL )
+	AND_B( CL, AH )
+
+	TEST_B( CL, CL )
+	MOV_B( CL, REGIND(EDX) )
+
+	INC_L( EDX )
+	/* slot */
+
+	ADD_L( ARG_DEST, ESI )
+	CMP_L( EDX, EDI )
+
+	JNZ( LLBL(ctp4_np_top) )
+
+	MOV_L( ARG_OR, ECX )
+	MOV_L( ARG_AND, EDX )
+
+	MOV_B( AL, REGIND(ECX) )
+	MOV_B( AH, REGIND(EDX) )
+
+LLBL(ctp4_np_finish):
+
+	MOV_L( ARG_SOURCE, EAX )
+#ifdef ELFPIC
+	POP_L( ESI )			/* discard ptr to clip_table */
+#endif
+	POP_L( EBX )
+	POP_L( EBP )
+	POP_L( EDI )
+	POP_L( ESI )
+
+	RET
diff --git a/reactos/lib/mesa32/src/x86/x86_xform2.S b/reactos/lib/mesa32/src/x86/x86_xform2.S
new file mode 100644
index 00000000000..37c4ed3b5d7
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/x86_xform2.S
@@ -0,0 +1,563 @@
+/* $Id: x86_xform2.S,v 1.1 2004/07/16 22:12:43 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * NOTE: Avoid using spaces in between '(' ')' and arguments, especially
+ * with macros like CONST, LLBL that expand to CONCAT(...).  Putting spaces
+ * in there will break the build on some platforms.
+ */
+
+#include "matypes.h"
+#include "xform_args.h"
+
+	SEG_TEXT
+
+#define FP_ONE		1065353216
+#define FP_ZERO		0
+
+#define SRC0		REGOFF(0, ESI)
+#define SRC1		REGOFF(4, ESI)
+#define SRC2		REGOFF(8, ESI)
+#define SRC3		REGOFF(12, ESI)
+#define DST0		REGOFF(0, EDI)
+#define DST1		REGOFF(4, EDI)
+#define DST2		REGOFF(8, EDI)
+#define DST3		REGOFF(12, EDI)
+#define MAT0		REGOFF(0, EDX)
+#define MAT1		REGOFF(4, EDX)
+#define MAT2		REGOFF(8, EDX)
+#define MAT3		REGOFF(12, EDX)
+#define MAT4		REGOFF(16, EDX)
+#define MAT5		REGOFF(20, EDX)
+#define MAT6		REGOFF(24, EDX)
+#define MAT7		REGOFF(28, EDX)
+#define MAT8		REGOFF(32, EDX)
+#define MAT9		REGOFF(36, EDX)
+#define MAT10		REGOFF(40, EDX)
+#define MAT11		REGOFF(44, EDX)
+#define MAT12		REGOFF(48, EDX)
+#define MAT13		REGOFF(52, EDX)
+#define MAT14		REGOFF(56, EDX)
+#define MAT15		REGOFF(60, EDX)
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_x86_transform_points2_general )
+GLNAME( _mesa_x86_transform_points2_general ):
+
+#define FRAME_OFFSET 8
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+
+	MOV_L( ARG_SOURCE, ESI )
+	MOV_L( ARG_DEST, EDI )
+
+	MOV_L( ARG_MATRIX, EDX )
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )
+
+	TEST_L( ECX, ECX )
+	JZ( LLBL(x86_p2_gr_done) )
+
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )
+	OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) )
+
+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )
+	MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) )
+
+	SHL_L( CONST(4), ECX )
+	MOV_L( REGOFF(V4F_START, ESI), ESI )
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI )
+	ADD_L( EDI, ECX )
+
+ALIGNTEXT16
+LLBL(x86_p2_gr_loop):
+
+	FLD_S( SRC0 )			/* F4 */
+	FMUL_S( MAT0 )
+	FLD_S( SRC0 )			/* F5 F4 */
+	FMUL_S( MAT1 )
+	FLD_S( SRC0 )			/* F6 F5 F4 */
+	FMUL_S( MAT2 )
+	FLD_S( SRC0 )			/* F7 F6 F5 F4 */
+	FMUL_S( MAT3 )
+
+	FLD_S( SRC1 )			/* F0 F7 F6 F5 F4 */
+	FMUL_S( MAT4 )
+	FLD_S( SRC1 )			/* F1 F0 F7 F6 F5 F4 */
+	FMUL_S( MAT5 )
+	FLD_S( SRC1 )			/* F2 F1 F0 F7 F6 F5 F4 */
+	FMUL_S( MAT6 )
+	FLD_S( SRC1 )			/* F3 F2 F1 F0 F7 F6 F5 F4 */
+	FMUL_S( MAT7 )
+
+	FXCH( ST(3) )			/* F0 F2 F1 F3 F7 F6 F5 F4 */
+	FADDP( ST0, ST(7) )		/* F2 F1 F3 F7 F6 F5 F4 */
+	FXCH( ST(1) )			/* F1 F2 F3 F7 F6 F5 F4 */
+	FADDP( ST0, ST(5) )		/* F2 F3 F7 F6 F5 F4 */
+	FADDP( ST0, ST(3) )		/* F3 F7 F6 F5 F4 */
+	FADDP( ST0, ST(1) )		/* F7 F6 F5 F4 */
+
+	FXCH( ST(3) )			/* F4 F6 F5 F7 */
+	FADD_S( MAT12 )
+	FXCH( ST(2) )			/* F5 F6 F4 F7 */
+	FADD_S( MAT13 )
+	FXCH( ST(1) )			/* F6 F5 F4 F7 */
+	FADD_S( MAT14 )
+	FXCH( ST(3) )			/* F7 F5 F4 F6 */
+	FADD_S( MAT15 )
+
+	FXCH( ST(2) )			/* F4 F5 F7 F6 */
+	FSTP_S( DST0 )			/* F5 F7 F6 */
+	FSTP_S( DST1 )			/* F7 F6 */
+	FXCH( ST(1) )			/* F6 F7 */
+	FSTP_S( DST2 )			/* F7 */
+	FSTP_S( DST3 )			/* */
+
+LLBL(x86_p2_gr_skip):
+
+	ADD_L( CONST(16), EDI )
+	ADD_L( EAX, ESI )
+	CMP_L( ECX, EDI )
+	JNE( LLBL(x86_p2_gr_loop) )
+
+LLBL(x86_p2_gr_done):
+
+	POP_L( EDI )
+	POP_L( ESI )
+	RET
+#undef FRAME_OFFSET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_x86_transform_points2_perspective )
+GLNAME( _mesa_x86_transform_points2_perspective ):
+
+#define FRAME_OFFSET 12
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+	PUSH_L( EBX )
+
+	MOV_L( ARG_SOURCE, ESI )
+	MOV_L( ARG_DEST, EDI )
+
+	MOV_L( ARG_MATRIX, EDX )
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )
+
+	TEST_L( ECX, ECX )
+	JZ( LLBL(x86_p2_pr_done) )
+
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )
+	OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) )
+
+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )
+	MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) )
+
+	SHL_L( CONST(4), ECX )
+	MOV_L( REGOFF(V4F_START, ESI), ESI )
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI )
+	ADD_L( EDI, ECX )
+
+	MOV_L( MAT14, EBX )
+
+ALIGNTEXT16
+LLBL(x86_p2_pr_loop):
+
+	FLD_S( SRC0 )			/* F4 */
+	FMUL_S( MAT0 )
+
+	FLD_S( SRC1 )			/* F1 F4 */
+	FMUL_S( MAT5 )
+
+	FXCH( ST(1) )			/* F4 F1 */
+	FSTP_S( DST0   )		/* F1 */
+	FSTP_S( DST1   )		/* */
+	MOV_L( EBX, DST2 )
+	MOV_L( CONST(FP_ZERO), DST3 )
+
+LLBL(x86_p2_pr_skip):
+
+	ADD_L( CONST(16), EDI )
+	ADD_L( EAX, ESI )
+	CMP_L( ECX, EDI )
+	JNE( LLBL(x86_p2_pr_loop) )
+
+LLBL(x86_p2_pr_done):
+
+	POP_L( EBX )
+	POP_L( EDI )
+	POP_L( ESI )
+	RET
+#undef FRAME_OFFSET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_x86_transform_points2_3d )
+GLNAME( _mesa_x86_transform_points2_3d ):
+
+#define FRAME_OFFSET 8
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+
+	MOV_L( ARG_SOURCE, ESI )
+	MOV_L( ARG_DEST, EDI )
+
+	MOV_L( ARG_MATRIX, EDX )
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )
+
+	TEST_L( ECX, ECX )
+	JZ( LLBL(x86_p2_3dr_done) )
+
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )
+	OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) )
+
+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )
+	MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) )
+
+	SHL_L( CONST(4), ECX )
+	MOV_L( REGOFF(V4F_START, ESI), ESI )
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI )
+	ADD_L( EDI, ECX )
+
+ALIGNTEXT16
+LLBL(x86_p2_3dr_loop):
+
+	FLD_S( SRC0 )			/* F4 */
+	FMUL_S( MAT0 )
+	FLD_S( SRC0 )			/* F5 F4 */
+	FMUL_S( MAT1 )
+	FLD_S( SRC0 )			/* F6 F5 F4 */
+	FMUL_S( MAT2 )
+
+	FLD_S( SRC1 )			/* F0 F6 F5 F4 */
+	FMUL_S( MAT4 )
+	FLD_S( SRC1 )			/* F1 F0 F6 F5 F4 */
+	FMUL_S( MAT5 )
+	FLD_S( SRC1 )			/* F2 F1 F0 F6 F5 F4 */
+	FMUL_S( MAT6 )
+
+	FXCH( ST(2) )			/* F0 F1 F2 F6 F5 F4 */
+	FADDP( ST0, ST(5) )		/* F1 F2 F6 F5 F4 */
+	FADDP( ST0, ST(3) )		/* F2 F6 F5 F4 */
+	FADDP( ST0, ST(1) )		/* F6 F5 F4 */
+
+	FXCH( ST(2) )			/* F4 F5 F6 */
+	FADD_S( MAT12 )
+	FXCH( ST(1) )			/* F5 F4 F6 */
+	FADD_S( MAT13 )
+	FXCH( ST(2) )			/* F6 F4 F5 */
+	FADD_S( MAT14 )
+
+	FXCH( ST(1) )			/* F4 F6 F5 */
+	FSTP_S( DST0 )			/* F6 F5 */
+	FXCH( ST(1) )			/* F5 F6 */
+	FSTP_S( DST1 )			/* F6 */
+	FSTP_S( DST2 )			/* */
+
+LLBL(x86_p2_3dr_skip):
+
+	ADD_L( CONST(16), EDI )
+	ADD_L( EAX, ESI )
+	CMP_L( ECX, EDI )
+	JNE( LLBL(x86_p2_3dr_loop) )
+
+LLBL(x86_p2_3dr_done):
+
+	POP_L( EDI )
+	POP_L( ESI )
+	RET
+#undef FRAME_OFFSET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_x86_transform_points2_3d_no_rot )
+GLNAME( _mesa_x86_transform_points2_3d_no_rot ):
+
+#define FRAME_OFFSET 12
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+	PUSH_L( EBX )
+
+	MOV_L( ARG_SOURCE, ESI )
+	MOV_L( ARG_DEST, EDI )
+
+	MOV_L( ARG_MATRIX, EDX )
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )
+
+	TEST_L( ECX, ECX )
+	JZ( LLBL(x86_p2_3dnrr_done) )
+
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )
+	OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) )
+
+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )
+	MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) )
+
+	SHL_L( CONST(4), ECX )
+	MOV_L( REGOFF(V4F_START, ESI), ESI )
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI )
+	ADD_L( EDI, ECX )
+
+	MOV_L( MAT14, EBX )
+
+ALIGNTEXT16
+LLBL(x86_p2_3dnrr_loop):
+
+	FLD_S( SRC0 )			/* F4 */
+	FMUL_S( MAT0 )
+
+	FLD_S( SRC1 )			/* F1 F4 */
+	FMUL_S( MAT5 )
+
+	FXCH( ST(1) )			/* F4 F1 */
+	FADD_S( MAT12 )
+	FLD_S( MAT13 )		/* F5 F4 F1 */
+	FXCH( ST(2) )			/* F1 F4 F5 */
+	FADDP( ST0, ST(2) )		/* F4 F5 */
+
+	FSTP_S( DST0 )		/* F5 */
+	FSTP_S( DST1 )		/* */
+	MOV_L( EBX, DST2 )
+
+LLBL(x86_p2_3dnrr_skip):
+
+	ADD_L( CONST(16), EDI )
+	ADD_L( EAX, ESI )
+	CMP_L( ECX, EDI )
+	JNE( LLBL(x86_p2_3dnrr_loop) )
+
+LLBL(x86_p2_3dnrr_done):
+
+	POP_L( EBX )
+	POP_L( EDI )
+	POP_L( ESI )
+	RET
+#undef FRAME_OFFSET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_x86_transform_points2_2d )
+GLNAME( _mesa_x86_transform_points2_2d ):
+
+#define FRAME_OFFSET 8
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+
+	MOV_L( ARG_SOURCE, ESI )
+	MOV_L( ARG_DEST, EDI )
+
+	MOV_L( ARG_MATRIX, EDX )
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )
+
+	TEST_L( ECX, ECX )
+	JZ( LLBL(x86_p2_2dr_done) )
+
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )
+	OR_L( CONST(VEC_SIZE_2), REGOFF(V4F_FLAGS, EDI) )
+
+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )
+	MOV_L( CONST(2), REGOFF(V4F_SIZE, EDI) )
+
+	SHL_L( CONST(4), ECX )
+	MOV_L( REGOFF(V4F_START, ESI), ESI )
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI )
+	ADD_L( EDI, ECX )
+
+ALIGNTEXT16
+LLBL(x86_p2_2dr_loop):
+
+	FLD_S( SRC0 )			/* F4 */
+	FMUL_S( MAT0 )
+	FLD_S( SRC0 )			/* F5 F4 */
+	FMUL_S( MAT1 )
+
+	FLD_S( SRC1 )			/* F0 F5 F4 */
+	FMUL_S( MAT4 )
+	FLD_S( SRC1 )			/* F1 F0 F5 F4 */
+	FMUL_S( MAT5 )
+
+	FXCH( ST(1) )			/* F0 F1 F5 F4 */
+	FADDP( ST0, ST(3) )		/* F1 F5 F4 */
+	FADDP( ST0, ST(1) )		/* F5 F4 */
+
+	FXCH( ST(1) )			/* F4 F5 */
+	FADD_S( MAT12 )
+	FXCH( ST(1) )			/* F5 F4 */
+	FADD_S( MAT13 )
+
+	FXCH( ST(1) )			/* F4 F5 */
+	FSTP_S( DST0 )		/* F5 */
+	FSTP_S( DST1 )		/* */
+
+LLBL(x86_p2_2dr_skip):
+
+	ADD_L( CONST(16), EDI )
+	ADD_L( EAX, ESI )
+	CMP_L( ECX, EDI )
+	JNE( LLBL(x86_p2_2dr_loop) )
+
+LLBL(x86_p2_2dr_done):
+
+	POP_L( EDI )
+	POP_L( ESI )
+	RET
+#undef FRAME_OFFSET
+
+
+
+
+ALIGNTEXT4
+GLOBL GLNAME( _mesa_x86_transform_points2_2d_no_rot )
+GLNAME( _mesa_x86_transform_points2_2d_no_rot ):
+
+#define FRAME_OFFSET 8
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+
+	MOV_L( ARG_SOURCE, ESI )
+	MOV_L( ARG_DEST, EDI )
+
+	MOV_L( ARG_MATRIX, EDX )
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )
+
+	TEST_L( ECX, ECX )
+	JZ( LLBL(x86_p2_2dnrr_done) )
+
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )
+	OR_L( CONST(VEC_SIZE_2), REGOFF(V4F_FLAGS, EDI) )
+
+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )
+	MOV_L( CONST(2), REGOFF(V4F_SIZE, EDI) )
+
+	SHL_L( CONST(4), ECX )
+	MOV_L( REGOFF(V4F_START, ESI), ESI )
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI )
+	ADD_L( EDI, ECX )
+
+ALIGNTEXT16
+LLBL(x86_p2_2dnrr_loop):
+
+	FLD_S( SRC0 )			/* F4 */
+	FMUL_S( MAT0 )
+
+	FLD_S( SRC1 )			/* F1 F4 */
+	FMUL_S( MAT5 )
+
+	FXCH( ST(1) )			/* F4 F1 */
+	FADD_S( MAT12 )
+	FLD_S( MAT13 )		/* F5 F4 F1 */
+	FXCH( ST(2) )			/* F1 F4 F5 */
+	FADDP( ST0, ST(2) )		/* F4 F5 */
+
+	FSTP_S( DST0   )		/* F5 */
+	FSTP_S( DST1   )		/* */
+
+LLBL(x86_p2_2dnrr_skip):
+
+	ADD_L( CONST(16), EDI )
+	ADD_L( EAX, ESI )
+	CMP_L( ECX, EDI )
+	JNE( LLBL(x86_p2_2dnrr_loop) )
+
+LLBL(x86_p2_2dnrr_done):
+
+	POP_L( EDI )
+	POP_L( ESI )
+	RET
+#undef FRAME_OFFSET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_x86_transform_points2_identity )
+GLNAME( _mesa_x86_transform_points2_identity ):
+
+#define FRAME_OFFSET 12
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+	PUSH_L( EBX )
+
+	MOV_L( ARG_SOURCE, ESI )
+	MOV_L( ARG_DEST, EDI )
+
+	MOV_L( ARG_MATRIX, EDX )
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )
+
+	TEST_L( ECX, ECX )
+	JZ( LLBL(x86_p2_ir_done) )
+
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )
+	OR_L( CONST(VEC_SIZE_2), REGOFF(V4F_FLAGS, EDI) )
+
+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )
+	MOV_L( CONST(2), REGOFF(V4F_SIZE, EDI) )
+
+	SHL_L( CONST(4), ECX )
+	MOV_L( REGOFF(V4F_START, ESI), ESI )
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI )
+	ADD_L( EDI, ECX )
+
+	CMP_L( ESI, EDI )
+	JE( LLBL(x86_p2_ir_done) )
+
+ALIGNTEXT16
+LLBL(x86_p2_ir_loop):
+
+	MOV_L( SRC0, EBX )
+	MOV_L( SRC1, EDX )
+
+	MOV_L( EBX, DST0 )
+	MOV_L( EDX, DST1 )
+
+LLBL(x86_p2_ir_skip):
+
+	ADD_L( CONST(16), EDI )
+	ADD_L( EAX, ESI )
+	CMP_L( ECX, EDI )
+	JNE( LLBL(x86_p2_ir_loop) )
+
+LLBL(x86_p2_ir_done):
+
+	POP_L( EBX )
+	POP_L( EDI )
+	POP_L( ESI )
+	RET
+#undef FRAME_OFFSET
diff --git a/reactos/lib/mesa32/src/x86/x86_xform3.S b/reactos/lib/mesa32/src/x86/x86_xform3.S
new file mode 100644
index 00000000000..7d464cd7aa3
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/x86_xform3.S
@@ -0,0 +1,633 @@
+/* $Id: x86_xform3.S,v 1.1 2004/07/16 22:12:43 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * NOTE: Avoid using spaces in between '(' ')' and arguments, especially
+ * with macros like CONST, LLBL that expand to CONCAT(...).  Putting spaces
+ * in there will break the build on some platforms.
+ */
+
+#include "matypes.h"
+#include "xform_args.h"
+
+	SEG_TEXT
+
+#define FP_ONE		1065353216
+#define FP_ZERO		0
+
+#define SRC0		REGOFF(0, ESI)
+#define SRC1		REGOFF(4, ESI)
+#define SRC2		REGOFF(8, ESI)
+#define SRC3		REGOFF(12, ESI)
+#define DST0		REGOFF(0, EDI)
+#define DST1		REGOFF(4, EDI)
+#define DST2		REGOFF(8, EDI)
+#define DST3		REGOFF(12, EDI)
+#define MAT0		REGOFF(0, EDX)
+#define MAT1		REGOFF(4, EDX)
+#define MAT2		REGOFF(8, EDX)
+#define MAT3		REGOFF(12, EDX)
+#define MAT4		REGOFF(16, EDX)
+#define MAT5		REGOFF(20, EDX)
+#define MAT6		REGOFF(24, EDX)
+#define MAT7		REGOFF(28, EDX)
+#define MAT8		REGOFF(32, EDX)
+#define MAT9		REGOFF(36, EDX)
+#define MAT10		REGOFF(40, EDX)
+#define MAT11		REGOFF(44, EDX)
+#define MAT12		REGOFF(48, EDX)
+#define MAT13		REGOFF(52, EDX)
+#define MAT14		REGOFF(56, EDX)
+#define MAT15		REGOFF(60, EDX)
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_x86_transform_points3_general )
+GLNAME( _mesa_x86_transform_points3_general ):
+
+#define FRAME_OFFSET 8
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+
+	MOV_L( ARG_SOURCE, ESI )
+	MOV_L( ARG_DEST, EDI )
+
+	MOV_L( ARG_MATRIX, EDX )
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )
+
+	TEST_L( ECX, ECX )
+	JZ( LLBL(x86_p3_gr_done) )
+
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )
+	OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) )
+
+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )
+	MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) )
+
+	SHL_L( CONST(4), ECX )
+	MOV_L( REGOFF(V4F_START, ESI), ESI )
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI )
+	ADD_L( EDI, ECX )
+
+ALIGNTEXT16
+LLBL(x86_p3_gr_loop):
+
+	FLD_S( SRC0 )			/* F4 */
+	FMUL_S( MAT0 )
+	FLD_S( SRC0 )			/* F5 F4 */
+	FMUL_S( MAT1 )
+	FLD_S( SRC0 )			/* F6 F5 F4 */
+	FMUL_S( MAT2 )
+	FLD_S( SRC0 )			/* F7 F6 F5 F4 */
+	FMUL_S( MAT3 )
+
+	FLD_S( SRC1 )			/* F0 F7 F6 F5 F4 */
+	FMUL_S( MAT4 )
+	FLD_S( SRC1 )			/* F1 F0 F7 F6 F5 F4 */
+	FMUL_S( MAT5 )
+	FLD_S( SRC1 )			/* F2 F1 F0 F7 F6 F5 F4 */
+	FMUL_S( MAT6 )
+	FLD_S( SRC1 )			/* F3 F2 F1 F0 F7 F6 F5 F4 */
+	FMUL_S( MAT7 )
+
+	FXCH( ST(3) )			/* F0 F2 F1 F3 F7 F6 F5 F4 */
+	FADDP( ST0, ST(7) )		/* F2 F1 F3 F7 F6 F5 F4 */
+	FXCH( ST(1) )			/* F1 F2 F3 F7 F6 F5 F4 */
+	FADDP( ST0, ST(5) )		/* F2 F3 F7 F6 F5 F4 */
+	FADDP( ST0, ST(3) )		/* F3 F7 F6 F5 F4 */
+	FADDP( ST0, ST(1) )		/* F7 F6 F5 F4 */
+
+	FLD_S( SRC2 )			/* F0 F7 F6 F5 F4 */
+	FMUL_S( MAT8 )
+	FLD_S( SRC2 )			/* F1 F0 F7 F6 F5 F4 */
+	FMUL_S( MAT9 )
+	FLD_S( SRC2 )			/* F2 F1 F0 F7 F6 F5 F4 */
+	FMUL_S( MAT10 )
+	FLD_S( SRC2 )			/* F3 F2 F1 F0 F7 F6 F5 F4 */
+	FMUL_S( MAT11 )
+
+	FXCH( ST(3) )			/* F0 F2 F1 F3 F7 F6 F5 F4 */
+	FADDP( ST0, ST(7) )		/* F2 F1 F3 F7 F6 F5 F4 */
+	FXCH( ST(1) )			/* F1 F2 F3 F7 F6 F5 F4 */
+	FADDP( ST0, ST(5) )		/* F2 F3 F7 F6 F5 F4 */
+	FADDP( ST0, ST(3) )		/* F3 F7 F6 F5 F4 */
+	FADDP( ST0, ST(1) )		/* F7 F6 F5 F4 */
+
+	FXCH( ST(3) )			/* F4 F6 F5 F7 */
+	FADD_S( MAT12 )
+	FXCH( ST(2) )			/* F5 F6 F4 F7 */
+	FADD_S( MAT13 )
+	FXCH( ST(1) )			/* F6 F5 F4 F7 */
+	FADD_S( MAT14 )
+	FXCH( ST(3) )			/* F7 F5 F4 F6 */
+	FADD_S( MAT15 )
+
+	FXCH( ST(2) )			/* F4 F5 F7 F6 */
+	FSTP_S( DST0 )		/* F5 F7 F6 */
+	FSTP_S( DST1 )		/* F7 F6 */
+	FXCH( ST(1) )			/* F6 F7 */
+	FSTP_S( DST2 )		/* F7 */
+	FSTP_S( DST3 )		/* */
+
+LLBL(x86_p3_gr_skip):
+
+	ADD_L( CONST(16), EDI )
+	ADD_L( EAX, ESI )
+	CMP_L( ECX, EDI )
+	JNE( LLBL(x86_p3_gr_loop) )
+
+LLBL(x86_p3_gr_done):
+
+	POP_L( EDI )
+	POP_L( ESI )
+	RET
+#undef FRAME_OFFSET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_x86_transform_points3_perspective )
+GLNAME( _mesa_x86_transform_points3_perspective ):
+
+#define FRAME_OFFSET 12
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+	PUSH_L( EBX )
+
+	MOV_L( ARG_SOURCE, ESI )
+	MOV_L( ARG_DEST, EDI )
+
+	MOV_L( ARG_MATRIX, EDX )
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )
+
+	TEST_L( ECX, ECX )
+	JZ( LLBL(x86_p3_pr_done) )
+
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )
+	OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) )
+
+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )
+	MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) )
+
+	SHL_L( CONST(4), ECX )
+	MOV_L( REGOFF(V4F_START, ESI), ESI )
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI )
+	ADD_L( EDI, ECX )
+
+ALIGNTEXT16
+LLBL(x86_p3_pr_loop):
+
+	FLD_S( SRC0 )			/* F4 */
+	FMUL_S( MAT0 )
+
+	FLD_S( SRC1 )			/* F5 F4 */
+	FMUL_S( MAT5 )
+
+	FLD_S( SRC2 )			/* F0 F5 F4 */
+	FMUL_S( MAT8 )
+	FLD_S( SRC2 )			/* F1 F0 F5 F4 */
+	FMUL_S( MAT9 )
+	FLD_S( SRC2 )			/* F2 F1 F0 F5 F4 */
+	FMUL_S( MAT10 )
+
+	FXCH( ST(2) )			/* F0 F1 F2 F5 F4 */
+	FADDP( ST0, ST(4) )		/* F1 F2 F5 F4 */
+	FADDP( ST0, ST(2) )		/* F2 F5 F4 */
+	FLD_S( MAT14 )		/* F6 F2 F5 F4 */
+	FXCH( ST(1) )			/* F2 F6 F5 F4 */
+	FADDP( ST0, ST(1) )		/* F6 F5 F4 */
+
+	MOV_L( SRC2, EBX )
+	XOR_L( CONST(-2147483648), EBX )/* change sign */
+
+	FXCH( ST(2) )			/* F4 F5 F6 */
+	FSTP_S( DST0 )		/* F5 F6 */
+	FSTP_S( DST1 )		/* F6 */
+	FSTP_S( DST2 )		/* */
+	MOV_L( EBX, DST3 )
+
+LLBL(x86_p3_pr_skip):
+
+	ADD_L( CONST(16), EDI )
+	ADD_L( EAX, ESI )
+	CMP_L( ECX, EDI )
+	JNE( LLBL(x86_p3_pr_loop) )
+
+LLBL(x86_p3_pr_done):
+
+	POP_L( EBX )
+	POP_L( EDI )
+	POP_L( ESI )
+	RET
+#undef FRAME_OFFSET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_x86_transform_points3_3d )
+GLNAME( _mesa_x86_transform_points3_3d ):
+
+#define FRAME_OFFSET 8
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+
+	MOV_L( ARG_SOURCE, ESI )
+	MOV_L( ARG_DEST, EDI )
+
+	MOV_L( ARG_MATRIX, EDX )
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )
+
+	TEST_L( ECX, ECX )
+	JZ( LLBL(x86_p3_3dr_done) )
+
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )
+	OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) )
+
+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )
+	MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) )
+
+	SHL_L( CONST(4), ECX )
+	MOV_L( REGOFF(V4F_START, ESI), ESI )
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI )
+	ADD_L( EDI, ECX )
+
+ALIGNTEXT16
+LLBL(x86_p3_3dr_loop):
+
+	FLD_S( SRC0 )			/* F4 */
+	FMUL_S( MAT0 )
+	FLD_S( SRC0 )			/* F5 F4 */
+	FMUL_S( MAT1 )
+	FLD_S( SRC0 )			/* F6 F5 F4 */
+	FMUL_S( MAT2 )
+
+	FLD_S( SRC1 )			/* F0 F6 F5 F4 */
+	FMUL_S( MAT4 )
+	FLD_S( SRC1 )			/* F1 F0 F6 F5 F4 */
+	FMUL_S( MAT5 )
+	FLD_S( SRC1 )			/* F2 F1 F0 F6 F5 F4 */
+	FMUL_S( MAT6 )
+
+	FXCH( ST(2) )			/* F0 F1 F2 F6 F5 F4 */
+	FADDP( ST0, ST(5) )		/* F1 F2 F6 F5 F4 */
+	FADDP( ST0, ST(3) )		/* F2 F6 F5 F4 */
+	FADDP( ST0, ST(1) )		/* F6 F5 F4 */
+
+	FLD_S( SRC2 )			/* F0 F6 F5 F4 */
+	FMUL_S( MAT8 )
+	FLD_S( SRC2 )			/* F1 F0 F6 F5 F4 */
+	FMUL_S( MAT9 )
+	FLD_S( SRC2 )			/* F2 F1 F0 F6 F5 F4 */
+	FMUL_S( MAT10 )
+
+	FXCH( ST(2) )			/* F0 F1 F2 F6 F5 F4 */
+	FADDP( ST0, ST(5) )		/* F1 F2 F6 F5 F4 */
+	FADDP( ST0, ST(3) )		/* F2 F6 F5 F4 */
+	FADDP( ST0, ST(1) )		/* F6 F5 F4 */
+
+	FXCH( ST(2) )			/* F4 F5 F6 */
+	FADD_S( MAT12 )
+	FXCH( ST(1) )			/* F5 F4 F6 */
+	FADD_S( MAT13 )
+	FXCH( ST(2) )			/* F6 F4 F5 */
+	FADD_S( MAT14 )
+
+	FXCH( ST(1) )			/* F4 F6 F5 */
+	FSTP_S( DST0   )		/* F6 F5 */
+	FXCH( ST(1) )			/* F5 F6 */
+	FSTP_S( DST1   )		/* F6 */
+	FSTP_S( DST2   )		/* */
+
+LLBL(x86_p3_3dr_skip):
+
+	ADD_L( CONST(16), EDI )
+	ADD_L( EAX, ESI )
+	CMP_L( ECX, EDI )
+	JNE( LLBL(x86_p3_3dr_loop) )
+
+LLBL(x86_p3_3dr_done):
+
+	POP_L( EDI )
+	POP_L( ESI )
+	RET
+#undef FRAME_OFFSET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_x86_transform_points3_3d_no_rot )
+GLNAME( _mesa_x86_transform_points3_3d_no_rot ):
+
+#define FRAME_OFFSET 8
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+
+	MOV_L( ARG_SOURCE, ESI )
+	MOV_L( ARG_DEST, EDI )
+
+
+	MOV_L( ARG_MATRIX, EDX )
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )
+
+	TEST_L( ECX, ECX )
+	JZ( LLBL(x86_p3_3dnrr_done) )
+
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )
+	OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) )
+
+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )
+	MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) )
+
+	SHL_L( CONST(4), ECX )
+	MOV_L( REGOFF(V4F_START, ESI), ESI )
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI )
+	ADD_L( EDI, ECX )
+
+ALIGNTEXT16
+LLBL(x86_p3_3dnrr_loop):
+
+	FLD_S( SRC0 )			/* F4 */
+	FMUL_S( MAT0 )
+
+	FLD_S( SRC1 )			/* F1 F4 */
+	FMUL_S( MAT5 )
+
+	FLD_S( SRC2 )			/* F2 F1 F4 */
+	FMUL_S( MAT10 )
+
+	FXCH( ST(2) )			/* F4 F1 F2 */
+	FADD_S( MAT12 )
+	FLD_S( MAT13 )		/* F5 F4 F1 F2 */
+	FXCH( ST(2) )			/* F1 F4 F5 F2 */
+	FADDP( ST0, ST(2) )		/* F4 F5 F2 */
+	FLD_S( MAT14 )		/* F6 F4 F5 F2 */
+	FXCH( ST(3) )			/* F2 F4 F5 F6 */
+	FADDP( ST0, ST(3) )		/* F4 F5 F6 */
+
+	FSTP_S( DST0   )		/* F5 F6 */
+	FSTP_S( DST1   )		/* F6 */
+	FSTP_S( DST2   )		/* */
+
+LLBL(x86_p3_3dnrr_skip):
+
+	ADD_L( CONST(16), EDI )
+	ADD_L( EAX, ESI )
+	CMP_L( ECX, EDI )
+	JNE( LLBL(x86_p3_3dnrr_loop) )
+
+LLBL(x86_p3_3dnrr_done):
+
+	POP_L( EDI )
+	POP_L( ESI )
+	RET
+#undef FRAME_OFFSET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_x86_transform_points3_2d )
+GLNAME( _mesa_x86_transform_points3_2d ):
+
+#define FRAME_OFFSET 12
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+	PUSH_L( EBX )
+
+	MOV_L( ARG_SOURCE, ESI )
+	MOV_L( ARG_DEST, EDI )
+
+	MOV_L( ARG_MATRIX, EDX )
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )
+
+	TEST_L( ECX, ECX )
+	JZ( LLBL(x86_p3_2dr_done) )
+
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )
+	OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) )
+
+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )
+	MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) )
+
+	SHL_L( CONST(4), ECX )
+	MOV_L( REGOFF(V4F_START, ESI), ESI )
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI )
+	ADD_L( EDI, ECX )
+
+ALIGNTEXT16
+LLBL(x86_p3_2dr_loop):
+
+	FLD_S( SRC0 )			/* F4 */
+	FMUL_S( MAT0 )
+	FLD_S( SRC0 )			/* F5 F4 */
+	FMUL_S( MAT1 )
+
+	FLD_S( SRC1 )			/* F0 F5 F4 */
+	FMUL_S( MAT4 )
+	FLD_S( SRC1 )			/* F1 F0 F5 F4 */
+	FMUL_S( MAT5 )
+
+	FXCH( ST(1) )			/* F0 F1 F5 F4 */
+	FADDP( ST0, ST(3) )		/* F1 F5 F4 */
+	FADDP( ST0, ST(1) )		/* F5 F4 */
+
+	FXCH( ST(1) )			/* F4 F5 */
+	FADD_S( MAT12 )
+	FXCH( ST(1) )			/* F5 F4 */
+	FADD_S( MAT13 )
+
+	MOV_L( SRC2, EBX )
+
+	FXCH( ST(1) )			/* F4 F5 */
+	FSTP_S( DST0   )		/* F5 */
+	FSTP_S( DST1   )		/* */
+	MOV_L( EBX, DST2 )
+
+LLBL(x86_p3_2dr_skip):
+
+	ADD_L( CONST(16), EDI )
+	ADD_L( EAX, ESI )
+	CMP_L( ECX, EDI )
+	JNE( LLBL(x86_p3_2dr_loop) )
+
+LLBL(x86_p3_2dr_done):
+
+	POP_L( EBX )
+	POP_L( EDI )
+	POP_L( ESI )
+	RET
+#undef FRAME_OFFSET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_x86_transform_points3_2d_no_rot )
+GLNAME( _mesa_x86_transform_points3_2d_no_rot ):
+
+#define FRAME_OFFSET 12
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+	PUSH_L( EBX )
+
+	MOV_L( ARG_SOURCE, ESI )
+	MOV_L( ARG_DEST, EDI )
+
+	MOV_L( ARG_MATRIX, EDX )
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )
+
+	TEST_L( ECX, ECX )
+	JZ( LLBL(x86_p3_2dnrr_done) )
+
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )
+	OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) )
+
+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )
+	MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) )
+
+	SHL_L( CONST(4), ECX )
+	MOV_L( REGOFF(V4F_START, ESI), ESI )
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI )
+	ADD_L( EDI, ECX )
+
+ALIGNTEXT16
+LLBL(x86_p3_2dnrr_loop):
+
+	FLD_S( SRC0 )			/* F4 */
+	FMUL_S( MAT0 )
+
+	FLD_S( SRC1 )			/* F1 F4 */
+	FMUL_S( MAT5 )
+
+	FXCH( ST(1) )			/* F4 F1 */
+	FADD_S( MAT12 )
+	FLD_S( MAT13 )		/* F5 F4 F1 */
+
+	FXCH( ST(2) )			/* F1 F4 F5 */
+	FADDP( ST0, ST(2) )		/* F4 F5 */
+
+	MOV_L( SRC2, EBX )
+
+	FSTP_S( DST0 )		/* F5 */
+	FSTP_S( DST1 )		/* */
+	MOV_L( EBX, DST2 )
+
+LLBL(x86_p3_2dnrr_skip):
+
+	ADD_L( CONST(16), EDI )
+	ADD_L( EAX, ESI )
+	CMP_L( ECX, EDI )
+	JNE( LLBL(x86_p3_2dnrr_loop) )
+
+LLBL(x86_p3_2dnrr_done):
+
+	POP_L( EBX )
+	POP_L( EDI )
+	POP_L( ESI )
+	RET
+#undef FRAME_OFFSET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_x86_transform_points3_identity )
+GLNAME(_mesa_x86_transform_points3_identity ):
+
+#define FRAME_OFFSET 16
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+	PUSH_L( EBX )
+	PUSH_L( EBP )
+
+	MOV_L( ARG_SOURCE, ESI )
+	MOV_L( ARG_DEST, EDI )
+
+	MOV_L( ARG_MATRIX, EDX )
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )
+
+	TEST_L( ECX, ECX )
+	JZ( LLBL(x86_p3_ir_done) )
+
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )
+	OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) )
+
+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )
+	MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) )
+
+	SHL_L( CONST(4), ECX )
+	MOV_L( REGOFF(V4F_START, ESI), ESI )
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI )
+	ADD_L( EDI, ECX )
+
+	CMP_L( ESI, EDI )
+	JE( LLBL(x86_p3_ir_done) )
+
+ALIGNTEXT16
+LLBL(x86_p3_ir_loop):
+
+#if 1
+	MOV_L( SRC0, EBX )
+	MOV_L( SRC1, EBP )
+	MOV_L( SRC2, EDX )
+
+	MOV_L( EBX, DST0 )
+	MOV_L( EBP, DST1 )
+	MOV_L( EDX, DST2 )
+#else
+	FLD_S( SRC0 )
+	FLD_S( SRC1 )
+	FLD_S( SRC2 )
+
+	FSTP_S( DST2 )
+	FSTP_S( DST1 )
+	FSTP_S( DST0 )
+#endif
+
+LLBL(x86_p3_ir_skip):
+
+	ADD_L( CONST(16), EDI )
+	ADD_L( EAX, ESI )
+	CMP_L( ECX, EDI )
+	JNE( LLBL(x86_p3_ir_loop) )
+
+LLBL(x86_p3_ir_done):
+
+	POP_L( EBP )
+	POP_L( EBX )
+	POP_L( EDI )
+	POP_L( ESI )
+	RET
diff --git a/reactos/lib/mesa32/src/x86/x86_xform4.S b/reactos/lib/mesa32/src/x86/x86_xform4.S
new file mode 100644
index 00000000000..865a9044833
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/x86_xform4.S
@@ -0,0 +1,666 @@
+/* $Id: x86_xform4.S,v 1.1 2004/07/16 22:12:43 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * NOTE: Avoid using spaces in between '(' ')' and arguments, especially
+ * with macros like CONST, LLBL that expand to CONCAT(...).  Putting spaces
+ * in there will break the build on some platforms.
+ */
+
+#include "matypes.h"
+#include "xform_args.h"
+
+	SEG_TEXT
+
+#define FP_ONE		1065353216
+#define FP_ZERO		0
+
+#define SRC0		REGOFF(0, ESI)
+#define SRC1		REGOFF(4, ESI)
+#define SRC2		REGOFF(8, ESI)
+#define SRC3		REGOFF(12, ESI)
+#define DST0		REGOFF(0, EDI)
+#define DST1		REGOFF(4, EDI)
+#define DST2		REGOFF(8, EDI)
+#define DST3		REGOFF(12, EDI)
+#define MAT0		REGOFF(0, EDX)
+#define MAT1		REGOFF(4, EDX)
+#define MAT2		REGOFF(8, EDX)
+#define MAT3		REGOFF(12, EDX)
+#define MAT4		REGOFF(16, EDX)
+#define MAT5		REGOFF(20, EDX)
+#define MAT6		REGOFF(24, EDX)
+#define MAT7		REGOFF(28, EDX)
+#define MAT8		REGOFF(32, EDX)
+#define MAT9		REGOFF(36, EDX)
+#define MAT10		REGOFF(40, EDX)
+#define MAT11		REGOFF(44, EDX)
+#define MAT12		REGOFF(48, EDX)
+#define MAT13		REGOFF(52, EDX)
+#define MAT14		REGOFF(56, EDX)
+#define MAT15		REGOFF(60, EDX)
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_x86_transform_points4_general )
+GLNAME( _mesa_x86_transform_points4_general ):
+
+#define FRAME_OFFSET 8
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+
+	MOV_L( ARG_SOURCE, ESI )
+	MOV_L( ARG_DEST, EDI )
+
+	MOV_L( ARG_MATRIX, EDX )
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )
+
+	TEST_L( ECX, ECX )
+	JZ( LLBL(x86_p4_gr_done) )
+
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )
+	OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) )
+
+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )
+	MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) )
+
+	SHL_L( CONST(4), ECX )
+	MOV_L( REGOFF(V4F_START, ESI), ESI )
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI )
+	ADD_L( EDI, ECX )
+
+ALIGNTEXT16
+LLBL(x86_p4_gr_loop):
+
+	FLD_S( SRC0 )			/* F4 */
+	FMUL_S( MAT0 )
+	FLD_S( SRC0 )			/* F5 F4 */
+	FMUL_S( MAT1 )
+	FLD_S( SRC0 )			/* F6 F5 F4 */
+	FMUL_S( MAT2 )
+	FLD_S( SRC0 )			/* F7 F6 F5 F4 */
+	FMUL_S( MAT3 )
+
+	FLD_S( SRC1 )			/* F0 F7 F6 F5 F4 */
+	FMUL_S( MAT4 )
+	FLD_S( SRC1 )			/* F1 F0 F7 F6 F5 F4 */
+	FMUL_S( MAT5 )
+	FLD_S( SRC1 )			/* F2 F1 F0 F7 F6 F5 F4 */
+	FMUL_S( MAT6 )
+	FLD_S( SRC1 )			/* F3 F2 F1 F0 F7 F6 F5 F4 */
+	FMUL_S( MAT7 )
+
+	FXCH( ST(3) )			/* F0 F2 F1 F3 F7 F6 F5 F4 */
+	FADDP( ST0, ST(7) )		/* F2 F1 F3 F7 F6 F5 F4 */
+	FXCH( ST(1) )			/* F1 F2 F3 F7 F6 F5 F4 */
+	FADDP( ST0, ST(5) )		/* F2 F3 F7 F6 F5 F4 */
+	FADDP( ST0, ST(3) )		/* F3 F7 F6 F5 F4 */
+	FADDP( ST0, ST(1) )		/* F7 F6 F5 F4 */
+
+	FLD_S( SRC2 )			/* F0 F7 F6 F5 F4 */
+	FMUL_S( MAT8 )
+	FLD_S( SRC2 )			/* F1 F0 F7 F6 F5 F4 */
+	FMUL_S( MAT9 )
+	FLD_S( SRC2 )			/* F2 F1 F0 F7 F6 F5 F4 */
+	FMUL_S( MAT10 )
+	FLD_S( SRC2 )			/* F3 F2 F1 F0 F7 F6 F5 F4 */
+	FMUL_S( MAT11 )
+
+	FXCH( ST(3) )			/* F0 F2 F1 F3 F7 F6 F5 F4 */
+	FADDP( ST0, ST(7) )		/* F2 F1 F3 F7 F6 F5 F4 */
+	FXCH( ST(1) )			/* F1 F2 F3 F7 F6 F5 F4 */
+	FADDP( ST0, ST(5) )		/* F2 F3 F7 F6 F5 F4 */
+	FADDP( ST0, ST(3) )		/* F3 F7 F6 F5 F4 */
+	FADDP( ST0, ST(1) )		/* F7 F6 F5 F4 */
+
+	FLD_S( SRC3 )			/* F0 F7 F6 F5 F4 */
+	FMUL_S( MAT12 )
+	FLD_S( SRC3 )			/* F1 F0 F7 F6 F5 F4 */
+	FMUL_S( MAT13 )
+	FLD_S( SRC3 )			/* F2 F1 F0 F7 F6 F5 F4 */
+	FMUL_S( MAT14 )
+	FLD_S( SRC3 )			/* F3 F2 F1 F0 F7 F6 F5 F4 */
+	FMUL_S( MAT15 )
+
+	FXCH( ST(3) )			/* F0 F2 F1 F3 F7 F6 F5 F4 */
+	FADDP( ST0, ST(7) )		/* F2 F1 F3 F7 F6 F5 F4 */
+	FXCH( ST(1) )			/* F1 F2 F3 F7 F6 F5 F4 */
+	FADDP( ST0, ST(5) )		/* F2 F3 F7 F6 F5 F4 */
+	FADDP( ST0, ST(3) )		/* F3 F7 F6 F5 F4 */
+	FADDP( ST0, ST(1) )		/* F7 F6 F5 F4 */
+
+	FXCH( ST(3) )			/* F4 F6 F5 F7 */
+	FSTP_S( DST0 )		/* F6 F5 F7 */
+	FXCH( ST(1) )			/* F5 F6 F7 */
+	FSTP_S( DST1 )		/* F6 F7 */
+	FSTP_S( DST2 )		/* F7 */
+	FSTP_S( DST3 )		/* */
+
+LLBL(x86_p4_gr_skip):
+
+	ADD_L( CONST(16), EDI )
+	ADD_L( EAX, ESI )
+	CMP_L( ECX, EDI )
+	JNE( LLBL(x86_p4_gr_loop) )
+
+LLBL(x86_p4_gr_done):
+
+	POP_L( EDI )
+	POP_L( ESI )
+	RET
+#undef FRAME_OFFSET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_x86_transform_points4_perspective )
+GLNAME( _mesa_x86_transform_points4_perspective ):
+
+#define FRAME_OFFSET 12
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+	PUSH_L( EBX )
+
+	MOV_L( ARG_SOURCE, ESI )
+	MOV_L( ARG_DEST, EDI )
+
+	MOV_L( ARG_MATRIX, EDX )
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )
+
+	TEST_L( ECX, ECX )
+	JZ( LLBL(x86_p4_pr_done) )
+
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )
+	OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) )
+
+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )
+	MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) )
+
+	SHL_L( CONST(4), ECX )
+	MOV_L( REGOFF(V4F_START, ESI), ESI )
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI )
+	ADD_L( EDI, ECX )
+
+ALIGNTEXT16
+LLBL(x86_p4_pr_loop):
+
+	FLD_S( SRC0 )			/* F4 */
+	FMUL_S( MAT0 )
+
+	FLD_S( SRC1 )			/* F5 F4 */
+	FMUL_S( MAT5 )
+
+	FLD_S( SRC2 )			/* F0 F5 F4 */
+	FMUL_S( MAT8 )
+	FLD_S( SRC2 )			/* F1 F0 F5 F4 */
+	FMUL_S( MAT9 )
+	FLD_S( SRC2 )			/* F6 F1 F0 F5 F4 */
+	FMUL_S( MAT10 )
+
+	FXCH( ST(2) )			/* F0 F1 F6 F5 F4 */
+	FADDP( ST0, ST(4) )		/* F1 F6 F5 F4 */
+	FADDP( ST0, ST(2) )		/* F6 F5 F4 */
+
+	FLD_S( SRC3 )			/* F2 F6 F5 F4 */
+	FMUL_S( MAT14 )
+
+	FADDP( ST0, ST(1) )		/* F6 F5 F4 */
+
+	MOV_L( SRC2, EBX )
+	XOR_L( CONST(-2147483648), EBX )/* change sign */
+
+	FXCH( ST(2) )			/* F4 F5 F6 */
+	FSTP_S( DST0 )		/* F5 F6 */
+	FSTP_S( DST1 )		/* F6 */
+	FSTP_S( DST2 )		/* */
+	MOV_L( EBX, DST3 )
+
+LLBL(x86_p4_pr_skip):
+
+	ADD_L( CONST(16), EDI )
+	ADD_L( EAX, ESI )
+	CMP_L( ECX, EDI )
+	JNE( LLBL(x86_p4_pr_loop) )
+
+LLBL(x86_p4_pr_done):
+
+	POP_L( EBX )
+	POP_L( EDI )
+	POP_L( ESI )
+	RET
+#undef FRAME_OFFSET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_x86_transform_points4_3d )
+GLNAME( _mesa_x86_transform_points4_3d ):
+
+#define FRAME_OFFSET 12
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+	PUSH_L( EBX )
+
+	MOV_L( ARG_SOURCE, ESI )
+	MOV_L( ARG_DEST, EDI )
+
+	MOV_L( ARG_MATRIX, EDX )
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )
+
+	TEST_L( ECX, ECX )
+	JZ( LLBL(x86_p4_3dr_done) )
+
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )
+	OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) )
+
+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )
+	MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) )
+
+	SHL_L( CONST(4), ECX )
+	MOV_L( REGOFF(V4F_START, ESI), ESI )
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI )
+	ADD_L( EDI, ECX )
+
+ALIGNTEXT16
+LLBL(x86_p4_3dr_loop):
+
+	FLD_S( SRC0 )			/* F4 */
+	FMUL_S( MAT0 )
+	FLD_S( SRC0 )			/* F5 F4 */
+	FMUL_S( MAT1 )
+	FLD_S( SRC0 )			/* F6 F5 F4 */
+	FMUL_S( MAT2 )
+
+	FLD_S( SRC1 )			/* F0 F6 F5 F4 */
+	FMUL_S( MAT4 )
+	FLD_S( SRC1 )			/* F1 F0 F6 F5 F4 */
+	FMUL_S( MAT5 )
+	FLD_S( SRC1 )			/* F2 F1 F0 F6 F5 F4 */
+	FMUL_S( MAT6 )
+
+	FXCH( ST(2) )			/* F0 F1 F2 F6 F5 F4 */
+	FADDP( ST0, ST(5) )		/* F1 F2 F6 F5 F4 */
+	FADDP( ST0, ST(3) )		/* F2 F6 F5 F4 */
+	FADDP( ST0, ST(1) )		/* F6 F5 F4 */
+
+	FLD_S( SRC2 )			/* F0 F6 F5 F4 */
+	FMUL_S( MAT8 )
+	FLD_S( SRC2 )			/* F1 F0 F6 F5 F4 */
+	FMUL_S( MAT9 )
+	FLD_S( SRC2 )			/* F2 F1 F0 F6 F5 F4 */
+	FMUL_S( MAT10 )
+
+	FXCH( ST(2) )			/* F0 F1 F2 F6 F5 F4 */
+	FADDP( ST0, ST(5) )		/* F1 F2 F6 F5 F4 */
+	FADDP( ST0, ST(3) )		/* F2 F6 F5 F4 */
+	FADDP( ST0, ST(1) )		/* F6 F5 F4 */
+
+	FLD_S( SRC3 )			/* F0 F6 F5 F4 */
+	FMUL_S( MAT12 )
+	FLD_S( SRC3 )			/* F1 F0 F6 F5 F4 */
+	FMUL_S( MAT13 )
+	FLD_S( SRC3 )			/* F2 F1 F0 F6 F5 F4 */
+	FMUL_S( MAT14 )
+
+	FXCH( ST(2) )			/* F0 F1 F2 F6 F5 F4 */
+	FADDP( ST0, ST(5) )		/* F1 F2 F6 F5 F4 */
+	FADDP( ST0, ST(3) )		/* F2 F6 F5 F4 */
+	FADDP( ST0, ST(1) )		/* F6 F5 F4 */
+
+	MOV_L( SRC3, EBX )
+
+	FXCH( ST(2) )			/* F4 F5 F6 */
+	FSTP_S( DST0 )		/* F5 F6 */
+	FSTP_S( DST1 )		/* F6 */
+	FSTP_S( DST2 )		/* */
+	MOV_L( EBX, DST3 )
+
+LLBL(x86_p4_3dr_skip):
+
+	ADD_L( CONST(16), EDI )
+	ADD_L( EAX, ESI )
+	CMP_L( ECX, EDI )
+	JNE( LLBL(x86_p4_3dr_loop) )
+
+LLBL(x86_p4_3dr_done):
+
+	POP_L( EBX )
+	POP_L( EDI )
+	POP_L( ESI )
+	RET
+#undef FRAME_OFFSET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME(_mesa_x86_transform_points4_3d_no_rot)
+GLNAME(_mesa_x86_transform_points4_3d_no_rot):
+
+#define FRAME_OFFSET 12
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+	PUSH_L( EBX )
+
+	MOV_L( ARG_SOURCE, ESI )
+	MOV_L( ARG_DEST, EDI )
+
+	MOV_L( ARG_MATRIX, EDX )
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )
+
+	TEST_L( ECX, ECX )
+	JZ( LLBL(x86_p4_3dnrr_done) )
+
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )
+	OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) )
+
+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )
+	MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) )
+
+	SHL_L( CONST(4), ECX )
+	MOV_L( REGOFF(V4F_START, ESI), ESI )
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI )
+	ADD_L( EDI, ECX )
+
+ALIGNTEXT16
+LLBL(x86_p4_3dnrr_loop):
+
+	FLD_S( SRC0 )			/* F4 */
+	FMUL_S( MAT0 )
+
+	FLD_S( SRC1 )			/* F5 F4 */
+	FMUL_S( MAT5 )
+
+	FLD_S( SRC2 )			/* F6 F5 F4 */
+	FMUL_S( MAT10 )
+
+	FLD_S( SRC3 )			/* F0 F6 F5 F4 */
+	FMUL_S( MAT12 )
+	FLD_S( SRC3 )			/* F1 F0 F6 F5 F4 */
+	FMUL_S( MAT13 )
+	FLD_S( SRC3 )			/* F2 F1 F0 F6 F5 F4 */
+	FMUL_S( MAT14 )
+
+	FXCH( ST(2) )			/* F0 F1 F2 F6 F5 F4 */
+	FADDP( ST0, ST(5) )		/* F1 F2 F6 F5 F4 */
+	FADDP( ST0, ST(3) )		/* F2 F6 F5 F4 */
+	FADDP( ST0, ST(1) )		/* F6 F5 F4 */
+
+	MOV_L( SRC3, EBX )
+
+	FXCH( ST(2) )			/* F4 F5 F6 */
+	FSTP_S( DST0   )		/* F5 F6 */
+	FSTP_S( DST1   )		/* F6 */
+	FSTP_S( DST2   )		/* */
+	MOV_L( EBX, DST3 )
+
+LLBL(x86_p4_3dnrr_skip):
+
+	ADD_L( CONST(16), EDI )
+	ADD_L( EAX, ESI )
+	CMP_L( ECX, EDI )
+	JNE( LLBL(x86_p4_3dnrr_loop) )
+
+LLBL(x86_p4_3dnrr_done):
+
+	POP_L( EBX )
+	POP_L( EDI )
+	POP_L( ESI )
+	RET
+#undef FRAME_OFFSET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_x86_transform_points4_2d )
+GLNAME( _mesa_x86_transform_points4_2d ):
+
+#define FRAME_OFFSET 16
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+	PUSH_L( EBX )
+	PUSH_L( EBP )
+
+	MOV_L( ARG_SOURCE, ESI )
+	MOV_L( ARG_DEST, EDI )
+
+	MOV_L( ARG_MATRIX, EDX )
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )
+
+	TEST_L( ECX, ECX )
+	JZ( LLBL(x86_p4_2dr_done) )
+
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )
+	OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) )
+
+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )
+	MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) )
+
+	SHL_L( CONST(4), ECX )
+	MOV_L( REGOFF(V4F_START, ESI), ESI )
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI )
+	ADD_L( EDI, ECX )
+
+ALIGNTEXT16
+LLBL(x86_p4_2dr_loop):
+
+	FLD_S( SRC0 )			/* F4 */
+	FMUL_S( MAT0 )
+	FLD_S( SRC0 )			/* F5 F4 */
+	FMUL_S( MAT1 )
+
+	FLD_S( SRC1 )			/* F0 F5 F4 */
+	FMUL_S( MAT4 )
+	FLD_S( SRC1 )			/* F1 F0 F5 F4 */
+	FMUL_S( MAT5 )
+
+	FXCH( ST(1) )			/* F0 F1 F5 F4 */
+	FADDP( ST0, ST(3) )		/* F1 F5 F4 */
+	FADDP( ST0, ST(1) )		/* F5 F4 */
+
+	FLD_S( SRC3 )			/* F0 F5 F4 */
+	FMUL_S( MAT12 )
+	FLD_S( SRC3 )			/* F1 F0 F5 F4 */
+	FMUL_S( MAT13 )
+
+	FXCH( ST(1) )			/* F0 F1 F5 F4 */
+	FADDP( ST0, ST(3) )		/* F1 F5 F4 */
+	FADDP( ST0, ST(1) )		/* F5 F4 */
+
+	MOV_L( SRC2, EBX )
+	MOV_L( SRC3, EBP )
+
+	FXCH( ST(1) )			/* F4 F5 */
+	FSTP_S( DST0 )		/* F5 */
+	FSTP_S( DST1 )		/* */
+	MOV_L( EBX, DST2 )
+	MOV_L( EBP, DST3 )
+
+LLBL(x86_p4_2dr_skip):
+
+	ADD_L( CONST(16), EDI )
+	ADD_L( EAX, ESI )
+	CMP_L( ECX, EDI )
+	JNE( LLBL(x86_p4_2dr_loop) )
+
+LLBL(x86_p4_2dr_done):
+
+	POP_L( EBP )
+	POP_L( EBX )
+	POP_L( EDI )
+	POP_L( ESI )
+	RET
+#undef FRAME_OFFSET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_x86_transform_points4_2d_no_rot )
+GLNAME( _mesa_x86_transform_points4_2d_no_rot ):
+
+#define FRAME_OFFSET 16
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+	PUSH_L( EBX )
+	PUSH_L( EBP )
+
+	MOV_L( ARG_SOURCE, ESI )
+	MOV_L( ARG_DEST, EDI )
+
+	MOV_L( ARG_MATRIX, EDX )
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )
+
+	TEST_L( ECX, ECX )
+	JZ( LLBL(x86_p4_2dnrr_done) )
+
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )
+	OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) )
+
+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )
+	MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) )
+
+	SHL_L( CONST(4), ECX )
+	MOV_L( REGOFF(V4F_START, ESI), ESI )
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI )
+	ADD_L( EDI, ECX )
+
+ALIGNTEXT16
+LLBL(x86_p4_2dnrr_loop):
+
+	FLD_S( SRC0 )			/* F4 */
+	FMUL_S( MAT0 )
+
+	FLD_S( SRC1 )			/* F5 F4 */
+	FMUL_S( MAT5 )
+
+	FLD_S( SRC3 )			/* F0 F5 F4 */
+	FMUL_S( MAT12 )
+	FLD_S( SRC3 )			/* F1 F0 F5 F4 */
+	FMUL_S( MAT13 )
+
+	FXCH( ST(1) )			/* F0 F1 F5 F4 */
+	FADDP( ST0, ST(3) )		/* F1 F5 F4 */
+	FADDP( ST0, ST(1) )		/* F5 F4 */
+
+	MOV_L( SRC2, EBX )
+	MOV_L( SRC3, EBP )
+
+	FXCH( ST(1) )			/* F4 F5 */
+	FSTP_S( DST0   )		/* F5 */
+	FSTP_S( DST1   )		/* */
+	MOV_L( EBX, DST2 )
+	MOV_L( EBP, DST3 )
+
+LLBL(x86_p4_2dnrr_skip):
+
+	ADD_L( CONST(16), EDI )
+	ADD_L( EAX, ESI )
+	CMP_L( ECX, EDI )
+	JNE( LLBL(x86_p4_2dnrr_loop) )
+
+LLBL(x86_p4_2dnrr_done):
+
+	POP_L( EBP )
+	POP_L( EBX )
+	POP_L( EDI )
+	POP_L( ESI )
+	RET
+#undef FRAME_OFFSET
+
+
+
+
+ALIGNTEXT16
+GLOBL GLNAME( _mesa_x86_transform_points4_identity )
+GLNAME( _mesa_x86_transform_points4_identity ):
+
+#define FRAME_OFFSET 12
+	PUSH_L( ESI )
+	PUSH_L( EDI )
+	PUSH_L( EBX )
+
+	MOV_L( ARG_SOURCE, ESI )
+	MOV_L( ARG_DEST, EDI )
+
+	MOV_L( ARG_MATRIX, EDX )
+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )
+
+	TEST_L( ECX, ECX )
+	JZ( LLBL(x86_p4_ir_done) )
+
+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )
+	OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) )
+
+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )
+	MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) )
+
+	SHL_L( CONST(4), ECX )
+	MOV_L( REGOFF(V4F_START, ESI), ESI )
+
+	MOV_L( REGOFF(V4F_START, EDI), EDI )
+	ADD_L( EDI, ECX )
+
+	CMP_L( ESI, EDI )
+	JE( LLBL(x86_p4_ir_done) )
+
+ALIGNTEXT16
+LLBL(x86_p4_ir_loop):
+
+	MOV_L( SRC0, EBX )
+	MOV_L( SRC1, EDX )
+
+	MOV_L( EBX, DST0 )
+	MOV_L( EDX, DST1 )
+
+	MOV_L( SRC2, EBX )
+	MOV_L( SRC3, EDX )
+
+	MOV_L( EBX, DST2 )
+	MOV_L( EDX, DST3 )
+
+LLBL(x86_p4_ir_skip):
+
+	ADD_L( CONST(16), EDI )
+	ADD_L( EAX, ESI )
+	CMP_L( ECX, EDI )
+	JNE( LLBL(x86_p4_ir_loop) )
+
+LLBL(x86_p4_ir_done):
+
+	POP_L( EBX )
+	POP_L( EDI )
+	POP_L( ESI )
+	RET
diff --git a/reactos/lib/mesa32/src/x86/xform_args.h b/reactos/lib/mesa32/src/x86/xform_args.h
new file mode 100644
index 00000000000..0f3c069700b
--- /dev/null
+++ b/reactos/lib/mesa32/src/x86/xform_args.h
@@ -0,0 +1,52 @@
+/* $Id: xform_args.h,v 1.1 2004/07/16 22:12:43 blight Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * Transform function interface for assembly code.  Simply define
+ * FRAME_OFFSET to the number of bytes pushed onto the stack before
+ * using the ARG_* argument macros.
+ *
+ * Gareth Hughes
+ */
+
+#ifndef __XFORM_ARGS_H__
+#define __XFORM_ARGS_H__
+
+/* Offsets for transform_func arguments
+ *
+ * typedef void (*transform_func)( GLvector4f *to_vec,
+ *				   const GLfloat m[16],
+ *				   const GLvector4f *from_vec );
+ */
+#define OFFSET_DEST	4
+#define OFFSET_MATRIX	8
+#define OFFSET_SOURCE	12
+
+#define ARG_DEST	REGOFF(FRAME_OFFSET+OFFSET_DEST, ESP)
+#define ARG_MATRIX 	REGOFF(FRAME_OFFSET+OFFSET_MATRIX, ESP)
+#define ARG_SOURCE 	REGOFF(FRAME_OFFSET+OFFSET_SOURCE, ESP)
+
+#endif

From 9be76f0f198932311c3c69f7fcbc362cea4bebf3 Mon Sep 17 00:00:00 2001
From: Steven Edwards <winehacker@gmail.com>
Date: Fri, 16 Jul 2004 22:24:24 +0000
Subject: [PATCH 316/356] added Spanish translation by Carlos Garcia Gomez.

svn path=/trunk/; revision=10150
---
 reactos/subsys/system/welcome/Es.rc      | 134 +++++++++++++++++++++++
 reactos/subsys/system/welcome/welcome.rc |   3 +-
 2 files changed, 136 insertions(+), 1 deletion(-)
 create mode 100644 reactos/subsys/system/welcome/Es.rc

diff --git a/reactos/subsys/system/welcome/Es.rc b/reactos/subsys/system/welcome/Es.rc
new file mode 100644
index 00000000000..437610b6312
--- /dev/null
+++ b/reactos/subsys/system/welcome/Es.rc
@@ -0,0 +1,134 @@
+#include <defines.h>
+#include <reactos/resource.h>
+#include "resource.h"
+
+LANGUAGE LANG_SPANISH, SUBLANG_SPANISH
+
+VS_VERSION_INFO VERSIONINFO
+	FILEVERSION	
+RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD
+	PRODUCTVERSION	
+RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD	
+	FILEFLAGSMASK	0x3fL
+#ifdef _DEBUG
+	FILEFLAGS	0x1L
+#else
+	FILEFLAGS	0x0L
+#endif
+	FILEOS		0x40004L
+	FILETYPE	0x2L
+	FILESUBTYPE	0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName",	RES_STR_COMPANY_NAME
+            VALUE "FileDescription",	"ReactOS-Welcome\0"
+            VALUE "FileVersion",	RES_STR_FILE_VERSION
+            VALUE "InternalName",	"welcome\0"
+            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
+            VALUE "OriginalFilename",	"welcome.exe\0"
+            VALUE "ProductName",	RES_STR_PRODUCT_NAME
+            VALUE "ProductVersion",	RES_STR_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+/* Icons */
+IDI_MAIN                ICON  "res/welcome.ico"
+
+/* Bitmaps */
+IDB_TITLEBITMAP         BITMAP  DISCARDABLE     "res/title.bmp"
+//IDB_DEFAULTTOPICBITMAP  BITMAP  DISCARDABLE     "res/default.bmp"
+
+//IDB_TOPICBITMAP0        BITMAP  DISCARDABLE     "res/topic0.bmp"
+//IDB_TOPICBITMAP1        BITMAP  DISCARDABLE     "res/topic1.bmp"
+//IDB_TOPICBITMAP2        BITMAP  DISCARDABLE     "res/topic2.bmp"
+//IDB_TOPICBITMAP3        BITMAP  DISCARDABLE     "res/topic3.bmp"
+//IDB_TOPICBITMAP4        BITMAP  DISCARDABLE     "res/topic4.bmp"
+//IDB_TOPICBITMAP5        BITMAP  DISCARDABLE     "res/topic5.bmp"
+//IDB_TOPICBITMAP6        BITMAP  DISCARDABLE     "res/topic6.bmp"
+//IDB_TOPICBITMAP7        BITMAP  DISCARDABLE     "res/topic7.bmp"
+//IDB_TOPICBITMAP8        BITMAP  DISCARDABLE     "res/topic8.bmp"
+//IDB_TOPICBITMAP9        BITMAP  DISCARDABLE     "res/topic9.bmp"
+
+
+/* String Tables */
+
+/* Default settings */
+STRINGTABLE DISCARDABLE 
+BEGIN
+    IDS_APPTITLE            "ReactOS - Bienvenido"
+    IDS_DEFAULTTOPICTITLE   "ReactOS"
+    IDS_DEFAULTTOPICDESC    "Bienvenido al Sistema Operativo React.\n\nHaz Click en una opcion a la izquierda."
+//    IDS_CHECKTEXT           "Mostrar este dialogo otra vez"
+//    IDS_CLOSETEXT           "Salir"
+END
+
+/* Topic buttons */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_TOPICBUTTON0        "Instalar ReactOS"
+    IDS_TOPICBUTTON1        "Explorar este CD"
+    IDS_TOPICBUTTON2        "Salir"
+//    IDS_TOPICBUTTON3        "Empty Topic 3"
+//    IDS_TOPICBUTTON4        "Empty Topic 4"
+//    IDS_TOPICBUTTON5        "Empty Topic 5"
+//    IDS_TOPICBUTTON6        "Empty Topic 6"
+//    IDS_TOPICBUTTON7        "Empty Topic 7"
+//    IDS_TOPICBUTTON8        "Empty Topic 8"
+//    IDS_TOPICBUTTON9        "Empty Topic 9"
+END
+
+/* Topic titles */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_TOPICTITLE0         "Instalar ReactOS"
+    IDS_TOPICTITLE1         "Explorar este CD"
+    IDS_TOPICTITLE2         "Salir"
+//    IDS_TOPICTITLE3         "Empty Topic Title 3"
+//    IDS_TOPICTITLE4         "Empty Topic Title 4"
+//    IDS_TOPICTITLE5         "Empty Topic Title 5"
+//    IDS_TOPICTITLE6         "Empty Topic Title 6"
+//    IDS_TOPICTITLE7         "Empty Topic Title 7"
+//    IDS_TOPICTITLE8         "Empty Topic Title 8"
+//    IDS_TOPICTITLE9         "Empty Topic Title 9"
+END
+
+/* Topic descriptions */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_TOPICDESC0          "Crear una nueva instalacion de ReactOS en su PC o actualizar una instalacion existente."
+    IDS_TOPICDESC1          "Explorar este CD."
+    IDS_TOPICDESC2          "Haz Click para salir de esta aplicacion."
+//    IDS_TOPICDESC3          "Topic description 3.\n\nDescribe topic 3 here."
+//    IDS_TOPICDESC4          "Topic description 4.\n\nDescribe topic 4 here."
+//    IDS_TOPICDESC5          "Topic description 5.\n\nDescribe topic 5 here."
+//    IDS_TOPICDESC6          "Topic description 6.\n\nDescribe topic 6 here."
+//    IDS_TOPICDESC7          "Topic description 7.\n\nDescribe topic 7 here."
+//    IDS_TOPICDESC8          "Topic description 8.\n\nDescribe topic 8 here."
+//    IDS_TOPICDESC9          "Topic description 9.\n\nDescribe topic 9 here."
+END
+
+/* Topic actions */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_TOPICACTION0        "setup.exe"
+    IDS_TOPICACTION1        "explorer.exe"
+    IDS_TOPICACTION2        "<exit>"  /* this quits the app */
+//    IDS_TOPICACTION3        "..."
+//    IDS_TOPICACTION4        "..."
+//    IDS_TOPICACTION5        "..."
+//    IDS_TOPICACTION6        "..."
+//    IDS_TOPICACTION7        "..."
+//    IDS_TOPICACTION8        "..."
+//    IDS_TOPICACTION9        "..."
+END
+
+/* EOF */
+
diff --git a/reactos/subsys/system/welcome/welcome.rc b/reactos/subsys/system/welcome/welcome.rc
index 5e103a4a06c..02794035904 100755
--- a/reactos/subsys/system/welcome/welcome.rc
+++ b/reactos/subsys/system/welcome/welcome.rc
@@ -2,6 +2,8 @@
 #include <reactos/resource.h>
 #include "resource.h"
 
+#include "Es.rc"
+
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 VS_VERSION_INFO VERSIONINFO
@@ -127,5 +129,4 @@ BEGIN
 //    IDS_TOPICACTION8        "..."
 //    IDS_TOPICACTION9        "..."
 END
-
 /* EOF */

From 46de716b21678d4b68124786852d2bac8dc7bcaf Mon Sep 17 00:00:00 2001
From: Gregor Anich <blight@blight.eu.org>
Date: Fri, 16 Jul 2004 22:32:04 +0000
Subject: [PATCH 317/356] Import Mesa-6.0.1 for use as software OpenGL
 renderer.

svn path=/trunk/; revision=10151
---
 reactos/lib/mesa32/src/drivers/ggi/ggimesa.c  | 646 ++++++++++++++++++
 .../mesa32/src/drivers/ggi/ggimesa.conf.in    |  13 +
 2 files changed, 659 insertions(+)
 create mode 100644 reactos/lib/mesa32/src/drivers/ggi/ggimesa.c
 create mode 100644 reactos/lib/mesa32/src/drivers/ggi/ggimesa.conf.in

diff --git a/reactos/lib/mesa32/src/drivers/ggi/ggimesa.c b/reactos/lib/mesa32/src/drivers/ggi/ggimesa.c
new file mode 100644
index 00000000000..8825c47162a
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/ggi/ggimesa.c
@@ -0,0 +1,646 @@
+/* GGI-Driver for MESA
+ * 
+ * Copyright (C) 1997-1998  Uwe Maurer  -  uwe_maurer@t-online.de 
+ *                    2002  Filip Spacek
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * ---------------------------------------------------------------------
+ * This code was derived from the following source of information:
+ *
+ * svgamesa.c and ddsample.c by Brian Paul
+ * 
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "conf.h"
+#endif
+
+#include <ggi/mesa/ggimesa_int.h>
+#include <ggi/mesa/debug.h>
+#include "extensions.h"
+#include "colormac.h"
+#include "imports.h"
+#include "matrix.h"
+#include "swrast/swrast.h"
+#include "swrast_setup/swrast_setup.h"
+#include "tnl/tnl.h"
+#include "tnl/t_context.h"
+#include "tnl/t_pipeline.h"
+#include "array_cache/acache.h"
+#include "teximage.h"
+#include "texformat.h"
+#include "texstore.h"
+
+ggi_extid ggiMesaID = -1;
+static int _ggimesaLibIsUp = 0;
+static void *_ggimesaConfigHandle;
+
+static char ggimesaconffile[] = GGIMESACONFFILE;
+
+int _ggimesaDebugSync = 0;
+uint32 _ggimesaDebugState = 0;
+
+static void gl_ggiUpdateState(GLcontext *ctx, GLuint new_state);
+static int changed(ggi_visual_t vis, int whatchanged);
+
+
+static int _ggi_error(void)
+{
+	GGIMESADPRINT_CORE("_ggi_error() called\n");
+	
+	return -1;
+}
+
+static void gl_ggiGetSize(GLframebuffer *fb, GLuint *width, GLuint *height)
+{
+	/* FIXME: this is a hack to work around the new interface */
+	GLcontext *ctx;
+	ggi_mesa_context_t ggi_ctx;
+	ctx = _mesa_get_current_context();
+	ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	
+	GGIMESADPRINT_CORE("gl_ggiGetSize() called\n");
+	
+	*width = LIBGGI_MODE(ggi_ctx->ggi_visual)->visible.x; 
+	*height = LIBGGI_MODE(ggi_ctx->ggi_visual)->visible.y;
+	printf("returning %d, %d\n", *width, *height);
+}
+
+static void gl_ggiSetIndex(GLcontext *ctx, GLuint ci)
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	
+	GGIMESADPRINT_CORE("gl_ggiSetIndex() called\n");
+	
+	ggiSetGCForeground(ggi_ctx->ggi_visual, ci);
+	ggi_ctx->color = (ggi_pixel)ci;
+}
+
+static void gl_ggiSetClearIndex(GLcontext *ctx, GLuint ci)
+{	
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	
+	GGIMESADPRINT_CORE("gl_ggiSetClearIndex() called\n");
+	
+	ggiSetGCForeground(ggi_ctx->ggi_visual, ci);
+	ggi_ctx->clearcolor = (ggi_pixel)ci;
+}
+
+static void gl_ggiSetClearColor(GLcontext *ctx, const GLfloat color[4])
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	ggi_color rgb;
+	ggi_pixel col;
+	GLubyte byteColor[3];
+
+	GGIMESADPRINT_CORE("gl_ggiSetClearColor() called\n");
+	
+	CLAMPED_FLOAT_TO_UBYTE(byteColor[0], color[0]);
+	CLAMPED_FLOAT_TO_UBYTE(byteColor[1], color[1]);
+	CLAMPED_FLOAT_TO_UBYTE(byteColor[2], color[2]);
+
+	rgb.r = (uint16)byteColor[0] << SHIFT;
+	rgb.g = (uint16)byteColor[1] << SHIFT;
+	rgb.b = (uint16)byteColor[2] << SHIFT;
+	col = ggiMapColor(ggi_ctx->ggi_visual, &rgb);
+	ggiSetGCForeground(ggi_ctx->ggi_visual, col);
+	ggi_ctx->clearcolor = col;
+}
+
+static void gl_ggiClear(GLcontext *ctx, GLbitfield mask, GLboolean all,
+			GLint x, GLint y, GLint width, GLint height)
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	
+	GGIMESADPRINT_CORE("gl_ggiClear() called\n");
+
+	if (mask & (DD_FRONT_LEFT_BIT | DD_BACK_LEFT_BIT)) 
+	{
+		ggiSetGCForeground(ggi_ctx->ggi_visual, ggi_ctx->clearcolor);
+
+		if (all)
+		{
+			int w, h;
+			w = LIBGGI_MODE(ggi_ctx->ggi_visual)->visible.x;
+			h = LIBGGI_MODE(ggi_ctx->ggi_visual)->visible.y;
+			ggiDrawBox(ggi_ctx->ggi_visual, 0, 0, w, h);
+		}
+		else
+		{
+			ggiDrawBox(ggi_ctx->ggi_visual, x, y, //FLIP(y),
+				   width, height);
+		}
+		ggiSetGCForeground(ggi_ctx->ggi_visual, ggi_ctx->color);
+
+		mask &= ~(DD_FRONT_LEFT_BIT | DD_BACK_LEFT_BIT);
+	}
+	_swrast_Clear(ctx, mask, all, x, y, width, height);
+	
+}
+
+
+/* Set the buffer used for reading */
+/* XXX support for separate read/draw buffers hasn't been tested */
+static GLboolean gl_ggiSetBuffer(GLcontext *ctx, GLframebuffer *buffer, GLuint bufferBit)
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	
+	printf("set read %d\n", bufferBit);
+	GGIMESADPRINT_CORE("gl_ggiSetBuffer() called\n");
+
+	if (bufferBit == FRONT_LEFT_BIT) 
+	{
+		ggiSetReadFrame(ggi_ctx->ggi_visual,
+				ggiGetDisplayFrame(ggi_ctx->ggi_visual));
+		ggiSetWriteFrame(ggi_ctx->ggi_visual,
+				 ggiGetDisplayFrame(ggi_ctx->ggi_visual));
+		return GL_TRUE;
+	}
+	else if (bufferBit == BACK_LEFT_BIT)
+	{
+		ggiSetReadFrame(ggi_ctx->ggi_visual,
+				ggiGetDisplayFrame(ggi_ctx->ggi_visual)?0 : 1);
+		ggiSetWriteFrame(ggi_ctx->ggi_visual,
+				 ggiGetDisplayFrame(ggi_ctx->ggi_visual)?0 : 1);
+		return GL_TRUE;
+	}
+	else
+		return GL_FALSE;
+}
+
+
+static const GLubyte * gl_ggiGetString(GLcontext *ctx, GLenum name)
+{
+	GGIMESADPRINT_CORE("gl_ggiGetString() called\n");
+	
+	if (name == GL_RENDERER)
+        	return (GLubyte *) "Mesa GGI";
+	else
+		return NULL;
+}
+
+static void gl_ggiFlush(GLcontext *ctx)
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+
+	GGIMESADPRINT_CORE("gl_ggiFlush() called\n");
+	
+	ggiFlush(ggi_ctx->ggi_visual);
+}
+
+static void gl_ggiIndexMask(GLcontext *ctx, GLuint mask)
+{
+	GGIMESADPRINT_CORE("gl_ggiIndexMask() called\n");
+}
+
+static void gl_ggiColorMask(GLcontext *ctx, GLboolean rmask, GLboolean gmask,
+			    GLboolean bmask, GLboolean amask)
+{
+	GGIMESADPRINT_CORE("gl_ggiColorMask() called\n");
+}
+
+static void gl_ggiEnable(GLcontext *ctx, GLenum pname, GLboolean state)
+{
+	GGIMESADPRINT_CORE("gl_ggiEnable() called\n");
+}
+
+static void gl_ggiSetupPointers(GLcontext *ctx)
+{
+	TNLcontext *tnl;
+  
+	GGIMESADPRINT_CORE("gl_ggiSetupPointers() called\n");
+
+	/* General information */
+	ctx->Driver.GetString = gl_ggiGetString;
+	ctx->Driver.GetBufferSize = gl_ggiGetSize;
+	ctx->Driver.Finish = gl_ggiFlush;
+	ctx->Driver.Flush = gl_ggiFlush;
+	
+	/* Software rasterizer pixel paths */
+	ctx->Driver.Accum = _swrast_Accum;
+	ctx->Driver.Bitmap = _swrast_Bitmap;
+	ctx->Driver.Clear = gl_ggiClear;
+	ctx->Driver.ResizeBuffers = _swrast_alloc_buffers;
+	ctx->Driver.CopyPixels = _swrast_CopyPixels;
+	ctx->Driver.DrawPixels = _swrast_DrawPixels;
+	ctx->Driver.ReadPixels = _swrast_ReadPixels;
+        ctx->Driver.DrawBuffer = _swrast_DrawBuffer;
+
+	/* Software texturing */
+	ctx->Driver.ChooseTextureFormat = _mesa_choose_tex_format;
+	ctx->Driver.TexImage1D = _mesa_store_teximage1d;
+	ctx->Driver.TexImage2D = _mesa_store_teximage2d;
+	ctx->Driver.TexImage3D = _mesa_store_teximage3d;
+	ctx->Driver.TexSubImage1D = _mesa_store_texsubimage1d;
+	ctx->Driver.TexSubImage2D = _mesa_store_texsubimage2d;
+	ctx->Driver.TexSubImage3D = _mesa_store_texsubimage3d;
+	ctx->Driver.TestProxyTexImage = _mesa_test_proxy_teximage;
+
+        ctx->Driver.CompressedTexImage1D = _mesa_store_compressed_teximage1d;
+        ctx->Driver.CompressedTexImage2D = _mesa_store_compressed_teximage2d;
+        ctx->Driver.CompressedTexImage3D = _mesa_store_compressed_teximage3d;
+        ctx->Driver.CompressedTexSubImage1D = _mesa_store_compressed_texsubimage1d;
+        ctx->Driver.CompressedTexSubImage2D = _mesa_store_compressed_texsubimage2d;
+        ctx->Driver.CompressedTexSubImage3D = _mesa_store_compressed_texsubimage3d;
+
+	ctx->Driver.CopyTexImage1D = _swrast_copy_teximage1d;
+	ctx->Driver.CopyTexImage2D = _swrast_copy_teximage2d;
+	ctx->Driver.CopyTexSubImage1D = _swrast_copy_texsubimage1d;
+	ctx->Driver.CopyTexSubImage2D = _swrast_copy_texsubimage2d;
+	ctx->Driver.CopyTexSubImage3D = _swrast_copy_texsubimage3d;
+
+	/* Imaging extensions */
+	ctx->Driver.CopyColorTable = _swrast_CopyColorTable;
+	ctx->Driver.CopyColorSubTable = _swrast_CopyColorSubTable;
+	ctx->Driver.CopyConvolutionFilter1D = _swrast_CopyConvolutionFilter1D;
+	ctx->Driver.CopyConvolutionFilter2D = _swrast_CopyConvolutionFilter2D;
+	
+	/* State change callbacks */
+	ctx->Driver.ClearIndex = gl_ggiSetClearIndex; 
+	ctx->Driver.ClearColor = gl_ggiSetClearColor;
+	ctx->Driver.IndexMask = gl_ggiIndexMask;
+	ctx->Driver.ColorMask = gl_ggiColorMask;
+	ctx->Driver.Enable = gl_ggiEnable;
+	
+	ctx->Driver.UpdateState = gl_ggiUpdateState;
+
+	/* Initialize TNL driver interface */
+	tnl = TNL_CONTEXT(ctx);
+	tnl->Driver.RunPipeline = _tnl_run_pipeline;
+	
+	/* Install setup for tnl */
+	_swsetup_Wakeup(ctx);
+}
+
+static void get_mode_info(ggi_visual_t vis, int *r, int *g, int *b,
+			  GLboolean *rgb, GLboolean *db, int *ci)
+{
+	unsigned int i;
+	
+	*r = 0;
+	*g = 0;
+	*b = 0;
+
+	for(i = 0; i < sizeof(ggi_pixel)*8; ++i){
+		int mask = 1 << i;
+		if(LIBGGI_PIXFMT(vis)->red_mask & mask)
+			++(*r);
+		if(LIBGGI_PIXFMT(vis)->green_mask & mask)
+			++(*g);
+		if(LIBGGI_PIXFMT(vis)->blue_mask & mask)
+			++(*b);
+	}
+
+	*rgb = GT_SCHEME(LIBGGI_MODE(vis)->graphtype) == GT_TRUECOLOR;
+	*db = LIBGGI_MODE(vis)->frames > 1;
+	*ci = GT_SIZE(LIBGGI_MODE(vis)->graphtype);
+
+	printf("rgb (%d, %d, %d) db %d, rgb %d ci %d\n",*r,*g,*b,*db,*rgb,*ci);
+}
+	
+int ggiMesaInit()
+{
+	int err;
+	char *str;
+	
+	GGIMESADPRINT_CORE("ggiMesaInit() called\n");
+	
+        str = getenv("GGIMESA_DEBUG");
+	if (str != NULL) {
+		_ggimesaDebugState = atoi(str);
+		GGIMESADPRINT_CORE("Debugging=%d\n", _ggimesaDebugState);
+	}
+	
+	str = getenv("GGIMESA_DEBUGSYNC");
+	if (str != NULL) {
+		_ggimesaDebugSync = 1;
+	}
+	
+	GGIMESADPRINT_CORE("ggiMesaInit()\n");
+	
+	_ggimesaLibIsUp++;
+	if (_ggimesaLibIsUp > 1)
+		return 0; /* Initialize only at first call */
+	
+	err = ggLoadConfig(ggimesaconffile, &_ggimesaConfigHandle);
+	if (err != GGI_OK)
+	{
+		GGIMESADPRINT_CORE("GGIMesa: Couldn't open %s\n",
+				   ggimesaconffile);
+		_ggimesaLibIsUp--;
+		return err;
+	}
+	
+	ggiMesaID = ggiExtensionRegister("GGIMesa",
+					 sizeof(struct ggi_mesa_ext), changed);
+	
+	if (ggiMesaID < 0)
+	{
+		GGIMESADPRINT_CORE("GGIMesa: failed to register as extension\n");
+		_ggimesaLibIsUp--;
+		ggFreeConfig(_ggimesaConfigHandle);
+		return ggiMesaID;
+	}
+	
+	return 0;
+}
+
+int ggiMesaExit(void)
+{
+	int rc;
+	
+	GGIMESADPRINT_CORE("ggiMesaExit() called\n");
+	
+	if (!_ggimesaLibIsUp)
+		return -1;
+	
+	if (_ggimesaLibIsUp > 1)
+	{
+		/* Exit only at last call */
+		_ggimesaLibIsUp--;
+		return 0;
+	}
+	
+	rc = ggiExtensionUnregister(ggiMesaID);
+	ggFreeConfig(_ggimesaConfigHandle);
+	
+	_ggimesaLibIsUp = 0;
+	
+	return rc;
+}
+
+int ggiMesaAttach(ggi_visual_t vis)
+{
+	int rc;
+	
+	GGIMESADPRINT_CORE("ggiMesaAttach() called\n");
+	
+	rc = ggiExtensionAttach(vis, ggiMesaID);
+	if (rc == 0)
+	{
+		int r, g, b, ci;
+		GLboolean rgb, db;
+		GLvisual *gl_visual;
+		
+		/* We are creating the primary instance */
+		memset(LIBGGI_MESAEXT(vis), 0, sizeof(struct ggi_mesa_ext));
+		LIBGGI_MESAEXT(vis)->update_state = (void *)_ggi_error;
+		LIBGGI_MESAEXT(vis)->setup_driver = (void *)_ggi_error;
+
+		/* Initialize default mesa visual */
+		get_mode_info(vis, &r, &g, &b, &rgb, &db, &ci);
+		gl_visual = &(LIBGGI_MESAEXT(vis)->mesa_visual.gl_visual);
+		_mesa_initialize_visual(gl_visual,
+					rgb, db, 0 /* No stereo */,
+					r, g, b, 0 /* No alpha */, ci,
+					0 /* No depth */, 0 /* No stencil */,
+					0, 0, 0, 0 /* No accum */, 0);
+		
+		/* Now fake an "API change" so the right libs get loaded */
+		changed(vis, GGI_CHG_APILIST);
+	}
+	
+	return rc;
+}
+
+int ggiMesaDetach(ggi_visual_t vis)
+{
+	GGIMESADPRINT_CORE("ggiMesaDetach() called\n");
+	
+	return ggiExtensionDetach(vis, ggiMesaID);
+}
+ 
+int ggiMesaExtendVisual(ggi_visual_t vis, GLboolean alpha_flag,
+			GLboolean stereo_flag, GLint depth_size,
+			GLint stencil_size, GLint accum_red_size,
+			GLint accum_green_size, GLint accum_blue_size,
+			GLint accum_alpha_size, GLint num_samples)
+{
+        GLvisual *gl_vis = &(LIBGGI_MESAEXT(vis)->mesa_visual.gl_visual);
+	int r, g, b, ci;
+	GLboolean db, rgb;
+
+	get_mode_info(vis, &r, &g, &b, &rgb, &db, &ci);
+       
+	/* Initialize the visual with the provided information */	
+	_mesa_initialize_visual(gl_vis,
+				rgb, db, stereo_flag,
+				r, g, b, 0 /* FIXME */, ci,
+				depth_size, stencil_size,
+				accum_red_size, accum_green_size,
+				accum_blue_size, accum_alpha_size, 0);
+
+	/* Now fake an "API change" so the right libs get loaded. After all,
+	   extending the visual by all these new buffers could be considered
+	   a "mode change" which requires an "API change".
+	 */
+	changed(vis, GGI_CHG_APILIST);
+	
+	return 0;
+}
+
+
+ggi_mesa_context_t ggiMesaCreateContext(ggi_visual_t vis)
+{
+	ggi_mesa_context_t ctx;
+	int err;
+
+	GGIMESADPRINT_CORE("ggiMesaCreateContext() called\n");
+	
+	ctx = (ggi_mesa_context_t)malloc(sizeof(struct ggi_mesa_context));
+	if (!ctx) 
+		return NULL;
+	
+	ctx->ggi_visual = vis;
+	ctx->color = 0;
+
+	ctx->gl_ctx =
+	  _mesa_create_context(&(LIBGGI_MESAEXT(vis)->mesa_visual.gl_visual),
+			       NULL, (void *) ctx, GL_FALSE);
+	if (!ctx->gl_ctx)
+		goto free_context;
+	
+        _mesa_enable_sw_extensions(ctx->gl_ctx);
+	
+	_swrast_CreateContext(ctx->gl_ctx);
+	_ac_CreateContext(ctx->gl_ctx);
+	_tnl_CreateContext(ctx->gl_ctx);
+	_swsetup_CreateContext(ctx->gl_ctx);
+	
+	gl_ggiSetupPointers(ctx->gl_ctx);
+
+	/* Make sure that an appropriate sublib has been loaded */
+	if (!LIBGGI_MESAEXT(ctx->ggi_visual)->setup_driver){
+		GGIMESADPRINT_CORE("setup_driver==NULL!\n");
+		GGIMESADPRINT_CORE("Please check your config files!\n");
+		goto free_context;
+	}
+
+	/* Set up the sublib driver */
+	err = LIBGGI_MESAEXT(ctx->ggi_visual)->setup_driver(ctx);
+	if (err){
+		GGIMESADPRINT_CORE("setup_driver failed (err = %d)", err);
+		goto free_gl_context;
+	}
+
+	return ctx;
+	
+free_gl_context:
+	_mesa_destroy_context(ctx->gl_ctx);
+free_context:
+	free(ctx);
+	
+	return NULL;
+}
+
+void ggiMesaDestroyContext(ggi_mesa_context_t ctx)
+{
+	GGIMESADPRINT_CORE("ggiMesaDestroyContext() called\n");
+	
+	if(!ctx)
+		return;
+
+	_mesa_destroy_context(ctx->gl_ctx);
+	free(ctx);
+}
+
+void ggiMesaMakeCurrent(ggi_mesa_context_t ctx, ggi_visual_t vis)
+{
+	GGIMESADPRINT_CORE("ggiMesaMakeCurrent(ctx = %p) called\n", ctx);
+
+	/* FIXME: clean up where are ggi_vis */
+	if (ctx->ggi_visual != vis) {
+		GGIMESADPRINT_CORE("Cannot migrate GL contexts\n");
+		return;
+	}
+	
+	_mesa_make_current(ctx->gl_ctx, &LIBGGI_MESAEXT(vis)->mesa_buffer);
+	
+	if (ctx->gl_ctx->Viewport.Width == 0)
+	{
+		_mesa_Viewport(0, 0,
+			       LIBGGI_MODE(vis)->visible.x,
+			       LIBGGI_MODE(vis)->visible.y);
+		ctx->gl_ctx->Scissor.Width = LIBGGI_MODE(vis)->visible.x;
+		ctx->gl_ctx->Scissor.Height = LIBGGI_MODE(vis)->visible.y;
+	}
+}
+
+
+/*
+ * Swap front/back buffers for current context if double buffered.
+ */
+void ggiMesaSwapBuffers(void)
+{
+	GLcontext *ctx;
+	ggi_mesa_context_t ggi_ctx;
+	ctx = _mesa_get_current_context();
+	ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	
+	GGIMESADPRINT_CORE("ggiMesaSwapBuffers() called\n");	
+	
+	_mesa_notifySwapBuffers(ctx);
+	gl_ggiFlush(ctx);
+
+	ggiSetDisplayFrame(ggi_ctx->ggi_visual,
+			   !ggiGetDisplayFrame(ggi_ctx->ggi_visual));
+	ggiSetWriteFrame(ggi_ctx->ggi_visual,
+			 !ggiGetWriteFrame(ggi_ctx->ggi_visual));
+	ggiSetReadFrame(ggi_ctx->ggi_visual,
+			 !ggiGetReadFrame(ggi_ctx->ggi_visual));
+
+	GGIMESADPRINT_CORE("swap disp: %d, write %d\n",
+			   ggiGetDisplayFrame(ggi_ctx->ggi_visual),
+			   ggiGetWriteFrame(ggi_ctx->ggi_visual));
+}
+
+static void gl_ggiUpdateState(GLcontext *ctx, GLuint new_state)
+{
+	ggi_mesa_context_t ggi_ctx = (ggi_mesa_context_t)ctx->DriverCtx;
+	
+	GGIMESADPRINT_CORE("gl_ggiUpdateState() called\n");
+		
+	/* Propogate statechange information to swrast and swrast_setup
+	 * modules.  The GGI driver has no internal GL-dependent state.
+	 */
+	_swrast_InvalidateState(ctx, new_state);
+	_swsetup_InvalidateState(ctx, new_state);
+	_tnl_InvalidateState(ctx, new_state);
+	
+	if (!LIBGGI_MESAEXT(ggi_ctx->ggi_visual)->update_state) {
+		GGIMESADPRINT_CORE("update_state == NULL!\n");
+		GGIMESADPRINT_CORE("Please check your config files!\n");
+		ggiPanic("");
+	}
+
+	LIBGGI_MESAEXT(ggi_ctx->ggi_visual)->update_state(ggi_ctx);
+}
+
+static int changed(ggi_visual_t vis, int whatchanged)
+{
+	GLcontext *ctx;
+	ctx = _mesa_get_current_context();
+
+	GGIMESADPRINT_CORE("changed() called\n");
+		
+	switch (whatchanged)
+	{
+	case GGI_CHG_APILIST:
+	{
+		char api[256];
+		char args[256];
+		int i;
+		const char *fname;
+		ggi_dlhandle *lib;
+		GLvisual *gl_vis=&(LIBGGI_MESAEXT(vis)->mesa_visual.gl_visual);
+		GLframebuffer *gl_fb = &(LIBGGI_MESAEXT(vis)->mesa_buffer);
+		
+		/* Initialize the framebuffer to provide all necessary
+		   buffers in software. The target libraries that are loaded
+		   next are free to modify this according to their
+		   capabilities. 
+		 */
+		 /* FIXME: if the target changes capabilities we'll leak 
+		    swrast's memory !!! Need to deallocate first */
+		_mesa_initialize_framebuffer(gl_fb, gl_vis,
+					 gl_vis->depthBits > 0,
+					 gl_vis->stencilBits > 0,
+					 gl_vis->accumRedBits > 0,
+					 gl_vis->alphaBits > 0);
+
+		for (i = 0; ggiGetAPI(vis, i, api, args) == 0; i++)
+		{
+			strcat(api, "-mesa");
+			fname = ggMatchConfig(_ggimesaConfigHandle, api, NULL);
+			if (fname == NULL)
+			{
+				/* No special implementation for this sublib */
+				continue;
+			}
+			lib = ggiExtensionLoadDL(vis, fname, args, NULL,
+						 GGI_SYMNAME_PREFIX);
+		}
+
+		/* The targets have cleared everything they can do from 
+		   the framebuffer structure so we provide the rest in sw
+		 */
+		_swrast_alloc_buffers(gl_fb);
+		
+		break;
+	} 
+	}
+	return 0;
+}
+
diff --git a/reactos/lib/mesa32/src/drivers/ggi/ggimesa.conf.in b/reactos/lib/mesa32/src/drivers/ggi/ggimesa.conf.in
new file mode 100644
index 00000000000..72132334fd0
--- /dev/null
+++ b/reactos/lib/mesa32/src/drivers/ggi/ggimesa.conf.in
@@ -0,0 +1,13 @@
+# GGIMesa global configuration
+.root: @ggi_libdir@/ggi/mesa
+
+generic-stubs-mesa		default/stubs.so
+generic-linear-8-mesa		default/linear_8.so
+generic-linear-15-mesa		default/linear_15.so
+generic-linear-16-mesa		default/linear_16.so
+generic-linear-24-mesa		default/linear_24.so
+generic-linear-32-mesa		default/linear_32.so
+
+display-fbdev-mesa		display/fbdev.so
+
+# .include @ggi_confdir@/ggi/mesa/targets/fbdev.conf

From 76b091d0f5f5d05c3982762042000fd1bafe957f Mon Sep 17 00:00:00 2001
From: Steven Edwards <winehacker@gmail.com>
Date: Fri, 16 Jul 2004 22:33:23 +0000
Subject: [PATCH 318/356] added Spanish translation by Carlos Garcia Gomez.

svn path=/trunk/; revision=10152
---
 reactos/subsys/system/vmwinst/Es.rc      | 133 +++++++++++++++++++++++
 reactos/subsys/system/vmwinst/vmwinst.rc |   3 +-
 2 files changed, 135 insertions(+), 1 deletion(-)
 create mode 100644 reactos/subsys/system/vmwinst/Es.rc

diff --git a/reactos/subsys/system/vmwinst/Es.rc b/reactos/subsys/system/vmwinst/Es.rc
new file mode 100644
index 00000000000..667942ef847
--- /dev/null
+++ b/reactos/subsys/system/vmwinst/Es.rc
@@ -0,0 +1,133 @@
+#include <defines.h>
+#include <reactos/resource.h>
+#include "vmwinst.h"
+
+LANGUAGE LANG_SPANISH, SUBLANG_SPANISH
+
+VS_VERSION_INFO VERSIONINFO
+	FILEVERSION	RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD
+	PRODUCTVERSION	RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD	
+	FILEFLAGSMASK	0x3fL
+#ifdef _DEBUG
+	FILEFLAGS	0x1L
+#else
+	FILEFLAGS	0x0L
+#endif
+	FILEOS		0x40004L
+	FILETYPE	0x2L
+	FILESUBTYPE	0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName",	RES_STR_COMPANY_NAME
+            VALUE "FileDescription",	"ReactOS VMware(r) driver installation utility\0"
+            VALUE "FileVersion",	RES_STR_FILE_VERSION
+            VALUE "InternalName",	"vmwinst\0"
+            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
+            VALUE "OriginalFilename",	"vmwinst.exe\0"
+            VALUE "ProductName",	RES_STR_PRODUCT_NAME
+            VALUE "ProductVersion",	RES_STR_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+IDD_WELCOMEPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Instalación del Controlador de Video"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+  LTEXT "El instalador de ReactOS ha detectado que husted está ejecutando ReactOS sobre el emulador VMware(r).\n\n\nSi husted desea instalar el controlador SVGA VMware(r), haga click en 'Siguiente', de lo contrario haga click en 'Cancelar'.",-1,25,25,225,85
+END
+
+IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Instalación del Controlador de Video"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+  LTEXT "El Instalador de ReactOS no viene con el controlador SVGA VMware(r).\n\nPor lo tanto vaya a 'VM' en la barra de menú de VMware(r) workstation y seleccione 'Install VMware(r) tools...'\n\nhaga click en 'Siguiente' para continuar o en 'Cancelar' para saltar la instalación del controlador SVGA.",-1,25,25,225,85
+END
+
+IDD_CONFIG DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Instalación del Controlador de Video"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+  LTEXT "El controlador SVGA VMware(r) ha sido instalado satisfactoriamente.\nPor favor elija su resolución de pantalla favorita:",-1,25,5,225,20
+  PUSHBUTTON "640x480", 540, 25, 30, 65, 15, BS_AUTORADIOBUTTON
+  PUSHBUTTON "800x600", 1400, 25, 45, 65, 15, BS_AUTORADIOBUTTON
+  PUSHBUTTON "1024x768", 1792, 25, 60, 65, 15, BS_AUTORADIOBUTTON
+  PUSHBUTTON "1152x864", 2016, 25, 75, 65, 15, BS_AUTORADIOBUTTON
+  PUSHBUTTON "1280x960", 2240, 110, 30, 65, 15, BS_AUTORADIOBUTTON
+  PUSHBUTTON "1280x1024", 2304, 110, 45, 65, 15, BS_AUTORADIOBUTTON
+  PUSHBUTTON "1400x1050", 2450, 110, 60, 65, 15, BS_AUTORADIOBUTTON
+  PUSHBUTTON "1600x1200", 2800, 110, 75, 65, 15, BS_AUTORADIOBUTTON
+  PUSHBUTTON "1792x1344", 3136, 195, 30, 65, 15, BS_AUTORADIOBUTTON
+  PUSHBUTTON "1856x1392", 3248, 195, 45, 65, 15, BS_AUTORADIOBUTTON
+  PUSHBUTTON "1920x1440", 3360, 195, 60, 50, 15, BS_AUTORADIOBUTTON
+  LTEXT "Por favor seleccione su calidad del color favorita:", -1, 25, 93, 225, 12
+  COMBOBOX IDC_COLORQUALITY, 25, 105, 75, 80, CBS_DROPDOWNLIST | WS_TABSTOP
+END
+
+IDD_INSTALLATION_FAILED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Instalación del Controlador de Video"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+  LTEXT "El instalador de ReactOS es incapaz de instalar el controlador SVGA VMware(R).\n\nHaga click en 'Finalizar' para continuar con el proceso de instalación.",-1,25,25,225,85
+END
+
+IDD_CHOOSEACTION DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Instalación del Controlador de Video"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+  LTEXT "El controlador SVGA VMware(r) está ya instalado.\n\nPor favor, seleccione que desea hacer:",-1,25,5,225,30
+  PUSHBUTTON "Configurar las opciones de pantalla", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON
+  PUSHBUTTON "Usar un controlador gráfico distinto", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON
+  PUSHBUTTON "Desinstalar el controlador SVGA VMware(r)", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON
+  LTEXT "Haga Click en 'Siguiente' para continuar o 'Cancelar' para salir del asistente.", -1, 25, 93, 225, 12
+END
+
+IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Instalación del Controlador de Video"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+  LTEXT "Por favor seleccione el controlador gráfico que desea usar:",-1,25,25,225,15
+  PUSHBUTTON "Controlador VGA de ReactOS", IDC_VGA, 25, 40, 225, 15, BS_AUTORADIOBUTTON
+  PUSHBUTTON "Controlador VBE de ReactOS (SVGA)", IDC_VBE, 25, 55, 225, 15, BS_AUTORADIOBUTTON
+  LTEXT "Haga click en 'Finalizar para completar la operación o 'Cancelar' para salir de la instalación sin cambios.", -1, 25, 93, 225, 20
+END
+
+IDD_DOUNINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Instalación del Controlador de Video"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+  LTEXT "El instalador de ReactOS va a proceder a desinstalar su controlador SVGA VMware(r)!!!\n\n\nHaga click en 'Finalizar' para desinstalar el controlador o 'Cancelar' para dejarlo como está.",-1,25,25,225,85
+END
+
+STRINGTABLE 
+BEGIN
+  IDS_WIZARD_NAME "VMware(r) detectado"
+  IDS_FAILEDTOLOCATEDRIVERS "El instalador de ReactOS no puede encontrar los archivos requeridos.\nPor favor asegúrese que el CD-ROM de VMware(r) tools está insertado."
+  IDS_FAILEDTOCOPYFILES "El instalador de ReactOS falló al copiar los archivos requeridos.\nPor favor asegúrese que el CD-ROM de VMware(r) tools está insertado.\n"
+  IDS_FAILEDTOACTIVATEDRIVER "Fallo al activar el controlador SVGA VMware(r)!"
+  IDS_FAILEDTOSELVGADRIVER "Fallo al activar el controlador VGA de ReactOS!"
+  IDS_FAILEDTOSELVBEDRIVER "Fallo al activar el controlador VBE de ReactOS!"
+  IDS_UNINSTNOTICE "Los archivos del controlador SVGA VMware(r) aun no han sido eliminados.\nPor favor elimínelos manualmente despues de reiniciar el sistema."
+END
+
+STRINGTABLE
+BEGIN
+  10001 "Baja (8BPP)"
+  10002 "Media (16BPP)"
+  10003 "Alta (32BPP)"
+END
+
diff --git a/reactos/subsys/system/vmwinst/vmwinst.rc b/reactos/subsys/system/vmwinst/vmwinst.rc
index dd80f3d6880..e5ff25752b5 100644
--- a/reactos/subsys/system/vmwinst/vmwinst.rc
+++ b/reactos/subsys/system/vmwinst/vmwinst.rc
@@ -2,6 +2,8 @@
 #include <reactos/resource.h>
 #include "vmwinst.h"
 
+#include "Es.rc"
+
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 VS_VERSION_INFO VERSIONINFO
@@ -130,4 +132,3 @@ BEGIN
   10002 "Medium (16BPP)"
   10003 "Highest (32BPP)"
 END
-

From 794c39610fc88e0614d560efe93f82b42639c5fc Mon Sep 17 00:00:00 2001
From: Gregor Anich <blight@blight.eu.org>
Date: Fri, 16 Jul 2004 22:45:08 +0000
Subject: [PATCH 319/356] Fix unknown pragma warnings.

svn path=/trunk/; revision=10154
---
 reactos/lib/mesa32/src/main/glheader.h | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/reactos/lib/mesa32/src/main/glheader.h b/reactos/lib/mesa32/src/main/glheader.h
index a75c65dd4aa..f2d896677b5 100644
--- a/reactos/lib/mesa32/src/main/glheader.h
+++ b/reactos/lib/mesa32/src/main/glheader.h
@@ -85,16 +85,18 @@
 #endif
 
 #if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__)) && !defined(BUILD_FOR_SNAP)
-#  pragma warning( disable : 4068 ) /* unknown pragma */
-#  pragma warning( disable : 4710 ) /* function 'foo' not inlined */
-#  pragma warning( disable : 4711 ) /* function 'foo' selected for automatic inline expansion */
-#  pragma warning( disable : 4127 ) /* conditional expression is constant */
-#  if defined(MESA_MINWARN)
-#    pragma warning( disable : 4244 ) /* '=' : conversion from 'const double ' to 'float ', possible loss of data */
-#    pragma warning( disable : 4018 ) /* '<' : signed/unsigned mismatch */
-#    pragma warning( disable : 4305 ) /* '=' : truncation from 'const double ' to 'float ' */
-#    pragma warning( disable : 4550 ) /* 'function' undefined; assuming extern returning int */
-#    pragma warning( disable : 4761 ) /* integral size mismatch in argument; conversion supplied */
+#  if !defined(__GNUC__)
+#    pragma warning( disable : 4068 ) /* unknown pragma */
+#    pragma warning( disable : 4710 ) /* function 'foo' not inlined */
+#    pragma warning( disable : 4711 ) /* function 'foo' selected for automatic inline expansion */
+#    pragma warning( disable : 4127 ) /* conditional expression is constant */
+#    if defined(MESA_MINWARN)
+#      pragma warning( disable : 4244 ) /* '=' : conversion from 'const double ' to 'float ', possible loss of data */
+#      pragma warning( disable : 4018 ) /* '<' : signed/unsigned mismatch */
+#      pragma warning( disable : 4305 ) /* '=' : truncation from 'const double ' to 'float ' */
+#      pragma warning( disable : 4550 ) /* 'function' undefined; assuming extern returning int */
+#      pragma warning( disable : 4761 ) /* integral size mismatch in argument; conversion supplied */
+#    endif
 #  endif
 #  if defined(_MSC_VER) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
 #    define GLAPI __declspec(dllexport)

From 6d2d63a8e13bdf33cdd11ae83d533c836c07afa0 Mon Sep 17 00:00:00 2001
From: Gregor Anich <blight@blight.eu.org>
Date: Fri, 16 Jul 2004 22:54:48 +0000
Subject: [PATCH 320/356] Fix unknown pragma warnings and gl.h include for
 linux builds.

svn path=/trunk/; revision=10155
---
 reactos/lib/mesa32/include/GL/wmesa.h | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/reactos/lib/mesa32/include/GL/wmesa.h b/reactos/lib/mesa32/include/GL/wmesa.h
index dc1ec89d2b1..5b6868526c2 100644
--- a/reactos/lib/mesa32/include/GL/wmesa.h
+++ b/reactos/lib/mesa32/include/GL/wmesa.h
@@ -50,17 +50,19 @@ extern "C" {
 #endif
 
 
-#include "gl\gl.h"
+#include "GL/gl.h"
 
-#pragma warning (disable:4273)
-#pragma warning( disable : 4244 ) /* '=' : conversion from 'const double ' to 'float ', possible loss of data */
-#pragma warning( disable : 4018 ) /* '<' : signed/unsigned mismatch */
-#pragma warning( disable : 4305 ) /* '=' : truncation from 'const double ' to 'float ' */
-#pragma warning( disable : 4013 ) /* 'function' undefined; assuming extern returning int */
-#pragma warning( disable : 4761 ) /* integral size mismatch in argument; conversion supplied */
-#pragma warning( disable : 4273 ) /* 'identifier' : inconsistent DLL linkage. dllexport assumed */
-#if (MESA_WARNQUIET>1)
+#if !defined(__GNUC__)
+#  pragma warning (disable:4273)
+#  pragma warning( disable : 4244 ) /* '=' : conversion from 'const double ' to 'float ', possible loss of data */
+#  pragma warning( disable : 4018 ) /* '<' : signed/unsigned mismatch */
+#  pragma warning( disable : 4305 ) /* '=' : truncation from 'const double ' to 'float ' */
+#  pragma warning( disable : 4013 ) /* 'function' undefined; assuming extern returning int */
+#  pragma warning( disable : 4761 ) /* integral size mismatch in argument; conversion supplied */
+#  pragma warning( disable : 4273 ) /* 'identifier' : inconsistent DLL linkage. dllexport assumed */
+#  if (MESA_WARNQUIET>1)
 #	pragma warning( disable : 4146 ) /* unary minus operator applied to unsigned type, result still unsigned */
+#  endif
 #endif
 
 /*

From 0ff1d5da1cf5f9c3fcfbb6682bcd4d2fb7e57fa2 Mon Sep 17 00:00:00 2001
From: Steven Edwards <winehacker@gmail.com>
Date: Fri, 16 Jul 2004 22:59:43 +0000
Subject: [PATCH 321/356] Fix building on Linux

svn path=/trunk/; revision=10156
---
 reactos/lib/mesa32/src/drivers/windows/gdi/wmesadef.h | 2 +-
 reactos/lib/mesa32/src/drivers/windows/icd/wmesadef.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/reactos/lib/mesa32/src/drivers/windows/gdi/wmesadef.h b/reactos/lib/mesa32/src/drivers/windows/gdi/wmesadef.h
index 29fff9f4f5e..b75123eaca4 100644
--- a/reactos/lib/mesa32/src/drivers/windows/gdi/wmesadef.h
+++ b/reactos/lib/mesa32/src/drivers/windows/gdi/wmesadef.h
@@ -70,7 +70,7 @@
 
 
 #include <windows.h>
-#include <GL\gl.h>
+#include <GL/gl.h>
 #include "context.h"
 #ifdef DDRAW
 #define DIRECTDRAW_VERSION 0x0100
diff --git a/reactos/lib/mesa32/src/drivers/windows/icd/wmesadef.h b/reactos/lib/mesa32/src/drivers/windows/icd/wmesadef.h
index 430da91fe14..f2f8ebe7e6b 100644
--- a/reactos/lib/mesa32/src/drivers/windows/icd/wmesadef.h
+++ b/reactos/lib/mesa32/src/drivers/windows/icd/wmesadef.h
@@ -70,7 +70,7 @@
 
 
 #include <windows.h>
-#include <GL\gl.h>
+#include <GL/gl.h>
 #include "context.h"
 #ifdef DDRAW
 #define DIRECTDRAW_VERSION 0x0100

From 89746fb06e2d9922ae30855efe09c7e25d167d61 Mon Sep 17 00:00:00 2001
From: Steven Edwards <winehacker@gmail.com>
Date: Fri, 16 Jul 2004 23:01:56 +0000
Subject: [PATCH 322/356] cleanup

svn path=/trunk/; revision=10157
---
 reactos/lib/mesa32/.cvsignore | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 reactos/lib/mesa32/.cvsignore

diff --git a/reactos/lib/mesa32/.cvsignore b/reactos/lib/mesa32/.cvsignore
new file mode 100644
index 00000000000..79b6d95b92c
--- /dev/null
+++ b/reactos/lib/mesa32/.cvsignore
@@ -0,0 +1,6 @@
+*.coff
+*.dll
+*.sym
+*.map
+*.o
+*.d

From a535f993384650f871fe725dd6f8412d596ef088 Mon Sep 17 00:00:00 2001
From: Gregor Anich <blight@blight.eu.org>
Date: Fri, 16 Jul 2004 23:21:04 +0000
Subject: [PATCH 323/356] Fix some warnings.

svn path=/trunk/; revision=10159
---
 reactos/lib/mesa32/src/drivers/windows/gdi/wmesa.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/reactos/lib/mesa32/src/drivers/windows/gdi/wmesa.c b/reactos/lib/mesa32/src/drivers/windows/gdi/wmesa.c
index 74c6caab697..0e6bd796fe4 100644
--- a/reactos/lib/mesa32/src/drivers/windows/gdi/wmesa.c
+++ b/reactos/lib/mesa32/src/drivers/windows/gdi/wmesa.c
@@ -399,7 +399,7 @@ static void clear_color( GLcontext* ctx, const GLfloat color[4] )
  * Otherwise, we let swrast do it. 
  */ 
 
-static clear(GLcontext* ctx, GLbitfield mask, 
+static void clear(GLcontext* ctx, GLbitfield mask, 
       GLboolean all, GLint x, GLint y, GLint width, GLint height) 
 { 
   const   GLuint *colorMask = (GLuint *) &ctx->Color.ColorMask; 
@@ -665,6 +665,7 @@ static void fast_flat_rgb_line( GLcontext* ctx, GLuint v0,
 
 static line_func choose_line_function( GLcontext* ctx )
 {
+  return NULL;
 }
 
 

From 37b963937e47887fdf715481e2d31dc1cd38c404 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Fri, 16 Jul 2004 23:28:55 +0000
Subject: [PATCH 324/356] Added keys for Winsock

svn path=/trunk/; revision=10160
---
 reactos/bootdata/hivesys.inf | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/reactos/bootdata/hivesys.inf b/reactos/bootdata/hivesys.inf
index 3864f4ab69e..d8830c1c283 100644
--- a/reactos/bootdata/hivesys.inf
+++ b/reactos/bootdata/hivesys.inf
@@ -548,6 +548,12 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","IPEnableRouter",0x000
 HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","SearchList",0x00010000,""
 HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","EnableSecurityFilters",0x00010001,0x00000000
 ;HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\PersistentRoutes",,0x00000010
+HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","UseDelayedAcceptance",0x00010001,0x00000000
+HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","MaxSockAddrLength",0x00010001,0x00000010
+HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","MinSockAddrLength",0x00010001,0x00000010
+HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","HelperDllName",0x00000000,"%SystemRoot%\System32\wshtcpip.dll"
+HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","Mapping",0x00000000,0b,00,00,00,03,00,00,00,02,00,00,00,01,00,00,00,06,00,00,00,02,00,00,00,01,00,00,00,00,00,00,00,02,00,00,00,00,00,00,00,06,00,00,00,00,00,00,00,00,00,00,00,06,00,00,00,00,00,00,00,01,00,00,00,06,00,00,00,02,00,00,00,02,00,00,00,11,00,00,00,02,00,00,00,02,00,00,00,00,00,00,00,02,00,00,00,00,00,00,00,11,00,00,00,00,00,00,00,00,00,00,00,11,00,00,00,00,00,00,00,02,00,00,00,11,00,00,00,02,00,00,00,03,00,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock\Parameters","Transports",0x00000000,54,63,70,69,70,00,4e,65,74,42,49,4f,53,00,00
 
 ; Virtual FAT filesystem driver
 HKLM,"SYSTEM\CurrentControlSet\Services\Vfatfs","ErrorControl",0x00010001,0x00000000

From 3231bd4977564fe6fa75ebce3c8989d023fd9d0d Mon Sep 17 00:00:00 2001
From: Gregor Anich <blight@blight.eu.org>
Date: Fri, 16 Jul 2004 23:29:10 +0000
Subject: [PATCH 325/356] Remove unused files.

svn path=/trunk/; revision=10161
---
 .../mesa32/src/drivers/windows/icd/colors.h   | 539 ------------------
 .../mesa32/src/drivers/windows/icd/wmesadef.h | 173 ------
 2 files changed, 712 deletions(-)
 delete mode 100644 reactos/lib/mesa32/src/drivers/windows/icd/colors.h
 delete mode 100644 reactos/lib/mesa32/src/drivers/windows/icd/wmesadef.h

diff --git a/reactos/lib/mesa32/src/drivers/windows/icd/colors.h b/reactos/lib/mesa32/src/drivers/windows/icd/colors.h
deleted file mode 100644
index 19f11eacc0f..00000000000
--- a/reactos/lib/mesa32/src/drivers/windows/icd/colors.h
+++ /dev/null
@@ -1,539 +0,0 @@
-/*	File name	:	colors.h
- *  Version		:	2.3
- *
- *  Header file for display driver for Mesa 2.3  under 
- *	Windows95 and WindowsNT 
- *	This file defines macros and global variables  needed
- *	for converting color format
- *
- *	Copyright (C) 1996-  Li Wei
- *  Address		:		Institute of Artificial Intelligence
- *				:			& Robotics
- *				:		Xi'an Jiaotong University
- *  Email		:		liwei@aiar.xjtu.edu.cn
- *  Web page	:		http://sun.aiar.xjtu.edu.cn
- *
- *  This file and its associations are partially based on the 
- *  Windows NT driver for Mesa, written by Mark Leaming
- *  (mark@rsinc.com).
- */
-
-/* $Log: ddcolors.h 1997/6/14 by Li Wei(liwei@aiar.xjtu.edu.cn)
- * Macros for pixel format defined
- */
-
-/*
- * $Log: colors.h,v $
- * Revision 1.1  2004/07/16 22:12:32  blight
- * Import Mesa-6.0.1 for use as software OpenGL renderer.
- *
- * Revision 1.1  2003/07/24 03:47:46  kschultz
- * Source code for GDI driver.
- *
- * Revision 1.3  2002/01/15 18:14:34  kschultz
- * Fixed pixel color component problem and clear code for 24-bit Windows
- *   devices.  (Jeff Lewis)
- *
- * Revision 1.2  2002/01/15 18:11:36  kschultz
- * Remove trailing CR's.   No logical changes.
- *
- * Revision 1.1.1.1  1999/08/19 00:55:42  jtg
- * Imported sources
- *
- * Revision 1.2  1999/01/03 03:08:57  brianp
- * Ted Jump's changes
- *
- * Revision 1.1  1999/01/03 03:08:12  brianp
- * Initial revision
- *
- * Revision 2.0.2  1997/4/30 15:58:00  CST by Li Wei(liwei@aiar.xjtu.edu.cn)
- * Add LUTs need for dithering
- */
-
-/*
- * $Log: colors.h,v $
- * Revision 1.1  2004/07/16 22:12:32  blight
- * Import Mesa-6.0.1 for use as software OpenGL renderer.
- *
- * Revision 1.1  2003/07/24 03:47:46  kschultz
- * Source code for GDI driver.
- *
- * Revision 1.3  2002/01/15 18:14:34  kschultz
- * Fixed pixel color component problem and clear code for 24-bit Windows
- *   devices.  (Jeff Lewis)
- *
- * Revision 1.2  2002/01/15 18:11:36  kschultz
- * Remove trailing CR's.   No logical changes.
- *
- * Revision 1.1.1.1  1999/08/19 00:55:42  jtg
- * Imported sources
- *
- * Revision 1.2  1999/01/03 03:08:57  brianp
- * Ted Jump's changes
- *
- * Revision 1.1  1999/01/03 03:08:12  brianp
- * Initial revision
- *
- * Revision 2.0.1  1997/4/29 15:52:00  CST by Li Wei(liwei@aiar.xjtu.edu.cn)
- * Add BGR8 Macro
- */
- 
-/*
- * $Log: colors.h,v $
- * Revision 1.1  2004/07/16 22:12:32  blight
- * Import Mesa-6.0.1 for use as software OpenGL renderer.
- *
- * Revision 1.1  2003/07/24 03:47:46  kschultz
- * Source code for GDI driver.
- *
- * Revision 1.3  2002/01/15 18:14:34  kschultz
- * Fixed pixel color component problem and clear code for 24-bit Windows
- *   devices.  (Jeff Lewis)
- *
- * Revision 1.2  2002/01/15 18:11:36  kschultz
- * Remove trailing CR's.   No logical changes.
- *
- * Revision 1.1.1.1  1999/08/19 00:55:42  jtg
- * Imported sources
- *
- * Revision 1.2  1999/01/03 03:08:57  brianp
- * Ted Jump's changes
- *
- * Revision 1.1  1999/01/03 03:08:12  brianp
- * Initial revision
- *
- * Revision 2.0  1996/11/15 10:55:00  CST by Li Wei(liwei@aiar.xjtu.edu.cn)
- * Initial revision
- */
-/* Values for wmesa->pixelformat: */
-
-#define PF_8A8B8G8R	3	/* 32-bit TrueColor:  8-A, 8-B, 8-G, 8-R */
-#define PF_8R8G8B	4	/* 32-bit TrueColor:  8-R, 8-G, 8-B */
-#define PF_5R6G5B	5	/* 16-bit TrueColor:  5-R, 6-G, 5-B bits */
-#define PF_DITHER8	6	/* Dithered RGB using a lookup table */
-#define PF_LOOKUP	7	/* Undithered RGB using a lookup table */
-#define PF_GRAYSCALE	10	/* Grayscale or StaticGray */
-#define PF_BADFORMAT	11
-#define PF_INDEX8		12
-
-char ColorMap16[] = {
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,
-0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,
-0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,
-0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,
-0x05,0x05,0x05,0x05,0x05,0x05,0x05,0x05,
-0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x06,
-0x07,0x07,0x07,0x07,0x07,0x07,0x07,0x07,
-0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,
-0x09,0x09,0x09,0x09,0x09,0x09,0x09,0x09,
-0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,
-0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,
-0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,
-0x0D,0x0D,0x0D,0x0D,0x0D,0x0D,0x0D,0x0D,
-0x0E,0x0E,0x0E,0x0E,0x0E,0x0E,0x0E,0x0E,
-0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,
-0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,
-0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
-0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12,
-0x13,0x13,0x13,0x13,0x13,0x13,0x13,0x13,
-0x14,0x14,0x14,0x14,0x14,0x14,0x14,0x14,
-0x15,0x15,0x15,0x15,0x15,0x15,0x15,0x15,
-0x16,0x16,0x16,0x16,0x16,0x16,0x16,0x16,
-0x17,0x17,0x17,0x17,0x17,0x17,0x17,0x17,
-0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,
-0x19,0x19,0x19,0x19,0x19,0x19,0x19,0x19,
-0x1A,0x1A,0x1A,0x1A,0x1A,0x1A,0x1A,0x1A,
-0x1B,0x1B,0x1B,0x1B,0x1B,0x1B,0x1B,0x1B,
-0x1C,0x1C,0x1C,0x1C,0x1C,0x1C,0x1C,0x1C,
-0x1D,0x1D,0x1D,0x1D,0x1D,0x1D,0x1D,0x1D,
-0x1E,0x1E,0x1E,0x1E,0x1E,0x1E,0x1E,0x1E,
-0x1F,0x1F,0x1F,0x1F,0x1F,0x1F,0x1F,0x1F};
-
-#define BGR8(r,g,b)		(unsigned)(((BYTE)(b & 0xc0 | (g & 0xe0)>>2 | (r & 0xe0)>>5)))
-#ifdef DDRAW
-#define BGR16(r,g,b)	((WORD)(((BYTE)(ColorMap16[b]) | ((BYTE)(g&0xfc) << 3)) | (((WORD)(BYTE)(ColorMap16[r])) << 11)))
-#else
-#define BGR16(r,g,b)	((WORD)(((BYTE)(ColorMap16[b]) | ((BYTE)(ColorMap16[g]) << 5)) | (((WORD)(BYTE)(ColorMap16[r])) << 10)))
-#endif
-#define BGR24(r,g,b) (unsigned long)((DWORD)(((BYTE)(b)|((WORD)((BYTE)(g))<<8))|(((DWORD)(BYTE)(r))<<16)))
-
-#define BGR32(r,g,b)	(unsigned long)((DWORD)(((BYTE)(b)|((WORD)((BYTE)(g))<<8))|(((DWORD)(BYTE)(r))<<16)))
-
-
-
-/*
- * If pixelformat==PF_8A8B8G8R:
- */
-#define PACK_8A8B8G8R( R, G, B, A )	\
-	( ((A) << 24) | ((B) << 16) | ((G) << 8) | (R) )
-
-
-/*
- * If pixelformat==PF_8R8G8B:
- */
-#define PACK_8R8G8B( R, G, B)	 ( ((R) << 16) | ((G) << 8) | (B) )
-
-
-/*
- * If pixelformat==PF_5R6G5B:
- */
-
-
-#ifdef DDRAW
-#define PACK_5R6G5B( R, G, B) ((WORD)(((BYTE)(ColorMap16[B]) | ((BYTE)(G&0xfc) << 3)) | (((WORD)(BYTE)(ColorMap16[R])) << 11)))
-#else
-#define PACK_5R6G5B( R, G, B)	((WORD)(((BYTE)(ColorMap16[B]) | ((BYTE)(ColorMap16[G]) << 5)) | (((WORD)(BYTE)(ColorMap16[R])) << 10)))
-#endif
-/*----------------------------------------------------------------------------
-
-Division lookup tables.  These tables compute 0-255 divided by 51 and
-modulo 51.  These tables could approximate gamma correction.
-
-*/
-
-char unsigned const aDividedBy51Rounded[256] =
-{
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-};
-
-char unsigned const aDividedBy51[256] =
-{
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 
-};
-
-char unsigned const aModulo51[256] =
-{
-  0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-  20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
-  38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 0, 1, 2, 3, 4, 5, 6,
-  7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
-  26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
-  44, 45, 46, 47, 48, 49, 50, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12,
-  13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
-  31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
-  49, 50, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
-  18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
-  36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 0, 1, 2, 3,
-  4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
-  23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
-  41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 0, 
-};
-
-/*----------------------------------------------------------------------------
-
-Multiplication LUTs.  These compute 0-5 times 6 and 36.
-
-*/
-
-char unsigned const aTimes6[6] =
-{
-  0, 6, 12, 18, 24, 30
-};
-
-char unsigned const aTimes36[6] =
-{
-  0, 36, 72, 108, 144, 180
-};
-
-
-/*----------------------------------------------------------------------------
-
-Dither matrices for 8 bit to 2.6 bit halftones.
-
-*/
-
-char unsigned const aHalftone16x16[256] =
-{
-  0, 44, 9, 41, 3, 46, 12, 43, 1, 44, 10, 41, 3, 46, 12, 43,
-  34, 16, 25, 19, 37, 18, 28, 21, 35, 16, 26, 19, 37, 18, 28, 21,
-  38, 6, 47, 3, 40, 9, 50, 6, 38, 7, 47, 4, 40, 9, 49, 6,
-  22, 28, 13, 31, 25, 31, 15, 34, 22, 29, 13, 32, 24, 31, 15, 34,
-  2, 46, 12, 43, 1, 45, 10, 42, 2, 45, 11, 42, 1, 45, 11, 42,
-  37, 18, 27, 21, 35, 17, 26, 20, 36, 17, 27, 20, 36, 17, 26, 20,
-  40, 8, 49, 5, 38, 7, 48, 4, 39, 8, 48, 5, 39, 7, 48, 4,
-  24, 30, 15, 33, 23, 29, 13, 32, 23, 30, 14, 33, 23, 29, 14, 32,
-  2, 46, 12, 43, 0, 44, 10, 41, 3, 47, 12, 44, 0, 44, 10, 41,
-  37, 18, 27, 21, 35, 16, 25, 19, 37, 19, 28, 22, 35, 16, 25, 19,
-  40, 9, 49, 5, 38, 7, 47, 4, 40, 9, 50, 6, 38, 6, 47, 3,
-  24, 30, 15, 34, 22, 29, 13, 32, 25, 31, 15, 34, 22, 28, 13, 31,
-  1, 45, 11, 42, 2, 46, 11, 42, 1, 45, 10, 41, 2, 46, 11, 43,
-  36, 17, 26, 20, 36, 17, 27, 21, 35, 16, 26, 20, 36, 18, 27, 21,
-  39, 8, 48, 4, 39, 8, 49, 5, 38, 7, 48, 4, 39, 8, 49, 5,
-  23, 29, 14, 33, 24, 30, 14, 33, 23, 29, 13, 32, 24, 30, 14, 33,
-};
-
-char unsigned const aHalftone8x8[64] =
-{
-   0, 38,  9, 47,  2, 40, 11, 50,
-  25, 12, 35, 22, 27, 15, 37, 24,
-   6, 44,  3, 41,  8, 47,  5, 43,
-  31, 19, 28, 15, 34, 21, 31, 18,
-   1, 39, 11, 49,  0, 39, 10, 48,
-  27, 14, 36, 23, 26, 13, 35, 23,
-   7, 46,  4, 43,  7, 45,  3, 42,
-  33, 20, 30, 17, 32, 19, 29, 16,
-};
-
-char unsigned const aHalftone4x4_1[16] =
-{
-  0, 25, 6, 31,
-  38, 12, 44, 19,
-  9, 35, 3, 28,
-  47, 22, 41, 15
-};
-
-char unsigned const aHalftone4x4_2[16] =
-{
-  41, 3, 9, 28,
-  35, 15, 22, 47,
-  6, 25, 38, 0,
-  19, 44, 31, 12
-};
-
-/***************************************************************************
-  aWinGHalftoneTranslation
-
-  Translates a 2.6 bit-per-pixel halftoned representation into the
-  slightly rearranged WinG Halftone Palette.
-*/
-
-char unsigned const aWinGHalftoneTranslation[216] =
-{
-  0,
-  29,
-  30,
-  31,
-  32,
-  249,
-  33,
-  34,
-  35,
-  36,
-  37,
-  38,
-  39,
-  40,
-  41,
-  42,
-  43,
-  44,
-  45,
-  46,
-  47,
-  48,
-  49,
-  50,
-  51,
-  52,
-  53,
-  54,
-  55,
-  56,
-  250,
-  250,
-  57,
-  58,
-  59,
-  251,
-  60,
-  61,
-  62,
-  63,
-  64,
-  65,
-  66,
-  67,
-  68,
-  69,
-  70,
-  71,
-  72,
-  73,
-  74,
-  75,
-  76,
-  77,
-  78,
-  79,
-  80,
-  81,
-  82,
-  83,
-  84,
-  85,
-  86,
-  87,
-  88,
-  89,
-  250,
-  90,
-  91,
-  92,
-  93,
-  94,
-  95,
-  96,
-  97,
-  98,
-  99,
-  100,
-  101,
-  102,
-  103,
-  104,
-  105,
-  106,
-  107,
-  108,
-  109,
-  110,
-  111,
-  227,
-  112,
-  113,
-  114,
-  115,
-  116,
-  117,
-  118,
-  119,
-  151,
-  120,
-  121,
-  122,
-  123,
-  124,
-  228,
-  125,
-  126,
-  229,
-  133,
-  162,
-  135,
-  131,
-  132,
-  137,
-  166,
-  134,
-  140,
-  130,
-  136,
-  143,
-  138,
-  139,
-  174,
-  141,
-  142,
-  177,
-  129,
-  144,
-  145,
-  146,
-  147,
-  148,
-  149,
-  150,
-  157,
-  152,
-  153,
-  154,
-  155,
-  156,
-  192,
-  158,
-  159,
-  160,
-  161,
-  196,
-  163,
-  164,
-  165,
-  127,
-  199,
-  167,
-  168,
-  169,
-  170,
-  171,
-  172,
-  173,
-  207,
-  175,
-  176,
-  210,
-  178,
-  179,
-  180,
-  181,
-  182,
-  183,
-  184,
-  185,
-  186,
-  187,
-  188,
-  189,
-  190,
-  191,
-  224,
-  193,
-  194,
-  195,
-  252,
-  252,
-  197,
-  198,
-  128,
-  253,
-  252,
-  200,
-  201,
-  202,
-  203,
-  204,
-  205,
-  206,
-  230,
-  208,
-  209,
-  231,
-  211,
-  212,
-  213,
-  214,
-  215,
-  216,
-  217,
-  218,
-  219,
-  220,
-  221,
-  222,
-  254,
-  223,
-  232,
-  225,
-  226,
-  255,
-};
diff --git a/reactos/lib/mesa32/src/drivers/windows/icd/wmesadef.h b/reactos/lib/mesa32/src/drivers/windows/icd/wmesadef.h
deleted file mode 100644
index f2f8ebe7e6b..00000000000
--- a/reactos/lib/mesa32/src/drivers/windows/icd/wmesadef.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/*	File name	:	wmesadef.h
- *  Version		:	2.3
- *
- *  Header file for display driver for Mesa 2.3  under
- *	Windows95, WindowsNT and Win32
- *
- *	Copyright (C) 1996-  Li Wei
- *  Address		:		Institute of Artificial Intelligence
- *				:			& Robotics
- *				:		Xi'an Jiaotong University
- *  Email		:		liwei@aiar.xjtu.edu.cn
- *  Web page	:		http://sun.aiar.xjtu.edu.cn
- *
- *  This file and its associations are partially based on the
- *  Windows NT driver for Mesa, written by Mark Leaming
- *  (mark@rsinc.com).
- */
-
-/*
- * $Log: wmesadef.h,v 
- * Revision 1.1.1.1  1999/08/19 00:55:42  jt
- * Imported source
- 
- * Revision 1.3  1999/01/03 03:08:57  brian
- * Ted Jump's change
- *
- * Initial version 1997/6/14 CST by Li Wei(liwei@aiar.xjtu.edu.cn)
- */
-
-/*
- * $Log: wmesadef.h,v 
- * Revision 1.1.1.1  1999/08/19 00:55:42  jt
- * Imported source
- 
- * Revision 1.3  1999/01/03 03:08:57  brian
- * Ted Jump's change
- *
- * Revision 2.1  1996/11/15 10:54:00  CST by Li Wei(liwei@aiar.xjtu.edu.cn)
- * a new element added to wmesa_context :
- * dither_flag
- */
-
-/*
- * $Log: wmesadef.h,v 
- * Revision 1.1.1.1  1999/08/19 00:55:42  jt
- * Imported source
- 
- * Revision 1.3  1999/01/03 03:08:57  brian
- * Ted Jump's change
- *
- * Revision 2.0  1996/11/15 10:54:00  CST by Li Wei(liwei@aiar.xjtu.edu.cn)
- * Initial revision
- */
-
-
-
-#ifndef DDMESADEF_H
-#define DDMESADEF_H
-
-// uncomment this to use DirectDraw driver
-//#define DDRAW 1
-// uncomment this to use a pointer to a function for setting the pixels
-// in the buffer
-#define COMPILE_SETPIXEL 1
-// uncomment this to enable the fast win32 rasterizers ( commented out for MesaGL 4.0 )
-// #define FAST_RASTERIZERS 1
-// uncomment this to enable setting function pointers once inside of
-// WMesaCreateContext instead of on every call to wmesa_update_state()
-#define SET_FPOINTERS_ONCE 1
-
-
-#include <windows.h>
-#include <GL/gl.h>
-#include "context.h"
-#ifdef DDRAW
-#define DIRECTDRAW_VERSION 0x0100
-	#include <ddraw.h>
-#endif
-//#include "profile.h"
-
-#define REDBITS		0x03
-#define REDSHIFT	0x00
-#define GREENBITS	0x03
-#define GREENSHIFT	0x03
-#define BLUEBITS	0x02
-#define BLUESHIFT	0x06
-
-typedef struct _dibSection{
-	HDC		hDC;
-	HANDLE	hFileMap;
-	BOOL	fFlushed;
-	LPVOID	base;
-}WMDIBSECTION, *PWMDIBSECTION;
-
-#ifdef COMPILE_SETPIXEL
-typedef void (*SETPIXELTYPE)(struct wmesa_context *pwc, int iScanLine, int iPixel, BYTE r, BYTE g, BYTE b);
-#endif
-
-typedef struct wmesa_context{
-    GLcontext *gl_ctx;		/* The core GL/Mesa context */
-	GLvisual *gl_visual;		/* Describes the buffers */
-    GLframebuffer *gl_buffer;	/* Depth, stencil, accum, etc buffers */
-
-	HWND				Window;
-    HDC                 hDC;
-    HPALETTE            hPalette;
-    HPALETTE            hOldPalette;
-    HPEN                hPen;
-    HPEN                hOldPen;
-    HCURSOR             hOldCursor;
-    COLORREF            crColor;
-    // 3D projection stuff
-    RECT                drawRect;
-    UINT                uiDIBoffset;
-    // OpenGL stuff
-    HPALETTE            hGLPalette;
-	GLuint				width;
-	GLuint				height;
-	GLuint				ScanWidth;
-	GLboolean			db_flag;	//* double buffered?
-	GLboolean			rgb_flag;	//* RGB mode?
-	GLboolean			dither_flag;	//* use dither when 256 color mode for RGB?
-	GLuint				depth;		//* bits per pixel (1, 8, 24, etc)
-	ULONG				pixel;	// current color index or RGBA pixel value
-	ULONG				clearpixel; //* pixel for clearing the color buffers
-	PBYTE				ScreenMem; // WinG memory
-	BITMAPINFO			*IndexFormat;
-	HPALETTE			hPal; // Current Palette
-	HPALETTE			hPalHalfTone;
-
-
-	WMDIBSECTION		dib;
-    BITMAPINFO          bmi;
-    HBITMAP             hbmDIB;
-    HBITMAP             hOldBitmap;
-	HBITMAP				Old_Compat_BM;
-	HBITMAP				Compat_BM;            // Bitmap for double buffering
-    PBYTE               pbPixels;
-    int                 nColors;
-	BYTE				cColorBits;
-	int					pixelformat;
-
-#ifdef DDRAW
-	LPDIRECTDRAW            lpDD;           // DirectDraw object
-//	LPDIRECTDRAW2            lpDD2;           // DirectDraw object
-	LPDIRECTDRAWSURFACE     lpDDSPrimary;   // DirectDraw primary surface
-	LPDIRECTDRAWSURFACE     lpDDSOffScreen;	// DirectDraw off screen surface
-	LPDIRECTDRAWPALETTE     lpDDPal;        // DirectDraw palette
-	BOOL                    bActive;        // is application active?
-	DDSURFACEDESC	        ddsd;			// surface description
-	int 					fullScreen;		// fullscreen ?
-	int			            gMode ;			// fullscreen mode
-	LONG					oldWndProc;		// old Window proc. we need to hook WM_MOVE message to update the drawing rectangle
-#endif
-	RECT					rectOffScreen;
-	RECT					rectSurface;
-	HWND					hwnd;
-	DWORD					pitch;
-	PBYTE					addrOffScreen;
-#ifdef COMPILE_SETPIXEL
-      SETPIXELTYPE                    wmSetPixel;
-#endif // COMPILE_SETPIXEL
-//#ifdef PROFILE
-//	MESAPROF	profile;
-//#endif
-}  *PWMC;
-
-
-#define PAGE_FILE		0xffffffff
-
-
-
-#endif

From e62f0e4796f8f274c59808304367171ed2ec22aa Mon Sep 17 00:00:00 2001
From: Gregor Anich <blight@blight.eu.org>
Date: Fri, 16 Jul 2004 23:35:19 +0000
Subject: [PATCH 326/356] Fix warning.

svn path=/trunk/; revision=10162
---
 reactos/lib/mesa32/src/drivers/windows/gdi/wmesadef.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/reactos/lib/mesa32/src/drivers/windows/gdi/wmesadef.h b/reactos/lib/mesa32/src/drivers/windows/gdi/wmesadef.h
index b75123eaca4..d43e990ed3c 100644
--- a/reactos/lib/mesa32/src/drivers/windows/gdi/wmesadef.h
+++ b/reactos/lib/mesa32/src/drivers/windows/gdi/wmesadef.h
@@ -93,6 +93,7 @@ typedef struct _dibSection{
 }WMDIBSECTION, *PWMDIBSECTION;
 
 #ifdef COMPILE_SETPIXEL
+struct wmesa_context;
 typedef void (*SETPIXELTYPE)(struct wmesa_context *pwc, int iScanLine, int iPixel, BYTE r, BYTE g, BYTE b);
 #endif
 

From cf38bc01b725f65b73fa8b6c69558563538488a0 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Fri, 16 Jul 2004 23:37:26 +0000
Subject: [PATCH 327/356] - Get rid of linker warnings.

svn path=/trunk/; revision=10163
---
 reactos/lib/mesa32/mesa32.def | 237 +++++++++++++++-------------------
 reactos/lib/mesa32/mesa32.edf | 205 +++++++++++++++--------------
 2 files changed, 203 insertions(+), 239 deletions(-)

diff --git a/reactos/lib/mesa32/mesa32.def b/reactos/lib/mesa32/mesa32.def
index 130594c5311..67f49f9a6f5 100644
--- a/reactos/lib/mesa32/mesa32.def
+++ b/reactos/lib/mesa32/mesa32.def
@@ -1,138 +1,105 @@
-; DO NOT EDIT - This file generated automatically by mesadef.py script
-DESCRIPTION 'Mesa (OpenGL work-alike) for Win32'
-VERSION 6.0
-;
-; Module definition file for Mesa (OPENGL32.DLL)
-;
-; Note: The OpenGL functions use the STDCALL
-; function calling convention.  Microsoft's
-; OPENGL32 uses this convention and so must the
-; Mesa OPENGL32 so that the Mesa DLL can be used
-; as a drop-in replacement.
-;
-; The linker exports STDCALL entry points with
-; 'decorated' names; e.g., _glBegin@0, where the
-; trailing number is the number of bytes of 
-; parameter data pushed onto the stack.  The
-; callee is responsible for popping this data
-; off the stack, usually via a RETF n instruction.
-;
-; However, the Microsoft OPENGL32.DLL does not export
-; the decorated names, even though the calling convention
-; is STDCALL.  So, this module definition file is
-; needed to force the Mesa OPENGL32.DLL to export the
-; symbols in the same manner as the Microsoft DLL.
-; Were it not for this problem, this file would not
-; be needed (for the gl* functions) since the entry
-; points are compiled with dllexport declspec.
-;
-; However, this file is still needed to export "internal"
-; Mesa symbols for the benefit of the OSMESA32.DLL.
-;
+LIBRARY mesa32.dll
 EXPORTS
-;
 ; ICD API
-	DrvCopyContext
-	DrvCreateContext
-	DrvCreateLayerContext
-	DrvDeleteContext
-	DrvDescribeLayerPlane
-	DrvDescribePixelFormat
-	DrvGetLayerPaletteEntries
-	DrvGetProcAddress
-	DrvReleaseContext
-	DrvRealizeLayerPalette
-	DrvSetContext
-	DrvSetLayerPaletteEntries
-	DrvSetPixelFormat
-	DrvShareLists
-	DrvSwapBuffers
-	DrvSwapLayerBuffers
-	DrvValidateVersion
-
-;
+DrvCopyContext@12
+DrvCreateContext@4
+DrvCreateLayerContext@8
+DrvDeleteContext@4
+DrvDescribeLayerPlane@20
+DrvDescribePixelFormat@16
+DrvGetLayerPaletteEntries@20
+DrvGetProcAddress@4
+DrvReleaseContext@4
+DrvRealizeLayerPalette@12
+DrvSetContext@12
+DrvSetLayerPaletteEntries@20
+DrvSetPixelFormat@8
+DrvShareLists@8
+DrvSwapBuffers@4
+DrvSwapLayerBuffers@8
+DrvValidateVersion@4
 ; Mesa internals - mostly for OSMESA
-	_ac_CreateContext
-	_ac_DestroyContext
-	_ac_InvalidateState
-	_glapi_get_context
-	_glapi_get_proc_address
-	_mesa_base_compressed_texformat
-	_mesa_buffer_data
-	_mesa_buffer_map
-	_mesa_buffer_subdata
-	_mesa_bzero
-	_mesa_calloc
-	_mesa_choose_tex_format
-	_mesa_compressed_texture_size
-	_mesa_create_framebuffer
-	_mesa_create_visual
-	_mesa_delete_buffer_object
-	_mesa_delete_texture_object
-	_mesa_destroy_framebuffer
-	_mesa_destroy_visual
-	_mesa_enable_1_3_extensions
-	_mesa_enable_1_4_extensions
-	_mesa_enable_1_5_extensions
-	_mesa_enable_sw_extensions
-	_mesa_error
-	_mesa_free
-	_mesa_free_context_data
-	_mesa_get_current_context
-	_mesa_init_default_imports
-	_mesa_initialize_context
-	_mesa_make_current
-	_mesa_memcpy
-	_mesa_memset
-	_mesa_new_buffer_object
-	_mesa_new_texture_object
-	_mesa_problem
-	_mesa_ResizeBuffersMESA
-	_mesa_store_compressed_teximage1d
-	_mesa_store_compressed_teximage2d
-	_mesa_store_compressed_teximage3d
-	_mesa_store_compressed_texsubimage1d
-	_mesa_store_compressed_texsubimage2d
-	_mesa_store_compressed_texsubimage3d
-	_mesa_store_teximage1d
-	_mesa_store_teximage2d
-	_mesa_store_teximage3d
-	_mesa_store_texsubimage1d
-	_mesa_store_texsubimage2d
-	_mesa_store_texsubimage3d
-	_mesa_strcmp
-	_mesa_test_proxy_teximage
-	_mesa_Viewport
-	_swrast_Accum
-	_swrast_alloc_buffers
-	_swrast_Bitmap
-	_swrast_CopyPixels
-	_swrast_DrawBuffer
-	_swrast_DrawPixels
-	_swrast_GetDeviceDriverReference
-	_swrast_Clear
-	_swrast_choose_line
-	_swrast_choose_triangle
-	_swrast_CopyColorSubTable
-	_swrast_CopyColorTable
-	_swrast_CopyConvolutionFilter1D
-	_swrast_CopyConvolutionFilter2D
-	_swrast_copy_teximage1d
-	_swrast_copy_teximage2d
-	_swrast_copy_texsubimage1d
-	_swrast_copy_texsubimage2d
-	_swrast_copy_texsubimage3d
-	_swrast_CreateContext
-	_swrast_DestroyContext
-	_swrast_InvalidateState
-	_swrast_ReadPixels
-	_swrast_zbuffer_address
-	_swsetup_Wakeup
-	_swsetup_CreateContext
-	_swsetup_DestroyContext
-	_swsetup_InvalidateState
-	_tnl_CreateContext
-	_tnl_DestroyContext
-	_tnl_InvalidateState
-	_tnl_MakeCurrent
-	_tnl_run_pipeline
+_ac_CreateContext
+_ac_DestroyContext
+_ac_InvalidateState
+_glapi_get_context
+_glapi_get_proc_address
+_mesa_base_compressed_texformat
+_mesa_buffer_data
+_mesa_buffer_map
+_mesa_buffer_subdata
+_mesa_bzero
+_mesa_calloc
+_mesa_choose_tex_format
+_mesa_compressed_texture_size
+_mesa_create_framebuffer
+_mesa_create_visual
+_mesa_delete_buffer_object
+_mesa_delete_texture_object
+_mesa_destroy_framebuffer
+_mesa_destroy_visual
+_mesa_enable_1_3_extensions
+_mesa_enable_1_4_extensions
+_mesa_enable_1_5_extensions
+_mesa_enable_sw_extensions
+_mesa_error
+_mesa_free
+_mesa_free_context_data
+_mesa_get_current_context
+_mesa_init_default_imports
+_mesa_initialize_context
+_mesa_make_current
+_mesa_memcpy
+_mesa_memset
+_mesa_new_buffer_object
+_mesa_new_texture_object
+_mesa_problem
+_mesa_ResizeBuffersMESA@0
+_mesa_store_compressed_teximage1d
+_mesa_store_compressed_teximage2d
+_mesa_store_compressed_teximage3d
+_mesa_store_compressed_texsubimage1d
+_mesa_store_compressed_texsubimage2d
+_mesa_store_compressed_texsubimage3d
+_mesa_store_teximage1d
+_mesa_store_teximage2d
+_mesa_store_teximage3d
+_mesa_store_texsubimage1d
+_mesa_store_texsubimage2d
+_mesa_store_texsubimage3d
+_mesa_strcmp
+_mesa_test_proxy_teximage
+_mesa_Viewport@16
+_swrast_Accum
+_swrast_alloc_buffers
+_swrast_Bitmap
+_swrast_CopyPixels
+_swrast_DrawBuffer
+_swrast_DrawPixels
+_swrast_GetDeviceDriverReference
+_swrast_Clear
+_swrast_choose_line
+_swrast_choose_triangle
+_swrast_CopyColorSubTable
+_swrast_CopyColorTable
+_swrast_CopyConvolutionFilter1D
+_swrast_CopyConvolutionFilter2D
+_swrast_copy_teximage1d
+_swrast_copy_teximage2d
+_swrast_copy_texsubimage1d
+_swrast_copy_texsubimage2d
+_swrast_copy_texsubimage3d
+_swrast_CreateContext
+_swrast_DestroyContext
+_swrast_InvalidateState
+_swrast_ReadPixels
+_swrast_zbuffer_address
+_swsetup_Wakeup
+_swsetup_CreateContext
+_swsetup_DestroyContext
+_swsetup_InvalidateState
+_tnl_CreateContext
+_tnl_DestroyContext
+_tnl_InvalidateState
+_tnl_MakeCurrent
+_tnl_run_pipeline
diff --git a/reactos/lib/mesa32/mesa32.edf b/reactos/lib/mesa32/mesa32.edf
index 4a70e0597a6..ea1e1dc1125 100644
--- a/reactos/lib/mesa32/mesa32.edf
+++ b/reactos/lib/mesa32/mesa32.edf
@@ -1,107 +1,104 @@
 EXPORTS
-;
 ; ICD API
-	DrvCopyContext=DrvCopyContext@12
-	DrvCreateContext=DrvCreateContext@4
-	DrvCreateLayerContext=DrvCreateLayerContext@8
-	DrvDeleteContext=DrvDeleteContext@4
-	DrvDescribeLayerPlane=DrvDescribeLayerPlane@20
-	DrvDescribePixelFormat=DrvDescribePixelFormat@16
-	DrvGetLayerPaletteEntries=DrvGetLayerPaletteEntries@20
-	DrvGetProcAddress=DrvGetProcAddress@4
-	DrvReleaseContext=DrvReleaseContext@4
-	DrvRealizeLayerPalette=DrvRealizeLayerPalette@12
-	DrvSetContext=DrvSetContext@12
-	DrvSetLayerPaletteEntries=DrvSetLayerPaletteEntries@20
-	DrvSetPixelFormat=DrvSetPixelFormat@8
-	DrvShareLists=DrvShareLists@8
-	DrvSwapBuffers=DrvSwapBuffers@4
-	DrvSwapLayerBuffers=DrvSwapLayerBuffers@8
-	DrvValidateVersion=DrvValidateVersion@4
-
-;
+DrvCopyContext=DrvCopyContext@12
+DrvCreateContext=DrvCreateContext@4
+DrvCreateLayerContext=DrvCreateLayerContext@8
+DrvDeleteContext=DrvDeleteContext@4
+DrvDescribeLayerPlane=DrvDescribeLayerPlane@20
+DrvDescribePixelFormat=DrvDescribePixelFormat@16
+DrvGetLayerPaletteEntries=DrvGetLayerPaletteEntries@20
+DrvGetProcAddress=DrvGetProcAddress@4
+DrvReleaseContext=DrvReleaseContext@4
+DrvRealizeLayerPalette=DrvRealizeLayerPalette@12
+DrvSetContext=DrvSetContext@12
+DrvSetLayerPaletteEntries=DrvSetLayerPaletteEntries@20
+DrvSetPixelFormat=DrvSetPixelFormat@8
+DrvShareLists=DrvShareLists@8
+DrvSwapBuffers=DrvSwapBuffers@4
+DrvSwapLayerBuffers=DrvSwapLayerBuffers@8
+DrvValidateVersion=DrvValidateVersion@4
 ; Mesa internals - mostly for OSMESA
-	_ac_CreateContext=_ac_CreateContext@4
-	_ac_DestroyContext=_ac_DestroyContext@4
-	_ac_InvalidateState=_ac_InvalidateState@8
-	_glapi_get_context=_glapi_get_context@0
-	_glapi_get_proc_address=_glapi_get_proc_address@4
-	_mesa_base_compressed_texformat=_mesa_base_compressed_texformat@8
-	_mesa_buffer_data=_mesa_buffer_data@24
-	_mesa_buffer_map=_mesa_buffer_map@16
-	_mesa_buffer_subdata=_mesa_buffer_subdata@24
-	_mesa_bzero=_mesa_bzero@8
-	_mesa_calloc=_mesa_calloc@4
-	_mesa_choose_tex_format=_mesa_choose_tex_format@16
-	_mesa_compressed_texture_size=_mesa_compressed_texture_size@20
-	_mesa_create_framebuffer=_mesa_create_framebuffer@20
-	_mesa_create_visual=_mesa_create_visual@60
-	_mesa_delete_buffer_object=_mesa_delete_buffer_object@8
-	_mesa_delete_texture_object=_mesa_delete_texture_object@8
-	_mesa_destroy_framebuffer=_mesa_destroy_framebuffer@4
-	_mesa_destroy_visual=_mesa_destroy_visual@4
-	_mesa_enable_1_3_extensions=_mesa_enable_1_3_extensions@4
-	_mesa_enable_1_4_extensions=_mesa_enable_1_4_extensions@4
-	_mesa_enable_1_5_extensions=_mesa_enable_1_5_extensions@4
-	_mesa_enable_sw_extensions=_mesa_enable_sw_extensions@4
-	_mesa_error=_mesa_error@12
-	_mesa_free=_mesa_free@4
-	_mesa_free_context_data=_mesa_free_context_data@4
-	_mesa_get_current_context=_mesa_get_current_context@0
-	_mesa_init_default_imports=_mesa_init_default_imports@8
-	_mesa_initialize_context=_mesa_initialize_context@20
-	_mesa_make_current=_mesa_make_current@8
-	_mesa_memcpy=_mesa_memcpy@12
-	_mesa_memset=_mesa_memset@12
-	_mesa_new_buffer_object=_mesa_new_buffer_object@12
-	_mesa_new_texture_object=_mesa_new_texture_object@12
-	_mesa_problem=_mesa_problem@8
-	_mesa_ResizeBuffersMESA=_mesa_ResizeBuffersMESA@0
-	_mesa_store_compressed_teximage1d=_mesa_store_compressed_teximage1d@40
-	_mesa_store_compressed_teximage2d=_mesa_store_compressed_teximage2d@44
-	_mesa_store_compressed_teximage3d=_mesa_store_compressed_teximage3d@48
-	_mesa_store_compressed_texsubimage1d=_mesa_store_compressed_texsubimage1d@40
-	_mesa_store_compressed_texsubimage2d=_mesa_store_compressed_texsubimage2d@44
-	_mesa_store_compressed_texsubimage3d=_mesa_store_compressed_texsubimage3d@48
-	_mesa_store_teximage1d=_mesa_store_teximage1d@48
-	_mesa_store_teximage2d=_mesa_store_teximage2d@52
-	_mesa_store_teximage3d=_mesa_store_teximage3d@56
-	_mesa_store_texsubimage1d=_mesa_store_texsubimage1d@48
-	_mesa_store_texsubimage2d=_mesa_store_texsubimage2d@52
-	_mesa_store_texsubimage3d=_mesa_store_texsubimage3d@56
-	_mesa_strcmp=_mesa_strcmp@8
-	_mesa_test_proxy_teximage=_mesa_test_proxy_teximage@40
-	_mesa_Viewport=_mesa_Viewport@16
-	_swrast_Accum=_swrast_Accum@28
-	_swrast_alloc_buffers=_swrast_alloc_buffers@4
-	_swrast_Bitmap=_swrast_Bitmap@28
-	_swrast_CopyPixels=_swrast_CopyPixels@32
-	_swrast_DrawBuffer=_swrast_DrawBuffer@8
-	_swrast_DrawPixels=_swrast_DrawPixels@36
-	_swrast_GetDeviceDriverReference=_swrast_GetDeviceDriverReference@4
-	_swrast_Clear=_swrast_Clear@28
-	_swrast_choose_line=_swrast_choose_line@4
-	_swrast_choose_triangle=_swrast_choose_triangle@4
-	_swrast_CopyColorSubTable=_swrast_CopyColorSubTable@24
-	_swrast_CopyColorTable=_swrast_CopyColorTable@24
-	_swrast_CopyConvolutionFilter1D=_swrast_CopyConvolutionFilter1D@24
-	_swrast_CopyConvolutionFilter2D=_swrast_CopyConvolutionFilter2D@28
-	_swrast_copy_teximage1d=_swrast_copy_teximage1d@32
-	_swrast_copy_teximage2d=_swrast_copy_teximage2d@36
-	_swrast_copy_texsubimage1d=_swrast_copy_texsubimage1d@28
-	_swrast_copy_texsubimage2d=_swrast_copy_texsubimage2d@36
-	_swrast_copy_texsubimage3d=_swrast_copy_texsubimage3d@40
-	_swrast_CreateContext=_swrast_CreateContext@4
-	_swrast_DestroyContext=_swrast_DestroyContext@4
-	_swrast_InvalidateState=_swrast_InvalidateState@8
-	_swrast_ReadPixels=_swrast_ReadPixels@36
-	_swrast_zbuffer_address=_swrast_zbuffer_address@12
-	_swsetup_Wakeup=_swsetup_Wakeup@4
-	_swsetup_CreateContext=_swsetup_CreateContext@4
-	_swsetup_DestroyContext=_swsetup_DestroyContext@4
-	_swsetup_InvalidateState=_swsetup_InvalidateState@8
-	_tnl_CreateContext=_tnl_CreateContext@4
-	_tnl_DestroyContext=_tnl_DestroyContext@4
-	_tnl_InvalidateState=_tnl_InvalidateState@8
-	_tnl_MakeCurrent=_tnl_MakeCurrent@12
-	_tnl_run_pipeline=_tnl_run_pipeline@4
+_ac_CreateContext
+_ac_DestroyContext
+_ac_InvalidateState
+_glapi_get_context
+_glapi_get_proc_address
+_mesa_base_compressed_texformat
+_mesa_buffer_data
+_mesa_buffer_map
+_mesa_buffer_subdata
+_mesa_bzero
+_mesa_calloc
+_mesa_choose_tex_format
+_mesa_compressed_texture_size
+_mesa_create_framebuffer
+_mesa_create_visual
+_mesa_delete_buffer_object
+_mesa_delete_texture_object
+_mesa_destroy_framebuffer
+_mesa_destroy_visual
+_mesa_enable_1_3_extensions
+_mesa_enable_1_4_extensions
+_mesa_enable_1_5_extensions
+_mesa_enable_sw_extensions
+_mesa_error
+_mesa_free
+_mesa_free_context_data
+_mesa_get_current_context
+_mesa_init_default_imports
+_mesa_initialize_context
+_mesa_make_current
+_mesa_memcpy
+_mesa_memset
+_mesa_new_buffer_object
+_mesa_new_texture_object
+_mesa_problem
+_mesa_ResizeBuffersMESA=_mesa_ResizeBuffersMESA@0
+_mesa_store_compressed_teximage1d
+_mesa_store_compressed_teximage2d
+_mesa_store_compressed_teximage3d
+_mesa_store_compressed_texsubimage1d
+_mesa_store_compressed_texsubimage2d
+_mesa_store_compressed_texsubimage3d
+_mesa_store_teximage1d
+_mesa_store_teximage2d
+_mesa_store_teximage3d
+_mesa_store_texsubimage1d
+_mesa_store_texsubimage2d
+_mesa_store_texsubimage3d
+_mesa_strcmp
+_mesa_test_proxy_teximage
+_mesa_Viewport=_mesa_Viewport@16
+_swrast_Accum
+_swrast_alloc_buffers
+_swrast_Bitmap
+_swrast_CopyPixels
+_swrast_DrawBuffer
+_swrast_DrawPixels
+_swrast_GetDeviceDriverReference
+_swrast_Clear
+_swrast_choose_line
+_swrast_choose_triangle
+_swrast_CopyColorSubTable
+_swrast_CopyColorTable
+_swrast_CopyConvolutionFilter1D
+_swrast_CopyConvolutionFilter2D
+_swrast_copy_teximage1d
+_swrast_copy_teximage2d
+_swrast_copy_texsubimage1d
+_swrast_copy_texsubimage2d
+_swrast_copy_texsubimage3d
+_swrast_CreateContext
+_swrast_DestroyContext
+_swrast_InvalidateState
+_swrast_ReadPixels
+_swrast_zbuffer_address
+_swsetup_Wakeup
+_swsetup_CreateContext
+_swsetup_DestroyContext
+_swsetup_InvalidateState
+_tnl_CreateContext
+_tnl_DestroyContext
+_tnl_InvalidateState
+_tnl_MakeCurrent
+_tnl_run_pipeline

From 73cbc815c1e01ed0fbce625977db22cc7ee62d72 Mon Sep 17 00:00:00 2001
From: Steven Edwards <winehacker@gmail.com>
Date: Fri, 16 Jul 2004 23:41:14 +0000
Subject: [PATCH 328/356] moved these docs to a folder. The file names broke
 the livecd build

svn path=/trunk/; revision=10164
---
 reactos/media/fonts/{ => doc}/COPYRIGHT.IBM         | 0
 reactos/media/fonts/{ => doc}/Copyright.Bitstream   | 0
 reactos/media/fonts/{ => doc}/VERA-COPYRIGHT.TXT    | 0
 reactos/media/fonts/{ => doc}/VERA-README.TXT       | 0
 reactos/media/fonts/{ => doc}/VERA-RELEASENOTES.TXT | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename reactos/media/fonts/{ => doc}/COPYRIGHT.IBM (100%)
 rename reactos/media/fonts/{ => doc}/Copyright.Bitstream (100%)
 rename reactos/media/fonts/{ => doc}/VERA-COPYRIGHT.TXT (100%)
 rename reactos/media/fonts/{ => doc}/VERA-README.TXT (100%)
 rename reactos/media/fonts/{ => doc}/VERA-RELEASENOTES.TXT (100%)

diff --git a/reactos/media/fonts/COPYRIGHT.IBM b/reactos/media/fonts/doc/COPYRIGHT.IBM
similarity index 100%
rename from reactos/media/fonts/COPYRIGHT.IBM
rename to reactos/media/fonts/doc/COPYRIGHT.IBM
diff --git a/reactos/media/fonts/Copyright.Bitstream b/reactos/media/fonts/doc/Copyright.Bitstream
similarity index 100%
rename from reactos/media/fonts/Copyright.Bitstream
rename to reactos/media/fonts/doc/Copyright.Bitstream
diff --git a/reactos/media/fonts/VERA-COPYRIGHT.TXT b/reactos/media/fonts/doc/VERA-COPYRIGHT.TXT
similarity index 100%
rename from reactos/media/fonts/VERA-COPYRIGHT.TXT
rename to reactos/media/fonts/doc/VERA-COPYRIGHT.TXT
diff --git a/reactos/media/fonts/VERA-README.TXT b/reactos/media/fonts/doc/VERA-README.TXT
similarity index 100%
rename from reactos/media/fonts/VERA-README.TXT
rename to reactos/media/fonts/doc/VERA-README.TXT
diff --git a/reactos/media/fonts/VERA-RELEASENOTES.TXT b/reactos/media/fonts/doc/VERA-RELEASENOTES.TXT
similarity index 100%
rename from reactos/media/fonts/VERA-RELEASENOTES.TXT
rename to reactos/media/fonts/doc/VERA-RELEASENOTES.TXT

From 3351ce053db3ef031b59dd83b47342343c01cb17 Mon Sep 17 00:00:00 2001
From: Gregor Anich <blight@blight.eu.org>
Date: Fri, 16 Jul 2004 23:48:54 +0000
Subject: [PATCH 329/356] Fixed more warnings, compiles with -Werror now.

svn path=/trunk/; revision=10165
---
 reactos/lib/mesa32/Makefile                   |  2 +-
 .../mesa32/src/drivers/windows/gdi/colors.h   | 11 +++++-
 .../mesa32/src/drivers/windows/gdi/wmesa.c    | 38 ++++++++++---------
 .../lib/mesa32/src/drivers/windows/icd/icd.c  | 13 +++----
 4 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/reactos/lib/mesa32/Makefile b/reactos/lib/mesa32/Makefile
index 0566a2f5944..72faf6cbf59 100644
--- a/reactos/lib/mesa32/Makefile
+++ b/reactos/lib/mesa32/Makefile
@@ -238,7 +238,7 @@ TARGET_NAME = mesa32
 
 TARGET_BASE = $(TARGET_BASE_LIB_MESA32)
 
-TARGET_CFLAGS = -D__USE_W32API -Wall $(MESA_CFLAGS)
+TARGET_CFLAGS = -D__USE_W32API -Wall -Werror $(MESA_CFLAGS)
 
 TARGET_GCCLIBS = gdi32
 
diff --git a/reactos/lib/mesa32/src/drivers/windows/gdi/colors.h b/reactos/lib/mesa32/src/drivers/windows/gdi/colors.h
index 19f11eacc0f..9db5a5cac47 100644
--- a/reactos/lib/mesa32/src/drivers/windows/gdi/colors.h
+++ b/reactos/lib/mesa32/src/drivers/windows/gdi/colors.h
@@ -24,6 +24,9 @@
 
 /*
  * $Log: colors.h,v $
+ * Revision 1.2  2004/07/16 23:48:24  blight
+ * Fixed more warnings, compiles with -Werror now.
+ *
  * Revision 1.1  2004/07/16 22:12:32  blight
  * Import Mesa-6.0.1 for use as software OpenGL renderer.
  *
@@ -52,6 +55,9 @@
 
 /*
  * $Log: colors.h,v $
+ * Revision 1.2  2004/07/16 23:48:24  blight
+ * Fixed more warnings, compiles with -Werror now.
+ *
  * Revision 1.1  2004/07/16 22:12:32  blight
  * Import Mesa-6.0.1 for use as software OpenGL renderer.
  *
@@ -80,6 +86,9 @@
  
 /*
  * $Log: colors.h,v $
+ * Revision 1.2  2004/07/16 23:48:24  blight
+ * Fixed more warnings, compiles with -Werror now.
+ *
  * Revision 1.1  2004/07/16 22:12:32  blight
  * Import Mesa-6.0.1 for use as software OpenGL renderer.
  *
@@ -150,7 +159,7 @@ char ColorMap16[] = {
 0x1E,0x1E,0x1E,0x1E,0x1E,0x1E,0x1E,0x1E,
 0x1F,0x1F,0x1F,0x1F,0x1F,0x1F,0x1F,0x1F};
 
-#define BGR8(r,g,b)		(unsigned)(((BYTE)(b & 0xc0 | (g & 0xe0)>>2 | (r & 0xe0)>>5)))
+#define BGR8(r,g,b)		(unsigned)(((BYTE)((b & 0xc0) | ((g & 0xe0)>>2) | ((r & 0xe0)>>5))))
 #ifdef DDRAW
 #define BGR16(r,g,b)	((WORD)(((BYTE)(ColorMap16[b]) | ((BYTE)(g&0xfc) << 3)) | (((WORD)(BYTE)(ColorMap16[r])) << 11)))
 #else
diff --git a/reactos/lib/mesa32/src/drivers/windows/gdi/wmesa.c b/reactos/lib/mesa32/src/drivers/windows/gdi/wmesa.c
index 0e6bd796fe4..37aae513dd9 100644
--- a/reactos/lib/mesa32/src/drivers/windows/gdi/wmesa.c
+++ b/reactos/lib/mesa32/src/drivers/windows/gdi/wmesa.c
@@ -45,6 +45,7 @@
 #include "array_cache/acache.h"
 #include "swrast/swrast.h"
 #include "swrast_setup/swrast_setup.h"
+#include "swrast/s_alphabuf.h"
 #include "swrast/s_context.h"
 #include "swrast/s_depth.h"
 #include "swrast/s_lines.h"
@@ -164,7 +165,7 @@ static BOOL DDCreateOffScreen(WMesaContext wc);
 #define USE_GDI_TO_CLEAR 1
 #endif
 
-static void FlushToFile(PWMC pwc, PSTR  szFile);
+//static void FlushToFile(PWMC pwc, PSTR  szFile);
 BOOL wmCreateBackingStore(PWMC pwc, long lxSize, long lySize);
 BOOL wmDeleteBackingStore(PWMC pwc);
 void wmCreatePalette( PWMC pwdc );
@@ -347,11 +348,12 @@ BOOL wmSetDIBits(PWMC pwc, UINT uiScanWidth, UINT uiNumScans,
 BYTE DITHER_RGB_2_8BIT( int r, int g, int b, int x, int y);
 
 /* Finish all pending operations and synchronize. */
+#if 0
 static void finish(GLcontext* ctx)
 {
   /* No op */
 }
-
+#endif
 
 static void flush(GLcontext* ctx)
 {
@@ -466,7 +468,7 @@ static void clear(GLcontext* ctx, GLbitfield mask,
    WORD    wColor; 
    BYTE    bColor; 
    LPDWORD lpdw = (LPDWORD)Current->pbPixels; 
-   LPWORD  lpw = (LPWORD)Current->pbPixels; 
+   //LPWORD  lpw = (LPWORD)Current->pbPixels; 
    LPBYTE  lpb = Current->pbPixels; 
    int     lines; 
    /* Double-buffering - clear back buffer */ 
@@ -600,7 +602,7 @@ static void set_buffer(GLcontext *ctx, GLframebuffer *colorBuffer,
 /* Return characteristics of the output buffer. */
 static void buffer_size( GLframebuffer *buffer, GLuint *width, GLuint *height )
 {
-  GET_CURRENT_CONTEXT(ctx);
+//  GET_CURRENT_CONTEXT(ctx);
   int New_Size;
   RECT CR;
   
@@ -647,7 +649,7 @@ static void buffer_size( GLframebuffer *buffer, GLuint *width, GLuint *height )
 /**********************************************************************/
 
 /* Accelerated routines are not implemented in 4.0. See OSMesa for ideas. */
-
+#if 0
 static void fast_rgb_points( GLcontext* ctx, GLuint first, GLuint last )
 {
 }
@@ -667,6 +669,7 @@ static line_func choose_line_function( GLcontext* ctx )
 {
   return NULL;
 }
+#endif
 
 
 /**********************************************************************/
@@ -735,7 +738,7 @@ static void write_rgba_span( const GLcontext* ctx, GLuint n, GLint x, GLint y,
   if (pwc->rgb_flag==GL_TRUE)
     {
       GLuint i;
-      HDC DC=DD_GETDC;
+      //HDC DC=DD_GETDC;
       y=FLIP(y);
       if (mask) {
 	for (i=0; i<n; i++)
@@ -783,7 +786,7 @@ static void write_rgb_span( const GLcontext* ctx,
   if (pwc->rgb_flag==GL_TRUE)
     {
       GLuint i;
-      HDC DC=DD_GETDC;
+      //HDC DC=DD_GETDC;
       y=FLIP(y);
       if (mask) {
 	for (i=0; i<n; i++)
@@ -902,7 +905,7 @@ static void write_rgba_pixels( const GLcontext* ctx,
 {
   GLuint i;
   PWMC    pwc = Current;
-  HDC DC=DD_GETDC;
+  //HDC DC=DD_GETDC;
   assert(Current->rgb_flag==GL_TRUE);
   for (i=0; i<n; i++)
     if (mask[i])
@@ -925,7 +928,7 @@ static void write_mono_rgba_pixels( const GLcontext* ctx,
 {
   GLuint i;
   PWMC    pwc = Current;
-  HDC DC=DD_GETDC;
+  //HDC DC=DD_GETDC;
   assert(Current->rgb_flag==GL_TRUE);
   for (i=0; i<n; i++)
     if (mask[i])
@@ -1103,7 +1106,7 @@ static void SetFunctionPointers(GLcontext *ctx)
 
 static void wmesa_update_state( GLcontext *ctx, GLuint new_state )
 {
-  struct swrast_device_driver *swdd = _swrast_GetDeviceDriverReference( ctx );
+//  struct swrast_device_driver *swdd = _swrast_GetDeviceDriverReference( ctx );
   TNLcontext *tnl = TNL_CONTEXT(ctx);
   
   /*
@@ -1195,7 +1198,7 @@ static void wmesa_update_state( GLcontext *ctx, GLuint new_state )
 /**********************************************************************/
 
 
-
+#if 0 /* unused */
 #define PAL_SIZE 256
 static void GetPalette(HPALETTE Pal,RGBQUAD *aRGB)
 {
@@ -1253,6 +1256,7 @@ static void GetPalette(HPALETTE Pal,RGBQUAD *aRGB)
       aRGB[i].rgbReserved=Palette.aEntries[i].peFlags;
     }
 }
+#endif /* 0 -- unused */
 
 
 WMesaContext WMesaCreateContext( HWND hWnd, HPALETTE* Pal,
@@ -1458,7 +1462,7 @@ void WMesaMakeCurrent( WMesaContext c )
 
 void WMesaSwapBuffers( void )
 {
-  HDC DC = Current->hDC;
+//  HDC DC = Current->hDC;
   GET_CURRENT_CONTEXT(ctx);
   
   /* If we're swapping the buffer associated with the current context
@@ -1764,14 +1768,14 @@ void  wmCreateDIBSection(
   pwc->hbmDIB = CreateDIBSection(hic,
 				 &(pwc->bmi),
 				 (iUsage ? DIB_PAL_COLORS : DIB_RGB_COLORS),
-				 &(pwc->pbPixels),
+				 (void **)&(pwc->pbPixels),
 				 pwc->dib.hFileMap,
 				 0);
 #else
   pwc->hbmDIB = CreateDIBSection(hic,
 				 &(pwc->bmi),
 				 (iUsage ? DIB_PAL_COLORS : DIB_RGB_COLORS),
-				 &(pwc->pbPixels),
+				 (void **)&(pwc->pbPixels),
 				 0,
 				 0);
 #endif // USE_MAPPED_FILE
@@ -1790,7 +1794,7 @@ void  wmCreateDIBSection(
 BOOL wmFlush(PWMC pwc)
 {
   BOOL    bRet = 0;
-  DWORD   dwErr = 0;
+//  DWORD   dwErr = 0;
 #ifdef DDRAW
   HRESULT             ddrval;
 #endif
@@ -3204,9 +3208,9 @@ static void flat_DITHER8_triangle( GLcontext *ctx, GLuint v0, GLuint v1,
 #endif
 /************** END DEAD TRIANGLE CODE ***********************/
 
+#if 0
 static triangle_func choose_triangle_function( GLcontext *ctx )
 {
-#if 0
     WMesaContext wmesa = (WMesaContext) ctx->DriverCtx;
     int depth = wmesa->cColorBits;
 
@@ -3296,8 +3300,8 @@ static triangle_func choose_triangle_function( GLcontext *ctx )
 
     return NULL;
     }
-#endif
 }
+#endif
 
 /*
  * Define a new viewport and reallocate auxillary buffers if the size of
diff --git a/reactos/lib/mesa32/src/drivers/windows/icd/icd.c b/reactos/lib/mesa32/src/drivers/windows/icd/icd.c
index 0be278102c5..7d605b5a4a6 100644
--- a/reactos/lib/mesa32/src/drivers/windows/icd/icd.c
+++ b/reactos/lib/mesa32/src/drivers/windows/icd/icd.c
@@ -29,9 +29,8 @@ extern "C" {
 
 #include <windows.h>
 #define GL_GLEXT_PROTOTYPES
-#include <GL/gl.h>
-#include <GL/glext.h>
-//#include <GL/glu.h>
+#include "GL/gl.h"
+#include "GL/glext.h"
 
 #ifdef __cplusplus
 }
@@ -39,7 +38,7 @@ extern "C" {
 
 #include <stdio.h>
 #include <tchar.h>
-#include "wmesadef.h"
+#include "../gdi/wmesadef.h"
 #include "GL/wmesa.h"
 #include "mtypes.h"
 #include "glapi.h"
@@ -53,7 +52,7 @@ typedef struct _icdTable {
 } ICDTABLE, *PICDTABLE;
 
 static ICDTABLE icdTable = { 336, {
-#define ICD_ENTRY(func) mgl##func,
+#define ICD_ENTRY(func) (PROC)mgl##func,
 #include "icdlist.h"
 #undef ICD_ENTRY
 } };
@@ -218,13 +217,13 @@ WGLAPI BOOL GLAPIENTRY DrvShareLists(HGLRC hglrc1,HGLRC hglrc2)
     return(TRUE);
 }
 
-
+#if 0
 static FIXED FixedFromDouble(double d)
 {
    long l = (long) (d * 65536L);
    return *(FIXED *)&l;
 }
-
+#endif
 
 WGLAPI BOOL GLAPIENTRY DrvDescribeLayerPlane(HDC hdc,int iPixelFormat,
                                     int iLayerPlane,UINT nBytes,

From a69987ef043d6df7b84c3fce3f36e616c780924b Mon Sep 17 00:00:00 2001
From: Gregor Anich <blight@blight.eu.org>
Date: Fri, 16 Jul 2004 23:53:38 +0000
Subject: [PATCH 330/356] Add registry entries for the Mesa OpenGL driver.

svn path=/trunk/; revision=10166
---
 reactos/bootdata/hivesft.inf | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/reactos/bootdata/hivesft.inf b/reactos/bootdata/hivesft.inf
index 97f688374f0..bb5cf7a23f3 100644
--- a/reactos/bootdata/hivesft.inf
+++ b/reactos/bootdata/hivesft.inf
@@ -57,4 +57,12 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Sans
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg",0x00000000,"Bitstream Vera Sans"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg 2",0x00000000,"Bitstream Vera Sans"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Helv",0x00000000,"Bitstream Vera Sans"
+
+; Mesa OpenGL Driver
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers","DefaultDriver",0x00000000,"Mesa"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\Mesa","Version",0x00010001,0x00000002
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\Mesa","Dll",0x00000000,"mesa32"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\Mesa","DriverVersion",0x00010001,0x00000010
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\Mesa","Flags",0x00010001,0x00000001
+
 ; EOF

From 858364e468b5f107d67dfb53787965a952fb63d0 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Sat, 17 Jul 2004 01:12:24 +0000
Subject: [PATCH 331/356] Added keys for Winsock

svn path=/trunk/; revision=10167
---
 reactos/bootdata/hivesys.inf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reactos/bootdata/hivesys.inf b/reactos/bootdata/hivesys.inf
index d8830c1c283..d9656c05828 100644
--- a/reactos/bootdata/hivesys.inf
+++ b/reactos/bootdata/hivesys.inf
@@ -553,7 +553,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","MaxSockAddrLe
 HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","MinSockAddrLength",0x00010001,0x00000010
 HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","HelperDllName",0x00000000,"%SystemRoot%\System32\wshtcpip.dll"
 HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","Mapping",0x00000000,0b,00,00,00,03,00,00,00,02,00,00,00,01,00,00,00,06,00,00,00,02,00,00,00,01,00,00,00,00,00,00,00,02,00,00,00,00,00,00,00,06,00,00,00,00,00,00,00,00,00,00,00,06,00,00,00,00,00,00,00,01,00,00,00,06,00,00,00,02,00,00,00,02,00,00,00,11,00,00,00,02,00,00,00,02,00,00,00,00,00,00,00,02,00,00,00,00,00,00,00,11,00,00,00,00,00,00,00,00,00,00,00,11,00,00,00,00,00,00,00,02,00,00,00,11,00,00,00,02,00,00,00,03,00,00,00,00,00,00,00
-HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock\Parameters","Transports",0x00000000,54,63,70,69,70,00,4e,65,74,42,49,4f,53,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Winsock\Parameters","Transports",0x00000000,54,63,70,69,70,00,4e,65,74,42,49,4f,53,00,00
 
 ; Virtual FAT filesystem driver
 HKLM,"SYSTEM\CurrentControlSet\Services\Vfatfs","ErrorControl",0x00010001,0x00000000

From 60676902f6074e30516bf91b24b0f910e504ddd1 Mon Sep 17 00:00:00 2001
From: Gregor Anich <blight@blight.eu.org>
Date: Sat, 17 Jul 2004 02:26:33 +0000
Subject: [PATCH 332/356] Fix loading of default driver.

svn path=/trunk/; revision=10168
---
 reactos/lib/opengl32/opengl32.c | 4 ++--
 reactos/lib/opengl32/opengl32.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/reactos/lib/opengl32/opengl32.c b/reactos/lib/opengl32/opengl32.c
index 1087efc3909..e4c258eb763 100644
--- a/reactos/lib/opengl32/opengl32.c
+++ b/reactos/lib/opengl32/opengl32.c
@@ -1,4 +1,4 @@
-/* $Id: opengl32.c,v 1.17 2004/07/16 16:16:16 blight Exp $
+/* $Id: opengl32.c,v 1.18 2004/07/17 02:26:33 blight Exp $
  *
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS kernel
@@ -601,7 +601,7 @@ static DWORD
 OPENGL32_RegGetDriverInfo( LPCWSTR driver, GLDRIVERDATA *icd )
 {
 	HKEY hKey;
-	WCHAR subKey[1024] = OPENGL_DRIVERS_SUBKEY;
+	WCHAR subKey[1024] = OPENGL_DRIVERS_SUBKEY"\\";
 	LONG ret;
 	DWORD type, size;
 
diff --git a/reactos/lib/opengl32/opengl32.h b/reactos/lib/opengl32/opengl32.h
index c531b7d3c8a..017b8c24aca 100644
--- a/reactos/lib/opengl32/opengl32.h
+++ b/reactos/lib/opengl32/opengl32.h
@@ -1,4 +1,4 @@
-/* $Id: opengl32.h,v 1.16 2004/07/16 16:16:16 blight Exp $
+/* $Id: opengl32.h,v 1.17 2004/07/17 02:26:33 blight Exp $
  *
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS kernel
@@ -22,7 +22,7 @@ extern "C" {
 # define PFD_GENERIC_ACCELERATED 0x00001000
 #endif
 
-#define OPENGL_DRIVERS_SUBKEY L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\OpenGLDrivers\\"
+#define OPENGL_DRIVERS_SUBKEY L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\OpenGLDrivers"
 
 /* gl function list */
 #include "glfuncs.h"

From a0e9802e9079b011907ae3b7c3b2685ce22130e3 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Sat, 17 Jul 2004 03:03:52 +0000
Subject: [PATCH 333/356] Added Mm Stubs

svn path=/trunk/; revision=10169
---
 reactos/ntoskrnl/mm/mdl.c      | 104 ++++++++++++++++++++++++++++++++-
 reactos/ntoskrnl/mm/mm.c       |  18 +++++-
 reactos/ntoskrnl/mm/paging.c   |  14 +++++
 reactos/ntoskrnl/mm/physical.c |  91 +++++++++++++++++++++++++++++
 reactos/ntoskrnl/mm/pool.c     |  30 +++++++++-
 reactos/ntoskrnl/mm/section.c  |  29 ++++++++-
 reactos/ntoskrnl/mm/verifier.c |  62 ++++++++++++++++++++
 reactos/ntoskrnl/mm/virtual.c  |  16 ++++-
 reactos/ntoskrnl/mm/wset.c     |  15 ++++-
 9 files changed, 372 insertions(+), 7 deletions(-)
 create mode 100644 reactos/ntoskrnl/mm/physical.c
 create mode 100644 reactos/ntoskrnl/mm/verifier.c

diff --git a/reactos/ntoskrnl/mm/mdl.c b/reactos/ntoskrnl/mm/mdl.c
index c6d8a369426..f221dfcd9ef 100644
--- a/reactos/ntoskrnl/mm/mdl.c
+++ b/reactos/ntoskrnl/mm/mdl.c
@@ -1,4 +1,4 @@
-/* $Id: mdl.c,v 1.64 2004/06/06 07:52:22 hbirr Exp $
+/* $Id: mdl.c,v 1.65 2004/07/17 03:03:51 ion Exp $
  *
  * COPYRIGHT:    See COPYING in the top level directory
  * PROJECT:      ReactOS kernel
@@ -45,6 +45,20 @@ MDL_PARTIAL_HAS_BEEN_MAPPED   mdl flagged MDL_PARTIAL has been mapped into kerne
 
 /* FUNCTIONS *****************************************************************/
 
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+MmAdvanceMdl (
+    IN PMDL Mdl,
+    IN ULONG NumberOfBytes
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
 VOID INIT_FUNCTION
 MmInitializeMdlImplementation(VOID)
 {
@@ -93,6 +107,7 @@ MmGetMdlPageAddress(PMDL Mdl, PVOID Offset)
    return((PVOID)MdlPages[((ULONG)Offset) / PAGE_SIZE]);
 }
 
+
 /*
  * @implemented
  */
@@ -311,6 +326,23 @@ MmMapLockedPages(PMDL Mdl, KPROCESSOR_MODE AccessMode)
    return((char*)Base + Mdl->ByteOffset);
 }
 
+
+/*
+ * @unimplemented
+ */
+PVOID
+STDCALL
+MmMapLockedPagesWithReservedMapping (
+    IN PVOID MappingAddress,
+    IN ULONG PoolTag,
+    IN PMDL MemoryDescriptorList,
+    IN MEMORY_CACHING_TYPE CacheType
+    )
+{
+	UNIMPLEMENTED;
+	return 0;
+}
+
 /*
  * @implemented
  */
@@ -401,6 +433,20 @@ MmUnmapLockedPages(PVOID BaseAddress, PMDL Mdl)
 
 }
 
+/*
+ * @unimplemented
+ */
+VOID
+STDCALL
+MmUnmapReservedMapping (
+     IN PVOID BaseAddress,
+     IN ULONG PoolTag,
+     IN PMDL MemoryDescriptorList
+     )
+{
+	UNIMPLEMENTED;
+}
+
 
 VOID
 MmBuildMdlFromPages(PMDL Mdl, PULONG Pages)
@@ -419,6 +465,33 @@ MmBuildMdlFromPages(PMDL Mdl, PULONG Pages)
    Mdl->MdlFlags |= MDL_IO_PAGE_READ;
 }
 
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+MmPrefetchPages (
+    IN ULONG NumberOfLists,
+    IN PREAD_LIST *ReadLists
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+MmProtectMdlSystemAddress (
+    IN PMDL MemoryDescriptorList,
+    IN ULONG NewProtect
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
 
 
 /*
@@ -548,6 +621,35 @@ VOID STDCALL MmProbeAndLockPages (PMDL Mdl,
    Mdl->MdlFlags |= MDL_PAGES_LOCKED;
 }
 
+/*
+ * @unimplemented
+ */
+VOID
+STDCALL
+MmProbeAndLockProcessPages (
+    IN OUT PMDL MemoryDescriptorList,
+    IN PEPROCESS Process,
+    IN KPROCESSOR_MODE AccessMode,
+    IN LOCK_OPERATION Operation
+    )
+{
+	UNIMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+VOID 
+STDCALL
+MmProbeAndLockSelectedPages(
+	IN OUT PMDL MemoryDescriptorList,
+	IN LARGE_INTEGER PageList[],
+	IN KPROCESSOR_MODE AccessMode,
+	IN LOCK_OPERATION Operation
+	)
+{
+	UNIMPLEMENTED;
+}
 
 /*
  * @implemented
diff --git a/reactos/ntoskrnl/mm/mm.c b/reactos/ntoskrnl/mm/mm.c
index f7cf9122d26..ee2b31af07e 100644
--- a/reactos/ntoskrnl/mm/mm.c
+++ b/reactos/ntoskrnl/mm/mm.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: mm.c,v 1.74 2004/06/01 10:16:26 gdalsnes Exp $
+/* $Id: mm.c,v 1.75 2004/07/17 03:03:51 ion Exp $
  *
  * COPYRIGHT:   See COPYING in the top directory
  * PROJECT:     ReactOS kernel 
@@ -44,8 +44,9 @@
 
 PVOID EXPORTED MmUserProbeAddress = NULL;
 PVOID EXPORTED MmHighestUserAddress = NULL;
+PBOOLEAN EXPORTED Mm64BitPhysicalAddress = FALSE;
+PVOID EXPORTED MmSystemRangeStart = NULL;
 
-PVOID MmSystemRangeStart = NULL;
 MM_STATS MmStats;
 
 /* FUNCTIONS ****************************************************************/
@@ -521,4 +522,17 @@ MmSetAddressRangeModified (
    return (FALSE);
 }
 
+/*
+ * @unimplemented
+ */
+NTKERNELAPI
+PVOID
+MmGetSystemRoutineAddress (
+    IN PUNICODE_STRING SystemRoutineName
+    )
+{
+	UNIMPLEMENTED;
+	return 0;
+}
+
 /* EOF */
diff --git a/reactos/ntoskrnl/mm/paging.c b/reactos/ntoskrnl/mm/paging.c
index c6ff3a37f5f..194cd5655c0 100644
--- a/reactos/ntoskrnl/mm/paging.c
+++ b/reactos/ntoskrnl/mm/paging.c
@@ -17,3 +17,17 @@
 
 /* FUNCTIONS *****************************************************************/
 
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+MmMapUserAddressesToPage (
+    IN PVOID BaseAddress,
+    IN SIZE_T NumberOfBytes,
+    IN PVOID PageAddress
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
diff --git a/reactos/ntoskrnl/mm/physical.c b/reactos/ntoskrnl/mm/physical.c
new file mode 100644
index 00000000000..1207b2277ca
--- /dev/null
+++ b/reactos/ntoskrnl/mm/physical.c
@@ -0,0 +1,91 @@
+/*
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS kernel
+ * FILE:            ntoskrnl/mm/physical.c
+ * PURPOSE:         Physical Memory Manipulation functions
+ * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
+ * UPDATE HISTORY:
+ *                  Created 16/07/04
+ */
+
+/* INCLUDES *****************************************************************/
+
+#include <ddk/ntddk.h>
+
+#include <internal/debug.h>
+
+
+/* FUNCTIONS *****************************************************************/
+
+
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+MmAddPhysicalMemory (
+    IN PPHYSICAL_ADDRESS StartAddress,
+    IN OUT PLARGE_INTEGER NumberOfBytes
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+MmMarkPhysicalMemoryAsBad(
+    IN PPHYSICAL_ADDRESS StartAddress,
+    IN OUT PLARGE_INTEGER NumberOfBytes
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+MmMarkPhysicalMemoryAsGood(
+    IN PPHYSICAL_ADDRESS StartAddress,
+    IN OUT PLARGE_INTEGER NumberOfBytes
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+MmRemovePhysicalMemory (
+    IN PPHYSICAL_ADDRESS StartAddress,
+    IN OUT PLARGE_INTEGER NumberOfBytes
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+PPHYSICAL_MEMORY_RANGE
+STDCALL
+MmGetPhysicalMemoryRanges (
+    VOID
+    )
+{
+	UNIMPLEMENTED;
+	return 0;
+}
diff --git a/reactos/ntoskrnl/mm/pool.c b/reactos/ntoskrnl/mm/pool.c
index e26bcde483d..0080bfa2567 100644
--- a/reactos/ntoskrnl/mm/pool.c
+++ b/reactos/ntoskrnl/mm/pool.c
@@ -1,4 +1,4 @@
-/* $Id: pool.c,v 1.29 2004/06/23 21:50:59 ion Exp $
+/* $Id: pool.c,v 1.30 2004/07/17 03:03:52 ion Exp $
  * 
  * COPYRIGHT:    See COPYING in the top level directory
  * PROJECT:      ReactOS kernel
@@ -222,6 +222,34 @@ ExQueryPoolBlockSize (
 	return FALSE;
 }
 
+/*
+ * @unimplemented
+ */
+PVOID
+STDCALL
+MmAllocateMappingAddress (
+     IN SIZE_T NumberOfBytes,
+     IN ULONG PoolTag
+     )
+{
+	UNIMPLEMENTED;
+	return 0;
+}
+
+
+/*
+ * @unimplemented
+ */
+VOID
+STDCALL
+MmFreeMappingAddress (
+     IN PVOID BaseAddress,
+     IN ULONG PoolTag
+     )
+{
+	UNIMPLEMENTED;
+}
+
 /* EOF */
 
 
diff --git a/reactos/ntoskrnl/mm/section.c b/reactos/ntoskrnl/mm/section.c
index 9d8b9b32bd3..e8a4e8357b8 100644
--- a/reactos/ntoskrnl/mm/section.c
+++ b/reactos/ntoskrnl/mm/section.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: section.c,v 1.153 2004/07/10 17:01:02 hbirr Exp $
+/* $Id: section.c,v 1.154 2004/07/17 03:03:52 ion Exp $
  *
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/mm/section.c
@@ -4113,6 +4113,21 @@ MmMapViewInSystemSpace (IN PVOID SectionObject,
    return Status;
 }
 
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+MmMapViewInSessionSpace (
+    IN PVOID Section,
+    OUT PVOID *MappedBase,
+    IN OUT PSIZE_T ViewSize
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
 
 /*
  * @implemented
@@ -4132,6 +4147,18 @@ MmUnmapViewInSystemSpace (IN PVOID MappedBase)
    return Status;
 }
 
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+MmUnmapViewInSessionSpace (
+    IN PVOID MappedBase
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
 
 /*
  * @unimplemented
diff --git a/reactos/ntoskrnl/mm/verifier.c b/reactos/ntoskrnl/mm/verifier.c
new file mode 100644
index 00000000000..381046c1c0b
--- /dev/null
+++ b/reactos/ntoskrnl/mm/verifier.c
@@ -0,0 +1,62 @@
+/*
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS kernel
+ * FILE:            ntoskrnl/mm/verifier.c
+ * PURPOSE:         Driver Verifier functions
+ * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
+ * UPDATE HISTORY:
+ *                  Created 16/07/04
+ */
+
+/* INCLUDES *****************************************************************/
+
+#include <ddk/ntddk.h>
+
+#include <internal/debug.h>
+
+
+/* FUNCTIONS *****************************************************************/
+
+
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+MmAddVerifierThunks (
+    IN PVOID ThunkBuffer,
+    IN ULONG ThunkBufferSize
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+
+ULONG
+STDCALL
+MmIsDriverVerifying (
+    IN struct _DRIVER_OBJECT *DriverObject
+    )
+{
+	UNIMPLEMENTED;
+	return 0;
+}
+
+
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+MmIsVerifierEnabled (
+    OUT PULONG VerifierFlags
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
\ No newline at end of file
diff --git a/reactos/ntoskrnl/mm/virtual.c b/reactos/ntoskrnl/mm/virtual.c
index 403ff839235..d2eae03a13b 100644
--- a/reactos/ntoskrnl/mm/virtual.c
+++ b/reactos/ntoskrnl/mm/virtual.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: virtual.c,v 1.78 2004/07/10 17:01:02 hbirr Exp $
+/* $Id: virtual.c,v 1.79 2004/07/17 03:03:52 ion Exp $
  *
  * PROJECT:     ReactOS kernel
  * FILE:        ntoskrnl/mm/virtual.c
@@ -547,6 +547,20 @@ NtWriteVirtualMemory(IN HANDLE ProcessHandle,
    return(STATUS_SUCCESS);
 }
 
+/*
+ * @unimplemented
+ */
+
+PVOID
+STDCALL
+MmGetVirtualForPhysical (
+    IN PHYSICAL_ADDRESS PhysicalAddress
+    )
+{
+	UNIMPLEMENTED;
+	return 0;
+}
+
 /* FUNCTION:
  * Called from EngSecureMem (subsys\win32k\eng\mem.c)
  * @unimplemented
diff --git a/reactos/ntoskrnl/mm/wset.c b/reactos/ntoskrnl/mm/wset.c
index 69477b025b7..e522af2a641 100644
--- a/reactos/ntoskrnl/mm/wset.c
+++ b/reactos/ntoskrnl/mm/wset.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: wset.c,v 1.18 2004/04/10 22:35:26 gdalsnes Exp $
+/* $Id: wset.c,v 1.19 2004/07/17 03:03:52 ion Exp $
  * 
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/mm/wset.c
@@ -68,3 +68,16 @@ MmTrimUserMemory(ULONG Target, ULONG Priority, PULONG NrFreedPages)
    }
    return(STATUS_SUCCESS);
 }
+
+/*
+ * @unimplemented
+ */
+ULONG
+STDCALL
+MmTrimAllSystemPagableMemory (
+	IN ULONG PurgeTransitionList
+	)
+{
+	UNIMPLEMENTED;
+	return 0;
+}

From e7874284d045e3bf81265b2cc6163879b71534be Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Sat, 17 Jul 2004 03:04:45 +0000
Subject: [PATCH 334/356] Added Mm Prototypes

svn path=/trunk/; revision=10170
---
 reactos/include/ddk/mmfuncs.h | 164 +++++++++++++++++++++++++++++++++-
 reactos/include/ddk/mmtypes.h |  21 ++++-
 reactos/include/ntos/mm.h     |   1 +
 3 files changed, 183 insertions(+), 3 deletions(-)

diff --git a/reactos/include/ddk/mmfuncs.h b/reactos/include/ddk/mmfuncs.h
index 40a5be072a4..76ed46e9f5f 100644
--- a/reactos/include/ddk/mmfuncs.h
+++ b/reactos/include/ddk/mmfuncs.h
@@ -1,6 +1,6 @@
 #ifndef _INCLUDE_DDK_MMFUNCS_H
 #define _INCLUDE_DDK_MMFUNCS_H
-/* $Id: mmfuncs.h,v 1.22 2004/05/15 22:45:51 hbirr Exp $ */
+/* $Id: mmfuncs.h,v 1.23 2004/07/17 03:04:45 ion Exp $ */
 /* MEMORY MANAGMENT ******************************************************/
 
 
@@ -65,6 +65,20 @@ extern inline unsigned int ADDRESS_AND_SIZE_TO_SPAN_PAGES(PVOID Va,
 #define PAGE_ALIGN(va) ( (PVOID) (((ULONG)(va)) & (~(PAGE_SIZE-1))) )
 #define PAGE_BASE(va) PAGE_ALIGN(va)
 
+NTSTATUS
+STDCALL
+MmAddPhysicalMemory (
+    IN PPHYSICAL_ADDRESS StartAddress,
+    IN OUT PLARGE_INTEGER NumberOfBytes
+    );
+
+NTSTATUS
+STDCALL
+MmAddVerifierThunks (
+    IN PVOID ThunkBuffer,
+    IN ULONG ThunkBufferSize
+    );
+
 
 DWORD
 STDCALL
@@ -73,6 +87,14 @@ MmAdjustWorkingSetSize (
 	DWORD	Unknown1,
 	DWORD	Unknown2
 	);
+
+NTSTATUS
+STDCALL
+MmAdvanceMdl (
+    IN PMDL Mdl,
+    IN ULONG NumberOfBytes
+    );
+
 PVOID
 STDCALL
 MmAllocateContiguousMemory (
@@ -96,6 +118,13 @@ MmAllocateContiguousAlignedMemory(IN ULONG NumberOfBytes,
 			          IN MEMORY_CACHING_TYPE CacheType OPTIONAL,
 					  IN ULONG Alignment);
 
+PVOID
+STDCALL
+MmAllocateMappingAddress (
+     IN SIZE_T NumberOfBytes,
+     IN ULONG PoolTag
+     );
+
 PVOID
 STDCALL
 MmAllocateNonCachedMemory (
@@ -181,6 +210,14 @@ MmFreeContiguousMemorySpecifyCache(IN PVOID BaseAddress,
 				IN ULONG NumberOfBytes,
 			    IN MEMORY_CACHING_TYPE CacheType
 			    );
+
+VOID
+STDCALL
+MmFreeMappingAddress (
+     IN PVOID BaseAddress,
+     IN ULONG PoolTag
+     );
+
 VOID
 STDCALL
 MmFreeNonCachedMemory (
@@ -228,6 +265,12 @@ MmGetPhysicalAddress (
 	IN	PVOID	BaseAddress
 	);
 
+PPHYSICAL_MEMORY_RANGE
+STDCALL
+MmGetPhysicalMemoryRanges (
+    VOID
+    );
+
 #define MmGetProcedureAddress(Address) (Address)
 
 /*
@@ -249,6 +292,18 @@ MmGetPhysicalAddress (
 	(((Mdl)->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA | MDL_SOURCE_IS_NONPAGED_POOL)) ? \
 		((Mdl)->MappedSystemVa):(MmMapLockedPages((Mdl),KernelMode)))
 
+PVOID
+STDCALL
+MmGetSystemRoutineAddress (
+    IN PUNICODE_STRING SystemRoutineName
+    );
+
+PVOID
+STDCALL
+MmGetVirtualForPhysical (
+    IN PHYSICAL_ADDRESS PhysicalAddress
+    );
+
 NTSTATUS
 STDCALL
 MmGrowKernelStack (
@@ -294,6 +349,11 @@ STDCALL
 MmIsAddressValid (
 	IN	PVOID	VirtualAddress
 	);
+ULONG
+STDCALL
+MmIsDriverVerifying (
+    IN struct _DRIVER_OBJECT *DriverObject
+    );
 BOOLEAN
 STDCALL
 MmIsNonPagedSystemAddressValid (
@@ -315,6 +375,13 @@ STDCALL
 MmIsThisAnNtAsSystem (
 	VOID
 	);
+
+NTSTATUS
+STDCALL
+MmIsVerifierEnabled (
+    OUT PULONG VerifierFlags
+    );
+
 /*
  * FUNCTION: Locks a section of the driver's code into memory
  * ARGUMENTS:
@@ -378,6 +445,21 @@ MmMapMemoryDumpMdl (
 	);
 PVOID
 STDCALL
+MmMapLockedPagesWithReservedMapping (
+    IN PVOID MappingAddress,
+    IN ULONG PoolTag,
+    IN PMDL MemoryDescriptorList,
+    IN MEMORY_CACHING_TYPE CacheType
+    );
+NTSTATUS
+STDCALL
+MmMapUserAddressesToPage (
+    IN PVOID BaseAddress,
+    IN SIZE_T NumberOfBytes,
+    IN PVOID PageAddress
+    );
+PVOID
+STDCALL
 MmMapVideoDisplay (
 	IN	PHYSICAL_ADDRESS	PhysicalAddress,
 	IN	ULONG			NumberOfBytes,
@@ -385,11 +467,19 @@ MmMapVideoDisplay (
 	);
 NTSTATUS
 STDCALL
+MmMapViewInSessionSpace (
+    IN	PVOID Section,
+    OUT PVOID *MappedBase,
+    IN	OUT PSIZE_T ViewSize
+    );
+NTSTATUS
+STDCALL
 MmMapViewInSystemSpace (
 	IN	PVOID	SectionObject,
 	OUT	PVOID	* MappedBase,
 	IN	PULONG	ViewSize
 	);
+
 NTSTATUS
 STDCALL
 MmMapViewOfSection (
@@ -404,6 +494,19 @@ MmMapViewOfSection (
 	IN	ULONG		AllocationType,
 	IN	ULONG		Protect
 	);
+NTSTATUS
+STDCALL
+MmMarkPhysicalMemoryAsBad(
+    IN PPHYSICAL_ADDRESS StartAddress,
+    IN OUT PLARGE_INTEGER NumberOfBytes
+    );
+
+NTSTATUS
+STDCALL
+MmMarkPhysicalMemoryAsGood(
+    IN PPHYSICAL_ADDRESS StartAddress,
+    IN OUT PLARGE_INTEGER NumberOfBytes
+    );
 
 /*
  * FUNCTION: Makes the whole driver pageable
@@ -416,6 +519,13 @@ MmPageEntireDriver (
 	PVOID	AddressWithinSection
 	);
 
+NTSTATUS
+STDCALL
+MmPrefetchPages (
+    IN ULONG NumberOfLists,
+    IN PREAD_LIST *ReadLists
+    );
+
 /*
  * VOID
  * MmPrepareMdlForReuse (
@@ -457,6 +567,32 @@ MmProbeAndLockPages (
 	LOCK_OPERATION	Operation
 	);
 
+VOID
+STDCALL
+MmProbeAndLockProcessPages (
+    IN OUT PMDL MemoryDescriptorList,
+    IN PEPROCESS Process,
+    IN KPROCESSOR_MODE AccessMode,
+    IN LOCK_OPERATION Operation
+    );
+
+VOID 
+STDCALL
+MmProbeAndLockSelectedPages(
+	IN OUT PMDL MemoryDescriptorList,
+	IN LARGE_INTEGER PageList[],
+	IN KPROCESSOR_MODE AccessMode,
+	IN LOCK_OPERATION Operation
+	);
+
+NTSTATUS
+STDCALL
+MmProtectMdlSystemAddress (
+    IN PMDL MemoryDescriptorList,
+    IN ULONG NewProtect
+    );
+
+
 /*
  * FUNCTION: Returns an estimate of the amount of memory in the system
  * RETURNS: Either MmSmallSystem, MmMediumSystem or MmLargeSystem
@@ -467,6 +603,13 @@ MmQuerySystemSize (
 	VOID
 	);
 
+NTSTATUS
+STDCALL
+MmRemovePhysicalMemory (
+    IN PPHYSICAL_ADDRESS StartAddress,
+    IN OUT PLARGE_INTEGER NumberOfBytes
+    );
+
 /*
  * FUNCTION: Resets the pageable status of a driver's sections to their
  * compile time settings
@@ -517,6 +660,13 @@ MmSizeOfMdl (
 	PVOID	Base,
 	ULONG	Length
 	);
+
+ULONG
+STDCALL
+MmTrimAllSystemPagableMemory (
+	IN ULONG PurgeTransitionList
+	);
+
 /*
  * FUNCTION: Unlocks the physical pages described by a given MDL
  * ARGUMENTS:
@@ -552,6 +702,13 @@ MmUnmapLockedPages (
 	);
 VOID
 STDCALL
+MmUnmapReservedMapping (
+     IN PVOID BaseAddress,
+     IN ULONG PoolTag,
+     IN PMDL MemoryDescriptorList
+     );
+VOID
+STDCALL
 MmUnmapVideoDisplay (
 	IN	PVOID	BaseAddress,
 	IN	ULONG	NumberOfBytes
@@ -561,6 +718,11 @@ STDCALL
 MmUnmapViewInSystemSpace (
 	IN	PVOID	MappedBase
 	);
+NTSTATUS
+STDCALL
+MmUnmapViewInSessionSpace (
+    IN PVOID MappedBase
+    );
 #if 0
 NTSTATUS
 STDCALL
diff --git a/reactos/include/ddk/mmtypes.h b/reactos/include/ddk/mmtypes.h
index d403ca7ec93..4508ad169b1 100644
--- a/reactos/include/ddk/mmtypes.h
+++ b/reactos/include/ddk/mmtypes.h
@@ -1,4 +1,4 @@
-/* $Id: mmtypes.h,v 1.18 2003/12/31 05:33:03 jfilby Exp $ */
+/* $Id: mmtypes.h,v 1.19 2004/07/17 03:04:45 ion Exp $ */
 
 #ifndef _INCLUDE_DDK_MMTYPES_H
 #define _INCLUDE_DDK_MMTYPES_H
@@ -6,7 +6,6 @@
 #include <ddk/i386/pagesize.h>
 #include <ntos/mm.h>
 
-
 /*
  * FUNCTION: Determines if the given virtual address is page aligned
  */
@@ -65,6 +64,24 @@ typedef struct _MDL
    ULONG ByteOffset;
 } MDL, *PMDL;
 
+typedef struct _PHYSICAL_MEMORY_RANGE {
+	PHYSICAL_ADDRESS BaseAddress;
+	LARGE_INTEGER NumberOfBytes;
+} PHYSICAL_MEMORY_RANGE, *PPHYSICAL_MEMORY_RANGE; 
+
+// read file scatter / write file scatter
+typedef union _FILE_SEGMENT_ELEMENT {
+	PVOID Buffer;
+	ULONG Alignment;
+}FILE_SEGMENT_ELEMENT, *PFILE_SEGMENT_ELEMENT;
+
+typedef struct _READ_LIST {
+	struct FILE_OBJECT* FileObject;
+    ULONG NumberOfEntries;
+    ULONG IsImage;
+    FILE_SEGMENT_ELEMENT List[];
+} READ_LIST, *PREAD_LIST;
+
 #define MmSmallSystem (0)
 #define MmMediumSystem (1)
 #define MmLargeSystem (2)
diff --git a/reactos/include/ntos/mm.h b/reactos/include/ntos/mm.h
index 77f7970fe1a..ac361213a8e 100644
--- a/reactos/include/ntos/mm.h
+++ b/reactos/include/ntos/mm.h
@@ -54,6 +54,7 @@
 #define FILE_MAP_READ	(4)
 #define FILE_MAP_WRITE	(2)
 #define FILE_MAP_COPY	(1)
+
 #else /* __USE_W32API */
 
 #include <ddk/ntifs.h>

From 4762b47e36abee18888a1eecb3d95c1501b46500 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Sat, 17 Jul 2004 03:07:00 +0000
Subject: [PATCH 335/356] Added New System Call Prototypes and Stubs

svn path=/trunk/; revision=10171
---
 reactos/iface/native/sysfuncs.lst |  26 ++
 reactos/include/base.h            |   4 +-
 reactos/include/funcs.h           |  76 -----
 reactos/include/ntos/zw.h         | 496 +++++++++++++++++++++++++++++-
 reactos/include/ntos/zwtypes.h    |  29 +-
 reactos/include/structs.h         |  10 -
 reactos/ntoskrnl/Makefile         |   4 +-
 reactos/ntoskrnl/io/file.c        |  38 ++-
 reactos/ntoskrnl/nt/efi.c         | 129 ++++++++
 reactos/ntoskrnl/nt/ntevent.c     |  17 +
 reactos/ntoskrnl/ob/ntobj.c       |  16 +-
 reactos/ntoskrnl/po/power.c       |  36 ++-
 reactos/ntoskrnl/ps/job.c         | 121 ++++++++
 reactos/ntoskrnl/ps/locale.c      |  39 ++-
 reactos/ntoskrnl/ps/process.c     |  19 +-
 reactos/ntoskrnl/ps/thread.c      |  19 +-
 16 files changed, 969 insertions(+), 110 deletions(-)
 create mode 100644 reactos/ntoskrnl/nt/efi.c
 create mode 100644 reactos/ntoskrnl/ps/job.c

diff --git a/reactos/iface/native/sysfuncs.lst b/reactos/iface/native/sysfuncs.lst
index 2361f4a2529..c782b62a169 100644
--- a/reactos/iface/native/sysfuncs.lst
+++ b/reactos/iface/native/sysfuncs.lst
@@ -2,6 +2,7 @@ NtAcceptConnectPort ZwAcceptConnectPort 6
 NtAccessCheck ZwAccessCheck 8
 NtAccessCheckAndAuditAlarm ZwAccessCheckAndAuditAlarm 11
 NtAddAtom ZwAddAtom 3
+NtAddBootEntry ZwAddBootEntry 2
 NtAdjustGroupsToken ZwAdjustGroupsToken 6
 NtAdjustPrivilegesToken ZwAdjustPrivilegesToken 6
 NtAlertResumeThread ZwAlertResumeThread 2
@@ -9,6 +10,7 @@ NtAlertThread ZwAlertThread 1
 NtAllocateLocallyUniqueId ZwAllocateLocallyUniqueId 1
 NtAllocateUuids ZwAllocateUuids 3
 NtAllocateVirtualMemory ZwAllocateVirtualMemory 6
+NtAssignProcessToJobObject ZwAssignProcessToJobObject 2
 NtCallbackReturn ZwCallbackReturn 3
 NtCancelIoFile ZwCancelIoFile 2
 NtCancelTimer ZwCancelTimer 2
@@ -23,6 +25,7 @@ NtCreateEvent ZwCreateEvent 5
 NtCreateEventPair ZwCreateEventPair 3
 NtCreateFile ZwCreateFile 11
 NtCreateIoCompletion ZwCreateIoCompletion 4
+NtCreateJobObject ZwCreateJobObject 3
 NtCreateKey ZwCreateKey 7
 NtCreateMailslotFile ZwCreateMailslotFile 8
 NtCreateMutant ZwCreateMutant 4
@@ -40,6 +43,7 @@ NtCreateToken ZwCreateToken 13
 NtCreateWaitablePort ZwCreateWaitablePort 5
 NtDelayExecution ZwDelayExecution 2
 NtDeleteAtom ZwDeleteAtom 1
+NtDeleteBootEntry ZwDeleteBootEntry 2
 NtDeleteFile ZwDeleteFile 1
 NtDeleteKey ZwDeleteKey 1
 NtDeleteObjectAuditAlarm ZwDeleteObjectAuditAlarm 3
@@ -48,6 +52,7 @@ NtDeviceIoControlFile ZwDeviceIoControlFile 10
 NtDisplayString ZwDisplayString 1
 NtDuplicateObject ZwDuplicateObject 7
 NtDuplicateToken ZwDuplicateToken 6
+NtEnumerateBootEntries ZwEnumerateBootEntries 2
 NtEnumerateKey ZwEnumerateKey 6
 NtEnumerateValueKey ZwEnumerateValueKey 6
 NtExtendSection ZwExtendSection 2
@@ -65,12 +70,15 @@ NtGetTickCount ZwGetTickCount 0
 NtImpersonateClientOfPort ZwImpersonateClientOfPort 2
 NtImpersonateThread ZwImpersonateThread 3
 NtInitializeRegistry ZwInitializeRegistry 1
+NtInitiatePowerAction ZwInitiatePowerAction 4
+NtIsProcessInJob ZwIsProcessInJob 2
 NtListenPort ZwListenPort 2
 NtLoadDriver ZwLoadDriver 1
 NtLoadKey ZwLoadKey 2
 NtLoadKey2 ZwLoadKey2 3
 NtLockFile ZwLockFile 10
 NtLockVirtualMemory ZwLockVirtualMemory 4
+NtMakePermanentObject ZwMakePermanentObject 1
 NtMakeTemporaryObject ZwMakeTemporaryObject 1
 NtMapViewOfSection ZwMapViewOfSection 10
 NtNotifyChangeDirectoryFile ZwNotifyChangeDirectoryFile 9
@@ -80,18 +88,22 @@ NtOpenEvent ZwOpenEvent 3
 NtOpenEventPair ZwOpenEventPair 3
 NtOpenFile ZwOpenFile 6
 NtOpenIoCompletion ZwOpenIoCompletion 3
+NtOpenJobObject ZwOpenJobObject 3
 NtOpenKey ZwOpenKey 3
 NtOpenMutant ZwOpenMutant 3
 NtOpenObjectAuditAlarm ZwOpenObjectAuditAlarm 12
 NtOpenProcess ZwOpenProcess 4
 NtOpenProcessToken ZwOpenProcessToken 3
+NtOpenProcessTokenEx ZwOpenProcessTokenEx 4
 NtOpenSection ZwOpenSection 3
 NtOpenSemaphore ZwOpenSemaphore 3
 NtOpenSymbolicLinkObject ZwOpenSymbolicLinkObject 3
 NtOpenThread ZwOpenThread 4
 NtOpenThreadToken ZwOpenThreadToken 4
+NtOpenThreadTokenEx ZwOpenThreadTokenEx 5
 NtOpenTimer ZwOpenTimer 3
 NtPlugPlayControl ZwPlugPlayControl 4
+NtPowerInformation ZwPowerInformation 5
 NtPrivilegeCheck ZwPrivilegeCheck 3
 NtPrivilegedServiceAuditAlarm ZwPrivilegedServiceAuditAlarm 5
 NtPrivilegeObjectAuditAlarm ZwPrivilegeObjectAuditAlarm 6
@@ -99,17 +111,22 @@ NtProtectVirtualMemory ZwProtectVirtualMemory 5
 NtPulseEvent ZwPulseEvent 2
 NtQueryInformationAtom ZwQueryInformationAtom 5
 NtQueryAttributesFile ZwQueryAttributesFile 2
+NtQueryBootEntryOrder ZwQueryBootEntryOrder 2
+NtQueryBootOptions ZwQueryBootOptions 2
 NtQueryDefaultLocale ZwQueryDefaultLocale 2
+NtQueryDefaultUILanguage ZwQueryDefaultUILanguage 1
 NtQueryDirectoryFile ZwQueryDirectoryFile 11
 NtQueryDirectoryObject ZwQueryDirectoryObject 7
 NtQueryEaFile ZwQueryEaFile 9
 NtQueryEvent ZwQueryEvent 5
 NtQueryFullAttributesFile ZwQueryFullAttributesFile 2
 NtQueryInformationFile ZwQueryInformationFile 5
+NtQueryInformationJobObject ZwQueryInformationJobObject 5
 NtQueryInformationPort ZwQueryInformationPort 5
 NtQueryInformationProcess ZwQueryInformationProcess 5
 NtQueryInformationThread ZwQueryInformationThread 5
 NtQueryInformationToken ZwQueryInformationToken 5
+NtQueryInstallUILanguage ZwQueryInstallUILanguage 1
 NtQueryIntervalProfile ZwQueryIntervalProfile 2
 NtQueryIoCompletion ZwQueryIoCompletion 5
 NtQueryKey ZwQueryKey 5
@@ -118,6 +135,7 @@ NtQueryMutant ZwQueryMutant 5
 NtQueryObject ZwQueryObject 5
 NtQueryOleDirectoryFile ZwQueryOleDirectoryFile 11
 NtQueryPerformanceCounter ZwQueryPerformanceCounter 2
+NtQueryQuotaInformationFile ZwQueryQuotaInformationFile 9
 NtQuerySection ZwQuerySection 5
 NtQuerySecurityObject ZwQuerySecurityObject 5
 NtQuerySemaphore ZwQuerySemaphore 5
@@ -151,10 +169,13 @@ NtResetEvent ZwResetEvent 2
 NtRestoreKey ZwRestoreKey 3
 NtResumeThread ZwResumeThread 2
 NtSaveKey ZwSaveKey 2
+NtSetBootEntryOrder ZwSetBootEntryOrder 2
+NtSetBootOptions ZwSetBootOptions 2
 NtSetIoCompletion ZwSetIoCompletion 5
 NtSetContextThread ZwSetContextThread 2
 NtSetDefaultHardErrorPort ZwSetDefaultHardErrorPort 1
 NtSetDefaultLocale ZwSetDefaultLocale 2
+NtSetDefaultUILanguage ZwSetDefaultUILanguage 1
 NtSetEaFile ZwSetEaFile 4
 NtSetEvent ZwSetEvent 2
 NtSetHighEventPair ZwSetHighEventPair 1
@@ -162,6 +183,7 @@ NtSetHighWaitLowEventPair ZwSetHighWaitLowEventPair 1
 NtSetHighWaitLowThread ZwSetHighWaitLowThread 0
 NtSetInformationFile ZwSetInformationFile 5
 NtSetInformationKey ZwSetInformationKey 4
+NtSetInformationJobObject ZwSetInformationJobObject 4
 NtSetInformationObject ZwSetInformationObject 4
 NtSetInformationProcess ZwSetInformationProcess 4
 NtSetInformationThread ZwSetInformationThread 4
@@ -171,6 +193,7 @@ NtSetLdtEntries ZwSetLdtEntries 6
 NtSetLowEventPair ZwSetLowEventPair 1
 NtSetLowWaitHighEventPair ZwSetLowWaitHighEventPair 1
 NtSetLowWaitHighThread ZwSetLowWaitHighThread 0
+NtSetQuotaInformationFile ZwSetQuotaInformationFile 4
 NtSetSecurityObject ZwSetSecurityObject 3
 NtSetSystemEnvironmentValue ZwSetSystemEnvironmentValue 2
 NtSetSystemInformation ZwSetSystemInformation 3
@@ -186,9 +209,12 @@ NtStartProfile ZwStartProfile 1
 NtStopProfile ZwStopProfile 1
 NtSuspendThread ZwSuspendThread 2
 NtSystemDebugControl ZwSystemDebugControl 6
+NtTerminateJobObject ZwTerminateJobObject 2
 NtTerminateProcess ZwTerminateProcess 2
 NtTerminateThread ZwTerminateThread 2
 NtTestAlert ZwTestAlert 0
+NtTraceEvent ZwTraceEvent 4
+NtTranslateFilePath ZwTranslateFilePath 3
 NtUnloadDriver ZwUnloadDriver 1
 NtUnloadKey ZwUnloadKey 1
 NtUnlockFile ZwUnlockFile 5
diff --git a/reactos/include/base.h b/reactos/include/base.h
index 333a062fe56..d2c6486a478 100644
--- a/reactos/include/base.h
+++ b/reactos/include/base.h
@@ -155,7 +155,7 @@ typedef HANDLE HRAWINPUT;
 typedef HANDLE HTASK;
 typedef HANDLE HWINEVENTHOOK;
 typedef VOID (CALLBACK *WINEVENTPROC)(HWINEVENTHOOK hWinEventHook,DWORD event,HWND hwnd,LONG idObject,LONG idChild,DWORD idEventThread,DWORD dwmsEventTime);
-typedef unsigned short LANGID;
+//typedef unsigned short LANGID;
 /*typedef DWORD LCID; */
 typedef DWORD LCTYPE;
 /* typedef LOCALHANDLE */
@@ -744,7 +744,7 @@ typedef FARPROC ENHMFENUMPROC;
 typedef DWORD CCSTYLE, *PCCSTYLE, *LPCCSTYLE;
 typedef DWORD CCSTYLEFLAGA, *PCCSTYLEFLAGA, *LPCCSTYLEFLAGA;
 #define DECLARE_HANDLE(s) typedef HANDLE s
-typedef LANGID *PLANGID;
+//typedef LANGID *PLANGID;
 
 #endif /* ! defined (RC_INVOKED) */
 
diff --git a/reactos/include/funcs.h b/reactos/include/funcs.h
index de16fc11001..7ef6ce07a0c 100644
--- a/reactos/include/funcs.h
+++ b/reactos/include/funcs.h
@@ -1487,12 +1487,6 @@ NtOpenThreadTokenEx(
 	OUT PHANDLE TokenHandle
 	);
 
-NTSTATUS
-STDCALL
-NtQueryDefaultUILanguage(
-	OUT PLANGID LanguageId
-	);
-
 NTSTATUS
 STDCALL
 NtQueryInformationJobObject(
@@ -1503,11 +1497,6 @@ NtQueryInformationJobObject(
 	OUT PULONG ReturnLength OPTIONAL
 	);
 
-NTSTATUS
-STDCALL
-NtQueryInstallUILanguage(
-	OUT PLANGID LanguageId
-	);
 
 ULONG
 STDCALL
@@ -1562,27 +1551,12 @@ NtSecureConnectPort(
 	IN OUT PULONG ConnectDataLength OPTIONAL
 	);
 
-NTSTATUS
-STDCALL
-NtSetDefaultUILanguage(
-	IN LANGID LanguageId
-	);
-
 NTSTATUS
 STDCALL
 NtSetHighWaitLowThread(
 	VOID
 	);
 
-NTSTATUS
-STDCALL
-NtSetInformationJobObject(
-	IN HANDLE JobHandle,
-	IN JOBOBJECTINFOCLASS JobInformationClass,
-	IN PVOID JobInformation,
-	IN ULONG JobInformationLength
-	);
-
 NTSTATUS
 STDCALL
 NtSetLowWaitHighThread(
@@ -1960,12 +1934,6 @@ ZwOpenThreadTokenEx(
 	OUT PHANDLE TokenHandle
 	);
 
-NTSTATUS
-STDCALL
-ZwQueryDefaultUILanguage(
-	OUT PLANGID LanguageId
-	);
-
 NTSTATUS
 STDCALL
 ZwQueryInformationJobObject(
@@ -1976,32 +1944,12 @@ ZwQueryInformationJobObject(
 	OUT PULONG ReturnLength OPTIONAL
 	);
 
-NTSTATUS
-STDCALL
-ZwQueryInstallUILanguage(
-	OUT PLANGID LanguageId
-	);
-
 ULONG
 STDCALL
 ZwQueryPortInformationProcess(
 	VOID
 	);
 
-NTSTATUS
-STDCALL
-ZwQueryQuotaInformationFile(
-	IN HANDLE FileHandle,
-	OUT PIO_STATUS_BLOCK IoStatusBlock,
-	OUT PFILE_USER_QUOTA_INFORMATION Buffer,
-	IN ULONG BufferLength,
-	IN BOOLEAN ReturnSingleEntry,
-	IN PFILE_QUOTA_LIST_INFORMATION QuotaList OPTIONAL,
-	IN ULONG QuotaListLength,
-	IN PSID ResumeSid OPTIONAL,
-	IN BOOLEAN RestartScan
-	);
-
 NTSTATUS
 STDCALL
 ZwReleaseKeyedEvent(
@@ -2049,12 +1997,6 @@ ZwSecureConnectPort(
 	IN OUT PULONG ConnectDataLength OPTIONAL
 	);
 
-NTSTATUS
-STDCALL
-ZwSetDefaultUILanguage(
-	IN LANGID LanguageId
-	);
-
 NTSTATUS
 STDCALL
 ZwSetHighWaitLowThread(
@@ -2210,14 +2152,6 @@ NtGetDevicePowerState(
     IN HANDLE Device,
     OUT DEVICE_POWER_STATE *State
     );
-NTSTATUS
-STDCALL
-NtInitiatePowerAction(
-    IN POWER_ACTION SystemAction,
-    IN SYSTEM_POWER_STATE MinSystemState,
-    IN ULONG Flags,
-    IN BOOL Asynchronous
-    );
 BOOL
 STDCALL
 NtIsSystemResumeAutomatic(
@@ -2369,14 +2303,6 @@ ZwGetDevicePowerState(
     IN HANDLE Device,
     OUT DEVICE_POWER_STATE *State
     );
-NTSTATUS
-STDCALL
-ZwInitiatePowerAction(
-    IN POWER_ACTION SystemAction,
-    IN SYSTEM_POWER_STATE MinSystemState,
-    IN ULONG Flags,
-    IN BOOL Asynchronous
-    );
 BOOL
 STDCALL
 ZwIsSystemResumeAutomatic(
@@ -2474,8 +2400,6 @@ VOID STDCALL A_SHAFinal(PSHA_CONTEXT Context, PVOID Result);
 
 VOID STDCALL GdiInitializeLanguagePack(DWORD InitParam);
 BOOL STDCALL SetConsoleIcon(HICON hicon);
-NTSTATUS STDCALL NtPowerInformation(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5);
-NTSTATUS STDCALL ZwPowerInformation(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5);
 double __cdecl _CIpow(double x,double y);
 LPSTR __cdecl _ui64toa(
     ULONGLONG value,
diff --git a/reactos/include/ntos/zw.h b/reactos/include/ntos/zw.h
index 58622d3295f..0e311302ba7 100755
--- a/reactos/include/ntos/zw.h
+++ b/reactos/include/ntos/zw.h
@@ -1,5 +1,5 @@
 
-/* $Id: zw.h,v 1.26 2004/07/12 12:00:15 ekohl Exp $
+/* $Id: zw.h,v 1.27 2004/07/17 03:06:00 ion Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -53,6 +53,51 @@ typedef struct _EVENT_BASIC_INFORMATION
 	LONG EventState;
 } EVENT_BASIC_INFORMATION, *PEVENT_BASIC_INFORMATION;
 
+// wmi trace event data
+typedef struct _EVENT_TRACE_HEADER {
+  USHORT           Size;
+  UCHAR            HeaderType;
+  UCHAR            MarkerFlags;
+  union {
+    ULONG         Version;
+    struct {
+      UCHAR     Type;
+      UCHAR     Level;
+      USHORT    Version;
+    } Class;
+  };
+  LARGE_INTEGER        ThreadId;
+  LARGE_INTEGER    TimeStamp;
+    union {
+    GUID          Guid;
+    LARGE_INTEGER    GuidPtr;
+  };
+ union {
+    struct {
+      ULONG ClientContext;
+      ULONG Flags;
+    };
+    struct {
+      ULONG KernelTime;
+      ULONG UserTime;
+    };
+    ULONG64 ProcessorTime;
+  };
+  LARGE_INTEGER          ProcessorTime;
+} EVENT_TRACE_HEADER, *PEVENT_TRACE_HEADER;
+
+
+typedef struct _FILE_USER_QUOTA_INFORMATION {
+	ULONG NextEntryOffset;
+	ULONG SidLength;
+	LARGE_INTEGER ChangeTime;
+	LARGE_INTEGER QuotaUsed;
+	LARGE_INTEGER QuotaThreshold;
+	LARGE_INTEGER QuotaLimit;
+	SID Sid[1];
+} FILE_USER_QUOTA_INFORMATION, *PFILE_USER_QUOTA_INFORMATION;
+
+
 //#define LCID ULONG
 //#define SECURITY_INFORMATION ULONG
 //typedef ULONG SECURITY_INFORMATION;
@@ -75,6 +120,20 @@ NtAcceptConnectPort (PHANDLE PortHandle,
 		     PLPC_SECTION_READ ReadMap);
 #endif /* ndef __USE_NT_LPC__ */
 
+NTSTATUS
+STDCALL
+NtAddBootEntry(
+	IN PUNICODE_STRING EntryName,
+	IN PUNICODE_STRING EntryValue
+	);
+
+NTSTATUS
+STDCALL
+ZwAddBootEntry(
+	IN PUNICODE_STRING EntryName,
+	IN PUNICODE_STRING EntryValue
+	);
+
 /*
  * FUNCTION: Adjusts the groups in an access token
  * ARGUMENTS: 
@@ -255,6 +314,20 @@ ZwAllocateVirtualMemory (
 	IN ULONG  AllocationType,
 	IN ULONG  Protect);
 
+
+
+NTSTATUS 
+STDCALL 
+NtAssignProcessToJobObject(
+	HANDLE JobHandle,
+    HANDLE ProcessHandle);
+
+NTSTATUS 
+STDCALL 
+ZwAssignProcessToJobObject(
+	HANDLE JobHandle,
+    HANDLE ProcessHandle);
+
 /*
  * FUNCTION: Returns from a callback into user mode
  * ARGUMENTS:
@@ -314,6 +387,23 @@ ZwClearEvent(
 	IN HANDLE  EventHandle
 	);
 
+NTSTATUS 
+STDCALL 
+NtCreateJobObject(
+	PHANDLE JobHandle, 
+	ACCESS_MASK DesiredAccess,
+    POBJECT_ATTRIBUTES ObjectAttributes
+	);
+
+NTSTATUS 
+STDCALL 
+ZwCreateJobObject(
+	PHANDLE JobHandle, 
+	ACCESS_MASK DesiredAccess,
+    POBJECT_ATTRIBUTES ObjectAttributes
+	);
+
+
 /*
  * FUNCTION: Closes an object handle
  * ARGUMENTS:
@@ -1052,6 +1142,20 @@ ZwDeleteAtom(
 	IN RTL_ATOM Atom
 	);
 
+NTSTATUS
+STDCALL
+NtDeleteBootEntry(
+	IN PUNICODE_STRING EntryName,
+	IN PUNICODE_STRING EntryValue
+	);
+
+NTSTATUS
+STDCALL
+ZwDeleteBootEntry(
+	IN PUNICODE_STRING EntryName,
+	IN PUNICODE_STRING EntryValue
+	);
+
 /*
  * FUNCTION: Deletes a file or a directory
  * ARGUMENTS:
@@ -1204,6 +1308,22 @@ ZwDisplayString(
 	IN PUNICODE_STRING DisplayString
 	);
 
+
+NTSTATUS
+STDCALL
+NtEnumerateBootEntries(
+	IN ULONG Unknown1,
+	IN ULONG Unknown2
+	);
+
+NTSTATUS
+STDCALL
+ZwEnumerateBootEntries(
+	IN ULONG Unknown1,
+	IN ULONG Unknown2
+	);
+
+
 /*
  * FUNCTION: Returns information about the subkeys of an open key
  * ARGUMENTS:
@@ -1459,6 +1579,23 @@ ZwImpersonateThread(
 	IN PSECURITY_QUALITY_OF_SERVICE SecurityQualityOfService
 	);
 
+NTSTATUS
+STDCALL
+NtInitiatePowerAction (
+	POWER_ACTION SystemAction,
+	SYSTEM_POWER_STATE MinSystemState,
+ 	ULONG Flags,
+	BOOLEAN Asynchronous
+);
+
+NTSTATUS
+STDCALL
+ZwInitiatePowerAction (
+	POWER_ACTION SystemAction,
+	SYSTEM_POWER_STATE MinSystemState,
+ 	ULONG Flags,
+	BOOLEAN Asynchronous
+);
 /*
  * FUNCTION: Initializes the registry.
  * ARGUMENTS:
@@ -1476,6 +1613,19 @@ ZwInitializeRegistry(
 	BOOLEAN SetUpBoot
 	);
 
+NTSTATUS
+STDCALL
+NtIsProcessInJob(
+	IN HANDLE ProcessHandle,  // ProcessHandle must grant PROCESS_QUERY_INFORMATION access.
+	IN HANDLE JobHandle OPTIONAL	// JobHandle must JOB_OBJECT_QUERY grant access. Defaults to the current process's job object.
+	);
+
+NTSTATUS
+STDCALL
+ZwIsProcessInJob(
+	IN HANDLE ProcessHandle,  // ProcessHandle must grant PROCESS_QUERY_INFORMATION access.
+	IN HANDLE JobHandle OPTIONAL	// JobHandle must JOB_OBJECT_QUERY grant access. Defaults to the current process's job object. 
+	);
 
 NTSTATUS STDCALL
 NtListenPort (HANDLE PortHandle,
@@ -1563,6 +1713,19 @@ ZwLockFile(
  * RETURNS: Status
  */	
 
+
+NTSTATUS
+STDCALL
+NtMakePermanentObject(
+	IN HANDLE Object
+	);
+
+NTSTATUS
+STDCALL
+ZwMakePermanentObject(
+	IN HANDLE Object
+	);
+
 NTSTATUS
 STDCALL
 NtMakeTemporaryObject(
@@ -1870,7 +2033,23 @@ ZwOpenIoCompletion(
 	IN ACCESS_MASK DesiredAccess,
 	IN POBJECT_ATTRIBUTES ObjectAttributes
 	);
-	
+
+
+NTSTATUS 
+STDCALL 
+NtOpenJobObject(
+	PHANDLE JobHandle, 
+	ACCESS_MASK DesiredAccess,
+   	POBJECT_ATTRIBUTES ObjectAttributes
+	);
+
+NTSTATUS 
+STDCALL 
+ZwOpenJobObject(
+	PHANDLE JobHandle, 
+	ACCESS_MASK DesiredAccess,
+   	POBJECT_ATTRIBUTES ObjectAttributes
+	);
 /*
  * FUNCTION: Opens an existing key in the registry
  * ARGUMENTS:
@@ -1969,6 +2148,25 @@ ZwOpenProcessToken(
 	OUT PHANDLE TokenHandle
 	);
 
+
+NTSTATUS
+STDCALL
+NtOpenProcessTokenEx(
+    IN HANDLE ProcessHandle,
+    IN ACCESS_MASK DesiredAccess,
+    IN ULONG HandleAttributes,
+    OUT PHANDLE TokenHandle
+    );
+
+
+NTSTATUS
+STDCALL
+ZwOpenProcessTokenEx(
+    IN HANDLE ProcessHandle,
+    IN ACCESS_MASK DesiredAccess,
+    IN ULONG HandleAttributes,
+    OUT PHANDLE TokenHandle
+    );
 /*
  * FUNCTION: Opens an existing section object
  * ARGUMENTS:
@@ -2079,6 +2277,28 @@ ZwOpenThreadToken(
 	IN BOOLEAN OpenAsSelf,
 	OUT PHANDLE TokenHandle
 	);
+
+NTSTATUS
+STDCALL
+NtOpenThreadTokenEx(
+    IN HANDLE ThreadHandle,
+    IN ACCESS_MASK DesiredAccess,
+    IN BOOLEAN OpenAsSelf,
+    IN ULONG HandleAttributes,
+    OUT PHANDLE TokenHandle
+    );
+
+
+NTSTATUS
+STDCALL
+ZwOpenThreadTokenEx(
+    IN HANDLE ThreadHandle,
+    IN ACCESS_MASK DesiredAccess,
+    IN BOOLEAN OpenAsSelf,
+    IN ULONG HandleAttributes,
+    OUT PHANDLE TokenHandle
+    );
+
 /*
  * FUNCTION: Opens an existing timer
  * ARGUMENTS:
@@ -2113,6 +2333,27 @@ ZwOpenTimer(
  * RETURNS: Status
  */
 
+
+NTSTATUS 
+STDCALL 
+NtPowerInformation(
+	POWER_INFORMATION_LEVEL PowerInformationLevel,
+    PVOID InputBuffer, 
+	ULONG InputBufferLength,
+    PVOID OutputBuffer,
+	ULONG OutputBufferLength
+	);
+
+NTSTATUS 
+STDCALL 
+ZwPowerInformation(
+	POWER_INFORMATION_LEVEL PowerInformationLevel,
+    PVOID InputBuffer, 
+	ULONG InputBufferLength,
+    PVOID OutputBuffer,
+	ULONG OutputBufferLength
+	);
+
 NTSTATUS
 STDCALL
 NtPrivilegeCheck(
@@ -2215,14 +2456,48 @@ ZwPulseEvent(
  * RETURNS: Status
  */
 
-NTSTATUS STDCALL
-NtQueryAttributesFile(IN POBJECT_ATTRIBUTES ObjectAttributes,
-		      OUT PFILE_BASIC_INFORMATION FileInformation);
+NTSTATUS
+STDCALL
+NtQueryAttributesFile(
+	IN POBJECT_ATTRIBUTES ObjectAttributes,
+	OUT PFILE_BASIC_INFORMATION FileInformation
+	);
 
-NTSTATUS STDCALL
-ZwQueryAttributesFile(IN POBJECT_ATTRIBUTES ObjectAttributes,
-		      OUT PFILE_BASIC_INFORMATION FileInformation);
+NTSTATUS
+STDCALL
+ZwQueryAttributesFile(
+	IN POBJECT_ATTRIBUTES ObjectAttributes,
+	OUT PFILE_BASIC_INFORMATION FileInformation
+	);
 
+
+NTSTATUS
+STDCALL
+NtQueryBootEntryOrder(
+	IN ULONG Unknown1,
+	IN ULONG Unknown2
+	);
+
+NTSTATUS
+STDCALL
+ZwQueryBootEntryOrder(
+	IN ULONG Unknown1,
+	IN ULONG Unknown2
+	);
+
+NTSTATUS
+STDCALL
+NtQueryBootOptions(
+	IN ULONG Unknown1,
+	IN ULONG Unknown2
+	);
+
+NTSTATUS
+STDCALL
+ZwQueryBootOptions(
+	IN ULONG Unknown1,
+	IN ULONG Unknown2
+	);
 /*
  * FUNCTION: Queries the default locale id
  * ARGUMENTS:
@@ -2247,6 +2522,18 @@ ZwQueryDefaultLocale(
 	OUT PLCID DefaultLocaleId
 	);
 
+NTSTATUS 
+STDCALL 
+NtQueryDefaultUILanguage(
+	PLANGID LanguageId
+	);
+
+NTSTATUS 
+STDCALL 
+ZwQueryDefaultUILanguage(
+	PLANGID LanguageId
+	);
+
 /*
  * FUNCTION: Queries a directory file.
  * ARGUMENTS:
@@ -2464,6 +2751,25 @@ ZwQueryInformationFile(
 	FILE_INFORMATION_CLASS FileInformationClass
 	);
 
+NTSTATUS 
+STDCALL 
+NtQueryInformationJobObject(
+	HANDLE JobHandle,
+    JOBOBJECTINFOCLASS JobInformationClass, 
+	PVOID JobInformation,
+    ULONG JobInformationLength, 
+	PULONG ReturnLength
+	);
+
+NTSTATUS 
+STDCALL 
+ZwQueryInformationJobObject(
+	HANDLE JobHandle,
+    JOBOBJECTINFOCLASS JobInformationClass, 
+	PVOID JobInformation,
+    ULONG JobInformationLength, 
+	PULONG ReturnLength
+	);
 
 NTSTATUS STDCALL
 NtQueryInformationPort (HANDLE PortHandle,
@@ -2526,6 +2832,16 @@ NtQueryInformationThread(
 	OUT PULONG ReturnLength 
 	);
 
+NTSTATUS 
+STDCALL 
+ZwQueryInformationThread(
+	IN HANDLE ThreadHandle,
+    IN THREADINFOCLASS ThreadInformationClass,
+	OUT PVOID ThreadInformation,
+    IN ULONG ThreadInformationLength, 
+	OUT PULONG ReturnLength
+	);
+
 
 NTSTATUS
 STDCALL
@@ -2547,6 +2863,18 @@ ZwQueryInformationToken(
 	OUT PULONG ReturnLength
 	);
 
+NTSTATUS 
+STDCALL 
+NtQueryInstallUILanguage(
+	PLANGID LanguageId
+	);
+
+NTSTATUS 
+STDCALL 
+ZwQueryInstallUILanguage(
+	PLANGID LanguageId
+	);
+
 NTSTATUS
 STDCALL
 NtQueryIoCompletion(
@@ -2597,6 +2925,35 @@ ZwQueryKey(
 	);
 
 
+
+NTSTATUS
+STDCALL
+NtQueryQuotaInformationFile(
+    IN HANDLE FileHandle,
+    OUT PIO_STATUS_BLOCK IoStatusBlock,
+    OUT PVOID Buffer,
+    IN ULONG Length,
+    IN BOOLEAN ReturnSingleEntry,
+    IN PVOID SidList OPTIONAL,
+    IN ULONG SidListLength,
+    IN PSID StartSid OPTIONAL,
+    IN BOOLEAN RestartScan
+    );
+
+
+NTSTATUS
+STDCALL
+ZwQueryQuotaInformationFile(
+    IN HANDLE FileHandle,
+    OUT PIO_STATUS_BLOCK IoStatusBlock,
+    OUT PVOID Buffer,
+    IN ULONG Length,
+    IN BOOLEAN ReturnSingleEntry,
+    IN PVOID SidList OPTIONAL,
+    IN ULONG SidListLength,
+    IN PSID StartSid OPTIONAL,
+    IN BOOLEAN RestartScan
+    );
 // draft
 
 NTSTATUS
@@ -3375,6 +3732,35 @@ ZwSaveKey(
 	IN HANDLE FileHandle
 	);
 
+NTSTATUS
+STDCALL
+NtSetBootEntryOrder(
+	IN ULONG Unknown1,
+	IN ULONG Unknown2
+	);
+
+NTSTATUS
+STDCALL
+ZwSetBootEntryOrder(
+	IN ULONG Unknown1,
+	IN ULONG Unknown2
+	);
+
+NTSTATUS 
+STDCALL 
+NtSetBootOptions(
+	ULONG Unknown1, 
+	ULONG Unknown2
+	);
+
+NTSTATUS 
+STDCALL 
+ZwSetBootOptions(
+	ULONG Unknown1, 
+	ULONG Unknown2
+	);
+
+
 /*
  * FUNCTION: Sets the context of a specified thread.
  * ARGUMENTS: 
@@ -3420,6 +3806,17 @@ ZwSetDefaultLocale(
 	IN LCID DefaultLocaleId
 	);
 
+NTSTATUS 
+STDCALL 
+NtSetDefaultUILanguage(
+	LANGID LanguageId
+	);
+
+NTSTATUS 
+STDCALL 
+ZwSetDefaultUILanguage(
+	LANGID LanguageId
+	);
 /*
  * FUNCTION: Sets the default hard error port
  * ARGUMENTS:
@@ -3567,6 +3964,23 @@ ZwSetInformationFile(
 	IN	FILE_INFORMATION_CLASS	FileInformationClass
 	);
 
+NTSTATUS 
+STDCALL 
+NtSetInformationJobObject(
+	HANDLE JobHandle,
+    JOBOBJECTINFOCLASS JobInformationClass,
+    PVOID JobInformation, 
+	ULONG JobInformationLength
+	);
+
+NTSTATUS 
+STDCALL 
+ZwSetInformationJobObject(
+	HANDLE JobHandle,
+    JOBOBJECTINFOCLASS JobInformationClass,
+    PVOID JobInformation, 
+	ULONG JobInformationLength
+	);
 /*
  * FUNCTION: Changes a set of thread specific parameters
  * ARGUMENTS: 
@@ -3768,6 +4182,24 @@ ZwSetHighWaitLowThread(
 	VOID
 	);
 
+NTSTATUS 
+STDCALL 
+NtSetQuotaInformationFile(
+    HANDLE FileHandle,
+    PIO_STATUS_BLOCK IoStatusBlock, 
+	PFILE_USER_QUOTA_INFORMATION Buffer,
+   	ULONG BufferLength
+	); 
+
+NTSTATUS 
+STDCALL 
+ZwSetQuotaInformationFile(
+    HANDLE FileHandle,
+    PIO_STATUS_BLOCK IoStatusBlock, 
+	PFILE_USER_QUOTA_INFORMATION Buffer,
+   	ULONG BufferLength
+	); 
+
 NTSTATUS
 STDCALL
 NtSetSecurityObject(
@@ -4058,6 +4490,54 @@ ZwTerminateProcess(
 	IN NTSTATUS ExitStatus
 	);
 
+NTSTATUS 
+STDCALL 
+NtTerminateJobObject(
+	HANDLE JobHandle, 
+	NTSTATUS ExitStatus
+	);
+
+NTSTATUS 
+STDCALL 
+ZwTerminateJobObject(
+	HANDLE JobHandle, 
+	NTSTATUS ExitStatus
+	);
+
+NTSTATUS
+STDCALL
+NtTraceEvent(
+	IN ULONG TraceHandle,
+	IN ULONG Flags,
+	IN ULONG TraceHeaderLength,
+	IN struct _EVENT_TRACE_HEADER* TraceHeader
+	);
+
+NTSTATUS
+STDCALL
+ZwTraceEvent(
+	IN ULONG TraceHandle,
+	IN ULONG Flags,
+	IN ULONG TraceHeaderLength,
+	IN struct _EVENT_TRACE_HEADER* TraceHeader
+	);
+
+NTSTATUS 
+STDCALL 
+NtTranslateFilePath(
+	ULONG Unknown1, 
+	ULONG Unknown2,
+	ULONG Unknown3
+	);
+
+
+NTSTATUS 
+STDCALL 
+ZwTranslateFilePath(
+	ULONG Unknown1, 
+	ULONG Unknown2,
+	ULONG Unknown3
+	);
 /*
  * FUNCTION: Unloads a driver.
  * ARGUMENTS: 
diff --git a/reactos/include/ntos/zwtypes.h b/reactos/include/ntos/zwtypes.h
index 3b8f166351c..30659982f76 100755
--- a/reactos/include/ntos/zwtypes.h
+++ b/reactos/include/ntos/zwtypes.h
@@ -3,6 +3,9 @@
 
 #ifndef __USE_W32API
 
+typedef unsigned short LANGID;
+typedef LANGID *PLANGID;
+
 typedef struct _LDT_ENTRY {
   WORD LimitLow;
   WORD BaseLow;
@@ -983,13 +986,6 @@ typedef struct _FILE_FS_LABEL_INFORMATION {
 	WCHAR VolumeLabel[0];
 } FILE_FS_LABEL_INFORMATION, *PFILE_FS_LABEL_INFORMATION;
 
-// read file scatter / write file scatter
-//FIXME I am a win32 struct aswell
-
-typedef union _FILE_SEGMENT_ELEMENT {
-	PVOID Buffer;
-	ULONG Alignment;
-}FILE_SEGMENT_ELEMENT, *PFILE_SEGMENT_ELEMENT;
 
 typedef struct _FILE_DIRECTORY_INFORMATION {
 	ULONG	NextEntryOffset;
@@ -1623,6 +1619,24 @@ typedef struct _DIRECTORY_BASIC_INFORMATION
 	UNICODE_STRING ObjectTypeName; // Directory, Device ...
 } DIRECTORY_BASIC_INFORMATION, *PDIRECTORY_BASIC_INFORMATION;
 
+
+// power information levels
+typedef enum _POWER_INFORMATION_LEVEL {
+	SystemPowerPolicyAc,
+	SystemPowerPolicyDc,
+	VerifySystemPolicyAc,
+	VerifySystemPolicyDc,
+	SystemPowerCapabilities,
+	SystemBatteryState,
+	SystemPowerStateHandler,
+	ProcessorStateHandler,
+	SystemPowerPolicyCurrent,
+	AdministratorPowerPolicy,
+	SystemReserveHiberFile,
+	ProcessorInformation,
+	SystemPowerInformationData
+} POWER_INFORMATION_LEVEL;
+
 #endif /* __USE_W32API */
 
 /*
@@ -1846,6 +1860,7 @@ typedef struct _HASH_TABLE
   PSPLAY_TREE  HashTrees;
 } HASH_TABLE, *PHASH_TABLE;
 
+
 /* END REACTOS ONLY */
 
 #endif
diff --git a/reactos/include/structs.h b/reactos/include/structs.h
index 16d9bb3d8a1..783a7d6b582 100644
--- a/reactos/include/structs.h
+++ b/reactos/include/structs.h
@@ -6243,16 +6243,6 @@ typedef struct _PORT_SECTION_READ {
 	ULONG ViewBase;
 } PORT_SECTION_READ,*PPORT_SECTION_READ;
 
-typedef struct _FILE_USER_QUOTA_INFORMATION {
-	ULONG NextEntryOffset;
-	ULONG SidLength;
-	LARGE_INTEGER ChangeTime;
-	LARGE_INTEGER QuotaUsed;
-	LARGE_INTEGER QuotaThreshold;
-	LARGE_INTEGER QuotaLimit;
-	SID Sid [1 ];
-} FILE_USER_QUOTA_INFORMATION,*PFILE_USER_QUOTA_INFORMATION;
-
 typedef struct _FILE_QUOTA_LIST_INFORMATION {
 	ULONG NextEntryOffset;
 	ULONG SidLength;
diff --git a/reactos/ntoskrnl/Makefile b/reactos/ntoskrnl/Makefile
index 8a4523c0d6b..158ef52be66 100644
--- a/reactos/ntoskrnl/Makefile
+++ b/reactos/ntoskrnl/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.130 2004/07/16 17:20:23 ekohl Exp $
+# $Id: Makefile,v 1.131 2004/07/17 03:06:01 ion Exp $
 #
 # ReactOS Operating System
 #
@@ -88,6 +88,7 @@ include Makefile.$(ARCH)
 # System API (Nt/Zw)
 OBJECTS_NT = \
 	nt/channel.o \
+	nt/efi.o \
 	nt/evtpair.o \
 	nt/mutant.o \
 	nt/misc.o \
@@ -243,6 +244,7 @@ OBJECTS_PS = \
 	ps/create.o \
 	ps/debug.o \
 	ps/idle.o \
+	ps/job.o \
 	ps/kill.o \
 	ps/locale.o \
 	ps/process.o \
diff --git a/reactos/ntoskrnl/io/file.c b/reactos/ntoskrnl/io/file.c
index 378bffea75f..cf6cc0ba457 100644
--- a/reactos/ntoskrnl/io/file.c
+++ b/reactos/ntoskrnl/io/file.c
@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.29 2004/06/23 21:42:50 ion Exp $
+/* $Id: file.c,v 1.30 2004/07/17 03:06:01 ion Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -130,6 +130,42 @@ NtQueryInformationFile(HANDLE FileHandle,
    return Status;
 }
 
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+NtQueryQuotaInformationFile(
+    IN HANDLE FileHandle,
+    OUT PIO_STATUS_BLOCK IoStatusBlock,
+    OUT PVOID Buffer,
+    IN ULONG Length,
+    IN BOOLEAN ReturnSingleEntry,
+    IN PVOID SidList OPTIONAL,
+    IN ULONG SidListLength,
+    IN PSID StartSid OPTIONAL,
+    IN BOOLEAN RestartScan
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+NTSTATUS 
+STDCALL
+NtSetQuotaInformationFile(
+	HANDLE FileHandle,
+    	PIO_STATUS_BLOCK IoStatusBlock,
+	PFILE_USER_QUOTA_INFORMATION Buffer,
+    	ULONG BufferLength)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
 
 /*
  * @unimplemented
diff --git a/reactos/ntoskrnl/nt/efi.c b/reactos/ntoskrnl/nt/efi.c
new file mode 100644
index 00000000000..7919047e29f
--- /dev/null
+++ b/reactos/ntoskrnl/nt/efi.c
@@ -0,0 +1,129 @@
+/*
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS kernel
+ * FILE:            ntoskrnl/nt/efi.c
+ * PURPOSE:         EFI Unimplemented Function Calls
+ * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
+ * UPDATE HISTORY:
+ *                  Created 16/07/04
+ */
+
+/* INCLUDES *****************************************************************/
+
+#include <ddk/ntddk.h>
+
+#include <internal/debug.h>
+
+/* FUNCTIONS *****************************************************************/
+
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+NtAddBootEntry(
+	IN PUNICODE_STRING EntryName,
+	IN PUNICODE_STRING EntryValue
+	)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+NtDeleteBootEntry(
+	IN PUNICODE_STRING EntryName,
+	IN PUNICODE_STRING EntryValue
+	)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+NtEnumerateBootEntries(
+	IN ULONG Unknown1,
+	IN ULONG Unknown2
+	)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+NtQueryBootEntryOrder(
+	IN ULONG Unknown1,
+	IN ULONG Unknown2
+	)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+NtQueryBootOptions(
+	IN ULONG Unknown1,
+	IN ULONG Unknown2
+	)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+NtSetBootEntryOrder(
+	IN ULONG Unknown1,
+	IN ULONG Unknown2
+	)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+NTSTATUS 
+STDCALL 
+NtSetBootOptions(
+	ULONG Unknown1, 
+	ULONG Unknown2
+	)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+
+/*
+ * @unimplemented
+ */
+NTSTATUS 
+STDCALL 
+NtTranslateFilePath(
+	ULONG Unknown1, 
+	ULONG Unknown2,
+	ULONG Unknown3
+	)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+
+/* EOF */
diff --git a/reactos/ntoskrnl/nt/ntevent.c b/reactos/ntoskrnl/nt/ntevent.c
index eb011365ec1..2cb609881e8 100644
--- a/reactos/ntoskrnl/nt/ntevent.c
+++ b/reactos/ntoskrnl/nt/ntevent.c
@@ -361,4 +361,21 @@ NtSetEvent(IN HANDLE EventHandle,
    return(STATUS_SUCCESS);
 }
 
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+NtTraceEvent(
+	IN ULONG TraceHandle,
+	IN ULONG Flags,
+	IN ULONG TraceHeaderLength,
+	IN struct _EVENT_TRACE_HEADER* TraceHeader
+	)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+
 /* EOF */
diff --git a/reactos/ntoskrnl/ob/ntobj.c b/reactos/ntoskrnl/ob/ntobj.c
index 51114acf8c3..3bea93162a3 100644
--- a/reactos/ntoskrnl/ob/ntobj.c
+++ b/reactos/ntoskrnl/ob/ntobj.c
@@ -1,4 +1,4 @@
-/* $Id: ntobj.c,v 1.19 2003/12/30 18:52:05 fireball Exp $
+/* $Id: ntobj.c,v 1.20 2004/07/17 03:06:01 ion Exp $
  *
  * COPYRIGHT:     See COPYING in the top level directory
  * PROJECT:       ReactOS kernel
@@ -275,4 +275,18 @@ NtMakeTemporaryObject (IN HANDLE Handle)
   return STATUS_SUCCESS;
 }
 
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+NtMakePermanentObject(
+	IN HANDLE Object
+	)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+
 /* EOF */
diff --git a/reactos/ntoskrnl/po/power.c b/reactos/ntoskrnl/po/power.c
index 550fd6d1dc2..beab3d20ba8 100644
--- a/reactos/ntoskrnl/po/power.c
+++ b/reactos/ntoskrnl/po/power.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: power.c,v 1.8 2003/10/12 17:05:50 hbirr Exp $
+/* $Id: power.c,v 1.9 2004/07/17 03:06:01 ion Exp $
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/po/power.c
  * PURPOSE:         Power Manager
@@ -218,4 +218,38 @@ PoInit(VOID)
 {
 }
 
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+NtInitiatePowerAction (
+	POWER_ACTION SystemAction,
+	SYSTEM_POWER_STATE MinSystemState,
+ 	ULONG Flags,
+	BOOLEAN Asynchronous)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+NTSTATUS 
+STDCALL 
+NtPowerInformation(
+	POWER_INFORMATION_LEVEL PowerInformationLevel,
+    PVOID InputBuffer, 
+	ULONG InputBufferLength,
+    PVOID OutputBuffer,
+	ULONG OutputBufferLength
+	)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+
+
 /* EOF */
diff --git a/reactos/ntoskrnl/ps/job.c b/reactos/ntoskrnl/ps/job.c
new file mode 100644
index 00000000000..1e97bfbbca2
--- /dev/null
+++ b/reactos/ntoskrnl/ps/job.c
@@ -0,0 +1,121 @@
+/*
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS kernel
+ * FILE:            ntoskrnl/ps/jobs.c
+ * PURPOSE:         Job Native Functions
+ * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
+ * UPDATE HISTORY:
+ *                  Created 16/07/04
+ */
+
+/* Note: Jobs are only supported on Win2K+ */
+/* INCLUDES *****************************************************************/
+
+#include <ddk/ntddk.h>
+
+#include <internal/debug.h>
+
+/* FUNCTIONS *****************************************************************/
+
+/*
+ * @unimplemented
+ */
+NTSTATUS 
+STDCALL 
+NtAssignProcessToJobObject(
+	HANDLE JobHandle,
+    HANDLE ProcessHandle
+	)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+/*
+ * @unimplemented
+ */
+NTSTATUS 
+STDCALL 
+NtCreateJobObject(
+	PHANDLE JobHandle, 
+	ACCESS_MASK DesiredAccess,
+    POBJECT_ATTRIBUTES ObjectAttributes
+	)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+NtIsProcessInJob(
+	IN HANDLE ProcessHandle,  // ProcessHandle must PROCESS_QUERY_INFORMATION grant access.
+	IN HANDLE JobHandle OPTIONAL	// JobHandle must grant JOB_OBJECT_QUERY access. Defaults to the current process's job object.
+	)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+/*
+ * @unimplemented
+ */
+NTSTATUS 
+STDCALL 
+NtOpenJobObject(
+	PHANDLE JobHandle, 
+	ACCESS_MASK DesiredAccess,
+    POBJECT_ATTRIBUTES ObjectAttributes
+	)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+/*
+ * @unimplemented
+ */
+NTSTATUS 
+STDCALL 
+NtQueryInformationJobObject(
+	HANDLE JobHandle,
+    JOBOBJECTINFOCLASS JobInformationClass, 
+	PVOID JobInformation,
+    ULONG JobInformationLength, 
+	PULONG ReturnLength
+	)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+/*
+ * @unimplemented
+ */
+NTSTATUS 
+STDCALL 
+NtSetInformationJobObject(
+	HANDLE JobHandle,
+    JOBOBJECTINFOCLASS JobInformationClass,
+    PVOID JobInformation, 
+	ULONG JobInformationLength
+	)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+/*
+ * @unimplemented
+ */
+NTSTATUS 
+STDCALL 
+NtTerminateJobObject(
+	HANDLE JobHandle, 
+	NTSTATUS ExitStatus
+	)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+
+/* EOF */
diff --git a/reactos/ntoskrnl/ps/locale.c b/reactos/ntoskrnl/ps/locale.c
index 2e356d0db66..7e9234f216f 100644
--- a/reactos/ntoskrnl/ps/locale.c
+++ b/reactos/ntoskrnl/ps/locale.c
@@ -1,4 +1,4 @@
-/* $Id: locale.c,v 1.8 2004/03/10 20:26:40 navaraf Exp $
+/* $Id: locale.c,v 1.9 2004/07/17 03:06:02 ion Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -304,4 +304,41 @@ NtSetDefaultLocale(IN BOOLEAN ThreadOrSystem,
    return(STATUS_SUCCESS);
 }
 
+/*
+ * @unimplemented
+ */
+NTSTATUS 
+STDCALL 
+NtQueryDefaultUILanguage(
+	PLANGID LanguageId
+	)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+/*
+ * @unimplemented
+ */
+NTSTATUS 
+STDCALL 
+NtQueryInstallUILanguage(
+	PLANGID LanguageId
+	)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+/*
+ * @unimplemented
+ */
+NTSTATUS 
+STDCALL 
+NtSetDefaultUILanguage(
+	LANGID LanguageId
+	)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
 /* EOF */
diff --git a/reactos/ntoskrnl/ps/process.c b/reactos/ntoskrnl/ps/process.c
index d3d64807294..863e4067ad0 100644
--- a/reactos/ntoskrnl/ps/process.c
+++ b/reactos/ntoskrnl/ps/process.c
@@ -1,4 +1,4 @@
-/* $Id: process.c,v 1.133 2004/07/16 20:20:53 weiden Exp $
+/* $Id: process.c,v 1.134 2004/07/17 03:06:02 ion Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -169,6 +169,23 @@ NtOpenProcessToken(IN	HANDLE		ProcessHandle,
   return _NtOpenProcessToken(ProcessHandle, DesiredAccess, TokenHandle);
 }
 
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+NtOpenProcessTokenEx(
+    IN HANDLE ProcessHandle,
+    IN ACCESS_MASK DesiredAccess,
+    IN ULONG HandleAttributes,
+    OUT PHANDLE TokenHandle
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
+
 
 /*
  * @implemented
diff --git a/reactos/ntoskrnl/ps/thread.c b/reactos/ntoskrnl/ps/thread.c
index e04ff087bd6..998c41ba01c 100644
--- a/reactos/ntoskrnl/ps/thread.c
+++ b/reactos/ntoskrnl/ps/thread.c
@@ -1,4 +1,4 @@
-/* $Id: thread.c,v 1.126 2004/07/02 00:47:57 royce Exp $
+/* $Id: thread.c,v 1.127 2004/07/17 03:06:02 ion Exp $
  *
  * COPYRIGHT:              See COPYING in the top level directory
  * PROJECT:                ReactOS kernel
@@ -809,4 +809,21 @@ PsLookupThreadByThreadId(IN PVOID ThreadId,
   return(STATUS_INVALID_PARAMETER);
 }
 
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+NtOpenThreadTokenEx(
+    IN HANDLE ThreadHandle,
+    IN ACCESS_MASK DesiredAccess,
+    IN BOOLEAN OpenAsSelf,
+    IN ULONG HandleAttributes,
+    OUT PHANDLE TokenHandle
+    )
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
 /* EOF */

From 6a9ab7123102b7cbe0ea1d3212b98c074d78bfde Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Sat, 17 Jul 2004 04:04:08 +0000
Subject: [PATCH 336/356] Added keys for Winsock

svn path=/trunk/; revision=10172
---
 reactos/bootdata/hivesys.inf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reactos/bootdata/hivesys.inf b/reactos/bootdata/hivesys.inf
index d9656c05828..741d85f1bdb 100644
--- a/reactos/bootdata/hivesys.inf
+++ b/reactos/bootdata/hivesys.inf
@@ -553,7 +553,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","MaxSockAddrLe
 HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","MinSockAddrLength",0x00010001,0x00000010
 HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","HelperDllName",0x00000000,"%SystemRoot%\System32\wshtcpip.dll"
 HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","Mapping",0x00000000,0b,00,00,00,03,00,00,00,02,00,00,00,01,00,00,00,06,00,00,00,02,00,00,00,01,00,00,00,00,00,00,00,02,00,00,00,00,00,00,00,06,00,00,00,00,00,00,00,00,00,00,00,06,00,00,00,00,00,00,00,01,00,00,00,06,00,00,00,02,00,00,00,02,00,00,00,11,00,00,00,02,00,00,00,02,00,00,00,00,00,00,00,02,00,00,00,00,00,00,00,11,00,00,00,00,00,00,00,00,00,00,00,11,00,00,00,00,00,00,00,02,00,00,00,11,00,00,00,02,00,00,00,03,00,00,00,00,00,00,00
-HKLM,"SYSTEM\CurrentControlSet\Services\Winsock\Parameters","Transports",0x00000000,54,63,70,69,70,00,4e,65,74,42,49,4f,53,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Winsock\Parameters","Transports",0x00000000,"Tcpip"
 
 ; Virtual FAT filesystem driver
 HKLM,"SYSTEM\CurrentControlSet\Services\Vfatfs","ErrorControl",0x00010001,0x00000000

From c015d55c31f45b898163b9428dda3069191078d9 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Sat, 17 Jul 2004 04:17:32 +0000
Subject: [PATCH 337/356] Added keys for Winsock

svn path=/trunk/; revision=10173
---
 reactos/bootdata/hivesys.inf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reactos/bootdata/hivesys.inf b/reactos/bootdata/hivesys.inf
index 741d85f1bdb..7731e5a29bd 100644
--- a/reactos/bootdata/hivesys.inf
+++ b/reactos/bootdata/hivesys.inf
@@ -552,7 +552,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","UseDelayedAcc
 HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","MaxSockAddrLength",0x00010001,0x00000010
 HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","MinSockAddrLength",0x00010001,0x00000010
 HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","HelperDllName",0x00000000,"%SystemRoot%\System32\wshtcpip.dll"
-HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","Mapping",0x00000000,0b,00,00,00,03,00,00,00,02,00,00,00,01,00,00,00,06,00,00,00,02,00,00,00,01,00,00,00,00,00,00,00,02,00,00,00,00,00,00,00,06,00,00,00,00,00,00,00,00,00,00,00,06,00,00,00,00,00,00,00,01,00,00,00,06,00,00,00,02,00,00,00,02,00,00,00,11,00,00,00,02,00,00,00,02,00,00,00,00,00,00,00,02,00,00,00,00,00,00,00,11,00,00,00,00,00,00,00,00,00,00,00,11,00,00,00,00,00,00,00,02,00,00,00,11,00,00,00,02,00,00,00,03,00,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","Mapping",0x00000001,0b,00,00,00,03,00,00,00,02,00,00,00,01,00,00,00,06,00,00,00,02,00,00,00,01,00,00,00,00,00,00,00,02,00,00,00,00,00,00,00,06,00,00,00,00,00,00,00,00,00,00,00,06,00,00,00,00,00,00,00,01,00,00,00,06,00,00,00,02,00,00,00,02,00,00,00,11,00,00,00,02,00,00,00,02,00,00,00,00,00,00,00,02,00,00,00,00,00,00,00,11,00,00,00,00,00,00,00,00,00,00,00,11,00,00,00,00,00,00,00,02,00,00,00,11,00,00,00,02,00,00,00,03,00,00,00,00,00,00,00
 HKLM,"SYSTEM\CurrentControlSet\Services\Winsock\Parameters","Transports",0x00000000,"Tcpip"
 
 ; Virtual FAT filesystem driver

From 14f18e7d6dfc3c190c0dc0a0852f6ea8c1e413c7 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Sat, 17 Jul 2004 05:13:05 +0000
Subject: [PATCH 338/356] Added exports for new stubs and fixed some issues
 with recently commited stubs.

svn path=/trunk/; revision=10174
---
 reactos/iface/native/sysfuncs.lst |  1 +
 reactos/include/ntos/zw.h         | 18 +++++++-
 reactos/ntoskrnl/Makefile         |  4 +-
 reactos/ntoskrnl/cm/ntfunc.c      | 15 ++++++
 reactos/ntoskrnl/mm/verifier.c    |  4 +-
 reactos/ntoskrnl/ntoskrnl.def     | 77 ++++++++++++++++++++++++++++++-
 reactos/ntoskrnl/ntoskrnl.edf     | 77 ++++++++++++++++++++++++++++++-
 7 files changed, 191 insertions(+), 5 deletions(-)

diff --git a/reactos/iface/native/sysfuncs.lst b/reactos/iface/native/sysfuncs.lst
index c782b62a169..38bc1d73cdb 100644
--- a/reactos/iface/native/sysfuncs.lst
+++ b/reactos/iface/native/sysfuncs.lst
@@ -169,6 +169,7 @@ NtResetEvent ZwResetEvent 2
 NtRestoreKey ZwRestoreKey 3
 NtResumeThread ZwResumeThread 2
 NtSaveKey ZwSaveKey 2
+NtSaveKeyEx ZwSaveKeyEx 3
 NtSetBootEntryOrder ZwSetBootEntryOrder 2
 NtSetBootOptions ZwSetBootOptions 2
 NtSetIoCompletion ZwSetIoCompletion 5
diff --git a/reactos/include/ntos/zw.h b/reactos/include/ntos/zw.h
index 0e311302ba7..ad094780635 100755
--- a/reactos/include/ntos/zw.h
+++ b/reactos/include/ntos/zw.h
@@ -1,5 +1,5 @@
 
-/* $Id: zw.h,v 1.27 2004/07/17 03:06:00 ion Exp $
+/* $Id: zw.h,v 1.28 2004/07/17 05:13:05 ion Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -3732,6 +3732,22 @@ ZwSaveKey(
 	IN HANDLE FileHandle
 	);
 
+NTSTATUS
+STDCALL
+NtSaveKeyEx(
+	IN HANDLE KeyHandle,
+	IN HANDLE FileHandle,
+	IN ULONG Flags // REG_STANDARD_FORMAT, etc..
+	);
+
+NTSTATUS
+STDCALL
+ZwSaveKeyEx(
+	IN HANDLE KeyHandle,
+	IN HANDLE FileHandle,
+	IN ULONG Flags // REG_STANDARD_FORMAT, etc..
+	);
+
 NTSTATUS
 STDCALL
 NtSetBootEntryOrder(
diff --git a/reactos/ntoskrnl/Makefile b/reactos/ntoskrnl/Makefile
index 158ef52be66..352d8478a74 100644
--- a/reactos/ntoskrnl/Makefile
+++ b/reactos/ntoskrnl/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.131 2004/07/17 03:06:01 ion Exp $
+# $Id: Makefile,v 1.132 2004/07/17 05:13:05 ion Exp $
 #
 # ReactOS Operating System
 #
@@ -170,10 +170,12 @@ OBJECTS_MM = \
 	mm/paging.o \
 	mm/pool.o \
 	mm/ppool.o \
+	mm/physical.o \
 	mm/region.o \
 	mm/rmap.o \
 	mm/section.o \
 	mm/slab.o \
+	mm/verifier.o \
 	mm/virtual.o \
 	mm/wset.o
 
diff --git a/reactos/ntoskrnl/cm/ntfunc.c b/reactos/ntoskrnl/cm/ntfunc.c
index 327fb8e74d9..2ad9f009f13 100644
--- a/reactos/ntoskrnl/cm/ntfunc.c
+++ b/reactos/ntoskrnl/cm/ntfunc.c
@@ -1861,6 +1861,21 @@ NtSaveKey (IN HANDLE KeyHandle,
   return STATUS_SUCCESS;
 }
 
+/*
+ * @unimplemented
+ */
+NTSTATUS
+STDCALL
+NtSaveKeyEx(
+	IN HANDLE KeyHandle,
+	IN HANDLE FileHandle,
+	IN ULONG Flags // REG_STANDARD_FORMAT, etc..
+	)
+{
+	UNIMPLEMENTED;
+	return STATUS_NOT_IMPLEMENTED;
+}
+
 
 NTSTATUS STDCALL
 NtSetInformationKey (IN HANDLE KeyHandle,
diff --git a/reactos/ntoskrnl/mm/verifier.c b/reactos/ntoskrnl/mm/verifier.c
index 381046c1c0b..e6cdfa6008f 100644
--- a/reactos/ntoskrnl/mm/verifier.c
+++ b/reactos/ntoskrnl/mm/verifier.c
@@ -59,4 +59,6 @@ MmIsVerifierEnabled (
 {
 	UNIMPLEMENTED;
 	return STATUS_NOT_IMPLEMENTED;
-}
\ No newline at end of file
+}
+
+/* EOF */
diff --git a/reactos/ntoskrnl/ntoskrnl.def b/reactos/ntoskrnl/ntoskrnl.def
index 06e7e9f097c..c4eacbb60bc 100644
--- a/reactos/ntoskrnl/ntoskrnl.def
+++ b/reactos/ntoskrnl/ntoskrnl.def
@@ -1,4 +1,4 @@
-; $Id: ntoskrnl.def,v 1.184 2004/06/13 10:35:53 navaraf Exp $
+; $Id: ntoskrnl.def,v 1.185 2004/07/17 05:13:05 ion Exp $
 ;
 ; reactos/ntoskrnl/ntoskrnl.def
 ;
@@ -499,6 +499,30 @@ LsaFreeReturnBuffer@4
 LsaLogonUser@56
 LsaLookupAuthenticationPackage@12
 LsaRegisterLogonProcess@12
+Mm64BitPhysicalAddress DATA
+MmAddPhysicalMemory@8
+MmAddVerifierThunks@8
+MmAdvanceMdl@8
+MmAllocateMappingAddress@8
+MmFreeMappingAddress@8
+MmGetPhysicalMemoryRanges@0
+MmGetSystemRoutineAddress@4
+MmGetVirtualForPhysical@8
+MmIsDriverVerifying@4
+MmIsVerifierEnabled@4
+MmMapLockedPagesWithReservedMapping@16
+MmMapUserAddressesToPage@12
+MmMapViewInSessionSpace@12
+MmMarkPhysicalMemoryAsBad@8
+MmMarkPhysicalMemoryAsGood@8
+MmPrefetchPages@8
+MmProbeAndLockProcessPages@16
+MmProbeAndLockSelectedPages@16
+MmProtectMdlSystemAddress@8
+MmRemovePhysicalMemory@8
+MmSystemRangeStart DATA
+MmUnmapReservedMapping@12
+MmUnmapViewInSessionSpace@4
 MmAdjustWorkingSetSize@12
 MmAllocateContiguousAlignedMemory@36
 MmAllocateContiguousMemory@12
@@ -612,6 +636,19 @@ NtVdmControl@8
 NtW32Call@20
 NtWaitForSingleObject@12
 NtWriteFile@36
+tMakePermanentObject@4
+NtOpenProcessTokenEx@16
+NtOpenThread@16
+NtOpenThreadToken@16
+NtOpenThreadTokenEx@20
+NtQueryInformationThread@20
+NtQueryQuotaInformationFile@36
+NtQuerySystemInformation@16
+NtSetEaFile@16
+NtSetQuotaInformationFile@16
+NtSetVolumeInformationFile@20
+NtShutdownSystem@4
+NtTraceEvent@16
 ObAssignSecurity@16
 ;ObCheckCreateObjectAccess@28
 ;ObCheckObjectAccess@20
@@ -1016,6 +1053,44 @@ ZwWaitForMultipleObjects@20
 ZwWaitForSingleObject@12
 ZwWriteFile@36
 ZwYieldExecution@0
+ZwAddBootEntry@8
+ZwAdjustPrivilegesToken@24
+ZwAssignProcessToJobObject@8
+ZwCancelIoFile@8
+ZwCancelTimer@8
+ZwCreateJobObject@12
+ZwCreateTimer@16
+ZwDeleteBootEntry@8
+ZwEnumerateBootEntries@8
+ZwFlushVirtualMemory@16
+ZwInitiatePowerAction@16
+ZwIsProcessInJob@8
+ZwOpenJobObject@12
+ZwOpenProcessTokenEx@16
+ZwOpenThreadTokenEx@20
+ZwOpenTimer@12
+ZwPowerInformation@20
+ZwQueryBootEntryOrder@8
+ZwQueryBootOptions@8
+ZwQueryDefaultUILanguage@4
+ZwQueryDirectoryObject@28
+ZwQueryEaFile@36
+ZwQueryFullAttributesFile@8
+ZwQueryInformationJobObject@20
+ZwQueryInformationThread@20
+ZwQueryInstallUILanguage@4
+ZwRestoreKey@12
+ZwSaveKeyEx@12
+ZwSetBootEntryOrder@8
+ZwSetBootOptions@8
+ZwSetDefaultUILanguage@4
+ZwSetEaFile@16
+ZwSetInformationJobObject@16
+ZwSetSecurityObject@12
+ZwSetTimer@28
+ZwSetVolumeInformationFile@20
+ZwTerminateJobObject@8
+ZwTranslateFilePath@12
 _abnormal_termination
 _alldiv
 _allmul
diff --git a/reactos/ntoskrnl/ntoskrnl.edf b/reactos/ntoskrnl/ntoskrnl.edf
index 00bbdce0fda..a0c3e268f34 100644
--- a/reactos/ntoskrnl/ntoskrnl.edf
+++ b/reactos/ntoskrnl/ntoskrnl.edf
@@ -1,4 +1,4 @@
-; $Id: ntoskrnl.edf,v 1.171 2004/06/19 05:04:33 sedwards Exp $
+; $Id: ntoskrnl.edf,v 1.172 2004/07/17 05:13:05 ion Exp $
 ;
 ; reactos/ntoskrnl/ntoskrnl.def
 ;
@@ -534,6 +534,30 @@ LsaFreeReturnBuffer=LsaFreeReturnBuffer@4
 LsaLogonUser=LsaLogonUser@56
 LsaLookupAuthenticationPackage=LsaLookupAuthenticationPackage@12
 LsaRegisterLogonProcess=LsaRegisterLogonProcess@12
+Mm64BitPhysicalAddress DATA
+MmAddPhysicalMemory=MmAddPhysicalMemory@8
+MmAddVerifierThunks=MmAddVerifierThunks@8
+MmAdvanceMdl=MmAdvanceMdl@8
+MmAllocateMappingAddress=MmAllocateMappingAddress@8
+MmFreeMappingAddress=MmFreeMappingAddress@8
+MmGetPhysicalMemoryRanges=MmGetPhysicalMemoryRanges@0
+MmGetSystemRoutineAddress=MmGetSystemRoutineAddress@4
+MmGetVirtualForPhysical=MmGetVirtualForPhysical@8
+MmIsDriverVerifying=MmIsDriverVerifying@4
+MmIsVerifierEnabled=MmIsVerifierEnabled@4
+MmMapLockedPagesWithReservedMapping=MmMapLockedPagesWithReservedMapping@16
+MmMapUserAddressesToPage=MmMapUserAddressesToPage@12
+MmMapViewInSessionSpace=MmMapViewInSessionSpace@12
+MmMarkPhysicalMemoryAsBad=MmMarkPhysicalMemoryAsBad@8
+MmMarkPhysicalMemoryAsGood=MmMarkPhysicalMemoryAsGood@8
+MmPrefetchPages=MmPrefetchPages@8
+MmProbeAndLockProcessPages=MmProbeAndLockProcessPages@16
+MmProbeAndLockSelectedPages=MmProbeAndLockSelectedPages@16
+MmProtectMdlSystemAddress=MmProtectMdlSystemAddress@8
+MmRemovePhysicalMemory=MmRemovePhysicalMemory@8
+MmSystemRangeStart DATA
+MmUnmapReservedMapping=MmUnmapReservedMapping@12
+MmUnmapViewInSessionSpace=MmUnmapViewInSessionSpace@4
 MmAdjustWorkingSetSize=MmAdjustWorkingSetSize@12
 MmAllocateContiguousAlignedMemory=MmAllocateContiguousAlignedMemory@36
 MmAllocateContiguousMemory=MmAllocateContiguousMemory@12
@@ -647,6 +671,19 @@ NtVdmControl=NtVdmControl@8
 NtW32Call=NtW32Call@20
 NtWaitForSingleObject=NtWaitForSingleObject@12
 NtWriteFile=NtWriteFile@36
+NtMakePermanentObject=NtMakePermanentObject@4
+NtOpenProcessTokenEx=NtOpenProcessTokenEx@16
+NtOpenThread=NtOpenThread@16
+NtOpenThreadToken=NtOpenThreadToken@16
+NtOpenThreadTokenEx=NtOpenThreadTokenEx@20
+NtQueryInformationThread=NtQueryInformationThread@20
+NtQueryQuotaInformationFile=NtQueryQuotaInformationFile@36
+NtQuerySystemInformation=NtQuerySystemInformation@16
+NtSetEaFile=NtSetEaFile@16
+NtSetQuotaInformationFile=NtSetQuotaInformationFile@16
+NtSetVolumeInformationFile=NtSetVolumeInformationFile@20
+NtShutdownSystem=NtShutdownSystem@4
+NtTraceEvent=NtTraceEvent@16
 ObAssignSecurity=ObAssignSecurity@16
 ;ObCheckCreateObjectAccess=ObCheckCreateObjectAccess@28
 ;ObCheckObjectAccess=ObCheckObjectAccess@20
@@ -1050,6 +1087,44 @@ ZwWaitForMultipleObjects=ZwWaitForMultipleObjects@20
 ZwWaitForSingleObject=ZwWaitForSingleObject@12
 ZwWriteFile=ZwWriteFile@36
 ZwYieldExecution=ZwYieldExecution@0
+ZwAddBootEntry=ZwAddBootEntry@8
+ZwAdjustPrivilegesToken=ZwAdjustPrivilegesToken@24
+ZwAssignProcessToJobObject=ZwAssignProcessToJobObject@8
+ZwCancelIoFile=ZwCancelIoFile@8
+ZwCancelTimer=ZwCancelTimer@8
+ZwCreateJobObject=ZwCreateJobObject@12
+ZwCreateTimer=ZwCreateTimer@16
+ZwDeleteBootEntry=ZwDeleteBootEntry@8
+ZwEnumerateBootEntries=ZwEnumerateBootEntries@8
+ZwFlushVirtualMemory=ZwFlushVirtualMemory@16
+ZwInitiatePowerAction=ZwInitiatePowerAction@16
+ZwIsProcessInJob=ZwIsProcessInJob@8
+ZwOpenJobObject=ZwOpenJobObject@12
+ZwOpenProcessTokenEx=ZwOpenProcessTokenEx@16
+ZwOpenThreadTokenEx=ZwOpenThreadTokenEx@20
+ZwOpenTimer=ZwOpenTimer@12
+ZwPowerInformation=ZwPowerInformation@20
+ZwQueryBootEntryOrder=ZwQueryBootEntryOrder@8
+ZwQueryBootOptions=ZwQueryBootOptions@8
+ZwQueryDefaultUILanguage=ZwQueryDefaultUILanguage@4
+ZwQueryDirectoryObject=ZwQueryDirectoryObject@28
+ZwQueryEaFile=ZwQueryEaFile@36
+ZwQueryFullAttributesFile=ZwQueryFullAttributesFile@8
+ZwQueryInformationJobObject=ZwQueryInformationJobObject@20
+ZwQueryInformationThread=ZwQueryInformationThread@20
+ZwQueryInstallUILanguage=ZwQueryInstallUILanguage@4
+ZwRestoreKey=ZwRestoreKey@12
+ZwSaveKeyEx=ZwSaveKeyEx@12
+ZwSetBootEntryOrder=ZwSetBootEntryOrder@8
+ZwSetBootOptions=ZwSetBootOptions@8
+ZwSetDefaultUILanguage=ZwSetDefaultUILanguage@4
+ZwSetEaFile=ZwSetEaFile@16
+ZwSetInformationJobObject=ZwSetInformationJobObject@16
+ZwSetSecurityObject=ZwSetSecurityObject@12
+ZwSetTimer=ZwSetTimer@28
+ZwSetVolumeInformationFile=ZwSetVolumeInformationFile@20
+ZwTerminateJobObject=ZwTerminateJobObject@8
+ZwTranslateFilePath=ZwTranslateFilePath@12
 _abnormal_termination
 _alldiv
 _allmul

From a3a123ab319cf35a8f86d622698cd0e058260102 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Sat, 17 Jul 2004 12:08:21 +0000
Subject: [PATCH 339/356] Implement NtMakePermanentObject().

svn path=/trunk/; revision=10175
---
 reactos/ntoskrnl/ob/ntobj.c | 65 ++++++++++++++++++++++++-------------
 1 file changed, 43 insertions(+), 22 deletions(-)

diff --git a/reactos/ntoskrnl/ob/ntobj.c b/reactos/ntoskrnl/ob/ntobj.c
index 3bea93162a3..3a8f3355e8f 100644
--- a/reactos/ntoskrnl/ob/ntobj.c
+++ b/reactos/ntoskrnl/ob/ntobj.c
@@ -1,4 +1,4 @@
-/* $Id: ntobj.c,v 1.20 2004/07/17 03:06:01 ion Exp $
+/* $Id: ntobj.c,v 1.21 2004/07/17 12:08:21 ekohl Exp $
  *
  * COPYRIGHT:     See COPYING in the top level directory
  * PROJECT:       ReactOS kernel
@@ -71,7 +71,7 @@ NtSetInformationObject (IN HANDLE ObjectHandle,
 /**********************************************************************
  * NAME							EXPORTED
  *	NtQueryObject
- *	
+ *
  * DESCRIPTION
  *
  * ARGUMENTS
@@ -135,11 +135,7 @@ NtQueryObject (IN HANDLE ObjectHandle,
 	      }
 	    else
 	      {
-#if defined(__GNUC__)
-		BasicInfo->CreateTime.QuadPart = 0ULL;
-#else
-		BasicInfo->CreateTime.QuadPart = 0;
-#endif
+		BasicInfo->CreateTime.QuadPart = (ULONGLONG)0;
 	      }
 	    Status = STATUS_SUCCESS;
 	  }
@@ -216,7 +212,7 @@ NtQueryObject (IN HANDLE ObjectHandle,
 /**********************************************************************
  * NAME							EXPORTED
  *	ObMakeTemporaryObject
- *	
+ *
  * DESCRIPTION
  *
  * ARGUMENTS
@@ -228,7 +224,7 @@ NtQueryObject (IN HANDLE ObjectHandle,
  * @implemented
  */
 VOID STDCALL
-ObMakeTemporaryObject (IN PVOID ObjectBody)
+ObMakeTemporaryObject(IN PVOID ObjectBody)
 {
   POBJECT_HEADER ObjectHeader;
 
@@ -240,7 +236,7 @@ ObMakeTemporaryObject (IN PVOID ObjectBody)
 /**********************************************************************
  * NAME							EXPORTED
  *	NtMakeTemporaryObject
- *	
+ *
  * DESCRIPTION
  *
  * ARGUMENTS
@@ -250,7 +246,7 @@ ObMakeTemporaryObject (IN PVOID ObjectBody)
  * REVISIONS
  */
 NTSTATUS STDCALL
-NtMakeTemporaryObject (IN HANDLE Handle)
+NtMakeTemporaryObject(IN HANDLE Handle)
 {
   POBJECT_HEADER ObjectHeader;
   PVOID Object;
@@ -260,7 +256,7 @@ NtMakeTemporaryObject (IN HANDLE Handle)
 				     0,
 				     NULL,
 				     (KPROCESSOR_MODE)KeGetPreviousMode(),
-				     & Object,
+				     &Object,
 				     NULL);
   if (Status != STATUS_SUCCESS)
     {
@@ -275,18 +271,43 @@ NtMakeTemporaryObject (IN HANDLE Handle)
   return STATUS_SUCCESS;
 }
 
-/*
- * @unimplemented
+
+/**********************************************************************
+ * NAME							EXPORTED
+ *	NtMakePermanentObject
+ *
+ * DESCRIPTION
+ *
+ * ARGUMENTS
+ *
+ * RETURN VALUE
+ *
+ * REVISIONS
  */
-NTSTATUS
-STDCALL
-NtMakePermanentObject(
-	IN HANDLE Object
-	)
+NTSTATUS STDCALL
+NtMakePermanentObject(IN HANDLE Handle)
 {
-	UNIMPLEMENTED;
-	return STATUS_NOT_IMPLEMENTED;
+  POBJECT_HEADER ObjectHeader;
+  PVOID Object;
+  NTSTATUS Status;
+
+  Status = ObReferenceObjectByHandle(Handle,
+				     0,
+				     NULL,
+				     (KPROCESSOR_MODE)KeGetPreviousMode(),
+				     &Object,
+				     NULL);
+  if (Status != STATUS_SUCCESS)
+    {
+      return Status;
+    }
+
+  ObjectHeader = BODY_TO_HEADER(Object);
+  ObjectHeader->Permanent = TRUE;
+
+  ObDereferenceObject(Object);
+
+  return STATUS_SUCCESS;
 }
 
-
 /* EOF */

From 13bc74184a66db6fe4f6592a42a0a85b26a5b27f Mon Sep 17 00:00:00 2001
From: Gregor Anich <blight@blight.eu.org>
Date: Sat, 17 Jul 2004 15:12:25 +0000
Subject: [PATCH 340/356] Handle escape to get opengl driver info in
 IntEngExtEscape to avoid the infinite loop in the UNIMPLEMENTED macro (needed
 by opengl32.dll)

svn path=/trunk/; revision=10176
---
 reactos/subsys/win32k/objects/print.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/reactos/subsys/win32k/objects/print.c b/reactos/subsys/win32k/objects/print.c
index 5d7cddb0d41..4548e6eedc3 100644
--- a/reactos/subsys/win32k/objects/print.c
+++ b/reactos/subsys/win32k/objects/print.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: print.c,v 1.20 2004/07/14 20:48:58 navaraf Exp $ */
+/* $Id: print.c,v 1.21 2004/07/17 15:12:25 blight Exp $ */
 #include <w32k.h>
 
 INT
@@ -65,6 +65,9 @@ IntEngExtEscape(
    INT      OutSize,
    LPVOID   OutData)
 {
+   if (Escape == 0x1101) /* Get OpenGL driver name */
+      return 0; /* use default driver */
+
    UNIMPLEMENTED;
    return -1;
 }

From 1bd5f9a9818eaa9d58bf913a56f42b0cca4ac49c Mon Sep 17 00:00:00 2001
From: Gregor Anich <blight@blight.eu.org>
Date: Sat, 17 Jul 2004 15:13:37 +0000
Subject: [PATCH 341/356] Handle return value 0 from ExtEscape as special case
 (means to use the default driver)

svn path=/trunk/; revision=10177
---
 reactos/lib/opengl32/wgl.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/reactos/lib/opengl32/wgl.c b/reactos/lib/opengl32/wgl.c
index d506c3a64fd..549a4207937 100644
--- a/reactos/lib/opengl32/wgl.c
+++ b/reactos/lib/opengl32/wgl.c
@@ -291,17 +291,20 @@ ROSGL_ICDForHDC( HDC hdc )
 			/* get driver name */
 			ret = ExtEscape( hdc, EXT_GET_DRIVERINFO, sizeof (dwInput), (LPCSTR)&dwInput,
 			                 sizeof (EXTDRIVERINFO), (LPSTR)&info );
-			if (ret < 0)
+			if (ret <= 0)
 			{
 				HKEY hKey;
 				DWORD type, size;
 
-				DBGPRINT( "Warning: ExtEscape to get the drivername failed!!! (%d)", GetLastError() );
-				if (MessageBox( WindowFromDC( hdc ), L"Couldn't get installable client driver name!\nUsing default driver.",
-				                L"OPENGL32.dll: Warning", MB_OKCANCEL | MB_ICONWARNING ) == IDCANCEL)
+				if (ret < 0)
 				{
-					SetLastError( ret );
-					return NULL;
+					DBGPRINT( "Warning: ExtEscape to get the drivername failed!!! (%d)", GetLastError() );
+					if (MessageBox( WindowFromDC( hdc ), L"Couldn't get installable client driver name!\nUsing default driver.",
+					                L"OPENGL32.dll: Warning", MB_OKCANCEL | MB_ICONWARNING ) == IDCANCEL)
+					{
+						SetLastError( 0 );
+						return NULL;
+					}
 				}
 
 				/* open registry key */

From 96e0da3b7bfe0899dde0c5080526b43e362dd68e Mon Sep 17 00:00:00 2001
From: Gregor Anich <blight@blight.eu.org>
Date: Sat, 17 Jul 2004 15:52:43 +0000
Subject: [PATCH 342/356] Changed comments a bit, previous version did create
 print.c dependencies over and over again for me.

svn path=/trunk/; revision=10178
---
 reactos/subsys/win32k/objects/print.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reactos/subsys/win32k/objects/print.c b/reactos/subsys/win32k/objects/print.c
index 4548e6eedc3..80d7838aa46 100644
--- a/reactos/subsys/win32k/objects/print.c
+++ b/reactos/subsys/win32k/objects/print.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: print.c,v 1.21 2004/07/17 15:12:25 blight Exp $ */
+/* $Id: print.c,v 1.22 2004/07/17 15:52:43 blight Exp $ */
 #include <w32k.h>
 
 INT
@@ -65,7 +65,7 @@ IntEngExtEscape(
    INT      OutSize,
    LPVOID   OutData)
 {
-   if (Escape == 0x1101) /* Get OpenGL driver name */
+   if (Escape == 0x1101) /* get opengl driver info */
       return 0; /* use default driver */
 
    UNIMPLEMENTED;

From 9eee1e99ee218328785e2261e4e222c021551c8c Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sat, 17 Jul 2004 16:09:07 +0000
Subject: [PATCH 343/356] - RegQueryValueExW shouldn't touch *lpcbData if
 lpData == NULL.

svn path=/trunk/; revision=10179
---
 reactos/lib/advapi32/reg/reg.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/reactos/lib/advapi32/reg/reg.c b/reactos/lib/advapi32/reg/reg.c
index d747d7d7d95..d9f7db4e405 100644
--- a/reactos/lib/advapi32/reg/reg.c
+++ b/reactos/lib/advapi32/reg/reg.c
@@ -1,4 +1,4 @@
-/* $Id: reg.c,v 1.50 2004/07/03 17:40:21 navaraf Exp $
+/* $Id: reg.c,v 1.51 2004/07/17 16:09:07 navaraf Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -20,7 +20,7 @@
 #include <windows.h>
 #include <wchar.h>
 
-#define NDEBUG
+//#define NDEBUG
 #include <debug.h>
 
 /* DEFINES ******************************************************************/
@@ -2248,7 +2248,7 @@ RegQueryValueExW (HKEY hKey,
   ULONG BufferSize;
   ULONG ResultSize;
   HANDLE KeyHandle;
-  ULONG MaxCopy = lpcbData ? *lpcbData : 0;
+  ULONG MaxCopy = lpcbData != NULL && lpData != NULL ? *lpcbData : 0;
 
   DPRINT("hKey 0x%X  lpValueName %S  lpData 0x%X  lpcbData %d\n",
 	 hKey, lpValueName, lpData, lpcbData ? *lpcbData : 0);

From 70d717f7424b1f90faebca097dcc9c0a5311a737 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sat, 17 Jul 2004 17:24:45 +0000
Subject: [PATCH 344/356] - Disable debug messages.

svn path=/trunk/; revision=10182
---
 reactos/lib/advapi32/reg/reg.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reactos/lib/advapi32/reg/reg.c b/reactos/lib/advapi32/reg/reg.c
index d9f7db4e405..0c6b273b8aa 100644
--- a/reactos/lib/advapi32/reg/reg.c
+++ b/reactos/lib/advapi32/reg/reg.c
@@ -1,4 +1,4 @@
-/* $Id: reg.c,v 1.51 2004/07/17 16:09:07 navaraf Exp $
+/* $Id: reg.c,v 1.52 2004/07/17 17:24:45 navaraf Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -20,7 +20,7 @@
 #include <windows.h>
 #include <wchar.h>
 
-//#define NDEBUG
+#define NDEBUG
 #include <debug.h>
 
 /* DEFINES ******************************************************************/

From 349c61070644f11c6f07c0792bd546a62fd6e192 Mon Sep 17 00:00:00 2001
From: Gregor Anich <blight@blight.eu.org>
Date: Sat, 17 Jul 2004 17:37:41 +0000
Subject: [PATCH 345/356] Removed some comments - previous change didn't fix
 infinite re-creation of print.c deps for me.

svn path=/trunk/; revision=10183
---
 reactos/subsys/win32k/objects/print.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/reactos/subsys/win32k/objects/print.c b/reactos/subsys/win32k/objects/print.c
index 80d7838aa46..fa9191a81d0 100644
--- a/reactos/subsys/win32k/objects/print.c
+++ b/reactos/subsys/win32k/objects/print.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: print.c,v 1.22 2004/07/17 15:52:43 blight Exp $ */
+/* $Id: print.c,v 1.23 2004/07/17 17:37:41 blight Exp $ */
 #include <w32k.h>
 
 INT
@@ -65,8 +65,8 @@ IntEngExtEscape(
    INT      OutSize,
    LPVOID   OutData)
 {
-   if (Escape == 0x1101) /* get opengl driver info */
-      return 0; /* use default driver */
+   if (Escape == 0x1101)
+      return 0;
 
    UNIMPLEMENTED;
    return -1;

From 23dac2681b91bfc84cffa4d8c8e6cf62b79bf570 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Sat, 17 Jul 2004 20:32:11 +0000
Subject: [PATCH 346/356] Create missing default DACLs.

svn path=/trunk/; revision=10184
---
 reactos/ntoskrnl/se/acl.c | 82 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 77 insertions(+), 5 deletions(-)

diff --git a/reactos/ntoskrnl/se/acl.c b/reactos/ntoskrnl/se/acl.c
index b31a26473a3..05eba6c7f8c 100644
--- a/reactos/ntoskrnl/se/acl.c
+++ b/reactos/ntoskrnl/se/acl.c
@@ -1,4 +1,4 @@
-/* $Id: acl.c,v 1.17 2004/02/02 20:59:46 ekohl Exp $
+/* $Id: acl.c,v 1.18 2004/07/17 20:32:11 ekohl Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -51,7 +51,7 @@ SepInitDACLs(VOID)
 					      AclLength2,
 					      TAG_ACL);
   if (SePublicDefaultDacl == NULL)
-    return(FALSE);
+    return FALSE;
 
   RtlCreateAcl(SePublicDefaultDacl,
 	       AclLength2,
@@ -73,7 +73,7 @@ SepInitDACLs(VOID)
 							  AclLength4,
 							  TAG_ACL);
   if (SePublicDefaultUnrestrictedDacl == NULL)
-    return(FALSE);
+    return FALSE;
 
   RtlCreateAcl(SePublicDefaultUnrestrictedDacl,
 	       AclLength4,
@@ -96,7 +96,7 @@ SepInitDACLs(VOID)
 
   RtlAddAccessAllowedAce(SePublicDefaultUnrestrictedDacl,
 			 ACL_REVISION,
-			 GENERIC_READ | GENERIC_EXECUTE | STANDARD_RIGHTS_READ,
+			 GENERIC_READ | GENERIC_EXECUTE | READ_CONTROL,
 			 SeRestrictedCodeSid);
 
   /* create PublicOpenDacl */
@@ -104,7 +104,7 @@ SepInitDACLs(VOID)
 					   AclLength3,
 					   TAG_ACL);
   if (SePublicOpenDacl == NULL)
-    return(FALSE);
+    return FALSE;
 
   RtlCreateAcl(SePublicOpenDacl,
 	       AclLength3,
@@ -125,6 +125,78 @@ SepInitDACLs(VOID)
 			 GENERIC_ALL,
 			 SeAliasAdminsSid);
 
+  /* create PublicOpenUnrestrictedDacl */
+  SePublicOpenUnrestrictedDacl = ExAllocatePoolWithTag(NonPagedPool,
+						       AclLength4,
+						       TAG_ACL);
+  if (SePublicOpenUnrestrictedDacl == NULL)
+    return FALSE;
+
+  RtlCreateAcl(SePublicOpenUnrestrictedDacl,
+	       AclLength4,
+	       ACL_REVISION);
+
+  RtlAddAccessAllowedAce(SePublicOpenUnrestrictedDacl,
+			 ACL_REVISION,
+			 GENERIC_ALL,
+			 SeWorldSid);
+
+  RtlAddAccessAllowedAce(SePublicOpenUnrestrictedDacl,
+			 ACL_REVISION,
+			 GENERIC_ALL,
+			 SeLocalSystemSid);
+
+  RtlAddAccessAllowedAce(SePublicOpenUnrestrictedDacl,
+			 ACL_REVISION,
+			 GENERIC_ALL,
+			 SeAliasAdminsSid);
+
+  RtlAddAccessAllowedAce(SePublicOpenUnrestrictedDacl,
+			 ACL_REVISION,
+			 GENERIC_READ | GENERIC_EXECUTE,
+			 SeRestrictedCodeSid);
+
+  /* create SystemDefaultDacl */
+  SeSystemDefaultDacl = ExAllocatePoolWithTag(NonPagedPool,
+					      AclLength2,
+					      TAG_ACL);
+  if (SeSystemDefaultDacl == NULL)
+    return FALSE;
+
+  RtlCreateAcl(SeSystemDefaultDacl,
+	       AclLength2,
+	       ACL_REVISION);
+
+  RtlAddAccessAllowedAce(SeSystemDefaultDacl,
+			 ACL_REVISION,
+			 GENERIC_ALL,
+			 SeLocalSystemSid);
+
+  RtlAddAccessAllowedAce(SeSystemDefaultDacl,
+			 ACL_REVISION,
+			 GENERIC_READ | GENERIC_EXECUTE | READ_CONTROL,
+			 SeAliasAdminsSid);
+
+  /* create UnrestrictedDacl */
+  SeUnrestrictedDacl = ExAllocatePoolWithTag(NonPagedPool,
+					     AclLength2,
+					     TAG_ACL);
+  if (SeUnrestrictedDacl == NULL)
+    return FALSE;
+
+  RtlCreateAcl(SeUnrestrictedDacl,
+	       AclLength2,
+	       ACL_REVISION);
+
+  RtlAddAccessAllowedAce(SeUnrestrictedDacl,
+			 ACL_REVISION,
+			 GENERIC_ALL,
+			 SeWorldSid);
+
+  RtlAddAccessAllowedAce(SeUnrestrictedDacl,
+			 ACL_REVISION,
+			 GENERIC_READ | GENERIC_EXECUTE,
+			 SeRestrictedCodeSid);
 
   return(TRUE);
 }

From 491fa2e1ef8525b31f28f68a8e5bcd1456752fbc Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Sat, 17 Jul 2004 20:34:42 +0000
Subject: [PATCH 347/356] Assign a security descriptor to the root directory
 object.

svn path=/trunk/; revision=10185
---
 reactos/ntoskrnl/ob/namespc.c | 38 ++++++++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/reactos/ntoskrnl/ob/namespc.c b/reactos/ntoskrnl/ob/namespc.c
index 0c18f2e2ec3..3b498dad05c 100644
--- a/reactos/ntoskrnl/ob/namespc.c
+++ b/reactos/ntoskrnl/ob/namespc.c
@@ -1,4 +1,4 @@
-/* $Id: namespc.c,v 1.45 2004/07/16 17:19:15 ekohl Exp $
+/* $Id: namespc.c,v 1.46 2004/07/17 20:34:42 ekohl Exp $
  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
@@ -17,6 +17,7 @@
 #include <internal/ob.h>
 #include <internal/io.h>
 #include <internal/pool.h>
+#include <internal/se.h>
 #include <rosrtl/string.h>
 
 #define NDEBUG
@@ -348,6 +349,7 @@ ObInit(VOID)
 {
   OBJECT_ATTRIBUTES ObjectAttributes;
   UNICODE_STRING Name;
+  SECURITY_DESCRIPTOR SecurityDescriptor;
 
   /* Initialize the security descriptor cache */
   ObpInitSdCache();
@@ -373,7 +375,7 @@ ObInit(VOID)
   ObDirectoryType->OkayToClose = NULL;
   ObDirectoryType->Create = ObpCreateDirectory;
   ObDirectoryType->DuplicationNotify = NULL;
-  
+
   RtlRosInitUnicodeStringFromLiteral(&ObDirectoryType->TypeName,
 		       L"Directory");
 
@@ -398,14 +400,36 @@ ObInit(VOID)
   ObTypeObjectType->OkayToClose = NULL;
   ObTypeObjectType->Create = NULL;
   ObTypeObjectType->DuplicationNotify = NULL;
-  
+
   RtlRosInitUnicodeStringFromLiteral(&ObTypeObjectType->TypeName,
 		       L"ObjectType");
 
-  /* create root directory */
+  /* Create security descriptor */
+  RtlCreateSecurityDescriptor(&SecurityDescriptor,
+			      SECURITY_DESCRIPTOR_REVISION1);
+
+  RtlSetOwnerSecurityDescriptor(&SecurityDescriptor,
+				SeAliasAdminsSid,
+				FALSE);
+
+  RtlSetGroupSecurityDescriptor(&SecurityDescriptor,
+				SeLocalSystemSid,
+				FALSE);
+
+  RtlSetDaclSecurityDescriptor(&SecurityDescriptor,
+			       TRUE,
+			       SePublicDefaultDacl,
+			       FALSE);
+
+  /* Create root directory */
+  InitializeObjectAttributes(&ObjectAttributes,
+			     NULL,
+			     OBJ_PERMANENT,
+			     NULL,
+			     &SecurityDescriptor);
   ObCreateObject(KernelMode,
 		 ObDirectoryType,
-		 NULL,
+		 &ObjectAttributes,
 		 KernelMode,
 		 NULL,
 		 sizeof(DIRECTORY_OBJECT),
@@ -413,14 +437,14 @@ ObInit(VOID)
 		 0,
 		 (PVOID*)&NameSpaceRoot);
 
-  /* create '\ObjectTypes' directory */
+  /* Create '\ObjectTypes' directory */
   RtlRosInitUnicodeStringFromLiteral(&Name,
 		       L"\\ObjectTypes");
   InitializeObjectAttributes(&ObjectAttributes,
 			     &Name,
 			     OBJ_PERMANENT,
 			     NULL,
-			     NULL);
+			     &SecurityDescriptor);
   ObCreateObject(KernelMode,
 		 ObDirectoryType,
 		 &ObjectAttributes,

From e5b2c95bf3c49fdb0d6814cb5600f51187f6e204 Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Sat, 17 Jul 2004 21:10:25 +0000
Subject: [PATCH 348/356] simplified assigning DDI functions

svn path=/trunk/; revision=10186
---
 reactos/include/win32k/driver.h     |   8 +-
 reactos/subsys/win32k/misc/driver.c | 151 +++++++++++++++-------------
 reactos/subsys/win32k/objects/dc.c  |  12 +--
 3 files changed, 91 insertions(+), 80 deletions(-)

diff --git a/reactos/include/win32k/driver.h b/reactos/include/win32k/driver.h
index bdae2ff75e2..d93effbf172 100644
--- a/reactos/include/win32k/driver.h
+++ b/reactos/include/win32k/driver.h
@@ -100,13 +100,13 @@ typedef BOOL (STDCALL *PGD_GRADIENTFILL)(SURFOBJ*, CLIPOBJ*, XLATEOBJ*, TRIVERTE
 typedef struct _DRIVER_FUNCTIONS
 {
   PGD_ENABLEDRIVER  EnableDriver;
-  PGD_ENABLEPDEV  EnablePDev;
-  PGD_COMPLETEPDEV  CompletePDev;
-  PGD_DISABLEPDEV  DisablePDev;
+  PGD_ENABLEPDEV  EnablePDEV;
+  PGD_COMPLETEPDEV  CompletePDEV;
+  PGD_DISABLEPDEV  DisablePDEV;
   PGD_ENABLESURFACE  EnableSurface;
   PGD_DISABLESURFACE  DisableSurface;
   PGD_ASSERTMODE  AssertMode;
-  PGD_RESETPDEV  ResetPDev;
+  PGD_RESETPDEV  ResetPDEV;
   PGD_CREATEDEVICEBITMAP  CreateDeviceBitmap;
   PGD_DELETEDEVICEBITMAP  DeleteDeviceBitmap;
   PGD_REALIZEBRUSH  RealizeBrush;
diff --git a/reactos/subsys/win32k/misc/driver.c b/reactos/subsys/win32k/misc/driver.c
index e40d62ddb3a..63b7aec90bd 100644
--- a/reactos/subsys/win32k/misc/driver.c
+++ b/reactos/subsys/win32k/misc/driver.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: driver.c,v 1.40 2004/06/20 00:45:36 navaraf Exp $
+/* $Id: driver.c,v 1.41 2004/07/17 21:10:25 weiden Exp $
  * 
  * GDI Driver support routines
  * (mostly swiped from Wine)
@@ -157,79 +157,90 @@ PGD_ENABLEDRIVER DRIVER_FindDDIDriver(LPCWSTR Name)
   return (PGD_ENABLEDRIVER)GdiDriverInfo.EntryPoint;
 }
 
+#define BEGIN_FUNCTION_MAP() \
+  ULONG i; \
+  for (i = 0; i < DED->c; i++) \
+  { \
+    switch(DED->pdrvfn[i].iFunc) \
+    {
+
+#define DRIVER_FUNCTION(function) \
+      case INDEX_Drv##function: \
+        *(PVOID*)&DF->function = DED->pdrvfn[i].pfn; \
+        break
+
+#define END_FUNCTION_MAP() \
+      default: \
+        DPRINT1("Unsupported DDI function 0x%x\n", DED->pdrvfn[i].iFunc); \
+        break; \
+    } \
+  }
+
 BOOL DRIVER_BuildDDIFunctions(PDRVENABLEDATA  DED, 
                                PDRIVER_FUNCTIONS  DF)
 {
-  ULONG i;
+  BEGIN_FUNCTION_MAP();
 
-  for (i=0; i<DED->c; i++)
-  {
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvEnablePDEV)      DF->EnablePDev = (PGD_ENABLEPDEV)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvCompletePDEV)    DF->CompletePDev = (PGD_COMPLETEPDEV)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvDisablePDEV)     DF->DisablePDev = (PGD_DISABLEPDEV)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvEnableSurface)   DF->EnableSurface = (PGD_ENABLESURFACE)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvDisableSurface)  DF->DisableSurface = (PGD_DISABLESURFACE)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvAssertMode)      DF->AssertMode = (PGD_ASSERTMODE)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvResetPDEV)       DF->ResetPDev = (PGD_RESETPDEV)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvCreateDeviceBitmap)
-      DF->CreateDeviceBitmap = (PGD_CREATEDEVICEBITMAP)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvDeleteDeviceBitmap)
-      DF->DeleteDeviceBitmap = (PGD_DELETEDEVICEBITMAP)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvRealizeBrush)    DF->RealizeBrush = (PGD_REALIZEBRUSH)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvDitherColor)     DF->DitherColor = (PGD_DITHERCOLOR)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvStrokePath)      DF->StrokePath = (PGD_STROKEPATH)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvFillPath)        DF->FillPath = (PGD_FILLPATH)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvStrokeAndFillPath)
-      DF->StrokeAndFillPath = (PGD_STROKEANDFILLPATH)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvPaint)           DF->Paint = (PGD_PAINT)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvBitBlt)          DF->BitBlt = (PGD_BITBLT)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvTransparentBlt)  DF->TransparentBlt = (PGD_TRANSPARENTBLT)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvCopyBits)        DF->CopyBits = (PGD_COPYBITS)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvStretchBlt)      DF->StretchBlt = (PGD_STRETCHBLT)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvSetPalette)      DF->SetPalette = (PGD_SETPALETTE)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvTextOut)         DF->TextOut = (PGD_TEXTOUT)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvEscape)          DF->Escape = (PGD_ESCAPE)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvDrawEscape)      DF->DrawEscape = (PGD_DRAWESCAPE)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvQueryFont)       DF->QueryFont = (PGD_QUERYFONT)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvQueryFontTree)   DF->QueryFontTree = (PGD_QUERYFONTTREE)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvQueryFontData)   DF->QueryFontData = (PGD_QUERYFONTDATA)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvSetPointerShape) DF->SetPointerShape = (PGD_SETPOINTERSHAPE)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvMovePointer)     DF->MovePointer = (PGD_MOVEPOINTER)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvLineTo)          DF->LineTo = (PGD_LINETO)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvSendPage)        DF->SendPage = (PGD_SENDPAGE)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvStartPage)       DF->StartPage = (PGD_STARTPAGE)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvEndDoc)          DF->EndDoc = (PGD_ENDDOC)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvStartDoc)        DF->StartDoc = (PGD_STARTDOC)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvGetGlyphMode)    DF->GetGlyphMode = (PGD_GETGLYPHMODE)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvSynchronize)     DF->Synchronize = (PGD_SYNCHRONIZE)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvSaveScreenBits)  DF->SaveScreenBits = (PGD_SAVESCREENBITS)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvGetModes)        DF->GetModes = (PGD_GETMODES)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvFree)            DF->Free = (PGD_FREE)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvDestroyFont)     DF->DestroyFont = (PGD_DESTROYFONT)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvQueryFontCaps)   DF->QueryFontCaps = (PGD_QUERYFONTCAPS)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvLoadFontFile)    DF->LoadFontFile = (PGD_LOADFONTFILE)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvUnloadFontFile)  DF->UnloadFontFile = (PGD_UNLOADFONTFILE)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvFontManagement)  DF->FontManagement = (PGD_FONTMANAGEMENT)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvQueryTrueTypeTable)
-      DF->QueryTrueTypeTable = (PGD_QUERYTRUETYPETABLE)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvQueryTrueTypeOutline)
-      DF->QueryTrueTypeOutline = (PGD_QUERYTRUETYPEOUTLINE)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvGetTrueTypeFile) DF->GetTrueTypeFile = (PGD_GETTRUETYPEFILE)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvQueryFontFile)   DF->QueryFontFile = (PGD_QUERYFONTFILE)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvQueryAdvanceWidths)
-      DF->QueryAdvanceWidths = (PGD_QUERYADVANCEWIDTHS)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvSetPixelFormat)  DF->SetPixelFormat = (PGD_SETPIXELFORMAT)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvDescribePixelFormat)
-      DF->DescribePixelFormat = (PGD_DESCRIBEPIXELFORMAT)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvSwapBuffers)     DF->SwapBuffers = (PGD_SWAPBUFFERS)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvStartBanding)    DF->StartBanding = (PGD_STARTBANDING)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvNextBand)        DF->NextBand = (PGD_NEXTBAND)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvGetDirectDrawInfo) DF->GetDirectDrawInfo = (PGD_GETDIRECTDRAWINFO)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvEnableDirectDraw)  DF->EnableDirectDraw = (PGD_ENABLEDIRECTDRAW)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvDisableDirectDraw) DF->DisableDirectDraw = (PGD_DISABLEDIRECTDRAW)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvQuerySpoolType)  DF->QuerySpoolType = (PGD_QUERYSPOOLTYPE)DED->pdrvfn[i].pfn;
-    if(DED->pdrvfn[i].iFunc == INDEX_DrvGradientFill) DF->GradientFill = (PGD_GRADIENTFILL)DED->pdrvfn[i].pfn;
-  }
+    DRIVER_FUNCTION(EnablePDEV);
+    DRIVER_FUNCTION(CompletePDEV);
+    DRIVER_FUNCTION(DisablePDEV);
+    DRIVER_FUNCTION(EnableSurface);
+    DRIVER_FUNCTION(DisableSurface);
+    DRIVER_FUNCTION(AssertMode);
+    DRIVER_FUNCTION(ResetPDEV);
+    DRIVER_FUNCTION(CreateDeviceBitmap);
+    DRIVER_FUNCTION(DeleteDeviceBitmap);
+    DRIVER_FUNCTION(RealizeBrush);
+    DRIVER_FUNCTION(DitherColor);
+    DRIVER_FUNCTION(StrokePath);
+    DRIVER_FUNCTION(FillPath);
+    DRIVER_FUNCTION(StrokeAndFillPath);
+    DRIVER_FUNCTION(Paint);
+    DRIVER_FUNCTION(BitBlt);
+    DRIVER_FUNCTION(TransparentBlt);
+    DRIVER_FUNCTION(CopyBits);
+    DRIVER_FUNCTION(StretchBlt);
+    DRIVER_FUNCTION(SetPalette);
+    DRIVER_FUNCTION(TextOut);
+    DRIVER_FUNCTION(Escape);
+    DRIVER_FUNCTION(DrawEscape);
+    DRIVER_FUNCTION(QueryFont);
+    DRIVER_FUNCTION(QueryFontTree);
+    DRIVER_FUNCTION(QueryFontData);
+    DRIVER_FUNCTION(SetPointerShape);
+    DRIVER_FUNCTION(MovePointer);
+    DRIVER_FUNCTION(LineTo);
+    DRIVER_FUNCTION(SendPage);
+    DRIVER_FUNCTION(StartPage);
+    DRIVER_FUNCTION(EndDoc);
+    DRIVER_FUNCTION(StartDoc);
+    DRIVER_FUNCTION(GetGlyphMode);
+    DRIVER_FUNCTION(Synchronize);
+    DRIVER_FUNCTION(SaveScreenBits);
+    DRIVER_FUNCTION(GetModes);
+    DRIVER_FUNCTION(Free);
+    DRIVER_FUNCTION(DestroyFont);
+    DRIVER_FUNCTION(QueryFontCaps);
+    DRIVER_FUNCTION(LoadFontFile);
+    DRIVER_FUNCTION(UnloadFontFile);
+    DRIVER_FUNCTION(FontManagement);
+    DRIVER_FUNCTION(QueryTrueTypeTable);
+    DRIVER_FUNCTION(QueryTrueTypeOutline);
+    DRIVER_FUNCTION(GetTrueTypeFile);
+    DRIVER_FUNCTION(QueryFontFile);
+    DRIVER_FUNCTION(QueryAdvanceWidths);
+    DRIVER_FUNCTION(SetPixelFormat);
+    DRIVER_FUNCTION(DescribePixelFormat);
+    DRIVER_FUNCTION(SwapBuffers);
+    DRIVER_FUNCTION(StartBanding);
+    DRIVER_FUNCTION(NextBand);
+    DRIVER_FUNCTION(GetDirectDrawInfo);
+    DRIVER_FUNCTION(EnableDirectDraw);
+    DRIVER_FUNCTION(DisableDirectDraw);
+    DRIVER_FUNCTION(QuerySpoolType);
+    DRIVER_FUNCTION(GradientFill);
+
+  END_FUNCTION_MAP();
 
   return TRUE;
 }
diff --git a/reactos/subsys/win32k/objects/dc.c b/reactos/subsys/win32k/objects/dc.c
index f016a3bad11..aa914c8bc87 100644
--- a/reactos/subsys/win32k/objects/dc.c
+++ b/reactos/subsys/win32k/objects/dc.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dc.c,v 1.144 2004/07/14 20:48:58 navaraf Exp $
+/* $Id: dc.c,v 1.145 2004/07/17 21:10:25 weiden Exp $
  *
  * DC.C - Device context functions
  *
@@ -560,7 +560,7 @@ IntCreatePrimarySurface()
       /* Allocate a phyical device handle from the driver */
       if (SetupDevMode(&PrimarySurface.DMW, DisplayNumber))
       {
-         PrimarySurface.PDev = PrimarySurface.DriverFunctions.EnablePDev(
+         PrimarySurface.PDev = PrimarySurface.DriverFunctions.EnablePDEV(
             &PrimarySurface.DMW,
             L"",
             HS_DDI_MAX,
@@ -586,7 +586,7 @@ IntCreatePrimarySurface()
       if (DoDefault)
       {
          RtlZeroMemory(&(PrimarySurface.DMW), sizeof(DEVMODEW));
-         PrimarySurface.PDev = PrimarySurface.DriverFunctions.EnablePDev(
+         PrimarySurface.PDev = PrimarySurface.DriverFunctions.EnablePDEV(
             &PrimarySurface.DMW,
             L"",
             HS_DDI_MAX,
@@ -623,7 +623,7 @@ IntCreatePrimarySurface()
       DPRINT("calling completePDev\n");
 
       /* Complete initialization of the physical device */
-      PrimarySurface.DriverFunctions.CompletePDev(
+      PrimarySurface.DriverFunctions.CompletePDEV(
          PrimarySurface.PDev,
 	 (HDEV)&PrimarySurface);
 
@@ -639,7 +639,7 @@ IntCreatePrimarySurface()
       if (NULL == PrimarySurface.Handle)
       {
 /*         PrimarySurface.DriverFunctions.AssertMode(PrimarySurface.PDev, FALSE);*/
-         PrimarySurface.DriverFunctions.DisablePDev(PrimarySurface.PDev);
+         PrimarySurface.DriverFunctions.DisablePDEV(PrimarySurface.PDev);
          ObDereferenceObject(PrimarySurface.VideoFileObject);
          DPRINT1("DrvEnableSurface failed\n");
          /* return FALSE; */
@@ -670,7 +670,7 @@ IntDestroyPrimarySurface()
     DPRINT("Reseting display\n" );
     PrimarySurface.DriverFunctions.AssertMode(PrimarySurface.PDev, FALSE);
     PrimarySurface.DriverFunctions.DisableSurface(PrimarySurface.PDev);
-    PrimarySurface.DriverFunctions.DisablePDev(PrimarySurface.PDev);
+    PrimarySurface.DriverFunctions.DisablePDEV(PrimarySurface.PDev);
 
     DceEmptyCache();
 

From 5a725770bc0648c3683023d22ec70f321b116ad8 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sat, 17 Jul 2004 22:28:23 +0000
Subject: [PATCH 349/356] - Fixed memory referencing in mmTaskCreate.

svn path=/trunk/; revision=10187
---
 reactos/lib/winmm/winmm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reactos/lib/winmm/winmm.c b/reactos/lib/winmm/winmm.c
index 3df138046e3..2988f7e5824 100644
--- a/reactos/lib/winmm/winmm.c
+++ b/reactos/lib/winmm/winmm.c
@@ -3213,7 +3213,7 @@ MMRESULT WINAPI mmTaskCreate(LPTASKCALLBACK cb, HANDLE* ph, DWORD client)
         mms->event = NULL;
     }
 
-    hThread = CreateThread(0, 0, mmTaskRun, (LPVOID)&mms, 0, NULL);
+    hThread = CreateThread(0, 0, mmTaskRun, (LPVOID)mms, 0, NULL);
     if (!hThread) {
         HeapFree(GetProcessHeap(), 0, mms);
         CloseHandle(hEvent);

From cec39741e74cd35f4c84078f839138c3e18ec64f Mon Sep 17 00:00:00 2001
From: Gregor Anich <blight@blight.eu.org>
Date: Sun, 18 Jul 2004 00:30:08 +0000
Subject: [PATCH 350/356] Added RosRtlDevModeW2A function.

svn path=/trunk/; revision=10188
---
 reactos/lib/rosrtl/misc/devmode.c | 74 +++++++++++++++++++++++++++++--
 1 file changed, 70 insertions(+), 4 deletions(-)

diff --git a/reactos/lib/rosrtl/misc/devmode.c b/reactos/lib/rosrtl/misc/devmode.c
index 70c51b5f604..0baf0b9ed5a 100644
--- a/reactos/lib/rosrtl/misc/devmode.c
+++ b/reactos/lib/rosrtl/misc/devmode.c
@@ -2,9 +2,6 @@
 #include <string.h>
 #include <rosrtl/devmode.h>
 
-void
-RosRtlDevModeA2W ( LPDEVMODEW pW, const LPDEVMODEA pA )
-{
 #define SIZEOF_DEVMODEA_300 124
 #define SIZEOF_DEVMODEA_400 148
 #define SIZEOF_DEVMODEA_500 156
@@ -12,6 +9,9 @@ RosRtlDevModeA2W ( LPDEVMODEW pW, const LPDEVMODEA pA )
 #define SIZEOF_DEVMODEW_400 212
 #define SIZEOF_DEVMODEW_500 220
 
+void
+RosRtlDevModeA2W ( LPDEVMODEW pW, const LPDEVMODEA pA )
+{
 #define COPYS(f,len) MultiByteToWideChar ( CP_THREAD_ACP, 0, pA->f, len, pW->f, len )
 #define COPYN(f) pW->f = pA->f
   memset ( pW, 0, sizeof(DEVMODEW) );
@@ -72,6 +72,73 @@ RosRtlDevModeA2W ( LPDEVMODEW pW, const LPDEVMODEA pA )
 
 #undef COPYN
 #undef COPYS
+}
+
+
+void
+RosRtlDevModeW2A( LPDEVMODEA pA, const LPDEVMODEW pW )
+{
+#define COPYS(f,len) WideCharToMultiByte( CP_THREAD_ACP, 0, pW->f, len, pA->f, len, NULL, NULL )
+#define COPYN(f) pA->f = pW->f
+  memset ( pA, 0, sizeof(DEVMODEA) );
+  COPYS(dmDeviceName, CCHDEVICENAME );
+  COPYN(dmSpecVersion);
+  COPYN(dmDriverVersion);
+  switch ( pW->dmSize )
+    {
+    case SIZEOF_DEVMODEW_300:
+      pA->dmSize = SIZEOF_DEVMODEA_300;
+      break;
+    case SIZEOF_DEVMODEW_400:
+      pA->dmSize = SIZEOF_DEVMODEA_400;
+      break;
+    case SIZEOF_DEVMODEW_500:
+    default: /* FIXME what to do??? */
+      pA->dmSize = SIZEOF_DEVMODEA_500;
+      break;
+    }
+  COPYN(dmDriverExtra);
+  COPYN(dmFields);
+  COPYN(dmPosition.x);
+  COPYN(dmPosition.y);
+  COPYN(dmScale);
+  COPYN(dmCopies);
+  COPYN(dmDefaultSource);
+  COPYN(dmPrintQuality);
+  COPYN(dmColor);
+  COPYN(dmDuplex);
+  COPYN(dmYResolution);
+  COPYN(dmTTOption);
+  COPYN(dmCollate);
+  COPYS(dmFormName,CCHFORMNAME);
+  COPYN(dmLogPixels);
+  COPYN(dmBitsPerPel);
+  COPYN(dmPelsWidth);
+  COPYN(dmPelsHeight);
+  COPYN(dmDisplayFlags); // aka dmNup
+  COPYN(dmDisplayFrequency);
+
+  if ( pW->dmSize <= SIZEOF_DEVMODEW_300 )
+    return; // we're done with 0x300 fields
+
+  COPYN(dmICMMethod);
+  COPYN(dmICMIntent);
+  COPYN(dmMediaType);
+  COPYN(dmDitherType);
+  COPYN(dmReserved1);
+  COPYN(dmReserved2);
+
+  if ( pW->dmSize <= SIZEOF_DEVMODEW_400 )
+    return; // we're done with 0x400 fields
+
+  COPYN(dmPanningWidth);
+  COPYN(dmPanningHeight);
+
+  return;
+
+#undef COPYN
+#undef COPYS
+}
 
 #undef SIZEOF_DEVMODEA_300
 #undef SIZEOF_DEVMODEA_400
@@ -79,4 +146,3 @@ RosRtlDevModeA2W ( LPDEVMODEW pW, const LPDEVMODEA pA )
 #undef SIZEOF_DEVMODEW_300
 #undef SIZEOF_DEVMODEW_400
 #undef SIZEOF_DEVMODEW_500
-}

From f7dff7223a1c50eab25c1484cc76ec60c219b631 Mon Sep 17 00:00:00 2001
From: Gregor Anich <blight@blight.eu.org>
Date: Sun, 18 Jul 2004 00:36:33 +0000
Subject: [PATCH 351/356] Fix EnumDisplaySettingsExA (did not output anything
 into devmode)

svn path=/trunk/; revision=10189
---
 reactos/lib/user32/misc/display.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/reactos/lib/user32/misc/display.c b/reactos/lib/user32/misc/display.c
index 3f40870a22f..ec2ffcd9ef8 100644
--- a/reactos/lib/user32/misc/display.c
+++ b/reactos/lib/user32/misc/display.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: display.c,v 1.10 2004/07/08 00:46:22 weiden Exp $
+/* $Id: display.c,v 1.11 2004/07/18 00:36:33 blight Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/misc/dde.c
@@ -142,6 +142,7 @@ EnumDisplaySettingsExA(
   rc = NtUserEnumDisplaySettings ( &DeviceName, iModeNum, &DevModeW, dwFlags );
 
   RtlFreeUnicodeString ( &DeviceName );
+  RosRtlDevModeW2A ( lpDevMode, &DevModeW );
 
   return rc;
 }

From 4afe092bc010930be2815877315c07b0b3daaa45 Mon Sep 17 00:00:00 2001
From: Martin Fuchs <fuchs.martin@gmail.com>
Date: Sun, 18 Jul 2004 09:20:38 +0000
Subject: [PATCH 352/356] fix UNICODE string buffer allocation

svn path=/trunk/; revision=10190
---
 reactos/subsys/system/explorer/utility/xmlstorage.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reactos/subsys/system/explorer/utility/xmlstorage.h b/reactos/subsys/system/explorer/utility/xmlstorage.h
index 57f96b13a41..f979d8ba2b1 100644
--- a/reactos/subsys/system/explorer/utility/xmlstorage.h
+++ b/reactos/subsys/system/explorer/utility/xmlstorage.h
@@ -171,7 +171,7 @@ inline void assign_utf8(String& s, const char* str)
 	int lutf8 = strlen(str);
 
 #ifdef UNICODE
-	LPTSTR buffer = (LPTSTR)alloca(lutf8);
+	LPTSTR buffer = (LPTSTR)alloca(sizeof(TCHAR)*lutf8);
 	int l = MultiByteToWideChar(CP_UTF8, 0, str, lutf8, buffer, lutf8);
 #else
 	LPWSTR wbuffer = (LPWSTR)alloca(sizeof(WCHAR)*lutf8);

From b96e6b7b0a82354072550b4796041a38f271a407 Mon Sep 17 00:00:00 2001
From: Martin Fuchs <fuchs.martin@gmail.com>
Date: Sun, 18 Jul 2004 09:31:02 +0000
Subject: [PATCH 353/356] eliminate useless GCC warning by initializing the
 entry variable

svn path=/trunk/; revision=10191
---
 reactos/subsys/system/explorer/shell/shellfs.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reactos/subsys/system/explorer/shell/shellfs.cpp b/reactos/subsys/system/explorer/shell/shellfs.cpp
index ca849de618e..1148c9ecb8d 100644
--- a/reactos/subsys/system/explorer/shell/shellfs.cpp
+++ b/reactos/subsys/system/explorer/shell/shellfs.cpp
@@ -225,7 +225,7 @@ void ShellDirectory::read_directory(int scan_flags)
 	TCHAR buffer[MAX_PATH];
 
 	if ((scan_flags&SCAN_FILESYSTEM) && get_path(buffer)) {
-		Entry* entry;
+		Entry* entry = NULL;	// eliminate useless GCC warning by initializing entry
 
 		LPTSTR p = buffer + _tcslen(buffer);
 
@@ -373,7 +373,7 @@ void ShellDirectory::read_directory(int scan_flags)
 												 (scan_flags&SCAN_DO_ACCESS) && !removeable);
 
 				try {
-					Entry* entry;
+					Entry* entry = NULL;	// eliminate useless GCC warning by initializing entry
 
 					if (w32fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
 						entry = new ShellDirectory(this, pidls[n], _hwnd);

From 9ba0b83e50e01a1e580f343a889ffaa6f1de91f7 Mon Sep 17 00:00:00 2001
From: Gregor Anich <blight@blight.eu.org>
Date: Sun, 18 Jul 2004 12:51:46 +0000
Subject: [PATCH 354/356] Added RosRtlDevModeW2A function.

svn path=/trunk/; revision=10192
---
 reactos/include/rosrtl/devmode.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/reactos/include/rosrtl/devmode.h b/reactos/include/rosrtl/devmode.h
index 0b6b996e6e5..7dc179d5f4c 100644
--- a/reactos/include/rosrtl/devmode.h
+++ b/reactos/include/rosrtl/devmode.h
@@ -8,6 +8,8 @@ extern "C"
 
 void
 RosRtlDevModeA2W ( LPDEVMODEW pW, const LPDEVMODEA pA );
+void
+RosRtlDevModeW2A( LPDEVMODEA pA, const LPDEVMODEW pW );
 
 #ifdef __cplusplus
 }

From 9e08323787cee4797dbf5e9ade63b2fe32785d59 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Sun, 18 Jul 2004 13:02:28 +0000
Subject: [PATCH 355/356] Implement most simple code path of
 SeAssignSecurity().

svn path=/trunk/; revision=10193
---
 reactos/ntoskrnl/se/semgr.c | 58 ++++++++++++++++++++++++++++++-------
 1 file changed, 47 insertions(+), 11 deletions(-)

diff --git a/reactos/ntoskrnl/se/semgr.c b/reactos/ntoskrnl/se/semgr.c
index ebc38ec27ba..e3cb195365e 100644
--- a/reactos/ntoskrnl/se/semgr.c
+++ b/reactos/ntoskrnl/se/semgr.c
@@ -1,4 +1,4 @@
-/* $Id: semgr.c,v 1.33 2004/07/14 14:25:31 ekohl Exp $
+/* $Id: semgr.c,v 1.34 2004/07/18 13:02:28 ekohl Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -322,31 +322,65 @@ SepInheritAcl(PACL Acl,
 	return(STATUS_UNSUCCESSFUL);
     }
 
-
 }
 #endif
 
+
 /*
  * @unimplemented
  */
 NTSTATUS STDCALL
-SeAssignSecurity(PSECURITY_DESCRIPTOR ParentDescriptor,
-		 PSECURITY_DESCRIPTOR ExplicitDescriptor,
-		 PSECURITY_DESCRIPTOR* NewDescriptor,
+SeAssignSecurity(PSECURITY_DESCRIPTOR ParentDescriptor OPTIONAL,
+		 PSECURITY_DESCRIPTOR ExplicitDescriptor OPTIONAL,
+		 PSECURITY_DESCRIPTOR *NewDescriptor,
 		 BOOLEAN IsDirectoryObject,
 		 PSECURITY_SUBJECT_CONTEXT SubjectContext,
 		 PGENERIC_MAPPING GenericMapping,
 		 POOL_TYPE PoolType)
 {
+  PSECURITY_DESCRIPTOR Descriptor;
+  ULONG Length;
+  NTSTATUS Status;
+
+  if (ExplicitDescriptor != NULL)
+    {
+      Length = RtlLengthSecurityDescriptor(ExplicitDescriptor);
+    }
+  else
+    {
+      DPRINT("No explicit security descriptor\n");
+      return STATUS_UNSUCCESSFUL;
+    }
+
+  Descriptor = ExAllocatePool(NonPagedPool,
+			      Length);
+  if (Descriptor == NULL)
+    {
+      DPRINT1("ExAlloctePool() failed\n");
+      return STATUS_UNSUCCESSFUL;
+    }
+
+  Status = RtlMakeSelfRelativeSD(ExplicitDescriptor,
+				 Descriptor,
+				 &Length);
+  if (!NT_SUCCESS(Status))
+    {
+      DPRINT1("RtlMakeSelfRelativeSD() failed (Status %lx)\n", Status);
+      return Status;
+    }
+
+  *NewDescriptor = Descriptor;
+
+  return STATUS_SUCCESS;
+
 #if 0
-   PSECURITY_DESCRIPTOR Descriptor;
    PSID Owner;
    PSID PrimaryGroup;
    PACL DefaultDacl;
    PSID ProcessOwner;
    PSID ProcessPrimaryGroup;
    PACL Sacl;
-   
+
    if (ExplicitDescriptor == NULL)
      {
 	RtlCreateSecurityDescriptor(&Descriptor, 1);
@@ -355,19 +389,23 @@ SeAssignSecurity(PSECURITY_DESCRIPTOR ParentDescriptor,
      {
 	Descriptor = ExplicitDescriptor;
      }
+
    SeLockSubjectContext(SubjectContext);
+
    SepGetDefaultsSubjectContext(SubjectContext,
 				&Owner,
 				&PrimaryGroup,
 				&DefaultDacl,
 				&ProcessOwner,
 				&ProcessPrimaryGroup);
+
    if (Descriptor->Control & SE_SACL_PRESENT ||
        Descriptor->Control & SE_SACL_DEFAULTED)
      {
 	if (ParentDescriptor == NULL)
 	  {
 	  }
+
 	if (Descriptor->Control & SE_SACL_PRESENT ||
 	    Descriptor->Sacl == NULL ||)
 	  {
@@ -378,9 +416,10 @@ SeAssignSecurity(PSECURITY_DESCRIPTOR ParentDescriptor,
 	     Sacl = Descriptor->Sacl;
 	     if (Descriptor->Control & SE_SELF_RELATIVE)
 	       {
-		  Sacl = (PACL)(((PVOID)Sacl) + (PVOID)Descriptor);
+		  Sacl = (PACL)(((ULONG_PTR)Sacl) + (ULONG_PTR)Descriptor);
 	       }
 	  }
+
 	SepInheritAcl(Sacl,
 		      IsDirectoryObject,
 		      Owner,
@@ -389,9 +428,6 @@ SeAssignSecurity(PSECURITY_DESCRIPTOR ParentDescriptor,
 		      ProcessOwner,
 		      GenericMapping);
      }
-#else
-  UNIMPLEMENTED;
-  return(STATUS_NOT_IMPLEMENTED);
 #endif
 }
 

From 04642b4ea7ff6f068497af5668e611fd4c6b8bc1 Mon Sep 17 00:00:00 2001
From: Martin Fuchs <fuchs.martin@gmail.com>
Date: Sun, 18 Jul 2004 13:03:06 +0000
Subject: [PATCH 356/356] precompiled header support for GCC 3.4.1

svn path=/trunk/; revision=10194
---
 reactos/subsys/system/explorer/.cvsignore   |   1 +
 reactos/subsys/system/explorer/Makefile.PCH | 112 ++++++++++++++++++++
 2 files changed, 113 insertions(+)
 create mode 100644 reactos/subsys/system/explorer/Makefile.PCH

diff --git a/reactos/subsys/system/explorer/.cvsignore b/reactos/subsys/system/explorer/.cvsignore
index ac5b1cd318b..f14d210818d 100644
--- a/reactos/subsys/system/explorer/.cvsignore
+++ b/reactos/subsys/system/explorer/.cvsignore
@@ -23,3 +23,4 @@ WineRelease
 *.suo
 buildno.h
 notifyhook.dll
+*.gch
diff --git a/reactos/subsys/system/explorer/Makefile.PCH b/reactos/subsys/system/explorer/Makefile.PCH
new file mode 100644
index 00000000000..51bdc8030c1
--- /dev/null
+++ b/reactos/subsys/system/explorer/Makefile.PCH
@@ -0,0 +1,112 @@
+#
+#  ReactOS explorer
+#
+#  Makefile.PCH
+#
+#  MinGW Makefile with precompiled header support
+#
+
+CC = gcc
+CXX = g++
+LINK = g++
+
+CFLAGS	= -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -fexceptions -Wall -I.
+RCFLAGS	= -DWIN32 -D__WINDRES__
+LFLAGS	= -Wl,--subsystem,windows
+
+ifdef DEBUG
+CFLAGS	+= -D_DEBUG -g
+RCFLAGS	+= -D_DEBUG
+LFLAGS	+= -g
+else
+CFLAGS	+= -DNDEBUG -Os
+RCFLAGS	+= -DNDEBUG
+LFLAGS	+= -s
+endif
+
+ifndef UNICODE
+UNICODE = 1
+endif
+
+ifeq ($(UNICODE),1)
+CFLAGS	+= -DUNICODE
+# LFLAGS+= -Wl,--entry,_wWinMain@16
+endif
+
+CXXFLAGS = $(CFLAGS)
+
+EXEC_SUFFIX = .exe
+RES_SUFFIX = .coff
+
+VPATH = shell utility taskbar desktop dialogs
+
+PROGRAM = explorer
+
+TARGET = $(PROGRAM)$(EXEC_SUFFIX)
+
+OBJECTS = \
+	startup.o \
+	shellclasses.o \
+	utility.o \
+	window.o \
+	dragdropimpl.o \
+	shellbrowserimpl.o \
+	explorer.o \
+	entries.o \
+	winfs.o \
+	unixfs.o \
+	shellfs.o \
+	ntobjfs.o \
+	regfs.o \
+	fatfs.o \
+	webchild.o \
+	mainframe.o \
+	filechild.o \
+	pane.o \
+	shellbrowser.o \
+	desktop.o \
+	desktopbar.o \
+	taskbar.o \
+	startmenu.o \
+	traynotify.o \
+	quicklaunch.o \
+	favorites.o \
+	searchprogram.o \
+	settings.o \
+	i386-stub-win32.o \
+	xmlstorage.o
+
+LIBS = gdi32 comctl32 ole32 uuid
+DELAYIMPORTS = oleaut32 wsock32
+
+all: precomp.h.gch $(TARGET)
+
+precomp.h.gch:
+	$(CXX) $(CFLAGS) precomp.h
+
+$(TARGET): $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) notifyhook.dll libexpat.dll
+	$(LINK) $(LFLAGS) -o $@ $^ $(addprefix -l,$(LIBS)) $(addprefix -l,$(DELAYIMPORTS))
+
+explorer$(RES_SUFFIX): $(PROGRAM)_intres.rc res/*.bmp res/*.ico
+	windres $(RCFLAGS) -o $@ $(PROGRAM)_intres.rc
+
+notifyhook.dll: notifyhook/notifyhook.c notifyhook/notifyhook.h
+	$(CC) -D_WIN32_IE=0x0600 -Wall -D_NOTIFYHOOK_IMPL -Os -s notifyhook/notifyhook.c -shared -o $@
+
+clean:
+	rm -f $(TARGET) $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) precomp.h.gch
+
+docu: doxy-footer.html
+	doxygen Doxyfile
+
+full-docu: docu
+	-cmd /c start /b /low /wait hhc doxy-doc\html\index.hhp
+	cmd /c move /y doxy-doc\html\index.chm ros-explorer.chm
+	doxygen Doxyfile-all
+	-cmd /c start /b /low /wait hhc doxy-doc\html\index.hhp
+	cmd /c move /y doxy-doc\html\index.chm ros-explorer-full.chm
+
+doxy-footer.html: ever
+	updatefooter
+
+ever: